From 5c511dd1244fc8eeccf8920a5a4754ae01da296e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 Feb 2023 07:42:04 -0500
Subject: [PATCH 0001/2704] feat(solidity): use maintained parser and update
 highlights accordingly

---
 README.md                                |   2 +-
 lockfile.json                            |   2 +-
 lua/nvim-treesitter/parsers.lua          |   6 +-
 queries/solidity/highlights.scm          | 218 ++++++++++++++---------
 tests/query/highlights/solidity/test.sol |   8 +-
 5 files changed, 138 insertions(+), 98 deletions(-)

diff --git a/README.md b/README.md
index 2a6ebf5e5..091a47e90 100644
--- a/README.md
+++ b/README.md
@@ -303,7 +303,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [slint](https://github.com/jrmoulton/tree-sitter-slint) (experimental, maintained by @jrmoulton)
 - [x] [smali](https://git.sr.ht/~yotam/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
-- [x] [solidity](https://github.com/YongJieYongJie/tree-sitter-solidity) (maintained by @YongJieYongJie)
+- [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)
 - [x] [sparql](https://github.com/BonaBeavis/tree-sitter-sparql) (maintained by @BonaBeavis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
 - [x] [starlark](https://github.com/amaanq/tree-sitter-starlark) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 0fe13282c..ca9770ad7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -390,7 +390,7 @@
     "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"
   },
   "solidity": {
-    "revision": "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a"
+    "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4769c95f0..de31f4196 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1235,11 +1235,11 @@ list.smithy = {
 
 list.solidity = {
   install_info = {
-    url = "https://github.com/YongJieYongJie/tree-sitter-solidity",
-    branch = "with-generated-c-code",
+    url = "https://github.com/JoranHonig/tree-sitter-solidity",
+    branch = "master",
     files = { "src/parser.c" },
   },
-  maintainers = { "@YongJieYongJie" },
+  maintainers = { "@amaanq" },
 }
 
 list.sparql = {
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 33c837d5c..5afebb990 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -1,73 +1,75 @@
-(comment) @comment
-;; Handles natspec comments
-((comment) @preproc
- (#match? @preproc "^/// .*"))
-
 ; Pragma
-(pragma_directive) @attribute
 
+[
+  "pragma" 
+  "solidity"
+] @preproc
+
+(solidity_pragma_token
+  "||" @symbol)
+(solidity_pragma_token
+  "-" @symbol)
+
+(solidity_version_comparison_operator) @operator
 
 ; Literals
+
 [
  (string)
- (hex_string_literal)
- (unicode_string_literal)
  (yul_string_literal)
 ] @string
+
+(hex_string_literal
+  "hex" @symbol
+  (_) @string)
+
+(unicode_string_literal
+  "unicode" @symbol
+  (_) @string)
+
 [
  (number_literal)
  (yul_decimal_number)
  (yul_hex_number)
 ] @number
-[
- (true)
- (false)
-] @constant.builtin
 
+(yul_boolean) @boolean
 
 ; Type
 (type_name (identifier) @type)
-(type_name "mapping" @type)
-(primitive_type) @type
+(type_name "mapping" @function.builtin)
+
+[
+  (primitive_type)
+  (number_unit)
+] @type.builtin
+
 (contract_declaration name: (identifier) @type)
-(struct_declaration struct_name: (identifier) @type)
+(struct_declaration name: (identifier) @type)
 (struct_member name: (identifier) @field)
-(enum_declaration enum_type_name: (identifier) @type)
+(enum_declaration name: (identifier) @type)
 (emit_statement . (identifier) @type)
 ; Handles ContractA, ContractB in function foo() override(ContractA, contractB) {}
-(override_specifier (identifier) @type)
-; Ensures that delimiters in mapping( ... => .. ) are not colored like types
-(type_name
-  "(" @punctuation.bracket
-  "=>" @punctuation.delimiter
-  ")" @punctuation.bracket)
-
+(override_specifier (user_defined_type) @type)
 
 ; Functions and parameters
 
 (function_definition
-  function_name:  (identifier) @function)
+  name:  (identifier) @function)
 (modifier_definition
   name:  (identifier) @function)
 (yul_evm_builtin) @function.builtin
 
 ; Use constructor coloring for special functions
 (constructor_definition "constructor" @constructor)
-(fallback_receive_definition "receive" @constructor)
-(fallback_receive_definition "fallback" @constructor)
 
 (modifier_invocation (identifier) @function)
 
 ; Handles expressions like structVariable.g();
-(call_expression . (member_expression (property_identifier) @method.call))
+(call_expression . (member_expression (identifier) @method.call))
 
 ; Handles expressions like g();
 (call_expression . (identifier) @function.call)
-(function_definition
- function_name: (identifier) @function)
-
-; Handles the field in struct literals like MyStruct({MyField: MyVar * 2})
-(call_expression (identifier) @field . ":")
 
 ; Function parameters
 (event_paramater name: (identifier) @parameter)
@@ -81,100 +83,123 @@
 
 (meta_type_expression "type" @keyword)
 
-(member_expression (property_identifier) @field)
-(property_identifier) @field
-(struct_expression ((identifier) @field . ":"))
+(member_expression property: (identifier) @field)
+(call_struct_argument name: (identifier) @field)
+(struct_field_assignment name: (identifier) @field)
 (enum_value) @constant
 
 
 ; Keywords
 [
- "contract"
- "interface"
- "library"
- "is"
- "struct"
- "enum"
- "event"
- "assembly"
- "emit"
- "modifier"
- "var"
- (virtual)
- (override_specifier)
+  "contract"
+  "interface"
+  "library"
+  "is"
+  "struct"
+  "enum"
+  "event"
+  "assembly"
+  "emit"
+  "override"
+  "modifier"
+  "var"
+  "let"
+  "emit"
+  "fallback"
+  "receive"
+  (virtual)
 ] @keyword
 
+; FIXME: update grammar
+; (block_statement "unchecked" @keyword)
+
+(event_paramater "indexed" @keyword)
+
 [
- "public"
- "internal"
- "private"
- "external"
- "pure"
- "view"
- "payable"
+  "public"
+  "internal"
+  "private"
+  "external"
+  "pure"
+  "view"
+  "payable"
+  (immutable)
 ] @type.qualifier
 
 [
- "memory"
- "storage"
- "calldata"
- (constant)
+  "memory"
+  "storage"
+  "calldata"
+  "constant"
 ] @storageclass
 
 [
- "for"
- "while"
- "do"
+  "for"
+  "while"
+  "do"
+  "break"
+  "continue"
 ] @repeat
 
 [
- "break"
- "continue"
- "if"
- "else"
- "switch"
- "case"
- "default"
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
 ] @conditional
 
+(ternary_expression
+  "?" @conditional.ternary
+  ":" @conditional.ternary)
+
 [
- "try"
- "catch"
+  "try"
+  "catch"
+  "revert"
 ] @exception
 
 [
- "return"
- "returns"
- (yul_leave)
+  "return"
+  "returns"
+  (yul_leave)
 ] @keyword.return
 
 "function" @keyword.function
 
-"pragma" @preproc
-
-["import" "using"] @include
+[
+  "import" 
+  "using"
+] @include
 (import_directive "as" @include)
 (import_directive "from" @include)
-
-(event_paramater "indexed" @keyword)
+(import_directive "*" @character.special)
 
 ; Punctuation
 
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-] @punctuation.bracket
+[ "{" "}" ] @punctuation.bracket
 
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
 
 [
   "."
   ","
+  ; FIXME: update grammar
+  ; (semicolon)
+  "->"
+  "=>"
 ] @punctuation.delimiter
 
+(call_struct_argument
+  ":" @punctuation.delimiter)
+(slice_access
+  ":" @punctuation.delimiter)
+(struct_field_assignment
+  ":" @punctuation.delimiter)
+(yul_label 
+  ":" @punctuation.delimiter)
 
 ; Operators
 
@@ -206,12 +231,27 @@
   "+"
   "++"
   "--"
+  ":="
 ] @operator
 
+(yul_assignment
+  ":" @operator
+  "=" @operator)
+
 [
   "delete"
   "new"
 ] @keyword.operator
 
-(identifier) @variable
-(yul_identifier) @variable
+[
+  (identifier)
+  (yul_identifier)
+] @variable
+
+; Comments
+
+(comment) @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/tests/query/highlights/solidity/test.sol b/tests/query/highlights/solidity/test.sol
index a4b642ee6..062970fdd 100644
--- a/tests/query/highlights/solidity/test.sol
+++ b/tests/query/highlights/solidity/test.sol
@@ -4,13 +4,13 @@
 // ^ comment
 pragma solidity >=0.7.0 <0.9.0;
 // ^ preproc
-//     ^ attribute
+//     ^ preproc
 
 import * as something from "anotherFile";
 // ^     ^            ^ include
 
 /// @title Voting with delegation.
-//  ^ preproc
+// <- comment
 contract Ballot {
 // ^keyword
 //       ^ type
@@ -20,7 +20,7 @@ contract Ballot {
     struct Voter {
 //         ^ type
         uint weight; // weight is accumulated by delegation
-//      ^ type
+//      ^ type.builtin
 //           ^ field
         bool voted;  // if true, that person already voted
         address delegate; // person delegated to
@@ -34,7 +34,7 @@ contract Ballot {
     }
 
     address public chairperson;
-//  ^ type
+//  ^ type.builtin
 
     // This declares a state variable that
     // stores a `Voter` struct for each possible address.

From 68ab44277cd3eca7c5f1d227f153bd4e56d6303f Mon Sep 17 00:00:00 2001
From: SzeLamC <chanszelam7725@gmail.com>
Date: Sat, 25 Feb 2023 05:06:31 +0800
Subject: [PATCH 0002/2704] fix(dart): add `@indent_end` to  } (#4167)

* fix dart indentation after }

* add some simple test case
---
 queries/dart/indents.scm     |  4 ++++
 tests/indent/dart/class.dart |  4 ++++
 tests/indent/dart_spec.lua   | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 tests/indent/dart/class.dart
 create mode 100644 tests/indent/dart_spec.lua

diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index e01cc238d..ad0ba389e 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -21,6 +21,10 @@
   "]"
 ] @branch
 
+[
+ "}"
+] @indent_end
+
 ; this one is for dedenting the else block
 (if_statement (block) @branch)
 
diff --git a/tests/indent/dart/class.dart b/tests/indent/dart/class.dart
new file mode 100644
index 000000000..0402cc677
--- /dev/null
+++ b/tests/indent/dart/class.dart
@@ -0,0 +1,4 @@
+void main() {
+}
+class Test {
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
new file mode 100644
index 000000000..8b05cc753
--- /dev/null
+++ b/tests/indent/dart_spec.lua
@@ -0,0 +1,20 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/dart", {
+  tabstop = 4,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent Lua:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+end)
+
+describe("new line:", function()
+  run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
+end)

From 2ad12932a26a429750b3343199afd60b93c97b72 Mon Sep 17 00:00:00 2001
From: ExpandingMan <ExpandingMan@users.noreply.github.com>
Date: Fri, 24 Feb 2023 16:19:46 -0500
Subject: [PATCH 0003/2704] docs: add small note in README clarifying custom
 parser installation (#3625)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 091a47e90..fdc603100 100644
--- a/README.md
+++ b/README.md
@@ -471,7 +471,7 @@ local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
 parser_config.zimbu = {
   install_info = {
     url = "~/projects/tree-sitter-zimbu", -- local path or git repo
-    files = {"src/parser.c"},
+    files = {"src/parser.c"}, -- note that some parsers also require src/scanner.c or src/scanner.cc
     -- optional entries:
     branch = "main", -- default branch in case of git repo if different from master
     generate_requires_npm = false, -- if stand-alone parser without npm dependencies

From e138c066f7e33464655bd064341483867c43d1fe Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 23 Feb 2023 23:50:55 -0500
Subject: [PATCH 0004/2704] feat(health): sort parser list for clarity

---
 lua/nvim-treesitter/parsers.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index de31f4196..0eec2f116 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1570,12 +1570,14 @@ end
 -- Get a list of all available parsers
 ---@return string[]
 function M.available_parsers()
+  local parsers = vim.tbl_keys(M.list)
+  table.sort(parsers)
   if vim.fn.executable "tree-sitter" == 1 and vim.fn.executable "node" == 1 then
-    return vim.tbl_keys(M.list)
+    return parsers
   else
     return vim.tbl_filter(function(p) ---@param p string
       return not M.list[p].install_info.requires_generate_from_grammar
-    end, vim.tbl_keys(M.list))
+    end, parsers)
   end
 end
 

From 06e8a91ce2aac663023d40cf57965ffade72c792 Mon Sep 17 00:00:00 2001
From: Tomas Sandven <tomas@sandven.email>
Date: Thu, 7 Apr 2022 10:39:46 +0200
Subject: [PATCH 0005/2704] Add YANG indentation tests

---
 tests/indent/yang/module.yang | 58 +++++++++++++++++++++++++++++++++++
 tests/indent/yang_spec.lua    | 23 ++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 tests/indent/yang/module.yang
 create mode 100644 tests/indent/yang_spec.lua

diff --git a/tests/indent/yang/module.yang b/tests/indent/yang/module.yang
new file mode 100644
index 000000000..29c911fa0
--- /dev/null
+++ b/tests/indent/yang/module.yang
@@ -0,0 +1,58 @@
+module test-module {
+  yang-version 1.1;
+  namespace "http://example.com";
+  prefix test;
+
+  import ietf-inet-types { prefix inet; }
+  import tailf-ncs {
+    prefix ncs;
+  }
+
+  description "Multi-line strings has indentation
+               aligned with the first line.";
+
+  typedef foo {
+    type enumeration {
+      enum "foo";
+      enum "bar";
+    }
+  }
+
+  ncs:plan-outline test-nano-service {
+    description "Testing indentation of extension statements.";
+
+    ncs:component-type "ncs:self" {
+      ncs:state "ncs:init" {
+        ncs:create {
+          ncs:nano-callback;
+        }
+      }
+      ncs:state "ncs:ready";
+    }
+
+    ncs:component-type "alloc:resource-allocator" {
+      ncs:state "ncs:init";
+      ncs:state "alloc:resources-allocated";
+      ncs:state "ncs:ready";
+    }
+  }
+
+  container test {
+  }
+
+  augment /alloc:resource-allocator {
+    description "Augmentation for the resource allocator mock services.";
+
+    list test-nano-service {
+      key "id";
+
+      leaf id {
+        type string;
+        description
+          "I'm a multi-line string
+
+           Starting on the next line from the statement.";
+      }
+    }
+  }
+}
diff --git a/tests/indent/yang_spec.lua b/tests/indent/yang_spec.lua
new file mode 100644
index 000000000..c5ff2c886
--- /dev/null
+++ b/tests/indent/yang_spec.lua
@@ -0,0 +1,23 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/yang", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent YANG:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("module.yang", { on_line = 12, text = "# Aligned indentation ended", indent = 2 })
+    run:new_line("module.yang", { on_line = 37, text = "# Test", indent = 2 })
+    run:new_line("module.yang", { on_line = 40, text = "# Test", indent = 4 })
+    run:new_line("module.yang", { on_line = 52, text = "Aligned string!", indent = 4 })
+  end)
+end)

From 061ee1b98f928a928771f35bba5deb6ad74a15b1 Mon Sep 17 00:00:00 2001
From: Tomas Sandven <tomas@sandven.email>
Date: Sat, 17 Dec 2022 22:58:02 +0100
Subject: [PATCH 0006/2704] Fix broken YANG indent tests

---
 tests/indent/yang_spec.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/indent/yang_spec.lua b/tests/indent/yang_spec.lua
index c5ff2c886..618d260c6 100644
--- a/tests/indent/yang_spec.lua
+++ b/tests/indent/yang_spec.lua
@@ -15,9 +15,9 @@ describe("indent YANG:", function()
   end)
 
   describe("new line:", function()
-    run:new_line("module.yang", { on_line = 12, text = "# Aligned indentation ended", indent = 2 })
-    run:new_line("module.yang", { on_line = 37, text = "# Test", indent = 2 })
-    run:new_line("module.yang", { on_line = 40, text = "# Test", indent = 4 })
-    run:new_line("module.yang", { on_line = 52, text = "Aligned string!", indent = 4 })
+    run:new_line("module.yang", { on_line = 12, text = "// Aligned indentation ended", indent = 2 })
+    run:new_line("module.yang", { on_line = 37, text = "// Test", indent = 4 })
+    run:new_line("module.yang", { on_line = 40, text = "// Test", indent = 4 })
+    run:new_line("module.yang", { on_line = 52, text = "Aligned string!", indent = 11 })
   end)
 end)

From 028b7dfbddffdd4738a25a76b280d9b26f38ce42 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 23 Feb 2023 04:42:37 -0500
Subject: [PATCH 0007/2704] feat: add bicep

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/bicep/folds.scm         |  25 ++++
 queries/bicep/highlights.scm    | 230 ++++++++++++++++++++++++++++++++
 queries/bicep/indents.scm       |  18 +++
 queries/bicep/injections.scm    |   4 +
 queries/bicep/locals.scm        |  74 ++++++++++
 8 files changed, 363 insertions(+)
 create mode 100644 queries/bicep/folds.scm
 create mode 100644 queries/bicep/highlights.scm
 create mode 100644 queries/bicep/indents.scm
 create mode 100644 queries/bicep/injections.scm
 create mode 100644 queries/bicep/locals.scm

diff --git a/README.md b/README.md
index fdc603100..7510dfc07 100644
--- a/README.md
+++ b/README.md
@@ -181,6 +181,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bash](https://github.com/tree-sitter/tree-sitter-bash) (maintained by @TravonteD)
 - [x] [beancount](https://github.com/polarmutex/tree-sitter-beancount) (maintained by @polarmutex)
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
+- [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @vigoux)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @Luxed)
diff --git a/lockfile.json b/lockfile.json
index ca9770ad7..4e685055d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -23,6 +23,9 @@
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
   },
+  "bicep": {
+    "revision": "b94a0983b69ebb75e9129329a188199ad6ebcec0"
+  },
   "blueprint": {
     "revision": "6ef91ca8270f0112b9c6d27ecb9966c741a5d103"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0eec2f116..4d7f9baf4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -144,6 +144,14 @@ list.bibtex = {
   maintainers = { "@theHamsta", "@clason" },
 }
 
+list.bicep = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-bicep",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.blueprint = {
   install_info = {
     url = "https://gitlab.com/gabmus/tree-sitter-blueprint.git",
diff --git a/queries/bicep/folds.scm b/queries/bicep/folds.scm
new file mode 100644
index 000000000..8ec5ba200
--- /dev/null
+++ b/queries/bicep/folds.scm
@@ -0,0 +1,25 @@
+[
+  (module_declaration)
+  (metadata_declaration)
+  (output_declaration)
+  (parameter_declaration)
+  (resource_declaration)
+  (type_declaration)
+  (variable_declaration)
+
+  (parenthesized_expression)
+
+  (decorators)
+  (array)
+  (object)
+
+  (if_statement)
+  (for_statement)
+
+  (subscript_expression)
+  (ternary_expression)
+
+  (string)
+
+  (comment)
+] @fold
diff --git a/queries/bicep/highlights.scm b/queries/bicep/highlights.scm
new file mode 100644
index 000000000..07c2c4efa
--- /dev/null
+++ b/queries/bicep/highlights.scm
@@ -0,0 +1,230 @@
+; Includes
+
+(import_statement
+  "import" @include)
+
+(import_with_statement
+  "import" @include
+  "with" @include)
+
+; Namespaces
+
+(module_declaration
+  (identifier) @namespace)
+
+; Builtins
+
+(primitive_type) @type.builtin
+
+((member_expression
+  object: (identifier) @type.builtin)
+  (#match? @type.builtin "^sys$"))
+
+; Functions
+
+(call_expression
+  function: (identifier) @function.call)
+
+; Properties
+
+(object_property
+  (identifier) @property
+  ":" @punctuation.delimiter
+  (_))
+
+(object_property
+  (compatible_identifier) @property
+  ":" @punctuation.delimiter
+  (_))
+
+(property_identifier) @property
+
+; Attributes
+
+(decorator
+  "@" @attribute)
+
+(decorator
+  (call_expression (identifier) @attribute))
+
+(decorator
+  (call_expression
+    (member_expression
+	  object: (identifier) @attribute
+	  property: (property_identifier) @attribute)))
+
+; Types
+
+(type_declaration
+  (identifier) @type)
+
+(type_declaration
+  (identifier)
+  "="
+  (identifier) @type)
+
+(type_declaration
+  (identifier)
+  "="
+  (array_type (identifier) @type))
+
+(type
+  (identifier) @type)
+
+(resource_declaration
+  (identifier) @type)
+
+(resource_expression
+  (identifier) @type)
+
+; Parameters
+
+(parameter_declaration
+  (identifier) @parameter
+  (_))
+
+(call_expression
+  function: (_) 
+  (arguments (identifier) @parameter))
+
+(call_expression
+  function: (_) 
+  (arguments (member_expression object: (identifier) @parameter)))
+
+; Variables
+
+(variable_declaration
+  (identifier) @variable
+  (_))
+
+(metadata_declaration
+  (identifier) @variable
+  (_))
+
+(output_declaration
+  (identifier) @variable
+  (_))
+
+(object_property
+  (_)
+  ":"
+  (identifier) @variable)
+
+(for_statement
+  "for"
+  (for_loop_parameters
+    (loop_variable) @variable
+    (loop_enumerator) @variable))
+
+; Conditionals
+
+"if" @conditional
+
+(ternary_expression
+  "?" @conditional.ternary
+  ":" @conditional.ternary)
+
+; Loops
+
+(for_statement
+  "for" @repeat
+  "in"
+  ":" @punctuation.delimiter)
+
+; Keywords
+
+[
+  "module"
+  "metadata"
+  "output"
+  "param"
+  "resource"
+  "existing"
+  "targetScope"
+  "type"
+  "var"
+] @keyword
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "||"
+  "&&"
+  "|"
+  "=="
+  "!="
+  "=~"
+  "!~"
+  ">"
+  ">="
+  "<="
+  "<"
+  "??"
+  "="
+  "!"
+] @operator
+
+[
+  "in"
+] @keyword.operator
+
+
+; Literals
+
+(string) @string
+(import_string
+  "'" @string
+  (import_name) @namespace
+  "@" @symbol
+  (import_version) @string.special)
+
+(escape_sequence) @string.escape
+
+(number) @number
+
+(boolean) @boolean
+
+(null) @constant.builtin
+
+; Misc
+
+(compatible_identifier
+  "?" @punctuation.special)
+
+(nullable_return_type) @punctuation.special
+
+["{" "}"] @punctuation.bracket
+
+["[" "]"] @punctuation.bracket
+
+["(" ")"] @punctuation.bracket
+
+[
+  "."
+  "::"
+  "=>"
+] @punctuation.delimiter
+
+
+; Interpolation
+
+(interpolation) @none
+
+(interpolation
+  "${" @punctuation.special
+  "}" @punctuation.special)
+
+(interpolation
+  (identifier) @variable)
+
+; Comments
+
+[
+  (comment)
+  (diagnostic_comment)
+] @comment @spell
diff --git a/queries/bicep/indents.scm b/queries/bicep/indents.scm
new file mode 100644
index 000000000..7fcf7ffb9
--- /dev/null
+++ b/queries/bicep/indents.scm
@@ -0,0 +1,18 @@
+[
+  (array)
+  (object)
+] @indent
+
+"}" @indent_end
+
+[ "{" "}" ] @branch
+
+[ "[" "]" ] @branch
+
+[ "(" ")" ] @branch
+
+[
+  (ERROR)
+  (comment)
+  (diagnostic_comment)
+] @auto
diff --git a/queries/bicep/injections.scm b/queries/bicep/injections.scm
new file mode 100644
index 000000000..c85cfe3b6
--- /dev/null
+++ b/queries/bicep/injections.scm
@@ -0,0 +1,4 @@
+[
+ (comment)
+ (diagnostic_comment)
+] @comment
diff --git a/queries/bicep/locals.scm b/queries/bicep/locals.scm
new file mode 100644
index 000000000..361be94fb
--- /dev/null
+++ b/queries/bicep/locals.scm
@@ -0,0 +1,74 @@
+; Scopes
+
+[
+  (infrastructure)
+  (call_expression)
+
+  (lambda_expression)
+  (subscript_expression)
+
+  (if_statement)
+  (for_statement)
+
+  (array)
+  (object)
+  (interpolation)
+] @scope
+
+; References
+
+(property_identifier) @reference
+
+(call_expression
+  (identifier) @reference)
+
+(object_property
+  (_)
+  ":"
+  (identifier) @reference)
+
+(resource_expression
+  (identifier) @reference)
+
+; Definitions
+
+(type) @definition.associated
+
+(object_property
+  (identifier) @definition.field
+  (_))
+
+(object_property
+  (compatible_identifier) @definition.field
+  (_))
+
+(import_name) @definition.import
+
+(module_declaration
+  (identifier) @definition.namespace)
+
+(parameter_declaration
+  (identifier) @definition.parameter
+  (_))
+
+(type_declaration
+  (identifier) @definition.type
+  (_))
+
+(variable_declaration
+  (identifier) @definition.var
+  (_))
+
+(metadata_declaration
+  (identifier) @definition.var
+  (_))
+
+(output_declaration
+  (identifier) @definition.var
+  (_))
+
+(for_statement
+  "for"
+  (for_loop_parameters
+    (loop_variable) @definition.var
+    (loop_enumerator) @definition.var))

From a744ed1b274b586a00dcb39dc0da7ba264758efb Mon Sep 17 00:00:00 2001
From: Stephen Bolton <stephen@bitsonthemind.com>
Date: Sun, 5 Feb 2023 15:56:46 -0500
Subject: [PATCH 0008/2704] Fix elixir `@function` captures

When viewing the previous rule in the `TSPlayground` the `@function`
captures were not actually matching. This led all functions to get the
`@function.call` group applied to them. This change makes it so that the
capture now works and where functions are defined will get the
`@function` group.
---
 queries/elixir/highlights.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index c3aee40c7..d87afcf1b 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -111,9 +111,10 @@
   "defp"
   "defprotocol"
   "defstruct"
-)) (arguments [
-  (identifier) @function
-  (binary_operator left: (identifier) @function operator: "when")])?)
+  ))
+  (arguments [
+    (call (identifier) @function)
+    (binary_operator left: (call target: (identifier) @function) operator: "when")])?)
 
 ; Kernel Keywords & Special Forms
 (call target: ((identifier) @keyword (#any-of? @keyword

From 22de3532cc0a8d8f3bf70962723f5c9a4058852c Mon Sep 17 00:00:00 2001
From: Nat Williams <nat.williams@kin.com>
Date: Thu, 2 Feb 2023 09:31:22 -0600
Subject: [PATCH 0009/2704] also pass the node to the statusline transform fn

---
 lua/nvim-treesitter/ts_utils.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
index 6b330fda4..f0cccc2cc 100644
--- a/lua/nvim-treesitter/ts_utils.lua
+++ b/lua/nvim-treesitter/ts_utils.lua
@@ -51,7 +51,7 @@ function M._get_line_for_node(node, type_patterns, transform_fn, bufnr)
   if not is_valid then
     return ""
   end
-  local line = transform_fn(vim.trim(get_node_text(node, bufnr)[1] or ""))
+  local line = transform_fn(vim.trim(get_node_text(node, bufnr)[1] or ""), node)
   -- Escape % to avoid statusline to evaluate content as expression
   return line:gsub("%%", "%%%%")
 end

From 34adfe8e95d31ba21c274ad11c6e16472ba5ef65 Mon Sep 17 00:00:00 2001
From: Nat Williams <nat.williams@kin.com>
Date: Thu, 2 Feb 2023 09:42:18 -0600
Subject: [PATCH 0010/2704] update docs for transform_fn

to reflect additional node argument
---
 doc/nvim-treesitter.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 61507cb58..f2da04203 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -445,7 +445,7 @@ Default options (lua syntax):
   {
     indicator_size = 100,
     type_patterns = {'class', 'function', 'method'},
-    transform_fn = function(line) return line:gsub('%s*[%[%(%{]*%s*$', '') end,
+    transform_fn = function(line, _node) return line:gsub('%s*[%[%(%{]*%s*$', '') end,
     separator = ' -> '
   }
 <
@@ -453,7 +453,8 @@ Default options (lua syntax):
   the beginning.
 - `type_patterns` - Which node type patterns to match.
 - `transform_fn` - Function used to transform the single item in line. By
-  default removes opening brackets and spaces from end.
+  default removes opening brackets and spaces from end. Takes two arguments:
+  the text of the line in question, and the corresponding treesitter node.
 - `separator` - Separator between nodes.
 
 						  *nvim_treesitter#foldexpr()*

From 3fab7abf6f653eb92eee74c19ce5e655536ced87 Mon Sep 17 00:00:00 2001
From: Nat Williams <nat.williams@kin.com>
Date: Thu, 2 Feb 2023 13:16:44 -0600
Subject: [PATCH 0011/2704] add statusline option to dedupe or not

---
 doc/nvim-treesitter.txt            |  4 +++-
 lua/nvim-treesitter/statusline.lua | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index f2da04203..f8ac369bd 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -446,7 +446,8 @@ Default options (lua syntax):
     indicator_size = 100,
     type_patterns = {'class', 'function', 'method'},
     transform_fn = function(line, _node) return line:gsub('%s*[%[%(%{]*%s*$', '') end,
-    separator = ' -> '
+    separator = ' -> ',
+    dedupe = true
   }
 <
 - `indicator_size` - How long should the string be. If longer, it is cut from
@@ -456,6 +457,7 @@ Default options (lua syntax):
   default removes opening brackets and spaces from end. Takes two arguments:
   the text of the line in question, and the corresponding treesitter node.
 - `separator` - Separator between nodes.
+- `dedupe` - Whether or not to remove duplicate components.
 
 						  *nvim_treesitter#foldexpr()*
 nvim_treesitter#foldexpr()~
diff --git a/lua/nvim-treesitter/statusline.lua b/lua/nvim-treesitter/statusline.lua
index cd75fcb00..fde7def2b 100644
--- a/lua/nvim-treesitter/statusline.lua
+++ b/lua/nvim-treesitter/statusline.lua
@@ -21,6 +21,10 @@ function M.statusline(opts)
   local type_patterns = options.type_patterns or { "class", "function", "method" }
   local transform_fn = options.transform_fn or transform_line
   local separator = options.separator or " -> "
+  local dedupe = options.dedupe
+  if dedupe == nil then
+    dedupe = true
+  end
 
   local current_node = ts_utils.get_node_at_cursor()
   if not current_node then
@@ -32,8 +36,10 @@ function M.statusline(opts)
 
   while expr do
     local line = ts_utils._get_line_for_node(expr, type_patterns, transform_fn, bufnr)
-    if line ~= "" and not vim.tbl_contains(lines, line) then
-      table.insert(lines, 1, line)
+    if line ~= "" then
+      if not dedupe or not vim.tbl_contains(lines, line) then
+        table.insert(lines, 1, line)
+      end
     end
     expr = expr:parent()
   end

From 20a8f30ace9fa9209b1c345311a36e91ab2f6d1d Mon Sep 17 00:00:00 2001
From: Nat Williams <nat.williams@kin.com>
Date: Thu, 2 Feb 2023 13:26:20 -0600
Subject: [PATCH 0012/2704] use positive option "allow_duplicates" instead of
 negative "dedupe"

---
 doc/nvim-treesitter.txt            | 4 ++--
 lua/nvim-treesitter/statusline.lua | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index f8ac369bd..884f334eb 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -447,7 +447,7 @@ Default options (lua syntax):
     type_patterns = {'class', 'function', 'method'},
     transform_fn = function(line, _node) return line:gsub('%s*[%[%(%{]*%s*$', '') end,
     separator = ' -> ',
-    dedupe = true
+    allow_duplicates = false
   }
 <
 - `indicator_size` - How long should the string be. If longer, it is cut from
@@ -457,7 +457,7 @@ Default options (lua syntax):
   default removes opening brackets and spaces from end. Takes two arguments:
   the text of the line in question, and the corresponding treesitter node.
 - `separator` - Separator between nodes.
-- `dedupe` - Whether or not to remove duplicate components.
+- `allow_duplicates` - Whether or not to remove duplicate components.
 
 						  *nvim_treesitter#foldexpr()*
 nvim_treesitter#foldexpr()~
diff --git a/lua/nvim-treesitter/statusline.lua b/lua/nvim-treesitter/statusline.lua
index fde7def2b..68ba41aca 100644
--- a/lua/nvim-treesitter/statusline.lua
+++ b/lua/nvim-treesitter/statusline.lua
@@ -21,10 +21,7 @@ function M.statusline(opts)
   local type_patterns = options.type_patterns or { "class", "function", "method" }
   local transform_fn = options.transform_fn or transform_line
   local separator = options.separator or " -> "
-  local dedupe = options.dedupe
-  if dedupe == nil then
-    dedupe = true
-  end
+  local allow_duplicates = options.allow_duplicates or false
 
   local current_node = ts_utils.get_node_at_cursor()
   if not current_node then
@@ -37,7 +34,7 @@ function M.statusline(opts)
   while expr do
     local line = ts_utils._get_line_for_node(expr, type_patterns, transform_fn, bufnr)
     if line ~= "" then
-      if not dedupe or not vim.tbl_contains(lines, line) then
+      if allow_duplicates or not vim.tbl_contains(lines, line) then
         table.insert(lines, 1, line)
       end
     end

From fe80f7c2bbd216f5a26fe28c91bb335ef9ad8ec2 Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Mon, 20 Feb 2023 18:05:10 +0100
Subject: [PATCH 0013/2704] feat: add ungrammar

---
 README.md                        |  1 +
 lockfile.json                    |  3 +++
 lua/nvim-treesitter/parsers.lua  |  8 ++++++++
 queries/ungrammar/folds.scm      |  1 +
 queries/ungrammar/highlights.scm | 30 ++++++++++++++++++++++++++++++
 queries/ungrammar/indents.scm    |  6 ++++++
 queries/ungrammar/injections.scm |  2 ++
 queries/ungrammar/locals.scm     |  7 +++++++
 8 files changed, 58 insertions(+)
 create mode 100644 queries/ungrammar/folds.scm
 create mode 100644 queries/ungrammar/highlights.scm
 create mode 100644 queries/ungrammar/indents.scm
 create mode 100644 queries/ungrammar/injections.scm
 create mode 100644 queries/ungrammar/locals.scm

diff --git a/README.md b/README.md
index 7510dfc07..74de9992b 100644
--- a/README.md
+++ b/README.md
@@ -325,6 +325,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [turtle](https://github.com/BonaBeavis/tree-sitter-turtle) (maintained by @BonaBeavis)
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
+- [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
 - [x] [v](https://github.com/vlang/vls) (maintained by @kkharji)
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
diff --git a/lockfile.json b/lockfile.json
index 4e685055d..6c6516d4f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -455,6 +455,9 @@
   "typescript": {
     "revision": "5d20856f34315b068c41edaee2ac8a100081d259"
   },
+  "ungrammar": {
+    "revision": "5275e45d1edb16aab4f0d63a3aa15b61ef033a9c"
+  },
   "v": {
     "revision": "136f3a0ad91ab8a781c2d4eb419df0a981839f69"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4d7f9baf4..c570343bd 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1451,6 +1451,14 @@ list.typescript = {
   maintainers = { "@steelsojka" },
 }
 
+list.ungrammar = {
+  install_info = {
+    url = "https://github.com/Philipp-M/tree-sitter-ungrammar",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Philipp-M", "@amaanq" },
+}
+
 list.v = {
   install_info = {
     url = "https://github.com/vlang/vls",
diff --git a/queries/ungrammar/folds.scm b/queries/ungrammar/folds.scm
new file mode 100644
index 000000000..206c4bed8
--- /dev/null
+++ b/queries/ungrammar/folds.scm
@@ -0,0 +1 @@
+(node) @fold
diff --git a/queries/ungrammar/highlights.scm b/queries/ungrammar/highlights.scm
new file mode 100644
index 000000000..027c6e008
--- /dev/null
+++ b/queries/ungrammar/highlights.scm
@@ -0,0 +1,30 @@
+(comment) @comment
+
+(definition) @keyword
+
+(identifier) @variable
+
+(label_name) @label
+
+(token) @string
+
+[
+  "="
+  "|"
+] @operator
+
+[
+  "*"
+  "?"
+] @repeat
+
+[
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+] @punctuation.bracket
+
+(ERROR) @error
diff --git a/queries/ungrammar/indents.scm b/queries/ungrammar/indents.scm
new file mode 100644
index 000000000..d4b7c085d
--- /dev/null
+++ b/queries/ungrammar/indents.scm
@@ -0,0 +1,6 @@
+(node) @indent
+
+[
+  (ERROR)
+  (comment)
+] @auto
diff --git a/queries/ungrammar/injections.scm b/queries/ungrammar/injections.scm
new file mode 100644
index 000000000..35c0af746
--- /dev/null
+++ b/queries/ungrammar/injections.scm
@@ -0,0 +1,2 @@
+(comment) @comment
+
diff --git a/queries/ungrammar/locals.scm b/queries/ungrammar/locals.scm
new file mode 100644
index 000000000..9fd87e637
--- /dev/null
+++ b/queries/ungrammar/locals.scm
@@ -0,0 +1,7 @@
+(grammar) @scope
+
+(definition) @definition
+
+(label_name) @definition.label
+
+(identifier) @reference

From 53695580e38d9ab5f858e8966275f1992bd2e2ec Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 23 Feb 2023 23:19:59 -0500
Subject: [PATCH 0014/2704] feat(dart): add folds

---
 queries/dart/folds.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 queries/dart/folds.scm

diff --git a/queries/dart/folds.scm b/queries/dart/folds.scm
new file mode 100644
index 000000000..ea398a4b3
--- /dev/null
+++ b/queries/dart/folds.scm
@@ -0,0 +1,15 @@
+[
+  (class_definition)
+  (enum_declaration)
+  (extension_declaration)
+
+  (arguments)
+  (function_body)
+
+  (block)
+  (switch_block)
+
+  (list_literal)
+  (set_or_map_literal)
+  (string_literal)
+] @fold

From df968afd9dd444990c0e7844c92aa20603e9ced1 Mon Sep 17 00:00:00 2001
From: Kiyoon Kim <yoonkr33@gmail.com>
Date: Tue, 7 Feb 2023 06:25:27 +0000
Subject: [PATCH 0015/2704] goto_node select last character when in
 operator-pending mode

---
 lua/nvim-treesitter/ts_utils.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
index f0cccc2cc..373bae340 100644
--- a/lua/nvim-treesitter/ts_utils.lua
+++ b/lua/nvim-treesitter/ts_utils.lua
@@ -452,6 +452,14 @@ function M.goto_node(node, goto_end, avoid_set_jump)
   else
     position = { range[3], range[4] }
   end
+
+  -- Enter visual mode if we are in operator pending mode
+  -- If we don't do this, it will miss the last character.
+  local mode = vim.api.nvim_get_mode()
+  if mode.mode == "no" then
+    vim.cmd "normal! v"
+  end
+
   -- Position is 1, 0 indexed.
   api.nvim_win_set_cursor(0, { position[1], position[2] - 1 })
 end

From ad8798795c71a00e796e1919c905a6bf815e9359 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 25 Feb 2023 06:39:20 +0000
Subject: [PATCH 0016/2704] Update parsers: cpon, javascript, perl, tsx,
 typescript

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6c6516d4f..2d4359501 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -57,7 +57,7 @@
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
   },
   "cpon": {
-    "revision": "b894a70f883d2cb7505b87a9d84a189fe8cd1982"
+    "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"
   },
   "cpp": {
     "revision": "66262d3e76eb2046c76e6d661a6b72664bfb5819"
@@ -216,7 +216,7 @@
     "revision": "3c24aa9365985830421a3a7b6791b415961ea770"
   },
   "javascript": {
-    "revision": "266455e22fc54f0add4dd2404ebe307d4d65deae"
+    "revision": "5720b249490b3c17245ba772f6be4a43edb4e3b7"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -309,7 +309,7 @@
     "revision": "9e995404ddff8319631d72d4b46552e737206912"
   },
   "perl": {
-    "revision": "749d26fe13fb131b92e6515416096e572575b981"
+    "revision": "3e4b9cad82a3e7e45390b751528dce581eb092b7"
   },
   "php": {
     "revision": "f860e598194f4a71747f91789bf536b393ad4a56"
@@ -444,7 +444,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "5d20856f34315b068c41edaee2ac8a100081d259"
+    "revision": "c6e56d44c686a67c89e29e773e662567285d610f"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -453,7 +453,7 @@
     "revision": "2457993b13a06dec2706e6a6c3d5b65bb23024b8"
   },
   "typescript": {
-    "revision": "5d20856f34315b068c41edaee2ac8a100081d259"
+    "revision": "c6e56d44c686a67c89e29e773e662567285d610f"
   },
   "ungrammar": {
     "revision": "5275e45d1edb16aab4f0d63a3aa15b61ef033a9c"

From 248a87ef6587b7ccfaaf4b6b405cec50849b0f8c Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:04:04 +0300
Subject: [PATCH 0017/2704] feat(ecma): add innerHTML injection

---
 queries/ecma/injections.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 6bd5da862..a901f34b3 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -67,3 +67,18 @@
 
 (((template_string) @_template_string
  (#match? @_template_string "^`#graphql")) @graphql)
+
+; el.innerHTML = `<html>`
+(assignment_expression
+  left: (member_expression
+          property: (property_identifier) @_prop
+          (#eq? @_prop "innerHTML"))
+  right: (template_string) @html
+    (#offset! @html 0 1 0 -1))
+; el.innerHTML = '<html>'
+(assignment_expression
+   left: (member_expression
+           property: (property_identifier) @_prop
+           (#eq? @_prop "innerHTML"))
+   right: (string) @html
+            (#offset! @html 0 1 0 -1))

From 8d2f9903f11542c3363353a65a8e08adfcca9d29 Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:08:56 +0300
Subject: [PATCH 0018/2704] feat(ecma): include outerHTML and innerHTML

---
 queries/ecma/injections.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index a901f34b3..43596ecb2 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -72,13 +72,14 @@
 (assignment_expression
   left: (member_expression
           property: (property_identifier) @_prop
-          (#eq? @_prop "innerHTML"))
+          (#match? @_prop "(out|inn)erHTML"))
   right: (template_string) @html
     (#offset! @html 0 1 0 -1))
+
 ; el.innerHTML = '<html>'
 (assignment_expression
    left: (member_expression
            property: (property_identifier) @_prop
-           (#eq? @_prop "innerHTML"))
+           (#match? @_prop "(out|inn)erHTML"))
    right: (string) @html
             (#offset! @html 0 1 0 -1))

From 4f8f4fe4c13939093e070da077698796a034fd7f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 26 Feb 2023 00:21:41 +0100
Subject: [PATCH 0019/2704] fix: do not recommend removing bundled parsers

---
 lua/nvim-treesitter/install.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index a82da7885..ba8cada87 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -643,8 +643,7 @@ function M.uninstall(...)
                 vim.notify(
                   "Tried to uninstall parser for "
                     .. lang
-                    .. "! But the parser is still installed (not by nvim-treesitter)."
-                    .. " Please delete the following files manually: "
+                    .. "! But the parser is still installed (not by nvim-treesitter):"
                     .. table.concat(all_parsers_after_deletion, ", "),
                   vim.log.levels.ERROR
                 )

From b4d8b7e5a374b800838a13aa6829ac4d542c6f1c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 26 Feb 2023 06:39:18 +0000
Subject: [PATCH 0020/2704] Update parsers: clojure, latex, perl

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2d4359501..b038fc74e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -42,7 +42,7 @@
     "revision": "3baf22e7e507cedf15d1dbc03df8afa50a625586"
   },
   "clojure": {
-    "revision": "262d6d60f39f0f77b3dd08da8ec895bd5a044416"
+    "revision": "421546c2547c74d1d9a0d8c296c412071d37e7ca"
   },
   "cmake": {
     "revision": "399605a02bcd5daa309ce63a6459c600dce3473f"
@@ -249,7 +249,7 @@
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
   },
   "latex": {
-    "revision": "6b7ea839307670e6bda011f888717d3a882ecc09"
+    "revision": "376f64097b7a26691a2ca60dc94e4dfa417be932"
   },
   "ledger": {
     "revision": "f787ae635ca79589faa25477b94291a87e2d3e23"
@@ -309,7 +309,7 @@
     "revision": "9e995404ddff8319631d72d4b46552e737206912"
   },
   "perl": {
-    "revision": "3e4b9cad82a3e7e45390b751528dce581eb092b7"
+    "revision": "c43bae0090cfcfc62d9904312599ded1b645a66d"
   },
   "php": {
     "revision": "f860e598194f4a71747f91789bf536b393ad4a56"

From 50709361378fa37d455b21fb716169416888314f Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Mon, 17 Oct 2022 21:13:17 +0300
Subject: [PATCH 0021/2704] feat(html): lit attr binding interpolation

---
 queries/html_tags/injections.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 1c8cdf6ab..c29619281 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -63,4 +63,14 @@
    (quoted_attribute_value (attribute_value) @css))
  (#eq? @_attr "style"))
 
+; lit-html style template interpolation
+((attribute
+  (quoted_attribute_value (attribute_value) @javascript))
+  (#match? @javascript "\\$\\{")
+  (#offset! @javascript 0 2 0 -1))
+((attribute
+  (attribute_value) @javascript)
+  (#match? @javascript "\\$\\{")
+  (#offset! @javascript 0 2 0 -2))
+
 (comment) @comment

From a9f0b1c2ba1d70de9189e1ade0e65346ad08849b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 27 Feb 2023 06:41:13 +0000
Subject: [PATCH 0022/2704] Update parsers: c_sharp, fortran, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b038fc74e..a3e3f471e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"
   },
   "c_sharp": {
-    "revision": "3a5de1b38136add719c2e4dfba64359619745ae6"
+    "revision": "fc6be5ae61c8788e0c028e757f132d67bfc538f5"
   },
   "capnp": {
     "revision": "fc6e2addf103861b9b3dffb82c543eb6b71061aa"
@@ -123,7 +123,7 @@
     "revision": "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2"
   },
   "fortran": {
-    "revision": "67cf1c96fd0dd92edd7812a95626c86c9be0781a"
+    "revision": "31552ac43ecaffa443a12ebea68cc526d334892f"
   },
   "fsh": {
     "revision": "fa3347712f7a59ed02ccf508284554689c6cde28"
@@ -414,7 +414,7 @@
     "revision": "52e122ae68b316d3aa960a0a422d3645ba717f42"
   },
   "swift": {
-    "revision": "0c32d2948b79939b6464d9ced40fca43912cd486"
+    "revision": "c249318113629435c75c7eedfd5d5bfcb4b6d12a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From cf718048ca2a43701931ccba445cf17502641d53 Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Mon, 27 Feb 2023 15:26:11 +0000
Subject: [PATCH 0023/2704] simplify cmake highlight queries

---
 queries/cmake/highlights.scm | 138 +----------------------------------
 1 file changed, 2 insertions(+), 136 deletions(-)

diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 0e846507d..b96323420 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -97,143 +97,9 @@
 )
 
 (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)
+  (identifier)
   (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")
+  (#match? @constant "^[A-Z][A-Z_]+$")
 )
 
 (escape_sequence) @string.escape

From a5a6590f157608f2c90c3bb674c2fe019931a020 Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Mon, 27 Feb 2023 15:31:47 +0000
Subject: [PATCH 0024/2704] only match unquoted arguments

---
 queries/cmake/highlights.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index b96323420..576e19cd8 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -91,15 +91,15 @@
 )
 
 (normal_command
-  (identifier) @_function
-  . (argument) @variable
-  (#match? @_function "\\c^set$")
+  (identifier)
+  (argument (unquoted_argument)) @constant
+  (#match? @constant "^[A-Z][A-Z_]+$")
 )
 
 (normal_command
-  (identifier)
-  (argument) @constant
-  (#match? @constant "^[A-Z][A-Z_]+$")
+  (identifier) @_function
+  . (argument) @variable
+  (#match? @_function "\\c^set$")
 )
 
 (escape_sequence) @string.escape

From 28475d5676c478c55ecc293c75b10bcb782467df Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Mon, 27 Feb 2023 16:55:01 +0000
Subject: [PATCH 0025/2704] add highlighting for elseif

---
 queries/cmake/highlights.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 576e19cd8..f528a04dc 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -84,6 +84,18 @@
                               "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"
   )
 )
+(elseif_command
+  (elseif)
+  (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

From 04b87c7b6e9a4cb81e5f21aba689811c8bed85dc Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Mon, 27 Feb 2023 20:21:40 +0100
Subject: [PATCH 0026/2704] move the catch uppercase query to the top to make
 it overridable, add back the more useful queries

---
 queries/cmake/highlights.scm | 77 ++++++++++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 4 deletions(-)

diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index f528a04dc..8a471fd1c 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -1,3 +1,9 @@
+(normal_command
+  (identifier)
+  (argument (unquoted_argument)) @constant
+  (#match? @constant "^[A-Z][A-Z_]+$")
+)
+
 [
  (quoted_argument)
  (bracket_argument)
@@ -103,15 +109,78 @@
 )
 
 (normal_command
-  (identifier)
-  (argument (unquoted_argument)) @constant
-  (#match? @constant "^[A-Z][A-Z_]+$")
+  (identifier) @_function
+  . (argument) @variable
+  (#match? @_function "\\c^set$")
 )
 
 (normal_command
   (identifier) @_function
-  . (argument) @variable
   (#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^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")
 )
 
 (escape_sequence) @string.escape

From b9a7591b6c23c983256d034bedd5f509edc6351d Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Mon, 20 Feb 2023 17:55:06 +0100
Subject: [PATCH 0027/2704] feat: add yuck

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   9 ++
 queries/yuck/folds.scm          |   9 ++
 queries/yuck/highlights.scm     | 209 ++++++++++++++++++++++++++++++++
 queries/yuck/indents.scm        |  25 ++++
 queries/yuck/injections.scm     |   1 +
 queries/yuck/locals.scm         |  21 ++++
 8 files changed, 278 insertions(+)
 create mode 100644 queries/yuck/folds.scm
 create mode 100644 queries/yuck/highlights.scm
 create mode 100644 queries/yuck/indents.scm
 create mode 100644 queries/yuck/injections.scm
 create mode 100644 queries/yuck/locals.scm

diff --git a/README.md b/README.md
index 74de9992b..9ba980f97 100644
--- a/README.md
+++ b/README.md
@@ -336,6 +336,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
 - [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
+- [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)
 - [x] [zig](https://github.com/maxxnino/tree-sitter-zig) (maintained by @maxxnino)
 <!--parserinfo-->
 
diff --git a/lockfile.json b/lockfile.json
index a3e3f471e..410e06557 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -488,6 +488,9 @@
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
+  "yuck": {
+    "revision": "607bf03cc78912cbaa85a3d373af21ddeaef5b41"
+  },
   "zig": {
     "revision": "6b3f5788f38be900b45f5af5a753bf6a37d614b8"
   }
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c570343bd..75efd7fca 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1551,6 +1551,15 @@ list.yang = {
   filetype = "yang",
 }
 
+list.yuck = {
+  install_info = {
+    url = "https://github.com/Philipp-M/tree-sitter-yuck",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@Philipp-M", "@amaanq" },
+  filetype = "yuck",
+}
+
 list.zig = {
   install_info = {
     url = "https://github.com/maxxnino/tree-sitter-zig",
diff --git a/queries/yuck/folds.scm b/queries/yuck/folds.scm
new file mode 100644
index 000000000..bad5a07c9
--- /dev/null
+++ b/queries/yuck/folds.scm
@@ -0,0 +1,9 @@
+[
+  (ast_block)
+  (list)
+  (array)
+  (expr)
+  (json_array)
+  (json_object)
+  (parenthesized_expression)
+] @fold
diff --git a/queries/yuck/highlights.scm b/queries/yuck/highlights.scm
new file mode 100644
index 000000000..8b2ca5814
--- /dev/null
+++ b/queries/yuck/highlights.scm
@@ -0,0 +1,209 @@
+; Tags
+
+(list
+  (symbol) @tag)
+
+; Includes
+
+((symbol) @include
+  (#match? @include "include"))
+
+; Keywords
+
+((symbol) @keyword
+  (#any-of? @keyword "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "for" "geometry" "children" "struts"))
+
+; Functions
+
+(function_call
+  name: (ident) @function.call)
+
+; Variables
+
+(array
+  (symbol) @variable)
+
+(binary_expression
+	(simplexpr
+    (ident) @variable))
+
+(unary_expression
+	(simplexpr
+    (ident) @variable))
+
+(ternary_expression
+	(simplexpr
+		(ident) @variable))
+
+(array
+  (symbol) @variable)
+
+(json_access
+	(simplexpr
+		(ident) @variable))
+
+(json_safe_access
+	(simplexpr
+		(ident) @variable))
+
+(json_array
+	(simplexpr
+    (ident) @variable))
+
+(json_dot_access
+	(simplexpr
+		(ident) @variable))
+
+(json_safe_dot_access
+	(simplexpr
+		(ident) @variable))
+
+(json_object
+  (_)
+  ":"
+	(simplexpr
+		(ident) @variable))
+
+; Properties & Fields
+
+(keyword) @property
+
+(json_access
+  (_)
+  "["
+	(simplexpr
+		(ident) @property))
+
+(json_safe_access
+  (_)
+  "?."
+  "["
+	(simplexpr
+		(ident) @property))
+
+(json_dot_access
+  (index) @property)
+
+(json_safe_dot_access
+  (index) @property)
+
+(json_object
+	(simplexpr
+		(ident) @field))
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+	"&&"
+  "||"
+  "=="
+  "!="
+  "=~"
+	">="
+	"<="
+  ">"
+  "<"
+	"?:"
+	"?."
+  "!"
+] @operator
+
+(ternary_expression
+  ["?" ":"] @conditional.ternary)
+
+; Properties & Fields
+
+(keyword) @property
+
+(json_access
+  (_)
+  "["
+	(simplexpr
+		(ident) @property))
+
+(json_safe_access
+  (_)
+  "?."
+  "["
+	(simplexpr
+		(ident) @property))
+
+(json_dot_access
+  (index) @property)
+
+(json_safe_dot_access
+  (index) @property)
+
+(json_object
+	(simplexpr
+		(ident) @field))
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "||"
+  "&&"
+  "=="
+  "!="
+  "=~"
+  ">"
+  "<"
+  ">="
+  "<="
+  "!"
+  "?."
+] @operator
+
+(ternary_expression
+  ["?" ":"] @conditional.ternary)
+
+; Punctuation
+
+[
+  ":"
+  "."
+  ","
+] @punctuation.delimiter
+
+["{" "}" "[" "]" "(" ")"] @punctuation.bracket
+
+; Literals
+
+(number) @number
+
+(float) @float
+
+(boolean) @boolean
+
+; Strings
+
+[ (string_fragment) "\"" "'" "`" ] @string
+
+(string_interpolation
+  "${" @punctuation.special
+  "}" @punctuation.special)
+
+(escape_sequence) @string.escape
+
+; Comments
+
+(comment) @comment @spell
+
+; Other stuff that has not been catched by the previous queries yet
+
+(ident) @variable
+(index) @property
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/yuck/indents.scm b/queries/yuck/indents.scm
new file mode 100644
index 000000000..b53ba75dd
--- /dev/null
+++ b/queries/yuck/indents.scm
@@ -0,0 +1,25 @@
+[
+  (ast_block)
+  (array)
+  (expr)
+  (json_array)
+  (json_object)
+  (parenthesized_expression)
+] @indent
+
+; TODO: can't get this to work, goal is to indent at the property ":" prefix
+; ((list (identifier) (property)) @aligned_indent
+;   (#set! "delimiter" ":"))
+
+[")" "}" "]"] @indent_end
+
+[ "{" "}" ] @branch
+
+[ "(" ")" ] @branch
+
+[ "[" "]" ] @branch
+
+[
+ (ERROR)
+ (comment)
+] @auto
diff --git a/queries/yuck/injections.scm b/queries/yuck/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/yuck/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/yuck/locals.scm b/queries/yuck/locals.scm
new file mode 100644
index 000000000..677281b0b
--- /dev/null
+++ b/queries/yuck/locals.scm
@@ -0,0 +1,21 @@
+[
+  (ast_block)
+  (list)
+  (array)
+  (expr)
+  (json_array)
+  (json_object)
+  (parenthesized_expression)
+] @scope
+
+(symbol) @reference
+
+(keyword) @definition.field
+
+(json_object
+	(simplexpr
+    (ident) @definition.field))
+
+(ast_block
+  (symbol)
+  (ident) @definition.type)

From e2a9fc8e5c15e1be1b9ce1210d2b2667707d1ae5 Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Tue, 28 Feb 2023 02:11:09 +0100
Subject: [PATCH 0028/2704] use lua-match where possible

---
 queries/cmake/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 8a471fd1c..055319978 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -1,7 +1,7 @@
 (normal_command
   (identifier)
   (argument (unquoted_argument)) @constant
-  (#match? @constant "^[A-Z][A-Z_]+$")
+  (#lua-match? @constant "^%u[%u_]+$")
 )
 
 [
@@ -186,4 +186,4 @@
 (escape_sequence) @string.escape
 
 ((source_file . (line_comment) @preproc)
-  (#match? @preproc "^#!/"))
+  (#lua-match? @preproc "^#!/"))

From 5cfb5d776812296a7b77d0d74d63a5f77df22327 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 25 Feb 2023 19:40:08 -0500
Subject: [PATCH 0029/2704] feat(fortran): update highlight queries

---
 README.md                       |   2 +-
 lua/nvim-treesitter/parsers.lua |   1 +
 queries/fortran/highlights.scm  | 382 ++++++++++++++++++++++----------
 3 files changed, 265 insertions(+), 120 deletions(-)

diff --git a/README.md b/README.md
index 9ba980f97..ce129942b 100644
--- a/README.md
+++ b/README.md
@@ -214,7 +214,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [fennel](https://github.com/travonted/tree-sitter-fennel) (maintained by @TravonteD)
 - [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
 - [x] [foam](https://github.com/FoamScience/tree-sitter-foam) (experimental, maintained by @FoamScience)
-- [ ] [fortran](https://github.com/stadelmanma/tree-sitter-fortran)
+- [x] [fortran](https://github.com/stadelmanma/tree-sitter-fortran) (maintained by @amaanq)
 - [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
 - [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 75efd7fca..fa5795335 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -443,6 +443,7 @@ list.fortran = {
     url = "https://github.com/stadelmanma/tree-sitter-fortran",
     files = { "src/parser.c", "src/scanner.cc" },
   },
+  maintainers = { "@amaanq" },
 }
 
 list.fsh = {
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 95839184a..4604e9a92 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -1,96 +1,224 @@
-(identifier) @variable
-(string_literal) @string
-(number_literal) @number
-(boolean_literal) @boolean
-(comment) @comment
+; Preprocs
+
+(preproc_file_line) @preproc
+
+; Namespaces
+
+(program_statement
+  (name) @namespace)
+
+(end_program_statement
+  (name) @namespace)
+
+(module_statement
+  (name) @namespace)
+
+(end_module_statement
+  (name) @namespace)
+
+(submodule_statement
+  (name) @namespace)
+
+(end_submodule_statement
+  (name) @namespace)
+
+; Includes
 
 [
-  (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"
+  "use"
 ] @include
 
+(import_statement
+  ","
+  ["all" "none"] @keyword)
+
+; Attributes
+
 [
   (none)
   "implicit"
   "intent"
 ] @attribute
 
+(implicit_statement
+  "type" @attribute)
+
+; Keywords
+
 [
+  "attributes"
+  "associate"
+  "block"
+  "class"
+  "classis"
+  "contains"
+  "default"
+  "dimension"
+  "endassociate"
+  "endenum"
+  "endinterface"
+  "endmodule"
+  "endselect"
+  "endsubmodule"
+  "endtype"
+  "enum"
+  "enumerator"
+  "equivalence"
+  "extends"
+  "goto"
+  "interface"
+  "intrinsic"
+  "non_intrinsic"
+  "module"
+  "submodule"
+  "namelist"
+  "parameter"
+  "quiet"
+  "rank"
+  "save"
+  "selectcase"
+  "selectrank"
+  "selecttype"
+  "sequence"
+  "stop"
+  "target"
+  "type"
+  "typeis"
+] @keyword
+
+[
+  (default)
+] @keyword
+
+; Types
+
+[
+  (type_name)
+] @type
+
+[
+  (intrinsic_type)
+] @type.builtin
+
+; Qualifiers
+
+[
+  "abstract"
+  "allocatable"
+  "automatic"
+  "constant"
+  "contiguous"
+  "data"
+  "deferred"
+  "device"
+  "external"
+  "family"
+  "final"
+  "generic"
+  "global"
+  "grid_global"
+  "host"
+  "initial"
+  "local"
+  "local_init"
+  "managed"
+  "nopass"
+  "non_overridable"
+  "optional"
+  "pass"
+  "pinned"
+  "pointer"
+  "private"
+  "property"
+  "protected"
+  "public"
+  "shared"
+  "static"
+  "texture"
+  "value"
+  "volatile"
+  (procedure_qualifier)
+] @type.qualifier
+
+[
+  "common"
+  "in"
+  "inout"
+  "out"
+] @storageclass
+
+; Labels
+
+[
+  (statement_label)
+  (statement_label_reference)
+] @label
+
+[
+  "call"
   "endfunction"
   "endprogram"
+  "endprocedure"
   "endsubroutine"
   "function"
   "procedure"
+  "program"
   "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
+  "result"
+  "return"
+] @keyword.return
 
-"return" @keyword.return
+; Functions
+
+(function_statement
+  (name) @function)
+
+(end_function_statement
+  (name) @function)
+
+(subroutine_statement
+  (name) @function)
+
+(end_subroutine_statement
+  (name) @function)
+
+(module_procedure_statement
+  (name) @function)
+
+(end_module_procedure_statement
+  (name) @function)
+
+(subroutine_call
+  (identifier) @function.call)
+
+[
+  "character"
+  "close"
+  "bind"
+  "format"
+  "open"
+  "print"
+  "read"
+  "write"
+] @function.builtin
+
+; Exceptions
+
+[
+  "error"
+] @exception
+
+; Conditionals
 
 [
   "else"
   "elseif"
+  "elsewhere"
   "endif"
   "endwhere"
   "if"
@@ -98,17 +226,44 @@
   "where"
 ] @conditional
 
-[
-  "do"
-  "enddo"
-  "forall"
-  "while"
-] @repeat
+; Repeats
+
+[
+  "do"
+  "concurrent"
+  "enddo"
+  "endforall"
+  "forall"
+  "while"
+  "continue"
+  "cycle"
+  "exit"
+] @repeat
+
+; Variables
+
+(identifier) @variable
+
+; Parameters
+
+(keyword_argument
+  name: (identifier) @parameter)
+
+(parameters
+  (identifier) @parameter)
+
+; Properties
+
+(derived_type_member_expression
+  (type_member) @property)
+
+; Operators
 
 [
-  "*"
   "+"
   "-"
+  "*"
+  "**"
   "/"
   "="
   "<"
@@ -117,69 +272,58 @@
   ">="
   "=="
   "/="
+  "//"
+  (assumed_rank)
 ] @operator
 
 [
   "\\.and\\."
   "\\.or\\."
-  "\\.lt\\."
-  "\\.gt\\."
-  "\\.ge\\."
-  "\\.le\\."
-  "\\.eq\\."
   "\\.eqv\\."
   "\\.neqv\\."
+  "\\.lt\\."
+  "\\.gt\\."
+  "\\.le\\."
+  "\\.ge\\."
+  "\\.eq\\."
+  "\\.ne\\."
+  "\\.not\\."
 ] @keyword.operator
 
- ;; Brackets
- [
-  "("
-  ")"
-  "["
-  "]"
-  "<<<"
-  ">>>"
- ] @punctuation.bracket
+; Punctuation
 
- ;; Delimiter
- [
-  "::"
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[ "<<<" ">>>" ] @punctuation.bracket
+
+(array_literal
+  ["(/" "/)"] @punctuation.bracket)
+
+[
+  ":"
   ","
+  "/"
   "%"
- ] @punctuation.delimiter
+  "::"
+  "=>"
+] @punctuation.delimiter
 
-(parameters
-  (identifier) @parameter)
+; Literals
 
-(program_statement
-  (name) @namespace)
+(string_literal) @string
 
-(module_statement
-  (name) @namespace)
+(number_literal) @number
 
-(function_statement
-  (name) @function)
+(boolean_literal) @boolean
 
-(subroutine_statement
-  (name) @function)
+(null_literal) @constant.builtin
 
-(end_program_statement
-  (name) @namespace)
+; Comments
 
-(end_module_statement
-  (name) @namespace)
+(comment) @comment @spell
 
-(end_function_statement
-  (name) @function)
+; Errors
 
-(end_subroutine_statement
-  (name) @function)
-
-(subroutine_call
-  (identifier) @function.call)
-
-(keyword_argument
-  name: (identifier) @keyword)
-
-(derived_type_member_expression
-  (type_member) @property)
+(ERROR) @error

From f0617c31f4bb52050f03707ec29c1d2830250dad Mon Sep 17 00:00:00 2001
From: Mitchell Hanberg <mitch@mitchellhanberg.com>
Date: Mon, 27 Feb 2023 23:19:27 -0500
Subject: [PATCH 0030/2704] fix(eex): map eelixir filetype to the eex parser

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fa5795335..b5bdeb820 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -354,7 +354,7 @@ list.eex = {
     files = { "src/parser.c" },
     branch = "main",
   },
-  filetype = "eex",
+  filetype = "eelixir",
   maintainers = { "@connorlay" },
 }
 

From 316200f77d4261ebd4957b29fc6958f988e0964d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 28 Feb 2023 00:16:21 -0500
Subject: [PATCH 0031/2704] feat: add matlab

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +++
 queries/matlab/folds.scm        |  16 +++++
 queries/matlab/highlights.scm   | 107 ++++++++++++++++++++++++++++++++
 queries/matlab/injections.scm   |   1 +
 6 files changed, 136 insertions(+)
 create mode 100644 queries/matlab/folds.scm
 create mode 100644 queries/matlab/highlights.scm
 create mode 100644 queries/matlab/injections.scm

diff --git a/README.md b/README.md
index ce129942b..c677cc261 100644
--- a/README.md
+++ b/README.md
@@ -264,6 +264,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
 - [x] [markdown](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
 - [x] [markdown_inline](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
+- [x] [matlab](https://github.com/mstanciu552/tree-sitter-matlab) (maintained by @amaanq)
 - [x] [menhir](https://github.com/Kerl13/tree-sitter-menhir) (maintained by @Kerl13)
 - [ ] [mermaid](https://github.com/monaqa/tree-sitter-mermaid) (experimental)
 - [x] [meson](https://github.com/Decodetalkers/tree-sitter-meson) (maintained by @Decodetalkers)
diff --git a/lockfile.json b/lockfile.json
index 410e06557..52002c5e8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -272,6 +272,9 @@
   "markdown_inline": {
     "revision": "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"
   },
+  "matlab": {
+    "revision": "2d5d3d5193718a86477d4335aba5b34e79147326"
+  },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b5bdeb820..2719194bc 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -888,6 +888,14 @@ list.markdown_inline = {
   experimental = true,
 }
 
+list.matlab = {
+  install_info = {
+    url = "https://github.com/mstanciu552/tree-sitter-matlab",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.menhir = {
   install_info = {
     url = "https://github.com/Kerl13/tree-sitter-menhir",
diff --git a/queries/matlab/folds.scm b/queries/matlab/folds.scm
new file mode 100644
index 000000000..063a99b5a
--- /dev/null
+++ b/queries/matlab/folds.scm
@@ -0,0 +1,16 @@
+[
+  (function_definition)
+
+  (if_statement)
+
+  (for_statement)
+  (while_statement)
+
+  (switch_statement)
+  (case_statement)
+
+  (otherwise_statement)
+
+  (try_statement)
+  (catch_statement)
+] @fold
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
new file mode 100644
index 000000000..bad9dbdf4
--- /dev/null
+++ b/queries/matlab/highlights.scm
@@ -0,0 +1,107 @@
+; Functions
+
+(function_definition
+  function_name: (identifier) @function
+  (end) @keyword.function)
+
+(parameter_list (identifier) @parameter)
+
+; Keywords
+
+((identifier) @keyword
+  (#eq? @keyword "end"))
+
+(function_keyword) @keyword.function
+
+[
+  "return"
+] @keyword.return
+
+; Conditionals
+
+[
+  "if"
+  "elseif"
+  "else"
+  "switch"
+  "case"
+  "otherwise"
+] @conditional
+
+(if_statement (end) @conditional)
+(switch_statement (end) @conditional)
+
+; Repeats
+
+[
+  "for" 
+  "while"
+  "break"
+  "continue"
+] @repeat
+
+(for_statement (end) @repeat)
+(while_statement (end) @repeat)
+
+; Exceptions
+
+[
+  "try"
+  "catch"
+] @exception
+
+(try_statement (end) @exception)
+
+; Punctuation
+
+[
+  ","
+  ";"
+  ":"
+] @punctuation.delimiter
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+; Operators
+
+[ 
+  ">"
+  "<"
+  "=="
+  "<="
+  ">="
+  "=<"
+  "=>"
+  "~="
+  "*"
+  ".*"
+  "/"
+  "\\"
+  "./"
+  "^"
+  ".^"
+  "+"
+  "="
+  "&&"
+  "||"
+] @operator
+
+; Literals
+
+(number) @number
+
+(string) @string
+
+[ "true" "false" ] @boolean
+
+; Comments
+
+(comment) @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/matlab/injections.scm b/queries/matlab/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/matlab/injections.scm
@@ -0,0 +1 @@
+(comment) @comment

From 418caac89dab5a37ccaf403b3829e4eeb4124d67 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 28 Feb 2023 00:53:13 -0500
Subject: [PATCH 0032/2704] feat(starlark): improve assertion parsing

---
 lockfile.json                   | 2 +-
 queries/starlark/highlights.scm | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 52002c5e8..a87b65752 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -405,7 +405,7 @@
     "revision": "672fe6b5180d20e9e84fd61749cc3e083e88d9d9"
   },
   "starlark": {
-    "revision": "2608deac514242c9e7e5609cbfab59095997b1da"
+    "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"
   },
   "supercollider": {
     "revision": "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0"
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 8ce3d0f77..401b985d7 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -218,7 +218,6 @@
 ] @keyword.function
 
 [
-  "assert"
   "async"
   "await"
   "exec"
@@ -256,6 +255,11 @@
 
 ;; Starlark-specific
 
+;; Assertion calls
+(assert_keyword) @keyword
+
+(assert_builtin) @function.builtin
+
 ;; Struct definitions
 ((call
   function: (identifier) @_func

From 934113c913c773d8b60225c0f570f5f8ce88eb68 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 28 Feb 2023 08:35:10 +0000
Subject: [PATCH 0033/2704] Update parsers: ungrammar

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index a87b65752..e5ba870b7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -459,7 +459,7 @@
     "revision": "c6e56d44c686a67c89e29e773e662567285d610f"
   },
   "ungrammar": {
-    "revision": "5275e45d1edb16aab4f0d63a3aa15b61ef033a9c"
+    "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "v": {
     "revision": "136f3a0ad91ab8a781c2d4eb419df0a981839f69"

From bae59318b3f80e25d8b9c548315a842dc9f5bf88 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 28 Feb 2023 14:11:22 +0000
Subject: [PATCH 0034/2704] Update parsers: markdown, markdown_inline

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e5ba870b7..f3d9d69a8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -267,10 +267,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"
+    "revision": "ca85c6db7088ce98f59e2fbc31b966f5834ea6d7"
   },
   "markdown_inline": {
-    "revision": "7e7aa9a25ca9729db9fe22912f8f47bdb403a979"
+    "revision": "ca85c6db7088ce98f59e2fbc31b966f5834ea6d7"
   },
   "matlab": {
     "revision": "2d5d3d5193718a86477d4335aba5b34e79147326"

From b1b2e9b6d3cb1b18732246a3429686aa2df23ff6 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 28 Feb 2023 18:48:45 +0000
Subject: [PATCH 0035/2704] Update parsers: markdown, markdown_inline, python,
 zig

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f3d9d69a8..f2e36d625 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -267,10 +267,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "ca85c6db7088ce98f59e2fbc31b966f5834ea6d7"
+    "revision": "6138ee0c0d0ddafc4bf0e25728b73f902bbf2c98"
   },
   "markdown_inline": {
-    "revision": "ca85c6db7088ce98f59e2fbc31b966f5834ea6d7"
+    "revision": "6138ee0c0d0ddafc4bf0e25728b73f902bbf2c98"
   },
   "matlab": {
     "revision": "2d5d3d5193718a86477d4335aba5b34e79147326"
@@ -336,7 +336,7 @@
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
   },
   "python": {
-    "revision": "528855eee2665210e1bf5556de48b8d8dacb8932"
+    "revision": "62827156d01c74dc1538266344e788da74536b8a"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -495,6 +495,6 @@
     "revision": "607bf03cc78912cbaa85a3d373af21ddeaef5b41"
   },
   "zig": {
-    "revision": "6b3f5788f38be900b45f5af5a753bf6a37d614b8"
+    "revision": "1cd5f339b146b764f39b36bb7be98ca631a2e02a"
   }
 }

From f95ffd09ed35880c3a46ad2b968df361fa592a76 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 28 Feb 2023 20:14:55 +0100
Subject: [PATCH 0036/2704] python(highlights): adapt query to parser change

---
 queries/python/highlights.scm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 976528c48..b8b8b7b94 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -173,11 +173,7 @@
   (#match? @preproc "^#!/"))
 
 (string) @string
-[
-  (escape_sequence)
-  "{{"
-  "}}"
-] @string.escape
+(escape_sequence) @string.escape
 
 ; doc-strings
 (expression_statement (string) @spell)

From 3fe80dbecdf1fa88cf81a4d7b30ab0714f8c443a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 27 Feb 2023 21:18:00 -0500
Subject: [PATCH 0037/2704] feat: add passwd

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/passwd/highlights.scm   | 16 ++++++++++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 queries/passwd/highlights.scm

diff --git a/README.md b/README.md
index c677cc261..bb93e4d9f 100644
--- a/README.md
+++ b/README.md
@@ -277,6 +277,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) (maintained by @undu)
 - [ ] [org](https://github.com/milisims/tree-sitter-org)
 - [x] [pascal](https://github.com/Isopod/tree-sitter-pascal.git) (maintained by @Isopod)
+- [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
 - [x] [perl](https://github.com/ganezdragon/tree-sitter-perl) (maintained by @lcrownover)
 - [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
 - [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
diff --git a/lockfile.json b/lockfile.json
index f2e36d625..d8736f659 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -311,6 +311,9 @@
   "pascal": {
     "revision": "9e995404ddff8319631d72d4b46552e737206912"
   },
+  "passwd": {
+    "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
+  },
   "perl": {
     "revision": "c43bae0090cfcfc62d9904312599ded1b645a66d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2719194bc..2c8956f67 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1003,6 +1003,14 @@ list.pascal = {
   maintainers = { "@Isopod" },
 }
 
+list.passwd = {
+  install_info = {
+    url = "https://github.com/ath3/tree-sitter-passwd",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.perl = {
   install_info = {
     url = "https://github.com/ganezdragon/tree-sitter-perl",
diff --git a/queries/passwd/highlights.scm b/queries/passwd/highlights.scm
new file mode 100644
index 000000000..3e078a123
--- /dev/null
+++ b/queries/passwd/highlights.scm
@@ -0,0 +1,16 @@
+(user) @namespace
+
+(auth) @symbol
+
+(gecos) @string
+
+(home) @text.uri @constant
+
+(shell) @text.uri @string.special
+
+[
+  (gid)
+  (uid)
+] @number
+
+(separator) @punctuation.delimiter

From ba4ecfe471e0ee1e8a7b0710ce6f74acf0946609 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 1 Mar 2023 01:23:52 -0500
Subject: [PATCH 0038/2704] feat: add qmldir

---
 README.md                     |  1 +
 lockfile.json                 |  3 +++
 queries/qmldir/highlights.scm | 24 ++++++++++++++++++++++++
 queries/qmldir/injections.scm |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 queries/qmldir/highlights.scm
 create mode 100644 queries/qmldir/injections.scm

diff --git a/README.md b/README.md
index bb93e4d9f..558927a50 100644
--- a/README.md
+++ b/README.md
@@ -288,6 +288,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
 - [x] [python](https://github.com/tree-sitter/tree-sitter-python) (maintained by @stsewd, @theHamsta)
 - [x] [ql](https://github.com/tree-sitter/tree-sitter-ql) (maintained by @pwntester)
+- [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
 - [x] [qmljs](https://github.com/yuja/tree-sitter-qmljs) (maintained by @Decodetalkers)
 - [x] [Tree-sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
diff --git a/lockfile.json b/lockfile.json
index d8736f659..41616f172 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -344,6 +344,9 @@
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
   },
+  "qmldir": {
+    "revision": "ce42c9abb9b86a563f117d733b3bc0dd7e2e6e76"
+  },
   "qmljs": {
     "revision": "ab75be9750e6f2f804638824d1790034286a830c"
   },
diff --git a/queries/qmldir/highlights.scm b/queries/qmldir/highlights.scm
new file mode 100644
index 000000000..1fd174708
--- /dev/null
+++ b/queries/qmldir/highlights.scm
@@ -0,0 +1,24 @@
+; Preproc
+
+(command (identifier) @preproc)
+
+; Keywords
+
+(keyword) @keyword
+
+; Literals
+
+(number) @number
+
+(float) @float
+
+; Variables
+
+[
+  (identifier)
+  (unit)
+] @variable
+
+; Comments
+
+(comment) @comment @spell
diff --git a/queries/qmldir/injections.scm b/queries/qmldir/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/qmldir/injections.scm
@@ -0,0 +1 @@
+(comment) @comment

From d80c99cab0a05ad4263783a59ad2286892c14fa0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 1 Mar 2023 02:42:30 -0500
Subject: [PATCH 0039/2704] fix(qmldir): add to parsers.lua

---
 lua/nvim-treesitter/parsers.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2c8956f67..a06c1baea 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1104,6 +1104,14 @@ list.ql = {
   maintainers = { "@pwntester" },
 }
 
+list.qmldir = {
+  install_info = {
+    url = "https://github.com/Decodetalkers/tree-sitter-qmldir",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.qmljs = {
   install_info = {
     url = "https://github.com/yuja/tree-sitter-qmljs",

From 5b9339f6f48acd7482a24884807c608fef401249 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 28 Feb 2023 00:14:08 -0500
Subject: [PATCH 0040/2704] feat: add PO

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/po/folds.scm            |  9 +++++++++
 queries/po/highlights.scm       | 33 +++++++++++++++++++++++++++++++++
 queries/po/injections.scm       |  1 +
 6 files changed, 55 insertions(+)
 create mode 100644 queries/po/folds.scm
 create mode 100644 queries/po/highlights.scm
 create mode 100644 queries/po/injections.scm

diff --git a/README.md b/README.md
index 558927a50..45edb3612 100644
--- a/README.md
+++ b/README.md
@@ -282,6 +282,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
 - [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
 - [x] [pioasm](https://github.com/leo60228/tree-sitter-pioasm) (maintained by @leo60228)
+- [x] [po](https://github.com/erasin/tree-sitter-po) (maintained by @amaanq)
 - [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [proto](https://github.com/mitchellh/tree-sitter-proto) (maintained by @fsouza)
diff --git a/lockfile.json b/lockfile.json
index 41616f172..375ea2ab2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -326,6 +326,9 @@
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
   },
+  "po": {
+    "revision": "d6aed225290bc71a15ab6f06305cb11419360c56"
+  },
   "poe_filter": {
     "revision": "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a06c1baea..743f0f3e5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1048,6 +1048,14 @@ list.pioasm = {
   maintainers = { "@leo60228" },
 }
 
+list.po = {
+  install_info = {
+    url = "https://github.com/erasin/tree-sitter-po",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.poe_filter = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-poe-filter",
diff --git a/queries/po/folds.scm b/queries/po/folds.scm
new file mode 100644
index 000000000..589696477
--- /dev/null
+++ b/queries/po/folds.scm
@@ -0,0 +1,9 @@
+[
+  (msgctxt)
+  (msgid)
+  (msgid_plural)
+  (msgstr)
+  (msgstr_plural)
+
+  (message)
+] @fold
diff --git a/queries/po/highlights.scm b/queries/po/highlights.scm
new file mode 100644
index 000000000..bddeb5ba9
--- /dev/null
+++ b/queries/po/highlights.scm
@@ -0,0 +1,33 @@
+; Keywords
+
+[
+  "msgctxt"
+  "msgid"
+  "msgid_plural"
+  "msgstr"
+  "msgstr_plural"
+] @keyword
+
+; Punctuation
+
+[ "[" "]" ] @punctuation.bracket
+
+; Literals
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+(number) @number
+
+; Comments
+
+(comment) @comment @spell
+
+(comment (reference (text) @string.special.path))
+
+(comment (flag (text) @preproc))
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/po/injections.scm b/queries/po/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/po/injections.scm
@@ -0,0 +1 @@
+(comment) @comment

From 75d98eaac424661812cc18de11f3d8037be8e8f4 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 28 Feb 2023 20:26:51 -0500
Subject: [PATCH 0041/2704] feat(kdl): update parser & queries fixing the
 comment bug

---
 lockfile.json              | 2 +-
 queries/kdl/highlights.scm | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 375ea2ab2..3c6888222 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -240,7 +240,7 @@
     "revision": "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"
   },
   "kdl": {
-    "revision": "c3c4856464842e05366b1f3ebc4434c9194cad43"
+    "revision": "e36f054a60c4d9e5ae29567d439fdb8790b53b30"
   },
   "kotlin": {
     "revision": "e4637037a5fe6f25fe66c305669faa0855f35692"
diff --git a/queries/kdl/highlights.scm b/queries/kdl/highlights.scm
index 35da6ec63..d903128a8 100644
--- a/queries/kdl/highlights.scm
+++ b/queries/kdl/highlights.scm
@@ -31,18 +31,21 @@
 
 (number (decimal) @float)
 (number (exponent) @float)
-(number (decimal) (exponent) @float)
 
 (boolean) @boolean
 
-; Misc
-
 "null" @constant.builtin
 
+; Punctuation
+
 ["{" "}"] @punctuation.bracket
 
 ["(" ")"] @punctuation.bracket
 
+[
+  ";"
+] @punctuation.delimiter
+
 ; Comments
 
 [

From 9dd1b9c09707bf1cdd565b999c79ac6461602591 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 1 Mar 2023 06:42:40 +0000
Subject: [PATCH 0042/2704] Update parsers: gdscript, kdl, meson, yuck

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3c6888222..ee0f5de10 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gdscript": {
-    "revision": "31ebb7cd0b880ea53a152eaf9d4df73f737181cc"
+    "revision": "a4b57cc3bcbfc24550e858159647e9238e7ad1ac"
   },
   "git_rebase": {
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
@@ -282,7 +282,7 @@
     "revision": "d787c66276e7e95899230539f556e8b83ee16f6d"
   },
   "meson": {
-    "revision": "5f3138d555aceef976ec9a1d4a3f78e13b31e45f"
+    "revision": "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"
   },
   "nickel": {
     "revision": "d6c7eeb751038f934b5b1aa7ff236376d0235c56"
@@ -501,7 +501,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "607bf03cc78912cbaa85a3d373af21ddeaef5b41"
+    "revision": "1e1a7e10053b910f3864fe8d97ca1741d2df66b2"
   },
   "zig": {
     "revision": "1cd5f339b146b764f39b36bb7be98ca631a2e02a"

From 0572657d4dba9b5c1108adfd4ecacc52a04917b5 Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Wed, 1 Mar 2023 21:21:11 +0100
Subject: [PATCH 0043/2704] feat: add prql (#4393)

* feat: add prql

* highlights(prql): null as constant.builtin

* highlights(prql): add missing kwd, update queries

* highlights(prql): remove redundant queries

* highlights(prql): make `->` a delimiter

* highlights(prql): instructions to `@method.call`
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |  10 +++
 queries/prql/highlights.scm     | 141 ++++++++++++++++++++++++++++++++
 queries/prql/injections.scm     |  13 +++
 5 files changed, 168 insertions(+)
 create mode 100644 queries/prql/highlights.scm
 create mode 100644 queries/prql/injections.scm

diff --git a/README.md b/README.md
index 45edb3612..666d264b6 100644
--- a/README.md
+++ b/README.md
@@ -286,6 +286,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [proto](https://github.com/mitchellh/tree-sitter-proto) (maintained by @fsouza)
+- [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
 - [x] [python](https://github.com/tree-sitter/tree-sitter-python) (maintained by @stsewd, @theHamsta)
 - [x] [ql](https://github.com/tree-sitter/tree-sitter-ql) (maintained by @pwntester)
diff --git a/lockfile.json b/lockfile.json
index ee0f5de10..437e104a3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -338,6 +338,9 @@
   "proto": {
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
+  "prql": {
+    "revision": "3f27cac466f030ee7d985d91eba5470e01dd21ea"
+  },
   "pug": {
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 743f0f3e5..d0b933779 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1086,6 +1086,16 @@ list.proto = {
   filetype = "proto",
 }
 
+list.prql = {
+  install_info = {
+    url = "https://github.com/PRQL/tree-sitter-prql",
+    branch = "main",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@matthias-Q" },
+  filetype = "prql",
+}
+
 list.pug = {
   install_info = {
     url = "https://github.com/zealot128/tree-sitter-pug",
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
new file mode 100644
index 000000000..3810bdda4
--- /dev/null
+++ b/queries/prql/highlights.scm
@@ -0,0 +1,141 @@
+[
+  (keyword_from)
+  (keyword_filter)
+  (keyword_derive)
+  (keyword_group)
+  (keyword_aggregate)
+  (keyword_sort)
+  (keyword_take)
+  (keyword_window)
+  (keyword_join)
+  (keyword_select)
+  (keyword_switch)
+  (keyword_append)
+  (keyword_remove)
+  (keyword_intersect)
+  (keyword_rolling)
+  (keyword_rows)
+  (keyword_expanding)
+  (keyword_let)
+  (keyword_prql)
+  (keyword_from_text)
+] @keyword
+
+[
+ (literal)
+ (f_string)
+ (s_string)
+] @string
+
+(assignment
+  alias: (field) @field)
+
+alias: (identifier) @field
+
+
+
+(comment) @comment @spell
+
+(keyword_func) @keyword.function
+
+(function_call
+  (identifier) @function.call)
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "="
+  "=="
+  "<"
+  "<="
+  "!="
+  ">="
+  ">"
+  (bang)
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ","
+  "."
+  (pipe)
+  "->"
+] @punctuation.delimiter
+
+(integer) @number
+
+(decimal_number) @float
+
+[
+  (keyword_min)
+  (keyword_max)
+  (keyword_count)
+  (keyword_count_distinct)
+  (keyword_average)
+  (keyword_avg)
+  (keyword_sum)
+  (keyword_stddev)
+  (keyword_count)
+] @function
+
+[
+ (keyword_side)
+ (keyword_format)
+] @attribute
+
+[
+ (keyword_version)
+ (keyword_target)
+] @type.qualifier
+
+(target) @function.builtin
+
+ [
+  (date)
+  (time)
+  (timestamp)
+] @string.special
+
+[
+  (keyword_left)
+  (keyword_inner)
+  (keyword_right)
+  (keyword_full)
+  (keyword_csv)
+  (keyword_json)
+] @method.call
+
+[
+  (keyword_true)
+  (keyword_false)
+] @boolean
+
+[
+ (keyword_and)
+ (keyword_or)
+ (keyword_in)
+] @keyword.operator
+
+(function_definition
+  (keyword_func)
+  name: (identifier) @function)
+
+(parameter
+  (identifier) @parameter)
+
+(variable
+  (keyword_let)
+  name: (identifier) @constant)
+
+
+ (keyword_null) @constant.builtin
+
+
diff --git a/queries/prql/injections.scm b/queries/prql/injections.scm
new file mode 100644
index 000000000..a6d4ccb12
--- /dev/null
+++ b/queries/prql/injections.scm
@@ -0,0 +1,13 @@
+(
+ (s_string) @sql
+ (#offset! @sql 0 2 0 -1)
+)
+
+(from_text
+  (keyword_from_text)
+  (keyword_json)
+  (literal) @json
+  (#offset! @json 0 3 0 -3)
+)
+
+(comment) @comment

From 252c1011c4bae91d25a8c54be4ed1a7b341c088c Mon Sep 17 00:00:00 2001
From: Yochem van Rosmalen <yochem+git@icloud.com>
Date: Wed, 1 Mar 2023 14:26:52 +0100
Subject: [PATCH 0044/2704] comment(highlights): add `@nospell` to tags and
 user mentions

---
 queries/comment/highlights.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 6466a4783..15adf45ab 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -1,39 +1,39 @@
 (_) @spell
 
 ((tag
-  (name) @text.todo
+  (name) @text.todo @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
   (#eq? @text.todo "TODO"))
 
-("text" @text.todo
+("text" @text.todo @nospell
  (#eq? @text.todo "TODO"))
 
 ((tag
-  (name) @text.note
+  (name) @text.note @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
   (#any-of? @text.note "NOTE" "XXX"))
 
-("text" @text.note
+("text" @text.note @nospell
  (#any-of? @text.note "NOTE" "XXX"))
 
 ((tag
-  (name) @text.warning
+  (name) @text.warning @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
   (#any-of? @text.warning "HACK" "WARNING"))
 
-("text" @text.warning
+("text" @text.warning @nospell
  (#any-of? @text.warning "HACK" "WARNING"))
 
 ((tag
-  (name) @text.danger
+  (name) @text.danger @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
   (#any-of? @text.danger "FIXME" "BUG"))
 
-("text" @text.danger
+("text" @text.danger @nospell
  (#any-of? @text.danger "FIXME" "BUG"))
 
 ; Issue number (#123)
@@ -41,5 +41,5 @@
  (#lua-match? @number "^#[0-9]+$"))
 
 ; User mention (@user)
-("text" @constant
+("text" @constant @nospell
  (#lua-match? @constant "^[@][a-zA-Z0-9_-]+$"))

From b1450214993582d54b2fd7e0fe6b556710cae606 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Thu, 2 Mar 2023 13:47:00 +0900
Subject: [PATCH 0045/2704] fix: remove wrong/pointless tostring

---
 lua/nvim-treesitter/caching.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lua/nvim-treesitter/caching.lua b/lua/nvim-treesitter/caching.lua
index 810d3a408..7733202ed 100644
--- a/lua/nvim-treesitter/caching.lua
+++ b/lua/nvim-treesitter/caching.lua
@@ -8,7 +8,7 @@ local M = {}
 function M.create_buffer_cache()
   local cache = {}
 
-  ---@type table<string, table<string, any>>
+  ---@type table<integer, table<string, any>>
   local items = setmetatable({}, {
     __index = function(tbl, key)
       rawset(tbl, key, {})
@@ -16,7 +16,7 @@ function M.create_buffer_cache()
     end,
   })
 
-  ---@type table<integer|string, boolean>
+  ---@type table<integer, boolean>
   local loaded_buffers = {}
 
   ---@param type_name string
@@ -30,21 +30,21 @@ function M.create_buffer_cache()
       api.nvim_buf_attach(bufnr, false, {
         on_detach = function()
           cache.clear_buffer(bufnr)
-          loaded_buffers[tostring(bufnr)] = nil
+          loaded_buffers[bufnr] = nil
           return true
         end,
         on_reload = function() end, -- this is needed to prevent on_detach being called on buffer reload
       })
     end
 
-    items[tostring(bufnr)][type_name] = value
+    items[bufnr][type_name] = value
   end
 
   ---@param type_name string
   ---@param bufnr integer
   ---@return any
   function cache.get(type_name, bufnr)
-    return items[tostring(bufnr)][type_name]
+    return items[bufnr][type_name]
   end
 
   ---@param type_name string
@@ -57,12 +57,12 @@ function M.create_buffer_cache()
   ---@param type_name string
   ---@param bufnr integer
   function cache.remove(type_name, bufnr)
-    items[tostring(bufnr)][type_name] = nil
+    items[bufnr][type_name] = nil
   end
 
   ---@param bufnr integer
   function cache.clear_buffer(bufnr)
-    items[tostring(bufnr)] = nil
+    items[bufnr] = nil
   end
 
   return cache

From 36b1038a65f250e93c88496350ab9f03ad00fa8a Mon Sep 17 00:00:00 2001
From: Preston Knopp <prestonknopp@gmail.com>
Date: Wed, 1 Mar 2023 23:28:13 -0800
Subject: [PATCH 0046/2704] Update gdscript queries (#4405)

* locals(gdscript): update locals

* folds(gdscript): add folds

* indents(gdscript): update indents with notes

* highlights(gdscript): update highlights

* docs(gdscript): add gdscript maintainer

* indents(gdscript): add ERROR auto indent

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

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

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

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

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

---------

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 lua/nvim-treesitter/parsers.lua |   1 +
 queries/gdscript/folds.scm      |  25 ++++
 queries/gdscript/highlights.scm | 249 +++++++++++++++++++++++++++++---
 queries/gdscript/indents.scm    |  80 ++++++++--
 queries/gdscript/locals.scm     |  92 +++++++++++-
 5 files changed, 412 insertions(+), 35 deletions(-)
 create mode 100644 queries/gdscript/folds.scm

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

From 6d96e2b6ace02db0bedc60ff268f2da7877895e0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 2 Mar 2023 06:41:32 +0000
Subject: [PATCH 0047/2704] Update parsers: erlang, haskell, qmldir, sql, v

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 437e104a3..91366890b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -111,7 +111,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "2422bc9373094bfa97653ac540e08759f812523c"
+    "revision": "9fe5cdfab0f0d753112e9949a3501f64b75a3d92"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -180,7 +180,7 @@
     "revision": "b7bd6928532ada34dddb1dece4a158ab62c6e783"
   },
   "haskell": {
-    "revision": "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3"
+    "revision": "0da7f826e85b3e589e217adf69a6fd89ee4301b9"
   },
   "hcl": {
     "revision": "0ff887f2a60a147452d52db060de6b42f42f1441"
@@ -351,7 +351,7 @@
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
   },
   "qmldir": {
-    "revision": "ce42c9abb9b86a563f117d733b3bc0dd7e2e6e76"
+    "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
     "revision": "ab75be9750e6f2f804638824d1790034286a830c"
@@ -414,7 +414,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "672fe6b5180d20e9e84fd61749cc3e083e88d9d9"
+    "revision": "d4b8be1e52b07b66e5ec62d2f1c0d701dfa85ed9"
   },
   "starlark": {
     "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"
@@ -474,7 +474,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "v": {
-    "revision": "136f3a0ad91ab8a781c2d4eb419df0a981839f69"
+    "revision": "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From b31312729e1b779e2773d99bf83355b09b5ba3d3 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Thu, 2 Mar 2023 07:28:32 +0000
Subject: [PATCH 0048/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 666d264b6..90bebb570 100644
--- a/README.md
+++ b/README.md
@@ -218,7 +218,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
 - [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
-- [ ] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript)
+- [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
 - [x] [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) (maintained by @gbprod)
 - [x] [gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) (maintained by @ObserverOfTime)
 - [x] [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) (maintained by @gbprod)

From 07fb134752b4af49d1a87cc735573edeadcbb271 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 2 Mar 2023 17:53:56 +0100
Subject: [PATCH 0049/2704] markdown!: switch to scanner.c

---
 lockfile.json                   | 4 ++--
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 91366890b..44d7d437a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -267,10 +267,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "6138ee0c0d0ddafc4bf0e25728b73f902bbf2c98"
+    "revision": "afbb3195c9c1683e358eb36805c0088ffbb2306c"
   },
   "markdown_inline": {
-    "revision": "6138ee0c0d0ddafc4bf0e25728b73f902bbf2c98"
+    "revision": "afbb3195c9c1683e358eb36805c0088ffbb2306c"
   },
   "matlab": {
     "revision": "2d5d3d5193718a86477d4335aba5b34e79147326"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a600e2de0..249a1b00a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -869,7 +869,7 @@ list.markdown = {
   install_info = {
     url = "https://github.com/MDeiml/tree-sitter-markdown",
     location = "tree-sitter-markdown",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     branch = "split_parser",
     readme_name = "markdown (basic highlighting)",
   },
@@ -881,7 +881,7 @@ list.markdown_inline = {
   install_info = {
     url = "https://github.com/MDeiml/tree-sitter-markdown",
     location = "tree-sitter-markdown-inline",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     branch = "split_parser",
     readme_name = "markdown_inline (needs to be installed for full markdown highlighting)",
   },

From e9fb90da020d08bda2a616324a64921fde3236f6 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Thu, 2 Mar 2023 18:41:33 +0100
Subject: [PATCH 0050/2704] feat(prql): update queries

---
 lockfile.json               |  2 +-
 queries/prql/highlights.scm | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 44d7d437a..6b1281d85 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -339,7 +339,7 @@
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
   "prql": {
-    "revision": "3f27cac466f030ee7d985d91eba5470e01dd21ea"
+    "revision": "5f6c4e4a90633b19e2077c1d37248989789d64be"
   },
   "pug": {
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 3810bdda4..a69259a0a 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -22,7 +22,7 @@
 ] @keyword
 
 [
- (literal)
+ (literal_string)
  (f_string)
  (s_string)
 ] @string
@@ -84,6 +84,15 @@ alias: (identifier) @field
   (keyword_sum)
   (keyword_stddev)
   (keyword_count)
+  (keyword_lag)
+  (keyword_lead)
+  (keyword_first)
+  (keyword_last)
+  (keyword_rank)
+  (keyword_row_number)
+  (keyword_round)
+  (keyword_all)
+  (keyword_map)
 ] @function
 
 [

From 8894d78f63a589b7fca609e42d682e32067b2448 Mon Sep 17 00:00:00 2001
From: Anthony Shi <69449791+anthony-S93@users.noreply.github.com>
Date: Fri, 3 Mar 2023 11:37:21 +0800
Subject: [PATCH 0051/2704] Update highlights.scm for Python

Added new keywords "is not" and "not in"
---
 queries/python/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index b8b8b7b94..54ad82b09 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -227,6 +227,8 @@
   "is"
   "not"
   "or"
+  "is not"
+  "not in"
 
   "del"
 ] @keyword.operator

From a0d6c28f893cbbc761cfa7fc7204ba6f3e2710cf Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 3 Mar 2023 06:40:53 +0000
Subject: [PATCH 0052/2704] Update parsers: cpp, cuda, markdown,
 markdown_inline, racket, sql

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6b1281d85..4720e882c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -60,13 +60,13 @@
     "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"
   },
   "cpp": {
-    "revision": "66262d3e76eb2046c76e6d661a6b72664bfb5819"
+    "revision": "03fa93db133d6048a77d4de154a7b17ea8b9d076"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "9b1f7481a151686fce8af66da147f40388f8ee4d"
+    "revision": "91c3ca3e42326e0f7b83c82765940bbf7f91c847"
   },
   "d": {
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
@@ -267,10 +267,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "afbb3195c9c1683e358eb36805c0088ffbb2306c"
+    "revision": "10b9b5ad8742456b383908868b14709d73ff81f4"
   },
   "markdown_inline": {
-    "revision": "afbb3195c9c1683e358eb36805c0088ffbb2306c"
+    "revision": "10b9b5ad8742456b383908868b14709d73ff81f4"
   },
   "matlab": {
     "revision": "2d5d3d5193718a86477d4335aba5b34e79147326"
@@ -363,7 +363,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "1a5df0206b25a05cb1b35a68d2105fc7493df39b"
+    "revision": "c2f7baa22053a66b4dba852cdba3f14f34bb6985"
   },
   "rasi": {
     "revision": "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b"
@@ -414,7 +414,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "d4b8be1e52b07b66e5ec62d2f1c0d701dfa85ed9"
+    "revision": "ee50e2e8c3df92bd66093aefa1834b2735355b9b"
   },
   "starlark": {
     "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"

From 8212548e3346aa56166a0831016026f265562e4a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Mar 2023 15:49:25 +0100
Subject: [PATCH 0053/2704] docs(readme): recommend installing query parser

now bundled in Neovim
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 90bebb570..f97bcd5bb 100644
--- a/README.md
+++ b/README.md
@@ -105,8 +105,8 @@ All modules are disabled by default and need to be activated explicitly in your
 
 ```lua
 require'nvim-treesitter.configs'.setup {
-  -- A list of parser names, or "all" (the four listed parsers should always be installed)
-  ensure_installed = { "c", "lua", "vim", "help" },
+  -- A list of parser names, or "all" (the five listed parsers should always be installed)
+  ensure_installed = { "c", "lua", "vim", "help", "query" },
 
   -- Install parsers synchronously (only applied to `ensure_installed`)
   sync_install = false,

From 1bf4be044138cc9b3f802d77a9d5c2b5dd9be61d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 Feb 2023 05:37:39 -0500
Subject: [PATCH 0054/2704] docs: add `@keyword.coroutine`

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 219555a8a..f954bff1d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -140,6 +140,7 @@ effect on highlighting. We will work on improving highlighting in the near futur
 
 ```scheme
 @keyword             ; various keywords
+@keyword.coroutine   ; keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)
 @keyword.function    ; keywords that define a function (e.g. `func` in Go, `def` in Python)
 @keyword.operator    ; operators that are English words (e.g. `and` / `or`)
 @keyword.return      ; keywords like `return` and `yield`

From 33ba346e60c3151fcdafc55d0e547556dc803c03 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 Feb 2023 06:37:45 -0500
Subject: [PATCH 0055/2704] feat!: add `@keyword.coroutine` capture

---
 queries/c_sharp/highlights.scm  |  7 ++-
 queries/clojure/highlights.scm  | 14 +++---
 queries/cpp/highlights.scm      | 15 ++++---
 queries/dart/highlights.scm     | 13 +++---
 queries/ecma/highlights.scm     | 79 +++++++++++++++++----------------
 queries/gdscript/highlights.scm |  9 ++--
 queries/hack/highlights.scm     |  7 ++-
 queries/kotlin/highlights.scm   |  8 +++-
 queries/python/highlights.scm   |  7 ++-
 queries/rust/highlights.scm     |  7 ++-
 queries/starlark/highlights.scm |  5 +++
 queries/svelte/highlights.scm   |  3 ++
 queries/swift/highlights.scm    |  6 ++-
 queries/thrift/highlights.scm   | 11 ++++-
 queries/tlaplus/highlights.scm  |  4 +-
 queries/vala/highlights.scm     |  7 ++-
 queries/zig/highlights.scm      | 13 +++---
 17 files changed, 137 insertions(+), 78 deletions(-)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index ddb08eca4..c2bac3c1d 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -337,8 +337,6 @@
  "implicit"
  "explicit"
  "override"
- "async"
- "await"
  "class"
  "delegate"
  "enum"
@@ -358,6 +356,11 @@
  "fixed"
 ] @keyword
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 [
  "const"
  "extern"
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 00a692521..e5609b25b 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -112,6 +112,9 @@
   "deftype"))
 ((sym_lit) @keyword
  (#eq? @keyword "declare"))
+((sym_name) @keyword.coroutine
+ (#any-of? @keyword.coroutine
+  "alts!" "alts!!" "await" "await-for" "await1" "chan" "close!" "future" "go" "sync" "thread" "timeout" "<!" "<!!" ">!" ">!!"))
 ((sym_lit) @keyword.function
  (#match? @keyword.function "^(defn|defn-|fn|fn[*])$"))
 
@@ -148,13 +151,13 @@
  (#any-of? @function.macro
   "." ".." "->" "->>" "amap" "areduce" "as->" "assert"
   "binding" "bound-fn" "delay" "do" "dosync"
-  "doto" "extend-protocol" "extend-type" "future"
+  "doto" "extend-protocol" "extend-type"
   "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"
+  "refer-clojure" "reify" "set!" "some->" "some->>"
   "time" "unquote" "unquote-splicing" "var" "vswap!"
-  "ex-cause" "ex-data" "ex-message")) 
+  "ex-cause" "ex-data" "ex-message"))
 ((sym_lit) @function.macro
  (#match? @function.macro "^with\\-.*$"))
 
@@ -175,9 +178,8 @@
   "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"
+  "associative?" "atom" "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"
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 1f770e9f8..0f12dd8df 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -143,11 +143,19 @@
  "template"
  "typename"
  "using"
- "co_await"
  "concept"
  "requires"
 ] @keyword
 
+[
+  "co_await"
+] @keyword.coroutine
+
+[
+ "co_yield"
+ "co_return"
+] @keyword.coroutine.return
+
 [
  "public"
  "private"
@@ -156,11 +164,6 @@
  "final"
 ] @type.qualifier
 
-[
- "co_yield"
- "co_return"
-] @keyword.return
-
 [
  "new"
  "delete"
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index f5e391092..154a92b3a 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -195,14 +195,12 @@
 
 [
   "return"
-  "yield"
 ] @keyword.return
 
 
 ; Built in identifiers:
 ; alone these are marked as keywords
 [
-    "await"
     "deferred"
     "factory"
     "get"
@@ -216,17 +214,22 @@
     "typedef"
 ] @keyword
 
+[
+  "async"
+  "async*"
+  "sync*"
+  "await"
+  "yield"
+] @keyword.coroutine
+
 [
     (const_builtin)
     (final_builtin)
     "abstract"
-    "async"
-    "async*"
     "covariant"
     "dynamic"
     "external"
     "static"
-    "sync*"
 ] @type.qualifier
 
 ; when used as an identifier:
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index e347098a3..cdae02ab2 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -210,15 +210,15 @@
 ;----------
 
 [
-"if"
-"else"
-"switch"
-"case"
+  "if"
+  "else"
+  "switch"
+  "case"
 ] @conditional
 
 [
-"import"
-"from"
+  "import"
+  "from"
 ] @include
 
 (export_specifier "as" @include)
@@ -227,53 +227,56 @@
 (namespace_import "as" @include)
 
 [
-"for"
-"of"
-"do"
-"while"
-"continue"
+  "for"
+  "of"
+  "do"
+  "while"
+  "continue"
 ] @repeat
 
 [
-"async"
-"await"
-"break"
-"class"
-"const"
-"debugger"
-"export"
-"extends"
-"get"
-"in"
-"instanceof"
-"let"
-"set"
-"static"
-"target"
-"typeof"
-"var"
-"with"
+  "break"
+  "class"
+  "const"
+  "debugger"
+  "export"
+  "extends"
+  "get"
+  "in"
+  "instanceof"
+  "let"
+  "set"
+  "static"
+  "target"
+  "typeof"
+  "var"
+  "with"
 ] @keyword
 
 [
-"return"
-"yield"
+  "async"
+  "await"
+] @keyword.coroutine
+
+[
+  "return"
+  "yield"
 ] @keyword.return
 
 [
- "function"
+  "function"
 ] @keyword.function
 
 [
- "new"
- "delete"
+  "new"
+  "delete"
 ] @keyword.operator
 
 [
- "throw"
- "try"
- "catch"
- "finally"
+  "throw"
+  "try"
+  "catch"
+  "finally"
 ] @exception
 
 (export_statement
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 073096556..c6c6dae13 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -159,12 +159,15 @@
 "func" @keyword.function
 
 [
-  "await"
   "return"
 ] @keyword.return
 
-(call (identifier) @keyword.return
-      (#eq? @keyword.return "yield"))
+[
+  "await"
+] @keyword.coroutine
+
+(call (identifier) @keyword.coroutine
+      (#eq? @keyword.coroutine "yield"))
 
 
 ;; Builtins
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index e79d62c75..ffb365c87 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -17,8 +17,6 @@
 "function" @keyword.function
 
 [
- "async"
- "await"
  "type"
  "interface"
  "implements"
@@ -31,6 +29,11 @@
  "insteadof"
 ] @keyword
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 [
  "use"
  "include"
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 2fd2c089b..caf62f1f0 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -307,7 +307,13 @@
 ;	"typeof" ; NOTE: It is reserved for future use
 ] @keyword
 
-("fun") @keyword.function
+[
+  "suspend"
+] @keyword.coroutine
+
+[
+  "fun"
+] @keyword.function
 
 (jump_expression) @keyword.return
 
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 54ad82b09..fe66d7ca3 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -240,8 +240,6 @@
 
 [
   "assert"
-  "async"
-  "await"
   "class"
   "exec"
   "global"
@@ -252,6 +250,11 @@
   "as"
 ] @keyword
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 [
   "return"
   "yield"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index db80fbb32..c24a278f6 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -169,8 +169,6 @@
 (use_as_clause "as" @include)
 
 [
-  "async"
-  "await"
   "default"
   "dyn"
   "enum"
@@ -188,6 +186,11 @@
   "where"
 ] @keyword
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 [
  "ref"
  (mutable_specifier)
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 401b985d7..a92832d68 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -228,6 +228,11 @@
   "as"
 ] @keyword
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 [
   "return"
 ] @keyword.return
diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 058682a7c..e1a67296e 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -8,6 +8,9 @@
   (as)
 ] @keyword
 
+((special_block_keyword) @keyword.coroutine
+  (#eq? @keyword.coroutine "await"))
+
 [
   "{"
   "}"
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index c6220984e..5773c2377 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -22,7 +22,6 @@
 (function_declaration (simple_identifier) @method)
 (function_declaration ["init" @constructor])
 (throws) @keyword
-"async" @keyword
 (where_keyword) @keyword
 (parameter external_name: (simple_identifier) @parameter)
 (parameter name: (simple_identifier) @parameter)
@@ -47,6 +46,11 @@
   "some"
 ] @keyword
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 [
   (getter_specifier)
   (setter_specifier)
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index c6ff6464f..5df609c3d 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -86,7 +86,6 @@
   "include"
   "interaction"
   "namespace"
-  "oneway"
   "optional"
   "required"
   "senum"
@@ -96,10 +95,13 @@
   "union"
 ] @keyword
 
+[
+  "oneway"
+] @keyword.coroutine
+
 ; Deprecated Keywords
 
 [
-  "async"
   "cocoa_prefix"
   "cpp_namespace"
   "csharp_namespace"
@@ -118,7 +120,12 @@
   "xsd_optional"
 ] @keyword
 
+[
+  "async"
+] @keyword.coroutine
+
 ; Extended Keywords
+
 [
   "client"
   "idempotent"
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index a94a91f4e..2199359f8 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -81,7 +81,6 @@
   (pcal_algorithm_start)
   "algorithm"
   "assert"
-  "await"
   "begin"
   "call"
   "define"
@@ -98,6 +97,9 @@
   "when"
   "with"
 ] @keyword
+[
+  "await"
+] @keyword.coroutine
 (pcal_with ("=") @keyword)
 (pcal_process ("=") @keyword)
 [ 
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index 1c9732dff..5ad7e0345 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -90,7 +90,6 @@
 
 [
  "abstract"
- "async"
  "class"
  "construct"
  "continue"
@@ -114,6 +113,11 @@
  "with"
 ] @keyword
 
+[
+  "async"
+  "yield"
+] @keyword.coroutine
+
 [
  "const"
  "dynamic"
@@ -183,7 +187,6 @@
 
 [
   "return"
-  "yield"
 ] @keyword.return
 
 [
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index e3e91dc65..60e5b373a 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -95,10 +95,17 @@ field_constant: (IDENTIFIER) @constant
   "asm"
   "defer"
   "errdefer"
-  "nosuspend"
   "test"
 ] @keyword
 
+[
+  "async"
+  "await"
+  "suspend"
+  "nosuspend"
+  "resume"
+] @keyword.coroutine
+
 [
   "fn"
 ] @keyword.function
@@ -111,10 +118,6 @@ field_constant: (IDENTIFIER) @constant
 
 [
   "return"
-  "async"
-  "await"
-  "suspend"
-  "resume"
 ] @keyword.return
 
 [

From 3c8842c79a2b499453c7f40d4babf5067a07e452 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 Feb 2023 06:38:02 -0500
Subject: [PATCH 0056/2704] refactor(ruby): move keywords appropriately

---
 queries/ruby/highlights.scm | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index cf253a474..c350e5ad1 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -8,19 +8,13 @@
 [
  "alias"
  "begin"
- "break"
  "class"
- "def"
  "do"
  "end"
  "ensure"
  "module"
- "next"
- "redo"
  "rescue"
- "retry"
  "then"
- "undef"
  ] @keyword
 
 [
@@ -35,6 +29,14 @@
  "not"
 ] @keyword.operator
 
+[
+  "def"
+  "undef"
+] @keyword.function
+
+(method
+  "end" @keyword.function)
+
 [
  "case"
  "else"
@@ -44,10 +46,23 @@
  "when"
  ] @conditional
 
+(if
+  "end" @conditional)
+(if
+  (then) @conditional)
+(unless
+  (then) @conditional)
+(elsif
+  (then) @conditional)
+
 [
  "for"
  "until"
  "while"
+ "break"
+ "redo"
+ "retry"
+ "next"
  ] @repeat
 
 (constant) @type

From d2a45aa5318b7b1a6d66dbdd7d2d592dd5bb21d7 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 Feb 2023 06:38:47 -0500
Subject: [PATCH 0057/2704] refactor(zig): `@type.definition` items belong in
 `@keyword`, differentiate `@boolean` from `@constant.builtin`

---
 queries/zig/highlights.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 60e5b373a..0989704ce 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -79,6 +79,11 @@ field_constant: (IDENTIFIER) @constant
 
 (FLOAT) @float
 
+[
+  "true"
+  "false"
+] @boolean
+
 [
   (LINESTRING)
   (STRINGLITERALSINGLE)
@@ -96,6 +101,11 @@ field_constant: (IDENTIFIER) @constant
   "defer"
   "errdefer"
   "test"
+  "struct"
+  "union"
+  "enum"
+  "opaque"
+  "error"
 ] @keyword
 
 [
@@ -147,14 +157,6 @@ field_constant: (IDENTIFIER) @constant
   (BuildinTypeExpr)
 ] @type.builtin
 
-[
-  "struct"
-  "union"
-  "enum"
-  "opaque"
-  "error"
-] @type.definition
-
 [
   "const"
   "var"
@@ -185,8 +187,6 @@ field_constant: (IDENTIFIER) @constant
   "null"
   "unreachable"
   "undefined"
-  "true"
-  "false"
 ] @constant.builtin
 
 [

From 3c42fb9d702e1246313d2b5531b815595cb4d889 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 Feb 2023 06:54:21 -0500
Subject: [PATCH 0058/2704] refactor(svelte): match certain keywords for
 conditional and exception

---
 queries/svelte/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index e1a67296e..9877fc7a5 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -11,6 +11,12 @@
 ((special_block_keyword) @keyword.coroutine
   (#eq? @keyword.coroutine "await"))
 
+((special_block_keyword) @exception
+  (#eq? @exception "catch"))
+
+((special_block_keyword) @conditional
+  (#match? @conditional "^(if|else)$"))
+
 [
   "{"
   "}"

From f225f53510986997ae843b2a825df8083d85a191 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 3 Mar 2023 15:23:53 +0000
Subject: [PATCH 0059/2704] Update parsers: sql, yuck

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4720e882c..bf3d59baf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -414,7 +414,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "ee50e2e8c3df92bd66093aefa1834b2735355b9b"
+    "revision": "1cb7c7a11015983f6d173847d5a3574f8e20107b"
   },
   "starlark": {
     "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"
@@ -504,7 +504,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "1e1a7e10053b910f3864fe8d97ca1741d2df66b2"
+    "revision": "0f96c1d3bbdd32ca92b4e706c3f1fc2cb0d26b3f"
   },
   "zig": {
     "revision": "1cd5f339b146b764f39b36bb7be98ca631a2e02a"

From 190561df8995ff9526c06d33cf17416b9e0791e3 Mon Sep 17 00:00:00 2001
From: Yochem van Rosmalen <yochem+git@icloud.com>
Date: Fri, 3 Mar 2023 18:55:49 +0100
Subject: [PATCH 0060/2704] v(injections): inject regex for some methods in
 `re` module

---
 queries/v/highlights.scm | 2 ++
 queries/v/injections.scm | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index af2905239..16904d18b 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -396,6 +396,8 @@
 
 (rune_literal) @string
 
+(raw_string_literal) @string
+
 (escape_sequence) @string.escape
 
 (float_literal) @float
diff --git a/queries/v/injections.scm b/queries/v/injections.scm
index b77e7c630..11f02639e 100644
--- a/queries/v/injections.scm
+++ b/queries/v/injections.scm
@@ -4,3 +4,10 @@
 ;; #include <...>
 (hash_statement) @c
 
+;; regex for the methods defined in `re` module
+((call_expression
+    function: (selector_expression
+      field: (identifier) @_re)
+    arguments: (argument_list
+  (raw_string_literal) @regex (#offset! @regex 0 2 0 -1)))
+  (#any-of? @_re "regex_base" "regex_opt" "compile_opt"))

From 28f84d69e3b6c26f1f7a2ef3f248a7242f36d620 Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@phx.io>
Date: Fri, 3 Mar 2023 20:26:51 -0800
Subject: [PATCH 0061/2704] fix(go): Indent on type switch case properly

---
 queries/go/indents.scm    | 1 +
 tests/indent/go/switch.go | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/queries/go/indents.scm b/queries/go/indents.scm
index e21fc8771..fe6e447eb 100644
--- a/queries/go/indents.scm
+++ b/queries/go/indents.scm
@@ -7,6 +7,7 @@
   (literal_value)
   (expression_case)
   (communication_case)
+  (type_case)
   (default_case)
   (block)
   (call_expression)
diff --git a/tests/indent/go/switch.go b/tests/indent/go/switch.go
index 8ccacd564..9b6e74db2 100644
--- a/tests/indent/go/switch.go
+++ b/tests/indent/go/switch.go
@@ -11,4 +11,10 @@ func test(ch byte) {
 	case 'l':
 		return
 	}
+
+	var i interface{}
+	switch i.(type) {
+	case int:
+		return
+	}
 }

From 88c490f00f837fbac95b2948bb7f0454a9cc4cf0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 4 Mar 2023 06:39:17 +0000
Subject: [PATCH 0062/2704] Update parsers: hlsl, yuck

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bf3d59baf..9e795a15f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -195,7 +195,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "18f2dcb5f65075457638658c4763672e826dcddf"
+    "revision": "306d48516a6b3dbb18a184692e8edffa8403018f"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -504,7 +504,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "0f96c1d3bbdd32ca92b4e706c3f1fc2cb0d26b3f"
+    "revision": "48af129ab5411cd6f7ae2b36f53c1192572fa030"
   },
   "zig": {
     "revision": "1cd5f339b146b764f39b36bb7be98ca631a2e02a"

From c553e6c5608ba54e210e9131bf9ba5e36ef18e57 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 3 Mar 2023 06:32:24 -0500
Subject: [PATCH 0063/2704] fix(ecma): properly capture constants in const
 declarations

---
 queries/ecma/highlights.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index cdae02ab2..97feae8f3 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -24,10 +24,15 @@
  (#lua-match? @type "^[A-Z]"))
 
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z_][A-Z%d_]+$"))
+ (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
 
 ((shorthand_property_identifier) @constant
- (#lua-match? @constant "^[A-Z_][A-Z%d_]+$"))
+ (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
+
+(lexical_declaration
+  "const"
+  . (variable_declarator
+      . name: (identifier) @constant))
 
 ((identifier) @variable.builtin
  (#vim-match? @variable.builtin "^(arguments|module|console|window|document)$"))

From d7cef15b01e04f8322900f4b0294be582d31ab9d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 3 Mar 2023 20:04:08 -0500
Subject: [PATCH 0064/2704] feat(ecma): add tests for constants

---
 tests/query/highlights/ecma/const.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 tests/query/highlights/ecma/const.js

diff --git a/tests/query/highlights/ecma/const.js b/tests/query/highlights/ecma/const.js
new file mode 100644
index 000000000..2b778fd15
--- /dev/null
+++ b/tests/query/highlights/ecma/const.js
@@ -0,0 +1,13 @@
+_FOO = 4
+// <- @constant
+__A__ = 2
+// <- @constant
+_ = 2
+// <- @variable
+A_B_C = 4
+// <- @constant
+_1 = 1
+// <- @variable
+
+const A = 2
+//    ^ @constant

From 376d74006fd8fff91431639136416ffca4458bfd Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 4 Mar 2023 04:31:11 -0500
Subject: [PATCH 0065/2704] feat: add cue

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/cue/folds.scm           |   5 +
 queries/cue/highlights.scm      | 164 ++++++++++++++++++++++++++++++++
 queries/cue/indents.scm         |  21 ++++
 queries/cue/injections.scm      |   1 +
 queries/cue/locals.scm          |  34 +++++++
 8 files changed, 237 insertions(+)
 create mode 100644 queries/cue/folds.scm
 create mode 100644 queries/cue/highlights.scm
 create mode 100644 queries/cue/indents.scm
 create mode 100644 queries/cue/injections.scm
 create mode 100644 queries/cue/locals.scm

diff --git a/README.md b/README.md
index f97bcd5bb..cb16f3c77 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [cpp](https://github.com/tree-sitter/tree-sitter-cpp) (maintained by @theHamsta)
 - [x] [css](https://github.com/tree-sitter/tree-sitter-css) (maintained by @TravonteD)
 - [x] [cuda](https://github.com/theHamsta/tree-sitter-cuda) (maintained by @theHamsta)
+- [x] [cue](https://github.com/eonpatapon/tree-sitter-cue) (maintained by @amaanq)
 - [x] [d](https://github.com/CyberShadow/tree-sitter-d) (experimental, maintained by @nawordar)
 - [x] [dart](https://github.com/UserNobody14/tree-sitter-dart) (maintained by @akinsho)
 - [x] [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) (maintained by @jedrzejboczar)
diff --git a/lockfile.json b/lockfile.json
index 9e795a15f..f1f630267 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -68,6 +68,9 @@
   "cuda": {
     "revision": "91c3ca3e42326e0f7b83c82765940bbf7f91c847"
   },
+  "cue": {
+    "revision": "4ffcda8c2bdfee1c2ba786cd503d0508ea92cca2"
+  },
   "d": {
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 249a1b00a..179513d9b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -271,6 +271,14 @@ list.cuda = {
   maintainers = { "@theHamsta" },
 }
 
+list.cue = {
+  install_info = {
+    url = "https://github.com/eonpatapon/tree-sitter-cue",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.d = {
   install_info = {
     url = "https://github.com/CyberShadow/tree-sitter-d",
diff --git a/queries/cue/folds.scm b/queries/cue/folds.scm
new file mode 100644
index 000000000..934b59e6f
--- /dev/null
+++ b/queries/cue/folds.scm
@@ -0,0 +1,5 @@
+[
+  (import_spec_list)
+  (field)
+  (string)
+] @fold
diff --git a/queries/cue/highlights.scm b/queries/cue/highlights.scm
new file mode 100644
index 000000000..c1f27fb8f
--- /dev/null
+++ b/queries/cue/highlights.scm
@@ -0,0 +1,164 @@
+; Includes
+
+[
+  "package"
+  "import"
+] @include
+
+; Namespaces
+
+(package_identifier) @namespace
+
+(import_spec ["." "_"] @punctuation.special)
+
+[
+  (attr_path)
+  (package_path)
+] @text.uri ;; In attributes
+
+; Attributes
+
+(attribute) @attribute
+
+; Conditionals
+
+"if" @conditional
+
+; Repeats
+
+[
+  "for"
+] @repeat
+
+(for_clause "_" @punctuation.special)
+
+; Keywords
+
+[
+  "let"
+] @keyword
+
+[
+  "in"
+] @keyword.operator
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "|"
+  "&"
+  "||"
+  "&&"
+  "=="
+  "!="
+  "<"
+  "<="
+  ">"
+  ">="
+  "=~"
+  "!~"
+  "!"
+  "="
+] @operator
+
+; Fields & Properties
+
+(field 
+  (label 
+  (identifier) @field))
+
+(selector_expression
+  (_)
+  (identifier) @property)
+
+; Functions
+
+(call_expression
+  function: (identifier) @function.call)
+(call_expression
+  function: (selector_expression
+  (_)
+  (identifier) @function.call))
+(call_expression
+  function: (builtin_function) @function.call)
+
+(builtin_function) @function.builtin
+
+; Variables
+
+(identifier) @variable
+
+; Types
+
+(primitive_type) @type.builtin
+
+((identifier) @type
+  (#match? @type "^(#|_#)"))
+
+[
+  (slice_type)
+  (pointer_type)
+] @type ;; In attributes
+
+; Punctuation
+
+[
+  ","
+  ":"
+] @punctuation.delimiter
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[ "<" ">" ] @punctuation.bracket
+
+[
+  (ellipsis)
+  "?"
+] @punctuation.special
+
+; Literals
+
+(string) @string
+
+[
+  (escape_char)
+  (escape_unicode)
+] @string.escape
+
+(number) @number
+
+(float) @float
+
+(si_unit
+  (float)
+  (_) @symbol)
+
+(boolean) @boolean
+
+[
+  (null)
+  (top)
+  (bottom)
+] @constant.builtin
+
+; Interpolations
+
+(interpolation "\\(" @punctuation.special (_) ")" @punctuation.special) @none
+
+(interpolation "\\(" (identifier) @variable ")")
+
+; Commments
+
+(comment) @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/cue/indents.scm b/queries/cue/indents.scm
new file mode 100644
index 000000000..731e69b79
--- /dev/null
+++ b/queries/cue/indents.scm
@@ -0,0 +1,21 @@
+[
+  (import_spec_list)
+  (field)
+] @indent
+
+[
+  "}"
+  "]"
+  ")"
+] @indent_end
+
+[ "{" "}" ] @branch
+
+[ "[" "]" ] @branch
+
+[ "(" ")" ] @branch
+
+[
+  (ERROR)
+  (comment)
+] @auto
diff --git a/queries/cue/injections.scm b/queries/cue/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/cue/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/cue/locals.scm b/queries/cue/locals.scm
new file mode 100644
index 000000000..b99a4fca8
--- /dev/null
+++ b/queries/cue/locals.scm
@@ -0,0 +1,34 @@
+; Scopes
+
+[
+  (source_file)
+  (field)
+  (for_clause)
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(import_spec
+  path: (string) @definition.import)
+
+(field
+  (label
+  (identifier) @definition.field))
+
+(package_identifier) @definition.namespace
+
+(for_clause
+  (identifier) @definition.variable
+  (expression))
+
+(for_clause
+  (identifier)
+  (identifier) @definition.variable
+  (expression))
+
+(let_clause
+  (identifier) @definition.variable)

From e3a1ae4c4eccf309eaa1880176de7307cd70748a Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Thu, 2 Mar 2023 23:18:10 +0100
Subject: [PATCH 0066/2704] highlights(sql): add missing keywords

---
 queries/sql/highlights.scm | 81 +++++++++++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 19 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 274469989..4178f9727 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -2,13 +2,16 @@
   name: (identifier) @function.call
   parameter: [(field)]? @parameter)
 
-(keyword_gist) @function.call
-(keyword_btree) @function.call
-(keyword_hash) @function.call
-(keyword_spgist) @function.call
-(keyword_gin) @function.call
-(keyword_brin) @function.call
-(keyword_float) @function.call
+[
+  (keyword_gist)
+  (keyword_btree)
+  (keyword_hash)
+  (keyword_spgist)
+  (keyword_gin)
+  (keyword_brin)
+  (keyword_float)
+  (keyword_array)
+] @function.call
 
 (count
   name: (keyword_count) @function.call
@@ -33,7 +36,7 @@
     parameter: [(literal)]?)))
 
 (literal) @string
-(comment) @comment
+(comment) @comment @spell
 (marginalia) @comment
 
 ((literal) @number
@@ -53,7 +56,6 @@
  (keyword_asc)
  (keyword_desc)
  (keyword_external)
- (keyword_stored)
  (keyword_parquet)
  (keyword_csv)
  (keyword_rcfile)
@@ -61,21 +63,27 @@
  (keyword_orc)
  (keyword_avro)
  (keyword_jsonfile)
+ (keyword_sequencefile)
  (keyword_temp)
- (keyword_cached)
  (keyword_uncached)
  (keyword_unlogged)
  (keyword_terminated)
  (keyword_escaped)
- (keyword_partitioned)
- (keyword_location)
- (keyword_lines)
  (keyword_unsigned)
  (keyword_nulls)
  (keyword_last)
  (keyword_materialized)
  (keyword_temp)
  (keyword_temporary)
+ (keyword_delimited)
+ (keyword_replication)
+ (keyword_auto_increment)
+ (keyword_default)
+ (keyword_collate)
+ (keyword_concurrently)
+ (keyword_engine)
+ (keyword_character)
+  (keyword_concurrently)
 ] @attribute
 
 [
@@ -91,7 +99,6 @@
   (keyword_where)
   (keyword_index)
   (keyword_join)
-  (keyword_on)
   (keyword_primary)
   (keyword_delete)
   (keyword_create)
@@ -107,10 +114,9 @@
   (keyword_outer)
   (keyword_inner)
   (keyword_order)
+  (keyword_partition)
   (keyword_group)
-  (keyword_by)
   (keyword_having)
-  (keyword_as)
   (keyword_limit)
   (keyword_offset)
   (keyword_table)
@@ -121,8 +127,6 @@
   (keyword_for)
   (keyword_if)
   (keyword_exists)
-  (keyword_auto_increment)
-  (keyword_default)
   (keyword_max)
   (keyword_min)
   (keyword_avg)
@@ -139,7 +143,6 @@
   (keyword_cascade)
   (keyword_between)
   (keyword_window)
-  (keyword_with)
   (keyword_no)
   (keyword_data)
   (keyword_type)
@@ -160,18 +163,54 @@
   (keyword_like)
   (keyword_similar)
   (keyword_over)
+  (keyword_change)
+  (keyword_modify)
+  (keyword_restrict)
+  (keyword_first)
+  (keyword_after)
+  (keyword_range)
+  (keyword_rows)
+  (keyword_groups)
+  (keyword_unbounded)
+  (keyword_preceding)
+  (keyword_following)
+  (keyword_exclude)
+  (keyword_current)
+  (keyword_ties)
+  (keyword_others)
+  (keyword_unique)
+  (keyword_preserve)
+  (keyword_zerofill)
+  (keyword_format)
+  (keyword_fields)
+  (keyword_row)
+  (keyword_sort)
+  (keyword_compute)
+  (keyword_stats)
+  (keyword_comment)
+  (keyword_partitioned)
+  (keyword_location)
+  (keyword_cached)
+  (keyword_lines)
+  (keyword_stored)
 ] @keyword
 
+(keyword_with) @repeat
+
+(keyword_as) @label
+
 [
   (keyword_int)
   (keyword_null)
   (keyword_boolean)
+  (keyword_bit)
   (keyword_smallserial)
   (keyword_serial)
   (keyword_bigserial)
   (keyword_smallint)
   (keyword_bigint)
   (keyword_decimal)
+  (keyword_float)
   (keyword_numeric)
   (keyword_real)
   (double)
@@ -199,6 +238,8 @@
   (keyword_and)
   (keyword_or)
   (keyword_not)
+  (keyword_by)
+  (keyword_on)
 ] @keyword.operator
 
 [
@@ -214,6 +255,7 @@
   "!="
   ">="
   ">"
+  "<>"
 ] @operator
 
 [
@@ -227,3 +269,4 @@
   "."
 ] @punctuation.delimiter
 
+

From d382b4156326195725d0d8cd84fe8b60a39bb73b Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Fri, 3 Mar 2023 20:52:59 +0100
Subject: [PATCH 0067/2704] highlights(sql): added missing kwds, added
 `@attribute` and @`type.qualifier` kwds

---
 queries/sql/highlights.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 4178f9727..a0e049082 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -11,6 +11,7 @@
   (keyword_brin)
   (keyword_float)
   (keyword_array)
+  (keyword_group_concat)
 ] @function.call
 
 (count
@@ -83,7 +84,10 @@
  (keyword_concurrently)
  (keyword_engine)
  (keyword_character)
-  (keyword_concurrently)
+ (keyword_concurrently)
+ (keyword_preceding)
+ (keyword_following)
+ (keyword_first)
 ] @attribute
 
 [
@@ -116,6 +120,8 @@
   (keyword_order)
   (keyword_partition)
   (keyword_group)
+  (keyword_with)
+  (keyword_as)
   (keyword_having)
   (keyword_limit)
   (keyword_offset)
@@ -140,7 +146,6 @@
   (keyword_end)
   (keyword_is)
   (keyword_using)
-  (keyword_cascade)
   (keyword_between)
   (keyword_window)
   (keyword_no)
@@ -165,20 +170,14 @@
   (keyword_over)
   (keyword_change)
   (keyword_modify)
-  (keyword_restrict)
-  (keyword_first)
   (keyword_after)
   (keyword_range)
   (keyword_rows)
   (keyword_groups)
-  (keyword_unbounded)
-  (keyword_preceding)
-  (keyword_following)
   (keyword_exclude)
   (keyword_current)
   (keyword_ties)
   (keyword_others)
-  (keyword_unique)
   (keyword_preserve)
   (keyword_zerofill)
   (keyword_format)
@@ -195,9 +194,12 @@
   (keyword_stored)
 ] @keyword
 
-(keyword_with) @repeat
-
-(keyword_as) @label
+[
+ (keyword_restrict)
+ (keyword_unbounded)
+ (keyword_unique)
+ (keyword_cascade)
+] @type.qualifier
 
 [
   (keyword_int)
@@ -231,6 +233,7 @@
   (keyword_geography)
   (keyword_box2d)
   (keyword_box3d)
+  (keyword_interval)
 ] @type.builtin
 
 [

From d4e48be88d9822d98c9194f5cc2778c9953afb66 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Sat, 4 Mar 2023 00:36:52 +0100
Subject: [PATCH 0068/2704] highlights(sql): keywords as `@storageclass`

---
 queries/sql/highlights.scm | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index a0e049082..db413cc0e 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -56,26 +56,11 @@
 [
  (keyword_asc)
  (keyword_desc)
- (keyword_external)
- (keyword_parquet)
- (keyword_csv)
- (keyword_rcfile)
- (keyword_textfile)
- (keyword_orc)
- (keyword_avro)
- (keyword_jsonfile)
- (keyword_sequencefile)
- (keyword_temp)
- (keyword_uncached)
- (keyword_unlogged)
  (keyword_terminated)
  (keyword_escaped)
  (keyword_unsigned)
  (keyword_nulls)
  (keyword_last)
- (keyword_materialized)
- (keyword_temp)
- (keyword_temporary)
  (keyword_delimited)
  (keyword_replication)
  (keyword_auto_increment)
@@ -90,6 +75,22 @@
  (keyword_first)
 ] @attribute
 
+[
+ (keyword_materialized)
+ (keyword_temp)
+ (keyword_temporary)
+ (keyword_unlogged)
+ (keyword_external)
+ (keyword_parquet)
+ (keyword_csv)
+ (keyword_rcfile)
+ (keyword_textfile)
+ (keyword_orc)
+ (keyword_avro)
+ (keyword_jsonfile)
+ (keyword_sequencefile)
+] @storageclass
+
 [
  (keyword_case)
  (keyword_when)
@@ -190,8 +191,12 @@
   (keyword_partitioned)
   (keyword_location)
   (keyword_cached)
+  (keyword_uncached)
   (keyword_lines)
   (keyword_stored)
+  (keyword_location)
+  (keyword_partitioned)
+  (keyword_cached)
 ] @keyword
 
 [

From c9d7918901693041179ef569eb9b7f3f88a89e52 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 3 Mar 2023 05:33:20 -0500
Subject: [PATCH 0069/2704] feat: add luap

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  9 +++++++++
 queries/luap/highlights.scm     | 35 +++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 queries/luap/highlights.scm

diff --git a/README.md b/README.md
index cb16f3c77..d11ffd833 100644
--- a/README.md
+++ b/README.md
@@ -261,6 +261,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
+- [x] [lua patterns](https://github.com/vhyrro/tree-sitter-luap) (maintained by @amaanq)
 - [x] [m68k](https://github.com/grahambates/tree-sitter-m68k) (maintained by @grahambates)
 - [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
 - [x] [markdown](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
diff --git a/lockfile.json b/lockfile.json
index f1f630267..ddef7a391 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -263,6 +263,9 @@
   "lua": {
     "revision": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"
   },
+  "luap": {
+    "revision": "ebc6739bf8900a0191a386ef53371fc556c662a8"
+  },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 179513d9b..4c873df81 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -855,6 +855,15 @@ list.lua = {
   maintainers = { "@muniftanjim" },
 }
 
+list.luap = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-luap",
+    files = { "src/parser.c" },
+    readme_name = "lua patterns",
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.m68k = {
   install_info = {
     url = "https://github.com/grahambates/tree-sitter-m68k",
diff --git a/queries/luap/highlights.scm b/queries/luap/highlights.scm
new file mode 100644
index 000000000..62d2b3182
--- /dev/null
+++ b/queries/luap/highlights.scm
@@ -0,0 +1,35 @@
+"." @character
+
+[
+  (anchor_begin)
+  (anchor_end)
+] @string.escape
+
+[
+  "[" "]"
+  "(" ")"
+] @punctuation.bracket
+
+[
+  (zero_or_more)
+  (shortest_zero_or_more)
+  (one_or_more)
+  (zero_or_one)
+] @operator
+
+(range
+  from: (character) @constant
+  "-" @punctuation.delimiter
+  to: (character) @constant)
+
+(set
+  (character) @constant)
+
+(class) @keyword
+
+(negated_set
+  "^" @operator
+  (character) @constant)
+
+(balanced_match
+  (character) @parameter)

From 25f99a270ac94afd7a4adc8c2055d33ec60125ab Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 3 Mar 2023 05:35:20 -0500
Subject: [PATCH 0070/2704] feat(lua): add luap injections

---
 queries/lua/injections.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index c11e3fb29..14714573a 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -19,4 +19,30 @@
 ;; highlight string as query if starts with `;; query`
 ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))
 
+; string.match("123", "%d+")
+(function_call
+  (dot_index_expression
+    field: (identifier) @_method
+    (#any-of? @_method "find" "match"))
+  arguments: (arguments (_) . (string content: _ @luap)))
+
+(function_call
+  (dot_index_expression
+    field: (identifier) @_method
+    (#eq? @_method "gmatch" "gsub"))
+  arguments: (arguments (_) (string content: _ @luap)))
+
+; ("123"):match("%d+")
+(function_call
+  (method_index_expression
+    method: (identifier) @_method
+    (#any-of? @_method "find" "match"))
+    arguments: (arguments . (string content: _ @luap)))
+
+(function_call
+  (method_index_expression
+    method: (identifier) @_method
+    (#any-of? @_method "gmatch" "gsub"))
+    arguments: (arguments (string content: _ @luap)))
+
 (comment) @comment

From 4beba61ddec3e2d470796b1822af21f0cc6008d3 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 3 Mar 2023 05:36:23 -0500
Subject: [PATCH 0071/2704] feat(query): differentiate lua-match strings by
 using luap injections and fix offset matches

---
 queries/query/injections.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index 95ce2978f..c4b877d0b 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -1,6 +1,13 @@
 ((predicate 
   name: (identifier) @_name
   parameters: (parameters (string) @regex))
- (#match? @_name "^#?(not-)?(match|vim-match|lua-match)$"))
+ (#match? @_name "^#?(not-)?(match|vim-match)$")
+ (#offset! @regex 0 1 0 -1))
+
+((predicate
+  name: (identifier) @_name
+  parameters: (parameters (string) @luap))
+ (#match? @_name "^#?(not-)?lua-match$")
+ (#offset! @luap 0 1 0 -1))
 
 (comment) @comment

From 00b403f190949275c809d83771a1927d2376c694 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sat, 4 Mar 2023 16:32:48 +0000
Subject: [PATCH 0072/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d11ffd833..e6d00fbb9 100644
--- a/README.md
+++ b/README.md
@@ -261,7 +261,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
-- [x] [lua patterns](https://github.com/vhyrro/tree-sitter-luap) (maintained by @amaanq)
+- [x] [luap](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)
 - [x] [m68k](https://github.com/grahambates/tree-sitter-m68k) (maintained by @grahambates)
 - [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
 - [x] [markdown](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)

From 1ceaceb9dea9b0bac2162345ee11e47a44e07a70 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 4 Mar 2023 20:25:03 +0200
Subject: [PATCH 0073/2704] docs: fix readme names

---
 README.md                       | 6 +++---
 lua/nvim-treesitter/parsers.lua | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e6d00fbb9..6371f7c10 100644
--- a/README.md
+++ b/README.md
@@ -261,11 +261,11 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
-- [x] [luap](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)
+- [x] [lua patterns](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)
 - [x] [m68k](https://github.com/grahambates/tree-sitter-m68k) (maintained by @grahambates)
 - [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
-- [x] [markdown](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
-- [x] [markdown_inline](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
+- [x] [markdown (basic highlighting)](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
+- [x] [markdown_inline (needed for full highlighting)](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
 - [x] [matlab](https://github.com/mstanciu552/tree-sitter-matlab) (maintained by @amaanq)
 - [x] [menhir](https://github.com/Kerl13/tree-sitter-menhir) (maintained by @Kerl13)
 - [ ] [mermaid](https://github.com/monaqa/tree-sitter-mermaid) (experimental)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4c873df81..1185d02d3 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -859,9 +859,9 @@ list.luap = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-luap",
     files = { "src/parser.c" },
-    readme_name = "lua patterns",
   },
   maintainers = { "@amaanq" },
+  readme_name = "lua patterns",
 }
 
 list.m68k = {
@@ -888,9 +888,9 @@ list.markdown = {
     location = "tree-sitter-markdown",
     files = { "src/parser.c", "src/scanner.c" },
     branch = "split_parser",
-    readme_name = "markdown (basic highlighting)",
   },
   maintainers = { "@MDeiml" },
+  readme_name = "markdown (basic highlighting)",
   experimental = true,
 }
 
@@ -900,9 +900,9 @@ list.markdown_inline = {
     location = "tree-sitter-markdown-inline",
     files = { "src/parser.c", "src/scanner.c" },
     branch = "split_parser",
-    readme_name = "markdown_inline (needs to be installed for full markdown highlighting)",
   },
   maintainers = { "@MDeiml" },
+  readme_name = "markdown_inline (needed for full highlighting)",
   experimental = true,
 }
 

From 14fb59e125d7db4378e2345f36c9d2735528b899 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 5 Mar 2023 06:38:51 +0000
Subject: [PATCH 0074/2704] Update parsers: c_sharp, luap, perl

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ddef7a391..a231b4d53 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"
   },
   "c_sharp": {
-    "revision": "fc6be5ae61c8788e0c028e757f132d67bfc538f5"
+    "revision": "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d"
   },
   "capnp": {
     "revision": "fc6e2addf103861b9b3dffb82c543eb6b71061aa"
@@ -264,7 +264,7 @@
     "revision": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"
   },
   "luap": {
-    "revision": "ebc6739bf8900a0191a386ef53371fc556c662a8"
+    "revision": "bfb38d254f380362e26b5c559a4086ba6e92ba77"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -321,7 +321,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "perl": {
-    "revision": "c43bae0090cfcfc62d9904312599ded1b645a66d"
+    "revision": "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"
   },
   "php": {
     "revision": "f860e598194f4a71747f91789bf536b393ad4a56"

From 3731cf1c0c70287568d26f190849c68a46c21297 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 5 Mar 2023 11:24:18 +0000
Subject: [PATCH 0075/2704] Update parsers: zig

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index a231b4d53..5b60f8f54 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -513,6 +513,6 @@
     "revision": "48af129ab5411cd6f7ae2b36f53c1192572fa030"
   },
   "zig": {
-    "revision": "1cd5f339b146b764f39b36bb7be98ca631a2e02a"
+    "revision": "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"
   }
 }

From d11dd552dbde181cd49652188521f4b5f6cad2f8 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 3 Mar 2023 09:09:52 +0700
Subject: [PATCH 0076/2704] injections(html): fix faulty css/js injections

Group queries to reduce duplicate injection tree

use only regex
---
 queries/html_tags/injections.scm              | 34 ++++---------------
 .../injections/html/test-html-injections.html |  4 +++
 .../injections/vue/test-vue-injections.vue    |  6 ++++
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index c29619281..5f0719c64 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -1,22 +1,12 @@
 ; <style>...</style>
-(
-  (style_element
-    (start_tag
-      (tag_name) .) 
-    (raw_text) @css)
-) 
-
 ; <style blocking> ...</style>
 ; Add "lang" to predicate check so that vue/svelte can inherit this
 ; without having this element being captured twice
 (
   (style_element
-    (start_tag
-      (attribute
-        (attribute_name) @_no_set_type))
-    (raw_text) @css)
-  (#not-any-of? @_no_set_type "type" "lang")
-) 
+    (start_tag) @_no_type_lang 
+      (#not-match? @_no_type_lang "\\s(lang|type)\\s*\\=")
+    (raw_text) @css))
 
 (
   (style_element
@@ -30,22 +20,12 @@
 )
 
 ; <script>...</script>
-(
-  (script_element
-    (start_tag
-      (tag_name) .) 
-    (raw_text) @javascript)
-) 
-
 ; <script defer>...</script>
 (
   (script_element
-    (start_tag
-      (attribute
-        (attribute_name) @_no_set_type))
-    (raw_text) @javascript)
-  (#not-any-of? @_no_set_type "type" "lang")
-) 
+    (start_tag) @_no_type_lang 
+      (#not-match? @_no_type_lang "\\s(lang|type)\\s*\\=")
+    (raw_text) @javascript))
 
 (
   (script_element
@@ -55,7 +35,7 @@
         (quoted_attribute_value (attribute_value) @_javascript)))
     (raw_text) @javascript)
   (#eq? @_type "type")
-  (#eq? @_javascript "text/javascript")
+  (#any-of? @_javascript "text/javascript" "module")
 )
 
 ((attribute
diff --git a/tests/query/injections/html/test-html-injections.html b/tests/query/injections/html/test-html-injections.html
index 4449923c6..348d901ca 100644
--- a/tests/query/injections/html/test-html-injections.html
+++ b/tests/query/injections/html/test-html-injections.html
@@ -19,6 +19,10 @@
     <!--              ^ javascript -->
     <script type="text/javascript"> const x = 1 </script>
     <!--                              ^ javascript -->
+    <script type="module"> import { foo } from "bar" </script>
+    <!--                              ^ javascript -->
+    <script defer type="text/javascript"> const x = 1 </script>
+                                        <!-- ^ javascript -->
     <div style="height: 100%">
 <!--                ^ css      -->
       Test div to test css injections for style attributes
diff --git a/tests/query/injections/vue/test-vue-injections.vue b/tests/query/injections/vue/test-vue-injections.vue
index 4cb4ae215..b0df16071 100644
--- a/tests/query/injections/vue/test-vue-injections.vue
+++ b/tests/query/injections/vue/test-vue-injections.vue
@@ -17,6 +17,9 @@
 <script lang="ts"> const foo: number = "1" </script>
 <!--                            ^ typescript -->
 <!--                            ^ !javascript -->
+<script lang="ts" defer>const foo: number = 1 </script>
+<!--                            ^ typescript -->
+<!--                            ^ !javascript -->
 <style> .bar { .foo{ } } </style>
 <!--                ^ css   -->
 <style scoped> .page.page--news { background: rebeccapurple; } </style>
@@ -26,3 +29,6 @@
 <style lang="scss"> .bar { &-baz { } } </style>
 <!--                       ^ scss -->
 <!--                       ^ !css -->
+<style scoped lang="scss">body{} </style>
+<!--                       ^ scss -->
+<!--                       ^ !css -->

From 51030378eb12160cbf802b68aaf56b3116aa22de Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 1 Mar 2023 12:25:39 -0500
Subject: [PATCH 0077/2704] docs: add `@string.documentation`

---
 CONTRIBUTING.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f954bff1d..c972da7e0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -108,17 +108,18 @@ effect on highlighting. We will work on improving highlighting in the near futur
 #### Literals
 
 ```scheme
-@string            ; string literals
-@string.regex      ; regular expressions
-@string.escape     ; escape sequences
-@string.special    ; other special strings (e.g. dates)
+@string               ; string literals
+@string.documentation ; string documenting code (e.g. Python docstrings)
+@string.regex         ; regular expressions
+@string.escape        ; escape sequences
+@string.special       ; other special strings (e.g. dates)
 
-@character         ; character literals
-@character.special ; special characters (e.g. wildcards)
+@character            ; character literals
+@character.special    ; special characters (e.g. wildcards)
 
-@boolean           ; boolean literals
-@number            ; numeric literals
-@float             ; floating-point number literals
+@boolean              ; boolean literals
+@number               ; numeric literals
+@float                ; floating-point number literals
 ```
 
 #### Functions

From 95bcd6a8fa1baa0824d44b697ba05bcc0b97bd34 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 1 Mar 2023 12:26:26 -0500
Subject: [PATCH 0078/2704] feat: add `@string.documentation` where applicable

---
 queries/graphql/highlights.scm  |  4 ++--
 queries/julia/highlights.scm    | 12 +++++++++++-
 queries/python/highlights.scm   | 13 ++++++++++++-
 queries/starlark/highlights.scm |  8 +++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/queries/graphql/highlights.scm b/queries/graphql/highlights.scm
index 3a9d47dad..48f27f983 100644
--- a/queries/graphql/highlights.scm
+++ b/queries/graphql/highlights.scm
@@ -111,9 +111,9 @@
 ;---------
 
 (description
-  (string_value) @comment)
+  (string_value) @string.documentation @spell)
 
-(comment) @comment
+(comment) @comment @spell
 
 (directive_location
   (executable_directive_location) @type.builtin)
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index bf51076c7..6044e66de 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -226,8 +226,18 @@
 (prefixed_command_literal
   prefix: (identifier) @function.macro) @string.special
 
+((string_literal) @string.documentation
+  . [
+      (module_definition)
+      (abstract_definition)
+      (struct_definition)
+      (function_definition)
+      (assignment)
+      (const_declaration)
+    ])
+
 [
   (line_comment)
   (block_comment)
-] @comment
+] @comment @spell
 
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index fe66d7ca3..d25448000 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -176,7 +176,18 @@
 (escape_sequence) @string.escape
 
 ; doc-strings
-(expression_statement (string) @spell)
+
+(module . (expression_statement (string) @string.documentation @spell))
+
+(class_definition
+  body:
+    (block
+      . (expression_statement (string) @string.documentation @spell)))
+
+(function_definition
+  body:
+    (block
+      . (expression_statement (string) @string.documentation @spell)))
 
 ; Tokens
 
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index a92832d68..ab9bfd68d 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -158,7 +158,13 @@
 ] @string.escape
 
 ; doc-strings
-(expression_statement (string) @spell)
+
+(module . (expression_statement (string) @string.documentation @spell))
+
+(function_definition
+  body:
+    (block
+      . (expression_statement (string) @string.documentation @spell)))
 
 ; Tokens
 

From 3a82b58745c668eb9a456eb061455b1ef497710e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 2 Mar 2023 08:06:23 -0500
Subject: [PATCH 0079/2704] docs: add `@comment.documentation`

---
 CONTRIBUTING.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c972da7e0..cea14ac53 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -89,12 +89,13 @@ effect on highlighting. We will work on improving highlighting in the near futur
 #### Misc
 
 ```scheme
-@comment  ; line and block comments
-@error    ; syntax/parser errors
-@none     ; completely disable the highlight
-@preproc  ; various preprocessor directives & shebangs
-@define   ; preprocessor definition directives
-@operator ; symbolic operators (e.g. `+` / `*`)
+@comment               ; line and block comments
+@comment.documentation ; comments documenting code
+@error                 ; syntax/parser errors
+@none                  ; completely disable the highlight
+@preproc               ; various preprocessor directives & shebangs
+@define                ; preprocessor definition directives
+@operator              ; symbolic operators (e.g. `+` / `*`)
 ```
 
 #### Punctuation

From 5a87bc98dabd0d38152a6fa774005f7ecbd40f1b Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 2 Mar 2023 08:06:35 -0500
Subject: [PATCH 0080/2704] feat: add `@comment.documentation` where applicable

---
 queries/ada/highlights.scm      | 26 +++++++++++++++++-----
 queries/c/highlights.scm        |  3 +++
 queries/c_sharp/highlights.scm  |  8 +++++++
 queries/d/highlights.scm        | 13 ++++++++++-
 queries/dart/highlights.scm     |  4 ++--
 queries/ecma/highlights.scm     |  7 +++---
 queries/elixir/highlights.scm   | 20 ++++++++---------
 queries/elm/highlights.scm      |  5 ++++-
 queries/erlang/highlights.scm   |  6 ++++--
 queries/fortran/highlights.scm  |  3 +++
 queries/gleam/highlights.scm    |  7 ++++--
 queries/go/highlights.scm       | 38 +++++++++++++++++++++++++++------
 queries/hack/highlights.scm     |  5 ++++-
 queries/java/highlights.scm     |  9 ++++++++
 queries/kotlin/highlights.scm   |  7 +++---
 queries/lua/highlights.scm      |  6 ++++++
 queries/pascal/highlights.scm   | 31 ++++++++++++++++++++++++++-
 queries/prisma/highlights.scm   |  7 +++---
 queries/proto/highlights.scm    |  7 ++++--
 queries/ql/highlights.scm       |  5 +++--
 queries/ruby/highlights.scm     | 23 +++++++++++++++++---
 queries/rust/highlights.scm     | 12 +++++++++++
 queries/scala/highlights.scm    |  3 +++
 queries/smali/highlights.scm    |  7 ++++++
 queries/smithy/highlights.scm   |  7 +++---
 queries/solidity/highlights.scm |  8 +++++++
 queries/swift/highlights.scm    |  9 ++++++++
 queries/teal/highlights.scm     |  6 +++++-
 queries/thrift/highlights.scm   |  8 +++++++
 queries/v/highlights.scm        |  5 ++++-
 queries/vala/highlights.scm     |  4 +++-
 queries/zig/highlights.scm      |  5 +++--
 32 files changed, 256 insertions(+), 58 deletions(-)

diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index 884203791..bcd041d5a 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -94,11 +94,9 @@
 [
    "exception"
    "raise"
-]  @exception
-(comment)         @comment
-(comment)         @spell       ;; spell-check comments
-(string_literal)  @string
-(string_literal)  @spell       ;; spell-check strings
+] @exception
+(comment) @comment @spell
+(string_literal) @string @spell
 (character_literal) @string
 (numeric_literal) @number
 
@@ -173,6 +171,24 @@
 ;    ] @function.spec
 ;)
 
+((comment) @comment.documentation
+  . [
+      (entry_declaration)
+      (subprogram_declaration)
+      (parameter_specification)
+    ])
+
+(compilation_unit 
+  . (comment) @comment.documentation)
+
+(component_list
+  (component_declaration)
+    . (comment) @comment.documentation)
+
+(enumeration_type_definition 
+  (identifier)
+  . (comment) @comment.documentation)
+
 ;; Highlight errors in red. This is not very useful in practice, as text will
 ;; be highlighted as user types, and the error could be elsewhere in the code.
 ;; This also requires defining    :hi @error guifg=Red    for instance.
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 661f71b53..f607d3b8c 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -176,6 +176,9 @@
 
 (comment) @comment @spell
 
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
 ;; Parameters
 (parameter_declaration
   declarator: (identifier) @parameter)
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index c2bac3c1d..993609485 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -75,6 +75,14 @@
 
 (comment) @comment @spell
 
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
+
 (using_directive
   (identifier) @type)
 
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
index 8bec1ca10..229a9bf55 100644
--- a/queries/d/highlights.scm
+++ b/queries/d/highlights.scm
@@ -4,7 +4,18 @@
   (line_comment)
   (block_comment)
   (nesting_block_comment)
-] @comment
+] @comment @spell
+
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
+
+((block_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
+((nesting_block_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[+][+][^+].*[+]/$"))
 
 [
   "(" ")"
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 154a92b3a..e34467f65 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -155,8 +155,8 @@
 (false) @boolean
 (null_literal) @constant.builtin
 
-(documentation_comment) @comment
-(comment) @comment
+(comment) @comment @spell
+(documentation_comment) @comment.documentation @spell
 
 ; Keywords
 ; --------------------
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 97feae8f3..82a0b99ab 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -123,12 +123,13 @@
   (undefined)
 ] @constant.builtin
 
-(comment) @comment
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 (hash_bang_line) @preproc
 
-(comment) @spell
-
 (string) @string @spell
 (template_string) @string
 (escape_sequence) @string.escape
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index d87afcf1b..3223fa683 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -29,12 +29,10 @@
 ((identifier) @comment (#match? @comment "^_"))
 
 ; Comments
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
 
 ; Strings
-(string) @string
-(string) @spell
+(string) @string @spell
 
 ; Modules
 (alias) @type
@@ -214,15 +212,15 @@
 (unary_operator
   operator: "@"
   operand: (call
-    target: ((identifier) @_identifier (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc")) @comment
+    target: ((identifier) @_identifier (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc")) @comment.documentation
     (arguments [
       (string)
       (boolean)
       (charlist)
       (sigil
-        "~" @comment
-        ((sigil_name) @comment)
-        quoted_start: _ @comment
-        (quoted_content) @comment
-        quoted_end: _ @comment)
-    ] @comment))) @comment
+        "~" @comment.documentation
+        ((sigil_name) @comment.documentation)
+        quoted_start: _ @comment.documentation
+        (quoted_content) @comment.documentation
+        quoted_end: _ @comment.documentation)
+    ] @comment.documentation))) @comment.documentation
diff --git a/queries/elm/highlights.scm b/queries/elm/highlights.scm
index 4d0f6f447..fbd3a4c3f 100644
--- a/queries/elm/highlights.scm
+++ b/queries/elm/highlights.scm
@@ -1,7 +1,10 @@
 [
   (line_comment)
   (block_comment)
-] @comment
+] @comment @spell
+
+((block_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^{[-]|[^|]"))
 
 
 ; Keywords
diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
index fba44359f..63e6ea214 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -5,7 +5,10 @@
 (integer) @number
 (float) @float
 
-(comment) @comment
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[%%][%%]"))
 
 ;; keyword
 [
@@ -104,7 +107,6 @@
 (type_alias name: _ @type) @type.definition
 (spec) @type.definition
 
-(comment) @comment
 [(string) (binary)] @string
 
 ;;; expr_function_call
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 4604e9a92..a6b55413b 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -324,6 +324,9 @@
 
 (comment) @comment @spell
 
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^!>"))
+
 ; Errors
 
 (ERROR) @error
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index 0e2712879..00cabd171 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -82,11 +82,14 @@
 (identifier) @variable
 
 ; Comments
+[
+  (comment)
+] @comment @spell
+
 [
   (module_comment)
   (statement_comment)
-  (comment)
-] @comment
+] @comment.documentation @spell
 
 ; Unused Identifiers
 [
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index be72804b6..ce4ae89b6 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -196,20 +196,46 @@
 (float_literal) @float
 (imaginary_literal) @number
 
-(true) @boolean
-(false) @boolean
+[
+ (true)
+ (false)
+] @boolean
+
 (nil) @constant.builtin
 
 (keyed_element
   . (literal_element (identifier) @field))
 (field_declaration name: (field_identifier) @field)
 
+; Comments
+
 (comment) @comment @spell
 
+;; Doc Comments
+
+(source_file . (comment)+ @comment.documentation)
+
+(source_file
+  (comment)+ @comment.documentation
+  . (const_declaration))
+
+(source_file
+  (comment)+ @comment.documentation
+  . (function_declaration))
+
+(source_file
+  (comment)+ @comment.documentation
+  . (type_declaration))
+
+(source_file
+  (comment)+ @comment.documentation
+  . (var_declaration))
+
+; Errors
+
 (ERROR) @error
 
+; Spell
+
 ((interpreted_string_literal) @spell
-	(#not-has-parent? @spell
-		import_spec
-	)
-)
+  (#not-has-parent? @spell import_spec))
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index ffb365c87..a75b166ca 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -12,7 +12,10 @@
 [
   (comment)
   (heredoc)
-] @comment
+] @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 "function" @keyword.function
 
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 717a13bad..c97242295 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -279,3 +279,12 @@
   (line_comment)
   (block_comment)
 ] @comment @spell
+
+((block_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index caf62f1f0..679cc0ad6 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -217,12 +217,13 @@
 
 ;;; Literals
 
-(comment) @comment
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 (shebang_line) @preproc
 
-(comment) @spell
-
 (real_literal) @float
 [
 	(integer_literal)
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 1c17d823b..fa2eff68d 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -187,6 +187,12 @@
 
 (comment) @comment @spell
 
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-][-]"))
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-](%s?)@"))
+
 (hash_bang_line) @preproc
 
 (number) @number
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index 3a1c484e0..e11e0eaa2 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -248,7 +248,36 @@
 
 ; -- Comments
 
-(comment)         @comment
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
+
+((comment) @comment.documentation
+  . [(unit) (declProc)])
+
+(declTypes
+  (comment) @comment.documentation
+  . (declType))
+
+(declSection
+  (comment) @comment.documentation
+  . [(declField) (declProc)])
+
+(declEnum
+  (comment) @comment.documentation
+  . (declEnumValue))
+
+(declConsts
+  (comment) @comment.documentation
+  . (declConst))
+
+(declVars
+  (comment) @comment.documentation
+  . (declVar))
+
 (pp)              @preproc
 
 ; -- Type declaration
diff --git a/queries/prisma/highlights.scm b/queries/prisma/highlights.scm
index e3a025d98..59ee2881c 100644
--- a/queries/prisma/highlights.scm
+++ b/queries/prisma/highlights.scm
@@ -8,10 +8,9 @@
  "type"
 ] @keyword
 
-[
-  (comment)
-  (developer_comment)
-] @comment
+(comment) @comment @spell
+
+(developer_comment) @comment.documentation @spell
 
 [
   (attribute)
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index 48c18906c..a6f47da93 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -42,7 +42,10 @@
   (false)
 ] @boolean
 
-(comment) @comment
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 [
   "("
@@ -53,7 +56,7 @@
   "}"
   "<"
   ">"
-]  @punctuation.bracket
+] @punctuation.bracket
 
 [
  ";"
diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm
index 009920a82..dcc702263 100644
--- a/queries/ql/highlights.scm
+++ b/queries/ql/highlights.scm
@@ -130,5 +130,6 @@
 [
   (line_comment)
   (block_comment)
-  (qldoc)
-] @comment
+] @comment @spell
+
+(qldoc) @comment.documentation
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index c350e5ad1..9488297b4 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -173,13 +173,30 @@
 (float) @float
 
 [
- (nil)
  (true)
  (false)
  ] @boolean
 
-(comment) @comment
-(comment) @spell
+(nil) @constant.builtin
+
+(comment) @comment @spell
+
+(program
+  (comment)+ @comment.documentation
+  (class))
+
+(module
+  (comment)+ @comment.documentation
+  (body_statement (class)))
+
+(class
+  (comment)+ @comment.documentation
+  (body_statement (method)))
+
+(body_statement
+  (comment)+ @comment.documentation
+  (method))
+
 (string_content) @spell
 
 ; Operators
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index c24a278f6..1a9330a70 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -148,6 +148,18 @@
   (block_comment)
 ] @comment @spell
 
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^//!"))
+
+((block_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+((block_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][!]"))
+
 (boolean_literal) @boolean
 (integer_literal) @number
 (float_literal) @float
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index f600dc185..6220cbfe1 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -234,6 +234,9 @@
 
 (comment) @comment @spell
 
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
 ;; `case` is a conditional keyword in case_block
 
 (case_block
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 5f89cfa74..bdcb464ae 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -182,3 +182,10 @@
 ; Comments
 
 (comment) @comment @spell
+
+(class_definition
+  (comment) @comment.documentation)
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/smithy/highlights.scm b/queries/smithy/highlights.scm
index 07ee328f1..2b709c2a2 100644
--- a/queries/smithy/highlights.scm
+++ b/queries/smithy/highlights.scm
@@ -108,7 +108,6 @@
 
 ; Comments
 
-[
-  (comment)
-  (documentation_comment)
-] @comment @spell
+(comment) @comment @spell
+
+(documentation_comment) @comment.documentation @spell
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 5afebb990..76a623267 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -252,6 +252,14 @@
 
 (comment) @comment @spell
 
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
 ; Errors
 
 (ERROR) @error
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 5773c2377..4cdd882a8 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -107,6 +107,15 @@
  (multiline_comment)
 ] @comment @spell
 
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
+
+((multiline_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
 ; String literals
 (line_str_text) @string
 (str_escaped_char) @string
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index 2af9be589..4af3e212b 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -2,7 +2,11 @@
 ;; Primitives
 (boolean) @boolean
 (comment) @comment @spell
-(shebang_comment) @comment
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-][-]"))
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-](%s?)@"))
+(shebang_comment) @preproc
 (identifier) @variable
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "self"))
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 5df609c3d..adf147d9d 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -198,3 +198,11 @@
 ; Comments
 
 (comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 16904d18b..c4e69e802 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -406,5 +406,8 @@
 
 (ERROR) @error
 
-(comment) @comment
+(comment) @comment @spell
 
+(_
+  (comment)+ @comment.documentation
+  [(function_declaration) (type_declaration) (const_spec) (enum_declaration)])
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index 5ad7e0345..e1a20b8a0 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -1,7 +1,9 @@
 ; highlights.scm
 
 ; highlight comments and symbols
-(comment) @comment
+(comment) @comment @spell
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 (symbol) @symbol
 (member_access_expression (_) (identifier) @symbol)
 
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 0989704ce..37afe1c2f 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -1,8 +1,9 @@
+(line_comment) @comment @spell
+
 [
   (container_doc_comment)
   (doc_comment)
-  (line_comment)
-] @comment @spell
+] @comment.documentation @spell
 
 [
   variable: (IDENTIFIER)

From 5ac39d10cc8a28f7bdb3725f3ee84a132ba783a8 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 6 Mar 2023 09:56:25 +0700
Subject: [PATCH 0081/2704] indents(vue): fix indents on new line after
 <template>

---
 queries/vue/indents.scm              |  2 ++
 tests/indent/vue/template_indent.vue |  3 +++
 tests/indent/vue_spec.lua            | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 tests/indent/vue/template_indent.vue
 create mode 100644 tests/indent/vue_spec.lua

diff --git a/queries/vue/indents.scm b/queries/vue/indents.scm
index d8b011e0e..d6869803b 100644
--- a/queries/vue/indents.scm
+++ b/queries/vue/indents.scm
@@ -3,3 +3,5 @@
 [
   (template_element)
 ] @indent
+
+(template_element (end_tag "</" @branch ">" @indent_end))
diff --git a/tests/indent/vue/template_indent.vue b/tests/indent/vue/template_indent.vue
new file mode 100644
index 000000000..95d891f84
--- /dev/null
+++ b/tests/indent/vue/template_indent.vue
@@ -0,0 +1,3 @@
+<template>
+  Foo
+</template>
diff --git a/tests/indent/vue_spec.lua b/tests/indent/vue_spec.lua
new file mode 100644
index 000000000..09527e4b0
--- /dev/null
+++ b/tests/indent/vue_spec.lua
@@ -0,0 +1,24 @@
+local Runner = require("tests.indent.common").Runner
+-- local XFAIL = require("tests.indent.common").XFAIL
+
+local run = Runner:new(it, "tests/indent", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent Vue:", function()
+  describe("whole file:", function()
+    run:whole_file({ "vue/" }, {})
+  end)
+
+  describe("new line:", function()
+    for _, info in ipairs {
+      { 1, 2 },
+      { 3, 0 },
+    } do
+      run:new_line("vue/template_indent.vue", { on_line = info[1], text = "Foo", indent = info[2] }, info[3], info[4])
+    end
+  end)
+end)

From 980f0816cc28c20e45715687a0a21b5b39af59eb Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 6 Mar 2023 06:41:23 +0000
Subject: [PATCH 0082/2704] Update parsers: markdown, markdown_inline, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5b60f8f54..f9c5fb18a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -273,10 +273,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "10b9b5ad8742456b383908868b14709d73ff81f4"
+    "revision": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"
   },
   "markdown_inline": {
-    "revision": "10b9b5ad8742456b383908868b14709d73ff81f4"
+    "revision": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"
   },
   "matlab": {
     "revision": "2d5d3d5193718a86477d4335aba5b34e79147326"
@@ -435,7 +435,7 @@
     "revision": "52e122ae68b316d3aa960a0a422d3645ba717f42"
   },
   "swift": {
-    "revision": "c249318113629435c75c7eedfd5d5bfcb4b6d12a"
+    "revision": "fe2e325a45056cdb3fcda821c03b8cef0d79e508"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 7947a2ccf10c746133200413e78b39482c6f7ef4 Mon Sep 17 00:00:00 2001
From: Daniel Woznicki <daniel.woznicki@gmail.com>
Date: Mon, 6 Mar 2023 15:10:31 -0800
Subject: [PATCH 0083/2704] fix: Java indent for multiple line arguments
 (#4449)

* fix Java indent for multiple line arguments, fixes #4448, add an additional test for methods with arguments on multiple lines

* Satisfy StyLua check

---------

Co-authored-by: Daniel Woznicki <danwoz@nettoolkit.com>
---
 queries/java/indents.scm                                    | 1 -
 .../java/constructor_with_arguments_on_multiple_lines.java  | 6 ++++++
 .../java/method_with_arguments_on_multiple_lines.java       | 6 ++++++
 tests/indent/java_spec.lua                                  | 2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/java/constructor_with_arguments_on_multiple_lines.java
 create mode 100644 tests/indent/java/method_with_arguments_on_multiple_lines.java

diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index bd86cdbed..033c314ec 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -2,7 +2,6 @@
   (class_body)
   (enum_body)
   (interface_body)
-  (constructor_declaration)
   (constructor_body)
   (block)
   (switch_block)
diff --git a/tests/indent/java/constructor_with_arguments_on_multiple_lines.java b/tests/indent/java/constructor_with_arguments_on_multiple_lines.java
new file mode 100644
index 000000000..bb97d4c62
--- /dev/null
+++ b/tests/indent/java/constructor_with_arguments_on_multiple_lines.java
@@ -0,0 +1,6 @@
+public class Testo {
+  public Testo(
+    String a
+  ) {
+  }
+}
diff --git a/tests/indent/java/method_with_arguments_on_multiple_lines.java b/tests/indent/java/method_with_arguments_on_multiple_lines.java
new file mode 100644
index 000000000..7eb7db18b
--- /dev/null
+++ b/tests/indent/java/method_with_arguments_on_multiple_lines.java
@@ -0,0 +1,6 @@
+public class Testo {
+  void hello(
+    String a
+  ) {
+  }
+}
diff --git a/tests/indent/java_spec.lua b/tests/indent/java_spec.lua
index 8629f6a3a..33003fd40 100644
--- a/tests/indent/java_spec.lua
+++ b/tests/indent/java_spec.lua
@@ -31,5 +31,7 @@ describe("indent Java:", function()
     )
     run:new_line("issue_2583.java", { on_line = 4, text = "int x = 1;", indent = 4 })
     run:new_line("method_chaining.java", { on_line = 4, text = '.append("b");', indent = 6 })
+    run:new_line("constructor_with_arguments_on_multiple_lines.java", { on_line = 4, text = "}", indent = 2 })
+    run:new_line("method_with_arguments_on_multiple_lines.java", { on_line = 4, text = "}", indent = 2 })
   end)
 end)

From 94f9a569736fea4c4128216800612a733e59b083 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 6 Mar 2023 23:09:24 +0700
Subject: [PATCH 0084/2704] indents(vue): Update dedent logic for <template>

---
 queries/vue/indents.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/vue/indents.scm b/queries/vue/indents.scm
index d6869803b..ab8375a23 100644
--- a/queries/vue/indents.scm
+++ b/queries/vue/indents.scm
@@ -4,4 +4,4 @@
   (template_element)
 ] @indent
 
-(template_element (end_tag "</" @branch ">" @indent_end))
+(template_element (end_tag ">" @indent_end) @branch)

From 356c9db3478b1bc6d0f0eefcb397989e50fdc35f Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 7 Mar 2023 06:41:21 +0000
Subject: [PATCH 0085/2704] Update parsers: yuck

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index f9c5fb18a..1f014fefc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -510,7 +510,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "48af129ab5411cd6f7ae2b36f53c1192572fa030"
+    "revision": "044fea8b9b9a19897d99b0a892bbaab4b5f44433"
   },
   "zig": {
     "revision": "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"

From ba4bce9bb79f5a5fb2e7b5a6b9b4b0fb256f3db9 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 7 Mar 2023 04:32:20 -0500
Subject: [PATCH 0086/2704] feat: add Uxn Tal

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua | 10 ++++
 queries/uxntal/folds.scm        |  7 +++
 queries/uxntal/highlights.scm   | 84 +++++++++++++++++++++++++++++++++
 queries/uxntal/indents.scm      | 17 +++++++
 queries/uxntal/injections.scm   |  1 +
 queries/uxntal/locals.scm       | 22 +++++++++
 8 files changed, 145 insertions(+)
 create mode 100644 queries/uxntal/folds.scm
 create mode 100644 queries/uxntal/highlights.scm
 create mode 100644 queries/uxntal/indents.scm
 create mode 100644 queries/uxntal/injections.scm
 create mode 100644 queries/uxntal/locals.scm

diff --git a/README.md b/README.md
index 6371f7c10..78a228a07 100644
--- a/README.md
+++ b/README.md
@@ -333,6 +333,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
+- [x] [uxn tal](https://github.com/amaanq/tree-sitter-uxntal) (maintained by @amaanq)
 - [x] [v](https://github.com/vlang/vls) (maintained by @kkharji)
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
diff --git a/lockfile.json b/lockfile.json
index 1f014fefc..2deb48d6b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -479,6 +479,9 @@
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
+  "uxntal": {
+    "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
+  },
   "v": {
     "revision": "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1185d02d3..a2fbe23d8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1520,6 +1520,16 @@ list.ungrammar = {
   maintainers = { "@Philipp-M", "@amaanq" },
 }
 
+list.uxntal = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-uxntal",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  filetype = "tal",
+  maintainers = { "@amaanq" },
+  readme_name = "uxn tal",
+}
+
 list.v = {
   install_info = {
     url = "https://github.com/vlang/vls",
diff --git a/queries/uxntal/folds.scm b/queries/uxntal/folds.scm
new file mode 100644
index 000000000..2043df867
--- /dev/null
+++ b/queries/uxntal/folds.scm
@@ -0,0 +1,7 @@
+[
+  (macro)
+  (memory_execution)
+  (subroutine)
+
+  (comment)
+] @fold
diff --git a/queries/uxntal/highlights.scm b/queries/uxntal/highlights.scm
new file mode 100644
index 000000000..25b1148d7
--- /dev/null
+++ b/queries/uxntal/highlights.scm
@@ -0,0 +1,84 @@
+; Includes
+
+(include
+  "~" @include
+  _ @text.uri @string.special)
+
+; Macros
+
+(macro
+  "%"
+  (identifier) @function.macro)
+
+((identifier) @function.macro
+  (#lua-match? @function.macro "^[a-z]?[0-9]*[A-Z-_]+$"))
+
+(rune
+  . rune_start: (rune_char ",")
+  . (identifier) @function.call)
+
+(rune
+  . rune_start: (rune_char ";")
+  . (identifier) @function.call)
+
+((identifier) @function.call
+  (#lua-match? @function.call "^:"))
+
+; Keywords
+
+(opcode) @keyword
+
+; Labels
+
+(label
+  "@" @symbol
+  (identifier) @function)
+
+(sublabel_reference
+  (identifier) @namespace
+  "/" @punctuation.delimiter
+  (identifier) @label)
+
+; Repeats
+
+((identifier) @repeat
+  (#eq? @repeat "while"))
+
+; Variables
+
+(identifier) @variable
+
+; Literals
+
+(raw_ascii) @string
+
+(hex_literal
+  "#" @symbol
+  (hex_lit_value) @string.special)
+
+(number) @number
+
+; Punctuation
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[
+  "%"
+  "|"
+  "$"
+  ","
+  "_"
+  "."
+  "-"
+  ";"
+  "="
+  "!"
+  "?"
+  "&"
+] @punctuation.special
+
+; Comments
+
+(comment) @comment @spell
diff --git a/queries/uxntal/indents.scm b/queries/uxntal/indents.scm
new file mode 100644
index 000000000..2802cfd1f
--- /dev/null
+++ b/queries/uxntal/indents.scm
@@ -0,0 +1,17 @@
+(memory_execution) @auto
+
+[
+  (subroutine)
+  (brackets)
+] @indent
+
+"}" @indent_end
+
+[ "{" "}" ] @branch
+
+[ "[" "]" ] @branch
+
+[
+  (ERROR)
+  (comment)
+] @auto
diff --git a/queries/uxntal/injections.scm b/queries/uxntal/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/uxntal/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/uxntal/locals.scm b/queries/uxntal/locals.scm
new file mode 100644
index 000000000..0a8ddee96
--- /dev/null
+++ b/queries/uxntal/locals.scm
@@ -0,0 +1,22 @@
+; Scopes
+
+[
+  (program)
+  (macro)
+  (memory_execution)
+  (subroutine)
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(label
+  "@"
+  . (identifier) @definition.function)
+
+(macro
+  "%"
+  . (identifier) @definition.macro)

From 71be7c04d5f55e931b4503a58464dae6519de29f Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 6 Mar 2023 04:46:43 -0500
Subject: [PATCH 0087/2704] feat: add Squirrel

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/squirrel/folds.scm      |  27 +++
 queries/squirrel/highlights.scm | 307 ++++++++++++++++++++++++++++++++
 queries/squirrel/indents.scm    |  58 ++++++
 queries/squirrel/injections.scm |   9 +
 queries/squirrel/locals.scm     |  67 +++++++
 8 files changed, 480 insertions(+)
 create mode 100644 queries/squirrel/folds.scm
 create mode 100644 queries/squirrel/highlights.scm
 create mode 100644 queries/squirrel/indents.scm
 create mode 100644 queries/squirrel/injections.scm
 create mode 100644 queries/squirrel/locals.scm

diff --git a/README.md b/README.md
index 78a228a07..80c22a91d 100644
--- a/README.md
+++ b/README.md
@@ -314,6 +314,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)
 - [x] [sparql](https://github.com/BonaBeavis/tree-sitter-sparql) (maintained by @BonaBeavis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
+- [x] [squirrel](https://github.com/amaanq/tree-sitter-squirrel) (maintained by @amaanq)
 - [x] [starlark](https://github.com/amaanq/tree-sitter-starlark) (maintained by @amaanq)
 - [x] [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) (maintained by @madskjeldgaard)
 - [x] [surface](https://github.com/connorlay/tree-sitter-surface) (maintained by @connorlay)
diff --git a/lockfile.json b/lockfile.json
index 2deb48d6b..cbe57a265 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -422,6 +422,9 @@
   "sql": {
     "revision": "1cb7c7a11015983f6d173847d5a3574f8e20107b"
   },
+  "squirrel": {
+    "revision": "518ab2feba8e14147009e788530b8ac88dfa9e73"
+  },
   "starlark": {
     "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a2fbe23d8..42b495a1d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1329,6 +1329,14 @@ list.sql = {
   maintainers = { "@derekstride" },
 }
 
+list.squirrel = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-squirrel",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.starlark = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-starlark",
diff --git a/queries/squirrel/folds.scm b/queries/squirrel/folds.scm
new file mode 100644
index 000000000..db0b9c581
--- /dev/null
+++ b/queries/squirrel/folds.scm
@@ -0,0 +1,27 @@
+[
+  (class_declaration)
+  (function_declaration)
+  (member_declaration)
+  (enum_declaration)
+
+  (array)
+  (block)
+  (table)
+  (anonymous_function)
+  (parenthesized_expression)
+
+  (string)
+  (verbatim_string)
+
+  (comment)
+
+  (if_statement)
+  (else_statement)
+  (while_statement)
+  (do_while_statement)
+  (switch_statement)
+  (for_statement)
+  (foreach_statement)
+  (try_statement)
+  (catch_statement)
+] @fold
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
new file mode 100644
index 000000000..b35c7cbf1
--- /dev/null
+++ b/queries/squirrel/highlights.scm
@@ -0,0 +1,307 @@
+; Keywords
+
+[
+  "class"
+  "clone"
+  "delete"
+  "enum"
+  "extends"
+  "rawcall"
+  "resume"
+  "var"
+] @keyword
+
+[
+  "function"
+] @keyword.function
+
+[
+  "in"
+  "instanceof"
+  "typeof"
+] @keyword.operator
+
+[
+  "return"
+  "yield"
+] @keyword.return
+
+((global_variable
+   "::"
+   (_) @keyword.coroutine)
+  (#any-of? @keyword.coroutine "suspend" "newthread"))
+
+; Conditionals
+
+[
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
+  "break"
+] @conditional
+
+; Repeats
+
+[
+  "for"
+  "foreach"
+  "do"
+  "while"
+  "continue"
+] @repeat
+
+; Exceptions
+
+[
+  "try"
+  "catch"
+  "throw"
+] @exception
+
+; Storageclasses
+
+[
+  "local"
+] @storageclass
+
+; Qualifiers
+
+[
+  "static"
+  "const"
+] @type.qualifier
+
+; Variables
+
+(identifier) @variable 
+
+(local_declaration
+  (identifier) @variable.local
+  . "=")
+
+
+(global_variable) @variable.global
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "base" "this" "vargv"))
+
+; Parameters
+
+(parameter
+  . (identifier) @parameter)
+
+; Properties (Slots)
+
+(deref_expression
+  "."
+  . (identifier) @property)
+
+(member_declaration
+  (identifier) @property
+  . "=")
+
+((table_slot
+  . (identifier) @property
+  . ["=" ":"])
+  (#set! "priority" 105))
+
+; Types
+
+((identifier) @type
+ (#lua-match? @type "^[A-Z]"))
+
+(class_declaration
+  (identifier) @type
+  "extends"? . (identifier)? @type)
+
+(enum_declaration
+  (identifier) @type)
+
+; Attributes
+
+(attribute_declaration
+  left: (identifier) @attribute)
+
+; Functions & Methods
+
+(member_declaration
+  (function_declaration
+    "::"? (_) @method . "(" (_)? ")"))
+
+((function_declaration
+   "::"? (_) @function . "(" (_)? ")")
+  (#not-has-ancestor? @function member_declaration))
+
+(call_expression
+  function: (identifier) @function.call)
+
+(call_expression
+  function: (deref_expression
+    "." . (identifier) @function.call))
+
+(call_expression
+  (global_variable
+    "::"
+    (_) @function.call))
+
+(_
+  (identifier) @function
+  "="
+  (lambda_expression
+    "@" @symbol))
+
+(call_expression 
+  [
+   function: (identifier) @function.builtin
+   function: (global_variable "::" (_) @function.builtin)
+   function: (deref_expression "." (_) @function.builtin)
+  ]
+  (#any-of? @function.builtin
+   ; General Methods
+   "assert" "array" "callee" "collectgarbage" "compilestring"
+   "enabledebughook" "enabledebuginfo" "error" "getconsttable"
+   "getroottable" "print" "resurrectunreachable" "setconsttable"
+   "setdebughook" "seterrorhandler" "setroottable" "type"
+
+   ; Hidden Methods
+   "_charsize_" "_intsize_" "_floatsize_" "_version_" "_versionnumber_"
+
+   ; Number Methods
+   "tofloat" "tostring" "tointeger" "tochar"
+
+   ; String Methods
+   "len" "slice" "find" "tolower" "toupper"
+
+   ; Table Methods
+   "rawget" "rawset" "rawdelete" "rawin" "clear" 
+   "setdelegate" "getdelegate" "filter" "keys" "values"
+
+   ; Array Methods
+   "append" "push" "extend" "pop" "top" "insert" "remove" "resize" "sort"
+   "reverse" "map" "apply" "reduce"
+
+   ; Function Methods
+   "call" "pcall" "acall" "pacall" "setroot" "getroot" "bindenv" "getinfos"
+
+   ; Class Methods
+   "instance" "getattributes" "setattributes" "newmember" "rawnewmember"
+
+   ; Class Instance Methods
+   "getclass"
+
+   ; Generator Methods
+   "getstatus"
+
+   ; Thread Methods
+   "call" "wakeup" "wakeupthrow" "getstackinfos"
+
+   ; Weak Referece Methods
+   "ref" "weakref"
+))
+
+(member_declaration
+  "constructor" @constructor)
+
+; Constants
+
+(const_declaration
+  "const"
+  . (identifier) @constant)
+
+(enum_declaration
+  "{"
+  . (identifier) @constant)
+
+((identifier) @constant
+ (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "||"
+  "&&"
+  "|"
+  "^"
+  "&"
+  "=="
+  "!="
+  "<=>"
+  ">"
+  ">="
+  "<="
+  "<"
+  "<<"
+  ">>"
+  ">>>"
+  "="
+  "<-"
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "~"
+  "!"
+  "++"
+  "--"
+] @operator
+
+; Punctuation
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[ "</" "/>" ] @punctuation.bracket
+
+[
+  "."
+  ","
+  ";"
+  ":"
+] @punctuation.delimiter
+
+[
+  "::"
+  "..."
+] @punctuation.special
+
+; Ternaries
+
+(ternary_expression
+  "?" @conditional.ternary
+  ":" @conditional.ternary)
+
+; Literals
+
+(string) @string
+
+(verbatim_string) @string.special
+
+(char) @character
+
+(escape_sequence) @string.escape
+
+(integer) @number
+
+(float) @float
+
+(bool) @boolean
+
+(null) @constant.builtin
+
+; Comments
+
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
diff --git a/queries/squirrel/indents.scm b/queries/squirrel/indents.scm
new file mode 100644
index 000000000..6649b732b
--- /dev/null
+++ b/queries/squirrel/indents.scm
@@ -0,0 +1,58 @@
+[
+  (class_declaration)
+  (function_declaration)
+  (enum_declaration)
+
+  (array)
+  (block)
+  (table)
+  (anonymous_function)
+  (parenthesized_expression)
+
+  (while_statement)
+  (switch_statement)
+  (for_statement)
+  (foreach_statement)
+  ; (try_statement)
+  (catch_statement)
+] @indent
+
+(
+  (if_statement)
+  (ERROR "else") @indent
+)
+
+(if_statement
+  condition: (_) @indent)
+
+(if_statement
+  consequence: (_)
+  (else_statement) @indent)
+
+(do_while_statement
+  "do"
+  (_) @indent)
+
+(try_statement
+  (_) @indent
+  (catch_statement) @indent)
+
+[ "{" "}" ] @branch
+
+[ "(" ")" ] @branch
+
+[ "[" "]" ] @branch
+
+[
+  "}"
+  ")"
+  "]"
+] @indent_end
+
+[
+  (ERROR)
+  (comment)
+
+  (string)
+  (verbatim_string)
+] @auto
diff --git a/queries/squirrel/injections.scm b/queries/squirrel/injections.scm
new file mode 100644
index 000000000..97cd40350
--- /dev/null
+++ b/queries/squirrel/injections.scm
@@ -0,0 +1,9 @@
+(comment) @comment
+
+((verbatim_string) @html
+  (#lua-match? @html "^@\"<html")
+  (#offset! @html 0 2 0 -1))
+
+((verbatim_string) @html
+  (#lua-match? @html "@\"<!DOCTYPE html>")
+  (#offset! @html 0 2 0 -1))
diff --git a/queries/squirrel/locals.scm b/queries/squirrel/locals.scm
new file mode 100644
index 000000000..11486d1e4
--- /dev/null
+++ b/queries/squirrel/locals.scm
@@ -0,0 +1,67 @@
+; Scopes
+
+[
+  (script)
+  (class_declaration)
+  (enum_declaration)
+  (function_declaration)
+  (attribute_declaration)
+
+  (array)
+  (block)
+  (table)
+  (anonymous_function)
+  (parenthesized_expression)
+
+  (if_statement)
+  (else_statement)
+  (while_statement)
+  (do_while_statement)
+  (switch_statement)
+  (for_statement)
+  (foreach_statement)
+  (try_statement)
+  (catch_statement)
+] @scope
+
+
+; References
+
+[
+  (identifier)
+  (global_variable)
+] @reference
+
+; Definitions
+
+(const_declaration
+  . (identifier) @definition.constant)
+
+(enum_declaration
+  . (identifier) @definition.enum)
+
+(member_declaration
+  (identifier) @definition.field 
+  . "=")
+
+(table_slot
+  . (identifier) @definition.field
+  . ["=" ":"])
+
+((function_declaration
+  . (identifier) @definition.function)
+  (#not-has-ancestor? @definition.function member_declaration))
+
+(member_declaration
+  (function_declaration
+    . (identifier) @definition.method))
+
+(class_declaration
+  . (identifier) @definition.type)
+
+(var_statement
+  "var" . (identifier) @definition.variable)
+
+(local_declaration
+  (identifier) @definition.variable 
+  . "=")

From d086563c02a582a552086ea94bfabd5f49d6872a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 8 Mar 2023 06:40:35 +0000
Subject: [PATCH 0088/2704] Update parsers: squirrel, yuck

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cbe57a265..6956fc3ba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -423,7 +423,7 @@
     "revision": "1cb7c7a11015983f6d173847d5a3574f8e20107b"
   },
   "squirrel": {
-    "revision": "518ab2feba8e14147009e788530b8ac88dfa9e73"
+    "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
   },
   "starlark": {
     "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"
@@ -516,7 +516,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "044fea8b9b9a19897d99b0a892bbaab4b5f44433"
+    "revision": "fefe8e32ac5306b261af6af52571e13edf7b420c"
   },
   "zig": {
     "revision": "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"

From fc1ca10bfbdee17e29374d0d1bac8ea030539dc3 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Wed, 8 Mar 2023 21:28:43 +0100
Subject: [PATCH 0089/2704] highlights(sql): add new keywords and datatypes

---
 lockfile.json              |  2 +-
 queries/sql/highlights.scm | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 6956fc3ba..414dd288e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -420,7 +420,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "1cb7c7a11015983f6d173847d5a3574f8e20107b"
+    "revision": "84a2b208f072a2ca78fc59b5fa51cbdbf9c5aa37"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index db413cc0e..df8fbb7c8 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -204,18 +204,25 @@
  (keyword_unbounded)
  (keyword_unique)
  (keyword_cascade)
+ (keyword_delayed)
+ (keyword_high_priority)
+ (keyword_low_priority)
+ (keyword_ignore)
+ (keyword_nothing)
 ] @type.qualifier
 
 [
   (keyword_int)
   (keyword_null)
   (keyword_boolean)
+  (keyword_binary)
   (keyword_bit)
   (keyword_smallserial)
   (keyword_serial)
   (keyword_bigserial)
   (keyword_smallint)
   (keyword_bigint)
+  (keyword_tinyint)
   (keyword_decimal)
   (keyword_float)
   (keyword_numeric)
@@ -224,7 +231,9 @@
   (keyword_money)
   (keyword_char)
   (keyword_varchar)
+  (keyword_varying)
   (keyword_text)
+  (keyword_string)
   (keyword_uuid)
   (keyword_json)
   (keyword_jsonb)
@@ -248,6 +257,7 @@
   (keyword_not)
   (keyword_by)
   (keyword_on)
+  (keyword_do)
 ] @keyword.operator
 
 [

From 1de237d10d2d3da8458125327481dffbf6594f82 Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Fri, 10 Mar 2023 03:04:16 +0100
Subject: [PATCH 0090/2704] feat: improve yuck highlighting

---
 lockfile.json               |   2 +-
 queries/yuck/highlights.scm | 227 +++++++++++++-----------------------
 2 files changed, 85 insertions(+), 144 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 414dd288e..c5e304ec2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -516,7 +516,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "fefe8e32ac5306b261af6af52571e13edf7b420c"
+    "revision": "e3d91a3c65decdea467adebe4127b8366fa47919"
   },
   "zig": {
     "revision": "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"
diff --git a/queries/yuck/highlights.scm b/queries/yuck/highlights.scm
index 8b2ca5814..0caf78c84 100644
--- a/queries/yuck/highlights.scm
+++ b/queries/yuck/highlights.scm
@@ -1,148 +1,96 @@
 ; Tags
 
+; TODO apply to every symbol in list? I think it should probably only be applied to the first child of the list
 (list
   (symbol) @tag)
 
 ; Includes
 
-((symbol) @include
-  (#match? @include "include"))
+(list .
+  ((symbol) @include
+    (#eq? @include "include")))
 
 ; Keywords
 
-((symbol) @keyword
-  (#any-of? @keyword "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "for" "geometry" "children" "struts"))
+; I think there's a bug in tree-sitter the anchor doesn't seem to be working, see
+; https://github.com/tree-sitter/tree-sitter/pull/2107
+(list .
+  ((symbol) @keyword
+    (#any-of? @keyword "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "geometry" "children" "struts")))
+
+; Loop
+
+(loop_widget . "for" @repeat . (symbol) @variable . "in" @keyword.operator)
+
+(loop_widget . "for" @repeat . (symbol) @variable . "in" @keyword.operator . (symbol) @variable)
+
+; Builtin widgets
+
+(list .
+  ((symbol) @tag.builtin
+    (#any-of? @tag.builtin
+      "box"
+      "button"
+      "calendar"
+      "centerbox"
+      "checkbox"
+      "circular-progress"
+      "color-button"
+      "color-chooser"
+      "combo-box-text"
+      "eventbox"
+      "expander"
+      "graph"
+      "image"
+      "input"
+      "label"
+      "literal"
+      "overlay"
+      "progress"
+      "revealer"
+      "scale"
+      "scroll"
+      "transform")))
+
+; Variables
+
+(ident) @variable
+
+(array
+  (symbol) @variable)
+
+; Properties & Fields
+
+(keyword) @property
+
+(json_access
+  (_)
+  "["
+  (simplexpr
+    (ident) @property))
+
+(json_safe_access
+  (_)
+  "?."
+  "["
+  (simplexpr
+    (ident) @property))
+
+(json_dot_access
+  (index) @property)
+
+(json_safe_dot_access
+  (index) @property)
+
+(json_object
+  (simplexpr
+    (ident) @field))
 
 ; Functions
 
 (function_call
   name: (ident) @function.call)
 
-; Variables
-
-(array
-  (symbol) @variable)
-
-(binary_expression
-	(simplexpr
-    (ident) @variable))
-
-(unary_expression
-	(simplexpr
-    (ident) @variable))
-
-(ternary_expression
-	(simplexpr
-		(ident) @variable))
-
-(array
-  (symbol) @variable)
-
-(json_access
-	(simplexpr
-		(ident) @variable))
-
-(json_safe_access
-	(simplexpr
-		(ident) @variable))
-
-(json_array
-	(simplexpr
-    (ident) @variable))
-
-(json_dot_access
-	(simplexpr
-		(ident) @variable))
-
-(json_safe_dot_access
-	(simplexpr
-		(ident) @variable))
-
-(json_object
-  (_)
-  ":"
-	(simplexpr
-		(ident) @variable))
-
-; Properties & Fields
-
-(keyword) @property
-
-(json_access
-  (_)
-  "["
-	(simplexpr
-		(ident) @property))
-
-(json_safe_access
-  (_)
-  "?."
-  "["
-	(simplexpr
-		(ident) @property))
-
-(json_dot_access
-  (index) @property)
-
-(json_safe_dot_access
-  (index) @property)
-
-(json_object
-	(simplexpr
-		(ident) @field))
-
-; Operators
-
-[
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-	"&&"
-  "||"
-  "=="
-  "!="
-  "=~"
-	">="
-	"<="
-  ">"
-  "<"
-	"?:"
-	"?."
-  "!"
-] @operator
-
-(ternary_expression
-  ["?" ":"] @conditional.ternary)
-
-; Properties & Fields
-
-(keyword) @property
-
-(json_access
-  (_)
-  "["
-	(simplexpr
-		(ident) @property))
-
-(json_safe_access
-  (_)
-  "?."
-  "["
-	(simplexpr
-		(ident) @property))
-
-(json_dot_access
-  (index) @property)
-
-(json_safe_dot_access
-  (index) @property)
-
-(json_object
-	(simplexpr
-		(ident) @field))
-
 ; Operators
 
 [
@@ -162,21 +110,19 @@
   "<="
   "!"
   "?."
+  "?:"
 ] @operator
 
-(ternary_expression
-  ["?" ":"] @conditional.ternary)
-
 ; Punctuation
 
-[
-  ":"
-  "."
-  ","
-] @punctuation.delimiter
-
+[":" "." ","] @punctuation.delimiter
 ["{" "}" "[" "]" "(" ")"] @punctuation.bracket
 
+; Ternary expression
+
+(ternary_expression
+  ["?" ":"] @conditional.ternary)
+
 ; Literals
 
 (number) @number
@@ -199,11 +145,6 @@
 
 (comment) @comment @spell
 
-; Other stuff that has not been catched by the previous queries yet
-
-(ident) @variable
-(index) @property
-
 ; Errors
 
 (ERROR) @error

From 964dc882e9083a4f75b7b6507d640271174466bf Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 9 Mar 2023 16:56:19 -0500
Subject: [PATCH 0091/2704] Partially Revert "fix(ecma): properly capture
 constants in const declarations"

This partially reverts commit c553e6c5608ba54e210e9131bf9ba5e36ef18e57.
---
 queries/ecma/highlights.scm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 82a0b99ab..be70ffd13 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -29,11 +29,6 @@
 ((shorthand_property_identifier) @constant
  (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
 
-(lexical_declaration
-  "const"
-  . (variable_declarator
-      . name: (identifier) @constant))
-
 ((identifier) @variable.builtin
  (#vim-match? @variable.builtin "^(arguments|module|console|window|document)$"))
 

From 4096d010c517734007fe37f1d0e97efcb11fe297 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 8 Mar 2023 05:59:55 -0500
Subject: [PATCH 0092/2704] fix(gleam): add scanner.c to parsers list & update
 lockfile

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c5e304ec2..ff5dbd483 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -153,7 +153,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "cfcbca3f8f734773878e00d7bfcedea98eb10be2"
+    "revision": "ae79782c00656945db69641378e688cdb78d52c1"
   },
   "glimmer": {
     "revision": "40cfb72a53654cbd666451ca04ffd500257c7b73"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 42b495a1d..b462805b7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -529,8 +529,7 @@ list.gitignore = {
 list.gleam = {
   install_info = {
     url = "https://github.com/J3RN/tree-sitter-gleam",
-    files = { "src/parser.c" },
-    branch = "main",
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@connorlay" },
 }

From faa4caa661903fda8027b45f41c24571c462e110 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 8 Mar 2023 16:37:58 -0500
Subject: [PATCH 0093/2704] chore(gleam): update parser info

---
 lua/nvim-treesitter/parsers.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b462805b7..235e2a094 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -528,10 +528,10 @@ list.gitignore = {
 
 list.gleam = {
   install_info = {
-    url = "https://github.com/J3RN/tree-sitter-gleam",
+    url = "https://github.com/gleam-lang/tree-sitter-gleam",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@connorlay" },
+  maintainers = { "@amaanq" },
 }
 
 list.glimmer = {

From c8c083e8ce9449876bac00ef91d47e38b1f39a43 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 8 Mar 2023 16:38:18 -0500
Subject: [PATCH 0094/2704] fix(gleam): update highlights from upstream

---
 queries/gleam/folds.scm      |  3 --
 queries/gleam/highlights.scm | 69 +++++++++++++++++++-----------------
 queries/gleam/indents.scm    | 13 +++----
 3 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/queries/gleam/folds.scm b/queries/gleam/folds.scm
index ff05eeb05..fbcec0ef1 100644
--- a/queries/gleam/folds.scm
+++ b/queries/gleam/folds.scm
@@ -3,9 +3,6 @@
   (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
index 00cabd171..f7eb1c5e7 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -2,14 +2,15 @@
 [
   "as"
   "let"
+  "panic"
   "todo"
-  "try"
+  "type"
+  "use"
 ] @keyword
 
 ; Function Keywords
 [
   "fn"
-  "type"
 ] @keyword.function
 
 ; Imports
@@ -26,6 +27,7 @@
 ; Exceptions
 [
   "assert"
+  "try"
 ] @exception
 
 ; Punctuation
@@ -43,6 +45,8 @@
 [
   ","
   "."
+  ":"
+  "->"
 ] @punctuation.delimiter
 
 [
@@ -59,11 +63,9 @@
   "+."
   "-"
   "-."
-  "->"
   ".."
   "/"
   "/."
-  ":"
   "<"
   "<."
   "<="
@@ -98,7 +100,7 @@
 ] @comment
 
 ; Modules & Imports
-(module ("/" @namespace)?) @namespace
+(module) @namespace
 (import alias: ((identifier) @namespace)?)
 (remote_type_identifier module: (identifier) @namespace)
 (unqualified_import name: (identifier) @function)
@@ -110,43 +112,37 @@
 (bit_string_segment) @string.special
 
 ; Numbers
-[
-  (integer)
-  (float)
-  (bit_string_segment_option_unit)
-] @number
+(integer) @number
+
+(float) @float
 
 ; Function Parameter Labels
-(function_call arguments: (arguments (argument label: (label) @symbol ":" @symbol)))
-(function_parameter label: (label)? @symbol name: (identifier) @parameter (":" @parameter)?)
+(function_call arguments: (arguments (argument label: (label) @label)))
+(function_parameter label: (label)? @label name: (identifier) @parameter)
 
 ; Records
-(record arguments: (arguments (argument label: (label) @property ":" @property)?))
-(record_pattern_argument  label: (label) @property ":" @property)
-(record_update_argument label: (label) @property ":" @property)
+(record arguments: (arguments (argument label: (label) @property)?))
+(record_pattern_argument  label: (label) @property)
+(record_update_argument label: (label) @property)
 (field_access record: (identifier) @variable field: (label) @property)
-
-; Type Constructors
-(data_constructor_argument label: (label) @property ":" @property)
-
-; Type Parameters
-(type_parameter) @parameter
+(data_constructor_argument (label) @property)
 
 ; Types
-((type_identifier) @type (#not-any-of? @type "True" "False"))
+[
+  (type_identifier)
+  (type_parameter)
+  (type_var)
+] @type
 
-; Booleans
-((type_identifier) @boolean (#any-of? @boolean "True" "False"))
-
-; Type Variables
-(type_var) @type
+((type_identifier) @type.builtin
+  (#any-of? @type.builtin "Int" "Float" "String" "List"))
 
 ; Type Qualifiers
 [
   "const"
   "external"
-  "opaque"
-  "pub"
+  (opacity_modifier)
+  (visibility_modifier)
 ] @type.qualifier
 
 ; Tuples
@@ -154,15 +150,22 @@
 
 ; Functions
 (function name: (identifier) @function)
-(public_function name: (identifier) @function)
-(function_call function: (identifier) @function)
-(function_call function: (field_access field: (label) @function))
+(function_call function: (identifier) @function.call)
+(function_call function: (field_access field: (label) @function.call))
 
 ; External Functions
-(public_external_function name: (identifier) @function)
 (external_function name: (identifier) @function)
 (external_function_body (string) @namespace . (string) @function)
 
+; Constructors
+(constructor_name) @type @constructor
+
+([(type_identifier) (constructor_name)] @constant.builtin
+  (#any-of? @constant.builtin "Ok" "Error"))
+
+; Booleans
+((constructor_name) @boolean (#any-of? @boolean "True" "False"))
+
 ; Pipe Operator
 (binary_expression operator: "|>" right: (identifier) @function)
 
diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
index e2259b688..61986b26f 100644
--- a/queries/gleam/indents.scm
+++ b/queries/gleam/indents.scm
@@ -10,17 +10,14 @@
   (import)
   (let)
   (list)
-  (public_constant)
-  (public_external_function)
-  (public_function)
-  (public_opaque_type_definition)
-  (public_type_alias)
-  (public_type_definition)
+  (constant)
+  (external_function)
+  (function)
+  (type_definition)
+  (type_alias)
   (todo)
   (try)
   (tuple)
-  (type_alias)
-  (type_definition)
 ] @indent
 
 [

From 4a4c475617b6c6cbf5ddbc26558a695b11474040 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 8 Mar 2023 21:40:09 -0500
Subject: [PATCH 0095/2704] fix(gleam): update tests reflecting recent changes

---
 tests/query/highlights/gleam/assert.gleam   |   6 +-
 tests/query/highlights/gleam/function.gleam | 106 ++++++++++----------
 tests/query/highlights/gleam/import.gleam   |   8 +-
 tests/query/highlights/gleam/pipe.gleam     |   4 +-
 tests/query/highlights/gleam/try.gleam      |   4 +-
 tests/query/highlights/gleam/type.gleam     |  77 +++++++-------
 6 files changed, 103 insertions(+), 102 deletions(-)

diff --git a/tests/query/highlights/gleam/assert.gleam b/tests/query/highlights/gleam/assert.gleam
index e49b3d2c4..3711339bb 100644
--- a/tests/query/highlights/gleam/assert.gleam
+++ b/tests/query/highlights/gleam/assert.gleam
@@ -1,13 +1,13 @@
 pub fn main() {
   assert Ok(i) = parse_int("123")
   // <- exception
-  //     ^ type
+  //     ^^ constructor
   //       ^ punctuation.bracket
   //        ^ variable
   //         ^ punctuation.bracket
   //           ^ operator
-  //             ^ function
+  //             ^^^^^^^^^ function.call
   //                      ^ punctuation.bracket
-  //                       ^ string
+  //                       ^^^^^ string
   //                            ^ punctuation.bracket
 }
diff --git a/tests/query/highlights/gleam/function.gleam b/tests/query/highlights/gleam/function.gleam
index bc69ec620..cf2fbf969 100644
--- a/tests/query/highlights/gleam/function.gleam
+++ b/tests/query/highlights/gleam/function.gleam
@@ -1,18 +1,18 @@
 pub fn add(x: Int, y: Int) -> Int {
 // <- type.qualifier
-//  ^ keyword.function
-//     ^ function
+//  ^^ keyword.function
+//     ^^^ function
 //        ^ punctuation.bracket
 //         ^ parameter
-//          ^ parameter
-//            ^ type
+//          ^ punctuation.delimiter
+//            ^^^ type.builtin
 //               ^ punctuation.delimiter
 //                 ^ parameter
-//                  ^ parameter
-//                    ^ type
+//                  ^ punctuation.delimiter
+//                    ^^^ type.builtin
 //                       ^ punctuation.bracket
-//                         ^ operator
-//                            ^ type
+//                         ^ punctuation.delimiter
+//                            ^^^ type.builtin
 //                                ^ punctuation.bracket
 }
 // <- punctuation.bracket
@@ -20,22 +20,22 @@ pub fn add(x: Int, y: Int) -> Int {
 pub fn twice(f: fn(t) -> t, x: t) -> t {
 // <- type.qualifier
 //  ^ keyword.function
-//     ^ function
+//     ^^^^^ function
 //          ^ punctuation.bracket
 //           ^ parameter
-//            ^ parameter
-//              ^ keyword.function
+//            ^ punctuation.delimiter
+//              ^^ keyword.function
 //                ^ punctuation.bracket
 //                 ^ type
 //                  ^ punctuation.bracket
-//                    ^ operator
+//                    ^^ punctuation.delimiter
 //                       ^ type
 //                        ^ punctuation.delimiter
 //                          ^ parameter
-//                           ^ parameter
+//                           ^ punctuation.delimiter
 //                             ^ type
 //                              ^ punctuation.bracket
-//                                ^ operator
+//                                ^^ punctuation.delimiter
 //                                   ^ type
 //                                     ^ punctuation.bracket
 }
@@ -46,11 +46,11 @@ fn list_of_two(my_value: a) -> List(a) {
 // ^ function
 //            ^ punctuation.bracket
 //             ^ parameter
-//                     ^ parameter
+//                     ^ punctuation.delimiter
 //                       ^ type
 //                        ^ punctuation.bracket
-//                          ^ operator
-//                             ^ type
+//                          ^ punctuation.delimiter
+//                             ^^^^ type.builtin
 //                                 ^ punctuation.bracket
 //                                  ^ type
 //                                   ^ punctuation.bracket
@@ -60,68 +60,68 @@ fn list_of_two(my_value: a) -> List(a) {
 
 fn replace(
 // <- keyword.function
-// ^ function
+// ^^^^^^^ function
 //        ^ punctuation.bracket
   in string: String,
-  // <- symbol
-  // ^ parameter
-  //       ^ parameter
-  //         ^ type
+  // <- label
+  // ^^^^^^ parameter
+  //       ^ punctuation.delimiter
+  //         ^^^^^^ type.builtin
   //               ^ punctuation.delimiter
   each pattern: String,
-  // <- symbol
-  //   ^ parameter
-  //          ^ parameter
-  //            ^ type
+  // <- label
+  //   ^^^^^^^ parameter
+  //          ^ punctuation.delimiter
+  //            ^^^^^^ type.builtin
   //                  ^ punctuation.delimiter
   with replacement: String,
-  // <- symbol
-  //   ^ parameter
-  //              ^ parameter
-  //                ^ type
+  // <- label
+  //   ^^^^^^^^^^^ parameter
+  //              ^ punctuation.delimiter
+  //                ^^^^^^ type.builtin
   //                      ^ punctuation.delimiter
 ) {
   replace(in: "A,B,C", each: ",", with: " ")
-  // <- function
+  // <- function.call
   //     ^ punctuation.bracket
-  //      ^ symbol
-  //        ^ symbol
-  //          ^ string
+  //      ^^ label
+  //        ^ punctuation.delimiter
+  //          ^^^^^^^ string
   //                 ^ punctuation.delimiter
-  //                   ^ symbol
-  //                       ^ symbol
-  //                         ^ string
+  //                   ^^^^ label
+  //                       ^ punctuation.delimiter
+  //                         ^^^ string
   //                            ^ punctuation.delimiter
-  //                              ^ symbol
-  //                                  ^ symbol
-  //                                    ^ string
+  //                              ^^^^ label
+  //                                  ^ punctuation.delimiter
+  //                                    ^^^ string
   //                                       ^ punctuation.bracket
 }
 // <- punctuation.bracket
 
 pub external fn random_float() -> Float = "rand" "uniform"
 // <- type.qualifier
-//  ^ type.qualifier
-//           ^ keyword.function
-//              ^ function
+//  ^^^^^^^^ type.qualifier
+//           ^^ keyword.function
+//              ^^^^^^^^^^^^ function
 //                          ^ punctuation.bracket
 //                           ^ punctuation.bracket
-//                             ^ operator
-//                                ^ type
+//                             ^^ punctuation.delimiter
+//                                ^^^^^ type.builtin
 //                                      ^ operator
-//                                        ^ namespace
-//                                               ^ function
+//                                        ^^^^^^ namespace
+//                                               ^^^^^^^^^ function
 
 pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
 // <- type.qualifier
-//  ^ type.qualifier
-//           ^ keyword.function
-//              ^ function
+//  ^^^^^^^^ type.qualifier
+//           ^^ keyword.function
+//              ^^^^^^^ function
 //                     ^ punctuation.bracket
 //                      ^ type
 //                       ^ punctuation.bracket
-//                         ^ operator
+//                         ^^ punctuation.delimiter
 //                            ^ type
 //                              ^ operator
-//                                ^ namespace
-//                                            ^ function
+//                                ^^^^^^^^^^^ namespace
+//                                            ^^^^^^^^^ function
diff --git a/tests/query/highlights/gleam/import.gleam b/tests/query/highlights/gleam/import.gleam
index 28356ca8c..c48b38199 100644
--- a/tests/query/highlights/gleam/import.gleam
+++ b/tests/query/highlights/gleam/import.gleam
@@ -1,7 +1,7 @@
 import gleam/io
 // <- include
 //     ^ namespace
-//          ^ namespace
+//          ^ operator
 //           ^ namespace
 
 import cat as kitten
@@ -13,10 +13,10 @@ import cat as kitten
 import animal/cat.{Cat, stroke}
 // <- include
 //     ^ namespace
-//           ^ namespace
+//           ^ operator
 //               ^ punctuation.delimiter
 //                ^ punctuation.bracket
-//                 ^ type
+//                 ^^^ type
 //                    ^ punctuation.delimiter
-//                      ^ function
+//                      ^^^^^^ function
 //                            ^ punctuation.bracket
diff --git a/tests/query/highlights/gleam/pipe.gleam b/tests/query/highlights/gleam/pipe.gleam
index 33f27312b..d0341217b 100644
--- a/tests/query/highlights/gleam/pipe.gleam
+++ b/tests/query/highlights/gleam/pipe.gleam
@@ -3,7 +3,7 @@ pub fn run() {
   // <- number
   |> add(_, 2)
   // <- operator
-  // ^ function
+  // ^^^ function.call
   //    ^ punctuation.bracket
   //     ^ comment
   //      ^ punctuation.delimiter
@@ -11,7 +11,7 @@ pub fn run() {
   //         ^ punctuation.bracket
   |> add(3)
   // <- operator
-  // ^ function
+  // ^^^ function.call
   //    ^ punctuation.bracket
   //     ^ number
   //      ^ punctuation.bracket
diff --git a/tests/query/highlights/gleam/try.gleam b/tests/query/highlights/gleam/try.gleam
index 136d44eb4..22c72c39e 100644
--- a/tests/query/highlights/gleam/try.gleam
+++ b/tests/query/highlights/gleam/try.gleam
@@ -1,9 +1,9 @@
 pub fn main() {
   try x = Ok(1)
-  // <- keyword
+  // <- exception
   //  ^ variable
   //    ^ operator
-  //      ^ type
+  //      ^^ constant.builtin
   //        ^ punctuation.bracket
   //         ^ number
   //          ^ punctuation.bracket
diff --git a/tests/query/highlights/gleam/type.gleam b/tests/query/highlights/gleam/type.gleam
index d25efde34..b44aceadc 100644
--- a/tests/query/highlights/gleam/type.gleam
+++ b/tests/query/highlights/gleam/type.gleam
@@ -1,18 +1,18 @@
 pub type Cat {
 // <- type.qualifier
-//  ^ keyword.function
-//       ^ type
+//  ^^^^ keyword
+//       ^^^ type
 //           ^ punctuation.bracket
   Cat(name: String, cuteness: Int)
-  // <- type
+  // <- constructor
   // ^ punctuation.bracket
-  //  ^ property
-  //      ^ property
-  //        ^ type
+  //  ^^^^ property
+  //      ^ punctuation.delimiter
+  //        ^^^^^^ type.builtin
   //              ^ punctuation.delimiter
-  //                ^ property
-  //                        ^ property
-  //                          ^ type
+  //                ^^^^^^^^ property
+  //                        ^ punctuation.delimiter
+  //                          ^^^ type.builtin
   //                             ^ punctuation.bracket
 }
 
@@ -20,64 +20,65 @@ fn cats() {
   Cat(name: "Nubi", cuteness: 2001)
   // <- type
   // ^ punctuation.bracket
-  //  ^ property
-  //      ^ property
-  //        ^ string
+  //  ^^^^ property
+  //      ^ punctuation.delimiter
+  //        ^^^^^^ string
   //              ^ punctuation.delimiter
-  //                ^ property
-  //                        ^ property
-  //                          ^ number
+  //                ^^^^^^^^ property
+  //                        ^ punctuation.delimiter
+  //                          ^^^^ number
+  //                              ^ punctuation.bracket
   Cat("Ginny", 1950)
-  // <- type
+  // <- constructor
   // ^ punctuation.bracket
-  //  ^ string
+  //  ^^^^^^^ string
   //         ^ punctuation.delimiter
-  //           ^ number
+  //           ^^^^ number
   //               ^ punctuation.bracket
 }
 
 type Box(inner_type) {
-// <- keyword.function
-//   ^ type
+// <- keyword
+//   ^^^ type
 //      ^ punctuation.bracket
-//       ^ parameter
+//       ^^^^^^^^^^ type
 //                 ^ punctuation.bracket
 //                   ^ punctuation.bracket
   Box(inner: inner_type)
-  // <- type
+  // <- constructor
   // ^ punctuation.bracket
-  //  ^ property
-  //       ^ property
-  //         ^ type
+  //  ^^^^^ property
+  //       ^ punctuation.delimiter
+  //         ^^^^^^^^^^ type
   //                   ^ punctuation.bracket
 }
 
 pub opaque type Counter {
 // <- type.qualifier
-//  ^ type.qualifier
-//         ^ keyword.function
-//              ^ type
+//  ^^^^^^ type.qualifier
+//         ^^^^ keyword
+//              ^^^^^^^ type
 //                      ^ punctuation.bracket
   Counter(value: Int)
 }
 
 pub fn have_birthday(person) {
   Person(..person, age: person.age + 1, is_happy: True)
-  // <- type
+  // <- constructor
   //    ^ punctuation.bracket
-  //     ^ operator
-  //       ^ variable
+  //     ^^ operator
+  //       ^^^^^^ variable
   //             ^ punctuation.delimiter
-  //               ^ property
-  //                  ^ property
-  //                    ^ variable
+  //               ^^^ property
+  //                  ^ punctuation.delimiter
+  //                    ^^^^^^ variable
   //                          ^ punctuation.delimiter
-  //                           ^ property
+  //                           ^^^ property
   //                               ^ operator
   //                                 ^ number
   //                                  ^ punctuation.delimiter
-  //                                    ^ property
-  //                                            ^ property
-  //                                              ^ boolean
+  //                                    ^^^^^^^^ property
+  //                                            ^ punctuation.delimiter
+  //                                              ^^^^ boolean
   //                                                  ^ punctuation.bracket
 }

From d2a7022d5d51a8dbf19bee2a5e3e440d02d60339 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Fri, 10 Mar 2023 07:42:03 +0000
Subject: [PATCH 0096/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 80c22a91d..ed5736bd2 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) (maintained by @ObserverOfTime)
 - [x] [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) (maintained by @gbprod)
 - [x] [gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) (maintained by @theHamsta)
-- [x] [gleam](https://github.com/J3RN/tree-sitter-gleam) (maintained by @connorlay)
+- [x] [gleam](https://github.com/gleam-lang/tree-sitter-gleam) (maintained by @amaanq)
 - [x] [Glimmer and Ember](https://github.com/alexlafroscia/tree-sitter-glimmer) (maintained by @NullVoxPopuli)
 - [x] [glsl](https://github.com/theHamsta/tree-sitter-glsl) (maintained by @theHamsta)
 - [x] [go](https://github.com/tree-sitter/tree-sitter-go) (maintained by @theHamsta, @WinWisely268)

From 0db1cc348eec72788d8424add78910ee218f6516 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 9 Mar 2023 18:07:54 -0500
Subject: [PATCH 0097/2704] feat: add gitconfig

---
 README.md                         |  1 +
 lockfile.json                     |  3 ++
 lua/nvim-treesitter/parsers.lua   | 10 +++++++
 queries/git_config/folds.scm      |  0
 queries/git_config/highlights.scm | 46 +++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 100644 queries/git_config/folds.scm
 create mode 100644 queries/git_config/highlights.scm

diff --git a/README.md b/README.md
index ed5736bd2..89267d626 100644
--- a/README.md
+++ b/README.md
@@ -223,6 +223,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) (maintained by @gbprod)
 - [x] [gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) (maintained by @ObserverOfTime)
 - [x] [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) (maintained by @gbprod)
+- [x] [gitconfig](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
 - [x] [gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) (maintained by @theHamsta)
 - [x] [gleam](https://github.com/gleam-lang/tree-sitter-gleam) (maintained by @amaanq)
 - [x] [Glimmer and Ember](https://github.com/alexlafroscia/tree-sitter-glimmer) (maintained by @NullVoxPopuli)
diff --git a/lockfile.json b/lockfile.json
index ff5dbd483..99fbb2205 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -149,6 +149,9 @@
   "gitcommit": {
     "revision": "f71b93f399c9c2b315825827c95466e7405ec622"
   },
+  "git_config": {
+    "revision": "a01b498b25003d97a5f93b0da0e6f28307454347"
+  },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 235e2a094..e36d6cdec 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -516,6 +516,16 @@ list.gitcommit = {
   maintainers = { "@gbprod" },
 }
 
+list.git_config = {
+  install_info = {
+    url = "https://github.com/the-mikedavis/tree-sitter-git-config",
+    files = { "src/parser.c" },
+  },
+  filetype = "gitconfig",
+  maintainers = { "@amaanq" },
+  readme_name = "gitconfig",
+}
+
 list.gitignore = {
   install_info = {
     url = "https://github.com/shunsambongi/tree-sitter-gitignore",
diff --git a/queries/git_config/folds.scm b/queries/git_config/folds.scm
new file mode 100644
index 000000000..e69de29bb
diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
new file mode 100644
index 000000000..9172e890c
--- /dev/null
+++ b/queries/git_config/highlights.scm
@@ -0,0 +1,46 @@
+; Sections
+
+(section_name) @type
+
+((section_name) @include
+ (#eq? @include "include"))
+
+((section_header
+   (section_name) @include
+   (subsection_name))
+ (#eq? @include "includeIf"))
+
+(variable (name) @property)
+
+; Operators
+
+[
+ "="
+] @operator
+
+; Literals
+
+(integer) @number
+[
+  (true)
+  (false)
+] @boolean
+
+(string) @string
+
+((string) @text.uri
+ (#match? @text.uri "^(~|./|/)"))
+
+(section_header
+  [
+    "\""
+    (subsection_name)
+  ] @string.special)
+
+; Punctuation
+
+[ "[" "]" ] @punctuation.bracket
+
+; Comments
+
+(comment) @comment @spell

From dfa2cf702cc719cc0e9bebf43a8ae3943e25da88 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Fri, 10 Mar 2023 08:01:14 +0000
Subject: [PATCH 0098/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 89267d626..fe84f78c0 100644
--- a/README.md
+++ b/README.md
@@ -220,10 +220,10 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
 - [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
 - [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
+- [x] [gitconfig](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
 - [x] [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) (maintained by @gbprod)
 - [x] [gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) (maintained by @ObserverOfTime)
 - [x] [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) (maintained by @gbprod)
-- [x] [gitconfig](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
 - [x] [gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) (maintained by @theHamsta)
 - [x] [gleam](https://github.com/gleam-lang/tree-sitter-gleam) (maintained by @amaanq)
 - [x] [Glimmer and Ember](https://github.com/alexlafroscia/tree-sitter-glimmer) (maintained by @NullVoxPopuli)

From 62ca703a0b66cbfb3cf3cc91638cace9d8d112a5 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Thu, 9 Mar 2023 08:40:23 +0100
Subject: [PATCH 0099/2704] highlights(prql): update to prql 0.6.0

---
 lockfile.json               | 2 +-
 queries/prql/highlights.scm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 99fbb2205..efc834314 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -348,7 +348,7 @@
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
   "prql": {
-    "revision": "5f6c4e4a90633b19e2077c1d37248989789d64be"
+    "revision": "a5a1fdb45826f7f0d94e258ee5ada2e973708191"
   },
   "pug": {
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index a69259a0a..750ddfe8c 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -9,7 +9,7 @@
   (keyword_window)
   (keyword_join)
   (keyword_select)
-  (keyword_switch)
+  (keyword_case)
   (keyword_append)
   (keyword_remove)
   (keyword_intersect)
@@ -19,6 +19,7 @@
   (keyword_let)
   (keyword_prql)
   (keyword_from_text)
+  (keyword_loop)
 ] @keyword
 
 [

From 9c7fa77f1443fd215c26c7c5f58484e2d4aeff0f Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 9 Mar 2023 19:52:39 -0500
Subject: [PATCH 0100/2704] fix(julia): refactor some operators and punctuation

---
 queries/julia/highlights.scm | 37 ++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 6044e66de..54ad8f626 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -19,10 +19,9 @@
   (identifier) @field .)
 
 
-
 ;;; Function names
 
-;; definitions
+;; Definitions
 
 (function_definition
   name: (identifier) @function)
@@ -57,9 +56,7 @@
   (identifier) @parameter)
 
 (typed_parameter
-  parameter: (identifier) @parameter
-  type: (_) @type)
-(typed_parameter
+  parameter: (identifier)? @parameter
   type: (_) @type)
 
 (function_expression
@@ -111,9 +108,9 @@
   "local"
   "macro"
   "struct"
+  "end"
 ] @keyword
 
-"end" @keyword
 
 (compound_statement
   ["begin" "end"] @keyword)
@@ -125,9 +122,9 @@
 (if_statement
   ["if" "end"] @conditional)
 (elseif_clause
-  ["elseif"] @conditional)
+  "elseif" @conditional)
 (else_clause
-  ["else"] @conditional)
+  "else" @conditional)
 (if_clause
   "if" @conditional) ; `if` clause in comprehensions
 (ternary_expression
@@ -167,8 +164,6 @@
   ["function" "end"] @keyword.function)
 (do_clause
   ["do" "end"] @keyword.function)
-(function_expression
-  "->" @keyword.function)
 (return_statement
   "return" @keyword.return)
 
@@ -180,25 +175,35 @@
 
 ;;; Operators & Punctuation
 
-(operator) @operator
+[
+  "="
+  "∈"
+  (operator)
+] @operator
 
 (adjoint_expression "'" @operator)
 (range_expression ":" @operator)
-(slurp_parameter "..." @operator)
-(splat_expression "..." @operator)
 
 ((operator) @keyword.operator
   (#any-of? @keyword.operator "in" "isa"))
 
 (for_binding "in" @keyword.operator)
-(for_binding ["=" "∈"] @operator)
 
 (where_clause "where" @keyword.operator)
 (where_expression "where" @keyword.operator)
 
-["." "::"] @operator
+[
+  ","
+  "."
+  ";"
+  "::"
+  "->"
+] @punctuation.delimiter
+
+[
+  "..."
+] @punctuation.special
 
-["," ";"] @punctuation.delimiter
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
 

From 8886384244381f59458271b0e6f99f95fb7447fd Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 9 Mar 2023 19:53:08 -0500
Subject: [PATCH 0101/2704] feat(julia): mark begin & end in an index or range
 expression as `@variable.builtin`

---
 queries/julia/highlights.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 54ad8f626..36c77c32d 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -100,6 +100,15 @@
 (where_clause
   (curly_expression (_) @type))
 
+;; Builtins
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "begin" "end")
+  (#has-ancestor? @variable.builtin index_expression))
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "begin" "end")
+  (#has-ancestor? @variable.builtin range_expression))
 
 ;;; Keywords
 

From 1012dd957e120f333474d8dbee07201ee7c1e94d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 9 Mar 2023 19:53:18 -0500
Subject: [PATCH 0102/2704] feat(julia): add builtin functions & types

---
 queries/julia/highlights.scm | 41 ++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 36c77c32d..53c8aeb27 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -45,6 +45,17 @@
 (broadcast_call_expression
   (field_expression (identifier) @function.call .))
 
+;; Builtins
+
+((identifier) @function.builtin
+  (#any-of? @function.builtin 
+  "_abstracttype" "_apply_iterate" "_apply_pure" "_call_in_world" "_call_in_world_total"
+  "_call_latest" "_equiv_typedef" "_expr" "_primitivetype" "_setsuper!" "_structtype"
+  "_typebody!" "_typevar" "applicable" "apply_type" "arrayref" "arrayset" "arraysize"
+  "const_arrayref" "donotdelete" "fieldtype" "get_binding_type" "getfield" "ifelse" "invoke" "isa"
+  "isdefined" "modifyfield!" "nfields" "replacefield!" "set_binding_type!" "setfield!" "sizeof"
+  "svec" "swapfield!" "throw" "tuple" "typeassert" "typeof"))
+
 
 ;;; Parameters
 
@@ -102,6 +113,36 @@
 
 ;; Builtins
 
+((identifier) @type.builtin
+ (#any-of? @type.builtin
+  "Type" "DataType" "Any" "Union" "UnionAll" "Tuple" "NTuple" "NamedTuple"
+  "Val" "Nothing" "Some" "Enum" "Expr" "Symbol" "Module" "Function" "ComposedFunction"
+  "Number" "Real" "AbstractFloat" "Integer" "Signed" "AbstractIrrational"
+  "Fix1" "Fix2" "Missing" "Cmd" "EnvDict" "VersionNumber" "ArgumentError"
+  "AssertionError" "BoundsError" "CompositeException" "DimensionMismatch"
+  "DivideError" "DomainError" "EOFError" "ErrorException" "InexactError"
+  "InterruptException" "KeyError" "LoadError" "MethodError" "OutOfMemoryError"
+  "ReadOnlyMemoryError" "OverflowError" "ProcessFailedException" "StackOverflowError"
+  "SystemError" "TypeError" "UndefKeywordError" "UndefRefError" "UndefVarError"
+  "StringIndexError" "InitError" "ExponentialBackOff" "Timer" "AsyncCondition"
+  "ParseError" "QuoteNode" "IteratorSize" "IteratorEltype" "AbstractRange"
+  "OrdinalRange" "AbstractUnitRange" "StepRange" "UnitRange" "LinRange" "AbstractDict"
+  "Dict" "IdDict" "WeakKeyDict" "ImmutableDict" "AbstractSet" "Set" "BitSet" "Pair"
+  "Pairs" "OneTo" " StepRangeLen" "RoundingMode" "Float16" "Float32" "Float64"
+  "BigFloat" "Bool" "Int" "Int8" "UInt8" "Int16" "UInt16" "Int32" "UInt32" "Int64"
+  "UInt64" "Int128" "UInt128" "BigInt" "Complex" "Rational" "Irrational" "AbstractChar"
+  "Char" "SubString" "Regex" "SubstitutionString" "RegexMatch" "AbstractArray"
+  "AbstractVector" "AbstractMatrix" "AbstractVecOrMat" "Array" "UndefInitializer"
+  "Vector" "Matrix" "VecOrMat" "DenseArray" "DenseVector" "DenseMatrix" "DenseVecOrMat"
+  "StridedArray" "StridedVector" "StridedMatrix" "StridedVecOrMat" "BitArray" "Dims"
+  "SubArray" "Task" "Condition" "Event" "Semaphore" "AbstractLniock" "ReentrantLock"
+  "Channel" "Atomic" "SpinLock" "RawFD" "IOStream" "IOBuffer" "AbstractDisplay" "MIME"
+  "TextDisplay" "PartialQuickSort" "Ordering" "ReverseOrdering" "By" "Lt" "Perm"
+  "Stateful" "CFunction" "Ptr" "Ref" "Cchar" "Cuchar" "Cshort" "Cstring" "Cushort"
+  "Cint" "Cuint" "Clong" "Culong" "Clonglong" "Culonglong" "Cintmax_t" "Cuintmax_t"
+  "Csize_t" "Cssize_t" "Cptrdiff_t" "Cwchar_t" "Cwstring" "Cfloat" "Cdouble" "Tmstruct"
+  "StackFrame" "StackTrace"))
+
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "begin" "end")
   (#has-ancestor? @variable.builtin index_expression))

From ffa6efa7f55e88be72812c47e4286fda48ab94f0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 9 Mar 2023 19:58:04 -0500
Subject: [PATCH 0103/2704] feat(julia): add tests for new changes

---
 tests/query/highlights/julia/test.jl | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tests/query/highlights/julia/test.jl

diff --git a/tests/query/highlights/julia/test.jl b/tests/query/highlights/julia/test.jl
new file mode 100644
index 000000000..46fc313c0
--- /dev/null
+++ b/tests/query/highlights/julia/test.jl
@@ -0,0 +1,26 @@
+function load_data(::Symbol; ::Int) :: Tuple
+# <- keyword.function
+#        ^ function
+#                 ^ punctuation.bracket
+#                  ^^ punctuation.delimiter
+#                    ^ type.builtin
+#                          ^ punctuation.delimiter
+#                            ^^ punctuation.delimiter
+#                              ^^^ type.builtin
+#                                 ^ punctuation.bracket
+#                                   ^^ punctuation.delimiter
+#                                      ^ type.builtin
+    dataset = CIFAR10(; Tx = Float32, split = split)
+#   ^^^^^^^ variable
+#           ^ operator
+#             ^ function.call
+#                          ^ operator
+#                            ^ type.builtin
+    X = reshape(dataset.features[:, :, :, begin:n_obs], :, n_obs) # flattening the image pixels
+#                                         ^^^^^ variable.builtin
+    y = categorical2onehot(dataset.targets[begin:n_obs], N_LABELS)
+#                                          ^^^^^ variable.builtin
+    return X, y
+#   ^^^^^^ keyword.return
+end
+# <- keyword.function

From cfa9b70ee85f9ead92c691cbc0b134a441864080 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 10 Mar 2023 08:32:38 +0000
Subject: [PATCH 0104/2704] Update parsers: query, sql

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index efc834314..0b782558b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -140,6 +140,9 @@
   "gdscript": {
     "revision": "a4b57cc3bcbfc24550e858159647e9238e7ad1ac"
   },
+  "git_config": {
+    "revision": "a01b498b25003d97a5f93b0da0e6f28307454347"
+  },
   "git_rebase": {
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
@@ -149,9 +152,6 @@
   "gitcommit": {
     "revision": "f71b93f399c9c2b315825827c95466e7405ec622"
   },
-  "git_config": {
-    "revision": "a01b498b25003d97a5f93b0da0e6f28307454347"
-  },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
@@ -366,7 +366,7 @@
     "revision": "ab75be9750e6f2f804638824d1790034286a830c"
   },
   "query": {
-    "revision": "0717de07078a20a8608c98ad5f26c208949d0e15"
+    "revision": "e97504446f14f529d5a8e649667d3d60391e4dfd"
   },
   "r": {
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
@@ -423,7 +423,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "84a2b208f072a2ca78fc59b5fa51cbdbf9c5aa37"
+    "revision": "fcc9a446b63181603edecd05370f976f112d94fa"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From 98d63d0da4293741dce5d3136a8243de9c24eae9 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Fri, 10 Mar 2023 18:09:50 +0100
Subject: [PATCH 0105/2704] highlights(prql): change `loop` and `case`
 highlight

---
 queries/prql/highlights.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 750ddfe8c..10c17b915 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -9,7 +9,6 @@
   (keyword_window)
   (keyword_join)
   (keyword_select)
-  (keyword_case)
   (keyword_append)
   (keyword_remove)
   (keyword_intersect)
@@ -19,9 +18,12 @@
   (keyword_let)
   (keyword_prql)
   (keyword_from_text)
-  (keyword_loop)
 ] @keyword
 
+(keyword_loop) @repeat
+
+(keyword_case) @conditional
+
 [
  (literal_string)
  (f_string)

From 207a86e4c91898a6eaf476271faa6e09f1109709 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 11 Mar 2023 03:02:30 -0500
Subject: [PATCH 0106/2704] feat: add Hare

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/hare/folds.scm          |  21 +++
 queries/hare/highlights.scm     | 255 ++++++++++++++++++++++++++++++++
 queries/hare/indents.scm        |  36 +++++
 queries/hare/injections.scm     |   8 +
 queries/hare/locals.scm         |  47 ++++++
 8 files changed, 379 insertions(+)
 create mode 100644 queries/hare/folds.scm
 create mode 100644 queries/hare/highlights.scm
 create mode 100644 queries/hare/indents.scm
 create mode 100644 queries/hare/injections.scm
 create mode 100644 queries/hare/locals.scm

diff --git a/README.md b/README.md
index fe84f78c0..449633124 100644
--- a/README.md
+++ b/README.md
@@ -235,6 +235,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
+- [x] [hare](https://github.com/amaanq/tree-sitter-hare) (maintained by @amaanq)
 - [ ] [haskell](https://github.com/tree-sitter/tree-sitter-haskell)
 - [x] [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay)
diff --git a/lockfile.json b/lockfile.json
index 0b782558b..f7c50623a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -185,6 +185,9 @@
   "hack": {
     "revision": "b7bd6928532ada34dddb1dece4a158ab62c6e783"
   },
+  "hare": {
+    "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
+  },
   "haskell": {
     "revision": "0da7f826e85b3e589e217adf69a6fd89ee4301b9"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e36d6cdec..6d2844e22 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -628,6 +628,14 @@ list.hack = {
   },
 }
 
+list.hare = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-hare",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.haskell = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-haskell",
diff --git a/queries/hare/folds.scm b/queries/hare/folds.scm
new file mode 100644
index 000000000..28f18b175
--- /dev/null
+++ b/queries/hare/folds.scm
@@ -0,0 +1,21 @@
+[
+  (imports)
+
+  (function_declaration)
+  (enum_type)
+  (struct_type)
+  (tuple_type)
+  (union_type)
+
+  (block)
+  (if_statement)
+  (for_statement)
+  (call_expression)
+  (switch_expression)
+  (match_expression)
+  (case)
+
+  (array_literal)
+  (struct_literal)
+  (tuple_literal)
+] @fold
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
new file mode 100644
index 000000000..063af31b3
--- /dev/null
+++ b/queries/hare/highlights.scm
@@ -0,0 +1,255 @@
+; Variables
+
+(identifier) @variable
+
+; Types
+
+(type) @type
+
+(scoped_type_identifier
+  (identifier) . (identifier) @type)
+
+(struct_literal
+  . (identifier) @type)
+
+(builtin_type) @type.builtin
+
+; Constants
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z_]+$"))
+
+; Includes
+
+[
+  "use"
+] @include
+
+(use_statement
+  (scoped_type_identifier
+    (identifier) @namespace))
+(use_statement
+  (identifier) @namespace  "{")
+(use_statement
+  . (identifier) @namespace .)
+
+((scoped_type_identifier
+  path: (_) @namespace)
+  (#set! "priority" 105))
+
+; Keywords
+
+[
+  "def"
+  "enum"
+  "export"
+  "let"
+  "struct"
+  "type"
+  "union"
+] @keyword
+
+[
+  "fn"
+] @keyword.function
+
+[
+  "defer"
+  "yield"
+  "return"
+] @keyword.return
+
+[
+  "as"
+  "is"
+] @keyword.operator
+
+; Typedefs
+
+(type_declaration
+  "type" (identifier) @type.definition . "=")
+
+; Qualifiers
+
+[
+  "const"
+  "static"
+  "nullable"
+] @type.qualifier
+
+; Attributes
+
+[
+  "@fini"
+  "@init"
+  "@test"
+  "@noreturn"
+  "@packed"
+  (declaration_attribute)
+] @attribute
+
+; Labels
+
+((label) @label
+  (#set! "priority" 105))
+
+; Functions
+
+(function_declaration
+  "fn" . (identifier) @function)
+
+(call_expression
+  . (identifier) @function.call)
+
+(call_expression
+  . (scoped_type_identifier
+    . (identifier) . "::" . (identifier) @method.call))
+
+((call_expression
+  . (identifier) @function.builtin)
+  (#any-of? @function.builtin "align" "assert" "free" "len" "offset" "size"))
+
+(size_expression
+  "size" @function.builtin)
+
+((function_declaration
+  "fn" . (identifier) @constructor)
+  (#eq? @constructor "init"))
+
+((call_expression
+  . (identifier) @constructor)
+  (#eq? @constructor "init"))
+
+; Parameters
+
+(parameter
+  (_) @parameter . ":")
+
+; Fields
+
+((member_expression
+  "." (_) @field)
+  (#set! "priority" 105))
+
+(field
+  . (identifier) @field)
+
+(field_assignment
+  . (identifier) @field)
+
+; Repeats
+
+[
+  "for"
+] @repeat
+
+; Conditionals
+
+[
+  "if"
+  "else"
+  "break"
+  "switch"
+  "match"
+  "case"
+] @conditional
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "||"
+  "&&"
+  "^^"
+  "|"
+  "&"
+  "^"
+  "=="
+  "!="
+  ">"
+  ">="
+  "<="
+  "<"
+  "<<"
+  ">>"
+  "~"
+  "!"
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "<<="
+  ">>="
+  "|="
+  "&="
+  "^="
+  "||="
+  "&&="
+  "^^="
+  "="
+  "?"
+] @operator
+
+; Punctuation
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[
+  ".."
+  "..."
+  "_"
+] @punctuation.special
+
+(pointer_type "*" @punctuation.special)
+
+(slice_type "*" @punctuation.special)
+
+(error_type "!" @punctuation.special)
+
+[
+  ","
+  "."
+  ":"
+  ";"
+  "::"
+  "=>"
+] @punctuation.delimiter
+
+; Literals
+
+[
+  (string)
+  (raw_string)
+] @string
+
+(rune) @character
+
+(escape_sequence) @string.escape
+
+(number) @number
+
+(float) @float
+
+(boolean) @boolean
+
+[
+  (void)
+  (null)
+] @constant.builtin
+
+; Comments
+
+(comment) @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/hare/indents.scm b/queries/hare/indents.scm
new file mode 100644
index 000000000..0324f09c6
--- /dev/null
+++ b/queries/hare/indents.scm
@@ -0,0 +1,36 @@
+[
+  (enum_type)
+  (struct_type)
+  (tuple_type)
+  (union_type)
+
+  (block)
+  (for_statement)
+  (call_expression)
+  (case)
+
+  (array_literal)
+  (struct_literal)
+  (tuple_literal)
+] @indent
+
+(if_statement
+   ("(" condition: (_) ")") @indent)
+
+[
+  "}"
+  "]"
+  ")"
+] @indent_end
+
+[ "{" "}" ] @branch
+
+[ "[" "]" ] @branch
+
+[ "(" ")" ] @branch
+
+[
+  (ERROR)
+  (comment)
+  (concatenated_string)
+] @auto
diff --git a/queries/hare/injections.scm b/queries/hare/injections.scm
new file mode 100644
index 000000000..2992a948d
--- /dev/null
+++ b/queries/hare/injections.scm
@@ -0,0 +1,8 @@
+(comment) @comment
+
+((call_expression
+  . (_) @_fnname
+  . "("
+  . (_ [(string_content) (raw_string_content)] @regex)
+  . ")")
+  (#any-of? @_fnname "compile" "regex::compile"))
diff --git a/queries/hare/locals.scm b/queries/hare/locals.scm
new file mode 100644
index 000000000..62eb6665b
--- /dev/null
+++ b/queries/hare/locals.scm
@@ -0,0 +1,47 @@
+; Scopes
+
+[
+  (module)
+  (function_declaration)
+  (if_statement)
+  (for_statement)
+  (match_expression)
+  (switch_expression)
+] @scope
+
+; References
+
+[
+  (identifier)
+  (scoped_type_identifier)
+] @reference
+
+; Definitions
+
+(global_binding
+  (identifier) @definition.constant . ":" (_))
+
+(const_declaration
+  "const" (identifier) @definition.constant . "=")
+
+(field
+  . (identifier) @definition.field)
+
+(field_assignment
+  . (identifier) @definition.field)
+
+(function_declaration
+  "fn" . (identifier) @definition.function)
+
+(parameter
+  (_) @definition.parameter . ":")
+
+(type_declaration
+  "type" (identifier) @definition.type . "=")
+
+(type_declaration
+  "type" (identifier) @definition.enum . "=" (enum_type))
+
+(let_declaration
+  "let" . (identifier) @definition.variable ","?)
+

From 22d35614ae535ed7a980b28b10a0476cb6b2260b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 11 Mar 2023 06:37:32 +0000
Subject: [PATCH 0107/2704] Update parsers: prql, scheme, sql, yuck

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f7c50623a..17ec92207 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -351,7 +351,7 @@
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
   "prql": {
-    "revision": "a5a1fdb45826f7f0d94e258ee5ada2e973708191"
+    "revision": "4045dcff3f8ac04669855b32584053dec065bba4"
   },
   "pug": {
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
@@ -405,7 +405,7 @@
     "revision": "2275b754360de8539e02e84106fa38f7cb6de275"
   },
   "scheme": {
-    "revision": "67b90a365bebf4406af4e5a546d6336de787e135"
+    "revision": "38aef90f54ef8f2e8e402b1f6f036ed19c636759"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -426,7 +426,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "fcc9a446b63181603edecd05370f976f112d94fa"
+    "revision": "b2f6b30ce12cbddfb663473457b670f2b3bffaa9"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
@@ -522,7 +522,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "e3d91a3c65decdea467adebe4127b8366fa47919"
+    "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zig": {
     "revision": "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"

From 0ec25f87ee89ceca1ddefdb62c9702357749ba5a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 11 Mar 2023 04:18:03 -0500
Subject: [PATCH 0108/2704] refactor(gitconfig): use lua-match instead of match

---
 queries/git_config/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index 9172e890c..18b75bc64 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -29,7 +29,10 @@
 (string) @string
 
 ((string) @text.uri
- (#match? @text.uri "^(~|./|/)"))
+ (#lua-match? @text.uri "^[.]?[/]"))
+
+((string) @text.uri
+ (#lua-match? @text.uri "^[~]"))
 
 (section_header
   [

From 5d59d18d3e6559e525fd933c41070303c5bae32b Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Fri, 10 Mar 2023 23:15:19 +0700
Subject: [PATCH 0109/2704] highlights(typescript): `infer`, template literal
 type & punctuations

---
 queries/typescript/highlights.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 036b6e8da..057156d55 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -12,6 +12,7 @@
   "override"
   "satisfies"
   "module"
+  "infer"
 ] @keyword
 
 (as_expression "as" @keyword)
@@ -35,6 +36,8 @@
       ((import_specifier
           name: (identifier) @type)))))
 
+(template_literal_type) @string
+
 ;; punctuation
 
 (type_arguments
@@ -55,11 +58,21 @@
 (pair
   ":" @punctuation.delimiter)
 
+(index_signature
+  ":" @punctuation.delimiter)
+
+(opting_type_annotation
+  "?:" @punctuation.delimiter)
+
 "?." @punctuation.delimiter
 
 (property_signature "?" @punctuation.special)
 (optional_parameter "?" @punctuation.special)
 
+(template_type ["${" "}"] @punctuation.special)
+
+(conditional_type ["?" ":"] @conditional.ternary)
+
 ; Variables
 
 (undefined) @variable.builtin

From 350e7e5e31a5265fbccdf96b00a413c32583c2cc Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Sat, 11 Mar 2023 16:03:33 +0100
Subject: [PATCH 0110/2704] highlights(cmake): match digits and @ in unquoted
 arguments

---
 queries/cmake/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 055319978..80bf80752 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -1,7 +1,7 @@
 (normal_command
   (identifier)
   (argument (unquoted_argument)) @constant
-  (#lua-match? @constant "^%u[%u_]+$")
+  (#lua-match? @constant "^[%u@][%u%d_]+$")
 )
 
 [

From 11b2d430e6f501e29e6851aaf1bd6fa338072be6 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 11 Mar 2023 14:42:08 -0500
Subject: [PATCH 0111/2704] feat(lua): add more builtin variables per lua_ls

---
 queries/lua/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index fa2eff68d..fadcb2ac0 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -129,7 +129,7 @@
 (identifier) @variable
 
 ((identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
+ (#any-of? @variable.builtin "self" "string" "table" "vim"))
 
 (variable_list
    attribute: (attribute

From 4b04eaa5ce16f1082c4962ef94b99605388a110f Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 11 Mar 2023 15:25:11 -0500
Subject: [PATCH 0112/2704] chore: clean up parsers.lua

---
 lua/nvim-treesitter/parsers.lua | 145 ++++----------------------------
 1 file changed, 16 insertions(+), 129 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6d2844e22..da85e9bec 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -36,12 +36,9 @@ for ft, lang in pairs {
   systemverilog = "verilog",
   cls = "latex",
   sty = "latex",
-  OpenFOAM = "foam",
   pandoc = "markdown",
   rmd = "markdown",
   quarto = "markdown",
-  cs = "c_sharp",
-  tape = "vhs",
   dosini = "ini",
   confini = "ini",
 } do
@@ -75,21 +72,16 @@ local list = setmetatable({}, {
 list.ada = {
   install_info = {
     url = "https://github.com/briot/tree-sitter-ada",
-    branch = "master",
     files = { "src/parser.c" },
   },
-  filetype = "ada",
   maintainers = { "@briot" },
 }
 
 list.agda = {
   install_info = {
     url = "https://github.com/AusCyberman/tree-sitter-agda",
-    branch = "master",
     files = { "src/parser.c", "src/scanner.cc" },
-    generate_requires_npm = true,
   },
-  filetype = "agda",
   maintainers = { "@Decodetalkers" },
 }
 
@@ -104,7 +96,6 @@ list.arduino = {
 list.astro = {
   install_info = {
     url = "https://github.com/virchau13/tree-sitter-astro",
-    branch = "master",
     files = { "src/parser.c", "src/scanner.cc" },
   },
   maintainers = { "@virchau13" },
@@ -130,7 +121,6 @@ list.beancount = {
   install_info = {
     url = "https://github.com/polarmutex/tree-sitter-beancount",
     files = { "src/parser.c", "src/scanner.cc" },
-    branch = "master",
   },
   maintainers = { "@polarmutex" },
 }
@@ -231,7 +221,6 @@ list.commonlisp = {
 list.cooklang = {
   install_info = {
     url = "https://github.com/addcninblue/tree-sitter-cooklang",
-    branch = "master",
     files = { "src/parser.c", "src/scanner.cc" },
   },
   maintainers = { "@addcninblue" },
@@ -285,9 +274,9 @@ list.d = {
     files = { "src/parser.c", "src/scanner.cc" },
     requires_generate_from_grammar = true,
   },
-  maintainers = { "@nawordar" },
   -- Generating grammar takes ~60s
   experimental = true,
+  maintainers = { "@nawordar" },
 }
 
 list.dart = {
@@ -302,8 +291,6 @@ list.devicetree = {
   install_info = {
     url = "https://github.com/joelspadin/tree-sitter-devicetree",
     files = { "src/parser.c" },
-    branch = "main",
-    requires_generate_from_grammar = true,
   },
   filetype = "dts",
   maintainers = { "@jedrzejboczar" },
@@ -320,17 +307,15 @@ list.dhall = {
 list.diff = {
   install_info = {
     url = "https://github.com/the-mikedavis/tree-sitter-diff",
-    branch = "main",
     files = { "src/parser.c" },
   },
-  maintainers = { "@gbprod" },
   filetype = "gitdiff",
+  maintainers = { "@gbprod" },
 }
 
 list.dockerfile = {
   install_info = {
     url = "https://github.com/camdencheek/tree-sitter-dockerfile",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@camdencheek" },
@@ -339,7 +324,6 @@ list.dockerfile = {
 list.dot = {
   install_info = {
     url = "https://github.com/rydesun/tree-sitter-dot",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@rydesun" },
@@ -347,10 +331,9 @@ list.dot = {
 
 list.ebnf = {
   install_info = {
-    url = "https://github.com/RubixDev/ebnf.git",
+    url = "https://github.com/RubixDev/ebnf",
     files = { "src/parser.c" },
     location = "crates/tree-sitter-ebnf",
-    branch = "main",
   },
   maintainers = { "@RubixDev" },
   experimental = true,
@@ -360,7 +343,6 @@ list.eex = {
   install_info = {
     url = "https://github.com/connorlay/tree-sitter-eex",
     files = { "src/parser.c" },
-    branch = "main",
   },
   filetype = "eelixir",
   maintainers = { "@connorlay" },
@@ -370,7 +352,6 @@ list.elixir = {
   install_info = {
     url = "https://github.com/elixir-lang/tree-sitter-elixir",
     files = { "src/parser.c", "src/scanner.cc" },
-    branch = "main",
   },
   maintainers = { "@connorlay" },
 }
@@ -394,7 +375,6 @@ list.elsa = {
 list.elvish = {
   install_info = {
     url = "https://github.com/ckafi/tree-sitter-elvish",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@ckafi" },
@@ -412,7 +392,6 @@ list.erlang = {
   install_info = {
     url = "https://github.com/WhatsApp/tree-sitter-erlang",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@filmor" },
 }
@@ -436,11 +415,9 @@ list.fish = {
 list.foam = {
   install_info = {
     url = "https://github.com/FoamScience/tree-sitter-foam",
-    branch = "master",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@FoamScience" },
-  filetype = "foam",
   -- Queries might change over time on the grammar's side
   -- Otherwise everything runs fine
   experimental = true,
@@ -458,7 +435,6 @@ list.fsh = {
   install_info = {
     url = "https://github.com/mgramigna/tree-sitter-fsh",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@mgramigna" },
 }
@@ -475,7 +451,6 @@ list.fusion = {
   install_info = {
     url = "https://gitlab.com/jirgn/tree-sitter-fusion.git",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "main",
   },
   maintainers = { "@jirgn" },
 }
@@ -485,15 +460,14 @@ list.gdscript = {
     url = "https://github.com/PrestonKnopp/tree-sitter-gdscript",
     files = { "src/parser.c", "src/scanner.cc" },
   },
-  readme_name = "Godot (gdscript)",
   maintainers = { "@PrestonKnopp" },
+  readme_name = "Godot (gdscript)",
 }
 
 list.git_rebase = {
   install_info = {
     url = "https://github.com/the-mikedavis/tree-sitter-git-rebase",
     files = { "src/parser.c" },
-    branch = "main",
   },
   filetype = "gitrebase",
   maintainers = { "@gbprod" },
@@ -511,7 +485,6 @@ list.gitcommit = {
   install_info = {
     url = "https://github.com/gbprod/tree-sitter-gitcommit",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "main",
   },
   maintainers = { "@gbprod" },
 }
@@ -530,8 +503,6 @@ list.gitignore = {
   install_info = {
     url = "https://github.com/shunsambongi/tree-sitter-gitignore",
     files = { "src/parser.c" },
-    branch = "main",
-    requires_generate_from_grammar = true,
   },
   maintainers = { "@theHamsta" },
 }
@@ -548,11 +519,10 @@ list.glimmer = {
   install_info = {
     url = "https://github.com/alexlafroscia/tree-sitter-glimmer",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "main",
   },
-  readme_name = "Glimmer and Ember",
-  maintainers = { "@NullVoxPopuli" },
   filetype = "handlebars",
+  maintainers = { "@NullVoxPopuli" },
+  readme_name = "Glimmer and Ember",
 }
 
 list.glsl = {
@@ -576,21 +546,18 @@ list.godot_resource = {
   install_info = {
     url = "https://github.com/PrestonKnopp/tree-sitter-godot-resource",
     files = { "src/parser.c", "src/scanner.c" },
-    requires_generate_from_grammar = true,
   },
   filetype = "gdresource",
-  readme_name = "Godot Resources (gdresource)",
   maintainers = { "@pierpo" },
+  readme_name = "Godot Resources (gdresource)",
 }
 
 list.gomod = {
   install_info = {
     url = "https://github.com/camdencheek/tree-sitter-go-mod",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@camdencheek" },
-  filetype = "gomod",
 }
 
 list.gosum = {
@@ -599,17 +566,14 @@ list.gosum = {
     files = { "src/parser.c" },
   },
   maintainers = { "@amaanq" },
-  filetype = "gosum",
 }
 
 list.gowork = {
   install_info = {
     url = "https://github.com/omertuc/tree-sitter-go-work",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@omertuc" },
-  filetype = "gowork",
 }
 
 list.graphql = {
@@ -623,7 +587,6 @@ list.graphql = {
 list.hack = {
   install_info = {
     url = "https://github.com/slackhq/tree-sitter-hack",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.cc" },
   },
 }
@@ -647,19 +610,15 @@ list.hcl = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
     files = { "src/parser.c", "src/scanner.cc" },
-    branch = "main",
   },
   maintainers = { "@MichaHoffmann" },
-  filetype = "hcl",
 }
 
 list.heex = {
   install_info = {
     url = "https://github.com/connorlay/tree-sitter-heex",
     files = { "src/parser.c" },
-    branch = "main",
   },
-  filetype = "heex",
   maintainers = { "@connorlay" },
 }
 
@@ -668,7 +627,6 @@ list.help = {
     url = "https://github.com/neovim/tree-sitter-vimdoc",
     files = { "src/parser.c" },
   },
-  filetype = "help",
   maintainers = { "@vigoux" },
 }
 
@@ -711,7 +669,6 @@ list.htmldjango = {
   install_info = {
     url = "https://github.com/interdependence/tree-sitter-htmldjango",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@ObserverOfTime" },
   experimental = true,
@@ -720,7 +677,6 @@ list.htmldjango = {
 list.http = {
   install_info = {
     url = "https://github.com/rest-nvim/tree-sitter-http",
-    branch = "main",
     files = { "src/parser.c" },
     generate_requires_npm = true,
   },
@@ -781,7 +737,6 @@ list.json5 = {
     url = "https://github.com/Joakker/tree-sitter-json5",
     files = { "src/parser.c" },
   },
-  filetype = "json5",
   maintainers = { "@Joakker" },
 }
 
@@ -791,8 +746,8 @@ list.jsonc = {
     files = { "src/parser.c" },
     generate_requires_npm = true,
   },
-  readme_name = "JSON with comments",
   maintainers = { "@WhyNotHugo" },
+  readme_name = "JSON with comments",
 }
 
 list.jsonnet = {
@@ -822,7 +777,6 @@ list.kdl = {
 list.kotlin = {
   install_info = {
     url = "https://github.com/fwcd/tree-sitter-kotlin",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@SalBakraa" },
@@ -831,7 +785,6 @@ list.kotlin = {
 list.lalrpop = {
   install_info = {
     url = "https://github.com/traxys/tree-sitter-lalrpop",
-    branch = "master",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@traxys" },
@@ -857,7 +810,6 @@ list.ledger = {
 list.llvm = {
   install_info = {
     url = "https://github.com/benwilliamgraham/tree-sitter-llvm",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@benwilliamgraham" },
@@ -866,7 +818,6 @@ list.llvm = {
 list.lua = {
   install_info = {
     url = "https://github.com/MunifTanjim/tree-sitter-lua",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@muniftanjim" },
@@ -886,14 +837,13 @@ list.m68k = {
     url = "https://github.com/grahambates/tree-sitter-m68k",
     files = { "src/parser.c" },
   },
-  maintainers = { "@grahambates" },
   filetype = "asm68k",
+  maintainers = { "@grahambates" },
 }
 
 list.make = {
   install_info = {
     url = "https://github.com/alemuller/tree-sitter-make",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@lewis6991" },
@@ -904,7 +854,6 @@ list.markdown = {
     url = "https://github.com/MDeiml/tree-sitter-markdown",
     location = "tree-sitter-markdown",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "split_parser",
   },
   maintainers = { "@MDeiml" },
   readme_name = "markdown (basic highlighting)",
@@ -916,7 +865,6 @@ list.markdown_inline = {
     url = "https://github.com/MDeiml/tree-sitter-markdown",
     location = "tree-sitter-markdown-inline",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "split_parser",
   },
   maintainers = { "@MDeiml" },
   readme_name = "markdown_inline (needed for full highlighting)",
@@ -937,7 +885,6 @@ list.menhir = {
     files = { "src/parser.c", "src/scanner.cc" },
   },
   maintainers = { "@Kerl13" },
-  filetype = "menhir",
 }
 
 list.mermaid = {
@@ -951,10 +898,8 @@ list.mermaid = {
 list.meson = {
   install_info = {
     url = "https://github.com/Decodetalkers/tree-sitter-meson",
-    branch = "master",
     files = { "src/parser.c" },
   },
-  filetype = "meson",
   maintainers = { "@Decodetalkers" },
 }
 
@@ -962,7 +907,6 @@ list.nickel = {
   install_info = {
     url = "https://github.com/nickel-lang/tree-sitter-nickel",
     files = { "src/parser.c", "src/scanner.cc" },
-    branch = "main",
   },
 }
 
@@ -970,7 +914,6 @@ list.ninja = {
   install_info = {
     url = "https://github.com/alemuller/tree-sitter-ninja",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@alemuller" },
 }
@@ -986,10 +929,9 @@ list.nix = {
 list.norg = {
   install_info = {
     url = "https://github.com/nvim-neorg/tree-sitter-norg",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.cc" },
-    use_makefile = true,
     cxx_standard = "c++14",
+    use_makefile = true,
   },
   maintainers = { "@JoeyGrajciar", "@vhyrro" },
 }
@@ -1009,8 +951,8 @@ list.ocaml_interface = {
     files = { "src/parser.c", "src/scanner.cc" },
     location = "interface",
   },
-  maintainers = { "@undu" },
   filetype = "ocamlinterface",
+  maintainers = { "@undu" },
 }
 
 list.ocamllex = {
@@ -1025,7 +967,6 @@ list.ocamllex = {
 list.org = {
   install_info = {
     url = "https://github.com/milisims/tree-sitter-org",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.cc" },
   },
 }
@@ -1050,7 +991,6 @@ list.perl = {
   install_info = {
     url = "https://github.com/ganezdragon/tree-sitter-perl",
     files = { "src/parser.c", "src/scanner.cc" },
-    generate_requires_npm = true,
   },
   maintainers = { "@lcrownover" },
 }
@@ -1077,7 +1017,6 @@ list.phpdoc = {
 list.pioasm = {
   install_info = {
     url = "https://github.com/leo60228/tree-sitter-pioasm",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@leo60228" },
@@ -1096,16 +1035,15 @@ list.poe_filter = {
     url = "https://github.com/ObserverOfTime/tree-sitter-poe-filter",
     files = { "src/parser.c" },
   },
-  maintainers = { "@ObserverOfTime" },
-  experimental = true,
   filetype = "poefilter",
+  maintainers = { "@ObserverOfTime" },
   readme_name = "Path of Exile item filter",
+  experimental = true,
 }
 
 list.prisma = {
   install_info = {
     url = "https://github.com/victorhqc/tree-sitter-prisma",
-    branch = "master",
     files = { "src/parser.c" },
   },
   maintainers = { "@elianiva" },
@@ -1114,21 +1052,17 @@ list.prisma = {
 list.proto = {
   install_info = {
     url = "https://github.com/mitchellh/tree-sitter-proto",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@fsouza" },
-  filetype = "proto",
 }
 
 list.prql = {
   install_info = {
     url = "https://github.com/PRQL/tree-sitter-prql",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@matthias-Q" },
-  filetype = "prql",
 }
 
 list.pug = {
@@ -1137,7 +1071,6 @@ list.pug = {
     files = { "src/parser.c", "src/scanner.cc" },
   },
   maintainers = { "@zealot128" },
-  filetype = "pug",
   experimental = true,
 }
 
@@ -1168,7 +1101,6 @@ list.qmldir = {
 list.qmljs = {
   install_info = {
     url = "https://github.com/yuja/tree-sitter-qmljs",
-    branch = "master",
     files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "qml",
@@ -1180,8 +1112,8 @@ list.query = {
     url = "https://github.com/nvim-treesitter/tree-sitter-query",
     files = { "src/parser.c" },
   },
-  readme_name = "Tree-sitter query language",
   maintainers = { "@steelsojka" },
+  readme_name = "Tree-Sitter query language",
 }
 
 list.r = {
@@ -1195,7 +1127,6 @@ list.r = {
 list.racket = {
   install_info = {
     url = "https://github.com/6cdh/tree-sitter-racket",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.cc" },
   },
   maintainers = { "@6cdh" },
@@ -1204,7 +1135,6 @@ list.racket = {
 list.rasi = {
   install_info = {
     url = "https://github.com/Fymyte/tree-sitter-rasi",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@Fymyte" },
@@ -1224,7 +1154,6 @@ list.rego = {
     files = { "src/parser.c" },
   },
   maintainers = { "@FallenAngel97" },
-  filetype = "rego",
 }
 
 list.rnoweb = {
@@ -1232,7 +1161,6 @@ list.rnoweb = {
     url = "https://github.com/bamonroe/tree-sitter-rnoweb",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  filetype = "rnoweb",
   maintainers = { "@bamonroe" },
 }
 
@@ -1279,7 +1207,6 @@ list.scala = {
 list.scheme = {
   install_info = {
     url = "https://github.com/6cdh/tree-sitter-scheme",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@6cdh" },
@@ -1297,7 +1224,6 @@ list.slint = {
   install_info = {
     url = "https://github.com/jrmoulton/tree-sitter-slint",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@jrmoulton" },
   experimental = true,
@@ -1322,7 +1248,6 @@ list.smithy = {
 list.solidity = {
   install_info = {
     url = "https://github.com/JoranHonig/tree-sitter-solidity",
-    branch = "master",
     files = { "src/parser.c" },
   },
   maintainers = { "@amaanq" },
@@ -1332,7 +1257,6 @@ list.sparql = {
   install_info = {
     url = "https://github.com/BonaBeavis/tree-sitter-sparql",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@BonaBeavis" },
 }
@@ -1367,17 +1291,14 @@ list.supercollider = {
   install_info = {
     url = "https://github.com/madskjeldgaard/tree-sitter-supercollider",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "main",
   },
   maintainers = { "@madskjeldgaard" },
-  filetype = "supercollider",
 }
 
 list.surface = {
   install_info = {
     url = "https://github.com/connorlay/tree-sitter-surface",
     files = { "src/parser.c" },
-    branch = "main",
   },
   filetype = "sface",
   maintainers = { "@connorlay" },
@@ -1387,7 +1308,6 @@ list.svelte = {
   install_info = {
     url = "https://github.com/Himujjal/tree-sitter-svelte",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "master",
   },
   maintainers = { "@elianiva" },
 }
@@ -1395,7 +1315,6 @@ list.svelte = {
 list.swift = {
   install_info = {
     url = "https://github.com/alex-pinkus/tree-sitter-swift",
-    branch = "main",
     files = { "src/parser.c", "src/scanner.c" },
     requires_generate_from_grammar = true,
   },
@@ -1406,10 +1325,6 @@ list.sxhkdrc = {
   install_info = {
     url = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc",
     files = { "src/parser.c" },
-    branch = "master",
-    generate_requires_npm = false,
-    requires_generate_from_grammar = false,
-    filetype = "sxhkdrc",
   },
   maintainers = { "@RaafatTurki" },
 }
@@ -1418,12 +1333,8 @@ list.t32 = {
   install_info = {
     url = "https://codeberg.org/xasc/tree-sitter-t32",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "main",
     revision = "675cd7de4eb80f2faa1e6d3bc9ee195fa9ef9790",
-    generate_requires_npm = false,
-    requires_generate_from_grammar = false,
   },
-  filetype = "t32",
   maintainers = { "@xasc" },
 }
 
@@ -1440,18 +1351,15 @@ list.terraform = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
     files = { "src/parser.c", "src/scanner.cc" },
-    branch = "main",
     location = "dialects/terraform",
   },
   maintainers = { "@MichaHoffmann" },
-  filetype = "terraform",
 }
 
 list.thrift = {
   install_info = {
     url = "https://github.com/duskmoon314/tree-sitter-thrift",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@amaanq", "@duskmoon314" },
 }
@@ -1460,11 +1368,7 @@ list.tiger = {
   install_info = {
     url = "https://github.com/ambroisie/tree-sitter-tiger",
     files = { "src/parser.c", "src/scanner.c" },
-    branch = "main",
-    generate_requires_npm = false,
-    requires_generate_from_grammar = false,
   },
-  filetype = "tiger",
   maintainers = { "@ambroisie" },
 }
 
@@ -1473,17 +1377,15 @@ list.tlaplus = {
     url = "https://github.com/tlaplus-community/tree-sitter-tlaplus",
     files = { "src/parser.c", "src/scanner.cc" },
   },
-  maintainers = { "@ahelwer", "@susliko" },
   filetype = "tla",
+  maintainers = { "@ahelwer", "@susliko" },
 }
 
 list.todotxt = {
   install_info = {
     url = "https://github.com/arnarg/tree-sitter-todotxt.git",
     files = { "src/parser.c" },
-    branch = "main",
   },
-  filetype = "todotxt",
   maintainers = { "@arnarg" },
   experimental = true,
 }
@@ -1512,7 +1414,6 @@ list.turtle = {
   install_info = {
     url = "https://github.com/BonaBeavis/tree-sitter-turtle",
     files = { "src/parser.c" },
-    branch = "main",
   },
   maintainers = { "@BonaBeavis" },
 }
@@ -1520,11 +1421,9 @@ list.turtle = {
 list.twig = {
   install_info = {
     url = "https://github.com/gbprod/tree-sitter-twig",
-    branch = "main",
     files = { "src/parser.c" },
   },
   maintainers = { "@gbprod" },
-  filetype = "twig",
 }
 
 list.typescript = {
@@ -1560,17 +1459,13 @@ list.v = {
     url = "https://github.com/vlang/vls",
     files = { "src/parser.c", "src/scanner.c" },
     location = "tree_sitter_v",
-    generate_requires_npm = false,
-    requires_generate_from_grammar = false,
   },
-  filetype = "vlang",
   maintainers = { "@kkharji" },
 }
 
 list.vala = {
   install_info = {
     url = "https://github.com/vala-lang/tree-sitter-vala",
-    branch = "master",
     files = { "src/parser.c" },
   },
   maintainers = { "@Prince781" },
@@ -1580,7 +1475,6 @@ list.verilog = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-verilog",
     files = { "src/parser.c" },
-    generate_requires_npm = true,
   },
   maintainers = { "@zegervdv" },
 }
@@ -1588,11 +1482,10 @@ list.verilog = {
 list.vhs = {
   install_info = {
     url = "https://github.com/charmbracelet/tree-sitter-vhs",
-    branch = "main",
     files = { "src/parser.c" },
   },
-  maintainers = { "@caarlos0" },
   filetype = "tape",
+  maintainers = { "@caarlos0" },
 }
 
 list.vim = {
@@ -1600,7 +1493,6 @@ list.vim = {
     url = "https://github.com/vigoux/tree-sitter-viml",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  filetype = "vim",
   maintainers = { "@vigoux" },
 }
 
@@ -1618,7 +1510,6 @@ list.wgsl = {
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@szebniok" },
-  filetype = "wgsl",
 }
 
 list.wgsl_bevy = {
@@ -1644,7 +1535,6 @@ list.yang = {
     files = { "src/parser.c" },
   },
   maintainers = { "@Hubro" },
-  filetype = "yang",
 }
 
 list.yuck = {
@@ -1653,16 +1543,13 @@ list.yuck = {
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@Philipp-M", "@amaanq" },
-  filetype = "yuck",
 }
 
 list.zig = {
   install_info = {
     url = "https://github.com/maxxnino/tree-sitter-zig",
     files = { "src/parser.c" },
-    branch = "main",
   },
-  filetype = "zig",
   maintainers = { "@maxxnino" },
 }
 

From 0e266bfc29a1ab17b9143235870c695ea74d6490 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 11 Mar 2023 16:32:19 -0500
Subject: [PATCH 0113/2704] docs: add missing fields from InstallInfo, update
 code docs related to installation

---
 lua/nvim-treesitter/parsers.lua                 |  2 ++
 lua/nvim-treesitter/shell_command_selectors.lua | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index da85e9bec..b772205a2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -53,6 +53,8 @@ end
 ---@field generate_requires_npm boolean|nil
 ---@field requires_generate_from_grammar boolean|nil
 ---@field location string|nil
+---@field use_makefile boolean|nil
+---@field cxx_standard string|nil
 
 ---@class ParserInfo
 ---@field install_info InstallInfo
diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 7a0610a98..353b30f26 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -16,6 +16,7 @@ end
 
 local M = {}
 
+-- Returns the mkdir command based on the OS
 ---@param directory string
 ---@param cwd string
 ---@param info_msg string
@@ -44,6 +45,7 @@ function M.select_mkdir_cmd(directory, cwd, info_msg)
   end
 end
 
+-- Returns the remove command based on the OS
 ---@param file string
 ---@param info_msg string
 ---@return table
@@ -77,6 +79,7 @@ function M.select_executable(executables)
   end, executables)[1]
 end
 
+-- Returns the compiler arguments based on the compiler and OS
 ---@param repo InstallInfo
 ---@param compiler string
 ---@return string[]
@@ -125,6 +128,11 @@ function M.select_compiler_args(repo, compiler)
   end
 end
 
+-- Returns the compile command based on the OS and user options
+---@param repo InstallInfo
+---@param cc string
+---@param compile_location string
+---@return Command
 function M.select_compile_command(repo, cc, compile_location)
   local make = M.select_executable { "gmake", "make" }
   if
@@ -160,6 +168,10 @@ function M.select_compile_command(repo, cc, compile_location)
   end
 end
 
+-- Returns the remove command based on the OS
+---@param cache_folder string
+---@param project_name string
+---@return Command
 function M.select_install_rm_cmd(cache_folder, project_name)
   if fn.has "win32" == 1 then
     local dir = cache_folder .. "\\" .. project_name
@@ -179,6 +191,11 @@ function M.select_install_rm_cmd(cache_folder, project_name)
   end
 end
 
+-- Returns the move command based on the OS
+---@param from string
+---@param to string
+---@param cwd string
+---@return Command
 function M.select_mv_cmd(from, to, cwd)
   if fn.has "win32" == 1 then
     return {

From a60b2234bc4bab1944e5a02fd71699f02cf65fcd Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sat, 11 Mar 2023 22:06:25 +0000
Subject: [PATCH 0114/2704] Update README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 449633124..ce2d1051a 100644
--- a/README.md
+++ b/README.md
@@ -204,7 +204,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [diff](https://github.com/the-mikedavis/tree-sitter-diff) (maintained by @gbprod)
 - [x] [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) (maintained by @camdencheek)
 - [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
-- [x] [ebnf](https://github.com/RubixDev/ebnf.git) (experimental, maintained by @RubixDev)
+- [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
 - [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)
 - [x] [elixir](https://github.com/elixir-lang/tree-sitter-elixir) (maintained by @connorlay)
 - [x] [elm](https://github.com/elm-tooling/tree-sitter-elm) (maintained by @zweimach)
@@ -296,7 +296,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ql](https://github.com/tree-sitter/tree-sitter-ql) (maintained by @pwntester)
 - [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
 - [x] [qmljs](https://github.com/yuja/tree-sitter-qmljs) (maintained by @Decodetalkers)
-- [x] [Tree-sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
+- [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
 - [x] [racket](https://github.com/6cdh/tree-sitter-racket) (maintained by @6cdh)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)

From 079a50f66ea9f2d3b9827bdba82ba3b255155621 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 11 Mar 2023 16:05:03 -0500
Subject: [PATCH 0115/2704] refactor!: remove setting the update strategy

---
 lua/nvim-treesitter/configs.lua | 6 ------
 lua/nvim-treesitter/install.lua | 5 ++---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index 4207384ef..a3f4063cd 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -14,7 +14,6 @@ local M = {}
 ---@field ensure_installed string[]|string
 ---@field ignore_install string[]
 ---@field auto_install boolean
----@field update_strategy string
 ---@field parser_install_dir string|nil
 
 ---@type TSConfig
@@ -24,7 +23,6 @@ local config = {
   ensure_installed = {},
   auto_install = false,
   ignore_install = {},
-  update_strategy = "lockfile",
   parser_install_dir = nil,
 }
 
@@ -604,10 +602,6 @@ function M.get_parser_info_dir()
   return M.get_parser_install_dir "parser-info"
 end
 
-function M.get_update_strategy()
-  return config.update_strategy
-end
-
 function M.get_ignored_parser_installs()
   return config.ignore_install or {}
 end
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index ba8cada87..37f32fe53 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -379,7 +379,7 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
   end
 
   local revision = repo.revision
-  if not revision and configs.get_update_strategy() == "lockfile" then
+  if not revision then
     revision = get_revision(lang)
   end
 
@@ -583,8 +583,7 @@ function M.update(options)
         utils.notify "Parsers are up-to-date!"
       end
     else
-      local parsers_to_update = configs.get_update_strategy() == "lockfile" and outdated_parsers()
-        or info.installed_parsers()
+      local parsers_to_update = outdated_parsers() or info.installed_parsers()
       if #parsers_to_update == 0 then
         utils.notify "All parsers are up-to-date!"
       end

From a6cc614409e5920800d0b5d7bba930a0fe830271 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 12 Mar 2023 06:37:50 +0000
Subject: [PATCH 0116/2704] Update parsers: racket, scheme

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 17ec92207..f4e671c92 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -375,7 +375,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "c2f7baa22053a66b4dba852cdba3f14f34bb6985"
+    "revision": "ed5369ad17166c0749ab7241d826c438bd69338d"
   },
   "rasi": {
     "revision": "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b"
@@ -405,7 +405,7 @@
     "revision": "2275b754360de8539e02e84106fa38f7cb6de275"
   },
   "scheme": {
-    "revision": "38aef90f54ef8f2e8e402b1f6f036ed19c636759"
+    "revision": "9a23ff3df8f03da555f7679ab640a98a9e851c79"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"

From e3ebc8ec5d586162f3c408417621daa59ba8ea62 Mon Sep 17 00:00:00 2001
From: Peter Lamby <dev@peterlamby.de>
Date: Sun, 12 Mar 2023 17:27:40 +0100
Subject: [PATCH 0117/2704] fix(ecma): inject properly based on
 "call_expression"

Also add a comment what the query does.
---
 queries/ecma/injections.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 43596ecb2..15da0431e 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -3,10 +3,13 @@
 
 (comment) @comment
 
-(call_expression
+; html(`...`), sql(...) etc
+(call_expression 
  function: ((identifier) @language)
- arguments: ((template_string) @content
-   (#offset! @content 0 1 0 -1)))
+ arguments: (arguments
+   (template_string) @content
+     (#offset! @content 0 1 0 -1))
+)
 
 (call_expression
  function: ((identifier) @_name

From 5b505f565816bc7e8c08605285ab78ecd7ca5945 Mon Sep 17 00:00:00 2001
From: August Damiani <acdamiani@outlook.com>
Date: Sun, 12 Mar 2023 15:15:55 -0500
Subject: [PATCH 0118/2704] docs: consistent  in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ce2d1051a..32e52405d 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ To make sure a parser is at the latest compatible version (as specified in `nvim
 
 Each module provides a distinct tree-sitter-based feature such as [highlighting](#highlight), [indentation](#indentation), or [folding](#folding); see [`:h nvim-treesitter-modules`](doc/nvim-treesitter.txt) or ["Available modules"](#available-modules) below for a list of modules and their options.
 
-Following examples assume that you are configuring neovim with lua. If you are using vimscript, see `:help lua-heredoc`.
+Following examples assume that you are configuring neovim with lua. If you are using vimscript, see `:h lua-heredoc`.
 All modules are disabled by default and need to be activated explicitly in your `init.lua`, e.g., via
 
 ```lua

From 3eae9ded42f14636875a89dcd57c719eddbf99c4 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 12 Mar 2023 06:09:35 -0400
Subject: [PATCH 0119/2704] feat(thrift): update queries based on upstream
 changes

---
 lockfile.json                 |   2 +-
 queries/thrift/folds.scm      |  16 ++--
 queries/thrift/highlights.scm | 176 +++++++++++++++++++---------------
 queries/thrift/indents.scm    |  11 +--
 queries/thrift/locals.scm     |  61 ++++++++----
 5 files changed, 151 insertions(+), 115 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f4e671c92..11db0a1ec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -459,7 +459,7 @@
     "revision": "0ff887f2a60a147452d52db060de6b42f42f1441"
   },
   "thrift": {
-    "revision": "e0c3e50e17846230e88becdce28fbb1b41dcabba"
+    "revision": "d4deb1bd9e848f2dbe81103a151d99e8546de480"
   },
   "tiger": {
     "revision": "a233ebe360a73a92c50978e5c4e9e471bc59ff42"
diff --git a/queries/thrift/folds.scm b/queries/thrift/folds.scm
index 0e0a845a8..1361be1f8 100644
--- a/queries/thrift/folds.scm
+++ b/queries/thrift/folds.scm
@@ -1,12 +1,12 @@
 [
-  (annotation)
-  (enum)
-  (exception)
-  (function)
-  (senum)
-  (service)
-  (struct)
-  (union)
+  (annotation_definition)
+  (enum_definition)
+  (exception_definition)
+  (function_definition)
+  (senum_definition)
+  (service_definition)
+  (struct_definition)
+  (union_definition)
 
   (comment)
 ] @fold
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index adf147d9d..2b4778722 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -1,6 +1,7 @@
- ; Namespace
+; Variables
 
-(namespace_definition) @namespace
+((identifier) @variable
+  (#set! "priority" 95))
 
 ; Includes
 
@@ -9,10 +10,62 @@
   "cpp_include"
 ] @include
 
-(include_path) @string
-(package_path) @string
+; Function
 
-; Builtins
+(function_definition
+  (identifier) @function)
+
+; Fields
+
+(field (identifier) @field)
+
+; Parameters
+
+(function_definition
+  (parameters
+    (parameter (identifier) @parameter)))
+
+(throws
+  (parameters
+    (parameter (identifier) @parameter)))
+
+; Types
+
+(typedef_identifier) @type
+(struct_definition
+  "struct" (identifier) @type)
+
+(union_definition
+  "union" (identifier) @type)
+
+(exception_definition
+  "exception" (identifier) @type)
+
+(service_definition
+  "service" (identifier) @type)
+
+(interaction_definition
+  "interaction" (identifier) @type)
+
+(type
+  type: (identifier) @type)
+
+(definition_type
+  type: (identifier) @type)
+
+((identifier) @type
+  (#lua-match? @type "^[_]*[A-Z]"))
+
+; Constants
+
+(const_definition (identifier) @constant)
+((identifier) @constant
+  (#lua-match? @constant "^[_A-Z][A-Z0-9_]*$"))
+(enum_definition "enum"
+  . (identifier) @type
+  "{" (identifier) @constant "}")
+
+; Builtin Types
 
 (primitive) @type.builtin
 
@@ -25,80 +78,50 @@
   "void"
 ] @type.builtin
 
-; Function
+; Namespace
 
-(function_identifier) @function
-
-; Fields
-
-(field_identifier) @field
-
-; Parameters
-
-(param_identifier) @parameter
-(exception_param_identifier) @parameter
-
-; Variables
-
-(identifier) @variable
-
-; Constants
-
-(const_identifier) @constant
-(enum_member) @constant
-
-; Types
-
-(enum_identifier) @type
-(definition_type) @type
-(exception_identifier) @type
-(exception_param_type) @type
-(field_type) @type
-(param_type) @type
-(type_identifier) @type
+(namespace_declaration
+  (namespace_scope) @tag
+  [(namespace) @namespace (_ (identifier) @namespace)])
 
 ; Attributes
 
-(annotation_identifier) @attribute
-(uri_def) @attribute
+(annotation_definition
+  (annotation_identifier (identifier) @attribute))
+(fb_annotation_definition
+  "@" @attribute (annotation_identifier (identifier) @attribute)
+  (identifier)? @attribute)
+(namespace_uri (string) @attribute)
 
 ; Operators
 
 [
- "="
- "+"
- "-"
+  "="
+  "&"
 ] @operator
 
 ; Exceptions
 
 [
- "throws"
+  "throws"
 ] @exception
 
 ; Keywords
 
 [
-  "cpp_include"
   "enum"
   "exception"
   "extends"
-  "include"
   "interaction"
   "namespace"
-  "optional"
-  "required"
   "senum"
   "service"
   "struct"
   "typedef"
   "union"
+  "uri"
 ] @keyword
 
-[
-  "oneway"
-] @keyword.coroutine
-
 ; Deprecated Keywords
 
 [
@@ -120,35 +143,41 @@
   "xsd_optional"
 ] @keyword
 
+; Extended Kewords
+[
+  "package"
+  "performs"
+] @keyword
+
 [
   "async"
+  "oneway"
 ] @keyword.coroutine
 
-; Extended Keywords
+; Qualifiers
 
 [
   "client"
+  "const"
   "idempotent"
-  "package"
-  "performs"
+  "optional"
   "permanent"
   "readonly"
-  "server"
+  "required"
   "safe"
+  "server"
   "stateful"
   "transient"
-] @keyword
+] @type.qualifier
 
 ; Literals
 
-[
- (annotation_value)
- (string)
-] @string
+(string) @string
 
 (escape_sequence) @string.escape
 
-(uri (string_fragment) @text.uri) @string.special
+(namespace_uri
+  (string) @text.uri @string.special)
 
 (number) @number
 
@@ -158,24 +187,12 @@
 
 ; Typedefs
 
-(typedef_definition) @type.definition
-(namespace_scope) @type.definition
-
-; Qualifiers
-
-[
-  "const"
-  (exception_modifier)
-  (field_modifier)
-  (function_modifier)
-] @type.qualifier
+(typedef_identifier) @type.definition
 
 ; Punctuation
 
 [
   "*"
-  "&"
-  "@"
 ] @punctuation.special
 
 ["{" "}"] @punctuation.bracket
@@ -187,14 +204,12 @@
 ["<" ">"] @punctuation.bracket
 
 [
-  ";"
+  "."
   ","
+  ";"
+  ":"
 ] @punctuation.delimiter
 
-; Errors
-
-(invalid) @error
-
 ; Comments
 
 (comment) @comment @spell
@@ -206,3 +221,10 @@
   (#lua-match? @comment.documentation "^///[^/]"))
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
+
+((comment) @preproc
+  (#lua-match? @preproc "#!.*"))
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/thrift/indents.scm b/queries/thrift/indents.scm
index 9a5e0455d..768ff795d 100644
--- a/queries/thrift/indents.scm
+++ b/queries/thrift/indents.scm
@@ -1,11 +1,6 @@
 (definition) @indent
 
-; (function (function_identifier) @aligned_indent)
-
-((function_parameters (function_parameter)) @aligned_indent
-  (#set! "delimiter" "()"))
-
-((exception_parameters (exception_parameter)) @aligned_indent
+((parameters (parameter)) @aligned_indent
   (#set! "delimiter" "()"))
 
 "}" @indent_end
@@ -15,6 +10,6 @@
 [ "(" ")" ] @branch
 
 [
- (ERROR)
- (comment)
+  (ERROR)
+  (comment)
 ] @auto
diff --git a/queries/thrift/locals.scm b/queries/thrift/locals.scm
index 2275ed9b8..d95cc5da1 100644
--- a/queries/thrift/locals.scm
+++ b/queries/thrift/locals.scm
@@ -1,32 +1,51 @@
-(document) @scope
-(definition) @scope
+; Scopes
 
 [
-  (identifier)
-  (field_type)
-  (custom_type)
-] @reference
-(const_value (const_identifier) @reference)
+  (document)
+  (definition)
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
 
 (annotation_identifier) @definition
 
-(const (const_identifier) @definition.constant)
-(enum_member) @definition.constant
+(const_definition (identifier) @definition.constant)
 
-(enum_identifier) @definition.enum
+(enum_definition "enum"
+  . (identifier) @definition.enum
+  "{" (identifier) @definition.constant "}")
 
-(field_identifier) @definition.field
+(senum_definition "senum"
+  . (identifier) @definition.enum)
 
-(function_identifier) @definition.function
+(field (identifier) @definition.field)
 
-(namespace_definition) @definition.namespace
+(function_definition (identifier) @definition.function)
 
-[
-  (param_identifier)
-  (exception_param_identifier)
-] @definition.parameter
+(namespace_declaration
+  "namespace" (namespace_scope)
+  . (_) @definition.namespace
+  (namespace_uri)?)
 
-[
-  (type_identifier)
-  (exception_identifier)
-] @definition.type
+(parameter (identifier) @definition.parameter)
+
+(struct_definition
+  "struct" . (identifier) @definition.type)
+
+(union_definition
+  "union" . (identifier) @definition.type)
+
+(exception_definition
+  "exception" . (identifier) @definition.type)
+
+(service_definition
+  "service" . (identifier) @definition.type)
+
+(interaction_definition
+  "interaction" . (identifier) @definition.type)
+
+(typedef_identifier) @definition.type

From 9c2009ce3696434fbe24569c7b87cbe952975d43 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 13 Mar 2023 06:40:00 +0000
Subject: [PATCH 0120/2704] Update parsers: php, scala, swift, thrift, tsx,
 typescript

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 11db0a1ec..36d15a124 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -330,7 +330,7 @@
     "revision": "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"
   },
   "php": {
-    "revision": "f860e598194f4a71747f91789bf536b393ad4a56"
+    "revision": "d5e7cacb6c27e0e131c7f76c0dbfee56dfcc61e3"
   },
   "phpdoc": {
     "revision": "2f4d16c861b5a454b577d057f247f9902d7b47f5"
@@ -402,7 +402,7 @@
     "revision": "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a"
   },
   "scala": {
-    "revision": "2275b754360de8539e02e84106fa38f7cb6de275"
+    "revision": "ec60db85fc589a3d52bc5c10de092b3eb50e1950"
   },
   "scheme": {
     "revision": "9a23ff3df8f03da555f7679ab640a98a9e851c79"
@@ -444,7 +444,7 @@
     "revision": "52e122ae68b316d3aa960a0a422d3645ba717f42"
   },
   "swift": {
-    "revision": "fe2e325a45056cdb3fcda821c03b8cef0d79e508"
+    "revision": "449d5974981d402181ca721e0573346f8c17f726"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -474,7 +474,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "c6e56d44c686a67c89e29e773e662567285d610f"
+    "revision": "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -483,7 +483,7 @@
     "revision": "2457993b13a06dec2706e6a6c3d5b65bb23024b8"
   },
   "typescript": {
-    "revision": "c6e56d44c686a67c89e29e773e662567285d610f"
+    "revision": "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"

From 834f1dcb8736c82b1269227b4bfe830310b5b6a1 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 13 Mar 2023 09:47:26 +0000
Subject: [PATCH 0121/2704] Update parsers: scala

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 36d15a124..061bbc98e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -402,7 +402,7 @@
     "revision": "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a"
   },
   "scala": {
-    "revision": "ec60db85fc589a3d52bc5c10de092b3eb50e1950"
+    "revision": "6f9bc5ab749d90bb2ac4ad083891f9d0481d768d"
   },
   "scheme": {
     "revision": "9a23ff3df8f03da555f7679ab640a98a9e851c79"

From 5c4ea53070c4e2680d7256be5487f0ef653a8a6d Mon Sep 17 00:00:00 2001
From: Ramkumar Ramachandra <r@artagnon.com>
Date: Mon, 20 Feb 2023 21:12:09 +0100
Subject: [PATCH 0122/2704] parsers: add tree-sitter-mlir parser

The parser is currently in development, and 60-80% of MLIR files in the
test suite of MLIR, within the Arith, Math, SCF, Tensor, and Linalg
dialects parse successfully.
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |  10 +
 queries/mlir/highlights.scm     | 335 ++++++++++++++++++++++++++++++++
 queries/mlir/locals.scm         |   7 +
 5 files changed, 356 insertions(+)
 create mode 100644 queries/mlir/highlights.scm
 create mode 100644 queries/mlir/locals.scm

diff --git a/README.md b/README.md
index 32e52405d..38384433f 100644
--- a/README.md
+++ b/README.md
@@ -272,6 +272,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [menhir](https://github.com/Kerl13/tree-sitter-menhir) (maintained by @Kerl13)
 - [ ] [mermaid](https://github.com/monaqa/tree-sitter-mermaid) (experimental)
 - [x] [meson](https://github.com/Decodetalkers/tree-sitter-meson) (maintained by @Decodetalkers)
+- [x] [mlir](https://github.com/artagnon/tree-sitter-mlir) (experimental, maintained by @artagnon)
 - [ ] [nickel](https://github.com/nickel-lang/tree-sitter-nickel)
 - [x] [ninja](https://github.com/alemuller/tree-sitter-ninja) (maintained by @alemuller)
 - [x] [nix](https://github.com/cstrahan/tree-sitter-nix) (maintained by @leo60228)
diff --git a/lockfile.json b/lockfile.json
index 061bbc98e..f205b2735 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -296,6 +296,9 @@
   "meson": {
     "revision": "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"
   },
+  "mlir": {
+    "revision": "f36fef9932e1214f65aa37cf700197ea5837e90a"
+  },
   "nickel": {
     "revision": "d6c7eeb751038f934b5b1aa7ff236376d0235c56"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b772205a2..6a54c9032 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -905,6 +905,16 @@ list.meson = {
   maintainers = { "@Decodetalkers" },
 }
 
+list.mlir = {
+  install_info = {
+    url = "https://github.com/artagnon/tree-sitter-mlir",
+    files = { "src/parser.c" },
+    requires_generate_from_grammar = true,
+  },
+  experimental = true,
+  maintainers = { "@artagnon" },
+}
+
 list.nickel = {
   install_info = {
     url = "https://github.com/nickel-lang/tree-sitter-nickel",
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
new file mode 100644
index 000000000..3cc3c671a
--- /dev/null
+++ b/queries/mlir/highlights.scm
@@ -0,0 +1,335 @@
+[
+  "ins"
+  "outs"
+  "else"
+  "do"
+  "loc"
+  "attributes"
+  "into"
+  "to"
+  "from"
+  "step"
+  "low"
+  "high"
+  "iter_args"
+  "padding_value"
+  "inner_tiles"
+  "gather_dims"
+  "scatter_dims"
+  "outer_dims_perm"
+  "inner_dims_pos"
+  "shared_outs"
+  "default"
+  (arith_cmp_predicate)
+] @keyword
+
+[
+  "module"
+  "unrealized_conversion_cast"
+
+  "func.call"
+  "call"
+  "func.call_indirect"
+  "call_indirect"
+  "func.constant"
+  "constant"
+  "func.func"
+  "func.return"
+  "return"
+
+  "llvm.func"
+  "llvm.return"
+
+  "cf.assert"
+  "cf.br"
+  "cf.cond_br"
+  "cf.switch"
+
+  "scf.condition"
+  "scf.execute_region"
+  "scf.if"
+  "scf.index_switch"
+  "scf.for"
+  "scf.forall"
+  "scf.forall.in_parallel"
+  "scf.parallel"
+  "scf.reduce"
+  "scf.reduce.return"
+  "scf.while"
+  "scf.yield"
+
+  "arith.constant"
+  "arith.addi"
+  "arith.subi"
+  "arith.divsi"
+  "arith.divui"
+  "arith.ceildivsi"
+  "arith.ceildivui"
+  "arith.floordivsi"
+  "arith.remsi"
+  "arith.remui"
+  "arith.muli"
+  "arith.mulsi_extended"
+  "arith.mului_extended"
+  "arith.andi"
+  "arith.ori"
+  "arith.xori"
+  "arith.maxsi"
+  "arith.maxui"
+  "arith.minsi"
+  "arith.minui"
+  "arith.shli"
+  "arith.shrsi"
+  "arith.shrui"
+  "arith.addui_extended"
+  "arith.addf"
+  "arith.divf"
+  "arith.maxf"
+  "arith.minf"
+  "arith.mulf"
+  "arith.remf"
+  "arith.subf"
+  "arith.negf"
+  "arith.cmpi"
+  "arith.cmpf"
+  "arith.extf"
+  "arith.extsi"
+  "arith.extui"
+  "arith.fptosi"
+  "arith.fptoui"
+  "arith.index_cast"
+  "arith.index_castui"
+  "arith.sitofp"
+  "arith.uitofp"
+  "arith.bitcast"
+  "arith.truncf"
+  "arith.select"
+
+  "math.absf"
+  "math.atan"
+  "math.cbrt"
+  "math.ceil"
+  "math.cos"
+  "math.erf"
+  "math.exp"
+  "math.exp2"
+  "math.expm1"
+  "math.floor"
+  "math.log"
+  "math.log10"
+  "math.log1p"
+  "math.log2"
+  "math.round"
+  "math.roundeven"
+  "math.rsqrt"
+  "math.sin"
+  "math.sqrt"
+  "math.tan"
+  "math.tanh"
+  "math.trunc"
+  "math.absi"
+  "math.ctlz"
+  "math.cttz"
+  "math.ctpop"
+  "math.atan2"
+  "math.copysign"
+  "math.fpowi"
+  "math.powf"
+  "math.ipowi"
+  "math.fma"
+
+  "memref.alloc"
+  "memref.cast"
+  "memref.copy"
+  "memref.collapse_shape"
+  "memref.expand_shape"
+  "memref.prefetch"
+  "memref.rank"
+  "memref.realloc"
+  "memref.view"
+
+  "vector.bitcast"
+  "vector.broadcast"
+  "vector.shape_cast"
+  "vector.type_cast"
+  "vector.constant_mask"
+  "vector.create_mask"
+  "vector.extract"
+  "vector.load"
+  "vector.scalable.extract"
+  "vector.fma"
+  "vector.flat_transpose"
+  "vector.insert"
+  "vector.scalable.insert"
+  "vector.shuffle"
+  "vector.store"
+  "vector.insert_strided_slice"
+  "vector.matrix_multiply"
+  "vector.print"
+  "vector.splat"
+  "vector.transfer_read"
+  "vector.transfer_write"
+  "vector.yield"
+
+  "tensor.empty"
+  "tensor.cast"
+  "tensor.dim"
+  "tensor.collapse_shape"
+  "tensor.expand_shape"
+  "tensor.extract"
+  "tensor.insert"
+  "tensor.extract_slice"
+  "tensor.insert_slice"
+  "tensor.parallel_insert_slice"
+  "tensor.from_elements"
+  "tensor.gather"
+  "tensor.scatter"
+  "tensor.pad"
+  "tensor.reshape"
+  "tensor.splat"
+  "tensor.pack"
+  "tensor.unpack"
+  "tensor.generate"
+  "tensor.rank"
+  "tensor.yield"
+
+  "bufferization.alloc_tensor"
+  "bufferization.to_memref"
+  "bufferization.to_tensor"
+
+  "linalg.batch_matmul"
+  "linalg.batch_matmul_transpose_b"
+  "linalg.batch_matvec"
+  "linalg.batch_reduce_matmul"
+  "linalg.broadcast"
+  "linalg.conv_1d_ncw_fcw"
+  "linalg.conv_1d_nwc_wcf"
+  "linalg.conv_1d"
+  "linalg.conv_2d_nchw_fchw"
+  "linalg.conv_2d_ngchw_fgchw"
+  "linalg.conv_2d_nhwc_fhwc"
+  "linalg.conv_2d_nhwc_hwcf"
+  "linalg.conv_2d_nhwc_hwcf_q"
+  "linalg.conv_2d"
+  "linalg.conv_3d_ndhwc_dhwcf"
+  "linalg.conv_3d_ndhwc_dhwcf_q"
+  "linalg.conv_3d"
+  "linalg.copy"
+  "linalg.depthwise_conv_1d_nwc_wcm"
+  "linalg.depthwise_conv_2d_nchw_chw"
+  "linalg.depthwise_conv_2d_nhwc_hwc"
+  "linalg.depthwise_conv_2d_nhwc_hwc_q"
+  "linalg.depthwise_conv_2d_nhwc_hwcm"
+  "linalg.depthwise_conv_2d_nhwc_hwcm_q"
+  "linalg.depthwise_conv_3d_ndhwc_dhwc"
+  "linalg.depthwise_conv_3d_ndhwc_dhwcm"
+  "linalg.dot"
+  "linalg.elemwise_binary"
+  "linalg.elemwise_unary"
+  "linalg.fill"
+  "linalg.fill_rng_2d"
+  "linalg.matmul"
+  "linalg.matmul_transpose_b"
+  "linalg.matmul_unsigned"
+  "linalg.matvec"
+  "linalg.mmt4d"
+  "linalg.pooling_nchw_max"
+  "linalg.pooling_nchw_sum"
+  "linalg.pooling_ncw_max"
+  "linalg.pooling_ncw_sum"
+  "linalg.pooling_ndhwc_max"
+  "linalg.pooling_ndhwc_min"
+  "linalg.pooling_ndhwc_sum"
+  "linalg.pooling_nhwc_max"
+  "linalg.pooling_nhwc_max_unsigned"
+  "linalg.pooling_nhwc_min"
+  "linalg.pooling_nhwc_min_unsigned"
+  "linalg.pooling_nhwc_sum"
+  "linalg.pooling_nwc_max"
+  "linalg.pooling_nwc_max_unsigned"
+  "linalg.pooling_nwc_min"
+  "linalg.pooling_nwc_min_unsigned"
+  "linalg.pooling_nwc_sum"
+  "linalg.quantized_batch_matmul"
+  "linalg.quantized_matmul"
+  "linalg.vecmat"
+  "linalg.generic"
+  "linalg.index"
+  "linalg.map"
+  "linalg.yield"
+] @function.builtin
+
+(generic_operation) @function
+
+(builtin_type) @type.builtin
+
+[
+  (type_alias)
+  (dialect_type)
+  (type_alias_def)
+] @type
+
+[
+  (integer_literal)
+  (complex_literal)
+] @number
+
+(float_literal) @float
+(bool_literal) @boolean
+
+[
+  (tensor_literal)
+  (array_literal)
+  (unit_literal)
+] @constant.builtin
+
+(string_literal) @string
+
+[
+  (attribute_alias_def)
+  (attribute_alias)
+  (bare_attribute_entry)
+  (attribute)
+  (fastmath_attr)
+  (scatter_dims_attr)
+  (gather_dims_attr)
+  (outer_dims_perm_attr)
+  (inner_dims_pos_attr)
+  (inner_tiles_attr)
+  (unique_attr)
+  (nofold_attr)
+  (isWrite_attr)
+  (localityHint_attr)
+  (isDataCache_attr)
+  (restrict_attr)
+  (writable_attr)
+] @attribute
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ":"
+  ","
+] @punctuation.delimiter
+
+[
+  "="
+  "->"
+] @operator
+
+(func_dialect name: (symbol_ref_id) @function)
+(llvm_dialect name: (symbol_ref_id) @function)
+
+(func_arg_list (value_use) @parameter)
+(block_arg_list (value_use) @parameter)
+
+(caret_id) @tag
+(value_use) @variable
+(comment) @comment
diff --git a/queries/mlir/locals.scm b/queries/mlir/locals.scm
new file mode 100644
index 000000000..7d96fe9e3
--- /dev/null
+++ b/queries/mlir/locals.scm
@@ -0,0 +1,7 @@
+(region) @scope
+
+(func_arg_list (value_use) @definition.var)
+(block_arg_list (value_use) @definition.var)
+(op_result (value_use) @definition.var)
+
+(value_use) @reference

From 89e5fa66cf53854f45cfcfae45afb93171cf5c05 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 14 Mar 2023 06:40:42 +0000
Subject: [PATCH 0123/2704] Update parsers: mlir, rasi

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f205b2735..152a21b93 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -297,7 +297,7 @@
     "revision": "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"
   },
   "mlir": {
-    "revision": "f36fef9932e1214f65aa37cf700197ea5837e90a"
+    "revision": "e2053f7c8856d91bc36c87604f697784845cee69"
   },
   "nickel": {
     "revision": "d6c7eeb751038f934b5b1aa7ff236376d0235c56"
@@ -381,7 +381,7 @@
     "revision": "ed5369ad17166c0749ab7241d826c438bd69338d"
   },
   "rasi": {
-    "revision": "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b"
+    "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "regex": {
     "revision": "e1cfca3c79896ff79842f057ea13e529b66af636"

From cd436f92f65def9c7e74a7324d3eab422ef85643 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 15 Mar 2023 06:39:25 +0000
Subject: [PATCH 0124/2704] Update parsers: elixir, haskell, php, sql

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 152a21b93..892320c93 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -99,7 +99,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "b20eaa75565243c50be5e35e253d8beb58f45d56"
+    "revision": "869dff3ceb8823ca4b17ca33b663667c8e41e8ba"
   },
   "elm": {
     "revision": "28bb193640d916dfaf947912c1413cebb0484841"
@@ -189,7 +189,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "0da7f826e85b3e589e217adf69a6fd89ee4301b9"
+    "revision": "fb3c19e8e307acaf9336ab88330fd386ce731638"
   },
   "hcl": {
     "revision": "0ff887f2a60a147452d52db060de6b42f42f1441"
@@ -333,7 +333,7 @@
     "revision": "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"
   },
   "php": {
-    "revision": "d5e7cacb6c27e0e131c7f76c0dbfee56dfcc61e3"
+    "revision": "1a40581b7a899201d7c2b4684ee34490bc306bd6"
   },
   "phpdoc": {
     "revision": "2f4d16c861b5a454b577d057f247f9902d7b47f5"
@@ -429,7 +429,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "b2f6b30ce12cbddfb663473457b670f2b3bffaa9"
+    "revision": "d6963a2426972a6ffa08ff92a5dba7922d68c1f5"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From fa0644667ea7ee7a72efdb69c471de4953a11019 Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Tue, 14 Mar 2023 12:25:38 -0700
Subject: [PATCH 0125/2704] fix: change folding algorithm to fix Python indents

---
 lua/nvim-treesitter/indent.lua      | 39 ++++++++++++++++++++++++++---
 queries/python/indents.scm          | 38 ++++++++++++++++++++--------
 tests/indent/python/control_flow.py |  8 ++++++
 tests/indent/python_spec.lua        | 17 +++++++++++--
 4 files changed, 85 insertions(+), 17 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index c3e4c0888..cf819d05b 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -137,7 +137,13 @@ function M.get_indent(lnum)
 
   while node do
     -- do 'autoindent' if not marked as @indent
-    if not q.indent[node:id()] and q.auto[node:id()] and node:start() < lnum - 1 and lnum - 1 <= node:end_() then
+    if
+      not q.indent[node:id()]
+      and not q.aligned_indent[node:id()]
+      and q.auto[node:id()]
+      and node:start() < lnum - 1
+      and lnum - 1 <= node:end_()
+    then
       return -1
     end
 
@@ -171,7 +177,7 @@ function M.get_indent(lnum)
       should_process
       and (
         q.indent[node:id()]
-        and (srow ~= erow or is_in_err)
+        and (srow ~= erow or is_in_err or q.indent[node:id()].immediate_indent)
         and (srow ~= lnum - 1 or q.indent[node:id()].start_at_same_line)
       )
     then
@@ -183,12 +189,16 @@ function M.get_indent(lnum)
     if q.aligned_indent[node:id()] and srow ~= erow and (srow ~= lnum - 1) then
       local metadata = q.aligned_indent[node:id()]
       local o_delim_node, is_last_in_line ---@type TSNode|nil, boolean|nil
+      local c_delim_node ---@type TSNode|nil
       if metadata.delimiter then
         ---@type string
         local opening_delimiter = metadata.delimiter and metadata.delimiter:sub(1, 1)
         o_delim_node, is_last_in_line = find_delimiter(bufnr, node, opening_delimiter)
+        local closing_delimiter = metadata.delimiter and metadata.delimiter:sub(2, 2)
+        c_delim_node, _ = find_delimiter(bufnr, node, closing_delimiter)
       else
         o_delim_node = node
+        c_delim_node = node
       end
 
       if o_delim_node then
@@ -196,8 +206,29 @@ function M.get_indent(lnum)
           -- hanging indent (previous line ended with starting delimiter)
           indent = indent + indent_size * 1
         else
-          local _, o_scol = o_delim_node:start()
-          return math.max(indent, 0) + o_scol + (metadata.increment or 1)
+          local o_srow, o_scol = o_delim_node:start()
+          local final_line_indent = false
+          if c_delim_node then
+            local c_srow, _ = c_delim_node:start()
+            if c_srow ~= o_srow and c_srow == lnum - 1 then
+              -- delims end on current line, and are not open and closed same line.
+              -- final_line_indent controls this behavior, for example this is not desirable
+              -- for a tuple.
+              final_line_indent = metadata.final_line_indent or false
+            end
+          end
+          if final_line_indent then
+            -- last line must be indented more in cases where
+            -- it would be same indent as next line
+            local aligned_indent = o_scol + (metadata.increment or 1)
+            if aligned_indent <= indent then
+              return indent + indent_size * 1
+            else
+              return aligned_indent
+            end
+          else
+            return o_scol + (metadata.increment or 1)
+          end
         end
       end
     end
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index 3032cedfb..da37c1f30 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -3,11 +3,6 @@
   (dictionary)
   (set)
 
-  (if_statement)
-  (for_statement)
-  (while_statement)
-  (with_statement)
-  (try_statement)
   (import_from_statement)
 
   (parenthesized_expression)
@@ -21,24 +16,45 @@
   (binary_operator)
 
   (lambda)
-  (function_definition)
-  (class_definition)
 
   (concatenated_string)
 ] @indent
-  
+
+((for_statement) @indent
+ (#set! "immediate_indent" 1))
+((if_statement) @indent
+ (#set! "immediate_indent" 1))
+((while_statement) @indent
+ (#set! "immediate_indent" 1))
+((try_statement) @indent
+ (#set! "immediate_indent" 1))
+((ERROR "try" ":") @indent
+ (#set! "immediate_indent" 1))
+((function_definition) @indent
+ (#set! "immediate_indent" 1))
+((class_definition) @indent
+ (#set! "immediate_indent" 1))
+((with_statement) @indent
+ (#set! "immediate_indent" 1))
+
 (if_statement
   condition: (parenthesized_expression) @aligned_indent
   (#set! "delimiter" "()")
+  (#set! "final_line_indent" 1) ; parenthesized_expression already indented
 )
+(while_statement
+  condition: (parenthesized_expression) @aligned_indent
+  (#set! "delimiter" "()")
+  (#set! "final_line_indent" 1) ; parenthesized_expression already indented
+)
+
 ((ERROR "(" . (_)) @aligned_indent
  (#set! "delimiter" "()"))
 ((argument_list) @aligned_indent
  (#set! "delimiter" "()"))
-((argument_list) @aligned_indent
- (#set! "delimiter" "()"))
 ((parameters) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "delimiter" "()")
+ (#set! "final_line_indent" 1))
 ((tuple) @aligned_indent
  (#set! "delimiter" "()"))
 
diff --git a/tests/indent/python/control_flow.py b/tests/indent/python/control_flow.py
index c8cd2541b..7ec02e3ff 100644
--- a/tests/indent/python/control_flow.py
+++ b/tests/indent/python/control_flow.py
@@ -20,3 +20,11 @@ except:
     pass
 finally:
     pass
+
+while (a > 4 and
+       b > 5):
+    pass
+
+try:
+    pass
+
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index b8856b3a0..b1e94cbf8 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -19,12 +19,25 @@ describe("indent Python:", function()
     run:new_line("aligned_indent.py", { on_line = 1, text = "arg3,", indent = 19 })
     run:new_line("basic_blocks.py", { on_line = 1, text = "wait,", indent = 4 })
     run:new_line("basic_blocks.py", { on_line = 6, text = "x += 1", indent = 4 })
-    run:new_line("basic_blocks.py", { on_line = 10, text = "x += 1", indent = 8 })
     run:new_line("basic_blocks.py", { on_line = 7, text = "x += 1", indent = 4 })
-    run:new_line("basic_blocks.py", { on_line = 11, text = "x += 1", indent = 8 })
+    run:new_line("basic_blocks.py", { on_line = 10, text = "x += 1", indent = 8 })
+    run:new_line("basic_blocks.py", { on_line = 14, text = "x += 1", indent = 8 })
     run:new_line("basic_collections.py", { on_line = 3, text = "4,", indent = 4 })
     run:new_line("comprehensions.py", { on_line = 8, text = "if x != 2", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 2, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 4, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 6, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 9, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 12, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 15, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 18, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 20, text = "x = 4", indent = 4 })
     run:new_line("control_flow.py", { on_line = 22, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 24, text = "c < 6 and", indent = 7 })
+    run:new_line("control_flow.py", { on_line = 26, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 29, text = "x = 4", indent = 4 })
+    run:new_line("branches.py", { on_line = 25, text = "x > 9 and", indent = 4 })
+    run:new_line("branches.py", { on_line = 29, text = "and x > 9", indent = 4 })
     run:new_line("hanging_indent.py", { on_line = 1, text = "arg0,", indent = 8 })
     run:new_line("hanging_indent.py", { on_line = 5, text = "0,", indent = 4 })
     run:new_line(

From f5ddd8f92e0222f96b88c6012453eee33e02728a Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Thu, 16 Mar 2023 08:39:58 +0900
Subject: [PATCH 0126/2704] fix(python): add missing @indent_end

---
 queries/python/indents.scm               | 18 ++++++-
 tests/indent/python/line_after_indent.py | 65 ++++++++++++++++++++++++
 tests/indent/python_spec.lua             | 14 +++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 tests/indent/python/line_after_indent.py

diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index da37c1f30..c02879712 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -50,14 +50,28 @@
 
 ((ERROR "(" . (_)) @aligned_indent
  (#set! "delimiter" "()"))
-((argument_list) @aligned_indent
+((argument_list ")" @indent_end) @aligned_indent
  (#set! "delimiter" "()"))
 ((parameters) @aligned_indent
  (#set! "delimiter" "()")
  (#set! "final_line_indent" 1))
-((tuple) @aligned_indent
+((tuple ")" @indent_end) @aligned_indent
  (#set! "delimiter" "()"))
 
+(list "]" @indent_end)
+(dictionary "}" @indent_end)
+(set "}" @indent_end)
+
+(parenthesized_expression ")" @indent_end)
+(generator_expression ")" @indent_end)
+(list_comprehension "]" @indent_end)
+(set_comprehension "}" @indent_end)
+(dictionary_comprehension "}" @indent_end)
+
+(tuple_pattern ")" @indent_end)
+(list_pattern "]" @indent_end)
+
+
 [
   ")"
   "]"
diff --git a/tests/indent/python/line_after_indent.py b/tests/indent/python/line_after_indent.py
new file mode 100644
index 000000000..ba24dc03f
--- /dev/null
+++ b/tests/indent/python/line_after_indent.py
@@ -0,0 +1,65 @@
+(
+    a, 
+    b
+)
+
+foo.bar(
+    a, b
+)
+
+foo = [
+    1, 
+    2, 
+    3
+]
+
+foo = {
+    "a": 1,
+    "b": 2,
+    "c": 3
+}
+
+foo = {
+    1,
+    2,
+    3,
+}
+
+foo = (
+    1 + 2
+)
+
+(
+    a for a in range(0, 10)
+)
+
+foo = [
+    a for a in range(0, 10)
+]
+
+foo = {
+    a for a in range(0, 10)
+}
+
+foo = {
+    a: b for a, b in items
+}
+
+foo.bar(
+    "baz")
+
+[
+    a + b for (
+        a, 
+        b
+    ) 
+    in items
+]
+
+[
+    a + b for [
+        a,
+        b
+    ]
+    in items
+]
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index b1e94cbf8..6b417a37f 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -60,5 +60,19 @@ describe("indent Python:", function()
     run:new_line("strings.py", { on_line = 14, text = "x", indent = 4 })
     run:new_line("strings.py", { on_line = 15, text = "x", indent = 0 })
     run:new_line("strings.py", { on_line = 16, text = "x", indent = 8 })
+    run:new_line("line_after_indent.py", { on_line = 4, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 8, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 4, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 14, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 20, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 26, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 30, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 34, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 38, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 42, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 46, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 49, text = "x", indent = 0 })
+    run:new_line("line_after_indent.py", { on_line = 55, text = "x", indent = 4 })
+    run:new_line("line_after_indent.py", { on_line = 63, text = "x", indent = 4 })
   end)
 end)

From e6f9a4b7c3b113a82b313d520ff32707cc5dddfa Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 16 Mar 2023 06:39:18 +0000
Subject: [PATCH 0127/2704] Update parsers: bash, scala

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 892320c93..7d1774958 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "e559793754c60c2cdf00cbb0409842d75f0a41dc"
   },
   "bash": {
-    "revision": "7f9506c34ab6a0f4e3e052b7a49cbeef91f71236"
+    "revision": "b338fa9f4807b9e0336cd4dde04948a8c324a4cf"
   },
   "beancount": {
     "revision": "f3741a3a68ade59ec894ed84a64673494d2ba8f3"
@@ -405,7 +405,7 @@
     "revision": "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a"
   },
   "scala": {
-    "revision": "6f9bc5ab749d90bb2ac4ad083891f9d0481d768d"
+    "revision": "7d348f51e442563f4ab2b6c3e136dac658649f93"
   },
   "scheme": {
     "revision": "9a23ff3df8f03da555f7679ab640a98a9e851c79"

From 677dd11c6a31bfcf162ca113b9348f0af6b44bea Mon Sep 17 00:00:00 2001
From: Adam Wolski <adam@wolski.email>
Date: Sat, 11 Mar 2023 10:42:17 +0100
Subject: [PATCH 0128/2704] fix(windows): fix invalid powershell separator
 during install

---
 lua/nvim-treesitter/shell_command_selectors.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 353b30f26..e90cb81c9 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -318,7 +318,11 @@ end
 ---@return string command
 function M.make_directory_change_for_command(dir, command)
   if fn.has "win32" == 1 then
-    return string.format("pushd %s & %s & popd", cmdpath(dir), command)
+    if vim.o.shell == "powershell" or vim.o.shell == "pwsh" then
+      return string.format("pushd %s ; %s ; popd", cmdpath(dir), command)
+    else
+      return string.format("pushd %s & %s & popd", cmdpath(dir), command)
+    end
   else
     return string.format("cd %s;\n %s", dir, command)
   end

From 273d5e9ac5cc84c72de856559b18e28050cca86f Mon Sep 17 00:00:00 2001
From: Adam Wolski <adam@wolski.email>
Date: Wed, 15 Mar 2023 09:18:52 +0100
Subject: [PATCH 0129/2704] fix(windows): treat any non-cmd shell as powershell
 like in selector

---
 lua/nvim-treesitter/shell_command_selectors.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index e90cb81c9..cf99a01d7 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -318,10 +318,10 @@ end
 ---@return string command
 function M.make_directory_change_for_command(dir, command)
   if fn.has "win32" == 1 then
-    if vim.o.shell == "powershell" or vim.o.shell == "pwsh" then
-      return string.format("pushd %s ; %s ; popd", cmdpath(dir), command)
-    else
+    if string.find(vim.o.shell, "cmd") ~= nil then
       return string.format("pushd %s & %s & popd", cmdpath(dir), command)
+    else
+      return string.format("pushd %s ; %s ; popd", cmdpath(dir), command)
     end
   else
     return string.format("cd %s;\n %s", dir, command)

From 01e8a5145160620140c3c57d285ccb2cfe067540 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Thu, 16 Mar 2023 19:04:17 +0900
Subject: [PATCH 0130/2704] feat(python): add "return" patterns to @indent_end

`return ...` is usually the last line of a
function/statement, so mark some possible patterns of `return` with
`@indent_end` to dedent the line after it
---
 queries/python/indents.scm           |  9 +++++++++
 tests/indent/python/return_dedent.py | 16 ++++++++++++++++
 tests/indent/python_spec.lua         |  4 ++++
 3 files changed, 29 insertions(+)
 create mode 100644 tests/indent/python/return_dedent.py

diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index c02879712..cc13587ec 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -72,6 +72,15 @@
 (list_pattern "]" @indent_end)
 
 
+(return_statement
+  [
+    (_) @indent_end 
+    (_ (_) @indent_end .)
+    (attribute 
+      attribute: (_) @indent_end)
+    "return" @indent_end
+  ] .)
+
 [
   ")"
   "]"
diff --git a/tests/indent/python/return_dedent.py b/tests/indent/python/return_dedent.py
new file mode 100644
index 000000000..44d6219de
--- /dev/null
+++ b/tests/indent/python/return_dedent.py
@@ -0,0 +1,16 @@
+def a():
+    return
+
+def a():
+    return True
+
+def a():
+    return (1, 2, 3)
+
+def a():
+    return x.y.z
+
+def a():
+    return (
+        1, 2, 3
+    )
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index 6b417a37f..c400de542 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -74,5 +74,9 @@ describe("indent Python:", function()
     run:new_line("line_after_indent.py", { on_line = 49, text = "x", indent = 0 })
     run:new_line("line_after_indent.py", { on_line = 55, text = "x", indent = 4 })
     run:new_line("line_after_indent.py", { on_line = 63, text = "x", indent = 4 })
+
+    for _, line in ipairs { 2, 5, 8, 11, 16 } do
+      run:new_line("return_dedent.py", { on_line = line, text = "x", indent = 0 })
+    end
   end)
 end)

From 17c275bfff86cfd4ac37a61a46bc8e4ade657e19 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 16 Mar 2023 07:00:30 -0400
Subject: [PATCH 0131/2704] feat: add LLVM TableGen

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/tablegen/folds.scm      |  13 +++
 queries/tablegen/highlights.scm | 156 ++++++++++++++++++++++++++++++++
 queries/tablegen/indents.scm    |  27 ++++++
 queries/tablegen/injections.scm |   7 ++
 queries/tablegen/locals.scm     |  51 +++++++++++
 8 files changed, 266 insertions(+)
 create mode 100644 queries/tablegen/folds.scm
 create mode 100644 queries/tablegen/highlights.scm
 create mode 100644 queries/tablegen/indents.scm
 create mode 100644 queries/tablegen/injections.scm
 create mode 100644 queries/tablegen/locals.scm

diff --git a/README.md b/README.md
index 38384433f..e345eba61 100644
--- a/README.md
+++ b/README.md
@@ -325,6 +325,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [t32](https://codeberg.org/xasc/tree-sitter-t32) (maintained by @xasc)
+- [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [thrift](https://github.com/duskmoon314/tree-sitter-thrift) (maintained by @amaanq, @duskmoon314)
diff --git a/lockfile.json b/lockfile.json
index 7d1774958..ccad247b0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -455,6 +455,9 @@
   "t32": {
     "revision": "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60"
   },
+  "tablegen": {
+    "revision": "e5e046e1b221e25111175469f02f3cf336010857"
+  },
   "teal": {
     "revision": "2158ecce11ea542f9b791baf2c7fb33798174ed2"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6a54c9032..89240ec8d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1350,6 +1350,14 @@ list.t32 = {
   maintainers = { "@xasc" },
 }
 
+list.tablegen = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-tablegen",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.teal = {
   install_info = {
     url = "https://github.com/euclidianAce/tree-sitter-teal",
diff --git a/queries/tablegen/folds.scm b/queries/tablegen/folds.scm
new file mode 100644
index 000000000..a1727b151
--- /dev/null
+++ b/queries/tablegen/folds.scm
@@ -0,0 +1,13 @@
+[
+  (assert)
+  (class)
+  (multiclass)
+  (def)
+  (defm)
+  (defset)
+  (defvar)
+  (foreach)
+  (if)
+  (let) 
+  (value_suffix)
+] @fold
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
new file mode 100644
index 000000000..b0b4b000c
--- /dev/null
+++ b/queries/tablegen/highlights.scm
@@ -0,0 +1,156 @@
+; Preprocs
+
+(preprocessor_directive) @preproc
+
+; Includes
+
+"include" @include
+
+; Keywords
+
+[
+  "assert"
+  "class"
+  "multiclass"
+  "field"
+  "let"
+  "def"
+  "defm"
+  "defset"
+  "defvar"
+] @keyword
+
+[
+  "in"
+] @keyword.operator
+
+; Conditionals
+
+[
+  "if"
+  "else"
+  "then"
+] @conditional
+
+; Repeats
+
+[
+  "foreach"
+] @repeat
+
+; Variables
+
+(identifier) @variable
+
+(var) @variable.builtin 
+
+; Parameters
+
+(template_arg (identifier) @parameter)
+
+
+; Types
+
+(type) @type
+
+[
+  "bit"
+  "int"
+  "string"
+  "dag"
+  "bits"
+  "list"
+  "code"
+] @type.builtin
+
+(class name: (identifier) @type)
+
+(multiclass name: (identifier) @type)
+
+(def name: (value (_) @type))
+
+(defm name: (value (_) @type))
+
+(defset name: (identifier) @type)
+
+(parent_class_list (identifier) @type (value (_) @type)?)
+
+(anonymous_record (identifier) @type)
+
+(anonymous_record (value (_) @type))
+
+((identifier) @type
+  (#lua-match? @type "^_*[A-Z][A-Z0-9_]+$"))
+
+; Fields
+
+(instruction
+  (identifier) @field)
+
+(let_instruction
+  (identifier) @field)
+
+; Functions
+
+([
+  (bang_operator)
+  (cond_operator)
+] @function
+  (#set! "priority" 105))
+
+; Operators
+
+[
+  "="
+  "#"
+  "-"
+  ":"
+  "..."
+] @operator
+
+; Literals
+
+(string) @string
+
+(code) @string.special
+
+(integer) @number
+
+(boolean) @boolean
+
+(uninitialized_value) @constant.builtin
+
+; Punctuation
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[ "<" ">" ] @punctuation.bracket
+
+[
+  "."
+  ","
+  ";"
+] @punctuation.delimiter
+
+[
+ "!"
+] @punctuation.special
+
+; Comments
+
+[
+  (comment)
+  (multiline_comment)
+] @comment @spell
+
+
+((comment) @preproc
+  (#lua-match? @preproc "^.*RUN"))
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/tablegen/indents.scm b/queries/tablegen/indents.scm
new file mode 100644
index 000000000..74287b02f
--- /dev/null
+++ b/queries/tablegen/indents.scm
@@ -0,0 +1,27 @@
+[
+  (assert)
+  (class)
+  (multiclass)
+  (def)
+  (defm)
+  (defvar)
+  (foreach)
+  (if)
+  (let) 
+  (value_suffix)
+] @indent
+
+[
+  "}"
+  "]"
+  ")"
+  ">"
+] @indent_end
+
+[ "{" "}" ] @branch
+
+[ "[" "]" ] @branch
+
+[ "(" ")" ] @branch
+
+[ "<" ">" ] @branch
diff --git a/queries/tablegen/injections.scm b/queries/tablegen/injections.scm
new file mode 100644
index 000000000..b137e472c
--- /dev/null
+++ b/queries/tablegen/injections.scm
@@ -0,0 +1,7 @@
+((code) @cpp
+  (#offset! @cpp 0 2 0 -2))
+
+((tablegen_file
+  (comment) @bash)
+  (#lua-match? @bash "^.*RUN")
+  (#offset! @bash 0 8))
diff --git a/queries/tablegen/locals.scm b/queries/tablegen/locals.scm
new file mode 100644
index 000000000..04602991c
--- /dev/null
+++ b/queries/tablegen/locals.scm
@@ -0,0 +1,51 @@
+; Scopes
+
+[
+  (class)
+  (multiclass)
+  (def)
+  (defm)
+  (defset)
+  (defvar)
+  (foreach)
+  (if)
+  (let)
+] @scope
+
+; References
+
+[
+  (var)
+  (identifier)
+] @reference
+
+; Definitions
+
+(instruction
+  (identifier) @definition.field)
+
+(let_instruction
+  (identifier) @definition.field)
+
+(include_directive
+  (string) @definition.import)
+
+(template_arg (identifier) @definition.parameter)
+
+(class
+  name: (identifier) @definition.type)
+
+(multiclass
+  name: (identifier) @definition.type)
+
+(def
+  name: (value (_) @definition.type))
+
+(defm
+  name: (value (_) @definition.type))
+
+(defset
+  name: (identifier) @definition.type)
+
+(def_var
+  name: (identifier) @definition.var)

From f3fbc7c9a75cbf09cd06cf0518ac244732a27288 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 16 Mar 2023 11:31:20 -0400
Subject: [PATCH 0132/2704] fix: check if repo location exists for local paths

---
 lua/nvim-treesitter/install.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 37f32fe53..3ea23ee86 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -330,6 +330,9 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
   local compile_location
   if from_local_path then
     compile_location = repo.url
+    if repo.location then
+      compile_location = utils.join_path(compile_location, repo.location)
+    end
   else
     local repo_location = project_name
     if repo.location then

From dcb9a89ab4f0091bf87aed4e6801423d3667f76a Mon Sep 17 00:00:00 2001
From: derekstride <derek.stride@shopify.com>
Date: Thu, 16 Mar 2023 15:32:33 -0400
Subject: [PATCH 0133/2704] Use pre-generated parser files for sql grammar

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ccad247b0..7bf3823d3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -429,7 +429,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "d6963a2426972a6ffa08ff92a5dba7922d68c1f5"
+    "revision": "4cb5b36d70687bfe4687c68483b4dacde309ae6f"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 89240ec8d..75fe513d4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1277,7 +1277,7 @@ list.sql = {
   install_info = {
     url = "https://github.com/derekstride/tree-sitter-sql",
     files = { "src/parser.c" },
-    requires_generate_from_grammar = true,
+    branch = "gh-pages",
   },
   maintainers = { "@derekstride" },
 }

From f1a0b815bad46c1dff603fac67c10479440ebbe0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 19 Mar 2023 06:38:14 +0000
Subject: [PATCH 0134/2704] Update parsers: qmljs, swift

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7bf3823d3..40a329b5e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -369,7 +369,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "ab75be9750e6f2f804638824d1790034286a830c"
+    "revision": "35ead5b9955cdb29bcf709d622fa960ff33992b6"
   },
   "query": {
     "revision": "e97504446f14f529d5a8e649667d3d60391e4dfd"
@@ -447,7 +447,7 @@
     "revision": "52e122ae68b316d3aa960a0a422d3645ba717f42"
   },
   "swift": {
-    "revision": "449d5974981d402181ca721e0573346f8c17f726"
+    "revision": "4cf4bb67c27f5c5a75f634fe941c588660e69ab3"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 6a269f197e9b14145c33db509bc12effe77138f7 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 19 Mar 2023 06:05:23 -0400
Subject: [PATCH 0135/2704] fix(cpp): nullptr should be `@constant.builtin`

---
 queries/cpp/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 0f12dd8df..c40ab26f1 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -114,7 +114,7 @@
 ; Constants
 
 (this) @variable.builtin
-(nullptr) @constant
+(nullptr) @constant.builtin
 
 (true) @boolean
 (false) @boolean

From 1ba94e9f01c18d2826e991874082fbfb422b3226 Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Fri, 17 Mar 2023 09:51:16 +0200
Subject: [PATCH 0136/2704] fix(ecma): template literal injections

see https://github.com/nvim-treesitter/nvim-treesitter/commit/e3ebc8ec5d586162f3c408417621daa59ba8ea62#commitcomment-104824257 for explanation

This also assigns the HTML parser for SVG tagged literals, since svg uses the HTML parser
---
 queries/ecma/injections.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 15da0431e..7ea48dec4 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -11,6 +11,19 @@
      (#offset! @content 0 1 0 -1))
 )
 
+; html`...`, sql`...` etc
+(call_expression 
+ function: ((identifier) @language)
+ arguments: ((template_string) @content
+     (#offset! @content 0 1 0 -1))
+)
+
+; svg`...`, which uses the html parser
+(call_expression
+ function: ((identifier) @_name (#eq? @_name "svg"))
+ arguments: ((template_string) @html
+     (#offset! @html 0 1 0 -1)))
+
 (call_expression
  function: ((identifier) @_name
    (#eq? @_name "gql"))

From f15db0b652e44c6233d05099eaa7ad4eeea095fc Mon Sep 17 00:00:00 2001
From: Benny Powers <web@bennypowers.com>
Date: Sat, 18 Mar 2023 21:59:44 +0200
Subject: [PATCH 0137/2704] style: alternation in template literal query

---
 queries/ecma/injections.scm | 39 +++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 7ea48dec4..ef3b9ba72 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -3,26 +3,27 @@
 
 (comment) @comment
 
-; html(`...`), sql(...) etc
-(call_expression 
- function: ((identifier) @language)
- arguments: (arguments
-   (template_string) @content
-     (#offset! @content 0 1 0 -1))
-)
-
-; html`...`, sql`...` etc
-(call_expression 
- function: ((identifier) @language)
- arguments: ((template_string) @content
-     (#offset! @content 0 1 0 -1))
-)
-
-; svg`...`, which uses the html parser
+; html(`...`), html`...`, sql(...) etc
 (call_expression
- function: ((identifier) @_name (#eq? @_name "svg"))
- arguments: ((template_string) @html
-     (#offset! @html 0 1 0 -1)))
+ function: ((identifier) @language)
+ arguments: [
+             (arguments
+              (template_string) @content)
+             (template_string) @content
+            ]
+     (#offset! @content 0 1 0 -1)
+     (#not-eq? @content "svg"))
+
+; svg`...` or svg(`...`), which uses the html parser, so is not included in the previous query
+(call_expression
+ function: ((identifier) @svg)
+ arguments: [
+             (arguments
+              (template_string) @content)
+             (template_string) @content
+            ]
+     (#offset! @content 0 1 0 -1)
+     (#eq? @content "svg"))
 
 (call_expression
  function: ((identifier) @_name

From 38f878a1cd98958f0766fcc410e01ab16d8b8fca Mon Sep 17 00:00:00 2001
From: Benny Powers <web@bennypowers.com>
Date: Sat, 18 Mar 2023 22:12:27 +0200
Subject: [PATCH 0138/2704] fix: svg injection in ecma tagged literals

---
 queries/ecma/injections.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index ef3b9ba72..bc5af1305 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -16,14 +16,14 @@
 
 ; svg`...` or svg(`...`), which uses the html parser, so is not included in the previous query
 (call_expression
- function: ((identifier) @svg)
+ function: ((identifier) @_name (#eq? @_name "svg"))
  arguments: [
              (arguments
-              (template_string) @content)
-             (template_string) @content
+              (template_string) @html)
+             (template_string) @html
             ]
-     (#offset! @content 0 1 0 -1)
-     (#eq? @content "svg"))
+     (#offset! @html 0 1 0 -1))
+
 
 (call_expression
  function: ((identifier) @_name

From 4536156f32b8ab0aab264e3cd7819fc8e3daede4 Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Sun, 19 Mar 2023 14:32:42 +0200
Subject: [PATCH 0139/2704] injections(html): input regex patterns (#4521)

* injections(html): input regex patterns

replaces regex part of #2577
---
 queries/html_tags/injections.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 5f0719c64..23b500590 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -4,7 +4,7 @@
 ; without having this element being captured twice
 (
   (style_element
-    (start_tag) @_no_type_lang 
+    (start_tag) @_no_type_lang
       (#not-match? @_no_type_lang "\\s(lang|type)\\s*\\=")
     (raw_text) @css))
 
@@ -23,7 +23,7 @@
 ; <script defer>...</script>
 (
   (script_element
-    (start_tag) @_no_type_lang 
+    (start_tag) @_no_type_lang
       (#not-match? @_no_type_lang "\\s(lang|type)\\s*\\=")
     (raw_text) @javascript))
 
@@ -54,3 +54,13 @@
   (#offset! @javascript 0 2 0 -2))
 
 (comment) @comment
+
+; <input pattern="[0-9]"> or <input pattern=[0-9]>
+(element (_
+  (tag_name) @_tagname (#eq? @_tagname "input")
+  ((attribute
+    (attribute_name) @_attr [
+      (quoted_attribute_value (attribute_value) @regex)
+      (attribute_value) @regex
+    ] (#eq? @_attr "pattern")))
+))

From 2170a36416d956cc673128bdaccb76139cf9711b Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 19 Mar 2023 21:04:38 -0400
Subject: [PATCH 0140/2704] fix(lua): properly highlight labels

---
 queries/lua/highlights.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index fadcb2ac0..38f926a0d 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -8,8 +8,6 @@
  "local"
 ] @keyword
 
-(label_statement) @label
-
 (break_statement) @keyword
 
 (do_statement
@@ -109,6 +107,7 @@
 [
   ";"
   ":"
+  "::"
   ","
   "."
 ] @punctuation.delimiter
@@ -136,6 +135,12 @@
      (["<" ">"] @punctuation.bracket
       (identifier) @attribute)))
 
+;; Labels
+
+(label_statement (identifier) @label)
+
+(goto_statement (identifier) @label)
+
 ;; Constants
 
 ((identifier) @constant

From 581fc14cea6e85c710ece75f89f17dffd816fbc4 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 16 Mar 2023 03:41:31 -0400
Subject: [PATCH 0141/2704] queries(lua): add more keywords related to
 variable/function builtins, debug, and coroutines

---
 queries/lua/highlights.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 38f926a0d..5fbf8a183 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -128,7 +128,10 @@
 (identifier) @variable
 
 ((identifier) @variable.builtin
- (#any-of? @variable.builtin "self" "string" "table" "vim"))
+ (#any-of? @variable.builtin "_G" "_VERSION" "debug" "io" "jit" "math" "os" "package" "self" "string" "table" "utf8"))
+
+((identifier) @keyword.coroutine
+  (#eq? @keyword.coroutine "coroutine"))
 
 (variable_list
    attribute: (attribute
@@ -185,8 +188,11 @@
     ;; built-in functions in Lua 5.1
     "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
     "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
-    "rawequal" "rawget" "rawset" "require" "select" "setfenv" "setmetatable"
-    "tonumber" "tostring" "type" "unpack" "xpcall"))
+    "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
+    "tonumber" "tostring" "type" "unpack" "xpcall"
+    "__add" "__band" "__bnot" "__bor" "__bxor" "__call" "__concat" "__div" "__eq" "__gc"
+    "__idiv" "__index" "__le" "__len" "__lt" "__metatable" "__mod" "__mul" "__name" "__newindex"
+    "__pairs" "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
 
 ;; Others
 

From bc23db25153efd480392ee479784d5bbac4b1913 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 19 Mar 2023 08:09:12 -0400
Subject: [PATCH 0142/2704] feat: add Luadoc

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/lua/injections.scm      |   4 +
 queries/luadoc/highlights.scm   | 133 ++++++++++++++++++++++++++++++++
 5 files changed, 149 insertions(+)
 create mode 100644 queries/luadoc/highlights.scm

diff --git a/README.md b/README.md
index e345eba61..a1c40bd66 100644
--- a/README.md
+++ b/README.md
@@ -263,6 +263,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
+- [x] [luadoc](https://github.com/amaanq/tree-sitter-luadoc) (maintained by @amaanq)
 - [x] [lua patterns](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)
 - [x] [m68k](https://github.com/grahambates/tree-sitter-m68k) (maintained by @grahambates)
 - [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
diff --git a/lockfile.json b/lockfile.json
index 40a329b5e..3db414d7f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -269,6 +269,9 @@
   "lua": {
     "revision": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"
   },
+  "luadoc": {
+    "revision": "40a67ee798eb3c989fffde0277ff6de740ebaf34"
+  },
   "luap": {
     "revision": "bfb38d254f380362e26b5c559a4086ba6e92ba77"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 75fe513d4..2cb31e7bd 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -825,6 +825,14 @@ list.lua = {
   maintainers = { "@muniftanjim" },
 }
 
+list.luadoc = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-luadoc",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.luap = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-luap",
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 14714573a..51957461e 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -19,6 +19,10 @@
 ;; highlight string as query if starts with `;; query`
 ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))
 
+((comment) @luadoc
+  (#lua-match? @luadoc "[-][-][-][%s]*@")
+  (#offset! @luadoc 0 3 0 0))
+
 ; string.match("123", "%d+")
 (function_call
   (dot_index_expression
diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
new file mode 100644
index 000000000..c0132c966
--- /dev/null
+++ b/queries/luadoc/highlights.scm
@@ -0,0 +1,133 @@
+; Keywords
+
+[
+  "@class"
+  "@type"
+  "@param"
+  "@alias"
+  "@field"
+  "@generic"
+  "@vararg"
+  "@diagnostic"
+  "@deprecated"
+  "@cast"
+  "@overload"
+  "@enum"
+  "@language"
+  "@see"
+  "extends"
+  (diagnostic_identifier)
+] @keyword
+
+[
+  "@async"
+] @keyword.coroutine
+
+(language_injection "@language" (identifier) @parameter)
+
+(function_type ["fun" "function"] @keyword.function)
+
+[
+  "@return"
+] @keyword.return
+
+; Qualifiers
+
+[
+  "public"
+  "protected"
+  "private"
+  "@public"
+  "@protected"
+  "@private"
+] @type.qualifier
+
+
+; Variables
+
+(identifier) @variable
+
+[
+  "..."
+  "self"
+] @variable.builtin
+
+; Macros
+
+(alias_annotation (identifier) @function.macro)
+
+; Parameters
+
+(param_annotation (identifier) @parameter)
+
+(parameter (identifier) @parameter)
+
+; Fields
+
+(field_annotation (identifier) @field)
+
+(table_literal_type field: (identifier) @field)
+
+(member_type ["#" "."] . (identifier) @field)
+
+; Types
+
+(table_type "table" @type.builtin)
+
+(builtin_type) @type.builtin
+
+(class_annotation (identifier) @type)
+
+(enum_annotation (identifier) @type)
+
+((array_type ["[" "]"] @type)
+  (#set! "priority" 105))
+
+(type) @type
+
+; Operators
+
+[
+  "|"
+] @operator
+
+; Literals
+
+(literal_type) @string
+
+(number) @number
+
+; Punctuation
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[ "<" ">" ] @punctuation.bracket
+
+[
+  ","
+  "."
+  "#"
+  ":"
+] @punctuation.delimiter
+
+[
+  "@"
+  "?"
+] @punctuation.special
+
+; Comments
+
+(comment) @comment @spell
+
+(at_comment 
+  (identifier) @type 
+  (_) @comment @spell)
+
+(class_at_comment 
+  (identifier) @type 
+  ("extends"? (identifier)? @type)
+  (_) @comment @spell)

From 25b656a4b771ee7d440e506280b9ae546d6f7233 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 20 Mar 2023 10:40:10 +0200
Subject: [PATCH 0143/2704] comment(highlights): reduce user mention priority

---
 queries/comment/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 15adf45ab..3d8bce56a 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -42,4 +42,5 @@
 
 ; User mention (@user)
 ("text" @constant @nospell
- (#lua-match? @constant "^[@][a-zA-Z0-9_-]+$"))
+ (#lua-match? @constant "^[@][a-zA-Z0-9_-]+$")
+ (#set! "priority" 95))

From 379305aa7f55e810950cde24a82789681478df04 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 20 Mar 2023 18:10:40 +0200
Subject: [PATCH 0144/2704] fix(parsers): alias sh to bash

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2cb31e7bd..b523c2274 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -29,6 +29,7 @@ for ft, lang in pairs {
   javascriptreact = "javascript",
   ecma = "javascript",
   jsx = "javascript",
+  sh = "bash",
   PKGBUILD = "bash",
   html_tags = "html",
   ["typescript.tsx"] = "tsx",

From 2e85a7f4f312617bf42158bf8c8693154959047d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 21 Mar 2023 05:54:27 +0000
Subject: [PATCH 0145/2704] Update parsers: glimmer, sql

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3db414d7f..3de33e054 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -159,7 +159,7 @@
     "revision": "ae79782c00656945db69641378e688cdb78d52c1"
   },
   "glimmer": {
-    "revision": "40cfb72a53654cbd666451ca04ffd500257c7b73"
+    "revision": "e0460316c0b1e07b21bbc7a5d5edca14afea88f4"
   },
   "glsl": {
     "revision": "e2c2214045de2628b81089b1a739962f59654558"
@@ -432,7 +432,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "4cb5b36d70687bfe4687c68483b4dacde309ae6f"
+    "revision": "b3c771f890dd2d94994d2647aeb744c93d762f0d"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From a1df50a79f0e422b3c99680071f32994893f3a3d Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Tue, 21 Mar 2023 13:50:54 +0800
Subject: [PATCH 0146/2704] docs: fix typo

---
 doc/nvim-treesitter.txt         | 8 ++++----
 queries/cue/highlights.scm      | 2 +-
 queries/solidity/highlights.scm | 4 ++--
 queries/squirrel/highlights.scm | 2 +-
 queries/thrift/highlights.scm   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 884f334eb..f05693676 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -325,9 +325,9 @@ These highlight groups are used by default:
 :TSEditQuery {query-group} [{lang}]~
 
 Edit the query file for a {query-group} (e.g. highlights, locals) for given
-{lang}.  If there are multiple the user is prompted to select one of them.
+{lang}. If there are multiple files, the user is prompted to select one of them.
 If no such file exists, a buffer for a new file in the user's config directory
-is created.  If {lang} is not specified, the language of the current buffer
+is created. If {lang} is not specified, the language of the current buffer
 is used.
 
 						       *:TSEditQueryUserAfter*
@@ -454,7 +454,7 @@ Default options (lua syntax):
   the beginning.
 - `type_patterns` - Which node type patterns to match.
 - `transform_fn` - Function used to transform the single item in line. By
-  default removes opening brackets and spaces from end. Takes two arguments:
+  default it removes opening brackets and spaces from end. Takes two arguments:
   the text of the line in question, and the corresponding treesitter node.
 - `separator` - Separator between nodes.
 - `allow_duplicates` - Whether or not to remove duplicate components.
@@ -471,7 +471,7 @@ To use it: >
 This will respect your 'foldminlines' and 'foldnestmax' settings.
 
 Note: This is highly experimental, and folding can break on some types of
-      edits. If you encounter such breakage, hiting `zx` should fix folding.
+      edits. If you encounter such breakage, hitting `zx` should fix folding.
       In any case, feel free to open an issue with the reproducing steps.
 
 ==============================================================================
diff --git a/queries/cue/highlights.scm b/queries/cue/highlights.scm
index c1f27fb8f..50137c7b3 100644
--- a/queries/cue/highlights.scm
+++ b/queries/cue/highlights.scm
@@ -155,7 +155,7 @@
 
 (interpolation "\\(" (identifier) @variable ")")
 
-; Commments
+; Comments
 
 (comment) @comment @spell
 
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 76a623267..eda45836a 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -72,7 +72,7 @@
 (call_expression . (identifier) @function.call)
 
 ; Function parameters
-(event_paramater name: (identifier) @parameter)
+(event_parameter name: (identifier) @parameter)
 (parameter name: (identifier) @parameter)
 
 ; Yul functions
@@ -113,7 +113,7 @@
 ; FIXME: update grammar
 ; (block_statement "unchecked" @keyword)
 
-(event_paramater "indexed" @keyword)
+(event_parameter "indexed" @keyword)
 
 [
   "public"
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index b35c7cbf1..b0b9caf56 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -197,7 +197,7 @@
    ; Thread Methods
    "call" "wakeup" "wakeupthrow" "getstackinfos"
 
-   ; Weak Referece Methods
+   ; Weak Reference Methods
    "ref" "weakref"
 ))
 
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 2b4778722..2c963f5bc 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -143,7 +143,7 @@
   "xsd_optional"
 ] @keyword
 
-; Extended Kewords
+; Extended Keywords
 [
   "package"
   "performs"

From 181a580190d4684d5f6e34c500c0aa99258a04d1 Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Tue, 21 Mar 2023 14:19:12 +0800
Subject: [PATCH 0147/2704] fix: revert for solidity

---
 queries/solidity/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index eda45836a..76a623267 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -72,7 +72,7 @@
 (call_expression . (identifier) @function.call)
 
 ; Function parameters
-(event_parameter name: (identifier) @parameter)
+(event_paramater name: (identifier) @parameter)
 (parameter name: (identifier) @parameter)
 
 ; Yul functions
@@ -113,7 +113,7 @@
 ; FIXME: update grammar
 ; (block_statement "unchecked" @keyword)
 
-(event_parameter "indexed" @keyword)
+(event_paramater "indexed" @keyword)
 
 [
   "public"

From 8ae2c8ff495fdf0f0f07edcd7afe271f15a70562 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Tue, 21 Mar 2023 12:01:42 +0100
Subject: [PATCH 0148/2704] highlights(proto): make "include"/"package"
 `@include`

---
 queries/proto/highlights.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index a6f47da93..a24314834 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -1,8 +1,6 @@
 [
   "syntax"
-  "package"
   "option"
-  "import"
   "service"
   "rpc"
   "returns"
@@ -15,6 +13,11 @@
   "to"
 ] @keyword
 
+[
+  "package"
+  "import"
+] @include
+
 [
   (key_type)
   (type)

From d228b51cd7dab16124e79a7ff456edcdfdb295b2 Mon Sep 17 00:00:00 2001
From: Benny Powers <web@bennypowers.com>
Date: Tue, 21 Mar 2023 09:34:49 +0200
Subject: [PATCH 0149/2704] test: html injections

---
 .../injections/html/test-html-injections.html | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/tests/query/injections/html/test-html-injections.html b/tests/query/injections/html/test-html-injections.html
index 348d901ca..16be762d9 100644
--- a/tests/query/injections/html/test-html-injections.html
+++ b/tests/query/injections/html/test-html-injections.html
@@ -14,18 +14,51 @@
   </head>
   <body>
     <script> const x = 1 </script>
-    <!--        ^ javascript -->
+           <!-- ^ javascript -->
     <script defer> const x = 1 </script>
-    <!--              ^ javascript -->
+                  <!-- ^ javascript -->
+    <script async defer> const x = 1 </script>
+                     <!-- ^ javascript -->
     <script type="text/javascript"> const x = 1 </script>
-    <!--                              ^ javascript -->
+                                  <!-- ^ javascript -->
+    <script type="text/ecmascript"> const x = 1 </script>
+                                  <!-- ^ javascript -->
+    <script type="application/ecmascript"> const x = 1 </script>
+                                       <!-- ^ javascript -->
+    <script type="application/javascript"> const x = 1 </script>
+                                       <!-- ^ javascript -->
     <script type="module"> import { foo } from "bar" </script>
-    <!--                              ^ javascript -->
+                                 <!-- ^ javascript -->
     <script defer type="text/javascript"> const x = 1 </script>
                                         <!-- ^ javascript -->
+    <script type="text/markdown">## Hello *World*!</script>
+                              <!-- ^ markdown -->
+    <script type="application/graphql">query OK { dokey }</script>
+                                      <!-- ^ graphql -->
+    <script type="application/typescript">type A = number;</script>
+                                      <!-- ^ typescript -->
+    <script type="application/json">{ "true": false }</script>
+                                      <!-- ^ json -->
+    <script type="importmap">{ "true": false }</script>
+                                  <!-- ^ json -->
+    <script type="module">html`<p></p>`</script>
+                             <!-- ^ html -->
+    <script type="module">html(`<p></p>`)</script>
+                             <!-- ^ html -->
+    <script type="module">svg`<p></p>`</script>
+                             <!-- ^ html -->
+    <script type="module">svg(`<p></p>`)</script>
+                             <!-- ^ html -->
+
     <div style="height: 100%">
-<!--                ^ css      -->
+               <!-- ^ css -->
       Test div to test css injections for style attributes
     </div>
+
+    <input pattern="[0-9]+">
+                  <!-- ^ regex -->
+    <input pattern=[0-9]+ type="tel">
+                <!-- ^ regex -->
+
   </body>
 </html>

From 972da989bcc33d86a09dc82b22de552557cff768 Mon Sep 17 00:00:00 2001
From: Benny Powers <web@bennypowers.com>
Date: Tue, 21 Mar 2023 10:05:52 +0200
Subject: [PATCH 0150/2704] test: ecma injections

---
 tests/query/injections/ecma/ecma-test-injections.js   | 9 +++++++++
 tests/query/injections/html/test-html-injections.html | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 tests/query/injections/ecma/ecma-test-injections.js

diff --git a/tests/query/injections/ecma/ecma-test-injections.js b/tests/query/injections/ecma/ecma-test-injections.js
new file mode 100644
index 000000000..68d53721a
--- /dev/null
+++ b/tests/query/injections/ecma/ecma-test-injections.js
@@ -0,0 +1,9 @@
+html`<p></p>`;
+   // ^ html
+html(`<p></p>`);
+   // ^ html
+svg`<p></p>`;
+   // ^ html
+svg(`<p></p>`);
+   // ^ html
+
diff --git a/tests/query/injections/html/test-html-injections.html b/tests/query/injections/html/test-html-injections.html
index 16be762d9..954ce5623 100644
--- a/tests/query/injections/html/test-html-injections.html
+++ b/tests/query/injections/html/test-html-injections.html
@@ -41,15 +41,6 @@
                                       <!-- ^ json -->
     <script type="importmap">{ "true": false }</script>
                                   <!-- ^ json -->
-    <script type="module">html`<p></p>`</script>
-                             <!-- ^ html -->
-    <script type="module">html(`<p></p>`)</script>
-                             <!-- ^ html -->
-    <script type="module">svg`<p></p>`</script>
-                             <!-- ^ html -->
-    <script type="module">svg(`<p></p>`)</script>
-                             <!-- ^ html -->
-
     <div style="height: 100%">
                <!-- ^ css -->
       Test div to test css injections for style attributes

From 19d9af8fb0e8465a93d63c6aee23371dad9ce399 Mon Sep 17 00:00:00 2001
From: Benny Powers <web@bennypowers.com>
Date: Fri, 17 Mar 2023 11:31:11 +0200
Subject: [PATCH 0151/2704] feat(html): injections in <script type>

refactor(html): remove superfluous injection query

fix(html): associate "module" type with "javascript"
---
 lua/nvim-treesitter/query_predicates.lua | 23 +++++++++++++++++++++++
 queries/html_tags/injections.scm         | 20 ++++++++++----------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 2509a677c..8c0a4c947 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -119,6 +119,29 @@ query.add_predicate("has-type?", function(match, _pattern, _bufnr, pred)
   return vim.tbl_contains(types, node:type())
 end)
 
+local html_script_type_languages = {
+  ["importmap"] = "json",
+  ["module"] = "javascript",
+  ["application/ecmascript"] = "javascript",
+  ["text/ecmascript"] = "javascript",
+}
+
+---@param match string
+---@param metadata table
+---@return boolean|nil
+query.add_directive("set-lang-from-mimetype!", function(match, pattern, bufnr, predicate, metadata)
+  local capture_id = predicate[2]
+  local node = match[capture_id]
+  local type_attr_value = vim.treesitter.get_node_text(node, bufnr)
+  local configured = html_script_type_languages[type_attr_value]
+  if configured then
+    metadata.language = configured
+  else
+    local parts = vim.split(type_attr_value, "/", {})
+    metadata.language = parts[#parts]
+  end
+end)
+
 -- Just avoid some annoying warnings for this directive
 query.add_directive("make-range!", function() end)
 
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 23b500590..dd971b7d9 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -27,23 +27,23 @@
       (#not-match? @_no_type_lang "\\s(lang|type)\\s*\\=")
     (raw_text) @javascript))
 
-(
-  (script_element
-    (start_tag
-      (attribute
-        (attribute_name) @_type
-        (quoted_attribute_value (attribute_value) @_javascript)))
-    (raw_text) @javascript)
-  (#eq? @_type "type")
-  (#any-of? @_javascript "text/javascript" "module")
-)
+; <script type="mimetype-or-well-known-script-type">
+(script_element
+   (start_tag
+      ((attribute
+           (attribute_name) @_attr (#eq? @_attr "type")
+           (quoted_attribute_value (attribute_value) @_type))))
+   (raw_text) @content (#set-lang-from-mimetype! @_type))
 
+; <a style="/* css */">
 ((attribute
    (attribute_name) @_attr
    (quoted_attribute_value (attribute_value) @css))
  (#eq? @_attr "style"))
 
 ; lit-html style template interpolation
+; <a @click=${e => console.log(e)}>
+; <a @click="${e => console.log(e)}">
 ((attribute
   (quoted_attribute_value (attribute_value) @javascript))
   (#match? @javascript "\\$\\{")

From 9b4e8c1b97da5c09b024059939c9ab201af95f67 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 22 Mar 2023 06:37:24 +0000
Subject: [PATCH 0152/2704] Update parsers: glimmer

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 3de33e054..99eac6e6b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -159,7 +159,7 @@
     "revision": "ae79782c00656945db69641378e688cdb78d52c1"
   },
   "glimmer": {
-    "revision": "e0460316c0b1e07b21bbc7a5d5edca14afea88f4"
+    "revision": "bc1c685aa6a7caf9e58c5746ab386a1e673eb9af"
   },
   "glsl": {
     "revision": "e2c2214045de2628b81089b1a739962f59654558"

From 9253ce66f9f0a7b5d8e0b0373d228688b3c4d5cd Mon Sep 17 00:00:00 2001
From: Anthony Shi <69449791+anthony-S93@users.noreply.github.com>
Date: Wed, 22 Mar 2023 15:07:50 +0800
Subject: [PATCH 0153/2704] fix(python): add object as `@type.builtin`

---
 queries/python/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index d25448000..86cb46b5a 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -47,7 +47,7 @@
               "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
               ;; https://docs.python.org/3/library/stdtypes.html
               "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
+              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 
 ((assignment
   left: (identifier) @type.definition

From 40670af9806e2bc5be820a18a50b4ffcd14f40fb Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 22 Mar 2023 05:24:56 -0400
Subject: [PATCH 0154/2704] feat: add Bass

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +++
 queries/bass/folds.scm          |   5 ++
 queries/bass/highlights.scm     | 109 ++++++++++++++++++++++++++++++++
 queries/bass/indents.scm        |  22 +++++++
 queries/bass/injections.scm     |   1 +
 queries/bass/locals.scm         |  25 ++++++++
 8 files changed, 174 insertions(+)
 create mode 100644 queries/bass/folds.scm
 create mode 100644 queries/bass/highlights.scm
 create mode 100644 queries/bass/indents.scm
 create mode 100644 queries/bass/injections.scm
 create mode 100644 queries/bass/locals.scm

diff --git a/README.md b/README.md
index a1c40bd66..ac73bd66f 100644
--- a/README.md
+++ b/README.md
@@ -179,6 +179,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)
 - [ ] [awk](https://github.com/Beaglefoot/tree-sitter-awk)
 - [x] [bash](https://github.com/tree-sitter/tree-sitter-bash) (maintained by @TravonteD)
+- [x] [bass](https://github.com/amaanq/tree-sitter-bass) (maintained by @amaanq)
 - [x] [beancount](https://github.com/polarmutex/tree-sitter-beancount) (maintained by @polarmutex)
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 99eac6e6b..558a22221 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -17,6 +17,9 @@
   "bash": {
     "revision": "b338fa9f4807b9e0336cd4dde04948a8c324a4cf"
   },
+  "bass": {
+    "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
+  },
   "beancount": {
     "revision": "f3741a3a68ade59ec894ed84a64673494d2ba8f3"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b523c2274..1d03bd63b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -120,6 +120,14 @@ list.bash = {
   maintainers = { "@TravonteD" },
 }
 
+list.bass = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-bass",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.beancount = {
   install_info = {
     url = "https://github.com/polarmutex/tree-sitter-beancount",
diff --git a/queries/bass/folds.scm b/queries/bass/folds.scm
new file mode 100644
index 000000000..d99e0c1ac
--- /dev/null
+++ b/queries/bass/folds.scm
@@ -0,0 +1,5 @@
+[
+  (list)
+  (scope)
+  (cons)
+] @fold
diff --git a/queries/bass/highlights.scm b/queries/bass/highlights.scm
new file mode 100644
index 000000000..296443d52
--- /dev/null
+++ b/queries/bass/highlights.scm
@@ -0,0 +1,109 @@
+;; Variables
+
+(list (symbol) @variable)
+
+(cons (symbol) @variable)
+
+(scope (symbol) @variable)
+
+(symbind (symbol) @variable)
+
+;; Constants
+
+((symbol) @constant
+  (#lua-match? @constant "^_*[A-Z][A-Z0-9_]*$"))
+
+;; Functions
+
+(list 
+  . (symbol) @function)
+
+;; Namespaces
+
+(symbind
+  (symbol) @namespace
+  . (keyword))
+
+;; Includes
+
+((symbol) @include
+  (#any-of? @include "use" "import" "load"))
+
+;; Keywords
+
+((symbol) @keyword
+  (#any-of? @keyword "do" "doc"))
+
+;; Special Functions
+
+; Keywords construct a symbol
+
+(keyword) @constructor
+
+((list
+  . (symbol) @keyword.function
+  . (symbol) @function
+  (symbol)? @parameter)
+  (#any-of? @keyword.function "def" "defop" "defn" "fn"))
+
+((cons
+  . (symbol) @keyword.function
+  . (symbol) @function
+  (symbol)? @parameter)
+  (#any-of? @keyword.function "def" "defop" "defn" "fn"))
+
+((symbol) @function.builtin
+  (#any-of? @function.builtin "dump" "mkfs" "json" "log" "error" "now" "cons" "wrap" "unwrap" "eval" "make-scope" "bind" "meta" "with-meta" "null?" "ignore?" "boolean?" "number?" "string?" "symbol?" "scope?" "sink?" "source?" "list?" "pair?" "applicative?" "operative?" "combiner?" "path?" "empty?" "thunk?" "+" "*" "quot" "-" "max" "min" "=" ">" ">=" "<" "<=" "list->source" "across" "emit" "next" "reduce-kv" "assoc" "symbol->string" "string->symbol" "str" "substring" "trim" "scope->list" "string->fs-path" "string->cmd-path" "string->dir" "subpath" "path-name" "path-stem" "with-image" "with-dir" "with-args" "with-cmd" "with-stdin" "with-env" "with-insecure" "with-label" "with-port" "with-tls" "with-mount" "thunk-cmd" "thunk-args" "resolve" "start" "addr" "wait" "read" "cache-dir" "binds?" "recall-memo" "store-memo" "mask" "list" "list*" "first" "rest" "length" "second" "third" "map" "map-pairs" "foldr" "foldl" "append" "filter" "conj" "list->scope" "merge" "apply" "id" "always" "vals" "keys" "memo" "succeeds?" "run" "last" "take" "take-all" "insecure!" "from" "cd" "wrap-cmd" "mkfile" "path-base" "not"))
+
+((symbol) @function.macro
+  (#any-of? @function.macro "op" "current-scope" "quote" "let" "provide" "module" "or" "and" "curryfn" "for" "$" "linux"))
+
+;; Conditionals
+
+((symbol) @conditional
+  (#any-of? @conditional "if" "case" "cond" "when"))
+
+;; Repeats
+
+((symbol) @repeat
+  (#any-of? @repeat "each"))
+
+;; Operators
+
+((symbol) @operator (#any-of? @operator "&" "*" "+" "-" "<" "<=" "=" ">" ">="))
+
+;; Punctuation
+
+[ "(" ")" ] @punctuation.bracket
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+((symbol) @punctuation.delimiter
+  (#eq? @punctuation.delimiter "->"))
+
+;; Literals
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+(path) @text.uri @string.special
+
+(number) @number
+
+(boolean) @boolean
+
+[
+  (ignore)
+  (null)
+] @constant.builtin
+
+[
+  "^"
+] @character.special
+
+;; Comments
+
+(comment) @comment @spell
diff --git a/queries/bass/indents.scm b/queries/bass/indents.scm
new file mode 100644
index 000000000..f1f4e0ecf
--- /dev/null
+++ b/queries/bass/indents.scm
@@ -0,0 +1,22 @@
+[
+  (list)
+  (scope)
+  (cons)
+] @indent
+
+[
+  ")"
+  "}"
+  "]"
+] @indent_end
+
+[ "(" ")" ] @branch
+
+[ "{" "}" ] @branch
+
+[ "[" "]" ] @branch
+
+[
+  (ERROR)
+  (comment)
+] @auto
diff --git a/queries/bass/injections.scm b/queries/bass/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/bass/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/bass/locals.scm b/queries/bass/locals.scm
new file mode 100644
index 000000000..5a94e7532
--- /dev/null
+++ b/queries/bass/locals.scm
@@ -0,0 +1,25 @@
+; Scopes
+
+[
+  (list)
+  (scope)
+  (cons)
+] @scope
+
+; References
+
+(symbol) @reference
+
+; Definitions
+
+((list
+  . (symbol) @_fnkw
+  . (symbol) @definition.function
+  (symbol)? @definition.parameter)
+  (#any-of? @_fnkw "def" "defop" "defn" "fn"))
+
+((cons
+  . (symbol) @_fnkw
+  . (symbol) @definition.function
+  (symbol)? @definition.parameter)
+  (#any-of? @_fnkw "def" "defop" "defn" "fn"))

From dbdbd71b41a3627e0f2784eff746ad4366e2a21c Mon Sep 17 00:00:00 2001
From: Turiiya <34311583+tobealive@users.noreply.github.com>
Date: Fri, 17 Mar 2023 13:57:22 +0100
Subject: [PATCH 0155/2704] fix(v): add `vlang` as filetype

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1d03bd63b..7b9c2dd62 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1497,6 +1497,7 @@ list.v = {
     files = { "src/parser.c", "src/scanner.c" },
     location = "tree_sitter_v",
   },
+  filetype = "vlang",
   maintainers = { "@kkharji" },
 }
 

From 97a354ff4425933f71c88751a9d028afc656159e Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Tue, 21 Mar 2023 21:33:27 +0100
Subject: [PATCH 0156/2704] highlights(sql): add new keywords for views and
 defaults

---
 queries/sql/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index df8fbb7c8..e2f7d991f 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -73,10 +73,12 @@
  (keyword_preceding)
  (keyword_following)
  (keyword_first)
+ (keyword_current_timestamp)
 ] @attribute
 
 [
  (keyword_materialized)
+ (keyword_recursive)
  (keyword_temp)
  (keyword_temporary)
  (keyword_unlogged)
@@ -209,6 +211,10 @@
  (keyword_low_priority)
  (keyword_ignore)
  (keyword_nothing)
+ (keyword_check)
+ (keyword_option)
+ (keyword_local)
+ (keyword_cascaded)
 ] @type.qualifier
 
 [

From 9db3769c4b34447bea5894beead79283639ed903 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Wed, 22 Mar 2023 21:25:42 +0100
Subject: [PATCH 0157/2704] highlights(sql): bump lockfile

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 558a22221..1b9bab6d2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -435,7 +435,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "b3c771f890dd2d94994d2647aeb744c93d762f0d"
+    "revision": "d2b64d85d0cab5edeffe44243134033e6ff07c02"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From 87cf2abeb6077ac19a1249d0b06f223aa398a0a0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 22 Mar 2023 01:08:57 -0400
Subject: [PATCH 0158/2704] feat(typescript): add various missing
 function/method captures

---
 queries/typescript/highlights.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 057156d55..13b7d99a8 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -66,6 +66,7 @@
 
 "?." @punctuation.delimiter
 
+(method_signature "?" @punctuation.special)
 (property_signature "?" @punctuation.special)
 (optional_parameter "?" @punctuation.special)
 
@@ -104,3 +105,20 @@
 ;; a => null
 (arrow_function
   parameter: (identifier) @parameter)
+
+;; function signatures
+(ambient_declaration
+  (function_signature
+    name: (identifier) @function))
+
+;; method signatures
+(method_signature name: (_) @method)
+
+;; property signatures
+(property_signature
+  name: (property_identifier) @method
+  type: (type_annotation
+          [
+            (union_type (parenthesized_type (function_type)))
+            (function_type)
+          ]))

From 1f087c91f5ca76a2257b855d72d371a2b5302986 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Fri, 24 Mar 2023 03:36:30 +0100
Subject: [PATCH 0159/2704] fix(health): check required neovim version (#4330)

* fix(health): check required neovim version

* fixup(health)!: require v0.8.3 for is_in_node_range

* fixup(readme)!: always prefer latest neovim
---
 README.md                      | 2 +-
 lua/nvim-treesitter/health.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ac73bd66f..0e525c0d5 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ For more detailed information on setting these up, see ["Advanced setup"](#advan
 
 ## Requirements
 
-- **Neovim 0.8.0 or later** built with **tree-sitter 0.20.3+** (latest [nightly](https://github.com/neovim/neovim#install-from-source) recommended)
+- [Latest](https://github.com/neovim/neovim/releases/tag/stable) Neovim release ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
 - `tar` and `curl` in your path (or alternatively `git`)
 - A C compiler in your path and libstdc++ installed ([Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support)).
 
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 40ec3448e..7edd77ed8 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -16,8 +16,8 @@ local NVIM_TREESITTER_MINIMUM_ABI = 13
 local function install_health()
   health.report_start "Installation"
 
-  if fn.has "nvim-0.7" == 0 then
-    health.report_error "Nvim-treesitter requires Neovim 0.7.0+"
+  if fn.has "nvim-0.8.3" ~= 1 then
+    health.report_error "Nvim-treesitter requires Neovim 0.8.3+"
   end
 
   if fn.executable "tree-sitter" == 0 then

From 17a81d7b357a74dcefda331fdacb2742ddc60eac Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 Mar 2023 08:07:45 -0400
Subject: [PATCH 0160/2704] feat(luadoc): add more annotations

---
 lockfile.json                 |  2 +-
 queries/luadoc/highlights.scm | 29 ++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1b9bab6d2..4948a4407 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -273,7 +273,7 @@
     "revision": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"
   },
   "luadoc": {
-    "revision": "40a67ee798eb3c989fffde0277ff6de740ebaf34"
+    "revision": "5c9572faf56d1fa0f7e0740c94de1c4f67c6af5e"
   },
   "luap": {
     "revision": "bfb38d254f380362e26b5c559a4086ba6e92ba77"
diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
index c0132c966..ec8bcb765 100644
--- a/queries/luadoc/highlights.scm
+++ b/queries/luadoc/highlights.scm
@@ -1,5 +1,10 @@
 ; Keywords
 
+[
+  "@module"
+  "@package"
+] @include
+
 [
   "@class"
   "@type"
@@ -10,6 +15,11 @@
   "@vararg"
   "@diagnostic"
   "@deprecated"
+  "@meta"
+  "@source"
+  "@version"
+  "@operator"
+  "@nodiscard"
   "@cast"
   "@overload"
   "@enum"
@@ -23,10 +33,17 @@
   "@async"
 ] @keyword.coroutine
 
-(language_injection "@language" (identifier) @parameter)
+(language_injection "@language" (identifier) @keyword)
 
 (function_type ["fun" "function"] @keyword.function)
 
+(source_annotation
+  filename: (identifier) @text.uri @string.special
+  extension: (identifier) @text.uri @string.special)
+
+(version_annotation
+  version: _ @constant.builtin)
+
 [
   "@return"
 ] @keyword.return
@@ -93,6 +110,8 @@
 
 ; Literals
 
+(string) @namespace ; only used in @module
+
 (literal_type) @string
 
 (number) @number
@@ -123,11 +142,11 @@
 
 (comment) @comment @spell
 
-(at_comment 
-  (identifier) @type 
+(at_comment
+  (identifier) @type
   (_) @comment @spell)
 
-(class_at_comment 
-  (identifier) @type 
+(class_at_comment
+  (identifier) @type
   ("extends"? (identifier)? @type)
   (_) @comment @spell)

From c7b9f68d0385274b4aa83671e6dcb02f301f9357 Mon Sep 17 00:00:00 2001
From: Lucario387 <hoangtun0810@gmail.com>
Date: Fri, 24 Mar 2023 23:38:19 +0900
Subject: [PATCH 0161/2704] feat(vue): add tsx/jsx injection queries (#4550)

* feat(vue): add tsx/jsx injection queries

- add a test

- style: format vue/injections.scm
---
 queries/vue/injections.scm                    | 60 +++++++++----------
 .../injections/vue/test-vue-injections.vue    |  4 ++
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index 84ac2160e..ffbc00bfc 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -1,53 +1,55 @@
 ; inherits html_tags
 
 ; <script lang="css">
-(
-  (style_element
+((style_element
     (start_tag
       (attribute
         (attribute_name) @_lang
         (quoted_attribute_value (attribute_value) @_css)))
-    (raw_text) @css)
-  (#eq? @_lang "lang")
-  (#eq? @_css "css")
-)
+    (#eq? @_lang "lang")
+    (#eq? @_css "css")
+    (raw_text) @css))
 
 ; TODO: When nvim-treesitter have postcss and less parser, use @language and @content instead
 ; <script lang="scss">
-(
-  (style_element
+((style_element
     (start_tag
       (attribute
         (attribute_name) @_lang
         (quoted_attribute_value (attribute_value) @_scss)))
-    (raw_text) @scss)
-  (#eq? @_lang "lang")
-  (#any-of? @_scss "scss" "less" "postcss")
-)
-
+    (#eq? @_lang "lang")
+    (#any-of? @_scss "scss" "less" "postcss")
+    (raw_text) @scss))
 ; <script lang="js">
-(
-  (script_element
+((script_element
     (start_tag
       (attribute
         (attribute_name) @_lang
         (quoted_attribute_value (attribute_value) @_js)))
-    (raw_text) @javascript)
-  (#eq? @_lang "lang")
-  (#eq? @_js "js")
-)
+    (#eq? @_lang "lang")
+    (#eq? @_js "js")
+    (raw_text) @javascript))
 
 ; <script lang="ts">
-(
-  (script_element
+((script_element
     (start_tag
       (attribute
         (attribute_name) @_lang
         (quoted_attribute_value (attribute_value) @_ts)))
-    (raw_text) @typescript)
-  (#eq? @_lang "lang")
-  (#eq? @_ts "ts")
-)
+    (#eq? @_lang "lang")
+    (#eq? @_ts "ts")
+    (raw_text) @typescript))
+
+; <script lang="tsx">
+; <script lang="jsx">
+((script_element
+    (start_tag
+      (attribute
+        (attribute_name) @_attr
+        (quoted_attribute_value (attribute_value) @language)))
+    (#eq? @_attr "lang")
+    (#any-of? @language "tsx" "jsx")
+    (raw_text) @content))
 
 ((interpolation
   (raw_text) @javascript))
@@ -56,11 +58,9 @@
     (quoted_attribute_value
       (attribute_value) @javascript)))
 
-(
-  (template_element
+((template_element
     (start_tag
       (attribute
         (quoted_attribute_value (attribute_value) @_lang)))
-    (text) @pug)
-  (#eq? @_lang "pug")
-)
+    (#eq? @_lang "pug")
+    (text) @pug))
diff --git a/tests/query/injections/vue/test-vue-injections.vue b/tests/query/injections/vue/test-vue-injections.vue
index b0df16071..75d3d831c 100644
--- a/tests/query/injections/vue/test-vue-injections.vue
+++ b/tests/query/injections/vue/test-vue-injections.vue
@@ -20,6 +20,10 @@
 <script lang="ts" defer>const foo: number = 1 </script>
 <!--                            ^ typescript -->
 <!--                            ^ !javascript -->
+<script lang="tsx" defer>const foo: number = 1</script>
+                              <!--  ^ tsx -->
+                              <!--  ^ !jsx -->
+                              <!--  ^ !typescript -->
 <style> .bar { .foo{ } } </style>
 <!--                ^ css   -->
 <style scoped> .page.page--news { background: rebeccapurple; } </style>

From 90ead4ed588eb1c5b9b1cf93ab766d2efc0fd4c7 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 24 Mar 2023 09:43:14 +0000
Subject: [PATCH 0162/2704] fix: shim 0.9 deprecations

---
 lua/nvim-treesitter/compat.lua           | 18 ++++++++++++++++++
 lua/nvim-treesitter/configs.lua          |  4 ++--
 lua/nvim-treesitter/health.lua           |  5 +++--
 lua/nvim-treesitter/query.lua            |  4 ++--
 lua/nvim-treesitter/query_predicates.lua |  2 +-
 queries/lua/injections.scm               |  2 +-
 6 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 lua/nvim-treesitter/compat.lua

diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
new file mode 100644
index 000000000..072b4dc58
--- /dev/null
+++ b/lua/nvim-treesitter/compat.lua
@@ -0,0 +1,18 @@
+-- Shim module to address deprecations across nvim versions
+local tsq = vim.treesitter.query
+
+local M = {}
+
+function M.get_query_files(lang, query_group, is_included)
+  return (tsq.get_files or tsq.get_query_files)(lang, query_group, is_included)
+end
+
+function M.get_query(lang, query_name)
+  return (tsq.get or tsq.get_query)(lang, query_name)
+end
+
+function M.parse_query(lang, query)
+  return (tsq.parse or tsq.parse_query)(lang, query)
+end
+
+return M
diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index a3f4063cd..99fc6b840 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -1,7 +1,7 @@
 local api = vim.api
 
 local queries = require "nvim-treesitter.query"
-local ts_query = require "vim.treesitter.query"
+local ts = require "nvim-treesitter.compat"
 local parsers = require "nvim-treesitter.parsers"
 local utils = require "nvim-treesitter.utils"
 local caching = require "nvim-treesitter.caching"
@@ -271,7 +271,7 @@ end
 ---@param lang string
 function M.edit_query_file(query_group, lang)
   lang = lang or parsers.get_buf_lang()
-  local files = ts_query.get_query_files(lang, query_group, true)
+  local files = ts.get_query_files(lang, query_group, true)
   if #files == 0 then
     utils.notify "No query file found! Creating a new one!"
     M.edit_query_file_user_after(query_group, lang)
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 7edd77ed8..f81d35fbf 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -6,6 +6,7 @@ local info = require "nvim-treesitter.info"
 local shell = require "nvim-treesitter.shell_command_selectors"
 local install = require "nvim-treesitter.install"
 local utils = require "nvim-treesitter.utils"
+local ts = require "nvim-treesitter.compat"
 
 local health = vim.health or require "health"
 
@@ -147,13 +148,13 @@ function M.check()
       local lang, type, err = unpack(p)
       local lines = {}
       table.insert(lines, lang .. "(" .. type .. "): " .. err)
-      local files = vim.treesitter.query.get_query_files(lang, type)
+      local files = ts.get_query_files(lang, type)
       if #files > 0 then
         table.insert(lines, lang .. "(" .. type .. ") is concatenated from the following files:")
         for _, file in ipairs(files) do
           local fd = io.open(file, "r")
           if fd then
-            local ok, file_err = pcall(vim.treesitter.query.parse_query, lang, fd:read "*a")
+            local ok, file_err = pcall(ts.parse_query, lang, fd:read "*a")
             if ok then
               table.insert(lines, '|    [OK]:"' .. file .. '"')
             else
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index c7f1f952e..18c416a38 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -1,5 +1,5 @@
 local api = vim.api
-local tsq = require "vim.treesitter.query"
+local ts = require "nvim-treesitter.compat"
 local tsrange = require "nvim-treesitter.tsrange"
 local utils = require "nvim-treesitter.utils"
 local parsers = require "nvim-treesitter.parsers"
@@ -105,7 +105,7 @@ do
   ---@param query_name string
   function M.get_query(lang, query_name)
     if cache[lang][query_name] == nil then
-      cache[lang][query_name] = tsq.get_query(lang, query_name)
+      cache[lang][query_name] = ts.get_query(lang, query_name)
     end
 
     return cache[lang][query_name]
diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 8c0a4c947..106f90a8d 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -168,7 +168,7 @@ query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
     text = value
   else
     local node = match[value]
-    text = query.get_node_text(node, bufnr) or ""
+    text = vim.treesitter.get_node_text(node, bufnr) or ""
   end
 
   if #pred == 3 then
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 51957461e..bb3d119f5 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -14,7 +14,7 @@
 ((function_call
   name: (_) @_vimcmd_identifier
   arguments: (arguments (string content: _ @query) .))
-  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set_query" "vim.treesitter.query.parse_query"))
+  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query"))
 
 ;; highlight string as query if starts with `;; query`
 ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))

From d1333dd7e51729a581fed3e429fa035bff77a3db Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Sun, 19 Mar 2023 18:09:18 -0700
Subject: [PATCH 0163/2704] refactor(indent)!: Rework indent, aligned indent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

indents now use @indent.X style captures, and indent.PROP for properties to set on those captures, as documented in the help.

Captures are:

indent.auto
indent.begin
indent.end
indent.dedent
indent.branch
indent.ignore
indent.align
indent.zero

Properties are:

indent.immediate
indent.start_at_same_line
indent.open_delimiter
indent.close_delimiter
indent.increment
indent.avoid_last_matching_next

Multiple opening delims on one line and multiple closing on a line are collapsed so as not to over indent,

The final line of @indent.align blocks which must in some cases be treated specially to avoid clashing with the next line is treated the same regardless of whether the @indent.align capture actually uses aligned indentation or just normal indentation. The indent.avoid_last_matching_next property controls this.

Adjust python to use these.

List, set, dict and tuple all use @indent.align which permits both hanging and aligned styles.

Finally, try: on it’s own will indent when typing live but make no guaranteeds about whole-file formatting.

Includes lucario387:fix-align-indent
---
 doc/nvim-treesitter.txt                       | 105 ++++++++++++++++++
 lua/nvim-treesitter/indent.lua                | 103 ++++++++++++-----
 queries/python/indents.scm                    |  49 ++++----
 tests/indent/python/aligned_indent_2.py       |  12 ++
 tests/indent/python/control_flow.py           |   2 -
 tests/indent/python/error_state_def.py        |   6 +
 tests/indent/python/error_state_dict.py       |   6 +
 tests/indent/python/error_state_funcall.py    |   5 +
 tests/indent/python/error_state_list.py       |   5 +
 tests/indent/python/error_state_set.py        |   5 +
 tests/indent/python/error_state_tuple.py      |   7 ++
 .../indent/python/error_state_tuple_align.py  |   7 ++
 tests/indent/python/return_dedent.py          |  23 ++++
 tests/indent/python_spec.lua                  |  16 ++-
 14 files changed, 298 insertions(+), 53 deletions(-)
 create mode 100644 tests/indent/python/aligned_indent_2.py
 create mode 100644 tests/indent/python/error_state_def.py
 create mode 100644 tests/indent/python/error_state_dict.py
 create mode 100644 tests/indent/python/error_state_funcall.py
 create mode 100644 tests/indent/python/error_state_list.py
 create mode 100644 tests/indent/python/error_state_set.py
 create mode 100644 tests/indent/python/error_state_tuple.py
 create mode 100644 tests/indent/python/error_state_tuple_align.py

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index f05693676..5509dc8af 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -222,7 +222,112 @@ Supported options:
       enable = true
     },
   }
+
+`@indent`				    *nvim-treesitter-indentation-queries*
+Queries can use the following captures: `@indent` and `@dedent`,
+`@branch`, `@indent_end` or `@aligned_indent`. An `@ignore` capture tells
+treesitter to ignore indentation and a `@zero_indent` capture sets
+the indentation to 0.
+
+`@indent`				    *nvim-treesitter-indentation-indent*
+The `@indent` specifies that the next line should be indented.  Multiple
+indents on the same line get collapsed. Eg.
+
+>
+  (
+   (if_statement)
+   (ERROR "else") @indent
+  )
 <
+Indent can also have `immediate_indent` set using a `#set!` directive, which
+permits the next line to indent even when the block intended to be indented
+has no content yet, improving interactive typing.
+
+eg for python:
+>
+ ((if_statement) @indent
+   (#set! "immediate_indent" 1))
+<
+
+Will allow:
+>
+  if True:<CR>
+      # Auto indent to here
+
+`@indent_end`				*nvim-treesitter-indentation-indent_end*
+An `@indent_end` capture is used to specify that the indented region ends and
+any text subsequent to the capture should be dedented.  
+
+`@branch`				*nvim-treesitter-indentation-branch*
+An `@branch` capture is used to specify that a dedented region starts
+at the line including the captured nodes.
+
+`@dedent`				*nvim-treesitter-indentation-dedent*
+A `@dedent` capture specifies dedenting starting on the next line.
+>
+`@aligned_indent`			*nvim-treesitter-indentation-aligned_indent*
+Aligned indent blocks may be specified with the `@aligned_indent` capture.
+This permits
+
+>
+  foo(a,
+      b,
+      c)
+<
+As well as
+>
+  foo(
+    a,
+    b,
+    c)
+<
+and finally
+>
+  foo(
+    a,
+    b,
+    c
+  )
+<
+To specify the delimiters to use `open_delimiter` and `close_delimiter`
+should be used.  Eg.
+>
+ ((argument_list) @aligned_indent
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")"))
+<
+
+For some languages the last line of an `aligned_indent` block must not be
+the same indent as the natural next line.
+
+For example in python:
+
+>
+  if (a > b and
+      c < d):
+      pass
+
+Is not correct, whereas
+>
+  if (a > b and
+	c < d):
+      pass
+
+Would be correctly indented.  This behavior may be chosen using
+`avoid_last_matching_next`.  Eg.
+
+>
+ (if_statement
+  condition: (parenthesized_expression) @aligned_indent
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")")
+  (#set! "avoid_last_matching_next" 1)
+ )
+<
+Could be used to specify that the last line of an `@aligned_indent` capture
+should be additionally indented to avoid clashing with the indent of the first
+line of the block inside an if.
+
 ==============================================================================
 COMMANDS                                            *nvim-treesitter-commands*
 
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index cf819d05b..8035a73d8 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -42,7 +42,10 @@ local function find_delimiter(bufnr, node, delimiter)
       local linenr = child:start()
       local line = vim.api.nvim_buf_get_lines(bufnr, linenr, linenr + 1, false)[1]
       local end_char = { child:end_() }
-      return child, #line == end_char[2]
+      local trimmed_after_delim
+      local escaped_delimiter = delimiter:gsub("[%-%.%+%[%]%(%)%$%^%%%?%*]", "%%%1")
+      trimmed_after_delim, _ = line:sub(end_char[2] + 1):gsub("[%s" .. escaped_delimiter .. "]*", "")
+      return child, #trimmed_after_delim == 0
     end
   end
 end
@@ -185,51 +188,93 @@ function M.get_indent(lnum)
       is_processed = true
     end
 
+    if is_in_err and not q.aligned_indent[node:id()] then
+      -- only when the node is in error, promote the
+      -- first child's aligned indent to the error node
+      -- to work around ((ERROR "X" . (_)) @aligned_indent (#set! "delimeter" "AB"))
+      -- matching for all X, instead set do
+      -- (ERROR "X" @aligned_indent (#set! "delimeter" "AB") . (_))
+      -- and we will fish it out here.
+      for c in node:iter_children() do
+        if q.aligned_indent[c:id()] then
+          q.aligned_indent[node:id()] = q.aligned_indent[c:id()]
+          break
+        end
+      end
+    end
     -- do not indent for nodes that starts-and-ends on same line and starts on target line (lnum)
-    if q.aligned_indent[node:id()] and srow ~= erow and (srow ~= lnum - 1) then
+    if should_process and q.aligned_indent[node:id()] and (srow ~= erow or is_in_err) and (srow ~= lnum - 1) then
       local metadata = q.aligned_indent[node:id()]
-      local o_delim_node, is_last_in_line ---@type TSNode|nil, boolean|nil
-      local c_delim_node ---@type TSNode|nil
+      local o_delim_node, o_is_last_in_line ---@type TSNode|nil, boolean|nil
+      local c_delim_node, c_is_last_in_line ---@type TSNode|nil, boolean|nil, boolean|nil
+      local indent_is_absolute = false
       if metadata.delimiter then
         ---@type string
         local opening_delimiter = metadata.delimiter and metadata.delimiter:sub(1, 1)
-        o_delim_node, is_last_in_line = find_delimiter(bufnr, node, opening_delimiter)
+        o_delim_node, o_is_last_in_line = find_delimiter(bufnr, node, opening_delimiter)
+        ---@type string
         local closing_delimiter = metadata.delimiter and metadata.delimiter:sub(2, 2)
-        c_delim_node, _ = find_delimiter(bufnr, node, closing_delimiter)
+        c_delim_node, c_is_last_in_line = find_delimiter(bufnr, node, closing_delimiter)
       else
         o_delim_node = node
         c_delim_node = node
       end
 
       if o_delim_node then
-        if is_last_in_line then
+        local o_srow, o_scol = o_delim_node:start()
+        local c_srow = nil
+        if c_delim_node then
+          c_srow, _ = c_delim_node:start()
+        end
+        if o_is_last_in_line then
           -- hanging indent (previous line ended with starting delimiter)
-          indent = indent + indent_size * 1
+          -- should be processed like indent
+          if should_process then
+            indent = indent + indent_size * 1
+            if c_is_last_in_line then
+              -- If current line is outside the range of a node marked with `@aligned_indent`
+              -- Then its indent level shouldn't be affected by `@aligned_indent` node
+              if c_srow and c_srow < lnum - 1 then
+                indent = math.max(indent - indent_size, 0)
+              end
+            end
+          end
         else
-          local o_srow, o_scol = o_delim_node:start()
-          local final_line_indent = false
-          if c_delim_node then
-            local c_srow, _ = c_delim_node:start()
-            if c_srow ~= o_srow and c_srow == lnum - 1 then
-              -- delims end on current line, and are not open and closed same line.
-              -- final_line_indent controls this behavior, for example this is not desirable
-              -- for a tuple.
-              final_line_indent = metadata.final_line_indent or false
-            end
-          end
-          if final_line_indent then
-            -- last line must be indented more in cases where
-            -- it would be same indent as next line
-            local aligned_indent = o_scol + (metadata.increment or 1)
-            if aligned_indent <= indent then
-              return indent + indent_size * 1
-            else
-              return aligned_indent
-            end
+          -- aligned indent
+          if c_is_last_in_line and c_srow and o_srow ~= c_srow and c_srow < lnum - 1 then
+            -- If current line is outside the range of a node marked with `@aligned_indent`
+            -- Then its indent level shouldn't be affected by `@aligned_indent` node
+            indent = math.max(indent - indent_size, 0)
           else
-            return o_scol + (metadata.increment or 1)
+            indent = o_scol + (metadata.increment or 1)
+            indent_is_absolute = true
           end
         end
+        -- deal with the final line
+        local avoid_last_matching_next = false
+        if c_srow and c_srow ~= o_srow and c_srow == lnum - 1 then
+          -- delims end on current line, and are not open and closed same line.
+          -- then this last line may need additional indent to avoid clashes
+          -- with the next. `avoid_last_matching_next` controls this behavior,
+          -- for example this is needed for function parameters.
+          avoid_last_matching_next = metadata.avoid_last_matching_next or false
+        end
+        if avoid_last_matching_next then
+          -- last line must be indented more in cases where
+          -- it would be same indent as next line (we determine this as one
+          -- width more than the open indent to avoid confusing with any
+          -- hanging indents)
+          if indent <= vim.fn.indent(o_srow + 1) + indent_size then
+            indent = indent + indent_size * 1
+          else
+            indent = indent
+          end
+        end
+        is_processed = true
+        if indent_is_absolute then
+          -- don't allow further indenting by parent nodes, this is an absolute position
+          return indent
+        end
       end
     end
 
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index cc13587ec..82933c159 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -1,8 +1,4 @@
 [
-  (list)
-  (dictionary)
-  (set)
-
   (import_from_statement)
 
   (parenthesized_expression)
@@ -20,6 +16,16 @@
   (concatenated_string)
 ] @indent
 
+((list) @aligned_indent
+ (#set! "delimiter" "[]")
+)
+((dictionary) @aligned_indent
+ (#set! "delimiter" "{}")
+)
+((set) @aligned_indent
+ (#set! "delimiter" "{}")
+)
+
 ((for_statement) @indent
  (#set! "immediate_indent" 1))
 ((if_statement) @indent
@@ -28,8 +34,7 @@
  (#set! "immediate_indent" 1))
 ((try_statement) @indent
  (#set! "immediate_indent" 1))
-((ERROR "try" ":") @indent
- (#set! "immediate_indent" 1))
+(ERROR "try" ":" @indent (#set! "immediate_indent" 1))
 ((function_definition) @indent
  (#set! "immediate_indent" 1))
 ((class_definition) @indent
@@ -40,27 +45,24 @@
 (if_statement
   condition: (parenthesized_expression) @aligned_indent
   (#set! "delimiter" "()")
-  (#set! "final_line_indent" 1) ; parenthesized_expression already indented
-)
+  (#set! "avoid_last_matching_next" 1))
 (while_statement
   condition: (parenthesized_expression) @aligned_indent
   (#set! "delimiter" "()")
-  (#set! "final_line_indent" 1) ; parenthesized_expression already indented
-)
+  (#set! "avoid_last_matching_next" 1))
 
-((ERROR "(" . (_)) @aligned_indent
- (#set! "delimiter" "()"))
-((argument_list ")" @indent_end) @aligned_indent
+(ERROR "(" @aligned_indent (#set! "delimiter" "()") . (_)) 
+((argument_list) @aligned_indent
  (#set! "delimiter" "()"))
 ((parameters) @aligned_indent
  (#set! "delimiter" "()")
- (#set! "final_line_indent" 1))
-((tuple ")" @indent_end) @aligned_indent
+ (#set! "avoid_last_matching_next" 1))
+((tuple) @aligned_indent
  (#set! "delimiter" "()"))
 
-(list "]" @indent_end)
-(dictionary "}" @indent_end)
-(set "}" @indent_end)
+(ERROR "[" @aligned_indent (#set! "delimiter" "[]") . (_)) 
+
+(ERROR "{" @aligned_indent (#set! "delimiter" "{}") . (_)) 
 
 (parenthesized_expression ")" @indent_end)
 (generator_expression ")" @indent_end)
@@ -75,9 +77,17 @@
 (return_statement
   [
     (_) @indent_end 
-    (_ (_) @indent_end .)
+    (_
+      [
+        (_)
+        ")"
+        "}"
+        "]"
+      ] @indent_end .)
     (attribute 
       attribute: (_) @indent_end)
+    (call
+      arguments: (_ ")" @indent_end))
     "return" @indent_end
   ] .)
 
@@ -92,3 +102,4 @@
 ] @branch
 
 (string) @auto
+
diff --git a/tests/indent/python/aligned_indent_2.py b/tests/indent/python/aligned_indent_2.py
new file mode 100644
index 000000000..124f7142f
--- /dev/null
+++ b/tests/indent/python/aligned_indent_2.py
@@ -0,0 +1,12 @@
+if True:
+    print(1, 2, 3)
+
+if True:
+    print(
+        1,
+        2,
+        3
+    )
+    print(1,
+          2,
+          3)
diff --git a/tests/indent/python/control_flow.py b/tests/indent/python/control_flow.py
index 7ec02e3ff..fca528a2d 100644
--- a/tests/indent/python/control_flow.py
+++ b/tests/indent/python/control_flow.py
@@ -26,5 +26,3 @@ while (a > 4 and
     pass
 
 try:
-    pass
-
diff --git a/tests/indent/python/error_state_def.py b/tests/indent/python/error_state_def.py
new file mode 100644
index 000000000..943fbfac3
--- /dev/null
+++ b/tests/indent/python/error_state_def.py
@@ -0,0 +1,6 @@
+def foo(a,
+        b,
+        c):
+    pass
+
+def foobar(a,
diff --git a/tests/indent/python/error_state_dict.py b/tests/indent/python/error_state_dict.py
new file mode 100644
index 000000000..dec92b1f9
--- /dev/null
+++ b/tests/indent/python/error_state_dict.py
@@ -0,0 +1,6 @@
+
+d = {1:4,
+     2:3,
+     4:5}
+
+d2 = {1:3,
diff --git a/tests/indent/python/error_state_funcall.py b/tests/indent/python/error_state_funcall.py
new file mode 100644
index 000000000..e86720ed1
--- /dev/null
+++ b/tests/indent/python/error_state_funcall.py
@@ -0,0 +1,5 @@
+
+f(1,2,3,
+  4,5,6)
+
+g(1,2,3,
diff --git a/tests/indent/python/error_state_list.py b/tests/indent/python/error_state_list.py
new file mode 100644
index 000000000..09823bb05
--- /dev/null
+++ b/tests/indent/python/error_state_list.py
@@ -0,0 +1,5 @@
+l = [1,
+     2,
+     3]
+
+l2 = [1,
diff --git a/tests/indent/python/error_state_set.py b/tests/indent/python/error_state_set.py
new file mode 100644
index 000000000..31338de68
--- /dev/null
+++ b/tests/indent/python/error_state_set.py
@@ -0,0 +1,5 @@
+s = {1,
+     2,
+     3}
+
+s2 = {1,
diff --git a/tests/indent/python/error_state_tuple.py b/tests/indent/python/error_state_tuple.py
new file mode 100644
index 000000000..fda59c8c3
--- /dev/null
+++ b/tests/indent/python/error_state_tuple.py
@@ -0,0 +1,7 @@
+(
+    a,
+    b,
+    c,
+)
+
+(a,
diff --git a/tests/indent/python/error_state_tuple_align.py b/tests/indent/python/error_state_tuple_align.py
new file mode 100644
index 000000000..fda59c8c3
--- /dev/null
+++ b/tests/indent/python/error_state_tuple_align.py
@@ -0,0 +1,7 @@
+(
+    a,
+    b,
+    c,
+)
+
+(a,
diff --git a/tests/indent/python/return_dedent.py b/tests/indent/python/return_dedent.py
index 44d6219de..8171bc9d1 100644
--- a/tests/indent/python/return_dedent.py
+++ b/tests/indent/python/return_dedent.py
@@ -14,3 +14,26 @@ def a():
     return (
         1, 2, 3
     )
+
+def a():
+    return b(
+        1, 2, 3
+    )
+
+def a():
+    return [1, 2, 3]
+
+def a():
+    return {1, 2, 3}
+
+def a():
+    return {
+        "a": 1,
+        "b": 2,
+        "c": 3
+    }
+
+def a():
+    return [
+        a for a in range (1, 3)
+    ]
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index c400de542..6f4e0fec7 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -17,6 +17,9 @@ describe("indent Python:", function()
 
   describe("new line:", function()
     run:new_line("aligned_indent.py", { on_line = 1, text = "arg3,", indent = 19 })
+    run:new_line("aligned_indent_2.py", { on_line = 2, text = "x", indent = 4 })
+    run:new_line("aligned_indent_2.py", { on_line = 9, text = "x", indent = 4 })
+    run:new_line("aligned_indent_2.py", { on_line = 12, text = "x", indent = 4 })
     run:new_line("basic_blocks.py", { on_line = 1, text = "wait,", indent = 4 })
     run:new_line("basic_blocks.py", { on_line = 6, text = "x += 1", indent = 4 })
     run:new_line("basic_blocks.py", { on_line = 7, text = "x += 1", indent = 4 })
@@ -35,11 +38,18 @@ describe("indent Python:", function()
     run:new_line("control_flow.py", { on_line = 22, text = "x = 4", indent = 4 })
     run:new_line("control_flow.py", { on_line = 24, text = "c < 6 and", indent = 7 })
     run:new_line("control_flow.py", { on_line = 26, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 29, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 28, text = "x = 4", indent = 4 })
     run:new_line("branches.py", { on_line = 25, text = "x > 9 and", indent = 4 })
     run:new_line("branches.py", { on_line = 29, text = "and x > 9", indent = 4 })
-    run:new_line("hanging_indent.py", { on_line = 1, text = "arg0,", indent = 8 })
+    run:new_line("hanging_indent.py", { on_line = 1, text = "arg0,", indent = 4 })
     run:new_line("hanging_indent.py", { on_line = 5, text = "0,", indent = 4 })
+    run:new_line("error_state_def.py", { on_line = 6, text = "b,", indent = 11 })
+    run:new_line("error_state_tuple.py", { on_line = 7, text = "b,", indent = 1 })
+    run:new_line("error_state_tuple_align.py", { on_line = 7, text = "b,", indent = 1 })
+    run:new_line("error_state_list.py", { on_line = 5, text = "3,", indent = 6 })
+    run:new_line("error_state_dict.py", { on_line = 6, text = "9:10,", indent = 6 })
+    run:new_line("error_state_set.py", { on_line = 5, text = "9,", indent = 6 })
+    run:new_line("error_state_funcall.py", { on_line = 5, text = "6,", indent = 2 })
     run:new_line(
       "join_lines.py",
       { on_line = 1, text = "+ 1 \\", indent = 4 },
@@ -75,7 +85,7 @@ describe("indent Python:", function()
     run:new_line("line_after_indent.py", { on_line = 55, text = "x", indent = 4 })
     run:new_line("line_after_indent.py", { on_line = 63, text = "x", indent = 4 })
 
-    for _, line in ipairs { 2, 5, 8, 11, 16 } do
+    for _, line in ipairs { 2, 5, 8, 11, 16, 21, 24, 27, 34, 39 } do
       run:new_line("return_dedent.py", { on_line = line, text = "x", indent = 0 })
     end
   end)

From b4fcc611753bd443d30a75c1797a93268faa8aba Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Sun, 19 Mar 2023 18:55:48 -0700
Subject: [PATCH 0164/2704] split delimiter into open_delimiter and
 close_delimiter

---
 lua/nvim-treesitter/indent.lua | 13 +++++------
 queries/c/indents.scm          |  6 +++--
 queries/capnp/indents.scm      |  6 +++--
 queries/gdscript/indents.scm   |  4 ++--
 queries/python/indents.scm     | 42 +++++++++++++++++++++++-----------
 queries/r/indents.scm          |  3 ++-
 queries/starlark/indents.scm   | 18 ++++++++++-----
 queries/thrift/indents.scm     |  3 ++-
 queries/yang/indents.scm       |  3 ++-
 queries/yuck/indents.scm       |  3 ++-
 10 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 8035a73d8..932fa17ff 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -208,15 +208,14 @@ function M.get_indent(lnum)
       local o_delim_node, o_is_last_in_line ---@type TSNode|nil, boolean|nil
       local c_delim_node, c_is_last_in_line ---@type TSNode|nil, boolean|nil, boolean|nil
       local indent_is_absolute = false
-      if metadata.delimiter then
-        ---@type string
-        local opening_delimiter = metadata.delimiter and metadata.delimiter:sub(1, 1)
-        o_delim_node, o_is_last_in_line = find_delimiter(bufnr, node, opening_delimiter)
-        ---@type string
-        local closing_delimiter = metadata.delimiter and metadata.delimiter:sub(2, 2)
-        c_delim_node, c_is_last_in_line = find_delimiter(bufnr, node, closing_delimiter)
+      if metadata.open_delimiter then
+        o_delim_node, o_is_last_in_line = find_delimiter(bufnr, node, metadata.open_delimiter)
       else
         o_delim_node = node
+      end
+      if metadata.close_delimiter then
+        c_delim_node, c_is_last_in_line = find_delimiter(bufnr, node, metadata.close_delimiter)
+      else
         c_delim_node = node
       end
 
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index db7b3a1c9..bb8903d3d 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -113,8 +113,10 @@
 ] @ignore
 
 ((ERROR (parameter_declaration)) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 ([(argument_list) (parameter_list)] @aligned_indent
-  (#set! "delimiter" "()"))
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")"))
 
 (comment) @auto
diff --git a/queries/capnp/indents.scm b/queries/capnp/indents.scm
index 362cc7da0..601862d9d 100644
--- a/queries/capnp/indents.scm
+++ b/queries/capnp/indents.scm
@@ -14,10 +14,12 @@
 ] @indent
 
 ((struct_shorthand (property)) @aligned_indent
-  (#set! "delimiter" "()"))
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")"))
 
 ((const_list (const_value)) @aligned_indent
-  (#set! "delimiter" "[]"))
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")"))
 
 [
   "}"
diff --git a/queries/gdscript/indents.scm b/queries/gdscript/indents.scm
index 74d14d3b8..b7c0ac836 100644
--- a/queries/gdscript/indents.scm
+++ b/queries/gdscript/indents.scm
@@ -42,8 +42,8 @@
 ] @indent
 
 ;; This only works with expanded tabs.
-; ((parameters) @aligned_indent (#set! "delimiter" "()"))
-; ((arguments)  @aligned_indent (#set! "delimiter" "()"))
+; ((parameters) @aligned_indent (#set! "open_delimiter" "(") (#set! "close_delimiter" ")"))
+; ((arguments)  @aligned_indent (#set! "open_delimiter" "(") (#set! "close_delimiter" ")"))
 
 ;; The following queries either do not agree with the current body parsing or are
 ;; attempted workarounds. Specifically as the last statement of a body. Opening
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index 82933c159..166787f28 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -17,13 +17,19 @@
 ] @indent
 
 ((list) @aligned_indent
- (#set! "delimiter" "[]")
+ (#set! "open_delimiter" "[")
+ (#set! "close_delimiter" "]")
+ (#set! "dedent_lone_close_delimiter" 1)
 )
 ((dictionary) @aligned_indent
- (#set! "delimiter" "{}")
+ (#set! "open_delimiter" "{")
+ (#set! "close_delimiter" "}")
+ (#set! "dedent_lone_close_delimiter" 1)
 )
 ((set) @aligned_indent
- (#set! "delimiter" "{}")
+ (#set! "open_delimiter" "{")
+ (#set! "close_delimiter" "}")
+ (#set! "dedent_lone_close_delimiter" 1)
 )
 
 ((for_statement) @indent
@@ -44,25 +50,35 @@
 
 (if_statement
   condition: (parenthesized_expression) @aligned_indent
-  (#set! "delimiter" "()")
-  (#set! "avoid_last_matching_next" 1))
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")")
+  (#set! "avoid_last_matching_next" 1)
+)
 (while_statement
   condition: (parenthesized_expression) @aligned_indent
-  (#set! "delimiter" "()")
-  (#set! "avoid_last_matching_next" 1))
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")")
+  (#set! "avoid_last_matching_next" 1)
+)
 
-(ERROR "(" @aligned_indent (#set! "delimiter" "()") . (_)) 
+(ERROR "(" @aligned_indent (#set! "open_delimiter" "(") (#set! "close_delimiter" ")") . (_)) 
 ((argument_list) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 ((parameters) @aligned_indent
- (#set! "delimiter" "()")
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")")
  (#set! "avoid_last_matching_next" 1))
 ((tuple) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 
-(ERROR "[" @aligned_indent (#set! "delimiter" "[]") . (_)) 
+(ERROR "[" @aligned_indent (#set! "open_delimiter" "[") (#set! "close_delimiter" "]") . (_)) 
+(list "]" @indent_end)
 
-(ERROR "{" @aligned_indent (#set! "delimiter" "{}") . (_)) 
+(ERROR "{" @aligned_indent (#set! "open_delimiter" "{") (#set! "close_delimiter" "}") . (_)) 
+(dictionary "}" @indent_end)
+(set "}" @indent_end)
 
 (parenthesized_expression ")" @indent_end)
 (generator_expression ")" @indent_end)
diff --git a/queries/r/indents.scm b/queries/r/indents.scm
index dea537366..c0551eaea 100644
--- a/queries/r/indents.scm
+++ b/queries/r/indents.scm
@@ -20,7 +20,8 @@
 ] @branch
 
 ((formal_parameters (identifier)) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 
 [
   ")"
diff --git a/queries/starlark/indents.scm b/queries/starlark/indents.scm
index 94cc941ef..1b18664c5 100644
--- a/queries/starlark/indents.scm
+++ b/queries/starlark/indents.scm
@@ -23,18 +23,24 @@
 
 (if_statement
   condition: (parenthesized_expression) @aligned_indent
-  (#set! "delimiter" "()")
+  (#set! "open_delimiter" "(")
+  (#set! "close_delimiter" ")")
 )
 ((ERROR "(" . (_)) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 ((argument_list) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 ((argument_list) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 ((parameters) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 ((tuple) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 
 [
   ")"
diff --git a/queries/thrift/indents.scm b/queries/thrift/indents.scm
index 768ff795d..73ceff342 100644
--- a/queries/thrift/indents.scm
+++ b/queries/thrift/indents.scm
@@ -1,7 +1,8 @@
 (definition) @indent
 
 ((parameters (parameter)) @aligned_indent
-  (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
 
 "}" @indent_end
 
diff --git a/queries/yang/indents.scm b/queries/yang/indents.scm
index aab7ddbad..73e743789 100644
--- a/queries/yang/indents.scm
+++ b/queries/yang/indents.scm
@@ -7,4 +7,5 @@
 (block "}" @indent_end @branch)
 
 ((string) @aligned_indent
- (#set! "delimiter" "\"\""))
+ (#set! "open_delimiter" "\"")
+ (#set! "close_delimiter" "\""))
diff --git a/queries/yuck/indents.scm b/queries/yuck/indents.scm
index b53ba75dd..9551a6061 100644
--- a/queries/yuck/indents.scm
+++ b/queries/yuck/indents.scm
@@ -9,7 +9,8 @@
 
 ; TODO: can't get this to work, goal is to indent at the property ":" prefix
 ; ((list (identifier) (property)) @aligned_indent
-;   (#set! "delimiter" ":"))
+;   (#set! "open_delimiter" "(")
+;   (#set! "close_delimiter" ")"))
 
 [")" "}" "]"] @indent_end
 

From cb568af5393241e5dbc9c19157c5df5e9ca9af2d Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Mon, 20 Mar 2023 14:44:39 -0700
Subject: [PATCH 0165/2704] use indent.X syntax for captures and properties of
 set directives

update CONTRIBUTING.md

adjust indents for bass

fix doc capture comment
---
 CONTRIBUTING.md                   |  16 ++--
 doc/nvim-treesitter.txt           |  58 +++++++-------
 lua/nvim-treesitter/indent.lua    |  80 +++++++++++--------
 lua/nvim-treesitter/query.lua     |  44 +++++------
 queries/bass/indents.scm          |  12 +--
 queries/bibtex/indents.scm        |   6 +-
 queries/bicep/indents.scm         |  12 +--
 queries/c/indents.scm             |  61 ++++++++-------
 queries/capnp/indents.scm         |  22 +++---
 queries/chatito/indents.scm       |   4 +-
 queries/cpon/indents.scm          |  12 +--
 queries/cpp/indents.scm           |   9 ++-
 queries/css/indents.scm           |   8 +-
 queries/cue/indents.scm           |  12 +--
 queries/d/indents.scm             |   6 +-
 queries/dart/indents.scm          |  10 +--
 queries/devicetree/indents.scm    |   6 +-
 queries/ecma/indents.scm          |  32 ++++----
 queries/elixir/indents.scm        |   6 +-
 queries/elsa/indents.scm          |   4 +-
 queries/fish/indents.scm          |   6 +-
 queries/foam/indents.scm          |   6 +-
 queries/fortran/indents.scm       |   4 +-
 queries/fusion/indents.scm        |  14 ++--
 queries/gdscript/indents.scm      |  30 +++----
 queries/gleam/indents.scm         |   6 +-
 queries/go/indents.scm            |  16 ++--
 queries/graphql/indents.scm       |   4 +-
 queries/hare/indents.scm          |  14 ++--
 queries/hcl/indents.scm           |   8 +-
 queries/heex/indents.scm          |   6 +-
 queries/hjson/indents.scm         |   2 +-
 queries/html_tags/indents.scm     |  14 ++--
 queries/htmldjango/indents.scm    |   6 +-
 queries/java/indents.scm          |  13 +--
 queries/json/indents.scm          |   4 +-
 queries/jsonc/indents.scm         |   2 +-
 queries/jsx/indents.scm           |  12 +--
 queries/julia/indents.scm         |   6 +-
 queries/kdl/indents.scm           |   8 +-
 queries/ledger/indents.scm        |   2 +-
 queries/lua/indents.scm           |  13 +--
 queries/ninja/indents.scm         |   2 +-
 queries/pascal/indents.scm        |   6 +-
 queries/php/indents.scm           |  10 +--
 queries/poe_filter/indents.scm    |   6 +-
 queries/python/indents.scm        | 126 ++++++++++++++----------------
 queries/ql/indents.scm            |   8 +-
 queries/query/indents.scm         |   4 +-
 queries/r/indents.scm             |  16 ++--
 queries/rasi/indents.scm          |   6 +-
 queries/ron/indents.scm           |   8 +-
 queries/ruby/indents.scm          |   8 +-
 queries/rust/indents.scm          |  31 ++++----
 queries/scss/indents.scm          |   2 +-
 queries/slint/indents.scm         |   8 +-
 queries/smali/indents.scm         |   8 +-
 queries/sparql/indents.scm        |   4 +-
 queries/squirrel/indents.scm      |  24 +++---
 queries/starlark/indents.scm      |  42 +++++-----
 queries/supercollider/indents.scm |   6 +-
 queries/surface/indents.scm       |   4 +-
 queries/svelte/indents.scm        |   6 +-
 queries/tablegen/indents.scm      |  12 +--
 queries/teal/indents.scm          |   4 +-
 queries/thrift/indents.scm        |  16 ++--
 queries/tiger/indents.scm         |  80 +++++++++----------
 queries/toml/indents.scm          |   4 +-
 queries/turtle/indents.scm        |   4 +-
 queries/typescript/indents.scm    |   2 +-
 queries/ungrammar/indents.scm     |   4 +-
 queries/uxntal/indents.scm        |  12 +--
 queries/v/indents.scm             |   8 +-
 queries/vue/indents.scm           |   4 +-
 queries/wgsl/indents.scm          |  14 ++--
 queries/wgsl_bevy/indents.scm     |   2 +-
 queries/yaml/indents.scm          |   4 +-
 queries/yang/indents.scm          |  20 ++---
 queries/yuck/indents.scm          |  18 ++---
 queries/zig/indents.scm           |   8 +-
 80 files changed, 592 insertions(+), 575 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cea14ac53..d809bc784 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -315,14 +315,14 @@ the node describing the language and `@content` to describe the injection region
 ### Indents
 
 ```scheme
-@indent         ; indent children when matching this node
-@indent_end     ; marks the end of indented block
-@aligned_indent ; behaves like python aligned/hanging indent
-@dedent         ; dedent children when matching this node
-@branch         ; dedent itself when matching this node
-@ignore         ; do not indent in this node
-@auto           ; behaves like 'autoindent' buffer option
-@zero_indent    ; sets this node at position 0 (no indent)
+@indent.begin       ; indent children when matching this node
+@indent.end         ; marks the end of indented block
+@indent.align       ; behaves like python aligned/hanging indent
+@indent.dedent      ; dedent children when matching this node
+@indent.branch      ; dedent itself when matching this node
+@indent.ignore      ; do not indent in this node
+@indent.auto        ; behaves like 'autoindent' buffer option
+@indent.zero        ; sets this node at position 0 (no indent)
 ```
 
 [Matrix channel]: https://matrix.to/#/#nvim-treesitter:matrix.org
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 5509dc8af..f7a91b849 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -224,29 +224,29 @@ Supported options:
   }
 
 `@indent`				    *nvim-treesitter-indentation-queries*
-Queries can use the following captures: `@indent` and `@dedent`,
-`@branch`, `@indent_end` or `@aligned_indent`. An `@ignore` capture tells
-treesitter to ignore indentation and a `@zero_indent` capture sets
+Queries can use the following captures: `@indent.begin` and `@indent.dedent`,
+`@indent.branch`, `@indent.end` or `@indent.align`. An `@indent.ignore` capture tells
+treesitter to ignore indentation and a `@indent.zero` capture sets
 the indentation to 0.
 
-`@indent`				    *nvim-treesitter-indentation-indent*
-The `@indent` specifies that the next line should be indented.  Multiple
+`@indent.begin`			    *nvim-treesitter-indentation-indent.begin*
+The `@indent.begin` specifies that the next line should be indented.  Multiple
 indents on the same line get collapsed. Eg.
 
 >
   (
    (if_statement)
-   (ERROR "else") @indent
+   (ERROR "else") @indent.begin
   )
 <
-Indent can also have `immediate_indent` set using a `#set!` directive, which
+Indent can also have `indent.immediate` set using a `#set!` directive, which
 permits the next line to indent even when the block intended to be indented
 has no content yet, improving interactive typing.
 
 eg for python:
 >
- ((if_statement) @indent
-   (#set! "immediate_indent" 1))
+ ((if_statement) @indent.begin
+   (#set! indent.immediate 1))
 <
 
 Will allow:
@@ -254,19 +254,19 @@ Will allow:
   if True:<CR>
       # Auto indent to here
 
-`@indent_end`				*nvim-treesitter-indentation-indent_end*
-An `@indent_end` capture is used to specify that the indented region ends and
+`@indent.end`				*nvim-treesitter-indentation-indent.end*
+An `@indent.end` capture is used to specify that the indented region ends and
 any text subsequent to the capture should be dedented.  
 
-`@branch`				*nvim-treesitter-indentation-branch*
-An `@branch` capture is used to specify that a dedented region starts
+`@indent.branch`		    *nvim-treesitter-indentation-indent.branch*
+An `@indent.branch` capture is used to specify that a dedented region starts
 at the line including the captured nodes.
 
-`@dedent`				*nvim-treesitter-indentation-dedent*
-A `@dedent` capture specifies dedenting starting on the next line.
+`@indent.dedent`		    *nvim-treesitter-indentation-indent.dedent*
+A `@indent.dedent` capture specifies dedenting starting on the next line.
 >
-`@aligned_indent`			*nvim-treesitter-indentation-aligned_indent*
-Aligned indent blocks may be specified with the `@aligned_indent` capture.
+`@indent.align`		    *nvim-treesitter-indentation-aligned_indent.align*
+Aligned indent blocks may be specified with the `@indent.align` capture.
 This permits
 
 >
@@ -289,15 +289,15 @@ and finally
     c
   )
 <
-To specify the delimiters to use `open_delimiter` and `close_delimiter`
-should be used.  Eg.
+To specify the delimiters to use `indent.open_delimiter` and
+`indent.close_delimiter` should be used.  Eg.
 >
- ((argument_list) @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")"))
+ ((argument_list) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 <
 
-For some languages the last line of an `aligned_indent` block must not be
+For some languages the last line of an `indent.align` block must not be
 the same indent as the natural next line.
 
 For example in python:
@@ -314,17 +314,17 @@ Is not correct, whereas
       pass
 
 Would be correctly indented.  This behavior may be chosen using
-`avoid_last_matching_next`.  Eg.
+`indent.avoid_last_matching_next`.  Eg.
 
 >
  (if_statement
-  condition: (parenthesized_expression) @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")")
-  (#set! "avoid_last_matching_next" 1)
+  condition: (parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1)
  )
 <
-Could be used to specify that the last line of an `@aligned_indent` capture
+Could be used to specify that the last line of an `@indent.align` capture
 should be additionally indented to avoid clashing with the indent of the first
 line of the block inside an if.
 
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 932fa17ff..7290b3148 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -52,18 +52,31 @@ end
 
 local get_indents = tsutils.memoize_by_buf_tick(function(bufnr, root, lang)
   local map = {
-    auto = {},
-    indent = {},
-    indent_end = {},
-    dedent = {},
-    branch = {},
-    ignore = {},
-    aligned_indent = {},
-    zero_indent = {},
+    indent = {
+      auto = {},
+      begin = {},
+      ["end"] = {},
+      dedent = {},
+      branch = {},
+      ignore = {},
+      align = {},
+      zero = {},
+    },
   }
 
+  local function split(to_split)
+    local t = {}
+    for str in string.gmatch(to_split, "([^.]+)") do
+      table.insert(t, str)
+    end
+    return t
+  end
+
   for name, node, metadata in queries.iter_captures(bufnr, "indents", root, lang) do
-    map[name][node:id()] = metadata or {}
+    local path = split(name)
+    -- node may contain a period so append directly.
+    table.insert(path, node:id())
+    queries.insert_to_path(map, path, metadata or {})
   end
 
   return map
@@ -116,7 +129,7 @@ function M.get_indent(lnum)
   if is_empty_line then
     local prevlnum = vim.fn.prevnonblank(lnum)
     node = get_last_node_at_line(root, prevlnum)
-    if q.indent_end[node:id()] then
+    if q.indent["end"][node:id()] then
       node = get_first_node_at_line(root, lnum)
     end
   else
@@ -134,16 +147,16 @@ function M.get_indent(lnum)
   -- tracks to ensure multiple indent levels are not applied for same line
   local is_processed_by_row = {}
 
-  if q.zero_indent[node:id()] then
+  if q.indent.zero[node:id()] then
     return 0
   end
 
   while node do
     -- do 'autoindent' if not marked as @indent
     if
-      not q.indent[node:id()]
-      and not q.aligned_indent[node:id()]
-      and q.auto[node:id()]
+      not q.indent.begin[node:id()]
+      and not q.indent.align[node:id()]
+      and q.indent.auto[node:id()]
       and node:start() < lnum - 1
       and lnum - 1 <= node:end_()
     then
@@ -153,7 +166,12 @@ function M.get_indent(lnum)
     -- Do not indent if we are inside an @ignore block.
     -- If a node spans from L1,C1 to L2,C2, we know that lines where L1 < line <= L2 would
     -- have their indentations contained by the node.
-    if not q.indent[node:id()] and q.ignore[node:id()] and node:start() < lnum - 1 and lnum - 1 <= node:end_() then
+    if
+      not q.indent.begin[node:id()]
+      and q.indent.ignore[node:id()]
+      and node:start() < lnum - 1
+      and lnum - 1 <= node:end_()
+    then
       return 0
     end
 
@@ -163,7 +181,7 @@ function M.get_indent(lnum)
 
     if
       not is_processed_by_row[srow]
-      and ((q.branch[node:id()] and srow == lnum - 1) or (q.dedent[node:id()] and srow ~= lnum - 1))
+      and ((q.indent.branch[node:id()] and srow == lnum - 1) or (q.indent.dedent[node:id()] and srow ~= lnum - 1))
     then
       indent = indent - indent_size
       is_processed = true
@@ -179,16 +197,16 @@ function M.get_indent(lnum)
     if
       should_process
       and (
-        q.indent[node:id()]
-        and (srow ~= erow or is_in_err or q.indent[node:id()].immediate_indent)
-        and (srow ~= lnum - 1 or q.indent[node:id()].start_at_same_line)
+        q.indent.begin[node:id()]
+        and (srow ~= erow or is_in_err or q.indent.begin[node:id()]["indent.immediate"])
+        and (srow ~= lnum - 1 or q.indent.begin[node:id()]["indent.start_at_same_line"])
       )
     then
       indent = indent + indent_size
       is_processed = true
     end
 
-    if is_in_err and not q.aligned_indent[node:id()] then
+    if is_in_err and not q.indent.align[node:id()] then
       -- only when the node is in error, promote the
       -- first child's aligned indent to the error node
       -- to work around ((ERROR "X" . (_)) @aligned_indent (#set! "delimeter" "AB"))
@@ -196,25 +214,25 @@ function M.get_indent(lnum)
       -- (ERROR "X" @aligned_indent (#set! "delimeter" "AB") . (_))
       -- and we will fish it out here.
       for c in node:iter_children() do
-        if q.aligned_indent[c:id()] then
-          q.aligned_indent[node:id()] = q.aligned_indent[c:id()]
+        if q.indent.align[c:id()] then
+          q.indent.align[node:id()] = q.indent.align[c:id()]
           break
         end
       end
     end
     -- do not indent for nodes that starts-and-ends on same line and starts on target line (lnum)
-    if should_process and q.aligned_indent[node:id()] and (srow ~= erow or is_in_err) and (srow ~= lnum - 1) then
-      local metadata = q.aligned_indent[node:id()]
+    if should_process and q.indent.align[node:id()] and (srow ~= erow or is_in_err) and (srow ~= lnum - 1) then
+      local metadata = q.indent.align[node:id()]
       local o_delim_node, o_is_last_in_line ---@type TSNode|nil, boolean|nil
       local c_delim_node, c_is_last_in_line ---@type TSNode|nil, boolean|nil, boolean|nil
       local indent_is_absolute = false
-      if metadata.open_delimiter then
-        o_delim_node, o_is_last_in_line = find_delimiter(bufnr, node, metadata.open_delimiter)
+      if metadata["indent.open_delimiter"] then
+        o_delim_node, o_is_last_in_line = find_delimiter(bufnr, node, metadata["indent.open_delimiter"])
       else
         o_delim_node = node
       end
-      if metadata.close_delimiter then
-        c_delim_node, c_is_last_in_line = find_delimiter(bufnr, node, metadata.close_delimiter)
+      if metadata["indent.close_delimiter"] then
+        c_delim_node, c_is_last_in_line = find_delimiter(bufnr, node, metadata["indent.close_delimiter"])
       else
         c_delim_node = node
       end
@@ -245,7 +263,7 @@ function M.get_indent(lnum)
             -- Then its indent level shouldn't be affected by `@aligned_indent` node
             indent = math.max(indent - indent_size, 0)
           else
-            indent = o_scol + (metadata.increment or 1)
+            indent = o_scol + (metadata["indent.increment"] or 1)
             indent_is_absolute = true
           end
         end
@@ -254,9 +272,9 @@ function M.get_indent(lnum)
         if c_srow and c_srow ~= o_srow and c_srow == lnum - 1 then
           -- delims end on current line, and are not open and closed same line.
           -- then this last line may need additional indent to avoid clashes
-          -- with the next. `avoid_last_matching_next` controls this behavior,
+          -- with the next. `indent.avoid_last_matching_next` controls this behavior,
           -- for example this is needed for function parameters.
-          avoid_last_matching_next = metadata.avoid_last_matching_next or false
+          avoid_last_matching_next = metadata["indent.avoid_last_matching_next"] or false
         end
         if avoid_last_matching_next then
           -- last line must be indented more in cases where
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index 18c416a38..51310545b 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -213,6 +213,24 @@ local function prepare_query(bufnr, query_name, root, root_lang)
     }
 end
 
+-- Given a path (i.e. a List(String)) this functions inserts value at path
+---@param object any
+---@param path string[]
+---@param value any
+function M.insert_to_path(object, path, value)
+  local curr_obj = object
+
+  for index = 1, (#path - 1) do
+    if curr_obj[path[index]] == nil then
+      curr_obj[path[index]] = {}
+    end
+
+    curr_obj = curr_obj[path[index]]
+  end
+
+  curr_obj[path[#path]] = value
+end
+
 ---@param query Query
 ---@param bufnr integer
 ---@param start_row integer
@@ -230,24 +248,6 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
     return t
   end
 
-  -- Given a path (i.e. a List(String)) this functions inserts value at path
-  ---@param object any
-  ---@param path string[]
-  ---@param value any
-  local function insert_to_path(object, path, value)
-    local curr_obj = object
-
-    for index = 1, (#path - 1) do
-      if curr_obj[path[index]] == nil then
-        curr_obj[path[index]] = {}
-      end
-
-      curr_obj = curr_obj[path[index]]
-    end
-
-    curr_obj[path[#path]] = value
-  end
-
   local matches = query:iter_matches(qnode, bufnr, start_row, end_row)
 
   local function iterator()
@@ -260,9 +260,9 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
         local name = query.captures[id] -- name of the capture in the query
         if name ~= nil then
           local path = split(name .. ".node")
-          insert_to_path(prepared_match, path, node)
+          M.insert_to_path(prepared_match, path, node)
           local metadata_path = split(name .. ".metadata")
-          insert_to_path(prepared_match, metadata_path, metadata[id])
+          M.insert_to_path(prepared_match, metadata_path, metadata[id])
         end
       end
 
@@ -273,10 +273,10 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
         for _, pred in pairs(preds) do
           -- functions
           if pred[1] == "set!" and type(pred[2]) == "string" then
-            insert_to_path(prepared_match, split(pred[2]), pred[3])
+            M.insert_to_path(prepared_match, split(pred[2]), pred[3])
           end
           if pred[1] == "make-range!" and type(pred[2]) == "string" and #pred == 4 then
-            insert_to_path(
+            M.insert_to_path(
               prepared_match,
               split(pred[2] .. ".node"),
               tsrange.TSRange.from_nodes(bufnr, match[pred[3]], match[pred[4]])
diff --git a/queries/bass/indents.scm b/queries/bass/indents.scm
index f1f4e0ecf..60c5df4eb 100644
--- a/queries/bass/indents.scm
+++ b/queries/bass/indents.scm
@@ -2,21 +2,21 @@
   (list)
   (scope)
   (cons)
-] @indent
+] @indent.begin
 
 [
   ")"
   "}"
   "]"
-] @indent_end
+] @indent.end
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/bibtex/indents.scm b/queries/bibtex/indents.scm
index af652160e..1ba3e6b47 100644
--- a/queries/bibtex/indents.scm
+++ b/queries/bibtex/indents.scm
@@ -1,10 +1,10 @@
 [
  (entry)
-] @indent
+] @indent.begin
 
 [
  "{"
  "}"
-] @branch
+] @indent.branch
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/bicep/indents.scm b/queries/bicep/indents.scm
index 7fcf7ffb9..cf2e6e1c2 100644
--- a/queries/bicep/indents.scm
+++ b/queries/bicep/indents.scm
@@ -1,18 +1,18 @@
 [
   (array)
   (object)
-] @indent
+] @indent.begin
 
-"}" @indent_end
+"}" @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
 [
   (ERROR)
   (comment)
   (diagnostic_comment)
-] @auto
+] @indent.auto
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index bb8903d3d..71f47ced1 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -7,66 +7,66 @@
   (initializer_list)
   (init_declarator)
   (expression_statement)
-] @indent
+] @indent.begin
 
 (
   ERROR
-    "for" "(" @indent ";" ";" ")" @indent_end)
+    "for" "(" @indent.begin ";" ";" ")" @indent.end)
 (
   (for_statement
     body: (_) @_body
-  ) @indent
+  ) @indent.begin
   (#not-has-type? @_body compound_statement)
 )
 
 (
   while_statement
-    condition: (_) @indent
+    condition: (_) @indent.begin
 )
 (
   (while_statement
     body: (_) @_body
-  ) @indent
+  ) @indent.begin
   (#not-has-type? @_body compound_statement)
 )
 
 (
   (if_statement)
-  (ERROR "else") @indent
+  (ERROR "else") @indent.begin
 )
 
 (
  if_statement
-  condition: (_) @indent
+  condition: (_) @indent.begin
 )
-;; Make sure all cases of if-else are tagged with @indent
+;; Make sure all cases of if-else are tagged with @indent.begin
 ;; So we will offset the indents for the else case
 (
   (if_statement
     consequence: (compound_statement)
-    "else" @branch
+    "else" @indent.branch
     alternative: 
       [
-        [ "{" "}" ] @branch
-        (compound_statement ["{" "}"] @branch)
+        [ "{" "}" ] @indent.branch
+        (compound_statement ["{" "}"] @indent.branch)
         (_)
       ] 
-  ) @indent
+  ) @indent.begin
 )
 (
   (if_statement
-    consequence: (_ ";" @indent_end) @_consequence
-  ) @indent
+    consequence: (_ ";" @indent.end) @_consequence
+  ) @indent.begin
   (#not-has-type? @_consequence compound_statement)
 )
 (
   (if_statement
     consequence: (_) @_consequence
-    "else" @branch
+    "else" @indent.branch
     alternative: 
       [
-        [ "{" "}" ] @branch
-        (compound_statement ["{" "}"] @branch)
+        [ "{" "}" ] @indent.branch
+        (compound_statement ["{" "}"] @indent.branch)
         (_)
       ] 
   )
@@ -83,19 +83,19 @@
     consequence: (_)
     alternative: 
       [
-        (if_statement consequence: (compound_statement) @dedent)
+        (if_statement consequence: (compound_statement) @indent.dedent)
         (_)
-      ] @dedent
+      ] @indent.dedent
   )
 )
 
-(compound_statement "}" @indent_end)
+(compound_statement "}" @indent.end)
 
 [
   ")"
   "}"
   (statement_identifier)
-] @branch
+] @indent.branch
 
 [
   "#define"
@@ -105,18 +105,19 @@
   "#if"
   "#else"
   "#endif"
-] @zero_indent
+] @indent.zero
 
 [
   (preproc_arg)
   (string_literal)
-] @ignore
+] @indent.ignore
 
-((ERROR (parameter_declaration)) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
-([(argument_list) (parameter_list)] @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")"))
+((ERROR (parameter_declaration)) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+([(argument_list) (parameter_list)] @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+(comment) @indent.auto
 
-(comment) @auto
diff --git a/queries/capnp/indents.scm b/queries/capnp/indents.scm
index 601862d9d..e54ca9566 100644
--- a/queries/capnp/indents.scm
+++ b/queries/capnp/indents.scm
@@ -11,26 +11,26 @@
   (struct)
   (struct_shorthand)
   (union)
-] @indent
+] @indent.begin
 
-((struct_shorthand (property)) @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")"))
+((struct_shorthand (property)) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
-((const_list (const_value)) @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")"))
+((const_list (const_value)) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
 [
   "}"
   ")"
-] @indent_end
+] @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/chatito/indents.scm b/queries/chatito/indents.scm
index 849abadfc..64b4674b7 100644
--- a/queries/chatito/indents.scm
+++ b/queries/chatito/indents.scm
@@ -2,6 +2,6 @@
  (intent_def)
  (slot_def)
  (alias_def)
-] @indent
+] @indent.begin
 
-(ERROR "]") @indent
+(ERROR "]") @indent.begin
diff --git a/queries/cpon/indents.scm b/queries/cpon/indents.scm
index 477ea83b5..5f52ea6a1 100644
--- a/queries/cpon/indents.scm
+++ b/queries/cpon/indents.scm
@@ -3,21 +3,21 @@
   (map)
   (imap)
   (array)
-] @indent
+] @indent.begin
 
 [
   "]"
   "}"
   ">"
-] @indent_end
+] @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
-[ "<" ">" ] @branch
+[ "<" ">" ] @indent.branch
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/cpp/indents.scm b/queries/cpp/indents.scm
index f1007dd28..7df9aea0c 100644
--- a/queries/cpp/indents.scm
+++ b/queries/cpp/indents.scm
@@ -3,8 +3,9 @@
 [
   (class_specifier)
   (condition_clause)
-] @indent
+] @indent.begin
+
+((field_initializer_list) @indent.begin
+  (#set! indent.start_at_same_line 1))
+(access_specifier) @indent.branch
 
-((field_initializer_list) @indent
-  (#set! "start_at_same_line" 1))
-(access_specifier) @branch
diff --git a/queries/css/indents.scm b/queries/css/indents.scm
index 1ea8a336f..cd22ed66c 100644
--- a/queries/css/indents.scm
+++ b/queries/css/indents.scm
@@ -1,9 +1,9 @@
 [
   (block)
   (declaration)
-] @indent
+] @indent.begin
 
-(block ("}") @branch)
-("}") @dedent
+(block ("}") @indent.branch)
+("}") @indent.dedent
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/cue/indents.scm b/queries/cue/indents.scm
index 731e69b79..71a03a778 100644
--- a/queries/cue/indents.scm
+++ b/queries/cue/indents.scm
@@ -1,21 +1,21 @@
 [
   (import_spec_list)
   (field)
-] @indent
+] @indent.begin
 
 [
   "}"
   "]"
   ")"
-] @indent_end
+] @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/d/indents.scm b/queries/d/indents.scm
index 7a6df759c..9ced7527d 100644
--- a/queries/d/indents.scm
+++ b/queries/d/indents.scm
@@ -2,16 +2,16 @@
   (block_statement)
   (case_statement)
   (token_string)
-] @indent
+] @indent.begin
 
 [
   "(" ")"
   "{" "}"
   "[" "]"
-] @branch
+] @indent.branch
 
 [
   (line_comment)
   (block_comment)
   (nesting_block_comment)
-] @ignore
+] @indent.ignore
diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index ad0ba389e..0c7bfe92d 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -10,7 +10,7 @@
   (list_literal)
   (return_statement)
   (arguments)
-] @indent
+] @indent.begin
 
 [
   "("
@@ -19,13 +19,13 @@
   "}"
   "["
   "]"
-] @branch
+] @indent.branch
 
 [
  "}"
-] @indent_end
+] @indent.end
 
 ; this one is for dedenting the else block
-(if_statement (block) @branch)
+(if_statement (block) @indent.branch)
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/devicetree/indents.scm b/queries/devicetree/indents.scm
index cd7c8fcd6..6cfc81cf2 100644
--- a/queries/devicetree/indents.scm
+++ b/queries/devicetree/indents.scm
@@ -2,13 +2,13 @@
   (node)
   (property)
   (integer_cells)
-] @indent
+] @indent.begin
 
 [
   "}"
   ">"
-] @branch
+] @indent.branch
 
 [
   (comment)
-] @ignore
+] @indent.ignore
diff --git a/queries/ecma/indents.scm b/queries/ecma/indents.scm
index 1a5520e52..602b8d901 100644
--- a/queries/ecma/indents.scm
+++ b/queries/ecma/indents.scm
@@ -16,42 +16,42 @@
   (switch_statement)
   (template_substitution)
   (ternary_expression)
-] @indent
+] @indent.begin
 
-(arguments (call_expression) @indent)
-(binary_expression (call_expression) @indent)
-(expression_statement (call_expression) @indent)
+(arguments (call_expression) @indent.begin)
+(binary_expression (call_expression) @indent.begin)
+(expression_statement (call_expression) @indent.begin)
 (arrow_function
   body: (_) @_body
   (#not-has-type? @_body statement_block)
-) @indent
+) @indent.begin
 (assignment_expression
   right: (_) @_right
   (#not-has-type? @_right arrow_function function)
-) @indent
+) @indent.begin
 (variable_declarator
   value: (_) @_value
   (#not-has-type? @_value arrow_function call_expression function)
-) @indent
+) @indent.begin
 
-(arguments ")" @indent_end)
-(object "}" @indent_end)
-(statement_block "}" @indent_end)
+(arguments ")" @indent.end)
+(object "}" @indent.end)
+(statement_block "}" @indent.end)
 
 [
   (arguments (object))
   ")"
   "}"
   "]"
-] @branch
-(statement_block "{" @branch)
+] @indent.branch
+(statement_block "{" @indent.branch)
 
-(parenthesized_expression ("(" (_) ")" @indent_end))
-["}" "]"] @indent_end
+(parenthesized_expression ("(" (_) ")" @indent.end))
+["}" "]"] @indent.end
 
 [
   (comment)
   (template_string)
-] @ignore
+] @indent.ignore
 
-(ERROR) @auto
+(ERROR) @indent.auto
diff --git a/queries/elixir/indents.scm b/queries/elixir/indents.scm
index 517f66940..0ba8fd442 100644
--- a/queries/elixir/indents.scm
+++ b/queries/elixir/indents.scm
@@ -6,7 +6,7 @@
   (stab_clause)
   (tuple)
   (arguments)
-] @indent
+] @indent.begin
 
 [
   ")"
@@ -17,7 +17,7 @@
   "rescue"
   "}"
   "end"
-] @indent_end @branch
+] @indent.end @indent.branch
 
 ; Elixir pipelines are not indented, but other binary operator chains are
-((binary_operator operator: _ @_operator) @indent (#not-eq? @_operator "|>"))
+((binary_operator operator: _ @_operator) @indent.begin (#not-eq? @_operator "|>"))
diff --git a/queries/elsa/indents.scm b/queries/elsa/indents.scm
index fa51b1cf0..6ddd1aa64 100644
--- a/queries/elsa/indents.scm
+++ b/queries/elsa/indents.scm
@@ -1,6 +1,6 @@
-(reduction) @indent
+(reduction) @indent.begin
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/fish/indents.scm b/queries/fish/indents.scm
index cf8d62658..0a825a13f 100644
--- a/queries/fish/indents.scm
+++ b/queries/fish/indents.scm
@@ -5,12 +5,12 @@
  (if_statement)
  (begin_statement)
  (switch_statement)
-] @indent
+] @indent.begin
 
 [
  (else_if_clause)
  (else_clause)
  "end"
-] @branch
+] @indent.branch
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/foam/indents.scm b/queries/foam/indents.scm
index 033700c17..a52cafea6 100644
--- a/queries/foam/indents.scm
+++ b/queries/foam/indents.scm
@@ -1,11 +1,11 @@
 [
   "{"
   "}"
-] @branch
+] @indent.branch
 
-[(dict) (key_value)] @indent
+[(dict) (key_value)] @indent.begin
 
 
 [
   (comment)
-] @ignore
+] @indent.ignore
diff --git a/queries/fortran/indents.scm b/queries/fortran/indents.scm
index 67fa046de..86704c4f4 100644
--- a/queries/fortran/indents.scm
+++ b/queries/fortran/indents.scm
@@ -9,7 +9,7 @@
   (where_statement)
   (derived_type_definition)
   (enum)
-] @indent
+] @indent.begin
 
 [
   (end_module_statement)
@@ -24,4 +24,4 @@
   (end_type_statement)
   (end_enum_statement)
   (end_where_statement)
-] @branch
+] @indent.branch
diff --git a/queries/fusion/indents.scm b/queries/fusion/indents.scm
index 68c57d528..73133191b 100644
--- a/queries/fusion/indents.scm
+++ b/queries/fusion/indents.scm
@@ -5,15 +5,15 @@
   (afx_element_self_closing)
   (eel_array)
   (eel_object)
-] @indent
+] @indent.begin
 
 
-(block end: _ @branch)
-(value_dsl end: _ @branch)
-(eel_array end: _ @branch)
-(eel_object end: _ @branch)
+(block end: _ @indent.branch)
+(value_dsl end: _ @indent.branch)
+(eel_array end: _ @indent.branch)
+(eel_object end: _ @indent.branch)
 [
   (afx_closing_element)
-] @branch
+] @indent.branch
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/gdscript/indents.scm b/queries/gdscript/indents.scm
index b7c0ac836..4eb579b22 100644
--- a/queries/gdscript/indents.scm
+++ b/queries/gdscript/indents.scm
@@ -12,12 +12,12 @@
   (match_body)
   (set_body)
   (get_body)
-] @indent
+] @indent.begin
 
 [
   (elif_clause)
   (else_clause)
-] @branch
+] @indent.branch
 
 [
  (string)
@@ -26,46 +26,46 @@
  (dictionary)
  (parenthesized_expression)
  (ERROR)
-] @auto
+] @indent.auto
 
 [
   (pass_statement)
   (continue_statement)
   (break_statement)
   (return_statement)
-] @dedent
+] @indent.dedent
 
 [
   (ERROR "[")
   (ERROR "(")
   (ERROR "{")
-] @indent
+] @indent.begin
 
 ;; This only works with expanded tabs.
-; ((parameters) @aligned_indent (#set! "open_delimiter" "(") (#set! "close_delimiter" ")"))
-; ((arguments)  @aligned_indent (#set! "open_delimiter" "(") (#set! "close_delimiter" ")"))
+; ((parameters) @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")"))
+; ((arguments)  @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")"))
 
 ;; The following queries either do not agree with the current body parsing or are
 ;; attempted workarounds. Specifically as the last statement of a body. Opening
 ;; a new line in between statements works well.
 ;;
-;; The overall experience is poor, so I've opted for @auto.
+;; The overall experience is poor, so I've opted for @indent.auto.
 ;;
 ;; The gdscript parser will need to be patched to accommodate more interactive
 ;; edits. As far as I can tell the parser greedily consumes whitespace
 ;; as a zero-width token which causes trouble when inserting indents.
 
 ;; This indents correctly with tabs.
-; (arguments) @indent
-; (parameters) @indent
-; (array) @indent
-; (dictionary) @indent
-; (parenthesized_expression) @indent
+; (arguments) @indent.begin
+; (parameters) @indent.begin
+; (array) @indent.begin
+; (dictionary) @indent.begin
+; (parenthesized_expression) @indent.begin
 
 ;; Partial workaround for when the cursor is on the bracket character and a newline
 ;; is created with <o>. Without this the newline is opened with extra
 ;; indentation.
-; (body (_ (array "]" @indent_end) ) _)
+; (body (_ (array "]" @indent.end) ) _)
 ;; Problematic behaviors occur at the last statement of a body.
 ;; with @dedent:
 ;;   - [ | ] i<CR> will dedent ] to 0.
@@ -75,4 +75,4 @@
 ;;   - [ | ] i<CR> same
 ;;   - [
 ;;   ]| o will open new line with extra indent.
-;(body (_ (array "]" @auto) ) .)
+;(body (_ (array "]" @indent.auto) ) .)
diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
index 61986b26f..f19e28318 100644
--- a/queries/gleam/indents.scm
+++ b/queries/gleam/indents.scm
@@ -18,13 +18,13 @@
   (todo)
   (try)
   (tuple)
-] @indent
+] @indent.begin
 
 [
   ")"
   "]"
   "}"
-] @indent_end @branch
+] @indent.end @indent.branch
 
 ; Gleam pipelines are not indented, but other binary expression chains are
-((binary_expression operator: _ @_operator) @indent (#not-eq? @_operator "|>"))
+((binary_expression operator: _ @_operator) @indent.begin (#not-eq? @_operator "|>"))
diff --git a/queries/go/indents.scm b/queries/go/indents.scm
index fe6e447eb..5f0039ac4 100644
--- a/queries/go/indents.scm
+++ b/queries/go/indents.scm
@@ -13,21 +13,21 @@
   (call_expression)
   (parameter_list)
   (struct_type)
-] @indent
+] @indent.begin
 
 [
   "}"
-] @branch
+] @indent.branch
 
-(const_declaration ")" @branch)
-(import_spec_list ")" @branch)
-(var_declaration ")" @branch)
+(const_declaration ")" @indent.branch)
+(import_spec_list ")" @indent.branch)
+(var_declaration ")" @indent.branch)
 
 [
  "}"
  ")"
-] @indent_end
+] @indent.end
 
-(parameter_list ")" @branch)
+(parameter_list ")" @indent.branch)
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/graphql/indents.scm b/queries/graphql/indents.scm
index 0f222b6d4..df47aff88 100644
--- a/queries/graphql/indents.scm
+++ b/queries/graphql/indents.scm
@@ -1,9 +1,9 @@
 [
   (definition)
   (selection)
-] @indent
+] @indent.begin
 
 [
   "{"
   "}"
-] @branch
+] @indent.branch
diff --git a/queries/hare/indents.scm b/queries/hare/indents.scm
index 0324f09c6..b3aadcd6e 100644
--- a/queries/hare/indents.scm
+++ b/queries/hare/indents.scm
@@ -12,25 +12,25 @@
   (array_literal)
   (struct_literal)
   (tuple_literal)
-] @indent
+] @indent.begin
 
 (if_statement
-   ("(" condition: (_) ")") @indent)
+   ("(" condition: (_) ")") @indent.begin)
 
 [
   "}"
   "]"
   ")"
-] @indent_end
+] @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
 [
   (ERROR)
   (comment)
   (concatenated_string)
-] @auto
+] @indent.auto
diff --git a/queries/hcl/indents.scm b/queries/hcl/indents.scm
index d68ec3081..93264de9d 100644
--- a/queries/hcl/indents.scm
+++ b/queries/hcl/indents.scm
@@ -3,13 +3,13 @@
   (object)
   (tuple)
   (function_call)
-] @indent
+] @indent.begin
 
 [
   "]"
   ")"
   "}"
-] @branch @indent_end
+] @indent.branch @indent.end
 
-(comment) @auto
-(ERROR) @auto
+(comment) @indent.auto
+(ERROR) @indent.auto
diff --git a/queries/heex/indents.scm b/queries/heex/indents.scm
index 99fc693dc..82a2f8912 100644
--- a/queries/heex/indents.scm
+++ b/queries/heex/indents.scm
@@ -3,18 +3,18 @@
   (component)
   (slot)
   (tag)
-] @indent
+] @indent.begin
 
 ; Dedent at the end of each tag, component, and slot
 [
   (end_component)
   (end_slot)
   (end_tag)
-] @branch @dedent
+] @indent.branch @indent.dedent
 
 ; Self-closing tags and components should not change
 ; indentation level of sibling nodes
 [
   (self_closing_component)
   (self_closing_tag)
-] @auto
+] @indent.auto
diff --git a/queries/hjson/indents.scm b/queries/hjson/indents.scm
index 26a42eeda..3b01ca999 100644
--- a/queries/hjson/indents.scm
+++ b/queries/hjson/indents.scm
@@ -1,3 +1,3 @@
 ; inherits: json
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/html_tags/indents.scm b/queries/html_tags/indents.scm
index 1e4d4707f..2d9fd3864 100644
--- a/queries/html_tags/indents.scm
+++ b/queries/html_tags/indents.scm
@@ -7,7 +7,7 @@
     (#not-any-of? @_not_special "meta" "link")
   )
   (element (self_closing_tag))
-] @indent
+] @indent.begin
 
 ; These tags are usually written one-lined and doesn't use self-closing tags so special-cased them
 ; but add indent to the tag to make sure attributes inside them are still indented if written multi-lined
@@ -15,20 +15,20 @@
   (start_tag 
      (tag_name) @_special)
   (#any-of? @_special "meta" "link")
-) @indent
+) @indent.begin
 
 
 ; These are the nodes that will be captured when we do `normal o`
 ; But last element has already been ended, so capturing this
 ; to mark end of last element
-(element (end_tag [">"] @indent_end))
-(element (self_closing_tag "/>" @indent_end))
+(element (end_tag [">"] @indent.end))
+(element (self_closing_tag "/>" @indent.end))
 
 ; Script/style elements aren't indented, so only branch the end tag of other elements
-(element (end_tag) @branch)
+(element (end_tag) @indent.branch)
 [
   ">"
   "/>"
-] @branch
+] @indent.branch
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/htmldjango/indents.scm b/queries/htmldjango/indents.scm
index 8fa0a456c..fd3d86502 100644
--- a/queries/htmldjango/indents.scm
+++ b/queries/htmldjango/indents.scm
@@ -1,3 +1,3 @@
-(paired_statement) @indent
-(end_paired_statement) @indent_end
-(branch_statement) @branch
+(paired_statement) @indent.begin
+(end_paired_statement) @indent.end
+(branch_statement) @indent.branch
diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index 033c314ec..017646e5b 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -8,9 +8,9 @@
   (array_initializer)
   (argument_list)
   (formal_parameters)
-] @indent
+] @indent.begin
 
-(expression_statement (method_invocation) @indent)
+(expression_statement (method_invocation) @indent.begin)
 
 [
   "("
@@ -19,13 +19,14 @@
   "}"
   "["
   "]"
-] @branch
+] @indent.branch
 
-"}" @indent_end
+"}" @indent.end
 
-(line_comment) @ignore
+(line_comment) @indent.ignore
 
 [
   (ERROR)
   (block_comment)
-] @auto
+] @indent.auto
+
diff --git a/queries/json/indents.scm b/queries/json/indents.scm
index 0345b945b..8274ee3d5 100644
--- a/queries/json/indents.scm
+++ b/queries/json/indents.scm
@@ -1,9 +1,9 @@
 [
   (object)
   (array)
-] @indent
+] @indent.begin
 
 [
   "}"
   "]"
-] @branch
+] @indent.branch
diff --git a/queries/jsonc/indents.scm b/queries/jsonc/indents.scm
index 26a42eeda..3b01ca999 100644
--- a/queries/jsonc/indents.scm
+++ b/queries/jsonc/indents.scm
@@ -1,3 +1,3 @@
 ; inherits: json
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/jsx/indents.scm b/queries/jsx/indents.scm
index 81ef8b238..3355061e1 100644
--- a/queries/jsx/indents.scm
+++ b/queries/jsx/indents.scm
@@ -3,19 +3,19 @@
   (jsx_element)
   (jsx_self_closing_element)
   (jsx_expression)
-] @indent
+] @indent.begin
 
 (jsx_fragment
-  ("<" ">" (_) "<" @branch "/" ">" @indent_end)
+  ("<" ">" (_) "<" @indent.branch "/" ">" @indent.end)
 )
 
-(jsx_closing_element (">" @indent_end))
-(jsx_self_closing_element ">" @indent_end)
+(jsx_closing_element (">" @indent.end))
+(jsx_self_closing_element ">" @indent.end)
 
 [
   (jsx_closing_element)
   ">"
-] @branch
+] @indent.branch
 ; <button
 ; />
-(jsx_self_closing_element "/" @branch)
+(jsx_self_closing_element "/" @indent.branch)
diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm
index 5e88c697c..142dee473 100644
--- a/queries/julia/indents.scm
+++ b/queries/julia/indents.scm
@@ -22,7 +22,7 @@
   (comprehension_expression)
   (matrix_expression)
   (vector_expression)
-] @indent
+] @indent.begin
 
 [
   "end"
@@ -34,10 +34,10 @@
   (elseif_clause)
   (catch_clause)
   (finally_clause)
-] @branch
+] @indent.branch
 
 [
   (line_comment)
   (block_comment)
-] @ignore
+] @indent.ignore
 
diff --git a/queries/kdl/indents.scm b/queries/kdl/indents.scm
index 3bb1ee66d..c14fec5cb 100644
--- a/queries/kdl/indents.scm
+++ b/queries/kdl/indents.scm
@@ -1,7 +1,7 @@
-(node (node_children) @indent)
+(node (node_children) @indent.begin)
 
-"}" @indent_end
+"}" @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
diff --git a/queries/ledger/indents.scm b/queries/ledger/indents.scm
index af74b1d41..31e7f56df 100644
--- a/queries/ledger/indents.scm
+++ b/queries/ledger/indents.scm
@@ -1,3 +1,3 @@
 [
     (journal_item)
-] @indent
+] @indent.begin
diff --git a/queries/lua/indents.scm b/queries/lua/indents.scm
index f23e7cc99..1125e6485 100644
--- a/queries/lua/indents.scm
+++ b/queries/lua/indents.scm
@@ -13,17 +13,17 @@
   (table_constructor)
   (arguments)
   (return_statement)
-] @indent
+] @indent.begin
 
 [
   "end"
   ")"
   "}"
-] @indent_end
+] @indent.end
 
 (return_statement
   (expression_list
-    (function_call))) @dedent
+    (function_call))) @indent.dedent
 
 [
   "end"
@@ -35,8 +35,9 @@
   (elseif_statement)
   "else"
   (else_statement)
-] @branch
+] @indent.branch
 
-(comment) @auto
+(comment) @indent.auto
+
+(string) @indent.auto
 
-(string) @auto
diff --git a/queries/ninja/indents.scm b/queries/ninja/indents.scm
index 088dec2cd..19f20dff5 100644
--- a/queries/ninja/indents.scm
+++ b/queries/ninja/indents.scm
@@ -2,5 +2,5 @@
   (pool)
   (rule)
   (build)
-] @indent
+] @indent.begin
 
diff --git a/queries/pascal/indents.scm b/queries/pascal/indents.scm
index 829054ddb..bbeea0089 100644
--- a/queries/pascal/indents.scm
+++ b/queries/pascal/indents.scm
@@ -14,9 +14,9 @@
 	(recInitializer)
 	(arrInitializer)
 	(defaultValue)
-] @indent
+] @indent.begin
 
-(defProc (block) @indent)
+(defProc (block) @indent.begin)
 
 [
 	(kEnd)
@@ -29,4 +29,4 @@
 	(declSection)
 	"]"
 	")"
-] @branch
+] @indent.branch
diff --git a/queries/php/indents.scm b/queries/php/indents.scm
index 1a2bb9017..c490ad77f 100644
--- a/queries/php/indents.scm
+++ b/queries/php/indents.scm
@@ -11,18 +11,18 @@
   (match_block)
   (case_statement)
   "["
-] @indent
+] @indent.begin
 
 [
   ")"
   "}"
   "]"
-] @branch
+] @indent.branch
 
 [
   (comment)
-] @auto
+] @indent.auto
 
-(compound_statement "}" @indent_end)
+(compound_statement "}" @indent.end)
 
-(ERROR) @auto
+(ERROR) @indent.auto
diff --git a/queries/poe_filter/indents.scm b/queries/poe_filter/indents.scm
index c096da418..78b7a2ed1 100644
--- a/queries/poe_filter/indents.scm
+++ b/queries/poe_filter/indents.scm
@@ -1,5 +1,5 @@
-(block) @indent
+(block) @indent.begin
 
-(ERROR) @auto
+(ERROR) @indent.auto
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index 166787f28..01933641b 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -14,97 +14,91 @@
   (lambda)
 
   (concatenated_string)
-] @indent
+] @indent.begin
 
-((list) @aligned_indent
- (#set! "open_delimiter" "[")
- (#set! "close_delimiter" "]")
- (#set! "dedent_lone_close_delimiter" 1)
+((list) @indent.align
+ (#set! indent.open_delimiter "[")
+ (#set! indent.close_delimiter "]")
 )
-((dictionary) @aligned_indent
- (#set! "open_delimiter" "{")
- (#set! "close_delimiter" "}")
- (#set! "dedent_lone_close_delimiter" 1)
+((dictionary) @indent.align
+ (#set! indent.open_delimiter "{")
+ (#set! indent.close_delimiter "}")
 )
-((set) @aligned_indent
- (#set! "open_delimiter" "{")
- (#set! "close_delimiter" "}")
- (#set! "dedent_lone_close_delimiter" 1)
+((set) @indent.align
+ (#set! indent.open_delimiter "{")
+ (#set! indent.close_delimiter "}")
 )
 
-((for_statement) @indent
- (#set! "immediate_indent" 1))
-((if_statement) @indent
- (#set! "immediate_indent" 1))
-((while_statement) @indent
- (#set! "immediate_indent" 1))
-((try_statement) @indent
- (#set! "immediate_indent" 1))
-(ERROR "try" ":" @indent (#set! "immediate_indent" 1))
-((function_definition) @indent
- (#set! "immediate_indent" 1))
-((class_definition) @indent
- (#set! "immediate_indent" 1))
-((with_statement) @indent
- (#set! "immediate_indent" 1))
+((for_statement) @indent.begin
+ (#set! indent.immediate 1))
+((if_statement) @indent.begin
+ (#set! indent.immediate 1))
+((while_statement) @indent.begin
+ (#set! indent.immediate 1))
+((try_statement) @indent.begin
+ (#set! indent.immediate 1))
+(ERROR "try" ":" @indent.begin (#set! indent.immediate 1))
+((function_definition) @indent.begin
+ (#set! indent.immediate 1))
+((class_definition) @indent.begin
+ (#set! indent.immediate 1))
+((with_statement) @indent.begin
+ (#set! indent.immediate 1))
 
 (if_statement
-  condition: (parenthesized_expression) @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")")
-  (#set! "avoid_last_matching_next" 1)
+  condition: (parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1)
 )
 (while_statement
-  condition: (parenthesized_expression) @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")")
-  (#set! "avoid_last_matching_next" 1)
+  condition: (parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1)
 )
 
-(ERROR "(" @aligned_indent (#set! "open_delimiter" "(") (#set! "close_delimiter" ")") . (_)) 
-((argument_list) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
-((parameters) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")")
- (#set! "avoid_last_matching_next" 1))
-((tuple) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
+(ERROR "(" @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")") . (_)) 
+((argument_list) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+((parameters) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")")
+ (#set! indent.avoid_last_matching_next 1))
+((tuple) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
 
-(ERROR "[" @aligned_indent (#set! "open_delimiter" "[") (#set! "close_delimiter" "]") . (_)) 
-(list "]" @indent_end)
+(ERROR "[" @indent.align (#set! indent.open_delimiter "[") (#set! indent.close_delimiter "]") . (_)) 
 
-(ERROR "{" @aligned_indent (#set! "open_delimiter" "{") (#set! "close_delimiter" "}") . (_)) 
-(dictionary "}" @indent_end)
-(set "}" @indent_end)
+(ERROR "{" @indent.align (#set! indent.open_delimiter "{") (#set! indent.close_delimiter "}") . (_)) 
 
-(parenthesized_expression ")" @indent_end)
-(generator_expression ")" @indent_end)
-(list_comprehension "]" @indent_end)
-(set_comprehension "}" @indent_end)
-(dictionary_comprehension "}" @indent_end)
+(parenthesized_expression ")" @indent.end)
+(generator_expression ")" @indent.end)
+(list_comprehension "]" @indent.end)
+(set_comprehension "}" @indent.end)
+(dictionary_comprehension "}" @indent.end)
 
-(tuple_pattern ")" @indent_end)
-(list_pattern "]" @indent_end)
+(tuple_pattern ")" @indent.end)
+(list_pattern "]" @indent.end)
 
 
 (return_statement
   [
-    (_) @indent_end 
+    (_) @indent.end
     (_
       [
         (_)
         ")"
         "}"
         "]"
-      ] @indent_end .)
+      ] @indent.end .)
     (attribute 
-      attribute: (_) @indent_end)
+      attribute: (_) @indent.end)
     (call
-      arguments: (_ ")" @indent_end))
-    "return" @indent_end
+      arguments: (_ ")" @indent.end))
+    "return" @indent.end
   ] .)
 
 [
@@ -115,7 +109,7 @@
   (else_clause)
   (except_clause)
   (finally_clause)
-] @branch
+] @indent.branch
 
-(string) @auto
+(string) @indent.auto
 
diff --git a/queries/ql/indents.scm b/queries/ql/indents.scm
index 8e5831738..1a4a1bdea 100644
--- a/queries/ql/indents.scm
+++ b/queries/ql/indents.scm
@@ -4,20 +4,20 @@
   (classMember)
   (classlessPredicate)
   (quantified)
-] @indent
+] @indent.begin
 
 [
   ")"
   "}"
-] @indent_end
+] @indent.end
 
 [
   ")"
   "}"
-] @branch
+] @indent.branch
 
 [
   (block_comment)
   (line_comment)
   (qldoc)
-] @ignore
+] @indent.ignore
diff --git a/queries/query/indents.scm b/queries/query/indents.scm
index 0df23706f..7c53fa1ad 100644
--- a/queries/query/indents.scm
+++ b/queries/query/indents.scm
@@ -1,8 +1,8 @@
 [
   (list)
-] @indent
+] @indent.begin
 
 [
   "["
   "]"
-] @branch
+] @indent.begin
diff --git a/queries/r/indents.scm b/queries/r/indents.scm
index c0551eaea..3b9e495ad 100644
--- a/queries/r/indents.scm
+++ b/queries/r/indents.scm
@@ -10,24 +10,24 @@
   "while"
   "repeat"
   "for"
-] @indent
+] @indent.begin
 
-((binary operator: (special)) @indent)
+((binary operator: (special)) @indent.begin)
 
 [
   "}"
   ")"
-] @branch
+] @indent.branch
 
-((formal_parameters (identifier)) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
+((formal_parameters (identifier)) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
 
 [
   ")"
   "}"
-] @indent_end
+] @indent.end
 
 [
   (comment)
-] @ignore
+] @indent.ignore
diff --git a/queries/rasi/indents.scm b/queries/rasi/indents.scm
index ad8fe49bf..398cf8b8f 100644
--- a/queries/rasi/indents.scm
+++ b/queries/rasi/indents.scm
@@ -1,5 +1,5 @@
-(rule_set) @indent
+(rule_set) @indent.begin
 
-(block "}" @branch)
+(block "}" @indent.branch)
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/ron/indents.scm b/queries/ron/indents.scm
index 84701a7e9..7fd9a5ff2 100644
--- a/queries/ron/indents.scm
+++ b/queries/ron/indents.scm
@@ -3,10 +3,10 @@
   (map)
   (tuple)
   (struct)
-] @indent
+] @indent.begin
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
diff --git a/queries/ruby/indents.scm b/queries/ruby/indents.scm
index 8101b1ab7..b76732922 100644
--- a/queries/ruby/indents.scm
+++ b/queries/ruby/indents.scm
@@ -19,14 +19,14 @@
   (unless)
   (assignment)
   (parenthesized_statements)
-] @indent
+] @indent.begin
 
 [
   "end"
   ")"
   "}"
   "]"
-] @indent_end
+] @indent.end
 
 [
   "end"
@@ -38,6 +38,6 @@
   (else)
   (rescue)
   (ensure)
-] @branch
+] @indent.branch
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index 7eb1539e0..0546efd25 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -22,38 +22,39 @@
   (parameters)
   (token_tree)
   (macro_definition)
-] @indent
-(trait_item body: (_) @indent)
-(string_literal (escape_sequence)) @indent
+] @indent.begin
+(trait_item body: (_) @indent.begin)
+(string_literal (escape_sequence)) @indent.begin
 
-(block "}" @indent_end)
+(block "}" @indent.end)
 (enum_item
-  body: (enum_variant_list "}" @indent_end))
+  body: (enum_variant_list "}" @indent.end))
 (impl_item
-  body: (declaration_list "}" @indent_end))
+  body: (declaration_list "}" @indent.end))
 (match_expression
-  body: (match_block "}" @indent_end))
+  body: (match_block "}" @indent.end))
 (mod_item
-  body: (declaration_list "}" @indent_end))
+  body: (declaration_list "}" @indent.end))
 (struct_item
-  body: (field_declaration_list "}" @indent_end))
+  body: (field_declaration_list "}" @indent.end))
 (trait_item
-  body: (declaration_list "}" @indent_end))
+  body: (declaration_list "}" @indent.end))
 
-(impl_item (where_clause) @dedent)
+(impl_item (where_clause) @indent.dedent)
 
 [
   "where"
   ")"
   "]"
   "}"
-] @branch
-(impl_item (declaration_list) @branch)
+] @indent.branch
+(impl_item (declaration_list) @indent.branch)
 
 [
   (line_comment)
   (string_literal)
-] @ignore
+] @indent.ignore
 
 
-(raw_string_literal) @auto
+(raw_string_literal) @indent.auto
+
diff --git a/queries/scss/indents.scm b/queries/scss/indents.scm
index 2889ddca7..902eee7bb 100644
--- a/queries/scss/indents.scm
+++ b/queries/scss/indents.scm
@@ -4,4 +4,4 @@
  (mixin_statement)
  (while_statement)
  (each_statement)
-] @indent
+] @indent.begin
diff --git a/queries/slint/indents.scm b/queries/slint/indents.scm
index 44e426493..db79aa0d5 100644
--- a/queries/slint/indents.scm
+++ b/queries/slint/indents.scm
@@ -5,10 +5,10 @@
 (handler_body)
 (consequence_body)
 (global_single)
-] @indent
+] @indent.begin
 
-"}" @indent_end
+"}" @indent.end
 
-(comment) @auto
+(comment) @indent.auto
 
-(string_literal) @auto
+(string_literal) @indent.auto
diff --git a/queries/smali/indents.scm b/queries/smali/indents.scm
index 871362cbd..cdfd9081e 100644
--- a/queries/smali/indents.scm
+++ b/queries/smali/indents.scm
@@ -9,7 +9,7 @@
   (sparse_switch_directive)
   (subannotation_directive)
   (list)
-] @indent
+] @indent.begin
 
 [
   ".end annotation"
@@ -22,11 +22,11 @@
   ".end sparse-switch"
   ".end subannotation"
   "}"
-] @indent_end
+] @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/sparql/indents.scm b/queries/sparql/indents.scm
index a154522a5..a0cee376c 100644
--- a/queries/sparql/indents.scm
+++ b/queries/sparql/indents.scm
@@ -8,10 +8,10 @@
   (data_block)
   (blank_node_property_list)
   (collection)
-] @indent
+] @indent.begin
 [
   "}"
   "]"
   ")"
   (triples_same_subject)
-] @branch
+] @indent.branch
diff --git a/queries/squirrel/indents.scm b/queries/squirrel/indents.scm
index 6649b732b..0dbbab416 100644
--- a/queries/squirrel/indents.scm
+++ b/queries/squirrel/indents.scm
@@ -15,39 +15,39 @@
   (foreach_statement)
   ; (try_statement)
   (catch_statement)
-] @indent
+] @indent.begin
 
 (
   (if_statement)
-  (ERROR "else") @indent
+  (ERROR "else") @indent.begin
 )
 
 (if_statement
-  condition: (_) @indent)
+  condition: (_) @indent.begin)
 
 (if_statement
   consequence: (_)
-  (else_statement) @indent)
+  (else_statement) @indent.begin)
 
 (do_while_statement
   "do"
-  (_) @indent)
+  (_) @indent.begin)
 
 (try_statement
-  (_) @indent
-  (catch_statement) @indent)
+  (_) @indent.begin
+  (catch_statement) @indent.begin)
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
 [
   "}"
   ")"
   "]"
-] @indent_end
+] @indent.end
 
 [
   (ERROR)
@@ -55,4 +55,4 @@
 
   (string)
   (verbatim_string)
-] @auto
+] @indent.auto
diff --git a/queries/starlark/indents.scm b/queries/starlark/indents.scm
index 1b18664c5..d87a8bc7f 100644
--- a/queries/starlark/indents.scm
+++ b/queries/starlark/indents.scm
@@ -19,28 +19,28 @@
 
   (lambda)
   (function_definition)
-] @indent
+] @indent.begin
 
 (if_statement
-  condition: (parenthesized_expression) @aligned_indent
-  (#set! "open_delimiter" "(")
-  (#set! "close_delimiter" ")")
+  condition: (parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
 )
-((ERROR "(" . (_)) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
-((argument_list) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
-((argument_list) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
-((parameters) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
-((tuple) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
+((ERROR "(" . (_)) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+((argument_list) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+((argument_list) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+((parameters) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+((tuple) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
 
 [
   ")"
@@ -48,6 +48,6 @@
   "}"
   (elif_clause)
   (else_clause)
-] @branch
+] @indent.branch
 
-(string) @auto
+(string) @indent.auto
diff --git a/queries/supercollider/indents.scm b/queries/supercollider/indents.scm
index c0be0cbaa..41241c6ec 100644
--- a/queries/supercollider/indents.scm
+++ b/queries/supercollider/indents.scm
@@ -13,7 +13,7 @@
   (variable_definition_sequence (variable_definition))
   (control_structure)
   (return_statement)
-] @indent
+] @indent.begin
 
 [
   (parameter_call_list (argument_calls))
@@ -23,9 +23,9 @@
   "}"
   "["
   "]"
-] @branch
+] @indent.branch
 
 [
   (block_comment)
   (line_comment)
-] @ignore
+] @indent.ignore
diff --git a/queries/surface/indents.scm b/queries/surface/indents.scm
index dceea9c7e..b9321b7ca 100644
--- a/queries/surface/indents.scm
+++ b/queries/surface/indents.scm
@@ -3,7 +3,7 @@
   (component)
   (tag)
   (block)
-] @indent
+] @indent.begin
 
 ; Dedent at the end of each tag, as well as a subblock
 [
@@ -11,4 +11,4 @@
   (end_component)
   (end_block)
   (subblock)
-] @branch
+] @indent.branch
diff --git a/queries/svelte/indents.scm b/queries/svelte/indents.scm
index 2f6f5c32e..6000c5900 100644
--- a/queries/svelte/indents.scm
+++ b/queries/svelte/indents.scm
@@ -5,7 +5,7 @@
   (await_statement)
   (script_element)
   (style_element)
-] @indent
+] @indent.begin
 
 [
   (end_tag)
@@ -15,6 +15,6 @@
   (await_end_expr)
   ">"
   "/>"
-] @branch
+] @indent.branch
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/tablegen/indents.scm b/queries/tablegen/indents.scm
index 74287b02f..5d73f8848 100644
--- a/queries/tablegen/indents.scm
+++ b/queries/tablegen/indents.scm
@@ -9,19 +9,19 @@
   (if)
   (let) 
   (value_suffix)
-] @indent
+] @indent.begin
 
 [
   "}"
   "]"
   ")"
   ">"
-] @indent_end
+] @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
-[ "<" ">" ] @branch
+[ "<" ">" ] @indent.branch
diff --git a/queries/teal/indents.scm b/queries/teal/indents.scm
index b199015a6..77b269cd9 100644
--- a/queries/teal/indents.scm
+++ b/queries/teal/indents.scm
@@ -6,7 +6,7 @@
   (if_statement)
   (return_statement)
   (while_statement)
-] @indent
+] @indent.begin
 
 [
   "{"
@@ -15,4 +15,4 @@
   ")"
   "end"
   "then"
-] @branch
+] @indent.branch
diff --git a/queries/thrift/indents.scm b/queries/thrift/indents.scm
index 73ceff342..32c6a2e9f 100644
--- a/queries/thrift/indents.scm
+++ b/queries/thrift/indents.scm
@@ -1,16 +1,16 @@
-(definition) @indent
+(definition) @indent.begin
 
-((parameters (parameter)) @aligned_indent
- (#set! "open_delimiter" "(")
- (#set! "close_delimiter" ")"))
+((parameters (parameter)) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
 
-"}" @indent_end
+"}" @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/tiger/indents.scm b/queries/tiger/indents.scm
index 4ac8d2452..0cb45d391 100644
--- a/queries/tiger/indents.scm
+++ b/queries/tiger/indents.scm
@@ -1,69 +1,69 @@
 ; Control flow {{{
-(if_expression) @indent
-"then" @branch
-"else" @branch
+(if_expression) @indent.begin
+"then" @indent.branch
+"else" @indent.branch
 
-(while_expression) @indent
-"do" @branch
+(while_expression) @indent.begin
+"do" @indent.branch
 
-(for_expression) @indent
-"to" @branch
+(for_expression) @indent.begin
+"to" @indent.branch
 ; }}}
 
 ; Class {{{
-(class_declaration) @indent
-(class_declaration "}" @indent_end)
+(class_declaration) @indent.begin
+(class_declaration "}" @indent.end)
 
-(class_type) @indent
-(class_type "}" @indent_end)
+(class_type) @indent.begin
+(class_type "}" @indent.end)
 ; }}}
 
 ; Groups {{{
-(let_expression) @indent
-"in" @branch
-"end" @branch
-(let_expression "end" @indent_end)
+(let_expression) @indent.begin
+"in" @indent.branch
+"end" @indent.branch
+(let_expression "end" @indent.end)
 
-(sequence_expression) @indent
-")" @branch
-(sequence_expression ")" @indent_end)
+(sequence_expression) @indent.begin
+")" @indent.branch
+(sequence_expression ")" @indent.end)
 ; }}}
 
 ; Functions and methods {{{
-(parameters) @indent
-(parameters ")" @indent_end)
+(parameters) @indent.begin
+(parameters ")" @indent.end)
 
-(function_call) @indent
-(method_call) @indent
-")" @branch
+(function_call) @indent.begin
+(method_call) @indent.begin
+")" @indent.branch
 
-(function_declaration) @indent
-(primitive_declaration) @indent
-(method_declaration) @indent
+(function_declaration) @indent.begin
+(primitive_declaration) @indent.begin
+(method_declaration) @indent.begin
 ; }}}
 
 ; Values and expressions {{{
-(array_value) @indent
-"]" @branch
-(array_value "]" @indent_end)
+(array_value) @indent.begin
+"]" @indent.branch
+(array_value "]" @indent.end)
 
-(array_expression) @indent
-"of" @branch
+(array_expression) @indent.begin
+"of" @indent.branch
 
-(record_expression) @indent
-"}" @branch
-(record_expression "}" @indent_end)
+(record_expression) @indent.begin
+"}" @indent.branch
+(record_expression "}" @indent.end)
 
-(record_type) @indent
-"}" @branch
-(record_type "}" @indent_end)
+(record_type) @indent.begin
+"}" @indent.branch
+(record_type "}" @indent.end)
 
-(variable_declaration) @indent
+(variable_declaration) @indent.begin
 ; }}}
 
 ; Misc{{{
-(comment) @ignore
-(string_literal) @ignore
+(comment) @indent.ignore
+(string_literal) @indent.ignore
 ; }}}
 
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/toml/indents.scm b/queries/toml/indents.scm
index ae5a84344..a2391a4bd 100644
--- a/queries/toml/indents.scm
+++ b/queries/toml/indents.scm
@@ -1,11 +1,11 @@
 [
   (array)
   (inline_table)
-] @indent
+] @indent.begin
 
 [
   "["
   "]"
   "{"
   "}"
-] @branch
+] @indent.branch
diff --git a/queries/turtle/indents.scm b/queries/turtle/indents.scm
index 839f50c71..4d40b3cbe 100644
--- a/queries/turtle/indents.scm
+++ b/queries/turtle/indents.scm
@@ -2,9 +2,9 @@
  (statement)
  (blank_node_property_list)
  (collection)
-] @indent
+] @indent.begin
 [
   "]"
   ")"
-] @branch
+] @indent.branch
 
diff --git a/queries/typescript/indents.scm b/queries/typescript/indents.scm
index d7f9cbc2a..9a269ba75 100644
--- a/queries/typescript/indents.scm
+++ b/queries/typescript/indents.scm
@@ -4,4 +4,4 @@
   (enum_declaration)
   (interface_declaration)
   (object_type)
-] @indent
+] @indent.begin
diff --git a/queries/ungrammar/indents.scm b/queries/ungrammar/indents.scm
index d4b7c085d..a5ececdbe 100644
--- a/queries/ungrammar/indents.scm
+++ b/queries/ungrammar/indents.scm
@@ -1,6 +1,6 @@
-(node) @indent
+(node) @indent.begin
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/uxntal/indents.scm b/queries/uxntal/indents.scm
index 2802cfd1f..cb07a52ee 100644
--- a/queries/uxntal/indents.scm
+++ b/queries/uxntal/indents.scm
@@ -1,17 +1,17 @@
-(memory_execution) @auto
+(memory_execution) @indent.auto
 
 [
   (subroutine)
   (brackets)
-] @indent
+] @indent.begin
 
-"}" @indent_end
+"}" @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
 [
   (ERROR)
   (comment)
-] @auto
+] @indent.auto
diff --git a/queries/v/indents.scm b/queries/v/indents.scm
index febd3786e..afcf6d8c6 100644
--- a/queries/v/indents.scm
+++ b/queries/v/indents.scm
@@ -7,11 +7,11 @@
  (map)
  (call_expression)
  (parameter_list)]
-@indent
+@indent.begin
 
 [ "}"]
-@branch
+@indent.branch
 
-(parameter_list ")" @branch)
+(parameter_list ")" @indent.branch)
 
-(comment) @ignore
+(comment) @indent.ignore
diff --git a/queries/vue/indents.scm b/queries/vue/indents.scm
index ab8375a23..39355b020 100644
--- a/queries/vue/indents.scm
+++ b/queries/vue/indents.scm
@@ -2,6 +2,6 @@
 
 [
   (template_element)
-] @indent
+] @indent.begin
 
-(template_element (end_tag ">" @indent_end) @branch)
+(template_element (end_tag ">" @indent.end) @indent.branch)
diff --git a/queries/wgsl/indents.scm b/queries/wgsl/indents.scm
index a764122c3..08be2255e 100644
--- a/queries/wgsl/indents.scm
+++ b/queries/wgsl/indents.scm
@@ -3,17 +3,17 @@
   (compound_statement)
   (loop_statement)
   (struct_declaration)
-] @indent
+] @indent.begin
 
-(compound_statement "}" @indent_end)
-(loop_statement "}" @indent_end)
-(function_declaration ")" @indent_end)
-(struct_declaration "}" @indent_end)
+(compound_statement "}" @indent.end)
+(loop_statement "}" @indent.end)
+(function_declaration ")" @indent.end)
+(struct_declaration "}" @indent.end)
 
 [
   "else"
   ")"
   "}"
-] @branch
+] @indent.branch
 
-[(line_comment) (block_comment)] @auto
+[(line_comment) (block_comment)] @indent.auto
diff --git a/queries/wgsl_bevy/indents.scm b/queries/wgsl_bevy/indents.scm
index 84d1845c0..381321877 100644
--- a/queries/wgsl_bevy/indents.scm
+++ b/queries/wgsl_bevy/indents.scm
@@ -4,4 +4,4 @@
   "#ifndef"
   "#else"
   "#endif"
-] @zero_indent
+] @indent.zero
diff --git a/queries/yaml/indents.scm b/queries/yaml/indents.scm
index 5820c62e4..f168bcc5a 100644
--- a/queries/yaml/indents.scm
+++ b/queries/yaml/indents.scm
@@ -1,6 +1,6 @@
 [
   (block_mapping_pair value: (block_node))
   (block_sequence_item)
-] @indent
+] @indent.begin
 
-(ERROR) @auto
+(ERROR) @indent.auto
diff --git a/queries/yang/indents.scm b/queries/yang/indents.scm
index 73e743789..d8782f955 100644
--- a/queries/yang/indents.scm
+++ b/queries/yang/indents.scm
@@ -1,11 +1,11 @@
-(module) @indent
-(submodule) @indent
-(statement) @indent
-(extension_statement) @indent
-(statement ";" @indent_end)
-(extension_statement ";" @indent_end)
-(block "}" @indent_end @branch)
+(module) @indent.begin
+(submodule) @indent.begin
+(statement) @indent.begin
+(extension_statement) @indent.begin
+(statement ";" @indent.end)
+(extension_statement ";" @indent.end)
+(block "}" @indent.end @indent.branch)
 
-((string) @aligned_indent
- (#set! "open_delimiter" "\"")
- (#set! "close_delimiter" "\""))
+((string) @indent.align
+ (#set! indent.open_delimiter "\"")
+ (#set! indent.close_delimiter "\""))
diff --git a/queries/yuck/indents.scm b/queries/yuck/indents.scm
index 9551a6061..bcf028ce4 100644
--- a/queries/yuck/indents.scm
+++ b/queries/yuck/indents.scm
@@ -5,22 +5,22 @@
   (json_array)
   (json_object)
   (parenthesized_expression)
-] @indent
+] @indent.begin
 
 ; TODO: can't get this to work, goal is to indent at the property ":" prefix
-; ((list (identifier) (property)) @aligned_indent
-;   (#set! "open_delimiter" "(")
-;   (#set! "close_delimiter" ")"))
+; ((list (identifier) (property)) @indent.align
+;   (#set! indent.open_delimiter "(")
+;   (#set! indent.close_delimiter ")"))
 
-[")" "}" "]"] @indent_end
+[")" "}" "]"] @indent.end
 
-[ "{" "}" ] @branch
+[ "{" "}" ] @indent.branch
 
-[ "(" ")" ] @branch
+[ "(" ")" ] @indent.branch
 
-[ "[" "]" ] @branch
+[ "[" "]" ] @indent.branch
 
 [
  (ERROR)
  (comment)
-] @auto
+] @indent.auto
diff --git a/queries/zig/indents.scm b/queries/zig/indents.scm
index f3afdfb48..fdf7b183b 100644
--- a/queries/zig/indents.scm
+++ b/queries/zig/indents.scm
@@ -3,9 +3,9 @@
   (ContainerDecl)
   (SwitchExpr)
   (InitList)
-] @indent
+] @indent.begin
 
-(Block "}" @indent_end)
+(Block "}" @indent.end)
 
 [
   "("
@@ -14,11 +14,11 @@
   "]"
   "{"
   "}"
-] @branch
+] @indent.branch
 
 [
   (line_comment)
   (container_doc_comment)
   (doc_comment)
   (LINESTRING)
-] @ignore
+] @indent.ignore

From 5c3e8dee6498f91387bb825b9728f0cfceb3be7e Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Fri, 24 Mar 2023 22:44:28 +0100
Subject: [PATCH 0166/2704] fix: `get_range` shim for playground

---
 lua/nvim-treesitter/compat.lua |  7 ++++++-
 lua/nvim-treesitter/locals.lua | 14 +++++---------
 queries/lua/injections.scm     |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
index 072b4dc58..accf2e6ac 100644
--- a/lua/nvim-treesitter/compat.lua
+++ b/lua/nvim-treesitter/compat.lua
@@ -1,5 +1,6 @@
 -- Shim module to address deprecations across nvim versions
-local tsq = vim.treesitter.query
+local ts = vim.treesitter
+local tsq = ts.query
 
 local M = {}
 
@@ -15,4 +16,8 @@ function M.parse_query(lang, query)
   return (tsq.parse or tsq.parse_query)(lang, query)
 end
 
+function M.get_range(node, source, metadata)
+  return (ts.get_range or tsq.get_range)(node, source, metadata)
+end
+
 return M
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index 75ae07237..cc69d5621 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -4,7 +4,7 @@
 
 local queries = require "nvim-treesitter.query"
 local ts_utils = require "nvim-treesitter.ts_utils"
-local ts_query = vim.treesitter.query
+local ts = vim.treesitter
 local api = vim.api
 
 local M = {}
@@ -170,7 +170,7 @@ M.get_definitions_lookup_table = ts_utils.memoize_by_buf_tick(function(bufnr)
       local scopes = M.get_definition_scopes(node_entry.node, bufnr, node_entry.scope)
       -- Always use the highest valid scope
       local scope = scopes[#scopes]
-      local node_text = ts_query.get_node_text(node_entry.node, bufnr)
+      local node_text = ts.get_node_text(node_entry.node, bufnr)
       local id = M.get_definition_id(scope, node_text)
 
       result[id] = node_entry
@@ -223,7 +223,7 @@ end
 ---@return string|nil kind
 function M.find_definition(node, bufnr)
   local def_lookup = M.get_definitions_lookup_table(bufnr)
-  local node_text = ts_query.get_node_text(node, bufnr)
+  local node_text = ts.get_node_text(node, bufnr)
 
   for scope in M.iter_scope_tree(node, bufnr) do
     local id = M.get_definition_id(scope, node_text)
@@ -244,7 +244,7 @@ end
 ---@return TSNode[]: a list of nodes
 function M.find_usages(node, scope_node, bufnr)
   bufnr = bufnr or api.nvim_get_current_buf()
-  local node_text = ts_query.get_node_text(node, bufnr)
+  local node_text = ts.get_node_text(node, bufnr)
 
   if not node_text or #node_text < 1 then
     return {}
@@ -254,11 +254,7 @@ function M.find_usages(node, scope_node, bufnr)
   local usages = {}
 
   for match in M.iter_locals(bufnr, scope_node) do
-    if
-      match.reference
-      and match.reference.node
-      and ts_query.get_node_text(match.reference.node, bufnr) == node_text
-    then
+    if match.reference and match.reference.node and ts.get_node_text(match.reference.node, bufnr) == node_text then
       local def_node, _, kind = M.find_definition(match.reference.node, bufnr)
 
       if kind == nil or def_node == node then
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index bb3d119f5..b9b203424 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -14,7 +14,7 @@
 ((function_call
   name: (_) @_vimcmd_identifier
   arguments: (arguments (string content: _ @query) .))
-  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query"))
+  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query" "vim.treesitter.query.parse"))
 
 ;; highlight string as query if starts with `;; query`
 ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))

From a072d923c7a18a5a326e80e31dc211f0ec679e54 Mon Sep 17 00:00:00 2001
From: Sergey Kacheev <s.kacheev@gmail.com>
Date: Mon, 12 Sep 2022 23:37:16 +0700
Subject: [PATCH 0167/2704] fix: uninstall function in the install.lua

The get_ensure_installed_parsers function return a table
for the option "all" because uninstall accepts a table
---
 lua/nvim-treesitter/configs.lua | 3 +++
 lua/nvim-treesitter/install.lua | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index 99fc6b840..a3ec30fb2 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -607,6 +607,9 @@ function M.get_ignored_parser_installs()
 end
 
 function M.get_ensure_installed_parsers()
+  if type(config.ensure_installed) == "string" then
+    return { config.ensure_installed }
+  end
   return config.ensure_installed or {}
 end
 
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 3ea23ee86..82d233e20 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -605,9 +605,7 @@ function M.uninstall(...)
   if vim.tbl_contains({ "all" }, ...) then
     reset_progress_counter()
     local installed = info.installed_parsers()
-    for _, langitem in pairs(installed) do
-      M.uninstall(langitem)
-    end
+    M.uninstall(installed)
   elseif ... then
     local ensure_installed_parsers = configs.get_ensure_installed_parsers()
     if ensure_installed_parsers == "all" then

From 1ffa01985651f6a5ba88d01e56f09cb76ff6e79a Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 25 Mar 2023 09:29:32 +0900
Subject: [PATCH 0168/2704] feat(python): add match-case indents

---
 queries/python/indents.scm        |  4 ++++
 tests/indent/python/match_case.py | 15 +++++++++++++++
 tests/indent/python_spec.lua      |  4 ++++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/indent/python/match_case.py

diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index 01933641b..e66f39696 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -44,6 +44,10 @@
  (#set! indent.immediate 1))
 ((with_statement) @indent.begin
  (#set! indent.immediate 1))
+((match_statement) @indent.begin
+ (#set! indent.immediate 1))
+((case_clause) @indent.begin
+ (#set! indent.immediate 1))
 
 (if_statement
   condition: (parenthesized_expression) @indent.align
diff --git a/tests/indent/python/match_case.py b/tests/indent/python/match_case.py
new file mode 100644
index 000000000..88b56af10
--- /dev/null
+++ b/tests/indent/python/match_case.py
@@ -0,0 +1,15 @@
+a = 0
+
+def test_match_case():
+    match a:
+        case 1:
+            return
+
+
+def test_match():
+    match a:
+
+
+def test_case():
+    match a:
+        case b:
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index 6f4e0fec7..2b52d4597 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -84,6 +84,10 @@ describe("indent Python:", function()
     run:new_line("line_after_indent.py", { on_line = 49, text = "x", indent = 0 })
     run:new_line("line_after_indent.py", { on_line = 55, text = "x", indent = 4 })
     run:new_line("line_after_indent.py", { on_line = 63, text = "x", indent = 4 })
+    run:new_line("match_case.py", { on_line = 4, text = "pass", indent = 8 })
+    run:new_line("match_case.py", { on_line = 5, text = "pass", indent = 12 })
+    run:new_line("match_case.py", { on_line = 10, text = "pass", indent = 8 })
+    run:new_line("match_case.py", { on_line = 15, text = "pass", indent = 12 })
 
     for _, line in ipairs { 2, 5, 8, 11, 16, 21, 24, 27, 34, 39 } do
       run:new_line("return_dedent.py", { on_line = line, text = "x", indent = 0 })

From c9ef5e58f7d59aba875324825ff47900d0be61f2 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 25 Mar 2023 09:51:41 +0900
Subject: [PATCH 0169/2704] feat(python): add break/continue dedent

---
 queries/python/indents.scm            | 5 +++++
 tests/indent/python/break_continue.py | 9 +++++++++
 tests/indent/python_spec.lua          | 2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 tests/indent/python/break_continue.py

diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index e66f39696..efcdba6b2 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -78,6 +78,11 @@
 
 (ERROR "{" @indent.align (#set! indent.open_delimiter "{") (#set! indent.close_delimiter "}") . (_)) 
 
+[
+  (break_statement)
+  (continue_statement)
+] @indent.dedent
+
 (parenthesized_expression ")" @indent.end)
 (generator_expression ")" @indent.end)
 (list_comprehension "]" @indent.end)
diff --git a/tests/indent/python/break_continue.py b/tests/indent/python/break_continue.py
new file mode 100644
index 000000000..aabd677f8
--- /dev/null
+++ b/tests/indent/python/break_continue.py
@@ -0,0 +1,9 @@
+def f():
+    for x in range(1, 2):
+        if x == 1:
+            break
+
+def f():
+    for x in range(1, 2):
+        if x == 1:
+            continue
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index 2b52d4597..aa9aa83e0 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -88,6 +88,8 @@ describe("indent Python:", function()
     run:new_line("match_case.py", { on_line = 5, text = "pass", indent = 12 })
     run:new_line("match_case.py", { on_line = 10, text = "pass", indent = 8 })
     run:new_line("match_case.py", { on_line = 15, text = "pass", indent = 12 })
+    run:new_line("break_continue.py", { on_line = 4, text = "pass", indent = 8 })
+    run:new_line("break_continue.py", { on_line = 9, text = "pass", indent = 8 })
 
     for _, line in ipairs { 2, 5, 8, 11, 16, 21, 24, 27, 34, 39 } do
       run:new_line("return_dedent.py", { on_line = line, text = "x", indent = 0 })

From 981f88a0c206e19e99b9990bf95a107e7bc35f14 Mon Sep 17 00:00:00 2001
From: Leix b <abone9999@gmail.com>
Date: Sun, 26 Mar 2023 19:12:51 +0200
Subject: [PATCH 0170/2704] fix(rockspec): add doc folder to rockspec (#4562)

---
 nvim-treesitter-scm-1.rockspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nvim-treesitter-scm-1.rockspec b/nvim-treesitter-scm-1.rockspec
index 7350ae47f..a901c5b12 100644
--- a/nvim-treesitter-scm-1.rockspec
+++ b/nvim-treesitter-scm-1.rockspec
@@ -29,6 +29,7 @@ build = {
   },
   copy_directories = {
     'autoload',
+    'doc',
     'plugin',
     'queries'
   }

From e559b6fb3f1b09d96568705c668abb8c55b7e3e4 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 26 Mar 2023 14:45:50 -0400
Subject: [PATCH 0171/2704] feat(kotlin): update queries from upstream changes

---
 lockfile.json                 |  2 +-
 queries/kotlin/highlights.scm | 32 ++++++++++++--------------------
 queries/kotlin/injections.scm | 11 +++++++----
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4948a4407..b969536d9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -255,7 +255,7 @@
     "revision": "e36f054a60c4d9e5ae29567d439fdb8790b53b30"
   },
   "kotlin": {
-    "revision": "e4637037a5fe6f25fe66c305669faa0855f35692"
+    "revision": "826ef28d605d0925a86a99022cd222c96f2d0952"
   },
   "lalrpop": {
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 679cc0ad6..f7b1b8c4d 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -217,9 +217,12 @@
 
 ;;; Literals
 
-(comment) @comment @spell
+[
+  (line_comment)
+  (multiline_comment)
+] @comment @spell
 
-((comment) @comment.documentation
+((multiline_comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 (shebang_line) @preproc
@@ -240,19 +243,16 @@
 
 (character_literal) @character
 
-[
-	(line_string_literal)
-	(multi_line_string_literal)
-] @string
+(string_literal) @string
 
 ; NOTE: Escapes not allowed in multi-line strings
-(line_string_literal (character_escape_seq) @string.escape)
+(character_literal (character_escape_seq) @string.escape)
 
 ; There are 3 ways to define a regex
 ;    - "[abc]?".toRegex()
 (call_expression
 	(navigation_expression
-		([(line_string_literal) (multi_line_string_literal)] @string.regex)
+		((string_literal) @string.regex)
 		(navigation_suffix
 			((simple_identifier) @_function
 			(#eq? @_function "toRegex")))))
@@ -264,7 +264,7 @@
 	(call_suffix
 		(value_arguments
 			(value_argument
-				[ (line_string_literal) (multi_line_string_literal) ] @string.regex))))
+				(string_literal) @string.regex))))
 
 ;    - Regex.fromLiteral("[abc]?")
 (call_expression
@@ -277,7 +277,7 @@
 	(call_suffix
 		(value_arguments
 			(value_argument
-				[ (line_string_literal) (multi_line_string_literal) ] @string.regex))))
+				(string_literal) @string.regex))))
 
 ;;; Keywords
 
@@ -413,18 +413,10 @@
 ] @punctuation.delimiter
 
 ; NOTE: `interpolated_identifier`s can be highlighted in any way
-(line_string_literal
+(string_literal
 	"$" @punctuation.special
 	(interpolated_identifier) @none @variable)
-(line_string_literal
-	"${" @punctuation.special
-	(interpolated_expression) @none
-	"}" @punctuation.special)
-
-(multi_line_string_literal
-    "$" @punctuation.special
-    (interpolated_identifier) @none @variable)
-(multi_line_string_literal
+(string_literal
 	"${" @punctuation.special
 	(interpolated_expression) @none
 	"}" @punctuation.special)
diff --git a/queries/kotlin/injections.scm b/queries/kotlin/injections.scm
index 371345cfd..7ba4d9494 100644
--- a/queries/kotlin/injections.scm
+++ b/queries/kotlin/injections.scm
@@ -1,10 +1,13 @@
-(comment) @comment
+[
+  (line_comment)
+  (multiline_comment)
+] @comment
 
 ; There are 3 ways to define a regex
 ;    - "[abc]?".toRegex()
 (call_expression
 	(navigation_expression
-		([(line_string_literal) (multi_line_string_literal)] @regex)
+		((string_literal) @regex)
 		(navigation_suffix
 			((simple_identifier) @_function
 			(#eq? @_function "toRegex")))))
@@ -16,7 +19,7 @@
 	(call_suffix
 		(value_arguments
 			(value_argument
-				[ (line_string_literal) (multi_line_string_literal) ] @regex))))
+				(string_literal) @regex))))
 
 ;    - Regex.fromLiteral("[abc]?")
 (call_expression
@@ -29,4 +32,4 @@
 	(call_suffix
 		(value_arguments
 			(value_argument
-				[ (line_string_literal) (multi_line_string_literal) ] @regex))))
+				(string_literal) @regex))))

From 25dd24ed0e3b4456b1987cdd744e261be5dc6c7c Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Mon, 27 Mar 2023 06:54:26 +0200
Subject: [PATCH 0172/2704] feat(scala): add in local variables queries

This syncs the queries that were updated in https://github.com/tree-sitter/tree-sitter-scala/pull/196.

Co-authored-by: ghostbuster91 <ghostbuster91@users.noreply.github.com>
---
 queries/scala/locals.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 queries/scala/locals.scm

diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
new file mode 100644
index 000000000..70b4b7990
--- /dev/null
+++ b/queries/scala/locals.scm
@@ -0,0 +1,38 @@
+; Scopes
+
+[
+  (template_body)
+  (lambda_expression)
+  (function_declaration)
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(function_declaration
+  name: (identifier) @definition.function)
+
+(function_definition
+  name: (identifier) @definition.function)
+
+(parameter
+  name: (identifier) @definition.parameter)
+
+(binding
+  name: (identifier) @definition.var)
+
+(val_definition
+  pattern: (identifier) @definition.var)
+
+(var_definition
+  pattern: (identifier) @definition.var)
+
+(val_declaration
+  name: (identifier) @definition.var)
+
+(var_declaration
+  name: (identifier) @definition.var)
+

From 300ba8d5a5e8cc7e91fbed932e2b05a39ca70e0b Mon Sep 17 00:00:00 2001
From: John Drouhard <john@drouhard.dev>
Date: Sun, 26 Mar 2023 13:32:22 -0500
Subject: [PATCH 0173/2704] feat(cpp): simplify namespace query rules now that
 parser is a bit more consistent

---
 lockfile.json              | 2 +-
 queries/cpp/highlights.scm | 5 +----
 queries/cpp/locals.scm     | 6 +++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b969536d9..5ce70288e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -63,7 +63,7 @@
     "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"
   },
   "cpp": {
-    "revision": "03fa93db133d6048a77d4de154a7b17ea8b9d076"
+    "revision": "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index c40ab26f1..854e03cb3 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -45,12 +45,9 @@
 (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)
 
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
index c48a7cc39..4c114876c 100644
--- a/queries/cpp/locals.scm
+++ b/queries/cpp/locals.scm
@@ -39,7 +39,11 @@
 
 ;; Namespaces
 (namespace_definition
-  name: (identifier) @definition.namespace
+  name: (namespace_identifier) @definition.namespace
+  body: (_) @scope)
+
+(namespace_definition
+  name: (nested_namespace_specifier) @definition.namespace
   body: (_) @scope)
 
 ((namespace_identifier) @reference

From a9df886c2ecbd723513942cd330286624f8a2775 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 27 Mar 2023 06:12:07 -0400
Subject: [PATCH 0174/2704] chore(lockfile): bump cuda & hlsl

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5ce70288e..97dfa65b0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "91c3ca3e42326e0f7b83c82765940bbf7f91c847"
+    "revision": "967e7d74a1a04a680674199e12141963a8dd6336"
   },
   "cue": {
     "revision": "4ffcda8c2bdfee1c2ba786cd503d0508ea92cca2"
@@ -207,7 +207,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "306d48516a6b3dbb18a184692e8edffa8403018f"
+    "revision": "fce5ea2e842404ce1af13fffdcf0daa02240c3dd"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"

From ac13230dddc1c5a86ee1f8008b89a05f7d95516f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 27 Mar 2023 14:46:25 +0300
Subject: [PATCH 0175/2704] chore(lockfile): bump arduino

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 97dfa65b0..9414955a8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "257efffa387da3283a37816b71dedfecf4af5222"
+    "revision": "833b53df97143bc46e014608dee9f64f78d7473c"
   },
   "astro": {
     "revision": "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"

From eadf4f43c6716a96e7464600e9cb9f1258643978 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 26 Mar 2023 18:28:54 -0400
Subject: [PATCH 0176/2704] feat: add Pony

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/pony/folds.scm          |  39 +++++
 queries/pony/highlights.scm     | 292 ++++++++++++++++++++++++++++++++
 queries/pony/indents.scm        |  60 +++++++
 queries/pony/injections.scm     |   4 +
 queries/pony/locals.scm         |  91 ++++++++++
 7 files changed, 497 insertions(+)
 create mode 100644 queries/pony/folds.scm
 create mode 100644 queries/pony/highlights.scm
 create mode 100644 queries/pony/indents.scm
 create mode 100644 queries/pony/injections.scm
 create mode 100644 queries/pony/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 9414955a8..32885b6e9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -353,6 +353,9 @@
   "poe_filter": {
     "revision": "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"
   },
+  "pony": {
+    "revision": "9c6a4d98dea80772dbd7967fe556652a220469e5"
+  },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7b9c2dd62..2c770dc82 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1070,6 +1070,14 @@ list.poe_filter = {
   experimental = true,
 }
 
+list.pony = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-pony",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq", "@mfelsche" },
+}
+
 list.prisma = {
   install_info = {
     url = "https://github.com/victorhqc/tree-sitter-prisma",
diff --git a/queries/pony/folds.scm b/queries/pony/folds.scm
new file mode 100644
index 000000000..1f7ba11b3
--- /dev/null
+++ b/queries/pony/folds.scm
@@ -0,0 +1,39 @@
+[
+  (use_statement) 
+  (actor_definition)
+  (class_definition)
+  (primitive_definition)
+  (interface_definition)
+  (trait_definition)
+  (struct_definition)
+
+  (constructor)
+  (method)
+  (behavior)
+
+  (parameters)
+
+  (type)
+
+  (if_statement)
+  (iftype_statement)
+  (elseif_block)
+  (elseiftype_block)
+  (else_block)
+  (for_statement)
+  (while_statement)
+  (try_statement)
+  (with_statement)
+  (repeat_statement)
+  (recover_statement)
+  (match_statement)
+  (case_statement)
+  (parenthesized_expression)
+  (tuple_expression)
+
+  (array_literal)
+  (object_literal)
+  (string)
+
+  (block_comment)
+] @fold
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
new file mode 100644
index 000000000..1968693f4
--- /dev/null
+++ b/queries/pony/highlights.scm
@@ -0,0 +1,292 @@
+; Includes
+
+[
+  "use"
+] @include
+
+; Keywords
+
+[
+  "type"
+  "actor"
+  "class"
+  "primitive"
+  "interface"
+  "trait"
+  "struct"
+  "embed"
+  "let"
+  "var"
+  (compile_intrinsic)
+  "as"
+  "consume"
+  "recover"
+  "object"
+  "where"
+] @keyword
+
+[
+  "fun"
+] @keyword.function
+
+[
+  "be"
+] @keyword.coroutine
+
+[
+  "in"
+  "is"
+] @keyword.operator
+
+[
+  "return"
+] @keyword.return
+
+; Qualifiers
+
+[
+  "iso"
+  "trn"
+  "ref"
+  "val"
+  "box"
+  "tag"
+  "#read"
+  "#send"
+  "#share"
+  "#alias"
+  "#any"
+] @type.qualifier
+
+; Conditionals
+
+[
+  "if"
+  "ifdef"
+  "iftype"
+  "then"
+  "else"
+  "elseif"
+  "match"
+] @conditional
+
+(if_statement "end" @conditional)
+
+(iftype_statement "end" @conditional)
+
+(match_statement "end" @conditional)
+
+; Repeats
+
+[
+  "repeat"
+  "until"
+  "while"
+  "for"
+  "continue"
+  "do"
+  "break"
+] @repeat
+
+(do_block "end" @repeat)
+
+(repeat_statement "end" @repeat)
+
+; Exceptions
+
+[
+  "try"
+  (error)
+  "compile_error"
+] @exception
+
+(try_statement "end" @exception)
+
+(recover_statement "end" @exception)
+
+; Attributes
+
+(annotation) @attribute
+
+; Variables
+
+(identifier) @variable
+
+(this) @variable.builtin
+
+; Fields
+
+(field name: (identifier) @field)
+
+(member_expression "." (identifier) @field)
+
+; Constructors
+
+(constructor "new" @keyword.operator (identifier) @constructor)
+
+; Methods
+
+(method (identifier) @method)
+
+(behavior (identifier) @method)
+
+(ffi_method (identifier) @method)
+
+((ffi_method (string) @string.special)
+  (#set! "priority" 105))
+
+(call_expression
+  callee:
+    [
+      (identifier) @method.call
+      (ffi_identifier (identifier) @method.call)
+      (member_expression "." (identifier) @method.call)
+    ])
+
+; Parameters
+
+(parameter name: (identifier) @parameter)
+(lambda_parameter name: (identifier) @parameter)
+
+; Types
+
+(type_alias (identifier) @type.definition)
+
+(base_type name: (identifier) @type)
+
+(generic_parameter (identifier) @type)
+
+(lambda_type (identifier)? @method)
+
+((identifier) @type
+  (#lua-match? @type "^_*[A-Z][a-zA-Z0-9_]*$"))
+
+; Operators
+
+(unary_expression
+  operator: ["not" "addressof" "digestof"] @keyword.operator)
+
+(binary_expression
+  operator: ["and" "or" "xor" "is" "isnt"] @keyword.operator)
+
+[
+  "="
+  "?"
+  "|"
+  "&"
+  "-~"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "%%"
+  "<<"
+  ">>"
+  "=="
+  "!="
+  ">"
+  ">="
+  "<="
+  "<"
+  "+~"
+  "-~"
+  "*~"
+  "/~"
+  "%~"
+  "%%~"
+  "<<~"
+  ">>~"
+  "==~"
+  "!=~"
+  ">~"
+  ">=~"
+  "<=~"
+  "<~"
+  "+?"
+  "-?"
+  "*?"
+  "/?"
+  "%?"
+  "%%?"
+  "<:"
+] @operator
+
+; Literals
+
+(string) @string
+
+(source_file (string) @string.documentation)
+(actor_definition (string) @string.documentation)
+(class_definition (string) @string.documentation)
+(primitive_definition (string) @string.documentation)
+(interface_definition (string) @string.documentation)
+(trait_definition (string) @string.documentation)
+(struct_definition (string) @string.documentation)
+(type_alias (string) @string.documentation)
+(field (string) @string.documentation)
+
+(constructor
+  [
+   (string) @string.documentation
+   (block . (string) @string.documentation)
+  ])
+
+(method
+  [
+   (string) @string.documentation
+   (block . (string) @string.documentation)
+  ])
+
+(behavior
+  [
+   (string) @string.documentation
+   (block . (string) @string.documentation)
+  ])
+
+(character) @character
+
+(escape_sequence) @string.escape
+
+(number) @number
+
+(float) @float
+
+(boolean) @boolean
+
+; Punctuation
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[
+  "."
+  ","
+  ";"
+  ":"
+  "~"
+  ".>"
+  "->"
+  "=>"
+] @punctuation.delimiter
+
+[
+  "@"
+  "!"
+  "^"
+  "..."
+] @punctuation.special
+
+; Comments
+
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/pony/indents.scm b/queries/pony/indents.scm
new file mode 100644
index 000000000..c9b3e7a25
--- /dev/null
+++ b/queries/pony/indents.scm
@@ -0,0 +1,60 @@
+[
+  (use_statement) 
+  (actor_definition)
+  (class_definition)
+  (primitive_definition)
+  (interface_definition)
+  (trait_definition)
+  (struct_definition)
+
+  (constructor)
+  (method)
+  (behavior)
+
+  (parameters)
+
+  (if_block)
+  (then_block)
+  (elseif_block)
+  (else_block)
+  (iftype_statement)
+  (elseiftype_block)
+  (do_block)
+  (match_statement)
+  (parenthesized_expression)
+  (tuple_expression)
+
+  (array_literal)
+  (object_literal)
+] @indent.begin
+
+(try_statement (block) @indent.begin)
+
+(repeat_statement (block) @indent.begin)
+
+(recover_statement (block) @indent.begin)
+
+(return_statement (block) @indent.begin)
+
+(continue_statement (block) @indent.begin)
+
+(break_statement (block) @indent.begin)
+
+[
+  "}"
+  "]"
+  ")"
+] @indent.end
+
+[ "{" "}" ] @indent.branch
+
+[ "[" "]" ] @indent.branch
+
+[ "(" ")" ] @indent.branch
+
+[
+  (ERROR)
+  (string)
+  (line_comment)
+  (block_comment)
+] @indent.auto
diff --git a/queries/pony/injections.scm b/queries/pony/injections.scm
new file mode 100644
index 000000000..e48ce9af3
--- /dev/null
+++ b/queries/pony/injections.scm
@@ -0,0 +1,4 @@
+[
+  (line_comment)
+  (block_comment)
+] @comment
diff --git a/queries/pony/locals.scm b/queries/pony/locals.scm
new file mode 100644
index 000000000..b12f2a04c
--- /dev/null
+++ b/queries/pony/locals.scm
@@ -0,0 +1,91 @@
+; Scopes
+
+[
+  (use_statement) 
+  (actor_definition)
+  (class_definition)
+  (primitive_definition)
+  (interface_definition)
+  (trait_definition)
+  (struct_definition)
+
+  (constructor)
+  (method)
+  (behavior)
+
+  (if_statement)
+  (iftype_statement)
+  (elseif_block)
+  (elseiftype_block)
+  (else_block)
+  (for_statement)
+  (while_statement)
+  (try_statement)
+  (with_statement)
+  (repeat_statement)
+  (recover_statement)
+  (match_statement)
+  (case_statement)
+  (parenthesized_expression)
+  (tuple_expression)
+
+  (array_literal)
+  (object_literal) 
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(field
+  name: (identifier) @definition.field)
+
+(use_statement
+  (identifier) @definition.import)
+
+(constructor
+  (identifier) @definition.method)
+
+(method
+  (identifier) @definition.method)
+
+(behavior
+  (identifier) @definition.method)
+
+(actor_definition
+  (identifier) @definition.type)
+
+(type_alias
+  (identifier) @definition.type)
+
+(class_definition
+  (identifier) @definition.type)
+
+(primitive_definition
+  (identifier) @definition.type)
+
+(interface_definition
+  (identifier) @definition.type)
+
+(trait_definition
+  (identifier) @definition.type)
+
+(struct_definition
+  (identifier) @definition.type)
+
+(parameter
+  name: (identifier) @definition.parameter)
+
+(variable_declaration
+  (identifier) @definition.var)
+
+(for_statement
+  [
+    (identifier) @definition.var
+    (tuple_expression (identifier) @definition.var)
+  ])
+
+(with_elem 
+  (identifier) @definition.var)

From eb1e5992518742d3483a6650e7d1a3c5a48393fb Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 26 Mar 2023 18:37:15 -0400
Subject: [PATCH 0177/2704] feat: add FIRRTL

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/firrtl/folds.scm        |   6 +
 queries/firrtl/highlights.scm   | 189 ++++++++++++++++++++++++++++++++
 queries/firrtl/indents.scm      |  12 ++
 queries/firrtl/injections.scm   |   1 +
 queries/firrtl/locals.scm       |  38 +++++++
 7 files changed, 257 insertions(+)
 create mode 100644 queries/firrtl/folds.scm
 create mode 100644 queries/firrtl/highlights.scm
 create mode 100644 queries/firrtl/indents.scm
 create mode 100644 queries/firrtl/injections.scm
 create mode 100644 queries/firrtl/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 32885b6e9..87b940098 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -122,6 +122,9 @@
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
   },
+  "firrtl": {
+    "revision": "58e9655caa6b6d0ef8dc0e6bd3d8e060beb6b40d"
+  },
   "fish": {
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2c770dc82..c3c9bab6c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -415,6 +415,14 @@ list.fennel = {
   maintainers = { "@TravonteD" },
 }
 
+list.firrtl = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-firrtl",
+    files = { "src/parser.c", "src/scanner.cc" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.fish = {
   install_info = {
     url = "https://github.com/ram02z/tree-sitter-fish",
diff --git a/queries/firrtl/folds.scm b/queries/firrtl/folds.scm
new file mode 100644
index 000000000..437b2c81c
--- /dev/null
+++ b/queries/firrtl/folds.scm
@@ -0,0 +1,6 @@
+[
+ (circuit)
+ (module)
+ (when)
+ (else)
+] @fold
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
new file mode 100644
index 000000000..551b2e751
--- /dev/null
+++ b/queries/firrtl/highlights.scm
@@ -0,0 +1,189 @@
+; Namespaces
+
+(circuit (identifier) @namespace)
+
+(module (identifier) @namespace)
+
+; Types
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z][A-Za-z0-9_$]*$"))
+
+; Keywords
+
+[
+  "circuit"
+  "module"
+  "extmodule"
+
+  "flip"
+  "parameter"
+  "reset"
+  "wire"
+
+  "cmem"
+  "smem"
+  "mem"
+
+  "reg"
+  "with"
+  "mport"
+  "inst"
+  "of"
+  "node"
+  "is"
+  "invalid"
+  "skip"
+
+  "infer"
+  "read"
+  "write"
+  "rdwr"
+
+  "defname"
+] @keyword
+
+; Qualifiers
+
+(qualifier) @type.qualifier
+
+; Storageclasses
+
+[
+  "input"
+  "output"
+] @storageclass
+
+; Conditionals
+
+[
+  "when"
+  "else"
+] @conditional
+
+; Annotations
+
+(info) @attribute
+
+; Builtins
+
+[
+  "stop"
+  "printf"
+  "assert"
+  "assume"
+  "cover"
+  "attach"
+  "mux"
+  "validif"
+] @function.builtin
+
+[
+  "UInt"
+  "SInt"
+  "Analog"
+  "Fixed"
+  "Clock"
+  "AsyncReset"
+  "Reset"
+] @type.builtin
+
+; Fields
+
+[
+  "data-type"
+  "depth"
+  "read-latency"
+  "write-latency"
+  "read-under-write"
+  "reader"
+  "writer"
+  "readwriter"
+] @field.builtin
+
+((field_id) @field
+  (#set! "priority" 105))
+
+(port (identifier) @field)
+
+(wire (identifier) @field)
+
+(cmem (identifier) @field)
+
+(smem (identifier) @field)
+
+(memory (identifier) @field)
+
+(register (identifier) @field)
+
+; Parameters
+
+(primitive_operation (identifier) @parameter)
+
+(mux (identifier) @parameter)
+(printf (identifier) @parameter)
+(reset (identifier) @parameter)
+(stop (identifier) @parameter)
+
+; Variables
+
+(identifier) @variable
+
+; Operators
+
+(primop) @keyword.operator
+
+[
+  "+"
+  "-"
+  "="
+  "=>"
+  "<="
+  "<-"
+] @operator
+
+; Literals
+
+[
+  (uint)
+  (number)
+] @number
+
+(number_str) @string.special
+
+(double) @float
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+[
+  "old"
+  "new"
+  "undefined"
+] @constant.builtin
+
+; Punctuation
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "<" ">" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[
+  ","
+  "."
+  ":"
+] @punctuation.delimiter
+
+; Comments
+
+(comment) @comment @spell
+
+["=>" "<=" "="] @operator
+
+; Error
+(ERROR) @error
diff --git a/queries/firrtl/indents.scm b/queries/firrtl/indents.scm
new file mode 100644
index 000000000..8bc1e2019
--- /dev/null
+++ b/queries/firrtl/indents.scm
@@ -0,0 +1,12 @@
+[
+ (circuit)
+ (module)
+ (memory)
+ (when)
+ (else)
+] @indent.begin
+
+[
+  (ERROR)
+  (comment)
+] @indent.auto
diff --git a/queries/firrtl/injections.scm b/queries/firrtl/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/firrtl/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/firrtl/locals.scm b/queries/firrtl/locals.scm
new file mode 100644
index 000000000..bb7fc56bd
--- /dev/null
+++ b/queries/firrtl/locals.scm
@@ -0,0 +1,38 @@
+; Scopes
+
+[
+  (source_file)
+  (circuit)
+  (module)
+
+  (else)
+  (when)
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(port (identifier) @definition.field)
+
+(wire (identifier) @definition.field)
+
+(cmem (identifier) @definition.field)
+
+(smem (identifier) @definition.field)
+
+(memory (identifier) @definition.field)
+
+(register (identifier) @definition.field)
+
+(circuit (identifier) @definition.namespace)
+
+(module (identifier) @definition.namespace)
+
+(parameter (identifier) @definition.parameter)
+
+(rdwr (identifier) @definition.var)
+
+(node (identifier) @definition.var)

From 0a907316fad22b4495541328bc1a92378baf1b68 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 27 Mar 2023 14:47:26 +0000
Subject: [PATCH 0178/2704] Update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 0e525c0d5..2af898eb4 100644
--- a/README.md
+++ b/README.md
@@ -214,6 +214,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template)
 - [x] [erlang](https://github.com/WhatsApp/tree-sitter-erlang) (maintained by @filmor)
 - [x] [fennel](https://github.com/travonted/tree-sitter-fennel) (maintained by @TravonteD)
+- [x] [firrtl](https://github.com/amaanq/tree-sitter-firrtl) (maintained by @amaanq)
 - [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
 - [x] [foam](https://github.com/FoamScience/tree-sitter-foam) (experimental, maintained by @FoamScience)
 - [x] [fortran](https://github.com/stadelmanma/tree-sitter-fortran) (maintained by @amaanq)
@@ -291,6 +292,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pioasm](https://github.com/leo60228/tree-sitter-pioasm) (maintained by @leo60228)
 - [x] [po](https://github.com/erasin/tree-sitter-po) (maintained by @amaanq)
 - [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
+- [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [proto](https://github.com/mitchellh/tree-sitter-proto) (maintained by @fsouza)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)

From 47615a947ab2c40ac97dbd6082cac6de179256d0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 27 Mar 2023 13:30:37 -0400
Subject: [PATCH 0179/2704] feat(perl): update queries from upstream changes

---
 lockfile.json          | 2 +-
 queries/perl/folds.scm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 87b940098..b19281276 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -339,7 +339,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "perl": {
-    "revision": "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"
+    "revision": "3d3a95ee6645d7bcd993e77b252ffd33fd297c8e"
   },
   "php": {
     "revision": "1a40581b7a899201d7c2b4684ee34490bc306bd6"
diff --git a/queries/perl/folds.scm b/queries/perl/folds.scm
index 994d569bc..7be36e5e0 100644
--- a/queries/perl/folds.scm
+++ b/queries/perl/folds.scm
@@ -6,7 +6,6 @@
   (until_statement)
   (for_statement_1)
   (for_statement_2)
-  (foreach_statement)
   (standalone_block)
   (pod_statement)
 ] @fold

From 63e4a3a40a494e76ef7613f127b31919eebd47d1 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 27 Mar 2023 06:38:20 +0000
Subject: [PATCH 0180/2704] Update parsers: awk, cpp, cuda, glimmer, haskell,
 hlsl, perl, swift, v

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b19281276..f07293c1d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"
   },
   "awk": {
-    "revision": "e559793754c60c2cdf00cbb0409842d75f0a41dc"
+    "revision": "b8e81f62109e65adca1ab51ab9d414411db5a37f"
   },
   "bash": {
     "revision": "b338fa9f4807b9e0336cd4dde04948a8c324a4cf"
@@ -165,7 +165,7 @@
     "revision": "ae79782c00656945db69641378e688cdb78d52c1"
   },
   "glimmer": {
-    "revision": "bc1c685aa6a7caf9e58c5746ab386a1e673eb9af"
+    "revision": "16c3786e1a2c87a236c823d1a8859574778a3436"
   },
   "glsl": {
     "revision": "e2c2214045de2628b81089b1a739962f59654558"
@@ -195,7 +195,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "fb3c19e8e307acaf9336ab88330fd386ce731638"
+    "revision": "98fc7f59049aeb713ab9b72a8ff25dcaaef81087"
   },
   "hcl": {
     "revision": "0ff887f2a60a147452d52db060de6b42f42f1441"
@@ -459,7 +459,7 @@
     "revision": "52e122ae68b316d3aa960a0a422d3645ba717f42"
   },
   "swift": {
-    "revision": "4cf4bb67c27f5c5a75f634fe941c588660e69ab3"
+    "revision": "8c8412a54d97d6f96a4bf4ecb76cba4808952ed5"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -510,7 +510,7 @@
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },
   "v": {
-    "revision": "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"
+    "revision": "1828a1e6611703371039fdefba955018ac570105"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 5a7a2ad172bcc40c53aa274dff05aacb5074b509 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 28 Mar 2023 06:37:46 +0000
Subject: [PATCH 0181/2704] Update parsers: erlang, pony, v

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f07293c1d..593d9ee92 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "9fe5cdfab0f0d753112e9949a3501f64b75a3d92"
+    "revision": "abf5794511a912059b8234ea7e70d60b55df8805"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -357,7 +357,7 @@
     "revision": "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"
   },
   "pony": {
-    "revision": "9c6a4d98dea80772dbd7967fe556652a220469e5"
+    "revision": "af8a2d40ed813d818380e7798f16732f34d95bf6"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -510,7 +510,7 @@
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },
   "v": {
-    "revision": "1828a1e6611703371039fdefba955018ac570105"
+    "revision": "76ce05a3fbf9b8283972b2d81412071ea1a19552"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 9850baa958d6a1edd6586d77e354d89249f97a88 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 29 Mar 2023 06:38:24 +0000
Subject: [PATCH 0182/2704] Update parsers: help, tlaplus, v, vhs

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 593d9ee92..770ed4294 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -204,7 +204,7 @@
     "revision": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"
   },
   "help": {
-    "revision": "8f75ef3ec86bc315d5fdb939899b397289389181"
+    "revision": "c4e23d265f022dcd51053c40d47cd06e7756a347"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -483,7 +483,7 @@
     "revision": "a233ebe360a73a92c50978e5c4e9e471bc59ff42"
   },
   "tlaplus": {
-    "revision": "6d2ec894aef843fc89312c904e20c5f555aec4e3"
+    "revision": "7ba226cf85280c7917d082940022006e6a3b7b6f"
   },
   "todotxt": {
     "revision": "0207f6a4ab6aeafc4b091914d31d8235049a2578"
@@ -510,7 +510,7 @@
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },
   "v": {
-    "revision": "76ce05a3fbf9b8283972b2d81412071ea1a19552"
+    "revision": "4cd190d1aaced458e8f1548e11b3beae5e4ea806"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -519,7 +519,7 @@
     "revision": "4457145e795b363f072463e697dfe2f6973c9a52"
   },
   "vhs": {
-    "revision": "54fe7c05dfa2b9e100572496531e15c9bec86343"
+    "revision": "621457c5c6efe471b601edb5a42191824f304b41"
   },
   "vim": {
     "revision": "e39a7bbcfdcfc7900629962b785c7e14503ae590"

From c07c1c5b98a459e16e8098ae915fffc665e95e61 Mon Sep 17 00:00:00 2001
From: kawas44 <kawas44@gmail.com>
Date: Tue, 28 Mar 2023 23:17:43 +0200
Subject: [PATCH 0183/2704] feat(spell): support lisp like languages

Add spell to commonlisp, scheme, racket, clojure and fennel.
---
 queries/clojure/highlights.scm    | 4 ++--
 queries/commonlisp/highlights.scm | 6 +++---
 queries/fennel/highlights.scm     | 4 ++--
 queries/racket/highlights.scm     | 4 ++++
 queries/scheme/highlights.scm     | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index e5609b25b..a070b7ffd 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -18,12 +18,12 @@
  (#set! "priority" 105) ; Higher priority to mark the whole sexpr as a comment
 )
 (kwd_lit) @symbol
-(str_lit) @string
+(str_lit) @string @spell
 (num_lit) @number
 (char_lit) @character
 (bool_lit) @boolean
 (nil_lit) @constant.builtin
-(comment) @comment
+(comment) @comment @spell
 (regex_lit) @string.regex
 
 ["'" "`"] @string.escape
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 5cf7c1eb0..536b19c81 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -60,7 +60,7 @@
   package: (_) @namespace)
 "cl" @namespace
 
-(str_lit) @string
+(str_lit) @string @spell
 
 (num_lit) @number
 
@@ -68,7 +68,7 @@
 
 (nil_lit) @constant.builtin
 
-(comment) @comment
+(comment) @comment @spell
 
 ;; dynamic variables
 ((sym_lit) @variable.builtin
@@ -90,7 +90,7 @@
 
 ["(" ")"] @punctuation.bracket
 
-(block_comment) @comment
+(block_comment) @comment @spell
 
 
 (with_clause
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index 7322e55c3..fcb7e8b5e 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 [
   "("
@@ -23,7 +23,7 @@
 (boolean) @boolean
 (number) @number
 
-(string) @string
+(string) @string @spell
 (escape_sequence) @string.escape
 
 (symbol) @variable
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index ebf9a0f5c..91aa77d9f 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -20,6 +20,7 @@
 [(string)
  (here_string)
  (byte_string)] @string
+(string) @spell
 
 (escape_sequence) @string.escape
 
@@ -31,6 +32,9 @@
  (block_comment)
  (sexp_comment)] @comment
 
+[(comment)
+ (block_comment)] @spell
+
 ;; symbol ;;
 
 (symbol) @variable
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index 497512b87..4854a4c85 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -5,9 +5,9 @@
 (number) @number
 (character) @character
 (boolean) @boolean
-(string) @string
+(string) @string @spell
 [(comment)
- (block_comment)] @comment
+ (block_comment)] @comment @spell
 
 ;; highlight for datum comment
 ;; copied from ../clojure/highlights.scm

From 1727f63976614da8180669a52cb849bf8b4ce635 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Wed, 29 Mar 2023 23:47:49 +0200
Subject: [PATCH 0184/2704] docs: fix typos

---
 queries/gdscript/highlights.scm | 2 +-
 queries/r/highlights.scm        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index c6c6dae13..a6581bb97 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -177,7 +177,7 @@
 ; some from:
 ; - https://github.com/godotengine/godot-vscode-plugin/blob/0636797c22bf1e23a41fd24d55cdb9be62e0c992/syntaxes/GDScript.tmLanguage.json
 
-;; Bulitin Annotations
+;; Built-in Annotations
 
 ((annotation "@" @attribute (identifier) @attribute)
  (#any-of? @attribute
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index c65d766bf..ba5835c11 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -127,7 +127,7 @@
 
 "function" @keyword.function
 
-; Functions/Methos
+; Functions/Methods
 
 (call function: (identifier) @function.call)
 

From 5d85bdd8832af4d674f894e0af2fdf75fae16bbc Mon Sep 17 00:00:00 2001
From: Trey Wood <treyw@squareup.com>
Date: Wed, 29 Mar 2023 13:26:25 -0600
Subject: [PATCH 0185/2704] update sql parser and highlights

---
 lockfile.json              | 2 +-
 queries/sql/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 770ed4294..d77d422a5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -441,7 +441,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "d2b64d85d0cab5edeffe44243134033e6ff07c02"
+    "revision": "ba8ec7f3d6e76bd16c07a619474d7504f57d6b68"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index e2f7d991f..aaa8aff9f 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -245,6 +245,7 @@
   (keyword_jsonb)
   (keyword_xml)
   (keyword_bytea)
+  (keyword_enum)
   (keyword_date)
   (keyword_datetime)
   (keyword_timestamp)

From 09275650b8ae262ac173398976093b60e36e01e8 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 30 Mar 2023 06:38:27 +0000
Subject: [PATCH 0186/2704] Update parsers: cue, sql

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d77d422a5..bec7df21f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "967e7d74a1a04a680674199e12141963a8dd6336"
   },
   "cue": {
-    "revision": "4ffcda8c2bdfee1c2ba786cd503d0508ea92cca2"
+    "revision": "f83fd9abbece9becb5232c517b9d47ff141e237a"
   },
   "d": {
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
@@ -441,7 +441,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "ba8ec7f3d6e76bd16c07a619474d7504f57d6b68"
+    "revision": "685c8905831fa7a0b548f7d712b97436b6eb301f"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From d546bcd1f1393e144396fc049ae4bf7d4fffccab Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Thu, 30 Mar 2023 08:21:42 +0200
Subject: [PATCH 0187/2704] highlights(sql): add `full`, `any` and `some`
 keywords

---
 queries/sql/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index aaa8aff9f..a3b5de05f 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -120,6 +120,7 @@
   (keyword_right)
   (keyword_outer)
   (keyword_inner)
+  (keyword_full)
   (keyword_order)
   (keyword_partition)
   (keyword_group)
@@ -160,6 +161,8 @@
   (keyword_owner)
   (keyword_union)
   (keyword_all)
+  (keyword_any)
+  (keyword_some)
   (keyword_except)
   (keyword_intersect)
   (keyword_returning)

From 2f3113ff6d554e3fe4da3610135c2f404f7aa270 Mon Sep 17 00:00:00 2001
From: Trey Wood <treyw@squareup.com>
Date: Fri, 31 Mar 2023 09:43:55 -0600
Subject: [PATCH 0188/2704] fix(ruby): then blocks should not be
 `@conditional`, just "then"

---
 queries/ruby/highlights.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 9488297b4..3ef35205c 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -44,16 +44,11 @@
  "if"
  "unless"
  "when"
+ "then"
  ] @conditional
 
 (if
   "end" @conditional)
-(if
-  (then) @conditional)
-(unless
-  (then) @conditional)
-(elsif
-  (then) @conditional)
 
 [
  "for"

From 93fa5df0a3f0aeb72df50a9d2110cb90fc5a0a13 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Apr 2023 15:58:48 +0200
Subject: [PATCH 0189/2704] chore(help)!: renamed to vimdoc

---
 README.md                               |  4 ++--
 lockfile.json                           |  6 +++---
 lua/nvim-treesitter/parsers.lua         | 17 +++++++++--------
 queries/{help => vimdoc}/highlights.scm |  0
 queries/{help => vimdoc}/injections.scm |  0
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename queries/{help => vimdoc}/highlights.scm (100%)
 rename queries/{help => vimdoc}/injections.scm (100%)

diff --git a/README.md b/README.md
index 2af898eb4..22b723059 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ All modules are disabled by default and need to be activated explicitly in your
 ```lua
 require'nvim-treesitter.configs'.setup {
   -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "c", "lua", "vim", "help", "query" },
+  ensure_installed = { "c", "lua", "vim", "vimdoc", "query" },
 
   -- Install parsers synchronously (only applied to `ensure_installed`)
   sync_install = false,
@@ -241,7 +241,6 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [haskell](https://github.com/tree-sitter/tree-sitter-haskell)
 - [x] [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay)
-- [x] [help](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @vigoux)
 - [x] [hjson](https://github.com/winston0410/tree-sitter-hjson) (maintained by @winston0410)
 - [x] [hlsl](https://github.com/theHamsta/tree-sitter-hlsl) (maintained by @theHamsta)
 - [x] [hocon](https://github.com/antosha417/tree-sitter-hocon) (maintained by @antosha417)
@@ -348,6 +347,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
 - [x] [vim](https://github.com/vigoux/tree-sitter-viml) (maintained by @vigoux)
+- [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason)
 - [x] [vue](https://github.com/ikatyang/tree-sitter-vue) (maintained by @WhyNotHugo)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
diff --git a/lockfile.json b/lockfile.json
index bec7df21f..327b68194 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -203,9 +203,6 @@
   "heex": {
     "revision": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"
   },
-  "help": {
-    "revision": "c4e23d265f022dcd51053c40d47cd06e7756a347"
-  },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
@@ -524,6 +521,9 @@
   "vim": {
     "revision": "e39a7bbcfdcfc7900629962b785c7e14503ae590"
   },
+  "vimdoc": {
+    "revision": "b2ec4ec5f7be24cb6f7ccffafd7204477fe5784a"
+  },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c3c9bab6c..753ad51e5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -641,14 +641,6 @@ list.heex = {
   maintainers = { "@connorlay" },
 }
 
-list.help = {
-  install_info = {
-    url = "https://github.com/neovim/tree-sitter-vimdoc",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@vigoux" },
-}
-
 list.hjson = {
   install_info = {
     url = "https://github.com/winston0410/tree-sitter-hjson",
@@ -1550,6 +1542,15 @@ list.vim = {
   maintainers = { "@vigoux" },
 }
 
+list.vimdoc = {
+  install_info = {
+    url = "https://github.com/neovim/tree-sitter-vimdoc",
+    files = { "src/parser.c" },
+  },
+  filetype = "help",
+  maintainers = { "@clason" },
+}
+
 list.vue = {
   install_info = {
     url = "https://github.com/ikatyang/tree-sitter-vue",
diff --git a/queries/help/highlights.scm b/queries/vimdoc/highlights.scm
similarity index 100%
rename from queries/help/highlights.scm
rename to queries/vimdoc/highlights.scm
diff --git a/queries/help/injections.scm b/queries/vimdoc/injections.scm
similarity index 100%
rename from queries/help/injections.scm
rename to queries/vimdoc/injections.scm

From ee1d6182801204c397534ac69c37f83283ba69e3 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 1 Apr 2023 14:17:24 +0000
Subject: [PATCH 0190/2704] Update parsers: vhs

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 327b68194..52689f8a5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -516,7 +516,7 @@
     "revision": "4457145e795b363f072463e697dfe2f6973c9a52"
   },
   "vhs": {
-    "revision": "621457c5c6efe471b601edb5a42191824f304b41"
+    "revision": "77fd8a8fcc0b4788e0b1569b1a4fa070b36add28"
   },
   "vim": {
     "revision": "e39a7bbcfdcfc7900629962b785c7e14503ae590"

From 06075ecd04892271e6a3fbd5c0d4e89ca6fb8375 Mon Sep 17 00:00:00 2001
From: ghostbuster91 <ghostbuster91@users.noreply.github.com>
Date: Sat, 1 Apr 2023 19:53:19 +0200
Subject: [PATCH 0191/2704] fix(scala): Add missing locals definitions for
 scala

---
 queries/scala/locals.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index 70b4b7990..928d7e723 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -4,6 +4,7 @@
   (template_body)
   (lambda_expression)
   (function_declaration)
+  (block)
 ] @scope
 
 ; References
@@ -21,6 +22,9 @@
 (parameter
   name: (identifier) @definition.parameter)
 
+(class_parameter
+  name: (identifier) @definition.parameter)
+
 (binding
   name: (identifier) @definition.var)
 

From cbfa7cae1b38e1b843b2275d633ddbb05a105906 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 2 Apr 2023 06:35:24 +0000
Subject: [PATCH 0192/2704] Update parsers: awk, tiger

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 52689f8a5..8f64bbd30 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"
   },
   "awk": {
-    "revision": "b8e81f62109e65adca1ab51ab9d414411db5a37f"
+    "revision": "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"
   },
   "bash": {
     "revision": "b338fa9f4807b9e0336cd4dde04948a8c324a4cf"
@@ -477,7 +477,7 @@
     "revision": "d4deb1bd9e848f2dbe81103a151d99e8546de480"
   },
   "tiger": {
-    "revision": "a233ebe360a73a92c50978e5c4e9e471bc59ff42"
+    "revision": "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3"
   },
   "tlaplus": {
     "revision": "7ba226cf85280c7917d082940022006e6a3b7b6f"

From 6f5a4f6306e6dfd23f93c8b60493871c9a600cc0 Mon Sep 17 00:00:00 2001
From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
Date: Mon, 3 Apr 2023 12:46:21 +0800
Subject: [PATCH 0193/2704] feat: use `-bundle` to build parsers on macOS

This will make the parsers align more closely to the ones bundled with
Neovim, because CMake uses the `-bundle` flag (instead of `-shared`) on
macOS when a library is compiled as a `MODULE`.

See, for example:

    https://github.com/neovim/neovim/blob/10baf89712724b4b95f7c641f2012f051737003c/cmake.deps/cmake/TreesitterParserCMakeLists.txt#L6-L9
---
 lua/nvim-treesitter/shell_command_selectors.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index cf99a01d7..de44ffa1c 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -110,9 +110,13 @@ function M.select_compiler_args(repo, compiler)
       "parser.so",
       "-I./src",
       repo.files,
-      "-shared",
       "-Os",
     }
+    if fn.has "mac" == 1 then
+      table.insert(args, "-bundle")
+    else
+      table.insert(args, "-shared")
+    end
     if
       #vim.tbl_filter(function(file) ---@param file string
         local ext = vim.fn.fnamemodify(file, ":e")

From 9711139326284ddb2c6f1d29783a162c08b47bb8 Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Mon, 27 Mar 2023 12:52:40 +0200
Subject: [PATCH 0194/2704] docs: add a small note about local queries

This just adds a small note in the CONTRIBUTING section about local
queries and how they differ from those listed upstream.
---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d809bc784..2d1a16a0b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -240,6 +240,12 @@ Used for XML-like tags.
 
 ### Locals
 
+Note: pay specific attention to the captures here as they are a bit different to
+those listed in the upstream [Local Variables
+docs](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables).
+Some of these docs didn't exist when `nvim-treesitter` was created and the
+upstream captures are more limiting than what we have here.
+
 ```scheme
 @definition            ; various definitions
 @definition.constant   ; constants

From 0a20d1bb63ff0352b1254cc21ad99f4d04327ea6 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 3 Apr 2023 11:02:36 -0400
Subject: [PATCH 0195/2704] feat(ecma): use lua-match for jsdoc injections

---
 queries/ecma/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index bc5af1305..52675d506 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -1,5 +1,5 @@
 (((comment) @_jsdoc_comment
-  (#match? @_jsdoc_comment "^/\\*\\*[^\\*].*\\*/")) @jsdoc)
+  (#lua-match? @_jsdoc_comment "^/[*][*][^*].*[*]/$")) @jsdoc)
 
 (comment) @comment
 

From 871f5665d92d59a369cf916e9aa4d321d466f1e3 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 4 Apr 2023 06:36:38 +0000
Subject: [PATCH 0196/2704] Update parsers: svelte, swift, vimdoc

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8f64bbd30..06ea85782 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -453,10 +453,10 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "52e122ae68b316d3aa960a0a422d3645ba717f42"
+    "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "8c8412a54d97d6f96a4bf4ecb76cba4808952ed5"
+    "revision": "ca3a37055069277ad91d6a2c35faf9f247dcfbfb"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -522,7 +522,7 @@
     "revision": "e39a7bbcfdcfc7900629962b785c7e14503ae590"
   },
   "vimdoc": {
-    "revision": "b2ec4ec5f7be24cb6f7ccffafd7204477fe5784a"
+    "revision": "15c2fdcc57f51f1caef82fe75e1ffb733626dcae"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"

From 411e771d511442ab81670701f5c830f6c74aadd7 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 5 Apr 2023 06:37:29 +0000
Subject: [PATCH 0197/2704] Update parsers: sql

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 06ea85782..b30b12077 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -438,7 +438,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "685c8905831fa7a0b548f7d712b97436b6eb301f"
+    "revision": "a1870b26a762cdd814725ac9fd40886ff2733dc4"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From 153818c29bd0bd845a51869c16576756bccac01f Mon Sep 17 00:00:00 2001
From: Saleh Bakra'a <SalBakraa@gmail.com>
Date: Thu, 6 Apr 2023 15:50:38 +0300
Subject: [PATCH 0198/2704] kotlin: update parser and queries

Update `queries/kotlin/locals.scm` to use the the newly exposed `function_value_parameters` node.
---
 lockfile.json             | 2 +-
 queries/kotlin/locals.scm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b30b12077..1e55e230c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -255,7 +255,7 @@
     "revision": "e36f054a60c4d9e5ae29567d439fdb8790b53b30"
   },
   "kotlin": {
-    "revision": "826ef28d605d0925a86a99022cd222c96f2d0952"
+    "revision": "c84d16e7f75032cdd8c4ad986a76ca9e1fe4e639"
   },
   "lalrpop": {
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
diff --git a/queries/kotlin/locals.scm b/queries/kotlin/locals.scm
index d1b45f276..0dea64618 100644
--- a/queries/kotlin/locals.scm
+++ b/queries/kotlin/locals.scm
@@ -23,8 +23,9 @@
 ;;; Variables
 
 (function_declaration
-	(parameter
-		(simple_identifier) @definition.parameter))
+	(function_value_parameters
+		(parameter
+			(simple_identifier) @definition.parameter)))
 
 (lambda_literal
 	(lambda_parameters

From c85d059c462ae7de0aa2a6ed0589f0b223e0e6a9 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 6 Apr 2023 12:51:44 +0000
Subject: [PATCH 0199/2704] Update parsers: c_sharp, gitcommit

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1e55e230c..454b02529 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"
   },
   "c_sharp": {
-    "revision": "fcacbeb4af6bcdcfb4527978a997bb03f4fe086d"
+    "revision": "92d572eef5ffdd4117e7ba36b56850a90cb79151"
   },
   "capnp": {
     "revision": "fc6e2addf103861b9b3dffb82c543eb6b71061aa"
@@ -156,7 +156,7 @@
     "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
   },
   "gitcommit": {
-    "revision": "f71b93f399c9c2b315825827c95466e7405ec622"
+    "revision": "17235998809be904892f14ee57730d96795e9323"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"

From 226c1475a46a2ef6d840af9caa0117a439465500 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Apr 2023 07:29:32 +0000
Subject: [PATCH 0200/2704] Update parsers: sql (#4615)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 454b02529..705e10c39 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -438,7 +438,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "a1870b26a762cdd814725ac9fd40886ff2733dc4"
+    "revision": "8f1c49febcb8944d39df8554d32c749b4f5f3158"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From 584ccea56e2d37b31ba292da2b539e1a4bb411ca Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 7 Apr 2023 15:03:10 +0200
Subject: [PATCH 0201/2704] vim: switch to parser maintained by Neovim (#4610)

Problem: The current vimscript parser has not been maintained for a while, which was a blocker for packaging the coming Neovim release.

Solution: Fork parser to https://github.com/neovim/tree-sitter-vim/ and maintain it there from now on.
---
 README.md                       | 2 +-
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 22b723059..b6fb87949 100644
--- a/README.md
+++ b/README.md
@@ -346,7 +346,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
-- [x] [vim](https://github.com/vigoux/tree-sitter-viml) (maintained by @vigoux)
+- [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
 - [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason)
 - [x] [vue](https://github.com/ikatyang/tree-sitter-vue) (maintained by @WhyNotHugo)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
diff --git a/lockfile.json b/lockfile.json
index 705e10c39..633119c91 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -519,7 +519,7 @@
     "revision": "77fd8a8fcc0b4788e0b1569b1a4fa070b36add28"
   },
   "vim": {
-    "revision": "e39a7bbcfdcfc7900629962b785c7e14503ae590"
+    "revision": "2886b52143d570d81f97c98be7a1e204ce9d3bcd"
   },
   "vimdoc": {
     "revision": "15c2fdcc57f51f1caef82fe75e1ffb733626dcae"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 753ad51e5..9e7c52091 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1536,10 +1536,10 @@ list.vhs = {
 
 list.vim = {
   install_info = {
-    url = "https://github.com/vigoux/tree-sitter-viml",
+    url = "https://github.com/neovim/tree-sitter-vim",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@vigoux" },
+  maintainers = { "@clason" },
 }
 
 list.vimdoc = {

From ab39fe6c862f18f61cc5bd8c5dc7c8a0f11efcd9 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sun, 9 Apr 2023 01:18:44 +0900
Subject: [PATCH 0202/2704] refactor(html_inject): Use lua-match instead of
 match

---
 queries/html_tags/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index dd971b7d9..ba6d35414 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -5,7 +5,8 @@
 (
   (style_element
     (start_tag) @_no_type_lang
-      (#not-match? @_no_type_lang "\\s(lang|type)\\s*\\=")
+      (#not-lua-match? @_no_type_lang "%slang%s*=")
+      (#not-lua-match? @_no_type_lang "%stype%s*=")
     (raw_text) @css))
 
 (

From e482c9b4e225df02cf1f08d526b8fc88edda395e Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 8 Apr 2023 14:09:39 +0900
Subject: [PATCH 0203/2704] feat(cpp): more distinction between function/method
 declaration and call

---
 queries/cpp/highlights.scm | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 854e03cb3..586067155 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -15,15 +15,10 @@
     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))
+ (#has-parent? @_parent template_method function_declarator))
 
 (field_declaration
   (field_identifier) @field)
@@ -61,6 +56,12 @@
       declarator: (qualified_identifier
         name: (qualified_identifier
           name: (identifier) @function)))
+(function_declarator
+      declarator: (template_function
+        name: (identifier) @function))
+(function_declarator
+      declarator: (template_method
+        name: (field_identifier) @method))
 ((function_declarator
       declarator: (qualified_identifier
         name: (identifier) @constructor))
@@ -83,10 +84,23 @@
         name: (qualified_identifier
               name: (qualified_identifier
                       name: (identifier) @function.call))))
+(call_expression
+  function: (template_function
+              name: (identifier) @function.call))
+(call_expression
+  function: (qualified_identifier
+              name: (template_function
+                      name: (identifier) @function.call)))
+(call_expression
+  function:
+      (qualified_identifier
+        name: (qualified_identifier
+              name: (template_function
+                      name: (identifier) @function.call))))
 
 (call_expression
   function: (field_expression
-              field: (field_identifier) @function.call))
+              field: (field_identifier) @method.call))
 
 ((call_expression
   function: (identifier) @constructor)

From 1c7ba3ffcfe8b828b69c7100b4caf7daa837ce70 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 1 Apr 2023 18:31:00 +0900
Subject: [PATCH 0204/2704] fix(indent): Make indent ignore trailing
 spaces/comment

Signed-off-by: Pham Huy Hoang <hoangtun0810@gmail.com>
---
 lua/nvim-treesitter/indent.lua | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 7290b3148..7b3485341 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -17,17 +17,19 @@ M.comment_parsers = {
 
 ---@param root TSNode
 ---@param lnum integer
+---@param col? integer
 ---@return TSNode
-local function get_first_node_at_line(root, lnum)
-  local col = vim.fn.indent(lnum)
+local function get_first_node_at_line(root, lnum, col)
+  col = col or vim.fn.indent(lnum)
   return root:descendant_for_range(lnum - 1, col, lnum - 1, col)
 end
 
 ---@param root TSNode
 ---@param lnum integer
+---@param col? integer
 ---@return TSNode
-local function get_last_node_at_line(root, lnum)
-  local col = #vim.fn.getline(lnum) - 1
+local function get_last_node_at_line(root, lnum, col)
+  col = col or (#vim.fn.getline(lnum) - 1)
   return root:descendant_for_range(lnum - 1, col, lnum - 1, col)
 end
 
@@ -128,7 +130,23 @@ function M.get_indent(lnum)
   local node ---@type TSNode
   if is_empty_line then
     local prevlnum = vim.fn.prevnonblank(lnum)
-    node = get_last_node_at_line(root, prevlnum)
+    local indent = vim.fn.indent(prevlnum)
+    local prevline = vim.trim(vim.fn.getline(prevlnum))
+    -- The final position can be trailing spaces, which should not affect indentation
+    node = get_last_node_at_line(root, prevlnum, indent + #prevline - 1)
+    if node:type():match "comment" then
+      -- The final node we capture of the previous line can be a comment node, which should also be ignored
+      -- Unless the last line is an entire line of comment, ignore the comment range and find the last node again
+      local first_node = get_first_node_at_line(root, prevlnum, indent)
+      if first_node:id() ~= node:id() then
+        -- In case the last captured node is a trailing comment node, re-trim the string
+        prevline = vim.trim(prevline:sub(1, node:start() + 1 - indent))
+        -- Add back indent as indent of prevline was trimmed away
+        local col = indent + #prevline - 1
+        node = get_last_node_at_line(root, prevlnum, col)
+      end
+    end
+
     if q.indent["end"][node:id()] then
       node = get_first_node_at_line(root, lnum)
     end

From 474c59dcf1d5586d6ef0d3f91b380c6c25eb314b Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 3 Apr 2023 23:47:41 +0900
Subject: [PATCH 0205/2704] add test

---
 lua/nvim-treesitter/indent.lua                 |  4 ++--
 tests/indent/algorithm/trailing.py             |  6 ++++++
 .../indent/algorithm/trailing_whitespace.html  | 11 +++++++++++
 tests/indent/algorithm_spec.lua                | 18 ++++++++++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 tests/indent/algorithm/trailing.py
 create mode 100644 tests/indent/algorithm/trailing_whitespace.html
 create mode 100644 tests/indent/algorithm_spec.lua

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 7b3485341..fc11b4063 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -138,15 +138,15 @@ function M.get_indent(lnum)
       -- The final node we capture of the previous line can be a comment node, which should also be ignored
       -- Unless the last line is an entire line of comment, ignore the comment range and find the last node again
       local first_node = get_first_node_at_line(root, prevlnum, indent)
+      local _, scol, _, _ = node:range()
       if first_node:id() ~= node:id() then
         -- In case the last captured node is a trailing comment node, re-trim the string
-        prevline = vim.trim(prevline:sub(1, node:start() + 1 - indent))
+        prevline = vim.trim(prevline:sub(1, scol - indent))
         -- Add back indent as indent of prevline was trimmed away
         local col = indent + #prevline - 1
         node = get_last_node_at_line(root, prevlnum, col)
       end
     end
-
     if q.indent["end"][node:id()] then
       node = get_first_node_at_line(root, lnum)
     end
diff --git a/tests/indent/algorithm/trailing.py b/tests/indent/algorithm/trailing.py
new file mode 100644
index 000000000..9a753ae33
--- /dev/null
+++ b/tests/indent/algorithm/trailing.py
@@ -0,0 +1,6 @@
+class x: # Ignore comment
+
+class y: 
+    def z(): # Ignore comment
+
+class t:    
diff --git a/tests/indent/algorithm/trailing_whitespace.html b/tests/indent/algorithm/trailing_whitespace.html
new file mode 100644
index 000000000..f3cf177a2
--- /dev/null
+++ b/tests/indent/algorithm/trailing_whitespace.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+    <body>
+        <!-- This file deliberately contains trailing whitespace -->
+        <!-- Don't remove them -->
+        <div>   
+            a   
+
+        </div>    
+    </body>     
+</html>
diff --git a/tests/indent/algorithm_spec.lua b/tests/indent/algorithm_spec.lua
new file mode 100644
index 000000000..faf7998ec
--- /dev/null
+++ b/tests/indent/algorithm_spec.lua
@@ -0,0 +1,18 @@
+local Runner = require("tests.indent.common").Runner
+-- local XFAIL = require("tests.indent.common").XFAIL
+
+local runner = Runner:new(it, "tests/indent/algorithm", {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 4,
+  expandtab = true,
+})
+
+describe("test indent algorithm: ", function()
+  describe("new line:", function()
+    runner:new_line("trailing.py", { on_line = 1, text = "x: str", indent = 4 }, "indent next line, ignore comment")
+    runner:new_line("trailing.py", { on_line = 4, text = "pass", indent = 8 }, "indent next line, ignore comment")
+    runner:new_line("trailing.py", { on_line = 6, text = "pass", indent = 4 }, "indent next line, ignore whitespace")
+    runner:new_line("trailing_whitespace.html", { on_line = 9, text = "x", indent = 8 }, "not ignore @indent.end")
+  end)
+end)

From 9161093fc7e13b12aa5bc86c641768c049d43a26 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 20 Mar 2023 15:58:06 +0900
Subject: [PATCH 0206/2704] fix(c_indents): fix expression leaking indents

---
 queries/c/indents.scm       |  8 +++++++-
 tests/indent/c/issue-4525.c | 23 +++++++++++++++++++++++
 tests/indent/c_spec.lua     | 16 ++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/c/issue-4525.c

diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index 71f47ced1..4d1ba3940 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -6,9 +6,15 @@
   (compound_literal_expression)
   (initializer_list)
   (init_declarator)
-  (expression_statement)
 ] @indent.begin
 
+; With current indent logic, if we capture expression_statement with @indent.begin
+; It will be affected by _parent_ node with error subnodes deep down the tree
+; So narrow indent capture to check for error inside expression statement only, 
+(expression_statement
+  (_) @indent.begin
+  ";" @indent.end)
+
 (
   ERROR
     "for" "(" @indent.begin ";" ";" ")" @indent.end)
diff --git a/tests/indent/c/issue-4525.c b/tests/indent/c/issue-4525.c
new file mode 100644
index 000000000..35feccedc
--- /dev/null
+++ b/tests/indent/c/issue-4525.c
@@ -0,0 +1,23 @@
+#include <stdint.h>
+#include <inttypes.h>
+#include <stdio.h>
+
+char *a = "a" "b" "c" D;
+
+static int a, b, c;
+a = b = c = 0;
+
+static int d = 0, e = 0, f = 0;
+
+int main(void) {
+    printf("String" PRIu64 "\n", (uint64_t)0);
+    printf("String" AND_ERROR_NODE "and string");
+    fflush(stdout);
+    a = 0; b = 0; c = 0;
+    int x = 0; int y = 0; int z = 0;
+    foo(1, 2);
+    x++;
+    a = b
+        = c
+        = d;
+}
diff --git a/tests/indent/c_spec.lua b/tests/indent/c_spec.lua
index 4fcdb3ebf..4e2826a54 100644
--- a/tests/indent/c_spec.lua
+++ b/tests/indent/c_spec.lua
@@ -73,5 +73,21 @@ describe("indent C:", function()
     for _, line in ipairs { 10, 12, 14 } do
       runner:new_line("if_else.c", { on_line = line, text = "{}", indent = 4 })
     end
+
+    for _, info in ipairs {
+      { 8, 0 },
+      { 10, 0 },
+      { 13, 4 },
+      { 14, 4 },
+      { 15, 4 },
+      { 16, 4 },
+      { 17, 4 },
+      { 18, 4 },
+      { 20, 8 },
+      { 21, 8 },
+      { 22, 4 },
+    } do
+      runner:new_line("issue-4525.c", { on_line = info[1], text = "x++;", indent = info[2] })
+    end
   end)
 end)

From a57d2a599b57a619f58a5c91c89d9bf12f8977b2 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 8 Apr 2023 14:11:24 +0900
Subject: [PATCH 0207/2704] feat(markdown_inline): add @nospell where
 appropriate

---
 queries/markdown_inline/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 9130ba06b..8369abffe 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -2,7 +2,7 @@
 [
   (code_span)
   (link_title)
-] @text.literal
+] @text.literal @nospell
 
 [
   (emphasis_delimiter)
@@ -18,7 +18,7 @@
 [
   (link_destination)
   (uri_autolink)
-] @text.uri
+] @text.uri @nospell
 
 [
   (link_label)

From fa9fe9a95ba481e26e11eede4657f8c5350a0eaa Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 8 Apr 2023 14:23:05 +0900
Subject: [PATCH 0208/2704] fix(rust): highlight SNAKE_CASE scoped identifier
 name as @constant

---
 queries/rust/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 1a9330a70..6c4491a02 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -82,6 +82,9 @@
 ((scoped_identifier
     name: (identifier) @type)
  (#lua-match? @type "^[A-Z]"))
+((scoped_identifier
+    name: (identifier) @constant)
+ (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
 
 [
   (crate)

From 2fe7f969c193fc2e5cad747617f52214c83450fa Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Mon, 10 Apr 2023 08:52:50 +0200
Subject: [PATCH 0209/2704] fix(dart): try statement wouldn't indent (#4623)

---
 queries/dart/indents.scm   | 1 +
 tests/indent/dart/try.dart | 5 +++++
 tests/indent/dart_spec.lua | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 tests/indent/dart/try.dart

diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index 0c7bfe92d..9616f0629 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -10,6 +10,7 @@
   (list_literal)
   (return_statement)
   (arguments)
+  (try_statement)
 ] @indent.begin
 
 [
diff --git a/tests/indent/dart/try.dart b/tests/indent/dart/try.dart
new file mode 100644
index 000000000..807ad3b0f
--- /dev/null
+++ b/tests/indent/dart/try.dart
@@ -0,0 +1,5 @@
+void test() {
+  try{
+  } catch(e) {
+  }
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index 8b05cc753..fde41b362 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -17,4 +17,5 @@ end)
 
 describe("new line:", function()
   run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
+  run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
 end)

From cc360a9beb1b30d172438f640e2c3450358c4086 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 10 Apr 2023 06:36:13 +0000
Subject: [PATCH 0210/2704] Update parsers: devicetree, hcl, terraform, vim,
 zig

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 633119c91..d30a5b9ae 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -81,7 +81,7 @@
     "revision": "53485a8f301254e19c518aa20c80f1bcf7cf5c62"
   },
   "devicetree": {
-    "revision": "ea30a05d0f0446a96d8b096ad11828ad4f8ad849"
+    "revision": "6428cee0e9d76fac3291796ced56ac14ecd036ee"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -198,7 +198,7 @@
     "revision": "98fc7f59049aeb713ab9b72a8ff25dcaaef81087"
   },
   "hcl": {
-    "revision": "0ff887f2a60a147452d52db060de6b42f42f1441"
+    "revision": "becebebd3509c02e871c99be55556269be1def1b"
   },
   "heex": {
     "revision": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"
@@ -471,7 +471,7 @@
     "revision": "2158ecce11ea542f9b791baf2c7fb33798174ed2"
   },
   "terraform": {
-    "revision": "0ff887f2a60a147452d52db060de6b42f42f1441"
+    "revision": "becebebd3509c02e871c99be55556269be1def1b"
   },
   "thrift": {
     "revision": "d4deb1bd9e848f2dbe81103a151d99e8546de480"
@@ -519,7 +519,7 @@
     "revision": "77fd8a8fcc0b4788e0b1569b1a4fa070b36add28"
   },
   "vim": {
-    "revision": "2886b52143d570d81f97c98be7a1e204ce9d3bcd"
+    "revision": "cd63bd20644a419d209b625d21258617580273d2"
   },
   "vimdoc": {
     "revision": "15c2fdcc57f51f1caef82fe75e1ffb733626dcae"
@@ -543,6 +543,6 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zig": {
-    "revision": "f3bc9ffe9ca10f52dee01999b5b6ce9a4074b0ac"
+    "revision": "2c7b6308d906d7aec4b3e1fafaaeca447a8a2c2f"
   }
 }

From a82501244a75b3d59cdc42496e5ad841f31e4d6d Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sun, 9 Apr 2023 15:05:04 +0900
Subject: [PATCH 0211/2704] refactor(html_inject): use lua-match where possible

---
 queries/html_tags/injections.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index ba6d35414..e8926b6b8 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -25,7 +25,8 @@
 (
   (script_element
     (start_tag) @_no_type_lang
-      (#not-match? @_no_type_lang "\\s(lang|type)\\s*\\=")
+      (#not-lua-match? @_no_type_lang "%slang%s*=")
+      (#not-lua-match? @_no_type_lang "%stype%s*=")
     (raw_text) @javascript))
 
 ; <script type="mimetype-or-well-known-script-type">
@@ -47,11 +48,11 @@
 ; <a @click="${e => console.log(e)}">
 ((attribute
   (quoted_attribute_value (attribute_value) @javascript))
-  (#match? @javascript "\\$\\{")
+  (#lua-match? @javascript "%${")
   (#offset! @javascript 0 2 0 -1))
 ((attribute
   (attribute_value) @javascript)
-  (#match? @javascript "\\$\\{")
+  (#lua-match? @javascript "%${")
   (#offset! @javascript 0 2 0 -2))
 
 (comment) @comment

From ac4020c70722337c326bf65b645b162ee6e1796b Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Tue, 11 Apr 2023 09:15:58 +0200
Subject: [PATCH 0212/2704] fix(dart): function argument indents is
 inconsistent

---
 queries/dart/indents.scm                  |  3 ++-
 tests/indent/dart/multiple_arguments.dart | 13 +++++++++++++
 tests/indent/dart_spec.lua                |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/dart/multiple_arguments.dart

diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index 9616f0629..1573290d7 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -1,7 +1,6 @@
 [
   (class_body)
   (function_body)
-  (function_expression_body)
   (declaration (initializers))
   (switch_block)
   (if_statement)
@@ -28,5 +27,7 @@
 
 ; this one is for dedenting the else block
 (if_statement (block) @indent.branch)
+; Issue #4637
+(function_expression_body (block) @indent.branch)
 
 (comment) @indent.ignore
diff --git a/tests/indent/dart/multiple_arguments.dart b/tests/indent/dart/multiple_arguments.dart
new file mode 100644
index 000000000..63a4a0438
--- /dev/null
+++ b/tests/indent/dart/multiple_arguments.dart
@@ -0,0 +1,13 @@
+// Example method that causes an issue with indentation on usage
+void someMethod(
+  void onSuccess(),
+  void onError(Exception ex, StackTrace stackTrace),
+) {
+  try {} catch (_, __) {}
+}
+
+void main() {
+  someMethod(() {
+  }, (Exception ex, StackTrace stackTrace) {
+  });
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index fde41b362..b2632cfa4 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -18,4 +18,6 @@ end)
 describe("new line:", function()
   run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
+  run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
+  run:new_line("multiple_arguments.dart", { on_line = 11, text = "var x;", indent = 4 })
 end)

From 0efa55ae2e6676b1a4cb66c5ee31ea295c6ebc2f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 11:31:40 +0000
Subject: [PATCH 0213/2704] Update parsers: comment, gitcommit, glimmer, v
 (#4636)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d30a5b9ae..c6756c751 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "399605a02bcd5daa309ce63a6459c600dce3473f"
   },
   "comment": {
-    "revision": "a37ca370310ac6f89b6e0ebf2b86b2219780494e"
+    "revision": "f08e7d44b2923e9da2bf487a2f365d08677d368e"
   },
   "commonlisp": {
     "revision": "c7e814975ab0d0d04333d1f32391c41180c58919"
@@ -156,7 +156,7 @@
     "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
   },
   "gitcommit": {
-    "revision": "17235998809be904892f14ee57730d96795e9323"
+    "revision": "04dcb2cb9a4cf638252b8bd4a829f9acadf2cc4c"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -165,7 +165,7 @@
     "revision": "ae79782c00656945db69641378e688cdb78d52c1"
   },
   "glimmer": {
-    "revision": "16c3786e1a2c87a236c823d1a8859574778a3436"
+    "revision": "21805f429c5b7536be9f5f61dcabb5d3a4173bec"
   },
   "glsl": {
     "revision": "e2c2214045de2628b81089b1a739962f59654558"
@@ -507,7 +507,7 @@
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },
   "v": {
-    "revision": "4cd190d1aaced458e8f1548e11b3beae5e4ea806"
+    "revision": "234c1028883187c6b48e030780b7332229faefa3"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 18f9e1a47fc25272836a84aa8adb03925c73b33d Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 12 Apr 2023 15:28:59 +0300
Subject: [PATCH 0214/2704] javascript: highlight more builtins

Co-Authored-By: Sergey Berezhnoy <veged@ya.ru>
---
 queries/ecma/highlights.scm | 65 +++++++++++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 2 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index be70ffd13..9fe50ac34 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -30,10 +30,65 @@
  (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
 
 ((identifier) @variable.builtin
- (#vim-match? @variable.builtin "^(arguments|module|console|window|document)$"))
+ (#any-of? @variable.builtin
+           "arguments"
+           "module"
+           "console"
+           "window"
+           "document"))
+
+((identifier) @type.builtin
+ (#any-of? @type.builtin
+           "Object"
+           "Function"
+           "Boolean"
+           "Symbol"
+           "Number"
+           "Math"
+           "Date"
+           "String"
+           "RegExp"
+           "Map"
+           "Set"
+           "WeakMap"
+           "WeakSet"
+           "Promise"
+           "Array"
+           "Int8Array"
+           "Uint8Array"
+           "Uint8ClampedArray"
+           "Int16Array"
+           "Uint16Array"
+           "Int32Array"
+           "Uint32Array"
+           "Float32Array"
+           "Float64Array"
+           "ArrayBuffer"
+           "DataView"
+           "Error"
+           "EvalError"
+           "InternalError"
+           "RangeError"
+           "ReferenceError"
+           "SyntaxError"
+           "TypeError"
+           "URIError"))
+
+((identifier) @namespace.builtin
+ (#eq? @namespace.builtin "Intl"))
 
 ((identifier) @function.builtin
- (#eq? @function.builtin "require"))
+ (#any-of? @function.builtin
+           "eval"
+           "isFinite"
+           "isNaN"
+           "parseFloat"
+           "parseInt"
+           "decodeURI"
+           "decodeURIComponent"
+           "encodeURI"
+           "encodeURIComponent"
+           "require"))
 
 ; Function and method definitions
 ;--------------------------------
@@ -48,6 +103,9 @@
   name: (identifier) @function)
 (method_definition
   name: [(property_identifier) (private_property_identifier)] @method)
+(method_definition
+  name: (property_identifier) @constructor
+  (#eq? @constructor "constructor"))
 
 (pair
   key: (property_identifier) @method
@@ -125,6 +183,9 @@
 
 (hash_bang_line) @preproc
 
+((string_fragment) @preproc
+ (#eq? @preproc "use strict"))
+
 (string) @string @spell
 (template_string) @string
 (escape_sequence) @string.escape

From ce3ea7aebef3bce752348b1e245279a6f5e79f90 Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Tue, 11 Apr 2023 21:05:00 +0200
Subject: [PATCH 0215/2704] Revert "fix(dart): function argument indents is
 inconsistent"

This reverts commit ac4020c70722337c326bf65b645b162ee6e1796b.
---
 queries/dart/indents.scm                  |  3 +--
 tests/indent/dart/multiple_arguments.dart | 13 -------------
 tests/indent/dart_spec.lua                |  2 --
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 tests/indent/dart/multiple_arguments.dart

diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index 1573290d7..9616f0629 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -1,6 +1,7 @@
 [
   (class_body)
   (function_body)
+  (function_expression_body)
   (declaration (initializers))
   (switch_block)
   (if_statement)
@@ -27,7 +28,5 @@
 
 ; this one is for dedenting the else block
 (if_statement (block) @indent.branch)
-; Issue #4637
-(function_expression_body (block) @indent.branch)
 
 (comment) @indent.ignore
diff --git a/tests/indent/dart/multiple_arguments.dart b/tests/indent/dart/multiple_arguments.dart
deleted file mode 100644
index 63a4a0438..000000000
--- a/tests/indent/dart/multiple_arguments.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Example method that causes an issue with indentation on usage
-void someMethod(
-  void onSuccess(),
-  void onError(Exception ex, StackTrace stackTrace),
-) {
-  try {} catch (_, __) {}
-}
-
-void main() {
-  someMethod(() {
-  }, (Exception ex, StackTrace stackTrace) {
-  });
-}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index b2632cfa4..fde41b362 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -18,6 +18,4 @@ end)
 describe("new line:", function()
   run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
-  run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
-  run:new_line("multiple_arguments.dart", { on_line = 11, text = "var x;", indent = 4 })
 end)

From 978fb2b7be88a4a1b27142ab9d3868fd61a505ec Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Wed, 12 Apr 2023 07:51:35 +0200
Subject: [PATCH 0216/2704] test(dart): Add an expected failure test

---
 tests/indent/dart/multiple_arguments.dart | 13 +++++++++++++
 tests/indent/dart_spec.lua                |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/indent/dart/multiple_arguments.dart

diff --git a/tests/indent/dart/multiple_arguments.dart b/tests/indent/dart/multiple_arguments.dart
new file mode 100644
index 000000000..63a4a0438
--- /dev/null
+++ b/tests/indent/dart/multiple_arguments.dart
@@ -0,0 +1,13 @@
+// Example method that causes an issue with indentation on usage
+void someMethod(
+  void onSuccess(),
+  void onError(Exception ex, StackTrace stackTrace),
+) {
+  try {} catch (_, __) {}
+}
+
+void main() {
+  someMethod(() {
+  }, (Exception ex, StackTrace stackTrace) {
+  });
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index fde41b362..b62485f4b 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -1,4 +1,5 @@
 local Runner = require("tests.indent.common").Runner
+local XFAIL = require("tests.indent.common").XFAIL
 
 local run = Runner:new(it, "tests/indent/dart", {
   tabstop = 4,
@@ -18,4 +19,6 @@ end)
 describe("new line:", function()
   run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
+  run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
+  run:new_line("multiple_arguments.dart", { on_line = 11, text = "var x;", indent = 4, "expected failure issue #4637", XFAIL })
 end)

From 34d1e0e360b4504156aef5ff4cc301aea1acaa89 Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Wed, 12 Apr 2023 08:01:28 +0200
Subject: [PATCH 0217/2704] Update tests/indent/dart_spec.lua

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>
---
 tests/indent/dart_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index b62485f4b..64c1be2cf 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -20,5 +20,5 @@ describe("new line:", function()
   run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
   run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
-  run:new_line("multiple_arguments.dart", { on_line = 11, text = "var x;", indent = 4, "expected failure issue #4637", XFAIL })
+  run:new_line("multiple_arguments.dart", { on_line = 11, text = "var x;", indent = 4 }, "expected failure issue #4637", XFAIL)
 end)

From 95055abaddefecad7b9c276f57eea411dc5b3017 Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Wed, 12 Apr 2023 08:02:40 +0200
Subject: [PATCH 0218/2704] chore: fix formatting issue for dart test

---
 tests/indent/dart_spec.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index 64c1be2cf..e983ddea2 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -20,5 +20,10 @@ describe("new line:", function()
   run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
   run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
-  run:new_line("multiple_arguments.dart", { on_line = 11, text = "var x;", indent = 4 }, "expected failure issue #4637", XFAIL)
+  run:new_line(
+    "multiple_arguments.dart",
+    { on_line = 11, text = "var x;", indent = 4 },
+    "expected failure issue #4637",
+    XFAIL
+  )
 end)

From 49f6962da4523de7dc5f6d16b57da4619609c08d Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Wed, 12 Apr 2023 08:29:31 +0200
Subject: [PATCH 0219/2704] test(dart): add expected failure file to test

---
 tests/indent/dart_spec.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index e983ddea2..a2f44f58f 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -11,7 +11,9 @@ local run = Runner:new(it, "tests/indent/dart", {
 describe("indent Lua:", function()
   describe("whole file:", function()
     run:whole_file(".", {
-      expected_failures = {},
+      expected_failures = {
+        "./dart/multiple_arguments.dart", -- expected failure issue #4637
+      },
     })
   end)
 end)

From e68b81e7fd5b7e7423fa5f931bf3ce7c3dc4f52a Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Wed, 12 Apr 2023 08:49:52 +0200
Subject: [PATCH 0220/2704] fix(dart): review comment

---
 tests/indent/dart_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index a2f44f58f..651730cfa 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -12,7 +12,7 @@ describe("indent Lua:", function()
   describe("whole file:", function()
     run:whole_file(".", {
       expected_failures = {
-        "./dart/multiple_arguments.dart", -- expected failure issue #4637
+        "./multiple_arguments.dart", -- expected failure issue #4637
       },
     })
   end)

From e9de9cedf0556f4cd083fbf3fda681edc33d417b Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Wed, 12 Apr 2023 18:09:10 +0200
Subject: [PATCH 0221/2704] test(dart): add test cases for open issues

---
 tests/indent/dart/class.dart                   |  4 ++++
 tests/indent/dart/class_function_argument.dart | 13 +++++++++++++
 tests/indent/dart/switch.dart                  |  9 +++++++++
 tests/indent/dart_spec.lua                     | 12 ++++++++++--
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 tests/indent/dart/class_function_argument.dart
 create mode 100644 tests/indent/dart/switch.dart

diff --git a/tests/indent/dart/class.dart b/tests/indent/dart/class.dart
index 0402cc677..0ad21114f 100644
--- a/tests/indent/dart/class.dart
+++ b/tests/indent/dart/class.dart
@@ -1,4 +1,8 @@
 void main() {
 }
+
 class Test {
+  List<String> get progress => [
+        '0',
+      ];
 }
diff --git a/tests/indent/dart/class_function_argument.dart b/tests/indent/dart/class_function_argument.dart
new file mode 100644
index 000000000..30db12f96
--- /dev/null
+++ b/tests/indent/dart/class_function_argument.dart
@@ -0,0 +1,13 @@
+class Something {
+  final int number;
+  final Function(int) write;
+
+  Something(this.number, this.write);
+}
+
+void test() {
+  Something(
+    1,
+    (int number) {
+  );
+}
diff --git a/tests/indent/dart/switch.dart b/tests/indent/dart/switch.dart
new file mode 100644
index 000000000..fae070cda
--- /dev/null
+++ b/tests/indent/dart/switch.dart
@@ -0,0 +1,9 @@
+void test() {
+  final a = 69;
+  switch (a) {
+    case 69:
+      break;
+    case 420:
+    default:
+  }
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index 651730cfa..143b792b2 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -12,14 +12,19 @@ describe("indent Lua:", function()
   describe("whole file:", function()
     run:whole_file(".", {
       expected_failures = {
-        "./multiple_arguments.dart", -- expected failure issue #4637
+        "./multiple_arguments.dart",
+        "./class.dart",
+        "./switch.dart",
+        "./class_function_argument.dart",
       },
     })
   end)
 end)
 
 describe("new line:", function()
-  run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
+  run:new_line("class.dart", { on_line = 4, text = "int five;", indent = 2 })
+  run:new_line("class.dart", { on_line = 6, text = "'100'", indent = 8 }, "expected failure", XFAIL)
+  run:new_line("class.dart", { on_line = 7, text = "int five = 5", indent = 2 }, "expected failure", XFAIL)
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
   run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
   run:new_line(
@@ -28,4 +33,7 @@ describe("new line:", function()
     "expected failure issue #4637",
     XFAIL
   )
+  run:new_line("switch.dart", { on_line = 3, text = "case 7:", indent = 4 })
+  run:new_line("switch.dart", { on_line = 6, text = "break;", indent = 6 }, "expected failure", XFAIL)
+  run:new_line("class_function_argument.dart", { on_line = 11, text = "}", indent = 4 })
 end)

From ba6c55b203748ec099127914d34554a575e051c0 Mon Sep 17 00:00:00 2001
From: Robert Brunhage <robertbrunhage@gmail.com>
Date: Wed, 12 Apr 2023 19:00:13 +0200
Subject: [PATCH 0222/2704] chore(dart): remove tests for switch

---
 tests/indent/dart/switch.dart | 9 ---------
 tests/indent/dart_spec.lua    | 3 ---
 2 files changed, 12 deletions(-)
 delete mode 100644 tests/indent/dart/switch.dart

diff --git a/tests/indent/dart/switch.dart b/tests/indent/dart/switch.dart
deleted file mode 100644
index fae070cda..000000000
--- a/tests/indent/dart/switch.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-void test() {
-  final a = 69;
-  switch (a) {
-    case 69:
-      break;
-    case 420:
-    default:
-  }
-}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index 143b792b2..0241e531f 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -14,7 +14,6 @@ describe("indent Lua:", function()
       expected_failures = {
         "./multiple_arguments.dart",
         "./class.dart",
-        "./switch.dart",
         "./class_function_argument.dart",
       },
     })
@@ -33,7 +32,5 @@ describe("new line:", function()
     "expected failure issue #4637",
     XFAIL
   )
-  run:new_line("switch.dart", { on_line = 3, text = "case 7:", indent = 4 })
-  run:new_line("switch.dart", { on_line = 6, text = "break;", indent = 6 }, "expected failure", XFAIL)
   run:new_line("class_function_argument.dart", { on_line = 11, text = "}", indent = 4 })
 end)

From 36d4deb294fb0cd4385d58d8c9f603975bf355ad Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Thu, 13 Apr 2023 01:42:53 +0900
Subject: [PATCH 0223/2704] fix(dart_indent): Fix dart case/default indent

add tests

add tests for fallthrough case

add more tests

keep functional tests
---
 queries/dart/indents.scm      | 10 ++++++++++
 tests/indent/dart/switch.dart | 30 ++++++++++++++++++++++++++++++
 tests/indent/dart_spec.lua    | 11 +++++++++--
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 tests/indent/dart/switch.dart

diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index 9616f0629..77259aef7 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -13,6 +13,13 @@
   (try_statement)
 ] @indent.begin
 
+(switch_block
+  (_) @indent.begin
+  (#set! indent.immediate 1)
+  (#set! indent.start_at_same_line 1))
+
+(switch_label) @indent.branch
+
 [
   "("
   ")"
@@ -26,6 +33,9 @@
  "}"
 ] @indent.end
 
+(return_statement ";" @indent.end)
+(break_statement ";" @indent.end)
+
 ; this one is for dedenting the else block
 (if_statement (block) @indent.branch)
 
diff --git a/tests/indent/dart/switch.dart b/tests/indent/dart/switch.dart
new file mode 100644
index 000000000..489c7b22a
--- /dev/null
+++ b/tests/indent/dart/switch.dart
@@ -0,0 +1,30 @@
+void test() {
+  switch(a) {
+    case 1:
+  }
+}
+
+void test() {
+  switch(a) {
+    default:
+  }
+}
+
+void test_break_dedent() {
+  switch(x) {
+    case 1:
+      break;
+  }
+  switch(y) {
+    case 2:
+      return;
+  }
+}
+
+
+void test_multi_case() {
+  switch(x) { 
+    case 1:
+    case 2:
+  }
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index 0241e531f..f3c360cbe 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -2,9 +2,9 @@ local Runner = require("tests.indent.common").Runner
 local XFAIL = require("tests.indent.common").XFAIL
 
 local run = Runner:new(it, "tests/indent/dart", {
-  tabstop = 4,
+  tabstop = 2,
   shiftwidth = 2,
-  softtabstop = 0,
+  softtabstop = 2,
   expandtab = true,
 })
 
@@ -25,6 +25,13 @@ describe("new line:", function()
   run:new_line("class.dart", { on_line = 6, text = "'100'", indent = 8 }, "expected failure", XFAIL)
   run:new_line("class.dart", { on_line = 7, text = "int five = 5", indent = 2 }, "expected failure", XFAIL)
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
+  run:new_line("switch.dart", { on_line = 3, text = "x = 1;", indent = 6 })
+  run:new_line("switch.dart", { on_line = 9, text = "x = 1;", indent = 6 })
+  run:new_line("switch.dart", { on_line = 3, text = "case 2:", indent = 4 })
+  run:new_line("switch.dart", { on_line = 16, text = "abc;", indent = 4 })
+  run:new_line("switch.dart", { on_line = 20, text = "abc;", indent = 4 })
+  run:new_line("switch.dart", { on_line = 28, text = "y++;", indent = 6 })
+
   run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
   run:new_line(
     "multiple_arguments.dart",

From f499a711fa5c573b5ba0af09a3c9955a6c14b062 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:32:52 +0200
Subject: [PATCH 0224/2704] Update parsers: c_sharp, html, matlab, perl, t32,
 zig (#4649)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c6756c751..6f34c90ff 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"
   },
   "c_sharp": {
-    "revision": "92d572eef5ffdd4117e7ba36b56850a90cb79151"
+    "revision": "0dd182a14a519a70dc60c3727fdc2fdb65c030ae"
   },
   "capnp": {
     "revision": "fc6e2addf103861b9b3dffb82c543eb6b71061aa"
@@ -213,7 +213,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "html": {
-    "revision": "29f53d8f4f2335e61bf6418ab8958dac3282077a"
+    "revision": "594f23eb6da580cf269a59d966db68f2cde7d0c8"
   },
   "htmldjango": {
     "revision": "b2dba02eddab66be669022320273d0dfe1ff923d"
@@ -291,7 +291,7 @@
     "revision": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"
   },
   "matlab": {
-    "revision": "2d5d3d5193718a86477d4335aba5b34e79147326"
+    "revision": "dd95e1fc1b5514aa3a882d5fb8ddbf4683e953f0"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -336,7 +336,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "perl": {
-    "revision": "3d3a95ee6645d7bcd993e77b252ffd33fd297c8e"
+    "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
   },
   "php": {
     "revision": "1a40581b7a899201d7c2b4684ee34490bc306bd6"
@@ -462,7 +462,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60"
+    "revision": "0802b3638a1c5022b4d55bdafa64f856ed43d7d6"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"
@@ -543,6 +543,6 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zig": {
-    "revision": "2c7b6308d906d7aec4b3e1fafaaeca447a8a2c2f"
+    "revision": "9b84cb66e7d480e7c0370f4e33e8325bac6ad09f"
   }
 }

From f7e8b7420ccf8bc61534ea6155db03d62c7ff571 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 14 Apr 2023 17:01:17 +0900
Subject: [PATCH 0225/2704] fix(php_inject): add missing @combined to text

---
 queries/php/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index ee29c4851..9e243259d 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -1,4 +1,4 @@
-(text) @html
+(text) @html @combined
 
 (comment) @phpdoc
 

From dad0864fa324d1df88242a978e9d7de383c5be68 Mon Sep 17 00:00:00 2001
From: John Drouhard <john@drouhard.dev>
Date: Sat, 8 Apr 2023 13:21:09 -0500
Subject: [PATCH 0226/2704] feat(cpp): improve function.call to support any
 level of nesting for qualified identifiers

---
 queries/cpp/highlights.scm                    | 107 ++++++++++++------
 .../cpp/static-namespace-functions.cpp        |  16 +--
 2 files changed, 80 insertions(+), 43 deletions(-)

diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 586067155..97a3b9f39 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -49,58 +49,93 @@
 (destructor_name
   (identifier) @method)
 
+; functions
 (function_declarator
-      declarator: (qualified_identifier
-        name: (identifier) @function))
+  (qualified_identifier
+    (identifier) @function))
 (function_declarator
-      declarator: (qualified_identifier
-        name: (qualified_identifier
-          name: (identifier) @function)))
+  (qualified_identifier
+    (qualified_identifier
+      (identifier) @function)))
 (function_declarator
-      declarator: (template_function
-        name: (identifier) @function))
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function))))
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function)))) @_parent
+  (#has-ancestor? @_parent function_declarator))
+
 (function_declarator
-      declarator: (template_method
-        name: (field_identifier) @method))
-((function_declarator
-      declarator: (qualified_identifier
-        name: (identifier) @constructor))
- (#lua-match? @constructor "^[A-Z]"))
+  (template_function
+    (identifier) @function))
 
 (operator_name) @function
 "operator" @function
 "static_assert" @function.builtin
 
 (call_expression
-  function: (qualified_identifier
-              name: (identifier) @function.call))
+  (qualified_identifier
+    (identifier) @function.call))
 (call_expression
-  function: (qualified_identifier
-              name: (qualified_identifier
-                      name: (identifier) @function.call)))
+  (qualified_identifier
+    (qualified_identifier
+      (identifier) @function.call)))
 (call_expression
-  function:
+  (qualified_identifier
+    (qualified_identifier
       (qualified_identifier
-        name: (qualified_identifier
-              name: (qualified_identifier
-                      name: (identifier) @function.call))))
-(call_expression
-  function: (template_function
-              name: (identifier) @function.call))
-(call_expression
-  function: (qualified_identifier
-              name: (template_function
-                      name: (identifier) @function.call)))
-(call_expression
-  function:
+        (identifier) @function.call))))
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
       (qualified_identifier
-        name: (qualified_identifier
-              name: (template_function
-                      name: (identifier) @function.call))))
+        (identifier) @function.call)))) @_parent
+  (#has-ancestor? @_parent call_expression))
 
 (call_expression
-  function: (field_expression
-              field: (field_identifier) @method.call))
+  (template_function
+    (identifier) @function.call))
+(call_expression
+  (qualified_identifier
+    (template_function
+      (identifier) @function.call)))
+(call_expression
+  (qualified_identifier
+    (qualified_identifier
+      (template_function
+        (identifier) @function.call))))
+(call_expression
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (template_function
+          (identifier) @function.call)))))
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (template_function
+          (identifier) @function.call))))) @_parent
+  (#has-ancestor? @_parent call_expression))
+
+; methods
+(function_declarator
+  (template_method
+    (field_identifier) @method))
+(call_expression
+  (field_expression
+    (field_identifier) @method.call))
+
+; constructors
+
+((function_declarator
+  (qualified_identifier
+    (identifier) @constructor))
+  (#lua-match? @constructor "^[A-Z]"))
 
 ((call_expression
   function: (identifier) @constructor)
diff --git a/tests/query/highlights/cpp/static-namespace-functions.cpp b/tests/query/highlights/cpp/static-namespace-functions.cpp
index 2bea488a3..3d16c43cf 100644
--- a/tests/query/highlights/cpp/static-namespace-functions.cpp
+++ b/tests/query/highlights/cpp/static-namespace-functions.cpp
@@ -1,12 +1,14 @@
 // Issue #2396
 
-int main()                                                                
-{                                                                         
-  B::foo();                                                                 
+int main()
+{
+  B::foo();
   //  ^ @function.call
-  Foo::A::foo();                                                            
+  Foo::A::foo();
   //       ^ @function.call
-  Foo::a::A::foo();                                                            
+  Foo::a::A::foo();
   //          ^ @function.call
-  return 0;                                                                 
-}    
+  Foo::a::A::B::foo();
+  //             ^ @function.call
+  return 0;
+}

From da7f886ab5dde87b7c9bbae1c1eb99aa63a74e55 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 15 Apr 2023 19:52:23 -0400
Subject: [PATCH 0227/2704] perf(ecma): remove GraphQL comment injection, use
 lua-match for gql template detection

---
 queries/ecma/injections.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 52675d506..712c780ac 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -78,12 +78,13 @@
 
 (regex_pattern) @regex
 
-((comment) @_gql_comment
-  (#eq? @_gql_comment "/* GraphQL */")
-  (template_string) @graphql)
+; ((comment) @_gql_comment
+;   (#eq? @_gql_comment "/* GraphQL */")
+;   (template_string) @graphql)
 
-(((template_string) @_template_string
- (#match? @_template_string "^`#graphql")) @graphql)
+((template_string) @graphql
+  (#lua-match? @graphql "^`#graphql")
+  (#offset! @graphql 0 1 0 -1))
 
 ; el.innerHTML = `<html>`
 (assignment_expression

From f90a80a5a5b8c4b54be96e91a10d774d60afccc1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 16 Apr 2023 08:27:05 +0000
Subject: [PATCH 0228/2704] Update parsers: cpp, cuda, elm, hlsl, luadoc, swift
 (#4657)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6f34c90ff..d3e16987d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -63,13 +63,13 @@
     "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"
   },
   "cpp": {
-    "revision": "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74"
+    "revision": "670404d7c689be1c868a46f919ba2a3912f2b7ef"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "967e7d74a1a04a680674199e12141963a8dd6336"
+    "revision": "a35854270463a96e79096bb854aae30a4f0e6cd2"
   },
   "cue": {
     "revision": "f83fd9abbece9becb5232c517b9d47ff141e237a"
@@ -105,7 +105,7 @@
     "revision": "869dff3ceb8823ca4b17ca33b663667c8e41e8ba"
   },
   "elm": {
-    "revision": "28bb193640d916dfaf947912c1413cebb0484841"
+    "revision": "692c50c0b961364c40299e73c1306aecb5d20f40"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -207,7 +207,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "fce5ea2e842404ce1af13fffdcf0daa02240c3dd"
+    "revision": "40472c119b5740d9a1fa0b0dc0b013502b636708"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -273,7 +273,7 @@
     "revision": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"
   },
   "luadoc": {
-    "revision": "5c9572faf56d1fa0f7e0740c94de1c4f67c6af5e"
+    "revision": "1e1152264cc68e11d65d9e2493566f5717a13d11"
   },
   "luap": {
     "revision": "bfb38d254f380362e26b5c559a4086ba6e92ba77"
@@ -456,7 +456,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "ca3a37055069277ad91d6a2c35faf9f247dcfbfb"
+    "revision": "05467af73ac315fc80c7f3ef397e261f30395e2a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 21f2fb188e4e5bb81fd0ff467c5e96dad858becb Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sun, 16 Apr 2023 12:59:46 +0200
Subject: [PATCH 0229/2704] fix(checkhealth): use non-deprecated versions if
 possible

---
 lua/nvim-treesitter/health.lua | 40 +++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index f81d35fbf..0edab2a55 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -10,24 +10,30 @@ local ts = require "nvim-treesitter.compat"
 
 local health = vim.health or require "health"
 
+-- "report_" prefix has been deprecated, use the recommended replacements if they exist.
+local _start = health.start or health.report_start
+local _ok = health.ok or health.report_ok
+local _warn = health.warn or health.report_warn
+local _error = health.error or health.report_error
+
 local M = {}
 
 local NVIM_TREESITTER_MINIMUM_ABI = 13
 
 local function install_health()
-  health.report_start "Installation"
+  _start "Installation"
 
   if fn.has "nvim-0.8.3" ~= 1 then
-    health.report_error "Nvim-treesitter requires Neovim 0.8.3+"
+    _error "Nvim-treesitter requires Neovim 0.8.3+"
   end
 
   if fn.executable "tree-sitter" == 0 then
-    health.report_warn(
+    _warn(
       "`tree-sitter` executable not found (parser generator, only needed for :TSInstallFromGrammar,"
         .. " not required for :TSInstall)"
     )
   else
-    health.report_ok(
+    _ok(
       "`tree-sitter` found "
         .. (utils.ts_cli_version() or "(unknown version)")
         .. " (parser generator, only needed for :TSInstallFromGrammar)"
@@ -35,29 +41,27 @@ local function install_health()
   end
 
   if fn.executable "node" == 0 then
-    health.report_warn(
-      "`node` executable not found (only needed for :TSInstallFromGrammar," .. " not required for :TSInstall)"
-    )
+    _warn("`node` executable not found (only needed for :TSInstallFromGrammar," .. " not required for :TSInstall)")
   else
     local handle = io.popen "node --version"
     local result = handle:read "*a"
     handle:close()
     local version = vim.split(result, "\n")[1]
-    health.report_ok("`node` found " .. version .. " (only needed for :TSInstallFromGrammar)")
+    _ok("`node` found " .. version .. " (only needed for :TSInstallFromGrammar)")
   end
 
   if fn.executable "git" == 0 then
-    health.report_error("`git` executable not found.", {
+    _error("`git` executable not found.", {
       "Install it with your package manager.",
       "Check that your `$PATH` is set correctly.",
     })
   else
-    health.report_ok "`git` executable found."
+    _ok "`git` executable found."
   end
 
   local cc = shell.select_executable(install.compilers)
   if not cc then
-    health.report_error("`cc` executable not found.", {
+    _error("`cc` executable not found.", {
       "Check that any of "
         .. vim.inspect(install.compilers)
         .. " is in your $PATH"
@@ -65,7 +69,7 @@ local function install_health()
     })
   else
     local version = vim.fn.systemlist(cc .. (cc == "cl" and "" or " --version"))[1]
-    health.report_ok(
+    _ok(
       "`"
         .. cc
         .. "` executable found. Selected from "
@@ -75,7 +79,7 @@ local function install_health()
   end
   if vim.treesitter.language_version then
     if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then
-      health.report_ok(
+      _ok(
         "Neovim was compiled with tree-sitter runtime ABI version "
           .. vim.treesitter.language_version
           .. " (required >="
@@ -83,7 +87,7 @@ local function install_health()
           .. "). Parsers must be compatible with runtime ABI."
       )
     else
-      health.report_error(
+      _error(
         "Neovim was compiled with tree-sitter runtime ABI version "
           .. vim.treesitter.language_version
           .. ".\n"
@@ -96,7 +100,7 @@ local function install_health()
     end
   end
 
-  health.report_start("OS Info:\n" .. vim.inspect(vim.loop.os_uname()))
+  _start("OS Info:\n" .. vim.inspect(vim.loop.os_uname()))
 end
 
 local function query_status(lang, query_group)
@@ -141,9 +145,9 @@ function M.check()
          x) errors found in the query, try to run :TSUpdate {lang}]]
   table.insert(parser_installation, legend)
   -- Finally call the report function
-  health.report_start(table.concat(parser_installation, "\n"))
+  _start(table.concat(parser_installation, "\n"))
   if #error_collection > 0 then
-    health.report_start "The following errors have been detected:"
+    _start "The following errors have been detected:"
     for _, p in ipairs(error_collection) do
       local lang, type, err = unpack(p)
       local lines = {}
@@ -164,7 +168,7 @@ function M.check()
           end
         end
       end
-      health.report_error(table.concat(lines, "\n"))
+      _error(table.concat(lines, "\n"))
     end
   end
 end

From 9d3c14874dbe2d513e35fd18c3519ecb1eb888cd Mon Sep 17 00:00:00 2001
From: Serhii Budnik <serhiib@scribd.com>
Date: Sun, 16 Apr 2023 20:49:27 +0300
Subject: [PATCH 0230/2704] fix(ruby): bare_symbol should be @symbol

---
 queries/ruby/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 3ef35205c..de7f96688 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -150,12 +150,12 @@
  ] @string
 
 [
- (bare_symbol)
  (heredoc_beginning)
  (heredoc_end)
  ] @constant
 
 [
+ (bare_symbol)
  (simple_symbol)
  (delimited_symbol)
  (hash_key_symbol)

From 9d64a68e1c727b8b9b4ca7ee571f3f079ec847e8 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 17 Apr 2023 06:37:14 +0000
Subject: [PATCH 0231/2704] Update parsers: bash, latex

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d3e16987d..8acb6d87c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"
   },
   "bash": {
-    "revision": "b338fa9f4807b9e0336cd4dde04948a8c324a4cf"
+    "revision": "422a07cb221b92c6b117e854efa8945a506b5214"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -261,7 +261,7 @@
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
   },
   "latex": {
-    "revision": "376f64097b7a26691a2ca60dc94e4dfa417be932"
+    "revision": "cd3cc493a92b6bac7be4b3bd6d006d35d3c36d4c"
   },
   "ledger": {
     "revision": "f787ae635ca79589faa25477b94291a87e2d3e23"

From 351e43d5ef9003c62068dc2f40a9772563355220 Mon Sep 17 00:00:00 2001
From: tzachar <Nir.tzachar@gmail.com>
Date: Mon, 17 Apr 2023 12:38:41 +0300
Subject: [PATCH 0232/2704] fix(compat): add missing get_node_text, required by
 playground (#4666)

---
 lua/nvim-treesitter/compat.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
index accf2e6ac..c56e12b18 100644
--- a/lua/nvim-treesitter/compat.lua
+++ b/lua/nvim-treesitter/compat.lua
@@ -20,4 +20,8 @@ function M.get_range(node, source, metadata)
   return (ts.get_range or tsq.get_range)(node, source, metadata)
 end
 
+function M.get_node_text(node, bufnr)
+  return (ts.get_node_text or tsq.get_node_text)(node, bufnr)
+end
+
 return M

From 1185a357053f54d479edc0ae1abf95ff5163bb1f Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Mon, 17 Apr 2023 19:28:34 +0200
Subject: [PATCH 0233/2704] highlights(prql): replace `and` and `or` operators

---
 lockfile.json               | 2 +-
 queries/prql/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8acb6d87c..1a8a7759e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -363,7 +363,7 @@
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
   "prql": {
-    "revision": "4045dcff3f8ac04669855b32584053dec065bba4"
+    "revision": "02b1e967ede00aaa5d7c9fcd4a604b83825a6261"
   },
   "pug": {
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 10c17b915..68b781959 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -56,6 +56,8 @@ alias: (identifier) @field
   "!="
   ">="
   ">"
+  "&&"
+  "||"
   (bang)
 ] @operator
 
@@ -131,8 +133,6 @@ alias: (identifier) @field
 ] @boolean
 
 [
- (keyword_and)
- (keyword_or)
  (keyword_in)
 ] @keyword.operator
 

From 7ade4d2e774795f458207db115421f09e2a049d8 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 17 Apr 2023 19:04:04 -0400
Subject: [PATCH 0234/2704] fix(ecma): comment should be `@indent.auto` (#4669)

---
 queries/ecma/indents.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/queries/ecma/indents.scm b/queries/ecma/indents.scm
index 602b8d901..538c5bdc7 100644
--- a/queries/ecma/indents.scm
+++ b/queries/ecma/indents.scm
@@ -49,9 +49,9 @@
 (parenthesized_expression ("(" (_) ")" @indent.end))
 ["}" "]"] @indent.end
 
+(template_string) @indent.ignore
+
 [
   (comment)
-  (template_string)
-] @indent.ignore
-
-(ERROR) @indent.auto
+  (ERROR)
+] @indent.auto

From c79c37927bb6a937b5b85c45125db75dc204a6ef Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 17 Apr 2023 22:24:59 -0400
Subject: [PATCH 0235/2704] refactor(smali): refactor queries from upstream

---
 lockfile.json                |  2 +-
 queries/smali/highlights.scm | 30 ++++++++++++------------------
 queries/smali/locals.scm     |  3 +--
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1a8a7759e..6292b5cb9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -426,7 +426,7 @@
     "revision": "07547525cdf4627343dca5891f1743ae45e879bb"
   },
   "smali": {
-    "revision": "a67a429784dafa0ca4342d71e6530137ca803883"
+    "revision": "b002dceb9b91a6d6de45479ab4b2e9596ebbaaf3"
   },
   "smithy": {
     "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index bdcb464ae..4f810c293 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -5,7 +5,7 @@
 (primitive_type) @type.builtin
 
 ((class_identifier) @type.builtin
-  (#vim-match? @type.builtin "^L(android|com/android|dalvik|java)/"))
+  (#match? @type.builtin "^L(android|com/android|dalvik|java|kotlinx)/"))
 
 ; Methods
 
@@ -14,19 +14,17 @@
 
 (expression
   (opcode) @_invoke
-  (value
 	(body
 	  (full_method_signature
-        (method_signature (method_identifier) @method.call))))
+      (method_signature (method_identifier) @method.call)))
   (#lua-match? @_invoke "^invoke"))
 
 (method_handle
   (full_method_signature
 	(method_signature (method_identifier) @method.call)))
 
-(call_site) @method.call
-
 (custom_invoke
+  . (identifier) @method.call
   (method_signature (method_identifier) @method.call))
 
 (annotation_value
@@ -39,25 +37,23 @@
       (method_signature (method_identifier) @method.call))))
 
 (field_definition
-  (value
 	(body
-		(method_signature (method_identifier) @method.call))))
+		(method_signature (method_identifier) @method.call)))
 
 (field_definition
-  (value
 	(body
 	  (full_method_signature
-		(method_signature (method_identifier) @method.call)))))
+		  (method_signature (method_identifier) @method.call))))
 
-((method_signature
-  (method_identifier) @constructor)
+((method_identifier) @constructor
   (#any-of? @constructor "<init>" "<clinit>"))
 
 ; Fields
 
-(field_identifier) @field
-
-(annotation_key) @field
+[
+  (field_identifier)
+  (annotation_key)
+] @field
 
 ; Variables
 
@@ -86,7 +82,7 @@
   (#lua-match? @keyword.return "^return"))
 
 ((opcode) @conditional
-  (#vim-match? @conditional "^(if|cmp)"))
+  (#match? @conditional "^(if|cmp)"))
 
 ((opcode) @exception
   (#lua-match? @exception "^throw"))
@@ -128,9 +124,6 @@
   ".array-data"
   ".end array-data"
   ".enum"
-] @keyword
-
-[
   (prologue_directive)
   (epilogue_directive)
 ] @keyword
@@ -143,6 +136,7 @@
 ; Literals
 
 (string) @string
+(source_directive (string "\"" _ @text.uri "\""))
 (escape_sequence) @string.escape
 
 (character) @character
diff --git a/queries/smali/locals.scm b/queries/smali/locals.scm
index a91fec225..fcb3b631c 100644
--- a/queries/smali/locals.scm
+++ b/queries/smali/locals.scm
@@ -12,7 +12,6 @@
 [
   (identifier)
   (class_identifier)
-  (call_site)
   (label)
   (jmp_label)
 ] @reference
@@ -21,7 +20,7 @@
   (field_identifier) @definition.enum)
 
 ((field_definition
-  modifiers: (access_modifiers) @_mod
+  (access_modifiers) @_mod
   (field_identifier) @definition.enum)
   (#eq? @_mod "enum"))
 

From cdc45ac6bad52d95802b54e8a6d4f7aaa163edc5 Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Tue, 18 Apr 2023 15:51:14 +0300
Subject: [PATCH 0236/2704] feat(markdown): configured aliases for fenced code
 block languages (#4659)

* feat(markdown): configured aliases for languages

* refactor: use vim.treesitter.match

* refactor: rename local vars

* fix: query syntax
---
 lua/nvim-treesitter/query_predicates.lua | 55 +++++++++++++++++++-----
 queries/markdown/injections.scm          |  9 ++--
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 106f90a8d..c3d474e6c 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -1,5 +1,25 @@
 local query = require "vim.treesitter.query"
 
+local html_script_type_languages = {
+  ["importmap"] = "json",
+  ["module"] = "javascript",
+  ["application/ecmascript"] = "javascript",
+  ["text/ecmascript"] = "javascript",
+}
+
+local non_filetype_match_injection_language_aliases = {
+  ex = "elixir",
+  pl = "perl",
+  sh = "bash",
+  uxn = "uxntal",
+  ts = "typescript",
+}
+
+local function get_parser_from_markdown_info_string(injection_alias)
+  local match = vim.filetype.match { filename = "a." .. injection_alias }
+  return match or non_filetype_match_injection_language_aliases[injection_alias] or injection_alias
+end
+
 local function error(str)
   vim.api.nvim_err_writeln(str)
 end
@@ -119,19 +139,17 @@ query.add_predicate("has-type?", function(match, _pattern, _bufnr, pred)
   return vim.tbl_contains(types, node:type())
 end)
 
-local html_script_type_languages = {
-  ["importmap"] = "json",
-  ["module"] = "javascript",
-  ["application/ecmascript"] = "javascript",
-  ["text/ecmascript"] = "javascript",
-}
-
----@param match string
----@param metadata table
+---@param match (TSNode|nil)[]
+---@param _ string
+---@param bufnr integer
+---@param pred string[]
 ---@return boolean|nil
-query.add_directive("set-lang-from-mimetype!", function(match, pattern, bufnr, predicate, metadata)
-  local capture_id = predicate[2]
+query.add_directive("set-lang-from-mimetype!", function(match, _, bufnr, pred, metadata)
+  local capture_id = pred[2]
   local node = match[capture_id]
+  if not node then
+    return
+  end
   local type_attr_value = vim.treesitter.get_node_text(node, bufnr)
   local configured = html_script_type_languages[type_attr_value]
   if configured then
@@ -142,6 +160,21 @@ query.add_directive("set-lang-from-mimetype!", function(match, pattern, bufnr, p
   end
 end)
 
+---@param match (TSNode|nil)[]
+---@param _ string
+---@param bufnr integer
+---@param pred string[]
+---@return boolean|nil
+query.add_directive("set-lang-from-info-string!", function(match, _, bufnr, pred, metadata)
+  local capture_id = pred[2]
+  local node = match[capture_id]
+  if not node then
+    return
+  end
+  local injection_alias = vim.treesitter.get_node_text(node, bufnr)
+  metadata.language = get_parser_from_markdown_info_string(injection_alias)
+end)
+
 -- Just avoid some annoying warnings for this directive
 query.add_directive("make-range!", function() end)
 
diff --git a/queries/markdown/injections.scm b/queries/markdown/injections.scm
index 2310ee42f..3b8599c72 100644
--- a/queries/markdown/injections.scm
+++ b/queries/markdown/injections.scm
@@ -1,8 +1,11 @@
 (fenced_code_block
   (info_string
-    (language) @language)
-  (#not-match? @language "elm")
-  (code_fence_content) @content (#exclude_children! @content))
+    (language) @_lang)
+  (#not-match? @_lang "elm") ; prevent segfault when using elm parser
+  (code_fence_content)
+    @content
+    (#set-lang-from-info-string! @_lang)
+    (#exclude_children! @content))
 
 ((html_block) @html)
 

From 831f37635df26864a397a5e35450eec97bfe60cd Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 19 Apr 2023 02:25:04 -0400
Subject: [PATCH 0237/2704] feat(rust): move some keywords & operators to where
 they belong

---
 queries/rust/highlights.scm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 6c4491a02..5eb6d97b8 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -185,12 +185,9 @@
 
 [
   "default"
-  "dyn"
   "enum"
-  "extern"
   "impl"
   "let"
-  "match"
   "move"
   "pub"
   "struct"
@@ -207,18 +204,21 @@
 ] @keyword.coroutine
 
 [
- "ref"
+  "ref"
  (mutable_specifier)
 ] @type.qualifier
 
 [
- "const"
- "static"
+  "const"
+  "static"
+  "dyn"
+  "extern"
 ] @storageclass
 
 (lifetime ["'" (identifier)] @storageclass.lifetime)
 
 "fn" @keyword.function
+
 [
   "return"
   "yield"
@@ -233,8 +233,9 @@
 (visibility_modifier [(crate) (super) (self)] @namespace)
 
 [
-  "else"
   "if"
+  "else"
+  "match"
 ] @conditional
 
 [
@@ -246,8 +247,7 @@
 ] @repeat
 
 "for" @keyword
-(for_expression
-  "for" @repeat)
+(for_expression "for" @repeat)
 
 ;;; Operators & Punctuation
 
@@ -265,7 +265,6 @@
   "+="
   "-"
   "-="
-  "->"
   ".."
   "..="
   "/"
@@ -276,7 +275,6 @@
   "<="
   "="
   "=="
-  "=>"
   ">"
   ">="
   ">>"
@@ -297,7 +295,7 @@
 (bracketed_type ["<" ">"] @punctuation.bracket)
 (for_lifetimes ["<" ">"] @punctuation.bracket)
 
-["," "." ":" "::" ";"] @punctuation.delimiter
+["," "." ":" "::" ";" "->" "=>"] @punctuation.delimiter
 
 (attribute_item "#" @punctuation.special)
 (inner_attribute_item ["!" "#"] @punctuation.special)

From 481d1eda24eed1f5184c38f16960fd99c2bb9a37 Mon Sep 17 00:00:00 2001
From: stefan <stefan@s00.xyz>
Date: Wed, 19 Apr 2023 23:17:44 -0400
Subject: [PATCH 0238/2704] docs: update gitconfig in readme to reflect parser
 name (#4656)

---
 README.md                       | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b6fb87949..7fcbc801d 100644
--- a/README.md
+++ b/README.md
@@ -222,7 +222,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
 - [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
 - [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
-- [x] [gitconfig](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
+- [x] [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
 - [x] [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) (maintained by @gbprod)
 - [x] [gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) (maintained by @ObserverOfTime)
 - [x] [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) (maintained by @gbprod)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9e7c52091..691161deb 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -515,7 +515,7 @@ list.git_config = {
   },
   filetype = "gitconfig",
   maintainers = { "@amaanq" },
-  readme_name = "gitconfig",
+  readme_name = "git_config",
 }
 
 list.gitignore = {

From eedc5198a1b4bb1b08ae6d4f64f3d76e376957aa Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Thu, 20 Apr 2023 15:12:31 +0900
Subject: [PATCH 0239/2704] tests: fix deprecated tests (#4681)

---
 tests/unit/ts_utils_spec.lua | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/unit/ts_utils_spec.lua b/tests/unit/ts_utils_spec.lua
index a56755134..397fa7eaf 100644
--- a/tests/unit/ts_utils_spec.lua
+++ b/tests/unit/ts_utils_spec.lua
@@ -71,8 +71,14 @@ describe("swap_nodes", function()
   local function swap(case)
     vim.api.nvim_buf_set_lines(0, 0, -1, false, case.lines)
     vim.opt.filetype = case.filetype
-    local a = vim.treesitter.get_node_at_pos(0, case.a[1], case.a[2], {})
-    local b = vim.treesitter.get_node_at_pos(0, case.b[1], case.b[2], {})
+    local a = vim.treesitter.get_node {
+      bufnr = 0,
+      pos = { case.a[1], case.a[2] },
+    }
+    local b = vim.treesitter.get_node {
+      bufnr = 0,
+      pos = { case.b[1], case.b[2] },
+    }
     tsutils.swap_nodes(a, b, 0, true)
   end
 

From c44a63ffdc213a5b56685a34502a00f56a2d061e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 20 Apr 2023 05:20:02 -0400
Subject: [PATCH 0240/2704] feat(http): update parser queries from upstream

---
 README.md                   |  2 +-
 lockfile.json               |  2 +-
 queries/http/highlights.scm | 67 ++++++++++++++++++++++++++++++-------
 queries/http/injections.scm |  6 ++++
 4 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 7fcbc801d..fde2cb3df 100644
--- a/README.md
+++ b/README.md
@@ -246,7 +246,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [hocon](https://github.com/antosha417/tree-sitter-hocon) (maintained by @antosha417)
 - [x] [html](https://github.com/tree-sitter/tree-sitter-html) (maintained by @TravonteD)
 - [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
-- [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @NTBBloodbath)
+- [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
 - [x] [javascript](https://github.com/tree-sitter/tree-sitter-javascript) (maintained by @steelsojka)
diff --git a/lockfile.json b/lockfile.json
index 6292b5cb9..6c95f6535 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -219,7 +219,7 @@
     "revision": "b2dba02eddab66be669022320273d0dfe1ff923d"
   },
   "http": {
-    "revision": "2c6c44574031263326cb1e51658bbc0c084326e7"
+    "revision": "f41d3e97ad148f0b2c2d913e3834ccd5816fdc02"
   },
   "ini": {
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index f5a08813b..e89b4dc7f 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -1,19 +1,60 @@
-; inherits: json
+; Keywords
 
-; Display errors
-(ERROR) @error
+(scheme) @keyword
+
+; Methods
+
+(method) @method
+
+; Constants
+
+(const_spec) @constant
+
+; Variables
+
+(identifier) @variable
+
+; Fields
+
+(pair name: (identifier) @field)
+
+; Parameters
+
+(query_param (key) @parameter)
+
+; Operators
+
+[
+  "="
+  "?"
+  "&"
+  "@"
+] @operator
+
+; Literals
+
+(string) @string
+
+(target_url) @string @text.uri
+
+(number) @number
+
+; (boolean) @boolean
+
+(null) @constant.builtin
+
+; Punctuation
+
+[ "{{" "}}" ] @punctuation.bracket
+
+[
+  ":"
+] @punctuation.delimiter
 
 ; Comments
-(comment) @comment
 
-(request
-  method: (method) @keyword
-  url: (url) @text.uri)
+(comment) @comment @spell
 
-(header
-  name: (name) @constant
-  value: (value))
+; Errors
 
-; rest.nvim Neovim plugin specific features
-(external_body
-  json_file: (json_file) @text.uri) @keyword
+(ERROR) @error
diff --git a/queries/http/injections.scm b/queries/http/injections.scm
index 4bb7d675d..db35379f7 100644
--- a/queries/http/injections.scm
+++ b/queries/http/injections.scm
@@ -1 +1,7 @@
 (comment) @comment
+
+(json_body) @json
+
+; (xml_body) @xml
+
+; (graphql_body) @graphql Not used as of now..

From e77fd9af161ff988274737353b9bea518f7b5f0b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 10:05:24 +0000
Subject: [PATCH 0241/2704] Update parsers: gitcommit, html, java, t32 (#4671)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6c95f6535..961a80159 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -156,7 +156,7 @@
     "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
   },
   "gitcommit": {
-    "revision": "04dcb2cb9a4cf638252b8bd4a829f9acadf2cc4c"
+    "revision": "735f02b12d9cdd9a8b90ac4b2dff8cdab6dd1e7b"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -213,7 +213,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "html": {
-    "revision": "594f23eb6da580cf269a59d966db68f2cde7d0c8"
+    "revision": "86c253e675e7fdd1c0482efe0706f24bafbc3a7d"
   },
   "htmldjango": {
     "revision": "b2dba02eddab66be669022320273d0dfe1ff923d"
@@ -225,7 +225,7 @@
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
   "java": {
-    "revision": "3c24aa9365985830421a3a7b6791b415961ea770"
+    "revision": "c194ee5e6ede5f26cf4799feead4a8f165dcf14d"
   },
   "javascript": {
     "revision": "5720b249490b3c17245ba772f6be4a43edb4e3b7"
@@ -462,7 +462,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "0802b3638a1c5022b4d55bdafa64f856ed43d7d6"
+    "revision": "b7d81e1e998f2246997fbbe4f31f8e6b01f43ea2"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From b0338a056525e83d88aaa76e8cf396af07410bed Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 20 Apr 2023 05:55:31 -0400
Subject: [PATCH 0242/2704] chore(parsers): update http maintainers

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 691161deb..22e83db46 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -691,7 +691,7 @@ list.http = {
     files = { "src/parser.c" },
     generate_requires_npm = true,
   },
-  maintainers = { "@NTBBloodbath" },
+  maintainers = { "@amaanq" },
 }
 
 list.ini = {

From b9ed96bb6ff053d17a019cb3134c19976b87decf Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 21 Apr 2023 00:39:21 -0400
Subject: [PATCH 0243/2704] feat(c): highlight parenthesized function pointer
 decl identifiers as `@function`

---
 queries/c/highlights.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index f607d3b8c..85001f891 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -130,7 +130,6 @@
 
 [
  (type_identifier)
- (sized_type_specifier)
  (type_descriptor)
 ] @type
 
@@ -146,6 +145,8 @@
 
 (primitive_type) @type.builtin
 
+(sized_type_specifier _ @type.builtin type: _)
+
 ((identifier) @constant
  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
 (enumerator
@@ -171,6 +172,10 @@
     field: (field_identifier) @function.call))
 (function_declarator
   declarator: (identifier) @function)
+(function_declarator
+  declarator: (parenthesized_declarator
+                (pointer_declarator
+                  declarator: (field_identifier) @function)))
 (preproc_function_def
   name: (identifier) @function.macro)
 

From 8b221448a3badc5e01a3975c99887acf26e2403c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 08:17:16 +0000
Subject: [PATCH 0244/2704] Update parsers: erlang, sql, t32 (#4687)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 961a80159..3a3d929f2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "abf5794511a912059b8234ea7e70d60b55df8805"
+    "revision": "616f09eab421671c8b54f9e8a0c9df759f956bc8"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -438,7 +438,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "8f1c49febcb8944d39df8554d32c749b4f5f3158"
+    "revision": "178148650a7847ab54e672d7483e850f5ad4e89d"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
@@ -462,7 +462,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "b7d81e1e998f2246997fbbe4f31f8e6b01f43ea2"
+    "revision": "286623444eabaf8eb36a5e9b3fe4bf3d9b575f1e"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From 5887528216b10e68b78ac0fbaf07f6c5771ac602 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 21 Apr 2023 04:25:45 -0400
Subject: [PATCH 0245/2704] docs: update readme maintainers

---
 README.md                       | 4 ++--
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fde2cb3df..2f5bafa0d 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
-- [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @vigoux)
+- [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @Luxed)
 - [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
@@ -310,7 +310,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
-- [x] [rust](https://github.com/tree-sitter/tree-sitter-rust) (maintained by @vigoux)
+- [x] [rust](https://github.com/tree-sitter/tree-sitter-rust) (maintained by @amaanq)
 - [x] [scala](https://github.com/tree-sitter/tree-sitter-scala) (maintained by @stevanmilic)
 - [x] [scheme](https://github.com/6cdh/tree-sitter-scheme) (maintained by @6cdh)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 22e83db46..6a52a4a6e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -167,7 +167,7 @@ list.c = {
     url = "https://github.com/tree-sitter/tree-sitter-c",
     files = { "src/parser.c" },
   },
-  maintainers = { "@vigoux" },
+  maintainers = { "@amaanq" },
 }
 
 list.c_sharp = {
@@ -1230,7 +1230,7 @@ list.rust = {
     url = "https://github.com/tree-sitter/tree-sitter-rust",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@vigoux" },
+  maintainers = { "@amaanq" },
 }
 
 list.scala = {

From 654216eb04f3fdf0f847ff2d410319fba6cee847 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 21 Apr 2023 04:44:50 -0400
Subject: [PATCH 0246/2704] fix(c): types are optional in sized_type_specifier

---
 queries/c/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 85001f891..523a79240 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -145,7 +145,7 @@
 
 (primitive_type) @type.builtin
 
-(sized_type_specifier _ @type.builtin type: _)
+(sized_type_specifier _ @type.builtin type: _?)
 
 ((identifier) @constant
  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))

From 85330918f05b3a4bd342a69063e7ef5fcdfadd2e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 21 Apr 2023 04:06:20 -0400
Subject: [PATCH 0247/2704] perf: remove match where possible

---
 queries/bash/highlights.scm       |  4 ++--
 queries/bicep/highlights.scm      |  2 +-
 queries/clojure/highlights.scm    | 16 ++++++++--------
 queries/cmake/highlights.scm      |  8 ++++----
 queries/commonlisp/highlights.scm |  8 ++++----
 queries/commonlisp/locals.scm     |  4 ++--
 queries/cpp/highlights.scm        | 14 +++++++-------
 queries/css/highlights.scm        |  4 ++--
 queries/cue/highlights.scm        |  2 +-
 queries/dart/highlights.scm       |  6 +++---
 queries/dhall/highlights.scm      |  2 +-
 queries/dockerfile/highlights.scm |  6 ------
 queries/ebnf/highlights.scm       |  6 +++---
 queries/ecma/injections.scm       |  4 ++--
 queries/elixir/highlights.scm     |  2 +-
 queries/fennel/highlights.scm     |  2 +-
 queries/fish/highlights.scm       | 10 +++++-----
 queries/foam/highlights.scm       | 22 +++++++++-------------
 queries/fusion/highlights.scm     |  2 +-
 queries/glimmer/highlights.scm    | 16 ++++++++--------
 queries/html_tags/highlights.scm  | 10 +++++-----
 queries/julia/injections.scm      |  2 +-
 queries/ocaml/highlights.scm      |  6 ++----
 queries/perl/highlights.scm       |  2 +-
 queries/python/highlights.scm     | 12 ++++++------
 queries/qmljs/highlights.scm      |  2 +-
 queries/r/highlights.scm          |  2 +-
 queries/racket/highlights.scm     |  2 +-
 queries/smali/highlights.scm      |  5 ++++-
 queries/starlark/highlights.scm   |  4 ++--
 queries/svelte/highlights.scm     |  2 +-
 queries/t32/highlights.scm        |  6 +++---
 queries/tiger/highlights.scm      |  6 +++---
 queries/v/highlights.scm          |  2 +-
 queries/vala/highlights.scm       |  6 +++---
 queries/vim/highlights.scm        |  2 +-
 queries/zig/highlights.scm        |  6 +++---
 37 files changed, 104 insertions(+), 113 deletions(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index d1cdb659d..6fd1d39d5 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -84,7 +84,7 @@
  (#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)$"))
+  (#any-of? @boolean "true" "false"))
 
 (comment) @comment @spell
 (test_operator) @string
@@ -133,4 +133,4 @@
 (regex) @string.regex
 
 ((program . (comment) @preproc)
-  (#match? @preproc "^#!/"))
+  (#lua-match? @preproc "^#!/"))
diff --git a/queries/bicep/highlights.scm b/queries/bicep/highlights.scm
index 07c2c4efa..b555edb37 100644
--- a/queries/bicep/highlights.scm
+++ b/queries/bicep/highlights.scm
@@ -18,7 +18,7 @@
 
 ((member_expression
   object: (identifier) @type.builtin)
-  (#match? @type.builtin "^sys$"))
+  (#eq? @type.builtin "sys"))
 
 ; Functions
 
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index a070b7ffd..69b9abd9d 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -59,28 +59,28 @@
 
 ; Inline function variables
 ((sym_lit) @variable.builtin
- (#match? @variable.builtin "^[%]"))
+ (#lua-match? @variable.builtin "^%%"))
 
 ; Constructor
 ((sym_lit) @constructor
- (#match? @constructor "^-\\>[^\\>].*"))
+ (#lua-match? @constructor "^-\\>[^\\>].*"))
 
 ; Dynamic variables
 ((sym_lit) @variable.builtin
- (#match? @variable.builtin "^[*].+[*]$"))
+ (#lua-match? @variable.builtin "^[*].+[*]$"))
 
 ; Gensym
 ;; Might not be needed
 ((sym_lit) @variable
- (#match? @variable "^.*#$"))
+ (#lua-match? @variable "^.*#$"))
 
 ; Types
 ;; TODO: improve?
 ((sym_lit) @type
- (#match? @type "^[A-Z][^/]*$"))
+ (#lua-match? @type "^[%u][^/]*$"))
 ;; Symbols with `.` but not `/`
 ((sym_lit) @type
- (#match? @type "^[^/]+[.][^/]*$"))
+ (#lua-match? @type "^[^/]+[.][^/]*$"))
 
 ; Interop
 ((sym_lit) @method
@@ -88,11 +88,11 @@
 ((sym_lit) @field
  (#match? @field "^\\.-"))
 ((sym_lit) @field
- (#match? @field "^[A-Z].*/.+"))
+ (#lua-match? @field "^[%u].*/.+"))
 (list_lit
  .
  (sym_lit) @method
- (#match? @method "^[A-Z].*/.+"))
+ (#lua-match? @method "^[%u].*/.+"))
 ;; TODO: Special casing for the `.` macro
 
 ; Operators
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 80bf80752..b6cc26d2c 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -159,7 +159,7 @@
   . (argument) @_transform @constant
   . (argument) @variable
   . (argument) @_action @constant
-  (#match? @_transform "TRANSFORM")
+  (#eq? @_transform "TRANSFORM")
   (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")
 )
 (normal_command
@@ -169,7 +169,7 @@
   . (argument) @variable
   . (argument) @_action @constant
   . (argument)? @_selector @constant
-  (#match? @_transform "TRANSFORM")
+  (#eq? @_transform "TRANSFORM")
   (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")
   (#any-of? @_selector "AT" "FOR" "REGEX")
 )
@@ -179,8 +179,8 @@
   . (argument) @_transform @constant
   (argument) @constant .
   (argument) @variable
-  (#match? @_transform "TRANSFORM")
-  (#match? @constant "OUTPUT_VARIABLE")
+  (#eq? @_transform "TRANSFORM")
+  (#eq? @constant "OUTPUT_VARIABLE")
 )
 
 (escape_sequence) @string.escape
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 536b19c81..d898afe79 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -64,7 +64,7 @@
 
 (num_lit) @number
 
-((sym_lit)  @boolean (#match? @boolean "^(t|T)$"))
+((sym_lit)  @boolean (#any-of? @boolean "t" "T"))
 
 (nil_lit) @constant.builtin
 
@@ -72,7 +72,7 @@
 
 ;; dynamic variables
 ((sym_lit) @variable.builtin
- (#match? @variable.builtin "^[*].+[*]$"))
+ (#lua-match? @variable.builtin "^[*].+[*]$"))
 
 ;; quote
 "'" @string.escape
@@ -147,7 +147,7 @@
 
 ;; constant
 ((sym_lit) @constant
- (#match? @constant "^[+].+[+]$"))
+ (#lua-match? @constant "^[+].+[+]$"))
 
 (var_quoting_lit
   marker: "#'" @symbol
@@ -180,7 +180,7 @@
 
 
 ((sym_lit) @symbol
-(#match? @symbol "^[&]"))
+(#lua-match? @symbol "^[&]"))
 
 [(array_dimension) "#0A" "#0a"] @number
 
diff --git a/queries/commonlisp/locals.scm b/queries/commonlisp/locals.scm
index acdf965b7..471fad408 100644
--- a/queries/commonlisp/locals.scm
+++ b/queries/commonlisp/locals.scm
@@ -22,14 +22,14 @@
  (sym_lit) @_deftest
  .
  (sym_lit) @definition.function
- (#match? @_deftest "^(deftest)$")) @scope
+ (#eq? @_deftest "deftest")) @scope
 
 (list_lit
  .
  (sym_lit) @_deftest
  .
  (sym_lit) @definition.function
- (#match? @_deftest "^(deftest)$")) @scope
+ (#eq? @_deftest "deftest")) @scope
 
 (for_clause . (sym_lit) @definition.var)
 (with_clause . (sym_lit) @definition.var)
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 97a3b9f39..9516645f6 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -1,7 +1,7 @@
 ; inherits: c
 
 ((identifier) @field
- (#match? @field "(^_|^m_|_$)"))
+  (#lua-match? @field "^m?_.*$"))
 
 (parameter_declaration
   declarator: (reference_declarator) @parameter)
@@ -39,7 +39,7 @@
 
 (namespace_identifier) @namespace
 ((namespace_identifier) @type
-                        (#lua-match? @type "^[A-Z]"))
+  (#lua-match? @type "^[%u]"))
 
 (case_statement
   value: (qualified_identifier (identifier) @constant))
@@ -135,26 +135,26 @@
 ((function_declarator
   (qualified_identifier
     (identifier) @constructor))
-  (#lua-match? @constructor "^[A-Z]"))
+  (#lua-match? @constructor "^%u"))
 
 ((call_expression
   function: (identifier) @constructor)
-(#lua-match? @constructor "^[A-Z]"))
+(#lua-match? @constructor "^%u"))
 ((call_expression
   function: (qualified_identifier
               name: (identifier) @constructor))
-(#lua-match? @constructor "^[A-Z]"))
+(#lua-match? @constructor "^%u"))
 
 ((call_expression
   function: (field_expression
               field: (field_identifier) @constructor))
-(#lua-match? @constructor "^[A-Z]"))
+(#lua-match? @constructor "^%u"))
 
 ;; constructing a type in an initializer list: Constructor ():  **SuperType (1)**
 ((field_initializer
   (field_identifier) @constructor
   (argument_list))
- (#lua-match? @constructor "^[A-Z]"))
+ (#lua-match? @constructor "^%u"))
 
 
 ; Constants
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index bacc5bd26..b26f0ec96 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -57,9 +57,9 @@
 (namespace_name) @namespace
 
 ((property_name) @type.definition
-                 (#match? @type.definition "^--"))
+  (#lua-match? @type.definition "^[-][-]"))
 ((plain_value) @type
-               (#match? @type "^--"))
+  (#lua-match? @type "^[-][-]"))
 
 [
  (string_value)
diff --git a/queries/cue/highlights.scm b/queries/cue/highlights.scm
index 50137c7b3..8e626d63c 100644
--- a/queries/cue/highlights.scm
+++ b/queries/cue/highlights.scm
@@ -97,7 +97,7 @@
 (primitive_type) @type.builtin
 
 ((identifier) @type
-  (#match? @type "^(#|_#)"))
+  (#lua-match? @type "^_?#"))
 
 [
   (slice_type)
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index e34467f65..372a6389c 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -11,7 +11,7 @@
 
 ; 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]"))
+(((identifier) @function (#lua-match? @function "^_?[%l]"))
   . (selector . (argument_part))) @function
 
 ; Annotations
@@ -100,7 +100,7 @@
 ((scoped_identifier
   scope: (identifier) @type
   name: (identifier) @type)
- (#match? @type "^[a-zA-Z]"))
+ (#lua-match? @type "^[%u%l]"))
 
 (type_identifier) @type
 
@@ -113,7 +113,7 @@
 (inferred_type) @keyword
 
 ((identifier) @type
- (#match? @type "^_?[A-Z].*[a-z]")) ; catch Classes or IClasses not CLASSES
+ (#lua-match? @type "^_?[%u].*[%l]")) ; catch Classes or IClasses not CLASSES
 
 ("Function" @type)
 
diff --git a/queries/dhall/highlights.scm b/queries/dhall/highlights.scm
index 4bf79d090..f0c454cf1 100644
--- a/queries/dhall/highlights.scm
+++ b/queries/dhall/highlights.scm
@@ -20,7 +20,7 @@
 ([
   (let_binding (label) @type)
   (union_type_entry (label) @type)
-] (#match? @type "^[A-Z]"))
+] (#lua-match? @type "^%u"))
 
 ((primitive_expression
   (identifier (label) @type)
diff --git a/queries/dockerfile/highlights.scm b/queries/dockerfile/highlights.scm
index 2d1840e66..592e70423 100644
--- a/queries/dockerfile/highlights.scm
+++ b/queries/dockerfile/highlights.scm
@@ -55,9 +55,3 @@
 
 (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/ebnf/highlights.scm b/queries/ebnf/highlights.scm
index 416aaab68..feafa1cef 100644
--- a/queries/ebnf/highlights.scm
+++ b/queries/ebnf/highlights.scm
@@ -11,13 +11,13 @@
 
 ; Allow different highlighting for specific casings
 ((identifier) @type
- (#match? @type "^[A-Z]"))
+ (#lua-match? @type "^%u"))
 
 ((identifier) @symbol
- (#match? @symbol "^[a-z]"))
+ (#lua-match? @symbol "^%l"))
 
 ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$"))
+ (#lua-match? @constant "^%u[%u%d_]+$"))
 
 ;;; Punctuation ;;;;
 [
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 712c780ac..ba0ea4fa1 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -90,7 +90,7 @@
 (assignment_expression
   left: (member_expression
           property: (property_identifier) @_prop
-          (#match? @_prop "(out|inn)erHTML"))
+           (#any-of? @_prop "innerHTML" "outerHTML"))
   right: (template_string) @html
     (#offset! @html 0 1 0 -1))
 
@@ -98,6 +98,6 @@
 (assignment_expression
    left: (member_expression
            property: (property_identifier) @_prop
-           (#match? @_prop "(out|inn)erHTML"))
+            (#any-of? @_prop "innerHTML" "outerHTML"))
    right: (string) @html
             (#offset! @html 0 1 0 -1))
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 3223fa683..81bf5f858 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -26,7 +26,7 @@
 (identifier) @variable
 
 ; Unused Identifiers
-((identifier) @comment (#match? @comment "^_"))
+((identifier) @comment (#lua-match? @comment "^_"))
 
 ; Comments
 (comment) @comment @spell
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index fcb7e8b5e..43aca53ad 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -40,7 +40,7 @@
 (list . (multi_symbol (symbol) @function .))
 
 ((symbol) @variable.builtin
- (#match? @variable.builtin "^[$]"))
+ (#lua-match? @variable.builtin "^[$]"))
 
 (binding) @symbol
 
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 91978e148..d12cbd781 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -15,12 +15,12 @@
 
 ;; match operators of test command
 (command
-  name: (word) @function.builtin (#match? @function.builtin "^test$")
+  name: (word) @function.builtin (#eq? @function.builtin "test")
   argument: (word) @operator (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
 
 ;; match operators of [ command
 (command
-  name: (word) @punctuation.bracket (#match? @punctuation.bracket "^\\[$")
+  name: (word) @punctuation.bracket (#eq? @punctuation.bracket "[")
   argument: (word) @operator (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
 
 [
@@ -106,7 +106,7 @@
 
 (command
   argument: [
-             (word) @parameter (#match? @parameter "^-")
+             (word) @parameter (#lua-match? @parameter "^[-]")
             ]
 )
 
@@ -137,7 +137,7 @@
   option: [
           (word)
           (concatenation (word))
-          ] @parameter (#match? @parameter "^-")
+          ] @parameter (#lua-match? @parameter "^[-]")
 )
 
 ;; Strings
@@ -160,7 +160,7 @@
 (#any-of? @boolean "true" "false"))
 
 ((program . (comment) @preproc)
-  (#match? @preproc "^#!/"))
+  (#lua-match? @preproc "^#!/"))
 
 ;; Error
 
diff --git a/queries/foam/highlights.scm b/queries/foam/highlights.scm
index 86a3bf324..11d31e692 100644
--- a/queries/foam/highlights.scm
+++ b/queries/foam/highlights.scm
@@ -23,16 +23,11 @@
     directive: (identifier)* @conditional
     argument: (identifier)* @namespace
 )
-(
-    (preproc_call
-        argument: (identifier)* @namespace
-    ) @conditional
-    (#match? @conditional "ifeq")
-)
-(
-    (preproc_call) @conditional
-    (#match? @conditional "(else|endif)")
-)
+((preproc_call
+  argument: (identifier)* @namespace) @conditional
+  (#eq? @conditional "ifeq"))
+((preproc_call) @conditional
+  (#any-of? @conditional "else" "endif"))
 
 ;; Literal numbers and strings
 (number_literal) @float
@@ -64,6 +59,7 @@
 ] @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)$")
-)
+[ "on" "off" "true" "false" "yes" "no" ] @constant.builtin
+
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin "uniform" "non-uniform" "and" "or"))
diff --git a/queries/fusion/highlights.scm b/queries/fusion/highlights.scm
index b093f8872..bb24a413f 100644
--- a/queries/fusion/highlights.scm
+++ b/queries/fusion/highlights.scm
@@ -18,7 +18,7 @@
 
 (eel_object_path
   (eel_path_identifier) @variable.builtin
-  (#match? @variable.builtin "^(this|props)$")
+  (#any-of? @variable.builtin "this" "props")
 )
 
 (eel_object_path
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index b1b3f9141..70a48cf83 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -3,10 +3,10 @@
 ; 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]"))
+  (#lua-match? @tag "^:?[%l]"))
 ; Tags that start with a capital letter are Glimmer components
 ((tag_name) @constructor
-  (#lua-match? @constructor "^[A-Z]"))
+  (#lua-match? @constructor "^%u"))
 
 (attribute_name) @property
 
@@ -38,7 +38,7 @@
   (path_expression (identifier) @variable)
   (identifier) @variable
   ])
-  (#not-match? @variable "yield|outlet|this|else"))
+  (#not-any-of? @variable "yield" "outlet" "this" "else"))
 ; As are arguments in a block statement
 (block_statement_start argument: [
   (path_expression (identifier) @variable)
@@ -51,10 +51,10 @@
   (path_expression (identifier) @variable)
   (identifier) @variable
   ])
-  (#not-match? @variable "this"))
+  (#not-eq? @variable "this"))
 ; `this` should be highlighted as a built-in variable
 ((identifier) @variable.builtin
-  (#lua-match? @variable.builtin "this"))
+  (#eq? @variable.builtin "this"))
 
 ; If the identifier is just "yield" or "outlet", it's a keyword
 ((mustache_statement (identifier) @keyword)
@@ -65,11 +65,11 @@
   (path_expression (identifier) @function)
   (identifier) @function
   ])
-  (#not-match? @function "if|yield"))
+  (#not-any-of? @function "if" "yield"))
 ((helper_invocation helper: (identifier) @conditional)
-  (#lua-match? @conditional "if"))
+  (#eq? @conditional "if"))
 ((helper_invocation helper: (identifier) @keyword)
-  (#lua-match? @keyword "yield"))
+  (#eq? @keyword "yield"))
 
 (hash_pair key: (identifier) @property)
 
diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index b6a90f726..f44a853b0 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -10,19 +10,19 @@
  (#match? @_tag "^(h[0-9]|title)$"))
 
 ((element (start_tag (tag_name) @_tag) (text) @text.strong)
- (#match? @_tag "^(strong|b)$"))
+ (#any-of? @_tag "strong" "b"))
 
 ((element (start_tag (tag_name) @_tag) (text) @text.emphasis)
- (#match? @_tag "^(em|i)$"))
+ (#any-of? @_tag "em" "i"))
 
 ((element (start_tag (tag_name) @_tag) (text) @text.strike)
- (#match? @_tag "^(s|del)$"))
+ (#any-of? @_tag "s" "del"))
 
 ((element (start_tag (tag_name) @_tag) (text) @text.underline)
  (#eq? @_tag "u"))
 
 ((element (start_tag (tag_name) @_tag) (text) @text.literal)
- (#match? @_tag "^(code|kbd)$"))
+ (#any-of? @_tag "code" "kbd"))
 
 ((element (start_tag (tag_name) @_tag) (text) @text.uri)
  (#eq? @_tag "a"))
@@ -30,7 +30,7 @@
 ((attribute
    (attribute_name) @_attr
    (quoted_attribute_value (attribute_value) @text.uri))
- (#match? @_attr "^(href|src)$"))
+ (#any-of? @_attr "href" "src"))
 
 [
  "<"
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index ff79619c0..259395da5 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -8,7 +8,7 @@
     (assignment)
     (const_declaration)
   ]
- (#match? @markdown "^\"\"\"")
+ (#lua-match? @markdown "^\"\"\"")
  (#offset! @markdown 0 3 0 -3))
 
 [
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index bb8a30539..ef045f1b1 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -58,10 +58,8 @@
 (application_expression
   function: (value_path (value_name) @function))
 
-(
-  (value_name) @function.builtin
-  (#match? @function.builtin "^(raise(_notrace)?|failwith|invalid_arg)$")
-)
+((value_name) @function.builtin
+  (#any-of? @function.builtin "raise" "raise_notrace" "failwith" "invalid_arg"))
 
 ; Properties
 ;-----------
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index c6b2c4ee4..45ad8db72 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -90,7 +90,7 @@
 (comments) @spell
 
 ((source_file . (comments) @preproc)
-  (#match? @preproc "^#!/"))
+  (#lua-match? @preproc "^#!/"))
 
 ; POD should be handled specially with its own embedded subtype but for now
 ;   we'll just have to do this.
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 86cb46b5a..30747b1fa 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -29,7 +29,7 @@
 
 ((attribute
     attribute: (identifier) @field)
- (#match? @field "^([A-Z])@!.*$"))
+ (#lua-match? @field "^%u@!.*$"))
 
 ((identifier) @type.builtin
  (#any-of? @type.builtin
@@ -71,12 +71,12 @@
 
 ((call
    function: (identifier) @constructor)
- (#lua-match? @constructor "^[A-Z]"))
+ (#lua-match? @constructor "^%u"))
 
 ((call
   function: (attribute
               attribute: (identifier) @constructor))
- (#lua-match? @constructor "^[A-Z]"))
+ (#lua-match? @constructor "^%u"))
 
 ;; Decorators
 
@@ -170,7 +170,7 @@
 (comment) @comment @spell
 
 ((module . (comment) @preproc)
-  (#match? @preproc "^#!/"))
+  (#lua-match? @preproc "^#!/"))
 
 (string) @string
 (escape_sequence) @string.escape
@@ -324,14 +324,14 @@
           (expression_statement
             (assignment
               left: (identifier) @field))))
- (#match? @field "^([A-Z])@!.*$"))
+ (#lua-match? @field "^%u@!.*$"))
 ((class_definition
   body: (block
           (expression_statement
             (assignment
               left: (_
                      (identifier) @field)))))
- (#match? @field "^([A-Z])@!.*$"))
+ (#lua-match? @field "^%u@!.*$"))
 
 ((class_definition
   (block
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 013e135ab..7c0c866d9 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -124,7 +124,7 @@
 (predefined_type) @type.builtin
 
 ((identifier) @type
-  (#match? @type "^[A-Z]"))
+  (#lua-match? @type "^%u"))
 
 (type_arguments
   "<" @punctuation.bracket
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index ba5835c11..ca784e647 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -13,7 +13,7 @@
 (comment) @comment @spell
 
 ((program . (comment) @preproc)
-  (#match? @preproc "^#!/"))
+  (#lua-match? @preproc "^#!/"))
 
 (identifier) @variable
 
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index 91aa77d9f..bc3c7eb5c 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -40,7 +40,7 @@
 (symbol) @variable
 
 ((symbol) @comment
- (#match? @comment "^#[cC][iIsS]$"))
+ (#lua-match? @comment "^#[cC][iIsS]$"))
 
 ;; extension ;;
 
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 4f810c293..e9ec9c22c 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -82,7 +82,10 @@
   (#lua-match? @keyword.return "^return"))
 
 ((opcode) @conditional
-  (#match? @conditional "^(if|cmp)"))
+  (#lua-match? @conditional "^if"))
+
+((opcode) @conditional
+  (#lua-match? @conditional "^cmp"))
 
 ((opcode) @exception
   (#lua-match? @exception "^throw"))
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index ab9bfd68d..f318258ac 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -29,7 +29,7 @@
 
 ((attribute
     attribute: (identifier) @field)
- (#match? @field "^([A-Z])@!.*$"))
+ (#lua-match? @field "^%u@!.*$"))
 
 ((identifier) @type.builtin
  (#any-of? @type.builtin
@@ -148,7 +148,7 @@
 (comment) @comment @spell
 
 ((module . (comment) @preproc)
-  (#match? @preproc "^#!/"))
+  (#lua-match? @preproc "^#!/"))
 
 (string) @string
 [
diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 9877fc7a5..9539f2b51 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -15,7 +15,7 @@
   (#eq? @exception "catch"))
 
 ((special_block_keyword) @conditional
-  (#match? @conditional "^(if|else)$"))
+  (#any-of? @conditional "if" "else"))
 
 [
   "{"
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index 9fd1816ba..0e4eb7bd5 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -81,7 +81,7 @@
 (
   (command_expression
     command: (identifier) @keyword.return)
-  (#match? @keyword.return "^[rR][eE][tT][uU][rR][nN]$")
+  (#lua-match? @keyword.return "^[rR][eE][tT][uU][rR][nN]$")
 )
 
 ; Subroutine calls
@@ -97,14 +97,14 @@
   (identifier) @constant)
 (
  (argument_list (identifier) @constant.builtin)
- (#match? @constant.builtin "^[%/][a-zA-Z][a-zA-Z0-9.]*$")
+ (#lua-match? @constant.builtin "^[%%/][%l%u][%l%u%d.]*$")
 )
 
 (
   (command_expression
     command: (identifier) @keyword
     arguments: (argument_list . (identifier) @label))
-  (#match? @keyword "^[gG][oO][tT][oO]$")
+  (#lua-match? @keyword "^[gG][oO][tT][oO]$")
 )
 (labeled_expression
   label: (identifier) @label)
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index f4256a34c..c0dd7dadf 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -1,19 +1,19 @@
 ; Built-ins {{{
 ((function_call
   function: (identifier) @function.builtin)
-  (#match? @function.builtin "^(chr|concat|exit|flush|getchar|not|ord|print|print_err|print_int|size|strcmp|streq|substring)$")
+  (#any-of? @function.builtin "chr" "concat" "exit" "flush" "getchar" "not" "ord" "print" "print_err" "print_int" "size" "strcmp" "streq" "substring")
   ; FIXME: not supported by neovim
   ; (#is-not? local)
   )
 
 ((type_identifier) @type.builtin
-  (#match? @type.builtin "^(int|string|Object)$")
+  (#any-of? @type.builtin "int" "string" "Object")
   ; FIXME: not supported by neovim
   ; (#is-not? local)
   )
 
 ((identifier) @variable.builtin
-  (#match? @variable.builtin "^self$")
+  (#eq? @variable.builtin "self")
   ; FIXME: not supported by neovim
   ; (#is-not? local)
   )
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index c4e69e802..379b525e8 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -31,7 +31,7 @@
   (#not-has-parent? @_parent call_expression special_call_expression)))
 
 ((identifier) @variable.builtin
- (#match? @variable.builtin "^(err|macos|linux|windows)$"))
+  (#any-of? @variable.builtin "err" "macos" "linux" "windows"))
 
 (attribute_declaration) @attribute
 ;; C: TODO: fixme make `C`.exten highlighted as variable.builtin
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index e1a20b8a0..875bad539 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -10,12 +10,12 @@
 ; highlight constants
 (
   (member_access_expression (identifier) @constant)
-  (#match? @constant "^[A-Z][A-Z_0-9]*$")
+  (#lua-match? @constant "^[%u][%u%d_]*$")
 )
 
 (
   (member_access_expression (member_access_expression) @include (identifier) @constant)
-  (#match? @constant "^[A-Z][A-Z_0-9]*$")
+  (#lua-match? @constant "^[%u][%u%d_]*$")
 )
 
 ; highlight types and probable types
@@ -28,7 +28,7 @@
 ; highlight creation methods in object creation expressions
 (
   (object_creation_expression (type (symbol (symbol (symbol)? @include (identifier) @type) (identifier) @constructor)))
-  (#match? @constructor "^[a-z][a-z_0-9]*$")
+  (#lua-match? @constructor "^[%l][%l%d_]*$")
 )
 
 (unqualified_type (symbol . (identifier) @type))
diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index ce25b13b9..09188ddb6 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -275,7 +275,7 @@
 
 ; Options
 ((set_value) @number
- (#match? @number "^[0-9]+(\.[0-9]+)?$"))
+ (#lua-match? @number "^[%d]+(%.[%d]+)?$"))
 
 (inv_option "!" @operator)
 (set_item "?" @operator)
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 37afe1c2f..72d2e642b 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -24,7 +24,7 @@ parameter: (IDENTIFIER) @parameter
     field_access: (IDENTIFIER)
     parameter: (IDENTIFIER)
   ] @type
-  (#match? @type "^[A-Z]([a-z]+[A-Za-z0-9]*)*$")
+  (#lua-match? @type "^%u([%l]+[%u%l%d]*)*$")
 )
 ;; assume camelCase is a function
 (
@@ -33,7 +33,7 @@ parameter: (IDENTIFIER) @parameter
     field_access: (IDENTIFIER)
     parameter: (IDENTIFIER)
   ] @function
-  (#match? @function "^[a-z]+([A-Z][a-z0-9]*)+$")
+  (#lua-match? @function "^%l+([%u][%l%d]*)+$")
 )
 
 ;; assume all CAPS_1 is a constant
@@ -42,7 +42,7 @@ parameter: (IDENTIFIER) @parameter
     variable_type_function: (IDENTIFIER)
     field_access: (IDENTIFIER)
   ] @constant
-  (#match? @constant "^[A-Z][A-Z_0-9]+$")
+  (#lua-match? @constant "^%u[%u%d_]+$")
 )
 
 [

From 57d1a5843742a180be9a3a1d1c652a7d22709691 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 22 Apr 2023 08:39:32 +0000
Subject: [PATCH 0248/2704] Update parsers: json, scheme, t32, tsx, typescript
 (#4694)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3a3d929f2..06df0c041 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -237,7 +237,7 @@
     "revision": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"
   },
   "json": {
-    "revision": "73076754005a460947cafe8e03a8cf5fa4fa2938"
+    "revision": "40a81c01a40ac48744e0c8ccabbaba1920441199"
   },
   "json5": {
     "revision": "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"
@@ -417,7 +417,7 @@
     "revision": "7d348f51e442563f4ab2b6c3e136dac658649f93"
   },
   "scheme": {
-    "revision": "9a23ff3df8f03da555f7679ab640a98a9e851c79"
+    "revision": "f7001ee724395240055fe85fb1558207e9c2935e"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -462,7 +462,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "286623444eabaf8eb36a5e9b3fe4bf3d9b575f1e"
+    "revision": "8a55c59b28d99fe1db7e056e93e4d66d71f5fad4"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"
@@ -489,7 +489,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"
+    "revision": "286e90c32060032225f636a573d0e999f7766c97"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -498,7 +498,7 @@
     "revision": "2457993b13a06dec2706e6a6c3d5b65bb23024b8"
   },
   "typescript": {
-    "revision": "b66d19b9b6ec3edf3d8aff0c20646acbdaa0afb3"
+    "revision": "286e90c32060032225f636a573d0e999f7766c97"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"

From 3f7301789bddf44c328cce7875442d9a617e94fe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 23 Apr 2023 09:08:41 +0000
Subject: [PATCH 0249/2704] Update parsers: htmldjango, ledger, scheme (#4698)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 06df0c041..f5ca27b33 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -216,7 +216,7 @@
     "revision": "86c253e675e7fdd1c0482efe0706f24bafbc3a7d"
   },
   "htmldjango": {
-    "revision": "b2dba02eddab66be669022320273d0dfe1ff923d"
+    "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"
   },
   "http": {
     "revision": "f41d3e97ad148f0b2c2d913e3834ccd5816fdc02"
@@ -264,7 +264,7 @@
     "revision": "cd3cc493a92b6bac7be4b3bd6d006d35d3c36d4c"
   },
   "ledger": {
-    "revision": "f787ae635ca79589faa25477b94291a87e2d3e23"
+    "revision": "1cc4445908966046c1dd211d9ddaac4c3198bd1d"
   },
   "llvm": {
     "revision": "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"
@@ -417,7 +417,7 @@
     "revision": "7d348f51e442563f4ab2b6c3e136dac658649f93"
   },
   "scheme": {
-    "revision": "f7001ee724395240055fe85fb1558207e9c2935e"
+    "revision": "6abcfe33d976ebe3e244ca80273c7e8a070441b5"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"

From 455ded29924aeebdd584f2bb0866788ba0a49dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Barreteau?=
 <cbarrete@users.noreply.github.com>
Date: Sat, 22 Apr 2023 18:06:12 -0400
Subject: [PATCH 0250/2704] Update ledger highlight queries

---
 queries/ledger/highlights.scm | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/queries/ledger/highlights.scm b/queries/ledger/highlights.scm
index 86c609c2a..963de1882 100644
--- a/queries/ledger/highlights.scm
+++ b/queries/ledger/highlights.scm
@@ -1,16 +1,31 @@
 [
+    (block_comment)
     (comment)
     (note)
+    (test)
 ] @comment
 
 [
-    (date)
-    (interval)
     (quantity)
+    (negative_quantity)
 ] @number
 
+[
+    (date)
+    (effective_date)
+    (time)
+    (interval)
+] @string.special
+
+[
+    (commodity)
+    (option)
+    (option_value)
+    (check_in)
+    (check_out)
+] @text.literal
+
 ((account) @field)
-((commodity) @text.literal)
 
 "include" @include
 
@@ -20,6 +35,7 @@
     "assert"
     "check"
     "commodity"
+    "comment"
     "def"
     "default"
     "end"
@@ -28,7 +44,7 @@
     "nomarket"
     "note"
     "payee"
-    "check"
+    "test"
     "A"
     "Y"
     "N"

From 2083a34dc6b70b8d87391419fd197830fc26c9a4 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 24 Apr 2023 15:32:41 +0900
Subject: [PATCH 0251/2704] feat(java): add basic folding (#4701)

---
 queries/java/folds.scm | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 queries/java/folds.scm

diff --git a/queries/java/folds.scm b/queries/java/folds.scm
new file mode 100644
index 000000000..262a8d80f
--- /dev/null
+++ b/queries/java/folds.scm
@@ -0,0 +1,5 @@
+[
+  (block)
+  (argument_list)
+  (annotation_argument_list)
+] @fold

From 77ffc7edbe19db9dc2a71081005e2961c8940096 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 07:02:58 +0000
Subject: [PATCH 0252/2704] Update parsers: devicetree, swift, t32 (#4702)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f5ca27b33..9ad6d940f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -81,7 +81,7 @@
     "revision": "53485a8f301254e19c518aa20c80f1bcf7cf5c62"
   },
   "devicetree": {
-    "revision": "6428cee0e9d76fac3291796ced56ac14ecd036ee"
+    "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -456,13 +456,13 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "05467af73ac315fc80c7f3ef397e261f30395e2a"
+    "revision": "80c1ff80502414f80de177ca162f4f71aa196ee2"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "8a55c59b28d99fe1db7e056e93e4d66d71f5fad4"
+    "revision": "51373bc49e6b43b063a2eec121b5948ca00d17d9"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From 72e2e2df8649d3c36559a28f35fcb278036507cb Mon Sep 17 00:00:00 2001
From: smjonas <jonas.strittmatter@gmx.de>
Date: Mon, 24 Apr 2023 13:25:00 +0200
Subject: [PATCH 0253/2704] injections(lua): highlight Lua code in
 vim.rpcrequest and vim.rpcnotify

---
 queries/lua/injections.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index b9b203424..81e257f77 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -16,7 +16,14 @@
   arguments: (arguments (string content: _ @query) .))
   (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query" "vim.treesitter.query.parse"))
 
-;; highlight string as query if starts with `;; query`
+; vim.rcprequest(123, "nvim_exec_lua", "return vim.api.nvim_buf_get_lines(0, 0, -1, false)", false)
+((function_call
+  name: (_) @_vimcmd_identifier
+  arguments: (arguments . (_) . (string) @_method . (string content: _ @lua)))
+  (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
+  (#any-of? @_method "\"nvim_exec_lua\"" "'nvim_exec_lua'" "[[nvim_exec_lua]]"))
+
+; highlight string as query if starts with `;; query`
 ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))
 
 ((comment) @luadoc

From 1280315db14e8b77a381b7c22b8dd0918b01fa8d Mon Sep 17 00:00:00 2001
From: smjonas <jonas.strittmatter@gmx.de>
Date: Mon, 24 Apr 2023 15:43:31 +0200
Subject: [PATCH 0254/2704] injections(lua): highlight vim.api.nvim_exec2

---
 queries/lua/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 81e257f77..d726c5417 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -8,8 +8,8 @@
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments (string content: _ @vim)))
-  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec"))
+  arguments: (arguments . (string content: _ @vim)))
+  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec" "vim.api.nvim_exec2"))
 
 ((function_call
   name: (_) @_vimcmd_identifier

From 9f157094cd0dabb7a6fd240e38b00d4ed0176fdb Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 24 Apr 2023 19:10:49 -0400
Subject: [PATCH 0255/2704] feat(smali): update queries from upstream parser

---
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua |  2 +-
 queries/smali/highlights.scm    | 46 +++++++++++++++++++++++++++------
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9ad6d940f..45474c092 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -426,7 +426,7 @@
     "revision": "07547525cdf4627343dca5891f1743ae45e879bb"
   },
   "smali": {
-    "revision": "b002dceb9b91a6d6de45479ab4b2e9596ebbaaf3"
+    "revision": "9bf8aa671a233ae2d2c6e9512c7144ce121b1fb6"
   },
   "smithy": {
     "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6a52a4a6e..b3fc36313 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1269,7 +1269,7 @@ list.slint = {
 list.smali = {
   install_info = {
     url = "https://git.sr.ht/~yotam/tree-sitter-smali",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@amaanq" },
 }
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index e9ec9c22c..2e2b84b8b 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -1,11 +1,21 @@
 ; Types
 
-(class_identifier) @type
+(class_identifier
+  (identifier) @type)
 
 (primitive_type) @type.builtin
 
-((class_identifier) @type.builtin
-  (#match? @type.builtin "^L(android|com/android|dalvik|java|kotlinx)/"))
+((class_identifier
+   . (identifier) @_first @type.builtin
+   (identifier) @type.builtin)
+  (#any-of? @_first "android" "dalvik" "java" "kotlinx"))
+
+((class_identifier
+   . (identifier) @_first @type.builtin
+   .  (identifier) @_second @type.builtin
+   (identifier) @type.builtin)
+  (#eq? @_first "com")
+  (#any-of? @_second "android" "google"))
 
 ; Methods
 
@@ -48,6 +58,8 @@
 ((method_identifier) @constructor
   (#any-of? @constructor "<init>" "<clinit>"))
 
+"constructor" @constructor
+
 ; Fields
 
 [
@@ -55,6 +67,9 @@
   (annotation_key)
 ] @field
 
+((field_identifier) @constant
+  (#lua-match? @constant "^[%u_]*$"))
+
 ; Variables
 
 (variable) @variable.builtin
@@ -90,6 +105,9 @@
 ((opcode) @exception
   (#lua-match? @exception "^throw"))
 
+((opcode) @comment
+  (#eq? @comment "nop")) ; haha, anyone get it? ;)
+
 [
   "="
   ".."
@@ -100,7 +118,6 @@
 [
   ".class"
   ".super"
-  ".source"
   ".implements"
   ".field"
   ".end field"
@@ -118,8 +135,6 @@
   ".end local"
   ".restart local"
   ".registers"
-  ".catch"
-  ".catchall"
   ".packed-switch"
   ".end packed-switch"
   ".sparse-switch"
@@ -131,11 +146,20 @@
   (epilogue_directive)
 ] @keyword
 
+[
+  ".source"
+] @include
+
 [
   ".method"
   ".end method"
 ] @keyword.function
 
+[
+  ".catch"
+  ".catchall"
+] @exception
+
 ; Literals
 
 (string) @string
@@ -144,6 +168,8 @@
 
 (character) @character
 
+"L" @character.special
+
 (number) @number
 
 [
@@ -160,7 +186,7 @@
 
 (annotation_visibility) @storageclass
 
-(access_modifiers) @type.qualifier
+(access_modifier) @type.qualifier
 
 (array_type
   "[" @punctuation.special)
@@ -171,11 +197,15 @@
 
 [
   "->"
-  ":"
   ","
+  ":"
+  ";"
   "@"
+  "/"
 ] @punctuation.delimiter
 
+(line_directive (number) @text.underline @text.literal)
+
 ; Comments
 
 (comment) @comment @spell

From b39e6bd61590e429b6fd42734f1485b94335af5f Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 24 Apr 2023 19:12:06 -0400
Subject: [PATCH 0256/2704] chore(smali): add tests

---
 queries/smali/indents.scm                     |   2 +-
 tests/indent/smali/array_and_switch.smali     |  58 ++++
 tests/indent/smali/field.smali                |  12 +
 tests/indent/smali/method.smali               |   8 +
 tests/indent/smali/parameter.smali            |  55 ++++
 tests/indent/smali_spec.lua                   |  25 ++
 .../smali/baksmali_test_class.smali           | 261 ++++++++++++++++++
 7 files changed, 420 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/smali/array_and_switch.smali
 create mode 100644 tests/indent/smali/field.smali
 create mode 100644 tests/indent/smali/method.smali
 create mode 100644 tests/indent/smali/parameter.smali
 create mode 100644 tests/indent/smali_spec.lua
 create mode 100644 tests/query/highlights/smali/baksmali_test_class.smali

diff --git a/queries/smali/indents.scm b/queries/smali/indents.scm
index cdfd9081e..c61d9528a 100644
--- a/queries/smali/indents.scm
+++ b/queries/smali/indents.scm
@@ -22,7 +22,7 @@
   ".end sparse-switch"
   ".end subannotation"
   "}"
-] @indent.end
+] @indent.end @indent.branch
 
 [ "{" "}" ] @indent.branch
 
diff --git a/tests/indent/smali/array_and_switch.smali b/tests/indent/smali/array_and_switch.smali
new file mode 100644
index 000000000..3ee3f6d01
--- /dev/null
+++ b/tests/indent/smali/array_and_switch.smali
@@ -0,0 +1,58 @@
+.class public Lbaksmali/test/class;
+.super Ljava/lang/Object;
+
+.source "baksmali_test_class.smali"
+
+.method public testMethod(ILjava/lang/String;)Ljava/lang/String;
+	.registers 3
+	.annotation runtime Lorg/junit/Test;
+	.end annotation
+	.annotation system Lyet/another/annotation;
+		somevalue = 1234
+		anothervalue = 3.14159
+	.end annotation
+
+	const-string v0, "testing\n123"
+
+	goto switch:
+
+	sget v0, Lbaksmali/test/class;->staticField:I
+
+	switch:
+	packed-switch v0, pswitch:
+
+	try_start:
+	const/4 v0, 7
+	const v0, 10
+	nop
+	try_end:
+	.catch Ljava/lang/Exception; {try_start: .. try_end:} handler:
+	.catchall {try_start: .. try_end:} handler2:
+
+	handler:
+
+	Label10:
+	Label11:
+	Label12:
+	Label13:
+	return-object v0
+
+
+
+	.array-data 4
+		1 2 3 4 5 6 200
+	.end array-data
+
+	pswitch:
+	.packed-switch 10
+		Label10:
+		Label11:
+		Label12:
+		Label13:
+	.end packed-switch
+
+	handler2:
+
+	return-void
+
+.end method
diff --git a/tests/indent/smali/field.smali b/tests/indent/smali/field.smali
new file mode 100644
index 000000000..ae48b7b3c
--- /dev/null
+++ b/tests/indent/smali/field.smali
@@ -0,0 +1,12 @@
+.class public Lbaksmali/test/class;
+.super Ljava/lang/Object;
+
+.source "baksmali_test_class.smali"
+
+.field public static annotationStaticField:Lsome/annotation; = .subannotation Lsome/annotation;
+	value1 = "test"
+	value2 = .subannotation Lsome/annotation;
+		value1 = "test2"
+		value2 = Lsome/enum;
+	.end subannotation
+.end subannotation
diff --git a/tests/indent/smali/method.smali b/tests/indent/smali/method.smali
new file mode 100644
index 000000000..2c139b0cb
--- /dev/null
+++ b/tests/indent/smali/method.smali
@@ -0,0 +1,8 @@
+.class public Lbaksmali/test/class;
+.super Ljava/lang/Object;
+
+.source "baksmali_test_class.smali"
+
+.method public debugTest(IIIII)V
+	.registers 10
+.end method
diff --git a/tests/indent/smali/parameter.smali b/tests/indent/smali/parameter.smali
new file mode 100644
index 000000000..2e54da2f9
--- /dev/null
+++ b/tests/indent/smali/parameter.smali
@@ -0,0 +1,55 @@
+.class public Lbaksmali/test/class;
+.super Ljava/lang/Object;
+
+.source "baksmali_test_class.smali"
+
+.method public debugTest(IIIII)V
+	.registers 10
+
+	.parameter "Blah"
+	.parameter
+	.parameter "BlahWithAnnotations"
+		.annotation runtime Lsome/annotation;
+			something = "some value"
+			somethingelse = 1234
+		.end annotation
+		.annotation runtime La/second/annotation;
+		.end annotation
+	.end parameter
+	.parameter
+		.annotation runtime Lsome/annotation;
+			something = "some value"
+			somethingelse = 1234
+		.end annotation
+	.end parameter
+	.parameter "LastParam"
+
+	.prologue
+
+	nop
+	nop
+
+	.source "somefile.java"
+	.line 101
+
+	nop
+
+
+	.line 50
+
+	.local v0, aNumber:I
+	const v0, 1234
+	.end local v0
+
+	.source "someotherfile.java"
+	.line 900
+
+	const-string v0, "1234"
+
+	.restart local v0
+	const v0, 6789
+	.end local v0
+
+	.epilogue
+
+.end method
diff --git a/tests/indent/smali_spec.lua b/tests/indent/smali_spec.lua
new file mode 100644
index 000000000..cddc4f9d2
--- /dev/null
+++ b/tests/indent/smali_spec.lua
@@ -0,0 +1,25 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/smali", {
+  tabstop = 4,
+  shiftwidth = 4,
+  expandtab = false,
+})
+
+describe("indent Smali:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("field.smali", { on_line = 7, text = 'value1 = "test"', indent = 1 })
+    run:new_line("field.smali", { on_line = 10, text = "value2 = Lsome/enum;", indent = 2 })
+    run:new_line("array_and_switch.smali", { on_line = 43, text = "1 2 3 4 5 6 200", indent = 2 })
+    run:new_line("array_and_switch.smali", { on_line = 48, text = "Label10:", indent = 2 })
+    run:new_line("method.smali", { on_line = 7, text = ".registers 10", indent = 1 })
+    run:new_line("parameter.smali", { on_line = 20, text = ".annotation runtime Lsome/annotation;", indent = 3 })
+    run:new_line("parameter.smali", { on_line = 21, text = 'something = "some value"', indent = 3 })
+  end)
+end)
diff --git a/tests/query/highlights/smali/baksmali_test_class.smali b/tests/query/highlights/smali/baksmali_test_class.smali
new file mode 100644
index 000000000..77eb0c83b
--- /dev/null
+++ b/tests/query/highlights/smali/baksmali_test_class.smali
@@ -0,0 +1,261 @@
+.class public Lbaksmali/test/class;
+# <- @keyword
+#      ^^^^^^ @type.qualifier
+.super Ljava/lang/Object;
+#      ^ @character.special
+#       ^^^^ @type.builtin
+#           ^ @punctuation.delimiter
+
+.source "baksmali_test_class.smali"
+# <- @include
+
+.implements Lsome/interface;
+.implements Lsome/other/interface;
+
+
+.annotation build Lsome/annotation;
+#           ^^^^^ @storageclass
+#                  ^^^^ @type
+#                                 ^ @punctuation.delimiter
+    value1 = "test"
+#   ^^^^^^ @field
+#          ^ @operator
+#            ^^^^^^ @string
+    value2 = .subannotation Lsome/annotation;
+        value1 = "test2"
+        value2 = Lsome/enum;
+    .end subannotation
+.end annotation
+
+.annotation system Lsome/annotation;
+.end annotation
+
+
+
+.field public static aStaticFieldWithoutAnInitializer:I
+#                                                    ^ @punctuation.delimiter
+#                                                     ^ @type.builtin
+
+.field public static longStaticField:J = 0x300000000L
+#                                        ^^^^^^^^^^^^ @number
+.field public static longNegStaticField:J = -0x300000000L
+
+.field public static intStaticField:I = 0x70000000
+.field public static intNegStaticField:I = -500
+
+.field public static shortStaticField:S = 500s
+.field public static shortNegStaticField:S = -500s
+
+.field public static byteStaticField:B = 123t
+.field public static byteNegStaticField:B = 0xAAt
+
+.field public static floatStaticField:F = 3.1415926f
+#                                         ^^^^^^^^^^ @float
+
+.field public static doubleStaticField:D = 3.141592653589793
+
+.field public static charStaticField:C = 'a'
+#                                        ^^^ @character
+.field public static charEscapedStaticField:C = '\n'
+#                                                ^^ @string.escape
+
+.field public static boolTrueStaticField:Z = true
+#                                            ^^^^ @boolean
+.field public static boolFalseStaticField:Z = false
+
+.field public static typeStaticField:Ljava/lang/Class; = Lbaksmali/test/class;
+
+.field public static stringStaticField:Ljava/lang/String; = "test"
+.field public static stringEscapedStaticField:Ljava/lang/String; = "test\ntest"
+
+
+.field public static fieldStaticField:Ljava/lang/reflect/Field; = Lbaksmali/test/class;->fieldStaticField:Ljava/lang/reflect/Field;
+
+.field public static methodStaticField:Ljava/lang/reflect/Method; = Lbaksmali/test/class;->testMethod(ILjava/lang/String;)Ljava/lang/String;
+#                                                                                        ^^ @punctuation.delimiter
+#                                                                                          ^^^^^^^^^^ @method.call
+
+.field public static arrayStaticField:[I = {1, 2, 3, {1, 2, 3, 4}}
+#                                     ^ @punctuation.special
+#                                          ^ @punctuation.bracket
+#                                            ^ @punctuation.delimiter
+
+.field public static enumStaticField:Lsome/enum; = .enum Lsome/enum;->someEnumValue:Lsome/enum;
+#                                                                     ^^^^^^^^^^^^^ @field
+
+.field public static annotationStaticField:Lsome/annotation; = .subannotation Lsome/annotation;
+    value1 = "test"
+    value2 = .subannotation Lsome/annotation;
+        value1 = "test2"
+        value2 = Lsome/enum;
+    .end subannotation
+.end subannotation
+
+.field public static staticFieldWithAnnotation:I
+    .annotation runtime La/field/annotation;
+#               ^^^^^^^ @storageclass
+        this = "is"
+        a = "test"
+    .end annotation
+    .annotation runtime Lorg/junit/Test;
+    .end annotation
+.end field
+
+.field public instanceField:Ljava/lang/String;
+
+
+
+.method public constructor <init>()V
+# <- @keyword.function
+#              ^^^^^^^^^^^ @constructor
+#                          ^^^^^^ @constructor
+    .registers 1
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+#   ^^^^^^^^^^^^^ @keyword.operator
+#                  ^^ @parameter.builtin
+    return-void
+#   ^^^^^^^^^^^ @keyword.return
+.end method
+
+.method public testMethod(ILjava/lang/String;)Ljava/lang/String;
+#              ^^^^^^^^^^ @method
+    .registers 3
+    .annotation runtime Lorg/junit/Test;
+    .end annotation
+    .annotation system Lyet/another/annotation;
+        somevalue = 1234
+        anothervalue = 3.14159
+    .end annotation
+
+    const-string v0, "testing\n123"
+#                ^^ @variable.builtin
+
+    goto switch:
+#        ^^^^^^^ @label
+
+    sget v0, Lbaksmali/test/class;->staticField:I
+
+    switch:
+    packed-switch v0, pswitch:
+
+    try_start:
+    const/4 v0, 7
+    const v0, 10
+    nop
+    try_end:
+    .catch Ljava/lang/Exception; {try_start: .. try_end:} handler:
+#   ^^^^^^ @exception
+    .catchall {try_start: .. try_end:} handler2:
+#   ^^^^^^^^^ @exception
+#                         ^^ @operator
+
+    handler:
+
+    Label10:
+    Label11:
+    Label12:
+    Label13:
+    return-object v0
+
+
+
+    .array-data 4
+        1 2 3 4 5 6 200
+    .end array-data
+
+    pswitch:
+    .packed-switch 10
+        Label10:
+        Label11:
+        Label12:
+        Label13:
+    .end packed-switch
+
+    handler2:
+
+    return-void
+
+.end method
+
+.method public abstract testMethod2()V
+    .annotation runtime Lsome/annotation;
+        subannotation = .subannotation Lsome/other/annotation;
+            value = "value"
+        .end subannotation
+    .end annotation
+    .annotation runtime Lorg/junit/Test;
+    .end annotation
+.end method
+
+
+.method public tryTest()V
+    .registers 1
+
+    handler:
+    nop
+
+
+    try_start:
+    const/4 v0, 7
+    const v0, 10
+    nop
+    try_end:
+    .catch Ljava/lang/Exception; {try_start: .. try_end:} handler:
+.end method
+
+
+.method public debugTest(IIIII)V
+    .registers 10
+
+    .parameter "Blah"
+    .parameter
+    .parameter "BlahWithAnnotations"
+        .annotation runtime Lsome/annotation;
+            something = "some value"
+            somethingelse = 1234
+        .end annotation
+        .annotation runtime La/second/annotation;
+        .end annotation
+    .end parameter
+    .parameter
+        .annotation runtime Lsome/annotation;
+            something = "some value"
+            somethingelse = 1234
+        .end annotation
+    .end parameter
+    .parameter "LastParam"
+
+    .prologue
+#   ^^^^^^^^^ @keyword
+
+    nop
+    nop
+
+    .source "somefile.java"
+#   ^^^^^^^ @include
+    .line 101
+#         ^^^ @text.literal
+
+    nop
+
+
+    .line 50
+
+    .local v0, aNumber:I
+#              ^^^^^^^ @variable
+    const v0, 1234
+    .end local v0
+
+    .source "someotherfile.java"
+    .line 900
+
+    const-string v0, "1234"
+
+    .restart local v0
+    const v0, 6789
+    .end local v0
+
+    .epilogue
+#   ^^^^^^^^^ @keyword
+
+.end method

From 39f5d8d89e947b5c0c8b4c868cff3b5711c71115 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 25 Apr 2023 06:36:33 +0000
Subject: [PATCH 0257/2704] Update parsers: glimmer, smali, zig

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 45474c092..b335f7a67 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "ae79782c00656945db69641378e688cdb78d52c1"
   },
   "glimmer": {
-    "revision": "21805f429c5b7536be9f5f61dcabb5d3a4173bec"
+    "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
     "revision": "e2c2214045de2628b81089b1a739962f59654558"
@@ -543,6 +543,6 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zig": {
-    "revision": "9b84cb66e7d480e7c0370f4e33e8325bac6ad09f"
+    "revision": "c73f666a48339657f6eb0f6fd0c67823f1d90992"
   }
 }

From 5ab25d8a1f759d6d0a825acc653f2d1c2679e0df Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 21 Apr 2023 20:45:47 -0400
Subject: [PATCH 0258/2704] fix(python,starlark): update field match pattern

---
 queries/python/highlights.scm           |  6 +++---
 queries/starlark/highlights.scm         |  2 +-
 tests/query/highlights/python/fields.py | 10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 tests/query/highlights/python/fields.py

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 30747b1fa..5496263f0 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -29,7 +29,7 @@
 
 ((attribute
     attribute: (identifier) @field)
- (#lua-match? @field "^%u@!.*$"))
+ (#lua-match? @field "^.*%l.*$"))
 
 ((identifier) @type.builtin
  (#any-of? @type.builtin
@@ -324,14 +324,14 @@
           (expression_statement
             (assignment
               left: (identifier) @field))))
- (#lua-match? @field "^%u@!.*$"))
+ (#lua-match? @field "^%l.*$"))
 ((class_definition
   body: (block
           (expression_statement
             (assignment
               left: (_
                      (identifier) @field)))))
- (#lua-match? @field "^%u@!.*$"))
+ (#lua-match? @field "^%l.*$"))
 
 ((class_definition
   (block
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index f318258ac..ad2ecb89d 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -29,7 +29,7 @@
 
 ((attribute
     attribute: (identifier) @field)
- (#lua-match? @field "^%u@!.*$"))
+ (#lua-match? @field "^.*%l.*$"))
 
 ((identifier) @type.builtin
  (#any-of? @type.builtin
diff --git a/tests/query/highlights/python/fields.py b/tests/query/highlights/python/fields.py
new file mode 100644
index 000000000..21b6251dc
--- /dev/null
+++ b/tests/query/highlights/python/fields.py
@@ -0,0 +1,10 @@
+class Fields:
+    def __init__(self, fields):
+        self.fields = fields
+#            ^^^^^^ @field
+        self.__dunderfield__ = None
+#            ^^^^^^^^^^^^^^^ @field
+        self._FunKyFielD = 0
+#            ^^^^^^^^^^^ @field
+        self.NOT_A_FIELD = "IM NOT A FIELD"
+#            ^^^^^^^^^^^ @constant

From 01b42a1a57b020f18c2bf73fb545a3a7833166c9 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 24 Apr 2023 00:30:18 -0400
Subject: [PATCH 0259/2704] feat(python,starlark): highlight type conversions
 as `@function.macro`

---
 queries/python/highlights.scm                     | 2 ++
 queries/starlark/highlights.scm                   | 2 ++
 tests/query/highlights/python/pattern_matching.py | 1 +
 3 files changed, 5 insertions(+)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 5496263f0..6e9436ff1 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -304,6 +304,8 @@
   "{" @punctuation.special
   "}" @punctuation.special)
 
+(type_conversion) @function.macro
+
 ["," "." ":" ";" (ellipsis)] @punctuation.delimiter
 
 ;; Class definitions
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index ad2ecb89d..b203bc9d6 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -259,6 +259,8 @@
   "{" @punctuation.special
   "}" @punctuation.special)
 
+(type_conversion) @function.macro
+
 ["," "." ":" ";" (ellipsis)] @punctuation.delimiter
 
 ;; Error
diff --git a/tests/query/highlights/python/pattern_matching.py b/tests/query/highlights/python/pattern_matching.py
index 38622cf4b..2d7d7d0c0 100644
--- a/tests/query/highlights/python/pattern_matching.py
+++ b/tests/query/highlights/python/pattern_matching.py
@@ -29,6 +29,7 @@ match command.split():
     case ["drop", *objects]: pass
     case _:
         print(f"Sorry, I couldn't understand {command!r}")
+                                                   # ^^ @function.macro
 
 match command.split():
 # ^ conditional

From 87faf372eb517077cc600c4e653e4fb3252d02ac Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 24 Apr 2023 00:38:31 -0400
Subject: [PATCH 0260/2704] fix(python,starlark): builtin types should come
 after types

---
 queries/python/highlights.scm           | 36 ++++++++++++-------------
 queries/starlark/highlights.scm         | 36 ++++++++++++-------------
 tests/query/highlights/python/fields.py |  4 ++-
 3 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 6e9436ff1..956b1d19c 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -31,24 +31,6 @@
     attribute: (identifier) @field)
  (#lua-match? @field "^.*%l.*$"))
 
-((identifier) @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
-
 ((assignment
   left: (identifier) @type.definition
   (type (identifier) @_annotation))
@@ -341,5 +323,23 @@
       name: (identifier) @constructor)))
  (#any-of? @constructor "__new__" "__init__"))
 
+((identifier) @type.builtin
+ (#any-of? @type.builtin
+              ;; https://docs.python.org/3/library/exceptions.html
+              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
+              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+              ;; https://docs.python.org/3/library/stdtypes.html
+              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+
 ;; Error
 (ERROR) @error
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index b203bc9d6..42776c89f 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -31,24 +31,6 @@
     attribute: (identifier) @field)
  (#lua-match? @field "^.*%l.*$"))
 
-((identifier) @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
-
 ((assignment
   left: (identifier) @type.definition
   (type (identifier) @_annotation))
@@ -106,6 +88,24 @@
     (identifier) @type))
  (#eq? @_isinstance "isinstance"))
 
+((identifier) @type.builtin
+ (#any-of? @type.builtin
+              ;; https://docs.python.org/3/library/exceptions.html
+              "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+              "EOFError" "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError"
+              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+              "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+              ;; https://docs.python.org/3/library/stdtypes.html
+              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
+
 ;; Normal parameters
 (parameters
   (identifier) @parameter)
diff --git a/tests/query/highlights/python/fields.py b/tests/query/highlights/python/fields.py
index 21b6251dc..fb36a6311 100644
--- a/tests/query/highlights/python/fields.py
+++ b/tests/query/highlights/python/fields.py
@@ -1,5 +1,7 @@
 class Fields:
-    def __init__(self, fields):
+    def __init__(self, fields: list[int]) -> None:
+#                                   ^^^ @type.builtin
+#                                            ^^^^ @constant.builtin
         self.fields = fields
 #            ^^^^^^ @field
         self.__dunderfield__ = None

From 75f911d01f740385f1f60b2f73266514647913b5 Mon Sep 17 00:00:00 2001
From: Munif Tanjim <hello@muniftanjim.dev>
Date: Tue, 25 Apr 2023 20:05:52 +0600
Subject: [PATCH 0261/2704] injections(lua): tweak query to capture string
 content (#4707)

---
 queries/lua/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index d726c5417..75394f163 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -24,7 +24,7 @@
   (#any-of? @_method "\"nvim_exec_lua\"" "'nvim_exec_lua'" "[[nvim_exec_lua]]"))
 
 ; highlight string as query if starts with `;; query`
-((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))
+(string content: _ @query (#lua-match? @query "^%s*;+%s?query"))
 
 ((comment) @luadoc
   (#lua-match? @luadoc "[-][-][-][%s]*@")

From 82bcd8483e0b802bd5f639046c88aecfddbab508 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 25 Apr 2023 13:09:18 -0400
Subject: [PATCH 0262/2704] fix(solidity): variable should not match last, tidy
 up highlights

---
 queries/solidity/highlights.scm | 42 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 76a623267..717f11f7c 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -12,6 +12,8 @@
 
 (solidity_version_comparison_operator) @operator
 
+(solidity_version) @text.underline @string.special
+
 ; Literals
 
 [
@@ -35,8 +37,17 @@
 
 (yul_boolean) @boolean
 
-; Type
+; Variables
+
+[
+  (identifier)
+  (yul_identifier)
+] @variable
+
+; Types
+
 (type_name (identifier) @type)
+(type_name (user_defined_type (identifier) @type))
 (type_name "mapping" @function.builtin)
 
 [
@@ -55,9 +66,9 @@
 ; Functions and parameters
 
 (function_definition
-  name:  (identifier) @function)
+  name: (identifier) @function)
 (modifier_definition
-  name:  (identifier) @function)
+  name: (identifier) @function)
 (yul_evm_builtin) @function.builtin
 
 ; Use constructor coloring for special functions
@@ -88,8 +99,8 @@
 (struct_field_assignment name: (identifier) @field)
 (enum_value) @constant
 
-
 ; Keywords
+
 [
   "contract"
   "interface"
@@ -173,7 +184,8 @@
 ] @include
 (import_directive "as" @include)
 (import_directive "from" @include)
-(import_directive "*" @character.special)
+((import_directive source: (string) @text.underline)
+  (#offset! @text.underline 0 1 0 -1))
 
 ; Punctuation
 
@@ -186,21 +198,13 @@
 [
   "."
   ","
+  ":"
   ; FIXME: update grammar
   ; (semicolon)
   "->"
   "=>"
 ] @punctuation.delimiter
 
-(call_struct_argument
-  ":" @punctuation.delimiter)
-(slice_access
-  ":" @punctuation.delimiter)
-(struct_field_assignment
-  ":" @punctuation.delimiter)
-(yul_label 
-  ":" @punctuation.delimiter)
-
 ; Operators
 
 [
@@ -218,6 +222,7 @@
   "/"
   "%"
   "**"
+  "="
   "<"
   "<="
   "=="
@@ -234,19 +239,12 @@
   ":="
 ] @operator
 
-(yul_assignment
-  ":" @operator
-  "=" @operator)
-
 [
   "delete"
   "new"
 ] @keyword.operator
 
-[
-  (identifier)
-  (yul_identifier)
-] @variable
+(import_directive "*" @character.special)
 
 ; Comments
 

From b0fe9cea0e5df30cc10f728ba79ff0e37e75f842 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 25 Apr 2023 22:42:06 -0400
Subject: [PATCH 0263/2704] fix(lua): injection eq should be any-of (#4711)

---
 queries/lua/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 75394f163..9a3838951 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -40,7 +40,7 @@
 (function_call
   (dot_index_expression
     field: (identifier) @_method
-    (#eq? @_method "gmatch" "gsub"))
+    (#any-of? @_method "gmatch" "gsub"))
   arguments: (arguments (_) (string content: _ @luap)))
 
 ; ("123"):match("%d+")

From 0d7da3bd7d59ffacc2fac6a52a1ba16d820f882c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 26 Apr 2023 06:36:40 +0000
Subject: [PATCH 0264/2704] Update parsers: capnp, luap, pony, rust, sql, zig

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b335f7a67..c27eba30c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -39,7 +39,7 @@
     "revision": "0dd182a14a519a70dc60c3727fdc2fdb65c030ae"
   },
   "capnp": {
-    "revision": "fc6e2addf103861b9b3dffb82c543eb6b71061aa"
+    "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
   },
   "chatito": {
     "revision": "3baf22e7e507cedf15d1dbc03df8afa50a625586"
@@ -276,7 +276,7 @@
     "revision": "1e1152264cc68e11d65d9e2493566f5717a13d11"
   },
   "luap": {
-    "revision": "bfb38d254f380362e26b5c559a4086ba6e92ba77"
+    "revision": "393915db4b16a792da9c60f52d11d93247d870b9"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -354,7 +354,7 @@
     "revision": "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"
   },
   "pony": {
-    "revision": "af8a2d40ed813d818380e7798f16732f34d95bf6"
+    "revision": "5fd795ae7597b568b0a356c5d243cc92162bc00c"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -411,7 +411,7 @@
     "revision": "206c7077164372c596ffa8eaadb9435c28941364"
   },
   "rust": {
-    "revision": "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a"
+    "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
     "revision": "7d348f51e442563f4ab2b6c3e136dac658649f93"
@@ -438,7 +438,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "178148650a7847ab54e672d7483e850f5ad4e89d"
+    "revision": "9de72fb40cd6d13a64c3aeeabc079c6b8dadb339"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
@@ -543,6 +543,6 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zig": {
-    "revision": "c73f666a48339657f6eb0f6fd0c67823f1d90992"
+    "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
   }
 }

From 8ec9a50965ccd34d504db86f09c580edfcff0c0f Mon Sep 17 00:00:00 2001
From: WindSoilder <WindSoilder@outlook.com>
Date: Thu, 27 Apr 2023 06:22:53 +0800
Subject: [PATCH 0265/2704] fix: add `-f` to `mv` to avoid errors when updating

---
 lua/nvim-treesitter/shell_command_selectors.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index de44ffa1c..0479956f1 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -213,7 +213,7 @@ function M.select_mv_cmd(from, to, cwd)
     return {
       cmd = "mv",
       opts = {
-        args = { from, to },
+        args = { "-f", from, to },
         cwd = cwd,
       },
     }

From fe3afeaa73cbf4b65a2cc603a6ba04c965dbe051 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 26 Apr 2023 07:32:41 -0400
Subject: [PATCH 0266/2704] feat: add puppet

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/puppet/folds.scm        |  13 +++
 queries/puppet/highlights.scm   | 194 ++++++++++++++++++++++++++++++++
 queries/puppet/indents.scm      |  24 ++++
 queries/puppet/injections.scm   |   4 +
 queries/puppet/locals.scm       |  46 ++++++++
 8 files changed, 293 insertions(+)
 create mode 100644 queries/puppet/folds.scm
 create mode 100644 queries/puppet/highlights.scm
 create mode 100644 queries/puppet/indents.scm
 create mode 100644 queries/puppet/injections.scm
 create mode 100644 queries/puppet/locals.scm

diff --git a/README.md b/README.md
index 2f5bafa0d..c14ebdb62 100644
--- a/README.md
+++ b/README.md
@@ -296,6 +296,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [proto](https://github.com/mitchellh/tree-sitter-proto) (maintained by @fsouza)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
+- [x] [puppet](https://github.com/amaanq/tree-sitter-puppet) (maintained by @amaanq)
 - [x] [python](https://github.com/tree-sitter/tree-sitter-python) (maintained by @stsewd, @theHamsta)
 - [x] [ql](https://github.com/tree-sitter/tree-sitter-ql) (maintained by @pwntester)
 - [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index c27eba30c..4b2b02730 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -368,6 +368,9 @@
   "pug": {
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
   },
+  "puppet": {
+    "revision": "5e1bb979ea71efc0860d4bc56eb3b3f7a670d6ec"
+  },
   "python": {
     "revision": "62827156d01c74dc1538266344e788da74536b8a"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b3fc36313..14c2b6999 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1111,6 +1111,14 @@ list.pug = {
   experimental = true,
 }
 
+list.puppet = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-puppet",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.python = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-python",
diff --git a/queries/puppet/folds.scm b/queries/puppet/folds.scm
new file mode 100644
index 000000000..c8fad6f92
--- /dev/null
+++ b/queries/puppet/folds.scm
@@ -0,0 +1,13 @@
+[
+  (block)
+  (defined_resource_type)
+  (parameter_list)
+  (attribute_type_entry)
+  (resource_declaration)
+  (selector)
+  (method_call)
+  (case_statement)
+  (hash)
+  (array)
+  (comment)
+] @fold
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
new file mode 100644
index 000000000..889aabc65
--- /dev/null
+++ b/queries/puppet/highlights.scm
@@ -0,0 +1,194 @@
+; Variables
+
+(identifier) @variable
+
+; Includes
+
+"include" @include
+
+(include_statement (identifier) @type)
+
+(include_statement (class_identifier (identifier) @type . ))
+
+; Keywords
+
+[
+  "class"
+  "inherits"
+  "node"
+  "type"
+  "tag"
+] @keyword
+
+[
+  "define"
+  "function"
+] @keyword.function
+
+[
+  "if"
+  "elsif"
+  "else"
+  "case"
+] @conditional
+
+(default_case "default" @conditional)
+
+; Properties
+
+(attribute name: (identifier) @property)
+(attribute name: (variable (identifier) @property))
+
+; Parameters
+
+(lambda (variable (identifier) @parameter))
+
+(parameter (variable (identifier) @parameter))
+
+(function_call (identifier) @parameter)
+
+(method_call (identifier) @parameter)
+
+; Functions
+
+(function_declaration
+  "function" . (identifier) @function)
+
+(function_call
+  (identifier) @function.call "(")
+
+(defined_resource_type
+  "define" . (identifier) @function)
+
+; Methods
+
+(function_declaration
+  "function" . (class_identifier (identifier) @method . ))
+
+(function_call
+  (class_identifier (identifier) @method.call . ))
+
+(defined_resource_type
+  "define" . (class_identifier (identifier) @method . ))
+
+(method_call
+  "." . (identifier) @method.call)
+
+; Types
+
+(type) @type
+
+(builtin_type) @type.builtin
+
+(class_definition
+  (identifier) @type)
+(class_definition
+  (class_identifier (identifier) @type . ))
+
+(class_inherits (identifier) @type)
+(class_inherits (class_identifier (identifier) @type . ))
+
+(resource_declaration
+  (identifier) @type)
+(resource_declaration
+  (class_identifier (identifier) @type . ))
+
+(node_definition (node_name (identifier) @type))
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z]"))
+
+((identifier) @type.builtin
+  (#any-of? @type.builtin "Boolean" "Integer" "Float" "String" "Array" "Hash" "Regexp" "Variant" "Data" "Undef" "Default" "File"))
+
+; "Namespaces"
+
+(class_identifier . (identifier) @namespace)
+
+; Operators
+
+[
+  "or"
+  "and"
+  "in"
+] @keyword.operator
+
+[
+  "="
+  "+="
+  "->"
+  "~>"
+  "<<|"
+  "<|"
+  "|>"
+  "|>>"
+  "?"
+  ">"
+  ">="
+  "<="
+  "<"
+  "=="
+  "!="
+  "<<"
+  ">>"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "=~"
+  "!~"
+] @operator
+
+; Punctuation
+
+[
+  "|"
+  "."
+  ","
+  ";"
+  ":"
+  "::"
+  "=>"
+] @punctuation.delimiter
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+(interpolation [ "${" "}" ] @punctuation.special)
+
+[
+  "$"
+  "@"
+  "@@"
+] @punctuation.special
+
+; Literals
+
+(number) @number
+
+(float) @float
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+(regex) @string.regex
+
+(boolean) @boolean
+
+[
+  (undef)
+  (default)
+] @variable.builtin
+
+; Comments
+
+(comment) @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/puppet/indents.scm b/queries/puppet/indents.scm
new file mode 100644
index 000000000..3522fe2f4
--- /dev/null
+++ b/queries/puppet/indents.scm
@@ -0,0 +1,24 @@
+[
+  (block)
+  (defined_resource_type)
+  (parameter_list)
+  (attribute_type_entry)
+  (resource_declaration)
+  (selector)
+  (method_call)
+  (case_statement)
+  (hash)
+  (array)
+] @indent.begin
+
+[
+  "}"
+  "]"
+  ")"
+] @indent.branch @indent.end
+
+[
+  (string)
+  (comment)
+  (ERROR)
+] @indent.auto
diff --git a/queries/puppet/injections.scm b/queries/puppet/injections.scm
new file mode 100644
index 000000000..a81069600
--- /dev/null
+++ b/queries/puppet/injections.scm
@@ -0,0 +1,4 @@
+((regex) @regex
+  (#offset! @regex 0 1 0 -1))
+
+(comment) @comment
diff --git a/queries/puppet/locals.scm b/queries/puppet/locals.scm
new file mode 100644
index 000000000..d9d903a46
--- /dev/null
+++ b/queries/puppet/locals.scm
@@ -0,0 +1,46 @@
+; Scopes
+
+[
+  (block)
+  (defined_resource_type)
+  (parameter_list)
+  (attribute_type_entry)
+  (class_definition)
+  (node_definition)
+  (resource_declaration)
+  (selector)
+  (method_call)
+  (case_statement)
+  (hash)
+  (array)
+] @scope
+
+; References
+
+[
+  (identifier)
+  (class_identifier)
+  (variable) 
+] @reference
+
+; Definitions
+
+(attribute [(identifier) (variable)] @definition.field)
+
+(function_declaration
+  [(identifier) (class_identifier)] @definition.function)
+
+(include_statement [(identifier) (class_identifier)] @definition.import)
+
+(parameter (variable) @definition.parameter)
+
+(class_definition
+  [(identifier) (class_identifier)] @definition.type)
+
+(node_definition
+  (node_name (identifier) @definition.type))
+
+(resource_declaration
+  [(identifier) (class_identifier)] @definition.type)
+
+(assignment . (variable) @definition.var)

From 08e8b2c08bfdcd20e4561620ca0ccda0bb2e050a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 07:12:29 +0000
Subject: [PATCH 0267/2704] Update parsers: kdl, kotlin, t32 (#4720)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4b2b02730..7e2ceda9e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -252,10 +252,10 @@
     "revision": "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"
   },
   "kdl": {
-    "revision": "e36f054a60c4d9e5ae29567d439fdb8790b53b30"
+    "revision": "d118f9376ef4f0461975289302fe74a28f073876"
   },
   "kotlin": {
-    "revision": "c84d16e7f75032cdd8c4ad986a76ca9e1fe4e639"
+    "revision": "100d79fd96b56a1b99099a8d2f3c114b8687acfb"
   },
   "lalrpop": {
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
@@ -465,7 +465,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "51373bc49e6b43b063a2eec121b5948ca00d17d9"
+    "revision": "fe7c7e858e57c7cdd207d168d7d2c42d778a0033"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From ee64345a3774eaecee5ddec8648390e86450eec8 Mon Sep 17 00:00:00 2001
From: Kasper Kondzielski <kghost0@gmail.com>
Date: Fri, 28 Apr 2023 00:24:35 +0200
Subject: [PATCH 0268/2704] fix: Correct scope definition for scala

`@scope` included `function_declaration` while is should have included `function_definition` instead. The former one is used to declare abstract functions while the latter one is used to define functions together with their bodies.
---
 queries/scala/locals.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index 928d7e723..dc19c7aa4 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -3,7 +3,7 @@
 [
   (template_body)
   (lambda_expression)
-  (function_declaration)
+  (function_definition)
   (block)
 ] @scope
 

From 2ce3c9080cfe4a39c7907e672edafd2a95244a7c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 28 Apr 2023 06:37:56 +0000
Subject: [PATCH 0269/2704] Update parsers: t32

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 7e2ceda9e..14e94dee2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -465,7 +465,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "fe7c7e858e57c7cdd207d168d7d2c42d778a0033"
+    "revision": "ff822fd77bb919854ba60d05f4d373d9d578d0e0"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From cde306813d12b94c64c46c6fd761b6e0bfb55de1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 27 Apr 2023 04:25:19 -0400
Subject: [PATCH 0270/2704] feat: add luau

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/luau/folds.scm          |   5 +
 queries/luau/highlights.scm     | 252 ++++++++++++++++++++++++++++++++
 queries/luau/indents.scm        |   5 +
 queries/luau/injections.scm     |  39 +++++
 queries/luau/locals.scm         |  51 +++++++
 8 files changed, 364 insertions(+)
 create mode 100644 queries/luau/folds.scm
 create mode 100644 queries/luau/highlights.scm
 create mode 100644 queries/luau/indents.scm
 create mode 100644 queries/luau/injections.scm
 create mode 100644 queries/luau/locals.scm

diff --git a/README.md b/README.md
index c14ebdb62..d633d57c9 100644
--- a/README.md
+++ b/README.md
@@ -266,6 +266,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
 - [x] [luadoc](https://github.com/amaanq/tree-sitter-luadoc) (maintained by @amaanq)
 - [x] [lua patterns](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)
+- [x] [luau](https://github.com/amaanq/tree-sitter-luau) (maintained by @amaanq)
 - [x] [m68k](https://github.com/grahambates/tree-sitter-m68k) (maintained by @grahambates)
 - [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
 - [x] [markdown (basic highlighting)](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
diff --git a/lockfile.json b/lockfile.json
index 14e94dee2..e18d3d340 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -278,6 +278,9 @@
   "luap": {
     "revision": "393915db4b16a792da9c60f52d11d93247d870b9"
   },
+  "luau": {
+    "revision": "4f8fc207b3a25b07cba1d3b4066f2872dcfe201f"
+  },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 14c2b6999..e859f297d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -851,6 +851,14 @@ list.luap = {
   readme_name = "lua patterns",
 }
 
+list.luau = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-luau",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.m68k = {
   install_info = {
     url = "https://github.com/grahambates/tree-sitter-m68k",
diff --git a/queries/luau/folds.scm b/queries/luau/folds.scm
new file mode 100644
index 000000000..11b644ef6
--- /dev/null
+++ b/queries/luau/folds.scm
@@ -0,0 +1,5 @@
+; inherits: lua
+
+[
+  (object_type)
+] @fold
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
new file mode 100644
index 000000000..5f7d7da90
--- /dev/null
+++ b/queries/luau/highlights.scm
@@ -0,0 +1,252 @@
+; Preproc
+
+(hash_bang_line) @preproc
+
+;; Keywords
+
+"return" @keyword.return
+
+[
+ "local"
+ "type"
+ "export"
+] @keyword
+
+(do_statement
+[
+  "do"
+  "end"
+] @keyword)
+
+(while_statement
+[
+  "while"
+  "do"
+  "end"
+] @repeat)
+
+(repeat_statement
+[
+  "repeat"
+  "until"
+] @repeat)
+
+[
+  (break_statement)
+  (continue_statement)
+] @repeat
+
+(if_statement
+[
+  "if"
+  "elseif"
+  "else"
+  "then"
+  "end"
+] @conditional)
+
+(elseif_statement
+[
+  "elseif"
+  "then"
+  "end"
+] @conditional)
+
+(else_statement
+[
+  "else"
+  "end"
+] @conditional)
+
+(for_statement
+[
+  "for"
+  "do"
+  "end"
+] @repeat)
+
+(function_declaration
+[
+  "function"
+  "end"
+] @keyword.function)
+
+(function_definition
+[
+  "function"
+  "end"
+] @keyword.function)
+
+;; Operators
+
+[
+  "and"
+  "not"
+  "or"
+  "in"
+  "typeof"
+] @keyword.operator
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "^"
+  "#"
+  "=="
+  "~="
+  "<="
+  ">="
+  "<"
+  ">"
+  "="
+  "&"
+  "~"
+  "|"
+  "?"
+  "//"
+  ".."
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "^="
+  "..="
+] @operator
+
+;; Variables
+
+(identifier) @variable
+
+; Types
+
+(type (identifier) @type)
+
+(type (generic_type (identifier) @type))
+
+(builtin_type) @type.builtin
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z]"))
+
+; Typedefs
+
+(type_definition "type" . (type) @type.definition "=")
+
+; Constants
+
+((identifier) @constant
+ (#lua-match? @constant "^[A-Z][A-Z_0-9]+$"))
+
+; Builtins
+
+((identifier) @constant.builtin
+  (#eq? @constant.builtin "_VERSION"))
+
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "self"))
+
+((identifier) @namespace.builtin
+  (#any-of? @namespace.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
+
+((identifier) @keyword.coroutine
+  (#eq? @keyword.coroutine "coroutine"))
+
+;; Tables
+
+(field name: (identifier) @field)
+
+(dot_index_expression field: (identifier) @field)
+
+(object_type (identifier) @field)
+
+(table_constructor
+[
+  "{"
+  "}"
+] @constructor)
+
+; Functions
+
+(parameter . (identifier) @parameter)
+(function_type (identifier) @parameter)
+
+(function_call name: (identifier) @function.call)
+(function_declaration name: (identifier) @function)
+
+(function_call name: (dot_index_expression field: (identifier) @function.call))
+(function_declaration name: (dot_index_expression field: (identifier) @function))
+
+(method_index_expression method: (identifier) @method.call)
+
+(function_call
+  (identifier) @function.builtin
+  (#any-of? @function.builtin
+    ;; built-in functions in Lua 5.1
+    "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
+    "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
+    "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
+    "tonumber" "tostring" "type" "unpack" "xpcall" "typeof"
+    "__add" "__band" "__bnot" "__bor" "__bxor" "__call" "__concat" "__div" "__eq" "__gc"
+    "__idiv" "__index" "__le" "__len" "__lt" "__metatable" "__mod" "__mul" "__name" "__newindex"
+    "__pairs" "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
+
+; Literals
+
+(number) @number
+
+(string) @string @spell
+
+(nil) @constant.builtin
+
+(vararg_expression) @variable.builtin
+
+[
+  (false)
+  (true)
+] @boolean
+
+;; Punctuations
+
+[
+  ";"
+  ":"
+  "::"
+  ","
+  "."
+  "->"
+] @punctuation.delimiter
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+(variable_list
+   attribute: (attribute
+     (["<" ">"] @punctuation.bracket
+      (identifier) @attribute)))
+
+(generic_type [ "<" ">" ] @punctuation.bracket)
+(generic_type_list [ "<" ">" ] @punctuation.bracket)
+
+; Comments
+
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-][-]"))
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-](%s?)@"))
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/luau/indents.scm b/queries/luau/indents.scm
new file mode 100644
index 000000000..e03d0ff48
--- /dev/null
+++ b/queries/luau/indents.scm
@@ -0,0 +1,5 @@
+; inherits: lua
+
+[
+  (object_type)
+] @indent.begin
diff --git a/queries/luau/injections.scm b/queries/luau/injections.scm
new file mode 100644
index 000000000..b24330f31
--- /dev/null
+++ b/queries/luau/injections.scm
@@ -0,0 +1,39 @@
+((function_call
+  name: [
+    (identifier) @_cdef_identifier
+    (_ _ (identifier) @_cdef_identifier)
+  ]
+  arguments: (arguments (string content: _ @c)))
+  (#eq? @_cdef_identifier "cdef"))
+
+((comment) @luadoc
+  (#lua-match? @luadoc "[-][-][-][%s]*@")
+  (#offset! @luadoc 0 3 0 0))
+
+; string.match("123", "%d+")
+(function_call
+  (dot_index_expression
+    field: (identifier) @_method
+    (#any-of? @_method "find" "format" "match"))
+  arguments: (arguments (_) . (string content: _ @luap)))
+
+(function_call
+  (dot_index_expression
+    field: (identifier) @_method
+    (#any-of? @_method "gmatch" "gsub"))
+  arguments: (arguments (_) (string content: _ @luap)))
+
+; ("123"):match("%d+")
+(function_call
+  (method_index_expression
+    method: (identifier) @_method
+    (#any-of? @_method "find" "format" "match"))
+    arguments: (arguments . (string content: _ @luap)))
+
+(function_call
+  (method_index_expression
+    method: (identifier) @_method
+    (#any-of? @_method "gmatch" "gsub"))
+    arguments: (arguments (string content: _ @luap)))
+
+(comment) @comment
diff --git a/queries/luau/locals.scm b/queries/luau/locals.scm
new file mode 100644
index 000000000..b57ef5802
--- /dev/null
+++ b/queries/luau/locals.scm
@@ -0,0 +1,51 @@
+; Scopes
+
+[
+  (chunk)
+  (do_statement)
+  (while_statement)
+  (repeat_statement)
+  (if_statement)
+  (for_statement)
+  (function_declaration)
+  (function_definition)
+] @scope
+
+; References
+
+[
+  (identifier)
+] @reference
+
+; Definitions
+
+(assignment_statement
+  (variable_list
+    (identifier) @definition.var))
+
+(assignment_statement
+  (variable_list
+    (dot_index_expression . (_) @definition.associated (identifier) @definition.var)))
+
+((function_declaration
+  name: (identifier) @definition.function)
+  (#set! definition.function.scope "parent"))
+
+((function_declaration
+  name: (dot_index_expression
+    . (_) @definition.associated (identifier) @definition.function))
+  (#set! definition.method.scope "parent"))
+
+((function_declaration
+  name: (method_index_expression
+    . (_) @definition.associated (identifier) @definition.method))
+  (#set! definition.method.scope "parent"))
+
+(for_generic_clause
+  (variable_list
+    (identifier) @definition.var))
+
+(for_numeric_clause
+  name: (identifier) @definition.var)
+
+(parameter (identifier) @definition.parameter)

From b8a0791eb435efc790755883cad166a91a4fe864 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 28 Apr 2023 03:42:54 -0400
Subject: [PATCH 0271/2704] refactor(lua): move _VERSION to
 `@constant.builtin`, builtin types to `@namespace.builtin`

---
 queries/lua/highlights.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 5fbf8a183..a7b7699d8 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -127,8 +127,14 @@
 
 (identifier) @variable
 
+((identifier) @constant.builtin
+  (#eq? @constant.builtin "_VERSION"))
+
 ((identifier) @variable.builtin
- (#any-of? @variable.builtin "_G" "_VERSION" "debug" "io" "jit" "math" "os" "package" "self" "string" "table" "utf8"))
+  (#eq? @variable.builtin "self"))
+
+((identifier) @namespace.builtin
+  (#any-of? @namespace.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
 
 ((identifier) @keyword.coroutine
   (#eq? @keyword.coroutine "coroutine"))

From 358a463c82c9ba0fd5d96c8a4d4fce6399fe5c48 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 29 Apr 2023 06:35:20 +0000
Subject: [PATCH 0272/2704] Update parsers: erlang, haskell

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e18d3d340..f084d33da 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "616f09eab421671c8b54f9e8a0c9df759f956bc8"
+    "revision": "7d083ca431265a6a677c10e8ca68a908ab0c2bc8"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -195,7 +195,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "98fc7f59049aeb713ab9b72a8ff25dcaaef81087"
+    "revision": "ed10ebfecbeb229f6564631c0d9bac3fa156bec7"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"

From 1ca9b938c1c3d8b2c64a168f6a5419b8f3870410 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 29 Apr 2023 17:35:35 +0900
Subject: [PATCH 0273/2704] Add Python else elif dedent (#4618)

* feat(python): add interactive else/elif dedent

* fixup

* add test
---
 queries/python/indents.scm     | 8 ++++++++
 tests/indent/python/if_else.py | 3 +++
 tests/indent/python_spec.lua   | 2 ++
 3 files changed, 13 insertions(+)
 create mode 100644 tests/indent/python/if_else.py

diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index efcdba6b2..338473f00 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -83,6 +83,14 @@
   (continue_statement)
 ] @indent.dedent
 
+(ERROR
+  (_) @indent.branch ":" .
+  (#lua-match? @indent.branch "^else"))
+
+(ERROR
+  (_) @indent.branch @indent.dedent ":" .
+  (#lua-match? @indent.branch "^elif"))
+
 (parenthesized_expression ")" @indent.end)
 (generator_expression ")" @indent.end)
 (list_comprehension "]" @indent.end)
diff --git a/tests/indent/python/if_else.py b/tests/indent/python/if_else.py
new file mode 100644
index 000000000..d128597f0
--- /dev/null
+++ b/tests/indent/python/if_else.py
@@ -0,0 +1,3 @@
+def test_branch_else():
+    if True:
+        x = 1
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index aa9aa83e0..ec44d551c 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -50,6 +50,8 @@ describe("indent Python:", function()
     run:new_line("error_state_dict.py", { on_line = 6, text = "9:10,", indent = 6 })
     run:new_line("error_state_set.py", { on_line = 5, text = "9,", indent = 6 })
     run:new_line("error_state_funcall.py", { on_line = 5, text = "6,", indent = 2 })
+    run:new_line("if_else.py", { on_line = 5, text = "else:", indent = 4 })
+    run:new_line("if_else.py", { on_line = 5, text = "elif False:", indent = 4 })
     run:new_line(
       "join_lines.py",
       { on_line = 1, text = "+ 1 \\", indent = 4 },

From 9bfc966769f593cc55faea36e2c500ecb4304203 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 29 Apr 2023 18:57:48 -0400
Subject: [PATCH 0274/2704] fix(python): fields should not match
 uppercase-beginning names

---
 queries/python/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 956b1d19c..c18b74867 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -29,7 +29,7 @@
 
 ((attribute
     attribute: (identifier) @field)
- (#lua-match? @field "^.*%l.*$"))
+ (#lua-match? @field "^[%l_].*$"))
 
 ((assignment
   left: (identifier) @type.definition

From 7133622c44ca4cd555f64ce1686ea350692d1951 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 29 Apr 2023 20:56:30 -0400
Subject: [PATCH 0275/2704] fix(starlark): fields should not match
 uppercase-beginning names (#4734)

---
 queries/starlark/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 42776c89f..7ea70e514 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -29,7 +29,7 @@
 
 ((attribute
     attribute: (identifier) @field)
- (#lua-match? @field "^.*%l.*$"))
+ (#lua-match? @field "^[%l_].*$"))
 
 ((assignment
   left: (identifier) @type.definition

From 54909e8df911bf4c47e51945570d7edb2f31c110 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 30 Apr 2023 08:39:06 +0000
Subject: [PATCH 0276/2704] Update parsers: haskell (#4735)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index f084d33da..1b3bc4bf7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -195,7 +195,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "ed10ebfecbeb229f6564631c0d9bac3fa156bec7"
+    "revision": "3241b683cc1eaa466afb83b9a5592ab39caaa2fa"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"

From 93b540f91729ff9fbe508907ffabbc19ec6cc25b Mon Sep 17 00:00:00 2001
From: sogaiu <983021772@users.noreply.github.com>
Date: Sat, 22 Apr 2023 22:18:01 +0900
Subject: [PATCH 0277/2704] feat: add janet_simple

---
 lockfile.json                       |   3 +
 lua/nvim-treesitter/parsers.lua     |   9 +
 queries/janet_simple/folds.scm      |   1 +
 queries/janet_simple/highlights.scm | 302 ++++++++++++++++++++++++++++
 queries/janet_simple/injections.scm |   1 +
 queries/janet_simple/locals.scm     |   1 +
 6 files changed, 317 insertions(+)
 create mode 100644 queries/janet_simple/folds.scm
 create mode 100644 queries/janet_simple/highlights.scm
 create mode 100644 queries/janet_simple/injections.scm
 create mode 100644 queries/janet_simple/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 1b3bc4bf7..c9d227465 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -224,6 +224,9 @@
   "ini": {
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
+  "janet_simple": {
+    "revision": "95f19cfb8ab03d994389e89d69477511440a08c6"
+  },
   "java": {
     "revision": "c194ee5e6ede5f26cf4799feead4a8f165dcf14d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e859f297d..2fd4b14bc 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -703,6 +703,15 @@ list.ini = {
   experimental = true,
 }
 
+list.janet_simple = {
+  install_info = {
+    url = "https://github.com/sogaiu/tree-sitter-janet-simple",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  filetype = "janet",
+  maintainers = { "@sogaiu" },
+}
+
 list.java = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-java",
diff --git a/queries/janet_simple/folds.scm b/queries/janet_simple/folds.scm
new file mode 100644
index 000000000..901641099
--- /dev/null
+++ b/queries/janet_simple/folds.scm
@@ -0,0 +1 @@
+(source (par_tup_lit) @fold)
diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
new file mode 100644
index 000000000..5788dd3ad
--- /dev/null
+++ b/queries/janet_simple/highlights.scm
@@ -0,0 +1,302 @@
+;; >> 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
+;; specialized captures.
+;; This can mean that sometimes things are highlighted weirdly because they
+;; have multiple highlight groups applied to them.
+
+
+;; >> Literals
+
+(kwd_lit) @symbol
+(str_lit) @string @spell
+(long_str_lit) @string @spell
+(buf_lit) @string @spell
+(long_buf_lit) @string @spell
+(num_lit) @number
+(bool_lit) @boolean
+(nil_lit) @constant.builtin
+(comment) @comment @spell
+
+["'" "~"] @string.escape
+
+["|" "," ";"] @punctuation.special
+
+["{" "@{" "}"
+ "[" "@[" "]"
+ "(" "@(" ")"] @punctuation.bracket
+
+;; >> Symbols
+
+; General symbol highlighting
+(sym_lit) @variable
+
+; General function calls
+(par_tup_lit
+ .
+ (sym_lit) @function.call)
+
+(short_fn_lit
+ .
+ (sym_lit) @function.call)
+
+; Quoted symbols
+(quote_lit
+ (sym_lit) @symbol)
+
+(qq_lit
+ (sym_lit) @symbol)
+
+; Dynamic variables
+((sym_lit) @variable.builtin
+ (#lua-match? @variable.builtin "^[*].+[*]$"))
+
+; Operators
+((sym_lit) @operator
+ (#any-of? @operator
+  "%" "*" "+" "-" "/"
+  "<" "<=" "=" "==" ">" ">="))
+
+((sym_lit) @keyword.operator
+ (#any-of? @keyword.operator
+  "not" "not=" "and" "or"))
+
+; Definition
+((sym_lit) @keyword
+ (#any-of? @keyword
+  "def" "def-" "defdyn" "defglobal" "defmacro" "defmacro-"
+  "var" "var-" "varglobal"))
+
+((sym_lit) @keyword.function
+ (#match? @keyword.function "^(defn|defn-|fn|varfn)$"))
+
+; Comment
+((sym_lit) @comment
+ (#any-of? @comment "comment"))
+
+; Conditionals
+((sym_lit) @conditional
+ (#any-of? @conditional
+  "case" "cond"))
+
+((sym_lit) @conditional
+ (#match? @conditional "^if(\\-.*)?$"))
+
+((sym_lit) @conditional
+ (#match? @conditional "^when(\\-.*)?$"))
+
+; Repeats
+((sym_lit) @repeat
+ (#any-of? @repeat
+  "for" "forever" "forv" "loop" "repeat" "while"))
+
+; Exception
+((sym_lit) @exception
+ (#any-of? @exception "error" "errorf" "try"))
+
+; Includes
+((sym_lit) @include
+ (#any-of? @include "import" "require" "use"))
+
+; Builtin macros
+;; TODO: Do all these items belong here?
+((sym_lit) @function.macro
+ (#any-of? @function.macro
+ "++" "+=" "--"
+ "->" "->>" "-?>" "-?>>"
+ "-=" "*=" "/=" "%="
+ "and" "as->" "as?->"
+ "case" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro"
+ "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
+ "defn" "defn-"
+ "delay" "doc"
+ "each" "eachk" "eachp"
+ "eachy" ;; XXX: obsolete
+ "edefer"
+ "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
+ "ev/with-deadline"
+ "ffi/defbind"
+ "for" "forever" "forv"
+ "generate"
+ "if-let" "if-not" "if-with" "import"
+ "juxt"
+ "label" "let" "loop"
+ "match"
+ "or"
+ "prompt" "protect"
+ "repeat"
+ "seq" "short-fn"
+ "tabseq" "tracev" "try"
+ "unless" "use"
+ "var-"
+ "when" "when-let" "when-with" 
+ "with" "with-dyns" "with-syms" "with-vars"))
+
+((sym_lit) @function.macro
+ (#match? @function.macro "^with\\-.*$"))
+
+; All builtin functions
+((sym_lit) @function.builtin
+ (#any-of? @function.builtin
+  "*" "+" "-" "/"
+  "<" "<=" "=" ">" ">="
+  ".break" ".breakall" ".bytecode"
+  ".clear" ".clearall"
+  ".disasm"
+  ".fiber"
+  ".fn" ".frame"
+  ".next" ".nextc"
+  ".ppasm"
+  ".signal" ".slot" ".slots" ".source" ".stack" ".step"
+  "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
+  "all-dynamics" "any?" "apply" "array" "array?"
+  "array/clear" "array/concat" "array/ensure" "array/fill"
+  "array/insert" "array/new" "array/new-filled" "array/peek"
+  "array/pop" "array/push" "array/remove" "array/slice"
+  "array/trim"
+  "asm" "assert"
+  "bad-compile" "bad-parse" "band" "blshift" "bnot" "boolean?"
+  "bor" "brshift" "brunshift" "buffer"
+  "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
+  "buffer/bit-toggle" "buffer/blit" "buffer/clear"
+  "buffer/fill" "buffer/format" "buffer/new-filled"
+  "buffer/popn" "buffer/push" "buffer/push-byte"
+  "buffer/push-string" "buffer/push-word" "buffer/slice"
+  "buffer/trim"
+  "buffer?" "bxor" "bytes?"
+  "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare"
+  "compare<" "compare<=" "compare=" "compare>" "compare>="
+  "compile" "complement" "count" "curenv"
+  "debug"
+  "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage"
+  "debug/stack" "debug/stacktrace" "debug/step" "debug/unbreak"
+  "debug/unfbreak"
+  "dec" "deep=" "deep-not=" "defglobal" "describe" "dictionary?"
+  "disasm" "distinct" "doc*" "doc-format" "dofile" "drop"
+  "drop-until" "drop-while" "dyn"
+  "eflush" "empty?" "env-lookup" "eprin" "eprinf" "eprint"
+  "eprintf" "error" "errorf"
+  "ev/call" "ev/close" "ev/capacity" "ev/chan" "ev/chunk"
+  "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give"
+  "ev/go" "ev/read" "ev/rselect" "ev/select" "ev/sleep"
+  "ev/take" "ev/write"
+  "eval" "eval-string" "even?" "every?" "extreme"
+  "false?"
+  "ffi/align" "ffi/call" "ffi/close" "ffi/context" "ffi/free"
+  "ffi/jitfn" "ffi/lookup" "ffi/malloc" "ffi/native"
+  "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
+  "ffi/trampoline" "ffi/write"
+  "fiber/can-resume?" "fiber/current" "fiber/getenv"
+  "fiber/maxstack" "fiber/new" "fiber/root" "fiber/setenv"
+  "fiber/setmaxstack" "fiber/status"
+  "fiber?"
+  "file/close" "file/flush" "file/open" "file/popen" "file/read"
+  "file/seek" "file/tell" "file/temp" "file/write"
+  "filter" "find" "find-index" "first" "flatten" "flatten-into"
+  "flush" "flycheck" "freeze" "frequencies" "function?"
+  "gccollect" "gcinterval" "gcsetinterval" "gensym" "get"
+  "get-in" "getline"
+  "hash"
+  "idempotent?" "identity" "import*" "in" "inc" "index-of"
+  "indexed?"
+  "int/s64" "int/u64"
+  "int?"
+  "interleave" "interpose" "invert"
+  "juxt*"
+  "keep" "keys"
+  "keyword"
+  "keyword/slice"
+  "keyword?"
+  "kvs"
+  "last" "length" "load-image"
+  "macex" "macex1"
+  "make-env" "make-image" "map" "mapcat" "marshal"
+  "math/abs" "math/acos" "math/acosh" "math/asin"
+  "math/asinh" "math/atan" "math/atan2" "math/atanh" "math/cbrt"
+  "math/ceil" "math/cos" "math/cosh" "math/erf"
+  "math/erfc" "math/exp" "math/exp2" "math/expm1" "math/floor"
+  "math/gamma" "math/hypot" "math/log" "math/log10" "math/log1p"
+  "math/log2" "math/next" "math/pi" "math/pow" "math/random"
+  "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform"
+  "math/round" "math/seedrandom" "math/sin" "math/sinh"
+  "math/sqrt" "math/tan" "math/tanh" "math/trunc"
+  "max" "mean" "merge" "merge-into" "merge-module" "min" "mod"
+  "module/add-paths" "module/expand-path" "module/find"
+  "nan?" "nat?" "native" "neg?"
+  "net/accept" "net/accept-loop" "net/address" "net/chunk"
+  "net/close" "net/connect" "net/flush" "net/listen" "net/read"
+  "net/recv-from" "net/send-to" "net/server" "net/write"
+  "next" "nil?" "not" "not=" "number?"
+  "odd?" "one?"
+  "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
+  "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir"
+  "os/environ" "os/execute" "os/exit" "os/getenv" "os/link"
+  "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
+  "os/perm-string" "os/pipe" "os/proc-close" "os/proc-kill"
+  "os/proc-wait" "os/readlink" "os/realpath" "os/rename"
+  "os/rm" "os/rmdir" "os/setenv" "os/shell" "os/sleep"
+  "os/spawn" "os/stat" "os/symlink" "os/time" "os/touch"
+  "os/umask" "os/which"
+  "pairs" "parse"
+  "parser/byte" "parser/clone" "parser/consume" "parser/eof"
+  "parser/error" "parser/flush" "parser/has-more"
+  "parser/insert" "parser/new" "parser/produce" "parser/state"
+  "parser/status" "parser/where"
+  "partial" "partition"
+  "peg/compile" "peg/find" "peg/find-all" "peg/match"
+  "peg/replace" "peg/replace-all"
+  "pos?" "postwalk" "pp" "prewalk" "prin" "prinf" "print"
+  "printf" "product" "propagate" "put" "put-in"
+  "quit"
+  "range" "reduce" "reduce2" "repl" "require" "resume"
+  "return" "reverse" "reverse!" "run-context"
+  "scan-number" "setdyn" "signal" "slice" "slurp" "some" "sort"
+  "sort-by" "sorted" "sorted-by" "spit"
+  "string"
+  "string/ascii-lower" "string/ascii-upper" "string/bytes"
+  "string/check-set" "string/find" "string/find-all"
+  "string/format" "string/from-bytes" "string/has-prefix?"
+  "string/has-suffix?" "string/join" "string/repeat"
+  "string/replace" "string/replace-all" "string/reverse"
+  "string/slice" "string/split" "string/trim" "string/triml"
+  "string/trimr"
+  "string?"
+  "struct"
+  "struct/getproto" "struct/proto-flatten" "struct/to-table"
+  "struct/with-proto"
+  "struct?"
+  "sum"
+  "symbol"
+  "symbol/slice"
+  "symbol?"
+  "table"
+  "table/clone" "table/getproto" "table/new" "table/rawget"
+  "table/setproto" "table/to-struct"
+  "table?"
+  "take" "take-until" "take-while"
+  ;; XXX: obsolete
+  "tarray/buffer" "tarray/copy-bytes" "tarray/length"
+  "tarray/new" "tarray/properties" "tarray/slice"
+  "tarray/swap-bytes"
+  ;; XXX: obsolete
+  "thread/close" "thread/current" "thread/exit" "thread/new"
+  "thread/receive" "thread/send"
+  ;; resume non-obsolete
+  "trace" "true?" "truthy?"
+  "tuple"
+  "tuple/brackets" "tuple/setmap" "tuple/slice"
+  "tuple/sourcemap" "tuple/type"
+  "tuple?"
+  "type"
+  "unmarshal" "untrace" "update" "update-in"
+  "values" "varglobal"
+  "walk"
+  "xprin" "xprinf" "xprint" "xprintf"
+  "yield"
+  "zero?" "zipcoll"))
+
diff --git a/queries/janet_simple/injections.scm b/queries/janet_simple/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/janet_simple/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/janet_simple/locals.scm b/queries/janet_simple/locals.scm
new file mode 100644
index 000000000..e47adce45
--- /dev/null
+++ b/queries/janet_simple/locals.scm
@@ -0,0 +1 @@
+; placeholder file to get incremental selection to work

From 8db7eeba9ddf3dc5ae5ae5a3fe0cf90977020f9d Mon Sep 17 00:00:00 2001
From: sogaiu <983021772@users.noreply.github.com>
Date: Sun, 23 Apr 2023 16:36:25 +0900
Subject: [PATCH 0278/2704] Use 2 semicolons for better editor interop

---
 queries/janet_simple/highlights.scm | 30 +++++++++++++----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 5788dd3ad..401433d08 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -33,10 +33,10 @@
 
 ;; >> Symbols
 
-; General symbol highlighting
+;; General symbol highlighting
 (sym_lit) @variable
 
-; General function calls
+;; General function calls
 (par_tup_lit
  .
  (sym_lit) @function.call)
@@ -45,18 +45,18 @@
  .
  (sym_lit) @function.call)
 
-; Quoted symbols
+;; Quoted symbols
 (quote_lit
  (sym_lit) @symbol)
 
 (qq_lit
  (sym_lit) @symbol)
 
-; Dynamic variables
+;; Dynamic variables
 ((sym_lit) @variable.builtin
  (#lua-match? @variable.builtin "^[*].+[*]$"))
 
-; Operators
+;; Operators
 ((sym_lit) @operator
  (#any-of? @operator
   "%" "*" "+" "-" "/"
@@ -66,7 +66,7 @@
  (#any-of? @keyword.operator
   "not" "not=" "and" "or"))
 
-; Definition
+;; Definition
 ((sym_lit) @keyword
  (#any-of? @keyword
   "def" "def-" "defdyn" "defglobal" "defmacro" "defmacro-"
@@ -75,11 +75,11 @@
 ((sym_lit) @keyword.function
  (#match? @keyword.function "^(defn|defn-|fn|varfn)$"))
 
-; Comment
+;; Comment
 ((sym_lit) @comment
  (#any-of? @comment "comment"))
 
-; Conditionals
+;; Conditionals
 ((sym_lit) @conditional
  (#any-of? @conditional
   "case" "cond"))
@@ -90,21 +90,20 @@
 ((sym_lit) @conditional
  (#match? @conditional "^when(\\-.*)?$"))
 
-; Repeats
+;; Repeats
 ((sym_lit) @repeat
  (#any-of? @repeat
   "for" "forever" "forv" "loop" "repeat" "while"))
 
-; Exception
+;; Exception
 ((sym_lit) @exception
  (#any-of? @exception "error" "errorf" "try"))
 
-; Includes
+;; Includes
 ((sym_lit) @include
  (#any-of? @include "import" "require" "use"))
 
-; Builtin macros
-;; TODO: Do all these items belong here?
+;; Builtin macros
 ((sym_lit) @function.macro
  (#any-of? @function.macro
  "++" "+=" "--"
@@ -137,10 +136,7 @@
  "when" "when-let" "when-with" 
  "with" "with-dyns" "with-syms" "with-vars"))
 
-((sym_lit) @function.macro
- (#match? @function.macro "^with\\-.*$"))
-
-; All builtin functions
+;; All builtin functions
 ((sym_lit) @function.builtin
  (#any-of? @function.builtin
   "*" "+" "-" "/"

From c780ba9b6c6b0ffc94d8767f2e1fc062d627dac3 Mon Sep 17 00:00:00 2001
From: sogaiu <983021772@users.noreply.github.com>
Date: Sun, 23 Apr 2023 16:36:53 +0900
Subject: [PATCH 0279/2704] Update list of macros

---
 queries/janet_simple/highlights.scm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 401433d08..459c132e3 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -104,12 +104,19 @@
  (#any-of? @include "import" "require" "use"))
 
 ;; Builtin macros
+;;
+;; (each name (all-bindings)
+;;   (when-let [info (dyn (symbol name))]
+;;     (when (info :macro)
+;;       (print name))))
 ((sym_lit) @function.macro
  (#any-of? @function.macro
- "++" "+=" "--"
+ "%=" "*="
+ "++" "+="
+ "--" "-="
  "->" "->>" "-?>" "-?>>"
- "-=" "*=" "/=" "%="
- "and" "as->" "as?->"
+ "/="
+ "and" "as->" "as-macro" "as?->" "assert"
  "case" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro"
  "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
  "defn" "defn-"
@@ -120,6 +127,7 @@
  "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
  "ev/with-deadline"
  "ffi/defbind"
+ "fiber-fn"
  "for" "forever" "forv"
  "generate"
  "if-let" "if-not" "if-with" "import"
@@ -130,10 +138,10 @@
  "prompt" "protect"
  "repeat"
  "seq" "short-fn"
- "tabseq" "tracev" "try"
+ "tabseq" "toggle" "tracev" "try"
  "unless" "use"
- "var-"
- "when" "when-let" "when-with" 
+ "var-" "varfn"
+ "when" "when-let" "when-with"
  "with" "with-dyns" "with-syms" "with-vars"))
 
 ;; All builtin functions

From 0d61fdae116276ceb45ff429afd76684ebbdd5a5 Mon Sep 17 00:00:00 2001
From: sogaiu <983021772@users.noreply.github.com>
Date: Sun, 23 Apr 2023 17:56:08 +0900
Subject: [PATCH 0280/2704] Adjust indentation

---
 queries/janet_simple/highlights.scm | 64 ++++++++++++++---------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 459c132e3..9496771bd 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -111,38 +111,38 @@
 ;;       (print name))))
 ((sym_lit) @function.macro
  (#any-of? @function.macro
- "%=" "*="
- "++" "+="
- "--" "-="
- "->" "->>" "-?>" "-?>>"
- "/="
- "and" "as->" "as-macro" "as?->" "assert"
- "case" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro"
- "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
- "defn" "defn-"
- "delay" "doc"
- "each" "eachk" "eachp"
- "eachy" ;; XXX: obsolete
- "edefer"
- "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
- "ev/with-deadline"
- "ffi/defbind"
- "fiber-fn"
- "for" "forever" "forv"
- "generate"
- "if-let" "if-not" "if-with" "import"
- "juxt"
- "label" "let" "loop"
- "match"
- "or"
- "prompt" "protect"
- "repeat"
- "seq" "short-fn"
- "tabseq" "toggle" "tracev" "try"
- "unless" "use"
- "var-" "varfn"
- "when" "when-let" "when-with"
- "with" "with-dyns" "with-syms" "with-vars"))
+  "%=" "*="
+  "++" "+="
+  "--" "-="
+  "->" "->>" "-?>" "-?>>"
+  "/="
+  "and" "as->" "as-macro" "as?->" "assert"
+  "case" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro"
+  "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
+  "defn" "defn-"
+  "delay" "doc"
+  "each" "eachk" "eachp"
+  "eachy" ;; XXX: obsolete
+  "edefer"
+  "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
+  "ev/with-deadline"
+  "ffi/defbind"
+  "fiber-fn"
+  "for" "forever" "forv"
+  "generate"
+  "if-let" "if-not" "if-with" "import"
+  "juxt"
+  "label" "let" "loop"
+  "match"
+  "or"
+  "prompt" "protect"
+  "repeat"
+  "seq" "short-fn"
+  "tabseq" "toggle" "tracev" "try"
+  "unless" "use"
+  "var-" "varfn"
+  "when" "when-let" "when-with"
+  "with" "with-dyns" "with-syms" "with-vars"))
 
 ;; All builtin functions
 ((sym_lit) @function.builtin

From b9d183c2c50e4c86b2774db2d7a5b5b8af08e17a Mon Sep 17 00:00:00 2001
From: sogaiu <983021772@users.noreply.github.com>
Date: Sun, 23 Apr 2023 17:56:30 +0900
Subject: [PATCH 0281/2704] Update list of functions

---
 queries/janet_simple/highlights.scm | 151 +++++++++++++++++-----------
 1 file changed, 93 insertions(+), 58 deletions(-)

diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 9496771bd..eafbc8c94 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -145,97 +145,129 @@
   "with" "with-dyns" "with-syms" "with-vars"))
 
 ;; All builtin functions
+;;
+;; (each name (all-bindings)
+;;   (when-let [info (dyn (symbol name))]
+;;     (when (and (nil? (info :macro))
+;;                (or (function? (info :value))
+;;                    (cfunction? (info :value))))
+;;       (print name))))
 ((sym_lit) @function.builtin
  (#any-of? @function.builtin
-  "*" "+" "-" "/"
+  "%" "*" "+" "-" "/"
   "<" "<=" "=" ">" ">="
+  ;; debugging -- start janet with -d and use (debug) to see these
   ".break" ".breakall" ".bytecode"
   ".clear" ".clearall"
   ".disasm"
   ".fiber"
   ".fn" ".frame"
+  ".locals"
   ".next" ".nextc"
   ".ppasm"
   ".signal" ".slot" ".slots" ".source" ".stack" ".step"
+  ;; back to regularly scheduled program
   "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
-  "all-dynamics" "any?" "apply" "array" "array?"
+  "all-dynamics" "any?" "apply"
+  "array"
   "array/clear" "array/concat" "array/ensure" "array/fill"
   "array/insert" "array/new" "array/new-filled" "array/peek"
-  "array/pop" "array/push" "array/remove" "array/slice"
-  "array/trim"
-  "asm" "assert"
-  "bad-compile" "bad-parse" "band" "blshift" "bnot" "boolean?"
-  "bor" "brshift" "brunshift" "buffer"
+  "array/pop" "array/push" "array/remove" "array/slice" "array/trim"
+  "array?"
+  "asm"
+  "bad-compile" "bad-parse"
+  "band" "blshift" "bnot"
+  "boolean?"
+  "bor" "brshift" "brushift"
+  "buffer"
   "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
-  "buffer/bit-toggle" "buffer/blit" "buffer/clear"
-  "buffer/fill" "buffer/format" "buffer/new-filled"
-  "buffer/popn" "buffer/push" "buffer/push-byte"
+  "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill"
+  "buffer/format" "buffer/new" "buffer/new-filled" "buffer/popn"
+  "buffer/push" "buffer/push-at" "buffer/push-byte"
   "buffer/push-string" "buffer/push-word" "buffer/slice"
   "buffer/trim"
-  "buffer?" "bxor" "bytes?"
-  "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare"
-  "compare<" "compare<=" "compare=" "compare>" "compare>="
+  "buffer?"
+  "bxor"
+  "bytes?"
+  "cancel"
+  "cfunction?"
+  "cli-main"
+  "cmp" "comp" "compare" "compare<" "compare<=" "compare="
+  "compare>" "compare>="
   "compile" "complement" "count" "curenv"
   "debug"
   "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage"
   "debug/stack" "debug/stacktrace" "debug/step" "debug/unbreak"
   "debug/unfbreak"
-  "dec" "deep=" "deep-not=" "defglobal" "describe" "dictionary?"
-  "disasm" "distinct" "doc*" "doc-format" "dofile" "drop"
-  "drop-until" "drop-while" "dyn"
-  "eflush" "empty?" "env-lookup" "eprin" "eprinf" "eprint"
-  "eprintf" "error" "errorf"
-  "ev/call" "ev/close" "ev/capacity" "ev/chan" "ev/chunk"
-  "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give"
-  "ev/go" "ev/read" "ev/rselect" "ev/select" "ev/sleep"
-  "ev/take" "ev/write"
+  "debugger" "debugger-on-status"
+  "dec" "deep-not=" "deep=" "defglobal" "describe"
+  "dictionary?"
+  "disasm" "distinct" "doc*" "doc-format" "doc-of" "dofile"
+  "drop" "drop-until" "drop-while" "dyn"
+  "eflush" "empty?" "env-lookup"
+  "eprin" "eprinf" "eprint" "eprintf" "error" "errorf"
+  "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
+  "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan"
+  "ev/chan-close" "ev/chunk" "ev/close" "ev/count" "ev/deadline"
+  "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
+  "ev/read" "ev/release-lock" "ev/release-rlock"
+  "ev/release-wlock" "ev/rselect" "ev/rwlock" "ev/select"
+  "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write"
   "eval" "eval-string" "even?" "every?" "extreme"
   "false?"
   "ffi/align" "ffi/call" "ffi/close" "ffi/context" "ffi/free"
   "ffi/jitfn" "ffi/lookup" "ffi/malloc" "ffi/native"
-  "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
-  "ffi/trampoline" "ffi/write"
+  "ffi/pointer-buffer" "ffi/read" "ffi/signature" "ffi/size"
+  "ffi/struct" "ffi/trampoline" "ffi/write"
   "fiber/can-resume?" "fiber/current" "fiber/getenv"
-  "fiber/maxstack" "fiber/new" "fiber/root" "fiber/setenv"
-  "fiber/setmaxstack" "fiber/status"
+  "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
+  "fiber/setenv" "fiber/setmaxstack" "fiber/status"
   "fiber?"
-  "file/close" "file/flush" "file/open" "file/popen" "file/read"
-  "file/seek" "file/tell" "file/temp" "file/write"
+  "file/close" "file/flush" "file/open" "file/read" "file/seek"
+  "file/tell" "file/temp" "file/write"
   "filter" "find" "find-index" "first" "flatten" "flatten-into"
-  "flush" "flycheck" "freeze" "frequencies" "function?"
-  "gccollect" "gcinterval" "gcsetinterval" "gensym" "get"
-  "get-in" "getline"
+  "flush" "flycheck" "freeze" "frequencies" "from-pairs"
+  "function?"
+  "gccollect" "gcinterval" "gcsetinterval"
+  "gensym" "get" "get-in" "getline" "getproto" "group-by"
   "hash"
   "idempotent?" "identity" "import*" "in" "inc" "index-of"
   "indexed?"
-  "int/s64" "int/u64"
+  "int/s64" "int/to-bytes" "int/to-number" "int/u64"
   "int?"
   "interleave" "interpose" "invert"
   "juxt*"
-  "keep" "keys"
+  "keep" "keep-syntax" "keep-syntax!" "keys"
   "keyword"
   "keyword/slice"
   "keyword?"
   "kvs"
   "last" "length" "load-image"
-  "macex" "macex1"
+  "macex" "macex1" "maclintf"
   "make-env" "make-image" "map" "mapcat" "marshal"
-  "math/abs" "math/acos" "math/acosh" "math/asin"
-  "math/asinh" "math/atan" "math/atan2" "math/atanh" "math/cbrt"
-  "math/ceil" "math/cos" "math/cosh" "math/erf"
-  "math/erfc" "math/exp" "math/exp2" "math/expm1" "math/floor"
-  "math/gamma" "math/hypot" "math/log" "math/log10" "math/log1p"
-  "math/log2" "math/next" "math/pi" "math/pow" "math/random"
-  "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform"
-  "math/round" "math/seedrandom" "math/sin" "math/sinh"
-  "math/sqrt" "math/tan" "math/tanh" "math/trunc"
-  "max" "mean" "merge" "merge-into" "merge-module" "min" "mod"
+  "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh"
+  "math/atan" "math/atan2" "math/atanh" "math/cbrt" "math/ceil"
+  "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
+  "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd"
+  "math/hypot" "math/lcm" "math/log" "math/log-gamma"
+  "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
+  "math/random" "math/rng" "math/rng-buffer" "math/rng-int"
+  "math/rng-uniform" "math/round" "math/seedrandom" "math/sin"
+  "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc"
+  "max" "max-of" "mean" "memcmp" "merge" "merge-into"
+  "merge-module" "min" "min-of" "mod"
   "module/add-paths" "module/expand-path" "module/find"
+  "module/value"
   "nan?" "nat?" "native" "neg?"
-  "net/accept" "net/accept-loop" "net/address" "net/chunk"
-  "net/close" "net/connect" "net/flush" "net/listen" "net/read"
-  "net/recv-from" "net/send-to" "net/server" "net/write"
-  "next" "nil?" "not" "not=" "number?"
+  "net/accept" "net/accept-loop" "net/address"
+  "net/address-unpack" "net/chunk" "net/close" "net/connect"
+  "net/flush" "net/listen" "net/localname" "net/peername"
+  "net/read" "net/recv-from" "net/send-to" "net/server"
+  "net/shutdown" "net/write"
+  "next"
+  "nil?"
+  "not" "not="
+  "number?"
   "odd?" "one?"
   "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
   "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir"
@@ -246,21 +278,23 @@
   "os/rm" "os/rmdir" "os/setenv" "os/shell" "os/sleep"
   "os/spawn" "os/stat" "os/symlink" "os/time" "os/touch"
   "os/umask" "os/which"
-  "pairs" "parse"
+  "pairs"
+  "parse" "parse-all"
   "parser/byte" "parser/clone" "parser/consume" "parser/eof"
   "parser/error" "parser/flush" "parser/has-more"
   "parser/insert" "parser/new" "parser/produce" "parser/state"
   "parser/status" "parser/where"
-  "partial" "partition"
+  "partial" "partition" "partition-by"
   "peg/compile" "peg/find" "peg/find-all" "peg/match"
   "peg/replace" "peg/replace-all"
-  "pos?" "postwalk" "pp" "prewalk" "prin" "prinf" "print"
-  "printf" "product" "propagate" "put" "put-in"
+  "pos?" "postwalk" "pp" "prewalk"
+  "prin" "prinf" "print" "printf"
+  "product" "propagate" "put" "put-in"
   "quit"
   "range" "reduce" "reduce2" "repl" "require" "resume"
   "return" "reverse" "reverse!" "run-context"
-  "scan-number" "setdyn" "signal" "slice" "slurp" "some" "sort"
-  "sort-by" "sorted" "sorted-by" "spit"
+  "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
+  "some" "sort" "sort-by" "sorted" "sorted-by" "spit"
   "string"
   "string/ascii-lower" "string/ascii-upper" "string/bytes"
   "string/check-set" "string/find" "string/find-all"
@@ -279,8 +313,9 @@
   "symbol/slice"
   "symbol?"
   "table"
-  "table/clone" "table/getproto" "table/new" "table/rawget"
-  "table/setproto" "table/to-struct"
+  "table/clear" "table/clone" "table/getproto" "table/new"
+  "table/proto-flatten" "table/rawget" "table/setproto"
+  "table/to-struct"
   "table?"
   "take" "take-until" "take-while"
   ;; XXX: obsolete
@@ -290,7 +325,7 @@
   ;; XXX: obsolete
   "thread/close" "thread/current" "thread/exit" "thread/new"
   "thread/receive" "thread/send"
-  ;; resume non-obsolete
+  ;; end of obsolete
   "trace" "true?" "truthy?"
   "tuple"
   "tuple/brackets" "tuple/setmap" "tuple/slice"
@@ -299,7 +334,7 @@
   "type"
   "unmarshal" "untrace" "update" "update-in"
   "values" "varglobal"
-  "walk"
+  "walk" "warn-compile"
   "xprin" "xprinf" "xprint" "xprintf"
   "yield"
   "zero?" "zipcoll"))

From 6fe60587d1a75bfc4c8cf3a029910cfe65372a2e Mon Sep 17 00:00:00 2001
From: sogaiu <983021772@users.noreply.github.com>
Date: Tue, 25 Apr 2023 22:34:56 +0900
Subject: [PATCH 0282/2704] Remove some sections and add some missing things

The original approach was to emulate what was in Clojure's
highlights.scm file, but it appears that there were a number of
questionable items, so some sections were removed.

As a consequence, there were some items that ended up unmentioned.  An
attempt was made to rescue most of these and add some missing items to
a renamed "Special forms and builtin macros" section.

Five items were removed entirely.  These are:

* Single quote
* Tilde
* Pipe
* Comma
* Semicolon

It was unclear where to put these and it's also unclear whether
highlighting them would really be beneficial.  Perhaps what to do, if
anything, will become clear in the future.
---
 queries/janet_simple/highlights.scm | 81 +++++++----------------------
 1 file changed, 20 insertions(+), 61 deletions(-)

diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index eafbc8c94..fdd65adc5 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -1,16 +1,3 @@
-;; >> 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
-;; specialized captures.
-;; This can mean that sometimes things are highlighted weirdly because they
-;; have multiple highlight groups applied to them.
-
-
 ;; >> Literals
 
 (kwd_lit) @symbol
@@ -23,10 +10,6 @@
 (nil_lit) @constant.builtin
 (comment) @comment @spell
 
-["'" "~"] @string.escape
-
-["|" "," ";"] @punctuation.special
-
 ["{" "@{" "}"
  "[" "@[" "]"
  "(" "@(" ")"] @punctuation.bracket
@@ -46,6 +29,7 @@
  (sym_lit) @function.call)
 
 ;; Quoted symbols
+
 (quote_lit
  (sym_lit) @symbol)
 
@@ -53,64 +37,38 @@
  (sym_lit) @symbol)
 
 ;; Dynamic variables
+
 ((sym_lit) @variable.builtin
  (#lua-match? @variable.builtin "^[*].+[*]$"))
 
-;; Operators
-((sym_lit) @operator
- (#any-of? @operator
-  "%" "*" "+" "-" "/"
-  "<" "<=" "=" "==" ">" ">="))
-
-((sym_lit) @keyword.operator
- (#any-of? @keyword.operator
-  "not" "not=" "and" "or"))
-
-;; Definition
-((sym_lit) @keyword
- (#any-of? @keyword
-  "def" "def-" "defdyn" "defglobal" "defmacro" "defmacro-"
-  "var" "var-" "varglobal"))
-
-((sym_lit) @keyword.function
- (#match? @keyword.function "^(defn|defn-|fn|varfn)$"))
-
 ;; Comment
+
 ((sym_lit) @comment
  (#any-of? @comment "comment"))
 
-;; Conditionals
-((sym_lit) @conditional
- (#any-of? @conditional
-  "case" "cond"))
-
-((sym_lit) @conditional
- (#match? @conditional "^if(\\-.*)?$"))
-
-((sym_lit) @conditional
- (#match? @conditional "^when(\\-.*)?$"))
-
-;; Repeats
-((sym_lit) @repeat
- (#any-of? @repeat
-  "for" "forever" "forv" "loop" "repeat" "while"))
-
-;; Exception
-((sym_lit) @exception
- (#any-of? @exception "error" "errorf" "try"))
-
-;; Includes
-((sym_lit) @include
- (#any-of? @include "import" "require" "use"))
-
-;; Builtin macros
+;; Special forms and builtin macros
 ;;
+;; # special forms were manually added at the beginning
+;;
+;; # for macros
 ;; (each name (all-bindings)
 ;;   (when-let [info (dyn (symbol name))]
 ;;     (when (info :macro)
 ;;       (print name))))
+
 ((sym_lit) @function.macro
  (#any-of? @function.macro
+  ;; special forms
+  "break"
+  "def" "do"
+  "fn"
+  "if"
+  "quasiquote" "quote"
+  "set" "splice"
+  "unquote" "upscope"
+  "var"
+  "while"
+  ;; macros
   "%=" "*="
   "++" "+="
   "--" "-="
@@ -152,6 +110,7 @@
 ;;                (or (function? (info :value))
 ;;                    (cfunction? (info :value))))
 ;;       (print name))))
+
 ((sym_lit) @function.builtin
  (#any-of? @function.builtin
   "%" "*" "+" "-" "/"

From ca8a981db35cf6f3dd24568da5a136fb2e5abc52 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 1 May 2023 12:04:27 +0900
Subject: [PATCH 0283/2704] fix(query): add missing dedent for "]" (#4739)

---
 queries/query/indents.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/query/indents.scm b/queries/query/indents.scm
index 7c53fa1ad..0ee125be7 100644
--- a/queries/query/indents.scm
+++ b/queries/query/indents.scm
@@ -6,3 +6,7 @@
   "["
   "]"
 ] @indent.begin
+
+[
+  "]"
+] @indent.branch

From 195a0cda1aaf550b6dacf866cddf371fe4256ae5 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 1 May 2023 03:05:02 +0000
Subject: [PATCH 0284/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d633d57c9..1fb1830fb 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
+- [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
 - [x] [javascript](https://github.com/tree-sitter/tree-sitter-javascript) (maintained by @steelsojka)
 - [x] [jq](https://github.com/flurie/tree-sitter-jq) (maintained by @ObserverOfTime)

From da79f9afe60b84111207c963c3d6220a21b4c737 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sun, 30 Apr 2023 21:03:34 +0900
Subject: [PATCH 0285/2704] feat: add py-script injections for html

---
 queries/html/injections.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/queries/html/injections.scm b/queries/html/injections.scm
index 7ddb5beae..23981018c 100644
--- a/queries/html/injections.scm
+++ b/queries/html/injections.scm
@@ -1 +1,24 @@
 ; inherits html_tags
+
+(element
+  (start_tag
+    (tag_name) @_py_script)
+  (text) @python
+  (#any-of? @_py_script "py-script" "py-repl"))
+
+(script_element
+  (start_tag
+    (attribute
+      (attribute_name) @_attr 
+      (quoted_attribute_value 
+        (attribute_value) @_type)))
+  (raw_text) @python
+  (#eq? @_attr "type")
+  ; not adding type="py" here as it's handled by html_tags 
+  (#any-of? @_type "pyscript" "py-script"))
+
+(element
+  (start_tag
+    (tag_name) @_py_config)
+  (text) @toml
+  (#eq? @_py_config "py-config"))

From 25bdc313c732cb0a2b612b9364eab8dc2acad76a Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 1 May 2023 12:46:03 +0900
Subject: [PATCH 0286/2704] fix(lua_inject): remove need for surrounding quote
 (#4740)

---
 queries/lua/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 9a3838951..da3107b0e 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -19,9 +19,9 @@
 ; vim.rcprequest(123, "nvim_exec_lua", "return vim.api.nvim_buf_get_lines(0, 0, -1, false)", false)
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments . (_) . (string) @_method . (string content: _ @lua)))
+  arguments: (arguments . (_) . (string content: _ @_method) . (string content: _ @lua)))
   (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
-  (#any-of? @_method "\"nvim_exec_lua\"" "'nvim_exec_lua'" "[[nvim_exec_lua]]"))
+  (#eq? @_method "nvim_exec_lua"))
 
 ; highlight string as query if starts with `;; query`
 (string content: _ @query (#lua-match? @query "^%s*;+%s?query"))

From c39b5d3fd72c5e9438f9b86b9bdaddc23f3d329a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 1 May 2023 06:36:19 +0000
Subject: [PATCH 0287/2704] Update parsers: janet_simple, swift, vimdoc

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c9d227465..36255a25f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -225,7 +225,7 @@
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
   "janet_simple": {
-    "revision": "95f19cfb8ab03d994389e89d69477511440a08c6"
+    "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
     "revision": "c194ee5e6ede5f26cf4799feead4a8f165dcf14d"
@@ -465,7 +465,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "80c1ff80502414f80de177ca162f4f71aa196ee2"
+    "revision": "56ecc996e5765054fc25cdae5fbddfd75a64287b"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -531,7 +531,7 @@
     "revision": "cd63bd20644a419d209b625d21258617580273d2"
   },
   "vimdoc": {
-    "revision": "15c2fdcc57f51f1caef82fe75e1ffb733626dcae"
+    "revision": "b3fca1b950ca9666bd1e891efe79470fb6dc403e"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"

From b4d2640eab4b1f6373e1ded84ab9f6db0c02c756 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 1 May 2023 20:42:21 +0900
Subject: [PATCH 0288/2704] feat: add indents for ocaml and ocaml interface
 (#4725)

---
 queries/ocaml/indents.scm           | 69 +++++++++++++++++++++++++++++
 queries/ocaml_interface/indents.scm |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 queries/ocaml/indents.scm
 create mode 100644 queries/ocaml_interface/indents.scm

diff --git a/queries/ocaml/indents.scm b/queries/ocaml/indents.scm
new file mode 100644
index 000000000..48049dd0d
--- /dev/null
+++ b/queries/ocaml/indents.scm
@@ -0,0 +1,69 @@
+[ 
+  (let_binding)                 ; let = ...
+  (type_binding)
+
+  (external)
+  (record_declaration)          ; { foo: bar ... }
+  (structure)                   ; struct ... end
+  (signature)                   ; sig ... end
+  (value_specification)         ; val x: bar
+
+  (do_clause)                   ; do ... done
+  (match_case)
+
+  (field_expression)
+  (application_expression)
+  (parenthesized_expression)    ; ( ... )
+  (record_expression)           ; { foo = bar ... }
+  (list_expression)             ; [...;...]
+  (try_expression)              ; try ... with
+] @indent.begin
+
+; handle if-else if-else case
+(if_expression
+  condition: (_) @indent.begin)
+(then_clause) @indent.begin
+((else_clause 
+   (_) @_not_if) @indent.begin
+ (#not-has-type? @_not_if if_expression))
+
+((parameter) @indent.begin
+ (#set! indent.start_at_same_line))
+
+(_ (ERROR) @indent.begin
+ (#set! indent.start_at_same_line))
+
+(ERROR "|" @indent.begin
+ (#set! indent.start_at_same_line))
+
+
+(try_expression
+  "with" @indent.branch
+  [
+    (match_case) @indent.dedent
+    (match_case 
+      [
+        (parenthesized_expression) 
+        (list_expression)
+      ] @indent.dedent)
+  ]
+)
+
+[
+  "}"
+] @indent.branch @indent.end
+
+
+(list_expression "]" @indent.branch)
+(parenthesized_expression ")" @indent.branch)
+
+";;" @indent.end
+
+(do_clause "done" @indent.end @indent.branch) 
+(structure "end" @indent.end @indent.branch)
+(signature "end" @indent.end @indent.branch)
+
+[
+  (string)
+  (comment) 
+] @indent.auto
diff --git a/queries/ocaml_interface/indents.scm b/queries/ocaml_interface/indents.scm
new file mode 100644
index 000000000..6d3dfbcf2
--- /dev/null
+++ b/queries/ocaml_interface/indents.scm
@@ -0,0 +1 @@
+; inherits: ocaml

From dd1cd5462253f967246b738c611b45c5f241b79c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 May 2023 08:37:14 +0000
Subject: [PATCH 0289/2704] Update parsers: lua (#4746)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 36255a25f..423d5abff 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -273,7 +273,7 @@
     "revision": "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"
   },
   "lua": {
-    "revision": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"
+    "revision": "4e94980e52f81f713d09be104ba32bf050000031"
   },
   "luadoc": {
     "revision": "1e1152264cc68e11d65d9e2493566f5717a13d11"

From e2cf8977fda35ad666d7b431b0254d8da710968a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 1 May 2023 00:20:51 -0400
Subject: [PATCH 0290/2704] feat(go): highlight constructors, remove _ as
 `@constant`

---
 queries/go/highlights.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index ce4ae89b6..f2bdf6a83 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -15,9 +15,6 @@
 
 (label_name) @label
 
-((identifier) @constant
- (#eq? @constant "_"))
-
 (const_spec
   name: (identifier) @constant)
 
@@ -41,6 +38,14 @@
 (method_spec 
   name: (field_identifier) @method) 
 
+; Constructors
+
+((call_expression (identifier) @constructor)
+  (#lua-match? @constructor "^[nN]ew.+$"))
+
+((call_expression (identifier) @constructor)
+  (#lua-match? @constructor "^[mM]ake.+$"))
+
 ; Operators
 
 [

From 1e9e1492eef63a9d7280d6324d02cf3c9d195ee5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 3 May 2023 06:35:56 +0000
Subject: [PATCH 0291/2704] Update parsers: blueprint, c_sharp, dockerfile,
 haskell

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 423d5abff..cef744d0e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -30,13 +30,13 @@
     "revision": "b94a0983b69ebb75e9129329a188199ad6ebcec0"
   },
   "blueprint": {
-    "revision": "6ef91ca8270f0112b9c6d27ecb9966c741a5d103"
+    "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
     "revision": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"
   },
   "c_sharp": {
-    "revision": "0dd182a14a519a70dc60c3727fdc2fdb65c030ae"
+    "revision": "2340fd6b57b06ccbf24c2c6dafb15905fdccfb1f"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -90,7 +90,7 @@
     "revision": "f69bde8e56f431863eba2fe4bab23e7d9692855f"
   },
   "dockerfile": {
-    "revision": "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62"
+    "revision": "fd30df68c4178964ed012ef7f745055db76f8ebf"
   },
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
@@ -195,7 +195,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "3241b683cc1eaa466afb83b9a5592ab39caaa2fa"
+    "revision": "684638edce563245e4dc6263940aeffa2a0205c2"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"

From 5e95ecaad0a533b6aae36361706e7a5028cd1841 Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Wed, 3 May 2023 12:56:13 +0300
Subject: [PATCH 0292/2704] injections(html): event attributes (#4750)

injections(html): inject javascript into event attributes

Adds javascript injections to HTML `onevent` attributes.
---
 queries/html_tags/injections.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index e8926b6b8..9e02fc21b 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -66,3 +66,10 @@
       (attribute_value) @regex
     ] (#eq? @_attr "pattern")))
 ))
+
+; <input type="checkbox" onchange="this.closest('form').elements.output.value = this.checked">
+(attribute
+  (attribute_name) @_name
+  (#lua-match? @_name "^on[a-z]+$")
+  (#offset! @javascript 0 1 0 -1)
+  (quoted_attribute_value) @javascript)

From bff7115bf89a553e4a1a120eb69b99486564af4c Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Wed, 3 May 2023 13:18:03 +0300
Subject: [PATCH 0293/2704] perf(html): onevent attrs (#4752)

---
 queries/html_tags/injections.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 9e02fc21b..29608a5a4 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -71,5 +71,4 @@
 (attribute
   (attribute_name) @_name
   (#lua-match? @_name "^on[a-z]+$")
-  (#offset! @javascript 0 1 0 -1)
-  (quoted_attribute_value) @javascript)
+  (quoted_attribute_value (attribute_value) @javascript))

From 4fe6b4c07f2383053a3f4ccc1bd621f19ddd3ff6 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 3 May 2023 22:29:23 +0900
Subject: [PATCH 0294/2704] fix: add @combined to markdown html

---
 queries/markdown/injections.scm        | 2 +-
 queries/markdown_inline/injections.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/markdown/injections.scm b/queries/markdown/injections.scm
index 3b8599c72..c0ef2e84a 100644
--- a/queries/markdown/injections.scm
+++ b/queries/markdown/injections.scm
@@ -7,7 +7,7 @@
     (#set-lang-from-info-string! @_lang)
     (#exclude_children! @content))
 
-((html_block) @html)
+((html_block) @html @combined)
 
 ((minus_metadata) @yaml (#offset! @yaml 1 0 -1 0))
 ((plus_metadata) @toml (#offset! @toml 1 0 -1 0))
diff --git a/queries/markdown_inline/injections.scm b/queries/markdown_inline/injections.scm
index 8699f72e7..3e46a283b 100644
--- a/queries/markdown_inline/injections.scm
+++ b/queries/markdown_inline/injections.scm
@@ -1,2 +1,2 @@
-((html_tag) @html)
+((html_tag) @html @combined)
 ((latex_block) @latex)

From 01c23a8036340af45cd90fa5b771ba16bd6eb152 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 07:10:53 +0000
Subject: [PATCH 0295/2704] Update parsers: dart, llvm (#4755)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cef744d0e..7ec608f97 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "53485a8f301254e19c518aa20c80f1bcf7cf5c62"
+    "revision": "3abbd3a486a1e356acfdf0367dbf3680f8a0024d"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
@@ -270,7 +270,7 @@
     "revision": "1cc4445908966046c1dd211d9ddaac4c3198bd1d"
   },
   "llvm": {
-    "revision": "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"
+    "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
     "revision": "4e94980e52f81f713d09be104ba32bf050000031"

From 2115c7d5852c5d63ca7605dda92076ad3ec3ed4b Mon Sep 17 00:00:00 2001
From: Iron-E <36409591+Iron-E@users.noreply.github.com>
Date: Thu, 4 May 2023 19:37:29 +0000
Subject: [PATCH 0296/2704] feat(c_sharp): add capture for ternary operators

---
 queries/c_sharp/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 993609485..e2dc3720c 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -298,6 +298,8 @@
  ":"
 ] @punctuation.delimiter
 
+(conditional_expression ["?" ":"] @conditional.ternary)
+
 [
  "["
  "]"

From 31d2f60734da6217c7fa8da1f6f9a9a18c52cdec Mon Sep 17 00:00:00 2001
From: Iron-E <36409591+Iron-E@users.noreply.github.com>
Date: Thu, 4 May 2023 19:46:41 +0000
Subject: [PATCH 0297/2704] fix(c_sharp): highlight `<` & `>` as
 `@punctuation.bracket` only in type param lists

This fixes highlighting of `x > 4`, for example
---
 queries/c_sharp/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index e2dc3720c..9895d8341 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -307,10 +307,10 @@
  "}"
  "("
  ")"
- "<"
- ">"
 ] @punctuation.bracket
 
+(type_argument_list ["<" ">"] @punctuation.bracket)
+
 [
  (this_expression)
  (base_expression)

From 239bb86b54d07a955caa0200053484298879ca59 Mon Sep 17 00:00:00 2001
From: Iron-E <36409591+Iron-E@users.noreply.github.com>
Date: Thu, 4 May 2023 19:49:20 +0000
Subject: [PATCH 0298/2704] feat(rust): capture debug macros as `@debug`

* ref(rust): highlight debug macros as `@debug`

E.g. `dbg!` and `debug_assert!`

* Update queries/rust/highlights.scm

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

---------

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 queries/rust/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 5eb6d97b8..4554db022 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -306,3 +306,5 @@
  (#eq? @_ident "panic"))
 (macro_invocation macro: (identifier) @_ident @exception "!" @exception
  (#contains? @_ident "assert"))
+(macro_invocation macro: (identifier) @_ident @debug "!" @debug
+ (#eq? @_ident "dbg"))

From 54741de02c18fae1b33d2b0da36f5ef946712073 Mon Sep 17 00:00:00 2001
From: Iron-E <36409591+Iron-E@users.noreply.github.com>
Date: Thu, 4 May 2023 19:50:31 +0000
Subject: [PATCH 0299/2704] fix(java): capture type parameter brackets as
 `@punctuation.delimiter`

It is currently highlighted as `@operator`
---
 queries/java/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index c97242295..f7e1c4792 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -258,6 +258,9 @@
 
 [ "(" ")" ] @punctuation.bracket
 
+(type_arguments [ "<" ">" ] @punctuation.bracket)
+(type_parameters [ "<" ">" ] @punctuation.bracket)
+
 ; Exceptions
 
 [

From f0b50973f334a7a5bb5831cb52b9fd4c770e6cba Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 5 May 2023 06:36:47 +0000
Subject: [PATCH 0300/2704] Update parsers: bash, dart, haskell, http

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7ec608f97..a9a2c7ed3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"
   },
   "bash": {
-    "revision": "422a07cb221b92c6b117e854efa8945a506b5214"
+    "revision": "ee2a8f9906b53a785b784ee816c0016c2b6866d2"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -78,7 +78,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "3abbd3a486a1e356acfdf0367dbf3680f8a0024d"
+    "revision": "939e5e18321a695f39889ae9dcf3c0255a107109"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
@@ -195,7 +195,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "684638edce563245e4dc6263940aeffa2a0205c2"
+    "revision": "3a50c9fc2827e4014ced8f037ddac595038c3b1b"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"
@@ -219,7 +219,7 @@
     "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"
   },
   "http": {
-    "revision": "f41d3e97ad148f0b2c2d913e3834ccd5816fdc02"
+    "revision": "6824a247d1326079aab4fa9f9164e9319678081d"
   },
   "ini": {
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"

From 39a78192fbcee43f0b9134d668663b0cfc1e082b Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Sat, 15 Apr 2023 13:53:26 +0200
Subject: [PATCH 0301/2704] ci: add tests for #4632

Issue #4632 might be fixed by
https://github.com/UserNobody14/tree-sitter-dart/pull/41
---
 tests/indent/dart/try.dart | 8 ++++++++
 tests/indent/dart_spec.lua | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/tests/indent/dart/try.dart b/tests/indent/dart/try.dart
index 807ad3b0f..8b78d7d51 100644
--- a/tests/indent/dart/try.dart
+++ b/tests/indent/dart/try.dart
@@ -3,3 +3,11 @@ void test() {
   } catch(e) {
   }
 }
+
+// Issue #4632
+class Test {
+  void test(){
+    try {
+    }
+  }
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index f3c360cbe..c1d018738 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -25,6 +25,9 @@ describe("new line:", function()
   run:new_line("class.dart", { on_line = 6, text = "'100'", indent = 8 }, "expected failure", XFAIL)
   run:new_line("class.dart", { on_line = 7, text = "int five = 5", indent = 2 }, "expected failure", XFAIL)
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
+  for _, content in ipairs { "var x;", "var x" } do
+    run:new_line("try.dart", { on_line = 10, text = content, indent = 6 })
+  end
   run:new_line("switch.dart", { on_line = 3, text = "x = 1;", indent = 6 })
   run:new_line("switch.dart", { on_line = 9, text = "x = 1;", indent = 6 })
   run:new_line("switch.dart", { on_line = 3, text = "case 2:", indent = 4 })

From 8646c0d2eaff318e041995e219ddc07515c21958 Mon Sep 17 00:00:00 2001
From: haoxian <haoxianhan@gmail.com>
Date: Sat, 6 May 2023 16:39:30 +0800
Subject: [PATCH 0302/2704] feat(erlang): add new keyword and operator from
 OTP25 (#4765)

---
 queries/erlang/folds.scm      | 1 +
 queries/erlang/highlights.scm | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/queries/erlang/folds.scm b/queries/erlang/folds.scm
index 35073e869..65c2d8ed1 100644
--- a/queries/erlang/folds.scm
+++ b/queries/erlang/folds.scm
@@ -2,6 +2,7 @@
   (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
index 63e6ea214..ef851f695 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -49,6 +49,7 @@
   "->"
   "=>"
   "|"
+  "?="
 ] @operator
 
 [
@@ -58,7 +59,7 @@
 ] @punctuation.delimiter
 
 ;; conditional
-([
+[
   "receive"
   "if"
   "case"
@@ -66,7 +67,9 @@
   "when"
   "after"
   "end"
-] @conditional (#set! "priority" 95))
+  "maybe"
+  "else"
+] @conditional
 
 [
   "catch"

From e8081bb1626696c6d0cc7706febb839c05494881 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 6 May 2023 06:34:54 +0000
Subject: [PATCH 0303/2704] Update parsers: haskell, vim, vimdoc

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a9a2c7ed3..486d5aa19 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -195,7 +195,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "3a50c9fc2827e4014ced8f037ddac595038c3b1b"
+    "revision": "14a48ba6a02b24b2897f5d9ed9621255e1ea8cf0"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"
@@ -528,10 +528,10 @@
     "revision": "77fd8a8fcc0b4788e0b1569b1a4fa070b36add28"
   },
   "vim": {
-    "revision": "cd63bd20644a419d209b625d21258617580273d2"
+    "revision": "26b1aea3b3a5dae31f784a1204205fd57f2b82b5"
   },
   "vimdoc": {
-    "revision": "b3fca1b950ca9666bd1e891efe79470fb6dc403e"
+    "revision": "e9b4d2b3e732ed841980e7369e945e46ce715b8c"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"

From 12453e0e3d2e82a4ae813f1540315c7cf2df2363 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 6 May 2023 11:12:49 -0400
Subject: [PATCH 0304/2704] Update Capnp (#4713)

* feat(capnp): update queries from upstream changes

* test: add tests for capnp

* fix indent queries

* ci: fix capnp indent tests

---------

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>
---
 queries/capnp/highlights.scm            |  101 ++-
 queries/capnp/indents.scm               |   18 +-
 tests/indent/capnp/test.capnp           | 1057 +++++++++++++++++++++++
 tests/indent/capnp_spec.lua             |   30 +
 tests/query/highlights/capnp/test.capnp |  633 ++++++++++++++
 5 files changed, 1787 insertions(+), 52 deletions(-)
 create mode 100644 tests/indent/capnp/test.capnp
 create mode 100644 tests/indent/capnp_spec.lua
 create mode 100644 tests/query/highlights/capnp/test.capnp

diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm
index 8dfb2ba91..780f03675 100644
--- a/queries/capnp/highlights.scm
+++ b/queries/capnp/highlights.scm
@@ -1,7 +1,9 @@
 ; Preproc
 
-(unique_id) @preproc
-(top_level_annotation_body) @preproc
+[
+  (unique_id)
+  (top_level_annotation_body)
+] @preproc
 
 ; Includes
 
@@ -9,12 +11,30 @@
   "import"
   "$import"
   "embed"
+  "using"
 ] @include
 
-(import_path) @string
+(import_path) @string @text.uri
+
+; Keywords
+
+[
+  "annotation"
+  "enum"
+  "group"
+  "interface"
+  "struct"
+  "union"
+  "extends"
+  "namespace"
+] @keyword
 
 ; Builtins
 
+[
+  "const"
+] @type.qualifier
+
 [
   (primitive_type)
   "List"
@@ -30,8 +50,10 @@
 
 ; Methods
 
-(annotation_definition_identifier) @method
-(method_identifier) @method
+[
+  (annotation_definition_identifier)
+  (method_identifier)
+] @method
 
 ; Fields
 
@@ -43,53 +65,41 @@
 
 ; Parameters
 
-(param_identifier) @parameter
-(return_identifier) @parameter
+[
+  (param_identifier)
+  (return_identifier)
+] @parameter
+
+(annotation_target) @parameter.builtin
 
 ; Constants
 
-(const_identifier) @constant
-(local_const) @constant
-(enum_member) @constant
+[
+  (const_identifier)
+  (local_const)
+  (enum_member)
+] @constant
 
 (void) @constant.builtin
 
 ; Types
 
-(enum_identifier) @type
-(extend_type) @type
-(type_identifier) @type
+[
+  (enum_identifier)
+  (extend_type)
+  (type_identifier)
+] @type
 
 ; Attributes
 
-(annotation_identifier) @attribute
-(attribute) @attribute
+[
+  (annotation_identifier)
+  (attribute)
+] @attribute
 
 ; Operators
 
-[
- ; @ ! -
-  "="
-] @operator
-
-; Keywords
-
-
-[
-  "annotation"
-  "enum"
-  "group"
-  "interface"
-  "struct"
-  "union"
-] @keyword
-
-[
-  "extends"
-  "namespace"
-  "using"
-  (annotation_target)
-] @keyword
+"=" @operator
 
 ; Literals
 
@@ -100,6 +110,8 @@
   (namespace)
 ] @string
 
+(namespace) @text.underline
+
 (escape_sequence) @string.escape
 
 (data_string) @string.special
@@ -110,11 +122,9 @@
 
 (boolean) @boolean
 
-; Misc
+(data_hex) @symbol
 
-[
-  "const"
-] @type.qualifier
+; Punctuation
 
 [
   "*"
@@ -129,13 +139,16 @@
 ["[" "]"] @punctuation.bracket
 
 [
+  "."
   ","
   ";"
   "->"
 ] @punctuation.delimiter
 
-(data_hex) @symbol
-
 ; Comments
 
 (comment) @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/capnp/indents.scm b/queries/capnp/indents.scm
index e54ca9566..bc7979aea 100644
--- a/queries/capnp/indents.scm
+++ b/queries/capnp/indents.scm
@@ -1,6 +1,6 @@
 [
   (annotation_targets)
-  (const_list)
+  (const)
   (enum)
   (interface)
   (implicit_generics)
@@ -9,26 +9,28 @@
   (method_parameters)
   (named_return_types)
   (struct)
-  (struct_shorthand)
   (union)
+  (field)
 ] @indent.begin
 
 ((struct_shorthand (property)) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
+((method (field_version)) @indent.align
+  (#set! indent.open_delimiter field_version))
+
 ((const_list (const_value)) @indent.align
-  (#set! indent.open_delimiter "(")
-  (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]"))
+
+(concatenated_string) @indent.align
 
 [
   "}"
   ")"
-] @indent.end
+] @indent.end @indent.branch
 
-[ "{" "}" ] @indent.branch
-
-[ "(" ")" ] @indent.branch
 
 [
   (ERROR)
diff --git a/tests/indent/capnp/test.capnp b/tests/indent/capnp/test.capnp
new file mode 100644
index 000000000..dd2322382
--- /dev/null
+++ b/tests/indent/capnp/test.capnp
@@ -0,0 +1,1057 @@
+# Copyright (c) 2013-2014 Sandstorm Development Group, Inc. and contributors
+# Licensed under the MIT License:
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+@0xd508eebdc2dc42b8;
+
+using Cxx = import "c++.capnp";
+
+# Use a namespace likely to cause trouble if the generated code doesn't use fully-qualified
+# names for stuff in the capnproto namespace.
+$Cxx.namespace("capnproto_test::capnp::test");
+
+enum TestEnum {
+  foo @0;
+  bar @1;
+  baz @2;
+  qux @3;
+  quux @4;
+  corge @5;
+  grault @6;
+  garply @7;
+}
+
+struct TestAllTypes {
+  voidField      @0  : Void;
+  boolField      @1  : Bool;
+  int8Field      @2  : Int8;
+  int16Field     @3  : Int16;
+  int32Field     @4  : Int32;
+  int64Field     @5  : Int64;
+  uInt8Field     @6  : UInt8;
+  uInt16Field    @7  : UInt16;
+  uInt32Field    @8  : UInt32;
+  uInt64Field    @9  : UInt64;
+  float32Field   @10 : Float32;
+  float64Field   @11 : Float64;
+  textField      @12 : Text;
+  dataField      @13 : Data;
+  structField    @14 : TestAllTypes;
+  enumField      @15 : TestEnum;
+  interfaceField @16 : Void;  # TODO
+
+  voidList      @17 : List(Void);
+  boolList      @18 : List(Bool);
+  int8List      @19 : List(Int8);
+  int16List     @20 : List(Int16);
+  int32List     @21 : List(Int32);
+  int64List     @22 : List(Int64);
+  uInt8List     @23 : List(UInt8);
+  uInt16List    @24 : List(UInt16);
+  uInt32List    @25 : List(UInt32);
+  uInt64List    @26 : List(UInt64);
+  float32List   @27 : List(Float32);
+  float64List   @28 : List(Float64);
+  textList      @29 : List(Text);
+  dataList      @30 : List(Data);
+  structList    @31 : List(TestAllTypes);
+  enumList      @32 : List(TestEnum);
+  interfaceList @33 : List(Void);  # TODO
+}
+
+struct TestDefaults {
+  voidField      @0  : Void    = void;
+  boolField      @1  : Bool    = true;
+  int8Field      @2  : Int8    = -123;
+  int16Field     @3  : Int16   = -12345;
+  int32Field     @4  : Int32   = -12345678;
+  int64Field     @5  : Int64   = -123456789012345;
+  uInt8Field     @6  : UInt8   = 234;
+  uInt16Field    @7  : UInt16  = 45678;
+  uInt32Field    @8  : UInt32  = 3456789012;
+  uInt64Field    @9  : UInt64  = 12345678901234567890;
+  float32Field   @10 : Float32 = 1234.5;
+  float64Field   @11 : Float64 = -123e45;
+  textField      @12 : Text    = "foo";
+  dataField      @13 : Data    = 0x"62 61 72"; # "bar"
+  structField    @14 : TestAllTypes = (
+    voidField      = void,
+    boolField      = true,
+    int8Field      = -12,
+    int16Field     = 3456,
+    int32Field     = -78901234,
+    int64Field     = 56789012345678,
+    uInt8Field     = 90,
+    uInt16Field    = 1234,
+    uInt32Field    = 56789012,
+    uInt64Field    = 345678901234567890,
+    float32Field   = -1.25e-10,
+    float64Field   = 345,
+    textField      = "baz",
+    dataField      = "qux",
+    structField    = (
+      textField = "nested",
+      structField = (textField = "really nested")),
+    enumField      = baz,
+    # interfaceField can't have a default
+
+    voidList      = [void, void, void],
+    boolList      = [false, true, false, true, true],
+    int8List      = [12, -34, -0x80, 0x7f],
+    int16List     = [1234, -5678, -0x8000, 0x7fff],
+    int32List     = [12345678, -90123456, -0x80000000, 0x7fffffff],
+    int64List     = [
+      123456789012345, -678901234567890, 
+      -0x8000000000000000, 0x7fffffffffffffff],
+    uInt8List     = [12, 34, 0, 0xff],
+    uInt16List    = [1234, 5678, 0, 0xffff],
+    uInt32List    = [12345678, 90123456, 0, 0xffffffff],
+    uInt64List    = [123456789012345, 678901234567890, 0, 0xffffffffffffffff],
+    float32List   = [0, 1234567, 1e37, -1e37, 1e-37, -1e-37],
+    float64List   = [0, 123456789012345, 1e306, -1e306, 1e-306, -1e-306],
+    textList      = ["quux", "corge", "grault"],
+    dataList      = ["garply", "waldo", "fred"],
+    structList    = [
+      (textField = "x " "structlist"
+                    " 1"),
+      (textField = "x structlist 2"),
+      (textField = "x structlist 3")],
+    enumList      = [qux, bar, grault]
+    # interfaceList can't have a default
+  );
+  enumField      @15 : TestEnum = corge;
+  interfaceField @16 : Void;  # TODO
+
+  voidList      @17 : List(Void)    = [void, void, void, void, void, void];
+  boolList      @18 : List(Bool)    = [true, false, false, true];
+  int8List      @19 : List(Int8)    = [111, -111];
+  int16List     @20 : List(Int16)   = [11111, -11111];
+  int32List     @21 : List(Int32)   = [111111111, -111111111];
+  int64List     @22 : List(Int64)   = [1111111111111111111, -1111111111111111111];
+  uInt8List     @23 : List(UInt8)   = [111, 222] ;
+  uInt16List    @24 : List(UInt16)  = [33333, 44444];
+  uInt32List    @25 : List(UInt32)  = [3333333333];
+  uInt64List    @26 : List(UInt64)  = [11111111111111111111];
+  float32List   @27 : List(Float32) = [5555.5, inf, -inf, nan];
+  float64List   @28 : List(Float64) = [7777.75, inf, -inf, nan];
+  textList      @29 : List(Text)    = ["plugh", "xyzzy", "thud"];
+  dataList      @30 : List(Data)    = ["oops", "exhausted", "rfc3092"];
+  structList    @31 : List(TestAllTypes) = [
+    (textField = "structlist 1"),
+    (textField = "structlist 2"),
+    (textField = "structlist 3")];
+  enumList      @32 : List(TestEnum) = [foo, garply];
+  interfaceList @33 : List(Void);  # TODO
+}
+
+struct TestAnyPointer {
+  anyPointerField @0 :AnyPointer;
+
+  # Do not add any other fields here!  
+  # Some tests rely on anyPointerField being the last pointer
+  # in the struct.
+}
+
+struct TestAnyOthers {
+  anyStructField @0 :AnyStruct;
+  anyListField @1 :AnyList;
+  capabilityField @2 :Capability;
+}
+
+struct TestOutOfOrder {
+  foo @3 :Text;
+  bar @2 :Text;
+  baz @8 :Text;
+  qux @0 :Text;
+  quux @6 :Text;
+  corge @4 :Text;
+  grault @1 :Text;
+  garply @7 :Text;
+  waldo @5 :Text;
+}
+
+struct TestUnion {
+  union0 @0! :union {
+    # Pack union 0 under ideal conditions: there is no unused padding space prior to it.
+    u0f0s0  @4: Void;
+    u0f0s1  @5: Bool;
+    u0f0s8  @6: Int8;
+    u0f0s16 @7: Int16;
+    u0f0s32 @8: Int32;
+    u0f0s64 @9: Int64;
+    u0f0sp  @10: Text;
+
+    # Pack more stuff into union0 -- should go in same space.
+    u0f1s0  @11: Void;
+    u0f1s1  @12: Bool;
+    u0f1s8  @13: Int8;
+    u0f1s16 @14: Int16;
+    u0f1s32 @15: Int32;
+    u0f1s64 @16: Int64;
+    u0f1sp  @17: Text;
+  }
+
+  # Pack one bit in order to make pathological situation for union1.
+  bit0 @18: Bool;
+
+  union1 @1! :union {
+    # Pack pathologically bad case.  Each field takes up new space.
+    u1f0s0  @19: Void;
+    u1f0s1  @20: Bool;
+    u1f1s1  @21: Bool;
+    u1f0s8  @22: Int8;
+    u1f1s8  @23: Int8;
+    u1f0s16 @24: Int16;
+    u1f1s16 @25: Int16;
+    u1f0s32 @26: Int32;
+    u1f1s32 @27: Int32;
+    u1f0s64 @28: Int64;
+    u1f1s64 @29: Int64;
+    u1f0sp  @30: Text;
+    u1f1sp  @31: Text;
+
+    # Pack more stuff into union1
+    # each should go into the same space as corresponding u1f0s*.
+    u1f2s0  @32: Void;
+    u1f2s1  @33: Bool;
+    u1f2s8  @34: Int8;
+    u1f2s16 @35: Int16;
+    u1f2s32 @36: Int32;
+    u1f2s64 @37: Int64;
+    u1f2sp  @38: Text;
+  }
+
+  # Fill in the rest of that bitfield from earlier.
+  bit2 @39: Bool;
+  bit3 @40: Bool;
+  bit4 @41: Bool;
+  bit5 @42: Bool;
+  bit6 @43: Bool;
+  bit7 @44: Bool;
+
+  # Interleave two unions to be really annoying.
+  # Also declare in reverse order to make sure 
+  # union discriminant values are sorted by field number and not by declaration order.
+  union2 @2! :union {
+    u2f0s64 @54: Int64;
+    u2f0s32 @52: Int32;
+    u2f0s16 @50: Int16;
+    u2f0s8 @47: Int8;
+    u2f0s1 @45: Bool;
+  }
+
+  union3 @3! :union {
+    u3f0s64 @55: Int64;
+    u3f0s32 @53: Int32;
+    u3f0s16 @51: Int16;
+    u3f0s8 @48: Int8;
+    u3f0s1 @46: Bool;
+  }
+
+  byte0 @49: UInt8;
+}
+
+struct TestUnnamedUnion {
+  before @0 :Text;
+
+  union {
+    foo @1 :UInt16;
+    bar @3 :UInt32;
+  }
+
+  middle @2 :UInt16;
+
+  after @4 :Text;
+}
+
+struct TestUnionInUnion {
+  # There is no reason to ever do this.
+  outer :union {
+    inner :union {
+      foo @0 :Int32;
+      bar @1 :Int32;
+    }
+    baz @2 :Int32;
+  }
+}
+
+struct TestGroups {
+  groups :union {
+    foo :group {
+      corge @0 :Int32;
+      grault @2 :Int64;
+      garply @8 :Text;
+    }
+    bar :group {
+      corge @3 :Int32;
+      grault @4 :Text;
+      garply @5 :Int64;
+    }
+    baz :group {
+      corge @1 :Int32;
+      grault @6 :Text;
+      garply @7 :Text;
+    }
+  }
+}
+
+struct TestInterleavedGroups {
+  group1 :group {
+    foo @0 :UInt32;
+    bar @2 :UInt64;
+    union {
+      qux @4 :UInt16;
+      corge :group {
+        grault @6 :UInt64;
+        garply @8 :UInt16;
+        plugh @14 :Text;
+        xyzzy @16 :Text;
+      }
+
+      fred @12 :Text;
+    }
+
+    waldo @10 :Text;
+  }
+
+  group2 :group {
+    foo @1 :UInt32;
+    bar @3 :UInt64;
+    union {
+      qux @5 :UInt16;
+      corge :group {
+        grault @7 :UInt64;
+        garply @9 :UInt16;
+        plugh @15 :Text;
+        xyzzy @17 :Text;
+      }
+
+      fred @13 :Text;
+    }
+
+    waldo @11 :Text;
+  }
+}
+
+struct TestUnionDefaults {
+  s16s8s64s8Set @0 :TestUnion =
+    (union0 = (u0f0s16 = 321), union1 = (u1f0s8 = 123), union2 = (u2f0s64 = 12345678901234567),
+     union3 = (u3f0s8 = 55));
+  s0sps1s32Set @1 :TestUnion =
+    (union0 = (u0f1s0 = void), union1 = (u1f0sp = "foo"), union2 = (u2f0s1 = true),
+     union3 = (u3f0s32 = 12345678));
+
+  unnamed1 @2 :TestUnnamedUnion = (foo = 123);
+  unnamed2 @3 :TestUnnamedUnion = (bar = 321, before = "foo", after = "bar");
+}
+
+struct TestNestedTypes {
+  enum NestedEnum {
+    foo @0;
+    bar @1;
+  }
+
+  struct NestedStruct {
+    enum NestedEnum {
+      baz @0;
+      qux @1;
+      quux @2;
+    }
+
+    outerNestedEnum @0 :TestNestedTypes.NestedEnum = bar;
+    innerNestedEnum @1 :NestedEnum = quux;
+  }
+
+  nestedStruct @0 :NestedStruct;
+
+  outerNestedEnum @1 :NestedEnum = bar;
+  innerNestedEnum @2 :NestedStruct.NestedEnum = quux;
+}
+
+struct TestUsing {
+  using OuterNestedEnum = TestNestedTypes.NestedEnum;
+  using TestNestedTypes.NestedStruct.NestedEnum;
+
+  outerNestedEnum @1 :OuterNestedEnum = bar;
+  innerNestedEnum @0 :NestedEnum = quux;
+}
+
+struct TestLists {
+  # Small structs, when encoded as list, will be encoded as primitive lists rather than struct
+  # lists, to save space.
+  struct Struct0  { f @0 :Void; }
+  struct Struct1  { f @0 :Bool; }
+  struct Struct8  { f @0 :UInt8; }
+  struct Struct16 { f @0 :UInt16; }
+  struct Struct32 { f @0 :UInt32; }
+  struct Struct64 { f @0 :UInt64; }
+  struct StructP  { f @0 :Text; }
+
+  # Versions of the above which cannot be encoded as primitive lists.
+  struct Struct0c  { f @0 :Void; pad @1 :Text; }
+  struct Struct1c  { f @0 :Bool; pad @1 :Text; }
+  struct Struct8c  { f @0 :UInt8; pad @1 :Text; }
+  struct Struct16c { f @0 :UInt16; pad @1 :Text; }
+  struct Struct32c { f @0 :UInt32; pad @1 :Text; }
+  struct Struct64c { f @0 :UInt64; pad @1 :Text; }
+  struct StructPc  { f @0 :Text; pad @1 :UInt64; }
+
+  list0  @0 :List(Struct0);
+  list1  @1 :List(Struct1);
+  list8  @2 :List(Struct8);
+  list16 @3 :List(Struct16);
+  list32 @4 :List(Struct32);
+  list64 @5 :List(Struct64);
+  listP  @6 :List(StructP);
+
+  int32ListList @7 :List(List(Int32));
+  textListList @8 :List(List(Text));
+  structListList @9 :List(List(TestAllTypes));
+}
+
+struct TestFieldZeroIsBit {
+  bit @0 :Bool;
+  secondBit @1 :Bool = true;
+  thirdField @2 :UInt8 = 123;
+}
+
+struct TestListDefaults {
+  lists @0 :TestLists = (
+    list0  = [(f = void), (f = void)],
+    list1  = [(f = true), (f = false), (f = true), (f = true)],
+    list8  = [(f = 123), (f = 45)],
+    list16 = [(f = 12345), (f = 6789)],
+    list32 = [(f = 123456789), (f = 234567890)],
+    list64 = [(f = 1234567890123456), (f = 2345678901234567)],
+    listP  = [(f = "foo"), (f = "bar")],
+    int32ListList = [[1, 2, 3], [4, 5], [12341234]],
+    textListList = [["foo", "bar"], ["baz"], ["qux", "corge"]],
+    structListList = [[(int32Field = 123), (int32Field = 456)], [(int32Field = 789)]]);
+}
+
+struct TestLateUnion {
+  # Test what happens if the unions are not the first ordinals in the struct.  
+  # At one point this was broken for the dynamic API.
+
+  foo @0 :Int32;
+  bar @1 :Text;
+  baz @2 :Int16;
+
+  theUnion @3! :union {
+    qux @4 :Text;
+    corge @5 :List(Int32);
+    grault @6 :Float32;
+  }
+
+  anotherUnion @7! :union {
+    qux @8 :Text;
+    corge @9 :List(Int32);
+    grault @10 :Float32;
+  }
+}
+
+struct TestOldVersion {
+  # A subset of TestNewVersion.
+  old1 @0 :Int64;
+  old2 @1 :Text;
+  old3 @2 :TestOldVersion;
+}
+
+struct TestNewVersion {
+  # A superset of TestOldVersion.
+  old1 @0 :Int64;
+  old2 @1 :Text;
+  old3 @2 :TestNewVersion;
+  new1 @3 :Int64 = 987;
+  new2 @4 :Text = "baz";
+}
+
+struct TestOldUnionVersion {
+  union {
+    a @0 :Void;
+    b @1 :UInt64;
+  }
+}
+
+struct TestNewUnionVersion {
+  union {
+    a :union {
+      a0 @0 :Void;
+      a1 @2 :UInt64;
+    }
+    b @1 :UInt64;
+  }
+}
+
+struct TestStructUnion {
+  un @0! :union {
+    struct @1 :SomeStruct;
+    object @2 :TestAnyPointer;
+  }
+
+  struct SomeStruct {
+    someText @0 :Text;
+    moreText @1 :Text;
+  }
+}
+
+struct TestPrintInlineStructs {
+  someText @0 :Text;
+
+  structList @1 :List(InlineStruct);
+  struct InlineStruct {
+    int32Field @0 :Int32;
+    textField @1 :Text;
+  }
+}
+
+struct TestWholeFloatDefault {
+  # At one point, these failed to compile in C++ because it would produce literals like "123f",
+  # which is not valid; it needs to be "123.0f".
+  field @0 :Float32 = 123;
+  bigField @1 :Float32 = 2e30;
+  const constant :Float32 = 456;
+  const bigConstant :Float32 = 4e30;
+}
+
+struct TestGenerics(Foo, Bar) {
+  foo @0 :Foo;
+  rev @1 :TestGenerics(Bar, Foo);
+
+  union {
+    uv @2:Void;
+    ug :group {
+      ugfoo @3:Int32;
+    }
+  }
+
+  list @4 :List(Inner);
+  # At one time this failed to compile with MSVC due to poor expression SFINAE support.
+
+  struct Inner {
+    foo @0 :Foo;
+    bar @1 :Bar;
+  }
+
+  struct Inner2(Baz) {
+    bar @0 :Bar;
+    baz @1 :Baz;
+    innerBound @2 :Inner;
+    innerUnbound @3 :TestGenerics.Inner;
+
+    struct DeepNest(Qux) {
+      foo @0 :Foo;
+      bar @1 :Bar;
+      baz @2 :Baz;
+      qux @3 :Qux;
+
+      interface DeepNestInterface(Quux) {
+        # At one time this failed to compile.
+        call @0 () -> ();
+      }
+    }
+  }
+
+  interface Interface(Qux) {
+    call @0 Inner2(Text) -> (qux :Qux, gen :TestGenerics(TestAllTypes, TestAnyPointer));
+  }
+
+  annotation ann(struct) :Foo;
+
+  using AliasFoo = Foo;
+  using AliasInner = Inner;
+  using AliasInner2 = Inner2;
+  using AliasInner2Text = Inner2(Text);
+  using AliasRev = TestGenerics(Bar, Foo);
+
+  struct UseAliases {
+    foo @0 :AliasFoo;
+    inner @1 :AliasInner;
+    inner2 @2 :AliasInner2;
+    inner2Bind @3 :AliasInner2(Text);
+    inner2Text @4 :AliasInner2Text;
+    revFoo @5 :AliasRev.AliasFoo;
+  }
+}
+
+struct BoxedText { text @0 :Text; }
+using BrandedAlias = TestGenerics(BoxedText, Text);
+
+struct TestGenericsWrapper(Foo, Bar) {
+  value @0 :TestGenerics(Foo, Bar);
+}
+
+struct TestGenericsWrapper2 {
+  value @0 :TestGenericsWrapper(Text, TestAllTypes);
+}
+
+interface TestImplicitMethodParams {
+  call @0 [T, U] (foo :T, bar :U) -> TestGenerics(T, U);
+}
+
+interface TestImplicitMethodParamsInGeneric(V) {
+  call @0 [T, U] (foo :T, bar :U) -> TestGenerics(T, U);
+}
+
+struct TestGenericsUnion(Foo, Bar) {
+  # At one point this failed to compile.
+
+  union {
+    foo @0 :Foo;
+    bar @1 :Bar;
+  }
+}
+
+struct TestUseGenerics $TestGenerics(Text, Data).ann("foo") {
+  basic @0 :TestGenerics(TestAllTypes, TestAnyPointer);
+  inner @1 :TestGenerics(TestAllTypes, TestAnyPointer).Inner;
+  inner2 @2 :TestGenerics(TestAllTypes, TestAnyPointer).Inner2(Text);
+  unspecified @3 :TestGenerics;
+  unspecifiedInner @4 :TestGenerics.Inner2(Text);
+  wrapper @8 :TestGenericsWrapper(TestAllTypes, TestAnyPointer);
+  cap @18 :TestGenerics(TestInterface, Text);
+  genericCap @19 :TestGenerics(TestAllTypes, List(UInt32)).Interface(Data);
+
+  default @5 :TestGenerics(TestAllTypes, Text) =
+    (foo = (int16Field = 123), rev = (foo = "text", rev = (foo = (int16Field = 321))));
+  defaultInner @6 :TestGenerics(TestAllTypes, Text).Inner =
+    (foo = (int16Field = 123), bar = "text");
+  defaultUser @7 :TestUseGenerics = (basic = (foo = (int16Field = 123)));
+  defaultWrapper @9 :TestGenericsWrapper(Text, TestAllTypes) =
+    (value = (foo = "text", rev = (foo = (int16Field = 321))));
+  defaultWrapper2 @10 :TestGenericsWrapper2 =
+    (value = (value = (foo = "text", rev = (foo = (int16Field = 321)))));
+
+  aliasFoo @11 :TestGenerics(TestAllTypes, TestAnyPointer).AliasFoo = (int16Field = 123);
+  aliasInner @12 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner
+    = (foo = (int16Field = 123));
+  aliasInner2 @13 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner2
+    = (innerBound = (foo = (int16Field = 123)));
+  aliasInner2Bind @14 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner2(List(UInt32))
+    = (baz = [12, 34], innerBound = (foo = (int16Field = 123)));
+  aliasInner2Text @15 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner2Text
+    = (baz = "text", innerBound = (foo = (int16Field = 123)));
+  aliasRev @16 :TestGenerics(TestAnyPointer, Text).AliasRev.AliasFoo = "text";
+
+  useAliases @17 :TestGenerics(TestAllTypes, List(UInt32)).UseAliases = (
+    foo = (int16Field = 123),
+    inner = (foo = (int16Field = 123)),
+    inner2 = (innerBound = (foo = (int16Field = 123))),
+    inner2Bind = (baz = "text", innerBound = (foo = (int16Field = 123))),
+    inner2Text = (baz = "text", innerBound = (foo = (int16Field = 123))),
+    revFoo = [12, 34, 56]);
+}
+
+struct TestEmptyStruct {}
+
+struct TestConstants {
+  const voidConst      :Void    = void;
+  const boolConst      :Bool    = true;
+  const int8Const      :Int8    = -123;
+  const int16Const     :Int16   = -12345;
+  const int32Const     :Int32   = -12345678;
+  const int64Const     :Int64   = -123456789012345;
+  const uint8Const     :UInt8   = 234;
+  const uint16Const    :UInt16  = 45678;
+  const uint32Const    :UInt32  = 3456789012;
+  const uint64Const    :UInt64  = 12345678901234567890;
+  const float32Const   :Float32 = 1234.5;
+  const float64Const   :Float64 = -123e45;
+  const textConst      :Text    = "foo";
+  const dataConst      :Data    = "bar";
+  const structConst    :TestAllTypes = (
+    voidField      = void,
+    boolField      = true,
+    int8Field      = -12,
+    int16Field     = 3456,
+    int32Field     = -78901234,
+    int64Field     = 56789012345678,
+    uInt8Field     = 90,
+    uInt16Field    = 1234,
+    uInt32Field    = 56789012,
+    uInt64Field    = 345678901234567890,
+    float32Field   = -1.25e-10,
+    float64Field   = 345,
+    textField      = "baz",
+    dataField      = "qux",
+    structField    = (
+      textField = "nested",
+      structField = (textField = "really nested")),
+    enumField      = baz,
+    # interfaceField can't have a default
+
+    voidList      = [void, void, void],
+    boolList      = [false, true, false, true, true],
+    int8List      = [12, -34, -0x80, 0x7f],
+    int16List     = [1234, -5678, -0x8000, 0x7fff],
+    int32List     = [12345678, -90123456, -0x80000000, 0x7fffffff],
+    int64List     = [
+      123456789012345, 
+      -678901234567890, 
+      -0x8000000000000000, 
+      0x7fffffffffffffff],
+    uInt8List     = [12, 34, 0, 0xff],
+    uInt16List    = [1234, 5678, 0, 0xffff],
+    uInt32List    = [12345678, 90123456, 0, 0xffffffff],
+    uInt64List    = [123456789012345, 678901234567890, 0, 0xffffffffffffffff],
+    float32List   = [0, 1234567, 1e37, -1e37, 1e-37, -1e-37],
+    float64List   = [0, 123456789012345, 1e306, -1e306, 1e-306, -1e-306],
+    textList      = ["quux", "corge", "grault"],
+    dataList      = ["garply", "waldo", "fred"],
+    structList    = [
+      (textField = "x " "structlist"
+                    " 1"),
+      (textField = "x structlist 2"),
+      (textField = "x structlist 3")],
+    enumList      = [qux, bar, grault]
+    # interfaceList can't have a default
+  );
+  const enumConst      :TestEnum = corge;
+
+  const voidListConst      :List(Void)    = [void, void, void, void, void, void];
+  const boolListConst      :List(Bool)    = [true, false, false, true];
+  const int8ListConst      :List(Int8)    = [111, -111];
+  const int16ListConst     :List(Int16)   = [11111, -11111];
+  const int32ListConst     :List(Int32)   = [111111111, -111111111];
+  const int64ListConst     :List(Int64)   = [1111111111111111111, -1111111111111111111];
+  const uint8ListConst     :List(UInt8)   = [111, 222] ;
+  const uint16ListConst    :List(UInt16)  = [33333, 44444];
+  const uint32ListConst    :List(UInt32)  = [3333333333];
+  const uint64ListConst    :List(UInt64)  = [11111111111111111111];
+  const float32ListConst   :List(Float32) = [5555.5, inf, -inf, nan];
+  const float64ListConst   :List(Float64) = [7777.75, inf, -inf, nan];
+  const textListConst      :List(Text)    = ["plugh", "xyzzy", "thud"];
+  const dataListConst      :List(Data)    = ["oops", "exhausted", "rfc3092"];
+  const structListConst    :List(TestAllTypes) = [
+    (textField = "structlist 1"),
+    (textField = "structlist 2"),
+    (textField = "structlist 3")];
+  const enumListConst      :List(TestEnum) = [foo, garply];
+}
+
+const globalInt :UInt32 = 12345;
+const globalText :Text = "foobar";
+const globalStruct :TestAllTypes = (int32Field = 54321);
+const globalPrintableStruct :TestPrintInlineStructs = (someText = "foo");
+const derivedConstant :TestAllTypes = (
+  uInt32Field = .globalInt,
+  textField = TestConstants.textConst,
+  structField = TestConstants.structConst,
+  int16List = TestConstants.int16ListConst,
+  structList = TestConstants.structListConst);
+
+const genericConstant :TestGenerics(TestAllTypes, Text) =
+  (foo = (int16Field = 123), rev = (foo = "text", rev = (foo = (int16Field = 321))));
+
+const embeddedData :Data = embed "testdata/packed";
+const embeddedText :Text = embed "testdata/short.txt";
+const embeddedStruct :TestAllTypes = embed "testdata/binary";
+
+const nonAsciiText :Text = "♫ é ✓";
+
+const blockText :Text =
+  `foo bar baz
+  `"qux" `corge` 'grault'
+  "regular\"quoted\"line"
+  `garply\nwaldo\tfred\"plugh\"xyzzy\'thud
+  ;
+
+struct TestAnyPointerConstants {
+  anyKindAsStruct @0 :AnyPointer;
+  anyStructAsStruct @1 :AnyStruct;
+  anyKindAsList @2 :AnyPointer;
+  anyListAsList @3 :AnyList;
+}
+
+const anyPointerConstants :TestAnyPointerConstants = (
+  anyKindAsStruct = TestConstants.structConst,
+  anyStructAsStruct = TestConstants.structConst,
+  anyKindAsList = TestConstants.int32ListConst,
+  anyListAsList = TestConstants.int32ListConst,
+);
+
+struct TestListOfAny {
+  capList @0 :List(Capability);
+  #listList @1 :List(AnyList); 
+  # TODO(0.10): Make List(AnyList) work correctly in C++ generated code.
+}
+
+interface TestInterface {
+  foo @0 (i :UInt32, j :Bool) -> (x :Text);
+  bar @1 () -> ();
+  baz @2 (s: TestAllTypes);
+}
+
+interface TestExtends extends(TestInterface) {
+  qux @0 ();
+  corge @1 TestAllTypes -> ();
+  grault @2 () -> TestAllTypes;
+}
+
+interface TestExtends2 extends(TestExtends) {}
+
+interface TestPipeline {
+  getCap @0 (n: UInt32, inCap :TestInterface) -> (s: Text, outBox :Box);
+  testPointers @1 (cap :TestInterface, obj :AnyPointer, list :List(TestInterface)) -> ();
+  getAnyCap @2 (n: UInt32, inCap :Capability) -> (s: Text, outBox :AnyBox);
+
+  getCapPipelineOnly @3 () -> (outBox :Box);
+  # Never returns, but uses setPipeline() to make the pipeline work.
+
+  struct Box {
+    cap @0 :TestInterface;
+  }
+  struct AnyBox {
+    cap @0 :Capability;
+  }
+}
+
+interface TestCallOrder {
+  getCallSequence @0 (expected: UInt32) -> (n: UInt32);
+  # First call returns 0, next returns 1, ...
+  #
+  # The input `expected` is ignored but useful for disambiguating debug logs.
+}
+
+interface TestTailCallee $Cxx.allowCancellation {
+  struct TailResult {
+    i @0 :UInt32;
+    t @1 :Text;
+    c @2 :TestCallOrder;
+  }
+
+  foo @0 (i :Int32, t :Text) -> TailResult;
+}
+
+interface TestTailCaller {
+  foo @0 (i :Int32, callee :TestTailCallee) -> TestTailCallee.TailResult;
+}
+
+interface TestStreaming $Cxx.allowCancellation {
+  doStreamI @0 (i :UInt32) -> stream;
+  doStreamJ @1 (j :UInt32) -> stream;
+  finishStream @2 () -> (totalI :UInt32, totalJ :UInt32);
+  # Test streaming. finishStream() returns 
+  # the totals of the values streamed to the other calls.
+}
+
+interface TestHandle {}
+
+interface TestMoreStuff extends(TestCallOrder) {
+  # Catch-all type that contains lots of testing methods.
+
+  callFoo @0 (cap :TestInterface) -> (s: Text);
+  # Call `cap.foo()`, check the result, and return "bar".
+
+  callFooWhenResolved @1 (cap :TestInterface) -> (s: Text);
+  # Like callFoo but waits for `cap` to resolve first.
+
+  neverReturn @2 (cap :TestInterface) -> (capCopy :TestInterface) $Cxx.allowCancellation;
+  # Doesn't return.  You should cancel it.
+
+  hold @3 (cap :TestInterface) -> ();
+  # Returns immediately but holds on to the capability.
+
+  callHeld @4 () -> (s: Text);
+  # Calls the capability previously held using `hold` (and keeps holding it).
+
+  getHeld @5 () -> (cap :TestInterface);
+  # Returns the capability previously held using `hold` (and keeps holding it).
+
+  echo @6 (cap :TestCallOrder) -> (cap :TestCallOrder);
+  # Just returns the input cap.
+
+  expectCancel @7 (cap :TestInterface) -> () $Cxx.allowCancellation;
+  # evalLater()-loops forever, holding `cap`.  Must be canceled.
+
+  methodWithDefaults @8 (
+    a :Text, 
+    b :UInt32 = 123, 
+    c :Text = "foo"
+  ) -> (d :Text, e :Text = "bar");
+
+  methodWithNullDefault @12 (a :Text, b :TestInterface = null);
+
+  getHandle @9 () -> (handle :TestHandle);
+  # Get a new handle. Tests have an out-of-band way to check
+  # the current number of live handles, so this can be used to test garbage collection.
+
+  getNull @10 () -> (nullCap :TestMoreStuff);
+  # Always returns a null capability.
+
+  getEnormousString @11 () -> (str :Text);
+  # Attempts to return an 100MB string. Should always fail.
+
+  writeToFd @13 (fdCap1 :TestInterface, fdCap2 :TestInterface)
+             -> (fdCap3 :TestInterface, secondFdPresent :Bool);
+  # Expects fdCap1 and fdCap2 wrap socket file descriptors.
+  # Writes "foo" to the first and "bar" to the second. 
+  # Also creates a socketpair, writes "baz" to one end, and returns the other end.
+
+  throwException @14 ();
+  throwRemoteException @15 ();
+}
+
+interface TestMembrane {
+  makeThing @0 () -> (thing :Thing);
+  callPassThrough @1 (thing :Thing, tailCall :Bool) -> Result;
+  callIntercept @2 (thing :Thing, tailCall :Bool) -> Result;
+  loopback @3 (thing :Thing) -> (thing :Thing);
+
+  waitForever @4 () $Cxx.allowCancellation;
+
+  interface Thing {
+    passThrough @0 () -> Result;
+    intercept @1 () -> Result;
+  }
+
+  struct Result {
+    text @0 :Text;
+  }
+}
+
+struct TestContainMembrane {
+  cap @0 :TestMembrane.Thing;
+  list @1 :List(TestMembrane.Thing);
+}
+
+struct TestTransferCap {
+  list @0 :List(Element);
+  struct Element {
+    text @0 :Text;
+    cap @1 :TestInterface;
+  }
+}
+
+interface TestKeywordMethods {
+  delete @0 ();
+  class @1 ();
+  void @2 ();
+  return @3 ();
+}
+
+interface TestAuthenticatedBootstrap(VatId) {
+  getCallerId @0 () -> (caller :VatId);
+}
+
+struct TestSturdyRef {
+  hostId @0 :TestSturdyRefHostId;
+  objectId @1 :AnyPointer;
+}
+
+struct TestSturdyRefHostId {
+  host @0 :Text;
+}
+
+struct TestSturdyRefObjectId {
+  tag @0 :Tag;
+  enum Tag {
+    testInterface @0;
+    testExtends @1;
+    testPipeline @2;
+    testTailCallee @3;
+    testTailCaller @4;
+    testMoreStuff @5;
+  }
+}
+
+struct TestProvisionId {}
+struct TestRecipientId {}
+struct TestThirdPartyCapId {}
+struct TestJoinResult {}
+
+struct TestNameAnnotation $Cxx.name("RenamedStruct") {
+  union {
+    badFieldName @0 :Bool $Cxx.name("goodFieldName");
+    bar @1 :Int8;
+  }
+
+  enum BadlyNamedEnum $Cxx.name("RenamedEnum") {
+    foo @0;
+    bar @1;
+    baz @2 $Cxx.name("qux");
+  }
+
+  anotherBadFieldName @2 :BadlyNamedEnum $Cxx.name("anotherGoodFieldName");
+
+  struct NestedStruct $Cxx.name("RenamedNestedStruct") {
+    badNestedFieldName @0 :Bool $Cxx.name("goodNestedFieldName");
+    anotherBadNestedFieldName @1 :NestedStruct $Cxx.name("anotherGoodNestedFieldName");
+
+    enum DeeplyNestedEnum $Cxx.name("RenamedDeeplyNestedEnum") {
+      quux @0;
+      corge @1;
+      grault @2 $Cxx.name("garply");
+    }
+  }
+
+  badlyNamedUnion :union $Cxx.name("renamedUnion") {
+    badlyNamedGroup :group $Cxx.name("renamedGroup") {
+      foo @3 :Void;
+      bar @4 :Void;
+    }
+    baz @5 :NestedStruct $Cxx.name("qux");
+  }
+}
+
+interface TestNameAnnotationInterface $Cxx.name("RenamedInterface") {
+  badlyNamedMethod @0 (
+    badlyNamedParam :UInt8 $Cxx.name("renamedParam")
+  ) $Cxx.name("renamedMethod");
+}
+
+struct TestImpliedFirstField {
+  struct TextStruct {
+    text @0 :Text;
+    i @1 :UInt32 = 321;
+  }
+
+  textStruct @0 :TextStruct = "foo";
+  textStructList @1 :List(TextStruct);
+
+  intGroup :group {
+    i @2 :UInt32;
+    str @3 :Text = "corge";
+  }
+}
+
+const testImpliedFirstField :TestImpliedFirstField = (
+  textStruct = "bar",
+  textStructList = ["baz", (text = "qux", i = 123)],
+  intGroup = 123
+);
+
+struct TestCycleANoCaps {
+  foo @0 :TestCycleBNoCaps;
+}
+
+struct TestCycleBNoCaps {
+  foo @0 :List(TestCycleANoCaps);
+  bar @1 :TestAllTypes;
+}
+
+struct TestCycleAWithCaps {
+  foo @0 :TestCycleBWithCaps;
+}
+
+struct TestCycleBWithCaps {
+  foo @0 :List(TestCycleAWithCaps);
+  bar @1 :TestInterface;
+}
diff --git a/tests/indent/capnp_spec.lua b/tests/indent/capnp_spec.lua
new file mode 100644
index 000000000..7c8418b06
--- /dev/null
+++ b/tests/indent/capnp_spec.lua
@@ -0,0 +1,30 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/capnp", {
+  tabstop = 2,
+  shiftwidth = 2,
+  expandtab = true,
+})
+
+describe("indent Cap'n Proto:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("test.capnp", { on_line = 31, text = "foo @0;", indent = 2 })
+    run:new_line("test.capnp", { on_line = 96, text = "boolField      = true,", indent = 4 })
+    run:new_line("test.capnp", { on_line = 340, text = "grault @7 :UInt64;", indent = 8 })
+    run:new_line("test.capnp", {
+      on_line = 573,
+      text = "call @0 Inner2(Text) -> (qux :Qux, gen :TestGenerics(TestAllTypes, TestAnyPointer));",
+      indent = 4,
+    })
+    run:new_line("test.capnp", { on_line = 617, text = "foo @0 :Foo;", indent = 4 })
+    run:new_line("test.capnp", { on_line = 654, text = "foo = (int16Field = 123),", indent = 4 })
+    run:new_line("test.capnp", { on_line = 695, text = 'textField = "nested",', indent = 6 })
+    run:new_line("test.capnp", { on_line = 970, text = "testTailCaller @4;", indent = 4 })
+  end)
+end)
diff --git a/tests/query/highlights/capnp/test.capnp b/tests/query/highlights/capnp/test.capnp
new file mode 100644
index 000000000..9ba376c7d
--- /dev/null
+++ b/tests/query/highlights/capnp/test.capnp
@@ -0,0 +1,633 @@
+# Copyright (c) 2013-2014 Sandstorm Development Group, Inc. and contributors
+# Licensed under the MIT License:
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+@0xd508eebdc2dc42b8;
+# <- @preproc
+#                  ^ @punctuation.delimiter
+
+using Cxx = import "c++.capnp";
+# <- @include
+#     ^^^ @type
+#         ^ @operator
+#           ^^^^^^ @include
+#                  ^^^^^^^^^^^ @string
+
+# Use a namespace likely to cause trouble if the generated code doesn't use fully-qualified
+# names for stuff in the capnproto namespace.
+$Cxx.namespace("capnproto_test::capnp::test");
+
+enum TestEnum {
+# <- @keyword
+#    ^^^^^^^^ @type
+  foo @0;
+# ^^^ @constant
+#     ^^ @label
+  bar @1;
+  baz @2;
+  qux @3;
+  quux @4;
+  corge @5;
+  grault @6;
+  garply @7;
+}
+# <- @punctuation.bracket
+
+struct TestAllTypes {
+# <- @keyword
+  voidField      @0  : Void;
+# ^^^^^^^^^ @field
+#                    ^ @punctuation.special
+#                      ^^^^ @type.builtin
+  boolField      @1  : Bool;
+  int8Field      @2  : Int8;
+  int16Field     @3  : Int16;
+  int32Field     @4  : Int32;
+  int64Field     @5  : Int64;
+  uInt8Field     @6  : UInt8;
+  uInt16Field    @7  : UInt16;
+  uInt32Field    @8  : UInt32;
+  uInt64Field    @9  : UInt64;
+  float32Field   @10 : Float32;
+  float64Field   @11 : Float64;
+  textField      @12 : Text;
+  dataField      @13 : Data;
+  structField    @14 : TestAllTypes;
+  enumField      @15 : TestEnum;
+  interfaceField @16 : Void;  # TODO
+
+  voidList      @17 : List(Void);
+  boolList      @18 : List(Bool);
+  int8List      @19 : List(Int8);
+  int16List     @20 : List(Int16);
+  int32List     @21 : List(Int32);
+  int64List     @22 : List(Int64);
+  uInt8List     @23 : List(UInt8);
+  uInt16List    @24 : List(UInt16);
+  uInt32List    @25 : List(UInt32);
+  uInt64List    @26 : List(UInt64);
+  float32List   @27 : List(Float32);
+  float64List   @28 : List(Float64);
+  textList      @29 : List(Text);
+  dataList      @30 : List(Data);
+  structList    @31 : List(TestAllTypes);
+  enumList      @32 : List(TestEnum);
+  interfaceList @33 : List(Void);  # TODO
+}
+
+struct TestInterleavedGroups {
+  group1 :group {
+    foo @0 :UInt32;
+    bar @2 :UInt64;
+    union {
+#   ^^^^^ @keyword
+      qux @4 :UInt16;
+      corge :group {
+#     ^^^^^ @type
+        grault @6 :UInt64;
+        garply @8 :UInt16;
+        plugh @14 :Text;
+        xyzzy @16 :Text;
+      }
+
+      fred @12 :Text;
+    }
+
+    waldo @10 :Text;
+  }
+
+  group2 :group {
+#         ^^^^^ @keyword
+    foo @1 :UInt32;
+    bar @3 :UInt64;
+    union {
+      qux @5 :UInt16;
+      corge :group {
+        grault @7 :UInt64;
+        garply @9 :UInt16;
+        plugh @15 :Text;
+        xyzzy @17 :Text;
+      }
+
+      fred @13 :Text;
+    }
+
+    waldo @11 :Text;
+  }
+}
+
+struct TestUnionDefaults {
+  s16s8s64s8Set @0 :TestUnion =
+      (union0 = (u0f0s16 = 321), union1 = (u1f0s8 = 123), union2 = (u2f0s64 = 12345678901234567),
+#                          ^^^ @number
+       union3 = (u3f0s8 = 55));
+  s0sps1s32Set @1 :TestUnion =
+      (union0 = (u0f1s0 = void), union1 = (u1f0sp = "foo"), union2 = (u2f0s1 = true),
+#                                                   ^^^^^ @string
+#                                                                              ^^^^ @boolean
+       union3 = (u3f0s32 = 12345678));
+
+  unnamed1 @2 :TestUnnamedUnion = (foo = 123);
+  unnamed2 @3 :TestUnnamedUnion = (bar = 321, before = "foo", after = "bar");
+}
+
+struct TestUsing {
+  using OuterNestedEnum = TestNestedTypes.NestedEnum;
+# ^^^^^ @include
+  using TestNestedTypes.NestedStruct.NestedEnum;
+
+  outerNestedEnum @1 :OuterNestedEnum = bar;
+  innerNestedEnum @0 :NestedEnum = quux;
+}
+
+struct TestListDefaults {
+  lists @0 :TestLists = (
+      list0  = [(f = void), (f = void)],
+#                    ^^^^ @constant.builtin
+      list1  = [(f = true), (f = false), (f = true), (f = true)],
+      list8  = [(f = 123), (f = 45)],
+      list16 = [(f = 12345), (f = 6789)],
+      list32 = [(f = 123456789), (f = 234567890)],
+      list64 = [(f = 1234567890123456), (f = 2345678901234567)],
+      listP  = [(f = "foo"), (f = "bar")],
+      int32ListList = [[1, 2, 3], [4, 5], [12341234]],
+      textListList = [["foo", "bar"], ["baz"], ["qux", "corge"]],
+      structListList = [[(int32Field = 123), (int32Field = 456)], [(int32Field = 789)]]);
+}
+
+struct TestWholeFloatDefault {
+  # At one point, these failed to compile in C++ because it would produce literals like "123f",
+  # which is not valid; it needs to be "123.0f".
+  field @0 :Float32 = 123;
+  bigField @1 :Float32 = 2e30;
+  const constant :Float32 = 456;
+  const bigConstant :Float32 = 4e30;
+#                              ^^^^ @float
+}
+
+struct TestGenerics(Foo, Bar) {
+  foo @0 :Foo;
+  rev @1 :TestGenerics(Bar, Foo);
+
+  union {
+    uv @2:Void;
+    ug :group {
+      ugfoo @3:Int32;
+    }
+  }
+
+  list @4 :List(Inner);
+  # At one time this failed to compile with MSVC due to poor expression SFINAE support.
+
+  struct Inner {
+    foo @0 :Foo;
+    bar @1 :Bar;
+  }
+
+  struct Inner2(Baz) {
+    bar @0 :Bar;
+    baz @1 :Baz;
+    innerBound @2 :Inner;
+    innerUnbound @3 :TestGenerics.Inner;
+
+    struct DeepNest(Qux) {
+      foo @0 :Foo;
+      bar @1 :Bar;
+      baz @2 :Baz;
+      qux @3 :Qux;
+
+      interface DeepNestInterface(Quux) {
+#     ^^^^^^^^^ @keyword
+        # At one time this failed to compile.
+        call @0 () -> ();
+#       ^^^^ @method
+#                  ^^ @punctuation.delimiter
+      }
+    }
+  }
+
+  interface Interface(Qux) {
+    call @0 Inner2(Text) -> (qux :Qux, gen :TestGenerics(TestAllTypes, TestAnyPointer));
+#                            ^^^ @parameter
+#                                      ^^^ @parameter
+  }
+
+  annotation ann(struct) :Foo;
+# ^^^^^^^^^^ @keyword
+#            ^^^ @method
+#                ^^^^^^ @parameter.builtin
+
+  using AliasFoo = Foo;
+  using AliasInner = Inner;
+  using AliasInner2 = Inner2;
+  using AliasInner2Text = Inner2(Text);
+  using AliasRev = TestGenerics(Bar, Foo);
+
+  struct UseAliases {
+    foo @0 :AliasFoo;
+    inner @1 :AliasInner;
+    inner2 @2 :AliasInner2;
+    inner2Bind @3 :AliasInner2(Text);
+    inner2Text @4 :AliasInner2Text;
+    revFoo @5 :AliasRev.AliasFoo;
+  }
+}
+
+struct BoxedText { text @0 :Text; }
+using BrandedAlias = TestGenerics(BoxedText, Text);
+
+struct TestGenericsWrapper(Foo, Bar) {
+  value @0 :TestGenerics(Foo, Bar);
+}
+
+struct TestGenericsWrapper2 {
+  value @0 :TestGenericsWrapper(Text, TestAllTypes);
+}
+
+interface TestImplicitMethodParams {
+  call @0 [T, U] (foo :T, bar :U) -> TestGenerics(T, U);
+#          ^ @type
+#                      ^ @type
+}
+
+interface TestImplicitMethodParamsInGeneric(V) {
+  call @0 [T, U] (foo :T, bar :U) -> TestGenerics(T, U);
+}
+
+struct TestGenericsUnion(Foo, Bar) {
+  # At one point this failed to compile.
+
+  union {
+    foo @0 :Foo;
+    bar @1 :Bar;
+  }
+}
+
+struct TestUseGenerics $TestGenerics(Text, Data).ann("foo") {
+#                      ^ @punctuation.special
+#                       ^^^^^^^^^^^^ @attribute
+#                                               ^ @punctuation.delimiter
+#                                                ^^^ @attribute
+  basic @0 :TestGenerics(TestAllTypes, TestAnyPointer);
+  inner @1 :TestGenerics(TestAllTypes, TestAnyPointer).Inner;
+  inner2 @2 :TestGenerics(TestAllTypes, TestAnyPointer).Inner2(Text);
+  unspecified @3 :TestGenerics;
+  unspecifiedInner @4 :TestGenerics.Inner2(Text);
+  wrapper @8 :TestGenericsWrapper(TestAllTypes, TestAnyPointer);
+  cap @18 :TestGenerics(TestInterface, Text);
+  genericCap @19 :TestGenerics(TestAllTypes, List(UInt32)).Interface(Data);
+
+  default @5 :TestGenerics(TestAllTypes, Text) =
+      (foo = (int16Field = 123), rev = (foo = "text", rev = (foo = (int16Field = 321))));
+  defaultInner @6 :TestGenerics(TestAllTypes, Text).Inner =
+      (foo = (int16Field = 123), bar = "text");
+  defaultUser @7 :TestUseGenerics = (basic = (foo = (int16Field = 123)));
+  defaultWrapper @9 :TestGenericsWrapper(Text, TestAllTypes) =
+      (value = (foo = "text", rev = (foo = (int16Field = 321))));
+  defaultWrapper2 @10 :TestGenericsWrapper2 =
+      (value = (value = (foo = "text", rev = (foo = (int16Field = 321)))));
+
+  aliasFoo @11 :TestGenerics(TestAllTypes, TestAnyPointer).AliasFoo = (int16Field = 123);
+  aliasInner @12 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner
+      = (foo = (int16Field = 123));
+  aliasInner2 @13 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner2
+      = (innerBound = (foo = (int16Field = 123)));
+  aliasInner2Bind @14 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner2(List(UInt32))
+      = (baz = [12, 34], innerBound = (foo = (int16Field = 123)));
+  aliasInner2Text @15 :TestGenerics(TestAllTypes, TestAnyPointer).AliasInner2Text
+      = (baz = "text", innerBound = (foo = (int16Field = 123)));
+  aliasRev @16 :TestGenerics(TestAnyPointer, Text).AliasRev.AliasFoo = "text";
+
+  useAliases @17 :TestGenerics(TestAllTypes, List(UInt32)).UseAliases = (
+      foo = (int16Field = 123),
+      inner = (foo = (int16Field = 123)),
+      inner2 = (innerBound = (foo = (int16Field = 123))),
+      inner2Bind = (baz = "text", innerBound = (foo = (int16Field = 123))),
+      inner2Text = (baz = "text", innerBound = (foo = (int16Field = 123))),
+      revFoo = [12, 34, 56]);
+}
+
+struct TestEmptyStruct {}
+
+struct TestConstants {
+  const voidConst      :Void    = void;
+# ^^^^^ @type.qualifier
+  const boolConst      :Bool    = true;
+  const int8Const      :Int8    = -123;
+  const int16Const     :Int16   = -12345;
+  const int32Const     :Int32   = -12345678;
+  const int64Const     :Int64   = -123456789012345;
+  const uint8Const     :UInt8   = 234;
+  const uint16Const    :UInt16  = 45678;
+  const uint32Const    :UInt32  = 3456789012;
+  const uint64Const    :UInt64  = 12345678901234567890;
+  const float32Const   :Float32 = 1234.5;
+  const float64Const   :Float64 = -123e45;
+  const textConst      :Text    = "foo";
+  const dataConst      :Data    = "bar";
+  const structConst    :TestAllTypes = (
+      voidField      = void,
+      boolField      = true,
+      int8Field      = -12,
+      int16Field     = 3456,
+      int32Field     = -78901234,
+      int64Field     = 56789012345678,
+      uInt8Field     = 90,
+      uInt16Field    = 1234,
+      uInt32Field    = 56789012,
+      uInt64Field    = 345678901234567890,
+      float32Field   = -1.25e-10,
+      float64Field   = 345,
+      textField      = "baz",
+      dataField      = "qux",
+      structField    = (
+          textField = "nested",
+          structField = (textField = "really nested")),
+      enumField      = baz,
+      # interfaceField can't have a default
+
+      voidList      = [void, void, void],
+      boolList      = [false, true, false, true, true],
+      int8List      = [12, -34, -0x80, 0x7f],
+      int16List     = [1234, -5678, -0x8000, 0x7fff],
+      int32List     = [12345678, -90123456, -0x80000000, 0x7fffffff],
+      int64List     = [123456789012345, -678901234567890, -0x8000000000000000, 0x7fffffffffffffff],
+      uInt8List     = [12, 34, 0, 0xff],
+      uInt16List    = [1234, 5678, 0, 0xffff],
+      uInt32List    = [12345678, 90123456, 0, 0xffffffff],
+      uInt64List    = [123456789012345, 678901234567890, 0, 0xffffffffffffffff],
+      float32List   = [0, 1234567, 1e37, -1e37, 1e-37, -1e-37],
+      float64List   = [0, 123456789012345, 1e306, -1e306, 1e-306, -1e-306],
+      textList      = ["quux", "corge", "grault"],
+      dataList      = ["garply", "waldo", "fred"],
+      structList    = [
+          (textField = "x " "structlist"
+                       " 1"),
+          (textField = "x structlist 2"),
+          (textField = "x structlist 3")],
+      enumList      = [qux, bar, grault]
+      # interfaceList can't have a default
+      );
+  const enumConst      :TestEnum = corge;
+
+  const voidListConst      :List(Void)    = [void, void, void, void, void, void];
+  const boolListConst      :List(Bool)    = [true, false, false, true];
+  const int8ListConst      :List(Int8)    = [111, -111];
+  const int16ListConst     :List(Int16)   = [11111, -11111];
+  const int32ListConst     :List(Int32)   = [111111111, -111111111];
+  const int64ListConst     :List(Int64)   = [1111111111111111111, -1111111111111111111];
+  const uint8ListConst     :List(UInt8)   = [111, 222] ;
+  const uint16ListConst    :List(UInt16)  = [33333, 44444];
+  const uint32ListConst    :List(UInt32)  = [3333333333];
+  const uint64ListConst    :List(UInt64)  = [11111111111111111111];
+  const float32ListConst   :List(Float32) = [5555.5, inf, -inf, nan];
+  const float64ListConst   :List(Float64) = [7777.75, inf, -inf, nan];
+  const textListConst      :List(Text)    = ["plugh", "xyzzy", "thud"];
+  const dataListConst      :List(Data)    = ["oops", "exhausted", "rfc3092"];
+  const structListConst    :List(TestAllTypes) = [
+      (textField = "structlist 1"),
+      (textField = "structlist 2"),
+      (textField = "structlist 3")];
+  const enumListConst      :List(TestEnum) = [foo, garply];
+}
+
+const globalInt :UInt32 = 12345;
+const globalText :Text = "foobar";
+const globalStruct :TestAllTypes = (int32Field = 54321);
+const globalPrintableStruct :TestPrintInlineStructs = (someText = "foo");
+const derivedConstant :TestAllTypes = (
+    uInt32Field = .globalInt,
+    textField = TestConstants.textConst,
+    structField = TestConstants.structConst,
+    int16List = TestConstants.int16ListConst,
+    structList = TestConstants.structListConst);
+
+const genericConstant :TestGenerics(TestAllTypes, Text) =
+    (foo = (int16Field = 123), rev = (foo = "text", rev = (foo = (int16Field = 321))));
+
+const embeddedData :Data = embed "testdata/packed";
+#                          ^^^^^ @include
+const embeddedText :Text = embed "testdata/short.txt";
+const embeddedStruct :TestAllTypes = embed "testdata/binary";
+
+const nonAsciiText :Text = "♫ é ✓";
+
+const blockText :Text =
+    `foo bar baz
+    `"qux" `corge` 'grault'
+    "regular\"quoted\"line"
+    `garply\nwaldo\tfred\"plugh\"xyzzy\'thud
+    ;
+
+struct TestAnyPointerConstants {
+  anyKindAsStruct @0 :AnyPointer;
+  anyStructAsStruct @1 :AnyStruct;
+  anyKindAsList @2 :AnyPointer;
+  anyListAsList @3 :AnyList;
+}
+
+const anyPointerConstants :TestAnyPointerConstants = (
+  anyKindAsStruct = TestConstants.structConst,
+  anyStructAsStruct = TestConstants.structConst,
+  anyKindAsList = TestConstants.int32ListConst,
+  anyListAsList = TestConstants.int32ListConst,
+);
+
+interface TestInterface {
+  foo @0 (i :UInt32, j :Bool) -> (x :Text);
+#                                 ^ @parameter
+  bar @1 () -> ();
+  baz @2 (s: TestAllTypes);
+}
+
+interface TestExtends extends(TestInterface) {
+#                     ^^^^^^^ @keyword
+  qux @0 ();
+  corge @1 TestAllTypes -> ();
+  grault @2 () -> TestAllTypes;
+}
+
+interface TestTailCallee $Cxx.allowCancellation {
+  struct TailResult {
+    i @0 :UInt32;
+    t @1 :Text;
+    c @2 :TestCallOrder;
+  }
+
+  foo @0 (i :Int32, t :Text) -> TailResult;
+}
+
+interface TestTailCaller {
+  foo @0 (i :Int32, callee :TestTailCallee) -> TestTailCallee.TailResult;
+}
+
+interface TestStreaming $Cxx.allowCancellation {
+  doStreamI @0 (i :UInt32) -> stream;
+  doStreamJ @1 (j :UInt32) -> stream;
+  finishStream @2 () -> (totalI :UInt32, totalJ :UInt32);
+  # Test streaming. finishStream() returns the totals of the values streamed to the other calls.
+}
+
+interface TestHandle {}
+
+interface TestMoreStuff extends(TestCallOrder) {
+  # Catch-all type that contains lots of testing methods.
+
+  callFoo @0 (cap :TestInterface) -> (s: Text);
+  # Call `cap.foo()`, check the result, and return "bar".
+
+  callFooWhenResolved @1 (cap :TestInterface) -> (s: Text);
+  # Like callFoo but waits for `cap` to resolve first.
+
+  neverReturn @2 (cap :TestInterface) -> (capCopy :TestInterface) $Cxx.allowCancellation;
+  # Doesn't return.  You should cancel it.
+
+  hold @3 (cap :TestInterface) -> ();
+  # Returns immediately but holds on to the capability.
+
+  callHeld @4 () -> (s: Text);
+  # Calls the capability previously held using `hold` (and keeps holding it).
+
+  getHeld @5 () -> (cap :TestInterface);
+  # Returns the capability previously held using `hold` (and keeps holding it).
+
+  echo @6 (cap :TestCallOrder) -> (cap :TestCallOrder);
+  # Just returns the input cap.
+
+  expectCancel @7 (cap :TestInterface) -> () $Cxx.allowCancellation;
+  # evalLater()-loops forever, holding `cap`.  Must be canceled.
+
+  methodWithDefaults @8 (a :Text, b :UInt32 = 123, c :Text = "foo") -> (d :Text, e :Text = "bar");
+
+  methodWithNullDefault @12 (a :Text, b :TestInterface = null);
+
+  getHandle @9 () -> (handle :TestHandle);
+  # Get a new handle. Tests have an out-of-band way to check the current number of live handles, so
+  # this can be used to test garbage collection.
+
+  getNull @10 () -> (nullCap :TestMoreStuff);
+  # Always returns a null capability.
+
+  getEnormousString @11 () -> (str :Text);
+  # Attempts to return an 100MB string. Should always fail.
+
+  writeToFd @13 (fdCap1 :TestInterface, fdCap2 :TestInterface)
+             -> (fdCap3 :TestInterface, secondFdPresent :Bool);
+  # Expects fdCap1 and fdCap2 wrap socket file descriptors. Writes "foo" to the first and "bar" to
+  # the second. Also creates a socketpair, writes "baz" to one end, and returns the other end.
+
+  throwException @14 ();
+  throwRemoteException @15 ();
+}
+
+interface TestMembrane {
+  makeThing @0 () -> (thing :Thing);
+  callPassThrough @1 (thing :Thing, tailCall :Bool) -> Result;
+  callIntercept @2 (thing :Thing, tailCall :Bool) -> Result;
+  loopback @3 (thing :Thing) -> (thing :Thing);
+
+  waitForever @4 () $Cxx.allowCancellation;
+
+  interface Thing {
+    passThrough @0 () -> Result;
+    intercept @1 () -> Result;
+  }
+
+  struct Result {
+    text @0 :Text;
+  }
+}
+
+struct TestNameAnnotation $Cxx.name("RenamedStruct") {
+  union {
+    badFieldName @0 :Bool $Cxx.name("goodFieldName");
+    bar @1 :Int8;
+  }
+
+  enum BadlyNamedEnum $Cxx.name("RenamedEnum") {
+    foo @0;
+    bar @1;
+    baz @2 $Cxx.name("qux");
+  }
+
+  anotherBadFieldName @2 :BadlyNamedEnum $Cxx.name("anotherGoodFieldName");
+
+  struct NestedStruct $Cxx.name("RenamedNestedStruct") {
+    badNestedFieldName @0 :Bool $Cxx.name("goodNestedFieldName");
+    anotherBadNestedFieldName @1 :NestedStruct $Cxx.name("anotherGoodNestedFieldName");
+
+    enum DeeplyNestedEnum $Cxx.name("RenamedDeeplyNestedEnum") {
+      quux @0;
+      corge @1;
+      grault @2 $Cxx.name("garply");
+    }
+  }
+
+  badlyNamedUnion :union $Cxx.name("renamedUnion") {
+    badlyNamedGroup :group $Cxx.name("renamedGroup") {
+      foo @3 :Void;
+      bar @4 :Void;
+    }
+    baz @5 :NestedStruct $Cxx.name("qux");
+  }
+}
+
+interface TestNameAnnotationInterface $Cxx.name("RenamedInterface") {
+  badlyNamedMethod @0 (badlyNamedParam :UInt8 $Cxx.name("renamedParam")) $Cxx.name("renamedMethod");
+}
+
+struct TestImpliedFirstField {
+  struct TextStruct {
+    text @0 :Text;
+    i @1 :UInt32 = 321;
+  }
+
+  textStruct @0 :TextStruct = "foo";
+  textStructList @1 :List(TextStruct);
+
+  intGroup :group {
+    i @2 :UInt32;
+    str @3 :Text = "corge";
+  }
+}
+
+const testImpliedFirstField :TestImpliedFirstField = (
+  textStruct = "bar",
+  textStructList = ["baz", (text = "qux", i = 123)],
+  intGroup = 123
+);
+
+struct TestCycleANoCaps {
+  foo @0 :TestCycleBNoCaps;
+}
+
+struct TestCycleBNoCaps {
+  foo @0 :List(TestCycleANoCaps);
+  bar @1 :TestAllTypes;
+}
+
+struct TestCycleAWithCaps {
+  foo @0 :TestCycleBWithCaps;
+}
+
+struct TestCycleBWithCaps {
+  foo @0 :List(TestCycleAWithCaps);
+  bar @1 :TestInterface;
+}

From b231afbad1569c08f12cac53c6bb8deecdaba013 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 7 May 2023 08:29:23 +0000
Subject: [PATCH 0305/2704] Update parsers: astro, c, haskell, t32 (#4769)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 486d5aa19..2ca8a1017 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "833b53df97143bc46e014608dee9f64f78d7473c"
   },
   "astro": {
-    "revision": "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"
+    "revision": "d111ae5ebbd30ffeaf58a3bebd2eb99682c0f6a3"
   },
   "awk": {
     "revision": "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2"
+    "revision": "735716c926837d9e39e4effb3fdc28cee81a7e5e"
   },
   "c_sharp": {
     "revision": "2340fd6b57b06ccbf24c2c6dafb15905fdccfb1f"
@@ -195,7 +195,7 @@
     "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
   },
   "haskell": {
-    "revision": "14a48ba6a02b24b2897f5d9ed9621255e1ea8cf0"
+    "revision": "c5cb0c860a399308305f44792bc4853737c40c07"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"
@@ -471,7 +471,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "ff822fd77bb919854ba60d05f4d373d9d578d0e0"
+    "revision": "fatal: unable to access 'https://codeberg.org/xasc/tree-sitter-t32/': The requested URL returned error: 502"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From 864b4171de82772323ab97d1fd9a9dbfcf53c002 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 8 May 2023 14:53:31 +0900
Subject: [PATCH 0306/2704] feat: add swift indents (#4756)

---
 queries/swift/indents.scm             | 87 +++++++++++++++++++++++++++
 tests/indent/swift/declarations.swift | 51 ++++++++++++++++
 tests/indent/swift/expressions.swift  | 17 ++++++
 tests/indent/swift/statements.swift   | 34 +++++++++++
 tests/indent/swift_spec.lua           | 21 +++++++
 5 files changed, 210 insertions(+)
 create mode 100644 queries/swift/indents.scm
 create mode 100644 tests/indent/swift/declarations.swift
 create mode 100644 tests/indent/swift/expressions.swift
 create mode 100644 tests/indent/swift/statements.swift
 create mode 100644 tests/indent/swift_spec.lua

diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
new file mode 100644
index 000000000..4207a788b
--- /dev/null
+++ b/queries/swift/indents.scm
@@ -0,0 +1,87 @@
+[
+  (protocol_body)
+  (class_body)
+  (function_declaration)
+  (computed_property)
+  (subscript_declaration)
+
+  (computed_getter)
+  (computed_setter)
+
+  (assignment)
+
+  (control_transfer_statement) ; return ...
+  (for_statement)
+  (while_statement)
+  (repeat_while_statement)
+  (do_statement)
+  (if_statement)
+  (switch_statement)
+  (guard_statement)
+
+  (type_parameters) ; x<Foo>
+  (tuple_type) ; (...)
+  (array_type) ; [String]
+  (dictionary_type); [Foo: Bar]
+
+  (call_expression)
+  (tuple_expression)
+  (array_literal)
+  (dictionary_literal)
+  (lambda_literal) 
+] @indent.begin
+
+; @something(...)
+((modifiers
+  (attribute) @indent.begin))
+
+(function_declaration
+  (modifiers
+    .
+    (attribute)
+    (_)* @indent.branch)
+  .
+  _ @indent.branch
+  (#not-has-type? @indent.branch type_parameters parameter))
+
+
+(ERROR
+  [
+    "<" 
+    "{" 
+    "(" 
+    "["
+  ]
+) @indent.begin
+
+
+; if-elseif
+(if_statement
+  (if_statement) @indent.dedent)
+
+(switch_entry . _ @indent.branch)
+
+(function_declaration ")" @indent.branch)
+
+(type_parameters ">" @indent.branch @indent.end .)
+(tuple_expression ")" @indent.branch @indent.end)
+(value_arguments ")" @indent.branch @indent.end)
+(tuple_type ")" @indent.branch @indent.end)
+(modifiers
+  (attribute ")" @indent.branch @indent.end))
+
+[
+  "}"
+  "]"
+] @indent.branch @indent.end
+
+
+[
+  ; (ERROR)
+  (comment)
+  (multiline_comment)
+  (raw_str_part)
+  (multi_line_string_literal)
+] @indent.auto
+
+(directive) @indent.ignore
diff --git a/tests/indent/swift/declarations.swift b/tests/indent/swift/declarations.swift
new file mode 100644
index 000000000..a6f576ef2
--- /dev/null
+++ b/tests/indent/swift/declarations.swift
@@ -0,0 +1,51 @@
+@wrapper
+@modifier(
+  *
+)
+class EquilateralTriangle: NamedShape {
+  var sideLength: Double = 0.0
+
+  @attr
+  init(
+    sideLength: Double, 
+    name: String
+  ) {
+    self.sideLength = sideLength
+  }
+
+  var perimeter: Double {
+    willSet {
+    }
+  }
+
+  @funcattr
+  override func simpleDescription(a: int, b: int) -> String {
+    return "An equilateral triangle with sides of length \(sideLength)."
+  }
+}
+
+@attr
+protocol ExampleProtocol {
+  var simpleDescription: String { get }
+  mutating func adjust()
+}
+
+@available(*)
+func test() {
+
+}
+
+@attr(*)
+typealias Foo = Bar
+
+@attr
+struct Foo<
+  Bar
+> {
+  @Provider
+  var test = 1
+
+  subscript(index: Int) -> Int {
+    var foo = 2
+  }
+}
diff --git a/tests/indent/swift/expressions.swift b/tests/indent/swift/expressions.swift
new file mode 100644
index 000000000..4f7292a69
--- /dev/null
+++ b/tests/indent/swift/expressions.swift
@@ -0,0 +1,17 @@
+func Test() {
+  (1 + 2)
+
+  [
+    1,
+    2,
+    3,
+    4,
+    5
+  ].split()
+
+  let x = [
+    1: 2,
+    3: 4,
+  ]
+
+}
diff --git a/tests/indent/swift/statements.swift b/tests/indent/swift/statements.swift
new file mode 100644
index 000000000..df6e46c94
--- /dev/null
+++ b/tests/indent/swift/statements.swift
@@ -0,0 +1,34 @@
+func Test() {
+  if true {
+    return
+  } else if true {
+    return
+  }
+
+  switch x {
+  case "1":
+    print("x")
+  default:
+    print("y")
+  @unknown default:
+    print("z")
+  }
+
+  for a in b {
+  }
+
+  while true{
+  }
+
+  repeat {
+
+  } while (true)
+
+  guard let name = person["name"] else {
+    return
+  }
+
+  return (
+    x + 1
+  )
+}
diff --git a/tests/indent/swift_spec.lua b/tests/indent/swift_spec.lua
new file mode 100644
index 000000000..6ba0d2cf0
--- /dev/null
+++ b/tests/indent/swift_spec.lua
@@ -0,0 +1,21 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/swift", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 2,
+  expandtab = true,
+})
+
+describe("indent Swift:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {})
+  end)
+  describe("new line:", function()
+    run:new_line("declarations.swift", { on_line = 6, text = "var x = 1", indent = 2 })
+    run:new_line("declarations.swift", { on_line = 12, text = "var textInsideInit = true", indent = 4 })
+    run:new_line("declarations.swift", { on_line = 17, text = "var textInsideWillSet = 1", indent = 6 })
+    run:new_line("declarations.swift", { on_line = 22, text = "var textInsideOverrideFunc", indent = 4 })
+    run:new_line("declarations.swift", { on_line = 28, text = "var InsideProtocol: String { get }", indent = 2 })
+  end)
+end)

From 402f1b8d3b424bb2379fc2fde522cd782de68cf4 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 8 May 2023 06:36:23 +0000
Subject: [PATCH 0307/2704] Update parsers: clojure, glsl, ledger, t32

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2ca8a1017..e8027fede 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -45,7 +45,7 @@
     "revision": "3baf22e7e507cedf15d1dbc03df8afa50a625586"
   },
   "clojure": {
-    "revision": "421546c2547c74d1d9a0d8c296c412071d37e7ca"
+    "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
     "revision": "399605a02bcd5daa309ce63a6459c600dce3473f"
@@ -168,7 +168,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "e2c2214045de2628b81089b1a739962f59654558"
+    "revision": "f21fc834ee48cc485c85f5df7099e00058dbc180"
   },
   "go": {
     "revision": "64457ea6b73ef5422ed1687178d4545c3e91334a"
@@ -267,7 +267,7 @@
     "revision": "cd3cc493a92b6bac7be4b3bd6d006d35d3c36d4c"
   },
   "ledger": {
-    "revision": "1cc4445908966046c1dd211d9ddaac4c3198bd1d"
+    "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "llvm": {
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
@@ -471,7 +471,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "fatal: unable to access 'https://codeberg.org/xasc/tree-sitter-t32/': The requested URL returned error: 502"
+    "revision": "ff822fd77bb919854ba60d05f4d373d9d578d0e0"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From 0ec48923e526d55892b7a1564a01b5111e5e9ba0 Mon Sep 17 00:00:00 2001
From: Derek Stride <derek.stride@shopify.com>
Date: Mon, 8 May 2023 17:40:33 -0400
Subject: [PATCH 0308/2704] feat(sql): add more keywords

---
 queries/sql/highlights.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index a3b5de05f..815b2ac2c 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -68,8 +68,8 @@
  (keyword_collate)
  (keyword_concurrently)
  (keyword_engine)
- (keyword_character)
- (keyword_concurrently)
+ (keyword_always)
+ (keyword_generated)
  (keyword_preceding)
  (keyword_following)
  (keyword_first)
@@ -131,6 +131,8 @@
   (keyword_offset)
   (keyword_table)
   (keyword_key)
+  (keyword_references)
+  (keyword_foreign)
   (keyword_constraint)
   (keyword_force)
   (keyword_use)
@@ -226,6 +228,8 @@
   (keyword_boolean)
   (keyword_binary)
   (keyword_bit)
+  (keyword_inet)
+  (keyword_character)
   (keyword_smallserial)
   (keyword_serial)
   (keyword_bigserial)

From 74779349fc860cc8260fccc330308dbb98179945 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 9 May 2023 06:36:17 +0000
Subject: [PATCH 0309/2704] Update parsers: slint

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index e8027fede..bd1b136ed 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -432,7 +432,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slint": {
-    "revision": "07547525cdf4627343dca5891f1743ae45e879bb"
+    "revision": "6f128658eb22cfd15a801f52369d517c25253d5c"
   },
   "smali": {
     "revision": "9bf8aa671a233ae2d2c6e9512c7144ce121b1fb6"

From 6df6dd262213ca5ced35a7446e5d07eebe594bef Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 8 May 2023 21:07:32 -0400
Subject: [PATCH 0310/2704] feat(rust): distinguish enum members better

---
 queries/rust/highlights.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 4554db022..c8a7170f2 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -86,6 +86,18 @@
     name: (identifier) @constant)
  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
 
+((scoped_identifier
+  path: (identifier) @type
+  name: (identifier) @constant)
+  (#lua-match? @type "^[A-Z]")
+  (#lua-match? @constant "^[A-Z]"))
+
+((scoped_type_identifier
+  path: (identifier) @type
+  name: (type_identifier) @constant)
+  (#lua-match? @type "^[A-Z]")
+  (#lua-match? @constant "^[A-Z]"))
+
 [
   (crate)
   (super)

From 5182759e1704172495f6820fbdb480eff5a111c6 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 8 May 2023 21:07:41 -0400
Subject: [PATCH 0311/2704] style(rust): better formatting

---
 queries/rust/highlights.scm | 114 ++++++++++++++++++++++++++++--------
 1 file changed, 88 insertions(+), 26 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index c8a7170f2..82fb966f7 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -5,57 +5,71 @@
 ; Identifier conventions
 
 (identifier) @variable
+
 ((identifier) @type
- (#lua-match? @type "^[A-Z]"))
+  (#lua-match? @type "^[A-Z]"))
+
 (const_item
   name: (identifier) @constant)
+
 ; Assume all-caps names are constants
+
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
 
 ; Other identifiers
 
 (type_identifier) @type
+
 (primitive_type) @type.builtin
+
 (field_identifier) @field
-(shorthand_field_initializer
-  (identifier) @field)
+
+(shorthand_field_initializer (identifier) @field)
+
 (mod_item
- name: (identifier) @namespace)
+  name: (identifier) @namespace)
 
 (self) @variable.builtin
 
 (loop_label ["'" (identifier)] @label)
 
-
 ; Function definitions
 
 (function_item (identifier) @function)
+
 (function_signature_item (identifier) @function)
 
 (parameter (identifier) @parameter)
+
 (closure_parameters (_) @parameter)
 
 ; Function calls
+
 (call_expression
   function: (identifier) @function.call)
+
 (call_expression
   function: (scoped_identifier
               (identifier) @function.call .))
+
 (call_expression
   function: (field_expression
     field: (field_identifier) @function.call))
 
 (generic_function
   function: (identifier) @function.call)
+
 (generic_function
   function: (scoped_identifier
     name: (identifier) @function.call))
+
 (generic_function
   function: (field_expression
     field: (field_identifier) @function.call))
 
 ; Assume other uppercase names are enum constructors
+
 ((field_identifier) @constant
  (#lua-match? @constant "^[A-Z]"))
 
@@ -63,25 +77,33 @@
   name: (identifier) @constant)
 
 ; Assume that uppercase names in paths are types
+
 (scoped_identifier
   path: (identifier) @namespace)
+
 (scoped_identifier
  (scoped_identifier
   name: (identifier) @namespace))
+
 (scoped_type_identifier
   path: (identifier) @namespace)
+
 (scoped_type_identifier
   path: (identifier) @type
   (#lua-match? @type "^[A-Z]"))
+
 (scoped_type_identifier
  (scoped_identifier
   name: (identifier) @namespace))
+
 ((scoped_identifier
   path: (identifier) @type)
  (#lua-match? @type "^[A-Z]"))
+
 ((scoped_identifier
     name: (identifier) @type)
  (#lua-match? @type "^[A-Z]"))
+
 ((scoped_identifier
     name: (identifier) @constant)
  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
@@ -105,14 +127,19 @@
 
 (scoped_use_list
   path: (identifier) @namespace)
+
 (scoped_use_list
   path: (scoped_identifier
-            (identifier) @namespace))
+          (identifier) @namespace))
+
 (use_list (scoped_identifier (identifier) @namespace . (_)))
+
 (use_list (identifier) @type (#lua-match? @type "^[A-Z]"))
+
 (use_as_clause alias: (identifier) @type (#lua-match? @type "^[A-Z]"))
 
-;; Correct enum constructors
+; Correct enum constructors
+
 (call_expression
   function: (scoped_identifier
     "::"
@@ -120,9 +147,11 @@
   (#lua-match? @constant "^[A-Z]"))
 
 ; Assume uppercase names in a match arm are constants.
+
 ((match_arm
    pattern: (match_pattern (identifier) @constant))
  (#lua-match? @constant "^[A-Z]"))
+
 ((match_arm
    pattern: (match_pattern
      (scoped_identifier
@@ -132,31 +161,35 @@
 ((identifier) @constant.builtin
  (#any-of? @constant.builtin "Some" "None" "Ok" "Err"))
 
-;; Macro definitions
+; Macro definitions
+
 "$" @function.macro
+
 (metavariable) @function.macro
+
 (macro_definition "macro_rules!" @function.macro)
 
-;; Attribute macros
+; Attribute macros
+
 (attribute_item (attribute (identifier) @function.macro))
+
 (attribute (scoped_identifier (identifier) @function.macro .))
 
-;; Derive macros (assume all arguments are types)
+; Derive macros (assume all arguments are types)
 ; (attribute
 ;   (identifier) @_name
 ;   arguments: (attribute (attribute (identifier) @type))
 ;   (#eq? @_name "derive"))
 
-;; Function-like macros
+; Function-like macros
 (macro_invocation
   macro: (identifier) @function.macro)
+
 (macro_invocation
   macro: (scoped_identifier
            (identifier) @function.macro .))
 
-
-
-;;; Literals
+; Literals
 
 [
   (line_comment)
@@ -165,34 +198,41 @@
 
 ((line_comment) @comment.documentation
   (#lua-match? @comment.documentation "^///[^/]"))
+
 ((line_comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
+
 ((line_comment) @comment.documentation
   (#lua-match? @comment.documentation "^//!"))
 
 ((block_comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
 ((block_comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][!]"))
 
 (boolean_literal) @boolean
+
 (integer_literal) @number
+
 (float_literal) @float
 
 [
   (raw_string_literal)
   (string_literal)
 ] @string
+
 (escape_sequence) @string.escape
+
 (char_literal) @character
 
-
-;;; Keywords
+; Keywords
 
 [
   "use"
   "mod"
 ] @include
+
 (use_as_clause "as" @include)
 
 [
@@ -237,11 +277,15 @@
 ] @keyword.return
 
 (type_cast_expression "as" @keyword.operator)
+
 (qualified_type "as" @keyword.operator)
 
 (use_list (self) @namespace)
+
 (scoped_use_list (self) @namespace)
+
 (scoped_identifier [(crate) (super) (self)] @namespace)
+
 (visibility_modifier [(crate) (super) (self)] @namespace)
 
 [
@@ -261,7 +305,7 @@
 "for" @keyword
 (for_expression "for" @repeat)
 
-;;; Operators & Punctuation
+; Operators
 
 [
   "!"
@@ -300,23 +344,41 @@
   "||"
 ] @operator
 
-["(" ")" "[" "]" "{" "}"]  @punctuation.bracket
-(closure_parameters "|"    @punctuation.bracket)
+; Punctuation
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+
+(closure_parameters "|" @punctuation.bracket)
+
 (type_arguments  ["<" ">"] @punctuation.bracket)
+
 (type_parameters ["<" ">"] @punctuation.bracket)
+
 (bracketed_type ["<" ">"] @punctuation.bracket)
+
 (for_lifetimes ["<" ">"] @punctuation.bracket)
 
 ["," "." ":" "::" ";" "->" "=>"] @punctuation.delimiter
 
 (attribute_item "#" @punctuation.special)
+
 (inner_attribute_item ["!" "#"] @punctuation.special)
+
 (macro_invocation "!" @function.macro)
+
 (empty_type "!" @type.builtin)
 
-(macro_invocation macro: (identifier) @_ident @exception "!" @exception
- (#eq? @_ident "panic"))
-(macro_invocation macro: (identifier) @_ident @exception "!" @exception
- (#contains? @_ident "assert"))
-(macro_invocation macro: (identifier) @_ident @debug "!" @debug
- (#eq? @_ident "dbg"))
+(macro_invocation
+  macro: (identifier) @exception
+  "!" @exception
+  (#eq? @exception "panic"))
+
+(macro_invocation
+  macro: (identifier) @exception
+  "!" @exception
+  (#contains? @exception "assert"))
+
+(macro_invocation
+  macro: (identifier) @debug
+  "!" @debug
+  (#eq? @debug "dbg"))

From a79baf039936598a146c1f159881208307f0ef43 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 8 May 2023 17:39:34 -0400
Subject: [PATCH 0312/2704] fix(typescript): remove duplicate capture

---
 queries/typescript/highlights.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 13b7d99a8..b82231567 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -55,9 +55,6 @@
 (type_annotation
   ":" @punctuation.delimiter)
 
-(pair
-  ":" @punctuation.delimiter)
-
 (index_signature
   ":" @punctuation.delimiter)
 

From 6e8ad92031ff3b07db8980ab4a5491d1c40398ea Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 8 May 2023 18:03:47 -0400
Subject: [PATCH 0313/2704] feat(typescript): add non-null operator

---
 queries/typescript/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index b82231567..d23a918f9 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -38,6 +38,8 @@
 
 (template_literal_type) @string
 
+(non_null_expression "!" @operator)
+
 ;; punctuation
 
 (type_arguments

From 78b3a8229356e7d7eb62d1da4fe723dcff16076e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 10 May 2023 06:36:07 +0000
Subject: [PATCH 0314/2704] Update parsers: cpp, t32

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bd1b136ed..4401e818f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -63,7 +63,7 @@
     "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"
   },
   "cpp": {
-    "revision": "670404d7c689be1c868a46f919ba2a3912f2b7ef"
+    "revision": "70aed2e9e83eb7320ab7c454d3084300bf587037"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
@@ -471,7 +471,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "ff822fd77bb919854ba60d05f4d373d9d578d0e0"
+    "revision": "751d44dbd99469cc8b8148341b6be070b8fa3470"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From f9cfd40c08e1a505e728271a57960c387a9bf8f5 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 10 May 2023 18:46:07 +0300
Subject: [PATCH 0315/2704] comment: remove user mention highlight

---
 queries/comment/highlights.scm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 3d8bce56a..2161cb808 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -39,8 +39,3 @@
 ; Issue number (#123)
 ("text" @number
  (#lua-match? @number "^#[0-9]+$"))
-
-; User mention (@user)
-("text" @constant @nospell
- (#lua-match? @constant "^[@][a-zA-Z0-9_-]+$")
- (#set! "priority" 95))

From 73c7af9cdbce9330eeb9771639c86269f6d7cf9d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 10 May 2023 15:27:40 +0000
Subject: [PATCH 0316/2704] Update parsers: c_sharp

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 4401e818f..90d7ac36e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "735716c926837d9e39e4effb3fdc28cee81a7e5e"
   },
   "c_sharp": {
-    "revision": "2340fd6b57b06ccbf24c2c6dafb15905fdccfb1f"
+    "revision": "35bee13fa5f739a85d4434ec45ebea4f07da395d"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"

From 957aefe8148902897aad877e508ae7e747f155fc Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 11 May 2023 06:35:28 +0000
Subject: [PATCH 0317/2704] Update parsers: cuda, hlsl, t32

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 90d7ac36e..44a36f6a7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "a35854270463a96e79096bb854aae30a4f0e6cd2"
+    "revision": "a27cb7b9d105c43205fa899f49bc0cc4cf399484"
   },
   "cue": {
     "revision": "f83fd9abbece9becb5232c517b9d47ff141e237a"
@@ -207,7 +207,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "40472c119b5740d9a1fa0b0dc0b013502b636708"
+    "revision": "916042734060d3d3a023f6637c815a1d23814af8"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -471,7 +471,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "751d44dbd99469cc8b8148341b6be070b8fa3470"
+    "revision": "1dd98248b01e4a3933c1b85b58bab0875e2ba437"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From f5182b51f74dc8d6c5157debaa729628c3be09ef Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 11 May 2023 17:53:04 +0000
Subject: [PATCH 0318/2704] Update parsers: latex, lua

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 44a36f6a7..362b787ca 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -264,7 +264,7 @@
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
   },
   "latex": {
-    "revision": "cd3cc493a92b6bac7be4b3bd6d006d35d3c36d4c"
+    "revision": "b0686a83c2429cc04e6d01f067f5a0a8efc0d17b"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -273,7 +273,7 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "4e94980e52f81f713d09be104ba32bf050000031"
+    "revision": "2138a4ebd5bbeef0d57a51f732f7cb8beed40890"
   },
   "luadoc": {
     "revision": "1e1152264cc68e11d65d9e2493566f5717a13d11"

From 39cf5cbcfd71c4fc3edebbcd79b471899f4deb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregg=20Jansen=20van=20V=C3=BCren?= <vurentjie@gmail.com>
Date: Thu, 11 May 2023 21:27:43 +0200
Subject: [PATCH 0319/2704] feat(java): add more foldable nodes

---
 queries/java/folds.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/java/folds.scm b/queries/java/folds.scm
index 262a8d80f..b0cdead4b 100644
--- a/queries/java/folds.scm
+++ b/queries/java/folds.scm
@@ -1,5 +1,7 @@
 [
   (block)
+  (class_body)
+  (constructor_declaration)
   (argument_list)
   (annotation_argument_list)
 ] @fold

From 7e1cb38c382dc1f1feb90a759a26dd600bd39841 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 12 May 2023 06:35:33 +0000
Subject: [PATCH 0320/2704] Update parsers: lua, t32

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 362b787ca..bc3bfcacf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -273,7 +273,7 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "2138a4ebd5bbeef0d57a51f732f7cb8beed40890"
+    "revision": "f6a13e357899aa602663f0a3462e5a2db7202c77"
   },
   "luadoc": {
     "revision": "1e1152264cc68e11d65d9e2493566f5717a13d11"
@@ -471,7 +471,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "1dd98248b01e4a3933c1b85b58bab0875e2ba437"
+    "revision": "4fca25fa99b6fd9ccf9cab9b6bf702a9df142ad5"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From 32d0baae44f5fd0416128c871fca6d9e27b60b3d Mon Sep 17 00:00:00 2001
From: Zheng PiaoDan <zhengpiaodan@gmail.com>
Date: Fri, 12 May 2023 17:49:39 +0000
Subject: [PATCH 0321/2704] feat: add indents.scm for nickel (#4790)

---
 queries/nickel/indents.scm             | 13 +++++++++++++
 scripts/minimal_init.lua               |  1 +
 tests/indent/nickel/indent-newline.ncl |  9 +++++++++
 tests/indent/nickel_spec.lua           | 24 ++++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 queries/nickel/indents.scm
 create mode 100644 tests/indent/nickel/indent-newline.ncl
 create mode 100644 tests/indent/nickel_spec.lua

diff --git a/queries/nickel/indents.scm b/queries/nickel/indents.scm
new file mode 100644
index 000000000..23e779bb1
--- /dev/null
+++ b/queries/nickel/indents.scm
@@ -0,0 +1,13 @@
+[
+  (term)
+] @indent.begin
+
+[
+  "]"
+  "}"
+] @indent.branch
+
+[
+  "]"
+  "}"
+] @indent.end
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index f1ffe3dfe..e47b6701a 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -4,6 +4,7 @@ vim.cmd [[runtime! plugin/nvim-treesitter.lua]]
 
 vim.cmd [[au BufRead,BufNewFile *.conf set filetype=hocon]]
 vim.cmd [[au BufRead,BufNewFile *.gleam set filetype=gleam]]
+vim.cmd [[au BufRead,BufNewFile *.ncl set filetype=nickel]]
 
 vim.o.swapfile = false
 vim.bo.swapfile = false
diff --git a/tests/indent/nickel/indent-newline.ncl b/tests/indent/nickel/indent-newline.ncl
new file mode 100644
index 000000000..c9813ea2d
--- /dev/null
+++ b/tests/indent/nickel/indent-newline.ncl
@@ -0,0 +1,9 @@
+{
+  key1 = 1,
+  key2 = [
+    2
+  ],
+  key3 = {
+    key4 = 4
+  }
+}
diff --git a/tests/indent/nickel_spec.lua b/tests/indent/nickel_spec.lua
new file mode 100644
index 000000000..01d3c3d17
--- /dev/null
+++ b/tests/indent/nickel_spec.lua
@@ -0,0 +1,24 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/nickel", {
+  shiftwidth = 2,
+  expandtab = true,
+})
+
+describe("indent Nickel:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("indent-newline.ncl", { on_line = 1, text = "stmt", indent = 2 })
+    run:new_line("indent-newline.ncl", { on_line = 2, text = "stmt", indent = 2 })
+    run:new_line("indent-newline.ncl", { on_line = 3, text = "stmt", indent = 4 })
+    run:new_line("indent-newline.ncl", { on_line = 4, text = "]", indent = 2 })
+    run:new_line("indent-newline.ncl", { on_line = 5, text = "stmt", indent = 2 })
+    run:new_line("indent-newline.ncl", { on_line = 6, text = "stmt", indent = 4 })
+    run:new_line("indent-newline.ncl", { on_line = 7, text = "}", indent = 2 })
+  end)
+end)

From ec0d0ffe51fab458a346b8a8d6f9d69490f3d7e1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 13 May 2023 00:52:29 -0400
Subject: [PATCH 0322/2704] feat(cpon): update queries

---
 queries/cpon/highlights.scm | 5 +++++
 queries/cpon/indents.scm    | 8 +-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/queries/cpon/highlights.scm b/queries/cpon/highlights.scm
index f08647293..807714a0f 100644
--- a/queries/cpon/highlights.scm
+++ b/queries/cpon/highlights.scm
@@ -15,6 +15,8 @@
   "d" @character.special
   (_) @string.special)
 
+(_ key: (_) @label)
+
 (number) @number
 
 (float) @float
@@ -36,6 +38,9 @@
 
 [ "<" ">" ] @punctuation.bracket
 
+(("\"" @conceal)
+ (#set! conceal ""))
+
 ; Comments
 
 (comment) @comment @spell
diff --git a/queries/cpon/indents.scm b/queries/cpon/indents.scm
index 5f52ea6a1..8ec2ff57c 100644
--- a/queries/cpon/indents.scm
+++ b/queries/cpon/indents.scm
@@ -9,13 +9,7 @@
   "]"
   "}"
   ">"
-] @indent.end
-
-[ "{" "}" ] @indent.branch
-
-[ "[" "]" ] @indent.branch
-
-[ "<" ">" ] @indent.branch
+] @indent.end @indent.branch
 
 [
   (ERROR)

From dba8c8e781cf9cc88a47ad65edf182784fdffaf1 Mon Sep 17 00:00:00 2001
From: Zheng PiaoDan <zhengpiaodan@gmail.com>
Date: Sat, 13 May 2023 06:03:05 +0000
Subject: [PATCH 0323/2704] fix(nickel): wrong indent on line after top level
 comment (#4792)

* fix(nickel): wrong indent on line after top level comment

Previous incorrect indentation on line after top level comment:

```
# no indent after this comment
  {
  another = 1
}
```

Expected result:

```
# no indent after this comment
{
  another = 1
}
````
---
 queries/nickel/indents.scm             | 10 +++++-----
 tests/indent/nickel/indent-newline.ncl |  5 +++++
 tests/indent/nickel_spec.lua           |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/queries/nickel/indents.scm b/queries/nickel/indents.scm
index 23e779bb1..3195d7feb 100644
--- a/queries/nickel/indents.scm
+++ b/queries/nickel/indents.scm
@@ -1,13 +1,13 @@
 [
-  (term)
+ (atom (uni_record)) ; for {...}
+ (atom terms: (term)) ; for [...]
 ] @indent.begin
 
 [
   "]"
   "}"
-] @indent.branch
+] @indent.end @indent.branch
 
 [
-  "]"
-  "}"
-] @indent.end
+  (comment)
+] @indent.auto
diff --git a/tests/indent/nickel/indent-newline.ncl b/tests/indent/nickel/indent-newline.ncl
index c9813ea2d..f6a8b613c 100644
--- a/tests/indent/nickel/indent-newline.ncl
+++ b/tests/indent/nickel/indent-newline.ncl
@@ -7,3 +7,8 @@
     key4 = 4
   }
 }
+
+# no indent after this line
+{
+  another = 1
+}
diff --git a/tests/indent/nickel_spec.lua b/tests/indent/nickel_spec.lua
index 01d3c3d17..d178dab52 100644
--- a/tests/indent/nickel_spec.lua
+++ b/tests/indent/nickel_spec.lua
@@ -20,5 +20,6 @@ describe("indent Nickel:", function()
     run:new_line("indent-newline.ncl", { on_line = 5, text = "stmt", indent = 2 })
     run:new_line("indent-newline.ncl", { on_line = 6, text = "stmt", indent = 4 })
     run:new_line("indent-newline.ncl", { on_line = 7, text = "}", indent = 2 })
+    run:new_line("indent-newline.ncl", { on_line = 11, text = "stmt", indent = 0 })
   end)
 end)

From a67a4ab6423d28d075e6054e9d0c5cef80b5acab Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 13 May 2023 01:26:02 -0400
Subject: [PATCH 0324/2704] feat(func): update highlights

---
 queries/func/highlights.scm | 139 ++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 79 deletions(-)

diff --git a/queries/func/highlights.scm b/queries/func/highlights.scm
index bda9e2ec1..c1662a180 100644
--- a/queries/func/highlights.scm
+++ b/queries/func/highlights.scm
@@ -16,6 +16,64 @@
     "test-version-set"
   ] @preproc)
 
+; Keywords
+
+[
+  "asm"
+  "impure"
+  "inline"
+  "inline_ref"
+  "method_id"
+  "type"
+] @keyword
+
+[
+  "return"
+] @keyword.return
+
+; Conditionals
+
+[
+  "if"
+  "ifnot"
+  "else"
+  "elseif"
+  "elseifnot"
+  "until"
+] @conditional
+
+; Exceptions
+
+[
+  "try"
+  "catch"
+] @exception
+
+; Repeats
+
+[
+  "do"
+  "forall"
+  "repeat"
+  "while"
+] @repeat
+
+; Qualifiers
+[
+  "const"
+  "global"
+  (var)
+] @type.qualifier
+
+; Variables
+
+(identifier) @variable
+
+; Constants
+
+(const_var_declarations
+  name: (identifier) @constant)
+
 ; Functions/Methods
 
 (function_definition
@@ -31,39 +89,11 @@
 
 (parameter) @parameter
 
-(function_application
-  arguments: [(identifier) (underscore)] @parameter)
-(function_application
-  arguments: (tensor_expression 
-               (identifier) @parameter))
-(function_application
-  arguments: (parenthesized_expression
-               (identifier) @parameter))
-
-(method_call
-  arguments: [(identifier) (underscore)] @parameter)
-(method_call
-  arguments: (tensor_expression 
-               (identifier) @parameter))
-(method_call
-  arguments: (parenthesized_expression
-               (identifier) @parameter))
-
-; Constants
-
-(const_var_declarations
-  name: (identifier) @constant)
-(unit_literal) @constant.builtin
-
-; Variables
-
-(identifier) @variable
-
 ; Types
 
 (type_identifier) @type
+
 (primitive_type) @type.builtin
-(unit_type) @type.builtin
 
 ; Operators
 
@@ -112,55 +142,6 @@
   "~"
 ] @operator
 
-; Keywords
-
-[
-  "asm"
-  "impure"
-  "inline"
-  "inline_ref"
-  "method_id"
-  "try"
-  "type"
-] @keyword
-
-[
-  "return"
-] @keyword.return
-
-; Conditionals
-
-[
-  "if"
-  "ifnot"
-  "else"
-  "elseif"
-  "elseifnot"
-  "until"
-] @conditional
-
-; Exceptions
-
-[
-  "catch"
-] @exception
-
-; Repeats
-
-[
-  "do"
-  "forall"
-  "repeat"
-  "while"
-] @repeat
-
-; Qualifiers
-[
-  "const"
-  "global"
-  (var)
-] @type.qualifier
-
 ; Literals
 
 [
@@ -179,7 +160,7 @@
 
 ["{" "}"] @punctuation.bracket
 
-["(" ")"] @punctuation.bracket
+["(" ")" "()"] @punctuation.bracket
 
 ["[" "]"] @punctuation.bracket
 

From 40d373adcd0c9f86d8e1beb2b2028723f288aade Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 11 May 2023 03:56:12 -0400
Subject: [PATCH 0325/2704] feat: add Odin

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/odin/folds.scm          |   7 +
 queries/odin/highlights.scm     | 293 ++++++++++++++++++++++++++++++++
 queries/odin/indents.scm        |  27 +++
 queries/odin/injections.scm     |   1 +
 queries/odin/locals.scm         |  39 +++++
 8 files changed, 379 insertions(+)
 create mode 100644 queries/odin/folds.scm
 create mode 100644 queries/odin/highlights.scm
 create mode 100644 queries/odin/indents.scm
 create mode 100644 queries/odin/injections.scm
 create mode 100644 queries/odin/locals.scm

diff --git a/README.md b/README.md
index 1fb1830fb..9938df2c4 100644
--- a/README.md
+++ b/README.md
@@ -284,6 +284,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) (maintained by @undu)
+- [x] [odin](https://github.com/amaanq/tree-sitter-odin) (maintained by @amaanq)
 - [ ] [org](https://github.com/milisims/tree-sitter-org)
 - [x] [pascal](https://github.com/Isopod/tree-sitter-pascal.git) (maintained by @Isopod)
 - [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index bc3bfcacf..68e46cf20 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -332,6 +332,9 @@
   "ocamllex": {
     "revision": "ac1d5957e719d49bd6acd27439b79843e4daf8ed"
   },
+  "odin": {
+    "revision": "d165dbee27617dab2653e38737d96ede1030d14f"
+  },
   "org": {
     "revision": "081179c52b3e8175af62b9b91dc099d010c38770"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2fd4b14bc..c4ed3d720 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1010,6 +1010,14 @@ list.ocamllex = {
   maintainers = { "@undu" },
 }
 
+list.odin = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-odin",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.org = {
   install_info = {
     url = "https://github.com/milisims/tree-sitter-org",
diff --git a/queries/odin/folds.scm b/queries/odin/folds.scm
new file mode 100644
index 000000000..5367cb5f2
--- /dev/null
+++ b/queries/odin/folds.scm
@@ -0,0 +1,7 @@
+[
+  (declaration)
+  (statement)
+  (else_when_clause)
+  (else_if_clause)
+  (else_clause)
+] @fold
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
new file mode 100644
index 000000000..e9ded5397
--- /dev/null
+++ b/queries/odin/highlights.scm
@@ -0,0 +1,293 @@
+; Preprocs
+
+[
+  (calling_convention)
+  (tag)
+] @preproc
+
+; Includes
+
+[
+  "import"
+  "package"
+] @include
+
+; Keywords
+
+[
+  "foreign"
+  "using"
+  "struct"
+  "enum"
+  "union"
+  "defer"
+  "cast"
+  "transmute"
+  "auto_cast"
+  "map"
+  "bit_set"
+  "matrix"
+] @keyword
+
+[
+  "proc"
+] @keyword.function
+
+[
+  "return"
+  "or_return"
+] @keyword.return
+
+[
+  "distinct"
+  "dynamic"
+] @storageclass
+
+; Conditionals
+
+[
+  "if"
+  "else"
+  "when"
+  "switch"
+  "case"
+  "where"
+  "break"
+  (fallthrough_statement)
+] @conditional
+
+((ternary_expression
+  [
+    "?"
+    ":"
+    "if"
+    "else"
+    "when"
+  ] @conditional.ternary)
+  (#set! "priority" 105))
+
+; Repeats
+
+[
+  "for"
+  "do"
+  "continue"
+] @repeat
+
+; Variables
+
+(identifier) @variable
+
+; Namespaces
+
+(package_declaration (identifier) @namespace)
+
+(import_declaration alias: (identifier) @namespace)
+
+(foreign_block (identifier) @namespace)
+
+(using_statement (identifier) @namespace)
+
+; Parameters
+
+(parameter (identifier) @parameter ":" "="? (identifier)? @constant)
+
+(default_parameter (identifier) @parameter ":=")
+
+(named_type (identifier) @parameter)
+
+(call_expression argument: (identifier) @parameter "=")
+
+; Functions
+
+(procedure_declaration (identifier) @type)
+
+(procedure_declaration (identifier) @function (procedure (block)))
+
+(procedure_declaration (identifier) @function (procedure (uninitialized)))
+
+(overloaded_procedure_declaration (identifier) @function)
+
+(call_expression function: (identifier) @function.call)
+
+; Types
+
+(type (identifier) @type)
+
+((type (identifier) @type.builtin)
+  (#any-of? @type.builtin
+    "bool" "byte" "b8" "b16" "b32" "b64"
+    "int" "i8" "i16" "i32" "i64" "i128"
+    "uint" "u8" "u16" "u32" "u64" "u128" "uintptr"
+    "i16le" "i32le" "i64le" "i128le" "u16le" "u32le" "u64le" "u128le"
+    "i16be" "i32be" "i64be" "i128be" "u16be" "u32be" "u64be" "u128be"
+    "float" "double" "f16" "f32" "f64" "f16le" "f32le" "f64le" "f16be" "f32be" "f64be"
+    "complex32" "complex64" "complex128" "complex_float" "complex_double"
+    "quaternion64" "quaternion128" "quaternion256"
+    "rune" "string" "cstring" "rawptr" "typeid" "any"))
+
+"..." @type.builtin
+
+(struct_declaration (identifier) @type "::")
+
+(enum_declaration (identifier) @type "::")
+
+(union_declaration (identifier) @type "::")
+
+(const_declaration (identifier) @type "::" [(array_type) (distinct_type) (bit_set_type) (pointer_type)])
+
+(struct . (identifier) @type)
+
+(field_type . (identifier) @namespace "." (identifier) @type)
+
+(bit_set_type (identifier) @type ";")
+
+(procedure_type (parameters (parameter (identifier) @type)))
+
+(polymorphic_parameters (identifier) @type)
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z][a-zA-Z0-9]*$")
+  (#not-has-parent? @type parameter procedure_declaration))
+
+; Fields
+
+(member_expression "." (identifier) @field)
+
+(struct_type "{" (identifier) @field)
+
+(struct_field (identifier) @field "="?)
+
+(field (identifier) @field)
+
+; Constants
+
+((identifier) @constant
+  (#lua-match? @constant "^_*[A-Z][A-Z0-9_]*$")
+  (#not-has-parent? @constant type parameter))
+
+(member_expression . "." (identifier) @constant)
+
+(enum_declaration "{" (identifier) @constant)
+
+; Macros
+
+((call_expression function: (identifier) @function.macro)
+  (#lua-match? @function.macro "^_*[A-Z][A-Z0-9_]*$"))
+
+; Attributes
+
+(attribute (identifier) @attribute "="?)
+
+; Labels
+
+(label_statement (identifier) @label ":")
+
+; Literals
+
+(number) @number
+
+(float) @float
+
+(string) @string
+
+(character) @character
+
+(escape_sequence) @string.escape
+
+(boolean) @boolean
+
+[
+  (uninitialized)
+  (nil)
+] @constant.builtin
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "context" "self"))
+
+; Operators
+
+[
+  ":="
+  "="
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "%%"
+  ">"
+  ">="
+  "<"
+  "<="
+  "=="
+  "!="
+  "~="
+  "|"
+  "~"
+  "&"
+  "&~"
+  "<<"
+  ">>"
+  "||"
+  "&&"
+  "!"
+  "^"
+  ".."
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "&="
+  "|="
+  "^="
+  "<<="
+  ">>="
+  "||="
+  "&&="
+  "&~="
+  "..="
+  "..<"
+  "?"
+] @operator
+
+[
+  "or_else"
+  "in"
+  "not_in"
+] @keyword.operator
+
+; Punctuation
+
+[ "{" "}" ] @punctuation.bracket
+
+[ "(" ")" ] @punctuation.bracket
+
+[ "[" "]" ] @punctuation.bracket
+
+[
+  "::"
+  "->"
+  "."
+  ","
+  ":"
+  (separator)
+] @punctuation.delimiter
+
+
+[
+  "@"
+  "$"
+] @punctuation.special
+
+; Comments
+
+[
+  (comment)
+  (block_comment)
+] @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/odin/indents.scm b/queries/odin/indents.scm
new file mode 100644
index 000000000..11dab0544
--- /dev/null
+++ b/queries/odin/indents.scm
@@ -0,0 +1,27 @@
+[
+  (block)
+  (procedure_declaration)
+  (overloaded_procedure_declaration)
+  (enum_declaration)
+  (union_declaration)
+  (if_statement)
+  (else_if_clause)
+  (else_clause)
+  (when_statement)
+  (else_when_clause)
+  (for_statement)
+  (switch_case)
+] @indent.begin
+
+[
+  "}"
+  ")"
+  "]"
+] @indent.branch @indent.end
+
+[
+  (comment)
+  (block_comment)
+  (string)
+  (ERROR)
+] @indent.auto
diff --git a/queries/odin/injections.scm b/queries/odin/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/odin/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/odin/locals.scm b/queries/odin/locals.scm
new file mode 100644
index 000000000..eb28ab952
--- /dev/null
+++ b/queries/odin/locals.scm
@@ -0,0 +1,39 @@
+; Scopes
+
+[
+  (block)
+  (declaration)
+  (statement)
+] @scope
+
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(package_declaration (identifier) @definition.namespace)
+
+(import_declaration alias: (identifier) @definition.namespace)
+
+(procedure_declaration (identifier) @definition.function)
+
+(struct_declaration (identifier) @definition.type "::")
+
+(enum_declaration (identifier) @definition.enum "::")
+
+(union_declaration (identifier) @definition.type "::")
+
+(variable_declaration (identifier) @definition.var ":=")
+
+(const_declaration (identifier) @definition.constant "::")
+
+(const_type_declaration (identifier) @definition.type ":")
+
+(parameter (identifier) @definition.parameter ":"?)
+
+(default_parameter (identifier) @definition.parameter ":=")
+
+(field (identifier) @definition.field ":")
+
+(label_statement (identifier) @definition ":")

From 15300c1a10a3aa857c7925d854d58cce6e758d51 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 13 May 2023 06:35:04 +0000
Subject: [PATCH 0326/2704] Update parsers: bicep, c_sharp, cpon, func, gosum,
 hare, kdl, lua, luadoc, luap, puppet, smali

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 68e46cf20..7584c49d9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
   },
   "bicep": {
-    "revision": "b94a0983b69ebb75e9129329a188199ad6ebcec0"
+    "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
   "blueprint": {
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
@@ -36,7 +36,7 @@
     "revision": "735716c926837d9e39e4effb3fdc28cee81a7e5e"
   },
   "c_sharp": {
-    "revision": "35bee13fa5f739a85d4434ec45ebea4f07da395d"
+    "revision": "76114711aedd3f4b6e1333a7513975647930c629"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -60,7 +60,7 @@
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
   },
   "cpon": {
-    "revision": "eedb93bf9e22e82ed6a67e6c57fd78731b44f591"
+    "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
     "revision": "70aed2e9e83eb7320ab7c454d3084300bf587037"
@@ -138,7 +138,7 @@
     "revision": "fa3347712f7a59ed02ccf508284554689c6cde28"
   },
   "func": {
-    "revision": "f161cfe22452b386eeeab29ba0d2c14893f1a31f"
+    "revision": "0834e35ecf8b23fbf9ad15b088af6a897e19d4a8"
   },
   "fusion": {
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
@@ -180,7 +180,7 @@
     "revision": "4a65743dbc2bb3094114dd2b43da03c820aa5234"
   },
   "gosum": {
-    "revision": "14da5c2a34861eb2d97ed89f39324156031e8878"
+    "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -192,7 +192,7 @@
     "revision": "b7bd6928532ada34dddb1dece4a158ab62c6e783"
   },
   "hare": {
-    "revision": "f0a9e6207a8c84bbd11143c8eb0c6cf70dc6d8b4"
+    "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
     "revision": "c5cb0c860a399308305f44792bc4853737c40c07"
@@ -255,7 +255,7 @@
     "revision": "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"
   },
   "kdl": {
-    "revision": "d118f9376ef4f0461975289302fe74a28f073876"
+    "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
     "revision": "100d79fd96b56a1b99099a8d2f3c114b8687acfb"
@@ -273,13 +273,13 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "f6a13e357899aa602663f0a3462e5a2db7202c77"
+    "revision": "dcc44f7473ecec4d7b99af0a9529705d98a769f1"
   },
   "luadoc": {
-    "revision": "1e1152264cc68e11d65d9e2493566f5717a13d11"
+    "revision": "978cc13791c1d6e4626ee7e8db108d0be14f07e7"
   },
   "luap": {
-    "revision": "393915db4b16a792da9c60f52d11d93247d870b9"
+    "revision": "43916b0f31c48a05e03783eb0bab4eec54a4ac75"
   },
   "luau": {
     "revision": "4f8fc207b3a25b07cba1d3b4066f2872dcfe201f"
@@ -378,7 +378,7 @@
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
   },
   "puppet": {
-    "revision": "5e1bb979ea71efc0860d4bc56eb3b3f7a670d6ec"
+    "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
   },
   "python": {
     "revision": "62827156d01c74dc1538266344e788da74536b8a"
@@ -438,7 +438,7 @@
     "revision": "6f128658eb22cfd15a801f52369d517c25253d5c"
   },
   "smali": {
-    "revision": "9bf8aa671a233ae2d2c6e9512c7144ce121b1fb6"
+    "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
   },
   "smithy": {
     "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"

From 680807fa6a482c639119098bc48ca3831c66db13 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 May 2023 11:23:50 +0200
Subject: [PATCH 0327/2704] highlights(markup): distinguish heading level in
 queries

also add a few queries from Helix and remove controversial
code block conceal in Markdown
---
 queries/latex/highlights.scm            | 34 ++++++++++++-------------
 queries/markdown/highlights.scm         | 30 ++++++++--------------
 queries/markdown_inline/highlights.scm  | 10 +++-----
 queries/vimdoc/highlights.scm           |  8 +++---
 tests/query/highlights/markdown/test.md | 14 +++++-----
 5 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 791689ff5..5d68cdfb0 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -126,48 +126,48 @@
 ;; Sectioning
 (title_declaration
   command: _ @namespace
-  options: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  options: (brack_group (_) @text.title.1)?
+  text: (curly_group (_) @text.title.1))
 
 (author_declaration
   command: _ @namespace
   authors: (curly_group_author_list
-             ((author)+ @text.title)))
+             ((author)+ @text.title.1)))
 
 (chapter
   command: _ @namespace
-  toc: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  toc: (brack_group (_) @text.title.2)?
+  text: (curly_group (_) @text.title.2))
 
 (part
   command: _ @namespace
-  toc: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  toc: (brack_group (_) @text.title.2)?
+  text: (curly_group (_) @text.title.2))
 
 (section
   command: _ @namespace
-  toc: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  toc: (brack_group (_) @text.title.3)?
+  text: (curly_group (_) @text.title.3))
 
 (subsection
   command: _ @namespace
-  toc: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  toc: (brack_group (_) @text.title.4)?
+  text: (curly_group (_) @text.title.4))
 
 (subsubsection
   command: _ @namespace
-  toc: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  toc: (brack_group (_) @text.title.5)?
+  text: (curly_group (_) @text.title.5))
 
 (paragraph
   command: _ @namespace
-  toc: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  toc: (brack_group (_) @text.title.6)?
+  text: (curly_group (_) @text.title.6))
 
 (subparagraph
   command: _ @namespace
-  toc: (brack_group (_) @text.title)?
-  text: (curly_group (_) @text.title))
+  toc: (brack_group (_) @text.title.6)?
+  text: (curly_group (_) @text.title.6))
 
 ;; Beamer frames
 (generic_environment
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 5fc378e58..8867a4b7f 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -1,17 +1,13 @@
-;From MDeiml/tree-sitter-markdown
-(atx_heading (inline) @text.title)
-(setext_heading (paragraph) @text.title)
+;From MDeiml/tree-sitter-markdown & Helix
+(setext_heading (paragraph) @text.title.1 (setext_h1_underline) @text.title.1.marker)
+(setext_heading (paragraph) @text.title.2 (setext_h2_underline) @text.title.2.marker)
 
-[
-  (atx_h1_marker)
-  (atx_h2_marker)
-  (atx_h3_marker)
-  (atx_h4_marker)
-  (atx_h5_marker)
-  (atx_h6_marker)
-  (setext_h1_underline)
-  (setext_h2_underline)
-] @punctuation.special
+(atx_heading (atx_h1_marker) @text.title.1.marker (inline) @text.title.1)
+(atx_heading (atx_h2_marker) @text.title.2.marker (inline) @text.title.2)
+(atx_heading (atx_h3_marker) @text.title.3.marker (inline) @text.title.3)
+(atx_heading (atx_h4_marker) @text.title.4.marker (inline) @text.title.4)
+(atx_heading (atx_h5_marker) @text.title.5.marker (inline) @text.title.5)
+(atx_heading (atx_h6_marker) @text.title.6.marker (inline) @text.title.6)
 
 [
   (link_title)
@@ -19,6 +15,8 @@
   (fenced_code_block)
 ] @text.literal
 
+(info_string) @label
+
 (pipe_table_header (pipe_table_cell) @text.title)
 
 (pipe_table_header "|" @punctuation.special)
@@ -64,10 +62,4 @@
   (backslash_escape)
 ] @string.escape
 
-([
-  (info_string)
-  (fenced_code_block_delimiter)
-] @conceal
-(#set! conceal ""))
-
 (inline) @spell
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 8369abffe..a70e34bb8 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -31,12 +31,10 @@
   (hard_line_break)
 ] @string.escape
 
-; "(" not part of query because of
-; https://github.com/nvim-treesitter/nvim-treesitter/issues/2206
-; TODO: Find better fix for this
-(image ["!" "[" "]" "(" ")"] @punctuation.delimiter)
-(inline_link ["[" "]" "(" ")"] @punctuation.delimiter)
-(shortcut_link ["[" "]"] @punctuation.delimiter)
+(image "!" @punctuation.special)
+(image ["[" "]" "(" ")"] @punctuation.bracket)
+(inline_link ["[" "]" "(" ")"] @punctuation.bracket)
+(shortcut_link ["[" "]"] @punctuation.bracket)
 
 ; Conceal codeblock and text style markers
 ([
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index c0d88301b..e0dce49b2 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -1,7 +1,7 @@
-(h1) @text.title
-(h2) @text.title
-(h3) @text.title
-(column_heading) @text.title
+(h1) @text.title.1
+(h2) @text.title.2
+(h3) @text.title.3
+(column_heading) @text.title.4
 (column_heading
    "~" @conceal (#set! conceal ""))
 (tag
diff --git a/tests/query/highlights/markdown/test.md b/tests/query/highlights/markdown/test.md
index 9423d3e85..2d3734515 100644
--- a/tests/query/highlights/markdown/test.md
+++ b/tests/query/highlights/markdown/test.md
@@ -1,8 +1,8 @@
 # H1
-<!-- <- punctuation.special -->
+<!-- <- text.title.1.marker -->
 
 ## H2
-<!-- <- punctuation.special -->
+<!-- <- text.title.2.marker -->
 
 - Item 1
 - Item 2
@@ -16,13 +16,13 @@
 <!--  ^ text.reference                                                    -->
 <!--                              ^ text.uri                              -->
 <!--                                                      ^ text.literal  -->
-<!--^ punctuation.delimiter                                               -->
-<!-- ^ punctuation.delimiter                                              -->
-<!--                                                                      //TODO: currently disabled punctuation.delimiter -->
+<!--^ punctuation.special                                                 -->
+<!-- ^ punctuation.bracket                                                -->
+<!--                    ^ punctuation.bracket                             -->
 
 [link_text](#local_reference "link go brr...")
 <!-- ^ text.reference                                                     -->
 <!--                 ^ text.uri                                           -->
 <!--                            ^ text.literal                            -->
-<!-- <- punctuation.delimiter                                             -->
-<!--                                                                      //TODO: currently disabled punctuation.delimiter -->
+<!-- <- punctuation.bracket                                               -->
+<!--       ^ punctuation.bracket                                          -->

From 3b0c133c31c055aeec9d64a5329803b8b81d1974 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 15 May 2023 06:36:00 +0000
Subject: [PATCH 0328/2704] Update parsers: dart, query

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7584c49d9..c8b40aaab 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "939e5e18321a695f39889ae9dcf3c0255a107109"
+    "revision": "e22648d689e61d05e25994c1cd939a0eda208695"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
@@ -393,7 +393,7 @@
     "revision": "35ead5b9955cdb29bcf709d622fa960ff33992b6"
   },
   "query": {
-    "revision": "e97504446f14f529d5a8e649667d3d60391e4dfd"
+    "revision": "3a9808b22742d5bd906ef5d1a562f2f1ae57406d"
   },
   "r": {
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"

From 4c35c0b75d678d3f901d8dd37428ae834c4bd689 Mon Sep 17 00:00:00 2001
From: Colin Kennedy <colinvfx@gmail.com>
Date: Sat, 6 May 2023 16:00:17 -0700
Subject: [PATCH 0329/2704] Added USD as a language + some queries

Added USD highlight unittests

Added USD indentation

Added USD indents.scm file

Added USD indent rules

Simplified USD highlight groups

Added explicit highlight groups

Added newline

Removed after/ftdetect/usda.lua

usd/indents.scm - Added inline comments explaining the nodes

Fixed USD highlight group unittests

Added indentation unittests

Simplified USD `@identifier` highlighting

Added USD documentation highlight group tests

Simplified USD highlight groups

Moved USD `@identifier` and `@namespace` highlights into one place

Removed and simplified tests/query/highlights/usd

Simplified tests/query/highlights/usd more

Removed trailing newline

Combined USD test files

Added `set filetype=usd` to minimal_init.lua
---
 README.md                                  |   1 +
 lua/nvim-treesitter/parsers.lua            |   8 +
 queries/usd/folds.scm                      |   3 +
 queries/usd/highlights.scm                 | 181 +++++++++++++++++++++
 queries/usd/indents.scm                    |  26 +++
 queries/usd/locals.scm                     |   4 +
 scripts/minimal_init.lua                   |   1 +
 tests/indent/usd/prim.usd                  |   6 +
 tests/indent/usd_spec.lua                  |  21 +++
 tests/query/highlights/usd/prims.usda      | 118 ++++++++++++++
 tests/query/highlights/usd/properties.usda |  21 +++
 tests/query/highlights/usd/subLayers.usda  |   9 +
 12 files changed, 399 insertions(+)
 create mode 100644 queries/usd/folds.scm
 create mode 100644 queries/usd/highlights.scm
 create mode 100644 queries/usd/indents.scm
 create mode 100644 queries/usd/locals.scm
 create mode 100644 tests/indent/usd/prim.usd
 create mode 100644 tests/indent/usd_spec.lua
 create mode 100644 tests/query/highlights/usd/prims.usda
 create mode 100644 tests/query/highlights/usd/properties.usda
 create mode 100644 tests/query/highlights/usd/subLayers.usda

diff --git a/README.md b/README.md
index 9938df2c4..3b9f577cc 100644
--- a/README.md
+++ b/README.md
@@ -345,6 +345,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
+- [x] [usd](https://github.com/ColinKennedy/tree-sitter-usd) (maintained by @ColinKennedy)
 - [x] [uxn tal](https://github.com/amaanq/tree-sitter-uxntal) (maintained by @amaanq)
 - [x] [v](https://github.com/vlang/vls) (maintained by @kkharji)
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c4ed3d720..8cd86213a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1522,6 +1522,14 @@ list.ungrammar = {
   maintainers = { "@Philipp-M", "@amaanq" },
 }
 
+list.usd = {
+  install_info = {
+    url = "https://github.com/ColinKennedy/tree-sitter-usd",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ColinKennedy" },
+}
+
 list.uxntal = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-uxntal",
diff --git a/queries/usd/folds.scm b/queries/usd/folds.scm
new file mode 100644
index 000000000..c4815bd07
--- /dev/null
+++ b/queries/usd/folds.scm
@@ -0,0 +1,3 @@
+[
+  (block)
+] @fold
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
new file mode 100644
index 000000000..73968a647
--- /dev/null
+++ b/queries/usd/highlights.scm
@@ -0,0 +1,181 @@
+(None) @constant.builtin
+(asset_path) @text.uri
+(attribute_property) @property
+(bool) @boolean
+(comment) @comment @spell
+(custom) @function.builtin
+(float) @float
+(integer) @number
+(orderer) @function.call
+(prim_path) @string.special
+(relationship_type) @type
+(string) @string
+(uniform) @function.builtin
+(variant_set_definition) @keyword
+
+;; Prefer namespace highlighting, if any.
+;;
+;; e.g. `rel fizz` - `fizz` uses `@identifier`
+;; e.g. `rel foo:bar:fizz` - `foo` and `bar` use `@namespace` and `fizz` uses `@identifier`
+;;
+(identifier) @variable
+(namespace_identifier) @namespace
+(namespace_identifier
+  (identifier) @namespace
+)
+
+[
+  "class"
+  "def"
+  "over"
+] @keyword.function
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+[":" ";" "."] @punctuation.delimiter
+
+[
+  "="
+] @operator
+
+(attribute_type) @type
+(
+ ;; Reference: https://openusd.org/release/api/sdf_page_front.html
+ (attribute_type) @type.builtin
+ (#any-of? @type.builtin
+  ;; Scalar types
+  "asset" "asset[]"
+  "bool" "bool[]"
+  "double" "double[]"
+  "float" "float[]"
+  "half" "half[]"
+  "int" "int[]"
+  "int64" "int64[]"
+  "string" "string[]"
+  "timecode" "timecode[]"
+  "token" "token[]"
+  "uchar" "uchar[]"
+  "uint" "uint[]"
+  "uint64" "uint64[]"
+
+  ;; Dimensioned Types
+  "double2" "double2[]"
+  "double3" "double3[]"
+  "double4" "double4[]"
+  "float2" "float2[]"
+  "float3" "float3[]"
+  "float4" "float4[]"
+  "half2" "half2[]"
+  "half3" "half3[]"
+  "half4" "half4[]"
+  "int2" "int2[]"
+  "int3" "int3[]"
+  "int4" "int4[]"
+  "matrix2d" "matrix2d[]"
+  "matrix3d" "matrix3d[]"
+  "matrix4d" "matrix4d[]"
+  "quatd" "quatd[]"
+  "quatf" "quatf[]"
+  "quath" "quath[]"
+
+  ;; Extra Types
+  "color3f" "color3f[]"
+  "normal3f" "normal3f[]"
+  "point3f" "point3f[]"
+  "texCoord2f" "texCoord2f[]"
+  "vector3d" "vector3d[]"
+  "vector3f" "vector3f[]"
+  "vector3h" "vector3h[]"
+
+  "dictionary"
+
+  ;; Deprecated Types
+  "EdgeIndex" "EdgeIndex[]"
+  "FaceIndex" "FaceIndex[]"
+  "Matrix4d" "Matrix4d[]"
+  "PointIndex" "PointIndex[]"
+  "PointFloat" "PointFloat[]"
+  "Transform" "Transform[]"
+  "Vec3f" "Vec3f[]"
+ )
+)
+
+(
+ (identifier) @keyword
+ (#any-of? @keyword
+
+  ;; Reference: https://openusd.org/release/api/sdf_page_front.html
+  ;; LIVRPS names
+  "inherits"
+  "payload"
+  "references"
+  "specializes"
+  "variantSets"
+  "variants"
+
+  ; assetInfo names
+  "assetInfo"
+  "identifier"
+  "name"
+  "payloadAssetDependencies"
+  "version"
+
+  ;; clips names
+  "clips"
+
+  "active"
+  "assetPaths"
+  "manifestAssetPath"
+  "primPath"
+  "templateAssetPath"
+  "templateEndTime"
+  "templateStartTime"
+  "templateStride"
+  "times"
+
+  ;; customData names
+  "customData"
+
+  "apiSchemaAutoApplyTo"
+  "apiSchemaOverridePropertyNames"
+  "className"
+  "extraPlugInfo"
+  "isUsdShadeContainer"
+  "libraryName"
+  "providesUsdShadeConnectableAPIBehavior"
+  "requiresUsdShadeEncapsulation"
+  "skipCodeGeneration"
+
+  ;; Layer metadata names
+  "colorConfiguration"
+  "colorManagementSystem"
+  "customLayerData"
+  "defaultPrim"
+  "doc"
+  "endTimeCode"
+  "framesPerSecond"
+  "owner"
+  "startTimeCode"
+  "subLayers"
+
+  ;; Prim metadata
+  "instanceable"
+ )
+)
+
+;; Common attribute metadata
+(
+ (layer_offset
+  (identifier) @keyword
+  (#any-of? @keyword
+
+   "offset"
+   "scale"
+  )
+ )
+)
+
+;; Docstrings in USD
+(metadata
+ (comment)*
+ (string) @comment.documentation
+)
diff --git a/queries/usd/indents.scm b/queries/usd/indents.scm
new file mode 100644
index 000000000..4af153034
--- /dev/null
+++ b/queries/usd/indents.scm
@@ -0,0 +1,26 @@
+[
+  (block)  ; The {}s in `def "foo" { ... Attributes / Prims here ... }`
+  (dictionary)  ; The {}s in `dictionary foo = { string "foo" = "bar" }`
+  (list)
+  (list_proxy)  ; [@foo.usda@, @bar.usda@]
+  (metadata)  ; ( anything = "goes-here" )
+  (prim_paths)  ; [</foo>, <../bar>]
+  (timeSamples)  ; The {}s in `int value.timeSamples = { 0: 1, -10: 10, ... }`
+  (tuple)
+  (variant_set_definition)  ; The {}s in `variantSet "foo" = { "vr1" { ... } "vr2" { ... } }`
+] @indent.begin
+
+(block "}" @indent.end)
+(dictionary "}" @indent.end)
+(list "]" @indent.end)
+(list_proxy "]" @indent.end)
+(metadata ")" @indent.end)
+(timeSamples "}" @indent.end)
+(tuple ")" @indent.end)
+(variant_set_definition "}" @indent.end)
+
+[
+  ")"
+  "]"
+  "}"
+] @indent.branch
diff --git a/queries/usd/locals.scm b/queries/usd/locals.scm
new file mode 100644
index 000000000..4e7e97b5f
--- /dev/null
+++ b/queries/usd/locals.scm
@@ -0,0 +1,4 @@
+[
+  (block)
+  (metadata)
+] @scope
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index e47b6701a..356745b61 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -5,6 +5,7 @@ vim.cmd [[runtime! plugin/nvim-treesitter.lua]]
 vim.cmd [[au BufRead,BufNewFile *.conf set filetype=hocon]]
 vim.cmd [[au BufRead,BufNewFile *.gleam set filetype=gleam]]
 vim.cmd [[au BufRead,BufNewFile *.ncl set filetype=nickel]]
+vim.cmd [[au BufRead,BufNewFile *.usd,*.usda set filetype=usd]]
 
 vim.o.swapfile = false
 vim.bo.swapfile = false
diff --git a/tests/indent/usd/prim.usd b/tests/indent/usd/prim.usd
new file mode 100644
index 000000000..4bfbff955
--- /dev/null
+++ b/tests/indent/usd/prim.usd
@@ -0,0 +1,6 @@
+#usda 1.0
+
+def "foo" (
+)
+{
+}
diff --git a/tests/indent/usd_spec.lua b/tests/indent/usd_spec.lua
new file mode 100644
index 000000000..c4e8198aa
--- /dev/null
+++ b/tests/indent/usd_spec.lua
@@ -0,0 +1,21 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/usd", {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 4,
+  expandtab = true,
+})
+
+describe("indent USD:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("prim.usd", { on_line = 3, text = "active = false", indent = 4 })
+    run:new_line("prim.usd", { on_line = 5, text = "custom int foo = 10", indent = 4 })
+  end)
+end)
diff --git a/tests/query/highlights/usd/prims.usda b/tests/query/highlights/usd/prims.usda
new file mode 100644
index 000000000..eeac67d74
--- /dev/null
+++ b/tests/query/highlights/usd/prims.usda
@@ -0,0 +1,118 @@
+def Xform "cube" (
+    assetInfo = {
+    # <- keyword
+        asset[] payloadAssetDependencies = [@fizz.usd@, @buzz.usd@]
+        # <- type
+        #       ^ keyword
+        #                                   ^ text.uri
+        #                                               ^ text.uri
+    }
+)
+{
+}
+
+def "root" (
+    add references = @foo.usda@</Model> (offset = 1; scale = 2.0)
+                      # <- text.uri
+                      #        ^ string.special
+                      #                  ^ keyword
+                      #                           ^ number
+                      #                            ^ punctuation.delimiter
+                      #                              ^ keyword
+                      #                                      ^ float
+)
+{
+}
+
+def "World"
+{
+    over "points" (
+        clips = {
+        # <- keyword
+            dictionary default = {
+            # <- type
+            #          ^ variable
+                double2[] times = [(101, 101), (102, 102)]
+                # <- type
+                #         ^ keyword
+                #                   ^ number
+            }
+        }
+    )
+    {
+    }
+}
+
+def Xform "torch_2" (
+    payload = @./torch.usda@
+    kind = "model"
+)
+{
+    // Pre-published light list
+    # <- comment
+    rel lightList = [ <light> ]  # inline comment
+    #                            ^ comment
+    token lightList:cacheBehavior = "consumeAndContinue"
+
+    double3 xformOp:translate = (1, 0, 0.5)
+    uniform token[] xformOpOrder = ["xformOp:translate"]
+}
+
+def "foo" (
+  "some comment"
+  # <- comment.documentation
+)
+{
+}
+
+def "foo" (
+  # inline comment
+  "actual in-description comment"
+  # <- comment.documentation
+)
+{
+}
+
+def "foo" (
+    add references = @foo.usda@
+    # <- function.call
+    append references = @foo.usda@
+    # <- function.call
+    delete references = @foo.usda@
+    # <- function.call
+    reorder references = [@foo.usda@]
+    # <- function.call
+
+    references = [@foo.usda@]  # explicit
+)
+{
+}
+
+over "Parent" (
+    prepend references = [</InternalRef>, @./ref.usda@</RefParent>]
+    # <- function.call
+    #       ^ keyword
+    #                     ^ string.special
+    #                                     ^ text.uri
+    #                                                 ^ string.special
+)
+{
+}
+
+def "foo"
+{
+    float value.timeSamples = {
+    # <- type
+    #     ^ variable
+    #           ^ property
+      -414: 14.4
+      # <- number
+      #     ^ float
+      10: 201.0,
+      # <- number
+      #   ^ float
+      10.123: 201.0123,
+      # <- float
+      #       ^ float
+    }
+}
diff --git a/tests/query/highlights/usd/properties.usda b/tests/query/highlights/usd/properties.usda
new file mode 100644
index 000000000..67df8a623
--- /dev/null
+++ b/tests/query/highlights/usd/properties.usda
@@ -0,0 +1,21 @@
+dictionary foo = {}
+# <- type
+half[] foo = [2, 1, 2]
+# <- type
+string foo = "something"
+# <- type
+timecode time = 1.0
+# <- type
+token[] purpose = ["default", "render"]
+# <- type
+
+rel material:binding:collection:Erasers = None
+# <- type
+#   ^ namespace
+#           ^ punctuation.delimiter
+#            ^ namespace
+#                   ^ punctuation.delimiter
+#                    ^ namespace
+#                              ^ punctuation.delimiter
+#                               ^ variable
+#                                         ^ constant.builtin
diff --git a/tests/query/highlights/usd/subLayers.usda b/tests/query/highlights/usd/subLayers.usda
new file mode 100644
index 000000000..b4dfa6298
--- /dev/null
+++ b/tests/query/highlights/usd/subLayers.usda
@@ -0,0 +1,9 @@
+#usda 1.0
+(
+    subLayers = [
+    # <- keyword
+        @./model_sub.usda@ (offset = 1)
+        # <- text.uri
+        #                   ^ keyword
+    ]
+)

From 217467c26223e0287f44f0eb04226da50fa0c114 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 15 May 2023 16:21:48 +0900
Subject: [PATCH 0330/2704] remove unnecessary ft aus

specify specific plugin files to load
---
 scripts/minimal_init.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 356745b61..5ae1836ef 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -1,11 +1,15 @@
 vim.opt.runtimepath:append "."
-vim.cmd [[runtime! plugin/plenary.vim]]
-vim.cmd [[runtime! plugin/nvim-treesitter.lua]]
+vim.cmd.runtime { "plugin/plenary.vim", bang = true }
+vim.cmd.runtime { "plugin/nvim-treesitter.lua", bang = true }
 
-vim.cmd [[au BufRead,BufNewFile *.conf set filetype=hocon]]
-vim.cmd [[au BufRead,BufNewFile *.gleam set filetype=gleam]]
-vim.cmd [[au BufRead,BufNewFile *.ncl set filetype=nickel]]
-vim.cmd [[au BufRead,BufNewFile *.usd,*.usda set filetype=usd]]
+vim.filetype.add {
+  extension = {
+    conf = "hocon",
+    ncl = "nickel",
+    usd = "usd",
+    usda = "usd",
+  },
+}
 
 vim.o.swapfile = false
 vim.bo.swapfile = false

From 95850f7964e5be713ab984384641cc15973626c6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 15 May 2023 22:31:28 +0200
Subject: [PATCH 0331/2704] fix: force upstreamed predicates

---
 lua/nvim-treesitter/query_predicates.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index c3d474e6c..545def1e9 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -91,9 +91,9 @@ local function has_ancestor(match, _pattern, _bufnr, pred)
   return false
 end
 
-query.add_predicate("has-ancestor?", has_ancestor)
+query.add_predicate("has-ancestor?", has_ancestor, true)
 
-query.add_predicate("has-parent?", has_ancestor)
+query.add_predicate("has-parent?", has_ancestor, true)
 
 ---@param match (TSNode|nil)[]
 ---@param _pattern string

From 27079f70603c9d8a002635acfb95db33318e4eef Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Mon, 15 May 2023 23:21:06 +0200
Subject: [PATCH 0332/2704] highlights(sql): refactor `count` to generic
 `invocation`

---
 lockfile.json              | 2 +-
 queries/sql/highlights.scm | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c8b40aaab..ac2fb5d7a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -450,7 +450,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "9de72fb40cd6d13a64c3aeeabc079c6b8dadb339"
+    "revision": "0f774f4ce1fbc7aa6df6202301e0b08b8c844ae4"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 815b2ac2c..1aaab65dd 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -14,10 +14,6 @@
   (keyword_group_concat)
 ] @function.call
 
-(count
-  name: (keyword_count) @function.call
-  parameter: [(field)]? @parameter)
-
 (table_reference
   name: (identifier) @type)
 

From 26230f06b6ee5a456c6114860ba792382922fadf Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 16 May 2023 06:35:09 +0000
Subject: [PATCH 0333/2704] Update parsers: dart, gitcommit, usd

---
 lockfile.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ac2fb5d7a..759e13b5f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "e22648d689e61d05e25994c1cd939a0eda208695"
+    "revision": "d56cc088de91d5a7ef7ec46b5a5ab4aa3fe82409"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
@@ -156,7 +156,7 @@
     "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
   },
   "gitcommit": {
-    "revision": "735f02b12d9cdd9a8b90ac4b2dff8cdab6dd1e7b"
+    "revision": "6c14f8b63767cf6264c5c43ec71cc9351420e831"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -515,6 +515,9 @@
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
+  "usd": {
+    "revision": "04816b1fbfe548e1446a9efe8b069f3f6e095504"
+  },
   "uxntal": {
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },

From d2b78324f2191db72e9bc063ff435278c36bf06b Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Tue, 16 May 2023 20:16:53 +0900
Subject: [PATCH 0334/2704] fix indent/fold memleak

---
 lua/nvim-treesitter/ts_utils.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
index 373bae340..b3f468934 100644
--- a/lua/nvim-treesitter/ts_utils.lua
+++ b/lua/nvim-treesitter/ts_utils.lua
@@ -351,7 +351,7 @@ function M.memoize_by_buf_tick(fn, options)
   options = options or {}
 
   ---@type table<string, {result: any, last_tick: integer}>
-  local cache = {}
+  local cache = setmetatable({}, { __mode = "kv" })
   local bufnr_fn = utils.to_func(options.bufnr or utils.identity)
   local key_fn = utils.to_func(options.key or utils.identity)
 

From aa44e5fc5f301eb934698b04c71e65b44c21c4fe Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 17 May 2023 06:35:11 +0000
Subject: [PATCH 0335/2704] Update parsers: c

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 759e13b5f..c18051eab 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "735716c926837d9e39e4effb3fdc28cee81a7e5e"
+    "revision": "424d0145efb0a87927269ab47709f98a564f8c4f"
   },
   "c_sharp": {
     "revision": "76114711aedd3f4b6e1333a7513975647930c629"

From fa23ff4bd7d77370613ecb37e49edb3ec3e7a931 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 May 2023 13:27:49 +0200
Subject: [PATCH 0336/2704] refactor(indent): backport improvements from main

* replace ts_utils.memoize_by_buftick by simpler implementation
* simplify construction of hash map
* prefer Neovim APIs
---
 lua/nvim-treesitter/indent.lua | 123 +++++++++++++++++++--------------
 1 file changed, 71 insertions(+), 52 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index fc11b4063..f453127bc 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -1,7 +1,5 @@
-local parsers = require "nvim-treesitter.parsers"
-local queries = require "nvim-treesitter.query"
-local tsutils = require "nvim-treesitter.ts_utils"
 local ts = vim.treesitter
+local parsers = require "lua.nvim-treesitter.parsers"
 
 local M = {}
 
@@ -15,6 +13,10 @@ M.comment_parsers = {
   phpdoc = true,
 }
 
+local function getline(lnum)
+  return vim.api.nvim_buf_get_lines(0, lnum - 1, lnum, false)[1] or ""
+end
+
 ---@param root TSNode
 ---@param lnum integer
 ---@param col? integer
@@ -29,10 +31,18 @@ end
 ---@param col? integer
 ---@return TSNode
 local function get_last_node_at_line(root, lnum, col)
-  col = col or (#vim.fn.getline(lnum) - 1)
+  col = col or (#getline(lnum) - 1)
   return root:descendant_for_range(lnum - 1, col, lnum - 1, col)
 end
 
+---@param node TSNode
+---@return number
+local function node_length(node)
+  local _, _, start_byte = node:start()
+  local _, _, end_byte = node:end_()
+  return end_byte - start_byte
+end
+
 ---@param bufnr integer
 ---@param node TSNode
 ---@param delimiter string
@@ -52,42 +62,50 @@ local function find_delimiter(bufnr, node, delimiter)
   end
 end
 
-local get_indents = tsutils.memoize_by_buf_tick(function(bufnr, root, lang)
+---Memoize a function using hash_fn to hash the arguments.
+---@generic F: function
+---@param fn F
+---@param hash_fn fun(...): any
+---@return F
+local function memoize(fn, hash_fn)
+  local cache = setmetatable({}, { __mode = "kv" }) ---@type table<any,any>
+
+  return function(...)
+    local key = hash_fn(...)
+    if cache[key] == nil then
+      local v = fn(...) ---@type any
+      cache[key] = v ~= nil and v or vim.NIL
+    end
+
+    local v = cache[key]
+    return v ~= vim.NIL and v or nil
+  end
+end
+
+local get_indents = memoize(function(bufnr, root, lang)
   local map = {
-    indent = {
-      auto = {},
-      begin = {},
-      ["end"] = {},
-      dedent = {},
-      branch = {},
-      ignore = {},
-      align = {},
-      zero = {},
-    },
+    ["indent.auto"] = {},
+    ["indent.begin"] = {},
+    ["indent.end"] = {},
+    ["indent.dedent"] = {},
+    ["indent.branch"] = {},
+    ["indent.ignore"] = {},
+    ["indent.align"] = {},
+    ["indent.zero"] = {},
   }
 
-  local function split(to_split)
-    local t = {}
-    for str in string.gmatch(to_split, "([^.]+)") do
-      table.insert(t, str)
+  --TODO(clason): remove when dropping Nvim 0.8 compat
+  local query = (ts.query.get or ts.get_query)(lang, "indents")
+  for id, node, metadata in query:iter_captures(root, bufnr) do
+    if query.captures[id]:sub(1, 1) ~= "_" then
+      map[query.captures[id]][node:id()] = metadata or {}
     end
-    return t
-  end
-
-  for name, node, metadata in queries.iter_captures(bufnr, "indents", root, lang) do
-    local path = split(name)
-    -- node may contain a period so append directly.
-    table.insert(path, node:id())
-    queries.insert_to_path(map, path, metadata or {})
   end
 
   return map
-end, {
-  -- Memoize by bufnr and lang together.
-  key = function(bufnr, root, lang)
-    return tostring(bufnr) .. root:id() .. "_" .. lang
-  end,
-})
+end, function(bufnr, root, lang)
+  return tostring(bufnr) .. root:id() .. "_" .. lang
+end)
 
 ---@param lnum number (1-indexed)
 function M.get_indent(lnum)
@@ -97,6 +115,7 @@ function M.get_indent(lnum)
     return -1
   end
 
+  --TODO(clason): replace when dropping Nvim 0.8 compat
   local root_lang = parsers.get_buf_lang(bufnr)
 
   -- some languages like Python will actually have worse results when re-parsing at opened new line
@@ -113,7 +132,7 @@ function M.get_indent(lnum)
     end
     local local_root = tstree:root()
     if ts.is_in_node_range(local_root, lnum - 1, 0) then
-      if not root or tsutils.node_length(root) >= tsutils.node_length(local_root) then
+      if not root or node_length(root) >= node_length(local_root) then
         root = local_root
         lang_tree = tree
       end
@@ -126,12 +145,12 @@ function M.get_indent(lnum)
   end
 
   local q = get_indents(vim.api.nvim_get_current_buf(), root, lang_tree:lang())
-  local is_empty_line = string.match(vim.fn.getline(lnum), "^%s*$") ~= nil
+  local is_empty_line = string.match(getline(lnum), "^%s*$") ~= nil
   local node ---@type TSNode
   if is_empty_line then
     local prevlnum = vim.fn.prevnonblank(lnum)
     local indent = vim.fn.indent(prevlnum)
-    local prevline = vim.trim(vim.fn.getline(prevlnum))
+    local prevline = vim.trim(getline(prevlnum))
     -- The final position can be trailing spaces, which should not affect indentation
     node = get_last_node_at_line(root, prevlnum, indent + #prevline - 1)
     if node:type():match "comment" then
@@ -147,7 +166,7 @@ function M.get_indent(lnum)
         node = get_last_node_at_line(root, prevlnum, col)
       end
     end
-    if q.indent["end"][node:id()] then
+    if q["indent.end"][node:id()] then
       node = get_first_node_at_line(root, lnum)
     end
   else
@@ -165,16 +184,16 @@ function M.get_indent(lnum)
   -- tracks to ensure multiple indent levels are not applied for same line
   local is_processed_by_row = {}
 
-  if q.indent.zero[node:id()] then
+  if q["indent.zero"][node:id()] then
     return 0
   end
 
   while node do
     -- do 'autoindent' if not marked as @indent
     if
-      not q.indent.begin[node:id()]
-      and not q.indent.align[node:id()]
-      and q.indent.auto[node:id()]
+      not q["indent.begin"][node:id()]
+      and not q["indent.align"][node:id()]
+      and q["indent.auto"][node:id()]
       and node:start() < lnum - 1
       and lnum - 1 <= node:end_()
     then
@@ -185,8 +204,8 @@ function M.get_indent(lnum)
     -- If a node spans from L1,C1 to L2,C2, we know that lines where L1 < line <= L2 would
     -- have their indentations contained by the node.
     if
-      not q.indent.begin[node:id()]
-      and q.indent.ignore[node:id()]
+      not q["indent.begin"][node:id()]
+      and q["indent.ignore"][node:id()]
       and node:start() < lnum - 1
       and lnum - 1 <= node:end_()
     then
@@ -199,7 +218,7 @@ function M.get_indent(lnum)
 
     if
       not is_processed_by_row[srow]
-      and ((q.indent.branch[node:id()] and srow == lnum - 1) or (q.indent.dedent[node:id()] and srow ~= lnum - 1))
+      and ((q["indent.branch"][node:id()] and srow == lnum - 1) or (q["indent.dedent"][node:id()] and srow ~= lnum - 1))
     then
       indent = indent - indent_size
       is_processed = true
@@ -215,16 +234,16 @@ function M.get_indent(lnum)
     if
       should_process
       and (
-        q.indent.begin[node:id()]
-        and (srow ~= erow or is_in_err or q.indent.begin[node:id()]["indent.immediate"])
-        and (srow ~= lnum - 1 or q.indent.begin[node:id()]["indent.start_at_same_line"])
+        q["indent.begin"][node:id()]
+        and (srow ~= erow or is_in_err or q["indent.begin"][node:id()]["indent.immediate"])
+        and (srow ~= lnum - 1 or q["indent.begin"][node:id()]["indent.start_at_same_line"])
       )
     then
       indent = indent + indent_size
       is_processed = true
     end
 
-    if is_in_err and not q.indent.align[node:id()] then
+    if is_in_err and not q["indent.align"][node:id()] then
       -- only when the node is in error, promote the
       -- first child's aligned indent to the error node
       -- to work around ((ERROR "X" . (_)) @aligned_indent (#set! "delimeter" "AB"))
@@ -232,15 +251,15 @@ function M.get_indent(lnum)
       -- (ERROR "X" @aligned_indent (#set! "delimeter" "AB") . (_))
       -- and we will fish it out here.
       for c in node:iter_children() do
-        if q.indent.align[c:id()] then
-          q.indent.align[node:id()] = q.indent.align[c:id()]
+        if q["indent.align"][c:id()] then
+          q["indent.align"][node:id()] = q["indent.align"][c:id()]
           break
         end
       end
     end
     -- do not indent for nodes that starts-and-ends on same line and starts on target line (lnum)
-    if should_process and q.indent.align[node:id()] and (srow ~= erow or is_in_err) and (srow ~= lnum - 1) then
-      local metadata = q.indent.align[node:id()]
+    if should_process and q["indent.align"][node:id()] and (srow ~= erow or is_in_err) and (srow ~= lnum - 1) then
+      local metadata = q["indent.align"][node:id()]
       local o_delim_node, o_is_last_in_line ---@type TSNode|nil, boolean|nil
       local c_delim_node, c_is_last_in_line ---@type TSNode|nil, boolean|nil, boolean|nil
       local indent_is_absolute = false

From 102f1b2f55575f0a2f18be92eafc0e7142024ad1 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 17 May 2023 22:29:01 +0900
Subject: [PATCH 0337/2704] fixup: use correct require syntax

---
 lua/nvim-treesitter/indent.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index f453127bc..a4bec1213 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -1,5 +1,5 @@
 local ts = vim.treesitter
-local parsers = require "lua.nvim-treesitter.parsers"
+local parsers = require "nvim-treesitter.parsers"
 
 local M = {}
 

From 16cce8df58b83b328e8448087308e3a90da6fa17 Mon Sep 17 00:00:00 2001
From: Christoph Sax <xasc@users.noreply.github.com>
Date: Thu, 18 May 2023 09:40:13 +0200
Subject: [PATCH 0338/2704] feat(t32): add indent rules (#4782)

---
 lockfile.json                           |   2 +-
 lua/nvim-treesitter/parsers.lua         |   2 +-
 queries/t32/highlights.scm              |   1 +
 queries/t32/indents.scm                 |  36 +++++++
 tests/indent/t32/if_block.cmm           |  49 +++++++++
 tests/indent/t32/repeat_block.cmm       |  27 +++++
 tests/indent/t32/subroutine_block.cmm   |  23 +++++
 tests/indent/t32/while_block.cmm        |  14 +++
 tests/indent/t32_spec.lua               | 130 ++++++++++++++++++++++++
 tests/query/highlights/t32/keywords.cmm |   5 +
 tests/query/highlights/t32/literals.cmm |   7 +-
 11 files changed, 291 insertions(+), 5 deletions(-)
 create mode 100644 queries/t32/indents.scm
 create mode 100644 tests/indent/t32/if_block.cmm
 create mode 100644 tests/indent/t32/repeat_block.cmm
 create mode 100644 tests/indent/t32/subroutine_block.cmm
 create mode 100644 tests/indent/t32/while_block.cmm
 create mode 100644 tests/indent/t32_spec.lua

diff --git a/lockfile.json b/lockfile.json
index c18051eab..82897340d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -474,7 +474,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "4fca25fa99b6fd9ccf9cab9b6bf702a9df142ad5"
+    "revision": "1dd98248b01e4a3933c1b85b58bab0875e2ba437"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8cd86213a..852ee735e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1403,7 +1403,7 @@ list.t32 = {
   install_info = {
     url = "https://codeberg.org/xasc/tree-sitter-t32",
     files = { "src/parser.c", "src/scanner.c" },
-    revision = "675cd7de4eb80f2faa1e6d3bc9ee195fa9ef9790",
+    revision = "1dd98248b01e4a3933c1b85b58bab0875e2ba437",
   },
   maintainers = { "@xasc" },
 }
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index 0e4eb7bd5..e5cba0125 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -121,6 +121,7 @@
 ; Parameter declarations
 (parameter_declaration
   command: (identifier) @keyword
+  (identifier)? @constant.builtin
   macro: (macro) @parameter)
 
 ; Control flow
diff --git a/queries/t32/indents.scm b/queries/t32/indents.scm
new file mode 100644
index 000000000..60e2782fb
--- /dev/null
+++ b/queries/t32/indents.scm
@@ -0,0 +1,36 @@
+; Subroutines & scoping
+(block
+  ")" @indent.branch .) @indent.begin
+
+
+; Control flow statements
+(
+  (if_block
+    _*
+    condition: (_)
+    . (_) @_then) @indent.begin
+  (#not-has-type? @_then block)
+)
+
+(else_block) @indent.branch
+
+(else_block
+  (if_block) @indent.dedent) @indent.branch
+
+(
+  (else_block
+    (if_block
+      _*
+      condition: (_)
+      . (_) @_then)) @indent.branch
+  (#not-has-type? @_then block)
+)
+
+(while_block
+  (command_expression)) @indent.begin
+
+(repeat_block
+  (command_expression)) @indent.begin
+
+
+(comment) @indent.ignore
diff --git a/tests/indent/t32/if_block.cmm b/tests/indent/t32/if_block.cmm
new file mode 100644
index 000000000..e85b5e714
--- /dev/null
+++ b/tests/indent/t32/if_block.cmm
@@ -0,0 +1,49 @@
+IF &a
+  STOP
+
+IF (TRUE())
+(
+  BREAK
+)
+
+IF (&b+CouNT())
+(
+  continue
+)
+
+IF FOUND()
+  STOP
+ELSE
+  CONTinue
+
+IF &c
+  CONTinue
+ELSE IF FALSE()
+  Break
+ELSE
+  stop
+
+IF &d
+(
+  STOP
+)
+ELSE IF &e
+; comment A
+(
+  CONTINUE
+)
+ELSE
+; comment B
+(
+  BREAK
+)
+
+IF &f
+  IF &g
+    stop
+  ELSE
+    IF &h
+  (
+    continue
+  )
+
diff --git a/tests/indent/t32/repeat_block.cmm b/tests/indent/t32/repeat_block.cmm
new file mode 100644
index 000000000..6384183dc
--- /dev/null
+++ b/tests/indent/t32/repeat_block.cmm
@@ -0,0 +1,27 @@
+RePeaT 10. PRINT "A"
+
+RePeaT &a
+  print
+
+REPEAT 0xaAfF09
+(
+  cont
+)
+
+RPT
+(
+  b
+)
+
+rpt
+(
+  s
+)
+WHILE &a
+
+REPEAT TRUE()
+; comment
+(
+  cont
+)
+
diff --git a/tests/indent/t32/subroutine_block.cmm b/tests/indent/t32/subroutine_block.cmm
new file mode 100644
index 000000000..24891c609
--- /dev/null
+++ b/tests/indent/t32/subroutine_block.cmm
@@ -0,0 +1,23 @@
+printA:
+(
+  PRINT "A"
+  RETURN
+)
+
+sUBROUtINE printB
+(
+  ENTRY &in
+
+  PRINT "&in"
+  RETURN
+)
+
+SUBROUTINE printC
+// comment
+(
+  PARAMETERS &a &b
+
+  PRINT "&a"+"&b"
+  ENDDO
+)
+
diff --git a/tests/indent/t32/while_block.cmm b/tests/indent/t32/while_block.cmm
new file mode 100644
index 000000000..bfcbd45db
--- /dev/null
+++ b/tests/indent/t32/while_block.cmm
@@ -0,0 +1,14 @@
+WHILE &a
+  Step
+
+WHILE (sYmbol.EXIT(main))
+(
+  Step
+  Break
+)
+
+WHILE (FALSE())
+// comment
+(
+  ECHO "test"
+)
diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua
new file mode 100644
index 000000000..8ab31387d
--- /dev/null
+++ b/tests/indent/t32_spec.lua
@@ -0,0 +1,130 @@
+local Runner = require("tests.indent.common").Runner
+local XFAIL = require("tests.indent.common").XFAIL
+
+local runner = Runner:new(it, "tests/indent/t32", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent t32:", function()
+  describe("whole file:", function()
+    runner:whole_file "."
+  end)
+
+  describe("new line:", function()
+    runner:new_line("if_block.cmm", { on_line = 2, text = "GOTO start", indent = 0 }, "command after IF", XFAIL)
+
+    runner:new_line("if_block.cmm", { on_line = 5, text = "GOTO start", indent = 2 }, "command in IF then block", XFAIL)
+
+    runner:new_line("if_block.cmm", { on_line = 4, text = "(", indent = 0 }, "block after IF")
+
+    for ii, test in ipairs {
+      { 1, 2 },
+      { 14, 2 },
+      { 19, 2 },
+      { 21, 2 },
+      { 41, 2 },
+      { 42, 4 },
+    } do
+      runner:new_line(
+        "if_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in IF then[" .. ii .. "]",
+        XFAIL
+      )
+    end
+
+    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 4 }, "command in IF then")
+
+    for ii, test in ipairs {
+      { 16, 2 },
+      { 21, 2 },
+      { 23, 2 },
+      { 44, 4 },
+    } do
+      runner:new_line(
+        "if_block.cmm",
+        { on_line = test[1], text = "(\n", indent = test[2] },
+        "command in IF else[" .. ii .. "]",
+        XFAIL
+      )
+    end
+
+    runner:new_line("while_block.cmm", { on_line = 2, text = "&x=1.", indent = 0 }, "command after WHILE", XFAIL)
+
+    runner:new_line("while_block.cmm", { on_line = 4, text = "&x=1.", indent = 0 }, "command after WHILE")
+
+    runner:new_line("while_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block in WHILE then")
+
+    for ii, test in ipairs {
+      { 5, 2 },
+      { 12, 2 },
+    } do
+      runner:new_line(
+        "while_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in WHILE then block[" .. ii .. "]",
+        XFAIL
+      )
+    end
+
+    for ii, test in ipairs {
+      { 1, 0, nil },
+      { 4, 0, XFAIL },
+    } do
+      runner:new_line(
+        "repeat_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command after RePeaT[" .. ii .. "]",
+        test[3]
+      )
+    end
+
+    runner:new_line("repeat_block.cmm", { on_line = 3, text = "(\n", indent = 0 }, "block in RePeaT then")
+
+    for ii, test in ipairs {
+      { 7, 2, XFAIL },
+      { 18, 2, nil },
+      { 24, 2, XFAIL },
+    } do
+      runner:new_line(
+        "repeat_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in RePeaT then block[" .. ii .. "]",
+        test[3]
+      )
+    end
+
+    runner:new_line("subroutine_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block after call label")
+
+    for ii, test in ipairs {
+      { 2, 2, XFAIL },
+      { 3, 2, nil },
+      { 8, 2, XFAIL },
+      { 12, 2, nil },
+      { 19, 2, XFAIL },
+    } do
+      runner:new_line(
+        "subroutine_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in subroutine block[" .. ii .. "]",
+        test[3]
+      )
+    end
+
+    for ii, test in ipairs {
+      { 5, 2 },
+      { 13, 2 },
+      { 23, 2 },
+    } do
+      runner:new_line(
+        "subroutine_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command after subroutine block[" .. ii .. "]",
+        XFAIL
+      )
+    end
+  end)
+end)
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
index e9eb0e37f..f51786e46 100644
--- a/tests/query/highlights/t32/keywords.cmm
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -5,6 +5,11 @@ ENTRY &password
 ; <- keyword
 ;        ^ parameter
 
+ENTRY %LINE &salt
+; <- keyword
+;      ^ constant.builtin
+;            ^ parameter
+
 IF "&password"==""
 ; <- conditional
 ;  ^ string
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
index f63348490..b1662639b 100644
--- a/tests/query/highlights/t32/literals.cmm
+++ b/tests/query/highlights/t32/literals.cmm
@@ -27,9 +27,10 @@ List `main`
 ;           ^ operator
 ;                       ^ character
 
-Data.Set 0xffff800000 0y0011xx01xx&&a
-;                     ^ number
-;                                 ^ operator
+Data.Set N: 0xffff800000 0y0011xx01xx&&a
+;        ^ number
+;                        ^ number
+;                                    ^ operator
 
 WinPOS 0% 85% 100% 15%
 ;             ^ number

From 4d0520ee0903eb04c218447b48fa30ffbd4682cc Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 18 May 2023 08:18:13 +0000
Subject: [PATCH 0339/2704] Update parsers: c_sharp, erlang, glsl, hlsl,
 nickel, t32

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 82897340d..9a9d445af 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "424d0145efb0a87927269ab47709f98a564f8c4f"
   },
   "c_sharp": {
-    "revision": "76114711aedd3f4b6e1333a7513975647930c629"
+    "revision": "aaafc3d75f058ca5fe639b7ed5829964a3ca4575"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -117,7 +117,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "7d083ca431265a6a677c10e8ca68a908ab0c2bc8"
+    "revision": "13a6a51d1bda845f756971773dd6049b80a3cffc"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -168,7 +168,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "f21fc834ee48cc485c85f5df7099e00058dbc180"
+    "revision": "7a005091d3896dab80f34d8dba58935ad7ad6353"
   },
   "go": {
     "revision": "64457ea6b73ef5422ed1687178d4545c3e91334a"
@@ -207,7 +207,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "916042734060d3d3a023f6637c815a1d23814af8"
+    "revision": "cad6130182be8793ca5ef00a8581508e2f12f642"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -312,7 +312,7 @@
     "revision": "e2053f7c8856d91bc36c87604f697784845cee69"
   },
   "nickel": {
-    "revision": "d6c7eeb751038f934b5b1aa7ff236376d0235c56"
+    "revision": "3a794388773f2424a97b2186828aa3fac4c66ce6"
   },
   "ninja": {
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
@@ -474,7 +474,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "1dd98248b01e4a3933c1b85b58bab0875e2ba437"
+    "revision": "c5ab392fece192875d2206da487449b856afcdef"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From 1aea2eee29b43c7ac42aa7487082d1163cd433e3 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 19 May 2023 00:57:18 +0900
Subject: [PATCH 0340/2704] refactor: add notes for swift

Also add enum_class_body
---
 queries/swift/indents.scm | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index 4207a788b..39ad59405 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -1,16 +1,18 @@
 [
-  (protocol_body)
-  (class_body)
-  (function_declaration)
-  (computed_property)
-  (subscript_declaration)
+  ; ... refers to the section that will get affected by this indent.begin capture
+  (protocol_body)               ; protocol Foo { ... }
+  (class_body)                  ; class Foo { ... }
+  (enum_class_body)             ; enum Foo { ... }
+  (function_declaration)        ; func Foo (...) {...}
+  (computed_property)           ; { ... }
+  (subscript_declaration)       ; subscript Foo(...) { ... }
 
-  (computed_getter)
-  (computed_setter)
+  (computed_getter)             ; get { ... }
+  (computed_setter)             ; set { ... }
 
-  (assignment)
+  (assignment)                  ; a = b
 
-  (control_transfer_statement) ; return ...
+  (control_transfer_statement)  ; return ...
   (for_statement)
   (while_statement)
   (repeat_while_statement)
@@ -19,15 +21,15 @@
   (switch_statement)
   (guard_statement)
 
-  (type_parameters) ; x<Foo>
-  (tuple_type) ; (...)
-  (array_type) ; [String]
-  (dictionary_type); [Foo: Bar]
+  (type_parameters)             ; x<Foo>
+  (tuple_type)                  ; (...)
+  (array_type)                  ; [String]
+  (dictionary_type)             ; [Foo: Bar]
 
-  (call_expression)
-  (tuple_expression)
-  (array_literal)
-  (dictionary_literal)
+  (call_expression)             ; callFunc(...)
+  (tuple_expression)            ; ( foo + bar )
+  (array_literal)               ; [ foo, bar ]
+  (dictionary_literal)          ; [ foo: bar, x: y ]
   (lambda_literal) 
 ] @indent.begin
 
@@ -59,6 +61,9 @@
 (if_statement
   (if_statement) @indent.dedent)
 
+; case Foo:
+; default Foo:
+; @attribute default Foo:
 (switch_entry . _ @indent.branch)
 
 (function_declaration ")" @indent.branch)

From 865483f8d1c6e263a1a9efd46f84e78ec5fa31d4 Mon Sep 17 00:00:00 2001
From: Emilia Simmons <emilia.milisims@gmail.com>
Date: Thu, 18 May 2023 11:30:10 -0400
Subject: [PATCH 0341/2704] fix(query): allow multiline modeline
 (inherits/extends)

---
 queries/query/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index ee31a7e7e..b9c09fb95 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -27,8 +27,8 @@
 ((parameters (identifier) @number)
  (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
 
-((program . (comment) @include)
+((program . (comment)* . (comment) @include)
  (#match? @include "^;\ +inherits\ *:"))
 
-((program . (comment) @preproc)
+((program . (comment)* . (comment) @preproc)
  (#match? @preproc "^; +extends"))

From 00580583862ab63317f44dc90fd440a8a19055be Mon Sep 17 00:00:00 2001
From: Emilia Simmons <emilia.milisims@gmail.com>
Date: Thu, 18 May 2023 12:00:38 -0400
Subject: [PATCH 0342/2704] add multiple ; for highlighting

---
 queries/query/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index b9c09fb95..8865b62d7 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -28,7 +28,7 @@
  (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
 
 ((program . (comment)* . (comment) @include)
- (#match? @include "^;\ +inherits\ *:"))
+ (#match? @include "^;+ +inherits *:"))
 
 ((program . (comment)* . (comment) @preproc)
- (#match? @preproc "^; +extends"))
+ (#match? @preproc "^;+ +extends"))

From 58da7fe93ea617b1dc85d5e728b4cc78582cd536 Mon Sep 17 00:00:00 2001
From: Emilia Simmons <emilia.milisims@gmail.com>
Date: Thu, 18 May 2023 12:05:02 -0400
Subject: [PATCH 0343/2704] allow no spaces for extend/inherit comments

---
 queries/query/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 8865b62d7..8d7ab6f77 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -28,7 +28,7 @@
  (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
 
 ((program . (comment)* . (comment) @include)
- (#match? @include "^;+ +inherits *:"))
+ (#match? @include "^;+ *inherits *:"))
 
 ((program . (comment)* . (comment) @preproc)
- (#match? @preproc "^;+ +extends"))
+ (#match? @preproc "^;+ *extends"))

From a02a06a068f92ec0e4cc0490afdc76bf4fcc407b Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Fri, 19 May 2023 08:25:51 +0700
Subject: [PATCH 0344/2704] highlights(typescript): `:` in `switch` statement

---
 queries/ecma/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 9fe50ac34..eb6d3d4a9 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -207,6 +207,7 @@
 
 (pair ":" @punctuation.delimiter)
 (pair_pattern ":" @punctuation.delimiter)
+(switch_case ":" @punctuation.delimiter)
 
 [
   "--"

From 05df88ebaa94d30d682d076244615786d9e7c1a5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 19 May 2023 06:35:42 +0000
Subject: [PATCH 0345/2704] Update parsers: dart

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 9a9d445af..2e7893005 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "d56cc088de91d5a7ef7ec46b5a5ab4aa3fe82409"
+    "revision": "8aa8ab977647da2d4dcfb8c4726341bee26fbce4"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"

From dad1b7cd6606ffaa5c283ba73d707b4741a5f445 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 18 May 2023 19:37:56 -0400
Subject: [PATCH 0346/2704] feat: add Objective-C

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/objc/folds.scm          |  20 +++
 queries/objc/highlights.scm     | 216 ++++++++++++++++++++++++++++++++
 queries/objc/indents.scm        |   1 +
 queries/objc/injections.scm     |  10 ++
 queries/objc/locals.scm         |   1 +
 8 files changed, 260 insertions(+)
 create mode 100644 queries/objc/folds.scm
 create mode 100644 queries/objc/highlights.scm
 create mode 100644 queries/objc/indents.scm
 create mode 100644 queries/objc/injections.scm
 create mode 100644 queries/objc/locals.scm

diff --git a/README.md b/README.md
index 3b9f577cc..d8b274ca7 100644
--- a/README.md
+++ b/README.md
@@ -281,6 +281,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ninja](https://github.com/alemuller/tree-sitter-ninja) (maintained by @alemuller)
 - [x] [nix](https://github.com/cstrahan/tree-sitter-nix) (maintained by @leo60228)
 - [x] [norg](https://github.com/nvim-neorg/tree-sitter-norg) (maintained by @JoeyGrajciar, @vhyrro)
+- [x] [objc](https://github.com/amaanq/tree-sitter-objc) (maintained by @amaanq)
 - [x] [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) (maintained by @undu)
diff --git a/lockfile.json b/lockfile.json
index 2e7893005..f0543a1fc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -323,6 +323,9 @@
   "norg": {
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
+  "objc": {
+    "revision": "90773a72d84d3c9a6eb8e373980e9b6b0bb665a0"
+  },
   "ocaml": {
     "revision": "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 852ee735e..22bb616a0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -982,6 +982,14 @@ list.norg = {
   maintainers = { "@JoeyGrajciar", "@vhyrro" },
 }
 
+list.objc = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-objc",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.ocaml = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-ocaml",
diff --git a/queries/objc/folds.scm b/queries/objc/folds.scm
new file mode 100644
index 000000000..43ffc78e9
--- /dev/null
+++ b/queries/objc/folds.scm
@@ -0,0 +1,20 @@
+; inherits: c
+
+[
+  (class_declaration)
+  (class_interface)
+  (class_implementation)
+  (protocol_declaration)
+  (property_declaration)
+  (method_declaration)
+  (struct_declaration)
+  (struct_declarator)
+  (try_statement)
+  (catch_statement)
+  (finally_statement)
+  (throw_statement)
+  (block_literal)
+  (ms_asm_block)
+  (dictionary_literal)
+  (array_literal)
+] @fold
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
new file mode 100644
index 000000000..c636895f6
--- /dev/null
+++ b/queries/objc/highlights.scm
@@ -0,0 +1,216 @@
+; inherits: c
+
+; Preprocs
+
+(preproc_undef
+  name: (_) @constant) @preproc
+
+; Includes
+
+(module_import "@import" @include path: (identifier) @namespace)
+
+((preproc_include
+  _ @include path: (_))
+  (#any-of? @include "#include" "#import"))
+
+; Type Qualifiers
+
+[
+  "@optional"
+  "@required"
+  "__covariant"
+  "__contravariant"
+  (visibility_specification)
+] @type.qualifier
+
+; Storageclasses
+
+[
+  "@autoreleasepool"
+  "@synthesize"
+  "@dynamic"
+  "volatile"
+  (protocol_qualifier)
+] @storageclass
+
+; Keywords
+
+[
+  "@protocol"
+  "@interface"
+  "@implementation"
+  "@compatibility_alias"
+  "@property"
+  "@selector"
+  "@defs"
+  "availability"
+  "@end"
+] @keyword
+
+(class_declaration "@" @keyword "class" @keyword) ; I hate Obj-C for allowing "@ class" :)
+
+(method_definition ["+" "-"] @keyword.function)
+(method_declaration ["+" "-"] @keyword.function)
+
+[
+  "__typeof__"
+  "__typeof"
+  "typeof"
+  "in"
+] @keyword.operator
+
+[
+  "@synchronized"
+  "oneway"
+] @keyword.coroutine
+
+; Exceptions
+
+[
+  "@try"
+  "__try"
+  "@catch"
+  "__catch"
+  "@finally"
+  "__finally"
+  "@throw"
+] @exception
+
+; Variables
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "self" "super"))
+
+; Functions & Methods
+
+[
+  "objc_bridge_related"
+  "@available"
+  "__builtin_available"
+  "va_arg"
+  "asm"
+] @function.builtin
+
+(method_definition (identifier) @method)
+
+(method_declaration (identifier) @method)
+
+(method_identifier (identifier)? @method ":" @method (identifier)? @method)
+
+(message_expression method: (identifier) @method.call)
+
+; Constructors
+
+((message_expression method: (identifier) @constructor)
+  (#eq? @constructor "init"))
+
+; Attributes
+
+(availability_attribute_specifier 
+  [
+    "CF_FORMAT_FUNCTION" "NS_AVAILABLE" "__IOS_AVAILABLE" "NS_AVAILABLE_IOS"
+    "API_AVAILABLE" "API_UNAVAILABLE" "API_DEPRECATED" "NS_ENUM_AVAILABLE_IOS"
+    "NS_DEPRECATED_IOS" "NS_ENUM_DEPRECATED_IOS" "NS_FORMAT_FUNCTION" "DEPRECATED_MSG_ATTRIBUTE"
+    "__deprecated_msg" "__deprecated_enum_msg" "NS_SWIFT_NAME" "NS_SWIFT_UNAVAILABLE"
+    "NS_EXTENSION_UNAVAILABLE_IOS" "NS_CLASS_AVAILABLE_IOS" "NS_CLASS_DEPRECATED_IOS" "__OSX_AVAILABLE_STARTING"
+    "NS_ROOT_CLASS" "NS_UNAVAILABLE" "NS_REQUIRES_NIL_TERMINATION" "CF_RETURNS_RETAINED"
+    "CF_RETURNS_NOT_RETAINED" "DEPRECATED_ATTRIBUTE" "UI_APPEARANCE_SELECTOR" "UNAVAILABLE_ATTRIBUTE"
+  ]) @attribute
+
+; Macros
+
+(type_qualifier
+  [
+    "_Complex"
+    "_Nonnull"
+    "_Nullable"
+    "_Nullable_result"
+    "_Null_unspecified"
+    "__autoreleasing"
+    "__block"
+    "__bridge"
+    "__bridge_retained"
+    "__bridge_transfer"
+    "__complex"
+    "__kindof"
+    "__nonnull"
+    "__nullable"
+    "__ptrauth_objc_class_ro"
+    "__ptrauth_objc_isa_pointer"
+    "__ptrauth_objc_super_pointer"
+    "__strong"
+    "__thread"
+    "__unsafe_unretained"
+    "__unused"
+    "__weak"
+  ]) @function.macro.builtin
+
+[ "__real" "__imag" ] @function.macro.builtin
+
+((call_expression function: (identifier) @function.macro)
+  (#eq? @function.macro "testassert"))
+
+; Types
+
+(class_declaration (identifier) @type)
+
+(class_interface "@interface" . (identifier) @type superclass: _? @type category: _? @namespace)
+
+(class_implementation "@implementation" . (identifier) @type superclass: _? @type category: _? @namespace)
+
+(protocol_forward_declaration (identifier) @type) ; @interface :(
+
+(protocol_reference_list (identifier) @type) ; ^
+
+[
+  "BOOL"
+  "IMP"
+  "SEL"
+  "Class"
+  "id"
+] @type.builtin
+
+; Constants
+
+(property_attribute (identifier) @constant "="?)
+
+[ "__asm" "__asm__" ] @constant.macro
+
+; Properties
+
+(property_implementation "@synthesize" (identifier) @property)
+
+((identifier) @property
+  (#has-ancestor? @property struct_declaration))
+
+; Parameters
+
+(method_parameter ":" @method (identifier) @parameter)
+
+(method_parameter declarator: (identifier) @parameter)
+
+(parameter_declaration 
+  declarator: (function_declarator 
+                declarator: (parenthesized_declarator 
+                              (block_pointer_declarator 
+                                declarator: (identifier) @parameter))))
+
+"..." @parameter.builtin
+
+; Operators
+
+[
+  "^"
+] @operator
+
+; Literals
+
+(platform) @string.special
+
+(version_number) @text.uri @number
+
+; Punctuation
+
+"@" @punctuation.special
+
+[ "<" ">" ] @punctuation.bracket
diff --git a/queries/objc/indents.scm b/queries/objc/indents.scm
new file mode 100644
index 000000000..a5a5208ca
--- /dev/null
+++ b/queries/objc/indents.scm
@@ -0,0 +1 @@
+; inherits: c
diff --git a/queries/objc/injections.scm b/queries/objc/injections.scm
new file mode 100644
index 000000000..359420d10
--- /dev/null
+++ b/queries/objc/injections.scm
@@ -0,0 +1,10 @@
+; inherits: c
+
+; TODO(amaanq): uncomment/add when I add asm support
+; (ms_asm_block "{" _ @asm "}")
+;
+; ((asm_specifier (string_literal) @asm)
+;   (#offset! @asm 0 1 0 -1))
+;
+; ((asm_statement (string_literal) @asm)
+;   (#offset! @asm 0 1 0 -1))
diff --git a/queries/objc/locals.scm b/queries/objc/locals.scm
new file mode 100644
index 000000000..a5a5208ca
--- /dev/null
+++ b/queries/objc/locals.scm
@@ -0,0 +1 @@
+; inherits: c

From cbfb03bba5538cb843b347b82f4c2c0438f88e24 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 20 May 2023 03:37:48 -0400
Subject: [PATCH 0347/2704] chore(objc): update folds

---
 lockfile.json          | 2 +-
 queries/objc/folds.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f0543a1fc..991f028ba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
   "objc": {
-    "revision": "90773a72d84d3c9a6eb8e373980e9b6b0bb665a0"
+    "revision": "60b129046cbae347a478515906c17ab095588ef8"
   },
   "ocaml": {
     "revision": "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"
diff --git a/queries/objc/folds.scm b/queries/objc/folds.scm
index 43ffc78e9..b922f8bf8 100644
--- a/queries/objc/folds.scm
+++ b/queries/objc/folds.scm
@@ -10,8 +10,8 @@
   (struct_declaration)
   (struct_declarator)
   (try_statement)
-  (catch_statement)
-  (finally_statement)
+  (catch_clause)
+  (finally_clause)
   (throw_statement)
   (block_literal)
   (ms_asm_block)

From 3d5fe8caf85ff1e18963b0c6ded1cf6d3a648ffa Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 20 May 2023 07:53:59 +0000
Subject: [PATCH 0348/2704] Update parsers: c, gitcommit, scala, sql

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 991f028ba..7b5953487 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "424d0145efb0a87927269ab47709f98a564f8c4f"
+    "revision": "cac392ac3d7d365c469971b117e92a0df3bc8305"
   },
   "c_sharp": {
     "revision": "aaafc3d75f058ca5fe639b7ed5829964a3ca4575"
@@ -156,7 +156,7 @@
     "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
   },
   "gitcommit": {
-    "revision": "6c14f8b63767cf6264c5c43ec71cc9351420e831"
+    "revision": "9d8c81e8e64b3b4f4c36de1425c5fc841097d7f4"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -429,7 +429,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "7d348f51e442563f4ab2b6c3e136dac658649f93"
+    "revision": "78ae129292990224bcae025e7d3f4873a88f772d"
   },
   "scheme": {
     "revision": "6abcfe33d976ebe3e244ca80273c7e8a070441b5"
@@ -453,7 +453,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "0f774f4ce1fbc7aa6df6202301e0b08b8c844ae4"
+    "revision": "721087c8819cda10ca37f974e914ab9be46b290f"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From 8e59b4919d1a61bd4eb29c397bd19bab83883cbb Mon Sep 17 00:00:00 2001
From: fab4100 <fab4100@posteo.ch>
Date: Sat, 20 May 2023 14:41:54 -0400
Subject: [PATCH 0349/2704] fear(cpp): highlight brackets in
 template_parameter_list

---
 queries/cpp/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 9516645f6..c58d76aba 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -234,4 +234,7 @@
 (template_argument_list
   ["<" ">"] @punctuation.bracket)
 
+(template_parameter_list
+  ["<" ">"] @punctuation.bracket)
+
 (literal_suffix) @operator

From 8e817bebf9184cab6c59205e1aed3fdce11c8c51 Mon Sep 17 00:00:00 2001
From: fab4100 <fab4100@posteo.ch>
Date: Sat, 20 May 2023 21:52:54 -0400
Subject: [PATCH 0350/2704] feat: add Intel Implicit SPMD Program Compiler
 (ISPC)

* Add ISPC parser config

* Add ISPC queries

* Update queries/ispc/injections.scm

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

---------

Co-authored-by: Fabian Wermelinger <fab4100@posteo.net>
Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 lua/nvim-treesitter/parsers.lua |   9 ++
 queries/ispc/folds.scm          |   8 ++
 queries/ispc/highlights.scm     | 225 ++++++++++++++++++++++++++++++++
 queries/ispc/indents.scm        |   7 +
 queries/ispc/injections.scm     |   1 +
 queries/ispc/locals.scm         |  17 +++
 6 files changed, 267 insertions(+)
 create mode 100644 queries/ispc/folds.scm
 create mode 100644 queries/ispc/highlights.scm
 create mode 100644 queries/ispc/indents.scm
 create mode 100644 queries/ispc/injections.scm
 create mode 100644 queries/ispc/locals.scm

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 22bb616a0..adf17b49f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -703,6 +703,15 @@ list.ini = {
   experimental = true,
 }
 
+list.ispc = {
+  install_info = {
+    url = "https://github.com/fab4100/tree-sitter-ispc",
+    files = { "src/parser.c" },
+    generate_requires_npm = true,
+  },
+  maintainers = { "@fab4100" },
+}
+
 list.janet_simple = {
   install_info = {
     url = "https://github.com/sogaiu/tree-sitter-janet-simple",
diff --git a/queries/ispc/folds.scm b/queries/ispc/folds.scm
new file mode 100644
index 000000000..45d0ba131
--- /dev/null
+++ b/queries/ispc/folds.scm
@@ -0,0 +1,8 @@
+; inherits: c
+
+[
+  (foreach_statement)
+  (foreach_instance_statement)
+  (unmasked_statement)
+  (template_declaration)
+] @fold
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
new file mode 100644
index 000000000..6770d6bb9
--- /dev/null
+++ b/queries/ispc/highlights.scm
@@ -0,0 +1,225 @@
+; inherits: c
+
+[
+  "soa"
+  "task"
+  "launch"
+  "unmasked"
+  "template"
+  "typename"
+  (sync_expression)
+] @keyword
+
+[
+  "in"
+  "new"
+  "delete"
+] @keyword.operator
+
+[
+  "cdo"
+  "cfor"
+  "cwhile"
+  "foreach"
+  "foreach_tiled"
+  "foreach_active"
+  "foreach_unique"
+] @repeat
+
+[
+  "cif"
+] @conditional
+
+[
+  "varying"
+  "uniform"
+] @type.qualifier
+
+"__regcall" @attribute
+
+(overload_declarator name: _ @function)
+(foreach_statement range_operator: _ @operator)
+
+(short_vector ["<" ">"] @punctuation.bracket)
+(soa_qualifier ["<" ">"] @punctuation.bracket)
+(template_argument_list ["<" ">"] @punctuation.bracket)
+(template_parameter_list ["<" ">"] @punctuation.bracket)
+
+(llvm_identifier) @function.builtin
+
+; built-in variables
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin
+   "programCount"
+   "programIndex"
+   "taskCount"
+   "taskCount0"
+   "taskCount1"
+   "taskCount2"
+   "taskIndex"
+   "taskIndex0"
+   "taskIndex1"
+   "taskIndex2"
+   "threadCount"
+   "threadIndex"
+   ))
+
+; preprocessor constants
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin
+   "ISPC"
+   "ISPC_FP16_SUPPORTED"
+   "ISPC_FP64_SUPPORTED"
+   "ISPC_LLVM_INTRINSICS_ENABLED"
+   "ISPC_MAJOR_VERSION"
+   "ISPC_MINOR_VERSION"
+   "ISPC_POINTER_SIZE"
+   "ISPC_TARGET_AVX"
+   "ISPC_TARGET_AVX2"
+   "ISPC_TARGET_AVX512KNL"
+   "ISPC_TARGET_AVX512SKX"
+   "ISPC_TARGET_AVX512SPR"
+   "ISPC_TARGET_NEON"
+   "ISPC_TARGET_SSE2"
+   "ISPC_TARGET_SSE4"
+   "ISPC_UINT_IS_DEFINED"
+   "PI"
+   "TARGET_ELEMENT_WIDTH"
+   "TARGET_WIDTH"
+   ))
+
+; standard library built-in
+((type_identifier) @type.builtin
+  (#lua-match? @type.builtin "^RNGState"))
+
+(call_expression
+  function: (identifier) @function.builtin
+  (#any-of? @function.builtin
+   "abs"
+   "acos"
+   "all"
+   "alloca"
+   "and"
+   "any"
+   "aos_to_soa2"
+   "aos_to_soa3"
+   "aos_to_soa4"
+   "asin"
+   "assert"
+   "assume"
+   "atan"
+   "atan2"
+   "atomic_add_global"
+   "atomic_add_local"
+   "atomic_and_global"
+   "atomic_and_local"
+   "atomic_compare_exchange_global"
+   "atomic_compare_exchange_local"
+   "atomic_max_global"
+   "atomic_max_local"
+   "atomic_min_global"
+   "atomic_min_local"
+   "atomic_or_global"
+   "atomic_or_local"
+   "atomic_subtract_global"
+   "atomic_subtract_local"
+   "atomic_swap_global"
+   "atomic_swap_local"
+   "atomic_xor_global"
+   "atomic_xor_local"
+   "avg_down"
+   "avg_up"
+   "broadcast"
+   "ceil"
+   "clamp"
+   "clock"
+   "cos"
+   "count_leading_zeros"
+   "count_trailing_zeros"
+   "doublebits"
+   "exclusive_scan_add"
+   "exclusive_scan_and"
+   "exclusive_scan_or"
+   "exp"
+   "extract"
+   "fastmath"
+   "float16bits"
+   "floatbits"
+   "float_to_half"
+   "float_to_half_fast"
+   "float_to_srgb8"
+   "floor"
+   "frandom"
+   "frexp"
+   "half_to_float"
+   "half_to_float_fast"
+   "insert"
+   "intbits"
+   "invoke_sycl"
+   "isnan"
+   "ISPCAlloc"
+   "ISPCLaunch"
+   "ISPCSync"
+   "lanemask"
+   "ldexp"
+   "log"
+   "max"
+   "memcpy"
+   "memcpy64"
+   "memmove"
+   "memmove64"
+   "memory_barrier"
+   "memset"
+   "memset64"
+   "min"
+   "none"
+   "num_cores"
+   "or"
+   "packed_load_active"
+   "packed_store_active"
+   "packed_store_active2"
+   "packmask"
+   "popcnt"
+   "pow"
+   "prefetch_l1"
+   "prefetch_l2"
+   "prefetch_l3"
+   "prefetch_nt"
+   "prefetchw_l1"
+   "prefetchw_l2"
+   "prefetchw_l3"
+   "print"
+   "random"
+   "rcp"
+   "rcp_fast"
+   "rdrand"
+   "reduce_add"
+   "reduce_equal"
+   "reduce_max"
+   "reduce_min"
+   "rotate"
+   "round"
+   "rsqrt"
+   "rsqrt_fast"
+   "saturating_add"
+   "saturating_div"
+   "saturating_mul"
+   "saturating_sub"
+   "seed_rng"
+   "select"
+   "shift"
+   "shuffle"
+   "signbits"
+   "sign_extend"
+   "sin"
+   "sincos"
+   "soa_to_aos2"
+   "soa_to_aos3"
+   "soa_to_aos4"
+   "sqrt"
+   "streaming_load"
+   "streaming_load_uniform"
+   "streaming_store"
+   "tan"
+   "trunc"
+   ))
diff --git a/queries/ispc/indents.scm b/queries/ispc/indents.scm
new file mode 100644
index 000000000..cc0829d5c
--- /dev/null
+++ b/queries/ispc/indents.scm
@@ -0,0 +1,7 @@
+; inherits: c
+
+((foreach_statement body: (_) @_body) @indent.begin
+ (#not-has-type? @_body compound_statement))
+
+((foreach_instance_statement body: (_) @_body) @indent.begin
+ (#not-has-type? @_body compound_statement))
diff --git a/queries/ispc/injections.scm b/queries/ispc/injections.scm
new file mode 100644
index 000000000..a5a5208ca
--- /dev/null
+++ b/queries/ispc/injections.scm
@@ -0,0 +1 @@
+; inherits: c
diff --git a/queries/ispc/locals.scm b/queries/ispc/locals.scm
new file mode 100644
index 000000000..8eca18c67
--- /dev/null
+++ b/queries/ispc/locals.scm
@@ -0,0 +1,17 @@
+; inherits: c
+
+(reference_declarator
+  (identifier) @definition.var)
+
+(type_parameter_declaration
+  (type_identifier) @definition.type)
+(template_declaration) @scope
+
+(template_function
+  name: (identifier) @definition.function) @scope
+
+[
+ (foreach_statement)
+ (foreach_instance_statement)
+ (unmasked_statement)
+] @scope

From 1557f5cb9abae305c45accd31e8be841f43c907e Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sun, 21 May 2023 01:53:17 +0000
Subject: [PATCH 0351/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d8b274ca7..a13c4b617 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
+- [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
 - [x] [javascript](https://github.com/tree-sitter/tree-sitter-javascript) (maintained by @steelsojka)

From 18c393108eb61c2d5157815b9af0e8f5b75c5109 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 21 May 2023 06:34:37 +0000
Subject: [PATCH 0352/2704] Update parsers: cuda, glsl, hlsl, ispc, objc,
 ocaml, ocaml_interface

---
 lockfile.json | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7b5953487..848efd786 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "a27cb7b9d105c43205fa899f49bc0cc4cf399484"
+    "revision": "7f6b48249b8500d506bd424cfa8e4c9d83e17754"
   },
   "cue": {
     "revision": "f83fd9abbece9becb5232c517b9d47ff141e237a"
@@ -168,7 +168,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "7a005091d3896dab80f34d8dba58935ad7ad6353"
+    "revision": "190c86e633e6a6dfdb8a96f8b8460e347ff93f1c"
   },
   "go": {
     "revision": "64457ea6b73ef5422ed1687178d4545c3e91334a"
@@ -207,7 +207,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "cad6130182be8793ca5ef00a8581508e2f12f642"
+    "revision": "cd7a53e9f82a2612cae0115692f964e9d0c416e2"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -224,6 +224,9 @@
   "ini": {
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
+  "ispc": {
+    "revision": "a5c2fd44a6a7fe4230c72d651c1b9b2d28fc20fe"
+  },
   "janet_simple": {
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
@@ -324,13 +327,13 @@
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
   "objc": {
-    "revision": "60b129046cbae347a478515906c17ab095588ef8"
+    "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
   },
   "ocaml": {
-    "revision": "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"
+    "revision": "a09c63f4d754d2d2dffb7265f6e6f39c9e6e6db1"
   },
   "ocaml_interface": {
-    "revision": "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"
+    "revision": "a09c63f4d754d2d2dffb7265f6e6f39c9e6e6db1"
   },
   "ocamllex": {
     "revision": "ac1d5957e719d49bd6acd27439b79843e4daf8ed"

From 741260618d30c2cdb8706f8bcea273557a25bbfa Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 21 May 2023 11:48:08 +0200
Subject: [PATCH 0353/2704] highlights(query): prefer lua-match

---
 queries/query/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 8d7ab6f77..f2d2ef6c7 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -28,7 +28,7 @@
  (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
 
 ((program . (comment)* . (comment) @include)
- (#match? @include "^;+ *inherits *:"))
+ (#lua-match? @include "^;+ *inherits *:"))
 
 ((program . (comment)* . (comment) @preproc)
- (#match? @preproc "^;+ *extends"))
+ (#lua-match? @preproc "^;+ *extends"))

From f2778bd1a28b74adf5b1aa51aa57da85adfa3d16 Mon Sep 17 00:00:00 2001
From: mohsen <smoka7@hotmail.com>
Date: Sat, 20 May 2023 12:26:24 +0330
Subject: [PATCH 0354/2704] highlights(go): add some highlights

- added missing operators
- added iota constant
- added comparable type
- edited  go keyword types
---
 queries/go/highlights.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index f2bdf6a83..05c491eb2 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -64,6 +64,8 @@
   "&"
   "&&"
   "&="
+  "&^"
+  "&^="
   "%"
   "%="
   "^"
@@ -92,15 +94,12 @@
 
 [
   "break"
-  "chan"
   "const"
   "continue"
   "default"
   "defer"
-  "go"
   "goto"
   "interface"
-  "map"
   "range"
   "select"
   "struct"
@@ -111,6 +110,7 @@
 
 "func" @keyword.function
 "return" @keyword.return
+"go" @keyword.coroutine
 
 "for" @repeat
 
@@ -134,6 +134,8 @@
            "any"
            "bool"
            "byte"
+           "chan"
+           "comparable"
            "complex128"
            "complex64"
            "error"
@@ -144,6 +146,7 @@
            "int32"
            "int64"
            "int8"
+           "map"
            "rune"
            "string"
            "uint"
@@ -206,7 +209,10 @@
  (false)
 ] @boolean
 
-(nil) @constant.builtin
+[
+ (nil)
+ (iota)
+] @constant.builtin
 
 (keyed_element
   . (literal_element (identifier) @field))

From b8ddb83d606c9f7f6b76843246ee9820353b417e Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Tue, 23 May 2023 23:53:04 +0200
Subject: [PATCH 0355/2704] highlights(sql): add keyword `overwrite`

---
 lockfile.json              | 2 +-
 queries/sql/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 848efd786..9ebf18391 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -456,7 +456,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "721087c8819cda10ca37f974e914ab9be46b290f"
+    "revision": "63a6bad6d4ca2192cf252e10db73627414546732"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 1aaab65dd..561b19a03 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -110,6 +110,7 @@
   (keyword_replace)
   (keyword_update)
   (keyword_into)
+  (keyword_overwrite)
   (keyword_values)
   (keyword_set)
   (keyword_left)

From ad75d3c4bdd1e88bcac2c385d355c591ba7dee67 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 24 May 2023 17:37:45 +0900
Subject: [PATCH 0356/2704] fix(indent): return early if query doesn't exist

---
 lua/nvim-treesitter/indent.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index a4bec1213..40c0cda46 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -96,6 +96,9 @@ local get_indents = memoize(function(bufnr, root, lang)
 
   --TODO(clason): remove when dropping Nvim 0.8 compat
   local query = (ts.query.get or ts.get_query)(lang, "indents")
+  if not query then
+    return map
+  end
   for id, node, metadata in query:iter_captures(root, bufnr) do
     if query.captures[id]:sub(1, 1) ~= "_" then
       map[query.captures[id]][node:id()] = metadata or {}

From 9bef7260449b4ed5e917eda87b6eca6853526329 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 24 May 2023 06:36:00 +0000
Subject: [PATCH 0357/2704] Update parsers: c, cuda, scala, t32

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9ebf18391..1f14baf88 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "cac392ac3d7d365c469971b117e92a0df3bc8305"
+    "revision": "a015709e7d1bb4f823a2fc53175e0cbee96c1c3e"
   },
   "c_sharp": {
     "revision": "aaafc3d75f058ca5fe639b7ed5829964a3ca4575"
@@ -69,7 +69,7 @@
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "7f6b48249b8500d506bd424cfa8e4c9d83e17754"
+    "revision": "9c20a3120c405db9efda9349cd005c29f2aace3c"
   },
   "cue": {
     "revision": "f83fd9abbece9becb5232c517b9d47ff141e237a"
@@ -432,7 +432,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "78ae129292990224bcae025e7d3f4873a88f772d"
+    "revision": "5aefc0ae4c174fa74d6e973faefa28692e081954"
   },
   "scheme": {
     "revision": "6abcfe33d976ebe3e244ca80273c7e8a070441b5"
@@ -480,7 +480,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "c5ab392fece192875d2206da487449b856afcdef"
+    "revision": "b4dca3527463274de1f3263c0e1c329bc3b4f514"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From dae928b3bbbcdd3890c61549bdc4c50e1e0d3094 Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Thu, 25 May 2023 07:53:14 +0200
Subject: [PATCH 0358/2704] indents(sql): initial support (#4857)

* indents(sql): initial support

* indents(sql): fix queries and lua style
---
 queries/sql/indents.scm       | 27 +++++++++++++++++++++++++++
 tests/indent/sql/case.sql     |  8 ++++++++
 tests/indent/sql/compound.sql |  3 +++
 tests/indent/sql/create.sql   |  4 ++++
 tests/indent/sql/cte.sql      |  7 +++++++
 tests/indent/sql/insert.sql   |  5 +++++
 tests/indent/sql/select.sql   |  4 ++++
 tests/indent/sql/subquery.sql |  9 +++++++++
 tests/indent/sql_spec.lua     | 19 +++++++++++++++++++
 9 files changed, 86 insertions(+)
 create mode 100644 queries/sql/indents.scm
 create mode 100644 tests/indent/sql/case.sql
 create mode 100644 tests/indent/sql/compound.sql
 create mode 100644 tests/indent/sql/create.sql
 create mode 100644 tests/indent/sql/cte.sql
 create mode 100644 tests/indent/sql/insert.sql
 create mode 100644 tests/indent/sql/select.sql
 create mode 100644 tests/indent/sql/subquery.sql
 create mode 100644 tests/indent/sql_spec.lua

diff --git a/queries/sql/indents.scm b/queries/sql/indents.scm
new file mode 100644
index 000000000..a807c2bc4
--- /dev/null
+++ b/queries/sql/indents.scm
@@ -0,0 +1,27 @@
+[
+ (select)
+ (cte)
+ (column_definitions)
+ (case)
+ (subquery)
+ (insert)
+] @indent.begin
+
+
+(compound_statement
+  (keyword_begin)
+) @indent.begin
+
+(column_definitions ")" @indent.branch)
+
+(subquery ")" @indent.branch)
+
+(cte ")" @indent.branch)
+
+[
+ (keyword_end)
+ (keyword_values)
+ (keyword_into)
+] @indent.branch
+
+(keyword_end) @indent.end
diff --git a/tests/indent/sql/case.sql b/tests/indent/sql/case.sql
new file mode 100644
index 000000000..eee85a3be
--- /dev/null
+++ b/tests/indent/sql/case.sql
@@ -0,0 +1,8 @@
+select
+    case
+        when a = 1 then '1'
+        when a = 2 then '2'
+        when a = 3 then '3'
+        else '0'
+    end as stmt1
+from tab;
diff --git a/tests/indent/sql/compound.sql b/tests/indent/sql/compound.sql
new file mode 100644
index 000000000..e645c6efb
--- /dev/null
+++ b/tests/indent/sql/compound.sql
@@ -0,0 +1,3 @@
+begin
+    create table foo (bar int);
+end;
diff --git a/tests/indent/sql/create.sql b/tests/indent/sql/create.sql
new file mode 100644
index 000000000..977388452
--- /dev/null
+++ b/tests/indent/sql/create.sql
@@ -0,0 +1,4 @@
+create table my_table (
+    id bigint,
+    date date
+);
diff --git a/tests/indent/sql/cte.sql b/tests/indent/sql/cte.sql
new file mode 100644
index 000000000..55426ccc3
--- /dev/null
+++ b/tests/indent/sql/cte.sql
@@ -0,0 +1,7 @@
+with data as (
+    select
+        a,
+        b
+    from tab
+)
+select * from data;
diff --git a/tests/indent/sql/insert.sql b/tests/indent/sql/insert.sql
new file mode 100644
index 000000000..36fa7c093
--- /dev/null
+++ b/tests/indent/sql/insert.sql
@@ -0,0 +1,5 @@
+insert into mytable
+    (column1, column2)
+values
+    ('john', 123),
+    ('jane', 124);
diff --git a/tests/indent/sql/select.sql b/tests/indent/sql/select.sql
new file mode 100644
index 000000000..85f0cc5b7
--- /dev/null
+++ b/tests/indent/sql/select.sql
@@ -0,0 +1,4 @@
+select
+    a,
+    b
+from tab;
diff --git a/tests/indent/sql/subquery.sql b/tests/indent/sql/subquery.sql
new file mode 100644
index 000000000..a559d7e5b
--- /dev/null
+++ b/tests/indent/sql/subquery.sql
@@ -0,0 +1,9 @@
+select
+    id
+from foo
+where id < (
+    select
+        id
+    from bar
+    limit 1
+);
diff --git a/tests/indent/sql_spec.lua b/tests/indent/sql_spec.lua
new file mode 100644
index 000000000..2fdfc9b1b
--- /dev/null
+++ b/tests/indent/sql_spec.lua
@@ -0,0 +1,19 @@
+local Runner = require("tests.indent.common").Runner
+--local XFAIL = require("tests.indent.common").XFAIL
+
+local run = Runner:new(it, "tests/indent/sql", {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent SQL:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function() end)
+end)

From 5781c94703463e675b0836d850a8950bc4d7d6b2 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 26 May 2023 17:08:06 +0900
Subject: [PATCH 0359/2704] feat: markdown indents (#4862)

---
 queries/markdown/indents.scm | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 queries/markdown/indents.scm

diff --git a/queries/markdown/indents.scm b/queries/markdown/indents.scm
new file mode 100644
index 000000000..6d13122f4
--- /dev/null
+++ b/queries/markdown/indents.scm
@@ -0,0 +1,3 @@
+[
+  (list_item)
+] @indent.auto

From ec97c5ec720da7b8bb5f53572c91c5b144ae0cae Mon Sep 17 00:00:00 2001
From: Yuki Ito <mrno110y@gmail.com>
Date: Fri, 26 May 2023 22:51:51 +0900
Subject: [PATCH 0360/2704] fear(go): add `clear` to `@function.builtin`

---
 queries/go/highlights.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 05c491eb2..b417dd375 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -35,8 +35,8 @@
 (method_declaration
   name: (field_identifier) @method)
 
-(method_spec 
-  name: (field_identifier) @method) 
+(method_spec
+  name: (field_identifier) @method)
 
 ; Constructors
 
@@ -163,6 +163,7 @@
  (#any-of? @function.builtin
            "append"
            "cap"
+           "clear"
            "close"
            "complex"
            "copy"

From ab3fb2a285e55a56b732d2f9f40ba7c3a10b87fc Mon Sep 17 00:00:00 2001
From: Noah <noah.bogart@hey.com>
Date: Fri, 26 May 2023 18:15:22 -0400
Subject: [PATCH 0361/2704] refactor: update Clojure queries

Instead of relying on regex for matching (which matches custom symbols),
explicitly list each of the variations in `@variable.builtin, `@conditional`,
`@function.macro`.

Add `@variable.builtin` for the builtin repl variables `*1`, `*2`, `*3`, and
`*e`, which are occasionally used in tests and comments.

Move `ex-info`, `ex-cause`, `ex-data`, and `ex-message` to `@functions.builtin`.

Add missing `clojure.core` functions to `@functions.builtin` at the bottom to
minimize diff. Includes functions from 1.12-alpha2 release as well.
---
 queries/clojure/highlights.scm | 52 +++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 69b9abd9d..d7d82601c 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -65,9 +65,26 @@
 ((sym_lit) @constructor
  (#lua-match? @constructor "^-\\>[^\\>].*"))
 
-; Dynamic variables
+; Builtin dynamic variables
 ((sym_lit) @variable.builtin
- (#lua-match? @variable.builtin "^[*].+[*]$"))
+ (#any-of? @variable.builtin
+  "*agent*" "*allow-unresolved-vars*" "*assert*"
+  "*clojure-version*" "*command-line-args*"
+  "*compile-files*" "*compile-path*" "*compiler-options*"
+  "*data-readers*" "*default-data-reader-fn*"
+  "*err*" "*file*" "*flush-on-newline*" "*fn-loader*"
+  "*in*" "*math-context*" "*ns*" "*out*"
+  "*print-dup*" "*print-length*" "*print-level*"
+  "*print-meta*" "*print-namespace-maps*" "*print-readably*"
+  "*read-eval*" "*reader-resolver*"
+  "*source-path*" "*suppress-read*"
+  "*unchecked-math*" "*use-context-classloader*"
+  "*verbose-defrecords*" "*warn-on-reflection*"))
+
+; Builtin repl variables
+((sym_lit) @variable.builtin
+ (#any-of? @variable.builtin
+  "*1" "*2" "*3" "*e"))
 
 ; Gensym
 ;; Might not be needed
@@ -107,7 +124,7 @@
 ; Definition functions
 ((sym_lit) @keyword
  (#any-of? @keyword
-  "def" "defonce" "defrecord" "defmacro" "definline"
+  "def" "defonce" "defrecord" "defmacro" "definline" "definterface"
   "defmulti" "defmethod" "defstruct" "defprotocol"
   "deftype"))
 ((sym_lit) @keyword
@@ -127,9 +144,11 @@
  (#any-of? @conditional
   "case" "cond" "cond->" "cond->>" "condp"))
 ((sym_lit) @conditional
- (#match? @conditional "^if(\\-.*)?$"))
+ (#any-of? @conditional
+  "if" "if-let" "if-not" "if-some"))
 ((sym_lit) @conditional
- (#match? @conditional "^when(\\-.*)?$"))
+ (#any-of? @conditional
+  "when" "when-first" "when-let" "when-not" "when-some"))
 
 ; Repeats
 ((sym_lit) @repeat
@@ -139,7 +158,7 @@
 ; Exception
 ((sym_lit) @exception
  (#any-of? @exception
-  "throw" "try" "catch" "finally" "ex-info"))
+  "throw" "try" "catch" "finally"))
 
 ; Includes
 ((sym_lit) @include
@@ -157,15 +176,14 @@
   "monitor-exit" "proxy" "proxy-super" "pvalues"
   "refer-clojure" "reify" "set!" "some->" "some->>"
   "time" "unquote" "unquote-splicing" "var" "vswap!"
-  "ex-cause" "ex-data" "ex-message"))
-((sym_lit) @function.macro
- (#match? @function.macro "^with\\-.*$"))
+  "with-bindings" "with-in-str" "with-loading-context" "with-local-vars"
+  "with-open" "with-out-str" "with-precision" "with-redefs"))
 
 ; All builtin functions
 ; (->> (ns-publics *ns*)
 ;      (keep (fn [[s v]] (when-not (:macro (meta v)) s)))
 ;      sort
-;      cp/print))
+;      clojure.pprint/pprint))
 ;; ...and then lots of manual filtering...
 ((sym_lit) @function.builtin
  (#any-of? @function.builtin
@@ -277,7 +295,19 @@
   "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"))
+  "zero?" "zipmap"
+  ;; earlier
+  "drop" "drop-last" "drop-while"
+  "double?" "doubles"
+  "ex-data" "ex-info"
+  ;; 1.10
+  "ex-cause" "ex-message"
+  ;; 1.11
+  "NaN?" "abs" "infinite?" "iteration" "random-uuid"
+  "parse-boolean" "parse-double" "parse-long" "parse-uuid"
+  "seq-to-map-for-destructuring"
+  ;; 1.12
+  "partitionv" "partitionv-all" "splitv-at"))
 
 
 

From a76db88548bb7fe008cd7e4f2d2ec2ccc080dede Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 27 May 2023 06:34:40 +0000
Subject: [PATCH 0362/2704] Update parsers: cue, erlang, haskell, ispc, nickel,
 ocaml, ocaml_interface, ocamllex, php, phpdoc, scala, scheme, slint, smali

---
 lockfile.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1f14baf88..133ea04ef 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "9c20a3120c405db9efda9349cd005c29f2aace3c"
   },
   "cue": {
-    "revision": "f83fd9abbece9becb5232c517b9d47ff141e237a"
+    "revision": "971130aa1d2da22098d75062c024bb1250ff9d62"
   },
   "d": {
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
@@ -117,7 +117,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "13a6a51d1bda845f756971773dd6049b80a3cffc"
+    "revision": "6228b1df25f25dbd69e4e0342c4c65eb9b5e957d"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -195,7 +195,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "c5cb0c860a399308305f44792bc4853737c40c07"
+    "revision": "e002d60072c73ab09bafedc82d3e35a4349ca6c0"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"
@@ -225,7 +225,7 @@
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
   "ispc": {
-    "revision": "a5c2fd44a6a7fe4230c72d651c1b9b2d28fc20fe"
+    "revision": "848e58874ffa2f7e540a6ec01ab9652b26995f37"
   },
   "janet_simple": {
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
@@ -315,13 +315,13 @@
     "revision": "e2053f7c8856d91bc36c87604f697784845cee69"
   },
   "nickel": {
-    "revision": "3a794388773f2424a97b2186828aa3fac4c66ce6"
+    "revision": "b1a4718601ebd29a62bf3a7fd1069a99ccf48093"
   },
   "ninja": {
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "6b71a810c0acd49b980c50fc79092561f7cee307"
+    "revision": "02878b40ac77d2889833519c6b6e9e63cfc690e6"
   },
   "norg": {
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
@@ -330,10 +330,10 @@
     "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
   },
   "ocaml": {
-    "revision": "a09c63f4d754d2d2dffb7265f6e6f39c9e6e6db1"
+    "revision": "11559418d8de82a2313504dc5bec9983d17ea4e9"
   },
   "ocaml_interface": {
-    "revision": "a09c63f4d754d2d2dffb7265f6e6f39c9e6e6db1"
+    "revision": "11559418d8de82a2313504dc5bec9983d17ea4e9"
   },
   "ocamllex": {
     "revision": "ac1d5957e719d49bd6acd27439b79843e4daf8ed"
@@ -354,10 +354,10 @@
     "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
   },
   "php": {
-    "revision": "1a40581b7a899201d7c2b4684ee34490bc306bd6"
+    "revision": "ff6a35badb0fe373575196bd728a8a53e9be70bd"
   },
   "phpdoc": {
-    "revision": "2f4d16c861b5a454b577d057f247f9902d7b47f5"
+    "revision": "2d20f39476348c2682761ce7251914031a7c013f"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
@@ -432,16 +432,16 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "5aefc0ae4c174fa74d6e973faefa28692e081954"
+    "revision": "17a19b0f0505eec059b82e1b2fd8928f5f6f0b02"
   },
   "scheme": {
-    "revision": "6abcfe33d976ebe3e244ca80273c7e8a070441b5"
+    "revision": "dd9a73d851238881a3a9426298d69742d24b7842"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slint": {
-    "revision": "6f128658eb22cfd15a801f52369d517c25253d5c"
+    "revision": "00c8a2d3645766f68c0d0460086c0a994e5b0d85"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"

From e23d5493cf14401ef02ec2e4e99b65f199869966 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 28 May 2023 06:35:33 +0000
Subject: [PATCH 0363/2704] Update parsers: php, scala

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 133ea04ef..f9ef5d19e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -354,7 +354,7 @@
     "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
   },
   "php": {
-    "revision": "ff6a35badb0fe373575196bd728a8a53e9be70bd"
+    "revision": "a17c0caaf133f7bb37b3531dadcfd0879bea23f1"
   },
   "phpdoc": {
     "revision": "2d20f39476348c2682761ce7251914031a7c013f"
@@ -432,7 +432,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "17a19b0f0505eec059b82e1b2fd8928f5f6f0b02"
+    "revision": "4072a37b9c06242ecae642f18cf341db64e055fb"
   },
   "scheme": {
     "revision": "dd9a73d851238881a3a9426298d69742d24b7842"

From dc38ff85d9dff0582857132df1acc645fda98756 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Mon, 29 May 2023 09:26:28 +0100
Subject: [PATCH 0364/2704] feat: add language support for corn (#4864)

Adds queries and a parser mapping for the [Corn](https://github.com/jakestanger/corn)
configuration language.
---
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/corn/folds.scm          |  5 +++++
 queries/corn/highlights.scm     | 22 ++++++++++++++++++++++
 queries/corn/indents.scm        | 14 ++++++++++++++
 queries/corn/locals.scm         | 16 ++++++++++++++++
 5 files changed, 65 insertions(+)
 create mode 100644 queries/corn/folds.scm
 create mode 100644 queries/corn/highlights.scm
 create mode 100644 queries/corn/indents.scm
 create mode 100644 queries/corn/locals.scm

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index adf17b49f..0c8ba9aae 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -237,6 +237,14 @@ list.cooklang = {
   maintainers = { "@addcninblue" },
 }
 
+list.corn = {
+  install_info = {
+    url = "https://github.com/jakestanger/tree-sitter-corn",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@jakestanger" },
+}
+
 list.cpon = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-cpon",
diff --git a/queries/corn/folds.scm b/queries/corn/folds.scm
new file mode 100644
index 000000000..c081ecb47
--- /dev/null
+++ b/queries/corn/folds.scm
@@ -0,0 +1,5 @@
+[
+ (object)
+ (array)
+ (assign_block)
+] @fold
diff --git a/queries/corn/highlights.scm b/queries/corn/highlights.scm
new file mode 100644
index 000000000..9bb0274e5
--- /dev/null
+++ b/queries/corn/highlights.scm
@@ -0,0 +1,22 @@
+"let" @keyword
+"in" @keyword
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+"." @punctuation.delimiter
+
+(input) @constant
+(comment) @comment
+
+(string) @string
+(integer) @number
+(float) @float
+(boolean) @boolean
+(null) @keyword
+
+(ERROR) @error
diff --git a/queries/corn/indents.scm b/queries/corn/indents.scm
new file mode 100644
index 000000000..1f5a2c402
--- /dev/null
+++ b/queries/corn/indents.scm
@@ -0,0 +1,14 @@
+[
+ (assign_block "{")
+ (object)
+ (array)
+] @indent.begin
+
+(assign_block "}" @indent.branch)
+(assign_block "}" @indent.end)
+
+(object "}" @indent.branch)
+(object "}" @indent.end)
+
+(array "]" @indent.branch)
+(array "]" @indent.end)
diff --git a/queries/corn/locals.scm b/queries/corn/locals.scm
new file mode 100644
index 000000000..f6b0d4c70
--- /dev/null
+++ b/queries/corn/locals.scm
@@ -0,0 +1,16 @@
+; scopes
+
+[
+  (object)
+  (array)
+] @scope
+
+; definitions
+
+(assign_block 
+  (assignment
+    (input) 
+      @definition.constant))
+
+(value (input) @reference)
+

From 1d670b0c906716b1543270b3b087d44b09f3b523 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 29 May 2023 08:26:51 +0000
Subject: [PATCH 0365/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a13c4b617..ceae07868 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [comment](https://github.com/stsewd/tree-sitter-comment) (maintained by @stsewd)
 - [x] [commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) (maintained by @theHamsta)
 - [x] [cooklang](https://github.com/addcninblue/tree-sitter-cooklang) (maintained by @addcninblue)
+- [x] [corn](https://github.com/jakestanger/tree-sitter-corn) (maintained by @jakestanger)
 - [x] [cpon](https://github.com/amaanq/tree-sitter-cpon) (maintained by @amaanq)
 - [x] [cpp](https://github.com/tree-sitter/tree-sitter-cpp) (maintained by @theHamsta)
 - [x] [css](https://github.com/tree-sitter/tree-sitter-css) (maintained by @TravonteD)

From 754b509f2680f1e76bef09c038bfef6a19e336de Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 29 May 2023 11:13:36 -0400
Subject: [PATCH 0366/2704] chore: update Gleam

---
 .github/workflows/update-lockfile.yml  |  2 +-
 lockfile.json                          |  2 +-
 queries/gleam/highlights.scm           |  1 -
 queries/gleam/indents.scm              |  1 -
 tests/indent/gleam/try.gleam           |  7 -------
 tests/indent/gleam_spec.lua            |  8 --------
 tests/query/highlights/gleam/try.gleam | 11 -----------
 7 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 tests/indent/gleam/try.gleam
 delete mode 100644 tests/query/highlights/gleam/try.gleam

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 806f85701..5e96667f6 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: verilog,gleam,nix
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: verilog,nix
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           ./nvim.appimage --headless -c "luafile ./scripts/write-lockfile.lua" -c "q"
diff --git a/lockfile.json b/lockfile.json
index f9ef5d19e..74fb48cf9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -162,7 +162,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "ae79782c00656945db69641378e688cdb78d52c1"
+    "revision": "2d5d6b001ba12bf1c7ac94679d69ac2bed3151dc"
   },
   "glimmer": {
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index f7eb1c5e7..051cbffc0 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -27,7 +27,6 @@
 ; Exceptions
 [
   "assert"
-  "try"
 ] @exception
 
 ; Punctuation
diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
index f19e28318..9bfd2952b 100644
--- a/queries/gleam/indents.scm
+++ b/queries/gleam/indents.scm
@@ -16,7 +16,6 @@
   (type_definition)
   (type_alias)
   (todo)
-  (try)
   (tuple)
 ] @indent.begin
 
diff --git a/tests/indent/gleam/try.gleam b/tests/indent/gleam/try.gleam
deleted file mode 100644
index b5f6d2cd1..000000000
--- a/tests/indent/gleam/try.gleam
+++ /dev/null
@@ -1,7 +0,0 @@
-pub fn main() {
-  try int_a = 
-    parse_int(a)
-  try int_b = 
-    parse_int(b)
-  Ok(int_a + int_b)
-}
diff --git a/tests/indent/gleam_spec.lua b/tests/indent/gleam_spec.lua
index 1b3cbd8a9..da0c86c57 100644
--- a/tests/indent/gleam_spec.lua
+++ b/tests/indent/gleam_spec.lua
@@ -105,14 +105,6 @@ describe("indent Gleam:", function()
     run:new_line("constant.gleam", { on_line = 1, text = "//", indent = 2 })
     run:new_line("constant.gleam", { on_line = 2, text = "//", indent = 2 })
 
-    run:new_line("try.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("try.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("try.gleam", { on_line = 3, text = "//", indent = 2 })
-    run:new_line("try.gleam", { on_line = 4, text = "//", indent = 4 })
-    run:new_line("try.gleam", { on_line = 5, text = "//", indent = 2 })
-    run:new_line("try.gleam", { on_line = 6, text = "//", indent = 2 })
-    run:new_line("try.gleam", { on_line = 7, text = "//", indent = 0 })
-
     run:new_line("assert.gleam", { on_line = 1, text = "//", indent = 2 })
     run:new_line("assert.gleam", { on_line = 2, text = "//", indent = 4 })
     run:new_line("assert.gleam", { on_line = 3, text = "//", indent = 2 })
diff --git a/tests/query/highlights/gleam/try.gleam b/tests/query/highlights/gleam/try.gleam
deleted file mode 100644
index 22c72c39e..000000000
--- a/tests/query/highlights/gleam/try.gleam
+++ /dev/null
@@ -1,11 +0,0 @@
-pub fn main() {
-  try x = Ok(1)
-  // <- exception
-  //  ^ variable
-  //    ^ operator
-  //      ^^ constant.builtin
-  //        ^ punctuation.bracket
-  //         ^ number
-  //          ^ punctuation.bracket
-  Ok(x + 1)
-}

From 905877e75f91790b693e8154ccfc10e3d4fc05a3 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 29 May 2023 11:14:42 -0400
Subject: [PATCH 0367/2704] chore: update skipped langs in ci

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 5e96667f6..5a29d32b7 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: verilog,nix
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           ./nvim.appimage --headless -c "luafile ./scripts/write-lockfile.lua" -c "q"

From 6de5ceba03255a48d6640a27c768442452e3aeba Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 30 May 2023 00:09:37 -0400
Subject: [PATCH 0368/2704] fix(go): properly highlight chan/map (#4875)

---
 queries/go/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index b417dd375..4569ec086 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -129,12 +129,13 @@
 
 ;; Builtin types
 
+[ "chan" "map" ] @type.builtin
+
 ((type_identifier) @type.builtin
  (#any-of? @type.builtin
            "any"
            "bool"
            "byte"
-           "chan"
            "comparable"
            "complex128"
            "complex64"
@@ -146,7 +147,6 @@
            "int32"
            "int64"
            "int8"
-           "map"
            "rune"
            "string"
            "uint"

From 06aa932bb87c9e30d9c3444c65f4d13599c7fb9c Mon Sep 17 00:00:00 2001
From: Pau Ruiz Safont <unduthegun@gmail.com>
Date: Tue, 30 May 2023 05:13:17 +0100
Subject: [PATCH 0369/2704] chore: update ocamllex

* Update parsers: ocamllex

Update its highlight to make it compatible with the new parser

* highlights(ocamllex): follow newest changes from upstream

The upstream grammar added highlights in the latest version, change our
highlight so they reflect better the intention of the grammar's author
---
 lockfile.json                   |  2 +-
 queries/ocamllex/highlights.scm | 52 ++++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 74fb48cf9..89c924d06 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -336,7 +336,7 @@
     "revision": "11559418d8de82a2313504dc5bec9983d17ea4e9"
   },
   "ocamllex": {
-    "revision": "ac1d5957e719d49bd6acd27439b79843e4daf8ed"
+    "revision": "62118551bd9501b8253598b835cb4bef04b31e3d"
   },
   "odin": {
     "revision": "d165dbee27617dab2653e38737d96ede1030d14f"
diff --git a/queries/ocamllex/highlights.scm b/queries/ocamllex/highlights.scm
index 513316159..060a57dc8 100644
--- a/queries/ocamllex/highlights.scm
+++ b/queries/ocamllex/highlights.scm
@@ -1,29 +1,41 @@
-
-[(lexer_argument) (regexp_name) (any)] @type
-
-(lexer_entry_name) @function
-
-["as" "let" "and" "parse" "rule"] @keyword
-
-[(eof) (character)] @character
-(string) @string
+; Allow OCaml highlighter
 
 (ocaml) @none
 
-(character_range "-" @operator)
-(character_set "^" @operator)
-(regexp_alternative ["|"] @operator)
+; Regular expressions
+
+(regexp_name) @variable
+
+[(eof) (any)] @constant
+
+(character) @character
+
+(string) @string
+(escape_sequence) @string.escape
+
+(character_set "^" @punctuation.special)
+(character_range "-" @punctuation.delimiter)
+
 (regexp_difference ["#"] @operator)
-(regexp_option ["?"] @operator)
-(regexp_repetition ["*"] @operator)
-(regexp_strict_repetition ["+"] @operator)
+(regexp_repetition ["?" "*" "+"] @operator)
+(regexp_alternative ["|"] @operator)
 
-(action ["{" "}"] @punctuation.special)
-(character_set ["[" "]"] @punctuation.bracket)
-(parenthesized_regexp ["(" ")"] @punctuation.bracket)
+; Rules
 
-["="] @punctuation.delimiter
-(lexer_entry "|" @punctuation.delimiter)
+(lexer_entry_name) @function
+(lexer_argument) @parameter
+
+(lexer_entry ["=" "|"] @punctuation.delimiter)
+
+; keywords
+
+["and" "as" "let" "parse" "refill" "rule" "shortest"] @keyword
+
+; Punctuation
+
+["[" "]" "(" ")" "{" "}"] @punctuation.bracket
+
+; Misc
 
 (comment) @comment
 (ERROR) @error

From 13d0354890bc616f0f394a4e66e192f92ae2187c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 30 May 2023 06:35:47 +0000
Subject: [PATCH 0370/2704] Update parsers: corn, scala

---
 lockfile.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 89c924d06..e01f500b5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -59,6 +59,9 @@
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
   },
+  "corn": {
+    "revision": "6a6b0f4b1d564392c1b6a8ebcc27d94185f72ede"
+  },
   "cpon": {
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
@@ -432,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "4072a37b9c06242ecae642f18cf341db64e055fb"
+    "revision": "dacd7bdbe27ba79fb7f3959d220f97820dc71dcc"
   },
   "scheme": {
     "revision": "dd9a73d851238881a3a9426298d69742d24b7842"

From 23dfae4db84f71e2ddb56c024845b322035182ee Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 30 May 2023 10:18:12 +0200
Subject: [PATCH 0371/2704] ci: bump tree-sitter CLI to v0.20.8

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0a216d2ca..2393a78dc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Install and prepare Neovim
         env:
           NVIM_TAG: stable
-          TREE_SITTER_CLI_TAG: v0.20.6
+          TREE_SITTER_CLI_TAG: v0.20.8
         run: |
           bash ./scripts/ci-install-${{ matrix.os }}.sh
 

From 62146fe415193879290c523b54cb5072e1f5dbbc Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 31 May 2023 06:37:08 +0000
Subject: [PATCH 0372/2704] Update parsers: c, cpp, cuda, gitcommit, glsl, go,
 hlsl, scala, supercollider

skip dart updates from now on
---
 .github/workflows/update-lockfile.yml |  2 +-
 lockfile.json                         | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 5a29d32b7..36b384de5 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "dart"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           ./nvim.appimage --headless -c "luafile ./scripts/write-lockfile.lua" -c "q"
diff --git a/lockfile.json b/lockfile.json
index e01f500b5..d4ca89e61 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "a015709e7d1bb4f823a2fc53175e0cbee96c1c3e"
+    "revision": "0906255f8de1d319b8ec682ac8c43e7d2524b4fa"
   },
   "c_sharp": {
     "revision": "aaafc3d75f058ca5fe639b7ed5829964a3ca4575"
@@ -66,13 +66,13 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "70aed2e9e83eb7320ab7c454d3084300bf587037"
+    "revision": "4c917d560572dc2b3704b041715b2729fa199963"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "9c20a3120c405db9efda9349cd005c29f2aace3c"
+    "revision": "867c97ed7769e56bff99f7122cf63effadb812cc"
   },
   "cue": {
     "revision": "971130aa1d2da22098d75062c024bb1250ff9d62"
@@ -159,7 +159,7 @@
     "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
   },
   "gitcommit": {
-    "revision": "9d8c81e8e64b3b4f4c36de1425c5fc841097d7f4"
+    "revision": "5e3263c856d2de7ecbcfb646352c8e29dc2b83e6"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -171,10 +171,10 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "190c86e633e6a6dfdb8a96f8b8460e347ff93f1c"
+    "revision": "29dcda3e8299b91df24cafd24bba43cdd3ca2456"
   },
   "go": {
-    "revision": "64457ea6b73ef5422ed1687178d4545c3e91334a"
+    "revision": "7cccc30535a40da07092626031120ae6b36202d7"
   },
   "godot_resource": {
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
@@ -210,7 +210,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "cd7a53e9f82a2612cae0115692f964e9d0c416e2"
+    "revision": "e7e2670872c2f1a6556eeedd0b80778b5653e187"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "dacd7bdbe27ba79fb7f3959d220f97820dc71dcc"
+    "revision": "e7f7d016308e47bfb387581206b77c8c48947fdc"
   },
   "scheme": {
     "revision": "dd9a73d851238881a3a9426298d69742d24b7842"
@@ -468,7 +468,7 @@
     "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"
   },
   "supercollider": {
-    "revision": "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0"
+    "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From a6063b22c9e6d8660b82255d251c19d150725d9f Mon Sep 17 00:00:00 2001
From: Pieter Goetschalckx <pieter@gtschlckx.be>
Date: Thu, 1 Jun 2023 03:28:00 +0200
Subject: [PATCH 0373/2704] highlights(ocaml): update operators (#4878)

* Update ocaml highlights

* Don't capture operator twice
---
 lockfile.json                |  4 ++--
 queries/ocaml/highlights.scm | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d4ca89e61..54ee58bf1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -333,10 +333,10 @@
     "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
   },
   "ocaml": {
-    "revision": "11559418d8de82a2313504dc5bec9983d17ea4e9"
+    "revision": "2da49308381b91e19e5d270ec5117616d0e4b135"
   },
   "ocaml_interface": {
-    "revision": "11559418d8de82a2313504dc5bec9983d17ea4e9"
+    "revision": "2da49308381b91e19e5d270ec5117616d0e4b135"
   },
   "ocamllex": {
     "revision": "62118551bd9501b8253598b835cb4bef04b31e3d"
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index ef045f1b1..db70575e8 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -47,13 +47,13 @@
 
 (infix_expression
   left: (value_path (value_name) @function)
-  (infix_operator) @operator
-  (#eq? @operator "@@"))
+  operator: (concat_operator) @_operator
+  (#eq? @_operator "@@"))
 
 (infix_expression
-  (infix_operator) @operator
+  operator: (rel_operator) @_operator
   right: (value_path (value_name) @function)
-  (#eq? @operator "|>"))
+  (#eq? @_operator "|>"))
 
 (application_expression
   function: (value_path (value_name) @function))
@@ -143,7 +143,14 @@
 [
   (prefix_operator)
   (sign_operator)
-  (infix_operator)
+  (pow_operator)
+  (mult_operator)
+  (add_operator)
+  (concat_operator)
+  (rel_operator)
+  (and_operator)
+  (or_operator)
+  (assign_operator)
   (hash_operator)
   (indexing_operator)
   (let_operator)
@@ -153,14 +160,7 @@
 
 (match_expression (match_operator) @keyword)
 
-(value_definition [(let_operator) (and_operator)] @keyword)
-
-;; TODO: this is an error now
-;(prefix_operator "!" @operator)
-
-(infix_operator ["&" "+" "-" "=" ">" "|" "%"] @operator)
-
-(signed_number ["+" "-"] @operator)
+(value_definition [(let_operator) (let_and_operator)] @keyword)
 
 ["*" "#" "::" "<-"] @operator
 

From 56c63529c052a179134842c56c6df5728cc375da Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 1 Jun 2023 06:36:19 +0000
Subject: [PATCH 0374/2704] Update parsers: scala, t32

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 54ee58bf1..4fa6d5d83 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "e7f7d016308e47bfb387581206b77c8c48947fdc"
+    "revision": "9d71af464132b29ea1c3316ca6084cc0d6232c65"
   },
   "scheme": {
     "revision": "dd9a73d851238881a3a9426298d69742d24b7842"
@@ -483,7 +483,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "b4dca3527463274de1f3263c0e1c329bc3b4f514"
+    "revision": "4e581fcd17d76651aa92759a68f9a8186b9fe8dc"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"

From 264dd35fd0abfd6536a9d051a7cd06b07a780927 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 2 Jun 2023 06:36:08 +0000
Subject: [PATCH 0375/2704] Update parsers: cue, glsl, hlsl, latex, scala

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4fa6d5d83..14b46519a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -75,7 +75,7 @@
     "revision": "867c97ed7769e56bff99f7122cf63effadb812cc"
   },
   "cue": {
-    "revision": "971130aa1d2da22098d75062c024bb1250ff9d62"
+    "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
   },
   "d": {
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
@@ -171,7 +171,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "29dcda3e8299b91df24cafd24bba43cdd3ca2456"
+    "revision": "53ca269cae2a47b1b75791e2bfe843baeb02e903"
   },
   "go": {
     "revision": "7cccc30535a40da07092626031120ae6b36202d7"
@@ -210,7 +210,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "e7e2670872c2f1a6556eeedd0b80778b5653e187"
+    "revision": "eeb138aba44de8379dae474624fef65d4288476a"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -270,7 +270,7 @@
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
   },
   "latex": {
-    "revision": "b0686a83c2429cc04e6d01f067f5a0a8efc0d17b"
+    "revision": "dfe891922ccd2e7cef52eccb2775e1b576727165"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "9d71af464132b29ea1c3316ca6084cc0d6232c65"
+    "revision": "236c7b20dbddedb031ce40517fafc027434f6860"
   },
   "scheme": {
     "revision": "dd9a73d851238881a3a9426298d69742d24b7842"

From cb6d94ef7b9ff820c5f2f1789df4bb651552ff2d Mon Sep 17 00:00:00 2001
From: Frank <fbearoff@users.noreply.github.com>
Date: Tue, 30 May 2023 20:28:04 -0400
Subject: [PATCH 0376/2704] add "select" to @repeat highlight group

---
 queries/bash/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 6fd1d39d5..e209eb935 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -64,6 +64,7 @@
  "for"
  "do"
  "done"
+ "select"
  "while"
  ] @repeat
 

From 2cbe8a4296612b2cd603548a31b020f013be512c Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Fri, 2 Jun 2023 15:13:30 +0200
Subject: [PATCH 0377/2704] highlights(scala): add support for using directives
 (#4893)

This accounts for the updates in https://github.com/tree-sitter/tree-sitter-scala/pull/273.
---
 queries/scala/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 6220cbfe1..64f49f8f6 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -252,3 +252,7 @@
   (identifier) @function.builtin
   (#lua-match? @function.builtin "^super$")
 )
+
+;; Scala CLI using directives
+(using_directive_key) @parameter
+(using_directive_value) @string

From 6847ce4f8c93a0c8fd5a3d4df08975ab185187eb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 3 Jun 2023 07:27:31 +0000
Subject: [PATCH 0378/2704] Update parsers: elixir, racket, scheme (#4899)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 14b46519a..d9a3984a3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -105,7 +105,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "869dff3ceb8823ca4b17ca33b663667c8e41e8ba"
+    "revision": "4ba9dab6e2602960d95b2b625f3386c27e08084e"
   },
   "elm": {
     "revision": "692c50c0b961364c40299e73c1306aecb5d20f40"
@@ -408,7 +408,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "ed5369ad17166c0749ab7241d826c438bd69338d"
+    "revision": "e196cd417c425c2c3dc54f3b7b7666fe968ba50b"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -438,7 +438,7 @@
     "revision": "236c7b20dbddedb031ce40517fafc027434f6860"
   },
   "scheme": {
-    "revision": "dd9a73d851238881a3a9426298d69742d24b7842"
+    "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"

From 5ac8cf8ee596ddc29e0392e1ed28dbc5f10245d8 Mon Sep 17 00:00:00 2001
From: Tyler Miller <tmillr@proton.me>
Date: Thu, 1 Jun 2023 02:38:29 -0700
Subject: [PATCH 0379/2704] fix(make/highlights): add `define` and operators

---
 queries/make/highlights.scm | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index f94c567b2..17a100edf 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -37,18 +37,35 @@
 (include_directive ["include" "-include"] @include)
 
 (variable_assignment
- (word) @symbol)
-(variable_assignment [
- "?="
- ":="
- "+="
- "="
+ name: (word) @symbol
+ [
+  "?="
+  ":="
+  "::="
+; ":::="
+  "+="
+  "="
  ] @operator)
 
+(shell_assignment
+ name: (word) @symbol
+ "!=" @operator)
+
+(define_directive
+ "define" @keyword
+ name: (word) @symbol
+ [
+  "="
+  ":="
+  "::="
+; ":::="
+  "?="
+  "!="
+ ]? @operator
+ "endef" @keyword)
 
 (variable_assignment
- (word) @variable.builtin
- (#any-of? @variable.builtin
+ (word) @variable.builtin (#any-of? @variable.builtin
   ".DEFAULT_GOAL"
   ".EXTRA_PREREQS"
   ".FEATURES"
@@ -65,11 +82,9 @@
   "SHELL"
  ))
 
-
 ; Use string to match bash
 (variable_reference (word) @string) @operator
 
-
 (shell_function
  ["$" "(" ")"] @operator
  "shell" @function.builtin)

From f84de0d6cd3199149c1c4c236b7267ce7b0775a2 Mon Sep 17 00:00:00 2001
From: Alex Manning <alex41290@gmail.com>
Date: Sat, 3 Jun 2023 21:39:20 -0400
Subject: [PATCH 0380/2704] fix(gleam): minor indent fixes

---
 queries/gleam/indents.scm                   | 2 +-
 tests/indent/gleam/anonymous_function.gleam | 7 +++++++
 tests/indent/gleam_spec.lua                 | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/gleam/anonymous_function.gleam

diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
index 9bfd2952b..0eef75129 100644
--- a/queries/gleam/indents.scm
+++ b/queries/gleam/indents.scm
@@ -1,5 +1,6 @@
 ; Gleam indents similar to Rust and JavaScript
 [
+  (anonymous_function)
   (assert)
   (case)
   (case_clause)
@@ -11,7 +12,6 @@
   (let)
   (list)
   (constant)
-  (external_function)
   (function)
   (type_definition)
   (type_alias)
diff --git a/tests/indent/gleam/anonymous_function.gleam b/tests/indent/gleam/anonymous_function.gleam
new file mode 100644
index 000000000..bcbdc2394
--- /dev/null
+++ b/tests/indent/gleam/anonymous_function.gleam
@@ -0,0 +1,7 @@
+fn() {
+  fn() {
+    fn() {
+      True
+    }
+  }
+}
diff --git a/tests/indent/gleam_spec.lua b/tests/indent/gleam_spec.lua
index da0c86c57..8de57fd50 100644
--- a/tests/indent/gleam_spec.lua
+++ b/tests/indent/gleam_spec.lua
@@ -115,5 +115,13 @@ describe("indent Gleam:", function()
     run:new_line("todo.gleam", { on_line = 3, text = "//", indent = 4 })
     run:new_line("todo.gleam", { on_line = 4, text = "//", indent = 2 })
     run:new_line("todo.gleam", { on_line = 5, text = "//", indent = 0 })
+
+    run:new_line("anonymous_function.gleam", { on_line = 1, text = "//", indent = 2 })
+    run:new_line("anonymous_function.gleam", { on_line = 2, text = "//", indent = 4 })
+    run:new_line("anonymous_function.gleam", { on_line = 3, text = "//", indent = 6 })
+    run:new_line("anonymous_function.gleam", { on_line = 4, text = "//", indent = 6 })
+    run:new_line("anonymous_function.gleam", { on_line = 5, text = "//", indent = 4 })
+    run:new_line("anonymous_function.gleam", { on_line = 6, text = "//", indent = 2 })
+    run:new_line("anonymous_function.gleam", { on_line = 7, text = "//", indent = 0 })
   end)
 end)

From 48f4f3ead16e59d886f2109dd796773c37dd713e Mon Sep 17 00:00:00 2001
From: Santos Gallegos <stsewd@proton.me>
Date: Sat, 3 Jun 2023 23:03:09 -0500
Subject: [PATCH 0381/2704] feat(comment): add support for URIs

https and https links are recognized now
ref https://github.com/stsewd/tree-sitter-comment/pull/21
---
 lockfile.json                  | 2 +-
 queries/comment/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index d9a3984a3..07fc19de1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "399605a02bcd5daa309ce63a6459c600dce3473f"
   },
   "comment": {
-    "revision": "f08e7d44b2923e9da2bf487a2f365d08677d368e"
+    "revision": "ef429992748f89e176243411e94b8ffc8777d118"
   },
   "commonlisp": {
     "revision": "c7e814975ab0d0d04333d1f32391c41180c58919"
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 2161cb808..c5e98669f 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -39,3 +39,5 @@
 ; Issue number (#123)
 ("text" @number
  (#lua-match? @number "^#[0-9]+$"))
+
+((uri) @text.uri @nospell)

From 56022e0b0584755fa4f65367be45d82c988cd86e Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Sun, 4 Jun 2023 11:04:00 +0700
Subject: [PATCH 0382/2704] feat(typescript): highlight `is` and `:` in type
 predicate

---
 queries/typescript/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index d23a918f9..7aaa3fca2 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -13,6 +13,7 @@
   "satisfies"
   "module"
   "infer"
+  "is"
 ] @keyword
 
 (as_expression "as" @keyword)
@@ -57,6 +58,9 @@
 (type_annotation
   ":" @punctuation.delimiter)
 
+(type_predicate_annotation
+  ":" @punctuation.delimiter)
+
 (index_signature
   ":" @punctuation.delimiter)
 

From bee003b880f8c1a04ed368d810e6daf8fc6da762 Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Sun, 4 Jun 2023 11:04:40 +0700
Subject: [PATCH 0383/2704] feat(ecma): convert eligible `@keyword.operators`

---
 queries/ecma/highlights.scm             | 8 ++++----
 queries/typescript/highlights.scm       | 9 ++++++---
 tests/query/highlights/typescript/as.ts | 2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index eb6d3d4a9..a002d17ae 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -256,7 +256,7 @@
 (binary_expression "/" @operator)
 (ternary_expression ["?" ":"] @conditional.ternary)
 (unary_expression ["!" "~" "-" "+"] @operator)
-(unary_expression ["delete" "void" "typeof"] @keyword.operator)
+(unary_expression ["delete" "void"] @keyword.operator)
 
 [
   "("
@@ -305,13 +305,10 @@
   "export"
   "extends"
   "get"
-  "in"
-  "instanceof"
   "let"
   "set"
   "static"
   "target"
-  "typeof"
   "var"
   "with"
 ] @keyword
@@ -333,6 +330,9 @@
 [
   "new"
   "delete"
+  "in"
+  "instanceof"
+  "typeof"
 ] @keyword.operator
 
 [
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 7aaa3fca2..239de88fd 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -6,17 +6,20 @@
   "export"
   "implements"
   "interface"
-  "keyof"
   "type"
   "namespace"
   "override"
-  "satisfies"
   "module"
   "infer"
   "is"
 ] @keyword
 
-(as_expression "as" @keyword)
+[
+  "keyof"
+  "satisfies"
+] @keyword.operator
+
+(as_expression "as" @keyword.operator)
 
 [
   "abstract"
diff --git a/tests/query/highlights/typescript/as.ts b/tests/query/highlights/typescript/as.ts
index b1f1533b4..ef0ce98e5 100644
--- a/tests/query/highlights/typescript/as.ts
+++ b/tests/query/highlights/typescript/as.ts
@@ -5,4 +5,4 @@ export { foo as bar };
 //           ^ include
 
 const n = 5 as number;
-//          ^ keyword
+//          ^ keyword.operator

From 79aedc9675dc0b25b64543f205743939233df1dc Mon Sep 17 00:00:00 2001
From: Will Ruggiano <wmruggiano@gmail.com>
Date: Sat, 3 Jun 2023 22:05:57 -0600
Subject: [PATCH 0384/2704] feat(prisma): highlight views

---
 queries/prisma/highlights.scm             | 1 +
 tests/query/highlights/prisma/test.prisma | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/queries/prisma/highlights.scm b/queries/prisma/highlights.scm
index 59ee2881c..cfdc3a668 100644
--- a/queries/prisma/highlights.scm
+++ b/queries/prisma/highlights.scm
@@ -6,6 +6,7 @@
  "generator"
  "model"
  "type"
+ "view"
 ] @keyword
 
 (comment) @comment @spell
diff --git a/tests/query/highlights/prisma/test.prisma b/tests/query/highlights/prisma/test.prisma
index 9e185cfb5..6a5795699 100644
--- a/tests/query/highlights/prisma/test.prisma
+++ b/tests/query/highlights/prisma/test.prisma
@@ -54,3 +54,10 @@ enum ReactionType {
   ANGRY
   // ^ constant
 }
+
+view ReactionView {
+// ^ keyword
+  id     Int @unique
+  postId Int
+  userId String
+}

From 1281601cb40b71a47c5b30866bd4968fd0d20fb3 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sun, 4 Jun 2023 13:28:41 +0900
Subject: [PATCH 0385/2704] feat: add indents for annotation defs (#4828)

- Add indent for `@interface` and `@Annotation(...)`
- Add notes for indent queries
---
 queries/java/indents.scm            | 23 ++++++++++++++---------
 tests/indent/java/annotation.java   |  3 +++
 tests/indent/java/annotation_2.java |  8 ++++++++
 tests/indent/java_spec.lua          |  2 ++
 4 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 tests/indent/java/annotation.java
 create mode 100644 tests/indent/java/annotation_2.java

diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index 017646e5b..73fb386e3 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -1,13 +1,17 @@
 [
-  (class_body)
-  (enum_body)
-  (interface_body)
-  (constructor_body)
-  (block)
-  (switch_block)
-  (array_initializer)
-  (argument_list)
-  (formal_parameters)
+  ; ... refers to the portion that this indent query will have effects on
+  (class_body)                        ; { ... } of `class X`
+  (enum_body)                         ; { ... } of `enum X`
+  (interface_body)                    ; { ... } of `interface X`
+  (constructor_body)                  ; { `modifier` X() {...} } inside `class X`
+  (annotation_type_body)              ; { ... } of `@interface X`
+  (block)                             ; { ... } that's not mentioned in this scope
+  (switch_block)                      ; { ... } in `switch X`
+  (array_initializer)                 ; [1, 2]
+  (argument_list)                     ; foo(...)
+  (formal_parameters)                 ; method foo(...)
+  (annotation_argument_list)          ; @Annotation(...)
+  (element_value_array_initializer)   ; { a, b } inside @Annotation()
 ] @indent.begin
 
 (expression_statement (method_invocation) @indent.begin)
@@ -21,6 +25,7 @@
   "]"
 ] @indent.branch
 
+(annotation_argument_list ")" @indent.end) ; This should be a special cased as `()` here doesn't have ending `;`
 "}" @indent.end
 
 (line_comment) @indent.ignore
diff --git a/tests/indent/java/annotation.java b/tests/indent/java/annotation.java
new file mode 100644
index 000000000..bd37d09a7
--- /dev/null
+++ b/tests/indent/java/annotation.java
@@ -0,0 +1,3 @@
+abstract public @interface Foo {
+  abstract public String Bar();
+}
diff --git a/tests/indent/java/annotation_2.java b/tests/indent/java/annotation_2.java
new file mode 100644
index 000000000..aa5f45994
--- /dev/null
+++ b/tests/indent/java/annotation_2.java
@@ -0,0 +1,8 @@
+@ContextConfiguration(
+  classes = {
+    WireMockConfig.class,
+  }
+)
+public class Foo {
+
+}
diff --git a/tests/indent/java_spec.lua b/tests/indent/java_spec.lua
index 33003fd40..1d10046bb 100644
--- a/tests/indent/java_spec.lua
+++ b/tests/indent/java_spec.lua
@@ -33,5 +33,7 @@ describe("indent Java:", function()
     run:new_line("method_chaining.java", { on_line = 4, text = '.append("b");', indent = 6 })
     run:new_line("constructor_with_arguments_on_multiple_lines.java", { on_line = 4, text = "}", indent = 2 })
     run:new_line("method_with_arguments_on_multiple_lines.java", { on_line = 4, text = "}", indent = 2 })
+    run:new_line("annotation.java", { on_line = 1, text = "abstract public Foo(){}", indent = 2 })
+    run:new_line("annotation_2.java", { on_line = 2, text = "Bar.class", indent = 4 })
   end)
 end)

From e54c8873ef964c730af451fedd4490166d335e3a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 4 Jun 2023 15:59:36 +0900
Subject: [PATCH 0386/2704] Update parsers: comment, usd (#4904)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 07fc19de1..70cfbfc91 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "399605a02bcd5daa309ce63a6459c600dce3473f"
   },
   "comment": {
-    "revision": "ef429992748f89e176243411e94b8ffc8777d118"
+    "revision": "7a7f9e2f9f1fdea6817e609474f66f2a1f65f1c2"
   },
   "commonlisp": {
     "revision": "c7e814975ab0d0d04333d1f32391c41180c58919"
@@ -525,7 +525,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "usd": {
-    "revision": "04816b1fbfe548e1446a9efe8b069f3f6e095504"
+    "revision": "718a6b3e939904e0b4fe7cff6742e96af4781f4b"
   },
   "uxntal": {
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"

From 9ec2a6bbdae426fc093b71805e7929158ac09411 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 5 Jun 2023 09:52:36 +0900
Subject: [PATCH 0387/2704] tests: fix failed tests (#4901)

fix failed tests for tiger, t32 and wgsl
---
 queries/t32/indents.scm     |  8 ++--
 queries/tiger/indents.scm   |  1 +
 scripts/minimal_init.lua    |  3 ++
 tests/indent/t32_spec.lua   | 29 ++++++---------
 tests/indent/tiger_spec.lua | 73 ++++++++++++-------------------------
 tests/indent/wgsl_spec.lua  |  4 +-
 6 files changed, 44 insertions(+), 74 deletions(-)

diff --git a/queries/t32/indents.scm b/queries/t32/indents.scm
index 60e2782fb..64ee3f571 100644
--- a/queries/t32/indents.scm
+++ b/queries/t32/indents.scm
@@ -6,7 +6,6 @@
 ; Control flow statements
 (
   (if_block
-    _*
     condition: (_)
     . (_) @_then) @indent.begin
   (#not-has-type? @_then block)
@@ -20,17 +19,16 @@
 (
   (else_block
     (if_block
-      _*
       condition: (_)
       . (_) @_then)) @indent.branch
   (#not-has-type? @_then block)
 )
 
 (while_block
-  (command_expression)) @indent.begin
+  (command_expression)) @indent.auto
 
 (repeat_block
-  (command_expression)) @indent.begin
+  (command_expression)) @indent.auto
 
 
-(comment) @indent.ignore
+(comment) @indent.auto
diff --git a/queries/tiger/indents.scm b/queries/tiger/indents.scm
index 0cb45d391..6f6c80bae 100644
--- a/queries/tiger/indents.scm
+++ b/queries/tiger/indents.scm
@@ -34,6 +34,7 @@
 (parameters ")" @indent.end)
 
 (function_call) @indent.begin
+(function_call ")" @indent.end)
 (method_call) @indent.begin
 ")" @indent.branch
 
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 5ae1836ef..f3aeef7b9 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -5,9 +5,12 @@ vim.cmd.runtime { "plugin/nvim-treesitter.lua", bang = true }
 vim.filetype.add {
   extension = {
     conf = "hocon",
+    cmm = "t32",
     ncl = "nickel",
+    tig = "tiger",
     usd = "usd",
     usda = "usd",
+    wgsl = "wgsl",
   },
 }
 
diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua
index 8ab31387d..b305cd61c 100644
--- a/tests/indent/t32_spec.lua
+++ b/tests/indent/t32_spec.lua
@@ -16,7 +16,7 @@ describe("indent t32:", function()
   describe("new line:", function()
     runner:new_line("if_block.cmm", { on_line = 2, text = "GOTO start", indent = 0 }, "command after IF", XFAIL)
 
-    runner:new_line("if_block.cmm", { on_line = 5, text = "GOTO start", indent = 2 }, "command in IF then block", XFAIL)
+    runner:new_line("if_block.cmm", { on_line = 5, text = "GOTO start", indent = 2 }, "command in IF then block")
 
     runner:new_line("if_block.cmm", { on_line = 4, text = "(", indent = 0 }, "block after IF")
 
@@ -31,12 +31,11 @@ describe("indent t32:", function()
       runner:new_line(
         "if_block.cmm",
         { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in IF then[" .. ii .. "]",
-        XFAIL
+        "command in IF then[" .. ii .. "]"
       )
     end
 
-    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 4 }, "command in IF then")
+    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 2 }, "command in IF then")
 
     for ii, test in ipairs {
       { 16, 2 },
@@ -47,12 +46,11 @@ describe("indent t32:", function()
       runner:new_line(
         "if_block.cmm",
         { on_line = test[1], text = "(\n", indent = test[2] },
-        "command in IF else[" .. ii .. "]",
-        XFAIL
+        "command in IF else[" .. ii .. "]"
       )
     end
 
-    runner:new_line("while_block.cmm", { on_line = 2, text = "&x=1.", indent = 0 }, "command after WHILE", XFAIL)
+    runner:new_line("while_block.cmm", { on_line = 2, text = "&x=1.", indent = 2 }, "command after WHILE")
 
     runner:new_line("while_block.cmm", { on_line = 4, text = "&x=1.", indent = 0 }, "command after WHILE")
 
@@ -65,20 +63,18 @@ describe("indent t32:", function()
       runner:new_line(
         "while_block.cmm",
         { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in WHILE then block[" .. ii .. "]",
-        XFAIL
+        "command in WHILE then block[" .. ii .. "]"
       )
     end
 
     for ii, test in ipairs {
       { 1, 0, nil },
-      { 4, 0, XFAIL },
+      { 4, 2, XFAIL },
     } do
       runner:new_line(
         "repeat_block.cmm",
         { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after RePeaT[" .. ii .. "]",
-        test[3]
+        "command after RePeaT[" .. ii .. "]"
       )
     end
 
@@ -92,8 +88,7 @@ describe("indent t32:", function()
       runner:new_line(
         "repeat_block.cmm",
         { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in RePeaT then block[" .. ii .. "]",
-        test[3]
+        "command in RePeaT then block [" .. ii .. "]"
       )
     end
 
@@ -109,8 +104,7 @@ describe("indent t32:", function()
       runner:new_line(
         "subroutine_block.cmm",
         { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in subroutine block[" .. ii .. "]",
-        test[3]
+        "command in subroutine block[" .. ii .. "]"
       )
     end
 
@@ -122,8 +116,7 @@ describe("indent t32:", function()
       runner:new_line(
         "subroutine_block.cmm",
         { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after subroutine block[" .. ii .. "]",
-        XFAIL
+        "command after subroutine block[" .. ii .. "]"
       )
     end
   end)
diff --git a/tests/indent/tiger_spec.lua b/tests/indent/tiger_spec.lua
index f435b4c03..c1f252fd8 100644
--- a/tests/indent/tiger_spec.lua
+++ b/tests/indent/tiger_spec.lua
@@ -1,5 +1,4 @@
 local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
 
 local runner = Runner:new(it, "tests/indent/tiger", {
   tabstop = 2,
@@ -14,62 +13,46 @@ describe("indent Tiger:", function()
   end)
 
   describe("new line:", function()
-    runner:new_line(
-      "classes.tig",
-      { on_line = 1, text = "var a := 0", indent = 2 },
-      "class declaration beginning",
-      XFAIL
-    )
+    runner:new_line("classes.tig", { on_line = 1, text = "var a := 0", indent = 2 }, "class declaration beginning")
     runner:new_line("classes.tig", { on_line = 2, text = "var a := 0", indent = 2 }, "class declaration after field")
     runner:new_line("classes.tig", { on_line = 4, text = "var a := 0", indent = 2 }, "class declaration after method")
     runner:new_line("classes.tig", { on_line = 5, text = "var a := 0", indent = 0 }, "after class declaration")
-    runner:new_line("classes.tig", { on_line = 7, text = "var a := 0", indent = 2 }, "class type beginning", XFAIL)
+    runner:new_line("classes.tig", { on_line = 7, text = "var a := 0", indent = 2 }, "class type beginning")
     runner:new_line("classes.tig", { on_line = 8, text = "var a := 0", indent = 2 }, "class type after field")
-    runner:new_line("classes.tig", { on_line = 10, text = "self.a := 0", indent = 4 }, "inside method", XFAIL)
+    runner:new_line("classes.tig", { on_line = 10, text = "self.a := 0", indent = 4 }, "inside method")
     runner:new_line("classes.tig", { on_line = 13, text = "var a := 0", indent = 2 }, "class type after method")
     runner:new_line("classes.tig", { on_line = 14, text = "var a := 0", indent = 0 }, "after class type")
 
-    runner:new_line("control-flow.tig", { on_line = 2, text = "true", indent = 4 }, "if condition", XFAIL)
-    runner:new_line("control-flow.tig", { on_line = 4, text = "true", indent = 4 }, "if consequence", XFAIL)
-    runner:new_line("control-flow.tig", { on_line = 4, text = "true", indent = 4 }, "if alternative", XFAIL)
-    runner:new_line("control-flow.tig", { on_line = 10, text = "start := 0", indent = 4 }, "for index start", XFAIL)
-    runner:new_line("control-flow.tig", { on_line = 12, text = "the_end", indent = 4 }, "for index end", XFAIL)
-    runner:new_line("control-flow.tig", { on_line = 14, text = "break", indent = 4 }, "for body", XFAIL)
-    runner:new_line("control-flow.tig", { on_line = 18, text = "true", indent = 4 }, "while condition", XFAIL)
-    runner:new_line("control-flow.tig", { on_line = 20, text = "break", indent = 4 }, "while body", XFAIL)
+    runner:new_line("control-flow.tig", { on_line = 2, text = "true", indent = 4 }, "if condition")
+    runner:new_line("control-flow.tig", { on_line = 4, text = "true", indent = 4 }, "if consequence")
+    runner:new_line("control-flow.tig", { on_line = 4, text = "true", indent = 4 }, "if alternative")
+    runner:new_line("control-flow.tig", { on_line = 10, text = "start := 0", indent = 4 }, "for index start")
+    runner:new_line("control-flow.tig", { on_line = 12, text = "the_end", indent = 4 }, "for index end")
+    runner:new_line("control-flow.tig", { on_line = 14, text = "break", indent = 4 }, "for body")
+    runner:new_line("control-flow.tig", { on_line = 18, text = "true", indent = 4 }, "while condition")
+    runner:new_line("control-flow.tig", { on_line = 20, text = "break", indent = 4 }, "while body")
 
-    runner:new_line(
-      "functions.tig",
-      { on_line = 1, text = "parameter: int,", indent = 2 },
-      "parameter list beginning",
-      XFAIL
-    )
+    runner:new_line("functions.tig", { on_line = 1, text = "parameter: int,", indent = 2 }, "parameter list beginning")
     runner:new_line("functions.tig", { on_line = 2, text = "parameter: int,", indent = 2 }, "parameter list middle")
     runner:new_line("functions.tig", { on_line = 4, text = ",parameter: int", indent = 2 }, "parameter list end")
     runner:new_line("functions.tig", { on_line = 5, text = "var a := 0", indent = 0 }, "after parameter list")
-    runner:new_line("functions.tig", { on_line = 7, text = "print(a)", indent = 2 }, "function body", XFAIL)
-    runner:new_line("functions.tig", { on_line = 9, text = "a,", indent = 6 }, "function call beginning", XFAIL)
+    runner:new_line("functions.tig", { on_line = 7, text = "print(a)", indent = 2 }, "function body")
+    runner:new_line("functions.tig", { on_line = 9, text = "a,", indent = 6 }, "function call beginning")
     runner:new_line("functions.tig", { on_line = 10, text = "a,", indent = 6 }, "function call middle")
     runner:new_line("functions.tig", { on_line = 12, text = ",a", indent = 6 }, "function call end")
     runner:new_line("functions.tig", { on_line = 13, text = "; print(a)", indent = 4 }, "after function call")
-    runner:new_line(
-      "functions.tig",
-      { on_line = 14, text = "var a := 12", indent = 0 },
-      "after function declaration",
-      XFAIL
-    )
+    runner:new_line("functions.tig", { on_line = 14, text = "var a := 12", indent = 0 }, "after function declaration")
 
     runner:new_line("groupings.tig", { on_line = 2, text = "var b := 0", indent = 2 }, "let declarations")
-    runner:new_line("groupings.tig", { on_line = 3, text = "a := a + 1", indent = 2 }, "after 'in'", XFAIL)
-    runner:new_line("groupings.tig", { on_line = 4, text = "a := a + 1;", indent = 4 }, "sequence", XFAIL)
+    runner:new_line("groupings.tig", { on_line = 3, text = "a := a + 1", indent = 2 }, "after 'in'")
+    runner:new_line("groupings.tig", { on_line = 4, text = "a := a + 1;", indent = 4 }, "sequence")
     runner:new_line("groupings.tig", { on_line = 8, text = "a := a + 1;", indent = 2 }, "after sequence")
     runner:new_line("groupings.tig", { on_line = 10, text = "+ 1", indent = 0 }, "after 'end'")
 
     runner:new_line(
       "values-and-expressions.tig",
       { on_line = 4, text = "field: record,", indent = 4 },
-      "record type beginning",
-      XFAIL
+      "record type beginning"
     )
     runner:new_line(
       "values-and-expressions.tig",
@@ -85,39 +68,31 @@ describe("indent Tiger:", function()
     runner:new_line(
       "values-and-expressions.tig",
       { on_line = 10, text = "0", indent = 4 },
-      "variable declaration init value",
-      XFAIL
+      "variable declaration init value"
     )
     runner:new_line(
       "values-and-expressions.tig",
       { on_line = 11, text = "+ a", indent = 4 },
       "variable declaration init follow-up"
     )
-    runner:new_line("values-and-expressions.tig", { on_line = 13, text = "a", indent = 4 }, "array index", XFAIL)
+    runner:new_line("values-and-expressions.tig", { on_line = 13, text = "a", indent = 4 }, "array index")
     runner:new_line("values-and-expressions.tig", { on_line = 14, text = "+ a", indent = 4 }, "array index follow-up")
     runner:new_line("values-and-expressions.tig", { on_line = 15, text = "+ a", indent = 2 }, "after array value")
+    runner:new_line("values-and-expressions.tig", { on_line = 18, text = "a", indent = 4 }, "array expression size")
     runner:new_line(
       "values-and-expressions.tig",
-      { on_line = 18, text = "a", indent = 4 },
-      "array expression size",
-      XFAIL
-    )
-    runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 20, text = "of", indent = 2 },
+      { on_line = 20, text = "of", indent = 4 },
       "array expression after size"
     )
     runner:new_line(
       "values-and-expressions.tig",
       { on_line = 21, text = "a", indent = 4 },
-      "array expression init value",
-      XFAIL
+      "array expression init value"
     )
     runner:new_line(
       "values-and-expressions.tig",
       { on_line = 25, text = "field = 0,", indent = 4 },
-      "record expression beginning",
-      XFAIL
+      "record expression beginning"
     )
     runner:new_line(
       "values-and-expressions.tig",
diff --git a/tests/indent/wgsl_spec.lua b/tests/indent/wgsl_spec.lua
index 4ffdbbda0..55d59acbd 100644
--- a/tests/indent/wgsl_spec.lua
+++ b/tests/indent/wgsl_spec.lua
@@ -2,8 +2,8 @@ local Runner = require("tests.indent.common").Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
 local run = Runner:new(it, "tests/indent/wgsl", {
-  tabstop = 4,
-  shiftwidth = 4,
+  tabstop = 2,
+  shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })

From 2d6e73ab2fd1daad1e8134f174d06a869cbc96b4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 07:43:40 +0000
Subject: [PATCH 0388/2704] Update parsers: comment, commonlisp, cuda,
 markdown, markdown_inline, rst (#4907)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 70cfbfc91..f29faef27 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,10 +51,10 @@
     "revision": "399605a02bcd5daa309ce63a6459c600dce3473f"
   },
   "comment": {
-    "revision": "7a7f9e2f9f1fdea6817e609474f66f2a1f65f1c2"
+    "revision": "94c99a66bb5051d8321b5900aee92b76450c50ce"
   },
   "commonlisp": {
-    "revision": "c7e814975ab0d0d04333d1f32391c41180c58919"
+    "revision": "5b83fc6c2e45df43333db605e87615cdf00eb164"
   },
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
@@ -72,7 +72,7 @@
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "867c97ed7769e56bff99f7122cf63effadb812cc"
+    "revision": "32efc637d841d3adcebb182e4420bc1dd48dab9f"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -297,10 +297,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"
+    "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
   },
   "markdown_inline": {
-    "revision": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d"
+    "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
   },
   "matlab": {
     "revision": "dd95e1fc1b5514aa3a882d5fb8ddbf4683e953f0"
@@ -426,7 +426,7 @@
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
   "rst": {
-    "revision": "25e6328872ac3a764ba8b926aea12719741103f1"
+    "revision": "c7c2b24918e231072af2d10c03b4893818de9d5d"
   },
   "ruby": {
     "revision": "206c7077164372c596ffa8eaadb9435c28941364"

From a034c7aa25a2dca0ab2c0b82d8e325f248d52e74 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 5 Jun 2023 14:09:44 +0200
Subject: [PATCH 0389/2704] fix(highlights): lower priority for codeblocks with
 injections (#4905)

---
 CONTRIBUTING.md                 | 17 +++++++++++++----
 queries/c/highlights.scm        |  6 ++----
 queries/markdown/highlights.scm |  8 +++-----
 queries/vimdoc/highlights.scm   |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d1a16a0b..f2e96bc1a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -82,9 +82,7 @@ you can mark the language as optional (by putting it between parenthesis).
 
 ### Highlights
 
-As languages differ quite a lot, here is a set of captures available to you when building a `highlights.scm` query.
-One important thing to note is that many of these capture groups are not supported by `neovim` for now, and will not have any
-effect on highlighting. We will work on improving highlighting in the near future though.
+As languages differ quite a lot, here is a set of captures available to you when building a `highlights.scm` query. Note that your colorscheme needs to define (or link) these captures as highlight groups.
 
 #### Misc
 
@@ -196,7 +194,6 @@ Mainly for markup languages.
 @text.underline        ; underlined text
 @text.strike           ; strikethrough text
 @text.title            ; text that is part of a title
-@text.literal          ; literal or verbatim text (e.g., inline code)
 @text.quote            ; text quotations
 @text.uri              ; URIs (e.g. hyperlinks)
 @text.math             ; math environments (e.g. `$ ... $` in LaTeX)
@@ -204,6 +201,10 @@ Mainly for markup languages.
 @text.environment.name ; text indicating the type of an environment
 @text.reference        ; text references, footnotes, citations, etc.
 
+@text.literal          ; literal or verbatim text (e.g., inline code)
+@text.literal.block    ; literal or verbatim text as a stand-alone block
+                       ; (use priority 90 for blocks with injections)
+
 @text.todo             ; todo notes
 @text.note             ; info notes
 @text.warning          ; warning notes
@@ -238,6 +239,14 @@ Used for XML-like tags.
 @nospell ; for defining regions that should NOT be spellchecked
 ```
 
+#### Priority
+
+Captures can be assigned a priority to control precedence of highlights via the
+`#set! "priority" <number>` directive (see `:h treesitter-highlight-priority`).
+The default priority for treesitter highlights is `100`; queries should only
+set priorities between `90` and `120`, to avoid conflict with other sources of
+highlighting (such as diagnostics or LSP semantic tokens).
+
 ### Locals
 
 Note: pay specific attention to the captures here as they are a bit different to
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 523a79240..b5dad2ae2 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -112,10 +112,8 @@
 (number_literal) @number
 (char_literal) @character
 
-[
- (preproc_arg)
- (preproc_defined)
-]  @function.macro
+((preproc_arg) @function.macro (#set! "priority" 90))
+(preproc_defined) @function.macro
 
 (((field_expression
      (field_identifier) @property)) @_parent
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 8867a4b7f..e78d233cc 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -9,11 +9,9 @@
 (atx_heading (atx_h5_marker) @text.title.5.marker (inline) @text.title.5)
 (atx_heading (atx_h6_marker) @text.title.6.marker (inline) @text.title.6)
 
-[
-  (link_title)
-  (indented_code_block)
-  (fenced_code_block)
-] @text.literal
+(link_title) @text.literal
+(indented_code_block) @text.literal.block
+((fenced_code_block) @text.literal.block (#set! "priority" 90))
 
 (info_string) @label
 
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index e0dce49b2..c52333df1 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -15,7 +15,7 @@
 (codespan
    "`" @conceal (#set! conceal "")
    text: (_) @text.literal)
-(codeblock) @text.literal
+((codeblock) @text.literal.block (#set! "priority" 90))
 (codeblock
    [">" (language)] @conceal (#set! conceal ""))
 (block

From 1b5a7334bb9862abafcf6676d2a2a6973d15ae3a Mon Sep 17 00:00:00 2001
From: Frank Bearoff <fbearoff@users.noreply.github.com>
Date: Mon, 5 Jun 2023 12:32:53 -0400
Subject: [PATCH 0390/2704] feat(bash): highlight `until` as `@repeat`

---
 queries/bash/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index e209eb935..b62405171 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -65,6 +65,7 @@
  "do"
  "done"
  "select"
+ "until"
  "while"
  ] @repeat
 

From ab3bf7d95615098f47596ab245282c03149195e7 Mon Sep 17 00:00:00 2001
From: Domas Poliakas <domas123123@gmail.com>
Date: Tue, 6 Jun 2023 16:36:09 +0200
Subject: [PATCH 0391/2704] fix(scala): add `block_comment`

---
 queries/scala/highlights.scm | 7 +++++--
 queries/scala/injections.scm | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 64f49f8f6..f62e88c5d 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -232,9 +232,12 @@
 
 "return" @keyword.return
 
-(comment) @comment @spell
+[
+  (comment)
+  (block_comment)
+] @comment @spell
 
-((comment) @comment.documentation
+((block_comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 ;; `case` is a conditional keyword in case_block
diff --git a/queries/scala/injections.scm b/queries/scala/injections.scm
index 4bb7d675d..521ca7a67 100644
--- a/queries/scala/injections.scm
+++ b/queries/scala/injections.scm
@@ -1 +1,4 @@
-(comment) @comment
+[
+  (comment) 
+  (block_comment)
+] @comment

From 33eb472b459f1d2bf49e16154726743ab3ca1c6d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 Jun 2023 07:16:37 +0000
Subject: [PATCH 0392/2704] Update parsers: ada, erlang, go, lua, scala (#4917)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f29faef27..44599566e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "42cc2eb141529b03a91c18ec8646a0a58fb111ba"
+    "revision": "ba7951a8f3fb08f9ea923625153e7670c89f30b4"
   },
   "agda": {
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
@@ -120,7 +120,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "6228b1df25f25dbd69e4e0342c4c65eb9b5e957d"
+    "revision": "c431b0b2d9228ed0869f7a6bb88fc9d2796d44b1"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -174,7 +174,7 @@
     "revision": "53ca269cae2a47b1b75791e2bfe843baeb02e903"
   },
   "go": {
-    "revision": "7cccc30535a40da07092626031120ae6b36202d7"
+    "revision": "3a3a8ee53777eaa6cbfc032afd11af407ee1f7fe"
   },
   "godot_resource": {
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
@@ -279,7 +279,7 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "dcc44f7473ecec4d7b99af0a9529705d98a769f1"
+    "revision": "092f32a3d58e37a40bbc8e83b44740e1f23719fb"
   },
   "luadoc": {
     "revision": "978cc13791c1d6e4626ee7e8db108d0be14f07e7"
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "236c7b20dbddedb031ce40517fafc027434f6860"
+    "revision": "97d88301d3af69e88098f90f7689061fa47f6154"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From 46ddea9deccb0608df416822228786d1a5a2b7d1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 8 Jun 2023 03:10:54 +0900
Subject: [PATCH 0393/2704] fix(dart): update indents from upstream (#4924)

---
 .github/workflows/update-lockfile.yml | 2 +-
 lockfile.json                         | 2 +-
 queries/dart/indents.scm              | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 36b384de5..5a29d32b7 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "dart"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           ./nvim.appimage --headless -c "luafile ./scripts/write-lockfile.lua" -c "q"
diff --git a/lockfile.json b/lockfile.json
index 44599566e..b59af78cf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -81,7 +81,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "8aa8ab977647da2d4dcfb8c4726341bee26fbce4"
+    "revision": "0033b223b5876b0db07da487dc799dcb63aedd1b"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index 77259aef7..87befcf6c 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -18,7 +18,10 @@
   (#set! indent.immediate 1)
   (#set! indent.start_at_same_line 1))
 
-(switch_label) @indent.branch
+[
+  (switch_statement_case)
+  (switch_statement_default)
+] @indent.branch
 
 [
   "("

From a954f789aaa0cedea7609b5493007867b1cd3e9e Mon Sep 17 00:00:00 2001
From: Munif Tanjim <hello@muniftanjim.dev>
Date: Thu, 8 Jun 2023 04:12:54 +0600
Subject: [PATCH 0394/2704] feat(lua): update highlights query for functions
 (#4919)

---
 queries/lua/highlights.scm | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index a7b7699d8..557ea7da0 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -180,13 +180,40 @@
 
 (parameters (identifier) @parameter)
 
-(function_call name: (identifier) @function.call)
-(function_declaration name: (identifier) @function)
+(function_declaration
+  name: [
+    (identifier) @function
+    (dot_index_expression
+      field: (identifier) @function)
+  ])
 
-(function_call name: (dot_index_expression field: (identifier) @function.call))
-(function_declaration name: (dot_index_expression field: (identifier) @function))
+(function_declaration
+  name: (method_index_expression
+    method: (identifier) @method))
 
-(method_index_expression method: (identifier) @method.call)
+(assignment_statement
+  (variable_list .
+    name: [
+      (identifier) @function
+      (dot_index_expression
+        field: (identifier) @function)
+    ])
+  (expression_list .
+    value: (function_definition)))
+
+(table_constructor
+  (field
+    name: (identifier) @function
+    value: (function_definition)))
+
+(function_call
+  name: [
+    (identifier) @function.call
+    (dot_index_expression
+      field: (identifier) @function.call)
+    (method_index_expression
+      method: (identifier) @method.call)
+  ])
 
 (function_call
   (identifier) @function.builtin

From 2883a9cf8611f94e18870b7647a0fc004ac39110 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 07:10:04 +0000
Subject: [PATCH 0395/2704] Update parsers: commonlisp, lua, ruby, scala
 (#4927)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b59af78cf..944575f05 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "94c99a66bb5051d8321b5900aee92b76450c50ce"
   },
   "commonlisp": {
-    "revision": "5b83fc6c2e45df43333db605e87615cdf00eb164"
+    "revision": "747a6e161ee8ab000f00f3adf0bec8dfbf6a8403"
   },
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
@@ -279,7 +279,7 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "092f32a3d58e37a40bbc8e83b44740e1f23719fb"
+    "revision": "d8360bc472ca1d55d437624ee7299152b693e1a0"
   },
   "luadoc": {
     "revision": "978cc13791c1d6e4626ee7e8db108d0be14f07e7"
@@ -429,13 +429,13 @@
     "revision": "c7c2b24918e231072af2d10c03b4893818de9d5d"
   },
   "ruby": {
-    "revision": "206c7077164372c596ffa8eaadb9435c28941364"
+    "revision": "74fde5e5fb2bb5978aaee7895188eb199f7facf0"
   },
   "rust": {
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "97d88301d3af69e88098f90f7689061fa47f6154"
+    "revision": "007a1845a46d3b4c1edfd157491ffc5739e2340f"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From 71bb1da621a48856c7f8ca10e674f2ac8c0a9005 Mon Sep 17 00:00:00 2001
From: Hoang Nguyen <folliekazetani@protonmail.com>
Date: Thu, 8 Jun 2023 14:13:26 +0000
Subject: [PATCH 0396/2704] feat(jsonnet): add "for" & "function", update
 operator highlights

`expr` -> `operator` doesn't exist in the node tree anymore after
https://github.com/sourcegraph/tree-sitter-jsonnet/commit/505f5bd90053ae895aa3d6f2bac8071dd9abd8b2
---
 queries/jsonnet/highlights.scm | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index eb8d22be9..4267c988f 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -30,13 +30,33 @@
   ":::"
 ] @punctuation.delimiter
 
-(expr
-  operator: (_) @operator)
+(unaryop) @operator
 [
   "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "^"
+  "=="
+  "!="
+  "<="
+  ">="
+  "<"
+  ">"
   "="
+  "&"
+  "|"
+  "<<"
+  ">>"
+  "&&"
+  "||"
 ] @operator
 
+"for" @repeat
+
+"function" @keyword.function
+
 "in" @keyword.operator
 
 [

From 99606fdb71249937eaa1f85bf1ac04b81538efda Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 8 Jun 2023 10:53:33 -0400
Subject: [PATCH 0397/2704] feat(typescript): update highlights

---
 queries/typescript/highlights.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 239de88fd..f9385c8c3 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -1,5 +1,9 @@
 ; inherits: ecma
 
+"require" @include
+
+(import_require_clause source: (string) @text.uri)
+
 [
   "declare"
   "enum"
@@ -10,6 +14,7 @@
   "namespace"
   "override"
   "module"
+  "asserts"
   "infer"
   "is"
 ] @keyword
@@ -20,6 +25,8 @@
 ] @keyword.operator
 
 (as_expression "as" @keyword.operator)
+(export_statement "as" @keyword.operator)
+(mapped_type_clause "as" @keyword.operator)
 
 [
   "abstract"
@@ -52,6 +59,9 @@
 (type_parameters
   ["<" ">"] @punctuation.bracket)
 
+(object_type
+  ["{|" "|}"] @punctuation.bracket)
+
 (union_type
   "|" @punctuation.delimiter)
 
@@ -67,14 +77,22 @@
 (index_signature
   ":" @punctuation.delimiter)
 
+(omitting_type_annotation
+  "-?:" @punctuation.delimiter)
+
 (opting_type_annotation
   "?:" @punctuation.delimiter)
 
 "?." @punctuation.delimiter
 
+(abstract_method_signature "?" @punctuation.special)
 (method_signature "?" @punctuation.special)
+(method_definition "?" @punctuation.special)
 (property_signature "?" @punctuation.special)
 (optional_parameter "?" @punctuation.special)
+(optional_type "?" @punctuation.special)
+(public_field_definition [ "?" "!" ] @punctuation.special)
+(flow_maybe_type "?" @punctuation.special)
 
 (template_type ["${" "}"] @punctuation.special)
 

From 2c59e0ff3da6514b03d853ebecb6c36c515a5d7d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 8 Jun 2023 12:52:21 -0400
Subject: [PATCH 0398/2704] refactor(ecma): triple dot should be an operator

---
 queries/ecma/highlights.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index a002d17ae..55ce8cb5b 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -199,8 +199,6 @@
 ; Punctuation
 ;------------
 
-"..." @punctuation.special
-
 ";" @punctuation.delimiter
 "." @punctuation.delimiter
 "," @punctuation.delimiter
@@ -251,6 +249,7 @@
   "&&="
   "||="
   "??="
+  "..."
 ] @operator
 
 (binary_expression "/" @operator)

From 7dd2f837647df19be585691dea8e982c70703f33 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 9 Jun 2023 06:49:49 +0000
Subject: [PATCH 0399/2704] Update parsers: commonlisp, dart, scala (#4934)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 944575f05..94def0fda 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "94c99a66bb5051d8321b5900aee92b76450c50ce"
   },
   "commonlisp": {
-    "revision": "747a6e161ee8ab000f00f3adf0bec8dfbf6a8403"
+    "revision": "ff0c1850cf992923a7989e8aa04f122dd13f05d6"
   },
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
@@ -81,7 +81,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "0033b223b5876b0db07da487dc799dcb63aedd1b"
+    "revision": "921149688d70f163d650f26c23f1bc42fac5d303"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "007a1845a46d3b4c1edfd157491ffc5739e2340f"
+    "revision": "359cfcb136bfbe6ee7863b4d69539c6b7da8deea"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From e040eda9976533fa5dfa5e473079dcc7b0d95bbf Mon Sep 17 00:00:00 2001
From: pseudometa <73286100+chrisgrieser@users.noreply.github.com>
Date: Fri, 9 Jun 2023 10:14:08 +0200
Subject: [PATCH 0400/2704] feat(comment): Add some common comment tags (#4909)

see also: https://github.com/stsewd/tree-sitter-comment/issues/22
---
 queries/comment/highlights.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index c5e98669f..c0e1df308 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -4,37 +4,37 @@
   (name) @text.todo @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#eq? @text.todo "TODO"))
+  (#eq? @text.todo "TODO" "WIP"))
 
 ("text" @text.todo @nospell
- (#eq? @text.todo "TODO"))
+ (#eq? @text.todo "TODO" "WIP"))
 
 ((tag
   (name) @text.note @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.note "NOTE" "XXX"))
+  (#any-of? @text.note "NOTE" "XXX" "INFO"))
 
 ("text" @text.note @nospell
- (#any-of? @text.note "NOTE" "XXX"))
+ (#any-of? @text.note "NOTE" "XXX" "INFO"))
 
 ((tag
   (name) @text.warning @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.warning "HACK" "WARNING"))
+  (#any-of? @text.warning "HACK" "WARNING" "WARN" "FIX"))
 
 ("text" @text.warning @nospell
- (#any-of? @text.warning "HACK" "WARNING"))
+ (#any-of? @text.warning "HACK" "WARNING" "WARN" "FIX"))
 
 ((tag
   (name) @text.danger @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.danger "FIXME" "BUG"))
+  (#any-of? @text.danger "FIXME" "BUG" "ERROR"))
 
 ("text" @text.danger @nospell
- (#any-of? @text.danger "FIXME" "BUG"))
+ (#any-of? @text.danger "FIXME" "BUG" "ERROR"))
 
 ; Issue number (#123)
 ("text" @number

From 5944fc821ac590ddb8073b3f9243a432105237b0 Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Fri, 9 Jun 2023 10:15:06 +0200
Subject: [PATCH 0401/2704] feat(scala): sync highlights with latest upstream
 (#4926)

This accounts for a correction in interpolations and also adding support
for `self_type`.

This is a follow-up to #4920.
---
 queries/scala/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index f62e88c5d..743d16cc2 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -23,7 +23,10 @@
 (class_parameter 
   name: (identifier) @parameter)
 
-(interpolation) @none
+(self_type (identifier) @parameter)
+
+(interpolation (identifier) @none)
+(interpolation (block) @none)
 
 ;; types
 

From 51dfcfdfdea564c7a6bf155cf5b7c9831193ddae Mon Sep 17 00:00:00 2001
From: David Zeng <zeng.david@outlook.com>
Date: Fri, 9 Jun 2023 11:48:24 +0200
Subject: [PATCH 0402/2704] feat(dart): improve locals query (#4922)

---
 queries/dart/locals.scm | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/queries/dart/locals.scm b/queries/dart/locals.scm
index 1013d4a92..2184bab1d 100644
--- a/queries/dart/locals.scm
+++ b/queries/dart/locals.scm
@@ -1,8 +1,34 @@
+;; Definitions
+
+(function_signature
+  name: (identifier) @definition.function)
+
+(formal_parameter
+  name: (identifier) @definition.parameter)
+
+(initialized_variable_definition
+  name: (identifier) @definition.var)
+
+(initialized_identifier
+  (identifier) @definition.var)
+
+(static_final_declaration
+  (identifier) @definition.var)
+
+;; References
+
+(identifier) @reference
+
+;; Scopes
+
 (class_definition
- body: (_) @scope)
-
- (block) @scope
-
- (try_statement) @scope
- (catch_clause) @scope
- (finally_clause) @scope
+  body: (_) @scope)
+[
+ (block)
+ (if_statement)
+ (for_statement)
+ (while_statement)
+ (try_statement)
+ (catch_clause)
+ (finally_clause)
+] @scope

From 7be9ebd06abe2ed836abd3e91acb0b243ddcafba Mon Sep 17 00:00:00 2001
From: Noah <noah.bogart@hey.com>
Date: Fri, 9 Jun 2023 16:07:45 -0400
Subject: [PATCH 0403/2704] feat(clojure): add update-keys & update-vals

---
 queries/clojure/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index d7d82601c..98c791e78 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -305,7 +305,7 @@
   ;; 1.11
   "NaN?" "abs" "infinite?" "iteration" "random-uuid"
   "parse-boolean" "parse-double" "parse-long" "parse-uuid"
-  "seq-to-map-for-destructuring"
+  "seq-to-map-for-destructuring" "update-keys" "update-vals"
   ;; 1.12
   "partitionv" "partitionv-all" "splitv-at"))
 

From f9d701176cb9a3e206a4c690920a8993630c3ec8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 10 Jun 2023 09:26:21 +0200
Subject: [PATCH 0404/2704] Update parsers: commonlisp, racket, ruby, scala
 (#4937)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 94def0fda..951747994 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "94c99a66bb5051d8321b5900aee92b76450c50ce"
   },
   "commonlisp": {
-    "revision": "ff0c1850cf992923a7989e8aa04f122dd13f05d6"
+    "revision": "7a61fd78c1673da5c38b7bef56794f0ac6250e91"
   },
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
@@ -408,7 +408,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "e196cd417c425c2c3dc54f3b7b7666fe968ba50b"
+    "revision": "b7261231aeaa8157240427716287fb5cbbcf44a2"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -429,13 +429,13 @@
     "revision": "c7c2b24918e231072af2d10c03b4893818de9d5d"
   },
   "ruby": {
-    "revision": "74fde5e5fb2bb5978aaee7895188eb199f7facf0"
+    "revision": "2edbd437ee901b8fa95861ec538e56efe3ebd127"
   },
   "rust": {
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "359cfcb136bfbe6ee7863b4d69539c6b7da8deea"
+    "revision": "d42d40c7adbc638cf9fb571a5bc984715bf083c2"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From 9c9e12f0333a1686171a1315b237e9f6c49ff41d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 11 Jun 2023 07:38:24 +0000
Subject: [PATCH 0405/2704] Update parsers: scala (#4940)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 951747994..de32b6eb3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "d42d40c7adbc638cf9fb571a5bc984715bf083c2"
+    "revision": "199cf060eec9e0d427ae3c6fe46de2c830d0c1e9"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From 111a3f46116516bc04fe5bbcbd6ec71d704b71f3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 07:35:58 +0000
Subject: [PATCH 0406/2704] Update parsers: latex, racket (#4943)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index de32b6eb3..cb718062d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -270,7 +270,7 @@
     "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
   },
   "latex": {
-    "revision": "dfe891922ccd2e7cef52eccb2775e1b576727165"
+    "revision": "2ae2021d7b224fb6aa57b760e0d146059f943bb8"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -408,7 +408,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "b7261231aeaa8157240427716287fb5cbbcf44a2"
+    "revision": "0c8791fdfed9412ea44177f1108da618d8a0470f"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"

From 0ae494269acd469fbd896cf5d5a430dbbf4d4e95 Mon Sep 17 00:00:00 2001
From: Vadim Kazakov <yads12@gmail.com>
Date: Mon, 12 Jun 2023 09:54:30 -0600
Subject: [PATCH 0407/2704] feat: add more support for glimmer (#4935)

* add indents, locals and folds
---
 queries/glimmer/folds.scm   |  4 ++++
 queries/glimmer/indents.scm | 22 ++++++++++++++++++++++
 queries/glimmer/locals.scm  |  7 +++++++
 3 files changed, 33 insertions(+)
 create mode 100644 queries/glimmer/folds.scm
 create mode 100644 queries/glimmer/indents.scm
 create mode 100644 queries/glimmer/locals.scm

diff --git a/queries/glimmer/folds.scm b/queries/glimmer/folds.scm
new file mode 100644
index 000000000..cfe9d35b0
--- /dev/null
+++ b/queries/glimmer/folds.scm
@@ -0,0 +1,4 @@
+[
+ (element_node (element_node_start))
+ (block_statement)
+] @fold
diff --git a/queries/glimmer/indents.scm b/queries/glimmer/indents.scm
new file mode 100644
index 000000000..8bccf33fa
--- /dev/null
+++ b/queries/glimmer/indents.scm
@@ -0,0 +1,22 @@
+[
+  (element_node (element_node_start))
+  (element_node_void)
+  (block_statement (block_statement_start))
+  (mustache_statement)
+] @indent.begin
+
+(element_node (element_node_end  [">"] @indent.end))
+(element_node_void "/>" @indent.end)
+[
+ ">"
+ "/>"
+ "</"
+ "{{/"
+ "}}"
+] @indent.branch
+
+(mustache_statement
+  (helper_invocation helper: (identifier) @_identifier (#eq? @_identifier "else"))
+  ) @indent.branch
+(mustache_statement ((identifier) @_identifier (#eq? @_identifier "else"))) @indent.branch
+(comment_statement) @indent.ignore
diff --git a/queries/glimmer/locals.scm b/queries/glimmer/locals.scm
new file mode 100644
index 000000000..c371162bc
--- /dev/null
+++ b/queries/glimmer/locals.scm
@@ -0,0 +1,7 @@
+[
+ (element_node)
+ (block_statement)
+] @scope
+
+(identifier) @reference
+(block_params (identifier) @definition.var)

From 2847aac9d40516c8fc29ab4864e665da09fe14d6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 07:20:54 +0000
Subject: [PATCH 0408/2704] Update parsers: astro, haskell, ruby, scala (#4947)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cb718062d..bb10486a8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "833b53df97143bc46e014608dee9f64f78d7473c"
   },
   "astro": {
-    "revision": "d111ae5ebbd30ffeaf58a3bebd2eb99682c0f6a3"
+    "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
   },
   "awk": {
     "revision": "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"
@@ -198,7 +198,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "e002d60072c73ab09bafedc82d3e35a4349ca6c0"
+    "revision": "d2345d17ccf06253d63aa9a2e09ac9d7b4ca3c8d"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"
@@ -429,13 +429,13 @@
     "revision": "c7c2b24918e231072af2d10c03b4893818de9d5d"
   },
   "ruby": {
-    "revision": "2edbd437ee901b8fa95861ec538e56efe3ebd127"
+    "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "199cf060eec9e0d427ae3c6fe46de2c830d0c1e9"
+    "revision": "3c5e57a55b7d80657ef2e1dffaa7a58ffb9b8523"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From 150be01d47579ba70137813348a2f0a5be7a7866 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <sseitz@nvidia.com>
Date: Sun, 11 Jun 2023 13:32:52 +0200
Subject: [PATCH 0409/2704] highlights(commonlisp): include all symbols defined
 by the ANSI standard

Before, those symbols were available via https://github.com/theHamsta/nvim-treesitter-commonlisp.
Since then `#any-of?` has become more efficient via tables and clojure also added all builtin functions
(https://github.com/theHamsta/nvim-treesitter/blob/72cbda75a901bf14a2eb98a47584fe5fc32689ab/queries/clojure/highlights.scm#L169-L278).

The list I'm adding is defined by the 1994 ANSI standard that has
not changed since. This is why I don't expect any changes or maintenance burden due to adding that list.

Fixes https://github.com/theHamsta/tree-sitter-commonlisp/issues/18
---
 queries/commonlisp/highlights.scm | 56 ++++---------------------------
 1 file changed, 7 insertions(+), 49 deletions(-)

diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index d898afe79..8775b4588 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -110,40 +110,9 @@
 (list_lit
  .
  (sym_lit) @function.macro
- ;; For a complete and more efficient version install theHamsta/nvim-treesitter-commonlisp
+ ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
  (#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"))
+  "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda" "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass" "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf" "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream" "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or" "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro" "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace" "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist" "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander" "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string" "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter" "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless" "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block" "time" "restart-case" "prog*" "define-method-combination" "optimize"))
 
 ;; constant
 ((sym_lit) @constant
@@ -156,22 +125,11 @@
 ["#" "#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"))
+  .
+  (sym_lit) @function.builtin
+  ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
+  (#any-of? @function.builtin
+   "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast"))
 
 (list_lit
  .

From 5822a8c6886f0238a315b57e5e96acdd74d04448 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 14 Jun 2023 06:36:13 +0000
Subject: [PATCH 0410/2704] Update parsers: c_sharp, dart, vhs

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bb10486a8..18f80e20e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "0906255f8de1d319b8ec682ac8c43e7d2524b4fa"
   },
   "c_sharp": {
-    "revision": "aaafc3d75f058ca5fe639b7ed5829964a3ca4575"
+    "revision": "cfdad1a01ce7cae6ad6ddd5f338740bc6e08690a"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -81,7 +81,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "921149688d70f163d650f26c23f1bc42fac5d303"
+    "revision": "e398400a0b785af3cf571f5a57eccab242f0cdf9"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
@@ -540,7 +540,7 @@
     "revision": "4457145e795b363f072463e697dfe2f6973c9a52"
   },
   "vhs": {
-    "revision": "77fd8a8fcc0b4788e0b1569b1a4fa070b36add28"
+    "revision": "fec6e981b7795b68262ddf229d73d2aa03a89b9a"
   },
   "vim": {
     "revision": "26b1aea3b3a5dae31f784a1204205fd57f2b82b5"

From 10b0da9f931c734b531eb095ea01cce53984205c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 15 Jun 2023 07:17:06 +0000
Subject: [PATCH 0411/2704] Update parsers: c, c_sharp, cpp, cuda, racket,
 scala (#4951)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 18f80e20e..2a6cfe55f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,10 +33,10 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "0906255f8de1d319b8ec682ac8c43e7d2524b4fa"
+    "revision": "f1b2a0b2102ff001a4ed9a26cd9a9405d09c590c"
   },
   "c_sharp": {
-    "revision": "cfdad1a01ce7cae6ad6ddd5f338740bc6e08690a"
+    "revision": "95b22531b496eec47fbb4c25375b507c909982ca"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -66,13 +66,13 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "4c917d560572dc2b3704b041715b2729fa199963"
+    "revision": "d63acf7c2ae9599a2f01c8e8beb7d333e54956e4"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "32efc637d841d3adcebb182e4420bc1dd48dab9f"
+    "revision": "90446edd3e2e1eed0cb77755a083d9ed91ddea63"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -408,7 +408,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "0c8791fdfed9412ea44177f1108da618d8a0470f"
+    "revision": "2804e03223953dc4709f4c041b57b722095a0397"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "3c5e57a55b7d80657ef2e1dffaa7a58ffb9b8523"
+    "revision": "e0d5372a203b7c2e95cb34e43124a3a819940bae"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From 150a4c9fa4743b9af7b95f68746778394ce2ac93 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 06:56:41 +0000
Subject: [PATCH 0412/2704] Update parsers: scala (#4953)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 2a6cfe55f..c49d02b6d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "e0d5372a203b7c2e95cb34e43124a3a819940bae"
+    "revision": "a5c4c29b95aca29dea71f34bf046ad0b36499045"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"

From 1b9f704eb8664508749a1164d4086e47f9afa77f Mon Sep 17 00:00:00 2001
From: Santos Gallegos <stsewd@proton.me>
Date: Fri, 16 Jun 2023 14:11:10 -0500
Subject: [PATCH 0413/2704] fix(comment): use #any-of? predicate

---
 queries/comment/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index c0e1df308..2f76708db 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -4,10 +4,10 @@
   (name) @text.todo @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#eq? @text.todo "TODO" "WIP"))
+  (#any-of? @text.todo "TODO" "WIP"))
 
 ("text" @text.todo @nospell
- (#eq? @text.todo "TODO" "WIP"))
+ (#any-of? @text.todo "TODO" "WIP"))
 
 ((tag
   (name) @text.note @nospell

From e2c162b09f7acdc5e008286032ce01a1f9bde970 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 16 Jun 2023 17:37:23 -0400
Subject: [PATCH 0414/2704] chore: update cmake files

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c49d02b6d..082f6d018 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "399605a02bcd5daa309ce63a6459c600dce3473f"
+    "revision": "24ed4fd565cd95fcba4f42e995cf186cab180ccb"
   },
   "comment": {
     "revision": "94c99a66bb5051d8321b5900aee92b76450c50ce"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0c8ba9aae..16da1ecef 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -206,7 +206,7 @@ list.clojure = {
 list.cmake = {
   install_info = {
     url = "https://github.com/uyha/tree-sitter-cmake",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@uyha" },
 }

From 41f78130fd59cd9aa1a9eaa11bb4e37dde162c31 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 17 Jun 2023 06:34:41 +0000
Subject: [PATCH 0415/2704] Update parsers: c_sharp, cmake, comment,
 commonlisp, corn, erlang, v

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 082f6d018..838ec16cb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "f1b2a0b2102ff001a4ed9a26cd9a9405d09c590c"
   },
   "c_sharp": {
-    "revision": "95b22531b496eec47fbb4c25375b507c909982ca"
+    "revision": "03b9b6272ef3df674f9c54507cc042412f257eed"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -51,16 +51,16 @@
     "revision": "24ed4fd565cd95fcba4f42e995cf186cab180ccb"
   },
   "comment": {
-    "revision": "94c99a66bb5051d8321b5900aee92b76450c50ce"
+    "revision": "fd1e1026d1a33b996db91a01dafeeff0a41d536c"
   },
   "commonlisp": {
-    "revision": "7a61fd78c1673da5c38b7bef56794f0ac6250e91"
+    "revision": "338db38330f0d25cba8e2c6428240ebc5e020264"
   },
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
   },
   "corn": {
-    "revision": "6a6b0f4b1d564392c1b6a8ebcc27d94185f72ede"
+    "revision": "604d73c38d4c28ca68e9e441ffd405d68cb63051"
   },
   "cpon": {
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
@@ -120,7 +120,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "c431b0b2d9228ed0869f7a6bb88fc9d2796d44b1"
+    "revision": "5dba13dcd531c19bf99829e2e0bb31f2e08e16fe"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -531,7 +531,7 @@
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },
   "v": {
-    "revision": "234c1028883187c6b48e030780b7332229faefa3"
+    "revision": "519e0f64007a40852e59bb72ff1b6e2375068664"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 840e5d71787b02789f909315f646a6dd66a0de2c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 17 Jun 2023 10:47:06 +0000
Subject: [PATCH 0416/2704] Update parsers: arduino, haskell

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 838ec16cb..a1be5799f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "833b53df97143bc46e014608dee9f64f78d7473c"
+    "revision": "0804efc41c42cf5b0a6ea8d500ea6f4e49a15ef6"
   },
   "astro": {
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
@@ -198,7 +198,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "d2345d17ccf06253d63aa9a2e09ac9d7b4ca3c8d"
+    "revision": "a75238fdefc2281cdba7dc4dca13f1d68a91f177"
   },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"

From d0d57ce5e74437f9281ecb700650b49e5c334031 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 18 Jun 2023 06:35:10 +0000
Subject: [PATCH 0417/2704] Update parsers: comment, rst

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a1be5799f..d493eff84 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "24ed4fd565cd95fcba4f42e995cf186cab180ccb"
   },
   "comment": {
-    "revision": "fd1e1026d1a33b996db91a01dafeeff0a41d536c"
+    "revision": "67446ac511a50ab26d55b2b496d9a7e6889d6704"
   },
   "commonlisp": {
     "revision": "338db38330f0d25cba8e2c6428240ebc5e020264"
@@ -426,7 +426,7 @@
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
   "rst": {
-    "revision": "c7c2b24918e231072af2d10c03b4893818de9d5d"
+    "revision": "a41a933524a54de1ba3ac4f5336b6eeb46deac15"
   },
   "ruby": {
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"

From fdddbff57665c872a92108da41c87adf040fda2e Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Sun, 18 Jun 2023 13:40:55 +0000
Subject: [PATCH 0418/2704] chore: update cmake

The new commit crashes when opening some CMake files
---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index d493eff84..06b945593 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "24ed4fd565cd95fcba4f42e995cf186cab180ccb"
+    "revision": "aafadc0d657faa99e483a4f2c70dbe64491b1802"
   },
   "comment": {
     "revision": "67446ac511a50ab26d55b2b496d9a7e6889d6704"

From c005b8a880de68f1b1a49aadc686a273ddcb59ac Mon Sep 17 00:00:00 2001
From: Akmadan23 <azadahmadi@mailo.com>
Date: Sun, 18 Jun 2023 10:46:56 +0200
Subject: [PATCH 0419/2704] feat(bash): add various shell builtins

---
 queries/bash/highlights.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index b62405171..23bf03e69 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -105,8 +105,15 @@
 
 ((command_name (word) @function.builtin)
  (#any-of? @function.builtin
-    "alias" "cd" "clear" "echo" "eval" "exit" "getopts" "popd"
-    "pushd" "return" "set" "shift" "shopt" "source" "test"))
+    "alias" "bg" "bind" "break" "builtin" "caller" "cd"
+    "command" "compgen" "complete" "compopt" "continue"
+    "coproc" "dirs" "disown" "echo" "enable" "eval"
+    "exec" "exit" "fc" "fg" "getopts" "hash" "help"
+    "history" "jobs" "kill" "let" "logout" "mapfile"
+    "popd" "printf" "pushd" "pwd" "read" "readarray"
+    "return" "set" "shift" "shopt" "source" "suspend"
+    "test" "time" "times" "trap" "type" "typeset"
+    "ulimit" "umask" "unalias" "wait"))
 
 (command
   argument: [

From 3f6c2de149877791aee41d901db7f4a548404af5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 19 Jun 2023 06:37:29 +0000
Subject: [PATCH 0420/2704] Update parsers: comment, luadoc

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 06b945593..16ec01f25 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "aafadc0d657faa99e483a4f2c70dbe64491b1802"
   },
   "comment": {
-    "revision": "67446ac511a50ab26d55b2b496d9a7e6889d6704"
+    "revision": "c9a7e2df7cac2dfb730f766a4f343308f84ff346"
   },
   "commonlisp": {
     "revision": "338db38330f0d25cba8e2c6428240ebc5e020264"
@@ -282,7 +282,7 @@
     "revision": "d8360bc472ca1d55d437624ee7299152b693e1a0"
   },
   "luadoc": {
-    "revision": "978cc13791c1d6e4626ee7e8db108d0be14f07e7"
+    "revision": "8981072676ec8bd74def6134be4f883655f7c082"
   },
   "luap": {
     "revision": "43916b0f31c48a05e03783eb0bab4eec54a4ac75"

From df3f47a5087f13db53bb96ff05a867b75acc4297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20Cr=C3=ADstoffer?= <acristoffers@startmail.com>
Date: Mon, 12 Jun 2023 10:15:41 +0200
Subject: [PATCH 0421/2704] feat(matlab)!: replace parser

---
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   6 +-
 queries/matlab/folds.scm        |  27 ++---
 queries/matlab/highlights.scm   | 173 ++++++++++++++++++++------------
 queries/matlab/indents.scm      |  35 +++++++
 queries/matlab/locals.scm       |  20 ++++
 6 files changed, 180 insertions(+), 83 deletions(-)
 create mode 100644 queries/matlab/indents.scm
 create mode 100644 queries/matlab/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 16ec01f25..90b5ab787 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -303,7 +303,7 @@
     "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
   },
   "matlab": {
-    "revision": "dd95e1fc1b5514aa3a882d5fb8ddbf4683e953f0"
+    "revision": "47cd9bde20c53a106cbd9ab1bd18fbfc600264e6"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 16da1ecef..4731258b6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -926,10 +926,10 @@ list.markdown_inline = {
 
 list.matlab = {
   install_info = {
-    url = "https://github.com/mstanciu552/tree-sitter-matlab",
-    files = { "src/parser.c" },
+    url = "https://github.com/acristoffers/tree-sitter-matlab",
+    files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@amaanq" },
+  maintainers = { "@acristoffers" },
 }
 
 list.menhir = {
diff --git a/queries/matlab/folds.scm b/queries/matlab/folds.scm
index 063a99b5a..dad9ea177 100644
--- a/queries/matlab/folds.scm
+++ b/queries/matlab/folds.scm
@@ -1,16 +1,11 @@
-[
-  (function_definition)
-
-  (if_statement)
-
-  (for_statement)
-  (while_statement)
-
-  (switch_statement)
-  (case_statement)
-
-  (otherwise_statement)
-
-  (try_statement)
-  (catch_statement)
-] @fold
+[(if_statement)
+ (for_statement)
+ (while_statement)
+ (switch_statement)
+ (try_statement)
+ (function_definition)
+ (class_definition)
+ (enumeration)
+ (events)
+ (methods)
+ (properties)] @fold
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index bad9dbdf4..8dd10d6a9 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -1,106 +1,153 @@
-; Functions
+; Includes
 
-(function_definition
-  function_name: (identifier) @function
-  (end) @keyword.function)
-
-(parameter_list (identifier) @parameter)
+((command_name) @include
+  (#eq? @include "import"))
 
 ; Keywords
 
-((identifier) @keyword
-  (#eq? @keyword "end"))
-
-(function_keyword) @keyword.function
-
 [
-  "return"
-] @keyword.return
+  "arguments"
+  "classdef"
+  "end"
+  "enumeration"
+  "events"
+  "global"
+  "methods"
+  "persistent"
+  "properties"
+] @keyword
 
 ; Conditionals
 
-[
-  "if"
-  "elseif"
-  "else"
-  "switch"
-  "case"
-  "otherwise"
-] @conditional
-
-(if_statement (end) @conditional)
-(switch_statement (end) @conditional)
+(if_statement [ "if" "end" ] @conditional)
+(elseif_clause "elseif" @conditional)
+(else_clause "else" @conditional)
+(switch_statement [ "switch" "end" ] @conditional)
+(case_clause "case" @conditional)
+(otherwise_clause "otherwise" @conditional)
+(break_statement) @conditional
 
 ; Repeats
 
-[
-  "for" 
-  "while"
-  "break"
-  "continue"
-] @repeat
-
-(for_statement (end) @repeat)
-(while_statement (end) @repeat)
+(for_statement [ "for" "parfor" "end" ] @repeat)
+(while_statement [ "while" "end" ] @repeat)
+(continue_statement) @repeat
 
 ; Exceptions
 
-[
-  "try"
-  "catch"
-] @exception
+(try_statement [ "try" "end" ] @exception)
+(catch_clause "catch" @exception)
 
-(try_statement (end) @exception)
+; Variables
+
+(identifier) @variable
+
+; Constants
+
+(events (identifier) @constant)
+(attribute (identifier) @constant)
+
+"~" @constant.builtin
+
+; Fields/Properties
+
+(field_expression field: (identifier) @field)
+
+(superclass "." (identifier) @property)
+
+(property_name "." (identifier) @property)
+
+(property name: (identifier) @property)
+
+; Types
+
+(class_definition name: (identifier) @type)
+
+(attributes (identifier) @constant)
+
+(enum . (identifier) @type)
+
+((identifier) @type
+  (#lua-match? @type "^_*[A-Z][a-zA-Z0-9_]+$"))
+
+; Functions
+
+(function_definition
+  "function" @keyword.function
+  name: (identifier) @function
+  [ "end" "endfunction" ]? @keyword.function)
+
+(function_signature name: (identifier) @function)
+
+(function_call
+  name: (identifier) @function.call)
+
+(handle_operator (identifier) @function)
+
+(validation_functions (identifier) @function)
+
+(command (command_name) @function.call)
+(command_argument) @parameter
+
+(return_statement) @keyword.return
+
+; Parameters
+
+(function_arguments (identifier) @parameter)
 
 ; Punctuation
 
-[
-  ","
-  ";"
-  ":"
-] @punctuation.delimiter
+[ ";" "," "." ] @punctuation.delimiter
 
-[ "{" "}" ] @punctuation.bracket
-
-[ "[" "]" ] @punctuation.bracket
-
-[ "(" ")" ] @punctuation.bracket
+[ "(" ")" "[" "]" "{" "}" ] @punctuation.bracket
 
 ; Operators
 
-[ 
-  ">"
-  "<"
-  "=="
-  "<="
-  ">="
-  "=<"
-  "=>"
-  "~="
+[
+  "+"
+  ".+"
+  "-"
+  ".*"
   "*"
   ".*"
   "/"
-  "\\"
   "./"
+  "\\"
+  ".\\"
   "^"
   ".^"
-  "+"
+  "'"
+  ".'"
+  "|"
+  "&"
+  "?"
+  "@"
+  "<"
+  "<="
+  ">"
+  ">="
+  "=="
+  "~="
   "="
   "&&"
   "||"
+  ":"
 ] @operator
 
 ; Literals
 
-(number) @number
-
 (string) @string
 
-[ "true" "false" ] @boolean
+(escape_sequence) @string.escape
+(formatting_sequence) @string.special
+
+(number) @number
+
+(boolean) @boolean
 
 ; Comments
 
-(comment) @comment @spell
+[ (comment) (line_continuation) ] @comment @spell
 
 ; Errors
 
diff --git a/queries/matlab/indents.scm b/queries/matlab/indents.scm
new file mode 100644
index 000000000..46889a280
--- /dev/null
+++ b/queries/matlab/indents.scm
@@ -0,0 +1,35 @@
+"end" @indent.end @indent.branch
+
+[
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (switch_statement)
+  (try_statement)
+  (function_definition)
+  (class_definition)
+  (enumeration)
+  (events)
+  (methods)
+  (properties)
+] @indent.begin
+
+[
+  "elseif"
+  "else"
+  "case"
+  "otherwise"
+  "catch"
+] @indent.branch
+
+((matrix (row) @indent.align)
+ (#set! indent.open_delimiter "[")
+ (#set! indent.close_delimiter "]"))
+((cell (row) @indent.align)
+ (#set! indent.open_delimiter "{")
+ (#set! indent.close_delimiter "}"))
+((parenthesis) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+
+(comment) @indent.auto
diff --git a/queries/matlab/locals.scm b/queries/matlab/locals.scm
new file mode 100644
index 000000000..a6ca6aeb5
--- /dev/null
+++ b/queries/matlab/locals.scm
@@ -0,0 +1,20 @@
+; References
+
+(identifier) @reference
+
+; Definitions
+
+(function_definition
+  name: (identifier) @definition.function
+  (function_arguments
+    (identifier)* @definition.parameter
+    ("," (identifier) @definition.parameter)*)?) @scope
+
+(assignment left: (identifier) @definition.var)
+(multioutput_variable (identifier) @definition.var)
+
+(iterator . (identifier) @definition.var)
+(lambda (arguments (identifier) @definition.parameter))
+(global_operator (identifier) @definition.var)
+(persistent_operator (identifier) @definition.var)
+(catch_clause (identifier) @definition)

From 9f87ac1ed193f7d2d2582b14b3a04bd48a58d0f1 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 19 Jun 2023 07:43:43 +0000
Subject: [PATCH 0422/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ceae07868..adaeaa094 100644
--- a/README.md
+++ b/README.md
@@ -274,7 +274,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
 - [x] [markdown (basic highlighting)](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
 - [x] [markdown_inline (needed for full highlighting)](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
-- [x] [matlab](https://github.com/mstanciu552/tree-sitter-matlab) (maintained by @amaanq)
+- [x] [matlab](https://github.com/acristoffers/tree-sitter-matlab) (maintained by @acristoffers)
 - [x] [menhir](https://github.com/Kerl13/tree-sitter-menhir) (maintained by @Kerl13)
 - [ ] [mermaid](https://github.com/monaqa/tree-sitter-mermaid) (experimental)
 - [x] [meson](https://github.com/Decodetalkers/tree-sitter-meson) (maintained by @Decodetalkers)

From e3330c67f1296b8fc42f652e95515e35c25bce1f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 19 Jun 2023 09:44:53 +0200
Subject: [PATCH 0423/2704] fix(cpp): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 90b5ab787..21bef1215 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -66,7 +66,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "d63acf7c2ae9599a2f01c8e8beb7d333e54956e4"
+    "revision": "2e29f23abcb5f92ddffb22de8b292f09ed78db01"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4731258b6..f20d40035 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -256,7 +256,7 @@ list.cpon = {
 list.cpp = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-cpp",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     generate_requires_npm = true,
   },
   maintainers = { "@theHamsta" },

From 70f161b1dda985d08e106d5e3744b2612755f748 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 19 Jun 2023 11:34:00 +0300
Subject: [PATCH 0424/2704] fix(arduino): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 21bef1215..a1384065c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "0804efc41c42cf5b0a6ea8d500ea6f4e49a15ef6"
+    "revision": "2caedf3e9eb314551a3a6cc9d3b6c4fcdee37747"
   },
   "astro": {
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f20d40035..dbf2e88b9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -91,7 +91,7 @@ list.agda = {
 list.arduino = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-arduino",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@ObserverOfTime" },
 }

From 517a79c84890507e0868982f23c7723541a0d0ea Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:09:47 +0200
Subject: [PATCH 0425/2704] feat(sql): add new keywords for optimization
 statements and renames

---
 lockfile.json              |  2 +-
 queries/sql/highlights.scm | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a1384065c..132976d86 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -459,7 +459,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "63a6bad6d4ca2192cf252e10db73627414546732"
+    "revision": "aa50c2474182c5da73f48fa5a00e02b029780fad"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 561b19a03..a2976c541 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -127,6 +127,7 @@
   (keyword_limit)
   (keyword_offset)
   (keyword_table)
+  (keyword_tables)
   (keyword_key)
   (keyword_references)
   (keyword_foreign)
@@ -140,6 +141,7 @@
   (keyword_min)
   (keyword_avg)
   (keyword_column)
+  (keyword_columns)
   (keyword_cross)
   (keyword_lateral)
   (keyword_alter)
@@ -190,7 +192,6 @@
   (keyword_row)
   (keyword_sort)
   (keyword_compute)
-  (keyword_stats)
   (keyword_comment)
   (keyword_partitioned)
   (keyword_location)
@@ -201,6 +202,12 @@
   (keyword_location)
   (keyword_partitioned)
   (keyword_cached)
+  (keyword_analyze)
+  (keyword_rewrite)
+  (keyword_statistics)
+  (keyword_optimize)
+  (keyword_vacuum)
+  (keyword_cache)
 ] @keyword
 
 [
@@ -217,6 +224,14 @@
  (keyword_option)
  (keyword_local)
  (keyword_cascaded)
+ (keyword_wait)
+ (keyword_nowait)
+ (keyword_metadata)
+ (keyword_incremental)
+ (keyword_bin_pack)
+ (keyword_noscan)
+ (keyword_stats)
+ (keyword_statistics)
 ] @type.qualifier
 
 [

From 4a8efcffc4e34559fbd2344daccc7cf12301e1f3 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 19 Jun 2023 19:14:25 -0400
Subject: [PATCH 0426/2704] fix(elixir): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 132976d86..5f6b3d650 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -105,7 +105,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "4ba9dab6e2602960d95b2b625f3386c27e08084e"
+    "revision": "f74a75dadf724e3b896f85c4a82ec519821e430d"
   },
   "elm": {
     "revision": "692c50c0b961364c40299e73c1306aecb5d20f40"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index dbf2e88b9..7f0079bfb 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -370,7 +370,7 @@ list.eex = {
 list.elixir = {
   install_info = {
     url = "https://github.com/elixir-lang/tree-sitter-elixir",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@connorlay" },
 }

From c8f5919b66d2b792032bbef8c231536a8db881b7 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 20 Jun 2023 02:45:03 -0400
Subject: [PATCH 0427/2704] fix(starlark): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5f6b3d650..63fb07a85 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -465,7 +465,7 @@
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
   },
   "starlark": {
-    "revision": "8ad93a74c2a880bc16325affba3cc66c14bb2bde"
+    "revision": "80516b3a8c2cf058b896d3481309bacf7497f933"
   },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7f0079bfb..5d438d79b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1376,7 +1376,7 @@ list.squirrel = {
 list.starlark = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-starlark",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "bzl",
   maintainers = { "@amaanq" },

From a1c29a9d1d82f231e4cc1922595f9e833bc6099b Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 19 Jun 2023 18:14:41 -0400
Subject: [PATCH 0428/2704] fix(org): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 63fb07a85..5b7f8e21b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -345,7 +345,7 @@
     "revision": "d165dbee27617dab2653e38737d96ede1030d14f"
   },
   "org": {
-    "revision": "081179c52b3e8175af62b9b91dc099d010c38770"
+    "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
   },
   "pascal": {
     "revision": "9e995404ddff8319631d72d4b46552e737206912"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5d438d79b..c8beaab9a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1046,7 +1046,7 @@ list.odin = {
 list.org = {
   install_info = {
     url = "https://github.com/milisims/tree-sitter-org",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
 }
 

From a74317ffaaa9450f444ef864f4ea8109109fc8c9 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 20 Jun 2023 07:15:19 +0000
Subject: [PATCH 0429/2704] Update parsers: elixir, matlab, sql

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5b7f8e21b..5de7058c7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -105,7 +105,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "f74a75dadf724e3b896f85c4a82ec519821e430d"
+    "revision": "7be390548a870ca9cb1bd7f59ac92457bbec7bf5"
   },
   "elm": {
     "revision": "692c50c0b961364c40299e73c1306aecb5d20f40"
@@ -303,7 +303,7 @@
     "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
   },
   "matlab": {
-    "revision": "47cd9bde20c53a106cbd9ab1bd18fbfc600264e6"
+    "revision": "5a047c1572792ae943b51af7cf9307097b2fcce0"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -459,7 +459,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "aa50c2474182c5da73f48fa5a00e02b029780fad"
+    "revision": "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d"
   },
   "squirrel": {
     "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"

From 19385830ab737f5c49a4cd44d0cdab5e5ee697d1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 20 Jun 2023 03:51:15 -0400
Subject: [PATCH 0430/2704] fix(firrtl): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5de7058c7..f0e96e203 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -126,7 +126,7 @@
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
   },
   "firrtl": {
-    "revision": "58e9655caa6b6d0ef8dc0e6bd3d8e060beb6b40d"
+    "revision": "572ac53752252c4b77bd7cf0ce6a07a2db177ab7"
   },
   "fish": {
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c8beaab9a..0337be9bf 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -426,7 +426,7 @@ list.fennel = {
 list.firrtl = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-firrtl",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@amaanq" },
 }

From 1897926700b6b0add1cf25c8ff0ba5f6e917814e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 20 Jun 2023 14:52:30 -0400
Subject: [PATCH 0431/2704] fix(gdscript): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f0e96e203..1a1d42ed2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gdscript": {
-    "revision": "a4b57cc3bcbfc24550e858159647e9238e7ad1ac"
+    "revision": "3fd70bf70a7b7d706ae0fe81730c68642713eeaa"
   },
   "git_config": {
     "revision": "a01b498b25003d97a5f93b0da0e6f28307454347"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0337be9bf..8321a91ab 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -485,7 +485,7 @@ list.fusion = {
 list.gdscript = {
   install_info = {
     url = "https://github.com/PrestonKnopp/tree-sitter-gdscript",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@PrestonKnopp" },
   readme_name = "Godot (gdscript)",

From c3ad1fc21ef2fac3b571837d4db6ee7062ff9604 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 20 Jun 2023 20:17:57 -0400
Subject: [PATCH 0432/2704] fix(php): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1a1d42ed2..f837b8c24 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -357,7 +357,7 @@
     "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
   },
   "php": {
-    "revision": "a17c0caaf133f7bb37b3531dadcfd0879bea23f1"
+    "revision": "d38adb26304d9b9d38e9a3b4aae0ec4b29bf9462"
   },
   "phpdoc": {
     "revision": "2d20f39476348c2682761ce7251914031a7c013f"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8321a91ab..2c2faea34 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1077,7 +1077,7 @@ list.perl = {
 list.php = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-php",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@tk-shirasaka" },
 }

From e015524926ffc2e9abec8f9dcf0ea5d9665d6e78 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 21 Jun 2023 06:36:10 +0000
Subject: [PATCH 0433/2704] Update parsers: c_sharp, firrtl, gdscript, julia,
 lua, luau, matlab, squirrel, starlark

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f837b8c24..3f576d664 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "f1b2a0b2102ff001a4ed9a26cd9a9405d09c590c"
   },
   "c_sharp": {
-    "revision": "03b9b6272ef3df674f9c54507cc042412f257eed"
+    "revision": "8acd38dae01bea4157f729325f5c69d0b47a75f2"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -126,7 +126,7 @@
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
   },
   "firrtl": {
-    "revision": "572ac53752252c4b77bd7cf0ce6a07a2db177ab7"
+    "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
   },
   "fish": {
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
@@ -147,7 +147,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gdscript": {
-    "revision": "3fd70bf70a7b7d706ae0fe81730c68642713eeaa"
+    "revision": "03f20b94707a21bed90bb95101684bc4036139ce"
   },
   "git_config": {
     "revision": "a01b498b25003d97a5f93b0da0e6f28307454347"
@@ -258,7 +258,7 @@
     "revision": "fdc775714afa27fdef823adbaba6ab98f5ae66f2"
   },
   "julia": {
-    "revision": "e2f449e2bcc95f1d07ceb62d67f986005f73a6be"
+    "revision": "4d4dc7d8a4ad3856200a9ef151f9056fc14cec8b"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -279,7 +279,7 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "d8360bc472ca1d55d437624ee7299152b693e1a0"
+    "revision": "7268c1cea5df56ac0c779cd37d6631d4e6f41d4f"
   },
   "luadoc": {
     "revision": "8981072676ec8bd74def6134be4f883655f7c082"
@@ -288,7 +288,7 @@
     "revision": "43916b0f31c48a05e03783eb0bab4eec54a4ac75"
   },
   "luau": {
-    "revision": "4f8fc207b3a25b07cba1d3b4066f2872dcfe201f"
+    "revision": "6953cd4fa5967c9aa3c769b4e4c7e69c904b9fa9"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -303,7 +303,7 @@
     "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
   },
   "matlab": {
-    "revision": "5a047c1572792ae943b51af7cf9307097b2fcce0"
+    "revision": "138f2ee2eaadcff53ef1fce944713942af92c097"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -462,10 +462,10 @@
     "revision": "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d"
   },
   "squirrel": {
-    "revision": "3fefc6b9bb2b4de1b1c461783f675918cd957546"
+    "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "starlark": {
-    "revision": "80516b3a8c2cf058b896d3481309bacf7497f933"
+    "revision": "504ddd75ecc78fbbce22aa6facd70375d3f8854a"
   },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"

From 39b9f45a646371736ce95ec0c8cf685a727b5312 Mon Sep 17 00:00:00 2001
From: homedirectory <47361170+homedirectory@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:51:36 +0300
Subject: [PATCH 0434/2704] java highlights: annotation type declaration and AT
 interface keyword

---
 queries/java/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index f7e1c4792..28c450059 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -84,6 +84,8 @@
 
 (interface_declaration
   name: (identifier) @type)
+(annotation_type_declaration
+  name: (identifier) @type)
 (class_declaration
   name: (identifier) @type)
 (record_declaration
@@ -169,6 +171,7 @@
   "implements"
   "instanceof"
   "interface"
+  "@interface"
   "permits"
   "to"
   "with"

From b26b11f9716c048d26b1c4bc581461acc77b96da Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Wed, 21 Jun 2023 16:15:39 +0530
Subject: [PATCH 0435/2704] fix(fennel): capture function calls as
 @function.call

---
 queries/fennel/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index 43aca53ad..c5f648472 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -36,8 +36,8 @@
    ":" @punctuation.delimiter
    (symbol) @method .)
 
-(list . (symbol) @function)
-(list . (multi_symbol (symbol) @function .))
+(list . (symbol) @function.call)
+(list . (multi_symbol (symbol) @function.call .))
 
 ((symbol) @variable.builtin
  (#lua-match? @variable.builtin "^[$]"))

From c9d5812ba358ce9e5ae2df322550cc6bc1678538 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 21 Jun 2023 13:09:58 -0400
Subject: [PATCH 0436/2704] fix(markdown): elm injection no longer segfaults

---
 queries/markdown/injections.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/markdown/injections.scm b/queries/markdown/injections.scm
index c0ef2e84a..b1795e713 100644
--- a/queries/markdown/injections.scm
+++ b/queries/markdown/injections.scm
@@ -1,7 +1,6 @@
 (fenced_code_block
   (info_string
     (language) @_lang)
-  (#not-match? @_lang "elm") ; prevent segfault when using elm parser
   (code_fence_content)
     @content
     (#set-lang-from-info-string! @_lang)

From e58bbe83f959f6413e7a0faf7cdde6416c88b7af Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 21 Jun 2023 09:14:44 +0200
Subject: [PATCH 0437/2704] lint(locals): use `#set!` to keep query linter
 happy

---
 queries/c/locals.scm     |  4 ++--
 queries/cpp/locals.scm   |  6 +++---
 queries/go/locals.scm    | 10 +++++-----
 queries/ocaml/locals.scm | 18 +++++++++---------
 queries/php/locals.scm   | 26 +++++++++++++-------------
 queries/rust/locals.scm  |  4 ++--
 queries/t32/locals.scm   |  2 +-
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/queries/c/locals.scm b/queries/c/locals.scm
index 78a2180d3..b59f8f37a 100644
--- a/queries/c/locals.scm
+++ b/queries/c/locals.scm
@@ -35,9 +35,9 @@
 ;; References
 (identifier) @reference
 ((field_identifier) @reference
-                   (set! reference.kind "field"))
+                    (#set! reference.kind "field"))
 ((type_identifier) @reference
-                   (set! reference.kind "type"))
+                   (#set! reference.kind "type"))
 
 (goto_statement (statement_identifier) @reference)
 
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
index 4c114876c..570a22af0 100644
--- a/queries/cpp/locals.scm
+++ b/queries/cpp/locals.scm
@@ -47,7 +47,7 @@
   body: (_) @scope)
 
 ((namespace_identifier) @reference
-                        (set! reference.kind "namespace"))
+                        (#set! reference.kind "namespace"))
 
 ;; Function definitions
 (template_function
@@ -61,8 +61,8 @@
                 name: (identifier) @definition.function)) @scope
 
 (field_declaration
-        declarator: (function_declarator
-                       (field_identifier) @definition.method))
+  declarator: (function_declarator
+                (field_identifier) @definition.method))
 
 (lambda_expression) @scope
 
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index 1de546c7c..b027c217a 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -36,7 +36,7 @@
 (type_identifier) @reference
 (field_identifier) @reference
 ((package_identifier) @reference
-  (set! reference.kind "namespace"))
+  (#set! reference.kind "namespace"))
 
 (package_clause
    (package_identifier) @definition.namespace)
@@ -48,24 +48,24 @@
 ;; Call references
 ((call_expression
    function: (identifier) @reference)
- (set! reference.kind "call" ))
+ (#set! reference.kind "call" ))
 
 ((call_expression
     function: (selector_expression
                 field: (field_identifier) @reference))
- (set! reference.kind "call" ))
+ (#set! reference.kind "call" ))
 
 
 ((call_expression
     function: (parenthesized_expression
                 (identifier) @reference))
- (set! reference.kind "call" ))
+ (#set! reference.kind "call" ))
 
 ((call_expression
    function: (parenthesized_expression
                (selector_expression
                  field: (field_identifier) @reference)))
- (set! reference.kind "call" ))
+ (#set! reference.kind "call" ))
 
 ;; Scopes
 
diff --git a/queries/ocaml/locals.scm b/queries/ocaml/locals.scm
index 9321ced2e..1e543fd13 100644
--- a/queries/ocaml/locals.scm
+++ b/queries/ocaml/locals.scm
@@ -27,15 +27,15 @@
 
 (let_binding
   pattern: (value_name) @definition.var
-  (set! definition.var.scope "parent"))
+  (#set! definition.var.scope "parent"))
 
 (let_binding
   pattern: (tuple_pattern (value_name) @definition.var)
-  (set! definition.var.scope "parent"))
+  (#set! definition.var.scope "parent"))
 
 (let_binding
   pattern: (record_pattern (field_pattern (value_name) @definition.var))
-  (set! definition.var.scope "parent"))
+  (#set! definition.var.scope "parent"))
 
 (external (value_name) @definition.var)
 
@@ -47,7 +47,7 @@
 
 (module_binding
   (module_name) @definition.namespace
-  (set! definition.namespace.scope "parent"))
+  (#set! definition.namespace.scope "parent"))
 
 (module_parameter (module_name) @definition.namespace)
 
@@ -58,20 +58,20 @@
 
 (value_path .
   (value_name) @reference
-  (set! reference.kind "var"))
+  (#set! reference.kind "var"))
 
 (type_constructor_path .
   (type_constructor) @reference
-  (set! reference.kind "type"))
+  (#set! reference.kind "type"))
 
 (method_invocation
   (method_name) @reference
-  (set! reference.kind "method"))
+  (#set! reference.kind "method"))
 
 (module_path .
   (module_name) @reference
-  (set! reference.kind "type"))
+  (#set! reference.kind "type"))
 
 (module_type_path .
   (module_type_name) @reference
-  (set! reference.kind "type"))
+  (#set! reference.kind "type"))
diff --git a/queries/php/locals.scm b/queries/php/locals.scm
index 277888d5c..0bb7a89db 100644
--- a/queries/php/locals.scm
+++ b/queries/php/locals.scm
@@ -3,15 +3,15 @@
 
 ((class_declaration
   name: (name) @definition.type) @scope
-    (set! definition.type.scope "parent"))
+    (#set! definition.type.scope "parent"))
 
 ((method_declaration
   name: (name) @definition.method) @scope
-    (set! definition.method.scope "parent"))
+    (#set! definition.method.scope "parent"))
 
 ((function_definition
   name: (name) @definition.function) @scope
-    (set! definition.function.scope "parent"))
+    (#set! definition.function.scope "parent"))
 
 (anonymous_function_creation_expression
   (anonymous_function_use_clause
@@ -33,7 +33,7 @@
 (foreach_statement
   (variable_name
     (name) @reference
-      (set! reference.kind "var"))
+      (#set! reference.kind "var"))
   (variable_name
     (name) @definition.var))
 
@@ -51,37 +51,37 @@
 
 (named_type
   (name) @reference
-    (set! reference.kind "type"))
+    (#set! reference.kind "type"))
 
 (named_type
   (qualified_name) @reference
-    (set! reference.kind "type"))
+    (#set! reference.kind "type"))
 
 (variable_name
   (name) @reference
-    (set! reference.kind "var"))
+    (#set! reference.kind "var"))
 
 (member_access_expression
   name: (name) @reference
-    (set! reference.kind "field"))
+    (#set! reference.kind "field"))
 
 (member_call_expression
   name: (name) @reference
-    (set! reference.kind "method"))
+    (#set! reference.kind "method"))
 
 (function_call_expression
   function: (qualified_name
     (name) @reference
-      (set! reference.kind "function")))
+      (#set! reference.kind "function")))
 
 (object_creation_expression
   (qualified_name
     (name) @reference
-      (set! reference.kind "type")))
+      (#set! reference.kind "type")))
 
 (scoped_call_expression
   scope: (qualified_name
     (name) @reference
-      (set! reference.kind "type"))
+      (#set! reference.kind "type"))
   name: (name) @reference
-    (set! reference.kind "method"))
+    (#set! reference.kind "method"))
diff --git a/queries/rust/locals.scm b/queries/rust/locals.scm
index 1cefcabf3..c5f4c187e 100644
--- a/queries/rust/locals.scm
+++ b/queries/rust/locals.scm
@@ -71,9 +71,9 @@
 ; References
 (identifier) @reference
 ((type_identifier) @reference
-                   (set! reference.kind "type"))
+                   (#set! reference.kind "type"))
 ((field_identifier) @reference
-                   (set! reference.kind "field"))
+                   (#set! reference.kind "field"))
 
 
 ; Macros
diff --git a/queries/t32/locals.scm b/queries/t32/locals.scm
index dd03b4246..7d18a7d3c 100644
--- a/queries/t32/locals.scm
+++ b/queries/t32/locals.scm
@@ -29,7 +29,7 @@
   (subroutine_call_expression
     command: (identifier)
     subroutine: (identifier) @reference)
-  (set! reference.kind "function")
+  (#set! reference.kind "function")
 )
 
 (macro) @reference

From 3db1a461b9f55903a6898f3835b1dbf1040f24c3 Mon Sep 17 00:00:00 2001
From: Dian M Fay <dian.m.fay@gmail.com>
Date: Tue, 20 Jun 2023 08:51:50 -0400
Subject: [PATCH 0438/2704] fix(sql): table_reference -> object_reference

---
 queries/sql/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index a2976c541..626cc9742 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -14,7 +14,7 @@
   (keyword_group_concat)
 ] @function.call
 
-(table_reference
+(object_reference
   name: (identifier) @type)
 
 (relation

From 57a753186ba490b1d395938c2c78fe2b5e41cee0 Mon Sep 17 00:00:00 2001
From: Dian M Fay <dian.m.fay@gmail.com>
Date: Tue, 20 Jun 2023 18:18:38 -0400
Subject: [PATCH 0439/2704] fix(sql): update lockfile

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 3f576d664..1195ca8e4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -459,7 +459,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d"
+    "revision": "baab519f9781937e948cdb2b4ee4138a0dcda866"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"

From cabbda88c94666381dd8e64112e2c2e2b31204c1 Mon Sep 17 00:00:00 2001
From: Dian M Fay <dian.m.fay@gmail.com>
Date: Tue, 20 Jun 2023 19:53:35 -0400
Subject: [PATCH 0440/2704] fix(sql): table_alias -> alias

---
 queries/sql/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 626cc9742..e71ea18cb 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -18,10 +18,10 @@
   name: (identifier) @type)
 
 (relation
-  table_alias: (identifier) @variable)
+  alias: (identifier) @variable)
 
 (field
-  table_alias: (identifier) @variable
+  alias: (identifier) @variable
   name: (identifier) @field)
 
 (term

From 38372dcda497ccc54f5f86e873f7438635323a6b Mon Sep 17 00:00:00 2001
From: Dian M Fay <dian.m.fay@gmail.com>
Date: Tue, 20 Jun 2023 20:58:17 -0400
Subject: [PATCH 0441/2704] fix(sql): field alias moved to term

---
 queries/sql/highlights.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index e71ea18cb..4decd4d81 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -21,7 +21,6 @@
   alias: (identifier) @variable)
 
 (field
-  alias: (identifier) @variable
   name: (identifier) @field)
 
 (term

From 40ac56c4938280619211d8a666656f3744b40fcb Mon Sep 17 00:00:00 2001
From: Dian M Fay <dian.m.fay@gmail.com>
Date: Wed, 21 Jun 2023 18:59:01 -0400
Subject: [PATCH 0442/2704] fix(sql): invocation

---
 queries/sql/highlights.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 4decd4d81..4fb708914 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -1,6 +1,7 @@
 (invocation
-  name: (identifier) @function.call
-  parameter: [(field)]? @parameter)
+  (object_reference
+    name: (identifier) @function.call
+    parameter: [(field)]? @parameter))
 
 [
   (keyword_gist)

From b723c30e5f9a72003f6870bb67e7153f74085a99 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 22 Jun 2023 07:21:01 +0000
Subject: [PATCH 0443/2704] Update parsers: arduino, c_sharp, cpp, lalrpop,
 matlab, scala, twig

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1195ca8e4..c3f7b9dee 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "2caedf3e9eb314551a3a6cc9d3b6c4fcdee37747"
+    "revision": "e138ee33bf3c951a1f31ff276ed797fa2bfd8858"
   },
   "astro": {
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
@@ -36,7 +36,7 @@
     "revision": "f1b2a0b2102ff001a4ed9a26cd9a9405d09c590c"
   },
   "c_sharp": {
-    "revision": "8acd38dae01bea4157f729325f5c69d0b47a75f2"
+    "revision": "adfbb69b05c2448d913a7b61f29562151ba3dfad"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -66,7 +66,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "2e29f23abcb5f92ddffb22de8b292f09ed78db01"
+    "revision": "0e7b7a02b6074859b51c1973eb6a8275b3315b1d"
   },
   "css": {
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
@@ -267,7 +267,7 @@
     "revision": "100d79fd96b56a1b99099a8d2f3c114b8687acfb"
   },
   "lalrpop": {
-    "revision": "7744b56f03ac1e5643fad23c9dd90837fe97291e"
+    "revision": "b7431e4b64183a5d0d094895a4cd5daf51ed3103"
   },
   "latex": {
     "revision": "2ae2021d7b224fb6aa57b760e0d146059f943bb8"
@@ -303,7 +303,7 @@
     "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
   },
   "matlab": {
-    "revision": "138f2ee2eaadcff53ef1fce944713942af92c097"
+    "revision": "10ae0e6e7ea74c653982f25fc7c8f27c061f9a7d"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -435,7 +435,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "a5c4c29b95aca29dea71f34bf046ad0b36499045"
+    "revision": "cda0de8a038b0e4ad79a97f7aa281250fcf88560"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"
@@ -516,7 +516,7 @@
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
   },
   "twig": {
-    "revision": "2457993b13a06dec2706e6a6c3d5b65bb23024b8"
+    "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
     "revision": "286e90c32060032225f636a573d0e999f7766c97"

From cbd54ebb8d633fb84b5592741cd3e22765d90fc0 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Thu, 22 Jun 2023 13:36:46 +0530
Subject: [PATCH 0444/2704] fix(zig): capture function calls as
 `@function.call`

---
 queries/zig/highlights.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 72d2e642b..9e558d74d 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -45,10 +45,8 @@ parameter: (IDENTIFIER) @parameter
   (#lua-match? @constant "^%u[%u%d_]+$")
 )
 
-[
-  function_call: (IDENTIFIER)
-  function: (IDENTIFIER)
-] @function
+function: (IDENTIFIER) @function
+function_call: (IDENTIFIER) @function.call
 
 exception: "!" @exception
 

From ae0415331483bd143f80c186401fb2aa783f33df Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Thu, 22 Jun 2023 17:14:58 +0200
Subject: [PATCH 0445/2704] highlights(sql): fix order for `invocation`

---
 queries/sql/highlights.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 4fb708914..790c0c262 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -1,8 +1,3 @@
-(invocation
-  (object_reference
-    name: (identifier) @function.call
-    parameter: [(field)]? @parameter))
-
 [
   (keyword_gist)
   (keyword_btree)
@@ -18,6 +13,11 @@
 (object_reference
   name: (identifier) @type)
 
+(invocation
+  (object_reference
+    name: (identifier) @function.call
+    parameter: [(field)]? @parameter))
+
 (relation
   alias: (identifier) @variable)
 

From fdaf9f3f98014a058401ea03603164492f243d31 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 23 Jun 2023 06:41:26 +0000
Subject: [PATCH 0446/2704] Update parsers: arduino, c_sharp, pony, sql

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c3f7b9dee..2723e374b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "e138ee33bf3c951a1f31ff276ed797fa2bfd8858"
+    "revision": "da8cae9ce365a81dcba25256f76c713674121017"
   },
   "astro": {
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
@@ -36,7 +36,7 @@
     "revision": "f1b2a0b2102ff001a4ed9a26cd9a9405d09c590c"
   },
   "c_sharp": {
-    "revision": "adfbb69b05c2448d913a7b61f29562151ba3dfad"
+    "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -372,7 +372,7 @@
     "revision": "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"
   },
   "pony": {
-    "revision": "5fd795ae7597b568b0a356c5d243cc92162bc00c"
+    "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -459,7 +459,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "baab519f9781937e948cdb2b4ee4138a0dcda866"
+    "revision": "f70c2d5da5e437bfe82942be7fee6e6e30177fde"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"

From f03db67aa400940a4e39f138a20cc9d0843528d3 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 23 Jun 2023 15:05:39 +0000
Subject: [PATCH 0447/2704] Update parsers: markdown, markdown_inline, matlab,
 ocaml, ocaml_interface

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2723e374b..1f79fb655 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -297,13 +297,13 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
+    "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "markdown_inline": {
-    "revision": "231f3163cd27d48f91a4517cfdf72d167a9ef164"
+    "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "10ae0e6e7ea74c653982f25fc7c8f27c061f9a7d"
+    "revision": "26c525577c7349b8d9805d244cacd8ef98807b78"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -333,10 +333,10 @@
     "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
   },
   "ocaml": {
-    "revision": "2da49308381b91e19e5d270ec5117616d0e4b135"
+    "revision": "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74"
   },
   "ocaml_interface": {
-    "revision": "2da49308381b91e19e5d270ec5117616d0e4b135"
+    "revision": "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74"
   },
   "ocamllex": {
     "revision": "62118551bd9501b8253598b835cb4bef04b31e3d"

From f26596386f31d5bd74b85b7d1ab0fd90c5b98608 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Fri, 23 Jun 2023 19:47:37 +0200
Subject: [PATCH 0448/2704] highlights(sql): remove `keyword_group_concat`
 after refactor

---
 lockfile.json              | 2 +-
 queries/sql/highlights.scm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1f79fb655..611e47ca6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -459,7 +459,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "f70c2d5da5e437bfe82942be7fee6e6e30177fde"
+    "revision": "d38db87c3e979a692cd542be44524f7f5e46f965"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 790c0c262..3cce87ae9 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -7,7 +7,6 @@
   (keyword_brin)
   (keyword_float)
   (keyword_array)
-  (keyword_group_concat)
 ] @function.call
 
 (object_reference

From 18983e3a8266249e0a813c1056a2a51e07be3faa Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 23 Jun 2023 19:01:41 -0400
Subject: [PATCH 0449/2704] fix(python): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 611e47ca6..531f96bb4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -390,7 +390,7 @@
     "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
   },
   "python": {
-    "revision": "62827156d01c74dc1538266344e788da74536b8a"
+    "revision": "6ecc2b54b39ac390848d81dfcf5ee961f33a2f03"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2c2faea34..98f1c7a74 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1172,7 +1172,7 @@ list.puppet = {
 list.python = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-python",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@stsewd", "@theHamsta" },
 }

From b08aa95eee19bbdf00409bcb624d5738525040f2 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 23 Jun 2023 20:31:42 -0400
Subject: [PATCH 0450/2704] fix(racket): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 531f96bb4..d8b6461ec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -408,7 +408,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "2804e03223953dc4709f4c041b57b722095a0397"
+    "revision": "989c3e631a7f2d87bb6a66a5394870aaeb6c56e7"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 98f1c7a74..8f96583ed 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1222,7 +1222,7 @@ list.r = {
 list.racket = {
   install_info = {
     url = "https://github.com/6cdh/tree-sitter-racket",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@6cdh" },
 }

From 68c619f2e3bbace5d2e885dbe44289dc68d776e5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 24 Jun 2023 07:30:48 +0000
Subject: [PATCH 0451/2704] Update parsers: matlab, racket

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d8b6461ec..2a6f44391 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -303,7 +303,7 @@
     "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "26c525577c7349b8d9805d244cacd8ef98807b78"
+    "revision": "0e493c806c442753ab8697963515457f88d2a399"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -408,7 +408,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "989c3e631a7f2d87bb6a66a5394870aaeb6c56e7"
+    "revision": "bbdb0bfbaf0dd5f6650b97a393a06a19cef50562"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"

From e9984bb744d3a413f58f4151df081db746df9c48 Mon Sep 17 00:00:00 2001
From: Borys Lykah <lykahb@fastmail.com>
Date: Sat, 24 Jun 2023 13:00:47 -0600
Subject: [PATCH 0452/2704] feat: add support for haskell persistent library

---
 lua/nvim-treesitter/parsers.lua           |  9 ++++++
 queries/haskell/injections.scm            |  7 +++++
 queries/haskell_persistent/folds.scm      |  3 ++
 queries/haskell_persistent/highlights.scm | 38 +++++++++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 queries/haskell_persistent/folds.scm
 create mode 100644 queries/haskell_persistent/highlights.scm

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8f96583ed..c55bc973a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -633,6 +633,15 @@ list.haskell = {
   },
 }
 
+list.haskell_persistent = {
+  install_info = {
+    url = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent",
+    files = { "src/parser.c", "src/scanner.cc" },
+  },
+  filetype = "haskell.persistent",
+  maintainers = { "@lykahb" },
+}
+
 list.hcl = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
diff --git a/queries/haskell/injections.scm b/queries/haskell/injections.scm
index 206248f6e..f210566c4 100644
--- a/queries/haskell/injections.scm
+++ b/queries/haskell/injections.scm
@@ -76,3 +76,10 @@
   (#eq? @_name "sql")
   ((quasiquote_body) @sql)
 )
+
+; persistent
+(quasiquote
+ (quoter) @_name
+ (#any-of? @_name "persistUpperCase" "persistLowerCase" "persistWith")
+ ((quasiquote_body) @haskell_persistent)
+)
diff --git a/queries/haskell_persistent/folds.scm b/queries/haskell_persistent/folds.scm
new file mode 100644
index 000000000..2bdffd177
--- /dev/null
+++ b/queries/haskell_persistent/folds.scm
@@ -0,0 +1,3 @@
+[
+  (entity_definition)
+] @fold
diff --git a/queries/haskell_persistent/highlights.scm b/queries/haskell_persistent/highlights.scm
new file mode 100644
index 000000000..afb32f11d
--- /dev/null
+++ b/queries/haskell_persistent/highlights.scm
@@ -0,0 +1,38 @@
+;; ----------------------------------------------------------------------------
+;; Literals and comments
+
+(integer) @number
+(float) @float
+(char) @character
+(string) @string
+(attribute_name) @attribute
+(attribute_exclamation_mark) @attribute
+
+(con_unit) @symbol  ; unit, as in ()
+
+(comment) @comment @spell
+
+;; ----------------------------------------------------------------------------
+;; Keywords, operators, includes
+
+[
+  "Id"
+  "Primary"
+  "Foreign"
+  "deriving"
+] @keyword
+
+"=" @operator
+
+
+;; ----------------------------------------------------------------------------
+;; Functions and variables
+
+(variable) @variable
+
+;; ----------------------------------------------------------------------------
+;; Types
+
+(type) @type
+
+(constructor) @constructor

From 0c5661e5fe85c0a8d7389cbe0c09c201067a57d6 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sat, 24 Jun 2023 19:01:08 +0000
Subject: [PATCH 0453/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index adaeaa094..c8a0893cf 100644
--- a/README.md
+++ b/README.md
@@ -240,6 +240,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
 - [x] [hare](https://github.com/amaanq/tree-sitter-hare) (maintained by @amaanq)
 - [ ] [haskell](https://github.com/tree-sitter/tree-sitter-haskell)
+- [x] [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) (maintained by @lykahb)
 - [x] [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay)
 - [x] [hjson](https://github.com/winston0410/tree-sitter-hjson) (maintained by @winston0410)

From 13c72dddb761e799800494ad682eea128359769a Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen03.huan@gmail.com>
Date: Sat, 24 Jun 2023 18:09:29 -0700
Subject: [PATCH 0454/2704] fix(haskell_persistent): add to lockfile.json

---
 lockfile.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lockfile.json b/lockfile.json
index 2a6f44391..8348c4cf4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -200,6 +200,9 @@
   "haskell": {
     "revision": "a75238fdefc2281cdba7dc4dca13f1d68a91f177"
   },
+  "haskell_persistent": {
+    "revision": "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"
+  },
   "hcl": {
     "revision": "becebebd3509c02e871c99be55556269be1def1b"
   },

From 20a6c66b769d09491247d760967bb4ef2fcf3e0d Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 24 Jun 2023 21:35:51 +0300
Subject: [PATCH 0455/2704] feat(awk): highlight builtin variables & shebang

---
 queries/awk/highlights.scm | 41 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
index a03c43670..4faf496e6 100644
--- a/queries/awk/highlights.scm
+++ b/queries/awk/highlights.scm
@@ -6,6 +6,44 @@
 ] @variable
 (field_ref (_) @variable)
 
+; https://www.gnu.org/software/gawk/manual/html_node/Auto_002dset.html
+((identifier) @constant.builtin
+ (#any-of? @constant.builtin
+           "ARGC"
+           "ARGV"
+           "ARGIND"
+           "ENVIRON"
+           "ERRNO"
+           "FILENAME"
+           "FNR"
+           "NF"
+           "FUNCTAB"
+           "NR"
+           "PROCINFO"
+           "RLENGTH"
+           "RSTART"
+           "RT"
+           "SYMTAB"))
+
+; https://www.gnu.org/software/gawk/manual/html_node/User_002dmodified.html
+((identifier) @variable.builtin
+ (#any-of? @variable.builtin
+           "BINMODE"
+           "CONVFMT"
+           "FIELDWIDTHS"
+           "FPAT"
+           "FS"
+           "IGNORECASE"
+           "LINT"
+           "OFMT"
+           "OFS"
+           "ORS"
+           "PREC"
+           "ROUNDMODE"
+           "RS"
+           "SUBSEP"
+           "TEXTDOMAIN"))
+
 (number) @number
 
 (string) @string
@@ -14,6 +52,9 @@
 
 (comment) @comment @spell
 
+((program . (comment) @preproc)
+  (#lua-match? @preproc "^#!/"))
+
 (ns_qualified_name (namespace) @namespace)
 (ns_qualified_name "::" @punctuation.delimiter)
 

From c667877ab575e32f9ba8aa2c518a6eb5fd069cf3 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 25 Jun 2023 03:43:47 -0400
Subject: [PATCH 0456/2704] fix(hack): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8348c4cf4..73f1ccc36 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,7 +192,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "hack": {
-    "revision": "b7bd6928532ada34dddb1dece4a158ab62c6e783"
+    "revision": "b1c41e4b82c625cc33ddb8701f6aa5a09c72fcf5"
   },
   "hare": {
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c55bc973a..8f6a83ed0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -614,7 +614,7 @@ list.graphql = {
 list.hack = {
   install_info = {
     url = "https://github.com/slackhq/tree-sitter-hack",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
 }
 

From 3590c0d30d32fe3b518abcd6aaebde6aad85ec14 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 25 Jun 2023 11:10:26 +0200
Subject: [PATCH 0457/2704] fix(html): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 73f1ccc36..f47c6a97b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -219,7 +219,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "html": {
-    "revision": "86c253e675e7fdd1c0482efe0706f24bafbc3a7d"
+    "revision": "ff48883eb679bbb71b7ac08c8023c8defbf9e234"
   },
   "htmldjango": {
     "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8f6a83ed0..d604e8016 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -688,7 +688,7 @@ list.hocon = {
 list.html = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-html",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@TravonteD" },
 }

From 069cbad8d2938f18a423b4640d3ebfb65dda710d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 25 Jun 2023 09:22:35 +0000
Subject: [PATCH 0458/2704] Update parsers: haskell, matlab

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f47c6a97b..0f375e7b3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "a75238fdefc2281cdba7dc4dca13f1d68a91f177"
+    "revision": "ba0bfb0e5d8e9e31c160d287878c6f26add3ec08"
   },
   "haskell_persistent": {
     "revision": "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"
@@ -306,7 +306,7 @@
     "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "0e493c806c442753ab8697963515457f88d2a399"
+    "revision": "b09c27e42732c59321604a15163480ebb4f82f1c"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"

From b75f79bc5f68b552743d2136b80fe545871d5501 Mon Sep 17 00:00:00 2001
From: Dian M Fay <dian.m.fay@gmail.com>
Date: Sun, 25 Jun 2023 10:35:50 -0400
Subject: [PATCH 0459/2704] fix(sql): compound_statement -> block

a little more reorganizing; we've copied the indents file into
tree-sitter-sql and it tests okay there.
---
 lockfile.json           | 2 +-
 queries/sql/indents.scm | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0f375e7b3..60137a6b5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -462,7 +462,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "d38db87c3e979a692cd542be44524f7f5e46f965"
+    "revision": "7bd15d1ca789c5aaef5d2dbfdb14565ec8223d1b"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
diff --git a/queries/sql/indents.scm b/queries/sql/indents.scm
index a807c2bc4..f5de6ea12 100644
--- a/queries/sql/indents.scm
+++ b/queries/sql/indents.scm
@@ -7,8 +7,7 @@
  (insert)
 ] @indent.begin
 
-
-(compound_statement
+(block
   (keyword_begin)
 ) @indent.begin
 

From 4ba25e973c75153f1354b43d55a9f1c87f994289 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 25 Jun 2023 20:33:46 -0400
Subject: [PATCH 0460/2704] fix(elm): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 60137a6b5..90978b253 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,7 +108,7 @@
     "revision": "7be390548a870ca9cb1bd7f59ac92457bbec7bf5"
   },
   "elm": {
-    "revision": "692c50c0b961364c40299e73c1306aecb5d20f40"
+    "revision": "2c6a1df7db1ca306cb04c2ada325347392b08ee0"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d604e8016..028273e58 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -378,7 +378,7 @@ list.elixir = {
 list.elm = {
   install_info = {
     url = "https://github.com/elm-tooling/tree-sitter-elm",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@zweimach" },
 }

From d49ba798c95398e62321b40041e8ac4654fea251 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 26 Jun 2023 07:15:53 +0000
Subject: [PATCH 0461/2704] Update parsers: elm, vimdoc

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 90978b253..2819dce33 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,7 +108,7 @@
     "revision": "7be390548a870ca9cb1bd7f59ac92457bbec7bf5"
   },
   "elm": {
-    "revision": "2c6a1df7db1ca306cb04c2ada325347392b08ee0"
+    "revision": "73edfcdc3bb2ddfc731cd5d63e6cb287a18da90d"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -549,7 +549,7 @@
     "revision": "26b1aea3b3a5dae31f784a1204205fd57f2b82b5"
   },
   "vimdoc": {
-    "revision": "e9b4d2b3e732ed841980e7369e945e46ce715b8c"
+    "revision": "8c0469d1f84f1e2733d4490dfb3cf8f8b100e2da"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"

From bad9f5bf5b4af5d97a9cffdc957f1b23dc91d851 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 27 Jun 2023 06:40:44 +0000
Subject: [PATCH 0462/2704] Update parsers: foam, hack, vimdoc

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2819dce33..0c252a83e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
   },
   "foam": {
-    "revision": "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2"
+    "revision": "ec73f2e317f9c09356e7be452d85671b9923a428"
   },
   "fortran": {
     "revision": "31552ac43ecaffa443a12ebea68cc526d334892f"
@@ -192,7 +192,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "hack": {
-    "revision": "b1c41e4b82c625cc33ddb8701f6aa5a09c72fcf5"
+    "revision": "95e63e79e0d9f91000bd11d458997fabed1bb1e2"
   },
   "hare": {
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
@@ -549,7 +549,7 @@
     "revision": "26b1aea3b3a5dae31f784a1204205fd57f2b82b5"
   },
   "vimdoc": {
-    "revision": "8c0469d1f84f1e2733d4490dfb3cf8f8b100e2da"
+    "revision": "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"

From 016cba16a07b582414d3174a58dd38d2d6b20e49 Mon Sep 17 00:00:00 2001
From: ShootingStarDragons <ShootingStarDragons@protonmail.com>
Date: Mon, 19 Jun 2023 21:18:42 +0800
Subject: [PATCH 0463/2704] feat: add groovy support

---
 lua/nvim-treesitter/parsers.lua |  9 ++++++
 queries/groovy/highlights.scm   | 51 +++++++++++++++++++++++++++++++++
 queries/groovy/injections.scm   |  1 +
 3 files changed, 61 insertions(+)
 create mode 100644 queries/groovy/highlights.scm
 create mode 100644 queries/groovy/injections.scm

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 028273e58..deb542a5b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -603,6 +603,15 @@ list.gowork = {
   maintainers = { "@omertuc" },
 }
 
+list.groovy = {
+  install_info = {
+    url = "https://github.com/Decodetalkers/tree-sitter-groovy",
+    files = { "src/parser.c" },
+    branch = "gh-pages",
+  },
+  maintainers = { "@Decodetalkers" },
+}
+
 list.graphql = {
   install_info = {
     url = "https://github.com/bkegley/tree-sitter-graphql",
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
new file mode 100644
index 000000000..2f9f541b8
--- /dev/null
+++ b/queries/groovy/highlights.scm
@@ -0,0 +1,51 @@
+(unit
+    (identifier) @variable)
+(string
+    (identifier) @variable)
+
+(escape_sequence) @string.escape
+
+(block
+    (unit
+       (identifier) @namespace))
+
+(func
+    (identifier) @function)
+
+(number) @number
+
+((identifier) @boolean
+  (#any-of? @boolean "true" "false" "True" "False"))
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+
+((identifier) @type.definition
+  (#any-of? @type.definition
+    "string"
+    "String"
+    "void"
+    "id"
+    "version"
+    "apply"
+    "implementation"
+    "testImplementation"
+    "androidTestImplementation"
+    "debugImplementation"))
+
+((identifier) @keyword
+  (#any-of? @keyword
+    "static"
+    "class"
+    "def"
+    "import"
+    "new"))
+
+(string) @string
+
+(comment) @comment
+
+(operators) @operator
+(leading_key) @operator
+
+["(" ")" "[" "]" "{" "}"]  @punctuation.bracket
diff --git a/queries/groovy/injections.scm b/queries/groovy/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/groovy/injections.scm
@@ -0,0 +1 @@
+(comment) @comment

From beda6227366fd4653ee83b83ff7535aa55188e11 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Tue, 27 Jun 2023 18:02:03 +0000
Subject: [PATCH 0464/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c8a0893cf..7ad2bebc6 100644
--- a/README.md
+++ b/README.md
@@ -237,6 +237,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gosum](https://github.com/amaanq/tree-sitter-go-sum) (maintained by @amaanq)
 - [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
+- [x] [groovy](https://github.com/Decodetalkers/tree-sitter-groovy) (maintained by @Decodetalkers)
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
 - [x] [hare](https://github.com/amaanq/tree-sitter-hare) (maintained by @amaanq)
 - [ ] [haskell](https://github.com/tree-sitter/tree-sitter-haskell)

From 43fab6423c42b1b96060f95832615d22ba587a0f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 27 Jun 2023 11:50:24 +0300
Subject: [PATCH 0465/2704] feat(pem): add parser

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/pem/folds.scm           |  1 +
 queries/pem/highlights.scm      | 11 +++++++++++
 queries/pem/injections.scm      |  1 +
 6 files changed, 25 insertions(+)
 create mode 100644 queries/pem/folds.scm
 create mode 100644 queries/pem/highlights.scm
 create mode 100644 queries/pem/injections.scm

diff --git a/README.md b/README.md
index 7ad2bebc6..973905a54 100644
--- a/README.md
+++ b/README.md
@@ -293,6 +293,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [org](https://github.com/milisims/tree-sitter-org)
 - [x] [pascal](https://github.com/Isopod/tree-sitter-pascal.git) (maintained by @Isopod)
 - [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
+- [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
 - [x] [perl](https://github.com/ganezdragon/tree-sitter-perl) (maintained by @lcrownover)
 - [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
 - [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
diff --git a/lockfile.json b/lockfile.json
index 0c252a83e..f72b18452 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -356,6 +356,9 @@
   "passwd": {
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
+  "pem": {
+    "revision": "3662443335bc95bac0168a338b0f29f87162c244"
+  },
   "perl": {
     "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index deb542a5b..ac8695f55 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1084,6 +1084,14 @@ list.passwd = {
   maintainers = { "@amaanq" },
 }
 
+list.pem = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-pem",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.perl = {
   install_info = {
     url = "https://github.com/ganezdragon/tree-sitter-perl",
diff --git a/queries/pem/folds.scm b/queries/pem/folds.scm
new file mode 100644
index 000000000..f0cdabd26
--- /dev/null
+++ b/queries/pem/folds.scm
@@ -0,0 +1 @@
+(content) @fold
diff --git a/queries/pem/highlights.scm b/queries/pem/highlights.scm
new file mode 100644
index 000000000..9192e88c0
--- /dev/null
+++ b/queries/pem/highlights.scm
@@ -0,0 +1,11 @@
+["BEGIN" "END"] @keyword
+
+(dashes) @punctuation.delimiter
+
+(label) @label
+
+(data) @none
+
+(comment) @comment
+
+(ERROR) @error
diff --git a/queries/pem/injections.scm b/queries/pem/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/pem/injections.scm
@@ -0,0 +1 @@
+(comment) @comment

From 949edb8c5252336b8059a98547d8d1a3ab1e6752 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 28 Jun 2023 15:56:44 +0900
Subject: [PATCH 0466/2704] indents(fish): Add "end" and "case" (#5029)

---
 queries/fish/indents.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/queries/fish/indents.scm b/queries/fish/indents.scm
index 0a825a13f..526c56e69 100644
--- a/queries/fish/indents.scm
+++ b/queries/fish/indents.scm
@@ -8,9 +8,11 @@
 ] @indent.begin
 
 [
- (else_if_clause)
- (else_clause)
+ "else" ; else and else if must both start the line with "else", so tag the string directly
+ "case"
  "end"
 ] @indent.branch
 
+"end" @indent.end
+
 (comment) @indent.ignore

From f04f137acb1b591a5c21df8c201e8df4878d33ed Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 28 Jun 2023 06:40:09 +0000
Subject: [PATCH 0467/2704] Update parsers: c, groovy, html

---
 lockfile.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f72b18452..904cac6e7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "f1b2a0b2102ff001a4ed9a26cd9a9405d09c590c"
+    "revision": "84bdf409067676dd5c003b2a7cb7760456e731bf"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -191,6 +191,9 @@
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
+  "groovy": {
+    "revision": "7ebfaf33a0f68f9283be17903ebecfdac05a1f3b"
+  },
   "hack": {
     "revision": "95e63e79e0d9f91000bd11d458997fabed1bb1e2"
   },
@@ -219,7 +222,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "html": {
-    "revision": "ff48883eb679bbb71b7ac08c8023c8defbf9e234"
+    "revision": "03e9435d5a95e3fcb9d7e2720c2aac5fc1b9ae8f"
   },
   "htmldjango": {
     "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"

From e68ad094cdae7eab4317e3e0241978ef69a60a5c Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Wed, 28 Jun 2023 15:19:58 +0000
Subject: [PATCH 0468/2704] feat(cmake): update cmake parser, adapt
 highlight.scm, and add indents.scm

---
 lockfile.json                |   2 +-
 queries/cmake/highlights.scm | 114 ++++++++++++++++++++++-------------
 queries/cmake/indents.scm    |  21 +++++++
 3 files changed, 93 insertions(+), 44 deletions(-)
 create mode 100644 queries/cmake/indents.scm

diff --git a/lockfile.json b/lockfile.json
index 904cac6e7..87bdc57d5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "aafadc0d657faa99e483a4f2c70dbe64491b1802"
+    "revision": "3dfc596025431b21e839d392c171f6f97c2a4258"
   },
   "comment": {
     "revision": "c9a7e2df7cac2dfb730f766a4f343308f84ff346"
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index b6cc26d2c..af6b70cc8 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -1,6 +1,8 @@
 (normal_command
   (identifier)
-  (argument (unquoted_argument)) @constant
+  (argument_list
+    (argument (unquoted_argument)) @constant
+  )
   (#lua-match? @constant "^[%u@][%u%d_]+$")
 )
 
@@ -55,32 +57,40 @@
 
 (function_command
   (function)
-  . (argument) @function
-  (argument)* @parameter
+  (argument_list
+    . (argument) @function
+    (argument)* @parameter
+  )
 )
 
 (macro_command
   (macro)
-  . (argument) @function.macro
-  (argument)* @parameter
+  (argument_list
+    . (argument) @function.macro
+    (argument)* @parameter
+  )
 )
 
 (block_def
   (block_command
     (block) @function.builtin
-    (argument (unquoted_argument) @constant)
+    (argument_list
+      (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
+  (argument_list
+    (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"
@@ -92,7 +102,9 @@
 )
 (elseif_command
   (elseif)
-  (argument) @keyword.operator
+  (argument_list
+    (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"
@@ -110,77 +122,93 @@
 
 (normal_command
   (identifier) @_function
-  . (argument) @variable
+  (argument_list
+    . (argument) @variable
+  )
   (#match? @_function "\\c^set$")
 )
 
 (normal_command
   (identifier) @_function
   (#match? @_function "\\c^set$")
-  . (argument)
-  (
+  (argument_list
+    . (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^unset$")
-  . (argument)
-  (argument) @storageclass
-  (#any-of? @storageclass "CACHE" "PARENT_SCOPE")
+  (argument_list
+    . (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 . 
+  (argument_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")
+  (argument_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
-  (#eq? @_transform "TRANSFORM")
-  (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")
+  (argument_list
+    . (argument) @_transform @constant
+    . (argument) @variable
+    . (argument) @_action @constant
+    (#eq? @_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
-  (#eq? @_transform "TRANSFORM")
-  (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")
-  (#any-of? @_selector "AT" "FOR" "REGEX")
+  (argument_list
+    . (argument) @_transform @constant
+    . (argument) @variable
+    . (argument) @_action @constant
+    . (argument)? @_selector @constant
+    (#eq? @_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
-  (#eq? @_transform "TRANSFORM")
-  (#eq? @constant "OUTPUT_VARIABLE")
+  (argument_list
+    . (argument) @_transform @constant
+    (argument) @constant .
+    (argument) @variable
+    (#eq? @_transform "TRANSFORM")
+    (#eq? @constant "OUTPUT_VARIABLE")
+  )
 )
 
 (escape_sequence) @string.escape
diff --git a/queries/cmake/indents.scm b/queries/cmake/indents.scm
new file mode 100644
index 000000000..6bb45d4f0
--- /dev/null
+++ b/queries/cmake/indents.scm
@@ -0,0 +1,21 @@
+[
+  (normal_command)
+  (if_condition)
+  (foreach_loop)
+  (while_loop)
+  (function_def)
+  (macro_def)
+  (block_def)
+] @indent.begin
+
+[
+ (elseif_command)
+ (elseif_command)
+ (endif_command)
+ (endforeach_command)
+ (endfunction_command)
+ (endmacro_command)
+ (endblock_command)
+] @indent.branch
+
+(normal_command ")" @indent.branch)

From e7f2b1276b7aa68099acc8169ce51f7e389b1772 Mon Sep 17 00:00:00 2001
From: Uy Ha <hchanuy@gmail.com>
Date: Wed, 28 Jun 2023 15:26:42 +0000
Subject: [PATCH 0469/2704] fix(cmake): end indentation after normal_command
 node

---
 queries/cmake/indents.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/cmake/indents.scm b/queries/cmake/indents.scm
index 6bb45d4f0..0c3da0013 100644
--- a/queries/cmake/indents.scm
+++ b/queries/cmake/indents.scm
@@ -19,3 +19,4 @@
 ] @indent.branch
 
 (normal_command ")" @indent.branch)
+(normal_command ")" @indent.end)

From ea637db9748f14a827b8b81b00252a96842f6ec4 Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Thu, 29 Jun 2023 07:54:33 +0200
Subject: [PATCH 0470/2704] highlights(sql): add `filter` keyword

---
 lockfile.json              | 2 +-
 queries/sql/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 87bdc57d5..a244747c1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -468,7 +468,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "7bd15d1ca789c5aaef5d2dbfdb14565ec8223d1b"
+    "revision": "bd53a6c482d865365cbfb034168ca78364d1d136"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 3cce87ae9..55e8fb68c 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -69,6 +69,7 @@
  (keyword_following)
  (keyword_first)
  (keyword_current_timestamp)
+ (keyword_filter)
 ] @attribute
 
 [

From 99a7e8d268a052e0e90211a2ab9c1c89e9db038c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 29 Jun 2023 06:56:36 +0000
Subject: [PATCH 0471/2704] Update parsers: gitcommit, html, kotlin

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a244747c1..fa2774929 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -159,7 +159,7 @@
     "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
   },
   "gitcommit": {
-    "revision": "5e3263c856d2de7ecbcfb646352c8e29dc2b83e6"
+    "revision": "6856a5fd0ffeff17d83325a8ce4e57811010eff1"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -222,7 +222,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "html": {
-    "revision": "03e9435d5a95e3fcb9d7e2720c2aac5fc1b9ae8f"
+    "revision": "ab91d87963c47ffd08a7967b9aa73eb53293d120"
   },
   "htmldjango": {
     "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"
@@ -270,7 +270,7 @@
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
-    "revision": "100d79fd96b56a1b99099a8d2f3c114b8687acfb"
+    "revision": "8d43d90d568a97afee0891949d7cead3294ca94d"
   },
   "lalrpop": {
     "revision": "b7431e4b64183a5d0d094895a4cd5daf51ed3103"

From f460cc8ee7cb0e7ff1512b238d07029afca3d958 Mon Sep 17 00:00:00 2001
From: Glib Shpychka <23005347+gshpychka@users.noreply.github.com>
Date: Thu, 29 Jun 2023 13:34:46 +0300
Subject: [PATCH 0472/2704] feat(wing): add parser (#5021)

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 lockfile.json                               |  3 +
 lua/nvim-treesitter/parsers.lua             | 11 +++
 queries/wing/folds.scm                      | 18 +++++
 queries/wing/highlights.scm                 | 86 +++++++++++++++++++++
 queries/wing/locals.scm                     |  5 ++
 scripts/minimal_init.lua                    |  1 +
 tests/query/highlights/wing/class.w         | 19 +++++
 tests/query/highlights/wing/nested_method.w |  4 +
 8 files changed, 147 insertions(+)
 create mode 100644 queries/wing/folds.scm
 create mode 100644 queries/wing/highlights.scm
 create mode 100644 queries/wing/locals.scm
 create mode 100644 tests/query/highlights/wing/class.w
 create mode 100644 tests/query/highlights/wing/nested_method.w

diff --git a/lockfile.json b/lockfile.json
index fa2774929..3cc6f3ae1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -566,6 +566,9 @@
   "wgsl_bevy": {
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
+  "wing": {
+    "revision": "bb54f98e55db82d67711abadefdbd3b933c9efc3"
+  },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ac8695f55..d5144c39c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1668,6 +1668,17 @@ list.wgsl_bevy = {
   maintainers = { "@theHamsta" },
 }
 
+list.wing = {
+  install_info = {
+    url = "https://github.com/winglang/wing",
+    files = { "src/parser.c", "src/scanner.c" },
+    location = "libs/tree-sitter-wing",
+    requires_generate_from_grammar = true,
+  },
+  maintainers = { "@gshpychka" },
+  experimental = true,
+}
+
 list.yaml = {
   install_info = {
     url = "https://github.com/ikatyang/tree-sitter-yaml",
diff --git a/queries/wing/folds.scm b/queries/wing/folds.scm
new file mode 100644
index 000000000..17fc7b95f
--- /dev/null
+++ b/queries/wing/folds.scm
@@ -0,0 +1,18 @@
+[
+  (class_definition)
+  (class_implementation)
+  (resource_definition)
+  (resource_implementation)
+  (interface_definition)
+  (interface_implementation)
+  (for_in_loop)
+  (while_statement)
+  (if_statement)
+  (if_let_statement)
+  (elif_block)
+  (struct_definition)
+  (enum_definition)
+  (try_catch_statement)
+  (method_definition)
+  (inflight_method_definition)
+] @fold
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
new file mode 100644
index 000000000..7fdf3a8f3
--- /dev/null
+++ b/queries/wing/highlights.scm
@@ -0,0 +1,86 @@
+(identifier) @variable
+(reference_identifier) @variable
+(member_identifier) @property
+
+; Classes
+
+(custom_type) @type
+(class_field 
+  name: (identifier) @field)
+(class_definition 
+  name: (identifier) @type)
+(method_definition
+  name: (identifier) @method)
+(inflight_method_definition
+  name: (identifier) @method)
+
+; Functions
+
+(keyword_argument_key) @parameter
+(call 
+  caller: (reference 
+  	(nested_identifier 
+    	property: (member_identifier) @method.call)))
+(call 
+  caller: (reference 
+  	(reference_identifier) @method.call))
+
+; Primitives
+
+(number) @number
+(duration) @constant
+(string) @string
+(bool) @boolean
+(builtin_type) @type.builtin
+(json_container_type) @type.builtin
+
+; Special
+
+(comment) @comment
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+]  @punctuation.bracket
+
+[
+  "-"
+  "+"
+  "*"
+  "/"
+  "%"
+  "<"
+  "<="
+  "="
+  "=="
+  "!"
+  "!="
+  ">"
+  ">="
+  "&&"
+  "??"
+  "||"
+] @operator
+
+[
+  ";"
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "as"
+  "bring"
+  "class"
+  "else"
+  "for"
+  "if"
+  "in"
+  "init"
+  "let"
+  "new"
+  "return"
+  (inflight_specifier)
+] @keyword
diff --git a/queries/wing/locals.scm b/queries/wing/locals.scm
new file mode 100644
index 000000000..a467939bd
--- /dev/null
+++ b/queries/wing/locals.scm
@@ -0,0 +1,5 @@
+(block) @scope
+(variable_definition_statement
+  name: (identifier) @definition)
+
+; TODO: Missing "@local.reference" usage tuned for each relevant identifier location
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index f3aeef7b9..e650a0dd8 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -11,6 +11,7 @@ vim.filetype.add {
     usd = "usd",
     usda = "usd",
     wgsl = "wgsl",
+    w = "wing",
   },
 }
 
diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
new file mode 100644
index 000000000..636cbc601
--- /dev/null
+++ b/tests/query/highlights/wing/class.w
@@ -0,0 +1,19 @@
+bring cloud;
+// <- keyword
+
+class Foo {
+// <- keyword
+//    ^   variable
+//        ^ punctuation.bracket
+  name: str;
+//^    field
+//      ^   type.builtin
+//         ^ punctuation.delimiter
+  init(name:  str) {
+//^    keyword
+//     ^    variable
+    this.name = name;
+//      ^ punctuation.delimiter
+//            ^ operator
+  }
+}
diff --git a/tests/query/highlights/wing/nested_method.w b/tests/query/highlights/wing/nested_method.w
new file mode 100644
index 000000000..04fd1a37d
--- /dev/null
+++ b/tests/query/highlights/wing/nested_method.w
@@ -0,0 +1,4 @@
+test1.test2.test3();
+// <- variable
+//    ^ property
+//          ^ method.call

From e89fd9f9632ebbb3e80a9f524f3d77358fc17d0a Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Thu, 29 Jun 2023 10:35:02 +0000
Subject: [PATCH 0473/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 973905a54..64f7d412f 100644
--- a/README.md
+++ b/README.md
@@ -362,6 +362,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vue](https://github.com/ikatyang/tree-sitter-vue) (maintained by @WhyNotHugo)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
+- [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka)
 - [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)

From 4c3912dfa865e3ee97c8164322847b8b487779b2 Mon Sep 17 00:00:00 2001
From: Beartama <8091245+uyha@users.noreply.github.com>
Date: Thu, 29 Jun 2023 14:26:23 +0300
Subject: [PATCH 0474/2704] indents(cmake): dedent brackets, else, endwhile

* feat(cmake): dedent for all closing brackets

* feat(cmake): indent an argument according to its previous peer

* fix(cmake); fix typo, add dedent `endwhile`
---
 queries/cmake/indents.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/queries/cmake/indents.scm b/queries/cmake/indents.scm
index 0c3da0013..787cc2c98 100644
--- a/queries/cmake/indents.scm
+++ b/queries/cmake/indents.scm
@@ -10,13 +10,16 @@
 
 [
  (elseif_command)
- (elseif_command)
+ (else_command)
  (endif_command)
  (endforeach_command)
+ (endwhile_command)
  (endfunction_command)
  (endmacro_command)
  (endblock_command)
 ] @indent.branch
 
-(normal_command ")" @indent.branch)
-(normal_command ")" @indent.end)
+(")" @indent.branch)
+(")" @indent.end)
+
+(argument_list) @indent.auto

From 8d2eb35c5b72a2e2fdb713998bdc906d8f028114 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 29 Jun 2023 10:17:58 -0400
Subject: [PATCH 0475/2704] fix(bash): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3cc6f3ae1..7d49e2409 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"
   },
   "bash": {
-    "revision": "ee2a8f9906b53a785b784ee816c0016c2b6866d2"
+    "revision": "493646764e7ad61ce63ce3b8c59ebeb37f71b841"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d5144c39c..da5be1a5d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -114,7 +114,7 @@ list.awk = {
 list.bash = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-bash",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "sh",
   maintainers = { "@TravonteD" },

From 849645e893386a9fe4286e44679da6b7bb263b31 Mon Sep 17 00:00:00 2001
From: Dian Fay <dmfay@users.noreply.github.com>
Date: Thu, 29 Jun 2023 19:25:34 -0400
Subject: [PATCH 0476/2704] feat(sql): json operator highlights

---
 lockfile.json              | 2 +-
 queries/sql/highlights.scm | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7d49e2409..9400c3986 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -468,7 +468,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "bd53a6c482d865365cbfb034168ca78364d1d136"
+    "revision": "e35a16e4b7b342de6a0fbeee108d536bb6633562"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 55e8fb68c..7ce6131c0 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -300,6 +300,10 @@
   ">="
   ">"
   "<>"
+  "->"
+  "->>"
+  "#>"
+  "#>>"
 ] @operator
 
 [
@@ -312,5 +316,3 @@
   ","
   "."
 ] @punctuation.delimiter
-
-

From 04dda34cb75018399d8a0a688ea10eb4de889eeb Mon Sep 17 00:00:00 2001
From: urbit-pilled <129720764+urbit-pilled@users.noreply.github.com>
Date: Fri, 30 Jun 2023 11:26:44 +1200
Subject: [PATCH 0477/2704] feat: add Hoon language support

---------

Co-authored-by: urbit-pilled <urbit-pilled>
Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  9 +++++++++
 queries/hoon/folds.scm          |  6 ++++++
 queries/hoon/highlights.scm     | 33 +++++++++++++++++++++++++++++++++
 queries/hoon/locals.scm         |  4 ++++
 6 files changed, 56 insertions(+)
 create mode 100644 queries/hoon/folds.scm
 create mode 100644 queries/hoon/highlights.scm
 create mode 100644 queries/hoon/locals.scm

diff --git a/README.md b/README.md
index 64f7d412f..0209883a8 100644
--- a/README.md
+++ b/README.md
@@ -247,6 +247,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [hjson](https://github.com/winston0410/tree-sitter-hjson) (maintained by @winston0410)
 - [x] [hlsl](https://github.com/theHamsta/tree-sitter-hlsl) (maintained by @theHamsta)
 - [x] [hocon](https://github.com/antosha417/tree-sitter-hocon) (maintained by @antosha417)
+- [x] [hoon](https://github.com/urbit-pilled/tree-sitter-hoon) (experimental, maintained by @urbit-pilled)
 - [x] [html](https://github.com/tree-sitter/tree-sitter-html) (maintained by @TravonteD)
 - [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 9400c3986..ed9371001 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -221,6 +221,9 @@
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
+  "hoon": {
+    "revision": "37563e0b57dfc7b0e6072f8b12f98cedaf22553a"
+  },
   "html": {
     "revision": "ab91d87963c47ffd08a7967b9aa73eb53293d120"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index da5be1a5d..7b0cc438d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -694,6 +694,15 @@ list.hocon = {
   maintainers = { "@antosha417" },
 }
 
+list.hoon = {
+  install_info = {
+    url = "https://github.com/urbit-pilled/tree-sitter-hoon",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@urbit-pilled" },
+  experimental = true,
+}
+
 list.html = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-html",
diff --git a/queries/hoon/folds.scm b/queries/hoon/folds.scm
new file mode 100644
index 000000000..93d1386e7
--- /dev/null
+++ b/queries/hoon/folds.scm
@@ -0,0 +1,6 @@
+[
+ (bartisTall)
+ (luslusTall)
+ (lusbucTall)
+ (barcenTall)
+ ] @fold
diff --git a/queries/hoon/highlights.scm b/queries/hoon/highlights.scm
new file mode 100644
index 000000000..f7136f63e
--- /dev/null
+++ b/queries/hoon/highlights.scm
@@ -0,0 +1,33 @@
+(number) @number
+
+(string) @string
+
+[
+  "("
+  ")"
+  "["
+  "]"
+]  @punctuation.bracket
+
+[
+  (coreTerminator)
+  (seriesTerminator)
+] @punctuation.delimiter
+
+
+(rune) @operator
+
+(term) @constant
+
+(aura) @constant.builtin
+
+(Gap) @comment
+
+(boolean) @constant.builtin
+
+(date) @string.special
+
+(mold) @symbol
+(specialIndex) @number.builtin
+(lark) @operator
+(fullContext) @symbol
diff --git a/queries/hoon/locals.scm b/queries/hoon/locals.scm
new file mode 100644
index 000000000..159783fd0
--- /dev/null
+++ b/queries/hoon/locals.scm
@@ -0,0 +1,4 @@
+(tisfasTall
+  name: (name) @definition.var)
+  
+(name) @reference

From adbabe9b5c75a32cff6d3cfc5ef2243c3352a3bb Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 26 Jun 2023 12:47:30 +0300
Subject: [PATCH 0478/2704] chore: remove scheme & racket maintainer

---
 README.md                       | 4 ++--
 lua/nvim-treesitter/parsers.lua | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0209883a8..7cd8b52b0 100644
--- a/README.md
+++ b/README.md
@@ -313,7 +313,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [qmljs](https://github.com/yuja/tree-sitter-qmljs) (maintained by @Decodetalkers)
 - [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
-- [x] [racket](https://github.com/6cdh/tree-sitter-racket) (maintained by @6cdh)
+- [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
 - [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
@@ -323,7 +323,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
 - [x] [rust](https://github.com/tree-sitter/tree-sitter-rust) (maintained by @amaanq)
 - [x] [scala](https://github.com/tree-sitter/tree-sitter-scala) (maintained by @stevanmilic)
-- [x] [scheme](https://github.com/6cdh/tree-sitter-scheme) (maintained by @6cdh)
+- [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
 - [x] [slint](https://github.com/jrmoulton/tree-sitter-slint) (experimental, maintained by @jrmoulton)
 - [x] [smali](https://git.sr.ht/~yotam/tree-sitter-smali) (maintained by @amaanq)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7b0cc438d..5e3c1efa3 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1259,7 +1259,6 @@ list.racket = {
     url = "https://github.com/6cdh/tree-sitter-racket",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@6cdh" },
 }
 
 list.rasi = {
@@ -1339,7 +1338,6 @@ list.scheme = {
     url = "https://github.com/6cdh/tree-sitter-scheme",
     files = { "src/parser.c" },
   },
-  maintainers = { "@6cdh" },
 }
 
 list.scss = {

From 0522bbe90d6f9bb7080621fe70f8ab565e072b98 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 30 Jun 2023 06:39:18 +0000
Subject: [PATCH 0479/2704] Update parsers: hoon, python, tsx, typescript, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ed9371001..d6b599fc8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -222,7 +222,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "37563e0b57dfc7b0e6072f8b12f98cedaf22553a"
+    "revision": "5b61ea6129dd6841140fa0d16172ca5d105526fd"
   },
   "html": {
     "revision": "ab91d87963c47ffd08a7967b9aa73eb53293d120"
@@ -402,7 +402,7 @@
     "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
   },
   "python": {
-    "revision": "6ecc2b54b39ac390848d81dfcf5ee961f33a2f03"
+    "revision": "dd3861c8f433c963cab727ad0827b55da74faae6"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -522,7 +522,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "286e90c32060032225f636a573d0e999f7766c97"
+    "revision": "3429d8c77d7a83e80032667f0642e6cb19d0c772"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -531,7 +531,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "286e90c32060032225f636a573d0e999f7766c97"
+    "revision": "3429d8c77d7a83e80032667f0642e6cb19d0c772"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "bb54f98e55db82d67711abadefdbd3b933c9efc3"
+    "revision": "e6d0f806db97dac29cdc6ba6a029055123312e6d"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 393bc5bec591caeedb0a4c696d15946c5d6c2de8 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 30 Jun 2023 17:35:52 +0000
Subject: [PATCH 0480/2704] Update parsers: awk, foam, html, matlab, nickel,
 python, scala, wing

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d6b599fc8..21008d32b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
   },
   "awk": {
-    "revision": "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"
+    "revision": "16e6fd822a5efa654d0a1ad7122aa1cc5e489cff"
   },
   "bash": {
     "revision": "493646764e7ad61ce63ce3b8c59ebeb37f71b841"
@@ -132,7 +132,7 @@
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
   },
   "foam": {
-    "revision": "ec73f2e317f9c09356e7be452d85671b9923a428"
+    "revision": "024449594c2841c944463481b741b141d1ab5727"
   },
   "fortran": {
     "revision": "31552ac43ecaffa443a12ebea68cc526d334892f"
@@ -225,7 +225,7 @@
     "revision": "5b61ea6129dd6841140fa0d16172ca5d105526fd"
   },
   "html": {
-    "revision": "ab91d87963c47ffd08a7967b9aa73eb53293d120"
+    "revision": "d2592b006e5270a281c6bafdbcb3768cd97fa47a"
   },
   "htmldjango": {
     "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"
@@ -312,7 +312,7 @@
     "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "b09c27e42732c59321604a15163480ebb4f82f1c"
+    "revision": "d7b24aaaf3e4814d073517d072727319d2b5ffc3"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -327,7 +327,7 @@
     "revision": "e2053f7c8856d91bc36c87604f697784845cee69"
   },
   "nickel": {
-    "revision": "b1a4718601ebd29a62bf3a7fd1069a99ccf48093"
+    "revision": "e1d9337864d209898a08c26b8cd4c2dd14c15148"
   },
   "ninja": {
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
@@ -402,7 +402,7 @@
     "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
   },
   "python": {
-    "revision": "dd3861c8f433c963cab727ad0827b55da74faae6"
+    "revision": "36f9e33d52b7572536ac1a8af8d7e78363ad52c3"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -447,7 +447,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "cda0de8a038b0e4ad79a97f7aa281250fcf88560"
+    "revision": "8062487fb3b7f3ce1bb7ce1fd1c84bed60c75203"
   },
   "scheme": {
     "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "e6d0f806db97dac29cdc6ba6a029055123312e6d"
+    "revision": "e5327844f545d4b6d78d23afc97439fae2aa5944"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 3c42a6400ed5a8766264ca4fc4ee7daa2de44aea Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 1 Jul 2023 06:38:28 +0000
Subject: [PATCH 0481/2704] Update parsers: go, matlab, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 21008d32b..0b5c8f346 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "53ca269cae2a47b1b75791e2bfe843baeb02e903"
   },
   "go": {
-    "revision": "3a3a8ee53777eaa6cbfc032afd11af407ee1f7fe"
+    "revision": "7a4edcbc376302efa8d6ba7e235070ab7ee3c4c8"
   },
   "godot_resource": {
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
@@ -312,7 +312,7 @@
     "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "d7b24aaaf3e4814d073517d072727319d2b5ffc3"
+    "revision": "0b020e5816830ad51ad2cd6185bd9b5052ab2df4"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "e5327844f545d4b6d78d23afc97439fae2aa5944"
+    "revision": "9840f377f740fb0efa902ccdd4b9f386a50a1d2b"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From aab2274e2cdc0342fccb8f6250a43c76a2d13164 Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Sat, 1 Jul 2023 16:25:05 +0700
Subject: [PATCH 0482/2704] feat(javascript): highlight parameter destructuring
 patterns

---
 queries/javascript/highlights.scm | 19 +++++++++++++++++++
 queries/typescript/highlights.scm |  6 ++++++
 2 files changed, 25 insertions(+)

diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index b62679c4b..8fc69e6c7 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -12,6 +12,12 @@
   (object_pattern
     (shorthand_property_identifier_pattern) @parameter))
 
+;; ({ a = b }) => null
+(formal_parameters
+  (object_pattern
+    (object_assignment_pattern
+      (shorthand_property_identifier_pattern) @parameter)))
+
 ;; ({ a: b }) => null
 (formal_parameters
   (object_pattern
@@ -23,6 +29,19 @@
   (array_pattern
     (identifier) @parameter))
 
+;; ({ a } = { a }) => null
+(formal_parameters
+  (assignment_pattern
+    (object_pattern
+      (shorthand_property_identifier_pattern) @parameter)))
+
+;; ({ a = b } = { a }) => null
+(formal_parameters
+  (assignment_pattern
+    (object_pattern
+      (object_assignment_pattern
+        (shorthand_property_identifier_pattern) @parameter))))
+
 ;; a => null
 (arrow_function
   parameter: (identifier) @parameter)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index f9385c8c3..4cb9fab3e 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -115,6 +115,12 @@
   (object_pattern
     (shorthand_property_identifier_pattern) @parameter))
 
+;; ({ a = b }) => null
+(required_parameter
+  (object_pattern
+    (object_assignment_pattern
+      (shorthand_property_identifier_pattern) @parameter)))
+
 ;; ({ a: b }) => null
 (required_parameter
   (object_pattern

From 58d4b924ebec182ac76f81f99966eb13a1d87eff Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 1 Jul 2023 19:22:23 +0900
Subject: [PATCH 0483/2704] fix: add `force` to all predicates/directives

So that when any of them are upstreamed, there will not be an issue with
re-adding directives anymore
---
 lua/nvim-treesitter/query_predicates.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 545def1e9..ff0e9999a 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -57,7 +57,7 @@ query.add_predicate("nth?", function(match, _pattern, _bufnr, pred)
   end
 
   return false
-end)
+end, true)
 
 ---@param match (TSNode|nil)[]
 ---@param _pattern string
@@ -117,7 +117,7 @@ query.add_predicate("is?", function(match, _pattern, bufnr, pred)
   local _, _, kind = locals.find_definition(node, bufnr)
 
   return vim.tbl_contains(types, kind)
-end)
+end, true)
 
 ---@param match (TSNode|nil)[]
 ---@param _pattern string
@@ -137,7 +137,7 @@ query.add_predicate("has-type?", function(match, _pattern, _bufnr, pred)
   end
 
   return vim.tbl_contains(types, node:type())
-end)
+end, true)
 
 ---@param match (TSNode|nil)[]
 ---@param _ string
@@ -158,7 +158,7 @@ query.add_directive("set-lang-from-mimetype!", function(match, _, bufnr, pred, m
     local parts = vim.split(type_attr_value, "/", {})
     metadata.language = parts[#parts]
   end
-end)
+end, true)
 
 ---@param match (TSNode|nil)[]
 ---@param _ string
@@ -173,10 +173,10 @@ query.add_directive("set-lang-from-info-string!", function(match, _, bufnr, pred
   end
   local injection_alias = vim.treesitter.get_node_text(node, bufnr)
   metadata.language = get_parser_from_markdown_info_string(injection_alias)
-end)
+end, true)
 
 -- Just avoid some annoying warnings for this directive
-query.add_directive("make-range!", function() end)
+query.add_directive("make-range!", function() end, true)
 
 ---@param match (TSNode|nil)[]
 ---@param _ string
@@ -209,7 +209,7 @@ query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
   else
     metadata[key] = string.lower(text)
   end
-end)
+end, true)
 
 ---@param match (TSNode|nil)[]
 ---@param _pattern string
@@ -240,7 +240,7 @@ query.add_directive("exclude_children!", function(match, _pattern, _bufnr, pred,
     table.insert(ranges, { start_row, start_col, end_row, end_col })
   end
   metadata.content = ranges
-end)
+end, true)
 
 -- Trim blank lines from end of the region
 -- Arguments are the captures to trim.
@@ -278,4 +278,4 @@ query.add_directive("trim!", function(match, _, bufnr, pred, metadata)
       metadata[id].range = { start_row, start_col, end_row, end_col }
     end
   end
-end)
+end, true)

From 3fde1587d0850d46b5a1473e5d1e59254e947496 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Jul 2023 12:17:39 +0200
Subject: [PATCH 0484/2704] fix(html): distinguish <hX> levels

---
 queries/html_tags/highlights.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index f44a853b0..e789fd922 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -7,7 +7,25 @@
 (text) @text @spell
 
 ((element (start_tag (tag_name) @_tag) (text) @text.title)
- (#match? @_tag "^(h[0-9]|title)$"))
+ (#eq? @_tag "title"))
+
+((element (start_tag (tag_name) @_tag) (text) @text.title.1)
+ (#eq? @_tag "h1"))
+
+((element (start_tag (tag_name) @_tag) (text) @text.title.2)
+ (#eq? @_tag "h2"))
+
+((element (start_tag (tag_name) @_tag) (text) @text.title.3)
+ (#eq? @_tag "h3"))
+
+((element (start_tag (tag_name) @_tag) (text) @text.title.4)
+ (#eq? @_tag "h4"))
+
+((element (start_tag (tag_name) @_tag) (text) @text.title.5)
+ (#eq? @_tag "h5"))
+
+((element (start_tag (tag_name) @_tag) (text) @text.title.6)
+ (#eq? @_tag "h6"))
 
 ((element (start_tag (tag_name) @_tag) (text) @text.strong)
  (#any-of? @_tag "strong" "b"))

From af25e8b7e0894dd7dc1461f0604d1005041154b5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 2 Jul 2023 06:37:26 +0000
Subject: [PATCH 0485/2704] Update parsers: matlab, t32, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0b5c8f346..2330f8cab 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -312,7 +312,7 @@
     "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "0b020e5816830ad51ad2cd6185bd9b5052ab2df4"
+    "revision": "3e7fb43959510b923d4f28eb1f0ca2de12921690"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -495,7 +495,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "4e581fcd17d76651aa92759a68f9a8186b9fe8dc"
+    "revision": "fatal: unable to access 'https://codeberg.org/xasc/tree-sitter-t32/': The requested URL returned error: 502"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "9840f377f740fb0efa902ccdd4b9f386a50a1d2b"
+    "revision": "99220ed7dc54f0b5b4a827a07dbcdecd51773223"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 254f3da6832252d579962ca6dcafae9c164de4ed Mon Sep 17 00:00:00 2001
From: Repetitive <serendipitousdog@protonmail.com>
Date: Sat, 1 Jul 2023 11:19:48 +0200
Subject: [PATCH 0486/2704] fix(markdown_inline): don't spellcheck shortlinks

---
 queries/markdown_inline/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index a70e34bb8..cd5da530d 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -20,6 +20,8 @@
   (uri_autolink)
 ] @text.uri @nospell
 
+(shortcut_link (link_text) @nospell)
+
 [
   (link_label)
   (link_text)

From c42a8f96d37be82cf32934c4351150d7736f93f5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 3 Jul 2023 07:12:17 +0000
Subject: [PATCH 0487/2704] Update parsers: arduino, beancount, matlab, sql,
 t32, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2330f8cab..d46399f3d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "da8cae9ce365a81dcba25256f76c713674121017"
+    "revision": "bf0db73db96ec02f872cb7b5058dcc8bfd8fe714"
   },
   "astro": {
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
@@ -21,7 +21,7 @@
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
   },
   "beancount": {
-    "revision": "f3741a3a68ade59ec894ed84a64673494d2ba8f3"
+    "revision": "358e5ecbb87109eef7fd596ea518a4ff74cb9b31"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -312,7 +312,7 @@
     "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "3e7fb43959510b923d4f28eb1f0ca2de12921690"
+    "revision": "835cdab0e105ccc670cf08193a958d1661f3e52b"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -471,7 +471,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "e35a16e4b7b342de6a0fbeee108d536bb6633562"
+    "revision": "5bf5e5256949b5d0b1bfecd9ac7ee86630760aea"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -495,7 +495,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "t32": {
-    "revision": "fatal: unable to access 'https://codeberg.org/xasc/tree-sitter-t32/': The requested URL returned error: 502"
+    "revision": "4e581fcd17d76651aa92759a68f9a8186b9fe8dc"
   },
   "tablegen": {
     "revision": "e5e046e1b221e25111175469f02f3cf336010857"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "99220ed7dc54f0b5b4a827a07dbcdecd51773223"
+    "revision": "0835281a20ec380fc52a1179de908c951d8d447d"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From c9bb5a5a7f960294cf1b3fb12a33949c04634456 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 4 Jul 2023 06:40:43 +0000
Subject: [PATCH 0488/2704] Update parsers: hoon, matlab, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d46399f3d..29b5c4312 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -222,7 +222,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "5b61ea6129dd6841140fa0d16172ca5d105526fd"
+    "revision": "89271dfe18f20aa71cbe5ef813252a8f98901240"
   },
   "html": {
     "revision": "d2592b006e5270a281c6bafdbcb3768cd97fa47a"
@@ -312,7 +312,7 @@
     "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
   },
   "matlab": {
-    "revision": "835cdab0e105ccc670cf08193a958d1661f3e52b"
+    "revision": "676117eafa64afedc8380a921a77cd9f2244bc6b"
   },
   "menhir": {
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
@@ -543,7 +543,7 @@
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },
   "v": {
-    "revision": "519e0f64007a40852e59bb72ff1b6e2375068664"
+    "revision": "f1b3a99285a58c6f5fe8add47877cde664b75a60"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "0835281a20ec380fc52a1179de908c951d8d447d"
+    "revision": "b9fa34ca30af7ef40d35cb844fd8677872ddf0bd"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 46b1ad3de2942dcf05f18d124b25fb6ee691c5bf Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 4 Jul 2023 04:12:21 -0400
Subject: [PATCH 0489/2704] refactor(v)!: update upstream repository

---
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   4 +-
 queries/v/highlights.scm        | 374 ++++++++++++++++++--------------
 queries/v/indents.scm           |   3 +-
 queries/v/injections.scm        |   6 +-
 queries/v/locals.scm            |  19 +-
 6 files changed, 230 insertions(+), 178 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 29b5c4312..12a8d0823 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -543,7 +543,7 @@
     "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
   },
   "v": {
-    "revision": "f1b3a99285a58c6f5fe8add47877cde664b75a60"
+    "revision": "e14fdf6e661b10edccc744102e4ccf0b187aa8ad"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5e3c1efa3..4b5fbbd3b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1600,12 +1600,12 @@ list.uxntal = {
 
 list.v = {
   install_info = {
-    url = "https://github.com/vlang/vls",
+    url = "https://github.com/v-analyzer/v-analyzer",
     files = { "src/parser.c", "src/scanner.c" },
     location = "tree_sitter_v",
   },
   filetype = "vlang",
-  maintainers = { "@kkharji" },
+  maintainers = { "@kkharji", "@amaanq" },
 }
 
 list.vala = {
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 379b525e8..0fb3074fa 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -1,196 +1,174 @@
-;; reference https://github.com/vlang/vls
-;; rev: c3e9874fa6c3b38beaa50d53aff4967403e251a4
-
-;; Identifiers -------------------
-(import_path) @namespace
-(module_identifier) @variable.builtin
-(identifier) @variable
-(interpreted_string_literal) @string
-(string_interpolation) @none
-
-; TODO: Have different highlight to make then standout + highlight }{$ as special
-; ((string_interpolation
-;   (identifier) @constant
-;   "$" @punctuation.special
-;   "${" @punctuation.special
-;   "}" @punctuation.special))
-
-[(type_identifier) (array_type) (pointer_type)] @type
-
-(field_identifier) @property
-
-(builtin_type) @type.builtin
-
-(parameter_declaration
-  name: (identifier) @parameter)
-
-(const_spec
-  name: (identifier) @constant)
-
-((((selector_expression field: (identifier) @property)) @_parent
-  (#not-has-parent? @_parent call_expression special_call_expression)))
-
-((identifier) @variable.builtin
-  (#any-of? @variable.builtin "err" "macos" "linux" "windows"))
-
-(attribute_declaration) @attribute
-;; C: TODO: fixme make `C`.exten highlighted as variable.builtin
-; ((binded_identifier) @content
-;  (#offset! @content 0 3 0 -1)
-;  (#match? @content "^C$"))
-
-;; Function calls ----------------
-(call_expression
-  function: (identifier) @function.call)
-
-(((_
-   function: (selector_expression field: (identifier) @function.call)
-   arguments: (_) @_args)
-  (#not-has-type? @_args arguments_list)))
-
-((call_expression
-  function: (binded_identifier name: (identifier) @function)
-  @function.call))
-
-
-;; Function definitions ---------
-(function_declaration
-  name: (identifier) @function)
-
-(function_declaration
-  receiver: (parameter_list)
-  name: (identifier) @method)
-
-((function_declaration
-  (binded_identifier name: (identifier) @function)
-  @function))
-
-;; Keywords
+; Includes
 
 [
   "import"
   "module"
 ] @include
 
+; Keywords
+
+[
+  "asm"
+  "assert"
+  "const"
+  "defer"
+  "enum"
+  "goto"
+  "interface"
+  "struct"
+  "sql"
+  "type"
+  "union"
+  "unsafe"
+] @keyword
+
+[
+  "as"
+  "in"
+  "!in"
+  "or"
+  "is"
+  "!is"
+] @keyword.operator
+
 [
   "match"
   "if"
   "$if"
   "else"
   "$else"
+  "select"
 ] @conditional
 
 [
-  "for" @repeat
+  "for"
   "$for"
+  "continue"
+  "break"
 ] @repeat
 
-[
- "as"
- "in"
- "!in"
- "or"
- "is"
- "!is"
-] @keyword.operator
-
-[
- "asm"
- "assert"
- "const"
- "defer"
- "enum"
- "go"
- "goto"
- "interface"
- "lock"
- "mut"
- "pub"
- "rlock"
- "struct"
- "type"
- "unsafe"
-]
- ;; Either not supported or will be dropped
- ;"atomic"
- ;"break"
- ; "continue"
- ;"shared"
- ;"static"
- ;"union"
-@keyword
-
 "fn" @keyword.function
+
 "return" @keyword.return
 
-; "import" @include ;; note: comment out b/c of import_path @namespace
+[
+  "__global"
+  "shared"
+  "static"
+  "const"
+] @storageclass
+
+[
+  "pub"
+  "mut"
+] @type.qualifier
+
+[
+  "go"
+  "spawn"
+  "lock"
+  "rlock"
+] @keyword.coroutine
+
+; Variables
+
+(identifier) @variable
+
+; Namespace
+
+(module_clause
+ (identifier) @namespace)
+
+(import_path
+ (import_name) @namespace)
+
+(import_alias
+ (import_name) @namespace)
+
+; Literals
 
 [ (true) (false) ] @boolean
 
+(interpreted_string_literal) @string
 
+(string_interpolation) @none
 
-;; Conditionals ----------------
-[ "else" "if"] @conditional
+; Types
 
-;; Operators ----------------
-[ "." "," ":" ";"] @punctuation.delimiter
+(struct_declaration
+  name: (identifier) @type)
 
-[ "(" ")" "{" "}" "[" "]"] @punctuation.bracket
+(enum_declaration
+  name: (identifier) @type)
 
-(array) @punctuation.bracket
+(interface_declaration
+  name: (identifier) @type)
 
-[
- "++"
- "--"
+(type_declaration
+  name: (identifier) @type)
 
- "+"
- "-"
- "*"
- "/"
- "%"
+(type_reference_expression (identifier) @type)
 
- "~"
- "&"
- "|"
- "^"
+; Labels
 
- "!"
- "&&"
- "||"
- "!="
+(label_reference) @label
 
- "<<"
- ">>"
+; Fields
 
- "<"
- ">"
- "<="
- ">="
+(selector_expression field: (reference_expression (identifier) @field))
 
- "+="
- "-="
- "*="
- "/="
- "&="
- "|="
- "^="
- "<<="
- ">>="
+(field_name) @field
 
- "="
- ":="
- "=="
+(struct_field_declaration
+  name: (identifier) @field)
 
- "?"
- "<-"
- "$"
- ".."
- "..."]
-@operator
+; Parameters
+
+(parameter_declaration
+  name: (identifier) @parameter)
+
+(receiver
+  name: (identifier) @parameter)
+
+; Constants
+
+((identifier) @constant
+  (#has-ancestor? @constant compile_time_if_expression))
+
+(enum_fetch
+  (reference_expression) @constant)
+
+(enum_field_definition
+  (identifier) @constant)
+
+(const_definition
+  name: (identifier) @constant)
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "err" "macos" "linux" "windows"))
+
+; Attributes
+
+(attribute) @attribute
+
+; Functions
+
+(function_declaration
+  name: (identifier) @function)
+
+(function_declaration
+  receiver: (receiver)
+  name: (identifier) @method)
+
+(call_expression
+ name: (selector_expression
+  field: (reference_expression) @method.call))
+
+(call_expression
+ name: (reference_expression) @function.call)
 
-;; Builtin Functions, maybe redundant with (builtin_type)
 ((identifier) @function.builtin
- (#any-of? @function.builtin
+  (#any-of? @function.builtin
     "eprint"
     "eprintln"
     "error"
@@ -389,25 +367,101 @@
     "vstrlen_char"
     "winapi_lasterr_str"))
 
+; Operators
 
-;; Literals
+[
+  "++"
+  "--"
+
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+
+  "~"
+  "&"
+  "|"
+  "^"
+
+  "!"
+  "&&"
+  "||"
+  "!="
+
+  "<<"
+  ">>"
+
+  "<"
+  ">"
+  "<="
+  ">="
+
+  "+="
+  "-="
+  "*="
+  "/="
+  "&="
+  "|="
+  "^="
+  "<<="
+  ">>="
+
+  "="
+  ":="
+  "=="
+
+  "?"
+  "<-"
+  "$"
+  ".."
+  "..."
+] @operator
+
+; Punctuation
+
+[ "." "," ":" ";" ] @punctuation.delimiter
+
+[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
+
+; Literals
 
 (int_literal) @number
 
-(rune_literal) @string
+(float_literal) @float
 
-(raw_string_literal) @string
+[
+  (c_string_literal)
+  (raw_string_literal)
+  (interpreted_string_literal)
+  (string_interpolation)
+  (rune_literal)
+] @string
+
+(string_interpolation
+  (braced_interpolation_opening) @punctuation.bracket
+  (interpolated_expression) @none
+  (braced_interpolation_closing) @punctuation.bracket)
 
 (escape_sequence) @string.escape
 
-(float_literal) @float
+[
+  (true)
+  (false)
+] @boolean
 
-[(true) (false)] @boolean
+(nil) @constant.builtin
 
-(ERROR) @error
+(none) @variable.builtin
+
+; Comments
 
 (comment) @comment @spell
 
 (_
   (comment)+ @comment.documentation
-  [(function_declaration) (type_declaration) (const_spec) (enum_declaration)])
+  [(function_declaration) (type_declaration) (enum_declaration)])
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/v/indents.scm b/queries/v/indents.scm
index afcf6d8c6..a806b35ed 100644
--- a/queries/v/indents.scm
+++ b/queries/v/indents.scm
@@ -1,10 +1,9 @@
 [(import_declaration)
  (const_declaration)
  (type_declaration)
- (literal_value)
  (type_initializer)
  (block)
- (map)
+ (map_init_expression)
  (call_expression)
  (parameter_list)]
 @indent.begin
diff --git a/queries/v/injections.scm b/queries/v/injections.scm
index 11f02639e..b39a5ef44 100644
--- a/queries/v/injections.scm
+++ b/queries/v/injections.scm
@@ -6,8 +6,8 @@
 
 ;; regex for the methods defined in `re` module
 ((call_expression
-    function: (selector_expression
-      field: (identifier) @_re)
+    name: (selector_expression
+      field: (reference_expression (identifier) @_re))
     arguments: (argument_list
-  (raw_string_literal) @regex (#offset! @regex 0 2 0 -1)))
+  (argument (literal (raw_string_literal) @regex (#offset! @regex 0 2 0 -1)))))
   (#any-of? @_re "regex_base" "regex_opt" "compile_opt"))
diff --git a/queries/v/locals.scm b/queries/v/locals.scm
index 0d1b64c17..f0e08403a 100644
--- a/queries/v/locals.scm
+++ b/queries/v/locals.scm
@@ -1,25 +1,24 @@
 ((function_declaration
      name: (identifier) @definition.function)) ;@function
 
-(short_var_declaration
-  left: (expression_list
-          (identifier) @definition.var))
+(var_declaration
+  var_list: (expression_list
+              (reference_expression
+                (identifier) @definition.var)))
 
 ((function_declaration
-  name: (binded_identifier
-          name: (identifier) @definition.function)))
+  name: (identifier) @definition.function))
 
-(const_declaration (const_spec (identifier) @definition.var))
+(const_declaration (const_definition name: (identifier) @definition.var))
 
 (identifier) @reference
-(type_identifier) @reference
 
-((call_expression function: (identifier) @reference)
+((call_expression name: (reference_expression (identifier)) @reference)
  (#set! reference.kind "call"))
 
 ((call_expression
-   function: (selector_expression
-                field: (identifier) @definition.function))
+   name: (selector_expression
+                field: (reference_expression (identifier) @definition.function)))
  (#set! reference.kind "call"))
 
 (source_file) @scope

From 896f2c76229f03d6978d29fa7b12421d7c18102f Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Tue, 4 Jul 2023 09:08:30 +0000
Subject: [PATCH 0490/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7cd8b52b0..6531affed 100644
--- a/README.md
+++ b/README.md
@@ -354,7 +354,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
 - [x] [usd](https://github.com/ColinKennedy/tree-sitter-usd) (maintained by @ColinKennedy)
 - [x] [uxn tal](https://github.com/amaanq/tree-sitter-uxntal) (maintained by @amaanq)
-- [x] [v](https://github.com/vlang/vls) (maintained by @kkharji)
+- [x] [v](https://github.com/v-analyzer/v-analyzer) (maintained by @kkharji, @amaanq)
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)

From 2d78445087be5c866a145a61b3e91614a621df90 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 5 Jul 2023 03:23:23 -0400
Subject: [PATCH 0491/2704] fix(foam): update queries from upstream

---
 lockfile.json               |  2 +-
 queries/foam/highlights.scm | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 12a8d0823..af2428bd0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
   },
   "foam": {
-    "revision": "024449594c2841c944463481b741b141d1ab5727"
+    "revision": "7ef88a8c652073785bffd7ce9c3effc68035aa11"
   },
   "fortran": {
     "revision": "31552ac43ecaffa443a12ebea68cc526d334892f"
diff --git a/queries/foam/highlights.scm b/queries/foam/highlights.scm
index 11d31e692..5d45b0a34 100644
--- a/queries/foam/highlights.scm
+++ b/queries/foam/highlights.scm
@@ -29,10 +29,11 @@
 ((preproc_call) @conditional
   (#any-of? @conditional "else" "endif"))
 
-;; Literal numbers and strings
+;; Literals
 (number_literal) @float
 (string_literal) @string
 (escape_sequence) @string.escape
+(boolean) @boolean
 
 ;; Treat [m^2 s^-2] the same as if it was put in numbers format
 (dimensions dimension: (identifier) @float)
@@ -54,12 +55,7 @@
   "$$"
 ] @punctuation.bracket
 
-[
-  ";"
-] @punctuation.delimiter
-
-;; Special identifiers
-[ "on" "off" "true" "false" "yes" "no" ] @constant.builtin
+";" @punctuation.delimiter
 
 ((identifier) @constant.builtin
   (#any-of? @constant.builtin "uniform" "non-uniform" "and" "or"))

From 0b81ed9f18333949a74586a1ea0497ae4cbb7cd4 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 5 Jul 2023 07:45:31 +0000
Subject: [PATCH 0492/2704] Update parsers: sql, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index af2428bd0..d6a65aeec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -471,7 +471,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "5bf5e5256949b5d0b1bfecd9ac7ee86630760aea"
+    "revision": "b1086083473cc7a0b0476d853f3152dd3a378aef"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "b9fa34ca30af7ef40d35cb844fd8677872ddf0bd"
+    "revision": "0be6fa1cdb142191c608260b9ee2c74ad7bb1899"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 1a915819d8a93548910c8649218a1df8ccaa677c Mon Sep 17 00:00:00 2001
From: Derek Stride <derek.stride@shopify.com>
Date: Wed, 5 Jul 2023 16:05:56 -0400
Subject: [PATCH 0493/2704] feat(sql): update highlights from upstream

---
 lockfile.json              |  2 +-
 queries/sql/highlights.scm | 44 ++++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d6a65aeec..a64fd1824 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -471,7 +471,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "b1086083473cc7a0b0476d853f3152dd3a378aef"
+    "revision": "0acc69008afa9e67f80062b8413c232da1796df2"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 7ce6131c0..0e0e945e8 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -5,7 +5,6 @@
   (keyword_spgist)
   (keyword_gin)
   (keyword_brin)
-  (keyword_float)
   (keyword_array)
 ] @function.call
 
@@ -69,7 +68,13 @@
  (keyword_following)
  (keyword_first)
  (keyword_current_timestamp)
- (keyword_filter)
+ (keyword_immutable)
+ (keyword_atomic)
+ (keyword_parallel)
+ (keyword_leakproof)
+ (keyword_safe)
+ (keyword_cost)
+ (keyword_strict)
 ] @attribute
 
 [
@@ -87,6 +92,7 @@
  (keyword_avro)
  (keyword_jsonfile)
  (keyword_sequencefile)
+ (keyword_volatile)
 ] @storageclass
 
 [
@@ -193,21 +199,44 @@
   (keyword_sort)
   (keyword_compute)
   (keyword_comment)
-  (keyword_partitioned)
   (keyword_location)
   (keyword_cached)
   (keyword_uncached)
   (keyword_lines)
   (keyword_stored)
-  (keyword_location)
   (keyword_partitioned)
-  (keyword_cached)
   (keyword_analyze)
   (keyword_rewrite)
-  (keyword_statistics)
   (keyword_optimize)
   (keyword_vacuum)
   (keyword_cache)
+  (keyword_language)
+  (keyword_sql)
+  (keyword_called)
+  (keyword_conflict)
+  (keyword_declare)
+  (keyword_filter)
+  (keyword_function)
+  (keyword_input)
+  (keyword_name)
+  (keyword_oid)
+  (keyword_options)
+  (keyword_plpgsql)
+  (keyword_precision)
+  (keyword_regclass)
+  (keyword_regnamespace)
+  (keyword_regproc)
+  (keyword_regtype)
+  (keyword_restricted)
+  (keyword_return)
+  (keyword_returns)
+  (keyword_separator)
+  (keyword_setof)
+  (keyword_stable)
+  (keyword_support)
+  (keyword_tblproperties)
+  (keyword_trigger)
+  (keyword_unsafe)
 ] @keyword
 
 [
@@ -246,10 +275,12 @@
   (keyword_serial)
   (keyword_bigserial)
   (keyword_smallint)
+  (keyword_mediumint)
   (keyword_bigint)
   (keyword_tinyint)
   (keyword_decimal)
   (keyword_float)
+  (keyword_double)
   (keyword_numeric)
   (keyword_real)
   (double)
@@ -293,6 +324,7 @@
   "/"
   "%"
   "^"
+  ":="
   "="
   "<"
   "<="

From 928ad5276cf071c049a27dbc5f98d0896aab38fc Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 5 Jul 2023 16:02:27 -0400
Subject: [PATCH 0494/2704] fix(cuda): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a64fd1824..b5c3d695c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
   },
   "cuda": {
-    "revision": "90446edd3e2e1eed0cb77755a083d9ed91ddea63"
+    "revision": "c9ba632aa68d24f32d2f97e356795f45f85e6c55"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4b5fbbd3b..85306fc4f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -273,7 +273,7 @@ list.css = {
 list.cuda = {
   install_info = {
     url = "https://github.com/theHamsta/tree-sitter-cuda",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     generate_requires_npm = true,
   },
   maintainers = { "@theHamsta" },

From 1bf573896c7854ca5827074685cd53e81eb30cef Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 5 Jul 2023 16:04:16 -0400
Subject: [PATCH 0495/2704] fix(hlsl): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b5c3d695c..d334f2da5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -216,7 +216,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "eeb138aba44de8379dae474624fef65d4288476a"
+    "revision": "ddb608219fa99d56ed98de2d60f396f575cc6590"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 85306fc4f..7ec7195de 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -679,7 +679,7 @@ list.hjson = {
 list.hlsl = {
   install_info = {
     url = "https://github.com/theHamsta/tree-sitter-hlsl",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     generate_requires_npm = true,
   },
   maintainers = { "@theHamsta" },

From be47e13a2483e7667181056cfe112b726b0baca8 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 6 Jul 2023 06:43:34 +0000
Subject: [PATCH 0496/2704] Update parsers: mermaid, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d334f2da5..25338025b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
   },
   "mermaid": {
-    "revision": "d787c66276e7e95899230539f556e8b83ee16f6d"
+    "revision": "e26a5f8898a8174f02b4cc9a9050eb3ccfb799f3"
   },
   "meson": {
     "revision": "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "0be6fa1cdb142191c608260b9ee2c74ad7bb1899"
+    "revision": "804287951c2673ff4eff53a3ffbe8e895c0d6270"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From e1ab5391e5c4820dd1ffc2566d29b01573ab52a9 Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen03.huan@gmail.com>
Date: Thu, 6 Jul 2023 00:07:07 -0700
Subject: [PATCH 0497/2704] feat(nix): highlight hpath_expressions as
 `@string.special`

---
 queries/nix/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 86b497e9f..d30deeaf5 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -37,7 +37,7 @@
   (#set! "priority" 99)) @string
 
 ; paths and URLs
-[ (path_expression) (spath_expression) (uri_expression) ] @string.special
+[ (path_expression) (hpath_expression) (spath_expression) (uri_expression) ] @string.special
 
 ; escape sequences
 (escape_sequence) @string.escape

From 4cc1b342f6b240e7309e940072f548325566e999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Buga=C5=82a?= <run2cmd@users.noreply.github.com>
Date: Fri, 7 Jul 2023 08:58:44 +0200
Subject: [PATCH 0498/2704] feat(groovy): update highlights from upstream
 (#5076)

Groovydoc multiline comment support.
---
 lockfile.json                 |  2 +-
 queries/groovy/highlights.scm | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 25338025b..c6dde55d1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,7 +192,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "7ebfaf33a0f68f9283be17903ebecfdac05a1f3b"
+    "revision": "54c7da8b167261e76c79513c0364a01836093526"
   },
   "hack": {
     "revision": "95e63e79e0d9f91000bd11d458997fabed1bb1e2"
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index 2f9f541b8..25dc21086 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -43,7 +43,19 @@
 
 (string) @string
 
-(comment) @comment
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+((block_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
+
+((line_comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
 
 (operators) @operator
 (leading_key) @operator

From 1ef286e5b0cfd17f56586a8445cd83d61647f851 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 7 Jul 2023 06:40:50 +0000
Subject: [PATCH 0499/2704] Update parsers: dockerfile, groovy, kotlin, racket,
 scheme, sql, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c6dde55d1..3cb685898 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -93,7 +93,7 @@
     "revision": "f69bde8e56f431863eba2fe4bab23e7d9692855f"
   },
   "dockerfile": {
-    "revision": "fd30df68c4178964ed012ef7f745055db76f8ebf"
+    "revision": "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321"
   },
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
@@ -273,7 +273,7 @@
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
-    "revision": "8d43d90d568a97afee0891949d7cead3294ca94d"
+    "revision": "2878163ee7cad7eaebd3df1729e86610891fe0ee"
   },
   "lalrpop": {
     "revision": "b7431e4b64183a5d0d094895a4cd5daf51ed3103"
@@ -420,7 +420,7 @@
     "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
   },
   "racket": {
-    "revision": "bbdb0bfbaf0dd5f6650b97a393a06a19cef50562"
+    "revision": "92bf6372c63bb413c2d3c1535383d266838d1911"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -450,7 +450,7 @@
     "revision": "8062487fb3b7f3ce1bb7ce1fd1c84bed60c75203"
   },
   "scheme": {
-    "revision": "0c763bd5f85b18e354bc338d17cf1daa23b478b1"
+    "revision": "ca8af220aaf2a80aaf609bfb0df193817e4f064b"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -471,7 +471,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "0acc69008afa9e67f80062b8413c232da1796df2"
+    "revision": "dd5fe7713cec874506c6f75409ce03776748b146"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -570,7 +570,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "804287951c2673ff4eff53a3ffbe8e895c0d6270"
+    "revision": "c4a42cd02490e52cb9ba517f88f6636327f2bc82"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From ec7db4ba3f4dd9c1d7faab48d982c254a648023b Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 7 Jul 2023 13:18:30 +0300
Subject: [PATCH 0500/2704] feat(pug): improve syntax highlighting

---
 queries/ecma/highlights.scm |   3 ++
 queries/pug/highlights.scm  | 102 +++++++++++++++++++++++++++---------
 2 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 55ce8cb5b..9141c4691 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -166,6 +166,9 @@
   (super)
 ] @variable.builtin
 
+((identifier) @variable.builtin
+ (#eq? @variable.builtin "self"))
+
 [
   (true)
   (false)
diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index af860be04..57667885a 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -1,30 +1,80 @@
-(comment) @comment
+(comment) @comment @spell
+
 (tag_name) @tag
-(
-  (tag_name) @constant.builtin
-  ; https://www.script-example.com/html-tag-liste
-  (#any-of? @constant.builtin
-   "head" "title" "base" "link" "meta" "style"
-   "body" "article" "section" "nav" "aside" "h1" "h2" "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address"
-   "p" "hr" "pre" "blockquote" "ol" "ul" "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div"
-   "a" "em" "strong" "small" "s" "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i" "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr"
-   "ins" "del"
-   "picture" "source" "img" "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area"
-   "table" "caption" "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th "
-   "form" "label" "input" "button" "select" "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
-   "details" "summary" "dialog"
-   "script" "noscript" "template" "slot" "canvas")
-)
-(content) @none
-(quoted_attribute_value) @string
+((tag_name) @constant.builtin
+ ; https://www.script-example.com/html-tag-liste
+ (#any-of? @constant.builtin
+  "head" "title" "base" "link" "meta" "style"
+  "body" "article" "section" "nav" "aside" "h1" "h2" "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address"
+  "p" "hr" "pre" "blockquote" "ol" "ul" "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div"
+  "a" "em" "strong" "small" "s" "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i" "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr"
+  "ins" "del"
+  "picture" "source" "img" "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area"
+  "table" "caption" "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th "
+  "form" "label" "input" "button" "select" "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
+  "details" "summary" "dialog"
+  "script" "noscript" "template" "slot" "canvas"))
+
 (id) @constant
-(class) @constant
-(attribute_name) @symbol
-(
-  (attribute_name )  @keyword
-  (#match? @keyword "^(:|v-bind|v-|\\@)")
-) @keyword
+(class) @property
+
+(doctype) @preproc
+
+(content) @none
+
+(tag
+  (attributes
+    (attribute
+      (attribute_name) @tag.attribute
+      "=" @operator)))
+((tag
+   (attributes
+     (attribute (attribute_name) @keyword)))
+ (#match? @keyword "^(:|v-bind|v-|\\@)"))
+(quoted_attribute_value) @string
+
+(include (keyword) @include)
+(extends (keyword) @include)
+(filename) @string.special
+
+(block_definition (keyword) @keyword)
+(block_append (keyword)+ @keyword)
+(block_prepend (keyword)+ @keyword)
+(block_name) @type
+
+(conditional (keyword) @conditional)
+(case
+  (keyword) @conditional
+  (when (keyword) @conditional)+)
+
+(each (keyword) @repeat)
+(while (keyword) @repeat)
+
+(mixin_use
+  "+" @punctuation.delimiter
+  (mixin_name) @function.call)
+(mixin_definition
+  (keyword) @keyword.function
+  (mixin_name) @function)
+(mixin_attributes
+  (attribute_name) @parameter)
+
+(filter
+  ":" @punctuation.delimiter
+  (filter_name) @method.call)
+(filter
+  (attributes
+    (attribute (attribute_name) @parameter)))
 
 [
-  ":"
-] @punctuation.delimiter
+ "(" ")"
+ "#{" "}"
+ ;; unsupported
+ ; "!{"
+ ; "#[" "]"
+] @punctuation.bracket
+
+[ "," "." "|" ] @punctuation.delimiter
+(buffered_code "=" @punctuation.delimiter)
+(unbuffered_code "-" @punctuation.delimiter)
+(unescaped_buffered_code "!=" @punctuation.delimiter)

From f45ea99454ccf28b0d614ae2f3a309f78a9f6698 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 6 Jul 2023 21:42:51 -0400
Subject: [PATCH 0501/2704] feat: add Cairo

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/cairo/folds.scm         |  31 +++
 queries/cairo/highlights.scm    | 338 ++++++++++++++++++++++++++++++++
 queries/cairo/indents.scm       |  45 +++++
 queries/cairo/injections.scm    |   3 +
 queries/cairo/locals.scm        |  68 +++++++
 7 files changed, 496 insertions(+)
 create mode 100644 queries/cairo/folds.scm
 create mode 100644 queries/cairo/highlights.scm
 create mode 100644 queries/cairo/indents.scm
 create mode 100644 queries/cairo/injections.scm
 create mode 100644 queries/cairo/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 3cb685898..68863587d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -38,6 +38,9 @@
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
   },
+  "cairo": {
+    "revision": "ce7ae19dabb3fc0fb57773f6ac0a40af17adf46f"
+  },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7ec7195de..e0f798930 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -179,6 +179,14 @@ list.c_sharp = {
   maintainers = { "@Luxed" },
 }
 
+list.cairo = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-cairo",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.capnp = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-capnp",
diff --git a/queries/cairo/folds.scm b/queries/cairo/folds.scm
new file mode 100644
index 000000000..1c7af9fcf
--- /dev/null
+++ b/queries/cairo/folds.scm
@@ -0,0 +1,31 @@
+[
+  (mod_item)
+  (struct_item)
+  (trait_item)
+  (enum_item)
+  (impl_item)
+  (type_item)
+
+  (use_declaration)
+  (let_declaration)
+  (namespace_definition)
+
+  (arguments)
+  (implicit_arguments)
+  (tuple_type)
+
+  (import_statement)
+  (attribute_statement)
+  (with_statement)
+  (if_statement)
+
+  (function_definition)
+  (struct_definition)
+  (loop_expression)
+  (if_expression)
+  (match_expression)
+  (call_expression)
+  (tuple_expression)
+
+  (attribute_item)
+] @fold
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
new file mode 100644
index 000000000..0f68121ae
--- /dev/null
+++ b/queries/cairo/highlights.scm
@@ -0,0 +1,338 @@
+; Preproc
+
+[
+  "%builtins"
+  "%lang"
+] @preproc
+
+; Includes
+
+(import_statement [ "from" "import" ] @include module_name: (dotted_name (identifier) @namespace . ))
+
+[
+  "as"
+  "use"
+  "mod"
+] @include
+
+; Variables
+
+(identifier) @variable
+
+; Namespaces
+
+(namespace_definition (identifier) @namespace)
+
+(mod_item
+  name: (identifier) @namespace)
+
+(use_list (self) @namespace)
+
+(scoped_use_list (self) @namespace)
+
+(scoped_identifier
+  path: (identifier) @namespace)
+
+(scoped_identifier
+ (scoped_identifier
+  name: (identifier) @namespace))
+
+(scoped_type_identifier
+  path: (identifier) @namespace)
+
+((scoped_identifier
+  path: (identifier) @type)
+ (#lua-match? @type "^[A-Z]"))
+
+((scoped_identifier
+    name: (identifier) @type)
+ (#lua-match? @type "^[A-Z]"))
+
+((scoped_identifier
+    name: (identifier) @constant)
+ (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+
+((scoped_identifier
+  path: (identifier) @type
+  name: (identifier) @constant)
+  (#lua-match? @type "^[A-Z]")
+  (#lua-match? @constant "^[A-Z]"))
+
+((scoped_type_identifier
+  path: (identifier) @type
+  name: (type_identifier) @constant)
+  (#lua-match? @type "^[A-Z]")
+  (#lua-match? @constant "^[A-Z]"))
+
+(scoped_use_list
+  path: (identifier) @namespace)
+
+(scoped_use_list
+  path: (scoped_identifier
+          (identifier) @namespace))
+
+(use_list (scoped_identifier (identifier) @namespace . (_)))
+
+(use_list (identifier) @type (#lua-match? @type "^[A-Z]"))
+
+(use_as_clause alias: (identifier) @type (#lua-match? @type "^[A-Z]"))
+
+; Keywords
+
+[
+  ; 0.x
+  "using"
+  "namespace"
+  "struct"
+  "let"
+  "const"
+  "local"
+  "rel"
+  "abs"
+  "dw"
+  "alloc_locals"
+  (inst_ret)
+  "with_attr"
+  "with"
+  "call"
+  "nondet"
+
+  ; 1.0
+  "type"
+  "impl"
+  "implicits"
+  "of"
+  "ref"
+  "mut"
+  "trait"
+  "enum"
+] @keyword
+
+[
+  "func"
+  "fn"
+  "end"
+] @keyword.function
+
+"return" @keyword.return
+
+[
+  "cast"
+  "new"
+  "and"
+] @keyword.operator
+
+[
+  "tempvar"
+  "extern"
+] @storageclass
+
+[
+  "if"
+  "else"
+  "match"
+] @conditional
+
+[
+  "loop"
+] @repeat
+
+[
+  "assert"
+  "static_assert"
+  "nopanic"
+] @exception
+
+; Fields
+
+(implicit_arguments (typed_identifier (identifier) @field))
+
+(member_expression "." (identifier) @field)
+
+(call_expression (assignment_expression left: (identifier) @field))
+
+(tuple_expression (assignment_expression left: (identifier) @field))
+
+(field_identifier) @field
+
+(shorthand_field_initializer (identifier) @field)
+
+; Parameters
+
+(arguments (typed_identifier (identifier) @parameter))
+
+(call_expression (tuple_expression (assignment_expression left: (identifier) @parameter)))
+
+(return_type (tuple_type (named_type . (identifier) @parameter)))
+
+(parameter (identifier) @parameter)
+
+; Builtins
+
+(builtin_directive (identifier) @variable.builtin)
+(lang_directive (identifier) @variable.builtin)
+
+[
+  "ap"
+  "fp"
+  (self)
+] @variable.builtin
+
+; Functions
+
+(function_definition "func" (identifier) @function)
+(function_definition "fn" (identifier) @function)
+(function_signature "fn" (identifier) @function)
+(extern_function_statement (identifier) @function)
+
+(call_expression
+  function: (identifier) @function.call)
+
+(call_expression
+  function: (scoped_identifier
+              (identifier) @function.call .))
+
+(call_expression
+  function: (field_expression
+    field: (field_identifier) @function.call))
+
+[
+  "jmp"
+] @function.builtin
+
+; Types
+
+(struct_definition . (identifier) @type (typed_identifier (identifier) @field)?)
+
+(named_type (identifier) @type .)
+
+[
+  (builtin_type)
+  (primitive_type)
+] @type.builtin
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z][a-zA-Z0-9_]*$"))
+
+(type_identifier) @type
+
+; Constants
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z_][A-Z0-9_]*$"))
+
+(enum_variant
+  name: (identifier) @constant)
+
+(call_expression
+  function: (scoped_identifier
+    "::"
+    name: (identifier) @constant)
+  (#lua-match? @constant "^[A-Z]"))
+
+((match_arm
+   pattern: (match_pattern (identifier) @constant))
+ (#lua-match? @constant "^[A-Z]"))
+
+((match_arm
+   pattern: (match_pattern
+     (scoped_identifier
+       name: (identifier) @constant)))
+ (#lua-match? @constant "^[A-Z]"))
+
+((identifier) @constant.builtin
+ (#any-of? @constant.builtin "Some" "None" "Ok" "Err"))
+
+; Constructors
+
+(unary_expression "new" (call_expression . (identifier) @constructor))
+
+((call_expression . (identifier) @constructor)
+  (#lua-match? @constructor "^%u"))
+
+; Attributes
+
+(decorator "@" @attribute (identifier) @attribute)
+
+(attribute_item (identifier) @function.macro)
+
+(attribute_item (scoped_identifier (identifier) @function.macro .))
+
+; Labels
+
+(label . (identifier) @label)
+
+(inst_jmp_to_label "jmp" . (identifier) @label)
+
+(inst_jnz_to_label "jmp" . (identifier) @label)
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "**"
+  "=="
+  "!="
+  "&"
+  "="
+  "++"
+  "+="
+  "@"
+  "!"
+  "~"
+  ".."
+  "&&"
+  "||"
+  "^"
+  "<"
+  "<="
+  ">"
+  ">="
+  "<<"
+  ">>"
+  "%"
+  "-="
+  "*="
+  "/="
+  "%="
+  "&="
+  "|="
+  "^="
+  "<<="
+  ">>="
+  "?"
+] @operator
+
+; Literals
+
+(number) @number
+
+(boolean) @boolean
+
+[
+  (string)
+  (short_string)
+] @string
+
+; Punctuation
+
+(attribute_item "#" @punctuation.special)
+
+[ "." "," ":" ";" "->" "=>" "::" ] @punctuation.delimiter
+
+[ "{" "}" "(" ")" "[" "]" "%{" "%}" ] @punctuation.bracket
+
+(type_parameters [ "<" ">" ] @punctuation.bracket)
+
+(type_arguments [ "<" ">" ] @punctuation.bracket)
+
+; Comment
+
+(comment) @comment @spell
+
+; Errors
+
+(ERROR) @error
diff --git a/queries/cairo/indents.scm b/queries/cairo/indents.scm
new file mode 100644
index 000000000..76a22e705
--- /dev/null
+++ b/queries/cairo/indents.scm
@@ -0,0 +1,45 @@
+[
+  (mod_item)
+  (struct_item)
+  (enum_item)
+  (impl_item)
+  (struct_expression)
+  (match_expression)
+  (tuple_expression)
+  (match_arm)
+  (match_block)
+  (call_expression)
+  (assignment_expression)
+  (arguments)
+  (block)
+  (use_list)
+  (field_declaration_list)
+  (enum_variant_list)
+  (tuple_pattern)
+] @indent.begin
+
+(import_statement "(") @indent.begin
+
+(block "}" @indent.end)
+(enum_item
+  body: (enum_variant_list "}" @indent.end))
+(match_expression
+  body: (match_block "}" @indent.end))
+(mod_item
+  body: (declaration_list "}" @indent.end))
+(struct_item
+  body: (field_declaration_list "}" @indent.end))
+(trait_item
+  body: (declaration_list "}" @indent.end))
+
+[
+  ")"
+  "]"
+  "}"
+] @indent.branch
+
+[
+  (comment)
+  (string)
+  (short_string)
+] @indent.ignore
diff --git a/queries/cairo/injections.scm b/queries/cairo/injections.scm
new file mode 100644
index 000000000..675a81a76
--- /dev/null
+++ b/queries/cairo/injections.scm
@@ -0,0 +1,3 @@
+(python_code) @python
+
+(comment) @comment
diff --git a/queries/cairo/locals.scm b/queries/cairo/locals.scm
new file mode 100644
index 000000000..53b33c01d
--- /dev/null
+++ b/queries/cairo/locals.scm
@@ -0,0 +1,68 @@
+; References
+
+(identifier) @reference
+((type_identifier) @reference
+  (#set! reference.kind "type"))
+((field_identifier) @reference
+  (#set! reference.kind "field"))
+
+; Scopes
+
+[
+  (program)
+  (block)
+  (function_definition)
+  (loop_expression)
+  (if_expression)
+  (match_expression)
+  (match_arm)
+
+  (struct_item)
+  (enum_item)
+  (impl_item)
+] @scope
+
+(use_declaration 
+  argument: (scoped_identifier 
+              name: (identifier) @definition.import))
+
+(use_as_clause 
+  alias: (identifier) @definition.import)
+
+(use_list
+    (identifier) @definition.import) ; use std::process::{Child, Command, Stdio};
+
+; Functions
+
+(function_definition
+    (identifier) @definition.function)
+
+(function_definition
+  (identifier) @definition.method
+  (parameter (self)))
+
+; Function with parameters, defines parameters
+
+(parameter
+  [ (identifier) (self) ]  @definition.parameter)
+
+; Types
+
+(struct_item
+  name: (type_identifier) @definition.type)
+
+(constrained_type_parameter 
+  left: (type_identifier) @definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
+
+(enum_item
+  name: (type_identifier) @definition.type)
+
+; Module
+
+(mod_item 
+  name: (identifier) @definition.namespace)
+
+; Variables
+
+(assignment_expression
+ left: (identifier) @definition.var)

From 11c685b3545d7f77e1a42cdf8257b288eef5c130 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sat, 8 Jul 2023 08:30:31 +0000
Subject: [PATCH 0502/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6531affed..ef99c66f0 100644
--- a/README.md
+++ b/README.md
@@ -186,6 +186,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @Luxed)
+- [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
 - [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
 - [x] [clojure](https://github.com/sogaiu/tree-sitter-clojure) (maintained by @sogaiu)

From dcf46d07cc07c5f801bb8488502b2e7953e6e7c8 Mon Sep 17 00:00:00 2001
From: Sergio Alejandro Vargas <savargasqu+git@unal.edu.co>
Date: Wed, 5 Jul 2023 18:14:04 -0500
Subject: [PATCH 0503/2704] Update Julia queries

---
 lockfile.json                | 2 +-
 queries/julia/highlights.scm | 5 ++---
 queries/julia/injections.scm | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 68863587d..b53a86fd2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -270,7 +270,7 @@
     "revision": "fdc775714afa27fdef823adbaba6ab98f5ae66f2"
   },
   "julia": {
-    "revision": "4d4dc7d8a4ad3856200a9ef151f9056fc14cec8b"
+    "revision": "8e5ce1e5a96e8dfe0b0eee74633f5ba2766bf48b"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 53c8aeb27..4b83f1714 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -48,7 +48,7 @@
 ;; Builtins
 
 ((identifier) @function.builtin
-  (#any-of? @function.builtin 
+  (#any-of? @function.builtin
   "_abstracttype" "_apply_iterate" "_apply_pure" "_call_in_world" "_call_in_world_total"
   "_call_latest" "_equiv_typedef" "_expr" "_primitivetype" "_setsuper!" "_structtype"
   "_typebody!" "_typevar" "applicable" "apply_type" "arrayref" "arrayset" "arraysize"
@@ -85,7 +85,6 @@
 (struct_definition
   name: (identifier) @type)
 (type_clause
-  ["<:" ">:"] @operator
   [(identifier) @type
     (field_expression (identifier) @type .)])
 
@@ -288,7 +287,7 @@
       (struct_definition)
       (function_definition)
       (assignment)
-      (const_declaration)
+      (const_statement)
     ])
 
 [
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 259395da5..435e5f0fb 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -6,7 +6,7 @@
     (struct_definition)
     (function_definition)
     (assignment)
-    (const_declaration)
+    (const_statement)
   ]
  (#lua-match? @markdown "^\"\"\"")
  (#offset! @markdown 0 3 0 -3))

From d9104a1d10023ed9e7eacf68639ad887425246eb Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 8 Jul 2023 09:26:07 +0000
Subject: [PATCH 0504/2704] Update parsers: arduino, cairo, nix, ocaml,
 ocaml_interface, verilog, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b53a86fd2..74212bdbd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "bf0db73db96ec02f872cb7b5058dcc8bfd8fe714"
+    "revision": "787bc6e1ca23092821231f6096438343f728ee6f"
   },
   "astro": {
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
@@ -39,7 +39,7 @@
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
   },
   "cairo": {
-    "revision": "ce7ae19dabb3fc0fb57773f6ac0a40af17adf46f"
+    "revision": "02ec1461f11aa126d3c16abb2da284ca3ba15631"
   },
   "capnp": {
     "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
@@ -336,7 +336,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "02878b40ac77d2889833519c6b6e9e63cfc690e6"
+    "revision": "14b53610c9038500066c509b2e67de04775b97fe"
   },
   "norg": {
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
@@ -345,10 +345,10 @@
     "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
   },
   "ocaml": {
-    "revision": "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74"
+    "revision": "4e672f346fde683d506289bb191523c747205d7a"
   },
   "ocaml_interface": {
-    "revision": "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74"
+    "revision": "4e672f346fde683d506289bb191523c747205d7a"
   },
   "ocamllex": {
     "revision": "62118551bd9501b8253598b835cb4bef04b31e3d"
@@ -552,7 +552,7 @@
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
   },
   "verilog": {
-    "revision": "4457145e795b363f072463e697dfe2f6973c9a52"
+    "revision": "22f9b845c77c52b86b21adaebe689864957f4e31"
   },
   "vhs": {
     "revision": "fec6e981b7795b68262ddf229d73d2aa03a89b9a"
@@ -573,7 +573,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "c4a42cd02490e52cb9ba517f88f6636327f2bc82"
+    "revision": "eeb6325378b4de68a6889774efc34a73ba84f9b4"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 62e29fc03ef4f772bfad59e342600c6214bdfc57 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 9 Jul 2023 11:11:30 +0200
Subject: [PATCH 0505/2704] fix(ocaml): adapt to scanner rewrite

---
 lockfile.json                   | 4 ++--
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 74212bdbd..6e749213c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -345,10 +345,10 @@
     "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
   },
   "ocaml": {
-    "revision": "4e672f346fde683d506289bb191523c747205d7a"
+    "revision": "7a61e11f8e44b4edee23adb15a187c9dd2beecef"
   },
   "ocaml_interface": {
-    "revision": "4e672f346fde683d506289bb191523c747205d7a"
+    "revision": "7a61e11f8e44b4edee23adb15a187c9dd2beecef"
   },
   "ocamllex": {
     "revision": "62118551bd9501b8253598b835cb4bef04b31e3d"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e0f798930..86f846420 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1045,7 +1045,7 @@ list.objc = {
 list.ocaml = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-ocaml",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     location = "ocaml",
   },
   maintainers = { "@undu" },
@@ -1054,7 +1054,7 @@ list.ocaml = {
 list.ocaml_interface = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-ocaml",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     location = "interface",
   },
   filetype = "ocamlinterface",

From 572a15f171ce1a69ed91ea642ae77af5b5d295fb Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 9 Jul 2023 09:27:01 +0000
Subject: [PATCH 0506/2704] Update parsers: awk, julia, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6e749213c..a8265c9be 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
   },
   "awk": {
-    "revision": "16e6fd822a5efa654d0a1ad7122aa1cc5e489cff"
+    "revision": "476b1a0f3de58c31cde57317c744059ca6792e52"
   },
   "bash": {
     "revision": "493646764e7ad61ce63ce3b8c59ebeb37f71b841"
@@ -270,7 +270,7 @@
     "revision": "fdc775714afa27fdef823adbaba6ab98f5ae66f2"
   },
   "julia": {
-    "revision": "8e5ce1e5a96e8dfe0b0eee74633f5ba2766bf48b"
+    "revision": "784364cb9185ef8dc245de4b0b51e3a22503419d"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -573,7 +573,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "eeb6325378b4de68a6889774efc34a73ba84f9b4"
+    "revision": "8b4843a1c432d42e00a28f7eafb81a9f591fecb3"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From d2f2aa8a2f21de1da862fa4028af80fb41f77ac0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 10 Jul 2023 02:58:16 -0400
Subject: [PATCH 0507/2704] fix(ocamllex): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a8265c9be..08833742a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -351,7 +351,7 @@
     "revision": "7a61e11f8e44b4edee23adb15a187c9dd2beecef"
   },
   "ocamllex": {
-    "revision": "62118551bd9501b8253598b835cb4bef04b31e3d"
+    "revision": "fab854a2de25b2284582bf7ed7f9970d19988c73"
   },
   "odin": {
     "revision": "d165dbee27617dab2653e38737d96ede1030d14f"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 86f846420..ed8e5718d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1064,7 +1064,7 @@ list.ocaml_interface = {
 list.ocamllex = {
   install_info = {
     url = "https://github.com/atom-ocaml/tree-sitter-ocamllex",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     requires_generate_from_grammar = true,
   },
   maintainers = { "@undu" },

From f2efc5f35743b8383a1b50f727faae94658506d5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 10 Jul 2023 07:24:01 +0000
Subject: [PATCH 0508/2704] Update parsers: astro, awk, ocaml, ocaml_interface,
 wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 08833742a..d47fe65c2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,10 +9,10 @@
     "revision": "787bc6e1ca23092821231f6096438343f728ee6f"
   },
   "astro": {
-    "revision": "a4535d1530558866a543c1660c90c57fbf2fd709"
+    "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
   },
   "awk": {
-    "revision": "476b1a0f3de58c31cde57317c744059ca6792e52"
+    "revision": "7fef05082d7aeb4e9dc0d9dca2695056b28ce6a8"
   },
   "bash": {
     "revision": "493646764e7ad61ce63ce3b8c59ebeb37f71b841"
@@ -345,10 +345,10 @@
     "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
   },
   "ocaml": {
-    "revision": "7a61e11f8e44b4edee23adb15a187c9dd2beecef"
+    "revision": "3ad4d7988edf8b8a9780a1db7a5af657911dbfba"
   },
   "ocaml_interface": {
-    "revision": "7a61e11f8e44b4edee23adb15a187c9dd2beecef"
+    "revision": "3ad4d7988edf8b8a9780a1db7a5af657911dbfba"
   },
   "ocamllex": {
     "revision": "fab854a2de25b2284582bf7ed7f9970d19988c73"
@@ -573,7 +573,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "8b4843a1c432d42e00a28f7eafb81a9f591fecb3"
+    "revision": "210e492e7729cdadd326123949bd5eed73065cf3"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 90581acf873c62e72931bc7f4a070790e85cc131 Mon Sep 17 00:00:00 2001
From: "Sergio A. Vargas" <savargasqu+git@unal.edu.co>
Date: Mon, 10 Jul 2023 13:13:17 -0500
Subject: [PATCH 0509/2704] feat(ecma): highlight regex flags

---
 queries/ecma/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 9141c4691..6cbc88d84 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -193,6 +193,7 @@
 (template_string) @string
 (escape_sequence) @string.escape
 (regex_pattern) @string.regex
+(regex_flags) @character.special
 (regex "/" @punctuation.bracket) ; Regex delimiters
 
 (number) @number

From e811a62e2f1602d42aff4e51236a3ef1e9775944 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 11 Jul 2023 05:25:04 +0000
Subject: [PATCH 0510/2704] Update parsers: bash, c, css, html, json, objc,
 php, python, sql, wing

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d47fe65c2..00dca9132 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "7fef05082d7aeb4e9dc0d9dca2695056b28ce6a8"
   },
   "bash": {
-    "revision": "493646764e7ad61ce63ce3b8c59ebeb37f71b841"
+    "revision": "1b0321ee85701d5036c334a6f04761cdc672e64c"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "84bdf409067676dd5c003b2a7cb7760456e731bf"
+    "revision": "a60f1ddef4702fc8a82a9bfc207d0cf453d748bb"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -72,7 +72,7 @@
     "revision": "0e7b7a02b6074859b51c1973eb6a8275b3315b1d"
   },
   "css": {
-    "revision": "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"
+    "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
     "revision": "c9ba632aa68d24f32d2f97e356795f45f85e6c55"
@@ -228,7 +228,7 @@
     "revision": "89271dfe18f20aa71cbe5ef813252a8f98901240"
   },
   "html": {
-    "revision": "d2592b006e5270a281c6bafdbcb3768cd97fa47a"
+    "revision": "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"
   },
   "htmldjango": {
     "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"
@@ -258,7 +258,7 @@
     "revision": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"
   },
   "json": {
-    "revision": "40a81c01a40ac48744e0c8ccabbaba1920441199"
+    "revision": "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f"
   },
   "json5": {
     "revision": "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"
@@ -342,7 +342,7 @@
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
   "objc": {
-    "revision": "0612ff9874bf376db4ae92b9f46ddcd4bdec1342"
+    "revision": "6d876afade2d5e70d394aaf994321c78297e3607"
   },
   "ocaml": {
     "revision": "3ad4d7988edf8b8a9780a1db7a5af657911dbfba"
@@ -372,7 +372,7 @@
     "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
   },
   "php": {
-    "revision": "d38adb26304d9b9d38e9a3b4aae0ec4b29bf9462"
+    "revision": "d43130fd1525301e9826f420c5393a4d169819fc"
   },
   "phpdoc": {
     "revision": "2d20f39476348c2682761ce7251914031a7c013f"
@@ -405,7 +405,7 @@
     "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
   },
   "python": {
-    "revision": "36f9e33d52b7572536ac1a8af8d7e78363ad52c3"
+    "revision": "db1d218a4f8fb87145aabeb22ca3c35925c411fc"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -474,7 +474,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "dd5fe7713cec874506c6f75409ce03776748b146"
+    "revision": "e08036ee4928b32fbebe55ac9336f81b7389e107"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -573,7 +573,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "210e492e7729cdadd326123949bd5eed73065cf3"
+    "revision": "755aef4e57da4a00da47e85b6aff976b007d500c"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 330da0ff07be4a68c96ab02ad0c03c87070614a3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 11 Jul 2023 07:40:25 +0200
Subject: [PATCH 0511/2704] ci: bump actions to latest

---
 .github/workflows/lint.yml            | 2 +-
 .github/workflows/update-lockfile.yml | 2 +-
 .github/workflows/update-readme.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9f380e1c5..121526c60 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Lint with stylua
-        uses: JohnnyMorganz/stylua-action@v2
+        uses: JohnnyMorganz/stylua-action@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: latest
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 5a29d32b7..a1b910e3b 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -48,7 +48,7 @@ jobs:
           git clean -xf
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
           branch: update-lockfile-pr
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 8867da0fc..c8673a6a0 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -33,7 +33,7 @@ jobs:
           git clean -xf
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Update README
           title: Update README

From d186a9e95a478fa60e1bef86790c8787e7440d0e Mon Sep 17 00:00:00 2001
From: Jacob Pfeifer <jacob@pfeifer.dev>
Date: Tue, 11 Jul 2023 02:18:26 -0400
Subject: [PATCH 0512/2704] feat: add Hurl

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>

---------

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>
---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/hurl/folds.scm          |  20 +++++
 queries/hurl/highlights.scm     | 133 ++++++++++++++++++++++++++++++++
 queries/hurl/indents.scm        |  14 ++++
 queries/hurl/injections.scm     |   7 ++
 scripts/minimal_init.lua        |   1 +
 7 files changed, 186 insertions(+)
 create mode 100644 queries/hurl/folds.scm
 create mode 100644 queries/hurl/highlights.scm
 create mode 100644 queries/hurl/indents.scm
 create mode 100644 queries/hurl/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 00dca9132..48265531e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -236,6 +236,9 @@
   "http": {
     "revision": "6824a247d1326079aab4fa9f9164e9319678081d"
   },
+  "hurl": {
+    "revision": "0eca909c8338364992e04c4862ac6afc5342cbb8"
+  },
   "ini": {
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ed8e5718d..a9e2f48c8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -737,6 +737,14 @@ list.http = {
   maintainers = { "@amaanq" },
 }
 
+list.hurl = {
+  install_info = {
+    url = "https://github.com/pfeiferj/tree-sitter-hurl",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@pfeiferj" },
+}
+
 list.ini = {
   install_info = {
     url = "https://github.com/justinmk/tree-sitter-ini",
diff --git a/queries/hurl/folds.scm b/queries/hurl/folds.scm
new file mode 100644
index 000000000..d7b8cd6cd
--- /dev/null
+++ b/queries/hurl/folds.scm
@@ -0,0 +1,20 @@
+; fold.scm
+
+[
+  (comment)
+  (entry)
+  (request)
+  (response)
+  (header)
+  (request_section)
+  (body)
+  (response_section)
+  (multipart_form_data_section)
+  (cookies_section)
+  (captures_section)
+  (asserts_section)
+  (options_section)
+  (basic_auth_section)
+  (json_object)
+  (json_array)
+] @fold
diff --git a/queries/hurl/highlights.scm b/queries/hurl/highlights.scm
new file mode 100644
index 000000000..a32f1965b
--- /dev/null
+++ b/queries/hurl/highlights.scm
@@ -0,0 +1,133 @@
+; highlights.scm
+
+[ 
+  "[QueryStringParams]"
+  "[FormParams]"
+  "[MultipartFormData]"
+  "[Cookies]"
+  "[Captures]"
+  "[Asserts]"
+  "[Options]"
+  "[BasicAuth]"
+  (key_string)
+  (json_key_string)
+] @property
+
+[ 
+  "\\"
+  (regex_escaped_char)
+  (quoted_string_escaped_char)
+  (key_string_escaped_char)
+  (value_string_escaped_char)
+  (oneline_string_escaped_char)
+  (multiline_string_escaped_char)
+  (filename_escaped_char)
+  (json_string_escaped_char)
+] @string.escape
+
+[
+  "status"
+  "url"
+  "header"
+  "cookie"
+  "body"
+  "xpath"
+  "jsonpath"
+  "regex"
+  "variable"
+  "duration"
+  "sha256"
+  "md5"
+  "bytes"
+] @function.builtin
+
+[
+  "null"
+  "cacert"
+  "compressed"
+  "location"
+  "insecure"
+  "path-as-is"
+  "proxy"
+  "max-redirs"
+  "retry"
+  "retry-interval"
+  "retry-max-count"
+  (variable_option "variable")
+  "verbose"
+  "very-verbose"
+] @constant.builtin
+
+(boolean) @boolean
+
+(variable_name) @variable
+
+[
+  "not"
+  "equals"
+  "notEquals"
+  "greaterThan"
+  "greaterThanOrEquals"
+  "lessThan"
+  "lessThanOrEquals"
+  "startsWith"
+  "endsWith"
+  "contains"
+  "matches"
+  "exists"
+  "includes"
+  "isInteger"
+  "isFloat"
+  "isBoolean"
+  "isString"
+  "isCollection"
+] @keyword.operator
+
+[
+  "=="
+  "!="
+  ">"
+  ">="
+  "<"
+  "<="
+] @operator
+
+[
+  (integer)
+  (status)
+] @number
+
+[
+  (float)
+  (json_number)
+] @float
+
+[ ":" "," ] @punctuation.delimiter
+
+[ "[" "]" "{" "}" "{{" "}}" ] @punctuation.bracket
+
+[ 
+  (value_string)
+  (quoted_string)
+  (json_string)
+] @string
+
+
+[
+  "base64,"
+  "file,"
+  "hex,"
+  (file_value)
+  (version)
+] @string.special
+
+(regex) @string.regex
+
+(multiline_string_type) @type
+
+(comment) @comment @spell
+
+(filter) @attribute
+
+(method) @type.builtin
+
diff --git a/queries/hurl/indents.scm b/queries/hurl/indents.scm
new file mode 100644
index 000000000..232cfc01a
--- /dev/null
+++ b/queries/hurl/indents.scm
@@ -0,0 +1,14 @@
+; indents.scm
+
+[
+  (json_object)
+  (json_array)
+] @indent.begin
+
+[
+  "}"
+  "]"
+] @indent.branch
+
+(xml_tag) @indent.begin
+(xml_close_tag) @indent.branch
diff --git a/queries/hurl/injections.scm b/queries/hurl/injections.scm
new file mode 100644
index 000000000..933633e03
--- /dev/null
+++ b/queries/hurl/injections.scm
@@ -0,0 +1,7 @@
+; injections.scm
+(json_value) @json
+(xml) @html
+
+(multiline_string
+  (multiline_string_type) @language
+  (multiline_string_content) @content)
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index e650a0dd8..f7a7ee590 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -6,6 +6,7 @@ vim.filetype.add {
   extension = {
     conf = "hocon",
     cmm = "t32",
+    hurl = "hurl",
     ncl = "nickel",
     tig = "tiger",
     usd = "usd",

From 3af1220e18034eb2ce7d1c8e77055bc3bf3c1c36 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Jul 2023 06:32:36 +0000
Subject: [PATCH 0513/2704] Update README

Co-authored-by: Github Actions <actions@github>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ef99c66f0..275c64116 100644
--- a/README.md
+++ b/README.md
@@ -252,6 +252,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [html](https://github.com/tree-sitter/tree-sitter-html) (maintained by @TravonteD)
 - [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq)
+- [x] [hurl](https://github.com/pfeiferj/tree-sitter-hurl) (maintained by @pfeiferj)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
 - [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)

From b4b94ec387525cb9df4b56eb1a8bf33231a0df47 Mon Sep 17 00:00:00 2001
From: Long Wang <wangl.cc@outlook.com>
Date: Tue, 11 Jul 2023 16:00:20 +0800
Subject: [PATCH 0514/2704] feat(julia): highlight docstrings before short
 function definitions

---
 queries/julia/highlights.scm | 1 +
 queries/julia/injections.scm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 4b83f1714..9ec16a060 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -286,6 +286,7 @@
       (abstract_definition)
       (struct_definition)
       (function_definition)
+      (short_function_definition)
       (assignment)
       (const_statement)
     ])
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 435e5f0fb..0dfd323ff 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -5,6 +5,7 @@
     (abstract_definition)
     (struct_definition)
     (function_definition)
+    (short_function_definition)
     (assignment)
     (const_statement)
   ]

From 08aabb145f93ed1dd607ce8e2dcd52d356822300 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq@macbook-air.myfiosgateway.com>
Date: Wed, 12 Jul 2023 07:01:36 -0400
Subject: [PATCH 0515/2704] chore: update Regex from upstream

---
 lockfile.json                | 2 +-
 queries/regex/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 48265531e..f3f92b5c5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -432,7 +432,7 @@
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "regex": {
-    "revision": "e1cfca3c79896ff79842f057ea13e529b66af636"
+    "revision": "ab4eb4b702b8bf99e40a34c54bda6083cec16e10"
   },
   "rego": {
     "revision": "b2667c975f07b33be3ceb83bea5cfbad88095866"
diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index 3f5ee8515..8277d6d7e 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -31,4 +31,4 @@
  (non_boundary_assertion)
 ] @string.escape
 
-[ "*" "+" "?" "|" "=" "<=" "!" "<!" ] @operator
+[ "*" "+" "?" "|" "=" "!" ] @operator

From 823e67a1c9452075ec7f01e7aa05ac6e7b41fb1e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq@macbook-air.myfiosgateway.com>
Date: Wed, 12 Jul 2023 07:09:54 -0400
Subject: [PATCH 0516/2704] chore: update JSX from upstream

---
 lockfile.json              |  6 +++---
 queries/jsx/highlights.scm | 11 +++++------
 queries/jsx/indents.scm    |  9 ++-------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f3f92b5c5..c37211fd2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -252,7 +252,7 @@
     "revision": "c194ee5e6ede5f26cf4799feead4a8f165dcf14d"
   },
   "javascript": {
-    "revision": "5720b249490b3c17245ba772f6be4a43edb4e3b7"
+    "revision": "f772967f7b7bc7c28f845be2420a38472b16a8ee"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -528,7 +528,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "3429d8c77d7a83e80032667f0642e6cb19d0c772"
+    "revision": "51c4c9eb5387c6e42fdb02f22fe68d408c89952b"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -537,7 +537,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "3429d8c77d7a83e80032667f0642e6cb19d0c772"
+    "revision": "51c4c9eb5387c6e42fdb02f22fe68d408c89952b"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 1f19c6b2a..718add87f 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -1,9 +1,8 @@
 (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)
+  close_tag: (jsx_closing_element ["</" ">"] @tag.delimiter))
+(jsx_self_closing_element ["<" "/>"] @tag.delimiter)
 (jsx_attribute (property_identifier) @tag.attribute)
 
 (jsx_opening_element
@@ -19,18 +18,18 @@
  (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component>
-(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+(jsx_opening_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
 
 (jsx_closing_element ((identifier) @constructor
  (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - </My.Component>
-(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+(jsx_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
 
 (jsx_self_closing_element ((identifier) @constructor
  (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component />
-(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+(jsx_self_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
 
 (jsx_text) @none
diff --git a/queries/jsx/indents.scm b/queries/jsx/indents.scm
index 3355061e1..c0dd53281 100644
--- a/queries/jsx/indents.scm
+++ b/queries/jsx/indents.scm
@@ -1,16 +1,11 @@
 [
-  (jsx_fragment)
   (jsx_element)
   (jsx_self_closing_element)
   (jsx_expression)
 ] @indent.begin
 
-(jsx_fragment
-  ("<" ">" (_) "<" @indent.branch "/" ">" @indent.end)
-)
-
 (jsx_closing_element (">" @indent.end))
-(jsx_self_closing_element ">" @indent.end)
+(jsx_self_closing_element "/>" @indent.end)
 
 [
   (jsx_closing_element)
@@ -18,4 +13,4 @@
 ] @indent.branch
 ; <button
 ; />
-(jsx_self_closing_element "/" @indent.branch)
+(jsx_self_closing_element "/>" @indent.branch)

From 575f5a4b1fcb60c1ac4f560c46a5171454d674ca Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 12 Jul 2023 13:54:20 +0000
Subject: [PATCH 0517/2704] Update parsers: gitattributes, go, ocaml,
 ocaml_interface, ocamllex, python, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c37211fd2..7b9e63ad8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -159,7 +159,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "577a075d46ea109905c5cb6179809df88da61ce9"
+    "revision": "19c716d2f45eac9529703413dc12aa8c76d13adc"
   },
   "gitcommit": {
     "revision": "6856a5fd0ffeff17d83325a8ce4e57811010eff1"
@@ -177,7 +177,7 @@
     "revision": "53ca269cae2a47b1b75791e2bfe843baeb02e903"
   },
   "go": {
-    "revision": "7a4edcbc376302efa8d6ba7e235070ab7ee3c4c8"
+    "revision": "8c8007eaee47702bb0291a3c7aeb004909baab4d"
   },
   "godot_resource": {
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
@@ -348,13 +348,13 @@
     "revision": "6d876afade2d5e70d394aaf994321c78297e3607"
   },
   "ocaml": {
-    "revision": "3ad4d7988edf8b8a9780a1db7a5af657911dbfba"
+    "revision": "fa4a8175a005a35c934ab36c4e4887d217061b2e"
   },
   "ocaml_interface": {
-    "revision": "3ad4d7988edf8b8a9780a1db7a5af657911dbfba"
+    "revision": "fa4a8175a005a35c934ab36c4e4887d217061b2e"
   },
   "ocamllex": {
-    "revision": "fab854a2de25b2284582bf7ed7f9970d19988c73"
+    "revision": "c8f90e42e1b9cf9e30b1669c386b8d9de992d201"
   },
   "odin": {
     "revision": "d165dbee27617dab2653e38737d96ede1030d14f"
@@ -408,7 +408,7 @@
     "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
   },
   "python": {
-    "revision": "db1d218a4f8fb87145aabeb22ca3c35925c411fc"
+    "revision": "538a5322047be6af79c246b6253f2e6e26680fad"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -576,7 +576,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "755aef4e57da4a00da47e85b6aff976b007d500c"
+    "revision": "8d973d1749d5f11aae4d45e1c1eb0b145dc4067f"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From a51236f068547487ed34c3a32d9a0b3bf793afa7 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 13 Jul 2023 06:39:51 +0000
Subject: [PATCH 0518/2704] Update parsers: nix, phpdoc, python, tsx,
 typescript, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7b9e63ad8..35573ed57 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -339,7 +339,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "14b53610c9038500066c509b2e67de04775b97fe"
+    "revision": "66e3e9ce9180ae08fc57372061006ef83f0abde7"
   },
   "norg": {
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
@@ -378,7 +378,7 @@
     "revision": "d43130fd1525301e9826f420c5393a4d169819fc"
   },
   "phpdoc": {
-    "revision": "2d20f39476348c2682761ce7251914031a7c013f"
+    "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
@@ -408,7 +408,7 @@
     "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
   },
   "python": {
-    "revision": "538a5322047be6af79c246b6253f2e6e26680fad"
+    "revision": "7c8930b6388b5590ebef248853f144185a9eda1d"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -528,7 +528,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "51c4c9eb5387c6e42fdb02f22fe68d408c89952b"
+    "revision": "6e695f4148a3ea96f0678513a10ebb5e52e8f352"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -537,7 +537,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "51c4c9eb5387c6e42fdb02f22fe68d408c89952b"
+    "revision": "6e695f4148a3ea96f0678513a10ebb5e52e8f352"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -576,7 +576,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "8d973d1749d5f11aae4d45e1c1eb0b145dc4067f"
+    "revision": "0e7781afec05f9d4240a918a3b0bbe508953cff5"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 39f10b0b14184f746a0c9e7475c5ea81a9a812f6 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 14 Jul 2023 06:41:01 +0000
Subject: [PATCH 0519/2704] Update parsers: c, capnp, cuda, glsl, hlsl, java,
 julia, perl, sql, swift, tablegen, wing

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 35573ed57..fccc9e2c1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "a60f1ddef4702fc8a82a9bfc207d0cf453d748bb"
+    "revision": "693d298099a01a5d6cad589fe1c2c8836a6f7702"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -42,7 +42,7 @@
     "revision": "02ec1461f11aa126d3c16abb2da284ca3ba15631"
   },
   "capnp": {
-    "revision": "7d5fa4e94d3643ec15750106113be0d40f9fc1bb"
+    "revision": "2611be13e6fe86eee1190c9c5c0faed05e136905"
   },
   "chatito": {
     "revision": "3baf22e7e507cedf15d1dbc03df8afa50a625586"
@@ -75,7 +75,7 @@
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "c9ba632aa68d24f32d2f97e356795f45f85e6c55"
+    "revision": "c5befe09c99f5e88190574676ffa8eb29775d410"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -174,7 +174,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "53ca269cae2a47b1b75791e2bfe843baeb02e903"
+    "revision": "7d76863f2126ed3b246fead68f9591760d546c94"
   },
   "go": {
     "revision": "8c8007eaee47702bb0291a3c7aeb004909baab4d"
@@ -219,7 +219,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "ddb608219fa99d56ed98de2d60f396f575cc6590"
+    "revision": "b8fab02e808bab41c49829fb5e4fb0ce7eab8d1a"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -249,7 +249,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "c194ee5e6ede5f26cf4799feead4a8f165dcf14d"
+    "revision": "7c9964a417ef0092ff3880d65a145ab0d9e8e706"
   },
   "javascript": {
     "revision": "f772967f7b7bc7c28f845be2420a38472b16a8ee"
@@ -273,7 +273,7 @@
     "revision": "fdc775714afa27fdef823adbaba6ab98f5ae66f2"
   },
   "julia": {
-    "revision": "784364cb9185ef8dc245de4b0b51e3a22503419d"
+    "revision": "d68ded9d5131878a2a06211ef0b47b72e70c6c08"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -372,7 +372,7 @@
     "revision": "3662443335bc95bac0168a338b0f29f87162c244"
   },
   "perl": {
-    "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
+    "revision": "fe79f0031246ecdff078fd02528a183463282c75"
   },
   "php": {
     "revision": "d43130fd1525301e9826f420c5393a4d169819fc"
@@ -477,7 +477,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "e08036ee4928b32fbebe55ac9336f81b7389e107"
+    "revision": "243de36808818b2fc81631fbada9d3ff9d46c465"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -495,7 +495,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "56ecc996e5765054fc25cdae5fbddfd75a64287b"
+    "revision": "29541ac9bbe2090de75d0b1e70360b85bbda1fef"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -504,7 +504,7 @@
     "revision": "4e581fcd17d76651aa92759a68f9a8186b9fe8dc"
   },
   "tablegen": {
-    "revision": "e5e046e1b221e25111175469f02f3cf336010857"
+    "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
   },
   "teal": {
     "revision": "2158ecce11ea542f9b791baf2c7fb33798174ed2"
@@ -576,7 +576,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "0e7781afec05f9d4240a918a3b0bbe508953cff5"
+    "revision": "903d15758f3242ec2e1b27ec5a4253f2c2a2b7ff"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 12d970f8aea7eed4d98727b3234ab098ddde3576 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 15 Jul 2023 10:10:09 +0000
Subject: [PATCH 0520/2704] Update parsers: capnp, elixir, java, perl, puppet,
 regex, sql, tsx, typescript, uxntal, wing

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fccc9e2c1..d6f7adec5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -42,7 +42,7 @@
     "revision": "02ec1461f11aa126d3c16abb2da284ca3ba15631"
   },
   "capnp": {
-    "revision": "2611be13e6fe86eee1190c9c5c0faed05e136905"
+    "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
     "revision": "3baf22e7e507cedf15d1dbc03df8afa50a625586"
@@ -108,7 +108,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "7be390548a870ca9cb1bd7f59ac92457bbec7bf5"
+    "revision": "59a2ba5c0d768f8a7a6de8caa7f523d03ec6b647"
   },
   "elm": {
     "revision": "73edfcdc3bb2ddfc731cd5d63e6cb287a18da90d"
@@ -249,7 +249,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "7c9964a417ef0092ff3880d65a145ab0d9e8e706"
+    "revision": "6c8329e2da78fae78e87c3c6f5788a2b005a4afc"
   },
   "javascript": {
     "revision": "f772967f7b7bc7c28f845be2420a38472b16a8ee"
@@ -372,7 +372,7 @@
     "revision": "3662443335bc95bac0168a338b0f29f87162c244"
   },
   "perl": {
-    "revision": "fe79f0031246ecdff078fd02528a183463282c75"
+    "revision": "4a023763f54dec0a6f986f5bd238af788a3f0584"
   },
   "php": {
     "revision": "d43130fd1525301e9826f420c5393a4d169819fc"
@@ -405,7 +405,7 @@
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
   },
   "puppet": {
-    "revision": "843868bfb909b734bfb63778a5685fae4bf2a33f"
+    "revision": "8e13a3768091703ac27ef1e5763e542af7f6dead"
   },
   "python": {
     "revision": "7c8930b6388b5590ebef248853f144185a9eda1d"
@@ -432,7 +432,7 @@
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "regex": {
-    "revision": "ab4eb4b702b8bf99e40a34c54bda6083cec16e10"
+    "revision": "17a3293714312c691ef14217f60593a3d093381c"
   },
   "rego": {
     "revision": "b2667c975f07b33be3ceb83bea5cfbad88095866"
@@ -477,7 +477,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "243de36808818b2fc81631fbada9d3ff9d46c465"
+    "revision": "9fc30c949f29747d34c254677d039c9df3c521b4"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -528,7 +528,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "6e695f4148a3ea96f0678513a10ebb5e52e8f352"
+    "revision": "e5fa28f919e0b1ed1961af9adf9a1e7a71271104"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -537,7 +537,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "6e695f4148a3ea96f0678513a10ebb5e52e8f352"
+    "revision": "e5fa28f919e0b1ed1961af9adf9a1e7a71271104"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -546,7 +546,7 @@
     "revision": "718a6b3e939904e0b4fe7cff6742e96af4781f4b"
   },
   "uxntal": {
-    "revision": "14e47600afef0affffcbfbe1543381b1ac8fbc5c"
+    "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
     "revision": "e14fdf6e661b10edccc744102e4ccf0b187aa8ad"
@@ -576,7 +576,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "903d15758f3242ec2e1b27ec5a4253f2c2a2b7ff"
+    "revision": "ab04b9ed56a8a6c75ae0f45b637fd6e8aa744331"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 51ea343f705a89326cff8dd7a0542d7fe0e6699a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 15 Jul 2023 01:56:24 -0400
Subject: [PATCH 0521/2704] fix(uxntal): move `@variable` query higher

---
 queries/uxntal/highlights.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/queries/uxntal/highlights.scm b/queries/uxntal/highlights.scm
index 25b1148d7..795c73d09 100644
--- a/queries/uxntal/highlights.scm
+++ b/queries/uxntal/highlights.scm
@@ -4,6 +4,10 @@
   "~" @include
   _ @text.uri @string.special)
 
+; Variables
+
+(identifier) @variable
+
 ; Macros
 
 (macro
@@ -44,10 +48,6 @@
 ((identifier) @repeat
   (#eq? @repeat "while"))
 
-; Variables
-
-(identifier) @variable
-
 ; Literals
 
 (raw_ascii) @string

From 7caa97615486d2418d394e3d09a05121de752ec6 Mon Sep 17 00:00:00 2001
From: Bugala Piotr <Piotr.Bugala@igt.com>
Date: Fri, 14 Jul 2023 13:49:50 +0200
Subject: [PATCH 0522/2704] feat(groovy): Add more support for groovy syntax.
 Fix for groovy multiline comment highlighting.

---
 lockfile.json                 |  2 +-
 queries/groovy/highlights.scm | 52 ++++++++++++++++++++++++++++-------
 queries/groovy/injections.scm |  5 +++-
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d6f7adec5..382e48252 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -195,7 +195,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "54c7da8b167261e76c79513c0364a01836093526"
+    "revision": "76e02db5866dd2b096512103ed4d8f630cc32980"
   },
   "hack": {
     "revision": "95e63e79e0d9f91000bd11d458997fabed1bb1e2"
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index 25dc21086..a9b38ef5b 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -1,16 +1,16 @@
 (unit
-    (identifier) @variable)
+  (identifier) @variable)
 (string
-    (identifier) @variable)
+  (identifier) @variable)
 
 (escape_sequence) @string.escape
 
 (block
-    (unit
-       (identifier) @namespace))
+  (unit
+    (identifier) @namespace))
 
 (func
-    (identifier) @function)
+  (identifier) @function)
 
 (number) @number
 
@@ -20,10 +20,20 @@
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
 
-((identifier) @type.definition
-  (#any-of? @type.definition
-    "string"
+((identifier) @constant.builtin
+  (#eq? @constant.builtin "null"))
+
+((identifier) @type
+  (#any-of? @type
     "String"
+    "Map"
+    "Object"
+    "Boolean"
+    "Integer"
+    "List"))
+
+((identifier) @function.builtin
+  (#any-of? @function.builtin
     "void"
     "id"
     "version"
@@ -39,8 +49,28 @@
     "class"
     "def"
     "import"
+    "package"
+    "assert"
+    "extends"
+    "implements"
+    "instanceof"
+    "interface"
     "new"))
 
+((identifier) @type.qualifier
+  (#any-of? @type.qualifier
+    "abstract"
+    "protected"
+    "private"
+    "public"))
+
+((identifier) @exception
+  (#any-of? @exception
+    "throw"
+    "finally"
+    "try"
+    "catch"))
+
 (string) @string
 
 [
@@ -57,7 +87,9 @@
 ((line_comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
-(operators) @operator
-(leading_key) @operator
+[
+  (operators)
+  (leading_key)
+] @operator
 
 ["(" ")" "[" "]" "{" "}"]  @punctuation.bracket
diff --git a/queries/groovy/injections.scm b/queries/groovy/injections.scm
index 4bb7d675d..0a63c9bfe 100644
--- a/queries/groovy/injections.scm
+++ b/queries/groovy/injections.scm
@@ -1 +1,4 @@
-(comment) @comment
+[
+  (block_comment)
+  (line_comment)
+] @comment

From 1e3b9866500db59c11dd012ce8b3336b1979679e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 17 Jul 2023 07:40:32 +0000
Subject: [PATCH 0523/2704] Update parsers: arduino, c, elixir, ocaml,
 ocaml_interface, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 382e48252..e794afb81 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "787bc6e1ca23092821231f6096438343f728ee6f"
+    "revision": "4de2f3e6235ee8659ecb7467c16ed13bde7fb272"
   },
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "693d298099a01a5d6cad589fe1c2c8836a6f7702"
+    "revision": "6adee194587678b250608cdb808544f06bcd26e7"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -108,7 +108,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "59a2ba5c0d768f8a7a6de8caa7f523d03ec6b647"
+    "revision": "2616034f78ffa83ca6a521ebd7eee1868cb5c14c"
   },
   "elm": {
     "revision": "73edfcdc3bb2ddfc731cd5d63e6cb287a18da90d"
@@ -348,10 +348,10 @@
     "revision": "6d876afade2d5e70d394aaf994321c78297e3607"
   },
   "ocaml": {
-    "revision": "fa4a8175a005a35c934ab36c4e4887d217061b2e"
+    "revision": "ee871b50b845b6adaa22e85aa3c794a3fd49b1fb"
   },
   "ocaml_interface": {
-    "revision": "fa4a8175a005a35c934ab36c4e4887d217061b2e"
+    "revision": "ee871b50b845b6adaa22e85aa3c794a3fd49b1fb"
   },
   "ocamllex": {
     "revision": "c8f90e42e1b9cf9e30b1669c386b8d9de992d201"
@@ -576,7 +576,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "ab04b9ed56a8a6c75ae0f45b637fd6e8aa744331"
+    "revision": "1f8736fc86204a045644e0086bee68f7171e1967"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From dd6964575e6ced69d582b7b9ffa46c240744c56f Mon Sep 17 00:00:00 2001
From: Emmanuel Bustos Torres <ema2159@gmail.com>
Date: Mon, 17 Jul 2023 10:21:10 +0200
Subject: [PATCH 0524/2704] feat: add Robot Framework parser and highlights

---
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  9 +++++++++
 queries/robot/highlights.scm    | 21 +++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 queries/robot/highlights.scm

diff --git a/lockfile.json b/lockfile.json
index e794afb81..f0efe0817 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -440,6 +440,9 @@
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
   },
+  "robot": {
+    "revision": "f1142bfaa6acfce95e25d2c6d18d218f4f533927"
+  },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a9e2f48c8..0819686a1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1309,6 +1309,15 @@ list.rnoweb = {
   maintainers = { "@bamonroe" },
 }
 
+list.robot = {
+  install_info = {
+    url = "https://github.com/Hubro/tree-sitter-robot",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ema2159" },
+  experimental = true,
+}
+
 list.ron = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-ron",
diff --git a/queries/robot/highlights.scm b/queries/robot/highlights.scm
new file mode 100644
index 000000000..abff22c42
--- /dev/null
+++ b/queries/robot/highlights.scm
@@ -0,0 +1,21 @@
+(argument (dictionary_variable) @string.special)
+(argument (list_variable) @string.special)
+(argument (scalar_variable) @string.special)
+(argument (text_chunk) @string)
+
+(keyword_invocation (keyword) @function)
+
+(test_case_definition (name) @property)
+
+(keyword_definition (body (keyword_setting) @keyword))
+(keyword_definition (name) @function)
+
+(variable_definition (variable_name) @variable)
+
+(setting_statement) @keyword
+
+(extra_text) @comment
+(section_header) @keyword
+
+(ellipses) @punctuation.delimiter
+(comment) @comment

From 180399295db82069bf07d3c2314530e7814c03d7 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 17 Jul 2023 08:21:30 +0000
Subject: [PATCH 0525/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 275c64116..66e0750a9 100644
--- a/README.md
+++ b/README.md
@@ -320,6 +320,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
+- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (experimental, maintained by @ema2159)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)

From 1bd95ec90ad5af13b9159c812576b34563381086 Mon Sep 17 00:00:00 2001
From: Tobias Frilling <tobias@frilling.dev>
Date: Mon, 17 Jul 2023 14:10:49 +0200
Subject: [PATCH 0526/2704] fix(parsers): ownership transfer of elvish

I've transferred the ownership of the elvish grammer to @elves, which is the org that develops elvish.
---
 lua/nvim-treesitter/parsers.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0819686a1..c5b8dd5f7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -401,10 +401,10 @@ list.elsa = {
 
 list.elvish = {
   install_info = {
-    url = "https://github.com/ckafi/tree-sitter-elvish",
+    url = "https://github.com/elves/tree-sitter-elvish",
     files = { "src/parser.c" },
   },
-  maintainers = { "@ckafi" },
+  maintainers = { "@elves" },
 }
 
 list.embedded_template = {

From f6c52eb8392e47aaf4878e5799ba54e7b30fa4f8 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 17 Jul 2023 12:22:04 +0000
Subject: [PATCH 0527/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 66e0750a9..4dab51958 100644
--- a/README.md
+++ b/README.md
@@ -212,7 +212,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [elixir](https://github.com/elixir-lang/tree-sitter-elixir) (maintained by @connorlay)
 - [x] [elm](https://github.com/elm-tooling/tree-sitter-elm) (maintained by @zweimach)
 - [x] [elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) (maintained by @glapa-grossklag, @amaanq)
-- [x] [elvish](https://github.com/ckafi/tree-sitter-elvish) (maintained by @ckafi)
+- [x] [elvish](https://github.com/elves/tree-sitter-elvish) (maintained by @elves)
 - [ ] [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template)
 - [x] [erlang](https://github.com/WhatsApp/tree-sitter-erlang) (maintained by @filmor)
 - [x] [fennel](https://github.com/travonted/tree-sitter-fennel) (maintained by @TravonteD)

From 44211e7f6e669b8a07e86abc533b292a30c32d62 Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Tue, 18 Jul 2023 01:19:28 +0700
Subject: [PATCH 0528/2704] feat(typescript): highlight decorators, default
 case, global declaration

---
 queries/ecma/highlights.scm       | 6 ++++++
 queries/typescript/highlights.scm | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 6cbc88d84..f53fb0518 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -158,6 +158,11 @@
 (namespace_import
   (identifier) @namespace)
 
+; Decorators
+;----------
+(decorator "@" @attribute (identifier) @attribute)
+(decorator "@" @attribute (call_expression (identifier) @attribute))
+
 ; Literals
 ;---------
 
@@ -210,6 +215,7 @@
 (pair ":" @punctuation.delimiter)
 (pair_pattern ":" @punctuation.delimiter)
 (switch_case ":" @punctuation.delimiter)
+(switch_default ":" @punctuation.delimiter)
 
 [
   "--"
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 4cb9fab3e..b58ba0e50 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -136,6 +136,9 @@
 (arrow_function
   parameter: (identifier) @parameter)
 
+;; global declaration
+(ambient_declaration "global" @namespace)
+
 ;; function signatures
 (ambient_declaration
   (function_signature

From e75b795f00689804b4cce917634ef68ee48b38a0 Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Tue, 18 Jul 2023 08:39:36 +0200
Subject: [PATCH 0529/2704] feat(sql): update queries for newly added keywords

---
 queries/sql/highlights.scm | 2 ++
 queries/sql/indents.scm    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 0e0e945e8..4bfaa3cb9 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -75,6 +75,7 @@
  (keyword_safe)
  (keyword_cost)
  (keyword_strict)
+ (keyword_matched)
 ] @attribute
 
 [
@@ -112,6 +113,7 @@
   (keyword_delete)
   (keyword_create)
   (keyword_insert)
+  (keyword_merge)
   (keyword_distinct)
   (keyword_replace)
   (keyword_update)
diff --git a/queries/sql/indents.scm b/queries/sql/indents.scm
index f5de6ea12..b09f9b5bd 100644
--- a/queries/sql/indents.scm
+++ b/queries/sql/indents.scm
@@ -5,6 +5,7 @@
  (case)
  (subquery)
  (insert)
+ (when_clause)
 ] @indent.begin
 
 (block

From a2c3a7319f2aab90dac1fb25a3c79a7614322c19 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 18 Jul 2023 02:40:30 -0400
Subject: [PATCH 0530/2704] fix(menhir): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f0efe0817..ae7d55f00 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -321,7 +321,7 @@
     "revision": "676117eafa64afedc8380a921a77cd9f2244bc6b"
   },
   "menhir": {
-    "revision": "db7953acb0d5551f207373c81fa07a57d7b085cb"
+    "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
   },
   "mermaid": {
     "revision": "e26a5f8898a8174f02b4cc9a9050eb3ccfb799f3"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c5b8dd5f7..d6b3bdb7f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -978,7 +978,7 @@ list.matlab = {
 list.menhir = {
   install_info = {
     url = "https://github.com/Kerl13/tree-sitter-menhir",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@Kerl13" },
 }

From b64ea2ec444c27efd8d3bd2377a8b24589954363 Mon Sep 17 00:00:00 2001
From: Michael Hoffmann <mhoffm@posteo.de>
Date: Sat, 8 Jul 2023 19:44:16 +0200
Subject: [PATCH 0531/2704] feat(promql,yaml): add parser and yaml injections

Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
---
 lockfile.json                                 |  3 ++
 lua/nvim-treesitter/parsers.lua               |  9 ++++
 queries/promql/highlights.scm                 | 54 +++++++++++++++++++
 queries/promql/injections.scm                 |  1 +
 queries/yaml/injections.scm                   | 26 +++++++++
 .../yaml/promql-on-prometheus-rules.yaml      | 12 +++++
 6 files changed, 105 insertions(+)
 create mode 100644 queries/promql/highlights.scm
 create mode 100644 queries/promql/injections.scm
 create mode 100644 tests/query/injections/yaml/promql-on-prometheus-rules.yaml

diff --git a/lockfile.json b/lockfile.json
index ae7d55f00..cef6a9359 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -395,6 +395,9 @@
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
+  "promql": {
+    "revision": "655afc4fe6813f38bde087d6493d8fd4920d6d4a"
+  },
   "proto": {
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d6b3bdb7f..3f1bc98d8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1187,6 +1187,15 @@ list.prisma = {
   maintainers = { "@elianiva" },
 }
 
+list.promql = {
+  install_info = {
+    url = "https://github.com/MichaHoffmann/tree-sitter-promql",
+    files = { "src/parser.c" },
+    experimental = true,
+  },
+  maintainers = { "@MichaHoffmann" },
+}
+
 list.proto = {
   install_info = {
     url = "https://github.com/mitchellh/tree-sitter-proto",
diff --git a/queries/promql/highlights.scm b/queries/promql/highlights.scm
new file mode 100644
index 000000000..7c0d1241e
--- /dev/null
+++ b/queries/promql/highlights.scm
@@ -0,0 +1,54 @@
+; highlights.scm
+
+[
+  "*"
+  "/"
+  "%"
+  "+"
+  "-"
+  ">"
+  ">="
+  "<"
+  "<="
+  "="
+  "=~"
+  "!="
+  "!~"
+] @operator
+
+[
+  "and"
+  "unless"
+  "or"
+  "bool"
+] @keyword.operator
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
+
+(float_literal) @float
+(string_literal) @string
+
+(metric_name) @type
+(range_selection) @text.strong @type
+(subquery_range_selection) @text.strong @type
+
+(label_name) @field
+(label_value) @text.underline @string.regex
+
+(function_name) @function.call
+
+[ 
+  "by"
+  "without"
+] @function
+
+(comment) @comment @spell
+(ERROR) @error
+
diff --git a/queries/promql/injections.scm b/queries/promql/injections.scm
new file mode 100644
index 000000000..ffdf4f8e6
--- /dev/null
+++ b/queries/promql/injections.scm
@@ -0,0 +1 @@
+((label_value) @regex (#offset! @regex 0 1 0 -1))
diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index 40727bbd2..a81ca4d06 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -25,3 +25,29 @@
              (block_sequence_item
                (block_node
                   (block_scalar) @bash (#offset! @bash 0 1 0 0))))))
+
+;; Prometheus Alertmanager ("expr")
+(block_mapping_pair
+  key: (flow_node) @_expr (#eq? @_expr "expr")
+  value: (flow_node
+           (plain_scalar) @promql))
+
+(block_mapping_pair
+  key: (flow_node) @_expr (#eq? @_expr "expr")
+  value: (block_node
+           (block_scalar) @promql (#offset! @promql 0 2 0 0)))
+
+(block_mapping_pair
+  key: (flow_node) @_expr (#eq? @_expr "expr")
+  value: (block_node
+           (block_sequence
+             (block_sequence_item
+               (flow_node) @promql))))
+
+(block_mapping_pair
+  key: (flow_node) @_expr (#eq @_expr "expr")
+  value: (block_node
+           (block_sequence
+             (block_sequence_item
+               (block_node
+                  (block_scalar) @promql (#offset! @promql 0 2 0 0))))))
diff --git a/tests/query/injections/yaml/promql-on-prometheus-rules.yaml b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
new file mode 100644
index 000000000..9d3e872ce
--- /dev/null
+++ b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
@@ -0,0 +1,12 @@
+groups:
+- name: Hardware alerts
+  rules:
+  - alert: Node down
+    expr: up{job="node_exporter"} == 0
+    #     ^ promql
+    for: 3m
+    labels:
+      severity: warning
+    annotations:
+      title: Node {{ $labels.instance }} is down
+      description: Failed to scrape {{ $labels.job }} on {{ $labels.instance }} for more than 3 minutes. Node seems down.

From 19b29f7cb046317b74e60fc7bff2f86ece4dc118 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Tue, 18 Jul 2023 07:03:30 +0000
Subject: [PATCH 0532/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4dab51958..2983d2100 100644
--- a/README.md
+++ b/README.md
@@ -305,6 +305,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
+- [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
 - [x] [proto](https://github.com/mitchellh/tree-sitter-proto) (maintained by @fsouza)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)

From 461d841771c7a576e5fd33d1320934a4a0f1dbc9 Mon Sep 17 00:00:00 2001
From: OK Ryoko <59705845+ok-ryoko@users.noreply.github.com>
Date: Tue, 18 Jul 2023 19:55:06 +0000
Subject: [PATCH 0533/2704] feat: add SystemTap (#5097)

---
 lockfile.json                    |   3 +
 lua/nvim-treesitter/parsers.lua  |   8 ++
 queries/systemtap/folds.scm      |  18 ++++
 queries/systemtap/highlights.scm | 153 +++++++++++++++++++++++++++++++
 queries/systemtap/injections.scm |   2 +
 queries/systemtap/locals.scm     |  35 +++++++
 6 files changed, 219 insertions(+)
 create mode 100644 queries/systemtap/folds.scm
 create mode 100644 queries/systemtap/highlights.scm
 create mode 100644 queries/systemtap/injections.scm
 create mode 100644 queries/systemtap/locals.scm

diff --git a/lockfile.json b/lockfile.json
index cef6a9359..c20a3c488 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -506,6 +506,9 @@
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
+  "systemtap": {
+    "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
+  },
   "t32": {
     "revision": "4e581fcd17d76651aa92759a68f9a8186b9fe8dc"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3f1bc98d8..b8b14ae8f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1491,6 +1491,14 @@ list.sxhkdrc = {
   maintainers = { "@RaafatTurki" },
 }
 
+list.systemtap = {
+  install_info = {
+    url = "https://github.com/ok-ryoko/tree-sitter-systemtap",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ok-ryoko" },
+}
+
 list.t32 = {
   install_info = {
     url = "https://codeberg.org/xasc/tree-sitter-t32",
diff --git a/queries/systemtap/folds.scm b/queries/systemtap/folds.scm
new file mode 100644
index 000000000..58bb03e51
--- /dev/null
+++ b/queries/systemtap/folds.scm
@@ -0,0 +1,18 @@
+[
+  (preprocessor_macro_definition)
+  (preprocessor_macro_expansion)
+  (conditional_preprocessing)
+  (embedded_code)
+  (probe_point_definition)
+  (probe_point_alias_prologue)
+  (probe_point_alias_epilogue)
+  (variable_declaration)
+  (function_definition)
+  (if_statement)
+  (while_statement)
+  (for_statement)
+  (foreach_statement)
+  (try_statement)
+  (catch_clause)
+  (comment)
+] @fold
diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm
new file mode 100644
index 000000000..54a27b897
--- /dev/null
+++ b/queries/systemtap/highlights.scm
@@ -0,0 +1,153 @@
+(identifier) @variable
+
+(preprocessor_macro_definition
+  name: (identifier) @function.macro)
+
+(preprocessor_macro_expansion) @function.macro
+
+(preprocessor_constant) @constant.macro
+
+(number) @number
+(string) @string
+(escape_sequence) @string.escape
+
+[
+  (script_argument_string)
+  (script_argument_number)
+] @constant
+
+(probe_point_component) @function
+
+(function_definition
+  name: (identifier) @function)
+
+(parameter
+  name: (identifier) @parameter)
+
+(type) @type.builtin
+
+(aggregation_operator) @attribute
+
+(member_expression
+  member: (identifier) @field)
+
+(call_expression
+  function: (identifier) @function.call)
+
+((call_expression
+    function: (identifier) @function.builtin)
+  (#any-of? @function.builtin
+    "print" "printd" "printdln" "printf" "println"
+    "sprint" "sprintd" "sprintdln" "sprintf" "sprintln"))
+
+((identifier) @variable.builtin
+  (#lua-match? @variable.builtin "^\$+[0-9A-Z_a-z]+\$*$"))
+
+(shebang_line) @preproc
+
+(comment) @comment @spell
+
+[
+  "!"
+  "!="
+  "!~"
+  "$"
+  "$$"
+  "%"
+  "%="
+  "&"
+  "&&"
+  "&="
+  "*"
+  "*="
+  "+"
+  "++"
+  "+="
+  "-"
+  "--"
+  "-="
+  "->"
+  "."
+  ".="
+  "/"
+  "/="
+  ":"
+  "<"
+  "<<"
+  "<<<"
+  "<<="
+  "<="
+  "="
+  "=="
+  "=~"
+  ">"
+  ">="
+  ">>"
+  ">>="
+  "?"
+  "^"
+  "^="
+  "|"
+  "|="
+  "||"
+  "~"
+] @operator
+
+[
+  ","
+  (null_statement)
+] @punctuation.delimiter
+
+[
+  "%{"
+  "%}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "delete"
+  "limit"
+  "next"
+  "probe"
+] @keyword
+
+"function" @keyword.function
+"in" @keyword.operator
+"return" @keyword.return
+
+[
+  "if"
+  "else"
+] @conditional
+
+[
+  "break"
+  "continue"
+  "for"
+  "foreach"
+  "while"
+] @repeat
+
+[
+  "try"
+  "catch"
+] @exception
+
+[
+  "%("
+  "%)"
+  "%:"
+  "%?"
+  (preprocessor_tokens)
+  (embedded_code)
+] @preproc
+
+"@define" @define
+
+"private" @type.qualifier
+"global" @storageclass
diff --git a/queries/systemtap/injections.scm b/queries/systemtap/injections.scm
new file mode 100644
index 000000000..1dd86c9f3
--- /dev/null
+++ b/queries/systemtap/injections.scm
@@ -0,0 +1,2 @@
+(comment) @comment
+(embedded_code) @c
diff --git a/queries/systemtap/locals.scm b/queries/systemtap/locals.scm
new file mode 100644
index 000000000..5d4447e52
--- /dev/null
+++ b/queries/systemtap/locals.scm
@@ -0,0 +1,35 @@
+[
+  (function_definition)
+  (statement_block)
+  (if_statement)
+  (while_statement)
+  (for_statement)
+  (foreach_statement)
+  (catch_clause)
+] @scope
+
+(init_declarator
+  name: (identifier) @definition.var)
+
+(array_declarator
+  name: (identifier) @definition.var)
+
+(function_definition
+  name: (identifier) @definition.function)
+
+(parameter
+  name: (identifier) @definition.parameter)
+
+(tuple_capture
+  (identifier) @definition.var)
+
+(catch_clause
+  parameter: (identifier) @definition.var)
+
+(assignment_expression
+  left: (identifier) @definition.var)
+
+(call_expression
+  function: (identifier) @reference)
+
+(identifier) @reference

From 9fa6806b88905d52b5ca36094909630919b432cc Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Tue, 18 Jul 2023 19:55:34 +0000
Subject: [PATCH 0534/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2983d2100..f0c8f7586 100644
--- a/README.md
+++ b/README.md
@@ -342,6 +342,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [svelte](https://github.com/Himujjal/tree-sitter-svelte) (maintained by @elianiva)
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
+- [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
 - [x] [t32](https://codeberg.org/xasc/tree-sitter-t32) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)

From 4115fad9fded72571bdc3e0f7351e64b31799a3d Mon Sep 17 00:00:00 2001
From: Constantine Bulany <61948252+lostl1ght@users.noreply.github.com>
Date: Wed, 19 Jul 2023 19:41:50 +0300
Subject: [PATCH 0535/2704] fix(yaml): typo in promql injection (#5130)

---
 queries/yaml/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index a81ca4d06..ba6d0aa06 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -45,7 +45,7 @@
                (flow_node) @promql))))
 
 (block_mapping_pair
-  key: (flow_node) @_expr (#eq @_expr "expr")
+  key: (flow_node) @_expr (#eq? @_expr "expr")
   value: (block_node
            (block_sequence
              (block_sequence_item

From a8ac8419c420f3564e5212ecbeba3283cfa9e78e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 21 Jul 2023 12:33:02 +0200
Subject: [PATCH 0536/2704] fix(regex): bump to latest commit

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index c20a3c488..f00128bac 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -435,7 +435,7 @@
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "regex": {
-    "revision": "17a3293714312c691ef14217f60593a3d093381c"
+    "revision": "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"
   },
   "rego": {
     "revision": "b2667c975f07b33be3ceb83bea5cfbad88095866"

From 7b04e8b67eec7d92daadf9f0717dd272ddfc81a3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 22 Jul 2023 13:57:57 +0200
Subject: [PATCH 0537/2704] Update lockfile.json: elvish, erlang, markdown,
 markdown_inline, matlab, ocaml, ocaml_interface, robot, tsx, typescript, wing

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f00128bac..ec27c2a04 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,13 +117,13 @@
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
   },
   "elvish": {
-    "revision": "f32711e31e987fd5c2c002f3daba02f25c68672f"
+    "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "5dba13dcd531c19bf99829e2e0bb31f2e08e16fe"
+    "revision": "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -312,13 +312,13 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
+    "revision": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"
   },
   "markdown_inline": {
-    "revision": "936cc84289f6de83c263ae8e659fb342867ceb16"
+    "revision": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"
   },
   "matlab": {
-    "revision": "676117eafa64afedc8380a921a77cd9f2244bc6b"
+    "revision": "1558d8fc85f7810fa567292ad2a7e64913fa78a1"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -348,10 +348,10 @@
     "revision": "6d876afade2d5e70d394aaf994321c78297e3607"
   },
   "ocaml": {
-    "revision": "ee871b50b845b6adaa22e85aa3c794a3fd49b1fb"
+    "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
   },
   "ocaml_interface": {
-    "revision": "ee871b50b845b6adaa22e85aa3c794a3fd49b1fb"
+    "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
   },
   "ocamllex": {
     "revision": "c8f90e42e1b9cf9e30b1669c386b8d9de992d201"
@@ -444,7 +444,7 @@
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
   },
   "robot": {
-    "revision": "f1142bfaa6acfce95e25d2c6d18d218f4f533927"
+    "revision": "51b82cfd0c824681b6a282663820a5ce54243e55"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
@@ -537,7 +537,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsx": {
-    "revision": "e5fa28f919e0b1ed1961af9adf9a1e7a71271104"
+    "revision": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -546,7 +546,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "e5fa28f919e0b1ed1961af9adf9a1e7a71271104"
+    "revision": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -585,7 +585,7 @@
     "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
   },
   "wing": {
-    "revision": "1f8736fc86204a045644e0086bee68f7171e1967"
+    "revision": "23712eff9768576bdd852cb9b989a9cd44af014a"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 5be3ddeadd68be5547b3f600ab2b9d2451dba3c4 Mon Sep 17 00:00:00 2001
From: Sergio Alejandro Vargas <savargasqu+git@unal.edu.co>
Date: Mon, 24 Jul 2023 13:51:05 -0500
Subject: [PATCH 0538/2704] fix(julia): symbol highlighting

Update the `@symbol` capture to enable highlighting symbols
differently from variables.

See https://github.com/tree-sitter/tree-sitter-julia/issues/110
---
 queries/julia/highlights.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 9ec16a060..0a7d32df3 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -13,7 +13,9 @@
 (macro_definition
   name: (identifier) @function.macro)
 
-(quote_expression ":" [(identifier) (operator)]) @symbol
+(quote_expression
+  ":" @symbol
+  [(identifier) (operator)] @symbol)
 
 (field_expression
   (identifier) @field .)

From 7c1e944311a0d4eb2c8a346661ee4ed207aca514 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 24 Jul 2023 15:39:36 -0400
Subject: [PATCH 0539/2704] fix(fortran): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ec27c2a04..c3334e0ae 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -138,7 +138,7 @@
     "revision": "7ef88a8c652073785bffd7ce9c3effc68035aa11"
   },
   "fortran": {
-    "revision": "31552ac43ecaffa443a12ebea68cc526d334892f"
+    "revision": "482bdb8b8fb7305b928937379820aa6449e359a7"
   },
   "fsh": {
     "revision": "fa3347712f7a59ed02ccf508284554689c6cde28"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b8b14ae8f..daece59de 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -461,7 +461,7 @@ list.foam = {
 list.fortran = {
   install_info = {
     url = "https://github.com/stadelmanma/tree-sitter-fortran",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@amaanq" },
 }

From 48df8efa25c72c8a75e8898ece4b112c71dbcc47 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 24 Jul 2023 16:55:05 -0400
Subject: [PATCH 0540/2704] chore(puppet): update queries from upstream

---
 lockfile.json                 | 2 +-
 queries/puppet/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index c3334e0ae..86315420f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -408,7 +408,7 @@
     "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
   },
   "puppet": {
-    "revision": "8e13a3768091703ac27ef1e5763e542af7f6dead"
+    "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "python": {
     "revision": "7c8930b6388b5590ebef248853f144185a9eda1d"
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index 889aabc65..dc3a1a3f3 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -29,6 +29,7 @@
   "if"
   "elsif"
   "else"
+  "unless"
   "case"
 ] @conditional
 

From 74a7da4e4be5ee71e9efb6d7bdffa16ad620cc57 Mon Sep 17 00:00:00 2001
From: pseudometa <73286100+chrisgrieser@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:03:54 +0200
Subject: [PATCH 0541/2704] feat(comment): highlight more comment tags

---
 queries/comment/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 2f76708db..70aa92de2 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -13,10 +13,10 @@
   (name) @text.note @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.note "NOTE" "XXX" "INFO"))
+  (#any-of? @text.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
 
 ("text" @text.note @nospell
- (#any-of? @text.note "NOTE" "XXX" "INFO"))
+ (#any-of? @text.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
 
 ((tag
   (name) @text.warning @nospell

From 4920a4e732d16dd1270d2bb8744f6d8371e3788d Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Tue, 25 Jul 2023 21:30:41 +0200
Subject: [PATCH 0542/2704] highlights(wgsl_bevy): add support for naga_oil
 features

Bevy has switched to https://github.com/bevyengine/naga_oil which allows
new syntax constructs.
---
 lockfile.json                    |  2 +-
 queries/wgsl_bevy/highlights.scm | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 86315420f..6bc192f2c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -582,7 +582,7 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "7cd38d6895060b023353e04f7af099ec64add5d1"
+    "revision": "9e3273e64bdd3f74d1514674286838f9075ee9e4"
   },
   "wing": {
     "revision": "23712eff9768576bdd852cb9b989a9cd44af014a"
diff --git a/queries/wgsl_bevy/highlights.scm b/queries/wgsl_bevy/highlights.scm
index 2b33eff66..4ba25a935 100644
--- a/queries/wgsl_bevy/highlights.scm
+++ b/queries/wgsl_bevy/highlights.scm
@@ -1,11 +1,22 @@
 ; inherits wgsl
 
+[
+ "virtual"
+ "override"
+] @keyword
+
 [
  "#import"
  "#define_import_path"
+ "as"
 ] @include
+
 "::" @punctuation.delimiter
 
+(function_declaration
+  (import_path
+    ((identifier) @function .)))
+
 (import_path (identifier) @namespace (identifier))
 
 (struct_declaration

From 736a672afe852dbad4199002c89b7461b285c47f Mon Sep 17 00:00:00 2001
From: Hugo <hugo@whynothugo.nl>
Date: Tue, 25 Jul 2023 22:49:09 +0200
Subject: [PATCH 0543/2704] feat: add scfg

---
 README.md                       | 1 +
 lockfile.json                   | 3 +++
 lua/nvim-treesitter/parsers.lua | 9 +++++++++
 queries/scfg/highlights.scm     | 8 ++++++++
 queries/scfg/injections.scm     | 1 +
 5 files changed, 22 insertions(+)
 create mode 100644 queries/scfg/highlights.scm
 create mode 100644 queries/scfg/injections.scm

diff --git a/README.md b/README.md
index f0c8f7586..74077290d 100644
--- a/README.md
+++ b/README.md
@@ -327,6 +327,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
 - [x] [rust](https://github.com/tree-sitter/tree-sitter-rust) (maintained by @amaanq)
 - [x] [scala](https://github.com/tree-sitter/tree-sitter-scala) (maintained by @stevanmilic)
+- [x] [scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) (maintained by @WhyNotHugo)
 - [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
 - [x] [slint](https://github.com/jrmoulton/tree-sitter-slint) (experimental, maintained by @jrmoulton)
diff --git a/lockfile.json b/lockfile.json
index 6bc192f2c..81c4f0a9e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -461,6 +461,9 @@
   "scala": {
     "revision": "8062487fb3b7f3ce1bb7ce1fd1c84bed60c75203"
   },
+  "scfg": {
+    "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
+  },
   "scheme": {
     "revision": "ca8af220aaf2a80aaf609bfb0df193817e4f064b"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index daece59de..973d955de 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1367,6 +1367,15 @@ list.scala = {
   maintainers = { "@stevanmilic" },
 }
 
+list.scfg = {
+  install_info = {
+    url = "https://git.sr.ht/~rockorager/tree-sitter-scfg",
+    files = { "src/parser.c" },
+    requires_generate_from_grammar = true,
+  },
+  maintainers = { "@WhyNotHugo" },
+}
+
 list.scheme = {
   install_info = {
     url = "https://github.com/6cdh/tree-sitter-scheme",
diff --git a/queries/scfg/highlights.scm b/queries/scfg/highlights.scm
new file mode 100644
index 000000000..240d48a90
--- /dev/null
+++ b/queries/scfg/highlights.scm
@@ -0,0 +1,8 @@
+[
+ "{"
+ "}"
+] @punctuation.bracket
+
+(comment) @comment @spell
+(directive_name) @type
+(directive_params) @parameter
diff --git a/queries/scfg/injections.scm b/queries/scfg/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/scfg/injections.scm
@@ -0,0 +1 @@
+(comment) @comment

From 25158a8b3916a354911928942daf185c32b19cce Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 26 Jul 2023 21:11:17 -0400
Subject: [PATCH 0544/2704] fix(r): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 81c4f0a9e..afbb33a03 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -426,7 +426,7 @@
     "revision": "3a9808b22742d5bd906ef5d1a562f2f1ae57406d"
   },
   "r": {
-    "revision": "80efda55672d1293aa738f956c7ae384ecdc31b4"
+    "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
     "revision": "92bf6372c63bb413c2d3c1535383d266838d1911"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 973d955de..aab25acce 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1274,7 +1274,7 @@ list.query = {
 list.r = {
   install_info = {
     url = "https://github.com/r-lib/tree-sitter-r",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@echasnovski" },
 }

From 203981d2880585c304be09c0a374bad82edd5c15 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 27 Jul 2023 02:54:03 -0400
Subject: [PATCH 0545/2704] fix(hcl, terraform): adapt to scanner rewrite

---
 lockfile.json                   | 4 ++--
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index afbb33a03..6573df89a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -210,7 +210,7 @@
     "revision": "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"
   },
   "hcl": {
-    "revision": "becebebd3509c02e871c99be55556269be1def1b"
+    "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
   },
   "heex": {
     "revision": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"
@@ -522,7 +522,7 @@
     "revision": "2158ecce11ea542f9b791baf2c7fb33798174ed2"
   },
   "terraform": {
-    "revision": "becebebd3509c02e871c99be55556269be1def1b"
+    "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
   },
   "thrift": {
     "revision": "d4deb1bd9e848f2dbe81103a151d99e8546de480"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index aab25acce..3ae9e09ea 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -662,7 +662,7 @@ list.haskell_persistent = {
 list.hcl = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@MichaHoffmann" },
 }
@@ -1537,7 +1537,7 @@ list.teal = {
 list.terraform = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
     location = "dialects/terraform",
   },
   maintainers = { "@MichaHoffmann" },

From ad3805f5c34b51890c3d3c37c2f0c86269598a32 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 27 Jul 2023 03:51:13 -0400
Subject: [PATCH 0546/2704] fix(c)!: update C, CPP parsers and queries

also update derived parsers (arduino, cuda, glsl, hlsl, ispc, objc)
---
 lockfile.json              |  16 +++---
 queries/c/folds.scm        |   3 +-
 queries/c/highlights.scm   |  26 ++++++---
 queries/c/indents.scm      | 107 ++++++++++++-------------------------
 queries/c/injections.scm   |   4 ++
 queries/cpp/highlights.scm |   2 +-
 tests/indent/c/if_else.c   |   3 +-
 7 files changed, 68 insertions(+), 93 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6573df89a..fcb0b44d2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "4de2f3e6235ee8659ecb7467c16ed13bde7fb272"
+    "revision": "3446bac828d5db2a6cf60ab31813c02ab53547a7"
   },
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "6adee194587678b250608cdb808544f06bcd26e7"
+    "revision": "ad095896dd223f1c22b85ac5ec84ab11fb732b07"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -69,13 +69,13 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "0e7b7a02b6074859b51c1973eb6a8275b3315b1d"
+    "revision": "f88bf81238ec2842682e4d1dac0acf3b43b686e9"
   },
   "css": {
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "c5befe09c99f5e88190574676ffa8eb29775d410"
+    "revision": "2af3d43cd96dd3f3c3868095222c7f5e2462b3ab"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -174,7 +174,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "7d76863f2126ed3b246fead68f9591760d546c94"
+    "revision": "34e0657e37323874c6b67c718a0f83410c4602cf"
   },
   "go": {
     "revision": "8c8007eaee47702bb0291a3c7aeb004909baab4d"
@@ -219,7 +219,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "b8fab02e808bab41c49829fb5e4fb0ce7eab8d1a"
+    "revision": "20c40a3f1bb68c596f56bb0c0290008b9d4f58dd"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -243,7 +243,7 @@
     "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
   },
   "ispc": {
-    "revision": "848e58874ffa2f7e540a6ec01ab9652b26995f37"
+    "revision": "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7"
   },
   "janet_simple": {
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
@@ -345,7 +345,7 @@
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
   "objc": {
-    "revision": "6d876afade2d5e70d394aaf994321c78297e3607"
+    "revision": "77e28aeaede824a5f4aa501fb5f3138ab1019b9f"
   },
   "ocaml": {
     "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
diff --git a/queries/c/folds.scm b/queries/c/folds.scm
index 80c3039b6..5a35334a2 100644
--- a/queries/c/folds.scm
+++ b/queries/c/folds.scm
@@ -13,7 +13,8 @@
  (preproc_else)
  (preproc_ifdef)
  (initializer_list)
+ (gnu_asm_expression)
 ] @fold
 
- (compound_statement
+(compound_statement
   (compound_statement) @fold)
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index b5dad2ae2..ef70a7103 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -8,9 +8,14 @@
   "typedef"
   "union"
   "goto"
+  "asm"
+  "__asm__"
 ] @keyword
 
-"sizeof" @keyword.operator
+[
+  "sizeof"
+  "offsetof"
+] @keyword.operator
 
 "return" @keyword.return
 
@@ -36,6 +41,8 @@
   "#else"
   "#elif"
   "#endif"
+  "#elifdef"
+  "#elifndef"
   (preproc_directive)
 ] @preproc
 
@@ -43,7 +50,7 @@
 
 "#include" @include
 
-[ ";" ":" "," ] @punctuation.delimiter
+[ ";" ":" "," "::" ] @punctuation.delimiter
 
 "..." @punctuation.special
 
@@ -98,8 +105,8 @@
 (comma_expression [ "," ] @operator)
 
 [
- (true)
- (false)
+  (true)
+  (false)
 ] @boolean
 
 (conditional_expression [ "?" ":" ] @conditional.ternary)
@@ -133,7 +140,10 @@
 
 (storage_class_specifier) @storageclass
 
-(type_qualifier) @type.qualifier
+[
+  (type_qualifier) 
+  (gnu_asm_qualifier)
+] @type.qualifier
 
 (linkage_specification
   "extern" @storageclass)
@@ -193,15 +203,15 @@
 
 [
   "__attribute__"
+  "__declspec"
+  "__based"
   "__cdecl"
   "__clrcall"
   "__stdcall"
   "__fastcall"
   "__thiscall"
   "__vectorcall"
-  "_unaligned"
-  "__unaligned"
-  "__declspec"
+  (ms_pointer_modifier)
   (attribute_declaration)
 ] @attribute
 
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index 4d1ba3940..cf4c8fa62 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -15,85 +15,46 @@
   (_) @indent.begin
   ";" @indent.end)
 
-(
-  ERROR
-    "for" "(" @indent.begin ";" ";" ")" @indent.end)
-(
-  (for_statement
-    body: (_) @_body
-  ) @indent.begin
-  (#not-has-type? @_body compound_statement)
-)
+(ERROR
+  "for" "(" @indent.begin ";" ";" ")" @indent.end)
 
-(
-  while_statement
-    condition: (_) @indent.begin
-)
-(
-  (while_statement
-    body: (_) @_body
-  ) @indent.begin
-  (#not-has-type? @_body compound_statement)
-)
+((for_statement
+    body: (_) @_body) @indent.begin
+  (#not-has-type? @_body compound_statement))
+
+(while_statement
+  condition: (_) @indent.begin)
+
+((while_statement
+    body: (_) @_body) @indent.begin
+  (#not-has-type? @_body compound_statement))
 
 (
   (if_statement)
-  (ERROR "else") @indent.begin
-)
+  .
+  (ERROR "else" @indent.begin))
 
-(
- if_statement
-  condition: (_) @indent.begin
-)
-;; Make sure all cases of if-else are tagged with @indent.begin
-;; So we will offset the indents for the else case
-(
-  (if_statement
-    consequence: (compound_statement)
-    "else" @indent.branch
-    alternative: 
-      [
-        [ "{" "}" ] @indent.branch
-        (compound_statement ["{" "}"] @indent.branch)
-        (_)
-      ] 
-  ) @indent.begin
-)
-(
-  (if_statement
-    consequence: (_ ";" @indent.end) @_consequence
-  ) @indent.begin
-  (#not-has-type? @_consequence compound_statement)
-)
-(
-  (if_statement
-    consequence: (_) @_consequence
-    "else" @indent.branch
-    alternative: 
-      [
-        [ "{" "}" ] @indent.branch
-        (compound_statement ["{" "}"] @indent.branch)
-        (_)
-      ] 
-  )
-  (#not-has-type? @_consequence compound_statement)
-)
+(if_statement
+  condition: (_) @indent.begin)
+
+;; Supports if without braces (but not both if-else without braces)
+((if_statement
+  consequence: 
+    (_ ";" @indent.end) @_consequence
+    (#not-has-type? @_consequence compound_statement)
+  alternative:
+    (else_clause 
+      "else" @indent.branch
+      [ 
+        (if_statement (compound_statement) @indent.dedent)? @indent.dedent
+        (compound_statement)? @indent.dedent
+        (_)? @indent.dedent
+      ]
+      )?
+  ) @indent.begin)
+
+(else_clause (_ . "{" @indent.branch))
 
-;; Dedent for chaining if-else statements
-;; this will go recursively through each if-elseif
-;; if-elseif -> second `if` is dedented once, indented twice
-;; if-elseif-elseif -> third `if` is dedented twice, indented 3 times
-;; -> all are indented once
-(
-  (if_statement
-    consequence: (_)
-    alternative: 
-      [
-        (if_statement consequence: (compound_statement) @indent.dedent)
-        (_)
-      ] @indent.dedent
-  )
-)
 
 (compound_statement "}" @indent.end)
 
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index afeb068a2..207ef0515 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,3 +1,7 @@
 (preproc_arg) @c
 
 (comment) @comment
+
+; TODO: add when asm is added
+; (gnu_asm_expression assembly_code: (string_literal) @asm)
+; (gnu_asm_expression assembly_code: (concatenated_string (string_literal) @asm))
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index c58d76aba..bce3f9061 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -160,7 +160,7 @@
 ; Constants
 
 (this) @variable.builtin
-(nullptr) @constant.builtin
+(null "nullptr" @constant.builtin)
 
 (true) @boolean
 (false) @boolean
diff --git a/tests/indent/c/if_else.c b/tests/indent/c/if_else.c
index 0a81b3594..e71aa328c 100644
--- a/tests/indent/c/if_else.c
+++ b/tests/indent/c/if_else.c
@@ -55,6 +55,5 @@ int baz(int x){
         else
             x++;
     }
-    else
-        return x;
+    return 0;
 }

From 0b0e4601808c2a526abd073e781d41bd50e462b9 Mon Sep 17 00:00:00 2001
From: Michael Hoffmann <mhoffm@posteo.de>
Date: Sat, 22 Jul 2023 14:41:43 +0200
Subject: [PATCH 0547/2704] fix(promql): bump parser, fix queries

Signed-off-by: Michael Hoffmann <mhoffm@posteo.de>
---
 lockfile.json                 |  2 +-
 queries/promql/highlights.scm | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fcb0b44d2..ce85db6ab 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -396,7 +396,7 @@
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
   "promql": {
-    "revision": "655afc4fe6813f38bde087d6493d8fd4920d6d4a"
+    "revision": "4b6b9f399dc58e408c81da8d8fd7e66ab617eef3"
   },
   "proto": {
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
diff --git a/queries/promql/highlights.scm b/queries/promql/highlights.scm
index 7c0d1241e..024b7703b 100644
--- a/queries/promql/highlights.scm
+++ b/queries/promql/highlights.scm
@@ -16,13 +16,6 @@
   "!~"
 ] @operator
 
-[
-  "and"
-  "unless"
-  "or"
-  "bool"
-] @keyword.operator
-
 [
   "{"
   "}"
@@ -44,11 +37,6 @@
 
 (function_name) @function.call
 
-[ 
-  "by"
-  "without"
-] @function
-
 (comment) @comment @spell
 (ERROR) @error
 

From 11610e0631cdaaffd8eb6774bd5275465a4eb314 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 27 Jul 2023 04:09:23 -0400
Subject: [PATCH 0548/2704] fix(pug): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ce85db6ab..f08c918b5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -405,7 +405,7 @@
     "revision": "02b1e967ede00aaa5d7c9fcd4a604b83825a6261"
   },
   "pug": {
-    "revision": "884e225b5ecca5d885ae627275f16ef648acd42e"
+    "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
   },
   "puppet": {
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3ae9e09ea..24cd450e6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1215,7 +1215,7 @@ list.prql = {
 list.pug = {
   install_info = {
     url = "https://github.com/zealot128/tree-sitter-pug",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@zealot128" },
   experimental = true,

From f09bcffe0c29a464db24ad8124dd1f0be3fe9ce5 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 27 Jul 2023 04:15:50 -0400
Subject: [PATCH 0549/2704] fix(hoon): add scanner file

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f08c918b5..8d7c8336b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -225,7 +225,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "89271dfe18f20aa71cbe5ef813252a8f98901240"
+    "revision": "dfa565f87c8997d43cec725d41f023cc3577ca46"
   },
   "html": {
     "revision": "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 24cd450e6..71b5eaf85 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -705,7 +705,7 @@ list.hocon = {
 list.hoon = {
   install_info = {
     url = "https://github.com/urbit-pilled/tree-sitter-hoon",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@urbit-pilled" },
   experimental = true,

From c2eae58ce244c301fc96d03bd4ae4fc20f556d3e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 27 Jul 2023 08:32:01 +0000
Subject: [PATCH 0550/2704] Update parsers: cairo, elixir, elm, go, hack,
 kotlin, matlab, perl, poe_filter, promql, python, racket, robot, scala, t32,
 wgsl_bevy, wing

---
 lockfile.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8d7c8336b..b4534a027 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -39,7 +39,7 @@
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
   },
   "cairo": {
-    "revision": "02ec1461f11aa126d3c16abb2da284ca3ba15631"
+    "revision": "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"
   },
   "capnp": {
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
@@ -108,10 +108,10 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "2616034f78ffa83ca6a521ebd7eee1868cb5c14c"
+    "revision": "a2861e88a730287a60c11ea9299c033c7d076e30"
   },
   "elm": {
-    "revision": "73edfcdc3bb2ddfc731cd5d63e6cb287a18da90d"
+    "revision": "8fce414fb951d6d2374593a3adf732621ef4bccf"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -177,7 +177,7 @@
     "revision": "34e0657e37323874c6b67c718a0f83410c4602cf"
   },
   "go": {
-    "revision": "8c8007eaee47702bb0291a3c7aeb004909baab4d"
+    "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
   },
   "godot_resource": {
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
@@ -198,7 +198,7 @@
     "revision": "76e02db5866dd2b096512103ed4d8f630cc32980"
   },
   "hack": {
-    "revision": "95e63e79e0d9f91000bd11d458997fabed1bb1e2"
+    "revision": "2887d3927c5fadebfd71c604922d0c59748e9901"
   },
   "hare": {
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
@@ -279,7 +279,7 @@
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
-    "revision": "2878163ee7cad7eaebd3df1729e86610891fe0ee"
+    "revision": "06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7"
   },
   "lalrpop": {
     "revision": "b7431e4b64183a5d0d094895a4cd5daf51ed3103"
@@ -318,7 +318,7 @@
     "revision": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"
   },
   "matlab": {
-    "revision": "1558d8fc85f7810fa567292ad2a7e64913fa78a1"
+    "revision": "9100997fecc8dba33948712c7536637136842a75"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -372,7 +372,7 @@
     "revision": "3662443335bc95bac0168a338b0f29f87162c244"
   },
   "perl": {
-    "revision": "4a023763f54dec0a6f986f5bd238af788a3f0584"
+    "revision": "6141ee2cb4c954d5fab9c4ed20ad2b159341533c"
   },
   "php": {
     "revision": "d43130fd1525301e9826f420c5393a4d169819fc"
@@ -387,7 +387,7 @@
     "revision": "d6aed225290bc71a15ab6f06305cb11419360c56"
   },
   "poe_filter": {
-    "revision": "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"
+    "revision": "d7b43b51f92fb19efe8af45c2246087c611c8f63"
   },
   "pony": {
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
@@ -396,7 +396,7 @@
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
   "promql": {
-    "revision": "4b6b9f399dc58e408c81da8d8fd7e66ab617eef3"
+    "revision": "ed9a12f6ae4e75d4622adef8fb1b1e4d0ac0a759"
   },
   "proto": {
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
@@ -411,7 +411,7 @@
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "python": {
-    "revision": "7c8930b6388b5590ebef248853f144185a9eda1d"
+    "revision": "1a1b51823c40b9f2c05fe1ba2365d9ecd6b72127"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -429,7 +429,7 @@
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
-    "revision": "92bf6372c63bb413c2d3c1535383d266838d1911"
+    "revision": "d181a9738177a3b21b9f0e7bbb33b1a562f73ba6"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -444,7 +444,7 @@
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
   },
   "robot": {
-    "revision": "51b82cfd0c824681b6a282663820a5ce54243e55"
+    "revision": "5e50f2517580290cd1b9689664815e3b09d986b8"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
@@ -459,7 +459,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "8062487fb3b7f3ce1bb7ce1fd1c84bed60c75203"
+    "revision": "a2f36c2477859110d5b7b675f395e50241fbc004"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -513,7 +513,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "4e581fcd17d76651aa92759a68f9a8186b9fe8dc"
+    "revision": "e4cb4a6adb26650e0a2bf4ae57d829ccb8066dcc"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -585,10 +585,10 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "9e3273e64bdd3f74d1514674286838f9075ee9e4"
+    "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "23712eff9768576bdd852cb9b989a9cd44af014a"
+    "revision": "9c1a59ee61e4e58055af2cf06cdb5ccbd5305aad"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From f590e13d6d52a12230436961e015773719734880 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 27 Jul 2023 05:20:09 -0400
Subject: [PATCH 0551/2704] fix(c): only inject in preproc function
 calls/definitions

---
 queries/c/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 207ef0515..cc6be9fa0 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,4 +1,5 @@
-(preproc_arg) @c
+(preproc_function_def (preproc_arg) @c)
+(preproc_call (preproc_arg) @c)
 
 (comment) @comment
 

From 6aababfca4e3d72cb1e8fbbdac4115a5f88107d0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 27 Jul 2023 07:00:35 -0400
Subject: [PATCH 0552/2704] chore: update C, improve preproc_arg highlights

---
 lockfile.json            | 2 +-
 queries/c/highlights.scm | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index b4534a027..f64749d33 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "ad095896dd223f1c22b85ac5ec84ab11fb732b07"
+    "revision": "28d910c52e701ff3414d3d99c1c2be21d694dbee"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index ef70a7103..83fe8b061 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -1,5 +1,6 @@
 ; Lower priority to prefer @parameter when identifier appears in parameter_declaration.
 ((identifier) @variable (#set! "priority" 95))
+(preproc_def (preproc_arg) @variable)
 
 [
   "default"
@@ -157,6 +158,8 @@
 
 ((identifier) @constant
  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+(preproc_def (preproc_arg) @constant
+  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
 (enumerator
   name: (identifier) @constant)
 (case_statement
@@ -164,6 +167,8 @@
 
 ((identifier) @constant.builtin
     (#any-of? @constant.builtin "stderr" "stdin" "stdout"))
+(preproc_def (preproc_arg) @constant.builtin
+  (#any-of? @constant.builtin "stderr" "stdin" "stdout"))
 
 ;; Preproc def / undef
 (preproc_def
@@ -196,6 +201,9 @@
 (parameter_declaration
   declarator: (identifier) @parameter)
 
+(parameter_declaration
+  declarator: (array_declarator) @parameter)
+
 (parameter_declaration
   declarator: (pointer_declarator) @parameter)
 

From 205b9e9bb88240a4192e0a2372b72b593724965f Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Fri, 28 Jul 2023 08:58:19 +0200
Subject: [PATCH 0553/2704] feat(sql, prql): update sql highlights, update prql
 to v0.9.x compatiblity

---
 lockfile.json               | 2 +-
 queries/prql/highlights.scm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f64749d33..0dfa344e2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -402,7 +402,7 @@
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
   "prql": {
-    "revision": "02b1e967ede00aaa5d7c9fcd4a604b83825a6261"
+    "revision": "b0b7cf06174e65e041d854b843e31f65e47d1fc7"
   },
   "pug": {
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 68b781959..09bf7066b 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -58,14 +58,15 @@ alias: (identifier) @field
   ">"
   "&&"
   "||"
+  "//"
   (bang)
 ] @operator
 
 [
   "("
   ")"
-  "["
-  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 [

From 5e27645a2b7ecce1f8e0971d78f55de0f392ba23 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 28 Jul 2023 06:35:54 +0000
Subject: [PATCH 0554/2704] Update parsers: c, cuda, fortran, haskell, heex,
 luap, ocamllex, php, prql, python, verilog, wing

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0dfa344e2..66548f9a4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "28d910c52e701ff3414d3d99c1c2be21d694dbee"
+    "revision": "39bea7d391f57c5f0e061419e1c3066e03eb14b3"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -75,7 +75,7 @@
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "2af3d43cd96dd3f3c3868095222c7f5e2462b3ab"
+    "revision": "ccb8368181f1684d3c9815bc1271eb25aa7ddb16"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -138,7 +138,7 @@
     "revision": "7ef88a8c652073785bffd7ce9c3effc68035aa11"
   },
   "fortran": {
-    "revision": "482bdb8b8fb7305b928937379820aa6449e359a7"
+    "revision": "7f901048c80e2886f3f0b1d38c699bf75c6a42dd"
   },
   "fsh": {
     "revision": "fa3347712f7a59ed02ccf508284554689c6cde28"
@@ -204,7 +204,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "ba0bfb0e5d8e9e31c160d287878c6f26add3ec08"
+    "revision": "99706824b92f162d4e0f47c7e930bbccb367276e"
   },
   "haskell_persistent": {
     "revision": "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"
@@ -213,7 +213,7 @@
     "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
   },
   "heex": {
-    "revision": "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"
+    "revision": "9bf4ae444a8779839ecbca3b6b896dee426b10ae"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -300,7 +300,7 @@
     "revision": "8981072676ec8bd74def6134be4f883655f7c082"
   },
   "luap": {
-    "revision": "43916b0f31c48a05e03783eb0bab4eec54a4ac75"
+    "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
   },
   "luau": {
     "revision": "6953cd4fa5967c9aa3c769b4e4c7e69c904b9fa9"
@@ -354,7 +354,7 @@
     "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
   },
   "ocamllex": {
-    "revision": "c8f90e42e1b9cf9e30b1669c386b8d9de992d201"
+    "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
     "revision": "d165dbee27617dab2653e38737d96ede1030d14f"
@@ -375,7 +375,7 @@
     "revision": "6141ee2cb4c954d5fab9c4ed20ad2b159341533c"
   },
   "php": {
-    "revision": "d43130fd1525301e9826f420c5393a4d169819fc"
+    "revision": "d76de26b8218df208949f46b31e0c422020eda3a"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
@@ -411,7 +411,7 @@
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "python": {
-    "revision": "1a1b51823c40b9f2c05fe1ba2365d9ecd6b72127"
+    "revision": "5af00f64af6bbf822f208243cce5cf75396fb6f5"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -567,7 +567,7 @@
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
   },
   "verilog": {
-    "revision": "22f9b845c77c52b86b21adaebe689864957f4e31"
+    "revision": "902031343056bc0b11f3e47b33f036a9cf59f58d"
   },
   "vhs": {
     "revision": "fec6e981b7795b68262ddf229d73d2aa03a89b9a"
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "9c1a59ee61e4e58055af2cf06cdb5ccbd5305aad"
+    "revision": "820a17ab5bd18fd523c22f0856eb16d4d6fc3b11"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From db0ccd920b3cf7e96a0a9b43aac0f367decd231a Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Fri, 28 Jul 2023 18:27:02 +0200
Subject: [PATCH 0555/2704] feat(prql): change `func` to `let` for prql 0.9.x

---
 lockfile.json               | 2 +-
 queries/prql/highlights.scm | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 66548f9a4..fb88906a8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -402,7 +402,7 @@
     "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
   },
   "prql": {
-    "revision": "b0b7cf06174e65e041d854b843e31f65e47d1fc7"
+    "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
   },
   "pug": {
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 09bf7066b..92f74f089 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -35,12 +35,8 @@
 
 alias: (identifier) @field
 
-
-
 (comment) @comment @spell
 
-(keyword_func) @keyword.function
-
 (function_call
   (identifier) @function.call)
 
@@ -59,6 +55,7 @@ alias: (identifier) @field
   "&&"
   "||"
   "//"
+  "~="
   (bang)
 ] @operator
 
@@ -138,7 +135,7 @@ alias: (identifier) @field
 ] @keyword.operator
 
 (function_definition
-  (keyword_func)
+  (keyword_let)
   name: (identifier) @function)
 
 (parameter

From ba223ceecc5d66312780c45079b6ae55c406fa96 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 29 Jul 2023 10:41:51 +0200
Subject: [PATCH 0556/2704] fix(tests): mark t32 as allowed to fail

---
 scripts/check-queries.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index c142084de..92a4b4aa8 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -99,7 +99,7 @@ local function do_check()
 end
 
 local ok, result = pcall(do_check)
-local allowed_to_fail = vim.split(vim.env.ALLOWED_INSTALLATION_FAILURES or "", ",", true)
+local allowed_to_fail = { "t32" } -- codeberg hoster is unreliable
 
 for k, v in pairs(require("nvim-treesitter.parsers").get_parser_configs()) do
   if not require("nvim-treesitter.parsers").has_parser(k) then

From 97957a547b93412411ba3a8a9abd27589247c869 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 29 Jul 2023 10:56:17 +0200
Subject: [PATCH 0557/2704] fix(tests): remove t32 tests

t32 parser is hosted on Codeberg, which has frequent outages that block
unrelated CI. Revert this commit if and when uptime has improved.
---
 tests/indent/t32/if_block.cmm           |  49 ----------
 tests/indent/t32/repeat_block.cmm       |  27 ------
 tests/indent/t32/subroutine_block.cmm   |  23 -----
 tests/indent/t32/while_block.cmm        |  14 ---
 tests/indent/t32_spec.lua               | 123 ------------------------
 tests/query/highlights/t32/comments.cmm |  10 --
 tests/query/highlights/t32/keywords.cmm | 108 ---------------------
 tests/query/highlights/t32/literals.cmm |  38 --------
 tests/query/highlights/t32/var.cmm      |  27 ------
 9 files changed, 419 deletions(-)
 delete mode 100644 tests/indent/t32/if_block.cmm
 delete mode 100644 tests/indent/t32/repeat_block.cmm
 delete mode 100644 tests/indent/t32/subroutine_block.cmm
 delete mode 100644 tests/indent/t32/while_block.cmm
 delete mode 100644 tests/indent/t32_spec.lua
 delete mode 100644 tests/query/highlights/t32/comments.cmm
 delete mode 100644 tests/query/highlights/t32/keywords.cmm
 delete mode 100644 tests/query/highlights/t32/literals.cmm
 delete mode 100644 tests/query/highlights/t32/var.cmm

diff --git a/tests/indent/t32/if_block.cmm b/tests/indent/t32/if_block.cmm
deleted file mode 100644
index e85b5e714..000000000
--- a/tests/indent/t32/if_block.cmm
+++ /dev/null
@@ -1,49 +0,0 @@
-IF &a
-  STOP
-
-IF (TRUE())
-(
-  BREAK
-)
-
-IF (&b+CouNT())
-(
-  continue
-)
-
-IF FOUND()
-  STOP
-ELSE
-  CONTinue
-
-IF &c
-  CONTinue
-ELSE IF FALSE()
-  Break
-ELSE
-  stop
-
-IF &d
-(
-  STOP
-)
-ELSE IF &e
-; comment A
-(
-  CONTINUE
-)
-ELSE
-; comment B
-(
-  BREAK
-)
-
-IF &f
-  IF &g
-    stop
-  ELSE
-    IF &h
-  (
-    continue
-  )
-
diff --git a/tests/indent/t32/repeat_block.cmm b/tests/indent/t32/repeat_block.cmm
deleted file mode 100644
index 6384183dc..000000000
--- a/tests/indent/t32/repeat_block.cmm
+++ /dev/null
@@ -1,27 +0,0 @@
-RePeaT 10. PRINT "A"
-
-RePeaT &a
-  print
-
-REPEAT 0xaAfF09
-(
-  cont
-)
-
-RPT
-(
-  b
-)
-
-rpt
-(
-  s
-)
-WHILE &a
-
-REPEAT TRUE()
-; comment
-(
-  cont
-)
-
diff --git a/tests/indent/t32/subroutine_block.cmm b/tests/indent/t32/subroutine_block.cmm
deleted file mode 100644
index 24891c609..000000000
--- a/tests/indent/t32/subroutine_block.cmm
+++ /dev/null
@@ -1,23 +0,0 @@
-printA:
-(
-  PRINT "A"
-  RETURN
-)
-
-sUBROUtINE printB
-(
-  ENTRY &in
-
-  PRINT "&in"
-  RETURN
-)
-
-SUBROUTINE printC
-// comment
-(
-  PARAMETERS &a &b
-
-  PRINT "&a"+"&b"
-  ENDDO
-)
-
diff --git a/tests/indent/t32/while_block.cmm b/tests/indent/t32/while_block.cmm
deleted file mode 100644
index bfcbd45db..000000000
--- a/tests/indent/t32/while_block.cmm
+++ /dev/null
@@ -1,14 +0,0 @@
-WHILE &a
-  Step
-
-WHILE (sYmbol.EXIT(main))
-(
-  Step
-  Break
-)
-
-WHILE (FALSE())
-// comment
-(
-  ECHO "test"
-)
diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua
deleted file mode 100644
index b305cd61c..000000000
--- a/tests/indent/t32_spec.lua
+++ /dev/null
@@ -1,123 +0,0 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
-
-local runner = Runner:new(it, "tests/indent/t32", {
-  tabstop = 2,
-  shiftwidth = 2,
-  softtabstop = 0,
-  expandtab = true,
-})
-
-describe("indent t32:", function()
-  describe("whole file:", function()
-    runner:whole_file "."
-  end)
-
-  describe("new line:", function()
-    runner:new_line("if_block.cmm", { on_line = 2, text = "GOTO start", indent = 0 }, "command after IF", XFAIL)
-
-    runner:new_line("if_block.cmm", { on_line = 5, text = "GOTO start", indent = 2 }, "command in IF then block")
-
-    runner:new_line("if_block.cmm", { on_line = 4, text = "(", indent = 0 }, "block after IF")
-
-    for ii, test in ipairs {
-      { 1, 2 },
-      { 14, 2 },
-      { 19, 2 },
-      { 21, 2 },
-      { 41, 2 },
-      { 42, 4 },
-    } do
-      runner:new_line(
-        "if_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in IF then[" .. ii .. "]"
-      )
-    end
-
-    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 2 }, "command in IF then")
-
-    for ii, test in ipairs {
-      { 16, 2 },
-      { 21, 2 },
-      { 23, 2 },
-      { 44, 4 },
-    } do
-      runner:new_line(
-        "if_block.cmm",
-        { on_line = test[1], text = "(\n", indent = test[2] },
-        "command in IF else[" .. ii .. "]"
-      )
-    end
-
-    runner:new_line("while_block.cmm", { on_line = 2, text = "&x=1.", indent = 2 }, "command after WHILE")
-
-    runner:new_line("while_block.cmm", { on_line = 4, text = "&x=1.", indent = 0 }, "command after WHILE")
-
-    runner:new_line("while_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block in WHILE then")
-
-    for ii, test in ipairs {
-      { 5, 2 },
-      { 12, 2 },
-    } do
-      runner:new_line(
-        "while_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in WHILE then block[" .. ii .. "]"
-      )
-    end
-
-    for ii, test in ipairs {
-      { 1, 0, nil },
-      { 4, 2, XFAIL },
-    } do
-      runner:new_line(
-        "repeat_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after RePeaT[" .. ii .. "]"
-      )
-    end
-
-    runner:new_line("repeat_block.cmm", { on_line = 3, text = "(\n", indent = 0 }, "block in RePeaT then")
-
-    for ii, test in ipairs {
-      { 7, 2, XFAIL },
-      { 18, 2, nil },
-      { 24, 2, XFAIL },
-    } do
-      runner:new_line(
-        "repeat_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in RePeaT then block [" .. ii .. "]"
-      )
-    end
-
-    runner:new_line("subroutine_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block after call label")
-
-    for ii, test in ipairs {
-      { 2, 2, XFAIL },
-      { 3, 2, nil },
-      { 8, 2, XFAIL },
-      { 12, 2, nil },
-      { 19, 2, XFAIL },
-    } do
-      runner:new_line(
-        "subroutine_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in subroutine block[" .. ii .. "]"
-      )
-    end
-
-    for ii, test in ipairs {
-      { 5, 2 },
-      { 13, 2 },
-      { 23, 2 },
-    } do
-      runner:new_line(
-        "subroutine_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after subroutine block[" .. ii .. "]"
-      )
-    end
-  end)
-end)
diff --git a/tests/query/highlights/t32/comments.cmm b/tests/query/highlights/t32/comments.cmm
deleted file mode 100644
index 0bab130f6..000000000
--- a/tests/query/highlights/t32/comments.cmm
+++ /dev/null
@@ -1,10 +0,0 @@
-// This is a comment
-; <- comment
-
-; Another comment
-; <- comment
-
-ECHO &a // This is a trailing comment
-;       ^ comment
-
-// vim: set ft=t32:
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
deleted file mode 100644
index f51786e46..000000000
--- a/tests/query/highlights/t32/keywords.cmm
+++ /dev/null
@@ -1,108 +0,0 @@
-PRIVATE &password
-; <- keyword
-;        ^ variable.builtin
-ENTRY &password
-; <- keyword
-;        ^ parameter
-
-ENTRY %LINE &salt
-; <- keyword
-;      ^ constant.builtin
-;            ^ parameter
-
-IF "&password"==""
-; <- conditional
-;  ^ string
-;    ^ variable.builtin
-;             ^ operator
-(
-    ECHO "Failed to provide password."
-    ENDDO
-;   ^ keyword.return
-)
-ELSE
-; <- conditional
-(
-    PRIVATE &pass
-
-    &pass=FALSE()
-;          ^ function.builtin
-    WHILE !&pass
-;         ^ operator
-    (
-        GOSUB verify_password "&password"
-;             ^ function.call
-        RETURNVALUES &pass
-;                     ^ parameter
-        WAIT 10.ms
-;            ^ number
-    )
-
-    IF !&pass
-        GOTO fail
-;            ^ label
-    ELSE
-    (
-        GOSUB start_debug
-;             ^ function.call
-    )
-)
-
-LOCAL &num
-;      ^ variable.builtin
-
-&num = 2.
-;      ^ number
-
-RePeaT &num PRINT "Password: &password"
-;       ^ variable.builtin
-;                             ^ variable.builtin
-
-WinCLEAR
-FramePOS ,,,,Maximized
-;        ^ punctuation.delimiter
-;            ^ constant
-WinPOS 0% 50% 100% 35%
-;      ^ number
-COVerage.ListFunc
-
-ENDDO
-
-
-fail:
-; <- label
-    PRINT %ERROR "Password verification failed."
-    END
-;   ^ keyword.return
-
-
-verify_password:
-; <- function
-(
-    PARAMETERS &password
-;               ^ parameter
-
-    SYStem.Option.KEYCODE "&password"
-    SYStem.JtagClock  1kHz
-;                     ^ number
-    SYStem.Mode.Attach
-
-    Data.Set EAXI:0x34000000 %Long 0x34000100 0x34000021 /verify
-;            ^ number
-;                             ^ constant.builtin
-;                                                         ^ constant
-
-    RETURN TRUE()
-;   ^ keyword.return
-)
-
-
-SUBROUTINE start_debug
-;          ^ function
-(
-    Go main
-    RETURN
-;   ^ keyword.return
-)
-
-// vim: set ft=t32:
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
deleted file mode 100644
index b1662639b..000000000
--- a/tests/query/highlights/t32/literals.cmm
+++ /dev/null
@@ -1,38 +0,0 @@
-WinPOS ,,1000.,,,,myWatchWindow
-;        ^ number
-
-PRinTer.OPEN "~~~/varwatch.txt" ASCIIE
-;            ^ string
-
-sYmbol.NEW _InitialSP   0x34000100
-;                       ^ number
-
-DO ~~~~/test.cmm
-;  ^ string.special
-
-WAIT 1.ns
-;    ^ number
-
-SYStem.JtagClock  100.GHZ
-;                 ^ number
-
-DATA.SET P:&HEAD+0x4 %LONG DATA.LONG(EA:&HEAD+0x4)&0xFFFFFF
-;                                    ^ number
-
-List `main`
-;    ^ symbol
-
-&range = 'a'--'z'||'0'--'9'
-;        ^ character
-;           ^ operator
-;                       ^ character
-
-Data.Set N: 0xffff800000 0y0011xx01xx&&a
-;        ^ number
-;                        ^ number
-;                                    ^ operator
-
-WinPOS 0% 85% 100% 15%
-;             ^ number
-
-// vim: set ft=t32:
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
deleted file mode 100644
index a2d6f9b2a..000000000
--- a/tests/query/highlights/t32/var.cmm
+++ /dev/null
@@ -1,27 +0,0 @@
-Var.NEWGLOBAL char[4][32] \myarr
-; <- keyword
-;             ^ type
-;                          ^ variable.builtin
-LOCAL &i &data
-
-&data="zero|one|two|three"
-
-&i=0.
-WHILE &i<4
-(
-    PRIVATE &val
-    &val=STRing.SPLIT("&data","|",&i)
-    Var.Assign \myarr[&i]="&val"
-;              ^ variable.builtin
-    &i=&i+1.
-)
-
-Var.NEWLOCAL \x
-; <- keyword
-;             ^ variable.builtin
-Var.set \x=func3(5,3)
-;       ^ variable.builtin
-PRINT Var.VALUE(\x)
-;               ^ variable.builtin
-
-// vim: set ft=t32:

From ee107fc759647293a84ad42b867f518331364fbe Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 29 Jul 2023 06:35:06 +0000
Subject: [PATCH 0558/2704] Update parsers: fortran, glsl, hoon, matlab, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fb88906a8..eaf47cd1d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -138,7 +138,7 @@
     "revision": "7ef88a8c652073785bffd7ce9c3effc68035aa11"
   },
   "fortran": {
-    "revision": "7f901048c80e2886f3f0b1d38c699bf75c6a42dd"
+    "revision": "6828cf3629addb1706bdbbd33491e95f12b7042c"
   },
   "fsh": {
     "revision": "fa3347712f7a59ed02ccf508284554689c6cde28"
@@ -174,7 +174,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "34e0657e37323874c6b67c718a0f83410c4602cf"
+    "revision": "e9c49d0752d968bc6dcd35d0c3a88397c5d51757"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -225,7 +225,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "dfa565f87c8997d43cec725d41f023cc3577ca46"
+    "revision": "900a272271cc2fb78f24aa7b5a1e21ed36bb1d39"
   },
   "html": {
     "revision": "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"
@@ -318,7 +318,7 @@
     "revision": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"
   },
   "matlab": {
-    "revision": "9100997fecc8dba33948712c7536637136842a75"
+    "revision": "c8723b33970deda54257e640779714fb181d4d5f"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "820a17ab5bd18fd523c22f0856eb16d4d6fc3b11"
+    "revision": "996e87a0fa23ebd41d6c50fdff61d2ec6e2e1c1e"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From e8648569d82c7bb46dc511cda9dbec687774461f Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Sun, 30 Jul 2023 08:31:18 +0200
Subject: [PATCH 0559/2704] feat(sql): add new keywords

---
 lockfile.json              | 2 +-
 queries/sql/highlights.scm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index eaf47cd1d..109486fbf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -486,7 +486,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "9fc30c949f29747d34c254677d039c9df3c521b4"
+    "revision": "61ab7913e110082b7f1fab5421ae3f971b3578ce"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 4bfaa3cb9..d45e9a5a6 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -164,6 +164,8 @@
   (keyword_no)
   (keyword_data)
   (keyword_type)
+  (keyword_value)
+  (keyword_attribute)
   (keyword_rename)
   (keyword_to)
   (keyword_schema)
@@ -186,6 +188,7 @@
   (keyword_change)
   (keyword_modify)
   (keyword_after)
+  (keyword_before)
   (keyword_range)
   (keyword_rows)
   (keyword_groups)

From 2fb735982893bf61c39bc98f5980a57c307f669d Mon Sep 17 00:00:00 2001
From: Christoph Sax <christoph.sax@mailbox.org>
Date: Tue, 25 Jul 2023 06:12:57 +0200
Subject: [PATCH 0560/2704] feat(t32)!: update queries for new HLL node types

- Lock grammar to version 2.1.1
- Update query for syntax hightlighting
- fix missing locals query
- reduce number of "(identifier) @variable" highlight queries
- revert to capture @function.builtin for PRACTICE call expressions
---
 lua/nvim-treesitter/parsers.lua |   2 +-
 queries/t32/highlights.scm      | 136 ++++++++++++++++++++++++++------
 queries/t32/locals.scm          |   7 +-
 3 files changed, 119 insertions(+), 26 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 71b5eaf85..10884fcf4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1512,7 +1512,7 @@ list.t32 = {
   install_info = {
     url = "https://codeberg.org/xasc/tree-sitter-t32",
     files = { "src/parser.c", "src/scanner.c" },
-    revision = "1dd98248b01e4a3933c1b85b58bab0875e2ba437",
+    revision = "767f3c52fe649e4a6ab3551ac287e5b6038c9148",
   },
   maintainers = { "@xasc" },
 }
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index e5cba0125..d1543efd0 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -1,3 +1,4 @@
+; Keywords, punctuation and operators
 [
   "="
   "^^"
@@ -28,50 +29,129 @@
   "&"
   "->"
   "*"
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "|="
+  "&="
+  "^="
+  ">>="
+  "<<="
+  "--"
+  "++"
 ] @operator
 
 [
- "("
- ")"
- "{"
- "}"
- "["
- "]"
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
 ] @punctuation.bracket
 
 [
   ","
   "."
-  ";"
 ] @punctuation.delimiter
 
 [
-  (access_class)
+  "enum"
+  "struct"
+  "union"
+] @keyword
+
+"sizeof" @keyword.operator
+
+[
+  "const"
+  "volatile"
+] @type.qualifier
+
+
+; Operators in comma and conditional HLL expressions
+(hll_comma_expression
+  "," @operator)
+
+(hll_conditional_expression
+  [
+   "?"
+   ":"
+] @conditional.ternary)
+
+
+; Strings and others literal types
+(access_class) @constant.builtin
+
+[
   (address)
   (bitmask)
   (file_handle)
-  (frequency)
   (integer)
-  (percentage)
-  (time)
+  (hll_number_literal)
 ] @number
 
-(float) @float
+[
+  (float)
+  (frequency)
+  (percentage)
+  (time)
+] @float
 
-(string) @string
+[
+  (string)
+  (hll_string_literal)
+] @string
+
+(hll_escape_sequence) @string.escape
 
 (path) @string.special
-
 (symbol) @symbol
 
-(character) @character
+[
+  (character)
+  (hll_char_literal)
+] @character
+
+
+; Types in HLL expressions
+[
+ (hll_type_identifier)
+ (hll_type_descriptor)
+] @type
+
+(hll_type_qualifier) @type.qualifier
+
+(hll_primitive_type) @type.builtin
+
+
+; HLL expressions
+(hll_call_expression
+  function: (identifier) @function.call)
+
+(hll_call_expression
+  function: (hll_field_expression
+    field: (hll_field_identifier) @function.call))
+
+
+; HLL variables
+(identifier) @variable
+(hll_field_identifier) @field
+
 
 ; Commands
 (command_expression
   command: (identifier) @keyword)
+
 (macro_definition
   command: (identifier) @keyword)
 
+(call_expression
+  function: (identifier) @function.builtin)
+
+
 ; Returns
 (
   (command_expression
@@ -84,20 +164,23 @@
   (#lua-match? @keyword.return "^[rR][eE][tT][uU][rR][nN]$")
 )
 
+
 ; Subroutine calls
 (subroutine_call_expression
   command: (identifier) @keyword
   subroutine: (identifier) @function.call)
 
+
 ; Variables, constants and labels
 (macro) @variable.builtin
-(internal_c_variable) @variable.builtin
+(trace32_hll_variable) @variable.builtin
 
 (argument_list
-  (identifier) @constant)
+  (identifier) @constant.builtin)
+
 (
- (argument_list (identifier) @constant.builtin)
- (#lua-match? @constant.builtin "^[%%/][%l%u][%l%u%d.]*$")
+  (argument_list (identifier) @constant.builtin)
+  (#lua-match? @constant.builtin "^[%%/][%l%u][%l%u%d.]*$")
 )
 
 (
@@ -106,24 +189,34 @@
     arguments: (argument_list . (identifier) @label))
   (#lua-match? @keyword "^[gG][oO][tT][oO]$")
 )
+
 (labeled_expression
   label: (identifier) @label)
 
+(option_expression
+  (identifier) @constant.builtin)
+
+(format_expression
+  (identifier) @constant.builtin)
+
+
 ; Subroutine blocks
 (subroutine_block
-  command: (identifier) @keyword
+  command: (identifier) @keyword.function
   subroutine: (identifier) @function)
 
 (labeled_expression
   label: (identifier) @function
   (block))
 
+
 ; Parameter declarations
 (parameter_declaration
   command: (identifier) @keyword
   (identifier)? @constant.builtin
   macro: (macro) @parameter)
 
+
 ; Control flow
 (if_block
   command: (identifier) @conditional)
@@ -135,8 +228,5 @@
 (repeat_block
   command: (identifier) @repeat)
 
-(call_expression
-  function: (identifier) @function.builtin)
 
-(type_identifier) @type
 (comment) @comment @spell
diff --git a/queries/t32/locals.scm b/queries/t32/locals.scm
index 7d18a7d3c..dc1f97fc2 100644
--- a/queries/t32/locals.scm
+++ b/queries/t32/locals.scm
@@ -13,7 +13,7 @@
 (command_expression
   command: (identifier)
   arguments: (argument_list
-    variable: (identifier) @definition.var))
+    declarator: (trace32_hll_variable) @definition.var))
 
 ; Function definitions
 (subroutine_block
@@ -32,4 +32,7 @@
   (#set! reference.kind "function")
 )
 
-(macro) @reference
+[
+  (macro)
+  (trace32_hll_variable)
+] @reference

From 536c8a3880a79492e6d69506b36088ebf4dd2f2a Mon Sep 17 00:00:00 2001
From: Christoph Sax <christoph.sax@mailbox.org>
Date: Sun, 30 Jul 2023 17:23:30 +0200
Subject: [PATCH 0561/2704] feat(t32): re-enable tests

- Switch to GitLab mirror repository
- Lock grammar version 2.2.0
- Revert "fix(tests): mark t32 as allowed to fail"
  This reverts commit ba223ceecc5d66312780c45079b6ae55c406fa96.
- Revert "fix(tests): remove t32 tests"
  This reverts commit 97957a547b93412411ba3a8a9abd27589247c869.
---
 lua/nvim-treesitter/parsers.lua         |   4 +-
 scripts/check-queries.lua               |   2 +-
 tests/indent/t32/if_block.cmm           |  49 ++++++++++
 tests/indent/t32/repeat_block.cmm       |  27 ++++++
 tests/indent/t32/subroutine_block.cmm   |  23 +++++
 tests/indent/t32/while_block.cmm        |  14 +++
 tests/indent/t32_spec.lua               | 123 ++++++++++++++++++++++++
 tests/query/highlights/t32/comments.cmm |  10 ++
 tests/query/highlights/t32/keywords.cmm | 108 +++++++++++++++++++++
 tests/query/highlights/t32/literals.cmm |  38 ++++++++
 tests/query/highlights/t32/var.cmm      |  27 ++++++
 11 files changed, 422 insertions(+), 3 deletions(-)
 create mode 100644 tests/indent/t32/if_block.cmm
 create mode 100644 tests/indent/t32/repeat_block.cmm
 create mode 100644 tests/indent/t32/subroutine_block.cmm
 create mode 100644 tests/indent/t32/while_block.cmm
 create mode 100644 tests/indent/t32_spec.lua
 create mode 100644 tests/query/highlights/t32/comments.cmm
 create mode 100644 tests/query/highlights/t32/keywords.cmm
 create mode 100644 tests/query/highlights/t32/literals.cmm
 create mode 100644 tests/query/highlights/t32/var.cmm

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 10884fcf4..6c8ab2647 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1510,9 +1510,9 @@ list.systemtap = {
 
 list.t32 = {
   install_info = {
-    url = "https://codeberg.org/xasc/tree-sitter-t32",
+    url = "https://gitlab.com/xasc/tree-sitter-t32",
     files = { "src/parser.c", "src/scanner.c" },
-    revision = "767f3c52fe649e4a6ab3551ac287e5b6038c9148",
+    revision = "9d2520ae9886d3a768a352ec80db8762afb5232d",
   },
   maintainers = { "@xasc" },
 }
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 92a4b4aa8..c142084de 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -99,7 +99,7 @@ local function do_check()
 end
 
 local ok, result = pcall(do_check)
-local allowed_to_fail = { "t32" } -- codeberg hoster is unreliable
+local allowed_to_fail = vim.split(vim.env.ALLOWED_INSTALLATION_FAILURES or "", ",", true)
 
 for k, v in pairs(require("nvim-treesitter.parsers").get_parser_configs()) do
   if not require("nvim-treesitter.parsers").has_parser(k) then
diff --git a/tests/indent/t32/if_block.cmm b/tests/indent/t32/if_block.cmm
new file mode 100644
index 000000000..e85b5e714
--- /dev/null
+++ b/tests/indent/t32/if_block.cmm
@@ -0,0 +1,49 @@
+IF &a
+  STOP
+
+IF (TRUE())
+(
+  BREAK
+)
+
+IF (&b+CouNT())
+(
+  continue
+)
+
+IF FOUND()
+  STOP
+ELSE
+  CONTinue
+
+IF &c
+  CONTinue
+ELSE IF FALSE()
+  Break
+ELSE
+  stop
+
+IF &d
+(
+  STOP
+)
+ELSE IF &e
+; comment A
+(
+  CONTINUE
+)
+ELSE
+; comment B
+(
+  BREAK
+)
+
+IF &f
+  IF &g
+    stop
+  ELSE
+    IF &h
+  (
+    continue
+  )
+
diff --git a/tests/indent/t32/repeat_block.cmm b/tests/indent/t32/repeat_block.cmm
new file mode 100644
index 000000000..6384183dc
--- /dev/null
+++ b/tests/indent/t32/repeat_block.cmm
@@ -0,0 +1,27 @@
+RePeaT 10. PRINT "A"
+
+RePeaT &a
+  print
+
+REPEAT 0xaAfF09
+(
+  cont
+)
+
+RPT
+(
+  b
+)
+
+rpt
+(
+  s
+)
+WHILE &a
+
+REPEAT TRUE()
+; comment
+(
+  cont
+)
+
diff --git a/tests/indent/t32/subroutine_block.cmm b/tests/indent/t32/subroutine_block.cmm
new file mode 100644
index 000000000..24891c609
--- /dev/null
+++ b/tests/indent/t32/subroutine_block.cmm
@@ -0,0 +1,23 @@
+printA:
+(
+  PRINT "A"
+  RETURN
+)
+
+sUBROUtINE printB
+(
+  ENTRY &in
+
+  PRINT "&in"
+  RETURN
+)
+
+SUBROUTINE printC
+// comment
+(
+  PARAMETERS &a &b
+
+  PRINT "&a"+"&b"
+  ENDDO
+)
+
diff --git a/tests/indent/t32/while_block.cmm b/tests/indent/t32/while_block.cmm
new file mode 100644
index 000000000..bfcbd45db
--- /dev/null
+++ b/tests/indent/t32/while_block.cmm
@@ -0,0 +1,14 @@
+WHILE &a
+  Step
+
+WHILE (sYmbol.EXIT(main))
+(
+  Step
+  Break
+)
+
+WHILE (FALSE())
+// comment
+(
+  ECHO "test"
+)
diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua
new file mode 100644
index 000000000..b305cd61c
--- /dev/null
+++ b/tests/indent/t32_spec.lua
@@ -0,0 +1,123 @@
+local Runner = require("tests.indent.common").Runner
+local XFAIL = require("tests.indent.common").XFAIL
+
+local runner = Runner:new(it, "tests/indent/t32", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent t32:", function()
+  describe("whole file:", function()
+    runner:whole_file "."
+  end)
+
+  describe("new line:", function()
+    runner:new_line("if_block.cmm", { on_line = 2, text = "GOTO start", indent = 0 }, "command after IF", XFAIL)
+
+    runner:new_line("if_block.cmm", { on_line = 5, text = "GOTO start", indent = 2 }, "command in IF then block")
+
+    runner:new_line("if_block.cmm", { on_line = 4, text = "(", indent = 0 }, "block after IF")
+
+    for ii, test in ipairs {
+      { 1, 2 },
+      { 14, 2 },
+      { 19, 2 },
+      { 21, 2 },
+      { 41, 2 },
+      { 42, 4 },
+    } do
+      runner:new_line(
+        "if_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in IF then[" .. ii .. "]"
+      )
+    end
+
+    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 2 }, "command in IF then")
+
+    for ii, test in ipairs {
+      { 16, 2 },
+      { 21, 2 },
+      { 23, 2 },
+      { 44, 4 },
+    } do
+      runner:new_line(
+        "if_block.cmm",
+        { on_line = test[1], text = "(\n", indent = test[2] },
+        "command in IF else[" .. ii .. "]"
+      )
+    end
+
+    runner:new_line("while_block.cmm", { on_line = 2, text = "&x=1.", indent = 2 }, "command after WHILE")
+
+    runner:new_line("while_block.cmm", { on_line = 4, text = "&x=1.", indent = 0 }, "command after WHILE")
+
+    runner:new_line("while_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block in WHILE then")
+
+    for ii, test in ipairs {
+      { 5, 2 },
+      { 12, 2 },
+    } do
+      runner:new_line(
+        "while_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in WHILE then block[" .. ii .. "]"
+      )
+    end
+
+    for ii, test in ipairs {
+      { 1, 0, nil },
+      { 4, 2, XFAIL },
+    } do
+      runner:new_line(
+        "repeat_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command after RePeaT[" .. ii .. "]"
+      )
+    end
+
+    runner:new_line("repeat_block.cmm", { on_line = 3, text = "(\n", indent = 0 }, "block in RePeaT then")
+
+    for ii, test in ipairs {
+      { 7, 2, XFAIL },
+      { 18, 2, nil },
+      { 24, 2, XFAIL },
+    } do
+      runner:new_line(
+        "repeat_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in RePeaT then block [" .. ii .. "]"
+      )
+    end
+
+    runner:new_line("subroutine_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block after call label")
+
+    for ii, test in ipairs {
+      { 2, 2, XFAIL },
+      { 3, 2, nil },
+      { 8, 2, XFAIL },
+      { 12, 2, nil },
+      { 19, 2, XFAIL },
+    } do
+      runner:new_line(
+        "subroutine_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command in subroutine block[" .. ii .. "]"
+      )
+    end
+
+    for ii, test in ipairs {
+      { 5, 2 },
+      { 13, 2 },
+      { 23, 2 },
+    } do
+      runner:new_line(
+        "subroutine_block.cmm",
+        { on_line = test[1], text = "&x=1.", indent = test[2] },
+        "command after subroutine block[" .. ii .. "]"
+      )
+    end
+  end)
+end)
diff --git a/tests/query/highlights/t32/comments.cmm b/tests/query/highlights/t32/comments.cmm
new file mode 100644
index 000000000..0bab130f6
--- /dev/null
+++ b/tests/query/highlights/t32/comments.cmm
@@ -0,0 +1,10 @@
+// This is a comment
+; <- comment
+
+; Another comment
+; <- comment
+
+ECHO &a // This is a trailing comment
+;       ^ comment
+
+// vim: set ft=t32:
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
new file mode 100644
index 000000000..f51786e46
--- /dev/null
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -0,0 +1,108 @@
+PRIVATE &password
+; <- keyword
+;        ^ variable.builtin
+ENTRY &password
+; <- keyword
+;        ^ parameter
+
+ENTRY %LINE &salt
+; <- keyword
+;      ^ constant.builtin
+;            ^ parameter
+
+IF "&password"==""
+; <- conditional
+;  ^ string
+;    ^ variable.builtin
+;             ^ operator
+(
+    ECHO "Failed to provide password."
+    ENDDO
+;   ^ keyword.return
+)
+ELSE
+; <- conditional
+(
+    PRIVATE &pass
+
+    &pass=FALSE()
+;          ^ function.builtin
+    WHILE !&pass
+;         ^ operator
+    (
+        GOSUB verify_password "&password"
+;             ^ function.call
+        RETURNVALUES &pass
+;                     ^ parameter
+        WAIT 10.ms
+;            ^ number
+    )
+
+    IF !&pass
+        GOTO fail
+;            ^ label
+    ELSE
+    (
+        GOSUB start_debug
+;             ^ function.call
+    )
+)
+
+LOCAL &num
+;      ^ variable.builtin
+
+&num = 2.
+;      ^ number
+
+RePeaT &num PRINT "Password: &password"
+;       ^ variable.builtin
+;                             ^ variable.builtin
+
+WinCLEAR
+FramePOS ,,,,Maximized
+;        ^ punctuation.delimiter
+;            ^ constant
+WinPOS 0% 50% 100% 35%
+;      ^ number
+COVerage.ListFunc
+
+ENDDO
+
+
+fail:
+; <- label
+    PRINT %ERROR "Password verification failed."
+    END
+;   ^ keyword.return
+
+
+verify_password:
+; <- function
+(
+    PARAMETERS &password
+;               ^ parameter
+
+    SYStem.Option.KEYCODE "&password"
+    SYStem.JtagClock  1kHz
+;                     ^ number
+    SYStem.Mode.Attach
+
+    Data.Set EAXI:0x34000000 %Long 0x34000100 0x34000021 /verify
+;            ^ number
+;                             ^ constant.builtin
+;                                                         ^ constant
+
+    RETURN TRUE()
+;   ^ keyword.return
+)
+
+
+SUBROUTINE start_debug
+;          ^ function
+(
+    Go main
+    RETURN
+;   ^ keyword.return
+)
+
+// vim: set ft=t32:
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
new file mode 100644
index 000000000..b1662639b
--- /dev/null
+++ b/tests/query/highlights/t32/literals.cmm
@@ -0,0 +1,38 @@
+WinPOS ,,1000.,,,,myWatchWindow
+;        ^ number
+
+PRinTer.OPEN "~~~/varwatch.txt" ASCIIE
+;            ^ string
+
+sYmbol.NEW _InitialSP   0x34000100
+;                       ^ number
+
+DO ~~~~/test.cmm
+;  ^ string.special
+
+WAIT 1.ns
+;    ^ number
+
+SYStem.JtagClock  100.GHZ
+;                 ^ number
+
+DATA.SET P:&HEAD+0x4 %LONG DATA.LONG(EA:&HEAD+0x4)&0xFFFFFF
+;                                    ^ number
+
+List `main`
+;    ^ symbol
+
+&range = 'a'--'z'||'0'--'9'
+;        ^ character
+;           ^ operator
+;                       ^ character
+
+Data.Set N: 0xffff800000 0y0011xx01xx&&a
+;        ^ number
+;                        ^ number
+;                                    ^ operator
+
+WinPOS 0% 85% 100% 15%
+;             ^ number
+
+// vim: set ft=t32:
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
new file mode 100644
index 000000000..a2d6f9b2a
--- /dev/null
+++ b/tests/query/highlights/t32/var.cmm
@@ -0,0 +1,27 @@
+Var.NEWGLOBAL char[4][32] \myarr
+; <- keyword
+;             ^ type
+;                          ^ variable.builtin
+LOCAL &i &data
+
+&data="zero|one|two|three"
+
+&i=0.
+WHILE &i<4
+(
+    PRIVATE &val
+    &val=STRing.SPLIT("&data","|",&i)
+    Var.Assign \myarr[&i]="&val"
+;              ^ variable.builtin
+    &i=&i+1.
+)
+
+Var.NEWLOCAL \x
+; <- keyword
+;             ^ variable.builtin
+Var.set \x=func3(5,3)
+;       ^ variable.builtin
+PRINT Var.VALUE(\x)
+;               ^ variable.builtin
+
+// vim: set ft=t32:

From 0fe8fa0bcf65ca3eb0d8beeab6fcf952cfb8f4f9 Mon Sep 17 00:00:00 2001
From: Christoph Sax <christoph.sax@mailbox.org>
Date: Sun, 30 Jul 2023 18:10:40 +0200
Subject: [PATCH 0562/2704] feat(t32): update tests to new node types

---
 tests/query/highlights/t32/keywords.cmm | 31 +++++++++++----
 tests/query/highlights/t32/literals.cmm | 11 +++---
 tests/query/highlights/t32/var.cmm      | 50 ++++++++++++++++++++++++-
 3 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
index f51786e46..21422438b 100644
--- a/tests/query/highlights/t32/keywords.cmm
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -35,7 +35,7 @@ ELSE
         RETURNVALUES &pass
 ;                     ^ parameter
         WAIT 10.ms
-;            ^ number
+;            ^ float
     )
 
     IF !&pass
@@ -61,9 +61,9 @@ RePeaT &num PRINT "Password: &password"
 WinCLEAR
 FramePOS ,,,,Maximized
 ;        ^ punctuation.delimiter
-;            ^ constant
+;            ^ constant.builtin
 WinPOS 0% 50% 100% 35%
-;      ^ number
+;      ^ float
 COVerage.ListFunc
 
 ENDDO
@@ -84,13 +84,16 @@ verify_password:
 
     SYStem.Option.KEYCODE "&password"
     SYStem.JtagClock  1kHz
-;                     ^ number
+;                     ^ float
     SYStem.Mode.Attach
 
-    Data.Set EAXI:0x34000000 %Long 0x34000100 0x34000021 /verify
-;            ^ number
-;                             ^ constant.builtin
-;                                                         ^ constant
+    Data.Set N: EAXI:0x34000000 %Long 0x34000100 0x34000021 /verify
+;            ^ constant.builtin
+;               ^ constant.builtin
+;                    ^ number
+;                                ^ constant.builtin
+;                                     ^ number
+;                                                            ^ constant.builtin
 
     RETURN TRUE()
 ;   ^ keyword.return
@@ -98,8 +101,20 @@ verify_password:
 
 
 SUBROUTINE start_debug
+; <- keyword.function
 ;          ^ function
 (
+    COVerage.ListModule %MULTI.OBC \sieve
+;    ^ keyword
+;                        ^ constant.builtin
+;                                  ^ symbol
+
+    Var.DRAW flags[0..16] /Alternate 3
+;    ^ keyword
+;             ^ variable
+;                          ^ constant.builtin
+;                                    ^ number
+
     Go main
     RETURN
 ;   ^ keyword.return
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
index b1662639b..6c6849aea 100644
--- a/tests/query/highlights/t32/literals.cmm
+++ b/tests/query/highlights/t32/literals.cmm
@@ -11,13 +11,13 @@ DO ~~~~/test.cmm
 ;  ^ string.special
 
 WAIT 1.ns
-;    ^ number
+;    ^ float
 
 SYStem.JtagClock  100.GHZ
-;                 ^ number
+;                 ^ float
 
 DATA.SET P:&HEAD+0x4 %LONG DATA.LONG(EA:&HEAD+0x4)&0xFFFFFF
-;                                    ^ number
+;                                    ^ constant.builtin
 
 List `main`
 ;    ^ symbol
@@ -28,11 +28,12 @@ List `main`
 ;                       ^ character
 
 Data.Set N: 0xffff800000 0y0011xx01xx&&a
-;        ^ number
+;        ^ constant.builtin
+;           ^ number
 ;                        ^ number
 ;                                    ^ operator
 
 WinPOS 0% 85% 100% 15%
-;             ^ number
+;             ^ float
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
index a2d6f9b2a..d77de90c8 100644
--- a/tests/query/highlights/t32/var.cmm
+++ b/tests/query/highlights/t32/var.cmm
@@ -1,6 +1,6 @@
 Var.NEWGLOBAL char[4][32] \myarr
 ; <- keyword
-;             ^ type
+;             ^ type.builtin
 ;                          ^ variable.builtin
 LOCAL &i &data
 
@@ -13,6 +13,7 @@ WHILE &i<4
     &val=STRing.SPLIT("&data","|",&i)
     Var.Assign \myarr[&i]="&val"
 ;              ^ variable.builtin
+;                        ^ operator
     &i=&i+1.
 )
 
@@ -21,7 +22,54 @@ Var.NEWLOCAL \x
 ;             ^ variable.builtin
 Var.set \x=func3(5,3)
 ;       ^ variable.builtin
+;          ^ function.call
+;                ^ number
 PRINT Var.VALUE(\x)
 ;               ^ variable.builtin
+PRINT Var.VALUE('a')
+;               ^ character
+Var.Assign (*ap)[2..4] = &a
+;            ^ variable
+;                         ^ variable
+Var.Assign sp = &s.n+offset
+;          ^ variable
+;                ^ variable
+;                  ^ field
+;                    ^ variable
+Var.Assign padd = (CAddition const * volatile)&d
+;          ^ variable
+;                  ^ type
+;                            ^ type.qualifier
+;                                    ^ type.qualifier
+;                                              ^ variable
+Var.Assign e1 = (enum e2)&e
+;          ^ variable
+;                ^ keyword
+;                     ^ type
+;                         ^ variable
+Var.Assign *vector = (struct Vector3d*)&acceleration
+;           ^ variable
+;                     ^ keyword
+;                            ^ type
+;                                       ^ variable
+Var.Assign z = (union foo)x
+;          ^ variable
+;               ^ keyword
+;                     ^ type
+;                         ^ variable
+Var.Assign b = -a
+;          ^ variable
+;               ^ variable
+Var.Assign c = i++
+;          ^ variable
+;              ^ variable
+Var.Assign d = sizeof(int)
+;          ^ variable
+;              ^ keyword.operator
+;                     ^ type.builtin
+Var.call strcmp(key,buffer)
+;        ^ function.call
+;               ^ variable
+;                   ^ variable
 
 // vim: set ft=t32:

From 1c79da3300951e934f635eaf8703480b57644e7e Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sun, 30 Jul 2023 17:30:12 +0000
Subject: [PATCH 0563/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 74077290d..263da5605 100644
--- a/README.md
+++ b/README.md
@@ -344,7 +344,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
-- [x] [t32](https://codeberg.org/xasc/tree-sitter-t32) (maintained by @xasc)
+- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)

From 82c948653909d8c1582f28313aa1cf9d68d66fe8 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Mon, 31 Jul 2023 16:14:34 +0530
Subject: [PATCH 0564/2704] fix(fennel): capture method calls as `@method.call`

---
 queries/fennel/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index c5f648472..9b072f55b 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -34,7 +34,7 @@
 
 (multi_symbol_method
    ":" @punctuation.delimiter
-   (symbol) @method .)
+   (symbol) @method.call .)
 
 (list . (symbol) @function.call)
 (list . (multi_symbol (symbol) @function.call .))

From 4fd6d9dc175f367cdcec87630d8a3950ba7daef4 Mon Sep 17 00:00:00 2001
From: Christoph Sax <christoph.sax@mailbox.org>
Date: Mon, 31 Jul 2023 20:35:42 +0200
Subject: [PATCH 0565/2704] refactor(t32): remove revision pinning

---
 lua/nvim-treesitter/parsers.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6c8ab2647..80b9bdcb2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1512,7 +1512,6 @@ list.t32 = {
   install_info = {
     url = "https://gitlab.com/xasc/tree-sitter-t32",
     files = { "src/parser.c", "src/scanner.c" },
-    revision = "9d2520ae9886d3a768a352ec80db8762afb5232d",
   },
   maintainers = { "@xasc" },
 }

From 8e70f17f711afbef96b7a27b8c8ee08f7e5dc5e9 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 1 Aug 2023 08:04:44 +0100
Subject: [PATCH 0566/2704] fix(perl): update highlights from upstream changes

---
 queries/perl/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 45ad8db72..ef1ca57ea 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -15,8 +15,6 @@
 [ "if" "elsif" "unless" "else" ] @conditional
 (ternary_expression
   ["?" ":"] @conditional.ternary)
-(ternary_expression_in_hash
-  ["?" ":"] @conditional.ternary)
 
 ; Keywords that mark repeating loops
 [ "while" "until" "for" "foreach" ] @repeat

From 4c4d586a05e236d8199ab6faab8cb733a9b5bd24 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 1 Aug 2023 09:47:37 +0200
Subject: [PATCH 0567/2704] fix(t32): correct gitlab URL

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 80b9bdcb2..fc2bad86c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1510,7 +1510,7 @@ list.systemtap = {
 
 list.t32 = {
   install_info = {
-    url = "https://gitlab.com/xasc/tree-sitter-t32",
+    url = "https://gitlab.com/xasc/tree-sitter-t32.git",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@xasc" },

From 8968a3a5417eecaea7b39134b089763902e14add Mon Sep 17 00:00:00 2001
From: Trey Wood <treyw@squareup.com>
Date: Wed, 2 Aug 2023 11:54:53 -0600
Subject: [PATCH 0568/2704] feat!: change upstream proto parser and improve
 highlights

---
 README.md                       |  2 +-
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua |  4 ++--
 queries/proto/highlights.scm    | 29 +++++++++++++++++++++--------
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 263da5605..64cbf72b9 100644
--- a/README.md
+++ b/README.md
@@ -306,7 +306,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
-- [x] [proto](https://github.com/mitchellh/tree-sitter-proto) (maintained by @fsouza)
+- [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
 - [x] [puppet](https://github.com/amaanq/tree-sitter-puppet) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 109486fbf..3670f5a53 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -399,7 +399,7 @@
     "revision": "ed9a12f6ae4e75d4622adef8fb1b1e4d0ac0a759"
   },
   "proto": {
-    "revision": "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"
+    "revision": "4f5450ca84ffc1bff6c604f061276729cf184f40"
   },
   "prql": {
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fc2bad86c..6ac8be998 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1198,10 +1198,10 @@ list.promql = {
 
 list.proto = {
   install_info = {
-    url = "https://github.com/mitchellh/tree-sitter-proto",
+    url = "https://github.com/treywood/tree-sitter-proto",
     files = { "src/parser.c" },
   },
-  maintainers = { "@fsouza" },
+  maintainers = { "@treywood" },
 }
 
 list.prql = {
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index a24314834..e869b87e0 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -1,18 +1,30 @@
 [
-  "syntax"
-  "option"
-  "service"
-  "rpc"
-  "returns"
-  "message"
   "enum"
+  "extend"
+  "extensions"
+  "message"
   "oneof"
-  "optional"
-  "repeated"
+  "option"
   "reserved"
+  "service"
+  "syntax"
   "to"
 ] @keyword
 
+[
+ "rpc"
+] @keyword.function
+
+[
+ "returns"
+] @keyword.return
+
+[
+  "optional"
+  "repeated"
+  "required"
+] @type.qualifier
+
 [
   "package"
   "import"
@@ -34,6 +46,7 @@
 [
   (string)
   "\"proto3\""
+  "\"proto2\""
 ] @string
 
 (int_lit) @number

From bec1ceee160a456158495849769bbfae4165642e Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Wed, 2 Aug 2023 17:55:13 +0000
Subject: [PATCH 0569/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 64cbf72b9..d33e4a790 100644
--- a/README.md
+++ b/README.md
@@ -344,7 +344,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
-- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32) (maintained by @xasc)
+- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)

From 80aee02921085435b04e880cabd1fbe29f6da99a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 2 Aug 2023 18:43:25 +0100
Subject: [PATCH 0570/2704] fix(gleam): update queries from upstream changes

---
 queries/gleam/folds.scm   | 1 -
 queries/gleam/indents.scm | 1 -
 2 files changed, 2 deletions(-)

diff --git a/queries/gleam/folds.scm b/queries/gleam/folds.scm
index fbcec0ef1..7c3b16741 100644
--- a/queries/gleam/folds.scm
+++ b/queries/gleam/folds.scm
@@ -1,7 +1,6 @@
 ; Folds
 [
   (case)
-  (expression_group)
   (function) 
   (anonymous_function)
   (type_definition)
diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
index 0eef75129..37f88df66 100644
--- a/queries/gleam/indents.scm
+++ b/queries/gleam/indents.scm
@@ -5,7 +5,6 @@
   (case)
   (case_clause)
   (constant)
-  (expression_group)
   (external_function)
   (function)
   (import)

From 1e5576fa0165a222529777731a3257343047f916 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 3 Aug 2023 06:35:48 +0000
Subject: [PATCH 0571/2704] Update parsers: awk, cuda, diff, elm, foam, gleam,
 gomod, hlsl, ini, java, perl, proto, racket, rst, scheme, sql, t32, wing

---
 lockfile.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3670f5a53..09b770f2d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
   },
   "awk": {
-    "revision": "7fef05082d7aeb4e9dc0d9dca2695056b28ce6a8"
+    "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
     "revision": "1b0321ee85701d5036c334a6f04761cdc672e64c"
@@ -75,7 +75,7 @@
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "ccb8368181f1684d3c9815bc1271eb25aa7ddb16"
+    "revision": "0c3dd8d5310076875e64bd224fdac93b6a16838e"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -93,7 +93,7 @@
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
   },
   "diff": {
-    "revision": "f69bde8e56f431863eba2fe4bab23e7d9692855f"
+    "revision": "c165725c28e69b36c5799ff0e458713a844f1aaf"
   },
   "dockerfile": {
     "revision": "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321"
@@ -111,7 +111,7 @@
     "revision": "a2861e88a730287a60c11ea9299c033c7d076e30"
   },
   "elm": {
-    "revision": "8fce414fb951d6d2374593a3adf732621ef4bccf"
+    "revision": "b075803c445191af3cf7dbfdc84efef5f5bbc0f5"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -135,7 +135,7 @@
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
   },
   "foam": {
-    "revision": "7ef88a8c652073785bffd7ce9c3effc68035aa11"
+    "revision": "09e03445f49290450589c5d293610ab39434e3e4"
   },
   "fortran": {
     "revision": "6828cf3629addb1706bdbbd33491e95f12b7042c"
@@ -168,7 +168,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "2d5d6b001ba12bf1c7ac94679d69ac2bed3151dc"
+    "revision": "8302c98ed78128b22f946fadefaf4af5ba5d5850"
   },
   "glimmer": {
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
@@ -183,7 +183,7 @@
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
   },
   "gomod": {
-    "revision": "4a65743dbc2bb3094114dd2b43da03c820aa5234"
+    "revision": "f41a27386f1cfa1271122db5f0ff59b910520007"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -219,7 +219,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "20c40a3f1bb68c596f56bb0c0290008b9d4f58dd"
+    "revision": "d3dc3e3cd010d200573eee26421dbdecfd6a6b59"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -240,7 +240,7 @@
     "revision": "0eca909c8338364992e04c4862ac6afc5342cbb8"
   },
   "ini": {
-    "revision": "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"
+    "revision": "7f11a02fb8891482068e0fe419965d7bade81a68"
   },
   "ispc": {
     "revision": "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7"
@@ -249,7 +249,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "6c8329e2da78fae78e87c3c6f5788a2b005a4afc"
+    "revision": "e8d1bc4043c1d2326f7ce3aa7b8833c7b18d0560"
   },
   "javascript": {
     "revision": "f772967f7b7bc7c28f845be2420a38472b16a8ee"
@@ -372,7 +372,7 @@
     "revision": "3662443335bc95bac0168a338b0f29f87162c244"
   },
   "perl": {
-    "revision": "6141ee2cb4c954d5fab9c4ed20ad2b159341533c"
+    "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
   },
   "php": {
     "revision": "d76de26b8218df208949f46b31e0c422020eda3a"
@@ -399,7 +399,7 @@
     "revision": "ed9a12f6ae4e75d4622adef8fb1b1e4d0ac0a759"
   },
   "proto": {
-    "revision": "4f5450ca84ffc1bff6c604f061276729cf184f40"
+    "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
   },
   "prql": {
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
@@ -429,7 +429,7 @@
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
-    "revision": "d181a9738177a3b21b9f0e7bbb33b1a562f73ba6"
+    "revision": "47f9148a66259d8a892a20e984a8eed8fd94df8b"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -450,7 +450,7 @@
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
   "rst": {
-    "revision": "a41a933524a54de1ba3ac4f5336b6eeb46deac15"
+    "revision": "2ca8c123c82ca41f41b66b5d13d403cff0204b78"
   },
   "ruby": {
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
@@ -465,7 +465,7 @@
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
   },
   "scheme": {
-    "revision": "ca8af220aaf2a80aaf609bfb0df193817e4f064b"
+    "revision": "2d5557fafe49a049485c8cb910be61ede309773a"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -486,7 +486,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "61ab7913e110082b7f1fab5421ae3f971b3578ce"
+    "revision": "012fe71ce44399e870f75615b54bd40d91b87a63"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -513,7 +513,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "e4cb4a6adb26650e0a2bf4ae57d829ccb8066dcc"
+    "revision": "6da5e3cbabd376b566d04282005e52ffe67ef74a"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "996e87a0fa23ebd41d6c50fdff61d2ec6e2e1c1e"
+    "revision": "d5e8bd82c8ec489a7850ab52964d7ff97d009289"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 131f665f9008d69d130f76f77603886e75c4b146 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Thu, 3 Aug 2023 13:49:22 +0300
Subject: [PATCH 0572/2704] feat(perl): improve highlights

---
 queries/perl/highlights.scm | 129 +++++++++++++++++++-----------------
 1 file changed, 70 insertions(+), 59 deletions(-)

diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index ef1ca57ea..c7403b6e7 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -30,15 +30,6 @@
 ; Keywords to define a function
 [ "sub" ] @keyword.function
 
-; Lots of builtin functions, except tree-sitter-perl doesn't emit most of
-;   these yet
-;[
-;  "print" "printf" "sprintf" "say"
-;  "push" "pop" "shift" "unshift" "splice"
-;  "exists" "delete" "keys" "values"
-;  "each"
-;] @function.builtin
-
 ; Keywords that are regular infix operators
 [
   "and" "or" "not" "xor"
@@ -61,6 +52,9 @@
   (super)
 ] @variable.builtin
 
+((scalar_variable) @variable.builtin
+ (#eq? @variable.builtin "$#ARGV"))
+
 ; Integer numbers
 [
   (integer)
@@ -84,8 +78,7 @@
 (super) @namespace
 
 ; Comments are comments
-(comments) @comment
-(comments) @spell
+(comments) @comment @spell
 
 ((source_file . (comments) @preproc)
   (#lua-match? @preproc "^#!/"))
@@ -99,6 +92,21 @@
 (call_expression
   function_name: (identifier) @function.call)
 
+; Built-in functions
+((call_expression
+  function_name: (identifier) @function.builtin)
+ (#any-of? @function.builtin
+   "print" "printf" "sprintf" "say"
+   "push" "pop" "shift" "unshift" "splice"
+   "exists" "delete" "keys" "values"
+   "each"))
+
+[
+  (map)
+  (grep)
+  (bless)
+] @function.builtin
+
 ;; ----------
 
 (use_constant_statement
@@ -110,76 +118,79 @@
 (function_definition
   name: (identifier) @function)
 
-[
-(function)
-(map)
-(grep)
-(bless)
-] @function
+(function) @function
 
 [
-"("
-")"
-"["
-"]"
-"{"
-"}"
+  "(" ")"
+  "[" "]"
+  "{" "}"
+  (standard_input_to_variable)
 ] @punctuation.bracket
-(standard_input_to_variable) @punctuation.bracket
+
+[ "`" "\"" ] @punctuation.special
 
 [
-"=~"
-"!~"
-"="
-"=="
-"+"
-"-"
-"."
-"//"
-"||"
-(arrow_operator)
-(hash_arrow_operator)
-(array_dereference)
-(hash_dereference)
-(to_reference)
-(type_glob)
-(hash_access_variable)
+  "=~"
+  "!~"
+  "="
+  "=="
+  "+"
+  "-"
+  "."
+  "//"
+  "||"
+  "&&"
+  "<<"
+  (arrow_operator)
+  (hash_arrow_operator)
+  (array_dereference)
+  (hash_dereference)
+  (to_reference)
+  (type_glob)
+  (hash_access_variable)
 ] @operator
 
 [
-(regex_option)
-(regex_option_for_substitution)
-(regex_option_for_transliteration)
+  (regex_option)
+  (regex_option_for_substitution)
+  (regex_option_for_transliteration)
 ] @parameter
 
 (type_glob
   (identifier) @variable)
 
 [
-(word_list_qw)
-(command_qx_quoted)
-(string_single_quoted)
-(string_double_quoted)
-(string_qq_quoted)
-(bareword)
-(transliteration_tr_or_y)
+  (word_list_qw)
+  (command_qx_quoted)
+  (string_single_quoted)
+  (string_double_quoted)
+  (string_qq_quoted)
+  (bareword)
+  (transliteration_tr_or_y)
 ] @string
 
 [
-(pattern_matcher)
-(regex_pattern_qr)
-(patter_matcher_m)
-(substitution_pattern_s)
+ (heredoc_start_identifier)
+ (heredoc_end_identifier)
+] @label
+
+(heredoc_body_statement) @text.literal
+
+[
+  (pattern_matcher)
+  (regex_pattern_qr)
+  (patter_matcher_m)
+  (substitution_pattern_s)
 ] @string.regex
 
 (escape_sequence) @string.escape
 
 [
-","
-(semi_colon)
-(start_delimiter)
-(end_delimiter)
-(ellipsis_statement)
+  ","
+  (semi_colon)
+  (start_delimiter)
+  (end_delimiter)
+  (ellipsis_statement)
 ] @punctuation.delimiter
 
 (function_attribute) @field

From 6c93c86272633937090806fedb2a20fe11025876 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 4 Aug 2023 06:35:32 +0000
Subject: [PATCH 0573/2704] Update parsers: chatito, jsonnet, pem, racket,
 scheme, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 09b770f2d..4f7b5d014 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -45,7 +45,7 @@
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
-    "revision": "3baf22e7e507cedf15d1dbc03df8afa50a625586"
+    "revision": "a945b8e799dac06c47309f7c2f3b7c385bbee029"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
@@ -270,7 +270,7 @@
     "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
   },
   "jsonnet": {
-    "revision": "fdc775714afa27fdef823adbaba6ab98f5ae66f2"
+    "revision": "af22de3337abcc01130fc7968014205ed8001b6c"
   },
   "julia": {
     "revision": "d68ded9d5131878a2a06211ef0b47b72e70c6c08"
@@ -369,7 +369,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "pem": {
-    "revision": "3662443335bc95bac0168a338b0f29f87162c244"
+    "revision": "8032882300fb7976af769b578b8c798c146bd1a2"
   },
   "perl": {
     "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
@@ -429,7 +429,7 @@
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
-    "revision": "47f9148a66259d8a892a20e984a8eed8fd94df8b"
+    "revision": "7dc4fb60390218b09bc351062eeede7dcdbb4d9f"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -465,7 +465,7 @@
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
   },
   "scheme": {
-    "revision": "2d5557fafe49a049485c8cb910be61ede309773a"
+    "revision": "af3af6c9356b936f8a515a1e449c32e804c2b1a8"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d5e8bd82c8ec489a7850ab52964d7ff97d009289"
+    "revision": "52fdcb31e1037e4a801a987369b1f43728566c5b"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 8d5e5dc40a4c480483690777cefb8cf67e710702 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 5 Aug 2023 06:35:10 +0000
Subject: [PATCH 0574/2704] Update parsers: julia, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4f7b5d014..b7daf016d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -273,7 +273,7 @@
     "revision": "af22de3337abcc01130fc7968014205ed8001b6c"
   },
   "julia": {
-    "revision": "d68ded9d5131878a2a06211ef0b47b72e70c6c08"
+    "revision": "ab0f70c0a919d38b41822305a8ca80e527c94e4f"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "52fdcb31e1037e4a801a987369b1f43728566c5b"
+    "revision": "ebab873dbaa8885a06e67fb112b756983fb0d2d2"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 2051c8603d572c5a0b23225549fd7d735adf115f Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 7 Aug 2023 06:36:29 +0000
Subject: [PATCH 0575/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index b7daf016d..e6134b4a2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "ebab873dbaa8885a06e67fb112b756983fb0d2d2"
+    "revision": "fea885a0358e5d6146dbd12feaa3f270ddfd78a3"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From d9be302f7499c203ab274bc2b37f11150a2f8834 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 7 Aug 2023 13:42:24 +0100
Subject: [PATCH 0576/2704] fix(spell): do not spell check certain types of
 strings (#5203)

- Document that only certain kinds of strings are spell checked, and
  reasons why they may not.

- Remove spell checking for bash strings.
---
 CONTRIBUTING.md             | 4 ++++
 queries/bash/highlights.scm | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f2e96bc1a..2d06c3525 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -239,6 +239,10 @@ Used for XML-like tags.
 @nospell ; for defining regions that should NOT be spellchecked
 ```
 
+The main types of nodes which are spell checked are:
+- Comments
+- Strings; where it makes sense. Strings that have interpolation or are typically used for non text purposes are not spell checked (e.g. bash).
+
 #### Priority
 
 Captures can be assigned a priority to control precedence of highlights via the
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 23bf03e69..063c2b920 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -40,12 +40,15 @@
  "!="
  ] @operator
 
+; Do *not* spell check strings since they typically have some sort of
+; interpolation in them, or, are typically used for things like filenames, URLs,
+; flags and file content.
 [
  (string)
  (raw_string)
  (ansi_c_string)
  (heredoc_body)
-] @string @spell
+] @string
 
 (variable_assignment (word) @string)
 

From d9e75a1736a960a104ff3086fc553a054f51835b Mon Sep 17 00:00:00 2001
From: ShellCode33 <shellcode33@proton.me>
Date: Mon, 7 Aug 2023 15:20:09 +0200
Subject: [PATCH 0577/2704] queries/*/highlights.scm : remove `@spell` for
 strings

---
 queries/ada/highlights.scm          | 2 +-
 queries/beancount/highlights.scm    | 2 +-
 queries/clojure/highlights.scm      | 2 +-
 queries/commonlisp/highlights.scm   | 2 +-
 queries/ecma/highlights.scm         | 2 +-
 queries/elixir/highlights.scm       | 2 +-
 queries/fennel/highlights.scm       | 2 +-
 queries/fsh/highlights.scm          | 4 ++--
 queries/go/highlights.scm           | 2 +-
 queries/haskell/highlights.scm      | 1 -
 queries/janet_simple/highlights.scm | 8 ++++----
 queries/json/highlights.scm         | 2 --
 queries/lua/highlights.scm          | 2 +-
 queries/luau/highlights.scm         | 2 +-
 queries/php/highlights.scm          | 2 +-
 queries/poe_filter/highlights.scm   | 2 +-
 queries/racket/highlights.scm       | 1 -
 queries/ruby/highlights.scm         | 2 --
 queries/scheme/highlights.scm       | 2 +-
 queries/verilog/highlights.scm      | 2 +-
 20 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index bcd041d5a..a350d31d9 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -96,7 +96,7 @@
    "raise"
 ] @exception
 (comment) @comment @spell
-(string_literal) @string @spell
+(string_literal) @string
 (character_literal) @string
 (numeric_literal) @number
 
diff --git a/queries/beancount/highlights.scm b/queries/beancount/highlights.scm
index 1f0cf8a48..5817fb2e2 100644
--- a/queries/beancount/highlights.scm
+++ b/queries/beancount/highlights.scm
@@ -7,7 +7,7 @@
 (amount_tolerance) @number
 (currency) @property
 (key) @label
-(string) @string @spell
+(string) @string
 (narration) @string @spell
 (payee) @string @spell
 (tag) @constant
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 98c791e78..d6b1585fd 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -18,7 +18,7 @@
  (#set! "priority" 105) ; Higher priority to mark the whole sexpr as a comment
 )
 (kwd_lit) @symbol
-(str_lit) @string @spell
+(str_lit) @string
 (num_lit) @number
 (char_lit) @character
 (bool_lit) @boolean
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 8775b4588..55c0c8fc2 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -60,7 +60,7 @@
   package: (_) @namespace)
 "cl" @namespace
 
-(str_lit) @string @spell
+(str_lit) @string
 
 (num_lit) @number
 
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index f53fb0518..2c921b2b2 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -194,7 +194,7 @@
 ((string_fragment) @preproc
  (#eq? @preproc "use strict"))
 
-(string) @string @spell
+(string) @string
 (template_string) @string
 (escape_sequence) @string.escape
 (regex_pattern) @string.regex
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 81bf5f858..c86372e29 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -32,7 +32,7 @@
 (comment) @comment @spell
 
 ; Strings
-(string) @string @spell
+(string) @string
 
 ; Modules
 (alias) @type
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index 9b072f55b..14c91d976 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -23,7 +23,7 @@
 (boolean) @boolean
 (number) @number
 
-(string) @string @spell
+(string) @string
 (escape_sequence) @string.escape
 
 (symbol) @variable
diff --git a/queries/fsh/highlights.scm b/queries/fsh/highlights.scm
index ccc93fc56..e4c0edd8e 100644
--- a/queries/fsh/highlights.scm
+++ b/queries/fsh/highlights.scm
@@ -76,8 +76,8 @@
 (target_type (name)) @type
 
 ; Strings
-(string) @string @spell
-(multiline_string) @string @spell
+(string) @string
+(multiline_string) @string
 
 ; Constants
 (strength_value) @constant
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 4569ec086..ec73c5a5d 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -197,7 +197,7 @@
 ; Literals
 
 (interpreted_string_literal) @string
-(raw_string_literal) @string @spell
+(raw_string_literal) @string
 (rune_literal) @string
 (escape_sequence) @string.escape
 
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 89695bae5..01fecb43e 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -156,6 +156,5 @@
 ;; ----------------------------------------------------------------------------
 ;; Spell checking
 
-(string) @spell
 (comment) @spell
 
diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index fdd65adc5..586f16944 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -1,10 +1,10 @@
 ;; >> Literals
 
 (kwd_lit) @symbol
-(str_lit) @string @spell
-(long_str_lit) @string @spell
-(buf_lit) @string @spell
-(long_buf_lit) @string @spell
+(str_lit) @string
+(long_str_lit) @string
+(buf_lit) @string
+(long_buf_lit) @string
 (num_lit) @number
 (bool_lit) @boolean
 (nil_lit) @constant.builtin
diff --git a/queries/json/highlights.scm b/queries/json/highlights.scm
index c4bfade8a..6163b2092 100644
--- a/queries/json/highlights.scm
+++ b/queries/json/highlights.scm
@@ -12,8 +12,6 @@
 
 (array (string) @string)
 
-(string_content) @spell
-
 (ERROR) @error
 
 ["," ":"] @punctuation.delimiter
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 557ea7da0..bdc2ae52c 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -241,7 +241,7 @@
 
 (number) @number
 
-(string) @string @spell
+(string) @string
 
 ;; Error
 (ERROR) @error
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 5f7d7da90..96788ecc3 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -198,7 +198,7 @@
 
 (number) @number
 
-(string) @string @spell
+(string) @string
 
 (nil) @constant.builtin
 
diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index 4b524b018..6b84b9405 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -135,7 +135,7 @@
  (heredoc_body)
  (nowdoc_body)
  (shell_command_expression) ; backtick operator: `ls -la`
- ] @string @spell
+ ] @string
 (escape_sequence) @string.escape
 
 (boolean) @boolean
diff --git a/queries/poe_filter/highlights.scm b/queries/poe_filter/highlights.scm
index 889e302ad..6914865a1 100644
--- a/queries/poe_filter/highlights.scm
+++ b/queries/poe_filter/highlights.scm
@@ -6,7 +6,7 @@
 
 (operator) @operator
 
-(string) @string @spell
+(string) @string
 
 (file) @string
 
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index bc3c7eb5c..af0650334 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -20,7 +20,6 @@
 [(string)
  (here_string)
  (byte_string)] @string
-(string) @spell
 
 (escape_sequence) @string.escape
 
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index de7f96688..192fd6f9a 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -192,8 +192,6 @@
   (comment)+ @comment.documentation
   (method))
 
-(string_content) @spell
-
 ; Operators
 
 [
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index 4854a4c85..7a8acfe9e 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -5,7 +5,7 @@
 (number) @number
 (character) @character
 (boolean) @boolean
-(string) @string @spell
+(string) @string
 [(comment)
  (block_comment)] @comment @spell
 
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index d4c9a24a5..86952becf 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -177,7 +177,7 @@
 [
   (double_quoted_string)
   (string_literal)
-] @string @spell
+] @string
 
 [
   (default_nettype_compiler_directive)

From 2f5b4a65dc065b5a6581429d5c1ca87e62fcb120 Mon Sep 17 00:00:00 2001
From: Matthias Queitsch <matthias.queitsch@mailbox.org>
Date: Mon, 7 Aug 2023 23:01:03 +0200
Subject: [PATCH 0578/2704] feat(sql): add missing keywords

---
 lockfile.json              |  2 +-
 queries/sql/highlights.scm | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index e6134b4a2..4d79142f7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -486,7 +486,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "012fe71ce44399e870f75615b54bd40d91b87a63"
+    "revision": "a000dd8930464c71fa6fec9be4fdd6198068393c"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index d45e9a5a6..04d76ead5 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -76,14 +76,30 @@
  (keyword_cost)
  (keyword_strict)
  (keyword_matched)
+ (keyword_encrypted)
+ (keyword_valid)
+ (keyword_admin)
+ (keyword_user)
+ (keyword_until)
+ (keyword_connection)
+ (keyword_cycle)
+ (keyword_increment)
+ (keyword_minvalue)
+ (keyword_maxvalue)
+ (keyword_none)
+ (keyword_owned)
+ (keyword_verbose)
+ (keyword_authorization)
 ] @attribute
 
 [
  (keyword_materialized)
+ (keyword_tablespace)
  (keyword_recursive)
  (keyword_temp)
  (keyword_temporary)
  (keyword_unlogged)
+ (keyword_logged)
  (keyword_external)
  (keyword_parquet)
  (keyword_csv)
@@ -114,6 +130,8 @@
   (keyword_create)
   (keyword_insert)
   (keyword_merge)
+  (keyword_truncate)
+  (keyword_explain)
   (keyword_distinct)
   (keyword_replace)
   (keyword_update)
@@ -156,6 +174,10 @@
   (keyword_drop)
   (keyword_add)
   (keyword_view)
+  (keyword_database)
+  (keyword_role)
+  (keyword_group)
+  (keyword_sequence)
   (keyword_end)
   (keyword_is)
   (keyword_using)
@@ -242,6 +264,8 @@
   (keyword_tblproperties)
   (keyword_trigger)
   (keyword_unsafe)
+  (keyword_start)
+  (keyword_restart)
 ] @keyword
 
 [

From a9ce9fb7cccf59e0c2f65d26a14942356c93948e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 8 Aug 2023 06:35:38 +0000
Subject: [PATCH 0579/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 4d79142f7..f067e6c58 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "fea885a0358e5d6146dbd12feaa3f270ddfd78a3"
+    "revision": "df94899fcee25e2da32744760aa4394d2e728a33"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From ae88851cac32415c8239a04b7ee44d8f7625e186 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 8 Aug 2023 10:41:37 +0100
Subject: [PATCH 0580/2704] feat: add .luarc.json

---
 .luarc.json | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .luarc.json

diff --git a/.luarc.json b/.luarc.json
new file mode 100644
index 000000000..8dc060501
--- /dev/null
+++ b/.luarc.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
+  "runtime": {
+      "version": "LuaJIT"
+  },
+  "workspace": {
+    "library": [
+      "lua",
+      "$VIMRUNTIME",
+      "${3rd}/luv/library"
+    ],
+    "checkThirdParty": false
+  },
+  "diagnostics": {
+    "groupFileStatus": {
+      "strict": "Opened",
+      "strong": "Opened"
+    },
+    "groupSeverity": {
+      "strong": "Warning",
+      "strict": "Warning"
+    },
+    "unusedLocalExclude": [ "_*" ]
+  }
+}

From 80cee52d445363c8bd08eacca17be31e3837f4d0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 9 Aug 2023 06:35:43 +0000
Subject: [PATCH 0581/2704] Update parsers: htmldjango, scala, sql, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f067e6c58..798234673 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -231,7 +231,7 @@
     "revision": "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"
   },
   "htmldjango": {
-    "revision": "11e73ebd8e73356badaad826a0534437b208b6e7"
+    "revision": "717e83aefd328735beeeb671f3f95b2624e70c57"
   },
   "http": {
     "revision": "6824a247d1326079aab4fa9f9164e9319678081d"
@@ -459,7 +459,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "a2f36c2477859110d5b7b675f395e50241fbc004"
+    "revision": "f14629b4d53f72356ce8f6d4ac8c54d21b4e74dd"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -486,7 +486,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "a000dd8930464c71fa6fec9be4fdd6198068393c"
+    "revision": "3dfa1b1fafac51e3ffc39064eafb26b5111861a2"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "df94899fcee25e2da32744760aa4394d2e728a33"
+    "revision": "6ae93e3950b12b6c1b3881e4d347263574222c4e"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 477a5d76a241ea5d79974072ee133dada223420d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 10 Aug 2023 06:36:48 +0000
Subject: [PATCH 0582/2704] Update parsers: arduino, c, chatito, cpp, cuda,
 gitattributes, jsonnet, pem, wing

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 798234673..43d78ce11 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "3446bac828d5db2a6cf60ab31813c02ab53547a7"
+    "revision": "11d4fd1b0320514272cfbe3aa911a3cd8705b7a9"
   },
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "39bea7d391f57c5f0e061419e1c3066e03eb14b3"
+    "revision": "93ef1785bbf854cf964e6e53d6e1e6885a4d8ebc"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -45,7 +45,7 @@
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
-    "revision": "a945b8e799dac06c47309f7c2f3b7c385bbee029"
+    "revision": "c80c219da2086696202cec8fc2501c02f4819a3f"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
@@ -69,13 +69,13 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "f88bf81238ec2842682e4d1dac0acf3b43b686e9"
+    "revision": "869f1be6ab4a384f649f4c6b374d0e4d7f0abab6"
   },
   "css": {
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "0c3dd8d5310076875e64bd224fdac93b6a16838e"
+    "revision": "ff8425f44c1c273dd3b831913dff5cdb3fe94e25"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -159,7 +159,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "19c716d2f45eac9529703413dc12aa8c76d13adc"
+    "revision": "2339ffe87a88d0b7838c015592c8269eb0063140"
   },
   "gitcommit": {
     "revision": "6856a5fd0ffeff17d83325a8ce4e57811010eff1"
@@ -270,7 +270,7 @@
     "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
   },
   "jsonnet": {
-    "revision": "af22de3337abcc01130fc7968014205ed8001b6c"
+    "revision": "26d9699842a429731844c93cbcb485519bb2c526"
   },
   "julia": {
     "revision": "ab0f70c0a919d38b41822305a8ca80e527c94e4f"
@@ -369,7 +369,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "pem": {
-    "revision": "8032882300fb7976af769b578b8c798c146bd1a2"
+    "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
     "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
@@ -588,7 +588,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6ae93e3950b12b6c1b3881e4d347263574222c4e"
+    "revision": "46d47bade5f6ee149c9f1449f64bace22a288a2e"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 3d3b335ace68ab4784ff3aebece915676cc03ea1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 10 Aug 2023 10:04:51 -0400
Subject: [PATCH 0583/2704] fix(cpp): update injections from C

---
 queries/cpp/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index cfb543ed7..f706c75e2 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,4 +1,5 @@
-(preproc_arg) @cpp
+(preproc_function_def (preproc_arg) @cpp)
+(preproc_call (preproc_arg) @cpp)
 
 (comment) @comment
 

From 251fe95efda3a7282ccbe97e9cf623d9be71e483 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 10 Aug 2023 10:43:45 -0400
Subject: [PATCH 0584/2704] fix: update preproc injections for arduino, cuda,
 glsl, hlsl

---
 queries/arduino/injections.scm | 3 ++-
 queries/cuda/injections.scm    | 3 ++-
 queries/glsl/injections.scm    | 3 ++-
 queries/hlsl/injections.scm    | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm
index ce1e7948a..a28a458b2 100644
--- a/queries/arduino/injections.scm
+++ b/queries/arduino/injections.scm
@@ -1,3 +1,4 @@
-(preproc_arg) @arduino
+(preproc_function_def (preproc_arg) @arduino)
+(preproc_call (preproc_arg) @arduino)
 
 (comment) @comment
diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm
index 49fe7c532..8361b483b 100644
--- a/queries/cuda/injections.scm
+++ b/queries/cuda/injections.scm
@@ -1,3 +1,4 @@
-(preproc_arg) @cuda
+(preproc_function_def (preproc_arg) @cuda)
+(preproc_call (preproc_arg) @cuda)
 
 (comment) @comment
diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm
index 7d3323b16..e211001ea 100644
--- a/queries/glsl/injections.scm
+++ b/queries/glsl/injections.scm
@@ -1,3 +1,4 @@
-(preproc_arg) @glsl
+(preproc_function_def (preproc_arg) @glsl)
+(preproc_call (preproc_arg) @glsl)
 
 (comment) @comment
diff --git a/queries/hlsl/injections.scm b/queries/hlsl/injections.scm
index 537ae542d..0fa49370f 100644
--- a/queries/hlsl/injections.scm
+++ b/queries/hlsl/injections.scm
@@ -1,3 +1,4 @@
-(preproc_arg) @hlsl
+(preproc_function_def (preproc_arg) @hlsl)
+(preproc_call (preproc_arg) @hlsl)
 
 (comment) @comment

From d92bfe2cbd86a9c10d814e38ecbe2fb7442da209 Mon Sep 17 00:00:00 2001
From: Yuki Ito <mrno110y@gmail.com>
Date: Mon, 26 Jun 2023 12:53:33 +0900
Subject: [PATCH 0585/2704] feat(go): add `max` and `min` to
 `@function.builtin`

---
 queries/go/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index ec73c5a5d..4dc5649f3 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -171,6 +171,8 @@
            "imag"
            "len"
            "make"
+           "max"
+           "min"
            "new"
            "panic"
            "print"

From 898f9c13d60bd51bdf873e284177f98264f0954f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 24 Jul 2023 13:07:35 +0300
Subject: [PATCH 0586/2704] feat: add requirements parser

---
 README.md                           |  1 +
 lockfile.json                       |  3 ++
 lua/nvim-treesitter/parsers.lua     |  9 ++++++
 queries/requirements/highlights.scm | 47 +++++++++++++++++++++++++++++
 queries/requirements/injections.scm |  1 +
 5 files changed, 61 insertions(+)
 create mode 100644 queries/requirements/highlights.scm
 create mode 100644 queries/requirements/injections.scm

diff --git a/README.md b/README.md
index d33e4a790..fdc643170 100644
--- a/README.md
+++ b/README.md
@@ -320,6 +320,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
 - [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
+- [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
 - [x] [robot](https://github.com/Hubro/tree-sitter-robot) (experimental, maintained by @ema2159)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 43d78ce11..495dc384f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -440,6 +440,9 @@
   "rego": {
     "revision": "b2667c975f07b33be3ceb83bea5cfbad88095866"
   },
+  "requirements": {
+    "revision": "56ddb4dad2ea0761d20c0995a0de2990caa350b5"
+  },
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6ac8be998..3c1040367 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1310,6 +1310,15 @@ list.rego = {
   maintainers = { "@FallenAngel97" },
 }
 
+list.requirements = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-requirements",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+  readme_name = "pip requirements",
+}
+
 list.rnoweb = {
   install_info = {
     url = "https://github.com/bamonroe/tree-sitter-rnoweb",
diff --git a/queries/requirements/highlights.scm b/queries/requirements/highlights.scm
new file mode 100644
index 000000000..04942ca68
--- /dev/null
+++ b/queries/requirements/highlights.scm
@@ -0,0 +1,47 @@
+;; packages
+
+(package) @variable
+
+(extras (package) @parameter)
+
+(path) @text.underline @string.special
+
+(url) @text.uri
+
+;; versions
+
+(version_cmp) @operator
+
+(version) @number
+
+;; markers
+
+(marker_var) @attribute
+
+(marker_op) @keyword.operator
+
+;; options
+
+(option) @function
+
+"=" @operator
+
+;; punctuation
+
+[ "[" "]" "(" ")" ] @punctuation.bracket
+
+[ "," ";" "@" ] @punctuation.delimiter
+
+[ "${" "}" ] @punctuation.special
+
+;; misc
+
+(env_var) @constant
+
+(quoted_string) @string
+
+(linebreak) @character.special
+
+(ERROR) @error
+
+(comment) @comment @spell
diff --git a/queries/requirements/injections.scm b/queries/requirements/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/requirements/injections.scm
@@ -0,0 +1 @@
+(comment) @comment

From c981ea0684ac7a38acf907e5ba91017606377b2e Mon Sep 17 00:00:00 2001
From: Borys Lykah <lykahb@fastmail.com>
Date: Thu, 10 Aug 2023 18:10:59 -0600
Subject: [PATCH 0587/2704] fix: rename filetype for haskell persistent to
 match vim

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3c1040367..53ccce0df 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -655,7 +655,7 @@ list.haskell_persistent = {
     url = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent",
     files = { "src/parser.c", "src/scanner.cc" },
   },
-  filetype = "haskell.persistent",
+  filetype = "haskellpersistent",
   maintainers = { "@lykahb" },
 }
 

From f3cf4a9a6c22d4d0c9f7adb398c93a85cdf15667 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Aug 2023 08:01:11 +0000
Subject: [PATCH 0588/2704] Update parsers: cpp, cuda, glsl, hlsl, objc, vim,
 wing (#5228)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 495dc384f..d70fc7577 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,13 +69,13 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "869f1be6ab4a384f649f4c6b374d0e4d7f0abab6"
+    "revision": "2e6cf687d50de51c9031974e2d2b689ea379ccdf"
   },
   "css": {
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "ff8425f44c1c273dd3b831913dff5cdb3fe94e25"
+    "revision": "d4285d0396a409c91bcd5a7fd362cf13cc6f8600"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -174,7 +174,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "e9c49d0752d968bc6dcd35d0c3a88397c5d51757"
+    "revision": "00ffe2099374613d2f313ace4a9dda44370b458b"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -219,7 +219,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "d3dc3e3cd010d200573eee26421dbdecfd6a6b59"
+    "revision": "95361dde7ad4025fbec5dc4e5cdde0ea8ed64172"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -345,7 +345,7 @@
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
   "objc": {
-    "revision": "77e28aeaede824a5f4aa501fb5f3138ab1019b9f"
+    "revision": "97e022ec4a908108283bad23d42eee39ad204db6"
   },
   "ocaml": {
     "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
@@ -576,7 +576,7 @@
     "revision": "fec6e981b7795b68262ddf229d73d2aa03a89b9a"
   },
   "vim": {
-    "revision": "26b1aea3b3a5dae31f784a1204205fd57f2b82b5"
+    "revision": "77e9e96c2ae5cff7343ce3dced263483acf95793"
   },
   "vimdoc": {
     "revision": "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"
@@ -591,7 +591,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "46d47bade5f6ee149c9f1449f64bace22a288a2e"
+    "revision": "f416d4b76141d803ea2ebadf0629fca164133723"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 15129f6d70a4d7adc380abe57a64af93478f72e5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Aug 2023 08:55:54 +0000
Subject: [PATCH 0589/2704] Update parsers: arduino, ispc (#5229)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d70fc7577..74a5f330e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "11d4fd1b0320514272cfbe3aa911a3cd8705b7a9"
+    "revision": "d988e6a803203cc2bbfd2a8a84edffc73d2922b4"
   },
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
@@ -243,7 +243,7 @@
     "revision": "7f11a02fb8891482068e0fe419965d7bade81a68"
   },
   "ispc": {
-    "revision": "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7"
+    "revision": "cc57a931eb782474324910e19ca253aa0d5fe38a"
   },
   "janet_simple": {
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"

From acd9d2115dbdf26d39dbd9614f4d0592a226604e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 10 Aug 2023 15:43:25 -0400
Subject: [PATCH 0590/2704] feat(c): update highlights

---
 queries/c/highlights.scm | 43 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 83fe8b061..29fb5747c 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -17,6 +17,7 @@
   "sizeof"
   "offsetof"
 ] @keyword.operator
+(alignof_expression . _ @keyword.operator)
 
 "return" @keyword.return
 
@@ -142,8 +143,9 @@
 (storage_class_specifier) @storageclass
 
 [
-  (type_qualifier) 
+  (type_qualifier)
   (gnu_asm_qualifier)
+  "__extension__"
 ] @type.qualifier
 
 (linkage_specification
@@ -166,9 +168,44 @@
   value: (identifier) @constant)
 
 ((identifier) @constant.builtin
-    (#any-of? @constant.builtin "stderr" "stdin" "stdout"))
+  (#any-of? @constant.builtin
+    "stderr" "stdin" "stdout"
+    "__FILE__" "__LINE__" "__DATE__" "__TIME__"
+    "__STDC__" "__STDC_VERSION__" "__STDC_HOSTED__"
+    "__cplusplus" "__OBJC__" "__ASSEMBLER__"
+    "__BASE_FILE__" "__FILE_NAME__" "__INCLUDE_LEVEL__"
+    "__TIMESTAMP__" "__clang__" "__clang_major__"
+    "__clang_minor__" "__clang_patchlevel__"
+    "__clang_version__" "__clang_literal_encoding__"
+    "__clang_wide_literal_encoding__"
+    "__FUNCTION__" "__func__" "__PRETTY_FUNCTION__"
+    "__VA_ARGS__" "__VA_OPT__"))
 (preproc_def (preproc_arg) @constant.builtin
-  (#any-of? @constant.builtin "stderr" "stdin" "stdout"))
+  (#any-of? @constant.builtin
+    "stderr" "stdin" "stdout"
+    "__FILE__" "__LINE__" "__DATE__" "__TIME__"
+    "__STDC__" "__STDC_VERSION__" "__STDC_HOSTED__"
+    "__cplusplus" "__OBJC__" "__ASSEMBLER__"
+    "__BASE_FILE__" "__FILE_NAME__" "__INCLUDE_LEVEL__"
+    "__TIMESTAMP__" "__clang__" "__clang_major__"
+    "__clang_minor__" "__clang_patchlevel__"
+    "__clang_version__" "__clang_literal_encoding__"
+    "__clang_wide_literal_encoding__"
+    "__FUNCTION__" "__func__" "__PRETTY_FUNCTION__"
+    "__VA_ARGS__" "__VA_OPT__"))
+
+(attribute_specifier
+  (argument_list (identifier) @variable.builtin))
+((attribute_specifier
+  (argument_list (call_expression
+                   function: (identifier) @variable.builtin))))
+
+((call_expression
+  function: (identifier) @function.builtin)
+  (#lua-match? @function.builtin "^__builtin_"))
+((call_expression
+   function: (identifier) @function.builtin)
+  (#has-ancestor? @function.builtin attribute_specifier))
 
 ;; Preproc def / undef
 (preproc_def

From 41f35eac4ff0c08a39d67b6d4faff697871e4ccb Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 10 Aug 2023 19:32:29 -0400
Subject: [PATCH 0591/2704] fix(c-family): inject into preproc args in preproc
 defs when it spans multiple lines only

---
 queries/arduino/injections.scm | 2 ++
 queries/c/injections.scm       | 2 ++
 queries/cpp/injections.scm     | 2 ++
 queries/cuda/injections.scm    | 2 ++
 queries/glsl/injections.scm    | 2 ++
 queries/hlsl/injections.scm    | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm
index a28a458b2..240162b9b 100644
--- a/queries/arduino/injections.scm
+++ b/queries/arduino/injections.scm
@@ -1,3 +1,5 @@
+((preproc_def (preproc_arg) @arduino)
+  (#lua-match? @arduino "\n"))
 (preproc_function_def (preproc_arg) @arduino)
 (preproc_call (preproc_arg) @arduino)
 
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index cc6be9fa0..2ef8f85c1 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,3 +1,5 @@
+((preproc_def (preproc_arg) @c)
+  (#lua-match? @c "\n"))
 (preproc_function_def (preproc_arg) @c)
 (preproc_call (preproc_arg) @c)
 
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index f706c75e2..1d8e11cb3 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,3 +1,5 @@
+((preproc_def (preproc_arg) @cpp)
+  (#lua-match? @cpp "\n"))
 (preproc_function_def (preproc_arg) @cpp)
 (preproc_call (preproc_arg) @cpp)
 
diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm
index 8361b483b..09deac468 100644
--- a/queries/cuda/injections.scm
+++ b/queries/cuda/injections.scm
@@ -1,3 +1,5 @@
+((preproc_def (preproc_arg) @cuda)
+  (#lua-match? @cuda "\n"))
 (preproc_function_def (preproc_arg) @cuda)
 (preproc_call (preproc_arg) @cuda)
 
diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm
index e211001ea..6d022021d 100644
--- a/queries/glsl/injections.scm
+++ b/queries/glsl/injections.scm
@@ -1,3 +1,5 @@
+((preproc_def (preproc_arg) @glsl)
+  (#lua-match? @glsl "\n"))
 (preproc_function_def (preproc_arg) @glsl)
 (preproc_call (preproc_arg) @glsl)
 
diff --git a/queries/hlsl/injections.scm b/queries/hlsl/injections.scm
index 0fa49370f..52e88686c 100644
--- a/queries/hlsl/injections.scm
+++ b/queries/hlsl/injections.scm
@@ -1,3 +1,5 @@
+((preproc_def (preproc_arg) @hlsl)
+  (#lua-match? @hlsl "\n"))
 (preproc_function_def (preproc_arg) @hlsl)
 (preproc_call (preproc_arg) @hlsl)
 

From fa414da96f4a2e60c2ac8082f0c1802b8f3c8f6c Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 11 Aug 2023 12:34:39 -0400
Subject: [PATCH 0592/2704] chore: update cpp

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 74a5f330e..dcc4e5d80 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "2e6cf687d50de51c9031974e2d2b689ea379ccdf"
+    "revision": "77cecd88d28032bf4f54fd4ee68efb53a6c8c9a5"
   },
   "css": {
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"

From 63260da18bf273c76b8e2ea0db84eb901cab49ce Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 12 Aug 2023 06:35:40 +0000
Subject: [PATCH 0593/2704] Update parsers: teal, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dcc4e5d80..4501e7956 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -522,7 +522,7 @@
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
   },
   "teal": {
-    "revision": "2158ecce11ea542f9b791baf2c7fb33798174ed2"
+    "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "terraform": {
     "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
@@ -591,7 +591,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f416d4b76141d803ea2ebadf0629fca164133723"
+    "revision": "9399564d1e32864c6af2d49c0dcd1f76d54443f2"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 2aa9e9b0e655462890c6d2d8632a0d569be66482 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 12 Aug 2023 16:52:36 +0200
Subject: [PATCH 0594/2704] feat!: bump required Nvim version to 0.9.1

---
 README.md                      | 2 +-
 lua/nvim-treesitter/health.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fdc643170..bfb9ac117 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ For more detailed information on setting these up, see ["Advanced setup"](#advan
 
 ## Requirements
 
-- [Latest](https://github.com/neovim/neovim/releases/tag/stable) Neovim release ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
+- **Neovim 0.9.1** or later  ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
 - `tar` and `curl` in your path (or alternatively `git`)
 - A C compiler in your path and libstdc++ installed ([Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support)).
 
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 0edab2a55..a71cbf5cd 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -23,8 +23,8 @@ local NVIM_TREESITTER_MINIMUM_ABI = 13
 local function install_health()
   _start "Installation"
 
-  if fn.has "nvim-0.8.3" ~= 1 then
-    _error "Nvim-treesitter requires Neovim 0.8.3+"
+  if fn.has "nvim-0.9.1" ~= 1 then
+    _error "Nvim-treesitter requires Neovim 0.9.1+"
   end
 
   if fn.executable "tree-sitter" == 0 then

From 78b54eb7f6a9956d25a3911fa0dfd0cabfe2a4c5 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 3 May 2023 19:07:59 +0900
Subject: [PATCH 0595/2704] chore(injections)!: update injection syntax to 0.9

Since 0.9, @lang syntax is still available as fallback but will soon be deprecated.
Because of that, new syntax should be adopted once 0.9 becomes the
baseline requirements for nvim-treesitter

- update health check
- update doc
---
 CONTRIBUTING.md                          |  29 ++++--
 lua/nvim-treesitter/query_predicates.lua |  37 +-------
 queries/arduino/injections.scm           |  19 ++--
 queries/astro/injections.scm             |  32 ++++---
 queries/awk/injections.scm               |   7 +-
 queries/bash/injections.scm              |   6 +-
 queries/bass/injections.scm              |   3 +-
 queries/bicep/injections.scm             |   9 +-
 queries/c/injections.scm                 |  25 ++++--
 queries/c_sharp/injections.scm           |   3 +-
 queries/capnp/injections.scm             |   3 +-
 queries/chatito/injections.scm           |   3 +-
 queries/clojure/injections.scm           |   3 +-
 queries/cpon/injections.scm              |   3 +-
 queries/cpp/injections.scm               |  23 +++--
 queries/css/injections.scm               |   3 +-
 queries/cuda/injections.scm              |  19 ++--
 queries/cue/injections.scm               |   3 +-
 queries/d/injections.scm                 |   8 +-
 queries/dart/injections.scm              |   3 +-
 queries/devicetree/injections.scm        |   3 +-
 queries/dhall/injections.scm             |   5 +-
 queries/dockerfile/injections.scm        |   6 +-
 queries/dot/injections.scm               |   7 +-
 queries/ecma/injections.scm              |  92 ++++++++++---------
 queries/eex/injections.scm               |   7 +-
 queries/elixir/injections.scm            |  42 +++++----
 queries/elm/injections.scm               |   9 +-
 queries/elsa/injections.scm              |   3 +-
 queries/elvish/injections.scm            |   3 +-
 queries/embedded_template/injections.scm |   9 +-
 queries/fennel/injections.scm            |   3 +-
 queries/firrtl/injections.scm            |   3 +-
 queries/fish/injections.scm              |   3 +-
 queries/foam/injections.scm              |  18 ++--
 queries/gdscript/injections.scm          |   3 +-
 queries/git_rebase/injections.scm        |   3 +-
 queries/gitattributes/injections.scm     |   3 +-
 queries/gitcommit/injections.scm         |   7 +-
 queries/gleam/injections.scm             |   5 +-
 queries/glsl/injections.scm              |  19 ++--
 queries/go/injections.scm                |  11 ++-
 queries/gomod/injections.scm             |   3 +-
 queries/gowork/injections.scm            |   3 +-
 queries/graphql/injections.scm           |   3 +-
 queries/groovy/injections.scm            |   9 +-
 queries/hare/injections.scm              |   8 +-
 queries/haskell/injections.scm           |  50 +++++------
 queries/hcl/injections.scm               |  10 +--
 queries/heex/injections.scm              |  11 ++-
 queries/hjson/injections.scm             |   3 +-
 queries/hlsl/injections.scm              |  19 ++--
 queries/hocon/injections.scm             |   3 +-
 queries/html/injections.scm              |  18 ++--
 queries/html_tags/injections.scm         |  91 ++++++++++---------
 queries/htmldjango/injections.scm        |   4 +-
 queries/http/injections.scm              |  12 ++-
 queries/hurl/injections.scm              |  12 ++-
 queries/janet_simple/injections.scm      |   3 +-
 queries/java/injections.scm              |   5 +-
 queries/jq/injections.scm                |  11 ++-
 queries/json5/injections.scm             |   3 +-
 queries/jsonc/injections.scm             |   3 +-
 queries/jsx/injections.scm               |   7 +-
 queries/julia/injections.scm             |  17 ++--
 queries/kdl/injections.scm               |   5 +-
 queries/kotlin/injections.scm            |  47 +++++-----
 queries/lalrpop/injections.scm           |  16 ++--
 queries/latex/injections.scm             |  23 ++---
 queries/ledger/injections.scm            |   7 +-
 queries/lua/highlights.scm               |   2 +
 queries/lua/injections.scm               |  44 +++++----
 queries/luau/injections.scm              |  27 +++---
 queries/m68k/injections.scm              |   3 +-
 queries/make/injections.scm              |   9 +-
 queries/markdown/injections.scm          |  25 ++++--
 queries/markdown_inline/injections.scm   |  10 ++-
 queries/matlab/injections.scm            |   3 +-
 queries/menhir/injections.scm            |   3 +-
 queries/meson/injections.scm             |   3 +-
 queries/nix/injections.scm               | 109 ++++++++++++++---------
 queries/ocaml/injections.scm             |   3 +-
 queries/ocamllex/injections.scm          |   6 +-
 queries/odin/injections.scm              |   3 +-
 queries/pascal/injections.scm            |   7 +-
 queries/pem/injections.scm               |   3 +-
 queries/perl/injections.scm              |   3 +-
 queries/php/injections.scm               |  24 +++--
 queries/pioasm/injections.scm            |  15 ++--
 queries/po/injections.scm                |   3 +-
 queries/poe_filter/injections.scm        |   3 +-
 queries/pony/injections.scm              |   5 +-
 queries/promql/injections.scm            |   4 +-
 queries/prql/injections.scm              |  16 ++--
 queries/pug/injections.scm               |  13 +--
 queries/puppet/injections.scm            |   8 +-
 queries/python/injections.scm            |   8 +-
 queries/ql/injections.scm                |   5 +-
 queries/qmldir/injections.scm            |   3 +-
 queries/query/injections.scm             |  13 +--
 queries/r/injections.scm                 |   3 +-
 queries/racket/injections.scm            |   7 +-
 queries/rego/injections.scm              |   3 +-
 queries/requirements/injections.scm      |   3 +-
 queries/rnoweb/injections.scm            |  15 ++--
 queries/ron/injections.scm               |   5 +-
 queries/rst/injections.scm               |  35 +++++---
 queries/ruby/injections.scm              |  13 +--
 queries/rust/injections.scm              |  33 ++++---
 queries/scala/injections.scm             |   9 +-
 queries/scfg/injections.scm              |   3 +-
 queries/scheme/injections.scm            |   3 +-
 queries/smali/injections.scm             |   3 +-
 queries/sparql/injections.scm            |   3 +-
 queries/sql/injections.scm               |   7 +-
 queries/squirrel/injections.scm          |  17 ++--
 queries/supercollider/injections.scm     |   5 +-
 queries/surface/injections.scm           |   8 +-
 queries/svelte/injections.scm            |  47 +++++-----
 queries/sxhkdrc/injections.scm           |   3 +-
 queries/systemtap/injections.scm         |   7 +-
 queries/t32/injections.scm               |   3 +-
 queries/tablegen/injections.scm          |  12 +--
 queries/teal/injections.scm              |  17 ++--
 queries/thrift/injections.scm            |   3 +-
 queries/tiger/injections.scm             |   3 +-
 queries/tlaplus/injections.scm           |   5 +-
 queries/toml/injections.scm              |   3 +-
 queries/turtle/injections.scm            |   3 +-
 queries/twig/injections.scm              |   3 +-
 queries/ungrammar/injections.scm         |   3 +-
 queries/uxntal/injections.scm            |   3 +-
 queries/v/injections.scm                 |  12 ++-
 queries/verilog/injections.scm           |   3 +-
 queries/vim/injections.scm               |  39 +++++---
 queries/vimdoc/injections.scm            |   7 +-
 queries/vue/injections.scm               |  52 +++++++----
 queries/yaml/injections.scm              |  37 ++++++--
 queries/yang/injections.scm              |   8 +-
 queries/zig/injections.scm               |   6 +-
 140 files changed, 1083 insertions(+), 665 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d06c3525..cc0a385d4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -318,19 +318,32 @@ query.
 ### Injections
 
 Some captures are related to language injection (like markdown code blocks). They are used in `injections.scm`.
-You can directly use the name of the language that you want to inject (e.g. `@html` to inject html).
 
-If you want to dynamically detect the language (e.g. for Markdown blocks) use the `@language` to capture
-the node describing the language and `@content` to describe the injection region.
+If you want to dynamically detect the language (e.g. for Markdown blocks) use the `@injection.language` to capture
+the node describing the language and `@injection.content` to describe the injection region.
 
 ```scheme
-@{lang}   ; e.g. @html to describe a html region
-
-@language ; dynamic detection of the injection language (i.e. the text of the captured node describes the language)
-@content  ; region for the dynamically detected language
-@combined ; combine all matches of a pattern as one single block of content
+@injection.language ; dynamic detection of the injection language (i.e. the text of the captured node describes the language)
+@injection.content  ; region for the dynamically detected language
 ```
 
+For example, to inject javascript into HTML's `<script>` tag
+
+```html
+<script>someJsCode();</script>
+```
+
+```query
+(script_element
+  (raw_text) @injection.content
+  (#set! injection.language "javascript")) ; set the parser language for @injection.content region to javascript
+```
+
+For regions that don't have a corresponding `@injection.language`, you need to manually set the language 
+through `(#set injection.language "lang_name")`
+
+To combine all matches of a pattern as one single block of content, add `(#set! injection.combined)` to such pattern
+
 ### Indents
 
 ```scheme
diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index ff0e9999a..7f2b73c54 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -153,10 +153,10 @@ query.add_directive("set-lang-from-mimetype!", function(match, _, bufnr, pred, m
   local type_attr_value = vim.treesitter.get_node_text(node, bufnr)
   local configured = html_script_type_languages[type_attr_value]
   if configured then
-    metadata.language = configured
+    metadata["injection.language"] = configured
   else
     local parts = vim.split(type_attr_value, "/", {})
-    metadata.language = parts[#parts]
+    metadata["injection.language"] = parts[#parts]
   end
 end, true)
 
@@ -172,7 +172,7 @@ query.add_directive("set-lang-from-info-string!", function(match, _, bufnr, pred
     return
   end
   local injection_alias = vim.treesitter.get_node_text(node, bufnr)
-  metadata.language = get_parser_from_markdown_info_string(injection_alias)
+  metadata["injection.language"] = get_parser_from_markdown_info_string(injection_alias)
 end, true)
 
 -- Just avoid some annoying warnings for this directive
@@ -211,37 +211,6 @@ query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
   end
 end, true)
 
----@param match (TSNode|nil)[]
----@param _pattern string
----@param _bufnr integer
----@param pred string[]
----@param metadata table
----@return boolean|nil
-query.add_directive("exclude_children!", function(match, _pattern, _bufnr, pred, metadata)
-  local capture_id = pred[2]
-  local node = match[capture_id]
-  local start_row, start_col, end_row, end_col = node:range()
-  local ranges = {}
-  for i = 0, node:named_child_count() - 1 do
-    local child = node:named_child(i) ---@type TSNode
-    local child_start_row, child_start_col, child_end_row, child_end_col = child:range()
-    if child_start_row > start_row or child_start_col > start_col then
-      table.insert(ranges, {
-        start_row,
-        start_col,
-        child_start_row,
-        child_start_col,
-      })
-    end
-    start_row = child_end_row
-    start_col = child_end_col
-  end
-  if end_row > start_row or end_col > start_col then
-    table.insert(ranges, { start_row, start_col, end_row, end_col })
-  end
-  metadata.content = ranges
-end, true)
-
 -- Trim blank lines from end of the region
 -- Arguments are the captures to trim.
 ---@param match (TSNode|nil)[]
diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm
index 240162b9b..15d3b1670 100644
--- a/queries/arduino/injections.scm
+++ b/queries/arduino/injections.scm
@@ -1,6 +1,15 @@
-((preproc_def (preproc_arg) @arduino)
-  (#lua-match? @arduino "\n"))
-(preproc_function_def (preproc_arg) @arduino)
-(preproc_call (preproc_arg) @arduino)
+((preproc_def
+ (preproc_arg) @injection.content)
+ (#lua-match? @injection.content "\n")
+ (#set! injection.language "arduino"))
 
-(comment) @comment
+(preproc_function_def
+ (preproc_arg) @injection.content
+ (#set! injection.language "arduino"))
+
+(preproc_call
+ (preproc_arg) @injection.content
+ (#set! injection.language "arduino"))
+
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/astro/injections.scm b/queries/astro/injections.scm
index 60ea3f5c6..b8f1ccefc 100644
--- a/queries/astro/injections.scm
+++ b/queries/astro/injections.scm
@@ -1,19 +1,23 @@
-; inherits: html
+; inherits: html_tags
 
-((frontmatter
-    (raw_text) @typescript))
+(frontmatter
+  (raw_text) @injection.content
+  (#set! injection.language "typescript"))
 
-((interpolation
-    (raw_text) @tsx))
+(interpolation
+  (raw_text) @injection.content
+  (#set! injection.language "tsx"))
 
-((script_element
-    (raw_text) @typescript))
+(script_element
+  (raw_text) @injection.content
+  (#set! injection.language "typescript"))
 
-((style_element
-   (start_tag
-     (attribute
-       (attribute_name) @_lang_attr
-       (quoted_attribute_value (attribute_value) @_lang_value)))
-   (raw_text) @scss)
+(style_element
+ (start_tag
+   (attribute
+     (attribute_name) @_lang_attr
+     (quoted_attribute_value (attribute_value) @_lang_value)))
+ (raw_text) @injection.content
  (#eq? @_lang_attr "lang")
- (#eq? @_lang_value "scss"))
+ (#eq? @_lang_value "scss")
+ (#set! injection.language "scss"))
diff --git a/queries/awk/injections.scm b/queries/awk/injections.scm
index 8cbffc623..e5e2b4d02 100644
--- a/queries/awk/injections.scm
+++ b/queries/awk/injections.scm
@@ -1,2 +1,5 @@
-(comment) @comment
-(regex) @regex
+((comment) @injection.content 
+ (#set! injection.language "comment"))
+
+((regex) @injection.content 
+ (#set! injection.language "regex"))
diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 86371b905..e5e2b4d02 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -1,3 +1,5 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
 
-(regex) @regex
+((regex) @injection.content 
+ (#set! injection.language "regex"))
diff --git a/queries/bass/injections.scm b/queries/bass/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/bass/injections.scm
+++ b/queries/bass/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/bicep/injections.scm b/queries/bicep/injections.scm
index c85cfe3b6..d3ff30b60 100644
--- a/queries/bicep/injections.scm
+++ b/queries/bicep/injections.scm
@@ -1,4 +1,5 @@
-[
- (comment)
- (diagnostic_comment)
-] @comment
+([
+  (comment)
+  (diagnostic_comment)
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 2ef8f85c1..a1913e664 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,10 +1,21 @@
-((preproc_def (preproc_arg) @c)
-  (#lua-match? @c "\n"))
-(preproc_function_def (preproc_arg) @c)
-(preproc_call (preproc_arg) @c)
+((preproc_def
+ (preproc_arg) @injection.content)
+ (#lua-match? @injection.content "\n")
+ (#set! injection.language "c"))
 
-(comment) @comment
+(preproc_function_def
+ (preproc_arg) @injection.content
+ (#set! injection.language "c"))
+
+(preproc_call
+ (preproc_arg) @injection.content
+ (#set! injection.language "c"))
+
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 ; TODO: add when asm is added
-; (gnu_asm_expression assembly_code: (string_literal) @asm)
-; (gnu_asm_expression assembly_code: (concatenated_string (string_literal) @asm))
+; (gnu_asm_expression assembly_code: (string_literal) @injection.content
+; (#set! injection.language "asm"))
+; (gnu_asm_expression assembly_code: (concatenated_string (string_literal) @injection.content)
+; (#set! injection.language "asm"))
diff --git a/queries/c_sharp/injections.scm b/queries/c_sharp/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/c_sharp/injections.scm
+++ b/queries/c_sharp/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/capnp/injections.scm b/queries/capnp/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/capnp/injections.scm
+++ b/queries/capnp/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/chatito/injections.scm b/queries/chatito/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/chatito/injections.scm
+++ b/queries/chatito/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/clojure/injections.scm b/queries/clojure/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/clojure/injections.scm
+++ b/queries/clojure/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/cpon/injections.scm b/queries/cpon/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/cpon/injections.scm
+++ b/queries/cpon/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 1d8e11cb3..2349c92bf 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,10 +1,19 @@
-((preproc_def (preproc_arg) @cpp)
-  (#lua-match? @cpp "\n"))
-(preproc_function_def (preproc_arg) @cpp)
-(preproc_call (preproc_arg) @cpp)
+((preproc_def
+ (preproc_arg) @injection.content)
+ (#lua-match? @injection.content "\n")
+ (#set! injection.language "cpp"))
 
-(comment) @comment
+(preproc_function_def
+ (preproc_arg) @injection.content
+ (#set! injection.language "cpp"))
+
+(preproc_call
+ (preproc_arg) @injection.content
+ (#set! injection.language "cpp"))
+
+((comment) @injection.content 
+ (#set! injection.language "comment"))
 
 (raw_string_literal
-  delimiter: (raw_string_delimiter) @language
-  (raw_string_content) @content)
+  delimiter: (raw_string_delimiter) @injection.language
+  (raw_string_content) @injection.content)
diff --git a/queries/css/injections.scm b/queries/css/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/css/injections.scm
+++ b/queries/css/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm
index 09deac468..bb37accb1 100644
--- a/queries/cuda/injections.scm
+++ b/queries/cuda/injections.scm
@@ -1,6 +1,15 @@
-((preproc_def (preproc_arg) @cuda)
-  (#lua-match? @cuda "\n"))
-(preproc_function_def (preproc_arg) @cuda)
-(preproc_call (preproc_arg) @cuda)
+((preproc_def
+ (preproc_arg) @injection.content)
+ (#lua-match? @injection.content "\n")
+ (#set! injection.language "cuda"))
 
-(comment) @comment
+(preproc_function_def
+ (preproc_arg) @injection.content
+ (#set! injection.language "cuda"))
+
+(preproc_call
+ (preproc_arg) @injection.content
+ (#set! injection.language "cuda"))
+
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/cue/injections.scm b/queries/cue/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/cue/injections.scm
+++ b/queries/cue/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/d/injections.scm b/queries/d/injections.scm
index d95514370..6dd8aeacf 100644
--- a/queries/d/injections.scm
+++ b/queries/d/injections.scm
@@ -1,7 +1,9 @@
-[
+([
   (line_comment)
   (block_comment)
   (nesting_block_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment")) 
 
-(token_string_tokens) @d
+((token_string_tokens) @injection.content
+ (#set! injection.language "d"))
diff --git a/queries/dart/injections.scm b/queries/dart/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/dart/injections.scm
+++ b/queries/dart/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/devicetree/injections.scm b/queries/devicetree/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/devicetree/injections.scm
+++ b/queries/devicetree/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/dhall/injections.scm b/queries/dhall/injections.scm
index e48ce9af3..43ae7287b 100644
--- a/queries/dhall/injections.scm
+++ b/queries/dhall/injections.scm
@@ -1,4 +1,5 @@
-[
+([
   (line_comment)
   (block_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/dockerfile/injections.scm b/queries/dockerfile/injections.scm
index c1fdd3f99..2a48ec4f6 100644
--- a/queries/dockerfile/injections.scm
+++ b/queries/dockerfile/injections.scm
@@ -1,3 +1,5 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
 
-(shell_command) @bash
+((shell_command) @injection.content 
+ (#set! injection.language "bash"))
diff --git a/queries/dot/injections.scm b/queries/dot/injections.scm
index 529d04d4a..ac41393ab 100644
--- a/queries/dot/injections.scm
+++ b/queries/dot/injections.scm
@@ -1,2 +1,5 @@
-(html_internal) @html
-(comment) @comment
+((html_internal) @injection.content 
+ (#set! injection.language "html"))
+
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index ba0ea4fa1..3b55295ce 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -1,59 +1,67 @@
 (((comment) @_jsdoc_comment
-  (#lua-match? @_jsdoc_comment "^/[*][*][^*].*[*]/$")) @jsdoc)
+  (#lua-match? @_jsdoc_comment "^/[*][*][^*].*[*]/$")) @injection.content
+  (#set! injection.language "jsdoc"))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 ; html(`...`), html`...`, sql(...) etc
 (call_expression
- function: ((identifier) @language)
+ function: ((identifier) @injection.language)
  arguments: [
              (arguments
-              (template_string) @content)
-             (template_string) @content
+              (template_string) @injection.content)
+             (template_string) @injection.content
             ]
-     (#offset! @content 0 1 0 -1)
-     (#not-eq? @content "svg"))
+     (#offset! @injection.content 0 1 0 -1)
+     (#not-eq? @injection.language "svg"))
 
 ; svg`...` or svg(`...`), which uses the html parser, so is not included in the previous query
 (call_expression
  function: ((identifier) @_name (#eq? @_name "svg"))
  arguments: [
              (arguments
-              (template_string) @html)
-             (template_string) @html
+              (template_string) @injection.content)
+             (template_string) @injection.content
             ]
-     (#offset! @html 0 1 0 -1))
+     (#offset! @injection.content 0 1 0 -1)
+     (#set! injection.language "html"))
 
 
 (call_expression
  function: ((identifier) @_name
    (#eq? @_name "gql"))
- arguments: ((template_string) @graphql
-   (#offset! @graphql 0 1 0 -1)))
+ arguments: ((template_string) @injection.content
+   (#offset! @injection.content 0 1 0 -1)
+   (#set! injection.language "graphql")))
 
 (call_expression
  function: ((identifier) @_name
    (#eq? @_name "hbs"))
- arguments: ((template_string) @glimmer
-   (#offset! @glimmer 0 1 0 -1)))
+ arguments: ((template_string) @injection.content
+   (#offset! @injection.content 0 1 0 -1)
+   (#set! injection.language "glimmer")))
 
-((glimmer_template) @glimmer)
+((glimmer_template) @injection.content
+ (#set! injection.language "glimmer"))
 
 ; styled.div`<css>`
 (call_expression
  function: (member_expression
    object: (identifier) @_name
      (#eq? @_name "styled"))
- arguments: ((template_string) @css
-   (#offset! @css 0 1 0 -1)))
+ arguments: ((template_string) @injection.content
+   (#offset! @injection.content 0 1 0 -1)
+   (#set! injection.language "css")))
 
 ; styled(Component)`<css>`
 (call_expression
  function: (call_expression
    function: (identifier) @_name
      (#eq? @_name "styled"))
- arguments: ((template_string) @css
-   (#offset! @css 0 1 0 -1)))
+ arguments: ((template_string) @injection.content
+   (#offset! @injection.content 0 1 0 -1)
+   (#set! injection.language "css")))
 
 ; styled.div.attrs({ prop: "foo" })`<css>`
 (call_expression
@@ -62,8 +70,9 @@
     object: (member_expression
       object: (identifier) @_name
         (#eq? @_name "styled"))))
- arguments: ((template_string) @css
-   (#offset! @css 0 1 0 -1)))
+ arguments: ((template_string) @injection.content
+   (#offset! @injection.content 0 1 0 -1)
+   (#set! injection.language "css")))
 
 
 ; styled(Component).attrs({ prop: "foo" })`<css>`
@@ -73,31 +82,34 @@
     object: (call_expression
       function: (identifier) @_name
         (#eq? @_name "styled"))))
- arguments: ((template_string) @css
-   (#offset! @css 0 1 0 -1)))
+ arguments: ((template_string) @injection.content
+   (#offset! @injection.content 0 1 0 -1)
+   (#set! injection.language "css")))
 
-(regex_pattern) @regex
+((regex_pattern) @injection.content
+ (#set! injection.language "regex"))
 
 ; ((comment) @_gql_comment
 ;   (#eq? @_gql_comment "/* GraphQL */")
-;   (template_string) @graphql)
+;   (template_string) @injection.content
+;   (#set! injection.language "graphql"))
 
-((template_string) @graphql
-  (#lua-match? @graphql "^`#graphql")
-  (#offset! @graphql 0 1 0 -1))
+((template_string) @injection.content
+  (#lua-match? @injection.content "^`#graphql")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "graphql"))
 
 ; el.innerHTML = `<html>`
-(assignment_expression
-  left: (member_expression
-          property: (property_identifier) @_prop
-           (#any-of? @_prop "innerHTML" "outerHTML"))
-  right: (template_string) @html
-    (#offset! @html 0 1 0 -1))
-
 ; el.innerHTML = '<html>'
 (assignment_expression
-   left: (member_expression
-           property: (property_identifier) @_prop
-            (#any-of? @_prop "innerHTML" "outerHTML"))
-   right: (string) @html
-            (#offset! @html 0 1 0 -1))
+  left: 
+    (member_expression
+      property: (property_identifier) @_prop
+      (#any-of? @_prop "outerHTML" "innerHTML"))
+  right: 
+    [
+      (template_string)
+      (string)
+    ] @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.language "html"))
diff --git a/queries/eex/injections.scm b/queries/eex/injections.scm
index f43206f55..9331f5925 100644
--- a/queries/eex/injections.scm
+++ b/queries/eex/injections.scm
@@ -1,5 +1,8 @@
 ; EEx expressions are Elixir
-(expression) @elixir
+((expression) @injection.content 
+ (#set! injection.language "elixir"))
 
 ; EEx expressions can span multiple interpolated lines
-(partial_expression) @elixir @combined
+((partial_expression) @injection.content
+ (#set! injection.language "elixir")
+ (#set! injection.combined))
diff --git a/queries/elixir/injections.scm b/queries/elixir/injections.scm
index 423fddea7..1f0b31f07 100644
--- a/queries/elixir/injections.scm
+++ b/queries/elixir/injections.scm
@@ -1,5 +1,6 @@
 ; Comments
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
 
 ; Documentation
 (unary_operator
@@ -7,42 +8,49 @@
   operand: (call
     target: ((identifier) @_identifier (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc"))
     (arguments [
-      (string (quoted_content) @markdown)
-      (sigil (quoted_content) @markdown)
-    ])))
+      (string (quoted_content) @injection.content)
+      (sigil (quoted_content) @injection.content)
+    ]) 
+    (#set! injection.language "markdown")))
 
 ; HEEx
 (sigil
   (sigil_name) @_sigil_name
-  (quoted_content) @heex
-(#eq? @_sigil_name "H"))
+  (quoted_content) @injection.content
+ (#eq? @_sigil_name "H")
+ (#set! injection.language "heex"))
 
 ; Surface
 (sigil
   (sigil_name) @_sigil_name
-  (quoted_content) @surface
-(#eq? @_sigil_name "F"))
+  (quoted_content) @injection.content
+ (#eq? @_sigil_name "F")
+ (#set! injection.language "surface"))
 
 ; Zigler
 (sigil
   (sigil_name) @_sigil_name
-  (quoted_content) @eex
-(#any-of? @_sigil_name "E" "L"))
+  (quoted_content) @injection.content
+ (#any-of? @_sigil_name "E" "L")
+ (#set! injection.language "eex"))
 
 (sigil
   (sigil_name) @_sigil_name
-  (quoted_content) @zig
-(#any-of? @_sigil_name "z" "Z"))
+  (quoted_content) @injection.content
+ (#any-of? @_sigil_name "z" "Z")
+ (#set! injection.language "zig"))
 
 ; Regex
 (sigil
   (sigil_name) @_sigil_name
-  (quoted_content) @regex
-(#any-of? @_sigil_name "r" "R"))
+  (quoted_content) @injection.content
+ (#any-of? @_sigil_name "r" "R")
+ (#set! injection.language "regex"))
 
-; Jason
+; Json
 (sigil
   (sigil_name) @_sigil_name
-  (quoted_content) @json
-(#any-of? @_sigil_name "j" "J"))
+  (quoted_content) @injection.content
+ (#any-of? @_sigil_name "j" "J")
+ (#set! injection.language "json"))
 
diff --git a/queries/elm/injections.scm b/queries/elm/injections.scm
index 6395776e1..b8b3e9943 100644
--- a/queries/elm/injections.scm
+++ b/queries/elm/injections.scm
@@ -1,3 +1,8 @@
-[(line_comment) (block_comment)] @comment
+([
+  (line_comment) 
+  (block_comment)
+ ] @injection.content
+ (#set! injection.language "comment"))
 
-(glsl_content) @glsl
+((glsl_content) @injection.content
+ (#set! injection.language "glsl"))
diff --git a/queries/elsa/injections.scm b/queries/elsa/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/elsa/injections.scm
+++ b/queries/elsa/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/elvish/injections.scm b/queries/elvish/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/elvish/injections.scm
+++ b/queries/elvish/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/embedded_template/injections.scm b/queries/embedded_template/injections.scm
index d55c87e09..2824f7a00 100644
--- a/queries/embedded_template/injections.scm
+++ b/queries/embedded_template/injections.scm
@@ -1,2 +1,7 @@
-(content) @html @combined
-(code) @ruby @combined
+((content) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined))
+
+((code) @injection.content
+ (#set! injection.language "ruby")
+ (#set! injection.combined))
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/fennel/injections.scm
+++ b/queries/fennel/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/firrtl/injections.scm b/queries/firrtl/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/firrtl/injections.scm
+++ b/queries/firrtl/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/fish/injections.scm b/queries/fish/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/fish/injections.scm
+++ b/queries/fish/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/foam/injections.scm b/queries/foam/injections.scm
index 4afdb63b0..2d744f6af 100644
--- a/queries/foam/injections.scm
+++ b/queries/foam/injections.scm
@@ -1,12 +1,20 @@
 ;; Pass code blocks to Cpp highlighter
-(code (code_body) @cpp)
+(code 
+  (code_body) @injection.content 
+  (#set! injection.language "cpp"))
 
 ;; Pass identifiers to Go highlighter (Cheating I know)
-;;((identifier) @lua)
+;; ((identifier) @injection.content
+;;  (#set! injection.language "lua")
 
 ;; Highlight regex syntax inside literal strings
-((string_literal) @regex)
+((string_literal) @injection.content 
+ (#set! injection.language "regex"))
 
 ;; Highlight PyFoam syntax as Python statements
-(pyfoam_variable code_body: (_) @python)
-(pyfoam_expression code_body: (_) @python)
+(pyfoam_variable
+  code_body: (_) @injection.content
+  (#set! injection.language "python"))
+(pyfoam_expression
+  code_body: (_) @injection.content
+  (#set! injection.language "python"))
diff --git a/queries/gdscript/injections.scm b/queries/gdscript/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/gdscript/injections.scm
+++ b/queries/gdscript/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/git_rebase/injections.scm b/queries/git_rebase/injections.scm
index 27388618e..8e6815a68 100644
--- a/queries/git_rebase/injections.scm
+++ b/queries/git_rebase/injections.scm
@@ -1,5 +1,6 @@
 ((operation
    (command) @_command
-   (message) @bash)
+   (message) @injection.content)
+(#set! injection.language "bash")
 (#any-of? @_command "exec" "x"))
 
diff --git a/queries/gitattributes/injections.scm b/queries/gitattributes/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/gitattributes/injections.scm
+++ b/queries/gitattributes/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/gitcommit/injections.scm b/queries/gitcommit/injections.scm
index eecdeee47..5e56dfa5f 100644
--- a/queries/gitcommit/injections.scm
+++ b/queries/gitcommit/injections.scm
@@ -1,2 +1,5 @@
-((diff) @diff (#exclude_children! @diff))
-(rebase_command) @git_rebase
+((diff) @injection.content
+ (#set! injection.language "diff"))
+
+((rebase_command) @injection.content 
+ (#set! injection.language "git_rebase"))
diff --git a/queries/gleam/injections.scm b/queries/gleam/injections.scm
index ed4c2de91..378240e38 100644
--- a/queries/gleam/injections.scm
+++ b/queries/gleam/injections.scm
@@ -1,6 +1,7 @@
 ; Comments
-[
+([
   (module_comment)
   (statement_comment) 
   (comment) 
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm
index 6d022021d..f9061052c 100644
--- a/queries/glsl/injections.scm
+++ b/queries/glsl/injections.scm
@@ -1,6 +1,15 @@
-((preproc_def (preproc_arg) @glsl)
-  (#lua-match? @glsl "\n"))
-(preproc_function_def (preproc_arg) @glsl)
-(preproc_call (preproc_arg) @glsl)
+((preproc_def
+ (preproc_arg) @injection.content)
+ (#lua-match? @injection.content "\n")
+ (#set! injection.language "glsl"))
 
-(comment) @comment
+(preproc_function_def
+ (preproc_arg) @injection.content
+ (#set! injection.language "glsl"))
+
+(preproc_call
+ (preproc_arg) @injection.content
+ (#set! injection.language "glsl"))
+
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index e0bdc99b9..68aa552cd 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -1,4 +1,5 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
 
 (call_expression
   (selector_expression) @_function (#any-of? @_function
@@ -10,4 +11,10 @@
                                     "regexp.MustCompile"
                                     "regexp.MustCompilePOSIX")
   (argument_list
-    . [(raw_string_literal) (interpreted_string_literal)] @regex (#offset! @regex 0 1 0 -1)))
+    . 
+    [
+     (raw_string_literal) 
+     (interpreted_string_literal)
+    ] @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.language "regex")))
diff --git a/queries/gomod/injections.scm b/queries/gomod/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/gomod/injections.scm
+++ b/queries/gomod/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/gowork/injections.scm b/queries/gowork/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/gowork/injections.scm
+++ b/queries/gowork/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/graphql/injections.scm b/queries/graphql/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/graphql/injections.scm
+++ b/queries/graphql/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/groovy/injections.scm b/queries/groovy/injections.scm
index 0a63c9bfe..0f3127b6b 100644
--- a/queries/groovy/injections.scm
+++ b/queries/groovy/injections.scm
@@ -1,4 +1,5 @@
-[
-  (block_comment)
-  (line_comment)
-] @comment
+((line_comment) @injection.content
+ (#set! injection.language "comment"))
+
+((block_comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/hare/injections.scm b/queries/hare/injections.scm
index 2992a948d..d3befb39b 100644
--- a/queries/hare/injections.scm
+++ b/queries/hare/injections.scm
@@ -1,8 +1,10 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 ((call_expression
   . (_) @_fnname
   . "("
-  . (_ [(string_content) (raw_string_content)] @regex)
+  . (_ [(string_content) (raw_string_content)] @injection.content)
   . ")")
-  (#any-of? @_fnname "compile" "regex::compile"))
+  (#any-of? @_fnname "compile" "regex::compile")
+  (#set! injection.language "regex"))
diff --git a/queries/haskell/injections.scm b/queries/haskell/injections.scm
index f210566c4..bc70e012f 100644
--- a/queries/haskell/injections.scm
+++ b/queries/haskell/injections.scm
@@ -2,11 +2,12 @@
 ;; General language injection
 
 (quasiquote
- ((quoter) @language)
- ((quasiquote_body) @content)
+ ((quoter) @injection.language)
+ ((quasiquote_body) @injection.content)
 )
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 ;; -----------------------------------------------------------------------------
 ;; shakespeare library
@@ -17,35 +18,36 @@
 ; (quasiquote
 ;  (quoter) @_name
 ;  (#eq? @_name "coffee")
-;  ((quasiquote_body) @coffeescript)
+;  ((quasiquote_body) @injection.content
+;   (#set! injection.language "coffeescript")))
 
 ; CSS: Text.Cassius, Text.Lucius
 (quasiquote
  (quoter) @_name
  (#any-of? @_name "cassius" "lucius")
- ((quasiquote_body) @css)
-)
+ ((quasiquote_body) @injection.content)
+ (#set! injection.language "css"))
 
 ; HTML: Text.Hamlet
 (quasiquote
  (quoter) @_name
  (#any-of? @_name "shamlet" "xshamlet" "hamlet" "xhamlet" "ihamlet")
- ((quasiquote_body) @html)
-)
+ ((quasiquote_body) @injection.content)
+ (#set! injection.language "html"))
 
 ; JS: Text.Julius
 (quasiquote
  (quoter) @_name
  (#any-of? @_name "js" "julius")
- ((quasiquote_body) @javascript)
-)
+ ((quasiquote_body) @injection.content)
+ (#set! injection.language "javascript"))
 
 ; TS: Text.TypeScript
 (quasiquote
  (quoter) @_name
  (#any-of? @_name "tsc" "tscJSX")
- ((quasiquote_body) @typescript)
-)
+ ((quasiquote_body) @injection.content)
+ (#set! injection.language "typescript"))
 
 
 ;; -----------------------------------------------------------------------------
@@ -54,8 +56,8 @@
 (quasiquote
  (quoter) @_name
  (#eq? @_name "hsx")
- ((quasiquote_body) @html)
-)
+ ((quasiquote_body) @injection.content)
+ (#set! injection.language "html"))
 
 ;; -----------------------------------------------------------------------------
 ;; Inline JSON from aeson
@@ -63,8 +65,8 @@
 (quasiquote
   (quoter) @_name
   (#eq? @_name "aesonQQ")
-  ((quasiquote_body) @json)
-)
+  ((quasiquote_body) @injection.content)
+  (#set! injection.language "json"))
 
 
 ;; -----------------------------------------------------------------------------
@@ -72,14 +74,12 @@
 
 ; postgresql-simple
 (quasiquote
-  (quoter) @_name 
-  (#eq? @_name "sql")
-  ((quasiquote_body) @sql)
-)
+  (quoter) @injection.language
+  (#eq? @injection.language "sql")
+  ((quasiquote_body) @injection.content))
 
-; persistent
 (quasiquote
- (quoter) @_name
- (#any-of? @_name "persistUpperCase" "persistLowerCase" "persistWith")
- ((quasiquote_body) @haskell_persistent)
-)
+  (quoter) @_name
+  (#any-of? @_name "persistUpperCase" "persistLowerCase" "persistWith")
+  ((quasiquote_body) @injection.content)
+  (#set! injection.language "haskell_persistent"))
diff --git a/queries/hcl/injections.scm b/queries/hcl/injections.scm
index 94451beb4..fd881d503 100644
--- a/queries/hcl/injections.scm
+++ b/queries/hcl/injections.scm
@@ -1,7 +1,7 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 (heredoc_template
-  (template_literal) @content
-  (heredoc_identifier) @language
-  (#set! "language" @language)
-  (#downcase! "language"))
+  (template_literal) @injection.content
+  (heredoc_identifier) @injection.language
+  (#downcase! @injection.language))
diff --git a/queries/heex/injections.scm b/queries/heex/injections.scm
index fffd1dc53..1aa822197 100644
--- a/queries/heex/injections.scm
+++ b/queries/heex/injections.scm
@@ -2,10 +2,15 @@
 (directive [
   (expression_value) 
   (partial_expression_value)
-] @elixir @combined)  
+] @injection.content
+  (#set! injection.language "elixir")
+  (#set! injection.combined))  
 
 ; HEEx Elixir expressions are always within a tag or component
-(expression (expression_value) @elixir)
+(expression 
+  (expression_value) @injection.content 
+  (#set! injection.language "elixir"))
 
 ; HEEx comments
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/hjson/injections.scm b/queries/hjson/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/hjson/injections.scm
+++ b/queries/hjson/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/hlsl/injections.scm b/queries/hlsl/injections.scm
index 52e88686c..9a9fcd6e8 100644
--- a/queries/hlsl/injections.scm
+++ b/queries/hlsl/injections.scm
@@ -1,6 +1,15 @@
-((preproc_def (preproc_arg) @hlsl)
-  (#lua-match? @hlsl "\n"))
-(preproc_function_def (preproc_arg) @hlsl)
-(preproc_call (preproc_arg) @hlsl)
+((preproc_def
+ (preproc_arg) @injection.content)
+ (#lua-match? @injection.content "\n")
+ (#set! injection.language "hlsl"))
 
-(comment) @comment
+(preproc_function_def
+ (preproc_arg) @injection.content
+ (#set! injection.language "hlsl"))
+
+(preproc_call
+ (preproc_arg) @injection.content
+ (#set! injection.language "hlsl"))
+
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/hocon/injections.scm b/queries/hocon/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/hocon/injections.scm
+++ b/queries/hocon/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/html/injections.scm b/queries/html/injections.scm
index 23981018c..eba8395a4 100644
--- a/queries/html/injections.scm
+++ b/queries/html/injections.scm
@@ -3,8 +3,10 @@
 (element
   (start_tag
     (tag_name) @_py_script)
-  (text) @python
-  (#any-of? @_py_script "py-script" "py-repl"))
+  (text) @injection.content
+  (#any-of? @_py_script "py-script" "py-repl")
+  (#set! injection.language "python")
+  (#set! injection.include-children))
 
 (script_element
   (start_tag
@@ -12,13 +14,17 @@
       (attribute_name) @_attr 
       (quoted_attribute_value 
         (attribute_value) @_type)))
-  (raw_text) @python
+  (raw_text) @injection.content
   (#eq? @_attr "type")
   ; not adding type="py" here as it's handled by html_tags 
-  (#any-of? @_type "pyscript" "py-script"))
+  (#any-of? @_type "pyscript" "py-script")
+  (#set! injection.language "python")
+  (#set! injection.include-children))
 
 (element
   (start_tag
     (tag_name) @_py_config)
-  (text) @toml
-  (#eq? @_py_config "py-config"))
+  (text) @injection.content
+  (#eq? @_py_config "py-config")
+  (#set! injection.language "toml")
+  (#set! injection.include-children))
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 29608a5a4..5b9e5350f 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -2,73 +2,84 @@
 ; <style blocking> ...</style>
 ; Add "lang" to predicate check so that vue/svelte can inherit this
 ; without having this element being captured twice
-(
-  (style_element
+((style_element
     (start_tag) @_no_type_lang
-      (#not-lua-match? @_no_type_lang "%slang%s*=")
-      (#not-lua-match? @_no_type_lang "%stype%s*=")
-    (raw_text) @css))
+    (raw_text) @injection.content)
+  (#not-lua-match? @_no_type_lang "%slang%s*=")
+  (#not-lua-match? @_no_type_lang "%stype%s*=")
+  (#set! injection.language "css")
+  (#set! injection.include-children))
 
-(
-  (style_element
-    (start_tag
-      (attribute
-        (attribute_name) @_type
-        (quoted_attribute_value (attribute_value) @_css)))
-    (raw_text) @css)
-  (#eq? @_type "type")
-  (#eq? @_css "text/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")
+ (#set! injection.include-children))
 
 ; <script>...</script>
 ; <script defer>...</script>
-(
-  (script_element
-    (start_tag) @_no_type_lang
-      (#not-lua-match? @_no_type_lang "%slang%s*=")
-      (#not-lua-match? @_no_type_lang "%stype%s*=")
-    (raw_text) @javascript))
+((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")
+ (#set! injection.include-children))
 
 ; <script type="mimetype-or-well-known-script-type">
 (script_element
-   (start_tag
-      ((attribute
-           (attribute_name) @_attr (#eq? @_attr "type")
-           (quoted_attribute_value (attribute_value) @_type))))
-   (raw_text) @content (#set-lang-from-mimetype! @_type))
+  (start_tag
+    ((attribute
+         (attribute_name) @_attr (#eq? @_attr "type")
+         (quoted_attribute_value (attribute_value) @_type))))
+  (raw_text) @injection.content (#set-lang-from-mimetype! @_type)
+  (#set! injection.include-children))
 
 ; <a style="/* css */">
 ((attribute
    (attribute_name) @_attr
-   (quoted_attribute_value (attribute_value) @css))
- (#eq? @_attr "style"))
+   (quoted_attribute_value (attribute_value) @injection.content))
+ (#eq? @_attr "style")
+ (#set! injection.language "css")
+ (#set! injection.include-children))
 
 ; lit-html style template interpolation
 ; <a @click=${e => console.log(e)}>
 ; <a @click="${e => console.log(e)}">
 ((attribute
-  (quoted_attribute_value (attribute_value) @javascript))
-  (#lua-match? @javascript "%${")
-  (#offset! @javascript 0 2 0 -1))
-((attribute
-  (attribute_value) @javascript)
-  (#lua-match? @javascript "%${")
-  (#offset! @javascript 0 2 0 -2))
+  (quoted_attribute_value (attribute_value) @injection.content))
+  (#lua-match? @injection.content "%${")
+  (#offset! @injection.content 0 2 0 -1)
+  (#set! injection.language "javascript")
+  (#set! injection.include-children))
 
-(comment) @comment
+((attribute
+  (attribute_value) @injection.content)
+  (#lua-match? @injection.content "%${")
+  (#offset! @injection.content 0 2 0 -2)
+  (#set! injection.language "javascript")
+  (#set! injection.include-children))
 
 ; <input pattern="[0-9]"> or <input pattern=[0-9]>
 (element (_
   (tag_name) @_tagname (#eq? @_tagname "input")
   ((attribute
     (attribute_name) @_attr [
-      (quoted_attribute_value (attribute_value) @regex)
-      (attribute_value) @regex
+      (quoted_attribute_value (attribute_value) @injection.content)
+      (attribute_value) @injection.content
     ] (#eq? @_attr "pattern")))
-))
+  (#set! injection.language "regex")
+  (#set! injection.include-children)))
 
 ; <input type="checkbox" onchange="this.closest('form').elements.output.value = this.checked">
 (attribute
   (attribute_name) @_name
   (#lua-match? @_name "^on[a-z]+$")
-  (quoted_attribute_value (attribute_value) @javascript))
+  (quoted_attribute_value (attribute_value) @injection.content)
+  (#set! injection.language "javascript")
+  (#set! injection.include-children))
diff --git a/queries/htmldjango/injections.scm b/queries/htmldjango/injections.scm
index 6e49e8dcd..f08227342 100644
--- a/queries/htmldjango/injections.scm
+++ b/queries/htmldjango/injections.scm
@@ -1 +1,3 @@
-(content) @html @combined
+((content) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined))
diff --git a/queries/http/injections.scm b/queries/http/injections.scm
index db35379f7..7f06e336d 100644
--- a/queries/http/injections.scm
+++ b/queries/http/injections.scm
@@ -1,7 +1,11 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
 
-(json_body) @json
+((json_body) @injection.content
+ (#set! injection.language "json"))
 
-; (xml_body) @xml
+; ((xml_body) @injection.content
+;  (#set! injection.language "xml"))
 
-; (graphql_body) @graphql Not used as of now..
+; ((graphql_body) @injection.content 
+;  (#set! injection.language "graphql")) ; Not used as of now..
diff --git a/queries/hurl/injections.scm b/queries/hurl/injections.scm
index 933633e03..3d961258f 100644
--- a/queries/hurl/injections.scm
+++ b/queries/hurl/injections.scm
@@ -1,7 +1,11 @@
 ; injections.scm
-(json_value) @json
-(xml) @html
+((json_value) @injection.content
+ (#set! injection.language "json"))
+
+((xml) @injection.content
+ (#set! injection.language "html"))
 
 (multiline_string
-  (multiline_string_type) @language
-  (multiline_string_content) @content)
+  (multiline_string_type) @_lang
+  (multiline_string_content) @injection.content
+  (#inject-language! @_lang))
diff --git a/queries/janet_simple/injections.scm b/queries/janet_simple/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/janet_simple/injections.scm
+++ b/queries/janet_simple/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 0a63c9bfe..988d370f0 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -1,4 +1,5 @@
-[
+([
   (block_comment)
   (line_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/jq/injections.scm b/queries/jq/injections.scm
index 5b3913967..072d38e24 100644
--- a/queries/jq/injections.scm
+++ b/queries/jq/injections.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+((comment) @injection.content (#set! injection.language "comment"))
 
 ; test(val)
 (query
@@ -12,7 +12,10 @@
              "splits"
              "sub"
              "gsub"))
-  (args . (query (string) @regex)))
+  (args . 
+    (query 
+      (string) @injection.content
+      (#set! injection.language "regex"))))
 
 
 ; test(regex; flags)
@@ -28,4 +31,6 @@
              "sub"
              "gsub"))
   (args . (args
-    (query (string) @regex))))
+    (query 
+      (string) @injection.content
+      (#set! injection.language "regex")))))
diff --git a/queries/json5/injections.scm b/queries/json5/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/json5/injections.scm
+++ b/queries/json5/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/jsonc/injections.scm b/queries/jsonc/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/jsonc/injections.scm
+++ b/queries/jsonc/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/jsx/injections.scm b/queries/jsx/injections.scm
index 3a96931b0..e20408a66 100644
--- a/queries/jsx/injections.scm
+++ b/queries/jsx/injections.scm
@@ -3,6 +3,7 @@
   (jsx_opening_element
     (identifier) @_name (#eq? @_name "style")
     (jsx_attribute) @_attr (#eq? @_attr "jsx"))
-  (jsx_expression (template_string) @css
-    (#offset! @css 0 1 0 -1))
-)
+  (jsx_expression 
+    ((template_string) @injection.content 
+     (#set! injection.language "css"))
+     (#offset! @injection.content 0 1 0 -1)))
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 0dfd323ff..82e1503fc 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -1,5 +1,5 @@
 ;; Inject markdown in docstrings 
-((string_literal) @markdown
+((string_literal) @injection.content
   . [
     (module_definition)
     (abstract_definition)
@@ -9,15 +9,18 @@
     (assignment)
     (const_statement)
   ]
- (#lua-match? @markdown "^\"\"\"")
- (#offset! @markdown 0 3 0 -3))
+ (#lua-match? @injection.content "^\"\"\"")
+ (#set! injection.language "markdown")
+ (#offset! @injection.content 0 3 0 -3))
 
-[
+([
   (line_comment)
   (block_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
 
 ((prefixed_string_literal
-   prefix: (identifier) @_prefix) @regex
+   prefix: (identifier) @_prefix) @injection.content
  (#eq? @_prefix "r")
- (#offset! @regex 0 2 0 -1))
+ (#set! injection.language "regex")
+ (#offset! @injection.content 0 2 0 -1))
diff --git a/queries/kdl/injections.scm b/queries/kdl/injections.scm
index e8f3c2ea7..46674768d 100644
--- a/queries/kdl/injections.scm
+++ b/queries/kdl/injections.scm
@@ -1,4 +1,5 @@
-[
+([
   (single_line_comment)
   (multi_line_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/kotlin/injections.scm b/queries/kotlin/injections.scm
index 7ba4d9494..757259d10 100644
--- a/queries/kotlin/injections.scm
+++ b/queries/kotlin/injections.scm
@@ -1,35 +1,36 @@
-[
+([
   (line_comment)
   (multiline_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
 
 ; There are 3 ways to define a regex
 ;    - "[abc]?".toRegex()
 (call_expression
-	(navigation_expression
-		((string_literal) @regex)
-		(navigation_suffix
-			((simple_identifier) @_function
-			(#eq? @_function "toRegex")))))
+  (navigation_expression
+    ((string_literal) @injection.content (#set! injection.language "regex"))
+      (navigation_suffix
+	((simple_identifier) @_function
+	  (#eq? @_function "toRegex")))))
 
 ;    - Regex("[abc]?")
 (call_expression
-	((simple_identifier) @_function
-	(#eq? @_function "Regex"))
-	(call_suffix
-		(value_arguments
-			(value_argument
-				(string_literal) @regex))))
+  ((simple_identifier) @_function
+    (#eq? @_function "Regex"))
+  (call_suffix
+    (value_arguments
+      (value_argument
+        (string_literal) @injection.content (#set! injection.language "regex")))))
 
 ;    - Regex.fromLiteral("[abc]?")
 (call_expression
-	(navigation_expression
-		((simple_identifier) @_class
-		(#eq? @_class "Regex"))
-		(navigation_suffix
-			((simple_identifier) @_function
-			(#eq? @_function "fromLiteral"))))
-	(call_suffix
-		(value_arguments
-			(value_argument
-				(string_literal) @regex))))
+  (navigation_expression
+    ((simple_identifier) @_class
+                         (#eq? @_class "Regex"))
+    (navigation_suffix
+      ((simple_identifier) @_function
+                           (#eq? @_function "fromLiteral"))))
+  (call_suffix
+    (value_arguments
+      (value_argument
+        (string_literal) @injection.content (#set! injection.language "regex")))))
diff --git a/queries/lalrpop/injections.scm b/queries/lalrpop/injections.scm
index e328af0cd..41bde7e39 100644
--- a/queries/lalrpop/injections.scm
+++ b/queries/lalrpop/injections.scm
@@ -1,9 +1,11 @@
-[
- (normal_action)
- (failible_action)
-] @rust
+([
+  (normal_action)
+  (failible_action)
+ ] @injection.content
+ (#set! injection.language "rust"))
 
-(use) @rust
+((use) @injection.content (#set! injection.language "rust"))
 
-((regex_literal) @regex
- (#offset! @regex 0 2 0 -1))
+((regex_literal) @injection.content
+ (#set! injection.language "regex")
+ (#offset! @injection.content 0 2 0 -1))
diff --git a/queries/latex/injections.scm b/queries/latex/injections.scm
index e68c6d938..85417104a 100644
--- a/queries/latex/injections.scm
+++ b/queries/latex/injections.scm
@@ -1,22 +1,25 @@
-[
- (line_comment)
- (block_comment)
- (comment_environment)
-] @comment
+([
+  (line_comment)
+  (block_comment)
+  (comment_environment)
+ ] @injection.content
+ (#set! injection.language "comment"))
 
 (pycode_environment
-  code: (source_code) @python
-)
+  code: 
+  (source_code) @injection.content 
+  (#set! injection.language "python"))
 
 (minted_environment
   (begin
     language: (curly_group_text
-               (text) @language))
-  (source_code) @content)
+               (text) @injection.language))
+  (source_code) @injection.content)
 
 ((generic_environment
   (begin
    name: (curly_group_text
-           (text) @_env))) @c
+           (text) @_env))) @injection.content
+   (#set! injection.language "c")
    (#any-of? @_env "asy" "asydef"))
 
diff --git a/queries/ledger/injections.scm b/queries/ledger/injections.scm
index 2d9481414..ad62013f5 100644
--- a/queries/ledger/injections.scm
+++ b/queries/ledger/injections.scm
@@ -1,2 +1,5 @@
-(comment) @comment
-(note) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((note) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index bdc2ae52c..7608da57a 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -243,5 +243,7 @@
 
 (string) @string
 
+(escape_sequence) @string.escape
+
 ;; Error
 (ERROR) @error
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index da3107b0e..bdb460895 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -3,57 +3,65 @@
     (identifier) @_cdef_identifier
     (_ _ (identifier) @_cdef_identifier)
   ]
-  arguments: (arguments (string content: _ @c)))
+  arguments: 
+    (arguments 
+      (string content: _ @injection.content)))
+  (#set! injection.language "c")
   (#eq? @_cdef_identifier "cdef"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments . (string content: _ @vim)))
-  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec" "vim.api.nvim_exec2"))
+  arguments: (arguments (string content: _ @injection.content)))
+  (#set! injection.language "vim")
+  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_command" "vim.api.nvim_exec2"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments (string content: _ @query) .))
-  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query" "vim.treesitter.query.parse"))
+  arguments: (arguments (string content: _ @injection.content) .))
+  (#set! injection.language "query")
+  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse"))
 
-; vim.rcprequest(123, "nvim_exec_lua", "return vim.api.nvim_buf_get_lines(0, 0, -1, false)", false)
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments . (_) . (string content: _ @_method) . (string content: _ @lua)))
+  arguments: (arguments . (_) . (string content: _ @_method) . (string content: _ @injection.content)))
   (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
-  (#eq? @_method "nvim_exec_lua"))
+  (#eq? @_method "nvim_exec_lua")
+  (#set! injection.language "lua"))
 
-; highlight string as query if starts with `;; query`
-(string content: _ @query (#lua-match? @query "^%s*;+%s?query"))
+;; highlight string as query if starts with `;; query`
+(string content: _ @injection.content 
+ (#lua-match? @injection.content "^%s*;+%s?query")
+ (#set! injection.language "query"))
 
-((comment) @luadoc
-  (#lua-match? @luadoc "[-][-][-][%s]*@")
-  (#offset! @luadoc 0 3 0 0))
+((comment) @injection.content
+  (#lua-match? @injection.content "[-][-][-][%s]*@")
+  (#set! injection.language "luadoc")
+  (#offset! @injection.content 0 3 0 0))
 
 ; string.match("123", "%d+")
 (function_call
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "match"))
-  arguments: (arguments (_) . (string content: _ @luap)))
+  arguments: (arguments (_) . (string content: _ @injection.content (#set! injection.language "luap"))))
 
 (function_call
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "gmatch" "gsub"))
-  arguments: (arguments (_) (string content: _ @luap)))
+  arguments: (arguments (_) (string content: _ @injection.content (#set! injection.language "luap"))))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "match"))
-    arguments: (arguments . (string content: _ @luap)))
+    arguments: (arguments . (string content: _ @injection.content (#set! injection.language "luap"))))
 
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "gmatch" "gsub"))
-    arguments: (arguments (string content: _ @luap)))
+    arguments: (arguments (string content: _ @injection.content (#set! injection.language "luap"))))
 
-(comment) @comment
+((comment) @injection.content (#set! injection.language "comment"))
diff --git a/queries/luau/injections.scm b/queries/luau/injections.scm
index b24330f31..e70e0274b 100644
--- a/queries/luau/injections.scm
+++ b/queries/luau/injections.scm
@@ -3,37 +3,44 @@
     (identifier) @_cdef_identifier
     (_ _ (identifier) @_cdef_identifier)
   ]
-  arguments: (arguments (string content: _ @c)))
-  (#eq? @_cdef_identifier "cdef"))
+  arguments: (arguments (string content: _ @injection.content)))
+  (#eq? @_cdef_identifier "cdef")
+  (#set! injection.language "c"))
 
-((comment) @luadoc
-  (#lua-match? @luadoc "[-][-][-][%s]*@")
-  (#offset! @luadoc 0 3 0 0))
+((comment) @injection.content
+  (#lua-match? @injection.content "[-][-][-][%s]*@")
+  (#offset! @injection.content 0 3 0 0)
+  (#set! injection.language "luadoc"))
 
 ; string.match("123", "%d+")
 (function_call
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "format" "match"))
-  arguments: (arguments (_) . (string content: _ @luap)))
+  arguments: (arguments (_) . (string content: _ @injection.content))
+    (#set! injection.language "luap"))
 
 (function_call
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "gmatch" "gsub"))
-  arguments: (arguments (_) (string content: _ @luap)))
+  arguments: (arguments (_) (string content: _ @injection.content))
+    (#set! injection.language "luap"))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "format" "match"))
-    arguments: (arguments . (string content: _ @luap)))
+    arguments: (arguments . (string content: _ @injection.content))
+    (#set! injection.language "luap"))
 
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "gmatch" "gsub"))
-    arguments: (arguments (string content: _ @luap)))
+    arguments: (arguments (string content: _ @injection.content))
+    (#set! injection.language "luap"))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/m68k/injections.scm b/queries/m68k/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/m68k/injections.scm
+++ b/queries/m68k/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/make/injections.scm b/queries/make/injections.scm
index 3add7f494..646daadd0 100644
--- a/queries/make/injections.scm
+++ b/queries/make/injections.scm
@@ -1,4 +1,7 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
-(shell_text) @bash
-(shell_command) @bash
+((shell_text) @injection.content
+ (#set! injection.language "bash"))
+((shell_command) @injection.content
+ (#set! injection.language "bash"))
diff --git a/queries/markdown/injections.scm b/queries/markdown/injections.scm
index b1795e713..735189db1 100644
--- a/queries/markdown/injections.scm
+++ b/queries/markdown/injections.scm
@@ -1,17 +1,26 @@
 (fenced_code_block
   (info_string
     (language) @_lang)
-  (code_fence_content)
-    @content
-    (#set-lang-from-info-string! @_lang)
-    (#exclude_children! @content))
+  (code_fence_content) @injection.content
+  (#set-lang-from-info-string! @_lang))
 
-((html_block) @html @combined)
+((html_block) @injection.content 
+ (#set! injection.language "html")
+ (#set! injection.combined)
+ (#set! injection.include-children))
 
-((minus_metadata) @yaml (#offset! @yaml 1 0 -1 0))
-((plus_metadata) @toml (#offset! @toml 1 0 -1 0))
+((minus_metadata) @injection.content 
+ (#set! injection.language "yaml") 
+ (#offset! @injection.content 1 0 -1 0)
+ (#set! injection.include-children))
+
+((plus_metadata) @injection.content 
+ (#set! injection.language "toml") 
+ (#offset! @injection.content 1 0 -1 0)
+ (#set! injection.include-children))
 
 ([
   (inline)
   (pipe_table_cell)
- ] @markdown_inline (#exclude_children! @markdown_inline))
+ ] @injection.content
+ (#set! injection.language "markdown_inline"))
diff --git a/queries/markdown_inline/injections.scm b/queries/markdown_inline/injections.scm
index 3e46a283b..f7aa19caf 100644
--- a/queries/markdown_inline/injections.scm
+++ b/queries/markdown_inline/injections.scm
@@ -1,2 +1,8 @@
-((html_tag) @html @combined)
-((latex_block) @latex)
+((html_tag) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined)
+ (#set! injection.include-children))
+
+((latex_block) @injection.content
+ (#set! injection.language "latex")
+ (#set! injection.include-children))
diff --git a/queries/matlab/injections.scm b/queries/matlab/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/matlab/injections.scm
+++ b/queries/matlab/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/menhir/injections.scm b/queries/menhir/injections.scm
index 7a31dd50c..f209dd139 100644
--- a/queries/menhir/injections.scm
+++ b/queries/menhir/injections.scm
@@ -1 +1,2 @@
-(ocaml) @ocaml
+((ocaml) @injection.content
+ (#set! injection.language "ocaml"))
diff --git a/queries/meson/injections.scm b/queries/meson/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/meson/injections.scm
+++ b/queries/meson/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index 671f93185..2b5d55ec1 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -1,19 +1,24 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 (apply_expression
   function: (_) @_func
   argument: [
-    (string_expression (string_fragment) @regex)
-    (indented_string_expression (string_fragment) @regex)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "regex")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "regex")))
   ]
-  (#match? @_func "(^|\\.)match$"))
-  @combined
+  (#match? @_func "(^|\\.)match$")
+  (#set! injection.combined))
 
 (binding
   attrpath: (attrpath (identifier) @_path)
   expression: [
-    (string_expression (string_fragment) @bash)
-    (indented_string_expression (string_fragment) @bash)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "bash")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "bash")))
   ]
   (#match? @_path "(^\\w+(Phase|Hook)|(pre|post)[A-Z]\\w+|script)$"))
 
@@ -22,87 +27,105 @@
   argument: (_ (_)* (_ (_)* (binding
     attrpath: (attrpath (identifier) @_path)
     expression: [
-      (string_expression (string_fragment) @bash)
-      (indented_string_expression (string_fragment) @bash)
+      (string_expression 
+        ((string_fragment) @injection.content (#set! injection.language "bash")))
+      (indented_string_expression 
+        ((string_fragment) @injection.content (#set! injection.language "bash")))
     ])))
   (#match? @_func "(^|\\.)writeShellApplication$")
-  (#match? @_path "^text$"))
-  @combined
+  (#match? @_path "^text$")
+  (#set! injection.combined))
 
 (apply_expression
   function: (apply_expression
     function: (apply_expression function: (_) @_func))
   argument: [
-    (string_expression (string_fragment) @bash)
-    (indented_string_expression (string_fragment) @bash)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "bash")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "bash")))
   ]
-  (#match? @_func "(^|\\.)runCommand((No)?CC)?(Local)?$"))
-  @combined
+  (#match? @_func "(^|\\.)runCommand((No)?CC)?(Local)?$")
+  (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression function: (_) @_func)
   argument: [
-    (string_expression (string_fragment) @bash)
-    (indented_string_expression (string_fragment) @bash)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "bash")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "bash")))
   ])
-  (#match? @_func "(^|\\.)write(Bash|Dash|ShellScript)(Bin)?$"))
-  @combined
+  (#match? @_func "(^|\\.)write(Bash|Dash|ShellScript)(Bin)?$")
+  (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression function: (_) @_func)
   argument: [
-    (string_expression (string_fragment) @fish)
-    (indented_string_expression (string_fragment) @fish)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "fish")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "fish")))
   ])
-  (#match? @_func "(^|\\.)writeFish(Bin)?$"))
-  @combined
+  (#match? @_func "(^|\\.)writeFish(Bin)?$")
+  (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
     function: (apply_expression function: (_) @_func))
   argument: [
-    (string_expression (string_fragment) @haskell)
-    (indented_string_expression (string_fragment) @haskell)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "haskell")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "haskell")))
   ])
-  (#match? @_func "(^|\\.)writeHaskell(Bin)?$"))
-  @combined
+  (#match? @_func "(^|\\.)writeHaskell(Bin)?$")
+  (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
     function: (apply_expression function: (_) @_func))
   argument: [
-    (string_expression (string_fragment) @javascript)
-    (indented_string_expression (string_fragment) @javascript)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "javascript")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "javascript")))
   ])
-  (#match? @_func "(^|\\.)writeJS(Bin)?$"))
-  @combined
+  (#match? @_func "(^|\\.)writeJS(Bin)?$")
+  (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
     function: (apply_expression function: (_) @_func))
   argument: [
-    (string_expression (string_fragment) @perl)
-    (indented_string_expression (string_fragment) @perl)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "perl")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "perl")))
   ])
-  (#match? @_func "(^|\\.)writePerl(Bin)?$"))
-  @combined
+  (#match? @_func "(^|\\.)writePerl(Bin)?$")
+  (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
     function: (apply_expression function: (_) @_func))
   argument: [
-    (string_expression (string_fragment) @python)
-    (indented_string_expression (string_fragment) @python)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "python")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "python")))
   ])
-  (#match? @_func "(^|\\.)write(PyPy|Python)[23](Bin)?$"))
-  @combined
+  (#match? @_func "(^|\\.)write(PyPy|Python)[23](Bin)?$")
+  (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
     function: (apply_expression function: (_) @_func))
   argument: [
-    (string_expression (string_fragment) @rust)
-    (indented_string_expression (string_fragment) @rust)
+    (string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "rust")))
+    (indented_string_expression 
+      ((string_fragment) @injection.content (#set! injection.language "rust")))
   ])
-  (#match? @_func "(^|\\.)writeRust(Bin)?$"))
-  @combined
+  (#match? @_func "(^|\\.)writeRust(Bin)?$")
+  (#set! injection.combined))
diff --git a/queries/ocaml/injections.scm b/queries/ocaml/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/ocaml/injections.scm
+++ b/queries/ocaml/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/ocamllex/injections.scm b/queries/ocamllex/injections.scm
index 337d8073e..ed1d9302a 100644
--- a/queries/ocamllex/injections.scm
+++ b/queries/ocamllex/injections.scm
@@ -1,3 +1,5 @@
-(ocaml) @ocaml
+((ocaml) @injection.content
+ (#set! injection.language "ocaml"))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/odin/injections.scm b/queries/odin/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/odin/injections.scm
+++ b/queries/odin/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/pascal/injections.scm b/queries/pascal/injections.scm
index c410fbb41..9832973b6 100644
--- a/queries/pascal/injections.scm
+++ b/queries/pascal/injections.scm
@@ -1,4 +1,7 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
 ; There is no parser for assembly language yet. Add an injection here when we
 ; have a parser.
-; (asmBody) @asm
+; ((asmBody) @injection.content
+;  (#set! injection.language "asm"))
diff --git a/queries/pem/injections.scm b/queries/pem/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/pem/injections.scm
+++ b/queries/pem/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/perl/injections.scm b/queries/perl/injections.scm
index 78162bdba..cab5f53d5 100644
--- a/queries/perl/injections.scm
+++ b/queries/perl/injections.scm
@@ -1 +1,2 @@
-(comments) @comment
+((comments) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index 9e243259d..0022459f7 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -1,20 +1,34 @@
-(text) @html @combined
+((text) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined))
 
-(comment) @phpdoc
+((comment) @injection.content
+ (#set! injection.language "phpdoc"))
 
 ;; regex
 
 ((function_call_expression
   function: (_) @_preg_func_identifier
-  arguments: (arguments . (argument (_ (string_value) @regex))))
+  arguments: 
+    (arguments . 
+      (argument 
+        (_ (string_value) @injection.content))))
+    (#set! injection.language "regex")
     (#lua-match? @_preg_func_identifier "^preg_"))
 
 ;; bash
 
 ((function_call_expression
   function: (_) @_shell_func_identifier
-  arguments: (arguments . (argument (_ (string_value) @bash))))
+  arguments: 
+    (arguments . 
+      (argument 
+        (_ (string_value) @injection.content))))
+  (#set! injection.language "bash")
   (#any-of? @_shell_func_identifier "shell_exec" "escapeshellarg" 
    "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec" "system"))
 
-((expression_statement (shell_command_expression (string_value) @bash)))
+(expression_statement 
+  (shell_command_expression 
+    (string_value) @injection.content)
+    (#set! injection.language "bash"))
diff --git a/queries/pioasm/injections.scm b/queries/pioasm/injections.scm
index a8a0cf49e..854886c65 100644
--- a/queries/pioasm/injections.scm
+++ b/queries/pioasm/injections.scm
@@ -1,10 +1,15 @@
- [ (line_comment) (block_comment) ] @comment
+([ 
+   (line_comment) 
+   (block_comment) 
+ ] @injection.content
+ (#set! injection.language "comment"))
 
 ((code_block
   (code_block_language) @_language
-  (code_block_body) @c)
- (#eq? @_language "c-sdk"))
+  (code_block_body) @injection.content)
+ (#eq? @_language "c-sdk")
+ (#set! injection.language "c"))
 
 (code_block
-  (code_block_language) @language
-  (code_block_body) @content)
+  (code_block_language) @injection.language
+  (code_block_body) @injection.content)
diff --git a/queries/po/injections.scm b/queries/po/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/po/injections.scm
+++ b/queries/po/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/poe_filter/injections.scm b/queries/poe_filter/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/poe_filter/injections.scm
+++ b/queries/poe_filter/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/pony/injections.scm b/queries/pony/injections.scm
index e48ce9af3..43ae7287b 100644
--- a/queries/pony/injections.scm
+++ b/queries/pony/injections.scm
@@ -1,4 +1,5 @@
-[
+([
   (line_comment)
   (block_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/promql/injections.scm b/queries/promql/injections.scm
index ffdf4f8e6..408b1c7b5 100644
--- a/queries/promql/injections.scm
+++ b/queries/promql/injections.scm
@@ -1 +1,3 @@
-((label_value) @regex (#offset! @regex 0 1 0 -1))
+((label_value) @injection.content
+ (#set! injection.language "regex")
+ (#offset! @injection.content 0 1 0 -1))
diff --git a/queries/prql/injections.scm b/queries/prql/injections.scm
index a6d4ccb12..ac266cc2d 100644
--- a/queries/prql/injections.scm
+++ b/queries/prql/injections.scm
@@ -1,13 +1,13 @@
-(
- (s_string) @sql
- (#offset! @sql 0 2 0 -1)
-)
+((s_string) @injection.content
+ (#set! injection.language "sql")
+ (#offset! @injection.content 0 2 0 -1))
 
 (from_text
   (keyword_from_text)
   (keyword_json)
-  (literal) @json
-  (#offset! @json 0 3 0 -3)
-)
+  (literal) @injection.content
+  (#set! injection.language "json")
+  (#offset! @injection.content 0 3 0 -3))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/pug/injections.scm b/queries/pug/injections.scm
index 027744402..a307a4eb2 100644
--- a/queries/pug/injections.scm
+++ b/queries/pug/injections.scm
@@ -1,7 +1,8 @@
-(javascript) @javascript
+((javascript) @injection.content
+ (#set! injection.language "javascript"))
 
-(
-   (attribute_name) @_attribute_name
-   (quoted_attribute_value (attribute_value )  @javascript)
-   (#match? @_attribute_name "^(:|v-bind|v-|\\@)")
-)
+((attribute_name) @_attribute_name
+  (quoted_attribute_value 
+    (attribute_value) @injection.content
+    (#set! injection.language "javascript"))
+  (#match? @_attribute_name "^(:|v-bind|v-|\\@)"))
diff --git a/queries/puppet/injections.scm b/queries/puppet/injections.scm
index a81069600..caa10a2b0 100644
--- a/queries/puppet/injections.scm
+++ b/queries/puppet/injections.scm
@@ -1,4 +1,6 @@
-((regex) @regex
-  (#offset! @regex 0 1 0 -1))
+((regex) @injection.content
+  (#set! injection.language "regex")
+  (#offset! @injection.content 0 1 0 -1))
 
-(comment) @comment
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index 04d0eed1f..effe2ecc7 100644
--- a/queries/python/injections.scm
+++ b/queries/python/injections.scm
@@ -1,8 +1,10 @@
 ((call
   function: (attribute
 	  object: (identifier) @_re)
-  arguments: (argument_list (string) @regex))
+  arguments: (argument_list (string) @injection.content))
  (#eq? @_re "re")
- (#lua-match? @regex "^r.*"))
+ (#lua-match? @injection.content "^r.*")
+ (#set! injection.language "regex"))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/ql/injections.scm b/queries/ql/injections.scm
index 88d49d424..baed9196d 100644
--- a/queries/ql/injections.scm
+++ b/queries/ql/injections.scm
@@ -1,5 +1,6 @@
-[
+([
   (line_comment)
   (block_comment)
   (qldoc)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/qmldir/injections.scm b/queries/qmldir/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/qmldir/injections.scm
+++ b/queries/qmldir/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index c4b877d0b..6bde865d0 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -1,13 +1,16 @@
 ((predicate 
   name: (identifier) @_name
-  parameters: (parameters (string) @regex))
+  parameters: (parameters (string) @injection.content))
  (#match? @_name "^#?(not-)?(match|vim-match)$")
- (#offset! @regex 0 1 0 -1))
+ (#set! injection.language "regex")
+ (#offset! @injection.content 0 1 0 -1))
 
 ((predicate
   name: (identifier) @_name
-  parameters: (parameters (string) @luap))
+  parameters: (parameters (string) @injection.content))
  (#match? @_name "^#?(not-)?lua-match$")
- (#offset! @luap 0 1 0 -1))
+ (#set! injection.language "luap")
+ (#offset! @injection.content 0 1 0 -1))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/r/injections.scm b/queries/r/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/r/injections.scm
+++ b/queries/r/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/racket/injections.scm b/queries/racket/injections.scm
index 496286d3f..b90c418a4 100644
--- a/queries/racket/injections.scm
+++ b/queries/racket/injections.scm
@@ -1,2 +1,5 @@
-[(comment)
- (block_comment)] @comment
+([
+  (comment)
+  (block_comment)
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/rego/injections.scm b/queries/rego/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/rego/injections.scm
+++ b/queries/rego/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/requirements/injections.scm b/queries/requirements/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/requirements/injections.scm
+++ b/queries/requirements/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/rnoweb/injections.scm b/queries/rnoweb/injections.scm
index 2f7ec8a91..6b07ccdc4 100644
--- a/queries/rnoweb/injections.scm
+++ b/queries/rnoweb/injections.scm
@@ -1,7 +1,12 @@
-(latex) @latex @combined
+((latex) @injection.content
+ (#set! injection.language "latex")
+ (#set! injection.combined))
+
 (rchunk
-	(renv_content) @r @combined
-)
+  (renv_content) @injection.content
+  (#set! injection.language "r")
+  (#set! injection.combined))
+
 (rinline
-	(renv_content) @r
-)
+  (renv_content) @injection.content
+  (#set! injection.language "r"))
diff --git a/queries/ron/injections.scm b/queries/ron/injections.scm
index e48ce9af3..c3522f945 100644
--- a/queries/ron/injections.scm
+++ b/queries/ron/injections.scm
@@ -1,4 +1,5 @@
-[
+([
   (line_comment)
   (block_comment)
-] @comment
+] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index 97bd0628a..4fc27225a 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -1,9 +1,11 @@
-(doctest_block) @python
+((doctest_block) @injection.content
+ (#set! injection.language "python"))
 
 ;; Directives with nested content without arguments nor options
 ((directive
    name: (type) @_type
-   body: (body) @rst)
+   body: (body) @injection.content)
+ (#set! injection.language "rst")
  (#any-of?
   @_type
   "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
@@ -15,7 +17,8 @@
 ;; Directives with nested content without arguments, but with options
 ((directive
    name: (type) @_type
-   body: (body (options) (content) @rst))
+   body: (body (options) (content) @injection.content))
+ (#set! injection.language "rst")
  (#any-of?
   @_type
   "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
@@ -24,7 +27,8 @@
 ;; Directives with nested content with arguments and options
 ((directive
    name: (type) @_type
-   body: (body (content) @rst))
+   body: (body (content) @injection.content))
+ (#set! injection.language "rst")
  (#any-of?
   @_type
   "figure"
@@ -35,37 +39,42 @@
 ;; Special directives
 ((directive
    name: (type) @_type
-   body: (body (arguments) @language (content) @content))
+   body: (body (arguments) @injection.language (content) @injection.content))
  (#any-of? @_type "code" "code-block" "sourcecode"))
 
 ((directive
    name: (type) @_type
-   body: (body (arguments) @language (content) @content))
+   body: (body (arguments) @injection.language (content) @injection.content))
  (#eq? @_type "raw"))
 
 ((directive
    name: (type) @_type
-   body: (body (content) @latex))
+   body: (body (content) @injection.content))
+ (#set! injection.language "latex")
  (#eq? @_type "math"))
 
 ; TODO: re-add when a parser for csv is added.
 ; ((directive
 ;    name: (type) @_type
-;    body: (body (content) @csv))
+;    body: (body (content) @injection.content))
+;  (#set! injection.language "csv")
 ;  (#eq? @_type "csv-table"))
 
 ;; Special roles - prefix
 
 ((interpreted_text
   (role) @_role
-  "interpreted_text" @latex)
- (#eq? @_role ":math:"))
+  "interpreted_text" @injection.content)
+ (#eq? @_role ":math:")
+ (#set! injection.language "latex"))
 
 ;; Special roles - suffix
 
 ((interpreted_text
-  "interpreted_text" @latex
+  "interpreted_text" @injection.content
   (role) @_role)
- (#eq? @_role ":math:"))
+ (#eq? @_role ":math:")
+ (#set! injection.language "latex"))
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/ruby/injections.scm b/queries/ruby/injections.scm
index 8e2456b39..6981808c5 100644
--- a/queries/ruby/injections.scm
+++ b/queries/ruby/injections.scm
@@ -1,9 +1,12 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
 
 (heredoc_body
- (heredoc_content) @content
- (heredoc_end) @language
- (#set! "language" @language)
+ (heredoc_content) @injection.content
+ (heredoc_end) @injection.language
+ (#set! "language" @injection.language)
  (#downcase! "language"))
 
-(regex (string_content) @regex)
+(regex 
+  (string_content) @injection.content 
+  (#set! injection.language "regex"))
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index fd19fbec2..5dead8564 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -1,34 +1,39 @@
 (macro_invocation
-  (token_tree) @rust)
+  (token_tree) @injection.content (#set! injection.language "rust"))
 
 (macro_definition
   (macro_rule
-    left: (token_tree_pattern) @rust
-    right: (token_tree) @rust))
+    left: (token_tree_pattern) @injection.content 
+    (#set! injection.language "rust")))
 
-[
+(macro_definition
+  (macro_rule
+    right: (token_tree) @injection.content
+    (#set! injection.language "rust")))
+
+([
   (line_comment)
   (block_comment)
-] @comment
+] @injection.content
+ (#set! injection.language "comment"))
 
-(
-  (macro_invocation
-    macro: ((identifier) @_html_def)
-    (token_tree) @html)
-
-    (#eq? @_html_def "html")
-)
+((macro_invocation
+   macro: ((identifier) @injection.language)
+   (token_tree) @injection.content)
+ (#eq? @injection.language "html"))
 
 (call_expression
   function: (scoped_identifier
     path: (identifier) @_regex (#eq? @_regex "Regex")
     name: (identifier) @_new (#eq? @_new "new"))
   arguments: (arguments
-    (raw_string_literal) @regex))
+    (raw_string_literal) @injection.content)
+    (#set! injection.language "regex"))
 
 (call_expression
   function: (scoped_identifier
     path: (scoped_identifier (identifier) @_regex (#eq? @_regex "Regex").)
     name: (identifier) @_new (#eq? @_new "new"))
   arguments: (arguments
-    (raw_string_literal) @regex))
+    (raw_string_literal) @injection.content)
+    (#set! injection.language "regex"))
diff --git a/queries/scala/injections.scm b/queries/scala/injections.scm
index 521ca7a67..aebb54d93 100644
--- a/queries/scala/injections.scm
+++ b/queries/scala/injections.scm
@@ -1,4 +1,5 @@
-[
-  (comment) 
-  (block_comment)
-] @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((block_comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/scfg/injections.scm b/queries/scfg/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/scfg/injections.scm
+++ b/queries/scfg/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/scheme/injections.scm b/queries/scheme/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/scheme/injections.scm
+++ b/queries/scheme/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/smali/injections.scm b/queries/smali/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/smali/injections.scm
+++ b/queries/smali/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/sparql/injections.scm b/queries/sparql/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/sparql/injections.scm
+++ b/queries/sparql/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/sql/injections.scm b/queries/sql/injections.scm
index 2157ceb1d..b298ff22f 100644
--- a/queries/sql/injections.scm
+++ b/queries/sql/injections.scm
@@ -1,3 +1,6 @@
-(comment) @comment
-(marginalia) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((marginalia) @injection.content
+ (#set! injection.language "comment"))
 
diff --git a/queries/squirrel/injections.scm b/queries/squirrel/injections.scm
index 97cd40350..34a0fce8b 100644
--- a/queries/squirrel/injections.scm
+++ b/queries/squirrel/injections.scm
@@ -1,9 +1,12 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
-((verbatim_string) @html
-  (#lua-match? @html "^@\"<html")
-  (#offset! @html 0 2 0 -1))
+((verbatim_string) @injection.content
+  (#lua-match? @injection.content "^@\"<html")
+  (#set! injection.language "html")
+  (#offset! @injection.content 0 2 0 -1))
 
-((verbatim_string) @html
-  (#lua-match? @html "@\"<!DOCTYPE html>")
-  (#offset! @html 0 2 0 -1))
+((verbatim_string) @injection.content
+  (#lua-match? @injection.content "@\"<!DOCTYPE html>")
+  (#set! injection.languge "html")
+  (#offset! @injection.content 0 2 0 -1))
diff --git a/queries/supercollider/injections.scm b/queries/supercollider/injections.scm
index e48ce9af3..43ae7287b 100644
--- a/queries/supercollider/injections.scm
+++ b/queries/supercollider/injections.scm
@@ -1,4 +1,5 @@
-[
+([
   (line_comment)
   (block_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/surface/injections.scm b/queries/surface/injections.scm
index 928977a34..0ee100999 100644
--- a/queries/surface/injections.scm
+++ b/queries/surface/injections.scm
@@ -1,8 +1,10 @@
 ; Surface expressions and components are Elixir code
-[
+([
   (expression_value)
   (component_name)
-] @elixir
+] @injection.content
+ (#set! injection.language "elixir"))
 
 ; Surface comments are nvim-treesitter comments
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index dec2772f8..679919dc6 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -1,40 +1,41 @@
 ; inherits: html_tags
 
-(
-  (style_element
+((style_element
     (start_tag
       (attribute
         (attribute_name) @_attr
         (quoted_attribute_value (attribute_value) @_lang)))
-    (raw_text) @scss)
+    (raw_text) @injection.content)
   (#eq? @_attr "lang")
   (#any-of? @_lang "scss" "postcss" "less")
-)
+  (#set! injection.language "scss")
+  (#set! injection.include-children))
 
-[
+([
   (raw_text_expr)
   (raw_text_each)
-] @javascript
+] @injection.content
+ (#set! injection.language "javascript")
+ (#set! injection.include-children))
 
-(
-  (script_element
+((script_element
     (start_tag
       (attribute
         (attribute_name) @_attr
         (quoted_attribute_value (attribute_value) @_lang)))
-    (raw_text) @typescript)
-  (#eq? @_attr "lang") 
-  (#any-of? @_lang "ts" "typescript")
-)
+    (raw_text) @injection.content)
+ (#eq? @_attr "lang") 
+ (#any-of? @_lang "ts" "typescript")
+ (#set! injection.language "typescript")
+ (#set! injection.include-children))
 
-(
-  (element
-    (start_tag
-      (attribute
-        (attribute_name) @_attr
-        (quoted_attribute_value
-          (attribute_value) @_lang)))
-    (text) @pug)
-  (#eq? @_attr "lang") 
-  (#eq? @_lang "pug")
-)
+((element
+   (start_tag
+     (attribute
+       (attribute_name) @_attr
+       (quoted_attribute_value
+         (attribute_value) @injection.language)))
+   (text) @injection.content)
+ (#eq? @_attr "lang") 
+ (#eq? @injection.language "pug")
+ (#set! injection.include-children))
diff --git a/queries/sxhkdrc/injections.scm b/queries/sxhkdrc/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/sxhkdrc/injections.scm
+++ b/queries/sxhkdrc/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/systemtap/injections.scm b/queries/systemtap/injections.scm
index 1dd86c9f3..9a1099d6d 100644
--- a/queries/systemtap/injections.scm
+++ b/queries/systemtap/injections.scm
@@ -1,2 +1,5 @@
-(comment) @comment
-(embedded_code) @c
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((embedded_code) @injection.content
+ (#set! injection.language "c"))
diff --git a/queries/t32/injections.scm b/queries/t32/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/t32/injections.scm
+++ b/queries/t32/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/tablegen/injections.scm b/queries/tablegen/injections.scm
index b137e472c..08390aaa1 100644
--- a/queries/tablegen/injections.scm
+++ b/queries/tablegen/injections.scm
@@ -1,7 +1,9 @@
-((code) @cpp
-  (#offset! @cpp 0 2 0 -2))
+((code) @injection.content
+  (#set! injection.language "cpp")
+  (#offset! @injection.content 0 2 0 -2))
 
 ((tablegen_file
-  (comment) @bash)
-  (#lua-match? @bash "^.*RUN")
-  (#offset! @bash 0 8))
+  (comment) @injection.content)
+  (#lua-match? @injection.content "^.*RUN")
+  (#set! injection.language "bash")
+  (#offset! @injection.content 0 8))
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index f37f4d747..5eef08702 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -3,12 +3,13 @@
     (index
       (identifier) @_cdef_identifier)
     (arguments
-      (string) @c)
+      (string) @injection.content)
   )
 
   (#eq? @_cdef_identifier "cdef")
-  (#lua-match? @c "^[\"']")
-  (#offset! @c 0 1 0 -1)
+  (#lua-match? @injection.content "^[\"']")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "c")
 )
 
 (
@@ -16,12 +17,14 @@
     (index
       (identifier) @_cdef_identifier)
     (arguments
-      (string) @c)
+      (string) @injection.content)
   )
 
   (#eq? @_cdef_identifier "cdef")
-  (#lua-match? @c "^%[%[")
-  (#offset! @c 0 2 0 -2)
+  (#lua-match? @injection.content "^%[%[")
+  (#offset! @injection.content 0 2 0 -2)
+  (#set! injection.language "c")
 )
 
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/thrift/injections.scm b/queries/thrift/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/thrift/injections.scm
+++ b/queries/thrift/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/tiger/injections.scm b/queries/tiger/injections.scm
index 21350312a..b0063012c 100644
--- a/queries/tiger/injections.scm
+++ b/queries/tiger/injections.scm
@@ -1,3 +1,4 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tlaplus/injections.scm b/queries/tlaplus/injections.scm
index 4d0833e1b..b88c1facb 100644
--- a/queries/tlaplus/injections.scm
+++ b/queries/tlaplus/injections.scm
@@ -1,4 +1,5 @@
-[
+([
   (comment)
   (block_comment_text)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/toml/injections.scm b/queries/toml/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/toml/injections.scm
+++ b/queries/toml/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/turtle/injections.scm b/queries/turtle/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/turtle/injections.scm
+++ b/queries/turtle/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/twig/injections.scm b/queries/twig/injections.scm
index 97f84c16c..663dc3b6c 100644
--- a/queries/twig/injections.scm
+++ b/queries/twig/injections.scm
@@ -1,2 +1,3 @@
-(content) @html
+((content) @injection.content
+ (#set! injection.language "html"))
 
diff --git a/queries/ungrammar/injections.scm b/queries/ungrammar/injections.scm
index 35c0af746..ac82a3e5f 100644
--- a/queries/ungrammar/injections.scm
+++ b/queries/ungrammar/injections.scm
@@ -1,2 +1,3 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
diff --git a/queries/uxntal/injections.scm b/queries/uxntal/injections.scm
index 4bb7d675d..6adae45a2 100644
--- a/queries/uxntal/injections.scm
+++ b/queries/uxntal/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/v/injections.scm b/queries/v/injections.scm
index b39a5ef44..9fa581377 100644
--- a/queries/v/injections.scm
+++ b/queries/v/injections.scm
@@ -1,13 +1,17 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 ;; asm_statement if asm ever highlighted :)
 
 ;; #include <...>
-(hash_statement) @c
+((hash_statement) @injection.content
+ (#set! injection.language "c"))
 
 ;; regex for the methods defined in `re` module
 ((call_expression
     name: (selector_expression
       field: (reference_expression (identifier) @_re))
     arguments: (argument_list
-  (argument (literal (raw_string_literal) @regex (#offset! @regex 0 2 0 -1)))))
-  (#any-of? @_re "regex_base" "regex_opt" "compile_opt"))
+  (argument (literal (raw_string_literal) @injection.content 
+  (#offset! @injection.content 0 2 0 -1)))))
+  (#any-of? @_re "regex_base" "regex_opt" "compile_opt")
+  (#set! injection.language "regex"))
diff --git a/queries/verilog/injections.scm b/queries/verilog/injections.scm
index 4bb7d675d..321c90add 100644
--- a/queries/verilog/injections.scm
+++ b/queries/verilog/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/vim/injections.scm b/queries/vim/injections.scm
index cddcbe418..553ac5e6a 100644
--- a/queries/vim/injections.scm
+++ b/queries/vim/injections.scm
@@ -1,18 +1,35 @@
-(lua_statement (script (body) @lua))
-(lua_statement (chunk) @lua)
-(ruby_statement (script (body) @ruby))
-(ruby_statement (chunk) @ruby)
-(python_statement (script (body) @python))
-(python_statement (chunk) @python)
+(lua_statement 
+  (script 
+    (body) @injection.content
+    (#set! injection.language "lua")))
+(lua_statement 
+  (chunk) @injection.content
+  (#set! injection.language "lua"))
+(ruby_statement 
+  (script 
+    (body) @injection.content 
+    (#set! injection.language "ruby")))
+(ruby_statement 
+  (chunk) @injection.content 
+  (#set! injection.language "ruby"))
+(python_statement 
+  (script 
+    (body) @injection.content 
+    (#set! injection.language "python")))
+(python_statement 
+  (chunk) @injection.content 
+  (#set! injection.language "python"))
 ;; If we support perl at some point...
 ;; (perl_statement (script (body) @perl))
 ;; (perl_statement (chunk) @perl)
 
-(autocmd_statement (pattern) @regex)
+(autocmd_statement 
+  (pattern) @injection.content 
+  (#set! injection.language "regex"))
 
 ((set_item
    option: (option_name) @_option
-   value: (set_value) @vim)
+   value: (set_value) @injection.content)
   (#any-of? @_option
     "includeexpr" "inex"
     "printexpr" "pexpr"
@@ -22,6 +39,8 @@
     "foldexpr" "fde"
     "diffexpr" "dex"
     "patchexpr" "pex"
-    "charconvert" "ccv"))
+    "charconvert" "ccv")
+  (#set! injection.language "vim"))
 
-(comment) @comment
+((comment) @injection.content 
+ (#set! injection.language "comment"))
diff --git a/queries/vimdoc/injections.scm b/queries/vimdoc/injections.scm
index 09bbe44e8..4ae65e19e 100644
--- a/queries/vimdoc/injections.scm
+++ b/queries/vimdoc/injections.scm
@@ -1,3 +1,4 @@
-(codeblock
-  (language) @language
-  (code) @content)
+((codeblock
+  (language) @injection.language
+  (code) @injection.content)
+  (#set! injection.include-children)) 
diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index ffbc00bfc..215fe1081 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -5,30 +5,36 @@
     (start_tag
       (attribute
         (attribute_name) @_lang
-        (quoted_attribute_value (attribute_value) @_css)))
+        (quoted_attribute_value (attribute_value) @injection.language)))
+    (raw_text) @injection.content)
     (#eq? @_lang "lang")
-    (#eq? @_css "css")
-    (raw_text) @css))
+    (#any-of? @injection.language "css" "scss")
+    (#set! injection.include-children))
 
-; TODO: When nvim-treesitter have postcss and less parser, use @language and @content instead
+; TODO: When nvim-treesitter has postcss and less parsers, use @injection.language and @injection.content instead
 ; <script lang="scss">
 ((style_element
     (start_tag
       (attribute
         (attribute_name) @_lang
         (quoted_attribute_value (attribute_value) @_scss)))
+    (raw_text) @injection.content
     (#eq? @_lang "lang")
-    (#any-of? @_scss "scss" "less" "postcss")
-    (raw_text) @scss))
+    (#any-of? @_scss "less" "postcss")
+    (#set! injection.language "scss")
+    (#set! injection.include-children)))
+
 ; <script lang="js">
 ((script_element
     (start_tag
       (attribute
         (attribute_name) @_lang
         (quoted_attribute_value (attribute_value) @_js)))
+    (raw_text) @injection.content)
     (#eq? @_lang "lang")
     (#eq? @_js "js")
-    (raw_text) @javascript))
+    (#set! injection.language "javascript")
+    (#set! injection.include-children))
 
 ; <script lang="ts">
 ((script_element
@@ -36,9 +42,11 @@
       (attribute
         (attribute_name) @_lang
         (quoted_attribute_value (attribute_value) @_ts)))
+    (raw_text) @injection.content)
     (#eq? @_lang "lang")
     (#eq? @_ts "ts")
-    (raw_text) @typescript))
+    (#set! injection.language "typescript")
+    (#set! injection.include-children))
 
 ; <script lang="tsx">
 ; <script lang="jsx">
@@ -46,21 +54,27 @@
     (start_tag
       (attribute
         (attribute_name) @_attr
-        (quoted_attribute_value (attribute_value) @language)))
+        (quoted_attribute_value (attribute_value) @injection.language)))
     (#eq? @_attr "lang")
-    (#any-of? @language "tsx" "jsx")
-    (raw_text) @content))
+    (#any-of? @injection.language "tsx" "jsx")
+    (raw_text) @injection.content)
+    (#set! injection.include-children))
 
 ((interpolation
-  (raw_text) @javascript))
+  (raw_text) @injection.content)
+  (#set! injection.language "javascript")
+  (#set! injection.include-children))
 
-((directive_attribute
-    (quoted_attribute_value
-      (attribute_value) @javascript)))
+(directive_attribute
+  (quoted_attribute_value
+    (attribute_value) @injection.content
+    (#set! injection.language "javascript")
+    (#set! injection.include-children)))
 
-((template_element
+(template_element
     (start_tag
       (attribute
-        (quoted_attribute_value (attribute_value) @_lang)))
-    (#eq? @_lang "pug")
-    (text) @pug))
+        (quoted_attribute_value (attribute_value) @injection.language)))
+    (text) @injection.content
+    (#eq? @injection.language "pug")
+    (#set! injection.include-children))
diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index ba6d0aa06..fd4685bb7 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -1,22 +1,30 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 ;; Github actions ("run") / Gitlab CI ("scripts")
 (block_mapping_pair
   key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script")
   value: (flow_node
-           (plain_scalar) @bash))
+           (plain_scalar
+             (string_scalar) @injection.content)
+           (#set! injection.language "bash")))
 
 (block_mapping_pair
   key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script")
   value: (block_node
-           (block_scalar) @bash (#offset! @bash 0 1 0 0)))
+           (block_scalar) @injection.content
+           (#set! injection.language "bash")
+           (#offset! @injection.content 0 1 0 0)))
 
 (block_mapping_pair
   key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script")
   value: (block_node
            (block_sequence
              (block_sequence_item
-               (flow_node) @bash))))
+                (flow_node
+                  (plain_scalar
+                    (string_scalar) @injection.content))
+                (#set! injection.language "bash")))))
 
 (block_mapping_pair
   key: (flow_node) @_run (#any-of? @_run "script" "before_script" "after_script")
@@ -24,25 +32,34 @@
            (block_sequence
              (block_sequence_item
                (block_node
-                  (block_scalar) @bash (#offset! @bash 0 1 0 0))))))
+                  (block_scalar) @injection.content
+                  (#set! injection.language "bash")
+                  (#offset! @injection.content 0 1 0 0))))))
 
 ;; Prometheus Alertmanager ("expr")
 (block_mapping_pair
   key: (flow_node) @_expr (#eq? @_expr "expr")
   value: (flow_node
-           (plain_scalar) @promql))
+           (plain_scalar
+             (string_scalar) @injection.content)
+           (#set! injection.language "promql")))
 
 (block_mapping_pair
   key: (flow_node) @_expr (#eq? @_expr "expr")
   value: (block_node
-           (block_scalar) @promql (#offset! @promql 0 2 0 0)))
+           (block_scalar) @injection.content
+           (#set! injection.language "promql")
+           (#offset! @injection.content 0 2 0 0)))
 
 (block_mapping_pair
   key: (flow_node) @_expr (#eq? @_expr "expr")
   value: (block_node
            (block_sequence
              (block_sequence_item
-               (flow_node) @promql))))
+               (flow_node
+                 (plain_scalar
+                   (string_scalar) @injection.content))
+               (#set! injection.language "promql")))))
 
 (block_mapping_pair
   key: (flow_node) @_expr (#eq? @_expr "expr")
@@ -50,4 +67,6 @@
            (block_sequence
              (block_sequence_item
                (block_node
-                  (block_scalar) @promql (#offset! @promql 0 2 0 0))))))
+                  (block_scalar) @injection.content
+                  (#set! injection.language "promql")
+                  (#offset! @injection.content 0 2 0 0))))))
diff --git a/queries/yang/injections.scm b/queries/yang/injections.scm
index a1d9482b7..44b0e44e9 100644
--- a/queries/yang/injections.scm
+++ b/queries/yang/injections.scm
@@ -1,6 +1,8 @@
-(comment) @comment
+((comment) @injection.content
+ (#set! injection.language "comment"))
 
 ((statement
   (statement_keyword "pattern")
-  (argument (string) @regex))
- (#offset! @regex 0 1 0 -1))
+  (argument (string) @injection.content))
+ (#set! injection.language "regex")
+ (#offset! @injection.content 0 1 0 -1))
diff --git a/queries/zig/injections.scm b/queries/zig/injections.scm
index e3ff406d3..31e15a328 100644
--- a/queries/zig/injections.scm
+++ b/queries/zig/injections.scm
@@ -1,5 +1,7 @@
-[
+([
   (container_doc_comment)
   (doc_comment)
   (line_comment)
-] @comment
+ ] @injection.content
+ (#set! injection.language "comment"))
+  

From 246f4cc20cbbae7d110863149e070b6b57dabbfe Mon Sep 17 00:00:00 2001
From: CalebW <cdwhite3@pm.me>
Date: Tue, 30 May 2023 07:34:15 -0500
Subject: [PATCH 0596/2704] Add PHP heredoc and nowdoc injections (#4866)

---
 queries/php/injections.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index 0022459f7..e5782b7f8 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -1,9 +1,19 @@
 ((text) @injection.content
- (#set! injection.language "html")
- (#set! injection.combined))
+  (#set! injection.language "html")
+  (#set! injection.combined))
 
 ((comment) @injection.content
- (#set! injection.language "phpdoc"))
+  (#set! injection.language "phpdoc"))
+
+(heredoc
+  (heredoc_body) @injection.content
+  (heredoc_end) @injection.language
+  (#downcase! @injection.language))
+
+(nowdoc
+  (nowdoc_body) @injection.content
+  (heredoc_end) @injection.language
+  (#downcase! @injection.language))
 
 ;; regex
 

From efe06e3057043ce4771f32f62aa1b8d2f536b9c4 Mon Sep 17 00:00:00 2001
From: lnay <luke@grahamnaylor.net>
Date: Fri, 2 Jun 2023 11:37:24 +0100
Subject: [PATCH 0597/2704] Add extra language injections for latex (#4896)

Add python injections to contents of `sagetex` defined environments, similarly to how `pycode` currently treated.
---
 queries/latex/injections.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/queries/latex/injections.scm b/queries/latex/injections.scm
index 85417104a..a35fcb150 100644
--- a/queries/latex/injections.scm
+++ b/queries/latex/injections.scm
@@ -10,6 +10,16 @@
   (source_code) @injection.content 
   (#set! injection.language "python"))
 
+(sagesilent_environment
+  code: 
+  (source_code) @injection.content 
+  (#set! injection.language "python"))
+
+(sageblock_environment
+  code: 
+  (source_code) @injection.content 
+  (#set! injection.language "python"))
+
 (minted_environment
   (begin
     language: (curly_group_text

From 39f07cd375dc67a216cfaf4837b394d8107706ab Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 3 Jun 2023 18:21:17 +0900
Subject: [PATCH 0598/2704] injections(query): add gsub pattern (#4897)

---
 queries/query/injections.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index 6bde865d0..8761ec494 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -12,5 +12,12 @@
  (#set! injection.language "luap")
  (#offset! @injection.content 0 1 0 -1))
 
+((predicate
+   name: (identifier) @_name
+   parameters: (parameters (string) @injection.content . (string) .))
+ (#any-of? @_name "gsub" "not-gsub")
+ (#set! injection.language "luap")
+ (#offset! @injection.content 0 1 0 -1))
+
 ((comment) @injection.content
  (#set! injection.language "comment"))

From d8e625df2d8718ecdd6395832e992de1ba1b4973 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 11 Aug 2023 14:33:30 +0300
Subject: [PATCH 0599/2704] fix(php): heredocs injections & highlights

---
 queries/php/highlights.scm |  8 ++++++++
 queries/php/injections.scm | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index 6b84b9405..6f061bb34 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -138,6 +138,13 @@
  ] @string
 (escape_sequence) @string.escape
 
+[
+ (heredoc_start)
+ (heredoc_end)
+] @label
+
+(nowdoc "'" @label)
+
 (boolean) @boolean
 (null) @constant.builtin
 (integer) @number
@@ -271,6 +278,7 @@
   "&"
   "<<"
   ">>"
+  "<<<"
 
   "->"
   "?->"
diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index e5782b7f8..78ae25ea4 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -15,6 +15,18 @@
   (heredoc_end) @injection.language
   (#downcase! @injection.language))
 
+((heredoc
+  (heredoc_body) @injection.content
+  (heredoc_end) @injection.language
+ (#set! injection.include-children)
+ (#downcase! @injection.language)))
+
+((nowdoc
+  (nowdoc_body) @injection.content
+  (heredoc_end) @injection.language
+ (#set! injection.include-children)
+ (#downcase! @injection.language)))
+
 ;; regex
 
 ((function_call_expression

From 71532e7776578fc56355bfdac874afd1e908001e Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 11 Aug 2023 15:24:48 +0300
Subject: [PATCH 0600/2704] feat(bash): add heredoc injection

---
 queries/awk/injections.scm  | 11 +++++++++--
 queries/bash/injections.scm |  8 +++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/queries/awk/injections.scm b/queries/awk/injections.scm
index e5e2b4d02..e93de626c 100644
--- a/queries/awk/injections.scm
+++ b/queries/awk/injections.scm
@@ -1,5 +1,12 @@
-((comment) @injection.content 
+((comment) @injection.content
  (#set! injection.language "comment"))
 
-((regex) @injection.content 
+((regex) @injection.content
  (#set! injection.language "regex"))
+
+((redirected_statement
+   (heredoc_redirect
+     (heredoc_start) @injection.language))
+ (heredoc_body) @injection.content
+ (#offset! @injection.content 0 0 -1 0)
+ (#downcase! @injection.language))
diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index e5e2b4d02..a6f330f3d 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -2,4 +2,10 @@
  (#set! injection.language "comment"))
 
 ((regex) @injection.content 
- (#set! injection.language "regex"))
+
+((redirected_statement
+   (heredoc_redirect
+     (heredoc_start) @injection.language))
+ (heredoc_body) @injection.content
+ (#offset! @injection.content 0 0 -1 0)
+ (#downcase! @injection.language))(#set! injection.language "regex"))

From b223402ba9a69a5993e25e3e7effac5621fbb0e1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 11 Aug 2023 12:48:36 +0200
Subject: [PATCH 0601/2704] fix(directive): make downcase work on captures

---
 lua/nvim-treesitter/query_predicates.lua | 32 ++++++++----------------
 queries/awk/injections.scm               |  7 ------
 queries/ruby/injections.scm              |  3 +--
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 7f2b73c54..d4726107c 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -178,37 +178,25 @@ end, true)
 -- Just avoid some annoying warnings for this directive
 query.add_directive("make-range!", function() end, true)
 
+--- transform node text to lower case (e.g., to make @injection.language case insensitive)
+---
 ---@param match (TSNode|nil)[]
 ---@param _ string
 ---@param bufnr integer
 ---@param pred string[]
----@param metadata table
 ---@return boolean|nil
 query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
-  local text, key, value ---@type string|string[], string, string|integer
-
-  if #pred == 3 then
-    -- (#downcase! @capture "key")
-    key = pred[3]
-    value = metadata[pred[2]][key]
-  else
-    -- (#downcase! "key")
-    key = pred[2]
-    value = metadata[key]
+  local id = pred[2]
+  local node = match[id]
+  if not node then
+    return
   end
 
-  if type(value) == "string" then
-    text = value
-  else
-    local node = match[value]
-    text = vim.treesitter.get_node_text(node, bufnr) or ""
-  end
-
-  if #pred == 3 then
-    metadata[pred[2]][key] = string.lower(text)
-  else
-    metadata[key] = string.lower(text)
+  local text = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] }) or ""
+  if not metadata[id] then
+    metadata[id] = {}
   end
+  metadata[id].text = string.lower(text)
 end, true)
 
 -- Trim blank lines from end of the region
diff --git a/queries/awk/injections.scm b/queries/awk/injections.scm
index e93de626c..bc35c8312 100644
--- a/queries/awk/injections.scm
+++ b/queries/awk/injections.scm
@@ -3,10 +3,3 @@
 
 ((regex) @injection.content
  (#set! injection.language "regex"))
-
-((redirected_statement
-   (heredoc_redirect
-     (heredoc_start) @injection.language))
- (heredoc_body) @injection.content
- (#offset! @injection.content 0 0 -1 0)
- (#downcase! @injection.language))
diff --git a/queries/ruby/injections.scm b/queries/ruby/injections.scm
index 6981808c5..381d96b2f 100644
--- a/queries/ruby/injections.scm
+++ b/queries/ruby/injections.scm
@@ -4,8 +4,7 @@
 (heredoc_body
  (heredoc_content) @injection.content
  (heredoc_end) @injection.language
- (#set! "language" @injection.language)
- (#downcase! "language"))
+ (#downcase! @injection.language))
 
 (regex 
   (string_content) @injection.content 

From 800b2f388b0f880be8a2fcd29494f7459af30a21 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 12 Aug 2023 17:45:44 +0200
Subject: [PATCH 0602/2704] fixup: php injections

---
 queries/php/injections.scm | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index 78ae25ea4..0e78d45e5 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -5,16 +5,6 @@
 ((comment) @injection.content
   (#set! injection.language "phpdoc"))
 
-(heredoc
-  (heredoc_body) @injection.content
-  (heredoc_end) @injection.language
-  (#downcase! @injection.language))
-
-(nowdoc
-  (nowdoc_body) @injection.content
-  (heredoc_end) @injection.language
-  (#downcase! @injection.language))
-
 ((heredoc
   (heredoc_body) @injection.content
   (heredoc_end) @injection.language

From 5b3dd8cff1064db583ddd3edd314e94a02ea1bef Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 4 Aug 2023 14:50:28 +0300
Subject: [PATCH 0603/2704] feat: add xml & dtd parsers

---
 README.md                       |   2 +
 lockfile.json                   |   6 ++
 lua/nvim-treesitter/parsers.lua |  21 ++++++
 queries/dtd/folds.scm           |   4 ++
 queries/dtd/highlights.scm      | 121 ++++++++++++++++++++++++++++++++
 queries/dtd/injections.scm      |   1 +
 queries/http/injections.scm     |   4 +-
 queries/hurl/injections.scm     |   2 +-
 queries/xml/folds.scm           |   5 ++
 queries/xml/highlights.scm      |  53 ++++++++++++++
 queries/xml/indents.scm         |  16 +++++
 queries/xml/injections.scm      |  29 ++++++++
 12 files changed, 261 insertions(+), 3 deletions(-)
 create mode 100644 queries/dtd/folds.scm
 create mode 100644 queries/dtd/highlights.scm
 create mode 100644 queries/dtd/injections.scm
 create mode 100644 queries/xml/folds.scm
 create mode 100644 queries/xml/highlights.scm
 create mode 100644 queries/xml/indents.scm
 create mode 100644 queries/xml/injections.scm

diff --git a/README.md b/README.md
index bfb9ac117..5a7cae35a 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [diff](https://github.com/the-mikedavis/tree-sitter-diff) (maintained by @gbprod)
 - [x] [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) (maintained by @camdencheek)
 - [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
+- [x] [dtd](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
 - [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)
 - [x] [elixir](https://github.com/elixir-lang/tree-sitter-elixir) (maintained by @connorlay)
@@ -371,6 +372,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
 - [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka)
+- [x] [xml](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 4501e7956..3a15ebf32 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -101,6 +101,9 @@
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
+  "dtd": {
+    "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
+  },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
@@ -593,6 +596,9 @@
   "wing": {
     "revision": "9399564d1e32864c6af2d49c0dcd1f76d54443f2"
   },
+  "xml": {
+    "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
+  },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 53ccce0df..08817b5df 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -42,6 +42,9 @@ for ft, lang in pairs {
   quarto = "markdown",
   dosini = "ini",
   confini = "ini",
+  svg = "xml",
+  xsd = "xml",
+  xslt = "xml",
 } do
   register_lang(lang, ft)
 end
@@ -356,6 +359,15 @@ list.dot = {
   maintainers = { "@rydesun" },
 }
 
+list.dtd = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-xml",
+    files = { "src/parser.c", "src/scanner.c" },
+    location = "tree-sitter-dtd",
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.ebnf = {
   install_info = {
     url = "https://github.com/RubixDev/ebnf",
@@ -1745,6 +1757,15 @@ list.wing = {
   experimental = true,
 }
 
+list.xml = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-xml",
+    files = { "src/parser.c", "src/scanner.c" },
+    location = "tree-sitter-xml",
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.yaml = {
   install_info = {
     url = "https://github.com/ikatyang/tree-sitter-yaml",
diff --git a/queries/dtd/folds.scm b/queries/dtd/folds.scm
new file mode 100644
index 000000000..ba7ea121b
--- /dev/null
+++ b/queries/dtd/folds.scm
@@ -0,0 +1,4 @@
+[
+   (conditionalSect)
+   (Comment)
+] @fold
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
new file mode 100644
index 000000000..ba34f0bfe
--- /dev/null
+++ b/queries/dtd/highlights.scm
@@ -0,0 +1,121 @@
+;; XML declaration
+
+(XMLDecl "xml" @preproc)
+
+(XMLDecl [ "version" "encoding" ] @tag.attribute)
+
+(XMLDecl (EncName) @string.special)
+
+(XMLDecl (VersionNum) @number)
+
+;; Processing instructions
+
+(PI) @preproc
+
+;; Element declaration
+
+(elementdecl
+  "ELEMENT" @define
+  (Name) @tag)
+
+(contentspec
+  (_ (Name) @tag.attribute))
+
+"#PCDATA" @type.builtin
+
+[ "EMPTY" "ANY" ] @type.qualifier
+
+[ "*" "?" "+" ] @character.special
+
+;; Entity declaration
+
+(GEDecl
+  "ENTITY" @define
+  (Name) @constant)
+
+(GEDecl (EntityValue) @string)
+
+(NDataDecl
+  "NDATA" @keyword
+  (Name) @label)
+
+;; Parsed entity declaration
+
+(PEDecl
+  "ENTITY" @define
+  "%" @operator
+  (Name) @function.macro)
+
+(PEDecl (EntityValue) @string)
+
+;; Notation declaration
+
+(NotationDecl
+  "NOTATION" @preproc
+  (Name) @label)
+
+((NotationDecl
+  (ExternalID
+    (SystemLiteral (URI) @string.special))
+ (#set! "priority" 105)))
+
+;; Attlist declaration
+
+(AttlistDecl
+  "ATTLIST" @define
+  (Name) @tag)
+
+(AttDef (Name) @tag.attribute)
+
+(AttDef (Enumeration (Nmtoken) @string))
+
+[
+  (StringType)
+  (TokenizedType)
+] @type.builtin
+
+(NotationType "NOTATION" @type.builtin)
+
+[
+  "#REQUIRED"
+  "#IMPLIED"
+  "#FIXED"
+] @attribute
+
+;; Entities
+
+(EntityRef) @constant
+
+((EntityRef) @constant.builtin
+ (#any-of? @constant.builtin
+   "&amp;" "&lt;" "&gt;" "&quot;" "&apos;"))
+
+(CharRef) @character
+
+(PEReference) @function.macro
+
+;; External references
+
+[ "PUBLIC" "SYSTEM" ] @keyword
+
+(PubidLiteral) @string.special
+
+(SystemLiteral (URI) @text.uri)
+
+;; Delimiters & punctuation
+
+[ "<?" "?>" "<!" ">" "]]>" ] @tag.delimiter
+
+[ "(" ")" "[" ] @punctuation.bracket
+
+[ "\"" "'" ] @punctuation.delimiter
+
+[ "," "|" "=" ] @operator
+
+;; Misc
+
+[ "INCLUDE" "IGNORE" ] @include
+
+(Comment) @comment @spell
+
+(ERROR) @error
diff --git a/queries/dtd/injections.scm b/queries/dtd/injections.scm
new file mode 100644
index 000000000..ed5557a05
--- /dev/null
+++ b/queries/dtd/injections.scm
@@ -0,0 +1 @@
+(Comment) @comment
diff --git a/queries/http/injections.scm b/queries/http/injections.scm
index 7f06e336d..cc17373dc 100644
--- a/queries/http/injections.scm
+++ b/queries/http/injections.scm
@@ -4,8 +4,8 @@
 ((json_body) @injection.content
  (#set! injection.language "json"))
 
-; ((xml_body) @injection.content
-;  (#set! injection.language "xml"))
+((xml_body) @injection.content
+ (#set! injection.language "xml"))
 
 ; ((graphql_body) @injection.content 
 ;  (#set! injection.language "graphql")) ; Not used as of now..
diff --git a/queries/hurl/injections.scm b/queries/hurl/injections.scm
index 3d961258f..363e90046 100644
--- a/queries/hurl/injections.scm
+++ b/queries/hurl/injections.scm
@@ -3,7 +3,7 @@
  (#set! injection.language "json"))
 
 ((xml) @injection.content
- (#set! injection.language "html"))
+ (#set! injection.language "xml"))
 
 (multiline_string
   (multiline_string_type) @_lang
diff --git a/queries/xml/folds.scm b/queries/xml/folds.scm
new file mode 100644
index 000000000..494e8c00a
--- /dev/null
+++ b/queries/xml/folds.scm
@@ -0,0 +1,5 @@
+[
+  (element)
+  (doctypedecl)
+  (Comment)
+] @fold
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
new file mode 100644
index 000000000..e47636ac4
--- /dev/null
+++ b/queries/xml/highlights.scm
@@ -0,0 +1,53 @@
+; inherits: dtd
+
+;; XML declaration
+
+(XMLDecl "standalone" @tag.attribute)
+
+(XMLDecl [ "yes" "no" ] @boolean)
+
+;; Processing instructions
+
+(XmlModelPI "xml-model" @preproc)
+
+(StyleSheetPI "xml-stylesheet" @preproc)
+
+(PseudoAtt (Name) @tag.attribute)
+
+(PseudoAtt (PseudoAttValue) @string)
+
+;; Doctype declaration
+
+(doctypedecl "DOCTYPE" @define)
+
+(doctypedecl (Name) @type.definition)
+
+;; Tags
+
+(STag (Name) @tag)
+
+(ETag (Name) @tag)
+
+(EmptyElemTag (Name) @tag)
+
+;; Attributes
+
+(Attribute (Name) @tag.attribute)
+
+(Attribute (AttValue) @string)
+
+;; Text
+
+(CharData) @text @spell
+
+((CDSect
+  (CDStart) @text.environment
+  (CData) @text.literal
+  "]]>" @text.environment)
+ (#set! "priority" 105))
+
+;; Delimiters & punctuation
+
+[ "<" "</" "/>" ] @tag.delimiter
+
+"]" @punctuation.bracket
diff --git a/queries/xml/indents.scm b/queries/xml/indents.scm
new file mode 100644
index 000000000..24cd75cfa
--- /dev/null
+++ b/queries/xml/indents.scm
@@ -0,0 +1,16 @@
+(element) @indent.begin
+
+[
+  (Attribute)
+  (AttlistDecl)
+  (contentspec)
+] @indent.align
+
+(ETag) @indent.dedent
+
+(doctypedecl) @indent.ignore
+
+[
+  (Comment)
+  (ERROR)
+] @indent.auto
diff --git a/queries/xml/injections.scm b/queries/xml/injections.scm
new file mode 100644
index 000000000..99b3a9cc8
--- /dev/null
+++ b/queries/xml/injections.scm
@@ -0,0 +1,29 @@
+((Comment) @injection.content 
+ (#set! injection.language "comment"))
+
+; SVG style
+((element
+   (STag (Name) @_name)
+   (content) @injection.content)
+ (#eq? @_name "style")
+ (#set! injection.combined)
+ (#set! injection.include-children)
+ (#set! injection.language "css"))
+
+; SVG script
+((element
+   (STag (Name) @_name)
+   (content) @injection.content)
+ (#eq? @_name "script")
+ (#set! injection.combined)
+ (#set! injection.include-children)
+ (#set! injection.language "javascript"))
+
+; phpMyAdmin dump
+((element
+   (STag (Name) @_name)
+   (content) @injection.content)
+ (#eq? @_name "pma:table")
+ (#set! injection.combined)
+ (#set! injection.include-children)
+ (#set! injection.language "sql"))

From 4e35ae6f71f5b734ffd876cf8661630cea3a26ae Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Thu, 10 Aug 2023 11:35:27 +0300
Subject: [PATCH 0604/2704] feat: add pymanifest parser

---
 README.md                         |  1 +
 lockfile.json                     |  3 +++
 lua/nvim-treesitter/parsers.lua   |  9 +++++++++
 queries/pymanifest/highlights.scm | 22 ++++++++++++++++++++++
 queries/pymanifest/injections.scm |  2 ++
 5 files changed, 37 insertions(+)
 create mode 100644 queries/pymanifest/highlights.scm
 create mode 100644 queries/pymanifest/injections.scm

diff --git a/README.md b/README.md
index 5a7cae35a..88ee4d3f1 100644
--- a/README.md
+++ b/README.md
@@ -311,6 +311,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
 - [x] [puppet](https://github.com/amaanq/tree-sitter-puppet) (maintained by @amaanq)
+- [x] [PyPA manifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) (maintained by @ObserverOfTime)
 - [x] [python](https://github.com/tree-sitter/tree-sitter-python) (maintained by @stsewd, @theHamsta)
 - [x] [ql](https://github.com/tree-sitter/tree-sitter-ql) (maintained by @pwntester)
 - [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 3a15ebf32..941ac0f1a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -413,6 +413,9 @@
   "puppet": {
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
+  "pymanifest": {
+    "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
+  },
   "python": {
     "revision": "5af00f64af6bbf822f208243cce5cf75396fb6f5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 08817b5df..6bb88ac06 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1241,6 +1241,15 @@ list.puppet = {
   maintainers = { "@amaanq" },
 }
 
+list.pymanifest = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-pymanifest",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+  readme_name = "PyPA manifest",
+}
+
 list.python = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-python",
diff --git a/queries/pymanifest/highlights.scm b/queries/pymanifest/highlights.scm
new file mode 100644
index 000000000..f2522443e
--- /dev/null
+++ b/queries/pymanifest/highlights.scm
@@ -0,0 +1,22 @@
+(keyword) @keyword
+
+(dir_sep) @punctuation.delimiter
+
+(glob) @punctuation.special
+
+(linebreak) @character.special
+
+(char_sequence) @string.special
+
+(char_sequence
+  [ "[" "]" ] @punctuation.bracket)
+
+(char_sequence "!" @operator)
+
+(char_range "-" @operator)
+
+(escaped_char) @string.escape
+
+(ERROR) @error
+
+(comment) @comment
diff --git a/queries/pymanifest/injections.scm b/queries/pymanifest/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/pymanifest/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 64a7e20be2d220077b2a3ed4dd184b37f7a5e660 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 13 Aug 2023 06:35:47 +0000
Subject: [PATCH 0605/2704] Update parsers: bash, c, cuda, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 941ac0f1a..4358fc56f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "1b0321ee85701d5036c334a6f04761cdc672e64c"
+    "revision": "8077be4c5504f2618f1280295bc4ae20a75988c1"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "93ef1785bbf854cf964e6e53d6e1e6885a4d8ebc"
+    "revision": "54fa1febf4f3b1baaba1066a615e569f58c8e765"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -75,7 +75,7 @@
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "d4285d0396a409c91bcd5a7fd362cf13cc6f8600"
+    "revision": "c5fa8c999c9b599c7014467e59920dd00cc5a64c"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -597,7 +597,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "9399564d1e32864c6af2d49c0dcd1f76d54443f2"
+    "revision": "a930aa4e36da798162fb088884d2c154f04c641c"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From baed6439e22aa4d1302a0c2acb1eb4a5824b1d23 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Sun, 30 Jul 2023 21:07:18 +0200
Subject: [PATCH 0606/2704] ci: fix luarocks tag release process

bumped version of the action

Co-authored-by: Marc Jakobi <mrcjkb89@outlook.com>
---
 .github/workflows/release.yml                 | 17 +++++--
 contrib/nvim-treesitter-luarocks.template     | 45 +++++++++++++++++++
 .../nvim-treesitter-scm-1.rockspec            |  0
 3 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 contrib/nvim-treesitter-luarocks.template
 rename nvim-treesitter-scm-1.rockspec => contrib/nvim-treesitter-scm-1.rockspec (100%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03b4d4e35..99e9c6e27 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,17 +1,26 @@
 name: "release"
 on:
   push:
-    tags:
-      - '*'
+    tags: # Will upload to luarocks.org
+      - "*"
+  pull_request: # Will test a local install without uploading to luarocks.org
+   paths:
+    - 'contrib/*.rockspec'
+    - .github/workflows/release.yml
+  
 jobs:
   luarocks-upload:
     runs-on: ubuntu-latest
     steps:
-      - uses: nvim-neorocks/luarocks-tag-release@v2.2.0
+      - uses: actions/checkout@v3
+      - uses: nvim-neorocks/luarocks-tag-release@v5
         env:
           LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }}
         with:
+          name: nvim-treesitter
+          version: 0.1
+          license: apache 2
           detailed_description: |
             The goal of nvim-treesitter is both to provide a simple and easy way to use the interface for tree-sitter in Neovim
             and to provide some basic functionality such as highlighting based on it.
-          build_type: "make"
+          template: contrib/nvim-treesitter-luarocks.template
diff --git a/contrib/nvim-treesitter-luarocks.template b/contrib/nvim-treesitter-luarocks.template
new file mode 100644
index 000000000..3bb15d3b2
--- /dev/null
+++ b/contrib/nvim-treesitter-luarocks.template
@@ -0,0 +1,45 @@
+local git_ref = '$git_ref'
+local modrev = '$modrev'
+local specrev = '-1'
+
+local repo_url = '$repo_url'
+
+rockspec_format = '3.0'
+package = '$package'
+version = modrev .. specrev
+
+description = {
+  summary = 'Nvim Treesitter configurations and abstraction layer',
+  detailed = $detailed_description,
+  labels = { 'neovim' },
+  homepage = 'https://github.com/nvim-treesitter/nvim-treesitter',
+  license = 'Apache-2.0',
+}
+
+dependencies = {
+  'lua >= 5.1',
+}
+
+-- source = file:///.
+
+source = {
+  url = repo_url .. '/archive/' .. git_ref .. '.zip',
+  dir = '$repo_name-' .. '$archive_dir_suffix',
+}
+
+build = {
+  type = 'make',
+  build_pass = false,
+  install_variables = {
+    INST_PREFIX='$(PREFIX)',
+    INST_BINDIR='$(BINDIR)',
+    INST_LIBDIR='$(LIBDIR)',
+    INST_LUADIR='$(LUADIR)',
+    INST_CONFDIR='$(CONFDIR)',
+  },
+  copy_directories = {
+    'autoload',
+    'plugin',
+    'queries'
+  }
+}
diff --git a/nvim-treesitter-scm-1.rockspec b/contrib/nvim-treesitter-scm-1.rockspec
similarity index 100%
rename from nvim-treesitter-scm-1.rockspec
rename to contrib/nvim-treesitter-scm-1.rockspec

From bc52938ddde0ff6b3d51ff215d2c66f2e39b7099 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <886074+teto@users.noreply.github.com>
Date: Sun, 13 Aug 2023 14:32:40 +0200
Subject: [PATCH 0607/2704] ci: dont hardcode the rockspec version

---
 .github/workflows/release.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 99e9c6e27..3c36b33db 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,8 +18,6 @@ jobs:
           LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }}
         with:
           name: nvim-treesitter
-          version: 0.1
-          license: apache 2
           detailed_description: |
             The goal of nvim-treesitter is both to provide a simple and easy way to use the interface for tree-sitter in Neovim
             and to provide some basic functionality such as highlighting based on it.

From 8fbc841df87210586d0b29b6dddea97adfb2889f Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 13 Aug 2023 17:24:05 -0400
Subject: [PATCH 0608/2704] chore: update c & cpp

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4358fc56f..7aa23065b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
   "c": {
-    "revision": "54fa1febf4f3b1baaba1066a615e569f58c8e765"
+    "revision": "a2b7bac3b313efbaa683d9a276ff63cdc544d960"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -69,7 +69,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "77cecd88d28032bf4f54fd4ee68efb53a6c8c9a5"
+    "revision": "ab1065fa23a43a447bd7e619a3af90253867af24"
   },
   "css": {
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"

From e0f47829780791975b334bd1b5a971d087bc829d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 12 Aug 2023 21:16:08 -0400
Subject: [PATCH 0609/2704] feat(c): mention how to highlight K&R functions

---
 queries/c/highlights.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 29fb5747c..4acdaed99 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -244,6 +244,29 @@
 (parameter_declaration
   declarator: (pointer_declarator) @parameter)
 
+; K&R functions
+; To enable support for K&R functions,
+; add the following lines to your own query config and uncomment them.
+; They are commented out as they'll conflict with C++
+; Note that you'll need to have `; extends` at the top of your query file.
+;
+; (parameter_list (identifier) @parameter)
+;
+; (function_definition
+;   declarator: _
+;   (declaration
+;     declarator: (identifier) @parameter))
+;
+; (function_definition
+;   declarator: _
+;   (declaration
+;     declarator: (array_declarator) @parameter))
+;
+; (function_definition
+;   declarator: _
+;   (declaration
+;     declarator: (pointer_declarator) @parameter))
+
 (preproc_params (identifier) @parameter)
 
 [

From b5f203031282a6e9e025080fe71b58dbb43f7509 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 13 Aug 2023 17:29:39 -0400
Subject: [PATCH 0610/2704] chore(c-family): inject all preproc args again

---
 queries/arduino/injections.scm | 12 +-----------
 queries/c/injections.scm       | 12 +-----------
 queries/cpp/injections.scm     | 12 +-----------
 queries/cuda/injections.scm    | 12 +-----------
 queries/glsl/injections.scm    | 12 +-----------
 queries/hlsl/injections.scm    | 12 +-----------
 6 files changed, 6 insertions(+), 66 deletions(-)

diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm
index 15d3b1670..6ccfef83f 100644
--- a/queries/arduino/injections.scm
+++ b/queries/arduino/injections.scm
@@ -1,14 +1,4 @@
-((preproc_def
- (preproc_arg) @injection.content)
- (#lua-match? @injection.content "\n")
- (#set! injection.language "arduino"))
-
-(preproc_function_def
- (preproc_arg) @injection.content
- (#set! injection.language "arduino"))
-
-(preproc_call
- (preproc_arg) @injection.content
+((preproc_arg) @injection.content
  (#set! injection.language "arduino"))
 
 ((comment) @injection.content 
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index a1913e664..933903ebb 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,14 +1,4 @@
-((preproc_def
- (preproc_arg) @injection.content)
- (#lua-match? @injection.content "\n")
- (#set! injection.language "c"))
-
-(preproc_function_def
- (preproc_arg) @injection.content
- (#set! injection.language "c"))
-
-(preproc_call
- (preproc_arg) @injection.content
+((preproc_arg) @injection.content
  (#set! injection.language "c"))
 
 ((comment) @injection.content
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 2349c92bf..6b7639b67 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,14 +1,4 @@
-((preproc_def
- (preproc_arg) @injection.content)
- (#lua-match? @injection.content "\n")
- (#set! injection.language "cpp"))
-
-(preproc_function_def
- (preproc_arg) @injection.content
- (#set! injection.language "cpp"))
-
-(preproc_call
- (preproc_arg) @injection.content
+((preproc_arg) @injection.content
  (#set! injection.language "cpp"))
 
 ((comment) @injection.content 
diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm
index bb37accb1..82aac968e 100644
--- a/queries/cuda/injections.scm
+++ b/queries/cuda/injections.scm
@@ -1,14 +1,4 @@
-((preproc_def
- (preproc_arg) @injection.content)
- (#lua-match? @injection.content "\n")
- (#set! injection.language "cuda"))
-
-(preproc_function_def
- (preproc_arg) @injection.content
- (#set! injection.language "cuda"))
-
-(preproc_call
- (preproc_arg) @injection.content
+((preproc_arg) @injection.content
  (#set! injection.language "cuda"))
 
 ((comment) @injection.content 
diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm
index f9061052c..57b24fed5 100644
--- a/queries/glsl/injections.scm
+++ b/queries/glsl/injections.scm
@@ -1,14 +1,4 @@
-((preproc_def
- (preproc_arg) @injection.content)
- (#lua-match? @injection.content "\n")
- (#set! injection.language "glsl"))
-
-(preproc_function_def
- (preproc_arg) @injection.content
- (#set! injection.language "glsl"))
-
-(preproc_call
- (preproc_arg) @injection.content
+((preproc_arg) @injection.content
  (#set! injection.language "glsl"))
 
 ((comment) @injection.content 
diff --git a/queries/hlsl/injections.scm b/queries/hlsl/injections.scm
index 9a9fcd6e8..29222ee01 100644
--- a/queries/hlsl/injections.scm
+++ b/queries/hlsl/injections.scm
@@ -1,14 +1,4 @@
-((preproc_def
- (preproc_arg) @injection.content)
- (#lua-match? @injection.content "\n")
- (#set! injection.language "hlsl"))
-
-(preproc_function_def
- (preproc_arg) @injection.content
- (#set! injection.language "hlsl"))
-
-(preproc_call
- (preproc_arg) @injection.content
+((preproc_arg) @injection.content
  (#set! injection.language "hlsl"))
 
 ((comment) @injection.content

From 93ee00cd9daf8d2e3fbaa2a18b8b9adcb4471b16 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 14 Aug 2023 06:35:08 +0000
Subject: [PATCH 0611/2704] Update parsers: arduino, cuda, glsl, hlsl, objc,
 promql, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7aa23065b..3513b7492 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "d988e6a803203cc2bbfd2a8a84edffc73d2922b4"
+    "revision": "a2aa2b38301960822c5384cd10a07c2026e9d44e"
   },
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
@@ -75,7 +75,7 @@
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "cuda": {
-    "revision": "c5fa8c999c9b599c7014467e59920dd00cc5a64c"
+    "revision": "607851cc524d9f5b5a5cd31ad4044fd431cee54e"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -177,7 +177,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "00ffe2099374613d2f313ace4a9dda44370b458b"
+    "revision": "4780c2b689a5a5bd0ccfd78403510e9cf4a0f2fc"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -222,7 +222,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "95361dde7ad4025fbec5dc4e5cdde0ea8ed64172"
+    "revision": "246354da450a9a6f27f04b67c673b2ed77abb4b7"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -348,7 +348,7 @@
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
   "objc": {
-    "revision": "97e022ec4a908108283bad23d42eee39ad204db6"
+    "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
   },
   "ocaml": {
     "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
@@ -399,7 +399,7 @@
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
   "promql": {
-    "revision": "ed9a12f6ae4e75d4622adef8fb1b1e4d0ac0a759"
+    "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
@@ -597,7 +597,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "a930aa4e36da798162fb088884d2c154f04c641c"
+    "revision": "fc4e19540659eca83e52116e36a49cefa0d87902"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 11d79aa0f731439f2cd05579a64ac13857002f16 Mon Sep 17 00:00:00 2001
From: dvic <info@dvic.io>
Date: Mon, 14 Aug 2023 20:59:27 +0200
Subject: [PATCH 0612/2704] Fix HEEx directive injections

---
 queries/heex/injections.scm | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/queries/heex/injections.scm b/queries/heex/injections.scm
index 1aa822197..403697acb 100644
--- a/queries/heex/injections.scm
+++ b/queries/heex/injections.scm
@@ -1,14 +1,25 @@
-; HEEx directives can span multiple interpolated lines of Elixir
-(directive [
-  (expression_value) 
-  (partial_expression_value)
-] @injection.content
+; directives are standalone tags like '<%= @x %>'
+;
+; partial_expression_values are elixir code that is part of an expression that
+; spans multiple directive nodes, so they must be combined. For example:
+;     <%= if true do %>
+;       <p>hello, tree-sitter!</p>
+;     <% end %>
+(directive
+  (partial_expression_value) @injection.content
   (#set! injection.language "elixir")
-  (#set! injection.combined))  
+  (#set! injection.include-children)
+  (#set! injection.combined))
 
-; HEEx Elixir expressions are always within a tag or component
-(expression 
-  (expression_value) @injection.content 
+; Regular expression_values do not need to be combined
+((directive
+  (expression_value) @injection.content)
+  (#set! injection.language "elixir"))
+
+; expressions live within HTML tags, and do not need to be combined
+;     <link href={ Routes.static_path(..) } />
+(expression
+  (expression_value) @injection.content
   (#set! injection.language "elixir"))
 
 ; HEEx comments

From 64d1696d6d2e389e99542bddf1579e527b000398 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 16 Aug 2023 03:05:59 -0400
Subject: [PATCH 0613/2704] fix(python,starlark): update parsers & add
 escape_interpolation

---
 lockfile.json                   | 4 ++--
 queries/python/highlights.scm   | 5 ++++-
 queries/starlark/highlights.scm | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3513b7492..86c8e4d82 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -417,7 +417,7 @@
     "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
   },
   "python": {
-    "revision": "5af00f64af6bbf822f208243cce5cf75396fb6f5"
+    "revision": "28fa64492e93619427c7f22c3ba39c2505b1ff2d"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -501,7 +501,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "starlark": {
-    "revision": "504ddd75ecc78fbbce22aa6facd70375d3f8854a"
+    "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
   },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index c18b74867..e0c1491a5 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -155,7 +155,10 @@
   (#lua-match? @preproc "^#!/"))
 
 (string) @string
-(escape_sequence) @string.escape
+[
+  (escape_sequence)
+  (escape_interpolation)
+] @string.escape
 
 ; doc-strings
 
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 7ea70e514..66ca4e8dd 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -153,8 +153,7 @@
 (string) @string
 [
   (escape_sequence)
-  "{{"
-  "}}"
+  (escape_interpolation)
 ] @string.escape
 
 ; doc-strings

From 294f753ed3597d7e221352efe8080a8951d740b4 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 16 Aug 2023 16:58:25 +0900
Subject: [PATCH 0614/2704] fix(ecma): fix no injections for innerHTML (#5258)

---
 queries/ecma/injections.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 3b55295ce..720dd2eda 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -100,6 +100,15 @@
   (#set! injection.language "graphql"))
 
 ; el.innerHTML = `<html>`
+(assignment_expression
+  left: 
+    (member_expression
+      property: (property_identifier) @_prop
+      (#any-of? @_prop "outerHTML" "innerHTML"))
+  right: (template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.language "html"))
+
 ; el.innerHTML = '<html>'
 (assignment_expression
   left: 
@@ -107,9 +116,5 @@
       property: (property_identifier) @_prop
       (#any-of? @_prop "outerHTML" "innerHTML"))
   right: 
-    [
-      (template_string)
-      (string)
-    ] @injection.content
-    (#offset! @injection.content 0 1 0 -1)
+    (string (string_fragment) @injection.content)
     (#set! injection.language "html"))

From 7c27beddda182a178eafd978a96cc35738d6be98 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 16 Aug 2023 07:31:45 +0000
Subject: [PATCH 0615/2704] Update parsers: cmake, cpp, ispc, java, lua, robot,
 wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 86c8e4d82..2061b8790 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "3dfc596025431b21e839d392c171f6f97c2a4258"
+    "revision": "73ab4b8e9522f014a67f87f585e820d36fa47408"
   },
   "comment": {
     "revision": "c9a7e2df7cac2dfb730f766a4f343308f84ff346"
@@ -69,7 +69,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "ab1065fa23a43a447bd7e619a3af90253867af24"
+    "revision": "a90f170f92d5d70e7c2d4183c146e61ba5f3a457"
   },
   "css": {
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
@@ -246,13 +246,13 @@
     "revision": "7f11a02fb8891482068e0fe419965d7bade81a68"
   },
   "ispc": {
-    "revision": "cc57a931eb782474324910e19ca253aa0d5fe38a"
+    "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "e8d1bc4043c1d2326f7ce3aa7b8833c7b18d0560"
+    "revision": "333cb0bd74a8de7ffd987a18e3421e41838031a1"
   },
   "javascript": {
     "revision": "f772967f7b7bc7c28f845be2420a38472b16a8ee"
@@ -297,7 +297,7 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "7268c1cea5df56ac0c779cd37d6631d4e6f41d4f"
+    "revision": "88e446476a1e97a8724dff7a23e2d709855077f2"
   },
   "luadoc": {
     "revision": "8981072676ec8bd74def6134be4f883655f7c082"
@@ -453,7 +453,7 @@
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
   },
   "robot": {
-    "revision": "5e50f2517580290cd1b9689664815e3b09d986b8"
+    "revision": "f6f2eaf8bc711bcded4ede4e10859b06f73e191f"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
@@ -597,7 +597,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "fc4e19540659eca83e52116e36a49cefa0d87902"
+    "revision": "672baf4f0f73c918581ba6ca1e2e49f77f32fb3c"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 5f01ffd47843d5030001df81a83c2f9ea1c06d97 Mon Sep 17 00:00:00 2001
From: Munif Tanjim <hello@muniftanjim.dev>
Date: Wed, 16 Aug 2023 20:06:01 +0600
Subject: [PATCH 0616/2704] fix(lua): injections for comment and luadoc

---
 queries/lua/injections.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index bdb460895..8cc0605c8 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -33,10 +33,10 @@
  (#lua-match? @injection.content "^%s*;+%s?query")
  (#set! injection.language "query"))
 
-((comment) @injection.content
-  (#lua-match? @injection.content "[-][-][-][%s]*@")
+(comment content: (_) @injection.content
+  (#lua-match? @injection.content "^[-][%s]*@")
   (#set! injection.language "luadoc")
-  (#offset! @injection.content 0 3 0 0))
+  (#offset! @injection.content 0 1 0 0))
 
 ; string.match("123", "%d+")
 (function_call
@@ -64,4 +64,5 @@
     (#any-of? @_method "gmatch" "gsub"))
     arguments: (arguments (string content: _ @injection.content (#set! injection.language "luap"))))
 
-((comment) @injection.content (#set! injection.language "comment"))
+(comment content: (_) @injection.content
+  (#set! injection.language "comment"))

From 59f06b3b33fb3013cfbdf378297c756e44a6919e Mon Sep 17 00:00:00 2001
From: sogaiu <983021772@users.noreply.github.com>
Date: Wed, 16 Aug 2023 19:45:07 +0900
Subject: [PATCH 0617/2704] feat(janet): update highlights

---
 queries/janet_simple/highlights.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 586f16944..2b4ddf95b 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -75,7 +75,8 @@
   "->" "->>" "-?>" "-?>>"
   "/="
   "and" "as->" "as-macro" "as?->" "assert"
-  "case" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro"
+  "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen"
+  "cond" "coro"
   "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
   "defn" "defn-"
   "delay" "doc"
@@ -119,8 +120,7 @@
   ".break" ".breakall" ".bytecode"
   ".clear" ".clearall"
   ".disasm"
-  ".fiber"
-  ".fn" ".frame"
+  ".fiber" ".fn" ".frame"
   ".locals"
   ".next" ".nextc"
   ".ppasm"
@@ -161,7 +161,7 @@
   "debugger" "debugger-on-status"
   "dec" "deep-not=" "deep=" "defglobal" "describe"
   "dictionary?"
-  "disasm" "distinct" "doc*" "doc-format" "doc-of" "dofile"
+  "disasm" "distinct" "div" "doc*" "doc-format" "doc-of" "dofile"
   "drop" "drop-until" "drop-while" "dyn"
   "eflush" "empty?" "env-lookup"
   "eprin" "eprinf" "eprint" "eprintf" "error" "errorf"
@@ -174,22 +174,23 @@
   "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write"
   "eval" "eval-string" "even?" "every?" "extreme"
   "false?"
-  "ffi/align" "ffi/call" "ffi/close" "ffi/context" "ffi/free"
-  "ffi/jitfn" "ffi/lookup" "ffi/malloc" "ffi/native"
-  "ffi/pointer-buffer" "ffi/read" "ffi/signature" "ffi/size"
-  "ffi/struct" "ffi/trampoline" "ffi/write"
+  "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
+  "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc"
+  "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction"
+  "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
+  "ffi/trampoline" "ffi/write"
   "fiber/can-resume?" "fiber/current" "fiber/getenv"
   "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
   "fiber/setenv" "fiber/setmaxstack" "fiber/status"
   "fiber?"
-  "file/close" "file/flush" "file/open" "file/read" "file/seek"
-  "file/tell" "file/temp" "file/write"
+  "file/close" "file/flush" "file/lines" "file/open" "file/read"
+  "file/seek" "file/tell" "file/temp" "file/write"
   "filter" "find" "find-index" "first" "flatten" "flatten-into"
   "flush" "flycheck" "freeze" "frequencies" "from-pairs"
   "function?"
   "gccollect" "gcinterval" "gcsetinterval"
   "gensym" "get" "get-in" "getline" "getproto" "group-by"
-  "hash"
+  "has-key?" "has-value?" "hash"
   "idempotent?" "identity" "import*" "in" "inc" "index-of"
   "indexed?"
   "int/s64" "int/to-bytes" "int/to-number" "int/u64"
@@ -222,7 +223,7 @@
   "net/address-unpack" "net/chunk" "net/close" "net/connect"
   "net/flush" "net/listen" "net/localname" "net/peername"
   "net/read" "net/recv-from" "net/send-to" "net/server"
-  "net/shutdown" "net/write"
+  "net/setsockopt" "net/shutdown" "net/write"
   "next"
   "nil?"
   "not" "not="

From 922c396b2600653b8af12780077340768a0404fb Mon Sep 17 00:00:00 2001
From: TheLeoP <eugenio2305@hotmail.com>
Date: Mon, 14 Aug 2023 10:50:59 -0500
Subject: [PATCH 0618/2704] fix(python): right content for regex injection

---
 queries/python/injections.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index effe2ecc7..b836ea3f7 100644
--- a/queries/python/injections.scm
+++ b/queries/python/injections.scm
@@ -1,10 +1,11 @@
-((call
+(call
   function: (attribute
-	  object: (identifier) @_re)
-  arguments: (argument_list (string) @injection.content))
- (#eq? @_re "re")
- (#lua-match? @injection.content "^r.*")
- (#set! injection.language "regex"))
+              object: (identifier) @_re)
+  arguments: (argument_list (string
+                              (string_content) @injection.content) @_string)
+  (#eq? @_re "re")
+  (#lua-match? @_string "^r.*")
+  (#set! injection.language "regex"))
 
 ((comment) @injection.content
  (#set! injection.language "comment"))

From 3fbf5138299cc79fd5203491967762d17e02d8ab Mon Sep 17 00:00:00 2001
From: "Sergio A. Vargas" <savargasqu+git@unal.edu.co>
Date: Wed, 16 Aug 2023 15:30:59 -0500
Subject: [PATCH 0619/2704] feat(julia): spell-check docstrings

Enable spell checking of docstrings without markdown injections.
---
 queries/julia/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 0a7d32df3..e76911947 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -282,7 +282,7 @@
 (prefixed_command_literal
   prefix: (identifier) @function.macro) @string.special
 
-((string_literal) @string.documentation
+((string_literal) @string.documentation @spell
   . [
       (module_definition)
       (abstract_definition)

From a3b2e0dcdb7ce0beb1459e5a3fde4bd975c35fc5 Mon Sep 17 00:00:00 2001
From: Guilherme Soares <48023091+guilhas07@users.noreply.github.com>
Date: Wed, 16 Aug 2023 22:44:47 +0100
Subject: [PATCH 0620/2704] feat(c_sharp): add missing highlights

Added:
 * `??` and `??=` as operators
 * `alias` as keyword
 * `when` as conditional
---
 queries/c_sharp/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 9895d8341..c67d29eb8 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -223,6 +223,7 @@
  "switch"
  "break"
  "case"
+ "when"
  (if_directive)
  (elif_directive)
  (else_directive)
@@ -289,6 +290,8 @@
  ">>="
  ">>>="
  "=>"
+ "??"
+ "??="
 ] @operator
 
 [
@@ -364,6 +367,7 @@
  "checked"
  "unchecked"
  "fixed"
+ "alias"
 ] @keyword
 
 [

From 0e27391e900a3efddfeebb37babc62e1e5dca595 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 16 Aug 2023 17:53:03 -0400
Subject: [PATCH 0621/2704] feat(python): update parser & highlights

---
 lockfile.json                 | 2 +-
 queries/python/highlights.scm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 2061b8790..008c934a0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -417,7 +417,7 @@
     "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
   },
   "python": {
-    "revision": "28fa64492e93619427c7f22c3ba39c2505b1ff2d"
+    "revision": "c01fb4e38587e959b9058b8cd34b9e6a3068c827"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index e0c1491a5..04398668e 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -27,6 +27,8 @@
            "credits"
            "license"))
 
+"_" @constant.builtin ; match wildcard
+
 ((attribute
     attribute: (identifier) @field)
  (#lua-match? @field "^[%l_].*$"))
@@ -244,6 +246,7 @@
   "print"
   "with"
   "as"
+  "type"
 ] @keyword
 
 [

From 087166aae1e2098061eb51eb6e9745bedc7760f8 Mon Sep 17 00:00:00 2001
From: Tomas Sandven <597206+Hubro@users.noreply.github.com>
Date: Thu, 17 Aug 2023 06:27:51 +0200
Subject: [PATCH 0622/2704] feat(robot): update parser, queries and maintainer

* Update tree-sitter-robot version and maintainer

* Improve query code style

* Update tree-sitter-robot revision
---
 README.md                    |  2 +-
 lockfile.json                |  2 +-
 queries/robot/folds.scm      |  5 +++
 queries/robot/highlights.scm | 68 +++++++++++++++++++++++++++---------
 queries/robot/indents.scm    | 21 +++++++++++
 5 files changed, 80 insertions(+), 18 deletions(-)
 create mode 100644 queries/robot/folds.scm
 create mode 100644 queries/robot/indents.scm

diff --git a/README.md b/README.md
index 88ee4d3f1..d46d1aba9 100644
--- a/README.md
+++ b/README.md
@@ -324,7 +324,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
-- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (experimental, maintained by @ema2159)
+- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
diff --git a/lockfile.json b/lockfile.json
index 008c934a0..15c0298ec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -453,7 +453,7 @@
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
   },
   "robot": {
-    "revision": "f6f2eaf8bc711bcded4ede4e10859b06f73e191f"
+    "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
diff --git a/queries/robot/folds.scm b/queries/robot/folds.scm
new file mode 100644
index 000000000..948f8a17d
--- /dev/null
+++ b/queries/robot/folds.scm
@@ -0,0 +1,5 @@
+[
+  (section)
+  (keyword_definition)
+  (test_case_definition)
+] @fold
diff --git a/queries/robot/highlights.scm b/queries/robot/highlights.scm
index abff22c42..152526f70 100644
--- a/queries/robot/highlights.scm
+++ b/queries/robot/highlights.scm
@@ -1,21 +1,57 @@
-(argument (dictionary_variable) @string.special)
-(argument (list_variable) @string.special)
-(argument (scalar_variable) @string.special)
-(argument (text_chunk) @string)
+[
+  (comment)
+  (extra_text)
+] @comment
 
-(keyword_invocation (keyword) @function)
-
-(test_case_definition (name) @property)
-
-(keyword_definition (body (keyword_setting) @keyword))
-(keyword_definition (name) @function)
+[
+  (section_header)
+  (setting_statement)
+  (keyword_setting)
+  (test_case_setting)
+] @keyword
 
 (variable_definition (variable_name) @variable)
+(keyword_definition (name) @function)
+(test_case_definition (name) @function)
 
-(setting_statement) @keyword
-
-(extra_text) @comment
-(section_header) @keyword
-
+(keyword_invocation (keyword) @function.call)
 (ellipses) @punctuation.delimiter
-(comment) @comment
+
+(text_chunk) @string
+(inline_python_expression) @string.special
+[
+  (scalar_variable)
+  (list_variable)
+  (dictionary_variable)
+] @variable
+
+; Control structures
+
+[
+  "FOR"
+  "IN"
+  "IN RANGE"
+  "IN ENUMERATE"
+  "IN ZIP"
+  (break_statement)
+  (continue_statement)
+] @repeat
+(for_statement "END" @repeat)
+
+"WHILE" @repeat
+(while_statement "END" @repeat)
+
+[
+  "IF"
+  "ELSE IF"
+] @conditional
+(if_statement "END" @conditional)
+(if_statement (else_statement "ELSE" @conditional))
+
+[
+  "TRY"
+  "EXCEPT"
+  "FINALLY"
+] @exception
+(try_statement "END" @exception)
+(try_statement (else_statement "ELSE" @exception))
diff --git a/queries/robot/indents.scm b/queries/robot/indents.scm
new file mode 100644
index 000000000..ae34b83a2
--- /dev/null
+++ b/queries/robot/indents.scm
@@ -0,0 +1,21 @@
+(keyword_definition) @indent.begin
+(test_case_definition) @indent.begin
+
+(for_statement) @indent.begin
+(for_statement "END" @indent.branch)
+(for_statement
+  right: (_ (arguments (continuation (ellipses) @indent.branch))))
+
+(while_statement) @indent.begin
+(while_statement "END" @indent.branch)
+
+(if_statement) @indent.begin
+(if_statement (elseif_statement) @indent.branch)
+(if_statement (else_statement) @indent.branch)
+(if_statement "END" @indent.branch)
+
+(try_statement) @indent.begin
+(try_statement (except_statement) @indent.branch)
+(try_statement (finally_statement) @indent.branch)
+(try_statement (else_statement) @indent.branch)
+(try_statement "END" @indent.branch)

From 04cab345e986bbfd0042ca591db293874e0f775b Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Thu, 17 Aug 2023 04:28:11 +0000
Subject: [PATCH 0623/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d46d1aba9..88ee4d3f1 100644
--- a/README.md
+++ b/README.md
@@ -324,7 +324,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
-- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
+- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (experimental, maintained by @ema2159)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)

From f7bb866405530e863135596900781e73cbf6f4ed Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 15 Aug 2023 21:36:44 +0300
Subject: [PATCH 0624/2704] feat: add gpg config parser

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++++
 queries/gpg/highlights.scm      | 49 +++++++++++++++++++++++++++++++++
 queries/gpg/injections.scm      |  2 ++
 5 files changed, 63 insertions(+)
 create mode 100644 queries/gpg/highlights.scm
 create mode 100644 queries/gpg/injections.scm

diff --git a/README.md b/README.md
index 88ee4d3f1..12faa4d76 100644
--- a/README.md
+++ b/README.md
@@ -238,6 +238,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gomod](https://github.com/camdencheek/tree-sitter-go-mod) (maintained by @camdencheek)
 - [x] [gosum](https://github.com/amaanq/tree-sitter-go-sum) (maintained by @amaanq)
 - [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
+- [x] [gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) (maintained by @ObserverOfTime)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
 - [x] [groovy](https://github.com/Decodetalkers/tree-sitter-groovy) (maintained by @Decodetalkers)
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
diff --git a/lockfile.json b/lockfile.json
index 15c0298ec..14923f000 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -194,6 +194,9 @@
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
+  "gpg": {
+    "revision": "af97733568c8141090d8a79dfff66806c96c2cc0"
+  },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6bb88ac06..b40113a38 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -623,6 +623,14 @@ list.gowork = {
   maintainers = { "@omertuc" },
 }
 
+list.gpg = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-gpg-config",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.groovy = {
   install_info = {
     url = "https://github.com/Decodetalkers/tree-sitter-groovy",
diff --git a/queries/gpg/highlights.scm b/queries/gpg/highlights.scm
new file mode 100644
index 000000000..55833027e
--- /dev/null
+++ b/queries/gpg/highlights.scm
@@ -0,0 +1,49 @@
+(option . _ @keyword)
+
+(option
+  ("no-" @parameter)?
+  (name) @parameter)
+
+(string (content) @string)
+
+[
+ (value)
+ "clear"
+] @string.special
+
+(url) @text.uri
+
+(key) @constant
+
+[
+ (number)
+ (expire_time)
+ (iso_time)
+] @number
+
+(format) @character.special
+
+"sensitive:" @type.qualifier
+
+(filter_name) @parameter
+
+(filter_scope) @namespace
+
+(filter_property) @property
+
+(filter_value) @string
+
+[
+ (filter_op0)
+ (filter_op1)
+ (filter_lc)
+ "="
+] @operator
+
+"!" @punctuation.special
+
+[ "\"" "'" "," ] @punctuation.delimiter
+
+(comment) @comment @spell
+
+(ERROR) @error
diff --git a/queries/gpg/injections.scm b/queries/gpg/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/gpg/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 977e9327268196ace4d7839c6d44feb7978952c4 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 17 Aug 2023 00:49:36 -0400
Subject: [PATCH 0625/2704] feat: add BitBake

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/bitbake/folds.scm       |  29 +++
 queries/bitbake/highlights.scm  | 360 ++++++++++++++++++++++++++++++++
 queries/bitbake/indents.scm     | 127 +++++++++++
 queries/bitbake/injections.scm  |  14 ++
 queries/bitbake/locals.scm      |  99 +++++++++
 8 files changed, 641 insertions(+)
 create mode 100644 queries/bitbake/folds.scm
 create mode 100644 queries/bitbake/highlights.scm
 create mode 100644 queries/bitbake/indents.scm
 create mode 100644 queries/bitbake/injections.scm
 create mode 100644 queries/bitbake/locals.scm

diff --git a/README.md b/README.md
index 12faa4d76..8aa827f7a 100644
--- a/README.md
+++ b/README.md
@@ -183,6 +183,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [beancount](https://github.com/polarmutex/tree-sitter-beancount) (maintained by @polarmutex)
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
+- [x] [bitbake](https://github.com/amaanq/tree-sitter-bitbake) (maintained by @amaanq)
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @Luxed)
diff --git a/lockfile.json b/lockfile.json
index 14923f000..bb5303fe1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -29,6 +29,9 @@
   "bicep": {
     "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
+  "bitbake": {
+    "revision": "ed92abd7b67ab66a6fa3a747a0157f01d2e467d8"
+  },
   "blueprint": {
     "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b40113a38..847c07837 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -156,6 +156,14 @@ list.bicep = {
   maintainers = { "@amaanq" },
 }
 
+list.bitbake = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-bitbake",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.blueprint = {
   install_info = {
     url = "https://gitlab.com/gabmus/tree-sitter-blueprint.git",
diff --git a/queries/bitbake/folds.scm b/queries/bitbake/folds.scm
new file mode 100644
index 000000000..9fc865e84
--- /dev/null
+++ b/queries/bitbake/folds.scm
@@ -0,0 +1,29 @@
+[
+  (function_definition)
+  (anonymous_python_function)
+  (python_function_definition)
+
+  (while_statement)
+  (for_statement)
+  (if_statement)
+  (with_statement)
+  (try_statement)
+
+  (import_from_statement)
+  (parameters)
+  (argument_list)
+
+  (parenthesized_expression)
+  (generator_expression)
+  (list_comprehension)
+  (set_comprehension)
+  (dictionary_comprehension)
+
+  (tuple)
+  (list)
+  (set)
+  (dictionary)
+
+  (string)
+  (python_string)
+] @fold
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
new file mode 100644
index 000000000..eb37b1b36
--- /dev/null
+++ b/queries/bitbake/highlights.scm
@@ -0,0 +1,360 @@
+; Includes
+
+[
+  "inherit"
+  "include"
+  "require"
+  "export"
+  "import"
+] @include
+
+; Keywords
+
+[
+  "unset"
+  "EXPORT_FUNCTIONS"
+  "python"
+
+  "assert"
+  "exec"
+  "global"
+  "nonlocal"
+  "pass"
+  "print"
+  "with"
+  "as"
+] @keyword
+
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
+[
+  "return"
+  "yield"
+] @keyword.return
+(yield "from" @keyword.return)
+
+(future_import_statement
+  "from" @include
+  "__future__" @constant.builtin)
+(import_from_statement "from" @include)
+"import" @include
+
+(aliased_import "as" @include)
+
+["if" "elif" "else"] @conditional
+
+["for" "while" "break" "continue"] @repeat
+
+[
+  "try"
+  "except"
+  "except*"
+  "raise"
+  "finally"
+] @exception
+
+(raise_statement "from" @exception)
+
+(try_statement
+  (else_clause
+    "else" @exception))
+
+[
+  "addtask"
+  "deltask"
+  "addhandler"
+  "def"
+  "lambda"
+] @keyword.function
+
+[
+  "before"
+  "after"
+] @storageclass
+
+[
+  "append"
+  "prepend"
+  "remove"
+] @type.qualifier
+
+; Variables
+
+[
+  (identifier)
+  (python_identifier)
+] @variable
+
+[
+  "noexec"
+  "INHERIT"
+  "OVERRIDES"
+  "$BB_ENV_PASSTHROUGH"
+  "$BB_ENV_PASSTHROUGH_ADDITIONS"
+] @variable.builtin
+
+; Reset highlighting in f-string interpolations
+(interpolation) @none
+
+;; Identifier naming conventions
+((python_identifier) @type
+ (#lua-match? @type "^[A-Z].*[a-z]"))
+([(identifier) (python_identifier)] @constant
+ (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+
+((python_identifier) @constant.builtin
+ (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
+
+((python_identifier) @constant.builtin
+ (#any-of? @constant.builtin
+           ;; https://docs.python.org/3/library/constants.html
+           "NotImplemented"
+           "Ellipsis"
+           "quit"
+           "exit"
+           "copyright"
+           "credits"
+           "license"))
+
+((assignment
+  left: (python_identifier) @type.definition
+  (type (python_identifier) @_annotation))
+ (#eq? @_annotation "TypeAlias"))
+
+((assignment
+  left: (python_identifier) @type.definition
+  right: (call
+    function: (python_identifier) @_func))
+ (#any-of? @_func "TypeVar" "NewType"))
+
+; Fields
+
+(flag) @field
+
+((attribute
+    attribute: (python_identifier) @field)
+ (#lua-match? @field "^[%l_].*$"))
+
+; Functions
+
+(call
+  function: (python_identifier) @function.call)
+
+(call
+  function: (attribute
+              attribute: (python_identifier) @method.call))
+
+((call
+   function: (python_identifier) @constructor)
+ (#lua-match? @constructor "^%u"))
+
+((call
+  function: (attribute
+              attribute: (python_identifier) @constructor))
+ (#lua-match? @constructor "^%u"))
+
+((call
+  function: (python_identifier) @function.builtin)
+ (#any-of? @function.builtin
+          "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
+          "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format"
+          "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
+          "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
+          "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
+          "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+
+(python_function_definition
+  name: (python_identifier) @function)
+
+(type (python_identifier) @type)
+(type
+  (subscript
+    (python_identifier) @type)) ; type subscript: Tuple[int]
+
+((call
+  function: (python_identifier) @_isinstance
+  arguments: (argument_list
+    (_)
+    (python_identifier) @type))
+ (#eq? @_isinstance "isinstance"))
+
+(anonymous_python_function (identifier) @function)
+
+(function_definition (identifier) @function)
+
+(addtask_statement (identifier) @function)
+
+(deltask_statement (identifier) @function)
+
+(export_functions_statement (identifier) @function)
+
+(addhandler_statement (identifier) @function)
+
+(python_function_definition
+  body:
+    (block
+      . (expression_statement (python_string) @string.documentation @spell)))
+
+; Namespace
+
+(inherit_directive (identifier) @namespace)
+
+;; Normal parameters
+(parameters
+  (python_identifier) @parameter)
+;; Lambda parameters
+(lambda_parameters
+  (python_identifier) @parameter)
+(lambda_parameters
+  (tuple_pattern
+    (python_identifier) @parameter))
+; Default parameters
+(keyword_argument
+  name: (python_identifier) @parameter)
+; Naming parameters on call-site
+(default_parameter
+  name: (python_identifier) @parameter)
+(typed_parameter
+  (python_identifier) @parameter)
+(typed_default_parameter
+  (python_identifier) @parameter)
+; Variadic parameters *args, **kwargs
+(parameters
+  (list_splat_pattern ; *args
+    (python_identifier) @parameter))
+(parameters
+  (dictionary_splat_pattern ; **kwargs
+    (python_identifier) @parameter))
+
+;; Literals
+
+(none) @constant.builtin
+[(true) (false)] @boolean
+((python_identifier) @variable.builtin
+ (#eq? @variable.builtin "self"))
+((python_identifier) @variable.builtin
+ (#eq? @variable.builtin "cls"))
+
+(integer) @number
+(float) @float
+
+; Operators
+
+[
+  "?="
+  "??="
+  ":="
+  "=+"
+  ".="
+  "=."
+  "-"
+  "-="
+  ":="
+  "!="
+  "*"
+  "**"
+  "**="
+  "*="
+  "/"
+  "//"
+  "//="
+  "/="
+  "&"
+  "&="
+  "%"
+  "%="
+  "^"
+  "^="
+  "+"
+  "+="
+  "<"
+  "<<"
+  "<<="
+  "<="
+  "<>"
+  "="
+  "=="
+  ">"
+  ">="
+  ">>"
+  ">>="
+  "@"
+  "@="
+  "|"
+  "|="
+  "~"
+  "->"
+] @operator
+
+[
+  "and"
+  "in"
+  "is"
+  "not"
+  "or"
+  "is not"
+  "not in"
+
+  "del"
+] @keyword.operator
+
+; Literals
+
+[
+  (string)
+  (python_string)
+  "\""
+] @string
+
+(include_path) @string.special
+
+[
+  (escape_sequence)
+  (escape_interpolation)
+] @string.escape
+
+; Punctuation
+
+[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
+
+[
+  ":"
+  "->"
+  ";"
+  "."
+  ","
+  (ellipsis)
+] @punctuation.delimiter
+
+(variable_expansion [ "${" "}" ] @punctuation.special)
+(inline_python [ "${@" "}" ] @punctuation.special)
+(interpolation
+  "{" @punctuation.special
+  "}" @punctuation.special)
+
+(type_conversion) @function.macro
+
+([(identifier) (python_identifier)] @type.builtin
+ (#any-of? @type.builtin
+              ;; https://docs.python.org/3/library/exceptions.html
+              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
+              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+              ;; https://docs.python.org/3/library/stdtypes.html
+              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+
+(comment) @comment @spell
+
+(ERROR) @error
diff --git a/queries/bitbake/indents.scm b/queries/bitbake/indents.scm
new file mode 100644
index 000000000..01d8aeb3c
--- /dev/null
+++ b/queries/bitbake/indents.scm
@@ -0,0 +1,127 @@
+[
+  (import_from_statement)
+
+  (parenthesized_expression)
+  (generator_expression)
+  (list_comprehension)
+  (set_comprehension)
+  (dictionary_comprehension)
+
+  (tuple_pattern)
+  (list_pattern)
+  (binary_operator)
+
+  (lambda)
+
+  (concatenated_string)
+] @indent.begin
+
+((list) @indent.align
+ (#set! indent.open_delimiter "[")
+ (#set! indent.close_delimiter "]")
+)
+((dictionary) @indent.align
+ (#set! indent.open_delimiter "{")
+ (#set! indent.close_delimiter "}")
+)
+((set) @indent.align
+ (#set! indent.open_delimiter "{")
+ (#set! indent.close_delimiter "}")
+)
+
+((for_statement) @indent.begin
+ (#set! indent.immediate 1))
+((if_statement) @indent.begin
+ (#set! indent.immediate 1))
+((while_statement) @indent.begin
+ (#set! indent.immediate 1))
+((try_statement) @indent.begin
+ (#set! indent.immediate 1))
+(ERROR "try" ":" @indent.begin (#set! indent.immediate 1))
+((python_function_definition) @indent.begin
+ (#set! indent.immediate 1))
+(function_definition) @indent.begin
+(anonymous_python_function) @indent.begin
+((with_statement) @indent.begin
+ (#set! indent.immediate 1))
+
+(if_statement
+  condition: (parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1))
+(while_statement
+  condition: (parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1))
+
+(ERROR "(" @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")") . (_)) 
+((argument_list) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+((parameters) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")")
+ (#set! indent.avoid_last_matching_next 1))
+((tuple) @indent.align
+ (#set! indent.open_delimiter "(")
+ (#set! indent.close_delimiter ")"))
+
+(ERROR "[" @indent.align (#set! indent.open_delimiter "[") (#set! indent.close_delimiter "]") . (_)) 
+
+(ERROR "{" @indent.align (#set! indent.open_delimiter "{") (#set! indent.close_delimiter "}") . (_)) 
+
+[
+  (break_statement)
+  (continue_statement)
+] @indent.dedent
+
+(ERROR
+  (_) @indent.branch ":" .
+  (#lua-match? @indent.branch "^else"))
+
+(ERROR
+  (_) @indent.branch @indent.dedent ":" .
+  (#lua-match? @indent.branch "^elif"))
+
+(parenthesized_expression ")" @indent.end)
+(generator_expression ")" @indent.end)
+(list_comprehension "]" @indent.end)
+(set_comprehension "}" @indent.end)
+(dictionary_comprehension "}" @indent.end)
+
+(tuple_pattern ")" @indent.end)
+(list_pattern "]" @indent.end)
+
+(function_definition "}" @indent.end)
+(anonymous_python_function "}" @indent.end)
+
+(return_statement
+  [
+    (_) @indent.end
+    (_
+      [
+        (_)
+        ")"
+        "}"
+        "]"
+      ] @indent.end .)
+    (attribute 
+      attribute: (_) @indent.end)
+    (call
+      arguments: (_ ")" @indent.end))
+    "return" @indent.end
+  ] .)
+
+[
+  ")"
+  "]"
+  "}"
+  (elif_clause)
+  (else_clause)
+  (except_clause)
+  (finally_clause)
+] @indent.branch
+
+(string) @indent.auto
diff --git a/queries/bitbake/injections.scm b/queries/bitbake/injections.scm
new file mode 100644
index 000000000..819487bc5
--- /dev/null
+++ b/queries/bitbake/injections.scm
@@ -0,0 +1,14 @@
+(call
+  function: (attribute
+              object: (python_identifier) @_re)
+  arguments: (argument_list (python_string
+                              (string_content) @injection.content) @_string)
+  (#eq? @_re "re")
+  (#lua-match? @_string "^r.*")
+  (#set! injection.language "regex"))
+
+((shell_content) @injection.content
+  (#set! injection.language "bash"))
+
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/bitbake/locals.scm b/queries/bitbake/locals.scm
new file mode 100644
index 000000000..baf835cc5
--- /dev/null
+++ b/queries/bitbake/locals.scm
@@ -0,0 +1,99 @@
+; References
+[
+  (python_identifier)
+  (identifier)
+] @reference
+
+; Imports
+(aliased_import
+  alias: (python_identifier) @definition.import)
+(import_statement
+  name: (dotted_name ((python_identifier) @definition.import)))
+(import_from_statement
+  name: (dotted_name ((python_identifier) @definition.import)))
+
+; Function with parameters, defines parameters
+(parameters
+  (python_identifier) @definition.parameter)
+
+(default_parameter
+  (python_identifier) @definition.parameter)
+
+(typed_parameter
+  (python_identifier) @definition.parameter)
+
+(typed_default_parameter
+  (python_identifier) @definition.parameter)
+
+; *args parameter
+(parameters
+  (list_splat_pattern
+    (python_identifier) @definition.parameter))
+
+; **kwargs parameter
+(parameters
+  (dictionary_splat_pattern
+    (python_identifier) @definition.parameter))
+
+; Function defines function and scope
+((python_function_definition
+  name: (python_identifier) @definition.function) @scope
+ (#set! definition.function.scope "parent"))
+
+(function_definition (identifier) @definition.function)
+
+(anonymous_python_function (identifier) @definition.function)
+
+;;; Loops
+; not a scope!
+(for_statement
+  left: (pattern_list
+          (python_identifier) @definition.var))
+(for_statement
+  left: (tuple_pattern
+          (python_identifier) @definition.var))
+(for_statement
+  left: (python_identifier) @definition.var)
+
+; not a scope!
+;(while_statement) @scope
+
+; for in list comprehension
+(for_in_clause
+  left: (python_identifier) @definition.var)
+(for_in_clause
+  left: (tuple_pattern
+          (python_identifier) @definition.var))
+(for_in_clause
+  left: (pattern_list
+          (python_identifier) @definition.var))
+
+(dictionary_comprehension) @scope
+(list_comprehension) @scope
+(set_comprehension) @scope
+
+;;; Assignments
+
+(assignment
+ left: (python_identifier) @definition.var)
+
+(assignment
+ left: (pattern_list
+   (python_identifier) @definition.var))
+(assignment
+ left: (tuple_pattern
+   (python_identifier) @definition.var))
+
+(assignment
+ left: (attribute
+   (python_identifier)
+   (python_identifier) @definition.field))
+
+(variable_assignment (identifier) operator: [ "=" "?=" "??=" ":=" ] @definition.var)
+
+; Walrus operator  x := 1
+(named_expression
+  (python_identifier) @definition.var)
+
+(as_pattern
+  alias: (as_pattern_target) @definition.var)

From 17d3398b5bd0d0042e1a71ee1842a831399cae97 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 17 Aug 2023 04:07:43 -0400
Subject: [PATCH 0626/2704] feat: add CSV, PSV, & TSV

---
 README.md                       |  3 +++
 lockfile.json                   |  9 +++++++++
 lua/nvim-treesitter/parsers.lua | 27 +++++++++++++++++++++++++++
 queries/csv/highlights.scm      |  3 +++
 queries/psv/highlights.scm      |  3 +++
 queries/rst/injections.scm      | 10 +++++-----
 queries/tsv/highlights.scm      |  4 ++++
 7 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 queries/csv/highlights.scm
 create mode 100644 queries/psv/highlights.scm
 create mode 100644 queries/tsv/highlights.scm

diff --git a/README.md b/README.md
index 8aa827f7a..263ed52d8 100644
--- a/README.md
+++ b/README.md
@@ -199,6 +199,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [cpon](https://github.com/amaanq/tree-sitter-cpon) (maintained by @amaanq)
 - [x] [cpp](https://github.com/tree-sitter/tree-sitter-cpp) (maintained by @theHamsta)
 - [x] [css](https://github.com/tree-sitter/tree-sitter-css) (maintained by @TravonteD)
+- [x] [csv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [cuda](https://github.com/theHamsta/tree-sitter-cuda) (maintained by @theHamsta)
 - [x] [cue](https://github.com/eonpatapon/tree-sitter-cue) (maintained by @amaanq)
 - [x] [d](https://github.com/CyberShadow/tree-sitter-d) (experimental, maintained by @nawordar)
@@ -311,6 +312,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
 - [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
+- [x] [psv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
 - [x] [puppet](https://github.com/amaanq/tree-sitter-puppet) (maintained by @amaanq)
 - [x] [PyPA manifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) (maintained by @ObserverOfTime)
@@ -358,6 +360,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) (maintained by @ahelwer, @susliko)
 - [x] [todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) (experimental, maintained by @arnarg)
 - [x] [toml](https://github.com/ikatyang/tree-sitter-toml) (maintained by @tk-shirasaka)
+- [x] [tsv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [tsx](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [turtle](https://github.com/BonaBeavis/tree-sitter-turtle) (maintained by @BonaBeavis)
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
diff --git a/lockfile.json b/lockfile.json
index bb5303fe1..c557cbeea 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -77,6 +77,9 @@
   "css": {
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
+  "csv": {
+    "revision": "1f584470170b708880b024142d901b05b2b2b602"
+  },
   "cuda": {
     "revision": "607851cc524d9f5b5a5cd31ad4044fd431cee54e"
   },
@@ -413,6 +416,9 @@
   "prql": {
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
   },
+  "psv": {
+    "revision": "1f584470170b708880b024142d901b05b2b2b602"
+  },
   "pug": {
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
   },
@@ -554,6 +560,9 @@
   "toml": {
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
+  "tsv": {
+    "revision": "1f584470170b708880b024142d901b05b2b2b602"
+  },
   "tsx": {
     "revision": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 847c07837..fed9b402d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -289,6 +289,15 @@ list.css = {
   maintainers = { "@TravonteD" },
 }
 
+list.csv = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-csv",
+    files = { "src/parser.c" },
+    location = "csv",
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.cuda = {
   install_info = {
     url = "https://github.com/theHamsta/tree-sitter-cuda",
@@ -1240,6 +1249,15 @@ list.prql = {
   maintainers = { "@matthias-Q" },
 }
 
+list.psv = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-csv",
+    files = { "src/parser.c" },
+    location = "psv",
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.pug = {
   install_info = {
     url = "https://github.com/zealot128/tree-sitter-pug",
@@ -1631,6 +1649,15 @@ list.toml = {
   maintainers = { "@tk-shirasaka" },
 }
 
+list.tsv = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-csv",
+    files = { "src/parser.c" },
+    location = "tsv",
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.tsx = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-typescript",
diff --git a/queries/csv/highlights.scm b/queries/csv/highlights.scm
new file mode 100644
index 000000000..de2213aa1
--- /dev/null
+++ b/queries/csv/highlights.scm
@@ -0,0 +1,3 @@
+; inherits: tsv
+
+"," @punctuation.delimiter
diff --git a/queries/psv/highlights.scm b/queries/psv/highlights.scm
new file mode 100644
index 000000000..b7303fe0b
--- /dev/null
+++ b/queries/psv/highlights.scm
@@ -0,0 +1,3 @@
+; inherits: tsv
+
+"|" @punctuation.delimiter
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index 4fc27225a..7155b2a9b 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -54,11 +54,11 @@
  (#eq? @_type "math"))
 
 ; TODO: re-add when a parser for csv is added.
-; ((directive
-;    name: (type) @_type
-;    body: (body (content) @injection.content))
-;  (#set! injection.language "csv")
-;  (#eq? @_type "csv-table"))
+((directive
+   name: (type) @_type
+   body: (body (content) @injection.content))
+ (#set! injection.language "csv")
+ (#eq? @_type "csv-table"))
 
 ;; Special roles - prefix
 
diff --git a/queries/tsv/highlights.scm b/queries/tsv/highlights.scm
new file mode 100644
index 000000000..f1e14af87
--- /dev/null
+++ b/queries/tsv/highlights.scm
@@ -0,0 +1,4 @@
+(text) @string
+(number) @number
+(float) @float
+(boolean) @boolean

From 4ffdc4c985fb1054fb3bfa51c28917e2d9804ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cezary=20Dro=C5=BCak?= <cezary@drozak.net>
Date: Thu, 17 Aug 2023 20:36:10 +0200
Subject: [PATCH 0627/2704] feat: update jsonnet queries

---
 lockfile.json                  |  2 +-
 queries/jsonnet/highlights.scm | 62 ++++++++++++++++------------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c557cbeea..596a9052f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -282,7 +282,7 @@
     "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
   },
   "jsonnet": {
-    "revision": "26d9699842a429731844c93cbcb485519bb2c526"
+    "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
     "revision": "ab0f70c0a919d38b41822305a8ca80e527c94e4f"
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index 4267c988f..189f4b9e1 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -10,7 +10,11 @@
 (number) @number
 (string) @string
 
-(fieldname (id) @label)
+(fieldname (id) @field)
+(fieldaccess
+  last: (id) @field)
+(fieldaccess_super
+  (id) @field)
 
 [
   "["
@@ -30,28 +34,13 @@
   ":::"
 ] @punctuation.delimiter
 
+; Nested field inheritance
+("+" @punctuation.delimiter [":" "::" ":::"])
+
+"=" @operator
 (unaryop) @operator
-[
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-  "^"
-  "=="
-  "!="
-  "<="
-  ">="
-  "<"
-  ">"
-  "="
-  "&"
-  "|"
-  "<<"
-  ">>"
-  "&&"
-  "||"
-] @operator
+(binary
+  operator: (_) @operator)
 
 "for" @repeat
 
@@ -61,6 +50,7 @@
 
 [
  (local)
+ (tailstrict)
  "assert"
 ] @keyword
 
@@ -70,27 +60,33 @@
   "then"
 ] @conditional
 
+"error" @exception
+
 [
   (dollar)
   (self)
+  (super)
 ] @variable.builtin
 ((id) @variable.builtin
  (#eq? @variable.builtin "std"))
 
 ; Function declaration
+(param
+  identifier: (id) @parameter)
+(field
+  (fieldname (id) @function)
+  [(anonymous_function) (params)])
 (bind
-  function: (id) @function
-  params: (params
-            (param
-              identifier: (id) @parameter)))
+  function: (id) @function)
 
 ; Function call
-(expr
-  (expr (id) @function.call)
-  "("
-  (args
-    (named_argument
-      (id) @parameter))?
-  ")")
+(functioncall (id) @function.call)
+(functioncall
+  (fieldaccess
+    last: (id) @function.call))
+(functioncall
+  (fieldaccess_super
+    (id) @function.call))
+(named_argument (id) @parameter)
 
 (ERROR) @error

From 3073b093d02875f9d42af5c522a5baa8c966289a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 17 Aug 2023 21:45:57 -0400
Subject: [PATCH 0628/2704] chore(csv,psv,tsv): update parser to fix numbers

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 596a9052f..c7efde6b5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
   },
   "csv": {
-    "revision": "1f584470170b708880b024142d901b05b2b2b602"
+    "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
   },
   "cuda": {
     "revision": "607851cc524d9f5b5a5cd31ad4044fd431cee54e"
@@ -417,7 +417,7 @@
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
   },
   "psv": {
-    "revision": "1f584470170b708880b024142d901b05b2b2b602"
+    "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
   },
   "pug": {
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
@@ -561,7 +561,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsv": {
-    "revision": "1f584470170b708880b024142d901b05b2b2b602"
+    "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
   },
   "tsx": {
     "revision": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"

From bbb92b2b8ea17cb477033b6d321dfad4bbde0c13 Mon Sep 17 00:00:00 2001
From: TheLeoP <53507599+TheLeoP@users.noreply.github.com>
Date: Thu, 17 Aug 2023 21:17:04 -0500
Subject: [PATCH 0629/2704] fix(lua): luap injection (#5275)

* fix(lua): luap injection

* test(lua): check for incorrect hlgroup of injected luap

* chore(lua): injections styling

* chore(lua): ignore luacheck for test.lua
---
 queries/lua/injections.scm          | 32 ++++++++++++++++++++++++-----
 tests/query/highlights/lua/test.lua |  5 +++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 8cc0605c8..a426ee1b9 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -39,30 +39,52 @@
   (#offset! @injection.content 0 1 0 0))
 
 ; string.match("123", "%d+")
+
 (function_call
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "match"))
-  arguments: (arguments (_) . (string content: _ @injection.content (#set! injection.language "luap"))))
+  arguments: (arguments
+               . (_)
+               .
+               (string
+                 content: (string_content) @injection.content
+                 (#set! injection.language "luap")
+                 (#set! injection.include-children))))
 
 (function_call
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "gmatch" "gsub"))
-  arguments: (arguments (_) (string content: _ @injection.content (#set! injection.language "luap"))))
+  arguments: (arguments
+               . (_)
+               .
+               (string
+                 content: (string_content) @injection.content
+                 (#set! injection.language "luap")
+                 (#set! injection.include-children))))
+
+;("123"):match("%d+")
 
-; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "match"))
-    arguments: (arguments . (string content: _ @injection.content (#set! injection.language "luap"))))
+  arguments: (arguments
+               . (string
+                   content: (string_content) @injection.content
+                   (#set! injection.language "luap")
+                   (#set! injection.include-children))))
 
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "gmatch" "gsub"))
-    arguments: (arguments (string content: _ @injection.content (#set! injection.language "luap"))))
+  arguments: (arguments
+               . (string
+                 content: (string_content) @injection.content
+                 (#set! injection.language "luap")
+                 (#set! injection.include-children))))
 
 (comment content: (_) @injection.content
   (#set! injection.language "comment"))
diff --git a/tests/query/highlights/lua/test.lua b/tests/query/highlights/lua/test.lua
index efb9a9994..e8725b9fe 100644
--- a/tests/query/highlights/lua/test.lua
+++ b/tests/query/highlights/lua/test.lua
@@ -1,3 +1,4 @@
+-- luacheck: ignore
 local a = { 1, 2, 3, 4, 5 }
 --          ^ number      ^ punctuation.bracket
 --    ^ variable
@@ -11,3 +12,7 @@ _ = next(a)
 
 next(a)
 -- ^ function.builtin
+
+-- Checking for incorrect hlgroup of injected luap
+string.match(s, "\0%d[^\n]+")
+--                       ^ !constant

From 5a476c7c27295c5f5434eccaf021e3d3edd783f7 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 18 Aug 2023 06:34:40 +0000
Subject: [PATCH 0630/2704] Update parsers: cuda, gpg, hlsl, java, javascript,
 php, scala, wing

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c7efde6b5..424cee99f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -81,7 +81,7 @@
     "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
   },
   "cuda": {
-    "revision": "607851cc524d9f5b5a5cd31ad4044fd431cee54e"
+    "revision": "f00c91430124797e798cbf28e09075d7d192938a"
   },
   "cue": {
     "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
@@ -201,7 +201,7 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "af97733568c8141090d8a79dfff66806c96c2cc0"
+    "revision": "c44ce76960114352dd00728b835ceef02e0506b8"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
@@ -231,7 +231,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "246354da450a9a6f27f04b67c673b2ed77abb4b7"
+    "revision": "45e60a69b4dac922d81474b5d6fa88b4e5387b21"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -261,10 +261,10 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "333cb0bd74a8de7ffd987a18e3421e41838031a1"
+    "revision": "0b3f9cfe10a973df0530533313fdbef6c2c92bfa"
   },
   "javascript": {
-    "revision": "f772967f7b7bc7c28f845be2420a38472b16a8ee"
+    "revision": "c69aabab53609d00e8e198ab902e4fde4b8e449f"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -387,7 +387,7 @@
     "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
   },
   "php": {
-    "revision": "d76de26b8218df208949f46b31e0c422020eda3a"
+    "revision": "ce2c73a8d84b5648e8792698dc9fd955e5f6a906"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
@@ -480,7 +480,7 @@
     "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
   },
   "scala": {
-    "revision": "f14629b4d53f72356ce8f6d4ac8c54d21b4e74dd"
+    "revision": "3a67773e205eb43c993cc5d43f633ddb79eb1653"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -612,7 +612,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "672baf4f0f73c918581ba6ca1e2e49f77f32fb3c"
+    "revision": "f30b02c4bf363b797de39ae63375a4f357718ae9"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 4613314b1f21b37694cf390ab3dc5262ba670798 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 18 Aug 2023 16:03:46 +0900
Subject: [PATCH 0631/2704] feat(java): add highlights to string interpolation

---
 queries/java/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 28c450059..9a953eee0 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -264,6 +264,8 @@
 (type_arguments [ "<" ">" ] @punctuation.bracket)
 (type_parameters [ "<" ">" ] @punctuation.bracket)
 
+(string_interpolation [ "\\{" "}" ] @punctuation.special)
+
 ; Exceptions
 
 [

From f8bc6c69d7b7e4169f65ed821478ed272c2ad1c9 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 15 Aug 2023 20:28:55 +0300
Subject: [PATCH 0632/2704] ci: add shebangs to scripts

---
 scripts/check-queries.lua           |  2 +-
 scripts/ci-install-macos-latest.sh  | 11 ++++++-----
 scripts/ci-install-ubuntu-latest.sh |  8 +++++---
 scripts/ci-install-windows-2022.sh  |  4 +++-
 scripts/update-readme.lua           |  2 +-
 scripts/write-lockfile.lua          |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 scripts/ci-install-macos-latest.sh
 mode change 100644 => 100755 scripts/ci-install-ubuntu-latest.sh
 mode change 100644 => 100755 scripts/ci-install-windows-2022.sh
 mode change 100644 => 100755 scripts/write-lockfile.lua

diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index c142084de..a84df85c4 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -1,4 +1,4 @@
--- Execute as `nvim --headless -c "luafile ./scripts/check-queries.lua"`
+#!/usr/bin/env -S nvim -l
 
 -- Equivalent to print(), but this will ensure consistent output regardless of
 -- operating system.
diff --git a/scripts/ci-install-macos-latest.sh b/scripts/ci-install-macos-latest.sh
old mode 100644
new mode 100755
index 9899f17e1..06bce74f7
--- a/scripts/ci-install-macos-latest.sh
+++ b/scripts/ci-install-macos-latest.sh
@@ -1,6 +1,7 @@
-curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-macos.tar.gz | tar -xz
-sudo ln -s $(pwd)/nvim-macos/bin/nvim /usr/local/bin
-rm -rf $(pwd)/nvim-macos/lib/nvim/parser
-mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
+#!/usr/bin/env bash
 
+curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-macos.tar.gz | tar -xz
+sudo ln -s "$PWD"/nvim-macos/bin/nvim /usr/local/bin
+rm -rf "$PWD"/nvim-macos/lib/nvim/parser
+mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
+ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/scripts/ci-install-ubuntu-latest.sh b/scripts/ci-install-ubuntu-latest.sh
old mode 100644
new mode 100755
index 5ab229e1d..60f260cc8
--- a/scripts/ci-install-ubuntu-latest.sh
+++ b/scripts/ci-install-ubuntu-latest.sh
@@ -1,6 +1,8 @@
+#!/usr/bin/env bash
+
 wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux64.tar.gz
 tar -zxf nvim-linux64.tar.gz
-sudo ln -s $(pwd)/nvim-linux64/bin/nvim /usr/local/bin
-rm -rf $(pwd)/nvim-linux64/lib/nvim/parser
+sudo ln -s "$PWD"/nvim-linux64/bin/nvim /usr/local/bin
+rm -rf "$PWD"/nvim-linux64/lib/nvim/parser
 mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
+ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/scripts/ci-install-windows-2022.sh b/scripts/ci-install-windows-2022.sh
old mode 100644
new mode 100755
index 6af5b0ce9..8d27ecc53
--- a/scripts/ci-install-windows-2022.sh
+++ b/scripts/ci-install-windows-2022.sh
@@ -1,5 +1,7 @@
+#!/usr/bin/env bash
+
 curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip
 unzip nvim-win64
 mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start
 mkdir -p ~/AppData/Local/nvim-data
-cp -r $(pwd) ~/AppData/Local/nvim/pack/nvim-treesitter/start
+cp -r "$PWD" ~/AppData/Local/nvim/pack/nvim-treesitter/start
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index d21628e2c..251a64af4 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -1,4 +1,4 @@
--- Execute as `nvim --headless -c "luafile ./scripts/update-readme.lua"`
+#!/usr/bin/env -S nvim -l
 
 ---@class Parser
 ---@field name string
diff --git a/scripts/write-lockfile.lua b/scripts/write-lockfile.lua
old mode 100644
new mode 100755
index b8833b91e..c1d5d6d8d
--- a/scripts/write-lockfile.lua
+++ b/scripts/write-lockfile.lua
@@ -1,4 +1,4 @@
--- Execute as `nvim --headless -c "luafile ./scripts/write-lockfile.lua"`
+#!/usr/bin/env -S nvim -l
 
 ---@type string|any[]
 local skip_langs = vim.fn.getenv "SKIP_LOCKFILE_UPDATE_FOR_LANGS"

From 1a4116aef1a8cde047b4cbe160ad18ebb00c134f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 15 Aug 2023 20:32:47 +0300
Subject: [PATCH 0633/2704] ci: update workflows

---
 .github/workflows/test-queries.yml    |  2 +-
 .github/workflows/update-lockfile.yml | 16 ++++++----------
 .github/workflows/update-readme.yml   | 14 +++++---------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 5c67d503a..5376c739c 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -84,4 +84,4 @@ jobs:
         run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser
 
       - name: Check query files
-        run: $NVIM --headless -c "luafile ./scripts/check-queries.lua" -c "q"
+        run: $NVIM -l scripts/check-queries.lua
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index a1b910e3b..e43a3ea59 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -18,29 +18,25 @@ jobs:
         env:
           NVIM_TAG: stable
         run: |
-          wget https://github.com/josephburnett/jd/releases/download/v1.6.1/jd-amd64-linux
-          mv ./jd-amd64-linux /tmp/jd
+          wget https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux
+          mv jd-amd64-linux /tmp/jd
           chmod +x /tmp/jd
-          sudo apt install libfuse2
-          wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage
-          chmod u+x nvim.appimage
-          mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-          ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
+          bash scripts/ci-install-${{ matrix.os }}.sh
 
       - name: Update parsers
         env:
           SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
         run: |
           cp lockfile.json /tmp/old_lockfile.json
-          ./nvim.appimage --headless -c "luafile ./scripts/write-lockfile.lua" -c "q"
+          nvim -l scripts/write-lockfile.lua
           # Pretty print
           cp lockfile.json /tmp/lockfile.json
           cat /tmp/lockfile.json | jq --sort-keys > lockfile.json
 
       - name: Commit changes
         run: |
-          git config user.name "GitHub"
-          git config user.email "noreply@github.com"
+          git config user.name 'GitHub'
+          git config user.email 'noreply@github.com'
           git add lockfile.json
           UPDATED_PARSERS=$(/tmp/jd -f merge /tmp/old_lockfile.json lockfile.json | jq -r 'keys | join(", ")')
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index c8673a6a0..7b2c80102 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -17,19 +17,15 @@ jobs:
         env:
           NVIM_TAG: stable
         run: |
-          sudo apt install libfuse2
-          wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage
-          chmod u+x nvim.appimage
-          mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-          ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start
+          bash ./scripts/ci-install-ubuntu-latest.sh
 
       - name: Check README
         run: |
-          git config user.email "actions@github"
-          git config user.name "Github Actions"
-          ./nvim.appimage --headless -c "luafile ./scripts/update-readme.lua" -c "q" || echo "Needs update"
+          git config user.email 'actions@github'
+          git config user.name 'Github Actions'
+          nvim -l scripts/update-readme.lua || echo 'Needs update'
           git add README.md
-          git commit -m "Update README" || echo 'No commit necessary!'
+          git commit -m 'Update README' || echo 'No commit necessary!'
           git clean -xf
 
       - name: Create Pull Request

From add1864bbf2d3b8e789ec6b4715bb5a4073e3b60 Mon Sep 17 00:00:00 2001
From: Gustavo Ordaz <ordazsgustavo@gmail.com>
Date: Sat, 12 Aug 2023 12:14:53 +0200
Subject: [PATCH 0634/2704] feat(swift): improve highlights

---
 queries/swift/highlights.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 4cdd882a8..b279d026f 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -17,6 +17,7 @@
   (property_modifier)
   (parameter_modifier)
   (inheritance_modifier)
+  (mutation_modifier)
 ] @type.qualifier
 
 (function_declaration (simple_identifier) @method)
@@ -59,6 +60,10 @@
 
 (class_body (property_declaration (pattern (simple_identifier) @property)))
 (protocol_property_declaration (pattern (simple_identifier) @property))
+(navigation_expression
+  (navigation_suffix (simple_identifier) @property))
+(value_argument
+  name: (simple_identifier) @property)
 
 (import_declaration ["import" @include])
 
@@ -69,6 +74,8 @@
 (call_expression ; foo.bar.baz(): highlight the baz()
   (navigation_expression
     (navigation_suffix (simple_identifier) @function.call)))
+(call_expression
+  (prefix_expression (simple_identifier) @function.call)) ; .foo()
 ((navigation_expression
    (simple_identifier) @type) ; SomeType.method(): highlight SomeType as a type
    (#lua-match? @type "^[A-Z]"))
@@ -148,7 +155,6 @@
  "try"
  "try?"
  "try!"
- "!"
  "+"
  "-"
  "*"
@@ -178,4 +184,5 @@
 
  "..<"
  "..."
+  (bang)
 ] @operator

From 8fa7ce35afe88b8294e6ced757aa14ec98414568 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 19 Aug 2023 10:34:23 +0300
Subject: [PATCH 0635/2704] chore: ignore ci artifacts

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6e01dc63c..0ac164cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ doc/tags
 .luacheckcache
 /tags
 nvim.appimage
+nvim-linux64*
+nvim-macos*
+nvim-win64*

From 34b2f7803bf4cad82b88955eda7fd4b75829abc9 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sun, 20 Aug 2023 10:07:41 +0300
Subject: [PATCH 0636/2704] ci: fix update lockfile workflow

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index e43a3ea59..a29189b48 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -21,7 +21,7 @@ jobs:
           wget https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux
           mv jd-amd64-linux /tmp/jd
           chmod +x /tmp/jd
-          bash scripts/ci-install-${{ matrix.os }}.sh
+          bash scripts/ci-install-ubuntu-latest.sh
 
       - name: Update parsers
         env:

From 43b2153d26da8308e3d58ac0db911111c7c35395 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 20 Aug 2023 07:13:46 +0000
Subject: [PATCH 0637/2704] Update parsers: arduino, bash, julia, rust, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 424cee99f..8afd8b33a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
   "arduino": {
-    "revision": "a2aa2b38301960822c5384cd10a07c2026e9d44e"
+    "revision": "db929fc6822b9b9e1211678d508f187894ce0345"
   },
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "8077be4c5504f2618f1280295bc4ae20a75988c1"
+    "revision": "c0f5797a728fc4ebd78a8b0e436b1494a8ab5f51"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -285,7 +285,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "ab0f70c0a919d38b41822305a8ca80e527c94e4f"
+    "revision": "bb7e587837fdeda74dd510256253d60f59a1e2cd"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -477,7 +477,7 @@
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
-    "revision": "0a70e15da977489d954c219af9b50b8a722630ee"
+    "revision": "afb6000a71fb9dff3f47f90d412ec080ae12bbb4"
   },
   "scala": {
     "revision": "3a67773e205eb43c993cc5d43f633ddb79eb1653"
@@ -612,7 +612,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f30b02c4bf363b797de39ae63375a4f357718ae9"
+    "revision": "72cbd819d5b49590b2921323d7f07051d38ffc1f"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From a185f8ebae9006b181e83f6569df68e7ff8aeb80 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 20 Aug 2023 04:33:33 -0400
Subject: [PATCH 0638/2704] feat: add strace

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/strace/highlights.scm   | 54 +++++++++++++++++++++++++++++++++
 queries/strace/injections.scm   |  2 ++
 5 files changed, 68 insertions(+)
 create mode 100644 queries/strace/highlights.scm
 create mode 100644 queries/strace/injections.scm

diff --git a/README.md b/README.md
index 263ed52d8..3c3f11751 100644
--- a/README.md
+++ b/README.md
@@ -345,6 +345,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
 - [x] [squirrel](https://github.com/amaanq/tree-sitter-squirrel) (maintained by @amaanq)
 - [x] [starlark](https://github.com/amaanq/tree-sitter-starlark) (maintained by @amaanq)
+- [x] [strace](https://github.com/sigmaSd/tree-sitter-strace) (maintained by @amaanq)
 - [x] [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) (maintained by @madskjeldgaard)
 - [x] [surface](https://github.com/connorlay/tree-sitter-surface) (maintained by @connorlay)
 - [x] [svelte](https://github.com/Himujjal/tree-sitter-svelte) (maintained by @elianiva)
diff --git a/lockfile.json b/lockfile.json
index 8afd8b33a..dc604baf2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -515,6 +515,9 @@
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
   },
+  "strace": {
+    "revision": "ef4a74c43565572db9c06596d99ccb0210db13e5"
+  },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fed9b402d..a4150c8eb 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1522,6 +1522,14 @@ list.starlark = {
   maintainers = { "@amaanq" },
 }
 
+list.strace = {
+  install_info = {
+    url = "https://github.com/sigmaSd/tree-sitter-strace",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.supercollider = {
   install_info = {
     url = "https://github.com/madskjeldgaard/tree-sitter-supercollider",
diff --git a/queries/strace/highlights.scm b/queries/strace/highlights.scm
new file mode 100644
index 000000000..fff706f01
--- /dev/null
+++ b/queries/strace/highlights.scm
@@ -0,0 +1,54 @@
+[
+  "killed"
+  "by"
+  "exited"
+  "with"
+  "<unfinished ...>"
+  "<..."
+  "resumed>"
+] @keyword
+
+[
+  (errorName)
+  (errorDescription)
+] @exception
+
+(syscall) @function.builtin
+
+; Literals
+
+(integer) @number
+
+(pointer) @number.special
+
+(value) @label
+
+(string) @string
+
+[
+  "="
+  "|"
+  "*"
+  "&&"
+  "=="
+] @operator
+
+; Punctuation
+
+[
+  "+++"
+  "---"
+  "..."
+  "~"
+] @punctuation.special
+
+[ "(" ")" "[" "]" ] @punctuation.bracket
+
+[
+  ","
+  "=>"
+] @punctuation.delimiter
+
+(comment) @comment
+
+(ERROR) @error
diff --git a/queries/strace/injections.scm b/queries/strace/injections.scm
new file mode 100644
index 000000000..2659fdc47
--- /dev/null
+++ b/queries/strace/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.language
+  (#set! @injection.language "comment"))

From 620b60b5ba1f9d99bf9a6b15dac6a4dad4612c68 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 21 Aug 2023 06:36:10 +0000
Subject: [PATCH 0639/2704] Update parsers: css, glsl, jsdoc, scala, sql, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dc604baf2..bc090b73d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -75,7 +75,7 @@
     "revision": "a90f170f92d5d70e7c2d4183c146e61ba5f3a457"
   },
   "css": {
-    "revision": "5f2c94b897601b4029fedcce7db4c6d76ce8a128"
+    "revision": "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"
   },
   "csv": {
     "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
@@ -183,7 +183,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "4780c2b689a5a5bd0ccfd78403510e9cf4a0f2fc"
+    "revision": "7491ce41c982ce74a54744ac21a2e4c360325fbb"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -270,7 +270,7 @@
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"
+    "revision": "d01984de49927c979b46ea5c01b78c8ddd79baf9"
   },
   "json": {
     "revision": "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f"
@@ -480,7 +480,7 @@
     "revision": "afb6000a71fb9dff3f47f90d412ec080ae12bbb4"
   },
   "scala": {
-    "revision": "3a67773e205eb43c993cc5d43f633ddb79eb1653"
+    "revision": "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -507,7 +507,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "3dfa1b1fafac51e3ffc39064eafb26b5111861a2"
+    "revision": "6fa716163fcf183e4938c75f427379ceba881fbe"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -615,7 +615,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "72cbd819d5b49590b2921323d7f07051d38ffc1f"
+    "revision": "19ef86cd590e7d531b0c843c08456ec81ac1bc9e"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 7c935d6bd5ecb36e7c6cf6678e1eaa38b85111f3 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 21 Aug 2023 04:29:38 -0400
Subject: [PATCH 0640/2704] feat: add Forth

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/forth/folds.scm         |  1 +
 queries/forth/highlights.scm    | 21 +++++++++++++++++++++
 queries/forth/indents.scm       |  3 +++
 queries/forth/injections.scm    |  2 ++
 queries/forth/locals.scm        |  3 +++
 8 files changed, 42 insertions(+)
 create mode 100644 queries/forth/folds.scm
 create mode 100644 queries/forth/highlights.scm
 create mode 100644 queries/forth/indents.scm
 create mode 100644 queries/forth/injections.scm
 create mode 100644 queries/forth/locals.scm

diff --git a/README.md b/README.md
index 3c3f11751..c701aeed7 100644
--- a/README.md
+++ b/README.md
@@ -222,6 +222,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [firrtl](https://github.com/amaanq/tree-sitter-firrtl) (maintained by @amaanq)
 - [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
 - [x] [foam](https://github.com/FoamScience/tree-sitter-foam) (experimental, maintained by @FoamScience)
+- [x] [forth](https://github.com/AlexanderBrevig/tree-sitter-forth) (maintained by @amaanq)
 - [x] [fortran](https://github.com/stadelmanma/tree-sitter-fortran) (maintained by @amaanq)
 - [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index bc090b73d..8743a10eb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -146,6 +146,9 @@
   "foam": {
     "revision": "09e03445f49290450589c5d293610ab39434e3e4"
   },
+  "forth": {
+    "revision": "304ed77beb113e37af38b20ff14e3c37bf350d10"
+  },
   "fortran": {
     "revision": "6828cf3629addb1706bdbbd33491e95f12b7042c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a4150c8eb..bd956ea9d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -487,6 +487,14 @@ list.foam = {
   experimental = true,
 }
 
+list.forth = {
+  install_info = {
+    url = "https://github.com/AlexanderBrevig/tree-sitter-forth",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.fortran = {
   install_info = {
     url = "https://github.com/stadelmanma/tree-sitter-fortran",
diff --git a/queries/forth/folds.scm b/queries/forth/folds.scm
new file mode 100644
index 000000000..443abb30d
--- /dev/null
+++ b/queries/forth/folds.scm
@@ -0,0 +1 @@
+(word_definition) @fold
diff --git a/queries/forth/highlights.scm b/queries/forth/highlights.scm
new file mode 100644
index 000000000..e8c53e9ce
--- /dev/null
+++ b/queries/forth/highlights.scm
@@ -0,0 +1,21 @@
+(core) @function
+
+(operator) @operator
+
+(word) @variable
+
+((word) @constant
+  (#lua-match? @constant "^[A-Z_]+$"))
+
+(number) @number
+
+(string) @string
+
+[
+  (start_definition)
+  (end_definition)
+] @punctuation.delimiter
+
+(comment) @comment
+
+(ERROR) @error
diff --git a/queries/forth/indents.scm b/queries/forth/indents.scm
new file mode 100644
index 000000000..067755433
--- /dev/null
+++ b/queries/forth/indents.scm
@@ -0,0 +1,3 @@
+(word_definition) @indent.begin
+
+(end_definition) @indent.end @indent.branch
diff --git a/queries/forth/injections.scm b/queries/forth/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/forth/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/forth/locals.scm b/queries/forth/locals.scm
new file mode 100644
index 000000000..3a5e191d2
--- /dev/null
+++ b/queries/forth/locals.scm
@@ -0,0 +1,3 @@
+(word) @reference
+
+(word_definition) @scope

From 46dee161d3934433b9f47f0459899427103a3477 Mon Sep 17 00:00:00 2001
From: Damir Vandic <info@dvic.io>
Date: Mon, 21 Aug 2023 23:22:34 +0200
Subject: [PATCH 0641/2704] fix: HEEx partial expression injections

Fixes #5296
---
 queries/heex/injections.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/heex/injections.scm b/queries/heex/injections.scm
index 403697acb..d8ae03caa 100644
--- a/queries/heex/injections.scm
+++ b/queries/heex/injections.scm
@@ -6,7 +6,10 @@
 ;       <p>hello, tree-sitter!</p>
 ;     <% end %>
 (directive
-  (partial_expression_value) @injection.content
+  [
+    (partial_expression_value)
+    (ending_expression_value)
+  ] @injection.content
   (#set! injection.language "elixir")
   (#set! injection.include-children)
   (#set! injection.combined))

From 2ee71c1a2fa74c10692be10ae420ff0c3a02eb3c Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Tue, 22 Aug 2023 09:53:11 +0900
Subject: [PATCH 0642/2704] fix(lua): use include-children instead (#5299)

The root issue is fixed with neovim 0.9.2. But the current stable
version is neovim 0.9.1, so partially reverts the commit to make it
compatible with the current stable version.
---
 queries/lua/injections.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index a426ee1b9..85c677665 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -33,10 +33,11 @@
  (#lua-match? @injection.content "^%s*;+%s?query")
  (#set! injection.language "query"))
 
-(comment content: (_) @injection.content
-  (#lua-match? @injection.content "^[-][%s]*@")
+((comment) @injection.content
+  (#lua-match? @injection.content "^[-][-][-][%s]*@")
   (#set! injection.language "luadoc")
-  (#offset! @injection.content 0 1 0 0))
+  (#set! injection.include-children)
+  (#offset! @injection.content 0 3 0 0))
 
 ; string.match("123", "%d+")
 
@@ -86,5 +87,6 @@
                  (#set! injection.language "luap")
                  (#set! injection.include-children))))
 
-(comment content: (_) @injection.content
-  (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment")
+  (#set! injection.include-children))

From ceaea55e0ce5c62368af823d37afde1c067324ef Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 22 Aug 2023 06:35:15 +0000
Subject: [PATCH 0643/2704] Update parsers: bash, forth, hurl, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8743a10eb..70c05d474 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "c0f5797a728fc4ebd78a8b0e436b1494a8ab5f51"
+    "revision": "81d8b921e715e53963be44afeeaeb6b28f5a2bfb"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -147,7 +147,7 @@
     "revision": "09e03445f49290450589c5d293610ab39434e3e4"
   },
   "forth": {
-    "revision": "304ed77beb113e37af38b20ff14e3c37bf350d10"
+    "revision": "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"
   },
   "fortran": {
     "revision": "6828cf3629addb1706bdbbd33491e95f12b7042c"
@@ -252,7 +252,7 @@
     "revision": "6824a247d1326079aab4fa9f9164e9319678081d"
   },
   "hurl": {
-    "revision": "0eca909c8338364992e04c4862ac6afc5342cbb8"
+    "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
   },
   "ini": {
     "revision": "7f11a02fb8891482068e0fe419965d7bade81a68"
@@ -618,7 +618,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "19ef86cd590e7d531b0c843c08456ec81ac1bc9e"
+    "revision": "ba6730eeab258d5d027dd737ddd5339dde9c358e"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 9ea7559ea99701c900b08c1f977eca6ca57eadd2 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 23 Aug 2023 06:34:38 +0000
Subject: [PATCH 0644/2704] Update parsers: ada, bash, java, matlab, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 70c05d474..49d3b8a20 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "ba7951a8f3fb08f9ea923625153e7670c89f30b4"
+    "revision": "f67bc6622a9b9bc879b2808164abdbaf99d65d4a"
   },
   "agda": {
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "81d8b921e715e53963be44afeeaeb6b28f5a2bfb"
+    "revision": "f6eacf39e5a4f2c05e70ce2ab861700a1e979227"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -264,7 +264,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "0b3f9cfe10a973df0530533313fdbef6c2c92bfa"
+    "revision": "2a156343a9e8521c1ff73ef0982cf13c51a905eb"
   },
   "javascript": {
     "revision": "c69aabab53609d00e8e198ab902e4fde4b8e449f"
@@ -333,7 +333,7 @@
     "revision": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"
   },
   "matlab": {
-    "revision": "c8723b33970deda54257e640779714fb181d4d5f"
+    "revision": "6071891a8c39600203eba20513666cf93b4d650a"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -618,7 +618,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "ba6730eeab258d5d027dd737ddd5339dde9c358e"
+    "revision": "5f56442a8f1c1b41371c7033e6dc50addab78ba5"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 05fe2c38a3bd4f889ac13f1735685ab348d95346 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 23 Aug 2023 14:09:30 +0300
Subject: [PATCH 0645/2704] refactor: replace some match & vim-match usages

---
 queries/clojure/highlights.scm | 6 +++---
 queries/dhall/highlights.scm   | 2 +-
 queries/glsl/highlights.scm    | 6 ++----
 queries/latex/highlights.scm   | 6 +++---
 queries/query/injections.scm   | 4 ++--
 queries/ruby/highlights.scm    | 6 +++---
 queries/tlaplus/locals.scm     | 3 +--
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index d6b1585fd..08ca49b86 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -101,9 +101,9 @@
 
 ; Interop
 ((sym_lit) @method
- (#match? @method "^\\.[^-]"))
+ (#lua-match? @method "^[.][^-]"))
 ((sym_lit) @field
- (#match? @field "^\\.-"))
+ (#lua-match? @field "^[.]-"))
 ((sym_lit) @field
  (#lua-match? @field "^[%u].*/.+"))
 (list_lit
@@ -133,7 +133,7 @@
  (#any-of? @keyword.coroutine
   "alts!" "alts!!" "await" "await-for" "await1" "chan" "close!" "future" "go" "sync" "thread" "timeout" "<!" "<!!" ">!" ">!!"))
 ((sym_lit) @keyword.function
- (#match? @keyword.function "^(defn|defn-|fn|fn[*])$"))
+ (#any-of? @keyword.function "defn" "defn-" "fn" "fn*"))
 
 ; Comment
 ((sym_lit) @comment
diff --git a/queries/dhall/highlights.scm b/queries/dhall/highlights.scm
index f0c454cf1..cd068efd0 100644
--- a/queries/dhall/highlights.scm
+++ b/queries/dhall/highlights.scm
@@ -25,7 +25,7 @@
 ((primitive_expression
   (identifier (label) @type)
   (selector (label) @type)) @variable
-  (#vim-match? @variable "^[A-Z][^.]*$"))
+  (#lua-match? @variable "^[A-Z][^.]*$"))
 
 ;; Parameters
 
diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index 4e5e57f47..b23ad797b 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -31,7 +31,5 @@
 
 (extension_storage_class) @storageclass
 
-(
-  (identifier) @variable.builtin
-  (#match? @variable.builtin "^gl_")
-)
+((identifier) @variable.builtin
+ (#lua-match? @variable.builtin "^gl_"))
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 5d68cdfb0..66cd8b6f3 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -193,18 +193,18 @@
 ((generic_command
   command: (command_name) @_name
   arg: (curly_group (_) @text.emphasis))
-  (#match? @_name "^(\\\\textit|\\\\mathit)$"))
+ (#any-of? @_name "\\textit" "\\mathit"))
 
 ((generic_command
   command: (command_name) @_name
   arg: (curly_group (_) @text.strong))
-  (#match? @_name "^(\\\\textbf|\\\\mathbf)$"))
+ (#any-of? @_name "\\textbf" "\\mathbf"))
 
 ((generic_command
   command: (command_name) @_name
   .
   arg: (curly_group (_) @text.uri))
- (#match? @_name "^(\\\\url|\\\\href)$"))
+ (#any-of? @_name "\\url" "\\href"))
 
 ;; File inclusion commands
 (class_include
diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index 8761ec494..150919ec0 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -1,14 +1,14 @@
 ((predicate 
   name: (identifier) @_name
   parameters: (parameters (string) @injection.content))
- (#match? @_name "^#?(not-)?(match|vim-match)$")
+ (#any-of? @_name "match" "not-match" "vim-match" "not-vim-match")
  (#set! injection.language "regex")
  (#offset! @injection.content 0 1 0 -1))
 
 ((predicate
   name: (identifier) @_name
   parameters: (parameters (string) @injection.content))
- (#match? @_name "^#?(not-)?lua-match$")
+ (#any-of? @_name "lua-match" "not-lua-match")
  (#set! injection.language "luap")
  (#offset! @injection.content 0 1 0 -1))
 
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 192fd6f9a..3479ad80d 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -60,7 +60,7 @@
  "next"
  ] @repeat
 
-(constant) @type
+(constant) @constant
 
 ((identifier) @type.qualifier
  (#any-of? @type.qualifier "private" "protected" "public"))
@@ -116,10 +116,10 @@
  ] @label
 
 ((identifier) @constant.builtin
- (#vim-match? @constant.builtin "^__(callee|dir|id|method|send|ENCODING|FILE|LINE)__$"))
+ (#match? @constant.builtin "^__(callee|dir|id|method|send|ENCODING|FILE|LINE)__$"))
 
 ((constant) @type
- (#vim-match? @type "^[A-Z\\d_]+$"))
+ (#not-lua-match? @type "^[A-Z0-9_]+$"))
 
 [
  (self)
diff --git a/queries/tlaplus/locals.scm b/queries/tlaplus/locals.scm
index 9a05eb7b7..81f774b27 100644
--- a/queries/tlaplus/locals.scm
+++ b/queries/tlaplus/locals.scm
@@ -75,8 +75,7 @@
     (_ (_ (_ (_ (identifier_ref) @definition.var))))
     (_ (_ (_ (_ (_ (identifier_ref) @definition.var)))))
   ]
-  (#vim-match? @definition.var "^(self|pc|stack)$")
-)
+  (#any-of? @definition.var "self" "pc" "stack"))
 
 ; References
 (identifier_ref) @reference

From c58694685d0a4387ea10aeac1932c6afc55bcf3e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 22 Aug 2023 02:10:29 -0400
Subject: [PATCH 0646/2704] feat: add re2c

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/c/injections.scm        |   4 +
 queries/go/injections.scm       |  10 +-
 queries/re2c/folds.scm          |   4 +
 queries/re2c/highlights.scm     | 190 ++++++++++++++++++++++++++++++++
 queries/re2c/indents.scm        |  11 ++
 queries/re2c/injections.scm     |  12 ++
 queries/re2c/locals.scm         |   1 +
 queries/rust/injections.scm     |   4 +
 11 files changed, 245 insertions(+), 3 deletions(-)
 create mode 100644 queries/re2c/folds.scm
 create mode 100644 queries/re2c/highlights.scm
 create mode 100644 queries/re2c/indents.scm
 create mode 100644 queries/re2c/injections.scm
 create mode 100644 queries/re2c/locals.scm

diff --git a/README.md b/README.md
index c701aeed7..0001645b1 100644
--- a/README.md
+++ b/README.md
@@ -325,6 +325,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
+- [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
 - [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index 49d3b8a20..6144680e2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -455,6 +455,9 @@
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
+  "re2c": {
+    "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
+  },
   "regex": {
     "revision": "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index bd956ea9d..0f0d7b90a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1357,6 +1357,14 @@ list.rasi = {
   maintainers = { "@Fymyte" },
 }
 
+list.re2c = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-re2c",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.regex = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-regex",
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 933903ebb..f67cd22c6 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -4,6 +4,10 @@
 ((comment) @injection.content
  (#set! injection.language "comment"))
 
+((comment) @injection.content
+  (#match? @injection.content "/\*!([a-zA-Z]+:)?re2c")
+  (#set! injection.language "re2c"))
+
 ; TODO: add when asm is added
 ; (gnu_asm_expression assembly_code: (string_literal) @injection.content
 ; (#set! injection.language "asm"))
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 68aa552cd..d44c9897c 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -1,4 +1,4 @@
-((comment) @injection.content 
+((comment) @injection.content
  (#set! injection.language "comment"))
 
 (call_expression
@@ -11,10 +11,14 @@
                                     "regexp.MustCompile"
                                     "regexp.MustCompilePOSIX")
   (argument_list
-    . 
+    .
     [
-     (raw_string_literal) 
+     (raw_string_literal)
      (interpreted_string_literal)
     ] @injection.content
     (#offset! @injection.content 0 1 0 -1)
     (#set! injection.language "regex")))
+
+((comment) @injection.content
+  (#match? @injection.content "/\*!([a-zA-Z]+:)?re2c")
+  (#set! injection.language "re2c"))
diff --git a/queries/re2c/folds.scm b/queries/re2c/folds.scm
new file mode 100644
index 000000000..b4cf5f24e
--- /dev/null
+++ b/queries/re2c/folds.scm
@@ -0,0 +1,4 @@
+[
+  (body)
+  (action)
+] @fold
diff --git a/queries/re2c/highlights.scm b/queries/re2c/highlights.scm
new file mode 100644
index 000000000..6d3a27f5a
--- /dev/null
+++ b/queries/re2c/highlights.scm
@@ -0,0 +1,190 @@
+; Namespaces
+
+[
+  "re2c"
+  "re2c"
+  "local"
+  "rules"
+] @namespace
+
+; Includes
+
+[
+  "!use"
+  "!include"
+] @include
+
+; Keywords
+
+[
+  "flags"
+  "define"
+  "cond"
+  "label"
+  "variable"
+  "yych"
+  "state"
+  "yybm"
+  "cgoto"
+  "api"
+  "tags"
+  "indent"
+  "yyfill"
+  "eof"
+  "sentinel"
+  "condprefix"
+  "condenumprefix"
+  "labelprefix"
+  "startlabel"
+  "posix-captures"
+  "max"
+  "maxnmatch"
+  "mtags"
+  "stags"
+  "header"
+  "getstate"
+] @keyword
+
+[
+  "*"
+  "+"
+  "?"
+] @repeat
+
+; Constants
+
+[
+  "ignore"
+  "substitute"
+  "fail"
+  "default"
+  "custom"
+  "match-empty"
+  "match-none"
+  "error"
+  "functions"
+  "free-form"
+  "format"
+  "separator"
+] @constant.builtin
+
+(linedir) @constant.macro
+
+; Operators
+
+[
+  "="
+  "=>"
+  ":=>"
+  "/"
+  "|"
+  "\\"
+  "->"
+  "^"
+] @operator
+
+[
+  "."
+  (default)
+  (end_of_input)
+] @constant.macro
+
+(field_expression
+  "." @operator)
+
+(condition
+  (any) @constant.macro)
+
+
+; Names
+
+(name) @type
+
+(block_name) @constant
+
+(label) @label
+
+(option_name) @constant.builtin
+
+((option_name) @constant.macro
+ (#match? @constant.macro "^YY"))
+
+(field_expression
+  argument: (identifier) @variable)
+
+(field_identifier) @property
+
+; Literals
+
+(regex) @string.regex
+
+[
+  (dstring) ; case   sensitive
+  (sstring) ; case insensitive
+] @string
+
+[
+  (quote)
+  (ctrl_code)
+  (code_unit)
+] @string.escape
+
+(number) @number
+
+[
+  "on"
+  "off"
+] @boolean
+
+[
+  (stag)
+  (mtag)
+] @property
+
+; Configurations
+
+(define
+  option: (option_name) @_yy
+  value: (dstring) @type
+  (#eq? @_yy "YYCTYPE")
+  (#offset! @type 0 1 0 -1))
+
+(set_header
+  value: (dstring) @string.special @text.underline)
+
+(host_lang) @none
+
+; Punctuation
+
+[
+  ":"
+  ";"
+  ","
+  "-"
+] @punctuation.delimiter
+
+[
+  "{" "}"
+  "[" "]"
+  "(" ")"
+  "<" ">"
+] @punctuation.bracket
+
+(repetition
+  (limits
+    ["{" "}"] @punctuation.bracket))
+
+[
+  "!"
+  "@"
+  "#"
+] @punctuation.special
+
+; Comments and error
+
+[
+  (comment)
+  (ignore_block)
+] @comment @spell
+
+(ERROR) @error
diff --git a/queries/re2c/indents.scm b/queries/re2c/indents.scm
new file mode 100644
index 000000000..72539143a
--- /dev/null
+++ b/queries/re2c/indents.scm
@@ -0,0 +1,11 @@
+[
+ (re2c)
+ (action)
+] @indent.begin
+
+"}" @indent.branch @indent.end
+
+[
+ (comment)
+ (linedir)
+] @indent.ignore
diff --git a/queries/re2c/injections.scm b/queries/re2c/injections.scm
new file mode 100644
index 000000000..e5e40a09d
--- /dev/null
+++ b/queries/re2c/injections.scm
@@ -0,0 +1,12 @@
+((host_lang) @injection.content
+  (#set! injection.parent))
+
+((define
+   option: (option_name) @_yy
+   value: (dstring) @injection.content)
+  (#any-of? @_yy "YYPEEK" "YYSKIP" "YYBACKUP" "YYBACKUPCTX" "YYRESTORE" "YYRESTORECTX" "YYFILL" "YYSHIFT")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.parent))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/re2c/locals.scm b/queries/re2c/locals.scm
new file mode 100644
index 000000000..0a77995d5
--- /dev/null
+++ b/queries/re2c/locals.scm
@@ -0,0 +1 @@
+(body) @scope
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index 5dead8564..a8dff4ca5 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -37,3 +37,7 @@
   arguments: (arguments
     (raw_string_literal) @injection.content)
     (#set! injection.language "regex"))
+
+((block_comment) @injection.content
+  (#match? @injection.content "/\*!([a-zA-Z]+:)?re2c")
+  (#set! injection.language "re2c"))

From 8ecf630b8e9cfa1ff7859d5a112839ded786656a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 24 Aug 2023 03:05:20 -0400
Subject: [PATCH 0647/2704] fix(dart): update queries from upstream

---
 queries/dart/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 372a6389c..108f41c15 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -18,8 +18,6 @@
 ; --------------------
 (annotation
   name: (identifier) @attribute)
-(marker_annotation
-  name: (identifier) @attribute)
 
 ; Operators and Tokens
 ; --------------------

From 99eef501a3d9128c15440296850b5bb178d6d560 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 24 Aug 2023 06:35:52 +0000
Subject: [PATCH 0648/2704] Update parsers: bash, dart, heex, java, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6144680e2..823744da2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "f6eacf39e5a4f2c05e70ce2ab861700a1e979227"
+    "revision": "42ab5ca0e6bb7130c397c7ca10440fd5cfc2d564"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -90,7 +90,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "e398400a0b785af3cf571f5a57eccab242f0cdf9"
+    "revision": "bcef6d57d0dd4df37bc9d8b1920ea4963c724826"
   },
   "devicetree": {
     "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
@@ -228,7 +228,7 @@
     "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
   },
   "heex": {
-    "revision": "9bf4ae444a8779839ecbca3b6b896dee426b10ae"
+    "revision": "4a36c9a388505180da6ee0eda1d8afb8c83481c8"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -264,7 +264,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "2a156343a9e8521c1ff73ef0982cf13c51a905eb"
+    "revision": "38be6eccc1b86d6ec5dca0976659e807fd4dc28d"
   },
   "javascript": {
     "revision": "c69aabab53609d00e8e198ab902e4fde4b8e449f"
@@ -621,7 +621,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "5f56442a8f1c1b41371c7033e6dc50addab78ba5"
+    "revision": "2cd49595d46c6808622e654c7a92214e003de561"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 1ff7985a74ac42142e55e561dcbff0e881b157f2 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 23 Aug 2023 13:02:30 +0300
Subject: [PATCH 0649/2704] feat(bash): improve highlights

---
 lockfile.json                                |  2 +-
 queries/bash/highlights.scm                  | 82 +++++++++++---------
 tests/query/highlights/bash/double-parens.sh |  4 +-
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 823744da2..d6be40756 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "42ab5ca0e6bb7130c397c7ca10440fd5cfc2d564"
+    "revision": "aaae047b927bcbd04ddbb07b32b555831c482c1a"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 063c2b920..dbe6f6883 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -1,36 +1,21 @@
-(simple_expansion) @none
-(expansion
-  "${" @punctuation.special
-  "}" @punctuation.special) @none
 [
- "("
- ")"
- "(("
- "))"
- "{"
- "}"
- "["
- "]"
- "[["
- "]]"
- ] @punctuation.bracket
+ "(" ")"
+ "{" "}"
+ "[" "]"
+ "[[" "]]"
+] @punctuation.bracket
 
 [
  ";"
  ";;"
- (heredoc_start)
- ] @punctuation.delimiter
-
-[
- "$"
-] @punctuation.special
+ "&"
+] @punctuation.delimiter
 
 [
  ">"
  ">>"
  "<"
  "<<"
- "&"
  "&&"
  "|"
  "||"
@@ -38,7 +23,7 @@
  "=~"
  "=="
  "!="
- ] @operator
+] @operator
 
 ; Do *not* spell check strings since they typically have some sort of
 ; interpolation in them, or, are typically used for things like filenames, URLs,
@@ -48,8 +33,14 @@
  (raw_string)
  (ansi_c_string)
  (heredoc_body)
+ (simple_heredoc_body)
 ] @string
 
+[
+ (heredoc_start)
+ (heredoc_end)
+] @label
+
 (variable_assignment (word) @string)
 
 [
@@ -61,7 +52,7 @@
  "case"
  "in"
  "esac"
- ] @conditional
+] @conditional
 
 [
  "for"
@@ -70,7 +61,7 @@
  "select"
  "until"
  "while"
- ] @repeat
+] @repeat
 
 [
  "declare"
@@ -78,7 +69,7 @@
  "local"
  "readonly"
  "unset"
- ] @keyword
+] @keyword
 
 "function" @keyword.function
 
@@ -89,17 +80,26 @@
  (#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
-  (#any-of? @boolean "true" "false"))
+ (#any-of? @boolean "true" "false"))
 
 (comment) @comment @spell
-(test_operator) @string
 
-(command_substitution
-  [ "$(" ")" ] @punctuation.bracket)
+(test_operator) @operator
 
-(process_substitution
-  [ "<(" ")" ] @punctuation.bracket)
+(command_substitution "$(" @punctuation.bracket)
+(process_substitution "<(" @punctuation.bracket)
 
+(arithmetic_expansion
+  [ "$((" "((" ] @punctuation.special
+  "))" @punctuation.special)
+
+(arithmetic_expansion "," @punctuation.delimiter)
+
+(ternary_expression [ "?" ":" ] @conditional.ternary)
+
+(binary_expression operator: _ @operator)
+(unary_expression operator: _ @operator)
+(postfix_expression operator: _ @operator)
 
 (function_definition
   name: (word) @function)
@@ -124,15 +124,27 @@
              (concatenation (word) @parameter)
              ])
 
+(number) @number
 ((word) @number
-  (#lua-match? @number "^[0-9]+$"))
+ (#lua-match? @number "^[0-9]+$"))
 
 (file_redirect
   descriptor: (file_descriptor) @operator
   destination: (word) @parameter)
 
+(simple_expansion
+  "$" @punctuation.special) @none
 (expansion
-  [ "${" "}" ] @punctuation.bracket)
+  "${" @punctuation.special
+  "}" @punctuation.special) @none
+
+(expansion operator: _ @punctuation.special)
+(expansion "@" . operator: _ @character.special)
+
+((expansion
+  (subscript
+    index: (word) @character.special))
+ (#any-of? @character.special "@" "*"))
 
 (variable_name) @variable
 
@@ -145,4 +157,4 @@
 (regex) @string.regex
 
 ((program . (comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+ (#lua-match? @preproc "^#!/"))
diff --git a/tests/query/highlights/bash/double-parens.sh b/tests/query/highlights/bash/double-parens.sh
index 7ba35873e..1f7aee4e4 100644
--- a/tests/query/highlights/bash/double-parens.sh
+++ b/tests/query/highlights/bash/double-parens.sh
@@ -1,6 +1,6 @@
 if (( $(tree-sitter parse test/Petalisp/**/*.lisp -q | wc -l) > 2 )); then
-#  ^ punctuation.bracket
-#                                                                  ^ punctuation.bracket
+#  ^ punctuation.special
+#                                                                  ^ punctuation.special
 #                                                           ^ punctuation.bracket
    exit 1 
 fi

From 103ecdf7585f90cad16659fb5dd957b6fdfda864 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 23 Aug 2023 13:02:41 +0300
Subject: [PATCH 0650/2704] fix(bash): fix injections

---
 queries/bash/injections.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index a6f330f3d..2702ff6bd 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -1,11 +1,13 @@
 ((comment) @injection.content 
  (#set! injection.language "comment"))
 
-((regex) @injection.content 
+((regex) @injection.content
+ (#set! injection.language "regex"))
 
-((redirected_statement
-   (heredoc_redirect
-     (heredoc_start) @injection.language))
- (heredoc_body) @injection.content
- (#offset! @injection.content 0 0 -1 0)
- (#downcase! @injection.language))(#set! injection.language "regex"))
+((heredoc_redirect
+  [
+    (heredoc_body)
+    (simple_heredoc_body)
+  ] @injection.content
+  (heredoc_end) @injection.language)
+ (#downcase! @injection.language))

From 31f608e47b838594d32a7bc42028e2cefd0ddaad Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Thu, 24 Aug 2023 00:09:48 +0300
Subject: [PATCH 0651/2704] feat(bash): fold heredocs

---
 queries/bash/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/bash/folds.scm b/queries/bash/folds.scm
index 851c67eed..766dbe598 100644
--- a/queries/bash/folds.scm
+++ b/queries/bash/folds.scm
@@ -5,4 +5,5 @@
   (for_statement)
   (while_statement)
   (c_style_for_statement)
+  (heredoc_redirect)
 ] @fold

From ed2c6da5a0959d5c0462ef64ac08d3faa4e92861 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 24 Aug 2023 17:12:10 -0400
Subject: [PATCH 0652/2704] feat(bash): add missing highlights

---
 queries/bash/highlights.scm | 39 ++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index dbe6f6883..8cc84194c 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -3,11 +3,14 @@
  "{" "}"
  "[" "]"
  "[[" "]]"
+ "((" "))"
 ] @punctuation.bracket
 
 [
  ";"
  ";;"
+ ";&"
+ ";;&"
  "&"
 ] @punctuation.delimiter
 
@@ -18,11 +21,24 @@
  "<<"
  "&&"
  "|"
+ "|&"
  "||"
  "="
+ "+="
  "=~"
  "=="
  "!="
+
+ "&>"
+ "&>>"
+ "<&"
+ ">&"
+ ">|"
+
+ "<<-"
+ "<<<"
+
+ ".."
 ] @operator
 
 ; Do *not* spell check strings since they typically have some sort of
@@ -42,6 +58,7 @@
 ] @label
 
 (variable_assignment (word) @string)
+(command argument: "$" @string) ; bare dollar
 
 [
  "if"
@@ -64,11 +81,13 @@
 ] @repeat
 
 [
- "declare"
- "export"
- "local"
- "readonly"
- "unset"
+  "declare"
+  "typeset"
+  "export"
+  "readonly"
+  "local"
+  "unset"
+  "unsetenv"
 ] @keyword
 
 "function" @keyword.function
@@ -129,9 +148,10 @@
  (#lua-match? @number "^[0-9]+$"))
 
 (file_redirect
-  descriptor: (file_descriptor) @operator
   destination: (word) @parameter)
 
+(file_descriptor) @operator
+
 (simple_expansion
   "$" @punctuation.special) @none
 (expansion
@@ -146,6 +166,8 @@
     index: (word) @character.special))
  (#any-of? @character.special "@" "*"))
 
+"``" @punctuation.special
+
 (variable_name) @variable
 
 ((variable_name) @constant
@@ -154,7 +176,10 @@
 (case_item
   value: (word) @parameter)
 
-(regex) @string.regex
+[
+  (regex)
+  (extglob_pattern)
+] @string.regex
 
 ((program . (comment) @preproc)
  (#lua-match? @preproc "^#!/"))

From 33958915fe03d5f1c37b80cd29fea1a269f563b8 Mon Sep 17 00:00:00 2001
From: Matthias Q <35303817+matthias-Q@users.noreply.github.com>
Date: Fri, 25 Aug 2023 02:23:38 +0200
Subject: [PATCH 0653/2704] highlights(sql): add t-sql specific data types
 (#5311)

---
 queries/sql/highlights.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 04d76ead5..d5c2c64f0 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -297,6 +297,8 @@
   (keyword_null)
   (keyword_boolean)
   (keyword_binary)
+  (keyword_varbinary)
+  (keyword_image)
   (keyword_bit)
   (keyword_inet)
   (keyword_character)
@@ -314,8 +316,11 @@
   (keyword_real)
   (double)
   (keyword_money)
+  (keyword_smallmoney)
   (keyword_char)
+  (keyword_nchar)
   (keyword_varchar)
+  (keyword_nvarchar)
   (keyword_varying)
   (keyword_text)
   (keyword_string)
@@ -327,6 +332,10 @@
   (keyword_enum)
   (keyword_date)
   (keyword_datetime)
+  (keyword_time)
+  (keyword_datetime2)
+  (keyword_datetimeoffset)
+  (keyword_smalldatetime)
   (keyword_timestamp)
   (keyword_timestamptz)
   (keyword_geometry)

From bae2c1824fb9297b044fbb58fc3b81ba79ed8b75 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 25 Aug 2023 06:35:55 +0000
Subject: [PATCH 0654/2704] Update parsers: bash, javascript, rust, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d6be40756..cf5cbb51e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "aaae047b927bcbd04ddbb07b32b555831c482c1a"
+    "revision": "8e286e7673e3fa7ad94ab3159c2b83395d302af4"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -267,7 +267,7 @@
     "revision": "38be6eccc1b86d6ec5dca0976659e807fd4dc28d"
   },
   "javascript": {
-    "revision": "c69aabab53609d00e8e198ab902e4fde4b8e449f"
+    "revision": "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -483,7 +483,7 @@
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
-    "revision": "afb6000a71fb9dff3f47f90d412ec080ae12bbb4"
+    "revision": "39eaeb41e17572c17e35bb050d6bf2da17568dbf"
   },
   "scala": {
     "revision": "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a"
@@ -621,7 +621,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2cd49595d46c6808622e654c7a92214e003de561"
+    "revision": "8efecc27b58d3266e3946ea5c8fb8b3ef853914d"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 4d41d9bfb09dd0836ce6910404e3cd570500c9ca Mon Sep 17 00:00:00 2001
From: Jeroen Op 't Eynde <jeroen@simplistic.be>
Date: Fri, 25 Aug 2023 19:55:22 +0200
Subject: [PATCH 0655/2704] feat(jsonnet): update parser and queries

---
 queries/jsonnet/folds.scm      |  10 +++
 queries/jsonnet/highlights.scm | 137 ++++++++++++++++++++-------------
 queries/jsonnet/locals.scm     |  17 ++++
 3 files changed, 110 insertions(+), 54 deletions(-)
 create mode 100644 queries/jsonnet/folds.scm
 create mode 100644 queries/jsonnet/locals.scm

diff --git a/queries/jsonnet/folds.scm b/queries/jsonnet/folds.scm
new file mode 100644
index 000000000..9243ccfde
--- /dev/null
+++ b/queries/jsonnet/folds.scm
@@ -0,0 +1,10 @@
+[
+ (field)
+ (object)
+ (array)
+ (parenthesis)
+ (bind)
+; (params)
+; (args)
+; (conditional)
+] @fold
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index 189f4b9e1..b0769c639 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -1,21 +1,61 @@
+(id) @variable
+(comment) @comment
+
+; Literals
+(null) @constant.builtin
+(string) @string
+(number) @number
 [
   (true)
   (false)
 ] @boolean
 
-(comment) @comment
-(id) @variable
-(import) @include
-(null) @constant.builtin
-(number) @number
-(string) @string
+; Keywords
+"for" @repeat
+"in" @keyword.operator
+"function" @keyword.function
 
-(fieldname (id) @field)
-(fieldaccess
-  last: (id) @field)
-(fieldaccess_super
-  (id) @field)
+[
+  "if"
+  "then"
+  "else"
+] @conditional
 
+[
+  (local)
+  (tailstrict)
+  "function"
+] @keyword
+
+[
+  "assert"
+  "error"
+] @exception
+
+[
+  (dollar)
+  (self)
+  (super)
+] @variable.builtin
+((id) @variable.builtin
+ (#eq? @variable.builtin "std"))
+
+; Operators
+[
+  (multiplicative)
+  (additive)
+  (bitshift)
+  (comparison)
+  (equality)
+  (bitand)
+  (bitxor)
+  (bitor)
+  (and)
+  (or)
+  (unaryop)
+] @operator
+
+; Punctuation
 [
   "["
   "]"
@@ -30,63 +70,52 @@
   ","
   ";"
   ":"
-  "::"
-  ":::"
 ] @punctuation.delimiter
 
-; Nested field inheritance
-("+" @punctuation.delimiter [":" "::" ":::"])
-
-"=" @operator
-(unaryop) @operator
-(binary
-  operator: (_) @operator)
-
-"for" @repeat
-
-"function" @keyword.function
-
-"in" @keyword.operator
-
 [
- (local)
- (tailstrict)
- "assert"
-] @keyword
+  "::"
+  ":::"
+] @punctuation.special
 
+(field
+  (fieldname) "+" @punctuation.special)
+
+; Imports
 [
-  "else"
-  "if"
-  "then"
-] @conditional
+  (import)
+  (importstr)
+] @include
 
-"error" @exception
+; Fields
 
-[
-  (dollar)
-  (self)
-  (super)
-] @variable.builtin
-((id) @variable.builtin
- (#eq? @variable.builtin "std"))
+(fieldname (id) @field)
+(fieldname (string (string_content) @field))
 
-; Function declaration
+; Functions
+(field
+  function: (fieldname (id) @function))
+(field
+  function: (fieldname
+              (string (string_content) @function)))
 (param
   identifier: (id) @parameter)
-(field
-  (fieldname (id) @function)
-  [(anonymous_function) (params)])
-(bind
-  function: (id) @function)
+
+(bind (id) @variable.local)
+(bind function: (id) @function)
 
 ; Function call
-(functioncall (id) @function.call)
 (functioncall
   (fieldaccess
-    last: (id) @function.call))
-(functioncall
+    last: (id) @function.call)?
   (fieldaccess_super
-    (id) @function.call))
-(named_argument (id) @parameter)
+    (id) @function.call)?
+  (id)? @function.call
+  "("
+  (args
+    (named_argument
+      (id) @parameter
+    ))?
+  ")")
 
+; ERROR
 (ERROR) @error
diff --git a/queries/jsonnet/locals.scm b/queries/jsonnet/locals.scm
new file mode 100644
index 000000000..5e1f1acc2
--- /dev/null
+++ b/queries/jsonnet/locals.scm
@@ -0,0 +1,17 @@
+(parenthesis) @scope
+(anonymous_function) @scope
+(object) @scope
+(field) @scope
+(local_bind) @scope
+
+(field
+  function: (fieldname (id)  @definition.function)
+  (#set! "definition.function.scope" "parent"))
+
+(bind (id)  @definition.var)
+(bind function: (id)  @definition.function)
+
+(param (id) @definition.parameter)
+
+(id) @reference
+;(fieldname (id) (#is-not? local)) ; (#is-not?) not supported yet

From a4f4fcdd3ef1b36ebdad72741bbd85dd9ef5013e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 25 Aug 2023 05:02:58 -0400
Subject: [PATCH 0656/2704] feat: add Doxygen

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 +++++++
 queries/c/injections.scm        |  6 +++++-
 queries/cpp/injections.scm      |  4 ++++
 queries/doxygen/highlights.scm  | 38 +++++++++++++++++++++++++++++++++
 queries/doxygen/indents.scm     |  1 +
 queries/doxygen/injections.scm  |  8 +++++++
 queries/go/injections.scm       |  2 +-
 queries/java/injections.scm     |  4 ++++
 queries/rust/injections.scm     |  2 +-
 11 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 queries/doxygen/highlights.scm
 create mode 100644 queries/doxygen/indents.scm
 create mode 100644 queries/doxygen/injections.scm

diff --git a/README.md b/README.md
index 0001645b1..9cc5b827a 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [diff](https://github.com/the-mikedavis/tree-sitter-diff) (maintained by @gbprod)
 - [x] [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) (maintained by @camdencheek)
 - [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
+- [x] [doxygen](https://github.com/amaanq/tree-sitter-doxygen) (maintained by @amaanq)
 - [x] [dtd](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
 - [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)
diff --git a/lockfile.json b/lockfile.json
index cf5cbb51e..de290a220 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -107,6 +107,9 @@
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
+  "doxygen": {
+    "revision": "19284113dbd42263c13b39d81b2a3b2492022c9b"
+  },
   "dtd": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0f0d7b90a..d8ca6abb9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -376,6 +376,14 @@ list.dot = {
   maintainers = { "@rydesun" },
 }
 
+list.doxygen = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-doxygen",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.dtd = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-xml",
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index f67cd22c6..6b1fc3522 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -5,9 +5,13 @@
  (#set! injection.language "comment"))
 
 ((comment) @injection.content
-  (#match? @injection.content "/\*!([a-zA-Z]+:)?re2c")
+  (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
   (#set! injection.language "re2c"))
 
+((comment) @injection.content
+  (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
+  (#set! injection.language "doxygen"))
+
 ; TODO: add when asm is added
 ; (gnu_asm_expression assembly_code: (string_literal) @injection.content
 ; (#set! injection.language "asm"))
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 6b7639b67..75f851367 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -4,6 +4,10 @@
 ((comment) @injection.content 
  (#set! injection.language "comment"))
 
+((comment) @injection.content
+  (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
+  (#set! injection.language "doxygen"))
+
 (raw_string_literal
   delimiter: (raw_string_delimiter) @injection.language
   (raw_string_content) @injection.content)
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
new file mode 100644
index 000000000..621199865
--- /dev/null
+++ b/queries/doxygen/highlights.scm
@@ -0,0 +1,38 @@
+((tag_name) @keyword
+  (#set! "priority" 105))
+
+(identifier) @variable
+
+((tag
+  (tag_name) @_param 
+  (identifier) @parameter)
+  (#any-of? @_param "@param" "\\param"))
+
+(function (identifier) @function)
+
+(function_link) @function
+
+(emphasis) @text.emphasis
+
+"\\a" @tag
+
+[
+  "in"
+  "out"
+  "inout"
+] @storageclass
+
+"~" @operator
+
+[
+  "<a"
+  ">"
+  "</a>"
+] @tag
+
+[
+  ","
+  "::"
+] @punctuation.delimiter
+
+[ "(" ")" "[" "]" ] @punctuation.bracket
diff --git a/queries/doxygen/indents.scm b/queries/doxygen/indents.scm
new file mode 100644
index 000000000..ef30f1e76
--- /dev/null
+++ b/queries/doxygen/indents.scm
@@ -0,0 +1 @@
+(document) @indent.auto
diff --git a/queries/doxygen/injections.scm b/queries/doxygen/injections.scm
new file mode 100644
index 000000000..1b5ee5858
--- /dev/null
+++ b/queries/doxygen/injections.scm
@@ -0,0 +1,8 @@
+((type) @injection.content
+  (#set! injection.parent))
+
+((function_link) @injection.content
+  (#set! injection.parent))
+
+((link) @injection.content
+  (#set! injection.language "html"))
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index d44c9897c..affc7a115 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -20,5 +20,5 @@
     (#set! injection.language "regex")))
 
 ((comment) @injection.content
-  (#match? @injection.content "/\*!([a-zA-Z]+:)?re2c")
+  (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
   (#set! injection.language "re2c"))
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 988d370f0..d79ffa6f1 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -3,3 +3,7 @@
   (line_comment)
  ] @injection.content
  (#set! injection.language "comment"))
+
+((block_comment) @injection.content
+  (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
+  (#set! injection.language "doxygen"))
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index a8dff4ca5..d3abc13a6 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -39,5 +39,5 @@
     (#set! injection.language "regex"))
 
 ((block_comment) @injection.content
-  (#match? @injection.content "/\*!([a-zA-Z]+:)?re2c")
+  (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
   (#set! injection.language "re2c"))

From 3be738312b6e8fa68c3691f77b525212abe143b0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 26 Aug 2023 05:06:54 -0400
Subject: [PATCH 0657/2704] fix(bash): update queries from upstream (#5321)

---
 lockfile.json               | 2 +-
 queries/bash/highlights.scm | 1 -
 queries/bash/injections.scm | 5 +----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index de290a220..70441fc76 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "8e286e7673e3fa7ad94ab3159c2b83395d302af4"
+    "revision": "a7be575f17ff9d5340dfd0f60e466cd92a7501d5"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 8cc84194c..b204c8446 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -49,7 +49,6 @@
  (raw_string)
  (ansi_c_string)
  (heredoc_body)
- (simple_heredoc_body)
 ] @string
 
 [
diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 2702ff6bd..fdb03cda5 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -5,9 +5,6 @@
  (#set! injection.language "regex"))
 
 ((heredoc_redirect
-  [
-    (heredoc_body)
-    (simple_heredoc_body)
-  ] @injection.content
+  (heredoc_body) @injection.content
   (heredoc_end) @injection.language)
  (#downcase! @injection.language))

From cb74c1c5aefd8b903f1b547d08d4df42be07aa2a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 26 Aug 2023 06:34:53 +0000
Subject: [PATCH 0658/2704] Update parsers: commonlisp, glsl, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 70441fc76..ba66527d7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -60,7 +60,7 @@
     "revision": "c9a7e2df7cac2dfb730f766a4f343308f84ff346"
   },
   "commonlisp": {
-    "revision": "338db38330f0d25cba8e2c6428240ebc5e020264"
+    "revision": "5153dbbc70e4cc2324320c1bdae020d31079c7c0"
   },
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
@@ -189,7 +189,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "7491ce41c982ce74a54744ac21a2e4c360325fbb"
+    "revision": "4296be48e59be05284be2f79d62b155b61b20518"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -624,7 +624,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "8efecc27b58d3266e3946ea5c8fb8b3ef853914d"
+    "revision": "2b2aa817bef5f56c56c8a0d02961858dd47c5860"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From dfbba919dd7491aef206765874ac7db91e42ed3b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 27 Aug 2023 06:35:00 +0000
Subject: [PATCH 0659/2704] Update parsers: bash, doxygen, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ba66527d7..5171cd406 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "a7be575f17ff9d5340dfd0f60e466cd92a7501d5"
+    "revision": "c3c6c2ea26fc1649fd40b1a6c999ae676e91f521"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -108,7 +108,7 @@
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
   "doxygen": {
-    "revision": "19284113dbd42263c13b39d81b2a3b2492022c9b"
+    "revision": "7bee4eb4d674ce0a6e35d0967b846816f72d5ce7"
   },
   "dtd": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
@@ -624,7 +624,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2b2aa817bef5f56c56c8a0d02961858dd47c5860"
+    "revision": "2c27b8621325189baeaac25cd1b3aa3d75d47e04"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From e942c720acf44c5c19338ffd57185e9e0e027227 Mon Sep 17 00:00:00 2001
From: Noah <noah.bogart@hey.com>
Date: Sun, 27 Aug 2023 03:25:43 -0400
Subject: [PATCH 0660/2704] fix(clojure): fix field highlighting (#5319)

---
 queries/clojure/highlights.scm          | 11 ++++--
 tests/query/highlights/clojure/test.clj | 52 +++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 tests/query/highlights/clojure/test.clj

diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 08ca49b86..2d3922adf 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -63,7 +63,7 @@
 
 ; Constructor
 ((sym_lit) @constructor
- (#lua-match? @constructor "^-\\>[^\\>].*"))
+ (#lua-match? @constructor "^-%>[^>].*"))
 
 ; Builtin dynamic variables
 ((sym_lit) @variable.builtin
@@ -100,12 +100,17 @@
  (#lua-match? @type "^[^/]+[.][^/]*$"))
 
 ; Interop
+; (.instanceMember instance args*)
+; (.instanceMember Classname args*)
 ((sym_lit) @method
- (#lua-match? @method "^[.][^-]"))
+ (#lua-match? @method "^%.[^-]"))
+; (.-instanceField instance)
 ((sym_lit) @field
- (#lua-match? @field "^[.]-"))
+ (#lua-match? @field "^%.%-.*"))
+;  Classname/staticField
 ((sym_lit) @field
  (#lua-match? @field "^[%u].*/.+"))
+; (Classname/staticMethod args*)
 (list_lit
  .
  (sym_lit) @method
diff --git a/tests/query/highlights/clojure/test.clj b/tests/query/highlights/clojure/test.clj
new file mode 100644
index 000000000..ab9e46d9a
--- /dev/null
+++ b/tests/query/highlights/clojure/test.clj
@@ -0,0 +1,52 @@
+(ns test {:clj-kondo/ignore true})
+; <- punctuation.bracket
+; ^ include
+;    ^ namespace
+
+ ; asdf
+;^^^^^^ comment
+
+ #_ abc
+;^^^^^^ comment
+
+(func obj)
+;^^^^ function.call
+;     ^^^ variable
+
+ #(+ % %1 %&)
+;^ punctuation.special
+;  ^ function.call
+;    ^ ^^ ^^ variable.builtin
+
+ &
+;^ parameter
+
+ ->abc
+;^^^^^ constructor
+
+ ->>abc
+;^^^^^^ variable
+
+ *1 *2 *3 *e
+;^^ ^^ ^^ ^^ variable.builtin
+
+(.method)
+;^^^^^^^ method
+
+(.-field)
+;^^^^^^^ field
+
+ Abc/method
+;^^^^^^^^^^ field
+
+(Abc/method)
+;^^^^^^^^^^ method
+
+ Abc
+;^^^ type
+
+ abc.
+;^^^^ type
+
+ ^abc
+;^ punctuation.special

From 1705a3e48687dc662b7aded94ab45645f4dce523 Mon Sep 17 00:00:00 2001
From: Kevin Svetlitski <kevin_svetlitski@berkeley.edu>
Date: Sun, 27 Aug 2023 02:43:10 -0500
Subject: [PATCH 0661/2704] feat(vim): add the builtin `sign` command (#5322)

---
 queries/vim/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 09188ddb6..c5bd2e947 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -106,6 +106,7 @@
   "visual"
   "view"
   "eval"
+  "sign"
 ] @keyword
 (map_statement cmd: _ @keyword)
 (command_name) @function.macro

From d0b17cc0b9c8c3055530770a9dd4de659232c692 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 27 Aug 2023 01:40:58 -0400
Subject: [PATCH 0662/2704] feat(doxygen): update parser and queries

---
 lockfile.json                  | 2 +-
 queries/doxygen/highlights.scm | 6 ++++++
 queries/doxygen/injections.scm | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 5171cd406..47a900cf9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,7 +108,7 @@
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
   "doxygen": {
-    "revision": "7bee4eb4d674ce0a6e35d0967b846816f72d5ce7"
+    "revision": "7ac6203cc018ff440b45b6d5aeba596f02eec4d5"
   },
   "dtd": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
index 621199865..de0fc3e5d 100644
--- a/queries/doxygen/highlights.scm
+++ b/queries/doxygen/highlights.scm
@@ -16,6 +16,8 @@
 
 "\\a" @tag
 
+(code_block_language) @label
+
 [
   "in"
   "out"
@@ -33,6 +35,10 @@
 [
   ","
   "::"
+  (code_block_start)
+  (code_block_end)
 ] @punctuation.delimiter
 
 [ "(" ")" "[" "]" ] @punctuation.bracket
+
+(code_block_content) @none
diff --git a/queries/doxygen/injections.scm b/queries/doxygen/injections.scm
index 1b5ee5858..7dba61097 100644
--- a/queries/doxygen/injections.scm
+++ b/queries/doxygen/injections.scm
@@ -6,3 +6,7 @@
 
 ((link) @injection.content
   (#set! injection.language "html"))
+
+((code_block
+  (code_block_language) @injection.language
+  (code_block_content) @injection.content))

From 08c830f625eb93db9c89c5e946e8eea7111bd568 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Sun, 27 Aug 2023 17:12:35 +0200
Subject: [PATCH 0663/2704] folds(typescript): add `enum_declaration`

Fixes #5325
---
 queries/typescript/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/typescript/folds.scm b/queries/typescript/folds.scm
index dced30d9a..df0b8942a 100644
--- a/queries/typescript/folds.scm
+++ b/queries/typescript/folds.scm
@@ -4,4 +4,5 @@
   (interface_declaration)
   (internal_module)
   (type_alias_declaration)
+  (enum_declaration)
 ] @fold

From d94e1ad9575cc211b5726f09b28ca9454aba22fe Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 28 Aug 2023 06:35:54 +0000
Subject: [PATCH 0664/2704] Update parsers: bash, gleam, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 47a900cf9..89ab35ae1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "c3c6c2ea26fc1649fd40b1a6c999ae676e91f521"
+    "revision": "4798bc61410fcb3ae725bab24f96f5c4684cea71"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -183,7 +183,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "8302c98ed78128b22f946fadefaf4af5ba5d5850"
+    "revision": "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a"
   },
   "glimmer": {
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
@@ -624,7 +624,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2c27b8621325189baeaac25cd1b3aa3d75d47e04"
+    "revision": "5d5d46ee60ed948cdfa2e3de40cd1ec080418e21"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 6def3eea22c213a475fc42644cd48c924b67a03f Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 29 Aug 2023 06:36:04 +0000
Subject: [PATCH 0665/2704] Update parsers: ada, java, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 89ab35ae1..d609a0517 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "f67bc6622a9b9bc879b2808164abdbaf99d65d4a"
+    "revision": "0f572c4dccac8cd6a149bbc88c9d8423e9c71ce9"
   },
   "agda": {
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
@@ -267,7 +267,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "38be6eccc1b86d6ec5dca0976659e807fd4dc28d"
+    "revision": "ca4afaaa41dd7735b35edc0a77629cf932e95799"
   },
   "javascript": {
     "revision": "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"
@@ -624,7 +624,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "5d5d46ee60ed948cdfa2e3de40cd1ec080418e21"
+    "revision": "353b660b4be2b0e8cd6ac3f06344eaa968be7da8"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 7f6ff292e3f53e7b12554ee92264c23762dc7906 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 30 Aug 2023 06:36:11 +0000
Subject: [PATCH 0666/2704] Update parsers: hack, rust, tiger, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d609a0517..cfdb8dd71 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -216,7 +216,7 @@
     "revision": "76e02db5866dd2b096512103ed4d8f630cc32980"
   },
   "hack": {
-    "revision": "2887d3927c5fadebfd71c604922d0c59748e9901"
+    "revision": "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"
   },
   "hare": {
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
@@ -486,7 +486,7 @@
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
-    "revision": "39eaeb41e17572c17e35bb050d6bf2da17568dbf"
+    "revision": "17a6b15562b09db1f27b8f5f26f17edbb2aac097"
   },
   "scala": {
     "revision": "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a"
@@ -561,7 +561,7 @@
     "revision": "d4deb1bd9e848f2dbe81103a151d99e8546de480"
   },
   "tiger": {
-    "revision": "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3"
+    "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
     "revision": "7ba226cf85280c7917d082940022006e6a3b7b6f"
@@ -624,7 +624,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "353b660b4be2b0e8cd6ac3f06344eaa968be7da8"
+    "revision": "915f263722a6a74e5a30be82310d3843ed203058"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 920b37260ebc720b0399bd12954fd2bf8bd18242 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 30 Aug 2023 14:17:40 -0400
Subject: [PATCH 0667/2704] feat(bash): update parser and queries

---
 lockfile.json               | 2 +-
 queries/bash/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index cfdb8dd71..b6bd245bc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "244426241376b08d9531616290d657106ec8f7ff"
   },
   "bash": {
-    "revision": "4798bc61410fcb3ae725bab24f96f5c4684cea71"
+    "revision": "bdcd56c5a3896f7bbb7684e223c43d9f24380351"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index b204c8446..4ffae437e 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -34,6 +34,8 @@
  "<&"
  ">&"
  ">|"
+ "<&-"
+ ">&-"
 
  "<<-"
  "<<<"

From 4a9adef71061a883c81f79862ee1f4bf100a2ddd Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 31 Aug 2023 06:36:12 +0000
Subject: [PATCH 0668/2704] Update parsers: fortran, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b6bd245bc..e20c229ae 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -153,7 +153,7 @@
     "revision": "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"
   },
   "fortran": {
-    "revision": "6828cf3629addb1706bdbbd33491e95f12b7042c"
+    "revision": "f73d473e3530862dee7cbb38520f28824e7804f6"
   },
   "fsh": {
     "revision": "fa3347712f7a59ed02ccf508284554689c6cde28"
@@ -624,7 +624,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "915f263722a6a74e5a30be82310d3843ed203058"
+    "revision": "33165cf561269a57a6d77e22709287abee1f97f7"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From f0f115e926df05d2f1363eb9aa93714056f29827 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 31 Aug 2023 02:26:24 -0400
Subject: [PATCH 0669/2704] feat: add NQC

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/nqc/folds.scm           |  1 +
 queries/nqc/highlights.scm      | 18 ++++++++++++++++++
 queries/nqc/indents.scm         |  1 +
 queries/nqc/injections.scm      |  1 +
 queries/nqc/locals.scm          |  1 +
 8 files changed, 34 insertions(+)
 create mode 100644 queries/nqc/folds.scm
 create mode 100644 queries/nqc/highlights.scm
 create mode 100644 queries/nqc/indents.scm
 create mode 100644 queries/nqc/injections.scm
 create mode 100644 queries/nqc/locals.scm

diff --git a/README.md b/README.md
index 9cc5b827a..fcb175bd7 100644
--- a/README.md
+++ b/README.md
@@ -294,6 +294,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ninja](https://github.com/alemuller/tree-sitter-ninja) (maintained by @alemuller)
 - [x] [nix](https://github.com/cstrahan/tree-sitter-nix) (maintained by @leo60228)
 - [x] [norg](https://github.com/nvim-neorg/tree-sitter-norg) (maintained by @JoeyGrajciar, @vhyrro)
+- [x] [nqc](https://github.com/amaanq/tree-sitter-nqc) (maintained by @amaanq)
 - [x] [objc](https://github.com/amaanq/tree-sitter-objc) (maintained by @amaanq)
 - [x] [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
diff --git a/lockfile.json b/lockfile.json
index e20c229ae..f4a73d48a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -362,6 +362,9 @@
   "norg": {
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
+  "nqc": {
+    "revision": "d8cebf03341d85ddef0ef590517446f9373b6fa8"
+  },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d8ca6abb9..5aa0e13ce 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1095,6 +1095,14 @@ list.norg = {
   maintainers = { "@JoeyGrajciar", "@vhyrro" },
 }
 
+list.nqc = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-nqc",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.objc = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-objc",
diff --git a/queries/nqc/folds.scm b/queries/nqc/folds.scm
new file mode 100644
index 000000000..a5a5208ca
--- /dev/null
+++ b/queries/nqc/folds.scm
@@ -0,0 +1 @@
+; inherits: c
diff --git a/queries/nqc/highlights.scm b/queries/nqc/highlights.scm
new file mode 100644
index 000000000..28d101f66
--- /dev/null
+++ b/queries/nqc/highlights.scm
@@ -0,0 +1,18 @@
+; inherits: c
+
+[
+  "task"
+  "sub"
+] @keyword.function
+
+[
+  "until"
+] @repeat
+
+[
+  "acquire"
+  "monitor"
+  "catch"
+  "start"
+  "stop"
+] @keyword.coroutine
diff --git a/queries/nqc/indents.scm b/queries/nqc/indents.scm
new file mode 100644
index 000000000..a5a5208ca
--- /dev/null
+++ b/queries/nqc/indents.scm
@@ -0,0 +1 @@
+; inherits: c
diff --git a/queries/nqc/injections.scm b/queries/nqc/injections.scm
new file mode 100644
index 000000000..a5a5208ca
--- /dev/null
+++ b/queries/nqc/injections.scm
@@ -0,0 +1 @@
+; inherits: c
diff --git a/queries/nqc/locals.scm b/queries/nqc/locals.scm
new file mode 100644
index 000000000..a5a5208ca
--- /dev/null
+++ b/queries/nqc/locals.scm
@@ -0,0 +1 @@
+; inherits: c

From 9361484fa465529b0e646f947fe07bc7e80bfa62 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 31 Aug 2023 06:08:07 -0400
Subject: [PATCH 0670/2704] feat(doxygen): update queries from upstream

---
 lockfile.json                  |  2 +-
 queries/doxygen/highlights.scm | 13 +++++++++++--
 queries/doxygen/injections.scm |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f4a73d48a..0d32e1b32 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,7 +108,7 @@
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
   "doxygen": {
-    "revision": "7ac6203cc018ff440b45b6d5aeba596f02eec4d5"
+    "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
index de0fc3e5d..42d76a448 100644
--- a/queries/doxygen/highlights.scm
+++ b/queries/doxygen/highlights.scm
@@ -1,6 +1,11 @@
 ((tag_name) @keyword
   (#set! "priority" 105))
 
+[
+  "@code"
+  "@endcode"
+] @keyword
+
 (identifier) @variable
 
 ((tag
@@ -14,7 +19,10 @@
 
 (emphasis) @text.emphasis
 
-"\\a" @tag
+[
+  "\\a"
+  "\\c"
+] @tag
 
 (code_block_language) @label
 
@@ -33,12 +41,13 @@
 ] @tag
 
 [
+  "."
   ","
   "::"
   (code_block_start)
   (code_block_end)
 ] @punctuation.delimiter
 
-[ "(" ")" "[" "]" ] @punctuation.bracket
+[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
 
 (code_block_content) @none
diff --git a/queries/doxygen/injections.scm b/queries/doxygen/injections.scm
index 7dba61097..8353dfd7a 100644
--- a/queries/doxygen/injections.scm
+++ b/queries/doxygen/injections.scm
@@ -1,7 +1,7 @@
 ((type) @injection.content
   (#set! injection.parent))
 
-((function_link) @injection.content
+([ (function_link) (code) ] @injection.content
   (#set! injection.parent))
 
 ((link) @injection.content

From 8e9cc89955ee5dcd9743ba47a9e6e44a78f648f8 Mon Sep 17 00:00:00 2001
From: Tobias S <tobias.seifert97@gmail.com>
Date: Thu, 31 Aug 2023 15:41:07 +0200
Subject: [PATCH 0671/2704] fix(ecma_injections): limit function names to
 alphanumeric characters only

---
 queries/ecma/injections.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 720dd2eda..1e0a478df 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -13,6 +13,7 @@
               (template_string) @injection.content)
              (template_string) @injection.content
             ]
+     (#lua-match? @injection.language "^[a-zA-Z][a-zA-Z0-9]*$")
      (#offset! @injection.content 0 1 0 -1)
      (#not-eq? @injection.language "svg"))
 

From f8c2825220bff70919b527ee68fe44e7b1dae4b2 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 31 Aug 2023 05:28:16 -0400
Subject: [PATCH 0672/2704] feat: add Kconfig

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++
 queries/kconfig/folds.scm       |  9 ++++
 queries/kconfig/highlights.scm  | 81 +++++++++++++++++++++++++++++++++
 queries/kconfig/indents.scm     | 11 +++++
 queries/kconfig/injections.scm  |  2 +
 queries/kconfig/locals.scm      | 17 +++++++
 8 files changed, 132 insertions(+)
 create mode 100644 queries/kconfig/folds.scm
 create mode 100644 queries/kconfig/highlights.scm
 create mode 100644 queries/kconfig/indents.scm
 create mode 100644 queries/kconfig/injections.scm
 create mode 100644 queries/kconfig/locals.scm

diff --git a/README.md b/README.md
index fcb175bd7..397163984 100644
--- a/README.md
+++ b/README.md
@@ -271,6 +271,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) (maintained by @WhyNotHugo)
 - [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
 - [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @theHamsta)
+- [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
 - [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)
 - [x] [kotlin](https://github.com/fwcd/tree-sitter-kotlin) (maintained by @SalBakraa)
 - [x] [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) (maintained by @traxys)
diff --git a/lockfile.json b/lockfile.json
index 0d32e1b32..907bbf3fa 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -293,6 +293,9 @@
   "julia": {
     "revision": "bb7e587837fdeda74dd510256253d60f59a1e2cd"
   },
+  "kconfig": {
+    "revision": "4242bff4d92964a1cbaa95cb45a87a32b3e1c896"
+  },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5aa0e13ce..246d41eab 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -899,6 +899,14 @@ list.julia = {
   maintainers = { "@theHamsta" },
 }
 
+list.kconfig = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-kconfig",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+}
+
 list.kdl = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-kdl",
diff --git a/queries/kconfig/folds.scm b/queries/kconfig/folds.scm
new file mode 100644
index 000000000..980667dfc
--- /dev/null
+++ b/queries/kconfig/folds.scm
@@ -0,0 +1,9 @@
+[
+  (config)
+  (menuconfig)
+  (choice)
+  (comment_entry)
+  (menu)
+  (if)
+  (help_text)
+] @fold
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
new file mode 100644
index 000000000..c18c69f69
--- /dev/null
+++ b/queries/kconfig/highlights.scm
@@ -0,0 +1,81 @@
+"source" @include
+
+[
+  "mainmenu"
+  "config"
+  "menuconfig"
+  "choice"
+  "endchoice"
+  "comment"
+  "menu"
+  "endmenu"
+  "prompt"
+  "default"
+  "range"
+  "help"
+  (optional)
+  (modules)
+] @keyword
+
+[
+  "if"
+  "endif"
+  "depends on"
+  "select"
+  "imply"
+  "visible if"
+] @conditional
+
+[
+  "def_bool"
+  "def_tristate"
+] @keyword.function
+
+[
+  "||"
+  "&&"
+  "="
+  "!="
+  "<"
+  ">"
+  "<="
+  ">="
+  "!"
+] @operator
+
+[
+  "bool"
+  "tristate"
+  "int"
+  "hex"
+  "string"
+] @type.builtin
+
+[ "(" ")" ] @punctuation.bracket
+
+(macro_variable ["$(" ")"] @punctuation.special)
+
+(symbol) @variable
+
+[
+  (prompt)
+  (macro_content)
+  (text)
+] @string
+
+(config name: (symbol) @constant)
+(menuconfig name: (symbol) @constant)
+(choice name: (symbol) @constant)
+
+((symbol) @constant
+  (#lua-match? @constant "[A-Z0-9]+"))
+
+(mainmenu name: (prompt) @text.title)
+(comment_entry name: (prompt) @text.title)
+(menu name: (prompt) @text.title)
+
+(source (prompt) @text.uri @string.special)
+
+(comment) @comment
+
+(ERROR) @error
diff --git a/queries/kconfig/indents.scm b/queries/kconfig/indents.scm
new file mode 100644
index 000000000..77f02e1f6
--- /dev/null
+++ b/queries/kconfig/indents.scm
@@ -0,0 +1,11 @@
+(help_text (text) @indent.auto)
+
+[
+  (config)
+  (menuconfig)
+  (choice)
+  (comment_entry)
+  (menu)
+  (if)
+  (help_text)
+] @indent.begin
diff --git a/queries/kconfig/injections.scm b/queries/kconfig/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/kconfig/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/kconfig/locals.scm b/queries/kconfig/locals.scm
new file mode 100644
index 000000000..3727cd94f
--- /dev/null
+++ b/queries/kconfig/locals.scm
@@ -0,0 +1,17 @@
+[
+  (symbol)
+  (prompt)
+] @reference
+
+[
+  (config)
+  (menuconfig)
+  (choice)
+  (comment_entry)
+  (menu)
+  (if)
+] @scope
+
+(type_definition (prompt) @definition.var)
+(type_definition (input_prompt (prompt) @definition.var))
+(type_definition_default (expression (prompt) @definition.var))

From 691d73287a94e8ed82a383df82aabfe77ab4bcaa Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 1 Sep 2023 06:36:29 +0000
Subject: [PATCH 0673/2704] Update parsers: csv, kconfig, nqc, psv, racket,
 scala, scheme, tsv, wing

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 907bbf3fa..7fd0d4fd7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"
   },
   "csv": {
-    "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
+    "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "cuda": {
     "revision": "f00c91430124797e798cbf28e09075d7d192938a"
@@ -294,7 +294,7 @@
     "revision": "bb7e587837fdeda74dd510256253d60f59a1e2cd"
   },
   "kconfig": {
-    "revision": "4242bff4d92964a1cbaa95cb45a87a32b3e1c896"
+    "revision": "aaba009ba9d7881f0f81742da588ae70b572316d"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -366,7 +366,7 @@
     "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
   },
   "nqc": {
-    "revision": "d8cebf03341d85ddef0ef590517446f9373b6fa8"
+    "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -429,7 +429,7 @@
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
   },
   "psv": {
-    "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
+    "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "pug": {
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
@@ -459,7 +459,7 @@
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
-    "revision": "7dc4fb60390218b09bc351062eeede7dcdbb4d9f"
+    "revision": "e4ba1a9674a3b4dd7905d04f194ae6f8331be342"
   },
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
@@ -495,13 +495,13 @@
     "revision": "17a6b15562b09db1f27b8f5f26f17edbb2aac097"
   },
   "scala": {
-    "revision": "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a"
+    "revision": "70afdd5632d57dd63a960972ab25945e353a52f6"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
   },
   "scheme": {
-    "revision": "af3af6c9356b936f8a515a1e449c32e804c2b1a8"
+    "revision": "85b6188fb77c03dfb01d13e58e2844450506860c"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -579,7 +579,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsv": {
-    "revision": "f1d35df780976721d3cd38f0b16538dd31f87a23"
+    "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "tsx": {
     "revision": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"
@@ -630,7 +630,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "33165cf561269a57a6d77e22709287abee1f97f7"
+    "revision": "ca6d5bea6c7cf5d16ca65f9ee223d2d3457ab2ec"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From e60057b389208518c8737f5a5e5f0cda72249a5e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 2 Sep 2023 06:35:25 +0000
Subject: [PATCH 0674/2704] Update parsers: gpg, requirements, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7fd0d4fd7..e8de1156c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -207,7 +207,7 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "c44ce76960114352dd00728b835ceef02e0506b8"
+    "revision": "9c26b66d6bca0bd0520269e98241709806561bd5"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
@@ -474,7 +474,7 @@
     "revision": "b2667c975f07b33be3ceb83bea5cfbad88095866"
   },
   "requirements": {
-    "revision": "56ddb4dad2ea0761d20c0995a0de2990caa350b5"
+    "revision": "eda424eade0f2afbafbf0c89d18c77818fa19273"
   },
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
@@ -630,7 +630,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "ca6d5bea6c7cf5d16ca65f9ee223d2d3457ab2ec"
+    "revision": "7f2871822417d61b7fb35c1db02c93f4a67615b7"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 17b943e7c5cc2b2db3ac7b5720fbd42e75a00d8d Mon Sep 17 00:00:00 2001
From: Yuri Socher Bichibichi <yurisocherbic@protonmail.com>
Date: Thu, 31 Aug 2023 18:09:03 -0300
Subject: [PATCH 0675/2704] docs: fix typo in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 397163984..c35f05414 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ require'nvim-treesitter.configs'.setup {
   -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
   auto_install = true,
 
-  -- List of parsers to ignore installing (for "all")
+  -- List of parsers to ignore installing (or "all")
   ignore_install = { "javascript" },
 
   ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)

From 9d637b7ae8fa17cea8600e91d1145e2095c2a15d Mon Sep 17 00:00:00 2001
From: Tavish Pegram <tapegram@gmail.com>
Date: Sun, 3 Sep 2023 14:05:18 -0500
Subject: [PATCH 0676/2704] Feat: Add unison (#5340)

* Add unison

* Trivial change to force prepush hook

* Undo change

* PR Feedback - remove appended text in query after variable, update lockfile, remove main branch specification in parser

* Replacing captures with only ones in the contributing.md

* Fix typo

* Generate from grammar

* First group of suggested changes

* Update gt operator

* Remove outer parens

* Remove maybe.c

* Add comment injection
---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  9 ++++
 queries/unison/highlights.scm   | 73 +++++++++++++++++++++++++++++++++
 queries/unison/injections.scm   |  2 +
 5 files changed, 88 insertions(+)
 create mode 100644 queries/unison/highlights.scm
 create mode 100644 queries/unison/injections.scm

diff --git a/README.md b/README.md
index c35f05414..d127bd7a1 100644
--- a/README.md
+++ b/README.md
@@ -372,6 +372,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
+- [x] [unison](https://github.com/kylegoetz/tree-sitter-unison) (maintained by @tapegram)
 - [x] [usd](https://github.com/ColinKennedy/tree-sitter-usd) (maintained by @ColinKennedy)
 - [x] [uxn tal](https://github.com/amaanq/tree-sitter-uxntal) (maintained by @amaanq)
 - [x] [v](https://github.com/v-analyzer/v-analyzer) (maintained by @kkharji, @amaanq)
diff --git a/lockfile.json b/lockfile.json
index e8de1156c..867f7984f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -596,6 +596,9 @@
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
+  "unison": {
+    "revision": "694c8c0c79f8d1b80d497401acf4d1b77bfb004a"
+  },
   "usd": {
     "revision": "718a6b3e939904e0b4fe7cff6742e96af4781f4b"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 246d41eab..460ccea18 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1751,6 +1751,15 @@ list.ungrammar = {
   maintainers = { "@Philipp-M", "@amaanq" },
 }
 
+list.unison = {
+  install_info = {
+    url = "https://github.com/kylegoetz/tree-sitter-unison",
+    files = { "src/parser.c", "src/scanner.c" },
+    requires_generate_from_grammar = true,
+  },
+  maintainers = { "@tapegram" },
+}
+
 list.usd = {
   install_info = {
     url = "https://github.com/ColinKennedy/tree-sitter-usd",
diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
new file mode 100644
index 000000000..41f7e19bf
--- /dev/null
+++ b/queries/unison/highlights.scm
@@ -0,0 +1,73 @@
+;; Primitives
+(comment) @comment @spell
+(nat) @number
+(unit) @constant.builtin
+(literal_char) @character
+(literal_text) @string
+(literal_boolean) @boolean
+
+;; Keywords
+[
+  (kw_forall)
+  (unique_kw)
+  (type_kw)
+  (do)
+  (kw_let)
+] @keyword
+
+(kw_equals) @keyword.operator
+(structural_kw) @type.qualifier
+(unique) @type.qualifier
+
+(type_constructor) @constructor
+
+(doc_block) @comment.documentation
+
+
+[
+  (operator)
+  (pipe) 
+  (arrow_symbol) 
+  ">"
+  (or)
+] @keyword.operator
+
+[
+  "if"
+  "else"
+  "then"
+  (match)
+  (with)
+  (cases)
+] @conditional
+
+(blank_pattern) @variable.builtin
+
+(pattern) @variable (constructor_or_variable_pattern) @type
+
+(use_clause) @include
+
+;; Types
+(record_field name: (wordy_id) @variable type: (wordy_id) @type)
+[
+  (type_name)
+  (type_signature)
+  (effect)
+] @type
+
+(term_definition) @variable
+
+;; Punctuation
+[
+  (type_signature_colon)
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
diff --git a/queries/unison/injections.scm b/queries/unison/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/unison/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 30604fd7dde5abcba7ca8f5761894dfa61febe51 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 4 Sep 2023 06:36:47 +0000
Subject: [PATCH 0677/2704] Update parsers: blueprint, devicetree, java, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 867f7984f..d7d563fd4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "ed92abd7b67ab66a6fa3a747a0157f01d2e467d8"
   },
   "blueprint": {
-    "revision": "7f1a5df44861291d6951b6b2146a9fef4c226e14"
+    "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
     "revision": "a2b7bac3b313efbaa683d9a276ff63cdc544d960"
@@ -93,7 +93,7 @@
     "revision": "bcef6d57d0dd4df37bc9d8b1920ea4963c724826"
   },
   "devicetree": {
-    "revision": "d2cc332aeb814ea40e1e34ed6b9446324b32612a"
+    "revision": "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -267,7 +267,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "ca4afaaa41dd7735b35edc0a77629cf932e95799"
+    "revision": "83044af4950e9f1adb46a20f616d10934930ce7e"
   },
   "javascript": {
     "revision": "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"
@@ -633,7 +633,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "7f2871822417d61b7fb35c1db02c93f4a67615b7"
+    "revision": "6dbb1ac0939403f5d8117e6ac0d1f41218ed3652"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 95d02cdafe704fa5b86eac81f2eb1de3d8f52330 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 5 Sep 2023 06:35:35 +0000
Subject: [PATCH 0678/2704] Update parsers: julia, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d7d563fd4..83404d0a5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -291,7 +291,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "bb7e587837fdeda74dd510256253d60f59a1e2cd"
+    "revision": "0c088d1ad270f02c4e84189247ac7001e86fe342"
   },
   "kconfig": {
     "revision": "aaba009ba9d7881f0f81742da588ae70b572316d"
@@ -633,7 +633,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6dbb1ac0939403f5d8117e6ac0d1f41218ed3652"
+    "revision": "a6e41306a669d575caaf38c2393f1e61ce7fb22d"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From cc56e1f093868892fc7fea68ac3a51f5ffc38728 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 6 Sep 2023 06:35:46 +0000
Subject: [PATCH 0679/2704] Update parsers: ada, hoon, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 83404d0a5..2103fe555 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "0f572c4dccac8cd6a149bbc88c9d8423e9c71ce9"
+    "revision": "f21f13afe0410311be1f78959a25aee393c569c9"
   },
   "agda": {
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
@@ -243,7 +243,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "900a272271cc2fb78f24aa7b5a1e21ed36bb1d39"
+    "revision": "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6"
   },
   "html": {
     "revision": "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"
@@ -633,7 +633,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "a6e41306a669d575caaf38c2393f1e61ce7fb22d"
+    "revision": "f1446e78183df1d12f864c3e514b24c1b00c0a47"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From adfebcfe753b07af1b20d098b4ac947354ec7aa8 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 7 Sep 2023 06:35:36 +0000
Subject: [PATCH 0680/2704] Update parsers: elm, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2103fe555..605c3917d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -123,7 +123,7 @@
     "revision": "a2861e88a730287a60c11ea9299c033c7d076e30"
   },
   "elm": {
-    "revision": "b075803c445191af3cf7dbfdc84efef5f5bbc0f5"
+    "revision": "0694058bf0555adbf5f700ce4868d18e463cb824"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -633,7 +633,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f1446e78183df1d12f864c3e514b24c1b00c0a47"
+    "revision": "13082becae059dd96fa60b2492e95335350549be"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 80b4fa7970ee159e5c2c715bbcd386143c48dcb1 Mon Sep 17 00:00:00 2001
From: Munif Tanjim <hello@muniftanjim.dev>
Date: Thu, 7 Sep 2023 11:45:24 +0600
Subject: [PATCH 0681/2704] fix(lua): highlights for attribute

---
 queries/lua/highlights.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 7608da57a..ecc81b91e 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -140,9 +140,10 @@
   (#eq? @keyword.coroutine "coroutine"))
 
 (variable_list
-   attribute: (attribute
-     (["<" ">"] @punctuation.bracket
-      (identifier) @attribute)))
+  (attribute
+    "<" @punctuation.bracket
+    (identifier) @attribute
+    ">" @punctuation.bracket))
 
 ;; Labels
 

From dfcfdb0e7bcb362c4de1ed7d0015c21957c91ba7 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 8 Sep 2023 06:35:21 +0000
Subject: [PATCH 0682/2704] Update parsers: dart, lua, sql, t32, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 605c3917d..0c729c126 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -90,7 +90,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "bcef6d57d0dd4df37bc9d8b1920ea4963c724826"
+    "revision": "7e447dc18a2d293498670fb5ea16138648c883e5"
   },
   "devicetree": {
     "revision": "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"
@@ -315,7 +315,7 @@
     "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
   },
   "lua": {
-    "revision": "88e446476a1e97a8724dff7a23e2d709855077f2"
+    "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
   "luadoc": {
     "revision": "8981072676ec8bd74def6134be4f883655f7c082"
@@ -522,7 +522,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "6fa716163fcf183e4938c75f427379ceba881fbe"
+    "revision": "39750c48bf9ad63bcc1399554355b0aa0aaa1c33"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -552,7 +552,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "6da5e3cbabd376b566d04282005e52ffe67ef74a"
+    "revision": "c17070b014d02319b4cc335d28651926b0ee5ed6"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -633,7 +633,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "13082becae059dd96fa60b2492e95335350549be"
+    "revision": "eaba03a1c9284669e666c86a0dfd43f895edd6e4"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From c13e28f8947a9200e816038d85cb1302be11f8e6 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 9 Sep 2023 06:35:25 +0000
Subject: [PATCH 0683/2704] Update parsers: llvm, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0c729c126..15ff2ff72 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -312,7 +312,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "llvm": {
-    "revision": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"
+    "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
   },
   "lua": {
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
@@ -633,7 +633,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "eaba03a1c9284669e666c86a0dfd43f895edd6e4"
+    "revision": "6fcfe7db18944f57dff8fb46bee927f704fe2df8"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From b6492f41c46d9c3bc3550ecfb10c3f261e73cba6 Mon Sep 17 00:00:00 2001
From: Loong <wangl.cc@outlook.com>
Date: Sat, 9 Sep 2023 01:01:10 +0800
Subject: [PATCH 0684/2704] fix(julia): fix highlighting `end` keyword

---
 queries/julia/highlights.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index e76911947..3df1dccc5 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -157,9 +157,6 @@
 [
   "global"
   "local"
-  "macro"
-  "struct"
-  "end"
 ] @keyword
 
 
@@ -208,8 +205,11 @@
 (export_statement
   "export" @include)
 
+(struct_definition
+  ["struct" "end"] @keyword)
+
 (macro_definition
-  ["macro" "end" @keyword])
+  ["macro" "end"] @keyword)
 
 (function_definition
   ["function" "end"] @keyword.function)

From 4c1a76ec236838a101e921ee349a47f323502092 Mon Sep 17 00:00:00 2001
From: Beartama <8091245+uyha@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:38:10 +0200
Subject: [PATCH 0685/2704] feat: add EDS

---
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++++
 queries/eds/folds.scm           |  1 +
 queries/eds/highlights.scm      | 49 +++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 queries/eds/folds.scm
 create mode 100644 queries/eds/highlights.scm

diff --git a/lockfile.json b/lockfile.json
index 15ff2ff72..89f215c27 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -116,6 +116,9 @@
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
+  "eds": {
+    "revision": "fde62029d4c715562230070b9af51a9500c2ce10"
+  },
   "eex": {
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 460ccea18..6fc18cbf9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -403,6 +403,14 @@ list.ebnf = {
   experimental = true,
 }
 
+list.eds = {
+  install_info = {
+    url = "https://github.com/uyha/tree-sitter-eds",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@uyha" },
+}
+
 list.eex = {
   install_info = {
     url = "https://github.com/connorlay/tree-sitter-eex",
diff --git a/queries/eds/folds.scm b/queries/eds/folds.scm
new file mode 100644
index 000000000..911798f5a
--- /dev/null
+++ b/queries/eds/folds.scm
@@ -0,0 +1 @@
+(section) @fold
diff --git a/queries/eds/highlights.scm b/queries/eds/highlights.scm
new file mode 100644
index 000000000..42f408754
--- /dev/null
+++ b/queries/eds/highlights.scm
@@ -0,0 +1,49 @@
+"=" @punctuation.delimiter
+
+[ "[" "]" ] @punctuation.bracket
+
+((section_name) @variable.builtin
+ (#match? @variable.builtin "\\c^(FileInfo|DeviceInfo|DummyUsage|MandatoryObjects|OptionalObjects)$"))
+
+((section_name) @variable.builtin
+ (#lua-match? @variable.builtin "^1"))
+
+(section
+   (section_name) @_name
+   (#match? @_name "\\c^Comments$")) @comment
+
+(section
+   (section_name) @_name
+   (statement (key) @_key) @string
+   (#match? @_key "\\c^ParameterName$")
+   (#not-match? @_name "\\c^Comments$"))
+
+(section
+   (section_name) @_name
+   (statement (key) @_key) @type
+   (#match? @_key "\\c^ObjectType$")
+   (#not-match? @_name "\\c^Comments$"))
+
+(section
+   (section_name) @_name
+   (statement (key) @_key) @type
+   (#match? @_key "\\c^DataType$")
+   (#not-match? @_name "\\c^Comments$"))
+
+(section
+   (section_name) @_name
+   (statement (key) @_key) @type.qualifier
+   (#match? @_key "\\c^AccessType$")
+   (#not-match? @_name "\\c^Comments$"))
+
+(section
+   (section_name) @_name
+   (statement (key) @_key) @attribute
+   (#match? @_key "\\c^PDOMapping$")
+   (#not-match? @_name "\\c^Comments$"))
+
+(section
+   (section_name) @_name
+   (statement (key) @_key) @number
+   (#match? @_key "\\c^(DefaultValue|LowLimit|HighLimit|SubNumber)$")
+   (#not-match? @_name "\\c^Comments$"))

From d5f57cd4794d8f0a541f140229e5764e2f41d63a Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sun, 10 Sep 2023 12:38:22 +0000
Subject: [PATCH 0686/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d127bd7a1..cd9687a71 100644
--- a/README.md
+++ b/README.md
@@ -212,6 +212,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [doxygen](https://github.com/amaanq/tree-sitter-doxygen) (maintained by @amaanq)
 - [x] [dtd](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
+- [x] [eds](https://github.com/uyha/tree-sitter-eds) (maintained by @uyha)
 - [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)
 - [x] [elixir](https://github.com/elixir-lang/tree-sitter-elixir) (maintained by @connorlay)
 - [x] [elm](https://github.com/elm-tooling/tree-sitter-elm) (maintained by @zweimach)

From 96a50241987531fdb8a516998b72c19f563ccd6c Mon Sep 17 00:00:00 2001
From: Alex Pinkus <62194897+alex-pinkus@users.noreply.github.com>
Date: Sun, 10 Sep 2023 10:38:36 -0700
Subject: [PATCH 0687/2704] feat(swift): update parser and queries

Co-authored-by: Alex Pinkus <pinkus@amazon.com>
---
 lockfile.json                | 2 +-
 queries/swift/highlights.scm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 89f215c27..a238ef7c5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -546,7 +546,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "29541ac9bbe2090de75d0b1e70360b85bbda1fef"
+    "revision": "10eb01d29827f24b1271672e89790661d94da9e1"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index b279d026f..a73a69356 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -63,7 +63,7 @@
 (navigation_expression
   (navigation_suffix (simple_identifier) @property))
 (value_argument
-  name: (simple_identifier) @property)
+  name: (value_argument_label) @property)
 
 (import_declaration ["import" @include])
 
@@ -186,3 +186,4 @@
  "..."
   (bang)
 ] @operator
+

From 991ae3da02137f6c65095b38fff8a315d3e9e2b1 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 11 Sep 2023 06:35:53 +0000
Subject: [PATCH 0688/2704] Update parsers: strace

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index a238ef7c5..dad93e263 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -534,7 +534,7 @@
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
   },
   "strace": {
-    "revision": "ef4a74c43565572db9c06596d99ccb0210db13e5"
+    "revision": "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e"
   },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"

From 15d327fe6324d8269451131ec34ad4f2a8ef1e01 Mon Sep 17 00:00:00 2001
From: L Lllvvuu <git@llllvvuu.dev>
Date: Sun, 10 Sep 2023 13:53:10 -0700
Subject: [PATCH 0689/2704] fix!: backport `ac9e755` from `main`

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>
Closes: neovim/neovim#25088
---
 lua/nvim-treesitter/indent.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 40c0cda46..80e0bc77b 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -124,7 +124,7 @@ function M.get_indent(lnum)
   -- some languages like Python will actually have worse results when re-parsing at opened new line
   if not M.avoid_force_reparsing[root_lang] then
     -- Reparse in case we got triggered by ":h indentkeys"
-    parser:parse()
+    parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" - 1 }
   end
 
   -- Get language tree with smallest range around node that's not a comment parser

From bfb4601f48c127ae6fb24a30ebf0495aaca8d28f Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Tue, 12 Sep 2023 15:36:50 +0900
Subject: [PATCH 0690/2704] refactor: remove `include-children` from queries
 (#5226)

These `include-children` were to alleviate an issue with empty range language tree, which has been fixed for Neovim nightly/Neovim 0.9.2
---
 queries/html/injections.scm            |  9 +++------
 queries/html_tags/injections.scm       | 27 +++++++++-----------------
 queries/lua/injections.scm             | 12 ++++++------
 queries/markdown_inline/injections.scm |  6 ++----
 queries/svelte/injections.scm          | 12 ++++--------
 queries/vue/injections.scm             | 24 ++++++++---------------
 6 files changed, 32 insertions(+), 58 deletions(-)

diff --git a/queries/html/injections.scm b/queries/html/injections.scm
index eba8395a4..7087abc73 100644
--- a/queries/html/injections.scm
+++ b/queries/html/injections.scm
@@ -5,8 +5,7 @@
     (tag_name) @_py_script)
   (text) @injection.content
   (#any-of? @_py_script "py-script" "py-repl")
-  (#set! injection.language "python")
-  (#set! injection.include-children))
+  (#set! injection.language "python"))
 
 (script_element
   (start_tag
@@ -18,13 +17,11 @@
   (#eq? @_attr "type")
   ; not adding type="py" here as it's handled by html_tags 
   (#any-of? @_type "pyscript" "py-script")
-  (#set! injection.language "python")
-  (#set! injection.include-children))
+  (#set! injection.language "python"))
 
 (element
   (start_tag
     (tag_name) @_py_config)
   (text) @injection.content
   (#eq? @_py_config "py-config")
-  (#set! injection.language "toml")
-  (#set! injection.include-children))
+  (#set! injection.language "toml"))
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 5b9e5350f..563e7453d 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -7,8 +7,7 @@
     (raw_text) @injection.content)
   (#not-lua-match? @_no_type_lang "%slang%s*=")
   (#not-lua-match? @_no_type_lang "%stype%s*=")
-  (#set! injection.language "css")
-  (#set! injection.include-children))
+  (#set! injection.language "css"))
 
 ((style_element
    (start_tag
@@ -18,8 +17,7 @@
    (raw_text) @injection.content)
  (#eq? @_type "type")
  (#eq? @_css "text/css")
- (#set! injection.language "css")
- (#set! injection.include-children))
+ (#set! injection.language "css"))
 
 ; <script>...</script>
 ; <script defer>...</script>
@@ -28,8 +26,7 @@
    (raw_text) @injection.content)
  (#not-lua-match? @_no_type_lang "%slang%s*=")
  (#not-lua-match? @_no_type_lang "%stype%s*=")
- (#set! injection.language "javascript")
- (#set! injection.include-children))
+ (#set! injection.language "javascript"))
 
 ; <script type="mimetype-or-well-known-script-type">
 (script_element
@@ -37,16 +34,14 @@
     ((attribute
          (attribute_name) @_attr (#eq? @_attr "type")
          (quoted_attribute_value (attribute_value) @_type))))
-  (raw_text) @injection.content (#set-lang-from-mimetype! @_type)
-  (#set! injection.include-children))
+  (raw_text) @injection.content (#set-lang-from-mimetype! @_type))
 
 ; <a style="/* css */">
 ((attribute
    (attribute_name) @_attr
    (quoted_attribute_value (attribute_value) @injection.content))
  (#eq? @_attr "style")
- (#set! injection.language "css")
- (#set! injection.include-children))
+ (#set! injection.language "css"))
 
 ; lit-html style template interpolation
 ; <a @click=${e => console.log(e)}>
@@ -55,15 +50,13 @@
   (quoted_attribute_value (attribute_value) @injection.content))
   (#lua-match? @injection.content "%${")
   (#offset! @injection.content 0 2 0 -1)
-  (#set! injection.language "javascript")
-  (#set! injection.include-children))
+  (#set! injection.language "javascript"))
 
 ((attribute
   (attribute_value) @injection.content)
   (#lua-match? @injection.content "%${")
   (#offset! @injection.content 0 2 0 -2)
-  (#set! injection.language "javascript")
-  (#set! injection.include-children))
+  (#set! injection.language "javascript"))
 
 ; <input pattern="[0-9]"> or <input pattern=[0-9]>
 (element (_
@@ -73,13 +66,11 @@
       (quoted_attribute_value (attribute_value) @injection.content)
       (attribute_value) @injection.content
     ] (#eq? @_attr "pattern")))
-  (#set! injection.language "regex")
-  (#set! injection.include-children)))
+  (#set! injection.language "regex")))
 
 ; <input type="checkbox" onchange="this.closest('form').elements.output.value = this.checked">
 (attribute
   (attribute_name) @_name
   (#lua-match? @_name "^on[a-z]+$")
   (quoted_attribute_value (attribute_value) @injection.content)
-  (#set! injection.language "javascript")
-  (#set! injection.include-children))
+  (#set! injection.language "javascript"))
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 85c677665..bd91c5902 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -33,10 +33,10 @@
  (#lua-match? @injection.content "^%s*;+%s?query")
  (#set! injection.language "query"))
 
-((comment) @injection.content
-  (#lua-match? @injection.content "^[-][-][-][%s]*@")
+(comment
+  content: (_) @injection.content
+  (#lua-match? @injection.content "^[-][%s]*@")
   (#set! injection.language "luadoc")
-  (#set! injection.include-children)
   (#offset! @injection.content 0 3 0 0))
 
 ; string.match("123", "%d+")
@@ -87,6 +87,6 @@
                  (#set! injection.language "luap")
                  (#set! injection.include-children))))
 
-((comment) @injection.content
-  (#set! injection.language "comment")
-  (#set! injection.include-children))
+(comment
+   content: (_) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/markdown_inline/injections.scm b/queries/markdown_inline/injections.scm
index f7aa19caf..33b97c481 100644
--- a/queries/markdown_inline/injections.scm
+++ b/queries/markdown_inline/injections.scm
@@ -1,8 +1,6 @@
 ((html_tag) @injection.content
  (#set! injection.language "html")
- (#set! injection.combined)
- (#set! injection.include-children))
+ (#set! injection.combined))
 
 ((latex_block) @injection.content
- (#set! injection.language "latex")
- (#set! injection.include-children))
+ (#set! injection.language "latex"))
diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index 679919dc6..187b40f4d 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -8,15 +8,13 @@
     (raw_text) @injection.content)
   (#eq? @_attr "lang")
   (#any-of? @_lang "scss" "postcss" "less")
-  (#set! injection.language "scss")
-  (#set! injection.include-children))
+  (#set! injection.language "scss"))
 
 ([
   (raw_text_expr)
   (raw_text_each)
 ] @injection.content
- (#set! injection.language "javascript")
- (#set! injection.include-children))
+ (#set! injection.language "javascript"))
 
 ((script_element
     (start_tag
@@ -26,8 +24,7 @@
     (raw_text) @injection.content)
  (#eq? @_attr "lang") 
  (#any-of? @_lang "ts" "typescript")
- (#set! injection.language "typescript")
- (#set! injection.include-children))
+ (#set! injection.language "typescript"))
 
 ((element
    (start_tag
@@ -37,5 +34,4 @@
          (attribute_value) @injection.language)))
    (text) @injection.content)
  (#eq? @_attr "lang") 
- (#eq? @injection.language "pug")
- (#set! injection.include-children))
+ (#eq? @injection.language "pug"))
diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index 215fe1081..57a264d9b 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -8,8 +8,7 @@
         (quoted_attribute_value (attribute_value) @injection.language)))
     (raw_text) @injection.content)
     (#eq? @_lang "lang")
-    (#any-of? @injection.language "css" "scss")
-    (#set! injection.include-children))
+    (#any-of? @injection.language "css" "scss"))
 
 ; TODO: When nvim-treesitter has postcss and less parsers, use @injection.language and @injection.content instead
 ; <script lang="scss">
@@ -21,8 +20,7 @@
     (raw_text) @injection.content
     (#eq? @_lang "lang")
     (#any-of? @_scss "less" "postcss")
-    (#set! injection.language "scss")
-    (#set! injection.include-children)))
+    (#set! injection.language "scss")))
 
 ; <script lang="js">
 ((script_element
@@ -33,8 +31,7 @@
     (raw_text) @injection.content)
     (#eq? @_lang "lang")
     (#eq? @_js "js")
-    (#set! injection.language "javascript")
-    (#set! injection.include-children))
+    (#set! injection.language "javascript"))
 
 ; <script lang="ts">
 ((script_element
@@ -45,8 +42,7 @@
     (raw_text) @injection.content)
     (#eq? @_lang "lang")
     (#eq? @_ts "ts")
-    (#set! injection.language "typescript")
-    (#set! injection.include-children))
+    (#set! injection.language "typescript"))
 
 ; <script lang="tsx">
 ; <script lang="jsx">
@@ -57,24 +53,20 @@
         (quoted_attribute_value (attribute_value) @injection.language)))
     (#eq? @_attr "lang")
     (#any-of? @injection.language "tsx" "jsx")
-    (raw_text) @injection.content)
-    (#set! injection.include-children))
+    (raw_text) @injection.content))
 
 ((interpolation
   (raw_text) @injection.content)
-  (#set! injection.language "javascript")
-  (#set! injection.include-children))
+  (#set! injection.language "javascript"))
 
 (directive_attribute
   (quoted_attribute_value
     (attribute_value) @injection.content
-    (#set! injection.language "javascript")
-    (#set! injection.include-children)))
+    (#set! injection.language "javascript")))
 
 (template_element
     (start_tag
       (attribute
         (quoted_attribute_value (attribute_value) @injection.language)))
     (text) @injection.content
-    (#eq? @injection.language "pug")
-    (#set! injection.include-children))
+    (#eq? @injection.language "pug"))

From 0ba881b7a2af0e24962e4522cf15ebd642261a90 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 12 Sep 2023 06:35:39 +0000
Subject: [PATCH 0691/2704] Update parsers: gleam, vhs, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dad93e263..0fef1cb50 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -186,7 +186,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a"
+    "revision": "297031dce60e07acf90345d62777623469e46027"
   },
   "glimmer": {
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
@@ -618,7 +618,7 @@
     "revision": "902031343056bc0b11f3e47b33f036a9cf59f58d"
   },
   "vhs": {
-    "revision": "fec6e981b7795b68262ddf229d73d2aa03a89b9a"
+    "revision": "375b42e9845f704dd491c17c7e37f7c972e0faf3"
   },
   "vim": {
     "revision": "77e9e96c2ae5cff7343ce3dced263483acf95793"
@@ -636,7 +636,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6fcfe7db18944f57dff8fb46bee927f704fe2df8"
+    "revision": "466955fbb51b542e539c833ed63ca3c7b8f53a20"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 905e782e803e200ec43b0b31fee37164cb2249a0 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Tue, 12 Sep 2023 23:46:39 +0900
Subject: [PATCH 0692/2704] perf(comment): remove spell capture

Problem:
Comment highlight query produces too many @spell captures.

Solution:
Remove the query. This is fine because comment parser is only used in
injection and the parent language has @spell for comment.
---
 queries/comment/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 70aa92de2..87491c7a5 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -1,5 +1,3 @@
-(_) @spell
-
 ((tag
   (name) @text.todo @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?

From 9567185621e532a9e29a671c66a11011334b80ea Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Wed, 13 Sep 2023 00:25:01 +0900
Subject: [PATCH 0693/2704] feat: @spell on comments

---
 queries/agda/highlights.scm              | 2 +-
 queries/bibtex/highlights.scm            | 2 ++
 queries/blueprint/highlights.scm         | 2 +-
 queries/corn/highlights.scm              | 2 +-
 queries/devicetree/highlights.scm        | 2 +-
 queries/ebnf/highlights.scm              | 2 +-
 queries/eex/highlights.scm               | 2 +-
 queries/elsa/highlights.scm              | 2 +-
 queries/elvish/highlights.scm            | 2 +-
 queries/embedded_template/highlights.scm | 2 +-
 queries/foam/highlights.scm              | 2 +-
 queries/forth/highlights.scm             | 2 +-
 queries/fusion/highlights.scm            | 4 ++--
 queries/glimmer/highlights.scm           | 2 +-
 queries/gomod/highlights.scm             | 2 +-
 queries/gowork/highlights.scm            | 2 +-
 queries/heex/highlights.scm              | 2 +-
 queries/hjson/highlights.scm             | 2 +-
 queries/hocon/highlights.scm             | 2 +-
 queries/html_tags/highlights.scm         | 2 +-
 queries/ini/highlights.scm               | 2 +-
 queries/json5/highlights.scm             | 2 +-
 queries/jsonnet/highlights.scm           | 2 +-
 queries/kconfig/highlights.scm           | 2 +-
 queries/latex/highlights.scm             | 2 +-
 queries/ledger/highlights.scm            | 2 +-
 queries/llvm/highlights.scm              | 2 +-
 queries/m68k/highlights.scm              | 2 +-
 queries/menhir/highlights.scm            | 2 +-
 queries/meson/highlights.scm             | 2 +-
 queries/mlir/highlights.scm              | 2 +-
 queries/ninja/highlights.scm             | 2 ++
 queries/nix/highlights.scm               | 2 +-
 queries/ocaml/highlights.scm             | 2 +-
 queries/ocamllex/highlights.scm          | 2 +-
 queries/pem/highlights.scm               | 2 +-
 queries/pioasm/highlights.scm            | 2 +-
 queries/pymanifest/highlights.scm        | 2 +-
 queries/qmljs/highlights.scm             | 2 +-
 queries/rasi/highlights.scm              | 2 +-
 queries/rego/highlights.scm              | 2 +-
 queries/robot/highlights.scm             | 2 +-
 queries/scss/highlights.scm              | 2 +-
 queries/slint/highlights.scm             | 2 +-
 queries/sparql/highlights.scm            | 2 +-
 queries/strace/highlights.scm            | 2 +-
 queries/supercollider/highlights.scm     | 4 ++--
 queries/surface/highlights.scm           | 2 +-
 queries/sxhkdrc/highlights.scm           | 2 +-
 queries/tiger/highlights.scm             | 2 +-
 queries/tlaplus/highlights.scm           | 4 ++--
 queries/turtle/highlights.scm            | 2 +-
 queries/ungrammar/highlights.scm         | 2 +-
 queries/wgsl/highlights.scm              | 2 +-
 queries/wing/highlights.scm              | 2 +-
 queries/yang/highlights.scm              | 2 +-
 56 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/queries/agda/highlights.scm b/queries/agda/highlights.scm
index ed208f1b6..7a4e954e8 100644
--- a/queries/agda/highlights.scm
+++ b/queries/agda/highlights.scm
@@ -35,7 +35,7 @@
 
 (pragma) @preproc
 
-(comment) @comment
+(comment) @comment @spell
 
 ;; Keywords
 [
diff --git a/queries/bibtex/highlights.scm b/queries/bibtex/highlights.scm
index 00cae314d..bd240f581 100644
--- a/queries/bibtex/highlights.scm
+++ b/queries/bibtex/highlights.scm
@@ -11,6 +11,8 @@
   (comment)
 ] @comment
 
+(comment) @spell
+
 [
   "="
   "#"
diff --git a/queries/blueprint/highlights.scm b/queries/blueprint/highlights.scm
index 3d4b48266..d85986ffd 100644
--- a/queries/blueprint/highlights.scm
+++ b/queries/blueprint/highlights.scm
@@ -3,7 +3,7 @@
 (string) @string
 (escape_sequence) @string.escape
 
-(comment) @comment
+(comment) @comment @spell
 
 (constant) @constant.builtin
 
diff --git a/queries/corn/highlights.scm b/queries/corn/highlights.scm
index 9bb0274e5..66873492f 100644
--- a/queries/corn/highlights.scm
+++ b/queries/corn/highlights.scm
@@ -11,7 +11,7 @@
 "." @punctuation.delimiter
 
 (input) @constant
-(comment) @comment
+(comment) @comment @spell
 
 (string) @string
 (integer) @number
diff --git a/queries/devicetree/highlights.scm b/queries/devicetree/highlights.scm
index e3140a5da..a7504260a 100644
--- a/queries/devicetree/highlights.scm
+++ b/queries/devicetree/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 [
   (preproc_include)
diff --git a/queries/ebnf/highlights.scm b/queries/ebnf/highlights.scm
index feafa1cef..00acf59e0 100644
--- a/queries/ebnf/highlights.scm
+++ b/queries/ebnf/highlights.scm
@@ -5,7 +5,7 @@
 
 (integer) @number
 
-(comment) @comment
+(comment) @comment @spell
 
 ;;;; Identifiers ;;;;
 
diff --git a/queries/eex/highlights.scm b/queries/eex/highlights.scm
index 781b39466..29b733e89 100644
--- a/queries/eex/highlights.scm
+++ b/queries/eex/highlights.scm
@@ -9,7 +9,7 @@
 ] @tag.delimiter
 
 ; EEx comments are highlighted as such
-(comment) @comment
+(comment) @comment @spell
 
 ; Tree-sitter parser errors
 (ERROR) @error
diff --git a/queries/elsa/highlights.scm b/queries/elsa/highlights.scm
index 7021a0970..c787dadd8 100644
--- a/queries/elsa/highlights.scm
+++ b/queries/elsa/highlights.scm
@@ -38,4 +38,4 @@
 
 ; Comments
 
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
index af7c41dd8..886f5bcda 100644
--- a/queries/elvish/highlights.scm
+++ b/queries/elvish/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 ["if" "elif"] @conditional
 (if (else "else" @conditional))
diff --git a/queries/embedded_template/highlights.scm b/queries/embedded_template/highlights.scm
index 0bf76a7d4..410983d65 100644
--- a/queries/embedded_template/highlights.scm
+++ b/queries/embedded_template/highlights.scm
@@ -1,4 +1,4 @@
-(comment_directive) @comment
+(comment_directive) @comment @spell
 
 [
   "<%#"
diff --git a/queries/foam/highlights.scm b/queries/foam/highlights.scm
index 5d45b0a34..aba33b4e8 100644
--- a/queries/foam/highlights.scm
+++ b/queries/foam/highlights.scm
@@ -1,5 +1,5 @@
 ;; Comments
-(comment) @comment
+(comment) @comment @spell
 
 ;; Generic Key-value pairs and dictionary keywords
 (key_value
diff --git a/queries/forth/highlights.scm b/queries/forth/highlights.scm
index e8c53e9ce..c2c5c3801 100644
--- a/queries/forth/highlights.scm
+++ b/queries/forth/highlights.scm
@@ -16,6 +16,6 @@
   (end_definition)
 ] @punctuation.delimiter
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/fusion/highlights.scm b/queries/fusion/highlights.scm
index bb24a413f..81f471f68 100644
--- a/queries/fusion/highlights.scm
+++ b/queries/fusion/highlights.scm
@@ -1,5 +1,5 @@
-(comment) @comment
-(afx_comment) @comment
+(comment) @comment @spell
+(afx_comment) @comment @spell
 
 ; identifiers afx
 (afx_opening_element
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index 70a48cf83..a577ba425 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -73,7 +73,7 @@
 
 (hash_pair key: (identifier) @property)
 
-(comment_statement) @comment
+(comment_statement) @comment @spell
 
 (attribute_node "=" @operator)
 
diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
index 46cd3b65e..36a676414 100644
--- a/queries/gomod/highlights.scm
+++ b/queries/gomod/highlights.scm
@@ -9,7 +9,7 @@
 
 "=>" @operator
 
-(comment) @comment
+(comment) @comment @spell
 (module_path) @text.uri
 
 [
diff --git a/queries/gowork/highlights.scm b/queries/gowork/highlights.scm
index 9c84bcc44..0584f1a68 100644
--- a/queries/gowork/highlights.scm
+++ b/queries/gowork/highlights.scm
@@ -6,7 +6,7 @@
 
 "=>" @operator
 
-(comment) @comment
+(comment) @comment @spell
 
 [
 (version)
diff --git a/queries/heex/highlights.scm b/queries/heex/highlights.scm
index 7dd4dd6fd..fe85a0652 100644
--- a/queries/heex/highlights.scm
+++ b/queries/heex/highlights.scm
@@ -27,7 +27,7 @@
 (doctype) @constant
 
 ; HEEx comments are highlighted as such
-(comment) @comment
+(comment) @comment @spell
 
 ; HEEx text content is treated as markup
 (text) @text
diff --git a/queries/hjson/highlights.scm b/queries/hjson/highlights.scm
index c8eed139f..8d5f5998d 100644
--- a/queries/hjson/highlights.scm
+++ b/queries/hjson/highlights.scm
@@ -13,4 +13,4 @@
 "{" @punctuation.bracket
 "}" @punctuation.bracket
 
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/hocon/highlights.scm b/queries/hocon/highlights.scm
index 3fb8249a9..1fdd6ca4b 100644
--- a/queries/hocon/highlights.scm
+++ b/queries/hocon/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 (null) @constant.builtin
 [ (true) (false) ] @boolean
diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index e789fd922..d51f9b27e 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -1,6 +1,6 @@
 (tag_name) @tag
 (erroneous_end_tag_name) @error
-(comment) @comment
+(comment) @comment @spell
 (attribute_name) @tag.attribute
 (attribute
   (quoted_attribute_value) @string)
diff --git a/queries/ini/highlights.scm b/queries/ini/highlights.scm
index e14d5a334..dfe46cc72 100644
--- a/queries/ini/highlights.scm
+++ b/queries/ini/highlights.scm
@@ -1,6 +1,6 @@
 (section_name
   (text) @type) ; consistency with toml
-(comment) @comment
+(comment) @comment @spell
 
 [
  "["
diff --git a/queries/json5/highlights.scm b/queries/json5/highlights.scm
index 4e41971ba..202d084b0 100644
--- a/queries/json5/highlights.scm
+++ b/queries/json5/highlights.scm
@@ -9,7 +9,7 @@
 
 (number) @number
 
-(comment) @comment
+(comment) @comment @spell
 
 (member
     name: (_) @keyword)
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index b0769c639..2ec60d0a7 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -1,5 +1,5 @@
 (id) @variable
-(comment) @comment
+(comment) @comment @spell
 
 ; Literals
 (null) @constant.builtin
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index c18c69f69..71889cb5e 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -76,6 +76,6 @@
 
 (source (prompt) @text.uri @string.special)
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 66cd8b6f3..8bb8fb10c 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -13,7 +13,7 @@
  (line_comment)
  (block_comment)
  (comment_environment)
-] @comment
+] @comment @spell
 
 ((line_comment) @preproc
   (#lua-match? @preproc "^%% !TeX"))
diff --git a/queries/ledger/highlights.scm b/queries/ledger/highlights.scm
index 963de1882..185269a00 100644
--- a/queries/ledger/highlights.scm
+++ b/queries/ledger/highlights.scm
@@ -3,7 +3,7 @@
     (comment)
     (note)
     (test)
-] @comment
+] @comment @spell
 
 [
     (quantity)
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index e2857b02c..c788aaafd 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -112,7 +112,7 @@
   ] @keyword.function)
 
 (number) @number
-(comment) @comment
+(comment) @comment @spell
 (string) @string
 (cstring) @string
 (label) @label
diff --git a/queries/m68k/highlights.scm b/queries/m68k/highlights.scm
index 49acaad1d..edb36cd57 100644
--- a/queries/m68k/highlights.scm
+++ b/queries/m68k/highlights.scm
@@ -47,7 +47,7 @@
 (repeat (control_mnemonic) @repeat)
 (conditional (control_mnemonic) @conditional)
 
-(comment) @comment
+(comment) @comment @spell
 
 [
   (operator)
diff --git a/queries/menhir/highlights.scm b/queries/menhir/highlights.scm
index 64789ee49..14bd2ea8d 100644
--- a/queries/menhir/highlights.scm
+++ b/queries/menhir/highlights.scm
@@ -25,5 +25,5 @@
 (ocaml_type) @type
 (ocaml) @none
 
-[(comment) (line_comment) (ocaml_comment)] @comment
+[(comment) (line_comment) (ocaml_comment)] @comment @spell
 (ERROR) @error
diff --git a/queries/meson/highlights.scm b/queries/meson/highlights.scm
index f687f5ae0..14fc52136 100644
--- a/queries/meson/highlights.scm
+++ b/queries/meson/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 (number) @number
 (bool) @boolean
 
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index 3cc3c671a..a25d4c3f9 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -332,4 +332,4 @@
 
 (caret_id) @tag
 (value_use) @variable
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/ninja/highlights.scm b/queries/ninja/highlights.scm
index 1b31b560c..e90169ff3 100644
--- a/queries/ninja/highlights.scm
+++ b/queries/ninja/highlights.scm
@@ -96,3 +96,5 @@
  (split)
  (comment)
 ] @comment
+
+(comment) @spell
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index d30deeaf5..b83a81027 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -30,7 +30,7 @@
 "or" @keyword.operator
 
 ; comments
-(comment) @comment
+(comment) @comment @spell
 
 ; strings
 ([ (string_expression) (indented_string_expression) ]
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index db70575e8..ba9ea4def 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -172,6 +172,6 @@
 ; Comments
 ;---------
 
-[(comment) (line_number_directive) (directive) (shebang)] @comment
+[(comment) (line_number_directive) (directive) (shebang)] @comment @spell
 
 (ERROR) @error
diff --git a/queries/ocamllex/highlights.scm b/queries/ocamllex/highlights.scm
index 060a57dc8..3673206ae 100644
--- a/queries/ocamllex/highlights.scm
+++ b/queries/ocamllex/highlights.scm
@@ -37,5 +37,5 @@
 
 ; Misc
 
-(comment) @comment
+(comment) @comment @spell
 (ERROR) @error
diff --git a/queries/pem/highlights.scm b/queries/pem/highlights.scm
index 9192e88c0..82289c6a9 100644
--- a/queries/pem/highlights.scm
+++ b/queries/pem/highlights.scm
@@ -6,6 +6,6 @@
 
 (data) @none
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm
index aa176aa24..055f745b4 100644
--- a/queries/pioasm/highlights.scm
+++ b/queries/pioasm/highlights.scm
@@ -1,4 +1,4 @@
-[ (line_comment) (block_comment) ] @comment
+[ (line_comment) (block_comment) ] @comment @spell
 
 (label_decl) @label
 
diff --git a/queries/pymanifest/highlights.scm b/queries/pymanifest/highlights.scm
index f2522443e..2205509ab 100644
--- a/queries/pymanifest/highlights.scm
+++ b/queries/pymanifest/highlights.scm
@@ -19,4 +19,4 @@
 
 (ERROR) @error
 
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 7c0c866d9..40008aad9 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -93,7 +93,7 @@
   (undefined)
 ] @constant.builtin
 
-(comment) @comment
+(comment) @comment @spell
 
 [
   (string)
diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index e2be63ffb..7936d99ed 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 "@media" @keyword
 "@import" @include
diff --git a/queries/rego/highlights.scm b/queries/rego/highlights.scm
index 42d276cd2..8d15d4fb4 100644
--- a/queries/rego/highlights.scm
+++ b/queries/rego/highlights.scm
@@ -37,7 +37,7 @@
 
 (term (ref (var))) @variable
 
-(comment) @comment
+(comment) @comment @spell
 
 (number) @number
 
diff --git a/queries/robot/highlights.scm b/queries/robot/highlights.scm
index 152526f70..06c559986 100644
--- a/queries/robot/highlights.scm
+++ b/queries/robot/highlights.scm
@@ -1,7 +1,7 @@
 [
   (comment)
   (extra_text)
-] @comment
+] @comment @spell
 
 [
   (section_header)
diff --git a/queries/scss/highlights.scm b/queries/scss/highlights.scm
index 2e6de820f..f45b4301e 100644
--- a/queries/scss/highlights.scm
+++ b/queries/scss/highlights.scm
@@ -26,7 +26,7 @@
   "in"
 ] @repeat
 
-(single_line_comment) @comment
+(single_line_comment) @comment @spell
 (function_name) @function
 
 
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 8928bc9a5..2ec720c33 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -1,6 +1,6 @@
 (identifier) @variable
 (type_identifier) @type
-(comment) @comment
+(comment) @comment @spell
 (int_literal) @number
 (float_literal) @float
 (string_literal) @string
diff --git a/queries/sparql/highlights.scm b/queries/sparql/highlights.scm
index 8b09502bc..2cc745b65 100644
--- a/queries/sparql/highlights.scm
+++ b/queries/sparql/highlights.scm
@@ -176,7 +176,7 @@
 ] @keyword.operator
 
 
-(comment) @comment
+(comment) @comment @spell
 
 
 ; Could this be summarized?
diff --git a/queries/strace/highlights.scm b/queries/strace/highlights.scm
index fff706f01..f45ef31c9 100644
--- a/queries/strace/highlights.scm
+++ b/queries/strace/highlights.scm
@@ -49,6 +49,6 @@
   "=>"
 ] @punctuation.delimiter
 
-(comment) @comment
+(comment) @comment @spell
 
 (ERROR) @error
diff --git a/queries/supercollider/highlights.scm b/queries/supercollider/highlights.scm
index f9b6d6f1f..43b3087de 100644
--- a/queries/supercollider/highlights.scm
+++ b/queries/supercollider/highlights.scm
@@ -2,8 +2,8 @@
 ; See this for full list: https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md
 
 ; comments
-(line_comment) @comment
-(block_comment) @comment
+(line_comment) @comment @spell
+(block_comment) @comment @spell
 
 ; Argument definition
 (argument name: (identifier) @parameter)
diff --git a/queries/surface/highlights.scm b/queries/surface/highlights.scm
index 0144193c9..35de877c9 100644
--- a/queries/surface/highlights.scm
+++ b/queries/surface/highlights.scm
@@ -2,7 +2,7 @@
 (text) @text
 
 ; Surface has two types of comments, both are highlighted as such
-(comment) @comment
+(comment) @comment @spell
 
 ; Surface attributes are highlighted as HTML attributes
 (attribute_name) @tag.attribute
diff --git a/queries/sxhkdrc/highlights.scm b/queries/sxhkdrc/highlights.scm
index 03b70221e..b4a58eb9a 100644
--- a/queries/sxhkdrc/highlights.scm
+++ b/queries/sxhkdrc/highlights.scm
@@ -5,6 +5,6 @@
 (punctuation) @punctuation.bracket
 (delimiter) @punctuation.delimiter
 (keysym) @variable
-(comment) @comment
+(comment) @comment @spell
 (range) @number
 "\\\n" @punctuation.special
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index c0dd7dadf..f4f666d8d 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -111,7 +111,7 @@
 ; }}}
 
 ; Misc {{{
-(comment) @comment
+(comment) @comment @spell
 
 (type_identifier) @type
 (field_identifier) @property
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index 2199359f8..0dd0fd939 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -232,8 +232,8 @@
 ; Comments and tags
 (block_comment "(*" @comment)
 (block_comment "*)" @comment)
-(block_comment_text) @comment
-(comment) @comment
+(block_comment_text) @comment @spell
+(comment) @comment @spell
 (single_line) @comment
 (_ label: (identifier) @label)
 (label name: (_) @label)
diff --git a/queries/turtle/highlights.scm b/queries/turtle/highlights.scm
index 0608f96ae..fac576781 100644
--- a/queries/turtle/highlights.scm
+++ b/queries/turtle/highlights.scm
@@ -48,7 +48,7 @@
   (anon)
 ] @punctuation.bracket
 
-(comment) @comment
+(comment) @comment @spell
 
 (echar) @string.escape
 
diff --git a/queries/ungrammar/highlights.scm b/queries/ungrammar/highlights.scm
index 027c6e008..c441eab70 100644
--- a/queries/ungrammar/highlights.scm
+++ b/queries/ungrammar/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 (definition) @keyword
 
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index c46221916..d2fa7409a 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -101,6 +101,6 @@
 (attribute
     (identifier) @attribute)
 
-[(line_comment) (block_comment)] @comment
+[(line_comment) (block_comment)] @comment @spell
 
 (ERROR) @error
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 7fdf3a8f3..0e8bd6492 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -36,7 +36,7 @@
 
 ; Special
 
-(comment) @comment
+(comment) @comment @spell
 
 [
   "("
diff --git a/queries/yang/highlights.scm b/queries/yang/highlights.scm
index 9604a39a8..c2c302a71 100644
--- a/queries/yang/highlights.scm
+++ b/queries/yang/highlights.scm
@@ -1,5 +1,5 @@
 
-(comment) @comment
+(comment) @comment @spell
 
 ; Module / submodule
 ["module" "submodule"] @keyword

From 2461e5ac21c59950457fea4b3f9f184f0daa8913 Mon Sep 17 00:00:00 2001
From: osthomas <8322329+osthomas@users.noreply.github.com>
Date: Wed, 13 Sep 2023 03:29:22 +0200
Subject: [PATCH 0694/2704] feat: add Snakemake

---
 lockfile.json                    |  3 ++
 lua/nvim-treesitter/parsers.lua  |  9 +++++
 queries/snakemake/folds.scm      |  6 +++
 queries/snakemake/highlights.scm | 64 ++++++++++++++++++++++++++++++++
 queries/snakemake/injections.scm |  4 ++
 queries/snakemake/locals.scm     |  1 +
 6 files changed, 87 insertions(+)
 create mode 100644 queries/snakemake/folds.scm
 create mode 100644 queries/snakemake/highlights.scm
 create mode 100644 queries/snakemake/injections.scm
 create mode 100644 queries/snakemake/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 0fef1cb50..5a2ed3c54 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -518,6 +518,9 @@
   "smithy": {
     "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"
   },
+  "snakemake": {
+    "revision": "65a6c3b4671877821082164da0a310851b211953"
+  },
   "solidity": {
     "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6fc18cbf9..5251fdb4a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1520,6 +1520,15 @@ list.smali = {
   maintainers = { "@amaanq" },
 }
 
+list.snakemake = {
+  install_info = {
+    url = "https://github.com/osthomas/tree-sitter-snakemake",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainer = { "@osthomas" },
+  experimental = true,
+}
+
 list.smithy = {
   install_info = {
     url = "https://github.com/indoorvivants/tree-sitter-smithy",
diff --git a/queries/snakemake/folds.scm b/queries/snakemake/folds.scm
new file mode 100644
index 000000000..36ed2318b
--- /dev/null
+++ b/queries/snakemake/folds.scm
@@ -0,0 +1,6 @@
+; inherits: python
+[
+  (rule_definition)
+  (module_definition)
+  (checkpoint_definition)
+] @fold
diff --git a/queries/snakemake/highlights.scm b/queries/snakemake/highlights.scm
new file mode 100644
index 000000000..8b173e0b5
--- /dev/null
+++ b/queries/snakemake/highlights.scm
@@ -0,0 +1,64 @@
+; inherits: python
+
+;; Compound directives
+["rule" "checkpoint" "module"] @keyword
+
+;; Top level directives (eg. configfile, include)
+(module (directive name: _ @keyword))
+
+;; Subordinate directives (eg. input, output)
+(_ body: (_ (directive name: _ @label)))
+
+;; rule/module/checkpoint names
+(rule_definition name: (identifier) @type)
+(module_definition name: (identifier) @type)
+(checkpoint_definition name: (identifier) @type)
+
+
+;; Rule imports
+(rule_import
+  "use" @include
+  "rule" @include
+  "from" @include
+  "as"? @include
+  "with"? @include
+)
+
+
+;; Rule inheritance
+(rule_inheritance
+  "use" @keyword
+  "rule" @keyword
+  "with" @keyword
+)
+
+
+;; Wildcard names
+(wildcard (identifier) @variable)
+
+
+;; builtin variables
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "checkpoints" "config" "gather" "rules" "scatter" "workflow"))
+
+
+;; References to directive labels in wildcard interpolations
+
+;; the #any-of? queries are moved above the #has-ancestor? queries to
+;; short-circuit the potentially expensive tree traversal, if possible
+;; see:
+;; https://github.com/nvim-treesitter/nvim-treesitter/pull/4302#issuecomment-1685789790
+
+;; directive labels in wildcard context
+((wildcard (identifier) @label)
+  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+((wildcard (attribute object: (identifier) @label))
+  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+((wildcard (subscript value: (identifier) @label))
+  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+
+;; directive labels in block context (eg. within 'run:')
+((identifier) @label
+  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards")
+  (#has-ancestor? @label "directive")
+  (#has-ancestor? @label "block"))
diff --git a/queries/snakemake/injections.scm b/queries/snakemake/injections.scm
new file mode 100644
index 000000000..dd41cbadb
--- /dev/null
+++ b/queries/snakemake/injections.scm
@@ -0,0 +1,4 @@
+; inherits: python
+
+(wildcard (constraint) @injection.content
+  (#set! injection.language "regex"))
diff --git a/queries/snakemake/locals.scm b/queries/snakemake/locals.scm
new file mode 100644
index 000000000..0b920cbf9
--- /dev/null
+++ b/queries/snakemake/locals.scm
@@ -0,0 +1 @@
+; inherits: python

From 31d30b3eba3f49de9df9235a2fcaacb3e01d7f0c Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Wed, 13 Sep 2023 01:29:35 +0000
Subject: [PATCH 0695/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cd9687a71..b22f0ff0b 100644
--- a/README.md
+++ b/README.md
@@ -346,6 +346,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [slint](https://github.com/jrmoulton/tree-sitter-slint) (experimental, maintained by @jrmoulton)
 - [x] [smali](https://git.sr.ht/~yotam/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
+- [ ] [snakemake](https://github.com/osthomas/tree-sitter-snakemake) (experimental)
 - [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)
 - [x] [sparql](https://github.com/BonaBeavis/tree-sitter-sparql) (maintained by @BonaBeavis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)

From 9ab4e9cc8989e3811b14897cd0eb21ae35e5541e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 13 Sep 2023 06:36:47 +0000
Subject: [PATCH 0696/2704] Update parsers: glsl, hlsl, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5a2ed3c54..db94345d6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,7 +192,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "4296be48e59be05284be2f79d62b155b61b20518"
+    "revision": "64e786e36398b1e18ccfdbfd964d922a67392ebc"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -240,7 +240,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "45e60a69b4dac922d81474b5d6fa88b4e5387b21"
+    "revision": "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -639,7 +639,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "466955fbb51b542e539c833ed63ca3c7b8f53a20"
+    "revision": "899ebde73fac14dafc76a28d2bb6885d7bc5825e"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 25c591611ec39468cad334457abeac87748c74a9 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 14 Sep 2023 06:36:50 +0000
Subject: [PATCH 0697/2704] Update parsers: t32, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index db94345d6..eb9455ebf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -558,7 +558,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "c17070b014d02319b4cc335d28651926b0ee5ed6"
+    "revision": "5e6ce99611b2fef9b4d812e43898b176185c61ed"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -639,7 +639,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "899ebde73fac14dafc76a28d2bb6885d7bc5825e"
+    "revision": "f04de6bd9073ea09c30573e41238514ea1b545f4"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 5ec42175676bc4e6248b8ca9603acbc86497c68e Mon Sep 17 00:00:00 2001
From: Christoph Sax <christoph.sax@mailbox.org>
Date: Wed, 13 Sep 2023 20:54:04 +0200
Subject: [PATCH 0698/2704] fix(t32): update indent queries & test

The latest release of the grammar changes the handling of consecutive
line breaks. This breaks the existing test for indents.

This commit updates the indent queries and fixes the associated test.
---
 queries/t32/indents.scm       | 22 ++++----------------
 tests/indent/t32/if_block.cmm |  6 +++---
 tests/indent/t32_spec.lua     | 39 ++++++++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/queries/t32/indents.scm b/queries/t32/indents.scm
index 64ee3f571..b30b916d2 100644
--- a/queries/t32/indents.scm
+++ b/queries/t32/indents.scm
@@ -1,28 +1,15 @@
-; Subroutines & scoping
 (block
   ")" @indent.branch .) @indent.begin
 
+(if_block) @indent.begin
 
-; Control flow statements
-(
-  (if_block
-    condition: (_)
-    . (_) @_then) @indent.begin
-  (#not-has-type? @_then block)
-)
+(if_block
+  (block)) @indent.dedent
 
 (else_block) @indent.branch
 
 (else_block
-  (if_block) @indent.dedent) @indent.branch
-
-(
-  (else_block
-    (if_block
-      condition: (_)
-      . (_) @_then)) @indent.branch
-  (#not-has-type? @_then block)
-)
+  (if_block) @indent.dedent)
 
 (while_block
   (command_expression)) @indent.auto
@@ -30,5 +17,4 @@
 (repeat_block
   (command_expression)) @indent.auto
 
-
 (comment) @indent.auto
diff --git a/tests/indent/t32/if_block.cmm b/tests/indent/t32/if_block.cmm
index e85b5e714..4bda7c6e5 100644
--- a/tests/indent/t32/if_block.cmm
+++ b/tests/indent/t32/if_block.cmm
@@ -43,7 +43,7 @@ IF &f
     stop
   ELSE
     IF &h
-  (
-    continue
-  )
+    (
+      continue
+    )
 
diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua
index b305cd61c..88d26612b 100644
--- a/tests/indent/t32_spec.lua
+++ b/tests/indent/t32_spec.lua
@@ -35,7 +35,22 @@ describe("indent t32:", function()
       )
     end
 
-    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 2 }, "command in IF then")
+    -- Insertion of a command right before the existing block results in
+    -- incorrect syntax. The parse either detect an error or incorrectly
+    -- assumes "ELSE IF" is a command.
+    for ii, test in ipairs {
+      { 26, 2 },
+      { 30, 2 },
+    } do
+      runner:new_line(
+        "if_block.cmm",
+        { on_line = test[1], text = 'PRINT ""', indent = test[2] },
+        "displace block in IF then[" .. ii .. "]",
+        XFAIL
+      )
+    end
+
+    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 6 }, "command in IF then", XFAIL)
 
     for ii, test in ipairs {
       { 16, 2 },
@@ -45,7 +60,7 @@ describe("indent t32:", function()
     } do
       runner:new_line(
         "if_block.cmm",
-        { on_line = test[1], text = "(\n", indent = test[2] },
+        { on_line = test[1], text = "CONTinue\n", indent = test[2] },
         "command in IF else[" .. ii .. "]"
       )
     end
@@ -68,8 +83,8 @@ describe("indent t32:", function()
     end
 
     for ii, test in ipairs {
-      { 1, 0, nil },
-      { 4, 2, XFAIL },
+      { 1, 0 },
+      { 4, 2 },
     } do
       runner:new_line(
         "repeat_block.cmm",
@@ -81,9 +96,9 @@ describe("indent t32:", function()
     runner:new_line("repeat_block.cmm", { on_line = 3, text = "(\n", indent = 0 }, "block in RePeaT then")
 
     for ii, test in ipairs {
-      { 7, 2, XFAIL },
-      { 18, 2, nil },
-      { 24, 2, XFAIL },
+      { 7, 2 },
+      { 18, 2 },
+      { 24, 2 },
     } do
       runner:new_line(
         "repeat_block.cmm",
@@ -95,11 +110,11 @@ describe("indent t32:", function()
     runner:new_line("subroutine_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block after call label")
 
     for ii, test in ipairs {
-      { 2, 2, XFAIL },
-      { 3, 2, nil },
-      { 8, 2, XFAIL },
-      { 12, 2, nil },
-      { 19, 2, XFAIL },
+      { 2, 2 },
+      { 3, 2 },
+      { 8, 2 },
+      { 12, 2 },
+      { 19, 2 },
     } do
       runner:new_line(
         "subroutine_block.cmm",

From 48b237fd3f482aef2f5896b8b7a6ece71c19ad99 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 15 Sep 2023 06:35:40 +0000
Subject: [PATCH 0699/2704] Update parsers: cue, nickel, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index eb9455ebf..00ff7b6b9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -84,7 +84,7 @@
     "revision": "f00c91430124797e798cbf28e09075d7d192938a"
   },
   "cue": {
-    "revision": "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"
+    "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
   },
   "d": {
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
@@ -357,7 +357,7 @@
     "revision": "e2053f7c8856d91bc36c87604f697784845cee69"
   },
   "nickel": {
-    "revision": "e1d9337864d209898a08c26b8cd4c2dd14c15148"
+    "revision": "b759233581fd8bae239e905c67a9ba453205da78"
   },
   "ninja": {
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
@@ -639,7 +639,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f04de6bd9073ea09c30573e41238514ea1b545f4"
+    "revision": "3083cc10d3df56f973b8af00a2e48234df9e7a9f"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 831dbb619e0e00d52fe7e636d28dddb683013666 Mon Sep 17 00:00:00 2001
From: Christian Segundo <christian.segundo@cabify.com>
Date: Fri, 15 Sep 2023 12:22:26 +0200
Subject: [PATCH 0700/2704] fix(yaml): promql injections block

---
 queries/yaml/injections.scm                                | 4 ++--
 .../query/injections/yaml/promql-on-prometheus-rules.yaml  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index fd4685bb7..ae86e7950 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -49,7 +49,7 @@
   value: (block_node
            (block_scalar) @injection.content
            (#set! injection.language "promql")
-           (#offset! @injection.content 0 2 0 0)))
+           (#offset! @injection.content 0 1 0 0)))
 
 (block_mapping_pair
   key: (flow_node) @_expr (#eq? @_expr "expr")
@@ -69,4 +69,4 @@
                (block_node
                   (block_scalar) @injection.content
                   (#set! injection.language "promql")
-                  (#offset! @injection.content 0 2 0 0))))))
+                  (#offset! @injection.content 0 1 0 0))))))
diff --git a/tests/query/injections/yaml/promql-on-prometheus-rules.yaml b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
index 9d3e872ce..8b1895c16 100644
--- a/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
+++ b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
@@ -10,3 +10,10 @@ groups:
     annotations:
       title: Node {{ $labels.instance }} is down
       description: Failed to scrape {{ $labels.job }} on {{ $labels.instance }} for more than 3 minutes. Node seems down.
+  - alert: Node down
+    expr: |
+      up{job="node_exporter"} == 0
+    # ^ promql
+    for: 3m
+    labels:
+      severity: warning

From bf8b089eecef9e9e8c1765f81613a2fd5e49175c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 15 Sep 2023 14:55:34 +0200
Subject: [PATCH 0701/2704] fix(lua): fix luadoc injections

---
 queries/lua/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index bd91c5902..908c805da 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -37,7 +37,7 @@
   content: (_) @injection.content
   (#lua-match? @injection.content "^[-][%s]*@")
   (#set! injection.language "luadoc")
-  (#offset! @injection.content 0 3 0 0))
+  (#offset! @injection.content 0 1 0 0))
 
 ; string.match("123", "%d+")
 

From c617560e1b0240e5c1d72b5f1c45f86c8b9b7d7a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 16 Sep 2023 07:00:41 +0000
Subject: [PATCH 0702/2704] Update parsers: lalrpop, wing (#5403)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 00ff7b6b9..d2ae9088f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -306,7 +306,7 @@
     "revision": "06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7"
   },
   "lalrpop": {
-    "revision": "b7431e4b64183a5d0d094895a4cd5daf51ed3103"
+    "revision": "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"
   },
   "latex": {
     "revision": "2ae2021d7b224fb6aa57b760e0d146059f943bb8"
@@ -639,7 +639,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "3083cc10d3df56f973b8af00a2e48234df9e7a9f"
+    "revision": "430ec7527a3eee00719ce9735854177629410f63"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 794266a4edc8ab57b0d637626f01b5278a9123d8 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 16 Sep 2023 19:08:08 +0900
Subject: [PATCH 0703/2704] injections(lua): add vim highlights to api funcs
 (#5404)

Add vim injections for `vim.api.nvim[_buf]_create_user_command` and
`vim.api.nvim_create_autocmd`
---
 queries/lua/injections.scm | 70 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 908c805da..6f7b97267 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -28,6 +28,76 @@
   (#eq? @_method "nvim_exec_lua")
   (#set! injection.language "lua"))
 
+; vim.api.nvim_create_autocmd("FileType", { command = "injected here" })
+(function_call
+  name: (_) @_vimcmd_identifier
+  arguments:
+    (arguments
+      . (_)
+      . 
+      (table_constructor
+        (field
+          name: (identifier) @_command
+          value: 
+            (string content: (_) @injection.content)))
+      .) ; limit so only 2-argument functions gets matched before pred handle
+  (#eq? @_vimcmd_identifier "vim.api.nvim_create_autocmd")
+  (#eq? @_command "command")
+  (#set! injection.language "vim"))
+
+
+(function_call
+  name: (_) @_user_cmd
+  arguments: 
+    (arguments
+      . (_)
+      . 
+      (string
+        content: (_) @injection.content)
+      . (_) .)
+  (#eq? @_user_cmd "vim.api.nvim_create_user_command")
+  (#set! injection.language "vim"))
+
+(function_call
+  name: (_) @_user_cmd
+  arguments: 
+    (arguments
+      . (_)
+      . (_)
+      . 
+      (string
+        content: (_) @injection.content)
+      . (_) .) ; Limiting predicate handling to only functions with 4 arguments
+  (#eq? @_user_cmd "vim.api.nvim_buf_create_user_command")
+  (#set! injection.language "vim"))
+
+;; rhs highlighting for vim.keymap.set/vim.api.nvim_set_keymap/vim.api.nvim_buf_set_keymap
+; (function_call
+;   name: (_) @_map
+;   arguments: 
+;     (arguments
+;       . (_)
+;       . (_)
+;       .
+;       (string
+;         content: (_) @injection.content))
+;   (#any-of? @_map "vim.api.nvim_set_keymap" "vim.keymap.set")
+;   (#set! injection.language "vim"))
+;
+; (function_call
+;   name: (_) @_map
+;   arguments: 
+;     (arguments
+;       . (_)
+;       . (_)
+;       . (_)
+;       . 
+;       (string
+;         content: (_) @injection.content)
+;       . (_) .)
+;   (#eq? @_map "vim.api.nvim_buf_set_keymap")
+;   (#set! injection.language "vim"))
+
 ;; highlight string as query if starts with `;; query`
 (string content: _ @injection.content 
  (#lua-match? @injection.content "^%s*;+%s?query")

From 1233138586263214127a0efc224d025c4fe9016e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 17 Sep 2023 06:34:43 +0000
Subject: [PATCH 0704/2704] Update parsers: php

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index d2ae9088f..35706498d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -402,7 +402,7 @@
     "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
   },
   "php": {
-    "revision": "ce2c73a8d84b5648e8792698dc9fd955e5f6a906"
+    "revision": "a05c6112a1dfdd9e586cb275700931e68d3c7c85"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"

From 58c868229044ac0892efeecee2d7706d7f6a00cb Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sun, 17 Sep 2023 18:04:29 +0900
Subject: [PATCH 0705/2704] fix: trees() may not be list-like

---
 lua/nvim-treesitter/ts_utils.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
index b3f468934..655c62881 100644
--- a/lua/nvim-treesitter/ts_utils.lua
+++ b/lua/nvim-treesitter/ts_utils.lua
@@ -173,7 +173,7 @@ function M.get_node_at_cursor(winnr, ignore_injected_langs)
 
   local root ---@type TSNode|nil
   if ignore_injected_langs then
-    for _, tree in ipairs(root_lang_tree:trees()) do
+    for _, tree in pairs(root_lang_tree:trees()) do
       local tree_root = tree:root()
       if tree_root and ts.is_in_node_range(tree_root, cursor_range[1], cursor_range[2]) then
         root = tree_root
@@ -202,7 +202,7 @@ function M.get_root_for_position(line, col, root_lang_tree)
 
   local lang_tree = root_lang_tree:language_for_range { line, col, line, col }
 
-  for _, tree in ipairs(lang_tree:trees()) do
+  for _, tree in pairs(lang_tree:trees()) do
     local root = tree:root()
 
     if root and ts.is_in_node_range(root, line, col) then

From dac6efbaff9a711074edeef9968dc29bad1324eb Mon Sep 17 00:00:00 2001
From: Christian Segundo <christian.segundo@cabify.com>
Date: Sun, 17 Sep 2023 13:35:17 +0200
Subject: [PATCH 0706/2704] fix(dockerfile): bash injection on run instructions

---
 queries/dockerfile/injections.scm                           | 3 ++-
 .../dockerfile/bash-on-run-instructions.dockerfile          | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile

diff --git a/queries/dockerfile/injections.scm b/queries/dockerfile/injections.scm
index 2a48ec4f6..0eb9ffdf2 100644
--- a/queries/dockerfile/injections.scm
+++ b/queries/dockerfile/injections.scm
@@ -2,4 +2,5 @@
  (#set! injection.language "comment"))
 
 ((shell_command) @injection.content 
- (#set! injection.language "bash"))
+ (#set! injection.language "bash")
+ (#set! injection.include-children))
diff --git a/tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile b/tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile
new file mode 100644
index 000000000..d25020494
--- /dev/null
+++ b/tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile
@@ -0,0 +1,6 @@
+FROM foo
+RUN bar
+#   ^ bash
+RUN \
+  baz
+# ^ bash

From 280cf6fddd09fbcdce659b24d0df9c3055977cd3 Mon Sep 17 00:00:00 2001
From: Xi Xiao <xi.xiao007@gmail.com>
Date: Sun, 17 Sep 2023 20:00:21 +0300
Subject: [PATCH 0707/2704] feat: add parsers and queries for apex, sosl, soql
 (#5396)

---
 lockfile.json                   |   9 ++
 lua/nvim-treesitter/parsers.lua |  27 ++++
 queries/apex/folds.scm          |   6 +
 queries/apex/highlights.scm     | 248 ++++++++++++++++++++++++++++++++
 queries/apex/locals.scm         |  66 +++++++++
 queries/soql/highlights.scm     | 150 +++++++++++++++++++
 queries/sosl/highlights.scm     |  28 ++++
 7 files changed, 534 insertions(+)
 create mode 100644 queries/apex/folds.scm
 create mode 100644 queries/apex/highlights.scm
 create mode 100644 queries/apex/locals.scm
 create mode 100644 queries/soql/highlights.scm
 create mode 100644 queries/sosl/highlights.scm

diff --git a/lockfile.json b/lockfile.json
index 35706498d..245078467 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -5,6 +5,9 @@
   "agda": {
     "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
   },
+  "apex": {
+    "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
+  },
   "arduino": {
     "revision": "db929fc6822b9b9e1211678d508f187894ce0345"
   },
@@ -524,6 +527,12 @@
   "solidity": {
     "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
   },
+  "soql": {
+    "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
+  },
+  "sosl": {
+    "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
+  },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5251fdb4a..253cfb7fd 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -91,6 +91,15 @@ list.agda = {
   maintainers = { "@Decodetalkers" },
 }
 
+list.apex = {
+  install_info = {
+    url = "https://github.com/aheber/tree-sitter-sfapex",
+    files = { "src/parser.c" },
+    location = "apex",
+  },
+  maintainers = { "@aheber" },
+}
+
 list.arduino = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-arduino",
@@ -1545,6 +1554,24 @@ list.solidity = {
   maintainers = { "@amaanq" },
 }
 
+list.soql = {
+  install_info = {
+    url = "https://github.com/aheber/tree-sitter-sfapex",
+    files = { "src/parser.c" },
+    location = "soql",
+  },
+  maintainers = { "@aheber" },
+}
+
+list.sosl = {
+  install_info = {
+    url = "https://github.com/aheber/tree-sitter-sfapex",
+    files = { "src/parser.c" },
+    location = "sosl",
+  },
+  maintainers = { "@aheber" },
+}
+
 list.sparql = {
   install_info = {
     url = "https://github.com/BonaBeavis/tree-sitter-sparql",
diff --git a/queries/apex/folds.scm b/queries/apex/folds.scm
new file mode 100644
index 000000000..0ffc550e9
--- /dev/null
+++ b/queries/apex/folds.scm
@@ -0,0 +1,6 @@
+[
+   (class_body)
+   (constructor_declaration)
+   (argument_list)
+   (annotation_argument_list)
+] @fold
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
new file mode 100644
index 000000000..f5ce0b9fb
--- /dev/null
+++ b/queries/apex/highlights.scm
@@ -0,0 +1,248 @@
+; inherits: soql
+
+;;; Apex + SOQL
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  ","
+  "."
+  ":"
+  "?"
+  ";"
+ ] @punctuation.delimiter
+
+;; Default general color defination
+
+(identifier) @variable
+
+(type_identifier) @type
+
+;; Methods
+
+(method_declaration
+  name: (identifier) @method)
+
+(method_invocation
+  name: (identifier) @method.call)
+
+(super) @function.builtin
+
+;; Annotations
+
+(annotation
+  name: (identifier) @attribute)
+
+;; Types
+
+(interface_declaration
+  name: (identifier) @type)
+
+(class_declaration
+  name: (identifier) @type)
+
+(class_declaration
+  (superclass) @type) 
+
+(enum_declaration
+  name: (identifier) @type)
+
+(enum_constant
+  name: (identifier) @constant)
+
+(type_arguments "<" @punctuation.delimiter)
+(type_arguments ">" @punctuation.delimiter)
+
+((field_access
+  object: (identifier) @type))
+
+(field_access
+  field: (identifier) @property)
+
+((scoped_identifier
+  scope: (identifier) @type)
+ (#match? @type "^[A-Z]"))
+
+((method_invocation
+  object: (identifier) @type)
+ (#match? @type "^[A-Z]"))
+
+(method_declaration
+  (formal_parameters
+    (formal_parameter
+      name: (identifier) @parameter)))
+
+(constructor_declaration
+  name: (identifier) @constructor)
+
+(dml_type) @function.builtin
+
+(assignment_operator) @operator
+
+(update_expression ["++" "--"] @operator)
+
+(trigger_declaration
+  name: (identifier) @type
+  object: (identifier) @type
+  (trigger_event) @keyword
+  ("," (trigger_event) @keyword)*)
+
+[
+  "@" 
+  "="
+  "!="
+  "<="
+  ">="
+] @operator
+
+(binary_expression
+  operator: [
+    ">"
+    "<"
+    "=="
+    "==="
+    "!=="
+    "&&"
+    "||"
+    "+"
+    "-"
+    "*"
+    "/"
+    "&"
+    "|"
+    "^"
+    "%"
+    "<<"
+    ">>"
+    ">>>"] @operator)
+
+(unary_expression
+  operator: [
+    "+"
+    "-"
+    "!"
+    "~"
+  ]) @operator
+
+(map_initializer "=>" @operator)
+
+[
+  (boolean_type)
+  (void_type)
+] @type.builtin;;
+
+; Fields
+
+(field_declaration
+  declarator: (variable_declarator
+    name: (identifier) @field))
+
+(field_access
+  field: (identifier) @field)
+
+; Variables
+
+(field_declaration
+  (modifiers (modifier ["final" "static"])(modifier ["final" "static"]))
+  (variable_declarator
+    name: (identifier) @constant))
+
+(variable_declarator
+  (identifier) @property)
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$")) ; SCREAM SNAKE CASE
+
+(this) @variable.builtin
+
+; Literals
+
+[
+  (int)
+  (decimal)
+  (currency_literal)
+] @number
+
+(string_literal) @string
+
+[
+  (line_comment)
+  (block_comment)
+] @comment
+
+(null_literal) @constant.builtin
+
+;; ;; Keywords
+
+[
+ "abstract"
+ "final"
+ "private"
+ "protected"
+ "public"
+ "static"
+ ] @type.qualifier
+
+[
+  "if"
+  "else"
+  "switch"
+] @conditional
+
+[
+  "for"
+  "while"
+  "do"
+  "break"
+] @repeat
+
+[
+  "return"
+] @keyword.return
+
+[
+ "throw"
+ "finally"
+ "try"
+ "catch"
+ ] @exception
+
+"new" @keyword.operator
+
+[
+  "abstract"
+  "class"
+  "continue"
+  "default"
+  "enum"
+  "extends"
+  "final"
+  "get"
+  "global"
+  "implements"
+  "instanceof"
+  "interface"
+  "on"
+  "private"
+  "protected"
+  "public"
+  "set"
+  "static"
+  "testMethod"
+  "transient"
+  "trigger"
+  "virtual"
+  "when"
+  "with_sharing"
+  "without_sharing"
+  "inherited_sharing"
+] @keyword
+
+"System.runAs" @type.builtin
diff --git a/queries/apex/locals.scm b/queries/apex/locals.scm
new file mode 100644
index 000000000..c7213601b
--- /dev/null
+++ b/queries/apex/locals.scm
@@ -0,0 +1,66 @@
+; declarations
+
+(class_declaration) @scope
+(method_declaration) @scope
+(constructor_declaration) @scope
+(enum_declaration) @scope
+(enhanced_for_statement) @scope
+
+; if/else
+
+(if_statement) @scope
+(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
+(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
+
+(enum_declaration
+  name: (identifier) @definition.enum)
+
+(method_declaration
+  name: (identifier) @definition.method)
+
+(local_variable_declaration
+  declarator: (variable_declarator
+    name: (identifier) @definition.var))
+
+(enhanced_for_statement 
+  name: (identifier) @definition.var)
+
+(formal_parameter
+  name: (identifier) @definition.parameter)
+
+(catch_formal_parameter
+  name: (identifier) @definition.parameter)
+
+(field_declaration
+  declarator: (variable_declarator
+    name: (identifier) @definition.field))
+
+;; REFERENCES
+
+(identifier) @reference
+
+(type_identifier) @reference
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
new file mode 100644
index 000000000..907f3d891
--- /dev/null
+++ b/queries/soql/highlights.scm
@@ -0,0 +1,150 @@
+(field_identifier
+  (identifier) @property)
+
+(field_identifier
+  (dotted_identifier
+    (identifier) @property))
+
+(type_of_clause
+  (identifier) @property)
+
+(when_expression
+  (identifier) @type)
+
+(when_expression
+  (field_list
+    (identifier) @property))
+
+(when_expression
+  (field_list
+    (dotted_identifier
+      (identifier) @property )))
+
+(else_expression
+  (field_list
+    (identifier) @property ))
+
+(else_expression
+  (field_list
+    (dotted_identifier
+      (identifier) @property )))
+
+(alias_expression
+  (identifier) @label)
+
+(storage_identifier) @storageclass
+(function_name) @function
+(date_literal) @string.special
+
+[
+  ","
+  "."
+  ":"
+  "?"
+  "("
+  ")"
+] @punctuation.delimiter
+
+[
+  "AND"
+  "OR"
+  "NOT"
+  "LIKE"
+  "NOT_IN"
+  "INCLUDES"
+  "EXCLUDES"
+] @keyword.operator
+
+[
+  "="
+  "!="
+  "<="
+  ">="
+] @operator
+
+(value_comparison_operator  [ "<" ">" ] @operator)
+
+(set_comparison_operator "IN" @keyword.operator)
+
+[
+  (int)
+  (decimal)
+  (currency_literal)
+] @number
+(string_literal) @string
+(date) @variable.readonly
+(date_time) @variable.readonly
+
+[
+  "TRUE"
+  "FALSE"
+] @boolean
+
+(null_literal) @constant.builtin
+
+[
+  "ABOVE"
+  "ABOVE_OR_BELOW"
+  "ALL_ROWS"
+  "ALL"
+  "AS"
+  "ASC"
+  "AT"
+  "BELOW"
+  "CUSTOM"
+  "DATA_CATEGORY"
+  "DESC"
+  "END"
+  "FIELDS"
+  "FOR"
+  "FROM"
+  "GROUP_BY"
+  "HAVING"
+  "LIMIT"
+  "NULLS_FIRST"
+  "NULLS_LAST"
+  "OFFSET"
+  "ORDER_BY"
+  "REFERENCE"
+  "SELECT"
+  "STANDARD"
+  "TRACKING"
+  "TYPEOF"
+  "UPDATE"
+  "USING_SCOPE"
+  "VIEW"
+  "VIEWSTAT"
+  "WITH"
+] @keyword
+
+[
+  "WHERE"
+  "WHEN"
+  "ELSE"
+  "THEN"
+] @conditional
+
+; Using Scope
+[
+  "delegated"
+  "everything"
+  "mine"
+  "mine_and_my_groups"
+  "my_territory"
+  "my_team_territory"
+  "team"
+] @keyword
+
+; With
+[
+  "maxDescriptorPerRecord"
+  "RecordVisibilityContext"
+  "Security_Enforced"
+  "supportsDomains"
+  "supportsDelegates"
+  "System_Mode"
+  "User_Mode"
+  "UserId"
+] @keyword
+
+
diff --git a/queries/sosl/highlights.scm b/queries/sosl/highlights.scm
new file mode 100644
index 000000000..085247b2c
--- /dev/null
+++ b/queries/sosl/highlights.scm
@@ -0,0 +1,28 @@
+(find_clause
+          (term) @string )
+
+(sobject_return
+        (identifier) @type )
+
+(with_type (_ "=" @operator))
+
+[
+  "ALL"
+  "DIVISION"
+  "EMAIL"
+  "FIND"
+  "ListView"
+  "HIGHLIGHT"
+  "IN"
+  "METADATA"
+  "NAME"
+  "NETWORK"
+  "PHONE"
+  "PricebookId"
+  "RETURNING"
+  "SIDEBAR"
+  "SNIPPET"
+  "SPELL_CORRECTION"
+  "target_length"
+  "USING"
+] @keyword

From 9dd3e07609c5b74c5ac4193d0ce4fe91fb406fea Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sun, 17 Sep 2023 17:00:36 +0000
Subject: [PATCH 0708/2704] Update README

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index b22f0ff0b..b15f45910 100644
--- a/README.md
+++ b/README.md
@@ -175,6 +175,7 @@ We are looking for maintainers to add more parsers and to write query files for
 <!--parserinfo-->
 - [x] [ada](https://github.com/briot/tree-sitter-ada) (maintained by @briot)
 - [x] [agda](https://github.com/AusCyberman/tree-sitter-agda) (maintained by @Decodetalkers)
+- [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)
 - [ ] [awk](https://github.com/Beaglefoot/tree-sitter-awk)
@@ -348,6 +349,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
 - [ ] [snakemake](https://github.com/osthomas/tree-sitter-snakemake) (experimental)
 - [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)
+- [x] [soql](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
+- [x] [sosl](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [sparql](https://github.com/BonaBeavis/tree-sitter-sparql) (maintained by @BonaBeavis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
 - [x] [squirrel](https://github.com/amaanq/tree-sitter-squirrel) (maintained by @amaanq)

From eb0f975bf29dd6bbb58011ed0e694874a50ae79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= <majosolano99@gmail.com>
Date: Sun, 17 Sep 2023 14:13:50 -0700
Subject: [PATCH 0709/2704] feat(markdown): conceal triple backticks and HTML
 entities

---
 queries/markdown/highlights.scm        | 8 ++++++++
 queries/markdown_inline/highlights.scm | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index e78d233cc..6c10c0885 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -26,6 +26,14 @@
   (fenced_code_block_delimiter)
 ] @punctuation.delimiter
 
+;; Conceal backticks
+(fenced_code_block
+  (fenced_code_block_delimiter) @conceal
+  (#set! conceal ""))
+(fenced_code_block
+  (info_string (language) @conceal
+  (#set! conceal "")))
+
 (code_fence_content) @none
 
 [
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index cd5da530d..f9589bdd9 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -92,3 +92,11 @@
     "]"
   ] @conceal
   (#set! conceal ""))
+
+;; Replace common HTML entities.
+((entity_reference) @conceal (#eq? @conceal "&nbsp;") (#set! conceal ""))
+((entity_reference) @conceal (#eq? @conceal "&lt;") (#set! conceal "<"))
+((entity_reference) @conceal (#eq? @conceal "&gt;") (#set! conceal ">"))
+((entity_reference) @conceal (#eq? @conceal "&amp;") (#set! conceal "&"))
+((entity_reference) @conceal (#eq? @conceal "&quot;") (#set! conceal "\""))
+((entity_reference) @conceal (#any-of? @conceal "&ensp;" "&emsp;") (#set! conceal " "))
\ No newline at end of file

From 6a865af171f6b6cf48647ea60924a721d0e89de2 Mon Sep 17 00:00:00 2001
From: ShootingStarDragons <ShootingStarDragons@protonmail.com>
Date: Mon, 18 Sep 2023 13:12:07 +0800
Subject: [PATCH 0710/2704] chore: switch agda upstream

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 queries/agda/highlights.scm     | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 245078467..9f35244de 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -3,7 +3,7 @@
     "revision": "f21f13afe0410311be1f78959a25aee393c569c9"
   },
   "agda": {
-    "revision": "80ea622cf952a0059e168e5c92a798b2f1925652"
+    "revision": "eb2687164a4d98eb16bfaee3880afa81ff498d97"
   },
   "apex": {
     "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 253cfb7fd..75ca59436 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -85,8 +85,8 @@ list.ada = {
 
 list.agda = {
   install_info = {
-    url = "https://github.com/AusCyberman/tree-sitter-agda",
-    files = { "src/parser.c", "src/scanner.cc" },
+    url = "https://github.com/tree-sitter/tree-sitter-agda",
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@Decodetalkers" },
 }
diff --git a/queries/agda/highlights.scm b/queries/agda/highlights.scm
index 7a4e954e8..a5c42c0a8 100644
--- a/queries/agda/highlights.scm
+++ b/queries/agda/highlights.scm
@@ -62,7 +62,6 @@
   "infixl"
   "infixr"
   "record"
-	(ARROW)
 ]
 @keyword
 

From c0170e1e2c713341805ce13fe53fe4933e8471d8 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 18 Sep 2023 05:43:10 +0000
Subject: [PATCH 0711/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b15f45910..5ef975fa4 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,7 @@ We are looking for maintainers to add more parsers and to write query files for
 <!--This section of the README is automatically updated by a CI job-->
 <!--parserinfo-->
 - [x] [ada](https://github.com/briot/tree-sitter-ada) (maintained by @briot)
-- [x] [agda](https://github.com/AusCyberman/tree-sitter-agda) (maintained by @Decodetalkers)
+- [x] [agda](https://github.com/tree-sitter/tree-sitter-agda) (maintained by @Decodetalkers)
 - [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)

From 6f3f89a6dded8f89ddf6e32bbd88efcb9d7c0dce Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 18 Sep 2023 06:37:03 +0000
Subject: [PATCH 0712/2704] Update parsers: agda, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9f35244de..03f6603c5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -3,7 +3,7 @@
     "revision": "f21f13afe0410311be1f78959a25aee393c569c9"
   },
   "agda": {
-    "revision": "eb2687164a4d98eb16bfaee3880afa81ff498d97"
+    "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
   },
   "apex": {
     "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
@@ -648,7 +648,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "430ec7527a3eee00719ce9735854177629410f63"
+    "revision": "e505e47416e2ffef17e1e77eb4b92ac6c6b7320b"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From c0f4363b72ec4f3ca2e4ce5fcd81aa67925379fd Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sun, 17 Sep 2023 12:41:06 +0300
Subject: [PATCH 0713/2704] feat: add ssh config

---
 lockfile.json                     |  3 ++
 lua/nvim-treesitter/parsers.lua   |  9 ++++
 queries/ssh_config/folds.scm      |  4 ++
 queries/ssh_config/highlights.scm | 81 +++++++++++++++++++++++++++++++
 queries/ssh_config/indents.scm    |  7 +++
 queries/ssh_config/injections.scm | 17 +++++++
 6 files changed, 121 insertions(+)
 create mode 100644 queries/ssh_config/folds.scm
 create mode 100644 queries/ssh_config/highlights.scm
 create mode 100644 queries/ssh_config/indents.scm
 create mode 100644 queries/ssh_config/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 03f6603c5..1d91350e8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -542,6 +542,9 @@
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
+  "ssh_config": {
+    "revision": "f1039c88c488f77a10a616c6de5ec1c4c6e8572f"
+  },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 75ca59436..2880edec7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1597,6 +1597,15 @@ list.squirrel = {
   maintainers = { "@amaanq" },
 }
 
+list.ssh_config = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-ssh-config",
+    files = { "src/parser.c" },
+  },
+  filetype = "sshconfig",
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.starlark = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-starlark",
diff --git a/queries/ssh_config/folds.scm b/queries/ssh_config/folds.scm
new file mode 100644
index 000000000..659835657
--- /dev/null
+++ b/queries/ssh_config/folds.scm
@@ -0,0 +1,4 @@
+[
+  (host_declaration)
+  (match_declaration)
+] @fold
diff --git a/queries/ssh_config/highlights.scm b/queries/ssh_config/highlights.scm
new file mode 100644
index 000000000..d6b060f56
--- /dev/null
+++ b/queries/ssh_config/highlights.scm
@@ -0,0 +1,81 @@
+; Literals
+
+(string) @string
+
+(pattern) @string.regex
+
+(token) @character
+
+[
+  (number)
+  (bytes)
+  (time)
+] @number
+
+[
+  (kex)
+  (mac)
+  (cipher)
+  (key_sig)
+] @parameter
+
+[
+  ; generic
+  "yes" "no"
+  "ask" "auto"
+  "none" "any"
+  ; ControlMaster
+  "autoask"
+  ; FingerprintHash
+  "md5" "sha256"
+  ; PubkeyAuthentication
+  "unbound" "host-bound"
+  ; RequestTTY
+  "force"
+  ; SessionType
+  "subsystem" "default"
+  ; StrictHostKeyChecking
+  "accept-new" "off"
+  ; Tunnel
+  "point-to-point" "ethernet"
+  (ipqos)
+  (verbosity)
+  (facility)
+  (authentication)
+] @constant.builtin
+
+(uri) @text.uri
+
+; Keywords
+
+[ "Host" "Match" ] @keyword
+
+(parameter keyword: _ @keyword)
+
+(host_declaration argument: _ @namespace)
+
+(match_declaration
+  (condition criteria: _ @attribute))
+
+"all" @attribute
+
+; Misc
+
+[
+  "SSH_AUTH_SOCK"
+  (variable)
+] @constant
+
+(comment) @comment @spell
+
+(ERROR) @error
+
+; Punctuation
+
+[ "${" "}" ] @punctuation.special
+
+[ "\"" "," ":" "@" ] @punctuation.delimiter
+
+[ "=" "!" "+" "-" "^" ] @operator
+
+[ "*" "?" ] @character.special
diff --git a/queries/ssh_config/indents.scm b/queries/ssh_config/indents.scm
new file mode 100644
index 000000000..0dd1eb6ca
--- /dev/null
+++ b/queries/ssh_config/indents.scm
@@ -0,0 +1,7 @@
+[
+  (host_declaration)
+  (match_declaration)
+] @indent.begin
+
+; incomplete declarations
+(ERROR . [ "Host" "Match" ]) @indent.begin
diff --git a/queries/ssh_config/injections.scm b/queries/ssh_config/injections.scm
new file mode 100644
index 000000000..b71988471
--- /dev/null
+++ b/queries/ssh_config/injections.scm
@@ -0,0 +1,17 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((condition
+   criteria: "exec"
+   argument: (string) @injection.content)
+ (#set! injection.language "bash"))
+
+((parameter
+   keyword: [
+              "KnownHostsCommand"
+              "LocalCommand"
+              "RemoteCommand"
+              "ProxyCommand"
+            ]
+   argument: (string) @injection.content)
+ (#set! injection.language "bash"))

From f9034812d8335356ef3ede49110d1569624033fa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 18:26:55 +0900
Subject: [PATCH 0714/2704] Update README (#5419)

Co-authored-by: Github Actions <actions@github>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5ef975fa4..7dbc96ebf 100644
--- a/README.md
+++ b/README.md
@@ -354,6 +354,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [sparql](https://github.com/BonaBeavis/tree-sitter-sparql) (maintained by @BonaBeavis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
 - [x] [squirrel](https://github.com/amaanq/tree-sitter-squirrel) (maintained by @amaanq)
+- [x] [ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) (maintained by @ObserverOfTime)
 - [x] [starlark](https://github.com/amaanq/tree-sitter-starlark) (maintained by @amaanq)
 - [x] [strace](https://github.com/sigmaSd/tree-sitter-strace) (maintained by @amaanq)
 - [x] [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) (maintained by @madskjeldgaard)

From b4f6dd72980607a9821d24502b0ca7ee826376af Mon Sep 17 00:00:00 2001
From: PorterAtGoogle <70230577+PorterAtGoogle@users.noreply.github.com>
Date: Mon, 18 Sep 2023 10:26:02 -0600
Subject: [PATCH 0715/2704] feat(textproto): Add Textproto parser and queries
 (#5402)

* Add textproto parser and queries

* remove extra newline

* Apply suggestions from code review

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

---------

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 README.md                        |  1 +
 lockfile.json                    |  3 +++
 lua/nvim-treesitter/parsers.lua  |  8 ++++++++
 queries/textproto/folds.scm      |  5 +++++
 queries/textproto/highlights.scm | 18 ++++++++++++++++++
 queries/textproto/indents.scm    |  7 +++++++
 scripts/minimal_init.lua         |  1 +
 7 files changed, 43 insertions(+)
 create mode 100644 queries/textproto/folds.scm
 create mode 100644 queries/textproto/highlights.scm
 create mode 100644 queries/textproto/indents.scm

diff --git a/README.md b/README.md
index 7dbc96ebf..23a411c5d 100644
--- a/README.md
+++ b/README.md
@@ -367,6 +367,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
+- [x] [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) (maintained by @Porter)
 - [x] [thrift](https://github.com/duskmoon314/tree-sitter-thrift) (maintained by @amaanq, @duskmoon314)
 - [x] [tiger](https://github.com/ambroisie/tree-sitter-tiger) (maintained by @ambroisie)
 - [x] [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) (maintained by @ahelwer, @susliko)
diff --git a/lockfile.json b/lockfile.json
index 1d91350e8..2c55b867d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -581,6 +581,9 @@
   "terraform": {
     "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
   },
+  "textproto": {
+    "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
+  },
   "thrift": {
     "revision": "d4deb1bd9e848f2dbe81103a151d99e8546de480"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2880edec7..be26b8f4c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1707,6 +1707,14 @@ list.terraform = {
   maintainers = { "@MichaHoffmann" },
 }
 
+list.textproto = {
+  install_info = {
+    url = "https://github.com/PorterAtGoogle/tree-sitter-textproto",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Porter" },
+}
+
 list.thrift = {
   install_info = {
     url = "https://github.com/duskmoon314/tree-sitter-thrift",
diff --git a/queries/textproto/folds.scm b/queries/textproto/folds.scm
new file mode 100644
index 000000000..f6eeead9a
--- /dev/null
+++ b/queries/textproto/folds.scm
@@ -0,0 +1,5 @@
+[
+  (message_value)
+  (scalar_list)
+  (message_list)
+] @fold
diff --git a/queries/textproto/highlights.scm b/queries/textproto/highlights.scm
new file mode 100644
index 000000000..8ebb476e5
--- /dev/null
+++ b/queries/textproto/highlights.scm
@@ -0,0 +1,18 @@
+(string) @string
+
+(field_name) @field
+
+(comment) @comment
+
+(number) @number
+; For stuff like "inf" and "-inf".
+(scalar_value [ (identifier) (signed_identifier) ]) @number
+
+[
+  (open_squiggly)
+  (close_squiggly)
+  (open_square)
+  (close_square)
+  (open_arrow)
+  (close_arrow)
+] @punctuation.bracket
diff --git a/queries/textproto/indents.scm b/queries/textproto/indents.scm
new file mode 100644
index 000000000..fd6db7ffb
--- /dev/null
+++ b/queries/textproto/indents.scm
@@ -0,0 +1,7 @@
+(message_value) @indent.begin
+(message_value (close_squiggly) @indent.branch)
+
+(scalar_list) @indent.begin
+(scalar_list (close_square) @indent.branch)
+(message_list) @indent.begin
+(message_list (close_square) @indent.branch)
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index f7a7ee590..45a7b0243 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -8,6 +8,7 @@ vim.filetype.add {
     cmm = "t32",
     hurl = "hurl",
     ncl = "nickel",
+    textproto = "textproto",
     tig = "tiger",
     usd = "usd",
     usda = "usd",

From 1ccbf82a9c171e4bdc7c4ac8e55b5649f1ba76b4 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 19 Sep 2023 06:36:48 +0000
Subject: [PATCH 0716/2704] Update parsers: awk, haskell_persistent, scala,
 ssh_config, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2c55b867d..753e86f77 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
   },
   "awk": {
-    "revision": "244426241376b08d9531616290d657106ec8f7ff"
+    "revision": "374da90decaa60fea7a22490a77440ece6d4161d"
   },
   "bash": {
     "revision": "bdcd56c5a3896f7bbb7684e223c43d9f24380351"
@@ -231,7 +231,7 @@
     "revision": "99706824b92f162d4e0f47c7e930bbccb367276e"
   },
   "haskell_persistent": {
-    "revision": "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"
+    "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
     "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
@@ -501,7 +501,7 @@
     "revision": "17a6b15562b09db1f27b8f5f26f17edbb2aac097"
   },
   "scala": {
-    "revision": "70afdd5632d57dd63a960972ab25945e353a52f6"
+    "revision": "59ab070df6667cad5bd669dd31aa866913129aa2"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -543,7 +543,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "f1039c88c488f77a10a616c6de5ec1c4c6e8572f"
+    "revision": "9611147e15be496655773f0c67d68e42b6c39e61"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "e505e47416e2ffef17e1e77eb4b92ac6c6b7320b"
+    "revision": "b71cae19d036459e5fee1a6084e229bd34bc7a01"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 42d0fb31bde4c99a0a03620ba7414e77fe4713b7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 19 Sep 2023 09:50:28 +0200
Subject: [PATCH 0717/2704] fix(haskell_persistent): adapt to scanner rewrite

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index be26b8f4c..504f1e908 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -723,7 +723,7 @@ list.haskell = {
 list.haskell_persistent = {
   install_info = {
     url = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "haskellpersistent",
   maintainers = { "@lykahb" },

From 940916074833159bf7b8cbb4bf5e59161461fa5a Mon Sep 17 00:00:00 2001
From: nedia <aiden@nedia.dev>
Date: Tue, 19 Sep 2023 10:30:17 +0100
Subject: [PATCH 0718/2704] feat(dart): add base, final & sealed class modifier
 highlights

---
 queries/dart/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 108f41c15..b5a4bd62a 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -228,6 +228,9 @@
     "dynamic"
     "external"
     "static"
+    "final"
+    "base"
+    "sealed"
 ] @type.qualifier
 
 ; when used as an identifier:

From c29d973c40f42fdf9823c2756c330fe7c8f7ca80 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 20 Sep 2023 06:37:26 +0000
Subject: [PATCH 0719/2704] Update parsers: luadoc, scala, ssh_config, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 753e86f77..32073cdf6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
   "luadoc": {
-    "revision": "8981072676ec8bd74def6134be4f883655f7c082"
+    "revision": "990926b13488a4bc0fc0804fc0f8400b5b0a1fb4"
   },
   "luap": {
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
@@ -501,7 +501,7 @@
     "revision": "17a6b15562b09db1f27b8f5f26f17edbb2aac097"
   },
   "scala": {
-    "revision": "59ab070df6667cad5bd669dd31aa866913129aa2"
+    "revision": "aa84398ad72bba17af18fa103fba6680aab78a79"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -543,7 +543,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "9611147e15be496655773f0c67d68e42b6c39e61"
+    "revision": "0842ab575dad561a0e903f309b7f871ee71c3e42"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "b71cae19d036459e5fee1a6084e229bd34bc7a01"
+    "revision": "3ccdc20067cacbd6c8bd0f6c609bd235801b2334"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From b7f2dd5dfbd24a1239844e15637b637b990df164 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 21 Sep 2023 06:36:45 +0000
Subject: [PATCH 0720/2704] Update parsers: bash, t32, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 32073cdf6..1164b6b27 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "374da90decaa60fea7a22490a77440ece6d4161d"
   },
   "bash": {
-    "revision": "bdcd56c5a3896f7bbb7684e223c43d9f24380351"
+    "revision": "fd4e40dab883d6456da4d847de8321aee9c80805"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -570,7 +570,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "5e6ce99611b2fef9b4d812e43898b176185c61ed"
+    "revision": "6d317c49ab310152c486ab85eb06724fd49df52d"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "3ccdc20067cacbd6c8bd0f6c609bd235801b2334"
+    "revision": "162d0e86752d39519c08288c854f5cd0e51d4a83"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From fc93fa5c07df7cd578a3ea82d7c075c0460a6884 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 22 Sep 2023 06:36:17 +0000
Subject: [PATCH 0721/2704] Update parsers: bitbake, python, rust, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1164b6b27..ba6cb3385 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
   "bitbake": {
-    "revision": "ed92abd7b67ab66a6fa3a747a0157f01d2e467d8"
+    "revision": "6cb07d98f1cad180b8ea28965e59ee05023a5693"
   },
   "blueprint": {
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
@@ -447,7 +447,7 @@
     "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
   },
   "python": {
-    "revision": "c01fb4e38587e959b9058b8cd34b9e6a3068c827"
+    "revision": "a901729099257aac932d79c60adb5e8a53fa7e6c"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -498,7 +498,7 @@
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
-    "revision": "17a6b15562b09db1f27b8f5f26f17edbb2aac097"
+    "revision": "48e053397b587de97790b055a1097b7c8a4ef846"
   },
   "scala": {
     "revision": "aa84398ad72bba17af18fa103fba6680aab78a79"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "162d0e86752d39519c08288c854f5cd0e51d4a83"
+    "revision": "0316314246f6fbdfe614e6dc7e29d4b9b9ce1ca8"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From af6b3ecea9b3cff18b9244027e23e7f2c34ebdd5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 23 Sep 2023 16:23:56 +0900
Subject: [PATCH 0722/2704] Update parsers: wing (#5439)

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index ba6cb3385..3c3311b2a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0316314246f6fbdfe614e6dc7e29d4b9b9ce1ca8"
+    "revision": "cd90a2e9e8b5a0f48b507534da08578bf6e6197f"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 0960322686bfa38afd4f1e0b9660473cf77e24b6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 24 Sep 2023 07:27:59 +0000
Subject: [PATCH 0723/2704] Update parsers: cuda, glsl, scala, ssh_config
 (#5441)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3c3311b2a..27eb0953f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -84,7 +84,7 @@
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "cuda": {
-    "revision": "f00c91430124797e798cbf28e09075d7d192938a"
+    "revision": "275cfb95013b88382e11490aef1e7c9b17a95ef7"
   },
   "cue": {
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
@@ -195,7 +195,7 @@
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
   },
   "glsl": {
-    "revision": "64e786e36398b1e18ccfdbfd964d922a67392ebc"
+    "revision": "ec6100d2bdf22363ca8a711a212f2144ea49233f"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -501,7 +501,7 @@
     "revision": "48e053397b587de97790b055a1097b7c8a4ef846"
   },
   "scala": {
-    "revision": "aa84398ad72bba17af18fa103fba6680aab78a79"
+    "revision": "1d3a1f9f18c2592a7326effb5783e6d080729a3d"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -543,7 +543,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "0842ab575dad561a0e903f309b7f871ee71c3e42"
+    "revision": "6afe38a8e418a1ffd05d45ea979e5e689b025a51"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"

From 3a251ac1b44133062c9ff1f0dc58977dc8773603 Mon Sep 17 00:00:00 2001
From: ghostbuster91 <ghostbuster91@users.noreply.github.com>
Date: Sun, 24 Sep 2023 22:58:14 +0200
Subject: [PATCH 0724/2704] Use scala parser for sbt filetype

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 504f1e908..7b40657f8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -45,6 +45,7 @@ for ft, lang in pairs {
   svg = "xml",
   xsd = "xml",
   xslt = "xml",
+  sbt = "scala",
 } do
   register_lang(lang, ft)
 end

From 73fbc807ebfbb8b0729f984b279ad4a863293a08 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 25 Sep 2023 06:37:10 +0000
Subject: [PATCH 0725/2704] Update parsers: haskell, scala, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 27eb0953f..f0f76c95a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -228,7 +228,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "99706824b92f162d4e0f47c7e930bbccb367276e"
+    "revision": "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -501,7 +501,7 @@
     "revision": "48e053397b587de97790b055a1097b7c8a4ef846"
   },
   "scala": {
-    "revision": "1d3a1f9f18c2592a7326effb5783e6d080729a3d"
+    "revision": "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "cd90a2e9e8b5a0f48b507534da08578bf6e6197f"
+    "revision": "f817ea10fe897dc15fb4affd09c4dc536b4edd81"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From f3fb301b267e85e4cbc725561da4a82b1c3089c8 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 24 Sep 2023 20:51:16 +0200
Subject: [PATCH 0726/2704] feat(highlights): some haskell improvements

---
 queries/haskell/highlights.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 01fecb43e..18038e079 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -77,7 +77,10 @@
   "@"
 ] @operator
 
-(module) @namespace
+(qualified_module (module) @constructor)
+(qualified_type (module) @namespace)
+(qualified_variable (module) @namespace)
+(import (module) @namespace)
 
 [
   (where)
@@ -133,6 +136,8 @@
 (exp_apply . (exp_name (variable) @function.call))
 (exp_apply . (exp_name (qualified_variable (variable) @function.call)))
 
+("@" @namespace)  ; "as" pattern operator, e.g. x@Constructor
+
 
 ;; ----------------------------------------------------------------------------
 ;; Types

From b5873bacb4ce44e0aac313abb28bb72e67fc9a53 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 26 Sep 2023 06:36:16 +0000
Subject: [PATCH 0727/2704] Update parsers: erlang, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f0f76c95a..248d4d40c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc"
+    "revision": "4a0ec79b7eb7671efe935cd97967430c34598c7d"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f817ea10fe897dc15fb4affd09c4dc536b4edd81"
+    "revision": "60c61fd6b6e2e6dbea7c206653d3e360435bfee2"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From a2556544598cacf6cf9f1a1283d135748937066c Mon Sep 17 00:00:00 2001
From: Enzo L F <49812445+lfenzo@users.noreply.github.com>
Date: Tue, 26 Sep 2023 23:50:57 -0300
Subject: [PATCH 0728/2704] feat(julia): added missing String and
 AbstractString builtin types (#5440)

* feat(julia): added missing String and AbstractString builtin types

* feat(juia): added all public built-in types in Core and Base

* feat(julia): removed private types from built-in type list
---
 queries/julia/highlights.scm | 242 +++++++++++++++++++++++++++++++----
 1 file changed, 215 insertions(+), 27 deletions(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 3df1dccc5..fbf97acd7 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -114,35 +114,223 @@
 
 ;; Builtins
 
+;; This list was generated with:
+;;
+;;  istype(x) = typeof(x) === DataType || typeof(x) === UnionAll
+;;  get_types(m) = filter(x -> istype(Base.eval(m, x)), names(m))
+;;  type_names = sort(union(get_types(Core), get_types(Base)))
+;;
 ((identifier) @type.builtin
  (#any-of? @type.builtin
-  "Type" "DataType" "Any" "Union" "UnionAll" "Tuple" "NTuple" "NamedTuple"
-  "Val" "Nothing" "Some" "Enum" "Expr" "Symbol" "Module" "Function" "ComposedFunction"
-  "Number" "Real" "AbstractFloat" "Integer" "Signed" "AbstractIrrational"
-  "Fix1" "Fix2" "Missing" "Cmd" "EnvDict" "VersionNumber" "ArgumentError"
-  "AssertionError" "BoundsError" "CompositeException" "DimensionMismatch"
-  "DivideError" "DomainError" "EOFError" "ErrorException" "InexactError"
-  "InterruptException" "KeyError" "LoadError" "MethodError" "OutOfMemoryError"
-  "ReadOnlyMemoryError" "OverflowError" "ProcessFailedException" "StackOverflowError"
-  "SystemError" "TypeError" "UndefKeywordError" "UndefRefError" "UndefVarError"
-  "StringIndexError" "InitError" "ExponentialBackOff" "Timer" "AsyncCondition"
-  "ParseError" "QuoteNode" "IteratorSize" "IteratorEltype" "AbstractRange"
-  "OrdinalRange" "AbstractUnitRange" "StepRange" "UnitRange" "LinRange" "AbstractDict"
-  "Dict" "IdDict" "WeakKeyDict" "ImmutableDict" "AbstractSet" "Set" "BitSet" "Pair"
-  "Pairs" "OneTo" " StepRangeLen" "RoundingMode" "Float16" "Float32" "Float64"
-  "BigFloat" "Bool" "Int" "Int8" "UInt8" "Int16" "UInt16" "Int32" "UInt32" "Int64"
-  "UInt64" "Int128" "UInt128" "BigInt" "Complex" "Rational" "Irrational" "AbstractChar"
-  "Char" "SubString" "Regex" "SubstitutionString" "RegexMatch" "AbstractArray"
-  "AbstractVector" "AbstractMatrix" "AbstractVecOrMat" "Array" "UndefInitializer"
-  "Vector" "Matrix" "VecOrMat" "DenseArray" "DenseVector" "DenseMatrix" "DenseVecOrMat"
-  "StridedArray" "StridedVector" "StridedMatrix" "StridedVecOrMat" "BitArray" "Dims"
-  "SubArray" "Task" "Condition" "Event" "Semaphore" "AbstractLniock" "ReentrantLock"
-  "Channel" "Atomic" "SpinLock" "RawFD" "IOStream" "IOBuffer" "AbstractDisplay" "MIME"
-  "TextDisplay" "PartialQuickSort" "Ordering" "ReverseOrdering" "By" "Lt" "Perm"
-  "Stateful" "CFunction" "Ptr" "Ref" "Cchar" "Cuchar" "Cshort" "Cstring" "Cushort"
-  "Cint" "Cuint" "Clong" "Culong" "Clonglong" "Culonglong" "Cintmax_t" "Cuintmax_t"
-  "Csize_t" "Cssize_t" "Cptrdiff_t" "Cwchar_t" "Cwstring" "Cfloat" "Cdouble" "Tmstruct"
-  "StackFrame" "StackTrace"))
+  "AbstractArray"
+  "AbstractChannel"
+  "AbstractChar"
+  "AbstractDict"
+  "AbstractDisplay"
+  "AbstractFloat"
+  "AbstractIrrational"
+  "AbstractLock"
+  "AbstractMatch"
+  "AbstractMatrix"
+  "AbstractPattern"
+  "AbstractRange"
+  "AbstractSet"
+  "AbstractSlices"
+  "AbstractString"
+  "AbstractUnitRange"
+  "AbstractVecOrMat"
+  "AbstractVector"
+  "Any"
+  "ArgumentError"
+  "Array"
+  "AssertionError"
+  "Atomic"
+  "BigFloat"
+  "BigInt"
+  "BitArray"
+  "BitMatrix"
+  "BitSet"
+  "BitVector"
+  "Bool"
+  "BoundsError"
+  "By"
+  "CanonicalIndexError"
+  "CapturedException"
+  "CartesianIndex"
+  "CartesianIndices"
+  "Cchar"
+  "Cdouble"
+  "Cfloat"
+  "Channel"
+  "Char"
+  "Cint"
+  "Cintmax_t"
+  "Clong"
+  "Clonglong"
+  "Cmd"
+  "Colon"
+  "ColumnSlices"
+  "Complex"
+  "ComplexF16"
+  "ComplexF32"
+  "ComplexF64"
+  "ComposedFunction"
+  "CompositeException"
+  "ConcurrencyViolationError"
+  "Condition"
+  "Cptrdiff_t"
+  "Cshort"
+  "Csize_t"
+  "Cssize_t"
+  "Cstring"
+  "Cuchar"
+  "Cuint"
+  "Cuintmax_t"
+  "Culong"
+  "Culonglong"
+  "Cushort"
+  "Cvoid"
+  "Cwchar_t"
+  "Cwstring"
+  "DataType"
+  "DenseArray"
+  "DenseMatrix"
+  "DenseVecOrMat"
+  "DenseVector"
+  "Dict"
+  "DimensionMismatch"
+  "Dims"
+  "DivideError"
+  "DomainError"
+  "EOFError"
+  "Enum"
+  "ErrorException"
+  "Exception"
+  "ExponentialBackOff"
+  "Expr"
+  "Float16"
+  "Float32"
+  "Float64"
+  "Function"
+  "GlobalRef"
+  "HTML"
+  "IO"
+  "IOBuffer"
+  "IOContext"
+  "IOStream"
+  "IdDict"
+  "IndexCartesian"
+  "IndexLinear"
+  "IndexStyle"
+  "InexactError"
+  "InitError"
+  "Int"
+  "Int128"
+  "Int16"
+  "Int32"
+  "Int64"
+  "Int8"
+  "Integer"
+  "InterruptException"
+  "InvalidStateException"
+  "Irrational"
+  "KeyError"
+  "LazyString"
+  "LinRange"
+  "LineNumberNode"
+  "LinearIndices"
+  "LoadError"
+  "Lt"
+  "MIME"
+  "Matrix"
+  "Method"
+  "MethodError"
+  "Missing"
+  "MissingException"
+  "Module"
+  "NTuple"
+  "NamedTuple"
+  "Nothing"
+  "Number"
+  "Ordering"
+  "OrdinalRange"
+  "OutOfMemoryError"
+  "OverflowError"
+  "Pair"
+  "ParseError"
+  "PartialQuickSort"
+  "Perm"
+  "PermutedDimsArray"
+  "Pipe"
+  "ProcessFailedException"
+  "Ptr"
+  "QuoteNode"
+  "Rational"
+  "RawFD"
+  "ReadOnlyMemoryError"
+  "Real"
+  "ReentrantLock"
+  "Ref"
+  "Regex"
+  "RegexMatch"
+  "Returns"
+  "ReverseOrdering"
+  "RoundingMode"
+  "RowSlices"
+  "SegmentationFault"
+  "Set"
+  "Signed"
+  "Slices"
+  "Some"
+  "SpinLock"
+  "StackFrame"
+  "StackOverflowError"
+  "StackTrace"
+  "Stateful"
+  "StepRange"
+  "StepRangeLen"
+  "StridedArray"
+  "StridedMatrix"
+  "StridedVecOrMat"
+  "StridedVector"
+  "String"
+  "StringIndexError"
+  "SubArray"
+  "SubString"
+  "SubstitutionString"
+  "Symbol"
+  "SystemError"
+  "Task"
+  "TaskFailedException"
+  "Text"
+  "TextDisplay"
+  "Timer"
+  "Tmstruct"
+  "Tuple"
+  "Type"
+  "TypeError"
+  "TypeVar"
+  "UInt"
+  "UInt128"
+  "UInt16"
+  "UInt32"
+  "UInt64"
+  "UInt8"
+  "UndefInitializer"
+  "UndefKeywordError"
+  "UndefRefError"
+  "UndefVarError"
+  "Union"
+  "UnionAll"
+  "UnitRange"
+  "Unsigned"
+  "Val"
+  "VecElement"
+  "VecOrMat"
+  "Vector"
+  "VersionNumber"
+  "WeakKeyDict"
+  "WeakRef"))
 
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "begin" "end")

From 86d0b2b1c08ff93020b261fc96201b25eb3a9082 Mon Sep 17 00:00:00 2001
From: zeroknots <102132718+zeroknots@users.noreply.github.com>
Date: Wed, 27 Sep 2023 13:08:46 +0700
Subject: [PATCH 0729/2704] solidity: Update highlights.scm (#5453)

https://soliditylang.org/blog/2021/04/21/custom-errors/

error keyword was introduced in 0.8.4
---
 queries/solidity/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 717f11f7c..82cf4fc73 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -116,6 +116,7 @@
   "var"
   "let"
   "emit"
+  "error"
   "fallback"
   "receive"
   (virtual)

From d6c9c85e14e15bc59478a0d5d810e88dad0ac53f Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 27 Sep 2023 06:36:43 +0000
Subject: [PATCH 0730/2704] Update parsers: git_config, gleam, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 248d4d40c..7f1f00142 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "03f20b94707a21bed90bb95101684bc4036139ce"
   },
   "git_config": {
-    "revision": "a01b498b25003d97a5f93b0da0e6f28307454347"
+    "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
   },
   "git_rebase": {
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
@@ -189,7 +189,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "297031dce60e07acf90345d62777623469e46027"
+    "revision": "32c8f1e32aee036583ca09e7e6e4ea881852b42c"
   },
   "glimmer": {
     "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "60c61fd6b6e2e6dbea7c206653d3e360435bfee2"
+    "revision": "380c161a2996efe1f481e6efc86e768bf05cdb6d"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From ec0e344f6ee1d910fe63a8bbce5380c42af47135 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Tue, 26 Sep 2023 22:20:59 +0200
Subject: [PATCH 0731/2704] feat(highlights): some haskell additions

- Re-add (module) @namespace
- Exception handling
- Debugging
- `otherwise` = boolean `True`
- `qq` string quasiquotes
- Documentation comments (draft)
- Function/lambda parameters
- Remove recently added @ (already defined as an operator)
---
 queries/haskell/highlights.scm | 110 +++++++++++++++++++++++++++++++--
 1 file changed, 105 insertions(+), 5 deletions(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 18038e079..5bd8d1b34 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -1,3 +1,15 @@
+;; ----------------------------------------------------------------------------
+;; Parameters
+
+;; NOTE: These are at the top, so that they have low priority,
+;; and don't override destructured parameters 
+
+(function
+  patterns: (patterns (pat_name) @parameter))
+
+(exp_lambda
+  (pat_name) @parameter)
+
 ;; ----------------------------------------------------------------------------
 ;; Literals and comments
 
@@ -11,6 +23,31 @@
 
 (comment) @comment
 
+; FIXME: The below documentation comment queries are inefficient
+; and need to be anchored, using something like
+; ((comment) @_first . (comment)+ @comment.documentation)
+; once https://github.com/neovim/neovim/pull/24738 has been merged.
+;
+; ((comment) @comment.documentation 
+;   (#lua-match? @comment.documentation "^-- |"))
+;
+; ((comment) @_first @comment.documentation 
+;  (comment) @comment.documentation 
+;   (#lua-match? @_first "^-- |"))
+;
+; ((comment) @comment.documentation 
+;   (#lua-match? @comment.documentation "^-- %^"))
+;
+; ((comment) @_first @comment.documentation 
+;  (comment) @comment.documentation 
+;   (#lua-match? @_first "^-- %^"))
+;
+; ((comment) @comment.documentation 
+;   (#lua-match? @comment.documentation "^{-"))
+;
+; ((comment) @_first @comment.documentation 
+;  (comment) @comment.documentation 
+;   (#lua-match? @_first "^{-"))
 
 ;; ----------------------------------------------------------------------------
 ;; Punctuation
@@ -77,6 +114,8 @@
   "@"
 ] @operator
 
+
+(module) @namespace
 (qualified_module (module) @constructor)
 (qualified_type (module) @namespace)
 (qualified_variable (module) @namespace)
@@ -136,9 +175,6 @@
 (exp_apply . (exp_name (variable) @function.call))
 (exp_apply . (exp_name (qualified_variable (variable) @function.call)))
 
-("@" @namespace)  ; "as" pattern operator, e.g. x@Constructor
-
-
 ;; ----------------------------------------------------------------------------
 ;; Types
 
@@ -150,13 +186,77 @@
 
 ; True or False
 ((constructor) @boolean (#any-of? @boolean "True" "False"))
-
+; otherwise (= True)
+((variable) @boolean
+  (#eq? @boolean "otherwise"))
 
 ;; ----------------------------------------------------------------------------
 ;; Quasi-quotes
 
 (quoter) @function.call
-; Highlighting of quasiquote_body is handled by injections.scm
+
+(quasiquote 
+  (quoter) @_name (#eq? @_name "qq")
+  (quasiquote_body) @string)
+
+; Highlighting of quasiquote_body for other languages is handled by injections.scm
+
+;; ----------------------------------------------------------------------------
+;; Exceptions/error handling
+
+((variable) @exception
+  (#any-of? @exception 
+   "error"
+   "undefined"
+   "try"
+   "tryJust"
+   "tryAny"
+   "catch"
+   "catches"
+   "catchJust"
+   "handle"
+   "handleJust"
+   "throw"
+   "throwIO"
+   "throwTo"
+   "throwError"
+   "ioError"
+   "mask"
+   "mask_"
+   "uninterruptibleMask"
+   "uninterruptibleMask_"
+   "bracket"
+   "bracket_"
+   "bracketOnErrorSource"
+   "finally"
+   "onException"))
+
+;; ----------------------------------------------------------------------------
+;; Debugging
+((variable) @debug
+  (#any-of? @debug 
+   "trace"
+   "traceId"
+   "traceShow"
+   "traceShowId"
+   "traceWith"
+   "traceShowWith"
+   "traceStack"
+   "traceIO"
+   "traceM"
+   "traceShowM"
+   "traceEvent"
+   "traceEventWith"
+   "traceEventIO"
+   "flushEventLog"
+   "traceMarker"
+   "traceMarkerIO"))
+
+
+;; ----------------------------------------------------------------------------
+;; Record fields
+(record_fields (field (variable) @field))
+
 
 ;; ----------------------------------------------------------------------------
 ;; Spell checking

From cb139d880bcf9b3a6f29f2bd088a7491d1662918 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Wed, 27 Sep 2023 16:24:49 +0200
Subject: [PATCH 0732/2704] chore(haskell): add mrcjkb as maintainer

---
 README.md                       | 2 +-
 lua/nvim-treesitter/parsers.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 23a411c5d..50a72798f 100644
--- a/README.md
+++ b/README.md
@@ -249,7 +249,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [groovy](https://github.com/Decodetalkers/tree-sitter-groovy) (maintained by @Decodetalkers)
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
 - [x] [hare](https://github.com/amaanq/tree-sitter-hare) (maintained by @amaanq)
-- [ ] [haskell](https://github.com/tree-sitter/tree-sitter-haskell)
+- [x] [haskell](https://github.com/tree-sitter/tree-sitter-haskell) (maintained by @mrcjkb)
 - [x] [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) (maintained by @lykahb)
 - [x] [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7b40657f8..ee6ad3295 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -719,6 +719,7 @@ list.haskell = {
     url = "https://github.com/tree-sitter/tree-sitter-haskell",
     files = { "src/parser.c", "src/scanner.c" },
   },
+  maintainers = { "@mrcjkb" },
 }
 
 list.haskell_persistent = {

From cc2f94ed1dfa008c23e16bbd17f56b967ceb6740 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 28 Sep 2023 16:27:19 +0000
Subject: [PATCH 0733/2704] Update parsers: dockerfile, ssh_config, t32, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7f1f00142..3c93a0876 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -105,7 +105,7 @@
     "revision": "c165725c28e69b36c5799ff0e458713a844f1aaf"
   },
   "dockerfile": {
-    "revision": "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321"
+    "revision": "1800d5a06789797065ba5e7d80712b6bbf5483d7"
   },
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
@@ -543,7 +543,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "6afe38a8e418a1ffd05d45ea979e5e689b025a51"
+    "revision": "e4008633536870f3fed3198c96503250af0b0a12"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -570,7 +570,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "6d317c49ab310152c486ab85eb06724fd49df52d"
+    "revision": "c544082904fd1d27da5493857bd3fc278bae2a1a"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "380c161a2996efe1f481e6efc86e768bf05cdb6d"
+    "revision": "0c8625d5d39374613e1802cd5d20fe034cf5bfa5"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 16ea2969ea0a5ba902fceece9b2db10c7c9ba2d6 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 29 Sep 2023 06:35:56 +0000
Subject: [PATCH 0734/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 3c93a0876..29fe4e1d8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0c8625d5d39374613e1802cd5d20fe034cf5bfa5"
+    "revision": "fac3f72d80d379fea61d1eca782cb99ac6d78b62"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From dd4e2dbc002dfce109d621e8bdcd9d89438b0a32 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 30 Sep 2023 06:34:53 +0000
Subject: [PATCH 0735/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 29fe4e1d8..29c00775c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "fac3f72d80d379fea61d1eca782cb99ac6d78b62"
+    "revision": "17b1df10c34b4bfecd008c3ab3e90fed58fc4678"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 776e4d341b5416c995e74c3abbf75f9cec26aa5e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 1 Oct 2023 07:36:51 +0000
Subject: [PATCH 0736/2704] Update parsers: vim, wing (#5463)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 29c00775c..3ff07b89e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -639,7 +639,7 @@
     "revision": "375b42e9845f704dd491c17c7e37f7c972e0faf3"
   },
   "vim": {
-    "revision": "77e9e96c2ae5cff7343ce3dced263483acf95793"
+    "revision": "32c76f150347c1cd044e90b8e2bc73c00677fa55"
   },
   "vimdoc": {
     "revision": "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "17b1df10c34b4bfecd008c3ab3e90fed58fc4678"
+    "revision": "602c8e51c4721a32cafaac0d1889a73de066e2f0"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 811e8ba4f37821a9e7fe645573ceac4ee47cd542 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 21 May 2023 20:14:12 -0400
Subject: [PATCH 0737/2704] injections(nix): dynamic language injection via
 comments

---
 queries/nix/injections.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index 2b5d55ec1..c2c31c44e 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -1,6 +1,15 @@
 ((comment) @injection.content
  (#set! injection.language "comment"))
 
+((comment) @injection.language
+  . ; this is to make sure only adjacent comments are accounted for the injections
+  [
+    (string_expression (string_fragment) @injection.content)
+    (indented_string_expression (string_fragment) @injection.content)
+  ]
+  (#gsub! @injection.language "/%*%s*([%w%p]+)%s*%*/" "%1")
+  (#set! injection.combined))
+
 (apply_expression
   function: (_) @_func
   argument: [

From faeb88e4cee4b27d4a36e40f75332753e45c85b6 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 2 Oct 2023 06:36:42 +0000
Subject: [PATCH 0738/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 3ff07b89e..666c77394 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "602c8e51c4721a32cafaac0d1889a73de066e2f0"
+    "revision": "a572271027b3a611ba40825c47355e99369d4f32"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From d96c216c54cc2d48d3c66ba7f0fc3c7c5b71b3b1 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Mon, 2 Oct 2023 12:49:12 +0200
Subject: [PATCH 0739/2704] feat(haskell): highlights improvements + tests
 (#5466)

---
 queries/haskell/highlights.scm         |  80 ++++++++++--
 tests/query/highlights/haskell/test.hs | 161 +++++++++++++++++++++++++
 2 files changed, 233 insertions(+), 8 deletions(-)
 create mode 100644 tests/query/highlights/haskell/test.hs

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 5bd8d1b34..956b241c8 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -116,7 +116,8 @@
 
 
 (module) @namespace
-(qualified_module (module) @constructor)
+((qualified_module (module) @constructor)
+ . (module))
 (qualified_type (module) @namespace)
 (qualified_variable (module) @namespace)
 (import (module) @namespace)
@@ -152,7 +153,24 @@
 
 (variable) @variable
 (pat_wildcard) @variable
-(signature name: (variable) @variable)
+(signature name: (variable) @function)
+((signature name: (variable) @variable)
+ (function 
+  name: (variable) @_name
+  rhs: [
+   (exp_literal)
+   (exp_apply (exp_name (constructor)))
+   (quasiquote)
+  ])
+ (#eq? @variable @_name))
+(function name: (variable) @function)
+(function 
+  name: (variable) @variable
+  rhs: [
+   (exp_literal)
+   (exp_apply (exp_name (constructor)))
+   (quasiquote)
+  ])
 
 (function
   name: (variable) @function
@@ -167,14 +185,61 @@
 ((signature (variable) @function (forall (context (fun)))) . (function (variable)))
 ((signature (variable) @_type (forall (context (fun)))) . (function (variable) @function) (#eq? @function @_type))
 
-(exp_infix (variable) @operator)  ; consider infix functions as operators
-(exp_section_right (variable) @operator) ; partially applied infix functions (sections) also get highlighted as operators
+; consider infix functions as operators
+(exp_infix (variable) @operator)  
+(exp_infix (qualified_variable (variable) @operator))
+; partially applied infix functions (sections) also get highlighted as operators
+(exp_section_right (variable) @operator) 
+(exp_section_right (qualified_variable (variable) @operator)) 
 (exp_section_left (variable) @operator)
+(exp_section_left (qualified_variable (variable) @operator))
 
-(exp_infix (exp_name) @function.call (#set! "priority" 101))
+; function calls with an infix operator
+; e.g. func <$> a <*> b
+(exp_infix (exp_name) @function.call . (operator))
+; qualified function calls with an infix operator
+(exp_infix (exp_name 
+  (qualified_variable (
+      (module) @namespace
+      (variable) @function.call))) . (operator))
+; infix operators applied to variables
+((exp_name (variable) @variable) . (operator))
+((operator) . (exp_name (variable) @variable))
+; function calls with infix operators
+((exp_name (variable) @function.call) . (operator) @_op
+ (#any-of? @_op "$" "<$>" ">>="))
+; function composition, arrows
+((exp_name (variable) @function) . (operator) @_op
+ (#any-of? @_op "." ">>>"))
+((operator) @_op (exp_name (variable) @function)
+ (#any-of? @_op "." ">>>"))
+        
+        
 (exp_apply . (exp_name (variable) @function.call))
 (exp_apply . (exp_name (qualified_variable (variable) @function.call)))
 
+; let/where bindings
+(_ (decls (function name: (variable) @variable)))
+(_ (decls 
+  (function 
+    name: (variable) @function
+    patterns: (patterns (pat_name) @parameter))))
+
+; higher-order function parameters
+(function
+  patterns: (patterns (pat_name (variable) @function))
+  rhs: (exp_apply (exp_name (variable) @_name) . (exp_name)+)
+  (#eq? @function @_name))
+(function
+  patterns: (patterns (pat_name (variable) @function))
+  rhs: (_ (operator) @_op (exp_name (variable))
+ (#any-of? @_op "." ">>>")))
+(function
+  patterns: (patterns (pat_name (variable) @function))
+  rhs: (_ (exp_name (variable)) . (operator) @_op)
+ (#any-of? @_op "$" "<$>" ">>=" "." ">>>"))
+
+
 ;; ----------------------------------------------------------------------------
 ;; Types
 
@@ -254,12 +319,11 @@
 
 
 ;; ----------------------------------------------------------------------------
-;; Record fields
-(record_fields (field (variable) @field))
+;; Fields
+(field (variable) @field)
 
 
 ;; ----------------------------------------------------------------------------
 ;; Spell checking
 
 (comment) @spell
-
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
new file mode 100644
index 000000000..e934e4606
--- /dev/null
+++ b/tests/query/highlights/haskell/test.hs
@@ -0,0 +1,161 @@
+{-# LANGUAGE QuasiQuotes #-}
+-- ^ @preproc
+
+module Main 
+-- ^ @include
+     -- ^ @namespace
+  ( main
+  ) where
+   -- ^ @keyword
+
+import Prelude hiding (show)
+-- ^ @include
+      -- ^ @namespace
+              -- ^ @keyword
+                      -- ^ @variable
+import Data.Map (fromList)
+      -- ^ @namespace
+import qualified Data.Map as Map
+                -- ^ @constructor
+                           -- ^ @namespace
+import qualified Chronos
+                -- ^ @namespace
+
+data ADT
+-- ^ @keyword
+  = A Int
+ -- ^ @constructor
+    -- ^ @type
+  | B
+ -- ^ @constructor
+  deriving (Eq, Show)
+  -- ^ @keyword
+         -- ^ @type
+               -- ^ @type
+
+class Ord a => PartialOrd a
+    -- ^ @type
+       -- ^ @type
+                -- ^ @type
+                       -- ^ @type
+
+instance Ord ADT where
+      -- ^ @type
+          -- ^ @type
+
+newtype Rec
+-- ^ @keyword
+     -- ^ @type
+  = Rec
+  -- ^ @constructor
+    { field :: Double
+ -- ^ @punctuation.bracket
+    -- ^ @field
+              -- ^ @type
+    }
+ -- ^ @punctuation.bracket
+    deriving Eq
+           -- ^ @type
+
+main :: IO ()
+-- ^ @function
+  -- ^ @operator
+     -- ^ @type
+         -- ^ @symbol
+main = undefined
+-- ^ @function
+      -- ^ @exception
+
+someFunc0 :: Int -> Int
+              -- ^ @operator
+someFunc0 x = someFunc1 x
+       -- ^ @parameter
+            -- ^ @function.call
+  where
+  -- ^ @keyword
+    someFunc1 _ = 5
+    -- ^ @function
+               -- ^ @number
+
+someInfix :: Integral a => a -> Double
+            -- ^ @type
+                   -- ^ @type
+                      -- ^ @operator
+                        -- ^ @type
+someInfix x = fromIntegral x `myAdd` floatVal
+                -- ^ @function.call
+                        -- ^ @variable
+                             -- ^ @operator
+                                    -- ^ @variable
+  where
+    myAdd x y = x + y
+             -- ^ @variable
+                 -- ^ @variable
+    floatVal = 5.5
+    -- ^ @variable
+            -- ^ @float
+
+someIOaction :: IO ()
+-- ^ @function
+someIOaction = do
+            -- ^ @keyword
+  foo <- SomeModule.someFun <$> getArgs
+-- ^ @variable
+            -- ^ @namespace
+                   -- ^ @function.call
+                          -- ^ @operator
+  let bar = SomeModule.doSomething $ "a" "b"
+    -- ^ @variable
+            -- ^ @namespace
+                        -- ^ @function.call
+                                -- ^ @operator
+      func x y = x + y - 7
+    -- ^ @function
+        -- ^ @parameter
+              -- ^ @variable
+                  -- ^ @variable
+  pure $ func 1 2
+  -- ^ @function.call
+        -- ^ @function.call
+
+intVal :: Int
+-- ^ @variable
+intVal = 5
+-- ^ @variable
+
+mbInt :: Maybe Int
+-- ^ @variable
+mbInt = Just 5
+-- ^ @variable
+
+getLambda x = \y -> x `SomeModule.someInfix` y
+            -- ^ @parameter
+                      -- ^ @namespace
+                                  -- ^ @operator
+
+isVowel = (`elem` "AEIOU")
+          -- ^ @operator
+isVowelQualified = (`SomeModule.elem` "AEIOU")
+                      -- ^ @namespace
+                              -- ^ @operator
+
+hasVowels = ("AEIOU" `elem`)
+                   -- ^ @operator
+hasVowelsQualified = ("AEIOU" `SomeModule.elem`)
+                            -- ^ @namespace
+                                       -- ^ @operator
+
+quasiQuotedString = [qq|Some string|]
+-- ^ @variable
+                   -- ^ @function.call
+                      -- ^ @string
+
+higherOrderFn f x = f x
+           -- ^ @function
+             -- ^ @variable
+
+composition f g = f . g
+         -- ^ @function
+           -- ^ @function
+               -- ^ @function
+                   -- ^ @function

From 32cc79b63342662f1136aebd93ba190778a45c92 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 3 Oct 2023 06:36:38 +0000
Subject: [PATCH 0740/2704] Update parsers: apex, bash, html, kotlin, norg,
 php, soql, sosl, sql, wing

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 666c77394..0eadcb509 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
   },
   "apex": {
-    "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
+    "revision": "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"
   },
   "arduino": {
     "revision": "db929fc6822b9b9e1211678d508f187894ce0345"
@@ -18,7 +18,7 @@
     "revision": "374da90decaa60fea7a22490a77440ece6d4161d"
   },
   "bash": {
-    "revision": "fd4e40dab883d6456da4d847de8321aee9c80805"
+    "revision": "1479a4030f1a399c253aee02097576d4af46f23a"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -252,7 +252,7 @@
     "revision": "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6"
   },
   "html": {
-    "revision": "e5d7d7decbbdec5a4c90bbc69436b3828f5646e7"
+    "revision": "d742025fa2d8e6100f134a6ea990443aa1f074b3"
   },
   "htmldjango": {
     "revision": "717e83aefd328735beeeb671f3f95b2624e70c57"
@@ -306,7 +306,7 @@
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
-    "revision": "06a2f6e71c7fcac34addcbf2a4667adad1b9c5a7"
+    "revision": "7587b4a7f1c3a0fe4ab41301596f9b4517395a4e"
   },
   "lalrpop": {
     "revision": "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"
@@ -369,7 +369,7 @@
     "revision": "66e3e9ce9180ae08fc57372061006ef83f0abde7"
   },
   "norg": {
-    "revision": "1a305093569632de50f9a316ff843dcda25b4ef5"
+    "revision": "014073fe8016d1ac440c51d22c77e3765d8f6855"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -405,7 +405,7 @@
     "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
   },
   "php": {
-    "revision": "a05c6112a1dfdd9e586cb275700931e68d3c7c85"
+    "revision": "92a98adaa534957b9a70b03e9acb9ccf9345033a"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
@@ -528,16 +528,16 @@
     "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
   },
   "soql": {
-    "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
+    "revision": "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"
   },
   "sosl": {
-    "revision": "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"
+    "revision": "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "39750c48bf9ad63bcc1399554355b0aa0aaa1c33"
+    "revision": "4c2eeb19cb3daff46ee9d87df77748724bd8344d"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "a572271027b3a611ba40825c47355e99369d4f32"
+    "revision": "101558a99a184e1110827bd293f2a8220a4b4992"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 9e52d8fda3d5a01571baac2e45d3fb8e0312404c Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Tue, 3 Oct 2023 19:15:54 +0900
Subject: [PATCH 0741/2704] feat(ocaml): use @function.call where appropriate

---
 queries/ocaml/highlights.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index ba9ea4def..309fdd73c 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -46,17 +46,17 @@
 ;------------
 
 (infix_expression
-  left: (value_path (value_name) @function)
+  left: (value_path (value_name) @function.call)
   operator: (concat_operator) @_operator
   (#eq? @_operator "@@"))
 
 (infix_expression
   operator: (rel_operator) @_operator
-  right: (value_path (value_name) @function)
+  right: (value_path (value_name) @function.call)
   (#eq? @_operator "|>"))
 
 (application_expression
-  function: (value_path (value_name) @function))
+  function: (value_path (value_name) @function.call))
 
 ((value_name) @function.builtin
   (#any-of? @function.builtin "raise" "raise_notrace" "failwith" "invalid_arg"))

From 812c2dd8fe838bb26cb53f0d251116468c2cae37 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Tue, 3 Oct 2023 19:16:32 +0900
Subject: [PATCH 0742/2704] feat(query): use @function.call for predicate

---
 queries/query/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index f2d2ef6c7..603bba933 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -2,7 +2,7 @@
 (escape_sequence) @string.escape
 (capture (identifier) @type)
 (anonymous_node (identifier) @string)
-(predicate name: (identifier) @function)
+(predicate name: (identifier) @function.call)
 (named_node name: (identifier) @variable)
 (field_definition name: (identifier) @property)
 (negated_field "!" @operator (identifier) @property)

From 06fa0a023459b43f86438a751275645b7f3163f3 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 4 Oct 2023 06:36:56 +0000
Subject: [PATCH 0743/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 0eadcb509..e01e02921 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -654,7 +654,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "101558a99a184e1110827bd293f2a8220a4b4992"
+    "revision": "0e8e85f00c6e214478fc26f743346bd417d73970"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From eb96ca52a7e72ec6d45b163e90bcb5e0774d44ad Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 4 Oct 2023 06:28:03 -0400
Subject: [PATCH 0744/2704] fix(c): add missing folds

---
 queries/c/folds.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/c/folds.scm b/queries/c/folds.scm
index 5a35334a2..42ca3fb63 100644
--- a/queries/c/folds.scm
+++ b/queries/c/folds.scm
@@ -2,6 +2,7 @@
  (for_statement)
  (if_statement)
  (while_statement)
+ (do_statement)
  (switch_statement)
  (case_statement)
  (function_definition)
@@ -12,6 +13,7 @@
  (preproc_elif)
  (preproc_else)
  (preproc_ifdef)
+ (preproc_function_def)
  (initializer_list)
  (gnu_asm_expression)
 ] @fold

From 691fdc61a13ecca2f5cf0c2abda4b5da87c54893 Mon Sep 17 00:00:00 2001
From: Romain Beauxis <toots@rastageeks.org>
Date: Wed, 4 Oct 2023 09:58:10 -0500
Subject: [PATCH 0745/2704] feat: add liquidsoap

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 README.md                         |  1 +
 lockfile.json                     |  3 ++
 lua/nvim-treesitter/parsers.lua   |  8 +++
 queries/liquidsoap/folds.scm      | 21 ++++++++
 queries/liquidsoap/highlights.scm | 85 +++++++++++++++++++++++++++++++
 queries/liquidsoap/indents.scm    | 54 ++++++++++++++++++++
 queries/liquidsoap/locals.scm     | 15 ++++++
 7 files changed, 187 insertions(+)
 create mode 100644 queries/liquidsoap/folds.scm
 create mode 100644 queries/liquidsoap/highlights.scm
 create mode 100644 queries/liquidsoap/indents.scm
 create mode 100644 queries/liquidsoap/locals.scm

diff --git a/README.md b/README.md
index 50a72798f..b86a54f54 100644
--- a/README.md
+++ b/README.md
@@ -280,6 +280,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [latex](https://github.com/latex-lsp/tree-sitter-latex) (maintained by @theHamsta, @clason)
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
+- [x] [liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) (maintained by @toots)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
 - [x] [luadoc](https://github.com/amaanq/tree-sitter-luadoc) (maintained by @amaanq)
 - [x] [lua patterns](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index e01e02921..41845a314 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -320,6 +320,9 @@
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
   },
+  "liquidsoap": {
+    "revision": "bfc9518d4289c1e0477f0c99cf37c84d895ef8e8"
+  },
   "lua": {
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ee6ad3295..26a2bf8f5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -975,6 +975,14 @@ list.llvm = {
   maintainers = { "@benwilliamgraham" },
 }
 
+list.liquidsoap = {
+  install_info = {
+    url = "https://github.com/savonet/tree-sitter-liquidsoap",
+    files = { "src/parser.c", "src/scanner.cc" },
+  },
+  maintainers = { "@toots" },
+}
+
 list.lua = {
   install_info = {
     url = "https://github.com/MunifTanjim/tree-sitter-lua",
diff --git a/queries/liquidsoap/folds.scm b/queries/liquidsoap/folds.scm
new file mode 100644
index 000000000..9b0d12efa
--- /dev/null
+++ b/queries/liquidsoap/folds.scm
@@ -0,0 +1,21 @@
+[
+ (let)
+ (binding)
+ (simple_fun)
+ (def)
+ (arglist)
+ (if)
+ (if_condition)
+ (if_then)
+ (elsif_condition)
+ (elsif_then)
+ (if_else)
+ (for)
+ (for_do)
+ (while)
+ (while_do)
+ (try)
+ (try_body)
+ (try_do)
+ (block)
+] @fold
diff --git a/queries/liquidsoap/highlights.scm b/queries/liquidsoap/highlights.scm
new file mode 100644
index 000000000..fcf553e3b
--- /dev/null
+++ b/queries/liquidsoap/highlights.scm
@@ -0,0 +1,85 @@
+(var) @variable
+
+(op) @operator
+["and" "or" "not"] @keyword.operator
+
+[
+  "def"
+  "fun"
+  "def_end"
+] @keyword.function
+
+(let_decoration) @keyword.coroutine
+
+[
+  "open"
+  "begin"
+  "block_end"
+  "let"
+] @keyword
+
+[
+  "while"
+  "do"
+  "to"
+  "for"
+  "for_end"
+  "while_end"
+] @repeat
+
+[
+  "if"
+  "then"
+  "elsif"
+  "else"
+  "if_end"
+] @conditional
+
+[
+  "try"
+  "catch"
+  "try_end"
+] @exception
+
+(inline_if [ "?" ":" ] @conditional.ternary)
+
+[
+  "%ifdef"
+  "%ifndef"
+  "%ifencoder"
+  "%ifnencoder"
+  "%ifversion"
+  "%else"
+  "%endif"
+  "%argsof"
+  "%include"
+] @preproc
+
+(encoder_name) @constant.builtin
+
+(anonymous_argument (var) @parameter)
+(labeled_argument label: (var) @parameter)
+
+"." @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+]  @punctuation.bracket
+
+(app name: (var) @function.call)
+(method) @method
+(method_app) @method.call
+
+(string) @string
+(string_interpolation [ "#{" "}" ] @punctuation.special)
+(integer) @number
+(float) @float
+(bool) @boolean
+(comment) @comment
+(regexp) @string.regex
+(type) @type
diff --git a/queries/liquidsoap/indents.scm b/queries/liquidsoap/indents.scm
new file mode 100644
index 000000000..ce8c02b53
--- /dev/null
+++ b/queries/liquidsoap/indents.scm
@@ -0,0 +1,54 @@
+[
+  "%ifdef"
+  "%ifndef"
+  "%ifencoder"
+  "%ifnencoder"
+  "%ifversion"
+  "%else"
+  "%endif"
+  "%argsof"
+  "%include"
+] @indent.zero
+
+[
+  "if"
+  "def"
+  "let"
+  "for"
+  "while"
+  "try"
+  "{"
+  "["
+  "("
+] @indent.begin
+
+(ERROR "def") @indent.begin
+
+(def "def_end" @indent.end)
+(if "if_end" @indent.end)
+(block "block_end" @indent.end)
+(for "for_end" @indent.end)
+(while "while_end" @indent.end)
+(try "try_end" @indent.end)
+
+[
+ "then"
+ "do"
+ "else"
+ "elsif"
+ "catch"
+] @indent.branch
+
+[
+ "def_end"
+ "if_end"
+ "block_end"
+ "for_end"
+ "while_end"
+ "try_end"
+ "}"
+ "]"
+ ")"
+] @indent.branch @indent.end
+
+(comment) @indent.auto
diff --git a/queries/liquidsoap/locals.scm b/queries/liquidsoap/locals.scm
new file mode 100644
index 000000000..1d67bc55a
--- /dev/null
+++ b/queries/liquidsoap/locals.scm
@@ -0,0 +1,15 @@
+[(anonymous_function) (binding) (def) (let)] @scope
+
+(anonymous_argument (var) @definition.parameter)
+(labeled_argument label: (var) @definition.parameter)
+
+(binding
+  defined: (var) @definition.var)
+(def defined: (var) @definition.var)
+(let defined: (var) @definition.var)
+(meth_pattern (var) @definition.var)
+(list_pattern (var) @definition.var)
+(tuple_pattern (var) @definition.var)
+(spread (var) @definition.var)
+
+(var) @reference

From f51d56c261990581289916322005e83446cf49ad Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Wed, 4 Oct 2023 14:58:26 +0000
Subject: [PATCH 0746/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b86a54f54..480e243b3 100644
--- a/README.md
+++ b/README.md
@@ -279,8 +279,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) (maintained by @traxys)
 - [x] [latex](https://github.com/latex-lsp/tree-sitter-latex) (maintained by @theHamsta, @clason)
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
-- [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) (maintained by @toots)
+- [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
 - [x] [luadoc](https://github.com/amaanq/tree-sitter-luadoc) (maintained by @amaanq)
 - [x] [lua patterns](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)

From dd72cfadec27c13e93df202c7f9a6d8bb9d51826 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 5 Oct 2023 06:37:03 +0000
Subject: [PATCH 0747/2704] Update parsers: c, comment, glimmer, json,
 liquidsoap, rst, sql, tsx, typescript, wing

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 41845a314..c96f6ef37 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -39,7 +39,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "a2b7bac3b313efbaa683d9a276ff63cdc544d960"
+    "revision": "f1075f2d65ecb62725821fd8a34ce68c1fa8ae51"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -60,7 +60,7 @@
     "revision": "73ab4b8e9522f014a67f87f585e820d36fa47408"
   },
   "comment": {
-    "revision": "c9a7e2df7cac2dfb730f766a4f343308f84ff346"
+    "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
   },
   "commonlisp": {
     "revision": "5153dbbc70e4cc2324320c1bdae020d31079c7c0"
@@ -192,7 +192,7 @@
     "revision": "32c8f1e32aee036583ca09e7e6e4ea881852b42c"
   },
   "glimmer": {
-    "revision": "d3031a8294bf331600d5046b1d14e690a0d8ba0c"
+    "revision": "8c99566ab0e454f98a2c123d0571da5d83045e50"
   },
   "glsl": {
     "revision": "ec6100d2bdf22363ca8a711a212f2144ea49233f"
@@ -285,7 +285,7 @@
     "revision": "d01984de49927c979b46ea5c01b78c8ddd79baf9"
   },
   "json": {
-    "revision": "ca3f8919800e3c1ad4508de3bfd7b0b860ce434f"
+    "revision": "3fef30de8aee74600f25ec2e319b62a1a870d51e"
   },
   "json5": {
     "revision": "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"
@@ -317,12 +317,12 @@
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
+  "liquidsoap": {
+    "revision": "a2ea4f516d3d3b3837e3e982cef0114dd7084b05"
+  },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
   },
-  "liquidsoap": {
-    "revision": "bfc9518d4289c1e0477f0c99cf37c84d895ef8e8"
-  },
   "lua": {
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
@@ -495,7 +495,7 @@
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
   "rst": {
-    "revision": "2ca8c123c82ca41f41b66b5d13d403cff0204b78"
+    "revision": "3c03a4bb2c27f1fa76f1ca5563c1fc10187e4028"
   },
   "ruby": {
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
@@ -540,7 +540,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "4c2eeb19cb3daff46ee9d87df77748724bd8344d"
+    "revision": "eeab7240a11098724e6f95bc57cc3ceaf5487d5f"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -606,7 +606,7 @@
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "tsx": {
-    "revision": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"
+    "revision": "c604297f8197b468026f2ea32119935887e01c67"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -615,7 +615,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"
+    "revision": "c604297f8197b468026f2ea32119935887e01c67"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -657,7 +657,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0e8e85f00c6e214478fc26f743346bd417d73970"
+    "revision": "066e14225c792ca0aacb494a525d080eafd694c0"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 6276cd9d41a56758bc48b433c99b8f9e345a3f2d Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Thu, 5 Oct 2023 19:04:46 +0200
Subject: [PATCH 0748/2704] fix(haskell): highlight fixes (#5470)

* fix(haskell): highlight fixes + merge qualified/unqualified queries

* fix(haskell): lambda params + add exp_record to function.call args

* style: apply PR suggestions
---
 queries/haskell/highlights.scm         | 206 ++++++++++++++++++-------
 tests/query/highlights/haskell/test.hs | 128 ++++++++++++++-
 2 files changed, 275 insertions(+), 59 deletions(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 956b241c8..1340cfd46 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -1,14 +1,23 @@
 ;; ----------------------------------------------------------------------------
-;; Parameters
+;; Parameters and variables
 
 ;; NOTE: These are at the top, so that they have low priority,
 ;; and don't override destructured parameters 
 
-(function
-  patterns: (patterns (pat_name) @parameter))
+(variable) @variable
+(pat_wildcard) @variable
 
-(exp_lambda
-  (pat_name) @parameter)
+(function
+  patterns: (patterns (_) @parameter))
+
+(exp_lambda (_)+ @parameter "->")
+
+(function 
+  infix: (infix
+    lhs: (_) @parameter))
+(function 
+  infix: (infix
+    rhs: (_) @parameter))
 
 ;; ----------------------------------------------------------------------------
 ;; Literals and comments
@@ -121,6 +130,7 @@
 (qualified_type (module) @namespace)
 (qualified_variable (module) @namespace)
 (import (module) @namespace)
+(import (module) @constructor . (module))
 
 [
   (where)
@@ -151,26 +161,79 @@
 ;; ----------------------------------------------------------------------------
 ;; Functions and variables
 
-(variable) @variable
-(pat_wildcard) @variable
 (signature name: (variable) @function)
 ((signature name: (variable) @variable)
  (function 
   name: (variable) @_name
   rhs: [
    (exp_literal)
-   (exp_apply (exp_name (constructor)))
+   (exp_apply 
+     (exp_name 
+       [(constructor)
+        (variable)
+       ]))
    (quasiquote)
+   ((exp_name) . (operator))
   ])
  (#eq? @variable @_name))
+
+((signature name: (variable) @variable)
+ (function 
+  name: (variable) @_name
+  rhs: (exp_infix 
+    [
+     (exp_literal)
+     (exp_apply 
+       (exp_name 
+         [(constructor)
+          (variable)
+         ]))
+     (quasiquote)
+     ((exp_name) . (operator))
+    ]))
+ (#eq? @variable @_name))
+
+((signature name: (variable) @function)
+ (function 
+  name: (variable) @_name
+  patterns: (patterns))
+ (#eq? @function @_name))
+
+(signature 
+  name: (variable) @function
+  type: (fun))
+((signature 
+   name: (variable) @_name
+   type: (fun))
+ (function
+   name: (variable) @function)
+ (#eq? @function @_name))
+
 (function name: (variable) @function)
 (function 
   name: (variable) @variable
   rhs: [
    (exp_literal)
-   (exp_apply (exp_name (constructor)))
+   (exp_apply 
+     (exp_name 
+       [(constructor)
+        (variable)
+       ]))
    (quasiquote)
+   ((exp_name) . (operator))
   ])
+(function 
+  name: (variable) @variable
+  rhs: (exp_infix [
+   (exp_literal)
+   (exp_apply 
+     (exp_name 
+       [(constructor)
+        (variable)
+       ]))
+   (quasiquote)
+   ((exp_name) . (operator))
+  ]))
 
 (function
   name: (variable) @function
@@ -186,59 +249,86 @@
 ((signature (variable) @_type (forall (context (fun)))) . (function (variable) @function) (#eq? @function @_type))
 
 ; consider infix functions as operators
-(exp_infix (variable) @operator)  
-(exp_infix (qualified_variable (variable) @operator))
+(exp_infix [
+  (variable) @operator
+  (qualified_variable (variable) @operator)
+])
 ; partially applied infix functions (sections) also get highlighted as operators
-(exp_section_right (variable) @operator) 
-(exp_section_right (qualified_variable (variable) @operator)) 
-(exp_section_left (variable) @operator)
-(exp_section_left (qualified_variable (variable) @operator))
+(exp_section_right [
+  ((variable) @operator)
+  (qualified_variable (variable) @operator)
+  ]) 
+(exp_section_left [
+  ((variable) @operator)
+  (qualified_variable (variable) @operator)
+  ])
 
 ; function calls with an infix operator
 ; e.g. func <$> a <*> b
-(exp_infix (exp_name) @function.call . (operator))
-; qualified function calls with an infix operator
-(exp_infix (exp_name 
-  (qualified_variable (
-      (module) @namespace
-      (variable) @function.call))) . (operator))
+(exp_infix 
+  (exp_name 
+    [
+      ((variable) @function.call)
+      (qualified_variable (
+        (module) @namespace
+        (variable) @function.call))
+    ])
+  . (operator))
 ; infix operators applied to variables
 ((exp_name (variable) @variable) . (operator))
 ((operator) . (exp_name (variable) @variable))
 ; function calls with infix operators
 ((exp_name (variable) @function.call) . (operator) @_op
- (#any-of? @_op "$" "<$>" ">>="))
-; function composition, arrows
-((exp_name (variable) @function) . (operator) @_op
- (#any-of? @_op "." ">>>"))
-((operator) @_op (exp_name (variable) @function)
- (#any-of? @_op "." ">>>"))
+ (#any-of? @_op "$" "<$>" ">>=" "=<<"))
+; right hand side of infix operator
+((exp_infix 
+   [(operator)(variable)] ; infix or `func`
+  . (exp_name [
+      ((variable) @function.call)
+      (qualified_variable (variable) @function.call)
+    ])) . (operator) @_op
+ (#any-of? @_op "$" "<$>" "=<<"))
+; function composition, arrows, monadic composition (rhs)
+((exp_name [
+  ((variable) @function)
+  (qualified_variable (variable) @function)
+ ]) . (operator) @_op
+ (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
+; right hand side of infix operator
+((exp_infix 
+   [(operator)(variable)] ; infix or `func`
+  . (exp_name [
+      ((variable) @function)
+      (qualified_variable (variable) @function)
+    ])) . (operator) @_op
+ (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
+; function composition, arrows, monadic composition (rhs)
+((operator) @_op . (exp_name [
+  ((variable) @function)
+  (qualified_variable (variable) @function)
+ ])
+ (#any-of? @_op "." ">>>" "***" ">=>" "<=<" ))
         
-        
-(exp_apply . (exp_name (variable) @function.call))
-(exp_apply . (exp_name (qualified_variable (variable) @function.call)))
-
-; let/where bindings
-(_ (decls (function name: (variable) @variable)))
-(_ (decls 
-  (function 
-    name: (variable) @function
-    patterns: (patterns (pat_name) @parameter))))
-
-; higher-order function parameters
-(function
-  patterns: (patterns (pat_name (variable) @function))
-  rhs: (exp_apply (exp_name (variable) @_name) . (exp_name)+)
-  (#eq? @function @_name))
-(function
-  patterns: (patterns (pat_name (variable) @function))
-  rhs: (_ (operator) @_op (exp_name (variable))
- (#any-of? @_op "." ">>>")))
-(function
-  patterns: (patterns (pat_name (variable) @function))
-  rhs: (_ (exp_name (variable)) . (operator) @_op)
- (#any-of? @_op "$" "<$>" ">>=" "." ">>>"))
-
+(exp_apply (exp_name 
+  [
+    ((variable) @function.call)
+    (qualified_variable (variable) @function.call)
+  ]))
+(exp_apply [
+    (exp_name [
+      (variable)
+      (qualified_variable (variable))
+      (constructor)
+      (qualified_constructor (constructor))
+    ])
+    (exp_type_application)
+    (exp_parens)
+    (exp_record)
+  ]
+  . (exp_name [
+    ((variable) @variable)
+    (qualified_variable (variable) @variable)
+  ]))
 
 ;; ----------------------------------------------------------------------------
 ;; Types
@@ -263,6 +353,12 @@
 (quasiquote 
   (quoter) @_name (#eq? @_name "qq")
   (quasiquote_body) @string)
+;; namespaced quasi-quoter
+(quasiquote
+  (_
+    (module) @namespace
+    . (variable) @function.call
+  ))
 
 ; Highlighting of quasiquote_body for other languages is handled by injections.scm
 
@@ -294,7 +390,8 @@
    "bracket_"
    "bracketOnErrorSource"
    "finally"
-   "onException"))
+   "onException"
+   "expectationFailure"))
 
 ;; ----------------------------------------------------------------------------
 ;; Debugging
@@ -321,6 +418,9 @@
 ;; ----------------------------------------------------------------------------
 ;; Fields
 (field (variable) @field)
+(pat_field (variable) @field)
+(exp_projection field: (variable) @field)
+(import_item (type) . (import_con_names (variable) @field))
 
 
 ;; ----------------------------------------------------------------------------
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
index e934e4606..8c9082c1a 100644
--- a/tests/query/highlights/haskell/test.hs
+++ b/tests/query/highlights/haskell/test.hs
@@ -20,6 +20,11 @@ import qualified Data.Map as Map
                            -- ^ @namespace
 import qualified Chronos
                 -- ^ @namespace
+import qualified Chronos as C
+                -- ^ @constructor
+                         -- ^ @namespace
+import FooMod (BarTy (barField))
+                      -- ^ @field
 
 data ADT
 -- ^ @keyword
@@ -32,6 +37,10 @@ data ADT
   -- ^ @keyword
          -- ^ @type
                -- ^ @type
+mkA x = A x
+       -- ^ @variable
+mkAQualified x = SomeModule.A x
+                           -- ^ @variable
 
 class Ord a => PartialOrd a
     -- ^ @type
@@ -56,6 +65,10 @@ newtype Rec
  -- ^ @punctuation.bracket
     deriving Eq
            -- ^ @type
+recordWildCard Rec { field } = field
+                    -- ^ @field
+recordDotSyntax rec = rec.field
+                        -- ^ @field
 
 main :: IO ()
 -- ^ @function
@@ -76,6 +89,10 @@ someFunc0 x = someFunc1 x
     someFunc1 _ = 5
     -- ^ @function
                -- ^ @number
+scopedTypeParam (x :: Int) = someFunc x
+              -- ^ @parameter
+scopedTypeParam (Just x :: Int) = someFunc x
+                   -- ^ @parameter
 
 someInfix :: Integral a => a -> Double
             -- ^ @type
@@ -88,12 +105,36 @@ someInfix x = fromIntegral x `myAdd` floatVal
                              -- ^ @operator
                                     -- ^ @variable
   where
+    myAdd :: Num a => a -> a
+    -- ^ @function
     myAdd x y = x + y
              -- ^ @variable
                  -- ^ @variable
+    floatVal :: Double
+    -- ^ @variable
     floatVal = 5.5
     -- ^ @variable
             -- ^ @float
+    intVal :: Int
+    -- ^ @variable
+    intVal = getInt 5
+    -- ^ @variable
+    boolVal :: Bool
+    -- ^ @variable
+    boolVal = bool False True $ 1 + 2 == 3
+    -- ^ @variable
+    isInt :: Either Double Int -> Bool
+    -- ^ @function
+    isInt eith@Left{} = False
+        -- ^ @parameter
+    isInt eith@(Left x) = False
+    -- ^ @function
+                  -- ^ @parameter
+    isInt (Left x) = False
+             -- ^ @parameter
+    isInt (Right _) = True
+    -- ^ @function
+
 
 someIOaction :: IO ()
 -- ^ @function
@@ -104,6 +145,8 @@ someIOaction = do
             -- ^ @namespace
                    -- ^ @function.call
                           -- ^ @operator
+  _ <- someFunc0 =<< someIOAction
+        -- ^ @function.call
   let bar = SomeModule.doSomething $ "a" "b"
     -- ^ @variable
             -- ^ @namespace
@@ -114,6 +157,15 @@ someIOaction = do
         -- ^ @parameter
               -- ^ @variable
                   -- ^ @variable
+      gunc x y = func x $ y + 7
+                   -- ^ @variable
+                       -- ^ @variable
+  when foo $ putStrLn $ T.showt =<< bar
+ -- ^ @function.call
+     -- ^ @variable
+            -- ^ @function.call
+                        -- ^ @function.call
+
   pure $ func 1 2
   -- ^ @function.call
         -- ^ @function.call
@@ -132,6 +184,12 @@ getLambda x = \y -> x `SomeModule.someInfix` y
             -- ^ @parameter
                       -- ^ @namespace
                                   -- ^ @operator
+lambdaTyped = \(y :: Int) -> x
+             -- ^ @parameter
+lambdaPattern = \(Just x) -> x
+                    -- ^ @parameter
+lambdaPatternTyped = \(Just x :: Int) -> x
+                         -- ^ @parameter
 
 isVowel = (`elem` "AEIOU")
           -- ^ @operator
@@ -149,13 +207,71 @@ quasiQuotedString = [qq|Some string|]
 -- ^ @variable
                    -- ^ @function.call
                       -- ^ @string
-
-higherOrderFn f x = f x
-           -- ^ @function
-             -- ^ @variable
+quasiQuotedString2 = [SomeModule.qq|Some string|]
+                        -- ^ @namespace
+                              -- ^ @function.call
 
 composition f g = f . g
-         -- ^ @function
-           -- ^ @function
                -- ^ @function
                    -- ^ @function
+qualifiedComposition = SomeModule.f . SomeModule.g
+                               -- ^ @function
+                                              -- ^ @function
+takeMVarOrThrow = evaluate <=< takeMVar
+                  -- ^ @function
+                              -- ^ @function
+modifyMVarOrThrow v f = modifyMVar v $ f >=> evaluate
+                                -- ^ @variable
+                                    -- ^ @function
+                                           -- ^ @function
+assertNonEmpty xs = xs `shouldSatisfy` not . null
+                 -- ^ @variable
+                                     -- ^ @function
+                                            -- ^ @function
+
+param1 |*| param2 = Qu $ param1 * param2
+-- ^ @parameter
+         -- ^ @parameter
+(param1 :: Int) |*| (param2 :: Int) = Qu $ param1 * param2
+-- ^ @parameter
+                   -- ^ @parameter
+(Qu a) |/| (SomeModule.Qu b) = a / b
+ -- ^ @parameter
+                       -- ^ @parameter
+(Qu a :: Int) |/| (SomeModule.Qu b :: Int) = a / b
+ -- ^ @parameter
+                              -- ^ @parameter
+(Qu a, b, c :: Int) |/| x = undefined
+ -- ^ @parameter
+    -- ^ @parameter
+       -- ^ @parameter
+[Qu a, b, c :: Int] >< x = undefined
+ -- ^ @parameter
+    -- ^ @parameter
+       -- ^ @parameter
+listParam [a, b :: Int, Just c] = undefined
+        -- ^ @parameter
+           -- ^ @parameter
+                          -- ^ @parameter
+tupleParam (a :: Int, b, Just c) = undefined
+         -- ^ @parameter
+                   -- ^ @parameter
+                           -- ^ @parameter
+listLambda = \[a, a :: Int, Just c] -> undefined
+            -- ^ @parameter
+               -- ^ @parameter
+                              -- ^ @parameter
+tupleLambda = \(a, b :: Int, Just c) -> undefined
+             -- ^ @parameter
+                -- ^ @parameter
+nestedDestructure (Left (Just a)) = undefined
+                           -- ^ @parameter
+typeApplication x y = someFun @ty x y
+                               -- ^ @variable
+                                 -- ^ @variable
+encrypt key pass = encrypt (defaultOAEPParams SHA1) key pass
+                                                 -- ^ @variable
+                                                      -- ^ @variable
+recordUpdate x y rec = someFun rec {field = 5} x y
+                                            -- ^ @variable
+                                              -- ^ @variable

From db7adb21e6f17528b0f639f36641ce59d65eb68f Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 6 Oct 2023 12:22:53 +0900
Subject: [PATCH 0749/2704] java(highlights): add missing import class pattern
 (#5483)

---
 queries/java/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 9a953eee0..3b1a55371 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -105,8 +105,8 @@
 ((field_access
   object: (identifier) @type)
   (#lua-match? @type "^[A-Z]"))
-((scoped_identifier
-  scope: (identifier) @type)
+(scoped_identifier
+  (identifier) @type
   (#lua-match? @type "^[A-Z]"))
 
 ; Fields

From 4e758a89a5a4c81f9d0a9a421798426dd7d212d3 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 6 Oct 2023 16:08:40 +0900
Subject: [PATCH 0750/2704] fix(json5): update queries from upstream

---
 lockfile.json                | 2 +-
 queries/json5/highlights.scm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c96f6ef37..45f9822f3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -288,7 +288,7 @@
     "revision": "3fef30de8aee74600f25ec2e319b62a1a870d51e"
   },
   "json5": {
-    "revision": "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"
+    "revision": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"
   },
   "jsonc": {
     "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
diff --git a/queries/json5/highlights.scm b/queries/json5/highlights.scm
index 202d084b0..653a48ef5 100644
--- a/queries/json5/highlights.scm
+++ b/queries/json5/highlights.scm
@@ -1,9 +1,9 @@
 [
-    "true"
-    "false"
+  (true)
+  (false)
 ] @boolean
 
-"null" @constant
+(null) @constant
 
 (string) @string
 

From 10bfa4826f2235c600c073a82e0d78718aa7240e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 6 Oct 2023 08:09:08 +0000
Subject: [PATCH 0751/2704] Update parsers: cuda, elm, erlang, glimmer, glsl,
 hlsl, java, tsx, typescript, usd, wing

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 45f9822f3..72c9a3cfa 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -84,7 +84,7 @@
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "cuda": {
-    "revision": "275cfb95013b88382e11490aef1e7c9b17a95ef7"
+    "revision": "759cf0a2557c9138baeae342aac61044acbdd618"
   },
   "cue": {
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
@@ -129,7 +129,7 @@
     "revision": "a2861e88a730287a60c11ea9299c033c7d076e30"
   },
   "elm": {
-    "revision": "0694058bf0555adbf5f700ce4868d18e463cb824"
+    "revision": "debe14fad40a8100c679d95c66f599b48111742c"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -141,7 +141,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "4a0ec79b7eb7671efe935cd97967430c34598c7d"
+    "revision": "4ec4aadac76ad1a701187e38152c83dba9cbacf4"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -192,10 +192,10 @@
     "revision": "32c8f1e32aee036583ca09e7e6e4ea881852b42c"
   },
   "glimmer": {
-    "revision": "8c99566ab0e454f98a2c123d0571da5d83045e50"
+    "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
   },
   "glsl": {
-    "revision": "ec6100d2bdf22363ca8a711a212f2144ea49233f"
+    "revision": "008abfeb24b73c696e1a07f3f1d299f95d4efbb1"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -243,7 +243,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4"
+    "revision": "360f5fdb6e1d1a201c52d67184e2d115f67c4e26"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -273,7 +273,7 @@
     "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
   },
   "java": {
-    "revision": "83044af4950e9f1adb46a20f616d10934930ce7e"
+    "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
   },
   "javascript": {
     "revision": "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"
@@ -606,7 +606,7 @@
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "tsx": {
-    "revision": "c604297f8197b468026f2ea32119935887e01c67"
+    "revision": "d847898fec3fe596798c9fda55cb8c05a799001a"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -615,7 +615,7 @@
     "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
   },
   "typescript": {
-    "revision": "c604297f8197b468026f2ea32119935887e01c67"
+    "revision": "d847898fec3fe596798c9fda55cb8c05a799001a"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -624,7 +624,7 @@
     "revision": "694c8c0c79f8d1b80d497401acf4d1b77bfb004a"
   },
   "usd": {
-    "revision": "718a6b3e939904e0b4fe7cff6742e96af4781f4b"
+    "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
   },
   "uxntal": {
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
@@ -657,7 +657,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "066e14225c792ca0aacb494a525d080eafd694c0"
+    "revision": "0226d23de5a41f24f1c483682de87c7c436bd086"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 3a2cc3161e01455d619a8076f0aa7fcd3e930090 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Fri, 6 Oct 2023 20:43:35 -0500
Subject: [PATCH 0752/2704] feat(authzed): add parser and highlight queries.
 (#5426)

* feat(authzed): add parser and highlight queries

* Update queries/authzed/highlights.scm

use `any-of` for list of alternative words.

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>

* add injections queries file.

* Update queries/authzed/highlights.scm

* tweak whitespace

* fix errors with capture names.

* style(authzed): reformat highlights

* add self as maintainer

* Update lua/nvim-treesitter/parsers.lua

Co-authored-by: Christian Clason <c.clason@uni-graz.at>

* Add to lockfile and readme

* feat(authzed): Updates to queries and lockfile around newest Authzed parser changes.

* Update queries/authzed/highlights.scm

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>

* Update queries/authzed/highlights.scm

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>

* unnest here similarly to recommended elsewhere

* Update highlights.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

---------

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/authzed/highlights.scm  | 58 +++++++++++++++++++++++++++++++++
 queries/authzed/injections.scm  |  2 ++
 5 files changed, 72 insertions(+)
 create mode 100644 queries/authzed/highlights.scm
 create mode 100644 queries/authzed/injections.scm

diff --git a/README.md b/README.md
index 480e243b3..15b97fb34 100644
--- a/README.md
+++ b/README.md
@@ -178,6 +178,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)
+- [x] [authzed](https://github.com/mleonidas/tree-sitter-authzed) (maintained by @mattpolzin)
 - [ ] [awk](https://github.com/Beaglefoot/tree-sitter-awk)
 - [x] [bash](https://github.com/tree-sitter/tree-sitter-bash) (maintained by @TravonteD)
 - [x] [bass](https://github.com/amaanq/tree-sitter-bass) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 72c9a3cfa..b05825591 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -14,6 +14,9 @@
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
   },
+  "authzed": {
+    "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
+  },
   "awk": {
     "revision": "374da90decaa60fea7a22490a77440ece6d4161d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 26a2bf8f5..d8dfb7124 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -117,6 +117,14 @@ list.astro = {
   maintainers = { "@virchau13" },
 }
 
+list.authzed = {
+  install_info = {
+    url = "https://github.com/mleonidas/tree-sitter-authzed",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@mattpolzin" },
+}
+
 list.awk = {
   install_info = {
     url = "https://github.com/Beaglefoot/tree-sitter-awk",
diff --git a/queries/authzed/highlights.scm b/queries/authzed/highlights.scm
new file mode 100644
index 000000000..7a4b85d1f
--- /dev/null
+++ b/queries/authzed/highlights.scm
@@ -0,0 +1,58 @@
+(identifier) @function
+
+(block
+  (relation
+    (relation_literal) @function.builtin
+    (identifier) @constant))
+
+(block
+  (permission
+    (permission_literal) @variable.builtin
+    (identifier) @type))
+
+; relations
+(rel_expression (identifier) @property)
+
+(relation
+  (rel_expression
+    (hash_literal)
+    .
+    (identifier) @constant))
+
+; permissions
+(perm_expression (identifier) @property)
+
+(call_expression
+  function: (selector_expression
+    operand: (identifier) @constant
+    field: (field_identifier) @function.method))
+
+(perm_expression
+  (stabby) @operator
+  . 
+  (identifier) @function)
+
+; misc
+[
+  (plus_literal)
+  (minus_literal)
+  (amp_literal)
+  (pipe_literal)
+] @operator
+
+[
+  (true)
+  (false)
+] @boolean
+
+(nil) @constant.builtin
+
+[
+  (caveat_literal)
+  (definition_literal)
+] @keyword
+
+[
+  (hash_literal)
+  (comment)
+] @comment
diff --git a/queries/authzed/injections.scm b/queries/authzed/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/authzed/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 957f3f8c15a88ef0f0c77ecd13edf2e2578f176e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 7 Oct 2023 06:35:06 +0000
Subject: [PATCH 0753/2704] Update parsers: erlang, kotlin, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b05825591..2d5879a61 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -144,7 +144,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "4ec4aadac76ad1a701187e38152c83dba9cbacf4"
+    "revision": "bb06a83db4f0c176875d9d49756b760d15211134"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -309,7 +309,7 @@
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
-    "revision": "7587b4a7f1c3a0fe4ab41301596f9b4517395a4e"
+    "revision": "5baa0fe2288830f88bd38e328b08d829f3914164"
   },
   "lalrpop": {
     "revision": "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"
@@ -660,7 +660,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0226d23de5a41f24f1c483682de87c7c436bd086"
+    "revision": "2ae397275b7848b16161a7fc0bc253c1b4a168ad"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From a102053352bd958d84a3e1be3de0203d2af92984 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 8 Oct 2023 06:34:36 +0000
Subject: [PATCH 0754/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 2d5879a61..b79691a99 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -660,7 +660,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2ae397275b7848b16161a7fc0bc253c1b4a168ad"
+    "revision": "31c8698f56f4479e5199c2de76097ac40f04fd6c"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 51372f1d4e728539c6243e96c6b657f633e81e29 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 9 Oct 2023 06:37:02 +0000
Subject: [PATCH 0755/2704] Update parsers: swift, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b79691a99..137f0e436 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -567,7 +567,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "10eb01d29827f24b1271672e89790661d94da9e1"
+    "revision": "597d544b3c93b2f67d2e143f27cc51ba874ec5c3"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -660,7 +660,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "31c8698f56f4479e5199c2de76097ac40f04fd6c"
+    "revision": "cb2f0316becd6d5ac2952d2e04188b3d21d6328a"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From dfd4fb330f75595813e2a2f83000580a36dd10ff Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 9 Oct 2023 11:28:28 +0300
Subject: [PATCH 0756/2704] feat: add nasm parser (#5475)

* feat: add nasm parser

* chore: update highlights

---------

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/nasm/highlights.scm     | 145 ++++++++++++++++++++++++++++++++
 queries/nasm/injections.scm     |   2 +
 5 files changed, 159 insertions(+)
 create mode 100644 queries/nasm/highlights.scm
 create mode 100644 queries/nasm/injections.scm

diff --git a/README.md b/README.md
index 15b97fb34..8e32deacf 100644
--- a/README.md
+++ b/README.md
@@ -295,6 +295,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [mermaid](https://github.com/monaqa/tree-sitter-mermaid) (experimental)
 - [x] [meson](https://github.com/Decodetalkers/tree-sitter-meson) (maintained by @Decodetalkers)
 - [x] [mlir](https://github.com/artagnon/tree-sitter-mlir) (experimental, maintained by @artagnon)
+- [x] [nasm](https://github.com/naclsn/tree-sitter-nasm) (maintained by @ObserverOfTime)
 - [ ] [nickel](https://github.com/nickel-lang/tree-sitter-nickel)
 - [x] [ninja](https://github.com/alemuller/tree-sitter-ninja) (maintained by @alemuller)
 - [x] [nix](https://github.com/cstrahan/tree-sitter-nix) (maintained by @leo60228)
diff --git a/lockfile.json b/lockfile.json
index 137f0e436..809211bf2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -365,6 +365,9 @@
   "mlir": {
     "revision": "e2053f7c8856d91bc36c87604f697784845cee69"
   },
+  "nasm": {
+    "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
+  },
   "nickel": {
     "revision": "b759233581fd8bae239e905c67a9ba453205da78"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d8dfb7124..13f885eac 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1105,6 +1105,14 @@ list.mlir = {
   maintainers = { "@artagnon" },
 }
 
+list.nasm = {
+  install_info = {
+    url = "https://github.com/naclsn/tree-sitter-nasm",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.nickel = {
   install_info = {
     url = "https://github.com/nickel-lang/tree-sitter-nickel",
diff --git a/queries/nasm/highlights.scm b/queries/nasm/highlights.scm
new file mode 100644
index 000000000..1556f9ca5
--- /dev/null
+++ b/queries/nasm/highlights.scm
@@ -0,0 +1,145 @@
+;; adapted from https://github.com/naclsn/tree-sitter-nasm/blob/main/queries/highlights.scm
+
+(word) @variable
+((word) @constant
+  (#lua-match? @constant "^[A-Z_][?A-Z_0-9]+$"))
+((word) @constant.builtin
+  (#lua-match? @constant.builtin "^__%?[A-Z_a-z0-9]+%?__$"))
+
+[
+  (line_here_token)
+  (section_here_token)
+] @variable.builtin
+
+(label (word) @label)
+(assembl_directive_symbols (word) @label)
+(assembl_directive_sections (word) @label)
+
+(unary_expression
+  operator: _ @operator)
+(binary_expression
+  operator: _ @operator)
+
+"?" @constant.builtin
+
+(conditional_expression
+  [ "?" ":" ] @conditional.ternary)
+
+[
+  ":"
+  ","
+] @punctuation.delimiter
+
+[
+  "(" ")"
+  "[" "]"
+  "{" "}"
+] @punctuation.bracket
+
+(instruction_prefix) @keyword
+(actual_instruction
+  instruction: (word) @function.builtin)
+
+(call_syntax_expression
+  base: (word) @function.call)
+
+(size_hint) @type
+(struc_declaration
+  name: (word) @type)
+(struc_instance
+  name: (word) @type)
+
+(effective_address
+  hint: _ @type)
+(effective_address
+  segment: _ @constant.builtin)
+
+(register) @variable.builtin
+
+(string_literal) @string
+
+(float_literal) @float
+
+[
+  (packed_bcd_literal)
+  (number_literal)
+] @number
+
+[
+  (preproc_alias)
+  (preproc_multiline_macro)
+  (preproc_multiline_unmacro)
+  (preproc_rotate)
+  (preproc_pathsearch)
+  (preproc_depend)
+  (preproc_use)
+  (preproc_push)
+  (preproc_pop)
+  (preproc_repl)
+  (preproc_arg)
+  (preproc_stacksize)
+  (preproc_local)
+  (preproc_reporting)
+  (preproc_pragma)
+  (preproc_line)
+  (preproc_clear)
+] @preproc
+
+(preproc_include) @include
+
+(preproc_rep_loop) @repeat
+
+(preproc_if) @conditional
+
+[
+  (preproc_def)
+  (preproc_undef)
+] @define
+
+(preproc_function_def) @keyword.function
+
+[
+  (preproc_expression)
+  (preproc_arg)
+] @constant.macro
+
+(preproc_multiline_macro
+  name: (word) @function)
+
+[
+  (pseudo_instruction_dx)
+  (pseudo_instruction_resx)
+  (pseudo_instruction_incbin_command)
+  (pseudo_instruction_equ_command)
+  (pseudo_instruction_times_prefix)
+  (pseudo_instruction_alignx_macro)
+] @function
+
+[
+  (assembl_directive_target)
+  (assembl_directive_defaults)
+  (assembl_directive_sections)
+  (assembl_directive_absolute)
+  (assembl_directive_symbols)
+  (assembl_directive_common)
+  (assembl_directive_symbolfixes)
+  (assembl_directive_cpu)
+  (assembl_directive_floathandling)
+  (assembl_directive_org)
+  (assembl_directive_sectalign)
+  (assembl_directive_primitive_target)
+  (assembl_directive_primitive_defaults)
+  (assembl_directive_primitive_sections)
+  (assembl_directive_primitive_absolute)
+  (assembl_directive_primitive_symbols)
+  (assembl_directive_primitive_common)
+  (assembl_directive_primitive_symbolfixes)
+  (assembl_directive_primitive_cpu)
+  (assembl_directive_primitive_floathandling)
+  (assembl_directive_primitive_org)
+  (assembl_directive_primitive_sectalign)
+  (assembl_directive_primitive_warning)
+  (assembl_directive_primitive_map)
+] @keyword
+
+(comment) @comment @spell
diff --git a/queries/nasm/injections.scm b/queries/nasm/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/nasm/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 95364251e5621e3038fef7afb55f6a31f745e266 Mon Sep 17 00:00:00 2001
From: Noah <noah.bogart@hey.com>
Date: Mon, 9 Oct 2023 08:38:26 -0500
Subject: [PATCH 0757/2704] chore(clojure): update maintainer

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 13f885eac..e583656ee 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -237,7 +237,7 @@ list.clojure = {
     url = "https://github.com/sogaiu/tree-sitter-clojure",
     files = { "src/parser.c" },
   },
-  maintainers = { "@sogaiu" },
+  maintainers = { "@NoahTheDuke" },
 }
 
 list.cmake = {

From 1d1c32b64b17b866152f29a3676a719cb6078028 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 9 Oct 2023 13:38:39 +0000
Subject: [PATCH 0758/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e32deacf..5064d01c9 100644
--- a/README.md
+++ b/README.md
@@ -192,7 +192,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
 - [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
-- [x] [clojure](https://github.com/sogaiu/tree-sitter-clojure) (maintained by @sogaiu)
+- [x] [clojure](https://github.com/sogaiu/tree-sitter-clojure) (maintained by @NoahTheDuke)
 - [x] [cmake](https://github.com/uyha/tree-sitter-cmake) (maintained by @uyha)
 - [x] [comment](https://github.com/stsewd/tree-sitter-comment) (maintained by @stsewd)
 - [x] [commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) (maintained by @theHamsta)

From 34e6ace726fb7dfeb9e8e2d260111b7d2b616778 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 10 Oct 2023 06:37:28 +0000
Subject: [PATCH 0759/2704] Update parsers: beancount, vimdoc, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 809211bf2..bfa43fa1c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
   },
   "beancount": {
-    "revision": "358e5ecbb87109eef7fd596ea518a4ff74cb9b31"
+    "revision": "0631b99d9096e10f4e289efe618e518debe918b4"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -651,7 +651,7 @@
     "revision": "32c76f150347c1cd044e90b8e2bc73c00677fa55"
   },
   "vimdoc": {
-    "revision": "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"
+    "revision": "60045f7d717eba85fa8abd996e0bb50eed5a3d8e"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"
@@ -663,7 +663,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "cb2f0316becd6d5ac2952d2e04188b3d21d6328a"
+    "revision": "ab0803ca0f16e24c92539a1651e0c49c3da0ec04"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 0eb1a0ad1c82e080e77e7b9d7a5e42632cefb543 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Tue, 10 Oct 2023 10:12:36 +0200
Subject: [PATCH 0760/2704] fix(haskell): prevent segfault due to anchorless
 queries (#5502)

---
 queries/haskell/highlights.scm         | 58 ++++++++++++--------------
 tests/query/highlights/haskell/test.hs |  9 ++--
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 1340cfd46..ecd267cc4 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -162,26 +162,11 @@
 ;; Functions and variables
 
 (signature name: (variable) @function)
-((signature name: (variable) @variable)
- (function 
-  name: (variable) @_name
-  rhs: [
-   (exp_literal)
-   (exp_apply 
-     (exp_name 
-       [(constructor)
-        (variable)
-       ]))
-   (quasiquote)
-   ((exp_name) . (operator))
-  ])
- (#eq? @variable @_name))
 
 ((signature name: (variable) @variable)
- (function 
-  name: (variable) @_name
-  rhs: (exp_infix 
-    [
+ . (function 
+    name: (variable) @_name
+    rhs: [
      (exp_literal)
      (exp_apply 
        (exp_name 
@@ -190,26 +175,36 @@
          ]))
      (quasiquote)
      ((exp_name) . (operator))
-    ]))
+    ])
+ (#eq? @variable @_name))
+
+((signature name: (variable) @variable)
+ . (function 
+    name: (variable) @_name
+    rhs: (exp_infix 
+      [
+       (exp_literal)
+       (exp_apply 
+         (exp_name 
+           [(constructor)
+            (variable)
+           ]))
+       (quasiquote)
+       ((exp_name) . (operator))
+      ]))
  (#eq? @variable @_name))
 
 ((signature name: (variable) @function)
- (function 
-  name: (variable) @_name
-  patterns: (patterns))
+ . (function 
+    name: (variable) @_name
+    patterns: (patterns))
  (#eq? @function @_name))
 
-(signature 
-  name: (variable) @function
-  type: (fun))
-((signature 
-   name: (variable) @_name
-   type: (fun))
- (function
-   name: (variable) @function)
- (#eq? @function @_name))
+;; For some reason, `(signature name: (variable) type: (fun))` doesn't work here
+(signature (variable) @function . (fun))
 
 (function name: (variable) @function)
+
 (function 
   name: (variable) @variable
   rhs: [
@@ -222,6 +217,7 @@
    (quasiquote)
    ((exp_name) . (operator))
   ])
+
 (function 
   name: (variable) @variable
   rhs: (exp_infix [
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
index 8c9082c1a..84d41769c 100644
--- a/tests/query/highlights/haskell/test.hs
+++ b/tests/query/highlights/haskell/test.hs
@@ -111,16 +111,13 @@ someInfix x = fromIntegral x `myAdd` floatVal
              -- ^ @variable
                  -- ^ @variable
     floatVal :: Double
-    -- ^ @variable
     floatVal = 5.5
     -- ^ @variable
             -- ^ @float
     intVal :: Int
-    -- ^ @variable
     intVal = getInt 5
     -- ^ @variable
     boolVal :: Bool
-    -- ^ @variable
     boolVal = bool False True $ 1 + 2 == 3
     -- ^ @variable
     isInt :: Either Double Int -> Bool
@@ -171,12 +168,14 @@ someIOaction = do
         -- ^ @function.call
 
 intVal :: Int
--- ^ @variable
 intVal = 5
 -- ^ @variable
 
+intFun :: Int -> Int
+intFun = 5
+-- ^ @function
+
 mbInt :: Maybe Int
--- ^ @variable
 mbInt = Just 5
 -- ^ @variable
 

From e5198778dbefa14823099dd6d8fba3819a5e7b8a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 11 Oct 2023 06:37:21 +0000
Subject: [PATCH 0761/2704] Update parsers: bash, dockerfile, groovy, python,
 swift, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bfa43fa1c..f9032dba8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -21,7 +21,7 @@
     "revision": "374da90decaa60fea7a22490a77440ece6d4161d"
   },
   "bash": {
-    "revision": "1479a4030f1a399c253aee02097576d4af46f23a"
+    "revision": "7331995b19b8f8aba2d5e26deb51d2195c18bc94"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -108,7 +108,7 @@
     "revision": "c165725c28e69b36c5799ff0e458713a844f1aaf"
   },
   "dockerfile": {
-    "revision": "1800d5a06789797065ba5e7d80712b6bbf5483d7"
+    "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
   },
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
@@ -222,7 +222,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "76e02db5866dd2b096512103ed4d8f630cc32980"
+    "revision": "ae8aa51ec3275afb567a4a67df1a26d89feb135f"
   },
   "hack": {
     "revision": "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"
@@ -456,7 +456,7 @@
     "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
   },
   "python": {
-    "revision": "a901729099257aac932d79c60adb5e8a53fa7e6c"
+    "revision": "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -570,7 +570,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "597d544b3c93b2f67d2e143f27cc51ba874ec5c3"
+    "revision": "7e4ccc97a25315022a70b730085deccd5680a39b"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -663,7 +663,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "ab0803ca0f16e24c92539a1651e0c49c3da0ec04"
+    "revision": "7cf9c675c1177ba412fa404c36129749f56b1db4"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 49f7194e4c4d3c9ed891b0968798c062e8ac5a3d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 12 Oct 2023 06:37:01 +0000
Subject: [PATCH 0762/2704] Update parsers: wing

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index f9032dba8..a0d526253 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -663,7 +663,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "7cf9c675c1177ba412fa404c36129749f56b1db4"
+    "revision": "d5fc08f3b889eb3938600737ec17927008f7bfb0"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 783e5fc3079680b307e8ac518935317907e71a59 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Thu, 12 Oct 2023 21:04:55 +0200
Subject: [PATCH 0763/2704] feat(nix): some highlight improvements

- functions
- builtin functions with prefix
- add test file
---
 queries/nix/highlights.scm          | 15 ++++++++++++++-
 tests/query/highlights/nix/test.nix | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/query/highlights/nix/test.nix

diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index b83a81027..97e5303ba 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -89,7 +89,14 @@
   name: (identifier) @boolean
   (#any-of? @boolean "true" "false"))
 
-; builtin functions
+; builtin functions (with builtins prefix)
+(select_expression
+  expression: (variable_expression name: (identifier) @_id)
+  attrpath: (attrpath attr: (identifier) @function.builtin)
+  (#eq? @_id "builtins")
+)
+
+; builtin functions (without builtins prefix)
 (variable_expression name: (identifier) @function.builtin (#any-of? @function.builtin
   ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
   "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap" "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength" "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose" "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext" "unsafeGetAttrPos" "zipAttrsWith"
@@ -114,6 +121,11 @@
 (attrset_expression (binding_set (binding . (attrpath (identifier) @field))))
 (rec_attrset_expression (binding_set (binding . (attrpath (identifier) @field))))
 
+; function definition
+(binding 
+  attrpath: (attrpath attr: (identifier) @function)
+  expression: (function_expression))
+
 ; unary operators
 (unary_expression operator: _ @operator)
 
@@ -131,3 +143,4 @@
   (unary_expression "-" (float_expression))
   (float_expression)
 ] @float
+
diff --git a/tests/query/highlights/nix/test.nix b/tests/query/highlights/nix/test.nix
new file mode 100644
index 000000000..d5fb13de8
--- /dev/null
+++ b/tests/query/highlights/nix/test.nix
@@ -0,0 +1,16 @@
+{
+  func1 = param: builtins.readFile param;
+  # ^ @function
+        # ^ @parameter
+                # ^ @constant.builtin
+                         # ^ @function.builtin
+  func2 = { p1, p2 }: p2;
+  # ^ @function
+          # ^ @parameter
+  readFile' = readFile;
+              # ^ @function.builtin
+  x = func1 ./path/to/file.nix;
+# ^ @field
+      # ^ @function.call
+              # ^ @string.special
+}

From 168972a0d53170767e49d44f678ca721a2472560 Mon Sep 17 00:00:00 2001
From: Kevin Durbin <kevindurb@fastmail.com>
Date: Fri, 13 Oct 2023 09:36:36 -0600
Subject: [PATCH 0764/2704] fix(injections): fix injection for hurl for new
 injection syntax

---
 queries/hurl/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/hurl/injections.scm b/queries/hurl/injections.scm
index 363e90046..1a099e186 100644
--- a/queries/hurl/injections.scm
+++ b/queries/hurl/injections.scm
@@ -8,4 +8,4 @@
 (multiline_string
   (multiline_string_type) @_lang
   (multiline_string_content) @injection.content
-  (#inject-language! @_lang))
+  (#set-lang-from-info-string! @_lang))

From b59a1fa07515d849caeb651b621617b0e1ffd253 Mon Sep 17 00:00:00 2001
From: Ibrahim Delice <59118341+Delice0@users.noreply.github.com>
Date: Fri, 13 Oct 2023 23:08:05 +0200
Subject: [PATCH 0765/2704] fix(java): move @ to `@attribute`

---
 queries/java/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 3b1a55371..a7e3af292 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -35,14 +35,15 @@
 ; Annotations
 
 (annotation
+  "@" @attribute
   name: (identifier) @attribute)
 (marker_annotation
+  "@" @attribute
   name: (identifier) @attribute)
 
 ; Operators
 
 [
-  "@"
   "+"
   ":"
   "++"

From 0d5c611e3fd36353b11b412661ff4f07bcc8e5c6 Mon Sep 17 00:00:00 2001
From: Ibrahim Delice <59118341+Delice0@users.noreply.github.com>
Date: Sat, 14 Oct 2023 00:12:18 +0200
Subject: [PATCH 0766/2704] feat(java): highlight `var` as `@type.builtin`

---
 queries/java/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index a7e3af292..ae498a159 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -96,6 +96,8 @@
 (constructor_declaration
   name: (identifier) @type)
 (type_identifier) @type
+((type_identifier) @type.builtin
+  (#eq? @type.builtin "var"))
 ((method_invocation
   object: (identifier) @type)
  (#lua-match? @type "^[A-Z]"))

From eefea35865f1fccc090af7700453d8a979c92035 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 14 Oct 2023 06:35:52 +0000
Subject: [PATCH 0767/2704] Update parsers: liquidsoap, t32, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a0d526253..71ed8a057 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -321,7 +321,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "liquidsoap": {
-    "revision": "a2ea4f516d3d3b3837e3e982cef0114dd7084b05"
+    "revision": "bbef4df4dc5b324455ad1ea4770bbed0df5130ea"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -579,7 +579,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "c544082904fd1d27da5493857bd3fc278bae2a1a"
+    "revision": "942e91a2e262420ca4b35352010c2f134fa7e809"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -663,7 +663,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d5fc08f3b889eb3938600737ec17927008f7bfb0"
+    "revision": "3a136d4277eceee2d2532b8367fef60cb71da0c2"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From ad02fbcdfc391017cad462e04e4740d2887cfa2e Mon Sep 17 00:00:00 2001
From: nsfisis <54318333+nsfisis@users.noreply.github.com>
Date: Sat, 14 Oct 2023 21:04:06 +0900
Subject: [PATCH 0768/2704] fix(php): highlight `never` as `@type.builtin`
 (#5522)

---
 queries/php/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index 6f061bb34..e284d16b0 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -16,6 +16,7 @@
 [
  (primitive_type)
  (cast_type)
+ (bottom_type)
  ] @type.builtin
 (named_type
   [(name) @type

From f213fae3ddbced99a15e85ae387f2da897c4d1d7 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 15 Oct 2023 06:35:32 +0000
Subject: [PATCH 0769/2704] Update parsers: beancount, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 71ed8a057..25f1553db 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
   },
   "beancount": {
-    "revision": "0631b99d9096e10f4e289efe618e518debe918b4"
+    "revision": "484f50849bcce887c86451f532bf778689ca8523"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -663,7 +663,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "3a136d4277eceee2d2532b8367fef60cb71da0c2"
+    "revision": "d61083e478b3d41b2fe5f481d4b57ca97b4c444f"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From f8fcb0da0618be551560a57fa1457dc6f889e568 Mon Sep 17 00:00:00 2001
From: Munif Tanjim <hello@muniftanjim.dev>
Date: Sun, 15 Oct 2023 13:04:45 +0600
Subject: [PATCH 0770/2704] fix(typescript): do not highlight undefined as
 variable

---
 queries/typescript/highlights.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index b58ba0e50..0a81699cd 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -98,10 +98,6 @@
 
 (conditional_type ["?" ":"] @conditional.ternary)
 
-; Variables
-
-(undefined) @variable.builtin
-
 ;;; Parameters
 (required_parameter (identifier) @parameter)
 (optional_parameter (identifier) @parameter)

From d33dbdab0138d78b285e9dddc8287239776488f5 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 8 Oct 2023 21:34:55 +0200
Subject: [PATCH 0771/2704] feat(haskell): highlights improvements

- Consider functions with only one value on the rhs as variables
- Applied composition: `(f . g) <param>` -> `@function.call`
- View patterns
- `@field` in record update expression
- type_tuple and type_list as variables
- quantifier for `exp_apply (<rhs>)+ (variable)`
- type_tuple and type_list as variables
- Treat signatures with only one value on the rhs as variables
  (except for `IO a`) -> Fixes #5505.
- Remove redundant anchors from signature function queries.
- Move signature function queries to give them higher priority
- Scoped function types
- Add signature query to function with parameters query
---
 queries/haskell/highlights.scm         | 148 ++++++++++++++-----------
 tests/query/highlights/haskell/test.hs |  61 +++++++++-
 2 files changed, 142 insertions(+), 67 deletions(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index ecd267cc4..bf9692136 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -163,46 +163,6 @@
 
 (signature name: (variable) @function)
 
-((signature name: (variable) @variable)
- . (function 
-    name: (variable) @_name
-    rhs: [
-     (exp_literal)
-     (exp_apply 
-       (exp_name 
-         [(constructor)
-          (variable)
-         ]))
-     (quasiquote)
-     ((exp_name) . (operator))
-    ])
- (#eq? @variable @_name))
-
-((signature name: (variable) @variable)
- . (function 
-    name: (variable) @_name
-    rhs: (exp_infix 
-      [
-       (exp_literal)
-       (exp_apply 
-         (exp_name 
-           [(constructor)
-            (variable)
-           ]))
-       (quasiquote)
-       ((exp_name) . (operator))
-      ]))
- (#eq? @variable @_name))
-
-((signature name: (variable) @function)
- . (function 
-    name: (variable) @_name
-    patterns: (patterns))
- (#eq? @function @_name))
-
-;; For some reason, `(signature name: (variable) type: (fun))` doesn't work here
-(signature (variable) @function . (fun))
-
 (function name: (variable) @function)
 
 (function 
@@ -231,18 +191,40 @@
    ((exp_name) . (operator))
   ]))
 
+;; Consider signatures (and accompanying functions)
+;; with only one value on the rhs as variables
+(signature . (variable) @variable . (_) . )
+((signature . (variable) @_name . (_) . )
+ . (function name: (variable) @variable)
+ (#eq? @_name @variable))
+;; but consider a type that involves 'IO' a function
+(signature name: (variable) @function 
+  . (type_apply (type_name) @_type)
+    (#eq? @_type "IO"))
+((signature name: (variable) @_name 
+  . (type_apply (type_name) @_type)
+    (#eq? @_type "IO"))
+ . (function name: (variable) @function)
+   (#eq? @_name @function))
+
+;; functions with parameters
+;; + accompanying signatures
 (function
   name: (variable) @function
   patterns: (patterns))
+((signature) @function
+ . (function
+    name: (variable) @function
+    patterns: (patterns)))
 (function
   name: (variable) @function
   rhs: (exp_lambda))
-((signature (variable) @function (fun)) . (function (variable)))
-((signature (variable) @_type (fun)) . (function (variable) @function) (#eq? @function @_type))
-((signature (variable) @function (context (fun))) . (function (variable)))
-((signature (variable) @_type (context (fun))) . (function (variable) @function) (#eq? @function @_type))
-((signature (variable) @function (forall (context (fun)))) . (function (variable)))
-((signature (variable) @_type (forall (context (fun)))) . (function (variable) @function) (#eq? @function @_type))
+
+; view patterns
+(pat_view (exp_name [
+  ((variable) @function.call)
+  (qualified_variable (variable) @function.call)
+]))
 
 ; consider infix functions as operators
 (exp_infix [
@@ -253,11 +235,11 @@
 (exp_section_right [
   ((variable) @operator)
   (qualified_variable (variable) @operator)
-  ]) 
+]) 
 (exp_section_left [
   ((variable) @operator)
   (qualified_variable (variable) @operator)
-  ])
+])
 
 ; function calls with an infix operator
 ; e.g. func <$> a <*> b
@@ -272,9 +254,15 @@
   . (operator))
 ; infix operators applied to variables
 ((exp_name (variable) @variable) . (operator))
-((operator) . (exp_name (variable) @variable))
+((operator) . (exp_name [
+  ((variable) @variable)
+  (qualified_variable (variable) @variable)
+]))
 ; function calls with infix operators
-((exp_name (variable) @function.call) . (operator) @_op
+((exp_name [
+    ((variable) @function.call)
+    (qualified_variable (variable) @function.call)
+  ]) . (operator) @_op
  (#any-of? @_op "$" "<$>" ">>=" "=<<"))
 ; right hand side of infix operator
 ((exp_infix 
@@ -284,7 +272,7 @@
       (qualified_variable (variable) @function.call)
     ])) . (operator) @_op
  (#any-of? @_op "$" "<$>" "=<<"))
-; function composition, arrows, monadic composition (rhs)
+; function composition, arrows, monadic composition (lhs)
 ((exp_name [
   ((variable) @function)
   (qualified_variable (variable) @function)
@@ -310,22 +298,57 @@
     ((variable) @function.call)
     (qualified_variable (variable) @function.call)
   ]))
-(exp_apply [
-    (exp_name [
-      (variable)
-      (qualified_variable (variable))
-      (constructor)
-      (qualified_constructor (constructor))
-    ])
-    (exp_type_application)
-    (exp_parens)
-    (exp_record)
-  ]
+
+; function compositions, in parentheses, applied
+; lhs
+(exp_apply 
+  . (exp_parens (exp_infix
+    (exp_name [((variable) @function.call) (qualified_variable (variable) @function.call)])
+    . (operator))))
+; rhs
+(exp_apply 
+  . (exp_parens (exp_infix
+    (operator) 
+    . (exp_name [((variable) @function.call) (qualified_variable (variable) @function.call)])))
+      )
+
+;; variables being passed to a function call
+(exp_apply (_)+
   . (exp_name [
     ((variable) @variable)
     (qualified_variable (variable) @variable)
   ]))
 
+;; Consider functions with only one value on the rhs
+;; as variables, e.g. x = Rec {} or x = foo
+(function
+  . (variable) @variable
+  . [
+     (exp_record)
+     (exp_name (variable))
+     (exp_list)
+     (exp_tuple)
+     (exp_cond)
+    ] . )
+
+;; main is always a function
+;; (this prevents `main = undefined` from being highlighted as a variable)
+(function name: (variable) @function (#eq? @function "main"))
+
+;; scoped function types (func :: a -> b)
+(pat_typed 
+  pattern: (pat_name (variable) @function)
+  type: (fun))
+
+;; signatures that have a function type
+;; + functions that follow them
+((signature (variable) @function (fun)))
+((signature (variable) @_type (fun)) . (function (variable) @function) (#eq? @function @_type))
+((signature (variable) @function (context (fun))))
+((signature (variable) @_type (context (fun))) . (function (variable) @function) (#eq? @function @_type))
+((signature (variable) @function (forall (context (fun)))) . (function (variable)))
+((signature (variable) @_type (forall (context (fun)))) . (function (variable) @function) (#eq? @function @_type))
+
 ;; ----------------------------------------------------------------------------
 ;; Types
 
@@ -417,6 +440,7 @@
 (pat_field (variable) @field)
 (exp_projection field: (variable) @field)
 (import_item (type) . (import_con_names (variable) @field))
+(exp_field field: [((variable) @field) (qualified_variable (variable) @field)])
 
 
 ;; ----------------------------------------------------------------------------
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
index 84d41769c..cd5db435e 100644
--- a/tests/query/highlights/haskell/test.hs
+++ b/tests/query/highlights/haskell/test.hs
@@ -26,6 +26,9 @@ import qualified Chronos as C
 import FooMod (BarTy (barField))
                       -- ^ @field
 
+x = mempty { field = 5 }
+           -- ^ @field
+
 data ADT
 -- ^ @keyword
   = A Int
@@ -70,6 +73,7 @@ recordWildCard Rec { field } = field
 recordDotSyntax rec = rec.field
                         -- ^ @field
 
+
 main :: IO ()
 -- ^ @function
   -- ^ @operator
@@ -111,15 +115,26 @@ someInfix x = fromIntegral x `myAdd` floatVal
              -- ^ @variable
                  -- ^ @variable
     floatVal :: Double
+    -- ^ @variable
     floatVal = 5.5
     -- ^ @variable
             -- ^ @float
     intVal :: Int
+    -- ^ @variable
     intVal = getInt 5
     -- ^ @variable
     boolVal :: Bool
+    -- ^ @variable
     boolVal = bool False True $ 1 + 2 == 3
     -- ^ @variable
+    refVal = boolVal
+    -- ^ @variable
+    namespacedRecord = NS.Rec { field = bar }
+    -- ^ @variable
+    record = Rec { field = bar }
+    -- ^ @variable
+    constructorRef = A
+    -- ^ @function
     isInt :: Either Double Int -> Bool
     -- ^ @function
     isInt eith@Left{} = False
@@ -132,7 +147,6 @@ someInfix x = fromIntegral x `myAdd` floatVal
     isInt (Right _) = True
     -- ^ @function
 
-
 someIOaction :: IO ()
 -- ^ @function
 someIOaction = do
@@ -175,10 +189,30 @@ intFun :: Int -> Int
 intFun = 5
 -- ^ @function
 
+undefinedFun :: Int -> Int
+undefinedFun = undefined
+-- ^ @function
+
 mbInt :: Maybe Int
+-- ^ @variable
 mbInt = Just 5
 -- ^ @variable
 
+tupleVal :: (a, b)
+-- ^@variable
+tupleVal = (1, "x")
+-- ^@variable
+
+listVal :: [a]
+-- ^@variable
+listVal = [1, 2]
+-- ^@variable
+-- ^@variable
+condVal = if otherwise
+-- ^@variable
+            then False
+            else True
+
 getLambda x = \y -> x `SomeModule.someInfix` y
             -- ^ @parameter
                       -- ^ @namespace
@@ -227,7 +261,12 @@ assertNonEmpty xs = xs `shouldSatisfy` not . null
                  -- ^ @variable
                                      -- ^ @function
                                             -- ^ @function
-
+appliedComposition f g var = (f . g) var
+                           -- ^ @function.call
+                               -- ^ @function.call
+appliedComposition f g var = (NS.f . NS.g) var
+                              -- ^ @function.call
+                                     -- ^ @function.call
 param1 |*| param2 = Qu $ param1 * param2
 -- ^ @parameter
          -- ^ @parameter
@@ -271,6 +310,18 @@ typeApplication x y = someFun @ty x y
 encrypt key pass = encrypt (defaultOAEPParams SHA1) key pass
                                                  -- ^ @variable
                                                       -- ^ @variable
-recordUpdate x y rec = someFun rec {field = 5} x y
-                                            -- ^ @variable
-                                              -- ^ @variable
+recordUpdate x y rec = someFun rec {field = 5} (x, x) y
+                                             -- ^ @variable
+                                                   -- ^ @variable
+viewPattern (func -> var) = 5
+           -- ^ @function.call
+                   -- ^ @parameter
+g (func :: a -> b) x = func y
+  -- ^ @parameter
+  -- ^ @function
+lambdaAlias :: LambdaAlias
+lambdaAlias _ _ _ = undefined
+  -- ^ @function
+spec :: Spec
+spec = describe "test ns" $ it "test case" pending
+-- ^ @variable

From 262e9b1e867ad30ff2cd433160b879d5ec4b3769 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Fri, 8 Sep 2023 16:02:29 -0400
Subject: [PATCH 0772/2704] fix(scala): Mark (lambda_expression) without
 bindings as @defintition.parameters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When you have a lambda expression like:

```scala
val fruits = List("apple", "banana", "avocado", "papaya")

val countsToFruits = fruits.groupBy(fruit => fruit.count(_ == 'a'))

for ((count, fruits) <- countsToFruits) {
  println(s"with (fruits) 'a' × $count = $fruits")
}
```

The `fruit => fruit.count(_ == 'a')` lambda expression (note: without
wrapping parenthesis) does not create a `(binding)` node. Its syntax
tree is:

```
    (lambda_expression) ; [5:18 - 47]
     parameters: (identifier) ; [5:18 - 22]
     (call_expression) ; [5:27 - 47]
      function: (field_expression) ; [5:27 - 37]
       value: (identifier) ; [5:27 - 31]
       field: (identifier) ; [5:33 - 37]
      arguments: (arguments) ; [5:38 - 47]
       (infix_expression) ; [5:39 - 46]
        left: (wildcard) ; [5:39 - 39]
        operator: (operator_identifier) ; [5:41 - 42]
        right: (character_literal) ; [5:44 - 46]
```

That example just _happens_ to be **exactly** one of the example from
https://www.scala-lang.org/ ([see
playground](https://scastie.scala-lang.org/S0bkCiXkQiuOMXnlhWn46g)) 😁.
---
 queries/scala/locals.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index dc19c7aa4..044923f17 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -25,6 +25,9 @@
 (class_parameter
   name: (identifier) @definition.parameter)
 
+(lambda_expression
+  parameters: (identifier) @definition.var)
+
 (binding
   name: (identifier) @definition.var)
 

From ea5f5fddad37a69ef50c4dceb1b790586f14f692 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 19 Sep 2023 12:12:20 -0700
Subject: [PATCH 0773/2704] fix(markdown): give code blocks higher priority
 than block quotes

---
 queries/markdown/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 6c10c0885..a96e84385 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -57,7 +57,7 @@
 (task_list_marker_unchecked) @text.todo.unchecked
 (task_list_marker_checked) @text.todo.checked
 
-(block_quote) @text.quote
+((block_quote) @text.quote (#set! "priority" 89))
 
 [
   (block_continuation)

From 28e1361d4abdc9aec669a767c8b9f96ad21fe1a6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 20 Sep 2023 10:46:17 -0700
Subject: [PATCH 0774/2704] fix(markdown): set block quote priority within
 allowed range

---
 queries/markdown/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index a96e84385..23f1fb60f 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -57,7 +57,7 @@
 (task_list_marker_unchecked) @text.todo.unchecked
 (task_list_marker_checked) @text.todo.checked
 
-((block_quote) @text.quote (#set! "priority" 89))
+((block_quote) @text.quote (#set! "priority" 90))
 
 [
   (block_continuation)

From bf87a16712124ed8485e359fda321861de769d2a Mon Sep 17 00:00:00 2001
From: Carlos Afonso <afonso.carlos.braga@gmail.com>
Date: Fri, 6 Oct 2023 18:34:46 +0100
Subject: [PATCH 0775/2704] fix(php): fix indentation for in between braces

---
 queries/php/indents.scm         | 4 ++--
 tests/indent/php/issue-3591.php | 1 +
 tests/indent/php_spec.lua       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/queries/php/indents.scm b/queries/php/indents.scm
index c490ad77f..a10791501 100644
--- a/queries/php/indents.scm
+++ b/queries/php/indents.scm
@@ -10,7 +10,6 @@
   (switch_block)
   (match_block)
   (case_statement)
-  "["
 ] @indent.begin
 
 [
@@ -25,4 +24,5 @@
 
 (compound_statement "}" @indent.end)
 
-(ERROR) @indent.auto
+(ERROR "(" @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")") . (_))
+(ERROR "[" @indent.align (#set! indent.open_delimiter "[") (#set! indent.close_delimiter "]") . (_))
diff --git a/tests/indent/php/issue-3591.php b/tests/indent/php/issue-3591.php
index 30b90a6a0..598948f5c 100644
--- a/tests/indent/php/issue-3591.php
+++ b/tests/indent/php/issue-3591.php
@@ -2,4 +2,5 @@
 
 function test() {
     $array = [
+    ]
 }
diff --git a/tests/indent/php_spec.lua b/tests/indent/php_spec.lua
index 2d7a88742..f7067501e 100644
--- a/tests/indent/php_spec.lua
+++ b/tests/indent/php_spec.lua
@@ -21,7 +21,7 @@ describe("indent PHP:", function()
       { on_line = 5, text = "indentation with `enter` in insert mode is not correct", indent = 4 }
     )
     run:new_line("issue-2497.php", { on_line = 5, text = "$a =", indent = 4 })
-    run:new_line("unfinished-call.php", { on_line = 6, text = "$a =", indent = 0 })
+    run:new_line("unfinished-call.php", { on_line = 6, text = "$a =", indent = 4 })
     run:new_line("issue-3591.php", { on_line = 4, text = "$a =", indent = 8 })
     run:new_line("enum-indent.php", { on_line = 4, text = "case", indent = 4 })
   end)

From 981b13b886d69e395bed1840790ea9e38f73266a Mon Sep 17 00:00:00 2001
From: Carlos Afonso <afonso.carlos.braga@gmail.com>
Date: Sat, 7 Oct 2023 18:37:56 +0100
Subject: [PATCH 0776/2704] refactor: improve readability

---
 queries/php/indents.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/queries/php/indents.scm b/queries/php/indents.scm
index a10791501..53e78c341 100644
--- a/queries/php/indents.scm
+++ b/queries/php/indents.scm
@@ -24,5 +24,13 @@
 
 (compound_statement "}" @indent.end)
 
-(ERROR "(" @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")") . (_))
-(ERROR "[" @indent.align (#set! indent.open_delimiter "[") (#set! indent.close_delimiter "]") . (_))
+(ERROR
+  "(" @indent.align
+  . (_)
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+(ERROR
+  "[" @indent.align
+  . (_)
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]"))

From 6608e2c868566b85d91b48e5991577f6002690e7 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Sun, 15 Oct 2023 20:35:08 +0200
Subject: [PATCH 0777/2704] fix(elixir): highlight functions without
 parenthesis (#5511)

Elixir does not require parenthesis after the function name for a
valid function definition.
---
 queries/elixir/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index c86372e29..60a6f3156 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -112,6 +112,7 @@
   ))
   (arguments [
     (call (identifier) @function)
+    (identifier) @function
     (binary_operator left: (call target: (identifier) @function) operator: "when")])?)
 
 ; Kernel Keywords & Special Forms

From 7eadc8715dad1f489dfa04e1f1f0f5caecd26f2f Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Sun, 15 Oct 2023 20:36:15 +0200
Subject: [PATCH 0778/2704] fix(unison): improve highlight queries

---
 queries/unison/highlights.scm | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
index 41f7e19bf..20e68a1c5 100644
--- a/queries/unison/highlights.scm
+++ b/queries/unison/highlights.scm
@@ -13,6 +13,8 @@
   (type_kw)
   (do)
   (kw_let)
+  (ability)
+  (where)
 ] @keyword
 
 (kw_equals) @keyword.operator
@@ -49,14 +51,25 @@
 
 ;; Types
 (record_field name: (wordy_id) @variable type: (wordy_id) @type)
-[
-  (type_name)
-  (type_signature)
-  (effect)
-] @type
+(type_name) @type
 
-(term_definition) @variable
+(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @parameter)
+(effect (wordy_id) @attribute) ;; NOTE: an effect is a special type
 
+
+;; Namespaces
+(path) @namespace
+(namespace) @namespace
+
+;; Terms
+(type_signature term_name: (path) @namespace term_name: (wordy_id) @variable)
+(type_signature term_name: (wordy_id) @variable)
+(term_type) @type
+
+(function_application function_name: (path) function_name: (wordy_id) @function)
+
+(term_definition name: (wordy_id) @variable)
+(term_definition param: (wordy_id) @parameter)
 ;; Punctuation
 [
   (type_signature_colon)
@@ -71,3 +84,5 @@
   "["
   "]"
 ] @punctuation.bracket
+
+(test_watch_expression (wordy_id) @preproc)

From 159272a809c122a0b8ce815acea5265ebb66055b Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Sun, 15 Oct 2023 20:38:16 +0200
Subject: [PATCH 0779/2704] feat: add gstreamer pipeline syntax (`gstlaunch`)

---
 lua/nvim-treesitter/parsers.lua  |  8 ++++++++
 queries/gstlaunch/highlights.scm | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 queries/gstlaunch/highlights.scm

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e583656ee..6a00b26a2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -707,6 +707,14 @@ list.graphql = {
   maintainers = { "@bkegley" },
 }
 
+list.gstlaunch = {
+  install_info = {
+    url = "https://github.com/theHamsta/tree-sitter-gstlaunch",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@theHamsta" },
+}
+
 list.hack = {
   install_info = {
     url = "https://github.com/slackhq/tree-sitter-hack",
diff --git a/queries/gstlaunch/highlights.scm b/queries/gstlaunch/highlights.scm
new file mode 100644
index 000000000..a6db82fdb
--- /dev/null
+++ b/queries/gstlaunch/highlights.scm
@@ -0,0 +1,32 @@
+[
+ "!"
+ "="
+] @operator
+
+[
+ ","
+ "."
+ ";"
+ "/"
+] @punctuation.delimiter
+
+[
+ "("
+ ")"
+] @punctuation.bracket
+
+(property
+  key: (identifier) @field)
+(value) @string
+(string_literal) @string
+(cap
+  .
+  (identifier) @string
+  .
+  (identifier) @string)
+(simple_element
+  type: (_) @type)
+(bin
+  type: (_) @type)
+
+(ERROR) @error

From dba7d120e5e2e6b0c7871268487371cb8d037d18 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 15 Oct 2023 14:40:36 -0400
Subject: [PATCH 0780/2704] fix(scala): ensure `function_definition` is in
 parent scope

---
 queries/scala/locals.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index 044923f17..d006556ab 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -17,7 +17,8 @@
   name: (identifier) @definition.function)
 
 (function_definition
-  name: (identifier) @definition.function)
+  name: ((identifier) @definition.function)
+  (#set! definition.var.scope parent))
 
 (parameter
   name: (identifier) @definition.parameter)

From 4c9da29cbdc100c6a48b18975c015e54e620c298 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 15 Oct 2023 14:43:34 -0400
Subject: [PATCH 0781/2704] fix(scala): add `for_expression` locals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change does two main things:

1. Indicate that `(for_expression)`'s introduce a `@scope` (this
   is the scope for the enumerators to be used within the loop).
2. Indicate that the `(identifiers)` within the `(enumerators)` are
   `@definition.var`s.

---

For the following example snippet:

```scala
val fruits = List("apple", "banana", "avocado", "papaya")

val countsToFruits = fruits.groupBy(fruit => fruit.count(_ == 'a'))

for ((count, fruits) <- countsToFruits) {
  println(s"with (fruits) 'a' × $count = $fruits")
}
```

The `count` and `fruits` identifiers are new definitions introduced by
the `for` expressions scope.
---
 queries/scala/locals.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index d006556ab..9f81e2859 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -5,6 +5,7 @@
   (lambda_expression)
   (function_definition)
   (block)
+  (for_expression)
 ] @scope
 
 ; References
@@ -44,3 +45,8 @@
 (var_declaration
   name: (identifier) @definition.var)
 
+(for_expression
+  enumerators: (enumerators
+    (enumerator
+      (tuple_pattern
+        (identifier) @definition.var))))

From 43694a240cce2fbaf3f573bd5e0864eefaf32e4f Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sun, 15 Oct 2023 18:43:48 +0000
Subject: [PATCH 0782/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5064d01c9..bf1ee51e1 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) (maintained by @ObserverOfTime)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
 - [x] [groovy](https://github.com/Decodetalkers/tree-sitter-groovy) (maintained by @Decodetalkers)
+- [x] [gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) (maintained by @theHamsta)
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
 - [x] [hare](https://github.com/amaanq/tree-sitter-hare) (maintained by @amaanq)
 - [x] [haskell](https://github.com/tree-sitter/tree-sitter-haskell) (maintained by @mrcjkb)

From 49e71322db582147ce8f4df1853d9dab08da0826 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 06:50:13 +0000
Subject: [PATCH 0783/2704] Update parsers: awk, c, gstlaunch, sql, t32, wing
 (#5530)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 25f1553db..19f774cf5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "374da90decaa60fea7a22490a77440ece6d4161d"
+    "revision": "90c8d9b47edcf7e2d67680c6649d5f6358d2ce06"
   },
   "bash": {
     "revision": "7331995b19b8f8aba2d5e26deb51d2195c18bc94"
@@ -42,7 +42,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "f1075f2d65ecb62725821fd8a34ce68c1fa8ae51"
+    "revision": "0d33f0422ad391c6d652283645d546ffa048f503"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -224,6 +224,9 @@
   "groovy": {
     "revision": "ae8aa51ec3275afb567a4a67df1a26d89feb135f"
   },
+  "gstlaunch": {
+    "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
+  },
   "hack": {
     "revision": "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"
   },
@@ -546,7 +549,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "eeab7240a11098724e6f95bc57cc3ceaf5487d5f"
+    "revision": "c86aa9c19ab9f04f2e55a6ef00f34147932c15e5"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -579,7 +582,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "942e91a2e262420ca4b35352010c2f134fa7e809"
+    "revision": "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -663,7 +666,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d61083e478b3d41b2fe5f481d4b57ca97b4c444f"
+    "revision": "d28bc4856a9804f2116bf2c3663139f5381658bb"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 9c4fc86b67c1d68141cef57846d24cbee9b74fb0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 17 Oct 2023 06:36:52 +0000
Subject: [PATCH 0784/2704] Update parsers: c, cuda, glsl, hlsl, sql, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 19f774cf5..ff7bce3e1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -42,7 +42,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "0d33f0422ad391c6d652283645d546ffa048f503"
+    "revision": "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -87,7 +87,7 @@
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "cuda": {
-    "revision": "759cf0a2557c9138baeae342aac61044acbdd618"
+    "revision": "3161aed045130c900f870ef53fad93a574317769"
   },
   "cue": {
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
@@ -198,7 +198,7 @@
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
   },
   "glsl": {
-    "revision": "008abfeb24b73c696e1a07f3f1d299f95d4efbb1"
+    "revision": "952739a25a7c014882aa777f1a32da8950f31f58"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -249,7 +249,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "360f5fdb6e1d1a201c52d67184e2d115f67c4e26"
+    "revision": "f2902bd614e3916bdf65e1bc9ad45ebd08417bba"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -549,7 +549,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "c86aa9c19ab9f04f2e55a6ef00f34147932c15e5"
+    "revision": "36c4de35f76dfa732493aae606feb69dce4b1daa"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -666,7 +666,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d28bc4856a9804f2116bf2c3663139f5381658bb"
+    "revision": "bde93562c6dae6aaffd641cb367356386da412d0"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From afa103385a2b5ef060596ed822ef63276ae88016 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 18 Oct 2023 06:36:41 +0000
Subject: [PATCH 0785/2704] Update parsers: dart, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ff7bce3e1..c3caec5d2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "7e447dc18a2d293498670fb5ea16138648c883e5"
+    "revision": "e14bbac8a0fcb6fab1b3becf6ed3fe464123c377"
   },
   "devicetree": {
     "revision": "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"
@@ -666,7 +666,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "bde93562c6dae6aaffd641cb367356386da412d0"
+    "revision": "6a7b21b322a347cda6076fe14dbe0bb592c5a041"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From eb3faef3a44641e5875581e901b0a8df8da2bde4 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 19 Oct 2023 06:36:35 +0000
Subject: [PATCH 0786/2704] Update parsers: sql, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c3caec5d2..9c053bd6b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -549,7 +549,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "36c4de35f76dfa732493aae606feb69dce4b1daa"
+    "revision": "caf2938f1bc6b174e5bf5b6f3b5522cb723ee55b"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -666,7 +666,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6a7b21b322a347cda6076fe14dbe0bb592c5a041"
+    "revision": "fc9ba04eeae22b46be64045beba4c9a7aa013af4"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 1bfefd1f98dae54576a54b59b42379b275a00414 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@whynothugo.nl>
Date: Fri, 20 Oct 2023 13:03:50 +0200
Subject: [PATCH 0787/2704] docs: add hint on configuring custom filetypes
 (#5552)

I thought that this functionality was not possible but there's actually
an API for it. This seems like a useful place for others to find more
information on it.
---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index bf1ee51e1..fd99ad748 100644
--- a/README.md
+++ b/README.md
@@ -745,3 +745,15 @@ require'nvim-treesitter.configs'.setup {
     --
 }
 ```
+
+#### Using an existing parser for another filetype
+
+For example, to use the `bash` tree-sitter to highlight file with
+`filetype=apkbuild`, use:
+
+```lua
+vim.treesitter.language.register("bash", "apkbuild")
+```
+
+The `bash` tree-sitter must be installed following the usual procedure [as
+described above](#language-parsers).

From 605a650924b1e0d48d96ebd7d667ac22216035a0 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 20 Oct 2023 23:02:49 +0900
Subject: [PATCH 0788/2704] chore(wing): update queries from upstream (#5549)

---
 lockfile.json          | 2 +-
 queries/wing/folds.scm | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9c053bd6b..73ceb652f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -666,7 +666,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "fc9ba04eeae22b46be64045beba4c9a7aa013af4"
+    "revision": "2b00ad4c06f1f49257f1310b01f23a98dc117f77"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
diff --git a/queries/wing/folds.scm b/queries/wing/folds.scm
index 17fc7b95f..538367db3 100644
--- a/queries/wing/folds.scm
+++ b/queries/wing/folds.scm
@@ -1,8 +1,6 @@
 [
   (class_definition)
   (class_implementation)
-  (resource_definition)
-  (resource_implementation)
   (interface_definition)
   (interface_implementation)
   (for_in_loop)

From 4a68f0778c05083cc458a3a144205cfc41474439 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 20 Oct 2023 14:05:04 +0000
Subject: [PATCH 0789/2704] Update parsers: liquidsoap, php

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 73ceb652f..e72c240f8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "liquidsoap": {
-    "revision": "bbef4df4dc5b324455ad1ea4770bbed0df5130ea"
+    "revision": "4acf9035d852fc65e013f05f597635204e6d1ca5"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -417,7 +417,7 @@
     "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
   },
   "php": {
-    "revision": "92a98adaa534957b9a70b03e9acb9ccf9345033a"
+    "revision": "0e02e7fab7913a0e77343edb347c8f17cac1f0ba"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"

From 486bb0e557779d703b5dcfbedaee3ef0d626b663 Mon Sep 17 00:00:00 2001
From: Hugo <hugo@whynothugo.nl>
Date: Fri, 20 Oct 2023 21:58:08 +0200
Subject: [PATCH 0790/2704] feat: register APKBUILD files as bash

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6a00b26a2..d1d97b983 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -30,6 +30,7 @@ for ft, lang in pairs {
   ecma = "javascript",
   jsx = "javascript",
   sh = "bash",
+  apkbuild = "bash",
   PKGBUILD = "bash",
   html_tags = "html",
   ["typescript.tsx"] = "tsx",

From 6e4a7707995f80d4e24641a081e90fe61cd38060 Mon Sep 17 00:00:00 2001
From: aMOPel <36712072+aMOPel@users.noreply.github.com>
Date: Fri, 20 Oct 2023 21:59:56 +0200
Subject: [PATCH 0791/2704] docs: improve description of `@type.definition`
 capture

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc0a385d4..43beeb04e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -160,7 +160,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 ```scheme
 @type            ; type or class definitions and annotations
 @type.builtin    ; built-in types
-@type.definition ; type definitions (e.g. `typedef` in C)
+@type.definition ; identifiers in type definitions (e.g. `typedef <type> <identifier>` in C)
 @type.qualifier  ; type qualifiers (e.g. `const`)
 
 @storageclass    ; modifiers that affect storage in memory or life-time

From 8ac3e313f5fb4c7af35948fd7eef3622e329a1ba Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Sat, 21 Oct 2023 06:04:23 +0300
Subject: [PATCH 0792/2704] feat(prisma): folding queries (#5541)

---
 queries/prisma/folds.scm | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 queries/prisma/folds.scm

diff --git a/queries/prisma/folds.scm b/queries/prisma/folds.scm
new file mode 100644
index 000000000..6b42d26cc
--- /dev/null
+++ b/queries/prisma/folds.scm
@@ -0,0 +1,7 @@
+[
+ (generator_declaration)
+ (datasource_declaration)
+ (model_declaration)
+ (enum_declaration)
+ (view_declaration)
+] @fold

From 8963bc8a91edc1119f898fbc4c221869f5a86809 Mon Sep 17 00:00:00 2001
From: Benedikt Reinartz <filmor@gmail.com>
Date: Sat, 21 Oct 2023 06:00:18 +0200
Subject: [PATCH 0793/2704] feat(erlang): add missing keyword 'begin'

---
 queries/erlang/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
index ef851f695..0c129e23f 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -66,6 +66,7 @@
   "of"
   "when"
   "after"
+  "begin"
   "end"
   "maybe"
   "else"

From f636d58c8d5780e5fe79a8de5691b1712c758b05 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 21 Oct 2023 06:34:36 +0000
Subject: [PATCH 0794/2704] Update parsers: haskell

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index e72c240f8..3e3f3db89 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -234,7 +234,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3"
+    "revision": "ca10c43a4c9bfe588c480d2941726c2fadcae699"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"

From cffa252f5e8f257d4952c0817c44fdaefd2c25a7 Mon Sep 17 00:00:00 2001
From: Meet Mangukiya <meet@flamy.dev>
Date: Tue, 17 Oct 2023 22:27:03 +0530
Subject: [PATCH 0795/2704] feat: add solidity folds

---
 queries/solidity/folds.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 queries/solidity/folds.scm

diff --git a/queries/solidity/folds.scm b/queries/solidity/folds.scm
new file mode 100644
index 000000000..7e3cbdec9
--- /dev/null
+++ b/queries/solidity/folds.scm
@@ -0,0 +1,20 @@
+[
+  (error_declaration)
+  (contract_body)
+  (struct_declaration)
+  (enum_declaration)
+  (event_definition)
+  (assembly_statement)
+  (block_statement)
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (yul_block)
+  (function_body)
+  (call_expression)
+  (inline_array_expression)
+  (tuple_expression)
+  (struct_expression)
+  (comment)
+  (emit_statement)
+] @fold

From 7c67a1a92340e1e4d653fb4393ef617e248412af Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Tue, 17 Oct 2023 19:31:54 +0000
Subject: [PATCH 0796/2704] feat(pod): add tree-sitter-perl org's POD parser

---
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  9 +++++
 queries/pod/highlights.scm      | 72 +++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 queries/pod/highlights.scm

diff --git a/lockfile.json b/lockfile.json
index 3e3f3db89..0d3748886 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -428,6 +428,9 @@
   "po": {
     "revision": "d6aed225290bc71a15ab6f06305cb11419360c56"
   },
+  "pod": {
+    "revision": "ea5d557cbd185cdcb5efcfdb6bc846fe909d86ae"
+  },
   "poe_filter": {
     "revision": "d7b43b51f92fb19efe8af45c2246087c611c8f63"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d1d97b983..8d12a69aa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1281,6 +1281,15 @@ list.po = {
   maintainers = { "@amaanq" },
 }
 
+list.pod = {
+  install_info = {
+    url = "https://github.com/tree-sitter-perl/tree-sitter-pod",
+    files = { "src/parser.c", "src/scanner.c" },
+    branch = "release",
+  },
+  maintainers = { "@RabbiVeesh", "@LeoNerd" },
+}
+
 list.poe_filter = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-poe-filter",
diff --git a/queries/pod/highlights.scm b/queries/pod/highlights.scm
new file mode 100644
index 000000000..f0b65ab63
--- /dev/null
+++ b/queries/pod/highlights.scm
@@ -0,0 +1,72 @@
+; A highlight file for nvim-treesitter to use
+
+[(pod_command)
+ (command)
+ (cut_command)] @keyword
+
+(command_paragraph
+  (command) @keyword
+  (#lua-match? @keyword "^=head")
+  (content) @text.title)
+
+(command_paragraph
+  (command) @keyword
+  (#lua-match? @keyword "^=over")
+  (content) @number)
+
+(command_paragraph
+  (command) @keyword
+  (#lua-match? @keyword "^=item")
+  (content) @text)
+
+(command_paragraph
+  (command) @keyword
+  (#lua-match? @keyword "^=encoding")
+  (content) @string.special)
+
+(command_paragraph
+  (command) @keyword
+  (#not-lua-match? @keyword "^=(head|over|item|encoding)")
+  (content) @string)
+
+(verbatim_paragraph (content) @text.literal)
+
+(interior_sequence
+  (sequence_letter) @character
+  ["<" ">"] @punctuation.delimiter
+)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "B")
+  (content) @text.strong)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "C")
+  (content) @text.literal)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "F")
+  (content) @text.underline @string.special)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "I")
+  (content) @text.emphasis)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "L")
+  (content) @text.uri)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "X")
+  (content) @text.reference)
+
+(interior_sequence
+  (sequence_letter) @character
+  (#eq? @character "E")
+  (content) @string.escape)

From bb3f8f40b1443fb40665263e1b5b0658bc24be03 Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Tue, 17 Oct 2023 19:32:09 +0000
Subject: [PATCH 0797/2704] feat(perl)!: switch to tree-sitter-perl org's
 parser

---
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   7 +-
 queries/perl/folds.scm          |  30 ++--
 queries/perl/highlights.scm     | 290 +++++++++++++-------------------
 queries/perl/injections.scm     |  14 +-
 5 files changed, 156 insertions(+), 187 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0d3748886..e2706fc6b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -414,7 +414,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "79e88f64681660f3961939bf764d8f3b4bbb0d27"
+    "revision": "99bbcb0faddfc79db3fd2996cb56689a4685e78c"
   },
   "php": {
     "revision": "0e02e7fab7913a0e77343edb347c8f17cac1f0ba"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8d12a69aa..526a34cd7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1240,10 +1240,11 @@ list.pem = {
 
 list.perl = {
   install_info = {
-    url = "https://github.com/ganezdragon/tree-sitter-perl",
-    files = { "src/parser.c", "src/scanner.cc" },
+    url = "https://github.com/tree-sitter-perl/tree-sitter-perl",
+    files = { "src/parser.c", "src/scanner.c" },
+    branch = "release",
   },
-  maintainers = { "@lcrownover" },
+  maintainers = { "@RabbiVeesh", "@LeoNerd" },
 }
 
 list.php = {
diff --git a/queries/perl/folds.scm b/queries/perl/folds.scm
index 7be36e5e0..df23f6317 100644
--- a/queries/perl/folds.scm
+++ b/queries/perl/folds.scm
@@ -1,11 +1,19 @@
-[
-  (function_definition)
-  (if_statement)
-  (unless_statement)
-  (while_statement)
-  (until_statement)
-  (for_statement_1)
-  (for_statement_2)
-  (standalone_block)
-  (pod_statement)
-] @fold
+(comment)+ @fold
+(pod) @fold
+
+; fold the block-typed package statements only
+(package_statement (block)) @fold
+
+[(subroutine_declaration_statement)
+ (conditional_statement)
+ (loop_statement)
+ (for_statement)
+ (cstyle_for_statement)
+ (block_statement)
+ (phaser_statement)] @fold
+
+(anonymous_subroutine_expression) @fold
+
+; perhaps folks want to fold these too?
+[(anonymous_array_expression)
+ (anonymous_hash_expression)] @fold
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index c7403b6e7..82d181183 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -1,198 +1,146 @@
-; Misc keywords
-[
-  "my" "our" "local"
-  "next" "last" "redo"
-  "goto"
-  "package"
-;  "do"
-;  "eval"
-] @keyword
-
-; Keywords for including
-[ "use" "no" "require" ] @include
-
-; Keywords that mark conditional statements
-[ "if" "elsif" "unless" "else" ] @conditional
-(ternary_expression
-  ["?" ":"] @conditional.ternary)
-
-; Keywords that mark repeating loops
-[ "while" "until" "for" "foreach" ] @repeat
-
-; Keyword for return expressions
-[ "return" ] @keyword.return
-
-; Keywords for phaser blocks
-; TODO: Ideally these would be @keyword.phaser but vim-treesitter doesn't
-;   have such a thing yet
-[ "BEGIN" "CHECK" "UNITCHECK" "INIT" "END" ] @keyword.function
-
-; Keywords to define a function
-[ "sub" ] @keyword.function
-
-; Keywords that are regular infix operators
-[
-  "and" "or" "not" "xor"
-  "eq" "ne" "lt" "le" "ge" "gt" "cmp"
-] @keyword.operator
-
-; Variables
-[
-  (scalar_variable)
-  (array_variable)
-  (hash_variable)
-] @variable
-
-; Special builtin variables
-[
-  (special_scalar_variable)
-  (special_array_variable)
-  (special_hash_variable)
-  (special_literal)
-  (super)
-] @variable.builtin
-
-((scalar_variable) @variable.builtin
- (#eq? @variable.builtin "$#ARGV"))
-
-; Integer numbers
-[
-  (integer)
-  (hexadecimal)
-] @number
-
-; Float numbers
-[
-  (floating_point)
-  (scientific_notation)
-] @float
-
-; version sortof counts as a kind of multipart integer
-(version) @constant
-
-; Package names are types
-(package_name) @type
-
-; The special SUPER:: could be called a namespace. It isn't really but it
-;   should highlight differently and we might as well do it this way
-(super) @namespace
-
-; Comments are comments
-(comments) @comment @spell
-
-((source_file . (comments) @preproc)
+((source_file . (comment) @preproc)
   (#lua-match? @preproc "^#!/"))
 
-; POD should be handled specially with its own embedded subtype but for now
-;   we'll just have to do this.
-(pod_statement) @text
+[ "use" "no" "require" ] @include
 
-(method_invocation
-  function_name: (identifier) @method.call)
-(call_expression
-  function_name: (identifier) @function.call)
+[ "if" "elsif" "unless" "else" ] @conditional
 
-; Built-in functions
-((call_expression
-  function_name: (identifier) @function.builtin)
- (#any-of? @function.builtin
-   "print" "printf" "sprintf" "say"
-   "push" "pop" "shift" "unshift" "splice"
-   "exists" "delete" "keys" "values"
-   "each"))
+(conditional_expression [ "?" ":" ] @conditional.ternary) 
+
+[ "while" "until" "for" "foreach" ] @repeat
+
+"return" @keyword.return
+
+"sub" @keyword.function
+
+[ "map" "grep" ] @function.builtin
+
+"package" @include
 
 [
-  (map)
-  (grep)
-  (bless)
-] @function.builtin
+  "do"
+  "my" "our" "local"
+  "last" "next" "redo" "goto"
+  "undef"
+] @keyword
 
-;; ----------
+(_ operator: _ @operator)
+"\\" @operator
 
-(use_constant_statement
-  constant: (identifier) @constant)
+(yadayada) @exception
 
-(named_block_statement
-  function_name: (identifier) @function)
-
-(function_definition
-  name: (identifier) @function)
-
-(function) @function
+(phaser_statement phase: _ @keyword.phaser)
 
 [
-  "(" ")"
-  "[" "]"
-  "{" "}"
-  (standard_input_to_variable)
-] @punctuation.bracket
+  "or" "and"
+  "eq" "ne" "cmp" "lt" "le" "ge" "gt"
+  "isa"
+] @keyword.operator
 
-[ "`" "\"" ] @punctuation.special
+(eof_marker) @preproc
+(data_section) @comment
+
+(pod) @text
 
 [
-  "=~"
-  "!~"
-  "="
-  "=="
-  "+"
-  "-"
-  "."
-  "//"
-  "||"
-  "&&"
-  "<<"
-  (arrow_operator)
-  (hash_arrow_operator)
-  (array_dereference)
-  (hash_dereference)
-  (to_reference)
-  (type_glob)
-  (hash_access_variable)
-] @operator
+  (number)
+  (version)
+] @number
 
 [
-  (regex_option)
-  (regex_option_for_substitution)
-  (regex_option_for_transliteration)
-] @parameter
-
-(type_glob
-  (identifier) @variable)
-
-[
-  (word_list_qw)
-  (command_qx_quoted)
-  (string_single_quoted)
-  (string_double_quoted)
-  (string_qq_quoted)
-  (bareword)
-  (transliteration_tr_or_y)
+  (string_literal) 
+  (interpolated_string_literal) 
+  (quoted_word_list) 
+  (command_string) 
+  (heredoc_content)
+  (replacement)
+  (transliteration_content)
 ] @string
 
 [
- (heredoc_start_identifier)
- (heredoc_end_identifier)
+  (heredoc_token)
+  (command_heredoc_token)
+  (heredoc_end)
 ] @label
 
-(heredoc_body_statement) @text.literal
+[(escape_sequence) (escaped_delimiter)] @string.escape
 
-[
-  (pattern_matcher)
-  (regex_pattern_qr)
-  (patter_matcher_m)
-  (substitution_pattern_s)
+(_ modifiers: _ @character.special)
+[  
+ (quoted_regexp)
+ (match_regexp)
+ (regexp_content)
 ] @string.regex
 
-(escape_sequence) @string.escape
+(autoquoted_bareword _?) @string.special
 
-[
-  ","
-  (semi_colon)
-  (start_delimiter)
-  (end_delimiter)
-  (ellipsis_statement)
-] @punctuation.delimiter
+(use_statement (package) @type)
+(package_statement (package) @type)
+(require_expression (bareword) @type)
 
-(function_attribute) @field
+(subroutine_declaration_statement name: (bareword) @function)
+(attribute_name) @attribute
+(attribute_value) @string
 
-(function_signature) @type
+(label) @label
+
+(statement_label label: _ @label)
+
+(relational_expression operator: "isa" right: (bareword) @type)
+
+(function_call_expression (function) @function.call)
+(method_call_expression (method) @method.call)
+(method_call_expression invocant: (bareword) @type)
+
+(func0op_call_expression function: _ @function.builtin)
+(func1op_call_expression function: _ @function.builtin)
+
+([(function)(expression_statement (bareword))] @function.builtin
+ (#set! "priority" 101)
+ (#lua-match? @function.builtin
+   "^(accept|atan2|bind|binmode|bless|crypt|chmod|chown|connect|die|dbmopen|exec|fcntl|flock|getpriority|getprotobynumber|gethostbyaddr|getnetbyaddr|getservbyname|getservbyport|getsockopt|glob|index|ioctl|join|kill|link|listen|mkdir|msgctl|msgget|msgrcv|msgsend|opendir|print|printf|push|pack|pipe|return|rename|rindex|read|recv|reverse|say|select|seek|semctl|semget|semop|send|setpgrp|setpriority|seekdir|setsockopt|shmctl|shmread|shmwrite|shutdown|socket|socketpair|split|sprintf|splice|substr|system|symlink|syscall|sysopen|sysseek|sysread|syswrite|tie|truncate|unlink|unpack|utime|unshift|vec|warn|waitpid|formline|open|sort)$"
+))
+
+(function) @function
+
+(ERROR) @error
+
+(_
+  "{" @punctuation.special
+  (varname)
+  "}" @punctuation.special)
+
+(varname 
+  (block
+    "{" @punctuation.special 
+    "}" @punctuation.special))
+
+
+(
+  [(varname) (filehandle)] @variable.builtin
+  (#lua-match? @variable.builtin "^((ENV|ARGV|INC|ARGVOUT|SIG|STDIN|STDOUT|STDERR)|[_ab]|\\W|\\d+|\\^.*)$")
+)
+
+(scalar) @variable.scalar
+(scalar_deref_expression [ "$" "*"] @variable.scalar)
+[(array) (arraylen)] @variable.array
+(array_deref_expression [ "@" "*"] @variable.array)
+(hash) @variable.hash
+(hash_deref_expression [ "%" "*"] @variable.hash)
+
+(array_element_expression array:(_) @variable.array)
+(slice_expression array:(_) @variable.array)
+(keyval_expression array:(_) @variable.array)
+
+(hash_element_expression hash:(_) @variable.hash)
+(slice_expression hash:(_) @variable.hash)
+(keyval_expression hash:(_) @variable.hash)
+
+(comment) @comment
+
+([ "=>" "," ";" "->" ] @punctuation.delimiter)
+
+(
+  [ "[" "]" "{" "}" "(" ")" ] @punctuation.bracket
+  ; priority hack so nvim + ts-cli behave the same
+  (#set! "priority" 90))
diff --git a/queries/perl/injections.scm b/queries/perl/injections.scm
index cab5f53d5..ba5e45f45 100644
--- a/queries/perl/injections.scm
+++ b/queries/perl/injections.scm
@@ -1,2 +1,14 @@
-((comments) @injection.content
+; an injections.scm file for nvim-treesitter
+((comment) @injection.content
  (#set! injection.language "comment"))
+ 
+((pod) @injection.content
+ (#set! injection.language "pod"))
+
+((substitution_regexp
+  (replacement) @injection.content
+  (substitution_regexp_modifiers) @_modifiers)
+    ; match if there's a single `e` in the modifiers list
+  (#lua-match? @_modifiers "e")
+  (#not-lua-match? @_modifiers "e.*e")
+  (#set! injection.language "perl"))

From 6f2ef910c2c320f27cf988cf4e688746f16f4f75 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sat, 21 Oct 2023 18:41:36 +0000
Subject: [PATCH 0798/2704] Update README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fd99ad748..3c41a2f1c 100644
--- a/README.md
+++ b/README.md
@@ -311,11 +311,12 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pascal](https://github.com/Isopod/tree-sitter-pascal.git) (maintained by @Isopod)
 - [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
 - [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
-- [x] [perl](https://github.com/ganezdragon/tree-sitter-perl) (maintained by @lcrownover)
+- [x] [perl](https://github.com/tree-sitter-perl/tree-sitter-perl) (maintained by @RabbiVeesh, @LeoNerd)
 - [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
 - [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
 - [x] [pioasm](https://github.com/leo60228/tree-sitter-pioasm) (maintained by @leo60228)
 - [x] [po](https://github.com/erasin/tree-sitter-po) (maintained by @amaanq)
+- [x] [pod](https://github.com/tree-sitter-perl/tree-sitter-pod) (maintained by @RabbiVeesh, @LeoNerd)
 - [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)

From ce2a9fb89a8ceef78310a67343d79c8f3d3c27ce Mon Sep 17 00:00:00 2001
From: Tomasz N <przepompownia@users.noreply.github.com>
Date: Sun, 22 Oct 2023 03:21:51 +0200
Subject: [PATCH 0799/2704] fix(phpdoc): disable spell checking of attribute
 names (#5015)

---
 queries/phpdoc/highlights.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/queries/phpdoc/highlights.scm b/queries/phpdoc/highlights.scm
index 5cb3dba06..08ff9e1cb 100644
--- a/queries/phpdoc/highlights.scm
+++ b/queries/phpdoc/highlights.scm
@@ -1,4 +1,4 @@
-(tag_name) @attribute
+(tag_name) @attribute @nospell
 (tag
   (tag_name) @_tag (#eq? @_tag "@param")
   (variable_name) @parameter
@@ -24,6 +24,8 @@
     (named_type)
     (optional_type)
   ] @type)
+(type_list) @nospell
+(variable_name) @nospell
 (tag
   (description (text) @text))
 (tag

From 99988f6eb7a6d898767813be6da48c49a2edc792 Mon Sep 17 00:00:00 2001
From: r001 <rob@nyar.eu>
Date: Sun, 22 Oct 2023 03:23:02 +0200
Subject: [PATCH 0800/2704] feat: leo parser and queries (#5542)

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/leo/highlights.scm      | 177 ++++++++++++++++++++++++++++++++
 queries/leo/injections.scm      |   2 +
 4 files changed, 190 insertions(+)
 create mode 100644 queries/leo/highlights.scm
 create mode 100644 queries/leo/injections.scm

diff --git a/lockfile.json b/lockfile.json
index e2706fc6b..22a59021a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -323,6 +323,9 @@
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
+  "leo": {
+    "revision": "bf56a34745ee7a322442702f3aef2e633bb0b36c"
+  },
   "liquidsoap": {
     "revision": "4acf9035d852fc65e013f05f597635204e6d1ca5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 526a34cd7..47a1593e1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -984,6 +984,14 @@ list.ledger = {
   maintainers = { "@cbarrete" },
 }
 
+list.leo = {
+  install_info = {
+    url = "https://github.com/r001/tree-sitter-leo",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@r001" },
+}
+
 list.llvm = {
   install_info = {
     url = "https://github.com/benwilliamgraham/tree-sitter-llvm",
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
new file mode 100644
index 000000000..4114f41f9
--- /dev/null
+++ b/queries/leo/highlights.scm
@@ -0,0 +1,177 @@
+(variable) @variable
+
+[
+ "assert"
+ "assert_eq"
+ "assert_neq"
+ "block"
+ "console"
+ "const"
+ "let"
+ "mapping"
+ "program"
+ "record"
+ "self"
+ "struct"
+] @keyword
+
+ "in" @keyword.operator
+
+[
+ "constant"
+ "private"
+ "public"
+ ] @type.qualifier
+
+"self" @variable.builtin
+
+[
+ "finalize"
+ "function"
+ "inline"
+ "transition"
+] @keyword.function
+
+"import" @include
+
+"return" @keyword.return
+
+(return_arrow) @punctuation.delimiter
+
+"for" @repeat
+
+[ 
+  "else"
+  "if"
+  "then"
+] @conditional
+
+[
+ (ternary_if)
+ (ternary_else)
+] @conditional.ternary
+
+[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
+
+[ ";" "," "::"] @punctuation.delimiter
+
+[
+"!"
+
+"&&"
+"||"
+
+"=="
+"!="
+
+"<"
+"<="
+">"
+">="
+
+"&"
+"|"
+"^"
+
+"<<"
+">>"
+
+"+"
+"-"
+"*"
+"/"
+"%"
+"**"
+
+"="
+
+"+="
+"-="
+"*="
+"/="
+"%="
+"**="
+
+"<<="
+">>="
+
+"&="
+"|="
+"^="
+
+"&&="
+"||="
+
+] @operator
+
+(comment) @comment @spell
+
+(boolean_literal) @boolean
+
+(constant_declaration 
+  (identifier) @constant)
+
+[
+ (program_id)
+ (this_program_id)
+] @string.special
+
+;record declaration
+(record_declaration (identifier) @field) 
+
+;struct component 
+(struct_component_declaration 
+  (identifier) @field)
+
+(type) @type
+
+(associated_constant) @constant
+
+[
+ (block_height)
+ (self_caller)
+] @constant.builtin
+
+(free_function_call
+ (locator
+	(identifier) @function))
+
+(record_type
+ (locator
+	(identifier) @field))
+
+(transition_declaration
+  name: (identifier) @function.builtin)
+
+(free_function_call
+  (identifier) @function.call)
+
+(function_declaration
+  name: (identifier) @function)
+
+(inline_declaration
+  name: (identifier) @function.macro)
+
+(method_call
+  . (_)
+  . (identifier) @method.call)
+
+(function_parameter
+ (identifier) @parameter)
+
+(struct_declaration
+  name: (identifier) @field)
+
+(variable_declaration
+	(identifier_or_identifiers
+		(identifier) @variable))
+
+[ 
+  (address_literal)
+  (affine_group_literal) 
+  (field_literal) 
+  (product_group_literal) 
+  (scalar_literal) 
+  (signed_literal) 
+  (unsigned_literal) 
+] @number
diff --git a/queries/leo/injections.scm b/queries/leo/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/leo/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 2f15204510000c144b841b775c5db91e39b4f38e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 22 Oct 2023 02:02:45 +0000
Subject: [PATCH 0801/2704] Update README (#5558)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3c41a2f1c..ad3182ca9 100644
--- a/README.md
+++ b/README.md
@@ -281,6 +281,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) (maintained by @traxys)
 - [x] [latex](https://github.com/latex-lsp/tree-sitter-latex) (maintained by @theHamsta, @clason)
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
+- [x] [leo](https://github.com/r001/tree-sitter-leo) (maintained by @r001)
 - [x] [liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) (maintained by @toots)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)

From 6cb93819c9d7107f5e1ff704eb35d230858ec698 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 22 Oct 2023 00:37:11 -0400
Subject: [PATCH 0802/2704] feat: add GN (Generate Ninja)

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  9 ++++
 queries/gn/folds.scm            |  6 +++
 queries/gn/highlights.scm       | 74 +++++++++++++++++++++++++++++++++
 queries/gn/indents.scm          | 12 ++++++
 queries/gn/injections.scm       |  2 +
 queries/gn/locals.scm           |  6 +++
 8 files changed, 113 insertions(+)
 create mode 100644 queries/gn/folds.scm
 create mode 100644 queries/gn/highlights.scm
 create mode 100644 queries/gn/indents.scm
 create mode 100644 queries/gn/injections.scm
 create mode 100644 queries/gn/locals.scm

diff --git a/README.md b/README.md
index ad3182ca9..70a269b61 100644
--- a/README.md
+++ b/README.md
@@ -240,6 +240,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gleam](https://github.com/gleam-lang/tree-sitter-gleam) (maintained by @amaanq)
 - [x] [Glimmer and Ember](https://github.com/alexlafroscia/tree-sitter-glimmer) (maintained by @NullVoxPopuli)
 - [x] [glsl](https://github.com/theHamsta/tree-sitter-glsl) (maintained by @theHamsta)
+- [x] [GN (Generate Ninja)](https://github.com/amaanq/tree-sitter-gn) (maintained by @amaanq)
 - [x] [go](https://github.com/tree-sitter/tree-sitter-go) (maintained by @theHamsta, @WinWisely268)
 - [x] [Godot Resources (gdresource)](https://github.com/PrestonKnopp/tree-sitter-godot-resource) (maintained by @pierpo)
 - [x] [gomod](https://github.com/camdencheek/tree-sitter-go-mod) (maintained by @camdencheek)
diff --git a/lockfile.json b/lockfile.json
index 22a59021a..58dafe11e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -200,6 +200,9 @@
   "glsl": {
     "revision": "952739a25a7c014882aa777f1a32da8950f31f58"
   },
+  "gn": {
+    "revision": "492878ebee3552ac4631b064e02d19a00b894535"
+  },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 47a1593e1..82f3fd775 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -641,6 +641,15 @@ list.glsl = {
   maintainers = { "@theHamsta" },
 }
 
+list.gn = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-gn",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@amaanq" },
+  readme_name = "GN (Generate Ninja)",
+}
+
 list.go = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-go",
diff --git a/queries/gn/folds.scm b/queries/gn/folds.scm
new file mode 100644
index 000000000..352b0f0ec
--- /dev/null
+++ b/queries/gn/folds.scm
@@ -0,0 +1,6 @@
+[
+  (list)
+  (block)
+  (if_statement)
+  (else_statement)
+] @fold
diff --git a/queries/gn/highlights.scm b/queries/gn/highlights.scm
new file mode 100644
index 000000000..87082a30a
--- /dev/null
+++ b/queries/gn/highlights.scm
@@ -0,0 +1,74 @@
+; Includes
+
+"import" @include
+
+; Conditionals
+
+[
+  "if"
+  "else"
+] @conditional
+
+; Repeats
+
+"foreach" @repeat
+
+; Operators
+
+[
+  "="
+  "+="
+  "-="
+  "!"
+  "+"
+  "-"
+  "<"
+  "<="
+  ">"
+  ">="
+  "=="
+  "!="
+  "&&"
+  "||"
+] @operator
+
+; Variables
+
+(identifier) @variable
+
+; Functions
+
+(call_expression function: (identifier) @function.call)
+
+; Fields
+
+(scope_access field: (identifier) @field)
+
+; Literals
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+(expansion) @none
+
+(integer) @number
+
+(hex) @string.special
+
+(boolean) @boolean
+
+; Punctuation
+
+[ "{" "}" "[" "]" "(" ")" ] @punctuation.bracket
+
+[
+  "."
+  ","
+] @punctuation.delimiter
+
+(expansion ["$" "${" "}"] @punctuation.special)
+
+; Comments
+
+(comment) @comment
diff --git a/queries/gn/indents.scm b/queries/gn/indents.scm
new file mode 100644
index 000000000..82f44711d
--- /dev/null
+++ b/queries/gn/indents.scm
@@ -0,0 +1,12 @@
+[
+  (block)
+  (parenthesized_expression)
+] @indent.begin
+
+[
+  "}"
+  ")"
+  "]"
+] @indent.end @indent.branch
+
+(comment) @indent.auto
diff --git a/queries/gn/injections.scm b/queries/gn/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/gn/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/gn/locals.scm b/queries/gn/locals.scm
new file mode 100644
index 000000000..1350a2318
--- /dev/null
+++ b/queries/gn/locals.scm
@@ -0,0 +1,6 @@
+[
+  (source_file)
+  (block)
+] @scope
+
+(identifier) @reference

From 07dbb3845c33645046e25c53c2ec851ebdd26c73 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 22 Oct 2023 06:34:59 +0000
Subject: [PATCH 0803/2704] Update parsers: gn, leo, liquidsoap

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 58dafe11e..25852a9b0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -201,7 +201,7 @@
     "revision": "952739a25a7c014882aa777f1a32da8950f31f58"
   },
   "gn": {
-    "revision": "492878ebee3552ac4631b064e02d19a00b894535"
+    "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
   },
   "go": {
     "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
@@ -327,10 +327,10 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "bf56a34745ee7a322442702f3aef2e633bb0b36c"
+    "revision": "a3727051dd8e1d350667608190498f508c1cf6d6"
   },
   "liquidsoap": {
-    "revision": "4acf9035d852fc65e013f05f597635204e6d1ca5"
+    "revision": "01df7d97af6210071f3f125e072d62305501bc50"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"

From 0179a89656b4ce395a4487c07ae385b8425524ae Mon Sep 17 00:00:00 2001
From: Colin Kennedy <colinvfx@gmail.com>
Date: Sun, 22 Oct 2023 02:05:20 -0700
Subject: [PATCH 0804/2704] feat: add objdump to the supported languages
 (#5548)

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/objdump/highlights.scm  | 35 +++++++++++++++++++++++++++++++++
 queries/objdump/injections.scm  |  6 ++++++
 5 files changed, 53 insertions(+)
 create mode 100644 queries/objdump/highlights.scm
 create mode 100644 queries/objdump/injections.scm

diff --git a/README.md b/README.md
index 70a269b61..444e79e5f 100644
--- a/README.md
+++ b/README.md
@@ -305,6 +305,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [norg](https://github.com/nvim-neorg/tree-sitter-norg) (maintained by @JoeyGrajciar, @vhyrro)
 - [x] [nqc](https://github.com/amaanq/tree-sitter-nqc) (maintained by @amaanq)
 - [x] [objc](https://github.com/amaanq/tree-sitter-objc) (maintained by @amaanq)
+- [x] [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) (maintained by @ColinKennedy)
 - [x] [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) (maintained by @undu)
diff --git a/lockfile.json b/lockfile.json
index 25852a9b0..58a0ff759 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -395,6 +395,9 @@
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
   },
+  "objdump": {
+    "revision": "64e4741d58345c36ded639f5a3bcd7811be7f8f8"
+  },
   "ocaml": {
     "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 82f3fd775..3e4e39006 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1188,6 +1188,14 @@ list.objc = {
   maintainers = { "@amaanq" },
 }
 
+list.objdump = {
+  install_info = {
+    url = "https://github.com/ColinKennedy/tree-sitter-objdump",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@ColinKennedy" },
+}
+
 list.ocaml = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-ocaml",
diff --git a/queries/objdump/highlights.scm b/queries/objdump/highlights.scm
new file mode 100644
index 000000000..d23f5a0d9
--- /dev/null
+++ b/queries/objdump/highlights.scm
@@ -0,0 +1,35 @@
+(byte) @constant
+
+[
+  (hexadecimal)
+  (integer)
+  (address)
+] @number
+
+[
+  "file" "format"
+  "File" "Offset:"
+  "discriminator"
+] @text
+"Disassembly of section " @text.title
+
+(section_address) @number @text.underline
+
+(identifier) @variable
+(code_location (identifier) @function.call)
+(header (identifier) @keyword)
+(disassembly_section_label (identifier) @namespace)
+(disassembly_section (identifier) @namespace)
+
+[(file_offset) (discriminator)] @field
+
+(file_path) @string
+(instruction) @function
+(bad_instruction) @text.warning
+(label) @label
+
+["<" ">"] @punctuation.special
+["(" ")"] @punctuation.bracket
+["+" ":"] @punctuation.delimiter
+
+(comment) @comment.documentation
diff --git a/queries/objdump/injections.scm b/queries/objdump/injections.scm
new file mode 100644
index 000000000..9fb52dafe
--- /dev/null
+++ b/queries/objdump/injections.scm
@@ -0,0 +1,6 @@
+; TODO: https://github.com/nvim-treesitter/nvim-treesitter/pull/5548#issuecomment-1773707396
+;
+; To be added once a compatible Assembly parser is merged into nvim-treesitter
+;
+; ((instruction) @injection.content
+;  (#set! injection.language "asm"))

From 5c08a5301c0fa79016fa2b6aee57396eefab685b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 23 Oct 2023 06:37:19 +0000
Subject: [PATCH 0805/2704] Update parsers: leo, liquidsoap, perl, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 58a0ff759..e09fbba54 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -327,10 +327,10 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "a3727051dd8e1d350667608190498f508c1cf6d6"
+    "revision": "91d7aa606f524cf4f5df7f4aacb45b4056fac704"
   },
   "liquidsoap": {
-    "revision": "01df7d97af6210071f3f125e072d62305501bc50"
+    "revision": "4620ab746d1e9e5b6ebccaaa6afc5ebce06b4d75"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -423,7 +423,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "99bbcb0faddfc79db3fd2996cb56689a4685e78c"
+    "revision": "186906b7b03a0a4d9c4e27444b234320e9b470c9"
   },
   "php": {
     "revision": "0e02e7fab7913a0e77343edb347c8f17cac1f0ba"
@@ -678,7 +678,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2b00ad4c06f1f49257f1310b01f23a98dc117f77"
+    "revision": "8abdb5e1846a56004bcba6e1d9a735e22bb5fff4"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 0b50cf159283855b72f4c6b22f5ba3c9cf813b37 Mon Sep 17 00:00:00 2001
From: r001 <rob@nyar.eu>
Date: Mon, 23 Oct 2023 12:15:49 +0200
Subject: [PATCH 0806/2704] fix(leo): highlights fixes (#5563)

* make sure affine_group has priority, so parens and comma will not be miscolored; added `annotation` as @attribute

* `then` is not used as conditional, so moved to keywords

* finalize function highlight added

* differentiate between constant and variable variable identifiers
---
 queries/leo/highlights.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 4114f41f9..86939e168 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -1,4 +1,5 @@
-(variable) @variable
+(variable_identifier) @variable
+(constant_identifier) @constant
 
 [
  "assert"
@@ -13,6 +14,7 @@
  "record"
  "self"
  "struct"
+ "then"
 ] @keyword
 
  "in" @keyword.operator
@@ -43,7 +45,6 @@
 [ 
   "else"
   "if"
-  "then"
 ] @conditional
 
 [
@@ -143,6 +144,9 @@
 (transition_declaration
   name: (identifier) @function.builtin)
 
+(finalizer
+  name: (identifier) @function.builtin)
+
 (free_function_call
   (identifier) @function.call)
 
@@ -168,10 +172,12 @@
 
 [ 
   (address_literal)
-  (affine_group_literal) 
+  ((affine_group_literal) (#set! "priority" 101))
   (field_literal) 
   (product_group_literal) 
   (scalar_literal) 
   (signed_literal) 
   (unsigned_literal) 
 ] @number
+
+(annotation) @attribute

From 84544f5cd3b7c046ebe0db6763c9ce7f20f4fe23 Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Mon, 23 Oct 2023 21:40:18 +0300
Subject: [PATCH 0807/2704] chore(perl): update parser

---
 lockfile.json               | 2 +-
 queries/perl/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e09fbba54..b5e528550 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -423,7 +423,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "186906b7b03a0a4d9c4e27444b234320e9b470c9"
+    "revision": "495ea4b2bb2ca7ebc64c598e4a60d8c0856b2811"
   },
   "php": {
     "revision": "0e02e7fab7913a0e77343edb347c8f17cac1f0ba"
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 82d181183..ffd5ed392 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -72,7 +72,7 @@
  (regexp_content)
 ] @string.regex
 
-(autoquoted_bareword _?) @string.special
+(autoquoted_bareword) @string.special
 
 (use_statement (package) @type)
 (package_statement (package) @type)

From 74ea25f95db4dcc61b4311aac02461a075db9c61 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 23 Oct 2023 19:19:12 -0700
Subject: [PATCH 0808/2704] feat(lua): highlight variadic expressions as
 builtin parameters (#5567)

---
 queries/lua/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index ecc81b91e..94fcac504 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -181,6 +181,8 @@
 
 (parameters (identifier) @parameter)
 
+(vararg_expression) @parameter.builtin
+
 (function_declaration
   name: [
     (identifier) @function

From 9dca0a176dce444da4091e98aafe3b10ab2187f4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 07:16:19 +0000
Subject: [PATCH 0809/2704] Update parsers: liquidsoap, wing (#5568)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b5e528550..a16b49b05 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -330,7 +330,7 @@
     "revision": "91d7aa606f524cf4f5df7f4aacb45b4056fac704"
   },
   "liquidsoap": {
-    "revision": "4620ab746d1e9e5b6ebccaaa6afc5ebce06b4d75"
+    "revision": "38a5f0df32eba7e6da2868c3ebfa6280b4da992b"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -678,7 +678,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "8abdb5e1846a56004bcba6e1d9a735e22bb5fff4"
+    "revision": "6da8758e34eaed7ba964454ba91404e6aa9ba5fe"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 16af5ef490ff37407cc4241d7b8b8798d5b3a726 Mon Sep 17 00:00:00 2001
From: Teddytrombone <github@tmk-stgeorgen.at>
Date: Tue, 24 Oct 2023 09:48:33 +0200
Subject: [PATCH 0810/2704] feat(typoscript) Added parser and queries for
 TypoScript (#5564)

* Added configuration for TypoScript

* Removed duplicated code; Applied folding suggestion

* Applied suggestions

* Update queries/typoscript/highlights.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

---------

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 lockfile.json                     |  3 ++
 lua/nvim-treesitter/parsers.lua   |  8 ++++++
 queries/typoscript/folds.scm      |  1 +
 queries/typoscript/highlights.scm | 46 +++++++++++++++++++++++++++++++
 queries/typoscript/indents.scm    |  5 ++++
 queries/typoscript/injections.scm |  2 ++
 6 files changed, 65 insertions(+)
 create mode 100644 queries/typoscript/folds.scm
 create mode 100644 queries/typoscript/highlights.scm
 create mode 100644 queries/typoscript/indents.scm
 create mode 100644 queries/typoscript/injections.scm

diff --git a/lockfile.json b/lockfile.json
index a16b49b05..8d206fef4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -638,6 +638,9 @@
   "typescript": {
     "revision": "d847898fec3fe596798c9fda55cb8c05a799001a"
   },
+  "typoscript": {
+    "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
+  },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3e4e39006..c9ba50b37 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1874,6 +1874,14 @@ list.typescript = {
   maintainers = { "@steelsojka" },
 }
 
+list.typoscript = {
+  install_info = {
+    url = "https://github.com/Teddytrombone/tree-sitter-typoscript",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Teddytrombone" },
+}
+
 list.ungrammar = {
   install_info = {
     url = "https://github.com/Philipp-M/tree-sitter-ungrammar",
diff --git a/queries/typoscript/folds.scm b/queries/typoscript/folds.scm
new file mode 100644
index 000000000..fd7d23999
--- /dev/null
+++ b/queries/typoscript/folds.scm
@@ -0,0 +1 @@
+(block) @fold
diff --git a/queries/typoscript/highlights.scm b/queries/typoscript/highlights.scm
new file mode 100644
index 000000000..9ce80c680
--- /dev/null
+++ b/queries/typoscript/highlights.scm
@@ -0,0 +1,46 @@
+(identifier) @field
+
+(constant) @constant
+
+(modifier_function) @function
+(modifier_predefined) @function.builtin
+
+[
+  (condition) 
+  (condition_end) 
+  (condition_else)
+] @conditional
+
+(cobject) @type.builtin
+
+[
+  "@import"
+  "INCLUDE_TYPOSCRIPT"
+] @include
+
+[
+  (comment)
+  (single_line_comment)
+] @comment @spell
+
+[
+  (string)
+  (multiline_value)
+] @string
+
+[
+  "="
+  ">"
+  "<"
+  ":="
+  "=<"
+  (condition_bool)
+] @operator
+
+"," @punctuation.delimiter
+
+[
+ "("
+ ")"
+ (block_punctuation)
+ ] @punctuation.bracket
diff --git a/queries/typoscript/indents.scm b/queries/typoscript/indents.scm
new file mode 100644
index 000000000..f3d15b720
--- /dev/null
+++ b/queries/typoscript/indents.scm
@@ -0,0 +1,5 @@
+(block) @indent.begin
+
+"}" @indent.branch @indent.end 
+
+(comment) @indent.ignore
diff --git a/queries/typoscript/injections.scm b/queries/typoscript/injections.scm
new file mode 100644
index 000000000..6adae45a2
--- /dev/null
+++ b/queries/typoscript/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content 
+ (#set! injection.language "comment"))

From 4199be485cd85662d8ff1dc8c4cc78d819fad6cd Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Tue, 24 Oct 2023 07:48:45 +0000
Subject: [PATCH 0811/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 444e79e5f..7bc6a8007 100644
--- a/README.md
+++ b/README.md
@@ -386,6 +386,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [turtle](https://github.com/BonaBeavis/tree-sitter-turtle) (maintained by @BonaBeavis)
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
+- [x] [typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) (maintained by @Teddytrombone)
 - [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
 - [x] [unison](https://github.com/kylegoetz/tree-sitter-unison) (maintained by @tapegram)
 - [x] [usd](https://github.com/ColinKennedy/tree-sitter-usd) (maintained by @ColinKennedy)

From 44762abc90725e279f3b9cfbe4cafb41ea72f09b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 25 Oct 2023 06:36:36 +0000
Subject: [PATCH 0812/2704] Update parsers: kotlin, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8d206fef4..e2e7c54d2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
-    "revision": "5baa0fe2288830f88bd38e328b08d829f3914164"
+    "revision": "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8"
   },
   "lalrpop": {
     "revision": "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"
@@ -681,7 +681,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6da8758e34eaed7ba964454ba91404e6aa9ba5fe"
+    "revision": "2419590a7bd116fcfdd0b7f71bd6a01ea216e90b"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 107e61afb7129d637ea6c3c68b97a22194b0bf16 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 25 Oct 2023 16:45:14 +0900
Subject: [PATCH 0813/2704] refactor: Remove all `(ERROR) @error` captures

As discussed in PR#5421, capturing `@error` is inconsistent, requiring
deep nesting (or priority) in order to correctly have red backgrounds to
it.

Some queries has this capture, some don't. For consistency purposes,
removing all of them is more preferable.

For re-enabling error, either add `(ERROR) @error` or `(ERROR _ @error)`
to your custom queries.
---
 queries/ada/highlights.scm            | 6 ------
 queries/bitbake/highlights.scm        | 2 --
 queries/c/highlights.scm              | 2 --
 queries/cairo/highlights.scm          | 4 ----
 queries/capnp/highlights.scm          | 4 ----
 queries/chatito/highlights.scm        | 4 ----
 queries/corn/highlights.scm           | 2 --
 queries/cpon/highlights.scm           | 4 ----
 queries/css/highlights.scm            | 2 --
 queries/cue/highlights.scm            | 4 ----
 queries/dart/highlights.scm           | 3 ---
 queries/dot/highlights.scm            | 2 --
 queries/dtd/highlights.scm            | 2 --
 queries/eex/highlights.scm            | 3 ---
 queries/elixir/highlights.scm         | 3 ---
 queries/firrtl/highlights.scm         | 3 ---
 queries/fish/highlights.scm           | 5 -----
 queries/forth/highlights.scm          | 2 --
 queries/fortran/highlights.scm        | 4 ----
 queries/gdscript/highlights.scm       | 1 -
 queries/gitattributes/highlights.scm  | 2 --
 queries/gitcommit/highlights.scm      | 2 --
 queries/gleam/highlights.scm          | 3 ---
 queries/go/highlights.scm             | 4 ----
 queries/godot_resource/highlights.scm | 2 --
 queries/gpg/highlights.scm            | 2 --
 queries/gstlaunch/highlights.scm      | 2 --
 queries/hack/highlights.scm           | 2 --
 queries/hare/highlights.scm           | 4 ----
 queries/hcl/highlights.scm            | 2 --
 queries/heex/highlights.scm           | 3 ---
 queries/hjson/highlights.scm          | 1 -
 queries/http/highlights.scm           | 4 ----
 queries/json/highlights.scm           | 2 --
 queries/json5/highlights.scm          | 2 --
 queries/jsonnet/highlights.scm        | 3 ---
 queries/kconfig/highlights.scm        | 2 --
 queries/latex/highlights.scm          | 1 -
 queries/llvm/highlights.scm           | 2 --
 queries/lua/highlights.scm            | 3 ---
 queries/luau/highlights.scm           | 4 ----
 queries/matlab/highlights.scm         | 4 ----
 queries/menhir/highlights.scm         | 1 -
 queries/ocaml/highlights.scm          | 2 --
 queries/ocamllex/highlights.scm       | 1 -
 queries/odin/highlights.scm           | 4 ----
 queries/pem/highlights.scm            | 2 --
 queries/perl/highlights.scm           | 2 --
 queries/php/highlights.scm            | 2 --
 queries/po/highlights.scm             | 4 ----
 queries/pony/highlights.scm           | 4 ----
 queries/promql/highlights.scm         | 2 --
 queries/puppet/highlights.scm         | 4 ----
 queries/pymanifest/highlights.scm     | 2 --
 queries/python/highlights.scm         | 3 ---
 queries/r/highlights.scm              | 3 ---
 queries/racket/highlights.scm         | 2 --
 queries/rasi/highlights.scm           | 2 --
 queries/re2c/highlights.scm           | 2 --
 queries/requirements/highlights.scm   | 2 --
 queries/rnoweb/highlights.scm         | 2 --
 queries/ron/highlights.scm            | 1 -
 queries/rst/highlights.scm            | 2 --
 queries/ruby/highlights.scm           | 2 --
 queries/smali/highlights.scm          | 4 ----
 queries/solidity/highlights.scm       | 4 ----
 queries/ssh_config/highlights.scm     | 2 --
 queries/starlark/highlights.scm       | 3 ---
 queries/strace/highlights.scm         | 2 --
 queries/tablegen/highlights.scm       | 4 ----
 queries/teal/highlights.scm           | 3 ---
 queries/thrift/highlights.scm         | 4 ----
 queries/toml/highlights.scm           | 2 --
 queries/ungrammar/highlights.scm      | 2 --
 queries/v/highlights.scm              | 4 ----
 queries/verilog/highlights.scm        | 2 --
 queries/wgsl/highlights.scm           | 2 --
 queries/yaml/highlights.scm           | 1 -
 queries/yuck/highlights.scm           | 4 ----
 queries/zig/highlights.scm            | 3 ---
 80 files changed, 215 deletions(-)
 delete mode 100644 queries/rnoweb/highlights.scm

diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index a350d31d9..694763073 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -188,9 +188,3 @@
 (enumeration_type_definition 
   (identifier)
   . (comment) @comment.documentation)
-
-;; Highlight errors in red. This is not very useful in practice, as text will
-;; be highlighted as user types, and the error could be elsewhere in the code.
-;; This also requires defining    :hi @error guifg=Red    for instance.
-(ERROR) @error
-
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index eb37b1b36..d61889acd 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -356,5 +356,3 @@
               "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 
 (comment) @comment @spell
-
-(ERROR) @error
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 4acdaed99..74656e336 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -282,5 +282,3 @@
   (ms_pointer_modifier)
   (attribute_declaration)
 ] @attribute
-
-(ERROR) @error
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index 0f68121ae..715644fcc 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -332,7 +332,3 @@
 ; Comment
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm
index 780f03675..f3954ae8c 100644
--- a/queries/capnp/highlights.scm
+++ b/queries/capnp/highlights.scm
@@ -148,7 +148,3 @@
 ; Comments
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/chatito/highlights.scm b/queries/chatito/highlights.scm
index f933f43c3..12a344523 100644
--- a/queries/chatito/highlights.scm
+++ b/queries/chatito/highlights.scm
@@ -48,7 +48,3 @@
 ;; Comment
 
 (comment) @comment @spell
-
-;; Error
-
-(ERROR) @error
diff --git a/queries/corn/highlights.scm b/queries/corn/highlights.scm
index 66873492f..200c33e1b 100644
--- a/queries/corn/highlights.scm
+++ b/queries/corn/highlights.scm
@@ -18,5 +18,3 @@
 (float) @float
 (boolean) @boolean
 (null) @keyword
-
-(ERROR) @error
diff --git a/queries/cpon/highlights.scm b/queries/cpon/highlights.scm
index 807714a0f..36df3555c 100644
--- a/queries/cpon/highlights.scm
+++ b/queries/cpon/highlights.scm
@@ -44,7 +44,3 @@
 ; Comments
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index b26f0ec96..8a7cba160 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -87,5 +87,3 @@
  "("
  "}"
  ] @punctuation.bracket
-
-(ERROR) @error
diff --git a/queries/cue/highlights.scm b/queries/cue/highlights.scm
index 8e626d63c..00088dec9 100644
--- a/queries/cue/highlights.scm
+++ b/queries/cue/highlights.scm
@@ -158,7 +158,3 @@
 ; Comments
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index b5a4bd62a..3ebdae0ea 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -268,6 +268,3 @@
 ] @exception
 
 ["do" "while" "continue" "for"] @repeat
-
-; Error
-(ERROR) @error
diff --git a/queries/dot/highlights.scm b/queries/dot/highlights.scm
index d8b70a949..6916d3721 100644
--- a/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -51,5 +51,3 @@
 (preproc) @preproc
 
 (comment) @spell
-
-(ERROR) @error
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index ba34f0bfe..678e61f92 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -117,5 +117,3 @@
 [ "INCLUDE" "IGNORE" ] @include
 
 (Comment) @comment @spell
-
-(ERROR) @error
diff --git a/queries/eex/highlights.scm b/queries/eex/highlights.scm
index 29b733e89..d032a7486 100644
--- a/queries/eex/highlights.scm
+++ b/queries/eex/highlights.scm
@@ -10,6 +10,3 @@
 
 ; EEx comments are highlighted as such
 (comment) @comment @spell
-
-; Tree-sitter parser errors
-(ERROR) @error
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 60a6f3156..0fbde2959 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -19,9 +19,6 @@
   "%"
 ] @punctuation.special
 
-; Parser Errors
-(ERROR) @error
-
 ; Identifiers
 (identifier) @variable
 
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index 551b2e751..ace8f712e 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -184,6 +184,3 @@
 (comment) @comment @spell
 
 ["=>" "<=" "="] @operator
-
-; Error
-(ERROR) @error
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index d12cbd781..8d0fba29a 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -161,8 +161,3 @@
 
 ((program . (comment) @preproc)
   (#lua-match? @preproc "^#!/"))
-
-;; Error
-
-(ERROR) @error
-
diff --git a/queries/forth/highlights.scm b/queries/forth/highlights.scm
index c2c5c3801..1e7207597 100644
--- a/queries/forth/highlights.scm
+++ b/queries/forth/highlights.scm
@@ -17,5 +17,3 @@
 ] @punctuation.delimiter
 
 (comment) @comment @spell
-
-(ERROR) @error
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index a6b55413b..3e85212bd 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -326,7 +326,3 @@
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^!>"))
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index a6581bb97..535dcd009 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -1,5 +1,4 @@
 ;; Basic
-(ERROR) @error
 
 (identifier) @variable
 (name) @variable
diff --git a/queries/gitattributes/highlights.scm b/queries/gitattributes/highlights.scm
index 73ec71438..5d044b356 100644
--- a/queries/gitattributes/highlights.scm
+++ b/queries/gitattributes/highlights.scm
@@ -48,6 +48,4 @@
   (trailing_slash)
 ] @error
 
-(ERROR) @error
-
 (comment) @comment @spell
diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index ff0c4ddb3..15ba85ef8 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -29,5 +29,3 @@
 (breaking_change (value) @text @spell)
 
 (scissor) @comment
-
-(ERROR) @error
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index 051cbffc0..bc392dec4 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -167,6 +167,3 @@
 
 ; Pipe Operator
 (binary_expression operator: "|>" right: (identifier) @function)
-
-; Parser Errors
-(ERROR) @error
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 4dc5649f3..65c00ea27 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -245,10 +245,6 @@
   (comment)+ @comment.documentation
   . (var_declaration))
 
-; Errors
-
-(ERROR) @error
-
 ; Spell
 
 ((interpreted_string_literal) @spell
diff --git a/queries/godot_resource/highlights.scm b/queries/godot_resource/highlights.scm
index 005ddaacb..848fbbe1f 100644
--- a/queries/godot_resource/highlights.scm
+++ b/queries/godot_resource/highlights.scm
@@ -24,5 +24,3 @@
 ] @punctuation.bracket
 
 "=" @operator
-
-(ERROR) @error
diff --git a/queries/gpg/highlights.scm b/queries/gpg/highlights.scm
index 55833027e..fb70ba135 100644
--- a/queries/gpg/highlights.scm
+++ b/queries/gpg/highlights.scm
@@ -45,5 +45,3 @@
 [ "\"" "'" "," ] @punctuation.delimiter
 
 (comment) @comment @spell
-
-(ERROR) @error
diff --git a/queries/gstlaunch/highlights.scm b/queries/gstlaunch/highlights.scm
index a6db82fdb..8fc8d2198 100644
--- a/queries/gstlaunch/highlights.scm
+++ b/queries/gstlaunch/highlights.scm
@@ -28,5 +28,3 @@
   type: (_) @type)
 (bin
   type: (_) @type)
-
-(ERROR) @error
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index a75b166ca..efe5631a6 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -313,5 +313,3 @@
  (xhp_open)
  (xhp_close)
 ] @tag
-
-(ERROR) @error
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index 063af31b3..f331da910 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -249,7 +249,3 @@
 ; Comments
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
index ba22f99d7..4cc822abd 100644
--- a/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -95,5 +95,3 @@
 ;
 ; first element in get_attr is a variable.builtin or a reference to a variable.builtin
 (expression (variable_expr (identifier) @variable.builtin) (get_attr (identifier) @field))
-
-(ERROR) @error
diff --git a/queries/heex/highlights.scm b/queries/heex/highlights.scm
index fe85a0652..ed8efb906 100644
--- a/queries/heex/highlights.scm
+++ b/queries/heex/highlights.scm
@@ -32,9 +32,6 @@
 ; HEEx text content is treated as markup
 (text) @text
 
-; Tree-sitter parser errors
-(ERROR) @error
-
 ; HEEx tags and slots are highlighted as HTML
 [
  (tag_name) 
diff --git a/queries/hjson/highlights.scm b/queries/hjson/highlights.scm
index 8d5f5998d..6e092fa14 100644
--- a/queries/hjson/highlights.scm
+++ b/queries/hjson/highlights.scm
@@ -6,7 +6,6 @@
 (pair value: (string) @string)
 (array (string) @string)
 ;  (string_content (escape_sequence) @string.escape)
-(ERROR) @error
 ;  "," @punctuation.delimiter
 "[" @punctuation.bracket
 "]" @punctuation.bracket
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index e89b4dc7f..e03f61253 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -54,7 +54,3 @@
 ; Comments
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/json/highlights.scm b/queries/json/highlights.scm
index 6163b2092..36c8f7a10 100644
--- a/queries/json/highlights.scm
+++ b/queries/json/highlights.scm
@@ -12,8 +12,6 @@
 
 (array (string) @string)
 
-(ERROR) @error
-
 ["," ":"] @punctuation.delimiter
 
 [
diff --git a/queries/json5/highlights.scm b/queries/json5/highlights.scm
index 653a48ef5..6d53c7bfc 100644
--- a/queries/json5/highlights.scm
+++ b/queries/json5/highlights.scm
@@ -13,5 +13,3 @@
 
 (member
     name: (_) @keyword)
-
-(ERROR) @error
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index 2ec60d0a7..e7ea6d8bb 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -116,6 +116,3 @@
       (id) @parameter
     ))?
   ")")
-
-; ERROR
-(ERROR) @error
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index 71889cb5e..2e7c401a1 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -77,5 +77,3 @@
 (source (prompt) @text.uri @string.special)
 
 (comment) @comment @spell
-
-(ERROR) @error
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 8bb8fb10c..d0283c2e7 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -1,5 +1,4 @@
 ;; General syntax
-(ERROR) @error
 
 (command_name) @function
 (caption
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index c788aaafd..37a31a3bb 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -162,5 +162,3 @@
   "none"
   "zeroinitializer"
 ] @constant.builtin
-
-(ERROR) @error
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 94fcac504..1af8e9aec 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -247,6 +247,3 @@
 (string) @string
 
 (escape_sequence) @string.escape
-
-;; Error
-(ERROR) @error
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 96788ecc3..7a6bc2e35 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -246,7 +246,3 @@
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^[-][-](%s?)@"))
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index 8dd10d6a9..9f8303a3d 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -148,7 +148,3 @@
 ; Comments
 
 [ (comment) (line_continuation) ] @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/menhir/highlights.scm b/queries/menhir/highlights.scm
index 14bd2ea8d..8b4b41d59 100644
--- a/queries/menhir/highlights.scm
+++ b/queries/menhir/highlights.scm
@@ -26,4 +26,3 @@
 (ocaml) @none
 
 [(comment) (line_comment) (ocaml_comment)] @comment @spell
-(ERROR) @error
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 309fdd73c..e263d833e 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -173,5 +173,3 @@
 ;---------
 
 [(comment) (line_number_directive) (directive) (shebang)] @comment @spell
-
-(ERROR) @error
diff --git a/queries/ocamllex/highlights.scm b/queries/ocamllex/highlights.scm
index 3673206ae..248470821 100644
--- a/queries/ocamllex/highlights.scm
+++ b/queries/ocamllex/highlights.scm
@@ -38,4 +38,3 @@
 ; Misc
 
 (comment) @comment @spell
-(ERROR) @error
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index e9ded5397..bdc557df2 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -287,7 +287,3 @@
   (comment)
   (block_comment)
 ] @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/pem/highlights.scm b/queries/pem/highlights.scm
index 82289c6a9..f5d0d70f0 100644
--- a/queries/pem/highlights.scm
+++ b/queries/pem/highlights.scm
@@ -7,5 +7,3 @@
 (data) @none
 
 (comment) @comment @spell
-
-(ERROR) @error
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index ffd5ed392..7f9077a0d 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -103,8 +103,6 @@
 
 (function) @function
 
-(ERROR) @error
-
 (_
   "{" @punctuation.special
   (varname)
diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index e284d16b0..427ab4838 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -319,5 +319,3 @@
   "@"
   "::"
 ] @operator
-
-(ERROR) @error
diff --git a/queries/po/highlights.scm b/queries/po/highlights.scm
index bddeb5ba9..307e32059 100644
--- a/queries/po/highlights.scm
+++ b/queries/po/highlights.scm
@@ -27,7 +27,3 @@
 (comment (reference (text) @string.special.path))
 
 (comment (flag (text) @preproc))
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
index 1968693f4..18c3975ea 100644
--- a/queries/pony/highlights.scm
+++ b/queries/pony/highlights.scm
@@ -286,7 +286,3 @@
   (line_comment)
   (block_comment)
 ] @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/promql/highlights.scm b/queries/promql/highlights.scm
index 024b7703b..47038034a 100644
--- a/queries/promql/highlights.scm
+++ b/queries/promql/highlights.scm
@@ -38,5 +38,3 @@
 (function_name) @function.call
 
 (comment) @comment @spell
-(ERROR) @error
-
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index dc3a1a3f3..196aa9dbd 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -189,7 +189,3 @@
 ; Comments
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/pymanifest/highlights.scm b/queries/pymanifest/highlights.scm
index 2205509ab..0f76a9383 100644
--- a/queries/pymanifest/highlights.scm
+++ b/queries/pymanifest/highlights.scm
@@ -17,6 +17,4 @@
 
 (escaped_char) @string.escape
 
-(ERROR) @error
-
 (comment) @comment @spell
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 04398668e..de98dccbf 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -346,6 +346,3 @@
               ;; https://docs.python.org/3/library/stdtypes.html
               "bool" "int" "float" "complex" "list" "tuple" "range" "str"
               "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
-
-;; Error
-(ERROR) @error
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index ca784e647..9d837ba83 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -139,6 +139,3 @@
 
 (call
   function: ((dollar _ (identifier) @method.call)))
-
-; Error
-(ERROR) @error
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index af0650334..4448397ae 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -6,8 +6,6 @@
 ;;                         Basic highlights                         ;;
 ;;------------------------------------------------------------------;;
 
-(ERROR) @error
-
 ;; basic ;;
 
 (number) @number
diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index 7936d99ed..6485a5f9e 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -78,5 +78,3 @@
 (environ_value "env" @function.builtin (identifier) @variable)
 
 (property_name) @variable
-
-(ERROR) @error
diff --git a/queries/re2c/highlights.scm b/queries/re2c/highlights.scm
index 6d3a27f5a..fd59c7208 100644
--- a/queries/re2c/highlights.scm
+++ b/queries/re2c/highlights.scm
@@ -186,5 +186,3 @@
   (comment)
   (ignore_block)
 ] @comment @spell
-
-(ERROR) @error
diff --git a/queries/requirements/highlights.scm b/queries/requirements/highlights.scm
index 04942ca68..3d3d20d91 100644
--- a/queries/requirements/highlights.scm
+++ b/queries/requirements/highlights.scm
@@ -42,6 +42,4 @@
 
 (linebreak) @character.special
 
-(ERROR) @error
-
 (comment) @comment @spell
diff --git a/queries/rnoweb/highlights.scm b/queries/rnoweb/highlights.scm
deleted file mode 100644
index 4bed5c94e..000000000
--- a/queries/rnoweb/highlights.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-;; General syntax
-;(ERROR) @error
diff --git a/queries/ron/highlights.scm b/queries/ron/highlights.scm
index 869264305..7f5b9030f 100644
--- a/queries/ron/highlights.scm
+++ b/queries/ron/highlights.scm
@@ -50,4 +50,3 @@
 ;------------
 
 (escape_sequence) @string.escape
-(ERROR) @error
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index 759087130..3231262c2 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -167,5 +167,3 @@
         (#not-any-of? @_directive "code" "code-block" "sourcecode")))
 
 (paragraph) @spell
-
-(ERROR) @error
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 3479ad80d..727c0fc50 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -255,5 +255,3 @@
 (interpolation
   "#{" @punctuation.special
   "}" @punctuation.special) @none
-
-(ERROR) @error
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 2e2b84b8b..3b6035c09 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -212,7 +212,3 @@
 
 (class_definition
   (comment) @comment.documentation)
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 82cf4fc73..f537cfab2 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -258,7 +258,3 @@
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/ssh_config/highlights.scm b/queries/ssh_config/highlights.scm
index d6b060f56..8de836b17 100644
--- a/queries/ssh_config/highlights.scm
+++ b/queries/ssh_config/highlights.scm
@@ -68,8 +68,6 @@
 
 (comment) @comment @spell
 
-(ERROR) @error
-
 ; Punctuation
 
 [ "${" "}" ] @punctuation.special
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 66ca4e8dd..055fad16f 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -262,9 +262,6 @@
 
 ["," "." ":" ";" (ellipsis)] @punctuation.delimiter
 
-;; Error
-(ERROR) @error
-
 ;; Starlark-specific
 
 ;; Assertion calls
diff --git a/queries/strace/highlights.scm b/queries/strace/highlights.scm
index f45ef31c9..8967542a4 100644
--- a/queries/strace/highlights.scm
+++ b/queries/strace/highlights.scm
@@ -50,5 +50,3 @@
 ] @punctuation.delimiter
 
 (comment) @comment @spell
-
-(ERROR) @error
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index b0b4b000c..c541cd165 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -150,7 +150,3 @@
 
 ((comment) @preproc
   (#lua-match? @preproc "^.*RUN"))
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index 4af3e212b..b6b79dec5 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -130,6 +130,3 @@
 ;    (string (format_specifier) @string.escape)
 ;    key: (identifier) @func-name)
 ;    (#eq? @func-name "format"))
-
-
-(ERROR) @error
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 2c963f5bc..6c68dc9a3 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -224,7 +224,3 @@
 
 ((comment) @preproc
   (#lua-match? @preproc "#!.*"))
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index 5255a20ab..fd6fe7309 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -32,5 +32,3 @@
 "]]" @punctuation.bracket
 "{" @punctuation.bracket
 "}" @punctuation.bracket
-
-(ERROR) @error
diff --git a/queries/ungrammar/highlights.scm b/queries/ungrammar/highlights.scm
index c441eab70..60355f577 100644
--- a/queries/ungrammar/highlights.scm
+++ b/queries/ungrammar/highlights.scm
@@ -26,5 +26,3 @@
   "("
   ")"
 ] @punctuation.bracket
-
-(ERROR) @error
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 0fb3074fa..b90749590 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -461,7 +461,3 @@
 (_
   (comment)+ @comment.documentation
   [(function_declaration) (type_declaration) (enum_declaration)])
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 86952becf..6d27863f6 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -311,5 +311,3 @@
   "("
   ")"
 ] @punctuation.bracket
-
-(ERROR) @error
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index d2fa7409a..c440bf0fe 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -102,5 +102,3 @@
     (identifier) @attribute)
 
 [(line_comment) (block_comment)] @comment @spell
-
-(ERROR) @error
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index fb3338eb3..0fa633dbd 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -11,7 +11,6 @@
 (anchor_name) @type
 (alias_name) @type
 (tag) @type
-(ERROR) @error
 
 [
   (yaml_directive)
diff --git a/queries/yuck/highlights.scm b/queries/yuck/highlights.scm
index 0caf78c84..16e90441f 100644
--- a/queries/yuck/highlights.scm
+++ b/queries/yuck/highlights.scm
@@ -144,7 +144,3 @@
 ; Comments
 
 (comment) @comment @spell
-
-; Errors
-
-(ERROR) @error
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 9e558d74d..9ba764b10 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -227,6 +227,3 @@ field_constant: (IDENTIFIER) @constant
   (PtrPayload "|")
   (PtrIndexPayload "|")
 ] @punctuation.bracket
-
-; Error
-(ERROR) @error

From 2e6961ff9d975cebce0b255d6e2205dcc841cf8f Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 26 Oct 2023 06:36:34 +0000
Subject: [PATCH 0814/2704] Update parsers: glsl, perl, php, sql, t32, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e2e7c54d2..b87feff6c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
   },
   "glsl": {
-    "revision": "952739a25a7c014882aa777f1a32da8950f31f58"
+    "revision": "bea82d337801e472e35b5cd08038afdf13263768"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -423,10 +423,10 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "495ea4b2bb2ca7ebc64c598e4a60d8c0856b2811"
+    "revision": "e5160db0dd628602b4df55d6e46889baecb2a01c"
   },
   "php": {
-    "revision": "0e02e7fab7913a0e77343edb347c8f17cac1f0ba"
+    "revision": "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
@@ -561,7 +561,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "caf2938f1bc6b174e5bf5b6f3b5522cb723ee55b"
+    "revision": "17e985d5ec306b7e6f094e47111b52cfd9503955"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -594,7 +594,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a"
+    "revision": "64e64e201bc8b8e0a09f5b95a66dd8831375e3b3"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -681,7 +681,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2419590a7bd116fcfdd0b7f71bd6a01ea216e90b"
+    "revision": "22a07719a928074eaee0b3e314acc17869e44531"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 3954741f2652fbcef9d6877d0e3a4d91d44b1632 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 27 Oct 2023 00:35:34 +0300
Subject: [PATCH 0815/2704] chore(sql): add scanner

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c9ba50b37..58796506c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1653,7 +1653,7 @@ list.sparql = {
 list.sql = {
   install_info = {
     url = "https://github.com/derekstride/tree-sitter-sql",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
     branch = "gh-pages",
   },
   maintainers = { "@derekstride" },

From 1e58a81450f8711d4d3fe7870e6b7b64bba02d77 Mon Sep 17 00:00:00 2001
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
Date: Fri, 27 Oct 2023 09:28:44 -0300
Subject: [PATCH 0816/2704] Fix Julia indentation after end and with
 parenthesis at the beginning of line (#5579)

---
 queries/julia/indents.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm
index 142dee473..9da8af357 100644
--- a/queries/julia/indents.scm
+++ b/queries/julia/indents.scm
@@ -26,9 +26,11 @@
 
 [
   "end"
-  "("
+] @indent.end
+
+[
+  "end"
   ")"
-  "["
   "]"
   (else_clause)
   (elseif_clause)

From a07ce2155be3648a0ea9b2fe767ec5ab1a8b299b Mon Sep 17 00:00:00 2001
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
Date: Fri, 27 Oct 2023 09:53:58 -0300
Subject: [PATCH 0817/2704] Fix indent. of curly expressions and of ],} in BOL
 (#5580)

---
 queries/julia/indents.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm
index 9da8af357..d854b937b 100644
--- a/queries/julia/indents.scm
+++ b/queries/julia/indents.scm
@@ -22,16 +22,21 @@
   (comprehension_expression)
   (matrix_expression)
   (vector_expression)
+  (curly_expression)
 ] @indent.begin
 
 [
   "end"
+  ")"
+  "]"
+  "}"
 ] @indent.end
 
 [
   "end"
   ")"
   "]"
+  "}"
   (else_clause)
   (elseif_clause)
   (catch_clause)

From bf0a96568a54618138ac42c84758945cdafef86b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 27 Oct 2023 06:36:02 +0000
Subject: [PATCH 0818/2704] Update parsers: gitattributes, t32, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b87feff6c..00a8c16f7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -183,7 +183,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "2339ffe87a88d0b7838c015592c8269eb0063140"
+    "revision": "f58a4a4bc55b9b43dfa7c4106257422764f97776"
   },
   "gitcommit": {
     "revision": "6856a5fd0ffeff17d83325a8ce4e57811010eff1"
@@ -594,7 +594,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "64e64e201bc8b8e0a09f5b95a66dd8831375e3b3"
+    "revision": "884a034e0ae29ce72649041a603deacdfb4a3275"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -681,7 +681,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "22a07719a928074eaee0b3e314acc17869e44531"
+    "revision": "e71fee95e97cc9f7f8e5efcef36f99bfe066901a"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 639c22c52ca2c76c6016de746836eca20145ea8c Mon Sep 17 00:00:00 2001
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
Date: Sat, 28 Oct 2023 10:23:50 -0300
Subject: [PATCH 0819/2704] Improve indentation in Julia language

This commit improves the indentation in the function declaration,
function call, and in the assignment expressions.
---
 queries/julia/indents.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm
index d854b937b..7e9794233 100644
--- a/queries/julia/indents.scm
+++ b/queries/julia/indents.scm
@@ -15,8 +15,8 @@
   (assignment)
   (for_binding)
 
-  (binary_expression)
   (call_expression)
+  (parenthesized_expression)
 
   (tuple_expression)
   (comprehension_expression)
@@ -48,3 +48,10 @@
   (block_comment)
 ] @indent.ignore
 
+((argument_list) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+((parameter_list) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))

From fc3bfd8f89a9a9ec088d686c68e45a35106df4de Mon Sep 17 00:00:00 2001
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
Date: Sat, 28 Oct 2023 16:47:18 -0300
Subject: [PATCH 0820/2704] Add initial tests for Julia language indentation

---
 tests/indent/julia/argument_list.jl  | 13 +++++++++++++
 tests/indent/julia/assignment.jl     | 11 +++++++++++
 tests/indent/julia/parameter_list.jl | 15 +++++++++++++++
 tests/indent/julia_spec.lua          | 17 +++++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 tests/indent/julia/argument_list.jl
 create mode 100644 tests/indent/julia/assignment.jl
 create mode 100644 tests/indent/julia/parameter_list.jl
 create mode 100644 tests/indent/julia_spec.lua

diff --git a/tests/indent/julia/argument_list.jl b/tests/indent/julia/argument_list.jl
new file mode 100644
index 000000000..747a36efc
--- /dev/null
+++ b/tests/indent/julia/argument_list.jl
@@ -0,0 +1,13 @@
+function test(a::Number,
+              b::Float64,
+              c::Union{Float64, Integer},
+              d::Bool)
+end
+
+function test(
+    a::Number,
+    b::Float64,
+    c::Union{Float64, Integer},
+    d::Bool
+)
+end
diff --git a/tests/indent/julia/assignment.jl b/tests/indent/julia/assignment.jl
new file mode 100644
index 000000000..798b889de
--- /dev/null
+++ b/tests/indent/julia/assignment.jl
@@ -0,0 +1,11 @@
+my_variable =
+    1 + 2 - 3 *
+    4 / 5 %
+    6
+
+function test()
+    my_variable =
+        1 + 2 - 3 *
+        4 / 5 %
+        6
+end
diff --git a/tests/indent/julia/parameter_list.jl b/tests/indent/julia/parameter_list.jl
new file mode 100644
index 000000000..fc9e6d262
--- /dev/null
+++ b/tests/indent/julia/parameter_list.jl
@@ -0,0 +1,15 @@
+function test(a, b, c, d, e)
+    vcat(a,
+         b,
+         c,
+         d,
+         e)
+
+    vcat(
+        a,
+        b,
+        c,
+        d,
+        e
+    )
+end
diff --git a/tests/indent/julia_spec.lua b/tests/indent/julia_spec.lua
new file mode 100644
index 000000000..a89f9f493
--- /dev/null
+++ b/tests/indent/julia_spec.lua
@@ -0,0 +1,17 @@
+local Runner = require("tests.indent.common").Runner
+local XFAIL = require("tests.indent.common").XFAIL
+
+local run = Runner:new(it, "tests/indent/julia", {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 4,
+  expandtab = true,
+})
+
+describe("indent Julia:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+end)

From 3d6c0af936e4a9ba01378eeabf7c85dd16fa7a65 Mon Sep 17 00:00:00 2001
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
Date: Sat, 28 Oct 2023 16:49:01 -0300
Subject: [PATCH 0821/2704] Fix tests

---
 tests/indent/julia_spec.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/indent/julia_spec.lua b/tests/indent/julia_spec.lua
index a89f9f493..538685307 100644
--- a/tests/indent/julia_spec.lua
+++ b/tests/indent/julia_spec.lua
@@ -1,5 +1,5 @@
 local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+-- local XFAIL = require("tests.indent.common").XFAIL
 
 local run = Runner:new(it, "tests/indent/julia", {
   tabstop = 4,

From a741b5dd0d76a7167e62ff320a787e93c87cb17d Mon Sep 17 00:00:00 2001
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
Date: Sat, 28 Oct 2023 17:25:25 -0300
Subject: [PATCH 0822/2704] Improve curly expression alignment

---
 queries/julia/indents.scm              |  5 ++++-
 tests/indent/julia/curly_expression.jl | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/julia/curly_expression.jl

diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm
index 7e9794233..e1ea1f719 100644
--- a/queries/julia/indents.scm
+++ b/queries/julia/indents.scm
@@ -22,7 +22,6 @@
   (comprehension_expression)
   (matrix_expression)
   (vector_expression)
-  (curly_expression)
 ] @indent.begin
 
 [
@@ -55,3 +54,7 @@
 ((parameter_list) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
+
+((curly_expression) @indent.align
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
diff --git a/tests/indent/julia/curly_expression.jl b/tests/indent/julia/curly_expression.jl
new file mode 100644
index 000000000..de22067a6
--- /dev/null
+++ b/tests/indent/julia/curly_expression.jl
@@ -0,0 +1,15 @@
+function test(a::Union{Number,
+                       String,
+                       Nothing},
+              b::Number)
+end
+
+function test(
+    a::Union{
+        Number,
+        String,
+        Nothing
+    },
+    b::Number
+)
+end

From d2fe87062dde25e7fdadac061f6ca04541275e31 Mon Sep 17 00:00:00 2001
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
Date: Sat, 28 Oct 2023 17:25:33 -0300
Subject: [PATCH 0823/2704] Add more tests for assignments

---
 tests/indent/julia/assignment.jl | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/indent/julia/assignment.jl b/tests/indent/julia/assignment.jl
index 798b889de..39b8e4e8d 100644
--- a/tests/indent/julia/assignment.jl
+++ b/tests/indent/julia/assignment.jl
@@ -1,11 +1,21 @@
 my_variable =
     1 + 2 - 3 *
     4 / 5 %
-    6
+    6 + (
+        1 + 2 +
+        3
+    ) +
+    7 + 8 +
+    9
 
 function test()
     my_variable =
         1 + 2 - 3 *
         4 / 5 %
-        6
+        6 + (
+            1 + 2 +
+            3
+        ) +
+        7 + 8 +
+        9
 end

From c36681bb496ebce2946867459ed08774cb61788c Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Sun, 29 Oct 2023 19:39:57 +0000
Subject: [PATCH 0824/2704] feat: bump perl

---
 lockfile.json               | 2 +-
 queries/perl/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 00a8c16f7..631482742 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -423,7 +423,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "e5160db0dd628602b4df55d6e46889baecb2a01c"
+    "revision": "3c2f9286969b5b8805962b622d01e7cbc43c8414"
   },
   "php": {
     "revision": "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 7f9077a0d..a8fa0074c 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -13,13 +13,13 @@
 
 "sub" @keyword.function
 
-[ "map" "grep" ] @function.builtin
+[ "map" "grep" "sort" ] @function.builtin
 
 "package" @include
 
 [
   "do"
-  "my" "our" "local"
+  "my" "our" "local" "state"
   "last" "next" "redo" "goto"
   "undef"
 ] @keyword

From f9c422a12185bd8e732f829dc26b1e0b59bdbb75 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 30 Oct 2023 06:37:19 +0000
Subject: [PATCH 0825/2704] Update parsers: gleam, strace, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 631482742..4b8024eb9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,7 +192,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "32c8f1e32aee036583ca09e7e6e4ea881852b42c"
+    "revision": "399172f660160258ede7d8e1d769f7fc5f61ff33"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -573,7 +573,7 @@
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
   },
   "strace": {
-    "revision": "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e"
+    "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
@@ -681,7 +681,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "e71fee95e97cc9f7f8e5efcef36f99bfe066901a"
+    "revision": "c900234651fd0979ab28fd49213d387932fe7ab6"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 6f8387f05d2cbb357fededf35ea4311703104a11 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 29 Oct 2023 23:04:34 -0400
Subject: [PATCH 0826/2704] fix(rust): add foreign_mod_item to folds

---
 queries/rust/folds.scm | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index 95572426e..6372e6dfb 100644
--- a/queries/rust/folds.scm
+++ b/queries/rust/folds.scm
@@ -1,25 +1,27 @@
-[(mod_item)
- (function_item)
- (struct_item)
- (trait_item)
- (enum_item)
- (impl_item)
- (type_item)
- (union_item)
+[
+  (mod_item)
+  (foreign_mod_item)
+  (function_item)
+  (struct_item)
+  (trait_item)
+  (enum_item)
+  (impl_item)
+  (type_item)
+  (union_item)
 
- (use_declaration)
- (let_declaration)
+  (use_declaration)
+  (let_declaration)
 
- (loop_expression)
- (for_expression)
- (while_expression)
- (if_expression)
- (match_expression)
- (call_expression)
- (array_expression)
+  (loop_expression)
+  (for_expression)
+  (while_expression)
+  (if_expression)
+  (match_expression)
+  (call_expression)
+  (array_expression)
 
- (macro_definition)
- (macro_invocation)
+  (macro_definition)
+  (macro_invocation)
 
- (attribute_item)
+  (attribute_item)
 ] @fold

From aeb5ad8ae1c7f0165128b0be889fae967d46844d Mon Sep 17 00:00:00 2001
From: aMOPel <36712072+aMOPel@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:35:51 +0100
Subject: [PATCH 0827/2704] feat(nim): added nim parser and queries (#5556)

* feat(nim): added nim parser and queries

* correct scanner.cc to scanner.c

Co-authored-by: Christian Clason <c.clason@uni-graz.at>

* fix(nim): corrected capture for @function.macro

* feat(nim highlights): added @field capture for discriminator field in
object variant

* bumped parser version, adapted highlights.scm and condensed
injections.scm

* improved nim_format_string highlights.scm

* bump nim parser version again

* removed overlap between queries for generalized strings in
injections.scm

* improved formattin] in nim_format_string/injections.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* corrected asm parser name in injections.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* improved formatting in highlights.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* removed @error capture from highlights.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* improved wording in comment in highlights.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* removed priority from (dot_expression left: @none) capture, since it's
at the end of the file anyways

* removed comments listing unused captures

* reverted @error capture in nim_format_string/highlights.scm back to
@none

* condensed string alternatives in injections.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* condensed string alternatives in injections.scm (second part)

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* added comment to explain reasoning behind priority use

* swapped order of @punctuation.delimiter and @operator to get rid of
superfluous comment

* moved macro and template keywords to @preproc capture

* removed priorities in highlights.scm and shifted @parameter capture
behind @type capture

* improved formatting in locals.scm

* added queries for missing cases of @definition.namespace capture in
locals.scm

* removed some trailing whitespace

* added @namespace queries for highlights.scm

* bumped parser version again

* removed superfluous @type capture

* removed `@type`s `has-ancestor` and removed `(_ (_ ...` structures,
but added priorities

* added missing @constant capture to some queries in highlights.scm

* fixed priority numbers so they work when injecting nim (in markdown)

* added @none captures back to injection targets

* added (assembly_statement) injection query

* added indent queries

* removed indents.scm again

* added some missing queries for dot_generic_call, concept_declaration and
pragma_statement

---------

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 lockfile.json                            |   6 +
 lua/nvim-treesitter/parsers.lua          |  16 +
 queries/nim/folds.scm                    |  47 ++
 queries/nim/highlights.scm               | 738 +++++++++++++++++++++++
 queries/nim/injections.scm               |  75 +++
 queries/nim/locals.scm                   | 310 ++++++++++
 queries/nim_format_string/highlights.scm |  19 +
 queries/nim_format_string/injections.scm |   2 +
 8 files changed, 1213 insertions(+)
 create mode 100644 queries/nim/folds.scm
 create mode 100644 queries/nim/highlights.scm
 create mode 100644 queries/nim/injections.scm
 create mode 100644 queries/nim/locals.scm
 create mode 100644 queries/nim_format_string/highlights.scm
 create mode 100644 queries/nim_format_string/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 4b8024eb9..24b4cb30b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -380,6 +380,12 @@
   "nickel": {
     "revision": "b759233581fd8bae239e905c67a9ba453205da78"
   },
+  "nim": {
+    "revision": "7550f55c3f3dab32c6cb42d22907d75876a0ca74"
+  },
+  "nim_format_string": {
+    "revision": "b60f0e982a74fb5df93d26a468120cfe67e7e1af"
+  },
   "ninja": {
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 58796506c..ac0cda658 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1146,6 +1146,22 @@ list.nickel = {
   },
 }
 
+list.nim = {
+  install_info = {
+    url = "https://github.com/alaviss/tree-sitter-nim",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@aMOPel" },
+}
+
+list.nim_format_string = {
+  install_info = {
+    url = "https://github.com/aMOPel/tree-sitter-nim-format-string",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@aMOPel" },
+}
+
 list.ninja = {
   install_info = {
     url = "https://github.com/alemuller/tree-sitter-ninja",
diff --git a/queries/nim/folds.scm b/queries/nim/folds.scm
new file mode 100644
index 000000000..27c8d4669
--- /dev/null
+++ b/queries/nim/folds.scm
@@ -0,0 +1,47 @@
+[
+  (const_section)
+  (var_section)
+  (let_section)
+  (type_section)
+  (using_section)
+
+  (object_declaration)
+  (tuple_type)
+  (enum_declaration)
+
+  (case)
+  (if)
+  (when)
+  (of_branch)
+  (elif_branch)
+  (else_branch)
+
+  (for)
+  (while)
+  (block)
+  (static_statement)
+  (pragma_statement)
+
+  (try)
+  (except_branch)
+  (finally_branch)
+
+  (do_block)
+  (call
+    (argument_list
+      (statement_list)))
+
+  (proc_declaration)
+  (func_declaration)
+  (method_declaration)
+  (iterator_declaration)
+  (converter_declaration)
+  (template_declaration)
+  (macro_declaration)
+
+  (proc_expression)
+  (func_expression)
+  (iterator_expression)
+
+  (concept_declaration)
+] @fold
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
new file mode 100644
index 000000000..e3aa64d2c
--- /dev/null
+++ b/queries/nim/highlights.scm
@@ -0,0 +1,738 @@
+; SPDX-FileCopyrightText: 2023 Leorize <leorize+oss@disroot.org>, aMOPel <>
+; SPDX-License-Identifier: MPL-2.0
+; SPDX-License-Identifier: Apache-2.0
+
+; =============================================================================
+; catch all rules
+
+((identifier) @variable (#set! "priority" 99))
+; NOTE: we need priority, since (identifier) is most specific and we have to
+; capture nodes containing (identifier) as a whole, while overruling the
+; @variable capture.
+
+; =============================================================================
+; @comment               ; line and block comments
+
+[
+  (comment)
+  (block_comment)
+] @comment
+
+; =============================================================================
+; @comment.documentation ; comments documenting code
+
+(documentation_comment "##" @comment.documentation)
+(block_documentation_comment 
+  "##[" @comment.documentation 
+  "]##" @comment.documentation)
+; NOTE: leaving content uncaptured so markdown can be injected
+
+; =============================================================================
+; @punctuation.delimiter ; delimiters (e.g. `;` / `.` / `,`)
+
+[ "." ";" "," ":" "=" ] @punctuation.delimiter
+
+; =============================================================================
+; @operator              ; symbolic operators (e.g. `+` / `*`)
+
+(operator) @operator
+
+(assignment "=" @operator)
+
+; =============================================================================
+; @punctuation.bracket   ; brackets (e.g. `()` / `{}` / `[]`)
+
+[ "(" ")" "[" "[:" "]" "{" "}" ] @punctuation.bracket
+
+; =============================================================================
+; @preproc               ; various preprocessor directives & shebangs
+
+[
+  "macro"
+  "template"
+] @preproc
+
+(pragma_list ["{." "}" ".}"] @preproc)
+; NOTE: has to come after @punctuation.bracket
+
+; =============================================================================
+; @punctuation.special   ; special symbols (e.g. `{}` in string interpolation)
+
+(accent_quoted "`" @punctuation.special)
+
+(exported_symbol "*" @punctuation.special)
+
+; dereference operator
+(bracket_expression !right "[" @punctuation.special . "]" @punctuation.special)
+
+; =============================================================================
+; @string               ; string literals
+
+[
+  (interpreted_string_literal)
+  (long_string_literal)
+  (raw_string_literal)
+  (generalized_string)
+] @string
+
+; injections in generalized_strings
+(generalized_string (string_content) @none)
+
+; format string injection in normal strings with & prefix
+(prefix_expression
+  operator: (operator) @_string_prefix .
+  (_ (string_content) @none)
+  (#eq? @_string_prefix "&"))
+
+; emit pragma injection
+(pragma_statement
+  (pragma_list
+    (colon_expression
+      left: (identifier) @_emit_keyword (#eq? @_emit_keyword "emit")
+      right: (_ (string_content) @none))))
+
+; =============================================================================
+; @string.escape        ; escape sequences
+
+(escape_sequence) @string.escape
+
+; =============================================================================
+; @character            ; character literals
+
+(char_literal) @character
+
+; =============================================================================
+; @boolean              ; boolean literals
+
+((identifier) @boolean
+  (#any-of? @boolean "true" "false" "on" "off"))
+
+; =============================================================================
+; @number               ; numeric literals
+
+(integer_literal) @number
+
+(custom_numeric_literal) @number
+
+; =============================================================================
+; @float                ; floating-point number literals
+
+(float_literal) @float
+
+; =============================================================================
+; @function         ; function definitions
+
+(proc_declaration
+  name: [
+    (identifier) @function
+    (accent_quoted (identifier) @function)
+    (exported_symbol (identifier) @function)
+    (exported_symbol (accent_quoted (identifier) @function))
+  ])
+
+(func_declaration
+  name: [
+    (identifier) @function
+    (accent_quoted (identifier) @function)
+    (exported_symbol (identifier) @function)
+    (exported_symbol (accent_quoted (identifier) @function))
+  ])
+
+(iterator_declaration
+  name: [
+    (identifier) @function
+    (accent_quoted (identifier) @function)
+    (exported_symbol (identifier) @function)
+    (exported_symbol (accent_quoted (identifier) @function))
+  ])
+
+(converter_declaration
+  name: [
+    (identifier) @function
+    (accent_quoted (identifier) @function)
+    (exported_symbol (identifier) @function)
+    (exported_symbol (accent_quoted (identifier) @function))
+  ])
+
+; =============================================================================
+; @function.call    ; function calls
+
+(call
+  function: [
+    (identifier) @function.call
+    (accent_quoted (identifier) @function.call)
+    ; generic types
+    (bracket_expression left: (identifier) @function.call)
+    (bracket_expression left: (accent_quoted (identifier) @function.call))
+    ; dot accessor
+    (dot_expression right: (identifier) @function.call)
+    (dot_expression right: (accent_quoted (identifier) @function.call))
+    ; both
+    (bracket_expression left:
+      (dot_expression right: (identifier) @function.call))
+    (bracket_expression left:
+      (dot_expression right: (accent_quoted (identifier) @function.call)))
+  ])
+
+(dot_generic_call
+  function: [
+    (identifier) @function.call
+    (accent_quoted (identifier) @function.call)
+  ])
+
+; generalized_string is a function call
+; `identifier"string literal"`
+; is short for
+; `identifier(r"string literal")`
+(generalized_string
+  function: [
+    (identifier) @function.call
+    (accent_quoted (identifier) @function.call)
+  ])
+
+; call with leading literal
+(dot_expression
+  left: [
+    (nil_literal)
+    (integer_literal)
+    (float_literal)
+    (custom_numeric_literal)
+    (char_literal)
+    (interpreted_string_literal)
+    (long_string_literal)
+    (raw_string_literal)
+    (generalized_string)
+    (array_construction)
+    ; for sequences
+    (prefix_expression
+      operator: (operator) @_at
+      (array_construction)
+      (#eq? @_at "@"))
+    (tuple_construction)
+    (curly_construction)
+  ]
+  right: [
+    (identifier) @function.call
+    (accent_quoted (identifier) @function.call)
+  ])
+; NOTE: will double capture as @function.call if it also has argument_list
+
+; =============================================================================
+; @function.macro   ; preprocessor macros
+
+(template_declaration
+  name: [
+    (identifier) @function.macro
+    (accent_quoted (identifier) @function.macro)
+    (exported_symbol (identifier) @function.macro)
+    (exported_symbol (accent_quoted (identifier) @function.macro))
+  ])
+
+(macro_declaration
+  name: [
+    (identifier) @function.macro
+    (accent_quoted (identifier) @function.macro)
+    (exported_symbol (identifier) @function.macro)
+    (exported_symbol (accent_quoted (identifier) @function.macro))
+  ])
+
+; =============================================================================
+; @method           ; method definitions
+
+(method_declaration
+  name: [
+    (identifier) @method
+    (accent_quoted (identifier) @method)
+    (exported_symbol (identifier) @method)
+    (exported_symbol (accent_quoted (identifier) @method))
+  ])
+
+; =============================================================================
+; @constructor      ; constructor calls and definitions
+
+(call
+  function: [
+    (identifier) @constructor
+    (accent_quoted (identifier) @constructor)
+    ; generic types
+    (bracket_expression left: (identifier) @constructor)
+    (bracket_expression left: (accent_quoted (identifier) @constructor))
+    ; dot accessor
+    (dot_expression right: (identifier) @constructor)
+    (dot_expression right: (accent_quoted (identifier) @constructor))
+    ; both
+    (bracket_expression left:
+      (dot_expression right: (identifier) @constructor))
+    (bracket_expression left:
+      (dot_expression right: (accent_quoted (identifier) @constructor)))
+  ]
+  (argument_list
+    (colon_expression)+))
+; NOTE: this cannot detect constructors with 0 arguments
+; those will be matched as @function.call instead
+
+; =============================================================================
+; @keyword             ; various keywords
+
+; unhandled but reserved keywords
+; end
+; interface
+
+; static expression
+; addr operator
+((call
+  function: (identifier) @keyword)
+  (#any-of? @keyword "static" "addr"))
+
+[
+  "const"
+  "let"
+  "var"
+  "type"
+  "concept"
+  "asm"
+  "bind"
+  "defer"
+  "do"
+  "mixin"
+  "static"
+  "object"
+  "tuple"
+  "enum"
+  "block"
+  "using"
+  "discard"
+] @keyword
+
+; =============================================================================
+; @keyword.function    ; keywords that define a function (e.g. `func` in Go, `def` in Python)
+
+[
+  "proc"
+  "func"
+  "method"
+  "converter"
+  "iterator"
+] @keyword.function
+
+; =============================================================================
+; @keyword.operator    ; operators that are English words (e.g. `and` / `or`)
+
+[
+  "and"
+  "or"
+  "xor"
+  "not"
+  "div"
+  "mod"
+  "shl"
+  "shr"
+  "from"
+  "as"
+  "of"
+  "in"
+  "notin"
+  "is"
+  "isnot"
+  "cast"
+] @keyword.operator
+
+; =============================================================================
+; @keyword.return      ; keywords like `return` and `yield`
+
+[
+  "return"
+  "yield"
+] @keyword.return
+
+; =============================================================================
+; @conditional         ; keywords related to conditionals (e.g. `if` / `else`)
+
+[
+  "if"
+  "when"
+  "case"
+  "elif"
+  "else"
+] @conditional
+
+(of_branch "of" @conditional)
+
+; =============================================================================
+; @repeat              ; keywords related to loops (e.g. `for` / `while`)
+
+[
+  "for"
+  "while"
+  "continue"
+  "break"
+] @repeat
+
+(for "in" @repeat)
+
+; =============================================================================
+; @label               ; GOTO and other labels (e.g. `label:` in C)
+
+(block
+  label: [
+    (identifier) @label
+    (accent_quoted (identifier) @label)
+  ])
+
+; =============================================================================
+; @include             ; keywords for including modules (e.g. `import` / `from` in Python)
+
+[
+  "import"
+  "include"
+  "export"
+] @include
+
+(import_from_statement "from" @include)
+
+(except_clause "except" @include)
+
+; =============================================================================
+; @exception           ; keywords related to exceptions (e.g. `throw` / `catch`)
+
+[
+  "try"
+  "except"
+  "finally"
+  "raise"
+] @exception
+
+; =============================================================================
+; @type            ; type or class definitions and annotations
+
+(type_expression) @type
+
+; overrule identifiers in pragmas in (proc_type)s
+(proc_type
+  pragmas: (pragma_list (_) @variable)
+  (#set! "priority" 101))
+(iterator_type
+  pragmas: (pragma_list (_) @variable)
+  (#set! "priority" 101))
+
+; generic types when declaring
+((generic_parameter_list
+  (parameter_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @type
+          (accent_quoted (identifier) @type)
+        ])))))
+
+; generic types when calling
+(call
+  function: (bracket_expression
+    right: (argument_list) @type))
+; NOTE: this also falsely matches
+; when accessing and directly call elements from an array of routines
+; eg `array_of_routines[index](arguments), but that is an uncommon case
+; NOTE: this will falsly capture (identifier)s that aren't types as well, eg
+; array[enum1..enum2, int]
+
+(dot_generic_call
+  generic_arguments: (_) @type)
+
+; right side of `is` operator is always type
+(infix_expression
+  operator: [ "is" "isnot" ]
+  right: (_) @type)
+
+; except branch always contains types of errors
+; Eg: `except module.exception[gen_type]:`
+(except_branch
+  values: (expression_list) @type)
+
+; overrule special case in (except_branch) with "as" operator
+; `except module.exception[gen_type] as variable:`
+(except_branch
+  values: (expression_list
+    (infix_expression
+      operator: "as"
+      right: [
+        (identifier) @variable
+        (accent_quoted (identifier) @variable)
+      ])))
+
+; for inline tuple types
+; `type a = tuple[a: int]`
+(tuple_type
+  "tuple" @type
+  (field_declaration_list))
+; NOTE: this is consistent with other generic types like `seq[int]`
+; but inconsistent with multiline tuple declaration,
+; where `tuple` is captured as @keyword
+
+; =============================================================================
+; @parameter        ; parameters of a function
+
+; named parameters when calling
+; call(parameter_name=arg)
+(argument_list
+  (equal_expression
+    left: [
+      (identifier) @parameter
+      (accent_quoted (identifier) @parameter)
+    ]))
+
+; parameters in function declaration
+(parameter_declaration_list
+  (parameter_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @parameter
+          (accent_quoted (identifier) @parameter)
+        ]))))
+; NOTE: needs to be after @type
+
+; for loop variables
+(for
+  left:
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @parameter
+          (accent_quoted (identifier) @parameter)
+        ])))
+
+((tuple_deconstruct_declaration
+  (symbol_declaration
+    name: [
+      (identifier) @parameter
+      (accent_quoted (identifier) @parameter)
+    ])) @_tuple_decons
+  (#has-ancestor? @_tuple_decons for))
+
+(concept_declaration
+  parameters: 
+    (parameter_list [
+      (identifier) @parameter
+      (accent_quoted (identifier) @parameter)
+    ]))
+(var_parameter [
+  (identifier) @parameter
+  (accent_quoted (identifier) @parameter)
+])
+(type_parameter [
+  (identifier) @parameter
+  (accent_quoted (identifier) @parameter)
+])
+(static_parameter [
+  (identifier) @parameter
+  (accent_quoted (identifier) @parameter)
+])
+(ref_parameter [
+  (identifier) @parameter
+  (accent_quoted (identifier) @parameter)
+])
+(pointer_parameter [
+  (identifier) @parameter
+  (accent_quoted (identifier) @parameter)
+])
+
+
+; =============================================================================
+; @type.definition ; type definitions (e.g. `typedef` in C)
+
+(type_section
+  (type_declaration
+    (type_symbol_declaration
+      name: [
+        (identifier) @type.definition
+        (accent_quoted (identifier) @type.definition)
+        (exported_symbol (identifier) @type.definition)
+        (exported_symbol (accent_quoted (identifier) @type.definition))
+      ])))
+
+; =============================================================================
+; @type.qualifier  ; type qualifiers (e.g. `const`)
+
+(var_type "var" @type.qualifier)
+(out_type "out" @type.qualifier)
+(distinct_type "distinct" @type.qualifier)
+(ref_type "ref" @type.qualifier)
+(pointer_type "ptr" @type.qualifier)
+
+(var_parameter "var" @type.qualifier)
+(type_parameter "type" @type.qualifier)
+(static_parameter "static" @type.qualifier)
+(ref_parameter "ref" @type.qualifier)
+(pointer_parameter "ptr" @type.qualifier)
+
+; =============================================================================
+; @field           ; object and struct fields
+
+; fields in object/tuple declaration
+(field_declaration
+  (symbol_declaration_list
+    (symbol_declaration
+      name: [
+        (identifier) @field
+        (accent_quoted (identifier) @field)
+        (exported_symbol (identifier) @field)
+        (exported_symbol (accent_quoted (identifier) @field))
+      ])))
+
+; fields in object construction
+(call
+  (argument_list
+    (colon_expression
+      left: [
+        (identifier) @field
+        (accent_quoted (identifier) @field)
+      ])))
+
+; fields in tuple construction
+(tuple_construction
+  (colon_expression
+    left: [
+      (identifier) @field
+      (accent_quoted (identifier) @field)
+    ]))
+
+(variant_declaration
+  (variant_discriminator_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @field
+          (accent_quoted (identifier) @field)
+          (exported_symbol (identifier) @field)
+          (exported_symbol (accent_quoted (identifier) @field))
+        ]))))
+
+; =============================================================================
+; @variable.builtin ; built-in variable names (e.g. `this`)
+
+(blank_identifier) @variable.builtin
+
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "result"))
+; NOTE: technically needs `has-ancestor some routine declaration` but it's
+; not worth it
+
+; =============================================================================
+; @constant         ; constant identifiers
+
+; identifiers in "case" "of" branches have to be enums
+(case
+  (of_branch values:
+    (expression_list (_) @constant)))
+
+; in variant objects with "case" "of"
+(variant_declaration
+  (of_branch values:
+    (expression_list (_) @constant)))
+
+; enum declaration
+(enum_field_declaration
+  (symbol_declaration
+    name: [
+      (identifier) @constant
+      (accent_quoted (identifier) @constant)
+    ]))
+
+; constants/enums in array construction
+(array_construction
+  (colon_expression
+    left: (_) @constant))
+
+; constant declaration
+(const_section
+  (variable_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @constant
+          (accent_quoted (identifier) @constant)
+          (exported_symbol (identifier) @constant)
+          (exported_symbol (accent_quoted (identifier) @constant))
+        ]))))
+
+((tuple_deconstruct_declaration
+  (symbol_declaration
+    name: [
+      (identifier) @constant
+      (accent_quoted (identifier) @constant)
+      (exported_symbol (identifier) @constant)
+      (exported_symbol (accent_quoted (identifier) @constant))
+    ])) @_tuple_decons
+  (#has-ancestor? @_tuple_decons const_section))
+
+; =============================================================================
+; @constant.builtin ; built-in constant values
+
+(nil_literal) @constant.builtin
+
+; =============================================================================
+; @namespace        ; modules or namespaces
+
+(import_statement
+  (expression_list
+    (identifier) @namespace))
+
+(import_statement
+  (expression_list
+    (infix_expression
+      operator: "as"
+      right: (identifier) @namespace)))
+
+(import_statement
+  (expression_list
+    (infix_expression
+      operator: (operator) @_operator
+      right: [
+        (identifier) @namespace
+        (array_construction (identifier) @namespace)
+      ]))
+  (#eq? @_operator "/"))
+
+(import_from_statement
+  module: (infix_expression
+    operator: (operator) @_operator
+    right: (identifier) @namespace)
+  (#eq? @_operator "/"))
+
+(export_statement
+  (expression_list
+    (identifier) @namespace))
+
+; =============================================================================
+; overrule things
+
+; left identifier in dot_expression
+(dot_expression left: [
+  (identifier) @none
+  (accent_quoted (identifier) @none)
+])
+; NOTE: we can't know what the left identifier is, so better leave it alone
+; for consistency
+
+; discard literals is like a comment
+(discard_statement
+  "discard" @comment
+  [
+    (nil_literal)
+    (integer_literal)
+    (float_literal)
+    (custom_numeric_literal)
+    (char_literal)
+    (interpreted_string_literal)
+    (long_string_literal)
+    (raw_string_literal)
+    (generalized_string)
+    (array_construction)
+    ; for sequences
+    (prefix_expression
+      operator: (operator) @_at
+      (array_construction)
+      (#eq? @_at "@"))
+    (tuple_construction)
+    (curly_construction)
+  ] @comment)
diff --git a/queries/nim/injections.scm b/queries/nim/injections.scm
new file mode 100644
index 000000000..5e347e965
--- /dev/null
+++ b/queries/nim/injections.scm
@@ -0,0 +1,75 @@
+; =============================================================================
+; generalized_strings
+
+; regex in generalized_strings
+(generalized_string
+  function: (identifier) @_string_prefix .
+  (string_content) @injection.content
+  (#set! injection.language "regex")
+  (#any-of? @_string_prefix "re" "rex"))
+
+; format string in generalized_strings
+(generalized_string
+  function: (identifier) @_string_prefix .
+  (string_content) @injection.content
+  (#set! injection.language "nim_format_string")
+  (#eq? @_string_prefix "fmt"))
+
+; format string in normal strings with & prefix
+(prefix_expression
+  operator: (operator) @_string_prefix .
+  (_ (string_content) @injection.content)
+  (#set! injection.language "nim_format_string")
+  (#eq? @_string_prefix "&"))
+
+; sql in generalized_strings
+; and anyhting you like as long as the function name is the same as the injected language's parser
+(generalized_string
+  function: (identifier) @injection.language
+  (string_content) @injection.content
+  (#not-any-of? @injection.language "re" "rex" "fmt"))
+
+; =============================================================================
+; emit pragma
+
+; C / CPP / OBJC / JAVASCRIPT
+; a `#<no whitespace><language name>`
+; has to directly precede the {.emit: "<language code>".} pragma
+
+; eg.:
+; #objc
+; {.emit: "<objc code>".}
+; OR
+; #javascript
+; {.emit: "<javascript code>".}
+
+; normal strings
+((comment (comment_content) @injection.language)
+  .
+  (pragma_statement
+    (pragma_list
+      (colon_expression
+        left: (identifier) @_emit_keyword (#eq? @_emit_keyword "emit")
+        right: (_ (string_content) @injection.content)))))
+
+
+; =============================================================================
+; asm statement
+
+; works same as emit pragma, needs preceding comment with language name
+((comment (comment_content) @injection.language)
+  .
+  (assembly_statement (_ (string_content) @injection.content)))
+
+; =============================================================================
+; comments
+
+; NOTE: ts "comment" parser heavily impacts performance
+
+; markdown parser in documentation_comment
+(documentation_comment (comment_content) @injection.content
+  (#set! injection.language "markdown_inline"))
+
+; markdown parser in block_documentation_comment
+(block_documentation_comment (comment_content) @injection.content
+  (#set! injection.language "markdown"))
diff --git a/queries/nim/locals.scm b/queries/nim/locals.scm
new file mode 100644
index 000000000..dd80b315b
--- /dev/null
+++ b/queries/nim/locals.scm
@@ -0,0 +1,310 @@
+
+; ==============================================================================
+; @definition            ; various definitions
+
+(block
+  label: [
+    (identifier) @definition
+    (accent_quoted) @definition
+  ])
+
+; ==============================================================================
+; @definition.constant   ; constants
+
+(const_section
+  (variable_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @definition.constant
+          (accent_quoted) @definition.constant
+          (exported_symbol (identifier) @definition.constant)
+          (exported_symbol (accent_quoted) @definition.constant)
+        ]))
+    type: (type_expression)? @definition.associated))
+
+; ==============================================================================
+; @definition.function   ; functions
+
+(proc_declaration
+  name: [
+    (identifier) @definition.function
+    (accent_quoted) @definition.function
+    (exported_symbol (identifier) @definition.function)
+    (exported_symbol (accent_quoted) @definition.function)
+  ]
+  (#set! "definition.function.scope" "parent"))
+
+(func_declaration
+  name: [
+    (identifier) @definition.function
+    (accent_quoted) @definition.function
+    (exported_symbol (identifier) @definition.function)
+    (exported_symbol (accent_quoted) @definition.function)
+  ]
+  (#set! "definition.function.scope" "parent"))
+
+(iterator_declaration
+  name: [
+    (identifier) @definition.function
+    (accent_quoted) @definition.function
+    (exported_symbol (identifier) @definition.function)
+    (exported_symbol (accent_quoted) @definition.function)
+  ]
+  (#set! "definition.function.scope" "parent"))
+
+(converter_declaration
+  name: [
+    (identifier) @definition.function
+    (accent_quoted) @definition.function
+    (exported_symbol (identifier) @definition.function)
+    (exported_symbol (accent_quoted) @definition.function)
+  ]
+  (#set! "definition.function.scope" "parent"))
+
+; ==============================================================================
+; @definition.method     ; methods
+
+(method_declaration
+  name: [
+    (identifier) @definition.method
+    (accent_quoted) @definition.method
+    (exported_symbol (identifier) @definition.method)
+    (exported_symbol (accent_quoted) @definition.method)
+  ]
+  (#set! "definition.method.scope" "parent"))
+
+; ==============================================================================
+; @definition.var        ; variables
+
+(var_section
+  (variable_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @definition.var
+          (accent_quoted) @definition.var
+          (exported_symbol (identifier) @definition.var)
+          (exported_symbol (accent_quoted) @definition.var)
+        ]))
+    type: (type_expression)? @definition.associated))
+
+(let_section
+  (variable_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @definition.var
+          (accent_quoted) @definition.var
+          (exported_symbol (identifier) @definition.var)
+          (exported_symbol (accent_quoted) @definition.var)
+        ]))
+    type: (type_expression)? @definition.associated))
+
+(for
+  (symbol_declaration_list
+    (symbol_declaration
+      name: [
+        (identifier) @definition.var
+        (accent_quoted) @definition.var
+      ])))
+
+(try
+  (except_branch
+    values: (expression_list
+      (infix_expression
+        right: [
+          (identifier) @definition.var
+          (accent_quoted) @definition.var
+        ]))))
+
+; ==============================================================================
+; @definition.parameter  ; parameters
+
+(parameter_declaration
+  (symbol_declaration_list
+    (symbol_declaration
+      name: [
+        (identifier) @definition.parameter
+        (accent_quoted) @definition.parameter
+      ]))
+  type: (type_expression)? @definition.associated)
+
+(concept_declaration
+  parameters: 
+    (parameter_list [
+      (identifier) @definition.parameter
+      (accent_quoted (identifier) @definition.parameter)
+    ]))
+(var_parameter [
+  (identifier) @definition.parameter
+  (accent_quoted (identifier) @definition.parameter)
+])
+(type_parameter [
+  (identifier) @definition.parameter
+  (accent_quoted (identifier) @definition.parameter)
+])
+(static_parameter [
+  (identifier) @definition.parameter
+  (accent_quoted (identifier) @definition.parameter)
+])
+(ref_parameter [
+  (identifier) @definition.parameter
+  (accent_quoted (identifier) @definition.parameter)
+])
+(pointer_parameter [
+  (identifier) @definition.parameter
+  (accent_quoted (identifier) @definition.parameter)
+])
+
+; ==============================================================================
+; @definition.macro      ; preprocessor macros
+
+(template_declaration
+  name: [
+    (identifier) @definition.macro
+    (accent_quoted) @definition.macro
+    (exported_symbol (identifier) @definition.macro)
+    (exported_symbol (accent_quoted) @definition.macro)
+  ]
+  (#set! "definition.macro.scope" "parent"))
+
+(macro_declaration
+  name: [
+    (identifier) @definition.macro
+    (accent_quoted) @definition.macro
+    (exported_symbol (identifier) @definition.macro)
+    (exported_symbol (accent_quoted) @definition.macro)
+  ]
+  (#set! "definition.macro.scope" "parent"))
+
+; ==============================================================================
+; @definition.type       ; types or classes
+
+(type_declaration
+  (type_symbol_declaration
+    name: [
+      (identifier) @definition.type
+      (accent_quoted) @definition.type
+      (exported_symbol (identifier) @definition.type)
+      (exported_symbol (accent_quoted) @definition.type)
+    ]))
+
+; ==============================================================================
+; @definition.field      ; fields or properties
+
+(object_declaration
+  (field_declaration_list
+    (field_declaration
+      (symbol_declaration_list
+        (symbol_declaration
+          name: [
+            (identifier) @definition.field
+            (accent_quoted) @definition.field
+            (exported_symbol (identifier) @definition.field)
+            (exported_symbol (accent_quoted) @definition.field)
+          ]))
+      type: (type_expression)? @definition.associated)))
+
+(tuple_type
+  (field_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @definition.field
+          (accent_quoted) @definition.field
+        ]))
+    type: (type_expression)? @definition.associated))
+
+; ==============================================================================
+; @definition.enum       ; enumerations
+
+(enum_declaration
+  (enum_field_declaration
+    (symbol_declaration
+      name: [
+        (identifier) @definition.enum
+        (accent_quoted) @definition.enum
+      ])))
+
+; ==============================================================================
+; @definition.namespace  ; modules or namespaces
+; @definition.import     ; imported names
+
+(import_statement
+  (expression_list
+    (identifier) @definition.namespace))
+
+(import_statement
+  (expression_list
+    (infix_expression
+      operator: "as"
+      right: (identifier) @definition.namespace)))
+
+(import_statement
+  (expression_list
+    (infix_expression
+      operator: (operator) @_operator
+      right: [
+        (identifier) @definition.namespace
+        (array_construction (identifier) @definition.namespace)
+      ]))
+  (#eq? @_operator "/"))
+
+(import_from_statement
+  module: (infix_expression
+    operator: (operator) @_operator
+    right: (identifier) @definition.namespace)
+  (expression_list [
+    (identifier) @definition.import
+    (accent_quoted) @definition.import
+  ])
+  (#eq? @_operator "/"))
+
+; ==============================================================================
+; @scope                 ; scope block
+
+; (when)
+; NOTE: `when` does actually not create a scope
+
+(if
+  consequence: (statement_list) @scope
+  alternative: (elif_branch)* @scope
+  alternative: (else_branch)? @scope)
+
+(case
+  (of_branch)* @scope
+  (elif_branch)* @scope
+  (else_branch)? @scope)
+
+(try
+  body: (statement_list) @scope
+  (except_branch) @scope
+  (finally_branch)? @scope)
+
+[
+  (for)
+  (while)
+  (block)
+  (static_statement)
+
+  (proc_declaration)
+  (func_declaration)
+  (method_declaration)
+  (iterator_declaration)
+  (converter_declaration)
+  (template_declaration)
+  (macro_declaration)
+
+  (proc_expression)
+  (func_expression)
+  (iterator_expression)
+
+  (concept_declaration)
+] @scope
+
+; ==============================================================================
+; @reference             ; identifier reference
+
+(identifier) @reference
+(accent_quoted) @reference
diff --git a/queries/nim_format_string/highlights.scm b/queries/nim_format_string/highlights.scm
new file mode 100644
index 000000000..94a239dfb
--- /dev/null
+++ b/queries/nim_format_string/highlights.scm
@@ -0,0 +1,19 @@
+(string_literal)
+(matching_curlies 
+  opening_curly: (opening_curly) @punctuation.special 
+  equals: (equals)? @punctuation.special
+  closing_curly: (closing_curly) @punctuation.special)
+
+(format_specifiers
+  colon: (colon) @punctuation.delimiter
+  fill_align: (fill_align)? @conditional.ternary
+  sign: (sign)? @operator
+  hash: (hash)? @punctuation.special
+  zero: (zero)? @field
+  min_width: (min_width)? @number
+  precision: (precision)? @number
+  type: (type)? @type)
+
+(matching_curlies 
+  nim_expression: (nim_expression 
+    escaped_curly: (escaped_curly)+ @string.escape) @none)
diff --git a/queries/nim_format_string/injections.scm b/queries/nim_format_string/injections.scm
new file mode 100644
index 000000000..0775fba0c
--- /dev/null
+++ b/queries/nim_format_string/injections.scm
@@ -0,0 +1,2 @@
+((matching_curlies (nim_expression !escaped_curly) @injection.content)
+  (#set! injection.language "nim"))

From a8c14d68b024ffc20baec92d1acc91796bcfb485 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 30 Oct 2023 11:36:03 +0000
Subject: [PATCH 0828/2704] Update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7bc6a8007..4ebdd4a15 100644
--- a/README.md
+++ b/README.md
@@ -300,6 +300,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [mlir](https://github.com/artagnon/tree-sitter-mlir) (experimental, maintained by @artagnon)
 - [x] [nasm](https://github.com/naclsn/tree-sitter-nasm) (maintained by @ObserverOfTime)
 - [ ] [nickel](https://github.com/nickel-lang/tree-sitter-nickel)
+- [x] [nim](https://github.com/alaviss/tree-sitter-nim) (maintained by @aMOPel)
+- [x] [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) (maintained by @aMOPel)
 - [x] [ninja](https://github.com/alemuller/tree-sitter-ninja) (maintained by @alemuller)
 - [x] [nix](https://github.com/cstrahan/tree-sitter-nix) (maintained by @leo60228)
 - [x] [norg](https://github.com/nvim-neorg/tree-sitter-norg) (maintained by @JoeyGrajciar, @vhyrro)

From efec7115d8175bdb6720eeb4e26196032cb52593 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 31 Oct 2023 06:36:57 +0000
Subject: [PATCH 0829/2704] Update parsers: htmldjango, nim_format_string, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 24b4cb30b..b8983b15e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -264,7 +264,7 @@
     "revision": "d742025fa2d8e6100f134a6ea990443aa1f074b3"
   },
   "htmldjango": {
-    "revision": "717e83aefd328735beeeb671f3f95b2624e70c57"
+    "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
   },
   "http": {
     "revision": "6824a247d1326079aab4fa9f9164e9319678081d"
@@ -384,7 +384,7 @@
     "revision": "7550f55c3f3dab32c6cb42d22907d75876a0ca74"
   },
   "nim_format_string": {
-    "revision": "b60f0e982a74fb5df93d26a468120cfe67e7e1af"
+    "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
   },
   "ninja": {
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
@@ -687,7 +687,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "c900234651fd0979ab28fd49213d387932fe7ab6"
+    "revision": "480bee435849a5b7bc6516bf71538136593d09c4"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 051ce73fcd4d6b77a313e87e1113fcd42cf54cd1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 1 Nov 2023 18:39:26 -0400
Subject: [PATCH 0830/2704] chore(odin): update highlights from upstream

---
 lockfile.json               | 2 +-
 queries/odin/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b8983b15e..5656c3b3b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -414,7 +414,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "d165dbee27617dab2653e38737d96ede1030d14f"
+    "revision": "751f7796fa76075cff52edd1afff569a8a09c2a7"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index bdc557df2..6b06153f3 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -272,7 +272,7 @@
   "."
   ","
   ":"
-  (separator)
+  ";"
 ] @punctuation.delimiter
 
 

From 198015cca117d41e7d1fd404e0cdf3235084749b Mon Sep 17 00:00:00 2001
From: Azad <49314270+Akmadan23@users.noreply.github.com>
Date: Thu, 2 Nov 2023 11:02:41 +0100
Subject: [PATCH 0831/2704] fix(query): stricter match for `extends` directive
 (#5604)

---
 queries/query/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 603bba933..c7f0d891a 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -31,4 +31,4 @@
  (#lua-match? @include "^;+ *inherits *:"))
 
 ((program . (comment)* . (comment) @preproc)
- (#lua-match? @preproc "^;+ *extends"))
+ (#lua-match? @preproc "^;+ *extends *$"))

From 43161c860e87645344c30c1a3d350e4137c54eae Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 2 Nov 2023 06:35:45 +0000
Subject: [PATCH 0832/2704] Update parsers: liquidsoap, nim, perl, sql, twig,
 unison, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5656c3b3b..32ae648fc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -330,7 +330,7 @@
     "revision": "91d7aa606f524cf4f5df7f4aacb45b4056fac704"
   },
   "liquidsoap": {
-    "revision": "38a5f0df32eba7e6da2868c3ebfa6280b4da992b"
+    "revision": "cff1fea7c2ef9eed066a4d3de8af6cb4d7117056"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -381,7 +381,7 @@
     "revision": "b759233581fd8bae239e905c67a9ba453205da78"
   },
   "nim": {
-    "revision": "7550f55c3f3dab32c6cb42d22907d75876a0ca74"
+    "revision": "1f9308c9e440ddbc67c0aaeb9396c992d266b281"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -429,7 +429,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "3c2f9286969b5b8805962b622d01e7cbc43c8414"
+    "revision": "e99bb5283805db4cb86c964722d709df21b0ac16"
   },
   "php": {
     "revision": "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"
@@ -567,7 +567,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "17e985d5ec306b7e6f094e47111b52cfd9503955"
+    "revision": "4ee5a6ad1542cf3f0e2afde91863f1fe74e28154"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -639,7 +639,7 @@
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
   },
   "twig": {
-    "revision": "779ee5ab1e065dcef7f51f253030dc875445b25f"
+    "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
   },
   "typescript": {
     "revision": "d847898fec3fe596798c9fda55cb8c05a799001a"
@@ -651,7 +651,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "694c8c0c79f8d1b80d497401acf4d1b77bfb004a"
+    "revision": "a69d087590f2ca057d1ef1a393de7e22869bb557"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
@@ -687,7 +687,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "480bee435849a5b7bc6516bf71538136593d09c4"
+    "revision": "58ba1ae91c61b69d74172c856a7d013d18d047a5"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 1920285ec11654072f14d07258e73ef792ac9005 Mon Sep 17 00:00:00 2001
From: Derek Stride <derek.stride@shopify.com>
Date: Thu, 2 Nov 2023 14:26:21 -0400
Subject: [PATCH 0833/2704] fix(sql): update queries from upstream

---
 queries/sql/highlights.scm | 115 +++++++++++++++++++++++++------------
 1 file changed, 78 insertions(+), 37 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index d5c2c64f0..d9f071362 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -1,3 +1,7 @@
+(invocation
+  (object_reference
+    name: (identifier) @function.call))
+
 [
   (keyword_gist)
   (keyword_btree)
@@ -11,11 +15,6 @@
 (object_reference
   name: (identifier) @type)
 
-(invocation
-  (object_reference
-    name: (identifier) @function.call
-    parameter: [(field)]? @parameter))
-
 (relation
   alias: (identifier) @variable)
 
@@ -75,31 +74,14 @@
  (keyword_safe)
  (keyword_cost)
  (keyword_strict)
- (keyword_matched)
- (keyword_encrypted)
- (keyword_valid)
- (keyword_admin)
- (keyword_user)
- (keyword_until)
- (keyword_connection)
- (keyword_cycle)
- (keyword_increment)
- (keyword_minvalue)
- (keyword_maxvalue)
- (keyword_none)
- (keyword_owned)
- (keyword_verbose)
- (keyword_authorization)
 ] @attribute
 
 [
  (keyword_materialized)
- (keyword_tablespace)
  (keyword_recursive)
  (keyword_temp)
  (keyword_temporary)
  (keyword_unlogged)
- (keyword_logged)
  (keyword_external)
  (keyword_parquet)
  (keyword_csv)
@@ -130,14 +112,15 @@
   (keyword_create)
   (keyword_insert)
   (keyword_merge)
-  (keyword_truncate)
-  (keyword_explain)
   (keyword_distinct)
   (keyword_replace)
   (keyword_update)
   (keyword_into)
   (keyword_overwrite)
+  (keyword_matched)
   (keyword_values)
+  (keyword_value)
+  (keyword_attribute)
   (keyword_set)
   (keyword_left)
   (keyword_right)
@@ -148,6 +131,7 @@
   (keyword_partition)
   (keyword_group)
   (keyword_with)
+  (keyword_without)
   (keyword_as)
   (keyword_having)
   (keyword_limit)
@@ -170,14 +154,11 @@
   (keyword_columns)
   (keyword_cross)
   (keyword_lateral)
+  (keyword_natural)
   (keyword_alter)
   (keyword_drop)
   (keyword_add)
   (keyword_view)
-  (keyword_database)
-  (keyword_role)
-  (keyword_group)
-  (keyword_sequence)
   (keyword_end)
   (keyword_is)
   (keyword_using)
@@ -186,18 +167,14 @@
   (keyword_no)
   (keyword_data)
   (keyword_type)
-  (keyword_value)
-  (keyword_attribute)
   (keyword_rename)
   (keyword_to)
   (keyword_schema)
   (keyword_owner)
-  (keyword_union)
+  (keyword_authorization)
   (keyword_all)
   (keyword_any)
   (keyword_some)
-  (keyword_except)
-  (keyword_intersect)
   (keyword_returning)
   (keyword_begin)
   (keyword_commit)
@@ -231,8 +208,12 @@
   (keyword_uncached)
   (keyword_lines)
   (keyword_stored)
+  (keyword_virtual)
   (keyword_partitioned)
   (keyword_analyze)
+  (keyword_explain)
+  (keyword_verbose)
+  (keyword_truncate)
   (keyword_rewrite)
   (keyword_optimize)
   (keyword_vacuum)
@@ -247,6 +228,7 @@
   (keyword_input)
   (keyword_name)
   (keyword_oid)
+  (keyword_oids)
   (keyword_options)
   (keyword_plpgsql)
   (keyword_precision)
@@ -264,8 +246,64 @@
   (keyword_tblproperties)
   (keyword_trigger)
   (keyword_unsafe)
+  (keyword_admin)
+  (keyword_connection)
+  (keyword_cycle)
+  (keyword_database)
+  (keyword_encrypted)
+  (keyword_increment)
+  (keyword_logged)
+  (keyword_none)
+  (keyword_owned)
+  (keyword_password)
+  (keyword_reset)
+  (keyword_role)
+  (keyword_sequence)
   (keyword_start)
   (keyword_restart)
+  (keyword_tablespace)
+  (keyword_until)
+  (keyword_user)
+  (keyword_valid)
+  (keyword_action)
+  (keyword_definer)
+  (keyword_invoker)
+  (keyword_security)
+  (keyword_extension)
+  (keyword_version)
+  (keyword_out)
+  (keyword_inout)
+  (keyword_variadic)
+  (keyword_session)
+  (keyword_isolation)
+  (keyword_level)
+  (keyword_serializable)
+  (keyword_repeatable)
+  (keyword_read)
+  (keyword_write)
+  (keyword_committed)
+  (keyword_uncommitted)
+  (keyword_deferrable)
+  (keyword_names)
+  (keyword_zone)
+  (keyword_immediate)
+  (keyword_deferred)
+  (keyword_constraints)
+  (keyword_snapshot)
+  (keyword_characteristics)
+  (keyword_off)
+  (keyword_follows)
+  (keyword_precedes)
+  (keyword_each)
+  (keyword_instead)
+  (keyword_of)
+  (keyword_initially)
+  (keyword_old)
+  (keyword_new)
+  (keyword_referencing)
+  (keyword_statement)
+  (keyword_execute)
+  (keyword_procedure)
 ] @keyword
 
 [
@@ -290,6 +328,8 @@
  (keyword_noscan)
  (keyword_stats)
  (keyword_statistics)
+ (keyword_maxvalue)
+ (keyword_minvalue)
 ] @type.qualifier
 
 [
@@ -353,6 +393,9 @@
   (keyword_by)
   (keyword_on)
   (keyword_do)
+  (keyword_union)
+  (keyword_except)
+  (keyword_intersect)
 ] @keyword.operator
 
 [
@@ -370,10 +413,8 @@
   ">="
   ">"
   "<>"
-  "->"
-  "->>"
-  "#>"
-  "#>>"
+  (op_other)
+  (op_unary_other)
 ] @operator
 
 [

From f3c27105840eeb3c5f66293232dd834a13f90c52 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 3 Nov 2023 06:35:41 +0000
Subject: [PATCH 0834/2704] Update parsers: janet_simple, sql, ssh_config, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 32ae648fc..f6b05acd1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -279,7 +279,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"
+    "revision": "3c6f947f9039bbd803d9f3cf57dcee3783b3e2ce"
   },
   "java": {
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
@@ -567,13 +567,13 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "4ee5a6ad1542cf3f0e2afde91863f1fe74e28154"
+    "revision": "25be0b8f17e9189ad9e1b875869d025c5aec1286"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "e4008633536870f3fed3198c96503250af0b0a12"
+    "revision": "9dcfe0f30ccbde8115790c72acbde4c04ec8e74e"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -687,7 +687,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "58ba1ae91c61b69d74172c856a7d013d18d047a5"
+    "revision": "d3ab286ac986d1eaf2461d6924132fe26cb46764"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From fca784da0eca70a4ed574d7e763e12c8f757ed7a Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Thu, 2 Nov 2023 19:58:38 +0000
Subject: [PATCH 0835/2704] perl: fix highlights for builtins

---
 queries/perl/highlights.scm | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index a8fa0074c..e3aa0b2bb 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -95,10 +95,21 @@
 (func0op_call_expression function: _ @function.builtin)
 (func1op_call_expression function: _ @function.builtin)
 
+; this was a regex for the CLI
 ([(function)(expression_statement (bareword))] @function.builtin
- (#set! "priority" 101)
- (#lua-match? @function.builtin
-   "^(accept|atan2|bind|binmode|bless|crypt|chmod|chown|connect|die|dbmopen|exec|fcntl|flock|getpriority|getprotobynumber|gethostbyaddr|getnetbyaddr|getservbyname|getservbyport|getsockopt|glob|index|ioctl|join|kill|link|listen|mkdir|msgctl|msgget|msgrcv|msgsend|opendir|print|printf|push|pack|pipe|return|rename|rindex|read|recv|reverse|say|select|seek|semctl|semget|semop|send|setpgrp|setpriority|seekdir|setsockopt|shmctl|shmread|shmwrite|shutdown|socket|socketpair|split|sprintf|splice|substr|system|symlink|syscall|sysopen|sysseek|sysread|syswrite|tie|truncate|unlink|unpack|utime|unshift|vec|warn|waitpid|formline|open|sort)$"
+ (#any-of? @function.builtin
+  "accept" "atan2" "bind" "binmode" "bless" "crypt" "chmod" "chown" "connect"
+  "die" "dbmopen" "exec" "fcntl" "flock" "formline" "getpriority"
+  "getprotobynumber" "gethostbyaddr" "getnetbyaddr" "getservbyname"
+  "getservbyport" "getsockopt" "glob" "index" "ioctl" "join" "kill" "link"
+  "listen" "mkdir" "msgctl" "msgget" "msgrcv" "msgsend" "open" "opendir"
+  "print" "printf" "push" "pack" "pipe" "return" "rename" "rindex" "read"
+  "recv" "reverse" "say" "select" "seek" "semctl" "semget" "semop" "send"
+  "setpgrp" "setpriority" "seekdir" "setsockopt" "shmctl" "shmread" "shmwrite"
+  "shutdown" "socket" "socketpair" "split" "sprintf" "splice" "substr" "system"
+  "symlink" "syscall" "sysopen" "sysseek" "sysread" "syswrite" "tie" "truncate"
+  "unlink" "unpack" "utime" "unshift" "vec" "warn"
+  "waitpid"
 ))
 
 (function) @function
@@ -114,10 +125,15 @@
     "}" @punctuation.special))
 
 
-(
-  [(varname) (filehandle)] @variable.builtin
-  (#lua-match? @variable.builtin "^((ENV|ARGV|INC|ARGVOUT|SIG|STDIN|STDOUT|STDERR)|[_ab]|\\W|\\d+|\\^.*)$")
-)
+([(varname) (filehandle)] @variable.builtin
+  (#any-of? @variable.builtin "ENV" "ARGV" "INC" "ARGVOUT" "SIG" "STDIN" "STDOUT" "STDERR" "a" "b" "_"))
+((varname) @variable.builtin
+  ; highlights all the reserved ^ vars like ${^THINGS}
+  (#lua-match? @variable.builtin "%^"))
+((varname) @variable.builtin
+  ; highlights punc vars and also numeric only like $11
+  (#lua-match? @variable.builtin "^%A+$"))
+
 
 (scalar) @variable.scalar
 (scalar_deref_expression [ "$" "*"] @variable.scalar)

From a689957480900d889b3d46675c33d903c0e2402d Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Thu, 2 Nov 2023 19:58:51 +0000
Subject: [PATCH 0836/2704] pod: fix highlights

---
 queries/pod/highlights.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/queries/pod/highlights.scm b/queries/pod/highlights.scm
index f0b65ab63..e1e88f5f8 100644
--- a/queries/pod/highlights.scm
+++ b/queries/pod/highlights.scm
@@ -4,6 +4,11 @@
  (command)
  (cut_command)] @keyword
 
+((command_paragraph
+  (command) @keyword
+  (content) @string)
+  (#set! "priority" 99))
+
 (command_paragraph
   (command) @keyword
   (#lua-match? @keyword "^=head")
@@ -24,10 +29,6 @@
   (#lua-match? @keyword "^=encoding")
   (content) @string.special)
 
-(command_paragraph
-  (command) @keyword
-  (#not-lua-match? @keyword "^=(head|over|item|encoding)")
-  (content) @string)
 
 (verbatim_paragraph (content) @text.literal)
 

From c5a7533113b2deb7db899d387b877389cc8b6113 Mon Sep 17 00:00:00 2001
From: Brian Albert Monroe <brian@bamonroe.com>
Date: Fri, 3 Nov 2023 15:51:41 +0200
Subject: [PATCH 0837/2704] fix(rnoweb): add highlights query (#5622)

Add a placeholder highlights query files for rnoweb to enable treesitter highlighting
---
 queries/rnoweb/highlights.scm | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 queries/rnoweb/highlights.scm

diff --git a/queries/rnoweb/highlights.scm b/queries/rnoweb/highlights.scm
new file mode 100644
index 000000000..ab365f266
--- /dev/null
+++ b/queries/rnoweb/highlights.scm
@@ -0,0 +1 @@
+;; This file is a placeholder to enable the highlighting of injected languages.

From bef2c24e23d0da62a8542b1f08b1ac87ec43e93f Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 4 Nov 2023 06:35:32 +0000
Subject: [PATCH 0838/2704] Update parsers: dart, forth, gleam, rego, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f6b05acd1..9e9a2afd8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
   },
   "dart": {
-    "revision": "e14bbac8a0fcb6fab1b3becf6ed3fe464123c377"
+    "revision": "f71e310a93010863f4b17a2a501ea8e2032c345b"
   },
   "devicetree": {
     "revision": "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"
@@ -159,7 +159,7 @@
     "revision": "09e03445f49290450589c5d293610ab39434e3e4"
   },
   "forth": {
-    "revision": "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"
+    "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
     "revision": "f73d473e3530862dee7cbb38520f28824e7804f6"
@@ -192,7 +192,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "399172f660160258ede7d8e1d769f7fc5f61ff33"
+    "revision": "0589025ee57e335fe0698190a1bc322748d8f026"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -507,7 +507,7 @@
     "revision": "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"
   },
   "rego": {
-    "revision": "b2667c975f07b33be3ceb83bea5cfbad88095866"
+    "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
   },
   "requirements": {
     "revision": "eda424eade0f2afbafbf0c89d18c77818fa19273"
@@ -687,7 +687,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d3ab286ac986d1eaf2461d6924132fe26cb46764"
+    "revision": "61ed52fa76a1797b7d22b831959b3abbbfdb7a05"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From b3d2c36254aa79fe531ac94c475a5a57580d2907 Mon Sep 17 00:00:00 2001
From: Ramkumar Ramachandra <r@artagnon.com>
Date: Sun, 5 Nov 2023 12:21:47 +0000
Subject: [PATCH 0839/2704] mlir: update highlights.scm, parser

---
 lockfile.json               | 2 +-
 queries/mlir/highlights.scm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9e9a2afd8..021ed8d21 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -372,7 +372,7 @@
     "revision": "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"
   },
   "mlir": {
-    "revision": "e2053f7c8856d91bc36c87604f697784845cee69"
+    "revision": "650a8fb72013ba8d169bdb458e480d640fc545c9"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index a25d4c3f9..2037ff78e 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -84,8 +84,8 @@
   "arith.addui_extended"
   "arith.addf"
   "arith.divf"
-  "arith.maxf"
-  "arith.minf"
+  "arith.maximumf"
+  "arith.minimumf"
   "arith.mulf"
   "arith.remf"
   "arith.subf"
@@ -324,6 +324,7 @@
   "->"
 ] @operator
 
+(builtin_dialect name: (symbol_ref_id) @function)
 (func_dialect name: (symbol_ref_id) @function)
 (llvm_dialect name: (symbol_ref_id) @function)
 

From a82bba45fb0fb43fc2e7998f3394fadc80606d8a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 5 Nov 2023 12:48:18 +0000
Subject: [PATCH 0840/2704] Update parsers: awk, gleam, janet_simple, markdown,
 markdown_inline, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 021ed8d21..47c9a4180 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "90c8d9b47edcf7e2d67680c6649d5f6358d2ce06"
+    "revision": "fc5a51138717a5c766b30ad7438fcfc5ef291cb3"
   },
   "bash": {
     "revision": "7331995b19b8f8aba2d5e26deb51d2195c18bc94"
@@ -192,7 +192,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "0589025ee57e335fe0698190a1bc322748d8f026"
+    "revision": "11b843da16cbc4c536213ab4ba03a48fff6e3e10"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -279,7 +279,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "3c6f947f9039bbd803d9f3cf57dcee3783b3e2ce"
+    "revision": "069a6d300e09c725fa4d6e3dfe0d6468fb16ca54"
   },
   "java": {
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
@@ -354,10 +354,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"
+    "revision": "85d0f22d9e1a4f92cfd26d0237b108f067e2761a"
   },
   "markdown_inline": {
-    "revision": "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee"
+    "revision": "85d0f22d9e1a4f92cfd26d0237b108f067e2761a"
   },
   "matlab": {
     "revision": "6071891a8c39600203eba20513666cf93b4d650a"
@@ -687,7 +687,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "61ed52fa76a1797b7d22b831959b3abbbfdb7a05"
+    "revision": "b8056b854f933886e204e46a3001f007441ca1be"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 80f66cdef147bd8d8a619dfd9b18da37af5ceaf6 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 6 Nov 2023 11:04:13 +0900
Subject: [PATCH 0841/2704] injections(vue): inject typescript instead of js
 (#5577)

Interpolations (`{{valid js code}}`) and directive attributes
(`<element :directive="valid js code"`) can also be typescript code,
hence we can inject typescript instead of javascript here and still
be ok with highlights (bar some syntax differences between ts and js)
---
 queries/vue/injections.scm                         | 4 ++--
 tests/query/injections/vue/test-vue-injections.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index 57a264d9b..583a05c3f 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -57,12 +57,12 @@
 
 ((interpolation
   (raw_text) @injection.content)
-  (#set! injection.language "javascript"))
+  (#set! injection.language "typescript"))
 
 (directive_attribute
   (quoted_attribute_value
     (attribute_value) @injection.content
-    (#set! injection.language "javascript")))
+    (#set! injection.language "typescript")))
 
 (template_element
     (start_tag
diff --git a/tests/query/injections/vue/test-vue-injections.vue b/tests/query/injections/vue/test-vue-injections.vue
index 75d3d831c..773e53a5f 100644
--- a/tests/query/injections/vue/test-vue-injections.vue
+++ b/tests/query/injections/vue/test-vue-injections.vue
@@ -1,12 +1,12 @@
 <template>
   <span>{{"Text inside interpolation"}}</span>
-  <!--      ^ javascript -->
+  <!--      ^ typescript -->
 
   <template lang="pug"> a(:href="url") some link title in pug: </template>
   <!--                                       ^ pug -->
 
   <template v-if="'text inside directives'"></template>
-<!--              ^ javascript -->
+<!--              ^ typescript -->
 </template>
 <script> const foo = "1" </script>
 <!--      ^ javascript -->

From 96f55f304332ca6ea1b7dde32d3ec04b5298c316 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 06:49:36 +0000
Subject: [PATCH 0842/2704] Update parsers: awk, janet_simple, markdown,
 markdown_inline, wing (#5633)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 47c9a4180..918e45f4a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "fc5a51138717a5c766b30ad7438fcfc5ef291cb3"
+    "revision": "4b4b46c9a44ec7fb9e8c9ce4a010295edc5be8d5"
   },
   "bash": {
     "revision": "7331995b19b8f8aba2d5e26deb51d2195c18bc94"
@@ -279,7 +279,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "069a6d300e09c725fa4d6e3dfe0d6468fb16ca54"
+    "revision": "69d46e8a76f3c249e15652ac922be50ba39a2ee1"
   },
   "java": {
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
@@ -354,10 +354,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "85d0f22d9e1a4f92cfd26d0237b108f067e2761a"
+    "revision": "cd705f159127c947cd92ac163c6b17b5dcba7f94"
   },
   "markdown_inline": {
-    "revision": "85d0f22d9e1a4f92cfd26d0237b108f067e2761a"
+    "revision": "cd705f159127c947cd92ac163c6b17b5dcba7f94"
   },
   "matlab": {
     "revision": "6071891a8c39600203eba20513666cf93b4d650a"
@@ -687,7 +687,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "b8056b854f933886e204e46a3001f007441ca1be"
+    "revision": "aa19914c881eccb97c73318638e2cea26557b8d2"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From e903dd54e9ec17ff1e817fd858a0756aa4bf0c34 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Nov 2023 08:37:19 +0000
Subject: [PATCH 0843/2704] Update parsers: janet_simple, perl, swift, wing
 (#5634)

Co-authored-by: GitHub <noreply@github.com>
---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 918e45f4a..5e0079c62 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -279,7 +279,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "69d46e8a76f3c249e15652ac922be50ba39a2ee1"
+    "revision": "143b15e7a40b9fc2d9664d8357d3f2714bd8bf5f"
   },
   "java": {
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
@@ -429,7 +429,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "e99bb5283805db4cb86c964722d709df21b0ac16"
+    "revision": "3911403cba497196fb867a6f1e286e3e1576f425"
   },
   "php": {
     "revision": "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"
@@ -591,7 +591,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "7e4ccc97a25315022a70b730085deccd5680a39b"
+    "revision": "b3bfaad89426a062c2a5d971cfebb7262f8cff62"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -687,7 +687,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "aa19914c881eccb97c73318638e2cea26557b8d2"
+    "revision": "cac0b1d1cf9d9c864da1f8ade48e1eeaf3720814"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 9a746b4b6a1ef215943f07e6aa2ec35fb14097d4 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 3 Nov 2023 14:20:46 +0200
Subject: [PATCH 0844/2704] feat: add udev rules parser

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  9 ++++++
 queries/udev/highlights.scm     | 53 +++++++++++++++++++++++++++++++++
 queries/udev/injections.scm     | 12 ++++++++
 5 files changed, 78 insertions(+)
 create mode 100644 queries/udev/highlights.scm
 create mode 100644 queries/udev/injections.scm

diff --git a/README.md b/README.md
index 4ebdd4a15..745735c74 100644
--- a/README.md
+++ b/README.md
@@ -389,6 +389,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) (maintained by @Teddytrombone)
+- [x] [udev](https://github.com/ObserverOfTime/tree-sitter-udev) (maintained by @ObserverOfTime)
 - [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
 - [x] [unison](https://github.com/kylegoetz/tree-sitter-unison) (maintained by @tapegram)
 - [x] [usd](https://github.com/ColinKennedy/tree-sitter-usd) (maintained by @ColinKennedy)
diff --git a/lockfile.json b/lockfile.json
index 5e0079c62..b67877270 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -647,6 +647,9 @@
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
+  "udev": {
+    "revision": "e3ad4cb3c59e4c71a177cd4af62958749e53a8bd"
+  },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ac0cda658..17e59046a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1898,6 +1898,15 @@ list.typoscript = {
   maintainers = { "@Teddytrombone" },
 }
 
+list.udev = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-udev",
+    files = { "src/parser.c" },
+  },
+  filetype = "udevrules",
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.ungrammar = {
   install_info = {
     url = "https://github.com/Philipp-M/tree-sitter-ungrammar",
diff --git a/queries/udev/highlights.scm b/queries/udev/highlights.scm
new file mode 100644
index 000000000..1a8514ea8
--- /dev/null
+++ b/queries/udev/highlights.scm
@@ -0,0 +1,53 @@
+(match key: _ @keyword)
+
+(assignment key: _ @property)
+
+(value) @string
+
+; NOTE: higher priorities override bash highlights
+
+((fmt_sub . _ @character.special)
+ (#set! "priority" 101))
+
+((var_sub . _ @variable.builtin)
+ (#set! "priority" 101))
+
+[
+  (system_const)
+  (run_type)
+  (import_type)
+  (kernel_param)
+  (seclabel)
+] @attribute
+
+((attribute) @attribute
+ (#set! "priority" 101))
+
+((env_var) @constant
+ (#set! "priority" 101))
+
+((pattern) @string.special
+ (#set! "priority" 101))
+
+([ "\\\"" (c_escape) ] @string.escape
+ (#set! "priority" 101))
+
+(octal) @number
+
+((number) @number
+ (#set! "priority" 101))
+
+[
+  (match_op)
+  (assignment_op)
+] @operator
+
+("+" @punctuation.special
+ (#set! "priority" 101))
+
+([ "{" "}" ] @punctuation.bracket
+ (#set! "priority" 101))
+
+[ "," (linebreak) ] @punctuation.delimiter
+
+(comment) @comment @spell
diff --git a/queries/udev/injections.scm b/queries/udev/injections.scm
new file mode 100644
index 000000000..5618e65de
--- /dev/null
+++ b/queries/udev/injections.scm
@@ -0,0 +1,12 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((match
+   key: "PROGRAM"
+   (value (content) @injection.content))
+ (#set! injection.language "bash"))
+
+((assignment
+   key: "RUN"
+   (value (content) @injection.content))
+ (#set! injection.language "bash"))

From eacb5e9468665d842d2d25e857cad8f6d95c57fd Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 7 Nov 2023 22:51:33 -0500
Subject: [PATCH 0845/2704] chore(bitbake): update highlights from upstream

---
 lockfile.json                  | 2 +-
 queries/bitbake/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b67877270..1b001ba12 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
   "bitbake": {
-    "revision": "6cb07d98f1cad180b8ea28965e59ee05023a5693"
+    "revision": "edcdb7dffd0e1680c60d489a625ab119e0d273a0"
   },
   "blueprint": {
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index d61889acd..46eaf11e3 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -200,7 +200,7 @@
 
 ; Namespace
 
-(inherit_directive (identifier) @namespace)
+(inherit_path) @namespace
 
 ;; Normal parameters
 (parameters

From ec09e52d41a9546283fc291845481428c0c6cdc4 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 8 Nov 2023 07:09:21 +0000
Subject: [PATCH 0846/2704] Update parsers: janet_simple, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1b001ba12..718450e15 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -279,7 +279,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "143b15e7a40b9fc2d9664d8357d3f2714bd8bf5f"
+    "revision": "77f8418fdba7b402350e4817bbb54816bbc627d2"
   },
   "java": {
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
@@ -690,7 +690,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "cac0b1d1cf9d9c864da1f8ade48e1eeaf3720814"
+    "revision": "0dedb057b5c508971abd7fcc0b12fcbe823927b8"
   },
   "xml": {
     "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"

From 629cae1f0fd0c18b4b8b203299d8b15378c6b860 Mon Sep 17 00:00:00 2001
From: Willem-J-an <51120533+Willem-J-an@users.noreply.github.com>
Date: Wed, 8 Nov 2023 10:11:19 +0100
Subject: [PATCH 0847/2704] feat(kusto): add kusto parser and highlights
 (#5632)

* feat(kusto): add kusto parser and highlights

* feat(kusto): improve highlights

* Update queries/kusto/highlights.scm

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

* chore(kusto): remove unneeded filetype

---------

Co-authored-by: Willem Jan Noort <noortw01@heiway.net>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/kusto/highlights.scm    | 52 +++++++++++++++++++++++++++++++++
 queries/kusto/injections.scm    |  2 ++
 4 files changed, 65 insertions(+)
 create mode 100644 queries/kusto/highlights.scm
 create mode 100644 queries/kusto/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 718450e15..0f623b2a9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -317,6 +317,9 @@
   "kotlin": {
     "revision": "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8"
   },
+  "kusto": {
+    "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
+  },
   "lalrpop": {
     "revision": "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 17e59046a..9c4ac31f9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -968,6 +968,14 @@ list.kotlin = {
   maintainers = { "@SalBakraa" },
 }
 
+list.kusto = {
+  install_info = {
+    url = "https://github.com/Willem-J-an/tree-sitter-kusto",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Willem-J-an" },
+}
+
 list.lalrpop = {
   install_info = {
     url = "https://github.com/traxys/tree-sitter-lalrpop",
diff --git a/queries/kusto/highlights.scm b/queries/kusto/highlights.scm
new file mode 100644
index 000000000..825f49b35
--- /dev/null
+++ b/queries/kusto/highlights.scm
@@ -0,0 +1,52 @@
+(identifier) @variable
+
+(let_keyword) @keyword
+
+(function_call
+  (identifier) @function.call)
+[
+  (type_cast_function)
+  (to_scalar_function)
+  (between_function)
+  (datatable_function)
+] @function.call
+
+(typed_parameter
+  (identifier) @parameter)
+(function_arguments (identifier) @parameter)
+
+[
+  (binary_operator)
+  (compound_keywords)
+  (operator)
+  (range_operator)
+  (join_operator)
+  (sub_operator)
+  (to_operator)
+  (mv_apply_operator)
+  (sort_keyword)
+] @keyword.operator
+
+(string) @string
+(number) @number
+(bool) @boolean
+(null) @constant.builtin
+(comment) @comment @spell
+
+(type) @type
+(join_types) @type.qualifier
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  ","
+  ":"
+  (pipe)
+] @punctuation.delimiter
diff --git a/queries/kusto/injections.scm b/queries/kusto/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/kusto/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 44d1684db35d4e2ee7c254fc06251035252006c9 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Wed, 8 Nov 2023 09:11:30 +0000
Subject: [PATCH 0848/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 745735c74..494810baf 100644
--- a/README.md
+++ b/README.md
@@ -279,6 +279,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
 - [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)
 - [x] [kotlin](https://github.com/fwcd/tree-sitter-kotlin) (maintained by @SalBakraa)
+- [x] [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) (maintained by @Willem-J-an)
 - [x] [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) (maintained by @traxys)
 - [x] [latex](https://github.com/latex-lsp/tree-sitter-latex) (maintained by @theHamsta, @clason)
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)

From bf18ff20ae4d7b667b5e7ede0244c6596427d69e Mon Sep 17 00:00:00 2001
From: postsolar <120750161+postsolar@users.noreply.github.com>
Date: Wed, 8 Nov 2023 18:07:02 +0200
Subject: [PATCH 0849/2704] feat(purescript): add parser and queries (#5626)

---
 lockfile.json                     |   3 +
 lua/nvim-treesitter/parsers.lua   |   8 ++
 queries/purescript/highlights.scm | 152 ++++++++++++++++++++++++++++++
 queries/purescript/injections.scm |   2 +
 queries/purescript/locals.scm     |   4 +
 5 files changed, 169 insertions(+)
 create mode 100644 queries/purescript/highlights.scm
 create mode 100644 queries/purescript/injections.scm
 create mode 100644 queries/purescript/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 0f623b2a9..bbff16fa8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -476,6 +476,9 @@
   "puppet": {
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
+  "purescript": {
+    "revision": "e055b28b2f81db9fdd277b07bff3329c3680943e"
+  },
   "pymanifest": {
     "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9c4ac31f9..2671a7ae7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1418,6 +1418,14 @@ list.puppet = {
   maintainers = { "@amaanq" },
 }
 
+list.purescript = {
+  install_info = {
+    url = "https://github.com/postsolar/tree-sitter-purescript",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@postsolar" },
+}
+
 list.pymanifest = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-pymanifest",
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
new file mode 100644
index 000000000..3e3ec3cb8
--- /dev/null
+++ b/queries/purescript/highlights.scm
@@ -0,0 +1,152 @@
+; ----------------------------------------------------------------------------
+; Literals and comments
+
+[
+  (integer)
+  (exp_negation)
+] @number
+ (exp_literal (number)) @float
+ (char) @character
+ [
+   (string)
+   (triple_quote_string)
+ ] @string
+
+ (comment) @comment @spell
+
+; ----------------------------------------------------------------------------
+; Punctuation
+
+ [
+   "("
+   ")"
+   "{"
+   "}"
+   "["
+   "]"
+ ] @punctuation.bracket
+
+ [
+ (comma)
+ ";"
+ (qualified_module)  ; grabs the `.` (dot), ex: import System.IO
+ "."
+ ] @punctuation.delimiter
+
+
+; ----------------------------------------------------------------------------
+; Keywords, operators, includes
+
+ [
+   "if"
+   "then"
+   "else"
+   "case"
+   "of"
+ ] @conditional
+
+ [
+   "import"
+   "module"
+ ] @include
+
+ [
+   (operator)
+   (constructor_operator)
+   (type_operator)
+   (all_names)
+
+   "="
+   "|"
+   "::"
+   "∷"
+   "=>"
+   "⇒"
+   "<="
+   "⇐"
+   "->"
+   "→"
+   "<-"
+   "←"
+   "\\"
+   "`"
+   "@"
+ ] @operator
+
+ (qualified_module (module) @constructor)
+ (module) @namespace
+ (qualified_type (module) @namespace)
+ (qualified_variable (module) @namespace)
+ (import (module) @namespace)
+
+ [
+   (where)
+   "let"
+   "in"
+   "class"
+   "instance"
+   "derive"
+   "foreign"
+   "data"
+   "newtype"
+   "type"
+   "as"
+   "hiding"
+   "do"
+   "ado"
+   "forall"
+   "∀"
+   "infix"
+   "infixl"
+   "infixr"
+ ] @keyword
+
+ (class_instance "else" @keyword)
+
+ (type_role_declaration
+   "role" @keyword
+   role: (type_role) @type.qualifier)
+
+ (hole) @character.special
+
+ ; `_` wildcards in if-then-else and case-of expressions,
+ ; as well as record updates and operator sections
+ (wildcard) @parameter
+
+; ----------------------------------------------------------------------------
+; Functions and variables
+
+ (variable) @variable
+ (exp_apply . (exp_name (variable) @function))
+ (exp_apply . (exp_name (qualified_variable (variable) @function)))
+
+ (row_field (field_name) @field)
+ (record_field (field_name) @field)
+ (record_accessor (variable) @field)
+ (exp_record_access (variable) @field)
+
+ (signature name: (variable) @type)
+ (kind_declaration (class_name) @type)
+ (function name: (variable) @function)
+ (foreign_import (variable) @function)
+ (class_instance (instance_name) @function)
+ (derive_declaration (instance_name) @function)
+
+ ; true or false
+ ((variable) @boolean
+  (#any-of? @boolean "true" "false"))
+
+ ; The former one works for `tree-sitter highlight` but not in Helix/Kakoune.
+ ; The latter two work in Helix (but not Kakoune) and are a good compromise between not highlighting anything at all
+ ; as an operator and leaving it to the child nodes, and highlighting everything as an operator.
+ (exp_ticked (_) @operator)
+ (exp_ticked (exp_name (variable) @operator))
+ (exp_ticked (exp_name (qualified_variable (variable) @operator)))
+
+; ----------------------------------------------------------------------------
+; Types
+
+ (type) @type
+
+ (constructor) @constructor
+
diff --git a/queries/purescript/injections.scm b/queries/purescript/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/purescript/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/purescript/locals.scm b/queries/purescript/locals.scm
new file mode 100644
index 000000000..d8219bf43
--- /dev/null
+++ b/queries/purescript/locals.scm
@@ -0,0 +1,4 @@
+(signature name: (variable)) @definition.type
+(function name: (variable)) @definition.function
+(pat_name (variable)) @definition
+(exp_name (variable)) @reference

From 7b26b085880f5c99c9e6109c81ed3b08db90ce50 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Wed, 8 Nov 2023 16:07:17 +0000
Subject: [PATCH 0850/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 494810baf..97e9b7648 100644
--- a/README.md
+++ b/README.md
@@ -332,6 +332,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [psv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
 - [x] [puppet](https://github.com/amaanq/tree-sitter-puppet) (maintained by @amaanq)
+- [x] [purescript](https://github.com/postsolar/tree-sitter-purescript) (maintained by @postsolar)
 - [x] [PyPA manifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) (maintained by @ObserverOfTime)
 - [x] [python](https://github.com/tree-sitter/tree-sitter-python) (maintained by @stsewd, @theHamsta)
 - [x] [ql](https://github.com/tree-sitter/tree-sitter-ql) (maintained by @pwntester)

From 8996612bfbebe1657e1bb55a95201c96cab945c6 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 9 Nov 2023 06:35:50 +0000
Subject: [PATCH 0851/2704] Update parsers: arduino, bitbake, chatito, dtd,
 erlang, gitattributes, gleam, kotlin, purescript, v, wing, xml

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bbff16fa8..97d5a06c4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"
   },
   "arduino": {
-    "revision": "db929fc6822b9b9e1211678d508f187894ce0345"
+    "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
   },
   "astro": {
     "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
@@ -36,7 +36,7 @@
     "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
   "bitbake": {
-    "revision": "edcdb7dffd0e1680c60d489a625ab119e0d273a0"
+    "revision": "ffe6c2f3dbf30224479a28ca5d50df594b2486a9"
   },
   "blueprint": {
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
@@ -54,7 +54,7 @@
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
-    "revision": "c80c219da2086696202cec8fc2501c02f4819a3f"
+    "revision": "871622a3a483f0baf94923d8495c8e0bb2c09009"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
@@ -117,7 +117,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
+    "revision": "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -144,7 +144,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "bb06a83db4f0c176875d9d49756b760d15211134"
+    "revision": "35ae91b2e9f5514c0ad6d6887f9859f28907c7d5"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -183,7 +183,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "f58a4a4bc55b9b43dfa7c4106257422764f97776"
+    "revision": "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"
   },
   "gitcommit": {
     "revision": "6856a5fd0ffeff17d83325a8ce4e57811010eff1"
@@ -192,7 +192,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "11b843da16cbc4c536213ab4ba03a48fff6e3e10"
+    "revision": "3f93cccaf278cc4c9cf9a373ea2f6389174d634c"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -315,7 +315,7 @@
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
   },
   "kotlin": {
-    "revision": "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8"
+    "revision": "0ef87892401bb01c84b40916e1f150197bc134b1"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -477,7 +477,7 @@
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "purescript": {
-    "revision": "e055b28b2f81db9fdd277b07bff3329c3680943e"
+    "revision": "5ef5592674ea42de75fc2792972e4ea0b6e3da6c"
   },
   "pymanifest": {
     "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
@@ -669,7 +669,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "e14fdf6e661b10edccc744102e4ccf0b187aa8ad"
+    "revision": "1ddb381210fbb54764710a644761ebb3afefefe8"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -696,10 +696,10 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0dedb057b5c508971abd7fcc0b12fcbe823927b8"
+    "revision": "8e6ae63a557c92d662161607d43c3a0bfbd76dec"
   },
   "xml": {
-    "revision": "9deacbfb79cb3527a0396255beb17e1bba3f2052"
+    "revision": "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From b09d645098844d1fc250ef8c7087846e4bdae32f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 8 Nov 2023 15:00:36 +0200
Subject: [PATCH 0852/2704] fix(kotlin): improve highlights

Co-authored-by: Anthony Shi <69449791+anthony-S93@users.noreply.github.com>
---
 queries/kotlin/highlights.scm | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index f7b1b8c4d..36bf148f9 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -14,11 +14,15 @@
 ((simple_identifier) @variable.builtin
 (#eq? @variable.builtin "field"))
 
-; `this` this keyword inside classes
-(this_expression) @variable.builtin
+[
+	"this"
+	"super"
+	"this@"
+	"super@"
+] @variable.builtin
 
-; `super` keyword inside classes
-(super_expression) @variable.builtin
+; NOTE: for consistency with "super@"
+(super_expression "@" @variable.builtin)
 
 (class_parameter
 	(simple_identifier) @property)
@@ -114,8 +118,6 @@
 		(type_identifier) @function)?
 		(#lua-match? @_import "^[a-z]"))
 
-; TODO: Separate labeled returns/breaks/continue/super/this
-;       Must be implemented in the parser first
 (label) @label
 
 ;;; Function definitions
@@ -309,14 +311,13 @@
 ] @keyword
 
 [
-  "suspend"
-] @keyword.coroutine
+	"return"
+	"return@"
+] @keyword.return
 
-[
-  "fun"
-] @keyword.function
+"suspend" @keyword.coroutine
 
-(jump_expression) @keyword.return
+"fun" @keyword.function
 
 [
 	"if"
@@ -328,6 +329,10 @@
 	"for"
 	"do"
 	"while"
+	"continue"
+	"continue@"
+	"break"
+	"break@"
 ] @repeat
 
 [
@@ -412,6 +417,10 @@
 	"::"
 ] @punctuation.delimiter
 
+(super_expression [ "<" ">" ] @punctuation.delimiter)
+(type_arguments [ "<" ">" ] @punctuation.delimiter)
+(type_parameters [ "<" ">" ] @punctuation.delimiter)
+
 ; NOTE: `interpolated_identifier`s can be highlighted in any way
 (string_literal
 	"$" @punctuation.special

From 208504c7072ca81e8bf9fa2e666cf3436dfc0ef5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 10 Nov 2023 06:36:57 +0000
Subject: [PATCH 0853/2704] Update parsers: go, gpg, poe_filter, ssh_config,
 tlaplus, udev, v, wing

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 97d5a06c4..1cf2a030f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -204,7 +204,7 @@
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
   },
   "go": {
-    "revision": "bbaa67a180cfe0c943e50c55130918be8efb20bd"
+    "revision": "ff86c7f1734873c8c4874ca4dd95603695686d7a"
   },
   "godot_resource": {
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
@@ -219,7 +219,7 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "9c26b66d6bca0bd0520269e98241709806561bd5"
+    "revision": "18b2690a15f061a6ff48730589f7a4039af2d002"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
@@ -450,7 +450,7 @@
     "revision": "ea5d557cbd185cdcb5efcfdb6bc846fe909d86ae"
   },
   "poe_filter": {
-    "revision": "d7b43b51f92fb19efe8af45c2246087c611c8f63"
+    "revision": "374f618de179498c2a821136bb86c3edbe221e10"
   },
   "pony": {
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
@@ -579,7 +579,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "9dcfe0f30ccbde8115790c72acbde4c04ec8e74e"
+    "revision": "6ac08decae456ef2fc307977d9210f86d75d4eca"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -627,7 +627,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "7ba226cf85280c7917d082940022006e6a3b7b6f"
+    "revision": "204e858899f7dd5713dea7b0148d6aa477d4a18f"
   },
   "todotxt": {
     "revision": "0207f6a4ab6aeafc4b091914d31d8235049a2578"
@@ -654,7 +654,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "udev": {
-    "revision": "e3ad4cb3c59e4c71a177cd4af62958749e53a8bd"
+    "revision": "baeac48a999abb9384cdcce320f0182937aec8ba"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -669,7 +669,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "1ddb381210fbb54764710a644761ebb3afefefe8"
+    "revision": "099a85fbd34a8b9db9f83da19f184bd4c1886e7c"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -696,7 +696,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "8e6ae63a557c92d662161607d43c3a0bfbd76dec"
+    "revision": "a30e8eca90b7a7deb3a85503dbdd172a68ba0e05"
   },
   "xml": {
     "revision": "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"

From 04a9a90c2a60c86aa9451c539586326b337b03e5 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 14:20:30 +0200
Subject: [PATCH 0854/2704] fix(htmldjango): improve highlights

---
 queries/html_tags/highlights.scm  |  3 ++-
 queries/htmldjango/highlights.scm | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index d51f9b27e..8d39afd49 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -2,8 +2,9 @@
 (erroneous_end_tag_name) @error
 (comment) @comment @spell
 (attribute_name) @tag.attribute
-(attribute
+((attribute
   (quoted_attribute_value) @string)
+ (#set! "priority" 99))
 (text) @text @spell
 
 ((element (start_tag (tag_name) @_tag) (text) @text.title)
diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index 848b455dd..814c7c420 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -23,13 +23,26 @@
 
 (keyword) @keyword
 
-(operator) @operator
-(variable "|" @operator)
-(paired_statement "=" @operator)
+[
+ "|"
+ "="
+ (operator)
+] @operator
 (keyword_operator) @keyword.operator
 
+(string) @string
+(filter [ "'" "\"" ] . (filter_argument) @string)
+
 (number) @number
+((filter (filter_argument) @number)
+ (#lua-match? @number "^%d+$"))
 
 (boolean) @boolean
+((filter (filter_argument) @boolean)
+ (#any-of? @boolean "True" "False"))
 
-(string) @string
+[
+  ":"
+  "'"
+  "\""
+] @punctuation.delimiter

From d4fb7557ba0ee203f18b3f290d80a8940f2d637d Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 00:23:42 +0200
Subject: [PATCH 0855/2704] feat: add xcompose parser

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/xcompose/highlights.scm | 20 ++++++++++++++++++++
 queries/xcompose/injections.scm |  2 ++
 5 files changed, 34 insertions(+)
 create mode 100644 queries/xcompose/highlights.scm
 create mode 100644 queries/xcompose/injections.scm

diff --git a/README.md b/README.md
index 97e9b7648..e1514e8ea 100644
--- a/README.md
+++ b/README.md
@@ -406,6 +406,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
 - [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka)
+- [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
 - [x] [xml](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
diff --git a/lockfile.json b/lockfile.json
index 1cf2a030f..19971be49 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -698,6 +698,9 @@
   "wing": {
     "revision": "a30e8eca90b7a7deb3a85503dbdd172a68ba0e05"
   },
+  "xcompose": {
+    "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
+  },
   "xml": {
     "revision": "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2671a7ae7..40491c7ff 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2046,6 +2046,14 @@ list.wing = {
   experimental = true,
 }
 
+list.xcompose = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-xcompose",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.xml = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-xml",
diff --git a/queries/xcompose/highlights.scm b/queries/xcompose/highlights.scm
new file mode 100644
index 000000000..48366985d
--- /dev/null
+++ b/queries/xcompose/highlights.scm
@@ -0,0 +1,20 @@
+(keysym) @constant
+
+((keysym) @constant.builtin
+ (#eq? @constant.builtin "Multi_key"))
+
+(text) @string
+
+"include" @include
+
+[ (octal) (hex) ] @number
+
+[ (modifier) "None" ] @type.qualifier
+
+[ "%L" "%H" "%S" ] @string.special
+
+[ "!" "~" ] @operator
+
+[ ":" "<" ">" "\"" ] @punctuation.delimiter
+
+(comment) @comment @spell
diff --git a/queries/xcompose/injections.scm b/queries/xcompose/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/xcompose/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From f53e6e82df8efb17b9b04d2f6d5ad64755786b7e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 10 Nov 2023 14:08:50 -0500
Subject: [PATCH 0856/2704] fix(cpp): highlight constexpr

---
 queries/cpp/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index bce3f9061..21c3c4e59 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -191,6 +191,7 @@
  "using"
  "concept"
  "requires"
+ "constexpr"
 ] @keyword
 
 [

From c543ffae1c34a92fb647505f2165b35f68c113c4 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 10 Nov 2023 16:04:40 -0500
Subject: [PATCH 0857/2704] fix(ecma): prioritize builtins

---
 queries/ecma/highlights.scm | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 2c921b2b2..664421701 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -74,22 +74,6 @@
            "TypeError"
            "URIError"))
 
-((identifier) @namespace.builtin
- (#eq? @namespace.builtin "Intl"))
-
-((identifier) @function.builtin
- (#any-of? @function.builtin
-           "eval"
-           "isFinite"
-           "isNaN"
-           "parseFloat"
-           "parseInt"
-           "decodeURI"
-           "decodeURIComponent"
-           "encodeURI"
-           "encodeURIComponent"
-           "require"))
-
 ; Function and method definitions
 ;--------------------------------
 
@@ -147,6 +131,25 @@
   function: (member_expression
     property: [(property_identifier) (private_property_identifier)] @method.call))
 
+; Builtins
+;---------
+
+((identifier) @namespace.builtin
+ (#eq? @namespace.builtin "Intl"))
+
+((identifier) @function.builtin
+ (#any-of? @function.builtin
+           "eval"
+           "isFinite"
+           "isNaN"
+           "parseFloat"
+           "parseInt"
+           "decodeURI"
+           "decodeURIComponent"
+           "encodeURI"
+           "encodeURIComponent"
+           "require"))
+
 ; Constructor
 ;------------
 

From 42053b9db3275e1c17ace0da6beb57aa50023ae1 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 11 Nov 2023 06:35:43 +0000
Subject: [PATCH 0858/2704] Update parsers: bitbake, groovy, janet_simple,
 liquidsoap, markdown, markdown_inline, pymanifest, requirements, sql, wing

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 19971be49..81a814f17 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
   "bitbake": {
-    "revision": "ffe6c2f3dbf30224479a28ca5d50df594b2486a9"
+    "revision": "10bacac929ff36a1e8f4056503fe4f8717b21b94"
   },
   "blueprint": {
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
@@ -225,7 +225,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "ae8aa51ec3275afb567a4a67df1a26d89feb135f"
+    "revision": "7e023227f46fee428b16a0288eeb0f65ee2523ec"
   },
   "gstlaunch": {
     "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
@@ -279,7 +279,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "77f8418fdba7b402350e4817bbb54816bbc627d2"
+    "revision": "51271e260346878e1a1aa6c506ce6a797b7c25e2"
   },
   "java": {
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
@@ -333,7 +333,7 @@
     "revision": "91d7aa606f524cf4f5df7f4aacb45b4056fac704"
   },
   "liquidsoap": {
-    "revision": "cff1fea7c2ef9eed066a4d3de8af6cb4d7117056"
+    "revision": "b35882f2e1460867ddddcbe8af586e6807d4676f"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -357,10 +357,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "cd705f159127c947cd92ac163c6b17b5dcba7f94"
+    "revision": "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"
   },
   "markdown_inline": {
-    "revision": "cd705f159127c947cd92ac163c6b17b5dcba7f94"
+    "revision": "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"
   },
   "matlab": {
     "revision": "6071891a8c39600203eba20513666cf93b4d650a"
@@ -480,7 +480,7 @@
     "revision": "5ef5592674ea42de75fc2792972e4ea0b6e3da6c"
   },
   "pymanifest": {
-    "revision": "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"
+    "revision": "a77547018ada84ca4bc115c7650b19441120f065"
   },
   "python": {
     "revision": "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"
@@ -516,7 +516,7 @@
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
   },
   "requirements": {
-    "revision": "eda424eade0f2afbafbf0c89d18c77818fa19273"
+    "revision": "389dd46a39075ce36af6ee3af50393d9aa506d14"
   },
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
@@ -573,7 +573,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "25be0b8f17e9189ad9e1b875869d025c5aec1286"
+    "revision": "5f928f404d2aa024abce8657778fc10c03f1511f"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -696,7 +696,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "a30e8eca90b7a7deb3a85503dbdd172a68ba0e05"
+    "revision": "238200d172538d5ff1228a929ea543465acfc410"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 075a64addc33390028ea124a1046a43497f05cd1 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 21 Sep 2023 14:28:01 -0700
Subject: [PATCH 0859/2704] feat: highlight regular latex text to maintain
 consistency with boldfaced and italic text

---
 queries/latex/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index d0283c2e7..10e02ed1b 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -184,6 +184,9 @@
  (#eq? @_name "\\frametitle"))
 
 ;; Formatting
+(text_mode
+  content: (curly_group (_) @text))
+
 ((generic_command
   command: (command_name) @_name
   arg: (curly_group (_) @text.emphasis))

From 17e77749c1f14f7e2bbae8c92c1b1cad1c2f26a9 Mon Sep 17 00:00:00 2001
From: Mark McCulloh <Mark.McCulloh@gmail.com>
Date: Mon, 13 Nov 2023 14:04:27 -0500
Subject: [PATCH 0860/2704] fix(wing): update parser and queries, add
 maintainer (#5671)

---
 lockfile.json                       | 2 +-
 lua/nvim-treesitter/parsers.lua     | 2 +-
 queries/wing/folds.scm              | 1 -
 queries/wing/highlights.scm         | 3 ---
 tests/query/highlights/wing/class.w | 4 ++--
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 81a814f17..04b0b5592 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -696,7 +696,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "238200d172538d5ff1228a929ea543465acfc410"
+    "revision": "d6af9180bfbd82b01980e7e5307d77ed3939e2a7"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 40491c7ff..9bd3521ef 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2042,7 +2042,7 @@ list.wing = {
     location = "libs/tree-sitter-wing",
     requires_generate_from_grammar = true,
   },
-  maintainers = { "@gshpychka" },
+  maintainers = { "@gshpychka", "@MarkMcCulloh" },
   experimental = true,
 }
 
diff --git a/queries/wing/folds.scm b/queries/wing/folds.scm
index 538367db3..60de6116d 100644
--- a/queries/wing/folds.scm
+++ b/queries/wing/folds.scm
@@ -12,5 +12,4 @@
   (enum_definition)
   (try_catch_statement)
   (method_definition)
-  (inflight_method_definition)
 ] @fold
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 0e8bd6492..af5ef6ed6 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -11,8 +11,6 @@
   name: (identifier) @type)
 (method_definition
   name: (identifier) @method)
-(inflight_method_definition
-  name: (identifier) @method)
 
 ; Functions
 
@@ -78,7 +76,6 @@
   "for"
   "if"
   "in"
-  "init"
   "let"
   "new"
   "return"
diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
index 636cbc601..06160d741 100644
--- a/tests/query/highlights/wing/class.w
+++ b/tests/query/highlights/wing/class.w
@@ -9,9 +9,9 @@ class Foo {
 //^    field
 //      ^   type.builtin
 //         ^ punctuation.delimiter
-  init(name:  str) {
+  new(name:  str) {
 //^    keyword
-//     ^    variable
+//    ^    variable
     this.name = name;
 //      ^ punctuation.delimiter
 //            ^ operator

From 31381e38854072686449bd7ad2044deeba609ab2 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 13 Nov 2023 19:04:40 +0000
Subject: [PATCH 0861/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e1514e8ea..2932165ff 100644
--- a/README.md
+++ b/README.md
@@ -405,7 +405,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vue](https://github.com/ikatyang/tree-sitter-vue) (maintained by @WhyNotHugo)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
-- [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka)
+- [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka, @MarkMcCulloh)
 - [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
 - [x] [xml](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)

From 2241f81d74a3de7f8ae1517bbfc24c319218d9a0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 13 Nov 2023 19:08:29 +0000
Subject: [PATCH 0862/2704] Update parsers: gleam, hcl, hlsl, ini, leo,
 markdown, markdown_inline, purescript, sql, terraform, tlaplus

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 04b0b5592..2b17335ef 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,7 +192,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "3f93cccaf278cc4c9cf9a373ea2f6389174d634c"
+    "revision": "b2afa4fd6bb41a7bf912b034c653c90af7ae5122"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -243,7 +243,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
+    "revision": "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"
   },
   "heex": {
     "revision": "4a36c9a388505180da6ee0eda1d8afb8c83481c8"
@@ -252,7 +252,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "f2902bd614e3916bdf65e1bc9ad45ebd08417bba"
+    "revision": "ac65c934b3214e96e0f854be009a3bd51549bd14"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -273,7 +273,7 @@
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
   },
   "ini": {
-    "revision": "7f11a02fb8891482068e0fe419965d7bade81a68"
+    "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
@@ -330,7 +330,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "91d7aa606f524cf4f5df7f4aacb45b4056fac704"
+    "revision": "23a9534d09d523d0dcee7dbf89e7c819e6835f6f"
   },
   "liquidsoap": {
     "revision": "b35882f2e1460867ddddcbe8af586e6807d4676f"
@@ -357,10 +357,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"
+    "revision": "f9820b2db958228f9be339b67d2de874d065866e"
   },
   "markdown_inline": {
-    "revision": "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"
+    "revision": "f9820b2db958228f9be339b67d2de874d065866e"
   },
   "matlab": {
     "revision": "6071891a8c39600203eba20513666cf93b4d650a"
@@ -477,7 +477,7 @@
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "purescript": {
-    "revision": "5ef5592674ea42de75fc2792972e4ea0b6e3da6c"
+    "revision": "f89bd149e44624342bf49f76245d3284f2beed9a"
   },
   "pymanifest": {
     "revision": "a77547018ada84ca4bc115c7650b19441120f065"
@@ -573,7 +573,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "5f928f404d2aa024abce8657778fc10c03f1511f"
+    "revision": "1dcf6bd933af6271c609566a3c1204c920efbca5"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -615,7 +615,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "terraform": {
-    "revision": "b5539065432c08e4118eb3ee7c94902fdda85708"
+    "revision": "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"
   },
   "textproto": {
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
@@ -627,7 +627,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "204e858899f7dd5713dea7b0148d6aa477d4a18f"
+    "revision": "d99cb5c77bb0e733176d607a0875ac30e17e1e72"
   },
   "todotxt": {
     "revision": "0207f6a4ab6aeafc4b091914d31d8235049a2578"

From c0da2013d1cef768c00f3f0b7f365fe19a10bca3 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 14 Nov 2023 06:36:25 +0000
Subject: [PATCH 0863/2704] Update parsers: objdump, sql, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2b17335ef..a583f040d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -405,7 +405,7 @@
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
   },
   "objdump": {
-    "revision": "64e4741d58345c36ded639f5a3bcd7811be7f8f8"
+    "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
     "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
@@ -573,7 +573,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "1dcf6bd933af6271c609566a3c1204c920efbca5"
+    "revision": "9fe5aeaa8d58d00cc31c20a3ae923ae695ce2ce7"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -696,7 +696,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d6af9180bfbd82b01980e7e5307d77ed3939e2a7"
+    "revision": "c48ce7e07cf2834c538be9e8ec653a244245c8a6"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 8b9f99660294dcd11d42572c84ee33a1e284f70d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 15 Nov 2023 06:37:26 +0000
Subject: [PATCH 0864/2704] Update parsers: cpp, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a583f040d..82429e8eb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "a90f170f92d5d70e7c2d4183c146e61ba5f3a457"
+    "revision": "d153fe1c3385ee0521730ff4e0be9358e903b322"
   },
   "css": {
     "revision": "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"
@@ -696,7 +696,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "c48ce7e07cf2834c538be9e8ec653a244245c8a6"
+    "revision": "eacf704338661b981fcf4fdb5ee44d898f038144"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From da6646c3e51cf10b8da1cb89be9aaf60ab41c6a3 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann <vincent@rischmann.fr>
Date: Thu, 16 Nov 2023 22:12:55 +0100
Subject: [PATCH 0865/2704] feat: add templ

---------

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++
 queries/templ/highlights.scm    | 47 +++++++++++++++++++++++++++++++++
 queries/templ/injections.scm    |  8 ++++++
 4 files changed, 66 insertions(+)
 create mode 100644 queries/templ/highlights.scm
 create mode 100644 queries/templ/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 82429e8eb..9a89d29e6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -715,5 +715,8 @@
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
+  },
+  "templ": {
+    "revision": "94ea27668915ef8f084c9fd7174cfd384ac9a275"
   }
 }
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9bd3521ef..9077bc8d4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2095,6 +2095,14 @@ list.zig = {
   maintainers = { "@maxxnino" },
 }
 
+list.templ = {
+  install_info = {
+    url = "https://github.com/vrischmann/tree-sitter-templ",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@vrischmann" },
+}
+
 local M = {
   list = list,
   filetype_to_parsername = filetype_to_parsername,
diff --git a/queries/templ/highlights.scm b/queries/templ/highlights.scm
new file mode 100644
index 000000000..a7a0718e6
--- /dev/null
+++ b/queries/templ/highlights.scm
@@ -0,0 +1,47 @@
+; inherits: go
+
+(component_declaration
+  name: (component_identifier) @function)
+
+[
+  (tag_start)
+  (tag_end)
+  (self_closing_tag)
+  (style_element)
+] @tag
+
+(attribute
+  name: (attribute_name) @tag.attribute)
+(attribute
+  value: (quoted_attribute_value) @string)
+
+[
+  (element_text)
+  (style_element_text)
+] @string.special
+
+(css_identifier) @function
+(css_property
+  name: (css_property_name) @attribute)
+(css_property
+  value: (css_property_value) @attribute)
+
+[
+  (expression)
+  (dynamic_class_attribute_value)
+] @method
+
+(component_import
+  name: (component_identifier) @function)
+
+(component_render) @function.call
+
+(element_comment) @comment @spell
+
+"@" @operator
+
+[
+  "templ"
+  "css"
+  "script"
+] @keyword
diff --git a/queries/templ/injections.scm b/queries/templ/injections.scm
new file mode 100644
index 000000000..54e8d6f68
--- /dev/null
+++ b/queries/templ/injections.scm
@@ -0,0 +1,8 @@
+; inherits: go
+
+((element_comment) @injection.content (#set! injection.language "comment"))
+
+((script_block_text) @injection.content (#set! injection.language "javascript"))
+((script_element_text) @injection.content (#set! injection.language "javascript"))
+
+((style_element_text) @injection.content (#set! injection.language "css"))

From 73287b794d428843f20f9ae004bef2ce67ab3dbc Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Thu, 16 Nov 2023 21:13:07 +0000
Subject: [PATCH 0866/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2932165ff..803db1a1a 100644
--- a/README.md
+++ b/README.md
@@ -378,6 +378,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
+- [x] [templ](https://github.com/vrischmann/tree-sitter-templ) (maintained by @vrischmann)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) (maintained by @Porter)
 - [x] [thrift](https://github.com/duskmoon314/tree-sitter-thrift) (maintained by @amaanq, @duskmoon314)

From 8199529bc42ab275786d2f2cc83903f35ff6db9e Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 17 Nov 2023 17:56:11 +0900
Subject: [PATCH 0867/2704] chore(apex): Update queries

---
 lockfile.json               | 6 +++---
 queries/soql/highlights.scm | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9a89d29e6..5a3913759 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
   },
   "apex": {
-    "revision": "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"
+    "revision": "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"
   },
   "arduino": {
     "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
@@ -564,10 +564,10 @@
     "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
   },
   "soql": {
-    "revision": "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"
+    "revision": "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"
   },
   "sosl": {
-    "revision": "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"
+    "revision": "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index 907f3d891..2e89a86f9 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -33,7 +33,6 @@
   (identifier) @label)
 
 (storage_identifier) @storageclass
-(function_name) @function
 (date_literal) @string.special
 
 [

From 557561fbc17269cdd4e9e88ef0ca1a9ff0bbf7e6 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 17 Nov 2023 07:18:04 -0500
Subject: [PATCH 0868/2704] chore(rust): update queries from upstream

---
 lockfile.json               | 2 +-
 queries/rust/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5a3913759..706b6e6cf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -534,7 +534,7 @@
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
-    "revision": "48e053397b587de97790b055a1097b7c8a4ef846"
+    "revision": "464df136755e81b54885ab18f8093f6ec9def8bb"
   },
   "scala": {
     "revision": "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 82fb966f7..cc629d5e7 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -32,7 +32,7 @@
 
 (self) @variable.builtin
 
-(loop_label ["'" (identifier)] @label)
+(label ["'" (identifier)] @label)
 
 ; Function definitions
 

From a9f4a916aaee2a3c6ad4b8b4fcdf6b63b401d0b0 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 18 Nov 2023 16:17:58 +0900
Subject: [PATCH 0869/2704] chore(apex): update apex queries

---
 queries/soql/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index 2e89a86f9..83736d9a7 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -33,6 +33,7 @@
   (identifier) @label)
 
 (storage_identifier) @storageclass
+(_ function_name: (identifier) @function)
 (date_literal) @string.special
 
 [

From 2b12560bc3d7331156c81b02ef7609fce85c1ef8 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 18 Nov 2023 10:59:06 +0000
Subject: [PATCH 0870/2704] Update parsers: c, cpp, cuda, glsl, liquidsoap,
 purescript, python, rust, sql, ssh_config, t32, templ, v, wing

---
 lockfile.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 706b6e6cf..cef380c0f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -42,7 +42,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f"
+    "revision": "212a80f86452bb1316324fa0db730cf52f29e05a"
   },
   "c_sharp": {
     "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
@@ -78,7 +78,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "d153fe1c3385ee0521730ff4e0be9358e903b322"
+    "revision": "3502513c3c5371b1c1480015c5eec85755d7a880"
   },
   "css": {
     "revision": "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"
@@ -87,7 +87,7 @@
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "cuda": {
-    "revision": "3161aed045130c900f870ef53fad93a574317769"
+    "revision": "d33ee2caab572f7b46cef12e090331b9ed1c02e2"
   },
   "cue": {
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
@@ -198,7 +198,7 @@
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
   },
   "glsl": {
-    "revision": "bea82d337801e472e35b5cd08038afdf13263768"
+    "revision": "c9082edab87b145e97090b133167cb53626d9f58"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -333,7 +333,7 @@
     "revision": "23a9534d09d523d0dcee7dbf89e7c819e6835f6f"
   },
   "liquidsoap": {
-    "revision": "b35882f2e1460867ddddcbe8af586e6807d4676f"
+    "revision": "91d2708e12a5869154a85190b13ac89cb1414189"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -477,13 +477,13 @@
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "purescript": {
-    "revision": "f89bd149e44624342bf49f76245d3284f2beed9a"
+    "revision": "85a90951c10f118f819c1137f669800246890db7"
   },
   "pymanifest": {
     "revision": "a77547018ada84ca4bc115c7650b19441120f065"
   },
   "python": {
-    "revision": "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"
+    "revision": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc"
   },
   "ql": {
     "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
@@ -534,7 +534,7 @@
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
-    "revision": "464df136755e81b54885ab18f8093f6ec9def8bb"
+    "revision": "c741c105c0df43664fcc978dac5bc27888c9558f"
   },
   "scala": {
     "revision": "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"
@@ -573,13 +573,13 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "9fe5aeaa8d58d00cc31c20a3ae923ae695ce2ce7"
+    "revision": "d8fffdf0902bf55994fd2e8a0a46e221ca988589"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "6ac08decae456ef2fc307977d9210f86d75d4eca"
+    "revision": "1651e637d57c667708add5440d3726f07e97d953"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -606,7 +606,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "884a034e0ae29ce72649041a603deacdfb4a3275"
+    "revision": "b904af353fb2f1df6ac45d8d3e3a5ee85a6cc306"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -614,6 +614,9 @@
   "teal": {
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
+  "templ": {
+    "revision": "6b9dff614d5bab902cb6989bfcaa180636218159"
+  },
   "terraform": {
     "revision": "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"
   },
@@ -669,7 +672,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "099a85fbd34a8b9db9f83da19f184bd4c1886e7c"
+    "revision": "2f24b0377ddb865eb4285634f6945cb4ee3f395c"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -696,7 +699,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "eacf704338661b981fcf4fdb5ee44d898f038144"
+    "revision": "6e6f9d2632518be6702ffc29460455fa7b3e4196"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
@@ -715,8 +718,5 @@
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
-  },
-  "templ": {
-    "revision": "94ea27668915ef8f084c9fd7174cfd384ac9a275"
   }
 }

From 0df364926d39f59471ebc5ca83054d74e457350e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 18 Nov 2023 13:02:13 +0000
Subject: [PATCH 0871/2704] Update parsers: hcl, terraform, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cef380c0f..eb68ef513 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -243,7 +243,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"
+    "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
   },
   "heex": {
     "revision": "4a36c9a388505180da6ee0eda1d8afb8c83481c8"
@@ -618,7 +618,7 @@
     "revision": "6b9dff614d5bab902cb6989bfcaa180636218159"
   },
   "terraform": {
-    "revision": "fdf6463216f1a45d83ba911cdb9f57445a8d3b51"
+    "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
   },
   "textproto": {
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
@@ -699,7 +699,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6e6f9d2632518be6702ffc29460455fa7b3e4196"
+    "revision": "11c5e35ec0437492497a931ca631787851e88c9d"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 5240574bcbd5e3ad793b96b3766693c2bc5c86a9 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Sun, 19 Nov 2023 01:02:29 +0100
Subject: [PATCH 0872/2704] feat(haskell): tweak highlights

* add cases for `qualified_variable`

* add function defined in terms of composition
---
 queries/haskell/highlights.scm         | 10 +++++++++-
 tests/query/highlights/haskell/test.hs |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index bf9692136..1fea39b08 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -173,6 +173,7 @@
      (exp_name 
        [(constructor)
         (variable)
+        (qualified_variable)
        ]))
    (quasiquote)
    ((exp_name) . (operator))
@@ -186,6 +187,7 @@
      (exp_name 
        [(constructor)
         (variable)
+        (qualified_variable)
        ]))
    (quasiquote)
    ((exp_name) . (operator))
@@ -293,6 +295,12 @@
  ])
  (#any-of? @_op "." ">>>" "***" ">=>" "<=<" ))
         
+; function defined in terms of a function composition
+(function 
+  name: (variable) @function
+  rhs: (exp_infix (_) . (operator) @_op . (_)
+  (#any-of? @_op "." ">>>" "***" ">=>" "<=<")))
+
 (exp_apply (exp_name 
   [
     ((variable) @function.call)
@@ -325,7 +333,7 @@
   . (variable) @variable
   . [
      (exp_record)
-     (exp_name (variable))
+     (exp_name [(variable) (qualified_variable)])
      (exp_list)
      (exp_tuple)
      (exp_cond)
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
index cd5db435e..bf7e939a0 100644
--- a/tests/query/highlights/haskell/test.hs
+++ b/tests/query/highlights/haskell/test.hs
@@ -171,6 +171,8 @@ someIOaction = do
       gunc x y = func x $ y + 7
                    -- ^ @variable
                        -- ^ @variable
+      valueFromList = HashSet.fromList []
+      -- ^ @variable
   when foo $ putStrLn $ T.showt =<< bar
  -- ^ @function.call
      -- ^ @variable
@@ -325,3 +327,6 @@ lambdaAlias _ _ _ = undefined
 spec :: Spec
 spec = describe "test ns" $ it "test case" pending
 -- ^ @variable
+
+composed = f . g
+-- ^ @function

From 6498be930ea142b289abdec1e3c8298b490f2f67 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 13:17:03 +0200
Subject: [PATCH 0873/2704] feat(xcompose): add locals queries

---
 queries/xcompose/locals.scm | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 queries/xcompose/locals.scm

diff --git a/queries/xcompose/locals.scm b/queries/xcompose/locals.scm
new file mode 100644
index 000000000..bd42d5fea
--- /dev/null
+++ b/queries/xcompose/locals.scm
@@ -0,0 +1,3 @@
+(result (keysym) @definition)
+
+(event (keysym) @reference)

From 78740f1895cd378655d55604f743d910651c6050 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 13:17:16 +0200
Subject: [PATCH 0874/2704] feat(udev): add locals queries

---
 queries/udev/locals.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 queries/udev/locals.scm

diff --git a/queries/udev/locals.scm b/queries/udev/locals.scm
new file mode 100644
index 000000000..33714d157
--- /dev/null
+++ b/queries/udev/locals.scm
@@ -0,0 +1,29 @@
+;; labels
+
+(assignment
+  key: "LABEL"
+  (value (content) @definition))
+
+(assignment
+  key: "GOTO"
+  (value (content) @reference))
+
+;; env vars
+
+(assignment
+  key: "ENV"
+  (env_var) @definition.var)
+
+(match
+  key: "ENV"
+  (env_var) @reference)
+
+(var_sub (env_var) @reference)
+
+;; misc
+
+[
+  (attribute)
+  (kernel_param)
+  (seclabel)
+] @reference

From 2bd2c4ce235419aafb4dad40c43832acfad43351 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 13:17:31 +0200
Subject: [PATCH 0875/2704] feat(ssh_config): add locals queries

---
 queries/ssh_config/locals.scm | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 queries/ssh_config/locals.scm

diff --git a/queries/ssh_config/locals.scm b/queries/ssh_config/locals.scm
new file mode 100644
index 000000000..d4ccbfdde
--- /dev/null
+++ b/queries/ssh_config/locals.scm
@@ -0,0 +1,7 @@
+(parameter
+  keyword: "Tag"
+  argument: (string) @reference)
+
+(condition
+  criteria: "tagged"
+  argument: (pattern) @definition)

From 9e5a34c2b906d46f6c5abd572f07bda848a94120 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 13:17:47 +0200
Subject: [PATCH 0876/2704] feat(gitattributes): add locals queries

---
 queries/gitattributes/locals.scm | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 queries/gitattributes/locals.scm

diff --git a/queries/gitattributes/locals.scm b/queries/gitattributes/locals.scm
new file mode 100644
index 000000000..6a9aee1d5
--- /dev/null
+++ b/queries/gitattributes/locals.scm
@@ -0,0 +1,4 @@
+(macro_def (attr_name) @definition.macro)
+
+(attribute (attr_name) @reference)
+(attribute (builtin_attr) @reference)

From f1fc7c2e764db25569d9e899857c15cea0345a5c Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 13:18:00 +0200
Subject: [PATCH 0877/2704] feat(xml,dtd): add locals queries

---
 queries/dtd/locals.scm |  7 +++++++
 queries/xml/locals.scm | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 queries/dtd/locals.scm
 create mode 100644 queries/xml/locals.scm

diff --git a/queries/dtd/locals.scm b/queries/dtd/locals.scm
new file mode 100644
index 000000000..7efcdd030
--- /dev/null
+++ b/queries/dtd/locals.scm
@@ -0,0 +1,7 @@
+(elementdecl (Name) @definition.type)
+
+(elementdecl
+  (contentspec
+    (children (Name) @reference)))
+
+(AttlistDecl . (Name) @reference)
diff --git a/queries/xml/locals.scm b/queries/xml/locals.scm
new file mode 100644
index 000000000..05e162fbf
--- /dev/null
+++ b/queries/xml/locals.scm
@@ -0,0 +1,25 @@
+;; tags
+
+(elementdecl (Name) @definition.type)
+
+(elementdecl
+  (contentspec
+    (children (Name) @reference)))
+
+(AttlistDecl . (Name) @reference)
+
+(STag (Name) @reference)
+(ETag (Name) @reference)
+(EmptyElemTag (Name) @reference)
+
+;; attributes
+
+(AttDef (Name) @definition.field)
+
+(Attribute (Name) @reference)
+
+;; entities
+
+(GEDecl (Name) @definition.macro)
+
+(EntityRef (Name) @reference)

From f9999888eb3dc5918e3d511b69de0d5ab3373306 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 10 Nov 2023 13:43:26 +0200
Subject: [PATCH 0878/2704] feat(jq): add locals queries

and highlight function calls
---
 queries/jq/highlights.scm | 2 ++
 queries/jq/locals.scm     | 7 +++++++
 2 files changed, 9 insertions(+)
 create mode 100644 queries/jq/locals.scm

diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index 120cbe2eb..66acd26f4 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -55,6 +55,8 @@
   "foreach"
 ] @function.builtin
 
+((funcname) @function.call . "(")
+
 ; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
 ((funcname) @function.builtin
  (#any-of? @function.builtin
diff --git a/queries/jq/locals.scm b/queries/jq/locals.scm
new file mode 100644
index 000000000..b655a5e10
--- /dev/null
+++ b/queries/jq/locals.scm
@@ -0,0 +1,7 @@
+(funcdef (identifier) @definition.function)
+
+(funcdefargs (identifier) @definition.parameter)
+
+(funcname) @reference
+
+(index (identifier) @reference)

From f2de95e30aac507bf7fa785e13a8edcbdc604605 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 18 Nov 2023 17:20:51 -0800
Subject: [PATCH 0879/2704] feat(markdown): conceals for bullets, block quotes

* feat(markdown): conceals for bullets, block quotes

* fix: remove conceals for block quotes, change list minus to em dash

* fix(markdown): allow empty bullets to be concealed
---
 queries/markdown/highlights.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 23f1fb60f..085a1d827 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -34,6 +34,24 @@
   (info_string (language) @conceal
   (#set! conceal "")))
 
+;; Conceal bullet points
+([(list_marker_plus) (list_marker_star)]
+  @punctuation.special
+  (#offset! @punctuation.special 0 0 0 -1)
+  (#set! conceal "•"))
+([(list_marker_plus) (list_marker_star)]
+  @punctuation.special
+  (#any-of? @punctuation.special "+" "*")
+  (#set! conceal "•"))
+((list_marker_minus)
+  @punctuation.special
+  (#offset! @punctuation.special 0 0 0 -1)
+  (#set! conceal "—"))
+((list_marker_minus)
+  @punctuation.special
+  (#eq? @punctuation.special "-")
+  (#set! conceal "—"))
+
 (code_fence_content) @none
 
 [

From e96a9b457714ffd4b649732c835080221981ae78 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 19 Nov 2023 06:35:25 +0000
Subject: [PATCH 0880/2704] Update parsers: cpp, php, rust, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index eb68ef513..4f23fa692 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -78,7 +78,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "3502513c3c5371b1c1480015c5eec85755d7a880"
+    "revision": "a71474021410973b29bfe99440d57bcd750246b1"
   },
   "css": {
     "revision": "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"
@@ -435,7 +435,7 @@
     "revision": "3911403cba497196fb867a6f1e286e3e1576f425"
   },
   "php": {
-    "revision": "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"
+    "revision": "0a99deca13c4af1fb9adcb03c958bfc9f4c740a9"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
@@ -534,7 +534,7 @@
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
   },
   "rust": {
-    "revision": "c741c105c0df43664fcc978dac5bc27888c9558f"
+    "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
   },
   "scala": {
     "revision": "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"
@@ -699,7 +699,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "11c5e35ec0437492497a931ca631787851e88c9d"
+    "revision": "f6423ecace1ef34f57dc77db031504ce21ebfaaf"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From b0162110574e4d21ead81fdc19746bd21f585759 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 18 Nov 2023 14:43:12 -0800
Subject: [PATCH 0881/2704] feat(lua): folds for parameter, argument lists

---
 queries/lua/folds.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/lua/folds.scm b/queries/lua/folds.scm
index d8f0b42df..37c4947ed 100644
--- a/queries/lua/folds.scm
+++ b/queries/lua/folds.scm
@@ -6,5 +6,7 @@
  (for_statement)
  (function_declaration)
  (function_definition)
+ (parameters)
+ (arguments)
  (table_constructor)
 ] @fold

From d87629647614b779fb2aad8f0042fe2864253ea6 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 19 Nov 2023 04:10:52 -0500
Subject: [PATCH 0882/2704] feat: add Linkerscript (#5693)

---
 README.md                           |   1 +
 lockfile.json                       |   3 +
 lua/nvim-treesitter/parsers.lua     |   9 ++
 queries/linkerscript/folds.scm      |   6 ++
 queries/linkerscript/highlights.scm | 146 ++++++++++++++++++++++++++++
 queries/linkerscript/indents.scm    |  11 +++
 queries/linkerscript/injections.scm |   2 +
 queries/linkerscript/locals.scm     |  15 +++
 8 files changed, 193 insertions(+)
 create mode 100644 queries/linkerscript/folds.scm
 create mode 100644 queries/linkerscript/highlights.scm
 create mode 100644 queries/linkerscript/indents.scm
 create mode 100644 queries/linkerscript/injections.scm
 create mode 100644 queries/linkerscript/locals.scm

diff --git a/README.md b/README.md
index 803db1a1a..559ae50da 100644
--- a/README.md
+++ b/README.md
@@ -284,6 +284,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [latex](https://github.com/latex-lsp/tree-sitter-latex) (maintained by @theHamsta, @clason)
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
 - [x] [leo](https://github.com/r001/tree-sitter-leo) (maintained by @r001)
+- [x] [linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) (maintained by @amaanq)
 - [x] [liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) (maintained by @toots)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
diff --git a/lockfile.json b/lockfile.json
index 4f23fa692..4f268d678 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -332,6 +332,9 @@
   "leo": {
     "revision": "23a9534d09d523d0dcee7dbf89e7c819e6835f6f"
   },
+  "linkerscript": {
+    "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
+  },
   "liquidsoap": {
     "revision": "91d2708e12a5869154a85190b13ac89cb1414189"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9077bc8d4..dc9135698 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1017,6 +1017,15 @@ list.llvm = {
   maintainers = { "@benwilliamgraham" },
 }
 
+list.linkerscript = {
+  install_info = {
+    url = "https://github.com/amaanq/tree-sitter-linkerscript",
+    files = { "src/parser.c" },
+  },
+  filetype = "ld",
+  maintainers = { "@amaanq" },
+}
+
 list.liquidsoap = {
   install_info = {
     url = "https://github.com/savonet/tree-sitter-liquidsoap",
diff --git a/queries/linkerscript/folds.scm b/queries/linkerscript/folds.scm
new file mode 100644
index 000000000..0fc77b1a7
--- /dev/null
+++ b/queries/linkerscript/folds.scm
@@ -0,0 +1,6 @@
+[
+  (sections_command)
+  (output_section)
+  (memory_command)
+  (phdrs_command)
+] @fold
diff --git a/queries/linkerscript/highlights.scm b/queries/linkerscript/highlights.scm
new file mode 100644
index 000000000..f933f31ca
--- /dev/null
+++ b/queries/linkerscript/highlights.scm
@@ -0,0 +1,146 @@
+; Keywords
+
+[
+  "ENTRY"
+  "SECTIONS"
+  "AT"
+  "OVERLAY"
+  "NOCROSSREFS"
+  "MEMORY"
+  "PHDRS"
+  "FILEHDR"
+] @keyword
+
+; Conditionals
+
+(conditional_expression [ "?" ":" ] @conditional.ternary)
+
+; Variables
+
+(symbol) @variable
+
+(filename) @string.special @text.underline
+
+; Functions
+
+(call_expression
+  function: (symbol) @function.call)
+
+((call_expression
+  function: (symbol) @preproc)
+  (#eq? @preproc "DEFINED"))
+
+((call_expression
+  function: (symbol) @function.builtin)
+  (#any-of? @function.builtin
+   "ABSOLUTE" "ALIAS" "ADDR" "ALIGN" "ALIGNOF" "BASE" "BLOCK" "CHIP" "DATA_SEGMENT_ALIGN"
+   "DATA_SEGMENT_END" "DATA_SEGMENT_RELRO_END" "END" "LENGTH" "LOADADDR" "LOG2CEIL" "MAX" "MIN"
+   "NEXT" "ORIGIN" "SEGMENT_START" "SIZEOF" "BYTE" "FILL" "LONG" "SHORT" "QUAD" "SQUAD" "WORD"))
+
+[
+  "KEEP"
+  "PROVIDE"
+  "PROVIDE_HIDDEN"
+] @function.builtin
+
+; Types
+
+(section_type "(" [ "NOLOAD" "DSECT" "COPY" "INFO" "OVERLAY" ] @type.builtin ")")
+
+; Fields
+
+[
+  "ORIGIN" "org" "o"
+  "LENGTH" "len" "l"
+] @field.builtin
+
+; Constants
+
+((symbol) @constant
+  (#lua-match? @constant "^[%u_][%u%d_]+$"))
+
+; Labels
+
+(entry_command name: (symbol) @label)
+
+(output_section name: (symbol) @label)
+
+(memory_command name: (symbol) @label)
+
+(phdrs_command name: (symbol) @label)
+
+(region ">" (symbol) @label)
+
+(lma_region ">" (symbol) @label)
+
+(phdr ":" (symbol) @label)
+
+([(symbol) (filename)] @label
+  (#lua-match? @label "^%."))
+
+; Exceptions
+
+"ASSERT" @exception
+
+[
+  "/DISCARD/"
+  "."
+] @variable.builtin
+
+; Operators
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "||"
+  "&&"
+  "|"
+  "&"
+  "=="
+  "!="
+  ">"
+  ">="
+  "<="
+  "<"
+  "<<"
+  ">>"
+  "!"
+  "~"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "<<="
+  ">>="
+  "&="
+  "|="
+] @operator
+
+; Literals
+
+(number) @number
+
+(quoted_symbol) @string
+
+(wildcard_pattern [ "*" "[" "]" ] @character.special)
+
+(attributes) @character.special
+
+; Punctuation
+
+[ "{" "}" "(" ")" ] @punctuation.bracket
+
+[
+  ":"
+  ";"
+] @punctuation.delimiter
+
+">" @punctuation.special
+
+; Comments
+
+(comment) @comment @spell
diff --git a/queries/linkerscript/indents.scm b/queries/linkerscript/indents.scm
new file mode 100644
index 000000000..a636ba109
--- /dev/null
+++ b/queries/linkerscript/indents.scm
@@ -0,0 +1,11 @@
+[
+  (sections_command)
+  (output_section)
+  (memory_command)
+  (phdrs_command)
+] @indent.begin
+
+[
+  "}"
+  ")"
+] @indent.branch @indent.end
diff --git a/queries/linkerscript/injections.scm b/queries/linkerscript/injections.scm
new file mode 100644
index 000000000..51e6d1f6b
--- /dev/null
+++ b/queries/linkerscript/injections.scm
@@ -0,0 +1,2 @@
+((comment)
+  (#set! injection.language "comment"))
diff --git a/queries/linkerscript/locals.scm b/queries/linkerscript/locals.scm
new file mode 100644
index 000000000..93ddb4357
--- /dev/null
+++ b/queries/linkerscript/locals.scm
@@ -0,0 +1,15 @@
+; References
+
+[
+ (symbol)
+ (filename)
+ (quoted_symbol)
+] @reference
+
+; Definitions
+
+(output_section name: (symbol) @definition.var)
+
+(memory_command name: (symbol) @definition.var)
+
+(phdrs_command name: (symbol) @definition.var)

From 3da5cfb4a2505bc10d6fe3c193c69adac13423a8 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 20 Nov 2023 06:37:41 +0000
Subject: [PATCH 0883/2704] Update parsers: commonlisp, cuda, glsl, hlsl, pod,
 smithy, tlaplus, v, wing

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4f268d678..8548146f9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -66,7 +66,7 @@
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
   },
   "commonlisp": {
-    "revision": "5153dbbc70e4cc2324320c1bdae020d31079c7c0"
+    "revision": "cf10fc38bc24faf0549d59217ff37c789973dfdc"
   },
   "cooklang": {
     "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
@@ -87,7 +87,7 @@
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
   },
   "cuda": {
-    "revision": "d33ee2caab572f7b46cef12e090331b9ed1c02e2"
+    "revision": "2c6e806949197e7898910c78f514a3b7ff679068"
   },
   "cue": {
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
@@ -198,7 +198,7 @@
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
   },
   "glsl": {
-    "revision": "c9082edab87b145e97090b133167cb53626d9f58"
+    "revision": "5bb58a6a5b0941d4e1256c6335e50d9780e74dde"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -252,7 +252,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "ac65c934b3214e96e0f854be009a3bd51549bd14"
+    "revision": "8b10faba024b536dc85f76e0c678f573b1776034"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -450,7 +450,7 @@
     "revision": "d6aed225290bc71a15ab6f06305cb11419360c56"
   },
   "pod": {
-    "revision": "ea5d557cbd185cdcb5efcfdb6bc846fe909d86ae"
+    "revision": "39da859947b94abdee43e431368e1ae975c0a424"
   },
   "poe_filter": {
     "revision": "374f618de179498c2a821136bb86c3edbe221e10"
@@ -558,7 +558,7 @@
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
   },
   "smithy": {
-    "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"
+    "revision": "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"
   },
   "snakemake": {
     "revision": "65a6c3b4671877821082164da0a310851b211953"
@@ -633,7 +633,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "d99cb5c77bb0e733176d607a0875ac30e17e1e72"
+    "revision": "c5fae9e4ad9f483fb6232a8688a2c940be6b496b"
   },
   "todotxt": {
     "revision": "0207f6a4ab6aeafc4b091914d31d8235049a2578"
@@ -675,7 +675,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "2f24b0377ddb865eb4285634f6945cb4ee3f395c"
+    "revision": "975f34bec1dfad391534c83a6df019c0c200887a"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -702,7 +702,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f6423ecace1ef34f57dc77db031504ce21ebfaaf"
+    "revision": "29894ffc9585f160b99f5b753dae07fcd319528f"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 1610b1aafb9b7b3a7b54c853ed45c6cb1a3d0df2 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 20 Nov 2023 08:26:18 -0800
Subject: [PATCH 0884/2704] feat(python): `@string.regex` capture, injection
 improvements (#5697)

* feat(python): `@string.regex` capture, injection improvements

* fix(python): match regex only for first argument of re module

* chore(python): remove unneeded capture

Co-authored-by: Santos Gallegos <stsewd@proton.me>

* fix(python): only highlight string content itself as regex

---------

Co-authored-by: Santos Gallegos <stsewd@proton.me>
---
 queries/python/highlights.scm | 8 ++++++++
 queries/python/injections.scm | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index de98dccbf..b09122dd9 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -346,3 +346,11 @@
               ;; https://docs.python.org/3/library/stdtypes.html
               "bool" "int" "float" "complex" "list" "tuple" "range" "str"
               "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+
+;; Regex from the `re` module
+
+(call
+  function: (attribute
+              object: (identifier) @_re)
+  arguments: (argument_list . (string (string_content) @string.regex))
+  (#eq? @_re "re"))
diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index b836ea3f7..aa36a5af9 100644
--- a/queries/python/injections.scm
+++ b/queries/python/injections.scm
@@ -1,10 +1,9 @@
 (call
   function: (attribute
               object: (identifier) @_re)
-  arguments: (argument_list (string
-                              (string_content) @injection.content) @_string)
+  arguments: (argument_list . (string
+                              (string_content) @injection.content))
   (#eq? @_re "re")
-  (#lua-match? @_string "^r.*")
   (#set! injection.language "regex"))
 
 ((comment) @injection.content

From 670e7aa84346ea0f0e66f6bed3bf464beca4e70a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 21 Nov 2023 06:37:13 +0000
Subject: [PATCH 0885/2704] Update parsers: devicetree, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8548146f9..94ad3a190 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -99,7 +99,7 @@
     "revision": "f71e310a93010863f4b17a2a501ea8e2032c345b"
   },
   "devicetree": {
-    "revision": "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"
+    "revision": "e876e2aee525d98b2704ba75a05e1dd2b04aba76"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -702,7 +702,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "29894ffc9585f160b99f5b753dae07fcd319528f"
+    "revision": "bc272f53bed53520d78d08a21fb0b412336e22d4"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 6b24db0c8fc1357522320e71c89069fdc66a4237 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 21 Nov 2023 02:19:07 +0200
Subject: [PATCH 0886/2704] feat: add properties parser

---
 README.md                         |  1 +
 lockfile.json                     |  3 +++
 lua/nvim-treesitter/parsers.lua   |  9 +++++++++
 queries/properties/highlights.scm | 28 ++++++++++++++++++++++++++++
 queries/properties/injections.scm |  2 ++
 queries/properties/locals.scm     |  3 +++
 6 files changed, 46 insertions(+)
 create mode 100644 queries/properties/highlights.scm
 create mode 100644 queries/properties/injections.scm
 create mode 100644 queries/properties/locals.scm

diff --git a/README.md b/README.md
index 559ae50da..bf96df17a 100644
--- a/README.md
+++ b/README.md
@@ -328,6 +328,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
+- [x] [properties](https://github.com/ObserverOfTime/tree-sitter-properties) (maintained by @ObserverOfTime)
 - [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [psv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 94ad3a190..9e1bf1ae3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -464,6 +464,9 @@
   "promql": {
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
+  "properties": {
+    "revision": "97253273bdf8b63546c8006e71ba155ecc27069e"
+  },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index dc9135698..b012d514a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1385,6 +1385,15 @@ list.promql = {
   maintainers = { "@MichaHoffmann" },
 }
 
+list.properties = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-properties",
+    files = { "src/parser.c" },
+  },
+  filetype = "jproperties",
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.proto = {
   install_info = {
     url = "https://github.com/treywood/tree-sitter-proto",
diff --git a/queries/properties/highlights.scm b/queries/properties/highlights.scm
new file mode 100644
index 000000000..3414294b7
--- /dev/null
+++ b/queries/properties/highlights.scm
@@ -0,0 +1,28 @@
+(comment) @comment @spell
+
+(key) @property
+
+(value) @string
+
+(value (escape) @string.escape)
+
+((value) @boolean
+ (#any-of? @boolean "true" "false"))
+
+((value) @number
+ (#lua-match? @number "^%d+$"))
+
+(index) @number
+
+(property [ "=" ":" ] @operator)
+
+[ "${" "}" ] @punctuation.special
+
+(substitution ":" @punctuation.special)
+
+[ "[" "]" ] @punctuation.bracket
+
+[ "." "\\" ] @punctuation.delimiter
+
+((substitution (key) @constant)
+ (#lua-match? @constant "^[A-Z_][A-Z0-9_]*$"))
diff --git a/queries/properties/injections.scm b/queries/properties/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/properties/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/properties/locals.scm b/queries/properties/locals.scm
new file mode 100644
index 000000000..d9360c465
--- /dev/null
+++ b/queries/properties/locals.scm
@@ -0,0 +1,3 @@
+(property (key) @definition)
+
+(substitution (key) @reference)

From 7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 19 Nov 2023 20:34:18 -0800
Subject: [PATCH 0887/2704] feat(regex): any_character, start end assertion hl
 differentiation

---
 queries/regex/highlights.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index 8277d6d7e..7a5685844 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -25,10 +25,14 @@
  (control_letter_escape)
  (character_class_escape)
  (control_escape)
- (start_assertion)
- (end_assertion)
  (boundary_assertion)
  (non_boundary_assertion)
 ] @string.escape
 
-[ "*" "+" "?" "|" "=" "!" ] @operator
+[ "*" "+" "?" "|" "=" "!" "-"] @operator
+
+[
+ (any_character)
+ (start_assertion)
+ (end_assertion)
+] @variable.builtin

From cd583cfb5b492c4f81edc5e1916c9f59b7b0ef16 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 22 Nov 2023 06:37:29 +0000
Subject: [PATCH 0888/2704] Update parsers: devicetree, v, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9e1bf1ae3..28895bfc7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -99,7 +99,7 @@
     "revision": "f71e310a93010863f4b17a2a501ea8e2032c345b"
   },
   "devicetree": {
-    "revision": "e876e2aee525d98b2704ba75a05e1dd2b04aba76"
+    "revision": "53b4137bd37e726116ea918139767f982a1584d8"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -678,7 +678,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "975f34bec1dfad391534c83a6df019c0c200887a"
+    "revision": "20433e0d8ff5bb6e7bb28d12948773be2bdd983d"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -705,7 +705,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "bc272f53bed53520d78d08a21fb0b412336e22d4"
+    "revision": "ade67c1dcfb7885dbbfdf7fa5be48550e107c382"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 2a5f6c9eb733a5a847bb1890f620658547033515 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 22 Nov 2023 14:53:56 -0800
Subject: [PATCH 0889/2704] fix(css): tweak operator keyword highlights

---
 queries/css/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index 8a7cba160..383d6b7dc 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -34,11 +34,14 @@
  "~="
  "$="
  "*="
+ ] @operator
+
+[
  "and"
  "or"
  "not"
  "only"
- ] @operator
+ ] @keyword.operator
 
 (important) @type.qualifier
 

From 6d45b3469719a9740a5ef6304bb6771516d19bd5 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 23 Nov 2023 06:36:39 +0000
Subject: [PATCH 0890/2704] Update parsers: sql, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 28895bfc7..5452493a3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -579,7 +579,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "d8fffdf0902bf55994fd2e8a0a46e221ca988589"
+    "revision": "a3ea0e4143a617fc2c4ccf29c41e0ba7a1ff6ab9"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -705,7 +705,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "ade67c1dcfb7885dbbfdf7fa5be48550e107c382"
+    "revision": "635fa4b72ee913f3028bf6be54c40393edbc259d"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 71bdf97bf6dafc776ad957169533f2f669a8c562 Mon Sep 17 00:00:00 2001
From: Patrick Haun <patrick@bomgar.email>
Date: Thu, 23 Nov 2023 14:42:00 +0100
Subject: [PATCH 0891/2704] feat(hocon): add fold query (#5710)

---
 queries/hocon/folds.scm | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 queries/hocon/folds.scm

diff --git a/queries/hocon/folds.scm b/queries/hocon/folds.scm
new file mode 100644
index 000000000..cc8a231a4
--- /dev/null
+++ b/queries/hocon/folds.scm
@@ -0,0 +1,4 @@
+[
+  (object)
+  (array)
+] @fold

From 649d137371e9214d30b20565e0574824fa3a3670 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 24 Nov 2023 06:36:51 +0000
Subject: [PATCH 0892/2704] Update parsers: erlang, ssh_config, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5452493a3..06f10cc7b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -144,7 +144,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "35ae91b2e9f5514c0ad6d6887f9859f28907c7d5"
+    "revision": "b7969b5f12c44038379901a6f2094c31afa2ec2f"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -585,7 +585,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "1651e637d57c667708add5440d3726f07e97d953"
+    "revision": "9ff3cabeb738f94bfc3c2de4d3857133ad717e3f"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -705,7 +705,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "635fa4b72ee913f3028bf6be54c40393edbc259d"
+    "revision": "d483d21ad212bc9641e88deee0db2dad670eaaf3"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From d8a71826a20dfc9ed3d8a43e28a00611a302b456 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 25 Nov 2023 06:35:01 +0000
Subject: [PATCH 0893/2704] Update parsers: dtd, ssh_config, wing, xml

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 06f10cc7b..ce3067474 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"
+    "revision": "dd7ef38c74d8430da729b4da815e4c40776e03bb"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -585,7 +585,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "9ff3cabeb738f94bfc3c2de4d3857133ad717e3f"
+    "revision": "096981397385f49833dfd66037fa98081bbd9ef9"
   },
   "starlark": {
     "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
@@ -705,13 +705,13 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d483d21ad212bc9641e88deee0db2dad670eaaf3"
+    "revision": "cf025a5f727a2b4645dd332876e94cef80e5147f"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
   },
   "xml": {
-    "revision": "a3bfa1ae7e8400ab81a6358f5e8d2983f5dd0697"
+    "revision": "dd7ef38c74d8430da729b4da815e4c40776e03bb"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From eafc0c2194842fe038e143b743e5a442ce5eac2c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 26 Nov 2023 06:35:13 +0000
Subject: [PATCH 0894/2704] Update parsers: swift, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ce3067474..903bbf405 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -603,7 +603,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "b3bfaad89426a062c2a5d971cfebb7262f8cff62"
+    "revision": "f1a48a33a7ceaf8817f7a340ea4ef1b549ffa176"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -705,7 +705,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "cf025a5f727a2b4645dd332876e94cef80e5147f"
+    "revision": "be512815ce78a92e8a62fef9ca4bdf2fdaecd159"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 9d91101f71cc64cdef923a3b14130db82985bac6 Mon Sep 17 00:00:00 2001
From: sheepwall <a.sve@live.se>
Date: Sun, 26 Nov 2023 12:12:06 +0100
Subject: [PATCH 0895/2704] twig queries: add combined injections (#5721)

Co-authored-by: August Svensson <august.svensson@metabytes.se>
---
 queries/twig/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/twig/injections.scm b/queries/twig/injections.scm
index 663dc3b6c..29ba009a8 100644
--- a/queries/twig/injections.scm
+++ b/queries/twig/injections.scm
@@ -1,3 +1,4 @@
 ((content) @injection.content
- (#set! injection.language "html"))
+ (#set! injection.language "html")
+ (#set! injection.combined))
 

From 1e74c34b668d0bbdd14492fc220974e4fc38dc6b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 24 Nov 2023 10:25:47 +0100
Subject: [PATCH 0896/2704] feat: add angular parser and queries

---
 lockfile.json                    |  3 ++
 lua/nvim-treesitter/parsers.lua  |  8 ++++
 queries/angular/highlights.scm   | 67 ++++++++++++++++++++++++++++++++
 queries/html_tags/injections.scm | 21 ++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 queries/angular/highlights.scm

diff --git a/lockfile.json b/lockfile.json
index 903bbf405..01d9ad274 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -5,6 +5,9 @@
   "agda": {
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
   },
+  "angular": {
+    "revision": "624ff108fe949727217cddb302f20e4f16997b1c"
+  },
   "apex": {
     "revision": "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b012d514a..0c83e58f0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,6 +93,14 @@ list.agda = {
   maintainers = { "@Decodetalkers" },
 }
 
+list.angular = {
+  install_info = {
+    url = "https://github.com/steelsojka/tree-sitter-angular",
+    files = { "src/parser.c" },
+  },
+  maintainers = {"@steelsojka"}
+}
+
 list.apex = {
   install_info = {
     url = "https://github.com/aheber/tree-sitter-sfapex",
diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
new file mode 100644
index 000000000..98c6f76e9
--- /dev/null
+++ b/queries/angular/highlights.scm
@@ -0,0 +1,67 @@
+(identifier) @variable
+(pipe_sequence "|" @operator)
+(string) @string
+(number) @number
+(pipe_call
+  name: (identifier) @function)
+(pipe_call
+  arguments: (pipe_arguments
+               (identifier) @parameter))
+
+(structural_assignment
+  operator: (identifier) @keyword)
+
+(member_expression
+  property: (identifier) @property)
+
+(call_expression
+  function: (identifier) @function)
+
+(call_expression
+  function: ((identifier) @function.builtin
+    (#eq? @function.builtin "$any")))
+
+[
+"let"
+"as"
+] @keyword
+
+[
+"("
+")"
+"["
+"]"
+"{"
+"}"
+] @punctuation.bracket
+
+[
+";"
+"."
+","
+"?."
+] @punctuation.delimiter
+
+((identifier) @boolean
+  (#vim-match? @boolean "^(true|false)$"))
+((identifier) @variable.builtin
+  (#vim-match? @variable.builtin "^(this|\$event|null)$"))
+
+[
+  "-"
+  "&&"
+  "+"
+  "<"
+  "<="
+  "="
+  "=="
+  "==="
+  "!="
+  "!=="
+  ">"
+  ">="
+  "*"
+  "/"
+  "||"
+  "%"
+] @operator
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 563e7453d..cef63ad8d 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -74,3 +74,24 @@
   (#lua-match? @_name "^on[a-z]+$")
   (quoted_attribute_value (attribute_value) @injection.content)
   (#set! injection.language "javascript"))
+
+(attribute
+  ((attribute_name) @_name
+   (#lua-match? @_name "[%[%(].*[%)%]]"))
+  (quoted_attribute_value
+    (attribute_value) @injection.content)
+  (#set! injection.language "angular"))
+
+(attribute
+  ((attribute_name) @_name
+   (#lua-match? @_name "^%*"))
+  (quoted_attribute_value
+    ((attribute_value) @injection.content))
+  (#set! injection.language "angular"))
+
+(element
+  ((text) @injection.content
+   (#lua-match? @injection.content "%{%{.*%}%}")
+   (#offset! @injection.content 0 2 0 -2))
+  (#set! injection.language "angular"))
+

From 274370e703dcf478c80fa31ca3798ab2e90bf71b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 24 Nov 2023 10:29:17 +0100
Subject: [PATCH 0897/2704] fixup: use any-of instead of vim-match

---
 queries/angular/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 98c6f76e9..dc926bb9a 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -43,9 +43,9 @@
 ] @punctuation.delimiter
 
 ((identifier) @boolean
-  (#vim-match? @boolean "^(true|false)$"))
+  (#any-of? @boolean "true" "false"))
 ((identifier) @variable.builtin
-  (#vim-match? @variable.builtin "^(this|\$event|null)$"))
+  (#any-of? @variable.builtin "this" "\$event" "null"))
 
 [
   "-"

From de5197871e49130dd7f5642b5dff5353b79c45b8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 24 Nov 2023 10:31:01 +0100
Subject: [PATCH 0898/2704] fixup: lint

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0c83e58f0..28e6f32b8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -98,7 +98,7 @@ list.angular = {
     url = "https://github.com/steelsojka/tree-sitter-angular",
     files = { "src/parser.c" },
   },
-  maintainers = {"@steelsojka"}
+  maintainers = { "@steelsojka" },
 }
 
 list.apex = {

From 52b25c9a3f172abf986686c6382dae5f10786809 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 24 Nov 2023 12:04:08 +0100
Subject: [PATCH 0899/2704] fixup: parser requires generate (ABI)

---
 lua/nvim-treesitter/parsers.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 28e6f32b8..b606392b5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -97,8 +97,9 @@ list.angular = {
   install_info = {
     url = "https://github.com/steelsojka/tree-sitter-angular",
     files = { "src/parser.c" },
+    requires_generate_from_grammar = true,
   },
-  maintainers = { "@steelsojka" },
+  experimental = true,
 }
 
 list.apex = {

From b056e4227b1c5d3ecfe96941352364c0c10668df Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sun, 26 Nov 2023 14:24:40 +0000
Subject: [PATCH 0900/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bf96df17a..39c25a1dc 100644
--- a/README.md
+++ b/README.md
@@ -175,6 +175,7 @@ We are looking for maintainers to add more parsers and to write query files for
 <!--parserinfo-->
 - [x] [ada](https://github.com/briot/tree-sitter-ada) (maintained by @briot)
 - [x] [agda](https://github.com/tree-sitter/tree-sitter-agda) (maintained by @Decodetalkers)
+- [ ] [angular](https://github.com/steelsojka/tree-sitter-angular) (experimental)
 - [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)

From 482a2f15d37817e1201466d00c6539574ba34554 Mon Sep 17 00:00:00 2001
From: Tomas Sandven <597206+Hubro@users.noreply.github.com>
Date: Sun, 19 Nov 2023 13:20:17 +0100
Subject: [PATCH 0901/2704] Fix robot parser metadata in parsers.lua

---
 lua/nvim-treesitter/parsers.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b606392b5..ff1fe7660 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1573,8 +1573,7 @@ list.robot = {
     url = "https://github.com/Hubro/tree-sitter-robot",
     files = { "src/parser.c" },
   },
-  maintainers = { "@ema2159" },
-  experimental = true,
+  maintainers = { "@Hubro" },
 }
 
 list.ron = {

From 8189d91cf82b78fd765b28c674537688bce70c10 Mon Sep 17 00:00:00 2001
From: virchau13 <virchau13@hexular.net>
Date: Mon, 27 Nov 2023 21:11:28 +0800
Subject: [PATCH 0902/2704] astro: add custom component highlighting (#5728)

---
 queries/astro/highlights.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/queries/astro/highlights.scm b/queries/astro/highlights.scm
index 62e8ed247..91ccbffb3 100644
--- a/queries/astro/highlights.scm
+++ b/queries/astro/highlights.scm
@@ -3,3 +3,11 @@
 [ "---" ] @punctuation.delimiter
 
 [ "{" "}" ] @punctuation.special
+
+; custom components get `@type` highlighting
+((start_tag (tag_name) @type)
+ (#lua-match? @type "^[A-Z]"))
+((end_tag (tag_name) @type)
+ (#lua-match? @type "^[A-Z]"))
+((erroneous_end_tag (erroneous_end_tag_name) @type)
+ (#lua-match? @type "^[A-Z]"))

From b8fbd13277aae47fecdf7ec63731fa1f9918ac07 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Mon, 27 Nov 2023 13:11:44 +0000
Subject: [PATCH 0903/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39c25a1dc..fae63f196 100644
--- a/README.md
+++ b/README.md
@@ -350,7 +350,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
-- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (experimental, maintained by @ema2159)
+- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)

From ba588ee0cf9df885f3f8698ae671330d82b4bdec Mon Sep 17 00:00:00 2001
From: HumblePresent <60856003+HumblePresent@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:50:08 -0600
Subject: [PATCH 0904/2704] fix(cpp): remove `@field` for identifiers with `_`
 prefix (#5731)

---
 queries/cpp/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 21c3c4e59..b9a8cfec0 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -1,7 +1,7 @@
 ; inherits: c
 
 ((identifier) @field
-  (#lua-match? @field "^m?_.*$"))
+  (#lua-match? @field "^m_.*$"))
 
 (parameter_declaration
   declarator: (reference_declarator) @parameter)

From 582a92ee120532a603b75239f40cba06b9a5ec07 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 28 Nov 2023 06:36:40 +0000
Subject: [PATCH 0905/2704] Update parsers: erlang, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 01d9ad274..5963a7c46 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "b7969b5f12c44038379901a6f2094c31afa2ec2f"
+    "revision": "56942778b5791d07949e6c7b6093e01aba5b7ab4"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -708,7 +708,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "be512815ce78a92e8a62fef9ca4bdf2fdaecd159"
+    "revision": "97d7dd56bfd0e0642ef43bbb29cae2c78e6d520e"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From bf982eb7dc9d54af748ea1dd8b9db3a7724b9a99 Mon Sep 17 00:00:00 2001
From: Bryan Kenote <9691017+bryankenote@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:24:43 +0000
Subject: [PATCH 0906/2704] feat: add facility

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  9 ++++
 queries/facility/folds.scm      |  6 +++
 queries/facility/highlights.scm | 81 +++++++++++++++++++++++++++++++++
 queries/facility/indents.scm    |  8 ++++
 queries/facility/injections.scm |  5 ++
 7 files changed, 113 insertions(+)
 create mode 100644 queries/facility/folds.scm
 create mode 100644 queries/facility/highlights.scm
 create mode 100644 queries/facility/indents.scm
 create mode 100644 queries/facility/injections.scm

diff --git a/README.md b/README.md
index fae63f196..3d0e495ef 100644
--- a/README.md
+++ b/README.md
@@ -223,6 +223,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [elvish](https://github.com/elves/tree-sitter-elvish) (maintained by @elves)
 - [ ] [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template)
 - [x] [erlang](https://github.com/WhatsApp/tree-sitter-erlang) (maintained by @filmor)
+- [x] [facility](https://github.com/FacilityApi/tree-sitter-facility) (maintained by @bryankenote)
 - [x] [fennel](https://github.com/travonted/tree-sitter-fennel) (maintained by @TravonteD)
 - [x] [firrtl](https://github.com/amaanq/tree-sitter-firrtl) (maintained by @amaanq)
 - [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
diff --git a/lockfile.json b/lockfile.json
index 5963a7c46..2a681c306 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -149,6 +149,9 @@
   "erlang": {
     "revision": "56942778b5791d07949e6c7b6093e01aba5b7ab4"
   },
+  "facility": {
+    "revision": "a2f90a0d4a3c41bcaa80cabb5f7467daefcd33f4"
+  },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ff1fe7660..3945f1167 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -496,6 +496,15 @@ list.erlang = {
   maintainers = { "@filmor" },
 }
 
+list.facility = {
+  install_info = {
+    url = "https://github.com/FacilityApi/tree-sitter-facility",
+    files = { "src/parser.c" },
+  },
+  filetype = "fsd",
+  maintainers = { "@bryankenote" },
+}
+
 list.fennel = {
   install_info = {
     url = "https://github.com/travonted/tree-sitter-fennel",
diff --git a/queries/facility/folds.scm b/queries/facility/folds.scm
new file mode 100644
index 000000000..7d8bafc80
--- /dev/null
+++ b/queries/facility/folds.scm
@@ -0,0 +1,6 @@
+[
+  (service)
+  (method)
+  (dto)
+  (enum)
+] @fold
diff --git a/queries/facility/highlights.scm b/queries/facility/highlights.scm
new file mode 100644
index 000000000..c10ff49be
--- /dev/null
+++ b/queries/facility/highlights.scm
@@ -0,0 +1,81 @@
+[
+  ";"
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+]  @punctuation.bracket
+
+(comment) @comment @spell
+(doc_comment) @comment.documentation @spell
+
+"method" @keyword.function
+
+[
+  "service"
+  "errors"
+  "data"
+  "enum"
+  "extern"
+] @type.builtin
+
+(type) @type.builtin
+
+(service
+  service_name: (identifier) @type)
+
+(error_set
+  (identifier) @property)
+
+(error_set
+  name: (identifier) @type)
+
+(dto
+  name: (identifier) @type)
+
+(external_dto
+  name: (identifier) @type)
+
+(enum
+  (values_block
+    (identifier) @constant))
+
+(enum
+  name: (identifier) @type)
+
+(external_enum
+  name: (identifier) @type)
+
+(type
+  name: (identifier) @type)
+
+[
+  "map"
+  "nullable"
+  "result"
+  "required"
+  "http"
+  "csharp"
+  "js"
+  "info"
+  "obsolete"
+] @attribute.builtin
+
+(parameter
+  name: (identifier) @property)
+
+(field
+  name: (identifier) @variable)
+
+(method
+  name: (identifier) @method)
+
+(number_literal) @number
+(string_literal) @string
diff --git a/queries/facility/indents.scm b/queries/facility/indents.scm
new file mode 100644
index 000000000..96a24f202
--- /dev/null
+++ b/queries/facility/indents.scm
@@ -0,0 +1,8 @@
+[
+ (service_block)
+ (values_block)
+ (field_list)
+] @indent.begin
+
+"}" @indent.branch
+
diff --git a/queries/facility/injections.scm b/queries/facility/injections.scm
new file mode 100644
index 000000000..572849ab4
--- /dev/null
+++ b/queries/facility/injections.scm
@@ -0,0 +1,5 @@
+((remarks) @injection.content
+  (#set! injection.language "markdown"))
+
+([(comment) (doc_comment)] @injection.content
+  (#set! injection.language "comment"))

From b04f990f92e41d0909de20a970a4a3c0fde5557e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 29 Nov 2023 06:37:42 +0000
Subject: [PATCH 0907/2704] Update parsers: css, facility, foam, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2a681c306..fe6355734 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -84,7 +84,7 @@
     "revision": "a71474021410973b29bfe99440d57bcd750246b1"
   },
   "css": {
-    "revision": "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"
+    "revision": "98c7b3dceb24f1ee17f1322f3947e55638251c37"
   },
   "csv": {
     "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
@@ -150,7 +150,7 @@
     "revision": "56942778b5791d07949e6c7b6093e01aba5b7ab4"
   },
   "facility": {
-    "revision": "a2f90a0d4a3c41bcaa80cabb5f7467daefcd33f4"
+    "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
   },
   "fennel": {
     "revision": "517195970428aacca60891b050aa53eabf4ba78d"
@@ -162,7 +162,7 @@
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
   },
   "foam": {
-    "revision": "09e03445f49290450589c5d293610ab39434e3e4"
+    "revision": "df1c0759e101b26e536254ca45d1ea7ca976fd58"
   },
   "forth": {
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
@@ -711,7 +711,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "97d7dd56bfd0e0642ef43bbb29cae2c78e6d520e"
+    "revision": "0c2c28b3227cd902bd54b1eb02908a967ab2f525"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 10432e6b0fb22a0fbe7b8fa45f7fbee187029d90 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Sat, 18 Nov 2023 20:52:31 +0100
Subject: [PATCH 0908/2704] parsers: add tree-sitter-slang

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua | 11 +++++++++
 queries/slang/folds.scm         |  9 +++++++
 queries/slang/highlights.scm    | 42 +++++++++++++++++++++++++++++++++
 queries/slang/indents.scm       |  6 +++++
 queries/slang/injections.scm    |  5 ++++
 queries/slang/locals.scm        |  1 +
 8 files changed, 78 insertions(+)
 create mode 100644 queries/slang/folds.scm
 create mode 100644 queries/slang/highlights.scm
 create mode 100644 queries/slang/indents.scm
 create mode 100644 queries/slang/injections.scm
 create mode 100644 queries/slang/locals.scm

diff --git a/README.md b/README.md
index 3d0e495ef..8a5c41651 100644
--- a/README.md
+++ b/README.md
@@ -360,6 +360,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) (maintained by @WhyNotHugo)
 - [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
+- [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
 - [x] [slint](https://github.com/jrmoulton/tree-sitter-slint) (experimental, maintained by @jrmoulton)
 - [x] [smali](https://git.sr.ht/~yotam/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
diff --git a/lockfile.json b/lockfile.json
index fe6355734..6ff0b40f9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -560,6 +560,9 @@
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
+  "slang": {
+    "revision": "47415d3f9ed2b3df9b9fc5f5d0ee1a71be3c67e0"
+  },
   "slint": {
     "revision": "00c8a2d3645766f68c0d0460086c0a994e5b0d85"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3945f1167..86bb7e358 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1649,6 +1649,17 @@ list.scss = {
   maintainers = { "@elianiva" },
 }
 
+list.slang = {
+  install_info = {
+    url = "https://github.com/theHamsta/tree-sitter-slang",
+    files = { "src/parser.c", "src/scanner.c" },
+    generate_requires_npm = true,
+  },
+  filetype = "shaderslang",
+  maintainers = { "@theHamsta" },
+  experimental = true,
+}
+
 list.slint = {
   install_info = {
     url = "https://github.com/jrmoulton/tree-sitter-slint",
diff --git a/queries/slang/folds.scm b/queries/slang/folds.scm
new file mode 100644
index 000000000..c8cc87643
--- /dev/null
+++ b/queries/slang/folds.scm
@@ -0,0 +1,9 @@
+; inherits: hlsl
+
+[
+ (interface_specifier)
+ (extension_specifier)
+ (property_declaration)
+ (subscript_declaration)
+ (init_declaration)
+] @fold
diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
new file mode 100644
index 000000000..6fd5f45ea
--- /dev/null
+++ b/queries/slang/highlights.scm
@@ -0,0 +1,42 @@
+; inherits: hlsl
+
+[
+ "var"
+ "let"
+ "This"
+] @type.builtin
+
+[
+ "interface"
+ "extension"
+ "property"
+] @keyword 
+
+[
+ "__init"
+] @constructor
+
+[
+ "__subscript"
+ "get"
+ "set"
+] @function.builtin
+
+(interface_requirements (identifier) @type)
+
+(binary_expression
+  ["is" "as"]
+  right: (identifier) @type)
+
+[
+ "as"
+ "is"
+] @keyword.operator
+
+[
+ "__exported"
+ "import"
+] @include
+
+(property_declaration
+  (identifier) @property)
diff --git a/queries/slang/indents.scm b/queries/slang/indents.scm
new file mode 100644
index 000000000..6175ac5bc
--- /dev/null
+++ b/queries/slang/indents.scm
@@ -0,0 +1,6 @@
+; inherits: hlsl
+
+[
+  (interface_specifier)
+  (extension_specifier)
+] @indent.begin
diff --git a/queries/slang/injections.scm b/queries/slang/injections.scm
new file mode 100644
index 000000000..bf83e478a
--- /dev/null
+++ b/queries/slang/injections.scm
@@ -0,0 +1,5 @@
+((preproc_arg) @injection.content
+ (#set! injection.language "slang"))
+
+((comment) @injection.content
+ (#set! injection.language "comment"))
diff --git a/queries/slang/locals.scm b/queries/slang/locals.scm
new file mode 100644
index 000000000..647bd1fef
--- /dev/null
+++ b/queries/slang/locals.scm
@@ -0,0 +1 @@
+; inherits: hlsl

From fb101ed49d4b9e0e6661a24b636a6d874f8de49d Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 27 Nov 2023 08:15:20 -0800
Subject: [PATCH 0909/2704] feat(make): give targets the function highlight

---
 queries/make/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index 17a100edf..e4d0e7c44 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -10,6 +10,8 @@
  ] @conditional)
  "endif" @conditional)
 
+(rule (targets (word) @function))
+
 (rule (targets
        (word) @function.builtin
        (#any-of? @function.builtin

From 8f16c39f5b439bd9540336c4d5da705d180e34b9 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 27 Nov 2023 12:51:33 -0800
Subject: [PATCH 0910/2704] feat(make): highlight phony prerequisites as
 functions

---
 queries/make/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index e4d0e7c44..b224a6765 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -12,6 +12,11 @@
 
 (rule (targets (word) @function))
 
+(rule
+ (targets) @_target
+ (prerequisites (word) @function
+  (#eq? @_target ".PHONY")))
+
 (rule (targets
        (word) @function.builtin
        (#any-of? @function.builtin

From e9acd01a4a1f6e584f76e736987f4c31401aa4b1 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 29 Nov 2023 16:36:07 -0800
Subject: [PATCH 0911/2704] fix(markdown): revert bullet conceals due to
 spacing issues (#5742)

---
 queries/markdown/highlights.scm | 38 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 085a1d827..9ffc6ee86 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -34,23 +34,27 @@
   (info_string (language) @conceal
   (#set! conceal "")))
 
-;; Conceal bullet points
-([(list_marker_plus) (list_marker_star)]
-  @punctuation.special
-  (#offset! @punctuation.special 0 0 0 -1)
-  (#set! conceal "•"))
-([(list_marker_plus) (list_marker_star)]
-  @punctuation.special
-  (#any-of? @punctuation.special "+" "*")
-  (#set! conceal "•"))
-((list_marker_minus)
-  @punctuation.special
-  (#offset! @punctuation.special 0 0 0 -1)
-  (#set! conceal "—"))
-((list_marker_minus)
-  @punctuation.special
-  (#eq? @punctuation.special "-")
-  (#set! conceal "—"))
+; NOTE: The following has been commented out due to issues with spaces in the
+; list marker nodes generated by the parser. If those spaces ever get captured
+; by a different node (e.g. block_continuation) we can safely readd these
+; conceals.
+; ;; Conceal bullet points
+; ([(list_marker_plus) (list_marker_star)]
+;   @punctuation.special
+;   (#offset! @punctuation.special 0 0 0 -1)
+;   (#set! conceal "•"))
+; ([(list_marker_plus) (list_marker_star)]
+;   @punctuation.special
+;   (#any-of? @punctuation.special "+" "*")
+;   (#set! conceal "•"))
+; ((list_marker_minus)
+;   @punctuation.special
+;   (#offset! @punctuation.special 0 0 0 -1)
+;   (#set! conceal "—"))
+; ((list_marker_minus)
+;   @punctuation.special
+;   (#eq? @punctuation.special "-")
+;   (#set! conceal "—"))
 
 (code_fence_content) @none
 

From 93750d388162f5658cfdb77bdcfe80711e637647 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 30 Nov 2023 06:36:35 +0000
Subject: [PATCH 0912/2704] Update parsers: c_sharp, foam, slang, v, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6ff0b40f9..ad0480700 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "212a80f86452bb1316324fa0db730cf52f29e05a"
   },
   "c_sharp": {
-    "revision": "1648e21b4f087963abf0101ee5221bb413107b07"
+    "revision": "dd5e59721a5f8dae34604060833902b882023aaf"
   },
   "cairo": {
     "revision": "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"
@@ -162,7 +162,7 @@
     "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
   },
   "foam": {
-    "revision": "df1c0759e101b26e536254ca45d1ea7ca976fd58"
+    "revision": "04664b40c0dadb7ef37028acf3422c63271d377b"
   },
   "forth": {
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
@@ -561,7 +561,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "47415d3f9ed2b3df9b9fc5f5d0ee1a71be3c67e0"
+    "revision": "11526ab1a2514c7302f3c4af60b0ebc992cee086"
   },
   "slint": {
     "revision": "00c8a2d3645766f68c0d0460086c0a994e5b0d85"
@@ -687,7 +687,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "20433e0d8ff5bb6e7bb28d12948773be2bdd983d"
+    "revision": "165ed9fda0be82ff26639dd8cf5d93fe7f7432a0"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -714,7 +714,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0c2c28b3227cd902bd54b1eb02908a967ab2f525"
+    "revision": "9573195e753fa0d303e65d8237d3902159708457"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 00f9b1ffed50803b8653c32e9799bd027fe13405 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Mon, 30 Oct 2023 21:33:09 +0100
Subject: [PATCH 0913/2704] fix(luarocks): don't copy runtime data to share/

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 139e6cb99..338c75463 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,4 @@ build:
 
 install:
 	mkdir -p $(INST_LUADIR)
-	cp -r autoload plugin queries lua $(INST_LUADIR)
+	cp -r lua/* $(INST_LUADIR)

From 1e64838ff575405c32b447b68762649289e8d73c Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Mon, 30 Oct 2023 21:45:31 +0100
Subject: [PATCH 0914/2704] fix(luarocks): enable automatic runtime path
 detection

---
 contrib/nvim-treesitter-luarocks.template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/contrib/nvim-treesitter-luarocks.template b/contrib/nvim-treesitter-luarocks.template
index 3bb15d3b2..8109f5f2b 100644
--- a/contrib/nvim-treesitter-luarocks.template
+++ b/contrib/nvim-treesitter-luarocks.template
@@ -37,9 +37,5 @@ build = {
     INST_LUADIR='$(LUADIR)',
     INST_CONFDIR='$(CONFDIR)',
   },
-  copy_directories = {
-    'autoload',
-    'plugin',
-    'queries'
-  }
+  copy_directories = $copy_directories,
 }

From 36f81e698ee67cba76f698a5a86fb7c6ecdeb7b0 Mon Sep 17 00:00:00 2001
From: aMOPel <36712072+aMOPel@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:21:43 +0100
Subject: [PATCH 0915/2704] feat(nim): added some captures and fixed some bugs
 (#5664)

* fix(nim): literals in pragmas in types would be falsly highlighted as `@variable`

* style(nim): removed trailing whitespace

* fix(nim): identifiers in (type_expression (pragma_expression)) would be
captured as `@type`

* fix(nim): changed generic parameters when declaring from @type to @parameter

* feat(nim): added @constant capture for (identifier)s x, y in
`array[x..y, type]`

* feat(nim): added @function.call capture for (identifier)s in second
argument to `varargs[type, routine]`
---
 queries/nim/highlights.scm | 103 ++++++++++++++++++++++++++++---------
 1 file changed, 78 insertions(+), 25 deletions(-)

diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index e3aa64d2c..a743c544b 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -10,6 +10,25 @@
 ; capture nodes containing (identifier) as a whole, while overruling the
 ; @variable capture.
 
+(type_expression) @type
+; NOTE: has to be after 
+; ((identifier) @variable (#set! "priority" 99))
+
+; overrule identifiers in pragmas in (proc_type)s and (pragma_expression)s
+(proc_type
+  pragmas:
+    (pragma_list) @variable)
+(iterator_type
+  pragmas:
+    (pragma_list) @variable)
+(type_expression
+  (pragma_expression
+    right:
+      (pragma_list) @variable))
+; NOTE: has to be after 
+; (type_expression) @type
+; and before @preproc and all literals
+
 ; =============================================================================
 ; @comment               ; line and block comments
 
@@ -22,8 +41,8 @@
 ; @comment.documentation ; comments documenting code
 
 (documentation_comment "##" @comment.documentation)
-(block_documentation_comment 
-  "##[" @comment.documentation 
+(block_documentation_comment
+  "##[" @comment.documentation
   "]##" @comment.documentation)
 ; NOTE: leaving content uncaptured so markdown can be injected
 
@@ -217,6 +236,22 @@
   ])
 ; NOTE: will double capture as @function.call if it also has argument_list
 
+; function.calls in `varargs[type, routine]`
+(bracket_expression
+  left: (identifier) @_varargs
+  right: 
+    (argument_list
+      . 
+      (_)
+      .
+      [
+        (identifier) @function.call
+        (accent_quoted (identifier) @function.call)
+        (dot_expression right: (identifier) @function.call)
+        (dot_expression right: (accent_quoted (identifier) @function.call))
+      ])
+  (#eq? @_varargs "varargs"))
+
 ; =============================================================================
 ; @function.macro   ; preprocessor macros
 
@@ -405,26 +440,6 @@
 ; =============================================================================
 ; @type            ; type or class definitions and annotations
 
-(type_expression) @type
-
-; overrule identifiers in pragmas in (proc_type)s
-(proc_type
-  pragmas: (pragma_list (_) @variable)
-  (#set! "priority" 101))
-(iterator_type
-  pragmas: (pragma_list (_) @variable)
-  (#set! "priority" 101))
-
-; generic types when declaring
-((generic_parameter_list
-  (parameter_declaration
-    (symbol_declaration_list
-      (symbol_declaration
-        name: [
-          (identifier) @type
-          (accent_quoted (identifier) @type)
-        ])))))
-
 ; generic types when calling
 (call
   function: (bracket_expression
@@ -432,8 +447,6 @@
 ; NOTE: this also falsely matches
 ; when accessing and directly call elements from an array of routines
 ; eg `array_of_routines[index](arguments), but that is an uncommon case
-; NOTE: this will falsly capture (identifier)s that aren't types as well, eg
-; array[enum1..enum2, int]
 
 (dot_generic_call
   generic_arguments: (_) @type)
@@ -491,6 +504,16 @@
         ]))))
 ; NOTE: needs to be after @type
 
+; generic types when declaring
+((generic_parameter_list
+  (parameter_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
+          (identifier) @parameter
+          (accent_quoted (identifier) @parameter)
+        ])))))
+
 ; for loop variables
 (for
   left:
@@ -510,7 +533,7 @@
   (#has-ancestor? @_tuple_decons for))
 
 (concept_declaration
-  parameters: 
+  parameters:
     (parameter_list [
       (identifier) @parameter
       (accent_quoted (identifier) @parameter)
@@ -665,6 +688,36 @@
     ])) @_tuple_decons
   (#has-ancestor? @_tuple_decons const_section))
 
+; constants x and y in `array[x..y, type]`
+(bracket_expression
+  left: (identifier) @_array
+  right: 
+    (argument_list
+      . 
+      (infix_expression 
+        right: [
+          (identifier) @constant
+          (accent_quoted (identifier) @constant)
+          (dot_expression right: (identifier) @constant)
+          (dot_expression right: (accent_quoted (identifier) @constant))
+        ]))
+  (#any-of? @_array "array" "range"))
+(bracket_expression
+  left: (identifier) @_array
+  right: 
+    (argument_list
+      . 
+      (infix_expression 
+        left: [
+          (identifier) @constant
+          (accent_quoted (identifier) @constant)
+          (dot_expression right: (identifier) @constant)
+          (dot_expression right: (accent_quoted (identifier) @constant))
+        ]))
+  (#any-of? @_array "array" "range"))
+; NOTE: can only do this for (infix_expression)s, since standalone identifiers
+; could be ordinal types and constants
+
 ; =============================================================================
 ; @constant.builtin ; built-in constant values
 

From b41bbcbb9a2c5543d3bfa4cf7e2b0948a5f61ce6 Mon Sep 17 00:00:00 2001
From: Tomohiro Hashidate <kakyoin.hierophant@gmail.com>
Date: Fri, 1 Dec 2023 01:22:29 +0900
Subject: [PATCH 0916/2704] feat: add rbs parser support (#5745)

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +++
 queries/rbs/folds.scm           |   5 ++
 queries/rbs/highlights.scm      | 117 ++++++++++++++++++++++++++++++++
 queries/rbs/indents.scm         |  24 +++++++
 queries/rbs/injections.scm      |   2 +
 7 files changed, 160 insertions(+)
 create mode 100644 queries/rbs/folds.scm
 create mode 100644 queries/rbs/highlights.scm
 create mode 100644 queries/rbs/indents.scm
 create mode 100644 queries/rbs/injections.scm

diff --git a/README.md b/README.md
index 8a5c41651..5a334ca4e 100644
--- a/README.md
+++ b/README.md
@@ -346,6 +346,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
+- [x] [rbs](https://github.com/joker1007/tree-sitter-rbs) (maintained by @joker1007)
 - [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
 - [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
diff --git a/lockfile.json b/lockfile.json
index ad0480700..b6632930d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -518,6 +518,9 @@
   "rasi": {
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
+  "rbs": {
+    "revision": "192eda46774fd0281cdd41d372d5b4da86148780"
+  },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 86bb7e358..640018cff 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1536,6 +1536,14 @@ list.rasi = {
   maintainers = { "@Fymyte" },
 }
 
+list.rbs = {
+  install_info = {
+    url = "https://github.com/joker1007/tree-sitter-rbs",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@joker1007" },
+}
+
 list.re2c = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-re2c",
diff --git a/queries/rbs/folds.scm b/queries/rbs/folds.scm
new file mode 100644
index 000000000..ff8e7c588
--- /dev/null
+++ b/queries/rbs/folds.scm
@@ -0,0 +1,5 @@
+[
+  (class_decl)
+  (module_decl)
+  (interface_decl)
+] @fold
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
new file mode 100644
index 000000000..e985e8e0a
--- /dev/null
+++ b/queries/rbs/highlights.scm
@@ -0,0 +1,117 @@
+; Use directive
+
+(use_clause
+  [
+    (type_name)
+    (simple_type_name)
+  ] @type)
+
+; Buitin constants and Keywords
+
+[
+  "true"
+  "false"
+] @boolean
+
+"nil" @constant.builtin
+
+[
+  "use"
+  "as"
+  "class"
+  "module"
+  "interface"
+  "type"
+  "def"
+  "attr_reader"
+  "attr_writer"
+  "attr_accessor"
+  "end"
+  "alias"
+] @keyword
+
+"def" @keyword.function
+
+; Members of declaration
+
+[
+ "include"
+ "extend"
+ "prepend"
+] @function.method
+
+(visibility) @type.qualifier
+
+(comment) @comment @spell
+
+(method_member
+  (method_name
+    [
+     (identifier)
+     (constant)
+     (operator)
+     (setter)
+    ] @method))
+
+[(ivar_name) (cvar_name)] @property
+
+(alias_member (method_name) @function)
+
+(class_name (constant) @type)
+(module_name (constant) @type)
+(interface_name (interface) @type)
+(alias_name (identifier) @type)
+(type_variable) @constant
+(namespace (constant) @namespace)
+
+(builtin_type) @type.builtin
+
+(const_name (constant) @constant)
+(global_name) @property
+
+; Standard Arguments
+(parameter (var_name) @parameter)
+
+; Keyword Arguments
+(keyword) @parameter
+
+; Self
+(self) @variable.builtin
+
+; Literal
+(type (symbol_literal) @symbol)
+
+(type (string_literal (escape_sequence) @string.escape))
+(type (string_literal) @string)
+
+(type (integer_literal) @number)
+
+; Operators
+
+[
+ "="
+ "->"
+ "<"
+ "**"
+ "*"
+ "&"
+ "|"
+ "^"
+ ] @operator
+
+; Punctuation
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+ ] @punctuation.bracket
+
+
+[
+ ","
+ "."
+ ] @punctuation.delimiter
diff --git a/queries/rbs/indents.scm b/queries/rbs/indents.scm
new file mode 100644
index 000000000..f6da5b10b
--- /dev/null
+++ b/queries/rbs/indents.scm
@@ -0,0 +1,24 @@
+[
+  (class_decl)
+  (module_decl)
+  (interface_decl)
+  (parameters)
+  (tuple_type)
+  (record_type)
+] @indent.begin
+
+[
+  "end"
+  ")"
+  "]"
+  "}"
+] @indent.end
+
+[
+  "end"
+  ")"
+  "}"
+  "]"
+] @indent.branch
+
+(comment) @indent.auto
diff --git a/queries/rbs/injections.scm b/queries/rbs/injections.scm
new file mode 100644
index 000000000..321c90add
--- /dev/null
+++ b/queries/rbs/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))

From 80a16deb5146a3eb4648effccda1ab9f45e43e76 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 1 Dec 2023 06:37:10 +0000
Subject: [PATCH 0917/2704] Update parsers: rbs

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index b6632930d..ad28ea03f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -519,7 +519,7 @@
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "rbs": {
-    "revision": "192eda46774fd0281cdd41d372d5b4da86148780"
+    "revision": "23c69a4fa9803abc9d87b235ca88d52418250041"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"

From 0791b5ebb590a2d44e20640c52679df1fc42e8ab Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 3 Dec 2023 06:34:44 +0000
Subject: [PATCH 0918/2704] Update parsers: elm

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index ad28ea03f..23abeb9dd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "a2861e88a730287a60c11ea9299c033c7d076e30"
   },
   "elm": {
-    "revision": "debe14fad40a8100c679d95c66f599b48111742c"
+    "revision": "0ae8d475281a25e9d7ab1068a952ff9a1615c0df"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"

From 67536f4057e4901e37805708bcfdd3d9abacfd26 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 4 Dec 2023 06:38:17 +0000
Subject: [PATCH 0919/2704] Update parsers: elixir, qmljs, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 23abeb9dd..48b0e597b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "a2861e88a730287a60c11ea9299c033c7d076e30"
+    "revision": "11426c5fd20eef360d5ecaf10729191f6bc5d715"
   },
   "elm": {
     "revision": "0ae8d475281a25e9d7ab1068a952ff9a1615c0df"
@@ -504,7 +504,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "35ead5b9955cdb29bcf709d622fa960ff33992b6"
+    "revision": "259133077f2fd854bcaa6f0149d3fc281fc8070b"
   },
   "query": {
     "revision": "3a9808b22742d5bd906ef5d1a562f2f1ae57406d"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "9573195e753fa0d303e65d8237d3902159708457"
+    "revision": "ee7bc3b0557a48cc22221f4ced5ca6c56cfe76db"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 3065a928fc134167f439230b01216e45198be715 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 4 Dec 2023 20:37:26 +0200
Subject: [PATCH 0920/2704] fix(java): move attributes after constants

---
 queries/java/highlights.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index ae498a159..27f139ec2 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -32,15 +32,6 @@
 (lambda_expression
     parameters: (identifier) @parameter) ; x -> ...
 
-; Annotations
-
-(annotation
-  "@" @attribute
-  name: (identifier) @attribute)
-(marker_annotation
-  "@" @attribute
-  name: (identifier) @attribute)
-
 ; Operators
 
 [
@@ -135,6 +126,15 @@
 
 (this) @variable.builtin
 
+; Annotations
+
+(annotation
+  "@" @attribute
+  name: (identifier) @attribute)
+(marker_annotation
+  "@" @attribute
+  name: (identifier) @attribute)
+
 ; Literals
 
 (string_literal) @string

From c203884c80ef31b6a3993398734fbe008addcb27 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 5 Dec 2023 06:36:57 +0000
Subject: [PATCH 0921/2704] Update parsers: liquidsoap, rbs, vhs, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 48b0e597b..32e32851d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -342,7 +342,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquidsoap": {
-    "revision": "91d2708e12a5869154a85190b13ac89cb1414189"
+    "revision": "691484ae766c4eee2ac59ec09e621b27b9ed9add"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -519,7 +519,7 @@
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "rbs": {
-    "revision": "23c69a4fa9803abc9d87b235ca88d52418250041"
+    "revision": "75b42d86e84f01bb3a367d7d7b9bd40de84d5ad7"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
@@ -699,7 +699,7 @@
     "revision": "902031343056bc0b11f3e47b33f036a9cf59f58d"
   },
   "vhs": {
-    "revision": "375b42e9845f704dd491c17c7e37f7c972e0faf3"
+    "revision": "9534865e614c95eb9418e5e73f061c32fa4d9540"
   },
   "vim": {
     "revision": "32c76f150347c1cd044e90b8e2bc73c00677fa55"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "ee7bc3b0557a48cc22221f4ced5ca6c56cfe76db"
+    "revision": "0ea8670963539fcf1b13a6a9c32e72179080e7d7"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From f861bc6148e7bc715f6a09bd34bb1f577b62a248 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 7 Dec 2023 06:37:00 +0000
Subject: [PATCH 0922/2704] Update parsers: gleam, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 32e32851d..edec3f779 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "b2afa4fd6bb41a7bf912b034c653c90af7ae5122"
+    "revision": "3479db3d2024406c2a35cc16c96e89f972c9a439"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0ea8670963539fcf1b13a6a9c32e72179080e7d7"
+    "revision": "4f02229bc407bc678b52ba3c49a0b06447d2d8c3"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 180e1ca385442e35e1d18420221a148c5e045671 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 8 Dec 2023 06:36:38 +0000
Subject: [PATCH 0923/2704] Update parsers: gitcommit, gleam, rbs, sql, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index edec3f779..002684da3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,13 +192,13 @@
     "revision": "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"
   },
   "gitcommit": {
-    "revision": "6856a5fd0ffeff17d83325a8ce4e57811010eff1"
+    "revision": "7e3ad5fdc61cd701e146ef78e4fc6dcdf6dbca0e"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "3479db3d2024406c2a35cc16c96e89f972c9a439"
+    "revision": "c9c7f0f01749d301b54e96ed8e0c47c7c415a196"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -519,7 +519,7 @@
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "rbs": {
-    "revision": "75b42d86e84f01bb3a367d7d7b9bd40de84d5ad7"
+    "revision": "b28e1819d434e95916d11fe48ee6e8959b69197b"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
@@ -591,7 +591,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "a3ea0e4143a617fc2c4ccf29c41e0ba7a1ff6ab9"
+    "revision": "1b7d451554f435d28c3217724acf00cdc627ee73"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "4f02229bc407bc678b52ba3c49a0b06447d2d8c3"
+    "revision": "55f5626617726954a1a95aa93e363a6a04913fa1"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From bd5517989398145c36d859927fb4e76a45c66cf6 Mon Sep 17 00:00:00 2001
From: gbprod <contact@gb-prod.fr>
Date: Sat, 9 Dec 2023 04:36:17 +0100
Subject: [PATCH 0924/2704] feat(gitcommit): add highlight group for
 subject_prefix (#5774)

---
 queries/gitcommit/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index 15ba85ef8..9c70e19b5 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -9,6 +9,7 @@
 
 (subject) @text.title @spell
 (subject (overflow) @text @spell)
+(subject (subject_prefix) @function @nospell)
 (prefix (type) @keyword @nospell)
 (prefix (scope) @parameter @nospell)
 (prefix [

From 401ef01feb9228e6bd33a25bbae7c9e23127efff Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 9 Dec 2023 06:35:28 +0000
Subject: [PATCH 0925/2704] Update parsers: nickel, v

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 002684da3..37e79de71 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -390,7 +390,7 @@
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
   },
   "nickel": {
-    "revision": "b759233581fd8bae239e905c67a9ba453205da78"
+    "revision": "502a8746c82c616ed441e0ab2b8c09772ee7d114"
   },
   "nim": {
     "revision": "1f9308c9e440ddbc67c0aaeb9396c992d266b281"
@@ -690,7 +690,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "165ed9fda0be82ff26639dd8cf5d93fe7f7432a0"
+    "revision": "ce3481c10eabed0ba36cfa9f72957c4d3f88689d"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 1b5bbb54b385c4eae217113f72df5284bc3cc94b Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 6 Dec 2023 11:10:33 +0200
Subject: [PATCH 0926/2704] fix(vim): highlight 'scriptencoding' command

---
 queries/vim/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index c5bd2e947..9bae16ae9 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -83,6 +83,7 @@
   "delcommand"
   "comclear"
   "colorscheme"
+  "scriptencoding"
   "startinsert"
   "stopinsert"
   "global"
@@ -194,6 +195,10 @@
 
 (colorscheme_statement (name) @string)
 
+;; Scriptencoding command
+
+(scriptencoding_statement (encoding) @string.special)
+
 ;; Literals
 
 (string_literal) @string

From 7958ff9ec7a2baea2842323d0e7ac67a509da4d2 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 9 Dec 2023 16:59:12 +0200
Subject: [PATCH 0927/2704] feat(poe_filter): add new Import statement

---
 lockfile.json                     | 2 +-
 queries/poe_filter/highlights.scm | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 37e79de71..3f86074b7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -459,7 +459,7 @@
     "revision": "39da859947b94abdee43e431368e1ae975c0a424"
   },
   "poe_filter": {
-    "revision": "374f618de179498c2a821136bb86c3edbe221e10"
+    "revision": "fa83292e04d27976ab5c354e0c980f2c67628a02"
   },
   "pony": {
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
diff --git a/queries/poe_filter/highlights.scm b/queries/poe_filter/highlights.scm
index 6914865a1..3b233a7d8 100644
--- a/queries/poe_filter/highlights.scm
+++ b/queries/poe_filter/highlights.scm
@@ -1,5 +1,7 @@
 ["Show" "Hide" "Minimal"] @namespace
 
+["Import" "Optional"] @include
+
 (condition (name) @conditional)
 (action (name) @keyword)
 (continue) @label
@@ -8,7 +10,7 @@
 
 (string) @string
 
-(file) @string
+(file) @string.special
 
 [
   (quality)
@@ -33,6 +35,7 @@
 
 "\"" @punctuation.delimiter
 
+; conceal unnecessary quotes
 ("\"" @conceal
   (#not-has-parent? @conceal string file)
   (#set! conceal ""))

From b6b9ca448b7f236e2e60f8393a729902511f9db9 Mon Sep 17 00:00:00 2001
From: r001 <rob@nyar.eu>
Date: Sun, 10 Dec 2023 11:16:24 +0400
Subject: [PATCH 0928/2704] indents added new language highlights added (#5777)

---
 lockfile.json              |  2 +-
 queries/leo/highlights.scm |  2 ++
 queries/leo/indents.scm    | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 queries/leo/indents.scm

diff --git a/lockfile.json b/lockfile.json
index 3f86074b7..29d03c1a5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -336,7 +336,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "23a9534d09d523d0dcee7dbf89e7c819e6835f6f"
+    "revision": "304611b5eaf53aca07459a0a03803b83b6dfd3b3"
   },
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 86939e168..60f3fefeb 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -131,6 +131,7 @@
 [
  (block_height)
  (self_caller)
+ (self_signer)
 ] @constant.builtin
 
 (free_function_call
@@ -172,6 +173,7 @@
 
 [ 
   (address_literal)
+  (signature_literal)
   ((affine_group_literal) (#set! "priority" 101))
   (field_literal) 
   (product_group_literal) 
diff --git a/queries/leo/indents.scm b/queries/leo/indents.scm
new file mode 100644
index 000000000..a8de26ecd
--- /dev/null
+++ b/queries/leo/indents.scm
@@ -0,0 +1,33 @@
+[
+ (record_declaration) 
+ (struct_declaration)
+ (mapping_declaration)
+ (constant_declaration)
+ (return_statement)
+ (expression_statement)
+ (variable_declaration)
+ (loop_statement)
+ (assignment_statement)
+ (assert_statement)
+ (struct_expression)
+ (array_expression)
+ (tuple_expression)
+ (parenthesized_expression)
+ (items_block)
+ (block)
+] @indent.begin
+
+; if "if" statement and conditional statement are in separate lines 
+; conditional should be indented and when the conditional block 
+; starts dedented
+(branch
+  (block "{" @indent.end)) @indent.begin
+
+((function_parameters) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+[
+ (comment)
+ (ERROR)
+] @indent.auto

From a6c655629cad421e432aa84af32cbfe35375113a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 11 Dec 2023 06:37:56 +0000
Subject: [PATCH 0929/2704] Update parsers: nim, v, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 29d03c1a5..f280a58c3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -393,7 +393,7 @@
     "revision": "502a8746c82c616ed441e0ab2b8c09772ee7d114"
   },
   "nim": {
-    "revision": "1f9308c9e440ddbc67c0aaeb9396c992d266b281"
+    "revision": "fe53e07e42fc6c8fab934ab3675d65b4247e9c29"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -690,7 +690,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "ce3481c10eabed0ba36cfa9f72957c4d3f88689d"
+    "revision": "012e7732614acf9ec75c0e5e774900da1313031e"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "55f5626617726954a1a95aa93e363a6a04913fa1"
+    "revision": "5feebac75906910415766f0aec55c24188e592c3"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 78d75bce03f218ee30aedb6e24e3ec1189a3e9ff Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 12 Dec 2023 06:36:49 +0000
Subject: [PATCH 0930/2704] Update parsers: gomod, haskell, hoon, nim, slang,
 sql, v, wing

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f280a58c3..d21f79d81 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -216,7 +216,7 @@
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
   },
   "gomod": {
-    "revision": "f41a27386f1cfa1271122db5f0ff59b910520007"
+    "revision": "af4270aed18500af1d24e6de5f6e7d243e2c8b05"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -243,7 +243,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "ca10c43a4c9bfe588c480d2941726c2fadcae699"
+    "revision": "d70b321b8b702939d722c2c15f4c28d14e91a400"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -264,7 +264,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6"
+    "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
     "revision": "d742025fa2d8e6100f134a6ea990443aa1f074b3"
@@ -393,7 +393,7 @@
     "revision": "502a8746c82c616ed441e0ab2b8c09772ee7d114"
   },
   "nim": {
-    "revision": "fe53e07e42fc6c8fab934ab3675d65b4247e9c29"
+    "revision": "77762e3680cb7b0a4380580de7a8b95e00f0dc6b"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -564,7 +564,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "11526ab1a2514c7302f3c4af60b0ebc992cee086"
+    "revision": "b07419a4b9dda852b6d9bb05bbf8391150bcdd62"
   },
   "slint": {
     "revision": "00c8a2d3645766f68c0d0460086c0a994e5b0d85"
@@ -591,7 +591,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "1b7d451554f435d28c3217724acf00cdc627ee73"
+    "revision": "b599f6a1ca37cb5bae827a424cd98371a0d91bdc"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -690,7 +690,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "012e7732614acf9ec75c0e5e774900da1313031e"
+    "revision": "fdd137445c50d73767548c1b2386e5f560d5d042"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "5feebac75906910415766f0aec55c24188e592c3"
+    "revision": "76420bc5832e421fb7b0ade2262f19fdff005988"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 42381aae7c1f785e4658cdb34a750be9851ba9af Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 13 Dec 2023 06:36:47 +0000
Subject: [PATCH 0931/2704] Update parsers: nim, slang, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d21f79d81..e41624c76 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -393,7 +393,7 @@
     "revision": "502a8746c82c616ed441e0ab2b8c09772ee7d114"
   },
   "nim": {
-    "revision": "77762e3680cb7b0a4380580de7a8b95e00f0dc6b"
+    "revision": "d41fd3e4c1f83a0e6429c2d035209e107e80e6f8"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -564,7 +564,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "b07419a4b9dda852b6d9bb05bbf8391150bcdd62"
+    "revision": "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7"
   },
   "slint": {
     "revision": "00c8a2d3645766f68c0d0460086c0a994e5b0d85"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "76420bc5832e421fb7b0ade2262f19fdff005988"
+    "revision": "693ee4b3a995a9c305479b32c10e0a87013ff125"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 30b5bdca1b534da71cdbc57fbbfe5693b4299e56 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 14 Dec 2023 06:37:46 +0000
Subject: [PATCH 0932/2704] Update parsers: v, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e41624c76..0ef81dd6c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -690,7 +690,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "fdd137445c50d73767548c1b2386e5f560d5d042"
+    "revision": "20e9968fcb7c53686d588d8cd4ad294340a27732"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "693ee4b3a995a9c305479b32c10e0a87013ff125"
+    "revision": "b2a8767803a50d654e9bfbd90d55cc0414b6ca8f"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 2583eb351ba5dab9ab06489d371987518e1d018f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Thu, 14 Dec 2023 11:37:34 +0200
Subject: [PATCH 0933/2704] fix(python): highlight variadic lambda parameters

---
 queries/python/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index b09122dd9..cfe0ab3e2 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -137,6 +137,12 @@
 (parameters
   (dictionary_splat_pattern ; **kwargs
     (identifier) @parameter))
+(lambda_parameters
+  (list_splat_pattern
+    (identifier) @parameter))
+(lambda_parameters
+  (dictionary_splat_pattern
+    (identifier) @parameter))
 
 
 ;; Literals

From ab818bf5a2ee21515ade9afcf428e98056b6197b Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Thu, 14 Dec 2023 14:38:43 +0200
Subject: [PATCH 0934/2704] fix(python): restrict typed parameter highlight

Only the name is a parameter and not the value
---
 queries/python/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index cfe0ab3e2..5b0301d21 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -129,7 +129,7 @@
 (typed_parameter
   (identifier) @parameter)
 (typed_default_parameter
-  (identifier) @parameter)
+  name: (identifier) @parameter)
 ; Variadic parameters *args, **kwargs
 (parameters
   (list_splat_pattern ; *args

From 9bc1f1e6406933e9263456e5761e47b9cb1da71d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 15 Dec 2023 10:00:18 +0100
Subject: [PATCH 0935/2704] fix(v): adapt to removed  scanner.c

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 queries/v/highlights.scm        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0ef81dd6c..a34b4b998 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -690,7 +690,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "20e9968fcb7c53686d588d8cd4ad294340a27732"
+    "revision": "f7c31c7578ebd35b95cfa85c6461ed6480697a9a"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 640018cff..5b10b79b9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2015,7 +2015,7 @@ list.uxntal = {
 list.v = {
   install_info = {
     url = "https://github.com/v-analyzer/v-analyzer",
-    files = { "src/parser.c", "src/scanner.c" },
+    files = { "src/parser.c" },
     location = "tree_sitter_v",
   },
   filetype = "vlang",
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index b90749590..dbf059d8f 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -439,9 +439,9 @@
 ] @string
 
 (string_interpolation
-  (braced_interpolation_opening) @punctuation.bracket
-  (interpolated_expression) @none
-  (braced_interpolation_closing) @punctuation.bracket)
+  (interpolation_opening) @punctuation.bracket
+  (interpolation_expression) @none
+  (interpolation_closing) @punctuation.bracket)
 
 (escape_sequence) @string.escape
 

From 194b3f0047816132b08bcc2857b23a49fa967d04 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 15 Dec 2023 09:33:21 +0000
Subject: [PATCH 0936/2704] Update parsers: erlang, haskell, nim, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a34b4b998..4d79a3ed0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "56942778b5791d07949e6c7b6093e01aba5b7ab4"
+    "revision": "08218898824c68fc8439cba1540042081e2da18d"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -243,7 +243,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "d70b321b8b702939d722c2c15f4c28d14e91a400"
+    "revision": "23ad72f4b755269004a0a3f3796192705313643d"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -393,7 +393,7 @@
     "revision": "502a8746c82c616ed441e0ab2b8c09772ee7d114"
   },
   "nim": {
-    "revision": "d41fd3e4c1f83a0e6429c2d035209e107e80e6f8"
+    "revision": "0fdb059ce7c1926a0287c3deb80e20186e4451d7"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "b2a8767803a50d654e9bfbd90d55cc0414b6ca8f"
+    "revision": "698e645b30e871a58c7de68e0ecd6d2ebbdd0009"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 000f71842bf08840df1e70004b17507fa92b2fb7 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann <vincent@rischmann.fr>
Date: Fri, 15 Dec 2023 20:01:31 +0100
Subject: [PATCH 0937/2704] feat(gomod): highlight the `toolchain` directive
 (#5795)

---
 queries/gomod/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
index 36a676414..76a2a4523 100644
--- a/queries/gomod/highlights.scm
+++ b/queries/gomod/highlights.scm
@@ -2,6 +2,7 @@
   "require"
   "replace"
   "go"
+  "toolchain"
   "exclude"
   "retract"
   "module"

From 5a713474e38a3999b85c6cb3f5cac3248a16c7d0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 16 Dec 2023 06:35:10 +0000
Subject: [PATCH 0938/2704] Update parsers: erlang, nim, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4d79a3ed0..909a05525 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "08218898824c68fc8439cba1540042081e2da18d"
+    "revision": "57e69513efd831f9cc8207d65d96bad917ca4aa4"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -393,7 +393,7 @@
     "revision": "502a8746c82c616ed441e0ab2b8c09772ee7d114"
   },
   "nim": {
-    "revision": "0fdb059ce7c1926a0287c3deb80e20186e4451d7"
+    "revision": "482e2f4e1c2520db711c57f1899e926c3e81d4eb"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -690,7 +690,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "f7c31c7578ebd35b95cfa85c6461ed6480697a9a"
+    "revision": "7ab132568aa18af0f177d4476079d3c412741a9d"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "698e645b30e871a58c7de68e0ecd6d2ebbdd0009"
+    "revision": "f9ccaffe1f8ef68e56d403451c34429388f966f1"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 25ddfde8d7167d7d81403d6809242439037d2b68 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 17 Dec 2023 06:35:10 +0000
Subject: [PATCH 0939/2704] Update parsers: elm, haskell, templ, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 909a05525..6135b7d44 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "11426c5fd20eef360d5ecaf10729191f6bc5d715"
   },
   "elm": {
-    "revision": "0ae8d475281a25e9d7ab1068a952ff9a1615c0df"
+    "revision": "ac2b629b3877ce22b3f171fee4517d8c2e6992e9"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -243,7 +243,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "23ad72f4b755269004a0a3f3796192705313643d"
+    "revision": "5260f606ec353f156751473a0c203d67167c0ebe"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -633,7 +633,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "6b9dff614d5bab902cb6989bfcaa180636218159"
+    "revision": "671e9a957acd40088919ca17b30f4a39870784d4"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f9ccaffe1f8ef68e56d403451c34429388f966f1"
+    "revision": "78da69154d39da9f0e3db2f07359e0ffbb5174fa"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From edacfa2eedd1d6099cd45e28ffe2892066b0b3ba Mon Sep 17 00:00:00 2001
From: aMOPel <36712072+aMOPel@users.noreply.github.com>
Date: Mon, 18 Dec 2023 17:32:06 +0100
Subject: [PATCH 0940/2704] fix(nim): minor improvements to queries and parser
 (#5784)

* fix(nim): bump parser again to include minor fix

* fix(nim): shifting around for precedence

* fix(nim): added new fields from recent parser version,
improved support for (conditional_declaration) and (variant_declaration)
---
 queries/nim/folds.scm      |  2 ++
 queries/nim/highlights.scm | 58 ++++++++++++++++++++++----------------
 queries/nim/locals.scm     | 45 +++++++++++++----------------
 3 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/queries/nim/folds.scm b/queries/nim/folds.scm
index 27c8d4669..466bcf5ae 100644
--- a/queries/nim/folds.scm
+++ b/queries/nim/folds.scm
@@ -12,6 +12,8 @@
   (case)
   (if)
   (when)
+  (conditional_declaration)
+  (variant_declaration)
   (of_branch)
   (elif_branch)
   (else_branch)
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index a743c544b..a6e28038e 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -11,7 +11,7 @@
 ; @variable capture.
 
 (type_expression) @type
-; NOTE: has to be after 
+; NOTE: has to be after
 ; ((identifier) @variable (#set! "priority" 99))
 
 ; overrule identifiers in pragmas in (proc_type)s and (pragma_expression)s
@@ -25,10 +25,32 @@
   (pragma_expression
     right:
       (pragma_list) @variable))
-; NOTE: has to be after 
+; NOTE: has to be after
 ; (type_expression) @type
 ; and before @preproc and all literals
 
+; constants/enums in array construction
+(array_construction
+  (colon_expression
+    left: (_) @constant))
+; NOTE: has to be before literals and punctuation etc.
+
+; identifiers in "case" "of" branches have to be enums
+(case
+  alternative:
+    (of_branch
+      values:
+        (expression_list (_) @constant)))
+; NOTE: has to be before literals and punctuation etc.
+
+; in variant objects with "case" "of"
+(variant_declaration
+  alternative:
+    (of_branch
+      values:
+        (expression_list (_) @constant)))
+; NOTE: has to be before literals and punctuation etc.
+
 ; =============================================================================
 ; @comment               ; line and block comments
 
@@ -239,9 +261,9 @@
 ; function.calls in `varargs[type, routine]`
 (bracket_expression
   left: (identifier) @_varargs
-  right: 
+  right:
     (argument_list
-      . 
+      .
       (_)
       .
       [
@@ -448,6 +470,7 @@
 ; when accessing and directly call elements from an array of routines
 ; eg `array_of_routines[index](arguments), but that is an uncommon case
 
+; dot_generic_call `v.call[:type, type]()
 (dot_generic_call
   generic_arguments: (_) @type)
 
@@ -643,16 +666,6 @@
 ; =============================================================================
 ; @constant         ; constant identifiers
 
-; identifiers in "case" "of" branches have to be enums
-(case
-  (of_branch values:
-    (expression_list (_) @constant)))
-
-; in variant objects with "case" "of"
-(variant_declaration
-  (of_branch values:
-    (expression_list (_) @constant)))
-
 ; enum declaration
 (enum_field_declaration
   (symbol_declaration
@@ -661,11 +674,6 @@
       (accent_quoted (identifier) @constant)
     ]))
 
-; constants/enums in array construction
-(array_construction
-  (colon_expression
-    left: (_) @constant))
-
 ; constant declaration
 (const_section
   (variable_declaration
@@ -691,10 +699,10 @@
 ; constants x and y in `array[x..y, type]`
 (bracket_expression
   left: (identifier) @_array
-  right: 
+  right:
     (argument_list
-      . 
-      (infix_expression 
+      .
+      (infix_expression
         right: [
           (identifier) @constant
           (accent_quoted (identifier) @constant)
@@ -704,10 +712,10 @@
   (#any-of? @_array "array" "range"))
 (bracket_expression
   left: (identifier) @_array
-  right: 
+  right:
     (argument_list
-      . 
-      (infix_expression 
+      .
+      (infix_expression
         left: [
           (identifier) @constant
           (accent_quoted (identifier) @constant)
diff --git a/queries/nim/locals.scm b/queries/nim/locals.scm
index dd80b315b..5b70bac10 100644
--- a/queries/nim/locals.scm
+++ b/queries/nim/locals.scm
@@ -131,7 +131,7 @@
   type: (type_expression)? @definition.associated)
 
 (concept_declaration
-  parameters: 
+  parameters:
     (parameter_list [
       (identifier) @definition.parameter
       (accent_quoted (identifier) @definition.parameter)
@@ -193,28 +193,21 @@
 ; ==============================================================================
 ; @definition.field      ; fields or properties
 
-(object_declaration
-  (field_declaration_list
-    (field_declaration
-      (symbol_declaration_list
-        (symbol_declaration
-          name: [
-            (identifier) @definition.field
-            (accent_quoted) @definition.field
-            (exported_symbol (identifier) @definition.field)
-            (exported_symbol (accent_quoted) @definition.field)
-          ]))
-      type: (type_expression)? @definition.associated)))
-
-(tuple_type
-  (field_declaration
-    (symbol_declaration_list
-      (symbol_declaration
-        name: [
-          (identifier) @definition.field
-          (accent_quoted) @definition.field
-        ]))
-    type: (type_expression)? @definition.associated))
+; object_declaration
+; variant_declaration
+; conditional_declaration
+; tuple_type inline
+; tuple_type multiline
+(field_declaration
+  (symbol_declaration_list
+    (symbol_declaration
+      name: [
+        (identifier) @definition.field
+        (accent_quoted) @definition.field
+        (exported_symbol (identifier) @definition.field)
+        (exported_symbol (accent_quoted) @definition.field)
+      ]))
+  type: (type_expression)? @definition.associated)
 
 ; ==============================================================================
 ; @definition.enum       ; enumerations
@@ -273,9 +266,9 @@
   alternative: (else_branch)? @scope)
 
 (case
-  (of_branch)* @scope
-  (elif_branch)* @scope
-  (else_branch)? @scope)
+  alternative: (of_branch)* @scope
+  alternative: (elif_branch)* @scope
+  alternative: (else_branch)? @scope)
 
 (try
   body: (statement_list) @scope

From 24be1534dbd062907842601ae1e2e953ba02472e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 18 Dec 2023 08:19:22 -0800
Subject: [PATCH 0941/2704] fix(rust): highlight inline attributes properly

---
 queries/rust/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index cc629d5e7..60438bd72 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -172,6 +172,7 @@
 ; Attribute macros
 
 (attribute_item (attribute (identifier) @function.macro))
+(inner_attribute_item (attribute (identifier) @function.macro))
 
 (attribute (scoped_identifier (identifier) @function.macro .))
 

From 251c855236fd99174563fd01b60b1eeaaf8ea806 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 19 Dec 2023 06:37:27 +0000
Subject: [PATCH 0942/2704] Update parsers: elm, gomod, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6135b7d44..f4711ddd2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "11426c5fd20eef360d5ecaf10729191f6bc5d715"
   },
   "elm": {
-    "revision": "ac2b629b3877ce22b3f171fee4517d8c2e6992e9"
+    "revision": "44ffae46bb460820c3c3d6fde20378202bd4b0ab"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -216,7 +216,7 @@
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
   },
   "gomod": {
-    "revision": "af4270aed18500af1d24e6de5f6e7d243e2c8b05"
+    "revision": "9b86399ab733fbd548ba0e817e732cb3351082d2"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -690,7 +690,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "7ab132568aa18af0f177d4476079d3c412741a9d"
+    "revision": "eced04c473f3bcb49f9c8ac91744451a9ab40310"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -717,7 +717,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "78da69154d39da9f0e3db2f07359e0ffbb5174fa"
+    "revision": "b5fa0cb75ee96d3ff19df59085d508240f5b0fd5"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 79dcd0e24cbcabc06fc06e9dba4de8faeb0fedb5 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Tue, 19 Dec 2023 19:42:30 +0900
Subject: [PATCH 0943/2704] fix: remove 0-length range usage in indent.lua
 (#5805)

---
 lua/nvim-treesitter/indent.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 80e0bc77b..18d239571 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -23,7 +23,7 @@ end
 ---@return TSNode
 local function get_first_node_at_line(root, lnum, col)
   col = col or vim.fn.indent(lnum)
-  return root:descendant_for_range(lnum - 1, col, lnum - 1, col)
+  return root:descendant_for_range(lnum - 1, col, lnum - 1, col + 1)
 end
 
 ---@param root TSNode
@@ -32,7 +32,7 @@ end
 ---@return TSNode
 local function get_last_node_at_line(root, lnum, col)
   col = col or (#getline(lnum) - 1)
-  return root:descendant_for_range(lnum - 1, col, lnum - 1, col)
+  return root:descendant_for_range(lnum - 1, col, lnum - 1, col + 1)
 end
 
 ---@param node TSNode
@@ -124,7 +124,7 @@ function M.get_indent(lnum)
   -- some languages like Python will actually have worse results when re-parsing at opened new line
   if not M.avoid_force_reparsing[root_lang] then
     -- Reparse in case we got triggered by ":h indentkeys"
-    parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" - 1 }
+    parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
   end
 
   -- Get language tree with smallest range around node that's not a comment parser

From a0b815497b55a8572301506e01dbd2ec24f1813f Mon Sep 17 00:00:00 2001
From: Mark Skelton <mdskelton99@gmail.com>
Date: Tue, 19 Dec 2023 06:53:00 -0600
Subject: [PATCH 0944/2704] feat: add tree-sitter-styled (#5735)

* Add styled parser

* Add queries

* Update highlights

* Remove unnecessary highlights

* Update injections to use the styled grammar

* Remove requires npm
---
 lockfile.json                   | 3 +++
 lua/nvim-treesitter/parsers.lua | 8 ++++++++
 queries/ecma/injections.scm     | 8 ++++----
 queries/styled/folds.scm        | 1 +
 queries/styled/highlights.scm   | 1 +
 queries/styled/indents.scm      | 1 +
 queries/styled/injections.scm   | 1 +
 7 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 queries/styled/folds.scm
 create mode 100644 queries/styled/highlights.scm
 create mode 100644 queries/styled/indents.scm
 create mode 100644 queries/styled/injections.scm

diff --git a/lockfile.json b/lockfile.json
index f4711ddd2..354324895 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -605,6 +605,9 @@
   "strace": {
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
+  "styled": {
+    "revision": "e51e673efc860373167680b4bcbf418a11e4ed26"
+  },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5b10b79b9..2ad741f3f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1779,6 +1779,14 @@ list.strace = {
   maintainers = { "@amaanq" },
 }
 
+list.styled = {
+  install_info = {
+    url = "https://github.com/mskelton/tree-sitter-styled",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@mskelton" },
+}
+
 list.supercollider = {
   install_info = {
     url = "https://github.com/madskjeldgaard/tree-sitter-supercollider",
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 1e0a478df..97dbbb628 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -53,7 +53,7 @@
      (#eq? @_name "styled"))
  arguments: ((template_string) @injection.content
    (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "css")))
+   (#set! injection.language "styled")))
 
 ; styled(Component)`<css>`
 (call_expression
@@ -62,7 +62,7 @@
      (#eq? @_name "styled"))
  arguments: ((template_string) @injection.content
    (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "css")))
+   (#set! injection.language "styled")))
 
 ; styled.div.attrs({ prop: "foo" })`<css>`
 (call_expression
@@ -73,7 +73,7 @@
         (#eq? @_name "styled"))))
  arguments: ((template_string) @injection.content
    (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "css")))
+   (#set! injection.language "styled")))
 
 
 ; styled(Component).attrs({ prop: "foo" })`<css>`
@@ -85,7 +85,7 @@
         (#eq? @_name "styled"))))
  arguments: ((template_string) @injection.content
    (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "css")))
+   (#set! injection.language "styled")))
 
 ((regex_pattern) @injection.content
  (#set! injection.language "regex"))
diff --git a/queries/styled/folds.scm b/queries/styled/folds.scm
new file mode 100644
index 000000000..cbe41875e
--- /dev/null
+++ b/queries/styled/folds.scm
@@ -0,0 +1 @@
+; inherits: css
diff --git a/queries/styled/highlights.scm b/queries/styled/highlights.scm
new file mode 100644
index 000000000..cbe41875e
--- /dev/null
+++ b/queries/styled/highlights.scm
@@ -0,0 +1 @@
+; inherits: css
diff --git a/queries/styled/indents.scm b/queries/styled/indents.scm
new file mode 100644
index 000000000..cbe41875e
--- /dev/null
+++ b/queries/styled/indents.scm
@@ -0,0 +1 @@
+; inherits: css
diff --git a/queries/styled/injections.scm b/queries/styled/injections.scm
new file mode 100644
index 000000000..cbe41875e
--- /dev/null
+++ b/queries/styled/injections.scm
@@ -0,0 +1 @@
+; inherits: css

From 0dfbf5e48e8551212c2a9f1c74cb080c8e76b5d1 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Tue, 19 Dec 2023 12:53:13 +0000
Subject: [PATCH 0945/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5a334ca4e..675add8b5 100644
--- a/README.md
+++ b/README.md
@@ -375,6 +375,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) (maintained by @ObserverOfTime)
 - [x] [starlark](https://github.com/amaanq/tree-sitter-starlark) (maintained by @amaanq)
 - [x] [strace](https://github.com/sigmaSd/tree-sitter-strace) (maintained by @amaanq)
+- [x] [styled](https://github.com/mskelton/tree-sitter-styled) (maintained by @mskelton)
 - [x] [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) (maintained by @madskjeldgaard)
 - [x] [surface](https://github.com/connorlay/tree-sitter-surface) (maintained by @connorlay)
 - [x] [svelte](https://github.com/Himujjal/tree-sitter-svelte) (maintained by @elianiva)

From cdb2ec999c1fb173500e2f9ab4dcd9aa62506c72 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 20 Dec 2023 06:35:45 +0000
Subject: [PATCH 0946/2704] Update parsers: gleam, styled, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 354324895..eb899e743 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "c9c7f0f01749d301b54e96ed8e0c47c7c415a196"
+    "revision": "2b49c49ef632928b5c52bb0a7269ff797d5d1414"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -606,7 +606,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "e51e673efc860373167680b4bcbf418a11e4ed26"
+    "revision": "5e52758b32e02adca16bb93f95b3f9c050c72b56"
   },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
@@ -693,7 +693,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "eced04c473f3bcb49f9c8ac91744451a9ab40310"
+    "revision": "f0336bb8847393ba4d5905a94642acf0dc3d5ebd"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "b5fa0cb75ee96d3ff19df59085d508240f5b0fd5"
+    "revision": "e6e06a05eeb894001d3c24e1db72f5cd2f35bdae"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 96e01877b82760a1852344f6ffd3a51bd6d36c0e Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Fri, 15 Dec 2023 00:05:27 +0100
Subject: [PATCH 0947/2704] highlights(haskell): namespaced string quasiquote

---
 queries/haskell/highlights.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 1fea39b08..eb6380ea0 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -378,8 +378,16 @@
 (quoter) @function.call
 
 (quasiquote 
-  (quoter) @_name (#eq? @_name "qq")
+  [
+   (quoter) @_name
+   (_ (variable) @_name)
+  ](#eq? @_name "qq")
   (quasiquote_body) @string)
+
+(quasiquote 
+  ((_ (variable) @_name)) (#eq? @_name "qq")
+  (quasiquote_body) @string)
+
 ;; namespaced quasi-quoter
 (quasiquote
   (_

From 732c8cb0b43b7336525c3cecb2e28db153994e62 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Mon, 4 Dec 2023 18:39:26 +0100
Subject: [PATCH 0948/2704] highlights(haskell): add `fail` to exception
 highlights

---
 queries/haskell/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index eb6380ea0..2c2189c38 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -425,6 +425,7 @@
    "bracket_"
    "bracketOnErrorSource"
    "finally"
+   "fail"
    "onException"
    "expectationFailure"))
 

From 23cc2cd85c077df1d9582957e99701809f2256c1 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 21 Dec 2023 06:36:36 +0000
Subject: [PATCH 0949/2704] Update parsers: beancount, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index eb899e743..b4da6a21a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -30,7 +30,7 @@
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
   },
   "beancount": {
-    "revision": "484f50849bcce887c86451f532bf778689ca8523"
+    "revision": "cd08aefa20dc0f3d5984b08b5d468f75bf4fd096"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "e6e06a05eeb894001d3c24e1db72f5cd2f35bdae"
+    "revision": "55514ae0d9d0d7c4170e98e9ab50a46f0887053f"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From c153019e11052f38cdf2bdd338750cd103877eba Mon Sep 17 00:00:00 2001
From: Ahnaf Rafi <ahnaf.al.rafi@gmail.com>
Date: Wed, 20 Dec 2023 16:03:45 -0600
Subject: [PATCH 0950/2704] Add @nospell annotation to label definitions and
 references

---
 queries/latex/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 10e02ed1b..bcba33eb2 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -249,3 +249,6 @@
 (citation
   keys: _ @nospell)
 (command_name) @nospell
+(label_definition) @nospell
+(label_reference) @nospell
+(label_reference_range) @nospell

From d2d3df8613ba0b733cc21ed150e3687fad147316 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 21 Dec 2023 14:29:31 +0100
Subject: [PATCH 0951/2704] vimdoc: add note, warning, deprecated (#5817)

---
 lockfile.json                 | 2 +-
 queries/vimdoc/highlights.scm | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index b4da6a21a..e60a56af1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -708,7 +708,7 @@
     "revision": "32c76f150347c1cd044e90b8e2bc73c00677fa55"
   },
   "vimdoc": {
-    "revision": "60045f7d717eba85fa8abd996e0bb50eed5a3d8e"
+    "revision": "4f8ba9e39c8b3fbaf0bb5f70ac255474a9099359"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index c52333df1..78ae9dab9 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -23,3 +23,9 @@
 (argument) @parameter
 (keycode) @string.special
 (url) @text.uri
+((note) @text.note
+   (#any-of? @text.note "Note:" "NOTE:" "Notes:"))
+((note) @text.warning
+   (#any-of? @text.warning "Warning:" "WARNING:"))
+((note) @text.danger
+   (#any-of? @text.danger "Deprecated:" "DEPRECATED:"))

From d496c5e08e853dadedc7f5d0a6541288d0441fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Boczar?= <yendreij@gmail.com>
Date: Thu, 21 Dec 2023 21:49:13 +0100
Subject: [PATCH 0952/2704] fix(cpp): incorrect indent of class with opening {
 on new line (#5811)

---
 queries/cpp/indents.scm            | 2 --
 tests/indent/cpp/class_newline.cpp | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 tests/indent/cpp/class_newline.cpp

diff --git a/queries/cpp/indents.scm b/queries/cpp/indents.scm
index 7df9aea0c..6faa6f144 100644
--- a/queries/cpp/indents.scm
+++ b/queries/cpp/indents.scm
@@ -1,11 +1,9 @@
 ; inherits: c
 
 [
-  (class_specifier)
   (condition_clause)
 ] @indent.begin
 
 ((field_initializer_list) @indent.begin
   (#set! indent.start_at_same_line 1))
 (access_specifier) @indent.branch
-
diff --git a/tests/indent/cpp/class_newline.cpp b/tests/indent/cpp/class_newline.cpp
new file mode 100644
index 000000000..084d3026b
--- /dev/null
+++ b/tests/indent/cpp/class_newline.cpp
@@ -0,0 +1,9 @@
+class Foo
+{
+    int x;
+    class Bar
+    {
+        int y;
+    };
+    Bar z;
+};

From d5842ebca8e0f048a5c2de6f467a8f22fa2187ed Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 22 Dec 2023 06:37:10 +0000
Subject: [PATCH 0953/2704] Update parsers: apex, scala, soql, sosl, tlaplus,
 wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e60a56af1..09aece86a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "624ff108fe949727217cddb302f20e4f16997b1c"
   },
   "apex": {
-    "revision": "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"
+    "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
   },
   "arduino": {
     "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
@@ -552,7 +552,7 @@
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
   },
   "scala": {
-    "revision": "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"
+    "revision": "866f94551cd03f9055d04dba20465b84e7e693f3"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -582,10 +582,10 @@
     "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
   },
   "soql": {
-    "revision": "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"
+    "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
   },
   "sosl": {
-    "revision": "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"
+    "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -651,7 +651,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "c5fae9e4ad9f483fb6232a8688a2c940be6b496b"
+    "revision": "aeb2e8fdc417c32ae7d1149cfa2a8ddc3b293600"
   },
   "todotxt": {
     "revision": "0207f6a4ab6aeafc4b091914d31d8235049a2578"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "55514ae0d9d0d7c4170e98e9ab50a46f0887053f"
+    "revision": "66962f2a87db24bb63fe8282ce76fb64c0a2e20b"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 454c3a9ba86f841dc3b5bb17d150a873a16b77b4 Mon Sep 17 00:00:00 2001
From: Christian Degnbol Madsen <christian.degnbol@gmail.com>
Date: Fri, 22 Dec 2023 21:24:04 +1100
Subject: [PATCH 0954/2704] fix(julia): pipe function highlight (#5815)

In Julia when piping into a function the function should be highlighted as a function call, and not a variable.
---
 queries/julia/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index fbf97acd7..8b7ee45e9 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -47,6 +47,12 @@
 (broadcast_call_expression
   (field_expression (identifier) @function.call .))
 
+(binary_expression
+  (_)
+  (operator) @_pipe
+  (identifier) @function.call
+  (#eq? @_pipe "|>"))
+
 ;; Builtins
 
 ((identifier) @function.builtin

From 1c619f5f20f33684b7b27a0c2c30143be7c44baa Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 23 Dec 2023 01:40:10 -0800
Subject: [PATCH 0955/2704] feat(luap): highlights more consistent with regex
 (#5819)

---
 queries/luap/highlights.scm  | 15 ++++++++-------
 queries/regex/highlights.scm |  5 +++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/queries/luap/highlights.scm b/queries/luap/highlights.scm
index 62d2b3182..87e6c6908 100644
--- a/queries/luap/highlights.scm
+++ b/queries/luap/highlights.scm
@@ -1,9 +1,10 @@
-"." @character
-
 [
   (anchor_begin)
   (anchor_end)
-] @string.escape
+] @punctuation.delimiter
+
+(pattern
+  (character "." @variable.builtin))
 
 [
   "[" "]"
@@ -19,17 +20,17 @@
 
 (range
   from: (character) @constant
-  "-" @punctuation.delimiter
+  "-" @operator
   to: (character) @constant)
 
 (set
   (character) @constant)
+(negated_set
+  (character) @constant)
 
 (class) @keyword
 
-(negated_set
-  "^" @operator
-  (character) @constant)
+(negated_set "^" @operator)
 
 (balanced_match
   (character) @parameter)
diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index 7a5685844..3aa4af909 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -32,7 +32,8 @@
 [ "*" "+" "?" "|" "=" "!" "-"] @operator
 
 [
- (any_character)
  (start_assertion)
  (end_assertion)
-] @variable.builtin
+] @punctuation.delimiter
+
+(any_character) @variable.builtin

From c4da7945641b2e74915313cd1e608b43877a56b7 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 23 Dec 2023 06:35:14 +0000
Subject: [PATCH 0956/2704] Update parsers: elm, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 09aece86a..ab9defe74 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "11426c5fd20eef360d5ecaf10729191f6bc5d715"
   },
   "elm": {
-    "revision": "44ffae46bb460820c3c3d6fde20378202bd4b0ab"
+    "revision": "c26afd7f2316f689410a1622f1780eff054994b1"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "66962f2a87db24bb63fe8282ce76fb64c0a2e20b"
+    "revision": "785c54e35a6a45826ff7228aa9662c19ca92ad57"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 92572c0dfd53b0e74bf436ef968ecc5b5a7e2b76 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 21 Dec 2023 15:31:40 -0800
Subject: [PATCH 0957/2704] feat: more `@string.regex` highlights

---
 queries/lua/highlights.scm   | 20 ++++++++++++++++++++
 queries/luau/highlights.scm  | 26 ++++++++++++++++++++++++++
 queries/query/highlights.scm | 16 ++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 1af8e9aec..2f12d3ce2 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -247,3 +247,23 @@
 (string) @string
 
 (escape_sequence) @string.escape
+
+; string.match("123", "%d+")
+(function_call
+  (dot_index_expression
+    field: (identifier) @_method
+    (#any-of? @_method "find" "match" "gmatch" "gsub"))
+  arguments: (arguments
+               . (_)
+               .
+               (string
+                 content: (string_content) @string.regex)))
+
+;("123"):match("%d+")
+(function_call
+  (method_index_expression
+    method: (identifier) @_method
+    (#any-of? @_method "find" "match" "gmatch" "gsub"))
+  arguments: (arguments
+               . (string
+                   content: (string_content) @string.regex)))
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 7a6bc2e35..a175276a7 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -246,3 +246,29 @@
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^[-][-](%s?)@"))
+
+; string.match("123", "%d+")
+(function_call
+  (dot_index_expression
+    field: (identifier) @_method
+    (#any-of? @_method "find" "format" "match"))
+  arguments: (arguments (_) . (string content: _ @string.regex)))
+
+(function_call
+  (dot_index_expression
+    field: (identifier) @_method
+    (#any-of? @_method "gmatch" "gsub"))
+  arguments: (arguments (_) (string content: _ @string.regex)))
+
+; ("123"):match("%d+")
+(function_call
+  (method_index_expression
+    method: (identifier) @_method
+    (#any-of? @_method "find" "format" "match"))
+    arguments: (arguments . (string content: _ @string.regex)))
+
+(function_call
+  (method_index_expression
+    method: (identifier) @_method
+    (#any-of? @_method "gmatch" "gsub"))
+    arguments: (arguments (string content: _ @string.regex)))
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index c7f0d891a..ccf13a6c8 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -32,3 +32,19 @@
 
 ((program . (comment)* . (comment) @preproc)
  (#lua-match? @preproc "^;+ *extends *$"))
+
+((predicate
+  name: (identifier) @_name
+  parameters: (parameters (string "\"" @string "\"" @string) @string.regex))
+ (#any-of? @_name
+   "match"
+   "not-match"
+   "vim-match"
+   "not-vim-match"
+   "lua-match"
+   "not-lua-match"))
+
+((predicate
+  name: (identifier) @_name
+  parameters: (parameters (string "\"" @string "\"" @string) @string.regex . (string) .))
+ (#any-of? @_name "gsub" "not-gsub"))

From cd4de5f7b14b878ac8f5c459c9d579cc58ba1ac5 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 23 Dec 2023 13:01:41 -0800
Subject: [PATCH 0958/2704] fix: cleanup luap injection queries

---
 queries/lua/injections.scm  | 26 ++------------------------
 queries/luau/injections.scm | 20 +++-----------------
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 6f7b97267..57ea527d4 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -114,19 +114,7 @@
 (function_call
   (dot_index_expression
     field: (identifier) @_method
-    (#any-of? @_method "find" "match"))
-  arguments: (arguments
-               . (_)
-               .
-               (string
-                 content: (string_content) @injection.content
-                 (#set! injection.language "luap")
-                 (#set! injection.include-children))))
-
-(function_call
-  (dot_index_expression
-    field: (identifier) @_method
-    (#any-of? @_method "gmatch" "gsub"))
+    (#any-of? @_method "find" "match" "gmatch" "gsub"))
   arguments: (arguments
                . (_)
                .
@@ -140,23 +128,13 @@
 (function_call
   (method_index_expression
     method: (identifier) @_method
-    (#any-of? @_method "find" "match"))
+    (#any-of? @_method "find" "match" "gmatch" "gsub"))
   arguments: (arguments
                . (string
                    content: (string_content) @injection.content
                    (#set! injection.language "luap")
                    (#set! injection.include-children))))
 
-(function_call
-  (method_index_expression
-    method: (identifier) @_method
-    (#any-of? @_method "gmatch" "gsub"))
-  arguments: (arguments
-               . (string
-                 content: (string_content) @injection.content
-                 (#set! injection.language "luap")
-                 (#set! injection.include-children))))
-
 (comment
    content: (_) @injection.content
   (#set! injection.language "comment"))
diff --git a/queries/luau/injections.scm b/queries/luau/injections.scm
index e70e0274b..4edc7f5e4 100644
--- a/queries/luau/injections.scm
+++ b/queries/luau/injections.scm
@@ -16,31 +16,17 @@
 (function_call
   (dot_index_expression
     field: (identifier) @_method
-    (#any-of? @_method "find" "format" "match"))
-  arguments: (arguments (_) . (string content: _ @injection.content))
-    (#set! injection.language "luap"))
-
-(function_call
-  (dot_index_expression
-    field: (identifier) @_method
-    (#any-of? @_method "gmatch" "gsub"))
-  arguments: (arguments (_) (string content: _ @injection.content))
+    (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
+  arguments: (arguments . (_) . (string content: _ @injection.content))
     (#set! injection.language "luap"))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
-    (#any-of? @_method "find" "format" "match"))
+    (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
     arguments: (arguments . (string content: _ @injection.content))
     (#set! injection.language "luap"))
 
-(function_call
-  (method_index_expression
-    method: (identifier) @_method
-    (#any-of? @_method "gmatch" "gsub"))
-    arguments: (arguments (string content: _ @injection.content))
-    (#set! injection.language "luap"))
-
 ((comment) @injection.content
  (#set! injection.language "comment"))

From 374966b25c9bcbe29944267128cb78bf857e189a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 23 Dec 2023 21:00:32 -0800
Subject: [PATCH 0959/2704] fixup(luau): align `@string.regex` to the
 injections (#5829)

---
 queries/luau/highlights.scm | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index a175276a7..4cd0b443c 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -251,24 +251,12 @@
 (function_call
   (dot_index_expression
     field: (identifier) @_method
-    (#any-of? @_method "find" "format" "match"))
-  arguments: (arguments (_) . (string content: _ @string.regex)))
-
-(function_call
-  (dot_index_expression
-    field: (identifier) @_method
-    (#any-of? @_method "gmatch" "gsub"))
-  arguments: (arguments (_) (string content: _ @string.regex)))
+    (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
+  arguments: (arguments . (_) . (string content: _ @string.regex)))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
-    (#any-of? @_method "find" "format" "match"))
+    (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
     arguments: (arguments . (string content: _ @string.regex)))
-
-(function_call
-  (method_index_expression
-    method: (identifier) @_method
-    (#any-of? @_method "gmatch" "gsub"))
-    arguments: (arguments (string content: _ @string.regex)))

From 27f68c0b6a87cbad900b3d016425450af8268026 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 24 Dec 2023 06:34:42 +0000
Subject: [PATCH 0960/2704] Update parsers: haskell, templ

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ab9defe74..4acd95107 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -243,7 +243,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "5260f606ec353f156751473a0c203d67167c0ebe"
+    "revision": "dd924b8df1eb76261f009e149fc6f3291c5081c2"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -636,7 +636,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "671e9a957acd40088919ca17b30f4a39870784d4"
+    "revision": "8793137e669949e72ac1d877ba9cadfbb5062fc0"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"

From 7d0b4756aba3b220d38ec0443c6cc10944060dd7 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 27 Dec 2023 06:36:29 +0000
Subject: [PATCH 0961/2704] Update parsers: nickel, nix, scala, v, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4acd95107..a11b546d3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -390,7 +390,7 @@
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
   },
   "nickel": {
-    "revision": "502a8746c82c616ed441e0ab2b8c09772ee7d114"
+    "revision": "091b5dcc7d138901bcc162da9409c0bb626c0d27"
   },
   "nim": {
     "revision": "482e2f4e1c2520db711c57f1899e926c3e81d4eb"
@@ -402,7 +402,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "66e3e9ce9180ae08fc57372061006ef83f0abde7"
+    "revision": "763168fa916a333a459434f1424b5d30645f015d"
   },
   "norg": {
     "revision": "014073fe8016d1ac440c51d22c77e3765d8f6855"
@@ -552,7 +552,7 @@
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
   },
   "scala": {
-    "revision": "866f94551cd03f9055d04dba20465b84e7e693f3"
+    "revision": "2b79741be78858bd65c605b6fc6e9c2641d5be50"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -693,7 +693,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "f0336bb8847393ba4d5905a94642acf0dc3d5ebd"
+    "revision": "583aad0a90da099708607b2aaf7450a1b1801535"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "785c54e35a6a45826ff7228aa9662c19ca92ad57"
+    "revision": "6d98fb7d428c4c2620209f41af8828e87f34c230"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 7a2c6211d6f550988fccd8800de8426d5e480a2d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 28 Dec 2023 06:36:15 +0000
Subject: [PATCH 0962/2704] Update parsers: perl, scala, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a11b546d3..83d55a838 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -441,7 +441,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "3911403cba497196fb867a6f1e286e3e1576f425"
+    "revision": "d4e5cb9b3f725aa9598c7eb800966e3a8417b88c"
   },
   "php": {
     "revision": "0a99deca13c4af1fb9adcb03c958bfc9f4c740a9"
@@ -552,7 +552,7 @@
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
   },
   "scala": {
-    "revision": "2b79741be78858bd65c605b6fc6e9c2641d5be50"
+    "revision": "696965ee3bafd47f4b5204d1e63b4ea4b52d9f9b"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6d98fb7d428c4c2620209f41af8828e87f34c230"
+    "revision": "d97fa32273e21272cca40af291538ffcf0af082f"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 362ebd3a210f20aab80be05557f216cbaf4531e6 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 29 Dec 2023 06:36:22 +0000
Subject: [PATCH 0963/2704] Update parsers: perl, rst, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 83d55a838..f5ec27311 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -441,7 +441,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "d4e5cb9b3f725aa9598c7eb800966e3a8417b88c"
+    "revision": "655632fa7f9174acbdbf1ad2abdac90ad3aa57a1"
   },
   "php": {
     "revision": "0a99deca13c4af1fb9adcb03c958bfc9f4c740a9"
@@ -543,7 +543,7 @@
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
   "rst": {
-    "revision": "3c03a4bb2c27f1fa76f1ca5563c1fc10187e4028"
+    "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
     "revision": "f257f3f57833d584050336921773738a3fd8ca22"
@@ -693,7 +693,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "583aad0a90da099708607b2aaf7450a1b1801535"
+    "revision": "b59edeac4a819999ebc5a78bbd384bd30bf6fa30"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d97fa32273e21272cca40af291538ffcf0af082f"
+    "revision": "339fec8a7671f8c4f0ff69adea9e14815616e8dd"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From e49f1e8ef3e8450a8446cb1f2bbb53c919f60b6d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 30 Dec 2023 06:35:35 +0000
Subject: [PATCH 0964/2704] Update parsers: nim, templ, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f5ec27311..07c93a90e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -393,7 +393,7 @@
     "revision": "091b5dcc7d138901bcc162da9409c0bb626c0d27"
   },
   "nim": {
-    "revision": "482e2f4e1c2520db711c57f1899e926c3e81d4eb"
+    "revision": "70ceee835e033acbc7092cd7f4f6a251789af121"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -636,7 +636,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "8793137e669949e72ac1d877ba9cadfbb5062fc0"
+    "revision": "14d105789af342f7f0c32bff2fec1a6edec59f60"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "339fec8a7671f8c4f0ff69adea9e14815616e8dd"
+    "revision": "d85ef04bb7e75e2627348b45a5f357a2c7fbee91"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 65ef62092ef997d2ecf68ede01a0afbda17808c3 Mon Sep 17 00:00:00 2001
From: Christian Degnbol Madsen <christian.degnbol@gmail.com>
Date: Thu, 28 Dec 2023 17:57:49 +1100
Subject: [PATCH 0965/2704] fix(julia): add missing capture of ":" in selected
 import

If writing a selected import, e.g. `using BSON: @load`, the colon isn't currently captured.
This change captures it as `@punctuation.delimiter`.
---
 queries/julia/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 8b7ee45e9..c1245f4d8 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -398,6 +398,8 @@
   "as" @include)
 (export_statement
   "export" @include)
+(selected_import
+  ":" @punctuation.delimiter)
 
 (struct_definition
   ["struct" "end"] @keyword)

From 3ef514b10b9557e3905b9817ca632e7506dd384a Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 3 Jan 2024 06:36:32 +0000
Subject: [PATCH 0966/2704] Update parsers: scala, templ, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 07c93a90e..23d0d6014 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -552,7 +552,7 @@
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
   },
   "scala": {
-    "revision": "696965ee3bafd47f4b5204d1e63b4ea4b52d9f9b"
+    "revision": "7891815f42dca9ed6aeb464c2edc39d479ab965c"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -636,7 +636,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "14d105789af342f7f0c32bff2fec1a6edec59f60"
+    "revision": "f5c56b4739ea3303d125f6b7363645af631b85a1"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -693,7 +693,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "b59edeac4a819999ebc5a78bbd384bd30bf6fa30"
+    "revision": "9ac84e62396bb13c8f1d11f967f0c0f2dec1a448"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d85ef04bb7e75e2627348b45a5f357a2c7fbee91"
+    "revision": "95006d1c99d597abc7b0264fd9773527031db53a"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 0da349ed303bea955942f409d29059cdb89dbe2c Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 3 Jan 2024 17:14:33 +0000
Subject: [PATCH 0967/2704] Update parsers: ada, ocaml, ocaml_interface, sql,
 wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 23d0d6014..b2f4bf24f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "f21f13afe0410311be1f78959a25aee393c569c9"
+    "revision": "a1e54e4e0347db6a37099822181e5cdf0d180198"
   },
   "agda": {
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
@@ -417,10 +417,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
+    "revision": "4abfdc1c7af2c6c77a370aee974627be1c285b3b"
   },
   "ocaml_interface": {
-    "revision": "694c57718fd85d514f8b81176038e7a4cfabcaaf"
+    "revision": "4abfdc1c7af2c6c77a370aee974627be1c285b3b"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -591,7 +591,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "b599f6a1ca37cb5bae827a424cd98371a0d91bdc"
+    "revision": "fd70fb358d164cd93fbe2674a9cca276dc5203f7"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "95006d1c99d597abc7b0264fd9773527031db53a"
+    "revision": "6437741d19632ae502fc335441c895cd94729db3"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 8ae4080c5ba59d81b4e49525d4168807bc098e73 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 4 Jan 2024 10:57:18 -0800
Subject: [PATCH 0968/2704] fix(latex): highlight text functions

---
 queries/latex/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index bcba33eb2..ea66645e5 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -1,6 +1,7 @@
 ;; General syntax
 
 (command_name) @function
+(text_mode "\\text" @function)
 (caption
   command: _ @function)
 

From e277ca9dec0dfd830133d1d82e79ad3f2cf026a1 Mon Sep 17 00:00:00 2001
From: Zhuofeng Wang <zhuofengwang2003@gmail.com>
Date: Fri, 5 Jan 2024 10:36:32 +0800
Subject: [PATCH 0969/2704] fix(markdown_inline): latex highlight injection
 (#5397)

The `injection.include-children` is needed in markdown_inline parser.
---
 queries/markdown_inline/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/markdown_inline/injections.scm b/queries/markdown_inline/injections.scm
index 33b97c481..d665574ff 100644
--- a/queries/markdown_inline/injections.scm
+++ b/queries/markdown_inline/injections.scm
@@ -3,4 +3,5 @@
  (#set! injection.combined))
 
 ((latex_block) @injection.content
- (#set! injection.language "latex"))
+ (#set! injection.language "latex")
+ (#set! injection.include-children))

From adf423a493f9e91d5dc4369b46e5a7e83e4c783e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 5 Jan 2024 06:36:22 +0000
Subject: [PATCH 0970/2704] Update parsers: astro, php, ruby, templ, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b2f4bf24f..9881176ad 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
   },
   "astro": {
-    "revision": "e122a8fcd07e808a7b873bfadc2667834067daf1"
+    "revision": "a092afa5c330495fdfbc652766c29c66ec6880f4"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
@@ -444,7 +444,7 @@
     "revision": "655632fa7f9174acbdbf1ad2abdac90ad3aa57a1"
   },
   "php": {
-    "revision": "0a99deca13c4af1fb9adcb03c958bfc9f4c740a9"
+    "revision": "594b8bad093abe739c3d2a2cae5abae33c5fb23d"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
@@ -546,7 +546,7 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "f257f3f57833d584050336921773738a3fd8ca22"
+    "revision": "1ba5af1bf41b09c7c0d2630700ba593635581811"
   },
   "rust": {
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
@@ -636,7 +636,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "f5c56b4739ea3303d125f6b7363645af631b85a1"
+    "revision": "64f3ded2bbc5cbc83f1b52bae1680a08fda435d5"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6437741d19632ae502fc335441c895cd94729db3"
+    "revision": "8d6b514bdc76dfc96827a62150bf85098c3fe429"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 9288d9b5059e6b409b5077399dc0b377a112d9f2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 5 Jan 2024 12:51:53 +0100
Subject: [PATCH 0971/2704] ci: bump actions to latest

---
 .github/workflows/lint.yml            | 4 ++--
 .github/workflows/release.yml         | 2 +-
 .github/workflows/test-queries.yml    | 4 ++--
 .github/workflows/tests.yml           | 4 ++--
 .github/workflows/update-lockfile.yml | 2 +-
 .github/workflows/update-readme.yml   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 121526c60..a643f796d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ jobs:
     name: Luacheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Prepare
         run: |
@@ -24,7 +24,7 @@ jobs:
     name: StyLua
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Lint with stylua
         uses: JohnnyMorganz/stylua-action@v3
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3c36b33db..11f3ffc14 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
   luarocks-upload:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: nvim-neorocks/luarocks-tag-release@v5
         env:
           LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }}
diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 5376c739c..768bab089 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -54,9 +54,9 @@ jobs:
       NVIM: ${{ matrix.os == 'windows-2022' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
       ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-2022' && 'rnoweb' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
 
       - name: Install tree-sitter CLI
         run: npm i -g tree-sitter-cli
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2393a78dc..3beda4631 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,8 +26,8 @@ jobs:
     env:
       CC: ${{ matrix.cc }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
 
       - name: Install tree-sitter CLI
         run: npm i -g tree-sitter-cli
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index a29189b48..e44d7c954 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -10,7 +10,7 @@ jobs:
     name: Update lockfile
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: master
 
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 7b2c80102..6708ad103 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -11,7 +11,7 @@ jobs:
     name: Update README
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Prepare
         env:

From 49f1b9a7efc794be143f7ddcd60ce18e8164a7f8 Mon Sep 17 00:00:00 2001
From: Calum Smith <hello@calum.io>
Date: Thu, 4 Jan 2024 12:54:45 -0500
Subject: [PATCH 0972/2704] highlights(html): character references (a.k.a.
 entities)

---
 queries/html/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/html/highlights.scm b/queries/html/highlights.scm
index 6da261c0a..4e2371d64 100644
--- a/queries/html/highlights.scm
+++ b/queries/html/highlights.scm
@@ -3,3 +3,5 @@
 (doctype) @constant
 
 "<!" @tag.delimiter
+
+(entity) @character.special

From 5032f9952ad2a3a7f7792ac438c4f9e2bd53e0b9 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 6 Jan 2024 06:35:46 +0000
Subject: [PATCH 0973/2704] Update parsers: ada, ruby

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9881176ad..580774b36 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "a1e54e4e0347db6a37099822181e5cdf0d180198"
+    "revision": "ba0894efa03beb70780156b91e28c716b7a4764d"
   },
   "agda": {
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
@@ -546,7 +546,7 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "1ba5af1bf41b09c7c0d2630700ba593635581811"
+    "revision": "4d9ad3f010fdc47a8433adcf9ae30c8eb8475ae7"
   },
   "rust": {
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"

From f6483d11940feed26110228281fc0a403bc370b0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 7 Jan 2024 12:14:46 +0100
Subject: [PATCH 0974/2704] fix(php): adjust to parser refactor

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 580774b36..cdea75243 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -444,7 +444,7 @@
     "revision": "655632fa7f9174acbdbf1ad2abdac90ad3aa57a1"
   },
   "php": {
-    "revision": "594b8bad093abe739c3d2a2cae5abae33c5fb23d"
+    "revision": "2f791d9d83c35b11e9a14daf9a58dd7e23566041"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2ad741f3f..bfadf5239 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1326,6 +1326,7 @@ list.perl = {
 list.php = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-php",
+    location = "php",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@tk-shirasaka" },

From 8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 7 Jan 2024 12:14:20 +0000
Subject: [PATCH 0975/2704] Update parsers: templ, tlaplus

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cdea75243..27ca33a95 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -636,7 +636,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "64f3ded2bbc5cbc83f1b52bae1680a08fda435d5"
+    "revision": "f8fbc1558e45b72c05cd55a02907ba9bc0df505a"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -651,7 +651,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "aeb2e8fdc417c32ae7d1149cfa2a8ddc3b293600"
+    "revision": "aaf5bb5c1df0a6e583bb51efa519a9ac788b2ad8"
   },
   "todotxt": {
     "revision": "0207f6a4ab6aeafc4b091914d31d8235049a2578"

From fcf843bf14adaeee53aad1b28fabba1d3b62fc8d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 14 Jan 2024 14:11:18 +0000
Subject: [PATCH 0976/2704] Update parsers: erlang, php, templ, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 27ca33a95..5f7394cba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
   },
   "erlang": {
-    "revision": "57e69513efd831f9cc8207d65d96bad917ca4aa4"
+    "revision": "54b6f814f43c4eac81eeedefaa7cc8762fec6683"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -444,7 +444,7 @@
     "revision": "655632fa7f9174acbdbf1ad2abdac90ad3aa57a1"
   },
   "php": {
-    "revision": "2f791d9d83c35b11e9a14daf9a58dd7e23566041"
+    "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
   },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
@@ -636,7 +636,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "f8fbc1558e45b72c05cd55a02907ba9bc0df505a"
+    "revision": "c3baaab33f1f1032eedd3613cd932284975bd21f"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "8d6b514bdc76dfc96827a62150bf85098c3fe429"
+    "revision": "7624e16278478db4499e3b439e0c70e4ba98a1b0"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 0746b1a13d53367e5b03cfd412b52dc612ef44ff Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 15 Jan 2024 06:38:07 +0000
Subject: [PATCH 0977/2704] Update parsers: awk

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 5f7394cba..dceffd692 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -21,7 +21,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "4b4b46c9a44ec7fb9e8c9ce4a010295edc5be8d5"
+    "revision": "dcf4ac4eaff601d87cc15604765a7ae329c1b2ee"
   },
   "bash": {
     "revision": "7331995b19b8f8aba2d5e26deb51d2195c18bc94"

From 295ab1da52f4c9e0978a95c21dd359afdd0a11b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20=C5=81uka?= <bartoszluka1@gmail.com>
Date: Fri, 12 Jan 2024 15:13:30 +0100
Subject: [PATCH 0978/2704] fix: link type in pattern matching correctly

---
 queries/c_sharp/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index c67d29eb8..bc74a16ff 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -13,6 +13,9 @@
 (method_declaration
   type: (identifier) @type)
 
+(declaration_pattern
+  type: (identifier) @type)
+
 (local_function_statement
   type: (identifier) @type)
 

From 59d4c14a1a4262cf637ff2420032593afa062749 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 15 Jan 2024 12:51:58 +0100
Subject: [PATCH 0979/2704] feat!: bump minimum Nvim version to 0.9.2

required for empty injection fix
---
 README.md                      | 2 +-
 lua/nvim-treesitter/health.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 675add8b5..6db64faee 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ For more detailed information on setting these up, see ["Advanced setup"](#advan
 
 ## Requirements
 
-- **Neovim 0.9.1** or later  ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
+- **Neovim 0.9.2** or later  ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
 - `tar` and `curl` in your path (or alternatively `git`)
 - A C compiler in your path and libstdc++ installed ([Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support)).
 
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index a71cbf5cd..be265f7d0 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -23,8 +23,8 @@ local NVIM_TREESITTER_MINIMUM_ABI = 13
 local function install_health()
   _start "Installation"
 
-  if fn.has "nvim-0.9.1" ~= 1 then
-    _error "Nvim-treesitter requires Neovim 0.9.1+"
+  if fn.has "nvim-0.9.2" ~= 1 then
+    _error "Nvim-treesitter requires Nvim 0.9.2 or newer"
   end
 
   if fn.executable "tree-sitter" == 0 then

From 842507a578704157e6c8f8f26befcb3b3a880efb Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 16 Jan 2024 06:37:25 +0000
Subject: [PATCH 0980/2704] Update parsers: perl, todotxt

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dceffd692..41c096799 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -441,7 +441,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "655632fa7f9174acbdbf1ad2abdac90ad3aa57a1"
+    "revision": "9c0cea7720f65a5e832c4d924356d7793f519e36"
   },
   "php": {
     "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
@@ -654,7 +654,7 @@
     "revision": "aaf5bb5c1df0a6e583bb51efa519a9ac788b2ad8"
   },
   "todotxt": {
-    "revision": "0207f6a4ab6aeafc4b091914d31d8235049a2578"
+    "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
   },
   "toml": {
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"

From fe89bf17197fc5daead3878fb1328911b30fb022 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 10 Jan 2024 18:25:34 +0100
Subject: [PATCH 0981/2704] fix(config)!: always install parsers bundled with
 nvim

---
 lua/nvim-treesitter/configs.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index a3ec30fb2..88d20cae8 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -20,7 +20,7 @@ local M = {}
 local config = {
   modules = {},
   sync_install = false,
-  ensure_installed = {},
+  ensure_installed = { "lua", "query", "vimdoc", "vim", "c", "python", "bash", "markdown", "markdown_inline" },
   auto_install = false,
   ignore_install = {},
   parser_install_dir = nil,
@@ -421,6 +421,7 @@ function M.setup(user_data)
   end
 
   local ensure_installed = user_data.ensure_installed or {}
+  vim.list_extend(ensure_installed, config.ensure_installed)
   if #ensure_installed > 0 then
     if user_data.sync_install then
       require("nvim-treesitter.install").ensure_installed_sync(ensure_installed)

From 97ba59c6f532072e456b3d1f2413560e689c132b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 16 Jan 2024 19:05:28 +0100
Subject: [PATCH 0982/2704] fixup: ensure_installed can be 'all'

---
 lua/nvim-treesitter/configs.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index 88d20cae8..8d720cd96 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -421,7 +421,9 @@ function M.setup(user_data)
   end
 
   local ensure_installed = user_data.ensure_installed or {}
-  vim.list_extend(ensure_installed, config.ensure_installed)
+  if type(ensure_installed) == "table" then
+    vim.list_extend(ensure_installed, config.ensure_installed)
+  end
   if #ensure_installed > 0 then
     if user_data.sync_install then
       require("nvim-treesitter.install").ensure_installed_sync(ensure_installed)

From 94cb036ba7bd2b4086c04c945da5e983b5e8b322 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 17 Jan 2024 06:37:15 +0000
Subject: [PATCH 0983/2704] Update parsers: gleam, gomod, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 41c096799..a081ce384 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "2b49c49ef632928b5c52bb0a7269ff797d5d1414"
+    "revision": "62c5388a7badb4e29315690358267a76a734bf83"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -216,7 +216,7 @@
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
   },
   "gomod": {
-    "revision": "9b86399ab733fbd548ba0e817e732cb3351082d2"
+    "revision": "bbe2fe3be4b87e06a613e685250f473d2267f430"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "7624e16278478db4499e3b439e0c70e4ba98a1b0"
+    "revision": "fd7adb7c776f2f3656b8a1839d8ee1e6636412f3"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 7b326a096241267bdb3412457a97d3ae834b0a7c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Jan 2024 11:01:24 +0100
Subject: [PATCH 0984/2704] fixup: don't extend _with_ 'all'

---
 lua/nvim-treesitter/configs.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index 8d720cd96..d4f87a539 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -421,7 +421,7 @@ function M.setup(user_data)
   end
 
   local ensure_installed = user_data.ensure_installed or {}
-  if type(ensure_installed) == "table" then
+  if type(ensure_installed) == "table" and type(config.ensure_installed) == "table" then
     vim.list_extend(ensure_installed, config.ensure_installed)
   end
   if #ensure_installed > 0 then

From 07c8c3d84f67b1530f636dcad31971f569a3df5f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Jan 2024 11:07:20 +0100
Subject: [PATCH 0985/2704] fixup: empty ensure_installed

---
 lua/nvim-treesitter/configs.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index d4f87a539..e64dc28e4 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -420,7 +420,7 @@ function M.setup(user_data)
     require("nvim-treesitter.install").setup_auto_install()
   end
 
-  local ensure_installed = user_data.ensure_installed or {}
+  local ensure_installed = user_data.ensure_installed or config.ensure_installed
   if type(ensure_installed) == "table" and type(config.ensure_installed) == "table" then
     vim.list_extend(ensure_installed, config.ensure_installed)
   end

From 503d0ccdee762bb4b2758c391288768fafe39861 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 18 Jan 2024 06:37:49 +0000
Subject: [PATCH 0986/2704] Update parsers: gitcommit, markdown,
 markdown_inline, vimdoc, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a081ce384..2ecba3e8e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,7 +192,7 @@
     "revision": "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"
   },
   "gitcommit": {
-    "revision": "7e3ad5fdc61cd701e146ef78e4fc6dcdf6dbca0e"
+    "revision": "e8d9eda4e5ea0b08aa39d48dab0f6553058fbe0f"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -366,10 +366,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "f9820b2db958228f9be339b67d2de874d065866e"
+    "revision": "28aa3baef73bd458d053b613b8bd10fd102b4405"
   },
   "markdown_inline": {
-    "revision": "f9820b2db958228f9be339b67d2de874d065866e"
+    "revision": "28aa3baef73bd458d053b613b8bd10fd102b4405"
   },
   "matlab": {
     "revision": "6071891a8c39600203eba20513666cf93b4d650a"
@@ -708,7 +708,7 @@
     "revision": "32c76f150347c1cd044e90b8e2bc73c00677fa55"
   },
   "vimdoc": {
-    "revision": "4f8ba9e39c8b3fbaf0bb5f70ac255474a9099359"
+    "revision": "ed8695ad8de39c3f073da130156f00b1148e2891"
   },
   "vue": {
     "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "fd7adb7c776f2f3656b8a1839d8ee1e6636412f3"
+    "revision": "40b84b0c8e27df07c9ca8fad97b36820e3e9ce12"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 5037721ec5870990db16dcbf06513a78a6a81641 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 18 Jan 2024 17:08:20 +0100
Subject: [PATCH 0987/2704] fixup: proper union of tables

---
 lua/nvim-treesitter/configs.lua | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index e64dc28e4..6be0c0148 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -405,6 +405,18 @@ function M.is_enabled(mod, lang, bufnr)
   return true
 end
 
+---Combine two list-like tables without duplicates
+local union = function(x, y)
+  local map = {}
+  for _, v in ipairs(x) do
+    map[v] = true
+  end
+  for _, v in ipairs(y) do
+    map[v] = true
+  end
+  return vim.tbl_keys(map)
+end
+
 ---Setup call for users to override module configurations.
 ---@param user_data TSConfig module overrides
 function M.setup(user_data)
@@ -422,7 +434,7 @@ function M.setup(user_data)
 
   local ensure_installed = user_data.ensure_installed or config.ensure_installed
   if type(ensure_installed) == "table" and type(config.ensure_installed) == "table" then
-    vim.list_extend(ensure_installed, config.ensure_installed)
+    union(ensure_installed, config.ensure_installed)
   end
   if #ensure_installed > 0 then
     if user_data.sync_install then

From 090880c0f1fec219f7de838cb51b8dc07ce74a6d Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 19 Jan 2024 06:37:19 +0000
Subject: [PATCH 0988/2704] Update parsers: scala, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2ecba3e8e..7c92b385e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -552,7 +552,7 @@
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
   },
   "scala": {
-    "revision": "7891815f42dca9ed6aeb464c2edc39d479ab965c"
+    "revision": "0c63ada18d34ac83eec6c7a2fba9a47e65cda48a"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -720,7 +720,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "40b84b0c8e27df07c9ca8fad97b36820e3e9ce12"
+    "revision": "ee58533169c654b8d7fd47fde01241e528674d8a"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From f197a15b0d1e8d555263af20add51450e5aaa1f0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 19 Jan 2024 16:45:58 +0100
Subject: [PATCH 0989/2704] revert "fix(config)!: always install parsers
 bundled with nvim"

---
 lua/nvim-treesitter/configs.lua | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index 6be0c0148..a3ec30fb2 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -20,7 +20,7 @@ local M = {}
 local config = {
   modules = {},
   sync_install = false,
-  ensure_installed = { "lua", "query", "vimdoc", "vim", "c", "python", "bash", "markdown", "markdown_inline" },
+  ensure_installed = {},
   auto_install = false,
   ignore_install = {},
   parser_install_dir = nil,
@@ -405,18 +405,6 @@ function M.is_enabled(mod, lang, bufnr)
   return true
 end
 
----Combine two list-like tables without duplicates
-local union = function(x, y)
-  local map = {}
-  for _, v in ipairs(x) do
-    map[v] = true
-  end
-  for _, v in ipairs(y) do
-    map[v] = true
-  end
-  return vim.tbl_keys(map)
-end
-
 ---Setup call for users to override module configurations.
 ---@param user_data TSConfig module overrides
 function M.setup(user_data)
@@ -432,10 +420,7 @@ function M.setup(user_data)
     require("nvim-treesitter.install").setup_auto_install()
   end
 
-  local ensure_installed = user_data.ensure_installed or config.ensure_installed
-  if type(ensure_installed) == "table" and type(config.ensure_installed) == "table" then
-    union(ensure_installed, config.ensure_installed)
-  end
+  local ensure_installed = user_data.ensure_installed or {}
   if #ensure_installed > 0 then
     if user_data.sync_install then
       require("nvim-treesitter.install").ensure_installed_sync(ensure_installed)

From 5b90ea2abaa4303b9205b5c9002a8cdd0acd11a5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 22 Jul 2023 15:29:32 +0200
Subject: [PATCH 0990/2704] feat(locals)!: switch to upstream captures

---
 CONTRIBUTING.md                   |  44 +++---
 lua/nvim-treesitter/locals.lua    |  12 +-
 queries/ada/locals.scm            |  54 +++----
 queries/apex/locals.scm           |  50 +++----
 queries/bash/locals.scm           |  10 +-
 queries/bass/locals.scm           |  12 +-
 queries/bicep/locals.scm          |  34 ++---
 queries/bitbake/locals.scm        |  60 ++++----
 queries/c/locals.scm              |  38 ++---
 queries/c_sharp/locals.scm        |  26 ++--
 queries/cairo/locals.scm          |  30 ++--
 queries/capnp/locals.scm          |  44 +++---
 queries/chatito/locals.scm        |  10 +-
 queries/commonlisp/locals.scm     |  40 ++---
 queries/corn/locals.scm           |   6 +-
 queries/cpon/locals.scm           |   2 +-
 queries/cpp/locals.scm            |  50 +++----
 queries/cue/locals.scm            |  16 +-
 queries/dart/locals.scm           |  16 +-
 queries/devicetree/locals.scm     |   2 +-
 queries/dtd/locals.scm            |   6 +-
 queries/ecma/locals.scm           |  30 ++--
 queries/elixir/locals.scm         | 240 +++++++++++++++---------------
 queries/elsa/locals.scm           |  10 +-
 queries/fennel/locals.scm         |  16 +-
 queries/firrtl/locals.scm         |  26 ++--
 queries/fish/locals.scm           |   8 +-
 queries/foam/locals.scm           |   8 +-
 queries/forth/locals.scm          |   4 +-
 queries/fusion/locals.scm         |  18 +--
 queries/gdscript/locals.scm       |  52 +++----
 queries/gitattributes/locals.scm  |   6 +-
 queries/gleam/locals.scm          |  18 +--
 queries/glimmer/locals.scm        |   6 +-
 queries/gn/locals.scm             |   4 +-
 queries/go/locals.scm             |  54 +++----
 queries/godot_resource/locals.scm |   2 +-
 queries/hare/locals.scm           |  22 +--
 queries/heex/locals.scm           |   4 +-
 queries/hoon/locals.scm           |   4 +-
 queries/html/locals.scm           |   2 +-
 queries/ispc/locals.scm           |  10 +-
 queries/java/locals.scm           |  68 ++++-----
 queries/javascript/locals.scm     |  22 +--
 queries/jq/locals.scm             |   8 +-
 queries/json/locals.scm           |   2 +-
 queries/jsonnet/locals.scm        |  20 +--
 queries/julia/locals.scm          |  42 +++---
 queries/kconfig/locals.scm        |  10 +-
 queries/kdl/locals.scm            |  14 +-
 queries/kotlin/locals.scm         |  28 ++--
 queries/lalrpop/locals.scm        |   4 +-
 queries/linkerscript/locals.scm   |   8 +-
 queries/liquidsoap/locals.scm     |  22 +--
 queries/lua/locals.scm            |  20 +--
 queries/luau/locals.scm           |  20 +--
 queries/m68k/locals.scm           |  18 +--
 queries/matlab/locals.scm         |  22 +--
 queries/mlir/locals.scm           |  10 +-
 queries/nim/locals.scm            | 216 +++++++++++++--------------
 queries/nix/locals.scm            |  16 +-
 queries/ocaml/locals.scm          |  34 ++---
 queries/odin/locals.scm           |  30 ++--
 queries/pascal/locals.scm         |  40 ++---
 queries/php/locals.scm            |  38 ++---
 queries/pony/locals.scm           |  38 ++---
 queries/properties/locals.scm     |   4 +-
 queries/puppet/locals.scm         |  20 +--
 queries/purescript/locals.scm     |   8 +-
 queries/python/locals.scm         |  64 ++++----
 queries/ql/locals.scm             |  32 ++--
 queries/query/locals.scm          |  16 +-
 queries/r/locals.scm              |  12 +-
 queries/rasi/locals.scm           |   6 +-
 queries/re2c/locals.scm           |   2 +-
 queries/ron/locals.scm            |  18 +--
 queries/rst/locals.scm            |  20 +--
 queries/ruby/locals.scm           |  46 +++---
 queries/rust/locals.scm           |  52 +++----
 queries/scala/locals.scm          |  26 ++--
 queries/smali/locals.scm          |  22 +--
 queries/sparql/locals.scm         |   8 +-
 queries/squirrel/locals.scm       |  24 +--
 queries/ssh_config/locals.scm     |   4 +-
 queries/starlark/locals.scm       |  50 +++----
 queries/supercollider/locals.scm  |  12 +-
 queries/swift/locals.scm          |   6 +-
 queries/systemtap/locals.scm      |  20 +--
 queries/t32/locals.scm            |  16 +-
 queries/tablegen/locals.scm       |  24 +--
 queries/teal/locals.scm           |  26 ++--
 queries/thrift/locals.scm         |  34 ++---
 queries/tiger/locals.scm          |  14 +-
 queries/tlaplus/locals.scm        |  86 +++++------
 queries/toml/locals.scm           |   2 +-
 queries/turtle/locals.scm         |   6 +-
 queries/typescript/locals.scm     |  14 +-
 queries/udev/locals.scm           |  12 +-
 queries/ungrammar/locals.scm      |   8 +-
 queries/usd/locals.scm            |   2 +-
 queries/uxntal/locals.scm         |   8 +-
 queries/v/locals.scm              |  24 +--
 queries/verilog/locals.scm        |  24 +--
 queries/vim/locals.scm            |  10 +-
 queries/wing/locals.scm           |   4 +-
 queries/xcompose/locals.scm       |   4 +-
 queries/xml/locals.scm            |  20 +--
 queries/yaml/locals.scm           |   6 +-
 queries/yuck/locals.scm           |  10 +-
 109 files changed, 1341 insertions(+), 1341 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 43beeb04e..209886d54 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -253,29 +253,29 @@ highlighting (such as diagnostics or LSP semantic tokens).
 
 ### Locals
 
-Note: pay specific attention to the captures here as they are a bit different to
-those listed in the upstream [Local Variables
-docs](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables).
-Some of these docs didn't exist when `nvim-treesitter` was created and the
-upstream captures are more limiting than what we have here.
+Locals are used to keep track of definitions and references in local or global
+scopes, see [upstream
+documentation](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables).
+Note that nvim-treesitter uses more specific subcaptures for definitions and
+**does not use locals for highlighting**.
 
 ```scheme
-@definition            ; various definitions
-@definition.constant   ; constants
-@definition.function   ; functions
-@definition.method     ; methods
-@definition.var        ; variables
-@definition.parameter  ; parameters
-@definition.macro      ; preprocessor macros
-@definition.type       ; types or classes
-@definition.field      ; fields or properties
-@definition.enum       ; enumerations
-@definition.namespace  ; modules or namespaces
-@definition.import     ; imported names
-@definition.associated ; the associated type of a variable
+@local.definition            ; various definitions
+@local.definition.constant   ; constants
+@local.definition.function   ; functions
+@local.definition.method     ; methods
+@local.definition.var        ; variables
+@local.definition.parameter  ; parameters
+@local.definition.macro      ; preprocessor macros
+@local.definition.type       ; types or classes
+@local.definition.field      ; fields or properties
+@local.definition.enum       ; enumerations
+@local.definition.namespace  ; modules or namespaces
+@local.definition.import     ; imported names
+@local.definition.associated ; the associated type of a variable
 
-@scope                 ; scope block
-@reference             ; identifier reference
+@local.scope                 ; scope block
+@local.reference             ; identifier reference
 ```
 
 #### Definition Scope
@@ -294,7 +294,7 @@ doSomething(); // Should point to the declaration as the definition
 
 ```query
 (function_declaration
-  ((identifier) @definition.var)
+  ((identifier) @local.definition.var)
    (#set! "definition.var.scope" "parent"))
 ```
 
@@ -312,7 +312,7 @@ You can define folds for a given language by adding a `folds.scm` query :
 @fold ; fold this node
 ```
 
-If the `folds.scm` query is not present, this will fall back to the `@scope` captures in the `locals`
+If the `folds.scm` query is not present, this will fall back to the `@local.scope` captures in the `locals`
 query.
 
 ### Injections
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index cc69d5621..ab0f89fc1 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -41,8 +41,8 @@ function M.get_definitions(bufnr)
   local defs = {}
 
   for _, loc in ipairs(locals) do
-    if loc.definition then
-      table.insert(defs, loc.definition)
+    if loc["local.definition"] then
+      table.insert(defs, loc["local.definition"])
     end
   end
 
@@ -55,8 +55,8 @@ function M.get_scopes(bufnr)
   local scopes = {}
 
   for _, loc in ipairs(locals) do
-    if loc.scope and loc.scope.node then
-      table.insert(scopes, loc.scope.node)
+    if loc["local.scope"] and loc["local.scope"].node then
+      table.insert(scopes, loc["local.scope"].node)
     end
   end
 
@@ -69,8 +69,8 @@ function M.get_references(bufnr)
   local refs = {}
 
   for _, loc in ipairs(locals) do
-    if loc.reference and loc.reference.node then
-      table.insert(refs, loc.reference.node)
+    if loc["local.reference"] and loc["local.reference"].node then
+      table.insert(refs, loc["local.reference"].node)
     end
   end
 
diff --git a/queries/ada/locals.scm b/queries/ada/locals.scm
index b36d3718c..2d61b3123 100644
--- a/queries/ada/locals.scm
+++ b/queries/ada/locals.scm
@@ -2,32 +2,32 @@
 ;;  references. However, this is not yet supported by neovim
 ;;  See https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables
 
-(compilation) @scope
-(package_declaration) @scope
-(package_body) @scope
-(subprogram_declaration) @scope
-(subprogram_body) @scope
-(block_statement) @scope
+(compilation) @local.scope
+(package_declaration) @local.scope
+(package_body) @local.scope
+(subprogram_declaration) @local.scope
+(subprogram_body) @local.scope
+(block_statement) @local.scope
 
-(with_clause (identifier) @definition.import)
-(procedure_specification name: (_) @definition.function)
-(function_specification name: (_) @definition.function)
-(package_declaration name: (_) @definition.var)
-(package_body name: (_) @definition.var)
-(generic_instantiation . name: (_) @definition.var)
-(component_declaration . (identifier) @definition.var)
-(exception_declaration . (identifier) @definition.var)
-(formal_object_declaration . (identifier) @definition.var)
-(object_declaration . (identifier) @definition.var)
-(parameter_specification . (identifier) @definition.var)
-(full_type_declaration . (identifier) @definition.type)
-(private_type_declaration . (identifier) @definition.type)
-(private_extension_declaration . (identifier) @definition.type)
-(incomplete_type_declaration . (identifier) @definition.type)
-(protected_type_declaration . (identifier) @definition.type)
-(formal_complete_type_declaration . (identifier) @definition.type)
-(formal_incomplete_type_declaration . (identifier) @definition.type)
-(task_type_declaration . (identifier) @definition.type)
-(subtype_declaration . (identifier) @definition.type)
+(with_clause (identifier) @local.definition.import)
+(procedure_specification name: (_) @local.definition.function)
+(function_specification name: (_) @local.definition.function)
+(package_declaration name: (_) @local.definition.var)
+(package_body name: (_) @local.definition.var)
+(generic_instantiation . name: (_) @local.definition.var)
+(component_declaration . (identifier) @local.definition.var)
+(exception_declaration . (identifier) @local.definition.var)
+(formal_object_declaration . (identifier) @local.definition.var)
+(object_declaration . (identifier) @local.definition.var)
+(parameter_specification . (identifier) @local.definition.var)
+(full_type_declaration . (identifier) @local.definition.type)
+(private_type_declaration . (identifier) @local.definition.type)
+(private_extension_declaration . (identifier) @local.definition.type)
+(incomplete_type_declaration . (identifier) @local.definition.type)
+(protected_type_declaration . (identifier) @local.definition.type)
+(formal_complete_type_declaration . (identifier) @local.definition.type)
+(formal_incomplete_type_declaration . (identifier) @local.definition.type)
+(task_type_declaration . (identifier) @local.definition.type)
+(subtype_declaration . (identifier) @local.definition.type)
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/apex/locals.scm b/queries/apex/locals.scm
index c7213601b..6ffa8648f 100644
--- a/queries/apex/locals.scm
+++ b/queries/apex/locals.scm
@@ -1,66 +1,66 @@
 ; declarations
 
-(class_declaration) @scope
-(method_declaration) @scope
-(constructor_declaration) @scope
-(enum_declaration) @scope
-(enhanced_for_statement) @scope
+(class_declaration) @local.scope
+(method_declaration) @local.scope
+(constructor_declaration) @local.scope
+(enum_declaration) @local.scope
+(enhanced_for_statement) @local.scope
 
 ; if/else
 
-(if_statement) @scope
+(if_statement) @local.scope
 (if_statement
-  consequence: (_) @scope) ; if body in case there are no braces
+  consequence: (_) @local.scope) ; if body in case there are no braces
 (if_statement
-  alternative: (_) @scope) ; else body in case there are no braces
+  alternative: (_) @local.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
+(try_statement) @local.scope ; covers try+catch, individual try and catch are covered by (block)
+(catch_clause) @local.scope ; needed because `Exception` variable
 
 ; loops
 
-(for_statement) @scope
+(for_statement) @local.scope
 (for_statement         ; "for" body in case there are no braces
-  body: (_) @scope)
+  body: (_) @local.scope)
 (do_statement
-  body: (_) @scope)
+  body: (_) @local.scope)
 (while_statement
-  body: (_) @scope)
+  body: (_) @local.scope)
 
 ; Functions
 
-(constructor_declaration) @scope
-(method_declaration) @scope
+(constructor_declaration) @local.scope
+(method_declaration) @local.scope
 
 ;; definitions
 
 (enum_declaration
-  name: (identifier) @definition.enum)
+  name: (identifier) @local.definition.enum)
 
 (method_declaration
-  name: (identifier) @definition.method)
+  name: (identifier) @local.definition.method)
 
 (local_variable_declaration
   declarator: (variable_declarator
-    name: (identifier) @definition.var))
+    name: (identifier) @local.definition.var))
 
 (enhanced_for_statement 
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (formal_parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (catch_formal_parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (field_declaration
   declarator: (variable_declarator
-    name: (identifier) @definition.field))
+    name: (identifier) @local.definition.field))
 
 ;; REFERENCES
 
-(identifier) @reference
+(identifier) @local.reference
 
-(type_identifier) @reference
+(type_identifier) @local.reference
diff --git a/queries/bash/locals.scm b/queries/bash/locals.scm
index a03bc3a56..2b9cfec70 100644
--- a/queries/bash/locals.scm
+++ b/queries/bash/locals.scm
@@ -1,13 +1,13 @@
 ; Scopes
-(function_definition) @scope
+(function_definition) @local.scope
 
 ; Definitions
 (variable_assignment 
-  name: (variable_name) @definition.var)
+  name: (variable_name) @local.definition.var)
 
 (function_definition
-  name: (word) @definition.function)
+  name: (word) @local.definition.function)
 
 ; References
-(variable_name) @reference
-(word) @reference
+(variable_name) @local.reference
+(word) @local.reference
diff --git a/queries/bass/locals.scm b/queries/bass/locals.scm
index 5a94e7532..c28a78dd5 100644
--- a/queries/bass/locals.scm
+++ b/queries/bass/locals.scm
@@ -4,22 +4,22 @@
   (list)
   (scope)
   (cons)
-] @scope
+] @local.scope
 
 ; References
 
-(symbol) @reference
+(symbol) @local.reference
 
 ; Definitions
 
 ((list
   . (symbol) @_fnkw
-  . (symbol) @definition.function
-  (symbol)? @definition.parameter)
+  . (symbol) @local.definition.function
+  (symbol)? @local.definition.parameter)
   (#any-of? @_fnkw "def" "defop" "defn" "fn"))
 
 ((cons
   . (symbol) @_fnkw
-  . (symbol) @definition.function
-  (symbol)? @definition.parameter)
+  . (symbol) @local.definition.function
+  (symbol)? @local.definition.parameter)
   (#any-of? @_fnkw "def" "defop" "defn" "fn"))
diff --git a/queries/bicep/locals.scm b/queries/bicep/locals.scm
index 361be94fb..c28987051 100644
--- a/queries/bicep/locals.scm
+++ b/queries/bicep/locals.scm
@@ -13,62 +13,62 @@
   (array)
   (object)
   (interpolation)
-] @scope
+] @local.scope
 
 ; References
 
-(property_identifier) @reference
+(property_identifier) @local.reference
 
 (call_expression
-  (identifier) @reference)
+  (identifier) @local.reference)
 
 (object_property
   (_)
   ":"
-  (identifier) @reference)
+  (identifier) @local.reference)
 
 (resource_expression
-  (identifier) @reference)
+  (identifier) @local.reference)
 
 ; Definitions
 
-(type) @definition.associated
+(type) @local.definition.associated
 
 (object_property
-  (identifier) @definition.field
+  (identifier) @local.definition.field
   (_))
 
 (object_property
-  (compatible_identifier) @definition.field
+  (compatible_identifier) @local.definition.field
   (_))
 
-(import_name) @definition.import
+(import_name) @local.definition.import
 
 (module_declaration
-  (identifier) @definition.namespace)
+  (identifier) @local.definition.namespace)
 
 (parameter_declaration
-  (identifier) @definition.parameter
+  (identifier) @local.definition.parameter
   (_))
 
 (type_declaration
-  (identifier) @definition.type
+  (identifier) @local.definition.type
   (_))
 
 (variable_declaration
-  (identifier) @definition.var
+  (identifier) @local.definition.var
   (_))
 
 (metadata_declaration
-  (identifier) @definition.var
+  (identifier) @local.definition.var
   (_))
 
 (output_declaration
-  (identifier) @definition.var
+  (identifier) @local.definition.var
   (_))
 
 (for_statement
   "for"
   (for_loop_parameters
-    (loop_variable) @definition.var
-    (loop_enumerator) @definition.var))
+    (loop_variable) @local.definition.var
+    (loop_enumerator) @local.definition.var))
diff --git a/queries/bitbake/locals.scm b/queries/bitbake/locals.scm
index baf835cc5..27e85f02a 100644
--- a/queries/bitbake/locals.scm
+++ b/queries/bitbake/locals.scm
@@ -2,98 +2,98 @@
 [
   (python_identifier)
   (identifier)
-] @reference
+] @local.reference
 
 ; Imports
 (aliased_import
-  alias: (python_identifier) @definition.import)
+  alias: (python_identifier) @local.definition.import)
 (import_statement
-  name: (dotted_name ((python_identifier) @definition.import)))
+  name: (dotted_name ((python_identifier) @local.definition.import)))
 (import_from_statement
-  name: (dotted_name ((python_identifier) @definition.import)))
+  name: (dotted_name ((python_identifier) @local.definition.import)))
 
 ; Function with parameters, defines parameters
 (parameters
-  (python_identifier) @definition.parameter)
+  (python_identifier) @local.definition.parameter)
 
 (default_parameter
-  (python_identifier) @definition.parameter)
+  (python_identifier) @local.definition.parameter)
 
 (typed_parameter
-  (python_identifier) @definition.parameter)
+  (python_identifier) @local.definition.parameter)
 
 (typed_default_parameter
-  (python_identifier) @definition.parameter)
+  (python_identifier) @local.definition.parameter)
 
 ; *args parameter
 (parameters
   (list_splat_pattern
-    (python_identifier) @definition.parameter))
+    (python_identifier) @local.definition.parameter))
 
 ; **kwargs parameter
 (parameters
   (dictionary_splat_pattern
-    (python_identifier) @definition.parameter))
+    (python_identifier) @local.definition.parameter))
 
 ; Function defines function and scope
 ((python_function_definition
-  name: (python_identifier) @definition.function) @scope
+  name: (python_identifier) @local.definition.function) @local.scope
  (#set! definition.function.scope "parent"))
 
-(function_definition (identifier) @definition.function)
+(function_definition (identifier) @local.definition.function)
 
-(anonymous_python_function (identifier) @definition.function)
+(anonymous_python_function (identifier) @local.definition.function)
 
 ;;; Loops
 ; not a scope!
 (for_statement
   left: (pattern_list
-          (python_identifier) @definition.var))
+          (python_identifier) @local.definition.var))
 (for_statement
   left: (tuple_pattern
-          (python_identifier) @definition.var))
+          (python_identifier) @local.definition.var))
 (for_statement
-  left: (python_identifier) @definition.var)
+  left: (python_identifier) @local.definition.var)
 
 ; not a scope!
-;(while_statement) @scope
+;(while_statement) @local.scope
 
 ; for in list comprehension
 (for_in_clause
-  left: (python_identifier) @definition.var)
+  left: (python_identifier) @local.definition.var)
 (for_in_clause
   left: (tuple_pattern
-          (python_identifier) @definition.var))
+          (python_identifier) @local.definition.var))
 (for_in_clause
   left: (pattern_list
-          (python_identifier) @definition.var))
+          (python_identifier) @local.definition.var))
 
-(dictionary_comprehension) @scope
-(list_comprehension) @scope
-(set_comprehension) @scope
+(dictionary_comprehension) @local.scope
+(list_comprehension) @local.scope
+(set_comprehension) @local.scope
 
 ;;; Assignments
 
 (assignment
- left: (python_identifier) @definition.var)
+ left: (python_identifier) @local.definition.var)
 
 (assignment
  left: (pattern_list
-   (python_identifier) @definition.var))
+   (python_identifier) @local.definition.var))
 (assignment
  left: (tuple_pattern
-   (python_identifier) @definition.var))
+   (python_identifier) @local.definition.var))
 
 (assignment
  left: (attribute
    (python_identifier)
-   (python_identifier) @definition.field))
+   (python_identifier) @local.definition.field))
 
-(variable_assignment (identifier) operator: [ "=" "?=" "??=" ":=" ] @definition.var)
+(variable_assignment (identifier) operator: [ "=" "?=" "??=" ":=" ] @local.definition.var)
 
 ; Walrus operator  x := 1
 (named_expression
-  (python_identifier) @definition.var)
+  (python_identifier) @local.definition.var)
 
 (as_pattern
-  alias: (as_pattern_target) @definition.var)
+  alias: (as_pattern_target) @local.definition.var)
diff --git a/queries/c/locals.scm b/queries/c/locals.scm
index b59f8f37a..3756bc4a5 100644
--- a/queries/c/locals.scm
+++ b/queries/c/locals.scm
@@ -1,45 +1,45 @@
 ;; Functions definitions
 (function_declarator
-  declarator: (identifier) @definition.function)
+  declarator: (identifier) @local.definition.function)
 (preproc_function_def
-  name: (identifier) @definition.macro) @scope
+  name: (identifier) @local.definition.macro) @local.scope
 
 (preproc_def
-  name: (identifier) @definition.macro)
+  name: (identifier) @local.definition.macro)
 (pointer_declarator
-  declarator: (identifier) @definition.var)
+  declarator: (identifier) @local.definition.var)
 (parameter_declaration
-  declarator: (identifier) @definition.parameter)
+  declarator: (identifier) @local.definition.parameter)
 (init_declarator
-  declarator: (identifier) @definition.var)
+  declarator: (identifier) @local.definition.var)
 (array_declarator
-  declarator: (identifier) @definition.var)
+  declarator: (identifier) @local.definition.var)
 (declaration
-  declarator: (identifier) @definition.var)
+  declarator: (identifier) @local.definition.var)
 (enum_specifier
-  name: (_) @definition.type
+  name: (_) @local.definition.type
   (enumerator_list
-    (enumerator name: (identifier) @definition.var)))
+    (enumerator name: (identifier) @local.definition.var)))
 
 ;; Type / Struct / Enum
 (field_declaration
-  declarator: (field_identifier) @definition.field)
+  declarator: (field_identifier) @local.definition.field)
 (type_definition
-  declarator: (type_identifier) @definition.type)
+  declarator: (type_identifier) @local.definition.type)
 (struct_specifier
-  name: (type_identifier) @definition.type)
+  name: (type_identifier) @local.definition.type)
 
 ;; goto
-(labeled_statement (statement_identifier) @definition)
+(labeled_statement (statement_identifier) @local.definition)
 
 ;; References
-(identifier) @reference
-((field_identifier) @reference
+(identifier) @local.reference
+((field_identifier) @local.reference
                     (#set! reference.kind "field"))
-((type_identifier) @reference
+((type_identifier) @local.reference
                    (#set! reference.kind "type"))
 
-(goto_statement (statement_identifier) @reference)
+(goto_statement (statement_identifier) @local.reference)
 
 ;; Scope
 [
@@ -50,4 +50,4 @@
  (function_definition)
  (compound_statement) ; a block in curly braces
  (struct_specifier)
-] @scope
+] @local.scope
diff --git a/queries/c_sharp/locals.scm b/queries/c_sharp/locals.scm
index c53eb1a19..1d1665d9d 100644
--- a/queries/c_sharp/locals.scm
+++ b/queries/c_sharp/locals.scm
@@ -1,41 +1,41 @@
 ;; Definitions
 (variable_declarator
-  . (identifier) @definition.var)
+  . (identifier) @local.definition.var)
 
 (variable_declarator
   (tuple_pattern
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 (declaration_expression
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (for_each_statement
-  left: (identifier) @definition.var)
+  left: (identifier) @local.definition.var)
 
 (for_each_statement
   left: (tuple_pattern
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 (parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (method_declaration
-  name: (identifier) @definition.method)
+  name: (identifier) @local.definition.method)
 
 (local_function_statement
-  name: (identifier) @definition.method)
+  name: (identifier) @local.definition.method)
 
 (property_declaration
-  name: (identifier) @definition)
+  name: (identifier) @local.definition)
 
 (type_parameter
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (class_declaration
-  name: (identifier) @definition)
+  name: (identifier) @local.definition)
 
 ;; References
-(identifier) @reference
+(identifier) @local.reference
 
 ;; Scope
-(block) @scope
+(block) @local.scope
diff --git a/queries/cairo/locals.scm b/queries/cairo/locals.scm
index 53b33c01d..a92991f26 100644
--- a/queries/cairo/locals.scm
+++ b/queries/cairo/locals.scm
@@ -1,9 +1,9 @@
 ; References
 
-(identifier) @reference
-((type_identifier) @reference
+(identifier) @local.reference
+((type_identifier) @local.reference
   (#set! reference.kind "type"))
-((field_identifier) @reference
+((field_identifier) @local.reference
   (#set! reference.kind "field"))
 
 ; Scopes
@@ -20,49 +20,49 @@
   (struct_item)
   (enum_item)
   (impl_item)
-] @scope
+] @local.scope
 
 (use_declaration 
   argument: (scoped_identifier 
-              name: (identifier) @definition.import))
+              name: (identifier) @local.definition.import))
 
 (use_as_clause 
-  alias: (identifier) @definition.import)
+  alias: (identifier) @local.definition.import)
 
 (use_list
-    (identifier) @definition.import) ; use std::process::{Child, Command, Stdio};
+    (identifier) @local.definition.import) ; use std::process::{Child, Command, Stdio};
 
 ; Functions
 
 (function_definition
-    (identifier) @definition.function)
+    (identifier) @local.definition.function)
 
 (function_definition
-  (identifier) @definition.method
+  (identifier) @local.definition.method
   (parameter (self)))
 
 ; Function with parameters, defines parameters
 
 (parameter
-  [ (identifier) (self) ]  @definition.parameter)
+  [ (identifier) (self) ]  @local.definition.parameter)
 
 ; Types
 
 (struct_item
-  name: (type_identifier) @definition.type)
+  name: (type_identifier) @local.definition.type)
 
 (constrained_type_parameter 
-  left: (type_identifier) @definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
+  left: (type_identifier) @local.definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
 
 (enum_item
-  name: (type_identifier) @definition.type)
+  name: (type_identifier) @local.definition.type)
 
 ; Module
 
 (mod_item 
-  name: (identifier) @definition.namespace)
+  name: (identifier) @local.definition.namespace)
 
 ; Variables
 
 (assignment_expression
- left: (identifier) @definition.var)
+ left: (identifier) @local.definition.var)
diff --git a/queries/capnp/locals.scm b/queries/capnp/locals.scm
index fb436bf06..d0025100e 100644
--- a/queries/capnp/locals.scm
+++ b/queries/capnp/locals.scm
@@ -12,79 +12,79 @@
   (struct)
   (struct_shorthand)
   (union)
-] @scope
+] @local.scope
 
 [
   (extend_type)
   (field_type)
-] @reference
-(custom_type (type_identifier) @reference)
+] @local.reference
+(custom_type (type_identifier) @local.reference)
 (custom_type
   (generics
     (generic_parameters 
-      (generic_identifier) @reference)))
+      (generic_identifier) @local.reference)))
 
-(annotation_definition_identifier) @definition
+(annotation_definition_identifier) @local.definition
 
-(const_identifier) @definition.constant
+(const_identifier) @local.definition.constant
 
-(enum (enum_identifier) @definition.enum)
+(enum (enum_identifier) @local.definition.enum)
 
 [
   (enum_member)
   (field_identifier)
-] @definition.field
+] @local.definition.field
 
-(method_identifier) @definition.method
+(method_identifier) @local.definition.method
 
-(namespace) @definition.namespace
+(namespace) @local.definition.namespace
 
 [
   (param_identifier)
   (return_identifier)
-] @definition.parameter
+] @local.definition.parameter
 
-(group (type_identifier) @definition.type)
+(group (type_identifier) @local.definition.type)
 
-(struct (type_identifier) @definition.type)
+(struct (type_identifier) @local.definition.type)
 
-(union (type_identifier) @definition.type)
+(union (type_identifier) @local.definition.type)
 
-(interface (type_identifier) @definition.type)
+(interface (type_identifier) @local.definition.type)
 
 ; Generics Related (don't know how to combine these)
 
 (struct
   (generics
     (generic_parameters
-      (generic_identifier) @definition.parameter)))
+      (generic_identifier) @local.definition.parameter)))
 
 (interface
   (generics
     (generic_parameters
-      (generic_identifier) @definition.parameter)))
+      (generic_identifier) @local.definition.parameter)))
 
 (method
   (implicit_generics
     (implicit_generic_parameters
-      (generic_identifier) @definition.parameter)))
+      (generic_identifier) @local.definition.parameter)))
 
 (method
   (generics
     (generic_parameters
-      (generic_identifier) @definition.parameter)))
+      (generic_identifier) @local.definition.parameter)))
 
 (annotation
   (generics
     (generic_parameters
-      (generic_identifier) @definition.type)))
+      (generic_identifier) @local.definition.type)))
 
 (replace_using
   (generics
     (generic_parameters
-      (generic_identifier) @definition.type)))
+      (generic_identifier) @local.definition.type)))
 
 (return_type
   (generics
     (generic_parameters
-      (generic_identifier) @definition.type)))
+      (generic_identifier) @local.definition.type)))
diff --git a/queries/chatito/locals.scm b/queries/chatito/locals.scm
index 4d7a6c1a0..fd8bb9da0 100644
--- a/queries/chatito/locals.scm
+++ b/queries/chatito/locals.scm
@@ -1,10 +1,10 @@
 ;; Definitions
 
-(intent_def (intent) @definition)
-(slot_def (slot) @definition)
-(alias_def (alias) @definition)
+(intent_def (intent) @local.definition)
+(slot_def (slot) @local.definition)
+(alias_def (alias) @local.definition)
 
 ;; References
 
-(slot_ref (slot) @reference)
-(alias_ref (alias) @reference)
+(slot_ref (slot) @local.reference)
+(alias_ref (alias) @local.reference)
diff --git a/queries/commonlisp/locals.scm b/queries/commonlisp/locals.scm
index 471fad408..647d1007f 100644
--- a/queries/commonlisp/locals.scm
+++ b/queries/commonlisp/locals.scm
@@ -1,72 +1,72 @@
 
 (defun_header
-  function_name: (sym_lit) @definition.function (#set! definition.function.scope "parent"))
+  function_name: (sym_lit) @local.definition.function (#set! definition.function.scope "parent"))
 (defun_header
-  lambda_list: (list_lit (sym_lit) @definition.parameter))
+  lambda_list: (list_lit (sym_lit) @local.definition.parameter))
 
 (defun_header
   keyword: (defun_keyword "defmethod")
-  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @definition.type)))
+  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @local.definition.type)))
 (defun_header
-  lambda_list: (list_lit (list_lit . (sym_lit) @definition.parameter . (_))))
+  lambda_list: (list_lit (list_lit . (sym_lit) @local.definition.parameter . (_))))
 
-(sym_lit) @reference
+(sym_lit) @local.reference
 
-(defun) @scope
+(defun) @local.scope
 
-((list_lit . (sym_lit) @_defvar . (sym_lit) @definition.var)
+((list_lit . (sym_lit) @_defvar . (sym_lit) @local.definition.var)
 (#match? @_defvar "^(cl:)?(defvar|defparameter)$"))
 
 (list_lit
  .
  (sym_lit) @_deftest
  .
- (sym_lit) @definition.function
- (#eq? @_deftest "deftest")) @scope
+ (sym_lit) @local.definition.function
+ (#eq? @_deftest "deftest")) @local.scope
 
 (list_lit
  .
  (sym_lit) @_deftest
  .
- (sym_lit) @definition.function
- (#eq? @_deftest "deftest")) @scope
+ (sym_lit) @local.definition.function
+ (#eq? @_deftest "deftest")) @local.scope
 
-(for_clause . (sym_lit) @definition.var)
-(with_clause . (sym_lit) @definition.var)
-(loop_macro) @scope
+(for_clause . (sym_lit) @local.definition.var)
+(with_clause . (sym_lit) @local.definition.var)
+(loop_macro) @local.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 (list_lit . (sym_lit) @local.definition.var))) @local.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 . (sym_lit) @local.definition.var)) @local.scope
 
 (list_lit
  .
  (kwd_lit) @_import_from (#eq? @_import_from ":import-from")
  .
  (_)
- (kwd_lit (kwd_symbol) @definition.import))
+ (kwd_lit (kwd_symbol) @local.definition.import))
 
 (list_lit
  .
  (kwd_lit) @_import_from (#eq? @_import_from ":import-from")
  .
  (_)
- (sym_lit) @definition.import)
+ (sym_lit) @local.definition.import)
 
 (list_lit
  .
  (kwd_lit) @_use (#eq? @_use ":use")
- (kwd_lit (kwd_symbol) @definition.import))
+ (kwd_lit (kwd_symbol) @local.definition.import))
 
 (list_lit
  .
  (kwd_lit) @_use (#eq? @_use ":use")
- (sym_lit) @definition.import)
+ (sym_lit) @local.definition.import)
diff --git a/queries/corn/locals.scm b/queries/corn/locals.scm
index f6b0d4c70..009d29202 100644
--- a/queries/corn/locals.scm
+++ b/queries/corn/locals.scm
@@ -3,14 +3,14 @@
 [
   (object)
   (array)
-] @scope
+] @local.scope
 
 ; definitions
 
 (assign_block 
   (assignment
     (input) 
-      @definition.constant))
+      @local.definition.constant))
 
-(value (input) @reference)
+(value (input) @local.reference)
 
diff --git a/queries/cpon/locals.scm b/queries/cpon/locals.scm
index c1854af91..8341b9725 100644
--- a/queries/cpon/locals.scm
+++ b/queries/cpon/locals.scm
@@ -4,4 +4,4 @@
   (meta_map)
   (map)
   (array)
-] @scope
+] @local.scope
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
index 570a22af0..d8bb18c05 100644
--- a/queries/cpp/locals.scm
+++ b/queries/cpp/locals.scm
@@ -3,73 +3,73 @@
 ;; Parameters
 (variadic_parameter_declaration
   declarator: (variadic_declarator
-                (identifier) @definition.parameter))
+                (identifier) @local.definition.parameter))
 (optional_parameter_declaration
-  declarator: (identifier) @definition.parameter)
+  declarator: (identifier) @local.definition.parameter)
 ;; Class / struct definitions
-(class_specifier) @scope
+(class_specifier) @local.scope
 
 (reference_declarator
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (variadic_declarator
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (struct_specifier
   name: (qualified_identifier
-          name: (type_identifier) @definition.type))
+          name: (type_identifier) @local.definition.type))
 
 (class_specifier
-  name: (type_identifier) @definition.type)
+  name: (type_identifier) @local.definition.type)
 
 (concept_definition
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 
 (class_specifier
   name: (qualified_identifier
-          name: (type_identifier) @definition.type))
+          name: (type_identifier) @local.definition.type))
 
 (alias_declaration
-  name: (type_identifier) @definition.type)
+  name: (type_identifier) @local.definition.type)
 
 ;template <typename T>
 (type_parameter_declaration
-  (type_identifier) @definition.type)
-(template_declaration) @scope
+  (type_identifier) @local.definition.type)
+(template_declaration) @local.scope
 
 ;; Namespaces
 (namespace_definition
-  name: (namespace_identifier) @definition.namespace
-  body: (_) @scope)
+  name: (namespace_identifier) @local.definition.namespace
+  body: (_) @local.scope)
 
 (namespace_definition
-  name: (nested_namespace_specifier) @definition.namespace
-  body: (_) @scope)
+  name: (nested_namespace_specifier) @local.definition.namespace
+  body: (_) @local.scope)
 
-((namespace_identifier) @reference
+((namespace_identifier) @local.reference
                         (#set! reference.kind "namespace"))
 
 ;; Function definitions
 (template_function
-  name: (identifier) @definition.function) @scope
+  name: (identifier) @local.definition.function) @local.scope
 
 (template_method
-  name: (field_identifier) @definition.method) @scope
+  name: (field_identifier) @local.definition.method) @local.scope
 
 (function_declarator
   declarator: (qualified_identifier
-                name: (identifier) @definition.function)) @scope
+                name: (identifier) @local.definition.function)) @local.scope
 
 (field_declaration
   declarator: (function_declarator
-                (field_identifier) @definition.method))
+                (field_identifier) @local.definition.method))
 
-(lambda_expression) @scope
+(lambda_expression) @local.scope
 
 ;; Control structures
 (try_statement
-  body: (_) @scope)
+  body: (_) @local.scope)
 
-(catch_clause) @scope
+(catch_clause) @local.scope
 
-(requires_expression) @scope
+(requires_expression) @local.scope
diff --git a/queries/cue/locals.scm b/queries/cue/locals.scm
index b99a4fca8..bdc4a56a2 100644
--- a/queries/cue/locals.scm
+++ b/queries/cue/locals.scm
@@ -4,31 +4,31 @@
   (source_file)
   (field)
   (for_clause)
-] @scope
+] @local.scope
 
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
 (import_spec
-  path: (string) @definition.import)
+  path: (string) @local.definition.import)
 
 (field
   (label
-  (identifier) @definition.field))
+  (identifier) @local.definition.field))
 
-(package_identifier) @definition.namespace
+(package_identifier) @local.definition.namespace
 
 (for_clause
-  (identifier) @definition.variable
+  (identifier) @local.definition.variable
   (expression))
 
 (for_clause
   (identifier)
-  (identifier) @definition.variable
+  (identifier) @local.definition.variable
   (expression))
 
 (let_clause
-  (identifier) @definition.variable)
+  (identifier) @local.definition.variable)
diff --git a/queries/dart/locals.scm b/queries/dart/locals.scm
index 2184bab1d..f7faa26ac 100644
--- a/queries/dart/locals.scm
+++ b/queries/dart/locals.scm
@@ -1,28 +1,28 @@
 ;; Definitions
 
 (function_signature
-  name: (identifier) @definition.function)
+  name: (identifier) @local.definition.function)
 
 (formal_parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (initialized_variable_definition
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (initialized_identifier
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (static_final_declaration
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 ;; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ;; Scopes
 
 (class_definition
-  body: (_) @scope)
+  body: (_) @local.scope)
 [
  (block)
  (if_statement)
@@ -31,4 +31,4 @@
  (try_statement)
  (catch_clause)
  (finally_clause)
-] @scope
+] @local.scope
diff --git a/queries/devicetree/locals.scm b/queries/devicetree/locals.scm
index 95b124bd1..88b266ec2 100644
--- a/queries/devicetree/locals.scm
+++ b/queries/devicetree/locals.scm
@@ -1,4 +1,4 @@
 [
   (node)
   (integer_cells)
-]@scope
+]@local.scope
diff --git a/queries/dtd/locals.scm b/queries/dtd/locals.scm
index 7efcdd030..6f64c6791 100644
--- a/queries/dtd/locals.scm
+++ b/queries/dtd/locals.scm
@@ -1,7 +1,7 @@
-(elementdecl (Name) @definition.type)
+(elementdecl (Name) @local.definition.type)
 
 (elementdecl
   (contentspec
-    (children (Name) @reference)))
+    (children (Name) @local.reference)))
 
-(AttlistDecl . (Name) @reference)
+(AttlistDecl . (Name) @local.reference)
diff --git a/queries/ecma/locals.scm b/queries/ecma/locals.scm
index 4c035d269..86e565490 100644
--- a/queries/ecma/locals.scm
+++ b/queries/ecma/locals.scm
@@ -1,37 +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
+(statement_block) @local.scope
+(function) @local.scope
+(arrow_function) @local.scope
+(function_declaration) @local.scope
+(method_definition) @local.scope
+(for_statement) @local.scope
+(for_in_statement) @local.scope
+(catch_clause) @local.scope
 
 ; Definitions
 ;------------
 
 (variable_declarator
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (import_specifier
-  (identifier) @definition.import)
+  (identifier) @local.definition.import)
 
 (namespace_import
-  (identifier) @definition.import)
+  (identifier) @local.definition.import)
 
 (function_declaration
-  ((identifier) @definition.function)
+  ((identifier) @local.definition.function)
    (#set! definition.var.scope parent))
 
 (method_definition
-  ((property_identifier) @definition.function)
+  ((property_identifier) @local.definition.function)
    (#set! definition.var.scope parent))
 
 ; References
 ;------------
 
-(identifier) @reference
-(shorthand_property_identifier) @reference
+(identifier) @local.reference
+(shorthand_property_identifier) @local.reference
diff --git a/queries/elixir/locals.scm b/queries/elixir/locals.scm
index 79a9676df..ae37b9ca8 100644
--- a/queries/elixir/locals.scm
+++ b/queries/elixir/locals.scm
@@ -1,86 +1,86 @@
 ; References
-(identifier) @reference
-(alias) @reference
+(identifier) @local.reference
+(alias) @local.reference
 
 ; Module Definitions
 (call
   target: ((identifier) @_identifier (#eq? @_identifier "defmodule"))
-  (arguments (alias) @definition.type))
+  (arguments (alias) @local.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))))))))))))))))))))
+  (identifier) @local.definition.var
+  (_ (identifier) @local.definition.var)
+  (_ (_ (identifier) @local.definition.var))
+  (_ (_ (_ (identifier) @local.definition.var)))
+  (_ (_ (_ (_ (identifier) @local.definition.var))))
+  (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))
+  (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))
+  (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
+  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.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))))))))))))))))))))
+      (identifier) @local.definition.var
+      (_ (identifier) @local.definition.var)
+      (_ (_ (identifier) @local.definition.var))
+      (_ (_ (_ (identifier) @local.definition.var)))
+      (_ (_ (_ (_ (identifier) @local.definition.var))))
+      (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))
+      (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))
+      (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.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))))))))))))))))))))
+        (identifier) @local.definition.var
+        (_ (identifier) @local.definition.var)
+        (_ (_ (identifier) @local.definition.var))
+        (_ (_ (_ (identifier) @local.definition.var)))
+        (_ (_ (_ (_ (identifier) @local.definition.var))))
+        (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))
+        (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))
+        (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
+        (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
   ]) operator: "when")
 ])
 
@@ -88,11 +88,11 @@
 (call
   target: ((identifier) @_identifier (#any-of? @_identifier "require" "alias" "use" "import"))
   (arguments [
-    (alias) @definition.import
-    (_ (alias) @definition.import)
-    (_ (_ (alias) @definition.import))
-    (_ (_ (_ (alias) @definition.import)))
-    (_ (_ (_ (_ (alias) @definition.import))))
+    (alias) @local.definition.import
+    (_ (alias) @local.definition.import)
+    (_ (_ (alias) @local.definition.import))
+    (_ (_ (_ (alias) @local.definition.import)))
+    (_ (_ (_ (_ (alias) @local.definition.import))))
   ]
 ))
 
@@ -100,35 +100,35 @@
 (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))))))))))))))))))))
+    (identifier) @local.definition.function
+    (binary_operator left: (identifier) @local.definition.function operator: "when")
+    (binary_operator (identifier) @local.definition.parameter)
+    (call target: (identifier) @local.definition.function (arguments [
+      (identifier) @local.definition.parameter
+      (_ (identifier) @local.definition.parameter)
+      (_ (_ (identifier) @local.definition.parameter))
+      (_ (_ (_ (identifier) @local.definition.parameter)))
+      (_ (_ (_ (_ (identifier) @local.definition.parameter))))
+      (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
+      (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
+      (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
     ]))
   ]?) (#set! definition.function.scope parent)
   (do_block)?
-) @scope
+) @local.scope
 
 ; ExUnit Test Definitions & Scopes
 (call
@@ -136,29 +136,29 @@
   (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))))))))))))))))))))
+      (identifier) @local.definition.parameter
+      (_ (identifier) @local.definition.parameter)
+      (_ (_ (identifier) @local.definition.parameter))
+      (_ (_ (_ (identifier) @local.definition.parameter)))
+      (_ (_ (_ (_ (identifier) @local.definition.parameter))))
+      (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
+      (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
+      (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
+      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
   ])
-]) (do_block)?) @scope
+]) (do_block)?) @local.scope
 
 ; Stab Clause Scopes
-(stab_clause) @scope
+(stab_clause) @local.scope
diff --git a/queries/elsa/locals.scm b/queries/elsa/locals.scm
index de7030796..3e8197ae7 100644
--- a/queries/elsa/locals.scm
+++ b/queries/elsa/locals.scm
@@ -1,12 +1,12 @@
 [
   (source_file)
   (reduction)
-] @scope
+] @local.scope
 
-(identifier) @reference
+(identifier) @local.reference
 
-(function) @definition.function
+(function) @local.definition.function
 
-(method) @definition.method
+(method) @local.definition.method
 
-(parameter) @definition.parameter
+(parameter) @local.definition.parameter
diff --git a/queries/fennel/locals.scm b/queries/fennel/locals.scm
index 3018732f9..38e54bf6d 100644
--- a/queries/fennel/locals.scm
+++ b/queries/fennel/locals.scm
@@ -6,21 +6,21 @@
  (each)
  (for)
  (match)
-] @scope
+] @local.scope
 
 (
-  (list . (symbol) @_special) @scope
+  (list . (symbol) @_special) @local.scope
   (#any-of? @_special
    "while" "if" "when" "do" "collect" "icollect" "accumulate")
 )
 
-(fn name: (symbol) @definition.function
+(fn name: (symbol) @local.definition.function
   (#set! definition.function.scope "parent"))
-(lambda name: (symbol) @definition.function
+(lambda name: (symbol) @local.definition.function
   (#set! definition.function.scope "parent"))
 
-; TODO: use @definition.parameter for parameters
-(binding (symbol) @definition.var)
-(for_clause . (symbol) @definition.var)
+; TODO: use @local.definition.parameter for parameters
+(binding (symbol) @local.definition.var)
+(for_clause . (symbol) @local.definition.var)
 
-(symbol) @reference
+(symbol) @local.reference
diff --git a/queries/firrtl/locals.scm b/queries/firrtl/locals.scm
index bb7fc56bd..aa0e294cd 100644
--- a/queries/firrtl/locals.scm
+++ b/queries/firrtl/locals.scm
@@ -7,32 +7,32 @@
 
   (else)
   (when)
-] @scope
+] @local.scope
 
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
-(port (identifier) @definition.field)
+(port (identifier) @local.definition.field)
 
-(wire (identifier) @definition.field)
+(wire (identifier) @local.definition.field)
 
-(cmem (identifier) @definition.field)
+(cmem (identifier) @local.definition.field)
 
-(smem (identifier) @definition.field)
+(smem (identifier) @local.definition.field)
 
-(memory (identifier) @definition.field)
+(memory (identifier) @local.definition.field)
 
-(register (identifier) @definition.field)
+(register (identifier) @local.definition.field)
 
-(circuit (identifier) @definition.namespace)
+(circuit (identifier) @local.definition.namespace)
 
-(module (identifier) @definition.namespace)
+(module (identifier) @local.definition.namespace)
 
-(parameter (identifier) @definition.parameter)
+(parameter (identifier) @local.definition.parameter)
 
-(rdwr (identifier) @definition.var)
+(rdwr (identifier) @local.definition.var)
 
-(node (identifier) @definition.var)
+(node (identifier) @local.definition.var)
diff --git a/queries/fish/locals.scm b/queries/fish/locals.scm
index a522c78dc..15c3aac1d 100644
--- a/queries/fish/locals.scm
+++ b/queries/fish/locals.scm
@@ -7,12 +7,12 @@
   (begin_statement)
   (while_statement)
   (switch_statement)
-] @scope
+] @local.scope
 
 ;; Definitions
 (function_definition
-  name: (word) @definition.function)
+  name: (word) @local.definition.function)
 
 ;; References
-(variable_name) @reference
-(word) @reference
+(variable_name) @local.reference
+(word) @local.reference
diff --git a/queries/foam/locals.scm b/queries/foam/locals.scm
index 2abe743dd..c1f635036 100644
--- a/queries/foam/locals.scm
+++ b/queries/foam/locals.scm
@@ -1,6 +1,6 @@
-(dict) @scope
+(dict) @local.scope
 
-(dict key: (_) @definition.type)
+(dict key: (_) @local.definition.type)
 
-(key_value keyword: (_) @definition.parameter)
-(key_value value: (macro (identifier)*)* @reference)
+(key_value keyword: (_) @local.definition.parameter)
+(key_value value: (macro (identifier)*)* @local.reference)
diff --git a/queries/forth/locals.scm b/queries/forth/locals.scm
index 3a5e191d2..d91d3aa98 100644
--- a/queries/forth/locals.scm
+++ b/queries/forth/locals.scm
@@ -1,3 +1,3 @@
-(word) @reference
+(word) @local.reference
 
-(word_definition) @scope
+(word_definition) @local.scope
diff --git a/queries/fusion/locals.scm b/queries/fusion/locals.scm
index 24dc57bbe..19afce078 100644
--- a/queries/fusion/locals.scm
+++ b/queries/fusion/locals.scm
@@ -1,21 +1,21 @@
 ;; Fusion base
-(block) @scope
+(block) @local.scope
 
 (namespace_declaration
-  (alias_namespace) @definition.namespace)
+  (alias_namespace) @local.definition.namespace)
 
 (property
-  (path (path_part) @definition.field))
+  (path (path_part) @local.definition.field))
 
 (type
-  namespace: (package_name)? @definition.namespace
-  name: (type_name) @definition.type
+  namespace: (package_name)? @local.definition.namespace
+  name: (type_name) @local.definition.type
 )
 
 ;; Eel Expressions
-(eel_arrow_function) @scope
-(eel_object) @scope
+(eel_arrow_function) @local.scope
+(eel_object) @local.scope
 
-(eel_parameter) @definition.parameter
+(eel_parameter) @local.definition.parameter
 (eel_object_pair
-  key: (eel_property_name) @definition.field)
+  key: (eel_property_name) @local.definition.field)
diff --git a/queries/gdscript/locals.scm b/queries/gdscript/locals.scm
index 2c352b4a3..ebcda4f7d 100644
--- a/queries/gdscript/locals.scm
+++ b/queries/gdscript/locals.scm
@@ -14,79 +14,79 @@
   (lambda)
   (get_body)
   (set_body)
-] @scope
+] @local.scope
 
 ;; Parameters
 
-(parameters (identifier) @definition.parameter)
-(default_parameter (identifier) @definition.parameter)
-(typed_parameter (identifier) @definition.parameter)
-(typed_default_parameter (identifier) @definition.parameter)
+(parameters (identifier) @local.definition.parameter)
+(default_parameter (identifier) @local.definition.parameter)
+(typed_parameter (identifier) @local.definition.parameter)
+(typed_default_parameter (identifier) @local.definition.parameter)
 
 ;; Signals
 
 ; Can gdscript 2 signals be considered fields?
-(signal_statement (name) @definition.field)
+(signal_statement (name) @local.definition.field)
 
 ;; Variable Definitions
 
-(const_statement (name) @definition.constant)
+(const_statement (name) @local.definition.constant)
 ; onready and export variations are only properties.
-(variable_statement (name) @definition.var)
+(variable_statement (name) @local.definition.var)
 
-(setter) @reference
-(getter) @reference
+(setter) @local.reference
+(getter) @local.reference
 
 ;; Function Definition
 
-((function_definition (name) @definition.function)
+((function_definition (name) @local.definition.function)
  (#set! "definition.function.scope" "parent"))
 
 ;; Lambda
 
 ; lambda names are not accessible and are only for debugging.
-(lambda (name) @definition.function)
+(lambda (name) @local.definition.function)
 
 ;; Source
 
-(class_name_statement (name) @definition.type)
+(class_name_statement (name) @local.definition.type)
 
-(source (variable_statement (name) @definition.field))
-(source (onready_variable_statement (name) @definition.field))
-(source (export_variable_statement (name) @definition.field))
+(source (variable_statement (name) @local.definition.field))
+(source (onready_variable_statement (name) @local.definition.field))
+(source (export_variable_statement (name) @local.definition.field))
 
 ;; Class
 
-((class_definition (name) @definition.type)
+((class_definition (name) @local.definition.type)
  (#set! "definition.type.scope" "parent"))
 
 (class_definition
-  (body (variable_statement (name) @definition.field)))
+  (body (variable_statement (name) @local.definition.field)))
 (class_definition
-  (body (onready_variable_statement (name) @definition.field)))
+  (body (onready_variable_statement (name) @local.definition.field)))
 (class_definition
-  (body (export_variable_statement (name) @definition.field)))
+  (body (export_variable_statement (name) @local.definition.field)))
 (class_definition
-  (body (signal_statement (name) @definition.field)))
+  (body (signal_statement (name) @local.definition.field)))
 
 ; Although a script is also a class, let's only define functions in an inner class as
 ; methods.
 ((class_definition
-  (body (function_definition (name) @definition.method)))
+  (body (function_definition (name) @local.definition.method)))
  (#set! "definition.method.scope" "parent"))
 
 ;; Enum
 
-((enum_definition (name) @definition.enum))
+((enum_definition (name) @local.definition.enum))
 
 ;; Repeat
 
-(for_statement . (identifier) @definition.var)
+(for_statement . (identifier) @local.definition.var)
 
 ;; Match Statement
 
-(pattern_binding (identifier) @definition.var)
+(pattern_binding (identifier) @local.definition.var)
 
 ;; References
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/gitattributes/locals.scm b/queries/gitattributes/locals.scm
index 6a9aee1d5..43082a43d 100644
--- a/queries/gitattributes/locals.scm
+++ b/queries/gitattributes/locals.scm
@@ -1,4 +1,4 @@
-(macro_def (attr_name) @definition.macro)
+(macro_def (attr_name) @local.definition.macro)
 
-(attribute (attr_name) @reference)
-(attribute (builtin_attr) @reference)
+(attribute (attr_name) @local.reference)
+(attribute (builtin_attr) @local.reference)
diff --git a/queries/gleam/locals.scm b/queries/gleam/locals.scm
index 8872e51f0..43328ce1b 100644
--- a/queries/gleam/locals.scm
+++ b/queries/gleam/locals.scm
@@ -1,24 +1,24 @@
 ; Let Binding Definition
-(let pattern: (identifier) @definition)
+(let pattern: (identifier) @local.definition)
 
 ; List Pattern Definitions
-(list_pattern (identifier) @definition)
-(list_pattern assign: (identifier) @definition)
+(list_pattern (identifier) @local.definition)
+(list_pattern assign: (identifier) @local.definition)
 
 ; Tuple Pattern Definition
-(tuple_pattern (identifier) @definition)
+(tuple_pattern (identifier) @local.definition)
 
 ; Record Pattern Definition
-(record_pattern_argument pattern: (identifier) @definition)
+(record_pattern_argument pattern: (identifier) @local.definition)
 
 ; Function Parameter Definition
-(function_parameter name: (identifier) @definition)
+(function_parameter name: (identifier) @local.definition)
 
 ; References
-(identifier) @reference
+(identifier) @local.reference
 
 ; Function Body Scope
-(function_body) @scope
+(function_body) @local.scope
 
 ; Case Scope
-(case_clause) @scope
+(case_clause) @local.scope
diff --git a/queries/glimmer/locals.scm b/queries/glimmer/locals.scm
index c371162bc..705382aa9 100644
--- a/queries/glimmer/locals.scm
+++ b/queries/glimmer/locals.scm
@@ -1,7 +1,7 @@
 [
  (element_node)
  (block_statement)
-] @scope
+] @local.scope
 
-(identifier) @reference
-(block_params (identifier) @definition.var)
+(identifier) @local.reference
+(block_params (identifier) @local.definition.var)
diff --git a/queries/gn/locals.scm b/queries/gn/locals.scm
index 1350a2318..eecb3426a 100644
--- a/queries/gn/locals.scm
+++ b/queries/gn/locals.scm
@@ -1,6 +1,6 @@
 [
   (source_file)
   (block)
-] @scope
+] @local.scope
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index b027c217a..37d72b2be 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -1,79 +1,79 @@
 (
     (function_declaration
-        name: (identifier) @definition.function) ;@function 
+        name: (identifier) @local.definition.function) ;@function 
 )
 
 (
     (method_declaration
-        name: (field_identifier) @definition.method); @method
+        name: (field_identifier) @local.definition.method); @method
 )
 
 (short_var_declaration 
   left: (expression_list
-          (identifier) @definition.var)) 
+          (identifier) @local.definition.var)) 
 
 (var_spec 
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
-(parameter_declaration (identifier) @definition.var)
-(variadic_parameter_declaration (identifier) @definition.var)
+(parameter_declaration (identifier) @local.definition.var)
+(variadic_parameter_declaration (identifier) @local.definition.var)
 
 (for_statement
  (range_clause
    left: (expression_list
-           (identifier) @definition.var)))
+           (identifier) @local.definition.var)))
 
 (const_declaration
  (const_spec
-  name: (identifier) @definition.var))
+  name: (identifier) @local.definition.var))
 
 (type_declaration 
   (type_spec
-    name: (type_identifier) @definition.type))
+    name: (type_identifier) @local.definition.type))
 
 ;; reference
-(identifier) @reference
-(type_identifier) @reference
-(field_identifier) @reference
-((package_identifier) @reference
+(identifier) @local.reference
+(type_identifier) @local.reference
+(field_identifier) @local.reference
+((package_identifier) @local.reference
   (#set! reference.kind "namespace"))
 
 (package_clause
-   (package_identifier) @definition.namespace)
+   (package_identifier) @local.definition.namespace)
 
 (import_spec_list
   (import_spec
-    name: (package_identifier) @definition.namespace))
+    name: (package_identifier) @local.definition.namespace))
 
 ;; Call references
 ((call_expression
-   function: (identifier) @reference)
+   function: (identifier) @local.reference)
  (#set! reference.kind "call" ))
 
 ((call_expression
     function: (selector_expression
-                field: (field_identifier) @reference))
+                field: (field_identifier) @local.reference))
  (#set! reference.kind "call" ))
 
 
 ((call_expression
     function: (parenthesized_expression
-                (identifier) @reference))
+                (identifier) @local.reference))
  (#set! reference.kind "call" ))
 
 ((call_expression
    function: (parenthesized_expression
                (selector_expression
-                 field: (field_identifier) @reference)))
+                 field: (field_identifier) @local.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
+(func_literal) @local.scope
+(source_file) @local.scope
+(function_declaration) @local.scope
+(if_statement) @local.scope
+(block) @local.scope
+(expression_switch_statement) @local.scope
+(for_statement) @local.scope
+(method_declaration) @local.scope
diff --git a/queries/godot_resource/locals.scm b/queries/godot_resource/locals.scm
index 1dce04f0c..53982b713 100644
--- a/queries/godot_resource/locals.scm
+++ b/queries/godot_resource/locals.scm
@@ -1,3 +1,3 @@
 [
   (section)
-] @scope
+] @local.scope
diff --git a/queries/hare/locals.scm b/queries/hare/locals.scm
index 62eb6665b..bf606b9b1 100644
--- a/queries/hare/locals.scm
+++ b/queries/hare/locals.scm
@@ -7,41 +7,41 @@
   (for_statement)
   (match_expression)
   (switch_expression)
-] @scope
+] @local.scope
 
 ; References
 
 [
   (identifier)
   (scoped_type_identifier)
-] @reference
+] @local.reference
 
 ; Definitions
 
 (global_binding
-  (identifier) @definition.constant . ":" (_))
+  (identifier) @local.definition.constant . ":" (_))
 
 (const_declaration
-  "const" (identifier) @definition.constant . "=")
+  "const" (identifier) @local.definition.constant . "=")
 
 (field
-  . (identifier) @definition.field)
+  . (identifier) @local.definition.field)
 
 (field_assignment
-  . (identifier) @definition.field)
+  . (identifier) @local.definition.field)
 
 (function_declaration
-  "fn" . (identifier) @definition.function)
+  "fn" . (identifier) @local.definition.function)
 
 (parameter
-  (_) @definition.parameter . ":")
+  (_) @local.definition.parameter . ":")
 
 (type_declaration
-  "type" (identifier) @definition.type . "=")
+  "type" (identifier) @local.definition.type . "=")
 
 (type_declaration
-  "type" (identifier) @definition.enum . "=" (enum_type))
+  "type" (identifier) @local.definition.enum . "=" (enum_type))
 
 (let_declaration
-  "let" . (identifier) @definition.variable ","?)
+  "let" . (identifier) @local.definition.variable ","?)
 
diff --git a/queries/heex/locals.scm b/queries/heex/locals.scm
index 4371bc979..cfa239e5f 100644
--- a/queries/heex/locals.scm
+++ b/queries/heex/locals.scm
@@ -3,11 +3,11 @@
   (component_name)
   (slot_name)
   (tag_name)
-] @reference
+] @local.reference
 
 ; Create a new scope within each HEEx tag, component, and slot
 [
   (component)
   (slot)
   (tag)
-] @scope
+] @local.scope
diff --git a/queries/hoon/locals.scm b/queries/hoon/locals.scm
index 159783fd0..f8cb5f857 100644
--- a/queries/hoon/locals.scm
+++ b/queries/hoon/locals.scm
@@ -1,4 +1,4 @@
 (tisfasTall
-  name: (name) @definition.var)
+  name: (name) @local.definition.var)
   
-(name) @reference
+(name) @local.reference
diff --git a/queries/html/locals.scm b/queries/html/locals.scm
index 04d296a23..4e3325db8 100644
--- a/queries/html/locals.scm
+++ b/queries/html/locals.scm
@@ -1 +1 @@
-(element) @scope
+(element) @local.scope
diff --git a/queries/ispc/locals.scm b/queries/ispc/locals.scm
index 8eca18c67..e2e5a9663 100644
--- a/queries/ispc/locals.scm
+++ b/queries/ispc/locals.scm
@@ -1,17 +1,17 @@
 ; inherits: c
 
 (reference_declarator
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (type_parameter_declaration
-  (type_identifier) @definition.type)
-(template_declaration) @scope
+  (type_identifier) @local.definition.type)
+(template_declaration) @local.scope
 
 (template_function
-  name: (identifier) @definition.function) @scope
+  name: (identifier) @local.definition.function) @local.scope
 
 [
  (foreach_statement)
  (foreach_instance_statement)
  (unmasked_statement)
-] @scope
+] @local.scope
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index 1d59fee90..0e8758b6d 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -2,88 +2,88 @@
 
 ; declarations
 
-(program) @scope
+(program) @local.scope
 (class_declaration
-  body: (_) @scope)
+  body: (_) @local.scope)
 (record_declaration
-  body: (_) @scope)
+  body: (_) @local.scope)
 (enum_declaration
-  body: (_) @scope)
-(lambda_expression) @scope
-(enhanced_for_statement) @scope
+  body: (_) @local.scope)
+(lambda_expression) @local.scope
+(enhanced_for_statement) @local.scope
 
 ; block
 
-(block) @scope
+(block) @local.scope
 
 ; if/else
 
-(if_statement) @scope ; if+else
+(if_statement) @local.scope ; if+else
 (if_statement
-  consequence: (_) @scope) ; if body in case there are no braces
+  consequence: (_) @local.scope) ; if body in case there are no braces
 (if_statement
-  alternative: (_) @scope) ; else body in case there are no braces
+  alternative: (_) @local.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
+(try_statement) @local.scope ; covers try+catch, individual try and catch are covered by (block)
+(catch_clause) @local.scope ; needed because `Exception` variable
 
 ; loops
 
-(for_statement) @scope ; whole for_statement because loop iterator variable
+(for_statement) @local.scope ; whole for_statement because loop iterator variable
 (for_statement         ; "for" body in case there are no braces
-  body: (_) @scope)
+  body: (_) @local.scope)
 (do_statement
-  body: (_) @scope)
+  body: (_) @local.scope)
 (while_statement
-  body: (_) @scope)
+  body: (_) @local.scope)
 
 ; Functions
 
-(constructor_declaration) @scope
-(method_declaration) @scope
+(constructor_declaration) @local.scope
+(method_declaration) @local.scope
 
 ;; DEFINITIONS
 
 (package_declaration
-  (identifier) @definition.namespace)
+  (identifier) @local.definition.namespace)
 
 (class_declaration
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 (record_declaration
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 
 (enum_declaration
-  name: (identifier) @definition.enum)
+  name: (identifier) @local.definition.enum)
 
 (method_declaration
-  name: (identifier) @definition.method)
+  name: (identifier) @local.definition.method)
 
 (local_variable_declaration
   declarator: (variable_declarator
-                name: (identifier) @definition.var))
+                name: (identifier) @local.definition.var))
 (enhanced_for_statement ; for (var item : items) {
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (formal_parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 (catch_formal_parameter
-  name: (identifier) @definition.parameter)
-(inferred_parameters (identifier) @definition.parameter) ; (x,y) -> ...
+  name: (identifier) @local.definition.parameter)
+(inferred_parameters (identifier) @local.definition.parameter) ; (x,y) -> ...
 (lambda_expression
-    parameters: (identifier) @definition.parameter) ; x -> ...
+    parameters: (identifier) @local.definition.parameter) ; x -> ...
 
 ((scoped_identifier
-  (identifier) @definition.import)
- (#has-ancestor? @definition.import import_declaration))
+  (identifier) @local.definition.import)
+ (#has-ancestor? @local.definition.import import_declaration))
 
 (field_declaration
   declarator: (variable_declarator
-                name: (identifier) @definition.field))
+                name: (identifier) @local.definition.field))
 
 ;; REFERENCES
 
-(identifier) @reference
+(identifier) @local.reference
 
-(type_identifier) @reference
+(type_identifier) @local.reference
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index 098f18af6..278702dfc 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -7,45 +7,45 @@
 ;     this.quuz = "qux";
 ;   }
 (field_definition 
-  property: [(property_identifier) (private_property_identifier)] @definition.var)
+  property: [(property_identifier) (private_property_identifier)] @local.definition.var)
 
 ; this.foo = "bar"
 (assignment_expression
   left: (member_expression
     object: (this)
-    property: (property_identifier) @definition.var))
+    property: (property_identifier) @local.definition.var))
 
 (formal_parameters
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 ; function(arg = []) {
 (formal_parameters
   (assignment_pattern
-    left: (identifier) @definition.parameter))
+    left: (identifier) @local.definition.parameter))
 
 ; x => x
 (arrow_function
-  parameter: (identifier) @definition.parameter)
+  parameter: (identifier) @local.definition.parameter)
 
 ;; ({ a }) => null
 (formal_parameters
   (object_pattern
-    (shorthand_property_identifier_pattern) @definition.parameter))
+    (shorthand_property_identifier_pattern) @local.definition.parameter))
 
 ;; ({ a: b }) => null
 (formal_parameters
   (object_pattern
     (pair_pattern
-      value: (identifier) @definition.parameter)))
+      value: (identifier) @local.definition.parameter)))
 
 ;; ([ a ]) => null
 (formal_parameters
   (array_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
 
 (formal_parameters
   (rest_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
 
 ; Both methods are matched here.
 ;
@@ -54,10 +54,10 @@
 ;     baz(y) { y }
 ;   }
 (method_definition
-  ([(property_identifier) (private_property_identifier)] @definition.function)
+  ([(property_identifier) (private_property_identifier)] @local.definition.function)
    (#set! definition.var.scope parent))
 
 ; this.foo()
 (member_expression
   object: (this)
-  property: (property_identifier) @reference)
+  property: (property_identifier) @local.reference)
diff --git a/queries/jq/locals.scm b/queries/jq/locals.scm
index b655a5e10..369bcb4eb 100644
--- a/queries/jq/locals.scm
+++ b/queries/jq/locals.scm
@@ -1,7 +1,7 @@
-(funcdef (identifier) @definition.function)
+(funcdef (identifier) @local.definition.function)
 
-(funcdefargs (identifier) @definition.parameter)
+(funcdefargs (identifier) @local.definition.parameter)
 
-(funcname) @reference
+(funcname) @local.reference
 
-(index (identifier) @reference)
+(index (identifier) @local.reference)
diff --git a/queries/json/locals.scm b/queries/json/locals.scm
index 6609a2d22..aaeee38ca 100644
--- a/queries/json/locals.scm
+++ b/queries/json/locals.scm
@@ -1,4 +1,4 @@
 [
   (object)
   (array)
-] @scope
+] @local.scope
diff --git a/queries/jsonnet/locals.scm b/queries/jsonnet/locals.scm
index 5e1f1acc2..583c89e03 100644
--- a/queries/jsonnet/locals.scm
+++ b/queries/jsonnet/locals.scm
@@ -1,17 +1,17 @@
-(parenthesis) @scope
-(anonymous_function) @scope
-(object) @scope
-(field) @scope
-(local_bind) @scope
+(parenthesis) @local.scope
+(anonymous_function) @local.scope
+(object) @local.scope
+(field) @local.scope
+(local_bind) @local.scope
 
 (field
-  function: (fieldname (id)  @definition.function)
+  function: (fieldname (id)  @local.definition.function)
   (#set! "definition.function.scope" "parent"))
 
-(bind (id)  @definition.var)
-(bind function: (id)  @definition.function)
+(bind (id)  @local.definition.var)
+(bind function: (id)  @local.definition.function)
 
-(param (id) @definition.parameter)
+(param (id) @local.definition.parameter)
 
-(id) @reference
+(id) @local.reference
 ;(fieldname (id) (#is-not? local)) ; (#is-not?) not supported yet
diff --git a/queries/julia/locals.scm b/queries/julia/locals.scm
index 8540268cb..dd00f8a9b 100644
--- a/queries/julia/locals.scm
+++ b/queries/julia/locals.scm
@@ -1,71 +1,71 @@
 ;;; Variables
 (assignment
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 (assignment
   (tuple_expression
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 ;;; let/const bindings
 (let_binding
- (identifier) @definition.var)
+ (identifier) @local.definition.var)
 (let_binding
  (tuple_expression
-  (identifier) @definition.var))
+  (identifier) @local.definition.var))
 
 
 ;;; For bindings
 (for_binding
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 (for_binding
   (tuple_expression
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 
 ;;; Types
 
 (struct_definition
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 (abstract_definition
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 (abstract_definition
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 
 (type_parameter_list
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 ;;; Module imports
 
 (import_statement
-  (identifier) @definition.import)
+  (identifier) @local.definition.import)
 
 
 ;;; Parameters
 
 (parameter_list
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 (optional_parameter .
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 (slurp_parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (typed_parameter
-  parameter: (identifier) @definition.parameter
+  parameter: (identifier) @local.definition.parameter
   (_))
 
 (function_expression
- . (identifier) @definition.parameter) ;; Single parameter arrow function
+ . (identifier) @local.definition.parameter) ;; Single parameter arrow function
 
 
 ;;; Function/macro definitions
 
 (function_definition
-  name: (identifier) @definition.function) @scope
+  name: (identifier) @local.definition.function) @local.scope
 (short_function_definition
-  name: (identifier) @definition.function) @scope
+  name: (identifier) @local.definition.function) @local.scope
 (macro_definition 
-  name: (identifier) @definition.macro) @scope
+  name: (identifier) @local.definition.macro) @local.scope
 
-(identifier) @reference
+(identifier) @local.reference
 
 [
   (for_statement)
@@ -76,4 +76,4 @@
   (let_statement)
   (quote_statement)
   (do_clause)
-] @scope
+] @local.scope
diff --git a/queries/kconfig/locals.scm b/queries/kconfig/locals.scm
index 3727cd94f..cce3a7f0e 100644
--- a/queries/kconfig/locals.scm
+++ b/queries/kconfig/locals.scm
@@ -1,7 +1,7 @@
 [
   (symbol)
   (prompt)
-] @reference
+] @local.reference
 
 [
   (config)
@@ -10,8 +10,8 @@
   (comment_entry)
   (menu)
   (if)
-] @scope
+] @local.scope
 
-(type_definition (prompt) @definition.var)
-(type_definition (input_prompt (prompt) @definition.var))
-(type_definition_default (expression (prompt) @definition.var))
+(type_definition (prompt) @local.definition.var)
+(type_definition (input_prompt (prompt) @local.definition.var))
+(type_definition_default (expression (prompt) @local.definition.var))
diff --git a/queries/kdl/locals.scm b/queries/kdl/locals.scm
index 9190cab69..2c7ec5150 100644
--- a/queries/kdl/locals.scm
+++ b/queries/kdl/locals.scm
@@ -1,10 +1,10 @@
-(document) @scope
-(node (node_children) @scope)
-(node_children (node) @scope)
+(document) @local.scope
+(node (node_children) @local.scope)
+(node_children (node) @local.scope)
 
-(identifier) @reference
+(identifier) @local.reference
 
-(node_field) @definition.field
+(node_field) @local.definition.field
 
-(node (identifier) @definition.type)
-(type) @definition.type
+(node (identifier) @local.definition.type)
+(type) @local.definition.type
diff --git a/queries/kotlin/locals.scm b/queries/kotlin/locals.scm
index 0dea64618..0f95d65c6 100644
--- a/queries/kotlin/locals.scm
+++ b/queries/kotlin/locals.scm
@@ -1,23 +1,23 @@
 ;;; Imports
 
 (package_header
-	. (identifier) @definition.namespace)
+	. (identifier) @local.definition.namespace)
 
 (import_header
 	(identifier
-		(simple_identifier) @definition.import .)
+		(simple_identifier) @local.definition.import .)
 	(import_alias
-		(type_identifier) @definition.import)?)
+		(type_identifier) @local.definition.import)?)
 
 ;;; Functions
 
 (function_declaration
-	. (simple_identifier) @definition.function
+	. (simple_identifier) @local.definition.function
 	(#set! "definition.function.scope" "parent"))
 
 (class_body
 	(function_declaration
-		. (simple_identifier) @definition.method)
+		. (simple_identifier) @local.definition.method)
 	(#set! "definition.method.scope" "parent"))
 
 ;;; Variables
@@ -25,38 +25,38 @@
 (function_declaration
 	(function_value_parameters
 		(parameter
-			(simple_identifier) @definition.parameter)))
+			(simple_identifier) @local.definition.parameter)))
 
 (lambda_literal
 	(lambda_parameters
 		(variable_declaration
-			(simple_identifier) @definition.parameter)))
+			(simple_identifier) @local.definition.parameter)))
 
 (class_body
 	(property_declaration
 		(variable_declaration
-			(simple_identifier) @definition.field)))
+			(simple_identifier) @local.definition.field)))
 
 (class_declaration
 	(primary_constructor
 		(class_parameter
-			(simple_identifier) @definition.field)))
+			(simple_identifier) @local.definition.field)))
 
 (enum_class_body
 	(enum_entry
-		(simple_identifier) @definition.field))
+		(simple_identifier) @local.definition.field))
 
 (variable_declaration
-	(simple_identifier) @definition.var)
+	(simple_identifier) @local.definition.var)
 
 ;;; Types
 
 (class_declaration
-	(type_identifier) @definition.type
+	(type_identifier) @local.definition.type
 	(#set! "definition.type.scope" "parent"))
 
 (type_alias
-	(type_identifier) @definition.type
+	(type_identifier) @local.definition.type
 	(#set! "definition.type.scope" "parent"))
 
 ;;; Scopes
@@ -81,4 +81,4 @@
 	(enum_entry)
 
 	(interpolated_expression)
-] @scope
+] @local.scope
diff --git a/queries/lalrpop/locals.scm b/queries/lalrpop/locals.scm
index 7a30cce9f..bd44c897c 100644
--- a/queries/lalrpop/locals.scm
+++ b/queries/lalrpop/locals.scm
@@ -1,5 +1,5 @@
 (nonterminal_name 
-  (macro_id) @definition.function)
+  (macro_id) @local.definition.function)
 
 (nonterminal_name
-  (identifier) @definition.function)
+  (identifier) @local.definition.function)
diff --git a/queries/linkerscript/locals.scm b/queries/linkerscript/locals.scm
index 93ddb4357..7b45dcef2 100644
--- a/queries/linkerscript/locals.scm
+++ b/queries/linkerscript/locals.scm
@@ -4,12 +4,12 @@
  (symbol)
  (filename)
  (quoted_symbol)
-] @reference
+] @local.reference
 
 ; Definitions
 
-(output_section name: (symbol) @definition.var)
+(output_section name: (symbol) @local.definition.var)
 
-(memory_command name: (symbol) @definition.var)
+(memory_command name: (symbol) @local.definition.var)
 
-(phdrs_command name: (symbol) @definition.var)
+(phdrs_command name: (symbol) @local.definition.var)
diff --git a/queries/liquidsoap/locals.scm b/queries/liquidsoap/locals.scm
index 1d67bc55a..d4727114a 100644
--- a/queries/liquidsoap/locals.scm
+++ b/queries/liquidsoap/locals.scm
@@ -1,15 +1,15 @@
-[(anonymous_function) (binding) (def) (let)] @scope
+[(anonymous_function) (binding) (def) (let)] @local.scope
 
-(anonymous_argument (var) @definition.parameter)
-(labeled_argument label: (var) @definition.parameter)
+(anonymous_argument (var) @local.definition.parameter)
+(labeled_argument label: (var) @local.definition.parameter)
 
 (binding
-  defined: (var) @definition.var)
-(def defined: (var) @definition.var)
-(let defined: (var) @definition.var)
-(meth_pattern (var) @definition.var)
-(list_pattern (var) @definition.var)
-(tuple_pattern (var) @definition.var)
-(spread (var) @definition.var)
+  defined: (var) @local.definition.var)
+(def defined: (var) @local.definition.var)
+(let defined: (var) @local.definition.var)
+(meth_pattern (var) @local.definition.var)
+(list_pattern (var) @local.definition.var)
+(tuple_pattern (var) @local.definition.var)
+(spread (var) @local.definition.var)
 
-(var) @reference
+(var) @local.reference
diff --git a/queries/lua/locals.scm b/queries/lua/locals.scm
index ae6a6aa6e..ef927e517 100644
--- a/queries/lua/locals.scm
+++ b/queries/lua/locals.scm
@@ -9,43 +9,43 @@
   (for_statement)
   (function_declaration)
   (function_definition)
-] @scope
+] @local.scope
 
 ; Definitions
 
 (assignment_statement
   (variable_list
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 (assignment_statement
   (variable_list
-    (dot_index_expression . (_) @definition.associated (identifier) @definition.var)))
+    (dot_index_expression . (_) @local.definition.associated (identifier) @local.definition.var)))
 
 ((function_declaration
-  name: (identifier) @definition.function)
+  name: (identifier) @local.definition.function)
   (#set! definition.function.scope "parent"))
 
 ((function_declaration
   name: (dot_index_expression
-    . (_) @definition.associated (identifier) @definition.function))
+    . (_) @local.definition.associated (identifier) @local.definition.function))
   (#set! definition.method.scope "parent"))
 
 ((function_declaration
   name: (method_index_expression
-    . (_) @definition.associated (identifier) @definition.method))
+    . (_) @local.definition.associated (identifier) @local.definition.method))
   (#set! definition.method.scope "parent"))
 
 (for_generic_clause
   (variable_list
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 (for_numeric_clause
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
-(parameters (identifier) @definition.parameter)
+(parameters (identifier) @local.definition.parameter)
 
 ; References
 
 [
   (identifier)
-] @reference
+] @local.reference
diff --git a/queries/luau/locals.scm b/queries/luau/locals.scm
index b57ef5802..d0581b890 100644
--- a/queries/luau/locals.scm
+++ b/queries/luau/locals.scm
@@ -9,43 +9,43 @@
   (for_statement)
   (function_declaration)
   (function_definition)
-] @scope
+] @local.scope
 
 ; References
 
 [
   (identifier)
-] @reference
+] @local.reference
 
 ; Definitions
 
 (assignment_statement
   (variable_list
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 (assignment_statement
   (variable_list
-    (dot_index_expression . (_) @definition.associated (identifier) @definition.var)))
+    (dot_index_expression . (_) @local.definition.associated (identifier) @local.definition.var)))
 
 ((function_declaration
-  name: (identifier) @definition.function)
+  name: (identifier) @local.definition.function)
   (#set! definition.function.scope "parent"))
 
 ((function_declaration
   name: (dot_index_expression
-    . (_) @definition.associated (identifier) @definition.function))
+    . (_) @local.definition.associated (identifier) @local.definition.function))
   (#set! definition.method.scope "parent"))
 
 ((function_declaration
   name: (method_index_expression
-    . (_) @definition.associated (identifier) @definition.method))
+    . (_) @local.definition.associated (identifier) @local.definition.method))
   (#set! definition.method.scope "parent"))
 
 (for_generic_clause
   (variable_list
-    (identifier) @definition.var))
+    (identifier) @local.definition.var))
 
 (for_numeric_clause
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
-(parameter (identifier) @definition.parameter)
+(parameter (identifier) @local.definition.parameter)
diff --git a/queries/m68k/locals.scm b/queries/m68k/locals.scm
index e1a1ed31d..737352e87 100644
--- a/queries/m68k/locals.scm
+++ b/queries/m68k/locals.scm
@@ -1,22 +1,22 @@
 (macro_definition
-  name: (symbol) @definition.macro)
+  name: (symbol) @local.definition.macro)
 
 (symbol_assignment
-  name: (symbol) @definition.var)
+  name: (symbol) @local.definition.var)
 
 (label
-  name: (symbol) @definition.constant)
+  name: (symbol) @local.definition.constant)
 (symbol_definition
-  name: (symbol) @definition.constant)
+  name: (symbol) @local.definition.constant)
 (offset_definition
-  name: (symbol) @definition.constant)
+  name: (symbol) @local.definition.constant)
 (register_definition
-  name: (symbol) @definition.constant)
+  name: (symbol) @local.definition.constant)
 (register_list_definition
-  name: (symbol) @definition.constant)
+  name: (symbol) @local.definition.constant)
 
 (external_reference
   symbols: (symbol_list
-    (symbol) @definition.import))
+    (symbol) @local.definition.import))
 
-(symbol) @reference
+(symbol) @local.reference
diff --git a/queries/matlab/locals.scm b/queries/matlab/locals.scm
index a6ca6aeb5..ec2d8d52a 100644
--- a/queries/matlab/locals.scm
+++ b/queries/matlab/locals.scm
@@ -1,20 +1,20 @@
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
 (function_definition
-  name: (identifier) @definition.function
+  name: (identifier) @local.definition.function
   (function_arguments
-    (identifier)* @definition.parameter
-    ("," (identifier) @definition.parameter)*)?) @scope
+    (identifier)* @local.definition.parameter
+    ("," (identifier) @local.definition.parameter)*)?) @local.scope
 
-(assignment left: (identifier) @definition.var)
-(multioutput_variable (identifier) @definition.var)
+(assignment left: (identifier) @local.definition.var)
+(multioutput_variable (identifier) @local.definition.var)
 
-(iterator . (identifier) @definition.var)
-(lambda (arguments (identifier) @definition.parameter))
-(global_operator (identifier) @definition.var)
-(persistent_operator (identifier) @definition.var)
-(catch_clause (identifier) @definition)
+(iterator . (identifier) @local.definition.var)
+(lambda (arguments (identifier) @local.definition.parameter))
+(global_operator (identifier) @local.definition.var)
+(persistent_operator (identifier) @local.definition.var)
+(catch_clause (identifier) @local.definition)
diff --git a/queries/mlir/locals.scm b/queries/mlir/locals.scm
index 7d96fe9e3..8e569e8e6 100644
--- a/queries/mlir/locals.scm
+++ b/queries/mlir/locals.scm
@@ -1,7 +1,7 @@
-(region) @scope
+(region) @local.scope
 
-(func_arg_list (value_use) @definition.var)
-(block_arg_list (value_use) @definition.var)
-(op_result (value_use) @definition.var)
+(func_arg_list (value_use) @local.definition.var)
+(block_arg_list (value_use) @local.definition.var)
+(op_result (value_use) @local.definition.var)
 
-(value_use) @reference
+(value_use) @local.reference
diff --git a/queries/nim/locals.scm b/queries/nim/locals.scm
index 5b70bac10..4ca6f6d44 100644
--- a/queries/nim/locals.scm
+++ b/queries/nim/locals.scm
@@ -1,112 +1,112 @@
 
 ; ==============================================================================
-; @definition            ; various definitions
+; @local.definition            ; various definitions
 
 (block
   label: [
-    (identifier) @definition
-    (accent_quoted) @definition
+    (identifier) @local.definition
+    (accent_quoted) @local.definition
   ])
 
 ; ==============================================================================
-; @definition.constant   ; constants
+; @local.definition.constant   ; constants
 
 (const_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
         name: [
-          (identifier) @definition.constant
-          (accent_quoted) @definition.constant
-          (exported_symbol (identifier) @definition.constant)
-          (exported_symbol (accent_quoted) @definition.constant)
+          (identifier) @local.definition.constant
+          (accent_quoted) @local.definition.constant
+          (exported_symbol (identifier) @local.definition.constant)
+          (exported_symbol (accent_quoted) @local.definition.constant)
         ]))
-    type: (type_expression)? @definition.associated))
+    type: (type_expression)? @local.definition.associated))
 
 ; ==============================================================================
-; @definition.function   ; functions
+; @local.definition.function   ; functions
 
 (proc_declaration
   name: [
-    (identifier) @definition.function
-    (accent_quoted) @definition.function
-    (exported_symbol (identifier) @definition.function)
-    (exported_symbol (accent_quoted) @definition.function)
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol (identifier) @local.definition.function)
+    (exported_symbol (accent_quoted) @local.definition.function)
   ]
   (#set! "definition.function.scope" "parent"))
 
 (func_declaration
   name: [
-    (identifier) @definition.function
-    (accent_quoted) @definition.function
-    (exported_symbol (identifier) @definition.function)
-    (exported_symbol (accent_quoted) @definition.function)
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol (identifier) @local.definition.function)
+    (exported_symbol (accent_quoted) @local.definition.function)
   ]
   (#set! "definition.function.scope" "parent"))
 
 (iterator_declaration
   name: [
-    (identifier) @definition.function
-    (accent_quoted) @definition.function
-    (exported_symbol (identifier) @definition.function)
-    (exported_symbol (accent_quoted) @definition.function)
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol (identifier) @local.definition.function)
+    (exported_symbol (accent_quoted) @local.definition.function)
   ]
   (#set! "definition.function.scope" "parent"))
 
 (converter_declaration
   name: [
-    (identifier) @definition.function
-    (accent_quoted) @definition.function
-    (exported_symbol (identifier) @definition.function)
-    (exported_symbol (accent_quoted) @definition.function)
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol (identifier) @local.definition.function)
+    (exported_symbol (accent_quoted) @local.definition.function)
   ]
   (#set! "definition.function.scope" "parent"))
 
 ; ==============================================================================
-; @definition.method     ; methods
+; @local.definition.method     ; methods
 
 (method_declaration
   name: [
-    (identifier) @definition.method
-    (accent_quoted) @definition.method
-    (exported_symbol (identifier) @definition.method)
-    (exported_symbol (accent_quoted) @definition.method)
+    (identifier) @local.definition.method
+    (accent_quoted) @local.definition.method
+    (exported_symbol (identifier) @local.definition.method)
+    (exported_symbol (accent_quoted) @local.definition.method)
   ]
   (#set! "definition.method.scope" "parent"))
 
 ; ==============================================================================
-; @definition.var        ; variables
+; @local.definition.var        ; variables
 
 (var_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
         name: [
-          (identifier) @definition.var
-          (accent_quoted) @definition.var
-          (exported_symbol (identifier) @definition.var)
-          (exported_symbol (accent_quoted) @definition.var)
+          (identifier) @local.definition.var
+          (accent_quoted) @local.definition.var
+          (exported_symbol (identifier) @local.definition.var)
+          (exported_symbol (accent_quoted) @local.definition.var)
         ]))
-    type: (type_expression)? @definition.associated))
+    type: (type_expression)? @local.definition.associated))
 
 (let_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
         name: [
-          (identifier) @definition.var
-          (accent_quoted) @definition.var
-          (exported_symbol (identifier) @definition.var)
-          (exported_symbol (accent_quoted) @definition.var)
+          (identifier) @local.definition.var
+          (accent_quoted) @local.definition.var
+          (exported_symbol (identifier) @local.definition.var)
+          (exported_symbol (accent_quoted) @local.definition.var)
         ]))
-    type: (type_expression)? @definition.associated))
+    type: (type_expression)? @local.definition.associated))
 
 (for
   (symbol_declaration_list
     (symbol_declaration
       name: [
-        (identifier) @definition.var
-        (accent_quoted) @definition.var
+        (identifier) @local.definition.var
+        (accent_quoted) @local.definition.var
       ])))
 
 (try
@@ -114,84 +114,84 @@
     values: (expression_list
       (infix_expression
         right: [
-          (identifier) @definition.var
-          (accent_quoted) @definition.var
+          (identifier) @local.definition.var
+          (accent_quoted) @local.definition.var
         ]))))
 
 ; ==============================================================================
-; @definition.parameter  ; parameters
+; @local.definition.parameter  ; parameters
 
 (parameter_declaration
   (symbol_declaration_list
     (symbol_declaration
       name: [
-        (identifier) @definition.parameter
-        (accent_quoted) @definition.parameter
+        (identifier) @local.definition.parameter
+        (accent_quoted) @local.definition.parameter
       ]))
-  type: (type_expression)? @definition.associated)
+  type: (type_expression)? @local.definition.associated)
 
 (concept_declaration
   parameters:
     (parameter_list [
-      (identifier) @definition.parameter
-      (accent_quoted (identifier) @definition.parameter)
+      (identifier) @local.definition.parameter
+      (accent_quoted (identifier) @local.definition.parameter)
     ]))
 (var_parameter [
-  (identifier) @definition.parameter
-  (accent_quoted (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter
+  (accent_quoted (identifier) @local.definition.parameter)
 ])
 (type_parameter [
-  (identifier) @definition.parameter
-  (accent_quoted (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter
+  (accent_quoted (identifier) @local.definition.parameter)
 ])
 (static_parameter [
-  (identifier) @definition.parameter
-  (accent_quoted (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter
+  (accent_quoted (identifier) @local.definition.parameter)
 ])
 (ref_parameter [
-  (identifier) @definition.parameter
-  (accent_quoted (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter
+  (accent_quoted (identifier) @local.definition.parameter)
 ])
 (pointer_parameter [
-  (identifier) @definition.parameter
-  (accent_quoted (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter
+  (accent_quoted (identifier) @local.definition.parameter)
 ])
 
 ; ==============================================================================
-; @definition.macro      ; preprocessor macros
+; @local.definition.macro      ; preprocessor macros
 
 (template_declaration
   name: [
-    (identifier) @definition.macro
-    (accent_quoted) @definition.macro
-    (exported_symbol (identifier) @definition.macro)
-    (exported_symbol (accent_quoted) @definition.macro)
+    (identifier) @local.definition.macro
+    (accent_quoted) @local.definition.macro
+    (exported_symbol (identifier) @local.definition.macro)
+    (exported_symbol (accent_quoted) @local.definition.macro)
   ]
   (#set! "definition.macro.scope" "parent"))
 
 (macro_declaration
   name: [
-    (identifier) @definition.macro
-    (accent_quoted) @definition.macro
-    (exported_symbol (identifier) @definition.macro)
-    (exported_symbol (accent_quoted) @definition.macro)
+    (identifier) @local.definition.macro
+    (accent_quoted) @local.definition.macro
+    (exported_symbol (identifier) @local.definition.macro)
+    (exported_symbol (accent_quoted) @local.definition.macro)
   ]
   (#set! "definition.macro.scope" "parent"))
 
 ; ==============================================================================
-; @definition.type       ; types or classes
+; @local.definition.type       ; types or classes
 
 (type_declaration
   (type_symbol_declaration
     name: [
-      (identifier) @definition.type
-      (accent_quoted) @definition.type
-      (exported_symbol (identifier) @definition.type)
-      (exported_symbol (accent_quoted) @definition.type)
+      (identifier) @local.definition.type
+      (accent_quoted) @local.definition.type
+      (exported_symbol (identifier) @local.definition.type)
+      (exported_symbol (accent_quoted) @local.definition.type)
     ]))
 
 ; ==============================================================================
-; @definition.field      ; fields or properties
+; @local.definition.field      ; fields or properties
 
 ; object_declaration
 ; variant_declaration
@@ -202,78 +202,78 @@
   (symbol_declaration_list
     (symbol_declaration
       name: [
-        (identifier) @definition.field
-        (accent_quoted) @definition.field
-        (exported_symbol (identifier) @definition.field)
-        (exported_symbol (accent_quoted) @definition.field)
+        (identifier) @local.definition.field
+        (accent_quoted) @local.definition.field
+        (exported_symbol (identifier) @local.definition.field)
+        (exported_symbol (accent_quoted) @local.definition.field)
       ]))
-  type: (type_expression)? @definition.associated)
+  type: (type_expression)? @local.definition.associated)
 
 ; ==============================================================================
-; @definition.enum       ; enumerations
+; @local.definition.enum       ; enumerations
 
 (enum_declaration
   (enum_field_declaration
     (symbol_declaration
       name: [
-        (identifier) @definition.enum
-        (accent_quoted) @definition.enum
+        (identifier) @local.definition.enum
+        (accent_quoted) @local.definition.enum
       ])))
 
 ; ==============================================================================
-; @definition.namespace  ; modules or namespaces
-; @definition.import     ; imported names
+; @local.definition.namespace  ; modules or namespaces
+; @local.definition.import     ; imported names
 
 (import_statement
   (expression_list
-    (identifier) @definition.namespace))
+    (identifier) @local.definition.namespace))
 
 (import_statement
   (expression_list
     (infix_expression
       operator: "as"
-      right: (identifier) @definition.namespace)))
+      right: (identifier) @local.definition.namespace)))
 
 (import_statement
   (expression_list
     (infix_expression
       operator: (operator) @_operator
       right: [
-        (identifier) @definition.namespace
-        (array_construction (identifier) @definition.namespace)
+        (identifier) @local.definition.namespace
+        (array_construction (identifier) @local.definition.namespace)
       ]))
   (#eq? @_operator "/"))
 
 (import_from_statement
   module: (infix_expression
     operator: (operator) @_operator
-    right: (identifier) @definition.namespace)
+    right: (identifier) @local.definition.namespace)
   (expression_list [
-    (identifier) @definition.import
-    (accent_quoted) @definition.import
+    (identifier) @local.definition.import
+    (accent_quoted) @local.definition.import
   ])
   (#eq? @_operator "/"))
 
 ; ==============================================================================
-; @scope                 ; scope block
+; @local.scope                 ; scope block
 
 ; (when)
 ; NOTE: `when` does actually not create a scope
 
 (if
-  consequence: (statement_list) @scope
-  alternative: (elif_branch)* @scope
-  alternative: (else_branch)? @scope)
+  consequence: (statement_list) @local.scope
+  alternative: (elif_branch)* @local.scope
+  alternative: (else_branch)? @local.scope)
 
 (case
-  alternative: (of_branch)* @scope
-  alternative: (elif_branch)* @scope
-  alternative: (else_branch)? @scope)
+  alternative: (of_branch)* @local.scope
+  alternative: (elif_branch)* @local.scope
+  alternative: (else_branch)? @local.scope)
 
 (try
-  body: (statement_list) @scope
-  (except_branch) @scope
-  (finally_branch)? @scope)
+  body: (statement_list) @local.scope
+  (except_branch) @local.scope
+  (finally_branch)? @local.scope)
 
 [
   (for)
@@ -294,10 +294,10 @@
   (iterator_expression)
 
   (concept_declaration)
-] @scope
+] @local.scope
 
 ; ==============================================================================
-; @reference             ; identifier reference
+; @local.reference             ; identifier reference
 
-(identifier) @reference
-(accent_quoted) @reference
+(identifier) @local.reference
+(accent_quoted) @local.reference
diff --git a/queries/nix/locals.scm b/queries/nix/locals.scm
index 1fc06d8bd..1871f0404 100644
--- a/queries/nix/locals.scm
+++ b/queries/nix/locals.scm
@@ -1,15 +1,15 @@
 ; let bindings
-(let_expression (binding_set (binding . (attrpath) @definition.var))) @scope
+(let_expression (binding_set (binding . (attrpath) @local.definition.var))) @local.scope
 
 ; rec attrsets
-(rec_attrset_expression (binding_set (binding . (attrpath) @definition.field))) @scope
+(rec_attrset_expression (binding_set (binding . (attrpath) @local.definition.field))) @local.scope
 
 ; functions and parameters
 (function_expression . [
-    (identifier) @definition.parameter
-    (formals (formal . (identifier) @definition.parameter))
-]) @scope
-((formals) "@" (identifier) @definition.parameter) ; I couldn't get this to work properly inside the (function)
+    (identifier) @local.definition.parameter
+    (formals (formal . (identifier) @local.definition.parameter))
+]) @local.scope
+((formals) "@" (identifier) @local.definition.parameter) ; I couldn't get this to work properly inside the (function)
 
-(variable_expression (identifier) @reference)
-(inherited_attrs attr: (identifier) @reference)
+(variable_expression (identifier) @local.reference)
+(inherited_attrs attr: (identifier) @local.reference)
diff --git a/queries/ocaml/locals.scm b/queries/ocaml/locals.scm
index 1e543fd13..1230bd013 100644
--- a/queries/ocaml/locals.scm
+++ b/queries/ocaml/locals.scm
@@ -18,60 +18,60 @@
   (let_class_expression)
   (object_expression)
   (attribute_payload)
-] @scope
+] @local.scope
 
 ; Definitions
 ;------------
 
-(value_pattern) @definition.var
+(value_pattern) @local.definition.var
 
 (let_binding
-  pattern: (value_name) @definition.var
+  pattern: (value_name) @local.definition.var
   (#set! definition.var.scope "parent"))
 
 (let_binding
-  pattern: (tuple_pattern (value_name) @definition.var)
+  pattern: (tuple_pattern (value_name) @local.definition.var)
   (#set! definition.var.scope "parent"))
 
 (let_binding
-  pattern: (record_pattern (field_pattern (value_name) @definition.var))
+  pattern: (record_pattern (field_pattern (value_name) @local.definition.var))
   (#set! definition.var.scope "parent"))
 
-(external (value_name) @definition.var)
+(external (value_name) @local.definition.var)
 
-(type_binding (type_constructor) @definition.type)
+(type_binding (type_constructor) @local.definition.type)
 
-(abstract_type (type_constructor) @definition.type)
+(abstract_type (type_constructor) @local.definition.type)
 
-(method_definition (method_name) @definition.method)
+(method_definition (method_name) @local.definition.method)
 
 (module_binding
-  (module_name) @definition.namespace
+  (module_name) @local.definition.namespace
   (#set! definition.namespace.scope "parent"))
 
-(module_parameter (module_name) @definition.namespace)
+(module_parameter (module_name) @local.definition.namespace)
 
-(module_type_definition (module_type_name) @definition.type)
+(module_type_definition (module_type_name) @local.definition.type)
 
 ; References
 ;------------
 
 (value_path .
-  (value_name) @reference
+  (value_name) @local.reference
   (#set! reference.kind "var"))
 
 (type_constructor_path .
-  (type_constructor) @reference
+  (type_constructor) @local.reference
   (#set! reference.kind "type"))
 
 (method_invocation
-  (method_name) @reference
+  (method_name) @local.reference
   (#set! reference.kind "method"))
 
 (module_path .
-  (module_name) @reference
+  (module_name) @local.reference
   (#set! reference.kind "type"))
 
 (module_type_path .
-  (module_type_name) @reference
+  (module_type_name) @local.reference
   (#set! reference.kind "type"))
diff --git a/queries/odin/locals.scm b/queries/odin/locals.scm
index eb28ab952..845a08a48 100644
--- a/queries/odin/locals.scm
+++ b/queries/odin/locals.scm
@@ -4,36 +4,36 @@
   (block)
   (declaration)
   (statement)
-] @scope
+] @local.scope
 
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
-(package_declaration (identifier) @definition.namespace)
+(package_declaration (identifier) @local.definition.namespace)
 
-(import_declaration alias: (identifier) @definition.namespace)
+(import_declaration alias: (identifier) @local.definition.namespace)
 
-(procedure_declaration (identifier) @definition.function)
+(procedure_declaration (identifier) @local.definition.function)
 
-(struct_declaration (identifier) @definition.type "::")
+(struct_declaration (identifier) @local.definition.type "::")
 
-(enum_declaration (identifier) @definition.enum "::")
+(enum_declaration (identifier) @local.definition.enum "::")
 
-(union_declaration (identifier) @definition.type "::")
+(union_declaration (identifier) @local.definition.type "::")
 
-(variable_declaration (identifier) @definition.var ":=")
+(variable_declaration (identifier) @local.definition.var ":=")
 
-(const_declaration (identifier) @definition.constant "::")
+(const_declaration (identifier) @local.definition.constant "::")
 
-(const_type_declaration (identifier) @definition.type ":")
+(const_type_declaration (identifier) @local.definition.type ":")
 
-(parameter (identifier) @definition.parameter ":"?)
+(parameter (identifier) @local.definition.parameter ":"?)
 
-(default_parameter (identifier) @definition.parameter ":=")
+(default_parameter (identifier) @local.definition.parameter ":=")
 
-(field (identifier) @definition.field ":")
+(field (identifier) @local.definition.field ":")
 
-(label_statement (identifier) @definition ":")
+(label_statement (identifier) @local.definition ":")
diff --git a/queries/pascal/locals.scm b/queries/pascal/locals.scm
index b97cb096f..7147a1086 100644
--- a/queries/pascal/locals.scm
+++ b/queries/pascal/locals.scm
@@ -1,25 +1,25 @@
 
-(root)                                   @scope
+(root)                                   @local.scope
 
-(defProc)                                @scope
-(lambda)                                 @scope
-(interface   (declProc)                  @scope)
-(declSection (declProc)                  @scope)
-(declClass   (declProc)                  @scope)
-(declHelper  (declProc)                  @scope)
-(declProcRef)                            @scope
+(defProc)                                @local.scope
+(lambda)                                 @local.scope
+(interface   (declProc)                  @local.scope)
+(declSection (declProc)                  @local.scope)
+(declClass   (declProc)                  @local.scope)
+(declHelper  (declProc)                  @local.scope)
+(declProcRef)                            @local.scope
 
-(exceptionHandler)                       @scope
-(exceptionHandler variable: (identifier) @definition)
+(exceptionHandler)                       @local.scope
+(exceptionHandler variable: (identifier) @local.definition)
 
-(declArg          name: (identifier)     @definition)
-(declVar          name: (identifier)     @definition)
-(declConst        name: (identifier)     @definition)
-(declLabel        name: (identifier)     @definition)
-(genericArg       name: (identifier)     @definition)
-(declEnumValue    name: (identifier)     @definition)
-(declType         name: (identifier)     @definition)
-(declType         name: (genericTpl entity: (identifier)     @definition))
+(declArg          name: (identifier)     @local.definition)
+(declVar          name: (identifier)     @local.definition)
+(declConst        name: (identifier)     @local.definition)
+(declLabel        name: (identifier)     @local.definition)
+(genericArg       name: (identifier)     @local.definition)
+(declEnumValue    name: (identifier)     @local.definition)
+(declType         name: (identifier)     @local.definition)
+(declType         name: (genericTpl entity: (identifier)     @local.definition))
 
-(declProc         name: (identifier)     @definition)
-(identifier)                             @reference
+(declProc         name: (identifier)     @local.definition)
+(identifier)                             @local.reference
diff --git a/queries/php/locals.scm b/queries/php/locals.scm
index 0bb7a89db..c1403e40b 100644
--- a/queries/php/locals.scm
+++ b/queries/php/locals.scm
@@ -2,86 +2,86 @@
 ;-------
 
 ((class_declaration
-  name: (name) @definition.type) @scope
+  name: (name) @local.definition.type) @local.scope
     (#set! definition.type.scope "parent"))
 
 ((method_declaration
-  name: (name) @definition.method) @scope
+  name: (name) @local.definition.method) @local.scope
     (#set! definition.method.scope "parent"))
 
 ((function_definition
-  name: (name) @definition.function) @scope
+  name: (name) @local.definition.function) @local.scope
     (#set! definition.function.scope "parent"))
 
 (anonymous_function_creation_expression
   (anonymous_function_use_clause
     (variable_name
-      (name) @definition.var))) @scope
+      (name) @local.definition.var))) @local.scope
 
 ; Definitions
 ;------------
 
 (simple_parameter
   (variable_name
-    (name) @definition.var))
+    (name) @local.definition.var))
 
 (foreach_statement
   (pair
     (variable_name
-      (name) @definition.var)))
+      (name) @local.definition.var)))
 
 (foreach_statement
   (variable_name
-    (name) @reference
+    (name) @local.reference
       (#set! reference.kind "var"))
   (variable_name
-    (name) @definition.var))
+    (name) @local.definition.var))
 
 (property_declaration
   (property_element
     (variable_name
-      (name) @definition.field)))
+      (name) @local.definition.field)))
 
 (namespace_use_clause
   (qualified_name
-    (name) @definition.type))
+    (name) @local.definition.type))
 
 ; References
 ;------------
 
 (named_type
-  (name) @reference
+  (name) @local.reference
     (#set! reference.kind "type"))
 
 (named_type
-  (qualified_name) @reference
+  (qualified_name) @local.reference
     (#set! reference.kind "type"))
 
 (variable_name
-  (name) @reference
+  (name) @local.reference
     (#set! reference.kind "var"))
 
 (member_access_expression
-  name: (name) @reference
+  name: (name) @local.reference
     (#set! reference.kind "field"))
 
 (member_call_expression
-  name: (name) @reference
+  name: (name) @local.reference
     (#set! reference.kind "method"))
 
 (function_call_expression
   function: (qualified_name
-    (name) @reference
+    (name) @local.reference
       (#set! reference.kind "function")))
 
 (object_creation_expression
   (qualified_name
-    (name) @reference
+    (name) @local.reference
       (#set! reference.kind "type")))
 
 (scoped_call_expression
   scope: (qualified_name
-    (name) @reference
+    (name) @local.reference
       (#set! reference.kind "type"))
-  name: (name) @reference
+  name: (name) @local.reference
     (#set! reference.kind "method"))
diff --git a/queries/pony/locals.scm b/queries/pony/locals.scm
index b12f2a04c..033dcb257 100644
--- a/queries/pony/locals.scm
+++ b/queries/pony/locals.scm
@@ -31,61 +31,61 @@
 
   (array_literal)
   (object_literal) 
-] @scope
+] @local.scope
 
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
 (field
-  name: (identifier) @definition.field)
+  name: (identifier) @local.definition.field)
 
 (use_statement
-  (identifier) @definition.import)
+  (identifier) @local.definition.import)
 
 (constructor
-  (identifier) @definition.method)
+  (identifier) @local.definition.method)
 
 (method
-  (identifier) @definition.method)
+  (identifier) @local.definition.method)
 
 (behavior
-  (identifier) @definition.method)
+  (identifier) @local.definition.method)
 
 (actor_definition
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (type_alias
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (class_definition
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (primitive_definition
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (interface_definition
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (trait_definition
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (struct_definition
-  (identifier) @definition.type)
+  (identifier) @local.definition.type)
 
 (parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (variable_declaration
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (for_statement
   [
-    (identifier) @definition.var
-    (tuple_expression (identifier) @definition.var)
+    (identifier) @local.definition.var
+    (tuple_expression (identifier) @local.definition.var)
   ])
 
 (with_elem 
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
diff --git a/queries/properties/locals.scm b/queries/properties/locals.scm
index d9360c465..f70e953db 100644
--- a/queries/properties/locals.scm
+++ b/queries/properties/locals.scm
@@ -1,3 +1,3 @@
-(property (key) @definition)
+(property (key) @local.definition)
 
-(substitution (key) @reference)
+(substitution (key) @local.reference)
diff --git a/queries/puppet/locals.scm b/queries/puppet/locals.scm
index d9d903a46..cc13bc77b 100644
--- a/queries/puppet/locals.scm
+++ b/queries/puppet/locals.scm
@@ -13,7 +13,7 @@
   (case_statement)
   (hash)
   (array)
-] @scope
+] @local.scope
 
 ; References
 
@@ -21,26 +21,26 @@
   (identifier)
   (class_identifier)
   (variable) 
-] @reference
+] @local.reference
 
 ; Definitions
 
-(attribute [(identifier) (variable)] @definition.field)
+(attribute [(identifier) (variable)] @local.definition.field)
 
 (function_declaration
-  [(identifier) (class_identifier)] @definition.function)
+  [(identifier) (class_identifier)] @local.definition.function)
 
-(include_statement [(identifier) (class_identifier)] @definition.import)
+(include_statement [(identifier) (class_identifier)] @local.definition.import)
 
-(parameter (variable) @definition.parameter)
+(parameter (variable) @local.definition.parameter)
 
 (class_definition
-  [(identifier) (class_identifier)] @definition.type)
+  [(identifier) (class_identifier)] @local.definition.type)
 
 (node_definition
-  (node_name (identifier) @definition.type))
+  (node_name (identifier) @local.definition.type))
 
 (resource_declaration
-  [(identifier) (class_identifier)] @definition.type)
+  [(identifier) (class_identifier)] @local.definition.type)
 
-(assignment . (variable) @definition.var)
+(assignment . (variable) @local.definition.var)
diff --git a/queries/purescript/locals.scm b/queries/purescript/locals.scm
index d8219bf43..0d42125e2 100644
--- a/queries/purescript/locals.scm
+++ b/queries/purescript/locals.scm
@@ -1,4 +1,4 @@
-(signature name: (variable)) @definition.type
-(function name: (variable)) @definition.function
-(pat_name (variable)) @definition
-(exp_name (variable)) @reference
+(signature name: (variable)) @local.definition.type
+(function name: (variable)) @local.definition.function
+(pat_name (variable)) @local.definition
+(exp_name (variable)) @local.reference
diff --git a/queries/python/locals.scm b/queries/python/locals.scm
index 76a14fef5..40c57dd44 100644
--- a/queries/python/locals.scm
+++ b/queries/python/locals.scm
@@ -1,115 +1,115 @@
 ;;; Program structure
-(module) @scope
+(module) @local.scope
 
 (class_definition
   body: (block
           (expression_statement
             (assignment
-              left: (identifier) @definition.field)))) @scope
+              left: (identifier) @local.definition.field)))) @local.scope
 (class_definition
   body: (block
           (expression_statement
             (assignment
               left: (_ 
-                     (identifier) @definition.field))))) @scope
+                     (identifier) @local.definition.field))))) @local.scope
 
 ; Imports
 (aliased_import
-  alias: (identifier) @definition.import)
+  alias: (identifier) @local.definition.import)
 (import_statement
-  name: (dotted_name ((identifier) @definition.import)))
+  name: (dotted_name ((identifier) @local.definition.import)))
 (import_from_statement
-  name: (dotted_name ((identifier) @definition.import)))
+  name: (dotted_name ((identifier) @local.definition.import)))
 
 ; Function with parameters, defines parameters
 (parameters
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (default_parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (typed_parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (typed_default_parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 ; *args parameter
 (parameters
   (list_splat_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
 
 ; **kwargs parameter
 (parameters
   (dictionary_splat_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
 
 ; Function defines function and scope
 ((function_definition
-  name: (identifier) @definition.function) @scope
+  name: (identifier) @local.definition.function) @local.scope
  (#set! definition.function.scope "parent"))
 
 
 ((class_definition
-  name: (identifier) @definition.type) @scope
+  name: (identifier) @local.definition.type) @local.scope
  (#set! definition.type.scope "parent"))
 
 (class_definition
   body: (block
           (function_definition
-            name: (identifier) @definition.method)))
+            name: (identifier) @local.definition.method)))
 
 ;;; Loops
 ; not a scope!
 (for_statement
   left: (pattern_list
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 (for_statement
   left: (tuple_pattern
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 (for_statement
-  left: (identifier) @definition.var)
+  left: (identifier) @local.definition.var)
 
 ; not a scope!
-;(while_statement) @scope
+;(while_statement) @local.scope
 
 ; for in list comprehension
 (for_in_clause
-  left: (identifier) @definition.var)
+  left: (identifier) @local.definition.var)
 (for_in_clause
   left: (tuple_pattern
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 (for_in_clause
   left: (pattern_list
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 
-(dictionary_comprehension) @scope
-(list_comprehension) @scope
-(set_comprehension) @scope
+(dictionary_comprehension) @local.scope
+(list_comprehension) @local.scope
+(set_comprehension) @local.scope
 
 ;;; Assignments
 
 (assignment
- left: (identifier) @definition.var)
+ left: (identifier) @local.definition.var)
 
 (assignment
  left: (pattern_list
-   (identifier) @definition.var))
+   (identifier) @local.definition.var))
 (assignment
  left: (tuple_pattern
-   (identifier) @definition.var))
+   (identifier) @local.definition.var))
 
 (assignment
  left: (attribute
    (identifier)
-   (identifier) @definition.field))
+   (identifier) @local.definition.field))
 
 ; Walrus operator  x := 1
 (named_expression
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (as_pattern 
-  alias: (as_pattern_target) @definition.var)
+  alias: (as_pattern_target) @local.definition.var)
 
 ;;; REFERENCES
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/ql/locals.scm b/queries/ql/locals.scm
index e5fcb1698..f9b1195ae 100644
--- a/queries/ql/locals.scm
+++ b/queries/ql/locals.scm
@@ -1,30 +1,30 @@
 ; SCOPES
-(module) @scope
-(dataclass) @scope
-(datatype) @scope
+(module) @local.scope
+(dataclass) @local.scope
+(datatype) @local.scope
 ;; TODO does not work
-;(classMember (body)  @scope)
-(memberPredicate (body)  @scope)
-(classlessPredicate (body)  @scope)
-(quantified (conjunction) @scope)
-(select) @scope
+;(classMember (body)  @local.scope)
+(memberPredicate (body)  @local.scope)
+(classlessPredicate (body)  @local.scope)
+(quantified (conjunction) @local.scope)
+(select) @local.scope
 
 ; DEFINITIONS
 
 ; module
-(module name: (moduleName) @definition.namespace)
+(module name: (moduleName) @local.definition.namespace)
 
 ; classes
-(dataclass name: (className) @definition.type)
-(datatype name: (className) @definition.type)
+(dataclass name: (className) @local.definition.type)
+(datatype name: (className) @local.definition.type)
 
 ; predicates
-(charpred (className) @definition.method)
-(memberPredicate name: (predicateName) @definition.method)
-(classlessPredicate name: (predicateName) @definition.function)
+(charpred (className) @local.definition.method)
+(memberPredicate name: (predicateName) @local.definition.method)
+(classlessPredicate name: (predicateName) @local.definition.function)
 
 ; variables
-(varDecl (varName (simpleId) @definition.var))
+(varDecl (varName (simpleId) @local.definition.var))
 
 ; REFERENCES
-(simpleId) @reference
+(simpleId) @local.reference
diff --git a/queries/query/locals.scm b/queries/query/locals.scm
index 29ab9fe0d..21d5fd7c9 100644
--- a/queries/query/locals.scm
+++ b/queries/query/locals.scm
@@ -1,15 +1,15 @@
-(program) @scope
-(program (named_node) @scope)
-(program (anonymous_node) @scope)
-(program (grouping) @scope)
+(program) @local.scope
+(program (named_node) @local.scope)
+(program (anonymous_node) @local.scope)
+(program (grouping) @local.scope)
 
-(identifier) @reference
+(identifier) @local.reference
 
 (named_node
-  (capture) @definition.var)
+  (capture) @local.definition.var)
 
 (anonymous_node
-  (capture) @definition.var)
+  (capture) @local.definition.var)
 
 (grouping
-  (capture) @definition.var)
+  (capture) @local.definition.var)
diff --git a/queries/r/locals.scm b/queries/r/locals.scm
index 394a23dfc..38977b7b7 100755
--- a/queries/r/locals.scm
+++ b/queries/r/locals.scm
@@ -1,11 +1,11 @@
 ; locals.scm
 
-(function_definition) @scope
+(function_definition) @local.scope
 
-(formal_parameters (identifier) @definition.parameter)
+(formal_parameters (identifier) @local.definition.parameter)
 
-(left_assignment name: (identifier) @definition)
-(equals_assignment name: (identifier) @definition)
-(right_assignment name: (identifier) @definition)
+(left_assignment name: (identifier) @local.definition)
+(equals_assignment name: (identifier) @local.definition)
+(right_assignment name: (identifier) @local.definition)
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/rasi/locals.scm b/queries/rasi/locals.scm
index a658e2477..b8e221252 100644
--- a/queries/rasi/locals.scm
+++ b/queries/rasi/locals.scm
@@ -1,5 +1,5 @@
-(rule_set (selectors (id_selector))) @scope
+(rule_set (selectors (id_selector))) @local.scope
 
-(block (declaration (property_name) @definition.var))
+(block (declaration (property_name) @local.definition.var))
 
-(reference_value name:(identifier) @reference)
+(reference_value name:(identifier) @local.reference)
diff --git a/queries/re2c/locals.scm b/queries/re2c/locals.scm
index 0a77995d5..eea1ede89 100644
--- a/queries/re2c/locals.scm
+++ b/queries/re2c/locals.scm
@@ -1 +1 @@
-(body) @scope
+(body) @local.scope
diff --git a/queries/ron/locals.scm b/queries/ron/locals.scm
index de90d35fd..62ccbf09f 100644
--- a/queries/ron/locals.scm
+++ b/queries/ron/locals.scm
@@ -1,12 +1,12 @@
-(source_file) @scope
-(source_file (array) @scope)
-(source_file (map) @scope)
-(source_file (struct) @scope)
-(source_file (tuple) @scope)
+(source_file) @local.scope
+(source_file (array) @local.scope)
+(source_file (map) @local.scope)
+(source_file (struct) @local.scope)
+(source_file (tuple) @local.scope)
 
-(identifier) @reference
+(identifier) @local.reference
 
-(struct_entry (identifier) @definition.field)
-(struct_entry (identifier) @definition.enum (enum_variant))
+(struct_entry (identifier) @local.definition.field)
+(struct_entry (identifier) @local.definition.enum (enum_variant))
 
-(struct (struct_name) @definition.type)
+(struct (struct_name) @local.definition.type)
diff --git a/queries/rst/locals.scm b/queries/rst/locals.scm
index bf8bd0417..3091064cb 100644
--- a/queries/rst/locals.scm
+++ b/queries/rst/locals.scm
@@ -1,32 +1,32 @@
 ;; Scopes
 
-(document) @scope
+(document) @local.scope
 
-(directive) @scope
+(directive) @local.scope
 
 ;; Definitions
 
-(title) @definition
+(title) @local.definition
 
 (substitution_definition
-  name: (substitution) @definition)
+  name: (substitution) @local.definition)
 
 (footnote
-  name: (label) @definition)
+  name: (label) @local.definition)
 
 (citation
-  name: (label) @definition)
+  name: (label) @local.definition)
 
 (target
-  name: (name) @definition)
+  name: (name) @local.definition)
 
 ; Inline targets
-(inline_target) @definition
+(inline_target) @local.definition
 
 ; The role directive can define a new role
 ((directive
   name: (type) @_type
-  body: (body (arguments) @definition))
+  body: (body (arguments) @local.definition))
  (#eq? @_type "role"))
 
 ;; References
@@ -37,4 +37,4 @@
  (citation_reference)
  (reference)
  (role)
-] @reference
+] @local.reference
diff --git a/queries/ruby/locals.scm b/queries/ruby/locals.scm
index dacc46994..f08dcd49f 100644
--- a/queries/ruby/locals.scm
+++ b/queries/ruby/locals.scm
@@ -21,35 +21,35 @@
 ; SOFTWARE.
 
 ;;; DECLARATIONS AND SCOPES
-(method) @scope
-(class) @scope
+(method) @local.scope
+(class) @local.scope
 
 [
  (block)
  (do_block) 
- ] @scope
+ ] @local.scope
 
-(identifier) @reference
-(constant) @reference
-(instance_variable) @reference
+(identifier) @local.reference
+(constant) @local.reference
+(instance_variable) @local.reference
 
-(module name: (constant) @definition.namespace)
-(class name: (constant) @definition.type)
-(method name: [(identifier) (constant)] @definition.function)
-(singleton_method name: [(identifier) (constant)] @definition.function)
+(module name: (constant) @local.definition.namespace)
+(class name: (constant) @local.definition.type)
+(method name: [(identifier) (constant)] @local.definition.function)
+(singleton_method name: [(identifier) (constant)] @local.definition.function)
 
-(method_parameters (identifier) @definition.var)
-(lambda_parameters (identifier) @definition.var)
-(block_parameters (identifier) @definition.var)
-(splat_parameter (identifier) @definition.var)
-(hash_splat_parameter (identifier) @definition.var)
-(optional_parameter name: (identifier) @definition.var)
-(destructured_parameter (identifier) @definition.var)
-(block_parameter name: (identifier) @definition.var)
-(keyword_parameter name: (identifier) @definition.var)
+(method_parameters (identifier) @local.definition.var)
+(lambda_parameters (identifier) @local.definition.var)
+(block_parameters (identifier) @local.definition.var)
+(splat_parameter (identifier) @local.definition.var)
+(hash_splat_parameter (identifier) @local.definition.var)
+(optional_parameter name: (identifier) @local.definition.var)
+(destructured_parameter (identifier) @local.definition.var)
+(block_parameter name: (identifier) @local.definition.var)
+(keyword_parameter name: (identifier) @local.definition.var)
 
-(assignment left: (_) @definition.var)
+(assignment left: (_) @local.definition.var)
 
-(left_assignment_list (identifier) @definition.var)
-(rest_assignment (identifier) @definition.var)
-(destructured_left_assignment (identifier) @definition.var)
+(left_assignment_list (identifier) @local.definition.var)
+(rest_assignment (identifier) @local.definition.var)
+(destructured_left_assignment (identifier) @local.definition.var)
diff --git a/queries/rust/locals.scm b/queries/rust/locals.scm
index c5f4c187e..24e2ffb0a 100644
--- a/queries/rust/locals.scm
+++ b/queries/rust/locals.scm
@@ -1,88 +1,88 @@
 ; Imports
 (extern_crate_declaration
-    name: (identifier) @definition.import)
+    name: (identifier) @local.definition.import)
 
 (use_declaration 
   argument: (scoped_identifier 
-              name: (identifier) @definition.import))  
+              name: (identifier) @local.definition.import))  
 
 (use_as_clause 
-  alias: (identifier) @definition.import)
+  alias: (identifier) @local.definition.import)
 
 (use_list
-    (identifier) @definition.import) ; use std::process::{Child, Command, Stdio};
+    (identifier) @local.definition.import) ; use std::process::{Child, Command, Stdio};
 
 ; Functions
 (function_item 
-    name: (identifier) @definition.function)
+    name: (identifier) @local.definition.function)
 
 (function_item 
-  name: (identifier) @definition.method
+  name: (identifier) @local.definition.method
   parameters: (parameters 
                 (self_parameter)))
 
 ; Variables
 (parameter 
-  pattern: (identifier) @definition.var) 
+  pattern: (identifier) @local.definition.var) 
 
 (let_declaration 
-  pattern: (identifier) @definition.var)
+  pattern: (identifier) @local.definition.var)
 
 (const_item 
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (tuple_pattern
-  (identifier) @definition.var) 
+  (identifier) @local.definition.var) 
 
 (let_condition
   pattern: (_
-             (identifier) @definition.var))
+             (identifier) @local.definition.var))
 
 (tuple_struct_pattern
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (closure_parameters
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (self_parameter
-  (self) @definition.var)
+  (self) @local.definition.var)
 
 (for_expression 
-  pattern: (identifier) @definition.var)
+  pattern: (identifier) @local.definition.var)
 
 ; Types
 (struct_item
-  name: (type_identifier) @definition.type)
+  name: (type_identifier) @local.definition.type)
 
 (constrained_type_parameter 
-  left: (type_identifier) @definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
+  left: (type_identifier) @local.definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
 
 (enum_item
-  name: (type_identifier) @definition.type)
+  name: (type_identifier) @local.definition.type)
 
 
 ; Fields
 (field_declaration
-  name: (field_identifier) @definition.field)
+  name: (field_identifier) @local.definition.field)
 
 (enum_variant
-  name: (identifier) @definition.field) 
+  name: (identifier) @local.definition.field) 
 
 ; References
-(identifier) @reference
-((type_identifier) @reference
+(identifier) @local.reference
+((type_identifier) @local.reference
                    (#set! reference.kind "type"))
-((field_identifier) @reference
+((field_identifier) @local.reference
                    (#set! reference.kind "field"))
 
 
 ; Macros
 (macro_definition
-  name: (identifier) @definition.macro)
+  name: (identifier) @local.definition.macro)
 
 ; Module
 (mod_item 
-  name: (identifier) @definition.namespace)
+  name: (identifier) @local.definition.namespace)
 
 ; Scopes
 [
@@ -99,5 +99,5 @@
  (struct_item)
  (enum_item)
  (impl_item)
-] @scope
+] @local.scope
 
diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index 9f81e2859..689b140b3 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -6,47 +6,47 @@
   (function_definition)
   (block)
   (for_expression)
-] @scope
+] @local.scope
 
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
 (function_declaration
-  name: (identifier) @definition.function)
+  name: (identifier) @local.definition.function)
 
 (function_definition
-  name: ((identifier) @definition.function)
+  name: ((identifier) @local.definition.function)
   (#set! definition.var.scope parent))
 
 (parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (class_parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (lambda_expression
-  parameters: (identifier) @definition.var)
+  parameters: (identifier) @local.definition.var)
 
 (binding
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (val_definition
-  pattern: (identifier) @definition.var)
+  pattern: (identifier) @local.definition.var)
 
 (var_definition
-  pattern: (identifier) @definition.var)
+  pattern: (identifier) @local.definition.var)
 
 (val_declaration
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (var_declaration
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (for_expression
   enumerators: (enumerators
     (enumerator
       (tuple_pattern
-        (identifier) @definition.var))))
+        (identifier) @local.definition.var))))
diff --git a/queries/smali/locals.scm b/queries/smali/locals.scm
index fcb3b631c..77852a21d 100644
--- a/queries/smali/locals.scm
+++ b/queries/smali/locals.scm
@@ -7,36 +7,36 @@
   (packed_switch_directive)
   (sparse_switch_directive)
   (subannotation_directive)
-] @scope
+] @local.scope
 
 [
   (identifier)
   (class_identifier)
   (label)
   (jmp_label)
-] @reference
+] @local.reference
 
 (enum_reference
-  (field_identifier) @definition.enum)
+  (field_identifier) @local.definition.enum)
 
 ((field_definition
   (access_modifiers) @_mod
-  (field_identifier) @definition.enum)
+  (field_identifier) @local.definition.enum)
   (#eq? @_mod "enum"))
 
 (field_definition
-  (field_identifier) @definition.field
-  (field_type) @definition.associated)
+  (field_identifier) @local.definition.field
+  (field_type) @local.definition.associated)
 
-(annotation_key) @definition.field
+(annotation_key) @local.definition.field
 
 (method_definition
-  (method_signature (method_identifier) @definition.method))
+  (method_signature (method_identifier) @local.definition.method))
 
-(param_identifier) @definition.parameter
+(param_identifier) @local.definition.parameter
 
 (annotation_directive
-  (class_identifier) @definition.type)
+  (class_identifier) @local.definition.type)
 
 (class_directive
-  (class_identifier) @definition.type)
+  (class_identifier) @local.definition.type)
diff --git a/queries/sparql/locals.scm b/queries/sparql/locals.scm
index 107aaeb75..ba157a4d5 100644
--- a/queries/sparql/locals.scm
+++ b/queries/sparql/locals.scm
@@ -1,8 +1,8 @@
-(group_graph_pattern (triples_block) @scope)
+(group_graph_pattern (triples_block) @local.scope)
 
-((sub_select (select_clause (var) @definition.var))
+((sub_select (select_clause (var) @local.definition.var))
  (#set! "definition.var.scope" "parent"))
-((select_query (select_clause (var) @definition.var))
+((select_query (select_clause (var) @local.definition.var))
  (#set! "definition.var.scope" "parent"))
 
-(var) @reference
+(var) @local.reference
diff --git a/queries/squirrel/locals.scm b/queries/squirrel/locals.scm
index 11486d1e4..3e3b9da3e 100644
--- a/queries/squirrel/locals.scm
+++ b/queries/squirrel/locals.scm
@@ -22,7 +22,7 @@
   (foreach_statement)
   (try_statement)
   (catch_statement)
-] @scope
+] @local.scope
 
 
 ; References
@@ -30,38 +30,38 @@
 [
   (identifier)
   (global_variable)
-] @reference
+] @local.reference
 
 ; Definitions
 
 (const_declaration
-  . (identifier) @definition.constant)
+  . (identifier) @local.definition.constant)
 
 (enum_declaration
-  . (identifier) @definition.enum)
+  . (identifier) @local.definition.enum)
 
 (member_declaration
-  (identifier) @definition.field 
+  (identifier) @local.definition.field 
   . "=")
 
 (table_slot
-  . (identifier) @definition.field
+  . (identifier) @local.definition.field
   . ["=" ":"])
 
 ((function_declaration
-  . (identifier) @definition.function)
-  (#not-has-ancestor? @definition.function member_declaration))
+  . (identifier) @local.definition.function)
+  (#not-has-ancestor? @local.definition.function member_declaration))
 
 (member_declaration
   (function_declaration
-    . (identifier) @definition.method))
+    . (identifier) @local.definition.method))
 
 (class_declaration
-  . (identifier) @definition.type)
+  . (identifier) @local.definition.type)
 
 (var_statement
-  "var" . (identifier) @definition.variable)
+  "var" . (identifier) @local.definition.variable)
 
 (local_declaration
-  (identifier) @definition.variable 
+  (identifier) @local.definition.variable 
   . "=")
diff --git a/queries/ssh_config/locals.scm b/queries/ssh_config/locals.scm
index d4ccbfdde..a3309a9a6 100644
--- a/queries/ssh_config/locals.scm
+++ b/queries/ssh_config/locals.scm
@@ -1,7 +1,7 @@
 (parameter
   keyword: "Tag"
-  argument: (string) @reference)
+  argument: (string) @local.reference)
 
 (condition
   criteria: "tagged"
-  argument: (pattern) @definition)
+  argument: (pattern) @local.definition)
diff --git a/queries/starlark/locals.scm b/queries/starlark/locals.scm
index ad7d89d2d..ff9af3803 100644
--- a/queries/starlark/locals.scm
+++ b/queries/starlark/locals.scm
@@ -1,85 +1,85 @@
 ;;; Program structure
-(module) @scope
+(module) @local.scope
 
 ; Function with parameters, defines parameters
 (parameters
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (default_parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (typed_parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 (typed_default_parameter
-  (identifier) @definition.parameter)
+  (identifier) @local.definition.parameter)
 
 ; *args parameter
 (parameters
   (list_splat_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
 
 ; **kwargs parameter
 (parameters
   (dictionary_splat_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
 
 ; Function defines function and scope
 ((function_definition
-  name: (identifier) @definition.function) @scope
+  name: (identifier) @local.definition.function) @local.scope
  (#set! definition.function.scope "parent"))
 
 ;;; Loops
 ; not a scope!
 (for_statement
   left: (pattern_list
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 (for_statement
   left: (tuple_pattern
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 (for_statement
-  left: (identifier) @definition.var)
+  left: (identifier) @local.definition.var)
 
 ; for in list comprehension
 (for_in_clause
-  left: (identifier) @definition.var)
+  left: (identifier) @local.definition.var)
 (for_in_clause
   left: (tuple_pattern
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 (for_in_clause
   left: (pattern_list
-          (identifier) @definition.var))
+          (identifier) @local.definition.var))
 
-(dictionary_comprehension) @scope
-(list_comprehension) @scope
-(set_comprehension) @scope
+(dictionary_comprehension) @local.scope
+(list_comprehension) @local.scope
+(set_comprehension) @local.scope
 
 ;;; Assignments
 
 (assignment
- left: (identifier) @definition.var)
+ left: (identifier) @local.definition.var)
 
 (assignment
  left: (pattern_list
-   (identifier) @definition.var))
+   (identifier) @local.definition.var))
 (assignment
  left: (tuple_pattern
-   (identifier) @definition.var))
+   (identifier) @local.definition.var))
 
 (assignment
  left: (attribute
    (identifier)
-   (identifier) @definition.field))
+   (identifier) @local.definition.field))
 
 ; Walrus operator  x := 1
 (named_expression
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (as_pattern 
-  alias: (as_pattern_target) @definition.var)
+  alias: (as_pattern_target) @local.definition.var)
 
 ;;; REFERENCES
-(identifier) @reference
+(identifier) @local.reference
 
 ;; Starlark-specific
 
@@ -87,5 +87,5 @@
 ((call
   function: (identifier) @_fn
   arguments: (argument_list
-    (string) @definition.import))
+    (string) @local.definition.import))
   (#eq? @_fn "load"))
diff --git a/queries/supercollider/locals.scm b/queries/supercollider/locals.scm
index f2238b478..d04677cae 100644
--- a/queries/supercollider/locals.scm
+++ b/queries/supercollider/locals.scm
@@ -4,24 +4,24 @@
 (code_block)
 (function_block)
 (control_structure)
-] @scope
+] @local.scope
 
 ; Definitions
 (argument 
-	name: (identifier) @definition.parameter
+	name: (identifier) @local.definition.parameter
 	(#set! "definition.var.scope" "local")
 ) 
 
 (variable_definition 
-	name: (variable (local_var (identifier) @definition.var
+	name: (variable (local_var (identifier) @local.definition.var
 	)))
 
 (variable_definition 
-	name: (variable (environment_var (identifier) @definition.var))
+	name: (variable (environment_var (identifier) @local.definition.var))
 	(#set! "definition.var.scope" "global"))
 
-(function_definition name: (variable) @definition.var
+(function_definition name: (variable) @local.definition.var
 	 (#set! "definition.var.scope" "parent")
 )
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/swift/locals.scm b/queries/swift/locals.scm
index dfe1c83b1..45d4f2f0a 100644
--- a/queries/swift/locals.scm
+++ b/queries/swift/locals.scm
@@ -1,5 +1,5 @@
-(import_declaration (identifier) @definition.import)
-(function_declaration name: (simple_identifier) @definition.function)
+(import_declaration (identifier) @local.definition.import)
+(function_declaration name: (simple_identifier) @local.definition.function)
 
 ; Scopes
 [
@@ -15,4 +15,4 @@
  (function_declaration)
  (class_declaration)
  (protocol_declaration)
-] @scope
+] @local.scope
diff --git a/queries/systemtap/locals.scm b/queries/systemtap/locals.scm
index 5d4447e52..15056808c 100644
--- a/queries/systemtap/locals.scm
+++ b/queries/systemtap/locals.scm
@@ -6,30 +6,30 @@
   (for_statement)
   (foreach_statement)
   (catch_clause)
-] @scope
+] @local.scope
 
 (init_declarator
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (array_declarator
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
 
 (function_definition
-  name: (identifier) @definition.function)
+  name: (identifier) @local.definition.function)
 
 (parameter
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (tuple_capture
-  (identifier) @definition.var)
+  (identifier) @local.definition.var)
 
 (catch_clause
-  parameter: (identifier) @definition.var)
+  parameter: (identifier) @local.definition.var)
 
 (assignment_expression
-  left: (identifier) @definition.var)
+  left: (identifier) @local.definition.var)
 
 (call_expression
-  function: (identifier) @reference)
+  function: (identifier) @local.reference)
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/t32/locals.scm b/queries/t32/locals.scm
index dc1f97fc2..bad645fdf 100644
--- a/queries/t32/locals.scm
+++ b/queries/t32/locals.scm
@@ -1,38 +1,38 @@
-(block) @scope
+(block) @local.scope
 
 ; Parameter definitions
 (parameter_declaration
   command: (identifier)
-  macro: (macro) @definition.parameter)
+  macro: (macro) @local.definition.parameter)
 
 ; Variable definitions
 (macro_definition
   command: (identifier)
-  macro: (macro) @definition.var)
+  macro: (macro) @local.definition.var)
 
 (command_expression
   command: (identifier)
   arguments: (argument_list
-    declarator: (trace32_hll_variable) @definition.var))
+    declarator: (trace32_hll_variable) @local.definition.var))
 
 ; Function definitions
 (subroutine_block
   command: (identifier)
-  subroutine: (identifier) @definition.function)
+  subroutine: (identifier) @local.definition.function)
 
 (labeled_expression
-  label: (identifier) @definition.function
+  label: (identifier) @local.definition.function
   (block))
 
 ; References
 (
   (subroutine_call_expression
     command: (identifier)
-    subroutine: (identifier) @reference)
+    subroutine: (identifier) @local.reference)
   (#set! reference.kind "function")
 )
 
 [
   (macro)
   (trace32_hll_variable)
-] @reference
+] @local.reference
diff --git a/queries/tablegen/locals.scm b/queries/tablegen/locals.scm
index 04602991c..f1404adb6 100644
--- a/queries/tablegen/locals.scm
+++ b/queries/tablegen/locals.scm
@@ -10,42 +10,42 @@
   (foreach)
   (if)
   (let)
-] @scope
+] @local.scope
 
 ; References
 
 [
   (var)
   (identifier)
-] @reference
+] @local.reference
 
 ; Definitions
 
 (instruction
-  (identifier) @definition.field)
+  (identifier) @local.definition.field)
 
 (let_instruction
-  (identifier) @definition.field)
+  (identifier) @local.definition.field)
 
 (include_directive
-  (string) @definition.import)
+  (string) @local.definition.import)
 
-(template_arg (identifier) @definition.parameter)
+(template_arg (identifier) @local.definition.parameter)
 
 (class
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 
 (multiclass
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 
 (def
-  name: (value (_) @definition.type))
+  name: (value (_) @local.definition.type))
 
 (defm
-  name: (value (_) @definition.type))
+  name: (value (_) @local.definition.type))
 
 (defset
-  name: (identifier) @definition.type)
+  name: (identifier) @local.definition.type)
 
 (def_var
-  name: (identifier) @definition.var)
+  name: (identifier) @local.definition.var)
diff --git a/queries/teal/locals.scm b/queries/teal/locals.scm
index 431e659a1..e26efc43e 100644
--- a/queries/teal/locals.scm
+++ b/queries/teal/locals.scm
@@ -1,23 +1,23 @@
 (var_declaration
   declarators: (var_declarators
-  (var (identifier)) @definition.var))
+  (var (identifier)) @local.definition.var))
 
 (var_assignment
   variables: (assignment_variables
-    (var (identifier) @definition.var) @definition.associated))
+    (var (identifier) @local.definition.var) @local.definition.associated))
 
-(arg name: (identifier) @definition.parameter)
+(arg name: (identifier) @local.definition.parameter)
 
-(anon_function) @scope
+(anon_function) @local.scope
 ((function_statement
-  (function_name) @definition.function) @scope)
+  (function_name) @local.definition.function) @local.scope)
 
-(program) @scope
-(if_statement) @scope
-(generic_for_statement (for_body) @scope)
-(numeric_for_statement (for_body) @scope)
-(repeat_statement) @scope
-(while_statement (while_body) @scope)
-(do_statement) @scope
+(program) @local.scope
+(if_statement) @local.scope
+(generic_for_statement (for_body) @local.scope)
+(numeric_for_statement (for_body) @local.scope)
+(repeat_statement) @local.scope
+(while_statement (while_body) @local.scope)
+(do_statement) @local.scope
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/thrift/locals.scm b/queries/thrift/locals.scm
index d95cc5da1..d1c4af9a1 100644
--- a/queries/thrift/locals.scm
+++ b/queries/thrift/locals.scm
@@ -3,49 +3,49 @@
 [
   (document)
   (definition)
-] @scope
+] @local.scope
 
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
-(annotation_identifier) @definition
+(annotation_identifier) @local.definition
 
-(const_definition (identifier) @definition.constant)
+(const_definition (identifier) @local.definition.constant)
 
 (enum_definition "enum"
-  . (identifier) @definition.enum
-  "{" (identifier) @definition.constant "}")
+  . (identifier) @local.definition.enum
+  "{" (identifier) @local.definition.constant "}")
 
 (senum_definition "senum"
-  . (identifier) @definition.enum)
+  . (identifier) @local.definition.enum)
 
-(field (identifier) @definition.field)
+(field (identifier) @local.definition.field)
 
-(function_definition (identifier) @definition.function)
+(function_definition (identifier) @local.definition.function)
 
 (namespace_declaration
   "namespace" (namespace_scope)
-  . (_) @definition.namespace
+  . (_) @local.definition.namespace
   (namespace_uri)?)
 
-(parameter (identifier) @definition.parameter)
+(parameter (identifier) @local.definition.parameter)
 
 (struct_definition
-  "struct" . (identifier) @definition.type)
+  "struct" . (identifier) @local.definition.type)
 
 (union_definition
-  "union" . (identifier) @definition.type)
+  "union" . (identifier) @local.definition.type)
 
 (exception_definition
-  "exception" . (identifier) @definition.type)
+  "exception" . (identifier) @local.definition.type)
 
 (service_definition
-  "service" . (identifier) @definition.type)
+  "service" . (identifier) @local.definition.type)
 
 (interaction_definition
-  "interaction" . (identifier) @definition.type)
+  "interaction" . (identifier) @local.definition.type)
 
-(typedef_identifier) @definition.type
+(typedef_identifier) @local.definition.type
diff --git a/queries/tiger/locals.scm b/queries/tiger/locals.scm
index 33ccd3c71..df26bb2a0 100644
--- a/queries/tiger/locals.scm
+++ b/queries/tiger/locals.scm
@@ -9,31 +9,31 @@
  (for_expression)
  (let_expression)
  (function_declaration)
-] @scope
+] @local.scope
 ; }}}
 
 ; Definitions {{{
 (type_declaration
-  name: (identifier) @definition.type
+  name: (identifier) @local.definition.type
   (#set! "definition.var.scope" "parent"))
 
 (parameters
-  name: (identifier) @definition.parameter)
+  name: (identifier) @local.definition.parameter)
 
 (function_declaration
-  name: (identifier) @definition.function
+  name: (identifier) @local.definition.function
   (#set! "definition.var.scope" "parent"))
 (primitive_declaration
-  name: (identifier) @definition.function
+  name: (identifier) @local.definition.function
   (#set! "definition.var.scope" "parent"))
 
 (variable_declaration
-  name: (identifier) @definition.var
+  name: (identifier) @local.definition.var
   (#set! "definition.var.scope" "parent"))
 ; }}}
 
 ; References {{{
-(identifier) @reference
+(identifier) @local.reference
 ; }}}
 
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tlaplus/locals.scm b/queries/tlaplus/locals.scm
index 81f774b27..fbb4abf97 100644
--- a/queries/tlaplus/locals.scm
+++ b/queries/tlaplus/locals.scm
@@ -12,45 +12,45 @@
   (set_filter)
   (set_map)
   (unbounded_quantification)
-] @scope
+] @local.scope
 
-(choose (identifier) @definition.parameter)
-(choose (tuple_of_identifiers (identifier) @definition.parameter))
-(constant_declaration (identifier) @definition.constant)
-(constant_declaration (operator_declaration name: (_) @definition.constant))
+(choose (identifier) @local.definition.parameter)
+(choose (tuple_of_identifiers (identifier) @local.definition.parameter))
+(constant_declaration (identifier) @local.definition.constant)
+(constant_declaration (operator_declaration name: (_) @local.definition.constant))
 (function_definition
-  name: (identifier) @definition.function
+  name: (identifier) @local.definition.function
   (#set! "definition.function.scope" "parent"))
-(lambda (identifier) @definition.parameter)
+(lambda (identifier) @local.definition.parameter)
 (module_definition
-  name: (_) @definition.import
+  name: (_) @local.definition.import
   (#set! "definition.import.scope" "parent"))
-(module_definition parameter: (identifier) @definition.parameter)
-(module_definition parameter: (operator_declaration name: (_) @definition.parameter))
+(module_definition parameter: (identifier) @local.definition.parameter)
+(module_definition parameter: (operator_declaration name: (_) @local.definition.parameter))
 (operator_definition
-  name: (_) @definition.macro
+  name: (_) @local.definition.macro
   (#set! "definition.macro.scope" "parent"))
-(operator_definition parameter: (identifier) @definition.parameter)
-(operator_definition parameter: (operator_declaration name: (_) @definition.parameter))
-(quantifier_bound (identifier) @definition.parameter)
-(quantifier_bound (tuple_of_identifiers (identifier) @definition.parameter))
-(unbounded_quantification (identifier) @definition.parameter)
-(variable_declaration (identifier) @definition.var)
+(operator_definition parameter: (identifier) @local.definition.parameter)
+(operator_definition parameter: (operator_declaration name: (_) @local.definition.parameter))
+(quantifier_bound (identifier) @local.definition.parameter)
+(quantifier_bound (tuple_of_identifiers (identifier) @local.definition.parameter))
+(unbounded_quantification (identifier) @local.definition.parameter)
+(variable_declaration (identifier) @local.definition.var)
 
 ; Proof scopes and definitions
 [
   (non_terminal_proof)
   (suffices_proof_step)
   (theorem)
-] @scope
+] @local.scope
 
-(assume_prove (new (identifier) @definition.parameter))
-(assume_prove (new (operator_declaration name: (_) @definition.parameter)))
-(assumption name: (identifier) @definition.constant)
-(pick_proof_step (identifier) @definition.parameter)
-(take_proof_step (identifier) @definition.parameter)
+(assume_prove (new (identifier) @local.definition.parameter))
+(assume_prove (new (operator_declaration name: (_) @local.definition.parameter)))
+(assumption name: (identifier) @local.definition.constant)
+(pick_proof_step (identifier) @local.definition.parameter)
+(take_proof_step (identifier) @local.definition.parameter)
 (theorem
-  name: (identifier) @definition.constant
+  name: (identifier) @local.definition.constant
   (#set! "definition.constant.scope" "parent"))
 
 ; PlusCal scopes and definitions
@@ -59,30 +59,30 @@
   (pcal_macro)
   (pcal_procedure)
   (pcal_with)
-] @scope
+] @local.scope
 
-(pcal_macro_decl parameter: (identifier) @definition.parameter)
-(pcal_proc_var_decl (identifier) @definition.parameter)
-(pcal_var_decl (identifier) @definition.var)
-(pcal_with (identifier) @definition.parameter)
+(pcal_macro_decl parameter: (identifier) @local.definition.parameter)
+(pcal_proc_var_decl (identifier) @local.definition.parameter)
+(pcal_var_decl (identifier) @local.definition.var)
+(pcal_with (identifier) @local.definition.parameter)
 
 ; Built-in PlusCal variables
 (pcal_algorithm_body
   [
-    (_ (identifier_ref) @definition.var)
-    (_ (_ (identifier_ref) @definition.var))
-    (_ (_ (_ (identifier_ref) @definition.var))) 
-    (_ (_ (_ (_ (identifier_ref) @definition.var))))
-    (_ (_ (_ (_ (_ (identifier_ref) @definition.var)))))
+    (_ (identifier_ref) @local.definition.var)
+    (_ (_ (identifier_ref) @local.definition.var))
+    (_ (_ (_ (identifier_ref) @local.definition.var))) 
+    (_ (_ (_ (_ (identifier_ref) @local.definition.var))))
+    (_ (_ (_ (_ (_ (identifier_ref) @local.definition.var)))))
   ]
-  (#any-of? @definition.var "self" "pc" "stack"))
+  (#any-of? @local.definition.var "self" "pc" "stack"))
 
 ; References
-(identifier_ref) @reference
-((prefix_op_symbol) @reference)
-(bound_prefix_op symbol: (_) @reference)
-((infix_op_symbol) @reference)
-(bound_infix_op symbol: (_) @reference)
-((postfix_op_symbol) @reference)
-(bound_postfix_op symbol: (_) @reference)
-(bound_nonfix_op symbol: (_) @reference)
+(identifier_ref) @local.reference
+((prefix_op_symbol) @local.reference)
+(bound_prefix_op symbol: (_) @local.reference)
+((infix_op_symbol) @local.reference)
+(bound_infix_op symbol: (_) @local.reference)
+((postfix_op_symbol) @local.reference)
+(bound_postfix_op symbol: (_) @local.reference)
+(bound_nonfix_op symbol: (_) @local.reference)
diff --git a/queries/toml/locals.scm b/queries/toml/locals.scm
index d3dda77b4..2ca4e5404 100644
--- a/queries/toml/locals.scm
+++ b/queries/toml/locals.scm
@@ -1,4 +1,4 @@
 [
   (table)
   (table_array_element)
-] @scope
+] @local.scope
diff --git a/queries/turtle/locals.scm b/queries/turtle/locals.scm
index e791f0bbd..db3455df8 100644
--- a/queries/turtle/locals.scm
+++ b/queries/turtle/locals.scm
@@ -1,12 +1,12 @@
-(turtle_doc) @scope
+(turtle_doc) @local.scope
 
 (subject
   [
     (prefixed_name)
     (iri_reference)
-  ] @definition.var)
+  ] @local.definition.var)
 
 [
   (prefixed_name)
   (iri_reference)
-] @reference
+] @local.reference
diff --git a/queries/typescript/locals.scm b/queries/typescript/locals.scm
index efbcaecaa..8addb1b27 100644
--- a/queries/typescript/locals.scm
+++ b/queries/typescript/locals.scm
@@ -1,27 +1,27 @@
 ; inherits: ecma
-(required_parameter (identifier) @definition)
-(optional_parameter (identifier) @definition)
+(required_parameter (identifier) @local.definition)
+(optional_parameter (identifier) @local.definition)
 
 ; x => x
 (arrow_function
-  parameter: (identifier) @definition.parameter)
+  parameter: (identifier) @local.definition.parameter)
 
 ;; ({ a }) => null
 (required_parameter
   (object_pattern
-    (shorthand_property_identifier_pattern) @definition.parameter))
+    (shorthand_property_identifier_pattern) @local.definition.parameter))
 
 ;; ({ a: b }) => null
 (required_parameter
   (object_pattern
     (pair_pattern
-      value: (identifier) @definition.parameter)))
+      value: (identifier) @local.definition.parameter)))
 
 ;; ([ a ]) => null
 (required_parameter
   (array_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
 
 (required_parameter
   (rest_pattern
-    (identifier) @definition.parameter))
+    (identifier) @local.definition.parameter))
diff --git a/queries/udev/locals.scm b/queries/udev/locals.scm
index 33714d157..f4923467c 100644
--- a/queries/udev/locals.scm
+++ b/queries/udev/locals.scm
@@ -2,23 +2,23 @@
 
 (assignment
   key: "LABEL"
-  (value (content) @definition))
+  (value (content) @local.definition))
 
 (assignment
   key: "GOTO"
-  (value (content) @reference))
+  (value (content) @local.reference))
 
 ;; env vars
 
 (assignment
   key: "ENV"
-  (env_var) @definition.var)
+  (env_var) @local.definition.var)
 
 (match
   key: "ENV"
-  (env_var) @reference)
+  (env_var) @local.reference)
 
-(var_sub (env_var) @reference)
+(var_sub (env_var) @local.reference)
 
 ;; misc
 
@@ -26,4 +26,4 @@
   (attribute)
   (kernel_param)
   (seclabel)
-] @reference
+] @local.reference
diff --git a/queries/ungrammar/locals.scm b/queries/ungrammar/locals.scm
index 9fd87e637..389d5c262 100644
--- a/queries/ungrammar/locals.scm
+++ b/queries/ungrammar/locals.scm
@@ -1,7 +1,7 @@
-(grammar) @scope
+(grammar) @local.scope
 
-(definition) @definition
+(definition) @local.definition
 
-(label_name) @definition.label
+(label_name) @local.definition.label
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/usd/locals.scm b/queries/usd/locals.scm
index 4e7e97b5f..89eb171d1 100644
--- a/queries/usd/locals.scm
+++ b/queries/usd/locals.scm
@@ -1,4 +1,4 @@
 [
   (block)
   (metadata)
-] @scope
+] @local.scope
diff --git a/queries/uxntal/locals.scm b/queries/uxntal/locals.scm
index 0a8ddee96..e31616223 100644
--- a/queries/uxntal/locals.scm
+++ b/queries/uxntal/locals.scm
@@ -5,18 +5,18 @@
   (macro)
   (memory_execution)
   (subroutine)
-] @scope
+] @local.scope
 
 ; References
 
-(identifier) @reference
+(identifier) @local.reference
 
 ; Definitions
 
 (label
   "@"
-  . (identifier) @definition.function)
+  . (identifier) @local.definition.function)
 
 (macro
   "%"
-  . (identifier) @definition.macro)
+  . (identifier) @local.definition.macro)
diff --git a/queries/v/locals.scm b/queries/v/locals.scm
index f0e08403a..03623a717 100644
--- a/queries/v/locals.scm
+++ b/queries/v/locals.scm
@@ -1,28 +1,28 @@
 ((function_declaration
-     name: (identifier) @definition.function)) ;@function
+     name: (identifier) @local.definition.function)) ;@function
 
 (var_declaration
   var_list: (expression_list
               (reference_expression
-                (identifier) @definition.var)))
+                (identifier) @local.definition.var)))
 
 ((function_declaration
-  name: (identifier) @definition.function))
+  name: (identifier) @local.definition.function))
 
-(const_declaration (const_definition name: (identifier) @definition.var))
+(const_declaration (const_definition name: (identifier) @local.definition.var))
 
-(identifier) @reference
+(identifier) @local.reference
 
-((call_expression name: (reference_expression (identifier)) @reference)
+((call_expression name: (reference_expression (identifier)) @local.reference)
  (#set! reference.kind "call"))
 
 ((call_expression
    name: (selector_expression
-                field: (reference_expression (identifier) @definition.function)))
+                field: (reference_expression (identifier) @local.definition.function)))
  (#set! reference.kind "call"))
 
-(source_file) @scope
-(function_declaration) @scope
-(if_expression) @scope
-(block) @scope
-(for_statement) @scope
+(source_file) @local.scope
+(function_declaration) @local.scope
+(if_expression) @local.scope
+(block) @local.scope
+(for_statement) @local.scope
diff --git a/queries/verilog/locals.scm b/queries/verilog/locals.scm
index 507ddea44..35b874ab4 100644
--- a/queries/verilog/locals.scm
+++ b/queries/verilog/locals.scm
@@ -6,56 +6,56 @@
   (function_declaration)
   (always_construct)
   (module_declaration)
-] @scope
+] @local.scope
 
 (data_declaration
  (list_of_variable_decl_assignments
   (variable_decl_assignment
-   (simple_identifier) @definition.var)))
+   (simple_identifier) @local.definition.var)))
 
 (genvar_initialization
  (genvar_identifier
-  (simple_identifier) @definition.var))
+  (simple_identifier) @local.definition.var))
 
 (for_initialization
  (for_variable_declaration
-  (simple_identifier) @definition.var))
+  (simple_identifier) @local.definition.var))
 
 (net_declaration
  (list_of_net_decl_assignments
   (net_decl_assignment
-   (simple_identifier) @definition.var)))
+   (simple_identifier) @local.definition.var)))
 
 (ansi_port_declaration
  (port_identifier
-  (simple_identifier) @definition.var))
+  (simple_identifier) @local.definition.var))
 
 (parameter_declaration
  (list_of_param_assignments
   (param_assignment
    (parameter_identifier
-    (simple_identifier) @definition.parameter))))
+    (simple_identifier) @local.definition.parameter))))
 
 (local_parameter_declaration
  (list_of_param_assignments
   (param_assignment
    (parameter_identifier
-    (simple_identifier) @definition.parameter))))
+    (simple_identifier) @local.definition.parameter))))
 
 ;; TODO: fixme
 ;(function_declaration
  ;(function_identifier
-  ;(simple_identifier) @definition.function))
+  ;(simple_identifier) @local.definition.function))
 
 (function_declaration
  (function_body_declaration
   (function_identifier
    (function_identifier
-    (simple_identifier) @definition.function))))
+    (simple_identifier) @local.definition.function))))
 
 (tf_port_item1
  (port_identifier
-  (simple_identifier) @definition.parameter))
+  (simple_identifier) @local.definition.parameter))
 
 ; too broad, now includes types etc
-(simple_identifier) @reference
+(simple_identifier) @local.reference
diff --git a/queries/vim/locals.scm b/queries/vim/locals.scm
index 11252b9f4..4ba551e40 100644
--- a/queries/vim/locals.scm
+++ b/queries/vim/locals.scm
@@ -1,10 +1,10 @@
 [
   (script_file)
   (function_definition)
-] @scope
+] @local.scope
 
-(function_declaration name: (identifier) @definition.function)
-(function_declaration parameters: (parameters (identifier) @definition.parameter))
-(let_statement [(scoped_identifier) (identifier)] @definition.var)
+(function_declaration name: (identifier) @local.definition.function)
+(function_declaration parameters: (parameters (identifier) @local.definition.parameter))
+(let_statement [(scoped_identifier) (identifier)] @local.definition.var)
 
-(identifier) @reference
+(identifier) @local.reference
diff --git a/queries/wing/locals.scm b/queries/wing/locals.scm
index a467939bd..c5515d15e 100644
--- a/queries/wing/locals.scm
+++ b/queries/wing/locals.scm
@@ -1,5 +1,5 @@
-(block) @scope
+(block) @local.scope
 (variable_definition_statement
-  name: (identifier) @definition)
+  name: (identifier) @local.definition)
 
 ; TODO: Missing "@local.reference" usage tuned for each relevant identifier location
diff --git a/queries/xcompose/locals.scm b/queries/xcompose/locals.scm
index bd42d5fea..365472da2 100644
--- a/queries/xcompose/locals.scm
+++ b/queries/xcompose/locals.scm
@@ -1,3 +1,3 @@
-(result (keysym) @definition)
+(result (keysym) @local.definition)
 
-(event (keysym) @reference)
+(event (keysym) @local.reference)
diff --git a/queries/xml/locals.scm b/queries/xml/locals.scm
index 05e162fbf..214b43818 100644
--- a/queries/xml/locals.scm
+++ b/queries/xml/locals.scm
@@ -1,25 +1,25 @@
 ;; tags
 
-(elementdecl (Name) @definition.type)
+(elementdecl (Name) @local.definition.type)
 
 (elementdecl
   (contentspec
-    (children (Name) @reference)))
+    (children (Name) @local.reference)))
 
-(AttlistDecl . (Name) @reference)
+(AttlistDecl . (Name) @local.reference)
 
-(STag (Name) @reference)
-(ETag (Name) @reference)
-(EmptyElemTag (Name) @reference)
+(STag (Name) @local.reference)
+(ETag (Name) @local.reference)
+(EmptyElemTag (Name) @local.reference)
 
 ;; attributes
 
-(AttDef (Name) @definition.field)
+(AttDef (Name) @local.definition.field)
 
-(Attribute (Name) @reference)
+(Attribute (Name) @local.reference)
 
 ;; entities
 
-(GEDecl (Name) @definition.macro)
+(GEDecl (Name) @local.definition.macro)
 
-(EntityRef (Name) @reference)
+(EntityRef (Name) @local.reference)
diff --git a/queries/yaml/locals.scm b/queries/yaml/locals.scm
index 89167cf58..8a438434b 100644
--- a/queries/yaml/locals.scm
+++ b/queries/yaml/locals.scm
@@ -2,7 +2,7 @@
  (stream)
  (document)
  (block_node)
-] @scope
+] @local.scope
 
-(anchor_name) @definition
-(alias_name) @reference
+(anchor_name) @local.definition
+(alias_name) @local.reference
diff --git a/queries/yuck/locals.scm b/queries/yuck/locals.scm
index 677281b0b..063d59b1a 100644
--- a/queries/yuck/locals.scm
+++ b/queries/yuck/locals.scm
@@ -6,16 +6,16 @@
   (json_array)
   (json_object)
   (parenthesized_expression)
-] @scope
+] @local.scope
 
-(symbol) @reference
+(symbol) @local.reference
 
-(keyword) @definition.field
+(keyword) @local.definition.field
 
 (json_object
 	(simplexpr
-    (ident) @definition.field))
+    (ident) @local.definition.field))
 
 (ast_block
   (symbol)
-  (ident) @definition.type)
+  (ident) @local.definition.type)

From 17fae3f4a3c81d17c3b40dfa815cca77116b81d0 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 19 Aug 2023 19:28:45 +0300
Subject: [PATCH 0991/2704] feat(injections): add printf format strings

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++
 queries/awk/injections.scm      |  8 ++++
 queries/bash/injections.scm     | 25 ++++++++++++
 queries/c/injections.scm        | 67 +++++++++++++++++++++++++++++++++
 queries/go/injections.scm       | 14 +++++++
 queries/java/injections.scm     |  7 ++++
 queries/kotlin/injections.scm   |  8 ++++
 queries/lua/injections.scm      | 17 +++++++++
 queries/printf/highlights.scm   |  1 +
 queries/python/injections.scm   |  5 +++
 queries/teal/injections.scm     | 17 +++++++++
 13 files changed, 181 insertions(+)
 create mode 100644 queries/printf/highlights.scm

diff --git a/README.md b/README.md
index 6db64faee..a765566f3 100644
--- a/README.md
+++ b/README.md
@@ -328,6 +328,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pod](https://github.com/tree-sitter-perl/tree-sitter-pod) (maintained by @RabbiVeesh, @LeoNerd)
 - [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
+- [x] [printf](https://github.com/ObserverOfTime/tree-sitter-printf) (maintained by @ObserverOfTime)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
 - [x] [properties](https://github.com/ObserverOfTime/tree-sitter-properties) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index 7c92b385e..42d210d0f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -464,6 +464,9 @@
   "pony": {
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
   },
+  "printf": {
+    "revision": "8a3f07c1f620ae46d14873e5b7ee0d3e114c15e8"
+  },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index bfadf5239..d60553206 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1387,6 +1387,14 @@ list.pony = {
   maintainers = { "@amaanq", "@mfelsche" },
 }
 
+list.printf = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-printf",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.prisma = {
   install_info = {
     url = "https://github.com/victorhqc/tree-sitter-prisma",
diff --git a/queries/awk/injections.scm b/queries/awk/injections.scm
index bc35c8312..24db57d67 100644
--- a/queries/awk/injections.scm
+++ b/queries/awk/injections.scm
@@ -3,3 +3,11 @@
 
 ((regex) @injection.content
  (#set! injection.language "regex"))
+
+((print_statement
+  (exp_list . (string) @injection.content))
+ (#set! injection.language "printf"))
+
+((printf_statement
+  (exp_list . (string) @injection.content))
+ (#set! injection.language "printf"))
diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index fdb03cda5..516df3b3d 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -8,3 +8,28 @@
   (heredoc_body) @injection.content
   (heredoc_end) @injection.language)
  (#downcase! @injection.language))
+
+; printf 'format'
+((command
+  name: (command_name) @_command
+  . argument: [(string) (raw_string)] @injection.content)
+ (#eq? @_command "printf")
+ (#set! injection.language "printf"))
+
+; printf -v var 'format'
+((command
+  name: (command_name) @_command
+  argument: (word) @_arg
+  . (_) . argument: [(string) (raw_string)] @injection.content)
+ (#eq? @_command "printf")
+ (#eq? @_arg "-v")
+ (#set! injection.language "printf"))
+
+; printf -- 'format'
+((command
+  name: (command_name) @_command
+  argument: (word) @_arg
+  . argument: [(string) (raw_string)] @injection.content)
+ (#eq? @_command "printf")
+ (#eq? @_arg "--")
+ (#set! injection.language "printf"))
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 6b1fc3522..086dede9e 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -12,6 +12,73 @@
   (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
   (#set! injection.language "doxygen"))
 
+((call_expression
+  function: (identifier) @_function
+  arguments: (argument_list
+               . (string_literal (string_content) @injection.content)))
+ (#any-of? @_function "printf" "printf_s"
+                      "vprintf" "vprintf_s"
+                      "scanf" "scanf_s"
+                      "vscanf" "vscanf_s"
+                      "wprintf" "wprintf_s"
+                      "vwprintf" "vwprintf_s"
+                      "wscanf" "wscanf_s"
+                      "vwscanf" "vwscanf_s"
+                      "cscanf" "_cscanf"
+                      "printw"
+                      "scanw")
+ (#set! injection.language "printf"))
+
+((call_expression
+  function: (identifier) @_function
+  arguments: (argument_list
+               (_) . (string_literal (string_content) @injection.content)))
+ (#any-of? @_function "fprintf" "fprintf_s"
+                      "sprintf"
+                      "dprintf"
+                      "fscanf" "fscanf_s"
+                      "sscanf" "sscanf_s"
+                      "vsscanf" "vsscanf_s"
+                      "vfprintf" "vfprintf_s"
+                      "vsprintf"
+                      "vdprintf"
+                      "fwprintf" "fwprintf_s"
+                      "vfwprintf" "vfwprintf_s"
+                      "fwscanf" "fwscanf_s"
+                      "swscanf" "swscanf_s"
+                      "vswscanf" "vswscanf_s"
+                      "vfscanf" "vfscanf_s"
+                      "vfwscanf" "vfwscanf_s"
+                      "wprintw"
+                      "vw_printw" "vwprintw"
+                      "wscanw"
+                      "vw_scanw" "vwscanw")
+ (#set! injection.language "printf"))
+
+((call_expression
+  function: (identifier) @_function
+  arguments: (argument_list
+               (_) . (_) . (string_literal (string_content) @injection.content)))
+ (#any-of? @_function "sprintf_s"
+                      "snprintf" "snprintf_s"
+                      "vsprintf_s"
+                      "vsnprintf" "vsnprintf_s"
+                      "swprintf" "swprintf_s"
+                      "snwprintf_s"
+                      "vswprintf" "vswprintf_s"
+                      "vsnwprintf_s"
+                      "mvprintw"
+                      "mvscanw")
+ (#set! injection.language "printf"))
+
+((call_expression
+  function: (identifier) @_function
+  arguments: (argument_list
+               (_) . (_) . (_) . (string_literal (string_content) @injection.content)))
+ (#any-of? @_function "mvwprintw"
+                      "mvwscanw")
+ (#set! injection.language "printf"))
+
 ; TODO: add when asm is added
 ; (gnu_asm_expression assembly_code: (string_literal) @injection.content
 ; (#set! injection.language "asm"))
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index affc7a115..cf19ebac5 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -19,6 +19,20 @@
     (#offset! @injection.content 0 1 0 -1)
     (#set! injection.language "regex")))
 
+
 ((comment) @injection.content
   (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
   (#set! injection.language "re2c"))
+
+((call_expression
+  function: (selector_expression field: (field_identifier) @_method)
+  arguments: (argument_list . (interpreted_string_literal) @injection.content))
+ (#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf")
+ (#set! injection.language "printf"))
+
+((call_expression
+  function: (selector_expression field: (field_identifier) @_method)
+  arguments: (argument_list (_) . (interpreted_string_literal) @injection.content))
+ (#eq? @_method "Fprintf")
+ (#set! injection.language "printf"))
+
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index d79ffa6f1..8696c16ff 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -7,3 +7,10 @@
 ((block_comment) @injection.content
   (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
   (#set! injection.language "doxygen"))
+
+((method_invocation
+  name: (identifier) @_method
+  arguments: (argument_list
+               . (string_literal . (_) @injection.content)))
+ (#any-of? @_method "format" "printf")
+ (#set! injection.language "printf"))
diff --git a/queries/kotlin/injections.scm b/queries/kotlin/injections.scm
index 757259d10..8ac2eba60 100644
--- a/queries/kotlin/injections.scm
+++ b/queries/kotlin/injections.scm
@@ -34,3 +34,11 @@
     (value_arguments
       (value_argument
         (string_literal) @injection.content (#set! injection.language "regex")))))
+
+; "pi = %.2f".format(3.14159)
+((call_expression
+  (navigation_expression
+    (string_literal) @injection.content
+    (navigation_suffix (simple_identifier) @_method)))
+ (#eq? @_method "format")
+ (#set! injection.language "printf"))
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 57ea527d4..03e057dfe 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -135,6 +135,23 @@
                    (#set! injection.language "luap")
                    (#set! injection.include-children))))
 
+; string.format("pi = %.2f", 3.14159)
+((function_call
+  (dot_index_expression
+    field: (identifier) @_method)
+  arguments: (arguments
+               . (string (string_content) @injection.content)))
+ (#eq? @_method "format")
+ (#set! injection.language "printf"))
+
+; ("pi = %.2f"):format(3.14159)
+((function_call
+  (method_index_expression
+    table: (_ (string (string_content) @injection.content))
+    method: (identifier) @_method))
+ (#eq? @_method "format")
+ (#set! injection.language "printf"))
+
 (comment
    content: (_) @injection.content
   (#set! injection.language "comment"))
diff --git a/queries/printf/highlights.scm b/queries/printf/highlights.scm
new file mode 100644
index 000000000..db5ef9a3f
--- /dev/null
+++ b/queries/printf/highlights.scm
@@ -0,0 +1 @@
+(format) @character
diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index aa36a5af9..87d1c3478 100644
--- a/queries/python/injections.scm
+++ b/queries/python/injections.scm
@@ -6,5 +6,10 @@
   (#eq? @_re "re")
   (#set! injection.language "regex"))
 
+((binary_operator
+  left: (string (string_content) @injection.content)
+  operator: "%")
+ (#set! injection.language "printf"))
+
 ((comment) @injection.content
  (#set! injection.language "comment"))
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index 5eef08702..789826452 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -26,5 +26,22 @@
   (#set! injection.language "c")
 )
 
+; string.format('...')
+((function_call
+  (index
+    (identifier) @_base
+    key: (identifier) @_entry)
+  (arguments . (string) @injection.content))
+ (#eq? @_base "string")
+ (#eq? @_entry "format")
+ (#set! injection.language "printf"))
+
+; ('...'):format()
+((function_call
+  (method_index (string) @printf
+    key: (identifier) @_func))
+ (#eq? @_func "format")
+ (#set! injection.language "printf"))
+
 ((comment) @injection.content
  (#set! injection.language "comment"))

From 10dd49958c96f86c8247c715bd20a6681afc1d8b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 24 Dec 2023 12:52:21 +0100
Subject: [PATCH 0992/2704] chore(tests): consistent captures

---
 tests/query/highlights/bash/double-parens.sh  |   6 +-
 tests/query/highlights/clojure/test.clj       |  42 ++--
 tests/query/highlights/cpp/concepts.cpp       |  12 +-
 tests/query/highlights/cpp/test.cpp           |  20 +-
 tests/query/highlights/ecma/test.ts           |  18 +-
 tests/query/highlights/fusion/basic.fusion    |  62 ++---
 .../gitattributes/test.gitattributes          |  56 ++---
 tests/query/highlights/gleam/assert.gleam     |  20 +-
 tests/query/highlights/gleam/function.gleam   | 214 +++++++++---------
 tests/query/highlights/gleam/import.gleam     |  34 +--
 tests/query/highlights/gleam/pipe.gleam       |  26 +--
 tests/query/highlights/gleam/todo.gleam       |   8 +-
 tests/query/highlights/gleam/type.gleam       | 128 +++++------
 tests/query/highlights/hack/as-foreach.hack   |   4 +-
 .../highlights/hack/async-functions.hack      |   6 +-
 .../query/highlights/hack/attribute-type.hack |   6 +-
 tests/query/highlights/hack/generics.hack     |  26 +--
 .../query/highlights/hack/heredoc-dollar.hack |   2 +-
 tests/query/highlights/hack/shapes.hack       |  10 +-
 tests/query/highlights/hack/use.hack          |  28 +--
 tests/query/highlights/hack/using.hack        |   4 +-
 tests/query/highlights/hack/xhp.hack          |   6 +-
 tests/query/highlights/hocon/test.conf        |  66 +++---
 tests/query/highlights/julia/test.jl          |  40 ++--
 tests/query/highlights/lua/test.lua           |  14 +-
 tests/query/highlights/markdown/test.md       |  30 +--
 tests/query/highlights/pascal/test.pas        |  52 ++---
 .../highlights/python/pattern_matching.py     |  34 +--
 .../highlights/rust/super-crate-imports.rs    |   8 +-
 tests/query/highlights/solidity/test.sol      |  38 ++--
 tests/query/highlights/t32/comments.cmm       |   6 +-
 tests/query/highlights/t32/keywords.cmm       |  98 ++++----
 tests/query/highlights/t32/literals.cmm       |  32 +--
 tests/query/highlights/t32/var.cmm            |  90 ++++----
 tests/query/highlights/tiger/built-ins.tig    |  24 +-
 tests/query/highlights/tiger/comment.tig      |   6 +-
 tests/query/highlights/tiger/functions.tig    |  10 +-
 tests/query/highlights/tiger/identifiers.tig  |  36 +--
 tests/query/highlights/tiger/imports.tig      |   4 +-
 tests/query/highlights/tiger/keywords.tig     |  38 ++--
 tests/query/highlights/tiger/literals.tig     |   8 +-
 .../query/highlights/tiger/meta-variables.tig |  10 +-
 .../highlights/tiger/object-oriented.tig      |  24 +-
 tests/query/highlights/tiger/operators.tig    |  48 ++--
 tests/query/highlights/typescript/as.ts       |   6 +-
 tests/query/highlights/usd/prims.usda         |  80 +++----
 tests/query/highlights/usd/properties.usda    |  28 +--
 tests/query/highlights/usd/subLayers.usda     |   6 +-
 tests/query/highlights/wing/class.w           |  22 +-
 tests/query/highlights/wing/nested_method.w   |   6 +-
 tests/query/highlights/xhp-intro.hack         |  16 +-
 .../injections/cuda/macro-self-injection.cu   |   2 +-
 .../bash-on-run-instructions.dockerfile       |   4 +-
 .../injections/ecma/ecma-test-injections.js   |   8 +-
 .../injections/html/test-html-injections.html |  40 ++--
 .../svelte/test-svelte-injections.svelte      |  18 +-
 .../injections/vue/negative-assertions.vue    |   4 +-
 .../injections/vue/test-vue-injections.vue    |  41 ++--
 .../yaml/bash-on-github-actions.yml           |   6 +-
 .../yaml/promql-on-prometheus-rules.yaml      |   4 +-
 60 files changed, 872 insertions(+), 873 deletions(-)

diff --git a/tests/query/highlights/bash/double-parens.sh b/tests/query/highlights/bash/double-parens.sh
index 1f7aee4e4..8d841d170 100644
--- a/tests/query/highlights/bash/double-parens.sh
+++ b/tests/query/highlights/bash/double-parens.sh
@@ -1,6 +1,6 @@
 if (( $(tree-sitter parse test/Petalisp/**/*.lisp -q | wc -l) > 2 )); then
-#  ^ punctuation.special
-#                                                                  ^ punctuation.special
-#                                                           ^ punctuation.bracket
+#  ^ @punctuation.special
+#                                                                  ^ @punctuation.special
+#                                                           ^ @punctuation.bracket
    exit 1 
 fi
diff --git a/tests/query/highlights/clojure/test.clj b/tests/query/highlights/clojure/test.clj
index ab9e46d9a..f40e9b0c4 100644
--- a/tests/query/highlights/clojure/test.clj
+++ b/tests/query/highlights/clojure/test.clj
@@ -1,52 +1,52 @@
 (ns test {:clj-kondo/ignore true})
-; <- punctuation.bracket
-; ^ include
-;    ^ namespace
+; <- @punctuation.bracket
+; ^ @include
+;    ^ @namespace
 
  ; asdf
-;^^^^^^ comment
+;^^^^^^ @comment
 
  #_ abc
-;^^^^^^ comment
+;^^^^^^ @comment
 
 (func obj)
-;^^^^ function.call
-;     ^^^ variable
+;^^^^ @function.call
+;     ^^^ @variable
 
  #(+ % %1 %&)
-;^ punctuation.special
-;  ^ function.call
-;    ^ ^^ ^^ variable.builtin
+;^ @punctuation.special
+;  ^ @function.call
+;    ^ ^^ ^^ @variable.builtin
 
  &
-;^ parameter
+;^ @parameter
 
  ->abc
-;^^^^^ constructor
+;^^^^^ @constructor
 
  ->>abc
-;^^^^^^ variable
+;^^^^^^ @variable
 
  *1 *2 *3 *e
-;^^ ^^ ^^ ^^ variable.builtin
+;^^ ^^ ^^ ^^ @variable.builtin
 
 (.method)
-;^^^^^^^ method
+;^^^^^^^ @method
 
 (.-field)
-;^^^^^^^ field
+;^^^^^^^ @field
 
  Abc/method
-;^^^^^^^^^^ field
+;^^^^^^^^^^ @field
 
 (Abc/method)
-;^^^^^^^^^^ method
+;^^^^^^^^^^ @method
 
  Abc
-;^^^ type
+;^^^ @type
 
  abc.
-;^^^^ type
+;^^^^ @type
 
  ^abc
-;^ punctuation.special
+;^ @punctuation.special
diff --git a/tests/query/highlights/cpp/concepts.cpp b/tests/query/highlights/cpp/concepts.cpp
index 27aed7a70..6fe6af436 100644
--- a/tests/query/highlights/cpp/concepts.cpp
+++ b/tests/query/highlights/cpp/concepts.cpp
@@ -1,14 +1,14 @@
 
 template <class T, class U>
 concept Derived = std::is_base_of<U, T>::value;
-//  ^ keyword
-//       ^ type.definition
+//  ^ @keyword
+//       ^ @type.definition
 
 template<typename T>
 concept Hashable = requires(T a) {
-//                   ^ keyword
-//                            ^ parameter
-//                          ^ type
+//                   ^ @keyword
+//                            ^ @parameter
+//                          ^ @type
     { std::hash<T>{}(a) } -> std::convertible_to<std::size_t>;
  typename CommonType<T, U>; // CommonType<T, U> is valid and names a type
     { CommonType<T, U>{std::forward<T>(t)} }; 
@@ -18,5 +18,5 @@ concept Hashable = requires(T a) {
 
 template<typename T>
     requires requires (T x) { x + x; } // ad-hoc constraint, note keyword used twice
-//                 ^ keyword
+//                 ^ @keyword
 T add(T a, T b) { return a + b; }
diff --git a/tests/query/highlights/cpp/test.cpp b/tests/query/highlights/cpp/test.cpp
index 77e3be698..3f903a55f 100644
--- a/tests/query/highlights/cpp/test.cpp
+++ b/tests/query/highlights/cpp/test.cpp
@@ -1,19 +1,19 @@
 #include <iostream>
 #include <cstdlib>
-//    ^ include
-//       ^ string
+//    ^ @include
+//       ^ @string
 
 auto main( int argc, char** argv ) -> int
-// ^ type.builtin
-      //       ^ parameter
-      //    ^ type.builtin
-      //    ^ type.builtin
-      //                  ^ operator
+// ^ @type.builtin
+      //       ^ @parameter
+      //    ^ @type.builtin
+      //    ^ @type.builtin
+      //                  ^ @operator
 {
     std::cout << "Hello world!" << std::endl;
-    //  ^ punctuation.delimiter
+    //  ^ @punctuation.delimiter
     
     return EXIT_SUCCESS;
-    // ^ keyword.return
-    //      ^ constant
+    // ^ @keyword.return
+    //      ^ @constant
 }
diff --git a/tests/query/highlights/ecma/test.ts b/tests/query/highlights/ecma/test.ts
index d35cf8272..9ecd50c76 100644
--- a/tests/query/highlights/ecma/test.ts
+++ b/tests/query/highlights/ecma/test.ts
@@ -1,32 +1,32 @@
 class H {
   pub_field = "Hello";
-  //  ^ property
+  //  ^ @property
 
   #priv_field = "World!";
-  //   ^ property
+  //   ^ @property
 
   #private_method() {
-    //  ^ method
+    //  ^ @method
     return `${this.pub_field} -- ${this.#priv_field}`;
-    //                                      ^ property
-    //                ^ property
+    //                                      ^ @property
+    //                ^ @property
   }
 
   public_method() {
-    //  ^ method
+    //  ^ @method
     return this.#private_method();
-    //                ^ method.call
+    //                ^ @method.call
   }
 
   ok() {
     return this.public_method();
-    //                ^ method.call
+    //                ^ @method.call
   }
 }
 
 function doSomething(options) {
   const {
     enable: on,
-    //    ^ punctuation.delimiter
+    //    ^ @punctuation.delimiter
   } = options
 }
diff --git a/tests/query/highlights/fusion/basic.fusion b/tests/query/highlights/fusion/basic.fusion
index e4c4d6afc..e63c86eea 100644
--- a/tests/query/highlights/fusion/basic.fusion
+++ b/tests/query/highlights/fusion/basic.fusion
@@ -1,60 +1,60 @@
 include: SomeFile.fusion
-//<- include
-//       ^text.uri
+//<- @include
+//       ^ @text.uri
 
 namespace: ns = Neos.Fusion.Space
-//<- keyword
-//         ^namespace
-//            ^operator
-//              ^namespace
+//<- @keyword
+//         ^ @namespace
+//            ^ @operator
+//              ^ @namespace
 
 prototype(MyType) < prototype(ns:SuperType) {
 //<-keyword
-//       ^punctuation.bracket
-//        ^type
-//              ^punctuation.bracket
-//                ^operator
-//                            ^namespace
-//                                ^type
+//       ^ @punctuation.bracket
+//        ^ @type
+//              ^ @punctuation.bracket
+//                ^ @operator
+//                            ^ @namespace
+//                                ^ @type
 
   deleteProp >
-  //         ^operator
+  //         ^ @operator
 
   string = 'value'
-  //<- property
-  //     ^operator
-  //        ^string
+  //<- @property
+  //     ^ @operator
+  //        ^ @string
 
   number = 10.2
-  //       ^number
+  //       ^ @number
 
   null = null
-  //     ^constant.builtin
+  //     ^ @constant.builtin
 
   boolean = true
-  //        ^boolean
+  //        ^ @boolean
 
   property.inner = "value"
-  //<- property
-  //       ^property
+  //<- @property
+  //       ^ @property
 
   property.@meta = "value"
-  //<- property
-  //       ^attribute
+  //<- @property
+  //       ^ @attribute
 
   property.type = SomeType
-  //<- property
-  //              ^type
+  //<- @property
+  //              ^ @type
 
   property.aliasedType = ns:SomeType
-  //<- property
-  //                     ^namespace
-  //                        ^type
+  //<- @property
+  //                     ^ @namespace
+  //                        ^ @type
 
   property.fullQualifiedType = SomeNamespace:SomeType
-  //<- property
-  //                           ^namespace
-  //                                         ^type
+  //<- @property
+  //                           ^ @namespace
+  //                                         ^ @type
 
 }
 
diff --git a/tests/query/highlights/gitattributes/test.gitattributes b/tests/query/highlights/gitattributes/test.gitattributes
index 1d398db41..a16c233e6 100644
--- a/tests/query/highlights/gitattributes/test.gitattributes
+++ b/tests/query/highlights/gitattributes/test.gitattributes
@@ -1,37 +1,37 @@
 [attr]nodiff -diff -merge
-# <- preproc
-#     ^^^^^^ property
-#            ^ operator
-#             ^^^^ variable.builtin
-#                  ^ operator
-#                   ^^^^^ variable.builtin
+# <- @preproc
+#     ^^^^^^ @property
+#            ^ @operator
+#             ^^^^ @variable.builtin
+#                  ^ @operator
+#                   ^^^^^ @variable.builtin
 
 vendor/** linguist-vendored=true
-#     ^ punctuation.delimiter
-#      ^^ character.special
-#         ^^^^^^^^^^^^^^^^^ parameter
-#                          ^ operator
-#                           ^^^^ boolean
+#     ^ @punctuation.delimiter
+#      ^^ @character.special
+#         ^^^^^^^^^^^^^^^^^ @parameter
+#                          ^ @operator
+#                           ^^^^ @boolean
 
   [^._]-[[:lower:]] !something
-# ^ punctuation.bracket
-#  ^ operator
-#   ^^ string.special
-#     ^ punctuation.bracket
-#       ^ punctuation.bracket
-#        ^^^^^^^^^ constant
-#                 ^ punctuation.bracket
-#                   ^ operator
-#                    ^^^^^^^^^^ parameter
+# ^ @punctuation.bracket
+#  ^ @operator
+#   ^^ @string.special
+#     ^ @punctuation.bracket
+#       ^ @punctuation.bracket
+#        ^^^^^^^^^ @constant
+#                 ^ @punctuation.bracket
+#                   ^ @operator
+#                    ^^^^^^^^^^ @parameter
 
 "_\u4E00\t\56txt" encoding=UTF-16
-# <- punctuation.special
-# ^^^^^^ string.escape
-#       ^^ string.escape
-#         ^^^ string.escape
-#               ^ punctuation.special
-#                 ^^^^^^^^ variable.builtin
-#                         ^ operator
-#                          ^^^^^^ string
+# <- @punctuation.special
+# ^^^^^^ @string.escape
+#       ^^ @string.escape
+#         ^^^ @string.escape
+#               ^ @punctuation.special
+#                 ^^^^^^^^ @variable.builtin
+#                         ^ @operator
+#                          ^^^^^^ @string
 
 # vim:ft=gitattributes:
diff --git a/tests/query/highlights/gleam/assert.gleam b/tests/query/highlights/gleam/assert.gleam
index 3711339bb..d36716a3f 100644
--- a/tests/query/highlights/gleam/assert.gleam
+++ b/tests/query/highlights/gleam/assert.gleam
@@ -1,13 +1,13 @@
 pub fn main() {
   assert Ok(i) = parse_int("123")
-  // <- exception
-  //     ^^ constructor
-  //       ^ punctuation.bracket
-  //        ^ variable
-  //         ^ punctuation.bracket
-  //           ^ operator
-  //             ^^^^^^^^^ function.call
-  //                      ^ punctuation.bracket
-  //                       ^^^^^ string
-  //                            ^ punctuation.bracket
+  // <- @exception
+  //     ^^ @constructor
+  //       ^ @punctuation.bracket
+  //        ^ @variable
+  //         ^ @punctuation.bracket
+  //           ^ @operator
+  //             ^^^^^^^^^ @function.call
+  //                      ^ @punctuation.bracket
+  //                       ^^^^^ @string
+  //                            ^ @punctuation.bracket
 }
diff --git a/tests/query/highlights/gleam/function.gleam b/tests/query/highlights/gleam/function.gleam
index cf2fbf969..aed4879dc 100644
--- a/tests/query/highlights/gleam/function.gleam
+++ b/tests/query/highlights/gleam/function.gleam
@@ -1,127 +1,127 @@
 pub fn add(x: Int, y: Int) -> Int {
-// <- type.qualifier
-//  ^^ keyword.function
-//     ^^^ function
-//        ^ punctuation.bracket
-//         ^ parameter
-//          ^ punctuation.delimiter
-//            ^^^ type.builtin
-//               ^ punctuation.delimiter
-//                 ^ parameter
-//                  ^ punctuation.delimiter
-//                    ^^^ type.builtin
-//                       ^ punctuation.bracket
-//                         ^ punctuation.delimiter
-//                            ^^^ type.builtin
-//                                ^ punctuation.bracket
+// <- @type.qualifier
+//  ^^ @keyword.function
+//     ^^^ @function
+//        ^ @punctuation.bracket
+//         ^ @parameter
+//          ^ @punctuation.delimiter
+//            ^^^ @type.builtin
+//               ^ @punctuation.delimiter
+//                 ^ @parameter
+//                  ^ @punctuation.delimiter
+//                    ^^^ @type.builtin
+//                       ^ @punctuation.bracket
+//                         ^ @punctuation.delimiter
+//                            ^^^ @type.builtin
+//                                ^ @punctuation.bracket
 }
-// <- punctuation.bracket
+// <- @punctuation.bracket
 
 pub fn twice(f: fn(t) -> t, x: t) -> t {
-// <- type.qualifier
-//  ^ keyword.function
-//     ^^^^^ function
-//          ^ punctuation.bracket
-//           ^ parameter
-//            ^ punctuation.delimiter
-//              ^^ keyword.function
-//                ^ punctuation.bracket
-//                 ^ type
-//                  ^ punctuation.bracket
-//                    ^^ punctuation.delimiter
-//                       ^ type
-//                        ^ punctuation.delimiter
-//                          ^ parameter
-//                           ^ punctuation.delimiter
-//                             ^ type
-//                              ^ punctuation.bracket
-//                                ^^ punctuation.delimiter
-//                                   ^ type
-//                                     ^ punctuation.bracket
+// <- @type.qualifier
+//  ^ @keyword.function
+//     ^^^^^ @function
+//          ^ @punctuation.bracket
+//           ^ @parameter
+//            ^ @punctuation.delimiter
+//              ^^ @keyword.function
+//                ^ @punctuation.bracket
+//                 ^ @type
+//                  ^ @punctuation.bracket
+//                    ^^ @punctuation.delimiter
+//                       ^ @type
+//                        ^ @punctuation.delimiter
+//                          ^ @parameter
+//                           ^ @punctuation.delimiter
+//                             ^ @type
+//                              ^ @punctuation.bracket
+//                                ^^ @punctuation.delimiter
+//                                   ^ @type
+//                                     ^ @punctuation.bracket
 }
-// <- punctuation.bracket
+// <- @punctuation.bracket
 
 fn list_of_two(my_value: a) -> List(a) {
-// <- keyword.function
-// ^ function
-//            ^ punctuation.bracket
-//             ^ parameter
-//                     ^ punctuation.delimiter
-//                       ^ type
-//                        ^ punctuation.bracket
-//                          ^ punctuation.delimiter
-//                             ^^^^ type.builtin
-//                                 ^ punctuation.bracket
-//                                  ^ type
-//                                   ^ punctuation.bracket
-//                                     ^ punctuation.bracket
+// <- @keyword.function
+// ^ @function
+//            ^ @punctuation.bracket
+//             ^ @parameter
+//                     ^ @punctuation.delimiter
+//                       ^ @type
+//                        ^ @punctuation.bracket
+//                          ^ @punctuation.delimiter
+//                             ^^^^ @type.builtin
+//                                 ^ @punctuation.bracket
+//                                  ^ @type
+//                                   ^ @punctuation.bracket
+//                                     ^ @punctuation.bracket
 }
-// <- punctuation.bracket
+// <- @punctuation.bracket
 
 fn replace(
-// <- keyword.function
-// ^^^^^^^ function
-//        ^ punctuation.bracket
+// <- @keyword.function
+// ^^^^^^^ @function
+//        ^ @punctuation.bracket
   in string: String,
-  // <- label
-  // ^^^^^^ parameter
-  //       ^ punctuation.delimiter
-  //         ^^^^^^ type.builtin
-  //               ^ punctuation.delimiter
+  // <- @label
+  // ^^^^^^ @parameter
+  //       ^ @punctuation.delimiter
+  //         ^^^^^^ @type.builtin
+  //               ^ @punctuation.delimiter
   each pattern: String,
-  // <- label
-  //   ^^^^^^^ parameter
-  //          ^ punctuation.delimiter
-  //            ^^^^^^ type.builtin
-  //                  ^ punctuation.delimiter
+  // <- @label
+  //   ^^^^^^^ @parameter
+  //          ^ @punctuation.delimiter
+  //            ^^^^^^ @type.builtin
+  //                  ^ @punctuation.delimiter
   with replacement: String,
-  // <- label
-  //   ^^^^^^^^^^^ parameter
-  //              ^ punctuation.delimiter
-  //                ^^^^^^ type.builtin
-  //                      ^ punctuation.delimiter
+  // <- @label
+  //   ^^^^^^^^^^^ @parameter
+  //              ^ @punctuation.delimiter
+  //                ^^^^^^ @type.builtin
+  //                      ^ @punctuation.delimiter
 ) {
   replace(in: "A,B,C", each: ",", with: " ")
-  // <- function.call
-  //     ^ punctuation.bracket
-  //      ^^ label
-  //        ^ punctuation.delimiter
-  //          ^^^^^^^ string
-  //                 ^ punctuation.delimiter
-  //                   ^^^^ label
-  //                       ^ punctuation.delimiter
-  //                         ^^^ string
-  //                            ^ punctuation.delimiter
-  //                              ^^^^ label
-  //                                  ^ punctuation.delimiter
-  //                                    ^^^ string
-  //                                       ^ punctuation.bracket
+  // <- @function.call
+  //     ^ @punctuation.bracket
+  //      ^^ @label
+  //        ^ @punctuation.delimiter
+  //          ^^^^^^^ @string
+  //                 ^ @punctuation.delimiter
+  //                   ^^^^ @label
+  //                       ^ @punctuation.delimiter
+  //                         ^^^ @string
+  //                            ^ @punctuation.delimiter
+  //                              ^^^^ @label
+  //                                  ^ @punctuation.delimiter
+  //                                    ^^^ @string
+  //                                       ^ @punctuation.bracket
 }
-// <- punctuation.bracket
+// <- @punctuation.bracket
 
 pub external fn random_float() -> Float = "rand" "uniform"
-// <- type.qualifier
-//  ^^^^^^^^ type.qualifier
-//           ^^ keyword.function
-//              ^^^^^^^^^^^^ function
-//                          ^ punctuation.bracket
-//                           ^ punctuation.bracket
-//                             ^^ punctuation.delimiter
-//                                ^^^^^ type.builtin
-//                                      ^ operator
-//                                        ^^^^^^ namespace
-//                                               ^^^^^^^^^ function
+// <- @type.qualifier
+//  ^^^^^^^^ @type.qualifier
+//           ^^ @keyword.function
+//              ^^^^^^^^^^^^ @function
+//                          ^ @punctuation.bracket
+//                           ^ @punctuation.bracket
+//                             ^^ @punctuation.delimiter
+//                                ^^^^^ @type.builtin
+//                                      ^ @operator
+//                                        ^^^^^^ @namespace
+//                                               ^^^^^^^^^ @function
 
 pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
-// <- type.qualifier
-//  ^^^^^^^^ type.qualifier
-//           ^^ keyword.function
-//              ^^^^^^^ function
-//                     ^ punctuation.bracket
-//                      ^ type
-//                       ^ punctuation.bracket
-//                         ^^ punctuation.delimiter
-//                            ^ type
-//                              ^ operator
-//                                ^^^^^^^^^^^ namespace
-//                                            ^^^^^^^^^ function
+// <- @type.qualifier
+//  ^^^^^^^^ @type.qualifier
+//           ^^ @keyword.function
+//              ^^^^^^^ @function
+//                     ^ @punctuation.bracket
+//                      ^ @type
+//                       ^ @punctuation.bracket
+//                         ^^ @punctuation.delimiter
+//                            ^ @type
+//                              ^ @operator
+//                                ^^^^^^^^^^^ @namespace
+//                                            ^^^^^^^^^ @function
diff --git a/tests/query/highlights/gleam/import.gleam b/tests/query/highlights/gleam/import.gleam
index c48b38199..3ee141513 100644
--- a/tests/query/highlights/gleam/import.gleam
+++ b/tests/query/highlights/gleam/import.gleam
@@ -1,22 +1,22 @@
 import gleam/io
-// <- include
-//     ^ namespace
-//          ^ operator
-//           ^ namespace
+// <- @include
+//     ^ @namespace
+//          ^ @operator
+//           ^ @namespace
 
 import cat as kitten
-// <- include
-//     ^ namespace
-//         ^ keyword
-//            ^ namespace
+// <- @include
+//     ^ @namespace
+//         ^ @keyword
+//            ^ @namespace
 
 import animal/cat.{Cat, stroke}
-// <- include
-//     ^ namespace
-//           ^ operator
-//               ^ punctuation.delimiter
-//                ^ punctuation.bracket
-//                 ^^^ type
-//                    ^ punctuation.delimiter
-//                      ^^^^^^ function
-//                            ^ punctuation.bracket
+// <- @include
+//     ^ @namespace
+//           ^ @operator
+//               ^ @punctuation.delimiter
+//                ^ @punctuation.bracket
+//                 ^^^ @type
+//                    ^ @punctuation.delimiter
+//                      ^^^^^^ @function
+//                            ^ @punctuation.bracket
diff --git a/tests/query/highlights/gleam/pipe.gleam b/tests/query/highlights/gleam/pipe.gleam
index d0341217b..c696b0227 100644
--- a/tests/query/highlights/gleam/pipe.gleam
+++ b/tests/query/highlights/gleam/pipe.gleam
@@ -1,18 +1,18 @@
 pub fn run() {
   1
-  // <- number
+  // <- @number
   |> add(_, 2)
-  // <- operator
-  // ^^^ function.call
-  //    ^ punctuation.bracket
-  //     ^ comment
-  //      ^ punctuation.delimiter
-  //        ^ number
-  //         ^ punctuation.bracket
+  // <- @operator
+  // ^^^ @function.call
+  //    ^ @punctuation.bracket
+  //     ^ @comment
+  //      ^ @punctuation.delimiter
+  //        ^ @number
+  //         ^ @punctuation.bracket
   |> add(3)
-  // <- operator
-  // ^^^ function.call
-  //    ^ punctuation.bracket
-  //     ^ number
-  //      ^ punctuation.bracket
+  // <- @operator
+  // ^^^ @function.call
+  //    ^ @punctuation.bracket
+  //     ^ @number
+  //      ^ @punctuation.bracket
 }
diff --git a/tests/query/highlights/gleam/todo.gleam b/tests/query/highlights/gleam/todo.gleam
index 27038bb73..b7384ecbd 100644
--- a/tests/query/highlights/gleam/todo.gleam
+++ b/tests/query/highlights/gleam/todo.gleam
@@ -1,7 +1,7 @@
 fn favourite_number() -> Int {
   todo("We're going to decide which number is best tomorrow")
-  // <- keyword
-  //  ^ punctuation.bracket
-  //   ^ string
-  //                                                        ^ punctuation.bracket
+  // <- @keyword
+  //  ^ @punctuation.bracket
+  //   ^ @string
+  //                                                        ^ @punctuation.bracket
 }
diff --git a/tests/query/highlights/gleam/type.gleam b/tests/query/highlights/gleam/type.gleam
index b44aceadc..0905e1ea4 100644
--- a/tests/query/highlights/gleam/type.gleam
+++ b/tests/query/highlights/gleam/type.gleam
@@ -1,84 +1,84 @@
 pub type Cat {
-// <- type.qualifier
-//  ^^^^ keyword
-//       ^^^ type
-//           ^ punctuation.bracket
+// <- @type.qualifier
+//  ^^^^ @keyword
+//       ^^^ @type
+//           ^ @punctuation.bracket
   Cat(name: String, cuteness: Int)
-  // <- constructor
-  // ^ punctuation.bracket
-  //  ^^^^ property
-  //      ^ punctuation.delimiter
-  //        ^^^^^^ type.builtin
-  //              ^ punctuation.delimiter
-  //                ^^^^^^^^ property
-  //                        ^ punctuation.delimiter
-  //                          ^^^ type.builtin
-  //                             ^ punctuation.bracket
+  // <- @constructor
+  // ^ @punctuation.bracket
+  //  ^^^^ @property
+  //      ^ @punctuation.delimiter
+  //        ^^^^^^ @type.builtin
+  //              ^ @punctuation.delimiter
+  //                ^^^^^^^^ @property
+  //                        ^ @punctuation.delimiter
+  //                          ^^^ @type.builtin
+  //                             ^ @punctuation.bracket
 }
 
 fn cats() {
   Cat(name: "Nubi", cuteness: 2001)
-  // <- type
-  // ^ punctuation.bracket
-  //  ^^^^ property
-  //      ^ punctuation.delimiter
-  //        ^^^^^^ string
-  //              ^ punctuation.delimiter
-  //                ^^^^^^^^ property
-  //                        ^ punctuation.delimiter
-  //                          ^^^^ number
-  //                              ^ punctuation.bracket
+  // <- @type
+  // ^ @punctuation.bracket
+  //  ^^^^ @property
+  //      ^ @punctuation.delimiter
+  //        ^^^^^^ @string
+  //              ^ @punctuation.delimiter
+  //                ^^^^^^^^ @property
+  //                        ^ @punctuation.delimiter
+  //                          ^^^^ @number
+  //                              ^ @punctuation.bracket
   Cat("Ginny", 1950)
-  // <- constructor
-  // ^ punctuation.bracket
-  //  ^^^^^^^ string
-  //         ^ punctuation.delimiter
-  //           ^^^^ number
-  //               ^ punctuation.bracket
+  // <- @constructor
+  // ^ @punctuation.bracket
+  //  ^^^^^^^ @string
+  //         ^ @punctuation.delimiter
+  //           ^^^^ @number
+  //               ^ @punctuation.bracket
 }
 
 type Box(inner_type) {
-// <- keyword
-//   ^^^ type
-//      ^ punctuation.bracket
-//       ^^^^^^^^^^ type
-//                 ^ punctuation.bracket
-//                   ^ punctuation.bracket
+// <- @keyword
+//   ^^^ @type
+//      ^ @punctuation.bracket
+//       ^^^^^^^^^^ @type
+//                 ^ @punctuation.bracket
+//                   ^ @punctuation.bracket
   Box(inner: inner_type)
-  // <- constructor
-  // ^ punctuation.bracket
-  //  ^^^^^ property
-  //       ^ punctuation.delimiter
-  //         ^^^^^^^^^^ type
-  //                   ^ punctuation.bracket
+  // <- @constructor
+  // ^ @punctuation.bracket
+  //  ^^^^^ @property
+  //       ^ @punctuation.delimiter
+  //         ^^^^^^^^^^ @type
+  //                   ^ @punctuation.bracket
 }
 
 pub opaque type Counter {
-// <- type.qualifier
-//  ^^^^^^ type.qualifier
-//         ^^^^ keyword
-//              ^^^^^^^ type
-//                      ^ punctuation.bracket
+// <- @type.qualifier
+//  ^^^^^^ @type.qualifier
+//         ^^^^ @keyword
+//              ^^^^^^^ @type
+//                      ^ @punctuation.bracket
   Counter(value: Int)
 }
 
 pub fn have_birthday(person) {
   Person(..person, age: person.age + 1, is_happy: True)
-  // <- constructor
-  //    ^ punctuation.bracket
-  //     ^^ operator
-  //       ^^^^^^ variable
-  //             ^ punctuation.delimiter
-  //               ^^^ property
-  //                  ^ punctuation.delimiter
-  //                    ^^^^^^ variable
-  //                          ^ punctuation.delimiter
-  //                           ^^^ property
-  //                               ^ operator
-  //                                 ^ number
-  //                                  ^ punctuation.delimiter
-  //                                    ^^^^^^^^ property
-  //                                            ^ punctuation.delimiter
-  //                                              ^^^^ boolean
-  //                                                  ^ punctuation.bracket
+  // <- @constructor
+  //    ^ @punctuation.bracket
+  //     ^^ @operator
+  //       ^^^^^^ @variable
+  //             ^ @punctuation.delimiter
+  //               ^^^ @property
+  //                  ^ @punctuation.delimiter
+  //                    ^^^^^^ @variable
+  //                          ^ @punctuation.delimiter
+  //                           ^^^ @property
+  //                               ^ @operator
+  //                                 ^ @number
+  //                                  ^ @punctuation.delimiter
+  //                                    ^^^^^^^^ @property
+  //                                            ^ @punctuation.delimiter
+  //                                              ^^^^ @boolean
+  //                                                  ^ @punctuation.bracket
 }
diff --git a/tests/query/highlights/hack/as-foreach.hack b/tests/query/highlights/hack/as-foreach.hack
index 8969be8fc..d7a66875b 100644
--- a/tests/query/highlights/hack/as-foreach.hack
+++ b/tests/query/highlights/hack/as-foreach.hack
@@ -1,6 +1,6 @@
 foreach (($array as vec[]) as $item) {}
-// ^ repeat
-//                   ^ type
+// ^ @repeat
+//                   ^ @type
 
 # Our expectation test for the code below intentionally includes an ERROR.
 foreach ($array as vec[] as $item) {}
diff --git a/tests/query/highlights/hack/async-functions.hack b/tests/query/highlights/hack/async-functions.hack
index 4488c992d..41779d76d 100644
--- a/tests/query/highlights/hack/async-functions.hack
+++ b/tests/query/highlights/hack/async-functions.hack
@@ -1,8 +1,8 @@
 async function func0(): void {}
-//                        ^ type.builtin
+//                        ^ @type.builtin
 async function func1<T1 as int>() {}
-//                         ^ type.builtin
-//                      ^ keyword.operator
+//                         ^ @type.builtin
+//                      ^ @keyword.operator
 						
 
 async ($x) ==> $x + 1;
diff --git a/tests/query/highlights/hack/attribute-type.hack b/tests/query/highlights/hack/attribute-type.hack
index 5ab9eaa4b..0bd12df8c 100644
--- a/tests/query/highlights/hack/attribute-type.hack
+++ b/tests/query/highlights/hack/attribute-type.hack
@@ -2,13 +2,13 @@
 newtype T1 = ?shape(
 //     TODO: ?operator (? not captureable at the moment)
   ?'int' => int
-//       ^ operator
+//       ^ @operator
 );
 
 <<A3(1), A2(2,3,)>>
-//       ^ attribute
+//       ^ @attribute
 type T2 = (function(T1): string);
-//    ^ type
+//    ^ @type
 //          TODO: keyword.function (currently not in AST)
 
 <<A4(1), A5, A6(1,3,4)>>
diff --git a/tests/query/highlights/hack/generics.hack b/tests/query/highlights/hack/generics.hack
index 9582240b9..66b008aa4 100644
--- a/tests/query/highlights/hack/generics.hack
+++ b/tests/query/highlights/hack/generics.hack
@@ -1,24 +1,24 @@
 class Box<T> {
-  //      ^ type
-  //   ^ type
+  //      ^ @type
+  //   ^ @type
   protected T $data;
-  // ^ type.qualifier
-  //        ^ type
+  // ^ @type.qualifier
+  //        ^ @type
 
   public function __construct(T $data) {
-  //                          ^ type
-  //                             ^ parameter
-  //        ^ keyword.function
-  // ^ type.qualifier
-  //                    ^ method
+  //                          ^ @type
+  //                             ^ @parameter
+  //        ^ @keyword.function
+  // ^ @type.qualifier
+  //                    ^ @method
     $this->data = $data;
   }
 
   public function getData(): T {
-                // ^ method
-  // ^ type.qualifier
+                // ^ @method
+  // ^ @type.qualifier
     return $this->data;
-              // ^ operator
-          // ^ variable.builtin
+              // ^ @operator
+          // ^ @variable.builtin
   }
 }
diff --git a/tests/query/highlights/hack/heredoc-dollar.hack b/tests/query/highlights/hack/heredoc-dollar.hack
index 8034cc863..8ea247389 100644
--- a/tests/query/highlights/hack/heredoc-dollar.hack
+++ b/tests/query/highlights/hack/heredoc-dollar.hack
@@ -1,4 +1,4 @@
 <<<EOT
 	$('a') abc $(function{return;})
 EOT;
-// <- comment        ^ comment
+// <- @comment      ^ @comment
diff --git a/tests/query/highlights/hack/shapes.hack b/tests/query/highlights/hack/shapes.hack
index 0f6ab3448..bc8732433 100644
--- a/tests/query/highlights/hack/shapes.hack
+++ b/tests/query/highlights/hack/shapes.hack
@@ -1,12 +1,12 @@
 class C extends Superclass implements Iface {
-//      ^ keyword          ^ keyword
+//      ^ @keyword          ^ @keyword
   use Trait;
-  // < include
+  // <- @include
   const type X = shape(
-  // <- keyword ^ type.builtin
+  // <- @keyword ^ @type.builtin
     "a" => int,
-  // ^ string
+  // ^ @string
     "b" => string,
-  //       ^ type.builtin
+  //       ^ @type.builtin
   );
 }
diff --git a/tests/query/highlights/hack/use.hack b/tests/query/highlights/hack/use.hack
index d7b7ce784..353838a18 100644
--- a/tests/query/highlights/hack/use.hack
+++ b/tests/query/highlights/hack/use.hack
@@ -1,28 +1,28 @@
 use const Space\Const\C;
-//  ^ keyword
-//                    ^ constant
+//  ^ @keyword
+//                    ^ @constant
 use function Space\Func\F as E;
-//                           ^ function
-//                      ^ function
+//                           ^ @function
+//                      ^ @function
 use type Space\Type\T;
-//  ^ keyword
+//  ^ @keyword
 use namespace Space\Name\N as M;
-//  ^ keyword
-//             ^ namespace
+//  ^ @keyword
+//             ^ @namespace
 
 use namespace Space\Name2\N2, Space\Nothing\N3 as N8, type Space\Type2\N4,;
-//                        ^ namespace
-//                                                                      ^ type
+//                        ^ @namespace
+//                                                                      ^ @type
 use namespace Space\Name\N10\{A as A2, B\};
-//                        ^ namespace
-//                                     ^ namespace
-//                                 ^ namespace
+//                        ^ @namespace
+//                                     ^ @namespace
+//                                 ^ @namespace
 use namespace Space\Name\{\C, Slash as Forward};
 
 use \What\Is\This\{function A as A2, B, const H\S\L as stdlib, function F};
 
 use type \{kind,};
 use Q\B\{kind2,};
-//    ^ namespace
+//    ^ @namespace
 use type Q\B\{kind3,};
-// <- include
+// <- @include
diff --git a/tests/query/highlights/hack/using.hack b/tests/query/highlights/hack/using.hack
index 4452ea962..c3a7be153 100644
--- a/tests/query/highlights/hack/using.hack
+++ b/tests/query/highlights/hack/using.hack
@@ -1,3 +1,3 @@
 using ($new = new Object(), $file = new File('using', '+using')) {}
-// <- keyword
-//                                       ^ type
+// <- @keyword
+//                                       ^ @type
diff --git a/tests/query/highlights/hack/xhp.hack b/tests/query/highlights/hack/xhp.hack
index 992296b97..57563a131 100644
--- a/tests/query/highlights/hack/xhp.hack
+++ b/tests/query/highlights/hack/xhp.hack
@@ -4,7 +4,7 @@ echo "<tt>Hello <strong>$user_name</tt></strong>";
 // XHP: Typechecked, well-formed, and secure
 $user_name = 'Andrew';
 $xhp = <tt>Hello <strong>{$user_name}</strong></tt>;
-//       ^ tag
-//                 ^ tag
-//            ^ string
+//       ^ @tag
+//                 ^ @tag
+//            ^ @string
 echo await $xhp->toStringAsync();
diff --git a/tests/query/highlights/hocon/test.conf b/tests/query/highlights/hocon/test.conf
index 881417b67..acfe4f975 100644
--- a/tests/query/highlights/hocon/test.conf
+++ b/tests/query/highlights/hocon/test.conf
@@ -1,59 +1,59 @@
 HOCON = Human-Optimized Config Object Notation
-// ^field
-//        ^string
-//                       ^string
-//                              ^string
-//                                    ^string
+// ^ @field
+//        ^ @string
+//                       ^ @string
+//                              ^ @string
+//                                    ^ @string
 
 "it's": "a JSON\nsuperset",
-//       ^string
-//             ^string.escape
-//                        ^punctuation.delimiter
+//       ^ @string
+//             ^ @string.escape
+//                        ^ @punctuation.delimiter
 
 features: [
-//      ^operator
-//        ^punctuation.bracket
+//      ^ @operator
+//        ^ @punctuation.bracket
     less noisy / less pedantic syntax
-//             ^string
+//             ^ @string
     ability to refer to another part of the configuration
     import/include another configuration file into the current file
     a mapping to a flat properties list such as Java's system properties
     ability to get values from environment variables
     # ability to write comments
-//  ^comment
-//     ^comment
+//  ^@ comment
+//     ^ @comment
     // this is also a comment 
-//  ^comment
-//     ^comment
+//  ^ @comment
+//     ^ @comment
 ]
 
 specs url: "https://github.com/lightbend/config/blob/master/HOCON.md"
 includes: { 
   include required(file("~/prog/tree-sitter-hocon/grammar.js")) 
-//         ^keyword
-//^include
-//                ^punctuation.bracket
-//                                                           ^punctuation.bracket
+//         ^ @keyword
+//^ @include
+//                ^ @punctuation.bracket
+//                                                           ^ @punctuation.bracket
   override = true
-//            ^boolean
+//            ^ @boolean
 }
 
 it's: ${it's}. A ${HOCON}
-//    ^punctuation.special
-//     ^punctuation.special
-//          ^punctuation.special
-//           ^string
-//             ^string
-//                ^punctuation.special
-//                      ^punctuation.special
+//    ^ @punctuation.special
+//     ^ @punctuation.special
+//          ^ @punctuation.special
+//           ^ @string
+//             ^ @string
+//                ^ @punctuation.special
+//                      ^ @punctuation.special
 
 this.is.a."long.key" = null,
-//  ^punctuation.delimiter
-//     ^punctuation.delimiter
-//       ^punctuation.delimiter
-//                      ^constant.builtin
+//  ^ @punctuation.delimiter
+//     ^ @punctuation.delimiter
+//       ^ @punctuation.delimiter
+//                      ^ @constant.builtin
 week  = 7 days 
-//      ^number
-//         ^keyword
+//      ^ @number
+//         ^ @keyword
 
 
diff --git a/tests/query/highlights/julia/test.jl b/tests/query/highlights/julia/test.jl
index 46fc313c0..065df5c9e 100644
--- a/tests/query/highlights/julia/test.jl
+++ b/tests/query/highlights/julia/test.jl
@@ -1,26 +1,26 @@
 function load_data(::Symbol; ::Int) :: Tuple
-# <- keyword.function
-#        ^ function
-#                 ^ punctuation.bracket
-#                  ^^ punctuation.delimiter
-#                    ^ type.builtin
-#                          ^ punctuation.delimiter
-#                            ^^ punctuation.delimiter
-#                              ^^^ type.builtin
-#                                 ^ punctuation.bracket
-#                                   ^^ punctuation.delimiter
-#                                      ^ type.builtin
+# <- @keyword.function
+#        ^ @function
+#                 ^ @punctuation.bracket
+#                  ^^ @punctuation.delimiter
+#                    ^ @type.builtin
+#                          ^ @punctuation.delimiter
+#                            ^^ @punctuation.delimiter
+#                              ^^^ @type.builtin
+#                                 ^ @punctuation.bracket
+#                                   ^^ @punctuation.delimiter
+#                                      ^ @type.builtin
     dataset = CIFAR10(; Tx = Float32, split = split)
-#   ^^^^^^^ variable
-#           ^ operator
-#             ^ function.call
-#                          ^ operator
-#                            ^ type.builtin
+#   ^^^^^^^ @variable
+#           ^ @operator
+#             ^ @function.call
+#                          ^ @operator
+#                            ^ @type.builtin
     X = reshape(dataset.features[:, :, :, begin:n_obs], :, n_obs) # flattening the image pixels
-#                                         ^^^^^ variable.builtin
+#                                         ^^^^^ @variable.builtin
     y = categorical2onehot(dataset.targets[begin:n_obs], N_LABELS)
-#                                          ^^^^^ variable.builtin
+#                                          ^^^^^ @variable.builtin
     return X, y
-#   ^^^^^^ keyword.return
+#   ^^^^^^ @keyword.return
 end
-# <- keyword.function
+# <- @keyword.function
diff --git a/tests/query/highlights/lua/test.lua b/tests/query/highlights/lua/test.lua
index e8725b9fe..55818bb74 100644
--- a/tests/query/highlights/lua/test.lua
+++ b/tests/query/highlights/lua/test.lua
@@ -1,18 +1,18 @@
 -- luacheck: ignore
 local a = { 1, 2, 3, 4, 5 }
---          ^ number      ^ punctuation.bracket
---    ^ variable
+--          ^ @number     ^ @punctuation.bracket
+--    ^ @variable
 
 local _ = next(a)
---          ^ function.builtin
--- ^ keyword
+--          ^ @function.builtin
+-- ^ @keyword
 
 _ = next(a)
---   ^ function.builtin
+--   ^ @function.builtin
 
 next(a)
--- ^ function.builtin
+-- ^ @function.builtin
 
 -- Checking for incorrect hlgroup of injected luap
 string.match(s, "\0%d[^\n]+")
---                       ^ !constant
+--                       ^ @!constant
diff --git a/tests/query/highlights/markdown/test.md b/tests/query/highlights/markdown/test.md
index 2d3734515..20953a863 100644
--- a/tests/query/highlights/markdown/test.md
+++ b/tests/query/highlights/markdown/test.md
@@ -1,28 +1,28 @@
 # H1
-<!-- <- text.title.1.marker -->
+<!-- <- @text.title.1.marker -->
 
 ## H2
-<!-- <- text.title.2.marker -->
+<!-- <- @text.title.2.marker -->
 
 - Item 1
 - Item 2
-<!-- <- punctuation.special -->
+<!-- <- @punctuation.special -->
 
 1. Item 1
 2. Item 2
-<!-- <- punctuation.special -->
+<!-- <- @punctuation.special -->
 
 ----![image_description](https://example.com/image.jpg "awesome image title")
-<!--  ^ text.reference                                                    -->
-<!--                              ^ text.uri                              -->
-<!--                                                      ^ text.literal  -->
-<!--^ punctuation.special                                                 -->
-<!-- ^ punctuation.bracket                                                -->
-<!--                    ^ punctuation.bracket                             -->
+<!--  ^ @text.reference                                                    -->
+<!--                              ^ @text.uri                              -->
+<!--                                                      ^ @text.literal  -->
+<!--^ @punctuation.special                                                 -->
+<!-- ^ @punctuation.bracket                                                -->
+<!--                    ^ @punctuation.bracket                             -->
 
 [link_text](#local_reference "link go brr...")
-<!-- ^ text.reference                                                     -->
-<!--                 ^ text.uri                                           -->
-<!--                            ^ text.literal                            -->
-<!-- <- punctuation.bracket                                               -->
-<!--       ^ punctuation.bracket                                          -->
+<!-- ^ @text.reference                                                     -->
+<!--                 ^ @text.uri                                           -->
+<!--                            ^ @text.literal                            -->
+<!-- <- @punctuation.bracket                                               -->
+<!--       ^ @punctuation.bracket                                          -->
diff --git a/tests/query/highlights/pascal/test.pas b/tests/query/highlights/pascal/test.pas
index f60e8b40b..3a6cc786a 100644
--- a/tests/query/highlights/pascal/test.pas
+++ b/tests/query/highlights/pascal/test.pas
@@ -1,39 +1,39 @@
 program foobar;
-// ^ keyword
+// ^ @keyword
 
 var
-// <- keyword
+// <- @keyword
   foo: bar;
-// ^ variable
-//     ^ type
+// ^ @variable
+//     ^ @type
   foo: foo.bar<t>;
-// ^ variable
-//     ^ type
-//         ^ type
-//             ^ type
+// ^ @variable
+//     ^ @type
+//         ^ @type
+//             ^ @type
 begin
-// ^ keyword
+// ^ @keyword
   foo := bar;
-// ^ variable
-//       ^ variable
+// ^ @variable
+//       ^ @variable
   foo;
-// ^ function
+// ^ @function
   foo();
-// ^ function
+// ^ @function
   foo(bar(xyz));
-// ^ function
-//    ^ function
-//        ^ variable
+// ^ @function
+//    ^ @function
+//        ^ @variable
   xx + yy;
-// ^ variable
-//     ^ variable
+// ^ @variable
+//     ^ @variable
   xx := y + z + func(a, b, c);
-// ^ variable
-//      ^ variable
-//          ^ variable
-//              ^ function
-//                   ^ variable
-//                      ^ variable
-//                         ^ variable
+// ^ @variable
+//      ^ @variable
+//          ^ @variable
+//              ^ @function
+//                   ^ @variable
+//                      ^ @variable
+//                         ^ @variable
 end.
-// <- keyword
+// <- @keyword
diff --git a/tests/query/highlights/python/pattern_matching.py b/tests/query/highlights/python/pattern_matching.py
index 2d7d7d0c0..cd359a48f 100644
--- a/tests/query/highlights/python/pattern_matching.py
+++ b/tests/query/highlights/python/pattern_matching.py
@@ -1,51 +1,51 @@
 match command.split():
-# ^ conditional
+# ^ @conditional
     case ["quit"]:
-    # ^ conditional
+    # ^ @conditional
         print("Goodbye!")
         quit_game()
     case ["look"]:
-    # ^ conditional
+    # ^ @conditional
         current_room.describe()
     case ["get", obj]:
-    # ^ conditional
+    # ^ @conditional
         character.get(obj, current_room)
     case ["go", direction]:
-    # ^ conditional
+    # ^ @conditional
         current_room = current_room.neighbor(direction)
     # The rest of your commands go here
 
 match command.split():
-# ^ conditional
+# ^ @conditional
     case ["drop", *objects]:
-    # ^ conditional
+    # ^ @conditional
         for obj in objects:
             character.drop(obj, current_room)
 
 match command.split():
-# ^ conditional
+# ^ @conditional
     case ["quit"]: ... # Code omitted for brevity
     case ["go", direction]: pass
     case ["drop", *objects]: pass
     case _:
         print(f"Sorry, I couldn't understand {command!r}")
-                                                   # ^^ @function.macro
+                                                   # ^^ @@function.macro
 
 match command.split():
-# ^ conditional
+# ^ @conditional
     case ["north"] | ["go", "north"]:
-    # ^ conditional
+    # ^ @conditional
         current_room = current_room.neighbor("north")
     case ["get", obj] | ["pick", "up", obj] | ["pick", obj, "up"]:
-    # ^ conditional
+    # ^ @conditional
         pass
 
 match = 2
-#   ^ variable
+#   ^ @variable
 match, a = 2, 3
-#   ^ variable
+#   ^ @variable
 match: int = secret
-#   ^ variable
+#   ^ @variable
 x, match: str = 2, "hey, what's up?"
-# <- variable
-#   ^ variable
+# <- @variable
+#   ^ @variable
diff --git a/tests/query/highlights/rust/super-crate-imports.rs b/tests/query/highlights/rust/super-crate-imports.rs
index 49a0c2918..59354a32c 100644
--- a/tests/query/highlights/rust/super-crate-imports.rs
+++ b/tests/query/highlights/rust/super-crate-imports.rs
@@ -1,12 +1,12 @@
 use crate::a;
-//  ^ namespace
+//  ^ @namespace
 //  ^ !keyword
 use crate::{b, c};
-//  ^ namespace
+//  ^ @namespace
 //  ^ !keyword
 use super::a;
-//  ^ namespace
+//  ^ @namespace
 //  ^ !keyword
 use super::{b, c};
-//  ^ namespace
+//  ^ @namespace
 //  ^ !keyword
diff --git a/tests/query/highlights/solidity/test.sol b/tests/query/highlights/solidity/test.sol
index 062970fdd..99117bb55 100644
--- a/tests/query/highlights/solidity/test.sol
+++ b/tests/query/highlights/solidity/test.sol
@@ -1,27 +1,27 @@
 // Example contract from official documentation at https://github.com/ethereum/solidity/blob/v0.8.12/docs/examples/voting.rst
 
 // SPDX-License-Identifier: GPL-3.0
-// ^ comment
+// ^ @comment
 pragma solidity >=0.7.0 <0.9.0;
-// ^ preproc
-//     ^ preproc
+// ^ @preproc
+//     ^ @preproc
 
 import * as something from "anotherFile";
-// ^     ^            ^ include
+// ^     ^            ^ @include
 
 /// @title Voting with delegation.
-// <- comment
+// <- @comment
 contract Ballot {
 // ^keyword
-//       ^ type
+//       ^ @type
     // This declares a new complex type which will
     // be used for variables later.
     // It will represent a single voter.
     struct Voter {
-//         ^ type
+//         ^ @type
         uint weight; // weight is accumulated by delegation
-//      ^ type.builtin
-//           ^ field
+//      ^ @type.builtin
+//           ^ @field
         bool voted;  // if true, that person already voted
         address delegate; // person delegated to
         uint vote;   // index of the voted proposal
@@ -34,23 +34,23 @@ contract Ballot {
     }
 
     address public chairperson;
-//  ^ type.builtin
+//  ^ @type.builtin
 
     // This declares a state variable that
     // stores a `Voter` struct for each possible address.
     mapping(address => Voter) public voters;
-//         ^                ^ punctuation.bracket
-//                  ^ punctuation.delimiter
+//         ^                ^ @punctuation.bracket
+//                  ^ @punctuation.delimiter
 
     // A dynamically-sized array of `Proposal` structs.
     Proposal[] public proposals;
 
     enum ActionChoices { GoLeft, GoRight, GoStraight, SitStill }
-//                       ^ constant
+//                       ^ @constant
 
     /// Create a new ballot to choose one of `proposalNames`.
     constructor(bytes32[] memory proposalNames) {
-//  ^ constructor
+//  ^ @constructor
         chairperson = msg.sender;
         voters[chairperson].weight = 1;
 
@@ -63,7 +63,7 @@ contract Ballot {
             // appends it to the end of `proposals`.
             proposals.push(Proposal({
                 name: proposalNames[i],
-//              ^ field
+//              ^ @field
                 voteCount: 0
             }));
         }
@@ -72,9 +72,9 @@ contract Ballot {
     // Give `voter` the right to vote on this ballot.
     // May only be called by `chairperson`.
     function giveRightToVote(address voter) external {
-//  ^ keyword.function
-//           ^ function
-//                                   ^ parameter
+//  ^ @keyword.function
+//           ^ @function
+//                                   ^ @parameter
         // If the first argument of `require` evaluates
         // to `false`, execution terminates and all
         // changes to the state and to Ether balances
@@ -180,7 +180,7 @@ contract Ballot {
 
 contract Another {
   Ballot b = new Ballot(new bytes32[](1));
-//           ^ keyword.operator
+//           ^ @keyword.operator
 }
 
 // vim:ft=solidity
diff --git a/tests/query/highlights/t32/comments.cmm b/tests/query/highlights/t32/comments.cmm
index 0bab130f6..e36f7e63a 100644
--- a/tests/query/highlights/t32/comments.cmm
+++ b/tests/query/highlights/t32/comments.cmm
@@ -1,10 +1,10 @@
 // This is a comment
-; <- comment
+; <- @comment
 
 ; Another comment
-; <- comment
+; <- @comment
 
 ECHO &a // This is a trailing comment
-;       ^ comment
+;       ^ @comment
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
index 21422438b..a4013d72f 100644
--- a/tests/query/highlights/t32/keywords.cmm
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -1,123 +1,123 @@
 PRIVATE &password
-; <- keyword
-;        ^ variable.builtin
+; <- @keyword
+;        ^ @variable.builtin
 ENTRY &password
-; <- keyword
-;        ^ parameter
+; <- @keyword
+;        ^ @parameter
 
 ENTRY %LINE &salt
-; <- keyword
-;      ^ constant.builtin
-;            ^ parameter
+; <- @keyword
+;      ^ @constant.builtin
+;            ^ @parameter
 
 IF "&password"==""
-; <- conditional
-;  ^ string
-;    ^ variable.builtin
-;             ^ operator
+; <- @conditional
+;  ^ @string
+;    ^ @variable.builtin
+;             ^ @operator
 (
     ECHO "Failed to provide password."
     ENDDO
-;   ^ keyword.return
+;   ^ @keyword.return
 )
 ELSE
-; <- conditional
+; <- @conditional
 (
     PRIVATE &pass
 
     &pass=FALSE()
-;          ^ function.builtin
+;          ^ @function.builtin
     WHILE !&pass
-;         ^ operator
+;         ^ @operator
     (
         GOSUB verify_password "&password"
-;             ^ function.call
+;             ^ @function.call
         RETURNVALUES &pass
-;                     ^ parameter
+;                     ^ @parameter
         WAIT 10.ms
-;            ^ float
+;            ^ @float
     )
 
     IF !&pass
         GOTO fail
-;            ^ label
+;            ^ @label
     ELSE
     (
         GOSUB start_debug
-;             ^ function.call
+;             ^ @function.call
     )
 )
 
 LOCAL &num
-;      ^ variable.builtin
+;      ^ @variable.builtin
 
 &num = 2.
-;      ^ number
+;      ^ @number
 
 RePeaT &num PRINT "Password: &password"
-;       ^ variable.builtin
-;                             ^ variable.builtin
+;       ^ @variable.builtin
+;                             ^ @variable.builtin
 
 WinCLEAR
 FramePOS ,,,,Maximized
-;        ^ punctuation.delimiter
-;            ^ constant.builtin
+;        ^ @punctuation.delimiter
+;            ^ @constant.builtin
 WinPOS 0% 50% 100% 35%
-;      ^ float
+;      ^ @float
 COVerage.ListFunc
 
 ENDDO
 
 
 fail:
-; <- label
+; <- @label
     PRINT %ERROR "Password verification failed."
     END
-;   ^ keyword.return
+;   ^ @keyword.return
 
 
 verify_password:
-; <- function
+; <- @function
 (
     PARAMETERS &password
-;               ^ parameter
+;               ^ @parameter
 
     SYStem.Option.KEYCODE "&password"
     SYStem.JtagClock  1kHz
-;                     ^ float
+;                     ^ @float
     SYStem.Mode.Attach
 
     Data.Set N: EAXI:0x34000000 %Long 0x34000100 0x34000021 /verify
-;            ^ constant.builtin
-;               ^ constant.builtin
-;                    ^ number
-;                                ^ constant.builtin
-;                                     ^ number
-;                                                            ^ constant.builtin
+;            ^ @constant.builtin
+;               ^ @constant.builtin
+;                    ^ @number
+;                                ^ @constant.builtin
+;                                     ^ @number
+;                                                            ^ @constant.builtin
 
     RETURN TRUE()
-;   ^ keyword.return
+;   ^ @keyword.return
 )
 
 
 SUBROUTINE start_debug
-; <- keyword.function
-;          ^ function
+; <- @keyword.function
+;          ^ @function
 (
     COVerage.ListModule %MULTI.OBC \sieve
-;    ^ keyword
-;                        ^ constant.builtin
-;                                  ^ symbol
+;    ^ @keyword
+;                        ^ @constant.builtin
+;                                  ^ @symbol
 
     Var.DRAW flags[0..16] /Alternate 3
-;    ^ keyword
-;             ^ variable
-;                          ^ constant.builtin
-;                                    ^ number
+;    ^ @keyword
+;             ^ @variable
+;                          ^ @constant.builtin
+;                                    ^ @number
 
     Go main
     RETURN
-;   ^ keyword.return
+;   ^ @keyword.return
 )
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
index 6c6849aea..8c63ce96d 100644
--- a/tests/query/highlights/t32/literals.cmm
+++ b/tests/query/highlights/t32/literals.cmm
@@ -1,39 +1,39 @@
 WinPOS ,,1000.,,,,myWatchWindow
-;        ^ number
+;        ^ @number
 
 PRinTer.OPEN "~~~/varwatch.txt" ASCIIE
-;            ^ string
+;            ^ @string
 
 sYmbol.NEW _InitialSP   0x34000100
-;                       ^ number
+;                       ^ @number
 
 DO ~~~~/test.cmm
-;  ^ string.special
+;  ^ @string.special
 
 WAIT 1.ns
-;    ^ float
+;    ^ @float
 
 SYStem.JtagClock  100.GHZ
-;                 ^ float
+;                 ^ @float
 
 DATA.SET P:&HEAD+0x4 %LONG DATA.LONG(EA:&HEAD+0x4)&0xFFFFFF
-;                                    ^ constant.builtin
+;                                    ^ @constant.builtin
 
 List `main`
-;    ^ symbol
+;    ^ @symbol
 
 &range = 'a'--'z'||'0'--'9'
-;        ^ character
-;           ^ operator
-;                       ^ character
+;        ^ @character
+;           ^ @operator
+;                       ^ @character
 
 Data.Set N: 0xffff800000 0y0011xx01xx&&a
-;        ^ constant.builtin
-;           ^ number
-;                        ^ number
-;                                    ^ operator
+;        ^ @constant.builtin
+;           ^ @number
+;                        ^ @number
+;                                    ^ @operator
 
 WinPOS 0% 85% 100% 15%
-;             ^ float
+;             ^ @float
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
index d77de90c8..de67278a0 100644
--- a/tests/query/highlights/t32/var.cmm
+++ b/tests/query/highlights/t32/var.cmm
@@ -1,7 +1,7 @@
 Var.NEWGLOBAL char[4][32] \myarr
-; <- keyword
-;             ^ type.builtin
-;                          ^ variable.builtin
+; <- @keyword
+;             ^ @type.builtin
+;                          ^ @variable.builtin
 LOCAL &i &data
 
 &data="zero|one|two|three"
@@ -12,64 +12,64 @@ WHILE &i<4
     PRIVATE &val
     &val=STRing.SPLIT("&data","|",&i)
     Var.Assign \myarr[&i]="&val"
-;              ^ variable.builtin
-;                        ^ operator
+;              ^ @variable.builtin
+;                        ^ @operator
     &i=&i+1.
 )
 
 Var.NEWLOCAL \x
-; <- keyword
-;             ^ variable.builtin
+; <- @keyword
+;             ^ @variable.builtin
 Var.set \x=func3(5,3)
-;       ^ variable.builtin
-;          ^ function.call
-;                ^ number
+;       ^ @variable.builtin
+;          ^ @function.call
+;                ^ @number
 PRINT Var.VALUE(\x)
-;               ^ variable.builtin
+;               ^ @variable.builtin
 PRINT Var.VALUE('a')
-;               ^ character
+;               ^ @character
 Var.Assign (*ap)[2..4] = &a
-;            ^ variable
-;                         ^ variable
+;            ^ @variable
+;                         ^ @variable
 Var.Assign sp = &s.n+offset
-;          ^ variable
-;                ^ variable
-;                  ^ field
-;                    ^ variable
+;          ^ @variable
+;                ^ @variable
+;                  ^ @field
+;                    ^ @variable
 Var.Assign padd = (CAddition const * volatile)&d
-;          ^ variable
-;                  ^ type
-;                            ^ type.qualifier
-;                                    ^ type.qualifier
-;                                              ^ variable
+;          ^ @variable
+;                  ^ @type
+;                            ^ @type.qualifier
+;                                    ^ @type.qualifier
+;                                              ^ @variable
 Var.Assign e1 = (enum e2)&e
-;          ^ variable
-;                ^ keyword
-;                     ^ type
-;                         ^ variable
+;          ^ @variable
+;                ^ @keyword
+;                     ^ @type
+;                         ^ @variable
 Var.Assign *vector = (struct Vector3d*)&acceleration
-;           ^ variable
-;                     ^ keyword
-;                            ^ type
-;                                       ^ variable
+;           ^ @variable
+;                     ^ @keyword
+;                            ^ @type
+;                                       ^ @variable
 Var.Assign z = (union foo)x
-;          ^ variable
-;               ^ keyword
-;                     ^ type
-;                         ^ variable
+;          ^ @variable
+;               ^ @keyword
+;                     ^ @type
+;                         ^ @variable
 Var.Assign b = -a
-;          ^ variable
-;               ^ variable
+;          ^ @variable
+;               ^ @variable
 Var.Assign c = i++
-;          ^ variable
-;              ^ variable
+;          ^ @variable
+;              ^ @variable
 Var.Assign d = sizeof(int)
-;          ^ variable
-;              ^ keyword.operator
-;                     ^ type.builtin
+;          ^ @variable
+;              ^ @keyword.operator
+;                     ^ @type.builtin
 Var.call strcmp(key,buffer)
-;        ^ function.call
-;               ^ variable
-;                   ^ variable
+;        ^ @function.call
+;               ^ @variable
+;                   ^ @variable
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/tiger/built-ins.tig b/tests/query/highlights/tiger/built-ins.tig
index 7cc1ca501..9aa649421 100644
--- a/tests/query/highlights/tiger/built-ins.tig
+++ b/tests/query/highlights/tiger/built-ins.tig
@@ -1,21 +1,21 @@
 let
   var a := exit(0)
-  /*       ^ function.builtin */
+  /*       ^ @function.builtin */
 
   primitive exit(ret: int) /* Shadowing the prelude-included built-in */
-  /*                  ^ type.builtin */
+  /*                  ^ @type.builtin */
 
   var b := exit(0)
-  /*       ^ function.builtin */
+  /*       ^ @function.builtin */
 
   type int = string /* Shadowing the built-in type */
-  /*         ^ type.builtin */
+  /*         ^ @type.builtin */
 
   var c : int := "This is an \"int\""
-  /*      ^ type.builtin (not sure why it isn't 'type')*/
+  /*      ^ @type.builtin (not sure why it isn't 'type')*/
 
   var d : Object := nil
-  /*      ^ type.builtin */
+  /*      ^ @type.builtin */
 
   type Object = int
 
@@ -23,22 +23,22 @@ let
 in
   let
     var c : int := "This is an int"
-    /*      ^ type.builtin (not sure why it isn't 'type')*/
+    /*      ^ @type.builtin (not sure why it isn't 'type')*/
     var d : Object := "This is an object"
-    /*      ^ type.builtin (not sure why it isn't 'type')*/
+    /*      ^ @type.builtin (not sure why it isn't 'type')*/
   in
   end;
 
   exit(1);
-  /* <- function.builtin */
+  /* <- @function.builtin */
 
   print("shadowing is fun");
-  /* <- function.builtin */
+  /* <- @function.builtin */
 
   self;
-  /* <- variable.builtin */
+  /* <- @variable.builtin */
 
   b := print
-  /*   ^ variable */
+  /*   ^ @variable */
 end
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/comment.tig b/tests/query/highlights/tiger/comment.tig
index a9c91535f..9323dba05 100644
--- a/tests/query/highlights/tiger/comment.tig
+++ b/tests/query/highlights/tiger/comment.tig
@@ -1,6 +1,6 @@
 /* This is /* a nested */ comment */
-/* <- comment
-            ^ comment
-                                ^ comment
+/* <- @comment
+            ^ @comment
+                                ^ @comment
  */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/functions.tig b/tests/query/highlights/tiger/functions.tig
index 219c05916..6505d20fe 100644
--- a/tests/query/highlights/tiger/functions.tig
+++ b/tests/query/highlights/tiger/functions.tig
@@ -1,9 +1,9 @@
 primitive print(s: string)
-/*        ^ function */
-/*              ^ parameter */
+/*        ^ @function */
+/*              ^ @parameter */
 
 function func(a: int) : int = (print("Hello World!"); a)
-/*       ^ function */
-/*            ^ parameter */
-/*                             ^ function.builtin */
+/*       ^ @function */
+/*            ^ @parameter */
+/*                             ^ @function.builtin */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/identifiers.tig b/tests/query/highlights/tiger/identifiers.tig
index 4216c930d..e712e57de 100644
--- a/tests/query/highlights/tiger/identifiers.tig
+++ b/tests/query/highlights/tiger/identifiers.tig
@@ -1,30 +1,30 @@
 type int = int
-/*   ^ variable */
-/*         ^ type.builtin */
+/*   ^ @variable */
+/*         ^ @type.builtin */
 
 type int_array = array of int
-/*                        ^ type.builtin */
+/*                        ^ @type.builtin */
 
 type record = {a: int, b: string}
-/*             ^ property */
-/*                ^ type.builtin */
-/*                     ^ property */
-/*                        ^ type.builtin */
+/*             ^ @property */
+/*                ^ @type.builtin */
+/*                     ^ @property */
+/*                        ^ @type.builtin */
 
 var record := record {a = 12, b = "27"}
-/*  ^ variable */
-/*            ^ type */
-/*                    ^ property */
-/*                            ^ property */
+/*  ^ @variable */
+/*            ^ @type */
+/*                    ^ @property */
+/*                            ^ @property */
 
 var array := int_array[12] of 27;
-/*  ^ variable */
-/*           ^ type */
+/*  ^ @variable */
+/*           ^ @type */
 
 primitive func(a: int, b: string) : array
-/*             ^ parameter */
-/*                ^ type.builtin */
-/*                     ^ parameter */
-/*                        ^ type.builtin */
-/*                                  ^ type */
+/*             ^ @parameter */
+/*                ^ @type.builtin */
+/*                     ^ @parameter */
+/*                        ^ @type.builtin */
+/*                                  ^ @type */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/imports.tig b/tests/query/highlights/tiger/imports.tig
index 068dc4810..f20a0bc1a 100644
--- a/tests/query/highlights/tiger/imports.tig
+++ b/tests/query/highlights/tiger/imports.tig
@@ -1,4 +1,4 @@
 import "lib.tih"
-/* <- include */
-/*      ^ string.special */
+/* <- @include */
+/*      ^ @string.special */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/keywords.tig b/tests/query/highlights/tiger/keywords.tig
index 862a531cd..7deb0288d 100644
--- a/tests/query/highlights/tiger/keywords.tig
+++ b/tests/query/highlights/tiger/keywords.tig
@@ -1,42 +1,42 @@
 let
-/* <- keyword */
+/* <- @keyword */
 
   var a := 12
-  /* <- keyword */
+  /* <- @keyword */
 
   function f() : int = a
-  /* <- keyword.function */
+  /* <- @keyword.function */
   primitive g()
-  /* <- keyword.function */
+  /* <- @keyword.function */
 
   import "lib.tih"
-  /* <- include */
+  /* <- @include */
 
   type array_of_int = array of int
-  /* <- keyword */
-  /*                  ^ keyword */
-  /*                        ^ keyword */
+  /* <- @keyword */
+  /*                  ^ @keyword */
+  /*                        ^ @keyword */
 
 in
-/* <- keyword */
+/* <- @keyword */
 
   12;
 
   if 12 then 27 else 42;
-  /* <- keyword */
-  /*    ^ keyword */
-  /*            ^ keyword */
+  /* <- @keyword */
+  /*    ^ @keyword */
+  /*            ^ @keyword */
 
   for i := 12 to 27 do 42;
-  /* <- repeat */
-  /*          ^ repeat */
-  /*                ^ repeat */
+  /* <- @repeat */
+  /*          ^ @repeat */
+  /*                ^ @repeat */
 
   while 12 do break
-  /* <- repeat */
-  /*       ^ repeat */
-  /*          ^ keyword */
+  /* <- @repeat */
+  /*       ^ @repeat */
+  /*          ^ @keyword */
 
 end
-/* <- keyword */
+/* <- @keyword */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/literals.tig b/tests/query/highlights/tiger/literals.tig
index c7d7b5d8e..46f3c8616 100644
--- a/tests/query/highlights/tiger/literals.tig
+++ b/tests/query/highlights/tiger/literals.tig
@@ -1,9 +1,9 @@
 nil
-/* <- constant.builtin */
+/* <- @constant.builtin */
 42
-/* <- number */
+/* <- @number */
 "Hello World!\n"
-/* <- string
-             ^ string.escape
+/* <- @string
+             ^ @string.escape
 */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/meta-variables.tig b/tests/query/highlights/tiger/meta-variables.tig
index 24c01ac69..1b2c6c976 100644
--- a/tests/query/highlights/tiger/meta-variables.tig
+++ b/tests/query/highlights/tiger/meta-variables.tig
@@ -1,14 +1,14 @@
 let
   _chunks(42)
-  /* <- keyword */
+  /* <- @keyword */
 
 in
   _lvalue(12) : _namety(42) := _cast("I'm So Meta Even This Acronym", string);
-  /* <- keyword */
-  /*            ^ keyword */
-  /*                           ^ keyword */
+  /* <- @keyword */
+  /*            ^ @keyword */
+  /*                           ^ @keyword */
 
   _exp(42)
-  /* <- keyword */
+  /* <- @keyword */
 end
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/object-oriented.tig b/tests/query/highlights/tiger/object-oriented.tig
index b09b82b19..607efec8c 100644
--- a/tests/query/highlights/tiger/object-oriented.tig
+++ b/tests/query/highlights/tiger/object-oriented.tig
@@ -1,29 +1,29 @@
 let
   class A extends Object {}
-  /* <- keyword */
-  /*      ^ keyword */
-  /*              ^ type.builtin */
+  /* <- @keyword */
+  /*      ^ @keyword */
+  /*              ^ @type.builtin */
 
   type B = class extends A {
-  /*       ^ keyword */
-  /*             ^ keyword */
-  /*                     ^ type */
+  /*       ^ @keyword */
+  /*             ^ @keyword */
+  /*                     ^ @type */
 
     var a := 12
 
     method meth() : int = self.a
-    /* <- keyword.function */
-    /*     ^ method */
-    /*                    ^ variable.builtin */
+    /* <- @keyword.function */
+    /*     ^ @method */
+    /*                    ^ @variable.builtin */
   }
 
   var object := new B
-  /*            ^ keyword.operator */
+  /*            ^ @keyword.operator */
 in
   object.a := 27;
-  /*     ^ property */
+  /*     ^ @property */
 
   object.meth()
-  /*     ^ method */
+  /*     ^ @method */
 end
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/operators.tig b/tests/query/highlights/tiger/operators.tig
index 569b8a8bc..d803af75b 100644
--- a/tests/query/highlights/tiger/operators.tig
+++ b/tests/query/highlights/tiger/operators.tig
@@ -1,49 +1,49 @@
 let
   var a : int := 42
-  /*    ^ punctuation.delimiter */
-  /*          ^ operator */
+  /*    ^ @punctuation.delimiter */
+  /*          ^ @operator */
 in
   (
-  /* <- punctuation.bracket */
+  /* <- @punctuation.bracket */
 
     -1 | 2 & 3 + 4 * 5;
-    /* <- operator */
-    /* ^ operator */
-    /*     ^ operator */
-    /*         ^ operator */
-    /*             ^ operator */
-    /*                ^ punctuation.delimiter */
+    /* <- @operator */
+    /* ^ @operator */
+    /*     ^ @operator */
+    /*         ^ @operator */
+    /*             ^ @operator */
+    /*                ^ @punctuation.delimiter */
 
     12 >= 27;
-    /* ^ operator */
+    /* ^ @operator */
     12 <= 27;
-    /* ^ operator */
+    /* ^ @operator */
     12 = 27;
-    /* ^ operator */
+    /* ^ @operator */
     12 <> 27;
-    /* ^ operator */
+    /* ^ @operator */
     12 < 27;
-    /* ^ operator */
+    /* ^ @operator */
     12 > 27;
-    /* ^ operator */
+    /* ^ @operator */
 
     record.field;
-    /*    ^ punctuation.delimiter */
+    /*    ^ @punctuation.delimiter */
 
     func(a, b);
-    /*  ^ punctuation.bracket */
-    /*       ^ punctuation.bracket */
-    /*    ^ punctuation.delimiter */
+    /*  ^ @punctuation.bracket */
+    /*       ^ @punctuation.bracket */
+    /*    ^ @punctuation.delimiter */
 
     record_type { };
-    /*          ^ punctuation.bracket */
-    /*            ^ punctuation.bracket */
+    /*          ^ @punctuation.bracket */
+    /*            ^ @punctuation.bracket */
 
     array[42]
-    /*   ^ punctuation.bracket */
-    /*      ^ punctuation.bracket */
+    /*   ^ @punctuation.bracket */
+    /*      ^ @punctuation.bracket */
 
   )
-  /* <- punctuation.bracket */
+  /* <- @punctuation.bracket */
 end
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/typescript/as.ts b/tests/query/highlights/typescript/as.ts
index ef0ce98e5..71221f410 100644
--- a/tests/query/highlights/typescript/as.ts
+++ b/tests/query/highlights/typescript/as.ts
@@ -1,8 +1,8 @@
 import * as foo from 'foo';
-//       ^ include
+//       ^ @include
 
 export { foo as bar };
-//           ^ include
+//           ^ @include
 
 const n = 5 as number;
-//          ^ keyword.operator
+//          ^ @keyword.operator
diff --git a/tests/query/highlights/usd/prims.usda b/tests/query/highlights/usd/prims.usda
index eeac67d74..eeeeae920 100644
--- a/tests/query/highlights/usd/prims.usda
+++ b/tests/query/highlights/usd/prims.usda
@@ -1,11 +1,11 @@
 def Xform "cube" (
     assetInfo = {
-    # <- keyword
+    # <- @keyword
         asset[] payloadAssetDependencies = [@fizz.usd@, @buzz.usd@]
-        # <- type
-        #       ^ keyword
-        #                                   ^ text.uri
-        #                                               ^ text.uri
+        # <- @type
+        #       ^ @keyword
+        #                                   ^ @text.uri
+        #                                               ^ @text.uri
     }
 )
 {
@@ -13,13 +13,13 @@ def Xform "cube" (
 
 def "root" (
     add references = @foo.usda@</Model> (offset = 1; scale = 2.0)
-                      # <- text.uri
-                      #        ^ string.special
-                      #                  ^ keyword
-                      #                           ^ number
-                      #                            ^ punctuation.delimiter
-                      #                              ^ keyword
-                      #                                      ^ float
+                      # <- @text.uri
+                      #        ^ @string.special
+                      #                  ^ @keyword
+                      #                           ^ @number
+                      #                            ^ @punctuation.delimiter
+                      #                              ^ @keyword
+                      #                                      ^ @float
 )
 {
 }
@@ -28,14 +28,14 @@ def "World"
 {
     over "points" (
         clips = {
-        # <- keyword
+        # <- @keyword
             dictionary default = {
-            # <- type
-            #          ^ variable
+            # <- @type
+            #          ^ @variable
                 double2[] times = [(101, 101), (102, 102)]
-                # <- type
-                #         ^ keyword
-                #                   ^ number
+                # <- @type
+                #         ^ @keyword
+                #                   ^ @number
             }
         }
     )
@@ -49,9 +49,9 @@ def Xform "torch_2" (
 )
 {
     // Pre-published light list
-    # <- comment
+    # <- @comment
     rel lightList = [ <light> ]  # inline comment
-    #                            ^ comment
+    #                            ^ @comment
     token lightList:cacheBehavior = "consumeAndContinue"
 
     double3 xformOp:translate = (1, 0, 0.5)
@@ -60,7 +60,7 @@ def Xform "torch_2" (
 
 def "foo" (
   "some comment"
-  # <- comment.documentation
+  # <- @comment.documentation
 )
 {
 }
@@ -68,20 +68,20 @@ def "foo" (
 def "foo" (
   # inline comment
   "actual in-description comment"
-  # <- comment.documentation
+  # <- @comment.documentation
 )
 {
 }
 
 def "foo" (
     add references = @foo.usda@
-    # <- function.call
+    # <- @function.call
     append references = @foo.usda@
-    # <- function.call
+    # <- @function.call
     delete references = @foo.usda@
-    # <- function.call
+    # <- @function.call
     reorder references = [@foo.usda@]
-    # <- function.call
+    # <- @function.call
 
     references = [@foo.usda@]  # explicit
 )
@@ -90,11 +90,11 @@ def "foo" (
 
 over "Parent" (
     prepend references = [</InternalRef>, @./ref.usda@</RefParent>]
-    # <- function.call
-    #       ^ keyword
-    #                     ^ string.special
-    #                                     ^ text.uri
-    #                                                 ^ string.special
+    # <- @function.call
+    #       ^ @keyword
+    #                     ^ @string.special
+    #                                     ^ @text.uri
+    #                                                 ^ @string.special
 )
 {
 }
@@ -102,17 +102,17 @@ over "Parent" (
 def "foo"
 {
     float value.timeSamples = {
-    # <- type
-    #     ^ variable
-    #           ^ property
+    # <- @type
+    #     ^ @variable
+    #           ^ @property
       -414: 14.4
-      # <- number
-      #     ^ float
+      # <- @number
+      #     ^ @float
       10: 201.0,
-      # <- number
-      #   ^ float
+      # <- @number
+      #   ^ @float
       10.123: 201.0123,
-      # <- float
-      #       ^ float
+      # <- @float
+      #       ^ @float
     }
 }
diff --git a/tests/query/highlights/usd/properties.usda b/tests/query/highlights/usd/properties.usda
index 67df8a623..e518c73f7 100644
--- a/tests/query/highlights/usd/properties.usda
+++ b/tests/query/highlights/usd/properties.usda
@@ -1,21 +1,21 @@
 dictionary foo = {}
-# <- type
+# <- @type
 half[] foo = [2, 1, 2]
-# <- type
+# <- @type
 string foo = "something"
-# <- type
+# <- @type
 timecode time = 1.0
-# <- type
+# <- @type
 token[] purpose = ["default", "render"]
-# <- type
+# <- @type
 
 rel material:binding:collection:Erasers = None
-# <- type
-#   ^ namespace
-#           ^ punctuation.delimiter
-#            ^ namespace
-#                   ^ punctuation.delimiter
-#                    ^ namespace
-#                              ^ punctuation.delimiter
-#                               ^ variable
-#                                         ^ constant.builtin
+# <- @type
+#   ^ @namespace
+#           ^ @punctuation.delimiter
+#            ^ @namespace
+#                   ^ @punctuation.delimiter
+#                    ^ @namespace
+#                              ^ @punctuation.delimiter
+#                               ^ @variable
+#                                         ^ @constant.builtin
diff --git a/tests/query/highlights/usd/subLayers.usda b/tests/query/highlights/usd/subLayers.usda
index b4dfa6298..24581b90a 100644
--- a/tests/query/highlights/usd/subLayers.usda
+++ b/tests/query/highlights/usd/subLayers.usda
@@ -1,9 +1,9 @@
 #usda 1.0
 (
     subLayers = [
-    # <- keyword
+    # <- @keyword
         @./model_sub.usda@ (offset = 1)
-        # <- text.uri
-        #                   ^ keyword
+        # <- @text.uri
+        #                   ^ @keyword
     ]
 )
diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
index 06160d741..b102db891 100644
--- a/tests/query/highlights/wing/class.w
+++ b/tests/query/highlights/wing/class.w
@@ -1,19 +1,19 @@
 bring cloud;
-// <- keyword
+// <- @keyword
 
 class Foo {
-// <- keyword
-//    ^   variable
-//        ^ punctuation.bracket
+// <- @keyword
+//    ^   @variable
+//        ^ @punctuation.bracket
   name: str;
-//^    field
-//      ^   type.builtin
-//         ^ punctuation.delimiter
+//^    @field
+//      ^   @type.builtin
+//         ^ @punctuation.delimiter
   new(name:  str) {
-//^    keyword
-//    ^    variable
+//^    @keyword
+//    ^    @variable
     this.name = name;
-//      ^ punctuation.delimiter
-//            ^ operator
+//      ^ @punctuation.delimiter
+//            ^ @operator
   }
 }
diff --git a/tests/query/highlights/wing/nested_method.w b/tests/query/highlights/wing/nested_method.w
index 04fd1a37d..8a454b34c 100644
--- a/tests/query/highlights/wing/nested_method.w
+++ b/tests/query/highlights/wing/nested_method.w
@@ -1,4 +1,4 @@
 test1.test2.test3();
-// <- variable
-//    ^ property
-//          ^ method.call
+// <- @variable
+//    ^ @property
+//          ^ @method.call
diff --git a/tests/query/highlights/xhp-intro.hack b/tests/query/highlights/xhp-intro.hack
index 942d2ff00..ccbe60c57 100644
--- a/tests/query/highlights/xhp-intro.hack
+++ b/tests/query/highlights/xhp-intro.hack
@@ -5,23 +5,23 @@ use type Facebook\XHP\HTML\{XHPHTMLHelpers, a, form};
 
 
 final xhp class a_post extends x\element {
-// ^ type.qualifier
-//     ^ type.qualifier
-//                        ^ keyword
+// ^ @type.qualifier
+//     ^ @type.qualifier
+//                        ^ @keyword
   use XHPHTMLHelpers;
 
   attribute string href @required;
-  //                      ^ attribute
+  //                      ^ @attribute
   attribute string target;
-  // ^ keyword
+  // ^ @keyword
 
   <<__Override>>
   protected async function renderAsync(): Awaitable<x\node> {
     $id = $this->getID();
 
     $anchor = <a>{$this->getChildren()}</a>;
-                                    // ^ tag.delimiter
-                                    // ^ tag
+                                    // ^ @tag.delimiter
+                                    // ^ @tag
     $form = (
       <form
         id={$id}
@@ -38,7 +38,7 @@ final xhp class a_post extends x\element {
       'document.getElementById("'.$id.'").submit(); return false;',
     );
     $anchor->setAttribute('href', '#');
-    //        ^ method.call
+    //        ^ @method.call
 
     return $form;
   }
diff --git a/tests/query/injections/cuda/macro-self-injection.cu b/tests/query/injections/cuda/macro-self-injection.cu
index 1acef197b..a91184287 100644
--- a/tests/query/injections/cuda/macro-self-injection.cu
+++ b/tests/query/injections/cuda/macro-self-injection.cu
@@ -1,2 +1,2 @@
 #define FOO(X,Y) X + Y
-//                ^ cuda
+//                ^ @cuda
diff --git a/tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile b/tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile
index d25020494..00621f1a3 100644
--- a/tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile
+++ b/tests/query/injections/dockerfile/bash-on-run-instructions.dockerfile
@@ -1,6 +1,6 @@
 FROM foo
 RUN bar
-#   ^ bash
+#   ^ @bash
 RUN \
   baz
-# ^ bash
+# ^ @bash
diff --git a/tests/query/injections/ecma/ecma-test-injections.js b/tests/query/injections/ecma/ecma-test-injections.js
index 68d53721a..16ddd3c6b 100644
--- a/tests/query/injections/ecma/ecma-test-injections.js
+++ b/tests/query/injections/ecma/ecma-test-injections.js
@@ -1,9 +1,9 @@
 html`<p></p>`;
-   // ^ html
+   // ^ @html
 html(`<p></p>`);
-   // ^ html
+   // ^ @html
 svg`<p></p>`;
-   // ^ html
+   // ^ @html
 svg(`<p></p>`);
-   // ^ html
+   // ^ @html
 
diff --git a/tests/query/injections/html/test-html-injections.html b/tests/query/injections/html/test-html-injections.html
index 954ce5623..0df3bd420 100644
--- a/tests/query/injections/html/test-html-injections.html
+++ b/tests/query/injections/html/test-html-injections.html
@@ -6,50 +6,50 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="css/style.css" rel="stylesheet">
     <style> footer{ } </style>
-    <!--      ^ css  -->
+    <!--       ^ @css  -->
     <style title="Test Style without type attribute"> footer{ } </style>
-    <!--                                                ^ css  -->
+    <!--                                                 ^ @css  -->
     <style type="text/css" title="test style with defined type attribute"> footer{ } </style>
-    <!--                                                                    ^ css  -->
+    <!--                                                                     ^ @css  -->
   </head>
   <body>
     <script> const x = 1 </script>
-           <!-- ^ javascript -->
+           <!--  ^ @javascript -->
     <script defer> const x = 1 </script>
-                  <!-- ^ javascript -->
+                  <!--  ^ @javascript -->
     <script async defer> const x = 1 </script>
-                     <!-- ^ javascript -->
+                     <!--  ^ @javascript -->
     <script type="text/javascript"> const x = 1 </script>
-                                  <!-- ^ javascript -->
+                                  <!--  ^ @javascript -->
     <script type="text/ecmascript"> const x = 1 </script>
-                                  <!-- ^ javascript -->
+                                  <!--  ^ @javascript -->
     <script type="application/ecmascript"> const x = 1 </script>
-                                       <!-- ^ javascript -->
+                                       <!--  ^ @javascript -->
     <script type="application/javascript"> const x = 1 </script>
-                                       <!-- ^ javascript -->
+                                       <!--  ^ @javascript -->
     <script type="module"> import { foo } from "bar" </script>
-                                 <!-- ^ javascript -->
+                                 <!--  ^ @javascript -->
     <script defer type="text/javascript"> const x = 1 </script>
-                                        <!-- ^ javascript -->
+                                        <!--  ^ @javascript -->
     <script type="text/markdown">## Hello *World*!</script>
-                              <!-- ^ markdown -->
+                              <!--  ^ @markdown -->
     <script type="application/graphql">query OK { dokey }</script>
-                                      <!-- ^ graphql -->
+                                      <!--  ^ @graphql -->
     <script type="application/typescript">type A = number;</script>
-                                      <!-- ^ typescript -->
+                                      <!--  ^ @typescript -->
     <script type="application/json">{ "true": false }</script>
-                                      <!-- ^ json -->
+                                      <!--  ^ @json -->
     <script type="importmap">{ "true": false }</script>
-                                  <!-- ^ json -->
+                                  <!--  ^ @json -->
     <div style="height: 100%">
-               <!-- ^ css -->
+               <!--  ^ @css -->
       Test div to test css injections for style attributes
     </div>
 
     <input pattern="[0-9]+">
-                  <!-- ^ regex -->
+                  <!--  ^ @regex -->
     <input pattern=[0-9]+ type="tel">
-                <!-- ^ regex -->
+                <!--  ^ @regex -->
 
   </body>
 </html>
diff --git a/tests/query/injections/svelte/test-svelte-injections.svelte b/tests/query/injections/svelte/test-svelte-injections.svelte
index 5a9a03300..ea88aa6a9 100644
--- a/tests/query/injections/svelte/test-svelte-injections.svelte
+++ b/tests/query/injections/svelte/test-svelte-injections.svelte
@@ -1,23 +1,21 @@
 <script> import Button from "./Button.svelte"; </script>
-<!--              ^ javascript -->
+<!--               ^ @javascript -->
 <script lang="ts"> const foo: number = 1 </script>
-<!--                           ^ typescript -->
-<!--                           ^ !javascript -->
+<!--                            ^ @typescript -->
+<!--                            ^ @!javascript -->
 
 <style> main { font-family: sans-serif; text-align: center; } </style>
-<!--                       ^ css  -->
+<!--                        ^ @css  -->
 <style lang="scss"> main { &:hover { } } </style>
-<!--                       ^ scss -->
-<!--                       ^ !css -->
+<!--                        ^ @scss -->
+<!--                        ^ @!css -->
 
 <main>
 	<h1>Test file</h1>
   {#each someItems as someItem}
-<!--          ^ javascript
--->
+<!--          ^ @javascript -->
     <div>{someItem}</div>
-<!--         ^ javascript 
--->
+<!--          ^ @javascript -->
   {/each}
 	<Button />
   <button on:click={() => foo++}></button>
diff --git a/tests/query/injections/vue/negative-assertions.vue b/tests/query/injections/vue/negative-assertions.vue
index fdc871919..000702a17 100644
--- a/tests/query/injections/vue/negative-assertions.vue
+++ b/tests/query/injections/vue/negative-assertions.vue
@@ -1,4 +1,4 @@
 <script lang="ts"> const foo: number = "1" </script>
-<!--                          ^ !javascript   -->
+<!--                           ^ @!javascript   -->
 <style lang="scss"> .bar { &-baz { &.page{ } } } </style>
-<!--                          ^ !css          -->
+<!--                           ^ @!css          -->
diff --git a/tests/query/injections/vue/test-vue-injections.vue b/tests/query/injections/vue/test-vue-injections.vue
index 773e53a5f..4966e6ac0 100644
--- a/tests/query/injections/vue/test-vue-injections.vue
+++ b/tests/query/injections/vue/test-vue-injections.vue
@@ -1,38 +1,39 @@
 <template>
   <span>{{"Text inside interpolation"}}</span>
-  <!--      ^ typescript -->
+  <!--       ^ @typescript -->
 
   <template lang="pug"> a(:href="url") some link title in pug: </template>
-  <!--                                       ^ pug -->
+  <!--                                        ^ @pug -->
 
   <template v-if="'text inside directives'"></template>
-<!--              ^ typescript -->
+<!--               ^ @typescript -->
 </template>
 <script> const foo = "1" </script>
-<!--      ^ javascript -->
+<!--       ^ @javascript -->
 <script defer> const foo = "1" </script>
-<!--              ^ javascript -->
+<!--               ^ @javascript -->
 <script lang="js">function x(){ return 1;}</script>
-<!--                              ^ javascript -->
+<!--                               ^ @javascript -->
 <script lang="ts"> const foo: number = "1" </script>
-<!--                            ^ typescript -->
-<!--                            ^ !javascript -->
+<!--                             ^ @typescript -->
+<!--                             ^ @!javascript -->
 <script lang="ts" defer>const foo: number = 1 </script>
-<!--                            ^ typescript -->
-<!--                            ^ !javascript -->
+<!--                             ^ @typescript -->
+<!--                             ^ @!javascript -->
 <script lang="tsx" defer>const foo: number = 1</script>
-                              <!--  ^ tsx -->
-                              <!--  ^ !jsx -->
-                              <!--  ^ !typescript -->
+                              <!--   ^ @tsx -->
+                              <!--   ^ @!jsx -->
+                              <!--   ^ @!typescript -->
 <style> .bar { .foo{ } } </style>
-<!--                ^ css   -->
+<!--                 ^ @css   -->
 <style scoped> .page.page--news { background: rebeccapurple; } </style>
-<!--                ^ css  -->
+<!--                 ^ @css  -->
 <style lang="css"> .bar { justify-content: center; } </style>
-<!--                ^ css  -->
+<!--                 ^ @css  -->
 <style lang="scss"> .bar { &-baz { } } </style>
-<!--                       ^ scss -->
-<!--                       ^ !css -->
+<!--                        ^ @scss -->
+<!--                        ^ @!css -->
 <style scoped lang="scss">body{} </style>
-<!--                       ^ scss -->
-<!--                       ^ !css -->
+<!--                        ^ @scss -->
+<!--                        ^ @!css -->
+  // const file = files[0];
diff --git a/tests/query/injections/yaml/bash-on-github-actions.yml b/tests/query/injections/yaml/bash-on-github-actions.yml
index ba56de193..5c732b09b 100644
--- a/tests/query/injections/yaml/bash-on-github-actions.yml
+++ b/tests/query/injections/yaml/bash-on-github-actions.yml
@@ -14,10 +14,10 @@ jobs:
           node-version: '16'
       - name: Install dependencies
         run: npm ci
-      #      ^ bash
+      #      ^ @bash
       - name: Run tests
         run: npm test
-      #      ^ bash
+      #      ^ @bash
       - name: Parse Petalisp
         run: |
           git submodule init
@@ -27,6 +27,6 @@ jobs:
           else
             echo "Successfully parsed Petalisp"
           fi
-      #    ^ bash
+      #    ^ @bash
       - name: Run tests
         run: npm test
diff --git a/tests/query/injections/yaml/promql-on-prometheus-rules.yaml b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
index 8b1895c16..f064da375 100644
--- a/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
+++ b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
@@ -3,7 +3,7 @@ groups:
   rules:
   - alert: Node down
     expr: up{job="node_exporter"} == 0
-    #     ^ promql
+    #     ^ @promql
     for: 3m
     labels:
       severity: warning
@@ -13,7 +13,7 @@ groups:
   - alert: Node down
     expr: |
       up{job="node_exporter"} == 0
-    # ^ promql
+    # ^ @promql
     for: 3m
     labels:
       severity: warning

From 1ae9b0e4558fe7868f8cda2db65239cfb14836d0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 24 Dec 2023 10:00:20 +0100
Subject: [PATCH 0993/2704] feat!: align standard captures with upstream

Problem: Sharing highlight queries with upstream tree-sitter and
Helix is difficult.

Solution: Where reasonable, use capture names in tree-sitter's standard
list or Helix's Atom-style hierarchy.

Specifically:

* tree-sitter "standard capture names"
  (https://github.com/tree-sitter/tree-sitter/blob/3f44b896852eb7daaa6df4fb778c9bb52c70c815/highlight/src/lib.rs#L20-L72):

  - `@parameter` -> `@variable.parameter`
  - `@field` -> `@variable.member`
  - `@namespace` -> `@module`
  - `@float` -> `@number.float`
  - `@symbol` -> `@string.special.symbol`
  - `@string.regex` -> `@string.regexp`
  - `@text.*` -> `@markup.*` (`strong`, `italic`, `link`, `strikethrough`; with exceptions; see below)
  - `@text.title` -> `@markup.heading`
  - `@text.literal` -> `@markup.raw`
  - `@text.reference` -> `@markup.link`
  - `@text.uri` -> `@markup.link.url` (in markup links)
  - `@string.special` -> `@markup.link.label` (non-url links)
  - `@punctuation.special` -> `@markup.list` (markdown lists only; move subitems from `@text.todo`)

* Helix captures
  (https://docs.helix-editor.com/master/themes.html#syntax-highlighting):

  - `@method` -> `@function.method`
  - `@method.call` -> `@function.method.call`
  - `@text.{todo,warning,note,danger}` -> `@comment.{error,warning,hint,info,todo}`
  - `@text.diff.{add,delete,}` -> `@diff.{plus,minus,delta}`
  - `@text.uri` -> `@string.special.url` (outside markup)
  - `@preproc` -> `@keyword.directive`
  - `@define` -> `@keyword.directive`(`.define`?)
  - `@storageclass` -> `@keyword.storage`
  - `@conditional` -> `@keyword.conditional`
  - `@debug` -> `@keyword.debug`
  - `@exception` -> `@keyword.exception`
  - `@include` -> `@keyword.import`
  - `@repeat` -> `@keyword.repeat`

* cleanup

  - remove some redundant `@conceal` (but still allow it for conceal-only patterns)
  - remove obsolete `@error` (syntax linting is out of scope for this repo)
  - sort, cleanup capture list in `CONTRIBUTING.md`
---
 CONTRIBUTING.md                               | 258 ++++++++++--------
 queries/ada/highlights.scm                    |  30 +-
 queries/agda/highlights.scm                   |   6 +-
 queries/angular/highlights.scm                |   2 +-
 queries/apex/highlights.scm                   |  16 +-
 queries/awk/highlights.scm                    |  20 +-
 queries/bash/highlights.scm                   |  20 +-
 queries/bass/highlights.scm                   |  20 +-
 queries/beancount/highlights.scm              |   2 +-
 queries/bibtex/highlights.scm                 |   6 +-
 queries/bicep/highlights.scm                  |  26 +-
 queries/bitbake/highlights.scm                |  54 ++--
 queries/blueprint/highlights.scm              |   8 +-
 queries/c/highlights.scm                      |  34 +--
 queries/c_sharp/highlights.scm                |  44 +--
 queries/cairo/highlights.scm                  |  56 ++--
 queries/capnp/highlights.scm                  |  20 +-
 queries/chatito/highlights.scm                |  10 +-
 queries/clojure/highlights.scm                |  62 ++---
 queries/cmake/highlights.scm                  |  24 +-
 queries/comment/highlights.scm                |  38 +--
 queries/commonlisp/highlights.scm             |  26 +-
 queries/cooklang/highlights.scm               |   6 +-
 queries/corn/highlights.scm                   |   2 +-
 queries/cpon/highlights.scm                   |   4 +-
 queries/cpp/highlights.scm                    |  30 +-
 queries/css/highlights.scm                    |   4 +-
 queries/cuda/highlights.scm                   |   2 +-
 queries/cue/highlights.scm                    |  16 +-
 queries/d/highlights.scm                      |  22 +-
 queries/dart/highlights.scm                   |  20 +-
 queries/devicetree/highlights.scm             |   4 +-
 queries/dhall/highlights.scm                  |  16 +-
 queries/diff/highlights.scm                   |   4 +-
 queries/dot/highlights.scm                    |   6 +-
 queries/doxygen/highlights.scm                |   6 +-
 queries/dtd/highlights.scm                    |  20 +-
 queries/ebnf/highlights.scm                   |   4 +-
 queries/ecma/highlights.scm                   |  46 ++--
 queries/elixir/highlights.scm                 |   4 +-
 queries/elm/highlights.scm                    |  20 +-
 queries/elsa/highlights.scm                   |   4 +-
 queries/elvish/highlights.scm                 |  22 +-
 queries/erlang/highlights.scm                 |  28 +-
 queries/facility/highlights.scm               |   2 +-
 queries/fennel/highlights.scm                 |  22 +-
 queries/firrtl/highlights.scm                 |  36 +--
 queries/fish/highlights.scm                   |  24 +-
 queries/foam/highlights.scm                   |  24 +-
 queries/fortran/highlights.scm                |  28 +-
 queries/fsh/highlights.scm                    |   2 +-
 queries/func/highlights.scm                   |  16 +-
 queries/fusion/highlights.scm                 |  12 +-
 queries/gdscript/highlights.scm               |  24 +-
 queries/git_config/highlights.scm             |  16 +-
 queries/git_rebase/highlights.scm             |   2 +-
 queries/gitattributes/highlights.scm          |  15 +-
 queries/gitcommit/highlights.scm              |  22 +-
 queries/gleam/highlights.scm                  |  18 +-
 queries/glimmer/highlights.scm                |  12 +-
 queries/glsl/highlights.scm                   |   2 +-
 queries/gn/highlights.scm                     |   8 +-
 queries/go/highlights.scm                     |  24 +-
 queries/go/locals.scm                         |   2 +-
 queries/godot_resource/highlights.scm         |   2 +-
 queries/gomod/highlights.scm                  |   2 +-
 queries/gosum/highlights.scm                  |   4 +-
 queries/gpg/highlights.scm                    |  10 +-
 queries/graphql/highlights.scm                |  10 +-
 queries/groovy/highlights.scm                 |   6 +-
 queries/gstlaunch/highlights.scm              |   2 +-
 queries/hack/highlights.scm                   |  30 +-
 queries/hare/highlights.scm                   |  26 +-
 queries/haskell/highlights.scm                |  50 ++--
 queries/haskell_persistent/highlights.scm     |   4 +-
 queries/hcl/highlights.scm                    |  10 +-
 queries/heex/highlights.scm                   |   2 +-
 queries/hocon/highlights.scm                  |   6 +-
 queries/hoon/highlights.scm                   |   4 +-
 queries/html_tags/highlights.scm              |  32 +--
 queries/htmldjango/highlights.scm             |   4 +-
 queries/http/highlights.scm                   |   8 +-
 queries/hurl/highlights.scm                   |  11 +-
 queries/ini/highlights.scm                    |   3 +-
 queries/ispc/highlights.scm                   |   4 +-
 queries/janet_simple/highlights.scm           |   6 +-
 queries/java/highlights.scm                   |  32 +--
 queries/javascript/highlights.scm             |  20 +-
 queries/jq/highlights.scm                     |   8 +-
 queries/jsonnet/highlights.scm                |  16 +-
 queries/julia/highlights.scm                  |  54 ++--
 queries/kconfig/highlights.scm                |  12 +-
 queries/kdl/highlights.scm                    |   4 +-
 queries/kotlin/highlights.scm                 |  26 +-
 queries/kusto/highlights.scm                  |   4 +-
 queries/lalrpop/highlights.scm                |   6 +-
 queries/latex/highlights.scm                  | 146 +++++-----
 queries/ledger/highlights.scm                 |   6 +-
 queries/leo/highlights.scm                    |  20 +-
 queries/linkerscript/highlights.scm           |  12 +-
 queries/liquidsoap/highlights.scm             |  22 +-
 queries/llvm/highlights.scm                   |   6 +-
 queries/lua/highlights.scm                    |  34 +--
 queries/luadoc/highlights.scm                 |  18 +-
 queries/luap/highlights.scm                   |   2 +-
 queries/luau/highlights.scm                   |  36 +--
 queries/m68k/highlights.scm                   |  18 +-
 queries/make/highlights.scm                   |  14 +-
 queries/markdown/highlights.scm               |  78 +++---
 queries/markdown_inline/highlights.scm        |  57 ++--
 queries/matlab/highlights.scm                 |  34 +--
 queries/menhir/highlights.scm                 |   4 +-
 queries/mermaid/highlights.scm                |  18 +-
 queries/meson/highlights.scm                  |   6 +-
 queries/mlir/highlights.scm                   |   6 +-
 queries/nasm/highlights.scm                   |  14 +-
 queries/nickel/highlights.scm                 |  10 +-
 queries/nim/highlights.scm                    | 132 ++++-----
 queries/nim_format_string/highlights.scm      |   4 +-
 queries/ninja/highlights.scm                  |   4 +-
 queries/nix/highlights.scm                    |  25 +-
 queries/nqc/highlights.scm                    |   2 +-
 queries/objc/highlights.scm                   |  34 +--
 queries/objdump/highlights.scm                |  24 +-
 queries/ocaml/highlights.scm                  |  14 +-
 queries/ocamllex/highlights.scm               |   2 +-
 queries/odin/highlights.scm                   |  40 +--
 queries/pascal/highlights.scm                 |  24 +-
 queries/passwd/highlights.scm                 |   8 +-
 queries/perl/highlights.scm                   |  24 +-
 queries/php/highlights.scm                    |  28 +-
 queries/phpdoc/highlights.scm                 |  14 +-
 queries/pioasm/highlights.scm                 |   6 +-
 queries/po/highlights.scm                     |   2 +-
 queries/pod/highlights.scm                    |  18 +-
 queries/poe_filter/highlights.scm             |   8 +-
 queries/pony/highlights.scm                   |  46 ++--
 queries/promql/highlights.scm                 |  10 +-
 queries/proto/highlights.scm                  |   4 +-
 queries/prql/highlights.scm                   |  14 +-
 queries/pug/highlights.scm                    |  24 +-
 queries/puppet/highlights.scm                 |  28 +-
 queries/purescript/highlights.scm             |  24 +-
 queries/python/highlights.scm                 |  64 ++---
 queries/ql/highlights.scm                     |  12 +-
 queries/qmldir/highlights.scm                 |   4 +-
 queries/qmljs/highlights.scm                  |   6 +-
 queries/query/highlights.scm                  |  12 +-
 queries/r/highlights.scm                      |  24 +-
 queries/racket/highlights.scm                 |  12 +-
 queries/rasi/highlights.scm                   |   6 +-
 queries/rbs/highlights.scm                    |  10 +-
 queries/re2c/highlights.scm                   |  10 +-
 queries/regex/highlights.scm                  |   2 +-
 queries/rego/highlights.scm                   |  12 +-
 queries/requirements/highlights.scm           |   6 +-
 queries/robot/highlights.scm                  |  20 +-
 queries/ron/highlights.scm                    |   2 +-
 queries/rst/highlights.scm                    |  44 +--
 queries/ruby/highlights.scm                   |  40 +--
 queries/rust/highlights.scm                   |  68 ++---
 queries/scala/highlights.scm                  |  43 +--
 queries/scfg/highlights.scm                   |   2 +-
 queries/scheme/highlights.scm                 |  10 +-
 queries/scss/highlights.scm                   |  22 +-
 queries/slang/highlights.scm                  |   2 +-
 queries/slint/highlights.scm                  |  20 +-
 queries/smali/highlights.scm                  |  48 ++--
 queries/smithy/highlights.scm                 |  18 +-
 queries/snakemake/highlights.scm              |  10 +-
 queries/solidity/highlights.scm               |  50 ++--
 queries/soql/highlights.scm                   |   4 +-
 queries/sparql/highlights.scm                 |  14 +-
 queries/sql/highlights.scm                    |  12 +-
 queries/squirrel/highlights.scm               |  20 +-
 queries/ssh_config/highlights.scm             |   8 +-
 queries/starlark/highlights.scm               |  42 +--
 queries/strace/highlights.scm                 |   2 +-
 queries/supercollider/highlights.scm          |  12 +-
 queries/surface/highlights.scm                |   4 +-
 queries/svelte/highlights.scm                 |   8 +-
 queries/swift/highlights.scm                  |  32 +--
 queries/systemtap/highlights.scm              |  18 +-
 queries/t32/highlights.scm                    |  20 +-
 queries/tablegen/highlights.scm               |  18 +-
 queries/teal/highlights.scm                   |  12 +-
 queries/templ/highlights.scm                  |   2 +-
 queries/terraform/highlights.scm              |   2 +-
 queries/textproto/highlights.scm              |   2 +-
 queries/thrift/highlights.scm                 |  20 +-
 queries/tiger/highlights.scm                  |  12 +-
 queries/tlaplus/highlights.scm                |  48 ++--
 queries/toml/highlights.scm                   |   2 +-
 queries/tsv/highlights.scm                    |   2 +-
 queries/turtle/highlights.scm                 |   4 +-
 queries/twig/highlights.scm                   |   8 +-
 queries/typescript/highlights.scm             |  28 +-
 queries/typoscript/highlights.scm             |   6 +-
 queries/ungrammar/highlights.scm              |   2 +-
 queries/unison/highlights.scm                 |  16 +-
 queries/usd/highlights.scm                    |  10 +-
 queries/uxntal/highlights.scm                 |  14 +-
 queries/v/highlights.scm                      |  30 +-
 queries/vala/highlights.scm                   |  44 +--
 queries/verilog/highlights.scm                |  24 +-
 queries/vhs/highlights.scm                    |   7 +-
 queries/vim/highlights.scm                    |  22 +-
 queries/vimdoc/highlights.scm                 |  44 +--
 queries/vue/highlights.scm                    |   2 +-
 queries/wgsl/highlights.scm                   |  12 +-
 queries/wgsl_bevy/highlights.scm              |  10 +-
 queries/wing/highlights.scm                   |  10 +-
 queries/xcompose/highlights.scm               |   2 +-
 queries/xml/highlights.scm                    |  14 +-
 queries/yaml/highlights.scm                   |  10 +-
 queries/yang/highlights.scm                   |   6 +-
 queries/yuck/highlights.scm                   |  14 +-
 queries/zig/highlights.scm                    |  22 +-
 tests/query/highlights/capnp/test.capnp       |  28 +-
 tests/query/highlights/clojure/test.clj       |  14 +-
 tests/query/highlights/cpp/concepts.cpp       |   2 +-
 .../highlights/cpp/enums-as-constants.cpp     |   2 +-
 tests/query/highlights/cpp/test.cpp           |   4 +-
 tests/query/highlights/ecma/test.ts           |   8 +-
 tests/query/highlights/fusion/basic.fusion    |  14 +-
 .../highlights/fusion/expressions.fusion      |   4 +-
 .../gitattributes/test.gitattributes          |   6 +-
 tests/query/highlights/gleam/assert.gleam     |   2 +-
 tests/query/highlights/gleam/function.gleam   |  20 +-
 tests/query/highlights/gleam/import.gleam     |  16 +-
 tests/query/highlights/hack/as-foreach.hack   |   2 +-
 tests/query/highlights/hack/generics.hack     |   6 +-
 tests/query/highlights/hack/shapes.hack       |   2 +-
 tests/query/highlights/hack/use.hack          |  14 +-
 tests/query/highlights/haskell/test.hs        | 124 ++++-----
 tests/query/highlights/hocon/test.conf        |   4 +-
 tests/query/highlights/markdown/test.md       |  30 +-
 tests/query/highlights/nix/test.nix           |   8 +-
 tests/query/highlights/python/fields.py       |   6 +-
 .../query/highlights/python/future_import.py  |   4 +-
 .../highlights/python/pattern_matching.py     |  22 +-
 tests/query/highlights/python/raise_from.py   |   4 +-
 tests/query/highlights/python/yield_from.py   |   4 +-
 tests/query/highlights/r/test.r               |  18 +-
 tests/query/highlights/rust/for.rs            |   2 +-
 .../highlights/rust/super-crate-imports.rs    |   8 +-
 .../smali/baksmali_test_class.smali           |  26 +-
 tests/query/highlights/solidity/test.sol      |  12 +-
 tests/query/highlights/t32/keywords.cmm       |  20 +-
 tests/query/highlights/t32/literals.cmm       |  10 +-
 tests/query/highlights/t32/var.cmm            |   2 +-
 tests/query/highlights/tiger/functions.tig    |   4 +-
 tests/query/highlights/tiger/identifiers.tig  |   4 +-
 tests/query/highlights/tiger/imports.tig      |   4 +-
 tests/query/highlights/tiger/keywords.tig     |  12 +-
 .../highlights/tiger/object-oriented.tig      |   4 +-
 tests/query/highlights/typescript/as.ts       |   4 +-
 tests/query/highlights/usd/prims.usda         |  18 +-
 tests/query/highlights/usd/properties.usda    |   6 +-
 tests/query/highlights/usd/subLayers.usda     |   2 +-
 tests/query/highlights/wing/class.w           |   2 +-
 tests/query/highlights/wing/nested_method.w   |   2 +-
 tests/query/highlights/xhp-intro.hack         |   2 +-
 263 files changed, 2356 insertions(+), 2337 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 209886d54..8c98c46b3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -84,16 +84,88 @@ you can mark the language as optional (by putting it between parenthesis).
 
 As languages differ quite a lot, here is a set of captures available to you when building a `highlights.scm` query. Note that your colorscheme needs to define (or link) these captures as highlight groups.
 
-#### Misc
+#### Identifiers
 
-```scheme
-@comment               ; line and block comments
-@comment.documentation ; comments documenting code
-@error                 ; syntax/parser errors
-@none                  ; completely disable the highlight
-@preproc               ; various preprocessor directives & shebangs
-@define                ; preprocessor definition directives
-@operator              ; symbolic operators (e.g. `+` / `*`)
+```query
+@variable            ; various variable names
+@variable.builtin    ; built-in variable names (e.g. `this`)
+@variable.parameter  ; parameters of a function
+@variable.member     ; object and struct fields
+
+@constant          ; constant identifiers
+@constant.builtin  ; built-in constant values
+@constant.macro    ; constants defined by the preprocessor
+
+@module            ; modules or namespaces
+@module.builtin    ; built-in modules or namespaces
+@label             ; GOTO and other labels (e.g. `label:` in C), including heredoc labels
+```
+#### Literals
+
+```query
+@string                 ; string literals
+@string.documentation   ; string documenting code (e.g. Python docstrings)
+@string.regexp          ; regular expressions
+@string.escape          ; escape sequences
+@string.special         ; other special strings (e.g. dates)
+@string.special.symbol  ; symbols or atoms
+@string.special.url     ; URIs (e.g. hyperlinks)
+@string.special.path    ; filenames
+
+@character              ; character literals
+@character.special      ; special characters (e.g. wildcards)
+
+@boolean                ; boolean literals
+@number                 ; numeric literals
+@number.float           ; floating-point number literals
+```
+
+#### Types
+
+```query
+@type             ; type or class definitions and annotations
+@type.builtin     ; built-in types
+@type.definition  ; identifiers in type definitions (e.g. `typedef <type> <identifier>` in C)
+@type.qualifier   ; type qualifiers (e.g. `const`)
+
+@attribute        ; attribute annotations (e.g. Python decorators)
+@property         ; the key in key/value pairs
+```
+
+#### Functions
+
+```query
+@function             ; function definitions
+@function.builtin     ; built-in functions
+@function.call        ; function calls
+@function.macro       ; preprocessor macros
+
+@function.method      ; method definitions
+@function.method.call ; method calls
+
+@constructor          ; constructor calls and definitions
+@operator             ; symbolic operators (e.g. `+` / `*`)
+```
+
+#### Keywords
+
+```query
+@keyword                   ; keywords not fitting into specific categories
+@keyword.coroutine         ; keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)
+@keyword.function          ; keywords that define a function (e.g. `func` in Go, `def` in Python)
+@keyword.operator          ; operators that are English words (e.g. `and` / `or`)
+@keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
+@keyword.storage           ; modifiers that affect storage in memory or life-time
+@keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
+@keyword.return            ; keywords like `return` and `yield`
+@keyword.debug             ; keywords related to debugging
+@keyword.exception         ; keywords related to exceptions (e.g. `throw` / `catch`)
+
+@keyword.conditional         ; keywords related to conditionals (e.g. `if` / `else`)
+@keyword.conditional.ternary ; ternary operator (e.g. `?` / `:`)
+
+@keyword.directive         ; various preprocessor directives & shebangs
+@keyword.directive.define  ; preprocessor definition directives
 ```
 
 #### Punctuation
@@ -104,119 +176,53 @@ As languages differ quite a lot, here is a set of captures available to you when
 @punctuation.special   ; special symbols (e.g. `{}` in string interpolation)
 ```
 
-#### Literals
+#### Comments
 
-```scheme
-@string               ; string literals
-@string.documentation ; string documenting code (e.g. Python docstrings)
-@string.regex         ; regular expressions
-@string.escape        ; escape sequences
-@string.special       ; other special strings (e.g. dates)
+```query
+@comment               ; line and block comments
+@comment.documentation ; comments documenting code
 
-@character            ; character literals
-@character.special    ; special characters (e.g. wildcards)
-
-@boolean              ; boolean literals
-@number               ; numeric literals
-@float                ; floating-point number literals
+@comment.error         ; error-type comments (e.g., `DEPRECATED:`)
+@comment.warning       ; warning-type comments (e.g., `WARNING:`, `FIX:`)
+@comment.hint          ; note-type comments (e.g., `NOTE:`)
+@comment.info          ; info-type comments
+@comment.todo          ; todo-type comments (e.g-, `TODO:`, `WIP:`)
 ```
 
-#### Functions
-
-```scheme
-@function         ; function definitions
-@function.builtin ; built-in functions
-@function.call    ; function calls
-@function.macro   ; preprocessor macros
-
-@method           ; method definitions
-@method.call      ; method calls
-
-@constructor      ; constructor calls and definitions
-@parameter        ; parameters of a function
-```
-
-#### Keywords
-
-```scheme
-@keyword             ; various keywords
-@keyword.coroutine   ; keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)
-@keyword.function    ; keywords that define a function (e.g. `func` in Go, `def` in Python)
-@keyword.operator    ; operators that are English words (e.g. `and` / `or`)
-@keyword.return      ; keywords like `return` and `yield`
-
-@conditional         ; keywords related to conditionals (e.g. `if` / `else`)
-@conditional.ternary ; ternary operator (e.g. `?` / `:`)
-
-@repeat              ; keywords related to loops (e.g. `for` / `while`)
-@debug               ; keywords related to debugging
-@label               ; GOTO and other labels (e.g. `label:` in C)
-@include             ; keywords for including modules (e.g. `import` / `from` in Python)
-@exception           ; keywords related to exceptions (e.g. `throw` / `catch`)
-```
-
-#### Types
-
-```scheme
-@type            ; type or class definitions and annotations
-@type.builtin    ; built-in types
-@type.definition ; identifiers in type definitions (e.g. `typedef <type> <identifier>` in C)
-@type.qualifier  ; type qualifiers (e.g. `const`)
-
-@storageclass    ; modifiers that affect storage in memory or life-time
-@attribute       ; attribute annotations (e.g. Python decorators)
-@field           ; object and struct fields
-@property        ; similar to `@field`
-```
-
-#### Identifiers
-
-```scheme
-@variable         ; various variable names
-@variable.builtin ; built-in variable names (e.g. `this`)
-
-@constant         ; constant identifiers
-@constant.builtin ; built-in constant values
-@constant.macro   ; constants defined by the preprocessor
-
-@namespace        ; modules or namespaces
-@symbol           ; symbols or atoms
-```
-
-#### Text
+#### Markup
 
 Mainly for markup languages.
 
-```scheme
-@text                  ; non-structured text
-@text.strong           ; bold text
-@text.emphasis         ; text with emphasis
-@text.underline        ; underlined text
-@text.strike           ; strikethrough text
-@text.title            ; text that is part of a title
-@text.quote            ; text quotations
-@text.uri              ; URIs (e.g. hyperlinks)
-@text.math             ; math environments (e.g. `$ ... $` in LaTeX)
-@text.environment      ; text environments of markup languages
-@text.environment.name ; text indicating the type of an environment
-@text.reference        ; text references, footnotes, citations, etc.
+```query
+@markup.strong         ; bold text
+@markup.italic         ; text with emphasis
+@markup.strikethrough  ; strikethrough text
+@markup.underline      ; underlined text (only for literal underline markup!)
 
-@text.literal          ; literal or verbatim text (e.g., inline code)
-@text.literal.block    ; literal or verbatim text as a stand-alone block
+@markup.heading        ; headings, titles (including markers)
+
+@markup.quote          ; block quotes
+@markup.math           ; math environments (e.g. `$ ... $` in LaTeX)
+@markup.environment    ; environments (e.g. in LaTeX)
+
+@markup.link           ; text references, footnotes, citations, etc.
+@markup.link.label     ; link, reference descriptions
+@markup.link.url       ; URL-style links
+
+@markup.raw            ; literal or verbatim text (e.g., inline code)
+@markup.raw.block      ; literal or verbatim text as a stand-alone block
                        ; (use priority 90 for blocks with injections)
 
-@text.todo             ; todo notes
-@text.note             ; info notes
-@text.warning          ; warning notes
-@text.danger           ; danger/error notes
-
-@text.diff.add         ; added text (for diff files)
-@text.diff.delete      ; deleted text (for diff files)
+@markup.list           ; list markers
+@markup.list.checked   ; checked todo-style list markers
+@markup.list.unchecked ; unchecked todo-style list markers
 ```
 
-#### Tags
-
-Used for XML-like tags.
+```query
+@diff.plus       ; added text (for diff files)
+@diff.minus      ; deleted text (for diff files)
+@diff.delta      ; changed text (for diff files)
+```
 
 ```scheme
 @tag           ; XML tag names
@@ -224,17 +230,14 @@ Used for XML-like tags.
 @tag.delimiter ; XML tag delimiters
 ```
 
-#### Conceal
+#### Non-highlighting captures
 
-```scheme
-@conceal ; for captures that are only used for concealing
+```query
+@none    ; completely disable the highlight
+@conceal ; captures that are only meant to be concealed
 ```
 
-`@conceal` must be followed by `(#set! conceal "")`.
-
-#### Spell
-
-```scheme
+```query
 @spell   ; for defining regions to be spellchecked
 @nospell ; for defining regions that should NOT be spellchecked
 ```
@@ -243,6 +246,25 @@ The main types of nodes which are spell checked are:
 - Comments
 - Strings; where it makes sense. Strings that have interpolation or are typically used for non text purposes are not spell checked (e.g. bash).
 
+#### Predicates
+
+Captures can be restricted according to node contents using [predicates](https://neovim.io/doc/user/treesitter.html#treesitter-predicates). For performance reasons, prefer earlier predicates in this list:
+
+1. `#eq?` (literal match)
+2. `#any-of?` (one of several literal matches)
+3. `#lua-match?` (match against a [Lua pattern](https://neovim.io/doc/user/luaref.html#lua-pattern))
+4. `#match?`/`#vim-match?` (match against a [Vim regular expression](https://neovim.io/doc/user/pattern.html#regexp)
+
+#### Conceal
+
+Captures can be concealed by setting the [`conceal` metadata](https://neovim.io/doc/user/treesitter.html#treesitter-highlight-conceal), e.g..,
+```query
+    (fenced_code_block_delimiter @markup.raw.block (#set! conceal ""))
+```
+The capture should be meaningful to allow proper highlighting when `set conceallevel=0`. If the unconcealed capture should not be highlighted (e.g., because an earlier pattern handles this), you can use `@conceal`.
+
+A conceal can be restricted to part of the capture via the [`#offset!` directive](https://neovim.io/doc/user/treesitter.html#treesitter-directive-offset%21).
+
 #### Priority
 
 Captures can be assigned a priority to control precedence of highlights via the
diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index 694763073..a88935b2a 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -44,7 +44,7 @@
    "aliased"
    "constant"
    "renames"
-] @storageclass
+] @keyword.storage
 [
    "mod"
    "new"
@@ -56,7 +56,7 @@
 [
    "with"
    "use"
-] @include
+] @keyword.import
 [
    "body"
    "function"
@@ -79,7 +79,7 @@
    "parallel"
    "reverse"
    "some"
-] @repeat
+] @keyword.repeat
 [
    "return"
 ] @keyword.return
@@ -90,11 +90,11 @@
    "then"
    "elsif"
    "select"
-] @conditional
+] @keyword.conditional
 [
    "exception"
    "raise"
-] @exception
+] @keyword.exception
 (comment) @comment @spell
 (string_literal) @string
 (character_literal) @string
@@ -109,24 +109,24 @@
 (entry_declaration . (identifier) @function)
 
 ;; Some keywords should take different categories depending on the context
-(use_clause "use"  @include "type" @include)
-(with_clause "private" @include)
-(with_clause "limited" @include)
-(use_clause (_) @namespace)
-(with_clause (_) @namespace)
+(use_clause "use"  @keyword.import "type" @keyword.import)
+(with_clause "private" @keyword.import)
+(with_clause "limited" @keyword.import)
+(use_clause (_) @module)
+(with_clause (_) @module)
 
 (loop_statement "end" @keyword.repeat)
-(if_statement "end" @conditional)
+(if_statement "end" @keyword.conditional)
 (loop_parameter_specification "in" @keyword.repeat)
 (loop_parameter_specification "in" @keyword.repeat)
 (iterator_specification ["in" "of"] @keyword.repeat)
 (range_attribute_designator "range" @keyword.repeat)
 
-(raise_statement "with" @exception)
+(raise_statement "with" @keyword.exception)
 
-(gnatprep_declarative_if_statement)  @preproc
-(gnatprep_if_statement)              @preproc
-(gnatprep_identifier)                @preproc
+(gnatprep_declarative_if_statement)  @keyword.directive
+(gnatprep_if_statement)              @keyword.directive
+(gnatprep_identifier)                @keyword.directive
 
 (subprogram_declaration "is" @keyword.function "abstract"  @keyword.function)
 (aspect_specification "with" @keyword.function)
diff --git a/queries/agda/highlights.scm b/queries/agda/highlights.scm
index a5c42c0a8..6ff55d2fc 100644
--- a/queries/agda/highlights.scm
+++ b/queries/agda/highlights.scm
@@ -27,13 +27,13 @@
 
 ;; Imports and Module Declarations
 
-"import"  @include
+"import"  @keyword.import
 
-(module_name) @namespace
+(module_name) @module
 
 ;; Pragmas and comments
 
-(pragma) @preproc
+(pragma) @keyword.directive
 
 (comment) @comment @spell
 
diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index dc926bb9a..42d69c28a 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -6,7 +6,7 @@
   name: (identifier) @function)
 (pipe_call
   arguments: (pipe_arguments
-               (identifier) @parameter))
+               (identifier) @variable.parameter))
 
 (structural_assignment
   operator: (identifier) @keyword)
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index f5ce0b9fb..729a84d15 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -28,10 +28,10 @@
 ;; Methods
 
 (method_declaration
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 (method_invocation
-  name: (identifier) @method.call)
+  name: (identifier) @function.method.call)
 
 (super) @function.builtin
 
@@ -77,7 +77,7 @@
 (method_declaration
   (formal_parameters
     (formal_parameter
-      name: (identifier) @parameter)))
+      name: (identifier) @variable.parameter)))
 
 (constructor_declaration
   name: (identifier) @constructor)
@@ -142,10 +142,10 @@
 
 (field_declaration
   declarator: (variable_declarator
-    name: (identifier) @field))
+    name: (identifier) @variable.member))
 
 (field_access
-  field: (identifier) @field)
+  field: (identifier) @variable.member)
 
 ; Variables
 
@@ -194,14 +194,14 @@
   "if"
   "else"
   "switch"
-] @conditional
+] @keyword.conditional
 
 [
   "for"
   "while"
   "do"
   "break"
-] @repeat
+] @keyword.repeat
 
 [
   "return"
@@ -212,7 +212,7 @@
  "finally"
  "try"
  "catch"
- ] @exception
+ ] @keyword.exception
 
 "new" @keyword.operator
 
diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
index 4faf496e6..6d3b7ff0b 100644
--- a/queries/awk/highlights.scm
+++ b/queries/awk/highlights.scm
@@ -47,21 +47,21 @@
 (number) @number
 
 (string) @string
-(regex) @string.regex
+(regex) @string.regexp
 (escape_sequence) @string.escape
 
 (comment) @comment @spell
 
-((program . (comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+((program . (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
 
-(ns_qualified_name (namespace) @namespace)
+(ns_qualified_name (namespace) @module)
 (ns_qualified_name "::" @punctuation.delimiter)
 
 (func_def name: (_ (identifier) @function) @function)
 (func_call name: (_ (identifier) @function) @function)
 
-(func_def (param_list (identifier) @parameter))
+(func_def (param_list (identifier) @variable.parameter))
 
 [
   "print"
@@ -92,7 +92,7 @@
   "while"
   "for"
   "in"
-] @repeat
+] @keyword.repeat
 
 [
   "if"
@@ -100,14 +100,14 @@
   "switch"
   "case"
   "default"
-] @conditional
+] @keyword.conditional
 
 [
   "@include"
   "@load"
-] @include
+] @keyword.import
 
-"@namespace" @preproc
+"@namespace" @keyword.directive
 
 [
  "BEGIN"
@@ -156,7 +156,7 @@
 (ternary_exp [
   "?"
   ":"
-] @conditional.ternary)
+] @keyword.conditional.ternary)
 
 (update_exp [
   "++"
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 4ffae437e..033f9fbee 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -70,7 +70,7 @@
  "case"
  "in"
  "esac"
-] @conditional
+] @keyword.conditional
 
 [
  "for"
@@ -79,7 +79,7 @@
  "select"
  "until"
  "while"
-] @repeat
+] @keyword.repeat
 
 [
   "declare"
@@ -115,7 +115,7 @@
 
 (arithmetic_expansion "," @punctuation.delimiter)
 
-(ternary_expression [ "?" ":" ] @conditional.ternary)
+(ternary_expression [ "?" ":" ] @keyword.conditional.ternary)
 
 (binary_expression operator: _ @operator)
 (unary_expression operator: _ @operator)
@@ -140,8 +140,8 @@
 
 (command
   argument: [
-             (word) @parameter
-             (concatenation (word) @parameter)
+             (word) @variable.parameter
+             (concatenation (word) @variable.parameter)
              ])
 
 (number) @number
@@ -149,7 +149,7 @@
  (#lua-match? @number "^[0-9]+$"))
 
 (file_redirect
-  destination: (word) @parameter)
+  destination: (word) @variable.parameter)
 
 (file_descriptor) @operator
 
@@ -175,12 +175,12 @@
  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 (case_item
-  value: (word) @parameter)
+  value: (word) @variable.parameter)
 
 [
   (regex)
   (extglob_pattern)
-] @string.regex
+] @string.regexp
 
-((program . (comment) @preproc)
- (#lua-match? @preproc "^#!/"))
+((program . (comment) @keyword.directive)
+ (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/bass/highlights.scm b/queries/bass/highlights.scm
index 296443d52..3a16cbb34 100644
--- a/queries/bass/highlights.scm
+++ b/queries/bass/highlights.scm
@@ -21,13 +21,13 @@
 ;; Namespaces
 
 (symbind
-  (symbol) @namespace
+  (symbol) @module
   . (keyword))
 
 ;; Includes
 
-((symbol) @include
-  (#any-of? @include "use" "import" "load"))
+((symbol) @keyword.import
+  (#any-of? @keyword.import "use" "import" "load"))
 
 ;; Keywords
 
@@ -43,13 +43,13 @@
 ((list
   . (symbol) @keyword.function
   . (symbol) @function
-  (symbol)? @parameter)
+  (symbol)? @variable.parameter)
   (#any-of? @keyword.function "def" "defop" "defn" "fn"))
 
 ((cons
   . (symbol) @keyword.function
   . (symbol) @function
-  (symbol)? @parameter)
+  (symbol)? @variable.parameter)
   (#any-of? @keyword.function "def" "defop" "defn" "fn"))
 
 ((symbol) @function.builtin
@@ -60,13 +60,13 @@
 
 ;; Conditionals
 
-((symbol) @conditional
-  (#any-of? @conditional "if" "case" "cond" "when"))
+((symbol) @keyword.conditional
+  (#any-of? @keyword.conditional "if" "case" "cond" "when"))
 
 ;; Repeats
 
-((symbol) @repeat
-  (#any-of? @repeat "each"))
+((symbol) @keyword.repeat
+  (#any-of? @keyword.repeat "each"))
 
 ;; Operators
 
@@ -89,7 +89,7 @@
 
 (escape_sequence) @string.escape
 
-(path) @text.uri @string.special
+(path) @string.special.url
 
 (number) @number
 
diff --git a/queries/beancount/highlights.scm b/queries/beancount/highlights.scm
index 5817fb2e2..191dc519e 100644
--- a/queries/beancount/highlights.scm
+++ b/queries/beancount/highlights.scm
@@ -1,4 +1,4 @@
-(date) @field
+(date) @variable.member
 (txn) @attribute
 (account) @type
 (amount) @number
diff --git a/queries/bibtex/highlights.scm b/queries/bibtex/highlights.scm
index bd240f581..602ed5d27 100644
--- a/queries/bibtex/highlights.scm
+++ b/queries/bibtex/highlights.scm
@@ -23,10 +23,10 @@
 (number) @number
 
 (field
-  name: (identifier) @field)
+  name: (identifier) @variable.member)
 
 (token
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 
 [
   (brace_word)
@@ -36,7 +36,7 @@
 [
   (key_brace)
   (key_paren)
-] @symbol
+] @string.special.symbol
 
 (string
   name: (identifier) @constant)
diff --git a/queries/bicep/highlights.scm b/queries/bicep/highlights.scm
index b555edb37..ae691c76b 100644
--- a/queries/bicep/highlights.scm
+++ b/queries/bicep/highlights.scm
@@ -1,16 +1,16 @@
 ; Includes
 
 (import_statement
-  "import" @include)
+  "import" @keyword.import)
 
 (import_with_statement
-  "import" @include
-  "with" @include)
+  "import" @keyword.import
+  "with" @keyword.import)
 
 ; Namespaces
 
 (module_declaration
-  (identifier) @namespace)
+  (identifier) @module)
 
 ; Builtins
 
@@ -80,16 +80,16 @@
 ; Parameters
 
 (parameter_declaration
-  (identifier) @parameter
+  (identifier) @variable.parameter
   (_))
 
 (call_expression
   function: (_) 
-  (arguments (identifier) @parameter))
+  (arguments (identifier) @variable.parameter))
 
 (call_expression
   function: (_) 
-  (arguments (member_expression object: (identifier) @parameter)))
+  (arguments (member_expression object: (identifier) @variable.parameter)))
 
 ; Variables
 
@@ -118,16 +118,16 @@
 
 ; Conditionals
 
-"if" @conditional
+"if" @keyword.conditional
 
 (ternary_expression
-  "?" @conditional.ternary
-  ":" @conditional.ternary)
+  "?" @keyword.conditional.ternary
+  ":" @keyword.conditional.ternary)
 
 ; Loops
 
 (for_statement
-  "for" @repeat
+  "for" @keyword.repeat
   "in"
   ":" @punctuation.delimiter)
 
@@ -179,8 +179,8 @@
 (string) @string
 (import_string
   "'" @string
-  (import_name) @namespace
-  "@" @symbol
+  (import_name) @module
+  "@" @string.special.symbol
   (import_version) @string.special)
 
 (escape_sequence) @string.escape
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index 46eaf11e3..c4f51d624 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -6,7 +6,7 @@
   "require"
   "export"
   "import"
-] @include
+] @keyword.import
 
 ; Keywords
 
@@ -37,16 +37,16 @@
 (yield "from" @keyword.return)
 
 (future_import_statement
-  "from" @include
+  "from" @keyword.import
   "__future__" @constant.builtin)
-(import_from_statement "from" @include)
-"import" @include
+(import_from_statement "from" @keyword.import)
+"import" @keyword.import
 
-(aliased_import "as" @include)
+(aliased_import "as" @keyword.import)
 
-["if" "elif" "else"] @conditional
+["if" "elif" "else"] @keyword.conditional
 
-["for" "while" "break" "continue"] @repeat
+["for" "while" "break" "continue"] @keyword.repeat
 
 [
   "try"
@@ -54,13 +54,13 @@
   "except*"
   "raise"
   "finally"
-] @exception
+] @keyword.exception
 
-(raise_statement "from" @exception)
+(raise_statement "from" @keyword.exception)
 
 (try_statement
   (else_clause
-    "else" @exception))
+    "else" @keyword.exception))
 
 [
   "addtask"
@@ -73,7 +73,7 @@
 [
   "before"
   "after"
-] @storageclass
+] @keyword.storage
 
 [
   "append"
@@ -132,11 +132,11 @@
 
 ; Fields
 
-(flag) @field
+(flag) @variable.member
 
 ((attribute
-    attribute: (python_identifier) @field)
- (#lua-match? @field "^[%l_].*$"))
+    attribute: (python_identifier) @variable.member)
+ (#lua-match? @variable.member "^[%l_].*$"))
 
 ; Functions
 
@@ -145,7 +145,7 @@
 
 (call
   function: (attribute
-              attribute: (python_identifier) @method.call))
+              attribute: (python_identifier) @function.method.call))
 
 ((call
    function: (python_identifier) @constructor)
@@ -200,34 +200,34 @@
 
 ; Namespace
 
-(inherit_path) @namespace
+(inherit_path) @module
 
 ;; Normal parameters
 (parameters
-  (python_identifier) @parameter)
+  (python_identifier) @variable.parameter)
 ;; Lambda parameters
 (lambda_parameters
-  (python_identifier) @parameter)
+  (python_identifier) @variable.parameter)
 (lambda_parameters
   (tuple_pattern
-    (python_identifier) @parameter))
+    (python_identifier) @variable.parameter))
 ; Default parameters
 (keyword_argument
-  name: (python_identifier) @parameter)
+  name: (python_identifier) @variable.parameter)
 ; Naming parameters on call-site
 (default_parameter
-  name: (python_identifier) @parameter)
+  name: (python_identifier) @variable.parameter)
 (typed_parameter
-  (python_identifier) @parameter)
+  (python_identifier) @variable.parameter)
 (typed_default_parameter
-  (python_identifier) @parameter)
+  (python_identifier) @variable.parameter)
 ; Variadic parameters *args, **kwargs
 (parameters
   (list_splat_pattern ; *args
-    (python_identifier) @parameter))
+    (python_identifier) @variable.parameter))
 (parameters
   (dictionary_splat_pattern ; **kwargs
-    (python_identifier) @parameter))
+    (python_identifier) @variable.parameter))
 
 ;; Literals
 
@@ -239,7 +239,7 @@
  (#eq? @variable.builtin "cls"))
 
 (integer) @number
-(float) @float
+(float) @number.float
 
 ; Operators
 
@@ -309,7 +309,7 @@
   "\""
 ] @string
 
-(include_path) @string.special
+(include_path) @string.special.path
 
 [
   (escape_sequence)
diff --git a/queries/blueprint/highlights.scm b/queries/blueprint/highlights.scm
index d85986ffd..3e3a8e4a8 100644
--- a/queries/blueprint/highlights.scm
+++ b/queries/blueprint/highlights.scm
@@ -9,7 +9,7 @@
 
 (boolean) @boolean
 
-(using) @include
+(using) @keyword.import
 
 (template) @keyword
 
@@ -34,11 +34,11 @@
 
 (template_definition (template_name_qualifier) @type.qualifier)
 
-(import_statement (gobject_library) @namespace)
+(import_statement (gobject_library) @module)
 
-(import_statement (version_number) @float)
+(import_statement (version_number) @number.float)
 
-(float) @float
+(float) @number.float
 (number) @number
 
 [
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 74656e336..33c30f095 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -1,4 +1,4 @@
-; Lower priority to prefer @parameter when identifier appears in parameter_declaration.
+; Lower priority to prefer @variable.parameter when identifier appears in parameter_declaration.
 ((identifier) @variable (#set! "priority" 95))
 (preproc_def (preproc_arg) @variable)
 
@@ -27,14 +27,14 @@
   "do"
   "continue"
   "break"
-] @repeat
+] @keyword.repeat
 
 [
  "if"
  "else"
  "case"
  "switch"
-] @conditional
+] @keyword.conditional
 
 [
   "#if"
@@ -46,11 +46,11 @@
   "#elifdef"
   "#elifndef"
   (preproc_directive)
-] @preproc
+] @keyword.directive
 
-"#define" @define
+"#define" @keyword.directive.define
 
-"#include" @include
+"#include" @keyword.import
 
 [ ";" ":" "," "::" ] @punctuation.delimiter
 
@@ -111,7 +111,7 @@
   (false)
 ] @boolean
 
-(conditional_expression [ "?" ":" ] @conditional.ternary)
+(conditional_expression [ "?" ":" ] @keyword.conditional.ternary)
 
 (string_literal) @string
 (system_lib_string) @string
@@ -140,7 +140,7 @@
  (type_descriptor)
 ] @type
 
-(storage_class_specifier) @storageclass
+(storage_class_specifier) @keyword.storage
 
 [
   (type_qualifier)
@@ -149,7 +149,7 @@
 ] @type.qualifier
 
 (linkage_specification
-  "extern" @storageclass)
+  "extern" @keyword.storage)
 
 (type_definition
   declarator: (type_identifier) @type.definition)
@@ -236,13 +236,13 @@
 
 ;; Parameters
 (parameter_declaration
-  declarator: (identifier) @parameter)
+  declarator: (identifier) @variable.parameter)
 
 (parameter_declaration
-  declarator: (array_declarator) @parameter)
+  declarator: (array_declarator) @variable.parameter)
 
 (parameter_declaration
-  declarator: (pointer_declarator) @parameter)
+  declarator: (pointer_declarator) @variable.parameter)
 
 ; K&R functions
 ; To enable support for K&R functions,
@@ -250,24 +250,24 @@
 ; They are commented out as they'll conflict with C++
 ; Note that you'll need to have `; extends` at the top of your query file.
 ;
-; (parameter_list (identifier) @parameter)
+; (parameter_list (identifier) @variable.parameter)
 ;
 ; (function_definition
 ;   declarator: _
 ;   (declaration
-;     declarator: (identifier) @parameter))
+;     declarator: (identifier) @variable.parameter))
 ;
 ; (function_definition
 ;   declarator: _
 ;   (declaration
-;     declarator: (array_declarator) @parameter))
+;     declarator: (array_declarator) @variable.parameter))
 ;
 ; (function_definition
 ;   declarator: _
 ;   (declaration
-;     declarator: (pointer_declarator) @parameter))
+;     declarator: (pointer_declarator) @variable.parameter))
 
-(preproc_params (identifier) @parameter)
+(preproc_params (identifier) @variable.parameter)
 
 [
   "__attribute__"
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index bc74a16ff..1cd566728 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -5,10 +5,10 @@
   (#has-ancestor? @keyword accessor_declaration))
 
 (method_declaration
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 (local_function_statement
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 (method_declaration
   type: (identifier) @type)
@@ -23,41 +23,41 @@
 
 (invocation_expression
   (member_access_expression
-    name: (identifier) @method.call))
+    name: (identifier) @function.method.call))
 
 (invocation_expression
   function: (conditional_access_expression
     (member_binding_expression
-      name: (identifier) @method.call)))
+      name: (identifier) @function.method.call)))
 
 (namespace_declaration
-  name: [(qualified_name) (identifier)] @namespace)
+  name: [(qualified_name) (identifier)] @module)
 
 (qualified_name
   (identifier) @type)
 
 (invocation_expression
-      (identifier) @method.call)
+      (identifier) @function.method.call)
 
 (field_declaration
   (variable_declaration
     (variable_declarator
-      (identifier) @field)))
+      (identifier) @variable.member)))
 
 (initializer_expression
   (assignment_expression
-    left: (identifier) @field))
+    left: (identifier) @variable.member))
 
 (parameter_list
   (parameter
-   name: (identifier) @parameter))
+   name: (identifier) @variable.parameter))
 
 (parameter_list
   (parameter
    type: (identifier) @type))
 
 (integer_literal) @number
-(real_literal) @float
+(real_literal) @number.float
 
 (null_literal) @constant.builtin
 (character_literal) @character
@@ -154,12 +154,12 @@
 ; Generic Method invocation with generic type
 (invocation_expression
   function: (generic_name
-              . (identifier) @method.call))
+              . (identifier) @function.method.call))
 
 (invocation_expression
   (member_access_expression
     (generic_name
-      (identifier) @method)))
+      (identifier) @function.method)))
 
 (base_list
   (identifier) @type)
@@ -194,10 +194,10 @@
   (identifier) @type)
 
 (name_colon
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 
-(warning_directive) @text.warning
-(error_directive) @exception
+(warning_directive) @comment.warning
+(error_directive) @keyword.exception
 
 (define_directive
   (identifier) @constant) @constant.macro
@@ -231,7 +231,7 @@
  (elif_directive)
  (else_directive)
  (endif_directive)
-] @conditional
+] @keyword.conditional
 
 (if_directive
   (identifier) @constant)
@@ -245,14 +245,14 @@
  "continue"
  "goto"
  "foreach"
-] @repeat
+] @keyword.repeat
 
 [
  "try"
  "catch"
  "throw"
  "finally"
-] @exception
+] @keyword.exception
 
 [
  "+"
@@ -304,7 +304,7 @@
  ":"
 ] @punctuation.delimiter
 
-(conditional_expression ["?" ":"] @conditional.ternary)
+(conditional_expression ["?" ":"] @keyword.conditional.ternary)
 
 [
  "["
@@ -325,10 +325,10 @@
 [
  "using"
  "as"
-] @include
+] @keyword.import
 
 (alias_qualified_name
-  (identifier "global") @include)
+  (identifier "global") @keyword.import)
 
 [
  "with"
@@ -385,7 +385,7 @@
  "static"
  "volatile"
  "required"
-] @storageclass
+] @keyword.storage
 
 [
  "abstract"
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index 715644fcc..f8bacede9 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -3,17 +3,17 @@
 [
   "%builtins"
   "%lang"
-] @preproc
+] @keyword.directive
 
 ; Includes
 
-(import_statement [ "from" "import" ] @include module_name: (dotted_name (identifier) @namespace . ))
+(import_statement [ "from" "import" ] @keyword.import module_name: (dotted_name (identifier) @module . ))
 
 [
   "as"
   "use"
   "mod"
-] @include
+] @keyword.import
 
 ; Variables
 
@@ -21,24 +21,24 @@
 
 ; Namespaces
 
-(namespace_definition (identifier) @namespace)
+(namespace_definition (identifier) @module)
 
 (mod_item
-  name: (identifier) @namespace)
+  name: (identifier) @module)
 
-(use_list (self) @namespace)
+(use_list (self) @module)
 
-(scoped_use_list (self) @namespace)
+(scoped_use_list (self) @module)
 
 (scoped_identifier
-  path: (identifier) @namespace)
+  path: (identifier) @module)
 
 (scoped_identifier
  (scoped_identifier
-  name: (identifier) @namespace))
+  name: (identifier) @module))
 
 (scoped_type_identifier
-  path: (identifier) @namespace)
+  path: (identifier) @module)
 
 ((scoped_identifier
   path: (identifier) @type)
@@ -65,13 +65,13 @@
   (#lua-match? @constant "^[A-Z]"))
 
 (scoped_use_list
-  path: (identifier) @namespace)
+  path: (identifier) @module)
 
 (scoped_use_list
   path: (scoped_identifier
-          (identifier) @namespace))
+          (identifier) @module))
 
-(use_list (scoped_identifier (identifier) @namespace . (_)))
+(use_list (scoped_identifier (identifier) @module . (_)))
 
 (use_list (identifier) @type (#lua-match? @type "^[A-Z]"))
 
@@ -125,47 +125,47 @@
 [
   "tempvar"
   "extern"
-] @storageclass
+] @keyword.storage
 
 [
   "if"
   "else"
   "match"
-] @conditional
+] @keyword.conditional
 
 [
   "loop"
-] @repeat
+] @keyword.repeat
 
 [
   "assert"
   "static_assert"
   "nopanic"
-] @exception
+] @keyword.exception
 
 ; Fields
 
-(implicit_arguments (typed_identifier (identifier) @field))
+(implicit_arguments (typed_identifier (identifier) @variable.member))
 
-(member_expression "." (identifier) @field)
+(member_expression "." (identifier) @variable.member)
 
-(call_expression (assignment_expression left: (identifier) @field))
+(call_expression (assignment_expression left: (identifier) @variable.member))
 
-(tuple_expression (assignment_expression left: (identifier) @field))
+(tuple_expression (assignment_expression left: (identifier) @variable.member))
 
-(field_identifier) @field
+(field_identifier) @variable.member
 
-(shorthand_field_initializer (identifier) @field)
+(shorthand_field_initializer (identifier) @variable.member)
 
 ; Parameters
 
-(arguments (typed_identifier (identifier) @parameter))
+(arguments (typed_identifier (identifier) @variable.parameter))
 
-(call_expression (tuple_expression (assignment_expression left: (identifier) @parameter)))
+(call_expression (tuple_expression (assignment_expression left: (identifier) @variable.parameter)))
 
-(return_type (tuple_type (named_type . (identifier) @parameter)))
+(return_type (tuple_type (named_type . (identifier) @variable.parameter)))
 
-(parameter (identifier) @parameter)
+(parameter (identifier) @variable.parameter)
 
 ; Builtins
 
@@ -202,7 +202,7 @@
 
 ; Types
 
-(struct_definition . (identifier) @type (typed_identifier (identifier) @field)?)
+(struct_definition . (identifier) @type (typed_identifier (identifier) @variable.member)?)
 
 (named_type (identifier) @type .)
 
diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm
index f3954ae8c..80c8262e7 100644
--- a/queries/capnp/highlights.scm
+++ b/queries/capnp/highlights.scm
@@ -3,7 +3,7 @@
 [
   (unique_id)
   (top_level_annotation_body)
-] @preproc
+] @keyword.directive
 
 ; Includes
 
@@ -12,9 +12,9 @@
   "$import"
   "embed"
   "using"
-] @include
+] @keyword.import
 
-(import_path) @string @text.uri
+(import_path) @string.special.path
 
 ; Keywords
 
@@ -53,11 +53,11 @@
 [
   (annotation_definition_identifier)
   (method_identifier)
-] @method
+] @function.method
 
 ; Fields
 
-(field_identifier) @field
+(field_identifier) @variable.member
 
 ; Properties
 
@@ -68,9 +68,9 @@
 [
   (param_identifier)
   (return_identifier)
-] @parameter
+] @variable.parameter
 
-(annotation_target) @parameter.builtin
+(annotation_target) @variable.parameter.builtin
 
 ; Constants
 
@@ -110,7 +110,7 @@
   (namespace)
 ] @string
 
-(namespace) @text.underline
+(namespace) @string.special
 
 (escape_sequence) @string.escape
 
@@ -118,11 +118,11 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (boolean) @boolean
 
-(data_hex) @symbol
+(data_hex) @string.special.symbol
 
 ; Punctuation
 
diff --git a/queries/chatito/highlights.scm b/queries/chatito/highlights.scm
index 12a344523..913787012 100644
--- a/queries/chatito/highlights.scm
+++ b/queries/chatito/highlights.scm
@@ -12,14 +12,14 @@
 
 [":" ","] @punctuation.delimiter
 
-(["\"" "'"] @punctuation.special @conceal
+(["\"" "'"] @punctuation.special
             (#set! conceal ""))
 
 ["%" "?" "#"] @character.special
 
 ;; Entities
 
-(intent) @namespace
+(intent) @module
 
 (slot) @type
 
@@ -37,13 +37,13 @@
 
 ;; Import
 
-"import" @include
+"import" @keyword.import
 
-(file) @string.special
+(file) @string.special.path
 
 ;; Text
 
-(word) @text @spell
+(word) @spell
 
 ;; Comment
 
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 2d3922adf..d0b0bf0cb 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -17,14 +17,14 @@
  (dis_expr) @comment
  (#set! "priority" 105) ; Higher priority to mark the whole sexpr as a comment
 )
-(kwd_lit) @symbol
+(kwd_lit) @string.special.symbol
 (str_lit) @string
 (num_lit) @number
 (char_lit) @character
 (bool_lit) @boolean
 (nil_lit) @constant.builtin
 (comment) @comment @spell
-(regex_lit) @string.regex
+(regex_lit) @string.regexp
 
 ["'" "`"] @string.escape
 
@@ -49,13 +49,13 @@
 
 ; Quoted symbols
 (quoting_lit
- (sym_lit) @symbol)
+ (sym_lit) @string.special.symbol)
 (syn_quoting_lit
- (sym_lit) @symbol)
+ (sym_lit) @string.special.symbol)
 
 ; Used in destructure pattern
-((sym_lit) @parameter
- (#lua-match? @parameter "^[&]"))
+((sym_lit) @variable.parameter
+ (#lua-match? @variable.parameter "^[&]"))
 
 ; Inline function variables
 ((sym_lit) @variable.builtin
@@ -102,19 +102,19 @@
 ; Interop
 ; (.instanceMember instance args*)
 ; (.instanceMember Classname args*)
-((sym_lit) @method
- (#lua-match? @method "^%.[^-]"))
+((sym_lit) @function.method
+ (#lua-match? @function.method "^%.[^-]"))
 ; (.-instanceField instance)
-((sym_lit) @field
- (#lua-match? @field "^%.%-.*"))
+((sym_lit) @variable.member
+ (#lua-match? @variable.member "^%.%-.*"))
 ;  Classname/staticField
-((sym_lit) @field
- (#lua-match? @field "^[%u].*/.+"))
+((sym_lit) @variable.member
+ (#lua-match? @variable.member "^[%u].*/.+"))
 ; (Classname/staticMethod args*)
 (list_lit
  .
- (sym_lit) @method
- (#lua-match? @method "^[%u].*/.+"))
+ (sym_lit) @function.method
+ (#lua-match? @function.method "^[%u].*/.+"))
 ;; TODO: Special casing for the `.` macro
 
 ; Operators
@@ -145,29 +145,29 @@
  (#any-of? @comment "comment"))
 
 ; Conditionals
-((sym_lit) @conditional
- (#any-of? @conditional
+((sym_lit) @keyword.conditional
+ (#any-of? @keyword.conditional
   "case" "cond" "cond->" "cond->>" "condp"))
-((sym_lit) @conditional
- (#any-of? @conditional
+((sym_lit) @keyword.conditional
+ (#any-of? @keyword.conditional
   "if" "if-let" "if-not" "if-some"))
-((sym_lit) @conditional
- (#any-of? @conditional
+((sym_lit) @keyword.conditional
+ (#any-of? @keyword.conditional
   "when" "when-first" "when-let" "when-not" "when-some"))
 
 ; Repeats
-((sym_lit) @repeat
- (#any-of? @repeat
+((sym_lit) @keyword.repeat
+ (#any-of? @keyword.repeat
   "doseq" "dotimes" "for" "loop" "recur" "while"))
 
 ; Exception
-((sym_lit) @exception
- (#any-of? @exception
+((sym_lit) @keyword.exception
+ (#any-of? @keyword.exception
   "throw" "try" "catch" "finally"))
 
 ; Includes
-((sym_lit) @include
- (#any-of? @include "ns" "import" "require" "use"))
+((sym_lit) @keyword.import
+ (#any-of? @keyword.import "ns" "import" "require" "use"))
 
 ; Builtin macros
 ;; TODO: Do all these items belong here?
@@ -350,18 +350,18 @@
 ;; TODO: Reproduce bug and file ticket
  ;.
  ;[(vec_lit
- ;  (sym_lit)* @parameter)
+ ;  (sym_lit)* @variable.parameter)
  ; (list_lit
  ;  (vec_lit
- ;   (sym_lit)* @parameter))])
+ ;   (sym_lit)* @variable.parameter))])
   
 ;[((list_lit
 ;   (vec_lit
-;    (sym_lit) @parameter)
+;    (sym_lit) @variable.parameter)
 ;   (_)
 ;  +
 ; ((vec_lit
-;   (sym_lit) @parameter)
+;   (sym_lit) @variable.parameter)
 ;  (_)))
    
 
@@ -378,4 +378,4 @@
  (sym_lit) @_include
  (#eq? @_include "ns")
  .
- (sym_lit) @namespace)
+ (sym_lit) @module)
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index af6b70cc8..bdad657e3 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -21,7 +21,7 @@
 
 (normal_command (identifier) @function)
 
-["ENV" "CACHE"] @storageclass
+["ENV" "CACHE"] @keyword.storage
 ["$" "{" "}" "<" ">"] @punctuation.special
 ["(" ")"] @punctuation.bracket
 
@@ -37,18 +37,18 @@
  (elseif)
  (else)
  (endif)
-] @conditional
+] @keyword.conditional
 
 [
  (foreach)
  (endforeach)
  (while)
  (endwhile)
-] @repeat
+] @keyword.repeat
 
 (normal_command
-  (identifier) @repeat
-  (#match? @repeat "\\c^(continue|break)$")
+  (identifier) @keyword.repeat
+  (#match? @keyword.repeat "\\c^(continue|break)$")
 )
 (normal_command
   (identifier) @keyword.return
@@ -59,7 +59,7 @@
   (function)
   (argument_list
     . (argument) @function
-    (argument)* @parameter
+    (argument)* @variable.parameter
   )
 )
 
@@ -67,7 +67,7 @@
   (macro)
   (argument_list
     . (argument) @function.macro
-    (argument)* @parameter
+    (argument)* @variable.parameter
   )
 )
 
@@ -134,7 +134,7 @@
   (argument_list
     . (argument)
     (
-    (argument) @_cache @storageclass
+    (argument) @_cache @keyword.storage
     .
     (argument) @_type @type
     (#any-of? @_cache "CACHE")
@@ -148,8 +148,8 @@
   (#match? @_function "\\c^unset$")
   (argument_list
     . (argument)
-    (argument) @storageclass
-    (#any-of? @storageclass "CACHE" "PARENT_SCOPE")
+    (argument) @keyword.storage
+    (#any-of? @keyword.storage "CACHE" "PARENT_SCOPE")
   )
 )
 
@@ -213,5 +213,5 @@
 
 (escape_sequence) @string.escape
 
-((source_file . (line_comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+((source_file . (line_comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 87491c7a5..41b653e93 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -1,41 +1,43 @@
 ((tag
-  (name) @text.todo @nospell
-  ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
+  (name) @comment.todo @nospell
+  ("(" @punctuation.bracket
+    (user) @constant
+    ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.todo "TODO" "WIP"))
+  (#any-of? @comment.todo "TODO" "WIP"))
 
-("text" @text.todo @nospell
- (#any-of? @text.todo "TODO" "WIP"))
+("text" @comment.todo @nospell
+  (#any-of? @comment.todo "TODO" "WIP"))
 
 ((tag
-  (name) @text.note @nospell
+  (name) @comment.note @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
+  (#any-of? @comment.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
 
-("text" @text.note @nospell
- (#any-of? @text.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
+("text" @comment.note @nospell
+ (#any-of? @comment.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
 
 ((tag
-  (name) @text.warning @nospell
+  (name) @comment.warning @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.warning "HACK" "WARNING" "WARN" "FIX"))
+  (#any-of? @comment.warning "HACK" "WARNING" "WARN" "FIX"))
 
-("text" @text.warning @nospell
- (#any-of? @text.warning "HACK" "WARNING" "WARN" "FIX"))
+("text" @comment.warning @nospell
+ (#any-of? @comment.warning "HACK" "WARNING" "WARN" "FIX"))
 
 ((tag
-  (name) @text.danger @nospell
+  (name) @comment.error @nospell
   ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @text.danger "FIXME" "BUG" "ERROR"))
+  (#any-of? @comment.error "FIXME" "BUG" "ERROR"))
 
-("text" @text.danger @nospell
- (#any-of? @text.danger "FIXME" "BUG" "ERROR"))
+("text" @comment.error @nospell
+ (#any-of? @comment.error "FIXME" "BUG" "ERROR"))
 
 ; Issue number (#123)
 ("text" @number
  (#lua-match? @number "^#[0-9]+$"))
 
-((uri) @text.uri @nospell)
+((uri) @string.special.url @nospell)
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 55c0c8fc2..4c6501de6 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -10,14 +10,14 @@
 (defun_header
   function_name: (_) @function)
 (defun_header
-  lambda_list: (list_lit (sym_lit) @parameter))
+  lambda_list: (list_lit (sym_lit) @variable.parameter))
 (defun_header
   keyword: (defun_keyword "defmethod")
-  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @symbol)))
+  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @string.special.symbol)))
 (defun_header
-  lambda_list: (list_lit (list_lit . (sym_lit) @parameter . (_))))
+  lambda_list: (list_lit (list_lit . (sym_lit) @variable.parameter . (_))))
 (defun_header
-  specifier: (sym_lit) @symbol)
+  specifier: (sym_lit) @string.special.symbol)
 
 [":" "::" "."] @punctuation.special
 
@@ -51,14 +51,14 @@
 ] @function.macro
 "=" @operator
 
-(include_reader_macro) @symbol
+(include_reader_macro) @string.special.symbol
 ["#C" "#c"] @number
 
-[(kwd_lit) (self_referential_reader_macro)] @symbol
+[(kwd_lit) (self_referential_reader_macro)] @string.special.symbol
 
 (package_lit
-  package: (_) @namespace)
-"cl" @namespace
+  package: (_) @module)
+"cl" @module
 
 (str_lit) @string
 
@@ -119,10 +119,10 @@
  (#lua-match? @constant "^[+].+[+]$"))
 
 (var_quoting_lit
-  marker: "#'" @symbol
-  value: (_) @symbol)
+  marker: "#'" @string.special.symbol
+  value: (_) @string.special.symbol)
 
-["#" "#p" "#P"] @symbol
+["#" "#p" "#P"] @string.special.symbol
 
 (list_lit
   .
@@ -137,8 +137,8 @@
  (#match? @operator "^([+*-+=<>]|<=|>=|/=)$"))
 
 
-((sym_lit) @symbol
-(#lua-match? @symbol "^[&]"))
+((sym_lit) @string.special.symbol
+(#lua-match? @string.special.symbol "^[&]"))
 
 [(array_dimension) "#0A" "#0a"] @number
 
diff --git a/queries/cooklang/highlights.scm b/queries/cooklang/highlights.scm
index 4ced465bd..2ed9f2049 100644
--- a/queries/cooklang/highlights.scm
+++ b/queries/cooklang/highlights.scm
@@ -2,21 +2,21 @@
 
 (ingredient
   "@" @tag
-  (name)? @text.title
+  (name)? @markup.heading
 	(amount
 	  (quantity)? @number
 		(units)? @tag.attribute)?)
 
 (timer
   "~" @tag
-  (name)? @text.title
+  (name)? @markup.heading
 	(amount
 	  (quantity)? @number
 		(units)? @tag.attribute)?)
 
 (cookware
   "#" @tag
-  (name)? @text.title
+  (name)? @markup.heading
 	(amount
 	  (quantity)? @number
 		(units)? @tag.attribute)?)
diff --git a/queries/corn/highlights.scm b/queries/corn/highlights.scm
index 200c33e1b..18672fd04 100644
--- a/queries/corn/highlights.scm
+++ b/queries/corn/highlights.scm
@@ -15,6 +15,6 @@
 
 (string) @string
 (integer) @number
-(float) @float
+(float) @number.float
 (boolean) @boolean
 (null) @keyword
diff --git a/queries/cpon/highlights.scm b/queries/cpon/highlights.scm
index 36df3555c..370c48b1b 100644
--- a/queries/cpon/highlights.scm
+++ b/queries/cpon/highlights.scm
@@ -19,7 +19,7 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (boolean) @boolean
 
@@ -38,7 +38,7 @@
 
 [ "<" ">" ] @punctuation.bracket
 
-(("\"" @conceal)
+(("\"" @string)
  (#set! conceal ""))
 
 ; Comments
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index b9a8cfec0..4919a1b3f 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -1,33 +1,33 @@
 ; inherits: c
 
-((identifier) @field
-  (#lua-match? @field "^m_.*$"))
+((identifier) @variable.member
+  (#lua-match? @variable.member "^m_.*$"))
 
 (parameter_declaration
-  declarator: (reference_declarator) @parameter)
+  declarator: (reference_declarator) @variable.parameter)
 
 ; function(Foo ...foo)
 (variadic_parameter_declaration
   declarator: (variadic_declarator
-                (_) @parameter))
+                (_) @variable.parameter))
 ; int foo = 0
 (optional_parameter_declaration
-    declarator: (_) @parameter)
+    declarator: (_) @variable.parameter)
 
-;(field_expression) @parameter ;; How to highlight this?
+;(field_expression) @variable.parameter ;; How to highlight this?
 
 (((field_expression
-     (field_identifier) @method)) @_parent
+     (field_identifier) @function.method)) @_parent
  (#has-parent? @_parent template_method function_declarator))
 
 (field_declaration
-  (field_identifier) @field)
+  (field_identifier) @variable.member)
 
 (field_initializer
  (field_identifier) @property)
 
 (function_declarator
-  declarator: (field_identifier) @method)
+  declarator: (field_identifier) @function.method)
 
 (concept_definition
   name: (identifier) @type.definition)
@@ -37,17 +37,17 @@
 
 (auto) @type.builtin
 
-(namespace_identifier) @namespace
+(namespace_identifier) @module
 ((namespace_identifier) @type
   (#lua-match? @type "^[%u]"))
 
 (case_statement
   value: (qualified_identifier (identifier) @constant))
 
-(using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @namespace)
+(using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @module)
 
 (destructor_name
-  (identifier) @method)
+  (identifier) @function.method)
 
 ; functions
 (function_declarator
@@ -125,10 +125,10 @@
 ; methods
 (function_declarator
   (template_method
-    (field_identifier) @method))
+    (field_identifier) @function.method))
 (call_expression
   (field_expression
-    (field_identifier) @method.call))
+    (field_identifier) @function.method.call))
 
 ; constructors
 
@@ -176,7 +176,7 @@
  "catch"
  "noexcept"
  "throw"
-] @exception
+] @keyword.exception
 
 
 [
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index 383d6b7dc..8beba125f 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -9,7 +9,7 @@
  (from)
  ] @keyword
 
-"@import" @include
+"@import" @keyword.import
 
 (comment) @comment @spell
 
@@ -57,7 +57,7 @@
  (attribute_name)
  ] @property
 
-(namespace_name) @namespace
+(namespace_name) @module
 
 ((property_name) @type.definition
   (#lua-match? @type.definition "^[-][-]"))
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
index 275871deb..0a90dbf67 100644
--- a/queries/cuda/highlights.scm
+++ b/queries/cuda/highlights.scm
@@ -8,6 +8,6 @@
   "__global__"
   "__forceinline__"
   "__noinline__"
-] @storageclass
+] @keyword.storage
 
 "__launch_bounds__" @type.qualifier
diff --git a/queries/cue/highlights.scm b/queries/cue/highlights.scm
index 00088dec9..47fd36311 100644
--- a/queries/cue/highlights.scm
+++ b/queries/cue/highlights.scm
@@ -3,18 +3,18 @@
 [
   "package"
   "import"
-] @include
+] @keyword.import
 
 ; Namespaces
 
-(package_identifier) @namespace
+(package_identifier) @module
 
 (import_spec ["." "_"] @punctuation.special)
 
 [
   (attr_path)
   (package_path)
-] @text.uri ;; In attributes
+] @string.special.url ;; In attributes
 
 ; Attributes
 
@@ -22,13 +22,13 @@
 
 ; Conditionals
 
-"if" @conditional
+"if" @keyword.conditional
 
 ; Repeats
 
 [
   "for"
-] @repeat
+] @keyword.repeat
 
 (for_clause "_" @punctuation.special)
 
@@ -69,7 +69,7 @@
 
 (field 
   (label 
-  (identifier) @field))
+  (identifier) @variable.member))
 
 (selector_expression
   (_)
@@ -135,11 +135,11 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (si_unit
   (float)
-  (_) @symbol)
+  (_) @string.special.symbol)
 
 (boolean) @boolean
 
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
index 229a9bf55..18ced7246 100644
--- a/queries/d/highlights.scm
+++ b/queries/d/highlights.scm
@@ -59,7 +59,7 @@
 
 (integer_literal) @number
 
-(float_literal) @float
+(float_literal) @number.float
 
 [
   "true"
@@ -88,12 +88,12 @@
 
 (parameter
   (var_declarator
-    (identifier) @parameter
+    (identifier) @variable.parameter
   )
 )
 
 (function_literal
-  (identifier) @parameter
+  (identifier) @variable.parameter
 )
 
 (constructor
@@ -112,7 +112,7 @@
   "else"
   "if"
   "switch"
-] @conditional
+] @keyword.conditional
 
 [
   "break"
@@ -122,7 +122,7 @@
   "foreach"
   "foreach_reverse"
   "while"
-] @repeat
+] @keyword.repeat
 
 [
   "__parameters"
@@ -209,7 +209,7 @@
   "finally"
   "throw"
   "try"
-] @exception
+] @keyword.exception
 
 "null" @constant.builtin
 
@@ -218,7 +218,7 @@
   "const"
   "immutable"
   "shared"
-] @storageclass
+] @keyword.storage
 
 [
   "abstract"
@@ -241,11 +241,11 @@
   . (identifier) @type.definition)
 
 (module_declaration
-  "module" @include
+  "module" @keyword.import
 )
 
 (import_declaration
-  "import" @include
+  "import" @keyword.import
 )
 
 (type) @type
@@ -272,8 +272,8 @@
 
 (fundamental_type) @type.builtin
 
-(module_fully_qualified_name (packages (package_name) @namespace))
-(module_name) @namespace
+(module_fully_qualified_name (packages (package_name) @module))
+(module_name) @module
 
 (at_attribute) @attribute
 
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 3ebdae0ea..be2824da5 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -84,11 +84,11 @@
 (scoped_identifier
   scope: (identifier) @type)
 (function_signature
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 (getter_signature
-  (identifier) @method)
+  (identifier) @function.method)
 (setter_signature
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 (enum_declaration
   name: (identifier) @type)
 (enum_constant
@@ -131,10 +131,10 @@
 ; Parameters
 ; --------------------
 (formal_parameter
-    name: (identifier) @parameter)
+    name: (identifier) @variable.parameter)
 
 (named_argument
-  (label (identifier) @parameter))
+  (label (identifier) @variable.parameter))
 
 ; Literals
 ; --------------------
@@ -147,7 +147,7 @@
     ; (hex_floating_point_literal)
 ] @number
 
-(symbol_literal) @symbol
+(symbol_literal) @string.special.symbol
 (string_literal) @string
 (true) @boolean
 (false) @boolean
@@ -165,7 +165,7 @@
   "as"
   "show"
   "hide"
-] @include
+] @keyword.import
 
 ; Reserved words (cannot be used as identifiers)
 [
@@ -257,7 +257,7 @@
           "static"
           "typedef"))
 
-["if" "else" "switch" "default"] @conditional
+["if" "else" "switch" "default"] @keyword.conditional
 
 [
   "try"
@@ -265,6 +265,6 @@
   "catch"
   "finally"
   (break_statement)
-] @exception
+] @keyword.exception
 
-["do" "while" "continue" "for"] @repeat
+["do" "while" "continue" "for"] @keyword.repeat
diff --git a/queries/devicetree/highlights.scm b/queries/devicetree/highlights.scm
index a7504260a..6236189bf 100644
--- a/queries/devicetree/highlights.scm
+++ b/queries/devicetree/highlights.scm
@@ -3,7 +3,7 @@
 [
   (preproc_include)
   (dtsi_include)
-] @include
+] @keyword.import
 
 (preproc_def) @constant.macro
 (preproc_function_def) @function.macro
@@ -22,7 +22,7 @@
 (integer_literal) @number
 
 (identifier) @variable
-(node (identifier) @namespace)
+(node (identifier) @module)
 (property (identifier) @property)
 (labeled_item (identifier) @label)
 (call_expression (identifier) @function.macro)
diff --git a/queries/dhall/highlights.scm b/queries/dhall/highlights.scm
index cd068efd0..5e2a77848 100644
--- a/queries/dhall/highlights.scm
+++ b/queries/dhall/highlights.scm
@@ -2,11 +2,11 @@
 
 ;; Imports
 
-(missing_import) @include
+(missing_import) @keyword.import
 
 (local_import) @string.special.path
 
-(http_import) @string @text.uri
+(http_import) @string.special.url
 
 [
   (env_variable)
@@ -29,7 +29,7 @@
 
 ;; Parameters
 
-(lambda_expression label: (label) @parameter)
+(lambda_expression label: (label) @variable.parameter)
 
 ;; Variables
 
@@ -44,13 +44,13 @@
 
 ; Fields
 
-(record_literal_entry (label) @field)
+(record_literal_entry (label) @variable.member)
 
-(record_type_entry (label) @field)
+(record_type_entry (label) @variable.member)
 
 (selector
   (selector_dot)
-  (_) @field)
+  (_) @variable.member)
 
 ;; Keywords
 
@@ -141,7 +141,7 @@
   "if"
   "then"
   "else"
-] @conditional
+] @keyword.conditional
 
 ;; Literals
 
@@ -157,7 +157,7 @@
   (natural_literal)
 ] @number
 
-(double_literal) @float
+(double_literal) @number.float
 
 (boolean_literal) @boolean
 
diff --git a/queries/diff/highlights.scm b/queries/diff/highlights.scm
index 4b9cbad60..4288913d9 100644
--- a/queries/diff/highlights.scm
+++ b/queries/diff/highlights.scm
@@ -1,5 +1,5 @@
-[(addition) (new_file)] @text.diff.add
-[(deletion) (old_file)] @text.diff.delete
+[(addition) (new_file)] @diff.plus
+[(deletion) (old_file)] @diff.minus
 
 (commit) @constant
 (location) @attribute
diff --git a/queries/dot/highlights.scm b/queries/dot/highlights.scm
index 6916d3721..f204ce44c 100644
--- a/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -33,12 +33,12 @@
 
 (subgraph
   id: (id
-    (identifier) @namespace)
+    (identifier) @module)
 )
 
 (attribute
   name: (id
-    (identifier) @field)
+    (identifier) @variable.member)
 )
 
 (attribute
@@ -48,6 +48,6 @@
 
 (comment) @comment
 
-(preproc) @preproc
+(preproc) @keyword.directive
 
 (comment) @spell
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
index 42d76a448..fadcdfa80 100644
--- a/queries/doxygen/highlights.scm
+++ b/queries/doxygen/highlights.scm
@@ -10,14 +10,14 @@
 
 ((tag
   (tag_name) @_param 
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
   (#any-of? @_param "@param" "\\param"))
 
 (function (identifier) @function)
 
 (function_link) @function
 
-(emphasis) @text.emphasis
+(emphasis) @markup.italic
 
 [
   "\\a"
@@ -30,7 +30,7 @@
   "in"
   "out"
   "inout"
-] @storageclass
+] @keyword.storage
 
 "~" @operator
 
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index 678e61f92..fac7d923c 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -1,6 +1,6 @@
 ;; XML declaration
 
-(XMLDecl "xml" @preproc)
+(XMLDecl "xml" @keyword.directive)
 
 (XMLDecl [ "version" "encoding" ] @tag.attribute)
 
@@ -10,12 +10,12 @@
 
 ;; Processing instructions
 
-(PI) @preproc
+(PI) @keyword.directive
 
 ;; Element declaration
 
 (elementdecl
-  "ELEMENT" @define
+  "ELEMENT" @keyword.directive.define
   (Name) @tag)
 
 (contentspec
@@ -30,7 +30,7 @@
 ;; Entity declaration
 
 (GEDecl
-  "ENTITY" @define
+  "ENTITY" @keyword.directive.define
   (Name) @constant)
 
 (GEDecl (EntityValue) @string)
@@ -42,7 +42,7 @@
 ;; Parsed entity declaration
 
 (PEDecl
-  "ENTITY" @define
+  "ENTITY" @keyword.directive.define
   "%" @operator
   (Name) @function.macro)
 
@@ -51,18 +51,18 @@
 ;; Notation declaration
 
 (NotationDecl
-  "NOTATION" @preproc
+  "NOTATION" @keyword.directive
   (Name) @label)
 
 ((NotationDecl
   (ExternalID
-    (SystemLiteral (URI) @string.special))
+    (SystemLiteral (URI) @string.special.url))
  (#set! "priority" 105)))
 
 ;; Attlist declaration
 
 (AttlistDecl
-  "ATTLIST" @define
+  "ATTLIST" @keyword.directive.define
   (Name) @tag)
 
 (AttDef (Name) @tag.attribute)
@@ -100,7 +100,7 @@
 
 (PubidLiteral) @string.special
 
-(SystemLiteral (URI) @text.uri)
+(SystemLiteral (URI) @string.special.url)
 
 ;; Delimiters & punctuation
 
@@ -114,6 +114,6 @@
 
 ;; Misc
 
-[ "INCLUDE" "IGNORE" ] @include
+[ "INCLUDE" "IGNORE" ] @keyword.import
 
 (Comment) @comment @spell
diff --git a/queries/ebnf/highlights.scm b/queries/ebnf/highlights.scm
index 00acf59e0..b0dfa2737 100644
--- a/queries/ebnf/highlights.scm
+++ b/queries/ebnf/highlights.scm
@@ -13,8 +13,8 @@
 ((identifier) @type
  (#lua-match? @type "^%u"))
 
-((identifier) @symbol
- (#lua-match? @symbol "^%l"))
+((identifier) @string.special.symbol
+ (#lua-match? @string.special.symbol "^%l"))
 
 ((identifier) @constant
  (#lua-match? @constant "^%u[%u%d_]+$"))
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 664421701..b6fd64668 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -86,25 +86,25 @@
 (generator_function_declaration
   name: (identifier) @function)
 (method_definition
-  name: [(property_identifier) (private_property_identifier)] @method)
+  name: [(property_identifier) (private_property_identifier)] @function.method)
 (method_definition
   name: (property_identifier) @constructor
   (#eq? @constructor "constructor"))
 
 (pair
-  key: (property_identifier) @method
+  key: (property_identifier) @function.method
   value: (function))
 (pair
-  key: (property_identifier) @method
+  key: (property_identifier) @function.method
   value: (arrow_function))
 
 (assignment_expression
   left: (member_expression
-    property: (property_identifier) @method)
+    property: (property_identifier) @function.method)
   right: (arrow_function))
 (assignment_expression
   left: (member_expression
-    property: (property_identifier) @method)
+    property: (property_identifier) @function.method)
   right: (function))
 
 (variable_declarator
@@ -129,13 +129,13 @@
 
 (call_expression
   function: (member_expression
-    property: [(property_identifier) (private_property_identifier)] @method.call))
+    property: [(property_identifier) (private_property_identifier)] @function.method.call))
 
 ; Builtins
 ;---------
 
-((identifier) @namespace.builtin
- (#eq? @namespace.builtin "Intl"))
+((identifier) @module.builtin
+ (#eq? @module.builtin "Intl"))
 
 ((identifier) @function.builtin
  (#any-of? @function.builtin
@@ -159,7 +159,7 @@
 ; Variables
 ;----------
 (namespace_import
-  (identifier) @namespace)
+  (identifier) @module)
 
 ; Decorators
 ;----------
@@ -192,15 +192,15 @@
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
-(hash_bang_line) @preproc
+(hash_bang_line) @keyword.directive
 
-((string_fragment) @preproc
- (#eq? @preproc "use strict"))
+((string_fragment) @keyword.directive
+ (#eq? @keyword.directive "use strict"))
 
 (string) @string
 (template_string) @string
 (escape_sequence) @string.escape
-(regex_pattern) @string.regex
+(regex_pattern) @string.regexp
 (regex_flags) @character.special
 (regex "/" @punctuation.bracket) ; Regex delimiters
 
@@ -266,7 +266,7 @@
 ] @operator
 
 (binary_expression "/" @operator)
-(ternary_expression ["?" ":"] @conditional.ternary)
+(ternary_expression ["?" ":"] @keyword.conditional.ternary)
 (unary_expression ["!" "~" "-" "+"] @operator)
 (unary_expression ["delete" "void"] @keyword.operator)
 
@@ -289,17 +289,17 @@
   "else"
   "switch"
   "case"
-] @conditional
+] @keyword.conditional
 
 [
   "import"
   "from"
-] @include
+] @keyword.import
 
-(export_specifier "as" @include)
-(import_specifier "as" @include)
-(namespace_export "as" @include)
-(namespace_import "as" @include)
+(export_specifier "as" @keyword.import)
+(import_specifier "as" @keyword.import)
+(namespace_export "as" @keyword.import)
+(namespace_import "as" @keyword.import)
 
 [
   "for"
@@ -307,7 +307,7 @@
   "do"
   "while"
   "continue"
-] @repeat
+] @keyword.repeat
 
 [
   "break"
@@ -352,9 +352,9 @@
   "try"
   "catch"
   "finally"
-] @exception
+] @keyword.exception
 
 (export_statement
   "default" @keyword)
 (switch_default
-  "default" @conditional)
+  "default" @keyword.conditional)
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 0fbde2959..5a9297fc7 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -40,7 +40,7 @@
   (quoted_atom)
   (keyword)
   (quoted_keyword)
-] @symbol
+] @string.special.symbol
 
 ; Interpolation
 (interpolation ["#{" "}"] @string.special)
@@ -52,7 +52,7 @@
 (integer) @number
 
 ; Floats
-(float) @float
+(float) @number.float
 
 ; Characters
 [
diff --git a/queries/elm/highlights.scm b/queries/elm/highlights.scm
index fbd3a4c3f..11bc0a00d 100644
--- a/queries/elm/highlights.scm
+++ b/queries/elm/highlights.scm
@@ -16,7 +16,7 @@
   "else"
   (case)
   (of)
-] @conditional
+] @keyword.conditional
 
 [
   "let"
@@ -32,7 +32,7 @@
 [
   (import)
   (exposing)
-] @include
+] @keyword.import
 
 
 ; Punctuation
@@ -79,14 +79,14 @@
   (lower_case_identifier) @variable)
 
 (value_qid
-  ((dot) (lower_case_identifier) @field))
+  ((dot) (lower_case_identifier) @variable.member))
 (field_access_expr
-  ((dot) (lower_case_identifier) @field))
+  ((dot) (lower_case_identifier) @variable.member))
 
 (function_declaration_left
-  (anything_pattern (underscore) @parameter))
+  (anything_pattern (underscore) @variable.parameter))
 (function_declaration_left
-  (lower_pattern (lower_case_identifier) @parameter))
+  (lower_pattern (lower_case_identifier) @variable.parameter))
 
 
 ; Functions
@@ -136,13 +136,13 @@
 ;--------
 
 (module_declaration
-  (upper_case_qid (upper_case_identifier) @namespace))
+  (upper_case_qid (upper_case_identifier) @module))
 (import_clause
-  (upper_case_qid (upper_case_identifier) @namespace))
+  (upper_case_qid (upper_case_identifier) @module))
 (as_clause
-  (upper_case_identifier) @namespace)
+  (upper_case_identifier) @module)
 (value_expr
-  (value_qid (upper_case_identifier) @namespace))
+  (value_qid (upper_case_identifier) @module))
 
 
 ; Types
diff --git a/queries/elsa/highlights.scm b/queries/elsa/highlights.scm
index c787dadd8..8e52b6f5b 100644
--- a/queries/elsa/highlights.scm
+++ b/queries/elsa/highlights.scm
@@ -11,11 +11,11 @@
 
 ; Method
 
-(method) @method
+(method) @function.method
 
 ; Parameter
 
-(parameter) @parameter
+(parameter) @variable.parameter
 
 ; Variables
 
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
index 886f5bcda..d6243549f 100644
--- a/queries/elvish/highlights.scm
+++ b/queries/elvish/highlights.scm
@@ -1,21 +1,21 @@
 (comment) @comment @spell
 
-["if" "elif"] @conditional
-(if (else "else" @conditional))
+["if" "elif"] @keyword.conditional
+(if (else "else" @keyword.conditional))
 
-["while" "for"] @repeat
-(while (else "else" @repeat))
-(for (else "else" @repeat))
+["while" "for"] @keyword.repeat
+(while (else "else" @keyword.repeat))
+(for (else "else" @keyword.repeat))
 
-["try" "catch" "finally"] @exception
-(try (else "else" @exception))
+["try" "catch" "finally"] @keyword.exception
+(try (else "else" @keyword.exception))
 
-"use" @include
-(import (bareword) @string.special)
+"use" @keyword.import
+(import (bareword) @string.special.path)
 
 (wildcard ["*" "**" "?"] @character.special)
 
-(command argument: (bareword) @parameter)
+(command argument: (bareword) @variable.parameter)
 (command head: (identifier) @function.call)
 ((command head: (identifier) @keyword.return)
  (#eq? @keyword.return "return"))
@@ -34,7 +34,7 @@
   "fn" @keyword.function
   (identifier) @function)
 
-(parameter_list) @parameter
+(parameter_list) @variable.parameter
 (parameter_list "|" @punctuation.bracket)
 
 ["var" "set" "tmp" "del"] @keyword
diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
index 0c129e23f..da0d1e600 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -3,7 +3,7 @@
 
 (char) @character
 (integer) @number
-(float) @float
+(float) @number.float
 
 (comment) @comment @spell
 
@@ -70,12 +70,12 @@
   "end"
   "maybe"
   "else"
-] @conditional
+] @keyword.conditional
 
 [
   "catch"
   "try"
-] @exception
+] @keyword.exception
 
 ((atom) @boolean (#any-of? @boolean "true" "false"))
 
@@ -86,26 +86,26 @@
 (pp_define
   lhs: _ @constant.macro (#set! "priority" 101)
 )
-(_preprocessor_directive) @preproc (#set! "priority" 99)
+(_preprocessor_directive) @keyword.directive (#set! "priority" 99)
 
 ;; Attributes
-(pp_include) @include
-(pp_include_lib) @include
-(export_attribute) @include
+(pp_include) @keyword.import
+(pp_include_lib) @keyword.import
+(export_attribute) @keyword.import
 (export_type_attribute) @type.definition
 (export_type_attribute types: (fa fun: _ @type (#set! "priority" 101)))
-(behaviour_attribute) @include
-(module_attribute (atom) @namespace) @include
+(behaviour_attribute) @keyword.import
+(module_attribute (atom) @module) @keyword.import
 (wild_attribute name: (attr_name name: _ @attribute)) @attribute
 
 ;; Records
 (record_expr) @type
-(record_field_expr _ @field) @type
-(record_field_name _ @field) @type
+(record_field_expr _ @variable.member) @type
+(record_field_name _ @variable.member) @type
 (record_name "#" @type name: _ @type) @type
 (record_decl name: _ @type) @type.definition
-(record_field name: _ @field)
-(record_field name: _ @field ty: _ @type)
+(record_field name: _ @variable.member)
+(record_field name: _ @variable.member ty: _ @type)
 
 ;; Type alias
 (type_alias name: _ @type) @type.definition
@@ -115,7 +115,7 @@
 
 ;;; expr_function_call
 (call expr: [(atom) (remote) (var)] @function)
-(call (atom) @exception (#any-of? @exception "error" "throw" "exit"))
+(call (atom) @keyword.exception (#any-of? @keyword.exception "error" "throw" "exit"))
 
 ;;; Parenthesized expression: (SomeFunc)(), only highlight the parens
 (call
diff --git a/queries/facility/highlights.scm b/queries/facility/highlights.scm
index c10ff49be..060ccd05c 100644
--- a/queries/facility/highlights.scm
+++ b/queries/facility/highlights.scm
@@ -75,7 +75,7 @@
   name: (identifier) @variable)
 
 (method
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 (number_literal) @number
 (string_literal) @string
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index 14c91d976..620c42ef3 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -30,11 +30,11 @@
 
 (multi_symbol
    "." @punctuation.delimiter
-   (symbol) @field)
+   (symbol) @variable.member)
 
 (multi_symbol_method
    ":" @punctuation.delimiter
-   (symbol) @method.call .)
+   (symbol) @function.method.call .)
 
 (list . (symbol) @function.call)
 (list . (multi_symbol (symbol) @function.call .))
@@ -42,7 +42,7 @@
 ((symbol) @variable.builtin
  (#lua-match? @variable.builtin "^[$]"))
 
-(binding) @symbol
+(binding) @string.special.symbol
 
 [
   "fn"
@@ -64,16 +64,16 @@
 [
   "for"
   "each"
-] @repeat
-((symbol) @repeat
- (#any-of? @repeat
+] @keyword.repeat
+((symbol) @keyword.repeat
+ (#any-of? @keyword.repeat
   "while"))
 
 [
   "match"
-] @conditional
-((symbol) @conditional
- (#any-of? @conditional
+] @keyword.conditional
+((symbol) @keyword.conditional
+ (#any-of? @keyword.conditional
   "if" "when"))
 
 [
@@ -89,8 +89,8 @@
  (#any-of? @keyword
   "comment" "do" "doc" "eval-compiler" "lua" "macros" "quote" "tset" "values"))
 
-((symbol) @include
- (#any-of? @include
+((symbol) @keyword.import
+ (#any-of? @keyword.import
   "require" "require-macros" "import-macros" "include"))
 
 [
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index ace8f712e..5f165eb32 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -1,8 +1,8 @@
 ; Namespaces
 
-(circuit (identifier) @namespace)
+(circuit (identifier) @module)
 
-(module (identifier) @namespace)
+(module (identifier) @module)
 
 ; Types
 
@@ -52,14 +52,14 @@
 [
   "input"
   "output"
-] @storageclass
+] @keyword.storage
 
 ; Conditionals
 
 [
   "when"
   "else"
-] @conditional
+] @keyword.conditional
 
 ; Annotations
 
@@ -99,31 +99,31 @@
   "reader"
   "writer"
   "readwriter"
-] @field.builtin
+] @variable.member.builtin
 
-((field_id) @field
+((field_id) @variable.member
   (#set! "priority" 105))
 
-(port (identifier) @field)
+(port (identifier) @variable.member)
 
-(wire (identifier) @field)
+(wire (identifier) @variable.member)
 
-(cmem (identifier) @field)
+(cmem (identifier) @variable.member)
 
-(smem (identifier) @field)
+(smem (identifier) @variable.member)
 
-(memory (identifier) @field)
+(memory (identifier) @variable.member)
 
-(register (identifier) @field)
+(register (identifier) @variable.member)
 
 ; Parameters
 
-(primitive_operation (identifier) @parameter)
+(primitive_operation (identifier) @variable.parameter)
 
-(mux (identifier) @parameter)
-(printf (identifier) @parameter)
-(reset (identifier) @parameter)
-(stop (identifier) @parameter)
+(mux (identifier) @variable.parameter)
+(printf (identifier) @variable.parameter)
+(reset (identifier) @variable.parameter)
+(stop (identifier) @variable.parameter)
 
 ; Variables
 
@@ -151,7 +151,7 @@
 
 (number_str) @string.special
 
-(double) @float
+(double) @number.float
 
 (string) @string
 
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 8d0fba29a..28ddf0b98 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -35,29 +35,29 @@
 [
  "if"
  "end"
-] @conditional)
+] @keyword.conditional)
 
 (switch_statement
 [
  "switch"
  "end"
-] @conditional)
+] @keyword.conditional)
 
 (case_clause
 [
  "case"
-] @conditional)
+] @keyword.conditional)
 
 (else_clause 
 [
  "else"
-] @conditional)
+] @keyword.conditional)
 
 (else_if_clause 
 [
  "else"
  "if"
-] @conditional)
+] @keyword.conditional)
 
 ;; Loops/Blocks
 
@@ -65,19 +65,19 @@
 [
  "while"
  "end"
-] @repeat)
+] @keyword.repeat)
 
 (for_statement
 [
  "for"
  "end"
-] @repeat)
+] @keyword.repeat)
 
 (begin_statement
 [
  "begin"
  "end"
-] @repeat)
+] @keyword.repeat)
 
 ;; Keywords
 
@@ -106,7 +106,7 @@
 
 (command
   argument: [
-             (word) @parameter (#lua-match? @parameter "^[-]")
+             (word) @variable.parameter (#lua-match? @variable.parameter "^[-]")
             ]
 )
 
@@ -137,7 +137,7 @@
   option: [
           (word)
           (concatenation (word))
-          ] @parameter (#lua-match? @parameter "^[-]")
+          ] @variable.parameter (#lua-match? @variable.parameter "^[-]")
 )
 
 ;; Strings
@@ -159,5 +159,5 @@
 ((word) @boolean
 (#any-of? @boolean "true" "false"))
 
-((program . (comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+((program . (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/foam/highlights.scm b/queries/foam/highlights.scm
index aba33b4e8..33370df66 100644
--- a/queries/foam/highlights.scm
+++ b/queries/foam/highlights.scm
@@ -11,32 +11,32 @@
 
 ;; Macros
 (macro
-    "$" @conditional
-    (prev_scope)* @conditional
-    (identifier)* @namespace
+    "$" @keyword.conditional
+    (prev_scope)* @keyword.conditional
+    (identifier)* @module
 )
 
 
 ;; Directives
-"#" @conditional
+"#" @keyword.conditional
 (preproc_call
-    directive: (identifier)* @conditional
-    argument: (identifier)* @namespace
+    directive: (identifier)* @keyword.conditional
+    argument: (identifier)* @module
 )
 ((preproc_call
-  argument: (identifier)* @namespace) @conditional
-  (#eq? @conditional "ifeq"))
-((preproc_call) @conditional
-  (#any-of? @conditional "else" "endif"))
+  argument: (identifier)* @module) @keyword.conditional
+  (#eq? @keyword.conditional "ifeq"))
+((preproc_call) @keyword.conditional
+  (#any-of? @keyword.conditional "else" "endif"))
 
 ;; Literals
-(number_literal) @float
+(number_literal) @number.float
 (string_literal) @string
 (escape_sequence) @string.escape
 (boolean) @boolean
 
 ;; Treat [m^2 s^-2] the same as if it was put in numbers format
-(dimensions dimension: (identifier) @float)
+(dimensions dimension: (identifier) @number.float)
 
 ;; Punctuation
 [
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 3e85212bd..c2eaa6a7e 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -1,26 +1,26 @@
 ; Preprocs
 
-(preproc_file_line) @preproc
+(preproc_file_line) @keyword.directive
 
 ; Namespaces
 
 (program_statement
-  (name) @namespace)
+  (name) @module)
 
 (end_program_statement
-  (name) @namespace)
+  (name) @module)
 
 (module_statement
-  (name) @namespace)
+  (name) @module)
 
 (end_module_statement
-  (name) @namespace)
+  (name) @module)
 
 (submodule_statement
-  (name) @namespace)
+  (name) @module)
 
 (end_submodule_statement
-  (name) @namespace)
+  (name) @module)
 
 ; Includes
 
@@ -28,7 +28,7 @@
   "import"
   "include"
   "use"
-] @include
+] @keyword.import
 
 (import_statement
   ","
@@ -147,7 +147,7 @@
   "in"
   "inout"
   "out"
-] @storageclass
+] @keyword.storage
 
 ; Labels
 
@@ -211,7 +211,7 @@
 
 [
   "error"
-] @exception
+] @keyword.exception
 
 ; Conditionals
 
@@ -224,7 +224,7 @@
   "if"
   "then"
   "where"
-] @conditional
+] @keyword.conditional
 
 ; Repeats
 
@@ -238,7 +238,7 @@
   "continue"
   "cycle"
   "exit"
-] @repeat
+] @keyword.repeat
 
 ; Variables
 
@@ -247,10 +247,10 @@
 ; Parameters
 
 (keyword_argument
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (parameters
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 
 ; Properties
 
diff --git a/queries/fsh/highlights.scm b/queries/fsh/highlights.scm
index e4c0edd8e..9a11e279f 100644
--- a/queries/fsh/highlights.scm
+++ b/queries/fsh/highlights.scm
@@ -85,7 +85,7 @@
 (flag) @constant
 
 ; Special Params
-(code_value) @parameter
+(code_value) @variable.parameter
 
 ; Extras
 (fsh_comment) @comment @spell
diff --git a/queries/func/highlights.scm b/queries/func/highlights.scm
index c1662a180..b5b6dde35 100644
--- a/queries/func/highlights.scm
+++ b/queries/func/highlights.scm
@@ -1,20 +1,20 @@
 ; Include
 
-"#include" @include
+"#include" @keyword.import
 (include_path) @string
 
 ; Preproc
 
 [
   "#pragma"
-] @preproc
+] @keyword.directive
 
 (pragma_directive
   [
     "version"
     "not-version"
     "test-version-set"
-  ] @preproc)
+  ] @keyword.directive)
 
 ; Keywords
 
@@ -40,14 +40,14 @@
   "elseif"
   "elseifnot"
   "until"
-] @conditional
+] @keyword.conditional
 
 ; Exceptions
 
 [
   "try"
   "catch"
-] @exception
+] @keyword.exception
 
 ; Repeats
 
@@ -56,7 +56,7 @@
   "forall"
   "repeat"
   "while"
-] @repeat
+] @keyword.repeat
 
 ; Qualifiers
 [
@@ -83,11 +83,11 @@
   function: (identifier) @function)
 
 (method_call
-  method_name: (identifier) @method.call)
+  method_name: (identifier) @function.method.call)
 
 ; Parameters
 
-(parameter) @parameter
+(parameter) @variable.parameter
 
 ; Types
 
diff --git a/queries/fusion/highlights.scm b/queries/fusion/highlights.scm
index 81f471f68..e8c217e67 100644
--- a/queries/fusion/highlights.scm
+++ b/queries/fusion/highlights.scm
@@ -12,7 +12,7 @@
 (afx_attribute
   (afx_property_identifier) @tag.attribute)
 
-(afx_text) @text
+(afx_text) @spell
 
 ; identifiers eel
 
@@ -43,13 +43,13 @@
 (include_statement
   [
    "include"
-  ] @include
-  (source_file) @text.uri
+  ] @keyword.import
+  (source_file) @string.special.url
 )
 
 (namespace_declaration
   "namespace" @keyword
-  (alias_namespace) @namespace)
+  (alias_namespace) @module)
 
 (type
   name: (type_name) @type)
@@ -78,7 +78,7 @@
 [
   (package_name)
   (alias_namespace)
-] @namespace
+] @module
 
 (namespace_declaration "=" @operator)
 (assignment "=" @operator)
@@ -117,4 +117,4 @@
 ] @punctuation.delimiter
 
 (eel_ternary_expression
-  ["?" ":"] @conditional.ternary)
+  ["?" ":"] @keyword.conditional.ternary)
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 535dcd009..1b4edbc7e 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -6,7 +6,7 @@
 (comment) @comment @spell
 (string_name) @string
 (string) @string
-(float) @float
+(float) @number.float
 (integer) @number
 (null) @constant
 (setter) @function
@@ -15,14 +15,14 @@
 (get_body "get" @keyword.function)
 (static_keyword) @type.qualifier
 (tool_statement) @keyword
-(breakpoint_statement) @debug
+(breakpoint_statement) @keyword.debug
 (inferred_type) @operator
 [(true) (false)] @boolean
 
 [
   (get_node)
   (node_path)
-] @text.uri
+] @string.special.url
 
 (class_name_statement
   (name) @type) @keyword
@@ -44,14 +44,14 @@
 
 (function_definition
   (name) @function (parameters
-    (identifier) @parameter)*)
+    (identifier) @variable.parameter)*)
 
-(typed_parameter (identifier) @parameter)
-(default_parameter (identifier) @parameter)
+(typed_parameter (identifier) @variable.parameter)
+(default_parameter (identifier) @variable.parameter)
 
 (call (identifier) @function.call)
-(call (identifier) @include
-      (#any-of? @include "preload" "load"))
+(call (identifier) @keyword.import
+      (#any-of? @keyword.import "preload" "load"))
 
 ;; Properties and Methods
 
@@ -63,9 +63,9 @@
 
 ; Same question but for methods?
 (class_definition
-  (body (function_definition (name) @method)))
+  (body (function_definition (name) @function.method)))
 
-(attribute_call (identifier) @method.call)
+(attribute_call (identifier) @function.method.call)
 (attribute (_) (identifier) @property)
 
 ;; Enums
@@ -90,9 +90,9 @@
 
 ["," "." ":"] @punctuation.delimiter
 
-["if" "elif" "else" "match"] @conditional
+["if" "elif" "else" "match"] @keyword.conditional
 
-["for" "while" "break" "continue"] @repeat
+["for" "while" "break" "continue"] @keyword.repeat
 
 [
   "~"
diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index 18b75bc64..df1dde803 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -2,13 +2,13 @@
 
 (section_name) @type
 
-((section_name) @include
- (#eq? @include "include"))
+((section_name) @keyword.import
+ (#eq? @keyword.import "include"))
 
 ((section_header
-   (section_name) @include
+   (section_name) @keyword.import
    (subsection_name))
- (#eq? @include "includeIf"))
+ (#eq? @keyword.import "includeIf"))
 
 (variable (name) @property)
 
@@ -28,11 +28,11 @@
 
 (string) @string
 
-((string) @text.uri
- (#lua-match? @text.uri "^[.]?[/]"))
+((string) @string.special.path
+ (#lua-match? @string.special.path "^[.]?[/]"))
 
-((string) @text.uri
- (#lua-match? @text.uri "^[~]"))
+((string) @string.special.path
+ (#lua-match? @string.special.path "^[~]"))
 
 (section_header
   [
diff --git a/queries/git_rebase/highlights.scm b/queries/git_rebase/highlights.scm
index 466bd2f16..9ace6be26 100644
--- a/queries/git_rebase/highlights.scm
+++ b/queries/git_rebase/highlights.scm
@@ -1,6 +1,6 @@
 ((command) @keyword
   (label)? @constant
-  (message)? @text @spell)
+  (message)? @none @spell)
 
 (option) @operator
 
diff --git a/queries/gitattributes/highlights.scm b/queries/gitattributes/highlights.scm
index 5d044b356..9f3c03dfb 100644
--- a/queries/gitattributes/highlights.scm
+++ b/queries/gitattributes/highlights.scm
@@ -22,7 +22,7 @@
 ] @string.escape
 
 (attribute
-  (attr_name) @parameter)
+  (attr_name) @variable.parameter)
 
 (attribute
   (builtin_attr) @variable.builtin)
@@ -37,15 +37,16 @@
 
 (string_value) @string
 
-(macro_tag) @preproc
+(macro_tag) @keyword.directive
 
 (macro_def
   macro_name: (_) @property)
 
-[
-  (pattern_negation)
-  (redundant_escape)
-  (trailing_slash)
-] @error
+; we do not lint syntax errors
+; [
+;   (pattern_negation)
+;   (redundant_escape)
+;   (trailing_slash)
+; ] @error
 
 (comment) @comment @spell
diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index 9c70e19b5..d475021c2 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -1,17 +1,17 @@
 (comment) @comment
 (generated_comment) @comment
-(title) @text.title
-(text) @text
-(branch) @text.reference
+(title) @markup.heading
+; (text) @none
+(branch) @markup.link
 (change) @keyword
-(filepath) @text.uri
+(filepath) @string.special.url
 (arrow) @punctuation.delimiter
 
-(subject) @text.title @spell
-(subject (overflow) @text @spell)
+(subject) @markup.heading @spell
+(subject (overflow) @none @spell)
 (subject (subject_prefix) @function @nospell)
 (prefix (type) @keyword @nospell)
-(prefix (scope) @parameter @nospell)
+(prefix (scope) @variable.parameter @nospell)
 (prefix [
     "("
     ")"
@@ -21,12 +21,12 @@
     "!"
 ] @punctuation.special)
 
-(message) @text @spell
+(message) @spell
 
 (trailer (token) @label)
-(trailer (value) @text)
+; (trailer (value) @none)
 
-(breaking_change (token) @text.warning)
-(breaking_change (value) @text @spell)
+(breaking_change (token) @comment.warning)
+(breaking_change (value) @none @spell)
 
 (scissor) @comment
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index bc392dec4..f74f17ab7 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -16,18 +16,18 @@
 ; Imports
 [
   "import"
-] @include
+] @keyword.import
 
 ; Conditionals
 [
   "case"
   "if"
-] @conditional
+] @keyword.conditional
 
 ; Exceptions
 [
   "assert"
-] @exception
+] @keyword.exception
 
 ; Punctuation
 [
@@ -99,9 +99,9 @@
 ] @comment
 
 ; Modules & Imports
-(module) @namespace
-(import alias: ((identifier) @namespace)?)
-(remote_type_identifier module: (identifier) @namespace)
+(module) @module
+(import alias: ((identifier) @module)?)
+(remote_type_identifier module: (identifier) @module)
 (unqualified_import name: (identifier) @function)
 
 ; Strings
@@ -113,11 +113,11 @@
 ; Numbers
 (integer) @number
 
-(float) @float
+(float) @number.float
 
 ; Function Parameter Labels
 (function_call arguments: (arguments (argument label: (label) @label)))
-(function_parameter label: (label)? @label name: (identifier) @parameter)
+(function_parameter label: (label)? @label name: (identifier) @variable.parameter)
 
 ; Records
 (record arguments: (arguments (argument label: (label) @property)?))
@@ -154,7 +154,7 @@
 
 ; External Functions
 (external_function name: (identifier) @function)
-(external_function_body (string) @namespace . (string) @function)
+(external_function_body (string) @module . (string) @function)
 
 ; Constructors
 (constructor_name) @type @constructor
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index a577ba425..059a1069c 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -23,10 +23,10 @@
 (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"))
+(block_statement_start path: (identifier) @keyword.conditional)
+(block_statement_end path: (identifier) @keyword.conditional)
+((mustache_statement (identifier) @keyword.conditional)
+ (#lua-match? @keyword.conditional "else"))
 
 ; == Mustache Statements ===
 
@@ -66,8 +66,8 @@
   (identifier) @function
   ])
   (#not-any-of? @function "if" "yield"))
-((helper_invocation helper: (identifier) @conditional)
-  (#eq? @conditional "if"))
+((helper_invocation helper: (identifier) @keyword.conditional)
+  (#eq? @keyword.conditional "if"))
 ((helper_invocation helper: (identifier) @keyword)
   (#eq? @keyword "yield"))
 
diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index b23ad797b..5825673c1 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -29,7 +29,7 @@
 
 "subroutine" @keyword.function
 
-(extension_storage_class) @storageclass
+(extension_storage_class) @keyword.storage
 
 ((identifier) @variable.builtin
  (#lua-match? @variable.builtin "^gl_"))
diff --git a/queries/gn/highlights.scm b/queries/gn/highlights.scm
index 87082a30a..3b09a7753 100644
--- a/queries/gn/highlights.scm
+++ b/queries/gn/highlights.scm
@@ -1,17 +1,17 @@
 ; Includes
 
-"import" @include
+"import" @keyword.import
 
 ; Conditionals
 
 [
   "if"
   "else"
-] @conditional
+] @keyword.conditional
 
 ; Repeats
 
-"foreach" @repeat
+"foreach" @keyword.repeat
 
 ; Operators
 
@@ -42,7 +42,7 @@
 
 ; Fields
 
-(scope_access field: (identifier) @field)
+(scope_access field: (identifier) @variable.member)
 
 ; Literals
 
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 65c00ea27..9c6fe1be8 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -8,10 +8,10 @@
 (type_spec name: (type_identifier) @type.definition)
 (field_identifier) @property
 (identifier) @variable
-(package_identifier) @namespace
+(package_identifier) @module
 
-(parameter_declaration (identifier) @parameter)
-(variadic_parameter_declaration (identifier) @parameter)
+(parameter_declaration (identifier) @variable.parameter)
+(variadic_parameter_declaration (identifier) @variable.parameter)
 
 (label_name) @label
 
@@ -25,7 +25,7 @@
 
 (call_expression
   function: (selector_expression
-    field: (field_identifier) @method.call))
+    field: (field_identifier) @function.method.call))
 
 ; Function definitions
 
@@ -33,10 +33,10 @@
   name: (identifier) @function)
 
 (method_declaration
-  name: (field_identifier) @method)
+  name: (field_identifier) @function.method)
 
 (method_spec
-  name: (field_identifier) @method)
+  name: (field_identifier) @function.method)
 
 ; Constructors
 
@@ -112,19 +112,19 @@
 "return" @keyword.return
 "go" @keyword.coroutine
 
-"for" @repeat
+"for" @keyword.repeat
 
 [
   "import"
   "package"
-] @include
+] @keyword.import
 
 [
   "else"
   "case"
   "switch"
   "if"
- ] @conditional
+ ] @keyword.conditional
 
 
 ;; Builtin types
@@ -204,7 +204,7 @@
 (escape_sequence) @string.escape
 
 (int_literal) @number
-(float_literal) @float
+(float_literal) @number.float
 (imaginary_literal) @number
 
 [
@@ -218,8 +218,8 @@
 ] @constant.builtin
 
 (keyed_element
-  . (literal_element (identifier) @field))
-(field_declaration name: (field_identifier) @field)
+  . (literal_element (identifier) @variable.member))
+(field_declaration name: (field_identifier) @variable.member)
 
 ; Comments
 
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index 37d72b2be..5702a2b93 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -5,7 +5,7 @@
 
 (
     (method_declaration
-        name: (field_identifier) @local.definition.method); @method
+        name: (field_identifier) @local.definition.method); @function.method
 )
 
 (short_var_declaration 
diff --git a/queries/godot_resource/highlights.scm b/queries/godot_resource/highlights.scm
index 848fbbe1f..f87f228d9 100644
--- a/queries/godot_resource/highlights.scm
+++ b/queries/godot_resource/highlights.scm
@@ -6,7 +6,7 @@
 
 (string) @string
 (integer) @number
-(float) @float
+(float) @number.float
 
 (true) @constant.builtin
 (false) @constant.builtin
diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
index 76a2a4523..8e3906fc1 100644
--- a/queries/gomod/highlights.scm
+++ b/queries/gomod/highlights.scm
@@ -11,7 +11,7 @@
 "=>" @operator
 
 (comment) @comment @spell
-(module_path) @text.uri
+(module_path) @string.special.url
 
 [
 (version)
diff --git a/queries/gosum/highlights.scm b/queries/gosum/highlights.scm
index bb65bd71f..bd9595b2b 100644
--- a/queries/gosum/highlights.scm
+++ b/queries/gosum/highlights.scm
@@ -8,11 +8,11 @@
 ] @keyword
 
 
-(module_path) @string @text.uri
+(module_path) @string.special.url
 (module_version) @string.special
 
 (hash_version) @attribute
-(hash) @symbol
+(hash) @string.special.symbol
 
 [
  (number)
diff --git a/queries/gpg/highlights.scm b/queries/gpg/highlights.scm
index fb70ba135..1dac05562 100644
--- a/queries/gpg/highlights.scm
+++ b/queries/gpg/highlights.scm
@@ -1,8 +1,8 @@
 (option . _ @keyword)
 
 (option
-  ("no-" @parameter)?
-  (name) @parameter)
+  ("no-" @variable.parameter)?
+  (name) @variable.parameter)
 
 (string (content) @string)
 
@@ -11,7 +11,7 @@
  "clear"
 ] @string.special
 
-(url) @text.uri
+(url) @string.special.url
 
 (key) @constant
 
@@ -25,9 +25,9 @@
 
 "sensitive:" @type.qualifier
 
-(filter_name) @parameter
+(filter_name) @variable.parameter
 
-(filter_scope) @namespace
+(filter_scope) @module
 
 (filter_property) @property
 
diff --git a/queries/graphql/highlights.scm b/queries/graphql/highlights.scm
index 48f27f983..136f287ee 100644
--- a/queries/graphql/highlights.scm
+++ b/queries/graphql/highlights.scm
@@ -80,17 +80,17 @@
 
 (input_fields_definition
   (input_value_definition
-    (name) @parameter))
+    (name) @variable.parameter))
 
 (argument
-  (name) @parameter)
+  (name) @variable.parameter)
 
 (arguments_definition
   (input_value_definition
-    (name) @parameter))
+    (name) @variable.parameter))
 
 (variable_definition
-  (variable) @parameter)
+  (variable) @variable.parameter)
 
 (argument
   (value
@@ -103,7 +103,7 @@
 
 (int_value) @number
 
-(float_value) @float
+(float_value) @number.float
 
 (boolean_value) @boolean
 
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index a9b38ef5b..25dcdb8ca 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -7,7 +7,7 @@
 
 (block
   (unit
-    (identifier) @namespace))
+    (identifier) @module))
 
 (func
   (identifier) @function)
@@ -64,8 +64,8 @@
     "private"
     "public"))
 
-((identifier) @exception
-  (#any-of? @exception
+((identifier) @keyword.exception
+  (#any-of? @keyword.exception
     "throw"
     "finally"
     "try"
diff --git a/queries/gstlaunch/highlights.scm b/queries/gstlaunch/highlights.scm
index 8fc8d2198..36118712e 100644
--- a/queries/gstlaunch/highlights.scm
+++ b/queries/gstlaunch/highlights.scm
@@ -16,7 +16,7 @@
 ] @punctuation.bracket
 
 (property
-  key: (identifier) @field)
+  key: (identifier) @variable.member)
 (value) @string
 (string_literal) @string
 (cap
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index efe5631a6..91efe90b4 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -43,7 +43,7 @@
  "include_once"
  "require"
  "require_once"
-] @include
+] @keyword.import
 
 [
   "new"
@@ -184,10 +184,10 @@
 ] @operator
 
 (integer) @number
-(float) @float
+(float) @number.float
 
 (parameter
-  (variable) @parameter)
+  (variable) @variable.parameter)
 
 (call_expression
   function: (qualified_identifier (identifier) @function.call .))
@@ -197,23 +197,23 @@
 
 (call_expression
   function: (selection_expression
-              (qualified_identifier (identifier) @method.call .)))
+              (qualified_identifier (identifier) @function.method.call .)))
 
 (qualified_identifier
-  (_) @namespace .
+  (_) @module .
   (_))
 
 (use_statement
   (qualified_identifier
-  (_) @namespace .)
+  (_) @module .)
   (use_clause))
 
 (use_statement
   (use_type "namespace")
   (use_clause
     (qualified_identifier
-         (identifier) @namespace .)
-    alias: (identifier)? @namespace))
+         (identifier) @module .)
+    alias: (identifier)? @module))
 
 (use_statement
   (use_type "const")
@@ -239,8 +239,8 @@
 (use_clause
   (use_type "namespace")
   (qualified_identifier
-  (_) @namespace .)
-  alias: (identifier)? @namespace)
+  (_) @module .)
+  alias: (identifier)? @module)
 
 (use_clause
   (use_type "function")
@@ -263,7 +263,7 @@
 (function_declaration
   name: (identifier) @function)
 (method_declaration
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 (type_arguments
   [ "<" ">" ] @punctuation.bracket)
@@ -279,7 +279,7 @@
   "\\" @punctuation.delimiter)
 
 (ternary_expression
-  ["?" ":"] @conditional.ternary)
+  ["?" ":"] @keyword.conditional.ternary)
 
 [
   "if"
@@ -287,13 +287,13 @@
   "elseif"
   "switch"
   "case"
-] @conditional
+] @keyword.conditional
 
 [
   "try"
   "catch"
   "finally"
-] @exception
+] @keyword.exception
 
 [
   "for"
@@ -302,7 +302,7 @@
   "do"
   "continue"
   "break"
-] @repeat
+] @keyword.repeat
 
 [
  (string)
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index f331da910..fb9f3f158 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -23,18 +23,18 @@
 
 [
   "use"
-] @include
+] @keyword.import
 
 (use_statement
   (scoped_type_identifier
-    (identifier) @namespace))
+    (identifier) @module))
 (use_statement
-  (identifier) @namespace  "{")
+  (identifier) @module  "{")
 (use_statement
-  . (identifier) @namespace .)
+  . (identifier) @module .)
 
 ((scoped_type_identifier
-  path: (_) @namespace)
+  path: (_) @module)
   (#set! "priority" 105))
 
 ; Keywords
@@ -103,7 +103,7 @@
 
 (call_expression
   . (scoped_type_identifier
-    . (identifier) . "::" . (identifier) @method.call))
+    . (identifier) . "::" . (identifier) @function.method.call))
 
 ((call_expression
   . (identifier) @function.builtin)
@@ -123,25 +123,25 @@
 ; Parameters
 
 (parameter
-  (_) @parameter . ":")
+  (_) @variable.parameter . ":")
 
 ; Fields
 
 ((member_expression
-  "." (_) @field)
+  "." (_) @variable.member)
   (#set! "priority" 105))
 
 (field
-  . (identifier) @field)
+  . (identifier) @variable.member)
 
 (field_assignment
-  . (identifier) @field)
+  . (identifier) @variable.member)
 
 ; Repeats
 
 [
   "for"
-] @repeat
+] @keyword.repeat
 
 ; Conditionals
 
@@ -152,7 +152,7 @@
   "switch"
   "match"
   "case"
-] @conditional
+] @keyword.conditional
 
 ; Operators
 
@@ -237,7 +237,7 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (boolean) @boolean
 
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 2c2189c38..92b36434d 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -8,27 +8,27 @@
 (pat_wildcard) @variable
 
 (function
-  patterns: (patterns (_) @parameter))
+  patterns: (patterns (_) @variable.parameter))
 
-(exp_lambda (_)+ @parameter "->")
+(exp_lambda (_)+ @variable.parameter "->")
 
 (function 
   infix: (infix
-    lhs: (_) @parameter))
+    lhs: (_) @variable.parameter))
 (function 
   infix: (infix
-    rhs: (_) @parameter))
+    rhs: (_) @variable.parameter))
 
 ;; ----------------------------------------------------------------------------
 ;; Literals and comments
 
 (integer) @number
 (exp_negation) @number
-(exp_literal (float)) @float
+(exp_literal (float)) @number.float
 (char) @character
 (string) @string
 
-(con_unit) @symbol  ; unit, as in ()
+(con_unit) @string.special.symbol  ; unit, as in ()
 
 (comment) @comment
 
@@ -82,9 +82,9 @@
 [
   "forall"
   "∀"
-] @repeat
+] @keyword.repeat
 
-(pragma) @preproc
+(pragma) @keyword.directive
 
 [
   "if"
@@ -92,13 +92,13 @@
   "else"
   "case"
   "of"
-] @conditional
+] @keyword.conditional
 
 [
   "import"
   "qualified"
   "module"
-] @include
+] @keyword.import
 
 [
   (operator)
@@ -124,12 +124,12 @@
 ] @operator
 
 
-(module) @namespace
+(module) @module
 ((qualified_module (module) @constructor)
  . (module))
-(qualified_type (module) @namespace)
-(qualified_variable (module) @namespace)
-(import (module) @namespace)
+(qualified_type (module) @module)
+(qualified_variable (module) @module)
+(import (module) @module)
 (import (module) @constructor . (module))
 
 [
@@ -250,7 +250,7 @@
     [
       ((variable) @function.call)
       (qualified_variable (
-        (module) @namespace
+        (module) @module
         (variable) @function.call))
     ])
   . (operator))
@@ -391,7 +391,7 @@
 ;; namespaced quasi-quoter
 (quasiquote
   (_
-    (module) @namespace
+    (module) @module
     . (variable) @function.call
   ))
 
@@ -400,8 +400,8 @@
 ;; ----------------------------------------------------------------------------
 ;; Exceptions/error handling
 
-((variable) @exception
-  (#any-of? @exception 
+((variable) @keyword.exception
+  (#any-of? @keyword.exception 
    "error"
    "undefined"
    "try"
@@ -431,8 +431,8 @@
 
 ;; ----------------------------------------------------------------------------
 ;; Debugging
-((variable) @debug
-  (#any-of? @debug 
+((variable) @keyword.debug
+  (#any-of? @keyword.debug
    "trace"
    "traceId"
    "traceShow"
@@ -453,11 +453,11 @@
 
 ;; ----------------------------------------------------------------------------
 ;; Fields
-(field (variable) @field)
-(pat_field (variable) @field)
-(exp_projection field: (variable) @field)
-(import_item (type) . (import_con_names (variable) @field))
-(exp_field field: [((variable) @field) (qualified_variable (variable) @field)])
+(field (variable) @variable.member)
+(pat_field (variable) @variable.member)
+(exp_projection field: (variable) @variable.member)
+(import_item (type) . (import_con_names (variable) @variable.member))
+(exp_field field: [((variable) @variable.member) (qualified_variable (variable) @variable.member)])
 
 
 ;; ----------------------------------------------------------------------------
diff --git a/queries/haskell_persistent/highlights.scm b/queries/haskell_persistent/highlights.scm
index afb32f11d..e806befcf 100644
--- a/queries/haskell_persistent/highlights.scm
+++ b/queries/haskell_persistent/highlights.scm
@@ -2,13 +2,13 @@
 ;; Literals and comments
 
 (integer) @number
-(float) @float
+(float) @number.float
 (char) @character
 (string) @string
 (attribute_name) @attribute
 (attribute_exclamation_mark) @attribute
 
-(con_unit) @symbol  ; unit, as in ()
+(con_unit) @string.special.symbol  ; unit, as in ()
 
 (comment) @comment @spell
 
diff --git a/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
index 4cc822abd..bb0de9816 100644
--- a/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -48,13 +48,13 @@
   "for"
   "endfor"
   "in"
-] @repeat
+] @keyword.repeat
 
 [
   "if"
   "else"
   "endif"
-] @conditional
+] @keyword.conditional
 
 [
   (quoted_template_start) ; "
@@ -84,14 +84,14 @@
 (body (block (identifier) @keyword))
 (body (block (body (block (identifier) @type))))
 (function_call (identifier) @function)
-(attribute (identifier) @field)
+(attribute (identifier) @variable.member)
 
 ; { key: val }
 ;
 ; highlight identifier keys as though they were block attributes
-(object_elem key: (expression (variable_expr (identifier) @field)))
+(object_elem key: (expression (variable_expr (identifier) @variable.member)))
 
 ; var.foo, data.bar
 ;
 ; first element in get_attr is a variable.builtin or a reference to a variable.builtin
-(expression (variable_expr (identifier) @variable.builtin) (get_attr (identifier) @field))
+(expression (variable_expr (identifier) @variable.builtin) (get_attr (identifier) @variable.member))
diff --git a/queries/heex/highlights.scm b/queries/heex/highlights.scm
index ed8efb906..f13e5d04f 100644
--- a/queries/heex/highlights.scm
+++ b/queries/heex/highlights.scm
@@ -30,7 +30,7 @@
 (comment) @comment @spell
 
 ; HEEx text content is treated as markup
-(text) @text
+; (text) @none
 
 ; HEEx tags and slots are highlighted as HTML
 [
diff --git a/queries/hocon/highlights.scm b/queries/hocon/highlights.scm
index 1fdd6ca4b..f0cc498b4 100644
--- a/queries/hocon/highlights.scm
+++ b/queries/hocon/highlights.scm
@@ -15,12 +15,12 @@
   "required"
 ] @keyword
 
-(include "include" @include)
+(include "include" @keyword.import)
 
 (substitution ["${" "${?" "}"] @punctuation.special)
-(substitution (_) @field)
+(substitution (_) @variable.member)
 
-(path (_) @field)
+(path (_) @variable.member)
 (value [":" "=" "+=" ] @operator)
 
 [
diff --git a/queries/hoon/highlights.scm b/queries/hoon/highlights.scm
index f7136f63e..029d20c1e 100644
--- a/queries/hoon/highlights.scm
+++ b/queries/hoon/highlights.scm
@@ -27,7 +27,7 @@
 
 (date) @string.special
 
-(mold) @symbol
+(mold) @string.special.symbol
 (specialIndex) @number.builtin
 (lark) @operator
-(fullContext) @symbol
+(fullContext) @string.special.symbol
diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index 8d39afd49..44626caac 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -1,54 +1,54 @@
 (tag_name) @tag
-(erroneous_end_tag_name) @error
+; (erroneous_end_tag_name) @error ; we do not lint syntax errors
 (comment) @comment @spell
 (attribute_name) @tag.attribute
 ((attribute
   (quoted_attribute_value) @string)
  (#set! "priority" 99))
-(text) @text @spell
+(text) @none @spell
 
-((element (start_tag (tag_name) @_tag) (text) @text.title)
+((element (start_tag (tag_name) @_tag) (text) @markup.heading)
  (#eq? @_tag "title"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.title.1)
+((element (start_tag (tag_name) @_tag) (text) @markup.heading.1)
  (#eq? @_tag "h1"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.title.2)
+((element (start_tag (tag_name) @_tag) (text) @markup.heading.2)
  (#eq? @_tag "h2"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.title.3)
+((element (start_tag (tag_name) @_tag) (text) @markup.heading.3)
  (#eq? @_tag "h3"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.title.4)
+((element (start_tag (tag_name) @_tag) (text) @markup.heading.4)
  (#eq? @_tag "h4"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.title.5)
+((element (start_tag (tag_name) @_tag) (text) @markup.heading.5)
  (#eq? @_tag "h5"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.title.6)
+((element (start_tag (tag_name) @_tag) (text) @markup.heading.6)
  (#eq? @_tag "h6"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.strong)
+((element (start_tag (tag_name) @_tag) (text) @markup.strong)
  (#any-of? @_tag "strong" "b"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.emphasis)
+((element (start_tag (tag_name) @_tag) (text) @markup.italic)
  (#any-of? @_tag "em" "i"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.strike)
+((element (start_tag (tag_name) @_tag) (text) @markup.strikethrough)
  (#any-of? @_tag "s" "del"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.underline)
+((element (start_tag (tag_name) @_tag) (text) @markup.underline)
  (#eq? @_tag "u"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.literal)
+((element (start_tag (tag_name) @_tag) (text) @markup.raw)
  (#any-of? @_tag "code" "kbd"))
 
-((element (start_tag (tag_name) @_tag) (text) @text.uri)
+((element (start_tag (tag_name) @_tag) (text) @string.special.url)
  (#eq? @_tag "a"))
 
 ((attribute
    (attribute_name) @_attr
-   (quoted_attribute_value (attribute_value) @text.uri))
+   (quoted_attribute_value (attribute_value) @string.special.url))
  (#any-of? @_attr "href" "src"))
 
 [
diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index 814c7c420..214dbb36f 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -18,8 +18,8 @@
 
 (variable_name) @variable
 
-(filter_name) @method
-(filter_argument) @parameter
+(filter_name) @function.method
+(filter_argument) @variable.parameter
 
 (keyword) @keyword
 
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index e03f61253..c5af93714 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -4,7 +4,7 @@
 
 ; Methods
 
-(method) @method
+(method) @function.method
 
 ; Constants
 
@@ -16,11 +16,11 @@
 
 ; Fields
 
-(pair name: (identifier) @field)
+(pair name: (identifier) @variable.member)
 
 ; Parameters
 
-(query_param (key) @parameter)
+(query_param (key) @variable.parameter)
 
 ; Operators
 
@@ -35,7 +35,7 @@
 
 (string) @string
 
-(target_url) @string @text.uri
+(target_url) @string.special.url
 
 (number) @number
 
diff --git a/queries/hurl/highlights.scm b/queries/hurl/highlights.scm
index a32f1965b..d43c172b8 100644
--- a/queries/hurl/highlights.scm
+++ b/queries/hurl/highlights.scm
@@ -100,7 +100,7 @@
 [
   (float)
   (json_number)
-] @float
+] @number.float
 
 [ ":" "," ] @punctuation.delimiter
 
@@ -115,13 +115,16 @@
 
 [
   "base64,"
-  "file,"
   "hex,"
-  (file_value)
   (version)
 ] @string.special
 
-(regex) @string.regex
+[
+  "file,"
+  (file_value)
+] @string.special.path
+
+(regex) @string.regexp
 
 (multiline_string_type) @type
 
diff --git a/queries/ini/highlights.scm b/queries/ini/highlights.scm
index dfe46cc72..d431a78b5 100644
--- a/queries/ini/highlights.scm
+++ b/queries/ini/highlights.scm
@@ -12,5 +12,4 @@
 ] @operator
 
 (setting (setting_name) @property)
-(setting_value) @text ; grammar does not support subtypes
-(ERROR (setting_name) @text)
+; (setting_value) @none ; grammar does not support subtypes
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 6770d6bb9..804b6ee63 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -24,11 +24,11 @@
   "foreach_tiled"
   "foreach_active"
   "foreach_unique"
-] @repeat
+] @keyword.repeat
 
 [
   "cif"
-] @conditional
+] @keyword.conditional
 
 [
   "varying"
diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 2b4ddf95b..25ce38635 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -1,6 +1,6 @@
 ;; >> Literals
 
-(kwd_lit) @symbol
+(kwd_lit) @string.special.symbol
 (str_lit) @string
 (long_str_lit) @string
 (buf_lit) @string
@@ -31,10 +31,10 @@
 ;; Quoted symbols
 
 (quote_lit
- (sym_lit) @symbol)
+ (sym_lit) @string.special.symbol)
 
 (qq_lit
- (sym_lit) @symbol)
+ (sym_lit) @string.special.symbol)
 
 ;; Dynamic variables
 
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 27f139ec2..4ff56641d 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -7,30 +7,30 @@
 ; Methods
 
 (method_declaration
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 (method_invocation
-  name: (identifier) @method.call)
+  name: (identifier) @function.method.call)
 
 (super) @function.builtin
 
 ; Parameters
 
 (formal_parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (catch_formal_parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (spread_parameter
  (variable_declarator
-   name: (identifier) @parameter)) ; int... foo
+   name: (identifier) @variable.parameter)) ; int... foo
 
 ;; Lambda parameter
 
-(inferred_parameters (identifier) @parameter) ; (x,y) -> ...
+(inferred_parameters (identifier) @variable.parameter) ; (x,y) -> ...
 
 (lambda_expression
-    parameters: (identifier) @parameter) ; x -> ...
+    parameters: (identifier) @variable.parameter) ; x -> ...
 
 ; Operators
 
@@ -107,10 +107,10 @@
 
 (field_declaration
   declarator: (variable_declarator
-    name: (identifier) @field))
+    name: (identifier) @variable.member))
 
 (field_access
-  field: (identifier) @field)
+  field: (identifier) @variable.member)
 
 [
   (boolean_type)
@@ -153,7 +153,7 @@
 [
   (decimal_floating_point_literal)
   (hex_floating_point_literal)
-] @float
+] @number.float
 
 [
   (true)
@@ -204,7 +204,7 @@
 [
   "transient"
   "volatile"
-] @storageclass
+] @keyword.storage
 
 [
   "return"
@@ -222,9 +222,9 @@
   "else"
   "switch"
   "case"
-] @conditional
+] @keyword.conditional
 
-(ternary_expression ["?" ":"] @conditional.ternary)
+(ternary_expression ["?" ":"] @keyword.conditional.ternary)
 
 ; Loops
 
@@ -234,7 +234,7 @@
   "do"
   "continue"
   "break"
-] @repeat
+] @keyword.repeat
 
 ; Includes
 
@@ -247,7 +247,7 @@
   "provides"
   "requires"
   "uses"
-] @include
+] @keyword.import
 
 ; Punctuation
 
@@ -277,7 +277,7 @@
   "finally"
   "try"
   "catch"
-] @exception
+] @keyword.exception
 
 ; Labels
 
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index 8fc69e6c7..e757dd2bd 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -1,55 +1,55 @@
 ; inherits: ecma,jsx
 
 ;;; Parameters
-(formal_parameters (identifier) @parameter)
+(formal_parameters (identifier) @variable.parameter)
 
 (formal_parameters
   (rest_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 
 ;; ({ a }) => null
 (formal_parameters
   (object_pattern
-    (shorthand_property_identifier_pattern) @parameter))
+    (shorthand_property_identifier_pattern) @variable.parameter))
 
 ;; ({ a = b }) => null
 (formal_parameters
   (object_pattern
     (object_assignment_pattern
-      (shorthand_property_identifier_pattern) @parameter)))
+      (shorthand_property_identifier_pattern) @variable.parameter)))
 
 ;; ({ a: b }) => null
 (formal_parameters
   (object_pattern
     (pair_pattern
-      value: (identifier) @parameter)))
+      value: (identifier) @variable.parameter)))
 
 ;; ([ a ]) => null
 (formal_parameters
   (array_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 
 ;; ({ a } = { a }) => null
 (formal_parameters
   (assignment_pattern
     (object_pattern
-      (shorthand_property_identifier_pattern) @parameter)))
+      (shorthand_property_identifier_pattern) @variable.parameter)))
 
 ;; ({ a = b } = { a }) => null
 (formal_parameters
   (assignment_pattern
     (object_pattern
       (object_assignment_pattern
-        (shorthand_property_identifier_pattern) @parameter))))
+        (shorthand_property_identifier_pattern) @variable.parameter))))
 
 ;; a => null
 (arrow_function
-  parameter: (identifier) @parameter)
+  parameter: (identifier) @variable.parameter)
 
 ;; optional parameters
 (formal_parameters
   (assignment_pattern
-    left: (identifier) @parameter))
+    left: (identifier) @variable.parameter))
 
 ;; punctuation
 (optional_chain) @punctuation.delimiter
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index 66acd26f4..e9967e95e 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -48,7 +48,7 @@
    (identifier) @function)
 
 (funcdefargs
-   (identifier) @parameter)
+   (identifier) @variable.parameter)
 
 [
   "reduce"
@@ -264,7 +264,7 @@
 [
   "import"
   "include"
-] @include
+] @keyword.import
 
 [
   "if"
@@ -272,12 +272,12 @@
   "elif"
   "else"
   "end"
-] @conditional
+] @keyword.conditional
 
 [
   "try"
   "catch"
-] @exception
+] @keyword.exception
 
 [
   "or"
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index e7ea6d8bb..c8eb38fcc 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -11,7 +11,7 @@
 ] @boolean
 
 ; Keywords
-"for" @repeat
+"for" @keyword.repeat
 "in" @keyword.operator
 "function" @keyword.function
 
@@ -19,7 +19,7 @@
   "if"
   "then"
   "else"
-] @conditional
+] @keyword.conditional
 
 [
   (local)
@@ -30,7 +30,7 @@
 [
   "assert"
   "error"
-] @exception
+] @keyword.exception
 
 [
   (dollar)
@@ -84,12 +84,12 @@
 [
   (import)
   (importstr)
-] @include
+] @keyword.import
 
 ; Fields
 
-(fieldname (id) @field)
-(fieldname (string (string_content) @field))
+(fieldname (id) @variable.member)
+(fieldname (string (string_content) @variable.member))
 
 ; Functions
 (field
@@ -98,7 +98,7 @@
   function: (fieldname
               (string (string_content) @function)))
 (param
-  identifier: (id) @parameter)
+  identifier: (id) @variable.parameter)
 
 (bind (id) @variable.local)
 (bind function: (id) @function)
@@ -113,6 +113,6 @@
   "("
   (args
     (named_argument
-      (id) @parameter
+      (id) @variable.parameter
     ))?
   ")")
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index c1245f4d8..20a154618 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -14,11 +14,11 @@
   name: (identifier) @function.macro)
 
 (quote_expression
-  ":" @symbol
-  [(identifier) (operator)] @symbol)
+  ":" @string.special.symbol
+  [(identifier) (operator)] @string.special.symbol)
 
 (field_expression
-  (identifier) @field .)
+  (identifier) @variable.member .)
 
 
 ;;; Function names
@@ -68,18 +68,18 @@
 ;;; Parameters
 
 (parameter_list
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 (optional_parameter .
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 (slurp_parameter
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 
 (typed_parameter
-  parameter: (identifier)? @parameter
+  parameter: (identifier)? @variable.parameter
   type: (_) @type)
 
 (function_expression
-  . (identifier) @parameter) ; Single parameter arrow functions
+  . (identifier) @variable.parameter) ; Single parameter arrow functions
 
 
 ;;; Types
@@ -362,42 +362,42 @@
   ["let" "end"] @keyword)
 
 (if_statement
-  ["if" "end"] @conditional)
+  ["if" "end"] @keyword.conditional)
 (elseif_clause
-  "elseif" @conditional)
+  "elseif" @keyword.conditional)
 (else_clause
-  "else" @conditional)
+  "else" @keyword.conditional)
 (if_clause
-  "if" @conditional) ; `if` clause in comprehensions
+  "if" @keyword.conditional) ; `if` clause in comprehensions
 (ternary_expression
-  ["?" ":"] @conditional.ternary)
+  ["?" ":"] @keyword.conditional.ternary)
 
 (try_statement
-  ["try" "end"] @exception)
+  ["try" "end"] @keyword.exception)
 (finally_clause
-  "finally" @exception)
+  "finally" @keyword.exception)
 (catch_clause
-  "catch" @exception)
+  "catch" @keyword.exception)
 
 (for_statement
-  ["for" "end"] @repeat)
+  ["for" "end"] @keyword.repeat)
 (while_statement
-  ["while" "end"] @repeat)
+  ["while" "end"] @keyword.repeat)
 (for_clause
-  "for" @repeat)
+  "for" @keyword.repeat)
 [
   (break_statement)
   (continue_statement)
-] @repeat
+] @keyword.repeat
 
 (module_definition
-  ["module" "baremodule" "end"] @include)
+  ["module" "baremodule" "end"] @keyword.import)
 (import_statement
-  ["import" "using"] @include)
+  ["import" "using"] @keyword.import)
 (import_alias
-  "as" @include)
+  "as" @keyword.import)
 (export_statement
-  "export" @include)
+  "export" @keyword.import)
 (selected_import
   ":" @punctuation.delimiter)
 
@@ -458,10 +458,10 @@
 
 (boolean_literal) @boolean
 (integer_literal) @number
-(float_literal) @float
+(float_literal) @number.float
 
-((identifier) @float
-  (#any-of? @float "NaN" "NaN16" "NaN32"
+((identifier) @number.float
+  (#any-of? @number.float "NaN" "NaN16" "NaN32"
                    "Inf" "Inf16" "Inf32"))
 
 ((identifier) @constant.builtin
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index 2e7c401a1..d2db087ce 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -1,4 +1,4 @@
-"source" @include
+"source" @keyword.import
 
 [
   "mainmenu"
@@ -24,7 +24,7 @@
   "select"
   "imply"
   "visible if"
-] @conditional
+] @keyword.conditional
 
 [
   "def_bool"
@@ -70,10 +70,10 @@
 ((symbol) @constant
   (#lua-match? @constant "[A-Z0-9]+"))
 
-(mainmenu name: (prompt) @text.title)
-(comment_entry name: (prompt) @text.title)
-(menu name: (prompt) @text.title)
+(mainmenu name: (prompt) @markup.heading)
+(comment_entry name: (prompt) @markup.heading)
+(menu name: (prompt) @markup.heading)
 
-(source (prompt) @text.uri @string.special)
+(source (prompt) @string.special.url)
 
 (comment) @comment @spell
diff --git a/queries/kdl/highlights.scm b/queries/kdl/highlights.scm
index d903128a8..5aafdeca3 100644
--- a/queries/kdl/highlights.scm
+++ b/queries/kdl/highlights.scm
@@ -29,8 +29,8 @@
 
 (number) @number
 
-(number (decimal) @float)
-(number (exponent) @float)
+(number (decimal) @number.float)
+(number (exponent) @number.float)
 
 (boolean) @boolean
 
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 36bf148f9..1ce0c5430 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -97,10 +97,10 @@
 ))
 
 (package_header "package" @keyword
-	. (identifier (simple_identifier) @namespace))
+	. (identifier (simple_identifier) @module))
 
 (import_header
-	"import" @include)
+	"import" @keyword.import)
 
 ; The last `simple_identifier` in a `import_header` will always either be a function
 ; or a type. Classes can appear anywhere in the import path, unlike functions
@@ -142,16 +142,16 @@
 	("init") @constructor)
 
 (parameter
-	(simple_identifier) @parameter)
+	(simple_identifier) @variable.parameter)
 
 (parameter_with_optional_type
-	(simple_identifier) @parameter)
+	(simple_identifier) @variable.parameter)
 
 ; lambda parameters
 (lambda_literal
 	(lambda_parameters
 		(variable_declaration
-			(simple_identifier) @parameter)))
+			(simple_identifier) @variable.parameter)))
 
 ;;; Function calls
 
@@ -227,9 +227,9 @@
 ((multiline_comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
-(shebang_line) @preproc
+(shebang_line) @keyword.directive
 
-(real_literal) @float
+(real_literal) @number.float
 [
 	(integer_literal)
 	(long_literal)
@@ -254,7 +254,7 @@
 ;    - "[abc]?".toRegex()
 (call_expression
 	(navigation_expression
-		((string_literal) @string.regex)
+		((string_literal) @string.regexp)
 		(navigation_suffix
 			((simple_identifier) @_function
 			(#eq? @_function "toRegex")))))
@@ -266,7 +266,7 @@
 	(call_suffix
 		(value_arguments
 			(value_argument
-				(string_literal) @string.regex))))
+				(string_literal) @string.regexp))))
 
 ;    - Regex.fromLiteral("[abc]?")
 (call_expression
@@ -279,7 +279,7 @@
 	(call_suffix
 		(value_arguments
 			(value_argument
-				(string_literal) @string.regex))))
+				(string_literal) @string.regexp))))
 
 ;;; Keywords
 
@@ -323,7 +323,7 @@
 	"if"
 	"else"
 	"when"
-] @conditional
+] @keyword.conditional
 
 [
 	"for"
@@ -333,14 +333,14 @@
 	"continue@"
 	"break"
 	"break@"
-] @repeat
+] @keyword.repeat
 
 [
 	"try"
 	"catch"
 	"throw"
 	"finally"
-] @exception
+] @keyword.exception
 
 
 (annotation
diff --git a/queries/kusto/highlights.scm b/queries/kusto/highlights.scm
index 825f49b35..a0ad0a895 100644
--- a/queries/kusto/highlights.scm
+++ b/queries/kusto/highlights.scm
@@ -12,8 +12,8 @@
 ] @function.call
 
 (typed_parameter
-  (identifier) @parameter)
-(function_arguments (identifier) @parameter)
+  (identifier) @variable.parameter)
+(function_arguments (identifier) @variable.parameter)
 
 [
   (binary_operator)
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index b6fda252e..c0c1a3a81 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -10,7 +10,7 @@
 [
   "match"
   "else"
-] @conditional
+] @keyword.conditional
 
 [
  "+"
@@ -32,7 +32,7 @@
   ["<" ">"] @punctuation.bracket)
 
 (binding_symbol
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (bare_symbol
   (macro
@@ -54,7 +54,7 @@
 
 [";" ":"] @punctuation.delimiter
 
-(lifetime (identifier) @storageclass)
+(lifetime (identifier) @keyword.storage)
 
 (string_literal) @string
 (regex_literal) @string
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index ea66645e5..5ccc2b8fe 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -6,7 +6,7 @@
   command: _ @function)
 
 (key_value_pair
-  key: (_) @parameter
+  key: (_) @variable.parameter
   value: (_))
 
 [
@@ -15,13 +15,13 @@
  (comment_environment)
 ] @comment @spell
 
-((line_comment) @preproc
-  (#lua-match? @preproc "^%% !TeX"))
+((line_comment) @keyword.directive
+  (#lua-match? @keyword.directive "^%% !TeX"))
 
 [
  (brack_group)
  (brack_group_argc)
-] @parameter
+] @variable.parameter
 
 [(operator) "="] @operator
 
@@ -34,12 +34,12 @@
 
 ;; General environments
 (begin
- command: _ @text.environment
- name: (curly_group_text (text) @text.environment.name))
+ command: _ @markup.environment
+ name: (curly_group_text (text) @markup.environment.name))
 
 (end
- command: _ @text.environment
- name: (curly_group_text (text) @text.environment.name))
+ command: _ @markup.environment
+ name: (curly_group_text (text) @markup.environment.name))
 
 ;; Definitions and references
 (new_command_definition
@@ -54,11 +54,11 @@
 
 (environment_definition
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 
 (theorem_definition
  command: _ @function.macro
- name: (curly_group_text (_) @text.environment.name))
+ name: (curly_group_text (_) @markup.environment.name))
 
 (paired_delimiter_definition
  command: _ @function.macro
@@ -66,178 +66,178 @@
 
 (label_definition
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 (label_reference_range
  command: _ @function.macro
- from: (curly_group_text (_) @text.reference)
- to: (curly_group_text (_) @text.reference))
+ from: (curly_group_text (_) @markup.link)
+ to: (curly_group_text (_) @markup.link))
 (label_reference
  command: _ @function.macro
- names: (curly_group_text_list (_) @text.reference))
+ names: (curly_group_text_list (_) @markup.link))
 (label_number
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference)
- number: (_) @text.reference)
+ name: (curly_group_text (_) @markup.link)
+ number: (_) @markup.link)
 
 (citation
  command: _ @function.macro
- keys: (curly_group_text_list) @text.reference)
+ keys: (curly_group_text_list) @markup.link)
 
 (glossary_entry_definition
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 (glossary_entry_reference
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 
 (acronym_definition
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 (acronym_reference
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 
 (color_definition
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 (color_reference
  command: _ @function.macro
- name: (curly_group_text (_) @text.reference))
+ name: (curly_group_text (_) @markup.link))
 
 ;; Math
 [
  (displayed_equation)
  (inline_formula)
-] @text.math
+] @markup.math
 
 (math_environment
   (begin
-   command: _ @text.math
-   name: (curly_group_text (text) @text.math)))
+   command: _ @markup.math
+   name: (curly_group_text (text) @markup.math)))
 
 (math_environment
-  (text) @text.math)
+  (text) @markup.math)
 
 (math_environment
   (end
-   command: _ @text.math
-   name: (curly_group_text (text) @text.math)))
+   command: _ @markup.math
+   name: (curly_group_text (text) @markup.math)))
 
 ;; Sectioning
 (title_declaration
-  command: _ @namespace
-  options: (brack_group (_) @text.title.1)?
-  text: (curly_group (_) @text.title.1))
+  command: _ @module
+  options: (brack_group (_) @markup.heading.1)?
+  text: (curly_group (_) @markup.heading.1))
 
 (author_declaration
-  command: _ @namespace
+  command: _ @module
   authors: (curly_group_author_list
-             ((author)+ @text.title.1)))
+             ((author)+ @markup.heading.1)))
 
 (chapter
-  command: _ @namespace
-  toc: (brack_group (_) @text.title.2)?
-  text: (curly_group (_) @text.title.2))
+  command: _ @module
+  toc: (brack_group (_) @markup.heading.2)?
+  text: (curly_group (_) @markup.heading.2))
 
 (part
-  command: _ @namespace
-  toc: (brack_group (_) @text.title.2)?
-  text: (curly_group (_) @text.title.2))
+  command: _ @module
+  toc: (brack_group (_) @markup.heading.2)?
+  text: (curly_group (_) @markup.heading.2))
 
 (section
-  command: _ @namespace
-  toc: (brack_group (_) @text.title.3)?
-  text: (curly_group (_) @text.title.3))
+  command: _ @module
+  toc: (brack_group (_) @markup.heading.3)?
+  text: (curly_group (_) @markup.heading.3))
 
 (subsection
-  command: _ @namespace
-  toc: (brack_group (_) @text.title.4)?
-  text: (curly_group (_) @text.title.4))
+  command: _ @module
+  toc: (brack_group (_) @markup.heading.4)?
+  text: (curly_group (_) @markup.heading.4))
 
 (subsubsection
-  command: _ @namespace
-  toc: (brack_group (_) @text.title.5)?
-  text: (curly_group (_) @text.title.5))
+  command: _ @module
+  toc: (brack_group (_) @markup.heading.5)?
+  text: (curly_group (_) @markup.heading.5))
 
 (paragraph
-  command: _ @namespace
-  toc: (brack_group (_) @text.title.6)?
-  text: (curly_group (_) @text.title.6))
+  command: _ @module
+  toc: (brack_group (_) @markup.heading.6)?
+  text: (curly_group (_) @markup.heading.6))
 
 (subparagraph
-  command: _ @namespace
-  toc: (brack_group (_) @text.title.6)?
-  text: (curly_group (_) @text.title.6))
+  command: _ @module
+  toc: (brack_group (_) @markup.heading.6)?
+  text: (curly_group (_) @markup.heading.6))
 
 ;; Beamer frames
 (generic_environment
   (begin
     name: (curly_group_text
-            (text) @text.environment.name)
-    (#any-of? @text.environment.name "frame"))
+            (text) @markup.environment.name)
+    (#any-of? @markup.environment.name "frame"))
   .
-  (curly_group (_) @text.title))
+  (curly_group (_) @markup.heading))
 
 ((generic_command
   command: (command_name) @_name
   arg: (curly_group
-          (text) @text.title))
+          (text) @markup.heading))
  (#eq? @_name "\\frametitle"))
 
 ;; Formatting
 (text_mode
-  content: (curly_group (_) @text))
+  content: (curly_group (_) @none @spell))
 
 ((generic_command
   command: (command_name) @_name
-  arg: (curly_group (_) @text.emphasis))
+  arg: (curly_group (_) @markup.italic))
   (#eq? @_name "\\emph"))
 
 ((generic_command
   command: (command_name) @_name
-  arg: (curly_group (_) @text.emphasis))
+  arg: (curly_group (_) @markup.italic))
  (#any-of? @_name "\\textit" "\\mathit"))
 
 ((generic_command
   command: (command_name) @_name
-  arg: (curly_group (_) @text.strong))
+  arg: (curly_group (_) @markup.strong))
  (#any-of? @_name "\\textbf" "\\mathbf"))
 
 ((generic_command
   command: (command_name) @_name
   .
-  arg: (curly_group (_) @text.uri))
+  arg: (curly_group (_) @markup.link.url))
  (#any-of? @_name "\\url" "\\href"))
 
 ;; File inclusion commands
 (class_include
-  command: _ @include
+  command: _ @keyword.import
   path: (curly_group_path) @string)
 
 (package_include
-  command: _ @include
+  command: _ @keyword.import
   paths: (curly_group_path_list) @string)
 
 (latex_include
-  command: _ @include
+  command: _ @keyword.import
   path: (curly_group_path) @string)
 (import_include
-  command: _ @include
+  command: _ @keyword.import
   directory: (curly_group_path) @string
   file: (curly_group_path) @string)
 
 (bibtex_include
-  command: _ @include
+  command: _ @keyword.import
   path: (curly_group_path) @string)
 (biblatex_include
-  "\\addbibresource" @include
-  glob: (curly_group_glob_pattern) @string.regex)
+  "\\addbibresource" @keyword.import
+  glob: (curly_group_glob_pattern) @string.regexp)
 
 (graphics_include
-  command: _ @include
+  command: _ @keyword.import
   path: (curly_group_path) @string)
 (tikz_library_import
-  command: _ @include
+  command: _ @keyword.import
   paths: (curly_group_path_list) @string)
 
 (text) @spell
diff --git a/queries/ledger/highlights.scm b/queries/ledger/highlights.scm
index 185269a00..8194b50ad 100644
--- a/queries/ledger/highlights.scm
+++ b/queries/ledger/highlights.scm
@@ -23,11 +23,11 @@
     (option_value)
     (check_in)
     (check_out)
-] @text.literal
+] @markup.raw
 
-((account) @field)
+((account) @variable.member)
 
-"include" @include
+"include" @keyword.import
 
 [
     "account"
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 60f3fefeb..11c2d67e4 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -34,23 +34,23 @@
  "transition"
 ] @keyword.function
 
-"import" @include
+"import" @keyword.import
 
 "return" @keyword.return
 
 (return_arrow) @punctuation.delimiter
 
-"for" @repeat
+"for" @keyword.repeat
 
 [ 
   "else"
   "if"
-] @conditional
+] @keyword.conditional
 
 [
  (ternary_if)
  (ternary_else)
-] @conditional.ternary
+] @keyword.conditional.ternary
 
 [ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
 
@@ -118,11 +118,11 @@
 ] @string.special
 
 ;record declaration
-(record_declaration (identifier) @field) 
+(record_declaration (identifier) @variable.member) 
 
 ;struct component 
 (struct_component_declaration 
-  (identifier) @field)
+  (identifier) @variable.member)
 
 (type) @type
 
@@ -140,7 +140,7 @@
 
 (record_type
  (locator
-	(identifier) @field))
+	(identifier) @variable.member))
 
 (transition_declaration
   name: (identifier) @function.builtin)
@@ -159,13 +159,13 @@
 
 (method_call
   . (_)
-  . (identifier) @method.call)
+  . (identifier) @function.method.call)
 
 (function_parameter
- (identifier) @parameter)
+ (identifier) @variable.parameter)
 
 (struct_declaration
-  name: (identifier) @field)
+  name: (identifier) @variable.member)
 
 (variable_declaration
 	(identifier_or_identifiers
diff --git a/queries/linkerscript/highlights.scm b/queries/linkerscript/highlights.scm
index f933f31ca..0453ded85 100644
--- a/queries/linkerscript/highlights.scm
+++ b/queries/linkerscript/highlights.scm
@@ -13,13 +13,13 @@
 
 ; Conditionals
 
-(conditional_expression [ "?" ":" ] @conditional.ternary)
+(conditional_expression [ "?" ":" ] @keyword.conditional.ternary)
 
 ; Variables
 
 (symbol) @variable
 
-(filename) @string.special @text.underline
+(filename) @string.special.path
 
 ; Functions
 
@@ -27,8 +27,8 @@
   function: (symbol) @function.call)
 
 ((call_expression
-  function: (symbol) @preproc)
-  (#eq? @preproc "DEFINED"))
+  function: (symbol) @keyword.directive)
+  (#eq? @keyword.directive "DEFINED"))
 
 ((call_expression
   function: (symbol) @function.builtin)
@@ -52,7 +52,7 @@
 [
   "ORIGIN" "org" "o"
   "LENGTH" "len" "l"
-] @field.builtin
+] @variable.member.builtin
 
 ; Constants
 
@@ -80,7 +80,7 @@
 
 ; Exceptions
 
-"ASSERT" @exception
+"ASSERT" @keyword.exception
 
 [
   "/DISCARD/"
diff --git a/queries/liquidsoap/highlights.scm b/queries/liquidsoap/highlights.scm
index fcf553e3b..45b5abe05 100644
--- a/queries/liquidsoap/highlights.scm
+++ b/queries/liquidsoap/highlights.scm
@@ -25,7 +25,7 @@
   "for"
   "for_end"
   "while_end"
-] @repeat
+] @keyword.repeat
 
 [
   "if"
@@ -33,15 +33,15 @@
   "elsif"
   "else"
   "if_end"
-] @conditional
+] @keyword.conditional
 
 [
   "try"
   "catch"
   "try_end"
-] @exception
+] @keyword.exception
 
-(inline_if [ "?" ":" ] @conditional.ternary)
+(inline_if [ "?" ":" ] @keyword.conditional.ternary)
 
 [
   "%ifdef"
@@ -53,12 +53,12 @@
   "%endif"
   "%argsof"
   "%include"
-] @preproc
+] @keyword.directive
 
 (encoder_name) @constant.builtin
 
-(anonymous_argument (var) @parameter)
-(labeled_argument label: (var) @parameter)
+(anonymous_argument (var) @variable.parameter)
+(labeled_argument label: (var) @variable.parameter)
 
 "." @punctuation.delimiter
 
@@ -72,14 +72,14 @@
 ]  @punctuation.bracket
 
 (app name: (var) @function.call)
-(method) @method
-(method_app) @method.call
+(method) @function.method
+(method_app) @function.method.call
 
 (string) @string
 (string_interpolation [ "#{" "}" ] @punctuation.special)
 (integer) @number
-(float) @float
+(float) @number.float
 (bool) @boolean
 (comment) @comment
-(regexp) @string.regex
+(regexp) @string.regexp
 (type) @type
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index 37a31a3bb..96b8bab93 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -14,7 +14,7 @@
 (global_type
   (local_var) @type.definition)
 
-(argument) @parameter
+(argument) @variable.parameter
 
 (_ inst_name: _ @keyword.operator)
 
@@ -101,7 +101,7 @@
   "localexec"
   (unnamed_addr)
   (dll_storage_class)
-] @storageclass
+] @keyword.storage
 
 (attribute_name) @attribute
 
@@ -117,7 +117,7 @@
 (cstring) @string
 (label) @label
 (_ inst_name: "ret" @keyword.return)
-(float) @float
+(float) @number.float
 
 [
   (struct_value)
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 2f12d3ce2..0cb861596 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -21,13 +21,13 @@
   "while"
   "do"
   "end"
-] @repeat)
+] @keyword.repeat)
 
 (repeat_statement
 [
   "repeat"
   "until"
-] @repeat)
+] @keyword.repeat)
 
 (if_statement
 [
@@ -36,27 +36,27 @@
   "else"
   "then"
   "end"
-] @conditional)
+] @keyword.conditional)
 
 (elseif_statement
 [
   "elseif"
   "then"
   "end"
-] @conditional)
+] @keyword.conditional)
 
 (else_statement
 [
   "else"
   "end"
-] @conditional)
+] @keyword.conditional)
 
 (for_statement
 [
   "for"
   "do"
   "end"
-] @repeat)
+] @keyword.repeat)
 
 (function_declaration
 [
@@ -133,8 +133,8 @@
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "self"))
 
-((identifier) @namespace.builtin
-  (#any-of? @namespace.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
+((identifier) @module.builtin
+  (#any-of? @module.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
 
 ((identifier) @keyword.coroutine
   (#eq? @keyword.coroutine "coroutine"))
@@ -167,9 +167,9 @@
 
 ;; Tables
 
-(field name: (identifier) @field)
+(field name: (identifier) @variable.member)
 
-(dot_index_expression field: (identifier) @field)
+(dot_index_expression field: (identifier) @variable.member)
 
 (table_constructor
 [
@@ -179,9 +179,9 @@
 
 ;; Functions
 
-(parameters (identifier) @parameter)
+(parameters (identifier) @variable.parameter)
 
-(vararg_expression) @parameter.builtin
+(vararg_expression) @variable.parameter.builtin
 
 (function_declaration
   name: [
@@ -192,7 +192,7 @@
 
 (function_declaration
   name: (method_index_expression
-    method: (identifier) @method))
+    method: (identifier) @function.method))
 
 (assignment_statement
   (variable_list .
@@ -215,7 +215,7 @@
     (dot_index_expression
       field: (identifier) @function.call)
     (method_index_expression
-      method: (identifier) @method.call)
+      method: (identifier) @function.method.call)
   ])
 
 (function_call
@@ -240,7 +240,7 @@
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^[-][-](%s?)@"))
 
-(hash_bang_line) @preproc
+(hash_bang_line) @keyword.directive
 
 (number) @number
 
@@ -257,7 +257,7 @@
                . (_)
                .
                (string
-                 content: (string_content) @string.regex)))
+                 content: (string_content) @string.regexp)))
 
 ;("123"):match("%d+")
 (function_call
@@ -266,4 +266,4 @@
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
   arguments: (arguments
                . (string
-                   content: (string_content) @string.regex)))
+                   content: (string_content) @string.regexp)))
diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
index ec8bcb765..3555039dc 100644
--- a/queries/luadoc/highlights.scm
+++ b/queries/luadoc/highlights.scm
@@ -3,7 +3,7 @@
 [
   "@module"
   "@package"
-] @include
+] @keyword.import
 
 [
   "@class"
@@ -38,8 +38,8 @@
 (function_type ["fun" "function"] @keyword.function)
 
 (source_annotation
-  filename: (identifier) @text.uri @string.special
-  extension: (identifier) @text.uri @string.special)
+  filename: (identifier) @string.special.path
+  extension: (identifier) @string.special.path)
 
 (version_annotation
   version: _ @constant.builtin)
@@ -75,17 +75,17 @@
 
 ; Parameters
 
-(param_annotation (identifier) @parameter)
+(param_annotation (identifier) @variable.parameter)
 
-(parameter (identifier) @parameter)
+(parameter (identifier) @variable.parameter)
 
 ; Fields
 
-(field_annotation (identifier) @field)
+(field_annotation (identifier) @variable.member)
 
-(table_literal_type field: (identifier) @field)
+(table_literal_type field: (identifier) @variable.member)
 
-(member_type ["#" "."] . (identifier) @field)
+(member_type ["#" "."] . (identifier) @variable.member)
 
 ; Types
 
@@ -110,7 +110,7 @@
 
 ; Literals
 
-(string) @namespace ; only used in @module
+(string) @module ; only used in @module
 
 (literal_type) @string
 
diff --git a/queries/luap/highlights.scm b/queries/luap/highlights.scm
index 87e6c6908..0f95d4eff 100644
--- a/queries/luap/highlights.scm
+++ b/queries/luap/highlights.scm
@@ -33,4 +33,4 @@
 (negated_set "^" @operator)
 
 (balanced_match
-  (character) @parameter)
+  (character) @variable.parameter)
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 4cd0b443c..5fdfb5006 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -1,6 +1,6 @@
 ; Preproc
 
-(hash_bang_line) @preproc
+(hash_bang_line) @keyword.directive
 
 ;; Keywords
 
@@ -23,18 +23,18 @@
   "while"
   "do"
   "end"
-] @repeat)
+] @keyword.repeat)
 
 (repeat_statement
 [
   "repeat"
   "until"
-] @repeat)
+] @keyword.repeat)
 
 [
   (break_statement)
   (continue_statement)
-] @repeat
+] @keyword.repeat
 
 (if_statement
 [
@@ -43,27 +43,27 @@
   "else"
   "then"
   "end"
-] @conditional)
+] @keyword.conditional)
 
 (elseif_statement
 [
   "elseif"
   "then"
   "end"
-] @conditional)
+] @keyword.conditional)
 
 (else_statement
 [
   "else"
   "end"
-] @conditional)
+] @keyword.conditional)
 
 (for_statement
 [
   "for"
   "do"
   "end"
-] @repeat)
+] @keyword.repeat)
 
 (function_declaration
 [
@@ -149,19 +149,19 @@
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "self"))
 
-((identifier) @namespace.builtin
-  (#any-of? @namespace.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
+((identifier) @module.builtin
+  (#any-of? @module.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
 
 ((identifier) @keyword.coroutine
   (#eq? @keyword.coroutine "coroutine"))
 
 ;; Tables
 
-(field name: (identifier) @field)
+(field name: (identifier) @variable.member)
 
-(dot_index_expression field: (identifier) @field)
+(dot_index_expression field: (identifier) @variable.member)
 
-(object_type (identifier) @field)
+(object_type (identifier) @variable.member)
 
 (table_constructor
 [
@@ -171,8 +171,8 @@
 
 ; Functions
 
-(parameter . (identifier) @parameter)
-(function_type (identifier) @parameter)
+(parameter . (identifier) @variable.parameter)
+(function_type (identifier) @variable.parameter)
 
 (function_call name: (identifier) @function.call)
 (function_declaration name: (identifier) @function)
@@ -180,7 +180,7 @@
 (function_call name: (dot_index_expression field: (identifier) @function.call))
 (function_declaration name: (dot_index_expression field: (identifier) @function))
 
-(method_index_expression method: (identifier) @method.call)
+(method_index_expression method: (identifier) @function.method.call)
 
 (function_call
   (identifier) @function.builtin
@@ -252,11 +252,11 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-  arguments: (arguments . (_) . (string content: _ @string.regex)))
+  arguments: (arguments . (_) . (string content: _ @string.regexp)))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-    arguments: (arguments . (string content: _ @string.regex)))
+    arguments: (arguments . (string content: _ @string.regexp)))
diff --git a/queries/m68k/highlights.scm b/queries/m68k/highlights.scm
index edb36cd57..e37c55ae0 100644
--- a/queries/m68k/highlights.scm
+++ b/queries/m68k/highlights.scm
@@ -7,9 +7,9 @@
   (directive_mnemonic)
 ] @function.builtin
 
-(include (directive_mnemonic) @include)
-(include_bin (directive_mnemonic) @include)
-(include_dir (directive_mnemonic) @include)
+(include (directive_mnemonic) @keyword.import)
+(include_bin (directive_mnemonic) @keyword.import)
+(include_dir (directive_mnemonic) @keyword.import)
 
 
 (size) @attribute
@@ -17,10 +17,8 @@
 (macro_definition name: (symbol) @function.macro)
 (macro_call name: (symbol) @function.macro)
 
-[
-  (path)
-  (string_literal)
-] @string
+(string_literal) @string
+(path) @string.special.path
 
 [
   (decimal_literal)
@@ -44,8 +42,8 @@
   (named_register)
 ] @keyword
 
-(repeat (control_mnemonic) @repeat)
-(conditional (control_mnemonic) @conditional)
+(repeat (control_mnemonic) @keyword.repeat)
+(conditional (control_mnemonic) @keyword.conditional)
 
 (comment) @comment @spell
 
@@ -68,4 +66,4 @@
   ")+"
 ] @punctuation.bracket
 
-(section) @namespace
+(section) @module
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index b224a6765..e1d7aa4f7 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -7,8 +7,8 @@
   "ifneq"
   "ifdef"
   "ifndef"
- ] @conditional)
- "endif" @conditional)
+ ] @keyword.conditional)
+ "endif" @keyword.conditional)
 
 (rule (targets (word) @function))
 
@@ -41,10 +41,12 @@
 
 (export_directive "export" @keyword)
 (override_directive "override" @keyword)
-(include_directive ["include" "-include"] @include)
+(include_directive
+  ["include" "-include"] @keyword.import
+  filenames: (list (word) @string.special.path))
 
 (variable_assignment
- name: (word) @symbol
+ name: (word) @string.special.symbol
  [
   "?="
   ":="
@@ -55,12 +57,12 @@
  ] @operator)
 
 (shell_assignment
- name: (word) @symbol
+ name: (word) @string.special.symbol
  "!=" @operator)
 
 (define_directive
  "define" @keyword
- name: (word) @symbol
+ name: (word) @string.special.symbol
  [
   "="
   ":="
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 9ffc6ee86..aa7b6a66c 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -1,38 +1,54 @@
 ;From MDeiml/tree-sitter-markdown & Helix
-(setext_heading (paragraph) @text.title.1 (setext_h1_underline) @text.title.1.marker)
-(setext_heading (paragraph) @text.title.2 (setext_h2_underline) @text.title.2.marker)
+(setext_heading (paragraph) @markup.heading.1 (setext_h1_underline) @markup.heading.1.marker)
+(setext_heading (paragraph) @markup.heading.2 (setext_h2_underline) @markup.heading.2.marker)
 
-(atx_heading (atx_h1_marker) @text.title.1.marker (inline) @text.title.1)
-(atx_heading (atx_h2_marker) @text.title.2.marker (inline) @text.title.2)
-(atx_heading (atx_h3_marker) @text.title.3.marker (inline) @text.title.3)
-(atx_heading (atx_h4_marker) @text.title.4.marker (inline) @text.title.4)
-(atx_heading (atx_h5_marker) @text.title.5.marker (inline) @text.title.5)
-(atx_heading (atx_h6_marker) @text.title.6.marker (inline) @text.title.6)
-
-(link_title) @text.literal
-(indented_code_block) @text.literal.block
-((fenced_code_block) @text.literal.block (#set! "priority" 90))
+(atx_heading (atx_h1_marker) @markup.heading.1.marker (inline) @markup.heading.1)
+(atx_heading (atx_h2_marker) @markup.heading.2.marker (inline) @markup.heading.2)
+(atx_heading (atx_h3_marker) @markup.heading.3.marker (inline) @markup.heading.3)
+(atx_heading (atx_h4_marker) @markup.heading.4.marker (inline) @markup.heading.4)
+(atx_heading (atx_h5_marker) @markup.heading.5.marker (inline) @markup.heading.5)
+(atx_heading (atx_h6_marker) @markup.heading.6.marker (inline) @markup.heading.6)
 
 (info_string) @label
 
-(pipe_table_header (pipe_table_cell) @text.title)
+(pipe_table_header (pipe_table_cell) @markup.heading)
 
 (pipe_table_header "|" @punctuation.special)
 (pipe_table_row "|" @punctuation.special)
 (pipe_table_delimiter_row "|" @punctuation.special)
 (pipe_table_delimiter_cell) @punctuation.special
 
-[
-  (fenced_code_block_delimiter)
-] @punctuation.delimiter
+;; Code blocks (conceal backticks and language annotation)
+(indented_code_block) @markup.raw.block
+
+((fenced_code_block) @markup.raw.block
+  (#set! "priority" 90))
 
-;; Conceal backticks
 (fenced_code_block
   (fenced_code_block_delimiter) @conceal
   (#set! conceal ""))
+
 (fenced_code_block
-  (info_string (language) @conceal
-  (#set! conceal "")))
+  (info_string
+    (language) @conceal
+    (#set! conceal "")))
+
+[
+  (link_destination)
+] @markup.link.url
+
+[
+  (link_title)
+  (link_label)
+] @markup.link.label
+
+[
+  (list_marker_plus)
+  (list_marker_minus)
+  (list_marker_star)
+  (list_marker_dot)
+  (list_marker_parenthesis)
+] @markup.list
 
 ; NOTE: The following has been commented out due to issues with spaces in the
 ; list marker nodes generated by the parser. If those spaces ever get captured
@@ -58,28 +74,12 @@
 
 (code_fence_content) @none
 
-[
-  (link_destination)
-] @text.uri
+(thematic_break) @punctuation.special
 
-[
-  (link_label)
-] @text.reference
+(task_list_marker_unchecked) @markup.list.unchecked
+(task_list_marker_checked) @markup.list.checked
 
-[
-  (list_marker_plus)
-  (list_marker_minus)
-  (list_marker_star)
-  (list_marker_dot)
-  (list_marker_parenthesis)
-  (thematic_break)
-] @punctuation.special
-
-
-(task_list_marker_unchecked) @text.todo.unchecked
-(task_list_marker_checked) @text.todo.checked
-
-((block_quote) @text.quote (#set! "priority" 90))
+((block_quote) @markup.quote (#set! "priority" 90))
 
 [
   (block_continuation)
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index f9589bdd9..a1f63328b 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -1,49 +1,36 @@
 ;; From MDeiml/tree-sitter-markdown
-[
-  (code_span)
-  (link_title)
-] @text.literal @nospell
+(code_span) @markup.raw @nospell
 
-[
-  (emphasis_delimiter)
-  (code_span_delimiter)
-] @punctuation.delimiter
+(emphasis) @markup.italic
 
-(emphasis) @text.emphasis
+(strong_emphasis) @markup.strong
 
-(strong_emphasis) @text.strong
-
-(strikethrough) @text.strike
+(strikethrough) @markup.strikethrough
 
 [
   (link_destination)
   (uri_autolink)
-] @text.uri @nospell
+] @markup.link.url @nospell
 
 (shortcut_link (link_text) @nospell)
 
 [
   (link_label)
   (link_text)
+  (link_title)
   (image_description)
-] @text.reference
+] @markup.link.label
 
 [
   (backslash_escape)
   (hard_line_break)
 ] @string.escape
 
-(image "!" @punctuation.special)
-(image ["[" "]" "(" ")"] @punctuation.bracket)
-(inline_link ["[" "]" "(" ")"] @punctuation.bracket)
-(shortcut_link ["[" "]"] @punctuation.bracket)
-
 ; Conceal codeblock and text style markers
-([
-  (code_span_delimiter)
-  (emphasis_delimiter)
-] @conceal
-(#set! conceal ""))
+((code_span_delimiter) @markup.raw
+  (#set! conceal ""))
+((emphasis_delimiter) @markup.strong
+  (#set! conceal ""))
 
 ; Conceal inline links
 (inline_link
@@ -53,7 +40,7 @@
     "("
     (link_destination)
     ")"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal image links
@@ -65,7 +52,7 @@
     "("
     (link_destination)
     ")"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal full reference links
@@ -74,7 +61,7 @@
     "["
     "]"
     (link_label)
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal collapsed reference links
@@ -82,7 +69,7 @@
   [
     "["
     "]"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ; Conceal shortcut links
@@ -90,13 +77,13 @@
   [
     "["
     "]"
-  ] @conceal
+  ] @markup.link
   (#set! conceal ""))
 
 ;; Replace common HTML entities.
-((entity_reference) @conceal (#eq? @conceal "&nbsp;") (#set! conceal ""))
-((entity_reference) @conceal (#eq? @conceal "&lt;") (#set! conceal "<"))
-((entity_reference) @conceal (#eq? @conceal "&gt;") (#set! conceal ">"))
-((entity_reference) @conceal (#eq? @conceal "&amp;") (#set! conceal "&"))
-((entity_reference) @conceal (#eq? @conceal "&quot;") (#set! conceal "\""))
-((entity_reference) @conceal (#any-of? @conceal "&ensp;" "&emsp;") (#set! conceal " "))
\ No newline at end of file
+((entity_reference) @character.special (#eq? @character.special "&nbsp;") (#set! conceal ""))
+((entity_reference) @character.special (#eq? @character.special "&lt;") (#set! conceal "<"))
+((entity_reference) @character.special (#eq? @character.special "&gt;") (#set! conceal ">"))
+((entity_reference) @character.special (#eq? @character.special "&amp;") (#set! conceal "&"))
+((entity_reference) @character.special (#eq? @character.special "&quot;") (#set! conceal "\""))
+((entity_reference) @character.special (#any-of? @character.special "&ensp;" "&emsp;") (#set! conceal " "))
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index 9f8303a3d..a2e73ee62 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -1,7 +1,7 @@
 ; Includes
 
-((command_name) @include
-  (#eq? @include "import"))
+((command_name) @keyword.import
+  (#eq? @keyword.import "import"))
 
 ; Keywords
 
@@ -19,24 +19,24 @@
 
 ; Conditionals
 
-(if_statement [ "if" "end" ] @conditional)
-(elseif_clause "elseif" @conditional)
-(else_clause "else" @conditional)
-(switch_statement [ "switch" "end" ] @conditional)
-(case_clause "case" @conditional)
-(otherwise_clause "otherwise" @conditional)
-(break_statement) @conditional
+(if_statement [ "if" "end" ] @keyword.conditional)
+(elseif_clause "elseif" @keyword.conditional)
+(else_clause "else" @keyword.conditional)
+(switch_statement [ "switch" "end" ] @keyword.conditional)
+(case_clause "case" @keyword.conditional)
+(otherwise_clause "otherwise" @keyword.conditional)
+(break_statement) @keyword.conditional
 
 ; Repeats
 
-(for_statement [ "for" "parfor" "end" ] @repeat)
-(while_statement [ "while" "end" ] @repeat)
-(continue_statement) @repeat
+(for_statement [ "for" "parfor" "end" ] @keyword.repeat)
+(while_statement [ "while" "end" ] @keyword.repeat)
+(continue_statement) @keyword.repeat
 
 ; Exceptions
 
-(try_statement [ "try" "end" ] @exception)
-(catch_clause "catch" @exception)
+(try_statement [ "try" "end" ] @keyword.exception)
+(catch_clause "catch" @keyword.exception)
 
 ; Variables
 
@@ -51,7 +51,7 @@
 
 ; Fields/Properties
 
-(field_expression field: (identifier) @field)
+(field_expression field: (identifier) @variable.member)
 
 (superclass "." (identifier) @property)
 
@@ -87,13 +87,13 @@
 (validation_functions (identifier) @function)
 
 (command (command_name) @function.call)
-(command_argument) @parameter
+(command_argument) @variable.parameter
 
 (return_statement) @keyword.return
 
 ; Parameters
 
-(function_arguments (identifier) @parameter)
+(function_arguments (identifier) @variable.parameter)
 
 ; Punctuation
 
diff --git a/queries/menhir/highlights.scm b/queries/menhir/highlights.scm
index 8b4b41d59..8c4e402c0 100644
--- a/queries/menhir/highlights.scm
+++ b/queries/menhir/highlights.scm
@@ -1,5 +1,5 @@
 ["%parameter" "%token" "%type" "%start" "%attribute" "%left" "%right" "%nonassoc" "%public" "%inline" "%prec"] @keyword
-["%on_error_reduce"] @exception
+["%on_error_reduce"] @keyword.exception
 
 ["let"] @keyword.function
 
@@ -15,7 +15,7 @@
 (old_rule [(symbol)] @function)
 (new_rule [(lid)] @function)
 
-(precedence [(symbol)] @parameter)
+(precedence [(symbol)] @variable.parameter)
 
 (funcall) @function.call
 
diff --git a/queries/mermaid/highlights.scm b/queries/mermaid/highlights.scm
index 2f3e31b90..b661f8ad8 100644
--- a/queries/mermaid/highlights.scm
+++ b/queries/mermaid/highlights.scm
@@ -99,12 +99,12 @@
  "&"
  ] @operator
 
-(sequence_actor) @field
-(class_name) @field
+(sequence_actor) @variable.member
+(class_name) @variable.member
 
-(state_name) @field
+(state_name) @variable.member
 
-(gantt_task_text) @field
+(gantt_task_text) @variable.member
 
 [
  (class_annotation_line)
@@ -116,10 +116,10 @@
  (state_annotation_choice)
  ] @attribute
 
-(directive) @include
+(directive) @keyword.import
 
 (pie_label) @string
-(pie_value) @float
+(pie_value) @number.float
 
 [
 (flowchart_direction_lr)
@@ -128,7 +128,7 @@
 (flowchart_direction_bt)
  ] @constant
 
-(flow_vertex_id) @field
+(flow_vertex_id) @variable.member
 
 [
  (flow_link_arrow)
@@ -164,10 +164,10 @@
  (er_reltype_identifying)
  ] @operator
 
-(er_entity_name) @field
+(er_entity_name) @variable.member
 
 (er_attribute_type) @type
-(er_attribute_name) @field
+(er_attribute_name) @variable.member
 
 [
  (er_attribute_key_type_pk)
diff --git a/queries/meson/highlights.scm b/queries/meson/highlights.scm
index 14fc52136..a61e6b1e6 100644
--- a/queries/meson/highlights.scm
+++ b/queries/meson/highlights.scm
@@ -40,21 +40,21 @@
 ] @operator
 
 (ternaryoperator
-  ["?" ":"] @conditional.ternary)
+  ["?" ":"] @keyword.conditional.ternary)
 
 [
   "if"
   "elif"
   "else"
   "endif"
-] @conditional
+] @keyword.conditional
 
 [
   "foreach"
   "endforeach"
   (keyword_break)
   (keyword_continue)
-] @repeat
+] @keyword.repeat
 
 (string) @string
 
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index 2037ff78e..ff768a19d 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -274,7 +274,7 @@
   (complex_literal)
 ] @number
 
-(float_literal) @float
+(float_literal) @number.float
 (bool_literal) @boolean
 
 [
@@ -328,8 +328,8 @@
 (func_dialect name: (symbol_ref_id) @function)
 (llvm_dialect name: (symbol_ref_id) @function)
 
-(func_arg_list (value_use) @parameter)
-(block_arg_list (value_use) @parameter)
+(func_arg_list (value_use) @variable.parameter)
+(block_arg_list (value_use) @variable.parameter)
 
 (caret_id) @tag
 (value_use) @variable
diff --git a/queries/nasm/highlights.scm b/queries/nasm/highlights.scm
index 1556f9ca5..d588635fc 100644
--- a/queries/nasm/highlights.scm
+++ b/queries/nasm/highlights.scm
@@ -23,7 +23,7 @@
 "?" @constant.builtin
 
 (conditional_expression
-  [ "?" ":" ] @conditional.ternary)
+  [ "?" ":" ] @keyword.conditional.ternary)
 
 [
   ":"
@@ -58,7 +58,7 @@
 
 (string_literal) @string
 
-(float_literal) @float
+(float_literal) @number.float
 
 [
   (packed_bcd_literal)
@@ -83,18 +83,18 @@
   (preproc_pragma)
   (preproc_line)
   (preproc_clear)
-] @preproc
+] @keyword.directive
 
-(preproc_include) @include
+(preproc_include) @keyword.import
 
-(preproc_rep_loop) @repeat
+(preproc_rep_loop) @keyword.repeat
 
-(preproc_if) @conditional
+(preproc_if) @keyword.conditional
 
 [
   (preproc_def)
   (preproc_undef)
-] @define
+] @keyword.directive.define
 
 (preproc_function_def) @keyword.function
 
diff --git a/queries/nickel/highlights.scm b/queries/nickel/highlights.scm
index f4df28030..e340c37f7 100644
--- a/queries/nickel/highlights.scm
+++ b/queries/nickel/highlights.scm
@@ -11,10 +11,10 @@
 
 "fun" @keyword.function
 
-"import" @include
+"import" @keyword.import
 
-[ "if" "then" "else" ] @conditional
-"match" @conditional
+[ "if" "then" "else" ] @keyword.conditional
+"match" @keyword.conditional
 
 (types) @type
 "Array" @type.builtin
@@ -46,13 +46,13 @@
 (interpolation_start) @punctuation.bracket
 (interpolation_end) @punctuation.bracket
 
-(record_field) @field
+(record_field) @variable.member
 
 (builtin) @function.builtin
 
 (fun_expr pats:
   (pattern id:
-    (ident) @parameter
+    (ident) @variable.parameter
   )
 )
 
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index a6e28038e..1a7da2ba2 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -27,7 +27,7 @@
       (pragma_list) @variable))
 ; NOTE: has to be after
 ; (type_expression) @type
-; and before @preproc and all literals
+; and before @keyword.directive and all literals
 
 ; constants/enums in array construction
 (array_construction
@@ -86,14 +86,14 @@
 [ "(" ")" "[" "[:" "]" "{" "}" ] @punctuation.bracket
 
 ; =============================================================================
-; @preproc               ; various preprocessor directives & shebangs
+; @keyword.directive               ; various preprocessor directives & shebangs
 
 [
   "macro"
   "template"
-] @preproc
+] @keyword.directive
 
-(pragma_list ["{." "}" ".}"] @preproc)
+(pragma_list ["{." "}" ".}"] @keyword.directive)
 ; NOTE: has to come after @punctuation.bracket
 
 ; =============================================================================
@@ -156,9 +156,9 @@
 (custom_numeric_literal) @number
 
 ; =============================================================================
-; @float                ; floating-point number literals
+; @number.float                ; floating-point number literals
 
-(float_literal) @float
+(float_literal) @number.float
 
 ; =============================================================================
 ; @function         ; function definitions
@@ -294,14 +294,14 @@
   ])
 
 ; =============================================================================
-; @method           ; method definitions
+; @function.method           ; method definitions
 
 (method_declaration
   name: [
-    (identifier) @method
-    (accent_quoted (identifier) @method)
-    (exported_symbol (identifier) @method)
-    (exported_symbol (accent_quoted (identifier) @method))
+    (identifier) @function.method
+    (accent_quoted (identifier) @function.method)
+    (exported_symbol (identifier) @function.method)
+    (exported_symbol (accent_quoted (identifier) @function.method))
   ])
 
 ; =============================================================================
@@ -403,7 +403,7 @@
 ] @keyword.return
 
 ; =============================================================================
-; @conditional         ; keywords related to conditionals (e.g. `if` / `else`)
+; @keyword.conditional         ; keywords related to conditionals (e.g. `if` / `else`)
 
 [
   "if"
@@ -411,21 +411,21 @@
   "case"
   "elif"
   "else"
-] @conditional
+] @keyword.conditional
 
-(of_branch "of" @conditional)
+(of_branch "of" @keyword.conditional)
 
 ; =============================================================================
-; @repeat              ; keywords related to loops (e.g. `for` / `while`)
+; @keyword.repeat              ; keywords related to loops (e.g. `for` / `while`)
 
 [
   "for"
   "while"
   "continue"
   "break"
-] @repeat
+] @keyword.repeat
 
-(for "in" @repeat)
+(for "in" @keyword.repeat)
 
 ; =============================================================================
 ; @label               ; GOTO and other labels (e.g. `label:` in C)
@@ -437,27 +437,27 @@
   ])
 
 ; =============================================================================
-; @include             ; keywords for including modules (e.g. `import` / `from` in Python)
+; @keyword.import             ; keywords for including modules (e.g. `import` / `from` in Python)
 
 [
   "import"
   "include"
   "export"
-] @include
+] @keyword.import
 
-(import_from_statement "from" @include)
+(import_from_statement "from" @keyword.import)
 
-(except_clause "except" @include)
+(except_clause "except" @keyword.import)
 
 ; =============================================================================
-; @exception           ; keywords related to exceptions (e.g. `throw` / `catch`)
+; @keyword.exception           ; keywords related to exceptions (e.g. `throw` / `catch`)
 
 [
   "try"
   "except"
   "finally"
   "raise"
-] @exception
+] @keyword.exception
 
 ; =============================================================================
 ; @type            ; type or class definitions and annotations
@@ -505,15 +505,15 @@
 ; where `tuple` is captured as @keyword
 
 ; =============================================================================
-; @parameter        ; parameters of a function
+; @variable.parameter        ; parameters of a function
 
 ; named parameters when calling
 ; call(parameter_name=arg)
 (argument_list
   (equal_expression
     left: [
-      (identifier) @parameter
-      (accent_quoted (identifier) @parameter)
+      (identifier) @variable.parameter
+      (accent_quoted (identifier) @variable.parameter)
     ]))
 
 ; parameters in function declaration
@@ -522,8 +522,8 @@
     (symbol_declaration_list
       (symbol_declaration
         name: [
-          (identifier) @parameter
-          (accent_quoted (identifier) @parameter)
+          (identifier) @variable.parameter
+          (accent_quoted (identifier) @variable.parameter)
         ]))))
 ; NOTE: needs to be after @type
 
@@ -533,8 +533,8 @@
     (symbol_declaration_list
       (symbol_declaration
         name: [
-          (identifier) @parameter
-          (accent_quoted (identifier) @parameter)
+          (identifier) @variable.parameter
+          (accent_quoted (identifier) @variable.parameter)
         ])))))
 
 ; for loop variables
@@ -543,43 +543,43 @@
     (symbol_declaration_list
       (symbol_declaration
         name: [
-          (identifier) @parameter
-          (accent_quoted (identifier) @parameter)
+          (identifier) @variable.parameter
+          (accent_quoted (identifier) @variable.parameter)
         ])))
 
 ((tuple_deconstruct_declaration
   (symbol_declaration
     name: [
-      (identifier) @parameter
-      (accent_quoted (identifier) @parameter)
+      (identifier) @variable.parameter
+      (accent_quoted (identifier) @variable.parameter)
     ])) @_tuple_decons
   (#has-ancestor? @_tuple_decons for))
 
 (concept_declaration
   parameters:
     (parameter_list [
-      (identifier) @parameter
-      (accent_quoted (identifier) @parameter)
+      (identifier) @variable.parameter
+      (accent_quoted (identifier) @variable.parameter)
     ]))
 (var_parameter [
-  (identifier) @parameter
-  (accent_quoted (identifier) @parameter)
+  (identifier) @variable.parameter
+  (accent_quoted (identifier) @variable.parameter)
 ])
 (type_parameter [
-  (identifier) @parameter
-  (accent_quoted (identifier) @parameter)
+  (identifier) @variable.parameter
+  (accent_quoted (identifier) @variable.parameter)
 ])
 (static_parameter [
-  (identifier) @parameter
-  (accent_quoted (identifier) @parameter)
+  (identifier) @variable.parameter
+  (accent_quoted (identifier) @variable.parameter)
 ])
 (ref_parameter [
-  (identifier) @parameter
-  (accent_quoted (identifier) @parameter)
+  (identifier) @variable.parameter
+  (accent_quoted (identifier) @variable.parameter)
 ])
 (pointer_parameter [
-  (identifier) @parameter
-  (accent_quoted (identifier) @parameter)
+  (identifier) @variable.parameter
+  (accent_quoted (identifier) @variable.parameter)
 ])
 
 
@@ -612,17 +612,17 @@
 (pointer_parameter "ptr" @type.qualifier)
 
 ; =============================================================================
-; @field           ; object and struct fields
+; @variable.member           ; object and struct fields
 
 ; fields in object/tuple declaration
 (field_declaration
   (symbol_declaration_list
     (symbol_declaration
       name: [
-        (identifier) @field
-        (accent_quoted (identifier) @field)
-        (exported_symbol (identifier) @field)
-        (exported_symbol (accent_quoted (identifier) @field))
+        (identifier) @variable.member
+        (accent_quoted (identifier) @variable.member)
+        (exported_symbol (identifier) @variable.member)
+        (exported_symbol (accent_quoted (identifier) @variable.member))
       ])))
 
 ; fields in object construction
@@ -630,16 +630,16 @@
   (argument_list
     (colon_expression
       left: [
-        (identifier) @field
-        (accent_quoted (identifier) @field)
+        (identifier) @variable.member
+        (accent_quoted (identifier) @variable.member)
       ])))
 
 ; fields in tuple construction
 (tuple_construction
   (colon_expression
     left: [
-      (identifier) @field
-      (accent_quoted (identifier) @field)
+      (identifier) @variable.member
+      (accent_quoted (identifier) @variable.member)
     ]))
 
 (variant_declaration
@@ -647,10 +647,10 @@
     (symbol_declaration_list
       (symbol_declaration
         name: [
-          (identifier) @field
-          (accent_quoted (identifier) @field)
-          (exported_symbol (identifier) @field)
-          (exported_symbol (accent_quoted (identifier) @field))
+          (identifier) @variable.member
+          (accent_quoted (identifier) @variable.member)
+          (exported_symbol (identifier) @variable.member)
+          (exported_symbol (accent_quoted (identifier) @variable.member))
         ]))))
 
 ; =============================================================================
@@ -732,37 +732,37 @@
 (nil_literal) @constant.builtin
 
 ; =============================================================================
-; @namespace        ; modules or namespaces
+; @module        ; modules or namespaces
 
 (import_statement
   (expression_list
-    (identifier) @namespace))
+    (identifier) @module))
 
 (import_statement
   (expression_list
     (infix_expression
       operator: "as"
-      right: (identifier) @namespace)))
+      right: (identifier) @module)))
 
 (import_statement
   (expression_list
     (infix_expression
       operator: (operator) @_operator
       right: [
-        (identifier) @namespace
-        (array_construction (identifier) @namespace)
+        (identifier) @module
+        (array_construction (identifier) @module)
       ]))
   (#eq? @_operator "/"))
 
 (import_from_statement
   module: (infix_expression
     operator: (operator) @_operator
-    right: (identifier) @namespace)
+    right: (identifier) @module)
   (#eq? @_operator "/"))
 
 (export_statement
   (expression_list
-    (identifier) @namespace))
+    (identifier) @module))
 
 ; =============================================================================
 ; overrule things
diff --git a/queries/nim_format_string/highlights.scm b/queries/nim_format_string/highlights.scm
index 94a239dfb..b30ecbbef 100644
--- a/queries/nim_format_string/highlights.scm
+++ b/queries/nim_format_string/highlights.scm
@@ -6,10 +6,10 @@
 
 (format_specifiers
   colon: (colon) @punctuation.delimiter
-  fill_align: (fill_align)? @conditional.ternary
+  fill_align: (fill_align)? @keyword.conditional.ternary
   sign: (sign)? @operator
   hash: (hash)? @punctuation.special
-  zero: (zero)? @field
+  zero: (zero)? @variable.member
   min_width: (min_width)? @number
   precision: (precision)? @number
   type: (type)? @type)
diff --git a/queries/ninja/highlights.scm b/queries/ninja/highlights.scm
index e90169ff3..5f87ff6b5 100644
--- a/queries/ninja/highlights.scm
+++ b/queries/ninja/highlights.scm
@@ -8,7 +8,7 @@
 [
   "include"
   "subninja"
-] @include
+] @keyword.import
 
 [
   ":"
@@ -39,7 +39,7 @@
 ;;
 ;; Paths and Text
 ;; ==============
-(path) @string.special
+(path) @string.special.path
 (text) @string
 
 ;;
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 97e5303ba..0f6caf4e2 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -15,8 +15,8 @@
 
 ; exceptions
 (variable_expression
-  name: (identifier) @exception
-  (#any-of? @exception "abort" "throw")
+  name: (identifier) @keyword.exception
+  (#any-of? @keyword.exception "abort" "throw")
   (#set! "priority" 101))
 
 ; if/then/else
@@ -24,7 +24,7 @@
   "if"
   "then"
   "else"
-] @conditional
+] @keyword.conditional
 
 ; field access default (`a.b or c`)
 "or" @keyword.operator
@@ -37,7 +37,8 @@
   (#set! "priority" 99)) @string
 
 ; paths and URLs
-[ (path_expression) (hpath_expression) (spath_expression) (uri_expression) ] @string.special
+[ (path_expression) (hpath_expression) (spath_expression) ] @string.special.path
+(uri_expression) @string.special.url
 
 ; escape sequences
 (escape_sequence) @string.escape
@@ -61,7 +62,7 @@
 
 ; `?` in `{ x ? y }:`, used to set defaults for named function arguments
 (formal
-  name: (identifier) @parameter
+  name: (identifier) @variable.parameter
   "?"? @operator)
 
 ; `...` in `{ ... }`, used to ignore unknown named function arguments (see above)
@@ -70,7 +71,7 @@
 ; universal is the parameter of the function expression
 ; `:` in `x: y`, used to separate function argument from body (see above)
 (function_expression
-  universal: (identifier) @parameter
+  universal: (identifier) @variable.parameter
   ":" @punctuation.special)
 
 ; function calls
@@ -82,8 +83,8 @@
 (variable_expression) @variable
 
 (variable_expression
-  name: (identifier) @include
-  (#eq? @include "import"))
+  name: (identifier) @keyword.import
+  (#eq? @keyword.import "import"))
 
 (variable_expression
   name: (identifier) @boolean
@@ -115,11 +116,11 @@
 
 (select_expression
   expression: (_) @_expr
-  attrpath: (attrpath attr: (identifier) @field)
+  attrpath: (attrpath attr: (identifier) @variable.member)
   (#not-eq? @_expr "builtins")
 )
-(attrset_expression (binding_set (binding . (attrpath (identifier) @field))))
-(rec_attrset_expression (binding_set (binding . (attrpath (identifier) @field))))
+(attrset_expression (binding_set (binding . (attrpath (identifier) @variable.member))))
+(rec_attrset_expression (binding_set (binding . (attrpath (identifier) @variable.member))))
 
 ; function definition
 (binding 
@@ -142,5 +143,5 @@
 [
   (unary_expression "-" (float_expression))
   (float_expression)
-] @float
+] @number.float
 
diff --git a/queries/nqc/highlights.scm b/queries/nqc/highlights.scm
index 28d101f66..2198426ca 100644
--- a/queries/nqc/highlights.scm
+++ b/queries/nqc/highlights.scm
@@ -7,7 +7,7 @@
 
 [
   "until"
-] @repeat
+] @keyword.repeat
 
 [
   "acquire"
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index c636895f6..129a74e89 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -3,15 +3,15 @@
 ; Preprocs
 
 (preproc_undef
-  name: (_) @constant) @preproc
+  name: (_) @constant) @keyword.directive
 
 ; Includes
 
-(module_import "@import" @include path: (identifier) @namespace)
+(module_import "@import" @keyword.import path: (identifier) @module)
 
 ((preproc_include
-  _ @include path: (_))
-  (#any-of? @include "#include" "#import"))
+  _ @keyword.import path: (_))
+  (#any-of? @keyword.import "#include" "#import"))
 
 ; Type Qualifiers
 
@@ -31,7 +31,7 @@
   "@dynamic"
   "volatile"
   (protocol_qualifier)
-] @storageclass
+] @keyword.storage
 
 ; Keywords
 
@@ -74,7 +74,7 @@
   "@finally"
   "__finally"
   "@throw"
-] @exception
+] @keyword.exception
 
 ; Variables
 
@@ -91,13 +91,13 @@
   "asm"
 ] @function.builtin
 
-(method_definition (identifier) @method)
+(method_definition (identifier) @function.method)
 
-(method_declaration (identifier) @method)
+(method_declaration (identifier) @function.method)
 
-(method_identifier (identifier)? @method ":" @method (identifier)? @method)
+(method_identifier (identifier)? @function.method ":" @function.method (identifier)? @function.method)
 
-(message_expression method: (identifier) @method.call)
+(message_expression method: (identifier) @function.method.call)
 
 ; Constructors
 
@@ -154,9 +154,9 @@
 
 (class_declaration (identifier) @type)
 
-(class_interface "@interface" . (identifier) @type superclass: _? @type category: _? @namespace)
+(class_interface "@interface" . (identifier) @type superclass: _? @type category: _? @module)
 
-(class_implementation "@implementation" . (identifier) @type superclass: _? @type category: _? @namespace)
+(class_implementation "@implementation" . (identifier) @type superclass: _? @type category: _? @module)
 
 (protocol_forward_declaration (identifier) @type) ; @interface :(
 
@@ -185,17 +185,17 @@
 
 ; Parameters
 
-(method_parameter ":" @method (identifier) @parameter)
+(method_parameter ":" @function.method (identifier) @variable.parameter)
 
-(method_parameter declarator: (identifier) @parameter)
+(method_parameter declarator: (identifier) @variable.parameter)
 
 (parameter_declaration 
   declarator: (function_declarator 
                 declarator: (parenthesized_declarator 
                               (block_pointer_declarator 
-                                declarator: (identifier) @parameter))))
+                                declarator: (identifier) @variable.parameter))))
 
-"..." @parameter.builtin
+"..." @variable.parameter.builtin
 
 ; Operators
 
@@ -207,7 +207,7 @@
 
 (platform) @string.special
 
-(version_number) @text.uri @number
+(version_number) @string.special
 
 ; Punctuation
 
diff --git a/queries/objdump/highlights.scm b/queries/objdump/highlights.scm
index d23f5a0d9..7532260a6 100644
--- a/queries/objdump/highlights.scm
+++ b/queries/objdump/highlights.scm
@@ -6,26 +6,26 @@
   (address)
 ] @number
 
-[
-  "file" "format"
-  "File" "Offset:"
-  "discriminator"
-] @text
-"Disassembly of section " @text.title
+; [
+;   "file" "format"
+;   "File" "Offset:"
+;   "discriminator"
+; ] @none
+"Disassembly of section " @markup.heading
 
-(section_address) @number @text.underline
+(section_address) @string.special
 
 (identifier) @variable
 (code_location (identifier) @function.call)
 (header (identifier) @keyword)
-(disassembly_section_label (identifier) @namespace)
-(disassembly_section (identifier) @namespace)
+(disassembly_section_label (identifier) @module)
+(disassembly_section (identifier) @module)
 
-[(file_offset) (discriminator)] @field
+[(file_offset) (discriminator)] @variable.member
 
-(file_path) @string
+(file_path) @string.special.path
 (instruction) @function
-(bad_instruction) @text.warning
+(bad_instruction) @comment.warning
 (label) @label
 
 ["<" ">"] @punctuation.special
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index e263d833e..d08c8e358 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -1,7 +1,7 @@
 ; Modules
 ;--------
 
-[(module_name) (module_type_name)] @namespace
+[(module_name) (module_type_name)] @module
 
 ; Types
 ;------
@@ -23,7 +23,7 @@
 
 [(value_name) (type_variable)] @variable
 
-(value_pattern) @parameter
+(value_pattern) @variable.parameter
 
 ; Functions
 ;----------
@@ -40,7 +40,7 @@
 
 (external (value_name) @function)
 
-(method_name) @method
+(method_name) @function.method
 
 ; Application
 ;------------
@@ -107,13 +107,13 @@
 
 ["fun" "function" "functor"] @keyword.function
 
-["if" "then" "else"] @conditional
+["if" "then" "else"] @keyword.conditional
 
-["exception" "try"] @exception
+["exception" "try"] @keyword.exception
 
-["include" "open"] @include
+["include" "open"] @keyword.import
 
-["for" "to" "downto" "while" "do" "done"] @repeat
+["for" "to" "downto" "while" "do" "done"] @keyword.repeat
 
 ; Punctuation
 ;------------
diff --git a/queries/ocamllex/highlights.scm b/queries/ocamllex/highlights.scm
index 248470821..6a5088710 100644
--- a/queries/ocamllex/highlights.scm
+++ b/queries/ocamllex/highlights.scm
@@ -23,7 +23,7 @@
 ; Rules
 
 (lexer_entry_name) @function
-(lexer_argument) @parameter
+(lexer_argument) @variable.parameter
 
 (lexer_entry ["=" "|"] @punctuation.delimiter)
 
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 6b06153f3..38896cbfc 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -3,14 +3,14 @@
 [
   (calling_convention)
   (tag)
-] @preproc
+] @keyword.directive
 
 ; Includes
 
 [
   "import"
   "package"
-] @include
+] @keyword.import
 
 ; Keywords
 
@@ -41,7 +41,7 @@
 [
   "distinct"
   "dynamic"
-] @storageclass
+] @keyword.storage
 
 ; Conditionals
 
@@ -54,7 +54,7 @@
   "where"
   "break"
   (fallthrough_statement)
-] @conditional
+] @keyword.conditional
 
 ((ternary_expression
   [
@@ -63,7 +63,7 @@
     "if"
     "else"
     "when"
-  ] @conditional.ternary)
+  ] @keyword.conditional.ternary)
   (#set! "priority" 105))
 
 ; Repeats
@@ -72,7 +72,7 @@
   "for"
   "do"
   "continue"
-] @repeat
+] @keyword.repeat
 
 ; Variables
 
@@ -80,23 +80,23 @@
 
 ; Namespaces
 
-(package_declaration (identifier) @namespace)
+(package_declaration (identifier) @module)
 
-(import_declaration alias: (identifier) @namespace)
+(import_declaration alias: (identifier) @module)
 
-(foreign_block (identifier) @namespace)
+(foreign_block (identifier) @module)
 
-(using_statement (identifier) @namespace)
+(using_statement (identifier) @module)
 
 ; Parameters
 
-(parameter (identifier) @parameter ":" "="? (identifier)? @constant)
+(parameter (identifier) @variable.parameter ":" "="? (identifier)? @constant)
 
-(default_parameter (identifier) @parameter ":=")
+(default_parameter (identifier) @variable.parameter ":=")
 
-(named_type (identifier) @parameter)
+(named_type (identifier) @variable.parameter)
 
-(call_expression argument: (identifier) @parameter "=")
+(call_expression argument: (identifier) @variable.parameter "=")
 
 ; Functions
 
@@ -138,7 +138,7 @@
 
 (struct . (identifier) @type)
 
-(field_type . (identifier) @namespace "." (identifier) @type)
+(field_type . (identifier) @module "." (identifier) @type)
 
 (bit_set_type (identifier) @type ";")
 
@@ -152,13 +152,13 @@
 
 ; Fields
 
-(member_expression "." (identifier) @field)
+(member_expression "." (identifier) @variable.member)
 
-(struct_type "{" (identifier) @field)
+(struct_type "{" (identifier) @variable.member)
 
-(struct_field (identifier) @field "="?)
+(struct_field (identifier) @variable.member "="?)
 
-(field (identifier) @field)
+(field (identifier) @variable.member)
 
 ; Constants
 
@@ -187,7 +187,7 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (string) @string
 
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index e11e0eaa2..088465545 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -72,13 +72,13 @@
 	(kWhile)
 	(kRepeat)
 	(kUntil)
-] @repeat
+] @keyword.repeat
 
 [
 	(kIf)
 	(kThen)
 	(kElse)
-] @conditional
+] @keyword.conditional
 
 [
 	(kPublished)
@@ -95,9 +95,9 @@
 	(kPacked)
 
 	(kAbsolute)
-] @storageclass
+] @keyword.storage
 
-(kUses) @include
+(kUses) @keyword.import
 
 ; -- Attributes
 
@@ -278,7 +278,7 @@
   (comment) @comment.documentation
   . (declVar))
 
-(pp)              @preproc
+(pp)              @keyword.directive
 
 ; -- Type declaration
 
@@ -304,11 +304,11 @@
 
 ; -- Function parameters
 
-(declArg name: (identifier) @parameter)
+(declArg name: (identifier) @variable.parameter)
 
 ; -- Template parameters
 
-(genericArg	name: (identifier) @parameter)
+(genericArg	name: (identifier) @variable.parameter)
 (genericArg	type: (typeref) @type)
 
 (declProc name: (genericDot lhs: (identifier) @type))
@@ -322,7 +322,7 @@
 
 ; -- Exception parameters
 
-(exceptionHandler variable: (identifier) @parameter)
+(exceptionHandler variable: (identifier) @variable.parameter)
 
 ; -- Type usage
 
@@ -394,10 +394,10 @@
  (#lua-match? @keyword.return "^[eE][xX][iI][tT]$")))
 (statement (exprCall entity: ((identifier) @keyword.return
  (#lua-match? @keyword.return "^[eE][xX][iI][tT]$"))))
-(statement ((identifier) @repeat
- (#lua-match? @repeat "^[bB][rR][eE][aA][kK]$")))
-(statement ((identifier) @repeat
- (#lua-match? @repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
+(statement ((identifier) @keyword.repeat
+ (#lua-match? @keyword.repeat "^[bB][rR][eE][aA][kK]$")))
+(statement ((identifier) @keyword.repeat
+ (#lua-match? @keyword.repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
 
 ; -- Identifier type inference
 
diff --git a/queries/passwd/highlights.scm b/queries/passwd/highlights.scm
index 3e078a123..51bb8fc5f 100644
--- a/queries/passwd/highlights.scm
+++ b/queries/passwd/highlights.scm
@@ -1,12 +1,12 @@
-(user) @namespace
+(user) @module
 
-(auth) @symbol
+(auth) @string.special.symbol
 
 (gecos) @string
 
-(home) @text.uri @constant
+(home) @string.special.path
 
-(shell) @text.uri @string.special
+(shell) @string.special.path
 
 [
   (gid)
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index e3aa0b2bb..7a0c4e530 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -1,13 +1,13 @@
-((source_file . (comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+((source_file . (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
 
-[ "use" "no" "require" ] @include
+[ "use" "no" "require" ] @keyword.import
 
-[ "if" "elsif" "unless" "else" ] @conditional
+[ "if" "elsif" "unless" "else" ] @keyword.conditional
 
-(conditional_expression [ "?" ":" ] @conditional.ternary) 
+(conditional_expression [ "?" ":" ] @keyword.conditional.ternary) 
 
-[ "while" "until" "for" "foreach" ] @repeat
+[ "while" "until" "for" "foreach" ] @keyword.repeat
 
 "return" @keyword.return
 
@@ -15,7 +15,7 @@
 
 [ "map" "grep" "sort" ] @function.builtin
 
-"package" @include
+"package" @keyword.import
 
 [
   "do"
@@ -27,7 +27,7 @@
 (_ operator: _ @operator)
 "\\" @operator
 
-(yadayada) @exception
+(yadayada) @keyword.exception
 
 (phaser_statement phase: _ @keyword.phaser)
 
@@ -37,10 +37,10 @@
   "isa"
 ] @keyword.operator
 
-(eof_marker) @preproc
+(eof_marker) @keyword.directive
 (data_section) @comment
 
-(pod) @text
+(pod) @none
 
 [
   (number)
@@ -70,7 +70,7 @@
  (quoted_regexp)
  (match_regexp)
  (regexp_content)
-] @string.regex
+] @string.regexp
 
 (autoquoted_bareword) @string.special
 
@@ -89,7 +89,7 @@
 (relational_expression operator: "isa" right: (bareword) @type)
 
 (function_call_expression (function) @function.call)
-(method_call_expression (method) @method.call)
+(method_call_expression (method) @function.method.call)
 (method_call_expression invocant: (bareword) @type)
 
 (func0op_call_expression function: _ @function.builtin)
diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index 427ab4838..aa3be62b9 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -59,7 +59,7 @@
 (list_literal "list" @function.builtin)
 
 (method_declaration
-  name: (name) @method)
+  name: (name) @function.method)
 
 (function_call_expression
   function: (qualified_name (name) @function.call))
@@ -71,13 +71,13 @@
   name: (name) @function.call)
 
 (member_call_expression
-  name: (name) @method.call)
+  name: (name) @function.method.call)
 
 (function_definition
   name: (name) @function)
 
 (nullsafe_member_call_expression
-    name: (name) @method)
+    name: (name) @function.method)
 
 (method_declaration
     name: (name) @constructor
@@ -90,10 +90,10 @@
 [
   (simple_parameter)
   (variadic_parameter)
-] @parameter
+] @variable.parameter
 
 (argument
-    (name) @parameter)
+    (name) @variable.parameter)
 
 ; Member
 
@@ -115,18 +115,18 @@
 
 ; Namespace
 (namespace_definition
-  name: (namespace_name (name) @namespace))
+  name: (namespace_name (name) @module))
 (namespace_name_as_prefix
-  (namespace_name (name) @namespace))
+  (namespace_name (name) @module))
 
 ; Attributes
 (attribute_list) @attribute
 
 ; Conditions ( ? : )
-(conditional_expression) @conditional
+(conditional_expression) @keyword.conditional
 
 ; Directives
-(declare_directive ["strict_types" "ticks" "encoding"] @parameter)
+(declare_directive ["strict_types" "ticks" "encoding"] @variable.parameter)
 
 ; Basic tokens
 
@@ -149,7 +149,7 @@
 (boolean) @boolean
 (null) @constant.builtin
 (integer) @number
-(float) @float
+(float) @number.float
 (comment) @comment @spell
 
 (named_label_statement) @label
@@ -215,7 +215,7 @@
  "switch"
  "match"
   "??"
- ] @conditional
+ ] @keyword.conditional
 
 [
  "continue"
@@ -226,14 +226,14 @@
  "for"
  "foreach"
  "while"
- ] @repeat
+ ] @keyword.repeat
 
 [
  "catch"
  "finally"
  "throw"
  "try"
- ] @exception
+ ] @keyword.exception
 
 [
  "include_once"
@@ -241,7 +241,7 @@
  "require_once"
  "require"
  "use"
- ] @include
+ ] @keyword.import
 
 [
  ","
diff --git a/queries/phpdoc/highlights.scm b/queries/phpdoc/highlights.scm
index 08ff9e1cb..a30409314 100644
--- a/queries/phpdoc/highlights.scm
+++ b/queries/phpdoc/highlights.scm
@@ -1,7 +1,7 @@
 (tag_name) @attribute @nospell
 (tag
   (tag_name) @_tag (#eq? @_tag "@param")
-  (variable_name) @parameter
+  (variable_name) @variable.parameter
 )
 (tag
   (tag_name) @_tag (#eq? @_tag "@property")
@@ -12,11 +12,11 @@
   (variable_name) @variable
 )
 (tag
-  (tag_name) @_tag (#eq? @_tag "@method")
-  (name) @method
+  (tag_name) @_tag (#eq? @_tag "@function.method")
+  (name) @function.method
 )
 (parameter
-  (variable_name) @parameter)
+  (variable_name) @variable.parameter)
 (type_list
   [
     (array_type)
@@ -27,14 +27,14 @@
 (type_list) @nospell
 (variable_name) @nospell
 (tag
-  (description (text) @text))
+  (description (text) @none @spell))
 (tag
   [
     (author_name)
     (version)
-  ] @text)
+  ] @none)
 (tag
-  (email_address) @text.uri
+  (email_address) @string.special.url
 )
 
 (type_list "|" @keyword)
diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm
index 055f745b4..6d0479b37 100644
--- a/queries/pioasm/highlights.scm
+++ b/queries/pioasm/highlights.scm
@@ -21,9 +21,9 @@
 
 [ "block" "noblock" "rel" ] @attribute
 
-[ "iffull" "ifempty" ] @conditional
+[ "iffull" "ifempty" ] @keyword.conditional
 
-"public" @storageclass
+"public" @keyword.storage
 
 (integer) @number
 
@@ -31,4 +31,4 @@
 (directive (symbol_def (identifier) @variable))
 (value (identifier) @variable)
 
-(directive directive: _ @preproc)
+(directive directive: _ @keyword.directive)
diff --git a/queries/po/highlights.scm b/queries/po/highlights.scm
index 307e32059..d799d692b 100644
--- a/queries/po/highlights.scm
+++ b/queries/po/highlights.scm
@@ -26,4 +26,4 @@
 
 (comment (reference (text) @string.special.path))
 
-(comment (flag (text) @preproc))
+(comment (flag (text) @keyword.directive))
diff --git a/queries/pod/highlights.scm b/queries/pod/highlights.scm
index e1e88f5f8..e5a192620 100644
--- a/queries/pod/highlights.scm
+++ b/queries/pod/highlights.scm
@@ -12,7 +12,7 @@
 (command_paragraph
   (command) @keyword
   (#lua-match? @keyword "^=head")
-  (content) @text.title)
+  (content) @markup.heading)
 
 (command_paragraph
   (command) @keyword
@@ -22,7 +22,7 @@
 (command_paragraph
   (command) @keyword
   (#lua-match? @keyword "^=item")
-  (content) @text)
+  (content) @none)
 
 (command_paragraph
   (command) @keyword
@@ -30,7 +30,7 @@
   (content) @string.special)
 
 
-(verbatim_paragraph (content) @text.literal)
+(verbatim_paragraph (content) @markup.raw)
 
 (interior_sequence
   (sequence_letter) @character
@@ -40,32 +40,32 @@
 (interior_sequence
   (sequence_letter) @character
   (#eq? @character "B")
-  (content) @text.strong)
+  (content) @markup.strong)
 
 (interior_sequence
   (sequence_letter) @character
   (#eq? @character "C")
-  (content) @text.literal)
+  (content) @markup.raw)
 
 (interior_sequence
   (sequence_letter) @character
   (#eq? @character "F")
-  (content) @text.underline @string.special)
+  (content) @string.special.path)
 
 (interior_sequence
   (sequence_letter) @character
   (#eq? @character "I")
-  (content) @text.emphasis)
+  (content) @markup.italic)
 
 (interior_sequence
   (sequence_letter) @character
   (#eq? @character "L")
-  (content) @text.uri)
+  (content) @string.special.url)
 
 (interior_sequence
   (sequence_letter) @character
   (#eq? @character "X")
-  (content) @text.reference)
+  (content) @markup.link)
 
 (interior_sequence
   (sequence_letter) @character
diff --git a/queries/poe_filter/highlights.scm b/queries/poe_filter/highlights.scm
index 3b233a7d8..7db71d279 100644
--- a/queries/poe_filter/highlights.scm
+++ b/queries/poe_filter/highlights.scm
@@ -1,8 +1,8 @@
-["Show" "Hide" "Minimal"] @namespace
+["Show" "Hide" "Minimal"] @module
 
-["Import" "Optional"] @include
+["Import" "Optional"] @keyword.import
 
-(condition (name) @conditional)
+(condition (name) @keyword.conditional)
 (action (name) @keyword)
 (continue) @label
 
@@ -10,7 +10,7 @@
 
 (string) @string
 
-(file) @string.special
+(file) @string.special.path
 
 [
   (quality)
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
index 18c3975ea..1d0c86c35 100644
--- a/queries/pony/highlights.scm
+++ b/queries/pony/highlights.scm
@@ -2,7 +2,7 @@
 
 [
   "use"
-] @include
+] @keyword.import
 
 ; Keywords
 
@@ -68,13 +68,13 @@
   "else"
   "elseif"
   "match"
-] @conditional
+] @keyword.conditional
 
-(if_statement "end" @conditional)
+(if_statement "end" @keyword.conditional)
 
-(iftype_statement "end" @conditional)
+(iftype_statement "end" @keyword.conditional)
 
-(match_statement "end" @conditional)
+(match_statement "end" @keyword.conditional)
 
 ; Repeats
 
@@ -86,11 +86,11 @@
   "continue"
   "do"
   "break"
-] @repeat
+] @keyword.repeat
 
-(do_block "end" @repeat)
+(do_block "end" @keyword.repeat)
 
-(repeat_statement "end" @repeat)
+(repeat_statement "end" @keyword.repeat)
 
 ; Exceptions
 
@@ -98,11 +98,11 @@
   "try"
   (error)
   "compile_error"
-] @exception
+] @keyword.exception
 
-(try_statement "end" @exception)
+(try_statement "end" @keyword.exception)
 
-(recover_statement "end" @exception)
+(recover_statement "end" @keyword.exception)
 
 ; Attributes
 
@@ -116,9 +116,9 @@
 
 ; Fields
 
-(field name: (identifier) @field)
+(field name: (identifier) @variable.member)
 
-(member_expression "." (identifier) @field)
+(member_expression "." (identifier) @variable.member)
 
 ; Constructors
 
@@ -126,11 +126,11 @@
 
 ; Methods
 
-(method (identifier) @method)
+(method (identifier) @function.method)
 
-(behavior (identifier) @method)
+(behavior (identifier) @function.method)
 
-(ffi_method (identifier) @method)
+(ffi_method (identifier) @function.method)
 
 ((ffi_method (string) @string.special)
   (#set! "priority" 105))
@@ -138,15 +138,15 @@
 (call_expression
   callee:
     [
-      (identifier) @method.call
-      (ffi_identifier (identifier) @method.call)
-      (member_expression "." (identifier) @method.call)
+      (identifier) @function.method.call
+      (ffi_identifier (identifier) @function.method.call)
+      (member_expression "." (identifier) @function.method.call)
     ])
 
 ; Parameters
 
-(parameter name: (identifier) @parameter)
-(lambda_parameter name: (identifier) @parameter)
+(parameter name: (identifier) @variable.parameter)
+(lambda_parameter name: (identifier) @variable.parameter)
 
 ; Types
 
@@ -156,7 +156,7 @@
 
 (generic_parameter (identifier) @type)
 
-(lambda_type (identifier)? @method)
+(lambda_type (identifier)? @function.method)
 
 ((identifier) @type
   (#lua-match? @type "^_*[A-Z][a-zA-Z0-9_]*$"))
@@ -250,7 +250,7 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (boolean) @boolean
 
diff --git a/queries/promql/highlights.scm b/queries/promql/highlights.scm
index 47038034a..d0af0356c 100644
--- a/queries/promql/highlights.scm
+++ b/queries/promql/highlights.scm
@@ -25,15 +25,15 @@
   ")"
 ] @punctuation.bracket
 
-(float_literal) @float
+(float_literal) @number.float
 (string_literal) @string
 
 (metric_name) @type
-(range_selection) @text.strong @type
-(subquery_range_selection) @text.strong @type
+(range_selection) @type
+(subquery_range_selection) @type
 
-(label_name) @field
-(label_value) @text.underline @string.regex
+(label_name) @variable.member
+(label_value) @string.regexp
 
 (function_name) @function.call
 
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index e869b87e0..f3715d5db 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -28,7 +28,7 @@
 [
   "package"
   "import"
-] @include
+] @keyword.import
 
 [
   (key_type)
@@ -51,7 +51,7 @@
 
 (int_lit) @number
 
-(float_lit) @float
+(float_lit) @number.float
 
 [
   (true)
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 92f74f089..587e8f070 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -20,9 +20,9 @@
   (keyword_from_text)
 ] @keyword
 
-(keyword_loop) @repeat
+(keyword_loop) @keyword.repeat
 
-(keyword_case) @conditional
+(keyword_case) @keyword.conditional
 
 [
  (literal_string)
@@ -31,9 +31,9 @@
 ] @string
 
 (assignment
-  alias: (field) @field)
+  alias: (field) @variable.member)
 
-alias: (identifier) @field
+alias: (identifier) @variable.member
 
 (comment) @comment @spell
 
@@ -75,7 +75,7 @@ alias: (identifier) @field
 
 (integer) @number
 
-(decimal_number) @float
+(decimal_number) @number.float
 
 [
   (keyword_min)
@@ -123,7 +123,7 @@ alias: (identifier) @field
   (keyword_full)
   (keyword_csv)
   (keyword_json)
-] @method.call
+] @function.method.call
 
 [
   (keyword_true)
@@ -139,7 +139,7 @@ alias: (identifier) @field
   name: (identifier) @function)
 
 (parameter
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 
 (variable
   (keyword_let)
diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index 57667885a..cdd9d1d83 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -18,7 +18,7 @@
 (id) @constant
 (class) @property
 
-(doctype) @preproc
+(doctype) @keyword.directive
 
 (content) @none
 
@@ -33,22 +33,22 @@
  (#match? @keyword "^(:|v-bind|v-|\\@)"))
 (quoted_attribute_value) @string
 
-(include (keyword) @include)
-(extends (keyword) @include)
-(filename) @string.special
+(include (keyword) @keyword.import)
+(extends (keyword) @keyword.import)
+(filename) @string.special.path
 
 (block_definition (keyword) @keyword)
 (block_append (keyword)+ @keyword)
 (block_prepend (keyword)+ @keyword)
 (block_name) @type
 
-(conditional (keyword) @conditional)
+(conditional (keyword) @keyword.conditional)
 (case
-  (keyword) @conditional
-  (when (keyword) @conditional)+)
+  (keyword) @keyword.conditional
+  (when (keyword) @keyword.conditional)+)
 
-(each (keyword) @repeat)
-(while (keyword) @repeat)
+(each (keyword) @keyword.repeat)
+(while (keyword) @keyword.repeat)
 
 (mixin_use
   "+" @punctuation.delimiter
@@ -57,14 +57,14 @@
   (keyword) @keyword.function
   (mixin_name) @function)
 (mixin_attributes
-  (attribute_name) @parameter)
+  (attribute_name) @variable.parameter)
 
 (filter
   ":" @punctuation.delimiter
-  (filter_name) @method.call)
+  (filter_name) @function.method.call)
 (filter
   (attributes
-    (attribute (attribute_name) @parameter)))
+    (attribute (attribute_name) @variable.parameter)))
 
 [
  "(" ")"
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index 196aa9dbd..aaf5dac39 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -4,7 +4,7 @@
 
 ; Includes
 
-"include" @include
+"include" @keyword.import
 
 (include_statement (identifier) @type)
 
@@ -31,9 +31,9 @@
   "else"
   "unless"
   "case"
-] @conditional
+] @keyword.conditional
 
-(default_case "default" @conditional)
+(default_case "default" @keyword.conditional)
 
 ; Properties
 
@@ -42,13 +42,13 @@
 
 ; Parameters
 
-(lambda (variable (identifier) @parameter))
+(lambda (variable (identifier) @variable.parameter))
 
-(parameter (variable (identifier) @parameter))
+(parameter (variable (identifier) @variable.parameter))
 
-(function_call (identifier) @parameter)
+(function_call (identifier) @variable.parameter)
 
-(method_call (identifier) @parameter)
+(method_call (identifier) @variable.parameter)
 
 ; Functions
 
@@ -64,16 +64,16 @@
 ; Methods
 
 (function_declaration
-  "function" . (class_identifier (identifier) @method . ))
+  "function" . (class_identifier (identifier) @function.method . ))
 
 (function_call
-  (class_identifier (identifier) @method.call . ))
+  (class_identifier (identifier) @function.method.call . ))
 
 (defined_resource_type
-  "define" . (class_identifier (identifier) @method . ))
+  "define" . (class_identifier (identifier) @function.method . ))
 
 (method_call
-  "." . (identifier) @method.call)
+  "." . (identifier) @function.method.call)
 
 ; Types
 
@@ -104,7 +104,7 @@
 
 ; "Namespaces"
 
-(class_identifier . (identifier) @namespace)
+(class_identifier . (identifier) @module)
 
 ; Operators
 
@@ -171,13 +171,13 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (string) @string
 
 (escape_sequence) @string.escape
 
-(regex) @string.regex
+(regex) @string.regexp
 
 (boolean) @boolean
 
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index 3e3ec3cb8..247ea839e 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -5,7 +5,7 @@
   (integer)
   (exp_negation)
 ] @number
- (exp_literal (number)) @float
+ (exp_literal (number)) @number.float
  (char) @character
  [
    (string)
@@ -43,12 +43,12 @@
    "else"
    "case"
    "of"
- ] @conditional
+ ] @keyword.conditional
 
  [
    "import"
    "module"
- ] @include
+ ] @keyword.import
 
  [
    (operator)
@@ -74,10 +74,10 @@
  ] @operator
 
  (qualified_module (module) @constructor)
- (module) @namespace
- (qualified_type (module) @namespace)
- (qualified_variable (module) @namespace)
- (import (module) @namespace)
+ (module) @module
+ (qualified_type (module) @module)
+ (qualified_variable (module) @module)
+ (import (module) @module)
 
  [
    (where)
@@ -111,7 +111,7 @@
 
  ; `_` wildcards in if-then-else and case-of expressions,
  ; as well as record updates and operator sections
- (wildcard) @parameter
+ (wildcard) @variable.parameter
 
 ; ----------------------------------------------------------------------------
 ; Functions and variables
@@ -120,10 +120,10 @@
  (exp_apply . (exp_name (variable) @function))
  (exp_apply . (exp_name (qualified_variable (variable) @function)))
 
- (row_field (field_name) @field)
- (record_field (field_name) @field)
- (record_accessor (variable) @field)
- (exp_record_access (variable) @field)
+ (row_field (field_name) @variable.member)
+ (record_field (field_name) @variable.member)
+ (record_accessor (variable) @variable.member)
+ (exp_record_access (variable) @variable.member)
 
  (signature name: (variable) @type)
  (kind_declaration (class_name) @type)
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 5b0301d21..9ba1fcf14 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -30,8 +30,8 @@
 "_" @constant.builtin ; match wildcard
 
 ((attribute
-    attribute: (identifier) @field)
- (#lua-match? @field "^[%l_].*$"))
+    attribute: (identifier) @variable.member)
+ (#lua-match? @variable.member "^[%l_].*$"))
 
 ((assignment
   left: (identifier) @type.definition
@@ -51,7 +51,7 @@
 
 (call
   function: (attribute
-              attribute: (identifier) @method.call))
+              attribute: (identifier) @function.method.call))
 
 ((call
    function: (identifier) @constructor)
@@ -113,36 +113,36 @@
 
 ;; Normal parameters
 (parameters
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 ;; Lambda parameters
 (lambda_parameters
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 (lambda_parameters
   (tuple_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 ; Default parameters
 (keyword_argument
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 ; Naming parameters on call-site
 (default_parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 (typed_parameter
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 (typed_default_parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 ; Variadic parameters *args, **kwargs
 (parameters
   (list_splat_pattern ; *args
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 (parameters
   (dictionary_splat_pattern ; **kwargs
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 (lambda_parameters
   (list_splat_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 (lambda_parameters
   (dictionary_splat_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 
 
 ;; Literals
@@ -155,12 +155,12 @@
  (#eq? @variable.builtin "cls"))
 
 (integer) @number
-(float) @float
+(float) @number.float
 
 (comment) @comment @spell
 
-((module . (comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+((module . (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
 
 (string) @string
 [
@@ -267,16 +267,16 @@
 (yield "from" @keyword.return)
 
 (future_import_statement
-  "from" @include
+  "from" @keyword.import
   "__future__" @constant.builtin)
-(import_from_statement "from" @include)
-"import" @include
+(import_from_statement "from" @keyword.import)
+"import" @keyword.import
 
-(aliased_import "as" @include)
+(aliased_import "as" @keyword.import)
 
-["if" "elif" "else" "match" "case"] @conditional
+["if" "elif" "else" "match" "case"] @keyword.conditional
 
-["for" "while" "break" "continue"] @repeat
+["for" "while" "break" "continue"] @keyword.repeat
 
 [
   "try"
@@ -284,13 +284,13 @@
   "except*"
   "raise"
   "finally"
-] @exception
+] @keyword.exception
 
-(raise_statement "from" @exception)
+(raise_statement "from" @keyword.exception)
 
 (try_statement
   (else_clause
-    "else" @exception))
+    "else" @keyword.exception))
 
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
@@ -309,7 +309,7 @@
 (class_definition
   body: (block
           (function_definition
-            name: (identifier) @method)))
+            name: (identifier) @function.method)))
 
 (class_definition
   superclasses: (argument_list
@@ -319,15 +319,15 @@
   body: (block
           (expression_statement
             (assignment
-              left: (identifier) @field))))
- (#lua-match? @field "^%l.*$"))
+              left: (identifier) @variable.member))))
+ (#lua-match? @variable.member "^%l.*$"))
 ((class_definition
   body: (block
           (expression_statement
             (assignment
               left: (_
-                     (identifier) @field)))))
- (#lua-match? @field "^%l.*$"))
+                     (identifier) @variable.member)))))
+ (#lua-match? @variable.member "^%l.*$"))
 
 ((class_definition
   (block
@@ -358,5 +358,5 @@
 (call
   function: (attribute
               object: (identifier) @_re)
-  arguments: (argument_list . (string (string_content) @string.regex))
+  arguments: (argument_list . (string (string_content) @string.regexp))
   (#eq? @_re "re"))
diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm
index dcc702263..d7d9500b0 100644
--- a/queries/ql/highlights.scm
+++ b/queries/ql/highlights.scm
@@ -39,18 +39,18 @@
   "strictsum"
 ] @function.builtin
 
-"import" @include
+"import" @keyword.import
 
 [
   "if"
   "then"
   "else"
-] @conditional
+] @keyword.conditional
 
 [
   "forall"
   "forex"
-] @repeat
+] @keyword.repeat
 
 [
   "asc"
@@ -106,8 +106,8 @@
   "|"
 ] @punctuation.delimiter
 
-(moduleExpr (simpleId) @namespace)
-(module name: (moduleName) @namespace)
+(moduleExpr (simpleId) @module)
+(module name: (moduleName) @module)
 
 (dataclass name: (className) @type)
 (typeExpr name: (className) @type)
@@ -118,7 +118,7 @@
 (varName) @variable
 
 (integer) @number
-(float) @float
+(float) @number.float
 
 (string) @string
 
diff --git a/queries/qmldir/highlights.scm b/queries/qmldir/highlights.scm
index 1fd174708..a716e8c9e 100644
--- a/queries/qmldir/highlights.scm
+++ b/queries/qmldir/highlights.scm
@@ -1,6 +1,6 @@
 ; Preproc
 
-(command (identifier) @preproc)
+(command (identifier) @keyword.directive)
 
 ; Keywords
 
@@ -10,7 +10,7 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 ; Variables
 
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 40008aad9..0b15f46cf 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -1,6 +1,6 @@
 ; inherits: ecma
 
-"pragma" @include
+"pragma" @keyword.import
 
 ;;; Annotations
 
@@ -61,7 +61,7 @@
 ;;; namespace
 (nested_identifier
   (nested_identifier
-    (identifier) @namespace)
+    (identifier) @module)
 )
 
 ; Properties
@@ -100,7 +100,7 @@
   (template_string)
 ] @string
 
-(regex) @string.regex
+(regex) @string.regexp
 (number) @number
 
 ; Tokens
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index ccf13a6c8..030e3d44f 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -27,15 +27,15 @@
 ((parameters (identifier) @number)
  (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
 
-((program . (comment)* . (comment) @include)
- (#lua-match? @include "^;+ *inherits *:"))
+((program . (comment)* . (comment) @keyword.import)
+ (#lua-match? @keyword.import "^;+ *inherits *:"))
 
-((program . (comment)* . (comment) @preproc)
- (#lua-match? @preproc "^;+ *extends *$"))
+((program . (comment)* . (comment) @keyword.directive)
+ (#lua-match? @keyword.directive "^;+ *extends *$"))
 
 ((predicate
   name: (identifier) @_name
-  parameters: (parameters (string "\"" @string "\"" @string) @string.regex))
+  parameters: (parameters (string "\"" @string "\"" @string) @string.regexp))
  (#any-of? @_name
    "match"
    "not-match"
@@ -46,5 +46,5 @@
 
 ((predicate
   name: (identifier) @_name
-  parameters: (parameters (string "\"" @string "\"" @string) @string.regex . (string) .))
+  parameters: (parameters (string "\"" @string "\"" @string) @string.regexp . (string) .))
  (#any-of? @_name "gsub" "not-gsub"))
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index 9d837ba83..03cf01bd7 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -3,7 +3,7 @@
 ; Literals
 (integer) @number
 
-(float) @float
+(float) @number.float
 
 (complex) @number
 
@@ -12,29 +12,29 @@
 
 (comment) @comment @spell
 
-((program . (comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+((program . (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
 
 (identifier) @variable
 
 ((dollar (identifier) @variable.builtin)
  (#eq? @variable.builtin "self"))
 
-((dollar _ (identifier) @field))
+((dollar _ (identifier) @variable.member))
 
 ; Parameters
 
-(formal_parameters (identifier) @parameter)
+(formal_parameters (identifier) @variable.parameter)
 
 (formal_parameters
- (default_parameter name: (identifier) @parameter))
+ (default_parameter name: (identifier) @variable.parameter))
 
-(default_argument name: (identifier) @parameter)
+(default_argument name: (identifier) @variable.parameter)
 
 ; Namespace
 
-(namespace_get namespace: (identifier) @namespace)
-(namespace_get_internal namespace: (identifier) @namespace)
+(namespace_get namespace: (identifier) @module)
+(namespace_get_internal namespace: (identifier) @module)
 
 ; Operators
 [
@@ -111,14 +111,14 @@
   "if"
   "else"
   "switch"
-] @conditional
+] @keyword.conditional
 
 [
   "while"
   "repeat"
   "for"
   "in"
-] @repeat
+] @keyword.repeat
 
 [
   (true)
@@ -138,4 +138,4 @@
   (namespace_get_internal function: (identifier) @function.call))
 
 (call
-  function: ((dollar _ (identifier) @method.call)))
+  function: ((dollar _ (identifier) @function.method.call)))
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index 4448397ae..fdd392077 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -11,7 +11,7 @@
 (number) @number
 (character) @character
 (boolean) @boolean
-(keyword) @symbol
+(keyword) @string.special.symbol
 
 ;; string ;;
 
@@ -21,7 +21,7 @@
 
 (escape_sequence) @string.escape
 
-(regex) @string.regex
+(regex) @string.regexp
 
 ;; comment ;;
 
@@ -46,7 +46,7 @@
 
 ;; quote ;;
 
-(quote) @symbol
+(quote) @string.special.symbol
 
 ;; list ;;
 
@@ -125,14 +125,14 @@
 
 (list
  .
- (symbol) @include
- (#eq? @include "require")
+ (symbol) @keyword.import
+ (#eq? @keyword.import "require")
  (#set! "priority" 101))
 
 (quote
   .
   (symbol)
-  (#set! "priority" 105)) @symbol
+  (#set! "priority" 105)) @string.special.symbol
 
 ((sexp_comment) @comment
  (#set! "priority" 110))
diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index 6485a5f9e..7385e3245 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -1,8 +1,8 @@
 (comment) @comment @spell
 
 "@media" @keyword
-"@import" @include
-"@theme" @include
+"@import" @keyword.import
+"@theme" @keyword.import
 
 (string_value) @string
 [
@@ -62,7 +62,7 @@
 [
   (global_selector)
   (id_selector)
- ] @namespace
+ ] @module
 
 (id_selector_view [ "normal" "selected" "alternate" ] @attribute)
 (id_selector_state [ "normal" "urgent" "active" ] @type.qualifier)
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index e985e8e0a..4e46680a3 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -51,7 +51,7 @@
      (constant)
      (operator)
      (setter)
-    ] @method))
+    ] @function.method))
 
 [(ivar_name) (cvar_name)] @property
 
@@ -62,7 +62,7 @@
 (interface_name (interface) @type)
 (alias_name (identifier) @type)
 (type_variable) @constant
-(namespace (constant) @namespace)
+(namespace (constant) @module)
 
 (builtin_type) @type.builtin
 
@@ -70,16 +70,16 @@
 (global_name) @property
 
 ; Standard Arguments
-(parameter (var_name) @parameter)
+(parameter (var_name) @variable.parameter)
 
 ; Keyword Arguments
-(keyword) @parameter
+(keyword) @variable.parameter
 
 ; Self
 (self) @variable.builtin
 
 ; Literal
-(type (symbol_literal) @symbol)
+(type (symbol_literal) @string.special.symbol)
 
 (type (string_literal (escape_sequence) @string.escape))
 (type (string_literal) @string)
diff --git a/queries/re2c/highlights.scm b/queries/re2c/highlights.scm
index fd59c7208..7e679fbcc 100644
--- a/queries/re2c/highlights.scm
+++ b/queries/re2c/highlights.scm
@@ -5,14 +5,14 @@
   "re2c"
   "local"
   "rules"
-] @namespace
+] @module
 
 ; Includes
 
 [
   "!use"
   "!include"
-] @include
+] @keyword.import
 
 ; Keywords
 
@@ -49,7 +49,7 @@
   "*"
   "+"
   "?"
-] @repeat
+] @keyword.repeat
 
 ; Constants
 
@@ -116,7 +116,7 @@
 
 ; Literals
 
-(regex) @string.regex
+(regex) @string.regexp
 
 [
   (dstring) ; case   sensitive
@@ -150,7 +150,7 @@
   (#offset! @type 0 1 0 -1))
 
 (set_header
-  value: (dstring) @string.special @text.underline)
+  value: (dstring) @string.special)
 
 (host_lang) @none
 
diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index 3aa4af909..ddcf1d92a 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -17,7 +17,7 @@
 
 ;; These are escaped special characters that lost their special meaning
 ;; -> no special highlighting
-(identity_escape) @string.regex
+(identity_escape) @string.regexp
 
 (class_character) @constant
 
diff --git a/queries/rego/highlights.scm b/queries/rego/highlights.scm
index 8d15d4fb4..5abaf0fd5 100644
--- a/queries/rego/highlights.scm
+++ b/queries/rego/highlights.scm
@@ -2,7 +2,7 @@
 [
   (import) 
   (package)
-] @include
+] @keyword.import
 
 [
   (with)
@@ -43,9 +43,9 @@
 
 (expr_call func_name: (fn_name (var) @function .))
 
-(expr_call func_arguments: (fn_args (expr) @parameter))
+(expr_call func_arguments: (fn_args (expr) @variable.parameter))
 
-(rule_args (term) @parameter)
+(rule_args (term) @variable.parameter)
 
 [
   (open_paren)
@@ -56,9 +56,9 @@
   (close_curly)
 ] @punctuation.bracket
 
-(rule (rule_head (var) @method))
+(rule (rule_head (var) @function.method))
 
 (rule 
-  (rule_head (term (ref (var) @namespace)))
-  (rule_body (query (literal (expr (expr_infix (expr (term (ref (var)) @_output)))))) (#eq? @_output @namespace))
+  (rule_head (term (ref (var) @module)))
+  (rule_body (query (literal (expr (expr_infix (expr (term (ref (var)) @_output)))))) (#eq? @_output @module))
 )
diff --git a/queries/requirements/highlights.scm b/queries/requirements/highlights.scm
index 3d3d20d91..921c3204b 100644
--- a/queries/requirements/highlights.scm
+++ b/queries/requirements/highlights.scm
@@ -2,11 +2,11 @@
 
 (package) @variable
 
-(extras (package) @parameter)
+(extras (package) @variable.parameter)
 
-(path) @text.underline @string.special
+(path) @string.special.path
 
-(url) @text.uri
+(url) @string.special.url
 
 ;; versions
 
diff --git a/queries/robot/highlights.scm b/queries/robot/highlights.scm
index 06c559986..b5f7bd105 100644
--- a/queries/robot/highlights.scm
+++ b/queries/robot/highlights.scm
@@ -35,23 +35,23 @@
   "IN ZIP"
   (break_statement)
   (continue_statement)
-] @repeat
-(for_statement "END" @repeat)
+] @keyword.repeat
+(for_statement "END" @keyword.repeat)
 
-"WHILE" @repeat
-(while_statement "END" @repeat)
+"WHILE" @keyword.repeat
+(while_statement "END" @keyword.repeat)
 
 [
   "IF"
   "ELSE IF"
-] @conditional
-(if_statement "END" @conditional)
-(if_statement (else_statement "ELSE" @conditional))
+] @keyword.conditional
+(if_statement "END" @keyword.conditional)
+(if_statement (else_statement "ELSE" @keyword.conditional))
 
 [
   "TRY"
   "EXCEPT"
   "FINALLY"
-] @exception
-(try_statement "END" @exception)
-(try_statement (else_statement "ELSE" @exception))
+] @keyword.exception
+(try_statement "END" @keyword.exception)
+(try_statement (else_statement "ELSE" @keyword.exception))
diff --git a/queries/ron/highlights.scm b/queries/ron/highlights.scm
index 7f5b9030f..4b0a87a50 100644
--- a/queries/ron/highlights.scm
+++ b/queries/ron/highlights.scm
@@ -15,7 +15,7 @@
 (string) @string
 (boolean) @boolean
 (integer) @number
-(float) @float
+(float) @number.float
 (char) @character
 
 
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index 3231262c2..b3b2b0a88 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -7,11 +7,13 @@
   "__"
   ":"
   "::"
-  "bullet"
-  "adornment"
   (transition)
 ] @punctuation.special
 
+[
+  "bullet"
+  "adornment"
+] @markup.list
 ;; Resets for injection
 
 (doctest_block) @none
@@ -22,11 +24,11 @@
   name: (type) @function)
 
 (directive
-  body: (body (arguments) @parameter))
+  body: (body (arguments) @variable.parameter))
 
 ((directive
-  name: (type) @include)
- (#eq? @include "include"))
+  name: (type) @keyword.import)
+ (#eq? @keyword.import "include"))
 
 ((directive
    name: (type) @function.builtin)
@@ -48,10 +50,10 @@
 [
   (literal_block)
   (line_block)
-] @text.literal
+] @markup.raw.block
 
 (block_quote
-  (attribution)? @text.emphasis) @text.literal
+  (attribution)? @markup.italic) @markup.quote
 
 (substitution_definition
   name: (substitution) @constant)
@@ -63,26 +65,26 @@
   name: (label) @constant)
 
 (target
-  name: (name)? @constant
-  link: (_)? @text.literal)
+  name: (name)? @markup.link.label
+  link: (_)? @markup.link)
 
 ;; Lists
 
 ; Definition lists
 (list_item
-  (term) @text.strong
-  (classifier)? @text.emphasis)
+  (term) @markup.strong
+  (classifier)? @markup.italic)
 
 ; Field lists
 (field (field_name) @constant)
 
 ;; Inline markup
 
-(emphasis) @text.emphasis
+(emphasis) @markup.italic
 
-(strong) @text.strong
+(strong) @markup.strong
 
-(standalone_hyperlink) @text.uri @nospell
+(standalone_hyperlink) @string.special.url @nospell
 
 (role) @function
 
@@ -111,17 +113,17 @@
 [
  "interpreted_text"
   (literal)
-] @text.literal
+] @markup.raw
 
 ; Prefix role
 ((interpreted_text
   (role) @_role
-  "interpreted_text" @text.emphasis)
+  "interpreted_text" @markup.italic)
  (#eq? @_role ":emphasis:"))
 
 ((interpreted_text
   (role) @_role
-  "interpreted_text" @text.strong)
+  "interpreted_text" @markup.strong)
  (#eq? @_role ":strong:"))
 
 ((interpreted_text
@@ -131,12 +133,12 @@
 
 ; Suffix role
 ((interpreted_text
-  "interpreted_text" @text.emphasis
+  "interpreted_text" @markup.italic
   (role) @_role)
  (#eq? @_role ":emphasis:"))
 
 ((interpreted_text
-  "interpreted_text" @text.strong
+  "interpreted_text" @markup.strong
   (role) @_role)
  (#eq? @_role ":strong:"))
 
@@ -151,11 +153,11 @@
   (footnote_reference)
   (citation_reference)
   (reference)
-] @text.reference @nospell
+] @markup.link @nospell
 
 ;; Others
 
-(title) @text.title
+(title) @markup.heading
 
 (comment) @comment @spell
 (comment "..") @comment
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 727c0fc50..d68c11847 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -45,10 +45,10 @@
  "unless"
  "when"
  "then"
- ] @conditional
+ ] @keyword.conditional
 
 (if
-  "end" @conditional)
+  "end" @keyword.conditional)
 
 [
  "for"
@@ -58,7 +58,7 @@
  "redo"
  "retry"
  "next"
- ] @repeat
+ ] @keyword.repeat
 
 (constant) @constant
 
@@ -68,10 +68,10 @@
 [
  "rescue"
  "ensure"
- ] @exception
+ ] @keyword.exception
 
-((identifier) @exception
- (#any-of? @exception "fail" "raise"))
+((identifier) @keyword.exception
+ (#any-of? @keyword.exception "fail" "raise"))
 
 ; Function calls
 
@@ -87,8 +87,8 @@
 
 (program
  (call
-  (identifier) @include)
- (#any-of? @include "require" "require_relative" "load"))
+  (identifier) @keyword.import)
+ (#any-of? @keyword.import "require" "require_relative" "load"))
 
 ; Function definitions
 
@@ -126,15 +126,15 @@
  (super)
  ] @variable.builtin
 
-(method_parameters (identifier) @parameter)
-(lambda_parameters (identifier) @parameter)
-(block_parameters (identifier) @parameter)
-(splat_parameter (identifier) @parameter)
-(hash_splat_parameter (identifier) @parameter)
-(optional_parameter (identifier) @parameter)
-(destructured_parameter (identifier) @parameter)
-(block_parameter (identifier) @parameter)
-(keyword_parameter (identifier) @parameter)
+(method_parameters (identifier) @variable.parameter)
+(lambda_parameters (identifier) @variable.parameter)
+(block_parameters (identifier) @variable.parameter)
+(splat_parameter (identifier) @variable.parameter)
+(hash_splat_parameter (identifier) @variable.parameter)
+(optional_parameter (identifier) @variable.parameter)
+(destructured_parameter (identifier) @variable.parameter)
+(block_parameter (identifier) @variable.parameter)
+(keyword_parameter (identifier) @variable.parameter)
 
 ; TODO: Re-enable this once it is supported
 ; ((identifier) @function
@@ -159,13 +159,13 @@
  (simple_symbol)
  (delimited_symbol)
  (hash_key_symbol)
- ] @symbol
+ ] @string.special.symbol
 
 (pair key: (hash_key_symbol) ":" @constant)
-(regex) @string.regex
+(regex) @string.regexp
 (escape_sequence) @string.escape
 (integer) @number
-(float) @float
+(float) @number.float
 
 [
  (true)
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 60438bd72..a262b6f08 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -23,12 +23,12 @@
 
 (primitive_type) @type.builtin
 
-(field_identifier) @field
+(field_identifier) @variable.member
 
-(shorthand_field_initializer (identifier) @field)
+(shorthand_field_initializer (identifier) @variable.member)
 
 (mod_item
-  name: (identifier) @namespace)
+  name: (identifier) @module)
 
 (self) @variable.builtin
 
@@ -40,9 +40,9 @@
 
 (function_signature_item (identifier) @function)
 
-(parameter (identifier) @parameter)
+(parameter (identifier) @variable.parameter)
 
-(closure_parameters (_) @parameter)
+(closure_parameters (_) @variable.parameter)
 
 ; Function calls
 
@@ -79,14 +79,14 @@
 ; Assume that uppercase names in paths are types
 
 (scoped_identifier
-  path: (identifier) @namespace)
+  path: (identifier) @module)
 
 (scoped_identifier
  (scoped_identifier
-  name: (identifier) @namespace))
+  name: (identifier) @module))
 
 (scoped_type_identifier
-  path: (identifier) @namespace)
+  path: (identifier) @module)
 
 (scoped_type_identifier
   path: (identifier) @type
@@ -94,7 +94,7 @@
 
 (scoped_type_identifier
  (scoped_identifier
-  name: (identifier) @namespace))
+  name: (identifier) @module))
 
 ((scoped_identifier
   path: (identifier) @type)
@@ -123,16 +123,16 @@
 [
   (crate)
   (super)
-] @namespace
+] @module
 
 (scoped_use_list
-  path: (identifier) @namespace)
+  path: (identifier) @module)
 
 (scoped_use_list
   path: (scoped_identifier
-          (identifier) @namespace))
+          (identifier) @module))
 
-(use_list (scoped_identifier (identifier) @namespace . (_)))
+(use_list (scoped_identifier (identifier) @module . (_)))
 
 (use_list (identifier) @type (#lua-match? @type "^[A-Z]"))
 
@@ -216,7 +216,7 @@
 
 (integer_literal) @number
 
-(float_literal) @float
+(float_literal) @number.float
 
 [
   (raw_string_literal)
@@ -232,9 +232,9 @@
 [
   "use"
   "mod"
-] @include
+] @keyword.import
 
-(use_as_clause "as" @include)
+(use_as_clause "as" @keyword.import)
 
 [
   "default"
@@ -266,9 +266,9 @@
   "static"
   "dyn"
   "extern"
-] @storageclass
+] @keyword.storage
 
-(lifetime ["'" (identifier)] @storageclass.lifetime)
+(lifetime ["'" (identifier)] @keyword.storage.lifetime)
 
 "fn" @keyword.function
 
@@ -281,19 +281,19 @@
 
 (qualified_type "as" @keyword.operator)
 
-(use_list (self) @namespace)
+(use_list (self) @module)
 
-(scoped_use_list (self) @namespace)
+(scoped_use_list (self) @module)
 
-(scoped_identifier [(crate) (super) (self)] @namespace)
+(scoped_identifier [(crate) (super) (self)] @module)
 
-(visibility_modifier [(crate) (super) (self)] @namespace)
+(visibility_modifier [(crate) (super) (self)] @module)
 
 [
   "if"
   "else"
   "match"
-] @conditional
+] @keyword.conditional
 
 [
   "break"
@@ -301,10 +301,10 @@
   "in"
   "loop"
   "while"
-] @repeat
+] @keyword.repeat
 
 "for" @keyword
-(for_expression "for" @repeat)
+(for_expression "for" @keyword.repeat)
 
 ; Operators
 
@@ -370,16 +370,16 @@
 (empty_type "!" @type.builtin)
 
 (macro_invocation
-  macro: (identifier) @exception
-  "!" @exception
-  (#eq? @exception "panic"))
+  macro: (identifier) @keyword.exception
+  "!" @keyword.exception
+  (#eq? @keyword.exception "panic"))
 
 (macro_invocation
-  macro: (identifier) @exception
-  "!" @exception
-  (#contains? @exception "assert"))
+  macro: (identifier) @keyword.exception
+  "!" @keyword.exception
+  (#contains? @keyword.exception "assert"))
 
 (macro_invocation
-  macro: (identifier) @debug
-  "!" @debug
-  (#eq? @debug "dbg"))
+  macro: (identifier) @keyword.debug
+  "!" @keyword.debug
+  (#eq? @keyword.debug "dbg"))
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 743d16cc2..2c483c46b 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -21,9 +21,9 @@
 ;; variables
 
 (class_parameter 
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
-(self_type (identifier) @parameter)
+(self_type (identifier) @variable.parameter)
 
 (interpolation (identifier) @none)
 (interpolation (block) @none)
@@ -52,24 +52,24 @@
 ; method definition
 
 (function_declaration
-      name: (identifier) @method)
+      name: (identifier) @function.method)
 
 (function_definition
-      name: (identifier) @method)
+      name: (identifier) @function.method)
 
 ; imports/exports
 
 (import_declaration
-  path: (identifier) @namespace)
-((stable_identifier (identifier) @namespace))
+  path: (identifier) @module)
+((stable_identifier (identifier) @module))
 
 ((import_declaration
   path: (identifier) @type) (#lua-match? @type "^[A-Z]"))
 ((stable_identifier (identifier) @type) (#lua-match? @type "^[A-Z]"))
 
 (export_declaration
-  path: (identifier) @namespace)
-((stable_identifier (identifier) @namespace))
+  path: (identifier) @module)
+((stable_identifier (identifier) @module))
 
 ((export_declaration
   path: (identifier) @type) (#lua-match? @type "^[A-Z]"))
@@ -87,7 +87,7 @@
 
 (call_expression
   function: (field_expression
-    field: (identifier) @method.call))
+    field: (identifier) @function.method.call))
 
 ((call_expression
    function: (identifier) @constructor)
@@ -105,10 +105,10 @@
   name: (identifier) @function)
 
 (parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (binding
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 ; expressions
 
@@ -125,15 +125,16 @@
 
 (boolean_literal) @boolean
 (integer_literal) @number
-(floating_point_literal) @float
+(floating_point_literal) @number.float
 
 [
-  (symbol_literal)
   (string)
   (character_literal)
   (interpolated_string_expression)
 ] @string
 
+(symbol_literal) @string.special.symbol
+
 (interpolation "$" @punctuation.special)
 
 ;; keywords
@@ -177,11 +178,11 @@
   "protected"
 ] @type.qualifier
 
-(inline_modifier) @storageclass
+(inline_modifier) @keyword.storage
 
 (null_literal) @constant.builtin
 
-(wildcard) @parameter
+(wildcard) @variable.parameter
 
 (annotation) @attribute
 
@@ -194,7 +195,7 @@
   "if"
   "match"
   "then"
-] @conditional
+] @keyword.conditional
 
 [
  "("
@@ -215,7 +216,7 @@
   "for"
   "while"
   "yield"
-] @repeat
+] @keyword.repeat
 
 "def" @keyword.function
 
@@ -225,13 +226,13 @@
  "@"
 ] @operator
 
-["import" "export"] @include
+["import" "export"] @keyword.import
 
 [
   "try"
   "catch"
   "throw"
-] @exception
+] @keyword.exception
 
 "return" @keyword.return
 
@@ -246,7 +247,7 @@
 ;; `case` is a conditional keyword in case_block
 
 (case_block
-  (case_clause ("case") @conditional))
+  (case_clause ("case") @keyword.conditional))
 
 (operator_identifier) @operator
 
@@ -260,5 +261,5 @@
 )
 
 ;; Scala CLI using directives
-(using_directive_key) @parameter
+(using_directive_key) @variable.parameter
 (using_directive_value) @string
diff --git a/queries/scfg/highlights.scm b/queries/scfg/highlights.scm
index 240d48a90..0fcfa7c9b 100644
--- a/queries/scfg/highlights.scm
+++ b/queries/scfg/highlights.scm
@@ -5,4 +5,4 @@
 
 (comment) @comment @spell
 (directive_name) @type
-(directive_params) @parameter
+(directive_params) @variable.parameter
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index 7a8acfe9e..f555920ba 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -76,19 +76,19 @@
   "assert"
   "library" "export" "import" "rename" "only" "except" "prefix"))
 
-((symbol) @conditional
- (#any-of? @conditional "if" "cond" "case" "when" "unless"))
+((symbol) @keyword.conditional
+ (#any-of? @keyword.conditional "if" "cond" "case" "when" "unless"))
 
 ;; quote
 
 (quote
  "'"
- (symbol)) @symbol
+ (symbol)) @string.special.symbol
 
 (list
  .
  (symbol) @_f
- (#eq? @_f "quote")) @symbol
+ (#eq? @_f "quote")) @string.special.symbol
 
 ;; library
 
@@ -96,7 +96,7 @@
  .
  (symbol) @_lib
  .
- (symbol) @namespace
+ (symbol) @module
 
  (#eq? @_lib "library"))
 
diff --git a/queries/scss/highlights.scm b/queries/scss/highlights.scm
index f45b4301e..b0801bb6f 100644
--- a/queries/scss/highlights.scm
+++ b/queries/scss/highlights.scm
@@ -15,7 +15,7 @@
 
 "@return" @keyword.return
 
-"@include" @include
+"@include" @keyword.import
 
 [
   "@while"
@@ -24,7 +24,7 @@
   "from"
   "through"
   "in"
-] @repeat
+] @keyword.repeat
 
 (single_line_comment) @comment @spell
 (function_name) @function
@@ -37,25 +37,25 @@
 
 
 (mixin_statement (name) @function)
-(mixin_statement (parameters (parameter) @parameter))
+(mixin_statement (parameters (parameter) @variable.parameter))
 
 (function_statement (name) @function)
-(function_statement (parameters (parameter) @parameter))
+(function_statement (parameters (parameter) @variable.parameter))
 
 (plain_value) @string
 (keyword_query) @function
 (identifier) @variable
 (variable_name) @variable
 
-(each_statement (key) @parameter)
-(each_statement (value) @parameter)
-(each_statement (variable_value) @parameter)
+(each_statement (key) @variable.parameter)
+(each_statement (value) @variable.parameter)
+(each_statement (variable_value) @variable.parameter)
 
-(for_statement (variable) @parameter)
-(for_statement (_ (variable_value) @parameter))
+(for_statement (variable) @variable.parameter)
+(for_statement (_ (variable_value) @variable.parameter))
 
-(argument) @parameter
-(arguments (variable_value) @parameter)
+(argument) @variable.parameter
+(arguments (variable_value) @variable.parameter)
 
 [
   "["
diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
index 6fd5f45ea..e93682eee 100644
--- a/queries/slang/highlights.scm
+++ b/queries/slang/highlights.scm
@@ -36,7 +36,7 @@
 [
  "__exported"
  "import"
-] @include
+] @keyword.import
 
 (property_declaration
   (identifier) @property)
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 2ec720c33..a4fc7f4f3 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -2,7 +2,7 @@
 (type_identifier) @type
 (comment) @comment @spell
 (int_literal) @number
-(float_literal) @float
+(float_literal) @number.float
 (string_literal) @string
 (function_identifier) @function
 [
@@ -16,33 +16,33 @@
 (call_expression
   function: (field_expression
     field: (identifier) @function.call))
-(vis) @include
+(vis) @keyword.import
 (units) @type
 (array_literal
   (identifier) @type)
-(transition_statement state: (identifier) @field)
-(state_expression state: (identifier) @field)
+(transition_statement state: (identifier) @variable.member)
+(state_expression state: (identifier) @variable.member)
 (struct_block_definition
-  (identifier) @field)
+  (identifier) @variable.member)
 
-; (state_identifier) @field
+; (state_identifier) @variable.member
 
 [
 "in"
 "for"
-] @repeat
+] @keyword.repeat
 
 "@" @keyword
 
 [
 "import"
 "from"
-] @include
+] @keyword.import
 
 [
 "if"
 "else"
-] @conditional
+] @keyword.conditional
 
 [
 "root"
@@ -151,4 +151,4 @@
  "=>"
  ] @operator
 
-(ternary_expression [":" "?"] @conditional.ternary)
+(ternary_expression [":" "?"] @keyword.conditional.ternary)
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 3b6035c09..9668c59ba 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -20,40 +20,40 @@
 ; Methods
 
 (method_definition
-  (method_signature (method_identifier) @method))
+  (method_signature (method_identifier) @function.method))
 
 (expression
   (opcode) @_invoke
 	(body
 	  (full_method_signature
-      (method_signature (method_identifier) @method.call)))
+      (method_signature (method_identifier) @function.method.call)))
   (#lua-match? @_invoke "^invoke"))
 
 (method_handle
   (full_method_signature
-	(method_signature (method_identifier) @method.call)))
+	(method_signature (method_identifier) @function.method.call)))
 
 (custom_invoke
-  . (identifier) @method.call
-  (method_signature (method_identifier) @method.call))
+  . (identifier) @function.method.call
+  (method_signature (method_identifier) @function.method.call))
 
 (annotation_value
   (body
-    (method_signature (method_identifier) @method.call)))
+    (method_signature (method_identifier) @function.method.call)))
 
 (annotation_value
   (body
     (full_method_signature
-      (method_signature (method_identifier) @method.call))))
+      (method_signature (method_identifier) @function.method.call))))
 
 (field_definition
 	(body
-		(method_signature (method_identifier) @method.call)))
+		(method_signature (method_identifier) @function.method.call)))
 
 (field_definition
 	(body
 	  (full_method_signature
-		  (method_signature (method_identifier) @method.call))))
+		  (method_signature (method_identifier) @function.method.call))))
 
 ((method_identifier) @constructor
   (#any-of? @constructor "<init>" "<clinit>"))
@@ -65,7 +65,7 @@
 [
   (field_identifier)
   (annotation_key)
-] @field
+] @variable.member
 
 ((field_identifier) @constant
   (#lua-match? @constant "^[%u_]*$"))
@@ -79,8 +79,8 @@
 
 ; Parameters
 
-(parameter) @parameter.builtin
-(param_identifier) @parameter
+(parameter) @variable.parameter.builtin
+(param_identifier) @variable.parameter
 
 ; Labels
 
@@ -96,14 +96,14 @@
 ((opcode) @keyword.return
   (#lua-match? @keyword.return "^return"))
 
-((opcode) @conditional
-  (#lua-match? @conditional "^if"))
+((opcode) @keyword.conditional
+  (#lua-match? @keyword.conditional "^if"))
 
-((opcode) @conditional
-  (#lua-match? @conditional "^cmp"))
+((opcode) @keyword.conditional
+  (#lua-match? @keyword.conditional "^cmp"))
 
-((opcode) @exception
-  (#lua-match? @exception "^throw"))
+((opcode) @keyword.exception
+  (#lua-match? @keyword.exception "^throw"))
 
 ((opcode) @comment
   (#eq? @comment "nop")) ; haha, anyone get it? ;)
@@ -148,7 +148,7 @@
 
 [
   ".source"
-] @include
+] @keyword.import
 
 [
   ".method"
@@ -158,12 +158,12 @@
 [
   ".catch"
   ".catchall"
-] @exception
+] @keyword.exception
 
 ; Literals
 
 (string) @string
-(source_directive (string "\"" _ @text.uri "\""))
+(source_directive (string "\"" _ @string.special.url "\""))
 (escape_sequence) @string.escape
 
 (character) @character
@@ -176,7 +176,7 @@
  (float)
  (NaN)
  (Infinity)
-] @float
+] @number.float
 
 (boolean) @boolean
 
@@ -184,7 +184,7 @@
 
 ; Misc
 
-(annotation_visibility) @storageclass
+(annotation_visibility) @keyword.storage
 
 (access_modifier) @type.qualifier
 
@@ -204,7 +204,7 @@
   "/"
 ] @punctuation.delimiter
 
-(line_directive (number) @text.underline @text.literal)
+(line_directive (number) @string.special)
 
 ; Comments
 
diff --git a/queries/smithy/highlights.scm b/queries/smithy/highlights.scm
index 2b709c2a2..bb54dad73 100644
--- a/queries/smithy/highlights.scm
+++ b/queries/smithy/highlights.scm
@@ -1,16 +1,16 @@
 ; Preproc
 
-(control_key) @preproc
+(control_key) @keyword.directive
 
 ; Namespace
 
-(namespace) @namespace
+(namespace) @module
 
 ; Includes
 
 [
   "use"
-] @include
+] @keyword.import
 
 ; Builtins
 
@@ -25,13 +25,13 @@
 
 ; Fields (Members)
 
-; (field) @field
+; (field) @variable.member
 
-(key_identifier) @field
+(key_identifier) @variable.member
 (shape_member
-  (field) @field)
-(operation_field) @field
-(operation_error_field) @field
+  (field) @variable.member)
+(operation_field) @variable.member
+(operation_error_field) @variable.member
 
 ; Constants
 
@@ -82,7 +82,7 @@
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (boolean) @boolean
 
diff --git a/queries/snakemake/highlights.scm b/queries/snakemake/highlights.scm
index 8b173e0b5..07f86e40d 100644
--- a/queries/snakemake/highlights.scm
+++ b/queries/snakemake/highlights.scm
@@ -17,11 +17,11 @@
 
 ;; Rule imports
 (rule_import
-  "use" @include
-  "rule" @include
-  "from" @include
-  "as"? @include
-  "with"? @include
+  "use" @keyword.import
+  "rule" @keyword.import
+  "from" @keyword.import
+  "as"? @keyword.import
+  "with"? @keyword.import
 )
 
 
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index f537cfab2..70ad31a1b 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -3,16 +3,16 @@
 [
   "pragma" 
   "solidity"
-] @preproc
+] @keyword.directive
 
 (solidity_pragma_token
-  "||" @symbol)
+  "||" @string.special.symbol)
 (solidity_pragma_token
-  "-" @symbol)
+  "-" @string.special.symbol)
 
 (solidity_version_comparison_operator) @operator
 
-(solidity_version) @text.underline @string.special
+(solidity_version) @string.special
 
 ; Literals
 
@@ -22,11 +22,11 @@
 ] @string
 
 (hex_string_literal
-  "hex" @symbol
+  "hex" @string.special.symbol
   (_) @string)
 
 (unicode_string_literal
-  "unicode" @symbol
+  "unicode" @string.special.symbol
   (_) @string)
 
 [
@@ -57,7 +57,7 @@
 
 (contract_declaration name: (identifier) @type)
 (struct_declaration name: (identifier) @type)
-(struct_member name: (identifier) @field)
+(struct_member name: (identifier) @variable.member)
 (enum_declaration name: (identifier) @type)
 (emit_statement . (identifier) @type)
 ; Handles ContractA, ContractB in function foo() override(ContractA, contractB) {}
@@ -77,26 +77,26 @@
 (modifier_invocation (identifier) @function)
 
 ; Handles expressions like structVariable.g();
-(call_expression . (member_expression (identifier) @method.call))
+(call_expression . (member_expression (identifier) @function.method.call))
 
 ; Handles expressions like g();
 (call_expression . (identifier) @function.call)
 
 ; Function parameters
-(event_paramater name: (identifier) @parameter)
-(parameter name: (identifier) @parameter)
+(event_paramater name: (identifier) @variable.parameter)
+(parameter name: (identifier) @variable.parameter)
 
 ; Yul functions
 (yul_function_call function: (yul_identifier) @function.call)
 
 ; Yul function parameters
-(yul_function_definition . (yul_identifier) @function (yul_identifier) @parameter)
+(yul_function_definition . (yul_identifier) @function (yul_identifier) @variable.parameter)
 
 (meta_type_expression "type" @keyword)
 
-(member_expression property: (identifier) @field)
-(call_struct_argument name: (identifier) @field)
-(struct_field_assignment name: (identifier) @field)
+(member_expression property: (identifier) @variable.member)
+(call_struct_argument name: (identifier) @variable.member)
+(struct_field_assignment name: (identifier) @variable.member)
 (enum_value) @constant
 
 ; Keywords
@@ -143,7 +143,7 @@
   "storage"
   "calldata"
   "constant"
-] @storageclass
+] @keyword.storage
 
 [
   "for"
@@ -151,7 +151,7 @@
   "do"
   "break"
   "continue"
-] @repeat
+] @keyword.repeat
 
 [
   "if"
@@ -159,17 +159,17 @@
   "switch"
   "case"
   "default"
-] @conditional
+] @keyword.conditional
 
 (ternary_expression
-  "?" @conditional.ternary
-  ":" @conditional.ternary)
+  "?" @keyword.conditional.ternary
+  ":" @keyword.conditional.ternary)
 
 [
   "try"
   "catch"
   "revert"
-] @exception
+] @keyword.exception
 
 [
   "return"
@@ -182,11 +182,11 @@
 [
   "import" 
   "using"
-] @include
-(import_directive "as" @include)
-(import_directive "from" @include)
-((import_directive source: (string) @text.underline)
-  (#offset! @text.underline 0 1 0 -1))
+] @keyword.import
+(import_directive "as" @keyword.import)
+(import_directive "from" @keyword.import)
+((import_directive source: (string) @string.special.path)
+  (#offset! @string.special.path 0 1 0 -1))
 
 ; Punctuation
 
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index 83736d9a7..def688ab2 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -32,7 +32,7 @@
 (alias_expression
   (identifier) @label)
 
-(storage_identifier) @storageclass
+(storage_identifier) @keyword.storage
 (_ function_name: (identifier) @function)
 (date_literal) @string.special
 
@@ -122,7 +122,7 @@
   "WHEN"
   "ELSE"
   "THEN"
-] @conditional
+] @keyword.conditional
 
 ; Using Scope
 [
diff --git a/queries/sparql/highlights.scm b/queries/sparql/highlights.scm
index 2cc745b65..0a4b6a84c 100644
--- a/queries/sparql/highlights.scm
+++ b/queries/sparql/highlights.scm
@@ -19,7 +19,7 @@
 [
   "_:"
   (namespace)
-] @namespace
+] @module
 
 [
   "UNDEF"
@@ -84,7 +84,7 @@
 [
   (decimal)
   (double)
-] @float
+] @number.float
 (boolean_literal) @boolean
 
 [
@@ -184,12 +184,12 @@
   [
     bound_variable: (var)
     "*"
-  ] @parameter)
-(bind bound_variable: (var) @parameter)
-(data_block bound_variable: (var) @parameter)
-(group_condition bound_variable: (var) @parameter)
+  ] @variable.parameter)
+(bind bound_variable: (var) @variable.parameter)
+(data_block bound_variable: (var) @variable.parameter)
+(group_condition bound_variable: (var) @variable.parameter)
 
-(iri_reference ["<" ">"] @namespace)
+(iri_reference ["<" ">"] @module)
 
 (lang_tag) @type
 (rdf_literal 
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index d9f071362..aaadd0e2c 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -19,7 +19,7 @@
   alias: (identifier) @variable)
 
 (field
-  name: (identifier) @field)
+  name: (identifier) @variable.member)
 
 (term
   alias: (identifier) @variable)
@@ -36,10 +36,10 @@
 ((literal) @number
  (#lua-match? @number "^%d+$"))
 
-((literal) @float
-(#lua-match? @float "^[-]?%d*\.%d*$"))
+((literal) @number.float
+(#lua-match? @number.float "^[-]?%d*\.%d*$"))
 
-(parameter) @parameter
+(parameter) @variable.parameter
 
 [
  (keyword_true)
@@ -92,14 +92,14 @@
  (keyword_jsonfile)
  (keyword_sequencefile)
  (keyword_volatile)
-] @storageclass
+] @keyword.storage
 
 [
  (keyword_case)
  (keyword_when)
  (keyword_then)
  (keyword_else)
-] @conditional
+] @keyword.conditional
 
 [
   (keyword_select)
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index b0b9caf56..5fa20881c 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -40,7 +40,7 @@
   "case"
   "default"
   "break"
-] @conditional
+] @keyword.conditional
 
 ; Repeats
 
@@ -50,7 +50,7 @@
   "do"
   "while"
   "continue"
-] @repeat
+] @keyword.repeat
 
 ; Exceptions
 
@@ -58,13 +58,13 @@
   "try"
   "catch"
   "throw"
-] @exception
+] @keyword.exception
 
 ; Storageclasses
 
 [
   "local"
-] @storageclass
+] @keyword.storage
 
 ; Qualifiers
 
@@ -90,7 +90,7 @@
 ; Parameters
 
 (parameter
-  . (identifier) @parameter)
+  . (identifier) @variable.parameter)
 
 ; Properties (Slots)
 
@@ -128,7 +128,7 @@
 
 (member_declaration
   (function_declaration
-    "::"? (_) @method . "(" (_)? ")"))
+    "::"? (_) @function.method . "(" (_)? ")"))
 
 ((function_declaration
    "::"? (_) @function . "(" (_)? ")")
@@ -150,7 +150,7 @@
   (identifier) @function
   "="
   (lambda_expression
-    "@" @symbol))
+    "@" @string.special.symbol))
 
 (call_expression 
   [
@@ -278,8 +278,8 @@
 ; Ternaries
 
 (ternary_expression
-  "?" @conditional.ternary
-  ":" @conditional.ternary)
+  "?" @keyword.conditional.ternary
+  ":" @keyword.conditional.ternary)
 
 ; Literals
 
@@ -293,7 +293,7 @@
 
 (integer) @number
 
-(float) @float
+(float) @number.float
 
 (bool) @boolean
 
diff --git a/queries/ssh_config/highlights.scm b/queries/ssh_config/highlights.scm
index 8de836b17..c0a0ae3e2 100644
--- a/queries/ssh_config/highlights.scm
+++ b/queries/ssh_config/highlights.scm
@@ -2,7 +2,7 @@
 
 (string) @string
 
-(pattern) @string.regex
+(pattern) @string.regexp
 
 (token) @character
 
@@ -17,7 +17,7 @@
   (mac)
   (cipher)
   (key_sig)
-] @parameter
+] @variable.parameter
 
 [
   ; generic
@@ -44,7 +44,7 @@
   (authentication)
 ] @constant.builtin
 
-(uri) @text.uri
+(uri) @string.special.url
 
 ; Keywords
 
@@ -52,7 +52,7 @@
 
 (parameter keyword: _ @keyword)
 
-(host_declaration argument: _ @namespace)
+(host_declaration argument: _ @module)
 
 (match_declaration
   (condition criteria: _ @attribute))
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 055fad16f..8d99963d5 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -28,8 +28,8 @@
            "license"))
 
 ((attribute
-    attribute: (identifier) @field)
- (#lua-match? @field "^[%l_].*$"))
+    attribute: (identifier) @variable.member)
+ (#lua-match? @variable.member "^[%l_].*$"))
 
 ((assignment
   left: (identifier) @type.definition
@@ -108,30 +108,30 @@
 
 ;; Normal parameters
 (parameters
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 ;; Lambda parameters
 (lambda_parameters
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 (lambda_parameters
   (tuple_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 ; Default parameters
 (keyword_argument
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 ; Naming parameters on call-site
 (default_parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 (typed_parameter
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 (typed_default_parameter
-  (identifier) @parameter)
+  (identifier) @variable.parameter)
 ; Variadic parameters *args, **kwargs
 (parameters
   (list_splat_pattern ; *args
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 (parameters
   (dictionary_splat_pattern ; **kwargs
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 
 
 ;; Literals
@@ -143,12 +143,12 @@
  (#eq? @variable.builtin "cls"))
 
 (integer) @number
-(float) @float
+(float) @number.float
 
 (comment) @comment @spell
 
-((module . (comment) @preproc)
-  (#lua-match? @preproc "^#!/"))
+((module . (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
 
 (string) @string
 [
@@ -243,14 +243,14 @@
 ] @keyword.return
 
 ((call
-  function: (identifier) @include
+  function: (identifier) @keyword.import
   arguments: (argument_list
-	(string) @conceal))
-  (#eq? @include "load"))
+	(string) @string))
+  (#eq? @keyword.import "load"))
 
-["if" "elif" "else" "match" "case"] @conditional
+["if" "elif" "else" "match" "case"] @keyword.conditional
 
-["for" "while" "break" "continue"] @repeat
+["for" "while" "break" "continue"] @keyword.repeat
 
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 
@@ -274,7 +274,7 @@
   function: (identifier) @_func
   arguments: (argument_list
     (keyword_argument
-	  name: (identifier) @field)))
+	  name: (identifier) @variable.member)))
   (#eq? @_func "struct"))
 
 ;; Function calls
@@ -284,7 +284,7 @@
 
 (call
   function: (attribute
-              attribute: (identifier) @method.call))
+              attribute: (identifier) @function.method.call))
 
 ((call
    function: (identifier) @constructor)
diff --git a/queries/strace/highlights.scm b/queries/strace/highlights.scm
index 8967542a4..2bc45abb7 100644
--- a/queries/strace/highlights.scm
+++ b/queries/strace/highlights.scm
@@ -11,7 +11,7 @@
 [
   (errorName)
   (errorDescription)
-] @exception
+] @keyword.exception
 
 (syscall) @function.builtin
 
diff --git a/queries/supercollider/highlights.scm b/queries/supercollider/highlights.scm
index 43b3087de..0d56de614 100644
--- a/queries/supercollider/highlights.scm
+++ b/queries/supercollider/highlights.scm
@@ -6,7 +6,7 @@
 (block_comment) @comment @spell
 
 ; Argument definition
-(argument name: (identifier) @parameter)
+(argument name: (identifier) @variable.parameter)
 
 ; Variables
 (local_var name: (identifier) @variable)
@@ -25,17 +25,17 @@
 
 ; Methods
 (method_call
-        name: (method_name) @method)
+        name: (method_name) @function.method)
 
 ; Classes
 (class) @type
 
 ; Literals
 (number) @number
-(float) @float
+(float) @number.float
 
 (string) @string
-(symbol) @string.special
+(symbol) @string.special.symbol
 
 ; Operators
 [
@@ -89,9 +89,9 @@
 ] @punctuation.delimiter
 
 ; control structure
-(control_structure) @conditional
+(control_structure) @keyword.conditional
 
 (escape_sequence) @string.escape
 
 ; SinOsc.ar()!2
-(duplicated_statement) @repeat
+(duplicated_statement) @keyword.repeat
diff --git a/queries/surface/highlights.scm b/queries/surface/highlights.scm
index 35de877c9..dc123172d 100644
--- a/queries/surface/highlights.scm
+++ b/queries/surface/highlights.scm
@@ -1,5 +1,5 @@
-; Surface text is highlighted as such
-(text) @text
+; Surface text is not highlighted
+(text) @none
 
 ; Surface has two types of comments, both are highlighted as such
 (comment) @comment @spell
diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 9539f2b51..5581c40c1 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -11,11 +11,11 @@
 ((special_block_keyword) @keyword.coroutine
   (#eq? @keyword.coroutine "await"))
 
-((special_block_keyword) @exception
-  (#eq? @exception "catch"))
+((special_block_keyword) @keyword.exception
+  (#eq? @keyword.exception "catch"))
 
-((special_block_keyword) @conditional
-  (#any-of? @conditional "if" "else"))
+((special_block_keyword) @keyword.conditional
+  (#any-of? @keyword.conditional "if" "else"))
 
 [
   "{"
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index a73a69356..81a0d931b 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -20,15 +20,15 @@
   (mutation_modifier)
 ] @type.qualifier
 
-(function_declaration (simple_identifier) @method)
+(function_declaration (simple_identifier) @function.method)
 (function_declaration ["init" @constructor])
 (throws) @keyword
 (where_keyword) @keyword
-(parameter external_name: (simple_identifier) @parameter)
-(parameter name: (simple_identifier) @parameter)
-(type_parameter (type_identifier) @parameter)
-(inheritance_constraint (identifier (simple_identifier) @parameter))
-(equality_constraint (identifier (simple_identifier) @parameter))
+(parameter external_name: (simple_identifier) @variable.parameter)
+(parameter name: (simple_identifier) @variable.parameter)
+(type_parameter (type_identifier) @variable.parameter)
+(inheritance_constraint (identifier (simple_identifier) @variable.parameter))
+(equality_constraint (identifier (simple_identifier) @variable.parameter))
 (pattern bound_identifier: (simple_identifier)) @variable
 
 [
@@ -65,7 +65,7 @@
 (value_argument
   name: (value_argument_label) @property)
 
-(import_declaration ["import" @include])
+(import_declaration ["import" @keyword.import])
 
 (enum_entry ["case" @keyword])
 
@@ -84,25 +84,25 @@
 (diagnostic) @function.macro
 
 ; Statements
-(for_statement ["for" @repeat])
-(for_statement ["in" @repeat])
+(for_statement ["for" @keyword.repeat])
+(for_statement ["in" @keyword.repeat])
 (for_statement (pattern) @variable)
 (else) @keyword
 (as_operator) @keyword
 
-["while" "repeat" "continue" "break"] @repeat
+["while" "repeat" "continue" "break"] @keyword.repeat
 
 ["let" "var"] @keyword
 
-(guard_statement ["guard" @conditional])
-(if_statement ["if" @conditional])
-(switch_statement ["switch" @conditional])
+(guard_statement ["guard" @keyword.conditional])
+(if_statement ["if" @keyword.conditional])
+(switch_statement ["switch" @keyword.conditional])
 (switch_entry ["case" @keyword])
 (switch_entry ["fallthrough" @keyword])
 (switch_entry (default_keyword) @keyword)
 "return" @keyword.return
 (ternary_expression
-  ["?" ":"] @conditional)
+  ["?" ":"] @keyword.conditional)
 
 ["do" (throw_keyword) (catch_keyword)] @keyword
 
@@ -142,12 +142,12 @@
  (oct_literal)
  (bin_literal)
 ] @number
-(real_literal) @float
+(real_literal) @number.float
 (boolean_literal) @boolean
 "nil" @constant.builtin
 
 ; Regex literals
-(regex_literal) @string.regex
+(regex_literal) @string.regexp
 
 ; Operators
 (custom_operator) @operator
diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm
index 54a27b897..55571a1d8 100644
--- a/queries/systemtap/highlights.scm
+++ b/queries/systemtap/highlights.scm
@@ -22,14 +22,14 @@
   name: (identifier) @function)
 
 (parameter
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (type) @type.builtin
 
 (aggregation_operator) @attribute
 
 (member_expression
-  member: (identifier) @field)
+  member: (identifier) @variable.member)
 
 (call_expression
   function: (identifier) @function.call)
@@ -43,7 +43,7 @@
 ((identifier) @variable.builtin
   (#lua-match? @variable.builtin "^\$+[0-9A-Z_a-z]+\$*$"))
 
-(shebang_line) @preproc
+(shebang_line) @keyword.directive
 
 (comment) @comment @spell
 
@@ -123,7 +123,7 @@
 [
   "if"
   "else"
-] @conditional
+] @keyword.conditional
 
 [
   "break"
@@ -131,12 +131,12 @@
   "for"
   "foreach"
   "while"
-] @repeat
+] @keyword.repeat
 
 [
   "try"
   "catch"
-] @exception
+] @keyword.exception
 
 [
   "%("
@@ -145,9 +145,9 @@
   "%?"
   (preprocessor_tokens)
   (embedded_code)
-] @preproc
+] @keyword.directive
 
-"@define" @define
+"@define" @keyword.directive.define
 
 "private" @type.qualifier
-"global" @storageclass
+"global" @keyword.storage
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index d1543efd0..a0e1e3c2d 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -79,7 +79,7 @@
   [
    "?"
    ":"
-] @conditional.ternary)
+] @keyword.conditional.ternary)
 
 
 ; Strings and others literal types
@@ -98,7 +98,7 @@
   (frequency)
   (percentage)
   (time)
-] @float
+] @number.float
 
 [
   (string)
@@ -107,8 +107,8 @@
 
 (hll_escape_sequence) @string.escape
 
-(path) @string.special
-(symbol) @symbol
+(path) @string.special.path
+(symbol) @string.special.symbol
 
 [
   (character)
@@ -138,7 +138,7 @@
 
 ; HLL variables
 (identifier) @variable
-(hll_field_identifier) @field
+(hll_field_identifier) @variable.member
 
 
 ; Commands
@@ -214,19 +214,19 @@
 (parameter_declaration
   command: (identifier) @keyword
   (identifier)? @constant.builtin
-  macro: (macro) @parameter)
+  macro: (macro) @variable.parameter)
 
 
 ; Control flow
 (if_block
-  command: (identifier) @conditional)
+  command: (identifier) @keyword.conditional)
 (else_block
-  command: (identifier) @conditional)
+  command: (identifier) @keyword.conditional)
 
 (while_block
-  command: (identifier) @repeat)
+  command: (identifier) @keyword.repeat)
 (repeat_block
-  command: (identifier) @repeat)
+  command: (identifier) @keyword.repeat)
 
 
 (comment) @comment @spell
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index c541cd165..aea94b4eb 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -1,10 +1,10 @@
 ; Preprocs
 
-(preprocessor_directive) @preproc
+(preprocessor_directive) @keyword.directive
 
 ; Includes
 
-"include" @include
+"include" @keyword.import
 
 ; Keywords
 
@@ -30,13 +30,13 @@
   "if"
   "else"
   "then"
-] @conditional
+] @keyword.conditional
 
 ; Repeats
 
 [
   "foreach"
-] @repeat
+] @keyword.repeat
 
 ; Variables
 
@@ -46,7 +46,7 @@
 
 ; Parameters
 
-(template_arg (identifier) @parameter)
+(template_arg (identifier) @variable.parameter)
 
 
 ; Types
@@ -85,10 +85,10 @@
 ; Fields
 
 (instruction
-  (identifier) @field)
+  (identifier) @variable.member)
 
 (let_instruction
-  (identifier) @field)
+  (identifier) @variable.member)
 
 ; Functions
 
@@ -148,5 +148,5 @@
 ] @comment @spell
 
 
-((comment) @preproc
-  (#lua-match? @preproc "^.*RUN"))
+((comment) @keyword.directive
+  (#lua-match? @keyword.directive "^.*RUN"))
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index b6b79dec5..aa71fc5b5 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -6,7 +6,7 @@
   (#lua-match? @comment.documentation "^[-][-][-]"))
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^[-][-](%s?)@"))
-(shebang_comment) @preproc
+(shebang_comment) @keyword.directive
 (identifier) @variable
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "self"))
@@ -21,8 +21,8 @@
 (format_specifier) @string.escape
 
 ;; Basic statements/Keywords
-[ "if" "then" "elseif" "else" ] @conditional
-[ "for" "while" "repeat" "until" ] @repeat
+[ "if" "then" "elseif" "else" ] @keyword.conditional
+[ "for" "while" "repeat" "until" ] @keyword.repeat
 "return" @keyword.return
 [ "in" "local" (break) (goto) "do" "end" ] @keyword
 (label) @label
@@ -47,7 +47,7 @@
   "function" @keyword.function)
 (function_body "end" @keyword.function)
 
-(arg name: (identifier) @parameter)
+(arg name: (identifier) @variable.parameter)
 
 (function_signature
   (arguments
@@ -56,8 +56,8 @@
 
 (typeargs
   "<" @punctuation.bracket
-  . (_) @parameter
-  . ("," . (_) @parameter)*
+  . (_) @variable.parameter
+  . ("," . (_) @variable.parameter)*
   . ">" @punctuation.bracket)
 
 (function_call
diff --git a/queries/templ/highlights.scm b/queries/templ/highlights.scm
index a7a0718e6..1187344a9 100644
--- a/queries/templ/highlights.scm
+++ b/queries/templ/highlights.scm
@@ -29,7 +29,7 @@
 [
   (expression)
   (dynamic_class_attribute_value)
-] @method
+] @function.method
 
 (component_import
   name: (component_identifier) @function)
diff --git a/queries/terraform/highlights.scm b/queries/terraform/highlights.scm
index 95d0c0451..d75b4284f 100644
--- a/queries/terraform/highlights.scm
+++ b/queries/terraform/highlights.scm
@@ -4,7 +4,7 @@
 ;
 ;
 ; local/module/data/var/output
-(expression (variable_expr (identifier) @variable.builtin (#any-of? @variable.builtin "data" "var" "local" "module" "output")) (get_attr (identifier) @field))
+(expression (variable_expr (identifier) @variable.builtin (#any-of? @variable.builtin "data" "var" "local" "module" "output")) (get_attr (identifier) @variable.member))
 
 ; path.root/cwd/module
 (expression (variable_expr (identifier) @type.builtin (#eq? @type.builtin "path")) (get_attr (identifier) @variable.builtin (#any-of? @variable.builtin "root" "cwd" "module")))
diff --git a/queries/textproto/highlights.scm b/queries/textproto/highlights.scm
index 8ebb476e5..439ca6875 100644
--- a/queries/textproto/highlights.scm
+++ b/queries/textproto/highlights.scm
@@ -1,6 +1,6 @@
 (string) @string
 
-(field_name) @field
+(field_name) @variable.member
 
 (comment) @comment
 
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 6c68dc9a3..a1ccdc9a2 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -8,7 +8,7 @@
 [
   "include"
   "cpp_include"
-] @include
+] @keyword.import
 
 ; Function
 
@@ -17,17 +17,17 @@
 
 ; Fields
 
-(field (identifier) @field)
+(field (identifier) @variable.member)
 
 ; Parameters
 
 (function_definition
   (parameters
-    (parameter (identifier) @parameter)))
+    (parameter (identifier) @variable.parameter)))
 
 (throws
   (parameters
-    (parameter (identifier) @parameter)))
+    (parameter (identifier) @variable.parameter)))
 
 ; Types
 
@@ -82,7 +82,7 @@
 
 (namespace_declaration
   (namespace_scope) @tag
-  [(namespace) @namespace (_ (identifier) @namespace)])
+  [(namespace) @module (_ (identifier) @module)])
 
 ; Attributes
 
@@ -104,7 +104,7 @@
 
 [
   "throws"
-] @exception
+] @keyword.exception
 
 ; Keywords
 
@@ -177,11 +177,11 @@
 (escape_sequence) @string.escape
 
 (namespace_uri
-  (string) @text.uri @string.special)
+  (string) @string.special.url)
 
 (number) @number
 
-(double) @float
+(double) @number.float
 
 (boolean) @boolean
 
@@ -222,5 +222,5 @@
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
-((comment) @preproc
-  (#lua-match? @preproc "#!.*"))
+((comment) @keyword.directive
+  (#lua-match? @keyword.directive "#!.*"))
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index f4f666d8d..0516341c3 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -31,11 +31,11 @@
   "for"
   "to"
   "while"
-] @repeat
+] @keyword.repeat
 
 "new" @keyword.operator
 
-"import" @include
+"import" @keyword.import
 
 [
   "array"
@@ -90,17 +90,17 @@
   name: (identifier) @function)
 
 (method_call
-  method: (identifier) @method)
+  method: (identifier) @function.method)
 (method_declaration
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 (parameters
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 ; }}}
 
 ; Declarations {{{
 (import_declaration
-  file: (string_literal) @string.special)
+  file: (string_literal) @string.special.path)
 ; }}}
 
 ; Literals {{{
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index 0dd0fd939..f1ad576cf 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -110,14 +110,14 @@
   (pcal_end_if)
   "either"
   (pcal_end_either)
-] @conditional
+] @keyword.conditional
 [ 
   "while" 
   "do" 
   (pcal_end_while) 
   "with" 
   (pcal_end_with)
-] @repeat
+] @keyword.repeat
 ("return") @keyword.return
 ("print") @function.macro
 
@@ -141,10 +141,10 @@
 (string_set) @type
 
 ; Namespaces
-(extends (identifier_ref) @namespace)
-(instance (identifier_ref) @namespace)
-(module name: (identifier) @namespace)
-(pcal_algorithm name: (identifier) @namespace)
+(extends (identifier_ref) @module)
+(instance (identifier_ref) @module)
+(module name: (identifier) @module)
+(pcal_algorithm name: (identifier) @module)
 
 ; Operators, functions, and macros
 (bound_infix_op symbol: (_) @operator)
@@ -155,7 +155,7 @@
 ((infix_op_symbol) @operator)
 ((postfix_op_symbol) @operator)
 (function_definition name: (identifier) @function)
-(module_definition name: (_) @include)
+(module_definition name: (_) @keyword.import)
 (operator_definition name: (_) @function.macro)
 (pcal_macro_decl name: (identifier) @function.macro)
 (pcal_macro_call name: (identifier) @function.macro)
@@ -168,25 +168,25 @@
 (constant_declaration (identifier) @constant)
 (constant_declaration (operator_declaration name: (_) @constant))
 (pcal_var_decl (identifier) @variable)
-(pcal_with (identifier) @parameter)
+(pcal_with (identifier) @variable.parameter)
 ((".") . (identifier) @attribute)
 (record_literal (identifier) @attribute)
 (set_of_records (identifier) @attribute)
 (variable_declaration (identifier) @variable)
 
 ; Parameters
-(choose (identifier) @parameter)
-(choose (tuple_of_identifiers (identifier) @parameter))
-(lambda (identifier) @parameter)
-(module_definition (operator_declaration name: (_) @parameter))
-(module_definition parameter: (identifier) @parameter)
-(operator_definition (operator_declaration name: (_) @parameter))
-(operator_definition parameter: (identifier) @parameter)
-(pcal_macro_decl parameter: (identifier) @parameter)
-(pcal_proc_var_decl (identifier) @parameter)
-(quantifier_bound (identifier) @parameter)
-(quantifier_bound (tuple_of_identifiers (identifier) @parameter))
-(unbounded_quantification (identifier) @parameter)
+(choose (identifier) @variable.parameter)
+(choose (tuple_of_identifiers (identifier) @variable.parameter))
+(lambda (identifier) @variable.parameter)
+(module_definition (operator_declaration name: (_) @variable.parameter))
+(module_definition parameter: (identifier) @variable.parameter)
+(operator_definition (operator_declaration name: (_) @variable.parameter))
+(operator_definition parameter: (identifier) @variable.parameter)
+(pcal_macro_decl parameter: (identifier) @variable.parameter)
+(pcal_proc_var_decl (identifier) @variable.parameter)
+(quantifier_bound (identifier) @variable.parameter)
+(quantifier_bound (tuple_of_identifiers (identifier) @variable.parameter))
+(unbounded_quantification (identifier) @variable.parameter)
 
 ; Delimiters
 [
@@ -214,10 +214,10 @@
 ] @punctuation.delimiter
 
 ; Proofs
-(assume_prove (new (identifier) @parameter))
-(assume_prove (new (operator_declaration name: (_) @parameter)))
+(assume_prove (new (identifier) @variable.parameter))
+(assume_prove (new (operator_declaration name: (_) @variable.parameter)))
 (assumption name: (identifier) @constant)
-(pick_proof_step (identifier) @parameter)
+(pick_proof_step (identifier) @variable.parameter)
 (proof_step_id "<" @punctuation.bracket)
 (proof_step_id (level) @label)
 (proof_step_id (name) @label)
@@ -226,7 +226,7 @@
 (proof_step_ref (level) @label)
 (proof_step_ref (name) @label)
 (proof_step_ref ">" @punctuation.bracket)
-(take_proof_step (identifier) @parameter)
+(take_proof_step (identifier) @variable.parameter)
 (theorem name: (identifier) @constant)
 
 ; Comments and tags
diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index fd6fe7309..a54dc167e 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -12,7 +12,7 @@
 (comment) @comment @spell
 (string) @string
 (integer) @number
-(float) @float
+(float) @number.float
 (offset_date_time) @string.special
 (local_date_time) @string.special
 (local_date) @string.special
diff --git a/queries/tsv/highlights.scm b/queries/tsv/highlights.scm
index f1e14af87..d406bd903 100644
--- a/queries/tsv/highlights.scm
+++ b/queries/tsv/highlights.scm
@@ -1,4 +1,4 @@
 (text) @string
 (number) @number
-(float) @float
+(float) @number.float
 (boolean) @boolean
diff --git a/queries/turtle/highlights.scm b/queries/turtle/highlights.scm
index fac576781..4462d583a 100644
--- a/queries/turtle/highlights.scm
+++ b/queries/turtle/highlights.scm
@@ -7,7 +7,7 @@
   "<" 
   ">" 
   (namespace)
-] @namespace
+] @module
 
 [
   (iri_reference)
@@ -23,7 +23,7 @@
 [
   (decimal)
   (double)
-] @float
+] @number.float
 
 (boolean_literal) @boolean
 
diff --git a/queries/twig/highlights.scm b/queries/twig/highlights.scm
index 4e7bfe4f2..a0a19160d 100644
--- a/queries/twig/highlights.scm
+++ b/queries/twig/highlights.scm
@@ -13,10 +13,10 @@
 (keyword) @keyword
 (attribute) @attribute
 (tag) @tag
-(conditional) @conditional
-(repeat) @repeat
-(method) @method
-(parameter) @parameter
+(conditional) @keyword.conditional
+(repeat) @keyword.repeat
+(method) @function.method
+(parameter) @variable.parameter
 
 [
     "{{"
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 0a81699cd..bc6478a45 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -1,8 +1,8 @@
 ; inherits: ecma
 
-"require" @include
+"require" @keyword.import
 
-(import_require_clause source: (string) @text.uri)
+(import_require_clause source: (string) @string.special.url)
 
 [
   "declare"
@@ -96,44 +96,44 @@
 
 (template_type ["${" "}"] @punctuation.special)
 
-(conditional_type ["?" ":"] @conditional.ternary)
+(conditional_type ["?" ":"] @keyword.conditional.ternary)
 
 ;;; Parameters
-(required_parameter (identifier) @parameter)
-(optional_parameter (identifier) @parameter)
+(required_parameter (identifier) @variable.parameter)
+(optional_parameter (identifier) @variable.parameter)
 
 (required_parameter
   (rest_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 
 ;; ({ a }) => null
 (required_parameter
   (object_pattern
-    (shorthand_property_identifier_pattern) @parameter))
+    (shorthand_property_identifier_pattern) @variable.parameter))
 
 ;; ({ a = b }) => null
 (required_parameter
   (object_pattern
     (object_assignment_pattern
-      (shorthand_property_identifier_pattern) @parameter)))
+      (shorthand_property_identifier_pattern) @variable.parameter)))
 
 ;; ({ a: b }) => null
 (required_parameter
   (object_pattern
     (pair_pattern
-      value: (identifier) @parameter)))
+      value: (identifier) @variable.parameter)))
 
 ;; ([ a ]) => null
 (required_parameter
   (array_pattern
-    (identifier) @parameter))
+    (identifier) @variable.parameter))
 
 ;; a => null
 (arrow_function
-  parameter: (identifier) @parameter)
+  parameter: (identifier) @variable.parameter)
 
 ;; global declaration
-(ambient_declaration "global" @namespace)
+(ambient_declaration "global" @module)
 
 ;; function signatures
 (ambient_declaration
@@ -141,11 +141,11 @@
     name: (identifier) @function))
 
 ;; method signatures
-(method_signature name: (_) @method)
+(method_signature name: (_) @function.method)
 
 ;; property signatures
 (property_signature
-  name: (property_identifier) @method
+  name: (property_identifier) @function.method
   type: (type_annotation
           [
             (union_type (parenthesized_type (function_type)))
diff --git a/queries/typoscript/highlights.scm b/queries/typoscript/highlights.scm
index 9ce80c680..c1c483c3a 100644
--- a/queries/typoscript/highlights.scm
+++ b/queries/typoscript/highlights.scm
@@ -1,4 +1,4 @@
-(identifier) @field
+(identifier) @variable.member
 
 (constant) @constant
 
@@ -9,14 +9,14 @@
   (condition) 
   (condition_end) 
   (condition_else)
-] @conditional
+] @keyword.conditional
 
 (cobject) @type.builtin
 
 [
   "@import"
   "INCLUDE_TYPOSCRIPT"
-] @include
+] @keyword.import
 
 [
   (comment)
diff --git a/queries/ungrammar/highlights.scm b/queries/ungrammar/highlights.scm
index 60355f577..0e4448255 100644
--- a/queries/ungrammar/highlights.scm
+++ b/queries/ungrammar/highlights.scm
@@ -16,7 +16,7 @@
 [
   "*"
   "?"
-] @repeat
+] @keyword.repeat
 
 [
   ":"
diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
index 20e68a1c5..88b2a1373 100644
--- a/queries/unison/highlights.scm
+++ b/queries/unison/highlights.scm
@@ -41,35 +41,35 @@
   (match)
   (with)
   (cases)
-] @conditional
+] @keyword.conditional
 
 (blank_pattern) @variable.builtin
 
 (pattern) @variable (constructor_or_variable_pattern) @type
 
-(use_clause) @include
+(use_clause) @keyword.import
 
 ;; Types
 (record_field name: (wordy_id) @variable type: (wordy_id) @type)
 (type_name) @type
 
-(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @parameter)
+(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @variable.parameter)
 (effect (wordy_id) @attribute) ;; NOTE: an effect is a special type
 
 
 ;; Namespaces
-(path) @namespace
-(namespace) @namespace
+(path) @module
+(namespace) @module
 
 ;; Terms
-(type_signature term_name: (path) @namespace term_name: (wordy_id) @variable)
+(type_signature term_name: (path) @module term_name: (wordy_id) @variable)
 (type_signature term_name: (wordy_id) @variable)
 (term_type) @type
 
 (function_application function_name: (path) function_name: (wordy_id) @function)
 
 (term_definition name: (wordy_id) @variable)
-(term_definition param: (wordy_id) @parameter)
+(term_definition param: (wordy_id) @variable.parameter)
 ;; Punctuation
 [
   (type_signature_colon)
@@ -85,4 +85,4 @@
   "]"
 ] @punctuation.bracket
 
-(test_watch_expression (wordy_id) @preproc)
+(test_watch_expression (wordy_id) @keyword.directive)
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
index 73968a647..6ba4ec98f 100644
--- a/queries/usd/highlights.scm
+++ b/queries/usd/highlights.scm
@@ -1,10 +1,10 @@
 (None) @constant.builtin
-(asset_path) @text.uri
+(asset_path) @string.special.url
 (attribute_property) @property
 (bool) @boolean
 (comment) @comment @spell
 (custom) @function.builtin
-(float) @float
+(float) @number.float
 (integer) @number
 (orderer) @function.call
 (prim_path) @string.special
@@ -16,12 +16,12 @@
 ;; Prefer namespace highlighting, if any.
 ;;
 ;; e.g. `rel fizz` - `fizz` uses `@identifier`
-;; e.g. `rel foo:bar:fizz` - `foo` and `bar` use `@namespace` and `fizz` uses `@identifier`
+;; e.g. `rel foo:bar:fizz` - `foo` and `bar` use `@module` and `fizz` uses `@identifier`
 ;;
 (identifier) @variable
-(namespace_identifier) @namespace
+(namespace_identifier) @module
 (namespace_identifier
-  (identifier) @namespace
+  (identifier) @module
 )
 
 [
diff --git a/queries/uxntal/highlights.scm b/queries/uxntal/highlights.scm
index 795c73d09..ce81e77ef 100644
--- a/queries/uxntal/highlights.scm
+++ b/queries/uxntal/highlights.scm
@@ -1,8 +1,8 @@
 ; Includes
 
 (include
-  "~" @include
-  _ @text.uri @string.special)
+  "~" @keyword.import
+  _ @string.special.url)
 
 ; Variables
 
@@ -35,25 +35,25 @@
 ; Labels
 
 (label
-  "@" @symbol
+  "@" @string.special.symbol
   (identifier) @function)
 
 (sublabel_reference
-  (identifier) @namespace
+  (identifier) @module
   "/" @punctuation.delimiter
   (identifier) @label)
 
 ; Repeats
 
-((identifier) @repeat
-  (#eq? @repeat "while"))
+((identifier) @keyword.repeat
+  (#eq? @keyword.repeat "while"))
 
 ; Literals
 
 (raw_ascii) @string
 
 (hex_literal
-  "#" @symbol
+  "#" @string.special.symbol
   (hex_lit_value) @string.special)
 
 (number) @number
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index dbf059d8f..221b05028 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -3,7 +3,7 @@
 [
   "import"
   "module"
-] @include
+] @keyword.import
 
 ; Keywords
 
@@ -38,14 +38,14 @@
   "else"
   "$else"
   "select"
-] @conditional
+] @keyword.conditional
 
 [
   "for"
   "$for"
   "continue"
   "break"
-] @repeat
+] @keyword.repeat
 
 "fn" @keyword.function
 
@@ -56,7 +56,7 @@
   "shared"
   "static"
   "const"
-] @storageclass
+] @keyword.storage
 
 [
   "pub"
@@ -77,13 +77,13 @@
 ; Namespace
 
 (module_clause
- (identifier) @namespace)
+ (identifier) @module)
 
 (import_path
- (import_name) @namespace)
+ (import_name) @module)
 
 (import_alias
- (import_name) @namespace)
+ (import_name) @module)
 
 ; Literals
 
@@ -115,20 +115,20 @@
 
 ; Fields
 
-(selector_expression field: (reference_expression (identifier) @field))
+(selector_expression field: (reference_expression (identifier) @variable.member))
 
-(field_name) @field
+(field_name) @variable.member
 
 (struct_field_declaration
-  name: (identifier) @field)
+  name: (identifier) @variable.member)
 
 ; Parameters
 
 (parameter_declaration
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 (receiver
-  name: (identifier) @parameter)
+  name: (identifier) @variable.parameter)
 
 ; Constants
 
@@ -158,11 +158,11 @@
 
 (function_declaration
   receiver: (receiver)
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 (call_expression
  name: (selector_expression
-  field: (reference_expression) @method.call))
+  field: (reference_expression) @function.method.call))
 
 (call_expression
  name: (reference_expression) @function.call)
@@ -428,7 +428,7 @@
 
 (int_literal) @number
 
-(float_literal) @float
+(float_literal) @number.float
 
 [
   (c_string_literal)
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index 875bad539..3250adcb4 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -4,8 +4,8 @@
 (comment) @comment @spell
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
-(symbol) @symbol
-(member_access_expression (_) (identifier) @symbol)
+(symbol) @string.special.symbol
+(member_access_expression (_) (identifier) @string.special.symbol)
 
 ; highlight constants
 (
@@ -14,12 +14,12 @@
 )
 
 (
-  (member_access_expression (member_access_expression) @include (identifier) @constant)
+  (member_access_expression (member_access_expression) @keyword.import (identifier) @constant)
   (#lua-match? @constant "^[%u][%u%d_]*$")
 )
 
 ; highlight types and probable types
-(type (symbol (_)? @namespace (identifier) @type))
+(type (symbol (_)? @module (identifier) @type))
 (
   (member_access_expression . (identifier) @type)
   (#match? @type "^[A-Z][A-Za-z_0-9]{2,}$")
@@ -27,15 +27,15 @@
 
 ; highlight creation methods in object creation expressions
 (
-  (object_creation_expression (type (symbol (symbol (symbol)? @include (identifier) @type) (identifier) @constructor)))
+  (object_creation_expression (type (symbol (symbol (symbol)? @keyword.import (identifier) @type) (identifier) @constructor)))
   (#lua-match? @constructor "^[%l][%l%d_]*$")
 )
 
 (unqualified_type (symbol . (identifier) @type))
-(unqualified_type (symbol (symbol) @namespace (identifier) @type))
+(unqualified_type (symbol (symbol) @module (identifier) @type))
 
 (attribute) @attribute
-(namespace_declaration (symbol) @namespace)
+(namespace_declaration (symbol) @module)
 (method_declaration (symbol (symbol) @type (identifier) @function))
 (method_declaration (symbol (identifier) @function))
 (local_declaration (assignment (identifier) @variable))
@@ -55,10 +55,10 @@
  (method_call_expression (member_access_expression (identifier) @function.macro))
  (#match? @function.macro "^assert[A-Za-z_0-9]*|error|info|debug|print|warning|warning_once$")
 )
-(lambda_expression (identifier) @parameter)
-(parameter (identifier) @parameter)
+(lambda_expression (identifier) @variable.parameter)
+(parameter (identifier) @variable.parameter)
 (property_declaration (symbol (identifier) @property))
-(field_declaration (identifier) @field)
+(field_declaration (identifier) @variable.member)
 [
  (this_access)
  (base_access)
@@ -69,8 +69,8 @@
 (escape_sequence) @string.escape
 (integer) @number
 (null) @constant.builtin
-(real) @float
-(regex) @string.regex
+(real) @number.float
+(regex) @string.regexp
 (string) @string
 (string_formatter) @string.special
 (template_string) @string
@@ -82,10 +82,10 @@
 ] @type.builtin
 
 (if_directive
-  expression: (_) @preproc
+  expression: (_) @keyword.directive
 ) @keyword
 (elif_directive
-  expression: (_) @preproc
+  expression: (_) @keyword.directive
 ) @keyword
 (else_directive) @keyword
 (endif_directive) @keyword
@@ -133,10 +133,10 @@
  "else"
  "if"
  "switch"
-] @conditional
+] @keyword.conditional
 
 ; specially highlight break statements in switch sections
-(switch_section (break_statement "break" @conditional))
+(switch_section (break_statement "break" @keyword.conditional))
 
 [
  "extern"
@@ -145,7 +145,7 @@
  "protected"
  "public"
  "static"
-] @storageclass
+] @keyword.storage
 
 [
  "and"
@@ -160,10 +160,10 @@
  "typeof"
 ] @keyword.operator
 
-"using" @include
-(using_directive (symbol) @namespace)
+"using" @keyword.import
+(using_directive (symbol) @module)
 
-(symbol "global::" @namespace)
+(symbol "global::" @module)
 
 (array_creation_expression "new" @keyword.operator)
 (object_creation_expression "new" @keyword.operator)
@@ -177,7 +177,7 @@
   "for"
   "foreach"
   "while"
-] @repeat
+] @keyword.repeat
 
 [
   "catch"
@@ -185,7 +185,7 @@
   "throw"
   "throws"
   "try"
-] @exception
+] @keyword.exception
 
 [
   "return"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 6d27863f6..1c6e578f6 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -66,20 +66,20 @@
   "forever"
   "initial"
   "while"
-] @repeat
+] @keyword.repeat
 
 [
   "if"
   "else"
   (case_keyword)
   "endcase"
-] @conditional
+] @keyword.conditional
 
 (comment) @comment @spell
 
 (include_compiler_directive) @constant.macro
 (package_import_declaration
- "import" @include)
+ "import" @keyword.import)
 
 (package_import_declaration
  (package_import_item
@@ -162,14 +162,14 @@
  (simple_identifier) @type)
 
 (method_call_body
-  (method_identifier) @field)
+  (method_identifier) @variable.member)
 
 (interface_identifier
  (simple_identifier) @type)
 
 (modport_identifier
  (modport_identifier
-  (simple_identifier) @field))
+  (simple_identifier) @variable.member))
 
 (net_port_type1
  (simple_identifier) @type)
@@ -182,9 +182,9 @@
 [
   (default_nettype_compiler_directive)
   (timescale_compiler_directive)
-] @preproc
+] @keyword.directive
 
-(include_compiler_directive) @include
+(include_compiler_directive) @keyword.import
 
 ; begin/end label
 (seq_block
@@ -212,7 +212,7 @@
  "new" @constructor)
 
 (parameter_identifier
- (simple_identifier) @parameter)
+ (simple_identifier) @variable.parameter)
 
 [
   (integral_number)
@@ -258,12 +258,12 @@
 
 (task_identifier
  (task_identifier
-  (simple_identifier) @method))
+  (simple_identifier) @function.method))
 
 ;;TODO: fixme
 ;(assignment_pattern_expression
  ;(assignment_pattern
-  ;(parameter_identifier) @field))
+  ;(parameter_identifier) @variable.member))
 
 (type_declaration
   (data_type ["packed"] @type.qualifier))
@@ -290,10 +290,10 @@
 (struct_union_member
  (list_of_variable_decl_assignments
   (variable_decl_assignment
-   (simple_identifier) @field)))
+   (simple_identifier) @variable.member)))
 
 (member_identifier
- (simple_identifier) @field)
+ (simple_identifier) @variable.member)
 
 (struct_union_member
  (data_type_or_void
diff --git a/queries/vhs/highlights.scm b/queries/vhs/highlights.scm
index 67fa3cf8a..70b6ca20a 100644
--- a/queries/vhs/highlights.scm
+++ b/queries/vhs/highlights.scm
@@ -31,8 +31,9 @@
 
 [ "@" ] @operator
 (control) @function.macro
-(float) @float
+(float) @number.float
 (integer) @number
 (comment) @comment @spell
-[(path) (string) (json)] @string
-(time) @symbol
+[(string) (json)] @string
+(path) @string.special.path
+(time) @string.special
diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 9bae16ae9..7b28b4759 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -9,7 +9,7 @@
   "else"
   "elseif"
   "endif"
-] @conditional
+] @keyword.conditional
 
 [
   "try"
@@ -17,7 +17,7 @@
   "finally"
   "endtry"
   "throw"
-] @exception
+] @keyword.exception
 
 [
   "for"
@@ -27,7 +27,7 @@
   "endwhile"
   "break"
   "continue"
-] @repeat
+] @keyword.repeat
 
 [
   "function"
@@ -38,8 +38,8 @@
 (function_declaration name: (_) @function)
 (call_expression function: (identifier) @function.call)
 (call_expression function: (scoped_identifier (identifier) @function.call))
-(parameters (identifier) @parameter)
-(default_parameter (identifier) @parameter)
+(parameters (identifier) @variable.parameter)
+(default_parameter (identifier) @variable.parameter)
 
 [ (bang) (spread) ] @punctuation.special
 
@@ -48,7 +48,7 @@
   (scope)
   "a:"
   "$"
-] @namespace
+] @module
 
 ;; Commands and user defined commands
 
@@ -153,7 +153,7 @@
   "<unique>"
 ] @constant.builtin
 
-(augroup_name) @namespace
+(augroup_name) @module
 
 (au_event) @constant
 (normal_statement (commands) @constant)
@@ -203,12 +203,12 @@
 
 (string_literal) @string
 (integer_literal) @number
-(float_literal) @float
+(float_literal) @number.float
 (comment) @comment @spell
 (line_continuation_comment) @comment @spell
 (pattern) @string.special
-(pattern_multi) @string.regex
-(filename) @string
+(pattern_multi) @string.regexp
+(filename) @string.special.path
 (heredoc (body) @string)
 (heredoc (parameter) @keyword)
 [ (marker_definition) (endmarker) ] @label
@@ -277,7 +277,7 @@
   ":"
 ] @punctuation.delimiter
 
-(ternary_expression ["?" ":"] @conditional.ternary)
+(ternary_expression ["?" ":"] @keyword.conditional.ternary)
 
 ; Options
 ((set_value) @number
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 78ae9dab9..eefc4e74b 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -1,31 +1,31 @@
-(h1) @text.title.1
-(h2) @text.title.2
-(h3) @text.title.3
-(column_heading) @text.title.4
+(h1) @markup.heading.1
+(h2) @markup.heading.2
+(h3) @markup.heading.3
+(column_heading) @markup.heading.4
 (column_heading
-   "~" @conceal (#set! conceal ""))
+   "~" @markup.heading.4.marker (#set! conceal ""))
 (tag
-   "*" @conceal (#set! conceal "")
+   "*" @markup.heading.5.marker (#set! conceal "")
    text: (_) @label)
 (taglink
-   "|" @conceal (#set! conceal "")
-   text: (_) @text.reference)
+   "|" @markup.link (#set! conceal "")
+   text: (_) @markup.link)
 (optionlink
-   text: (_) @text.reference)
+   text: (_) @markup.link)
 (codespan
-   "`" @conceal (#set! conceal "")
-   text: (_) @text.literal)
-((codeblock) @text.literal.block (#set! "priority" 90))
+   "`" @markup.raw (#set! conceal "")
+   text: (_) @markup.raw)
+((codeblock) @markup.raw.block (#set! "priority" 90))
 (codeblock
-   [">" (language)] @conceal (#set! conceal ""))
+   [">" (language)] @markup.raw.block (#set! conceal ""))
 (block
-   "<" @conceal (#set! conceal ""))
-(argument) @parameter
+   "<" @markup.raw.block (#set! conceal ""))
+(argument) @variable.parameter
 (keycode) @string.special
-(url) @text.uri
-((note) @text.note
-   (#any-of? @text.note "Note:" "NOTE:" "Notes:"))
-((note) @text.warning
-   (#any-of? @text.warning "Warning:" "WARNING:"))
-((note) @text.danger
-   (#any-of? @text.danger "Deprecated:" "DEPRECATED:"))
+(url) @string.special.url
+((note) @comment.hint
+   (#any-of? @comment.hint "Note:" "NOTE:" "Notes:"))
+((note) @comment.warning
+   (#any-of? @comment.warning "Warning:" "WARNING:"))
+((note) @comment.error
+   (#any-of? @comment.error "Deprecated:" "DEPRECATED:"))
diff --git a/queries/vue/highlights.scm b/queries/vue/highlights.scm
index ae89d65a0..e53ef4b8a 100644
--- a/queries/vue/highlights.scm
+++ b/queries/vue/highlights.scm
@@ -20,4 +20,4 @@
 [
   (directive_modifier)
   (directive_argument)
-] @method
+] @function.method
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index c440bf0fe..6e190f06e 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -1,6 +1,6 @@
 (identifier) @variable
 (int_literal) @number
-(float_literal) @float
+(float_literal) @number.float
 (bool_literal) @boolean
 
 (type_declaration) @type
@@ -9,13 +9,13 @@
     (identifier) @function)
 
 (parameter
-    (variable_identifier_declaration (identifier) @parameter))
+    (variable_identifier_declaration (identifier) @variable.parameter))
 
 (struct_declaration
     (identifier) @type)
 
 (struct_declaration
-    (struct_member (variable_identifier_declaration (identifier) @field)))
+    (struct_member (variable_identifier_declaration (identifier) @variable.member)))
 
 (type_constructor_or_function_call_expression
     (type_declaration) @function.call)
@@ -38,7 +38,7 @@
     "storage"
     "uniform"
     "workgroup"
-] @storageclass
+] @keyword.storage
 
 [
     "read"
@@ -61,7 +61,7 @@
     "break"
     "continue"
     "continuing"
-] @repeat
+] @keyword.repeat
 
 [
     "if"
@@ -69,7 +69,7 @@
     "switch"
     "case"
     "default"
-] @conditional
+] @keyword.conditional
 
 [
     "&"
diff --git a/queries/wgsl_bevy/highlights.scm b/queries/wgsl_bevy/highlights.scm
index 4ba25a935..d14276733 100644
--- a/queries/wgsl_bevy/highlights.scm
+++ b/queries/wgsl_bevy/highlights.scm
@@ -9,7 +9,7 @@
  "#import"
  "#define_import_path"
  "as"
-] @include
+] @keyword.import
 
 "::" @punctuation.delimiter
 
@@ -17,13 +17,13 @@
   (import_path
     ((identifier) @function .)))
 
-(import_path (identifier) @namespace (identifier))
+(import_path (identifier) @module (identifier))
 
 (struct_declaration
-    (preproc_ifdef (struct_member (variable_identifier_declaration (identifier) @field))))
+    (preproc_ifdef (struct_member (variable_identifier_declaration (identifier) @variable.member))))
 (struct_declaration
     (preproc_ifdef
-      (preproc_else (struct_member (variable_identifier_declaration (identifier) @field)))))
+      (preproc_else (struct_member (variable_identifier_declaration (identifier) @variable.member)))))
 
 (preproc_ifdef
   name: (identifier) @constant.macro)
@@ -33,4 +33,4 @@
  "#ifndef"
  "#endif"
  "#else"
-] @preproc
+] @keyword.directive
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index af5ef6ed6..3ef530746 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -6,22 +6,22 @@
 
 (custom_type) @type
 (class_field 
-  name: (identifier) @field)
+  name: (identifier) @variable.member)
 (class_definition 
   name: (identifier) @type)
 (method_definition
-  name: (identifier) @method)
+  name: (identifier) @function.method)
 
 ; Functions
 
-(keyword_argument_key) @parameter
+(keyword_argument_key) @variable.parameter
 (call 
   caller: (reference 
   	(nested_identifier 
-    	property: (member_identifier) @method.call)))
+    	property: (member_identifier) @function.method.call)))
 (call 
   caller: (reference 
-  	(reference_identifier) @method.call))
+  	(reference_identifier) @function.method.call))
 
 ; Primitives
 
diff --git a/queries/xcompose/highlights.scm b/queries/xcompose/highlights.scm
index 48366985d..811a67b1d 100644
--- a/queries/xcompose/highlights.scm
+++ b/queries/xcompose/highlights.scm
@@ -5,7 +5,7 @@
 
 (text) @string
 
-"include" @include
+"include" @keyword.import
 
 [ (octal) (hex) ] @number
 
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index e47636ac4..aa913352e 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -8,9 +8,9 @@
 
 ;; Processing instructions
 
-(XmlModelPI "xml-model" @preproc)
+(XmlModelPI "xml-model" @keyword.directive)
 
-(StyleSheetPI "xml-stylesheet" @preproc)
+(StyleSheetPI "xml-stylesheet" @keyword.directive)
 
 (PseudoAtt (Name) @tag.attribute)
 
@@ -18,7 +18,7 @@
 
 ;; Doctype declaration
 
-(doctypedecl "DOCTYPE" @define)
+(doctypedecl "DOCTYPE" @keyword.directive.define)
 
 (doctypedecl (Name) @type.definition)
 
@@ -38,12 +38,12 @@
 
 ;; Text
 
-(CharData) @text @spell
+(CharData) @none @spell
 
 ((CDSect
-  (CDStart) @text.environment
-  (CData) @text.literal
-  "]]>" @text.environment)
+  (CDStart) @markup.environment
+  (CData) @markup.raw
+  "]]>" @markup.environment)
  (#set! "priority" 105))
 
 ;; Delimiters & punctuation
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index 0fa633dbd..03234a5ce 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -16,17 +16,17 @@
   (yaml_directive)
   (tag_directive)
   (reserved_directive)
-] @preproc
+] @keyword.directive
 
 (block_mapping_pair
-  key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @field))
+  key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @variable.member))
 (block_mapping_pair
-  key: (flow_node (plain_scalar (string_scalar) @field)))
+  key: (flow_node (plain_scalar (string_scalar) @variable.member)))
 
 (flow_mapping
-  (_ key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @field)))
+  (_ key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @variable.member)))
 (flow_mapping
-  (_ key: (flow_node (plain_scalar (string_scalar) @field))))
+  (_ key: (flow_node (plain_scalar (string_scalar) @variable.member))))
 
 [
  ","
diff --git a/queries/yang/highlights.scm b/queries/yang/highlights.scm
index c2c302a71..33e5517c3 100644
--- a/queries/yang/highlights.scm
+++ b/queries/yang/highlights.scm
@@ -6,7 +6,7 @@
 
 ; Keywords
 (statement_keyword) @keyword
-(statement_keyword "import") @include
+(statement_keyword "import") @keyword.import
 (extension_keyword) @function
 
 ; Arguments
@@ -24,7 +24,7 @@
 (string) @string
 (string (escape_sequence) @string.escape)
 (unquoted_string) @string
-(keypath) @string.special
+(keypath) @string.special.path
 
 ; Always highlight the value of an enum statement as a string
 (enum_value) @string
@@ -35,7 +35,7 @@
   (argument (string) @string.special))
 (statement
   (statement_keyword "pattern")
-  (argument (string) @string.regex))
+  (argument (string) @string.regexp))
 
 ; Punctuation
 (plus_symbol) @operator
diff --git a/queries/yuck/highlights.scm b/queries/yuck/highlights.scm
index 16e90441f..c885d909d 100644
--- a/queries/yuck/highlights.scm
+++ b/queries/yuck/highlights.scm
@@ -7,8 +7,8 @@
 ; Includes
 
 (list .
-  ((symbol) @include
-    (#eq? @include "include")))
+  ((symbol) @keyword.import
+    (#eq? @keyword.import "include")))
 
 ; Keywords
 
@@ -20,9 +20,9 @@
 
 ; Loop
 
-(loop_widget . "for" @repeat . (symbol) @variable . "in" @keyword.operator)
+(loop_widget . "for" @keyword.repeat . (symbol) @variable . "in" @keyword.operator)
 
-(loop_widget . "for" @repeat . (symbol) @variable . "in" @keyword.operator . (symbol) @variable)
+(loop_widget . "for" @keyword.repeat . (symbol) @variable . "in" @keyword.operator . (symbol) @variable)
 
 ; Builtin widgets
 
@@ -84,7 +84,7 @@
 
 (json_object
   (simplexpr
-    (ident) @field))
+    (ident) @variable.member))
 
 ; Functions
 
@@ -121,13 +121,13 @@
 ; Ternary expression
 
 (ternary_expression
-  ["?" ":"] @conditional.ternary)
+  ["?" ":"] @keyword.conditional.ternary)
 
 ; Literals
 
 (number) @number
 
-(float) @float
+(float) @number.float
 
 (boolean) @boolean
 
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 9ba764b10..875235412 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -10,12 +10,12 @@
   variable_type_function: (IDENTIFIER)
 ] @variable
 
-parameter: (IDENTIFIER) @parameter
+parameter: (IDENTIFIER) @variable.parameter
 
 [
   field_member: (IDENTIFIER)
   field_access: (IDENTIFIER)
-] @field
+] @variable.member
 
 ;; assume TitleCase is a type
 (
@@ -48,7 +48,7 @@ parameter: (IDENTIFIER) @parameter
 function: (IDENTIFIER) @function
 function_call: (IDENTIFIER) @function.call
 
-exception: "!" @exception
+exception: "!" @keyword.exception
 
 (
   (IDENTIFIER) @variable.builtin
@@ -71,12 +71,12 @@ field_constant: (IDENTIFIER) @constant
 
 (BUILTINIDENTIFIER) @function.builtin
 
-((BUILTINIDENTIFIER) @include
-  (#any-of? @include "@import" "@cImport"))
+((BUILTINIDENTIFIER) @keyword.import
+  (#any-of? @keyword.import "@import" "@cImport"))
 
 (INTEGER) @number
 
-(FLOAT) @float
+(FLOAT) @number.float
 
 [
   "true"
@@ -133,23 +133,23 @@ field_constant: (IDENTIFIER) @constant
   "if"
   "else"
   "switch"
-] @conditional
+] @keyword.conditional
 
 [
   "for"
   "while"
   "break"
   "continue"
-] @repeat
+] @keyword.repeat
 
 [
   "usingnamespace"
-] @include
+] @keyword.import
 
 [
   "try"
   "catch"
-] @exception
+] @keyword.exception
 
 [
   "anytype"
@@ -169,7 +169,7 @@ field_constant: (IDENTIFIER) @constant
   "align"
   "callconv"
   "linksection"
-] @storageclass
+] @keyword.storage
 
 [
   "comptime"
diff --git a/tests/query/highlights/capnp/test.capnp b/tests/query/highlights/capnp/test.capnp
index 9ba376c7d..ce12b07ac 100644
--- a/tests/query/highlights/capnp/test.capnp
+++ b/tests/query/highlights/capnp/test.capnp
@@ -20,15 +20,15 @@
 # THE SOFTWARE.
 
 @0xd508eebdc2dc42b8;
-# <- @preproc
+# <- @keyword.directive
 #                  ^ @punctuation.delimiter
 
 using Cxx = import "c++.capnp";
-# <- @include
+# <- @keyword.import
 #     ^^^ @type
 #         ^ @operator
-#           ^^^^^^ @include
-#                  ^^^^^^^^^^^ @string
+#           ^^^^^^ @keyword.import
+#                  ^^^^^^^^^^^ @string.special.path
 
 # Use a namespace likely to cause trouble if the generated code doesn't use fully-qualified
 # names for stuff in the capnproto namespace.
@@ -53,7 +53,7 @@ enum TestEnum {
 struct TestAllTypes {
 # <- @keyword
   voidField      @0  : Void;
-# ^^^^^^^^^ @field
+# ^^^^^^^^^ @variable.member
 #                    ^ @punctuation.special
 #                      ^^^^ @type.builtin
   boolField      @1  : Bool;
@@ -150,7 +150,7 @@ struct TestUnionDefaults {
 
 struct TestUsing {
   using OuterNestedEnum = TestNestedTypes.NestedEnum;
-# ^^^^^ @include
+# ^^^^^ @keyword.import
   using TestNestedTypes.NestedStruct.NestedEnum;
 
   outerNestedEnum @1 :OuterNestedEnum = bar;
@@ -179,7 +179,7 @@ struct TestWholeFloatDefault {
   bigField @1 :Float32 = 2e30;
   const constant :Float32 = 456;
   const bigConstant :Float32 = 4e30;
-#                              ^^^^ @float
+#                              ^^^^ @number.float
 }
 
 struct TestGenerics(Foo, Bar) {
@@ -217,7 +217,7 @@ struct TestGenerics(Foo, Bar) {
 #     ^^^^^^^^^ @keyword
         # At one time this failed to compile.
         call @0 () -> ();
-#       ^^^^ @method
+#       ^^^^ @function.method
 #                  ^^ @punctuation.delimiter
       }
     }
@@ -225,14 +225,14 @@ struct TestGenerics(Foo, Bar) {
 
   interface Interface(Qux) {
     call @0 Inner2(Text) -> (qux :Qux, gen :TestGenerics(TestAllTypes, TestAnyPointer));
-#                            ^^^ @parameter
-#                                      ^^^ @parameter
+#                            ^^^ @variable.parameter
+#                                      ^^^ @variable.parameter
   }
 
   annotation ann(struct) :Foo;
 # ^^^^^^^^^^ @keyword
-#            ^^^ @method
-#                ^^^^^^ @parameter.builtin
+#            ^^^ @function.method
+#                ^^^^^^ @variable.parameter.builtin
 
   using AliasFoo = Foo;
   using AliasInner = Inner;
@@ -423,7 +423,7 @@ const genericConstant :TestGenerics(TestAllTypes, Text) =
     (foo = (int16Field = 123), rev = (foo = "text", rev = (foo = (int16Field = 321))));
 
 const embeddedData :Data = embed "testdata/packed";
-#                          ^^^^^ @include
+#                          ^^^^^ @keyword.import
 const embeddedText :Text = embed "testdata/short.txt";
 const embeddedStruct :TestAllTypes = embed "testdata/binary";
 
@@ -452,7 +452,7 @@ const anyPointerConstants :TestAnyPointerConstants = (
 
 interface TestInterface {
   foo @0 (i :UInt32, j :Bool) -> (x :Text);
-#                                 ^ @parameter
+#                                 ^ @variable.parameter
   bar @1 () -> ();
   baz @2 (s: TestAllTypes);
 }
diff --git a/tests/query/highlights/clojure/test.clj b/tests/query/highlights/clojure/test.clj
index f40e9b0c4..5c9ca649b 100644
--- a/tests/query/highlights/clojure/test.clj
+++ b/tests/query/highlights/clojure/test.clj
@@ -1,7 +1,7 @@
 (ns test {:clj-kondo/ignore true})
 ; <- @punctuation.bracket
-; ^ @include
-;    ^ @namespace
+; ^ @keyword.import
+;    ^ @module
 
  ; asdf
 ;^^^^^^ @comment
@@ -19,7 +19,7 @@
 ;    ^ ^^ ^^ @variable.builtin
 
  &
-;^ @parameter
+;^ @variable.parameter
 
  ->abc
 ;^^^^^ @constructor
@@ -31,16 +31,16 @@
 ;^^ ^^ ^^ ^^ @variable.builtin
 
 (.method)
-;^^^^^^^ @method
+;^^^^^^^ @function.method
 
 (.-field)
-;^^^^^^^ @field
+;^^^^^^^ @variable.member
 
  Abc/method
-;^^^^^^^^^^ @field
+;^^^^^^^^^^ @variable.member
 
 (Abc/method)
-;^^^^^^^^^^ @method
+;^^^^^^^^^^ @function.method
 
  Abc
 ;^^^ @type
diff --git a/tests/query/highlights/cpp/concepts.cpp b/tests/query/highlights/cpp/concepts.cpp
index 6fe6af436..09d975c98 100644
--- a/tests/query/highlights/cpp/concepts.cpp
+++ b/tests/query/highlights/cpp/concepts.cpp
@@ -7,7 +7,7 @@ concept Derived = std::is_base_of<U, T>::value;
 template<typename T>
 concept Hashable = requires(T a) {
 //                   ^ @keyword
-//                            ^ @parameter
+//                            ^ @variable.parameter
 //                          ^ @type
     { std::hash<T>{}(a) } -> std::convertible_to<std::size_t>;
  typename CommonType<T, U>; // CommonType<T, U> is valid and names a type
diff --git a/tests/query/highlights/cpp/enums-as-constants.cpp b/tests/query/highlights/cpp/enums-as-constants.cpp
index ae773e8d3..d6b93d5ec 100644
--- a/tests/query/highlights/cpp/enums-as-constants.cpp
+++ b/tests/query/highlights/cpp/enums-as-constants.cpp
@@ -11,7 +11,7 @@ void foo(Foo f){
     switch ( f ) {
         case Foo::a:
          //  ^ @type
-         //   ^ @namespace
+         //   ^ @module
          //       ^ @constant
             break;
         case Foo::aa:
diff --git a/tests/query/highlights/cpp/test.cpp b/tests/query/highlights/cpp/test.cpp
index 3f903a55f..4a4c6238a 100644
--- a/tests/query/highlights/cpp/test.cpp
+++ b/tests/query/highlights/cpp/test.cpp
@@ -1,11 +1,11 @@
 #include <iostream>
 #include <cstdlib>
-//    ^ @include
+//    ^ @keyword.import
 //       ^ @string
 
 auto main( int argc, char** argv ) -> int
 // ^ @type.builtin
-      //       ^ @parameter
+      //       ^ @variable.parameter
       //    ^ @type.builtin
       //    ^ @type.builtin
       //                  ^ @operator
diff --git a/tests/query/highlights/ecma/test.ts b/tests/query/highlights/ecma/test.ts
index 9ecd50c76..ecdfa8929 100644
--- a/tests/query/highlights/ecma/test.ts
+++ b/tests/query/highlights/ecma/test.ts
@@ -6,21 +6,21 @@ class H {
   //   ^ @property
 
   #private_method() {
-    //  ^ @method
+    //  ^ @function.method
     return `${this.pub_field} -- ${this.#priv_field}`;
     //                                      ^ @property
     //                ^ @property
   }
 
   public_method() {
-    //  ^ @method
+    //  ^ @function.method
     return this.#private_method();
-    //                ^ @method.call
+    //                ^ @function.method.call
   }
 
   ok() {
     return this.public_method();
-    //                ^ @method.call
+    //                ^ @function.method.call
   }
 }
 
diff --git a/tests/query/highlights/fusion/basic.fusion b/tests/query/highlights/fusion/basic.fusion
index e63c86eea..16b99f431 100644
--- a/tests/query/highlights/fusion/basic.fusion
+++ b/tests/query/highlights/fusion/basic.fusion
@@ -1,12 +1,12 @@
 include: SomeFile.fusion
-//<- @include
-//       ^ @text.uri
+//<- @keyword.import
+//       ^ @string.special.url
 
 namespace: ns = Neos.Fusion.Space
 //<- @keyword
-//         ^ @namespace
+//         ^ @module
 //            ^ @operator
-//              ^ @namespace
+//              ^ @module
 
 prototype(MyType) < prototype(ns:SuperType) {
 //<-keyword
@@ -14,7 +14,7 @@ prototype(MyType) < prototype(ns:SuperType) {
 //        ^ @type
 //              ^ @punctuation.bracket
 //                ^ @operator
-//                            ^ @namespace
+//                            ^ @module
 //                                ^ @type
 
   deleteProp >
@@ -48,12 +48,12 @@ prototype(MyType) < prototype(ns:SuperType) {
 
   property.aliasedType = ns:SomeType
   //<- @property
-  //                     ^ @namespace
+  //                     ^ @module
   //                        ^ @type
 
   property.fullQualifiedType = SomeNamespace:SomeType
   //<- @property
-  //                           ^ @namespace
+  //                           ^ @module
   //                                         ^ @type
 
 }
diff --git a/tests/query/highlights/fusion/expressions.fusion b/tests/query/highlights/fusion/expressions.fusion
index ae6e2db33..b1822dda8 100644
--- a/tests/query/highlights/fusion/expressions.fusion
+++ b/tests/query/highlights/fusion/expressions.fusion
@@ -76,7 +76,7 @@ logic = ${!foo && !(bar || baz) and not 'string'}
 //                              ^operator
 
 ternary = ${ check ? true : false}
-//                 ^@conditional.ternary
-//                        ^@conditional.ternary
+//                 ^@keyword.conditional.ternary
+//                        ^@keyword.conditional.ternary
 
 
diff --git a/tests/query/highlights/gitattributes/test.gitattributes b/tests/query/highlights/gitattributes/test.gitattributes
index a16c233e6..4595b94f2 100644
--- a/tests/query/highlights/gitattributes/test.gitattributes
+++ b/tests/query/highlights/gitattributes/test.gitattributes
@@ -1,5 +1,5 @@
 [attr]nodiff -diff -merge
-# <- @preproc
+# <- @keyword.directive
 #     ^^^^^^ @property
 #            ^ @operator
 #             ^^^^ @variable.builtin
@@ -9,7 +9,7 @@
 vendor/** linguist-vendored=true
 #     ^ @punctuation.delimiter
 #      ^^ @character.special
-#         ^^^^^^^^^^^^^^^^^ @parameter
+#         ^^^^^^^^^^^^^^^^^ @variable.parameter
 #                          ^ @operator
 #                           ^^^^ @boolean
 
@@ -22,7 +22,7 @@ vendor/** linguist-vendored=true
 #        ^^^^^^^^^ @constant
 #                 ^ @punctuation.bracket
 #                   ^ @operator
-#                    ^^^^^^^^^^ @parameter
+#                    ^^^^^^^^^^ @variable.parameter
 
 "_\u4E00\t\56txt" encoding=UTF-16
 # <- @punctuation.special
diff --git a/tests/query/highlights/gleam/assert.gleam b/tests/query/highlights/gleam/assert.gleam
index d36716a3f..8be39923d 100644
--- a/tests/query/highlights/gleam/assert.gleam
+++ b/tests/query/highlights/gleam/assert.gleam
@@ -1,6 +1,6 @@
 pub fn main() {
   assert Ok(i) = parse_int("123")
-  // <- @exception
+  // <- @keyword.exception
   //     ^^ @constructor
   //       ^ @punctuation.bracket
   //        ^ @variable
diff --git a/tests/query/highlights/gleam/function.gleam b/tests/query/highlights/gleam/function.gleam
index aed4879dc..ff2b690ca 100644
--- a/tests/query/highlights/gleam/function.gleam
+++ b/tests/query/highlights/gleam/function.gleam
@@ -3,11 +3,11 @@ pub fn add(x: Int, y: Int) -> Int {
 //  ^^ @keyword.function
 //     ^^^ @function
 //        ^ @punctuation.bracket
-//         ^ @parameter
+//         ^ @variable.parameter
 //          ^ @punctuation.delimiter
 //            ^^^ @type.builtin
 //               ^ @punctuation.delimiter
-//                 ^ @parameter
+//                 ^ @variable.parameter
 //                  ^ @punctuation.delimiter
 //                    ^^^ @type.builtin
 //                       ^ @punctuation.bracket
@@ -22,7 +22,7 @@ pub fn twice(f: fn(t) -> t, x: t) -> t {
 //  ^ @keyword.function
 //     ^^^^^ @function
 //          ^ @punctuation.bracket
-//           ^ @parameter
+//           ^ @variable.parameter
 //            ^ @punctuation.delimiter
 //              ^^ @keyword.function
 //                ^ @punctuation.bracket
@@ -31,7 +31,7 @@ pub fn twice(f: fn(t) -> t, x: t) -> t {
 //                    ^^ @punctuation.delimiter
 //                       ^ @type
 //                        ^ @punctuation.delimiter
-//                          ^ @parameter
+//                          ^ @variable.parameter
 //                           ^ @punctuation.delimiter
 //                             ^ @type
 //                              ^ @punctuation.bracket
@@ -45,7 +45,7 @@ fn list_of_two(my_value: a) -> List(a) {
 // <- @keyword.function
 // ^ @function
 //            ^ @punctuation.bracket
-//             ^ @parameter
+//             ^ @variable.parameter
 //                     ^ @punctuation.delimiter
 //                       ^ @type
 //                        ^ @punctuation.bracket
@@ -64,19 +64,19 @@ fn replace(
 //        ^ @punctuation.bracket
   in string: String,
   // <- @label
-  // ^^^^^^ @parameter
+  // ^^^^^^ @variable.parameter
   //       ^ @punctuation.delimiter
   //         ^^^^^^ @type.builtin
   //               ^ @punctuation.delimiter
   each pattern: String,
   // <- @label
-  //   ^^^^^^^ @parameter
+  //   ^^^^^^^ @variable.parameter
   //          ^ @punctuation.delimiter
   //            ^^^^^^ @type.builtin
   //                  ^ @punctuation.delimiter
   with replacement: String,
   // <- @label
-  //   ^^^^^^^^^^^ @parameter
+  //   ^^^^^^^^^^^ @variable.parameter
   //              ^ @punctuation.delimiter
   //                ^^^^^^ @type.builtin
   //                      ^ @punctuation.delimiter
@@ -109,7 +109,7 @@ pub external fn random_float() -> Float = "rand" "uniform"
 //                             ^^ @punctuation.delimiter
 //                                ^^^^^ @type.builtin
 //                                      ^ @operator
-//                                        ^^^^^^ @namespace
+//                                        ^^^^^^ @module
 //                                               ^^^^^^^^^ @function
 
 pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
@@ -123,5 +123,5 @@ pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
 //                         ^^ @punctuation.delimiter
 //                            ^ @type
 //                              ^ @operator
-//                                ^^^^^^^^^^^ @namespace
+//                                ^^^^^^^^^^^ @module
 //                                            ^^^^^^^^^ @function
diff --git a/tests/query/highlights/gleam/import.gleam b/tests/query/highlights/gleam/import.gleam
index 3ee141513..ac452d157 100644
--- a/tests/query/highlights/gleam/import.gleam
+++ b/tests/query/highlights/gleam/import.gleam
@@ -1,18 +1,18 @@
 import gleam/io
-// <- @include
-//     ^ @namespace
+// <- @keyword.import
+//     ^ @module
 //          ^ @operator
-//           ^ @namespace
+//           ^ @module
 
 import cat as kitten
-// <- @include
-//     ^ @namespace
+// <- @keyword.import
+//     ^ @module
 //         ^ @keyword
-//            ^ @namespace
+//            ^ @module
 
 import animal/cat.{Cat, stroke}
-// <- @include
-//     ^ @namespace
+// <- @keyword.import
+//     ^ @module
 //           ^ @operator
 //               ^ @punctuation.delimiter
 //                ^ @punctuation.bracket
diff --git a/tests/query/highlights/hack/as-foreach.hack b/tests/query/highlights/hack/as-foreach.hack
index d7a66875b..611027131 100644
--- a/tests/query/highlights/hack/as-foreach.hack
+++ b/tests/query/highlights/hack/as-foreach.hack
@@ -1,5 +1,5 @@
 foreach (($array as vec[]) as $item) {}
-// ^ @repeat
+// ^ @keyword.repeat
 //                   ^ @type
 
 # Our expectation test for the code below intentionally includes an ERROR.
diff --git a/tests/query/highlights/hack/generics.hack b/tests/query/highlights/hack/generics.hack
index 66b008aa4..fc41a86a9 100644
--- a/tests/query/highlights/hack/generics.hack
+++ b/tests/query/highlights/hack/generics.hack
@@ -7,15 +7,15 @@ class Box<T> {
 
   public function __construct(T $data) {
   //                          ^ @type
-  //                             ^ @parameter
+  //                             ^ @variable.parameter
   //        ^ @keyword.function
   // ^ @type.qualifier
-  //                    ^ @method
+  //                    ^ @function.method
     $this->data = $data;
   }
 
   public function getData(): T {
-                // ^ @method
+                // ^ @function.method
   // ^ @type.qualifier
     return $this->data;
               // ^ @operator
diff --git a/tests/query/highlights/hack/shapes.hack b/tests/query/highlights/hack/shapes.hack
index bc8732433..f111689d0 100644
--- a/tests/query/highlights/hack/shapes.hack
+++ b/tests/query/highlights/hack/shapes.hack
@@ -1,7 +1,7 @@
 class C extends Superclass implements Iface {
 //      ^ @keyword          ^ @keyword
   use Trait;
-  // <- @include
+  // <- @keyword.import
   const type X = shape(
   // <- @keyword ^ @type.builtin
     "a" => int,
diff --git a/tests/query/highlights/hack/use.hack b/tests/query/highlights/hack/use.hack
index 353838a18..0b1fde364 100644
--- a/tests/query/highlights/hack/use.hack
+++ b/tests/query/highlights/hack/use.hack
@@ -8,21 +8,21 @@ use type Space\Type\T;
 //  ^ @keyword
 use namespace Space\Name\N as M;
 //  ^ @keyword
-//             ^ @namespace
+//             ^ @module
 
 use namespace Space\Name2\N2, Space\Nothing\N3 as N8, type Space\Type2\N4,;
-//                        ^ @namespace
+//                        ^ @module
 //                                                                      ^ @type
 use namespace Space\Name\N10\{A as A2, B\};
-//                        ^ @namespace
-//                                     ^ @namespace
-//                                 ^ @namespace
+//                        ^ @module
+//                                     ^ @module
+//                                 ^ @module
 use namespace Space\Name\{\C, Slash as Forward};
 
 use \What\Is\This\{function A as A2, B, const H\S\L as stdlib, function F};
 
 use type \{kind,};
 use Q\B\{kind2,};
-//    ^ @namespace
+//    ^ @module
 use type Q\B\{kind3,};
-// <- @include
+// <- @keyword.import
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
index bf7e939a0..7734a448b 100644
--- a/tests/query/highlights/haskell/test.hs
+++ b/tests/query/highlights/haskell/test.hs
@@ -1,33 +1,33 @@
 {-# LANGUAGE QuasiQuotes #-}
--- ^ @preproc
+-- ^ @keyword.directive
 
 module Main 
--- ^ @include
-     -- ^ @namespace
+-- ^ @keyword.import
+     -- ^ @module
   ( main
   ) where
    -- ^ @keyword
 
 import Prelude hiding (show)
--- ^ @include
-      -- ^ @namespace
+-- ^ @keyword.import
+      -- ^ @module
               -- ^ @keyword
                       -- ^ @variable
 import Data.Map (fromList)
-      -- ^ @namespace
+      -- ^ @module
 import qualified Data.Map as Map
                 -- ^ @constructor
-                           -- ^ @namespace
+                           -- ^ @module
 import qualified Chronos
-                -- ^ @namespace
+                -- ^ @module
 import qualified Chronos as C
                 -- ^ @constructor
-                         -- ^ @namespace
+                         -- ^ @module
 import FooMod (BarTy (barField))
-                      -- ^ @field
+                      -- ^ @variable.member
 
 x = mempty { field = 5 }
-           -- ^ @field
+           -- ^ @variable.member
 
 data ADT
 -- ^ @keyword
@@ -62,31 +62,31 @@ newtype Rec
   -- ^ @constructor
     { field :: Double
  -- ^ @punctuation.bracket
-    -- ^ @field
+    -- ^ @variable.member
               -- ^ @type
     }
  -- ^ @punctuation.bracket
     deriving Eq
            -- ^ @type
 recordWildCard Rec { field } = field
-                    -- ^ @field
+                    -- ^ @variable.member
 recordDotSyntax rec = rec.field
-                        -- ^ @field
+                        -- ^ @variable.member
 
 
 main :: IO ()
 -- ^ @function
   -- ^ @operator
      -- ^ @type
-         -- ^ @symbol
+         -- ^ @string.special.symbol
 main = undefined
 -- ^ @function
-      -- ^ @exception
+      -- ^ @keyword.exception
 
 someFunc0 :: Int -> Int
               -- ^ @operator
 someFunc0 x = someFunc1 x
-       -- ^ @parameter
+       -- ^ @variable.parameter
             -- ^ @function.call
   where
   -- ^ @keyword
@@ -94,9 +94,9 @@ someFunc0 x = someFunc1 x
     -- ^ @function
                -- ^ @number
 scopedTypeParam (x :: Int) = someFunc x
-              -- ^ @parameter
+              -- ^ @variable.parameter
 scopedTypeParam (Just x :: Int) = someFunc x
-                   -- ^ @parameter
+                   -- ^ @variable.parameter
 
 someInfix :: Integral a => a -> Double
             -- ^ @type
@@ -118,7 +118,7 @@ someInfix x = fromIntegral x `myAdd` floatVal
     -- ^ @variable
     floatVal = 5.5
     -- ^ @variable
-            -- ^ @float
+            -- ^ @number.float
     intVal :: Int
     -- ^ @variable
     intVal = getInt 5
@@ -138,12 +138,12 @@ someInfix x = fromIntegral x `myAdd` floatVal
     isInt :: Either Double Int -> Bool
     -- ^ @function
     isInt eith@Left{} = False
-        -- ^ @parameter
+        -- ^ @variable.parameter
     isInt eith@(Left x) = False
     -- ^ @function
-                  -- ^ @parameter
+                  -- ^ @variable.parameter
     isInt (Left x) = False
-             -- ^ @parameter
+             -- ^ @variable.parameter
     isInt (Right _) = True
     -- ^ @function
 
@@ -153,19 +153,19 @@ someIOaction = do
             -- ^ @keyword
   foo <- SomeModule.someFun <$> getArgs
 -- ^ @variable
-            -- ^ @namespace
+            -- ^ @module
                    -- ^ @function.call
                           -- ^ @operator
   _ <- someFunc0 =<< someIOAction
         -- ^ @function.call
   let bar = SomeModule.doSomething $ "a" "b"
     -- ^ @variable
-            -- ^ @namespace
+            -- ^ @module
                         -- ^ @function.call
                                 -- ^ @operator
       func x y = x + y - 7
     -- ^ @function
-        -- ^ @parameter
+        -- ^ @variable.parameter
               -- ^ @variable
                   -- ^ @variable
       gunc x y = func x $ y + 7
@@ -216,26 +216,26 @@ condVal = if otherwise
             else True
 
 getLambda x = \y -> x `SomeModule.someInfix` y
-            -- ^ @parameter
-                      -- ^ @namespace
+            -- ^ @variable.parameter
+                      -- ^ @module
                                   -- ^ @operator
 lambdaTyped = \(y :: Int) -> x
-             -- ^ @parameter
+             -- ^ @variable.parameter
 lambdaPattern = \(Just x) -> x
-                    -- ^ @parameter
+                    -- ^ @variable.parameter
 lambdaPatternTyped = \(Just x :: Int) -> x
-                         -- ^ @parameter
+                         -- ^ @variable.parameter
 
 isVowel = (`elem` "AEIOU")
           -- ^ @operator
 isVowelQualified = (`SomeModule.elem` "AEIOU")
-                      -- ^ @namespace
+                      -- ^ @module
                               -- ^ @operator
 
 hasVowels = ("AEIOU" `elem`)
                    -- ^ @operator
 hasVowelsQualified = ("AEIOU" `SomeModule.elem`)
-                            -- ^ @namespace
+                            -- ^ @module
                                        -- ^ @operator
 
 quasiQuotedString = [qq|Some string|]
@@ -243,7 +243,7 @@ quasiQuotedString = [qq|Some string|]
                    -- ^ @function.call
                       -- ^ @string
 quasiQuotedString2 = [SomeModule.qq|Some string|]
-                        -- ^ @namespace
+                        -- ^ @module
                               -- ^ @function.call
 
 composition f g = f . g
@@ -270,42 +270,42 @@ appliedComposition f g var = (NS.f . NS.g) var
                               -- ^ @function.call
                                      -- ^ @function.call
 param1 |*| param2 = Qu $ param1 * param2
--- ^ @parameter
-         -- ^ @parameter
+-- ^ @variable.parameter
+         -- ^ @variable.parameter
 (param1 :: Int) |*| (param2 :: Int) = Qu $ param1 * param2
--- ^ @parameter
-                   -- ^ @parameter
+-- ^ @variable.parameter
+                   -- ^ @variable.parameter
 (Qu a) |/| (SomeModule.Qu b) = a / b
- -- ^ @parameter
-                       -- ^ @parameter
+ -- ^ @variable.parameter
+                       -- ^ @variable.parameter
 (Qu a :: Int) |/| (SomeModule.Qu b :: Int) = a / b
- -- ^ @parameter
-                              -- ^ @parameter
+ -- ^ @variable.parameter
+                              -- ^ @variable.parameter
 (Qu a, b, c :: Int) |/| x = undefined
- -- ^ @parameter
-    -- ^ @parameter
-       -- ^ @parameter
+ -- ^ @variable.parameter
+    -- ^ @variable.parameter
+       -- ^ @variable.parameter
 [Qu a, b, c :: Int] >< x = undefined
- -- ^ @parameter
-    -- ^ @parameter
-       -- ^ @parameter
+ -- ^ @variable.parameter
+    -- ^ @variable.parameter
+       -- ^ @variable.parameter
 listParam [a, b :: Int, Just c] = undefined
-        -- ^ @parameter
-           -- ^ @parameter
-                          -- ^ @parameter
+        -- ^ @variable.parameter
+           -- ^ @variable.parameter
+                          -- ^ @variable.parameter
 tupleParam (a :: Int, b, Just c) = undefined
-         -- ^ @parameter
-                   -- ^ @parameter
-                           -- ^ @parameter
+         -- ^ @variable.parameter
+                   -- ^ @variable.parameter
+                           -- ^ @variable.parameter
 listLambda = \[a, a :: Int, Just c] -> undefined
-            -- ^ @parameter
-               -- ^ @parameter
-                              -- ^ @parameter
+            -- ^ @variable.parameter
+               -- ^ @variable.parameter
+                              -- ^ @variable.parameter
 tupleLambda = \(a, b :: Int, Just c) -> undefined
-             -- ^ @parameter
-                -- ^ @parameter
+             -- ^ @variable.parameter
+                -- ^ @variable.parameter
 nestedDestructure (Left (Just a)) = undefined
-                           -- ^ @parameter
+                           -- ^ @variable.parameter
 typeApplication x y = someFun @ty x y
                                -- ^ @variable
                                  -- ^ @variable
@@ -317,9 +317,9 @@ recordUpdate x y rec = someFun rec {field = 5} (x, x) y
                                                    -- ^ @variable
 viewPattern (func -> var) = 5
            -- ^ @function.call
-                   -- ^ @parameter
+                   -- ^ @variable.parameter
 g (func :: a -> b) x = func y
-  -- ^ @parameter
+  -- ^ @variable.parameter
   -- ^ @function
 lambdaAlias :: LambdaAlias
 lambdaAlias _ _ _ = undefined
diff --git a/tests/query/highlights/hocon/test.conf b/tests/query/highlights/hocon/test.conf
index acfe4f975..55f4c03e7 100644
--- a/tests/query/highlights/hocon/test.conf
+++ b/tests/query/highlights/hocon/test.conf
@@ -1,5 +1,5 @@
 HOCON = Human-Optimized Config Object Notation
-// ^ @field
+// ^ @variable.member
 //        ^ @string
 //                       ^ @string
 //                              ^ @string
@@ -31,7 +31,7 @@ specs url: "https://github.com/lightbend/config/blob/master/HOCON.md"
 includes: { 
   include required(file("~/prog/tree-sitter-hocon/grammar.js")) 
 //         ^ @keyword
-//^ @include
+//^ @keyword.import
 //                ^ @punctuation.bracket
 //                                                           ^ @punctuation.bracket
   override = true
diff --git a/tests/query/highlights/markdown/test.md b/tests/query/highlights/markdown/test.md
index 20953a863..87b28520e 100644
--- a/tests/query/highlights/markdown/test.md
+++ b/tests/query/highlights/markdown/test.md
@@ -1,28 +1,28 @@
 # H1
-<!-- <- @text.title.1.marker -->
+<!-- <- @markup.heading.1.marker -->
 
 ## H2
-<!-- <- @text.title.2.marker -->
+<!-- <- @markup.heading.2.marker -->
 
 - Item 1
 - Item 2
-<!-- <- @punctuation.special -->
+<!-- <- @markup.list -->
 
 1. Item 1
 2. Item 2
-<!-- <- @punctuation.special -->
+<!-- <- @markup.list -->
 
 ----![image_description](https://example.com/image.jpg "awesome image title")
-<!--  ^ @text.reference                                                    -->
-<!--                              ^ @text.uri                              -->
-<!--                                                      ^ @text.literal  -->
-<!--^ @punctuation.special                                                 -->
-<!-- ^ @punctuation.bracket                                                -->
-<!--                    ^ @punctuation.bracket                             -->
+<!--  ^ @markup.link.label                                                    -->
+<!--                              ^ @markup.link.url                              -->
+<!--                                                      ^ @markup.link.label  -->
+<!--^ @markup.link                                                 -->
+<!-- ^ @markup.link                                                -->
+<!--                    ^ @markup.link                             -->
 
 [link_text](#local_reference "link go brr...")
-<!-- ^ @text.reference                                                     -->
-<!--                 ^ @text.uri                                           -->
-<!--                            ^ @text.literal                            -->
-<!-- <- @punctuation.bracket                                               -->
-<!--       ^ @punctuation.bracket                                          -->
+<!-- ^ @markup.link.label                                                     -->
+<!--                 ^ @markup.link.url                                           -->
+<!--                            ^ @markup.link.label                            -->
+<!-- <- @markup.link                                               -->
+<!--       ^ @markup.link                                          -->
diff --git a/tests/query/highlights/nix/test.nix b/tests/query/highlights/nix/test.nix
index d5fb13de8..8ab067a2e 100644
--- a/tests/query/highlights/nix/test.nix
+++ b/tests/query/highlights/nix/test.nix
@@ -1,16 +1,16 @@
 {
   func1 = param: builtins.readFile param;
   # ^ @function
-        # ^ @parameter
+        # ^ @variable.parameter
                 # ^ @constant.builtin
                          # ^ @function.builtin
   func2 = { p1, p2 }: p2;
   # ^ @function
-          # ^ @parameter
+          # ^ @variable.parameter
   readFile' = readFile;
               # ^ @function.builtin
   x = func1 ./path/to/file.nix;
-# ^ @field
+# ^ @variable.member
       # ^ @function.call
-              # ^ @string.special
+              # ^ @string.special.path
 }
diff --git a/tests/query/highlights/python/fields.py b/tests/query/highlights/python/fields.py
index fb36a6311..deb280622 100644
--- a/tests/query/highlights/python/fields.py
+++ b/tests/query/highlights/python/fields.py
@@ -3,10 +3,10 @@ class Fields:
 #                                   ^^^ @type.builtin
 #                                            ^^^^ @constant.builtin
         self.fields = fields
-#            ^^^^^^ @field
+#            ^^^^^^ @variable.member
         self.__dunderfield__ = None
-#            ^^^^^^^^^^^^^^^ @field
+#            ^^^^^^^^^^^^^^^ @variable.member
         self._FunKyFielD = 0
-#            ^^^^^^^^^^^ @field
+#            ^^^^^^^^^^^ @variable.member
         self.NOT_A_FIELD = "IM NOT A FIELD"
 #            ^^^^^^^^^^^ @constant
diff --git a/tests/query/highlights/python/future_import.py b/tests/query/highlights/python/future_import.py
index 7495588a9..6790b9b6b 100644
--- a/tests/query/highlights/python/future_import.py
+++ b/tests/query/highlights/python/future_import.py
@@ -1,4 +1,4 @@
 from __future__ import print_function
-# ^ @include
+# ^ @keyword.import
 #     ^ @constant.builtin
-#                  ^ @include
+#                  ^ @keyword.import
diff --git a/tests/query/highlights/python/pattern_matching.py b/tests/query/highlights/python/pattern_matching.py
index cd359a48f..2762781b0 100644
--- a/tests/query/highlights/python/pattern_matching.py
+++ b/tests/query/highlights/python/pattern_matching.py
@@ -1,29 +1,29 @@
 match command.split():
-# ^ @conditional
+# ^ @keyword.conditional
     case ["quit"]:
-    # ^ @conditional
+    # ^ @keyword.conditional
         print("Goodbye!")
         quit_game()
     case ["look"]:
-    # ^ @conditional
+    # ^ @keyword.conditional
         current_room.describe()
     case ["get", obj]:
-    # ^ @conditional
+    # ^ @keyword.conditional
         character.get(obj, current_room)
     case ["go", direction]:
-    # ^ @conditional
+    # ^ @keyword.conditional
         current_room = current_room.neighbor(direction)
     # The rest of your commands go here
 
 match command.split():
-# ^ @conditional
+# ^ @keyword.conditional
     case ["drop", *objects]:
-    # ^ @conditional
+    # ^ @keyword.conditional
         for obj in objects:
             character.drop(obj, current_room)
 
 match command.split():
-# ^ @conditional
+# ^ @keyword.conditional
     case ["quit"]: ... # Code omitted for brevity
     case ["go", direction]: pass
     case ["drop", *objects]: pass
@@ -32,12 +32,12 @@ match command.split():
                                                    # ^^ @@function.macro
 
 match command.split():
-# ^ @conditional
+# ^ @keyword.conditional
     case ["north"] | ["go", "north"]:
-    # ^ @conditional
+    # ^ @keyword.conditional
         current_room = current_room.neighbor("north")
     case ["get", obj] | ["pick", "up", obj] | ["pick", obj, "up"]:
-    # ^ @conditional
+    # ^ @keyword.conditional
         pass
 
 match = 2
diff --git a/tests/query/highlights/python/raise_from.py b/tests/query/highlights/python/raise_from.py
index 8a48a222b..fb30f4252 100644
--- a/tests/query/highlights/python/raise_from.py
+++ b/tests/query/highlights/python/raise_from.py
@@ -2,5 +2,5 @@ try:
     print(1 / 0)
 except Exception:
     raise RuntimeError from None
-    # ^ @exception
-    #                   ^ @exception
+    # ^ @keyword.exception
+    #                   ^ @keyword.exception
diff --git a/tests/query/highlights/python/yield_from.py b/tests/query/highlights/python/yield_from.py
index 2f3238379..6ada002c6 100644
--- a/tests/query/highlights/python/yield_from.py
+++ b/tests/query/highlights/python/yield_from.py
@@ -1,6 +1,6 @@
 from foo import bar
-# ^ @include
-#           ^ @include
+# ^ @keyword.import
+#           ^ @keyword.import
 def generator():
     yield from bar(42)
     # ^ @keyword.return
diff --git a/tests/query/highlights/r/test.r b/tests/query/highlights/r/test.r
index b6bfd1ff5..c67df6096 100644
--- a/tests/query/highlights/r/test.r
+++ b/tests/query/highlights/r/test.r
@@ -1,7 +1,7 @@
 init <- 1
 # ^ @variable
 #     ^ @operator
-#       ^ @float
+#       ^ @number.float
 
 r"{(\1\2)}" -> `%r%`
 #  ^ @string
@@ -21,27 +21,27 @@ b <- list(TRUE, FALSE, NA, Inf)
 #                           ^ @constant.builtin
 
 b <- list(name = "r", version = R.version$major)
-#          ^ @parameter
+#          ^ @variable.parameter
 #                 ^ @string
 #                                        ^ @operator
-#                                           ^ @field
+#                                           ^ @variable.member
 
 Lang$new(name = "r")$print()
-#     ^ @method.call
+#     ^ @function.method.call
 
 for(i in 1:10) {
-# <- @repeat
-#      ^ @repeat
+# <- @keyword.repeat
+#      ^ @keyword.repeat
 }
 
 add <- function(a, b = 1, ...) {
 #        ^ @keyword.function
-#               ^ @parameter
-#                  ^ @parameter
+#               ^ @variable.parameter
+#                  ^ @variable.parameter
 #                         ^ @keyword
   return(a + b)
 }
 
 base::letters
-# ^ @namespace
+# ^ @module
 #        ^ @variable
diff --git a/tests/query/highlights/rust/for.rs b/tests/query/highlights/rust/for.rs
index 27f072847..e8c085fa3 100644
--- a/tests/query/highlights/rust/for.rs
+++ b/tests/query/highlights/rust/for.rs
@@ -9,7 +9,7 @@ impl Drop for Foo {
 
 fn main() {
     for i in 0..128 {
-    // <- @repeat
+    // <- @keyword.repeat
         println!("{i}");
     }
 }
diff --git a/tests/query/highlights/rust/super-crate-imports.rs b/tests/query/highlights/rust/super-crate-imports.rs
index 59354a32c..93263098e 100644
--- a/tests/query/highlights/rust/super-crate-imports.rs
+++ b/tests/query/highlights/rust/super-crate-imports.rs
@@ -1,12 +1,12 @@
 use crate::a;
-//  ^ @namespace
+//  ^ @module
 //  ^ !keyword
 use crate::{b, c};
-//  ^ @namespace
+//  ^ @module
 //  ^ !keyword
 use super::a;
-//  ^ @namespace
+//  ^ @module
 //  ^ !keyword
 use super::{b, c};
-//  ^ @namespace
+//  ^ @module
 //  ^ !keyword
diff --git a/tests/query/highlights/smali/baksmali_test_class.smali b/tests/query/highlights/smali/baksmali_test_class.smali
index 77eb0c83b..6412f8784 100644
--- a/tests/query/highlights/smali/baksmali_test_class.smali
+++ b/tests/query/highlights/smali/baksmali_test_class.smali
@@ -7,18 +7,18 @@
 #           ^ @punctuation.delimiter
 
 .source "baksmali_test_class.smali"
-# <- @include
+# <- @keyword.import
 
 .implements Lsome/interface;
 .implements Lsome/other/interface;
 
 
 .annotation build Lsome/annotation;
-#           ^^^^^ @storageclass
+#           ^^^^^ @keyword.storage
 #                  ^^^^ @type
 #                                 ^ @punctuation.delimiter
     value1 = "test"
-#   ^^^^^^ @field
+#   ^^^^^^ @variable.member
 #          ^ @operator
 #            ^^^^^^ @string
     value2 = .subannotation Lsome/annotation;
@@ -50,7 +50,7 @@
 .field public static byteNegStaticField:B = 0xAAt
 
 .field public static floatStaticField:F = 3.1415926f
-#                                         ^^^^^^^^^^ @float
+#                                         ^^^^^^^^^^ @number.float
 
 .field public static doubleStaticField:D = 3.141592653589793
 
@@ -73,7 +73,7 @@
 
 .field public static methodStaticField:Ljava/lang/reflect/Method; = Lbaksmali/test/class;->testMethod(ILjava/lang/String;)Ljava/lang/String;
 #                                                                                        ^^ @punctuation.delimiter
-#                                                                                          ^^^^^^^^^^ @method.call
+#                                                                                          ^^^^^^^^^^ @function.method.call
 
 .field public static arrayStaticField:[I = {1, 2, 3, {1, 2, 3, 4}}
 #                                     ^ @punctuation.special
@@ -81,7 +81,7 @@
 #                                            ^ @punctuation.delimiter
 
 .field public static enumStaticField:Lsome/enum; = .enum Lsome/enum;->someEnumValue:Lsome/enum;
-#                                                                     ^^^^^^^^^^^^^ @field
+#                                                                     ^^^^^^^^^^^^^ @variable.member
 
 .field public static annotationStaticField:Lsome/annotation; = .subannotation Lsome/annotation;
     value1 = "test"
@@ -93,7 +93,7 @@
 
 .field public static staticFieldWithAnnotation:I
     .annotation runtime La/field/annotation;
-#               ^^^^^^^ @storageclass
+#               ^^^^^^^ @keyword.storage
         this = "is"
         a = "test"
     .end annotation
@@ -112,13 +112,13 @@
     .registers 1
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 #   ^^^^^^^^^^^^^ @keyword.operator
-#                  ^^ @parameter.builtin
+#                  ^^ @variable.parameter.builtin
     return-void
 #   ^^^^^^^^^^^ @keyword.return
 .end method
 
 .method public testMethod(ILjava/lang/String;)Ljava/lang/String;
-#              ^^^^^^^^^^ @method
+#              ^^^^^^^^^^ @function.method
     .registers 3
     .annotation runtime Lorg/junit/Test;
     .end annotation
@@ -144,9 +144,9 @@
     nop
     try_end:
     .catch Ljava/lang/Exception; {try_start: .. try_end:} handler:
-#   ^^^^^^ @exception
+#   ^^^^^^ @keyword.exception
     .catchall {try_start: .. try_end:} handler2:
-#   ^^^^^^^^^ @exception
+#   ^^^^^^^^^ @keyword.exception
 #                         ^^ @operator
 
     handler:
@@ -232,9 +232,9 @@
     nop
 
     .source "somefile.java"
-#   ^^^^^^^ @include
+#   ^^^^^^^ @keyword.import
     .line 101
-#         ^^^ @text.literal
+#         ^^^ @string.special
 
     nop
 
diff --git a/tests/query/highlights/solidity/test.sol b/tests/query/highlights/solidity/test.sol
index 99117bb55..b53dd857d 100644
--- a/tests/query/highlights/solidity/test.sol
+++ b/tests/query/highlights/solidity/test.sol
@@ -3,11 +3,11 @@
 // SPDX-License-Identifier: GPL-3.0
 // ^ @comment
 pragma solidity >=0.7.0 <0.9.0;
-// ^ @preproc
-//     ^ @preproc
+// ^ @keyword.directive
+//     ^ @keyword.directive
 
 import * as something from "anotherFile";
-// ^     ^            ^ @include
+// ^     ^            ^ @keyword.import
 
 /// @title Voting with delegation.
 // <- @comment
@@ -21,7 +21,7 @@ contract Ballot {
 //         ^ @type
         uint weight; // weight is accumulated by delegation
 //      ^ @type.builtin
-//           ^ @field
+//           ^ @variable.member
         bool voted;  // if true, that person already voted
         address delegate; // person delegated to
         uint vote;   // index of the voted proposal
@@ -63,7 +63,7 @@ contract Ballot {
             // appends it to the end of `proposals`.
             proposals.push(Proposal({
                 name: proposalNames[i],
-//              ^ @field
+//              ^ @variable.member
                 voteCount: 0
             }));
         }
@@ -74,7 +74,7 @@ contract Ballot {
     function giveRightToVote(address voter) external {
 //  ^ @keyword.function
 //           ^ @function
-//                                   ^ @parameter
+//                                   ^ @variable.parameter
         // If the first argument of `require` evaluates
         // to `false`, execution terminates and all
         // changes to the state and to Ether balances
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
index a4013d72f..f04df3ed1 100644
--- a/tests/query/highlights/t32/keywords.cmm
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -3,15 +3,15 @@ PRIVATE &password
 ;        ^ @variable.builtin
 ENTRY &password
 ; <- @keyword
-;        ^ @parameter
+;        ^ @variable.parameter
 
 ENTRY %LINE &salt
 ; <- @keyword
 ;      ^ @constant.builtin
-;            ^ @parameter
+;            ^ @variable.parameter
 
 IF "&password"==""
-; <- @conditional
+; <- @keyword.conditional
 ;  ^ @string
 ;    ^ @variable.builtin
 ;             ^ @operator
@@ -21,7 +21,7 @@ IF "&password"==""
 ;   ^ @keyword.return
 )
 ELSE
-; <- @conditional
+; <- @keyword.conditional
 (
     PRIVATE &pass
 
@@ -33,9 +33,9 @@ ELSE
         GOSUB verify_password "&password"
 ;             ^ @function.call
         RETURNVALUES &pass
-;                     ^ @parameter
+;                     ^ @variable.parameter
         WAIT 10.ms
-;            ^ @float
+;            ^ @number.float
     )
 
     IF !&pass
@@ -63,7 +63,7 @@ FramePOS ,,,,Maximized
 ;        ^ @punctuation.delimiter
 ;            ^ @constant.builtin
 WinPOS 0% 50% 100% 35%
-;      ^ @float
+;      ^ @number.float
 COVerage.ListFunc
 
 ENDDO
@@ -80,11 +80,11 @@ verify_password:
 ; <- @function
 (
     PARAMETERS &password
-;               ^ @parameter
+;               ^ @variable.parameter
 
     SYStem.Option.KEYCODE "&password"
     SYStem.JtagClock  1kHz
-;                     ^ @float
+;                     ^ @number.float
     SYStem.Mode.Attach
 
     Data.Set N: EAXI:0x34000000 %Long 0x34000100 0x34000021 /verify
@@ -107,7 +107,7 @@ SUBROUTINE start_debug
     COVerage.ListModule %MULTI.OBC \sieve
 ;    ^ @keyword
 ;                        ^ @constant.builtin
-;                                  ^ @symbol
+;                                  ^ @string.special.symbol
 
     Var.DRAW flags[0..16] /Alternate 3
 ;    ^ @keyword
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
index 8c63ce96d..a9d72e441 100644
--- a/tests/query/highlights/t32/literals.cmm
+++ b/tests/query/highlights/t32/literals.cmm
@@ -8,19 +8,19 @@ sYmbol.NEW _InitialSP   0x34000100
 ;                       ^ @number
 
 DO ~~~~/test.cmm
-;  ^ @string.special
+;  ^ @string.special.path
 
 WAIT 1.ns
-;    ^ @float
+;    ^ @number.float
 
 SYStem.JtagClock  100.GHZ
-;                 ^ @float
+;                 ^ @number.float
 
 DATA.SET P:&HEAD+0x4 %LONG DATA.LONG(EA:&HEAD+0x4)&0xFFFFFF
 ;                                    ^ @constant.builtin
 
 List `main`
-;    ^ @symbol
+;    ^ @string.special.symbol
 
 &range = 'a'--'z'||'0'--'9'
 ;        ^ @character
@@ -34,6 +34,6 @@ Data.Set N: 0xffff800000 0y0011xx01xx&&a
 ;                                    ^ @operator
 
 WinPOS 0% 85% 100% 15%
-;             ^ @float
+;             ^ @number.float
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
index de67278a0..8e251afef 100644
--- a/tests/query/highlights/t32/var.cmm
+++ b/tests/query/highlights/t32/var.cmm
@@ -34,7 +34,7 @@ Var.Assign (*ap)[2..4] = &a
 Var.Assign sp = &s.n+offset
 ;          ^ @variable
 ;                ^ @variable
-;                  ^ @field
+;                  ^ @variable.member
 ;                    ^ @variable
 Var.Assign padd = (CAddition const * volatile)&d
 ;          ^ @variable
diff --git a/tests/query/highlights/tiger/functions.tig b/tests/query/highlights/tiger/functions.tig
index 6505d20fe..706f1991a 100644
--- a/tests/query/highlights/tiger/functions.tig
+++ b/tests/query/highlights/tiger/functions.tig
@@ -1,9 +1,9 @@
 primitive print(s: string)
 /*        ^ @function */
-/*              ^ @parameter */
+/*              ^ @variable.parameter */
 
 function func(a: int) : int = (print("Hello World!"); a)
 /*       ^ @function */
-/*            ^ @parameter */
+/*            ^ @variable.parameter */
 /*                             ^ @function.builtin */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/identifiers.tig b/tests/query/highlights/tiger/identifiers.tig
index e712e57de..e38749071 100644
--- a/tests/query/highlights/tiger/identifiers.tig
+++ b/tests/query/highlights/tiger/identifiers.tig
@@ -22,9 +22,9 @@ var array := int_array[12] of 27;
 /*           ^ @type */
 
 primitive func(a: int, b: string) : array
-/*             ^ @parameter */
+/*             ^ @variable.parameter */
 /*                ^ @type.builtin */
-/*                     ^ @parameter */
+/*                     ^ @variable.parameter */
 /*                        ^ @type.builtin */
 /*                                  ^ @type */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/imports.tig b/tests/query/highlights/tiger/imports.tig
index f20a0bc1a..1c7ce308d 100644
--- a/tests/query/highlights/tiger/imports.tig
+++ b/tests/query/highlights/tiger/imports.tig
@@ -1,4 +1,4 @@
 import "lib.tih"
-/* <- @include */
-/*      ^ @string.special */
+/* <- @keyword.import */
+/*      ^ @string.special.path */
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/keywords.tig b/tests/query/highlights/tiger/keywords.tig
index 7deb0288d..c92cd929a 100644
--- a/tests/query/highlights/tiger/keywords.tig
+++ b/tests/query/highlights/tiger/keywords.tig
@@ -10,7 +10,7 @@ let
   /* <- @keyword.function */
 
   import "lib.tih"
-  /* <- @include */
+  /* <- @keyword.import */
 
   type array_of_int = array of int
   /* <- @keyword */
@@ -28,13 +28,13 @@ in
   /*            ^ @keyword */
 
   for i := 12 to 27 do 42;
-  /* <- @repeat */
-  /*          ^ @repeat */
-  /*                ^ @repeat */
+  /* <- @keyword.repeat */
+  /*          ^ @keyword.repeat */
+  /*                ^ @keyword.repeat */
 
   while 12 do break
-  /* <- @repeat */
-  /*       ^ @repeat */
+  /* <- @keyword.repeat */
+  /*       ^ @keyword.repeat */
   /*          ^ @keyword */
 
 end
diff --git a/tests/query/highlights/tiger/object-oriented.tig b/tests/query/highlights/tiger/object-oriented.tig
index 607efec8c..bf1632485 100644
--- a/tests/query/highlights/tiger/object-oriented.tig
+++ b/tests/query/highlights/tiger/object-oriented.tig
@@ -13,7 +13,7 @@ let
 
     method meth() : int = self.a
     /* <- @keyword.function */
-    /*     ^ @method */
+    /*     ^ @function.method */
     /*                    ^ @variable.builtin */
   }
 
@@ -24,6 +24,6 @@ in
   /*     ^ @property */
 
   object.meth()
-  /*     ^ @method */
+  /*     ^ @function.method */
 end
 /* vim: set ft=tiger: */
diff --git a/tests/query/highlights/typescript/as.ts b/tests/query/highlights/typescript/as.ts
index 71221f410..30be1ffae 100644
--- a/tests/query/highlights/typescript/as.ts
+++ b/tests/query/highlights/typescript/as.ts
@@ -1,8 +1,8 @@
 import * as foo from 'foo';
-//       ^ @include
+//       ^ @keyword.import
 
 export { foo as bar };
-//           ^ @include
+//           ^ @keyword.import
 
 const n = 5 as number;
 //          ^ @keyword.operator
diff --git a/tests/query/highlights/usd/prims.usda b/tests/query/highlights/usd/prims.usda
index eeeeae920..da9a5d6fe 100644
--- a/tests/query/highlights/usd/prims.usda
+++ b/tests/query/highlights/usd/prims.usda
@@ -4,8 +4,8 @@ def Xform "cube" (
         asset[] payloadAssetDependencies = [@fizz.usd@, @buzz.usd@]
         # <- @type
         #       ^ @keyword
-        #                                   ^ @text.uri
-        #                                               ^ @text.uri
+        #                                   ^ @string.special.url
+        #                                               ^ @string.special.url
     }
 )
 {
@@ -13,13 +13,13 @@ def Xform "cube" (
 
 def "root" (
     add references = @foo.usda@</Model> (offset = 1; scale = 2.0)
-                      # <- @text.uri
+                      # <- @string.special.url
                       #        ^ @string.special
                       #                  ^ @keyword
                       #                           ^ @number
                       #                            ^ @punctuation.delimiter
                       #                              ^ @keyword
-                      #                                      ^ @float
+                      #                                      ^ @number.float
 )
 {
 }
@@ -93,7 +93,7 @@ over "Parent" (
     # <- @function.call
     #       ^ @keyword
     #                     ^ @string.special
-    #                                     ^ @text.uri
+    #                                     ^ @string.special.url
     #                                                 ^ @string.special
 )
 {
@@ -107,12 +107,12 @@ def "foo"
     #           ^ @property
       -414: 14.4
       # <- @number
-      #     ^ @float
+      #     ^ @number.float
       10: 201.0,
       # <- @number
-      #   ^ @float
+      #   ^ @number.float
       10.123: 201.0123,
-      # <- @float
-      #       ^ @float
+      # <- @number.float
+      #       ^ @number.float
     }
 }
diff --git a/tests/query/highlights/usd/properties.usda b/tests/query/highlights/usd/properties.usda
index e518c73f7..790ccfab7 100644
--- a/tests/query/highlights/usd/properties.usda
+++ b/tests/query/highlights/usd/properties.usda
@@ -11,11 +11,11 @@ token[] purpose = ["default", "render"]
 
 rel material:binding:collection:Erasers = None
 # <- @type
-#   ^ @namespace
+#   ^ @module
 #           ^ @punctuation.delimiter
-#            ^ @namespace
+#            ^ @module
 #                   ^ @punctuation.delimiter
-#                    ^ @namespace
+#                    ^ @module
 #                              ^ @punctuation.delimiter
 #                               ^ @variable
 #                                         ^ @constant.builtin
diff --git a/tests/query/highlights/usd/subLayers.usda b/tests/query/highlights/usd/subLayers.usda
index 24581b90a..ddd1dd7af 100644
--- a/tests/query/highlights/usd/subLayers.usda
+++ b/tests/query/highlights/usd/subLayers.usda
@@ -3,7 +3,7 @@
     subLayers = [
     # <- @keyword
         @./model_sub.usda@ (offset = 1)
-        # <- @text.uri
+        # <- @string.special.url
         #                   ^ @keyword
     ]
 )
diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
index b102db891..c210fc611 100644
--- a/tests/query/highlights/wing/class.w
+++ b/tests/query/highlights/wing/class.w
@@ -6,7 +6,7 @@ class Foo {
 //    ^   @variable
 //        ^ @punctuation.bracket
   name: str;
-//^    @field
+//^    @variable.member
 //      ^   @type.builtin
 //         ^ @punctuation.delimiter
   new(name:  str) {
diff --git a/tests/query/highlights/wing/nested_method.w b/tests/query/highlights/wing/nested_method.w
index 8a454b34c..4fe5ceb6a 100644
--- a/tests/query/highlights/wing/nested_method.w
+++ b/tests/query/highlights/wing/nested_method.w
@@ -1,4 +1,4 @@
 test1.test2.test3();
 // <- @variable
 //    ^ @property
-//          ^ @method.call
+//          ^ @function.method.call
diff --git a/tests/query/highlights/xhp-intro.hack b/tests/query/highlights/xhp-intro.hack
index ccbe60c57..06f7e30a2 100644
--- a/tests/query/highlights/xhp-intro.hack
+++ b/tests/query/highlights/xhp-intro.hack
@@ -38,7 +38,7 @@ final xhp class a_post extends x\element {
       'document.getElementById("'.$id.'").submit(); return false;',
     );
     $anchor->setAttribute('href', '#');
-    //        ^ @method.call
+    //        ^ @function.method.call
 
     return $form;
   }

From fc0fceb43a8a6dee9ffa669de8b641493e64c276 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 4 Jan 2024 19:18:49 +0100
Subject: [PATCH 0994/2704] test(queries): print ALL errors at end

---
 scripts/check-queries.lua | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index a84df85c4..959969645 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -51,7 +51,7 @@ local function do_check()
   local query_types = queries.built_in_query_groups
 
   local captures = extract_captures()
-  local last_error
+  local errors = {}
 
   io_print "::group::Check parsers"
 
@@ -66,8 +66,7 @@ local function do_check()
       io_print("Checking " .. lang .. " " .. query_type .. string.format(" (%.02fms)", duration * 1e-6))
       if not ok then
         local err_msg = lang .. " (" .. query_type .. "): " .. query
-        io_print(err_msg)
-        last_error = err_msg
+        errors[#errors + 1] = err_msg
       else
         if query then
           for _, capture in ipairs(query.captures) do
@@ -79,8 +78,7 @@ local function do_check()
             )
             if not is_valid then
               local error = string.format("(x) Invalid capture @%s in %s for %s.", capture, query_type, lang)
-              io_print(error)
-              last_error = error
+              errors[#errors + 1] = error
             end
           end
         end
@@ -90,10 +88,12 @@ local function do_check()
 
   io_print "::endgroup::"
 
-  if last_error then
-    io_print()
-    io_print "Last error: "
-    error(last_error)
+  if #errors > 0 then
+    io_print "\nCheck failed!\nErrors:"
+    for _, err in ipairs(errors) do
+      print(err)
+    end
+    error()
   end
   return timings
 end
@@ -129,8 +129,5 @@ if ok then
   io_print "Check successful!"
   vim.cmd "q"
 else
-  io_print "Check failed:"
-  io_print(result)
-  io_print "\n"
   vim.cmd "cq"
 end

From 15de22a2e19fb5c79bbcff0e2d12f4b1dd44e069 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 5 Jan 2024 02:21:00 +0900
Subject: [PATCH 0995/2704] feat: query formatting script

Usage:
- nvim -l scripts/format-queries.lua /path/to/file.scm
- nvim -l scripts/format-queries.lua /path/to/dir

fixup: add `format-ignore` directive to query/highlights.scm
---
 queries/query/highlights.scm |   3 +
 scripts/format-queries.lua   | 396 +++++++++++++++++++++++++++++++++++
 2 files changed, 399 insertions(+)
 create mode 100755 scripts/format-queries.lua

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 030e3d44f..8601b1365 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -33,6 +33,9 @@
 ((program . (comment)* . (comment) @keyword.directive)
  (#lua-match? @keyword.directive "^;+ *extends *$"))
 
+((comment) @keyword.directive
+  (#lua-match? @keyword.directive "^;+%s*format%-ignore%s*$"))
+
 ((predicate
   name: (identifier) @_name
   parameters: (parameters (string "\"" @string "\"" @string) @string.regexp))
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
new file mode 100755
index 000000000..88933c630
--- /dev/null
+++ b/scripts/format-queries.lua
@@ -0,0 +1,396 @@
+#!/usr/bin/env -S nvim -l
+
+local ts = vim.treesitter
+local get_node_text = ts.get_node_text
+
+---@type string[]
+local files
+
+if not _G.arg[1] then
+  error "Must specify specify file or directory to format!"
+elseif _G.arg[1]:match ".*%.scm$" then
+  files = { _G.arg[1] }
+else
+  files = vim.fn.split(vim.fn.glob(_G.arg[1] .. "/**/*.scm"))
+end
+
+ts.query.add_predicate("has-type?", function(match, _, _, pred)
+  local node = match[pred[2]]
+  if not node then
+    return true
+  end
+
+  local types = { unpack(pred, 3) }
+  return vim.tbl_contains(types, node:type())
+end, true)
+
+ts.query.add_predicate("is-start-of-line?", function(match, _, _, pred)
+  local node = match[pred[2]]
+  if not node then
+    return true
+  end
+  local start_row, start_col = node:start()
+  return vim.fn.indent(start_row + 1) == start_col
+end)
+
+--- Control the indent here. Change to \t if uses tab instead
+local indent_str = "  "
+
+-- Query to control the formatter
+local format_queries = [[
+;;query
+;; Ignore next node with `; format-ignore`
+(
+  (comment) @_pattern
+  .
+  (_) @format.ignore
+  (#lua-match? @_pattern "^;+%s*format%-ignore"))
+
+;; {{{
+;; Add newlines to top level nodes
+;; {{{
+;; Preserve inline comments
+(program
+  . (_)
+  (_) @_comment
+  .
+  (comment) @format.prepend-newline
+  (#not-has-type? @_comment comment)
+  (#is-start-of-line? @format.prepend-newline))
+(program
+  . (_)
+  (comment) @_comment
+  .
+  (comment) @format.prepend-newline
+  (#not-is-start-of-line? @_comment)
+  (#is-start-of-line? @format.prepend-newline))
+;; }}}
+;; Making sure all top-level patterns are separated
+(program
+  (_) @format.append-newline)
+(program
+  (_) @format.cancel-append .)
+(program
+  . (_)
+  [
+    (list)
+    (grouping)
+    (named_node)
+    (anonymous_node)
+  ] @format.prepend-newline)
+(program
+  (comment) @_comment
+  .
+  [
+    (list)
+    (grouping)
+    (named_node)
+    (anonymous_node)
+  ] @format.cancel-prepend
+  (#is-start-of-line? @_comment))
+;; }}}
+
+;; delims
+[
+  ":"
+  "."
+] @format.append-space
+(
+  "." @format.prepend-space @format.cancel-append
+  .
+  ")")
+
+;; List handler
+;; Only starts indent if 2 or more elements
+(list
+  "[" @format.indent.begin
+  .
+  (_)
+  .
+  (_)
+  "]" @format.indent.dedent)
+;; Otherwise, remove brackets
+(list
+  "[" @format.remove
+  .
+  (_) @format.cancel-append
+  .
+  "]" @format.remove)
+;; [ ... ] @capture1 @capture2
+(list
+  (capture) @format.prepend-space)
+;; Append newlines for nodes inside the list
+(list
+  (_) @format.append-newline
+  (#not-has-type? @format.append-newline capture))
+
+;; (_), "_" and _ handler
+;; Start indents if it's one of these patterns
+(named_node
+  [
+    "_"
+    name: (identifier)
+  ] @format.indent.begin
+  .
+  [
+    (list)              ; (foo [...])
+    (grouping)          ; (foo ((foo)))
+    (negated_field)     ; (foo !field)
+    (field_definition)  ; (foo field: (...))
+    (named_node)        ; (foo (bar))
+    (predicate)         ; (named_node (#set!))
+    (anonymous_node)
+    "."
+  ])
+;; Honoring comment's position within a node
+(named_node
+  [
+    "_"
+    name: (identifier)
+  ] @format.indent.begin
+  .
+  (comment) @_comment
+  (#is-start-of-line? @_comment))
+(named_node
+  [
+    "_"
+    name: (identifier)
+  ] @format.indent.begin @format.cancel-append
+  .
+  "."? @format.prepend-newline
+  .
+  (comment) @format.prepend-space
+  (#not-is-start-of-line? @format.prepend-space))
+
+;; Add newlines for other nodes, in case the top node is indented
+(named_node
+  [
+    (list)
+    (grouping)
+    (negated_field)
+    (field_definition)
+    (named_node)
+    (predicate)
+    (anonymous_node)
+    "."
+  ] @format.append-newline)
+(named_node
+  (list
+    "[" . (_) @format.append-newline . "]"))
+
+;; Collapse closing parentheses
+(named_node
+  [
+    "_"
+    name: (identifier)
+  ]
+  (_) @format.cancel-append
+  .
+  ")"
+  (#not-has-type? @format.cancel-append comment))
+
+;; All captures should be separated with a space
+(named_node
+  (capture) @format.prepend-space)
+(anonymous_node
+  (capture) @format.prepend-space)
+
+;; Workaround to just use the string's content
+(anonymous_node (identifier) @format.keep)
+(field_definition
+  name: (_)
+  ":" @format.indent.begin @format.append-newline ; surpress trailing whitespaces with forced newlines
+  [
+    (named_node [ (named_node) (list) (grouping) (anonymous_node) (field_definition) ])
+    (list "[" . (_) . (_) "]")
+    (grouping)
+  ])
+
+; ( (_) ) handler
+(grouping
+  "("
+  .
+  [
+    (named_node)                  ; ((foo))
+    (list)                        ; ([foo] (...))
+    (anonymous_node)              ; ("foo")
+    (grouping . (anonymous_node)) ; (("foo"))
+  ] @format.indent.begin
+  .
+  (_))
+(grouping
+  "("
+  .
+  (grouping) @format.indent.begin
+  (predicate))
+(grouping
+  "("
+  [
+    (anonymous_node)
+    (named_node)
+    (list)
+    (predicate)
+    "."
+  ] @format.append-newline
+  (_) .)
+;; Collapsing closing parens
+(grouping
+  (_) @format.cancel-append . ")"
+  (#not-has-type? @format.cancel-append comment))
+(grouping
+  (capture) @format.prepend-space)
+
+(predicate
+  (parameters
+    (_) @format.prepend-space))
+;; Workaround to keep the string's content
+(string) @format.keep
+
+;; Comment related handlers
+(comment) @format.append-newline
+;; comment styling. Feel free to change in the future
+((comment) @format.replace
+  (#gsub! @format.replace "^;+(%s*.-)%s*$" ";%1"))
+;; Preserve end of line comments
+(
+  [
+    "."
+    ":"
+    (list)
+    (grouping)
+    (named_node)
+    (anonymous_node)
+    (negated_field)
+  ] @format.cancel-append
+  .
+  (quantifier)?
+  .
+  "."? @format.prepend-newline ; Make sure anchor are not eol but start of newline
+  .
+  (comment) @format.prepend-space
+  (#not-is-start-of-line? @format.prepend-space))
+]]
+
+---@param lines string[]
+---@param lines_to_append string[]
+local function append_lines(lines, lines_to_append)
+  for i = 1, #lines_to_append, 1 do
+    lines[#lines] = lines[#lines] .. lines_to_append[i]
+    if i ~= #lines_to_append then
+      lines[#lines + 1] = ""
+    end
+  end
+end
+
+---@param bufnr integer
+---@param node TSNode
+---@param lines string[]
+---@param q table<string, TSMetadata>
+---@param level integer
+local function iter(bufnr, node, lines, q, level)
+  --- Sometimes 2 queries apply append twice. This is to prevent the case from happening
+  local apply_newline = false
+  for child, _ in node:iter_children() do
+    local id = child:id()
+    repeat
+      if apply_newline then
+        apply_newline = false
+        lines[#lines + 1] = string.rep(indent_str, level)
+      end
+      if q["format.ignore"][id] then
+        local text = vim.split(get_node_text(child, bufnr):gsub("\r\n?", "\n"), "\n", { trimempty = true })
+        append_lines(lines, text)
+        break
+      elseif q["format.remove"][id] then
+        break
+      end
+      if not q["format.cancel-prepend"][id] then
+        if q["format.prepend-newline"][id] then
+          lines[#lines + 1] = string.rep(indent_str, level)
+        elseif q["format.prepend-space"][id] then
+          lines[#lines] = lines[#lines] .. " "
+        end
+      end
+      if q["format.replace"][id] then
+        append_lines(lines, vim.split(q["format.replace"][id].text, "\n", { trimempty = true }))
+      elseif child:named_child_count() == 0 or q["format.keep"][id] then
+        append_lines(
+          lines,
+          vim.split(string.gsub(get_node_text(child, bufnr), "\r\n?", "\n"), "\n+", { trimempty = true })
+        )
+      else
+        iter(bufnr, child, lines, q, level)
+      end
+      if q["format.indent.begin"][id] then
+        level = level + 1
+        apply_newline = true
+        break
+      end
+      if q["format.indent.dedent"][id] then
+        if string.match(lines[#lines], "^%s*" .. get_node_text(child, bufnr)) then
+          lines[#lines] = string.sub(lines[#lines], 1 + #string.rep(indent_str, 1))
+        end
+      end
+      if q["format.indent.end"][id] then
+        level = math.max(level - 1, 0)
+        if string.match(lines[#lines], "^%s*" .. get_node_text(child, bufnr)) then
+          lines[#lines] = string.sub(lines[#lines], 1 + #string.rep(indent_str, 1))
+        end
+        break
+      end
+    until true
+    repeat
+      if q["format.cancel-append"][id] then
+        apply_newline = false
+      end
+      if not q["format.cancel-append"][id] then
+        if q["format.append-newline"][id] then
+          apply_newline = true
+        elseif q["format.append-space"][id] then
+          lines[#lines] = lines[#lines] .. " "
+        end
+      end
+    until true
+  end
+end
+
+---@param bufnr integer
+---@param queries string
+local function format(bufnr, queries)
+  local lines = { "" }
+  -- stylua: ignore
+  local map = {
+    ['format.ignore'] = {},           -- Ignore the node and its children
+    ['format.indent.begin'] = {},     -- +1 shiftwidth for all nodes after this
+    ['format.indent.end'] = {},       -- -1 shiftwidth for all nodes after this
+    ['format.indent.dedent'] = {},    -- -1 shiftwidth for this line only
+    ['format.prepend-space'] = {},    -- Prepend a space before inserting the node
+    ['format.prepend-newline'] = {},  -- Prepend a \n before inserting the node
+    ['format.append-space'] = {},     -- Append a space after inserting the node
+    ['format.append-newline'] = {},   -- Append a newline after inserting the node
+    ['format.cancel-append'] = {},    -- Cancel any `@format.append-*` applied to the node
+    ['format.cancel-prepend'] = {},   -- Cancel any `@format.prepend-*` applied to the node
+    ['format.keep'] = {},             -- String content is not exposed as a syntax node. This is a workaround for it
+    ['format.replace'] = {},          -- Dedicated capture used to store results of `(#gsub!)`
+    ['format.remove'] = {},           -- Do not add the syntax node to the result, i.e. brackets [], parens ()
+  }
+  local root = ts.get_parser(bufnr, "query"):parse(true)[1]:root()
+  local query = ts.query.parse("query", queries)
+  for id, node, metadata in query:iter_captures(root, bufnr) do
+    if query.captures[id]:sub(1, 1) ~= "_" then
+      map[query.captures[id]][node:id()] = metadata and (metadata[id] and metadata[id] or metadata) or {}
+    end
+  end
+
+  iter(bufnr, root, lines, map, 0)
+  vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
+end
+
+for _, file in ipairs(files) do
+  local buf = vim.fn.bufadd(file)
+  vim.fn.bufload(file)
+  vim.api.nvim_set_current_buf(buf)
+  format(buf, format_queries)
+end
+
+vim.cmd "silent wa!"

From edee83272efe9b597bc27e8060539cdffa3b12a8 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 5 Jan 2024 03:19:54 +0900
Subject: [PATCH 0996/2704] refactor: manual pre-cleanup

Moving comments, adding `format-ignore` to lines that will be better
with it
---
 queries/apex/highlights.scm         |   2 +-
 queries/apex/locals.scm             |   2 +-
 queries/arduino/highlights.scm      | 138 ++++-----
 queries/bash/highlights.scm         |   3 +-
 queries/bitbake/highlights.scm      |  47 ++-
 queries/c/highlights.scm            |   8 +-
 queries/c/injections.scm            |  88 +++---
 queries/clojure/highlights.scm      | 295 +++++++++---------
 queries/cmake/highlights.scm        |  32 +-
 queries/commonlisp/highlights.scm   |  10 +-
 queries/elixir/locals.scm           | 241 ++++++++-------
 queries/gdscript/highlights.scm     | 249 +++++++--------
 queries/go/locals.scm               |   4 +-
 queries/hcl/highlights.scm          |   2 +-
 queries/ispc/highlights.scm         | 256 +++++++--------
 queries/janet_simple/highlights.scm | 463 ++++++++++++++--------------
 queries/java/indents.scm            |   1 +
 queries/java/locals.scm             |   1 +
 queries/jq/highlights.scm           | 383 +++++++++++------------
 queries/julia/highlights.scm        | 421 ++++++++++++-------------
 queries/julia/locals.scm            |   3 +-
 queries/lua/highlights.scm          |   3 +-
 queries/lua/injections.scm          |   7 +-
 queries/luau/highlights.scm         |   3 +-
 queries/mlir/highlights.scm         |   1 +
 queries/nix/highlights.scm          |  22 +-
 queries/ocaml/indents.scm           |   1 +
 queries/pug/highlights.scm          |  25 +-
 queries/python/highlights.scm       |  47 ++-
 queries/rst/highlights.scm          |  64 ++--
 queries/scheme/highlights.scm       | 151 ++++-----
 queries/squirrel/highlights.scm     |   1 +
 queries/starlark/highlights.scm     |  62 ++--
 queries/swift/highlights.scm        |   2 +-
 queries/swift/indents.scm           |   1 +
 queries/usd/highlights.scm          | 211 +++++++------
 queries/usd/indents.scm             |   1 +
 37 files changed, 1656 insertions(+), 1595 deletions(-)

diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 729a84d15..692fccb1b 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -136,7 +136,7 @@
 [
   (boolean_type)
   (void_type)
-] @type.builtin;;
+] @type.builtin
 
 ; Fields
 
diff --git a/queries/apex/locals.scm b/queries/apex/locals.scm
index 6ffa8648f..5661b911d 100644
--- a/queries/apex/locals.scm
+++ b/queries/apex/locals.scm
@@ -22,7 +22,7 @@
 ; loops
 
 (for_statement) @local.scope
-(for_statement         ; "for" body in case there are no braces
+(for_statement  ; "for" body in case there are no braces
   body: (_) @local.scope)
 (do_statement
   body: (_) @local.scope)
diff --git a/queries/arduino/highlights.scm b/queries/arduino/highlights.scm
index a4e74ae89..a2e121a06 100644
--- a/queries/arduino/highlights.scm
+++ b/queries/arduino/highlights.scm
@@ -1,75 +1,75 @@
 ; 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"
-           ))
+  ; format-ignore
+  (#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
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 033f9fbee..5820680ef 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -127,7 +127,8 @@
 (command_name (word) @function.call)
 
 ((command_name (word) @function.builtin)
- (#any-of? @function.builtin
+  ; format-ignore
+  (#any-of? @function.builtin
     "alias" "bg" "bind" "break" "builtin" "caller" "cd"
     "command" "compgen" "complete" "compopt" "continue"
     "coproc" "dirs" "disown" "echo" "enable" "eval"
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index c4f51d624..eafe60b4d 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -109,15 +109,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((python_identifier) @constant.builtin
- (#any-of? @constant.builtin
-           ;; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
-           "Ellipsis"
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
+  ; format-ignore
+  (#any-of? @constant.builtin 
+    ; https://docs.python.org/3/library/constants.html
+    "NotImplemented" "Ellipsis" 
+    "quit" "exit" "copyright" "credits" "license"))
 
 ((assignment
   left: (python_identifier) @type.definition
@@ -338,21 +334,22 @@
 (type_conversion) @function.macro
 
 ([(identifier) (python_identifier)] @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+  ; format-ignore
+  (#any-of? @type.builtin
+      ; https://docs.python.org/3/library/exceptions.html
+      "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+      "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
+      "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+      "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+      "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+      "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+      "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+      "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+      "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+      "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+      "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+      ; https://docs.python.org/3/library/stdtypes.html
+      "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+      "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 
 (comment) @comment @spell
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 33c30f095..0a6145e3e 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -124,12 +124,12 @@
 ((preproc_arg) @function.macro (#set! "priority" 90))
 (preproc_defined) @function.macro
 
-(((field_expression
-     (field_identifier) @property)) @_parent
+((field_expression
+     (field_identifier) @property) @_parent
  (#not-has-parent? @_parent template_method function_declarator call_expression))
 
 (field_designator) @property
-(((field_identifier) @property)
+((field_identifier) @property
  (#has-ancestor? @property field_declaration)
  (#not-has-ancestor? @property function_declarator))
 
@@ -168,6 +168,7 @@
   value: (identifier) @constant)
 
 ((identifier) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin
     "stderr" "stdin" "stdout"
     "__FILE__" "__LINE__" "__DATE__" "__TIME__"
@@ -181,6 +182,7 @@
     "__FUNCTION__" "__func__" "__PRETTY_FUNCTION__"
     "__VA_ARGS__" "__VA_OPT__"))
 (preproc_def (preproc_arg) @constant.builtin
+  ; format-ignore
   (#any-of? @constant.builtin
     "stderr" "stdin" "stdout"
     "__FILE__" "__LINE__" "__DATE__" "__TIME__"
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 086dede9e..c025b0f07 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -16,59 +16,65 @@
   function: (identifier) @_function
   arguments: (argument_list
                . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "printf" "printf_s"
-                      "vprintf" "vprintf_s"
-                      "scanf" "scanf_s"
-                      "vscanf" "vscanf_s"
-                      "wprintf" "wprintf_s"
-                      "vwprintf" "vwprintf_s"
-                      "wscanf" "wscanf_s"
-                      "vwscanf" "vwscanf_s"
-                      "cscanf" "_cscanf"
-                      "printw"
-                      "scanw")
+  ; format-ignore
+  (#any-of? @_function 
+    "printf" "printf_s"
+    "vprintf" "vprintf_s"
+    "scanf" "scanf_s"
+    "vscanf" "vscanf_s"
+    "wprintf" "wprintf_s"
+    "vwprintf" "vwprintf_s"
+    "wscanf" "wscanf_s"
+    "vwscanf" "vwscanf_s"
+    "cscanf" "_cscanf"
+    "printw"
+    "scanw")
  (#set! injection.language "printf"))
 
 ((call_expression
   function: (identifier) @_function
   arguments: (argument_list
                (_) . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "fprintf" "fprintf_s"
-                      "sprintf"
-                      "dprintf"
-                      "fscanf" "fscanf_s"
-                      "sscanf" "sscanf_s"
-                      "vsscanf" "vsscanf_s"
-                      "vfprintf" "vfprintf_s"
-                      "vsprintf"
-                      "vdprintf"
-                      "fwprintf" "fwprintf_s"
-                      "vfwprintf" "vfwprintf_s"
-                      "fwscanf" "fwscanf_s"
-                      "swscanf" "swscanf_s"
-                      "vswscanf" "vswscanf_s"
-                      "vfscanf" "vfscanf_s"
-                      "vfwscanf" "vfwscanf_s"
-                      "wprintw"
-                      "vw_printw" "vwprintw"
-                      "wscanw"
-                      "vw_scanw" "vwscanw")
+  ; format-ignore
+  (#any-of? @_function 
+    "fprintf" "fprintf_s"
+    "sprintf"
+    "dprintf"
+    "fscanf" "fscanf_s"
+    "sscanf" "sscanf_s"
+    "vsscanf" "vsscanf_s"
+    "vfprintf" "vfprintf_s"
+    "vsprintf"
+    "vdprintf"
+    "fwprintf" "fwprintf_s"
+    "vfwprintf" "vfwprintf_s"
+    "fwscanf" "fwscanf_s"
+    "swscanf" "swscanf_s"
+    "vswscanf" "vswscanf_s"
+    "vfscanf" "vfscanf_s"
+    "vfwscanf" "vfwscanf_s"
+    "wprintw"
+    "vw_printw" "vwprintw"
+    "wscanw"
+    "vw_scanw" "vwscanw")
  (#set! injection.language "printf"))
 
 ((call_expression
   function: (identifier) @_function
   arguments: (argument_list
                (_) . (_) . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "sprintf_s"
-                      "snprintf" "snprintf_s"
-                      "vsprintf_s"
-                      "vsnprintf" "vsnprintf_s"
-                      "swprintf" "swprintf_s"
-                      "snwprintf_s"
-                      "vswprintf" "vswprintf_s"
-                      "vsnwprintf_s"
-                      "mvprintw"
-                      "mvscanw")
+  ; format-ignore
+  (#any-of? @_function 
+    "sprintf_s"
+    "snprintf" "snprintf_s"
+    "vsprintf_s"
+    "vsnprintf" "vsnprintf_s"
+    "swprintf" "swprintf_s"
+    "snwprintf_s"
+    "vswprintf" "vswprintf_s"
+    "vsnwprintf_s"
+    "mvprintw"
+    "mvscanw")
  (#set! injection.language "printf"))
 
 ((call_expression
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index d0b0bf0cb..974a17c0a 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -67,19 +67,20 @@
 
 ; Builtin dynamic variables
 ((sym_lit) @variable.builtin
- (#any-of? @variable.builtin
-  "*agent*" "*allow-unresolved-vars*" "*assert*"
-  "*clojure-version*" "*command-line-args*"
-  "*compile-files*" "*compile-path*" "*compiler-options*"
-  "*data-readers*" "*default-data-reader-fn*"
-  "*err*" "*file*" "*flush-on-newline*" "*fn-loader*"
-  "*in*" "*math-context*" "*ns*" "*out*"
-  "*print-dup*" "*print-length*" "*print-level*"
-  "*print-meta*" "*print-namespace-maps*" "*print-readably*"
-  "*read-eval*" "*reader-resolver*"
-  "*source-path*" "*suppress-read*"
-  "*unchecked-math*" "*use-context-classloader*"
-  "*verbose-defrecords*" "*warn-on-reflection*"))
+  ; format-ignore
+  (#any-of? @variable.builtin
+    "*agent*" "*allow-unresolved-vars*" "*assert*"
+    "*clojure-version*" "*command-line-args*"
+    "*compile-files*" "*compile-path*" "*compiler-options*"
+    "*data-readers*" "*default-data-reader-fn*"
+    "*err*" "*file*" "*flush-on-newline*" "*fn-loader*"
+    "*in*" "*math-context*" "*ns*" "*out*"
+    "*print-dup*" "*print-length*" "*print-level*"
+    "*print-meta*" "*print-namespace-maps*" "*print-readably*"
+    "*read-eval*" "*reader-resolver*"
+    "*source-path*" "*suppress-read*"
+    "*unchecked-math*" "*use-context-classloader*"
+    "*verbose-defrecords*" "*warn-on-reflection*"))
 
 ; Builtin repl variables
 ((sym_lit) @variable.builtin
@@ -172,17 +173,18 @@
 ; 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"
-  "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->>"
-  "time" "unquote" "unquote-splicing" "var" "vswap!"
-  "with-bindings" "with-in-str" "with-loading-context" "with-local-vars"
-  "with-open" "with-out-str" "with-precision" "with-redefs"))
+  ; format-ignore
+  (#any-of? @function.macro
+    "." ".." "->" "->>" "amap" "areduce" "as->" "assert"
+    "binding" "bound-fn" "delay" "do" "dosync"
+    "doto" "extend-protocol" "extend-type"
+    "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->>"
+    "time" "unquote" "unquote-splicing" "var" "vswap!"
+    "with-bindings" "with-in-str" "with-loading-context" "with-local-vars"
+    "with-open" "with-out-str" "with-precision" "with-redefs"))
 
 ; All builtin functions
 ; (->> (ns-publics *ns*)
@@ -191,128 +193,129 @@
 ;      clojure.pprint/pprint))
 ;; ...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" "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"
-  ;; earlier
-  "drop" "drop-last" "drop-while"
-  "double?" "doubles"
-  "ex-data" "ex-info"
-  ;; 1.10
-  "ex-cause" "ex-message"
-  ;; 1.11
-  "NaN?" "abs" "infinite?" "iteration" "random-uuid"
-  "parse-boolean" "parse-double" "parse-long" "parse-uuid"
-  "seq-to-map-for-destructuring" "update-keys" "update-vals"
-  ;; 1.12
-  "partitionv" "partitionv-all" "splitv-at"))
+  ; format-ignore
+  (#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" "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"
+    ;; earlier
+    "drop" "drop-last" "drop-while"
+    "double?" "doubles"
+    "ex-data" "ex-info"
+    ;; 1.10
+    "ex-cause" "ex-message"
+    ;; 1.11
+    "NaN?" "abs" "infinite?" "iteration" "random-uuid"
+    "parse-boolean" "parse-double" "parse-long" "parse-uuid"
+    "seq-to-map-for-destructuring" "update-keys" "update-vals"
+    ;; 1.12
+    "partitionv" "partitionv-all" "splitv-at"))
 
 
 
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index bdad657e3..13544661f 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -91,13 +91,15 @@
   (argument_list
     (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"
+  ; format-ignore
+  (#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"
   )
 )
 (elseif_command
@@ -105,13 +107,15 @@
   (argument_list
     (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"
+  ; format-ignore
+  (#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"
   )
 )
 
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 4c6501de6..42da34d0e 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -110,9 +110,10 @@
 (list_lit
  .
  (sym_lit) @function.macro
- ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
- (#any-of? @function.macro
-  "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda" "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass" "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf" "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream" "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or" "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro" "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace" "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist" "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander" "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string" "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter" "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless" "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block" "time" "restart-case" "prog*" "define-method-combination" "optimize"))
+  ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
+  ; format-ignore
+  (#any-of? @function.macro
+    "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda" "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass" "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf" "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream" "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or" "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro" "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace" "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist" "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander" "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string" "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter" "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless" "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block" "time" "restart-case" "prog*" "define-method-combination" "optimize"))
 
 ;; constant
 ((sym_lit) @constant
@@ -128,8 +129,9 @@
   .
   (sym_lit) @function.builtin
   ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
+  ; format-ignore
   (#any-of? @function.builtin
-   "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast"))
+    "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast"))
 
 (list_lit
  .
diff --git a/queries/elixir/locals.scm b/queries/elixir/locals.scm
index ae37b9ca8..59e55eae0 100644
--- a/queries/elixir/locals.scm
+++ b/queries/elixir/locals.scm
@@ -1,41 +1,21 @@
 ; References
 (identifier) @local.reference
+
 (alias) @local.reference
 
 ; Module Definitions
 (call
-  target: ((identifier) @_identifier (#eq? @_identifier "defmodule"))
-  (arguments (alias) @local.definition.type))
+  target: 
+    ((identifier) @_identifier
+      (#eq? @_identifier "defmodule"))
+  (arguments
+    (alias) @local.definition.type))
 
 ; Pattern Match Definitions
-(binary_operator left: [
-  (identifier) @local.definition.var
-  (_ (identifier) @local.definition.var)
-  (_ (_ (identifier) @local.definition.var))
-  (_ (_ (_ (identifier) @local.definition.var)))
-  (_ (_ (_ (_ (identifier) @local.definition.var))))
-  (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))
-  (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))
-  (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
-  (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-] operator: "=")
-
-; Stab Clause Definitions
-(stab_clause
-  left: [
-    (arguments [
+(binary_operator
+  ; format-ignore
+  left: 
+    [
       (identifier) @local.definition.var
       (_ (identifier) @local.definition.var)
       (_ (_ (identifier) @local.definition.var))
@@ -57,9 +37,15 @@
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-    ])
-    (binary_operator
-      left: (arguments [
+    ]
+  operator: "=")
+; Stab Clause Definitions
+; format-ignore
+(stab_clause
+  left:
+    [
+     (arguments
+      [
         (identifier) @local.definition.var
         (_ (identifier) @local.definition.var)
         (_ (_ (identifier) @local.definition.var))
@@ -81,84 +67,131 @@
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
         (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
-  ]) operator: "when")
-])
+      ])
 
+    (binary_operator
+      left:
+        (arguments
+          ; format-ignore
+          [
+            (identifier) @local.definition.var
+            (_ (identifier) @local.definition.var)
+            (_ (_ (identifier) @local.definition.var))
+            (_ (_ (_ (identifier) @local.definition.var)))
+            (_ (_ (_ (_ (identifier) @local.definition.var))))
+            (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))
+            (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))
+            (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var)))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
+          ])
+      operator: "when")
+    ])
 ; Aliases
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#any-of? @_identifier "require" "alias" "use" "import"))
-  (arguments [
-    (alias) @local.definition.import
-    (_ (alias) @local.definition.import)
-    (_ (_ (alias) @local.definition.import))
-    (_ (_ (_ (alias) @local.definition.import)))
-    (_ (_ (_ (_ (alias) @local.definition.import))))
-  ]
-))
+  target:
+    ((identifier) @_identifier
+      (#any-of? @_identifier "require" "alias" "use" "import"))
+  (arguments
+    [
+      (alias) @local.definition.import
+      (_ (alias) @local.definition.import)
+      (_ (_ (alias) @local.definition.import))
+      (_ (_ (_ (alias) @local.definition.import)))
+      (_ (_ (_ (_ (alias) @local.definition.import))))
+    ]))
 
 ; Local Function Definitions & Scopes
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#any-of? @_identifier "def" "defp" "defmacro" "defmacrop" "defguard" "defguardp" "defn" "defnp" "for"))
-  (arguments [
-    (identifier) @local.definition.function
-    (binary_operator left: (identifier) @local.definition.function operator: "when")
-    (binary_operator (identifier) @local.definition.parameter)
-    (call target: (identifier) @local.definition.function (arguments [
-      (identifier) @local.definition.parameter
-      (_ (identifier) @local.definition.parameter)
-      (_ (_ (identifier) @local.definition.parameter))
-      (_ (_ (_ (identifier) @local.definition.parameter)))
-      (_ (_ (_ (_ (identifier) @local.definition.parameter))))
-      (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
-      (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
-      (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
-    ]))
-  ]?) (#set! definition.function.scope parent)
-  (do_block)?
-) @local.scope
-
+  target:
+    ((identifier) @_identifier
+      (#any-of? @_identifier "def" "defp" "defmacro" "defmacrop" "defguard" "defguardp" "defn" "defnp" "for"))
+  (arguments
+    [
+      (identifier) @local.definition.function
+      (binary_operator
+        left: (identifier) @local.definition.function
+        operator: "when")
+      (binary_operator
+        (identifier) @local.definition.parameter)
+      (call
+        target: (identifier) @local.definition.function
+        (arguments
+          [
+            (identifier) @local.definition.parameter
+            (_ (identifier) @local.definition.parameter)
+            (_ (_ (identifier) @local.definition.parameter))
+            (_ (_ (_ (identifier) @local.definition.parameter)))
+            (_ (_ (_ (_ (identifier) @local.definition.parameter))))
+            (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
+            (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
+            (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
+            (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
+          ]))
+    ]?)
+  (#set! definition.function.scope parent)(do_block)?) @local.scope
 ; ExUnit Test Definitions & Scopes
+; format-ignore
 (call
-  target: ((identifier) @_identifier (#eq? @_identifier "test"))
-  (arguments [
-    (string)
-    ((string) . "," . [
-      (identifier) @local.definition.parameter
-      (_ (identifier) @local.definition.parameter)
-      (_ (_ (identifier) @local.definition.parameter))
-      (_ (_ (_ (identifier) @local.definition.parameter)))
-      (_ (_ (_ (_ (identifier) @local.definition.parameter))))
-      (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
-      (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
-      (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
-      (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
-  ])
-]) (do_block)?) @local.scope
-
+  target:
+    ((identifier) @_identifier
+      (#eq? @_identifier "test"))
+  (arguments
+    [
+      (string)
+      ((string)
+        .
+        ","
+        .
+        [
+          (identifier) @local.definition.parameter
+          (_ (identifier) @local.definition.parameter)
+          (_ (_ (identifier) @local.definition.parameter))
+          (_ (_ (_ (identifier) @local.definition.parameter)))
+          (_ (_ (_ (_ (identifier) @local.definition.parameter))))
+          (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))
+          (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))
+          (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter)))))))))))))))))))
+          (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.parameter))))))))))))))))))))
+        ])
+    ])
+  (do_block)?) @local.scope
 ; Stab Clause Scopes
 (stab_clause) @local.scope
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 1b4edbc7e..21e0b8e0b 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -82,7 +82,7 @@
 
 ;; Match Pattern
 
-(underscore) @constant          ; The "_" pattern.
+(underscore) @constant         ; The "_" pattern.
 (pattern_open_ending) @operator ; The ".." pattern.
 
 ;; Alternations
@@ -179,21 +179,22 @@
 ;; Built-in Annotations
 
 ((annotation "@" @attribute (identifier) @attribute)
- (#any-of? @attribute
-  ; @GDScript
-  "export" "export_category" "export_color_no_alpha" "export_dir"
-  "export_enum" "export_exp_easing" "export_file" "export_flags"
-  "export_flags_2d_navigation" "export_flags_2d_physics"
-  "export_flags_2d_render" "export_flags_3d_navigation"
-  "export_flags_3d_physics" "export_flags_3d_render" "export_global_dir"
-  "export_global_file" "export_group" "export_multiline" "export_node_path"
-  "export_placeholder" "export_range" "export_subgroup" "icon" "onready"
-  "rpc" "tool" "warning_ignore"
- ))
+  ; format-ignore
+  (#any-of? @attribute
+    ; @GDScript
+    "export" "export_category" "export_color_no_alpha" "export_dir"
+    "export_enum" "export_exp_easing" "export_file" "export_flags"
+    "export_flags_2d_navigation" "export_flags_2d_physics"
+    "export_flags_2d_render" "export_flags_3d_navigation"
+    "export_flags_3d_physics" "export_flags_3d_render" "export_global_dir"
+    "export_global_file" "export_group" "export_multiline" "export_node_path"
+    "export_placeholder" "export_range" "export_subgroup" "icon" "onready"
+    "rpc" "tool" "warning_ignore"))
 
 ;; Builtin Types
 
 ([(identifier) (type)] @type.builtin
+  ; format-ignore
   (#any-of? @type.builtin
    ; from godot-vscode-plugin
    "Vector2" "Vector2i" "Vector3" "Vector3i"
@@ -222,122 +223,122 @@
 ;; Builtin Funcs
 
 (call (identifier) @function.builtin
-      (#any-of? @function.builtin
-       ; @GlobalScope
-       "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
-       "bezier_interpolate" "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf"
-       "ceili" "clamp" "clampf" "clampi" "cos" "cosh" "cubic_interpolate"
-       "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
-       "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string"
-       "exp" "floor" "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id"
-       "inverse_lerp" "is_equal_approx" "is_finite" "is_inf" "is_instance_id_valid"
-       "is_instance_valid" "is_nan" "is_same" "is_zero_approx" "lerp" "lerp_angle"
-       "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min" "minf" "mini"
-       "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
-       "print_verbose" "printerr" "printraw" "prints" "printt" "push_error"
-       "push_warning" "rad_to_deg" "rand_from_seed" "randf" "randf_range" "randfn"
-       "randi" "randi_range" "randomize" "remap" "rid_allocate_id" "rid_from_int64"
-       "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin" "sinh"
-       "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str"
-       "str_to_var" "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects"
-       "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; @GlobalScope
+    "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
+    "bezier_interpolate" "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf"
+    "ceili" "clamp" "clampf" "clampi" "cos" "cosh" "cubic_interpolate"
+    "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
+    "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string"
+    "exp" "floor" "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id"
+    "inverse_lerp" "is_equal_approx" "is_finite" "is_inf" "is_instance_id_valid"
+    "is_instance_valid" "is_nan" "is_same" "is_zero_approx" "lerp" "lerp_angle"
+    "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min" "minf" "mini"
+    "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
+    "print_verbose" "printerr" "printraw" "prints" "printt" "push_error"
+    "push_warning" "rad_to_deg" "rand_from_seed" "randf" "randf_range" "randfn"
+    "randi" "randi_range" "randomize" "remap" "rid_allocate_id" "rid_from_int64"
+    "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin" "sinh"
+    "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str"
+    "str_to_var" "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects"
+    "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
 
-       ; @GDScript
-       "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
-       "is_instance_of" "len" "print_debug" "print_stack" "range"
-       "type_exists"
-      ))
+    ; @GDScript
+    "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
+    "is_instance_of" "len" "print_debug" "print_stack" "range"
+    "type_exists"))
 
 ;; Builtin Constants
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin
-  ; @GDScript
-  "PI" "TAU" "INF" "NAN"
+  ; format-ignore
+  (#any-of? @constant.builtin
+    ; @GDScript
+    "PI" "TAU" "INF" "NAN"
 
-  ; @GlobalScope
-  "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT" "CORNER_BOTTOM_RIGHT"
-  "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE" "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT"
-  "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
-  "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL" "INLINE_ALIGNMENT_TOP_TO"
-  "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP"
-  "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
-  "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK"
-  "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ" "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE"
-  "KEY_SPECIAL" "KEY_ESCAPE" "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
-  "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP" "KEY_RIGHT" "KEY_DOWN"
-  "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT" "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK"
-  "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5" "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12"
-  "KEY_F13" "KEY_F14" "KEY_F15" "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
-  "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33" "KEY_F34" "KEY_F35"
-  "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD" "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2"
-  "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6" "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP"
-  "KEY_BACK" "KEY_FORWARD" "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
-  "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE" "KEY_FAVORITES" "KEY_SEARCH"
-  "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA" "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3"
-  "KEY_LAUNCH4" "KEY_LAUNCH5" "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
-  "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM" "KEY_QUOTEDBL"
-  "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE" "KEY_PARENLEFT" "KEY_PARENRIGHT"
-  "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD" "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4"
-  "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9" "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION"
-  "KEY_AT" "KEY_A" "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
-  "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y" "KEY_Z"
-  "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE" "KEY_QUOTELEFT" "KEY_BRACELEFT"
-  "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN" "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU"
-  "KEY_JIS_KANA" "KEY_CODE_MASK" "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT"
-  "KEY_MASK_META" "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
-  "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN" "MOUSE_BUTTON_WHEEL_LEFT"
-  "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1" "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT"
-  "MOUSE_BUTTON_MASK_RIGHT" "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
-  "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y" "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE"
-  "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK" "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER"
-  "JOY_BUTTON_RIGHT_SHOULDER" "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
-  "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3" "JOY_BUTTON_PADDLE4"
-  "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y"
-  "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX"
-  "JOY_AXIS_MAX" "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
-  "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE" "MIDI_MESSAGE_PITCH_BEND"
-  "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
-  "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST" "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START"
-  "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP" "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED"
-  "ERR_UNAVAILABLE" "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
-  "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION" "ERR_FILE_ALREADY_IN_USE"
-  "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ" "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT"
-  "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF" "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED"
-  "ERR_ALREADY_IN_USE" "ERR_LOCKED" "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
-  "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER" "ERR_ALREADY_EXISTS"
-  "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND"
-  "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED" "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL"
-  "ERR_PARSE_ERROR" "ERR_BUSY" "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE"
-  "PROPERTY_HINT_RANGE" "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
-  "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER" "PROPERTY_HINT_LAYERS_2D_PHYSICS"
-  "PROPERTY_HINT_LAYERS_2D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
-  "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR" "PROPERTY_HINT_GLOBAL_FILE"
-  "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE" "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION"
-  "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
-  "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_NODE_PATH_VALID_TYPES"
-  "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE" "PROPERTY_HINT_INT_IS_OBJECTID"
-  "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE" "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING"
-  "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
-  "PROPERTY_USAGE_NONE" "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_INTERNAL"
-  "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_CATEGORY"
-  "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_NO_INSTANCE_STATE"
-  "PROPERTY_USAGE_RESTART_IF_CHANGED" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
-  "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_CLASS_IS_ENUM"
-  "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
-  "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT"
-  "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
-  "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_READ_ONLY"
-  "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR" "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST"
-  "METHOD_FLAG_VIRTUAL" "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
-  "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I" "TYPE_RECT2" "TYPE_RECT2I"
-  "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4" "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION"
-  "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D" "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH"
-  "TYPE_RID" "TYPE_OBJECT" "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
-  "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY" "TYPE_PACKED_FLOAT64_ARRAY"
-  "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX"
-  "OP_EQUAL" "OP_NOT_EQUAL" "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT"
-  "OP_MULTIPLY" "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
-  "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"
- ))
+    ; @GlobalScope
+    "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT" "CORNER_BOTTOM_RIGHT"
+    "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE" "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT"
+    "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
+    "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL" "INLINE_ALIGNMENT_TOP_TO"
+    "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP"
+    "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
+    "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK"
+    "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ" "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE"
+    "KEY_SPECIAL" "KEY_ESCAPE" "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
+    "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP" "KEY_RIGHT" "KEY_DOWN"
+    "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT" "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK"
+    "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5" "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12"
+    "KEY_F13" "KEY_F14" "KEY_F15" "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
+    "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33" "KEY_F34" "KEY_F35"
+    "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD" "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2"
+    "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6" "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP"
+    "KEY_BACK" "KEY_FORWARD" "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
+    "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE" "KEY_FAVORITES" "KEY_SEARCH"
+    "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA" "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3"
+    "KEY_LAUNCH4" "KEY_LAUNCH5" "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
+    "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM" "KEY_QUOTEDBL"
+    "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE" "KEY_PARENLEFT" "KEY_PARENRIGHT"
+    "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD" "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4"
+    "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9" "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION"
+    "KEY_AT" "KEY_A" "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
+    "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y" "KEY_Z"
+    "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE" "KEY_QUOTELEFT" "KEY_BRACELEFT"
+    "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN" "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU"
+    "KEY_JIS_KANA" "KEY_CODE_MASK" "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT"
+    "KEY_MASK_META" "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
+    "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN" "MOUSE_BUTTON_WHEEL_LEFT"
+    "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1" "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT"
+    "MOUSE_BUTTON_MASK_RIGHT" "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
+    "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y" "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE"
+    "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK" "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER"
+    "JOY_BUTTON_RIGHT_SHOULDER" "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
+    "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3" "JOY_BUTTON_PADDLE4"
+    "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y"
+    "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX"
+    "JOY_AXIS_MAX" "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
+    "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE" "MIDI_MESSAGE_PITCH_BEND"
+    "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
+    "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST" "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START"
+    "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP" "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED"
+    "ERR_UNAVAILABLE" "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
+    "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION" "ERR_FILE_ALREADY_IN_USE"
+    "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ" "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT"
+    "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF" "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED"
+    "ERR_ALREADY_IN_USE" "ERR_LOCKED" "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
+    "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER" "ERR_ALREADY_EXISTS"
+    "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND"
+    "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED" "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL"
+    "ERR_PARSE_ERROR" "ERR_BUSY" "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE"
+    "PROPERTY_HINT_RANGE" "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
+    "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER" "PROPERTY_HINT_LAYERS_2D_PHYSICS"
+    "PROPERTY_HINT_LAYERS_2D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
+    "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR" "PROPERTY_HINT_GLOBAL_FILE"
+    "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE" "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION"
+    "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
+    "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_NODE_PATH_VALID_TYPES"
+    "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE" "PROPERTY_HINT_INT_IS_OBJECTID"
+    "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE" "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING"
+    "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
+    "PROPERTY_USAGE_NONE" "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_INTERNAL"
+    "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_CATEGORY"
+    "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_NO_INSTANCE_STATE"
+    "PROPERTY_USAGE_RESTART_IF_CHANGED" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
+    "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_CLASS_IS_ENUM"
+    "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
+    "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT"
+    "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
+    "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_READ_ONLY"
+    "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR" "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST"
+    "METHOD_FLAG_VIRTUAL" "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
+    "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I" "TYPE_RECT2" "TYPE_RECT2I"
+    "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4" "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION"
+    "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D" "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH"
+    "TYPE_RID" "TYPE_OBJECT" "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
+    "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY" "TYPE_PACKED_FLOAT64_ARRAY"
+    "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX"
+    "OP_EQUAL" "OP_NOT_EQUAL" "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT"
+    "OP_MULTIPLY" "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
+    "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"))
 
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index 5702a2b93..20d8cd618 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -1,11 +1,11 @@
 (
     (function_declaration
-        name: (identifier) @local.definition.function) ;@function 
+        name: (identifier) @local.definition.function) ; @function 
 )
 
 (
     (method_declaration
-        name: (field_identifier) @local.definition.method); @function.method
+        name: (field_identifier) @local.definition.method) ; @function.method
 )
 
 (short_var_declaration 
diff --git a/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
index bb0de9816..7aa8b86fe 100644
--- a/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -58,7 +58,7 @@
 
 [
   (quoted_template_start) ; "
-  (quoted_template_end); "
+  (quoted_template_end) ; "
   (template_literal) ; non-interpolation/directive content
 ] @string
 
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 804b6ee63..6b1d2bd96 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -92,134 +92,134 @@
 ((type_identifier) @type.builtin
   (#lua-match? @type.builtin "^RNGState"))
 
+; format-ignore
 (call_expression
   function: (identifier) @function.builtin
   (#any-of? @function.builtin
-   "abs"
-   "acos"
-   "all"
-   "alloca"
-   "and"
-   "any"
-   "aos_to_soa2"
-   "aos_to_soa3"
-   "aos_to_soa4"
-   "asin"
-   "assert"
-   "assume"
-   "atan"
-   "atan2"
-   "atomic_add_global"
-   "atomic_add_local"
-   "atomic_and_global"
-   "atomic_and_local"
-   "atomic_compare_exchange_global"
-   "atomic_compare_exchange_local"
-   "atomic_max_global"
-   "atomic_max_local"
-   "atomic_min_global"
-   "atomic_min_local"
-   "atomic_or_global"
-   "atomic_or_local"
-   "atomic_subtract_global"
-   "atomic_subtract_local"
-   "atomic_swap_global"
-   "atomic_swap_local"
-   "atomic_xor_global"
-   "atomic_xor_local"
-   "avg_down"
-   "avg_up"
-   "broadcast"
-   "ceil"
-   "clamp"
-   "clock"
-   "cos"
-   "count_leading_zeros"
-   "count_trailing_zeros"
-   "doublebits"
-   "exclusive_scan_add"
-   "exclusive_scan_and"
-   "exclusive_scan_or"
-   "exp"
-   "extract"
-   "fastmath"
-   "float16bits"
-   "floatbits"
-   "float_to_half"
-   "float_to_half_fast"
-   "float_to_srgb8"
-   "floor"
-   "frandom"
-   "frexp"
-   "half_to_float"
-   "half_to_float_fast"
-   "insert"
-   "intbits"
-   "invoke_sycl"
-   "isnan"
-   "ISPCAlloc"
-   "ISPCLaunch"
-   "ISPCSync"
-   "lanemask"
-   "ldexp"
-   "log"
-   "max"
-   "memcpy"
-   "memcpy64"
-   "memmove"
-   "memmove64"
-   "memory_barrier"
-   "memset"
-   "memset64"
-   "min"
-   "none"
-   "num_cores"
-   "or"
-   "packed_load_active"
-   "packed_store_active"
-   "packed_store_active2"
-   "packmask"
-   "popcnt"
-   "pow"
-   "prefetch_l1"
-   "prefetch_l2"
-   "prefetch_l3"
-   "prefetch_nt"
-   "prefetchw_l1"
-   "prefetchw_l2"
-   "prefetchw_l3"
-   "print"
-   "random"
-   "rcp"
-   "rcp_fast"
-   "rdrand"
-   "reduce_add"
-   "reduce_equal"
-   "reduce_max"
-   "reduce_min"
-   "rotate"
-   "round"
-   "rsqrt"
-   "rsqrt_fast"
-   "saturating_add"
-   "saturating_div"
-   "saturating_mul"
-   "saturating_sub"
-   "seed_rng"
-   "select"
-   "shift"
-   "shuffle"
-   "signbits"
-   "sign_extend"
-   "sin"
-   "sincos"
-   "soa_to_aos2"
-   "soa_to_aos3"
-   "soa_to_aos4"
-   "sqrt"
-   "streaming_load"
-   "streaming_load_uniform"
-   "streaming_store"
-   "tan"
-   "trunc"
-   ))
+    "abs"
+    "acos"
+    "all"
+    "alloca"
+    "and"
+    "any"
+    "aos_to_soa2"
+    "aos_to_soa3"
+    "aos_to_soa4"
+    "asin"
+    "assert"
+    "assume"
+    "atan"
+    "atan2"
+    "atomic_add_global"
+    "atomic_add_local"
+    "atomic_and_global"
+    "atomic_and_local"
+    "atomic_compare_exchange_global"
+    "atomic_compare_exchange_local"
+    "atomic_max_global"
+    "atomic_max_local"
+    "atomic_min_global"
+    "atomic_min_local"
+    "atomic_or_global"
+    "atomic_or_local"
+    "atomic_subtract_global"
+    "atomic_subtract_local"
+    "atomic_swap_global"
+    "atomic_swap_local"
+    "atomic_xor_global"
+    "atomic_xor_local"
+    "avg_down"
+    "avg_up"
+    "broadcast"
+    "ceil"
+    "clamp"
+    "clock"
+    "cos"
+    "count_leading_zeros"
+    "count_trailing_zeros"
+    "doublebits"
+    "exclusive_scan_add"
+    "exclusive_scan_and"
+    "exclusive_scan_or"
+    "exp"
+    "extract"
+    "fastmath"
+    "float16bits"
+    "floatbits"
+    "float_to_half"
+    "float_to_half_fast"
+    "float_to_srgb8"
+    "floor"
+    "frandom"
+    "frexp"
+    "half_to_float"
+    "half_to_float_fast"
+    "insert"
+    "intbits"
+    "invoke_sycl"
+    "isnan"
+    "ISPCAlloc"
+    "ISPCLaunch"
+    "ISPCSync"
+    "lanemask"
+    "ldexp"
+    "log"
+    "max"
+    "memcpy"
+    "memcpy64"
+    "memmove"
+    "memmove64"
+    "memory_barrier"
+    "memset"
+    "memset64"
+    "min"
+    "none"
+    "num_cores"
+    "or"
+    "packed_load_active"
+    "packed_store_active"
+    "packed_store_active2"
+    "packmask"
+    "popcnt"
+    "pow"
+    "prefetch_l1"
+    "prefetch_l2"
+    "prefetch_l3"
+    "prefetch_nt"
+    "prefetchw_l1"
+    "prefetchw_l2"
+    "prefetchw_l3"
+    "print"
+    "random"
+    "rcp"
+    "rcp_fast"
+    "rdrand"
+    "reduce_add"
+    "reduce_equal"
+    "reduce_max"
+    "reduce_min"
+    "rotate"
+    "round"
+    "rsqrt"
+    "rsqrt_fast"
+    "saturating_add"
+    "saturating_div"
+    "saturating_mul"
+    "saturating_sub"
+    "seed_rng"
+    "select"
+    "shift"
+    "shuffle"
+    "signbits"
+    "sign_extend"
+    "sin"
+    "sincos"
+    "soa_to_aos2"
+    "soa_to_aos3"
+    "soa_to_aos4"
+    "sqrt"
+    "streaming_load"
+    "streaming_load_uniform"
+    "streaming_store"
+    "tan"
+    "trunc"))
diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 25ce38635..c1408ec68 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -57,51 +57,53 @@
 ;;       (print name))))
 
 ((sym_lit) @function.macro
- (#any-of? @function.macro
-  ;; special forms
-  "break"
-  "def" "do"
-  "fn"
-  "if"
-  "quasiquote" "quote"
-  "set" "splice"
-  "unquote" "upscope"
-  "var"
-  "while"
-  ;; macros
-  "%=" "*="
-  "++" "+="
-  "--" "-="
-  "->" "->>" "-?>" "-?>>"
-  "/="
-  "and" "as->" "as-macro" "as?->" "assert"
-  "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen"
-  "cond" "coro"
-  "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
-  "defn" "defn-"
-  "delay" "doc"
-  "each" "eachk" "eachp"
-  "eachy" ;; XXX: obsolete
-  "edefer"
-  "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
-  "ev/with-deadline"
-  "ffi/defbind"
-  "fiber-fn"
-  "for" "forever" "forv"
-  "generate"
-  "if-let" "if-not" "if-with" "import"
-  "juxt"
-  "label" "let" "loop"
-  "match"
-  "or"
-  "prompt" "protect"
-  "repeat"
-  "seq" "short-fn"
-  "tabseq" "toggle" "tracev" "try"
-  "unless" "use"
-  "var-" "varfn"
-  "when" "when-let" "when-with"
-  "with" "with-dyns" "with-syms" "with-vars"))
+  ; format-ignore
+  (#any-of? @function.macro
+    ; special forms
+    "break"
+    "def" "do"
+    "fn"
+    "if"
+    "quasiquote" "quote"
+    "set" "splice"
+    "unquote" "upscope"
+    "var"
+    "while"
+    ; macros
+    "%=" "*="
+    "++" "+="
+    "--" "-="
+    "->" "->>" "-?>" "-?>>"
+    "/="
+    "and" "as->" "as-macro" "as?->" "assert"
+    "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen"
+    "cond" "coro"
+    "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
+    "defn" "defn-"
+    "delay" "doc"
+    "each" "eachk" "eachp"
+    "eachy" 
+    ; XXX: obsolete
+    "edefer"
+    "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
+    "ev/with-deadline"
+    "ffi/defbind"
+    "fiber-fn"
+    "for" "forever" "forv"
+    "generate"
+    "if-let" "if-not" "if-with" "import"
+    "juxt"
+    "label" "let" "loop"
+    "match"
+    "or"
+    "prompt" "protect"
+    "repeat"
+    "seq" "short-fn"
+    "tabseq" "toggle" "tracev" "try"
+    "unless" "use"
+    "var-" "varfn"
+    "when" "when-let" "when-with"
+    "with" "with-dyns" "with-syms" "with-vars"))
 
 ;; All builtin functions
 ;;
@@ -113,189 +115,190 @@
 ;;       (print name))))
 
 ((sym_lit) @function.builtin
- (#any-of? @function.builtin
-  "%" "*" "+" "-" "/"
-  "<" "<=" "=" ">" ">="
-  ;; debugging -- start janet with -d and use (debug) to see these
-  ".break" ".breakall" ".bytecode"
-  ".clear" ".clearall"
-  ".disasm"
-  ".fiber" ".fn" ".frame"
-  ".locals"
-  ".next" ".nextc"
-  ".ppasm"
-  ".signal" ".slot" ".slots" ".source" ".stack" ".step"
-  ;; back to regularly scheduled program
-  "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
-  "all-dynamics" "any?" "apply"
-  "array"
-  "array/clear" "array/concat" "array/ensure" "array/fill"
-  "array/insert" "array/new" "array/new-filled" "array/peek"
-  "array/pop" "array/push" "array/remove" "array/slice" "array/trim"
-  "array?"
-  "asm"
-  "bad-compile" "bad-parse"
-  "band" "blshift" "bnot"
-  "boolean?"
-  "bor" "brshift" "brushift"
-  "buffer"
-  "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
-  "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill"
-  "buffer/format" "buffer/new" "buffer/new-filled" "buffer/popn"
-  "buffer/push" "buffer/push-at" "buffer/push-byte"
-  "buffer/push-string" "buffer/push-word" "buffer/slice"
-  "buffer/trim"
-  "buffer?"
-  "bxor"
-  "bytes?"
-  "cancel"
-  "cfunction?"
-  "cli-main"
-  "cmp" "comp" "compare" "compare<" "compare<=" "compare="
-  "compare>" "compare>="
-  "compile" "complement" "count" "curenv"
-  "debug"
-  "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage"
-  "debug/stack" "debug/stacktrace" "debug/step" "debug/unbreak"
-  "debug/unfbreak"
-  "debugger" "debugger-on-status"
-  "dec" "deep-not=" "deep=" "defglobal" "describe"
-  "dictionary?"
-  "disasm" "distinct" "div" "doc*" "doc-format" "doc-of" "dofile"
-  "drop" "drop-until" "drop-while" "dyn"
-  "eflush" "empty?" "env-lookup"
-  "eprin" "eprinf" "eprint" "eprintf" "error" "errorf"
-  "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
-  "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan"
-  "ev/chan-close" "ev/chunk" "ev/close" "ev/count" "ev/deadline"
-  "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
-  "ev/read" "ev/release-lock" "ev/release-rlock"
-  "ev/release-wlock" "ev/rselect" "ev/rwlock" "ev/select"
-  "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write"
-  "eval" "eval-string" "even?" "every?" "extreme"
-  "false?"
-  "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
-  "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc"
-  "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction"
-  "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
-  "ffi/trampoline" "ffi/write"
-  "fiber/can-resume?" "fiber/current" "fiber/getenv"
-  "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
-  "fiber/setenv" "fiber/setmaxstack" "fiber/status"
-  "fiber?"
-  "file/close" "file/flush" "file/lines" "file/open" "file/read"
-  "file/seek" "file/tell" "file/temp" "file/write"
-  "filter" "find" "find-index" "first" "flatten" "flatten-into"
-  "flush" "flycheck" "freeze" "frequencies" "from-pairs"
-  "function?"
-  "gccollect" "gcinterval" "gcsetinterval"
-  "gensym" "get" "get-in" "getline" "getproto" "group-by"
-  "has-key?" "has-value?" "hash"
-  "idempotent?" "identity" "import*" "in" "inc" "index-of"
-  "indexed?"
-  "int/s64" "int/to-bytes" "int/to-number" "int/u64"
-  "int?"
-  "interleave" "interpose" "invert"
-  "juxt*"
-  "keep" "keep-syntax" "keep-syntax!" "keys"
-  "keyword"
-  "keyword/slice"
-  "keyword?"
-  "kvs"
-  "last" "length" "load-image"
-  "macex" "macex1" "maclintf"
-  "make-env" "make-image" "map" "mapcat" "marshal"
-  "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh"
-  "math/atan" "math/atan2" "math/atanh" "math/cbrt" "math/ceil"
-  "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
-  "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd"
-  "math/hypot" "math/lcm" "math/log" "math/log-gamma"
-  "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
-  "math/random" "math/rng" "math/rng-buffer" "math/rng-int"
-  "math/rng-uniform" "math/round" "math/seedrandom" "math/sin"
-  "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc"
-  "max" "max-of" "mean" "memcmp" "merge" "merge-into"
-  "merge-module" "min" "min-of" "mod"
-  "module/add-paths" "module/expand-path" "module/find"
-  "module/value"
-  "nan?" "nat?" "native" "neg?"
-  "net/accept" "net/accept-loop" "net/address"
-  "net/address-unpack" "net/chunk" "net/close" "net/connect"
-  "net/flush" "net/listen" "net/localname" "net/peername"
-  "net/read" "net/recv-from" "net/send-to" "net/server"
-  "net/setsockopt" "net/shutdown" "net/write"
-  "next"
-  "nil?"
-  "not" "not="
-  "number?"
-  "odd?" "one?"
-  "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
-  "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir"
-  "os/environ" "os/execute" "os/exit" "os/getenv" "os/link"
-  "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
-  "os/perm-string" "os/pipe" "os/proc-close" "os/proc-kill"
-  "os/proc-wait" "os/readlink" "os/realpath" "os/rename"
-  "os/rm" "os/rmdir" "os/setenv" "os/shell" "os/sleep"
-  "os/spawn" "os/stat" "os/symlink" "os/time" "os/touch"
-  "os/umask" "os/which"
-  "pairs"
-  "parse" "parse-all"
-  "parser/byte" "parser/clone" "parser/consume" "parser/eof"
-  "parser/error" "parser/flush" "parser/has-more"
-  "parser/insert" "parser/new" "parser/produce" "parser/state"
-  "parser/status" "parser/where"
-  "partial" "partition" "partition-by"
-  "peg/compile" "peg/find" "peg/find-all" "peg/match"
-  "peg/replace" "peg/replace-all"
-  "pos?" "postwalk" "pp" "prewalk"
-  "prin" "prinf" "print" "printf"
-  "product" "propagate" "put" "put-in"
-  "quit"
-  "range" "reduce" "reduce2" "repl" "require" "resume"
-  "return" "reverse" "reverse!" "run-context"
-  "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
-  "some" "sort" "sort-by" "sorted" "sorted-by" "spit"
-  "string"
-  "string/ascii-lower" "string/ascii-upper" "string/bytes"
-  "string/check-set" "string/find" "string/find-all"
-  "string/format" "string/from-bytes" "string/has-prefix?"
-  "string/has-suffix?" "string/join" "string/repeat"
-  "string/replace" "string/replace-all" "string/reverse"
-  "string/slice" "string/split" "string/trim" "string/triml"
-  "string/trimr"
-  "string?"
-  "struct"
-  "struct/getproto" "struct/proto-flatten" "struct/to-table"
-  "struct/with-proto"
-  "struct?"
-  "sum"
-  "symbol"
-  "symbol/slice"
-  "symbol?"
-  "table"
-  "table/clear" "table/clone" "table/getproto" "table/new"
-  "table/proto-flatten" "table/rawget" "table/setproto"
-  "table/to-struct"
-  "table?"
-  "take" "take-until" "take-while"
-  ;; XXX: obsolete
-  "tarray/buffer" "tarray/copy-bytes" "tarray/length"
-  "tarray/new" "tarray/properties" "tarray/slice"
-  "tarray/swap-bytes"
-  ;; XXX: obsolete
-  "thread/close" "thread/current" "thread/exit" "thread/new"
-  "thread/receive" "thread/send"
-  ;; end of obsolete
-  "trace" "true?" "truthy?"
-  "tuple"
-  "tuple/brackets" "tuple/setmap" "tuple/slice"
-  "tuple/sourcemap" "tuple/type"
-  "tuple?"
-  "type"
-  "unmarshal" "untrace" "update" "update-in"
-  "values" "varglobal"
-  "walk" "warn-compile"
-  "xprin" "xprinf" "xprint" "xprintf"
-  "yield"
-  "zero?" "zipcoll"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    "%" "*" "+" "-" "/"
+    "<" "<=" "=" ">" ">="
+    ; debugging -- start janet with -d and use (debug) to see these
+    ".break" ".breakall" ".bytecode"
+    ".clear" ".clearall"
+    ".disasm"
+    ".fiber" ".fn" ".frame"
+    ".locals"
+    ".next" ".nextc"
+    ".ppasm"
+    ".signal" ".slot" ".slots" ".source" ".stack" ".step"
+    ; back to regularly scheduled program
+    "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
+    "all-dynamics" "any?" "apply"
+    "array"
+    "array/clear" "array/concat" "array/ensure" "array/fill"
+    "array/insert" "array/new" "array/new-filled" "array/peek"
+    "array/pop" "array/push" "array/remove" "array/slice" "array/trim"
+    "array?"
+    "asm"
+    "bad-compile" "bad-parse"
+    "band" "blshift" "bnot"
+    "boolean?"
+    "bor" "brshift" "brushift"
+    "buffer"
+    "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
+    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill"
+    "buffer/format" "buffer/new" "buffer/new-filled" "buffer/popn"
+    "buffer/push" "buffer/push-at" "buffer/push-byte"
+    "buffer/push-string" "buffer/push-word" "buffer/slice"
+    "buffer/trim"
+    "buffer?"
+    "bxor"
+    "bytes?"
+    "cancel"
+    "cfunction?"
+    "cli-main"
+    "cmp" "comp" "compare" "compare<" "compare<=" "compare="
+    "compare>" "compare>="
+    "compile" "complement" "count" "curenv"
+    "debug"
+    "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage"
+    "debug/stack" "debug/stacktrace" "debug/step" "debug/unbreak"
+    "debug/unfbreak"
+    "debugger" "debugger-on-status"
+    "dec" "deep-not=" "deep=" "defglobal" "describe"
+    "dictionary?"
+    "disasm" "distinct" "div" "doc*" "doc-format" "doc-of" "dofile"
+    "drop" "drop-until" "drop-while" "dyn"
+    "eflush" "empty?" "env-lookup"
+    "eprin" "eprinf" "eprint" "eprintf" "error" "errorf"
+    "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
+    "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan"
+    "ev/chan-close" "ev/chunk" "ev/close" "ev/count" "ev/deadline"
+    "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
+    "ev/read" "ev/release-lock" "ev/release-rlock"
+    "ev/release-wlock" "ev/rselect" "ev/rwlock" "ev/select"
+    "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write"
+    "eval" "eval-string" "even?" "every?" "extreme"
+    "false?"
+    "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
+    "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc"
+    "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction"
+    "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
+    "ffi/trampoline" "ffi/write"
+    "fiber/can-resume?" "fiber/current" "fiber/getenv"
+    "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
+    "fiber/setenv" "fiber/setmaxstack" "fiber/status"
+    "fiber?"
+    "file/close" "file/flush" "file/lines" "file/open" "file/read"
+    "file/seek" "file/tell" "file/temp" "file/write"
+    "filter" "find" "find-index" "first" "flatten" "flatten-into"
+    "flush" "flycheck" "freeze" "frequencies" "from-pairs"
+    "function?"
+    "gccollect" "gcinterval" "gcsetinterval"
+    "gensym" "get" "get-in" "getline" "getproto" "group-by"
+    "has-key?" "has-value?" "hash"
+    "idempotent?" "identity" "import*" "in" "inc" "index-of"
+    "indexed?"
+    "int/s64" "int/to-bytes" "int/to-number" "int/u64"
+    "int?"
+    "interleave" "interpose" "invert"
+    "juxt*"
+    "keep" "keep-syntax" "keep-syntax!" "keys"
+    "keyword"
+    "keyword/slice"
+    "keyword?"
+    "kvs"
+    "last" "length" "load-image"
+    "macex" "macex1" "maclintf"
+    "make-env" "make-image" "map" "mapcat" "marshal"
+    "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh"
+    "math/atan" "math/atan2" "math/atanh" "math/cbrt" "math/ceil"
+    "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
+    "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd"
+    "math/hypot" "math/lcm" "math/log" "math/log-gamma"
+    "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
+    "math/random" "math/rng" "math/rng-buffer" "math/rng-int"
+    "math/rng-uniform" "math/round" "math/seedrandom" "math/sin"
+    "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc"
+    "max" "max-of" "mean" "memcmp" "merge" "merge-into"
+    "merge-module" "min" "min-of" "mod"
+    "module/add-paths" "module/expand-path" "module/find"
+    "module/value"
+    "nan?" "nat?" "native" "neg?"
+    "net/accept" "net/accept-loop" "net/address"
+    "net/address-unpack" "net/chunk" "net/close" "net/connect"
+    "net/flush" "net/listen" "net/localname" "net/peername"
+    "net/read" "net/recv-from" "net/send-to" "net/server"
+    "net/setsockopt" "net/shutdown" "net/write"
+    "next"
+    "nil?"
+    "not" "not="
+    "number?"
+    "odd?" "one?"
+    "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
+    "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir"
+    "os/environ" "os/execute" "os/exit" "os/getenv" "os/link"
+    "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
+    "os/perm-string" "os/pipe" "os/proc-close" "os/proc-kill"
+    "os/proc-wait" "os/readlink" "os/realpath" "os/rename"
+    "os/rm" "os/rmdir" "os/setenv" "os/shell" "os/sleep"
+    "os/spawn" "os/stat" "os/symlink" "os/time" "os/touch"
+    "os/umask" "os/which"
+    "pairs"
+    "parse" "parse-all"
+    "parser/byte" "parser/clone" "parser/consume" "parser/eof"
+    "parser/error" "parser/flush" "parser/has-more"
+    "parser/insert" "parser/new" "parser/produce" "parser/state"
+    "parser/status" "parser/where"
+    "partial" "partition" "partition-by"
+    "peg/compile" "peg/find" "peg/find-all" "peg/match"
+    "peg/replace" "peg/replace-all"
+    "pos?" "postwalk" "pp" "prewalk"
+    "prin" "prinf" "print" "printf"
+    "product" "propagate" "put" "put-in"
+    "quit"
+    "range" "reduce" "reduce2" "repl" "require" "resume"
+    "return" "reverse" "reverse!" "run-context"
+    "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
+    "some" "sort" "sort-by" "sorted" "sorted-by" "spit"
+    "string"
+    "string/ascii-lower" "string/ascii-upper" "string/bytes"
+    "string/check-set" "string/find" "string/find-all"
+    "string/format" "string/from-bytes" "string/has-prefix?"
+    "string/has-suffix?" "string/join" "string/repeat"
+    "string/replace" "string/replace-all" "string/reverse"
+    "string/slice" "string/split" "string/trim" "string/triml"
+    "string/trimr"
+    "string?"
+    "struct"
+    "struct/getproto" "struct/proto-flatten" "struct/to-table"
+    "struct/with-proto"
+    "struct?"
+    "sum"
+    "symbol"
+    "symbol/slice"
+    "symbol?"
+    "table"
+    "table/clear" "table/clone" "table/getproto" "table/new"
+    "table/proto-flatten" "table/rawget" "table/setproto"
+    "table/to-struct"
+    "table?"
+    "take" "take-until" "take-while"
+    ; XXX: obsolete
+    "tarray/buffer" "tarray/copy-bytes" "tarray/length"
+    "tarray/new" "tarray/properties" "tarray/slice"
+    "tarray/swap-bytes"
+    ; XXX: obsolete
+    "thread/close" "thread/current" "thread/exit" "thread/new"
+    "thread/receive" "thread/send"
+    ; end of obsolete
+    "trace" "true?" "truthy?"
+    "tuple"
+    "tuple/brackets" "tuple/setmap" "tuple/slice"
+    "tuple/sourcemap" "tuple/type"
+    "tuple?"
+    "type"
+    "unmarshal" "untrace" "update" "update-in"
+    "values" "varglobal"
+    "walk" "warn-compile"
+    "xprin" "xprinf" "xprint" "xprintf"
+    "yield"
+    "zero?" "zipcoll"))
 
diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index 73fb386e3..8ce928eb8 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [
   ; ... refers to the portion that this indent query will have effects on
   (class_body)                        ; { ... } of `class X`
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index 0e8758b6d..5de5f5ff5 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -70,6 +70,7 @@
   name: (identifier) @local.definition.parameter)
 (catch_formal_parameter
   name: (identifier) @local.definition.parameter)
+
 (inferred_parameters (identifier) @local.definition.parameter) ; (x,y) -> ...
 (lambda_expression
     parameters: (identifier) @local.definition.parameter) ; x -> ...
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index e9967e95e..968ba87a0 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -59,197 +59,198 @@
 
 ; 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"))
+  ; format-ignore
+  (#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
 
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 20a154618..21ae1adb0 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -127,216 +127,217 @@
 ;;  type_names = sort(union(get_types(Core), get_types(Base)))
 ;;
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-  "AbstractArray"
-  "AbstractChannel"
-  "AbstractChar"
-  "AbstractDict"
-  "AbstractDisplay"
-  "AbstractFloat"
-  "AbstractIrrational"
-  "AbstractLock"
-  "AbstractMatch"
-  "AbstractMatrix"
-  "AbstractPattern"
-  "AbstractRange"
-  "AbstractSet"
-  "AbstractSlices"
-  "AbstractString"
-  "AbstractUnitRange"
-  "AbstractVecOrMat"
-  "AbstractVector"
-  "Any"
-  "ArgumentError"
-  "Array"
-  "AssertionError"
-  "Atomic"
-  "BigFloat"
-  "BigInt"
-  "BitArray"
-  "BitMatrix"
-  "BitSet"
-  "BitVector"
-  "Bool"
-  "BoundsError"
-  "By"
-  "CanonicalIndexError"
-  "CapturedException"
-  "CartesianIndex"
-  "CartesianIndices"
-  "Cchar"
-  "Cdouble"
-  "Cfloat"
-  "Channel"
-  "Char"
-  "Cint"
-  "Cintmax_t"
-  "Clong"
-  "Clonglong"
-  "Cmd"
-  "Colon"
-  "ColumnSlices"
-  "Complex"
-  "ComplexF16"
-  "ComplexF32"
-  "ComplexF64"
-  "ComposedFunction"
-  "CompositeException"
-  "ConcurrencyViolationError"
-  "Condition"
-  "Cptrdiff_t"
-  "Cshort"
-  "Csize_t"
-  "Cssize_t"
-  "Cstring"
-  "Cuchar"
-  "Cuint"
-  "Cuintmax_t"
-  "Culong"
-  "Culonglong"
-  "Cushort"
-  "Cvoid"
-  "Cwchar_t"
-  "Cwstring"
-  "DataType"
-  "DenseArray"
-  "DenseMatrix"
-  "DenseVecOrMat"
-  "DenseVector"
-  "Dict"
-  "DimensionMismatch"
-  "Dims"
-  "DivideError"
-  "DomainError"
-  "EOFError"
-  "Enum"
-  "ErrorException"
-  "Exception"
-  "ExponentialBackOff"
-  "Expr"
-  "Float16"
-  "Float32"
-  "Float64"
-  "Function"
-  "GlobalRef"
-  "HTML"
-  "IO"
-  "IOBuffer"
-  "IOContext"
-  "IOStream"
-  "IdDict"
-  "IndexCartesian"
-  "IndexLinear"
-  "IndexStyle"
-  "InexactError"
-  "InitError"
-  "Int"
-  "Int128"
-  "Int16"
-  "Int32"
-  "Int64"
-  "Int8"
-  "Integer"
-  "InterruptException"
-  "InvalidStateException"
-  "Irrational"
-  "KeyError"
-  "LazyString"
-  "LinRange"
-  "LineNumberNode"
-  "LinearIndices"
-  "LoadError"
-  "Lt"
-  "MIME"
-  "Matrix"
-  "Method"
-  "MethodError"
-  "Missing"
-  "MissingException"
-  "Module"
-  "NTuple"
-  "NamedTuple"
-  "Nothing"
-  "Number"
-  "Ordering"
-  "OrdinalRange"
-  "OutOfMemoryError"
-  "OverflowError"
-  "Pair"
-  "ParseError"
-  "PartialQuickSort"
-  "Perm"
-  "PermutedDimsArray"
-  "Pipe"
-  "ProcessFailedException"
-  "Ptr"
-  "QuoteNode"
-  "Rational"
-  "RawFD"
-  "ReadOnlyMemoryError"
-  "Real"
-  "ReentrantLock"
-  "Ref"
-  "Regex"
-  "RegexMatch"
-  "Returns"
-  "ReverseOrdering"
-  "RoundingMode"
-  "RowSlices"
-  "SegmentationFault"
-  "Set"
-  "Signed"
-  "Slices"
-  "Some"
-  "SpinLock"
-  "StackFrame"
-  "StackOverflowError"
-  "StackTrace"
-  "Stateful"
-  "StepRange"
-  "StepRangeLen"
-  "StridedArray"
-  "StridedMatrix"
-  "StridedVecOrMat"
-  "StridedVector"
-  "String"
-  "StringIndexError"
-  "SubArray"
-  "SubString"
-  "SubstitutionString"
-  "Symbol"
-  "SystemError"
-  "Task"
-  "TaskFailedException"
-  "Text"
-  "TextDisplay"
-  "Timer"
-  "Tmstruct"
-  "Tuple"
-  "Type"
-  "TypeError"
-  "TypeVar"
-  "UInt"
-  "UInt128"
-  "UInt16"
-  "UInt32"
-  "UInt64"
-  "UInt8"
-  "UndefInitializer"
-  "UndefKeywordError"
-  "UndefRefError"
-  "UndefVarError"
-  "Union"
-  "UnionAll"
-  "UnitRange"
-  "Unsigned"
-  "Val"
-  "VecElement"
-  "VecOrMat"
-  "Vector"
-  "VersionNumber"
-  "WeakKeyDict"
-  "WeakRef"))
+  ; format-ignore
+  (#any-of? @type.builtin
+    "AbstractArray"
+    "AbstractChannel"
+    "AbstractChar"
+    "AbstractDict"
+    "AbstractDisplay"
+    "AbstractFloat"
+    "AbstractIrrational"
+    "AbstractLock"
+    "AbstractMatch"
+    "AbstractMatrix"
+    "AbstractPattern"
+    "AbstractRange"
+    "AbstractSet"
+    "AbstractSlices"
+    "AbstractString"
+    "AbstractUnitRange"
+    "AbstractVecOrMat"
+    "AbstractVector"
+    "Any"
+    "ArgumentError"
+    "Array"
+    "AssertionError"
+    "Atomic"
+    "BigFloat"
+    "BigInt"
+    "BitArray"
+    "BitMatrix"
+    "BitSet"
+    "BitVector"
+    "Bool"
+    "BoundsError"
+    "By"
+    "CanonicalIndexError"
+    "CapturedException"
+    "CartesianIndex"
+    "CartesianIndices"
+    "Cchar"
+    "Cdouble"
+    "Cfloat"
+    "Channel"
+    "Char"
+    "Cint"
+    "Cintmax_t"
+    "Clong"
+    "Clonglong"
+    "Cmd"
+    "Colon"
+    "ColumnSlices"
+    "Complex"
+    "ComplexF16"
+    "ComplexF32"
+    "ComplexF64"
+    "ComposedFunction"
+    "CompositeException"
+    "ConcurrencyViolationError"
+    "Condition"
+    "Cptrdiff_t"
+    "Cshort"
+    "Csize_t"
+    "Cssize_t"
+    "Cstring"
+    "Cuchar"
+    "Cuint"
+    "Cuintmax_t"
+    "Culong"
+    "Culonglong"
+    "Cushort"
+    "Cvoid"
+    "Cwchar_t"
+    "Cwstring"
+    "DataType"
+    "DenseArray"
+    "DenseMatrix"
+    "DenseVecOrMat"
+    "DenseVector"
+    "Dict"
+    "DimensionMismatch"
+    "Dims"
+    "DivideError"
+    "DomainError"
+    "EOFError"
+    "Enum"
+    "ErrorException"
+    "Exception"
+    "ExponentialBackOff"
+    "Expr"
+    "Float16"
+    "Float32"
+    "Float64"
+    "Function"
+    "GlobalRef"
+    "HTML"
+    "IO"
+    "IOBuffer"
+    "IOContext"
+    "IOStream"
+    "IdDict"
+    "IndexCartesian"
+    "IndexLinear"
+    "IndexStyle"
+    "InexactError"
+    "InitError"
+    "Int"
+    "Int128"
+    "Int16"
+    "Int32"
+    "Int64"
+    "Int8"
+    "Integer"
+    "InterruptException"
+    "InvalidStateException"
+    "Irrational"
+    "KeyError"
+    "LazyString"
+    "LinRange"
+    "LineNumberNode"
+    "LinearIndices"
+    "LoadError"
+    "Lt"
+    "MIME"
+    "Matrix"
+    "Method"
+    "MethodError"
+    "Missing"
+    "MissingException"
+    "Module"
+    "NTuple"
+    "NamedTuple"
+    "Nothing"
+    "Number"
+    "Ordering"
+    "OrdinalRange"
+    "OutOfMemoryError"
+    "OverflowError"
+    "Pair"
+    "ParseError"
+    "PartialQuickSort"
+    "Perm"
+    "PermutedDimsArray"
+    "Pipe"
+    "ProcessFailedException"
+    "Ptr"
+    "QuoteNode"
+    "Rational"
+    "RawFD"
+    "ReadOnlyMemoryError"
+    "Real"
+    "ReentrantLock"
+    "Ref"
+    "Regex"
+    "RegexMatch"
+    "Returns"
+    "ReverseOrdering"
+    "RoundingMode"
+    "RowSlices"
+    "SegmentationFault"
+    "Set"
+    "Signed"
+    "Slices"
+    "Some"
+    "SpinLock"
+    "StackFrame"
+    "StackOverflowError"
+    "StackTrace"
+    "Stateful"
+    "StepRange"
+    "StepRangeLen"
+    "StridedArray"
+    "StridedMatrix"
+    "StridedVecOrMat"
+    "StridedVector"
+    "String"
+    "StringIndexError"
+    "SubArray"
+    "SubString"
+    "SubstitutionString"
+    "Symbol"
+    "SystemError"
+    "Task"
+    "TaskFailedException"
+    "Text"
+    "TextDisplay"
+    "Timer"
+    "Tmstruct"
+    "Tuple"
+    "Type"
+    "TypeError"
+    "TypeVar"
+    "UInt"
+    "UInt128"
+    "UInt16"
+    "UInt32"
+    "UInt64"
+    "UInt8"
+    "UndefInitializer"
+    "UndefKeywordError"
+    "UndefRefError"
+    "UndefVarError"
+    "Union"
+    "UnionAll"
+    "UnitRange"
+    "Unsigned"
+    "Val"
+    "VecElement"
+    "VecOrMat"
+    "Vector"
+    "VersionNumber"
+    "WeakKeyDict"
+    "WeakRef"))
 
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "begin" "end")
diff --git a/queries/julia/locals.scm b/queries/julia/locals.scm
index dd00f8a9b..9e607cfd1 100644
--- a/queries/julia/locals.scm
+++ b/queries/julia/locals.scm
@@ -52,8 +52,9 @@
   parameter: (identifier) @local.definition.parameter
   (_))
 
+;; Single parameter arrow function
 (function_expression
- . (identifier) @local.definition.parameter) ;; Single parameter arrow function
+ . (identifier) @local.definition.parameter) 
 
 
 ;;; Function/macro definitions
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 0cb861596..ea87c0da0 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -220,8 +220,9 @@
 
 (function_call
   (identifier) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
-    ;; built-in functions in Lua 5.1
+    ; built-in functions in Lua 5.1
     "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
     "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
     "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 03e057dfe..2ce156574 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -67,14 +67,15 @@
       . 
       (string
         content: (_) @injection.content)
-      . (_) .) ; Limiting predicate handling to only functions with 4 arguments
+      . (_) 
+      .) ; Limiting predicate handling to only functions with 4 arguments
   (#eq? @_user_cmd "vim.api.nvim_buf_create_user_command")
   (#set! injection.language "vim"))
 
 ;; rhs highlighting for vim.keymap.set/vim.api.nvim_set_keymap/vim.api.nvim_buf_set_keymap
 ; (function_call
 ;   name: (_) @_map
-;   arguments: 
+;   arguments:
 ;     (arguments
 ;       . (_)
 ;       . (_)
@@ -86,7 +87,7 @@
 ;
 ; (function_call
 ;   name: (_) @_map
-;   arguments: 
+;   arguments:
 ;     (arguments
 ;       . (_)
 ;       . (_)
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 5fdfb5006..328401f26 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -184,8 +184,9 @@
 
 (function_call
   (identifier) @function.builtin
+  ; format-ignore
   (#any-of? @function.builtin
-    ;; built-in functions in Lua 5.1
+    ; built-in functions in Lua 5.1
     "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
     "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
     "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index ff768a19d..6d7f4c2d7 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -23,6 +23,7 @@
   (arith_cmp_predicate)
 ] @keyword
 
+; format-ignore
 [
   "module"
   "unrealized_conversion_cast"
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 0f6caf4e2..bcabbbc65 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -98,18 +98,20 @@
 )
 
 ; builtin functions (without builtins prefix)
-(variable_expression name: (identifier) @function.builtin (#any-of? @function.builtin
-  ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
-  "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap" "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength" "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose" "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext" "unsafeGetAttrPos" "zipAttrsWith"
-  ; primops, `__<tab>` in `nix repl`
- "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort"
-))
+(variable_expression name: (identifier) @function.builtin 
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
+    "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap" "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength" "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose" "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext" "unsafeGetAttrPos" "zipAttrsWith"
+    ; primops, `__<tab>` in `nix repl`
+   "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort"))
 
 ; constants
-(variable_expression name: (identifier) @constant.builtin (#any-of? @constant.builtin
-  ; nix eval --impure --expr 'with builtins; filter (x: !(isFunction builtins.${x} || isBool builtins.${x})) (attrNames builtins)'
-  "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"
-))
+(variable_expression name: (identifier) @constant.builtin 
+  ; format-ignore
+  (#any-of? @constant.builtin
+    ; nix eval --impure --expr 'with builtins; filter (x: !(isFunction builtins.${x} || isBool builtins.${x})) (attrNames builtins)'
+    "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"))
 
 ; string interpolation (this was very annoying to get working properly)
 (interpolation "${" @punctuation.special (_) "}" @punctuation.special) @none
diff --git a/queries/ocaml/indents.scm b/queries/ocaml/indents.scm
index 48049dd0d..d821abbd7 100644
--- a/queries/ocaml/indents.scm
+++ b/queries/ocaml/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [ 
   (let_binding)                 ; let = ...
   (type_binding)
diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index cdd9d1d83..7ac2c7c63 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -2,18 +2,19 @@
 
 (tag_name) @tag
 ((tag_name) @constant.builtin
- ; https://www.script-example.com/html-tag-liste
- (#any-of? @constant.builtin
-  "head" "title" "base" "link" "meta" "style"
-  "body" "article" "section" "nav" "aside" "h1" "h2" "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address"
-  "p" "hr" "pre" "blockquote" "ol" "ul" "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div"
-  "a" "em" "strong" "small" "s" "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i" "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr"
-  "ins" "del"
-  "picture" "source" "img" "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area"
-  "table" "caption" "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th "
-  "form" "label" "input" "button" "select" "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
-  "details" "summary" "dialog"
-  "script" "noscript" "template" "slot" "canvas"))
+  ; https://www.script-example.com/html-tag-liste
+  ; format-ignore
+  (#any-of? @constant.builtin
+    "head" "title" "base" "link" "meta" "style"
+    "body" "article" "section" "nav" "aside" "h1" "h2" "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address"
+    "p" "hr" "pre" "blockquote" "ol" "ul" "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div"
+    "a" "em" "strong" "small" "s" "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i" "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr"
+    "ins" "del"
+    "picture" "source" "img" "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area"
+    "table" "caption" "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th "
+    "form" "label" "input" "button" "select" "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
+    "details" "summary" "dialog"
+    "script" "noscript" "template" "slot" "canvas"))
 
 (id) @constant
 (class) @property
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 9ba1fcf14..8d272185c 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -17,15 +17,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin
-           ;; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
-           "Ellipsis"
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
+  ; format-ignore
+  (#any-of? @constant.builtin 
+    ; https://docs.python.org/3/library/constants.html
+    "NotImplemented" "Ellipsis" 
+    "quit" "exit" "copyright" "credits" "license"))
 
 "_" @constant.builtin ; match wildcard
 
@@ -336,22 +332,23 @@
  (#any-of? @constructor "__new__" "__init__"))
 
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+  ; format-ignore
+  (#any-of? @type.builtin
+    ; https://docs.python.org/3/library/exceptions.html
+    "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+    "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
+    "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+    "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+    "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+    "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+    "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+    "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+    "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+    "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+    ; https://docs.python.org/3/library/stdtypes.html
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+    "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 
 ;; Regex from the `re` module
 
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index b3b2b0a88..d83a21427 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -32,18 +32,18 @@
 
 ((directive
    name: (type) @function.builtin)
- (#any-of?
-  @function.builtin
-  ; https://docutils.sourceforge.io/docs/ref/rst/directives.html
-  "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
-  "image" "figure"
-  "topic" "sidebar" "line-block" "parsed-literal" "code" "math" "rubric" "epigraph" "highlights" "pull-quote" "compound" "container"
-  "table" "csv-table" "list-table"
-  "contents" "sectnum" "section-numbering" "header" "footer"
-  "target-notes"
-  "meta"
-  "replace" "unicode" "date"
-  "raw" "class" "role" "default-role" "title" "restructuredtext-test-directive"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; https://docutils.sourceforge.io/docs/ref/rst/directives.html
+    "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
+    "image" "figure"
+    "topic" "sidebar" "line-block" "parsed-literal" "code" "math" "rubric" "epigraph" "highlights" "pull-quote" "compound" "container"
+    "table" "csv-table" "list-table"
+    "contents" "sectnum" "section-numbering" "header" "footer"
+    "target-notes"
+    "meta"
+    "replace" "unicode" "date"
+    "raw" "class" "role" "default-role" "title" "restructuredtext-test-directive"))
 
 ;; Blocks
 
@@ -89,26 +89,26 @@
 (role) @function
 
 ((role) @function.builtin
- (#any-of?
-  @function.builtin
-  ; https://docutils.sourceforge.io/docs/ref/rst/roles.html
-  ":emphasis:"
-  ":literal:"
-  ":code:"
-  ":math:"
-  ":pep-reference:"
-  ":PEP:"
-  ":rfc-reference:"
-  ":RFC:"
-  ":strong:"
-  ":subscript:"
-  ":sub:"
-  ":superscript:"
-  ":sup:"
-  ":title-reference:"
-  ":title:"
-  ":t:"
-  ":raw:"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; https://docutils.sourceforge.io/docs/ref/rst/roles.html
+    ":emphasis:"
+    ":literal:"
+    ":code:"
+    ":math:"
+    ":pep-reference:"
+    ":PEP:"
+    ":rfc-reference:"
+    ":RFC:"
+    ":strong:"
+    ":subscript:"
+    ":sub:"
+    ":superscript:"
+    ":sup:"
+    ":title-reference:"
+    ":title:"
+    ":t:"
+    ":raw:"))
 
 [
  "interpreted_text"
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index f555920ba..fdd494d8b 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -104,79 +104,80 @@
 ;; procedures in R5RS and R6RS but not in R6RS-lib
 
 ((symbol) @function.builtin
- (#any-of? @function.builtin
-  ;; eq
-  "eqv?" "eq?" "equal?"
-  ;; number
-  "number?" "complex?" "real?" "rational?" "integer?"
-  "exact?" "inexact?"
-  "zero?" "positive?" "negative?" "odd?" "even?" "finite?" "infinite?" "nan?"
-  "max" "min"
-  "abs" "quotient" "remainder" "modulo"
-  "div" "div0" "mod" "mod0" "div-and-mod" "div0-and-mod0"
-  "gcd" "lcm" "numerator" "denominator"
-  "floor" "ceiling" "truncate" "round"
-  "rationalize"
-  "exp" "log" "sin" "cos" "tan" "asin" "acos" "atan"
-  "sqrt" "expt"
-  "exact-integer-sqrt"
-  "make-rectangular" "make-polar" "real-part" "imag-part" "magnitude" "angle"
-  "real-valued" "rational-valued?" "integer-valued?"
-  "exact" "inexact" "exact->inexact" "inexact->exact"
-  "number->string" "string->number"
-  ;; boolean
-  "boolean?" "not" "boolean=?"
-  ;; pair
-  "pair?" "cons" 
-  "car" "cdr" 
-  "caar" "cadr" "cdar" "cddr" 
-  "caaar" "caadr" "cadar" "caddr" "cdaar" "cdadr" "cddar" "cdddr"
-  "caaaar" "caaadr" "caadar" "caaddr" "cadaar" "cadadr" "caddar" "cadddr"
-  "cdaaar" "cdaadr" "cdadar" "cdaddr" "cddaar" "cddadr" "cdddar" "cddddr"
-  "set-car!" "set-cdr!"
-  ;; list
-  "null?" "list?"
-  "list" "length" "append" "reverse" "list-tail" "list-ref"
-  "map" "for-each"
-  "memq" "memv" "member" "assq" "assv" "assoc"
-  ;; symbol
-  "symbol?" "symbol->string" "string->symbol" "symbol=?"
-  ;; char
-  "char?" "char=?" "char<?" "char>?" "char<=?" "char>=?"
-  "char-ci=?" "char-ci<?" "char-ci>?" "char-ci<=?" "char-ci>=?"
-  "char-alphabetic?" "char-numeric?" "char-whitespace?" "char-upper-case?" "char-lower-case?"
-  "char->integer" "integer->char"
-  "char-upcase" "char-downcase"
-  ;; string
-  "string?" "make-string" "string" "string-length" "string-ref" "string-set!"
-  "string=?" "string-ci=?" "string<?" "string>?" "string<=?" "string>=?"
-  "string-ci<?" "string-ci>?" "string-ci<=?" "string-ci>=?"
-  "substring" "string-append" "string->list" "list->string"
-  "string-for-each"
-  "string-copy" "string-fill!"
-  "string-upcase" "string-downcase"
-  ;; vector
-  "vector?" "make-vector" "vector" "vector-length" "vector-ref" "vector-set!"
-  "vector->list" "list->vector" "vector-fill!" "vector-map" "vector-for-each"
-  ;; bytevector
-  "bytevector?" "native-endianness"
-  "make-bytevector" "bytevector-length" "bytevector=?" "bytevector-fill!"
-  "bytevector-copy!" "bytevector-copy"
-  ;; error
-  "error" "assertion-violation"
-  ;; control
-  "procedure?" "apply" "force"
-  "call-with-current-continuation" "call/cc"
-  "values" "call-with-values" "dynamic-wind"
-  "eval" "scheme-report-environment" "null-environment" "interaction-environment"
-  ;; IO
-  "call-with-input-file" "call-with-output-file" "input-port?" "output-port?"
-  "current-input-port" "current-output-port" "with-input-from-file" "with-output-to-file"
-  "open-input-file" "open-output-file" "close-input-port" "close-output-port"
-  ;; input
-  "read" "read-char" "peek-char" "eof-object?" "char-ready?"
-  ;; output
-  "write" "display" "newline" "write-char"
-  ;; system
-  "load" "transcript-on" "transcript-off"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    ; eq
+    "eqv?" "eq?" "equal?"
+    ; number
+    "number?" "complex?" "real?" "rational?" "integer?"
+    "exact?" "inexact?"
+    "zero?" "positive?" "negative?" "odd?" "even?" "finite?" "infinite?" "nan?"
+    "max" "min"
+    "abs" "quotient" "remainder" "modulo"
+    "div" "div0" "mod" "mod0" "div-and-mod" "div0-and-mod0"
+    "gcd" "lcm" "numerator" "denominator"
+    "floor" "ceiling" "truncate" "round"
+    "rationalize"
+    "exp" "log" "sin" "cos" "tan" "asin" "acos" "atan"
+    "sqrt" "expt"
+    "exact-integer-sqrt"
+    "make-rectangular" "make-polar" "real-part" "imag-part" "magnitude" "angle"
+    "real-valued" "rational-valued?" "integer-valued?"
+    "exact" "inexact" "exact->inexact" "inexact->exact"
+    "number->string" "string->number"
+    ; boolean
+    "boolean?" "not" "boolean=?"
+    ; pair
+    "pair?" "cons" 
+    "car" "cdr" 
+    "caar" "cadr" "cdar" "cddr" 
+    "caaar" "caadr" "cadar" "caddr" "cdaar" "cdadr" "cddar" "cdddr"
+    "caaaar" "caaadr" "caadar" "caaddr" "cadaar" "cadadr" "caddar" "cadddr"
+    "cdaaar" "cdaadr" "cdadar" "cdaddr" "cddaar" "cddadr" "cdddar" "cddddr"
+    "set-car!" "set-cdr!"
+    ; list
+    "null?" "list?"
+    "list" "length" "append" "reverse" "list-tail" "list-ref"
+    "map" "for-each"
+    "memq" "memv" "member" "assq" "assv" "assoc"
+    ; symbol
+    "symbol?" "symbol->string" "string->symbol" "symbol=?"
+    ; char
+    "char?" "char=?" "char<?" "char>?" "char<=?" "char>=?"
+    "char-ci=?" "char-ci<?" "char-ci>?" "char-ci<=?" "char-ci>=?"
+    "char-alphabetic?" "char-numeric?" "char-whitespace?" "char-upper-case?" "char-lower-case?"
+    "char->integer" "integer->char"
+    "char-upcase" "char-downcase"
+    ; string
+    "string?" "make-string" "string" "string-length" "string-ref" "string-set!"
+    "string=?" "string-ci=?" "string<?" "string>?" "string<=?" "string>=?"
+    "string-ci<?" "string-ci>?" "string-ci<=?" "string-ci>=?"
+    "substring" "string-append" "string->list" "list->string"
+    "string-for-each"
+    "string-copy" "string-fill!"
+    "string-upcase" "string-downcase"
+    ; vector
+    "vector?" "make-vector" "vector" "vector-length" "vector-ref" "vector-set!"
+    "vector->list" "list->vector" "vector-fill!" "vector-map" "vector-for-each"
+    ; bytevector
+    "bytevector?" "native-endianness"
+    "make-bytevector" "bytevector-length" "bytevector=?" "bytevector-fill!"
+    "bytevector-copy!" "bytevector-copy"
+    ; error
+    "error" "assertion-violation"
+    ; control
+    "procedure?" "apply" "force"
+    "call-with-current-continuation" "call/cc"
+    "values" "call-with-values" "dynamic-wind"
+    "eval" "scheme-report-environment" "null-environment" "interaction-environment"
+    ; IO
+    "call-with-input-file" "call-with-output-file" "input-port?" "output-port?"
+    "current-input-port" "current-output-port" "with-input-from-file" "with-output-to-file"
+    "open-input-file" "open-output-file" "close-input-port" "close-output-port"
+    ; input
+    "read" "read-char" "peek-char" "eof-object?" "char-ready?"
+    ; output
+    "write" "display" "newline" "write-char"
+    ; system
+    "load" "transcript-on" "transcript-off"))
 
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index 5fa20881c..e7ac9150e 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -158,6 +158,7 @@
    function: (global_variable "::" (_) @function.builtin)
    function: (deref_expression "." (_) @function.builtin)
   ]
+  ; format-ignore
   (#any-of? @function.builtin
    ; General Methods
    "assert" "array" "callee" "collectgarbage" "compilestring"
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 8d99963d5..9707632a5 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -17,15 +17,11 @@
  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin
-           ;; https://docs.python.org/3/library/constants.html
-           "NotImplemented"
-           "Ellipsis"
-           "quit"
-           "exit"
-           "copyright"
-           "credits"
-           "license"))
+  ; format-ignore
+  (#any-of? @constant.builtin 
+    ; https://docs.python.org/3/library/constants.html
+    "NotImplemented" "Ellipsis" 
+    "quit" "exit" "copyright" "credits" "license"))
 
 ((attribute
     attribute: (identifier) @variable.member)
@@ -64,13 +60,14 @@
 ;; Builtin functions
 ((call
   function: (identifier) @function.builtin)
- (#any-of? @function.builtin
-          "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
-          "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "fail" "filter" "float" "format"
-          "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
-          "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
-          "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
-          "struct" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+  ; format-ignore
+  (#any-of? @function.builtin
+    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
+    "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "fail" "filter" "float" "format"
+    "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
+    "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
+    "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
+    "struct" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
 
 ;; Function definitions
 (function_definition
@@ -89,22 +86,23 @@
  (#eq? @_isinstance "isinstance"))
 
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-              ;; https://docs.python.org/3/library/exceptions.html
-              "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-              "EOFError" "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError"
-              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-              "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-              ;; https://docs.python.org/3/library/stdtypes.html
-              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
+  ; format-ignore
+  (#any-of? @type.builtin
+    ; https://docs.python.org/3/library/exceptions.html
+    "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+    "EOFError" "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError"
+    "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+    "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+    "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+    "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+    "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+    "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+    "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+    "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+    ; https://docs.python.org/3/library/stdtypes.html
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+    "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
 
 ;; Normal parameters
 (parameters
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 81a0d931b..336497839 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -73,7 +73,7 @@
 (call_expression (simple_identifier) @function.call) ; foo()
 (call_expression ; foo.bar.baz(): highlight the baz()
   (navigation_expression
-    (navigation_suffix (simple_identifier) @function.call)))
+    (navigation_suffix (simple_identifier) @function.call))) 
 (call_expression
   (prefix_expression (simple_identifier) @function.call)) ; .foo()
 ((navigation_expression
diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index 39ad59405..63d1c9011 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [
   ; ... refers to the section that will get affected by this indent.begin capture
   (protocol_body)               ; protocol Foo { ... }
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
index 6ba4ec98f..180b6d219 100644
--- a/queries/usd/highlights.scm
+++ b/queries/usd/highlights.scm
@@ -39,128 +39,125 @@
 
 (attribute_type) @type
 (
- ;; Reference: https://openusd.org/release/api/sdf_page_front.html
  (attribute_type) @type.builtin
- (#any-of? @type.builtin
-  ;; Scalar types
-  "asset" "asset[]"
-  "bool" "bool[]"
-  "double" "double[]"
-  "float" "float[]"
-  "half" "half[]"
-  "int" "int[]"
-  "int64" "int64[]"
-  "string" "string[]"
-  "timecode" "timecode[]"
-  "token" "token[]"
-  "uchar" "uchar[]"
-  "uint" "uint[]"
-  "uint64" "uint64[]"
+  ;format-ignore
+  (#any-of? @type.builtin
+    ;; Reference: https://openusd.org/release/api/sdf_page_front.html
+    ;; Scalar types
+    "asset" "asset[]"
+    "bool" "bool[]"
+    "double" "double[]"
+    "float" "float[]"
+    "half" "half[]"
+    "int" "int[]"
+    "int64" "int64[]"
+    "string" "string[]"
+    "timecode" "timecode[]"
+    "token" "token[]"
+    "uchar" "uchar[]"
+    "uint" "uint[]"
+    "uint64" "uint64[]"
 
-  ;; Dimensioned Types
-  "double2" "double2[]"
-  "double3" "double3[]"
-  "double4" "double4[]"
-  "float2" "float2[]"
-  "float3" "float3[]"
-  "float4" "float4[]"
-  "half2" "half2[]"
-  "half3" "half3[]"
-  "half4" "half4[]"
-  "int2" "int2[]"
-  "int3" "int3[]"
-  "int4" "int4[]"
-  "matrix2d" "matrix2d[]"
-  "matrix3d" "matrix3d[]"
-  "matrix4d" "matrix4d[]"
-  "quatd" "quatd[]"
-  "quatf" "quatf[]"
-  "quath" "quath[]"
+    ;; Dimensioned Types
+    "double2" "double2[]"
+    "double3" "double3[]"
+    "double4" "double4[]"
+    "float2" "float2[]"
+    "float3" "float3[]"
+    "float4" "float4[]"
+    "half2" "half2[]"
+    "half3" "half3[]"
+    "half4" "half4[]"
+    "int2" "int2[]"
+    "int3" "int3[]"
+    "int4" "int4[]"
+    "matrix2d" "matrix2d[]"
+    "matrix3d" "matrix3d[]"
+    "matrix4d" "matrix4d[]"
+    "quatd" "quatd[]"
+    "quatf" "quatf[]"
+    "quath" "quath[]"
 
-  ;; Extra Types
-  "color3f" "color3f[]"
-  "normal3f" "normal3f[]"
-  "point3f" "point3f[]"
-  "texCoord2f" "texCoord2f[]"
-  "vector3d" "vector3d[]"
-  "vector3f" "vector3f[]"
-  "vector3h" "vector3h[]"
+    ;; Extra Types
+    "color3f" "color3f[]"
+    "normal3f" "normal3f[]"
+    "point3f" "point3f[]"
+    "texCoord2f" "texCoord2f[]"
+    "vector3d" "vector3d[]"
+    "vector3f" "vector3f[]"
+    "vector3h" "vector3h[]"
 
-  "dictionary"
+    "dictionary"
 
-  ;; Deprecated Types
-  "EdgeIndex" "EdgeIndex[]"
-  "FaceIndex" "FaceIndex[]"
-  "Matrix4d" "Matrix4d[]"
-  "PointIndex" "PointIndex[]"
-  "PointFloat" "PointFloat[]"
-  "Transform" "Transform[]"
-  "Vec3f" "Vec3f[]"
- )
-)
+    ;; Deprecated Types
+    "EdgeIndex" "EdgeIndex[]"
+    "FaceIndex" "FaceIndex[]"
+    "Matrix4d" "Matrix4d[]"
+    "PointIndex" "PointIndex[]"
+    "PointFloat" "PointFloat[]"
+    "Transform" "Transform[]"
+    "Vec3f" "Vec3f[]"))
 
 (
  (identifier) @keyword
- (#any-of? @keyword
+  ; format-ignore
+  (#any-of? @keyword
+    ; Reference: https://openusd.org/release/api/sdf_page_front.html
+    ; LIVRPS names
+    "inherits"
+    "payload"
+    "references"
+    "specializes"
+    "variantSets"
+    "variants"
 
-  ;; Reference: https://openusd.org/release/api/sdf_page_front.html
-  ;; LIVRPS names
-  "inherits"
-  "payload"
-  "references"
-  "specializes"
-  "variantSets"
-  "variants"
+    ; assetInfo names
+    "assetInfo"
+    "identifier"
+    "name"
+    "payloadAssetDependencies"
+    "version"
 
-  ; assetInfo names
-  "assetInfo"
-  "identifier"
-  "name"
-  "payloadAssetDependencies"
-  "version"
+    ; clips names
+    "clips"
 
-  ;; clips names
-  "clips"
+    "active"
+    "assetPaths"
+    "manifestAssetPath"
+    "primPath"
+    "templateAssetPath"
+    "templateEndTime"
+    "templateStartTime"
+    "templateStride"
+    "times"
 
-  "active"
-  "assetPaths"
-  "manifestAssetPath"
-  "primPath"
-  "templateAssetPath"
-  "templateEndTime"
-  "templateStartTime"
-  "templateStride"
-  "times"
+    ; customData names
+    "customData"
 
-  ;; customData names
-  "customData"
+    "apiSchemaAutoApplyTo"
+    "apiSchemaOverridePropertyNames"
+    "className"
+    "extraPlugInfo"
+    "isUsdShadeContainer"
+    "libraryName"
+    "providesUsdShadeConnectableAPIBehavior"
+    "requiresUsdShadeEncapsulation"
+    "skipCodeGeneration"
 
-  "apiSchemaAutoApplyTo"
-  "apiSchemaOverridePropertyNames"
-  "className"
-  "extraPlugInfo"
-  "isUsdShadeContainer"
-  "libraryName"
-  "providesUsdShadeConnectableAPIBehavior"
-  "requiresUsdShadeEncapsulation"
-  "skipCodeGeneration"
+    ; Layer metadata names
+    "colorConfiguration"
+    "colorManagementSystem"
+    "customLayerData"
+    "defaultPrim"
+    "doc"
+    "endTimeCode"
+    "framesPerSecond"
+    "owner"
+    "startTimeCode"
+    "subLayers"
 
-  ;; Layer metadata names
-  "colorConfiguration"
-  "colorManagementSystem"
-  "customLayerData"
-  "defaultPrim"
-  "doc"
-  "endTimeCode"
-  "framesPerSecond"
-  "owner"
-  "startTimeCode"
-  "subLayers"
-
-  ;; Prim metadata
-  "instanceable"
- )
-)
+    ; Prim metadata
+    "instanceable"))
 
 ;; Common attribute metadata
 (
diff --git a/queries/usd/indents.scm b/queries/usd/indents.scm
index 4af153034..78146d188 100644
--- a/queries/usd/indents.scm
+++ b/queries/usd/indents.scm
@@ -1,3 +1,4 @@
+; format-ignore
 [
   (block)  ; The {}s in `def "foo" { ... Attributes / Prims here ... }`
   (dictionary)  ; The {}s in `dictionary foo = { string "foo" = "bar" }`

From 79975d6557bcf9f5ca1c29268de14ce3f6801401 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 6 Jan 2024 02:51:48 +0900
Subject: [PATCH 0997/2704] ci: add query lint job

---
 .github/workflows/lint.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a643f796d..3092c418f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -31,3 +31,19 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: latest
           args: --check .
+
+  format-queries:
+    name: Lint queries
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Prepare
+        run: |
+          wget https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz
+          tar -zxf nvim-linux64.tar.gz
+          sudo ln -s "$PWD"/nvim-linux64/bin/nvim /usr/local/bin
+
+      - name: Lint
+        run: |
+          nvim -l scripts/format-queries.lua queries
+          git diff --exit-code

From 57a8acf0c4ed5e7f6dda83c3f9b073f8a99a70f9 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Sat, 6 Jan 2024 15:05:50 +0900
Subject: [PATCH 0998/2704] chore: query formatting

---
 queries/ada/folds.scm                     |  23 +-
 queries/ada/highlights.scm                | 390 +++++++----
 queries/ada/locals.scm                    | 106 ++-
 queries/agda/folds.scm                    |   4 +-
 queries/agda/highlights.scm               |  57 +-
 queries/angular/highlights.scm            |  43 +-
 queries/apex/folds.scm                    |   8 +-
 queries/apex/highlights.scm               | 149 ++--
 queries/apex/locals.scm                   |  36 +-
 queries/arduino/highlights.scm            |  20 +-
 queries/arduino/injections.scm            |   6 +-
 queries/astro/highlights.scm              |  25 +-
 queries/astro/injections.scm              |  18 +-
 queries/authzed/highlights.scm            |  15 +-
 queries/authzed/injections.scm            |   2 +-
 queries/awk/highlights.scm                | 206 +++---
 queries/awk/injections.scm                |  16 +-
 queries/bash/highlights.scm               | 196 +++---
 queries/bash/injections.scm               |  47 +-
 queries/bash/locals.scm                   |   3 +-
 queries/bass/highlights.scm               |  94 +--
 queries/bass/indents.scm                  |  15 +-
 queries/bass/injections.scm               |   4 +-
 queries/bass/locals.scm                   |  15 +-
 queries/beancount/folds.scm               |   4 +-
 queries/beancount/highlights.scm          |  43 +-
 queries/bibtex/folds.scm                  |   4 +-
 queries/bibtex/highlights.scm             |   1 -
 queries/bibtex/indents.scm                |   8 +-
 queries/bicep/folds.scm                   |   6 -
 queries/bicep/highlights.scm              |  60 +-
 queries/bicep/indents.scm                 |  15 +-
 queries/bicep/injections.scm              |   4 +-
 queries/bicep/locals.scm                  |   6 -
 queries/bitbake/folds.scm                 |   5 -
 queries/bitbake/highlights.scm            | 190 +++--
 queries/bitbake/indents.scm               | 132 ++--
 queries/bitbake/injections.scm            |  13 +-
 queries/bitbake/locals.scm                |  80 ++-
 queries/blueprint/highlights.scm          |  47 +-
 queries/c/folds.scm                       |  34 +-
 queries/c/highlights.scm                  | 129 ++--
 queries/c/indents.scm                     |  64 +-
 queries/c/injections.scm                  |  52 +-
 queries/c/locals.scm                      |  48 +-
 queries/c_sharp/folds.scm                 |  21 +-
 queries/c_sharp/highlights.scm            | 363 +++++-----
 queries/c_sharp/injections.scm            |   4 +-
 queries/c_sharp/locals.scm                |  14 +-
 queries/cairo/folds.scm                   |   5 -
 queries/cairo/highlights.scm              | 250 ++++---
 queries/cairo/indents.scm                 |  31 +-
 queries/cairo/injections.scm              |   6 +-
 queries/cairo/locals.scm                  |  37 +-
 queries/capnp/highlights.scm              |  36 +-
 queries/capnp/indents.scm                 |  10 +-
 queries/capnp/injections.scm              |   4 +-
 queries/capnp/locals.scm                  |  23 +-
 queries/chatito/folds.scm                 |   6 +-
 queries/chatito/highlights.scm            |  47 +-
 queries/chatito/indents.scm               |   9 +-
 queries/chatito/injections.scm            |   4 +-
 queries/chatito/locals.scm                |  20 +-
 queries/clojure/folds.scm                 |   3 +-
 queries/clojure/highlights.scm            | 262 +++----
 queries/clojure/injections.scm            |   4 +-
 queries/cmake/folds.scm                   |  12 +-
 queries/cmake/highlights.scm              | 237 ++++---
 queries/cmake/indents.scm                 |  17 +-
 queries/comment/highlights.scm            |  20 +-
 queries/commonlisp/folds.scm              |   3 +-
 queries/commonlisp/highlights.scm         | 128 ++--
 queries/commonlisp/locals.scm             | 129 ++--
 queries/cooklang/highlights.scm           |  18 +-
 queries/corn/folds.scm                    |   6 +-
 queries/corn/highlights.scm               |   6 +
 queries/corn/indents.scm                  |  28 +-
 queries/corn/locals.scm                   |  11 +-
 queries/cpon/highlights.scm               |  24 +-
 queries/cpon/injections.scm               |   4 +-
 queries/cpon/locals.scm                   |   3 +-
 queries/cpp/folds.scm                     |  21 +-
 queries/cpp/highlights.scm                | 168 +++--
 queries/cpp/indents.scm                   |   6 +-
 queries/cpp/injections.scm                |   5 +-
 queries/cpp/locals.scm                    |  41 +-
 queries/css/folds.scm                     |   4 +-
 queries/css/highlights.scm                | 125 ++--
 queries/css/indents.scm                   |   4 +-
 queries/css/injections.scm                |   4 +-
 queries/csv/highlights.scm                |   1 -
 queries/cuda/highlights.scm               |   6 +-
 queries/cuda/injections.scm               |   6 +-
 queries/cue/highlights.scm                |  85 +--
 queries/cue/indents.scm                   |  15 +-
 queries/cue/injections.scm                |   4 +-
 queries/cue/locals.scm                    |   5 +-
 queries/d/highlights.scm                  |  79 +--
 queries/d/indents.scm                     |   9 +-
 queries/d/injections.scm                  |   6 +-
 queries/dart/folds.scm                    |   3 -
 queries/dart/highlights.scm               | 220 +++---
 queries/dart/indents.scm                  |  17 +-
 queries/dart/injections.scm               |   4 +-
 queries/dart/locals.scm                   |  24 +-
 queries/devicetree/highlights.scm         |  40 +-
 queries/devicetree/indents.scm            |   4 +-
 queries/devicetree/injections.scm         |   4 +-
 queries/devicetree/locals.scm             |   2 +-
 queries/dhall/folds.scm                   |   4 -
 queries/dhall/highlights.scm              | 184 ++---
 queries/dhall/injections.scm              |   4 +-
 queries/diff/highlights.scm               |  13 +-
 queries/dockerfile/highlights.scm         |  10 +-
 queries/dockerfile/injections.scm         |  10 +-
 queries/dot/highlights.scm                |  19 +-
 queries/dot/injections.scm                |   6 +-
 queries/doxygen/highlights.scm            |  14 +-
 queries/doxygen/injections.scm            |   5 +-
 queries/dtd/folds.scm                     |   4 +-
 queries/dtd/highlights.scm                | 124 ++--
 queries/dtd/locals.scm                    |  10 +-
 queries/ebnf/highlights.scm               |  35 +-
 queries/ecma/highlights.scm               | 207 +++---
 queries/ecma/indents.scm                  |  52 +-
 queries/ecma/injections.scm               | 155 ++--
 queries/ecma/locals.scm                   |  15 +-
 queries/eds/highlights.scm                |  67 +-
 queries/eex/highlights.scm                |   1 -
 queries/eex/injections.scm                |   8 +-
 queries/elixir/highlights.scm             | 182 ++---
 queries/elixir/indents.scm                |   4 +-
 queries/elixir/injections.scm             |  49 +-
 queries/elixir/locals.scm                 |   2 +-
 queries/elm/highlights.scm                | 108 +--
 queries/elm/injections.scm                |   8 +-
 queries/elsa/highlights.scm               |  13 +-
 queries/elsa/injections.scm               |   4 +-
 queries/elvish/highlights.scm             | 157 ++++-
 queries/elvish/injections.scm             |   4 +-
 queries/embedded_template/injections.scm  |   8 +-
 queries/erlang/highlights.scm             | 138 ++--
 queries/facility/highlights.scm           |   4 +-
 queries/facility/indents.scm              |   7 +-
 queries/facility/injections.scm           |   5 +-
 queries/fennel/folds.scm                  |  12 +-
 queries/fennel/highlights.scm             |  82 +--
 queries/fennel/injections.scm             |   4 +-
 queries/fennel/locals.scm                 |  38 +-
 queries/firrtl/folds.scm                  |   8 +-
 queries/firrtl/highlights.scm             |  86 ++-
 queries/firrtl/indents.scm                |  10 +-
 queries/firrtl/injections.scm             |   4 +-
 queries/firrtl/locals.scm                 |  37 +-
 queries/fish/folds.scm                    |  12 +-
 queries/fish/highlights.scm               | 217 +++---
 queries/fish/indents.scm                  |  18 +-
 queries/fish/injections.scm               |   4 +-
 queries/fish/locals.scm                   |   7 +-
 queries/foam/folds.scm                    |   9 +-
 queries/foam/highlights.scm               |  43 +-
 queries/foam/indents.scm                  |  10 +-
 queries/foam/injections.scm               |  22 +-
 queries/foam/locals.scm                   |  12 +-
 queries/fortran/folds.scm                 |  18 +-
 queries/fortran/highlights.scm            |  60 +-
 queries/fsh/highlights.scm                |  10 +-
 queries/func/highlights.scm               |  40 +-
 queries/fusion/highlights.scm             |  92 +--
 queries/fusion/indents.scm                |  19 +-
 queries/fusion/locals.scm                 |  12 +-
 queries/gdscript/folds.scm                |   8 +-
 queries/gdscript/highlights.scm           | 165 +++--
 queries/gdscript/indents.scm              |  71 +-
 queries/gdscript/injections.scm           |   4 +-
 queries/gdscript/locals.scm               | 117 ++--
 queries/git_config/folds.scm              |   1 +
 queries/git_config/highlights.scm         |  30 +-
 queries/git_rebase/highlights.scm         |   1 -
 queries/git_rebase/injections.scm         |   9 +-
 queries/gitattributes/highlights.scm      |   9 +-
 queries/gitattributes/injections.scm      |   4 +-
 queries/gitattributes/locals.scm          |  10 +-
 queries/gitcommit/highlights.scm          |  46 +-
 queries/gitcommit/injections.scm          |   6 +-
 queries/gitignore/highlights.scm          |   6 +-
 queries/gleam/folds.scm                   |   2 +-
 queries/gleam/highlights.scm              | 104 ++-
 queries/gleam/indents.scm                 |   4 +-
 queries/gleam/injections.scm              |   8 +-
 queries/gleam/locals.scm                  |  19 +-
 queries/glimmer/folds.scm                 |   5 +-
 queries/glimmer/highlights.scm            |  92 ++-
 queries/glimmer/indents.scm               |  36 +-
 queries/glimmer/locals.scm                |   8 +-
 queries/glsl/highlights.scm               |   3 +-
 queries/glsl/injections.scm               |   6 +-
 queries/gn/highlights.scm                 |  32 +-
 queries/go/folds.scm                      |  35 +-
 queries/go/highlights.scm                 | 153 ++--
 queries/go/indents.scm                    |  24 +-
 queries/go/injections.scm                 |  45 +-
 queries/go/locals.scm                     |  90 ++-
 queries/godot_resource/folds.scm          |   4 +-
 queries/godot_resource/highlights.scm     |  14 +-
 queries/godot_resource/locals.scm         |   4 +-
 queries/gomod/highlights.scm              |   5 +-
 queries/gomod/injections.scm              |   2 +-
 queries/gosum/highlights.scm              |   9 +-
 queries/gowork/highlights.scm             |   4 +-
 queries/gowork/injections.scm             |   2 +-
 queries/gpg/highlights.scm                |  31 +-
 queries/gpg/injections.scm                |   2 +-
 queries/graphql/highlights.scm            |  25 +-
 queries/graphql/injections.scm            |   2 +-
 queries/groovy/highlights.scm             |  53 +-
 queries/groovy/injections.scm             |   8 +-
 queries/gstlaunch/highlights.scm          |  21 +-
 queries/hack/highlights.scm               | 179 +++--
 queries/hare/folds.scm                    |   3 -
 queries/hare/highlights.scm               | 114 +--
 queries/hare/indents.scm                  |  20 +-
 queries/hare/injections.scm               |  18 +-
 queries/hare/locals.scm                   |  44 +-
 queries/haskell/folds.scm                 |   6 +-
 queries/haskell/highlights.scm            | 707 +++++++++++--------
 queries/haskell/injections.scm            |  77 +-
 queries/haskell_persistent/folds.scm      |   4 +-
 queries/haskell_persistent/highlights.scm |  28 +-
 queries/hcl/folds.scm                     |   8 +-
 queries/hcl/highlights.scm                |  36 +-
 queries/hcl/indents.scm                   |   1 +
 queries/hcl/injections.scm                |   2 +-
 queries/heex/highlights.scm               |  17 +-
 queries/heex/injections.scm               |   2 +-
 queries/hjson/highlights.scm              |  19 +-
 queries/hjson/indents.scm                 |   1 -
 queries/hjson/injections.scm              |   2 +-
 queries/hlsl/highlights.scm               |  14 +-
 queries/hlsl/injections.scm               |   4 +-
 queries/hocon/highlights.scm              |  62 +-
 queries/hocon/injections.scm              |   2 +-
 queries/hoon/folds.scm                    |  10 +-
 queries/hoon/highlights.scm               |   6 +-
 queries/hoon/locals.scm                   |   2 +-
 queries/html/highlights.scm               |   1 -
 queries/html/injections.scm               |   7 +-
 queries/html_tags/highlights.scm          | 111 ++-
 queries/html_tags/indents.scm             |  37 +-
 queries/html_tags/injections.scm          |  85 ++-
 queries/htmldjango/highlights.scm         |  40 +-
 queries/htmldjango/indents.scm            |   2 +
 queries/htmldjango/injections.scm         |   4 +-
 queries/http/highlights.scm               |  26 +-
 queries/http/injections.scm               |  10 +-
 queries/hurl/folds.scm                    |   1 -
 queries/hurl/highlights.scm               |  26 +-
 queries/hurl/indents.scm                  |   2 +-
 queries/hurl/injections.scm               |   4 +-
 queries/ini/highlights.scm                |  13 +-
 queries/ispc/folds.scm                    |   1 -
 queries/ispc/highlights.scm               |  76 +-
 queries/ispc/indents.scm                  |  11 +-
 queries/ispc/locals.scm                   |   8 +-
 queries/janet_simple/folds.scm            |   3 +-
 queries/janet_simple/highlights.scm       |  94 +--
 queries/janet_simple/injections.scm       |   2 +-
 queries/java/highlights.scm               |  98 +--
 queries/java/indents.scm                  |   8 +-
 queries/java/injections.scm               |  16 +-
 queries/java/locals.scm                   |  54 +-
 queries/javascript/highlights.scm         |  24 +-
 queries/javascript/locals.scm             |  29 +-
 queries/jq/highlights.scm                 |  50 +-
 queries/jq/injections.scm                 |  40 +-
 queries/jq/locals.scm                     |   9 +-
 queries/jsdoc/highlights.scm              |   1 +
 queries/json/highlights.scm               |  32 +-
 queries/json5/highlights.scm              |   2 +-
 queries/json5/injections.scm              |   2 +-
 queries/jsonc/highlights.scm              |   1 -
 queries/jsonc/indents.scm                 |   1 -
 queries/jsonc/injections.scm              |   2 +-
 queries/jsonnet/folds.scm                 |  16 +-
 queries/jsonnet/highlights.scm            |  41 +-
 queries/jsonnet/locals.scm                |  19 +-
 queries/jsx/highlights.scm                |  56 +-
 queries/jsx/indents.scm                   |  11 +-
 queries/jsx/injections.scm                |  14 +-
 queries/julia/folds.scm                   |   3 -
 queries/julia/highlights.scm              | 262 ++++---
 queries/julia/indents.scm                 |   4 -
 queries/julia/injections.scm              |  23 +-
 queries/julia/locals.scm                  |  47 +-
 queries/kconfig/highlights.scm            |  36 +-
 queries/kconfig/indents.scm               |   3 +-
 queries/kconfig/locals.scm                |  13 +-
 queries/kdl/folds.scm                     |   1 -
 queries/kdl/highlights.scm                |  54 +-
 queries/kdl/indents.scm                   |  13 +-
 queries/kdl/injections.scm                |   4 +-
 queries/kdl/locals.scm                    |  12 +-
 queries/kotlin/folds.scm                  |  26 +-
 queries/kotlin/highlights.scm             | 498 ++++++-------
 queries/kotlin/injections.scm             |  31 +-
 queries/kotlin/locals.scm                 | 110 ++-
 queries/kusto/highlights.scm              |  10 +-
 queries/kusto/injections.scm              |   2 +-
 queries/lalrpop/highlights.scm            |  45 +-
 queries/lalrpop/injections.scm            |  11 +-
 queries/lalrpop/locals.scm                |   2 +-
 queries/latex/folds.scm                   |   1 -
 queries/latex/highlights.scm              | 308 +++++---
 queries/latex/injections.scm              |  28 +-
 queries/ledger/folds.scm                  |   4 +-
 queries/ledger/highlights.scm             |  72 +-
 queries/ledger/indents.scm                |   4 +-
 queries/ledger/injections.scm             |   4 +-
 queries/leo/highlights.scm                | 200 +++---
 queries/leo/indents.scm                   |  44 +-
 queries/leo/injections.scm                |   2 +-
 queries/linkerscript/highlights.scm       |  86 ++-
 queries/linkerscript/locals.scm           |  17 +-
 queries/liquidsoap/folds.scm              |  38 +-
 queries/liquidsoap/highlights.scm         |  40 +-
 queries/liquidsoap/indents.scm            |  54 +-
 queries/liquidsoap/locals.scm             |  38 +-
 queries/llvm/highlights.scm               |  30 +-
 queries/lua/folds.scm                     |  20 +-
 queries/lua/highlights.scm                | 231 +++---
 queries/lua/indents.scm                   |   1 -
 queries/lua/injections.scm                | 143 ++--
 queries/lua/locals.scm                    |  29 +-
 queries/luadoc/highlights.scm             |  95 ++-
 queries/luap/highlights.scm               |  13 +-
 queries/luau/folds.scm                    |   5 +-
 queries/luau/highlights.scm               | 221 +++---
 queries/luau/indents.scm                  |   5 +-
 queries/luau/injections.scm               |  36 +-
 queries/luau/locals.scm                   |  29 +-
 queries/m68k/highlights.scm               |  30 +-
 queries/m68k/injections.scm               |   2 +-
 queries/m68k/locals.scm                   |   9 +-
 queries/make/folds.scm                    |  12 +-
 queries/make/highlights.scm               | 241 +++----
 queries/make/injections.scm               |   7 +-
 queries/markdown/folds.scm                |  16 +-
 queries/markdown/highlights.scm           |  68 +-
 queries/markdown/indents.scm              |   4 +-
 queries/markdown/injections.scm           |  28 +-
 queries/markdown_inline/highlights.scm    |  37 +-
 queries/markdown_inline/injections.scm    |   8 +-
 queries/matlab/folds.scm                  |  24 +-
 queries/matlab/highlights.scm             | 136 ++--
 queries/matlab/indents.scm                |  20 +-
 queries/matlab/injections.scm             |   2 +-
 queries/matlab/locals.scm                 |  33 +-
 queries/menhir/highlights.scm             |  66 +-
 queries/menhir/injections.scm             |   2 +-
 queries/mermaid/highlights.scm            | 334 +++++----
 queries/meson/folds.scm                   |  14 +-
 queries/meson/highlights.scm              |  15 +-
 queries/meson/injections.scm              |   2 +-
 queries/mlir/highlights.scm               |  22 +-
 queries/mlir/locals.scm                   |  11 +-
 queries/nasm/highlights.scm               |  35 +-
 queries/nickel/highlights.scm             |  39 +-
 queries/nickel/indents.scm                |  10 +-
 queries/nim/folds.scm                     |   8 -
 queries/nim/highlights.scm                | 817 +++++++++++++---------
 queries/nim/injections.scm                |  43 +-
 queries/nim/locals.scm                    | 340 +++++----
 queries/nim_format_string/highlights.scm  |  12 +-
 queries/nim_format_string/injections.scm  |   4 +-
 queries/ninja/highlights.scm              | 110 +--
 queries/ninja/indents.scm                 |   1 -
 queries/nix/highlights.scm                |  87 ++-
 queries/nix/injections.scm                | 240 ++++---
 queries/nix/locals.scm                    |  35 +-
 queries/nqc/highlights.scm                |   5 +-
 queries/objc/folds.scm                    |   1 -
 queries/objc/highlights.scm               | 169 +++--
 queries/objc/injections.scm               |   1 -
 queries/objdump/highlights.scm            |  41 +-
 queries/ocaml/highlights.scm              | 261 +++++--
 queries/ocaml/indents.scm                 |  51 +-
 queries/ocaml/injections.scm              |   2 +-
 queries/ocaml/locals.scm                  |  42 +-
 queries/ocamllex/highlights.scm           |  60 +-
 queries/ocamllex/injections.scm           |   4 +-
 queries/odin/highlights.scm               | 183 +++--
 queries/odin/injections.scm               |   2 +-
 queries/odin/locals.scm                   |  52 +-
 queries/pascal/folds.scm                  |   6 +-
 queries/pascal/highlights.scm             | 688 ++++++++++--------
 queries/pascal/indents.scm                |  53 +-
 queries/pascal/injections.scm             |   3 +-
 queries/pascal/locals.scm                 |  70 +-
 queries/pem/highlights.scm                |   5 +-
 queries/pem/injections.scm                |   2 +-
 queries/perl/folds.scm                    |  26 +-
 queries/perl/highlights.scm               | 232 ++++--
 queries/perl/injections.scm               |   8 +-
 queries/php/highlights.scm                | 332 +++++----
 queries/php/indents.scm                   |  14 +-
 queries/php/injections.scm                |  47 +-
 queries/php/locals.scm                    |  35 +-
 queries/phpdoc/highlights.scm             |  56 +-
 queries/pioasm/highlights.scm             |  91 ++-
 queries/pioasm/injections.scm             |  14 +-
 queries/po/folds.scm                      |   1 -
 queries/po/highlights.scm                 |  17 +-
 queries/po/injections.scm                 |   2 +-
 queries/pod/highlights.scm                |  19 +-
 queries/poe_filter/highlights.scm         |  19 +-
 queries/poe_filter/injections.scm         |   2 +-
 queries/pony/folds.scm                    |   8 +-
 queries/pony/highlights.scm               | 185 +++--
 queries/pony/indents.scm                  |  39 +-
 queries/pony/injections.scm               |   4 +-
 queries/pony/locals.scm                   |  15 +-
 queries/prisma/folds.scm                  |  10 +-
 queries/prisma/highlights.scm             |  19 +-
 queries/promql/highlights.scm             |   5 +-
 queries/promql/injections.scm             |   4 +-
 queries/properties/highlights.scm         |  36 +-
 queries/properties/injections.scm         |   2 +-
 queries/properties/locals.scm             |   6 +-
 queries/proto/highlights.scm              |  12 +-
 queries/prql/highlights.scm               |  26 +-
 queries/prql/injections.scm               |   6 +-
 queries/psv/highlights.scm                |   1 -
 queries/pug/highlights.scm                |  81 ++-
 queries/pug/injections.scm                |   4 +-
 queries/puppet/highlights.scm             | 149 ++--
 queries/puppet/locals.scm                 |  42 +-
 queries/purescript/highlights.scm         | 270 ++++---
 queries/purescript/injections.scm         |   2 +-
 queries/purescript/locals.scm             |  15 +-
 queries/pymanifest/highlights.scm         |  11 +-
 queries/pymanifest/injections.scm         |   2 +-
 queries/python/folds.scm                  |   5 -
 queries/python/highlights.scm             | 258 ++++---
 queries/python/indents.scm                | 138 ++--
 queries/python/injections.scm             |  20 +-
 queries/python/locals.scm                 | 102 +--
 queries/ql/folds.scm                      |  10 +-
 queries/ql/highlights.scm                 |  38 +-
 queries/ql/injections.scm                 |   4 +-
 queries/ql/locals.scm                     |  43 +-
 queries/qmldir/highlights.scm             |   8 +-
 queries/qmldir/injections.scm             |   2 +-
 queries/qmljs/highlights.scm              |  93 +--
 queries/query/highlights.scm              |  80 ++-
 queries/query/indents.scm                 |   8 +-
 queries/query/injections.scm              |  38 +-
 queries/query/locals.scm                  |  12 +-
 queries/r/highlights.scm                  | 138 ++--
 queries/r/indents.scm                     |  14 +-
 queries/r/injections.scm                  |   2 +-
 queries/r/locals.scm                      |  15 +-
 queries/racket/folds.scm                  |   3 +-
 queries/racket/highlights.scm             | 174 +++--
 queries/racket/injections.scm             |   4 +-
 queries/rasi/folds.scm                    |   2 +-
 queries/rasi/highlights.scm               | 133 +++-
 queries/rasi/indents.scm                  |   3 +-
 queries/rasi/locals.scm                   |  11 +-
 queries/rbs/highlights.scm                | 109 +--
 queries/rbs/injections.scm                |   2 +-
 queries/re2c/highlights.scm               |  30 +-
 queries/re2c/indents.scm                  |   8 +-
 queries/re2c/injections.scm               |   4 +-
 queries/regex/highlights.scm              |  52 +-
 queries/rego/highlights.scm               |  42 +-
 queries/rego/injections.scm               |   2 +-
 queries/requirements/highlights.scm       |  39 +-
 queries/requirements/injections.scm       |   2 +-
 queries/rnoweb/folds.scm                  |   4 +-
 queries/rnoweb/highlights.scm             |   2 +-
 queries/rnoweb/injections.scm             |   4 +-
 queries/robot/highlights.scm              |  44 +-
 queries/robot/indents.scm                 |  44 +-
 queries/ron/highlights.scm                |  50 +-
 queries/ron/indents.scm                   |  15 +-
 queries/ron/injections.scm                |   2 +-
 queries/ron/locals.scm                    |  27 +-
 queries/rst/highlights.scm                |  58 +-
 queries/rst/injections.scm                | 108 ++-
 queries/rst/locals.scm                    |  25 +-
 queries/ruby/highlights.scm               | 341 +++++----
 queries/ruby/injections.scm               |  14 +-
 queries/ruby/locals.scm                   |  84 ++-
 queries/rust/folds.scm                    |   4 -
 queries/rust/highlights.scm               | 244 ++++---
 queries/rust/indents.scm                  |  60 +-
 queries/rust/injections.scm               |  48 +-
 queries/rust/locals.scm                   |  85 +--
 queries/scala/folds.scm                   |  27 +-
 queries/scala/highlights.scm              | 157 +++--
 queries/scala/injections.scm              |   4 +-
 queries/scala/locals.scm                  |  15 +-
 queries/scfg/highlights.scm               |   6 +-
 queries/scfg/injections.scm               |   2 +-
 queries/scheme/folds.scm                  |   3 +-
 queries/scheme/highlights.scm             | 154 ++--
 queries/scheme/injections.scm             |   2 +-
 queries/scss/highlights.scm               |  47 +-
 queries/scss/indents.scm                  |   7 +-
 queries/slang/folds.scm                   |  11 +-
 queries/slang/highlights.scm              |  43 +-
 queries/slang/indents.scm                 |   1 -
 queries/slang/injections.scm              |   4 +-
 queries/slint/highlights.scm              | 217 +++---
 queries/slint/indents.scm                 |  12 +-
 queries/smali/highlights.scm              |  93 +--
 queries/smali/indents.scm                 |   5 +-
 queries/smali/injections.scm              |   2 +-
 queries/smali/locals.scm                  |   3 +-
 queries/smithy/highlights.scm             |  43 +-
 queries/snakemake/highlights.scm          |  87 ++-
 queries/snakemake/injections.scm          |   4 +-
 queries/solidity/highlights.scm           | 140 ++--
 queries/soql/highlights.scm               |  25 +-
 queries/sosl/highlights.scm               |   8 +-
 queries/sparql/highlights.scm             |  73 +-
 queries/sparql/indents.scm                |   1 +
 queries/sparql/injections.scm             |   2 +-
 queries/sparql/locals.scm                 |  16 +-
 queries/sql/highlights.scm                | 155 ++--
 queries/sql/indents.scm                   |  32 +-
 queries/sql/injections.scm                |   5 +-
 queries/squirrel/folds.scm                |   4 -
 queries/squirrel/highlights.scm           | 123 ++--
 queries/squirrel/indents.scm              |  25 +-
 queries/squirrel/injections.scm           |   2 +-
 queries/squirrel/locals.scm               |  44 +-
 queries/ssh_config/highlights.scm         |  67 +-
 queries/ssh_config/indents.scm            |   8 +-
 queries/ssh_config/injections.scm         |  25 +-
 queries/starlark/folds.scm                |   5 -
 queries/starlark/highlights.scm           | 192 +++--
 queries/starlark/indents.scm              |  37 +-
 queries/starlark/locals.scm               |  67 +-
 queries/strace/highlights.scm             |   9 +-
 queries/supercollider/folds.scm           |   9 +-
 queries/supercollider/highlights.scm      |  68 +-
 queries/supercollider/indents.scm         |   6 +-
 queries/supercollider/injections.scm      |   4 +-
 queries/supercollider/locals.scm          |  38 +-
 queries/surface/highlights.scm            |   4 +-
 queries/surface/indents.scm               |   2 +-
 queries/surface/injections.scm            |   4 +-
 queries/svelte/folds.scm                  |  14 +-
 queries/svelte/highlights.scm             |   1 -
 queries/svelte/injections.scm             |  47 +-
 queries/swift/highlights.scm              | 253 +++++--
 queries/swift/indents.scm                 |  38 +-
 queries/swift/locals.scm                  |  31 +-
 queries/sxhkdrc/folds.scm                 |   4 +-
 queries/sxhkdrc/highlights.scm            |   9 +
 queries/sxhkdrc/injections.scm            |   2 +-
 queries/systemtap/highlights.scm          |  11 +-
 queries/systemtap/injections.scm          |   4 +-
 queries/t32/highlights.scm                |  68 +-
 queries/t32/injections.scm                |   2 +-
 queries/t32/locals.scm                    |  16 +-
 queries/tablegen/folds.scm                |   2 +-
 queries/tablegen/highlights.scm           |  84 +--
 queries/tablegen/indents.scm              |  22 +-
 queries/tablegen/locals.scm               |  14 +-
 queries/teal/folds.scm                    |  22 +-
 queries/teal/highlights.scm               | 251 +++++--
 queries/teal/injections.scm               |  51 +-
 queries/teal/locals.scm                   |  31 +-
 queries/templ/highlights.scm              |   4 +-
 queries/templ/injections.scm              |  12 +-
 queries/terraform/highlights.scm          |  38 +-
 queries/textproto/highlights.scm          |   7 +-
 queries/textproto/indents.scm             |  13 +-
 queries/thrift/folds.scm                  |   1 -
 queries/thrift/highlights.scm             | 102 +--
 queries/thrift/indents.scm                |  17 +-
 queries/thrift/injections.scm             |   2 +-
 queries/thrift/locals.scm                 |  57 +-
 queries/tiger/folds.scm                   |   3 -
 queries/tiger/highlights.scm              |  75 +-
 queries/tiger/indents.scm                 |  74 +-
 queries/tiger/injections.scm              |   3 +-
 queries/tiger/locals.scm                  |  14 +-
 queries/tlaplus/highlights.scm            | 339 ++++++---
 queries/tlaplus/injections.scm            |   4 +-
 queries/tlaplus/locals.scm                | 149 +++-
 queries/todotxt/highlights.scm            |  20 +-
 queries/toml/highlights.scm               |  22 +-
 queries/toml/injections.scm               |   2 +-
 queries/tsv/highlights.scm                |   3 +
 queries/turtle/highlights.scm             |  15 +-
 queries/turtle/indents.scm                |   8 +-
 queries/turtle/injections.scm             |   2 +-
 queries/twig/highlights.scm               |  70 +-
 queries/twig/injections.scm               |   5 +-
 queries/typescript/folds.scm              |   1 -
 queries/typescript/highlights.scm         | 137 ++--
 queries/typescript/indents.scm            |   1 -
 queries/typescript/locals.scm             |  13 +-
 queries/typoscript/highlights.scm         |  13 +-
 queries/typoscript/indents.scm            |   2 +-
 queries/typoscript/injections.scm         |   4 +-
 queries/udev/highlights.scm               |  48 +-
 queries/udev/injections.scm               |  16 +-
 queries/udev/locals.scm                   |  18 +-
 queries/ungrammar/highlights.scm          |   4 +-
 queries/ungrammar/injections.scm          |   3 +-
 queries/unison/highlights.scm             |  65 +-
 queries/unison/injections.scm             |   2 +-
 queries/usd/folds.scm                     |   4 +-
 queries/usd/highlights.scm                |  73 +-
 queries/usd/indents.scm                   |  31 +-
 queries/uxntal/folds.scm                  |   1 -
 queries/uxntal/highlights.scm             |  35 +-
 queries/uxntal/indents.scm                |  10 +-
 queries/uxntal/injections.scm             |   4 +-
 queries/uxntal/locals.scm                 |   9 +-
 queries/v/folds.scm                       |  14 +-
 queries/v/highlights.scm                  | 272 +------
 queries/v/indents.scm                     |  25 +-
 queries/v/injections.scm                  |  27 +-
 queries/v/locals.scm                      |  33 +-
 queries/vala/folds.scm                    |   1 -
 queries/vala/highlights.scm               | 410 ++++++-----
 queries/verilog/highlights.scm            | 147 ++--
 queries/verilog/injections.scm            |   2 +-
 queries/verilog/locals.scm                |  59 +-
 queries/vhs/highlights.scm                |  23 +-
 queries/vim/folds.scm                     |   4 +-
 queries/vim/highlights.scm                | 234 ++++---
 queries/vim/injections.scm                |  68 +-
 queries/vim/locals.scm                    |  16 +-
 queries/vimdoc/highlights.scm             |  55 +-
 queries/vimdoc/injections.scm             |   2 +-
 queries/vue/highlights.scm                |   5 +-
 queries/vue/indents.scm                   |   9 +-
 queries/vue/injections.scm                |  93 +--
 queries/wgsl/folds.scm                    |  16 +-
 queries/wgsl/highlights.scm               | 146 ++--
 queries/wgsl/indents.scm                  |  20 +-
 queries/wgsl_bevy/folds.scm               |   5 +-
 queries/wgsl_bevy/highlights.scm          |  38 +-
 queries/wing/highlights.scm               |  38 +-
 queries/wing/locals.scm                   |   1 +
 queries/xcompose/highlights.scm           |  30 +-
 queries/xcompose/injections.scm           |   2 +-
 queries/xcompose/locals.scm               |   6 +-
 queries/xml/highlights.scm                |  72 +-
 queries/xml/injections.scm                |  44 +-
 queries/xml/locals.scm                    |  38 +-
 queries/yaml/highlights.scm               |  71 +-
 queries/yaml/indents.scm                  |   3 +-
 queries/yaml/injections.scm               | 127 ++--
 queries/yaml/locals.scm                   |   7 +-
 queries/yang/folds.scm                    |   4 +-
 queries/yang/highlights.scm               |  65 +-
 queries/yang/indents.scm                  |  19 +-
 queries/yang/injections.scm               |  12 +-
 queries/yuck/highlights.scm               |  91 +--
 queries/yuck/indents.scm                  |  33 +-
 queries/yuck/injections.scm               |   3 +-
 queries/yuck/locals.scm                   |   2 +-
 queries/zig/folds.scm                     |  12 +-
 queries/zig/highlights.scm                | 104 ++-
 queries/zig/indents.scm                   |   3 +-
 queries/zig/injections.scm                |   5 +-
 queries/zig/locals.scm                    |   1 +
 674 files changed, 18466 insertions(+), 12648 deletions(-)

diff --git a/queries/ada/folds.scm b/queries/ada/folds.scm
index b8b5735bb..8e3defac4 100644
--- a/queries/ada/folds.scm
+++ b/queries/ada/folds.scm
@@ -1,14 +1,13 @@
-;; Support for folding in Ada
-;;    za     toggles folding a package, subprogram, if statement or loop
-
+; Support for folding in Ada
+;    za     toggles folding a package, subprogram, if statement or loop
 [
-   (package_declaration)
-   (generic_package_declaration)
-   (package_body)
-   (subprogram_body)
-   (block_statement)
-   (if_statement)
-   (loop_statement)
-   (gnatprep_declarative_if_statement)
-   (gnatprep_if_statement)
+  (package_declaration)
+  (generic_package_declaration)
+  (package_body)
+  (subprogram_body)
+  (block_statement)
+  (if_statement)
+  (loop_statement)
+  (gnatprep_declarative_if_statement)
+  (gnatprep_if_statement)
 ] @fold
diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index a88935b2a..c15c4d9e3 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -1,190 +1,288 @@
-;; highlight queries.
-;; See the syntax at https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries
-;; See also https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#parser-configurations
-;; for a list of recommended @ tags, though not all of them have matching
-;; highlights in neovim.
+; highlight queries.
+; See the syntax at https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries
+; See also https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#parser-configurations
+; for a list of recommended @ tags, though not all of them have matching
+; highlights in neovim.
+[
+  "abort"
+  "abs"
+  "abstract"
+  "accept"
+  "access"
+  "all"
+  "array"
+  "at"
+  "begin"
+  "declare"
+  "delay"
+  "delta"
+  "digits"
+  "do"
+  "end"
+  "entry"
+  "exit"
+  "generic"
+  "interface"
+  "is"
+  "limited"
+  "null"
+  "of"
+  "others"
+  "out"
+  "pragma"
+  "private"
+  "range"
+  "synchronized"
+  "tagged"
+  "task"
+  "terminate"
+  "until"
+  "when"
+] @keyword
 
 [
-   "abort"
-   "abs"
-   "abstract"
-   "accept"
-   "access"
-   "all"
-   "array"
-   "at"
-   "begin"
-   "declare"
-   "delay"
-   "delta"
-   "digits"
-   "do"
-   "end"
-   "entry"
-   "exit"
-   "generic"
-   "interface"
-   "is"
-   "limited"
-   "null"
-   "of"
-   "others"
-   "out"
-   "pragma"
-   "private"
-   "range"
-   "synchronized"
-   "tagged"
-   "task"
-   "terminate"
-   "until"
-   "when"
-] @keyword
-[
-   "aliased"
-   "constant"
-   "renames"
+  "aliased"
+  "constant"
+  "renames"
 ] @keyword.storage
+
 [
-   "mod"
-   "new"
-   "protected"
-   "record"
-   "subtype"
-   "type"
+  "mod"
+  "new"
+  "protected"
+  "record"
+  "subtype"
+  "type"
 ] @keyword.type
+
 [
-   "with"
-   "use"
+  "with"
+  "use"
 ] @keyword.import
+
 [
-   "body"
-   "function"
-   "overriding"
-   "procedure"
-   "package"
-   "separate"
+  "body"
+  "function"
+  "overriding"
+  "procedure"
+  "package"
+  "separate"
 ] @keyword.function
+
 [
-   "and"
-   "in"
-   "not"
-   "or"
-   "xor"
+  "and"
+  "in"
+  "not"
+  "or"
+  "xor"
 ] @keyword.operator
+
 [
-   "while"
-   "loop"
-   "for"
-   "parallel"
-   "reverse"
-   "some"
+  "while"
+  "loop"
+  "for"
+  "parallel"
+  "reverse"
+  "some"
 ] @keyword.repeat
+
+"return" @keyword.return
+
 [
-   "return"
-] @keyword.return
-[
-   "case"
-   "if"
-   "else"
-   "then"
-   "elsif"
-   "select"
+  "case"
+  "if"
+  "else"
+  "then"
+  "elsif"
+  "select"
 ] @keyword.conditional
+
 [
-   "exception"
-   "raise"
+  "exception"
+  "raise"
 ] @keyword.exception
+
 (comment) @comment @spell
+
 (string_literal) @string
+
 (character_literal) @string
+
 (numeric_literal) @number
 
-;; Highlight the name of subprograms
-(procedure_specification name: (_) @function)
-(function_specification name: (_) @function)
-(package_declaration name: (_) @function)
-(package_body name: (_) @function)
-(generic_instantiation name: (_) @function)
-(entry_declaration . (identifier) @function)
+; Highlight the name of subprograms
+(procedure_specification
+  name: (_) @function)
 
-;; Some keywords should take different categories depending on the context
-(use_clause "use"  @keyword.import "type" @keyword.import)
-(with_clause "private" @keyword.import)
-(with_clause "limited" @keyword.import)
-(use_clause (_) @module)
-(with_clause (_) @module)
+(function_specification
+  name: (_) @function)
 
-(loop_statement "end" @keyword.repeat)
-(if_statement "end" @keyword.conditional)
-(loop_parameter_specification "in" @keyword.repeat)
-(loop_parameter_specification "in" @keyword.repeat)
-(iterator_specification ["in" "of"] @keyword.repeat)
-(range_attribute_designator "range" @keyword.repeat)
+(package_declaration
+  name: (_) @function)
 
-(raise_statement "with" @keyword.exception)
+(package_body
+  name: (_) @function)
 
-(gnatprep_declarative_if_statement)  @keyword.directive
-(gnatprep_if_statement)              @keyword.directive
-(gnatprep_identifier)                @keyword.directive
+(generic_instantiation
+  name: (_) @function)
 
-(subprogram_declaration "is" @keyword.function "abstract"  @keyword.function)
-(aspect_specification "with" @keyword.function)
+(entry_declaration
+  .
+  (identifier) @function)
 
-(full_type_declaration "is" @keyword.type)
-(subtype_declaration "is" @keyword.type)
-(record_definition "end" @keyword.type)
-(full_type_declaration (_ "access" @keyword.type))
-(array_type_definition "array" @keyword.type "of" @keyword.type)
-(access_to_object_definition "access" @keyword.type)
-(access_to_object_definition "access" @keyword.type
-   [
-      (general_access_modifier "constant" @keyword.type)
-      (general_access_modifier "all" @keyword.type)
-   ]
-)
-(range_constraint "range" @keyword.type)
-(signed_integer_type_definition "range" @keyword.type)
-(index_subtype_definition "range" @keyword.type)
-(record_type_definition "abstract" @keyword.type)
-(record_type_definition "tagged" @keyword.type)
-(record_type_definition "limited" @keyword.type)
-(record_type_definition (record_definition "null" @keyword.type))
-(private_type_declaration "is" @keyword.type "private" @keyword.type)
-(private_type_declaration "tagged" @keyword.type)
-(private_type_declaration "limited" @keyword.type)
-(task_type_declaration "task" @keyword.type "is" @keyword.type)
+; Some keywords should take different categories depending on the context
+(use_clause
+  "use" @keyword.import
+  "type" @keyword.import)
 
-;; Gray the body of expression functions
+(with_clause
+  "private" @keyword.import)
+
+(with_clause
+  "limited" @keyword.import)
+
+(use_clause
+  (_) @module)
+
+(with_clause
+  (_) @module)
+
+(loop_statement
+  "end" @keyword.repeat)
+
+(if_statement
+  "end" @keyword.conditional)
+
+(loop_parameter_specification
+  "in" @keyword.repeat)
+
+(loop_parameter_specification
+  "in" @keyword.repeat)
+
+(iterator_specification
+  [
+    "in"
+    "of"
+  ] @keyword.repeat)
+
+(range_attribute_designator
+  "range" @keyword.repeat)
+
+(raise_statement
+  "with" @keyword.exception)
+
+(gnatprep_declarative_if_statement) @keyword.directive
+
+(gnatprep_if_statement) @keyword.directive
+
+(gnatprep_identifier) @keyword.directive
+
+(subprogram_declaration
+  "is" @keyword.function
+  "abstract" @keyword.function)
+
+(aspect_specification
+  "with" @keyword.function)
+
+(full_type_declaration
+  "is" @keyword.type)
+
+(subtype_declaration
+  "is" @keyword.type)
+
+(record_definition
+  "end" @keyword.type)
+
+(full_type_declaration
+  (_
+    "access" @keyword.type))
+
+(array_type_definition
+  "array" @keyword.type
+  "of" @keyword.type)
+
+(access_to_object_definition
+  "access" @keyword.type)
+
+(access_to_object_definition
+  "access" @keyword.type
+  [
+    (general_access_modifier
+      "constant" @keyword.type)
+    (general_access_modifier
+      "all" @keyword.type)
+  ])
+
+(range_constraint
+  "range" @keyword.type)
+
+(signed_integer_type_definition
+  "range" @keyword.type)
+
+(index_subtype_definition
+  "range" @keyword.type)
+
+(record_type_definition
+  "abstract" @keyword.type)
+
+(record_type_definition
+  "tagged" @keyword.type)
+
+(record_type_definition
+  "limited" @keyword.type)
+
+(record_type_definition
+  (record_definition
+    "null" @keyword.type))
+
+(private_type_declaration
+  "is" @keyword.type
+  "private" @keyword.type)
+
+(private_type_declaration
+  "tagged" @keyword.type)
+
+(private_type_declaration
+  "limited" @keyword.type)
+
+(task_type_declaration
+  "task" @keyword.type
+  "is" @keyword.type)
+
+; Gray the body of expression functions
 (expression_function_declaration
-   (function_specification)
-   "is"
-   (_) @attribute
-)
-(subprogram_declaration (aspect_specification) @attribute)
+  (function_specification)
+  "is"
+  (_) @attribute)
 
-;; Highlight full subprogram specifications
+(subprogram_declaration
+  (aspect_specification) @attribute)
+
+; Highlight full subprogram specifications
 ;(subprogram_body
 ;    [
 ;       (procedure_specification)
 ;       (function_specification)
 ;    ] @function.spec
 ;)
-
 ((comment) @comment.documentation
-  . [
-      (entry_declaration)
-      (subprogram_declaration)
-      (parameter_specification)
-    ])
+  .
+  [
+    (entry_declaration)
+    (subprogram_declaration)
+    (parameter_specification)
+  ])
 
-(compilation_unit 
-  . (comment) @comment.documentation)
+(compilation_unit
+  .
+  (comment) @comment.documentation)
 
 (component_list
   (component_declaration)
-    . (comment) @comment.documentation)
+  .
+  (comment) @comment.documentation)
 
-(enumeration_type_definition 
+(enumeration_type_definition
   (identifier)
-  . (comment) @comment.documentation)
+  .
+  (comment) @comment.documentation)
diff --git a/queries/ada/locals.scm b/queries/ada/locals.scm
index 2d61b3123..bdfc38be8 100644
--- a/queries/ada/locals.scm
+++ b/queries/ada/locals.scm
@@ -1,33 +1,91 @@
-;;  Better highlighting by referencing to the definition, for variable
-;;  references. However, this is not yet supported by neovim
-;;  See https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables
-
+;  Better highlighting by referencing to the definition, for variable
+;  references. However, this is not yet supported by neovim
+;  See https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables
 (compilation) @local.scope
+
 (package_declaration) @local.scope
+
 (package_body) @local.scope
+
 (subprogram_declaration) @local.scope
+
 (subprogram_body) @local.scope
+
 (block_statement) @local.scope
 
-(with_clause (identifier) @local.definition.import)
-(procedure_specification name: (_) @local.definition.function)
-(function_specification name: (_) @local.definition.function)
-(package_declaration name: (_) @local.definition.var)
-(package_body name: (_) @local.definition.var)
-(generic_instantiation . name: (_) @local.definition.var)
-(component_declaration . (identifier) @local.definition.var)
-(exception_declaration . (identifier) @local.definition.var)
-(formal_object_declaration . (identifier) @local.definition.var)
-(object_declaration . (identifier) @local.definition.var)
-(parameter_specification . (identifier) @local.definition.var)
-(full_type_declaration . (identifier) @local.definition.type)
-(private_type_declaration . (identifier) @local.definition.type)
-(private_extension_declaration . (identifier) @local.definition.type)
-(incomplete_type_declaration . (identifier) @local.definition.type)
-(protected_type_declaration . (identifier) @local.definition.type)
-(formal_complete_type_declaration . (identifier) @local.definition.type)
-(formal_incomplete_type_declaration . (identifier) @local.definition.type)
-(task_type_declaration . (identifier) @local.definition.type)
-(subtype_declaration . (identifier) @local.definition.type)
+(with_clause
+  (identifier) @local.definition.import)
+
+(procedure_specification
+  name: (_) @local.definition.function)
+
+(function_specification
+  name: (_) @local.definition.function)
+
+(package_declaration
+  name: (_) @local.definition.var)
+
+(package_body
+  name: (_) @local.definition.var)
+
+(generic_instantiation
+  .
+  name: (_) @local.definition.var)
+
+(component_declaration
+  .
+  (identifier) @local.definition.var)
+
+(exception_declaration
+  .
+  (identifier) @local.definition.var)
+
+(formal_object_declaration
+  .
+  (identifier) @local.definition.var)
+
+(object_declaration
+  .
+  (identifier) @local.definition.var)
+
+(parameter_specification
+  .
+  (identifier) @local.definition.var)
+
+(full_type_declaration
+  .
+  (identifier) @local.definition.type)
+
+(private_type_declaration
+  .
+  (identifier) @local.definition.type)
+
+(private_extension_declaration
+  .
+  (identifier) @local.definition.type)
+
+(incomplete_type_declaration
+  .
+  (identifier) @local.definition.type)
+
+(protected_type_declaration
+  .
+  (identifier) @local.definition.type)
+
+(formal_complete_type_declaration
+  .
+  (identifier) @local.definition.type)
+
+(formal_incomplete_type_declaration
+  .
+  (identifier) @local.definition.type)
+
+(task_type_declaration
+  .
+  (identifier) @local.definition.type)
+
+(subtype_declaration
+  .
+  (identifier) @local.definition.type)
 
 (identifier) @local.reference
diff --git a/queries/agda/folds.scm b/queries/agda/folds.scm
index e3258efb9..5e1051f8f 100644
--- a/queries/agda/folds.scm
+++ b/queries/agda/folds.scm
@@ -1,4 +1,4 @@
 [
- (record)
- (module)
+  (record)
+  (module)
 ] @fold
diff --git a/queries/agda/highlights.scm b/queries/agda/highlights.scm
index 6ff55d2fc..657e657f9 100644
--- a/queries/agda/highlights.scm
+++ b/queries/agda/highlights.scm
@@ -1,43 +1,52 @@
-
-;; Constants
+; Constants
 (integer) @number
 
-;; Variables and Symbols
+; Variables and Symbols
+(typed_binding
+  (atom
+    (qid) @variable))
 
-(typed_binding (atom (qid) @variable))
 (untyped_binding) @variable
-(typed_binding (expr) @type)
+
+(typed_binding
+  (expr) @type)
 
 (id) @function
+
 (bid) @function
 
-(function_name (atom (qid) @function))
+(function_name
+  (atom
+    (qid) @function))
+
 (field_name) @function
 
-
-[(data_name) (record_name)] @constructor
+[
+  (data_name)
+  (record_name)
+] @constructor
 
 ; Set
 (SetN) @type.builtin
 
-(expr . (atom) @function)
+(expr
+  .
+  (atom) @function)
 
 ((atom) @boolean
   (#any-of? @boolean "true" "false" "True" "False"))
 
-;; Imports and Module Declarations
-
-"import"  @keyword.import
+; Imports and Module Declarations
+"import" @keyword.import
 
 (module_name) @module
 
-;; Pragmas and comments
-
+; Pragmas and comments
 (pragma) @keyword.directive
 
 (comment) @comment @spell
 
-;; Keywords
+; Keywords
 [
   "where"
   "data"
@@ -62,20 +71,16 @@
   "infixl"
   "infixr"
   "record"
-]
-@keyword
-
-;;;(expr 
-;;;	f_name: (atom) @function)
-;; Brackets
+] @keyword
 
+;(expr
+;	f_name: (atom) @function)
+; Brackets
 [
   "("
   ")"
   "{"
-  "}"]
-@punctuation.bracket
+  "}"
+] @punctuation.bracket
 
-[
-  "="
-] @operator
+"=" @operator
diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 42d69c28a..a109dc179 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -1,12 +1,19 @@
 (identifier) @variable
-(pipe_sequence "|" @operator)
+
+(pipe_sequence
+  "|" @operator)
+
 (string) @string
+
 (number) @number
+
 (pipe_call
   name: (identifier) @function)
+
 (pipe_call
-  arguments: (pipe_arguments
-               (identifier) @variable.parameter))
+  arguments:
+    (pipe_arguments
+      (identifier) @variable.parameter))
 
 (structural_assignment
   operator: (identifier) @keyword)
@@ -18,32 +25,34 @@
   function: (identifier) @function)
 
 (call_expression
-  function: ((identifier) @function.builtin
-    (#eq? @function.builtin "$any")))
+  function:
+    ((identifier) @function.builtin
+      (#eq? @function.builtin "$any")))
 
 [
-"let"
-"as"
+  "let"
+  "as"
 ] @keyword
 
 [
-"("
-")"
-"["
-"]"
-"{"
-"}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 [
-";"
-"."
-","
-"?."
+  ";"
+  "."
+  ","
+  "?."
 ] @punctuation.delimiter
 
 ((identifier) @boolean
   (#any-of? @boolean "true" "false"))
+
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "this" "\$event" "null"))
 
diff --git a/queries/apex/folds.scm b/queries/apex/folds.scm
index 0ffc550e9..fdfc2a1ed 100644
--- a/queries/apex/folds.scm
+++ b/queries/apex/folds.scm
@@ -1,6 +1,6 @@
 [
-   (class_body)
-   (constructor_declaration)
-   (argument_list)
-   (annotation_argument_list)
+  (class_body)
+  (constructor_declaration)
+  (argument_list)
+  (annotation_argument_list)
 ] @fold
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 692fccb1b..64ff9168c 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -1,7 +1,5 @@
 ; inherits: soql
-
-;;; Apex + SOQL
-
+; Apex + SOQL
 [
   "["
   "]"
@@ -17,16 +15,14 @@
   ":"
   "?"
   ";"
- ] @punctuation.delimiter
-
-;; Default general color defination
+] @punctuation.delimiter
 
+; Default general color defination
 (identifier) @variable
 
 (type_identifier) @type
 
-;; Methods
-
+; Methods
 (method_declaration
   name: (identifier) @function.method)
 
@@ -35,13 +31,11 @@
 
 (super) @function.builtin
 
-;; Annotations
-
+; Annotations
 (annotation
   name: (identifier) @attribute)
 
-;; Types
-
+; Types
 (interface_declaration
   name: (identifier) @type)
 
@@ -49,7 +43,7 @@
   name: (identifier) @type)
 
 (class_declaration
-  (superclass) @type) 
+  (superclass) @type)
 
 (enum_declaration
   name: (identifier) @type)
@@ -57,8 +51,11 @@
 (enum_constant
   name: (identifier) @constant)
 
-(type_arguments "<" @punctuation.delimiter)
-(type_arguments ">" @punctuation.delimiter)
+(type_arguments
+  "<" @punctuation.delimiter)
+
+(type_arguments
+  ">" @punctuation.delimiter)
 
 ((field_access
   object: (identifier) @type))
@@ -68,11 +65,11 @@
 
 ((scoped_identifier
   scope: (identifier) @type)
- (#match? @type "^[A-Z]"))
+  (#match? @type "^[A-Z]"))
 
 ((method_invocation
   object: (identifier) @type)
- (#match? @type "^[A-Z]"))
+  (#match? @type "^[A-Z]"))
 
 (method_declaration
   (formal_parameters
@@ -86,16 +83,21 @@
 
 (assignment_operator) @operator
 
-(update_expression ["++" "--"] @operator)
+(update_expression
+  [
+    "++"
+    "--"
+  ] @operator)
 
 (trigger_declaration
   name: (identifier) @type
   object: (identifier) @type
   (trigger_event) @keyword
-  ("," (trigger_event) @keyword)*)
+  (","
+    (trigger_event) @keyword)*)
 
 [
-  "@" 
+  "@"
   "="
   "!="
   "<="
@@ -103,35 +105,39 @@
 ] @operator
 
 (binary_expression
-  operator: [
-    ">"
-    "<"
-    "=="
-    "==="
-    "!=="
-    "&&"
-    "||"
-    "+"
-    "-"
-    "*"
-    "/"
-    "&"
-    "|"
-    "^"
-    "%"
-    "<<"
-    ">>"
-    ">>>"] @operator)
+  operator:
+    [
+      ">"
+      "<"
+      "=="
+      "==="
+      "!=="
+      "&&"
+      "||"
+      "+"
+      "-"
+      "*"
+      "/"
+      "&"
+      "|"
+      "^"
+      "%"
+      "<<"
+      ">>"
+      ">>>"
+    ] @operator)
 
 (unary_expression
-  operator: [
-    "+"
-    "-"
-    "!"
-    "~"
-  ]) @operator
+  operator:
+    [
+      "+"
+      "-"
+      "!"
+      "~"
+    ]) @operator
 
-(map_initializer "=>" @operator)
+(map_initializer
+  "=>" @operator)
 
 [
   (boolean_type)
@@ -139,18 +145,27 @@
 ] @type.builtin
 
 ; Fields
-
 (field_declaration
-  declarator: (variable_declarator
-    name: (identifier) @variable.member))
+  declarator:
+    (variable_declarator
+      name: (identifier) @variable.member))
 
 (field_access
   field: (identifier) @variable.member)
 
 ; Variables
-
 (field_declaration
-  (modifiers (modifier ["final" "static"])(modifier ["final" "static"]))
+  (modifiers
+    (modifier
+      [
+        "final"
+        "static"
+      ])
+    (modifier
+      [
+        "final"
+        "static"
+      ]))
   (variable_declarator
     name: (identifier) @constant))
 
@@ -163,7 +178,6 @@
 (this) @variable.builtin
 
 ; Literals
-
 [
   (int)
   (decimal)
@@ -179,16 +193,15 @@
 
 (null_literal) @constant.builtin
 
-;; ;; Keywords
-
+; ;; Keywords
 [
- "abstract"
- "final"
- "private"
- "protected"
- "public"
- "static"
- ] @type.qualifier
+  "abstract"
+  "final"
+  "private"
+  "protected"
+  "public"
+  "static"
+] @type.qualifier
 
 [
   "if"
@@ -203,16 +216,14 @@
   "break"
 ] @keyword.repeat
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 [
- "throw"
- "finally"
- "try"
- "catch"
- ] @keyword.exception
+  "throw"
+  "finally"
+  "try"
+  "catch"
+] @keyword.exception
 
 "new" @keyword.operator
 
diff --git a/queries/apex/locals.scm b/queries/apex/locals.scm
index 5661b911d..d3cbfa73b 100644
--- a/queries/apex/locals.scm
+++ b/queries/apex/locals.scm
@@ -1,41 +1,46 @@
 ; declarations
-
 (class_declaration) @local.scope
+
 (method_declaration) @local.scope
+
 (constructor_declaration) @local.scope
+
 (enum_declaration) @local.scope
+
 (enhanced_for_statement) @local.scope
 
 ; if/else
-
 (if_statement) @local.scope
+
 (if_statement
   consequence: (_) @local.scope) ; if body in case there are no braces
+
 (if_statement
   alternative: (_) @local.scope) ; else body in case there are no braces
 
 ; try/catch
-
 (try_statement) @local.scope ; covers try+catch, individual try and catch are covered by (block)
+
 (catch_clause) @local.scope ; needed because `Exception` variable
 
 ; loops
-
 (for_statement) @local.scope
-(for_statement  ; "for" body in case there are no braces
+
+(for_statement ; "for" body in case there are no braces
   body: (_) @local.scope)
+
 (do_statement
   body: (_) @local.scope)
+
 (while_statement
   body: (_) @local.scope)
 
 ; Functions
-
 (constructor_declaration) @local.scope
+
 (method_declaration) @local.scope
 
-;; definitions
-
+; definitions
 (enum_declaration
   name: (identifier) @local.definition.enum)
 
@@ -43,10 +48,11 @@
   name: (identifier) @local.definition.method)
 
 (local_variable_declaration
-  declarator: (variable_declarator
-    name: (identifier) @local.definition.var))
+  declarator:
+    (variable_declarator
+      name: (identifier) @local.definition.var))
 
-(enhanced_for_statement 
+(enhanced_for_statement
   name: (identifier) @local.definition.var)
 
 (formal_parameter
@@ -56,11 +62,11 @@
   name: (identifier) @local.definition.parameter)
 
 (field_declaration
-  declarator: (variable_declarator
-    name: (identifier) @local.definition.field))
-
-;; REFERENCES
+  declarator:
+    (variable_declarator
+      name: (identifier) @local.definition.field))
 
+; REFERENCES
 (identifier) @local.reference
 
 (type_identifier) @local.reference
diff --git a/queries/arduino/highlights.scm b/queries/arduino/highlights.scm
index a2e121a06..9620f1f73 100644
--- a/queries/arduino/highlights.scm
+++ b/queries/arduino/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: cpp
-
 ((identifier) @function.builtin
   ; format-ignore
   (#any-of? @function.builtin
@@ -72,25 +71,10 @@
      "noInterrupts"))
 
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-           "Serial"
-           "SPI"
-           "Stream"
-           "Wire"
-           "Keyboard"
-           "Mouse"
-           "String"
-           ))
+  (#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"
-           ))
+  (#any-of? @constant.builtin "HIGH" "LOW" "INPUT" "OUTPUT" "INPUT_PULLUP" "LED_BUILTIN"))
 
 (function_definition
   (function_declarator
diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm
index 6ccfef83f..b637d9b2b 100644
--- a/queries/arduino/injections.scm
+++ b/queries/arduino/injections.scm
@@ -1,5 +1,5 @@
 ((preproc_arg) @injection.content
- (#set! injection.language "arduino"))
+  (#set! injection.language "arduino"))
 
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/astro/highlights.scm b/queries/astro/highlights.scm
index 91ccbffb3..650a489e4 100644
--- a/queries/astro/highlights.scm
+++ b/queries/astro/highlights.scm
@@ -1,13 +1,20 @@
 ; inherits: html
+"---" @punctuation.delimiter
 
-[ "---" ] @punctuation.delimiter
-
-[ "{" "}" ] @punctuation.special
+[
+  "{"
+  "}"
+] @punctuation.special
 
 ; custom components get `@type` highlighting
-((start_tag (tag_name) @type)
- (#lua-match? @type "^[A-Z]"))
-((end_tag (tag_name) @type)
- (#lua-match? @type "^[A-Z]"))
-((erroneous_end_tag (erroneous_end_tag_name) @type)
- (#lua-match? @type "^[A-Z]"))
+((start_tag
+  (tag_name) @type)
+  (#lua-match? @type "^[A-Z]"))
+
+((end_tag
+  (tag_name) @type)
+  (#lua-match? @type "^[A-Z]"))
+
+((erroneous_end_tag
+  (erroneous_end_tag_name) @type)
+  (#lua-match? @type "^[A-Z]"))
diff --git a/queries/astro/injections.scm b/queries/astro/injections.scm
index b8f1ccefc..9b1f285db 100644
--- a/queries/astro/injections.scm
+++ b/queries/astro/injections.scm
@@ -1,5 +1,4 @@
 ; inherits: html_tags
-
 (frontmatter
   (raw_text) @injection.content
   (#set! injection.language "typescript"))
@@ -13,11 +12,12 @@
   (#set! injection.language "typescript"))
 
 (style_element
- (start_tag
-   (attribute
-     (attribute_name) @_lang_attr
-     (quoted_attribute_value (attribute_value) @_lang_value)))
- (raw_text) @injection.content
- (#eq? @_lang_attr "lang")
- (#eq? @_lang_value "scss")
- (#set! injection.language "scss"))
+  (start_tag
+    (attribute
+      (attribute_name) @_lang_attr
+      (quoted_attribute_value
+        (attribute_value) @_lang_value)))
+  (raw_text) @injection.content
+  (#eq? @_lang_attr "lang")
+  (#eq? @_lang_value "scss")
+  (#set! injection.language "scss"))
diff --git a/queries/authzed/highlights.scm b/queries/authzed/highlights.scm
index 7a4b85d1f..2009b78e3 100644
--- a/queries/authzed/highlights.scm
+++ b/queries/authzed/highlights.scm
@@ -11,7 +11,8 @@
     (identifier) @type))
 
 ; relations
-(rel_expression (identifier) @property)
+(rel_expression
+  (identifier) @property)
 
 (relation
   (rel_expression
@@ -20,16 +21,18 @@
     (identifier) @constant))
 
 ; permissions
-(perm_expression (identifier) @property)
+(perm_expression
+  (identifier) @property)
 
 (call_expression
-  function: (selector_expression
-    operand: (identifier) @constant
-    field: (field_identifier) @function.method))
+  function:
+    (selector_expression
+      operand: (identifier) @constant
+      field: (field_identifier) @function.method))
 
 (perm_expression
   (stabby) @operator
-  . 
+  .
   (identifier) @function)
 
 ; misc
diff --git a/queries/authzed/injections.scm b/queries/authzed/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/authzed/injections.scm
+++ b/queries/authzed/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
index 6d3b7ff0b..90c9f3437 100644
--- a/queries/awk/highlights.scm
+++ b/queries/awk/highlights.scm
@@ -1,67 +1,54 @@
 ; adapted from https://github.com/Beaglefoot/tree-sitter-awk
-
 [
   (identifier)
   (field_ref)
 ] @variable
-(field_ref (_) @variable)
+
+(field_ref
+  (_) @variable)
 
 ; https://www.gnu.org/software/gawk/manual/html_node/Auto_002dset.html
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin
-           "ARGC"
-           "ARGV"
-           "ARGIND"
-           "ENVIRON"
-           "ERRNO"
-           "FILENAME"
-           "FNR"
-           "NF"
-           "FUNCTAB"
-           "NR"
-           "PROCINFO"
-           "RLENGTH"
-           "RSTART"
-           "RT"
-           "SYMTAB"))
+  (#any-of? @constant.builtin "ARGC" "ARGV" "ARGIND" "ENVIRON" "ERRNO" "FILENAME" "FNR" "NF" "FUNCTAB" "NR" "PROCINFO" "RLENGTH" "RSTART" "RT" "SYMTAB"))
 
 ; https://www.gnu.org/software/gawk/manual/html_node/User_002dmodified.html
 ((identifier) @variable.builtin
- (#any-of? @variable.builtin
-           "BINMODE"
-           "CONVFMT"
-           "FIELDWIDTHS"
-           "FPAT"
-           "FS"
-           "IGNORECASE"
-           "LINT"
-           "OFMT"
-           "OFS"
-           "ORS"
-           "PREC"
-           "ROUNDMODE"
-           "RS"
-           "SUBSEP"
-           "TEXTDOMAIN"))
+  (#any-of? @variable.builtin "BINMODE" "CONVFMT" "FIELDWIDTHS" "FPAT" "FS" "IGNORECASE" "LINT" "OFMT" "OFS" "ORS" "PREC" "ROUNDMODE" "RS" "SUBSEP" "TEXTDOMAIN"))
 
 (number) @number
 
 (string) @string
+
 (regex) @string.regexp
+
 (escape_sequence) @string.escape
 
 (comment) @comment @spell
 
-((program . (comment) @keyword.directive)
+((program
+  .
+  (comment) @keyword.directive)
   (#lua-match? @keyword.directive "^#!/"))
 
-(ns_qualified_name (namespace) @module)
-(ns_qualified_name "::" @punctuation.delimiter)
+(ns_qualified_name
+  (namespace) @module)
 
-(func_def name: (_ (identifier) @function) @function)
-(func_call name: (_ (identifier) @function) @function)
+(ns_qualified_name
+  "::" @punctuation.delimiter)
 
-(func_def (param_list (identifier) @variable.parameter))
+(func_def
+  name:
+    (_
+      (identifier) @function) @function)
+
+(func_call
+  name:
+    (_
+      (identifier) @function) @function)
+
+(func_def
+  (param_list
+    (identifier) @variable.parameter))
 
 [
   "print"
@@ -110,80 +97,95 @@
 "@namespace" @keyword.directive
 
 [
- "BEGIN"
- "END"
- "BEGINFILE"
- "ENDFILE"
+  "BEGIN"
+  "END"
+  "BEGINFILE"
+  "ENDFILE"
 ] @label
 
-(binary_exp [
-  "^"
-  "**"
-  "*"
-  "/"
-  "%"
-  "+"
-  "-"
-  "<"
-  ">"
-  "<="
-  ">="
-  "=="
-  "!="
-  "~"
-  "!~"
-  "in"
-  "&&"
-  "||"
-] @operator)
+(binary_exp
+  [
+    "^"
+    "**"
+    "*"
+    "/"
+    "%"
+    "+"
+    "-"
+    "<"
+    ">"
+    "<="
+    ">="
+    "=="
+    "!="
+    "~"
+    "!~"
+    "in"
+    "&&"
+    "||"
+  ] @operator)
 
-(unary_exp [
-  "!"
-  "+"
-  "-"
-] @operator)
+(unary_exp
+  [
+    "!"
+    "+"
+    "-"
+  ] @operator)
 
-(assignment_exp [
-  "="
-  "+="
-  "-="
-  "*="
-  "/="
-  "%="
-  "^="
-] @operator)
+(assignment_exp
+  [
+    "="
+    "+="
+    "-="
+    "*="
+    "/="
+    "%="
+    "^="
+  ] @operator)
 
-(ternary_exp [
-  "?"
-  ":"
-] @keyword.conditional.ternary)
+(ternary_exp
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
-(update_exp [
-  "++"
-  "--"
-] @operator)
+(update_exp
+  [
+    "++"
+    "--"
+  ] @operator)
 
-(redirected_io_statement [
-  ">"
-  ">>"
-] @operator)
+(redirected_io_statement
+  [
+    ">"
+    ">>"
+  ] @operator)
 
-(piped_io_statement [
-  "|"
-  "|&"
-] @operator)
+(piped_io_statement
+  [
+    "|"
+    "|&"
+  ] @operator)
 
-(piped_io_exp [
-  "|"
-  "|&"
-] @operator)
+(piped_io_exp
+  [
+    "|"
+    "|&"
+  ] @operator)
 
-(field_ref "$" @punctuation.delimiter)
+(field_ref
+  "$" @punctuation.delimiter)
 
-(regex "/" @punctuation.delimiter)
-(regex_constant "@" @punctuation.delimiter)
+(regex
+  "/" @punctuation.delimiter)
 
-[ ";" "," ] @punctuation.delimiter
+(regex_constant
+  "@" @punctuation.delimiter)
+
+[
+  ";"
+  ","
+] @punctuation.delimiter
 
 [
   "("
diff --git a/queries/awk/injections.scm b/queries/awk/injections.scm
index 24db57d67..3e67da245 100644
--- a/queries/awk/injections.scm
+++ b/queries/awk/injections.scm
@@ -1,13 +1,17 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((regex) @injection.content
- (#set! injection.language "regex"))
+  (#set! injection.language "regex"))
 
 ((print_statement
-  (exp_list . (string) @injection.content))
- (#set! injection.language "printf"))
+  (exp_list
+    .
+    (string) @injection.content))
+  (#set! injection.language "printf"))
 
 ((printf_statement
-  (exp_list . (string) @injection.content))
- (#set! injection.language "printf"))
+  (exp_list
+    .
+    (string) @injection.content))
+  (#set! injection.language "printf"))
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 5820680ef..21346ded8 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -1,84 +1,89 @@
 [
- "(" ")"
- "{" "}"
- "[" "]"
- "[[" "]]"
- "((" "))"
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+  "[["
+  "]]"
+  "(("
+  "))"
 ] @punctuation.bracket
 
 [
- ";"
- ";;"
- ";&"
- ";;&"
- "&"
+  ";"
+  ";;"
+  ";&"
+  ";;&"
+  "&"
 ] @punctuation.delimiter
 
 [
- ">"
- ">>"
- "<"
- "<<"
- "&&"
- "|"
- "|&"
- "||"
- "="
- "+="
- "=~"
- "=="
- "!="
-
- "&>"
- "&>>"
- "<&"
- ">&"
- ">|"
- "<&-"
- ">&-"
-
- "<<-"
- "<<<"
-
- ".."
+  ">"
+  ">>"
+  "<"
+  "<<"
+  "&&"
+  "|"
+  "|&"
+  "||"
+  "="
+  "+="
+  "=~"
+  "=="
+  "!="
+  "&>"
+  "&>>"
+  "<&"
+  ">&"
+  ">|"
+  "<&-"
+  ">&-"
+  "<<-"
+  "<<<"
+  ".."
 ] @operator
 
 ; Do *not* spell check strings since they typically have some sort of
 ; interpolation in them, or, are typically used for things like filenames, URLs,
 ; flags and file content.
 [
- (string)
- (raw_string)
- (ansi_c_string)
- (heredoc_body)
+  (string)
+  (raw_string)
+  (ansi_c_string)
+  (heredoc_body)
 ] @string
 
 [
- (heredoc_start)
- (heredoc_end)
+  (heredoc_start)
+  (heredoc_end)
 ] @label
 
-(variable_assignment (word) @string)
-(command argument: "$" @string) ; bare dollar
+(variable_assignment
+  (word) @string)
+
+(command
+  argument: "$" @string) ; bare dollar
 
 [
- "if"
- "then"
- "else"
- "elif"
- "fi"
- "case"
- "in"
- "esac"
+  "if"
+  "then"
+  "else"
+  "elif"
+  "fi"
+  "case"
+  "in"
+  "esac"
 ] @keyword.conditional
 
 [
- "for"
- "do"
- "done"
- "select"
- "until"
- "while"
+  "for"
+  "do"
+  "done"
+  "select"
+  "until"
+  "while"
 ] @keyword.repeat
 
 [
@@ -97,36 +102,54 @@
 
 ; 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]))?)$"))
+  (#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
- (#any-of? @boolean "true" "false"))
+  (#any-of? @boolean "true" "false"))
 
 (comment) @comment @spell
 
 (test_operator) @operator
 
-(command_substitution "$(" @punctuation.bracket)
-(process_substitution "<(" @punctuation.bracket)
+(command_substitution
+  "$(" @punctuation.bracket)
+
+(process_substitution
+  "<(" @punctuation.bracket)
 
 (arithmetic_expansion
-  [ "$((" "((" ] @punctuation.special
+  [
+    "$(("
+    "(("
+  ] @punctuation.special
   "))" @punctuation.special)
 
-(arithmetic_expansion "," @punctuation.delimiter)
+(arithmetic_expansion
+  "," @punctuation.delimiter)
 
-(ternary_expression [ "?" ":" ] @keyword.conditional.ternary)
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
-(binary_expression operator: _ @operator)
-(unary_expression operator: _ @operator)
-(postfix_expression operator: _ @operator)
+(binary_expression
+  operator: _ @operator)
+
+(unary_expression
+  operator: _ @operator)
+
+(postfix_expression
+  operator: _ @operator)
 
 (function_definition
   name: (word) @function)
 
-(command_name (word) @function.call)
+(command_name
+  (word) @function.call)
 
-((command_name (word) @function.builtin)
+((command_name
+  (word) @function.builtin)
   ; format-ignore
   (#any-of? @function.builtin
     "alias" "bg" "bind" "break" "builtin" "caller" "cd"
@@ -140,14 +163,17 @@
     "ulimit" "umask" "unalias" "wait"))
 
 (command
-  argument: [
-             (word) @variable.parameter
-             (concatenation (word) @variable.parameter)
-             ])
+  argument:
+    [
+      (word) @variable.parameter
+      (concatenation
+        (word) @variable.parameter)
+    ])
 
 (number) @number
+
 ((word) @number
- (#lua-match? @number "^[0-9]+$"))
+  (#lua-match? @number "^[0-9]+$"))
 
 (file_redirect
   destination: (word) @variable.parameter)
@@ -156,24 +182,30 @@
 
 (simple_expansion
   "$" @punctuation.special) @none
+
 (expansion
   "${" @punctuation.special
   "}" @punctuation.special) @none
 
-(expansion operator: _ @punctuation.special)
-(expansion "@" . operator: _ @character.special)
+(expansion
+  operator: _ @punctuation.special)
+
+(expansion
+  "@"
+  .
+  operator: _ @character.special)
 
 ((expansion
   (subscript
     index: (word) @character.special))
- (#any-of? @character.special "@" "*"))
+  (#any-of? @character.special "@" "*"))
 
 "``" @punctuation.special
 
 (variable_name) @variable
 
 ((variable_name) @constant
- (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 (case_item
   value: (word) @variable.parameter)
@@ -183,5 +215,7 @@
   (extglob_pattern)
 ] @string.regexp
 
-((program . (comment) @keyword.directive)
- (#lua-match? @keyword.directive "^#!/"))
+((program
+  .
+  (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 516df3b3d..83bb6359e 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -1,35 +1,52 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
 
 ((regex) @injection.content
- (#set! injection.language "regex"))
+  (#set! injection.language "regex"))
 
 ((heredoc_redirect
   (heredoc_body) @injection.content
   (heredoc_end) @injection.language)
- (#downcase! @injection.language))
+  (#downcase! @injection.language))
 
 ; printf 'format'
 ((command
   name: (command_name) @_command
-  . argument: [(string) (raw_string)] @injection.content)
- (#eq? @_command "printf")
- (#set! injection.language "printf"))
+  .
+  argument:
+    [
+      (string)
+      (raw_string)
+    ] @injection.content)
+  (#eq? @_command "printf")
+  (#set! injection.language "printf"))
 
 ; printf -v var 'format'
 ((command
   name: (command_name) @_command
   argument: (word) @_arg
-  . (_) . argument: [(string) (raw_string)] @injection.content)
- (#eq? @_command "printf")
- (#eq? @_arg "-v")
- (#set! injection.language "printf"))
+  .
+  (_)
+  .
+  argument:
+    [
+      (string)
+      (raw_string)
+    ] @injection.content)
+  (#eq? @_command "printf")
+  (#eq? @_arg "-v")
+  (#set! injection.language "printf"))
 
 ; printf -- 'format'
 ((command
   name: (command_name) @_command
   argument: (word) @_arg
-  . argument: [(string) (raw_string)] @injection.content)
- (#eq? @_command "printf")
- (#eq? @_arg "--")
- (#set! injection.language "printf"))
+  .
+  argument:
+    [
+      (string)
+      (raw_string)
+    ] @injection.content)
+  (#eq? @_command "printf")
+  (#eq? @_arg "--")
+  (#set! injection.language "printf"))
diff --git a/queries/bash/locals.scm b/queries/bash/locals.scm
index 2b9cfec70..347f51fa2 100644
--- a/queries/bash/locals.scm
+++ b/queries/bash/locals.scm
@@ -2,7 +2,7 @@
 (function_definition) @local.scope
 
 ; Definitions
-(variable_assignment 
+(variable_assignment
   name: (variable_name) @local.definition.var)
 
 (function_definition
@@ -10,4 +10,5 @@
 
 ; References
 (variable_name) @local.reference
+
 (word) @local.reference
diff --git a/queries/bass/highlights.scm b/queries/bass/highlights.scm
index 3a16cbb34..8a92a59e9 100644
--- a/queries/bass/highlights.scm
+++ b/queries/bass/highlights.scm
@@ -1,54 +1,56 @@
-;; Variables
+; Variables
+(list
+  (symbol) @variable)
 
-(list (symbol) @variable)
+(cons
+  (symbol) @variable)
 
-(cons (symbol) @variable)
+(scope
+  (symbol) @variable)
 
-(scope (symbol) @variable)
-
-(symbind (symbol) @variable)
-
-;; Constants
+(symbind
+  (symbol) @variable)
 
+; Constants
 ((symbol) @constant
   (#lua-match? @constant "^_*[A-Z][A-Z0-9_]*$"))
 
-;; Functions
-
-(list 
-  . (symbol) @function)
-
-;; Namespaces
+; Functions
+(list
+  .
+  (symbol) @function)
 
+; Namespaces
 (symbind
   (symbol) @module
-  . (keyword))
-
-;; Includes
+  .
+  (keyword))
 
+; Includes
 ((symbol) @keyword.import
   (#any-of? @keyword.import "use" "import" "load"))
 
-;; Keywords
-
+; Keywords
 ((symbol) @keyword
   (#any-of? @keyword "do" "doc"))
 
-;; Special Functions
-
+; Special Functions
 ; Keywords construct a symbol
-
 (keyword) @constructor
 
 ((list
-  . (symbol) @keyword.function
-  . (symbol) @function
+  .
+  (symbol) @keyword.function
+  .
+  (symbol) @function
   (symbol)? @variable.parameter)
   (#any-of? @keyword.function "def" "defop" "defn" "fn"))
 
 ((cons
-  . (symbol) @keyword.function
-  . (symbol) @function
+  .
+  (symbol) @keyword.function
+  .
+  (symbol) @function
   (symbol)? @variable.parameter)
   (#any-of? @keyword.function "def" "defop" "defn" "fn"))
 
@@ -58,33 +60,38 @@
 ((symbol) @function.macro
   (#any-of? @function.macro "op" "current-scope" "quote" "let" "provide" "module" "or" "and" "curryfn" "for" "$" "linux"))
 
-;; Conditionals
-
+; Conditionals
 ((symbol) @keyword.conditional
   (#any-of? @keyword.conditional "if" "case" "cond" "when"))
 
-;; Repeats
-
+; Repeats
 ((symbol) @keyword.repeat
   (#any-of? @keyword.repeat "each"))
 
-;; Operators
+; Operators
+((symbol) @operator
+  (#any-of? @operator "&" "*" "+" "-" "<" "<=" "=" ">" ">="))
 
-((symbol) @operator (#any-of? @operator "&" "*" "+" "-" "<" "<=" "=" ">" ">="))
+; Punctuation
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-;; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
-
-[ "{" "}" ] @punctuation.bracket
-
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 ((symbol) @punctuation.delimiter
   (#eq? @punctuation.delimiter "->"))
 
-;; Literals
-
+; Literals
 (string) @string
 
 (escape_sequence) @string.escape
@@ -100,10 +107,7 @@
   (null)
 ] @constant.builtin
 
-[
-  "^"
-] @character.special
-
-;; Comments
+"^" @character.special
 
+; Comments
 (comment) @comment @spell
diff --git a/queries/bass/indents.scm b/queries/bass/indents.scm
index 60c5df4eb..27b976f21 100644
--- a/queries/bass/indents.scm
+++ b/queries/bass/indents.scm
@@ -10,11 +10,20 @@
   "]"
 ] @indent.end
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/bass/injections.scm b/queries/bass/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/bass/injections.scm
+++ b/queries/bass/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/bass/locals.scm b/queries/bass/locals.scm
index c28a78dd5..daed7e5e1 100644
--- a/queries/bass/locals.scm
+++ b/queries/bass/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (list)
   (scope)
@@ -7,19 +6,21 @@
 ] @local.scope
 
 ; References
-
 (symbol) @local.reference
 
 ; Definitions
-
 ((list
-  . (symbol) @_fnkw
-  . (symbol) @local.definition.function
+  .
+  (symbol) @_fnkw
+  .
+  (symbol) @local.definition.function
   (symbol)? @local.definition.parameter)
   (#any-of? @_fnkw "def" "defop" "defn" "fn"))
 
 ((cons
-  . (symbol) @_fnkw
-  . (symbol) @local.definition.function
+  .
+  (symbol) @_fnkw
+  .
+  (symbol) @local.definition.function
   (symbol)? @local.definition.parameter)
   (#any-of? @_fnkw "def" "defop" "defn" "fn"))
diff --git a/queries/beancount/folds.scm b/queries/beancount/folds.scm
index ffe319500..9f1b6cbed 100644
--- a/queries/beancount/folds.scm
+++ b/queries/beancount/folds.scm
@@ -1,4 +1,4 @@
 [
-    (transaction)
-    (section)
+  (transaction)
+  (section)
 ] @fold
diff --git a/queries/beancount/highlights.scm b/queries/beancount/highlights.scm
index 191dc519e..1e23d28f4 100644
--- a/queries/beancount/highlights.scm
+++ b/queries/beancount/highlights.scm
@@ -1,24 +1,57 @@
 (date) @variable.member
+
 (txn) @attribute
+
 (account) @type
+
 (amount) @number
+
 (incomplete_amount) @number
+
 (compound_amount) @number
+
 (amount_tolerance) @number
+
 (currency) @property
+
 (key) @label
+
 (string) @string
+
 (narration) @string @spell
+
 (payee) @string @spell
+
 (tag) @constant
+
 (link) @constant
+
 [
- (minus) (plus) (slash) (asterisk)
+  (minus)
+  (plus)
+  (slash)
+  (asterisk)
 ] @operator
+
 (comment) @comment @spell
+
 [
-    (balance) (open) (close) (commodity) (pad)
-    (event) (price) (note) (document) (query)
-    (custom) (pushtag) (poptag) (pushmeta)
-    (popmeta) (option) (include) (plugin)
+  (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
index 3b24d5fea..321a045c9 100644
--- a/queries/bibtex/folds.scm
+++ b/queries/bibtex/folds.scm
@@ -1,3 +1 @@
-[
- (entry)
-] @fold
+(entry) @fold
diff --git a/queries/bibtex/highlights.scm b/queries/bibtex/highlights.scm
index 602ed5d27..a82b371ae 100644
--- a/queries/bibtex/highlights.scm
+++ b/queries/bibtex/highlights.scm
@@ -1,5 +1,4 @@
 ; CREDITS @pfoerster (adapted from https://github.com/latex-lsp/tree-sitter-bibtex)
-
 [
   (string_type)
   (preamble_type)
diff --git a/queries/bibtex/indents.scm b/queries/bibtex/indents.scm
index 1ba3e6b47..764172a76 100644
--- a/queries/bibtex/indents.scm
+++ b/queries/bibtex/indents.scm
@@ -1,10 +1,8 @@
-[
- (entry)
-] @indent.begin
+(entry) @indent.begin
 
 [
- "{"
- "}"
+  "{"
+  "}"
 ] @indent.branch
 
 (comment) @indent.ignore
diff --git a/queries/bicep/folds.scm b/queries/bicep/folds.scm
index 8ec5ba200..217a86d6a 100644
--- a/queries/bicep/folds.scm
+++ b/queries/bicep/folds.scm
@@ -6,20 +6,14 @@
   (resource_declaration)
   (type_declaration)
   (variable_declaration)
-
   (parenthesized_expression)
-
   (decorators)
   (array)
   (object)
-
   (if_statement)
   (for_statement)
-
   (subscript_expression)
   (ternary_expression)
-
   (string)
-
   (comment)
 ] @fold
diff --git a/queries/bicep/highlights.scm b/queries/bicep/highlights.scm
index ae691c76b..0045f8b8c 100644
--- a/queries/bicep/highlights.scm
+++ b/queries/bicep/highlights.scm
@@ -1,5 +1,4 @@
 ; Includes
-
 (import_statement
   "import" @keyword.import)
 
@@ -8,12 +7,10 @@
   "with" @keyword.import)
 
 ; Namespaces
-
 (module_declaration
   (identifier) @module)
 
 ; Builtins
-
 (primitive_type) @type.builtin
 
 ((member_expression
@@ -21,12 +18,10 @@
   (#eq? @type.builtin "sys"))
 
 ; Functions
-
 (call_expression
   function: (identifier) @function.call)
 
 ; Properties
-
 (object_property
   (identifier) @property
   ":" @punctuation.delimiter
@@ -40,21 +35,20 @@
 (property_identifier) @property
 
 ; Attributes
-
 (decorator
   "@" @attribute)
 
 (decorator
-  (call_expression (identifier) @attribute))
+  (call_expression
+    (identifier) @attribute))
 
 (decorator
   (call_expression
     (member_expression
-	  object: (identifier) @attribute
-	  property: (property_identifier) @attribute)))
+      object: (identifier) @attribute
+      property: (property_identifier) @attribute)))
 
 ; Types
-
 (type_declaration
   (identifier) @type)
 
@@ -66,7 +60,8 @@
 (type_declaration
   (identifier)
   "="
-  (array_type (identifier) @type))
+  (array_type
+    (identifier) @type))
 
 (type
   (identifier) @type)
@@ -78,21 +73,22 @@
   (identifier) @type)
 
 ; Parameters
-
 (parameter_declaration
   (identifier) @variable.parameter
   (_))
 
 (call_expression
-  function: (_) 
-  (arguments (identifier) @variable.parameter))
+  function: (_)
+  (arguments
+    (identifier) @variable.parameter))
 
 (call_expression
-  function: (_) 
-  (arguments (member_expression object: (identifier) @variable.parameter)))
+  function: (_)
+  (arguments
+    (member_expression
+      object: (identifier) @variable.parameter)))
 
 ; Variables
-
 (variable_declaration
   (identifier) @variable
   (_))
@@ -117,7 +113,6 @@
     (loop_enumerator) @variable))
 
 ; Conditionals
-
 "if" @keyword.conditional
 
 (ternary_expression
@@ -125,14 +120,12 @@
   ":" @keyword.conditional.ternary)
 
 ; Loops
-
 (for_statement
   "for" @keyword.repeat
   "in"
   ":" @punctuation.delimiter)
 
 ; Keywords
-
 [
   "module"
   "metadata"
@@ -146,7 +139,6 @@
 ] @keyword
 
 ; Operators
-
 [
   "+"
   "-"
@@ -169,14 +161,11 @@
   "!"
 ] @operator
 
-[
-  "in"
-] @keyword.operator
-
+"in" @keyword.operator
 
 ; Literals
-
 (string) @string
+
 (import_string
   "'" @string
   (import_name) @module
@@ -192,17 +181,25 @@
 (null) @constant.builtin
 
 ; Misc
-
 (compatible_identifier
   "?" @punctuation.special)
 
 (nullable_return_type) @punctuation.special
 
-["{" "}"] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-["[" "]"] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-["(" ")"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   "."
@@ -210,9 +207,7 @@
   "=>"
 ] @punctuation.delimiter
 
-
 ; Interpolation
-
 (interpolation) @none
 
 (interpolation
@@ -223,7 +218,6 @@
   (identifier) @variable)
 
 ; Comments
-
 [
   (comment)
   (diagnostic_comment)
diff --git a/queries/bicep/indents.scm b/queries/bicep/indents.scm
index cf2e6e1c2..055e51b23 100644
--- a/queries/bicep/indents.scm
+++ b/queries/bicep/indents.scm
@@ -5,11 +5,20 @@
 
 "}" @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/bicep/injections.scm b/queries/bicep/injections.scm
index d3ff30b60..5c2d4a57b 100644
--- a/queries/bicep/injections.scm
+++ b/queries/bicep/injections.scm
@@ -1,5 +1,5 @@
 ([
   (comment)
   (diagnostic_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/bicep/locals.scm b/queries/bicep/locals.scm
index c28987051..137753ae2 100644
--- a/queries/bicep/locals.scm
+++ b/queries/bicep/locals.scm
@@ -1,22 +1,17 @@
 ; Scopes
-
 [
   (infrastructure)
   (call_expression)
-
   (lambda_expression)
   (subscript_expression)
-
   (if_statement)
   (for_statement)
-
   (array)
   (object)
   (interpolation)
 ] @local.scope
 
 ; References
-
 (property_identifier) @local.reference
 
 (call_expression
@@ -31,7 +26,6 @@
   (identifier) @local.reference)
 
 ; Definitions
-
 (type) @local.definition.associated
 
 (object_property
diff --git a/queries/bitbake/folds.scm b/queries/bitbake/folds.scm
index 9fc865e84..85d226348 100644
--- a/queries/bitbake/folds.scm
+++ b/queries/bitbake/folds.scm
@@ -2,28 +2,23 @@
   (function_definition)
   (anonymous_python_function)
   (python_function_definition)
-
   (while_statement)
   (for_statement)
   (if_statement)
   (with_statement)
   (try_statement)
-
   (import_from_statement)
   (parameters)
   (argument_list)
-
   (parenthesized_expression)
   (generator_expression)
   (list_comprehension)
   (set_comprehension)
   (dictionary_comprehension)
-
   (tuple)
   (list)
   (set)
   (dictionary)
-
   (string)
   (python_string)
 ] @fold
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index eafe60b4d..e555e40d7 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -1,5 +1,4 @@
 ; Includes
-
 [
   "inherit"
   "include"
@@ -9,12 +8,10 @@
 ] @keyword.import
 
 ; Keywords
-
 [
   "unset"
   "EXPORT_FUNCTIONS"
   "python"
-
   "assert"
   "exec"
   "global"
@@ -34,19 +31,34 @@
   "return"
   "yield"
 ] @keyword.return
-(yield "from" @keyword.return)
+
+(yield
+  "from" @keyword.return)
 
 (future_import_statement
   "from" @keyword.import
   "__future__" @constant.builtin)
-(import_from_statement "from" @keyword.import)
+
+(import_from_statement
+  "from" @keyword.import)
+
 "import" @keyword.import
 
-(aliased_import "as" @keyword.import)
+(aliased_import
+  "as" @keyword.import)
 
-["if" "elif" "else"] @keyword.conditional
+[
+  "if"
+  "elif"
+  "else"
+] @keyword.conditional
 
-["for" "while" "break" "continue"] @keyword.repeat
+[
+  "for"
+  "while"
+  "break"
+  "continue"
+] @keyword.repeat
 
 [
   "try"
@@ -56,7 +68,8 @@
   "finally"
 ] @keyword.exception
 
-(raise_statement "from" @keyword.exception)
+(raise_statement
+  "from" @keyword.exception)
 
 (try_statement
   (else_clause
@@ -82,7 +95,6 @@
 ] @type.qualifier
 
 ; Variables
-
 [
   (identifier)
   (python_identifier)
@@ -99,14 +111,18 @@
 ; Reset highlighting in f-string interpolations
 (interpolation) @none
 
-;; Identifier naming conventions
+; Identifier naming conventions
 ((python_identifier) @type
- (#lua-match? @type "^[A-Z].*[a-z]"))
-([(identifier) (python_identifier)] @constant
- (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+  (#lua-match? @type "^[A-Z].*[a-z]"))
+
+([
+  (identifier)
+  (python_identifier)
+] @constant
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 ((python_identifier) @constant.builtin
- (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
+  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((python_identifier) @constant.builtin
   ; format-ignore
@@ -117,128 +133,149 @@
 
 ((assignment
   left: (python_identifier) @type.definition
-  (type (python_identifier) @_annotation))
- (#eq? @_annotation "TypeAlias"))
+  (type
+    (python_identifier) @_annotation))
+  (#eq? @_annotation "TypeAlias"))
 
 ((assignment
   left: (python_identifier) @type.definition
-  right: (call
-    function: (python_identifier) @_func))
- (#any-of? @_func "TypeVar" "NewType"))
+  right:
+    (call
+      function: (python_identifier) @_func))
+  (#any-of? @_func "TypeVar" "NewType"))
 
 ; Fields
-
 (flag) @variable.member
 
 ((attribute
-    attribute: (python_identifier) @variable.member)
- (#lua-match? @variable.member "^[%l_].*$"))
+  attribute: (python_identifier) @variable.member)
+  (#lua-match? @variable.member "^[%l_].*$"))
 
 ; Functions
-
 (call
   function: (python_identifier) @function.call)
 
 (call
-  function: (attribute
-              attribute: (python_identifier) @function.method.call))
+  function:
+    (attribute
+      attribute: (python_identifier) @function.method.call))
 
 ((call
-   function: (python_identifier) @constructor)
- (#lua-match? @constructor "^%u"))
+  function: (python_identifier) @constructor)
+  (#lua-match? @constructor "^%u"))
 
 ((call
-  function: (attribute
-              attribute: (python_identifier) @constructor))
- (#lua-match? @constructor "^%u"))
+  function:
+    (attribute
+      attribute: (python_identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
 
 ((call
   function: (python_identifier) @function.builtin)
- (#any-of? @function.builtin
-          "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
-          "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format"
-          "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
-          "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
-          "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
-          "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+  (#any-of? @function.builtin "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
 
 (python_function_definition
   name: (python_identifier) @function)
 
-(type (python_identifier) @type)
+(type
+  (python_identifier) @type)
+
 (type
   (subscript
     (python_identifier) @type)) ; type subscript: Tuple[int]
 
 ((call
   function: (python_identifier) @_isinstance
-  arguments: (argument_list
-    (_)
-    (python_identifier) @type))
- (#eq? @_isinstance "isinstance"))
+  arguments:
+    (argument_list
+      (_)
+      (python_identifier) @type))
+  (#eq? @_isinstance "isinstance"))
 
-(anonymous_python_function (identifier) @function)
+(anonymous_python_function
+  (identifier) @function)
 
-(function_definition (identifier) @function)
+(function_definition
+  (identifier) @function)
 
-(addtask_statement (identifier) @function)
+(addtask_statement
+  (identifier) @function)
 
-(deltask_statement (identifier) @function)
+(deltask_statement
+  (identifier) @function)
 
-(export_functions_statement (identifier) @function)
+(export_functions_statement
+  (identifier) @function)
 
-(addhandler_statement (identifier) @function)
+(addhandler_statement
+  (identifier) @function)
 
 (python_function_definition
   body:
     (block
-      . (expression_statement (python_string) @string.documentation @spell)))
+      .
+      (expression_statement
+        (python_string) @string.documentation @spell)))
 
 ; Namespace
-
 (inherit_path) @module
 
-;; Normal parameters
+; Normal parameters
 (parameters
   (python_identifier) @variable.parameter)
-;; Lambda parameters
+
+; Lambda parameters
 (lambda_parameters
   (python_identifier) @variable.parameter)
+
 (lambda_parameters
   (tuple_pattern
     (python_identifier) @variable.parameter))
+
 ; Default parameters
 (keyword_argument
   name: (python_identifier) @variable.parameter)
+
 ; Naming parameters on call-site
 (default_parameter
   name: (python_identifier) @variable.parameter)
+
 (typed_parameter
   (python_identifier) @variable.parameter)
+
 (typed_default_parameter
   (python_identifier) @variable.parameter)
+
 ; Variadic parameters *args, **kwargs
 (parameters
-  (list_splat_pattern ; *args
+  (list_splat_pattern
+    ; *args
     (python_identifier) @variable.parameter))
+
 (parameters
-  (dictionary_splat_pattern ; **kwargs
+  (dictionary_splat_pattern
+    ; **kwargs
     (python_identifier) @variable.parameter))
 
-;; Literals
-
+; Literals
 (none) @constant.builtin
-[(true) (false)] @boolean
+
+[
+  (true)
+  (false)
+] @boolean
+
 ((python_identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
+  (#eq? @variable.builtin "self"))
+
 ((python_identifier) @variable.builtin
- (#eq? @variable.builtin "cls"))
+  (#eq? @variable.builtin "cls"))
 
 (integer) @number
+
 (float) @number.float
 
 ; Operators
-
 [
   "?="
   "??="
@@ -293,12 +330,10 @@
   "or"
   "is not"
   "not in"
-
   "del"
 ] @keyword.operator
 
 ; Literals
-
 [
   (string)
   (python_string)
@@ -313,8 +348,14 @@
 ] @string.escape
 
 ; Punctuation
-
-[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   ":"
@@ -325,15 +366,28 @@
   (ellipsis)
 ] @punctuation.delimiter
 
-(variable_expansion [ "${" "}" ] @punctuation.special)
-(inline_python [ "${@" "}" ] @punctuation.special)
+(variable_expansion
+  [
+    "${"
+    "}"
+  ] @punctuation.special)
+
+(inline_python
+  [
+    "${@"
+    "}"
+  ] @punctuation.special)
+
 (interpolation
   "{" @punctuation.special
   "}" @punctuation.special)
 
 (type_conversion) @function.macro
 
-([(identifier) (python_identifier)] @type.builtin
+([
+  (identifier)
+  (python_identifier)
+] @type.builtin
   ; format-ignore
   (#any-of? @type.builtin
       ; https://docs.python.org/3/library/exceptions.html
diff --git a/queries/bitbake/indents.scm b/queries/bitbake/indents.scm
index 01d8aeb3c..ee60d0fda 100644
--- a/queries/bitbake/indents.scm
+++ b/queries/bitbake/indents.scm
@@ -1,76 +1,101 @@
 [
   (import_from_statement)
-
   (parenthesized_expression)
   (generator_expression)
   (list_comprehension)
   (set_comprehension)
   (dictionary_comprehension)
-
   (tuple_pattern)
   (list_pattern)
   (binary_operator)
-
   (lambda)
-
   (concatenated_string)
 ] @indent.begin
 
 ((list) @indent.align
- (#set! indent.open_delimiter "[")
- (#set! indent.close_delimiter "]")
-)
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]"))
+
 ((dictionary) @indent.align
- (#set! indent.open_delimiter "{")
- (#set! indent.close_delimiter "}")
-)
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
+
 ((set) @indent.align
- (#set! indent.open_delimiter "{")
- (#set! indent.close_delimiter "}")
-)
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
 
 ((for_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((if_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((while_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((try_statement) @indent.begin
- (#set! indent.immediate 1))
-(ERROR "try" ":" @indent.begin (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
+(ERROR
+  "try"
+  ":" @indent.begin
+  (#set! indent.immediate 1))
+
 ((python_function_definition) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 (function_definition) @indent.begin
+
 (anonymous_python_function) @indent.begin
+
 ((with_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
 
 (if_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
   (#set! indent.avoid_last_matching_next 1))
+
 (while_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
   (#set! indent.avoid_last_matching_next 1))
 
-(ERROR "(" @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")") . (_)) 
+(ERROR
+  "(" @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  .
+  (_))
+
 ((argument_list) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((parameters) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")")
- (#set! indent.avoid_last_matching_next 1))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1))
+
 ((tuple) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
-(ERROR "[" @indent.align (#set! indent.open_delimiter "[") (#set! indent.close_delimiter "]") . (_)) 
+(ERROR
+  "[" @indent.align
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]")
+  .
+  (_))
 
-(ERROR "{" @indent.align (#set! indent.open_delimiter "{") (#set! indent.close_delimiter "}") . (_)) 
+(ERROR
+  "{" @indent.align
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}")
+  .
+  (_))
 
 [
   (break_statement)
@@ -78,24 +103,43 @@
 ] @indent.dedent
 
 (ERROR
-  (_) @indent.branch ":" .
+  (_) @indent.branch
+  ":"
+  .
   (#lua-match? @indent.branch "^else"))
 
 (ERROR
-  (_) @indent.branch @indent.dedent ":" .
+  (_) @indent.branch @indent.dedent
+  ":"
+  .
   (#lua-match? @indent.branch "^elif"))
 
-(parenthesized_expression ")" @indent.end)
-(generator_expression ")" @indent.end)
-(list_comprehension "]" @indent.end)
-(set_comprehension "}" @indent.end)
-(dictionary_comprehension "}" @indent.end)
+(parenthesized_expression
+  ")" @indent.end)
 
-(tuple_pattern ")" @indent.end)
-(list_pattern "]" @indent.end)
+(generator_expression
+  ")" @indent.end)
 
-(function_definition "}" @indent.end)
-(anonymous_python_function "}" @indent.end)
+(list_comprehension
+  "]" @indent.end)
+
+(set_comprehension
+  "}" @indent.end)
+
+(dictionary_comprehension
+  "}" @indent.end)
+
+(tuple_pattern
+  ")" @indent.end)
+
+(list_pattern
+  "]" @indent.end)
+
+(function_definition
+  "}" @indent.end)
+
+(anonymous_python_function
+  "}" @indent.end)
 
 (return_statement
   [
@@ -107,10 +151,12 @@
         "}"
         "]"
       ] @indent.end .)
-    (attribute 
+    (attribute
       attribute: (_) @indent.end)
     (call
-      arguments: (_ ")" @indent.end))
+      arguments:
+        (_
+          ")" @indent.end))
     "return" @indent.end
   ] .)
 
diff --git a/queries/bitbake/injections.scm b/queries/bitbake/injections.scm
index 819487bc5..39182e838 100644
--- a/queries/bitbake/injections.scm
+++ b/queries/bitbake/injections.scm
@@ -1,8 +1,11 @@
 (call
-  function: (attribute
-              object: (python_identifier) @_re)
-  arguments: (argument_list (python_string
-                              (string_content) @injection.content) @_string)
+  function:
+    (attribute
+      object: (python_identifier) @_re)
+  arguments:
+    (argument_list
+      (python_string
+        (string_content) @injection.content) @_string)
   (#eq? @_re "re")
   (#lua-match? @_string "^r.*")
   (#set! injection.language "regex"))
@@ -11,4 +14,4 @@
   (#set! injection.language "bash"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/bitbake/locals.scm b/queries/bitbake/locals.scm
index 27e85f02a..0f572584b 100644
--- a/queries/bitbake/locals.scm
+++ b/queries/bitbake/locals.scm
@@ -7,10 +7,16 @@
 ; Imports
 (aliased_import
   alias: (python_identifier) @local.definition.import)
+
 (import_statement
-  name: (dotted_name ((python_identifier) @local.definition.import)))
+  name:
+    (dotted_name
+      ((python_identifier) @local.definition.import)))
+
 (import_from_statement
-  name: (dotted_name ((python_identifier) @local.definition.import)))
+  name:
+    (dotted_name
+      ((python_identifier) @local.definition.import)))
 
 ; Function with parameters, defines parameters
 (parameters
@@ -38,58 +44,80 @@
 ; Function defines function and scope
 ((python_function_definition
   name: (python_identifier) @local.definition.function) @local.scope
- (#set! definition.function.scope "parent"))
+  (#set! definition.function.scope "parent"))
 
-(function_definition (identifier) @local.definition.function)
+(function_definition
+  (identifier) @local.definition.function)
 
-(anonymous_python_function (identifier) @local.definition.function)
+(anonymous_python_function
+  (identifier) @local.definition.function)
 
-;;; Loops
+; Loops
 ; not a scope!
 (for_statement
-  left: (pattern_list
-          (python_identifier) @local.definition.var))
+  left:
+    (pattern_list
+      (python_identifier) @local.definition.var))
+
 (for_statement
-  left: (tuple_pattern
-          (python_identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (python_identifier) @local.definition.var))
+
 (for_statement
   left: (python_identifier) @local.definition.var)
 
 ; not a scope!
 ;(while_statement) @local.scope
-
 ; for in list comprehension
 (for_in_clause
   left: (python_identifier) @local.definition.var)
+
 (for_in_clause
-  left: (tuple_pattern
-          (python_identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (python_identifier) @local.definition.var))
+
 (for_in_clause
-  left: (pattern_list
-          (python_identifier) @local.definition.var))
+  left:
+    (pattern_list
+      (python_identifier) @local.definition.var))
 
 (dictionary_comprehension) @local.scope
+
 (list_comprehension) @local.scope
+
 (set_comprehension) @local.scope
 
-;;; Assignments
+; Assignments
+(assignment
+  left: (python_identifier) @local.definition.var)
 
 (assignment
- left: (python_identifier) @local.definition.var)
+  left:
+    (pattern_list
+      (python_identifier) @local.definition.var))
 
 (assignment
- left: (pattern_list
-   (python_identifier) @local.definition.var))
-(assignment
- left: (tuple_pattern
-   (python_identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (python_identifier) @local.definition.var))
 
 (assignment
- left: (attribute
-   (python_identifier)
-   (python_identifier) @local.definition.field))
+  left:
+    (attribute
+      (python_identifier)
+      (python_identifier) @local.definition.field))
 
-(variable_assignment (identifier) operator: [ "=" "?=" "??=" ":=" ] @local.definition.var)
+(variable_assignment
+  (identifier)
+  operator:
+    [
+      "="
+      "?="
+      "??="
+      ":="
+    ] @local.definition.var)
 
 ; Walrus operator  x := 1
 (named_expression
diff --git a/queries/blueprint/highlights.scm b/queries/blueprint/highlights.scm
index 3e3a8e4a8..faefd319d 100644
--- a/queries/blueprint/highlights.scm
+++ b/queries/blueprint/highlights.scm
@@ -1,6 +1,7 @@
 (object_id) @variable
 
 (string) @string
+
 (escape_sequence) @string.escape
 
 (comment) @comment @spell
@@ -15,30 +16,50 @@
 
 (decorator) @attribute
 
-(property_definition (property_name) @property)
+(property_definition
+  (property_name) @property)
 
 (object) @type
 
-(signal_binding (signal_name) @function.builtin)
-(signal_binding (function (identifier)) @function)
-(signal_binding "swapped" @keyword)
+(signal_binding
+  (signal_name) @function.builtin)
 
-(styles_list "styles" @function.macro)
-(layout_definition "layout" @function.macro)
+(signal_binding
+  (function
+    (identifier)) @function)
 
-(gettext_string "_" @function.builtin)
+(signal_binding
+  "swapped" @keyword)
 
-(menu_definition "menu" @keyword)
-(menu_section "section" @keyword)
-(menu_item "item" @function.macro)
+(styles_list
+  "styles" @function.macro)
 
-(template_definition (template_name_qualifier) @type.qualifier)
+(layout_definition
+  "layout" @function.macro)
 
-(import_statement (gobject_library) @module)
+(gettext_string
+  "_" @function.builtin)
 
-(import_statement (version_number) @number.float)
+(menu_definition
+  "menu" @keyword)
+
+(menu_section
+  "section" @keyword)
+
+(menu_item
+  "item" @function.macro)
+
+(template_definition
+  (template_name_qualifier) @type.qualifier)
+
+(import_statement
+  (gobject_library) @module)
+
+(import_statement
+  (version_number) @number.float)
 
 (float) @number.float
+
 (number) @number
 
 [
diff --git a/queries/c/folds.scm b/queries/c/folds.scm
index 42ca3fb63..2e2a6b4d0 100644
--- a/queries/c/folds.scm
+++ b/queries/c/folds.scm
@@ -1,21 +1,21 @@
 [
- (for_statement)
- (if_statement)
- (while_statement)
- (do_statement)
- (switch_statement)
- (case_statement)
- (function_definition)
- (struct_specifier)
- (enum_specifier)
- (comment)
- (preproc_if)
- (preproc_elif)
- (preproc_else)
- (preproc_ifdef)
- (preproc_function_def)
- (initializer_list)
- (gnu_asm_expression)
+  (for_statement)
+  (if_statement)
+  (while_statement)
+  (do_statement)
+  (switch_statement)
+  (case_statement)
+  (function_definition)
+  (struct_specifier)
+  (enum_specifier)
+  (comment)
+  (preproc_if)
+  (preproc_elif)
+  (preproc_else)
+  (preproc_ifdef)
+  (preproc_function_def)
+  (initializer_list)
+  (gnu_asm_expression)
 ] @fold
 
 (compound_statement
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 0a6145e3e..c848f68dc 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -1,6 +1,9 @@
 ; Lower priority to prefer @variable.parameter when identifier appears in parameter_declaration.
-((identifier) @variable (#set! "priority" 95))
-(preproc_def (preproc_arg) @variable)
+((identifier) @variable
+  (#set! "priority" 95))
+
+(preproc_def
+  (preproc_arg) @variable)
 
 [
   "default"
@@ -17,7 +20,10 @@
   "sizeof"
   "offsetof"
 ] @keyword.operator
-(alignof_expression . _ @keyword.operator)
+
+(alignof_expression
+  .
+  _ @keyword.operator)
 
 "return" @keyword.return
 
@@ -30,10 +36,10 @@
 ] @keyword.repeat
 
 [
- "if"
- "else"
- "case"
- "switch"
+  "if"
+  "else"
+  "case"
+  "switch"
 ] @keyword.conditional
 
 [
@@ -52,42 +58,48 @@
 
 "#include" @keyword.import
 
-[ ";" ":" "," "::" ] @punctuation.delimiter
+[
+  ";"
+  ":"
+  ","
+  "::"
+] @punctuation.delimiter
 
 "..." @punctuation.special
 
-[ "(" ")" "[" "]" "{" "}"] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 [
   "="
-
   "-"
   "*"
   "/"
   "+"
   "%"
-
   "~"
   "|"
   "&"
   "^"
   "<<"
   ">>"
-
   "->"
   "."
-
   "<"
   "<="
   ">="
   ">"
   "=="
   "!="
-
   "!"
   "&&"
   "||"
-
   "-="
   "+="
   "*="
@@ -102,42 +114,54 @@
   "++"
 ] @operator
 
-;; Make sure the comma operator is given a highlight group after the comma
-;; punctuator so the operator is highlighted properly.
-(comma_expression [ "," ] @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 [ "?" ":" ] @keyword.conditional.ternary)
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 (string_literal) @string
+
 (system_lib_string) @string
+
 (escape_sequence) @string.escape
 
 (null) @constant.builtin
+
 (number_literal) @number
+
 (char_literal) @character
 
-((preproc_arg) @function.macro (#set! "priority" 90))
+((preproc_arg) @function.macro
+  (#set! "priority" 90))
+
 (preproc_defined) @function.macro
 
 ((field_expression
-     (field_identifier) @property) @_parent
- (#not-has-parent? @_parent template_method function_declarator call_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))
+  (#has-ancestor? @property field_declaration)
+  (#not-has-ancestor? @property function_declarator))
 
 (statement_identifier) @label
 
 [
- (type_identifier)
- (type_descriptor)
+  (type_identifier)
+  (type_descriptor)
 ] @type
 
 (storage_class_specifier) @keyword.storage
@@ -156,14 +180,20 @@
 
 (primitive_type) @type.builtin
 
-(sized_type_specifier _ @type.builtin type: _?)
+(sized_type_specifier
+  _ @type.builtin
+  type: _?)
 
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
-(preproc_def (preproc_arg) @constant
   (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+
+(preproc_def
+  (preproc_arg) @constant
+  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+
 (enumerator
   name: (identifier) @constant)
+
 (case_statement
   value: (identifier) @constant)
 
@@ -181,7 +211,9 @@
     "__clang_wide_literal_encoding__"
     "__FUNCTION__" "__func__" "__PRETTY_FUNCTION__"
     "__VA_ARGS__" "__VA_OPT__"))
-(preproc_def (preproc_arg) @constant.builtin
+
+(preproc_def
+  (preproc_arg) @constant.builtin
   ; format-ignore
   (#any-of? @constant.builtin
     "stderr" "stdin" "stdout"
@@ -197,21 +229,26 @@
     "__VA_ARGS__" "__VA_OPT__"))
 
 (attribute_specifier
-  (argument_list (identifier) @variable.builtin))
+  (argument_list
+    (identifier) @variable.builtin))
+
 ((attribute_specifier
-  (argument_list (call_expression
-                   function: (identifier) @variable.builtin))))
+  (argument_list
+    (call_expression
+      function: (identifier) @variable.builtin))))
 
 ((call_expression
   function: (identifier) @function.builtin)
   (#lua-match? @function.builtin "^__builtin_"))
+
 ((call_expression
-   function: (identifier) @function.builtin)
+  function: (identifier) @function.builtin)
   (#has-ancestor? @function.builtin attribute_specifier))
 
-;; Preproc def / undef
+; Preproc def / undef
 (preproc_def
   name: (_) @constant)
+
 (preproc_call
   directive: (preproc_directive) @_u
   argument: (_) @constant
@@ -219,15 +256,21 @@
 
 (call_expression
   function: (identifier) @function.call)
+
 (call_expression
-  function: (field_expression
-    field: (field_identifier) @function.call))
+  function:
+    (field_expression
+      field: (field_identifier) @function.call))
+
 (function_declarator
   declarator: (identifier) @function)
+
 (function_declarator
-  declarator: (parenthesized_declarator
-                (pointer_declarator
-                  declarator: (field_identifier) @function)))
+  declarator:
+    (parenthesized_declarator
+      (pointer_declarator
+        declarator: (field_identifier) @function)))
+
 (preproc_function_def
   name: (identifier) @function.macro)
 
@@ -236,7 +279,7 @@
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
-;; Parameters
+; Parameters
 (parameter_declaration
   declarator: (identifier) @variable.parameter)
 
@@ -268,8 +311,8 @@
 ;   declarator: _
 ;   (declaration
 ;     declarator: (pointer_declarator) @variable.parameter))
-
-(preproc_params (identifier) @variable.parameter)
+(preproc_params
+  (identifier) @variable.parameter)
 
 [
   "__attribute__"
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index cf4c8fa62..95d25fe1d 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -1,5 +1,5 @@
 [
-  (compound_statement) 
+  (compound_statement)
   (field_declaration_list)
   (case_statement)
   (enumerator_list)
@@ -7,56 +7,62 @@
   (initializer_list)
   (init_declarator)
 ] @indent.begin
-
 ; With current indent logic, if we capture expression_statement with @indent.begin
 ; It will be affected by _parent_ node with error subnodes deep down the tree
-; So narrow indent capture to check for error inside expression statement only, 
+; So narrow indent capture to check for error inside expression statement only,
 (expression_statement
   (_) @indent.begin
   ";" @indent.end)
 
 (ERROR
-  "for" "(" @indent.begin ";" ";" ")" @indent.end)
+  "for"
+  "(" @indent.begin
+  ";"
+  ";"
+  ")" @indent.end)
 
 ((for_statement
-    body: (_) @_body) @indent.begin
+  body: (_) @_body) @indent.begin
   (#not-has-type? @_body compound_statement))
 
 (while_statement
   condition: (_) @indent.begin)
 
 ((while_statement
-    body: (_) @_body) @indent.begin
+  body: (_) @_body) @indent.begin
   (#not-has-type? @_body compound_statement))
 
-(
-  (if_statement)
+((if_statement)
   .
-  (ERROR "else" @indent.begin))
+  (ERROR
+    "else" @indent.begin))
 
 (if_statement
   condition: (_) @indent.begin)
 
-;; Supports if without braces (but not both if-else without braces)
+; Supports if without braces (but not both if-else without braces)
 ((if_statement
-  consequence: 
-    (_ ";" @indent.end) @_consequence
-    (#not-has-type? @_consequence compound_statement)
+  consequence:
+    (_
+      ";" @indent.end) @_consequence
+  (#not-has-type? @_consequence compound_statement)
   alternative:
-    (else_clause 
+    (else_clause
       "else" @indent.branch
-      [ 
-        (if_statement (compound_statement) @indent.dedent)? @indent.dedent
+      [
+        (if_statement
+          (compound_statement) @indent.dedent)? @indent.dedent
         (compound_statement)? @indent.dedent
         (_)? @indent.dedent
-      ]
-      )?
-  ) @indent.begin)
+      ])?) @indent.begin)
 
-(else_clause (_ . "{" @indent.branch))
+(else_clause
+  (_
+    .
+    "{" @indent.branch))
 
-
-(compound_statement "}" @indent.end)
+(compound_statement
+  "}" @indent.end)
 
 [
   ")"
@@ -79,12 +85,16 @@
   (string_literal)
 ] @indent.ignore
 
-((ERROR (parameter_declaration)) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
-([(argument_list) (parameter_list)] @indent.align
+((ERROR
+  (parameter_declaration)) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+([
+  (argument_list)
+  (parameter_list)
+] @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
 (comment) @indent.auto
-
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index c025b0f07..6349fe2d1 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,8 +1,8 @@
 ((preproc_arg) @injection.content
- (#set! injection.language "c"))
+  (#set! injection.language "c"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((comment) @injection.content
   (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
@@ -14,8 +14,11 @@
 
 ((call_expression
   function: (identifier) @_function
-  arguments: (argument_list
-               . (string_literal (string_content) @injection.content)))
+  arguments:
+    (argument_list
+      .
+      (string_literal
+        (string_content) @injection.content)))
   ; format-ignore
   (#any-of? @_function 
     "printf" "printf_s"
@@ -29,12 +32,16 @@
     "cscanf" "_cscanf"
     "printw"
     "scanw")
- (#set! injection.language "printf"))
+  (#set! injection.language "printf"))
 
 ((call_expression
   function: (identifier) @_function
-  arguments: (argument_list
-               (_) . (string_literal (string_content) @injection.content)))
+  arguments:
+    (argument_list
+      (_)
+      .
+      (string_literal
+        (string_content) @injection.content)))
   ; format-ignore
   (#any-of? @_function 
     "fprintf" "fprintf_s"
@@ -57,12 +64,18 @@
     "vw_printw" "vwprintw"
     "wscanw"
     "vw_scanw" "vwscanw")
- (#set! injection.language "printf"))
+  (#set! injection.language "printf"))
 
 ((call_expression
   function: (identifier) @_function
-  arguments: (argument_list
-               (_) . (_) . (string_literal (string_content) @injection.content)))
+  arguments:
+    (argument_list
+      (_)
+      .
+      (_)
+      .
+      (string_literal
+        (string_content) @injection.content)))
   ; format-ignore
   (#any-of? @_function 
     "sprintf_s"
@@ -75,15 +88,22 @@
     "vsnwprintf_s"
     "mvprintw"
     "mvscanw")
- (#set! injection.language "printf"))
+  (#set! injection.language "printf"))
 
 ((call_expression
   function: (identifier) @_function
-  arguments: (argument_list
-               (_) . (_) . (_) . (string_literal (string_content) @injection.content)))
- (#any-of? @_function "mvwprintw"
-                      "mvwscanw")
- (#set! injection.language "printf"))
+  arguments:
+    (argument_list
+      (_)
+      .
+      (_)
+      .
+      (_)
+      .
+      (string_literal
+        (string_content) @injection.content)))
+  (#any-of? @_function "mvwprintw" "mvwscanw")
+  (#set! injection.language "printf"))
 
 ; TODO: add when asm is added
 ; (gnu_asm_expression assembly_code: (string_literal) @injection.content
diff --git a/queries/c/locals.scm b/queries/c/locals.scm
index 3756bc4a5..13a122790 100644
--- a/queries/c/locals.scm
+++ b/queries/c/locals.scm
@@ -1,53 +1,67 @@
-;; Functions definitions
+; Functions definitions
 (function_declarator
   declarator: (identifier) @local.definition.function)
+
 (preproc_function_def
   name: (identifier) @local.definition.macro) @local.scope
 
 (preproc_def
   name: (identifier) @local.definition.macro)
+
 (pointer_declarator
   declarator: (identifier) @local.definition.var)
+
 (parameter_declaration
   declarator: (identifier) @local.definition.parameter)
+
 (init_declarator
   declarator: (identifier) @local.definition.var)
+
 (array_declarator
   declarator: (identifier) @local.definition.var)
+
 (declaration
   declarator: (identifier) @local.definition.var)
+
 (enum_specifier
   name: (_) @local.definition.type
   (enumerator_list
-    (enumerator name: (identifier) @local.definition.var)))
+    (enumerator
+      name: (identifier) @local.definition.var)))
 
-;; Type / Struct / Enum
+; Type / Struct / Enum
 (field_declaration
   declarator: (field_identifier) @local.definition.field)
+
 (type_definition
   declarator: (type_identifier) @local.definition.type)
+
 (struct_specifier
   name: (type_identifier) @local.definition.type)
 
-;; goto
-(labeled_statement (statement_identifier) @local.definition)
+; goto
+(labeled_statement
+  (statement_identifier) @local.definition)
 
-;; References
+; References
 (identifier) @local.reference
+
 ((field_identifier) @local.reference
-                    (#set! reference.kind "field"))
+  (#set! reference.kind "field"))
+
 ((type_identifier) @local.reference
-                   (#set! reference.kind "type"))
+  (#set! reference.kind "type"))
 
-(goto_statement (statement_identifier) @local.reference)
+(goto_statement
+  (statement_identifier) @local.reference)
 
-;; Scope
+; Scope
 [
- (for_statement)
- (if_statement)
- (while_statement)
- (translation_unit)
- (function_definition)
- (compound_statement) ; a block in curly braces
- (struct_specifier)
+  (for_statement)
+  (if_statement)
+  (while_statement)
+  (translation_unit)
+  (function_definition)
+  (compound_statement) ; a block in curly braces
+  (struct_specifier)
 ] @local.scope
diff --git a/queries/c_sharp/folds.scm b/queries/c_sharp/folds.scm
index 4b5d94270..2b7c9773d 100644
--- a/queries/c_sharp/folds.scm
+++ b/queries/c_sharp/folds.scm
@@ -1,15 +1,10 @@
-body: [
-  (declaration_list)
-  (switch_body)
-  (enum_member_declaration_list)
-] @fold
-
-accessors: [
-  (accessor_list)
-] @fold
-
-initializer: [
-  (initializer_expression)
-] @fold
+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
index 1cd566728..3671dc258 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -26,18 +26,23 @@
     name: (identifier) @function.method.call))
 
 (invocation_expression
-  function: (conditional_access_expression
-    (member_binding_expression
-      name: (identifier) @function.method.call)))
+  function:
+    (conditional_access_expression
+      (member_binding_expression
+        name: (identifier) @function.method.call)))
 
 (namespace_declaration
-  name: [(qualified_name) (identifier)] @module)
+  name:
+    [
+      (qualified_name)
+      (identifier)
+    ] @module)
 
 (qualified_name
   (identifier) @type)
 
 (invocation_expression
-      (identifier) @function.method.call)
+  (identifier) @function.method.call)
 
 (field_declaration
   (variable_declaration
@@ -50,29 +55,29 @@
 
 (parameter_list
   (parameter
-   name: (identifier) @variable.parameter))
+    name: (identifier) @variable.parameter))
 
 (parameter_list
   (parameter
-   type: (identifier) @type))
+    type: (identifier) @type))
 
 (integer_literal) @number
+
 (real_literal) @number.float
 
 (null_literal) @constant.builtin
+
 (character_literal) @character
 
 [
- (string_literal)
- (verbatim_string_literal)
- (interpolated_string_expression)
+  (string_literal)
+  (verbatim_string_literal)
+  (interpolated_string_expression)
 ] @string
 
 (boolean_literal) @boolean
 
-[
- (predefined_type)
-] @type.builtin
+(predefined_type) @type.builtin
 
 (implicit_type) @keyword
 
@@ -83,6 +88,7 @@
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///[^/]"))
+
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
@@ -90,7 +96,8 @@
   (identifier) @type)
 
 (using_directive
-  (name_equals (identifier) @type.definition))
+  (name_equals
+    (identifier) @type.definition))
 
 (property_declaration
   name: (identifier) @property)
@@ -106,20 +113,25 @@
 
 (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
-])
+
+(constructor_initializer
+  "base" @constructor)
 
 (variable_declaration
   (identifier) @type)
+
 (object_creation_expression
   (identifier) @type)
 
@@ -142,19 +154,23 @@
 
 (object_creation_expression
   (generic_name
-   (identifier) @type))
+    (identifier) @type))
 
 (property_declaration
   (generic_name
     (identifier) @type))
 
 (_
-  type: (generic_name
-   (identifier) @type))
+  type:
+    (generic_name
+      (identifier) @type))
+
 ; Generic Method invocation with generic type
 (invocation_expression
-  function: (generic_name
-              . (identifier) @function.method.call))
+  function:
+    (generic_name
+      .
+      (identifier) @function.method.call))
 
 (invocation_expression
   (member_access_expression
@@ -165,7 +181,7 @@
   (identifier) @type)
 
 (type_argument_list
- (identifier) @type)
+  (identifier) @type)
 
 (type_parameter_list
   (type_parameter) @type)
@@ -174,7 +190,7 @@
   target: (identifier) @type)
 
 (attribute
- name: (identifier) @attribute)
+  name: (identifier) @attribute)
 
 (for_each_statement
   type: (identifier) @type)
@@ -197,180 +213,194 @@
   (identifier) @variable.parameter)
 
 (warning_directive) @comment.warning
+
 (error_directive) @keyword.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)
+  (nullable_directive)
+  (region_directive)
+  (endregion_directive)
 ] @constant.macro
 
 [
- "if"
- "else"
- "switch"
- "break"
- "case"
- "when"
- (if_directive)
- (elif_directive)
- (else_directive)
- (endif_directive)
+  "if"
+  "else"
+  "switch"
+  "break"
+  "case"
+  "when"
+  (if_directive)
+  (elif_directive)
+  (else_directive)
+  (endif_directive)
 ] @keyword.conditional
 
 (if_directive
   (identifier) @constant)
+
 (elif_directive
   (identifier) @constant)
 
 [
- "while"
- "for"
- "do"
- "continue"
- "goto"
- "foreach"
+  "while"
+  "for"
+  "do"
+  "continue"
+  "goto"
+  "foreach"
 ] @keyword.repeat
 
 [
- "try"
- "catch"
- "throw"
- "finally"
+  "try"
+  "catch"
+  "throw"
+  "finally"
 ] @keyword.exception
 
 [
- "+"
- "?"
- ":"
- "++"
- "-"
- "--"
- "&"
- "&&"
- "|"
- "||"
- "!"
- "!="
- "=="
- "*"
- "/"
- "%"
- "<"
- "<="
- ">"
- ">="
- "="
- "-="
- "+="
- "*="
- "/="
- "%="
- "^"
- "^="
- "&="
- "|="
- "~"
- ">>"
- ">>>"
- "<<"
- "<<="
- ">>="
- ">>>="
- "=>"
- "??"
- "??="
+  "+"
+  "?"
+  ":"
+  "++"
+  "-"
+  "--"
+  "&"
+  "&&"
+  "|"
+  "||"
+  "!"
+  "!="
+  "=="
+  "*"
+  "/"
+  "%"
+  "<"
+  "<="
+  ">"
+  ">="
+  "="
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "^"
+  "^="
+  "&="
+  "|="
+  "~"
+  ">>"
+  ">>>"
+  "<<"
+  "<<="
+  ">>="
+  ">>>="
+  "=>"
+  "??"
+  "??="
 ] @operator
 
 [
- ";"
- "."
- ","
- ":"
+  ";"
+  "."
+  ","
+  ":"
 ] @punctuation.delimiter
 
-(conditional_expression ["?" ":"] @keyword.conditional.ternary)
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 [
- "["
- "]"
- "{"
- "}"
- "("
- ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "("
+  ")"
 ] @punctuation.bracket
 
-(type_argument_list ["<" ">"] @punctuation.bracket)
+(type_argument_list
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 [
- (this_expression)
- (base_expression)
+  (this_expression)
+  (base_expression)
 ] @variable.builtin
 
 [
- "using"
- "as"
+  "using"
+  "as"
 ] @keyword.import
 
 (alias_qualified_name
-  (identifier "global") @keyword.import)
+  (identifier
+    "global") @keyword.import)
 
 [
- "with"
- "new"
- "typeof"
- "sizeof"
- "is"
- "and"
- "or"
- "not"
- "stackalloc"
- "in"
- "out"
- "ref"
+  "with"
+  "new"
+  "typeof"
+  "sizeof"
+  "is"
+  "and"
+  "or"
+  "not"
+  "stackalloc"
+  "in"
+  "out"
+  "ref"
 ] @keyword.operator
 
 [
- "lock"
- "params"
- "operator"
- "default"
- "implicit"
- "explicit"
- "override"
- "class"
- "delegate"
- "enum"
- "interface"
- "namespace"
- "struct"
- "get"
- "set"
- "init"
- "where"
- "record"
- "event"
- "add"
- "remove"
- "checked"
- "unchecked"
- "fixed"
- "alias"
+  "lock"
+  "params"
+  "operator"
+  "default"
+  "implicit"
+  "explicit"
+  "override"
+  "class"
+  "delegate"
+  "enum"
+  "interface"
+  "namespace"
+  "struct"
+  "get"
+  "set"
+  "init"
+  "where"
+  "record"
+  "event"
+  "add"
+  "remove"
+  "checked"
+  "unchecked"
+  "fixed"
+  "alias"
 ] @keyword
 
 [
@@ -379,39 +409,40 @@
 ] @keyword.coroutine
 
 [
- "const"
- "extern"
- "readonly"
- "static"
- "volatile"
- "required"
+  "const"
+  "extern"
+  "readonly"
+  "static"
+  "volatile"
+  "required"
 ] @keyword.storage
 
 [
- "abstract"
- "private"
- "protected"
- "internal"
- "public"
- "partial"
- "sealed"
- "virtual"
+  "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))
+  (_
+    [
+      "from"
+      "orderby"
+      "select"
+      "group"
+      "by"
+      "ascending"
+      "descending"
+      "equals"
+      "let"
+    ] @keyword))
 
 [
   "return"
diff --git a/queries/c_sharp/injections.scm b/queries/c_sharp/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/c_sharp/injections.scm
+++ b/queries/c_sharp/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/c_sharp/locals.scm b/queries/c_sharp/locals.scm
index 1d1665d9d..0476a1695 100644
--- a/queries/c_sharp/locals.scm
+++ b/queries/c_sharp/locals.scm
@@ -1,6 +1,7 @@
-;; Definitions
+; Definitions
 (variable_declarator
-  . (identifier) @local.definition.var)
+  .
+  (identifier) @local.definition.var)
 
 (variable_declarator
   (tuple_pattern
@@ -13,8 +14,9 @@
   left: (identifier) @local.definition.var)
 
 (for_each_statement
-  left: (tuple_pattern
-    (identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (identifier) @local.definition.var))
 
 (parameter
   (identifier) @local.definition.parameter)
@@ -34,8 +36,8 @@
 (class_declaration
   name: (identifier) @local.definition)
 
-;; References
+; References
 (identifier) @local.reference
 
-;; Scope
+; Scope
 (block) @local.scope
diff --git a/queries/cairo/folds.scm b/queries/cairo/folds.scm
index 1c7af9fcf..9937da6f1 100644
--- a/queries/cairo/folds.scm
+++ b/queries/cairo/folds.scm
@@ -5,20 +5,16 @@
   (enum_item)
   (impl_item)
   (type_item)
-
   (use_declaration)
   (let_declaration)
   (namespace_definition)
-
   (arguments)
   (implicit_arguments)
   (tuple_type)
-
   (import_statement)
   (attribute_statement)
   (with_statement)
   (if_statement)
-
   (function_definition)
   (struct_definition)
   (loop_expression)
@@ -26,6 +22,5 @@
   (match_expression)
   (call_expression)
   (tuple_expression)
-
   (attribute_item)
 ] @fold
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index f8bacede9..aa25847c9 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -1,13 +1,18 @@
 ; Preproc
-
 [
   "%builtins"
   "%lang"
 ] @keyword.directive
 
 ; Includes
-
-(import_statement [ "from" "import" ] @keyword.import module_name: (dotted_name (identifier) @module . ))
+(import_statement
+  [
+    "from"
+    "import"
+  ] @keyword.import
+  module_name:
+    (dotted_name
+      (identifier) @module .))
 
 [
   "as"
@@ -16,41 +21,42 @@
 ] @keyword.import
 
 ; Variables
-
 (identifier) @variable
 
 ; Namespaces
-
-(namespace_definition (identifier) @module)
+(namespace_definition
+  (identifier) @module)
 
 (mod_item
   name: (identifier) @module)
 
-(use_list (self) @module)
+(use_list
+  (self) @module)
 
-(scoped_use_list (self) @module)
+(scoped_use_list
+  (self) @module)
 
 (scoped_identifier
   path: (identifier) @module)
 
 (scoped_identifier
- (scoped_identifier
-  name: (identifier) @module))
+  (scoped_identifier
+    name: (identifier) @module))
 
 (scoped_type_identifier
   path: (identifier) @module)
 
 ((scoped_identifier
   path: (identifier) @type)
- (#lua-match? @type "^[A-Z]"))
+  (#lua-match? @type "^[A-Z]"))
 
 ((scoped_identifier
-    name: (identifier) @type)
- (#lua-match? @type "^[A-Z]"))
+  name: (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
 
 ((scoped_identifier
-    name: (identifier) @constant)
- (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+  name: (identifier) @constant)
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
 
 ((scoped_identifier
   path: (identifier) @type
@@ -68,17 +74,25 @@
   path: (identifier) @module)
 
 (scoped_use_list
-  path: (scoped_identifier
-          (identifier) @module))
+  path:
+    (scoped_identifier
+      (identifier) @module))
 
-(use_list (scoped_identifier (identifier) @module . (_)))
+(use_list
+  (scoped_identifier
+    (identifier) @module
+    .
+    (_)))
 
-(use_list (identifier) @type (#lua-match? @type "^[A-Z]"))
+(use_list
+  (identifier) @type
+  (#lua-match? @type "^[A-Z]"))
 
-(use_as_clause alias: (identifier) @type (#lua-match? @type "^[A-Z]"))
+(use_as_clause
+  alias: (identifier) @type
+  (#lua-match? @type "^[A-Z]"))
 
 ; Keywords
-
 [
   ; 0.x
   "using"
@@ -96,7 +110,6 @@
   "with"
   "call"
   "nondet"
-
   ; 1.0
   "type"
   "impl"
@@ -133,9 +146,7 @@
   "match"
 ] @keyword.conditional
 
-[
-  "loop"
-] @keyword.repeat
+"loop" @keyword.repeat
 
 [
   "assert"
@@ -144,33 +155,52 @@
 ] @keyword.exception
 
 ; Fields
+(implicit_arguments
+  (typed_identifier
+    (identifier) @variable.member))
 
-(implicit_arguments (typed_identifier (identifier) @variable.member))
+(member_expression
+  "."
+  (identifier) @variable.member)
 
-(member_expression "." (identifier) @variable.member)
+(call_expression
+  (assignment_expression
+    left: (identifier) @variable.member))
 
-(call_expression (assignment_expression left: (identifier) @variable.member))
-
-(tuple_expression (assignment_expression left: (identifier) @variable.member))
+(tuple_expression
+  (assignment_expression
+    left: (identifier) @variable.member))
 
 (field_identifier) @variable.member
 
-(shorthand_field_initializer (identifier) @variable.member)
+(shorthand_field_initializer
+  (identifier) @variable.member)
 
 ; Parameters
+(arguments
+  (typed_identifier
+    (identifier) @variable.parameter))
 
-(arguments (typed_identifier (identifier) @variable.parameter))
+(call_expression
+  (tuple_expression
+    (assignment_expression
+      left: (identifier) @variable.parameter)))
 
-(call_expression (tuple_expression (assignment_expression left: (identifier) @variable.parameter)))
+(return_type
+  (tuple_type
+    (named_type
+      .
+      (identifier) @variable.parameter)))
 
-(return_type (tuple_type (named_type . (identifier) @variable.parameter)))
-
-(parameter (identifier) @variable.parameter)
+(parameter
+  (identifier) @variable.parameter)
 
 ; Builtins
+(builtin_directive
+  (identifier) @variable.builtin)
 
-(builtin_directive (identifier) @variable.builtin)
-(lang_directive (identifier) @variable.builtin)
+(lang_directive
+  (identifier) @variable.builtin)
 
 [
   "ap"
@@ -179,32 +209,45 @@
 ] @variable.builtin
 
 ; Functions
+(function_definition
+  "func"
+  (identifier) @function)
 
-(function_definition "func" (identifier) @function)
-(function_definition "fn" (identifier) @function)
-(function_signature "fn" (identifier) @function)
-(extern_function_statement (identifier) @function)
+(function_definition
+  "fn"
+  (identifier) @function)
+
+(function_signature
+  "fn"
+  (identifier) @function)
+
+(extern_function_statement
+  (identifier) @function)
 
 (call_expression
   function: (identifier) @function.call)
 
 (call_expression
-  function: (scoped_identifier
-              (identifier) @function.call .))
+  function:
+    (scoped_identifier
+      (identifier) @function.call .))
 
 (call_expression
-  function: (field_expression
-    field: (field_identifier) @function.call))
+  function:
+    (field_expression
+      field: (field_identifier) @function.call))
 
-[
-  "jmp"
-] @function.builtin
+"jmp" @function.builtin
 
 ; Types
+(struct_definition
+  .
+  (identifier) @type
+  (typed_identifier
+    (identifier) @variable.member)?)
 
-(struct_definition . (identifier) @type (typed_identifier (identifier) @variable.member)?)
-
-(named_type (identifier) @type .)
+(named_type
+  (identifier) @type .)
 
 [
   (builtin_type)
@@ -217,7 +260,6 @@
 (type_identifier) @type
 
 ; Constants
-
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z_][A-Z0-9_]*$"))
 
@@ -225,49 +267,68 @@
   name: (identifier) @constant)
 
 (call_expression
-  function: (scoped_identifier
-    "::"
-    name: (identifier) @constant)
+  function:
+    (scoped_identifier
+      "::"
+      name: (identifier) @constant)
   (#lua-match? @constant "^[A-Z]"))
 
 ((match_arm
-   pattern: (match_pattern (identifier) @constant))
- (#lua-match? @constant "^[A-Z]"))
+  pattern:
+    (match_pattern
+      (identifier) @constant))
+  (#lua-match? @constant "^[A-Z]"))
 
 ((match_arm
-   pattern: (match_pattern
-     (scoped_identifier
-       name: (identifier) @constant)))
- (#lua-match? @constant "^[A-Z]"))
+  pattern:
+    (match_pattern
+      (scoped_identifier
+        name: (identifier) @constant)))
+  (#lua-match? @constant "^[A-Z]"))
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin "Some" "None" "Ok" "Err"))
+  (#any-of? @constant.builtin "Some" "None" "Ok" "Err"))
 
 ; Constructors
+(unary_expression
+  "new"
+  (call_expression
+    .
+    (identifier) @constructor))
 
-(unary_expression "new" (call_expression . (identifier) @constructor))
-
-((call_expression . (identifier) @constructor)
+((call_expression
+  .
+  (identifier) @constructor)
   (#lua-match? @constructor "^%u"))
 
 ; Attributes
+(decorator
+  "@" @attribute
+  (identifier) @attribute)
 
-(decorator "@" @attribute (identifier) @attribute)
+(attribute_item
+  (identifier) @function.macro)
 
-(attribute_item (identifier) @function.macro)
-
-(attribute_item (scoped_identifier (identifier) @function.macro .))
+(attribute_item
+  (scoped_identifier
+    (identifier) @function.macro .))
 
 ; Labels
+(label
+  .
+  (identifier) @label)
 
-(label . (identifier) @label)
+(inst_jmp_to_label
+  "jmp"
+  .
+  (identifier) @label)
 
-(inst_jmp_to_label "jmp" . (identifier) @label)
-
-(inst_jnz_to_label "jmp" . (identifier) @label)
+(inst_jnz_to_label
+  "jmp"
+  .
+  (identifier) @label)
 
 ; Operators
-
 [
   "+"
   "-"
@@ -307,7 +368,6 @@
 ] @operator
 
 ; Literals
-
 (number) @number
 
 (boolean) @boolean
@@ -318,17 +378,41 @@
 ] @string
 
 ; Punctuation
+(attribute_item
+  "#" @punctuation.special)
 
-(attribute_item "#" @punctuation.special)
+[
+  "."
+  ","
+  ":"
+  ";"
+  "->"
+  "=>"
+  "::"
+] @punctuation.delimiter
 
-[ "." "," ":" ";" "->" "=>" "::" ] @punctuation.delimiter
+[
+  "{"
+  "}"
+  "("
+  ")"
+  "["
+  "]"
+  "%{"
+  "%}"
+] @punctuation.bracket
 
-[ "{" "}" "(" ")" "[" "]" "%{" "%}" ] @punctuation.bracket
+(type_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
-(type_parameters [ "<" ">" ] @punctuation.bracket)
-
-(type_arguments [ "<" ">" ] @punctuation.bracket)
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 ; Comment
-
 (comment) @comment @spell
diff --git a/queries/cairo/indents.scm b/queries/cairo/indents.scm
index 76a22e705..a97bd24a4 100644
--- a/queries/cairo/indents.scm
+++ b/queries/cairo/indents.scm
@@ -18,19 +18,36 @@
   (tuple_pattern)
 ] @indent.begin
 
-(import_statement "(") @indent.begin
+(import_statement
+  "(") @indent.begin
+
+(block
+  "}" @indent.end)
 
-(block "}" @indent.end)
 (enum_item
-  body: (enum_variant_list "}" @indent.end))
+  body:
+    (enum_variant_list
+      "}" @indent.end))
+
 (match_expression
-  body: (match_block "}" @indent.end))
+  body:
+    (match_block
+      "}" @indent.end))
+
 (mod_item
-  body: (declaration_list "}" @indent.end))
+  body:
+    (declaration_list
+      "}" @indent.end))
+
 (struct_item
-  body: (field_declaration_list "}" @indent.end))
+  body:
+    (field_declaration_list
+      "}" @indent.end))
+
 (trait_item
-  body: (declaration_list "}" @indent.end))
+  body:
+    (declaration_list
+      "}" @indent.end))
 
 [
   ")"
diff --git a/queries/cairo/injections.scm b/queries/cairo/injections.scm
index 675a81a76..fbb66be38 100644
--- a/queries/cairo/injections.scm
+++ b/queries/cairo/injections.scm
@@ -1,3 +1,5 @@
-(python_code) @python
+((python_code) @injection.content
+  (#set! injection.language "python"))
 
-(comment) @comment
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/cairo/locals.scm b/queries/cairo/locals.scm
index a92991f26..27ec73542 100644
--- a/queries/cairo/locals.scm
+++ b/queries/cairo/locals.scm
@@ -1,13 +1,13 @@
 ; References
-
 (identifier) @local.reference
+
 ((type_identifier) @local.reference
   (#set! reference.kind "type"))
+
 ((field_identifier) @local.reference
   (#set! reference.kind "field"))
 
 ; Scopes
-
 [
   (program)
   (block)
@@ -16,53 +16,52 @@
   (if_expression)
   (match_expression)
   (match_arm)
-
   (struct_item)
   (enum_item)
   (impl_item)
 ] @local.scope
 
-(use_declaration 
-  argument: (scoped_identifier 
-              name: (identifier) @local.definition.import))
+(use_declaration
+  argument:
+    (scoped_identifier
+      name: (identifier) @local.definition.import))
 
-(use_as_clause 
+(use_as_clause
   alias: (identifier) @local.definition.import)
 
 (use_list
-    (identifier) @local.definition.import) ; use std::process::{Child, Command, Stdio};
+  (identifier) @local.definition.import) ; use std::process::{Child, Command, Stdio};
 
 ; Functions
-
 (function_definition
-    (identifier) @local.definition.function)
+  (identifier) @local.definition.function)
 
 (function_definition
   (identifier) @local.definition.method
-  (parameter (self)))
+  (parameter
+    (self)))
 
 ; Function with parameters, defines parameters
-
 (parameter
-  [ (identifier) (self) ]  @local.definition.parameter)
+  [
+    (identifier)
+    (self)
+  ] @local.definition.parameter)
 
 ; Types
-
 (struct_item
   name: (type_identifier) @local.definition.type)
 
-(constrained_type_parameter 
+(constrained_type_parameter
   left: (type_identifier) @local.definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
 
 (enum_item
   name: (type_identifier) @local.definition.type)
 
 ; Module
-
-(mod_item 
+(mod_item
   name: (identifier) @local.definition.namespace)
 
 ; Variables
-
 (assignment_expression
- left: (identifier) @local.definition.var)
+  left: (identifier) @local.definition.var)
diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm
index 80c8262e7..4ce923ce4 100644
--- a/queries/capnp/highlights.scm
+++ b/queries/capnp/highlights.scm
@@ -1,12 +1,10 @@
 ; Preproc
-
 [
   (unique_id)
   (top_level_annotation_body)
 ] @keyword.directive
 
 ; Includes
-
 [
   "import"
   "$import"
@@ -17,7 +15,6 @@
 (import_path) @string.special.path
 
 ; Keywords
-
 [
   "annotation"
   "enum"
@@ -30,10 +27,7 @@
 ] @keyword
 
 ; Builtins
-
-[
-  "const"
-] @type.qualifier
+"const" @type.qualifier
 
 [
   (primitive_type)
@@ -41,30 +35,24 @@
 ] @type.builtin
 
 ; Typedefs
-
 (type_definition) @type.definition
 
 ; Labels (@number, @number!)
-
 (field_version) @label
 
 ; Methods
-
 [
   (annotation_definition_identifier)
   (method_identifier)
 ] @function.method
 
 ; Fields
-
 (field_identifier) @variable.member
 
 ; Properties
-
 (property) @property
 
 ; Parameters
-
 [
   (param_identifier)
   (return_identifier)
@@ -73,7 +61,6 @@
 (annotation_target) @variable.parameter.builtin
 
 ; Constants
-
 [
   (const_identifier)
   (local_const)
@@ -83,7 +70,6 @@
 (void) @constant.builtin
 
 ; Types
-
 [
   (enum_identifier)
   (extend_type)
@@ -91,18 +77,15 @@
 ] @type
 
 ; Attributes
-
 [
   (annotation_identifier)
   (attribute)
 ] @attribute
 
 ; Operators
-
 "=" @operator
 
 ; Literals
-
 [
   (string)
   (concatenated_string)
@@ -125,18 +108,26 @@
 (data_hex) @string.special.symbol
 
 ; Punctuation
-
 [
   "*"
   "$"
   ":"
 ] @punctuation.special
 
-["{" "}"] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-["(" ")"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-["[" "]"] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   "."
@@ -146,5 +137,4 @@
 ] @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/capnp/indents.scm b/queries/capnp/indents.scm
index bc7979aea..cc2f4d756 100644
--- a/queries/capnp/indents.scm
+++ b/queries/capnp/indents.scm
@@ -13,14 +13,17 @@
   (field)
 ] @indent.begin
 
-((struct_shorthand (property)) @indent.align
+((struct_shorthand
+  (property)) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
-((method (field_version)) @indent.align
+((method
+  (field_version)) @indent.align
   (#set! indent.open_delimiter field_version))
 
-((const_list (const_value)) @indent.align
+((const_list
+  (const_value)) @indent.align
   (#set! indent.open_delimiter "[")
   (#set! indent.close_delimiter "]"))
 
@@ -31,7 +34,6 @@
   ")"
 ] @indent.end @indent.branch
 
-
 [
   (ERROR)
   (comment)
diff --git a/queries/capnp/injections.scm b/queries/capnp/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/capnp/injections.scm
+++ b/queries/capnp/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/capnp/locals.scm b/queries/capnp/locals.scm
index d0025100e..d1f0ccacc 100644
--- a/queries/capnp/locals.scm
+++ b/queries/capnp/locals.scm
@@ -18,17 +18,21 @@
   (extend_type)
   (field_type)
 ] @local.reference
-(custom_type (type_identifier) @local.reference)
+
+(custom_type
+  (type_identifier) @local.reference)
+
 (custom_type
   (generics
-    (generic_parameters 
+    (generic_parameters
       (generic_identifier) @local.reference)))
 
 (annotation_definition_identifier) @local.definition
 
 (const_identifier) @local.definition.constant
 
-(enum (enum_identifier) @local.definition.enum)
+(enum
+  (enum_identifier) @local.definition.enum)
 
 [
   (enum_member)
@@ -44,16 +48,19 @@
   (return_identifier)
 ] @local.definition.parameter
 
-(group (type_identifier) @local.definition.type)
+(group
+  (type_identifier) @local.definition.type)
 
-(struct (type_identifier) @local.definition.type)
+(struct
+  (type_identifier) @local.definition.type)
 
-(union (type_identifier) @local.definition.type)
+(union
+  (type_identifier) @local.definition.type)
 
-(interface (type_identifier) @local.definition.type)
+(interface
+  (type_identifier) @local.definition.type)
 
 ; Generics Related (don't know how to combine these)
-
 (struct
   (generics
     (generic_parameters
diff --git a/queries/chatito/folds.scm b/queries/chatito/folds.scm
index 20cb51941..052dd2064 100644
--- a/queries/chatito/folds.scm
+++ b/queries/chatito/folds.scm
@@ -1,5 +1,5 @@
 [
- (intent_def)
- (slot_def)
- (alias_def)
+  (intent_def)
+  (slot_def)
+  (alias_def)
 ] @fold
diff --git a/queries/chatito/highlights.scm b/queries/chatito/highlights.scm
index 913787012..0c2dd795a 100644
--- a/queries/chatito/highlights.scm
+++ b/queries/chatito/highlights.scm
@@ -1,24 +1,32 @@
-;; Punctuation
-
+; Punctuation
 [
- "%["
- "@["
- "~["
- "*["
- "]"
- "("
- ")"
+  "%["
+  "@["
+  "~["
+  "*["
+  "]"
+  "("
+  ")"
 ] @punctuation.bracket
 
-[":" ","] @punctuation.delimiter
+[
+  ":"
+  ","
+] @punctuation.delimiter
 
-(["\"" "'"] @punctuation.special
-            (#set! conceal ""))
+([
+  "\""
+  "'"
+] @punctuation.special
+  (#set! conceal ""))
 
-["%" "?" "#"] @character.special
-
-;; Entities
+[
+  "%"
+  "?"
+  "#"
+] @character.special
 
+; Entities
 (intent) @module
 
 (slot) @type
@@ -35,16 +43,13 @@
 
 (escape) @string.escape
 
-;; Import
-
+; Import
 "import" @keyword.import
 
 (file) @string.special.path
 
-;; Text
-
+; Text
 (word) @spell
 
-;; Comment
-
+; Comment
 (comment) @comment @spell
diff --git a/queries/chatito/indents.scm b/queries/chatito/indents.scm
index 64b4674b7..dc9e13d78 100644
--- a/queries/chatito/indents.scm
+++ b/queries/chatito/indents.scm
@@ -1,7 +1,8 @@
 [
- (intent_def)
- (slot_def)
- (alias_def)
+  (intent_def)
+  (slot_def)
+  (alias_def)
 ] @indent.begin
 
-(ERROR "]") @indent.begin
+(ERROR
+  "]") @indent.begin
diff --git a/queries/chatito/injections.scm b/queries/chatito/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/chatito/injections.scm
+++ b/queries/chatito/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/chatito/locals.scm b/queries/chatito/locals.scm
index fd8bb9da0..827447f57 100644
--- a/queries/chatito/locals.scm
+++ b/queries/chatito/locals.scm
@@ -1,10 +1,16 @@
-;; Definitions
+; Definitions
+(intent_def
+  (intent) @local.definition)
 
-(intent_def (intent) @local.definition)
-(slot_def (slot) @local.definition)
-(alias_def (alias) @local.definition)
+(slot_def
+  (slot) @local.definition)
 
-;; References
+(alias_def
+  (alias) @local.definition)
 
-(slot_ref (slot) @local.reference)
-(alias_ref (alias) @local.reference)
+; References
+(slot_ref
+  (slot) @local.reference)
+
+(alias_ref
+  (alias) @local.reference)
diff --git a/queries/clojure/folds.scm b/queries/clojure/folds.scm
index d54daade6..eceb69712 100644
--- a/queries/clojure/folds.scm
+++ b/queries/clojure/folds.scm
@@ -1 +1,2 @@
-(source (list_lit) @fold)
+(source
+  (list_lit) @fold)
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 974a17c0a..60bc4365b 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -1,69 +1,87 @@
-;; >> 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
-;; specialized captures.
-;; This can mean that sometimes things are highlighted weirdly because they
-;; have multiple highlight groups applied to them.
+; >> 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
+; specialized 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
+  )
 
-
-;; >> Literals
-
-(
- (dis_expr) @comment
- (#set! "priority" 105) ; Higher priority to mark the whole sexpr as a comment
-)
 (kwd_lit) @string.special.symbol
+
 (str_lit) @string
+
 (num_lit) @number
+
 (char_lit) @character
+
 (bool_lit) @boolean
+
 (nil_lit) @constant.builtin
+
 (comment) @comment @spell
+
 (regex_lit) @string.regexp
 
-["'" "`"] @string.escape
+[
+  "'"
+  "`"
+] @string.escape
 
-["~" "~@" "#"] @punctuation.special
+[
+  "~"
+  "~@"
+  "#"
+] @punctuation.special
 
-["{" "}" "[" "]" "(" ")"] @punctuation.bracket
-
-
-
-;; >> Symbols
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
 
+; >> Symbols
 ; General symbol highlighting
 (sym_lit) @variable
 
 ; General function calls
 (list_lit
- .
- (sym_lit) @function.call)
+  .
+  (sym_lit) @function.call)
+
 (anon_fn_lit
- .
- (sym_lit) @function.call)
+  .
+  (sym_lit) @function.call)
 
 ; Quoted symbols
 (quoting_lit
- (sym_lit) @string.special.symbol)
+  (sym_lit) @string.special.symbol)
+
 (syn_quoting_lit
- (sym_lit) @string.special.symbol)
+  (sym_lit) @string.special.symbol)
 
 ; Used in destructure pattern
 ((sym_lit) @variable.parameter
- (#lua-match? @variable.parameter "^[&]"))
+  (#lua-match? @variable.parameter "^[&]"))
 
 ; Inline function variables
 ((sym_lit) @variable.builtin
- (#lua-match? @variable.builtin "^%%"))
+  (#lua-match? @variable.builtin "^%%"))
 
 ; Constructor
 ((sym_lit) @constructor
- (#lua-match? @constructor "^-%>[^>].*"))
+  (#lua-match? @constructor "^-%>[^>].*"))
 
 ; Builtin dynamic variables
 ((sym_lit) @variable.builtin
@@ -84,94 +102,91 @@
 
 ; Builtin repl variables
 ((sym_lit) @variable.builtin
- (#any-of? @variable.builtin
-  "*1" "*2" "*3" "*e"))
+  (#any-of? @variable.builtin "*1" "*2" "*3" "*e"))
 
 ; Gensym
-;; Might not be needed
+; Might not be needed
 ((sym_lit) @variable
- (#lua-match? @variable "^.*#$"))
+  (#lua-match? @variable "^.*#$"))
 
 ; Types
-;; TODO: improve?
+; TODO: improve?
 ((sym_lit) @type
- (#lua-match? @type "^[%u][^/]*$"))
-;; Symbols with `.` but not `/`
+  (#lua-match? @type "^[%u][^/]*$"))
+
+; Symbols with `.` but not `/`
 ((sym_lit) @type
- (#lua-match? @type "^[^/]+[.][^/]*$"))
+  (#lua-match? @type "^[^/]+[.][^/]*$"))
 
 ; Interop
 ; (.instanceMember instance args*)
 ; (.instanceMember Classname args*)
 ((sym_lit) @function.method
- (#lua-match? @function.method "^%.[^-]"))
+  (#lua-match? @function.method "^%.[^-]"))
+
 ; (.-instanceField instance)
 ((sym_lit) @variable.member
- (#lua-match? @variable.member "^%.%-.*"))
+  (#lua-match? @variable.member "^%.%-.*"))
+
 ;  Classname/staticField
 ((sym_lit) @variable.member
- (#lua-match? @variable.member "^[%u].*/.+"))
+  (#lua-match? @variable.member "^[%u].*/.+"))
+
 ; (Classname/staticMethod args*)
 (list_lit
- .
- (sym_lit) @function.method
- (#lua-match? @function.method "^[%u].*/.+"))
-;; TODO: Special casing for the `.` macro
+  .
+  (sym_lit) @function.method
+  (#lua-match? @function.method "^[%u].*/.+"))
 
+; TODO: Special casing for the `.` macro
 ; Operators
 ((sym_lit) @operator
- (#any-of? @operator
-  "*" "*'" "+" "+'" "-" "-'" "/"
-  "<" "<=" ">" ">=" "=" "=="))
+  (#any-of? @operator "*" "*'" "+" "+'" "-" "-'" "/" "<" "<=" ">" ">=" "=" "=="))
+
 ((sym_lit) @keyword.operator
- (#any-of? @keyword.operator
-  "not" "not=" "and" "or"))
+  (#any-of? @keyword.operator "not" "not=" "and" "or"))
 
 ; Definition functions
 ((sym_lit) @keyword
- (#any-of? @keyword
-  "def" "defonce" "defrecord" "defmacro" "definline" "definterface"
-  "defmulti" "defmethod" "defstruct" "defprotocol"
-  "deftype"))
+  (#any-of? @keyword "def" "defonce" "defrecord" "defmacro" "definline" "definterface" "defmulti" "defmethod" "defstruct" "defprotocol" "deftype"))
+
 ((sym_lit) @keyword
- (#eq? @keyword "declare"))
+  (#eq? @keyword "declare"))
+
 ((sym_name) @keyword.coroutine
- (#any-of? @keyword.coroutine
-  "alts!" "alts!!" "await" "await-for" "await1" "chan" "close!" "future" "go" "sync" "thread" "timeout" "<!" "<!!" ">!" ">!!"))
+  (#any-of? @keyword.coroutine "alts!" "alts!!" "await" "await-for" "await1" "chan" "close!" "future" "go" "sync" "thread" "timeout" "<!" "<!!" ">!" ">!!"))
+
 ((sym_lit) @keyword.function
- (#any-of? @keyword.function "defn" "defn-" "fn" "fn*"))
+  (#any-of? @keyword.function "defn" "defn-" "fn" "fn*"))
 
 ; Comment
 ((sym_lit) @comment
- (#any-of? @comment "comment"))
+  (#any-of? @comment "comment"))
 
 ; Conditionals
 ((sym_lit) @keyword.conditional
- (#any-of? @keyword.conditional
-  "case" "cond" "cond->" "cond->>" "condp"))
+  (#any-of? @keyword.conditional "case" "cond" "cond->" "cond->>" "condp"))
+
 ((sym_lit) @keyword.conditional
- (#any-of? @keyword.conditional
-  "if" "if-let" "if-not" "if-some"))
+  (#any-of? @keyword.conditional "if" "if-let" "if-not" "if-some"))
+
 ((sym_lit) @keyword.conditional
- (#any-of? @keyword.conditional
-  "when" "when-first" "when-let" "when-not" "when-some"))
+  (#any-of? @keyword.conditional "when" "when-first" "when-let" "when-not" "when-some"))
 
 ; Repeats
 ((sym_lit) @keyword.repeat
- (#any-of? @keyword.repeat
-  "doseq" "dotimes" "for" "loop" "recur" "while"))
+  (#any-of? @keyword.repeat "doseq" "dotimes" "for" "loop" "recur" "while"))
 
 ; Exception
 ((sym_lit) @keyword.exception
- (#any-of? @keyword.exception
-  "throw" "try" "catch" "finally"))
+  (#any-of? @keyword.exception "throw" "try" "catch" "finally"))
 
 ; Includes
 ((sym_lit) @keyword.import
- (#any-of? @keyword.import "ns" "import" "require" "use"))
+  (#any-of? @keyword.import "ns" "import" "require" "use"))
 
 ; Builtin macros
-;; TODO: Do all these items belong here?
+; TODO: Do all these items belong here?
 ((sym_lit) @function.macro
   ; format-ignore
   (#any-of? @function.macro
@@ -191,7 +206,7 @@
 ;      (keep (fn [[s v]] (when-not (:macro (meta v)) s)))
 ;      sort
 ;      clojure.pprint/pprint))
-;; ...and then lots of manual filtering...
+; ...and then lots of manual filtering...
 ((sym_lit) @function.builtin
   ; format-ignore
   (#any-of? @function.builtin
@@ -316,48 +331,43 @@
     "seq-to-map-for-destructuring" "update-keys" "update-vals"
     ;; 1.12
     "partitionv" "partitionv-all" "splitv-at"))
-
-
-
-;; >> Context based highlighting
-
-;; def-likes
-;; Correctly highlight docstrings
+; >> 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)?
- ;.
- ;(_))
-
+;.
+;(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)* @variable.parameter)
- ; (list_lit
- ;  (vec_lit
- ;   (sym_lit)* @variable.parameter))])
-  
+  .
+  (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)* @variable.parameter)
+; (list_lit
+;  (vec_lit
+;   (sym_lit)* @variable.parameter))])
 ;[((list_lit
 ;   (vec_lit
 ;    (sym_lit) @variable.parameter)
@@ -366,19 +376,17 @@
 ; ((vec_lit
 ;   (sym_lit) @variable.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
+; 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
+; namespaces
 (list_lit
- .
- (sym_lit) @_include
- (#eq? @_include "ns")
- .
- (sym_lit) @module)
+  .
+  (sym_lit) @_include
+  (#eq? @_include "ns")
+  .
+  (sym_lit) @module)
diff --git a/queries/clojure/injections.scm b/queries/clojure/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/clojure/injections.scm
+++ b/queries/clojure/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/cmake/folds.scm b/queries/cmake/folds.scm
index 9ac59ad4c..ef153b911 100644
--- a/queries/cmake/folds.scm
+++ b/queries/cmake/folds.scm
@@ -1,8 +1,8 @@
 [
- (if_condition)
- (foreach_loop)
- (while_loop)
- (function_def)
- (macro_def)
- (block_def)
+  (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
index 13544661f..714893cb1 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -1,96 +1,107 @@
 (normal_command
   (identifier)
   (argument_list
-    (argument (unquoted_argument)) @constant
-  )
-  (#lua-match? @constant "^[%u@][%u%d_]+$")
-)
+    (argument
+      (unquoted_argument)) @constant)
+  (#lua-match? @constant "^[%u@][%u%d_]+$"))
 
 [
- (quoted_argument)
- (bracket_argument)
+  (quoted_argument)
+  (bracket_argument)
 ] @string
 
 (variable_ref) @none
+
 (variable) @variable
 
 [
- (bracket_comment)
- (line_comment)
+  (bracket_comment)
+  (line_comment)
 ] @comment @spell
 
-(normal_command (identifier) @function)
-
-["ENV" "CACHE"] @keyword.storage
-["$" "{" "}" "<" ">"] @punctuation.special
-["(" ")"] @punctuation.bracket
+(normal_command
+  (identifier) @function)
 
 [
- (function)
- (endfunction)
- (macro)
- (endmacro)
+  "ENV"
+  "CACHE"
+] @keyword.storage
+
+[
+  "$"
+  "{"
+  "}"
+  "<"
+  ">"
+] @punctuation.special
+
+[
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  (function)
+  (endfunction)
+  (macro)
+  (endmacro)
 ] @keyword.function
 
 [
- (if)
- (elseif)
- (else)
- (endif)
+  (if)
+  (elseif)
+  (else)
+  (endif)
 ] @keyword.conditional
 
 [
- (foreach)
- (endforeach)
- (while)
- (endwhile)
+  (foreach)
+  (endforeach)
+  (while)
+  (endwhile)
 ] @keyword.repeat
 
 (normal_command
   (identifier) @keyword.repeat
-  (#match? @keyword.repeat "\\c^(continue|break)$")
-)
+  (#match? @keyword.repeat "\\c^(continue|break)$"))
+
 (normal_command
   (identifier) @keyword.return
-  (#match? @keyword.return "\\c^return$")
-)
+  (#match? @keyword.return "\\c^return$"))
 
 (function_command
   (function)
   (argument_list
-    . (argument) @function
-    (argument)* @variable.parameter
-  )
-)
+    .
+    (argument) @function
+    (argument)* @variable.parameter))
 
 (macro_command
   (macro)
   (argument_list
-    . (argument) @function.macro
-    (argument)* @variable.parameter
-  )
-)
+    .
+    (argument) @function.macro
+    (argument)* @variable.parameter))
 
 (block_def
   (block_command
     (block) @function.builtin
     (argument_list
-      (argument (unquoted_argument) @constant)
-    )
-    (#any-of? @constant "SCOPE_FOR" "POLICIES" "VARIABLES" "PROPAGATE")
-  )
-  (endblock_command (endblock) @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)$")
-)
+  (#match? @boolean "\\c^(1|on|yes|true|y|0|off|no|false|n|ignore|notfound|.*-notfound)$"))
+
 ;
 (if_command
   (if)
   (argument_list
-    (argument) @keyword.operator
-  )
+    (argument) @keyword.operator)
   ; format-ignore
   (#any-of? @keyword.operator 
     "NOT" "AND" "OR"
@@ -100,13 +111,12 @@
     "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"
-  )
-)
+  ))
+
 (elseif_command
   (elseif)
   (argument_list
-    (argument) @keyword.operator
-  )
+    (argument) @keyword.operator)
   ; format-ignore
   (#any-of? @keyword.operator 
     "NOT" "AND" "OR"
@@ -116,106 +126,105 @@
     "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)$")
-)
+  (#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_list
-    . (argument) @variable
-  )
-  (#match? @_function "\\c^set$")
-)
-
-(normal_command
-  (identifier) @_function
-  (#match? @_function "\\c^set$")
-  (argument_list
-    . (argument)
-    (
-    (argument) @_cache @keyword.storage
     .
-    (argument) @_type @type
-    (#any-of? @_cache "CACHE")
-    (#any-of? @_type "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL")
-    )
-  )
-)
+    (argument) @variable)
+  (#match? @_function "\\c^set$"))
+
+(normal_command
+  (identifier) @_function
+  (#match? @_function "\\c^set$")
+  (argument_list
+    .
+    (argument)
+    ((argument) @_cache @keyword.storage
+      .
+      (argument) @_type @type
+      (#any-of? @_cache "CACHE")
+      (#any-of? @_type "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL"))))
 
 (normal_command
   (identifier) @_function
   (#match? @_function "\\c^unset$")
   (argument_list
-    . (argument)
+    .
+    (argument)
     (argument) @keyword.storage
-    (#any-of? @keyword.storage "CACHE" "PARENT_SCOPE")
-  )
-)
+    (#any-of? @keyword.storage "CACHE" "PARENT_SCOPE")))
 
 (normal_command
   (identifier) @_function
   (#match? @_function "\\c^list$")
   (argument_list
-    . (argument) @constant
+    .
+    (argument) @constant
     (#any-of? @constant "LENGTH" "GET" "JOIN" "SUBLIST" "FIND")
-    . (argument) @variable
-    (argument) @variable . 
-  )
-)
+    .
+    (argument) @variable
+    (argument) @variable .))
+
 (normal_command
   (identifier) @_function
   (#match? @_function "\\c^list$")
   (argument_list
-    . (argument) @constant
-    . (argument) @variable
-    (#any-of? @constant "APPEND" "FILTER" "INSERT"
-                        "POP_BACK" "POP_FRONT" "PREPEND"
-                        "REMOVE_ITEM" "REMOVE_AT" "REMOVE_DUPLICATES"
-                        "REVERSE" "SORT")
-  )
-)
+    .
+    (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_list
-    . (argument) @_transform @constant
-    . (argument) @variable
-    . (argument) @_action @constant
+    .
+    (argument) @_transform @constant
+    .
+    (argument) @variable
+    .
+    (argument) @_action @constant
+    (#eq? @_transform "TRANSFORM")
+    (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")))
+
+(normal_command
+  (identifier) @_function
+  (#match? @_function "\\c^list$")
+  (argument_list
+    .
+    (argument) @_transform @constant
+    .
+    (argument) @variable
+    .
+    (argument) @_action @constant
+    .
+    (argument)? @_selector @constant
     (#eq? @_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_list
-    . (argument) @_transform @constant
-    . (argument) @variable
-    . (argument) @_action @constant
-    . (argument)? @_selector @constant
-    (#eq? @_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_list
-    . (argument) @_transform @constant
-    (argument) @constant .
+    .
+    (argument) @_transform @constant
+    (argument) @constant
+    .
     (argument) @variable
     (#eq? @_transform "TRANSFORM")
-    (#eq? @constant "OUTPUT_VARIABLE")
-  )
-)
+    (#eq? @constant "OUTPUT_VARIABLE")))
 
 (escape_sequence) @string.escape
 
-((source_file . (line_comment) @keyword.directive)
+((source_file
+  .
+  (line_comment) @keyword.directive)
   (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/cmake/indents.scm b/queries/cmake/indents.scm
index 787cc2c98..e7f326b00 100644
--- a/queries/cmake/indents.scm
+++ b/queries/cmake/indents.scm
@@ -9,17 +9,18 @@
 ] @indent.begin
 
 [
- (elseif_command)
- (else_command)
- (endif_command)
- (endforeach_command)
- (endwhile_command)
- (endfunction_command)
- (endmacro_command)
- (endblock_command)
+  (elseif_command)
+  (else_command)
+  (endif_command)
+  (endforeach_command)
+  (endwhile_command)
+  (endfunction_command)
+  (endmacro_command)
+  (endblock_command)
 ] @indent.branch
 
 (")" @indent.branch)
+
 (")" @indent.end)
 
 (argument_list) @indent.auto
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 41b653e93..6556ec557 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -11,33 +11,39 @@
 
 ((tag
   (name) @comment.note @nospell
-  ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
+  ("(" @punctuation.bracket
+    (user) @constant
+    ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
   (#any-of? @comment.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
 
 ("text" @comment.note @nospell
- (#any-of? @comment.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
+  (#any-of? @comment.note "NOTE" "XXX" "INFO" "DOCS" "PERF" "TEST"))
 
 ((tag
   (name) @comment.warning @nospell
-  ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
+  ("(" @punctuation.bracket
+    (user) @constant
+    ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
   (#any-of? @comment.warning "HACK" "WARNING" "WARN" "FIX"))
 
 ("text" @comment.warning @nospell
- (#any-of? @comment.warning "HACK" "WARNING" "WARN" "FIX"))
+  (#any-of? @comment.warning "HACK" "WARNING" "WARN" "FIX"))
 
 ((tag
   (name) @comment.error @nospell
-  ("(" @punctuation.bracket (user) @constant ")" @punctuation.bracket)?
+  ("(" @punctuation.bracket
+    (user) @constant
+    ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
   (#any-of? @comment.error "FIXME" "BUG" "ERROR"))
 
 ("text" @comment.error @nospell
- (#any-of? @comment.error "FIXME" "BUG" "ERROR"))
+  (#any-of? @comment.error "FIXME" "BUG" "ERROR"))
 
 ; Issue number (#123)
 ("text" @number
- (#lua-match? @number "^#[0-9]+$"))
+  (#lua-match? @number "^#[0-9]+$"))
 
 ((uri) @string.special.url @nospell)
diff --git a/queries/commonlisp/folds.scm b/queries/commonlisp/folds.scm
index d54daade6..eceb69712 100644
--- a/queries/commonlisp/folds.scm
+++ b/queries/commonlisp/folds.scm
@@ -1 +1,2 @@
-(source (list_lit) @fold)
+(source
+  (list_lit) @fold)
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 42da34d0e..57775019b 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -1,25 +1,48 @@
 (sym_lit) @variable
-
-;; A highlighting for functions/macros in th cl namespace is available in theHamsta/nvim-treesitter-commonlisp
+; 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) @variable.parameter))
+  lambda_list:
+    (list_lit
+      (sym_lit) @variable.parameter))
+
 (defun_header
-  keyword: (defun_keyword "defmethod")
-  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @string.special.symbol)))
+  keyword:
+    (defun_keyword
+      "defmethod")
+  lambda_list:
+    (list_lit
+      (list_lit
+        .
+        (sym_lit)
+        .
+        (sym_lit) @string.special.symbol)))
+
 (defun_header
-  lambda_list: (list_lit (list_lit . (sym_lit) @variable.parameter . (_))))
+  lambda_list:
+    (list_lit
+      (list_lit
+        .
+        (sym_lit) @variable.parameter
+        .
+        (_))))
+
 (defun_header
   specifier: (sym_lit) @string.special.symbol)
 
-[":" "::" "."] @punctuation.special
+[
+  ":"
+  "::"
+  "."
+] @punctuation.special
 
 [
   (accumulation_verb)
@@ -49,99 +72,126 @@
   "return"
   "initially"
 ] @function.macro
+
 "=" @operator
 
 (include_reader_macro) @string.special.symbol
-["#C" "#c"] @number
 
-[(kwd_lit) (self_referential_reader_macro)] @string.special.symbol
+[
+  "#C"
+  "#c"
+] @number
+
+[
+  (kwd_lit)
+  (self_referential_reader_macro)
+] @string.special.symbol
 
 (package_lit
   package: (_) @module)
+
 "cl" @module
 
 (str_lit) @string
 
 (num_lit) @number
 
-((sym_lit)  @boolean (#any-of? @boolean "t" "T"))
+((sym_lit) @boolean
+  (#any-of? @boolean "t" "T"))
 
 (nil_lit) @constant.builtin
 
 (comment) @comment @spell
 
-;; dynamic variables
+; dynamic variables
 ((sym_lit) @variable.builtin
- (#lua-match? @variable.builtin "^[*].+[*]$"))
+  (#lua-match? @variable.builtin "^[*].+[*]$"))
 
-;; quote
+; quote
 "'" @string.escape
+
 (format_specifier) @string.escape
+
 (quoting_lit) @string.escape
 
-;; syntax quote
+; syntax quote
 "`" @string.escape
+
 "," @string.escape
+
 ",@" @string.escape
+
 (syn_quoting_lit) @string.escape
+
 (unquoting_lit) @none
+
 (unquote_splicing_lit) @none
 
-
-["(" ")"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 (block_comment) @comment @spell
 
-
 (with_clause
   type: (_) @type)
+
 (for_clause
   type: (_) @type)
 
-;; defun-like things
+; defun-like things
 (list_lit
- .
- (sym_lit) @function.macro
- .
- (sym_lit) @function
- (#eq? @function.macro "deftest"))
+  .
+  (sym_lit) @function.macro
+  .
+  (sym_lit) @function
+  (#eq? @function.macro "deftest"))
 
-;;; Macros and Special Operators
+; Macros and Special Operators
 (list_lit
- .
- (sym_lit) @function.macro
-  ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
+  .
+  (sym_lit) @function.macro
+  ; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
   ; format-ignore
   (#any-of? @function.macro
     "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda" "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass" "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf" "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream" "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or" "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro" "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace" "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist" "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander" "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string" "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter" "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless" "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block" "time" "restart-case" "prog*" "define-method-combination" "optimize"))
 
-;; constant
+; constant
 ((sym_lit) @constant
- (#lua-match? @constant "^[+].+[+]$"))
+  (#lua-match? @constant "^[+].+[+]$"))
 
 (var_quoting_lit
   marker: "#'" @string.special.symbol
   value: (_) @string.special.symbol)
 
-["#" "#p" "#P"] @string.special.symbol
+[
+  "#"
+  "#p"
+  "#P"
+] @string.special.symbol
 
 (list_lit
   .
   (sym_lit) @function.builtin
-  ;; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
+  ; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
   ; format-ignore
   (#any-of? @function.builtin
-    "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast"))
+    "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast")
+  )
 
 (list_lit
- .
- (sym_lit) @operator
- (#match? @operator "^([+*-+=<>]|<=|>=|/=)$"))
-
+  .
+  (sym_lit) @operator
+  (#match? @operator "^([+*-+=<>]|<=|>=|/=)$"))
 
 ((sym_lit) @string.special.symbol
-(#lua-match? @string.special.symbol "^[&]"))
+  (#lua-match? @string.special.symbol "^[&]"))
 
-[(array_dimension) "#0A" "#0a"] @number
+[
+  (array_dimension)
+  "#0A"
+  "#0a"
+] @number
 
 (char_lit) @character
diff --git a/queries/commonlisp/locals.scm b/queries/commonlisp/locals.scm
index 647d1007f..2865c1f0f 100644
--- a/queries/commonlisp/locals.scm
+++ b/queries/commonlisp/locals.scm
@@ -1,72 +1,113 @@
+(defun_header
+  function_name: (sym_lit) @local.definition.function
+  (#set! definition.function.scope "parent"))
 
 (defun_header
-  function_name: (sym_lit) @local.definition.function (#set! definition.function.scope "parent"))
-(defun_header
-  lambda_list: (list_lit (sym_lit) @local.definition.parameter))
+  lambda_list:
+    (list_lit
+      (sym_lit) @local.definition.parameter))
 
 (defun_header
-  keyword: (defun_keyword "defmethod")
-  lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @local.definition.type)))
+  keyword:
+    (defun_keyword
+      "defmethod")
+  lambda_list:
+    (list_lit
+      (list_lit
+        .
+        (sym_lit)
+        .
+        (sym_lit) @local.definition.type)))
+
 (defun_header
-  lambda_list: (list_lit (list_lit . (sym_lit) @local.definition.parameter . (_))))
+  lambda_list:
+    (list_lit
+      (list_lit
+        .
+        (sym_lit) @local.definition.parameter
+        .
+        (_))))
 
 (sym_lit) @local.reference
 
 (defun) @local.scope
 
-((list_lit . (sym_lit) @_defvar . (sym_lit) @local.definition.var)
-(#match? @_defvar "^(cl:)?(defvar|defparameter)$"))
+((list_lit
+  .
+  (sym_lit) @_defvar
+  .
+  (sym_lit) @local.definition.var)
+  (#match? @_defvar "^(cl:)?(defvar|defparameter)$"))
 
 (list_lit
- .
- (sym_lit) @_deftest
- .
- (sym_lit) @local.definition.function
- (#eq? @_deftest "deftest")) @local.scope
+  .
+  (sym_lit) @_deftest
+  .
+  (sym_lit) @local.definition.function
+  (#eq? @_deftest "deftest")) @local.scope
 
 (list_lit
- .
- (sym_lit) @_deftest
- .
- (sym_lit) @local.definition.function
- (#eq? @_deftest "deftest")) @local.scope
+  .
+  (sym_lit) @_deftest
+  .
+  (sym_lit) @local.definition.function
+  (#eq? @_deftest "deftest")) @local.scope
+
+(for_clause
+  .
+  (sym_lit) @local.definition.var)
+
+(with_clause
+  .
+  (sym_lit) @local.definition.var)
 
-(for_clause . (sym_lit) @local.definition.var)
-(with_clause . (sym_lit) @local.definition.var)
 (loop_macro) @local.scope
 
 (list_lit
- .
- (sym_lit) @_let (#match? @_let "(cl:|cffi:)?(with-accessors|with-foreign-objects|let[*]?)")
- .
- (list_lit (list_lit . (sym_lit) @local.definition.var))) @local.scope
+  .
+  (sym_lit) @_let
+  (#match? @_let "(cl:|cffi:)?(with-accessors|with-foreign-objects|let[*]?)")
+  .
+  (list_lit
+    (list_lit
+      .
+      (sym_lit) @local.definition.var))) @local.scope
 
 (list_lit
- .
- (sym_lit) @_let (#match? @_let "(cl:|alexandria:)?(with-gensyms|dotimes|with-foreign-object)")
- .
- (list_lit . (sym_lit) @local.definition.var)) @local.scope
+  .
+  (sym_lit) @_let
+  (#match? @_let "(cl:|alexandria:)?(with-gensyms|dotimes|with-foreign-object)")
+  .
+  (list_lit
+    .
+    (sym_lit) @local.definition.var)) @local.scope
 
 (list_lit
- .
- (kwd_lit) @_import_from (#eq? @_import_from ":import-from")
- .
- (_)
- (kwd_lit (kwd_symbol) @local.definition.import))
+  .
+  (kwd_lit) @_import_from
+  (#eq? @_import_from ":import-from")
+  .
+  (_)
+  (kwd_lit
+    (kwd_symbol) @local.definition.import))
 
 (list_lit
- .
- (kwd_lit) @_import_from (#eq? @_import_from ":import-from")
- .
- (_)
- (sym_lit) @local.definition.import)
+  .
+  (kwd_lit) @_import_from
+  (#eq? @_import_from ":import-from")
+  .
+  (_)
+  (sym_lit) @local.definition.import)
 
 (list_lit
- .
- (kwd_lit) @_use (#eq? @_use ":use")
- (kwd_lit (kwd_symbol) @local.definition.import))
+  .
+  (kwd_lit) @_use
+  (#eq? @_use ":use")
+  (kwd_lit
+    (kwd_symbol) @local.definition.import))
 
 (list_lit
- .
- (kwd_lit) @_use (#eq? @_use ":use")
- (sym_lit) @local.definition.import)
+  .
+  (kwd_lit) @_use
+  (#eq? @_use ":use")
+  (sym_lit) @local.definition.import)
diff --git a/queries/cooklang/highlights.scm b/queries/cooklang/highlights.scm
index 2ed9f2049..cd4eedade 100644
--- a/queries/cooklang/highlights.scm
+++ b/queries/cooklang/highlights.scm
@@ -3,20 +3,20 @@
 (ingredient
   "@" @tag
   (name)? @markup.heading
-	(amount
-	  (quantity)? @number
-		(units)? @tag.attribute)?)
+  (amount
+    (quantity)? @number
+    (units)? @tag.attribute)?)
 
 (timer
   "~" @tag
   (name)? @markup.heading
-	(amount
-	  (quantity)? @number
-		(units)? @tag.attribute)?)
+  (amount
+    (quantity)? @number
+    (units)? @tag.attribute)?)
 
 (cookware
   "#" @tag
   (name)? @markup.heading
-	(amount
-	  (quantity)? @number
-		(units)? @tag.attribute)?)
+  (amount
+    (quantity)? @number
+    (units)? @tag.attribute)?)
diff --git a/queries/corn/folds.scm b/queries/corn/folds.scm
index c081ecb47..2ce5ddb31 100644
--- a/queries/corn/folds.scm
+++ b/queries/corn/folds.scm
@@ -1,5 +1,5 @@
 [
- (object)
- (array)
- (assign_block)
+  (object)
+  (array)
+  (assign_block)
 ] @fold
diff --git a/queries/corn/highlights.scm b/queries/corn/highlights.scm
index 18672fd04..029291462 100644
--- a/queries/corn/highlights.scm
+++ b/queries/corn/highlights.scm
@@ -1,4 +1,5 @@
 "let" @keyword
+
 "in" @keyword
 
 [
@@ -11,10 +12,15 @@
 "." @punctuation.delimiter
 
 (input) @constant
+
 (comment) @comment @spell
 
 (string) @string
+
 (integer) @number
+
 (float) @number.float
+
 (boolean) @boolean
+
 (null) @keyword
diff --git a/queries/corn/indents.scm b/queries/corn/indents.scm
index 1f5a2c402..f1f5e04da 100644
--- a/queries/corn/indents.scm
+++ b/queries/corn/indents.scm
@@ -1,14 +1,24 @@
 [
- (assign_block "{")
- (object)
- (array)
+  (assign_block
+    "{")
+  (object)
+  (array)
 ] @indent.begin
 
-(assign_block "}" @indent.branch)
-(assign_block "}" @indent.end)
+(assign_block
+  "}" @indent.branch)
 
-(object "}" @indent.branch)
-(object "}" @indent.end)
+(assign_block
+  "}" @indent.end)
 
-(array "]" @indent.branch)
-(array "]" @indent.end)
+(object
+  "}" @indent.branch)
+
+(object
+  "}" @indent.end)
+
+(array
+  "]" @indent.branch)
+
+(array
+  "]" @indent.end)
diff --git a/queries/corn/locals.scm b/queries/corn/locals.scm
index 009d29202..7e78c4d23 100644
--- a/queries/corn/locals.scm
+++ b/queries/corn/locals.scm
@@ -1,16 +1,13 @@
 ; scopes
-
 [
   (object)
   (array)
 ] @local.scope
 
 ; definitions
-
-(assign_block 
+(assign_block
   (assignment
-    (input) 
-      @local.definition.constant))
-
-(value (input) @local.reference)
+    (input) @local.definition.constant))
 
+(value
+  (input) @local.reference)
diff --git a/queries/cpon/highlights.scm b/queries/cpon/highlights.scm
index 370c48b1b..531b3961f 100644
--- a/queries/cpon/highlights.scm
+++ b/queries/cpon/highlights.scm
@@ -1,6 +1,6 @@
 ; Literals
-
 (string) @string
+
 (escape_sequence) @string.escape
 
 (hex_blob
@@ -15,7 +15,8 @@
   "d" @character.special
   (_) @string.special)
 
-(_ key: (_) @label)
+(_
+  key: (_) @label)
 
 (number) @number
 
@@ -26,21 +27,28 @@
 (null) @constant.builtin
 
 ; Punctuation
-
 [
   ","
   ":"
 ] @punctuation.delimiter
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "<" ">" ] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
 (("\"" @string)
- (#set! conceal ""))
+  (#set! conceal ""))
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/cpon/injections.scm b/queries/cpon/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/cpon/injections.scm
+++ b/queries/cpon/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/cpon/locals.scm b/queries/cpon/locals.scm
index 8341b9725..2a4ba4712 100644
--- a/queries/cpon/locals.scm
+++ b/queries/cpon/locals.scm
@@ -1,6 +1,5 @@
 [
-  (document) 
-
+  (document)
   (meta_map)
   (map)
   (array)
diff --git a/queries/cpp/folds.scm b/queries/cpp/folds.scm
index 23d623b04..26a068a55 100644
--- a/queries/cpp/folds.scm
+++ b/queries/cpp/folds.scm
@@ -1,14 +1,13 @@
 ; 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)
+  (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
index 4919a1b3f..cb8f9c3f3 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: c
-
 ((identifier) @variable.member
   (#lua-match? @variable.member "^m_.*$"))
 
@@ -8,23 +7,24 @@
 
 ; function(Foo ...foo)
 (variadic_parameter_declaration
-  declarator: (variadic_declarator
-                (_) @variable.parameter))
+  declarator:
+    (variadic_declarator
+      (_) @variable.parameter))
+
 ; int foo = 0
 (optional_parameter_declaration
-    declarator: (_) @variable.parameter)
+  declarator: (_) @variable.parameter)
 
 ;(field_expression) @variable.parameter ;; How to highlight this?
-
 (((field_expression
-     (field_identifier) @function.method)) @_parent
- (#has-parent? @_parent template_method function_declarator))
+  (field_identifier) @function.method)) @_parent
+  (#has-parent? @_parent template_method function_declarator))
 
 (field_declaration
   (field_identifier) @variable.member)
 
 (field_initializer
- (field_identifier) @property)
+  (field_identifier) @property)
 
 (function_declarator
   declarator: (field_identifier) @function.method)
@@ -38,13 +38,25 @@
 (auto) @type.builtin
 
 (namespace_identifier) @module
+
 ((namespace_identifier) @type
   (#lua-match? @type "^[%u]"))
 
 (case_statement
-  value: (qualified_identifier (identifier) @constant))
+  value:
+    (qualified_identifier
+      (identifier) @constant))
 
-(using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @module)
+(using_declaration
+  .
+  "using"
+  .
+  "namespace"
+  .
+  [
+    (qualified_identifier)
+    (identifier)
+  ] @module)
 
 (destructor_name
   (identifier) @function.method)
@@ -53,15 +65,18 @@
 (function_declarator
   (qualified_identifier
     (identifier) @function))
+
 (function_declarator
   (qualified_identifier
     (qualified_identifier
       (identifier) @function)))
+
 (function_declarator
   (qualified_identifier
     (qualified_identifier
       (qualified_identifier
         (identifier) @function))))
+
 ((qualified_identifier
   (qualified_identifier
     (qualified_identifier
@@ -74,21 +89,26 @@
     (identifier) @function))
 
 (operator_name) @function
+
 "operator" @function
+
 "static_assert" @function.builtin
 
 (call_expression
   (qualified_identifier
     (identifier) @function.call))
+
 (call_expression
   (qualified_identifier
     (qualified_identifier
       (identifier) @function.call)))
+
 (call_expression
   (qualified_identifier
     (qualified_identifier
       (qualified_identifier
         (identifier) @function.call))))
+
 ((qualified_identifier
   (qualified_identifier
     (qualified_identifier
@@ -99,21 +119,25 @@
 (call_expression
   (template_function
     (identifier) @function.call))
+
 (call_expression
   (qualified_identifier
     (template_function
       (identifier) @function.call)))
+
 (call_expression
   (qualified_identifier
     (qualified_identifier
       (template_function
         (identifier) @function.call))))
+
 (call_expression
   (qualified_identifier
     (qualified_identifier
       (qualified_identifier
         (template_function
           (identifier) @function.call)))))
+
 ((qualified_identifier
   (qualified_identifier
     (qualified_identifier
@@ -126,12 +150,12 @@
 (function_declarator
   (template_method
     (field_identifier) @function.method))
+
 (call_expression
   (field_expression
     (field_identifier) @function.method.call))
 
 ; constructors
-
 ((function_declarator
   (qualified_identifier
     (identifier) @constructor))
@@ -139,93 +163,91 @@
 
 ((call_expression
   function: (identifier) @constructor)
-(#lua-match? @constructor "^%u"))
-((call_expression
-  function: (qualified_identifier
-              name: (identifier) @constructor))
-(#lua-match? @constructor "^%u"))
+  (#lua-match? @constructor "^%u"))
 
 ((call_expression
-  function: (field_expression
-              field: (field_identifier) @constructor))
-(#lua-match? @constructor "^%u"))
+  function:
+    (qualified_identifier
+      name: (identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
 
-;; constructing a type in an initializer list: Constructor ():  **SuperType (1)**
+((call_expression
+  function:
+    (field_expression
+      field: (field_identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
+
+; constructing a type in an initializer list: Constructor ():  **SuperType (1)**
 ((field_initializer
   (field_identifier) @constructor
   (argument_list))
- (#lua-match? @constructor "^%u"))
-
+  (#lua-match? @constructor "^%u"))
 
 ; Constants
-
 (this) @variable.builtin
-(null "nullptr" @constant.builtin)
+
+(null
+  "nullptr" @constant.builtin)
 
 (true) @boolean
+
 (false) @boolean
 
 ; Literals
-
-(raw_string_literal)  @string
+(raw_string_literal) @string
 
 ; Keywords
-
 [
- "try"
- "catch"
- "noexcept"
- "throw"
+  "try"
+  "catch"
+  "noexcept"
+  "throw"
 ] @keyword.exception
 
-
 [
- "class"
- "decltype"
- "explicit"
- "friend"
- "namespace"
- "override"
- "template"
- "typename"
- "using"
- "concept"
- "requires"
- "constexpr"
+  "class"
+  "decltype"
+  "explicit"
+  "friend"
+  "namespace"
+  "override"
+  "template"
+  "typename"
+  "using"
+  "concept"
+  "requires"
+  "constexpr"
 ] @keyword
 
-[
-  "co_await"
-] @keyword.coroutine
+"co_await" @keyword.coroutine
 
 [
- "co_yield"
- "co_return"
+  "co_yield"
+  "co_return"
 ] @keyword.coroutine.return
 
 [
- "public"
- "private"
- "protected"
- "virtual"
- "final"
+  "public"
+  "private"
+  "protected"
+  "virtual"
+  "final"
 ] @type.qualifier
 
 [
- "new"
- "delete"
-
- "xor"
- "bitand"
- "bitor"
- "compl"
- "not"
- "xor_eq"
- "and_eq"
- "or_eq"
- "not_eq"
- "and"
- "or"
+  "new"
+  "delete"
+  "xor"
+  "bitand"
+  "bitor"
+  "compl"
+  "not"
+  "xor_eq"
+  "and_eq"
+  "or_eq"
+  "not_eq"
+  "and"
+  "or"
 ] @keyword.operator
 
 "<=>" @operator
@@ -233,9 +255,15 @@
 "::" @punctuation.delimiter
 
 (template_argument_list
-  ["<" ">"] @punctuation.bracket)
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (template_parameter_list
-  ["<" ">"] @punctuation.bracket)
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (literal_suffix) @operator
diff --git a/queries/cpp/indents.scm b/queries/cpp/indents.scm
index 6faa6f144..be6826d6e 100644
--- a/queries/cpp/indents.scm
+++ b/queries/cpp/indents.scm
@@ -1,9 +1,7 @@
 ; inherits: c
-
-[
-  (condition_clause)
-] @indent.begin
+(condition_clause) @indent.begin
 
 ((field_initializer_list) @indent.begin
   (#set! indent.start_at_same_line 1))
+
 (access_specifier) @indent.branch
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 75f851367..2038347a2 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,8 +1,5 @@
 ((preproc_arg) @injection.content
- (#set! injection.language "cpp"))
-
-((comment) @injection.content 
- (#set! injection.language "comment"))
+  (#set! injection.language "cpp"))
 
 ((comment) @injection.content
   (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
index d8bb18c05..863f9de7d 100644
--- a/queries/cpp/locals.scm
+++ b/queries/cpp/locals.scm
@@ -1,12 +1,14 @@
 ; inherits: c
-
-;; Parameters
+; Parameters
 (variadic_parameter_declaration
-  declarator: (variadic_declarator
-                (identifier) @local.definition.parameter))
+  declarator:
+    (variadic_declarator
+      (identifier) @local.definition.parameter))
+
 (optional_parameter_declaration
   declarator: (identifier) @local.definition.parameter)
-;; Class / struct definitions
+
+; Class / struct definitions
 (class_specifier) @local.scope
 
 (reference_declarator
@@ -16,8 +18,9 @@
   (identifier) @local.definition.var)
 
 (struct_specifier
-  name: (qualified_identifier
-          name: (type_identifier) @local.definition.type))
+  name:
+    (qualified_identifier
+      name: (type_identifier) @local.definition.type))
 
 (class_specifier
   name: (type_identifier) @local.definition.type)
@@ -26,8 +29,9 @@
   name: (identifier) @local.definition.type)
 
 (class_specifier
-  name: (qualified_identifier
-          name: (type_identifier) @local.definition.type))
+  name:
+    (qualified_identifier
+      name: (type_identifier) @local.definition.type))
 
 (alias_declaration
   name: (type_identifier) @local.definition.type)
@@ -35,9 +39,10 @@
 ;template <typename T>
 (type_parameter_declaration
   (type_identifier) @local.definition.type)
+
 (template_declaration) @local.scope
 
-;; Namespaces
+; Namespaces
 (namespace_definition
   name: (namespace_identifier) @local.definition.namespace
   body: (_) @local.scope)
@@ -47,9 +52,9 @@
   body: (_) @local.scope)
 
 ((namespace_identifier) @local.reference
-                        (#set! reference.kind "namespace"))
+  (#set! reference.kind "namespace"))
 
-;; Function definitions
+; Function definitions
 (template_function
   name: (identifier) @local.definition.function) @local.scope
 
@@ -57,16 +62,18 @@
   name: (field_identifier) @local.definition.method) @local.scope
 
 (function_declarator
-  declarator: (qualified_identifier
-                name: (identifier) @local.definition.function)) @local.scope
+  declarator:
+    (qualified_identifier
+      name: (identifier) @local.definition.function)) @local.scope
 
 (field_declaration
-  declarator: (function_declarator
-                (field_identifier) @local.definition.method))
+  declarator:
+    (function_declarator
+      (field_identifier) @local.definition.method))
 
 (lambda_expression) @local.scope
 
-;; Control structures
+; Control structures
 (try_statement
   body: (_) @local.scope)
 
diff --git a/queries/css/folds.scm b/queries/css/folds.scm
index 9d2995c48..2c244d63f 100644
--- a/queries/css/folds.scm
+++ b/queries/css/folds.scm
@@ -1,3 +1 @@
-[
-  (rule_set)
-] @fold
+(rule_set) @fold
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index 8beba125f..506f78251 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -1,92 +1,99 @@
 [
- "@media"
- "@charset"
- "@namespace"
- "@supports"
- "@keyframes"
- (at_keyword)
- (to)
- (from)
- ] @keyword
+  "@media"
+  "@charset"
+  "@namespace"
+  "@supports"
+  "@keyframes"
+  (at_keyword)
+  (to)
+  (from)
+] @keyword
 
 "@import" @keyword.import
 
 (comment) @comment @spell
 
 [
- (tag_name)
- (nesting_selector)
- (universal_selector)
- ] @type
+  (tag_name)
+  (nesting_selector)
+  (universal_selector)
+] @type
 
 (function_name) @function
 
 [
- "~"
- ">"
- "+"
- "-"
- "*"
- "/"
- "="
- "^="
- "|="
- "~="
- "$="
- "*="
- ] @operator
+  "~"
+  ">"
+  "+"
+  "-"
+  "*"
+  "/"
+  "="
+  "^="
+  "|="
+  "~="
+  "$="
+  "*="
+] @operator
 
 [
- "and"
- "or"
- "not"
- "only"
- ] @keyword.operator
+  "and"
+  "or"
+  "not"
+  "only"
+] @keyword.operator
 
 (important) @type.qualifier
 
-(attribute_selector (plain_value) @string)
-(pseudo_element_selector "::" (tag_name) @property)
-(pseudo_class_selector (class_name) @property)
+(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
+  (class_name)
+  (id_name)
+  (property_name)
+  (feature_name)
+  (attribute_name)
+] @property
 
 (namespace_name) @module
 
 ((property_name) @type.definition
   (#lua-match? @type.definition "^[-][-]"))
+
 ((plain_value) @type
   (#lua-match? @type "^[-][-]"))
 
 [
- (string_value)
- (color_value)
- (unit)
- ] @string
+  (string_value)
+  (color_value)
+  (unit)
+] @string
 
 [
- (integer_value)
- (float_value)
- ] @number
+  (integer_value)
+  (float_value)
+] @number
 
 [
- "#"
- ","
- "."
- ":"
- "::"
- ";"
- ] @punctuation.delimiter
+  "#"
+  ","
+  "."
+  ":"
+  "::"
+  ";"
+] @punctuation.delimiter
 
 [
- "{"
- ")"
- "("
- "}"
- ] @punctuation.bracket
+  "{"
+  ")"
+  "("
+  "}"
+] @punctuation.bracket
diff --git a/queries/css/indents.scm b/queries/css/indents.scm
index cd22ed66c..8385bfc82 100644
--- a/queries/css/indents.scm
+++ b/queries/css/indents.scm
@@ -3,7 +3,9 @@
   (declaration)
 ] @indent.begin
 
-(block ("}") @indent.branch)
+(block
+  ("}") @indent.branch)
+
 ("}") @indent.dedent
 
 (comment) @indent.ignore
diff --git a/queries/css/injections.scm b/queries/css/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/css/injections.scm
+++ b/queries/css/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/csv/highlights.scm b/queries/csv/highlights.scm
index de2213aa1..94abe21cc 100644
--- a/queries/csv/highlights.scm
+++ b/queries/csv/highlights.scm
@@ -1,3 +1,2 @@
 ; inherits: tsv
-
 "," @punctuation.delimiter
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
index 0a90dbf67..0b2a13e49 100644
--- a/queries/cuda/highlights.scm
+++ b/queries/cuda/highlights.scm
@@ -1,6 +1,8 @@
 ; inherits: cpp
-
-[ "<<<" ">>>" ] @punctuation.bracket
+[
+  "<<<"
+  ">>>"
+] @punctuation.bracket
 
 [
   "__host__"
diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm
index 82aac968e..0259958c5 100644
--- a/queries/cuda/injections.scm
+++ b/queries/cuda/injections.scm
@@ -1,5 +1,5 @@
 ((preproc_arg) @injection.content
- (#set! injection.language "cuda"))
+  (#set! injection.language "cuda"))
 
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/cue/highlights.scm b/queries/cue/highlights.scm
index 47fd36311..3371bc33e 100644
--- a/queries/cue/highlights.scm
+++ b/queries/cue/highlights.scm
@@ -1,49 +1,41 @@
 ; Includes
-
 [
   "package"
   "import"
 ] @keyword.import
 
 ; Namespaces
-
 (package_identifier) @module
 
-(import_spec ["." "_"] @punctuation.special)
+(import_spec
+  [
+    "."
+    "_"
+  ] @punctuation.special)
 
 [
   (attr_path)
   (package_path)
-] @string.special.url ;; In attributes
+] @string.special.url ; In attributes
 
 ; Attributes
-
 (attribute) @attribute
 
 ; Conditionals
-
 "if" @keyword.conditional
 
 ; Repeats
+"for" @keyword.repeat
 
-[
-  "for"
-] @keyword.repeat
-
-(for_clause "_" @punctuation.special)
+(for_clause
+  "_" @punctuation.special)
 
 ; Keywords
+"let" @keyword
 
-[
-  "let"
-] @keyword
-
-[
-  "in"
-] @keyword.operator
+"in" @keyword.operator
 
 ; Operators
-
 [
   "+"
   "-"
@@ -66,34 +58,33 @@
 ] @operator
 
 ; Fields & Properties
-
-(field 
-  (label 
-  (identifier) @variable.member))
+(field
+  (label
+    (identifier) @variable.member))
 
 (selector_expression
   (_)
   (identifier) @property)
 
 ; Functions
-
 (call_expression
   function: (identifier) @function.call)
+
 (call_expression
-  function: (selector_expression
-  (_)
-  (identifier) @function.call))
+  function:
+    (selector_expression
+      (_)
+      (identifier) @function.call))
+
 (call_expression
   function: (builtin_function) @function.call)
 
 (builtin_function) @function.builtin
 
 ; Variables
-
 (identifier) @variable
 
 ; Types
-
 (primitive_type) @type.builtin
 
 ((identifier) @type
@@ -102,22 +93,33 @@
 [
   (slice_type)
   (pointer_type)
-] @type ;; In attributes
+] @type ; In attributes
 
 ; Punctuation
-
 [
   ","
   ":"
 ] @punctuation.delimiter
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "<" ">" ] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
 [
   (ellipsis)
@@ -125,7 +127,6 @@
 ] @punctuation.special
 
 ; Literals
-
 (string) @string
 
 [
@@ -150,11 +151,15 @@
 ] @constant.builtin
 
 ; Interpolations
+(interpolation
+  "\\(" @punctuation.special
+  (_)
+  ")" @punctuation.special) @none
 
-(interpolation "\\(" @punctuation.special (_) ")" @punctuation.special) @none
-
-(interpolation "\\(" (identifier) @variable ")")
+(interpolation
+  "\\("
+  (identifier) @variable
+  ")")
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/cue/indents.scm b/queries/cue/indents.scm
index 71a03a778..cef2345cc 100644
--- a/queries/cue/indents.scm
+++ b/queries/cue/indents.scm
@@ -9,11 +9,20 @@
   ")"
 ] @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/cue/injections.scm b/queries/cue/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/cue/injections.scm
+++ b/queries/cue/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/cue/locals.scm b/queries/cue/locals.scm
index bdc4a56a2..9c5a7378e 100644
--- a/queries/cue/locals.scm
+++ b/queries/cue/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (source_file)
   (field)
@@ -7,17 +6,15 @@
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
-
 (import_spec
   path: (string) @local.definition.import)
 
 (field
   (label
-  (identifier) @local.definition.field))
+    (identifier) @local.definition.field))
 
 (package_identifier) @local.definition.namespace
 
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
index 18ced7246..2b63dd48c 100644
--- a/queries/d/highlights.scm
+++ b/queries/d/highlights.scm
@@ -1,5 +1,4 @@
-;; Misc
-
+; Misc
 [
   (line_comment)
   (block_comment)
@@ -8,6 +7,7 @@
 
 ((line_comment) @comment.documentation
   (#lua-match? @comment.documentation "^///[^/]"))
+
 ((line_comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
@@ -18,9 +18,12 @@
   (#lua-match? @comment.documentation "^/[+][+][^+].*[+]/$"))
 
 [
-  "(" ")"
-  "[" "]"
-  "{" "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 [
@@ -35,8 +38,7 @@
   "$"
 ] @punctuation.special
 
-;; Constants
-
+; Constants
 [
   "__FILE_FULL_PATH__"
   "__FILE__"
@@ -66,11 +68,9 @@
   "false"
 ] @boolean
 
-;; Functions
-
+; Functions
 (func_declarator
-  (identifier) @function
-)
+  (identifier) @function)
 
 [
   "__traits"
@@ -83,29 +83,22 @@
 ] @function.builtin
 
 (import_expression
-  "import" @function.builtin
-)
+  "import" @function.builtin)
 
 (parameter
   (var_declarator
-    (identifier) @variable.parameter
-  )
-)
+    (identifier) @variable.parameter))
 
 (function_literal
-  (identifier) @variable.parameter
-)
+  (identifier) @variable.parameter)
 
 (constructor
-  "this" @constructor
-)
+  "this" @constructor)
 
 (destructor
-  "this" @constructor
-)
-
-;; Keywords
+  "this" @constructor)
 
+; Keywords
 [
   "case"
   "default"
@@ -238,51 +231,45 @@
 ] @type.qualifier
 
 (alias_assignment
-  . (identifier) @type.definition)
+  .
+  (identifier) @type.definition)
 
 (module_declaration
-  "module" @keyword.import
-)
+  "module" @keyword.import)
 
 (import_declaration
-  "import" @keyword.import
-)
+  "import" @keyword.import)
 
 (type) @type
 
 (catch_parameter
-  (qualified_identifier) @type
-)
+  (qualified_identifier) @type)
 
 (var_declarations
-  (qualified_identifier) @type
-)
+  (qualified_identifier) @type)
 
 (func_declaration
-  (qualified_identifier) @type
-)
+  (qualified_identifier) @type)
 
 (parameter
-  (qualified_identifier) @type
-)
+  (qualified_identifier) @type)
 
 (class_declaration
-  (identifier) @type
-)
+  (identifier) @type)
 
 (fundamental_type) @type.builtin
 
-(module_fully_qualified_name (packages (package_name) @module))
+(module_fully_qualified_name
+  (packages
+    (package_name) @module))
+
 (module_name) @module
 
 (at_attribute) @attribute
 
 (user_defined_attribute
-  "@" @attribute
-)
-
-;; Variables
+  "@" @attribute)
 
+; Variables
 (primary_expression
-  "this" @variable.builtin
-)
+  "this" @variable.builtin)
diff --git a/queries/d/indents.scm b/queries/d/indents.scm
index 9ced7527d..81624cabd 100644
--- a/queries/d/indents.scm
+++ b/queries/d/indents.scm
@@ -5,9 +5,12 @@
 ] @indent.begin
 
 [
-  "(" ")"
-  "{" "}"
-  "[" "]"
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
 ] @indent.branch
 
 [
diff --git a/queries/d/injections.scm b/queries/d/injections.scm
index 6dd8aeacf..7437b932b 100644
--- a/queries/d/injections.scm
+++ b/queries/d/injections.scm
@@ -2,8 +2,8 @@
   (line_comment)
   (block_comment)
   (nesting_block_comment)
- ] @injection.content
- (#set! injection.language "comment")) 
+] @injection.content
+  (#set! injection.language "comment"))
 
 ((token_string_tokens) @injection.content
- (#set! injection.language "d"))
+  (#set! injection.language "d"))
diff --git a/queries/dart/folds.scm b/queries/dart/folds.scm
index ea398a4b3..8dc4e7815 100644
--- a/queries/dart/folds.scm
+++ b/queries/dart/folds.scm
@@ -2,13 +2,10 @@
   (class_definition)
   (enum_declaration)
   (extension_declaration)
-
   (arguments)
   (function_body)
-
   (block)
   (switch_block)
-
   (list_literal)
   (set_or_map_literal)
   (string_literal)
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index be2824da5..de81cbc0b 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -1,18 +1,21 @@
 (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)
+(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 (#lua-match? @function "^_?[%l]"))
-  . (selector . (argument_part))) @function
+(((identifier) @function
+  (#lua-match? @function "^_?[%l]")).
+(selector
+  .
+  (argument_part))) @function
 
 ; Annotations
 ; --------------------
@@ -24,38 +27,36 @@
 (template_substitution
   "$" @punctuation.special
   "{" @punctuation.special
-  "}" @punctuation.special
-) @none
+  "}" @punctuation.special) @none
 
 (template_substitution
   "$" @punctuation.special
-  (identifier_dollar_escaped) @variable
-) @none
+  (identifier_dollar_escaped) @variable) @none
 
 (escape_sequence) @string.escape
 
 [
- "@"
- "=>"
- ".."
- "??"
- "=="
- "?"
- ":"
- "&&"
- "%"
- "<"
- ">"
- "="
- ">="
- "<="
- "||"
- (multiplicative_operator)
- (increment_operator)
- (is_operator)
- (prefix_operator)
- (equality_operator)
- (additive_operator)
+  "@"
+  "=>"
+  ".."
+  "??"
+  "=="
+  "?"
+  ":"
+  "&&"
+  "%"
+  "<"
+  ">"
+  "="
+  ">="
+  "<="
+  "||"
+  (multiplicative_operator)
+  (increment_operator)
+  (is_operator)
+  (prefix_operator)
+  (equality_operator)
+  (additive_operator)
 ] @operator
 
 [
@@ -65,7 +66,7 @@
   "]"
   "{"
   "}"
-]  @punctuation.bracket
+] @punctuation.bracket
 
 ; Delimiters
 ; --------------------
@@ -79,26 +80,34 @@
 ; --------------------
 (class_definition
   name: (identifier) @type)
+
 (constructor_signature
   name: (identifier) @type)
+
 (scoped_identifier
   scope: (identifier) @type)
+
 (function_signature
   name: (identifier) @function.method)
+
 (getter_signature
   (identifier) @function.method)
+
 (setter_signature
   name: (identifier) @function.method)
+
 (enum_declaration
   name: (identifier) @type)
+
 (enum_constant
   name: (identifier) @type)
+
 (void_type) @type
 
 ((scoped_identifier
   scope: (identifier) @type
   name: (identifier) @type)
- (#lua-match? @type "^[%u%l]"))
+  (#lua-match? @type "^[%u%l]"))
 
 (type_identifier) @type
 
@@ -111,7 +120,7 @@
 (inferred_type) @keyword
 
 ((identifier) @type
- (#lua-match? @type "^_?[%u].*[%l]")) ; catch Classes or IClasses not CLASSES
+  (#lua-match? @type "^_?[%u].*[%l]")) ; catch Classes or IClasses not CLASSES
 
 ("Function" @type)
 
@@ -131,29 +140,35 @@
 ; Parameters
 ; --------------------
 (formal_parameter
-    name: (identifier) @variable.parameter)
+  name: (identifier) @variable.parameter)
 
 (named_argument
-  (label (identifier) @variable.parameter))
+  (label
+    (identifier) @variable.parameter))
 
 ; Literals
 ; --------------------
 [
-    (hex_integer_literal)
-    (decimal_integer_literal)
-    (decimal_floating_point_literal)
-    ; TODO: inaccessible nodes
-    ; (octal_integer_literal)
-    ; (hex_floating_point_literal)
+  (hex_integer_literal)
+  (decimal_integer_literal)
+  (decimal_floating_point_literal)
+  ; TODO: inaccessible nodes
+  ; (octal_integer_literal)
+  ; (hex_floating_point_literal)
 ] @number
 
 (symbol_literal) @string.special.symbol
+
 (string_literal) @string
+
 (true) @boolean
+
 (false) @boolean
+
 (null_literal) @constant.builtin
 
 (comment) @comment @spell
+
 (documentation_comment) @comment.documentation @spell
 
 ; Keywords
@@ -169,47 +184,44 @@
 
 ; 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"
+  ; 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"
-] @keyword.return
-
+"return" @keyword.return
 
 ; Built in identifiers:
 ; alone these are marked as keywords
 [
-    "deferred"
-    "factory"
-    "get"
-    "implements"
-    "interface"
-    "library"
-    "operator"
-    "mixin"
-    "part"
-    "set"
-    "typedef"
+  "deferred"
+  "factory"
+  "get"
+  "implements"
+  "interface"
+  "library"
+  "operator"
+  "mixin"
+  "part"
+  "set"
+  "typedef"
 ] @keyword
 
 [
@@ -221,43 +233,28 @@
 ] @keyword.coroutine
 
 [
-    (const_builtin)
-    (final_builtin)
-    "abstract"
-    "covariant"
-    "dynamic"
-    "external"
-    "static"
-    "final"
-    "base"
-    "sealed"
+  (const_builtin)
+  (final_builtin)
+  "abstract"
+  "covariant"
+  "dynamic"
+  "external"
+  "static"
+  "final"
+  "base"
+  "sealed"
 ] @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"))
+  (#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"] @keyword.conditional
+[
+  "if"
+  "else"
+  "switch"
+  "default"
+] @keyword.conditional
 
 [
   "try"
@@ -267,4 +264,9 @@
   (break_statement)
 ] @keyword.exception
 
-["do" "while" "continue" "for"] @keyword.repeat
+[
+  "do"
+  "while"
+  "continue"
+  "for"
+] @keyword.repeat
diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index 87befcf6c..8da3ebb14 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -2,7 +2,8 @@
   (class_body)
   (function_body)
   (function_expression_body)
-  (declaration (initializers))
+  (declaration
+    (initializers))
   (switch_block)
   (if_statement)
   (formal_parameter_list)
@@ -32,14 +33,16 @@
   "]"
 ] @indent.branch
 
-[
- "}"
-] @indent.end
+"}" @indent.end
 
-(return_statement ";" @indent.end)
-(break_statement ";" @indent.end)
+(return_statement
+  ";" @indent.end)
+
+(break_statement
+  ";" @indent.end)
 
 ; this one is for dedenting the else block
-(if_statement (block) @indent.branch)
+(if_statement
+  (block) @indent.branch)
 
 (comment) @indent.ignore
diff --git a/queries/dart/injections.scm b/queries/dart/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/dart/injections.scm
+++ b/queries/dart/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/dart/locals.scm b/queries/dart/locals.scm
index f7faa26ac..3e3beb58e 100644
--- a/queries/dart/locals.scm
+++ b/queries/dart/locals.scm
@@ -1,5 +1,4 @@
-;; Definitions
-
+; Definitions
 (function_signature
   name: (identifier) @local.definition.function)
 
@@ -15,20 +14,19 @@
 (static_final_declaration
   (identifier) @local.definition.var)
 
-;; References
-
+; References
 (identifier) @local.reference
 
-;; Scopes
-
+; Scopes
 (class_definition
   body: (_) @local.scope)
+
 [
- (block)
- (if_statement)
- (for_statement)
- (while_statement)
- (try_statement)
- (catch_clause)
- (finally_clause)
+  (block)
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (try_statement)
+  (catch_clause)
+  (finally_clause)
 ] @local.scope
diff --git a/queries/devicetree/highlights.scm b/queries/devicetree/highlights.scm
index 6236189bf..a81cf2c89 100644
--- a/queries/devicetree/highlights.scm
+++ b/queries/devicetree/highlights.scm
@@ -6,6 +6,7 @@
 ] @keyword.import
 
 (preproc_def) @constant.macro
+
 (preproc_function_def) @function.macro
 
 [
@@ -22,14 +23,39 @@
 (integer_literal) @number
 
 (identifier) @variable
-(node (identifier) @module)
-(property (identifier) @property)
-(labeled_item (identifier) @label)
-(call_expression (identifier) @function.macro)
+
+(node
+  (identifier) @module)
+
+(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/queries/devicetree/indents.scm b/queries/devicetree/indents.scm
index 6cfc81cf2..9740060ca 100644
--- a/queries/devicetree/indents.scm
+++ b/queries/devicetree/indents.scm
@@ -9,6 +9,4 @@
   ">"
 ] @indent.branch
 
-[
-  (comment)
-] @indent.ignore
+(comment) @indent.ignore
diff --git a/queries/devicetree/injections.scm b/queries/devicetree/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/devicetree/injections.scm
+++ b/queries/devicetree/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/devicetree/locals.scm b/queries/devicetree/locals.scm
index 88b266ec2..e33a81dfd 100644
--- a/queries/devicetree/locals.scm
+++ b/queries/devicetree/locals.scm
@@ -1,4 +1,4 @@
 [
   (node)
   (integer_cells)
-]@local.scope
+] @local.scope
diff --git a/queries/dhall/folds.scm b/queries/dhall/folds.scm
index 305079aa8..bc92797b4 100644
--- a/queries/dhall/folds.scm
+++ b/queries/dhall/folds.scm
@@ -1,14 +1,10 @@
 [
   (let_binding)
-
   (application_expression)
   (lambda_expression)
-
   (record_type)
   (union_type)
-
   (list_literal)
   (record_literal)
-
   (block_comment)
 ] @fold
diff --git a/queries/dhall/highlights.scm b/queries/dhall/highlights.scm
index 5e2a77848..efd7fedf2 100644
--- a/queries/dhall/highlights.scm
+++ b/queries/dhall/highlights.scm
@@ -1,7 +1,5 @@
-;; Text
-
-;; Imports
-
+; Text
+; Imports
 (missing_import) @keyword.import
 
 (local_import) @string.special.path
@@ -13,47 +11,55 @@
   (import_hash)
 ] @string.special
 
-[ (import_as_location) (import_as_text) ] @type
-
-;; Types
+[
+  (import_as_location)
+  (import_as_text)
+] @type
 
+; Types
 ([
-  (let_binding (label) @type)
-  (union_type_entry (label) @type)
-] (#lua-match? @type "^%u"))
+  (let_binding
+    (label) @type)
+  (union_type_entry
+    (label) @type)
+]
+  (#lua-match? @type "^%u"))
 
 ((primitive_expression
-  (identifier (label) @type)
-  (selector (label) @type)) @variable
+  (identifier
+    (label) @type)
+  (selector
+    (label) @type)) @variable
   (#lua-match? @variable "^[A-Z][^.]*$"))
 
-;; Parameters
-
-(lambda_expression label: (label) @variable.parameter)
-
-;; Variables
+; Parameters
+(lambda_expression
+  label: (label) @variable.parameter)
 
+; Variables
 (label) @variable
 
-(identifier [
-  (label) @variable
-  (de_bruijn_index) @operator
-])
+(identifier
+  [
+    (label) @variable
+    (de_bruijn_index) @operator
+  ])
 
-(let_binding label: (label) @variable)
+(let_binding
+  label: (label) @variable)
 
 ; Fields
+(record_literal_entry
+  (label) @variable.member)
 
-(record_literal_entry (label) @variable.member)
-
-(record_type_entry (label) @variable.member)
+(record_type_entry
+  (label) @variable.member)
 
 (selector
   (selector_dot)
   (_) @variable.member)
 
-;; Keywords
-
+; Keywords
 (env_import) @keyword
 
 [
@@ -68,8 +74,7 @@
   "with"
 ] @keyword.operator
 
-;; Operators
-
+; Operators
 [
   (type_operator)
   (assign_operator)
@@ -82,71 +87,88 @@
   (empty_record_literal)
 ] @operator
 
-;; Builtins
-
+; Builtins
 (builtin_function) @function.builtin
-(builtin [
-  "Natural"
-  "Natural/build"
-  "Natural/fold"
-  "Natural/isZero"
-  "Natural/even"
-  "Natural/odd"
-  "Natural/subtract"
-  "Natural/toInteger"
-  "Natural/show"
-  "Integer"
-  "Integer/toDouble"
-  "Integer/show"
-  "Integer/negate"
-  "Integer/clamp"
-  "Double"
-  "Double/show"
-  "List"
-  "List/build"
-  "List/fold"
-  "List/length"
-  "List/head"
-  "List/last"
-  "List/indexed"
-  "List/reverse"
-  "Text"
-  "Text/show"
-  "Text/replace"
-  "Optional"
-  "Date"
-  "Time"
-  "TimeZone"
-  "Type"
-  "Kind"
-  "Sort"
-] @type.builtin)
 
-;; Punctuation
+(builtin
+  [
+    "Natural"
+    "Natural/build"
+    "Natural/fold"
+    "Natural/isZero"
+    "Natural/even"
+    "Natural/odd"
+    "Natural/subtract"
+    "Natural/toInteger"
+    "Natural/show"
+    "Integer"
+    "Integer/toDouble"
+    "Integer/show"
+    "Integer/negate"
+    "Integer/clamp"
+    "Double"
+    "Double/show"
+    "List"
+    "List/build"
+    "List/fold"
+    "List/length"
+    "List/head"
+    "List/last"
+    "List/indexed"
+    "List/reverse"
+    "Text"
+    "Text/show"
+    "Text/replace"
+    "Optional"
+    "Date"
+    "Time"
+    "TimeZone"
+    "Type"
+    "Kind"
+    "Sort"
+  ] @type.builtin)
+
+; Punctuation
+[
+  ","
+  "|"
+] @punctuation.delimiter
 
-[ "," "|" ] @punctuation.delimiter
 (selector_dot) @punctuation.delimiter
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "<" ">" ] @punctuation.bracket
-
-;; Conditionals
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
+; Conditionals
 [
   "if"
   "then"
   "else"
 ] @keyword.conditional
 
-;; Literals
-
+; Literals
 (text_literal) @string
-(interpolation "}" @string)
+
+(interpolation
+  "}" @string)
+
 [
   (double_quote_escaped)
   (single_quote_escaped)
@@ -161,10 +183,10 @@
 
 (boolean_literal) @boolean
 
-(builtin "None") @constant.builtin
-
-;; Comments
+(builtin
+  "None") @constant.builtin
 
+; Comments
 [
   (line_comment)
   (block_comment)
diff --git a/queries/dhall/injections.scm b/queries/dhall/injections.scm
index 43ae7287b..3cd6aac8e 100644
--- a/queries/dhall/injections.scm
+++ b/queries/dhall/injections.scm
@@ -1,5 +1,5 @@
 ([
   (line_comment)
   (block_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/diff/highlights.scm b/queries/diff/highlights.scm
index 4288913d9..d8e600882 100644
--- a/queries/diff/highlights.scm
+++ b/queries/diff/highlights.scm
@@ -1,6 +1,15 @@
-[(addition) (new_file)] @diff.plus
-[(deletion) (old_file)] @diff.minus
+[
+  (addition)
+  (new_file)
+] @diff.plus
+
+[
+  (deletion)
+  (old_file)
+] @diff.minus
 
 (commit) @constant
+
 (location) @attribute
+
 (command) @function
diff --git a/queries/dockerfile/highlights.scm b/queries/dockerfile/highlights.scm
index 592e70423..762e34426 100644
--- a/queries/dockerfile/highlights.scm
+++ b/queries/dockerfile/highlights.scm
@@ -41,17 +41,19 @@
     "$"
     "{"
     "}"
-  ] @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)
diff --git a/queries/dockerfile/injections.scm b/queries/dockerfile/injections.scm
index 0eb9ffdf2..0304f982e 100644
--- a/queries/dockerfile/injections.scm
+++ b/queries/dockerfile/injections.scm
@@ -1,6 +1,6 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
 
-((shell_command) @injection.content 
- (#set! injection.language "bash")
- (#set! injection.include-children))
+((shell_command) @injection.content
+  (#set! injection.language "bash")
+  (#set! injection.include-children))
diff --git a/queries/dot/highlights.scm b/queries/dot/highlights.scm
index f204ce44c..7919e87f5 100644
--- a/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -10,6 +10,7 @@
 ] @keyword
 
 (string_literal) @string
+
 (number_literal) @number
 
 [
@@ -32,19 +33,19 @@
 ] @punctuation.bracket
 
 (subgraph
-  id: (id
-    (identifier) @module)
-)
+  id:
+    (id
+      (identifier) @module))
 
 (attribute
-  name: (id
-    (identifier) @variable.member)
-)
+  name:
+    (id
+      (identifier) @variable.member))
 
 (attribute
-  value: (id
-    (identifier) @constant)
-)
+  value:
+    (id
+      (identifier) @constant))
 
 (comment) @comment
 
diff --git a/queries/dot/injections.scm b/queries/dot/injections.scm
index ac41393ab..4fe39a8ba 100644
--- a/queries/dot/injections.scm
+++ b/queries/dot/injections.scm
@@ -1,5 +1,5 @@
-((html_internal) @injection.content 
- (#set! injection.language "html"))
+((html_internal) @injection.content
+  (#set! injection.language "html"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
index fadcdfa80..e3e26881e 100644
--- a/queries/doxygen/highlights.scm
+++ b/queries/doxygen/highlights.scm
@@ -9,11 +9,12 @@
 (identifier) @variable
 
 ((tag
-  (tag_name) @_param 
+  (tag_name) @_param
   (identifier) @variable.parameter)
   (#any-of? @_param "@param" "\\param"))
 
-(function (identifier) @function)
+(function
+  (identifier) @function)
 
 (function_link) @function
 
@@ -48,6 +49,13 @@
   (code_block_end)
 ] @punctuation.delimiter
 
-[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
 
 (code_block_content) @none
diff --git a/queries/doxygen/injections.scm b/queries/doxygen/injections.scm
index 8353dfd7a..e0eff433a 100644
--- a/queries/doxygen/injections.scm
+++ b/queries/doxygen/injections.scm
@@ -1,7 +1,10 @@
 ((type) @injection.content
   (#set! injection.parent))
 
-([ (function_link) (code) ] @injection.content
+([
+  (function_link)
+  (code)
+] @injection.content
   (#set! injection.parent))
 
 ((link) @injection.content
diff --git a/queries/dtd/folds.scm b/queries/dtd/folds.scm
index ba7ea121b..b1bce4ffb 100644
--- a/queries/dtd/folds.scm
+++ b/queries/dtd/folds.scm
@@ -1,4 +1,4 @@
 [
-   (conditionalSect)
-   (Comment)
+  (conditionalSect)
+  (Comment)
 ] @fold
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index fac7d923c..12a2093d1 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -1,80 +1,95 @@
-;; XML declaration
+; XML declaration
+(XMLDecl
+  "xml" @keyword.directive)
 
-(XMLDecl "xml" @keyword.directive)
+(XMLDecl
+  [
+    "version"
+    "encoding"
+  ] @tag.attribute)
 
-(XMLDecl [ "version" "encoding" ] @tag.attribute)
+(XMLDecl
+  (EncName) @string.special)
 
-(XMLDecl (EncName) @string.special)
-
-(XMLDecl (VersionNum) @number)
-
-;; Processing instructions
+(XMLDecl
+  (VersionNum) @number)
 
+; Processing instructions
 (PI) @keyword.directive
 
-;; Element declaration
-
+; Element declaration
 (elementdecl
   "ELEMENT" @keyword.directive.define
   (Name) @tag)
 
 (contentspec
-  (_ (Name) @tag.attribute))
+  (_
+    (Name) @tag.attribute))
 
 "#PCDATA" @type.builtin
 
-[ "EMPTY" "ANY" ] @type.qualifier
+[
+  "EMPTY"
+  "ANY"
+] @type.qualifier
 
-[ "*" "?" "+" ] @character.special
-
-;; Entity declaration
+[
+  "*"
+  "?"
+  "+"
+] @character.special
 
+; Entity declaration
 (GEDecl
   "ENTITY" @keyword.directive.define
   (Name) @constant)
 
-(GEDecl (EntityValue) @string)
+(GEDecl
+  (EntityValue) @string)
 
 (NDataDecl
   "NDATA" @keyword
   (Name) @label)
 
-;; Parsed entity declaration
-
+; Parsed entity declaration
 (PEDecl
   "ENTITY" @keyword.directive.define
   "%" @operator
   (Name) @function.macro)
 
-(PEDecl (EntityValue) @string)
-
-;; Notation declaration
+(PEDecl
+  (EntityValue) @string)
 
+; Notation declaration
 (NotationDecl
   "NOTATION" @keyword.directive
   (Name) @label)
 
 ((NotationDecl
   (ExternalID
-    (SystemLiteral (URI) @string.special.url))
- (#set! "priority" 105)))
-
-;; Attlist declaration
+    (SystemLiteral
+      (URI) @string.special.url))
+  (#set! "priority" 105)))
 
+; Attlist declaration
 (AttlistDecl
   "ATTLIST" @keyword.directive.define
   (Name) @tag)
 
-(AttDef (Name) @tag.attribute)
+(AttDef
+  (Name) @tag.attribute)
 
-(AttDef (Enumeration (Nmtoken) @string))
+(AttDef
+  (Enumeration
+    (Nmtoken) @string))
 
 [
   (StringType)
   (TokenizedType)
 ] @type.builtin
 
-(NotationType "NOTATION" @type.builtin)
+(NotationType
+  "NOTATION" @type.builtin)
 
 [
   "#REQUIRED"
@@ -82,38 +97,57 @@
   "#FIXED"
 ] @attribute
 
-;; Entities
-
+; Entities
 (EntityRef) @constant
 
 ((EntityRef) @constant.builtin
- (#any-of? @constant.builtin
-   "&amp;" "&lt;" "&gt;" "&quot;" "&apos;"))
+  (#any-of? @constant.builtin "&amp;" "&lt;" "&gt;" "&quot;" "&apos;"))
 
 (CharRef) @character
 
 (PEReference) @function.macro
 
-;; External references
-
-[ "PUBLIC" "SYSTEM" ] @keyword
+; External references
+[
+  "PUBLIC"
+  "SYSTEM"
+] @keyword
 
 (PubidLiteral) @string.special
 
-(SystemLiteral (URI) @string.special.url)
+(SystemLiteral
+  (URI) @string.special.url)
 
-;; Delimiters & punctuation
+; Delimiters & punctuation
+[
+  "<?"
+  "?>"
+  "<!"
+  ">"
+  "]]>"
+] @tag.delimiter
 
-[ "<?" "?>" "<!" ">" "]]>" ] @tag.delimiter
+[
+  "("
+  ")"
+  "["
+] @punctuation.bracket
 
-[ "(" ")" "[" ] @punctuation.bracket
+[
+  "\""
+  "'"
+] @punctuation.delimiter
 
-[ "\"" "'" ] @punctuation.delimiter
+[
+  ","
+  "|"
+  "="
+] @operator
 
-[ "," "|" "=" ] @operator
-
-;; Misc
-
-[ "INCLUDE" "IGNORE" ] @keyword.import
+; Misc
+[
+  "INCLUDE"
+  "IGNORE"
+] @keyword.import
 
 (Comment) @comment @spell
diff --git a/queries/dtd/locals.scm b/queries/dtd/locals.scm
index 6f64c6791..88246c04a 100644
--- a/queries/dtd/locals.scm
+++ b/queries/dtd/locals.scm
@@ -1,7 +1,11 @@
-(elementdecl (Name) @local.definition.type)
+(elementdecl
+  (Name) @local.definition.type)
 
 (elementdecl
   (contentspec
-    (children (Name) @local.reference)))
+    (children
+      (Name) @local.reference)))
 
-(AttlistDecl . (Name) @local.reference)
+(AttlistDecl
+  .
+  (Name) @local.reference)
diff --git a/queries/ebnf/highlights.scm b/queries/ebnf/highlights.scm
index b0dfa2737..8715091b1 100644
--- a/queries/ebnf/highlights.scm
+++ b/queries/ebnf/highlights.scm
@@ -1,4 +1,4 @@
-;;;; Simple tokens ;;;;
+; Simple tokens ;;;;
 (terminal) @string.grammar
 
 (special_sequence) @string.special.grammar
@@ -7,37 +7,36 @@
 
 (comment) @comment @spell
 
-;;;; Identifiers ;;;;
-
+; Identifiers ;;;;
 ; Allow different highlighting for specific casings
 ((identifier) @type
- (#lua-match? @type "^%u"))
+  (#lua-match? @type "^%u"))
 
 ((identifier) @string.special.symbol
- (#lua-match? @string.special.symbol "^%l"))
+  (#lua-match? @string.special.symbol "^%l"))
 
 ((identifier) @constant
- (#lua-match? @constant "^%u[%u%d_]+$"))
+  (#lua-match? @constant "^%u[%u%d_]+$"))
 
-;;; Punctuation ;;;;
+; Punctuation ;;;;
 [
- ";"
- ","
+  ";"
+  ","
 ] @punctuation.delimiter
 
 [
- "|"
- "*"
- "-"
+  "|"
+  "*"
+  "-"
 ] @operator
 
 "=" @keyword.operator
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index b6fd64668..223198410 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -1,92 +1,60 @@
 ; 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
+  name:
+    (object_pattern
+      (shorthand_property_identifier_pattern))) @variable
 
 ; Special identifiers
 ;--------------------
-
 ((identifier) @type
- (#lua-match? @type "^[A-Z]"))
+  (#lua-match? @type "^[A-Z]"))
 
 ((identifier) @constant
- (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
+  (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
 
 ((shorthand_property_identifier) @constant
- (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
+  (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
 
 ((identifier) @variable.builtin
- (#any-of? @variable.builtin
-           "arguments"
-           "module"
-           "console"
-           "window"
-           "document"))
+  (#any-of? @variable.builtin "arguments" "module" "console" "window" "document"))
 
 ((identifier) @type.builtin
- (#any-of? @type.builtin
-           "Object"
-           "Function"
-           "Boolean"
-           "Symbol"
-           "Number"
-           "Math"
-           "Date"
-           "String"
-           "RegExp"
-           "Map"
-           "Set"
-           "WeakMap"
-           "WeakSet"
-           "Promise"
-           "Array"
-           "Int8Array"
-           "Uint8Array"
-           "Uint8ClampedArray"
-           "Int16Array"
-           "Uint16Array"
-           "Int32Array"
-           "Uint32Array"
-           "Float32Array"
-           "Float64Array"
-           "ArrayBuffer"
-           "DataView"
-           "Error"
-           "EvalError"
-           "InternalError"
-           "RangeError"
-           "ReferenceError"
-           "SyntaxError"
-           "TypeError"
-           "URIError"))
+  (#any-of? @type.builtin "Object" "Function" "Boolean" "Symbol" "Number" "Math" "Date" "String" "RegExp" "Map" "Set" "WeakMap" "WeakSet" "Promise" "Array" "Int8Array" "Uint8Array" "Uint8ClampedArray" "Int16Array" "Uint16Array" "Int32Array" "Uint32Array" "Float32Array" "Float64Array" "ArrayBuffer" "DataView" "Error" "EvalError" "InternalError" "RangeError" "ReferenceError" "SyntaxError" "TypeError" "URIError"))
 
 ; 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)] @function.method)
+  name:
+    [
+      (property_identifier)
+      (private_property_identifier)
+    ] @function.method)
+
 (method_definition
   name: (property_identifier) @constructor
   (#eq? @constructor "constructor"))
@@ -94,22 +62,27 @@
 (pair
   key: (property_identifier) @function.method
   value: (function))
+
 (pair
   key: (property_identifier) @function.method
   value: (arrow_function))
 
 (assignment_expression
-  left: (member_expression
-    property: (property_identifier) @function.method)
+  left:
+    (member_expression
+      property: (property_identifier) @function.method)
   right: (arrow_function))
+
 (assignment_expression
-  left: (member_expression
-    property: (property_identifier) @function.method)
+  left:
+    (member_expression
+      property: (property_identifier) @function.method)
   right: (function))
 
 (variable_declarator
   name: (identifier) @function
   value: (arrow_function))
+
 (variable_declarator
   name: (identifier) @function
   value: (function))
@@ -117,42 +90,35 @@
 (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)] @function.method.call))
+  function:
+    (member_expression
+      property:
+        [
+          (property_identifier)
+          (private_property_identifier)
+        ] @function.method.call))
 
 ; Builtins
 ;---------
-
 ((identifier) @module.builtin
- (#eq? @module.builtin "Intl"))
+  (#eq? @module.builtin "Intl"))
 
 ((identifier) @function.builtin
- (#any-of? @function.builtin
-           "eval"
-           "isFinite"
-           "isNaN"
-           "parseFloat"
-           "parseInt"
-           "decodeURI"
-           "decodeURIComponent"
-           "encodeURI"
-           "encodeURIComponent"
-           "require"))
+  (#any-of? @function.builtin "eval" "isFinite" "isNaN" "parseFloat" "parseInt" "decodeURI" "decodeURIComponent" "encodeURI" "encodeURIComponent" "require"))
 
 ; Constructor
 ;------------
-
 (new_expression
   constructor: (identifier) @constructor)
 
@@ -163,19 +129,24 @@
 
 ; Decorators
 ;----------
-(decorator "@" @attribute (identifier) @attribute)
-(decorator "@" @attribute (call_expression (identifier) @attribute))
+(decorator
+  "@" @attribute
+  (identifier) @attribute)
+
+(decorator
+  "@" @attribute
+  (call_expression
+    (identifier) @attribute))
 
 ; Literals
 ;---------
-
 [
   (this)
   (super)
 ] @variable.builtin
 
 ((identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
+  (#eq? @variable.builtin "self"))
 
 [
   (true)
@@ -195,30 +166,45 @@
 (hash_bang_line) @keyword.directive
 
 ((string_fragment) @keyword.directive
- (#eq? @keyword.directive "use strict"))
+  (#eq? @keyword.directive "use strict"))
 
 (string) @string
+
 (template_string) @string
+
 (escape_sequence) @string.escape
+
 (regex_pattern) @string.regexp
+
 (regex_flags) @character.special
-(regex "/" @punctuation.bracket) ; Regex delimiters
+
+(regex
+  "/" @punctuation.bracket) ; Regex delimiters
 
 (number) @number
+
 ((identifier) @number
   (#any-of? @number "NaN" "Infinity"))
 
 ; Punctuation
 ;------------
-
 ";" @punctuation.delimiter
+
 "." @punctuation.delimiter
+
 "," @punctuation.delimiter
 
-(pair ":" @punctuation.delimiter)
-(pair_pattern ":" @punctuation.delimiter)
-(switch_case ":" @punctuation.delimiter)
-(switch_default ":" @punctuation.delimiter)
+(pair
+  ":" @punctuation.delimiter)
+
+(pair_pattern
+  ":" @punctuation.delimiter)
+
+(switch_case
+  ":" @punctuation.delimiter)
+
+(switch_default
+  ":" @punctuation.delimiter)
 
 [
   "--"
@@ -265,10 +251,28 @@
   "..."
 ] @operator
 
-(binary_expression "/" @operator)
-(ternary_expression ["?" ":"] @keyword.conditional.ternary)
-(unary_expression ["!" "~" "-" "+"] @operator)
-(unary_expression ["delete" "void"] @keyword.operator)
+(binary_expression
+  "/" @operator)
+
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+(unary_expression
+  [
+    "!"
+    "~"
+    "-"
+    "+"
+  ] @operator)
+
+(unary_expression
+  [
+    "delete"
+    "void"
+  ] @keyword.operator)
 
 [
   "("
@@ -279,11 +283,14 @@
   "}"
 ] @punctuation.bracket
 
-((template_substitution ["${" "}"] @punctuation.special) @none)
+((template_substitution
+  [
+    "${"
+    "}"
+  ] @punctuation.special) @none)
 
 ; Keywords
 ;----------
-
 [
   "if"
   "else"
@@ -296,10 +303,17 @@
   "from"
 ] @keyword.import
 
-(export_specifier "as" @keyword.import)
-(import_specifier "as" @keyword.import)
-(namespace_export "as" @keyword.import)
-(namespace_import "as" @keyword.import)
+(export_specifier
+  "as" @keyword.import)
+
+(import_specifier
+  "as" @keyword.import)
+
+(namespace_export
+  "as" @keyword.import)
+
+(namespace_import
+  "as" @keyword.import)
 
 [
   "for"
@@ -335,9 +349,7 @@
   "yield"
 ] @keyword.return
 
-[
-  "function"
-] @keyword.function
+"function" @keyword.function
 
 [
   "new"
@@ -356,5 +368,6 @@
 
 (export_statement
   "default" @keyword)
+
 (switch_default
   "default" @keyword.conditional)
diff --git a/queries/ecma/indents.scm b/queries/ecma/indents.scm
index 538c5bdc7..03b10c605 100644
--- a/queries/ecma/indents.scm
+++ b/queries/ecma/indents.scm
@@ -18,36 +18,56 @@
   (ternary_expression)
 ] @indent.begin
 
-(arguments (call_expression) @indent.begin)
-(binary_expression (call_expression) @indent.begin)
-(expression_statement (call_expression) @indent.begin)
+(arguments
+  (call_expression) @indent.begin)
+
+(binary_expression
+  (call_expression) @indent.begin)
+
+(expression_statement
+  (call_expression) @indent.begin)
+
 (arrow_function
   body: (_) @_body
-  (#not-has-type? @_body statement_block)
-) @indent.begin
+  (#not-has-type? @_body statement_block)) @indent.begin
+
 (assignment_expression
   right: (_) @_right
-  (#not-has-type? @_right arrow_function function)
-) @indent.begin
+  (#not-has-type? @_right arrow_function function)) @indent.begin
+
 (variable_declarator
   value: (_) @_value
-  (#not-has-type? @_value arrow_function call_expression function)
-) @indent.begin
+  (#not-has-type? @_value arrow_function call_expression function)) @indent.begin
 
-(arguments ")" @indent.end)
-(object "}" @indent.end)
-(statement_block "}" @indent.end)
+(arguments
+  ")" @indent.end)
+
+(object
+  "}" @indent.end)
+
+(statement_block
+  "}" @indent.end)
 
 [
-  (arguments (object))
+  (arguments
+    (object))
   ")"
   "}"
   "]"
 ] @indent.branch
-(statement_block "{" @indent.branch)
 
-(parenthesized_expression ("(" (_) ")" @indent.end))
-["}" "]"] @indent.end
+(statement_block
+  "{" @indent.branch)
+
+(parenthesized_expression
+  ("("
+    (_)
+    ")" @indent.end))
+
+[
+  "}"
+  "]"
+] @indent.end
 
 (template_string) @indent.ignore
 
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 97dbbb628..9421d8113 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -3,98 +3,116 @@
   (#set! injection.language "jsdoc"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ; html(`...`), html`...`, sql(...) etc
 (call_expression
- function: ((identifier) @injection.language)
- arguments: [
-             (arguments
-              (template_string) @injection.content)
-             (template_string) @injection.content
-            ]
-     (#lua-match? @injection.language "^[a-zA-Z][a-zA-Z0-9]*$")
-     (#offset! @injection.content 0 1 0 -1)
-     (#not-eq? @injection.language "svg"))
+  function:
+    ((identifier) @injection.language)
+  arguments:
+    [
+      (arguments
+        (template_string) @injection.content)
+      (template_string) @injection.content
+    ]
+  (#lua-match? @injection.language "^[a-zA-Z][a-zA-Z0-9]*$")
+  (#offset! @injection.content 0 1 0 -1)
+  (#not-eq? @injection.language "svg"))
 
 ; svg`...` or svg(`...`), which uses the html parser, so is not included in the previous query
 (call_expression
- function: ((identifier) @_name (#eq? @_name "svg"))
- arguments: [
-             (arguments
-              (template_string) @injection.content)
-             (template_string) @injection.content
-            ]
-     (#offset! @injection.content 0 1 0 -1)
-     (#set! injection.language "html"))
-
+  function:
+    ((identifier) @_name
+      (#eq? @_name "svg"))
+  arguments:
+    [
+      (arguments
+        (template_string) @injection.content)
+      (template_string) @injection.content
+    ]
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "html"))
 
 (call_expression
- function: ((identifier) @_name
-   (#eq? @_name "gql"))
- arguments: ((template_string) @injection.content
-   (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "graphql")))
+  function:
+    ((identifier) @_name
+      (#eq? @_name "gql"))
+  arguments:
+    ((template_string) @injection.content
+      (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.language "graphql")))
 
 (call_expression
- function: ((identifier) @_name
-   (#eq? @_name "hbs"))
- arguments: ((template_string) @injection.content
-   (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "glimmer")))
+  function:
+    ((identifier) @_name
+      (#eq? @_name "hbs"))
+  arguments:
+    ((template_string) @injection.content
+      (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.language "glimmer")))
 
 ((glimmer_template) @injection.content
- (#set! injection.language "glimmer"))
+  (#set! injection.language "glimmer"))
 
 ; styled.div`<css>`
 (call_expression
- function: (member_expression
-   object: (identifier) @_name
-     (#eq? @_name "styled"))
- arguments: ((template_string) @injection.content
-   (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "styled")))
+  function:
+    (member_expression
+      object: (identifier) @_name
+      (#eq? @_name "styled"))
+  arguments:
+    ((template_string) @injection.content
+      (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.language "styled")))
 
 ; styled(Component)`<css>`
 (call_expression
- function: (call_expression
-   function: (identifier) @_name
-     (#eq? @_name "styled"))
- arguments: ((template_string) @injection.content
-   (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "styled")))
+  function:
+    (call_expression
+      function: (identifier) @_name
+      (#eq? @_name "styled"))
+  arguments:
+    ((template_string) @injection.content
+      (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.language "styled")))
 
 ; styled.div.attrs({ prop: "foo" })`<css>`
 (call_expression
- function: (call_expression
-   function: (member_expression
-    object: (member_expression
-      object: (identifier) @_name
-        (#eq? @_name "styled"))))
- arguments: ((template_string) @injection.content
-   (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "styled")))
-
+  function:
+    (call_expression
+      function:
+        (member_expression
+          object:
+            (member_expression
+              object: (identifier) @_name
+              (#eq? @_name "styled"))))
+  arguments:
+    ((template_string) @injection.content
+      (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.language "styled")))
 
 ; styled(Component).attrs({ prop: "foo" })`<css>`
 (call_expression
- function: (call_expression
-   function: (member_expression
-    object: (call_expression
-      function: (identifier) @_name
-        (#eq? @_name "styled"))))
- arguments: ((template_string) @injection.content
-   (#offset! @injection.content 0 1 0 -1)
-   (#set! injection.language "styled")))
+  function:
+    (call_expression
+      function:
+        (member_expression
+          object:
+            (call_expression
+              function: (identifier) @_name
+              (#eq? @_name "styled"))))
+  arguments:
+    ((template_string) @injection.content
+      (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.language "styled")))
 
 ((regex_pattern) @injection.content
- (#set! injection.language "regex"))
+  (#set! injection.language "regex"))
 
 ; ((comment) @_gql_comment
 ;   (#eq? @_gql_comment "/* GraphQL */")
 ;   (template_string) @injection.content
 ;   (#set! injection.language "graphql"))
-
 ((template_string) @injection.content
   (#lua-match? @injection.content "^`#graphql")
   (#offset! @injection.content 0 1 0 -1)
@@ -102,20 +120,21 @@
 
 ; el.innerHTML = `<html>`
 (assignment_expression
-  left: 
+  left:
     (member_expression
       property: (property_identifier) @_prop
       (#any-of? @_prop "outerHTML" "innerHTML"))
   right: (template_string) @injection.content
-    (#offset! @injection.content 0 1 0 -1)
-    (#set! injection.language "html"))
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "html"))
 
 ; el.innerHTML = '<html>'
 (assignment_expression
-  left: 
+  left:
     (member_expression
       property: (property_identifier) @_prop
       (#any-of? @_prop "outerHTML" "innerHTML"))
-  right: 
-    (string (string_fragment) @injection.content)
-    (#set! injection.language "html"))
+  right:
+    (string
+      (string_fragment) @injection.content)
+  (#set! injection.language "html"))
diff --git a/queries/ecma/locals.scm b/queries/ecma/locals.scm
index 86e565490..54da79335 100644
--- a/queries/ecma/locals.scm
+++ b/queries/ecma/locals.scm
@@ -1,18 +1,23 @@
 ; Scopes
 ;-------
-
 (statement_block) @local.scope
+
 (function) @local.scope
+
 (arrow_function) @local.scope
+
 (function_declaration) @local.scope
+
 (method_definition) @local.scope
+
 (for_statement) @local.scope
+
 (for_in_statement) @local.scope
+
 (catch_clause) @local.scope
 
 ; Definitions
 ;------------
-
 (variable_declarator
   name: (identifier) @local.definition.var)
 
@@ -24,14 +29,14 @@
 
 (function_declaration
   ((identifier) @local.definition.function)
-   (#set! definition.var.scope parent))
+  (#set! definition.var.scope parent))
 
 (method_definition
   ((property_identifier) @local.definition.function)
-   (#set! definition.var.scope parent))
+  (#set! definition.var.scope parent))
 
 ; References
 ;------------
-
 (identifier) @local.reference
+
 (shorthand_property_identifier) @local.reference
diff --git a/queries/eds/highlights.scm b/queries/eds/highlights.scm
index 42f408754..2ce79c048 100644
--- a/queries/eds/highlights.scm
+++ b/queries/eds/highlights.scm
@@ -1,49 +1,58 @@
 "=" @punctuation.delimiter
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 ((section_name) @variable.builtin
- (#match? @variable.builtin "\\c^(FileInfo|DeviceInfo|DummyUsage|MandatoryObjects|OptionalObjects)$"))
+  (#match? @variable.builtin "\\c^(FileInfo|DeviceInfo|DummyUsage|MandatoryObjects|OptionalObjects)$"))
 
 ((section_name) @variable.builtin
- (#lua-match? @variable.builtin "^1"))
+  (#lua-match? @variable.builtin "^1"))
 
 (section
-   (section_name) @_name
-   (#match? @_name "\\c^Comments$")) @comment
+  (section_name) @_name
+  (#match? @_name "\\c^Comments$")) @comment
 
 (section
-   (section_name) @_name
-   (statement (key) @_key) @string
-   (#match? @_key "\\c^ParameterName$")
-   (#not-match? @_name "\\c^Comments$"))
+  (section_name) @_name
+  (statement
+    (key) @_key) @string
+  (#match? @_key "\\c^ParameterName$")
+  (#not-match? @_name "\\c^Comments$"))
 
 (section
-   (section_name) @_name
-   (statement (key) @_key) @type
-   (#match? @_key "\\c^ObjectType$")
-   (#not-match? @_name "\\c^Comments$"))
+  (section_name) @_name
+  (statement
+    (key) @_key) @type
+  (#match? @_key "\\c^ObjectType$")
+  (#not-match? @_name "\\c^Comments$"))
 
 (section
-   (section_name) @_name
-   (statement (key) @_key) @type
-   (#match? @_key "\\c^DataType$")
-   (#not-match? @_name "\\c^Comments$"))
+  (section_name) @_name
+  (statement
+    (key) @_key) @type
+  (#match? @_key "\\c^DataType$")
+  (#not-match? @_name "\\c^Comments$"))
 
 (section
-   (section_name) @_name
-   (statement (key) @_key) @type.qualifier
-   (#match? @_key "\\c^AccessType$")
-   (#not-match? @_name "\\c^Comments$"))
+  (section_name) @_name
+  (statement
+    (key) @_key) @type.qualifier
+  (#match? @_key "\\c^AccessType$")
+  (#not-match? @_name "\\c^Comments$"))
 
 (section
-   (section_name) @_name
-   (statement (key) @_key) @attribute
-   (#match? @_key "\\c^PDOMapping$")
-   (#not-match? @_name "\\c^Comments$"))
+  (section_name) @_name
+  (statement
+    (key) @_key) @attribute
+  (#match? @_key "\\c^PDOMapping$")
+  (#not-match? @_name "\\c^Comments$"))
 
 (section
-   (section_name) @_name
-   (statement (key) @_key) @number
-   (#match? @_key "\\c^(DefaultValue|LowLimit|HighLimit|SubNumber)$")
-   (#not-match? @_name "\\c^Comments$"))
+  (section_name) @_name
+  (statement
+    (key) @_key) @number
+  (#match? @_key "\\c^(DefaultValue|LowLimit|HighLimit|SubNumber)$")
+  (#not-match? @_name "\\c^Comments$"))
diff --git a/queries/eex/highlights.scm b/queries/eex/highlights.scm
index d032a7486..ae91a2774 100644
--- a/queries/eex/highlights.scm
+++ b/queries/eex/highlights.scm
@@ -7,6 +7,5 @@
   "<%%="
   "<%="
 ] @tag.delimiter
-
 ; EEx comments are highlighted as such
 (comment) @comment @spell
diff --git a/queries/eex/injections.scm b/queries/eex/injections.scm
index 9331f5925..f13d3c14e 100644
--- a/queries/eex/injections.scm
+++ b/queries/eex/injections.scm
@@ -1,8 +1,8 @@
 ; EEx expressions are Elixir
-((expression) @injection.content 
- (#set! injection.language "elixir"))
+((expression) @injection.content
+  (#set! injection.language "elixir"))
 
 ; EEx expressions can span multiple interpolated lines
 ((partial_expression) @injection.content
- (#set! injection.language "elixir")
- (#set! injection.combined))
+  (#set! injection.language "elixir")
+  (#set! injection.combined))
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 5a9297fc7..57e299b17 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -15,15 +15,14 @@
   "}"
 ] @punctuation.bracket
 
-[
-  "%"
-] @punctuation.special
+"%" @punctuation.special
 
 ; Identifiers
 (identifier) @variable
 
 ; Unused Identifiers
-((identifier) @comment (#lua-match? @comment "^_"))
+((identifier) @comment
+  (#lua-match? @comment "^_"))
 
 ; Comments
 (comment) @comment @spell
@@ -43,7 +42,11 @@
 ] @string.special.symbol
 
 ; Interpolation
-(interpolation ["#{" "}"] @string.special)
+(interpolation
+  [
+    "#{"
+    "}"
+  ] @string.special)
 
 ; Escape sequences
 (escape_sequence) @string.escape
@@ -69,82 +72,65 @@
 ; Operators
 (operator_identifier) @operator
 
-(unary_operator operator: _ @operator)
+(unary_operator
+  operator: _ @operator)
 
-(binary_operator operator: _ @operator)
+(binary_operator
+  operator: _ @operator)
 
 ; Pipe Operator
-(binary_operator operator: "|>" right: (identifier) @function)
+(binary_operator
+  operator: "|>"
+  right: (identifier) @function)
 
-(dot operator: _ @operator)
+(dot
+  operator: _ @operator)
 
-(stab_clause operator: _ @operator)
+(stab_clause
+  operator: _ @operator)
 
 ; Local Function Calls
-(call target: (identifier) @function.call)
+(call
+  target: (identifier) @function.call)
 
 ; Remote Function Calls
-(call target: (dot left: [
-  (atom) @type
-  (_)
-] right: (identifier) @function.call) (arguments))
+(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 [
-    (call (identifier) @function)
-    (identifier) @function
-    (binary_operator left: (call target: (identifier) @function) operator: "when")])?)
+(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
+    [
+      (call
+        (identifier) @function)
+      (identifier) @function
+      (binary_operator
+        left:
+          (call
+            target: (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"
-)))
+(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__"
-))
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin "__CALLER__" "__DIR__" "__ENV__" "__MODULE__" "__STACKTRACE__"))
 
 ; Reserved Keywords
 [
@@ -170,14 +156,22 @@
 ; Capture Operator
 (unary_operator
   operator: "&"
-  operand: [
-    (integer) @operator
-    (binary_operator
-      left: [
-        (call target: (dot left: (_) right: (identifier) @function))
-        (identifier) @function
-      ] operator: "/" right: (integer) @operator)
-  ])
+  operand:
+    [
+      (integer) @operator
+      (binary_operator
+        left:
+          [
+            (call
+              target:
+                (dot
+                  left: (_)
+                  right: (identifier) @function))
+            (identifier) @function
+          ]
+        operator: "/"
+        right: (integer) @operator)
+    ])
 
 ; Non-String Sigils
 (sigil
@@ -201,24 +195,30 @@
 ; Module attributes
 (unary_operator
   operator: "@"
-  operand: [
-    (identifier)
-    (call target: (identifier))
-  ] @constant) @constant
+  operand:
+    [
+      (identifier)
+      (call
+        target: (identifier))
+    ] @constant) @constant
 
 ; Documentation
 (unary_operator
   operator: "@"
-  operand: (call
-    target: ((identifier) @_identifier (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc")) @comment.documentation
-    (arguments [
-      (string)
-      (boolean)
-      (charlist)
-      (sigil
-        "~" @comment.documentation
-        ((sigil_name) @comment.documentation)
-        quoted_start: _ @comment.documentation
-        (quoted_content) @comment.documentation
-        quoted_end: _ @comment.documentation)
-    ] @comment.documentation))) @comment.documentation
+  operand:
+    (call
+      target:
+        ((identifier) @_identifier
+          (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc")) @comment.documentation
+      (arguments
+        [
+          (string)
+          (boolean)
+          (charlist)
+          (sigil
+            "~" @comment.documentation
+            ((sigil_name) @comment.documentation)
+            quoted_start: _ @comment.documentation
+            (quoted_content) @comment.documentation
+            quoted_end: _ @comment.documentation)
+        ] @comment.documentation))) @comment.documentation
diff --git a/queries/elixir/indents.scm b/queries/elixir/indents.scm
index 0ba8fd442..5470b6422 100644
--- a/queries/elixir/indents.scm
+++ b/queries/elixir/indents.scm
@@ -20,4 +20,6 @@
 ] @indent.end @indent.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.begin
+  (#not-eq? @_operator "|>"))
diff --git a/queries/elixir/injections.scm b/queries/elixir/injections.scm
index 1f0b31f07..b580f2ea6 100644
--- a/queries/elixir/injections.scm
+++ b/queries/elixir/injections.scm
@@ -1,56 +1,61 @@
 ; Comments
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
 
 ; Documentation
 (unary_operator
   operator: "@"
-  operand: (call
-    target: ((identifier) @_identifier (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc"))
-    (arguments [
-      (string (quoted_content) @injection.content)
-      (sigil (quoted_content) @injection.content)
-    ]) 
-    (#set! injection.language "markdown")))
+  operand:
+    (call
+      target:
+        ((identifier) @_identifier
+          (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc"))
+      (arguments
+        [
+          (string
+            (quoted_content) @injection.content)
+          (sigil
+            (quoted_content) @injection.content)
+        ])
+      (#set! injection.language "markdown")))
 
 ; HEEx
 (sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content
- (#eq? @_sigil_name "H")
- (#set! injection.language "heex"))
+  (#eq? @_sigil_name "H")
+  (#set! injection.language "heex"))
 
 ; Surface
 (sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content
- (#eq? @_sigil_name "F")
- (#set! injection.language "surface"))
+  (#eq? @_sigil_name "F")
+  (#set! injection.language "surface"))
 
 ; Zigler
 (sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content
- (#any-of? @_sigil_name "E" "L")
- (#set! injection.language "eex"))
+  (#any-of? @_sigil_name "E" "L")
+  (#set! injection.language "eex"))
 
 (sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content
- (#any-of? @_sigil_name "z" "Z")
- (#set! injection.language "zig"))
+  (#any-of? @_sigil_name "z" "Z")
+  (#set! injection.language "zig"))
 
 ; Regex
 (sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content
- (#any-of? @_sigil_name "r" "R")
- (#set! injection.language "regex"))
+  (#any-of? @_sigil_name "r" "R")
+  (#set! injection.language "regex"))
 
 ; Json
 (sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content
- (#any-of? @_sigil_name "j" "J")
- (#set! injection.language "json"))
-
+  (#any-of? @_sigil_name "j" "J")
+  (#set! injection.language "json"))
diff --git a/queries/elixir/locals.scm b/queries/elixir/locals.scm
index 59e55eae0..003ec4b1b 100644
--- a/queries/elixir/locals.scm
+++ b/queries/elixir/locals.scm
@@ -5,7 +5,7 @@
 
 ; Module Definitions
 (call
-  target: 
+  target:
     ((identifier) @_identifier
       (#eq? @_identifier "defmodule"))
   (arguments
diff --git a/queries/elm/highlights.scm b/queries/elm/highlights.scm
index 11bc0a00d..86351fe60 100644
--- a/queries/elm/highlights.scm
+++ b/queries/elm/highlights.scm
@@ -6,10 +6,8 @@
 ((block_comment) @comment.documentation
   (#lua-match? @comment.documentation "^{[-]|[^|]"))
 
-
 ; Keywords
 ;---------
-
 [
   "if"
   "then"
@@ -34,13 +32,9 @@
   (exposing)
 ] @keyword.import
 
-
 ; Punctuation
 ;------------
-
-[
-  (double_dot)
-] @punctuation.special
+(double_dot) @punctuation.special
 
 [
   ","
@@ -57,71 +51,89 @@
   "]"
 ] @punctuation.bracket
 
-
 ; Variables
 ;----------
-
 (value_qid
   (lower_case_identifier) @variable)
+
 (value_declaration
-  (function_declaration_left (lower_case_identifier) @variable))
+  (function_declaration_left
+    (lower_case_identifier) @variable))
+
 (type_annotation
   (lower_case_identifier) @variable)
+
 (port_annotation
   (lower_case_identifier) @variable)
+
 (anything_pattern
   (underscore) @variable)
+
 (record_base_identifier
   (lower_case_identifier) @variable)
+
 (lower_pattern
   (lower_case_identifier) @variable)
+
 (exposed_value
   (lower_case_identifier) @variable)
 
 (value_qid
-  ((dot) (lower_case_identifier) @variable.member))
+  ((dot)
+    (lower_case_identifier) @variable.member))
+
 (field_access_expr
-  ((dot) (lower_case_identifier) @variable.member))
+  ((dot)
+    (lower_case_identifier) @variable.member))
 
 (function_declaration_left
-  (anything_pattern (underscore) @variable.parameter))
-(function_declaration_left
-  (lower_pattern (lower_case_identifier) @variable.parameter))
+  (anything_pattern
+    (underscore) @variable.parameter))
 
+(function_declaration_left
+  (lower_pattern
+    (lower_case_identifier) @variable.parameter))
 
 ; Functions
 ;----------
-
 (value_declaration
   functionDeclarationLeft:
     (function_declaration_left
       (lower_case_identifier) @function
       (pattern)))
+
 (value_declaration
   functionDeclarationLeft:
     (function_declaration_left
       (lower_case_identifier) @function
       pattern: (_)))
+
 (value_declaration
   functionDeclarationLeft:
     (function_declaration_left
       (lower_case_identifier) @function)
   body: (anonymous_function_expr))
+
 (type_annotation
   name: (lower_case_identifier) @function
-  typeExpression: (type_expression (arrow)))
+  typeExpression:
+    (type_expression
+      (arrow)))
+
 (port_annotation
   name: (lower_case_identifier) @function
-  typeExpression: (type_expression (arrow)))
+  typeExpression:
+    (type_expression
+      (arrow)))
 
 (function_call_expr
-  target: (value_expr
-    (value_qid (lower_case_identifier) @function.call)))
-
+  target:
+    (value_expr
+      (value_qid
+        (lower_case_identifier) @function.call)))
 
 ; Operators
 ;----------
-
 [
   (operator_identifier)
   (eq)
@@ -131,31 +143,38 @@
   "::"
 ] @operator
 
-
 ; Modules
 ;--------
-
 (module_declaration
-  (upper_case_qid (upper_case_identifier) @module))
+  (upper_case_qid
+    (upper_case_identifier) @module))
+
 (import_clause
-  (upper_case_qid (upper_case_identifier) @module))
+  (upper_case_qid
+    (upper_case_identifier) @module))
+
 (as_clause
   (upper_case_identifier) @module)
-(value_expr
-  (value_qid (upper_case_identifier) @module))
 
+(value_expr
+  (value_qid
+    (upper_case_identifier) @module))
 
 ; Types
 ;------
-
 (type_declaration
   (upper_case_identifier) @type)
+
 (type_ref
-  (upper_case_qid (upper_case_identifier) @type))
+  (upper_case_qid
+    (upper_case_identifier) @type))
+
 (type_variable
   (lower_case_identifier) @type)
+
 (lower_type_name
   (lower_case_identifier) @type)
+
 (exposed_type
   (upper_case_identifier) @type)
 
@@ -164,34 +183,43 @@
 
 (field_type
   name: (lower_case_identifier) @property)
+
 (field
   name: (lower_case_identifier) @property)
 
 (type_declaration
-  (union_variant (upper_case_identifier) @constructor))
-(nullary_constructor_argument_pattern
-  (upper_case_qid (upper_case_identifier) @constructor))
-(union_pattern
-  (upper_case_qid (upper_case_identifier) @constructor))
-(value_expr
-  (upper_case_qid (upper_case_identifier)) @constructor)
+  (union_variant
+    (upper_case_identifier) @constructor))
 
+(nullary_constructor_argument_pattern
+  (upper_case_qid
+    (upper_case_identifier) @constructor))
+
+(union_pattern
+  (upper_case_qid
+    (upper_case_identifier) @constructor))
+
+(value_expr
+  (upper_case_qid
+    (upper_case_identifier)) @constructor)
 
 ; Literals
 ;---------
-
 (number_constant_expr
   (number_literal) @number)
 
 (upper_case_qid
-  ((upper_case_identifier) @boolean (#any-of? @boolean "True" "False")))
+  ((upper_case_identifier) @boolean
+    (#any-of? @boolean "True" "False")))
 
 [
   (open_quote)
   (close_quote)
 ] @string
+
 (string_constant_expr
   (string_escape) @string)
+
 (string_constant_expr
   (regular_string_part) @string)
 
@@ -199,7 +227,9 @@
   (open_char)
   (close_char)
 ] @character
+
 (char_constant_expr
   (string_escape) @character)
+
 (char_constant_expr
   (regular_string_part) @character)
diff --git a/queries/elm/injections.scm b/queries/elm/injections.scm
index b8b3e9943..7ee6c7f03 100644
--- a/queries/elm/injections.scm
+++ b/queries/elm/injections.scm
@@ -1,8 +1,8 @@
 ([
-  (line_comment) 
+  (line_comment)
   (block_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
 
 ((glsl_content) @injection.content
- (#set! injection.language "glsl"))
+  (#set! injection.language "glsl"))
diff --git a/queries/elsa/highlights.scm b/queries/elsa/highlights.scm
index 8e52b6f5b..1a974bda6 100644
--- a/queries/elsa/highlights.scm
+++ b/queries/elsa/highlights.scm
@@ -1,28 +1,22 @@
 ; Keywords
-
 [
   "eval"
   "let"
 ] @keyword
 
 ; Function
-
 (function) @function
 
 ; Method
-
 (method) @function.method
 
 ; Parameter
-
 (parameter) @variable.parameter
 
 ; Variables
-
 (identifier) @variable
 
 ; Operators
-
 [
   "\\"
   "->"
@@ -31,11 +25,12 @@
 ] @operator
 
 ; Punctuation
-
-["(" ")"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 ":" @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/elsa/injections.scm b/queries/elsa/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/elsa/injections.scm
+++ b/queries/elsa/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
index d6243549f..a2fd9302c 100644
--- a/queries/elvish/highlights.scm
+++ b/queries/elvish/highlights.scm
@@ -1,32 +1,90 @@
 (comment) @comment @spell
 
-["if" "elif"] @keyword.conditional
-(if (else "else" @keyword.conditional))
+[
+  "if"
+  "elif"
+] @keyword.conditional
 
-["while" "for"] @keyword.repeat
-(while (else "else" @keyword.repeat))
-(for (else "else" @keyword.repeat))
+(if
+  (else
+    "else" @keyword.conditional))
 
-["try" "catch" "finally"] @keyword.exception
-(try (else "else" @keyword.exception))
+[
+  "while"
+  "for"
+] @keyword.repeat
+
+(while
+  (else
+    "else" @keyword.repeat))
+
+(for
+  (else
+    "else" @keyword.repeat))
+
+[
+  "try"
+  "catch"
+  "finally"
+] @keyword.exception
+
+(try
+  (else
+    "else" @keyword.exception))
 
 "use" @keyword.import
-(import (bareword) @string.special.path)
 
-(wildcard ["*" "**" "?"] @character.special)
+(import
+  (bareword) @string.special.path)
+
+(wildcard
+  [
+    "*"
+    "**"
+    "?"
+  ] @character.special)
+
+(command
+  argument: (bareword) @variable.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"))
 
-(command argument: (bareword) @variable.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" "==s" "!=s" ">s" ">=s"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "<"
+  "<="
+  "=="
+  "!="
+  ">"
+  ">="
+  "<s"
+  "<=s"
+  "==s"
+  "!=s"
+  ">s"
+  ">=s"
 ] @function.builtin
 
-[">" "<" ">>" "<>" "|"] @operator
+[
+  ">"
+  "<"
+  ">>"
+  "<>"
+  "|"
+] @operator
 
 (io_port) @number
 
@@ -35,36 +93,63 @@
   (identifier) @function)
 
 (parameter_list) @variable.parameter
-(parameter_list "|" @punctuation.bracket)
 
-["var" "set" "tmp" "del"] @keyword
+(parameter_list
+  "|" @punctuation.bracket)
+
+[
+  "var"
+  "set"
+  "tmp"
+  "del"
+] @keyword
+
 (variable_declaration
-  (lhs (identifier) @variable))
+  (lhs
+    (identifier) @variable))
 
 (variable_assignment
-  (lhs (identifier) @variable))
+  (lhs
+    (identifier) @variable))
 
 (temporary_assignment
-  (lhs (identifier) @variable))
+  (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"))
+(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.special
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
 ";" @punctuation.delimiter
diff --git a/queries/elvish/injections.scm b/queries/elvish/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/elvish/injections.scm
+++ b/queries/elvish/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/embedded_template/injections.scm b/queries/embedded_template/injections.scm
index 2824f7a00..cdeb2cd4f 100644
--- a/queries/embedded_template/injections.scm
+++ b/queries/embedded_template/injections.scm
@@ -1,7 +1,7 @@
 ((content) @injection.content
- (#set! injection.language "html")
- (#set! injection.combined))
+  (#set! injection.language "html")
+  (#set! injection.combined))
 
 ((code) @injection.content
- (#set! injection.language "ruby")
- (#set! injection.combined))
+  (#set! injection.language "ruby")
+  (#set! injection.combined))
diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
index da0d1e600..1b9aeaf4e 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -1,8 +1,12 @@
-((atom) @constant (#set! "priority" "90"))
+((atom) @constant
+  (#set! "priority" "90"))
+
 (var) @variable
 
 (char) @character
+
 (integer) @number
+
 (float) @number.float
 
 (comment) @comment @spell
@@ -10,13 +14,13 @@
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^[%%][%%]"))
 
-;; keyword
+; keyword
 [
   "fun"
   "div"
 ] @keyword
 
-;; bracket
+; bracket
 [
   "("
   ")"
@@ -27,7 +31,7 @@
   "#"
 ] @punctuation.bracket
 
-;;; Comparisons
+; Comparisons
 [
   "=="
   "=:="
@@ -36,14 +40,14 @@
   ">="
   "<"
   ">"
-] @operator ;; .comparison
+] @operator ; .comparison
 
-;;; operator
+; operator
 [
   ":"
   ":="
   "!"
-  ;; "-"
+  ; "-"
   "+"
   "="
   "->"
@@ -58,7 +62,7 @@
   ";"
 ] @punctuation.delimiter
 
-;; conditional
+; conditional
 [
   "receive"
   "if"
@@ -77,54 +81,108 @@
   "try"
 ] @keyword.exception
 
-((atom) @boolean (#any-of? @boolean "true" "false"))
+((atom) @boolean
+  (#any-of? @boolean "true" "false"))
 
-;; Macros
-((macro_call_expr) @constant.macro (#set! "priority" 101))
+; Macros
+((macro_call_expr) @constant.macro
+  (#set! "priority" 101))
 
-;; Preprocessor
+; Preprocessor
 (pp_define
-  lhs: _ @constant.macro (#set! "priority" 101)
-)
-(_preprocessor_directive) @keyword.directive (#set! "priority" 99)
+  lhs: _ @constant.macro
+  (#set! "priority" 101))
 
-;; Attributes
+(_preprocessor_directive) @keyword.directive
+(#set! "priority" 99)
+
+; Attributes
 (pp_include) @keyword.import
+
 (pp_include_lib) @keyword.import
+
 (export_attribute) @keyword.import
+
 (export_type_attribute) @type.definition
-(export_type_attribute types: (fa fun: _ @type (#set! "priority" 101)))
+
+(export_type_attribute
+  types:
+    (fa
+      fun: _ @type
+      (#set! "priority" 101)))
+
 (behaviour_attribute) @keyword.import
-(module_attribute (atom) @module) @keyword.import
-(wild_attribute name: (attr_name name: _ @attribute)) @attribute
 
-;; Records
+(module_attribute
+  (atom) @module) @keyword.import
+
+(wild_attribute
+  name:
+    (attr_name
+      name: _ @attribute)) @attribute
+
+; Records
 (record_expr) @type
-(record_field_expr _ @variable.member) @type
-(record_field_name _ @variable.member) @type
-(record_name "#" @type name: _ @type) @type
-(record_decl name: _ @type) @type.definition
-(record_field name: _ @variable.member)
-(record_field name: _ @variable.member ty: _ @type)
 
-;; Type alias
-(type_alias name: _ @type) @type.definition
+(record_field_expr
+  _ @variable.member) @type
+
+(record_field_name
+  _ @variable.member) @type
+
+(record_name
+  "#" @type
+  name: _ @type) @type
+
+(record_decl
+  name: _ @type) @type.definition
+
+(record_field
+  name: _ @variable.member)
+
+(record_field
+  name: _ @variable.member
+  ty: _ @type)
+
+; Type alias
+(type_alias
+  name: _ @type) @type.definition
+
 (spec) @type.definition
 
-[(string) (binary)] @string
+[
+  (string)
+  (binary)
+] @string
 
-;;; expr_function_call
-(call expr: [(atom) (remote) (var)] @function)
-(call (atom) @keyword.exception (#any-of? @keyword.exception "error" "throw" "exit"))
-
-;;; Parenthesized expression: (SomeFunc)(), only highlight the parens
+; expr_function_call
 (call
-  expr: (paren_expr "(" @function.call ")" @function.call)
-)
+  expr:
+    [
+      (atom)
+      (remote)
+      (var)
+    ] @function)
 
-;;; function
+(call
+  (atom) @keyword.exception
+  (#any-of? @keyword.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)
 
+(internal_fun
+  fun: (atom) @function.call)
+
+(function_clause
+  name: (atom) @function)
+
+(fa
+  fun: (atom) @function)
diff --git a/queries/facility/highlights.scm b/queries/facility/highlights.scm
index 060ccd05c..01f1bab19 100644
--- a/queries/facility/highlights.scm
+++ b/queries/facility/highlights.scm
@@ -11,9 +11,10 @@
   "]"
   "{"
   "}"
-]  @punctuation.bracket
+] @punctuation.bracket
 
 (comment) @comment @spell
+
 (doc_comment) @comment.documentation @spell
 
 "method" @keyword.function
@@ -78,4 +79,5 @@
   name: (identifier) @function.method)
 
 (number_literal) @number
+
 (string_literal) @string
diff --git a/queries/facility/indents.scm b/queries/facility/indents.scm
index 96a24f202..247949ba1 100644
--- a/queries/facility/indents.scm
+++ b/queries/facility/indents.scm
@@ -1,8 +1,7 @@
 [
- (service_block)
- (values_block)
- (field_list)
+  (service_block)
+  (values_block)
+  (field_list)
 ] @indent.begin
 
 "}" @indent.branch
-
diff --git a/queries/facility/injections.scm b/queries/facility/injections.scm
index 572849ab4..5d9b7836f 100644
--- a/queries/facility/injections.scm
+++ b/queries/facility/injections.scm
@@ -1,5 +1,8 @@
 ((remarks) @injection.content
   (#set! injection.language "markdown"))
 
-([(comment) (doc_comment)] @injection.content
+([
+  (comment)
+  (doc_comment)
+] @injection.content
   (#set! injection.language "comment"))
diff --git a/queries/fennel/folds.scm b/queries/fennel/folds.scm
index c8427b188..619300c4f 100644
--- a/queries/fennel/folds.scm
+++ b/queries/fennel/folds.scm
@@ -1 +1,11 @@
-[(list) (table) (sequential_table) (let) (fn) (let_clause) (quoted_list) (local) (global)] @fold
+[
+  (list)
+  (table)
+  (sequential_table)
+  (let)
+  (fn)
+  (let_clause)
+  (quoted_list)
+  (local)
+  (global)
+] @fold
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index 620c42ef3..ec2a82759 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -18,29 +18,38 @@
 ] @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) @variable.member)
+  "." @punctuation.delimiter
+  (symbol) @variable.member)
 
 (multi_symbol_method
-   ":" @punctuation.delimiter
-   (symbol) @function.method.call .)
+  ":" @punctuation.delimiter
+  (symbol) @function.method.call .)
 
-(list . (symbol) @function.call)
-(list . (multi_symbol (symbol) @function.call .))
+(list
+  .
+  (symbol) @function.call)
+
+(list
+  .
+  (multi_symbol
+    (symbol) @function.call .))
 
 ((symbol) @variable.builtin
- (#lua-match? @variable.builtin "^[$]"))
+  (#lua-match? @variable.builtin "^[$]"))
 
 (binding) @string.special.symbol
 
@@ -51,30 +60,34 @@
   "#"
 ] @keyword.function
 
-(fn name: [
- (symbol) @function
- (multi_symbol (symbol) @function .)
-])
+(fn
+  name:
+    [
+      (symbol) @function
+      (multi_symbol
+        (symbol) @function .)
+    ])
 
-(lambda name: [
- (symbol) @function
- (multi_symbol (symbol) @function .)
-])
+(lambda
+  name:
+    [
+      (symbol) @function
+      (multi_symbol
+        (symbol) @function .)
+    ])
 
 [
   "for"
   "each"
 ] @keyword.repeat
-((symbol) @keyword.repeat
- (#any-of? @keyword.repeat
-  "while"))
 
-[
-  "match"
-] @keyword.conditional
+((symbol) @keyword.repeat
+  (#any-of? @keyword.repeat "while"))
+
+"match" @keyword.conditional
+
 ((symbol) @keyword.conditional
- (#any-of? @keyword.conditional
-  "if" "when"))
+  (#any-of? @keyword.conditional "if" "when"))
 
 [
   "global"
@@ -85,13 +98,12 @@
   "where"
   "or"
 ] @keyword
+
 ((symbol) @keyword
- (#any-of? @keyword
-  "comment" "do" "doc" "eval-compiler" "lua" "macros" "quote" "tset" "values"))
+  (#any-of? @keyword "comment" "do" "doc" "eval-compiler" "lua" "macros" "quote" "tset" "values"))
 
 ((symbol) @keyword.import
- (#any-of? @keyword.import
-  "require" "require-macros" "import-macros" "include"))
+  (#any-of? @keyword.import "require" "require-macros" "import-macros" "include"))
 
 [
   "collect"
@@ -100,22 +112,14 @@
 ] @function.macro
 
 ((symbol) @function.macro
- (#any-of? @function.macro
-  "->" "->>" "-?>" "-?>>" "?." "doto" "macro" "macrodebug" "partial" "pick-args"
-  "pick-values" "with-open"))
+  (#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"))
+  (#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"))
+  (#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"))
+  (#any-of? @function.builtin "loadstring" "module" "setfenv" "unpack"))
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/fennel/injections.scm
+++ b/queries/fennel/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/fennel/locals.scm b/queries/fennel/locals.scm
index 38e54bf6d..bf3701a50 100644
--- a/queries/fennel/locals.scm
+++ b/queries/fennel/locals.scm
@@ -1,26 +1,32 @@
 [
- (program)
- (fn)
- (lambda)
- (let)
- (each)
- (for)
- (match)
+  (program)
+  (fn)
+  (lambda)
+  (let)
+  (each)
+  (for)
+  (match)
 ] @local.scope
 
-(
-  (list . (symbol) @_special) @local.scope
-  (#any-of? @_special
-   "while" "if" "when" "do" "collect" "icollect" "accumulate")
-)
+((list
+  .
+  (symbol) @_special) @local.scope
+  (#any-of? @_special "while" "if" "when" "do" "collect" "icollect" "accumulate"))
 
-(fn name: (symbol) @local.definition.function
+(fn
+  name: (symbol) @local.definition.function
   (#set! definition.function.scope "parent"))
-(lambda name: (symbol) @local.definition.function
+
+(lambda
+  name: (symbol) @local.definition.function
   (#set! definition.function.scope "parent"))
 
 ; TODO: use @local.definition.parameter for parameters
-(binding (symbol) @local.definition.var)
-(for_clause . (symbol) @local.definition.var)
+(binding
+  (symbol) @local.definition.var)
+
+(for_clause
+  .
+  (symbol) @local.definition.var)
 
 (symbol) @local.reference
diff --git a/queries/firrtl/folds.scm b/queries/firrtl/folds.scm
index 437b2c81c..4c64e644f 100644
--- a/queries/firrtl/folds.scm
+++ b/queries/firrtl/folds.scm
@@ -1,6 +1,6 @@
 [
- (circuit)
- (module)
- (when)
- (else)
+  (circuit)
+  (module)
+  (when)
+  (else)
 ] @fold
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index 5f165eb32..8e078fad2 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -1,30 +1,26 @@
 ; Namespaces
+(circuit
+  (identifier) @module)
 
-(circuit (identifier) @module)
-
-(module (identifier) @module)
+(module
+  (identifier) @module)
 
 ; Types
-
 ((identifier) @type
   (#lua-match? @type "^[A-Z][A-Za-z0-9_$]*$"))
 
 ; Keywords
-
 [
   "circuit"
   "module"
   "extmodule"
-
   "flip"
   "parameter"
   "reset"
   "wire"
-
   "cmem"
   "smem"
   "mem"
-
   "reg"
   "with"
   "mport"
@@ -34,39 +30,32 @@
   "is"
   "invalid"
   "skip"
-
   "infer"
   "read"
   "write"
   "rdwr"
-
   "defname"
 ] @keyword
 
 ; Qualifiers
-
 (qualifier) @type.qualifier
 
 ; Storageclasses
-
 [
   "input"
   "output"
 ] @keyword.storage
 
 ; Conditionals
-
 [
   "when"
   "else"
 ] @keyword.conditional
 
 ; Annotations
-
 (info) @attribute
 
 ; Builtins
-
 [
   "stop"
   "printf"
@@ -89,7 +78,6 @@
 ] @type.builtin
 
 ; Fields
-
 [
   "data-type"
   "depth"
@@ -104,33 +92,44 @@
 ((field_id) @variable.member
   (#set! "priority" 105))
 
-(port (identifier) @variable.member)
+(port
+  (identifier) @variable.member)
 
-(wire (identifier) @variable.member)
+(wire
+  (identifier) @variable.member)
 
-(cmem (identifier) @variable.member)
+(cmem
+  (identifier) @variable.member)
 
-(smem (identifier) @variable.member)
+(smem
+  (identifier) @variable.member)
 
-(memory (identifier) @variable.member)
+(memory
+  (identifier) @variable.member)
 
-(register (identifier) @variable.member)
+(register
+  (identifier) @variable.member)
 
 ; Parameters
+(primitive_operation
+  (identifier) @variable.parameter)
 
-(primitive_operation (identifier) @variable.parameter)
+(mux
+  (identifier) @variable.parameter)
 
-(mux (identifier) @variable.parameter)
-(printf (identifier) @variable.parameter)
-(reset (identifier) @variable.parameter)
-(stop (identifier) @variable.parameter)
+(printf
+  (identifier) @variable.parameter)
+
+(reset
+  (identifier) @variable.parameter)
+
+(stop
+  (identifier) @variable.parameter)
 
 ; Variables
-
 (identifier) @variable
 
 ; Operators
-
 (primop) @keyword.operator
 
 [
@@ -143,7 +142,6 @@
 ] @operator
 
 ; Literals
-
 [
   (uint)
   (number)
@@ -164,14 +162,25 @@
 ] @constant.builtin
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
-[ "<" ">" ] @punctuation.bracket
-
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   ","
@@ -180,7 +189,10 @@
 ] @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
 
-["=>" "<=" "="] @operator
+[
+  "=>"
+  "<="
+  "="
+] @operator
diff --git a/queries/firrtl/indents.scm b/queries/firrtl/indents.scm
index 8bc1e2019..e172e1e81 100644
--- a/queries/firrtl/indents.scm
+++ b/queries/firrtl/indents.scm
@@ -1,9 +1,9 @@
 [
- (circuit)
- (module)
- (memory)
- (when)
- (else)
+  (circuit)
+  (module)
+  (memory)
+  (when)
+  (else)
 ] @indent.begin
 
 [
diff --git a/queries/firrtl/injections.scm b/queries/firrtl/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/firrtl/injections.scm
+++ b/queries/firrtl/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/firrtl/locals.scm b/queries/firrtl/locals.scm
index aa0e294cd..97b7931bf 100644
--- a/queries/firrtl/locals.scm
+++ b/queries/firrtl/locals.scm
@@ -1,38 +1,45 @@
 ; Scopes
-
 [
   (source_file)
   (circuit)
   (module)
-
   (else)
   (when)
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
+(port
+  (identifier) @local.definition.field)
 
-(port (identifier) @local.definition.field)
+(wire
+  (identifier) @local.definition.field)
 
-(wire (identifier) @local.definition.field)
+(cmem
+  (identifier) @local.definition.field)
 
-(cmem (identifier) @local.definition.field)
+(smem
+  (identifier) @local.definition.field)
 
-(smem (identifier) @local.definition.field)
+(memory
+  (identifier) @local.definition.field)
 
-(memory (identifier) @local.definition.field)
+(register
+  (identifier) @local.definition.field)
 
-(register (identifier) @local.definition.field)
+(circuit
+  (identifier) @local.definition.namespace)
 
-(circuit (identifier) @local.definition.namespace)
+(module
+  (identifier) @local.definition.namespace)
 
-(module (identifier) @local.definition.namespace)
+(parameter
+  (identifier) @local.definition.parameter)
 
-(parameter (identifier) @local.definition.parameter)
+(rdwr
+  (identifier) @local.definition.var)
 
-(rdwr (identifier) @local.definition.var)
-
-(node (identifier) @local.definition.var)
+(node
+  (identifier) @local.definition.var)
diff --git a/queries/fish/folds.scm b/queries/fish/folds.scm
index 6075e2e04..06363e15e 100644
--- a/queries/fish/folds.scm
+++ b/queries/fish/folds.scm
@@ -1,8 +1,8 @@
 [
- (function_definition)
- (if_statement)
- (switch_statement)
- (for_statement)
- (while_statement)
- (begin_statement)
+  (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
index 28ddf0b98..77dccbf89 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -1,163 +1,174 @@
-;; Fish highlighting
-
-;; Operators
-
+; Fish highlighting
+; Operators
 [
- "&&"
- "||"
- "|"
- "&"
- ".."
- "!"
- (direction)
- (stream_redirect)
+  "&&"
+  "||"
+  "|"
+  "&"
+  ".."
+  "!"
+  (direction)
+  (stream_redirect)
 ] @operator
 
-;; match operators of test command
+; match operators of test command
 (command
-  name: (word) @function.builtin (#eq? @function.builtin "test")
-  argument: (word) @operator (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
+  name: (word) @function.builtin
+  (#eq? @function.builtin "test")
+  argument: (word) @operator
+  (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
 
-;; match operators of [ command
+; match operators of [ command
 (command
-  name: (word) @punctuation.bracket (#eq? @punctuation.bracket "[")
-  argument: (word) @operator (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
+  name: (word) @punctuation.bracket
+  (#eq? @punctuation.bracket "[")
+  argument: (word) @operator
+  (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
 
 [
- "not"
- "and"
- "or"
+  "not"
+  "and"
+  "or"
 ] @keyword.operator
 
-;; Conditionals
-
+; Conditionals
 (if_statement
-[
- "if"
- "end"
-] @keyword.conditional)
+  [
+    "if"
+    "end"
+  ] @keyword.conditional)
 
 (switch_statement
-[
- "switch"
- "end"
-] @keyword.conditional)
+  [
+    "switch"
+    "end"
+  ] @keyword.conditional)
 
 (case_clause
-[
- "case"
-] @keyword.conditional)
+  "case" @keyword.conditional)
 
-(else_clause 
-[
- "else"
-] @keyword.conditional)
+(else_clause
+  "else" @keyword.conditional)
 
-(else_if_clause 
-[
- "else"
- "if"
-] @keyword.conditional)
-
-;; Loops/Blocks
+(else_if_clause
+  [
+    "else"
+    "if"
+  ] @keyword.conditional)
 
+; Loops/Blocks
 (while_statement
-[
- "while"
- "end"
-] @keyword.repeat)
+  [
+    "while"
+    "end"
+  ] @keyword.repeat)
 
 (for_statement
-[
- "for"
- "end"
-] @keyword.repeat)
+  [
+    "for"
+    "end"
+  ] @keyword.repeat)
 
 (begin_statement
-[
- "begin"
- "end"
-] @keyword.repeat)
-
-;; Keywords
+  [
+    "begin"
+    "end"
+  ] @keyword.repeat)
 
+; Keywords
 [
- "in"
- (break)
- (continue)
+  "in"
+  (break)
+  (continue)
 ] @keyword
 
 "return" @keyword.return
 
-;; Punctuation
-
+; Punctuation
 [
- "["
- "]"
- "{"
- "}"
- "("
- ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "("
+  ")"
 ] @punctuation.bracket
 
 "," @punctuation.delimiter
 
-;; Commands
-
+; Commands
 (command
-  argument: [
-             (word) @variable.parameter (#lua-match? @variable.parameter "^[-]")
-            ]
-)
+  argument:
+    [
+      (word) @variable.parameter
+      (#lua-match? @variable.parameter "^[-]")
+    ])
 
-(command_substitution "$" @punctuation.bracket)
+(command_substitution
+  "$" @punctuation.bracket)
 
 ; non-builtin command names
-(command name: (word) @function.call)
+(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")
-        ]
-)
+  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")
+    ])
 
-;; Functions
-
-(function_definition ["function" "end"] @keyword.function)
+; Functions
+(function_definition
+  [
+    "function"
+    "end"
+  ] @keyword.function)
 
 (function_definition
-  name: [
-        (word) (concatenation)
-        ] 
-@function)
+  name:
+    [
+      (word)
+      (concatenation)
+    ] @function)
 
 (function_definition
-  option: [
-          (word)
-          (concatenation (word))
-          ] @variable.parameter (#lua-match? @variable.parameter "^[-]")
-)
+  option:
+    [
+      (word)
+      (concatenation
+        (word))
+    ] @variable.parameter
+  (#lua-match? @variable.parameter "^[-]"))
 
-;; Strings
+; Strings
+[
+  (double_quote_string)
+  (single_quote_string)
+] @string
 
-[(double_quote_string) (single_quote_string)] @string
 (escape_sequence) @string.escape
 
-;; Variables
-
+; Variables
 (variable_name) @variable
+
 (variable_expansion) @constant
 
-;; Nodes
+; Nodes
+[
+  (integer)
+  (float)
+] @number
 
-[(integer) (float)] @number
 (comment) @comment
+
 (comment) @spell
 
 ((word) @boolean
-(#any-of? @boolean "true" "false"))
+  (#any-of? @boolean "true" "false"))
 
-((program . (comment) @keyword.directive)
+((program
+  .
+  (comment) @keyword.directive)
   (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/fish/indents.scm b/queries/fish/indents.scm
index 526c56e69..4984c4cb2 100644
--- a/queries/fish/indents.scm
+++ b/queries/fish/indents.scm
@@ -1,16 +1,16 @@
 [
- (function_definition)
- (while_statement)
- (for_statement)
- (if_statement)
- (begin_statement)
- (switch_statement)
+  (function_definition)
+  (while_statement)
+  (for_statement)
+  (if_statement)
+  (begin_statement)
+  (switch_statement)
 ] @indent.begin
 
 [
- "else" ; else and else if must both start the line with "else", so tag the string directly
- "case"
- "end"
+  "else" ; else and else if must both start the line with "else", so tag the string directly
+  "case"
+  "end"
 ] @indent.branch
 
 "end" @indent.end
diff --git a/queries/fish/injections.scm b/queries/fish/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/fish/injections.scm
+++ b/queries/fish/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/fish/locals.scm b/queries/fish/locals.scm
index 15c3aac1d..904d568f9 100644
--- a/queries/fish/locals.scm
+++ b/queries/fish/locals.scm
@@ -1,4 +1,4 @@
-;; Scopes
+; Scopes
 [
   (command)
   (function_definition)
@@ -9,10 +9,11 @@
   (switch_statement)
 ] @local.scope
 
-;; Definitions
+; Definitions
 (function_definition
   name: (word) @local.definition.function)
 
-;; References
+; References
 (variable_name) @local.reference
+
 (word) @local.reference
diff --git a/queries/foam/folds.scm b/queries/foam/folds.scm
index 2e499c2e2..e05d0dbaa 100644
--- a/queries/foam/folds.scm
+++ b/queries/foam/folds.scm
@@ -1,7 +1,8 @@
 [
-    (comment)
-    (list)
-    (dict_core)
+  (comment)
+  (list)
+  (dict_core)
 ] @fold
 
-(code (code_body)* @fold)
+(code
+  (code_body)* @fold)
diff --git a/queries/foam/highlights.scm b/queries/foam/highlights.scm
index 33370df66..9c96f196e 100644
--- a/queries/foam/highlights.scm
+++ b/queries/foam/highlights.scm
@@ -1,44 +1,47 @@
-;; Comments
+; Comments
 (comment) @comment @spell
 
-;; Generic Key-value pairs and dictionary keywords
+; Generic Key-value pairs and dictionary keywords
 (key_value
-    keyword: (identifier) @function
-)
+  keyword: (identifier) @function)
+
 (dict
-    key: (identifier) @type
-)
+  key: (identifier) @type)
 
-;; Macros
+; Macros
 (macro
-    "$" @keyword.conditional
-    (prev_scope)* @keyword.conditional
-    (identifier)* @module
-)
+  "$" @keyword.conditional
+  (prev_scope)* @keyword.conditional
+  (identifier)* @module)
 
-
-;; Directives
+; Directives
 "#" @keyword.conditional
+
 (preproc_call
-    directive: (identifier)* @keyword.conditional
-    argument: (identifier)* @module
-)
+  directive: (identifier)* @keyword.conditional
+  argument: (identifier)* @module)
+
 ((preproc_call
   argument: (identifier)* @module) @keyword.conditional
   (#eq? @keyword.conditional "ifeq"))
+
 ((preproc_call) @keyword.conditional
   (#any-of? @keyword.conditional "else" "endif"))
 
-;; Literals
+; Literals
 (number_literal) @number.float
+
 (string_literal) @string
+
 (escape_sequence) @string.escape
+
 (boolean) @boolean
 
-;; Treat [m^2 s^-2] the same as if it was put in numbers format
-(dimensions dimension: (identifier) @number.float)
+; Treat [m^2 s^-2] the same as if it was put in numbers format
+(dimensions
+  dimension: (identifier) @number.float)
 
-;; Punctuation
+; Punctuation
 [
   "("
   ")"
diff --git a/queries/foam/indents.scm b/queries/foam/indents.scm
index a52cafea6..be02b80ed 100644
--- a/queries/foam/indents.scm
+++ b/queries/foam/indents.scm
@@ -3,9 +3,9 @@
   "}"
 ] @indent.branch
 
-[(dict) (key_value)] @indent.begin
-
-
 [
-  (comment)
-] @indent.ignore
+  (dict)
+  (key_value)
+] @indent.begin
+
+(comment) @indent.ignore
diff --git a/queries/foam/injections.scm b/queries/foam/injections.scm
index 2d744f6af..e1c223bd2 100644
--- a/queries/foam/injections.scm
+++ b/queries/foam/injections.scm
@@ -1,20 +1,20 @@
-;; Pass code blocks to Cpp highlighter
-(code 
-  (code_body) @injection.content 
+; Pass code blocks to Cpp highlighter
+(code
+  (code_body) @injection.content
   (#set! injection.language "cpp"))
 
-;; Pass identifiers to Go highlighter (Cheating I know)
-;; ((identifier) @injection.content
-;;  (#set! injection.language "lua")
+; Pass identifiers to Go highlighter (Cheating I know)
+; ((identifier) @injection.content
+;  (#set! injection.language "lua")
+; Highlight regex syntax inside literal strings
+((string_literal) @injection.content
+  (#set! injection.language "regex"))
 
-;; Highlight regex syntax inside literal strings
-((string_literal) @injection.content 
- (#set! injection.language "regex"))
-
-;; Highlight PyFoam syntax as Python statements
+; Highlight PyFoam syntax as Python statements
 (pyfoam_variable
   code_body: (_) @injection.content
   (#set! injection.language "python"))
+
 (pyfoam_expression
   code_body: (_) @injection.content
   (#set! injection.language "python"))
diff --git a/queries/foam/locals.scm b/queries/foam/locals.scm
index c1f635036..508643672 100644
--- a/queries/foam/locals.scm
+++ b/queries/foam/locals.scm
@@ -1,6 +1,12 @@
 (dict) @local.scope
 
-(dict key: (_) @local.definition.type)
+(dict
+  key: (_) @local.definition.type)
 
-(key_value keyword: (_) @local.definition.parameter)
-(key_value value: (macro (identifier)*)* @local.reference)
+(key_value
+  keyword: (_) @local.definition.parameter)
+
+(key_value
+  value:
+    (macro
+      (identifier)*)* @local.reference)
diff --git a/queries/fortran/folds.scm b/queries/fortran/folds.scm
index a2edc64d3..cedbdb635 100644
--- a/queries/fortran/folds.scm
+++ b/queries/fortran/folds.scm
@@ -1,11 +1,11 @@
-;; by @oponkork
+; by @oponkork
 [
- (if_statement)
- (where_statement)
- (enum_statement)
- (do_loop_statement)
- (derived_type_definition)
- (function)
- (subroutine)
- (interface)
+  (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
index c2eaa6a7e..c88ad9cec 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -1,9 +1,7 @@
 ; Preprocs
-
 (preproc_file_line) @keyword.directive
 
 ; Namespaces
-
 (program_statement
   (name) @module)
 
@@ -23,7 +21,6 @@
   (name) @module)
 
 ; Includes
-
 [
   "import"
   "include"
@@ -32,10 +29,12 @@
 
 (import_statement
   ","
-  ["all" "none"] @keyword)
+  [
+    "all"
+    "none"
+  ] @keyword)
 
 ; Attributes
-
 [
   (none)
   "implicit"
@@ -46,7 +45,6 @@
   "type" @attribute)
 
 ; Keywords
-
 [
   "attributes"
   "associate"
@@ -88,22 +86,14 @@
   "typeis"
 ] @keyword
 
-[
-  (default)
-] @keyword
+(default) @keyword
 
 ; Types
+(type_name) @type
 
-[
-  (type_name)
-] @type
-
-[
-  (intrinsic_type)
-] @type.builtin
+(intrinsic_type) @type.builtin
 
 ; Qualifiers
-
 [
   "abstract"
   "allocatable"
@@ -150,7 +140,6 @@
 ] @keyword.storage
 
 ; Labels
-
 [
   (statement_label)
   (statement_label_reference)
@@ -174,7 +163,6 @@
 ] @keyword.return
 
 ; Functions
-
 (function_statement
   (name) @function)
 
@@ -208,13 +196,9 @@
 ] @function.builtin
 
 ; Exceptions
-
-[
-  "error"
-] @keyword.exception
+"error" @keyword.exception
 
 ; Conditionals
-
 [
   "else"
   "elseif"
@@ -227,7 +211,6 @@
 ] @keyword.conditional
 
 ; Repeats
-
 [
   "do"
   "concurrent"
@@ -241,11 +224,9 @@
 ] @keyword.repeat
 
 ; Variables
-
 (identifier) @variable
 
 ; Parameters
-
 (keyword_argument
   name: (identifier) @variable.parameter)
 
@@ -253,12 +234,10 @@
   (identifier) @variable.parameter)
 
 ; Properties
-
 (derived_type_member_expression
   (type_member) @property)
 
 ; Operators
-
 [
   "+"
   "-"
@@ -291,15 +270,26 @@
 ] @keyword.operator
 
 ; Punctuation
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
-
-[ "<<<" ">>>" ] @punctuation.bracket
+[
+  "<<<"
+  ">>>"
+] @punctuation.bracket
 
 (array_literal
-  ["(/" "/)"] @punctuation.bracket)
+  [
+    "(/"
+    "/)"
+  ] @punctuation.bracket)
 
 [
   ":"
@@ -311,7 +301,6 @@
 ] @punctuation.delimiter
 
 ; Literals
-
 (string_literal) @string
 
 (number_literal) @number
@@ -321,7 +310,6 @@
 (null_literal) @constant.builtin
 
 ; Comments
-
 (comment) @comment @spell
 
 ((comment) @comment.documentation
diff --git a/queries/fsh/highlights.scm b/queries/fsh/highlights.scm
index 9a11e279f..3404fa7c6 100644
--- a/queries/fsh/highlights.scm
+++ b/queries/fsh/highlights.scm
@@ -71,17 +71,23 @@
   "Canonical"
 ] @type.builtin
 
+(sd_metadata
+  (parent
+    (name))) @type
 
-(sd_metadata (parent (name))) @type
-(target_type (name)) @type
+(target_type
+  (name)) @type
 
 ; Strings
 (string) @string
+
 (multiline_string) @string
 
 ; Constants
 (strength_value) @constant
+
 (bool) @constant.boolean
+
 (flag) @constant
 
 ; Special Params
diff --git a/queries/func/highlights.scm b/queries/func/highlights.scm
index b5b6dde35..a6fb6bd0b 100644
--- a/queries/func/highlights.scm
+++ b/queries/func/highlights.scm
@@ -1,13 +1,10 @@
 ; Include
-
 "#include" @keyword.import
+
 (include_path) @string
 
 ; Preproc
-
-[
-  "#pragma"
-] @keyword.directive
+"#pragma" @keyword.directive
 
 (pragma_directive
   [
@@ -17,7 +14,6 @@
   ] @keyword.directive)
 
 ; Keywords
-
 [
   "asm"
   "impure"
@@ -27,12 +23,9 @@
   "type"
 ] @keyword
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 ; Conditionals
-
 [
   "if"
   "ifnot"
@@ -43,14 +36,12 @@
 ] @keyword.conditional
 
 ; Exceptions
-
 [
   "try"
   "catch"
 ] @keyword.exception
 
 ; Repeats
-
 [
   "do"
   "forall"
@@ -66,16 +57,13 @@
 ] @type.qualifier
 
 ; Variables
-
 (identifier) @variable
 
 ; Constants
-
 (const_var_declarations
   name: (identifier) @constant)
 
 ; Functions/Methods
-
 (function_definition
   name: (function_name) @function)
 
@@ -86,17 +74,14 @@
   method_name: (identifier) @function.method.call)
 
 ; Parameters
-
 (parameter) @variable.parameter
 
 ; Types
-
 (type_identifier) @type
 
 (primitive_type) @type.builtin
 
 ; Operators
-
 [
   "="
   "+="
@@ -143,7 +128,6 @@
 ] @operator
 
 ; Literals
-
 [
   (string)
   (asm_instruction)
@@ -157,12 +141,21 @@
 (number) @number
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-["{" "}"] @punctuation.bracket
+[
+  "("
+  ")"
+  "()"
+] @punctuation.bracket
 
-["(" ")" "()"] @punctuation.bracket
-
-["[" "]"] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   ";"
@@ -171,5 +164,4 @@
 ] @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/fusion/highlights.scm b/queries/fusion/highlights.scm
index e8c217e67..dca576f84 100644
--- a/queries/fusion/highlights.scm
+++ b/queries/fusion/highlights.scm
@@ -1,11 +1,14 @@
 (comment) @comment @spell
+
 (afx_comment) @comment @spell
 
 ; identifiers afx
 (afx_opening_element
   (afx_identifier) @tag)
+
 (afx_closing_element
   (afx_identifier) @tag)
+
 (afx_element_self_closing
   (afx_identifier) @tag)
 
@@ -15,11 +18,9 @@
 (afx_text) @spell
 
 ; identifiers eel
-
 (eel_object_path
   (eel_path_identifier) @variable.builtin
-  (#any-of? @variable.builtin "this" "props")
-)
+  (#any-of? @variable.builtin "this" "props"))
 
 (eel_object_path
   (eel_path_identifier) @variable)
@@ -33,19 +34,16 @@
 
 ; identifiers fusion
 ; -----------
-
 (path_part) @property
-(meta_property) @attribute
-(prototype_signature
-  "prototype" @keyword
 
-)
+(meta_property) @attribute
+
+(prototype_signature
+  "prototype" @keyword)
+
 (include_statement
-  [
-   "include"
-  ] @keyword.import
-  (source_file) @string.special.url
-)
+  "include" @keyword.import
+  (source_file) @string.special.url)
 
 (namespace_declaration
   "namespace" @keyword
@@ -58,21 +56,21 @@
 ; ------
 (afx_opening_element
   [
-   "<"
-   ">"
-   ] @punctuation.bracket)
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
- (afx_closing_element
+(afx_closing_element
   [
-   "<"
-   ">"
-   "/"
-   ] @punctuation.bracket)
+    "<"
+    ">"
+    "/"
+  ] @punctuation.bracket)
 
 (afx_element_self_closing
   [
-   "<"
-   "/>"
+    "<"
+    "/>"
   ] @punctuation.bracket)
 
 [
@@ -80,41 +78,55 @@
   (alias_namespace)
 ] @module
 
-(namespace_declaration "=" @operator)
-(assignment "=" @operator)
-(copy "<" @operator)
+(namespace_declaration
+  "=" @operator)
+
+(assignment
+  "=" @operator)
+
+(copy
+  "<" @operator)
+
 (deletion) @operator
+
 (eel_binary_expression
   operator: _ @operator)
+
 (eel_not_expression
   [
-   "!"
-   "not"
+    "!"
+    "not"
   ] @operator)
 
 (string) @string
+
 (number) @number
+
 (boolean) @boolean
+
 (null) @constant.builtin
 
 (value_expression
   start: _ @punctuation.special
-  end: _ @punctuation.special
-)
+  end: _ @punctuation.special)
+
 [
- "("
- ")"
- "{"
- "}"
- "["
- "]"
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
 ] @punctuation.bracket
 
 [
- ":"
- "."
- "?"
+  ":"
+  "."
+  "?"
 ] @punctuation.delimiter
 
 (eel_ternary_expression
-  ["?" ":"] @keyword.conditional.ternary)
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
diff --git a/queries/fusion/indents.scm b/queries/fusion/indents.scm
index 73133191b..0ba6cf758 100644
--- a/queries/fusion/indents.scm
+++ b/queries/fusion/indents.scm
@@ -7,13 +7,18 @@
   (eel_object)
 ] @indent.begin
 
+(block
+  end: _ @indent.branch)
 
-(block end: _ @indent.branch)
-(value_dsl end: _ @indent.branch)
-(eel_array end: _ @indent.branch)
-(eel_object end: _ @indent.branch)
-[
-  (afx_closing_element)
-] @indent.branch
+(value_dsl
+  end: _ @indent.branch)
+
+(eel_array
+  end: _ @indent.branch)
+
+(eel_object
+  end: _ @indent.branch)
+
+(afx_closing_element) @indent.branch
 
 (comment) @indent.ignore
diff --git a/queries/fusion/locals.scm b/queries/fusion/locals.scm
index 19afce078..d23e0ab46 100644
--- a/queries/fusion/locals.scm
+++ b/queries/fusion/locals.scm
@@ -1,21 +1,23 @@
-;; Fusion base
+; Fusion base
 (block) @local.scope
 
 (namespace_declaration
   (alias_namespace) @local.definition.namespace)
 
 (property
-  (path (path_part) @local.definition.field))
+  (path
+    (path_part) @local.definition.field))
 
 (type
   namespace: (package_name)? @local.definition.namespace
-  name: (type_name) @local.definition.type
-)
+  name: (type_name) @local.definition.type)
 
-;; Eel Expressions
+; Eel Expressions
 (eel_arrow_function) @local.scope
+
 (eel_object) @local.scope
 
 (eel_parameter) @local.definition.parameter
+
 (eel_object_pair
   key: (eel_property_name) @local.definition.field)
diff --git a/queries/gdscript/folds.scm b/queries/gdscript/folds.scm
index 946b0fea3..828ef807f 100644
--- a/queries/gdscript/folds.scm
+++ b/queries/gdscript/folds.scm
@@ -2,7 +2,6 @@
   ; Body fold will "join" the next adjacent fold into a SUPER fold.
   ; This is an issue with the grammar.
   ; (body)
-
   (if_statement)
   (elif_clause)
   (else_clause)
@@ -16,10 +15,11 @@
   (lambda)
   (constructor_definition)
 ] @fold
-
 ; It's nice to be able to fold the if/elif/else clauses and the entire
 ; if_statement.
-(if_statement (body) @fold)
+(if_statement
+  (body) @fold)
 
 ; Fold strings that are probably doc strings.
-(expression_statement (string) @fold)
+(expression_statement
+  (string) @fold)
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 21e0b8e0b..212bc67e3 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -1,23 +1,44 @@
-;; Basic
-
+; Basic
 (identifier) @variable
+
 (name) @variable
+
 (type) @type
+
 (comment) @comment @spell
+
 (string_name) @string
+
 (string) @string
+
 (float) @number.float
+
 (integer) @number
+
 (null) @constant
+
 (setter) @function
+
 (getter) @function
-(set_body "set" @keyword.function)
-(get_body "get" @keyword.function)
+
+(set_body
+  "set" @keyword.function)
+
+(get_body
+  "get" @keyword.function)
+
 (static_keyword) @type.qualifier
+
 (tool_statement) @keyword
+
 (breakpoint_statement) @keyword.debug
+
 (inferred_type) @operator
-[(true) (false)] @boolean
+
+[
+  (true)
+  (false)
+] @boolean
 
 [
   (get_node)
@@ -31,68 +52,105 @@
   "const" @type.qualifier
   (name) @constant)
 
-(expression_statement (string) @comment @spell)
+(expression_statement
+  (string) @comment @spell)
 
-;; Identifier naming conventions
+; Identifier naming conventions
 ((identifier) @type
   (#lua-match? @type "^[A-Z]"))
+
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
-;; Functions
+; Functions
 (constructor_definition) @constructor
 
 (function_definition
-  (name) @function (parameters
+  (name) @function
+  (parameters
     (identifier) @variable.parameter)*)
 
-(typed_parameter (identifier) @variable.parameter)
-(default_parameter (identifier) @variable.parameter)
+(typed_parameter
+  (identifier) @variable.parameter)
 
-(call (identifier) @function.call)
-(call (identifier) @keyword.import
-      (#any-of? @keyword.import "preload" "load"))
+(default_parameter
+  (identifier) @variable.parameter)
 
-;; Properties and Methods
+(call
+  (identifier) @function.call)
 
+(call
+  (identifier) @keyword.import
+  (#any-of? @keyword.import "preload" "load"))
+
+; Properties and Methods
 ; We'll use @property since that's the term Godot uses.
 ; But, should (source (variable_statement (name))) be @property, too? Since a
 ; script file is a class in gdscript.
 (class_definition
-  (body (variable_statement (name) @property)))
+  (body
+    (variable_statement
+      (name) @property)))
 
 ; Same question but for methods?
 (class_definition
-  (body (function_definition (name) @function.method)))
+  (body
+    (function_definition
+      (name) @function.method)))
 
-(attribute_call (identifier) @function.method.call)
-(attribute (_) (identifier) @property)
+(attribute_call
+  (identifier) @function.method.call)
 
-;; Enums
+(attribute
+  (_)
+  (identifier) @property)
 
-(enumerator left: (identifier) @constant)
-
-;; Special Builtins
+; Enums
+(enumerator
+  left: (identifier) @constant)
 
+; Special Builtins
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "self" "super"))
 
-(attribute_call (identifier) @keyword.operator
- (#eq? @keyword.operator "new"))
+(attribute_call
+  (identifier) @keyword.operator
+  (#eq? @keyword.operator "new"))
 
-;; Match Pattern
+; Match Pattern
+(underscore) @constant ; The "_" pattern.
 
-(underscore) @constant         ; The "_" pattern.
 (pattern_open_ending) @operator ; The ".." pattern.
 
-;; Alternations
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+; Alternations
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
-["," "." ":"] @punctuation.delimiter
+[
+  ","
+  "."
+  ":"
+] @punctuation.delimiter
 
-["if" "elif" "else" "match"] @keyword.conditional
+[
+  "if"
+  "elif"
+  "else"
+  "match"
+] @keyword.conditional
 
-["for" "while" "break" "continue"] @keyword.repeat
+[
+  "for"
+  "while"
+  "break"
+  "continue"
+] @keyword.repeat
 
 [
   "~"
@@ -157,28 +215,24 @@
 
 "func" @keyword.function
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
-[
-  "await"
-] @keyword.coroutine
+"await" @keyword.coroutine
 
-(call (identifier) @keyword.coroutine
-      (#eq? @keyword.coroutine "yield"))
+(call
+  (identifier) @keyword.coroutine
+  (#eq? @keyword.coroutine "yield"))
 
-
-;; Builtins
+; Builtins
 ; generated from
 ; - https://github.com/godotengine/godot/blob/491ded18983a4ae963ce9c29e8df5d5680873ccb/doc/classes/@GlobalScope.xml
 ; - https://github.com/godotengine/godot/blob/491ded18983a4ae963ce9c29e8df5d5680873ccb/modules/gdscript/doc_classes/@GDScript.xml
 ; some from:
 ; - https://github.com/godotengine/godot-vscode-plugin/blob/0636797c22bf1e23a41fd24d55cdb9be62e0c992/syntaxes/GDScript.tmLanguage.json
-
-;; Built-in Annotations
-
-((annotation "@" @attribute (identifier) @attribute)
+; Built-in Annotations
+((annotation
+  "@" @attribute
+  (identifier) @attribute)
   ; format-ignore
   (#any-of? @attribute
     ; @GDScript
@@ -191,9 +245,11 @@
     "export_placeholder" "export_range" "export_subgroup" "icon" "onready"
     "rpc" "tool" "warning_ignore"))
 
-;; Builtin Types
-
-([(identifier) (type)] @type.builtin
+; Builtin Types
+([
+  (identifier)
+  (type)
+] @type.builtin
   ; format-ignore
   (#any-of? @type.builtin
    ; from godot-vscode-plugin
@@ -220,9 +276,9 @@
    "TranslationServer" "WorkerThreadPool" "XRServer"
   ))
 
-;; Builtin Funcs
-
-(call (identifier) @function.builtin
+; Builtin Funcs
+(call
+  (identifier) @function.builtin
   ; format-ignore
   (#any-of? @function.builtin
     ; @GlobalScope
@@ -248,9 +304,7 @@
     "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
     "is_instance_of" "len" "print_debug" "print_stack" "range"
     "type_exists"))
-
-;; Builtin Constants
-
+; Builtin Constants
 ((identifier) @constant.builtin
   ; format-ignore
   (#any-of? @constant.builtin
@@ -341,4 +395,3 @@
     "OP_EQUAL" "OP_NOT_EQUAL" "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT"
     "OP_MULTIPLY" "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
     "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"))
-
diff --git a/queries/gdscript/indents.scm b/queries/gdscript/indents.scm
index 4eb579b22..22d155e6f 100644
--- a/queries/gdscript/indents.scm
+++ b/queries/gdscript/indents.scm
@@ -1,7 +1,6 @@
 [
   (lambda)
   (function_definition)
-
   (for_statement)
   (while_statement)
   (if_statement)
@@ -20,12 +19,12 @@
 ] @indent.branch
 
 [
- (string)
- (comment)
- (array)
- (dictionary)
- (parenthesized_expression)
- (ERROR)
+  (string)
+  (comment)
+  (array)
+  (dictionary)
+  (parenthesized_expression)
+  (ERROR)
 ] @indent.auto
 
 [
@@ -36,43 +35,43 @@
 ] @indent.dedent
 
 [
-  (ERROR "[")
-  (ERROR "(")
-  (ERROR "{")
+  (ERROR
+    "[")
+  (ERROR
+    "(")
+  (ERROR
+    "{")
 ] @indent.begin
 
-;; This only works with expanded tabs.
+; This only works with expanded tabs.
 ; ((parameters) @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")"))
 ; ((arguments)  @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")"))
-
-;; The following queries either do not agree with the current body parsing or are
-;; attempted workarounds. Specifically as the last statement of a body. Opening
-;; a new line in between statements works well.
-;;
-;; The overall experience is poor, so I've opted for @indent.auto.
-;;
-;; The gdscript parser will need to be patched to accommodate more interactive
-;; edits. As far as I can tell the parser greedily consumes whitespace
-;; as a zero-width token which causes trouble when inserting indents.
-
-;; This indents correctly with tabs.
+; The following queries either do not agree with the current body parsing or are
+; attempted workarounds. Specifically as the last statement of a body. Opening
+; a new line in between statements works well.
+;
+; The overall experience is poor, so I've opted for @indent.auto.
+;
+; The gdscript parser will need to be patched to accommodate more interactive
+; edits. As far as I can tell the parser greedily consumes whitespace
+; as a zero-width token which causes trouble when inserting indents.
+; This indents correctly with tabs.
 ; (arguments) @indent.begin
 ; (parameters) @indent.begin
 ; (array) @indent.begin
 ; (dictionary) @indent.begin
 ; (parenthesized_expression) @indent.begin
-
-;; Partial workaround for when the cursor is on the bracket character and a newline
-;; is created with <o>. Without this the newline is opened with extra
-;; indentation.
+; Partial workaround for when the cursor is on the bracket character and a newline
+; is created with <o>. Without this the newline is opened with extra
+; indentation.
 ; (body (_ (array "]" @indent.end) ) _)
-;; Problematic behaviors occur at the last statement of a body.
-;; with @dedent:
-;;   - [ | ] i<CR> will dedent ] to 0.
-;;   - [
-;;   ]| o will open new line at correct indentation.
-;; with @auto:
-;;   - [ | ] i<CR> same
-;;   - [
-;;   ]| o will open new line with extra indent.
+; Problematic behaviors occur at the last statement of a body.
+; with @dedent:
+;   - [ | ] i<CR> will dedent ] to 0.
+;   - [
+;   ]| o will open new line at correct indentation.
+; with @auto:
+;   - [ | ] i<CR> same
+;   - [
+;   ]| o will open new line with extra indent.
 ;(body (_ (array "]" @indent.auto) ) .)
diff --git a/queries/gdscript/injections.scm b/queries/gdscript/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/gdscript/injections.scm
+++ b/queries/gdscript/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/gdscript/locals.scm b/queries/gdscript/locals.scm
index ebcda4f7d..83a1b4433 100644
--- a/queries/gdscript/locals.scm
+++ b/queries/gdscript/locals.scm
@@ -1,5 +1,4 @@
-;; Scopes
-
+; Scopes
 [
   (if_statement)
   (elif_clause)
@@ -16,77 +15,107 @@
   (set_body)
 ] @local.scope
 
-;; Parameters
+; Parameters
+(parameters
+  (identifier) @local.definition.parameter)
 
-(parameters (identifier) @local.definition.parameter)
-(default_parameter (identifier) @local.definition.parameter)
-(typed_parameter (identifier) @local.definition.parameter)
-(typed_default_parameter (identifier) @local.definition.parameter)
+(default_parameter
+  (identifier) @local.definition.parameter)
 
-;; Signals
+(typed_parameter
+  (identifier) @local.definition.parameter)
 
+(typed_default_parameter
+  (identifier) @local.definition.parameter)
+
+; Signals
 ; Can gdscript 2 signals be considered fields?
-(signal_statement (name) @local.definition.field)
+(signal_statement
+  (name) @local.definition.field)
 
-;; Variable Definitions
+; Variable Definitions
+(const_statement
+  (name) @local.definition.constant)
 
-(const_statement (name) @local.definition.constant)
 ; onready and export variations are only properties.
-(variable_statement (name) @local.definition.var)
+(variable_statement
+  (name) @local.definition.var)
 
 (setter) @local.reference
+
 (getter) @local.reference
 
-;; Function Definition
-
-((function_definition (name) @local.definition.function)
- (#set! "definition.function.scope" "parent"))
-
-;; Lambda
+; Function Definition
+((function_definition
+  (name) @local.definition.function)
+  (#set! "definition.function.scope" "parent"))
 
+; Lambda
 ; lambda names are not accessible and are only for debugging.
-(lambda (name) @local.definition.function)
+(lambda
+  (name) @local.definition.function)
 
-;; Source
+; Source
+(class_name_statement
+  (name) @local.definition.type)
 
-(class_name_statement (name) @local.definition.type)
+(source
+  (variable_statement
+    (name) @local.definition.field))
 
-(source (variable_statement (name) @local.definition.field))
-(source (onready_variable_statement (name) @local.definition.field))
-(source (export_variable_statement (name) @local.definition.field))
+(source
+  (onready_variable_statement
+    (name) @local.definition.field))
 
-;; Class
+(source
+  (export_variable_statement
+    (name) @local.definition.field))
 
-((class_definition (name) @local.definition.type)
- (#set! "definition.type.scope" "parent"))
+; Class
+((class_definition
+  (name) @local.definition.type)
+  (#set! "definition.type.scope" "parent"))
 
 (class_definition
-  (body (variable_statement (name) @local.definition.field)))
+  (body
+    (variable_statement
+      (name) @local.definition.field)))
+
 (class_definition
-  (body (onready_variable_statement (name) @local.definition.field)))
+  (body
+    (onready_variable_statement
+      (name) @local.definition.field)))
+
 (class_definition
-  (body (export_variable_statement (name) @local.definition.field)))
+  (body
+    (export_variable_statement
+      (name) @local.definition.field)))
+
 (class_definition
-  (body (signal_statement (name) @local.definition.field)))
+  (body
+    (signal_statement
+      (name) @local.definition.field)))
 
 ; Although a script is also a class, let's only define functions in an inner class as
 ; methods.
 ((class_definition
-  (body (function_definition (name) @local.definition.method)))
- (#set! "definition.method.scope" "parent"))
+  (body
+    (function_definition
+      (name) @local.definition.method)))
+  (#set! "definition.method.scope" "parent"))
 
-;; Enum
+; Enum
+((enum_definition
+  (name) @local.definition.enum))
 
-((enum_definition (name) @local.definition.enum))
+; Repeat
+(for_statement
+  .
+  (identifier) @local.definition.var)
 
-;; Repeat
-
-(for_statement . (identifier) @local.definition.var)
-
-;; Match Statement
-
-(pattern_binding (identifier) @local.definition.var)
-
-;; References
+; Match Statement
+(pattern_binding
+  (identifier) @local.definition.var)
 
+; References
 (identifier) @local.reference
diff --git a/queries/git_config/folds.scm b/queries/git_config/folds.scm
index e69de29bb..8b1378917 100644
--- a/queries/git_config/folds.scm
+++ b/queries/git_config/folds.scm
@@ -0,0 +1 @@
+
diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index df1dde803..ebae70e51 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -1,26 +1,23 @@
 ; Sections
-
 (section_name) @type
 
 ((section_name) @keyword.import
- (#eq? @keyword.import "include"))
+  (#eq? @keyword.import "include"))
 
 ((section_header
-   (section_name) @keyword.import
-   (subsection_name))
- (#eq? @keyword.import "includeIf"))
+  (section_name) @keyword.import
+  (subsection_name))
+  (#eq? @keyword.import "includeIf"))
 
-(variable (name) @property)
+(variable
+  (name) @property)
 
 ; Operators
-
-[
- "="
-] @operator
+"=" @operator
 
 ; Literals
-
 (integer) @number
+
 [
   (true)
   (false)
@@ -29,10 +26,10 @@
 (string) @string
 
 ((string) @string.special.path
- (#lua-match? @string.special.path "^[.]?[/]"))
+  (#lua-match? @string.special.path "^[.]?[/]"))
 
 ((string) @string.special.path
- (#lua-match? @string.special.path "^[~]"))
+  (#lua-match? @string.special.path "^[~]"))
 
 (section_header
   [
@@ -41,9 +38,10 @@
   ] @string.special)
 
 ; Punctuation
-
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/git_rebase/highlights.scm b/queries/git_rebase/highlights.scm
index 9ace6be26..248366e24 100644
--- a/queries/git_rebase/highlights.scm
+++ b/queries/git_rebase/highlights.scm
@@ -5,4 +5,3 @@
 (option) @operator
 
 (comment) @comment
-
diff --git a/queries/git_rebase/injections.scm b/queries/git_rebase/injections.scm
index 8e6815a68..da2628667 100644
--- a/queries/git_rebase/injections.scm
+++ b/queries/git_rebase/injections.scm
@@ -1,6 +1,5 @@
 ((operation
-   (command) @_command
-   (message) @injection.content)
-(#set! injection.language "bash")
-(#any-of? @_command "exec" "x"))
-
+  (command) @_command
+  (message) @injection.content)
+  (#set! injection.language "bash")
+  (#any-of? @_command "exec" "x"))
diff --git a/queries/gitattributes/highlights.scm b/queries/gitattributes/highlights.scm
index 9f3c03dfb..bc2e02e88 100644
--- a/queries/gitattributes/highlights.scm
+++ b/queries/gitattributes/highlights.scm
@@ -6,7 +6,10 @@
 (range_notation) @string.special
 
 (range_notation
-  [ "[" "]" ] @punctuation.bracket)
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
 
 (wildcard) @character.special
 
@@ -14,7 +17,8 @@
 
 (character_class) @constant
 
-(class_range ("-" @operator))
+(class_range
+  ("-" @operator))
 
 [
   (ansi_c_escape)
@@ -48,5 +52,4 @@
 ;   (redundant_escape)
 ;   (trailing_slash)
 ; ] @error
-
 (comment) @comment @spell
diff --git a/queries/gitattributes/injections.scm b/queries/gitattributes/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/gitattributes/injections.scm
+++ b/queries/gitattributes/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/gitattributes/locals.scm b/queries/gitattributes/locals.scm
index 43082a43d..2471b8bc6 100644
--- a/queries/gitattributes/locals.scm
+++ b/queries/gitattributes/locals.scm
@@ -1,4 +1,8 @@
-(macro_def (attr_name) @local.definition.macro)
+(macro_def
+  (attr_name) @local.definition.macro)
 
-(attribute (attr_name) @local.reference)
-(attribute (builtin_attr) @local.reference)
+(attribute
+  (attr_name) @local.reference)
+
+(attribute
+  (builtin_attr) @local.reference)
diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index d475021c2..880d05e01 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -1,32 +1,52 @@
 (comment) @comment
+
 (generated_comment) @comment
+
 (title) @markup.heading
+
 ; (text) @none
 (branch) @markup.link
+
 (change) @keyword
+
 (filepath) @string.special.url
+
 (arrow) @punctuation.delimiter
 
 (subject) @markup.heading @spell
-(subject (overflow) @none @spell)
-(subject (subject_prefix) @function @nospell)
-(prefix (type) @keyword @nospell)
-(prefix (scope) @variable.parameter @nospell)
-(prefix [
+
+(subject
+  (overflow) @none @spell)
+
+(subject
+  (subject_prefix) @function @nospell)
+
+(prefix
+  (type) @keyword @nospell)
+
+(prefix
+  (scope) @variable.parameter @nospell)
+
+(prefix
+  [
     "("
     ")"
     ":"
-] @punctuation.delimiter)
-(prefix [
-    "!"
-] @punctuation.special)
+  ] @punctuation.delimiter)
+
+(prefix
+  "!" @punctuation.special)
 
 (message) @spell
 
-(trailer (token) @label)
-; (trailer (value) @none)
+(trailer
+  (token) @label)
 
-(breaking_change (token) @comment.warning)
-(breaking_change (value) @none @spell)
+; (trailer (value) @none)
+(breaking_change
+  (token) @comment.warning)
+
+(breaking_change
+  (value) @none @spell)
 
 (scissor) @comment
diff --git a/queries/gitcommit/injections.scm b/queries/gitcommit/injections.scm
index 5e56dfa5f..5613d7e8e 100644
--- a/queries/gitcommit/injections.scm
+++ b/queries/gitcommit/injections.scm
@@ -1,5 +1,5 @@
 ((diff) @injection.content
- (#set! injection.language "diff"))
+  (#set! injection.language "diff"))
 
-((rebase_command) @injection.content 
- (#set! injection.language "git_rebase"))
+((rebase_command) @injection.content
+  (#set! injection.language "git_rebase"))
diff --git a/queries/gitignore/highlights.scm b/queries/gitignore/highlights.scm
index 6e83ea6f2..10ae3f309 100644
--- a/queries/gitignore/highlights.scm
+++ b/queries/gitignore/highlights.scm
@@ -19,13 +19,15 @@
   (bracket_char_escaped)
 ] @string.escape
 
-;; 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
index 7c3b16741..b4cd225e7 100644
--- a/queries/gleam/folds.scm
+++ b/queries/gleam/folds.scm
@@ -1,7 +1,7 @@
 ; Folds
 [
   (case)
-  (function) 
+  (function)
   (anonymous_function)
   (type_definition)
 ] @fold
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index f74f17ab7..5c34dde7a 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -9,14 +9,10 @@
 ] @keyword
 
 ; Function Keywords
-[
-  "fn"
-] @keyword.function
+"fn" @keyword.function
 
 ; Imports
-[
-  "import"
-] @keyword.import
+"import" @keyword.import
 
 ; Conditionals
 [
@@ -25,9 +21,7 @@
 ] @keyword.conditional
 
 ; Exceptions
-[
-  "assert"
-] @keyword.exception
+"assert" @keyword.exception
 
 ; Punctuation
 [
@@ -48,9 +42,7 @@
   "->"
 ] @punctuation.delimiter
 
-[
-  "#"
-] @punctuation.special
+"#" @punctuation.special
 
 ; Operators
 [
@@ -83,9 +75,7 @@
 (identifier) @variable
 
 ; Comments
-[
-  (comment)
-] @comment @spell
+(comment) @comment @spell
 
 [
   (module_comment)
@@ -100,9 +90,16 @@
 
 ; Modules & Imports
 (module) @module
-(import alias: ((identifier) @module)?)
-(remote_type_identifier module: (identifier) @module)
-(unqualified_import name: (identifier) @function)
+
+(import
+  alias:
+    ((identifier) @module)?)
+
+(remote_type_identifier
+  module: (identifier) @module)
+
+(unqualified_import
+  name: (identifier) @function)
 
 ; Strings
 (string) @string
@@ -116,15 +113,35 @@
 (float) @number.float
 
 ; Function Parameter Labels
-(function_call arguments: (arguments (argument label: (label) @label)))
-(function_parameter label: (label)? @label name: (identifier) @variable.parameter)
+(function_call
+  arguments:
+    (arguments
+      (argument
+        label: (label) @label)))
+
+(function_parameter
+  label: (label)? @label
+  name: (identifier) @variable.parameter)
 
 ; Records
-(record arguments: (arguments (argument label: (label) @property)?))
-(record_pattern_argument  label: (label) @property)
-(record_update_argument label: (label) @property)
-(field_access record: (identifier) @variable field: (label) @property)
-(data_constructor_argument (label) @property)
+(record
+  arguments:
+    (arguments
+      (argument
+        label: (label) @property)?))
+
+(record_pattern_argument
+  label: (label) @property)
+
+(record_update_argument
+  label: (label) @property)
+
+(field_access
+  record: (identifier) @variable
+  field: (label) @property)
+
+(data_constructor_argument
+  (label) @property)
 
 ; Types
 [
@@ -145,25 +162,44 @@
 ] @type.qualifier
 
 ; Tuples
-(tuple_access index: (integer) @operator)
+(tuple_access
+  index: (integer) @operator)
 
 ; Functions
-(function name: (identifier) @function)
-(function_call function: (identifier) @function.call)
-(function_call function: (field_access field: (label) @function.call))
+(function
+  name: (identifier) @function)
+
+(function_call
+  function: (identifier) @function.call)
+
+(function_call
+  function:
+    (field_access
+      field: (label) @function.call))
 
 ; External Functions
-(external_function name: (identifier) @function)
-(external_function_body (string) @module . (string) @function)
+(external_function
+  name: (identifier) @function)
+
+(external_function_body
+  (string) @module
+  .
+  (string) @function)
 
 ; Constructors
 (constructor_name) @type @constructor
 
-([(type_identifier) (constructor_name)] @constant.builtin
+([
+  (type_identifier)
+  (constructor_name)
+] @constant.builtin
   (#any-of? @constant.builtin "Ok" "Error"))
 
 ; Booleans
-((constructor_name) @boolean (#any-of? @boolean "True" "False"))
+((constructor_name) @boolean
+  (#any-of? @boolean "True" "False"))
 
 ; Pipe Operator
-(binary_expression operator: "|>" right: (identifier) @function)
+(binary_expression
+  operator: "|>"
+  right: (identifier) @function)
diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
index 37f88df66..c79854508 100644
--- a/queries/gleam/indents.scm
+++ b/queries/gleam/indents.scm
@@ -25,4 +25,6 @@
 ] @indent.end @indent.branch
 
 ; Gleam pipelines are not indented, but other binary expression chains are
-((binary_expression operator: _ @_operator) @indent.begin (#not-eq? @_operator "|>"))
+((binary_expression
+  operator: _ @_operator) @indent.begin
+  (#not-eq? @_operator "|>"))
diff --git a/queries/gleam/injections.scm b/queries/gleam/injections.scm
index 378240e38..11d4f5d55 100644
--- a/queries/gleam/injections.scm
+++ b/queries/gleam/injections.scm
@@ -1,7 +1,7 @@
 ; Comments
 ([
   (module_comment)
-  (statement_comment) 
-  (comment) 
- ] @injection.content
- (#set! injection.language "comment"))
+  (statement_comment)
+  (comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/gleam/locals.scm b/queries/gleam/locals.scm
index 43328ce1b..ba0632c0b 100644
--- a/queries/gleam/locals.scm
+++ b/queries/gleam/locals.scm
@@ -1,18 +1,25 @@
 ; Let Binding Definition
-(let pattern: (identifier) @local.definition)
+(let
+  pattern: (identifier) @local.definition)
 
 ; List Pattern Definitions
-(list_pattern (identifier) @local.definition)
-(list_pattern assign: (identifier) @local.definition)
+(list_pattern
+  (identifier) @local.definition)
+
+(list_pattern
+  assign: (identifier) @local.definition)
 
 ; Tuple Pattern Definition
-(tuple_pattern (identifier) @local.definition)
+(tuple_pattern
+  (identifier) @local.definition)
 
 ; Record Pattern Definition
-(record_pattern_argument pattern: (identifier) @local.definition)
+(record_pattern_argument
+  pattern: (identifier) @local.definition)
 
 ; Function Parameter Definition
-(function_parameter name: (identifier) @local.definition)
+(function_parameter
+  name: (identifier) @local.definition)
 
 ; References
 (identifier) @local.reference
diff --git a/queries/glimmer/folds.scm b/queries/glimmer/folds.scm
index cfe9d35b0..6502455d8 100644
--- a/queries/glimmer/folds.scm
+++ b/queries/glimmer/folds.scm
@@ -1,4 +1,5 @@
 [
- (element_node (element_node_start))
- (block_statement)
+  (element_node
+    (element_node_start))
+  (block_statement)
 ] @fold
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index 059a1069c..cfb1af15f 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -1,9 +1,9 @@
 ; === 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
   (#lua-match? @tag "^:?[%l]"))
+
 ; Tags that start with a capital letter are Glimmer components
 ((tag_name) @constructor
   (#lua-match? @constructor "^%u"))
@@ -11,74 +11,106 @@
 (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) @keyword.conditional)
-(block_statement_end path: (identifier) @keyword.conditional)
-((mustache_statement (identifier) @keyword.conditional)
- (#lua-match? @keyword.conditional "else"))
+(block_statement_start
+  path: (identifier) @keyword.conditional)
+
+(block_statement_end
+  path: (identifier) @keyword.conditional)
+
+((mustache_statement
+  (identifier) @keyword.conditional)
+  (#lua-match? @keyword.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
+((mustache_statement
+  [
+    (path_expression
+      (identifier) @variable)
+    (identifier) @variable
   ])
   (#not-any-of? @variable "yield" "outlet" "this" "else"))
+
 ; As are arguments in a block statement
-(block_statement_start argument: [
-  (path_expression (identifier) @variable)
-  (identifier) @variable
-  ])
+(block_statement_start
+  argument:
+    [
+      (path_expression
+        (identifier) @variable)
+      (identifier) @variable
+    ])
+
 ; As is an identifier in a block param
-(block_params (identifier) @variable)
+(block_params
+  (identifier) @variable)
+
 ; As are helper arguments
-((helper_invocation argument: [
-  (path_expression (identifier) @variable)
-  (identifier) @variable
-  ])
+((helper_invocation
+  argument:
+    [
+      (path_expression
+        (identifier) @variable)
+      (identifier) @variable
+    ])
   (#not-eq? @variable "this"))
+
 ; `this` should be highlighted as a built-in variable
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "this"))
 
 ; If the identifier is just "yield" or "outlet", it's a keyword
-((mustache_statement (identifier) @keyword)
+((mustache_statement
+  (identifier) @keyword)
   (#any-of? @keyword "yield" "outlet"))
 
 ; Helpers are functions
-((helper_invocation helper: [
-  (path_expression (identifier) @function)
-  (identifier) @function
-  ])
+((helper_invocation
+  helper:
+    [
+      (path_expression
+        (identifier) @function)
+      (identifier) @function
+    ])
   (#not-any-of? @function "if" "yield"))
-((helper_invocation helper: (identifier) @keyword.conditional)
+
+((helper_invocation
+  helper: (identifier) @keyword.conditional)
   (#eq? @keyword.conditional "if"))
-((helper_invocation helper: (identifier) @keyword)
+
+((helper_invocation
+  helper: (identifier) @keyword)
   (#eq? @keyword "yield"))
 
-(hash_pair key: (identifier) @property)
+(hash_pair
+  key: (identifier) @property)
 
 (comment_statement) @comment @spell
 
-(attribute_node "=" @operator)
+(attribute_node
+  "=" @operator)
 
-(block_params "as" @keyword)
-(block_params "|" @operator)
+(block_params
+  "as" @keyword)
+
+(block_params
+  "|" @operator)
 
 [
   "<"
diff --git a/queries/glimmer/indents.scm b/queries/glimmer/indents.scm
index 8bccf33fa..c1ef130c0 100644
--- a/queries/glimmer/indents.scm
+++ b/queries/glimmer/indents.scm
@@ -1,22 +1,34 @@
 [
-  (element_node (element_node_start))
+  (element_node
+    (element_node_start))
   (element_node_void)
-  (block_statement (block_statement_start))
+  (block_statement
+    (block_statement_start))
   (mustache_statement)
 ] @indent.begin
 
-(element_node (element_node_end  [">"] @indent.end))
-(element_node_void "/>" @indent.end)
+(element_node
+  (element_node_end
+    ">" @indent.end))
+
+(element_node_void
+  "/>" @indent.end)
+
 [
- ">"
- "/>"
- "</"
- "{{/"
- "}}"
+  ">"
+  "/>"
+  "</"
+  "{{/"
+  "}}"
 ] @indent.branch
 
 (mustache_statement
-  (helper_invocation helper: (identifier) @_identifier (#eq? @_identifier "else"))
-  ) @indent.branch
-(mustache_statement ((identifier) @_identifier (#eq? @_identifier "else"))) @indent.branch
+  (helper_invocation
+    helper: (identifier) @_identifier
+    (#eq? @_identifier "else"))) @indent.branch
+
+(mustache_statement
+  ((identifier) @_identifier
+    (#eq? @_identifier "else"))) @indent.branch
+
 (comment_statement) @indent.ignore
diff --git a/queries/glimmer/locals.scm b/queries/glimmer/locals.scm
index 705382aa9..8fde3a297 100644
--- a/queries/glimmer/locals.scm
+++ b/queries/glimmer/locals.scm
@@ -1,7 +1,9 @@
 [
- (element_node)
- (block_statement)
+  (element_node)
+  (block_statement)
 ] @local.scope
 
 (identifier) @local.reference
-(block_params (identifier) @local.definition.var)
+
+(block_params
+  (identifier) @local.definition.var)
diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index 5825673c1..dbf3ed07b 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: c
-
 [
   "in"
   "out"
@@ -32,4 +31,4 @@
 (extension_storage_class) @keyword.storage
 
 ((identifier) @variable.builtin
- (#lua-match? @variable.builtin "^gl_"))
+  (#lua-match? @variable.builtin "^gl_"))
diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm
index 57b24fed5..90ca7b5d4 100644
--- a/queries/glsl/injections.scm
+++ b/queries/glsl/injections.scm
@@ -1,5 +1,5 @@
 ((preproc_arg) @injection.content
- (#set! injection.language "glsl"))
+  (#set! injection.language "glsl"))
 
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/gn/highlights.scm b/queries/gn/highlights.scm
index 3b09a7753..7bd97ff38 100644
--- a/queries/gn/highlights.scm
+++ b/queries/gn/highlights.scm
@@ -1,20 +1,16 @@
 ; Includes
-
 "import" @keyword.import
 
 ; Conditionals
-
 [
   "if"
   "else"
 ] @keyword.conditional
 
 ; Repeats
-
 "foreach" @keyword.repeat
 
 ; Operators
-
 [
   "="
   "+="
@@ -33,19 +29,17 @@
 ] @operator
 
 ; Variables
-
 (identifier) @variable
 
 ; Functions
-
-(call_expression function: (identifier) @function.call)
+(call_expression
+  function: (identifier) @function.call)
 
 ; Fields
-
-(scope_access field: (identifier) @variable.member)
+(scope_access
+  field: (identifier) @variable.member)
 
 ; Literals
-
 (string) @string
 
 (escape_sequence) @string.escape
@@ -59,16 +53,26 @@
 (boolean) @boolean
 
 ; Punctuation
-
-[ "{" "}" "[" "]" "(" ")" ] @punctuation.bracket
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   "."
   ","
 ] @punctuation.delimiter
 
-(expansion ["$" "${" "}"] @punctuation.special)
+(expansion
+  [
+    "$"
+    "${"
+    "}"
+  ] @punctuation.special)
 
 ; Comments
-
 (comment) @comment
diff --git a/queries/go/folds.scm b/queries/go/folds.scm
index 2c0beb4f6..44b452de5 100644
--- a/queries/go/folds.scm
+++ b/queries/go/folds.scm
@@ -1,20 +1,19 @@
 [
- (const_declaration)
- (expression_switch_statement)
- (expression_case)
- (default_case)
- (type_switch_statement)
- (type_case)
- (for_statement)
- (func_literal)
- (function_declaration)
- (if_statement)
- (import_declaration)
- (method_declaration)
- (type_declaration)
- (var_declaration)
- (composite_literal)
- (literal_element)
- (block)
+  (const_declaration)
+  (expression_switch_statement)
+  (expression_case)
+  (default_case)
+  (type_switch_statement)
+  (type_case)
+  (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
index 9c6fe1be8..d23ac6f73 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -1,17 +1,23 @@
-;; Forked from tree-sitter-go
-;; Copyright (c) 2014 Max Brunsfeld (The MIT License)
-
-;;
+; Forked from tree-sitter-go
+; Copyright (c) 2014 Max Brunsfeld (The MIT License)
+;
 ; Identifiers
-
 (type_identifier) @type
-(type_spec name: (type_identifier) @type.definition)
+
+(type_spec
+  name: (type_identifier) @type.definition)
+
 (field_identifier) @property
+
 (identifier) @variable
+
 (package_identifier) @module
 
-(parameter_declaration (identifier) @variable.parameter)
-(variadic_parameter_declaration (identifier) @variable.parameter)
+(parameter_declaration
+  (identifier) @variable.parameter)
+
+(variadic_parameter_declaration
+  (identifier) @variable.parameter)
 
 (label_name) @label
 
@@ -19,16 +25,15 @@
   name: (identifier) @constant)
 
 ; Function calls
-
 (call_expression
   function: (identifier) @function.call)
 
 (call_expression
-  function: (selector_expression
-    field: (field_identifier) @function.method.call))
+  function:
+    (selector_expression
+      field: (field_identifier) @function.method.call))
 
 ; Function definitions
-
 (function_declaration
   name: (identifier) @function)
 
@@ -39,15 +44,15 @@
   name: (field_identifier) @function.method)
 
 ; Constructors
-
-((call_expression (identifier) @constructor)
+((call_expression
+  (identifier) @constructor)
   (#lua-match? @constructor "^[nN]ew.+$"))
 
-((call_expression (identifier) @constructor)
+((call_expression
+  (identifier) @constructor)
   (#lua-match? @constructor "^[mM]ake.+$"))
 
 ; Operators
-
 [
   "--"
   "-"
@@ -91,7 +96,6 @@
 ] @operator
 
 ; Keywords
-
 [
   "break"
   "const"
@@ -109,7 +113,9 @@
 ] @keyword
 
 "func" @keyword.function
+
 "return" @keyword.return
+
 "go" @keyword.coroutine
 
 "for" @keyword.repeat
@@ -124,128 +130,103 @@
   "case"
   "switch"
   "if"
- ] @keyword.conditional
+] @keyword.conditional
 
-
-;; Builtin types
-
-[ "chan" "map" ] @type.builtin
+; Builtin types
+[
+  "chan"
+  "map"
+] @type.builtin
 
 ((type_identifier) @type.builtin
- (#any-of? @type.builtin
-           "any"
-           "bool"
-           "byte"
-           "comparable"
-           "complex128"
-           "complex64"
-           "error"
-           "float32"
-           "float64"
-           "int"
-           "int16"
-           "int32"
-           "int64"
-           "int8"
-           "rune"
-           "string"
-           "uint"
-           "uint16"
-           "uint32"
-           "uint64"
-           "uint8"
-           "uintptr"))
-
-
-;; Builtin functions
+  (#any-of? @type.builtin "any" "bool" "byte" "comparable" "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"
-           "clear"
-           "close"
-           "complex"
-           "copy"
-           "delete"
-           "imag"
-           "len"
-           "make"
-           "max"
-           "min"
-           "new"
-           "panic"
-           "print"
-           "println"
-           "real"
-           "recover"))
-
+  (#any-of? @function.builtin "append" "cap" "clear" "close" "complex" "copy" "delete" "imag" "len" "make" "max" "min" "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
+
 (rune_literal) @string
+
 (escape_sequence) @string.escape
 
 (int_literal) @number
+
 (float_literal) @number.float
+
 (imaginary_literal) @number
 
 [
- (true)
- (false)
+  (true)
+  (false)
 ] @boolean
 
 [
- (nil)
- (iota)
+  (nil)
+  (iota)
 ] @constant.builtin
 
 (keyed_element
-  . (literal_element (identifier) @variable.member))
-(field_declaration name: (field_identifier) @variable.member)
+  .
+  (literal_element
+    (identifier) @variable.member))
+
+(field_declaration
+  name: (field_identifier) @variable.member)
 
 ; Comments
-
 (comment) @comment @spell
 
-;; Doc Comments
-
-(source_file . (comment)+ @comment.documentation)
+; Doc Comments
+(source_file
+  .
+  (comment)+ @comment.documentation)
 
 (source_file
   (comment)+ @comment.documentation
-  . (const_declaration))
+  .
+  (const_declaration))
 
 (source_file
   (comment)+ @comment.documentation
-  . (function_declaration))
+  .
+  (function_declaration))
 
 (source_file
   (comment)+ @comment.documentation
-  . (type_declaration))
+  .
+  (type_declaration))
 
 (source_file
   (comment)+ @comment.documentation
-  . (var_declaration))
+  .
+  (var_declaration))
 
 ; Spell
-
 ((interpreted_string_literal) @spell
   (#not-has-parent? @spell import_spec))
diff --git a/queries/go/indents.scm b/queries/go/indents.scm
index 5f0039ac4..b26811c83 100644
--- a/queries/go/indents.scm
+++ b/queries/go/indents.scm
@@ -15,19 +15,23 @@
   (struct_type)
 ] @indent.begin
 
+"}" @indent.branch
+
+(const_declaration
+  ")" @indent.branch)
+
+(import_spec_list
+  ")" @indent.branch)
+
+(var_declaration
+  ")" @indent.branch)
+
 [
   "}"
-] @indent.branch
-
-(const_declaration ")" @indent.branch)
-(import_spec_list ")" @indent.branch)
-(var_declaration ")" @indent.branch)
-
-[
- "}"
- ")"
+  ")"
 ] @indent.end
 
-(parameter_list ")" @indent.branch)
+(parameter_list
+  ")" @indent.branch)
 
 (comment) @indent.ignore
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index cf19ebac5..7d9166e33 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -1,38 +1,41 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 (call_expression
-  (selector_expression) @_function (#any-of? @_function
-                                    "regexp.Match"
-                                    "regexp.MatchReader"
-                                    "regexp.MatchString"
-                                    "regexp.Compile"
-                                    "regexp.CompilePOSIX"
-                                    "regexp.MustCompile"
-                                    "regexp.MustCompilePOSIX")
+  (selector_expression) @_function
+  (#any-of? @_function "regexp.Match" "regexp.MatchReader" "regexp.MatchString" "regexp.Compile" "regexp.CompilePOSIX" "regexp.MustCompile" "regexp.MustCompilePOSIX")
   (argument_list
     .
     [
-     (raw_string_literal)
-     (interpreted_string_literal)
+      (raw_string_literal)
+      (interpreted_string_literal)
     ] @injection.content
     (#offset! @injection.content 0 1 0 -1)
     (#set! injection.language "regex")))
 
-
 ((comment) @injection.content
   (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
   (#set! injection.language "re2c"))
 
 ((call_expression
-  function: (selector_expression field: (field_identifier) @_method)
-  arguments: (argument_list . (interpreted_string_literal) @injection.content))
- (#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf")
- (#set! injection.language "printf"))
+  function:
+    (selector_expression
+      field: (field_identifier) @_method)
+  arguments:
+    (argument_list
+      .
+      (interpreted_string_literal) @injection.content))
+  (#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf")
+  (#set! injection.language "printf"))
 
 ((call_expression
-  function: (selector_expression field: (field_identifier) @_method)
-  arguments: (argument_list (_) . (interpreted_string_literal) @injection.content))
- (#eq? @_method "Fprintf")
- (#set! injection.language "printf"))
-
+  function:
+    (selector_expression
+      field: (field_identifier) @_method)
+  arguments:
+    (argument_list
+      (_)
+      .
+      (interpreted_string_literal) @injection.content))
+  (#eq? @_method "Fprintf")
+  (#set! injection.language "printf"))
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index 20d8cd618..a8325f97c 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -1,79 +1,93 @@
-(
-    (function_declaration
-        name: (identifier) @local.definition.function) ; @function 
-)
+((function_declaration
+  name: (identifier) @local.definition.function) ; @function
+  )
 
-(
-    (method_declaration
-        name: (field_identifier) @local.definition.method) ; @function.method
-)
+((method_declaration
+  name: (field_identifier) @local.definition.method) ; @function.method
+  )
 
-(short_var_declaration 
-  left: (expression_list
-          (identifier) @local.definition.var)) 
+(short_var_declaration
+  left:
+    (expression_list
+      (identifier) @local.definition.var))
 
-(var_spec 
+(var_spec
   name: (identifier) @local.definition.var)
 
-(parameter_declaration (identifier) @local.definition.var)
-(variadic_parameter_declaration (identifier) @local.definition.var)
+(parameter_declaration
+  (identifier) @local.definition.var)
+
+(variadic_parameter_declaration
+  (identifier) @local.definition.var)
 
 (for_statement
- (range_clause
-   left: (expression_list
-           (identifier) @local.definition.var)))
+  (range_clause
+    left:
+      (expression_list
+        (identifier) @local.definition.var)))
 
 (const_declaration
- (const_spec
-  name: (identifier) @local.definition.var))
+  (const_spec
+    name: (identifier) @local.definition.var))
 
-(type_declaration 
+(type_declaration
   (type_spec
     name: (type_identifier) @local.definition.type))
 
-;; reference
+; reference
 (identifier) @local.reference
+
 (type_identifier) @local.reference
+
 (field_identifier) @local.reference
+
 ((package_identifier) @local.reference
   (#set! reference.kind "namespace"))
 
 (package_clause
-   (package_identifier) @local.definition.namespace)
+  (package_identifier) @local.definition.namespace)
 
 (import_spec_list
   (import_spec
     name: (package_identifier) @local.definition.namespace))
 
-;; Call references
+; Call references
 ((call_expression
-   function: (identifier) @local.reference)
- (#set! reference.kind "call" ))
+  function: (identifier) @local.reference)
+  (#set! reference.kind "call"))
 
 ((call_expression
-    function: (selector_expression
-                field: (field_identifier) @local.reference))
- (#set! reference.kind "call" ))
-
+  function:
+    (selector_expression
+      field: (field_identifier) @local.reference))
+  (#set! reference.kind "call"))
 
 ((call_expression
-    function: (parenthesized_expression
-                (identifier) @local.reference))
- (#set! reference.kind "call" ))
+  function:
+    (parenthesized_expression
+      (identifier) @local.reference))
+  (#set! reference.kind "call"))
 
 ((call_expression
-   function: (parenthesized_expression
-               (selector_expression
-                 field: (field_identifier) @local.reference)))
- (#set! reference.kind "call" ))
-
-;; Scopes
+  function:
+    (parenthesized_expression
+      (selector_expression
+        field: (field_identifier) @local.reference)))
+  (#set! reference.kind "call"))
 
+; Scopes
 (func_literal) @local.scope
+
 (source_file) @local.scope
+
 (function_declaration) @local.scope
+
 (if_statement) @local.scope
+
 (block) @local.scope
+
 (expression_switch_statement) @local.scope
+
 (for_statement) @local.scope
+
 (method_declaration) @local.scope
diff --git a/queries/godot_resource/folds.scm b/queries/godot_resource/folds.scm
index 943e0628f..911798f5a 100644
--- a/queries/godot_resource/folds.scm
+++ b/queries/godot_resource/folds.scm
@@ -1,3 +1 @@
-[
-  (section)
-] @fold
+(section) @fold
diff --git a/queries/godot_resource/highlights.scm b/queries/godot_resource/highlights.scm
index f87f228d9..fbe297839 100644
--- a/queries/godot_resource/highlights.scm
+++ b/queries/godot_resource/highlights.scm
@@ -1,14 +1,22 @@
 (identifier) @type.builtin
 
-(attribute (identifier) @property)
-(property (path) @property)
-(constructor (identifier) @constructor)
+(attribute
+  (identifier) @property)
+
+(property
+  (path) @property)
+
+(constructor
+  (identifier) @constructor)
 
 (string) @string
+
 (integer) @number
+
 (float) @number.float
 
 (true) @constant.builtin
+
 (false) @constant.builtin
 
 [
diff --git a/queries/godot_resource/locals.scm b/queries/godot_resource/locals.scm
index 53982b713..b946a5eec 100644
--- a/queries/godot_resource/locals.scm
+++ b/queries/godot_resource/locals.scm
@@ -1,3 +1 @@
-[
-  (section)
-] @local.scope
+(section) @local.scope
diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
index 8e3906fc1..29cbe6574 100644
--- a/queries/gomod/highlights.scm
+++ b/queries/gomod/highlights.scm
@@ -11,9 +11,10 @@
 "=>" @operator
 
 (comment) @comment @spell
+
 (module_path) @string.special.url
 
 [
-(version)
-(go_version)
+  (version)
+  (go_version)
 ] @string
diff --git a/queries/gomod/injections.scm b/queries/gomod/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/gomod/injections.scm
+++ b/queries/gomod/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/gosum/highlights.scm b/queries/gosum/highlights.scm
index bd9595b2b..f20c5f176 100644
--- a/queries/gosum/highlights.scm
+++ b/queries/gosum/highlights.scm
@@ -7,17 +7,18 @@
   "+incompatible"
 ] @keyword
 
-
 (module_path) @string.special.url
+
 (module_version) @string.special
 
 (hash_version) @attribute
+
 (hash) @string.special.symbol
 
 [
- (number)
- (number_with_decimal)
- (hex_number)
+  (number)
+  (number_with_decimal)
+  (hex_number)
 ] @number
 
 (checksum
diff --git a/queries/gowork/highlights.scm b/queries/gowork/highlights.scm
index 0584f1a68..bca9a5f80 100644
--- a/queries/gowork/highlights.scm
+++ b/queries/gowork/highlights.scm
@@ -9,6 +9,6 @@
 (comment) @comment @spell
 
 [
-(version)
-(go_version)
+  (version)
+  (go_version)
 ] @string
diff --git a/queries/gowork/injections.scm b/queries/gowork/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/gowork/injections.scm
+++ b/queries/gowork/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/gpg/highlights.scm b/queries/gpg/highlights.scm
index 1dac05562..09656b302 100644
--- a/queries/gpg/highlights.scm
+++ b/queries/gpg/highlights.scm
@@ -1,14 +1,17 @@
-(option . _ @keyword)
+(option
+  .
+  _ @keyword)
 
 (option
   ("no-" @variable.parameter)?
   (name) @variable.parameter)
 
-(string (content) @string)
+(string
+  (content) @string)
 
 [
- (value)
- "clear"
+  (value)
+  "clear"
 ] @string.special
 
 (url) @string.special.url
@@ -16,9 +19,9 @@
 (key) @constant
 
 [
- (number)
- (expire_time)
- (iso_time)
+  (number)
+  (expire_time)
+  (iso_time)
 ] @number
 
 (format) @character.special
@@ -34,14 +37,18 @@
 (filter_value) @string
 
 [
- (filter_op0)
- (filter_op1)
- (filter_lc)
- "="
+  (filter_op0)
+  (filter_op1)
+  (filter_lc)
+  "="
 ] @operator
 
 "!" @punctuation.special
 
-[ "\"" "'" "," ] @punctuation.delimiter
+[
+  "\""
+  "'"
+  ","
+] @punctuation.delimiter
 
 (comment) @comment @spell
diff --git a/queries/gpg/injections.scm b/queries/gpg/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/gpg/injections.scm
+++ b/queries/gpg/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/graphql/highlights.scm b/queries/graphql/highlights.scm
index 136f287ee..24db06645 100644
--- a/queries/graphql/highlights.scm
+++ b/queries/graphql/highlights.scm
@@ -1,6 +1,5 @@
 ; Types
 ;------
-
 (scalar_type_definition
   (name) @type)
 
@@ -42,7 +41,6 @@
 
 ; Directives
 ;-----------
-
 (directive_definition
   "@" @attribute
   (name) @attribute)
@@ -51,7 +49,6 @@
 
 ; Properties
 ;-----------
-
 (field
   (name) @property)
 
@@ -69,9 +66,8 @@
 (enum_value
   (name) @property)
 
-; Variable Definitions and Arguments 
+; Variable Definitions and Arguments
 ;-----------------------------------
-
 (operation_definition
   (name) @variable)
 
@@ -98,7 +94,6 @@
 
 ; Constants
 ;----------
-
 (string_value) @string
 
 (int_value) @number
@@ -109,7 +104,6 @@
 
 ; Literals
 ;---------
-
 (description
   (string_value) @string.documentation @spell)
 
@@ -123,7 +117,6 @@
 
 ; Keywords
 ;----------
-
 [
   "query"
   "mutation"
@@ -145,21 +138,23 @@
 
 ; Punctuation
 ;------------
-
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 "=" @operator
 
 "|" @punctuation.delimiter
+
 "&" @punctuation.delimiter
+
 ":" @punctuation.delimiter
 
 "..." @punctuation.special
+
 "!" @punctuation.special
diff --git a/queries/graphql/injections.scm b/queries/graphql/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/graphql/injections.scm
+++ b/queries/graphql/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index 25dcdb8ca..4306f17a3 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -1,5 +1,6 @@
 (unit
   (identifier) @variable)
+
 (string
   (identifier) @variable)
 
@@ -24,52 +25,19 @@
   (#eq? @constant.builtin "null"))
 
 ((identifier) @type
-  (#any-of? @type
-    "String"
-    "Map"
-    "Object"
-    "Boolean"
-    "Integer"
-    "List"))
+  (#any-of? @type "String" "Map" "Object" "Boolean" "Integer" "List"))
 
 ((identifier) @function.builtin
-  (#any-of? @function.builtin
-    "void"
-    "id"
-    "version"
-    "apply"
-    "implementation"
-    "testImplementation"
-    "androidTestImplementation"
-    "debugImplementation"))
+  (#any-of? @function.builtin "void" "id" "version" "apply" "implementation" "testImplementation" "androidTestImplementation" "debugImplementation"))
 
 ((identifier) @keyword
-  (#any-of? @keyword
-    "static"
-    "class"
-    "def"
-    "import"
-    "package"
-    "assert"
-    "extends"
-    "implements"
-    "instanceof"
-    "interface"
-    "new"))
+  (#any-of? @keyword "static" "class" "def" "import" "package" "assert" "extends" "implements" "instanceof" "interface" "new"))
 
 ((identifier) @type.qualifier
-  (#any-of? @type.qualifier
-    "abstract"
-    "protected"
-    "private"
-    "public"))
+  (#any-of? @type.qualifier "abstract" "protected" "private" "public"))
 
 ((identifier) @keyword.exception
-  (#any-of? @keyword.exception
-    "throw"
-    "finally"
-    "try"
-    "catch"))
+  (#any-of? @keyword.exception "throw" "finally" "try" "catch"))
 
 (string) @string
 
@@ -92,4 +60,11 @@
   (leading_key)
 ] @operator
 
-["(" ")" "[" "]" "{" "}"]  @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
diff --git a/queries/groovy/injections.scm b/queries/groovy/injections.scm
index 0f3127b6b..14a5d393e 100644
--- a/queries/groovy/injections.scm
+++ b/queries/groovy/injections.scm
@@ -1,5 +1,5 @@
-((line_comment) @injection.content
- (#set! injection.language "comment"))
-
 ((block_comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
+
+((line_comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/gstlaunch/highlights.scm b/queries/gstlaunch/highlights.scm
index 36118712e..90729f876 100644
--- a/queries/gstlaunch/highlights.scm
+++ b/queries/gstlaunch/highlights.scm
@@ -1,30 +1,35 @@
 [
- "!"
- "="
+  "!"
+  "="
 ] @operator
 
 [
- ","
- "."
- ";"
- "/"
+  ","
+  "."
+  ";"
+  "/"
 ] @punctuation.delimiter
 
 [
- "("
- ")"
+  "("
+  ")"
 ] @punctuation.bracket
 
 (property
   key: (identifier) @variable.member)
+
 (value) @string
+
 (string_literal) @string
+
 (cap
   .
   (identifier) @string
   .
   (identifier) @string)
+
 (simple_element
   type: (_) @type)
+
 (bin
   type: (_) @type)
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index 91efe90b4..22fa7ea50 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -1,13 +1,15 @@
 (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)
@@ -20,16 +22,16 @@
 "function" @keyword.function
 
 [
- "type"
- "interface"
- "implements"
- "class"
- "using"
- "namespace"
- "attribute"
- "const"
- "extends"
- "insteadof"
+  "type"
+  "interface"
+  "implements"
+  "class"
+  "using"
+  "namespace"
+  "attribute"
+  "const"
+  "extends"
+  "insteadof"
 ] @keyword
 
 [
@@ -38,11 +40,11 @@
 ] @keyword.coroutine
 
 [
- "use"
- "include"
- "include_once"
- "require"
- "require_once"
+  "use"
+  "include"
+  "include_once"
+  "require"
+  "require_once"
 ] @keyword.import
 
 [
@@ -80,9 +82,7 @@
   "noreturn"
 ] @type.builtin
 
-[
-  (null)
-] @constant.builtin
+(null) @constant.builtin
 
 [
   (true)
@@ -90,14 +90,23 @@
 ] @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)
 
@@ -106,8 +115,8 @@
     (identifier) @type .))
 
 [
- "@required"
- "@lateinit"
+  "@required"
+  "@lateinit"
   (attribute_modifier)
 ] @attribute
 
@@ -126,7 +135,6 @@
   "/="
   "%="
   "**="
-
   "==>"
   "|>"
   "??"
@@ -154,13 +162,10 @@
   "/"
   "%"
   "**"
-
   "++"
   "--"
   "!"
-
   "?:"
-
   "="
   "??="
   ".="
@@ -176,110 +181,156 @@
   "%="
   "**="
   "=>"
-
-  ;; type modifiers
+  ; type modifiers
   "@"
   "?"
   "~"
 ] @operator
 
 (integer) @number
+
 (float) @number.float
 
 (parameter
   (variable) @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 .)))
+  function:
+    (selection_expression
+      (qualified_identifier
+        (identifier) @function.method.call .)))
 
 (qualified_identifier
-  (_) @module .
+  (_) @module
+  .
   (_))
 
 (use_statement
   (qualified_identifier
-  (_) @module .)
+    (_) @module .)
   (use_clause))
 
 (use_statement
-  (use_type "namespace")
+  (use_type
+    "namespace")
   (use_clause
     (qualified_identifier
-         (identifier) @module .)
+      (identifier) @module .)
     alias: (identifier)? @module))
 
 (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 .)
+    (_) @module .)
   alias: (identifier)? @module)
 
 (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)
 
 (type_arguments
-  [ "<" ">" ] @punctuation.bracket)
-[ "(" ")" "[" "]" "{" "}" "<<" ">>"] @punctuation.bracket
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "<<"
+  ">>"
+] @punctuation.bracket
 
 (xhp_open
-  [ "<" ">" ] @tag.delimiter)
-(xhp_close
-  [ "</" ">" ] @tag.delimiter)
+  [
+    "<"
+    ">"
+  ] @tag.delimiter)
+
+(xhp_close
+  [
+    "</"
+    ">"
+  ] @tag.delimiter)
+
+[
+  "."
+  ";"
+  "::"
+  ":"
+  ","
+] @punctuation.delimiter
 
-[ "." ";" "::" ":" "," ] @punctuation.delimiter
 (qualified_identifier
   "\\" @punctuation.delimiter)
 
 (ternary_expression
-  ["?" ":"] @keyword.conditional.ternary)
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 [
   "if"
@@ -305,11 +356,11 @@
 ] @keyword.repeat
 
 [
- (string)
- (xhp_string)
+  (string)
+  (xhp_string)
 ] @string
 
 [
- (xhp_open)
- (xhp_close)
+  (xhp_open)
+  (xhp_close)
 ] @tag
diff --git a/queries/hare/folds.scm b/queries/hare/folds.scm
index 28f18b175..58b10bfdc 100644
--- a/queries/hare/folds.scm
+++ b/queries/hare/folds.scm
@@ -1,12 +1,10 @@
 [
   (imports)
-
   (function_declaration)
   (enum_type)
   (struct_type)
   (tuple_type)
   (union_type)
-
   (block)
   (if_statement)
   (for_statement)
@@ -14,7 +12,6 @@
   (switch_expression)
   (match_expression)
   (case)
-
   (array_literal)
   (struct_literal)
   (tuple_literal)
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index fb9f3f158..817084886 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -1,44 +1,44 @@
 ; Variables
-
 (identifier) @variable
 
 ; Types
-
 (type) @type
 
 (scoped_type_identifier
-  (identifier) . (identifier) @type)
+  (identifier)
+  .
+  (identifier) @type)
 
 (struct_literal
-  . (identifier) @type)
+  .
+  (identifier) @type)
 
 (builtin_type) @type.builtin
 
 ; Constants
-
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z_]+$"))
 
 ; Includes
-
-[
-  "use"
-] @keyword.import
+"use" @keyword.import
 
 (use_statement
   (scoped_type_identifier
     (identifier) @module))
+
 (use_statement
-  (identifier) @module  "{")
+  (identifier) @module
+  "{")
+
 (use_statement
-  . (identifier) @module .)
+  .
+  (identifier) @module .)
 
 ((scoped_type_identifier
   path: (_) @module)
   (#set! "priority" 105))
 
 ; Keywords
-
 [
   "def"
   "enum"
@@ -49,9 +49,7 @@
   "union"
 ] @keyword
 
-[
-  "fn"
-] @keyword.function
+"fn" @keyword.function
 
 [
   "defer"
@@ -65,12 +63,13 @@
 ] @keyword.operator
 
 ; Typedefs
-
 (type_declaration
-  "type" (identifier) @type.definition . "=")
+  "type"
+  (identifier) @type.definition
+  .
+  "=")
 
 ; Qualifiers
-
 [
   "const"
   "static"
@@ -78,7 +77,6 @@
 ] @type.qualifier
 
 ; Attributes
-
 [
   "@fini"
   "@init"
@@ -89,62 +87,72 @@
 ] @attribute
 
 ; Labels
-
 ((label) @label
   (#set! "priority" 105))
 
 ; Functions
-
 (function_declaration
-  "fn" . (identifier) @function)
+  "fn"
+  .
+  (identifier) @function)
 
 (call_expression
-  . (identifier) @function.call)
+  .
+  (identifier) @function.call)
 
 (call_expression
-  . (scoped_type_identifier
-    . (identifier) . "::" . (identifier) @function.method.call))
+  .
+  (scoped_type_identifier
+    .
+    (identifier)
+    .
+    "::"
+    .
+    (identifier) @function.method.call))
 
 ((call_expression
-  . (identifier) @function.builtin)
+  .
+  (identifier) @function.builtin)
   (#any-of? @function.builtin "align" "assert" "free" "len" "offset" "size"))
 
 (size_expression
   "size" @function.builtin)
 
 ((function_declaration
-  "fn" . (identifier) @constructor)
+  "fn"
+  .
+  (identifier) @constructor)
   (#eq? @constructor "init"))
 
 ((call_expression
-  . (identifier) @constructor)
+  .
+  (identifier) @constructor)
   (#eq? @constructor "init"))
 
 ; Parameters
-
 (parameter
-  (_) @variable.parameter . ":")
+  (_) @variable.parameter
+  .
+  ":")
 
 ; Fields
-
 ((member_expression
-  "." (_) @variable.member)
+  "."
+  (_) @variable.member)
   (#set! "priority" 105))
 
 (field
-  . (identifier) @variable.member)
+  .
+  (identifier) @variable.member)
 
 (field_assignment
-  . (identifier) @variable.member)
+  .
+  (identifier) @variable.member)
 
 ; Repeats
-
-[
-  "for"
-] @keyword.repeat
+"for" @keyword.repeat
 
 ; Conditionals
-
 [
   "if"
   "else"
@@ -155,7 +163,6 @@
 ] @keyword.conditional
 
 ; Operators
-
 [
   "+"
   "-"
@@ -196,12 +203,20 @@
 ] @operator
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
-
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   ".."
@@ -209,11 +224,14 @@
   "_"
 ] @punctuation.special
 
-(pointer_type "*" @punctuation.special)
+(pointer_type
+  "*" @punctuation.special)
 
-(slice_type "*" @punctuation.special)
+(slice_type
+  "*" @punctuation.special)
 
-(error_type "!" @punctuation.special)
+(error_type
+  "!" @punctuation.special)
 
 [
   ","
@@ -225,7 +243,6 @@
 ] @punctuation.delimiter
 
 ; Literals
-
 [
   (string)
   (raw_string)
@@ -247,5 +264,4 @@
 ] @constant.builtin
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/hare/indents.scm b/queries/hare/indents.scm
index b3aadcd6e..d729663e1 100644
--- a/queries/hare/indents.scm
+++ b/queries/hare/indents.scm
@@ -3,19 +3,18 @@
   (struct_type)
   (tuple_type)
   (union_type)
-
   (block)
   (for_statement)
   (call_expression)
   (case)
-
   (array_literal)
   (struct_literal)
   (tuple_literal)
 ] @indent.begin
 
 (if_statement
-   ("(" condition: (_) ")") @indent.begin)
+  ("("
+    condition: (_)")") @indent.begin)
 
 [
   "}"
@@ -23,11 +22,20 @@
   ")"
 ] @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/hare/injections.scm b/queries/hare/injections.scm
index d3befb39b..88a3f1cdd 100644
--- a/queries/hare/injections.scm
+++ b/queries/hare/injections.scm
@@ -1,10 +1,18 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((call_expression
-  . (_) @_fnname
-  . "("
-  . (_ [(string_content) (raw_string_content)] @injection.content)
-  . ")")
+  .
+  (_) @_fnname
+  .
+  "("
+  .
+  (_
+    [
+      (string_content)
+      (raw_string_content)
+    ] @injection.content)
+  .
+  ")")
   (#any-of? @_fnname "compile" "regex::compile")
   (#set! injection.language "regex"))
diff --git a/queries/hare/locals.scm b/queries/hare/locals.scm
index bf606b9b1..b81ee5135 100644
--- a/queries/hare/locals.scm
+++ b/queries/hare/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (module)
   (function_declaration)
@@ -10,38 +9,57 @@
 ] @local.scope
 
 ; References
-
 [
   (identifier)
   (scoped_type_identifier)
 ] @local.reference
 
 ; Definitions
-
 (global_binding
-  (identifier) @local.definition.constant . ":" (_))
+  (identifier) @local.definition.constant
+  .
+  ":"
+  (_))
 
 (const_declaration
-  "const" (identifier) @local.definition.constant . "=")
+  "const"
+  (identifier) @local.definition.constant
+  .
+  "=")
 
 (field
-  . (identifier) @local.definition.field)
+  .
+  (identifier) @local.definition.field)
 
 (field_assignment
-  . (identifier) @local.definition.field)
+  .
+  (identifier) @local.definition.field)
 
 (function_declaration
-  "fn" . (identifier) @local.definition.function)
+  "fn"
+  .
+  (identifier) @local.definition.function)
 
 (parameter
-  (_) @local.definition.parameter . ":")
+  (_) @local.definition.parameter
+  .
+  ":")
 
 (type_declaration
-  "type" (identifier) @local.definition.type . "=")
+  "type"
+  (identifier) @local.definition.type
+  .
+  "=")
 
 (type_declaration
-  "type" (identifier) @local.definition.enum . "=" (enum_type))
+  "type"
+  (identifier) @local.definition.enum
+  .
+  "="
+  (enum_type))
 
 (let_declaration
-  "let" . (identifier) @local.definition.variable ","?)
-
+  "let"
+  .
+  (identifier) @local.definition.variable
+  ","?)
diff --git a/queries/haskell/folds.scm b/queries/haskell/folds.scm
index 28eadf8f3..a1af2a169 100644
--- a/queries/haskell/folds.scm
+++ b/queries/haskell/folds.scm
@@ -1,5 +1,5 @@
 [
- (exp_apply)
- (exp_do)
- (function)
+  (exp_apply)
+  (exp_do)
+  (function)
 ] @fold
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 92b36434d..1a3cfd485 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -1,34 +1,44 @@
-;; ----------------------------------------------------------------------------
-;; Parameters and variables
-
-;; NOTE: These are at the top, so that they have low priority,
-;; and don't override destructured parameters 
-
+; ----------------------------------------------------------------------------
+; Parameters and variables
+; NOTE: These are at the top, so that they have low priority,
+; and don't override destructured parameters
 (variable) @variable
+
 (pat_wildcard) @variable
 
 (function
-  patterns: (patterns (_) @variable.parameter))
+  patterns:
+    (patterns
+      (_) @variable.parameter))
 
-(exp_lambda (_)+ @variable.parameter "->")
+(exp_lambda
+  (_)+ @variable.parameter
+  "->")
 
-(function 
-  infix: (infix
-    lhs: (_) @variable.parameter))
-(function 
-  infix: (infix
-    rhs: (_) @variable.parameter))
+(function
+  infix:
+    (infix
+      lhs: (_) @variable.parameter))
 
-;; ----------------------------------------------------------------------------
-;; Literals and comments
+(function
+  infix:
+    (infix
+      rhs: (_) @variable.parameter))
 
+; ----------------------------------------------------------------------------
+; Literals and comments
 (integer) @number
+
 (exp_negation) @number
-(exp_literal (float)) @number.float
+
+(exp_literal
+  (float)) @number.float
+
 (char) @character
+
 (string) @string
 
-(con_unit) @string.special.symbol  ; unit, as in ()
+(con_unit) @string.special.symbol ; unit, as in ()
 
 (comment) @comment
 
@@ -37,30 +47,28 @@
 ; ((comment) @_first . (comment)+ @comment.documentation)
 ; once https://github.com/neovim/neovim/pull/24738 has been merged.
 ;
-; ((comment) @comment.documentation 
+; ((comment) @comment.documentation
 ;   (#lua-match? @comment.documentation "^-- |"))
 ;
-; ((comment) @_first @comment.documentation 
-;  (comment) @comment.documentation 
+; ((comment) @_first @comment.documentation
+;  (comment) @comment.documentation
 ;   (#lua-match? @_first "^-- |"))
 ;
-; ((comment) @comment.documentation 
+; ((comment) @comment.documentation
 ;   (#lua-match? @comment.documentation "^-- %^"))
 ;
-; ((comment) @_first @comment.documentation 
-;  (comment) @comment.documentation 
+; ((comment) @_first @comment.documentation
+;  (comment) @comment.documentation
 ;   (#lua-match? @_first "^-- %^"))
 ;
-; ((comment) @comment.documentation 
+; ((comment) @comment.documentation
 ;   (#lua-match? @comment.documentation "^{-"))
 ;
-; ((comment) @_first @comment.documentation 
-;  (comment) @comment.documentation 
+; ((comment) @_first @comment.documentation
+;  (comment) @comment.documentation
 ;   (#lua-match? @_first "^{-"))
-
-;; ----------------------------------------------------------------------------
-;; Punctuation
-
+; ----------------------------------------------------------------------------
+; Punctuation
 [
   "("
   ")"
@@ -75,10 +83,8 @@
   ";"
 ] @punctuation.delimiter
 
-
-;; ----------------------------------------------------------------------------
-;; Keywords, operators, includes
-
+; ----------------------------------------------------------------------------
+; Keywords, operators, includes
 [
   "forall"
   "∀"
@@ -105,7 +111,7 @@
   (constructor_operator)
   (type_operator)
   (tycon_arrow)
-  (qualified_module)  ; grabs the `.` (dot), ex: import System.IO
+  (qualified_module) ; grabs the `.` (dot), ex: import System.IO
   (qualified_type)
   (qualified_variable)
   (all_names)
@@ -123,14 +129,26 @@
   "@"
 ] @operator
 
-
 (module) @module
-((qualified_module (module) @constructor)
- . (module))
-(qualified_type (module) @module)
-(qualified_variable (module) @module)
-(import (module) @module)
-(import (module) @constructor . (module))
+
+((qualified_module
+  (module) @constructor)
+  .
+  (module))
+
+(qualified_type
+  (module) @module)
+
+(qualified_variable
+  (module) @module)
+
+(import
+  (module) @module)
+
+(import
+  (module) @constructor
+  .
+  (module))
 
 [
   (where)
@@ -157,310 +175,449 @@
   "infixr"
 ] @keyword
 
+; ----------------------------------------------------------------------------
+; Functions and variables
+(signature
+  name: (variable) @function)
 
-;; ----------------------------------------------------------------------------
-;; Functions and variables
+(function
+  name: (variable) @function)
 
-(signature name: (variable) @function)
-
-(function name: (variable) @function)
-
-(function 
+(function
   name: (variable) @variable
-  rhs: [
-   (exp_literal)
-   (exp_apply 
-     (exp_name 
-       [(constructor)
-        (variable)
-        (qualified_variable)
-       ]))
-   (quasiquote)
-   ((exp_name) . (operator))
-  ])
+  rhs:
+    [
+      (exp_literal)
+      (exp_apply
+        (exp_name
+          [
+            (constructor)
+            (variable)
+            (qualified_variable)
+          ]))
+      (quasiquote)
+      ((exp_name)
+        .
+        (operator))
+    ])
 
-(function 
+(function
   name: (variable) @variable
-  rhs: (exp_infix [
-   (exp_literal)
-   (exp_apply 
-     (exp_name 
-       [(constructor)
-        (variable)
-        (qualified_variable)
-       ]))
-   (quasiquote)
-   ((exp_name) . (operator))
-  ]))
+  rhs:
+    (exp_infix
+      [
+        (exp_literal)
+        (exp_apply
+          (exp_name
+            [
+              (constructor)
+              (variable)
+              (qualified_variable)
+            ]))
+        (quasiquote)
+        ((exp_name)
+          .
+          (operator))
+      ]))
 
-;; Consider signatures (and accompanying functions)
-;; with only one value on the rhs as variables
-(signature . (variable) @variable . (_) . )
-((signature . (variable) @_name . (_) . )
- . (function name: (variable) @variable)
- (#eq? @_name @variable))
-;; but consider a type that involves 'IO' a function
-(signature name: (variable) @function 
-  . (type_apply (type_name) @_type)
-    (#eq? @_type "IO"))
-((signature name: (variable) @_name 
-  . (type_apply (type_name) @_type)
-    (#eq? @_type "IO"))
- . (function name: (variable) @function)
-   (#eq? @_name @function))
+; Consider signatures (and accompanying functions)
+; with only one value on the rhs as variables
+(signature
+  .
+  (variable) @variable
+  .
+  (_) .)
 
-;; functions with parameters
-;; + accompanying signatures
+((signature
+  .
+  (variable) @_name
+  .
+  (_) .)
+  .
+  (function
+    name: (variable) @variable)
+  (#eq? @_name @variable))
+
+; but consider a type that involves 'IO' a function
+(signature
+  name: (variable) @function
+  .
+  (type_apply
+    (type_name) @_type)
+  (#eq? @_type "IO"))
+
+((signature
+  name: (variable) @_name
+  .
+  (type_apply
+    (type_name) @_type)
+  (#eq? @_type "IO"))
+  .
+  (function
+    name: (variable) @function)
+  (#eq? @_name @function))
+
+; functions with parameters
+; + accompanying signatures
 (function
   name: (variable) @function
   patterns: (patterns))
+
 ((signature) @function
- . (function
+  .
+  (function
     name: (variable) @function
     patterns: (patterns)))
+
 (function
   name: (variable) @function
   rhs: (exp_lambda))
 
 ; view patterns
-(pat_view (exp_name [
-  ((variable) @function.call)
-  (qualified_variable (variable) @function.call)
-]))
+(pat_view
+  (exp_name
+    [
+      ((variable) @function.call)
+      (qualified_variable
+        (variable) @function.call)
+    ]))
 
 ; consider infix functions as operators
-(exp_infix [
-  (variable) @operator
-  (qualified_variable (variable) @operator)
-])
+(exp_infix
+  [
+    (variable) @operator
+    (qualified_variable
+      (variable) @operator)
+  ])
+
 ; partially applied infix functions (sections) also get highlighted as operators
-(exp_section_right [
-  ((variable) @operator)
-  (qualified_variable (variable) @operator)
-]) 
-(exp_section_left [
-  ((variable) @operator)
-  (qualified_variable (variable) @operator)
-])
+(exp_section_right
+  [
+    ((variable) @operator)
+    (qualified_variable
+      (variable) @operator)
+  ])
+
+(exp_section_left
+  [
+    ((variable) @operator)
+    (qualified_variable
+      (variable) @operator)
+  ])
 
 ; function calls with an infix operator
 ; e.g. func <$> a <*> b
-(exp_infix 
-  (exp_name 
+(exp_infix
+  (exp_name
     [
       ((variable) @function.call)
-      (qualified_variable (
-        (module) @module
-        (variable) @function.call))
+      (qualified_variable
+        ((module) @module
+          (variable) @function.call))
     ])
-  . (operator))
-; infix operators applied to variables
-((exp_name (variable) @variable) . (operator))
-((operator) . (exp_name [
-  ((variable) @variable)
-  (qualified_variable (variable) @variable)
-]))
-; function calls with infix operators
-((exp_name [
-    ((variable) @function.call)
-    (qualified_variable (variable) @function.call)
-  ]) . (operator) @_op
- (#any-of? @_op "$" "<$>" ">>=" "=<<"))
-; right hand side of infix operator
-((exp_infix 
-   [(operator)(variable)] ; infix or `func`
-  . (exp_name [
-      ((variable) @function.call)
-      (qualified_variable (variable) @function.call)
-    ])) . (operator) @_op
- (#any-of? @_op "$" "<$>" "=<<"))
-; function composition, arrows, monadic composition (lhs)
-((exp_name [
-  ((variable) @function)
-  (qualified_variable (variable) @function)
- ]) . (operator) @_op
- (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
-; right hand side of infix operator
-((exp_infix 
-   [(operator)(variable)] ; infix or `func`
-  . (exp_name [
-      ((variable) @function)
-      (qualified_variable (variable) @function)
-    ])) . (operator) @_op
- (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
-; function composition, arrows, monadic composition (rhs)
-((operator) @_op . (exp_name [
-  ((variable) @function)
-  (qualified_variable (variable) @function)
- ])
- (#any-of? @_op "." ">>>" "***" ">=>" "<=<" ))
-        
-; function defined in terms of a function composition
-(function 
-  name: (variable) @function
-  rhs: (exp_infix (_) . (operator) @_op . (_)
-  (#any-of? @_op "." ">>>" "***" ">=>" "<=<")))
+  .
+  (operator))
 
-(exp_apply (exp_name 
+; infix operators applied to variables
+((exp_name
+  (variable) @variable)
+  .
+  (operator))
+
+((operator)
+  .
+  (exp_name
+    [
+      ((variable) @variable)
+      (qualified_variable
+        (variable) @variable)
+    ]))
+
+; function calls with infix operators
+((exp_name
   [
     ((variable) @function.call)
-    (qualified_variable (variable) @function.call)
-  ]))
+    (qualified_variable
+      (variable) @function.call)
+  ])
+  .
+  (operator) @_op
+  (#any-of? @_op "$" "<$>" ">>=" "=<<"))
+
+; right hand side of infix operator
+((exp_infix
+  [
+    (operator)
+    (variable)
+  ] ; infix or `func`
+  .
+  (exp_name
+    [
+      ((variable) @function.call)
+      (qualified_variable
+        (variable) @function.call)
+    ]))
+  .
+  (operator) @_op
+  (#any-of? @_op "$" "<$>" "=<<"))
+
+; function composition, arrows, monadic composition (lhs)
+((exp_name
+  [
+    ((variable) @function)
+    (qualified_variable
+      (variable) @function)
+  ])
+  .
+  (operator) @_op
+  (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
+
+; right hand side of infix operator
+((exp_infix
+  [
+    (operator)
+    (variable)
+  ] ; infix or `func`
+  .
+  (exp_name
+    [
+      ((variable) @function)
+      (qualified_variable
+        (variable) @function)
+    ]))
+  .
+  (operator) @_op
+  (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
+
+; function composition, arrows, monadic composition (rhs)
+((operator) @_op
+  .
+  (exp_name
+    [
+      ((variable) @function)
+      (qualified_variable
+        (variable) @function)
+    ])
+  (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
+
+; function defined in terms of a function composition
+(function
+  name: (variable) @function
+  rhs:
+    (exp_infix
+      (_)
+      .
+      (operator) @_op
+      .
+      (_)
+      (#any-of? @_op "." ">>>" "***" ">=>" "<=<")))
+
+(exp_apply
+  (exp_name
+    [
+      ((variable) @function.call)
+      (qualified_variable
+        (variable) @function.call)
+    ]))
 
 ; function compositions, in parentheses, applied
 ; lhs
-(exp_apply 
-  . (exp_parens (exp_infix
-    (exp_name [((variable) @function.call) (qualified_variable (variable) @function.call)])
-    . (operator))))
+(exp_apply
+  .
+  (exp_parens
+    (exp_infix
+      (exp_name
+        [
+          ((variable) @function.call)
+          (qualified_variable
+            (variable) @function.call)
+        ])
+      .
+      (operator))))
+
 ; rhs
-(exp_apply 
-  . (exp_parens (exp_infix
-    (operator) 
-    . (exp_name [((variable) @function.call) (qualified_variable (variable) @function.call)])))
-      )
+(exp_apply
+  .
+  (exp_parens
+    (exp_infix
+      (operator)
+      .
+      (exp_name
+        [
+          ((variable) @function.call)
+          (qualified_variable
+            (variable) @function.call)
+        ]))))
 
-;; variables being passed to a function call
-(exp_apply (_)+
-  . (exp_name [
-    ((variable) @variable)
-    (qualified_variable (variable) @variable)
-  ]))
+; variables being passed to a function call
+(exp_apply
+  (_)+
+  .
+  (exp_name
+    [
+      ((variable) @variable)
+      (qualified_variable
+        (variable) @variable)
+    ]))
 
-;; Consider functions with only one value on the rhs
-;; as variables, e.g. x = Rec {} or x = foo
+; Consider functions with only one value on the rhs
+; as variables, e.g. x = Rec {} or x = foo
 (function
-  . (variable) @variable
-  . [
-     (exp_record)
-     (exp_name [(variable) (qualified_variable)])
-     (exp_list)
-     (exp_tuple)
-     (exp_cond)
-    ] . )
+  .
+  (variable) @variable
+  .
+  [
+    (exp_record)
+    (exp_name
+      [
+        (variable)
+        (qualified_variable)
+      ])
+    (exp_list)
+    (exp_tuple)
+    (exp_cond)
+  ] .)
 
-;; main is always a function
-;; (this prevents `main = undefined` from being highlighted as a variable)
-(function name: (variable) @function (#eq? @function "main"))
+; main is always a function
+; (this prevents `main = undefined` from being highlighted as a variable)
+(function
+  name: (variable) @function
+  (#eq? @function "main"))
 
-;; scoped function types (func :: a -> b)
-(pat_typed 
-  pattern: (pat_name (variable) @function)
+; scoped function types (func :: a -> b)
+(pat_typed
+  pattern:
+    (pat_name
+      (variable) @function)
   type: (fun))
 
-;; signatures that have a function type
-;; + functions that follow them
-((signature (variable) @function (fun)))
-((signature (variable) @_type (fun)) . (function (variable) @function) (#eq? @function @_type))
-((signature (variable) @function (context (fun))))
-((signature (variable) @_type (context (fun))) . (function (variable) @function) (#eq? @function @_type))
-((signature (variable) @function (forall (context (fun)))) . (function (variable)))
-((signature (variable) @_type (forall (context (fun)))) . (function (variable) @function) (#eq? @function @_type))
+; signatures that have a function type
+; + functions that follow them
+((signature
+  (variable) @function
+  (fun)))
 
-;; ----------------------------------------------------------------------------
-;; Types
+((signature
+  (variable) @_type
+  (fun))
+  .
+  (function
+    (variable) @function)
+  (#eq? @function @_type))
 
+((signature
+  (variable) @function
+  (context
+    (fun))))
+
+((signature
+  (variable) @_type
+  (context
+    (fun)))
+  .
+  (function
+    (variable) @function)
+  (#eq? @function @_type))
+
+((signature
+  (variable) @function
+  (forall
+    (context
+      (fun))))
+  .
+  (function
+    (variable)))
+
+((signature
+  (variable) @_type
+  (forall
+    (context
+      (fun))))
+  .
+  (function
+    (variable) @function)
+  (#eq? @function @_type))
+
+; ----------------------------------------------------------------------------
+; Types
 (type) @type
+
 (type_star) @type
+
 (type_variable) @type
 
 (constructor) @constructor
 
 ; True or False
-((constructor) @boolean (#any-of? @boolean "True" "False"))
+((constructor) @boolean
+  (#any-of? @boolean "True" "False"))
+
 ; otherwise (= True)
 ((variable) @boolean
   (#eq? @boolean "otherwise"))
 
-;; ----------------------------------------------------------------------------
-;; Quasi-quotes
-
+; ----------------------------------------------------------------------------
+; Quasi-quotes
 (quoter) @function.call
 
-(quasiquote 
+(quasiquote
   [
-   (quoter) @_name
-   (_ (variable) @_name)
-  ](#eq? @_name "qq")
+    (quoter) @_name
+    (_
+      (variable) @_name)
+  ]
+  (#eq? @_name "qq")
   (quasiquote_body) @string)
 
-(quasiquote 
-  ((_ (variable) @_name)) (#eq? @_name "qq")
+(quasiquote
+  ((_
+    (variable) @_name))
+  (#eq? @_name "qq")
   (quasiquote_body) @string)
 
-;; namespaced quasi-quoter
+; namespaced quasi-quoter
 (quasiquote
   (_
     (module) @module
-    . (variable) @function.call
-  ))
+    .
+    (variable) @function.call))
 
 ; Highlighting of quasiquote_body for other languages is handled by injections.scm
-
-;; ----------------------------------------------------------------------------
-;; Exceptions/error handling
-
+; ----------------------------------------------------------------------------
+; Exceptions/error handling
 ((variable) @keyword.exception
-  (#any-of? @keyword.exception 
-   "error"
-   "undefined"
-   "try"
-   "tryJust"
-   "tryAny"
-   "catch"
-   "catches"
-   "catchJust"
-   "handle"
-   "handleJust"
-   "throw"
-   "throwIO"
-   "throwTo"
-   "throwError"
-   "ioError"
-   "mask"
-   "mask_"
-   "uninterruptibleMask"
-   "uninterruptibleMask_"
-   "bracket"
-   "bracket_"
-   "bracketOnErrorSource"
-   "finally"
-   "fail"
-   "onException"
-   "expectationFailure"))
+  (#any-of? @keyword.exception "error" "undefined" "try" "tryJust" "tryAny" "catch" "catches" "catchJust" "handle" "handleJust" "throw" "throwIO" "throwTo" "throwError" "ioError" "mask" "mask_" "uninterruptibleMask" "uninterruptibleMask_" "bracket" "bracket_" "bracketOnErrorSource" "finally" "fail" "onException" "expectationFailure"))
 
-;; ----------------------------------------------------------------------------
-;; Debugging
+; ----------------------------------------------------------------------------
+; Debugging
 ((variable) @keyword.debug
-  (#any-of? @keyword.debug
-   "trace"
-   "traceId"
-   "traceShow"
-   "traceShowId"
-   "traceWith"
-   "traceShowWith"
-   "traceStack"
-   "traceIO"
-   "traceM"
-   "traceShowM"
-   "traceEvent"
-   "traceEventWith"
-   "traceEventIO"
-   "flushEventLog"
-   "traceMarker"
-   "traceMarkerIO"))
+  (#any-of? @keyword.debug "trace" "traceId" "traceShow" "traceShowId" "traceWith" "traceShowWith" "traceStack" "traceIO" "traceM" "traceShowM" "traceEvent" "traceEventWith" "traceEventIO" "flushEventLog" "traceMarker" "traceMarkerIO"))
 
+; ----------------------------------------------------------------------------
+; Fields
+(field
+  (variable) @variable.member)
 
-;; ----------------------------------------------------------------------------
-;; Fields
-(field (variable) @variable.member)
-(pat_field (variable) @variable.member)
-(exp_projection field: (variable) @variable.member)
-(import_item (type) . (import_con_names (variable) @variable.member))
-(exp_field field: [((variable) @variable.member) (qualified_variable (variable) @variable.member)])
+(pat_field
+  (variable) @variable.member)
 
+(exp_projection
+  field: (variable) @variable.member)
 
-;; ----------------------------------------------------------------------------
-;; Spell checking
+(import_item
+  (type)
+  .
+  (import_con_names
+    (variable) @variable.member))
 
+(exp_field
+  field:
+    [
+      ((variable) @variable.member)
+      (qualified_variable
+        (variable) @variable.member)
+    ])
+
+; ----------------------------------------------------------------------------
+; Spell checking
 (comment) @spell
diff --git a/queries/haskell/injections.scm b/queries/haskell/injections.scm
index bc70e012f..d1c8fe5fb 100644
--- a/queries/haskell/injections.scm
+++ b/queries/haskell/injections.scm
@@ -1,18 +1,15 @@
-;; -----------------------------------------------------------------------------
-;; General language injection
-
+; -----------------------------------------------------------------------------
+; General language injection
 (quasiquote
- ((quoter) @injection.language)
- ((quasiquote_body) @injection.content)
-)
+  ((quoter) @injection.language)
+  ((quasiquote_body) @injection.content))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
-
-;; -----------------------------------------------------------------------------
-;; shakespeare library
-;; NOTE: doesn't support templating
+  (#set! injection.language "comment"))
 
+; -----------------------------------------------------------------------------
+; shakespeare library
+; NOTE: doesn't support templating
 ; TODO: add once CoffeeScript parser is added
 ; ; CoffeeScript: Text.Coffee
 ; (quasiquote
@@ -20,58 +17,52 @@
 ;  (#eq? @_name "coffee")
 ;  ((quasiquote_body) @injection.content
 ;   (#set! injection.language "coffeescript")))
-
 ; CSS: Text.Cassius, Text.Lucius
 (quasiquote
- (quoter) @_name
- (#any-of? @_name "cassius" "lucius")
- ((quasiquote_body) @injection.content)
- (#set! injection.language "css"))
+  (quoter) @_name
+  (#any-of? @_name "cassius" "lucius")
+  ((quasiquote_body) @injection.content)
+  (#set! injection.language "css"))
 
 ; HTML: Text.Hamlet
 (quasiquote
- (quoter) @_name
- (#any-of? @_name "shamlet" "xshamlet" "hamlet" "xhamlet" "ihamlet")
- ((quasiquote_body) @injection.content)
- (#set! injection.language "html"))
+  (quoter) @_name
+  (#any-of? @_name "shamlet" "xshamlet" "hamlet" "xhamlet" "ihamlet")
+  ((quasiquote_body) @injection.content)
+  (#set! injection.language "html"))
 
 ; JS: Text.Julius
 (quasiquote
- (quoter) @_name
- (#any-of? @_name "js" "julius")
- ((quasiquote_body) @injection.content)
- (#set! injection.language "javascript"))
+  (quoter) @_name
+  (#any-of? @_name "js" "julius")
+  ((quasiquote_body) @injection.content)
+  (#set! injection.language "javascript"))
 
 ; TS: Text.TypeScript
 (quasiquote
- (quoter) @_name
- (#any-of? @_name "tsc" "tscJSX")
- ((quasiquote_body) @injection.content)
- (#set! injection.language "typescript"))
-
-
-;; -----------------------------------------------------------------------------
-;; HSX
+  (quoter) @_name
+  (#any-of? @_name "tsc" "tscJSX")
+  ((quasiquote_body) @injection.content)
+  (#set! injection.language "typescript"))
 
+; -----------------------------------------------------------------------------
+; HSX
 (quasiquote
- (quoter) @_name
- (#eq? @_name "hsx")
- ((quasiquote_body) @injection.content)
- (#set! injection.language "html"))
-
-;; -----------------------------------------------------------------------------
-;; Inline JSON from aeson
+  (quoter) @_name
+  (#eq? @_name "hsx")
+  ((quasiquote_body) @injection.content)
+  (#set! injection.language "html"))
 
+; -----------------------------------------------------------------------------
+; Inline JSON from aeson
 (quasiquote
   (quoter) @_name
   (#eq? @_name "aesonQQ")
   ((quasiquote_body) @injection.content)
   (#set! injection.language "json"))
 
-
-;; -----------------------------------------------------------------------------
-;; SQL
-
+; -----------------------------------------------------------------------------
+; SQL
 ; postgresql-simple
 (quasiquote
   (quoter) @injection.language
diff --git a/queries/haskell_persistent/folds.scm b/queries/haskell_persistent/folds.scm
index 2bdffd177..dd34d9f15 100644
--- a/queries/haskell_persistent/folds.scm
+++ b/queries/haskell_persistent/folds.scm
@@ -1,3 +1 @@
-[
-  (entity_definition)
-] @fold
+(entity_definition) @fold
diff --git a/queries/haskell_persistent/highlights.scm b/queries/haskell_persistent/highlights.scm
index e806befcf..22cbf5cb3 100644
--- a/queries/haskell_persistent/highlights.scm
+++ b/queries/haskell_persistent/highlights.scm
@@ -1,20 +1,23 @@
-;; ----------------------------------------------------------------------------
-;; Literals and comments
-
+; ----------------------------------------------------------------------------
+; Literals and comments
 (integer) @number
+
 (float) @number.float
+
 (char) @character
+
 (string) @string
+
 (attribute_name) @attribute
+
 (attribute_exclamation_mark) @attribute
 
-(con_unit) @string.special.symbol  ; unit, as in ()
+(con_unit) @string.special.symbol ; unit, as in ()
 
 (comment) @comment @spell
 
-;; ----------------------------------------------------------------------------
-;; Keywords, operators, includes
-
+; ----------------------------------------------------------------------------
+; Keywords, operators, includes
 [
   "Id"
   "Primary"
@@ -24,15 +27,12 @@
 
 "=" @operator
 
-
-;; ----------------------------------------------------------------------------
-;; Functions and variables
-
+; ----------------------------------------------------------------------------
+; Functions and variables
 (variable) @variable
 
-;; ----------------------------------------------------------------------------
-;; Types
-
+; ----------------------------------------------------------------------------
+; Types
 (type) @type
 
 (constructor) @constructor
diff --git a/queries/hcl/folds.scm b/queries/hcl/folds.scm
index cb20b2aa8..e0c5313a2 100644
--- a/queries/hcl/folds.scm
+++ b/queries/hcl/folds.scm
@@ -1,6 +1,6 @@
 [
- (comment)
- (block)
- (heredoc_template)
- (object)
+  (comment)
+  (block)
+  (heredoc_template)
+  (object)
 ] @fold
diff --git a/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
index 7aa8b86fe..45a120dff 100644
--- a/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -1,5 +1,4 @@
 ; highlights.scm
-
 [
   "!"
   "\*"
@@ -76,22 +75,45 @@
 ] @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)
+(body
+  (block
+    (identifier) @keyword))
+
+(body
+  (block
+    (body
+      (block
+        (identifier) @type))))
+
+(function_call
+  (identifier) @function)
+
+(attribute
+  (identifier) @variable.member)
 
 ; { 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) @variable.member)))
 
 ; var.foo, data.bar
 ;
 ; first element in get_attr is a variable.builtin or a reference to a variable.builtin
-(expression (variable_expr (identifier) @variable.builtin) (get_attr (identifier) @variable.member))
+(expression
+  (variable_expr
+    (identifier) @variable.builtin)
+  (get_attr
+    (identifier) @variable.member))
diff --git a/queries/hcl/indents.scm b/queries/hcl/indents.scm
index 93264de9d..1d7dc49d9 100644
--- a/queries/hcl/indents.scm
+++ b/queries/hcl/indents.scm
@@ -12,4 +12,5 @@
 ] @indent.branch @indent.end
 
 (comment) @indent.auto
+
 (ERROR) @indent.auto
diff --git a/queries/hcl/injections.scm b/queries/hcl/injections.scm
index fd881d503..b68f4caea 100644
--- a/queries/hcl/injections.scm
+++ b/queries/hcl/injections.scm
@@ -1,5 +1,5 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 (heredoc_template
   (template_literal) @injection.content
diff --git a/queries/heex/highlights.scm b/queries/heex/highlights.scm
index f13e5d04f..e2fb01880 100644
--- a/queries/heex/highlights.scm
+++ b/queries/heex/highlights.scm
@@ -31,23 +31,24 @@
 
 ; HEEx text content is treated as markup
 ; (text) @none
-
 ; 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/queries/heex/injections.scm b/queries/heex/injections.scm
index d8ae03caa..4f179ee80 100644
--- a/queries/heex/injections.scm
+++ b/queries/heex/injections.scm
@@ -27,4 +27,4 @@
 
 ; HEEx comments
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/hjson/highlights.scm b/queries/hjson/highlights.scm
index 6e092fa14..8333d8fe5 100644
--- a/queries/hjson/highlights.scm
+++ b/queries/hjson/highlights.scm
@@ -1,15 +1,28 @@
 (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)
 ;  "," @punctuation.delimiter
 "[" @punctuation.bracket
+
 "]" @punctuation.bracket
+
 "{" @punctuation.bracket
+
 "}" @punctuation.bracket
 
 (comment) @comment @spell
diff --git a/queries/hjson/indents.scm b/queries/hjson/indents.scm
index 3b01ca999..350f670a0 100644
--- a/queries/hjson/indents.scm
+++ b/queries/hjson/indents.scm
@@ -1,3 +1,2 @@
 ; inherits: json
-
 (comment) @indent.ignore
diff --git a/queries/hjson/injections.scm b/queries/hjson/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/hjson/injections.scm
+++ b/queries/hjson/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/hlsl/highlights.scm b/queries/hlsl/highlights.scm
index 68e9e44bd..b85c1a7fd 100644
--- a/queries/hlsl/highlights.scm
+++ b/queries/hlsl/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: cpp
-
 [
   "in"
   "out"
@@ -26,10 +25,13 @@
   "triangle"
 ] @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/queries/hlsl/injections.scm b/queries/hlsl/injections.scm
index 29222ee01..c2fca7121 100644
--- a/queries/hlsl/injections.scm
+++ b/queries/hlsl/injections.scm
@@ -1,5 +1,5 @@
 ((preproc_arg) @injection.content
- (#set! injection.language "hlsl"))
+  (#set! injection.language "hlsl"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/hocon/highlights.scm b/queries/hocon/highlights.scm
index f0cc498b4..0eb94e6dd 100644
--- a/queries/hocon/highlights.scm
+++ b/queries/hocon/highlights.scm
@@ -1,37 +1,65 @@
 (comment) @comment @spell
 
 (null) @constant.builtin
-[ (true) (false) ] @boolean
+
+[
+  (true)
+  (false)
+] @boolean
+
 (number) @number
+
 (unit) @keyword
+
 (string) @string
+
 (multiline_string) @string
-(string (escape_sequence) @string.escape)
+
+(string
+  (escape_sequence) @string.escape)
+
 (unquoted_string) @string
 
-[ "url"
+[
+  "url"
   "file"
   "classpath"
   "required"
 ] @keyword
 
-(include "include" @keyword.import)
+(include
+  "include" @keyword.import)
 
-(substitution ["${" "${?" "}"] @punctuation.special)
-(substitution (_) @variable.member)
+(substitution
+  [
+    "${"
+    "${?"
+    "}"
+  ] @punctuation.special)
 
-(path (_) @variable.member)
-(value [":" "=" "+=" ] @operator)
+(substitution
+  (_) @variable.member)
+
+(path
+  (_) @variable.member)
+
+(value
+  [
+    ":"
+    "="
+    "+="
+  ] @operator)
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
-]  @punctuation.bracket
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "," ] @punctuation.delimiter
-(unquoted_path "." @punctuation.delimiter)
+"," @punctuation.delimiter
 
+(unquoted_path
+  "." @punctuation.delimiter)
diff --git a/queries/hocon/injections.scm b/queries/hocon/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/hocon/injections.scm
+++ b/queries/hocon/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/hoon/folds.scm b/queries/hoon/folds.scm
index 93d1386e7..cfb4b6d0c 100644
--- a/queries/hoon/folds.scm
+++ b/queries/hoon/folds.scm
@@ -1,6 +1,6 @@
 [
- (bartisTall)
- (luslusTall)
- (lusbucTall)
- (barcenTall)
- ] @fold
+  (bartisTall)
+  (luslusTall)
+  (lusbucTall)
+  (barcenTall)
+] @fold
diff --git a/queries/hoon/highlights.scm b/queries/hoon/highlights.scm
index 029d20c1e..767b0dd22 100644
--- a/queries/hoon/highlights.scm
+++ b/queries/hoon/highlights.scm
@@ -7,14 +7,13 @@
   ")"
   "["
   "]"
-]  @punctuation.bracket
+] @punctuation.bracket
 
 [
   (coreTerminator)
   (seriesTerminator)
 ] @punctuation.delimiter
 
-
 (rune) @operator
 
 (term) @constant
@@ -28,6 +27,9 @@
 (date) @string.special
 
 (mold) @string.special.symbol
+
 (specialIndex) @number.builtin
+
 (lark) @operator
+
 (fullContext) @string.special.symbol
diff --git a/queries/hoon/locals.scm b/queries/hoon/locals.scm
index f8cb5f857..fd7cc026d 100644
--- a/queries/hoon/locals.scm
+++ b/queries/hoon/locals.scm
@@ -1,4 +1,4 @@
 (tisfasTall
   name: (name) @local.definition.var)
-  
+
 (name) @local.reference
diff --git a/queries/html/highlights.scm b/queries/html/highlights.scm
index 4e2371d64..ae4e396c0 100644
--- a/queries/html/highlights.scm
+++ b/queries/html/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: html_tags
-
 (doctype) @constant
 
 "<!" @tag.delimiter
diff --git a/queries/html/injections.scm b/queries/html/injections.scm
index 7087abc73..adb067d15 100644
--- a/queries/html/injections.scm
+++ b/queries/html/injections.scm
@@ -1,5 +1,4 @@
 ; inherits html_tags
-
 (element
   (start_tag
     (tag_name) @_py_script)
@@ -10,12 +9,12 @@
 (script_element
   (start_tag
     (attribute
-      (attribute_name) @_attr 
-      (quoted_attribute_value 
+      (attribute_name) @_attr
+      (quoted_attribute_value
         (attribute_value) @_type)))
   (raw_text) @injection.content
   (#eq? @_attr "type")
-  ; not adding type="py" here as it's handled by html_tags 
+  ; not adding type="py" here as it's handled by html_tags
   (#any-of? @_type "pyscript" "py-script")
   (#set! injection.language "python"))
 
diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index 44626caac..9b84fbf8b 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -1,61 +1,104 @@
 (tag_name) @tag
 ; (erroneous_end_tag_name) @error ; we do not lint syntax errors
 (comment) @comment @spell
+
 (attribute_name) @tag.attribute
+
 ((attribute
   (quoted_attribute_value) @string)
- (#set! "priority" 99))
+  (#set! "priority" 99))
+
 (text) @none @spell
 
-((element (start_tag (tag_name) @_tag) (text) @markup.heading)
- (#eq? @_tag "title"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.heading)
+  (#eq? @_tag "title"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.heading.1)
- (#eq? @_tag "h1"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.heading.1)
+  (#eq? @_tag "h1"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.heading.2)
- (#eq? @_tag "h2"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.heading.2)
+  (#eq? @_tag "h2"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.heading.3)
- (#eq? @_tag "h3"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.heading.3)
+  (#eq? @_tag "h3"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.heading.4)
- (#eq? @_tag "h4"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.heading.4)
+  (#eq? @_tag "h4"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.heading.5)
- (#eq? @_tag "h5"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.heading.5)
+  (#eq? @_tag "h5"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.heading.6)
- (#eq? @_tag "h6"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.heading.6)
+  (#eq? @_tag "h6"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.strong)
- (#any-of? @_tag "strong" "b"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.strong)
+  (#any-of? @_tag "strong" "b"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.italic)
- (#any-of? @_tag "em" "i"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.italic)
+  (#any-of? @_tag "em" "i"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.strikethrough)
- (#any-of? @_tag "s" "del"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.strikethrough)
+  (#any-of? @_tag "s" "del"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.underline)
- (#eq? @_tag "u"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.underline)
+  (#eq? @_tag "u"))
 
-((element (start_tag (tag_name) @_tag) (text) @markup.raw)
- (#any-of? @_tag "code" "kbd"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @markup.raw)
+  (#any-of? @_tag "code" "kbd"))
 
-((element (start_tag (tag_name) @_tag) (text) @string.special.url)
- (#eq? @_tag "a"))
+((element
+  (start_tag
+    (tag_name) @_tag)
+  (text) @string.special.url)
+  (#eq? @_tag "a"))
 
 ((attribute
-   (attribute_name) @_attr
-   (quoted_attribute_value (attribute_value) @string.special.url))
- (#any-of? @_attr "href" "src"))
+  (attribute_name) @_attr
+  (quoted_attribute_value
+    (attribute_value) @string.special.url))
+  (#any-of? @_attr "href" "src"))
 
 [
- "<"
- ">"
- "</"
- "/>"
+  "<"
+  ">"
+  "</"
+  "/>"
 ] @tag.delimiter
 
 "=" @operator
diff --git a/queries/html_tags/indents.scm b/queries/html_tags/indents.scm
index 2d9fd3864..59448d2fc 100644
--- a/queries/html_tags/indents.scm
+++ b/queries/html_tags/indents.scm
@@ -1,31 +1,32 @@
 [
-  (
-    (element
-      (start_tag 
-        (tag_name) @_not_special)
-    )
-    (#not-any-of? @_not_special "meta" "link")
-  )
-  (element (self_closing_tag))
+  ((element
+    (start_tag
+      (tag_name) @_not_special))
+    (#not-any-of? @_not_special "meta" "link"))
+  (element
+    (self_closing_tag))
 ] @indent.begin
-
 ; These tags are usually written one-lined and doesn't use self-closing tags so special-cased them
 ; but add indent to the tag to make sure attributes inside them are still indented if written multi-lined
-(
-  (start_tag 
-     (tag_name) @_special)
-  (#any-of? @_special "meta" "link")
-) @indent.begin
-
+((start_tag
+  (tag_name) @_special)
+  (#any-of? @_special "meta" "link")) @indent.begin
 
 ; These are the nodes that will be captured when we do `normal o`
 ; But last element has already been ended, so capturing this
 ; to mark end of last element
-(element (end_tag [">"] @indent.end))
-(element (self_closing_tag "/>" @indent.end))
+(element
+  (end_tag
+    ">" @indent.end))
+
+(element
+  (self_closing_tag
+    "/>" @indent.end))
 
 ; Script/style elements aren't indented, so only branch the end tag of other elements
-(element (end_tag) @indent.branch)
+(element
+  (end_tag) @indent.branch)
+
 [
   ">"
   "/>"
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index cef63ad8d..8cfcddf29 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -3,51 +3,57 @@
 ; 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)
+  (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"))
+  (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>...</script>
 ; <script defer>...</script>
 ((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"))
+  (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"))
 
 ; <script type="mimetype-or-well-known-script-type">
 (script_element
   (start_tag
     ((attribute
-         (attribute_name) @_attr (#eq? @_attr "type")
-         (quoted_attribute_value (attribute_value) @_type))))
-  (raw_text) @injection.content (#set-lang-from-mimetype! @_type))
+      (attribute_name) @_attr
+      (#eq? @_attr "type")
+      (quoted_attribute_value
+        (attribute_value) @_type))))
+  (raw_text) @injection.content
+  (#set-lang-from-mimetype! @_type))
 
 ; <a style="/* css */">
 ((attribute
-   (attribute_name) @_attr
-   (quoted_attribute_value (attribute_value) @injection.content))
- (#eq? @_attr "style")
- (#set! injection.language "css"))
+  (attribute_name) @_attr
+  (quoted_attribute_value
+    (attribute_value) @injection.content))
+  (#eq? @_attr "style")
+  (#set! injection.language "css"))
 
 ; lit-html style template interpolation
 ; <a @click=${e => console.log(e)}>
 ; <a @click="${e => console.log(e)}">
 ((attribute
-  (quoted_attribute_value (attribute_value) @injection.content))
+  (quoted_attribute_value
+    (attribute_value) @injection.content))
   (#lua-match? @injection.content "%${")
   (#offset! @injection.content 0 2 0 -1)
   (#set! injection.language "javascript"))
@@ -59,39 +65,44 @@
   (#set! injection.language "javascript"))
 
 ; <input pattern="[0-9]"> or <input pattern=[0-9]>
-(element (_
-  (tag_name) @_tagname (#eq? @_tagname "input")
-  ((attribute
-    (attribute_name) @_attr [
-      (quoted_attribute_value (attribute_value) @injection.content)
-      (attribute_value) @injection.content
-    ] (#eq? @_attr "pattern")))
-  (#set! injection.language "regex")))
+(element
+  (_
+    (tag_name) @_tagname
+    (#eq? @_tagname "input")
+    ((attribute
+      (attribute_name) @_attr
+      [
+        (quoted_attribute_value
+          (attribute_value) @injection.content)
+        (attribute_value) @injection.content
+      ]
+      (#eq? @_attr "pattern")))
+    (#set! injection.language "regex")))
 
 ; <input type="checkbox" onchange="this.closest('form').elements.output.value = this.checked">
 (attribute
   (attribute_name) @_name
   (#lua-match? @_name "^on[a-z]+$")
-  (quoted_attribute_value (attribute_value) @injection.content)
+  (quoted_attribute_value
+    (attribute_value) @injection.content)
   (#set! injection.language "javascript"))
 
 (attribute
   ((attribute_name) @_name
-   (#lua-match? @_name "[%[%(].*[%)%]]"))
+    (#lua-match? @_name "[%[%(].*[%)%]]"))
   (quoted_attribute_value
     (attribute_value) @injection.content)
   (#set! injection.language "angular"))
 
 (attribute
   ((attribute_name) @_name
-   (#lua-match? @_name "^%*"))
+    (#lua-match? @_name "^%*"))
   (quoted_attribute_value
     ((attribute_value) @injection.content))
   (#set! injection.language "angular"))
 
 (element
   ((text) @injection.content
-   (#lua-match? @injection.content "%{%{.*%}%}")
-   (#offset! @injection.content 0 2 0 -2))
+    (#lua-match? @injection.content "%{%{.*%}%}")
+    (#offset! @injection.content 0 2 0 -2))
   (#set! injection.language "angular"))
-
diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index 214dbb36f..5bbc4211b 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -1,45 +1,59 @@
 ; adapted from https://github.com/interdependence/tree-sitter-htmldjango
-
 [
   (unpaired_comment)
   (paired_comment)
 ] @comment @spell
 
 [
-  "{{" "}}"
-  "{%" "%}"
+  "{{"
+  "}}"
+  "{%"
+  "%}"
   (end_paired_statement)
 ] @punctuation.bracket
 
 [
- "end"
- (tag_name)
+  "end"
+  (tag_name)
 ] @function
 
 (variable_name) @variable
 
 (filter_name) @function.method
+
 (filter_argument) @variable.parameter
 
 (keyword) @keyword
 
 [
- "|"
- "="
- (operator)
+  "|"
+  "="
+  (operator)
 ] @operator
+
 (keyword_operator) @keyword.operator
 
 (string) @string
-(filter [ "'" "\"" ] . (filter_argument) @string)
+
+(filter
+  [
+    "'"
+    "\""
+  ]
+  .
+  (filter_argument) @string)
 
 (number) @number
-((filter (filter_argument) @number)
- (#lua-match? @number "^%d+$"))
+
+((filter
+  (filter_argument) @number)
+  (#lua-match? @number "^%d+$"))
 
 (boolean) @boolean
-((filter (filter_argument) @boolean)
- (#any-of? @boolean "True" "False"))
+
+((filter
+  (filter_argument) @boolean)
+  (#any-of? @boolean "True" "False"))
 
 [
   ":"
diff --git a/queries/htmldjango/indents.scm b/queries/htmldjango/indents.scm
index fd3d86502..d671f045d 100644
--- a/queries/htmldjango/indents.scm
+++ b/queries/htmldjango/indents.scm
@@ -1,3 +1,5 @@
 (paired_statement) @indent.begin
+
 (end_paired_statement) @indent.end
+
 (branch_statement) @indent.branch
diff --git a/queries/htmldjango/injections.scm b/queries/htmldjango/injections.scm
index f08227342..c475757bf 100644
--- a/queries/htmldjango/injections.scm
+++ b/queries/htmldjango/injections.scm
@@ -1,3 +1,3 @@
 ((content) @injection.content
- (#set! injection.language "html")
- (#set! injection.combined))
+  (#set! injection.language "html")
+  (#set! injection.combined))
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index c5af93714..d1396ff63 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -1,29 +1,24 @@
 ; Keywords
-
 (scheme) @keyword
 
 ; Methods
-
 (method) @function.method
 
 ; Constants
-
 (const_spec) @constant
 
 ; Variables
-
 (identifier) @variable
 
 ; Fields
-
-(pair name: (identifier) @variable.member)
+(pair
+  name: (identifier) @variable.member)
 
 ; Parameters
-
-(query_param (key) @variable.parameter)
+(query_param
+  (key) @variable.parameter)
 
 ; Operators
-
 [
   "="
   "?"
@@ -32,7 +27,6 @@
 ] @operator
 
 ; Literals
-
 (string) @string
 
 (target_url) @string.special.url
@@ -40,17 +34,15 @@
 (number) @number
 
 ; (boolean) @boolean
-
 (null) @constant.builtin
 
 ; Punctuation
-
-[ "{{" "}}" ] @punctuation.bracket
-
 [
-  ":"
-] @punctuation.delimiter
+  "{{"
+  "}}"
+] @punctuation.bracket
+
+":" @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/http/injections.scm b/queries/http/injections.scm
index cc17373dc..a0cc1b4e9 100644
--- a/queries/http/injections.scm
+++ b/queries/http/injections.scm
@@ -1,11 +1,11 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
 
 ((json_body) @injection.content
- (#set! injection.language "json"))
+  (#set! injection.language "json"))
 
 ((xml_body) @injection.content
- (#set! injection.language "xml"))
+  (#set! injection.language "xml"))
 
-; ((graphql_body) @injection.content 
+; ((graphql_body) @injection.content
 ;  (#set! injection.language "graphql")) ; Not used as of now..
diff --git a/queries/hurl/folds.scm b/queries/hurl/folds.scm
index d7b8cd6cd..a0edfa930 100644
--- a/queries/hurl/folds.scm
+++ b/queries/hurl/folds.scm
@@ -1,5 +1,4 @@
 ; fold.scm
-
 [
   (comment)
   (entry)
diff --git a/queries/hurl/highlights.scm b/queries/hurl/highlights.scm
index d43c172b8..9ccaa2ee7 100644
--- a/queries/hurl/highlights.scm
+++ b/queries/hurl/highlights.scm
@@ -1,6 +1,5 @@
 ; highlights.scm
-
-[ 
+[
   "[QueryStringParams]"
   "[FormParams]"
   "[MultipartFormData]"
@@ -13,7 +12,7 @@
   (json_key_string)
 ] @property
 
-[ 
+[
   "\\"
   (regex_escaped_char)
   (quoted_string_escaped_char)
@@ -53,7 +52,8 @@
   "retry"
   "retry-interval"
   "retry-max-count"
-  (variable_option "variable")
+  (variable_option
+    "variable")
   "verbose"
   "very-verbose"
 ] @constant.builtin
@@ -102,17 +102,26 @@
   (json_number)
 ] @number.float
 
-[ ":" "," ] @punctuation.delimiter
+[
+  ":"
+  ","
+] @punctuation.delimiter
 
-[ "[" "]" "{" "}" "{{" "}}" ] @punctuation.bracket
+[
+  "["
+  "]"
+  "{"
+  "}"
+  "{{"
+  "}}"
+] @punctuation.bracket
 
-[ 
+[
   (value_string)
   (quoted_string)
   (json_string)
 ] @string
 
-
 [
   "base64,"
   "hex,"
@@ -133,4 +142,3 @@
 (filter) @attribute
 
 (method) @type.builtin
-
diff --git a/queries/hurl/indents.scm b/queries/hurl/indents.scm
index 232cfc01a..af6fdfa4e 100644
--- a/queries/hurl/indents.scm
+++ b/queries/hurl/indents.scm
@@ -1,5 +1,4 @@
 ; indents.scm
-
 [
   (json_object)
   (json_array)
@@ -11,4 +10,5 @@
 ] @indent.branch
 
 (xml_tag) @indent.begin
+
 (xml_close_tag) @indent.branch
diff --git a/queries/hurl/injections.scm b/queries/hurl/injections.scm
index 1a099e186..ea62b8f5f 100644
--- a/queries/hurl/injections.scm
+++ b/queries/hurl/injections.scm
@@ -1,9 +1,9 @@
 ; injections.scm
 ((json_value) @injection.content
- (#set! injection.language "json"))
+  (#set! injection.language "json"))
 
 ((xml) @injection.content
- (#set! injection.language "xml"))
+  (#set! injection.language "xml"))
 
 (multiline_string
   (multiline_string_type) @_lang
diff --git a/queries/ini/highlights.scm b/queries/ini/highlights.scm
index d431a78b5..4da3c7b4c 100644
--- a/queries/ini/highlights.scm
+++ b/queries/ini/highlights.scm
@@ -1,15 +1,16 @@
 (section_name
   (text) @type) ; consistency with toml
+
 (comment) @comment @spell
 
 [
- "["
- "]"
+  "["
+  "]"
 ] @punctuation.bracket
 
-[
- "="
-] @operator
+"=" @operator
+
+(setting
+  (setting_name) @property)
 
-(setting (setting_name) @property)
 ; (setting_value) @none ; grammar does not support subtypes
diff --git a/queries/ispc/folds.scm b/queries/ispc/folds.scm
index 45d0ba131..331c70345 100644
--- a/queries/ispc/folds.scm
+++ b/queries/ispc/folds.scm
@@ -1,5 +1,4 @@
 ; inherits: c
-
 [
   (foreach_statement)
   (foreach_instance_statement)
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 6b1d2bd96..3877bafa3 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: c
-
 [
   "soa"
   "task"
@@ -26,9 +25,7 @@
   "foreach_unique"
 ] @keyword.repeat
 
-[
-  "cif"
-] @keyword.conditional
+"cif" @keyword.conditional
 
 [
   "varying"
@@ -37,56 +34,45 @@
 
 "__regcall" @attribute
 
-(overload_declarator name: _ @function)
-(foreach_statement range_operator: _ @operator)
+(overload_declarator
+  name: _ @function)
 
-(short_vector ["<" ">"] @punctuation.bracket)
-(soa_qualifier ["<" ">"] @punctuation.bracket)
-(template_argument_list ["<" ">"] @punctuation.bracket)
-(template_parameter_list ["<" ">"] @punctuation.bracket)
+(foreach_statement
+  range_operator: _ @operator)
+
+(short_vector
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(soa_qualifier
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(template_argument_list
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(template_parameter_list
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (llvm_identifier) @function.builtin
 
 ; built-in variables
 ((identifier) @variable.builtin
-  (#any-of? @variable.builtin
-   "programCount"
-   "programIndex"
-   "taskCount"
-   "taskCount0"
-   "taskCount1"
-   "taskCount2"
-   "taskIndex"
-   "taskIndex0"
-   "taskIndex1"
-   "taskIndex2"
-   "threadCount"
-   "threadIndex"
-   ))
+  (#any-of? @variable.builtin "programCount" "programIndex" "taskCount" "taskCount0" "taskCount1" "taskCount2" "taskIndex" "taskIndex0" "taskIndex1" "taskIndex2" "threadCount" "threadIndex"))
 
 ; preprocessor constants
 ((identifier) @constant.builtin
-  (#any-of? @constant.builtin
-   "ISPC"
-   "ISPC_FP16_SUPPORTED"
-   "ISPC_FP64_SUPPORTED"
-   "ISPC_LLVM_INTRINSICS_ENABLED"
-   "ISPC_MAJOR_VERSION"
-   "ISPC_MINOR_VERSION"
-   "ISPC_POINTER_SIZE"
-   "ISPC_TARGET_AVX"
-   "ISPC_TARGET_AVX2"
-   "ISPC_TARGET_AVX512KNL"
-   "ISPC_TARGET_AVX512SKX"
-   "ISPC_TARGET_AVX512SPR"
-   "ISPC_TARGET_NEON"
-   "ISPC_TARGET_SSE2"
-   "ISPC_TARGET_SSE4"
-   "ISPC_UINT_IS_DEFINED"
-   "PI"
-   "TARGET_ELEMENT_WIDTH"
-   "TARGET_WIDTH"
-   ))
+  (#any-of? @constant.builtin "ISPC" "ISPC_FP16_SUPPORTED" "ISPC_FP64_SUPPORTED" "ISPC_LLVM_INTRINSICS_ENABLED" "ISPC_MAJOR_VERSION" "ISPC_MINOR_VERSION" "ISPC_POINTER_SIZE" "ISPC_TARGET_AVX" "ISPC_TARGET_AVX2" "ISPC_TARGET_AVX512KNL" "ISPC_TARGET_AVX512SKX" "ISPC_TARGET_AVX512SPR" "ISPC_TARGET_NEON" "ISPC_TARGET_SSE2" "ISPC_TARGET_SSE4" "ISPC_UINT_IS_DEFINED" "PI" "TARGET_ELEMENT_WIDTH" "TARGET_WIDTH"))
 
 ; standard library built-in
 ((type_identifier) @type.builtin
diff --git a/queries/ispc/indents.scm b/queries/ispc/indents.scm
index cc0829d5c..bf64a963b 100644
--- a/queries/ispc/indents.scm
+++ b/queries/ispc/indents.scm
@@ -1,7 +1,8 @@
 ; inherits: c
+((foreach_statement
+  body: (_) @_body) @indent.begin
+  (#not-has-type? @_body compound_statement))
 
-((foreach_statement body: (_) @_body) @indent.begin
- (#not-has-type? @_body compound_statement))
-
-((foreach_instance_statement body: (_) @_body) @indent.begin
- (#not-has-type? @_body compound_statement))
+((foreach_instance_statement
+  body: (_) @_body) @indent.begin
+  (#not-has-type? @_body compound_statement))
diff --git a/queries/ispc/locals.scm b/queries/ispc/locals.scm
index e2e5a9663..54e328083 100644
--- a/queries/ispc/locals.scm
+++ b/queries/ispc/locals.scm
@@ -1,17 +1,17 @@
 ; inherits: c
-
 (reference_declarator
   (identifier) @local.definition.var)
 
 (type_parameter_declaration
   (type_identifier) @local.definition.type)
+
 (template_declaration) @local.scope
 
 (template_function
   name: (identifier) @local.definition.function) @local.scope
 
 [
- (foreach_statement)
- (foreach_instance_statement)
- (unmasked_statement)
+  (foreach_statement)
+  (foreach_instance_statement)
+  (unmasked_statement)
 ] @local.scope
diff --git a/queries/janet_simple/folds.scm b/queries/janet_simple/folds.scm
index 901641099..e316af4d5 100644
--- a/queries/janet_simple/folds.scm
+++ b/queries/janet_simple/folds.scm
@@ -1 +1,2 @@
-(source (par_tup_lit) @fold)
+(source
+  (par_tup_lit) @fold)
diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index c1408ec68..94614c7a2 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -1,61 +1,71 @@
-;; >> Literals
-
+; >> Literals
 (kwd_lit) @string.special.symbol
+
 (str_lit) @string
+
 (long_str_lit) @string
+
 (buf_lit) @string
+
 (long_buf_lit) @string
+
 (num_lit) @number
+
 (bool_lit) @boolean
+
 (nil_lit) @constant.builtin
+
 (comment) @comment @spell
 
-["{" "@{" "}"
- "[" "@[" "]"
- "(" "@(" ")"] @punctuation.bracket
+[
+  "{"
+  "@{"
+  "}"
+  "["
+  "@["
+  "]"
+  "("
+  "@("
+  ")"
+] @punctuation.bracket
 
-;; >> Symbols
-
-;; General symbol highlighting
+; >> Symbols
+; General symbol highlighting
 (sym_lit) @variable
 
-;; General function calls
+; General function calls
 (par_tup_lit
- .
- (sym_lit) @function.call)
+  .
+  (sym_lit) @function.call)
 
 (short_fn_lit
- .
- (sym_lit) @function.call)
-
-;; Quoted symbols
+  .
+  (sym_lit) @function.call)
 
+; Quoted symbols
 (quote_lit
- (sym_lit) @string.special.symbol)
+  (sym_lit) @string.special.symbol)
 
 (qq_lit
- (sym_lit) @string.special.symbol)
-
-;; Dynamic variables
+  (sym_lit) @string.special.symbol)
 
+; Dynamic variables
 ((sym_lit) @variable.builtin
- (#lua-match? @variable.builtin "^[*].+[*]$"))
-
-;; Comment
+  (#lua-match? @variable.builtin "^[*].+[*]$"))
 
+; Comment
 ((sym_lit) @comment
- (#any-of? @comment "comment"))
-
-;; Special forms and builtin macros
-;;
-;; # special forms were manually added at the beginning
-;;
-;; # for macros
-;; (each name (all-bindings)
-;;   (when-let [info (dyn (symbol name))]
-;;     (when (info :macro)
-;;       (print name))))
+  (#any-of? @comment "comment"))
 
+; Special forms and builtin macros
+;
+; # special forms were manually added at the beginning
+;
+; # for macros
+; (each name (all-bindings)
+;   (when-let [info (dyn (symbol name))]
+;     (when (info :macro)
+;       (print name))))
 ((sym_lit) @function.macro
   ; format-ignore
   (#any-of? @function.macro
@@ -105,15 +115,14 @@
     "when" "when-let" "when-with"
     "with" "with-dyns" "with-syms" "with-vars"))
 
-;; All builtin functions
-;;
-;; (each name (all-bindings)
-;;   (when-let [info (dyn (symbol name))]
-;;     (when (and (nil? (info :macro))
-;;                (or (function? (info :value))
-;;                    (cfunction? (info :value))))
-;;       (print name))))
-
+; All builtin functions
+;
+; (each name (all-bindings)
+;   (when-let [info (dyn (symbol name))]
+;     (when (and (nil? (info :macro))
+;                (or (function? (info :value))
+;                    (cfunction? (info :value))))
+;       (print name))))
 ((sym_lit) @function.builtin
   ; format-ignore
   (#any-of? @function.builtin
@@ -301,4 +310,3 @@
     "xprin" "xprinf" "xprint" "xprintf"
     "yield"
     "zero?" "zipcoll"))
-
diff --git a/queries/janet_simple/injections.scm b/queries/janet_simple/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/janet_simple/injections.scm
+++ b/queries/janet_simple/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 4ff56641d..ee36bf0bf 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -1,20 +1,17 @@
 ; CREDITS @maxbrunsfeld (maxbrunsfeld@gmail.com)
-
 ; Variables
-
 (identifier) @variable
 
 ; Methods
-
 (method_declaration
   name: (identifier) @function.method)
+
 (method_invocation
   name: (identifier) @function.method.call)
 
 (super) @function.builtin
 
 ; Parameters
-
 (formal_parameter
   name: (identifier) @variable.parameter)
 
@@ -22,18 +19,17 @@
   name: (identifier) @variable.parameter)
 
 (spread_parameter
- (variable_declarator
-   name: (identifier) @variable.parameter)) ; int... foo
+  (variable_declarator
+    name: (identifier) @variable.parameter)) ; int... foo
 
-;; Lambda parameter
-
-(inferred_parameters (identifier) @variable.parameter) ; (x,y) -> ...
+; Lambda parameter
+(inferred_parameters
+  (identifier) @variable.parameter) ; (x,y) -> ...
 
 (lambda_expression
-    parameters: (identifier) @variable.parameter) ; x -> ...
+  parameters: (identifier) @variable.parameter) ; x -> ...
 
 ; Operators
-
 [
   "+"
   ":"
@@ -73,41 +69,51 @@
 ] @operator
 
 ; Types
-
 (interface_declaration
   name: (identifier) @type)
+
 (annotation_type_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
+
 ((type_identifier) @type.builtin
   (#eq? @type.builtin "var"))
+
 ((method_invocation
   object: (identifier) @type)
- (#lua-match? @type "^[A-Z]"))
+  (#lua-match? @type "^[A-Z]"))
+
 ((method_reference
-  . (identifier) @type)
- (#lua-match? @type "^[A-Z]"))
+  .
+  (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
 
 ((field_access
   object: (identifier) @type)
   (#lua-match? @type "^[A-Z]"))
+
 (scoped_identifier
   (identifier) @type
   (#lua-match? @type "^[A-Z]"))
 
 ; Fields
-
 (field_declaration
-  declarator: (variable_declarator
-    name: (identifier) @variable.member))
+  declarator:
+    (variable_declarator
+      name: (identifier) @variable.member))
 
 (field_access
   field: (identifier) @variable.member)
@@ -120,23 +126,21 @@
 ] @type.builtin
 
 ; Variables
-
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z_][A-Z%d_]+$"))
 
 (this) @variable.builtin
 
 ; Annotations
-
 (annotation
   "@" @attribute
   name: (identifier) @attribute)
+
 (marker_annotation
   "@" @attribute
   name: (identifier) @attribute)
 
 ; Literals
-
 (string_literal) @string
 
 (escape_sequence) @string.escape
@@ -163,7 +167,6 @@
 (null_literal) @constant.builtin
 
 ; Keywords
-
 [
   "assert"
   "class"
@@ -211,12 +214,9 @@
   "yield"
 ] @keyword.return
 
-[
-  "new"
-] @keyword.operator
+"new" @keyword.operator
 
 ; Conditionals
-
 [
   "if"
   "else"
@@ -224,10 +224,13 @@
   "case"
 ] @keyword.conditional
 
-(ternary_expression ["?" ":"] @keyword.conditional.ternary)
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 ; Loops
-
 [
   "for"
   "while"
@@ -237,7 +240,6 @@
 ] @keyword.repeat
 
 ; Includes
-
 [
   "exports"
   "import"
@@ -250,7 +252,6 @@
 ] @keyword.import
 
 ; Punctuation
-
 [
   ";"
   "."
@@ -258,19 +259,40 @@
   ","
 ] @punctuation.delimiter
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-(type_arguments [ "<" ">" ] @punctuation.bracket)
-(type_parameters [ "<" ">" ] @punctuation.bracket)
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
-(string_interpolation [ "\\{" "}" ] @punctuation.special)
+(type_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(string_interpolation
+  [
+    "\\{"
+    "}"
+  ] @punctuation.special)
 
 ; Exceptions
-
 [
   "throw"
   "throws"
@@ -280,12 +302,10 @@
 ] @keyword.exception
 
 ; Labels
-
 (labeled_statement
   (identifier) @label)
 
 ; Comments
-
 [
   (line_comment)
   (block_comment)
diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index 8ce928eb8..9e4d0a5e1 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -15,7 +15,8 @@
   (element_value_array_initializer)   ; { a, b } inside @Annotation()
 ] @indent.begin
 
-(expression_statement (method_invocation) @indent.begin)
+(expression_statement
+  (method_invocation) @indent.begin)
 
 [
   "("
@@ -26,7 +27,9 @@
   "]"
 ] @indent.branch
 
-(annotation_argument_list ")" @indent.end) ; This should be a special cased as `()` here doesn't have ending `;`
+(annotation_argument_list
+  ")" @indent.end) ; This should be a special cased as `()` here doesn't have ending `;`
+
 "}" @indent.end
 
 (line_comment) @indent.ignore
@@ -35,4 +38,3 @@
   (ERROR)
   (block_comment)
 ] @indent.auto
-
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 8696c16ff..59e1be02b 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -1,8 +1,8 @@
 ([
   (block_comment)
   (line_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
 
 ((block_comment) @injection.content
   (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
@@ -10,7 +10,11 @@
 
 ((method_invocation
   name: (identifier) @_method
-  arguments: (argument_list
-               . (string_literal . (_) @injection.content)))
- (#any-of? @_method "format" "printf")
- (#set! injection.language "printf"))
+  arguments:
+    (argument_list
+      .
+      (string_literal
+        .
+        (_) @injection.content)))
+  (#any-of? @_method "format" "printf")
+  (#set! injection.language "printf"))
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index 5de5f5ff5..ac0715c93 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -1,56 +1,62 @@
-;; SCOPES
-
+; SCOPES
 ; declarations
-
 (program) @local.scope
+
 (class_declaration
   body: (_) @local.scope)
+
 (record_declaration
   body: (_) @local.scope)
+
 (enum_declaration
   body: (_) @local.scope)
+
 (lambda_expression) @local.scope
+
 (enhanced_for_statement) @local.scope
 
 ; block
-
 (block) @local.scope
 
 ; if/else
-
 (if_statement) @local.scope ; if+else
+
 (if_statement
   consequence: (_) @local.scope) ; if body in case there are no braces
+
 (if_statement
   alternative: (_) @local.scope) ; else body in case there are no braces
 
 ; try/catch
-
 (try_statement) @local.scope ; covers try+catch, individual try and catch are covered by (block)
+
 (catch_clause) @local.scope ; needed because `Exception` variable
 
 ; loops
-
 (for_statement) @local.scope ; whole for_statement because loop iterator variable
-(for_statement         ; "for" body in case there are no braces
+
+(for_statement
+  ; "for" body in case there are no braces
   body: (_) @local.scope)
+
 (do_statement
   body: (_) @local.scope)
+
 (while_statement
   body: (_) @local.scope)
 
 ; Functions
-
 (constructor_declaration) @local.scope
+
 (method_declaration) @local.scope
 
-;; DEFINITIONS
-
+; DEFINITIONS
 (package_declaration
   (identifier) @local.definition.namespace)
 
 (class_declaration
   name: (identifier) @local.definition.type)
+
 (record_declaration
   name: (identifier) @local.definition.type)
 
@@ -61,30 +67,36 @@
   name: (identifier) @local.definition.method)
 
 (local_variable_declaration
-  declarator: (variable_declarator
-                name: (identifier) @local.definition.var))
-(enhanced_for_statement ; for (var item : items) {
+  declarator:
+    (variable_declarator
+      name: (identifier) @local.definition.var))
+
+(enhanced_for_statement
+  ; for (var item : items) {
   name: (identifier) @local.definition.var)
 
 (formal_parameter
   name: (identifier) @local.definition.parameter)
+
 (catch_formal_parameter
   name: (identifier) @local.definition.parameter)
 
-(inferred_parameters (identifier) @local.definition.parameter) ; (x,y) -> ...
+(inferred_parameters
+  (identifier) @local.definition.parameter) ; (x,y) -> ...
+
 (lambda_expression
-    parameters: (identifier) @local.definition.parameter) ; x -> ...
+  parameters: (identifier) @local.definition.parameter) ; x -> ...
 
 ((scoped_identifier
   (identifier) @local.definition.import)
- (#has-ancestor? @local.definition.import import_declaration))
+  (#has-ancestor? @local.definition.import import_declaration))
 
 (field_declaration
-  declarator: (variable_declarator
-                name: (identifier) @local.definition.field))
-
-;; REFERENCES
+  declarator:
+    (variable_declarator
+      name: (identifier) @local.definition.field))
 
+; REFERENCES
 (identifier) @local.reference
 
 (type_identifier) @local.reference
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index e757dd2bd..9b166d1fd 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -1,55 +1,55 @@
 ; inherits: ecma,jsx
-
-;;; Parameters
-(formal_parameters (identifier) @variable.parameter)
+; Parameters
+(formal_parameters
+  (identifier) @variable.parameter)
 
 (formal_parameters
   (rest_pattern
     (identifier) @variable.parameter))
 
-;; ({ a }) => null
+; ({ a }) => null
 (formal_parameters
   (object_pattern
     (shorthand_property_identifier_pattern) @variable.parameter))
 
-;; ({ a = b }) => null
+; ({ a = b }) => null
 (formal_parameters
   (object_pattern
     (object_assignment_pattern
       (shorthand_property_identifier_pattern) @variable.parameter)))
 
-;; ({ a: b }) => null
+; ({ a: b }) => null
 (formal_parameters
   (object_pattern
     (pair_pattern
       value: (identifier) @variable.parameter)))
 
-;; ([ a ]) => null
+; ([ a ]) => null
 (formal_parameters
   (array_pattern
     (identifier) @variable.parameter))
 
-;; ({ a } = { a }) => null
+; ({ a } = { a }) => null
 (formal_parameters
   (assignment_pattern
     (object_pattern
       (shorthand_property_identifier_pattern) @variable.parameter)))
 
-;; ({ a = b } = { a }) => null
+; ({ a = b } = { a }) => null
 (formal_parameters
   (assignment_pattern
     (object_pattern
       (object_assignment_pattern
         (shorthand_property_identifier_pattern) @variable.parameter))))
 
-;; a => null
+; a => null
 (arrow_function
   parameter: (identifier) @variable.parameter)
 
-;; optional parameters
+; optional parameters
 (formal_parameters
   (assignment_pattern
     left: (identifier) @variable.parameter))
 
-;; punctuation
+; punctuation
 (optional_chain) @punctuation.delimiter
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index 278702dfc..8c8d82363 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -1,19 +1,23 @@
 ; inherits: ecma,jsx
-
 ; Both properties are matched here.
 ;
 ;   class Foo {
 ;     this.#bar = "baz";
 ;     this.quuz = "qux";
 ;   }
-(field_definition 
-  property: [(property_identifier) (private_property_identifier)] @local.definition.var)
+(field_definition
+  property:
+    [
+      (property_identifier)
+      (private_property_identifier)
+    ] @local.definition.var)
 
 ; this.foo = "bar"
 (assignment_expression
-  left: (member_expression
-    object: (this)
-    property: (property_identifier) @local.definition.var))
+  left:
+    (member_expression
+      object: (this)
+      property: (property_identifier) @local.definition.var))
 
 (formal_parameters
   (identifier) @local.definition.parameter)
@@ -27,18 +31,18 @@
 (arrow_function
   parameter: (identifier) @local.definition.parameter)
 
-;; ({ a }) => null
+; ({ a }) => null
 (formal_parameters
   (object_pattern
     (shorthand_property_identifier_pattern) @local.definition.parameter))
 
-;; ({ a: b }) => null
+; ({ a: b }) => null
 (formal_parameters
   (object_pattern
     (pair_pattern
       value: (identifier) @local.definition.parameter)))
 
-;; ([ a ]) => null
+; ([ a ]) => null
 (formal_parameters
   (array_pattern
     (identifier) @local.definition.parameter))
@@ -54,8 +58,11 @@
 ;     baz(y) { y }
 ;   }
 (method_definition
-  ([(property_identifier) (private_property_identifier)] @local.definition.function)
-   (#set! definition.var.scope parent))
+  ([
+    (property_identifier)
+    (private_property_identifier)
+  ] @local.definition.function)
+  (#set! definition.var.scope parent))
 
 ; this.foo()
 (member_expression
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index 968ba87a0..d7c42a96c 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -1,61 +1,59 @@
 ; Variables
-
 (variable) @variable
 
 ((variable) @constant.builtin
- (#eq? @constant.builtin "$ENV"))
+  (#eq? @constant.builtin "$ENV"))
 
 ((variable) @constant.macro
- (#eq? @constant.macro "$__loc__"))
+  (#eq? @constant.macro "$__loc__"))
 
 ; Properties
-
 (index
-   (identifier) @property)
+  (identifier) @property)
 
 ; Labels
+(query
+  label: (variable) @label)
 
 (query
-   label: (variable) @label)
-
-(query
-   break_statement: (variable) @label)
+  break_statement: (variable) @label)
 
 ; Literals
-
 (number) @number
 
 (string) @string
 
 [
-   "true"
-   "false"
+  "true"
+  "false"
 ] @boolean
 
 ("null") @type.builtin
 
 ; Interpolation
-
-["\\(" ")"] @character.special
+[
+  "\\("
+  ")"
+] @character.special
 
 ; Format
-
 (format) @attribute
 
 ; Functions
-
 (funcdef
-   (identifier) @function)
+  (identifier) @function)
 
 (funcdefargs
-   (identifier) @variable.parameter)
+  (identifier) @variable.parameter)
 
 [
   "reduce"
   "foreach"
 ] @function.builtin
 
-((funcname) @function.call . "(")
+((funcname) @function.call
+  .
+  "(")
 
 ; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
 ((funcname) @function.builtin
@@ -251,9 +249,7 @@
     "y0"
     "y1"
     "yn"))
-
 ; Keywords
-
 [
   "def"
   "as"
@@ -286,7 +282,6 @@
 ] @keyword.operator
 
 ; Operators
-
 [
   "."
   "=="
@@ -315,7 +310,6 @@
 ] @operator
 
 ; Punctuation
-
 [
   ";"
   ","
@@ -323,11 +317,13 @@
 ] @punctuation.delimiter
 
 [
-  "[" "]"
-  "{" "}"
-  "(" ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "("
+  ")"
 ] @punctuation.bracket
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/jq/injections.scm b/queries/jq/injections.scm
index 072d38e24..740af735e 100644
--- a/queries/jq/injections.scm
+++ b/queries/jq/injections.scm
@@ -1,36 +1,22 @@
-((comment) @injection.content (#set! injection.language "comment"))
-
+((comment) @injection.content
+  (#set! injection.language "comment"))
 ; test(val)
 (query
   ((funcname) @_function
-   (#any-of? @_function
-             "test"
-             "match"
-             "capture"
-             "scan"
-             "split"
-             "splits"
-             "sub"
-             "gsub"))
-  (args . 
-    (query 
+    (#any-of? @_function "test" "match" "capture" "scan" "split" "splits" "sub" "gsub"))
+  (args
+    .
+    (query
       (string) @injection.content
       (#set! injection.language "regex"))))
 
-
 ; test(regex; flags)
 (query
   ((funcname) @_function
-   (#any-of? @_function
-             "test"
-             "match"
-             "capture"
-             "scan"
-             "split"
-             "splits"
-             "sub"
-             "gsub"))
-  (args . (args
-    (query 
-      (string) @injection.content
-      (#set! injection.language "regex")))))
+    (#any-of? @_function "test" "match" "capture" "scan" "split" "splits" "sub" "gsub"))
+  (args
+    .
+    (args
+      (query
+        (string) @injection.content
+        (#set! injection.language "regex")))))
diff --git a/queries/jq/locals.scm b/queries/jq/locals.scm
index 369bcb4eb..0b8a0997d 100644
--- a/queries/jq/locals.scm
+++ b/queries/jq/locals.scm
@@ -1,7 +1,10 @@
-(funcdef (identifier) @local.definition.function)
+(funcdef
+  (identifier) @local.definition.function)
 
-(funcdefargs (identifier) @local.definition.parameter)
+(funcdefargs
+  (identifier) @local.definition.parameter)
 
 (funcname) @local.reference
 
-(index (identifier) @local.reference)
+(index
+  (identifier) @local.reference)
diff --git a/queries/jsdoc/highlights.scm b/queries/jsdoc/highlights.scm
index 4b4266c9f..fcba0c188 100644
--- a/queries/jsdoc/highlights.scm
+++ b/queries/jsdoc/highlights.scm
@@ -1,2 +1,3 @@
 (tag_name) @keyword
+
 (type) @type
diff --git a/queries/json/highlights.scm b/queries/json/highlights.scm
index 36c8f7a10..17365ed34 100644
--- a/queries/json/highlights.scm
+++ b/queries/json/highlights.scm
@@ -1,28 +1,38 @@
 [
- (true)
- (false)
+  (true)
+  (false)
 ] @boolean
 
 (null) @constant.builtin
 
 (number) @number
 
-(pair key: (string) @label)
-(pair value: (string) @string)
+(pair
+  key: (string) @label)
 
-(array (string) @string)
+(pair
+  value: (string) @string)
 
-["," ":"] @punctuation.delimiter
+(array
+  (string) @string)
 
 [
- "[" "]"
- "{" "}"
+  ","
+  ":"
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 (("\"" @conceal)
- (#set! conceal ""))
+  (#set! conceal ""))
 
 (escape_sequence) @string.escape
+
 ((escape_sequence) @conceal
- (#eq? @conceal "\\\"")
- (#set! conceal "\""))
+  (#eq? @conceal "\\\"")
+  (#set! conceal "\""))
diff --git a/queries/json5/highlights.scm b/queries/json5/highlights.scm
index 6d53c7bfc..4ffe311c4 100644
--- a/queries/json5/highlights.scm
+++ b/queries/json5/highlights.scm
@@ -12,4 +12,4 @@
 (comment) @comment @spell
 
 (member
-    name: (_) @keyword)
+  name: (_) @keyword)
diff --git a/queries/json5/injections.scm b/queries/json5/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/json5/injections.scm
+++ b/queries/json5/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/jsonc/highlights.scm b/queries/jsonc/highlights.scm
index e50112155..763cd5998 100644
--- a/queries/jsonc/highlights.scm
+++ b/queries/jsonc/highlights.scm
@@ -1,3 +1,2 @@
 ; inherits: json
-
 (comment) @comment @spell
diff --git a/queries/jsonc/indents.scm b/queries/jsonc/indents.scm
index 3b01ca999..350f670a0 100644
--- a/queries/jsonc/indents.scm
+++ b/queries/jsonc/indents.scm
@@ -1,3 +1,2 @@
 ; inherits: json
-
 (comment) @indent.ignore
diff --git a/queries/jsonc/injections.scm b/queries/jsonc/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/jsonc/injections.scm
+++ b/queries/jsonc/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/jsonnet/folds.scm b/queries/jsonnet/folds.scm
index 9243ccfde..91257a790 100644
--- a/queries/jsonnet/folds.scm
+++ b/queries/jsonnet/folds.scm
@@ -1,10 +1,10 @@
 [
- (field)
- (object)
- (array)
- (parenthesis)
- (bind)
-; (params)
-; (args)
-; (conditional)
+  (field)
+  (object)
+  (array)
+  (parenthesis)
+  (bind)
+  ; (params)
+  ; (args)
+  ; (conditional)
 ] @fold
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index c8eb38fcc..acd838cbe 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -1,10 +1,14 @@
 (id) @variable
+
 (comment) @comment @spell
 
 ; Literals
 (null) @constant.builtin
+
 (string) @string
+
 (number) @number
+
 [
   (true)
   (false)
@@ -12,7 +16,9 @@
 
 ; Keywords
 "for" @keyword.repeat
+
 "in" @keyword.operator
+
 "function" @keyword.function
 
 [
@@ -37,8 +43,9 @@
   (self)
   (super)
 ] @variable.builtin
+
 ((id) @variable.builtin
- (#eq? @variable.builtin "std"))
+  (#eq? @variable.builtin "std"))
 
 ; Operators
 [
@@ -78,7 +85,8 @@
 ] @punctuation.special
 
 (field
-  (fieldname) "+" @punctuation.special)
+  (fieldname)
+  "+" @punctuation.special)
 
 ; Imports
 [
@@ -87,21 +95,33 @@
 ] @keyword.import
 
 ; Fields
+(fieldname
+  (id) @variable.member)
 
-(fieldname (id) @variable.member)
-(fieldname (string (string_content) @variable.member))
+(fieldname
+  (string
+    (string_content) @variable.member))
 
 ; Functions
 (field
-  function: (fieldname (id) @function))
+  function:
+    (fieldname
+      (id) @function))
+
 (field
-  function: (fieldname
-              (string (string_content) @function)))
+  function:
+    (fieldname
+      (string
+        (string_content) @function)))
+
 (param
   identifier: (id) @variable.parameter)
 
-(bind (id) @variable.local)
-(bind function: (id) @function)
+(bind
+  (id) @variable.local)
+
+(bind
+  function: (id) @function)
 
 ; Function call
 (functioncall
@@ -113,6 +133,5 @@
   "("
   (args
     (named_argument
-      (id) @variable.parameter
-    ))?
+      (id) @variable.parameter))?
   ")")
diff --git a/queries/jsonnet/locals.scm b/queries/jsonnet/locals.scm
index 583c89e03..ca03ef077 100644
--- a/queries/jsonnet/locals.scm
+++ b/queries/jsonnet/locals.scm
@@ -1,17 +1,28 @@
 (parenthesis) @local.scope
+
 (anonymous_function) @local.scope
+
 (object) @local.scope
+
 (field) @local.scope
+
 (local_bind) @local.scope
 
 (field
-  function: (fieldname (id)  @local.definition.function)
+  function:
+    (fieldname
+      (id) @local.definition.function)
   (#set! "definition.function.scope" "parent"))
 
-(bind (id)  @local.definition.var)
-(bind function: (id)  @local.definition.function)
+(bind
+  (id) @local.definition.var)
 
-(param (id) @local.definition.parameter)
+(bind
+  function: (id) @local.definition.function)
+
+(param
+  (id) @local.definition.parameter)
 
 (id) @local.reference
+
 ;(fieldname (id) (#is-not? local)) ; (#is-not?) not supported yet
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 718add87f..d99ae62ec 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -1,9 +1,27 @@
 (jsx_element
-  open_tag: (jsx_opening_element ["<" ">"] @tag.delimiter))
+  open_tag:
+    (jsx_opening_element
+      [
+        "<"
+        ">"
+      ] @tag.delimiter))
+
 (jsx_element
-  close_tag: (jsx_closing_element ["</" ">"] @tag.delimiter))
-(jsx_self_closing_element ["<" "/>"] @tag.delimiter)
-(jsx_attribute (property_identifier) @tag.attribute)
+  close_tag:
+    (jsx_closing_element
+      [
+        "</"
+        ">"
+      ] @tag.delimiter))
+
+(jsx_self_closing_element
+  [
+    "<"
+    "/>"
+  ] @tag.delimiter)
+
+(jsx_attribute
+  (property_identifier) @tag.attribute)
 
 (jsx_opening_element
   name: (identifier) @tag)
@@ -14,22 +32,34 @@
 (jsx_self_closing_element
   name: (identifier) @tag)
 
-(jsx_opening_element ((identifier) @constructor
- (#lua-match? @constructor "^[A-Z]")))
+(jsx_opening_element
+  ((identifier) @constructor
+    (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component>
-(jsx_opening_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
+(jsx_opening_element
+  ((member_expression
+    (identifier) @tag
+    (property_identifier) @constructor)))
 
-(jsx_closing_element ((identifier) @constructor
- (#lua-match? @constructor "^[A-Z]")))
+(jsx_closing_element
+  ((identifier) @constructor
+    (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - </My.Component>
-(jsx_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
+(jsx_closing_element
+  ((member_expression
+    (identifier) @tag
+    (property_identifier) @constructor)))
 
-(jsx_self_closing_element ((identifier) @constructor
- (#lua-match? @constructor "^[A-Z]")))
+(jsx_self_closing_element
+  ((identifier) @constructor
+    (#lua-match? @constructor "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component />
-(jsx_self_closing_element ((member_expression (identifier) @tag (property_identifier) @constructor)))
+(jsx_self_closing_element
+  ((member_expression
+    (identifier) @tag
+    (property_identifier) @constructor)))
 
 (jsx_text) @none
diff --git a/queries/jsx/indents.scm b/queries/jsx/indents.scm
index c0dd53281..eed9afeba 100644
--- a/queries/jsx/indents.scm
+++ b/queries/jsx/indents.scm
@@ -4,13 +4,18 @@
   (jsx_expression)
 ] @indent.begin
 
-(jsx_closing_element (">" @indent.end))
-(jsx_self_closing_element "/>" @indent.end)
+(jsx_closing_element
+  (">" @indent.end))
+
+(jsx_self_closing_element
+  "/>" @indent.end)
 
 [
   (jsx_closing_element)
   ">"
 ] @indent.branch
+
 ; <button
 ; />
-(jsx_self_closing_element "/>" @indent.branch)
+(jsx_self_closing_element
+  "/>" @indent.branch)
diff --git a/queries/jsx/injections.scm b/queries/jsx/injections.scm
index e20408a66..269ee3fff 100644
--- a/queries/jsx/injections.scm
+++ b/queries/jsx/injections.scm
@@ -1,9 +1,11 @@
 ; Styled Jsx <style jsx>
 (jsx_element
   (jsx_opening_element
-    (identifier) @_name (#eq? @_name "style")
-    (jsx_attribute) @_attr (#eq? @_attr "jsx"))
-  (jsx_expression 
-    ((template_string) @injection.content 
-     (#set! injection.language "css"))
-     (#offset! @injection.content 0 1 0 -1)))
+    (identifier) @_name
+    (#eq? @_name "style")
+    (jsx_attribute) @_attr
+    (#eq? @_attr "jsx"))
+  (jsx_expression
+    ((template_string) @injection.content
+      (#set! injection.language "css"))
+    (#offset! @injection.content 0 1 0 -1)))
diff --git a/queries/julia/folds.scm b/queries/julia/folds.scm
index 617182155..2cbdc2815 100644
--- a/queries/julia/folds.scm
+++ b/queries/julia/folds.scm
@@ -3,15 +3,12 @@
   (struct_definition)
   (macro_definition)
   (function_definition)
-
   (if_statement)
   (try_statement)
   (for_statement)
   (while_statement)
   (let_statement)
   (quote_statement)
-
   (do_clause)
   (compound_statement)
 ] @fold
-
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 21ae1adb0..74b2b8fca 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -1,12 +1,11 @@
-;;; Identifiers
-
+; Identifiers
 (identifier) @variable
 
 ; ;; If you want type highlighting based on Julia naming conventions (this might collide with mathematical notation)
 ; ((identifier) @type
 ;   (match? @type "^[A-Z][^_]"))  ; exception: Highlight `A_foo` sort of identifiers as variables
-
 (macro_identifier) @function.macro
+
 (macro_identifier
   (identifier) @function.macro) ; for any one using the variable highlight
 
@@ -15,37 +14,46 @@
 
 (quote_expression
   ":" @string.special.symbol
-  [(identifier) (operator)] @string.special.symbol)
+  [
+    (identifier)
+    (operator)
+  ] @string.special.symbol)
 
 (field_expression
   (identifier) @variable.member .)
 
-
-;;; Function names
-
-;; Definitions
-
+; Function names
+; Definitions
 (function_definition
   name: (identifier) @function)
+
 (short_function_definition
   name: (identifier) @function)
 
 (function_definition
-  name: (field_expression (identifier) @function .))
+  name:
+    (field_expression
+      (identifier) @function .))
+
 (short_function_definition
-  name: (field_expression (identifier) @function .))
-
-;; calls
+  name:
+    (field_expression
+      (identifier) @function .))
 
+; calls
 (call_expression
   (identifier) @function.call)
+
 (call_expression
-  (field_expression (identifier) @function.call .))
+  (field_expression
+    (identifier) @function.call .))
 
 (broadcast_call_expression
   (identifier) @function.call)
+
 (broadcast_call_expression
-  (field_expression (identifier) @function.call .))
+  (field_expression
+    (identifier) @function.call .))
 
 (binary_expression
   (_)
@@ -53,24 +61,18 @@
   (identifier) @function.call
   (#eq? @_pipe "|>"))
 
-;; Builtins
-
+; Builtins
 ((identifier) @function.builtin
-  (#any-of? @function.builtin
-  "_abstracttype" "_apply_iterate" "_apply_pure" "_call_in_world" "_call_in_world_total"
-  "_call_latest" "_equiv_typedef" "_expr" "_primitivetype" "_setsuper!" "_structtype"
-  "_typebody!" "_typevar" "applicable" "apply_type" "arrayref" "arrayset" "arraysize"
-  "const_arrayref" "donotdelete" "fieldtype" "get_binding_type" "getfield" "ifelse" "invoke" "isa"
-  "isdefined" "modifyfield!" "nfields" "replacefield!" "set_binding_type!" "setfield!" "sizeof"
-  "svec" "swapfield!" "throw" "tuple" "typeassert" "typeof"))
-
-
-;;; Parameters
+  (#any-of? @function.builtin "_abstracttype" "_apply_iterate" "_apply_pure" "_call_in_world" "_call_in_world_total" "_call_latest" "_equiv_typedef" "_expr" "_primitivetype" "_setsuper!" "_structtype" "_typebody!" "_typevar" "applicable" "apply_type" "arrayref" "arrayset" "arraysize" "const_arrayref" "donotdelete" "fieldtype" "get_binding_type" "getfield" "ifelse" "invoke" "isa" "isdefined" "modifyfield!" "nfields" "replacefield!" "set_binding_type!" "setfield!" "sizeof" "svec" "swapfield!" "throw" "tuple" "typeassert" "typeof"))
 
+; Parameters
 (parameter_list
   (identifier) @variable.parameter)
-(optional_parameter .
+
+(optional_parameter
+  .
   (identifier) @variable.parameter)
+
 (slurp_parameter
   (identifier) @variable.parameter)
 
@@ -79,28 +81,32 @@
   type: (_) @type)
 
 (function_expression
-  . (identifier) @variable.parameter) ; Single parameter arrow functions
-
-
-;;; Types
-
-;; Definitions
+  .
+  (identifier) @variable.parameter) ; Single parameter arrow functions
 
+; Types
+; Definitions
 (abstract_definition
   name: (identifier) @type.definition) @keyword
+
 (primitive_definition
   name: (identifier) @type.definition) @keyword
+
 (struct_definition
   name: (identifier) @type)
+
 (type_clause
-  [(identifier) @type
-    (field_expression (identifier) @type .)])
-
-;; Annotations
+  [
+    (identifier) @type
+    (field_expression
+      (identifier) @type .)
+  ])
 
+; Annotations
 (parametrized_type_expression
   (_) @type
-  (curly_expression (_) @type))
+  (curly_expression
+    (_) @type))
 
 (type_parameter_list
   (identifier) @type)
@@ -110,22 +116,24 @@
 
 (function_definition
   return_type: (identifier) @type)
+
 (short_function_definition
   return_type: (identifier) @type)
 
 (where_clause
   (identifier) @type)
+
 (where_clause
-  (curly_expression (_) @type))
+  (curly_expression
+    (_) @type))
 
-;; Builtins
-
-;; This list was generated with:
-;;
-;;  istype(x) = typeof(x) === DataType || typeof(x) === UnionAll
-;;  get_types(m) = filter(x -> istype(Base.eval(m, x)), names(m))
-;;  type_names = sort(union(get_types(Core), get_types(Base)))
-;;
+; Builtins
+; This list was generated with:
+;
+;  istype(x) = typeof(x) === DataType || typeof(x) === UnionAll
+;  get_types(m) = filter(x -> istype(Base.eval(m, x)), names(m))
+;  type_names = sort(union(get_types(Core), get_types(Base)))
+;
 ((identifier) @type.builtin
   ; format-ignore
   (#any-of? @type.builtin
@@ -347,71 +355,129 @@
   (#any-of? @variable.builtin "begin" "end")
   (#has-ancestor? @variable.builtin range_expression))
 
-;;; Keywords
-
+; Keywords
 [
   "global"
   "local"
 ] @keyword
 
-
 (compound_statement
-  ["begin" "end"] @keyword)
+  [
+    "begin"
+    "end"
+  ] @keyword)
+
 (quote_statement
-  ["quote" "end"] @keyword)
+  [
+    "quote"
+    "end"
+  ] @keyword)
+
 (let_statement
-  ["let" "end"] @keyword)
+  [
+    "let"
+    "end"
+  ] @keyword)
 
 (if_statement
-  ["if" "end"] @keyword.conditional)
+  [
+    "if"
+    "end"
+  ] @keyword.conditional)
+
 (elseif_clause
   "elseif" @keyword.conditional)
+
 (else_clause
   "else" @keyword.conditional)
+
 (if_clause
   "if" @keyword.conditional) ; `if` clause in comprehensions
+
 (ternary_expression
-  ["?" ":"] @keyword.conditional.ternary)
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 (try_statement
-  ["try" "end"] @keyword.exception)
+  [
+    "try"
+    "end"
+  ] @keyword.exception)
+
 (finally_clause
   "finally" @keyword.exception)
+
 (catch_clause
   "catch" @keyword.exception)
 
 (for_statement
-  ["for" "end"] @keyword.repeat)
+  [
+    "for"
+    "end"
+  ] @keyword.repeat)
+
 (while_statement
-  ["while" "end"] @keyword.repeat)
+  [
+    "while"
+    "end"
+  ] @keyword.repeat)
+
 (for_clause
   "for" @keyword.repeat)
+
 [
   (break_statement)
   (continue_statement)
 ] @keyword.repeat
 
 (module_definition
-  ["module" "baremodule" "end"] @keyword.import)
+  [
+    "module"
+    "baremodule"
+    "end"
+  ] @keyword.import)
+
 (import_statement
-  ["import" "using"] @keyword.import)
+  [
+    "import"
+    "using"
+  ] @keyword.import)
+
 (import_alias
   "as" @keyword.import)
+
 (export_statement
   "export" @keyword.import)
+
 (selected_import
   ":" @punctuation.delimiter)
 
 (struct_definition
-  ["struct" "end"] @keyword)
+  [
+    "struct"
+    "end"
+  ] @keyword)
 
 (macro_definition
-  ["macro" "end"] @keyword)
+  [
+    "macro"
+    "end"
+  ] @keyword)
 
 (function_definition
-  ["function" "end"] @keyword.function)
+  [
+    "function"
+    "end"
+  ] @keyword.function)
+
 (do_clause
-  ["do" "end"] @keyword.function)
+  [
+    "do"
+    "end"
+  ] @keyword.function)
+
 (return_statement
   "return" @keyword.return)
 
@@ -420,25 +486,30 @@
   "mutable"
 ] @type.qualifier
 
-
-;;; Operators & Punctuation
-
+; Operators & Punctuation
 [
   "="
   "∈"
   (operator)
 ] @operator
 
-(adjoint_expression "'" @operator)
-(range_expression ":" @operator)
+(adjoint_expression
+  "'" @operator)
+
+(range_expression
+  ":" @operator)
 
 ((operator) @keyword.operator
   (#any-of? @keyword.operator "in" "isa"))
 
-(for_binding "in" @keyword.operator)
+(for_binding
+  "in" @keyword.operator)
 
-(where_clause "where" @keyword.operator)
-(where_expression "where" @keyword.operator)
+(where_clause
+  "where" @keyword.operator)
+
+(where_expression
+  "where" @keyword.operator)
 
 [
   ","
@@ -448,50 +519,57 @@
   "->"
 ] @punctuation.delimiter
 
+"..." @punctuation.special
+
 [
-  "..."
-] @punctuation.special
-
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
-
-
-;;; Literals
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
+; Literals
 (boolean_literal) @boolean
+
 (integer_literal) @number
+
 (float_literal) @number.float
 
 ((identifier) @number.float
-  (#any-of? @number.float "NaN" "NaN16" "NaN32"
-                   "Inf" "Inf16" "Inf32"))
+  (#any-of? @number.float "NaN" "NaN16" "NaN32" "Inf" "Inf16" "Inf32"))
 
 ((identifier) @constant.builtin
   (#any-of? @constant.builtin "nothing" "missing"))
 
 (character_literal) @character
+
 (escape_sequence) @string.escape
 
 (string_literal) @string
+
 (prefixed_string_literal
   prefix: (identifier) @function.macro) @string
 
 (command_literal) @string.special
+
 (prefixed_command_literal
   prefix: (identifier) @function.macro) @string.special
 
 ((string_literal) @string.documentation @spell
-  . [
-      (module_definition)
-      (abstract_definition)
-      (struct_definition)
-      (function_definition)
-      (short_function_definition)
-      (assignment)
-      (const_statement)
-    ])
+  .
+  [
+    (module_definition)
+    (abstract_definition)
+    (struct_definition)
+    (function_definition)
+    (short_function_definition)
+    (assignment)
+    (const_statement)
+  ])
 
 [
   (line_comment)
   (block_comment)
 ] @comment @spell
-
diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm
index e1ea1f719..bf4932ec3 100644
--- a/queries/julia/indents.scm
+++ b/queries/julia/indents.scm
@@ -2,7 +2,6 @@
   (struct_definition)
   (macro_definition)
   (function_definition)
-
   (compound_statement)
   (if_statement)
   (try_statement)
@@ -11,13 +10,10 @@
   (let_statement)
   (quote_statement)
   (do_clause)
-
   (assignment)
   (for_binding)
-
   (call_expression)
   (parenthesized_expression)
-
   (tuple_expression)
   (comprehension_expression)
   (matrix_expression)
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 82e1503fc..07af15a11 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -1,6 +1,7 @@
-;; Inject markdown in docstrings 
+; Inject markdown in docstrings
 ((string_literal) @injection.content
-  . [
+  .
+  [
     (module_definition)
     (abstract_definition)
     (struct_definition)
@@ -9,18 +10,18 @@
     (assignment)
     (const_statement)
   ]
- (#lua-match? @injection.content "^\"\"\"")
- (#set! injection.language "markdown")
- (#offset! @injection.content 0 3 0 -3))
+  (#lua-match? @injection.content "^\"\"\"")
+  (#set! injection.language "markdown")
+  (#offset! @injection.content 0 3 0 -3))
 
 ([
   (line_comment)
   (block_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
 
 ((prefixed_string_literal
-   prefix: (identifier) @_prefix) @injection.content
- (#eq? @_prefix "r")
- (#set! injection.language "regex")
- (#offset! @injection.content 0 2 0 -1))
+  prefix: (identifier) @_prefix) @injection.content
+  (#eq? @_prefix "r")
+  (#set! injection.language "regex")
+  (#offset! @injection.content 0 2 0 -1))
diff --git a/queries/julia/locals.scm b/queries/julia/locals.scm
index 9e607cfd1..3e7654b06 100644
--- a/queries/julia/locals.scm
+++ b/queries/julia/locals.scm
@@ -1,50 +1,52 @@
-;;; Variables
+; Variables
 (assignment
   (identifier) @local.definition.var)
+
 (assignment
   (tuple_expression
     (identifier) @local.definition.var))
 
-;;; let/const bindings
+; let/const bindings
 (let_binding
- (identifier) @local.definition.var)
+  (identifier) @local.definition.var)
+
 (let_binding
- (tuple_expression
-  (identifier) @local.definition.var))
+  (tuple_expression
+    (identifier) @local.definition.var))
 
-
-;;; For bindings
+; For bindings
 (for_binding
   (identifier) @local.definition.var)
+
 (for_binding
   (tuple_expression
     (identifier) @local.definition.var))
 
-
-;;; Types
-
+; Types
 (struct_definition
   name: (identifier) @local.definition.type)
+
 (abstract_definition
   name: (identifier) @local.definition.type)
+
 (abstract_definition
   name: (identifier) @local.definition.type)
 
 (type_parameter_list
   (identifier) @local.definition.type)
 
-;;; Module imports
-
+; Module imports
 (import_statement
   (identifier) @local.definition.import)
 
-
-;;; Parameters
-
+; Parameters
 (parameter_list
   (identifier) @local.definition.parameter)
-(optional_parameter .
+
+(optional_parameter
+  .
   (identifier) @local.definition.parameter)
+
 (slurp_parameter
   (identifier) @local.definition.parameter)
 
@@ -52,18 +54,19 @@
   parameter: (identifier) @local.definition.parameter
   (_))
 
-;; Single parameter arrow function
+; Single parameter arrow function
 (function_expression
- . (identifier) @local.definition.parameter) 
-
-
-;;; Function/macro definitions
+  .
+  (identifier) @local.definition.parameter)
 
+; Function/macro definitions
 (function_definition
   name: (identifier) @local.definition.function) @local.scope
+
 (short_function_definition
   name: (identifier) @local.definition.function) @local.scope
-(macro_definition 
+
+(macro_definition
   name: (identifier) @local.definition.macro) @local.scope
 
 (identifier) @local.reference
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index d2db087ce..1cea0832c 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -51,9 +51,16 @@
   "string"
 ] @type.builtin
 
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-(macro_variable ["$(" ")"] @punctuation.special)
+(macro_variable
+  [
+    "$("
+    ")"
+  ] @punctuation.special)
 
 (symbol) @variable
 
@@ -63,17 +70,28 @@
   (text)
 ] @string
 
-(config name: (symbol) @constant)
-(menuconfig name: (symbol) @constant)
-(choice name: (symbol) @constant)
+(config
+  name: (symbol) @constant)
+
+(menuconfig
+  name: (symbol) @constant)
+
+(choice
+  name: (symbol) @constant)
 
 ((symbol) @constant
   (#lua-match? @constant "[A-Z0-9]+"))
 
-(mainmenu name: (prompt) @markup.heading)
-(comment_entry name: (prompt) @markup.heading)
-(menu name: (prompt) @markup.heading)
+(mainmenu
+  name: (prompt) @markup.heading)
 
-(source (prompt) @string.special.url)
+(comment_entry
+  name: (prompt) @markup.heading)
+
+(menu
+  name: (prompt) @markup.heading)
+
+(source
+  (prompt) @string.special.url)
 
 (comment) @comment @spell
diff --git a/queries/kconfig/indents.scm b/queries/kconfig/indents.scm
index 77f02e1f6..faa83602f 100644
--- a/queries/kconfig/indents.scm
+++ b/queries/kconfig/indents.scm
@@ -1,4 +1,5 @@
-(help_text (text) @indent.auto)
+(help_text
+  (text) @indent.auto)
 
 [
   (config)
diff --git a/queries/kconfig/locals.scm b/queries/kconfig/locals.scm
index cce3a7f0e..1fc1b30a7 100644
--- a/queries/kconfig/locals.scm
+++ b/queries/kconfig/locals.scm
@@ -12,6 +12,13 @@
   (if)
 ] @local.scope
 
-(type_definition (prompt) @local.definition.var)
-(type_definition (input_prompt (prompt) @local.definition.var))
-(type_definition_default (expression (prompt) @local.definition.var))
+(type_definition
+  (prompt) @local.definition.var)
+
+(type_definition
+  (input_prompt
+    (prompt) @local.definition.var))
+
+(type_definition_default
+  (expression
+    (prompt) @local.definition.var))
diff --git a/queries/kdl/folds.scm b/queries/kdl/folds.scm
index 81acf643e..c96619b14 100644
--- a/queries/kdl/folds.scm
+++ b/queries/kdl/folds.scm
@@ -1,5 +1,4 @@
 ; Folds
-
 [
   (node)
   (node_children)
diff --git a/queries/kdl/highlights.scm b/queries/kdl/highlights.scm
index 5aafdeca3..d15845e13 100644
--- a/queries/kdl/highlights.scm
+++ b/queries/kdl/highlights.scm
@@ -1,58 +1,70 @@
 ; Types
-
-(node (identifier) @type)
+(node
+  (identifier) @type)
 
 (type) @type
 
 (annotation_type) @type.builtin
 
 ; Properties
-
-(prop (identifier) @property)
+(prop
+  (identifier) @property)
 
 ; Variables
-
 (identifier) @variable
 
 ; Operators
 [
- "="
- "+"
- "-"
+  "="
+  "+"
+  "-"
 ] @operator
 
 ; Literals
-
 (string) @string
 
 (escape) @string.escape
 
 (number) @number
 
-(number (decimal) @number.float)
-(number (exponent) @number.float)
+(number
+  (decimal) @number.float)
+
+(number
+  (exponent) @number.float)
 
 (boolean) @boolean
 
 "null" @constant.builtin
 
 ; Punctuation
-
-["{" "}"] @punctuation.bracket
-
-["(" ")"] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
 [
-  ";"
-] @punctuation.delimiter
+  "("
+  ")"
+] @punctuation.bracket
+
+";" @punctuation.delimiter
 
 ; Comments
-
 [
   (single_line_comment)
   (multi_line_comment)
 ] @comment @spell
 
-(node (node_comment) (#set! "priority" 105)) @comment
-(node (node_field (node_field_comment) (#set! "priority" 105)) @comment)
-(node_children (node_children_comment) (#set! "priority" 105)) @comment
+(node
+  (node_comment)
+  (#set! "priority" 105)) @comment
+
+(node
+  (node_field
+    (node_field_comment)
+    (#set! "priority" 105)) @comment)
+
+(node_children
+  (node_children_comment)
+  (#set! "priority" 105)) @comment
diff --git a/queries/kdl/indents.scm b/queries/kdl/indents.scm
index c14fec5cb..6d16efd2d 100644
--- a/queries/kdl/indents.scm
+++ b/queries/kdl/indents.scm
@@ -1,7 +1,14 @@
-(node (node_children) @indent.begin)
+(node
+  (node_children) @indent.begin)
 
 "}" @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
diff --git a/queries/kdl/injections.scm b/queries/kdl/injections.scm
index 46674768d..81d7734cb 100644
--- a/queries/kdl/injections.scm
+++ b/queries/kdl/injections.scm
@@ -1,5 +1,5 @@
 ([
   (single_line_comment)
   (multi_line_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/kdl/locals.scm b/queries/kdl/locals.scm
index 2c7ec5150..14b0af23e 100644
--- a/queries/kdl/locals.scm
+++ b/queries/kdl/locals.scm
@@ -1,10 +1,16 @@
 (document) @local.scope
-(node (node_children) @local.scope)
-(node_children (node) @local.scope)
+
+(node
+  (node_children) @local.scope)
+
+(node_children
+  (node) @local.scope)
 
 (identifier) @local.reference
 
 (node_field) @local.definition.field
 
-(node (identifier) @local.definition.type)
+(node
+  (identifier) @local.definition.type)
+
 (type) @local.definition.type
diff --git a/queries/kotlin/folds.scm b/queries/kotlin/folds.scm
index 768972b8b..eb4becc5f 100644
--- a/queries/kotlin/folds.scm
+++ b/queries/kotlin/folds.scm
@@ -1,17 +1,13 @@
 [
-	(import_list)
-
-	(when_expression)
-	(control_structure_body)
-
-	(lambda_literal)
-	(function_body)
-	(primary_constructor)
-	(secondary_constructor)
-	(anonymous_initializer)
-
-	(class_body)
-	(enum_class_body)
-
-	(interpolated_expression)
+  (import_list)
+  (when_expression)
+  (control_structure_body)
+  (lambda_literal)
+  (function_body)
+  (primary_constructor)
+  (secondary_constructor)
+  (anonymous_initializer)
+  (class_body)
+  (enum_class_body)
+  (interpolated_expression)
 ] @fold
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 1ce0c5430..2e5c349d2 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -1,53 +1,53 @@
-;;; Identifiers
-
+; Identifiers
 (simple_identifier) @variable
 
 ; `it` keyword inside lambdas
 ; FIXME: This will highlight the keyword outside of lambdas since tree-sitter
 ;        does not allow us to check for arbitrary nestation
 ((simple_identifier) @variable.builtin
-(#eq? @variable.builtin "it"))
+  (#eq? @variable.builtin "it"))
 
 ; `field` keyword inside property getter/setter
 ; FIXME: This will highlight the keyword outside of getters and setters
 ;        since tree-sitter does not allow us to check for arbitrary nestation
 ((simple_identifier) @variable.builtin
-(#eq? @variable.builtin "field"))
+  (#eq? @variable.builtin "field"))
 
 [
-	"this"
-	"super"
-	"this@"
-	"super@"
+  "this"
+  "super"
+  "this@"
+  "super@"
 ] @variable.builtin
 
 ; NOTE: for consistency with "super@"
-(super_expression "@" @variable.builtin)
+(super_expression
+  "@" @variable.builtin)
 
 (class_parameter
-	(simple_identifier) @property)
+  (simple_identifier) @property)
 
 (class_body
-	(property_declaration
-		(variable_declaration
-			(simple_identifier) @property)))
+  (property_declaration
+    (variable_declaration
+      (simple_identifier) @property)))
 
 ; id_1.id_2.id_3: `id_2` and `id_3` are assumed as object properties
 (_
-	(navigation_suffix
-		(simple_identifier) @property))
+  (navigation_suffix
+    (simple_identifier) @property))
 
 ; SCREAMING CASE identifiers are assumed to be constants
 ((simple_identifier) @constant
-(#lua-match? @constant "^[A-Z][A-Z0-9_]*$"))
+  (#lua-match? @constant "^[A-Z][A-Z0-9_]*$"))
 
 (_
-	(navigation_suffix
-		(simple_identifier) @constant
-		(#lua-match? @constant "^[A-Z][A-Z0-9_]*$")))
+  (navigation_suffix
+    (simple_identifier) @constant
+    (#lua-match? @constant "^[A-Z][A-Z0-9_]*$")))
 
 (enum_entry
-	(simple_identifier) @constant)
+  (simple_identifier) @constant)
 
 (type_identifier) @type
 
@@ -55,170 +55,95 @@
 (nullable_type) @punctuation.special
 
 (type_alias
-	(type_identifier) @type.definition)
+  (type_identifier) @type.definition)
 
 ((type_identifier) @type.builtin
-	(#any-of? @type.builtin
-		"Byte"
-		"Short"
-		"Int"
-		"Long"
-		"UByte"
-		"UShort"
-		"UInt"
-		"ULong"
-		"Float"
-		"Double"
-		"Boolean"
-		"Char"
-		"String"
-		"Array"
-		"ByteArray"
-		"ShortArray"
-		"IntArray"
-		"LongArray"
-		"UByteArray"
-		"UShortArray"
-		"UIntArray"
-		"ULongArray"
-		"FloatArray"
-		"DoubleArray"
-		"BooleanArray"
-		"CharArray"
-		"Map"
-		"Set"
-		"List"
-		"EmptyMap"
-		"EmptySet"
-		"EmptyList"
-		"MutableMap"
-		"MutableSet"
-		"MutableList"
-))
+  (#any-of? @type.builtin "Byte" "Short" "Int" "Long" "UByte" "UShort" "UInt" "ULong" "Float" "Double" "Boolean" "Char" "String" "Array" "ByteArray" "ShortArray" "IntArray" "LongArray" "UByteArray" "UShortArray" "UIntArray" "ULongArray" "FloatArray" "DoubleArray" "BooleanArray" "CharArray" "Map" "Set" "List" "EmptyMap" "EmptySet" "EmptyList" "MutableMap" "MutableSet" "MutableList"))
 
-(package_header "package" @keyword
-	. (identifier (simple_identifier) @module))
+(package_header
+  "package" @keyword
+  .
+  (identifier
+    (simple_identifier) @module))
 
 (import_header
-	"import" @keyword.import)
+  "import" @keyword.import)
 
 ; The last `simple_identifier` in a `import_header` will always either be a function
 ; or a type. Classes can appear anywhere in the import path, unlike functions
 (import_header
-	(identifier
-		(simple_identifier) @type @_import)
-	(import_alias
-		(type_identifier) @type.definition)?
-		(#lua-match? @_import "^[A-Z]"))
+  (identifier
+    (simple_identifier) @type @_import)
+  (import_alias
+    (type_identifier) @type.definition)?
+  (#lua-match? @_import "^[A-Z]"))
 
 (import_header
-	(identifier
-		(simple_identifier) @function @_import .)
-	(import_alias
-		(type_identifier) @function)?
-		(#lua-match? @_import "^[a-z]"))
+  (identifier
+    (simple_identifier) @function @_import .)
+  (import_alias
+    (type_identifier) @function)?
+  (#lua-match? @_import "^[a-z]"))
 
 (label) @label
 
-;;; Function definitions
-
+; Function definitions
 (function_declaration
-	(simple_identifier) @function)
+  (simple_identifier) @function)
 
 (getter
-	("get") @function.builtin)
+  ("get") @function.builtin)
+
 (setter
-	("set") @function.builtin)
+  ("set") @function.builtin)
 
 (primary_constructor) @constructor
+
 (secondary_constructor
-	("constructor") @constructor)
+  ("constructor") @constructor)
 
 (constructor_invocation
-	(user_type
-		(type_identifier) @constructor))
+  (user_type
+    (type_identifier) @constructor))
 
 (anonymous_initializer
-	("init") @constructor)
+  ("init") @constructor)
 
 (parameter
-	(simple_identifier) @variable.parameter)
+  (simple_identifier) @variable.parameter)
 
 (parameter_with_optional_type
-	(simple_identifier) @variable.parameter)
+  (simple_identifier) @variable.parameter)
 
 ; lambda parameters
 (lambda_literal
-	(lambda_parameters
-		(variable_declaration
-			(simple_identifier) @variable.parameter)))
-
-;;; Function calls
+  (lambda_parameters
+    (variable_declaration
+      (simple_identifier) @variable.parameter)))
 
+; Function calls
 ; function()
 (call_expression
-	. (simple_identifier) @function.call)
+  .
+  (simple_identifier) @function.call)
 
 ; ::function
 (callable_reference
-	. (simple_identifier) @function.call)
+  .
+  (simple_identifier) @function.call)
 
 ; object.function() or object.property.function()
 (call_expression
-	(navigation_expression
-		(navigation_suffix
-			(simple_identifier) @function.call) . ))
+  (navigation_expression
+    (navigation_suffix
+      (simple_identifier) @function.call) .))
 
 (call_expression
-	. (simple_identifier) @function.builtin
-    (#any-of? @function.builtin
-		"arrayOf"
-		"arrayOfNulls"
-		"byteArrayOf"
-		"shortArrayOf"
-		"intArrayOf"
-		"longArrayOf"
-		"ubyteArrayOf"
-		"ushortArrayOf"
-		"uintArrayOf"
-		"ulongArrayOf"
-		"floatArrayOf"
-		"doubleArrayOf"
-		"booleanArrayOf"
-		"charArrayOf"
-		"emptyArray"
-		"mapOf"
-		"setOf"
-		"listOf"
-		"emptyMap"
-		"emptySet"
-		"emptyList"
-		"mutableMapOf"
-		"mutableSetOf"
-		"mutableListOf"
-		"print"
-		"println"
-		"error"
-		"TODO"
-		"run"
-		"runCatching"
-		"repeat"
-		"lazy"
-		"lazyOf"
-		"enumValues"
-		"enumValueOf"
-		"assert"
-		"check"
-		"checkNotNull"
-		"require"
-		"requireNotNull"
-		"with"
-		"suspend"
-		"synchronized"
-))
-
-;;; Literals
+  .
+  (simple_identifier) @function.builtin
+  (#any-of? @function.builtin "arrayOf" "arrayOfNulls" "byteArrayOf" "shortArrayOf" "intArrayOf" "longArrayOf" "ubyteArrayOf" "ushortArrayOf" "uintArrayOf" "ulongArrayOf" "floatArrayOf" "doubleArrayOf" "booleanArrayOf" "charArrayOf" "emptyArray" "mapOf" "setOf" "listOf" "emptyMap" "emptySet" "emptyList" "mutableMapOf" "mutableSetOf" "mutableListOf" "print" "println" "error" "TODO" "run" "runCatching" "repeat" "lazy" "lazyOf" "enumValues" "enumValueOf" "assert" "check" "checkNotNull" "require" "requireNotNull" "with" "suspend" "synchronized"))
 
+; Literals
 [
   (line_comment)
   (multiline_comment)
@@ -230,17 +155,19 @@
 (shebang_line) @keyword.directive
 
 (real_literal) @number.float
+
 [
-	(integer_literal)
-	(long_literal)
-	(hex_literal)
-	(bin_literal)
-	(unsigned_literal)
+  (integer_literal)
+  (long_literal)
+  (hex_literal)
+  (bin_literal)
+  (unsigned_literal)
 ] @number
 
 [
-	"null" ; should be highlighted the same as booleans
-	(boolean_literal)
+  "null"
+  ; should be highlighted the same as booleans
+  (boolean_literal)
 ] @boolean
 
 (character_literal) @character
@@ -248,71 +175,73 @@
 (string_literal) @string
 
 ; NOTE: Escapes not allowed in multi-line strings
-(character_literal (character_escape_seq) @string.escape)
+(character_literal
+  (character_escape_seq) @string.escape)
 
 ; There are 3 ways to define a regex
 ;    - "[abc]?".toRegex()
 (call_expression
-	(navigation_expression
-		((string_literal) @string.regexp)
-		(navigation_suffix
-			((simple_identifier) @_function
-			(#eq? @_function "toRegex")))))
+  (navigation_expression
+    ((string_literal) @string.regexp)
+    (navigation_suffix
+      ((simple_identifier) @_function
+        (#eq? @_function "toRegex")))))
 
 ;    - Regex("[abc]?")
 (call_expression
-	((simple_identifier) @_function
-	(#eq? @_function "Regex"))
-	(call_suffix
-		(value_arguments
-			(value_argument
-				(string_literal) @string.regexp))))
+  ((simple_identifier) @_function
+    (#eq? @_function "Regex"))
+  (call_suffix
+    (value_arguments
+      (value_argument
+        (string_literal) @string.regexp))))
 
 ;    - Regex.fromLiteral("[abc]?")
 (call_expression
-	(navigation_expression
-		((simple_identifier) @_class
-		(#eq? @_class "Regex"))
-		(navigation_suffix
-			((simple_identifier) @_function
-			(#eq? @_function "fromLiteral"))))
-	(call_suffix
-		(value_arguments
-			(value_argument
-				(string_literal) @string.regexp))))
+  (navigation_expression
+    ((simple_identifier) @_class
+      (#eq? @_class "Regex"))
+    (navigation_suffix
+      ((simple_identifier) @_function
+        (#eq? @_function "fromLiteral"))))
+  (call_suffix
+    (value_arguments
+      (value_argument
+        (string_literal) @string.regexp))))
 
-;;; Keywords
+; Keywords
+(type_alias
+  "typealias" @keyword)
 
-(type_alias "typealias" @keyword)
-
-(companion_object "companion" @keyword)
+(companion_object
+  "companion" @keyword)
 
 [
-	(class_modifier)
-	(member_modifier)
-	(function_modifier)
-	(property_modifier)
-	(platform_modifier)
-	(variance_modifier)
-	(parameter_modifier)
-	(visibility_modifier)
-	(reification_modifier)
-	(inheritance_modifier)
+  (class_modifier)
+  (member_modifier)
+  (function_modifier)
+  (property_modifier)
+  (platform_modifier)
+  (variance_modifier)
+  (parameter_modifier)
+  (visibility_modifier)
+  (reification_modifier)
+  (inheritance_modifier)
 ] @type.qualifier
 
 [
-	"val"
-	"var"
-	"enum"
-	"class"
-	"object"
-	"interface"
-;	"typeof" ; NOTE: It is reserved for future use
+  "val"
+  "var"
+  "enum"
+  "class"
+  "object"
+  "interface"
+  ;	"typeof" ; NOTE: It is reserved for future use
 ] @keyword
 
 [
-	"return"
-	"return@"
+  "return"
+  "return@"
 ] @keyword.return
 
 "suspend" @keyword.coroutine
@@ -320,112 +249,135 @@
 "fun" @keyword.function
 
 [
-	"if"
-	"else"
-	"when"
+  "if"
+  "else"
+  "when"
 ] @keyword.conditional
 
 [
-	"for"
-	"do"
-	"while"
-	"continue"
-	"continue@"
-	"break"
-	"break@"
+  "for"
+  "do"
+  "while"
+  "continue"
+  "continue@"
+  "break"
+  "break@"
 ] @keyword.repeat
 
 [
-	"try"
-	"catch"
-	"throw"
-	"finally"
+  "try"
+  "catch"
+  "throw"
+  "finally"
 ] @keyword.exception
 
+(annotation
+  "@" @attribute
+  (use_site_target)? @attribute)
 
 (annotation
-	"@" @attribute (use_site_target)? @attribute)
+  (user_type
+    (type_identifier) @attribute))
+
 (annotation
-	(user_type
-		(type_identifier) @attribute))
-(annotation
-	(constructor_invocation
-		(user_type
-			(type_identifier) @attribute)))
+  (constructor_invocation
+    (user_type
+      (type_identifier) @attribute)))
 
 (file_annotation
-	"@" @attribute "file" @attribute ":" @attribute)
-(file_annotation
-	(user_type
-		(type_identifier) @attribute))
-(file_annotation
-	(constructor_invocation
-		(user_type
-			(type_identifier) @attribute)))
+  "@" @attribute
+  "file" @attribute
+  ":" @attribute)
 
-;;; Operators & Punctuation
+(file_annotation
+  (user_type
+    (type_identifier) @attribute))
 
+(file_annotation
+  (constructor_invocation
+    (user_type
+      (type_identifier) @attribute)))
+
+; Operators & Punctuation
 [
-	"!"
-	"!="
-	"!=="
-	"="
-	"=="
-	"==="
-	">"
-	">="
-	"<"
-	"<="
-	"||"
-	"&&"
-	"+"
-	"++"
-	"+="
-	"-"
-	"--"
-	"-="
-	"*"
-	"*="
-	"/"
-	"/="
-	"%"
-	"%="
-	"?."
-	"?:"
-	"!!"
-	"is"
-	"!is"
-	"in"
-	"!in"
-	"as"
-	"as?"
-	".."
-	"->"
+  "!"
+  "!="
+  "!=="
+  "="
+  "=="
+  "==="
+  ">"
+  ">="
+  "<"
+  "<="
+  "||"
+  "&&"
+  "+"
+  "++"
+  "+="
+  "-"
+  "--"
+  "-="
+  "*"
+  "*="
+  "/"
+  "/="
+  "%"
+  "%="
+  "?."
+  "?:"
+  "!!"
+  "is"
+  "!is"
+  "in"
+  "!in"
+  "as"
+  "as?"
+  ".."
+  "->"
 ] @operator
 
 [
-	"(" ")"
-	"[" "]"
-	"{" "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 [
-	"."
-	","
-	";"
-	":"
-	"::"
+  "."
+  ","
+  ";"
+  ":"
+  "::"
 ] @punctuation.delimiter
 
-(super_expression [ "<" ">" ] @punctuation.delimiter)
-(type_arguments [ "<" ">" ] @punctuation.delimiter)
-(type_parameters [ "<" ">" ] @punctuation.delimiter)
+(super_expression
+  [
+    "<"
+    ">"
+  ] @punctuation.delimiter)
+
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.delimiter)
+
+(type_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.delimiter)
 
 ; NOTE: `interpolated_identifier`s can be highlighted in any way
 (string_literal
-	"$" @punctuation.special
-	(interpolated_identifier) @none @variable)
+  "$" @punctuation.special
+  (interpolated_identifier) @none @variable)
+
 (string_literal
-	"${" @punctuation.special
-	(interpolated_expression) @none
-	"}" @punctuation.special)
+  "${" @punctuation.special
+  (interpolated_expression) @none
+  "}" @punctuation.special)
diff --git a/queries/kotlin/injections.scm b/queries/kotlin/injections.scm
index 8ac2eba60..335938309 100644
--- a/queries/kotlin/injections.scm
+++ b/queries/kotlin/injections.scm
@@ -1,17 +1,17 @@
 ([
   (line_comment)
   (multiline_comment)
- ] @injection.content
- (#set! injection.language "comment"))
-
+] @injection.content
+  (#set! injection.language "comment"))
 ; There are 3 ways to define a regex
 ;    - "[abc]?".toRegex()
 (call_expression
   (navigation_expression
-    ((string_literal) @injection.content (#set! injection.language "regex"))
-      (navigation_suffix
-	((simple_identifier) @_function
-	  (#eq? @_function "toRegex")))))
+    ((string_literal) @injection.content
+      (#set! injection.language "regex"))
+    (navigation_suffix
+      ((simple_identifier) @_function
+        (#eq? @_function "toRegex")))))
 
 ;    - Regex("[abc]?")
 (call_expression
@@ -20,25 +20,28 @@
   (call_suffix
     (value_arguments
       (value_argument
-        (string_literal) @injection.content (#set! injection.language "regex")))))
+        (string_literal) @injection.content
+        (#set! injection.language "regex")))))
 
 ;    - Regex.fromLiteral("[abc]?")
 (call_expression
   (navigation_expression
     ((simple_identifier) @_class
-                         (#eq? @_class "Regex"))
+      (#eq? @_class "Regex"))
     (navigation_suffix
       ((simple_identifier) @_function
-                           (#eq? @_function "fromLiteral"))))
+        (#eq? @_function "fromLiteral"))))
   (call_suffix
     (value_arguments
       (value_argument
-        (string_literal) @injection.content (#set! injection.language "regex")))))
+        (string_literal) @injection.content
+        (#set! injection.language "regex")))))
 
 ; "pi = %.2f".format(3.14159)
 ((call_expression
   (navigation_expression
     (string_literal) @injection.content
-    (navigation_suffix (simple_identifier) @_method)))
- (#eq? @_method "format")
- (#set! injection.language "printf"))
+    (navigation_suffix
+      (simple_identifier) @_method)))
+  (#eq? @_method "format")
+  (#set! injection.language "printf"))
diff --git a/queries/kotlin/locals.scm b/queries/kotlin/locals.scm
index 0f95d65c6..1bc044e85 100644
--- a/queries/kotlin/locals.scm
+++ b/queries/kotlin/locals.scm
@@ -1,84 +1,78 @@
-;;; Imports
-
+; Imports
 (package_header
-	. (identifier) @local.definition.namespace)
+  .
+  (identifier) @local.definition.namespace)
 
 (import_header
-	(identifier
-		(simple_identifier) @local.definition.import .)
-	(import_alias
-		(type_identifier) @local.definition.import)?)
-
-;;; Functions
+  (identifier
+    (simple_identifier) @local.definition.import .)
+  (import_alias
+    (type_identifier) @local.definition.import)?)
 
+; Functions
 (function_declaration
-	. (simple_identifier) @local.definition.function
-	(#set! "definition.function.scope" "parent"))
+  .
+  (simple_identifier) @local.definition.function
+  (#set! "definition.function.scope" "parent"))
 
 (class_body
-	(function_declaration
-		. (simple_identifier) @local.definition.method)
-	(#set! "definition.method.scope" "parent"))
-
-;;; Variables
+  (function_declaration
+    .
+    (simple_identifier) @local.definition.method)
+  (#set! "definition.method.scope" "parent"))
 
+; Variables
 (function_declaration
-	(function_value_parameters
-		(parameter
-			(simple_identifier) @local.definition.parameter)))
+  (function_value_parameters
+    (parameter
+      (simple_identifier) @local.definition.parameter)))
 
 (lambda_literal
-	(lambda_parameters
-		(variable_declaration
-			(simple_identifier) @local.definition.parameter)))
+  (lambda_parameters
+    (variable_declaration
+      (simple_identifier) @local.definition.parameter)))
 
 (class_body
-	(property_declaration
-		(variable_declaration
-			(simple_identifier) @local.definition.field)))
+  (property_declaration
+    (variable_declaration
+      (simple_identifier) @local.definition.field)))
 
 (class_declaration
-	(primary_constructor
-		(class_parameter
-			(simple_identifier) @local.definition.field)))
+  (primary_constructor
+    (class_parameter
+      (simple_identifier) @local.definition.field)))
 
 (enum_class_body
-	(enum_entry
-		(simple_identifier) @local.definition.field))
+  (enum_entry
+    (simple_identifier) @local.definition.field))
 
 (variable_declaration
-	(simple_identifier) @local.definition.var)
-
-;;; Types
+  (simple_identifier) @local.definition.var)
 
+; Types
 (class_declaration
-	(type_identifier) @local.definition.type
-	(#set! "definition.type.scope" "parent"))
+  (type_identifier) @local.definition.type
+  (#set! "definition.type.scope" "parent"))
 
 (type_alias
-	(type_identifier) @local.definition.type
-	(#set! "definition.type.scope" "parent"))
-
-;;; Scopes
+  (type_identifier) @local.definition.type
+  (#set! "definition.type.scope" "parent"))
 
+; Scopes
 [
-	(if_expression)
-	(when_expression)
-	(when_entry)
-
-	(for_statement)
-	(while_statement)
-	(do_while_statement)
-
-	(lambda_literal)
-	(function_declaration)
-	(primary_constructor)
-	(secondary_constructor)
-	(anonymous_initializer)
-
-	(class_declaration)
-	(enum_class_body)
-	(enum_entry)
-
-	(interpolated_expression)
+  (if_expression)
+  (when_expression)
+  (when_entry)
+  (for_statement)
+  (while_statement)
+  (do_while_statement)
+  (lambda_literal)
+  (function_declaration)
+  (primary_constructor)
+  (secondary_constructor)
+  (anonymous_initializer)
+  (class_declaration)
+  (enum_class_body)
+  (enum_entry)
+  (interpolated_expression)
 ] @local.scope
diff --git a/queries/kusto/highlights.scm b/queries/kusto/highlights.scm
index a0ad0a895..00bf4b067 100644
--- a/queries/kusto/highlights.scm
+++ b/queries/kusto/highlights.scm
@@ -4,6 +4,7 @@
 
 (function_call
   (identifier) @function.call)
+
 [
   (type_cast_function)
   (to_scalar_function)
@@ -13,7 +14,9 @@
 
 (typed_parameter
   (identifier) @variable.parameter)
-(function_arguments (identifier) @variable.parameter)
+
+(function_arguments
+  (identifier) @variable.parameter)
 
 [
   (binary_operator)
@@ -28,12 +31,17 @@
 ] @keyword.operator
 
 (string) @string
+
 (number) @number
+
 (bool) @boolean
+
 (null) @constant.builtin
+
 (comment) @comment @spell
 
 (type) @type
+
 (join_types) @type.qualifier
 
 [
diff --git a/queries/kusto/injections.scm b/queries/kusto/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/kusto/injections.scm
+++ b/queries/kusto/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index c0c1a3a81..450e657b4 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -13,23 +13,32 @@
 ] @keyword.conditional
 
 [
- "+"
- "*"
- "?"
- ; TODO: inaccessible node
- ; =>
- "=>@L"
- "=>@R"
+  "+"
+  "*"
+  "?"
+  ; TODO: inaccessible node
+  ; =>
+  "=>@L"
+  "=>@R"
 ] @operator
 
 (grammar_type_params
-  ["<" ">"] @punctuation.bracket)
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (symbol
-  ["<" ">"] @punctuation.bracket)
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (binding_symbol
-  ["<" ">"] @punctuation.bracket)
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (binding_symbol
   name: (identifier) @variable.parameter)
@@ -50,11 +59,21 @@
 (nonterminal
   (type_ref) @type.builtin)
 
-["(" ")" "[" "]"] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
 
-[";" ":"] @punctuation.delimiter
+[
+  ";"
+  ":"
+] @punctuation.delimiter
 
-(lifetime (identifier) @keyword.storage)
+(lifetime
+  (identifier) @keyword.storage)
 
 (string_literal) @string
+
 (regex_literal) @string
diff --git a/queries/lalrpop/injections.scm b/queries/lalrpop/injections.scm
index 41bde7e39..b0c83a11a 100644
--- a/queries/lalrpop/injections.scm
+++ b/queries/lalrpop/injections.scm
@@ -1,11 +1,12 @@
 ([
   (normal_action)
   (failible_action)
- ] @injection.content
- (#set! injection.language "rust"))
+] @injection.content
+  (#set! injection.language "rust"))
 
-((use) @injection.content (#set! injection.language "rust"))
+((use) @injection.content
+  (#set! injection.language "rust"))
 
 ((regex_literal) @injection.content
- (#set! injection.language "regex")
- (#offset! @injection.content 0 2 0 -1))
+  (#set! injection.language "regex")
+  (#offset! @injection.content 0 2 0 -1))
diff --git a/queries/lalrpop/locals.scm b/queries/lalrpop/locals.scm
index bd44c897c..ceeac965b 100644
--- a/queries/lalrpop/locals.scm
+++ b/queries/lalrpop/locals.scm
@@ -1,4 +1,4 @@
-(nonterminal_name 
+(nonterminal_name
   (macro_id) @local.definition.function)
 
 (nonterminal_name
diff --git a/queries/latex/folds.scm b/queries/latex/folds.scm
index 07505c375..f00289493 100644
--- a/queries/latex/folds.scm
+++ b/queries/latex/folds.scm
@@ -6,7 +6,6 @@
   (subsubsection)
   (paragraph)
   (subparagraph)
-
   (generic_environment)
   (math_environment)
   (comment_environment)
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 5ccc2b8fe..47c923ee6 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -1,7 +1,9 @@
-;; General syntax
-
+; General syntax
 (command_name) @function
-(text_mode "\\text" @function)
+
+(text_mode
+  "\\text" @function)
+
 (caption
   command: _ @function)
 
@@ -10,206 +12,306 @@
   value: (_))
 
 [
- (line_comment)
- (block_comment)
- (comment_environment)
+  (line_comment)
+  (block_comment)
+  (comment_environment)
 ] @comment @spell
 
 ((line_comment) @keyword.directive
   (#lua-match? @keyword.directive "^%% !TeX"))
 
 [
- (brack_group)
- (brack_group_argc)
+  (brack_group)
+  (brack_group_argc)
 ] @variable.parameter
 
-[(operator) "="] @operator
+[
+  (operator)
+  "="
+] @operator
 
 "\\item" @punctuation.special
 
 ((word) @punctuation.delimiter
-(#eq? @punctuation.delimiter "&"))
+  (#eq? @punctuation.delimiter "&"))
 
-["[" "]" "{" "}"] @punctuation.bracket ; "(" ")" has no syntactical meaning in LaTeX
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket ; "(" ")" has no syntactical meaning in LaTeX
 
-;; General environments
+; General environments
 (begin
- command: _ @markup.environment
- name: (curly_group_text (text) @markup.environment.name))
+  command: _ @markup.environment
+  name:
+    (curly_group_text
+      (text) @markup.environment.name))
 
 (end
- command: _ @markup.environment
- name: (curly_group_text (text) @markup.environment.name))
+  command: _ @markup.environment
+  name:
+    (curly_group_text
+      (text) @markup.environment.name))
 
-;; Definitions and references
+; Definitions and references
 (new_command_definition
- command: _ @function.macro
- declaration: (curly_group_command_name (_) @function))
+  command: _ @function.macro
+  declaration:
+    (curly_group_command_name
+      (_) @function))
+
 (old_command_definition
- command: _ @function.macro
- declaration: (_) @function)
+  command: _ @function.macro
+  declaration: (_) @function)
+
 (let_command_definition
- command: _ @function.macro
- declaration: (_) @function)
+  command: _ @function.macro
+  declaration: (_) @function)
 
 (environment_definition
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
 
 (theorem_definition
- command: _ @function.macro
- name: (curly_group_text (_) @markup.environment.name))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.environment.name))
 
 (paired_delimiter_definition
- command: _ @function.macro
- declaration: (curly_group_command_name (_) @function))
+  command: _ @function.macro
+  declaration:
+    (curly_group_command_name
+      (_) @function))
 
 (label_definition
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
+
 (label_reference_range
- command: _ @function.macro
- from: (curly_group_text (_) @markup.link)
- to: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  from:
+    (curly_group_text
+      (_) @markup.link)
+  to:
+    (curly_group_text
+      (_) @markup.link))
+
 (label_reference
- command: _ @function.macro
- names: (curly_group_text_list (_) @markup.link))
+  command: _ @function.macro
+  names:
+    (curly_group_text_list
+      (_) @markup.link))
+
 (label_number
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link)
- number: (_) @markup.link)
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link)
+  number: (_) @markup.link)
 
 (citation
- command: _ @function.macro
- keys: (curly_group_text_list) @markup.link)
+  command: _ @function.macro
+  keys: (curly_group_text_list) @markup.link)
 
 (glossary_entry_definition
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
+
 (glossary_entry_reference
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
 
 (acronym_definition
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
+
 (acronym_reference
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
 
 (color_definition
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
-(color_reference
- command: _ @function.macro
- name: (curly_group_text (_) @markup.link))
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
 
-;; Math
+(color_reference
+  command: _ @function.macro
+  name:
+    (curly_group_text
+      (_) @markup.link))
+
+; Math
 [
- (displayed_equation)
- (inline_formula)
+  (displayed_equation)
+  (inline_formula)
 ] @markup.math
 
 (math_environment
   (begin
-   command: _ @markup.math
-   name: (curly_group_text (text) @markup.math)))
+    command: _ @markup.math
+    name:
+      (curly_group_text
+        (text) @markup.math)))
 
 (math_environment
   (text) @markup.math)
 
 (math_environment
   (end
-   command: _ @markup.math
-   name: (curly_group_text (text) @markup.math)))
+    command: _ @markup.math
+    name:
+      (curly_group_text
+        (text) @markup.math)))
 
-;; Sectioning
+; Sectioning
 (title_declaration
   command: _ @module
-  options: (brack_group (_) @markup.heading.1)?
-  text: (curly_group (_) @markup.heading.1))
+  options:
+    (brack_group
+      (_) @markup.heading.1)?
+  text:
+    (curly_group
+      (_) @markup.heading.1))
 
 (author_declaration
   command: _ @module
-  authors: (curly_group_author_list
-             ((author)+ @markup.heading.1)))
+  authors:
+    (curly_group_author_list
+      ((author)+ @markup.heading.1)))
 
 (chapter
   command: _ @module
-  toc: (brack_group (_) @markup.heading.2)?
-  text: (curly_group (_) @markup.heading.2))
+  toc:
+    (brack_group
+      (_) @markup.heading.2)?
+  text:
+    (curly_group
+      (_) @markup.heading.2))
 
 (part
   command: _ @module
-  toc: (brack_group (_) @markup.heading.2)?
-  text: (curly_group (_) @markup.heading.2))
+  toc:
+    (brack_group
+      (_) @markup.heading.2)?
+  text:
+    (curly_group
+      (_) @markup.heading.2))
 
 (section
   command: _ @module
-  toc: (brack_group (_) @markup.heading.3)?
-  text: (curly_group (_) @markup.heading.3))
+  toc:
+    (brack_group
+      (_) @markup.heading.3)?
+  text:
+    (curly_group
+      (_) @markup.heading.3))
 
 (subsection
   command: _ @module
-  toc: (brack_group (_) @markup.heading.4)?
-  text: (curly_group (_) @markup.heading.4))
+  toc:
+    (brack_group
+      (_) @markup.heading.4)?
+  text:
+    (curly_group
+      (_) @markup.heading.4))
 
 (subsubsection
   command: _ @module
-  toc: (brack_group (_) @markup.heading.5)?
-  text: (curly_group (_) @markup.heading.5))
+  toc:
+    (brack_group
+      (_) @markup.heading.5)?
+  text:
+    (curly_group
+      (_) @markup.heading.5))
 
 (paragraph
   command: _ @module
-  toc: (brack_group (_) @markup.heading.6)?
-  text: (curly_group (_) @markup.heading.6))
+  toc:
+    (brack_group
+      (_) @markup.heading.6)?
+  text:
+    (curly_group
+      (_) @markup.heading.6))
 
 (subparagraph
   command: _ @module
-  toc: (brack_group (_) @markup.heading.6)?
-  text: (curly_group (_) @markup.heading.6))
+  toc:
+    (brack_group
+      (_) @markup.heading.6)?
+  text:
+    (curly_group
+      (_) @markup.heading.6))
 
-;; Beamer frames
+; Beamer frames
 (generic_environment
   (begin
-    name: (curly_group_text
-            (text) @markup.environment.name)
+    name:
+      (curly_group_text
+        (text) @markup.environment.name)
     (#any-of? @markup.environment.name "frame"))
   .
-  (curly_group (_) @markup.heading))
+  (curly_group
+    (_) @markup.heading))
 
 ((generic_command
   command: (command_name) @_name
-  arg: (curly_group
-          (text) @markup.heading))
- (#eq? @_name "\\frametitle"))
+  arg:
+    (curly_group
+      (text) @markup.heading))
+  (#eq? @_name "\\frametitle"))
 
-;; Formatting
+; Formatting
 (text_mode
-  content: (curly_group (_) @none @spell))
+  content:
+    (curly_group
+      (_) @none @spell))
 
 ((generic_command
   command: (command_name) @_name
-  arg: (curly_group (_) @markup.italic))
+  arg:
+    (curly_group
+      (_) @markup.italic))
   (#eq? @_name "\\emph"))
 
 ((generic_command
   command: (command_name) @_name
-  arg: (curly_group (_) @markup.italic))
- (#any-of? @_name "\\textit" "\\mathit"))
+  arg:
+    (curly_group
+      (_) @markup.italic))
+  (#any-of? @_name "\\textit" "\\mathit"))
 
 ((generic_command
   command: (command_name) @_name
-  arg: (curly_group (_) @markup.strong))
- (#any-of? @_name "\\textbf" "\\mathbf"))
+  arg:
+    (curly_group
+      (_) @markup.strong))
+  (#any-of? @_name "\\textbf" "\\mathbf"))
 
 ((generic_command
   command: (command_name) @_name
   .
-  arg: (curly_group (_) @markup.link.url))
- (#any-of? @_name "\\url" "\\href"))
+  arg:
+    (curly_group
+      (_) @markup.link.url))
+  (#any-of? @_name "\\url" "\\href"))
 
-;; File inclusion commands
+; File inclusion commands
 (class_include
   command: _ @keyword.import
   path: (curly_group_path) @string)
@@ -221,6 +323,7 @@
 (latex_include
   command: _ @keyword.import
   path: (curly_group_path) @string)
+
 (import_include
   command: _ @keyword.import
   directory: (curly_group_path) @string
@@ -229,6 +332,7 @@
 (bibtex_include
   command: _ @keyword.import
   path: (curly_group_path) @string)
+
 (biblatex_include
   "\\addbibresource" @keyword.import
   glob: (curly_group_glob_pattern) @string.regexp)
@@ -236,20 +340,30 @@
 (graphics_include
   command: _ @keyword.import
   path: (curly_group_path) @string)
+
 (tikz_library_import
   command: _ @keyword.import
   paths: (curly_group_path_list) @string)
 
 (text) @spell
+
 (inline_formula) @nospell
+
 (displayed_equation) @nospell
+
 (key_value_pair) @nospell
+
 (generic_environment
   begin: _ @nospell
   end: _ @nospell)
+
 (citation
   keys: _ @nospell)
+
 (command_name) @nospell
+
 (label_definition) @nospell
+
 (label_reference) @nospell
+
 (label_reference_range) @nospell
diff --git a/queries/latex/injections.scm b/queries/latex/injections.scm
index a35fcb150..189987a38 100644
--- a/queries/latex/injections.scm
+++ b/queries/latex/injections.scm
@@ -2,34 +2,32 @@
   (line_comment)
   (block_comment)
   (comment_environment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
 
 (pycode_environment
-  code: 
-  (source_code) @injection.content 
+  code: (source_code) @injection.content
   (#set! injection.language "python"))
 
 (sagesilent_environment
-  code: 
-  (source_code) @injection.content 
+  code: (source_code) @injection.content
   (#set! injection.language "python"))
 
 (sageblock_environment
-  code: 
-  (source_code) @injection.content 
+  code: (source_code) @injection.content
   (#set! injection.language "python"))
 
 (minted_environment
   (begin
-    language: (curly_group_text
-               (text) @injection.language))
+    language:
+      (curly_group_text
+        (text) @injection.language))
   (source_code) @injection.content)
 
 ((generic_environment
   (begin
-   name: (curly_group_text
-           (text) @_env))) @injection.content
-   (#set! injection.language "c")
-   (#any-of? @_env "asy" "asydef"))
-
+    name:
+      (curly_group_text
+        (text) @_env))) @injection.content
+  (#set! injection.language "c")
+  (#any-of? @_env "asy" "asydef"))
diff --git a/queries/ledger/folds.scm b/queries/ledger/folds.scm
index d807fc35e..8b5736819 100644
--- a/queries/ledger/folds.scm
+++ b/queries/ledger/folds.scm
@@ -1,3 +1 @@
-[
-    (xact)
-] @fold
+(xact) @fold
diff --git a/queries/ledger/highlights.scm b/queries/ledger/highlights.scm
index 8194b50ad..cdf8f6bb9 100644
--- a/queries/ledger/highlights.scm
+++ b/queries/ledger/highlights.scm
@@ -1,28 +1,28 @@
 [
-    (block_comment)
-    (comment)
-    (note)
-    (test)
+  (block_comment)
+  (comment)
+  (note)
+  (test)
 ] @comment @spell
 
 [
-    (quantity)
-    (negative_quantity)
+  (quantity)
+  (negative_quantity)
 ] @number
 
 [
-    (date)
-    (effective_date)
-    (time)
-    (interval)
+  (date)
+  (effective_date)
+  (time)
+  (interval)
 ] @string.special
 
 [
-    (commodity)
-    (option)
-    (option_value)
-    (check_in)
-    (check_out)
+  (commodity)
+  (option)
+  (option_value)
+  (check_in)
+  (check_out)
 ] @markup.raw
 
 ((account) @variable.member)
@@ -30,25 +30,25 @@
 "include" @keyword.import
 
 [
-    "account"
-    "alias"
-    "assert"
-    "check"
-    "commodity"
-    "comment"
-    "def"
-    "default"
-    "end"
-    "eval"
-    "format"
-    "nomarket"
-    "note"
-    "payee"
-    "test"
-    "A"
-    "Y"
-    "N"
-    "D"
-    "C"
-    "P"
+  "account"
+  "alias"
+  "assert"
+  "check"
+  "commodity"
+  "comment"
+  "def"
+  "default"
+  "end"
+  "eval"
+  "format"
+  "nomarket"
+  "note"
+  "payee"
+  "test"
+  "A"
+  "Y"
+  "N"
+  "D"
+  "C"
+  "P"
 ] @keyword
diff --git a/queries/ledger/indents.scm b/queries/ledger/indents.scm
index 31e7f56df..9697c9cfa 100644
--- a/queries/ledger/indents.scm
+++ b/queries/ledger/indents.scm
@@ -1,3 +1 @@
-[
-    (journal_item)
-] @indent.begin
+(journal_item) @indent.begin
diff --git a/queries/ledger/injections.scm b/queries/ledger/injections.scm
index ad62013f5..35fb57eef 100644
--- a/queries/ledger/injections.scm
+++ b/queries/ledger/injections.scm
@@ -1,5 +1,5 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((note) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 11c2d67e4..c4500ddf3 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -1,37 +1,38 @@
 (variable_identifier) @variable
+
 (constant_identifier) @constant
 
 [
- "assert"
- "assert_eq"
- "assert_neq"
- "block"
- "console"
- "const"
- "let"
- "mapping"
- "program"
- "record"
- "self"
- "struct"
- "then"
+  "assert"
+  "assert_eq"
+  "assert_neq"
+  "block"
+  "console"
+  "const"
+  "let"
+  "mapping"
+  "program"
+  "record"
+  "self"
+  "struct"
+  "then"
 ] @keyword
 
- "in" @keyword.operator
+"in" @keyword.operator
 
 [
- "constant"
- "private"
- "public"
- ] @type.qualifier
+  "constant"
+  "private"
+  "public"
+] @type.qualifier
 
 "self" @variable.builtin
 
 [
- "finalize"
- "function"
- "inline"
- "transition"
+  "finalize"
+  "function"
+  "inline"
+  "transition"
 ] @keyword.function
 
 "import" @keyword.import
@@ -42,86 +43,86 @@
 
 "for" @keyword.repeat
 
-[ 
+[
   "else"
   "if"
 ] @keyword.conditional
 
 [
- (ternary_if)
- (ternary_else)
+  (ternary_if)
+  (ternary_else)
 ] @keyword.conditional.ternary
 
-[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
-
-[ ";" "," "::"] @punctuation.delimiter
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
 
 [
-"!"
-
-"&&"
-"||"
-
-"=="
-"!="
-
-"<"
-"<="
-">"
-">="
-
-"&"
-"|"
-"^"
-
-"<<"
-">>"
-
-"+"
-"-"
-"*"
-"/"
-"%"
-"**"
-
-"="
-
-"+="
-"-="
-"*="
-"/="
-"%="
-"**="
-
-"<<="
-">>="
-
-"&="
-"|="
-"^="
-
-"&&="
-"||="
+  ";"
+  ","
+  "::"
+] @punctuation.delimiter
 
+[
+  "!"
+  "&&"
+  "||"
+  "=="
+  "!="
+  "<"
+  "<="
+  ">"
+  ">="
+  "&"
+  "|"
+  "^"
+  "<<"
+  ">>"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "**"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "**="
+  "<<="
+  ">>="
+  "&="
+  "|="
+  "^="
+  "&&="
+  "||="
 ] @operator
 
 (comment) @comment @spell
 
 (boolean_literal) @boolean
 
-(constant_declaration 
+(constant_declaration
   (identifier) @constant)
 
 [
- (program_id)
- (this_program_id)
+  (program_id)
+  (this_program_id)
 ] @string.special
 
 ;record declaration
-(record_declaration (identifier) @variable.member) 
+(record_declaration
+  (identifier) @variable.member)
 
-;struct component 
-(struct_component_declaration 
+;struct component
+(struct_component_declaration
   (identifier) @variable.member)
 
 (type) @type
@@ -129,18 +130,18 @@
 (associated_constant) @constant
 
 [
- (block_height)
- (self_caller)
- (self_signer)
+  (block_height)
+  (self_caller)
+  (self_signer)
 ] @constant.builtin
 
 (free_function_call
- (locator
-	(identifier) @function))
+  (locator
+    (identifier) @function))
 
 (record_type
- (locator
-	(identifier) @variable.member))
+  (locator
+    (identifier) @variable.member))
 
 (transition_declaration
   name: (identifier) @function.builtin)
@@ -158,28 +159,31 @@
   name: (identifier) @function.macro)
 
 (method_call
-  . (_)
-  . (identifier) @function.method.call)
+  .
+  (_)
+  .
+  (identifier) @function.method.call)
 
 (function_parameter
- (identifier) @variable.parameter)
+  (identifier) @variable.parameter)
 
 (struct_declaration
   name: (identifier) @variable.member)
 
 (variable_declaration
-	(identifier_or_identifiers
-		(identifier) @variable))
+  (identifier_or_identifiers
+    (identifier) @variable))
 
-[ 
+[
   (address_literal)
   (signature_literal)
-  ((affine_group_literal) (#set! "priority" 101))
-  (field_literal) 
-  (product_group_literal) 
-  (scalar_literal) 
-  (signed_literal) 
-  (unsigned_literal) 
+  ((affine_group_literal)
+    (#set! "priority" 101))
+  (field_literal)
+  (product_group_literal)
+  (scalar_literal)
+  (signed_literal)
+  (unsigned_literal)
 ] @number
 
 (annotation) @attribute
diff --git a/queries/leo/indents.scm b/queries/leo/indents.scm
index a8de26ecd..0f1a0a500 100644
--- a/queries/leo/indents.scm
+++ b/queries/leo/indents.scm
@@ -1,33 +1,33 @@
 [
- (record_declaration) 
- (struct_declaration)
- (mapping_declaration)
- (constant_declaration)
- (return_statement)
- (expression_statement)
- (variable_declaration)
- (loop_statement)
- (assignment_statement)
- (assert_statement)
- (struct_expression)
- (array_expression)
- (tuple_expression)
- (parenthesized_expression)
- (items_block)
- (block)
+  (record_declaration)
+  (struct_declaration)
+  (mapping_declaration)
+  (constant_declaration)
+  (return_statement)
+  (expression_statement)
+  (variable_declaration)
+  (loop_statement)
+  (assignment_statement)
+  (assert_statement)
+  (struct_expression)
+  (array_expression)
+  (tuple_expression)
+  (parenthesized_expression)
+  (items_block)
+  (block)
 ] @indent.begin
-
-; if "if" statement and conditional statement are in separate lines 
-; conditional should be indented and when the conditional block 
+; if "if" statement and conditional statement are in separate lines
+; conditional should be indented and when the conditional block
 ; starts dedented
 (branch
-  (block "{" @indent.end)) @indent.begin
+  (block
+    "{" @indent.end)) @indent.begin
 
 ((function_parameters) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
 [
- (comment)
- (ERROR)
+  (comment)
+  (ERROR)
 ] @indent.auto
diff --git a/queries/leo/injections.scm b/queries/leo/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/leo/injections.scm
+++ b/queries/leo/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/linkerscript/highlights.scm b/queries/linkerscript/highlights.scm
index 0453ded85..accaad5ca 100644
--- a/queries/linkerscript/highlights.scm
+++ b/queries/linkerscript/highlights.scm
@@ -1,5 +1,4 @@
 ; Keywords
-
 [
   "ENTRY"
   "SECTIONS"
@@ -12,17 +11,18 @@
 ] @keyword
 
 ; Conditionals
-
-(conditional_expression [ "?" ":" ] @keyword.conditional.ternary)
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 ; Variables
-
 (symbol) @variable
 
 (filename) @string.special.path
 
 ; Functions
-
 (call_expression
   function: (symbol) @function.call)
 
@@ -32,10 +32,7 @@
 
 ((call_expression
   function: (symbol) @function.builtin)
-  (#any-of? @function.builtin
-   "ABSOLUTE" "ALIAS" "ADDR" "ALIGN" "ALIGNOF" "BASE" "BLOCK" "CHIP" "DATA_SEGMENT_ALIGN"
-   "DATA_SEGMENT_END" "DATA_SEGMENT_RELRO_END" "END" "LENGTH" "LOADADDR" "LOG2CEIL" "MAX" "MIN"
-   "NEXT" "ORIGIN" "SEGMENT_START" "SIZEOF" "BYTE" "FILL" "LONG" "SHORT" "QUAD" "SQUAD" "WORD"))
+  (#any-of? @function.builtin "ABSOLUTE" "ALIAS" "ADDR" "ALIGN" "ALIGNOF" "BASE" "BLOCK" "CHIP" "DATA_SEGMENT_ALIGN" "DATA_SEGMENT_END" "DATA_SEGMENT_RELRO_END" "END" "LENGTH" "LOADADDR" "LOG2CEIL" "MAX" "MIN" "NEXT" "ORIGIN" "SEGMENT_START" "SIZEOF" "BYTE" "FILL" "LONG" "SHORT" "QUAD" "SQUAD" "WORD"))
 
 [
   "KEEP"
@@ -44,42 +41,63 @@
 ] @function.builtin
 
 ; Types
-
-(section_type "(" [ "NOLOAD" "DSECT" "COPY" "INFO" "OVERLAY" ] @type.builtin ")")
+(section_type
+  "("
+  [
+    "NOLOAD"
+    "DSECT"
+    "COPY"
+    "INFO"
+    "OVERLAY"
+  ] @type.builtin
+  ")")
 
 ; Fields
-
 [
-  "ORIGIN" "org" "o"
-  "LENGTH" "len" "l"
+  "ORIGIN"
+  "org"
+  "o"
+  "LENGTH"
+  "len"
+  "l"
 ] @variable.member.builtin
 
 ; Constants
-
 ((symbol) @constant
   (#lua-match? @constant "^[%u_][%u%d_]+$"))
 
 ; Labels
+(entry_command
+  name: (symbol) @label)
 
-(entry_command name: (symbol) @label)
+(output_section
+  name: (symbol) @label)
 
-(output_section name: (symbol) @label)
+(memory_command
+  name: (symbol) @label)
 
-(memory_command name: (symbol) @label)
+(phdrs_command
+  name: (symbol) @label)
 
-(phdrs_command name: (symbol) @label)
+(region
+  ">"
+  (symbol) @label)
 
-(region ">" (symbol) @label)
+(lma_region
+  ">"
+  (symbol) @label)
 
-(lma_region ">" (symbol) @label)
+(phdr
+  ":"
+  (symbol) @label)
 
-(phdr ":" (symbol) @label)
-
-([(symbol) (filename)] @label
+([
+  (symbol)
+  (filename)
+] @label
   (#lua-match? @label "^%."))
 
 ; Exceptions
-
 "ASSERT" @keyword.exception
 
 [
@@ -88,7 +106,6 @@
 ] @variable.builtin
 
 ; Operators
-
 [
   "+"
   "-"
@@ -121,18 +138,26 @@
 ] @operator
 
 ; Literals
-
 (number) @number
 
 (quoted_symbol) @string
 
-(wildcard_pattern [ "*" "[" "]" ] @character.special)
+(wildcard_pattern
+  [
+    "*"
+    "["
+    "]"
+  ] @character.special)
 
 (attributes) @character.special
 
 ; Punctuation
-
-[ "{" "}" "(" ")" ] @punctuation.bracket
+[
+  "{"
+  "}"
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   ":"
@@ -142,5 +167,4 @@
 ">" @punctuation.special
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/linkerscript/locals.scm b/queries/linkerscript/locals.scm
index 7b45dcef2..6b7660370 100644
--- a/queries/linkerscript/locals.scm
+++ b/queries/linkerscript/locals.scm
@@ -1,15 +1,16 @@
 ; References
-
 [
- (symbol)
- (filename)
- (quoted_symbol)
+  (symbol)
+  (filename)
+  (quoted_symbol)
 ] @local.reference
 
 ; Definitions
+(output_section
+  name: (symbol) @local.definition.var)
 
-(output_section name: (symbol) @local.definition.var)
+(memory_command
+  name: (symbol) @local.definition.var)
 
-(memory_command name: (symbol) @local.definition.var)
-
-(phdrs_command name: (symbol) @local.definition.var)
+(phdrs_command
+  name: (symbol) @local.definition.var)
diff --git a/queries/liquidsoap/folds.scm b/queries/liquidsoap/folds.scm
index 9b0d12efa..56e4ce547 100644
--- a/queries/liquidsoap/folds.scm
+++ b/queries/liquidsoap/folds.scm
@@ -1,21 +1,21 @@
 [
- (let)
- (binding)
- (simple_fun)
- (def)
- (arglist)
- (if)
- (if_condition)
- (if_then)
- (elsif_condition)
- (elsif_then)
- (if_else)
- (for)
- (for_do)
- (while)
- (while_do)
- (try)
- (try_body)
- (try_do)
- (block)
+  (let)
+  (binding)
+  (simple_fun)
+  (def)
+  (arglist)
+  (if)
+  (if_condition)
+  (if_then)
+  (elsif_condition)
+  (elsif_then)
+  (if_else)
+  (for)
+  (for_do)
+  (while)
+  (while_do)
+  (try)
+  (try_body)
+  (try_do)
+  (block)
 ] @fold
diff --git a/queries/liquidsoap/highlights.scm b/queries/liquidsoap/highlights.scm
index 45b5abe05..38a386548 100644
--- a/queries/liquidsoap/highlights.scm
+++ b/queries/liquidsoap/highlights.scm
@@ -1,7 +1,12 @@
 (var) @variable
 
 (op) @operator
-["and" "or" "not"] @keyword.operator
+
+[
+  "and"
+  "or"
+  "not"
+] @keyword.operator
 
 [
   "def"
@@ -41,7 +46,11 @@
   "try_end"
 ] @keyword.exception
 
-(inline_if [ "?" ":" ] @keyword.conditional.ternary)
+(inline_if
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 [
   "%ifdef"
@@ -57,8 +66,11 @@
 
 (encoder_name) @constant.builtin
 
-(anonymous_argument (var) @variable.parameter)
-(labeled_argument label: (var) @variable.parameter)
+(anonymous_argument
+  (var) @variable.parameter)
+
+(labeled_argument
+  label: (var) @variable.parameter)
 
 "." @punctuation.delimiter
 
@@ -69,17 +81,31 @@
   "]"
   "{"
   "}"
-]  @punctuation.bracket
+] @punctuation.bracket
+
+(app
+  name: (var) @function.call)
 
-(app name: (var) @function.call)
 (method) @function.method
+
 (method_app) @function.method.call
 
 (string) @string
-(string_interpolation [ "#{" "}" ] @punctuation.special)
+
+(string_interpolation
+  [
+    "#{"
+    "}"
+  ] @punctuation.special)
+
 (integer) @number
+
 (float) @number.float
+
 (bool) @boolean
+
 (comment) @comment
+
 (regexp) @string.regexp
+
 (type) @type
diff --git a/queries/liquidsoap/indents.scm b/queries/liquidsoap/indents.scm
index ce8c02b53..7cb5935fb 100644
--- a/queries/liquidsoap/indents.scm
+++ b/queries/liquidsoap/indents.scm
@@ -22,33 +22,45 @@
   "("
 ] @indent.begin
 
-(ERROR "def") @indent.begin
+(ERROR
+  "def") @indent.begin
 
-(def "def_end" @indent.end)
-(if "if_end" @indent.end)
-(block "block_end" @indent.end)
-(for "for_end" @indent.end)
-(while "while_end" @indent.end)
-(try "try_end" @indent.end)
+(def
+  "def_end" @indent.end)
+
+(if
+  "if_end" @indent.end)
+
+(block
+  "block_end" @indent.end)
+
+(for
+  "for_end" @indent.end)
+
+(while
+  "while_end" @indent.end)
+
+(try
+  "try_end" @indent.end)
 
 [
- "then"
- "do"
- "else"
- "elsif"
- "catch"
+  "then"
+  "do"
+  "else"
+  "elsif"
+  "catch"
 ] @indent.branch
 
 [
- "def_end"
- "if_end"
- "block_end"
- "for_end"
- "while_end"
- "try_end"
- "}"
- "]"
- ")"
+  "def_end"
+  "if_end"
+  "block_end"
+  "for_end"
+  "while_end"
+  "try_end"
+  "}"
+  "]"
+  ")"
 ] @indent.branch @indent.end
 
 (comment) @indent.auto
diff --git a/queries/liquidsoap/locals.scm b/queries/liquidsoap/locals.scm
index d4727114a..995294c03 100644
--- a/queries/liquidsoap/locals.scm
+++ b/queries/liquidsoap/locals.scm
@@ -1,15 +1,35 @@
-[(anonymous_function) (binding) (def) (let)] @local.scope
+[
+  (anonymous_function)
+  (binding)
+  (def)
+  (let)
+] @local.scope
 
-(anonymous_argument (var) @local.definition.parameter)
-(labeled_argument label: (var) @local.definition.parameter)
+(anonymous_argument
+  (var) @local.definition.parameter)
+
+(labeled_argument
+  label: (var) @local.definition.parameter)
 
 (binding
   defined: (var) @local.definition.var)
-(def defined: (var) @local.definition.var)
-(let defined: (var) @local.definition.var)
-(meth_pattern (var) @local.definition.var)
-(list_pattern (var) @local.definition.var)
-(tuple_pattern (var) @local.definition.var)
-(spread (var) @local.definition.var)
+
+(def
+  defined: (var) @local.definition.var)
+
+(let
+  defined: (var) @local.definition.var)
+
+(meth_pattern
+  (var) @local.definition.var)
+
+(list_pattern
+  (var) @local.definition.var)
+
+(tuple_pattern
+  (var) @local.definition.var)
+
+(spread
+  (var) @local.definition.var)
 
 (var) @local.reference
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index 96b8bab93..2ccae3693 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -4,9 +4,11 @@
 ] @variable
 
 (type) @type
+
 (type_keyword) @type.builtin
 
-(type [
+(type
+  [
     (local_var)
     (global_var)
   ] @type)
@@ -16,7 +18,8 @@
 
 (argument) @variable.parameter
 
-(_ inst_name: _ @keyword.operator)
+(_
+  inst_name: _ @keyword.operator)
 
 [
   "catch"
@@ -36,18 +39,24 @@
   "inbounds"
   "inrange"
 ] @keyword
+
 (icmp_cond) @keyword
+
 (fcmp_cond) @keyword
 
 (fast_math) @keyword
 
-(_ callee: _ @function)
-(function_header name: _ @function)
+(_
+  callee: _ @function)
+
+(function_header
+  name: _ @function)
 
 [
   "declare"
   "define"
 ] @keyword.function
+
 (calling_conv) @keyword.function
 
 [
@@ -86,7 +95,6 @@
   "vscale"
 ] @keyword
 
-
 [
   "no_cfi"
   (dso_local)
@@ -105,18 +113,26 @@
 
 (attribute_name) @attribute
 
-(function_header [
+(function_header
+  [
     (linkage)
     (calling_conv)
     (unnamed_addr)
   ] @keyword.function)
 
 (number) @number
+
 (comment) @comment @spell
+
 (string) @string
+
 (cstring) @string
+
 (label) @label
-(_ inst_name: "ret" @keyword.return)
+
+(_
+  inst_name: "ret" @keyword.return)
+
 (float) @number.float
 
 [
diff --git a/queries/lua/folds.scm b/queries/lua/folds.scm
index 37c4947ed..9dfac3abc 100644
--- a/queries/lua/folds.scm
+++ b/queries/lua/folds.scm
@@ -1,12 +1,12 @@
 [
- (do_statement)
- (while_statement)
- (repeat_statement)
- (if_statement)
- (for_statement)
- (function_declaration)
- (function_definition)
- (parameters)
- (arguments)
- (table_constructor)
+  (do_statement)
+  (while_statement)
+  (repeat_statement)
+  (if_statement)
+  (for_statement)
+  (function_declaration)
+  (function_definition)
+  (parameters)
+  (arguments)
+  (table_constructor)
 ] @fold
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index ea87c0da0..0b0bf35a8 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -1,81 +1,79 @@
-;; Keywords
-
+; Keywords
 "return" @keyword.return
 
 [
- "goto"
- "in"
- "local"
+  "goto"
+  "in"
+  "local"
 ] @keyword
 
 (break_statement) @keyword
 
 (do_statement
-[
-  "do"
-  "end"
-] @keyword)
+  [
+    "do"
+    "end"
+  ] @keyword)
 
 (while_statement
-[
-  "while"
-  "do"
-  "end"
-] @keyword.repeat)
+  [
+    "while"
+    "do"
+    "end"
+  ] @keyword.repeat)
 
 (repeat_statement
-[
-  "repeat"
-  "until"
-] @keyword.repeat)
+  [
+    "repeat"
+    "until"
+  ] @keyword.repeat)
 
 (if_statement
-[
-  "if"
-  "elseif"
-  "else"
-  "then"
-  "end"
-] @keyword.conditional)
+  [
+    "if"
+    "elseif"
+    "else"
+    "then"
+    "end"
+  ] @keyword.conditional)
 
 (elseif_statement
-[
-  "elseif"
-  "then"
-  "end"
-] @keyword.conditional)
+  [
+    "elseif"
+    "then"
+    "end"
+  ] @keyword.conditional)
 
 (else_statement
-[
-  "else"
-  "end"
-] @keyword.conditional)
+  [
+    "else"
+    "end"
+  ] @keyword.conditional)
 
 (for_statement
-[
-  "for"
-  "do"
-  "end"
-] @keyword.repeat)
+  [
+    "for"
+    "do"
+    "end"
+  ] @keyword.repeat)
 
 (function_declaration
-[
-  "function"
-  "end"
-] @keyword.function)
+  [
+    "function"
+    "end"
+  ] @keyword.function)
 
 (function_definition
-[
-  "function"
-  "end"
-] @keyword.function)
-
-;; Operators
+  [
+    "function"
+    "end"
+  ] @keyword.function)
 
+; Operators
 [
- "and"
- "not"
- "or"
+  "and"
+  "not"
+  "or"
 ] @keyword.operator
 
 [
@@ -102,8 +100,7 @@
   ".."
 ] @operator
 
-;; Punctuations
-
+; Punctuations
 [
   ";"
   ":"
@@ -112,19 +109,17 @@
   "."
 ] @punctuation.delimiter
 
-;; Brackets
-
+; Brackets
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
-;; Variables
-
+; Variables
 (identifier) @variable
 
 ((identifier) @constant.builtin
@@ -145,16 +140,16 @@
     (identifier) @attribute
     ">" @punctuation.bracket))
 
-;; Labels
+; Labels
+(label_statement
+  (identifier) @label)
 
-(label_statement (identifier) @label)
-
-(goto_statement (identifier) @label)
-
-;; Constants
+(goto_statement
+  (identifier) @label)
 
+; Constants
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 (vararg_expression) @constant
 
@@ -165,43 +160,49 @@
   (true)
 ] @boolean
 
-;; Tables
+; Tables
+(field
+  name: (identifier) @variable.member)
 
-(field name: (identifier) @variable.member)
-
-(dot_index_expression field: (identifier) @variable.member)
+(dot_index_expression
+  field: (identifier) @variable.member)
 
 (table_constructor
-[
-  "{"
-  "}"
-] @constructor)
+  [
+    "{"
+    "}"
+  ] @constructor)
 
-;; Functions
-
-(parameters (identifier) @variable.parameter)
+; Functions
+(parameters
+  (identifier) @variable.parameter)
 
 (vararg_expression) @variable.parameter.builtin
 
 (function_declaration
-  name: [
-    (identifier) @function
-    (dot_index_expression
-      field: (identifier) @function)
-  ])
-
-(function_declaration
-  name: (method_index_expression
-    method: (identifier) @function.method))
-
-(assignment_statement
-  (variable_list .
-    name: [
+  name:
+    [
       (identifier) @function
       (dot_index_expression
         field: (identifier) @function)
     ])
-  (expression_list .
+
+(function_declaration
+  name:
+    (method_index_expression
+      method: (identifier) @function.method))
+
+(assignment_statement
+  (variable_list
+    .
+    name:
+      [
+        (identifier) @function
+        (dot_index_expression
+          field: (identifier) @function)
+      ])
+  (expression_list
+    .
     value: (function_definition)))
 
 (table_constructor
@@ -210,13 +211,14 @@
     value: (function_definition)))
 
 (function_call
-  name: [
-    (identifier) @function.call
-    (dot_index_expression
-      field: (identifier) @function.call)
-    (method_index_expression
-      method: (identifier) @function.method.call)
-  ])
+  name:
+    [
+      (identifier) @function.call
+      (dot_index_expression
+        field: (identifier) @function.call)
+      (method_index_expression
+        method: (identifier) @function.method.call)
+    ])
 
 (function_call
   (identifier) @function.builtin
@@ -231,8 +233,7 @@
     "__idiv" "__index" "__le" "__len" "__lt" "__metatable" "__mod" "__mul" "__name" "__newindex"
     "__pairs" "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
 
-;; Others
-
+; Others
 (comment) @comment @spell
 
 ((comment) @comment.documentation
@@ -254,17 +255,21 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments: (arguments
-               . (_)
-               .
-               (string
-                 content: (string_content) @string.regexp)))
+  arguments:
+    (arguments
+      .
+      (_)
+      .
+      (string
+        content: (string_content) @string.regexp)))
 
 ;("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments: (arguments
-               . (string
-                   content: (string_content) @string.regexp)))
+  arguments:
+    (arguments
+      .
+      (string
+        content: (string_content) @string.regexp)))
diff --git a/queries/lua/indents.scm b/queries/lua/indents.scm
index 1125e6485..2c3dc2448 100644
--- a/queries/lua/indents.scm
+++ b/queries/lua/indents.scm
@@ -40,4 +40,3 @@
 (comment) @indent.auto
 
 (string) @indent.auto
-
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 2ce156574..6042ea260 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -1,29 +1,48 @@
 ((function_call
-  name: [
-    (identifier) @_cdef_identifier
-    (_ _ (identifier) @_cdef_identifier)
-  ]
-  arguments: 
-    (arguments 
-      (string content: _ @injection.content)))
+  name:
+    [
+      (identifier) @_cdef_identifier
+      (_
+        _
+        (identifier) @_cdef_identifier)
+    ]
+  arguments:
+    (arguments
+      (string
+        content: _ @injection.content)))
   (#set! injection.language "c")
   (#eq? @_cdef_identifier "cdef"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments (string content: _ @injection.content)))
+  arguments:
+    (arguments
+      (string
+        content: _ @injection.content)))
   (#set! injection.language "vim")
   (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_command" "vim.api.nvim_exec2"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments (string content: _ @injection.content) .))
+  arguments:
+    (arguments
+      (string
+        content: _ @injection.content) .))
   (#set! injection.language "query")
   (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments . (_) . (string content: _ @_method) . (string content: _ @injection.content)))
+  arguments:
+    (arguments
+      .
+      (_)
+      .
+      (string
+        content: _ @_method)
+      .
+      (string
+        content: _ @injection.content)))
   (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
   (#eq? @_method "nvim_exec_lua")
   (#set! injection.language "lua"))
@@ -33,46 +52,52 @@
   name: (_) @_vimcmd_identifier
   arguments:
     (arguments
-      . (_)
-      . 
+      .
+      (_)
+      .
       (table_constructor
         (field
           name: (identifier) @_command
-          value: 
-            (string content: (_) @injection.content)))
-      .) ; limit so only 2-argument functions gets matched before pred handle
+          value:
+            (string
+              content: (_) @injection.content))) .)
+  ; limit so only 2-argument functions gets matched before pred handle
   (#eq? @_vimcmd_identifier "vim.api.nvim_create_autocmd")
   (#eq? @_command "command")
   (#set! injection.language "vim"))
 
-
 (function_call
   name: (_) @_user_cmd
-  arguments: 
+  arguments:
     (arguments
-      . (_)
-      . 
+      .
+      (_)
+      .
       (string
         content: (_) @injection.content)
-      . (_) .)
+      .
+      (_) .)
   (#eq? @_user_cmd "vim.api.nvim_create_user_command")
   (#set! injection.language "vim"))
 
 (function_call
   name: (_) @_user_cmd
-  arguments: 
+  arguments:
     (arguments
-      . (_)
-      . (_)
-      . 
+      .
+      (_)
+      .
+      (_)
+      .
       (string
         content: (_) @injection.content)
-      . (_) 
-      .) ; Limiting predicate handling to only functions with 4 arguments
+      .
+      (_) .)
+  ; Limiting predicate handling to only functions with 4 arguments
   (#eq? @_user_cmd "vim.api.nvim_buf_create_user_command")
   (#set! injection.language "vim"))
 
-;; rhs highlighting for vim.keymap.set/vim.api.nvim_set_keymap/vim.api.nvim_buf_set_keymap
+; rhs highlighting for vim.keymap.set/vim.api.nvim_set_keymap/vim.api.nvim_buf_set_keymap
 ; (function_call
 ;   name: (_) @_map
 ;   arguments:
@@ -92,17 +117,17 @@
 ;       . (_)
 ;       . (_)
 ;       . (_)
-;       . 
+;       .
 ;       (string
 ;         content: (_) @injection.content)
 ;       . (_) .)
 ;   (#eq? @_map "vim.api.nvim_buf_set_keymap")
 ;   (#set! injection.language "vim"))
-
-;; highlight string as query if starts with `;; query`
-(string content: _ @injection.content 
- (#lua-match? @injection.content "^%s*;+%s?query")
- (#set! injection.language "query"))
+; highlight string as query if starts with `;; query`
+(string
+  content: _ @injection.content
+  (#lua-match? @injection.content "^%s*;+%s?query")
+  (#set! injection.language "query"))
 
 (comment
   content: (_) @injection.content
@@ -111,48 +136,56 @@
   (#offset! @injection.content 0 1 0 0))
 
 ; string.match("123", "%d+")
-
 (function_call
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments: (arguments
-               . (_)
-               .
-               (string
-                 content: (string_content) @injection.content
-                 (#set! injection.language "luap")
-                 (#set! injection.include-children))))
+  arguments:
+    (arguments
+      .
+      (_)
+      .
+      (string
+        content: (string_content) @injection.content
+        (#set! injection.language "luap")
+        (#set! injection.include-children))))
 
 ;("123"):match("%d+")
-
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments: (arguments
-               . (string
-                   content: (string_content) @injection.content
-                   (#set! injection.language "luap")
-                   (#set! injection.include-children))))
+  arguments:
+    (arguments
+      .
+      (string
+        content: (string_content) @injection.content
+        (#set! injection.language "luap")
+        (#set! injection.include-children))))
 
 ; string.format("pi = %.2f", 3.14159)
 ((function_call
   (dot_index_expression
     field: (identifier) @_method)
-  arguments: (arguments
-               . (string (string_content) @injection.content)))
- (#eq? @_method "format")
- (#set! injection.language "printf"))
+  arguments:
+    (arguments
+      .
+      (string
+        (string_content) @injection.content)))
+  (#eq? @_method "format")
+  (#set! injection.language "printf"))
 
 ; ("pi = %.2f"):format(3.14159)
 ((function_call
   (method_index_expression
-    table: (_ (string (string_content) @injection.content))
+    table:
+      (_
+        (string
+          (string_content) @injection.content))
     method: (identifier) @_method))
- (#eq? @_method "format")
- (#set! injection.language "printf"))
+  (#eq? @_method "format")
+  (#set! injection.language "printf"))
 
 (comment
-   content: (_) @injection.content
+  content: (_) @injection.content
   (#set! injection.language "comment"))
diff --git a/queries/lua/locals.scm b/queries/lua/locals.scm
index ef927e517..8f50e844f 100644
--- a/queries/lua/locals.scm
+++ b/queries/lua/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (chunk)
   (do_statement)
@@ -12,27 +11,35 @@
 ] @local.scope
 
 ; Definitions
-
 (assignment_statement
   (variable_list
     (identifier) @local.definition.var))
 
 (assignment_statement
   (variable_list
-    (dot_index_expression . (_) @local.definition.associated (identifier) @local.definition.var)))
+    (dot_index_expression
+      .
+      (_) @local.definition.associated
+      (identifier) @local.definition.var)))
 
 ((function_declaration
   name: (identifier) @local.definition.function)
   (#set! definition.function.scope "parent"))
 
 ((function_declaration
-  name: (dot_index_expression
-    . (_) @local.definition.associated (identifier) @local.definition.function))
+  name:
+    (dot_index_expression
+      .
+      (_) @local.definition.associated
+      (identifier) @local.definition.function))
   (#set! definition.method.scope "parent"))
 
 ((function_declaration
-  name: (method_index_expression
-    . (_) @local.definition.associated (identifier) @local.definition.method))
+  name:
+    (method_index_expression
+      .
+      (_) @local.definition.associated
+      (identifier) @local.definition.method))
   (#set! definition.method.scope "parent"))
 
 (for_generic_clause
@@ -42,10 +49,8 @@
 (for_numeric_clause
   name: (identifier) @local.definition.var)
 
-(parameters (identifier) @local.definition.parameter)
+(parameters
+  (identifier) @local.definition.parameter)
 
 ; References
-
-[
-  (identifier)
-] @local.reference
+(identifier) @local.reference
diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
index 3555039dc..a73fefd27 100644
--- a/queries/luadoc/highlights.scm
+++ b/queries/luadoc/highlights.scm
@@ -1,5 +1,4 @@
 ; Keywords
-
 [
   "@module"
   "@package"
@@ -29,13 +28,17 @@
   (diagnostic_identifier)
 ] @keyword
 
-[
-  "@async"
-] @keyword.coroutine
+"@async" @keyword.coroutine
 
-(language_injection "@language" (identifier) @keyword)
+(language_injection
+  "@language"
+  (identifier) @keyword)
 
-(function_type ["fun" "function"] @keyword.function)
+(function_type
+  [
+    "fun"
+    "function"
+  ] @keyword.function)
 
 (source_annotation
   filename: (identifier) @string.special.path
@@ -44,12 +47,9 @@
 (version_annotation
   version: _ @constant.builtin)
 
-[
-  "@return"
-] @keyword.return
+"@return" @keyword.return
 
 ; Qualifiers
-
 [
   "public"
   "protected"
@@ -59,9 +59,7 @@
   "@private"
 ] @type.qualifier
 
-
 ; Variables
-
 (identifier) @variable
 
 [
@@ -70,46 +68,56 @@
 ] @variable.builtin
 
 ; Macros
-
-(alias_annotation (identifier) @function.macro)
+(alias_annotation
+  (identifier) @function.macro)
 
 ; Parameters
+(param_annotation
+  (identifier) @variable.parameter)
 
-(param_annotation (identifier) @variable.parameter)
-
-(parameter (identifier) @variable.parameter)
+(parameter
+  (identifier) @variable.parameter)
 
 ; Fields
+(field_annotation
+  (identifier) @variable.member)
 
-(field_annotation (identifier) @variable.member)
+(table_literal_type
+  field: (identifier) @variable.member)
 
-(table_literal_type field: (identifier) @variable.member)
-
-(member_type ["#" "."] . (identifier) @variable.member)
+(member_type
+  [
+    "#"
+    "."
+  ]
+  .
+  (identifier) @variable.member)
 
 ; Types
-
-(table_type "table" @type.builtin)
+(table_type
+  "table" @type.builtin)
 
 (builtin_type) @type.builtin
 
-(class_annotation (identifier) @type)
+(class_annotation
+  (identifier) @type)
 
-(enum_annotation (identifier) @type)
+(enum_annotation
+  (identifier) @type)
 
-((array_type ["[" "]"] @type)
+((array_type
+  [
+    "["
+    "]"
+  ] @type)
   (#set! "priority" 105))
 
 (type) @type
 
 ; Operators
-
-[
-  "|"
-] @operator
+"|" @operator
 
 ; Literals
-
 (string) @module ; only used in @module
 
 (literal_type) @string
@@ -117,14 +125,25 @@
 (number) @number
 
 ; Punctuation
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
-
-[ "<" ">" ] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
 [
   ","
@@ -139,7 +158,6 @@
 ] @punctuation.special
 
 ; Comments
-
 (comment) @comment @spell
 
 (at_comment
@@ -148,5 +166,6 @@
 
 (class_at_comment
   (identifier) @type
-  ("extends"? (identifier)? @type)
+  ("extends"?
+    (identifier)? @type)
   (_) @comment @spell)
diff --git a/queries/luap/highlights.scm b/queries/luap/highlights.scm
index 0f95d4eff..64bb60c85 100644
--- a/queries/luap/highlights.scm
+++ b/queries/luap/highlights.scm
@@ -4,11 +4,14 @@
 ] @punctuation.delimiter
 
 (pattern
-  (character "." @variable.builtin))
+  (character
+    "." @variable.builtin))
 
 [
-  "[" "]"
-  "(" ")"
+  "["
+  "]"
+  "("
+  ")"
 ] @punctuation.bracket
 
 [
@@ -25,12 +28,14 @@
 
 (set
   (character) @constant)
+
 (negated_set
   (character) @constant)
 
 (class) @keyword
 
-(negated_set "^" @operator)
+(negated_set
+  "^" @operator)
 
 (balanced_match
   (character) @variable.parameter)
diff --git a/queries/luau/folds.scm b/queries/luau/folds.scm
index 11b644ef6..c35ce1304 100644
--- a/queries/luau/folds.scm
+++ b/queries/luau/folds.scm
@@ -1,5 +1,2 @@
 ; inherits: lua
-
-[
-  (object_type)
-] @fold
+(object_type) @fold
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 328401f26..ec765f1b9 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -1,35 +1,33 @@
 ; Preproc
-
 (hash_bang_line) @keyword.directive
 
-;; Keywords
-
+; Keywords
 "return" @keyword.return
 
 [
- "local"
- "type"
- "export"
+  "local"
+  "type"
+  "export"
 ] @keyword
 
 (do_statement
-[
-  "do"
-  "end"
-] @keyword)
+  [
+    "do"
+    "end"
+  ] @keyword)
 
 (while_statement
-[
-  "while"
-  "do"
-  "end"
-] @keyword.repeat)
+  [
+    "while"
+    "do"
+    "end"
+  ] @keyword.repeat)
 
 (repeat_statement
-[
-  "repeat"
-  "until"
-] @keyword.repeat)
+  [
+    "repeat"
+    "until"
+  ] @keyword.repeat)
 
 [
   (break_statement)
@@ -37,48 +35,47 @@
 ] @keyword.repeat
 
 (if_statement
-[
-  "if"
-  "elseif"
-  "else"
-  "then"
-  "end"
-] @keyword.conditional)
+  [
+    "if"
+    "elseif"
+    "else"
+    "then"
+    "end"
+  ] @keyword.conditional)
 
 (elseif_statement
-[
-  "elseif"
-  "then"
-  "end"
-] @keyword.conditional)
+  [
+    "elseif"
+    "then"
+    "end"
+  ] @keyword.conditional)
 
 (else_statement
-[
-  "else"
-  "end"
-] @keyword.conditional)
+  [
+    "else"
+    "end"
+  ] @keyword.conditional)
 
 (for_statement
-[
-  "for"
-  "do"
-  "end"
-] @keyword.repeat)
+  [
+    "for"
+    "do"
+    "end"
+  ] @keyword.repeat)
 
 (function_declaration
-[
-  "function"
-  "end"
-] @keyword.function)
+  [
+    "function"
+    "end"
+  ] @keyword.function)
 
 (function_definition
-[
-  "function"
-  "end"
-] @keyword.function)
-
-;; Operators
+  [
+    "function"
+    "end"
+  ] @keyword.function)
 
+; Operators
 [
   "and"
   "not"
@@ -117,15 +114,16 @@
   "..="
 ] @operator
 
-;; Variables
-
+; Variables
 (identifier) @variable
 
 ; Types
+(type
+  (identifier) @type)
 
-(type (identifier) @type)
-
-(type (generic_type (identifier) @type))
+(type
+  (generic_type
+    (identifier) @type))
 
 (builtin_type) @type.builtin
 
@@ -133,16 +131,17 @@
   (#lua-match? @type "^[A-Z]"))
 
 ; Typedefs
-
-(type_definition "type" . (type) @type.definition "=")
+(type_definition
+  "type"
+  .
+  (type) @type.definition
+  "=")
 
 ; Constants
-
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z][A-Z_0-9]+$"))
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]+$"))
 
 ; Builtins
-
 ((identifier) @constant.builtin
   (#eq? @constant.builtin "_VERSION"))
 
@@ -155,32 +154,48 @@
 ((identifier) @keyword.coroutine
   (#eq? @keyword.coroutine "coroutine"))
 
-;; Tables
+; Tables
+(field
+  name: (identifier) @variable.member)
 
-(field name: (identifier) @variable.member)
+(dot_index_expression
+  field: (identifier) @variable.member)
 
-(dot_index_expression field: (identifier) @variable.member)
-
-(object_type (identifier) @variable.member)
+(object_type
+  (identifier) @variable.member)
 
 (table_constructor
-[
-  "{"
-  "}"
-] @constructor)
+  [
+    "{"
+    "}"
+  ] @constructor)
 
 ; Functions
+(parameter
+  .
+  (identifier) @variable.parameter)
 
-(parameter . (identifier) @variable.parameter)
-(function_type (identifier) @variable.parameter)
+(function_type
+  (identifier) @variable.parameter)
 
-(function_call name: (identifier) @function.call)
-(function_declaration name: (identifier) @function)
+(function_call
+  name: (identifier) @function.call)
 
-(function_call name: (dot_index_expression field: (identifier) @function.call))
-(function_declaration name: (dot_index_expression field: (identifier) @function))
+(function_declaration
+  name: (identifier) @function)
 
-(method_index_expression method: (identifier) @function.method.call)
+(function_call
+  name:
+    (dot_index_expression
+      field: (identifier) @function.call))
+
+(function_declaration
+  name:
+    (dot_index_expression
+      field: (identifier) @function))
+
+(method_index_expression
+  method: (identifier) @function.method.call)
 
 (function_call
   (identifier) @function.builtin
@@ -196,7 +211,6 @@
     "__pairs" "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
 
 ; Literals
-
 (number) @number
 
 (string) @string
@@ -210,8 +224,7 @@
   (true)
 ] @boolean
 
-;; Punctuations
-
+; Punctuations
 [
   ";"
   ":"
@@ -222,24 +235,36 @@
 ] @punctuation.delimiter
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 (variable_list
-   attribute: (attribute
-     (["<" ">"] @punctuation.bracket
-      (identifier) @attribute)))
+  attribute:
+    (attribute
+      ([
+        "<"
+        ">"
+      ] @punctuation.bracket
+        (identifier) @attribute)))
 
-(generic_type [ "<" ">" ] @punctuation.bracket)
-(generic_type_list [ "<" ">" ] @punctuation.bracket)
+(generic_type
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(generic_type_list
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 ; Comments
-
 (comment) @comment @spell
 
 ((comment) @comment.documentation
@@ -253,11 +278,21 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-  arguments: (arguments . (_) . (string content: _ @string.regexp)))
+  arguments:
+    (arguments
+      .
+      (_)
+      .
+      (string
+        content: _ @string.regexp)))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-    arguments: (arguments . (string content: _ @string.regexp)))
+  arguments:
+    (arguments
+      .
+      (string
+        content: _ @string.regexp)))
diff --git a/queries/luau/indents.scm b/queries/luau/indents.scm
index e03d0ff48..03da6320b 100644
--- a/queries/luau/indents.scm
+++ b/queries/luau/indents.scm
@@ -1,5 +1,2 @@
 ; inherits: lua
-
-[
-  (object_type)
-] @indent.begin
+(object_type) @indent.begin
diff --git a/queries/luau/injections.scm b/queries/luau/injections.scm
index 4edc7f5e4..4563f8ed4 100644
--- a/queries/luau/injections.scm
+++ b/queries/luau/injections.scm
@@ -1,9 +1,15 @@
 ((function_call
-  name: [
-    (identifier) @_cdef_identifier
-    (_ _ (identifier) @_cdef_identifier)
-  ]
-  arguments: (arguments (string content: _ @injection.content)))
+  name:
+    [
+      (identifier) @_cdef_identifier
+      (_
+        _
+        (identifier) @_cdef_identifier)
+    ]
+  arguments:
+    (arguments
+      (string
+        content: _ @injection.content)))
   (#eq? @_cdef_identifier "cdef")
   (#set! injection.language "c"))
 
@@ -17,16 +23,26 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-  arguments: (arguments . (_) . (string content: _ @injection.content))
-    (#set! injection.language "luap"))
+  arguments:
+    (arguments
+      .
+      (_)
+      .
+      (string
+        content: _ @injection.content))
+  (#set! injection.language "luap"))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-    arguments: (arguments . (string content: _ @injection.content))
-    (#set! injection.language "luap"))
+  arguments:
+    (arguments
+      .
+      (string
+        content: _ @injection.content))
+  (#set! injection.language "luap"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/luau/locals.scm b/queries/luau/locals.scm
index d0581b890..8e45c4743 100644
--- a/queries/luau/locals.scm
+++ b/queries/luau/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (chunk)
   (do_statement)
@@ -12,33 +11,38 @@
 ] @local.scope
 
 ; References
-
-[
-  (identifier)
-] @local.reference
+(identifier) @local.reference
 
 ; Definitions
-
 (assignment_statement
   (variable_list
     (identifier) @local.definition.var))
 
 (assignment_statement
   (variable_list
-    (dot_index_expression . (_) @local.definition.associated (identifier) @local.definition.var)))
+    (dot_index_expression
+      .
+      (_) @local.definition.associated
+      (identifier) @local.definition.var)))
 
 ((function_declaration
   name: (identifier) @local.definition.function)
   (#set! definition.function.scope "parent"))
 
 ((function_declaration
-  name: (dot_index_expression
-    . (_) @local.definition.associated (identifier) @local.definition.function))
+  name:
+    (dot_index_expression
+      .
+      (_) @local.definition.associated
+      (identifier) @local.definition.function))
   (#set! definition.method.scope "parent"))
 
 ((function_declaration
-  name: (method_index_expression
-    . (_) @local.definition.associated (identifier) @local.definition.method))
+  name:
+    (method_index_expression
+      .
+      (_) @local.definition.associated
+      (identifier) @local.definition.method))
   (#set! definition.method.scope "parent"))
 
 (for_generic_clause
@@ -48,4 +52,5 @@
 (for_numeric_clause
   name: (identifier) @local.definition.var)
 
-(parameter (identifier) @local.definition.parameter)
+(parameter
+  (identifier) @local.definition.parameter)
diff --git a/queries/m68k/highlights.scm b/queries/m68k/highlights.scm
index e37c55ae0..72a5504d6 100644
--- a/queries/m68k/highlights.scm
+++ b/queries/m68k/highlights.scm
@@ -1,23 +1,32 @@
 (symbol) @variable
 
-(label name: (symbol) @label)
+(label
+  name: (symbol) @label)
 
 [
   (instruction_mnemonic)
   (directive_mnemonic)
 ] @function.builtin
 
-(include (directive_mnemonic) @keyword.import)
-(include_bin (directive_mnemonic) @keyword.import)
-(include_dir (directive_mnemonic) @keyword.import)
+(include
+  (directive_mnemonic) @keyword.import)
 
+(include_bin
+  (directive_mnemonic) @keyword.import)
+
+(include_dir
+  (directive_mnemonic) @keyword.import)
 
 (size) @attribute
 
-(macro_definition name: (symbol) @function.macro)
-(macro_call name: (symbol) @function.macro)
+(macro_definition
+  name: (symbol) @function.macro)
+
+(macro_call
+  name: (symbol) @function.macro)
 
 (string_literal) @string
+
 (path) @string.special.path
 
 [
@@ -30,7 +39,7 @@
 [
   (reptn)
   (carg)
-  (narg) 
+  (narg)
   (macro_arg)
 ] @variable.builtin
 
@@ -42,8 +51,11 @@
   (named_register)
 ] @keyword
 
-(repeat (control_mnemonic) @keyword.repeat)
-(conditional (control_mnemonic) @keyword.conditional)
+(repeat
+  (control_mnemonic) @keyword.repeat)
+
+(conditional
+  (control_mnemonic) @keyword.conditional)
 
 (comment) @comment @spell
 
diff --git a/queries/m68k/injections.scm b/queries/m68k/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/m68k/injections.scm
+++ b/queries/m68k/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/m68k/locals.scm b/queries/m68k/locals.scm
index 737352e87..6e958b6f5 100644
--- a/queries/m68k/locals.scm
+++ b/queries/m68k/locals.scm
@@ -6,17 +6,22 @@
 
 (label
   name: (symbol) @local.definition.constant)
+
 (symbol_definition
   name: (symbol) @local.definition.constant)
+
 (offset_definition
   name: (symbol) @local.definition.constant)
+
 (register_definition
   name: (symbol) @local.definition.constant)
+
 (register_list_definition
   name: (symbol) @local.definition.constant)
 
 (external_reference
-  symbols: (symbol_list
-    (symbol) @local.definition.import))
+  symbols:
+    (symbol_list
+      (symbol) @local.definition.import))
 
 (symbol) @local.reference
diff --git a/queries/make/folds.scm b/queries/make/folds.scm
index a2b472761..961f4ec7d 100644
--- a/queries/make/folds.scm
+++ b/queries/make/folds.scm
@@ -1,7 +1,5 @@
-(
-  [
-    (conditional)
-    (rule)
-  ] @fold
-  (#trim! @fold)
-)
+([
+  (conditional)
+  (rule)
+] @fold
+  (#trim! @fold))
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index e1d7aa4f7..1777aa610 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -1,140 +1,147 @@
 (comment) @comment @spell
 
 (conditional
- (_ [
-  "ifeq"
-  "else"
-  "ifneq"
-  "ifdef"
-  "ifndef"
- ] @keyword.conditional)
- "endif" @keyword.conditional)
-
-(rule (targets (word) @function))
+  (_
+    [
+      "ifeq"
+      "else"
+      "ifneq"
+      "ifdef"
+      "ifndef"
+    ] @keyword.conditional)
+  "endif" @keyword.conditional)
 
 (rule
- (targets) @_target
- (prerequisites (word) @function
-  (#eq? @_target ".PHONY")))
+  (targets
+    (word) @function))
 
-(rule (targets
-       (word) @function.builtin
-       (#any-of? @function.builtin
-        ".DEFAULT"
-        ".SUFFIXES"
-        ".DELETE_ON_ERROR"
-        ".EXPORT_ALL_VARIABLES"
-        ".IGNORE"
-        ".INTERMEDIATE"
-        ".LOW_RESOLUTION_TIME"
-        ".NOTPARALLEL"
-        ".ONESHELL"
-        ".PHONY"
-        ".POSIX"
-        ".PRECIOUS"
-        ".SECONDARY"
-        ".SECONDEXPANSION"
-        ".SILENT"
-        ".SUFFIXES")))
+(rule
+  (targets) @_target
+  (prerequisites
+    (word) @function
+    (#eq? @_target ".PHONY")))
 
-(rule ["&:" ":" "::"] @operator)
+(rule
+  (targets
+    (word) @function.builtin
+    (#any-of? @function.builtin ".DEFAULT" ".SUFFIXES" ".DELETE_ON_ERROR" ".EXPORT_ALL_VARIABLES" ".IGNORE" ".INTERMEDIATE" ".LOW_RESOLUTION_TIME" ".NOTPARALLEL" ".ONESHELL" ".PHONY" ".POSIX" ".PRECIOUS" ".SECONDARY" ".SECONDEXPANSION" ".SILENT" ".SUFFIXES")))
+
+(rule
+  [
+    "&:"
+    ":"
+    "::"
+  ] @operator)
+
+(export_directive
+  "export" @keyword)
+
+(override_directive
+  "override" @keyword)
 
-(export_directive "export" @keyword)
-(override_directive "override" @keyword)
 (include_directive
-  ["include" "-include"] @keyword.import
-  filenames: (list (word) @string.special.path))
+  [
+    "include"
+    "-include"
+  ] @keyword.import
+  filenames:
+    (list
+      (word) @string.special.path))
 
 (variable_assignment
- name: (word) @string.special.symbol
- [
-  "?="
-  ":="
-  "::="
-; ":::="
-  "+="
-  "="
- ] @operator)
+  name: (word) @string.special.symbol
+  [
+    "?="
+    ":="
+    "::="
+    ; ":::="
+    "+="
+    "="
+  ] @operator)
 
 (shell_assignment
- name: (word) @string.special.symbol
- "!=" @operator)
+  name: (word) @string.special.symbol
+  "!=" @operator)
 
 (define_directive
- "define" @keyword
- name: (word) @string.special.symbol
- [
-  "="
-  ":="
-  "::="
-; ":::="
-  "?="
-  "!="
- ]? @operator
- "endef" @keyword)
+  "define" @keyword
+  name: (word) @string.special.symbol
+  [
+    "="
+    ":="
+    "::="
+    ; ":::="
+    "?="
+    "!="
+  ]?
+     @operator
+  "endef" @keyword)
 
 (variable_assignment
- (word) @variable.builtin (#any-of? @variable.builtin
-  ".DEFAULT_GOAL"
-  ".EXTRA_PREREQS"
-  ".FEATURES"
-  ".INCLUDE_DIRS"
-  ".RECIPEPREFIX"
-  ".SHELLFLAGS"
-  ".VARIABLES"
-  "MAKEARGS"
-  "MAKEFILE_LIST"
-  "MAKEFLAGS"
-  "MAKE_RESTARTS"
-  "MAKE_TERMERR"
-  "MAKE_TERMOUT"
-  "SHELL"
- ))
+  (word) @variable.builtin
+  (#any-of? @variable.builtin ".DEFAULT_GOAL" ".EXTRA_PREREQS" ".FEATURES" ".INCLUDE_DIRS" ".RECIPEPREFIX" ".SHELLFLAGS" ".VARIABLES" "MAKEARGS" "MAKEFILE_LIST" "MAKEFLAGS" "MAKE_RESTARTS" "MAKE_TERMERR" "MAKE_TERMOUT" "SHELL"))
 
 ; Use string to match bash
-(variable_reference (word) @string) @operator
+(variable_reference
+  (word) @string) @operator
 
 (shell_function
- ["$" "(" ")"] @operator
- "shell" @function.builtin)
+  [
+    "$"
+    "("
+    ")"
+  ] @operator
+  "shell" @function.builtin)
 
-(function_call ["$" "(" ")"] @operator)
-(substitution_reference ["$" "(" ")"] @operator)
+(function_call
+  [
+    "$"
+    "("
+    ")"
+  ] @operator)
 
-(function_call [
- "subst"
- "patsubst"
- "strip"
- "findstring"
- "filter"
- "filter-out"
- "sort"
- "word"
- "words"
- "wordlist"
- "firstword"
- "lastword"
- "dir"
- "notdir"
- "suffix"
- "basename"
- "addsuffix"
- "addprefix"
- "join"
- "wildcard"
- "realpath"
- "abspath"
- "error"
- "warning"
- "info"
- "origin"
- "flavor"
- "foreach"
- "if"
- "or"
- "and"
- "call"
- "eval"
- "file"
- "value"
- ] @function.builtin)
+(substitution_reference
+  [
+    "$"
+    "("
+    ")"
+  ] @operator)
+
+(function_call
+  [
+    "subst"
+    "patsubst"
+    "strip"
+    "findstring"
+    "filter"
+    "filter-out"
+    "sort"
+    "word"
+    "words"
+    "wordlist"
+    "firstword"
+    "lastword"
+    "dir"
+    "notdir"
+    "suffix"
+    "basename"
+    "addsuffix"
+    "addprefix"
+    "join"
+    "wildcard"
+    "realpath"
+    "abspath"
+    "error"
+    "warning"
+    "info"
+    "origin"
+    "flavor"
+    "foreach"
+    "if"
+    "or"
+    "and"
+    "call"
+    "eval"
+    "file"
+    "value"
+  ] @function.builtin)
diff --git a/queries/make/injections.scm b/queries/make/injections.scm
index 646daadd0..c9c09be5d 100644
--- a/queries/make/injections.scm
+++ b/queries/make/injections.scm
@@ -1,7 +1,8 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((shell_text) @injection.content
- (#set! injection.language "bash"))
+  (#set! injection.language "bash"))
+
 ((shell_command) @injection.content
- (#set! injection.language "bash"))
+  (#set! injection.language "bash"))
diff --git a/queries/markdown/folds.scm b/queries/markdown/folds.scm
index 5900f7ffb..a682e20e0 100644
--- a/queries/markdown/folds.scm
+++ b/queries/markdown/folds.scm
@@ -1,9 +1,7 @@
-(
-  [
-    (fenced_code_block)
-    (indented_code_block)
-    (list)
-    (section)
-  ] @fold
-  (#trim! @fold)
-)
+([
+  (fenced_code_block)
+  (indented_code_block)
+  (list)
+  (section)
+] @fold
+  (#trim! @fold))
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index aa7b6a66c..92c0e7486 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -1,24 +1,53 @@
 ;From MDeiml/tree-sitter-markdown & Helix
-(setext_heading (paragraph) @markup.heading.1 (setext_h1_underline) @markup.heading.1.marker)
-(setext_heading (paragraph) @markup.heading.2 (setext_h2_underline) @markup.heading.2.marker)
+(setext_heading
+  (paragraph) @markup.heading.1
+  (setext_h1_underline) @markup.heading.1.marker)
 
-(atx_heading (atx_h1_marker) @markup.heading.1.marker (inline) @markup.heading.1)
-(atx_heading (atx_h2_marker) @markup.heading.2.marker (inline) @markup.heading.2)
-(atx_heading (atx_h3_marker) @markup.heading.3.marker (inline) @markup.heading.3)
-(atx_heading (atx_h4_marker) @markup.heading.4.marker (inline) @markup.heading.4)
-(atx_heading (atx_h5_marker) @markup.heading.5.marker (inline) @markup.heading.5)
-(atx_heading (atx_h6_marker) @markup.heading.6.marker (inline) @markup.heading.6)
+(setext_heading
+  (paragraph) @markup.heading.2
+  (setext_h2_underline) @markup.heading.2.marker)
+
+(atx_heading
+  (atx_h1_marker) @markup.heading.1.marker
+  (inline) @markup.heading.1)
+
+(atx_heading
+  (atx_h2_marker) @markup.heading.2.marker
+  (inline) @markup.heading.2)
+
+(atx_heading
+  (atx_h3_marker) @markup.heading.3.marker
+  (inline) @markup.heading.3)
+
+(atx_heading
+  (atx_h4_marker) @markup.heading.4.marker
+  (inline) @markup.heading.4)
+
+(atx_heading
+  (atx_h5_marker) @markup.heading.5.marker
+  (inline) @markup.heading.5)
+
+(atx_heading
+  (atx_h6_marker) @markup.heading.6.marker
+  (inline) @markup.heading.6)
 
 (info_string) @label
 
-(pipe_table_header (pipe_table_cell) @markup.heading)
+(pipe_table_header
+  (pipe_table_cell) @markup.heading)
+
+(pipe_table_header
+  "|" @punctuation.special)
+
+(pipe_table_row
+  "|" @punctuation.special)
+
+(pipe_table_delimiter_row
+  "|" @punctuation.special)
 
-(pipe_table_header "|" @punctuation.special)
-(pipe_table_row "|" @punctuation.special)
-(pipe_table_delimiter_row "|" @punctuation.special)
 (pipe_table_delimiter_cell) @punctuation.special
 
-;; Code blocks (conceal backticks and language annotation)
+; Code blocks (conceal backticks and language annotation)
 (indented_code_block) @markup.raw.block
 
 ((fenced_code_block) @markup.raw.block
@@ -33,9 +62,7 @@
     (language) @conceal
     (#set! conceal "")))
 
-[
-  (link_destination)
-] @markup.link.url
+(link_destination) @markup.link.url
 
 [
   (link_title)
@@ -71,23 +98,22 @@
 ;   @punctuation.special
 ;   (#eq? @punctuation.special "-")
 ;   (#set! conceal "—"))
-
 (code_fence_content) @none
 
 (thematic_break) @punctuation.special
 
 (task_list_marker_unchecked) @markup.list.unchecked
+
 (task_list_marker_checked) @markup.list.checked
 
-((block_quote) @markup.quote (#set! "priority" 90))
+((block_quote) @markup.quote
+  (#set! "priority" 90))
 
 [
   (block_continuation)
   (block_quote_marker)
 ] @punctuation.special
 
-[
-  (backslash_escape)
-] @string.escape
+(backslash_escape) @string.escape
 
 (inline) @spell
diff --git a/queries/markdown/indents.scm b/queries/markdown/indents.scm
index 6d13122f4..90c52d3d0 100644
--- a/queries/markdown/indents.scm
+++ b/queries/markdown/indents.scm
@@ -1,3 +1 @@
-[
-  (list_item)
-] @indent.auto
+(list_item) @indent.auto
diff --git a/queries/markdown/injections.scm b/queries/markdown/injections.scm
index 735189db1..8ed205296 100644
--- a/queries/markdown/injections.scm
+++ b/queries/markdown/injections.scm
@@ -4,23 +4,23 @@
   (code_fence_content) @injection.content
   (#set-lang-from-info-string! @_lang))
 
-((html_block) @injection.content 
- (#set! injection.language "html")
- (#set! injection.combined)
- (#set! injection.include-children))
+((html_block) @injection.content
+  (#set! injection.language "html")
+  (#set! injection.combined)
+  (#set! injection.include-children))
 
-((minus_metadata) @injection.content 
- (#set! injection.language "yaml") 
- (#offset! @injection.content 1 0 -1 0)
- (#set! injection.include-children))
+((minus_metadata) @injection.content
+  (#set! injection.language "yaml")
+  (#offset! @injection.content 1 0 -1 0)
+  (#set! injection.include-children))
 
-((plus_metadata) @injection.content 
- (#set! injection.language "toml") 
- (#offset! @injection.content 1 0 -1 0)
- (#set! injection.include-children))
+((plus_metadata) @injection.content
+  (#set! injection.language "toml")
+  (#offset! @injection.content 1 0 -1 0)
+  (#set! injection.include-children))
 
 ([
   (inline)
   (pipe_table_cell)
- ] @injection.content
- (#set! injection.language "markdown_inline"))
+] @injection.content
+  (#set! injection.language "markdown_inline"))
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index a1f63328b..d9f48296d 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -1,4 +1,4 @@
-;; From MDeiml/tree-sitter-markdown
+; From MDeiml/tree-sitter-markdown
 (code_span) @markup.raw @nospell
 
 (emphasis) @markup.italic
@@ -12,7 +12,8 @@
   (uri_autolink)
 ] @markup.link.url @nospell
 
-(shortcut_link (link_text) @nospell)
+(shortcut_link
+  (link_text) @nospell)
 
 [
   (link_label)
@@ -29,6 +30,7 @@
 ; Conceal codeblock and text style markers
 ((code_span_delimiter) @markup.raw
   (#set! conceal ""))
+
 ((emphasis_delimiter) @markup.strong
   (#set! conceal ""))
 
@@ -80,10 +82,27 @@
   ] @markup.link
   (#set! conceal ""))
 
-;; Replace common HTML entities.
-((entity_reference) @character.special (#eq? @character.special "&nbsp;") (#set! conceal ""))
-((entity_reference) @character.special (#eq? @character.special "&lt;") (#set! conceal "<"))
-((entity_reference) @character.special (#eq? @character.special "&gt;") (#set! conceal ">"))
-((entity_reference) @character.special (#eq? @character.special "&amp;") (#set! conceal "&"))
-((entity_reference) @character.special (#eq? @character.special "&quot;") (#set! conceal "\""))
-((entity_reference) @character.special (#any-of? @character.special "&ensp;" "&emsp;") (#set! conceal " "))
+; Replace common HTML entities.
+((entity_reference) @character.special
+  (#eq? @character.special "&nbsp;")
+  (#set! conceal ""))
+
+((entity_reference) @character.special
+  (#eq? @character.special "&lt;")
+  (#set! conceal "<"))
+
+((entity_reference) @character.special
+  (#eq? @character.special "&gt;")
+  (#set! conceal ">"))
+
+((entity_reference) @character.special
+  (#eq? @character.special "&amp;")
+  (#set! conceal "&"))
+
+((entity_reference) @character.special
+  (#eq? @character.special "&quot;")
+  (#set! conceal "\""))
+
+((entity_reference) @character.special
+  (#any-of? @character.special "&ensp;" "&emsp;")
+  (#set! conceal " "))
diff --git a/queries/markdown_inline/injections.scm b/queries/markdown_inline/injections.scm
index d665574ff..6448b77c1 100644
--- a/queries/markdown_inline/injections.scm
+++ b/queries/markdown_inline/injections.scm
@@ -1,7 +1,7 @@
 ((html_tag) @injection.content
- (#set! injection.language "html")
- (#set! injection.combined))
+  (#set! injection.language "html")
+  (#set! injection.combined))
 
 ((latex_block) @injection.content
- (#set! injection.language "latex")
- (#set! injection.include-children))
+  (#set! injection.language "latex")
+  (#set! injection.include-children))
diff --git a/queries/matlab/folds.scm b/queries/matlab/folds.scm
index dad9ea177..83008b3d7 100644
--- a/queries/matlab/folds.scm
+++ b/queries/matlab/folds.scm
@@ -1,11 +1,13 @@
-[(if_statement)
- (for_statement)
- (while_statement)
- (switch_statement)
- (try_statement)
- (function_definition)
- (class_definition)
- (enumeration)
- (events)
- (methods)
- (properties)] @fold
+[
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (switch_statement)
+  (try_statement)
+  (function_definition)
+  (class_definition)
+  (enumeration)
+  (events)
+  (methods)
+  (properties)
+] @fold
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index a2e73ee62..7a1b6c40a 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -1,10 +1,8 @@
 ; Includes
-
 ((command_name) @keyword.import
   (#eq? @keyword.import "import"))
 
 ; Keywords
-
 [
   "arguments"
   "classdef"
@@ -18,91 +16,149 @@
 ] @keyword
 
 ; Conditionals
+(if_statement
+  [
+    "if"
+    "end"
+  ] @keyword.conditional)
+
+(elseif_clause
+  "elseif" @keyword.conditional)
+
+(else_clause
+  "else" @keyword.conditional)
+
+(switch_statement
+  [
+    "switch"
+    "end"
+  ] @keyword.conditional)
+
+(case_clause
+  "case" @keyword.conditional)
+
+(otherwise_clause
+  "otherwise" @keyword.conditional)
 
-(if_statement [ "if" "end" ] @keyword.conditional)
-(elseif_clause "elseif" @keyword.conditional)
-(else_clause "else" @keyword.conditional)
-(switch_statement [ "switch" "end" ] @keyword.conditional)
-(case_clause "case" @keyword.conditional)
-(otherwise_clause "otherwise" @keyword.conditional)
 (break_statement) @keyword.conditional
 
 ; Repeats
+(for_statement
+  [
+    "for"
+    "parfor"
+    "end"
+  ] @keyword.repeat)
+
+(while_statement
+  [
+    "while"
+    "end"
+  ] @keyword.repeat)
 
-(for_statement [ "for" "parfor" "end" ] @keyword.repeat)
-(while_statement [ "while" "end" ] @keyword.repeat)
 (continue_statement) @keyword.repeat
 
 ; Exceptions
+(try_statement
+  [
+    "try"
+    "end"
+  ] @keyword.exception)
 
-(try_statement [ "try" "end" ] @keyword.exception)
-(catch_clause "catch" @keyword.exception)
+(catch_clause
+  "catch" @keyword.exception)
 
 ; Variables
-
 (identifier) @variable
 
 ; Constants
+(events
+  (identifier) @constant)
 
-(events (identifier) @constant)
-(attribute (identifier) @constant)
+(attribute
+  (identifier) @constant)
 
 "~" @constant.builtin
 
 ; Fields/Properties
+(field_expression
+  field: (identifier) @variable.member)
 
-(field_expression field: (identifier) @variable.member)
+(superclass
+  "."
+  (identifier) @property)
 
-(superclass "." (identifier) @property)
+(property_name
+  "."
+  (identifier) @property)
 
-(property_name "." (identifier) @property)
-
-(property name: (identifier) @property)
+(property
+  name: (identifier) @property)
 
 ; Types
+(class_definition
+  name: (identifier) @type)
 
-(class_definition name: (identifier) @type)
+(attributes
+  (identifier) @constant)
 
-(attributes (identifier) @constant)
-
-(enum . (identifier) @type)
+(enum
+  .
+  (identifier) @type)
 
 ((identifier) @type
   (#lua-match? @type "^_*[A-Z][a-zA-Z0-9_]+$"))
 
 ; Functions
-
 (function_definition
   "function" @keyword.function
   name: (identifier) @function
-  [ "end" "endfunction" ]? @keyword.function)
+  [
+    "end"
+    "endfunction"
+  ]?
+     @keyword.function)
 
-(function_signature name: (identifier) @function)
+(function_signature
+  name: (identifier) @function)
 
 (function_call
   name: (identifier) @function.call)
 
-(handle_operator (identifier) @function)
+(handle_operator
+  (identifier) @function)
 
-(validation_functions (identifier) @function)
+(validation_functions
+  (identifier) @function)
+
+(command
+  (command_name) @function.call)
 
-(command (command_name) @function.call)
 (command_argument) @variable.parameter
 
 (return_statement) @keyword.return
 
 ; Parameters
-
-(function_arguments (identifier) @variable.parameter)
+(function_arguments
+  (identifier) @variable.parameter)
 
 ; Punctuation
+[
+  ";"
+  ","
+  "."
+] @punctuation.delimiter
 
-[ ";" "," "." ] @punctuation.delimiter
-
-[ "(" ")" "[" "]" "{" "}" ] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 ; Operators
-
 [
   "+"
   ".+"
@@ -135,10 +191,10 @@
 ] @operator
 
 ; Literals
-
 (string) @string
 
 (escape_sequence) @string.escape
+
 (formatting_sequence) @string.special
 
 (number) @number
@@ -146,5 +202,7 @@
 (boolean) @boolean
 
 ; Comments
-
-[ (comment) (line_continuation) ] @comment @spell
+[
+  (comment)
+  (line_continuation)
+] @comment @spell
diff --git a/queries/matlab/indents.scm b/queries/matlab/indents.scm
index 46889a280..c217879d3 100644
--- a/queries/matlab/indents.scm
+++ b/queries/matlab/indents.scm
@@ -22,14 +22,18 @@
   "catch"
 ] @indent.branch
 
-((matrix (row) @indent.align)
- (#set! indent.open_delimiter "[")
- (#set! indent.close_delimiter "]"))
-((cell (row) @indent.align)
- (#set! indent.open_delimiter "{")
- (#set! indent.close_delimiter "}"))
+((matrix
+  (row) @indent.align)
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]"))
+
+((cell
+  (row) @indent.align)
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
+
 ((parenthesis) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
 (comment) @indent.auto
diff --git a/queries/matlab/injections.scm b/queries/matlab/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/matlab/injections.scm
+++ b/queries/matlab/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/matlab/locals.scm b/queries/matlab/locals.scm
index ec2d8d52a..366c82027 100644
--- a/queries/matlab/locals.scm
+++ b/queries/matlab/locals.scm
@@ -1,20 +1,33 @@
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
-
 (function_definition
   name: (identifier) @local.definition.function
   (function_arguments
     (identifier)* @local.definition.parameter
-    ("," (identifier) @local.definition.parameter)*)?) @local.scope
+    (","
+      (identifier) @local.definition.parameter)*)?) @local.scope
 
-(assignment left: (identifier) @local.definition.var)
-(multioutput_variable (identifier) @local.definition.var)
+(assignment
+  left: (identifier) @local.definition.var)
 
-(iterator . (identifier) @local.definition.var)
-(lambda (arguments (identifier) @local.definition.parameter))
-(global_operator (identifier) @local.definition.var)
-(persistent_operator (identifier) @local.definition.var)
-(catch_clause (identifier) @local.definition)
+(multioutput_variable
+  (identifier) @local.definition.var)
+
+(iterator
+  .
+  (identifier) @local.definition.var)
+
+(lambda
+  (arguments
+    (identifier) @local.definition.parameter))
+
+(global_operator
+  (identifier) @local.definition.var)
+
+(persistent_operator
+  (identifier) @local.definition.var)
+
+(catch_clause
+  (identifier) @local.definition)
diff --git a/queries/menhir/highlights.scm b/queries/menhir/highlights.scm
index 8c4e402c0..6a7ceb085 100644
--- a/queries/menhir/highlights.scm
+++ b/queries/menhir/highlights.scm
@@ -1,21 +1,60 @@
-["%parameter" "%token" "%type" "%start" "%attribute" "%left" "%right" "%nonassoc" "%public" "%inline" "%prec"] @keyword
-["%on_error_reduce"] @keyword.exception
+[
+  "%parameter"
+  "%token"
+  "%type"
+  "%start"
+  "%attribute"
+  "%left"
+  "%right"
+  "%nonassoc"
+  "%public"
+  "%inline"
+  "%prec"
+] @keyword
 
-["let"] @keyword.function
+"%on_error_reduce" @keyword.exception
 
-[(equality_symbol) ":" "|" ";" ","] @punctuation.delimiter
+"let" @keyword.function
+
+[
+  (equality_symbol)
+  ":"
+  "|"
+  ";"
+  ","
+] @punctuation.delimiter
+
+[
+  "="
+  "~"
+  "_"
+] @operator
 
-["=" "~" "_"] @operator
 (modifier) @operator
 
-["<" ">" "{" "}" "%{" "%}" "%%"] @punctuation.special
+[
+  "<"
+  ">"
+  "{"
+  "}"
+  "%{"
+  "%}"
+  "%%"
+] @punctuation.special
 
-["(" ")"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-(old_rule [(symbol)] @function)
-(new_rule [(lid)] @function)
+(old_rule
+  (symbol) @function)
 
-(precedence [(symbol)] @variable.parameter)
+(new_rule
+  (lid) @function)
+
+(precedence
+  (symbol) @variable.parameter)
 
 (funcall) @function.call
 
@@ -23,6 +62,11 @@
 (uid) @constant
 
 (ocaml_type) @type
+
 (ocaml) @none
 
-[(comment) (line_comment) (ocaml_comment)] @comment @spell
+[
+  (comment)
+  (line_comment)
+  (ocaml_comment)
+] @comment @spell
diff --git a/queries/menhir/injections.scm b/queries/menhir/injections.scm
index f209dd139..9343d60af 100644
--- a/queries/menhir/injections.scm
+++ b/queries/menhir/injections.scm
@@ -1,2 +1,2 @@
 ((ocaml) @injection.content
- (#set! injection.language "ocaml"))
+  (#set! injection.language "ocaml"))
diff --git a/queries/mermaid/highlights.scm b/queries/mermaid/highlights.scm
index b661f8ad8..3289c4e5c 100644
--- a/queries/mermaid/highlights.scm
+++ b/queries/mermaid/highlights.scm
@@ -1,105 +1,97 @@
 ; adapted from https://github.com/monaqa/tree-sitter-mermaid
-
 [
- "sequenceDiagram"
- "classDiagram"
- "classDiagram-v2"
- "stateDiagram"
- "stateDiagram-v2"
- "gantt"
- "pie"
- "flowchart"
- "erdiagram"
-
- "participant"
- "as"
- "activate"
- "deactivate"
- "note "
- "over"
- "link"
- "links"
- ; "left of"
- ; "right of"
- "properties"
- "details"
- "title"
- "loop"
- "rect"
- "opt"
- "alt"
- "else"
- "par"
- "and"
- "end"
- (sequence_stmt_autonumber)
- (note_placement_left)
- (note_placement_right)
-
- "class"
-
- "state "
-
- "dateformat"
- "inclusiveenddates"
- "topaxis"
- "axisformat"
- "includes"
- "excludes"
- "todaymarker"
- "title"
- "section"
-
- "direction"
- "subgraph"
-
- ] @keyword
+  "sequenceDiagram"
+  "classDiagram"
+  "classDiagram-v2"
+  "stateDiagram"
+  "stateDiagram-v2"
+  "gantt"
+  "pie"
+  "flowchart"
+  "erdiagram"
+  "participant"
+  "as"
+  "activate"
+  "deactivate"
+  "note "
+  "over"
+  "link"
+  "links"
+  ; "left of"
+  ; "right of"
+  "properties"
+  "details"
+  "title"
+  "loop"
+  "rect"
+  "opt"
+  "alt"
+  "else"
+  "par"
+  "and"
+  "end"
+  (sequence_stmt_autonumber)
+  (note_placement_left)
+  (note_placement_right)
+  "class"
+  "state "
+  "dateformat"
+  "inclusiveenddates"
+  "topaxis"
+  "axisformat"
+  "includes"
+  "excludes"
+  "todaymarker"
+  "title"
+  "section"
+  "direction"
+  "subgraph"
+] @keyword
 
 (comment) @comment @spell
 
 [
- ":"
- (sequence_signal_plus_sign)
- (sequence_signal_minus_sign)
-
- (class_visibility_public)
- (class_visibility_private)
- (class_visibility_protected)
- (class_visibility_internal)
-
- (state_division)
- ] @punctuation.delimiter
+  ":"
+  (sequence_signal_plus_sign)
+  (sequence_signal_minus_sign)
+  (class_visibility_public)
+  (class_visibility_private)
+  (class_visibility_protected)
+  (class_visibility_internal)
+  (state_division)
+] @punctuation.delimiter
 
 [
- "("
- ")"
- "{"
- "}"
- ] @punctuation.bracket
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
 
 [
- "-->"
- (solid_arrow)
- (dotted_arrow)
- (solid_open_arrow)
- (dotted_open_arrow)
- (solid_cross)
- (dotted_cross)
- (solid_point)
- (dotted_point)
- ] @operator
+  "-->"
+  (solid_arrow)
+  (dotted_arrow)
+  (solid_open_arrow)
+  (dotted_open_arrow)
+  (solid_cross)
+  (dotted_cross)
+  (solid_point)
+  (dotted_point)
+] @operator
 
 [
- (class_reltype_aggregation)
- (class_reltype_extension)
- (class_reltype_composition)
- (class_reltype_dependency)
- (class_linetype_solid)
- (class_linetype_dotted)
- "&"
- ] @operator
+  (class_reltype_aggregation)
+  (class_reltype_extension)
+  (class_reltype_composition)
+  (class_reltype_dependency)
+  (class_linetype_solid)
+  (class_linetype_dotted)
+  "&"
+] @operator
 
 (sequence_actor) @variable.member
+
 (class_name) @variable.member
 
 (state_name) @variable.member
@@ -107,71 +99,151 @@
 (gantt_task_text) @variable.member
 
 [
- (class_annotation_line)
- (class_stmt_annotation)
- (class_generics)
-
- (state_annotation_fork)
- (state_annotation_join)
- (state_annotation_choice)
- ] @attribute
+  (class_annotation_line)
+  (class_stmt_annotation)
+  (class_generics)
+  (state_annotation_fork)
+  (state_annotation_join)
+  (state_annotation_choice)
+] @attribute
 
 (directive) @keyword.import
 
 (pie_label) @string
+
 (pie_value) @number.float
 
 [
-(flowchart_direction_lr)
-(flowchart_direction_rl)
-(flowchart_direction_tb)
-(flowchart_direction_bt)
- ] @constant
+  (flowchart_direction_lr)
+  (flowchart_direction_rl)
+  (flowchart_direction_tb)
+  (flowchart_direction_bt)
+] @constant
 
 (flow_vertex_id) @variable.member
 
 [
- (flow_link_arrow)
- (flow_link_arrow_start)
- ] @operator
+  (flow_link_arrow)
+  (flow_link_arrow_start)
+] @operator
 
-(flow_link_arrowtext "|" @punctuation.bracket)
+(flow_link_arrowtext
+  "|" @punctuation.bracket)
 
-(flow_vertex_square        [ "[" "]" ]   @punctuation.bracket )
-(flow_vertex_circle        ["((" "))"]   @punctuation.bracket )
-(flow_vertex_ellipse       ["(-" "-)"]   @punctuation.bracket )
-(flow_vertex_stadium       ["([" "])"]   @punctuation.bracket )
-(flow_vertex_subroutine    ["[[" "]]"]   @punctuation.bracket )
-(flow_vertex_rect          ["[|" "|]"]   @punctuation.bracket )
-(flow_vertex_cylinder      ["[(" ")]"]   @punctuation.bracket )
-(flow_vertex_round         ["(" ")"]     @punctuation.bracket )
-(flow_vertex_diamond       ["{" "}"]     @punctuation.bracket )
-(flow_vertex_hexagon       ["{{" "}}"]   @punctuation.bracket )
-(flow_vertex_odd           [">" "]"]     @punctuation.bracket )
-(flow_vertex_trapezoid     ["[/" "\\]"]  @punctuation.bracket )
-(flow_vertex_inv_trapezoid ["[\\" "/]"]  @punctuation.bracket )
-(flow_vertex_leanright     ["[/" "/]"]   @punctuation.bracket )
-(flow_vertex_leanleft      ["[\\" "\\]"] @punctuation.bracket )
+(flow_vertex_square
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
 
-(flow_stmt_subgraph ["[" "]"] @punctuation.bracket )
+(flow_vertex_circle
+  [
+    "(("
+    "))"
+  ] @punctuation.bracket)
+
+(flow_vertex_ellipse
+  [
+    "(-"
+    "-)"
+  ] @punctuation.bracket)
+
+(flow_vertex_stadium
+  [
+    "(["
+    "])"
+  ] @punctuation.bracket)
+
+(flow_vertex_subroutine
+  [
+    "[["
+    "]]"
+  ] @punctuation.bracket)
+
+(flow_vertex_rect
+  [
+    "[|"
+    "|]"
+  ] @punctuation.bracket)
+
+(flow_vertex_cylinder
+  [
+    "[("
+    ")]"
+  ] @punctuation.bracket)
+
+(flow_vertex_round
+  [
+    "("
+    ")"
+  ] @punctuation.bracket)
+
+(flow_vertex_diamond
+  [
+    "{"
+    "}"
+  ] @punctuation.bracket)
+
+(flow_vertex_hexagon
+  [
+    "{{"
+    "}}"
+  ] @punctuation.bracket)
+
+(flow_vertex_odd
+  [
+    ">"
+    "]"
+  ] @punctuation.bracket)
+
+(flow_vertex_trapezoid
+  [
+    "[/"
+    "\\]"
+  ] @punctuation.bracket)
+
+(flow_vertex_inv_trapezoid
+  [
+    "[\\"
+    "/]"
+  ] @punctuation.bracket)
+
+(flow_vertex_leanright
+  [
+    "[/"
+    "/]"
+  ] @punctuation.bracket)
+
+(flow_vertex_leanleft
+  [
+    "[\\"
+    "\\]"
+  ] @punctuation.bracket)
+
+(flow_stmt_subgraph
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
 
 [
- (er_cardinarity_zero_or_one)
- (er_cardinarity_zero_or_more)
- (er_cardinarity_one_or_more)
- (er_cardinarity_only_one)
- (er_reltype_non_identifying)
- (er_reltype_identifying)
- ] @operator
+  (er_cardinarity_zero_or_one)
+  (er_cardinarity_zero_or_more)
+  (er_cardinarity_one_or_more)
+  (er_cardinarity_only_one)
+  (er_reltype_non_identifying)
+  (er_reltype_identifying)
+] @operator
 
 (er_entity_name) @variable.member
 
 (er_attribute_type) @type
+
 (er_attribute_name) @variable.member
 
 [
- (er_attribute_key_type_pk)
- (er_attribute_key_type_fk)
- ] @type.qualifier
+  (er_attribute_key_type_pk)
+  (er_attribute_key_type_fk)
+] @type.qualifier
 
 (er_attribute_comment) @string @spell
diff --git a/queries/meson/folds.scm b/queries/meson/folds.scm
index bb6c3c877..386d4d306 100644
--- a/queries/meson/folds.scm
+++ b/queries/meson/folds.scm
@@ -1,9 +1,9 @@
 [
- (normal_command)
- (if_condition)
- (if_command)
- (else_command)
- (elseif_command)
- (foreach_command)
- (list)
+  (normal_command)
+  (if_condition)
+  (if_command)
+  (else_command)
+  (elseif_command)
+  (foreach_command)
+  (list)
 ] @fold
diff --git a/queries/meson/highlights.scm b/queries/meson/highlights.scm
index a61e6b1e6..b00c3399b 100644
--- a/queries/meson/highlights.scm
+++ b/queries/meson/highlights.scm
@@ -1,5 +1,7 @@
 (comment) @comment @spell
+
 (number) @number
+
 (bool) @boolean
 
 (identifier) @variable
@@ -40,7 +42,10 @@
 ] @operator
 
 (ternaryoperator
-  ["?" ":"] @keyword.conditional.ternary)
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 [
   "if"
@@ -62,15 +67,11 @@
 
 (normal_command
   command: (identifier) @function)
+
 (pair
   key: (identifier) @property)
 
 (escape_sequence) @string.escape
 
 ((identifier) @variable.builtin
-  (#any-of? @variable.builtin
-    "meson"
-    "host_machine"
-    "build_machine"
-    "target_machine"
-   ))
+  (#any-of? @variable.builtin "meson" "host_machine" "build_machine" "target_machine"))
diff --git a/queries/meson/injections.scm b/queries/meson/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/meson/injections.scm
+++ b/queries/meson/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index 6d7f4c2d7..cbe4ecf0d 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -22,7 +22,6 @@
   "default"
   (arith_cmp_predicate)
 ] @keyword
-
 ; format-ignore
 [
   "module"
@@ -276,6 +275,7 @@
 ] @number
 
 (float_literal) @number.float
+
 (bool_literal) @boolean
 
 [
@@ -325,13 +325,23 @@
   "->"
 ] @operator
 
-(builtin_dialect name: (symbol_ref_id) @function)
-(func_dialect name: (symbol_ref_id) @function)
-(llvm_dialect name: (symbol_ref_id) @function)
+(builtin_dialect
+  name: (symbol_ref_id) @function)
 
-(func_arg_list (value_use) @variable.parameter)
-(block_arg_list (value_use) @variable.parameter)
+(func_dialect
+  name: (symbol_ref_id) @function)
+
+(llvm_dialect
+  name: (symbol_ref_id) @function)
+
+(func_arg_list
+  (value_use) @variable.parameter)
+
+(block_arg_list
+  (value_use) @variable.parameter)
 
 (caret_id) @tag
+
 (value_use) @variable
+
 (comment) @comment @spell
diff --git a/queries/mlir/locals.scm b/queries/mlir/locals.scm
index 8e569e8e6..d29351d48 100644
--- a/queries/mlir/locals.scm
+++ b/queries/mlir/locals.scm
@@ -1,7 +1,12 @@
 (region) @local.scope
 
-(func_arg_list (value_use) @local.definition.var)
-(block_arg_list (value_use) @local.definition.var)
-(op_result (value_use) @local.definition.var)
+(func_arg_list
+  (value_use) @local.definition.var)
+
+(block_arg_list
+  (value_use) @local.definition.var)
+
+(op_result
+  (value_use) @local.definition.var)
 
 (value_use) @local.reference
diff --git a/queries/nasm/highlights.scm b/queries/nasm/highlights.scm
index d588635fc..02506de8b 100644
--- a/queries/nasm/highlights.scm
+++ b/queries/nasm/highlights.scm
@@ -1,8 +1,9 @@
-;; adapted from https://github.com/naclsn/tree-sitter-nasm/blob/main/queries/highlights.scm
-
+; adapted from https://github.com/naclsn/tree-sitter-nasm/blob/main/queries/highlights.scm
 (word) @variable
+
 ((word) @constant
   (#lua-match? @constant "^[A-Z_][?A-Z_0-9]+$"))
+
 ((word) @constant.builtin
   (#lua-match? @constant.builtin "^__%?[A-Z_a-z0-9]+%?__$"))
 
@@ -11,19 +12,28 @@
   (section_here_token)
 ] @variable.builtin
 
-(label (word) @label)
-(assembl_directive_symbols (word) @label)
-(assembl_directive_sections (word) @label)
+(label
+  (word) @label)
+
+(assembl_directive_symbols
+  (word) @label)
+
+(assembl_directive_sections
+  (word) @label)
 
 (unary_expression
   operator: _ @operator)
+
 (binary_expression
   operator: _ @operator)
 
 "?" @constant.builtin
 
 (conditional_expression
-  [ "?" ":" ] @keyword.conditional.ternary)
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 [
   ":"
@@ -31,12 +41,16 @@
 ] @punctuation.delimiter
 
 [
-  "(" ")"
-  "[" "]"
-  "{" "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 (instruction_prefix) @keyword
+
 (actual_instruction
   instruction: (word) @function.builtin)
 
@@ -44,13 +58,16 @@
   base: (word) @function.call)
 
 (size_hint) @type
+
 (struc_declaration
   name: (word) @type)
+
 (struc_instance
   name: (word) @type)
 
 (effective_address
   hint: _ @type)
+
 (effective_address
   segment: _ @constant.builtin)
 
diff --git a/queries/nickel/highlights.scm b/queries/nickel/highlights.scm
index e340c37f7..d77bf7373 100644
--- a/queries/nickel/highlights.scm
+++ b/queries/nickel/highlights.scm
@@ -13,14 +13,21 @@
 
 "import" @keyword.import
 
-[ "if" "then" "else" ] @keyword.conditional
+[
+  "if"
+  "then"
+  "else"
+] @keyword.conditional
+
 "match" @keyword.conditional
 
 (types) @type
+
 "Array" @type.builtin
 
 ; BUILTIN Constants
 (bool) @boolean
+
 "null" @constant.builtin
 
 (num_literal) @number
@@ -28,34 +35,42 @@
 (infix_op) @operator
 
 (type_atom) @type
+
 (enum_tag) @variable
 
 (chunk_literal_single) @string
+
 (chunk_literal_multi) @string
 
 (str_esc_char) @string.escape
 
 [
- "{" "}"
- "(" ")"
- "[|" "|]"
+  "{"
+  "}"
+  "("
+  ")"
+  "[|"
+  "|]"
 ] @punctuation.bracket
 
 (multstr_start) @punctuation.bracket
+
 (multstr_end) @punctuation.bracket
+
 (interpolation_start) @punctuation.bracket
+
 (interpolation_end) @punctuation.bracket
 
 (record_field) @variable.member
 
 (builtin) @function.builtin
 
-(fun_expr pats:
-  (pattern id:
-    (ident) @variable.parameter
-  )
-)
+(fun_expr
+  pats:
+    (pattern
+      id: (ident) @variable.parameter))
 
-(applicative t1:
-  (applicative (record_operand) @function)
-)
+(applicative
+  t1:
+    (applicative
+      (record_operand) @function))
diff --git a/queries/nickel/indents.scm b/queries/nickel/indents.scm
index 3195d7feb..8c6f740d9 100644
--- a/queries/nickel/indents.scm
+++ b/queries/nickel/indents.scm
@@ -1,6 +1,8 @@
 [
- (atom (uni_record)) ; for {...}
- (atom terms: (term)) ; for [...]
+  (atom
+    (uni_record)) ; for {...}
+  (atom
+    terms: (term)) ; for [...]
 ] @indent.begin
 
 [
@@ -8,6 +10,4 @@
   "}"
 ] @indent.end @indent.branch
 
-[
-  (comment)
-] @indent.auto
+(comment) @indent.auto
diff --git a/queries/nim/folds.scm b/queries/nim/folds.scm
index 466bcf5ae..fa0581a72 100644
--- a/queries/nim/folds.scm
+++ b/queries/nim/folds.scm
@@ -4,11 +4,9 @@
   (let_section)
   (type_section)
   (using_section)
-
   (object_declaration)
   (tuple_type)
   (enum_declaration)
-
   (case)
   (if)
   (when)
@@ -17,22 +15,18 @@
   (of_branch)
   (elif_branch)
   (else_branch)
-
   (for)
   (while)
   (block)
   (static_statement)
   (pragma_statement)
-
   (try)
   (except_branch)
   (finally_branch)
-
   (do_block)
   (call
     (argument_list
       (statement_list)))
-
   (proc_declaration)
   (func_declaration)
   (method_declaration)
@@ -40,10 +34,8 @@
   (converter_declaration)
   (template_declaration)
   (macro_declaration)
-
   (proc_expression)
   (func_expression)
   (iterator_expression)
-
   (concept_declaration)
 ] @fold
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index 1a7da2ba2..d868be072 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -1,59 +1,58 @@
 ; SPDX-FileCopyrightText: 2023 Leorize <leorize+oss@disroot.org>, aMOPel <>
 ; SPDX-License-Identifier: MPL-2.0
 ; SPDX-License-Identifier: Apache-2.0
-
 ; =============================================================================
 ; catch all rules
+((identifier) @variable
+  (#set! "priority" 99))
 
-((identifier) @variable (#set! "priority" 99))
 ; NOTE: we need priority, since (identifier) is most specific and we have to
 ; capture nodes containing (identifier) as a whole, while overruling the
 ; @variable capture.
-
 (type_expression) @type
+
 ; NOTE: has to be after
 ; ((identifier) @variable (#set! "priority" 99))
-
 ; overrule identifiers in pragmas in (proc_type)s and (pragma_expression)s
 (proc_type
-  pragmas:
-    (pragma_list) @variable)
+  pragmas: (pragma_list) @variable)
+
 (iterator_type
-  pragmas:
-    (pragma_list) @variable)
+  pragmas: (pragma_list) @variable)
+
 (type_expression
   (pragma_expression
-    right:
-      (pragma_list) @variable))
+    right: (pragma_list) @variable))
+
 ; NOTE: has to be after
 ; (type_expression) @type
 ; and before @keyword.directive and all literals
-
 ; constants/enums in array construction
 (array_construction
   (colon_expression
     left: (_) @constant))
-; NOTE: has to be before literals and punctuation etc.
 
+; NOTE: has to be before literals and punctuation etc.
 ; identifiers in "case" "of" branches have to be enums
 (case
   alternative:
     (of_branch
       values:
-        (expression_list (_) @constant)))
-; NOTE: has to be before literals and punctuation etc.
+        (expression_list
+          (_) @constant)))
 
+; NOTE: has to be before literals and punctuation etc.
 ; in variant objects with "case" "of"
 (variant_declaration
   alternative:
     (of_branch
       values:
-        (expression_list (_) @constant)))
-; NOTE: has to be before literals and punctuation etc.
+        (expression_list
+          (_) @constant)))
 
+; NOTE: has to be before literals and punctuation etc.
 ; =============================================================================
 ; @comment               ; line and block comments
-
 [
   (comment)
   (block_comment)
@@ -61,54 +60,75 @@
 
 ; =============================================================================
 ; @comment.documentation ; comments documenting code
+(documentation_comment
+  "##" @comment.documentation)
 
-(documentation_comment "##" @comment.documentation)
 (block_documentation_comment
   "##[" @comment.documentation
   "]##" @comment.documentation)
-; NOTE: leaving content uncaptured so markdown can be injected
 
+; NOTE: leaving content uncaptured so markdown can be injected
 ; =============================================================================
 ; @punctuation.delimiter ; delimiters (e.g. `;` / `.` / `,`)
-
-[ "." ";" "," ":" "=" ] @punctuation.delimiter
+[
+  "."
+  ";"
+  ","
+  ":"
+  "="
+] @punctuation.delimiter
 
 ; =============================================================================
 ; @operator              ; symbolic operators (e.g. `+` / `*`)
-
 (operator) @operator
 
-(assignment "=" @operator)
+(assignment
+  "=" @operator)
 
 ; =============================================================================
 ; @punctuation.bracket   ; brackets (e.g. `()` / `{}` / `[]`)
-
-[ "(" ")" "[" "[:" "]" "{" "}" ] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "[:"
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 ; =============================================================================
 ; @keyword.directive               ; various preprocessor directives & shebangs
-
 [
   "macro"
   "template"
 ] @keyword.directive
 
-(pragma_list ["{." "}" ".}"] @keyword.directive)
-; NOTE: has to come after @punctuation.bracket
+(pragma_list
+  [
+    "{."
+    "}"
+    ".}"
+  ] @keyword.directive)
 
+; NOTE: has to come after @punctuation.bracket
 ; =============================================================================
 ; @punctuation.special   ; special symbols (e.g. `{}` in string interpolation)
+(accent_quoted
+  "`" @punctuation.special)
 
-(accent_quoted "`" @punctuation.special)
-
-(exported_symbol "*" @punctuation.special)
+(exported_symbol
+  "*" @punctuation.special)
 
 ; dereference operator
-(bracket_expression !right "[" @punctuation.special . "]" @punctuation.special)
+(bracket_expression
+  !right
+  "[" @punctuation.special
+  .
+  "]" @punctuation.special)
 
 ; =============================================================================
 ; @string               ; string literals
-
 [
   (interpreted_string_literal)
   (long_string_literal)
@@ -117,147 +137,189 @@
 ] @string
 
 ; injections in generalized_strings
-(generalized_string (string_content) @none)
+(generalized_string
+  (string_content) @none)
 
 ; format string injection in normal strings with & prefix
 (prefix_expression
-  operator: (operator) @_string_prefix .
-  (_ (string_content) @none)
+  operator: (operator) @_string_prefix
+  .
+  (_
+    (string_content) @none)
   (#eq? @_string_prefix "&"))
 
 ; emit pragma injection
 (pragma_statement
   (pragma_list
     (colon_expression
-      left: (identifier) @_emit_keyword (#eq? @_emit_keyword "emit")
-      right: (_ (string_content) @none))))
+      left: (identifier) @_emit_keyword
+      (#eq? @_emit_keyword "emit")
+      right:
+        (_
+          (string_content) @none))))
 
 ; =============================================================================
 ; @string.escape        ; escape sequences
-
 (escape_sequence) @string.escape
 
 ; =============================================================================
 ; @character            ; character literals
-
 (char_literal) @character
 
 ; =============================================================================
 ; @boolean              ; boolean literals
-
 ((identifier) @boolean
   (#any-of? @boolean "true" "false" "on" "off"))
 
 ; =============================================================================
 ; @number               ; numeric literals
-
 (integer_literal) @number
 
 (custom_numeric_literal) @number
 
 ; =============================================================================
 ; @number.float                ; floating-point number literals
-
 (float_literal) @number.float
 
 ; =============================================================================
 ; @function         ; function definitions
-
 (proc_declaration
-  name: [
-    (identifier) @function
-    (accent_quoted (identifier) @function)
-    (exported_symbol (identifier) @function)
-    (exported_symbol (accent_quoted (identifier) @function))
-  ])
+  name:
+    [
+      (identifier) @function
+      (accent_quoted
+        (identifier) @function)
+      (exported_symbol
+        (identifier) @function)
+      (exported_symbol
+        (accent_quoted
+          (identifier) @function))
+    ])
 
 (func_declaration
-  name: [
-    (identifier) @function
-    (accent_quoted (identifier) @function)
-    (exported_symbol (identifier) @function)
-    (exported_symbol (accent_quoted (identifier) @function))
-  ])
+  name:
+    [
+      (identifier) @function
+      (accent_quoted
+        (identifier) @function)
+      (exported_symbol
+        (identifier) @function)
+      (exported_symbol
+        (accent_quoted
+          (identifier) @function))
+    ])
 
 (iterator_declaration
-  name: [
-    (identifier) @function
-    (accent_quoted (identifier) @function)
-    (exported_symbol (identifier) @function)
-    (exported_symbol (accent_quoted (identifier) @function))
-  ])
+  name:
+    [
+      (identifier) @function
+      (accent_quoted
+        (identifier) @function)
+      (exported_symbol
+        (identifier) @function)
+      (exported_symbol
+        (accent_quoted
+          (identifier) @function))
+    ])
 
 (converter_declaration
-  name: [
-    (identifier) @function
-    (accent_quoted (identifier) @function)
-    (exported_symbol (identifier) @function)
-    (exported_symbol (accent_quoted (identifier) @function))
-  ])
+  name:
+    [
+      (identifier) @function
+      (accent_quoted
+        (identifier) @function)
+      (exported_symbol
+        (identifier) @function)
+      (exported_symbol
+        (accent_quoted
+          (identifier) @function))
+    ])
 
 ; =============================================================================
 ; @function.call    ; function calls
-
 (call
-  function: [
-    (identifier) @function.call
-    (accent_quoted (identifier) @function.call)
-    ; generic types
-    (bracket_expression left: (identifier) @function.call)
-    (bracket_expression left: (accent_quoted (identifier) @function.call))
-    ; dot accessor
-    (dot_expression right: (identifier) @function.call)
-    (dot_expression right: (accent_quoted (identifier) @function.call))
-    ; both
-    (bracket_expression left:
-      (dot_expression right: (identifier) @function.call))
-    (bracket_expression left:
-      (dot_expression right: (accent_quoted (identifier) @function.call)))
-  ])
+  function:
+    [
+      (identifier) @function.call
+      (accent_quoted
+        (identifier) @function.call)
+      ; generic types
+      (bracket_expression
+        left: (identifier) @function.call)
+      (bracket_expression
+        left:
+          (accent_quoted
+            (identifier) @function.call))
+      ; dot accessor
+      (dot_expression
+        right: (identifier) @function.call)
+      (dot_expression
+        right:
+          (accent_quoted
+            (identifier) @function.call))
+      ; both
+      (bracket_expression
+        left:
+          (dot_expression
+            right: (identifier) @function.call))
+      (bracket_expression
+        left:
+          (dot_expression
+            right:
+              (accent_quoted
+                (identifier) @function.call)))
+    ])
 
 (dot_generic_call
-  function: [
-    (identifier) @function.call
-    (accent_quoted (identifier) @function.call)
-  ])
+  function:
+    [
+      (identifier) @function.call
+      (accent_quoted
+        (identifier) @function.call)
+    ])
 
 ; generalized_string is a function call
 ; `identifier"string literal"`
 ; is short for
 ; `identifier(r"string literal")`
 (generalized_string
-  function: [
-    (identifier) @function.call
-    (accent_quoted (identifier) @function.call)
-  ])
+  function:
+    [
+      (identifier) @function.call
+      (accent_quoted
+        (identifier) @function.call)
+    ])
 
 ; call with leading literal
 (dot_expression
-  left: [
-    (nil_literal)
-    (integer_literal)
-    (float_literal)
-    (custom_numeric_literal)
-    (char_literal)
-    (interpreted_string_literal)
-    (long_string_literal)
-    (raw_string_literal)
-    (generalized_string)
-    (array_construction)
-    ; for sequences
-    (prefix_expression
-      operator: (operator) @_at
+  left:
+    [
+      (nil_literal)
+      (integer_literal)
+      (float_literal)
+      (custom_numeric_literal)
+      (char_literal)
+      (interpreted_string_literal)
+      (long_string_literal)
+      (raw_string_literal)
+      (generalized_string)
       (array_construction)
-      (#eq? @_at "@"))
-    (tuple_construction)
-    (curly_construction)
-  ]
-  right: [
-    (identifier) @function.call
-    (accent_quoted (identifier) @function.call)
-  ])
-; NOTE: will double capture as @function.call if it also has argument_list
+      ; for sequences
+      (prefix_expression
+        operator: (operator) @_at
+        (array_construction)
+        (#eq? @_at "@"))
+      (tuple_construction)
+      (curly_construction)
+    ]
+  right:
+    [
+      (identifier) @function.call
+      (accent_quoted
+        (identifier) @function.call)
+    ])
 
+; NOTE: will double capture as @function.call if it also has argument_list
 ; function.calls in `varargs[type, routine]`
 (bracket_expression
   left: (identifier) @_varargs
@@ -268,73 +330,104 @@
       .
       [
         (identifier) @function.call
-        (accent_quoted (identifier) @function.call)
-        (dot_expression right: (identifier) @function.call)
-        (dot_expression right: (accent_quoted (identifier) @function.call))
+        (accent_quoted
+          (identifier) @function.call)
+        (dot_expression
+          right: (identifier) @function.call)
+        (dot_expression
+          right:
+            (accent_quoted
+              (identifier) @function.call))
       ])
   (#eq? @_varargs "varargs"))
 
 ; =============================================================================
 ; @function.macro   ; preprocessor macros
-
 (template_declaration
-  name: [
-    (identifier) @function.macro
-    (accent_quoted (identifier) @function.macro)
-    (exported_symbol (identifier) @function.macro)
-    (exported_symbol (accent_quoted (identifier) @function.macro))
-  ])
+  name:
+    [
+      (identifier) @function.macro
+      (accent_quoted
+        (identifier) @function.macro)
+      (exported_symbol
+        (identifier) @function.macro)
+      (exported_symbol
+        (accent_quoted
+          (identifier) @function.macro))
+    ])
 
 (macro_declaration
-  name: [
-    (identifier) @function.macro
-    (accent_quoted (identifier) @function.macro)
-    (exported_symbol (identifier) @function.macro)
-    (exported_symbol (accent_quoted (identifier) @function.macro))
-  ])
+  name:
+    [
+      (identifier) @function.macro
+      (accent_quoted
+        (identifier) @function.macro)
+      (exported_symbol
+        (identifier) @function.macro)
+      (exported_symbol
+        (accent_quoted
+          (identifier) @function.macro))
+    ])
 
 ; =============================================================================
 ; @function.method           ; method definitions
-
 (method_declaration
-  name: [
-    (identifier) @function.method
-    (accent_quoted (identifier) @function.method)
-    (exported_symbol (identifier) @function.method)
-    (exported_symbol (accent_quoted (identifier) @function.method))
-  ])
+  name:
+    [
+      (identifier) @function.method
+      (accent_quoted
+        (identifier) @function.method)
+      (exported_symbol
+        (identifier) @function.method)
+      (exported_symbol
+        (accent_quoted
+          (identifier) @function.method))
+    ])
 
 ; =============================================================================
 ; @constructor      ; constructor calls and definitions
-
 (call
-  function: [
-    (identifier) @constructor
-    (accent_quoted (identifier) @constructor)
-    ; generic types
-    (bracket_expression left: (identifier) @constructor)
-    (bracket_expression left: (accent_quoted (identifier) @constructor))
-    ; dot accessor
-    (dot_expression right: (identifier) @constructor)
-    (dot_expression right: (accent_quoted (identifier) @constructor))
-    ; both
-    (bracket_expression left:
-      (dot_expression right: (identifier) @constructor))
-    (bracket_expression left:
-      (dot_expression right: (accent_quoted (identifier) @constructor)))
-  ]
+  function:
+    [
+      (identifier) @constructor
+      (accent_quoted
+        (identifier) @constructor)
+      ; generic types
+      (bracket_expression
+        left: (identifier) @constructor)
+      (bracket_expression
+        left:
+          (accent_quoted
+            (identifier) @constructor))
+      ; dot accessor
+      (dot_expression
+        right: (identifier) @constructor)
+      (dot_expression
+        right:
+          (accent_quoted
+            (identifier) @constructor))
+      ; both
+      (bracket_expression
+        left:
+          (dot_expression
+            right: (identifier) @constructor))
+      (bracket_expression
+        left:
+          (dot_expression
+            right:
+              (accent_quoted
+                (identifier) @constructor)))
+    ]
   (argument_list
     (colon_expression)+))
+
 ; NOTE: this cannot detect constructors with 0 arguments
 ; those will be matched as @function.call instead
-
 ; =============================================================================
 ; @keyword             ; various keywords
-
 ; unhandled but reserved keywords
 ; end
 ; interface
-
 ; static expression
 ; addr operator
 ((call
@@ -363,7 +456,6 @@
 
 ; =============================================================================
 ; @keyword.function    ; keywords that define a function (e.g. `func` in Go, `def` in Python)
-
 [
   "proc"
   "func"
@@ -374,7 +466,6 @@
 
 ; =============================================================================
 ; @keyword.operator    ; operators that are English words (e.g. `and` / `or`)
-
 [
   "and"
   "or"
@@ -396,7 +487,6 @@
 
 ; =============================================================================
 ; @keyword.return      ; keywords like `return` and `yield`
-
 [
   "return"
   "yield"
@@ -404,7 +494,6 @@
 
 ; =============================================================================
 ; @keyword.conditional         ; keywords related to conditionals (e.g. `if` / `else`)
-
 [
   "if"
   "when"
@@ -413,11 +502,11 @@
   "else"
 ] @keyword.conditional
 
-(of_branch "of" @keyword.conditional)
+(of_branch
+  "of" @keyword.conditional)
 
 ; =============================================================================
 ; @keyword.repeat              ; keywords related to loops (e.g. `for` / `while`)
-
 [
   "for"
   "while"
@@ -425,33 +514,35 @@
   "break"
 ] @keyword.repeat
 
-(for "in" @keyword.repeat)
+(for
+  "in" @keyword.repeat)
 
 ; =============================================================================
 ; @label               ; GOTO and other labels (e.g. `label:` in C)
-
 (block
-  label: [
-    (identifier) @label
-    (accent_quoted (identifier) @label)
-  ])
+  label:
+    [
+      (identifier) @label
+      (accent_quoted
+        (identifier) @label)
+    ])
 
 ; =============================================================================
 ; @keyword.import             ; keywords for including modules (e.g. `import` / `from` in Python)
-
 [
   "import"
   "include"
   "export"
 ] @keyword.import
 
-(import_from_statement "from" @keyword.import)
+(import_from_statement
+  "from" @keyword.import)
 
-(except_clause "except" @keyword.import)
+(except_clause
+  "except" @keyword.import)
 
 ; =============================================================================
 ; @keyword.exception           ; keywords related to exceptions (e.g. `throw` / `catch`)
-
 [
   "try"
   "except"
@@ -461,22 +552,26 @@
 
 ; =============================================================================
 ; @type            ; type or class definitions and annotations
-
 ; generic types when calling
 (call
-  function: (bracket_expression
-    right: (argument_list) @type))
+  function:
+    (bracket_expression
+      right: (argument_list) @type))
+
 ; NOTE: this also falsely matches
 ; when accessing and directly call elements from an array of routines
 ; eg `array_of_routines[index](arguments), but that is an uncommon case
-
 ; dot_generic_call `v.call[:type, type]()
 (dot_generic_call
   generic_arguments: (_) @type)
 
 ; right side of `is` operator is always type
 (infix_expression
-  operator: [ "is" "isnot" ]
+  operator:
+    [
+      "is"
+      "isnot"
+    ]
   right: (_) @type)
 
 ; except branch always contains types of errors
@@ -487,213 +582,285 @@
 ; overrule special case in (except_branch) with "as" operator
 ; `except module.exception[gen_type] as variable:`
 (except_branch
-  values: (expression_list
-    (infix_expression
-      operator: "as"
-      right: [
-        (identifier) @variable
-        (accent_quoted (identifier) @variable)
-      ])))
+  values:
+    (expression_list
+      (infix_expression
+        operator: "as"
+        right:
+          [
+            (identifier) @variable
+            (accent_quoted
+              (identifier) @variable)
+          ])))
 
 ; for inline tuple types
 ; `type a = tuple[a: int]`
 (tuple_type
   "tuple" @type
   (field_declaration_list))
+
 ; NOTE: this is consistent with other generic types like `seq[int]`
 ; but inconsistent with multiline tuple declaration,
 ; where `tuple` is captured as @keyword
-
 ; =============================================================================
 ; @variable.parameter        ; parameters of a function
-
 ; named parameters when calling
 ; call(parameter_name=arg)
 (argument_list
   (equal_expression
-    left: [
-      (identifier) @variable.parameter
-      (accent_quoted (identifier) @variable.parameter)
-    ]))
+    left:
+      [
+        (identifier) @variable.parameter
+        (accent_quoted
+          (identifier) @variable.parameter)
+      ]))
 
 ; parameters in function declaration
 (parameter_declaration_list
   (parameter_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @variable.parameter
-          (accent_quoted (identifier) @variable.parameter)
-        ]))))
-; NOTE: needs to be after @type
+        name:
+          [
+            (identifier) @variable.parameter
+            (accent_quoted
+              (identifier) @variable.parameter)
+          ]))))
 
+; NOTE: needs to be after @type
 ; generic types when declaring
 ((generic_parameter_list
   (parameter_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @variable.parameter
-          (accent_quoted (identifier) @variable.parameter)
-        ])))))
+        name:
+          [
+            (identifier) @variable.parameter
+            (accent_quoted
+              (identifier) @variable.parameter)
+          ])))))
 
 ; for loop variables
 (for
   left:
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @variable.parameter
-          (accent_quoted (identifier) @variable.parameter)
-        ])))
+        name:
+          [
+            (identifier) @variable.parameter
+            (accent_quoted
+              (identifier) @variable.parameter)
+          ])))
 
 ((tuple_deconstruct_declaration
   (symbol_declaration
-    name: [
-      (identifier) @variable.parameter
-      (accent_quoted (identifier) @variable.parameter)
-    ])) @_tuple_decons
+    name:
+      [
+        (identifier) @variable.parameter
+        (accent_quoted
+          (identifier) @variable.parameter)
+      ])) @_tuple_decons
   (#has-ancestor? @_tuple_decons for))
 
 (concept_declaration
   parameters:
-    (parameter_list [
-      (identifier) @variable.parameter
-      (accent_quoted (identifier) @variable.parameter)
-    ]))
-(var_parameter [
-  (identifier) @variable.parameter
-  (accent_quoted (identifier) @variable.parameter)
-])
-(type_parameter [
-  (identifier) @variable.parameter
-  (accent_quoted (identifier) @variable.parameter)
-])
-(static_parameter [
-  (identifier) @variable.parameter
-  (accent_quoted (identifier) @variable.parameter)
-])
-(ref_parameter [
-  (identifier) @variable.parameter
-  (accent_quoted (identifier) @variable.parameter)
-])
-(pointer_parameter [
-  (identifier) @variable.parameter
-  (accent_quoted (identifier) @variable.parameter)
-])
+    (parameter_list
+      [
+        (identifier) @variable.parameter
+        (accent_quoted
+          (identifier) @variable.parameter)
+      ]))
 
+(var_parameter
+  [
+    (identifier) @variable.parameter
+    (accent_quoted
+      (identifier) @variable.parameter)
+  ])
+
+(type_parameter
+  [
+    (identifier) @variable.parameter
+    (accent_quoted
+      (identifier) @variable.parameter)
+  ])
+
+(static_parameter
+  [
+    (identifier) @variable.parameter
+    (accent_quoted
+      (identifier) @variable.parameter)
+  ])
+
+(ref_parameter
+  [
+    (identifier) @variable.parameter
+    (accent_quoted
+      (identifier) @variable.parameter)
+  ])
+
+(pointer_parameter
+  [
+    (identifier) @variable.parameter
+    (accent_quoted
+      (identifier) @variable.parameter)
+  ])
 
 ; =============================================================================
 ; @type.definition ; type definitions (e.g. `typedef` in C)
-
 (type_section
   (type_declaration
     (type_symbol_declaration
-      name: [
-        (identifier) @type.definition
-        (accent_quoted (identifier) @type.definition)
-        (exported_symbol (identifier) @type.definition)
-        (exported_symbol (accent_quoted (identifier) @type.definition))
-      ])))
+      name:
+        [
+          (identifier) @type.definition
+          (accent_quoted
+            (identifier) @type.definition)
+          (exported_symbol
+            (identifier) @type.definition)
+          (exported_symbol
+            (accent_quoted
+              (identifier) @type.definition))
+        ])))
 
 ; =============================================================================
 ; @type.qualifier  ; type qualifiers (e.g. `const`)
+(var_type
+  "var" @type.qualifier)
 
-(var_type "var" @type.qualifier)
-(out_type "out" @type.qualifier)
-(distinct_type "distinct" @type.qualifier)
-(ref_type "ref" @type.qualifier)
-(pointer_type "ptr" @type.qualifier)
+(out_type
+  "out" @type.qualifier)
 
-(var_parameter "var" @type.qualifier)
-(type_parameter "type" @type.qualifier)
-(static_parameter "static" @type.qualifier)
-(ref_parameter "ref" @type.qualifier)
-(pointer_parameter "ptr" @type.qualifier)
+(distinct_type
+  "distinct" @type.qualifier)
+
+(ref_type
+  "ref" @type.qualifier)
+
+(pointer_type
+  "ptr" @type.qualifier)
+
+(var_parameter
+  "var" @type.qualifier)
+
+(type_parameter
+  "type" @type.qualifier)
+
+(static_parameter
+  "static" @type.qualifier)
+
+(ref_parameter
+  "ref" @type.qualifier)
+
+(pointer_parameter
+  "ptr" @type.qualifier)
 
 ; =============================================================================
 ; @variable.member           ; object and struct fields
-
 ; fields in object/tuple declaration
 (field_declaration
   (symbol_declaration_list
     (symbol_declaration
-      name: [
-        (identifier) @variable.member
-        (accent_quoted (identifier) @variable.member)
-        (exported_symbol (identifier) @variable.member)
-        (exported_symbol (accent_quoted (identifier) @variable.member))
-      ])))
+      name:
+        [
+          (identifier) @variable.member
+          (accent_quoted
+            (identifier) @variable.member)
+          (exported_symbol
+            (identifier) @variable.member)
+          (exported_symbol
+            (accent_quoted
+              (identifier) @variable.member))
+        ])))
 
 ; fields in object construction
 (call
   (argument_list
     (colon_expression
-      left: [
-        (identifier) @variable.member
-        (accent_quoted (identifier) @variable.member)
-      ])))
+      left:
+        [
+          (identifier) @variable.member
+          (accent_quoted
+            (identifier) @variable.member)
+        ])))
 
 ; fields in tuple construction
 (tuple_construction
   (colon_expression
-    left: [
-      (identifier) @variable.member
-      (accent_quoted (identifier) @variable.member)
-    ]))
+    left:
+      [
+        (identifier) @variable.member
+        (accent_quoted
+          (identifier) @variable.member)
+      ]))
 
 (variant_declaration
   (variant_discriminator_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @variable.member
-          (accent_quoted (identifier) @variable.member)
-          (exported_symbol (identifier) @variable.member)
-          (exported_symbol (accent_quoted (identifier) @variable.member))
-        ]))))
+        name:
+          [
+            (identifier) @variable.member
+            (accent_quoted
+              (identifier) @variable.member)
+            (exported_symbol
+              (identifier) @variable.member)
+            (exported_symbol
+              (accent_quoted
+                (identifier) @variable.member))
+          ]))))
 
 ; =============================================================================
 ; @variable.builtin ; built-in variable names (e.g. `this`)
-
 (blank_identifier) @variable.builtin
 
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "result"))
+
 ; NOTE: technically needs `has-ancestor some routine declaration` but it's
 ; not worth it
-
 ; =============================================================================
 ; @constant         ; constant identifiers
-
 ; enum declaration
 (enum_field_declaration
   (symbol_declaration
-    name: [
-      (identifier) @constant
-      (accent_quoted (identifier) @constant)
-    ]))
+    name:
+      [
+        (identifier) @constant
+        (accent_quoted
+          (identifier) @constant)
+      ]))
 
 ; constant declaration
 (const_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @constant
-          (accent_quoted (identifier) @constant)
-          (exported_symbol (identifier) @constant)
-          (exported_symbol (accent_quoted (identifier) @constant))
-        ]))))
+        name:
+          [
+            (identifier) @constant
+            (accent_quoted
+              (identifier) @constant)
+            (exported_symbol
+              (identifier) @constant)
+            (exported_symbol
+              (accent_quoted
+                (identifier) @constant))
+          ]))))
 
 ((tuple_deconstruct_declaration
   (symbol_declaration
-    name: [
-      (identifier) @constant
-      (accent_quoted (identifier) @constant)
-      (exported_symbol (identifier) @constant)
-      (exported_symbol (accent_quoted (identifier) @constant))
-    ])) @_tuple_decons
+    name:
+      [
+        (identifier) @constant
+        (accent_quoted
+          (identifier) @constant)
+        (exported_symbol
+          (identifier) @constant)
+        (exported_symbol
+          (accent_quoted
+            (identifier) @constant))
+      ])) @_tuple_decons
   (#has-ancestor? @_tuple_decons const_section))
 
 ; constants x and y in `array[x..y, type]`
@@ -703,37 +870,48 @@
     (argument_list
       .
       (infix_expression
-        right: [
-          (identifier) @constant
-          (accent_quoted (identifier) @constant)
-          (dot_expression right: (identifier) @constant)
-          (dot_expression right: (accent_quoted (identifier) @constant))
-        ]))
+        right:
+          [
+            (identifier) @constant
+            (accent_quoted
+              (identifier) @constant)
+            (dot_expression
+              right: (identifier) @constant)
+            (dot_expression
+              right:
+                (accent_quoted
+                  (identifier) @constant))
+          ]))
   (#any-of? @_array "array" "range"))
+
 (bracket_expression
   left: (identifier) @_array
   right:
     (argument_list
       .
       (infix_expression
-        left: [
-          (identifier) @constant
-          (accent_quoted (identifier) @constant)
-          (dot_expression right: (identifier) @constant)
-          (dot_expression right: (accent_quoted (identifier) @constant))
-        ]))
+        left:
+          [
+            (identifier) @constant
+            (accent_quoted
+              (identifier) @constant)
+            (dot_expression
+              right: (identifier) @constant)
+            (dot_expression
+              right:
+                (accent_quoted
+                  (identifier) @constant))
+          ]))
   (#any-of? @_array "array" "range"))
+
 ; NOTE: can only do this for (infix_expression)s, since standalone identifiers
 ; could be ordinal types and constants
-
 ; =============================================================================
 ; @constant.builtin ; built-in constant values
-
 (nil_literal) @constant.builtin
 
 ; =============================================================================
 ; @module        ; modules or namespaces
-
 (import_statement
   (expression_list
     (identifier) @module))
@@ -748,16 +926,19 @@
   (expression_list
     (infix_expression
       operator: (operator) @_operator
-      right: [
-        (identifier) @module
-        (array_construction (identifier) @module)
-      ]))
+      right:
+        [
+          (identifier) @module
+          (array_construction
+            (identifier) @module)
+        ]))
   (#eq? @_operator "/"))
 
 (import_from_statement
-  module: (infix_expression
-    operator: (operator) @_operator
-    right: (identifier) @module)
+  module:
+    (infix_expression
+      operator: (operator) @_operator
+      right: (identifier) @module)
   (#eq? @_operator "/"))
 
 (export_statement
@@ -766,15 +947,17 @@
 
 ; =============================================================================
 ; overrule things
-
 ; left identifier in dot_expression
-(dot_expression left: [
-  (identifier) @none
-  (accent_quoted (identifier) @none)
-])
+(dot_expression
+  left:
+    [
+      (identifier) @none
+      (accent_quoted
+        (identifier) @none)
+    ])
+
 ; NOTE: we can't know what the left identifier is, so better leave it alone
 ; for consistency
-
 ; discard literals is like a comment
 (discard_statement
   "discard" @comment
diff --git a/queries/nim/injections.scm b/queries/nim/injections.scm
index 5e347e965..776d36e3a 100644
--- a/queries/nim/injections.scm
+++ b/queries/nim/injections.scm
@@ -1,24 +1,27 @@
 ; =============================================================================
 ; generalized_strings
-
 ; regex in generalized_strings
 (generalized_string
-  function: (identifier) @_string_prefix .
+  function: (identifier) @_string_prefix
+  .
   (string_content) @injection.content
   (#set! injection.language "regex")
   (#any-of? @_string_prefix "re" "rex"))
 
 ; format string in generalized_strings
 (generalized_string
-  function: (identifier) @_string_prefix .
+  function: (identifier) @_string_prefix
+  .
   (string_content) @injection.content
   (#set! injection.language "nim_format_string")
   (#eq? @_string_prefix "fmt"))
 
 ; format string in normal strings with & prefix
 (prefix_expression
-  operator: (operator) @_string_prefix .
-  (_ (string_content) @injection.content)
+  operator: (operator) @_string_prefix
+  .
+  (_
+    (string_content) @injection.content)
   (#set! injection.language "nim_format_string")
   (#eq? @_string_prefix "&"))
 
@@ -31,45 +34,47 @@
 
 ; =============================================================================
 ; emit pragma
-
 ; C / CPP / OBJC / JAVASCRIPT
 ; a `#<no whitespace><language name>`
 ; has to directly precede the {.emit: "<language code>".} pragma
-
 ; eg.:
 ; #objc
 ; {.emit: "<objc code>".}
 ; OR
 ; #javascript
 ; {.emit: "<javascript code>".}
-
 ; normal strings
-((comment (comment_content) @injection.language)
+((comment
+  (comment_content) @injection.language)
   .
   (pragma_statement
     (pragma_list
       (colon_expression
-        left: (identifier) @_emit_keyword (#eq? @_emit_keyword "emit")
-        right: (_ (string_content) @injection.content)))))
-
+        left: (identifier) @_emit_keyword
+        (#eq? @_emit_keyword "emit")
+        right:
+          (_
+            (string_content) @injection.content)))))
 
 ; =============================================================================
 ; asm statement
-
 ; works same as emit pragma, needs preceding comment with language name
-((comment (comment_content) @injection.language)
+((comment
+  (comment_content) @injection.language)
   .
-  (assembly_statement (_ (string_content) @injection.content)))
+  (assembly_statement
+    (_
+      (string_content) @injection.content)))
 
 ; =============================================================================
 ; comments
-
 ; NOTE: ts "comment" parser heavily impacts performance
-
 ; markdown parser in documentation_comment
-(documentation_comment (comment_content) @injection.content
+(documentation_comment
+  (comment_content) @injection.content
   (#set! injection.language "markdown_inline"))
 
 ; markdown parser in block_documentation_comment
-(block_documentation_comment (comment_content) @injection.content
+(block_documentation_comment
+  (comment_content) @injection.content
   (#set! injection.language "markdown"))
diff --git a/queries/nim/locals.scm b/queries/nim/locals.scm
index 4ca6f6d44..d4d89b048 100644
--- a/queries/nim/locals.scm
+++ b/queries/nim/locals.scm
@@ -1,198 +1,243 @@
-
 ; ==============================================================================
 ; @local.definition            ; various definitions
-
 (block
-  label: [
-    (identifier) @local.definition
-    (accent_quoted) @local.definition
-  ])
+  label:
+    [
+      (identifier) @local.definition
+      (accent_quoted) @local.definition
+    ])
 
 ; ==============================================================================
 ; @local.definition.constant   ; constants
-
 (const_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @local.definition.constant
-          (accent_quoted) @local.definition.constant
-          (exported_symbol (identifier) @local.definition.constant)
-          (exported_symbol (accent_quoted) @local.definition.constant)
-        ]))
+        name:
+          [
+            (identifier) @local.definition.constant
+            (accent_quoted) @local.definition.constant
+            (exported_symbol
+              (identifier) @local.definition.constant)
+            (exported_symbol
+              (accent_quoted) @local.definition.constant)
+          ]))
     type: (type_expression)? @local.definition.associated))
 
 ; ==============================================================================
 ; @local.definition.function   ; functions
-
 (proc_declaration
-  name: [
-    (identifier) @local.definition.function
-    (accent_quoted) @local.definition.function
-    (exported_symbol (identifier) @local.definition.function)
-    (exported_symbol (accent_quoted) @local.definition.function)
-  ]
+  name:
+    [
+      (identifier) @local.definition.function
+      (accent_quoted) @local.definition.function
+      (exported_symbol
+        (identifier) @local.definition.function)
+      (exported_symbol
+        (accent_quoted) @local.definition.function)
+    ]
   (#set! "definition.function.scope" "parent"))
 
 (func_declaration
-  name: [
-    (identifier) @local.definition.function
-    (accent_quoted) @local.definition.function
-    (exported_symbol (identifier) @local.definition.function)
-    (exported_symbol (accent_quoted) @local.definition.function)
-  ]
+  name:
+    [
+      (identifier) @local.definition.function
+      (accent_quoted) @local.definition.function
+      (exported_symbol
+        (identifier) @local.definition.function)
+      (exported_symbol
+        (accent_quoted) @local.definition.function)
+    ]
   (#set! "definition.function.scope" "parent"))
 
 (iterator_declaration
-  name: [
-    (identifier) @local.definition.function
-    (accent_quoted) @local.definition.function
-    (exported_symbol (identifier) @local.definition.function)
-    (exported_symbol (accent_quoted) @local.definition.function)
-  ]
+  name:
+    [
+      (identifier) @local.definition.function
+      (accent_quoted) @local.definition.function
+      (exported_symbol
+        (identifier) @local.definition.function)
+      (exported_symbol
+        (accent_quoted) @local.definition.function)
+    ]
   (#set! "definition.function.scope" "parent"))
 
 (converter_declaration
-  name: [
-    (identifier) @local.definition.function
-    (accent_quoted) @local.definition.function
-    (exported_symbol (identifier) @local.definition.function)
-    (exported_symbol (accent_quoted) @local.definition.function)
-  ]
+  name:
+    [
+      (identifier) @local.definition.function
+      (accent_quoted) @local.definition.function
+      (exported_symbol
+        (identifier) @local.definition.function)
+      (exported_symbol
+        (accent_quoted) @local.definition.function)
+    ]
   (#set! "definition.function.scope" "parent"))
 
 ; ==============================================================================
 ; @local.definition.method     ; methods
-
 (method_declaration
-  name: [
-    (identifier) @local.definition.method
-    (accent_quoted) @local.definition.method
-    (exported_symbol (identifier) @local.definition.method)
-    (exported_symbol (accent_quoted) @local.definition.method)
-  ]
+  name:
+    [
+      (identifier) @local.definition.method
+      (accent_quoted) @local.definition.method
+      (exported_symbol
+        (identifier) @local.definition.method)
+      (exported_symbol
+        (accent_quoted) @local.definition.method)
+    ]
   (#set! "definition.method.scope" "parent"))
 
 ; ==============================================================================
 ; @local.definition.var        ; variables
-
 (var_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @local.definition.var
-          (accent_quoted) @local.definition.var
-          (exported_symbol (identifier) @local.definition.var)
-          (exported_symbol (accent_quoted) @local.definition.var)
-        ]))
+        name:
+          [
+            (identifier) @local.definition.var
+            (accent_quoted) @local.definition.var
+            (exported_symbol
+              (identifier) @local.definition.var)
+            (exported_symbol
+              (accent_quoted) @local.definition.var)
+          ]))
     type: (type_expression)? @local.definition.associated))
 
 (let_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name: [
-          (identifier) @local.definition.var
-          (accent_quoted) @local.definition.var
-          (exported_symbol (identifier) @local.definition.var)
-          (exported_symbol (accent_quoted) @local.definition.var)
-        ]))
+        name:
+          [
+            (identifier) @local.definition.var
+            (accent_quoted) @local.definition.var
+            (exported_symbol
+              (identifier) @local.definition.var)
+            (exported_symbol
+              (accent_quoted) @local.definition.var)
+          ]))
     type: (type_expression)? @local.definition.associated))
 
 (for
   (symbol_declaration_list
     (symbol_declaration
-      name: [
-        (identifier) @local.definition.var
-        (accent_quoted) @local.definition.var
-      ])))
+      name:
+        [
+          (identifier) @local.definition.var
+          (accent_quoted) @local.definition.var
+        ])))
 
 (try
   (except_branch
-    values: (expression_list
-      (infix_expression
-        right: [
-          (identifier) @local.definition.var
-          (accent_quoted) @local.definition.var
-        ]))))
+    values:
+      (expression_list
+        (infix_expression
+          right:
+            [
+              (identifier) @local.definition.var
+              (accent_quoted) @local.definition.var
+            ]))))
 
 ; ==============================================================================
 ; @local.definition.parameter  ; parameters
-
 (parameter_declaration
   (symbol_declaration_list
     (symbol_declaration
-      name: [
-        (identifier) @local.definition.parameter
-        (accent_quoted) @local.definition.parameter
-      ]))
+      name:
+        [
+          (identifier) @local.definition.parameter
+          (accent_quoted) @local.definition.parameter
+        ]))
   type: (type_expression)? @local.definition.associated)
 
 (concept_declaration
   parameters:
-    (parameter_list [
-      (identifier) @local.definition.parameter
-      (accent_quoted (identifier) @local.definition.parameter)
-    ]))
-(var_parameter [
-  (identifier) @local.definition.parameter
-  (accent_quoted (identifier) @local.definition.parameter)
-])
-(type_parameter [
-  (identifier) @local.definition.parameter
-  (accent_quoted (identifier) @local.definition.parameter)
-])
-(static_parameter [
-  (identifier) @local.definition.parameter
-  (accent_quoted (identifier) @local.definition.parameter)
-])
-(ref_parameter [
-  (identifier) @local.definition.parameter
-  (accent_quoted (identifier) @local.definition.parameter)
-])
-(pointer_parameter [
-  (identifier) @local.definition.parameter
-  (accent_quoted (identifier) @local.definition.parameter)
-])
+    (parameter_list
+      [
+        (identifier) @local.definition.parameter
+        (accent_quoted
+          (identifier) @local.definition.parameter)
+      ]))
+
+(var_parameter
+  [
+    (identifier) @local.definition.parameter
+    (accent_quoted
+      (identifier) @local.definition.parameter)
+  ])
+
+(type_parameter
+  [
+    (identifier) @local.definition.parameter
+    (accent_quoted
+      (identifier) @local.definition.parameter)
+  ])
+
+(static_parameter
+  [
+    (identifier) @local.definition.parameter
+    (accent_quoted
+      (identifier) @local.definition.parameter)
+  ])
+
+(ref_parameter
+  [
+    (identifier) @local.definition.parameter
+    (accent_quoted
+      (identifier) @local.definition.parameter)
+  ])
+
+(pointer_parameter
+  [
+    (identifier) @local.definition.parameter
+    (accent_quoted
+      (identifier) @local.definition.parameter)
+  ])
 
 ; ==============================================================================
 ; @local.definition.macro      ; preprocessor macros
-
 (template_declaration
-  name: [
-    (identifier) @local.definition.macro
-    (accent_quoted) @local.definition.macro
-    (exported_symbol (identifier) @local.definition.macro)
-    (exported_symbol (accent_quoted) @local.definition.macro)
-  ]
+  name:
+    [
+      (identifier) @local.definition.macro
+      (accent_quoted) @local.definition.macro
+      (exported_symbol
+        (identifier) @local.definition.macro)
+      (exported_symbol
+        (accent_quoted) @local.definition.macro)
+    ]
   (#set! "definition.macro.scope" "parent"))
 
 (macro_declaration
-  name: [
-    (identifier) @local.definition.macro
-    (accent_quoted) @local.definition.macro
-    (exported_symbol (identifier) @local.definition.macro)
-    (exported_symbol (accent_quoted) @local.definition.macro)
-  ]
+  name:
+    [
+      (identifier) @local.definition.macro
+      (accent_quoted) @local.definition.macro
+      (exported_symbol
+        (identifier) @local.definition.macro)
+      (exported_symbol
+        (accent_quoted) @local.definition.macro)
+    ]
   (#set! "definition.macro.scope" "parent"))
 
 ; ==============================================================================
 ; @local.definition.type       ; types or classes
-
 (type_declaration
   (type_symbol_declaration
-    name: [
-      (identifier) @local.definition.type
-      (accent_quoted) @local.definition.type
-      (exported_symbol (identifier) @local.definition.type)
-      (exported_symbol (accent_quoted) @local.definition.type)
-    ]))
+    name:
+      [
+        (identifier) @local.definition.type
+        (accent_quoted) @local.definition.type
+        (exported_symbol
+          (identifier) @local.definition.type)
+        (exported_symbol
+          (accent_quoted) @local.definition.type)
+      ]))
 
 ; ==============================================================================
 ; @local.definition.field      ; fields or properties
-
 ; object_declaration
 ; variant_declaration
 ; conditional_declaration
@@ -201,29 +246,31 @@
 (field_declaration
   (symbol_declaration_list
     (symbol_declaration
-      name: [
-        (identifier) @local.definition.field
-        (accent_quoted) @local.definition.field
-        (exported_symbol (identifier) @local.definition.field)
-        (exported_symbol (accent_quoted) @local.definition.field)
-      ]))
+      name:
+        [
+          (identifier) @local.definition.field
+          (accent_quoted) @local.definition.field
+          (exported_symbol
+            (identifier) @local.definition.field)
+          (exported_symbol
+            (accent_quoted) @local.definition.field)
+        ]))
   type: (type_expression)? @local.definition.associated)
 
 ; ==============================================================================
 ; @local.definition.enum       ; enumerations
-
 (enum_declaration
   (enum_field_declaration
     (symbol_declaration
-      name: [
-        (identifier) @local.definition.enum
-        (accent_quoted) @local.definition.enum
-      ])))
+      name:
+        [
+          (identifier) @local.definition.enum
+          (accent_quoted) @local.definition.enum
+        ])))
 
 ; ==============================================================================
 ; @local.definition.namespace  ; modules or namespaces
 ; @local.definition.import     ; imported names
-
 (import_statement
   (expression_list
     (identifier) @local.definition.namespace))
@@ -238,28 +285,30 @@
   (expression_list
     (infix_expression
       operator: (operator) @_operator
-      right: [
-        (identifier) @local.definition.namespace
-        (array_construction (identifier) @local.definition.namespace)
-      ]))
+      right:
+        [
+          (identifier) @local.definition.namespace
+          (array_construction
+            (identifier) @local.definition.namespace)
+        ]))
   (#eq? @_operator "/"))
 
 (import_from_statement
-  module: (infix_expression
-    operator: (operator) @_operator
-    right: (identifier) @local.definition.namespace)
-  (expression_list [
-    (identifier) @local.definition.import
-    (accent_quoted) @local.definition.import
-  ])
+  module:
+    (infix_expression
+      operator: (operator) @_operator
+      right: (identifier) @local.definition.namespace)
+  (expression_list
+    [
+      (identifier) @local.definition.import
+      (accent_quoted) @local.definition.import
+    ])
   (#eq? @_operator "/"))
 
 ; ==============================================================================
 ; @local.scope                 ; scope block
-
 ; (when)
 ; NOTE: `when` does actually not create a scope
-
 (if
   consequence: (statement_list) @local.scope
   alternative: (elif_branch)* @local.scope
@@ -280,7 +329,6 @@
   (while)
   (block)
   (static_statement)
-
   (proc_declaration)
   (func_declaration)
   (method_declaration)
@@ -288,16 +336,14 @@
   (converter_declaration)
   (template_declaration)
   (macro_declaration)
-
   (proc_expression)
   (func_expression)
   (iterator_expression)
-
   (concept_declaration)
 ] @local.scope
 
 ; ==============================================================================
 ; @local.reference             ; identifier reference
-
 (identifier) @local.reference
+
 (accent_quoted) @local.reference
diff --git a/queries/nim_format_string/highlights.scm b/queries/nim_format_string/highlights.scm
index b30ecbbef..44fc80260 100644
--- a/queries/nim_format_string/highlights.scm
+++ b/queries/nim_format_string/highlights.scm
@@ -1,6 +1,7 @@
 (string_literal)
-(matching_curlies 
-  opening_curly: (opening_curly) @punctuation.special 
+
+(matching_curlies
+  opening_curly: (opening_curly) @punctuation.special
   equals: (equals)? @punctuation.special
   closing_curly: (closing_curly) @punctuation.special)
 
@@ -14,6 +15,7 @@
   precision: (precision)? @number
   type: (type)? @type)
 
-(matching_curlies 
-  nim_expression: (nim_expression 
-    escaped_curly: (escaped_curly)+ @string.escape) @none)
+(matching_curlies
+  nim_expression:
+    (nim_expression
+      escaped_curly: (escaped_curly)+ @string.escape) @none)
diff --git a/queries/nim_format_string/injections.scm b/queries/nim_format_string/injections.scm
index 0775fba0c..3efbfb854 100644
--- a/queries/nim_format_string/injections.scm
+++ b/queries/nim_format_string/injections.scm
@@ -1,2 +1,4 @@
-((matching_curlies (nim_expression !escaped_curly) @injection.content)
+((matching_curlies
+  (nim_expression
+    !escaped_curly) @injection.content)
   (#set! injection.language "nim"))
diff --git a/queries/ninja/highlights.scm b/queries/ninja/highlights.scm
index 5f87ff6b5..d216c3f71 100644
--- a/queries/ninja/highlights.scm
+++ b/queries/ninja/highlights.scm
@@ -10,9 +10,7 @@
   "subninja"
 ] @keyword.import
 
-[
-  ":"
-] @punctuation.delimiter
+":" @punctuation.delimiter
 
 [
   "="
@@ -27,74 +25,76 @@
   "}"
 ] @punctuation.special
 
-;;
-;; Names
-;; =====
-(pool      name: (identifier) @type)
-(rule      name: (identifier) @function)
-(let       name: (identifier) @constant)
-(expansion       (identifier) @constant)
-(build     rule: (identifier) @function)
+;
+; Names
+; =====
+(pool
+  name: (identifier) @type)
 
-;;
-;; Paths and Text
-;; ==============
+(rule
+  name: (identifier) @function)
+
+(let
+  name: (identifier) @constant)
+
+(expansion
+  (identifier) @constant)
+
+(build
+  rule: (identifier) @function)
+
+;
+; Paths and Text
+; ==============
 (path) @string.special.path
+
 (text) @string
 
-;;
-;; Builtins
-;; ========
-(pool  name: (identifier) @type.builtin
-                (#any-of? @type.builtin "console"))
-(build rule: (identifier) @function.builtin
-                (#any-of? @function.builtin "phony" "dyndep"))
+;
+; Builtins
+; ========
+(pool
+  name: (identifier) @type.builtin
+  (#any-of? @type.builtin "console"))
 
-;; Top level bindings
-;; ------------------
+(build
+  rule: (identifier) @function.builtin
+  (#any-of? @function.builtin "phony" "dyndep"))
+
+; Top level bindings
+; ------------------
 (manifest
-  (let name: ((identifier) @constant.builtin
-                 (#any-of? @constant.builtin "builddir"
-                                             "ninja_required_version"))))
+  (let
+    name:
+      ((identifier) @constant.builtin
+        (#any-of? @constant.builtin "builddir" "ninja_required_version"))))
 
-;; Rules bindings
-;; -----------------
+; Rules bindings
+; -----------------
 (rule
   (body
-    (let name: (identifier)  @constant.builtin
-               (#not-any-of? @constant.builtin "command"
-                                               "depfile"
-                                               "deps"
-                                               "msvc_deps_prefix"
-                                               "description"
-                                               "dyndep"
-                                               "generator"
-                                               "in"
-                                               "in_newline"
-                                               "out"
-                                               "restat"
-                                               "rspfile"
-                                               "rspfile_content"
-                                               "pool"))))
+    (let
+      name: (identifier) @constant.builtin
+      (#not-any-of? @constant.builtin "command" "depfile" "deps" "msvc_deps_prefix" "description" "dyndep" "generator" "in" "in_newline" "out" "restat" "rspfile" "rspfile_content" "pool"))))
 
-;;
-;; Expansion
-;; ---------
+;
+; Expansion
+; ---------
 (expansion
   (identifier) @constant.macro
-     (#any-of? @constant.macro "in" "out"))
+  (#any-of? @constant.macro "in" "out"))
 
-;;
-;; Escape sequences
-;; ================
+;
+; Escape sequences
+; ================
 (quote) @string.escape
 
-;;
-;; Others
-;; ======
+;
+; Others
+; ======
 [
- (split)
- (comment)
+  (split)
+  (comment)
 ] @comment
 
 (comment) @spell
diff --git a/queries/ninja/indents.scm b/queries/ninja/indents.scm
index 19f20dff5..80344cdfb 100644
--- a/queries/ninja/indents.scm
+++ b/queries/ninja/indents.scm
@@ -3,4 +3,3 @@
   (rule)
   (build)
 ] @indent.begin
-
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index bcabbbc65..57f4c11b8 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -33,11 +33,19 @@
 (comment) @comment @spell
 
 ; strings
-([ (string_expression) (indented_string_expression) ]
+([
+  (string_expression)
+  (indented_string_expression)
+]
   (#set! "priority" 99)) @string
 
 ; paths and URLs
-[ (path_expression) (hpath_expression) (spath_expression) ] @string.special.path
+[
+  (path_expression)
+  (hpath_expression)
+  (spath_expression)
+] @string.special.path
+
 (uri_expression) @string.special.url
 
 ; escape sequences
@@ -76,8 +84,9 @@
 
 ; function calls
 (apply_expression
-  function: (variable_expression
-    name: (identifier) @function.call))
+  function:
+    (variable_expression
+      name: (identifier) @function.call))
 
 ; basic identifiers
 (variable_expression) @variable
@@ -92,58 +101,86 @@
 
 ; builtin functions (with builtins prefix)
 (select_expression
-  expression: (variable_expression name: (identifier) @_id)
-  attrpath: (attrpath attr: (identifier) @function.builtin)
-  (#eq? @_id "builtins")
-)
+  expression:
+    (variable_expression
+      name: (identifier) @_id)
+  attrpath:
+    (attrpath
+      attr: (identifier) @function.builtin)
+  (#eq? @_id "builtins"))
 
 ; builtin functions (without builtins prefix)
-(variable_expression name: (identifier) @function.builtin 
+(variable_expression
+  name: (identifier) @function.builtin
   ; format-ignore
   (#any-of? @function.builtin
     ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
     "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap" "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength" "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose" "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext" "unsafeGetAttrPos" "zipAttrsWith"
     ; primops, `__<tab>` in `nix repl`
-   "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort"))
-
+   "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort")
+  )
 ; constants
-(variable_expression name: (identifier) @constant.builtin 
+(variable_expression
+  name: (identifier) @constant.builtin
   ; format-ignore
   (#any-of? @constant.builtin
     ; nix eval --impure --expr 'with builtins; filter (x: !(isFunction builtins.${x} || isBool builtins.${x})) (attrNames builtins)'
     "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"))
 
 ; string interpolation (this was very annoying to get working properly)
-(interpolation "${" @punctuation.special (_) "}" @punctuation.special) @none
+(interpolation
+  "${" @punctuation.special
+  (_)
+  "}" @punctuation.special) @none
 
 (select_expression
   expression: (_) @_expr
-  attrpath: (attrpath attr: (identifier) @variable.member)
-  (#not-eq? @_expr "builtins")
-)
-(attrset_expression (binding_set (binding . (attrpath (identifier) @variable.member))))
-(rec_attrset_expression (binding_set (binding . (attrpath (identifier) @variable.member))))
+  attrpath:
+    (attrpath
+      attr: (identifier) @variable.member)
+  (#not-eq? @_expr "builtins"))
+
+(attrset_expression
+  (binding_set
+    (binding
+      .
+      (attrpath
+        (identifier) @variable.member))))
+
+(rec_attrset_expression
+  (binding_set
+    (binding
+      .
+      (attrpath
+        (identifier) @variable.member))))
 
 ; function definition
-(binding 
-  attrpath: (attrpath attr: (identifier) @function)
+(binding
+  attrpath:
+    (attrpath
+      attr: (identifier) @function)
   expression: (function_expression))
 
 ; unary operators
-(unary_expression operator: _ @operator)
+(unary_expression
+  operator: _ @operator)
 
 ; binary operators
-(binary_expression operator: _ @operator)
+(binary_expression
+  operator: _ @operator)
 
 ; integers, also highlight a unary -
 [
-  (unary_expression "-" (integer_expression))
+  (unary_expression
+    "-"
+    (integer_expression))
   (integer_expression)
 ] @number
 
 ; floats, also highlight a unary -
 [
-  (unary_expression "-" (float_expression))
+  (unary_expression
+    "-"
+    (float_expression))
   (float_expression)
 ] @number.float
-
diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index c2c31c44e..5d86d3697 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -1,140 +1,206 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((comment) @injection.language
   . ; this is to make sure only adjacent comments are accounted for the injections
   [
-    (string_expression (string_fragment) @injection.content)
-    (indented_string_expression (string_fragment) @injection.content)
+    (string_expression
+      (string_fragment) @injection.content)
+    (indented_string_expression
+      (string_fragment) @injection.content)
   ]
   (#gsub! @injection.language "/%*%s*([%w%p]+)%s*%*/" "%1")
   (#set! injection.combined))
 
 (apply_expression
   function: (_) @_func
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "regex")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "regex")))
-  ]
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "regex")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "regex")))
+    ]
   (#match? @_func "(^|\\.)match$")
   (#set! injection.combined))
 
 (binding
-  attrpath: (attrpath (identifier) @_path)
-  expression: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "bash")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "bash")))
-  ]
-  (#match? @_path "(^\\w+(Phase|Hook)|(pre|post)[A-Z]\\w+|script)$"))
+  attrpath:
+    (attrpath
+      (identifier) @_path)
+  expression:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "bash")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "bash")))
+    ]
+  (#match? @_path "(^\\w+(Phase|Hook|Check)|(pre|post)[A-Z]\\w+|script)$"))
 
 (apply_expression
   function: (_) @_func
-  argument: (_ (_)* (_ (_)* (binding
-    attrpath: (attrpath (identifier) @_path)
-    expression: [
-      (string_expression 
-        ((string_fragment) @injection.content (#set! injection.language "bash")))
-      (indented_string_expression 
-        ((string_fragment) @injection.content (#set! injection.language "bash")))
-    ])))
+  argument:
+    (_
+      (_)*
+      (_
+        (_)*
+        (binding
+          attrpath:
+            (attrpath
+              (identifier) @_path)
+          expression:
+            [
+              (string_expression
+                ((string_fragment) @injection.content
+                  (#set! injection.language "bash")))
+              (indented_string_expression
+                ((string_fragment) @injection.content
+                  (#set! injection.language "bash")))
+            ])))
   (#match? @_func "(^|\\.)writeShellApplication$")
   (#match? @_path "^text$")
   (#set! injection.combined))
 
 (apply_expression
-  function: (apply_expression
-    function: (apply_expression function: (_) @_func))
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "bash")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "bash")))
-  ]
+  function:
+    (apply_expression
+      function:
+        (apply_expression
+          function: (_) @_func))
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "bash")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "bash")))
+    ]
   (#match? @_func "(^|\\.)runCommand((No)?CC)?(Local)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression function: (_) @_func)
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "bash")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "bash")))
-  ])
+  function:
+    (apply_expression
+      function: (_) @_func)
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "bash")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "bash")))
+    ])
   (#match? @_func "(^|\\.)write(Bash|Dash|ShellScript)(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression function: (_) @_func)
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "fish")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "fish")))
-  ])
+  function:
+    (apply_expression
+      function: (_) @_func)
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "fish")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "fish")))
+    ])
   (#match? @_func "(^|\\.)writeFish(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression
-    function: (apply_expression function: (_) @_func))
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "haskell")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "haskell")))
-  ])
+  function:
+    (apply_expression
+      function:
+        (apply_expression
+          function: (_) @_func))
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "haskell")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "haskell")))
+    ])
   (#match? @_func "(^|\\.)writeHaskell(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression
-    function: (apply_expression function: (_) @_func))
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "javascript")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "javascript")))
-  ])
+  function:
+    (apply_expression
+      function:
+        (apply_expression
+          function: (_) @_func))
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "javascript")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "javascript")))
+    ])
   (#match? @_func "(^|\\.)writeJS(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression
-    function: (apply_expression function: (_) @_func))
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "perl")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "perl")))
-  ])
+  function:
+    (apply_expression
+      function:
+        (apply_expression
+          function: (_) @_func))
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "perl")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "perl")))
+    ])
   (#match? @_func "(^|\\.)writePerl(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression
-    function: (apply_expression function: (_) @_func))
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "python")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "python")))
-  ])
+  function:
+    (apply_expression
+      function:
+        (apply_expression
+          function: (_) @_func))
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "python")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "python")))
+    ])
   (#match? @_func "(^|\\.)write(PyPy|Python)[23](Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression
-    function: (apply_expression function: (_) @_func))
-  argument: [
-    (string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "rust")))
-    (indented_string_expression 
-      ((string_fragment) @injection.content (#set! injection.language "rust")))
-  ])
+  function:
+    (apply_expression
+      function:
+        (apply_expression
+          function: (_) @_func))
+  argument:
+    [
+      (string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "rust")))
+      (indented_string_expression
+        ((string_fragment) @injection.content
+          (#set! injection.language "rust")))
+    ])
   (#match? @_func "(^|\\.)writeRust(Bin)?$")
   (#set! injection.combined))
diff --git a/queries/nix/locals.scm b/queries/nix/locals.scm
index 1871f0404..61cab2309 100644
--- a/queries/nix/locals.scm
+++ b/queries/nix/locals.scm
@@ -1,15 +1,34 @@
 ; let bindings
-(let_expression (binding_set (binding . (attrpath) @local.definition.var))) @local.scope
+(let_expression
+  (binding_set
+    (binding
+      .
+      (attrpath) @local.definition.var))) @local.scope
 
 ; rec attrsets
-(rec_attrset_expression (binding_set (binding . (attrpath) @local.definition.field))) @local.scope
+(rec_attrset_expression
+  (binding_set
+    (binding
+      .
+      (attrpath) @local.definition.field))) @local.scope
 
 ; functions and parameters
-(function_expression . [
+(function_expression
+  .
+  [
     (identifier) @local.definition.parameter
-    (formals (formal . (identifier) @local.definition.parameter))
-]) @local.scope
-((formals) "@" (identifier) @local.definition.parameter) ; I couldn't get this to work properly inside the (function)
+    (formals
+      (formal
+        .
+        (identifier) @local.definition.parameter))
+  ]) @local.scope
 
-(variable_expression (identifier) @local.reference)
-(inherited_attrs attr: (identifier) @local.reference)
+((formals)
+  "@"
+  (identifier) @local.definition.parameter) ; I couldn't get this to work properly inside the (function)
+
+(variable_expression
+  (identifier) @local.reference)
+
+(inherited_attrs
+  attr: (identifier) @local.reference)
diff --git a/queries/nqc/highlights.scm b/queries/nqc/highlights.scm
index 2198426ca..d1ff8de9c 100644
--- a/queries/nqc/highlights.scm
+++ b/queries/nqc/highlights.scm
@@ -1,13 +1,10 @@
 ; inherits: c
-
 [
   "task"
   "sub"
 ] @keyword.function
 
-[
-  "until"
-] @keyword.repeat
+"until" @keyword.repeat
 
 [
   "acquire"
diff --git a/queries/objc/folds.scm b/queries/objc/folds.scm
index b922f8bf8..90469b9c3 100644
--- a/queries/objc/folds.scm
+++ b/queries/objc/folds.scm
@@ -1,5 +1,4 @@
 ; inherits: c
-
 [
   (class_declaration)
   (class_interface)
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index 129a74e89..dfb513a07 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -1,20 +1,19 @@
 ; inherits: c
-
 ; Preprocs
-
 (preproc_undef
   name: (_) @constant) @keyword.directive
 
 ; Includes
-
-(module_import "@import" @keyword.import path: (identifier) @module)
+(module_import
+  "@import" @keyword.import
+  path: (identifier) @module)
 
 ((preproc_include
-  _ @keyword.import path: (_))
+  _ @keyword.import
+  path: (_))
   (#any-of? @keyword.import "#include" "#import"))
 
 ; Type Qualifiers
-
 [
   "@optional"
   "@required"
@@ -24,7 +23,6 @@
 ] @type.qualifier
 
 ; Storageclasses
-
 [
   "@autoreleasepool"
   "@synthesize"
@@ -34,7 +32,6 @@
 ] @keyword.storage
 
 ; Keywords
-
 [
   "@protocol"
   "@interface"
@@ -47,10 +44,21 @@
   "@end"
 ] @keyword
 
-(class_declaration "@" @keyword "class" @keyword) ; I hate Obj-C for allowing "@ class" :)
+(class_declaration
+  "@" @keyword
+  "class" @keyword) ; I hate Obj-C for allowing "@ class" :)
 
-(method_definition ["+" "-"] @keyword.function)
-(method_declaration ["+" "-"] @keyword.function)
+(method_definition
+  [
+    "+"
+    "-"
+  ] @keyword.function)
+
+(method_declaration
+  [
+    "+"
+    "-"
+  ] @keyword.function)
 
 [
   "__typeof__"
@@ -65,7 +73,6 @@
 ] @keyword.coroutine
 
 ; Exceptions
-
 [
   "@try"
   "__try"
@@ -77,12 +84,10 @@
 ] @keyword.exception
 
 ; Variables
-
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "self" "super"))
 
 ; Functions & Methods
-
 [
   "objc_bridge_related"
   "@available"
@@ -91,34 +96,59 @@
   "asm"
 ] @function.builtin
 
-(method_definition (identifier) @function.method)
+(method_definition
+  (identifier) @function.method)
 
-(method_declaration (identifier) @function.method)
+(method_declaration
+  (identifier) @function.method)
 
-(method_identifier (identifier)? @function.method ":" @function.method (identifier)? @function.method)
+(method_identifier
+  (identifier)? @function.method
+  ":" @function.method
+  (identifier)? @function.method)
 
-(message_expression method: (identifier) @function.method.call)
+(message_expression
+  method: (identifier) @function.method.call)
 
 ; Constructors
-
-((message_expression method: (identifier) @constructor)
+((message_expression
+  method: (identifier) @constructor)
   (#eq? @constructor "init"))
 
 ; Attributes
-
-(availability_attribute_specifier 
+(availability_attribute_specifier
   [
-    "CF_FORMAT_FUNCTION" "NS_AVAILABLE" "__IOS_AVAILABLE" "NS_AVAILABLE_IOS"
-    "API_AVAILABLE" "API_UNAVAILABLE" "API_DEPRECATED" "NS_ENUM_AVAILABLE_IOS"
-    "NS_DEPRECATED_IOS" "NS_ENUM_DEPRECATED_IOS" "NS_FORMAT_FUNCTION" "DEPRECATED_MSG_ATTRIBUTE"
-    "__deprecated_msg" "__deprecated_enum_msg" "NS_SWIFT_NAME" "NS_SWIFT_UNAVAILABLE"
-    "NS_EXTENSION_UNAVAILABLE_IOS" "NS_CLASS_AVAILABLE_IOS" "NS_CLASS_DEPRECATED_IOS" "__OSX_AVAILABLE_STARTING"
-    "NS_ROOT_CLASS" "NS_UNAVAILABLE" "NS_REQUIRES_NIL_TERMINATION" "CF_RETURNS_RETAINED"
-    "CF_RETURNS_NOT_RETAINED" "DEPRECATED_ATTRIBUTE" "UI_APPEARANCE_SELECTOR" "UNAVAILABLE_ATTRIBUTE"
+    "CF_FORMAT_FUNCTION"
+    "NS_AVAILABLE"
+    "__IOS_AVAILABLE"
+    "NS_AVAILABLE_IOS"
+    "API_AVAILABLE"
+    "API_UNAVAILABLE"
+    "API_DEPRECATED"
+    "NS_ENUM_AVAILABLE_IOS"
+    "NS_DEPRECATED_IOS"
+    "NS_ENUM_DEPRECATED_IOS"
+    "NS_FORMAT_FUNCTION"
+    "DEPRECATED_MSG_ATTRIBUTE"
+    "__deprecated_msg"
+    "__deprecated_enum_msg"
+    "NS_SWIFT_NAME"
+    "NS_SWIFT_UNAVAILABLE"
+    "NS_EXTENSION_UNAVAILABLE_IOS"
+    "NS_CLASS_AVAILABLE_IOS"
+    "NS_CLASS_DEPRECATED_IOS"
+    "__OSX_AVAILABLE_STARTING"
+    "NS_ROOT_CLASS"
+    "NS_UNAVAILABLE"
+    "NS_REQUIRES_NIL_TERMINATION"
+    "CF_RETURNS_RETAINED"
+    "CF_RETURNS_NOT_RETAINED"
+    "DEPRECATED_ATTRIBUTE"
+    "UI_APPEARANCE_SELECTOR"
+    "UNAVAILABLE_ATTRIBUTE"
   ]) @attribute
 
 ; Macros
-
 (type_qualifier
   [
     "_Complex"
@@ -145,22 +175,38 @@
     "__weak"
   ]) @function.macro.builtin
 
-[ "__real" "__imag" ] @function.macro.builtin
+[
+  "__real"
+  "__imag"
+] @function.macro.builtin
 
-((call_expression function: (identifier) @function.macro)
+((call_expression
+  function: (identifier) @function.macro)
   (#eq? @function.macro "testassert"))
 
 ; Types
+(class_declaration
+  (identifier) @type)
 
-(class_declaration (identifier) @type)
+(class_interface
+  "@interface"
+  .
+  (identifier) @type
+  superclass: _? @type
+  category: _? @module)
 
-(class_interface "@interface" . (identifier) @type superclass: _? @type category: _? @module)
+(class_implementation
+  "@implementation"
+  .
+  (identifier) @type
+  superclass: _? @type
+  category: _? @module)
 
-(class_implementation "@implementation" . (identifier) @type superclass: _? @type category: _? @module)
+(protocol_forward_declaration
+  (identifier) @type) ; @interface :(
 
-(protocol_forward_declaration (identifier) @type) ; @interface :(
-
-(protocol_reference_list (identifier) @type) ; ^
+(protocol_reference_list
+  (identifier) @type) ; ^
 
 [
   "BOOL"
@@ -171,46 +217,53 @@
 ] @type.builtin
 
 ; Constants
+(property_attribute
+  (identifier) @constant
+  "="?)
 
-(property_attribute (identifier) @constant "="?)
-
-[ "__asm" "__asm__" ] @constant.macro
+[
+  "__asm"
+  "__asm__"
+] @constant.macro
 
 ; Properties
-
-(property_implementation "@synthesize" (identifier) @property)
+(property_implementation
+  "@synthesize"
+  (identifier) @property)
 
 ((identifier) @property
   (#has-ancestor? @property struct_declaration))
 
 ; Parameters
+(method_parameter
+  ":" @function.method
+  (identifier) @variable.parameter)
 
-(method_parameter ":" @function.method (identifier) @variable.parameter)
+(method_parameter
+  declarator: (identifier) @variable.parameter)
 
-(method_parameter declarator: (identifier) @variable.parameter)
-
-(parameter_declaration 
-  declarator: (function_declarator 
-                declarator: (parenthesized_declarator 
-                              (block_pointer_declarator 
-                                declarator: (identifier) @variable.parameter))))
+(parameter_declaration
+  declarator:
+    (function_declarator
+      declarator:
+        (parenthesized_declarator
+          (block_pointer_declarator
+            declarator: (identifier) @variable.parameter))))
 
 "..." @variable.parameter.builtin
 
 ; Operators
-
-[
-  "^"
-] @operator
+"^" @operator
 
 ; Literals
-
 (platform) @string.special
 
 (version_number) @string.special
 
 ; Punctuation
-
 "@" @punctuation.special
 
-[ "<" ">" ] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
diff --git a/queries/objc/injections.scm b/queries/objc/injections.scm
index 359420d10..f5d13f38e 100644
--- a/queries/objc/injections.scm
+++ b/queries/objc/injections.scm
@@ -1,5 +1,4 @@
 ; inherits: c
-
 ; TODO(amaanq): uncomment/add when I add asm support
 ; (ms_asm_block "{" _ @asm "}")
 ;
diff --git a/queries/objdump/highlights.scm b/queries/objdump/highlights.scm
index 7532260a6..b73e18803 100644
--- a/queries/objdump/highlights.scm
+++ b/queries/objdump/highlights.scm
@@ -16,20 +16,45 @@
 (section_address) @string.special
 
 (identifier) @variable
-(code_location (identifier) @function.call)
-(header (identifier) @keyword)
-(disassembly_section_label (identifier) @module)
-(disassembly_section (identifier) @module)
 
-[(file_offset) (discriminator)] @variable.member
+(code_location
+  (identifier) @function.call)
+
+(header
+  (identifier) @keyword)
+
+(disassembly_section_label
+  (identifier) @module)
+
+(disassembly_section
+  (identifier) @module)
+
+[
+  (file_offset)
+  (discriminator)
+] @variable.member
 
 (file_path) @string.special.path
+
 (instruction) @function
+
 (bad_instruction) @comment.warning
+
 (label) @label
 
-["<" ">"] @punctuation.special
-["(" ")"] @punctuation.bracket
-["+" ":"] @punctuation.delimiter
+[
+  "<"
+  ">"
+] @punctuation.special
+
+[
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  "+"
+  ":"
+] @punctuation.delimiter
 
 (comment) @comment.documentation
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index d08c8e358..99151efdc 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -1,86 +1,109 @@
 ; Modules
 ;--------
-
-[(module_name) (module_type_name)] @module
+[
+  (module_name)
+  (module_type_name)
+] @module
 
 ; Types
 ;------
+((type_constructor) @type.builtin
+  (#any-of? @type.builtin "int" "char" "bytes" "string" "float" "bool" "unit" "exn" "array" "list" "option" "int32" "int64" "nativeint" "format6" "lazy_t"))
 
-(
-  (type_constructor) @type.builtin
-  (#any-of? @type.builtin
-    "int" "char" "bytes" "string" "float"
-    "bool" "unit" "exn" "array" "list" "option"
-    "int32" "int64" "nativeint" "format6" "lazy_t")
-)
+[
+  (class_name)
+  (class_type_name)
+  (type_constructor)
+] @type
 
-[(class_name) (class_type_name) (type_constructor)] @type
-
-[(constructor_name) (tag)] @constructor
+[
+  (constructor_name)
+  (tag)
+] @constructor
 
 ; Variables
 ;----------
-
-[(value_name) (type_variable)] @variable
+[
+  (value_name)
+  (type_variable)
+] @variable
 
 (value_pattern) @variable.parameter
 
 ; Functions
 ;----------
-
 (let_binding
   pattern: (value_name) @function
   (parameter))
 
 (let_binding
   pattern: (value_name) @function
-  body: [(fun_expression) (function_expression)])
+  body:
+    [
+      (fun_expression)
+      (function_expression)
+    ])
 
-(value_specification (value_name) @function)
+(value_specification
+  (value_name) @function)
 
-(external (value_name) @function)
+(external
+  (value_name) @function)
 
 (method_name) @function.method
 
 ; Application
 ;------------
-
 (infix_expression
-  left: (value_path (value_name) @function.call)
+  left:
+    (value_path
+      (value_name) @function.call)
   operator: (concat_operator) @_operator
   (#eq? @_operator "@@"))
 
 (infix_expression
   operator: (rel_operator) @_operator
-  right: (value_path (value_name) @function.call)
+  right:
+    (value_path
+      (value_name) @function.call)
   (#eq? @_operator "|>"))
 
 (application_expression
-  function: (value_path (value_name) @function.call))
+  function:
+    (value_path
+      (value_name) @function.call))
 
 ((value_name) @function.builtin
   (#any-of? @function.builtin "raise" "raise_notrace" "failwith" "invalid_arg"))
 
 ; Properties
 ;-----------
-
-[(label_name) (field_name) (instance_variable_name)] @property
+[
+  (label_name)
+  (field_name)
+  (instance_variable_name)
+] @property
 
 ; Constants
 ;----------
-
 ; Don't let normal parens take priority over this
-((unit) @constant.builtin (#set! "priority" 105))
+((unit) @constant.builtin
+  (#set! "priority" 105))
 
 (boolean) @boolean
 
-[(number) (signed_number)] @number
+[
+  (number)
+  (signed_number)
+] @number
 
 (character) @character
 
 (string) @string
 
-(quoted_string "{" @string "}" @string) @string
+(quoted_string
+  "{" @string
+  "}" @string) @string
 
 (escape_sequence) @string.escape
 
@@ -91,55 +114,162 @@
 
 ; Keywords
 ;---------
-
 [
-  "and" "as" "assert" "begin" "class"
-  "constraint" "end" "external" "in"
-  "inherit" "initializer" "let" "match"
-  "method" "module" "new" "object" "of"
-  "sig" "struct" "type" "val" "when" "with"
+  "and"
+  "as"
+  "assert"
+  "begin"
+  "class"
+  "constraint"
+  "end"
+  "external"
+  "in"
+  "inherit"
+  "initializer"
+  "let"
+  "match"
+  "method"
+  "module"
+  "new"
+  "object"
+  "of"
+  "sig"
+  "struct"
+  "type"
+  "val"
+  "when"
+  "with"
 ] @keyword
 
 [
-  "lazy" "mutable" "nonrec"
-  "rec" "private" "virtual"
+  "lazy"
+  "mutable"
+  "nonrec"
+  "rec"
+  "private"
+  "virtual"
 ] @type.qualifier
 
-["fun" "function" "functor"] @keyword.function
+[
+  "fun"
+  "function"
+  "functor"
+] @keyword.function
 
-["if" "then" "else"] @keyword.conditional
+[
+  "if"
+  "then"
+  "else"
+] @keyword.conditional
 
-["exception" "try"] @keyword.exception
+[
+  "exception"
+  "try"
+] @keyword.exception
 
-["include" "open"] @keyword.import
+[
+  "include"
+  "open"
+] @keyword.import
 
-["for" "to" "downto" "while" "do" "done"] @keyword.repeat
+[
+  "for"
+  "to"
+  "downto"
+  "while"
+  "do"
+  "done"
+] @keyword.repeat
 
 ; Punctuation
 ;------------
+(attribute
+  [
+    "[@"
+    "]"
+  ] @punctuation.special)
 
-(attribute ["[@" "]"] @punctuation.special)
-(item_attribute ["[@@" "]"] @punctuation.special)
-(floating_attribute ["[@@@" "]"] @punctuation.special)
-(extension ["[%" "]"] @punctuation.special)
-(item_extension ["[%%" "]"] @punctuation.special)
-(quoted_extension ["{%" "}"] @punctuation.special)
-(quoted_item_extension ["{%%" "}"] @punctuation.special)
+(item_attribute
+  [
+    "[@@"
+    "]"
+  ] @punctuation.special)
+
+(floating_attribute
+  [
+    "[@@@"
+    "]"
+  ] @punctuation.special)
+
+(extension
+  [
+    "[%"
+    "]"
+  ] @punctuation.special)
+
+(item_extension
+  [
+    "[%%"
+    "]"
+  ] @punctuation.special)
+
+(quoted_extension
+  [
+    "{%"
+    "}"
+  ] @punctuation.special)
+
+(quoted_item_extension
+  [
+    "{%%"
+    "}"
+  ] @punctuation.special)
 
 "%" @punctuation.special
 
-["(" ")" "[" "]" "{" "}" "[|" "|]" "[<" "[>"] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "[|"
+  "|]"
+  "[<"
+  "[>"
+] @punctuation.bracket
 
-(object_type ["<" ">"] @punctuation.bracket)
+(object_type
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 [
-  "," "." ";" ":" "=" "|" "~" "?" "+" "-" "!" ">" "&"
-  "->" ";;" ":>" "+=" ":=" ".."
+  ","
+  "."
+  ";"
+  ":"
+  "="
+  "|"
+  "~"
+  "?"
+  "+"
+  "-"
+  "!"
+  ">"
+  "&"
+  "->"
+  ";;"
+  ":>"
+  "+="
+  ":="
+  ".."
 ] @punctuation.delimiter
 
 ; Operators
 ;----------
-
 [
   (prefix_operator)
   (sign_operator)
@@ -158,18 +288,31 @@
   (match_operator)
 ] @operator
 
-(match_expression (match_operator) @keyword)
+(match_expression
+  (match_operator) @keyword)
 
-(value_definition [(let_operator) (let_and_operator)] @keyword)
+(value_definition
+  [
+    (let_operator)
+    (let_and_operator)
+  ] @keyword)
 
-["*" "#" "::" "<-"] @operator
+[
+  "*"
+  "#"
+  "::"
+  "<-"
+] @operator
 
 ; Attributes
 ;-----------
-
 (attribute_id) @property
 
 ; Comments
 ;---------
-
-[(comment) (line_number_directive) (directive) (shebang)] @comment @spell
+[
+  (comment)
+  (line_number_directive)
+  (directive)
+  (shebang)
+] @comment @spell
diff --git a/queries/ocaml/indents.scm b/queries/ocaml/indents.scm
index d821abbd7..9181dcadf 100644
--- a/queries/ocaml/indents.scm
+++ b/queries/ocaml/indents.scm
@@ -23,48 +23,55 @@
 ; handle if-else if-else case
 (if_expression
   condition: (_) @indent.begin)
+
 (then_clause) @indent.begin
-((else_clause 
-   (_) @_not_if) @indent.begin
- (#not-has-type? @_not_if if_expression))
+
+((else_clause
+  (_) @_not_if) @indent.begin
+  (#not-has-type? @_not_if if_expression))
 
 ((parameter) @indent.begin
- (#set! indent.start_at_same_line))
+  (#set! indent.start_at_same_line))
 
-(_ (ERROR) @indent.begin
- (#set! indent.start_at_same_line))
-
-(ERROR "|" @indent.begin
- (#set! indent.start_at_same_line))
+(_
+  (ERROR) @indent.begin
+  (#set! indent.start_at_same_line))
 
+(ERROR
+  "|" @indent.begin
+  (#set! indent.start_at_same_line))
 
 (try_expression
   "with" @indent.branch
   [
     (match_case) @indent.dedent
-    (match_case 
+    (match_case
       [
-        (parenthesized_expression) 
+        (parenthesized_expression)
         (list_expression)
       ] @indent.dedent)
-  ]
-)
+  ])
 
-[
-  "}"
-] @indent.branch @indent.end
+"}" @indent.branch @indent.end
 
+(list_expression
+  "]" @indent.branch)
 
-(list_expression "]" @indent.branch)
-(parenthesized_expression ")" @indent.branch)
+(parenthesized_expression
+  ")" @indent.branch)
 
 ";;" @indent.end
 
-(do_clause "done" @indent.end @indent.branch) 
-(structure "end" @indent.end @indent.branch)
-(signature "end" @indent.end @indent.branch)
+(do_clause
+  "done" @indent.end @indent.branch)
+
+(structure
+  "end" @indent.end @indent.branch)
+
+(signature
+  "end" @indent.end @indent.branch)
 
 [
   (string)
-  (comment) 
+  (comment)
 ] @indent.auto
diff --git a/queries/ocaml/injections.scm b/queries/ocaml/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/ocaml/injections.scm
+++ b/queries/ocaml/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/ocaml/locals.scm b/queries/ocaml/locals.scm
index 1230bd013..38f1f15f2 100644
--- a/queries/ocaml/locals.scm
+++ b/queries/ocaml/locals.scm
@@ -1,6 +1,5 @@
 ; Scopes
 ;-------
-
 [
   (compilation_unit)
   (structure)
@@ -22,7 +21,6 @@
 
 ; Definitions
 ;------------
-
 (value_pattern) @local.definition.var
 
 (let_binding
@@ -30,37 +28,49 @@
   (#set! definition.var.scope "parent"))
 
 (let_binding
-  pattern: (tuple_pattern (value_name) @local.definition.var)
+  pattern:
+    (tuple_pattern
+      (value_name) @local.definition.var)
   (#set! definition.var.scope "parent"))
 
 (let_binding
-  pattern: (record_pattern (field_pattern (value_name) @local.definition.var))
+  pattern:
+    (record_pattern
+      (field_pattern
+        (value_name) @local.definition.var))
   (#set! definition.var.scope "parent"))
 
-(external (value_name) @local.definition.var)
+(external
+  (value_name) @local.definition.var)
 
-(type_binding (type_constructor) @local.definition.type)
+(type_binding
+  (type_constructor) @local.definition.type)
 
-(abstract_type (type_constructor) @local.definition.type)
+(abstract_type
+  (type_constructor) @local.definition.type)
 
-(method_definition (method_name) @local.definition.method)
+(method_definition
+  (method_name) @local.definition.method)
 
 (module_binding
   (module_name) @local.definition.namespace
   (#set! definition.namespace.scope "parent"))
 
-(module_parameter (module_name) @local.definition.namespace)
+(module_parameter
+  (module_name) @local.definition.namespace)
 
-(module_type_definition (module_type_name) @local.definition.type)
+(module_type_definition
+  (module_type_name) @local.definition.type)
 
 ; References
 ;------------
-
-(value_path .
+(value_path
+  .
   (value_name) @local.reference
   (#set! reference.kind "var"))
 
-(type_constructor_path .
+(type_constructor_path
+  .
   (type_constructor) @local.reference
   (#set! reference.kind "type"))
 
@@ -68,10 +78,12 @@
   (method_name) @local.reference
   (#set! reference.kind "method"))
 
-(module_path .
+(module_path
+  .
   (module_name) @local.reference
   (#set! reference.kind "type"))
 
-(module_type_path .
+(module_type_path
+  .
   (module_type_name) @local.reference
   (#set! reference.kind "type"))
diff --git a/queries/ocamllex/highlights.scm b/queries/ocamllex/highlights.scm
index 6a5088710..2556aa4c2 100644
--- a/queries/ocamllex/highlights.scm
+++ b/queries/ocamllex/highlights.scm
@@ -1,40 +1,70 @@
 ; Allow OCaml highlighter
-
 (ocaml) @none
 
 ; Regular expressions
-
 (regexp_name) @variable
 
-[(eof) (any)] @constant
+[
+  (eof)
+  (any)
+] @constant
 
 (character) @character
 
 (string) @string
+
 (escape_sequence) @string.escape
 
-(character_set "^" @punctuation.special)
-(character_range "-" @punctuation.delimiter)
+(character_set
+  "^" @punctuation.special)
 
-(regexp_difference ["#"] @operator)
-(regexp_repetition ["?" "*" "+"] @operator)
-(regexp_alternative ["|"] @operator)
+(character_range
+  "-" @punctuation.delimiter)
+
+(regexp_difference
+  "#" @operator)
+
+(regexp_repetition
+  [
+    "?"
+    "*"
+    "+"
+  ] @operator)
+
+(regexp_alternative
+  "|" @operator)
 
 ; Rules
-
 (lexer_entry_name) @function
+
 (lexer_argument) @variable.parameter
 
-(lexer_entry ["=" "|"] @punctuation.delimiter)
+(lexer_entry
+  [
+    "="
+    "|"
+  ] @punctuation.delimiter)
 
 ; keywords
-
-["and" "as" "let" "parse" "refill" "rule" "shortest"] @keyword
+[
+  "and"
+  "as"
+  "let"
+  "parse"
+  "refill"
+  "rule"
+  "shortest"
+] @keyword
 
 ; Punctuation
-
-["[" "]" "(" ")" "{" "}"] @punctuation.bracket
+[
+  "["
+  "]"
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
 
 ; Misc
-
 (comment) @comment @spell
diff --git a/queries/ocamllex/injections.scm b/queries/ocamllex/injections.scm
index ed1d9302a..ecc577d40 100644
--- a/queries/ocamllex/injections.scm
+++ b/queries/ocamllex/injections.scm
@@ -1,5 +1,5 @@
 ((ocaml) @injection.content
- (#set! injection.language "ocaml"))
+  (#set! injection.language "ocaml"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 38896cbfc..f599f6e97 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -1,19 +1,16 @@
 ; Preprocs
-
 [
   (calling_convention)
   (tag)
 ] @keyword.directive
 
 ; Includes
-
 [
   "import"
   "package"
 ] @keyword.import
 
 ; Keywords
-
 [
   "foreign"
   "using"
@@ -29,9 +26,7 @@
   "matrix"
 ] @keyword
 
-[
-  "proc"
-] @keyword.function
+"proc" @keyword.function
 
 [
   "return"
@@ -44,7 +39,6 @@
 ] @keyword.storage
 
 ; Conditionals
-
 [
   "if"
   "else"
@@ -67,7 +61,6 @@
   (#set! "priority" 105))
 
 ; Repeats
-
 [
   "for"
   "do"
@@ -75,116 +68,163 @@
 ] @keyword.repeat
 
 ; Variables
-
 (identifier) @variable
 
 ; Namespaces
+(package_declaration
+  (identifier) @module)
 
-(package_declaration (identifier) @module)
+(import_declaration
+  alias: (identifier) @module)
 
-(import_declaration alias: (identifier) @module)
+(foreign_block
+  (identifier) @module)
 
-(foreign_block (identifier) @module)
-
-(using_statement (identifier) @module)
+(using_statement
+  (identifier) @module)
 
 ; Parameters
+(parameter
+  (identifier) @variable.parameter
+  ":"
+  "="?
+  (identifier)? @constant)
 
-(parameter (identifier) @variable.parameter ":" "="? (identifier)? @constant)
+(default_parameter
+  (identifier) @variable.parameter
+  ":=")
 
-(default_parameter (identifier) @variable.parameter ":=")
+(named_type
+  (identifier) @variable.parameter)
 
-(named_type (identifier) @variable.parameter)
-
-(call_expression argument: (identifier) @variable.parameter "=")
+(call_expression
+  argument: (identifier) @variable.parameter
+  "=")
 
 ; Functions
+(procedure_declaration
+  (identifier) @type)
 
-(procedure_declaration (identifier) @type)
+(procedure_declaration
+  (identifier) @function
+  (procedure
+    (block)))
 
-(procedure_declaration (identifier) @function (procedure (block)))
+(procedure_declaration
+  (identifier) @function
+  (procedure
+    (uninitialized)))
 
-(procedure_declaration (identifier) @function (procedure (uninitialized)))
+(overloaded_procedure_declaration
+  (identifier) @function)
 
-(overloaded_procedure_declaration (identifier) @function)
-
-(call_expression function: (identifier) @function.call)
+(call_expression
+  function: (identifier) @function.call)
 
 ; Types
+(type
+  (identifier) @type)
 
-(type (identifier) @type)
-
-((type (identifier) @type.builtin)
-  (#any-of? @type.builtin
-    "bool" "byte" "b8" "b16" "b32" "b64"
-    "int" "i8" "i16" "i32" "i64" "i128"
-    "uint" "u8" "u16" "u32" "u64" "u128" "uintptr"
-    "i16le" "i32le" "i64le" "i128le" "u16le" "u32le" "u64le" "u128le"
-    "i16be" "i32be" "i64be" "i128be" "u16be" "u32be" "u64be" "u128be"
-    "float" "double" "f16" "f32" "f64" "f16le" "f32le" "f64le" "f16be" "f32be" "f64be"
-    "complex32" "complex64" "complex128" "complex_float" "complex_double"
-    "quaternion64" "quaternion128" "quaternion256"
-    "rune" "string" "cstring" "rawptr" "typeid" "any"))
+((type
+  (identifier) @type.builtin)
+  (#any-of? @type.builtin "bool" "byte" "b8" "b16" "b32" "b64" "int" "i8" "i16" "i32" "i64" "i128" "uint" "u8" "u16" "u32" "u64" "u128" "uintptr" "i16le" "i32le" "i64le" "i128le" "u16le" "u32le" "u64le" "u128le" "i16be" "i32be" "i64be" "i128be" "u16be" "u32be" "u64be" "u128be" "float" "double" "f16" "f32" "f64" "f16le" "f32le" "f64le" "f16be" "f32be" "f64be" "complex32" "complex64" "complex128" "complex_float" "complex_double" "quaternion64" "quaternion128" "quaternion256" "rune" "string" "cstring" "rawptr" "typeid" "any"))
 
 "..." @type.builtin
 
-(struct_declaration (identifier) @type "::")
+(struct_declaration
+  (identifier) @type
+  "::")
 
-(enum_declaration (identifier) @type "::")
+(enum_declaration
+  (identifier) @type
+  "::")
 
-(union_declaration (identifier) @type "::")
+(union_declaration
+  (identifier) @type
+  "::")
 
-(const_declaration (identifier) @type "::" [(array_type) (distinct_type) (bit_set_type) (pointer_type)])
+(const_declaration
+  (identifier) @type
+  "::"
+  [
+    (array_type)
+    (distinct_type)
+    (bit_set_type)
+    (pointer_type)
+  ])
 
-(struct . (identifier) @type)
+(struct
+  .
+  (identifier) @type)
 
-(field_type . (identifier) @module "." (identifier) @type)
+(field_type
+  .
+  (identifier) @module
+  "."
+  (identifier) @type)
 
-(bit_set_type (identifier) @type ";")
+(bit_set_type
+  (identifier) @type
+  ";")
 
-(procedure_type (parameters (parameter (identifier) @type)))
+(procedure_type
+  (parameters
+    (parameter
+      (identifier) @type)))
 
-(polymorphic_parameters (identifier) @type)
+(polymorphic_parameters
+  (identifier) @type)
 
 ((identifier) @type
   (#lua-match? @type "^[A-Z][a-zA-Z0-9]*$")
   (#not-has-parent? @type parameter procedure_declaration))
 
 ; Fields
+(member_expression
+  "."
+  (identifier) @variable.member)
 
-(member_expression "." (identifier) @variable.member)
+(struct_type
+  "{"
+  (identifier) @variable.member)
 
-(struct_type "{" (identifier) @variable.member)
+(struct_field
+  (identifier) @variable.member
+  "="?)
 
-(struct_field (identifier) @variable.member "="?)
-
-(field (identifier) @variable.member)
+(field
+  (identifier) @variable.member)
 
 ; Constants
-
 ((identifier) @constant
   (#lua-match? @constant "^_*[A-Z][A-Z0-9_]*$")
   (#not-has-parent? @constant type parameter))
 
-(member_expression . "." (identifier) @constant)
+(member_expression
+  .
+  "."
+  (identifier) @constant)
 
-(enum_declaration "{" (identifier) @constant)
+(enum_declaration
+  "{"
+  (identifier) @constant)
 
 ; Macros
-
-((call_expression function: (identifier) @function.macro)
+((call_expression
+  function: (identifier) @function.macro)
   (#lua-match? @function.macro "^_*[A-Z][A-Z0-9_]*$"))
 
 ; Attributes
-
-(attribute (identifier) @attribute "="?)
+(attribute
+  (identifier) @attribute
+  "="?)
 
 ; Labels
-
-(label_statement (identifier) @label ":")
+(label_statement
+  (identifier) @label
+  ":")
 
 ; Literals
-
 (number) @number
 
 (float) @number.float
@@ -206,7 +246,6 @@
   (#any-of? @variable.builtin "context" "self"))
 
 ; Operators
-
 [
   ":="
   "="
@@ -259,12 +298,20 @@
 ] @keyword.operator
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
-
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   "::"
@@ -275,14 +322,12 @@
   ";"
 ] @punctuation.delimiter
 
-
 [
   "@"
   "$"
 ] @punctuation.special
 
 ; Comments
-
 [
   (comment)
   (block_comment)
diff --git a/queries/odin/injections.scm b/queries/odin/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/odin/injections.scm
+++ b/queries/odin/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/odin/locals.scm b/queries/odin/locals.scm
index 845a08a48..6c55f8a1a 100644
--- a/queries/odin/locals.scm
+++ b/queries/odin/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (block)
   (declaration)
@@ -7,33 +6,54 @@
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
+(package_declaration
+  (identifier) @local.definition.namespace)
 
-(package_declaration (identifier) @local.definition.namespace)
+(import_declaration
+  alias: (identifier) @local.definition.namespace)
 
-(import_declaration alias: (identifier) @local.definition.namespace)
+(procedure_declaration
+  (identifier) @local.definition.function)
 
-(procedure_declaration (identifier) @local.definition.function)
+(struct_declaration
+  (identifier) @local.definition.type
+  "::")
 
-(struct_declaration (identifier) @local.definition.type "::")
+(enum_declaration
+  (identifier) @local.definition.enum
+  "::")
 
-(enum_declaration (identifier) @local.definition.enum "::")
+(union_declaration
+  (identifier) @local.definition.type
+  "::")
 
-(union_declaration (identifier) @local.definition.type "::")
+(variable_declaration
+  (identifier) @local.definition.var
+  ":=")
 
-(variable_declaration (identifier) @local.definition.var ":=")
+(const_declaration
+  (identifier) @local.definition.constant
+  "::")
 
-(const_declaration (identifier) @local.definition.constant "::")
+(const_type_declaration
+  (identifier) @local.definition.type
+  ":")
 
-(const_type_declaration (identifier) @local.definition.type ":")
+(parameter
+  (identifier) @local.definition.parameter
+  ":"?)
 
-(parameter (identifier) @local.definition.parameter ":"?)
+(default_parameter
+  (identifier) @local.definition.parameter
+  ":=")
 
-(default_parameter (identifier) @local.definition.parameter ":=")
+(field
+  (identifier) @local.definition.field
+  ":")
 
-(field (identifier) @local.definition.field ":")
-
-(label_statement (identifier) @local.definition ":")
+(label_statement
+  (identifier) @local.definition
+  ":")
diff --git a/queries/pascal/folds.scm b/queries/pascal/folds.scm
index 6db2857bf..8fcde3ac0 100644
--- a/queries/pascal/folds.scm
+++ b/queries/pascal/folds.scm
@@ -3,7 +3,6 @@
   (implementation)
   (initialization)
   (finalization)
-
   (if)
   (ifElse)
   (while)
@@ -15,7 +14,6 @@
   (caseCase)
   (asm)
   (with)
-
   (declVar)
   (declConst)
   (declEnum)
@@ -26,8 +24,8 @@
   (defProc)
   (declField)
   (declProp)
-
   (comment)
 ] @fold
 
-(interface (declProc) @fold)
+(interface
+  (declProc) @fold)
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index 088465545..f8788a056 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -1,379 +1,454 @@
 ; -- Keywords
 [
-	(kProgram)
-	(kLibrary)
-	(kUnit)
-
-	(kBegin)
-	(kEnd)
-	(kAsm)
-
-	(kVar)
-	(kThreadvar)
-	(kConst)
-	(kConstref)
-	(kResourcestring)
-	(kOut)
-	(kType)
-	(kLabel)
-	(kExports)
-
-	(kProperty)
-	(kRead)
-	(kWrite)
-	(kImplements)
-
-	(kClass)
-	(kInterface)
-	(kObject)
-	(kRecord)
-	(kObjcclass)
-	(kObjccategory)
-	(kObjcprotocol)
-	(kArray)
-	(kFile)
-	(kString)
-	(kSet)
-	(kOf)
-	(kHelper)
-
-	(kInherited)
-
-	(kGeneric)
-	(kSpecialize)
-
-	(kFunction)
-	(kProcedure)
-	(kConstructor)
-	(kDestructor)
-	(kOperator)
-	(kReference)
-
-	(kInterface)
-	(kImplementation)
-	(kInitialization)
-	(kFinalization)
-
-	(kTry)
-	(kExcept)
-	(kFinally)
-	(kRaise)
-	(kOn)
-	(kCase)
-	(kWith)
-	(kGoto)
+  (kProgram)
+  (kLibrary)
+  (kUnit)
+  (kBegin)
+  (kEnd)
+  (kAsm)
+  (kVar)
+  (kThreadvar)
+  (kConst)
+  (kConstref)
+  (kResourcestring)
+  (kOut)
+  (kType)
+  (kLabel)
+  (kExports)
+  (kProperty)
+  (kRead)
+  (kWrite)
+  (kImplements)
+  (kClass)
+  (kInterface)
+  (kObject)
+  (kRecord)
+  (kObjcclass)
+  (kObjccategory)
+  (kObjcprotocol)
+  (kArray)
+  (kFile)
+  (kString)
+  (kSet)
+  (kOf)
+  (kHelper)
+  (kInherited)
+  (kGeneric)
+  (kSpecialize)
+  (kFunction)
+  (kProcedure)
+  (kConstructor)
+  (kDestructor)
+  (kOperator)
+  (kReference)
+  (kInterface)
+  (kImplementation)
+  (kInitialization)
+  (kFinalization)
+  (kTry)
+  (kExcept)
+  (kFinally)
+  (kRaise)
+  (kOn)
+  (kCase)
+  (kWith)
+  (kGoto)
 ] @keyword
 
 [
-	(kFor)
-	(kTo)
-	(kDownto)
-	(kDo)
-	(kWhile)
-	(kRepeat)
-	(kUntil)
+  (kFor)
+  (kTo)
+  (kDownto)
+  (kDo)
+  (kWhile)
+  (kRepeat)
+  (kUntil)
 ] @keyword.repeat
 
 [
-	(kIf)
-	(kThen)
-	(kElse)
+  (kIf)
+  (kThen)
+  (kElse)
 ] @keyword.conditional
 
 [
-	(kPublished)
-	(kPublic)
-	(kProtected)
-	(kPrivate)
-
-	(kStrict)
-	(kRequired)
-	(kOptional)
+  (kPublished)
+  (kPublic)
+  (kProtected)
+  (kPrivate)
+  (kStrict)
+  (kRequired)
+  (kOptional)
 ] @type.qualifier
 
 [
-	(kPacked)
-
-	(kAbsolute)
+  (kPacked)
+  (kAbsolute)
 ] @keyword.storage
 
 (kUses) @keyword.import
 
 ; -- Attributes
-
 [
-	(kDefault)
-	(kIndex)
-	(kNodefault)
-	(kStored)
-
-	(kStatic)
-	(kVirtual)
-	(kAbstract)
-	(kSealed)
-	(kDynamic)
-	(kOverride)
-	(kOverload)
-	(kReintroduce)
-	(kInline)
-
-	(kForward)
-
-	(kStdcall)
-	(kCdecl)
-	(kCppdecl)
-	(kPascal)
-	(kRegister)
-	(kMwpascal)
-	(kExternal)
-	(kName)
-	(kMessage)
-	(kDeprecated)
-	(kExperimental)
-	(kPlatform)
-	(kUnimplemented)
-	(kCvar)
-	(kExport)
-	(kFar)
-	(kNear)
-	(kSafecall)
-	(kAssembler)
-	(kNostackframe)
-	(kInterrupt)
-	(kNoreturn)
-	(kIocheck)
-	(kLocal)
-	(kHardfloat)
-	(kSoftfloat)
-	(kMs_abi_default)
-	(kMs_abi_cdecl)
-	(kSaveregisters)
-	(kSysv_abi_default)
-	(kSysv_abi_cdecl)
-	(kVectorcall)
-	(kVarargs)
-	(kWinapi)
-	(kAlias)
-	(kDelayed)
-
-	(rttiAttributes)
-	(procAttribute)
-
+  (kDefault)
+  (kIndex)
+  (kNodefault)
+  (kStored)
+  (kStatic)
+  (kVirtual)
+  (kAbstract)
+  (kSealed)
+  (kDynamic)
+  (kOverride)
+  (kOverload)
+  (kReintroduce)
+  (kInline)
+  (kForward)
+  (kStdcall)
+  (kCdecl)
+  (kCppdecl)
+  (kPascal)
+  (kRegister)
+  (kMwpascal)
+  (kExternal)
+  (kName)
+  (kMessage)
+  (kDeprecated)
+  (kExperimental)
+  (kPlatform)
+  (kUnimplemented)
+  (kCvar)
+  (kExport)
+  (kFar)
+  (kNear)
+  (kSafecall)
+  (kAssembler)
+  (kNostackframe)
+  (kInterrupt)
+  (kNoreturn)
+  (kIocheck)
+  (kLocal)
+  (kHardfloat)
+  (kSoftfloat)
+  (kMs_abi_default)
+  (kMs_abi_cdecl)
+  (kSaveregisters)
+  (kSysv_abi_default)
+  (kSysv_abi_cdecl)
+  (kVectorcall)
+  (kVarargs)
+  (kWinapi)
+  (kAlias)
+  (kDelayed)
+  (rttiAttributes)
+  (procAttribute)
 ] @attribute
 
-(procAttribute (kPublic) @attribute)
+(procAttribute
+  (kPublic) @attribute)
 
 ; -- Punctuation & operators
-
 [
-	"("
-	")"
-	"["
-	"]"
+  "("
+  ")"
+  "["
+  "]"
 ] @punctuation.bracket
 
 [
-	";"
-	","
-	":"
-	(kEndDot)
+  ";"
+  ","
+  ":"
+  (kEndDot)
 ] @punctuation.delimiter
 
-[
-	".."
-] @punctuation.special
+".." @punctuation.special
 
 [
-	(kDot)
-	(kAdd)
-	(kSub)
-	(kMul)
-	(kFdiv)
-	(kAssign)
-	(kAssignAdd)
-	(kAssignSub)
-	(kAssignMul)
-	(kAssignDiv)
-	(kEq)
-	(kLt)
-	(kLte)
-	(kGt)
-	(kGte)
-	(kNeq)
-	(kAt)
-	(kHat)
+  (kDot)
+  (kAdd)
+  (kSub)
+  (kMul)
+  (kFdiv)
+  (kAssign)
+  (kAssignAdd)
+  (kAssignSub)
+  (kAssignMul)
+  (kAssignDiv)
+  (kEq)
+  (kLt)
+  (kLte)
+  (kGt)
+  (kGte)
+  (kNeq)
+  (kAt)
+  (kHat)
 ] @operator
 
 [
-	(kOr)
-	(kXor)
-	(kDiv)
-	(kMod)
-	(kAnd)
-	(kShl)
-	(kShr)
-	(kNot)
-	(kIs)
-	(kAs)
-	(kIn)
+  (kOr)
+  (kXor)
+  (kDiv)
+  (kMod)
+  (kAnd)
+  (kShl)
+  (kShr)
+  (kNot)
+  (kIs)
+  (kAs)
+  (kIn)
 ] @keyword.operator
 
 ; -- Builtin constants
-
 [
-	(kTrue)
-	(kFalse)
+  (kTrue)
+  (kFalse)
 ] @boolean
 
-[
-	(kNil)
-] @constant.builtin
+(kNil) @constant.builtin
 
 ; -- Literals
+(literalNumber) @number
 
-(literalNumber)   @number
-(literalString)   @string
+(literalString) @string
 
 ; -- Variables
+(exprBinary
+  (identifier) @variable)
 
-(exprBinary (identifier) @variable)
-(exprUnary (identifier) @variable)
-(assignment (identifier) @variable)
-(exprBrackets (identifier) @variable)
-(exprParens (identifier) @variable)
-(exprDot (identifier) @variable)
-(exprTpl (identifier) @variable)
-(exprArgs (identifier) @variable)
-(defaultValue (identifier) @variable)
+(exprUnary
+  (identifier) @variable)
+
+(assignment
+  (identifier) @variable)
+
+(exprBrackets
+  (identifier) @variable)
+
+(exprParens
+  (identifier) @variable)
+
+(exprDot
+  (identifier) @variable)
+
+(exprTpl
+  (identifier) @variable)
+
+(exprArgs
+  (identifier) @variable)
+
+(defaultValue
+  (identifier) @variable)
 
 ; -- Comments
-
 (comment) @comment @spell
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///[^/]"))
+
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
 ((comment) @comment.documentation
-  . [(unit) (declProc)])
+  .
+  [
+    (unit)
+    (declProc)
+  ])
 
 (declTypes
   (comment) @comment.documentation
-  . (declType))
+  .
+  (declType))
 
 (declSection
   (comment) @comment.documentation
-  . [(declField) (declProc)])
+  .
+  [
+    (declField)
+    (declProc)
+  ])
 
 (declEnum
   (comment) @comment.documentation
-  . (declEnumValue))
+  .
+  (declEnumValue))
 
 (declConsts
   (comment) @comment.documentation
-  . (declConst))
+  .
+  (declConst))
 
 (declVars
   (comment) @comment.documentation
-  . (declVar))
+  .
+  (declVar))
 
-(pp)              @keyword.directive
+(pp) @keyword.directive
 
 ; -- Type declaration
+(declType
+  name: (identifier) @type)
 
-(declType name: (identifier) @type)
-(declType name: (genericTpl entity: (identifier) @type))
+(declType
+  name:
+    (genericTpl
+      entity: (identifier) @type))
 
 ; -- Procedure & function declarations
-
 ; foobar
-(declProc name: (identifier) @function)
+(declProc
+  name: (identifier) @function)
+
 ; foobar<t>
-(declProc name: (genericTpl entity: (identifier) @function))
+(declProc
+  name:
+    (genericTpl
+      entity: (identifier) @function))
+
 ; foo.bar
-(declProc name: (genericDot rhs: (identifier) @function))
+(declProc
+  name:
+    (genericDot
+      rhs: (identifier) @function))
+
 ; foo.bar<t>
-(declProc name: (genericDot rhs: (genericTpl entity: (identifier) @function)))
+(declProc
+  name:
+    (genericDot
+      rhs:
+        (genericTpl
+          entity: (identifier) @function)))
 
 ; Treat property declarations like functions
+(declProp
+  name: (identifier) @function)
 
-(declProp name: (identifier) @function)
-(declProp getter: (identifier) @property)
-(declProp setter: (identifier) @property)
+(declProp
+  getter: (identifier) @property)
+
+(declProp
+  setter: (identifier) @property)
 
 ; -- Function parameters
-
-(declArg name: (identifier) @variable.parameter)
+(declArg
+  name: (identifier) @variable.parameter)
 
 ; -- Template parameters
+(genericArg
+  name: (identifier) @variable.parameter)
 
-(genericArg	name: (identifier) @variable.parameter)
-(genericArg	type: (typeref) @type)
+(genericArg
+  type: (typeref) @type)
 
-(declProc name: (genericDot lhs: (identifier) @type))
-(declType (genericDot (identifier) @type))
+(declProc
+  name:
+    (genericDot
+      lhs: (identifier) @type))
 
-(genericDot (genericTpl (identifier) @type))
-(genericDot (genericDot (identifier) @type))
+(declType
+  (genericDot
+    (identifier) @type))
 
-(genericTpl entity: (identifier) @type)
-(genericTpl entity: (genericDot (identifier) @type))
+(genericDot
+  (genericTpl
+    (identifier) @type))
+
+(genericDot
+  (genericDot
+    (identifier) @type))
+
+(genericTpl
+  entity: (identifier) @type)
+
+(genericTpl
+  entity:
+    (genericDot
+      (identifier) @type))
 
 ; -- Exception parameters
-
-(exceptionHandler variable: (identifier) @variable.parameter)
+(exceptionHandler
+  variable: (identifier) @variable.parameter)
 
 ; -- Type usage
-
 (typeref) @type
 
 ; -- Constant usage
-
 [
-	(caseLabel)
-	(label)
+  (caseLabel)
+  (label)
 ] @constant
 
-(procAttribute (identifier) @constant)
-(procExternal (identifier) @constant)
+(procAttribute
+  (identifier) @constant)
+
+(procExternal
+  (identifier) @constant)
 
 ; -- Variable & constant declarations
 ; (This is only questionable because we cannot detect types of identifiers
 ; declared in other units, so the results will be inconsistent)
+(declVar
+  name: (identifier) @variable)
 
-(declVar name: (identifier) @variable)
-(declConst name: (identifier) @constant)
-(declEnumValue name: (identifier) @constant)
+(declConst
+  name: (identifier) @constant)
+
+(declEnumValue
+  name: (identifier) @constant)
 
 ; -- Fields
+(exprDot
+  rhs: (identifier) @property)
 
-(exprDot rhs: (identifier) @property)
-(exprDot rhs: (exprDot)    @property)
-(declClass   (declField name:(identifier) @property))
-(declSection (declField name:(identifier) @property))
-(declSection (declVars (declVar   name:(identifier) @property)))
+(exprDot
+  rhs: (exprDot) @property)
 
-(recInitializerField name:(identifier) @property)
+(declClass
+  (declField
+    name: (identifier) @property))
 
+(declSection
+  (declField
+    name: (identifier) @property))
 
-;;; ---------------------------------------------- ;;;
-;;; EVERYTHING BELOW THIS IS OF QUESTIONABLE VALUE ;;;
-;;; ---------------------------------------------- ;;;
+(declSection
+  (declVars
+    (declVar
+      name: (identifier) @property)))
 
+(recInitializerField
+  name: (identifier) @property)
 
+; ---------------------------------------------- ;;;
+; EVERYTHING BELOW THIS IS OF QUESTIONABLE VALUE ;;;
+; ---------------------------------------------- ;;;
 ; -- Procedure name in calls with parentheses
 ; (Pascal doesn't require parentheses for procedure calls, so this will not
 ; detect all calls)
-
 ; foobar
-(exprCall entity: (identifier) @function)
+(exprCall
+  entity: (identifier) @function)
+
 ; foobar<t>
-(exprCall entity: (exprTpl entity: (identifier) @function))
+(exprCall
+  entity:
+    (exprTpl
+      entity: (identifier) @function))
+
 ; foo.bar
-(exprCall entity: (exprDot rhs: (identifier) @function))
+(exprCall
+  entity:
+    (exprDot
+      rhs: (identifier) @function))
+
 ; foo.bar<t>
-(exprCall entity: (exprDot rhs: (exprTpl entity: (identifier) @function)))
+(exprCall
+  entity:
+    (exprDot
+      rhs:
+        (exprTpl
+          entity: (identifier) @function)))
 
 (inherited) @function
 
@@ -381,44 +456,85 @@
 ; (If a statement consists only of an identifier, assume it's a procedure)
 ; (This will still not match all procedure calls, and also may produce false
 ; positives in rare cases, but only for nonsensical code)
+(statement
+  (identifier) @function)
 
-(statement (identifier) @function)
-(statement (exprDot rhs: (identifier) @function))
-(statement (exprTpl entity: (identifier) @function))
-(statement (exprDot rhs: (exprTpl entity: (identifier) @function)))
+(statement
+  (exprDot
+    rhs: (identifier) @function))
+
+(statement
+  (exprTpl
+    entity: (identifier) @function))
+
+(statement
+  (exprDot
+    rhs:
+      (exprTpl
+        entity: (identifier) @function)))
 
 ; -- Break, Continue & Exit
 ; (Not ideal: ideally, there would be a way to check if these special
 ; identifiers are shadowed by a local variable)
-(statement ((identifier) @keyword.return
- (#lua-match? @keyword.return "^[eE][xX][iI][tT]$")))
-(statement (exprCall entity: ((identifier) @keyword.return
- (#lua-match? @keyword.return "^[eE][xX][iI][tT]$"))))
-(statement ((identifier) @keyword.repeat
- (#lua-match? @keyword.repeat "^[bB][rR][eE][aA][kK]$")))
-(statement ((identifier) @keyword.repeat
- (#lua-match? @keyword.repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
+(statement
+  ((identifier) @keyword.return
+    (#lua-match? @keyword.return "^[eE][xX][iI][tT]$")))
+
+(statement
+  (exprCall
+    entity:
+      ((identifier) @keyword.return
+        (#lua-match? @keyword.return "^[eE][xX][iI][tT]$"))))
+
+(statement
+  ((identifier) @keyword.repeat
+    (#lua-match? @keyword.repeat "^[bB][rR][eE][aA][kK]$")))
+
+(statement
+  ((identifier) @keyword.repeat
+    (#lua-match? @keyword.repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
 
 ; -- Identifier type inference
-
 ; VERY QUESTIONABLE: Highlighting of identifiers based on spelling
-(exprBinary ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(exprUnary ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(assignment rhs: ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(exprBrackets ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(exprParens ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(exprDot rhs: ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(exprTpl args: ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(exprArgs ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(declEnumValue ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
-(defaultValue ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+(exprBinary
+  ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(exprUnary
+  ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(assignment
+  rhs:
+    ((identifier) @constant
+      (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(exprBrackets
+  ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(exprParens
+  ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(exprDot
+  rhs:
+    ((identifier) @constant
+      (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(exprTpl
+  args:
+    ((identifier) @constant
+      (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(exprArgs
+  ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(declEnumValue
+  ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+
+(defaultValue
+  ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
diff --git a/queries/pascal/indents.scm b/queries/pascal/indents.scm
index bbeea0089..879e7b86f 100644
--- a/queries/pascal/indents.scm
+++ b/queries/pascal/indents.scm
@@ -1,32 +1,33 @@
 [
-	(statement)
-	(declVars)
-	(declConsts)
-	(declTypes)
-	(declProc)
-	(declArgs)
-	(declUses)
-	(declClass)
-	(exprArgs)
-	(exprSubscript)
-	(exprBrackets)
-	(exprParens)
-	(recInitializer)
-	(arrInitializer)
-	(defaultValue)
+  (statement)
+  (declVars)
+  (declConsts)
+  (declTypes)
+  (declProc)
+  (declArgs)
+  (declUses)
+  (declClass)
+  (exprArgs)
+  (exprSubscript)
+  (exprBrackets)
+  (exprParens)
+  (recInitializer)
+  (arrInitializer)
+  (defaultValue)
 ] @indent.begin
 
-(defProc (block) @indent.begin)
+(defProc
+  (block) @indent.begin)
 
 [
-	(kEnd)
-	(kFinally)
-	(kDo)
-	(kUntil)
-	(kExcept)
-	(kElse)
-	(kThen)
-	(declSection)
-	"]"
-	")"
+  (kEnd)
+  (kFinally)
+  (kDo)
+  (kUntil)
+  (kExcept)
+  (kElse)
+  (kThen)
+  (declSection)
+  "]"
+  ")"
 ] @indent.branch
diff --git a/queries/pascal/injections.scm b/queries/pascal/injections.scm
index 9832973b6..31d9d4cea 100644
--- a/queries/pascal/injections.scm
+++ b/queries/pascal/injections.scm
@@ -1,6 +1,5 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
-
+  (#set! injection.language "comment"))
 ; There is no parser for assembly language yet. Add an injection here when we
 ; have a parser.
 ; ((asmBody) @injection.content
diff --git a/queries/pascal/locals.scm b/queries/pascal/locals.scm
index 7147a1086..bb12cb2d2 100644
--- a/queries/pascal/locals.scm
+++ b/queries/pascal/locals.scm
@@ -1,25 +1,55 @@
+(root) @local.scope
 
-(root)                                   @local.scope
+(defProc) @local.scope
 
-(defProc)                                @local.scope
-(lambda)                                 @local.scope
-(interface   (declProc)                  @local.scope)
-(declSection (declProc)                  @local.scope)
-(declClass   (declProc)                  @local.scope)
-(declHelper  (declProc)                  @local.scope)
-(declProcRef)                            @local.scope
+(lambda) @local.scope
 
-(exceptionHandler)                       @local.scope
-(exceptionHandler variable: (identifier) @local.definition)
+(interface
+  (declProc) @local.scope)
 
-(declArg          name: (identifier)     @local.definition)
-(declVar          name: (identifier)     @local.definition)
-(declConst        name: (identifier)     @local.definition)
-(declLabel        name: (identifier)     @local.definition)
-(genericArg       name: (identifier)     @local.definition)
-(declEnumValue    name: (identifier)     @local.definition)
-(declType         name: (identifier)     @local.definition)
-(declType         name: (genericTpl entity: (identifier)     @local.definition))
+(declSection
+  (declProc) @local.scope)
 
-(declProc         name: (identifier)     @local.definition)
-(identifier)                             @local.reference
+(declClass
+  (declProc) @local.scope)
+
+(declHelper
+  (declProc) @local.scope)
+
+(declProcRef) @local.scope
+
+(exceptionHandler) @local.scope
+
+(exceptionHandler
+  variable: (identifier) @local.definition)
+
+(declArg
+  name: (identifier) @local.definition)
+
+(declVar
+  name: (identifier) @local.definition)
+
+(declConst
+  name: (identifier) @local.definition)
+
+(declLabel
+  name: (identifier) @local.definition)
+
+(genericArg
+  name: (identifier) @local.definition)
+
+(declEnumValue
+  name: (identifier) @local.definition)
+
+(declType
+  name: (identifier) @local.definition)
+
+(declType
+  name:
+    (genericTpl
+      entity: (identifier) @local.definition))
+
+(declProc
+  name: (identifier) @local.definition)
+
+(identifier) @local.reference
diff --git a/queries/pem/highlights.scm b/queries/pem/highlights.scm
index f5d0d70f0..b8dbb0f11 100644
--- a/queries/pem/highlights.scm
+++ b/queries/pem/highlights.scm
@@ -1,4 +1,7 @@
-["BEGIN" "END"] @keyword
+[
+  "BEGIN"
+  "END"
+] @keyword
 
 (dashes) @punctuation.delimiter
 
diff --git a/queries/pem/injections.scm b/queries/pem/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/pem/injections.scm
+++ b/queries/pem/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/perl/folds.scm b/queries/perl/folds.scm
index df23f6317..21950324d 100644
--- a/queries/perl/folds.scm
+++ b/queries/perl/folds.scm
@@ -1,19 +1,25 @@
 (comment)+ @fold
+
 (pod) @fold
 
 ; fold the block-typed package statements only
-(package_statement (block)) @fold
+(package_statement
+  (block)) @fold
 
-[(subroutine_declaration_statement)
- (conditional_statement)
- (loop_statement)
- (for_statement)
- (cstyle_for_statement)
- (block_statement)
- (phaser_statement)] @fold
+[
+  (subroutine_declaration_statement)
+  (conditional_statement)
+  (loop_statement)
+  (for_statement)
+  (cstyle_for_statement)
+  (block_statement)
+  (phaser_statement)
+] @fold
 
 (anonymous_subroutine_expression) @fold
 
 ; perhaps folks want to fold these too?
-[(anonymous_array_expression)
- (anonymous_hash_expression)] @fold
+[
+  (anonymous_array_expression)
+  (anonymous_hash_expression)
+] @fold
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 7a0c4e530..a6405c948 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -1,43 +1,84 @@
-((source_file . (comment) @keyword.directive)
+((source_file
+  .
+  (comment) @keyword.directive)
   (#lua-match? @keyword.directive "^#!/"))
 
-[ "use" "no" "require" ] @keyword.import
+[
+  "use"
+  "no"
+  "require"
+] @keyword.import
 
-[ "if" "elsif" "unless" "else" ] @keyword.conditional
+[
+  "if"
+  "elsif"
+  "unless"
+  "else"
+] @keyword.conditional
 
-(conditional_expression [ "?" ":" ] @keyword.conditional.ternary) 
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
-[ "while" "until" "for" "foreach" ] @keyword.repeat
+[
+  "while"
+  "until"
+  "for"
+  "foreach"
+] @keyword.repeat
 
 "return" @keyword.return
 
 "sub" @keyword.function
 
-[ "map" "grep" "sort" ] @function.builtin
+[
+  "map"
+  "grep"
+  "sort"
+] @function.builtin
 
 "package" @keyword.import
 
 [
   "do"
-  "my" "our" "local" "state"
-  "last" "next" "redo" "goto"
+  "my"
+  "our"
+  "local"
+  "state"
+  "last"
+  "next"
+  "redo"
+  "goto"
   "undef"
 ] @keyword
 
-(_ operator: _ @operator)
+(_
+  operator: _ @operator)
+
 "\\" @operator
 
 (yadayada) @keyword.exception
 
-(phaser_statement phase: _ @keyword.phaser)
+(phaser_statement
+  phase: _ @keyword.phaser)
 
 [
-  "or" "and"
-  "eq" "ne" "cmp" "lt" "le" "ge" "gt"
+  "or"
+  "and"
+  "eq"
+  "ne"
+  "cmp"
+  "lt"
+  "le"
+  "ge"
+  "gt"
   "isa"
 ] @keyword.operator
 
 (eof_marker) @keyword.directive
+
 (data_section) @comment
 
 (pod) @none
@@ -48,10 +89,10 @@
 ] @number
 
 [
-  (string_literal) 
-  (interpolated_string_literal) 
-  (quoted_word_list) 
-  (command_string) 
+  (string_literal)
+  (interpolated_string_literal)
+  (quoted_word_list)
+  (command_string)
   (heredoc_content)
   (replacement)
   (transliteration_content)
@@ -63,54 +104,69 @@
   (heredoc_end)
 ] @label
 
-[(escape_sequence) (escaped_delimiter)] @string.escape
+[
+  (escape_sequence)
+  (escaped_delimiter)
+] @string.escape
 
-(_ modifiers: _ @character.special)
-[  
- (quoted_regexp)
- (match_regexp)
- (regexp_content)
+(_
+  modifiers: _ @character.special)
+
+[
+  (quoted_regexp)
+  (match_regexp)
+  (regexp_content)
 ] @string.regexp
 
 (autoquoted_bareword) @string.special
 
-(use_statement (package) @type)
-(package_statement (package) @type)
-(require_expression (bareword) @type)
+(use_statement
+  (package) @type)
+
+(package_statement
+  (package) @type)
+
+(require_expression
+  (bareword) @type)
+
+(subroutine_declaration_statement
+  name: (bareword) @function)
 
-(subroutine_declaration_statement name: (bareword) @function)
 (attribute_name) @attribute
+
 (attribute_value) @string
 
 (label) @label
 
-(statement_label label: _ @label)
+(statement_label
+  label: _ @label)
 
-(relational_expression operator: "isa" right: (bareword) @type)
+(relational_expression
+  operator: "isa"
+  right: (bareword) @type)
 
-(function_call_expression (function) @function.call)
-(method_call_expression (method) @function.method.call)
-(method_call_expression invocant: (bareword) @type)
+(function_call_expression
+  (function) @function.call)
 
-(func0op_call_expression function: _ @function.builtin)
-(func1op_call_expression function: _ @function.builtin)
+(method_call_expression
+  (method) @function.method.call)
+
+(method_call_expression
+  invocant: (bareword) @type)
+
+(func0op_call_expression
+  function: _ @function.builtin)
+
+(func1op_call_expression
+  function: _ @function.builtin)
 
 ; this was a regex for the CLI
-([(function)(expression_statement (bareword))] @function.builtin
- (#any-of? @function.builtin
-  "accept" "atan2" "bind" "binmode" "bless" "crypt" "chmod" "chown" "connect"
-  "die" "dbmopen" "exec" "fcntl" "flock" "formline" "getpriority"
-  "getprotobynumber" "gethostbyaddr" "getnetbyaddr" "getservbyname"
-  "getservbyport" "getsockopt" "glob" "index" "ioctl" "join" "kill" "link"
-  "listen" "mkdir" "msgctl" "msgget" "msgrcv" "msgsend" "open" "opendir"
-  "print" "printf" "push" "pack" "pipe" "return" "rename" "rindex" "read"
-  "recv" "reverse" "say" "select" "seek" "semctl" "semget" "semop" "send"
-  "setpgrp" "setpriority" "seekdir" "setsockopt" "shmctl" "shmread" "shmwrite"
-  "shutdown" "socket" "socketpair" "split" "sprintf" "splice" "substr" "system"
-  "symlink" "syscall" "sysopen" "sysseek" "sysread" "syswrite" "tie" "truncate"
-  "unlink" "unpack" "utime" "unshift" "vec" "warn"
-  "waitpid"
-))
+([
+  (function)
+  (expression_statement
+    (bareword))
+] @function.builtin
+  (#any-of? @function.builtin "accept" "atan2" "bind" "binmode" "bless" "crypt" "chmod" "chown" "connect" "die" "dbmopen" "exec" "fcntl" "flock" "formline" "getpriority" "getprotobynumber" "gethostbyaddr" "getnetbyaddr" "getservbyname" "getservbyport" "getsockopt" "glob" "index" "ioctl" "join" "kill" "link" "listen" "mkdir" "msgctl" "msgget" "msgrcv" "msgsend" "open" "opendir" "print" "printf" "push" "pack" "pipe" "return" "rename" "rindex" "read" "recv" "reverse" "say" "select" "seek" "semctl" "semget" "semop" "send" "setpgrp" "setpriority" "seekdir" "setsockopt" "shmctl" "shmread" "shmwrite" "shutdown" "socket" "socketpair" "split" "sprintf" "splice" "substr" "system" "symlink" "syscall" "sysopen" "sysseek" "sysread" "syswrite" "tie" "truncate" "unlink" "unpack" "utime" "unshift" "vec" "warn" "waitpid"))
 
 (function) @function
 
@@ -119,42 +175,86 @@
   (varname)
   "}" @punctuation.special)
 
-(varname 
+(varname
   (block
-    "{" @punctuation.special 
+    "{" @punctuation.special
     "}" @punctuation.special))
 
-
-([(varname) (filehandle)] @variable.builtin
+([
+  (varname)
+  (filehandle)
+] @variable.builtin
   (#any-of? @variable.builtin "ENV" "ARGV" "INC" "ARGVOUT" "SIG" "STDIN" "STDOUT" "STDERR" "a" "b" "_"))
+
 ((varname) @variable.builtin
   ; highlights all the reserved ^ vars like ${^THINGS}
   (#lua-match? @variable.builtin "%^"))
+
 ((varname) @variable.builtin
   ; highlights punc vars and also numeric only like $11
   (#lua-match? @variable.builtin "^%A+$"))
 
-
 (scalar) @variable.scalar
-(scalar_deref_expression [ "$" "*"] @variable.scalar)
-[(array) (arraylen)] @variable.array
-(array_deref_expression [ "@" "*"] @variable.array)
+
+(scalar_deref_expression
+  [
+    "$"
+    "*"
+  ] @variable.scalar)
+
+[
+  (array)
+  (arraylen)
+] @variable.array
+
+(array_deref_expression
+  [
+    "@"
+    "*"
+  ] @variable.array)
+
 (hash) @variable.hash
-(hash_deref_expression [ "%" "*"] @variable.hash)
 
-(array_element_expression array:(_) @variable.array)
-(slice_expression array:(_) @variable.array)
-(keyval_expression array:(_) @variable.array)
+(hash_deref_expression
+  [
+    "%"
+    "*"
+  ] @variable.hash)
 
-(hash_element_expression hash:(_) @variable.hash)
-(slice_expression hash:(_) @variable.hash)
-(keyval_expression hash:(_) @variable.hash)
+(array_element_expression
+  array: (_) @variable.array)
+
+(slice_expression
+  array: (_) @variable.array)
+
+(keyval_expression
+  array: (_) @variable.array)
+
+(hash_element_expression
+  hash: (_) @variable.hash)
+
+(slice_expression
+  hash: (_) @variable.hash)
+
+(keyval_expression
+  hash: (_) @variable.hash)
 
 (comment) @comment
 
-([ "=>" "," ";" "->" ] @punctuation.delimiter)
+([
+  "=>"
+  ","
+  ";"
+  "->"
+] @punctuation.delimiter)
 
-(
-  [ "[" "]" "{" "}" "(" ")" ] @punctuation.bracket
+([
+  "["
+  "]"
+  "{"
+  "}"
+  "("
+  ")"
+] @punctuation.bracket
   ; priority hack so nvim + ts-cli behave the same
   (#set! "priority" 90))
diff --git a/queries/perl/injections.scm b/queries/perl/injections.scm
index ba5e45f45..48e6363b9 100644
--- a/queries/perl/injections.scm
+++ b/queries/perl/injections.scm
@@ -1,14 +1,14 @@
 ; an injections.scm file for nvim-treesitter
 ((comment) @injection.content
- (#set! injection.language "comment"))
- 
+  (#set! injection.language "comment"))
+
 ((pod) @injection.content
- (#set! injection.language "pod"))
+  (#set! injection.language "pod"))
 
 ((substitution_regexp
   (replacement) @injection.content
   (substitution_regexp_modifiers) @_modifiers)
-    ; match if there's a single `e` in the modifiers list
+  ; match if there's a single `e` in the modifiers list
   (#lua-match? @_modifiers "e")
   (#not-lua-match? @_modifiers "e.*e")
   (#set! injection.language "perl"))
diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index aa3be62b9..cbc7e1839 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -1,68 +1,110 @@
 ; Variables
-
 (variable_name) @variable
 
 ; Constants
-
 ((name) @constant
- (#lua-match? @constant "^_?[A-Z][A-Z%d_]*$"))
-((name) @constant.builtin
- (#lua-match? @constant.builtin "^__[A-Z][A-Z%d_]+__$"))
+  (#lua-match? @constant "^_?[A-Z][A-Z%d_]*$"))
 
-(const_declaration (const_element (name) @constant))
+((name) @constant.builtin
+  (#lua-match? @constant.builtin "^__[A-Z][A-Z%d_]+__$"))
+
+(const_declaration
+  (const_element
+    (name) @constant))
 
 ; Types
-
 [
- (primitive_type)
- (cast_type)
- (bottom_type)
- ] @type.builtin
+  (primitive_type)
+  (cast_type)
+  (bottom_type)
+] @type.builtin
+
 (named_type
-  [(name) @type
-   (qualified_name (name) @type)])
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
 (class_declaration
   name: (name) @type)
+
 (base_clause
-  [(name) @type
-   (qualified_name (name) @type)])
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
 (enum_declaration
   name: (name) @type)
+
 (interface_declaration
   name: (name) @type)
+
 (namespace_use_clause
-  [(name) @type
-   (qualified_name (name) @type)])
-(namespace_aliasing_clause (name) @type.definition)
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
+(namespace_aliasing_clause
+  (name) @type.definition)
+
 (class_interface_clause
-  [(name) @type
-   (qualified_name (name) @type)])
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
 (scoped_call_expression
-  scope: [(name) @type
-          (qualified_name (name) @type)])
+  scope:
+    [
+      (name) @type
+      (qualified_name
+        (name) @type)
+    ])
+
 (class_constant_access_expression
-  . [(name) @type
-     (qualified_name (name) @type)]
+  .
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ]
   (name) @constant)
+
 (trait_declaration
   name: (name) @type)
+
 (use_declaration
-    (name) @type)
+  (name) @type)
+
 (binary_expression
   operator: "instanceof"
-  right: [(name) @type
-          (qualified_name (name) @type)])
+  right:
+    [
+      (name) @type
+      (qualified_name
+        (name) @type)
+    ])
 
 ; Functions, methods, constructors
+(array_creation_expression
+  "array" @function.builtin)
 
-(array_creation_expression "array" @function.builtin)
-(list_literal "list" @function.builtin)
+(list_literal
+  "list" @function.builtin)
 
 (method_declaration
   name: (name) @function.method)
 
 (function_call_expression
-  function: (qualified_name (name) @function.call))
+  function:
+    (qualified_name
+      (name) @function.call))
 
 (function_call_expression
   (name) @function.call)
@@ -77,14 +119,18 @@
   name: (name) @function)
 
 (nullsafe_member_call_expression
-    name: (name) @function.method)
+  name: (name) @function.method)
 
 (method_declaration
-    name: (name) @constructor
-    (#eq? @constructor "__construct"))
+  name: (name) @constructor
+  (#eq? @constructor "__construct"))
+
 (object_creation_expression
-  [(name) @constructor
-   (qualified_name (name) @constructor)])
+  [
+    (name) @constructor
+    (qualified_name
+      (name) @constructor)
+  ])
 
 ; Parameters
 [
@@ -93,31 +139,35 @@
 ] @variable.parameter
 
 (argument
-    (name) @variable.parameter)
+  (name) @variable.parameter)
 
 ; Member
-
 (property_element
   (variable_name) @property)
 
 (member_access_expression
-  name: (variable_name (name)) @property)
+  name:
+    (variable_name
+      (name)) @property)
 
 (member_access_expression
   name: (name) @property)
 
 ; Variables
-
 (relative_scope) @variable.builtin
 
 ((variable_name) @variable.builtin
- (#eq? @variable.builtin "$this"))
+  (#eq? @variable.builtin "$this"))
 
 ; Namespace
 (namespace_definition
-  name: (namespace_name (name) @module))
+  name:
+    (namespace_name
+      (name) @module))
+
 (namespace_name_as_prefix
-  (namespace_name (name) @module))
+  (namespace_name
+    (name) @module))
 
 ; Attributes
 (attribute_list) @attribute
@@ -126,78 +176,88 @@
 (conditional_expression) @keyword.conditional
 
 ; Directives
-(declare_directive ["strict_types" "ticks" "encoding"] @variable.parameter)
+(declare_directive
+  [
+    "strict_types"
+    "ticks"
+    "encoding"
+  ] @variable.parameter)
 
 ; Basic tokens
-
 [
- (string)
- (encapsed_string)
- (heredoc_body)
- (nowdoc_body)
- (shell_command_expression) ; backtick operator: `ls -la`
- ] @string
+  (string)
+  (encapsed_string)
+  (heredoc_body)
+  (nowdoc_body)
+  (shell_command_expression) ; backtick operator: `ls -la`
+] @string
+
 (escape_sequence) @string.escape
 
 [
- (heredoc_start)
- (heredoc_end)
+  (heredoc_start)
+  (heredoc_end)
 ] @label
 
-(nowdoc "'" @label)
+(nowdoc
+  "'" @label)
 
 (boolean) @boolean
+
 (null) @constant.builtin
+
 (integer) @number
+
 (float) @number.float
+
 (comment) @comment @spell
 
 (named_label_statement) @label
-; Keywords
 
+; Keywords
 [
- "and"
- "as"
- "instanceof"
- "or"
- "xor"
+  "and"
+  "as"
+  "instanceof"
+  "or"
+  "xor"
 ] @keyword.operator
 
 [
- "fn"
- "function"
+  "fn"
+  "function"
 ] @keyword.function
 
 [
- "break"
- "class"
- "clone"
- "declare"
- "default"
- "echo"
- "enddeclare"
- "enum"
- "extends"
- "global"
- "goto"
- "implements"
- "insteadof"
- "interface"
- "namespace"
- "new"
- "trait"
- "unset"
- ] @keyword
+  "break"
+  "class"
+  "clone"
+  "declare"
+  "default"
+  "echo"
+  "enddeclare"
+  "enum"
+  "extends"
+  "global"
+  "goto"
+  "implements"
+  "insteadof"
+  "interface"
+  "namespace"
+  "new"
+  "trait"
+  "unset"
+] @keyword
 
 [
- "abstract"
- "const"
- "final"
- "private"
- "protected"
- "public"
- "readonly"
- "static"
+  "abstract"
+  "const"
+  "final"
+  "private"
+  "protected"
+  "public"
+  "readonly"
+  "static"
 ] @type.qualifier
 
 [
@@ -206,65 +266,64 @@
 ] @keyword.return
 
 [
- "case"
- "else"
- "elseif"
- "endif"
- "endswitch"
- "if"
- "switch"
- "match"
+  "case"
+  "else"
+  "elseif"
+  "endif"
+  "endswitch"
+  "if"
+  "switch"
+  "match"
   "??"
- ] @keyword.conditional
+] @keyword.conditional
 
 [
- "continue"
- "do"
- "endfor"
- "endforeach"
- "endwhile"
- "for"
- "foreach"
- "while"
- ] @keyword.repeat
+  "continue"
+  "do"
+  "endfor"
+  "endforeach"
+  "endwhile"
+  "for"
+  "foreach"
+  "while"
+] @keyword.repeat
 
 [
- "catch"
- "finally"
- "throw"
- "try"
- ] @keyword.exception
+  "catch"
+  "finally"
+  "throw"
+  "try"
+] @keyword.exception
 
 [
- "include_once"
- "include"
- "require_once"
- "require"
- "use"
- ] @keyword.import
+  "include_once"
+  "include"
+  "require_once"
+  "require"
+  "use"
+] @keyword.import
 
 [
- ","
- ";"
- ":"
- "\\"
- ] @punctuation.delimiter
+  ","
+  ";"
+  ":"
+  "\\"
+] @punctuation.delimiter
 
 [
- (php_tag)
- "?>"
- "("
- ")"
- "["
- "]"
- "{"
- "}"
- "#["
- ] @punctuation.bracket
+  (php_tag)
+  "?>"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "#["
+] @punctuation.bracket
 
 [
   "="
-
   "."
   "-"
   "*"
@@ -272,7 +331,6 @@
   "+"
   "%"
   "**"
-
   "~"
   "|"
   "^"
@@ -280,12 +338,9 @@
   "<<"
   ">>"
   "<<<"
-
   "->"
   "?->"
-
   "=>"
-
   "<"
   "<="
   ">="
@@ -295,11 +350,9 @@
   "!="
   "==="
   "!=="
-
   "!"
   "&&"
   "||"
-
   ".="
   "-="
   "+="
@@ -315,7 +368,6 @@
   "??="
   "--"
   "++"
-
   "@"
   "::"
 ] @operator
diff --git a/queries/php/indents.scm b/queries/php/indents.scm
index 53e78c341..a81faed62 100644
--- a/queries/php/indents.scm
+++ b/queries/php/indents.scm
@@ -18,19 +18,21 @@
   "]"
 ] @indent.branch
 
-[
-  (comment)
-] @indent.auto
+(comment) @indent.auto
 
-(compound_statement "}" @indent.end)
+(compound_statement
+  "}" @indent.end)
 
 (ERROR
   "(" @indent.align
-  . (_)
+  .
+  (_)
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
+
 (ERROR
   "[" @indent.align
-  . (_)
+  .
+  (_)
   (#set! indent.open_delimiter "[")
   (#set! indent.close_delimiter "]"))
diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index 0e78d45e5..0c9d25ce6 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -8,39 +8,40 @@
 ((heredoc
   (heredoc_body) @injection.content
   (heredoc_end) @injection.language
- (#set! injection.include-children)
- (#downcase! @injection.language)))
+  (#set! injection.include-children)
+  (#downcase! @injection.language)))
 
 ((nowdoc
   (nowdoc_body) @injection.content
   (heredoc_end) @injection.language
- (#set! injection.include-children)
- (#downcase! @injection.language)))
-
-;; regex
+  (#set! injection.include-children)
+  (#downcase! @injection.language)))
 
+; regex
 ((function_call_expression
   function: (_) @_preg_func_identifier
-  arguments: 
-    (arguments . 
-      (argument 
-        (_ (string_value) @injection.content))))
-    (#set! injection.language "regex")
-    (#lua-match? @_preg_func_identifier "^preg_"))
-
-;; bash
+  arguments:
+    (arguments
+      .
+      (argument
+        (_
+          (string_value) @injection.content))))
+  (#set! injection.language "regex")
+  (#lua-match? @_preg_func_identifier "^preg_"))
 
+; bash
 ((function_call_expression
   function: (_) @_shell_func_identifier
-  arguments: 
-    (arguments . 
-      (argument 
-        (_ (string_value) @injection.content))))
+  arguments:
+    (arguments
+      .
+      (argument
+        (_
+          (string_value) @injection.content))))
   (#set! injection.language "bash")
-  (#any-of? @_shell_func_identifier "shell_exec" "escapeshellarg" 
-   "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec" "system"))
+  (#any-of? @_shell_func_identifier "shell_exec" "escapeshellarg" "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec" "system"))
 
-(expression_statement 
-  (shell_command_expression 
+(expression_statement
+  (shell_command_expression
     (string_value) @injection.content)
-    (#set! injection.language "bash"))
+  (#set! injection.language "bash"))
diff --git a/queries/php/locals.scm b/queries/php/locals.scm
index c1403e40b..8d509b37c 100644
--- a/queries/php/locals.scm
+++ b/queries/php/locals.scm
@@ -1,17 +1,16 @@
 ; Scopes
 ;-------
-
 ((class_declaration
   name: (name) @local.definition.type) @local.scope
-    (#set! definition.type.scope "parent"))
+  (#set! definition.type.scope "parent"))
 
 ((method_declaration
   name: (name) @local.definition.method) @local.scope
-    (#set! definition.method.scope "parent"))
+  (#set! definition.method.scope "parent"))
 
 ((function_definition
   name: (name) @local.definition.function) @local.scope
-    (#set! definition.function.scope "parent"))
+  (#set! definition.function.scope "parent"))
 
 (anonymous_function_creation_expression
   (anonymous_function_use_clause
@@ -20,7 +19,6 @@
 
 ; Definitions
 ;------------
-
 (simple_parameter
   (variable_name
     (name) @local.definition.var))
@@ -33,7 +31,7 @@
 (foreach_statement
   (variable_name
     (name) @local.reference
-      (#set! reference.kind "var"))
+    (#set! reference.kind "var"))
   (variable_name
     (name) @local.definition.var))
 
@@ -48,40 +46,41 @@
 
 ; References
 ;------------
-
 (named_type
   (name) @local.reference
-    (#set! reference.kind "type"))
+  (#set! reference.kind "type"))
 
 (named_type
   (qualified_name) @local.reference
-    (#set! reference.kind "type"))
+  (#set! reference.kind "type"))
 
 (variable_name
   (name) @local.reference
-    (#set! reference.kind "var"))
+  (#set! reference.kind "var"))
 
 (member_access_expression
   name: (name) @local.reference
-    (#set! reference.kind "field"))
+  (#set! reference.kind "field"))
 
 (member_call_expression
   name: (name) @local.reference
-    (#set! reference.kind "method"))
+  (#set! reference.kind "method"))
 
 (function_call_expression
-  function: (qualified_name
-    (name) @local.reference
+  function:
+    (qualified_name
+      (name) @local.reference
       (#set! reference.kind "function")))
 
 (object_creation_expression
   (qualified_name
     (name) @local.reference
-      (#set! reference.kind "type")))
+    (#set! reference.kind "type")))
 
 (scoped_call_expression
-  scope: (qualified_name
-    (name) @local.reference
+  scope:
+    (qualified_name
+      (name) @local.reference
       (#set! reference.kind "type"))
   name: (name) @local.reference
-    (#set! reference.kind "method"))
+  (#set! reference.kind "method"))
diff --git a/queries/phpdoc/highlights.scm b/queries/phpdoc/highlights.scm
index a30409314..076a7d528 100644
--- a/queries/phpdoc/highlights.scm
+++ b/queries/phpdoc/highlights.scm
@@ -1,22 +1,28 @@
 (tag_name) @attribute @nospell
+
 (tag
-  (tag_name) @_tag (#eq? @_tag "@param")
-  (variable_name) @variable.parameter
-)
+  (tag_name) @_tag
+  (#eq? @_tag "@param")
+  (variable_name) @variable.parameter)
+
 (tag
-  (tag_name) @_tag (#eq? @_tag "@property")
-  (variable_name) @property
-)
+  (tag_name) @_tag
+  (#eq? @_tag "@property")
+  (variable_name) @property)
+
 (tag
-  (tag_name) @_tag (#eq? @_tag "@var")
-  (variable_name) @variable
-)
+  (tag_name) @_tag
+  (#eq? @_tag "@var")
+  (variable_name) @variable)
+
 (tag
-  (tag_name) @_tag (#eq? @_tag "@function.method")
-  (name) @function.method
-)
+  (tag_name) @_tag
+  (#eq? @_tag "@function.method")
+  (name) @function.method)
+
 (parameter
   (variable_name) @variable.parameter)
+
 (type_list
   [
     (array_type)
@@ -24,24 +30,36 @@
     (named_type)
     (optional_type)
   ] @type)
+
 (type_list) @nospell
+
 (variable_name) @nospell
+
 (tag
-  (description (text) @none @spell))
+  (description
+    (text) @none @spell))
+
 (tag
   [
     (author_name)
     (version)
   ] @none)
-(tag
-  (email_address) @string.special.url
-)
 
-(type_list "|" @keyword)
-(variable_name "$" @keyword)
+(tag
+  (email_address) @string.special.url)
+
+(type_list
+  "|" @keyword)
+
+(variable_name
+  "$" @keyword)
+
 (tag
   (tag_name) @_tag_name
-  ["<" ">"] @keyword
+  [
+    "<"
+    ">"
+  ] @keyword
   (#eq? @_tag_name "@author"))
 
 (text) @spell
diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm
index 6d0479b37..8bb9dca01 100644
--- a/queries/pioasm/highlights.scm
+++ b/queries/pioasm/highlights.scm
@@ -1,34 +1,93 @@
-[ (line_comment) (block_comment) ] @comment @spell
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
 
 (label_decl) @label
 
 (string) @string
 
-(instruction opcode: _ @function.call)
+(instruction
+  opcode: _ @function.call)
 
-[ "pins" "x" "y" "null" "isr" "osr" "osre" "status" "pc" "exec" ] @constant.builtin
-(wait_source [ "irq" "gpio" "pin" ] @constant.builtin)
+[
+  "pins"
+  "x"
+  "y"
+  "null"
+  "isr"
+  "osr"
+  "osre"
+  "status"
+  "pc"
+  "exec"
+] @constant.builtin
 
-(out_target "pindirs" @constant.builtin)
-(set_target "pindirs" @constant.builtin)
-(directive "pindirs" @attribute)
+(wait_source
+  [
+    "irq"
+    "gpio"
+    "pin"
+  ] @constant.builtin)
+
+(out_target
+  "pindirs" @constant.builtin)
+
+(set_target
+  "pindirs" @constant.builtin)
+
+(directive
+  "pindirs" @attribute)
+
+(condition
+  [
+    "--"
+    "!="
+  ] @operator)
+
+(expression
+  [
+    "+"
+    "-"
+    "*"
+    "/"
+    "|"
+    "&"
+    "^"
+    "::"
+  ] @operator)
 
-(condition [ "--" "!=" ] @operator)
-(expression [ "+" "-" "*" "/" "|" "&" "^" "::" ] @operator)
 (not) @operator
 
-[ (optional) (irq_modifiers) ] @type.qualifier
+[
+  (optional)
+  (irq_modifiers)
+] @type.qualifier
 
-[ "block" "noblock" "rel" ] @attribute
+[
+  "block"
+  "noblock"
+  "rel"
+] @attribute
 
-[ "iffull" "ifempty" ] @keyword.conditional
+[
+  "iffull"
+  "ifempty"
+] @keyword.conditional
 
 "public" @keyword.storage
 
 (integer) @number
 
-(directive (identifier) @variable)
-(directive (symbol_def (identifier) @variable))
-(value (identifier) @variable)
+(directive
+  (identifier) @variable)
 
-(directive directive: _ @keyword.directive)
+(directive
+  (symbol_def
+    (identifier) @variable))
+
+(value
+  (identifier) @variable)
+
+(directive
+  directive: _ @keyword.directive)
diff --git a/queries/pioasm/injections.scm b/queries/pioasm/injections.scm
index 854886c65..84d17cf2d 100644
--- a/queries/pioasm/injections.scm
+++ b/queries/pioasm/injections.scm
@@ -1,14 +1,14 @@
-([ 
-   (line_comment) 
-   (block_comment) 
- ] @injection.content
- (#set! injection.language "comment"))
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))
 
 ((code_block
   (code_block_language) @_language
   (code_block_body) @injection.content)
- (#eq? @_language "c-sdk")
- (#set! injection.language "c"))
+  (#eq? @_language "c-sdk")
+  (#set! injection.language "c"))
 
 (code_block
   (code_block_language) @injection.language
diff --git a/queries/po/folds.scm b/queries/po/folds.scm
index 589696477..fd1fb1ebf 100644
--- a/queries/po/folds.scm
+++ b/queries/po/folds.scm
@@ -4,6 +4,5 @@
   (msgid_plural)
   (msgstr)
   (msgstr_plural)
-
   (message)
 ] @fold
diff --git a/queries/po/highlights.scm b/queries/po/highlights.scm
index d799d692b..0cc92e72a 100644
--- a/queries/po/highlights.scm
+++ b/queries/po/highlights.scm
@@ -1,5 +1,4 @@
 ; Keywords
-
 [
   "msgctxt"
   "msgid"
@@ -9,11 +8,12 @@
 ] @keyword
 
 ; Punctuation
-
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 ; Literals
-
 (string) @string
 
 (escape_sequence) @string.escape
@@ -21,9 +21,12 @@
 (number) @number
 
 ; Comments
-
 (comment) @comment @spell
 
-(comment (reference (text) @string.special.path))
+(comment
+  (reference
+    (text) @string.special.path))
 
-(comment (flag (text) @keyword.directive))
+(comment
+  (flag
+    (text) @keyword.directive))
diff --git a/queries/po/injections.scm b/queries/po/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/po/injections.scm
+++ b/queries/po/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/pod/highlights.scm b/queries/pod/highlights.scm
index e5a192620..6e4779c85 100644
--- a/queries/pod/highlights.scm
+++ b/queries/pod/highlights.scm
@@ -1,8 +1,9 @@
 ; A highlight file for nvim-treesitter to use
-
-[(pod_command)
- (command)
- (cut_command)] @keyword
+[
+  (pod_command)
+  (command)
+  (cut_command)
+] @keyword
 
 ((command_paragraph
   (command) @keyword
@@ -29,13 +30,15 @@
   (#lua-match? @keyword "^=encoding")
   (content) @string.special)
 
-
-(verbatim_paragraph (content) @markup.raw)
+(verbatim_paragraph
+  (content) @markup.raw)
 
 (interior_sequence
   (sequence_letter) @character
-  ["<" ">"] @punctuation.delimiter
-)
+  [
+    "<"
+    ">"
+  ] @punctuation.delimiter)
 
 (interior_sequence
   (sequence_letter) @character
diff --git a/queries/poe_filter/highlights.scm b/queries/poe_filter/highlights.scm
index 7db71d279..b0c715ac9 100644
--- a/queries/poe_filter/highlights.scm
+++ b/queries/poe_filter/highlights.scm
@@ -1,9 +1,20 @@
-["Show" "Hide" "Minimal"] @module
+[
+  "Show"
+  "Hide"
+  "Minimal"
+] @module
 
-["Import" "Optional"] @keyword.import
+[
+  "Import"
+  "Optional"
+] @keyword.import
+
+(condition
+  (name) @keyword.conditional)
+
+(action
+  (name) @keyword)
 
-(condition (name) @keyword.conditional)
-(action (name) @keyword)
 (continue) @label
 
 (operator) @operator
diff --git a/queries/poe_filter/injections.scm b/queries/poe_filter/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/poe_filter/injections.scm
+++ b/queries/poe_filter/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/pony/folds.scm b/queries/pony/folds.scm
index 1f7ba11b3..95b76eb69 100644
--- a/queries/pony/folds.scm
+++ b/queries/pony/folds.scm
@@ -1,20 +1,16 @@
 [
-  (use_statement) 
+  (use_statement)
   (actor_definition)
   (class_definition)
   (primitive_definition)
   (interface_definition)
   (trait_definition)
   (struct_definition)
-
   (constructor)
   (method)
   (behavior)
-
   (parameters)
-
   (type)
-
   (if_statement)
   (iftype_statement)
   (elseif_block)
@@ -30,10 +26,8 @@
   (case_statement)
   (parenthesized_expression)
   (tuple_expression)
-
   (array_literal)
   (object_literal)
   (string)
-
   (block_comment)
 ] @fold
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
index 1d0c86c35..5884a3e89 100644
--- a/queries/pony/highlights.scm
+++ b/queries/pony/highlights.scm
@@ -1,11 +1,7 @@
 ; Includes
-
-[
-  "use"
-] @keyword.import
+"use" @keyword.import
 
 ; Keywords
-
 [
   "type"
   "actor"
@@ -25,25 +21,18 @@
   "where"
 ] @keyword
 
-[
-  "fun"
-] @keyword.function
+"fun" @keyword.function
 
-[
-  "be"
-] @keyword.coroutine
+"be" @keyword.coroutine
 
 [
   "in"
   "is"
 ] @keyword.operator
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 ; Qualifiers
-
 [
   "iso"
   "trn"
@@ -59,7 +48,6 @@
 ] @type.qualifier
 
 ; Conditionals
-
 [
   "if"
   "ifdef"
@@ -70,14 +58,16 @@
   "match"
 ] @keyword.conditional
 
-(if_statement "end" @keyword.conditional)
+(if_statement
+  "end" @keyword.conditional)
 
-(iftype_statement "end" @keyword.conditional)
+(iftype_statement
+  "end" @keyword.conditional)
 
-(match_statement "end" @keyword.conditional)
+(match_statement
+  "end" @keyword.conditional)
 
 ; Repeats
-
 [
   "repeat"
   "until"
@@ -88,86 +78,112 @@
   "break"
 ] @keyword.repeat
 
-(do_block "end" @keyword.repeat)
+(do_block
+  "end" @keyword.repeat)
 
-(repeat_statement "end" @keyword.repeat)
+(repeat_statement
+  "end" @keyword.repeat)
 
 ; Exceptions
-
 [
   "try"
   (error)
   "compile_error"
 ] @keyword.exception
 
-(try_statement "end" @keyword.exception)
+(try_statement
+  "end" @keyword.exception)
 
-(recover_statement "end" @keyword.exception)
+(recover_statement
+  "end" @keyword.exception)
 
 ; Attributes
-
 (annotation) @attribute
 
 ; Variables
-
 (identifier) @variable
 
 (this) @variable.builtin
 
 ; Fields
+(field
+  name: (identifier) @variable.member)
 
-(field name: (identifier) @variable.member)
-
-(member_expression "." (identifier) @variable.member)
+(member_expression
+  "."
+  (identifier) @variable.member)
 
 ; Constructors
-
-(constructor "new" @keyword.operator (identifier) @constructor)
+(constructor
+  "new" @keyword.operator
+  (identifier) @constructor)
 
 ; Methods
+(method
+  (identifier) @function.method)
 
-(method (identifier) @function.method)
+(behavior
+  (identifier) @function.method)
 
-(behavior (identifier) @function.method)
+(ffi_method
+  (identifier) @function.method)
 
-(ffi_method (identifier) @function.method)
-
-((ffi_method (string) @string.special)
+((ffi_method
+  (string) @string.special)
   (#set! "priority" 105))
 
 (call_expression
   callee:
     [
       (identifier) @function.method.call
-      (ffi_identifier (identifier) @function.method.call)
-      (member_expression "." (identifier) @function.method.call)
+      (ffi_identifier
+        (identifier) @function.method.call)
+      (member_expression
+        "."
+        (identifier) @function.method.call)
     ])
 
 ; Parameters
+(parameter
+  name: (identifier) @variable.parameter)
 
-(parameter name: (identifier) @variable.parameter)
-(lambda_parameter name: (identifier) @variable.parameter)
+(lambda_parameter
+  name: (identifier) @variable.parameter)
 
 ; Types
+(type_alias
+  (identifier) @type.definition)
 
-(type_alias (identifier) @type.definition)
+(base_type
+  name: (identifier) @type)
 
-(base_type name: (identifier) @type)
+(generic_parameter
+  (identifier) @type)
 
-(generic_parameter (identifier) @type)
-
-(lambda_type (identifier)? @function.method)
+(lambda_type
+  (identifier)? @function.method)
 
 ((identifier) @type
   (#lua-match? @type "^_*[A-Z][a-zA-Z0-9_]*$"))
 
 ; Operators
-
 (unary_expression
-  operator: ["not" "addressof" "digestof"] @keyword.operator)
+  operator:
+    [
+      "not"
+      "addressof"
+      "digestof"
+    ] @keyword.operator)
 
 (binary_expression
-  operator: ["and" "or" "xor" "is" "isnt"] @keyword.operator)
+  operator:
+    [
+      "and"
+      "or"
+      "xor"
+      "is"
+      "isnt"
+    ] @keyword.operator)
 
 [
   "="
@@ -213,35 +229,57 @@
 ] @operator
 
 ; Literals
-
 (string) @string
 
-(source_file (string) @string.documentation)
-(actor_definition (string) @string.documentation)
-(class_definition (string) @string.documentation)
-(primitive_definition (string) @string.documentation)
-(interface_definition (string) @string.documentation)
-(trait_definition (string) @string.documentation)
-(struct_definition (string) @string.documentation)
-(type_alias (string) @string.documentation)
-(field (string) @string.documentation)
+(source_file
+  (string) @string.documentation)
+
+(actor_definition
+  (string) @string.documentation)
+
+(class_definition
+  (string) @string.documentation)
+
+(primitive_definition
+  (string) @string.documentation)
+
+(interface_definition
+  (string) @string.documentation)
+
+(trait_definition
+  (string) @string.documentation)
+
+(struct_definition
+  (string) @string.documentation)
+
+(type_alias
+  (string) @string.documentation)
+
+(field
+  (string) @string.documentation)
 
 (constructor
   [
-   (string) @string.documentation
-   (block . (string) @string.documentation)
+    (string) @string.documentation
+    (block
+      .
+      (string) @string.documentation)
   ])
 
 (method
   [
-   (string) @string.documentation
-   (block . (string) @string.documentation)
+    (string) @string.documentation
+    (block
+      .
+      (string) @string.documentation)
   ])
 
 (behavior
   [
-   (string) @string.documentation
-   (block . (string) @string.documentation)
+    (string) @string.documentation
+    (block
+      .
+      (string) @string.documentation)
   ])
 
 (character) @character
@@ -255,12 +293,20 @@
 (boolean) @boolean
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
-
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   "."
@@ -281,7 +327,6 @@
 ] @punctuation.special
 
 ; Comments
-
 [
   (line_comment)
   (block_comment)
diff --git a/queries/pony/indents.scm b/queries/pony/indents.scm
index c9b3e7a25..3bddd29de 100644
--- a/queries/pony/indents.scm
+++ b/queries/pony/indents.scm
@@ -1,18 +1,15 @@
 [
-  (use_statement) 
+  (use_statement)
   (actor_definition)
   (class_definition)
   (primitive_definition)
   (interface_definition)
   (trait_definition)
   (struct_definition)
-
   (constructor)
   (method)
   (behavior)
-
   (parameters)
-
   (if_block)
   (then_block)
   (elseif_block)
@@ -23,22 +20,27 @@
   (match_statement)
   (parenthesized_expression)
   (tuple_expression)
-
   (array_literal)
   (object_literal)
 ] @indent.begin
 
-(try_statement (block) @indent.begin)
+(try_statement
+  (block) @indent.begin)
 
-(repeat_statement (block) @indent.begin)
+(repeat_statement
+  (block) @indent.begin)
 
-(recover_statement (block) @indent.begin)
+(recover_statement
+  (block) @indent.begin)
 
-(return_statement (block) @indent.begin)
+(return_statement
+  (block) @indent.begin)
 
-(continue_statement (block) @indent.begin)
+(continue_statement
+  (block) @indent.begin)
 
-(break_statement (block) @indent.begin)
+(break_statement
+  (block) @indent.begin)
 
 [
   "}"
@@ -46,11 +48,20 @@
   ")"
 ] @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/pony/injections.scm b/queries/pony/injections.scm
index 43ae7287b..3cd6aac8e 100644
--- a/queries/pony/injections.scm
+++ b/queries/pony/injections.scm
@@ -1,5 +1,5 @@
 ([
   (line_comment)
   (block_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/pony/locals.scm b/queries/pony/locals.scm
index 033dcb257..a27e501a3 100644
--- a/queries/pony/locals.scm
+++ b/queries/pony/locals.scm
@@ -1,18 +1,15 @@
 ; Scopes
-
 [
-  (use_statement) 
+  (use_statement)
   (actor_definition)
   (class_definition)
   (primitive_definition)
   (interface_definition)
   (trait_definition)
   (struct_definition)
-
   (constructor)
   (method)
   (behavior)
-
   (if_statement)
   (iftype_statement)
   (elseif_block)
@@ -28,17 +25,14 @@
   (case_statement)
   (parenthesized_expression)
   (tuple_expression)
-
   (array_literal)
-  (object_literal) 
+  (object_literal)
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
-
 (field
   name: (identifier) @local.definition.field)
 
@@ -84,8 +78,9 @@
 (for_statement
   [
     (identifier) @local.definition.var
-    (tuple_expression (identifier) @local.definition.var)
+    (tuple_expression
+      (identifier) @local.definition.var)
   ])
 
-(with_elem 
+(with_elem
   (identifier) @local.definition.var)
diff --git a/queries/prisma/folds.scm b/queries/prisma/folds.scm
index 6b42d26cc..73be36016 100644
--- a/queries/prisma/folds.scm
+++ b/queries/prisma/folds.scm
@@ -1,7 +1,7 @@
 [
- (generator_declaration)
- (datasource_declaration)
- (model_declaration)
- (enum_declaration)
- (view_declaration)
+  (generator_declaration)
+  (datasource_declaration)
+  (model_declaration)
+  (enum_declaration)
+  (view_declaration)
 ] @fold
diff --git a/queries/prisma/highlights.scm b/queries/prisma/highlights.scm
index cfdc3a668..ce9c25590 100644
--- a/queries/prisma/highlights.scm
+++ b/queries/prisma/highlights.scm
@@ -1,12 +1,12 @@
 (variable) @variable
 
 [
- "datasource"
- "enum"
- "generator"
- "model"
- "type"
- "view"
+  "datasource"
+  "enum"
+  "generator"
+  "model"
+  "type"
+  "view"
 ] @keyword
 
 (comment) @comment @spell
@@ -19,9 +19,14 @@
 ] @function
 
 (arguments) @property
+
 (column_type) @type
+
 (enumeral) @constant
-(column_declaration (identifier) @variable)
+
+(column_declaration
+  (identifier) @variable)
+
 (string) @string
 
 [
diff --git a/queries/promql/highlights.scm b/queries/promql/highlights.scm
index d0af0356c..0f58f1578 100644
--- a/queries/promql/highlights.scm
+++ b/queries/promql/highlights.scm
@@ -1,5 +1,4 @@
 ; highlights.scm
-
 [
   "*"
   "/"
@@ -26,13 +25,17 @@
 ] @punctuation.bracket
 
 (float_literal) @number.float
+
 (string_literal) @string
 
 (metric_name) @type
+
 (range_selection) @type
+
 (subquery_range_selection) @type
 
 (label_name) @variable.member
+
 (label_value) @string.regexp
 
 (function_name) @function.call
diff --git a/queries/promql/injections.scm b/queries/promql/injections.scm
index 408b1c7b5..4fbe37a00 100644
--- a/queries/promql/injections.scm
+++ b/queries/promql/injections.scm
@@ -1,3 +1,3 @@
 ((label_value) @injection.content
- (#set! injection.language "regex")
- (#offset! @injection.content 0 1 0 -1))
+  (#set! injection.language "regex")
+  (#offset! @injection.content 0 1 0 -1))
diff --git a/queries/properties/highlights.scm b/queries/properties/highlights.scm
index 3414294b7..d819e20a5 100644
--- a/queries/properties/highlights.scm
+++ b/queries/properties/highlights.scm
@@ -4,25 +4,41 @@
 
 (value) @string
 
-(value (escape) @string.escape)
+(value
+  (escape) @string.escape)
 
 ((value) @boolean
- (#any-of? @boolean "true" "false"))
+  (#any-of? @boolean "true" "false"))
 
 ((value) @number
- (#lua-match? @number "^%d+$"))
+  (#lua-match? @number "^%d+$"))
 
 (index) @number
 
-(property [ "=" ":" ] @operator)
+(property
+  [
+    "="
+    ":"
+  ] @operator)
 
-[ "${" "}" ] @punctuation.special
+[
+  "${"
+  "}"
+] @punctuation.special
 
-(substitution ":" @punctuation.special)
+(substitution
+  ":" @punctuation.special)
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "." "\\" ] @punctuation.delimiter
+[
+  "."
+  "\\"
+] @punctuation.delimiter
 
-((substitution (key) @constant)
- (#lua-match? @constant "^[A-Z_][A-Z0-9_]*$"))
+((substitution
+  (key) @constant)
+  (#lua-match? @constant "^[A-Z_][A-Z0-9_]*$"))
diff --git a/queries/properties/injections.scm b/queries/properties/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/properties/injections.scm
+++ b/queries/properties/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/properties/locals.scm b/queries/properties/locals.scm
index f70e953db..91a3b9a86 100644
--- a/queries/properties/locals.scm
+++ b/queries/properties/locals.scm
@@ -1,3 +1,5 @@
-(property (key) @local.definition)
+(property
+  (key) @local.definition)
 
-(substitution (key) @local.reference)
+(substitution
+  (key) @local.reference)
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index f3715d5db..102d5c20b 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -11,13 +11,9 @@
   "to"
 ] @keyword
 
-[
- "rpc"
-] @keyword.function
+"rpc" @keyword.function
 
-[
- "returns"
-] @keyword.return
+"returns" @keyword.return
 
 [
   "optional"
@@ -75,8 +71,8 @@
 ] @punctuation.bracket
 
 [
- ";"
- ","
+  ";"
+  ","
 ] @punctuation.delimiter
 
 "=" @operator
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 587e8f070..2ab793ce7 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -25,14 +25,13 @@
 (keyword_case) @keyword.conditional
 
 [
- (literal_string)
- (f_string)
- (s_string)
+  (literal_string)
+  (f_string)
+  (s_string)
 ] @string
 
 (assignment
   alias: (field) @variable.member)
-
 alias: (identifier) @variable.member
 
 (comment) @comment @spell
@@ -99,18 +98,18 @@ alias: (identifier) @variable.member
 ] @function
 
 [
- (keyword_side)
- (keyword_format)
+  (keyword_side)
+  (keyword_format)
 ] @attribute
 
 [
- (keyword_version)
- (keyword_target)
+  (keyword_version)
+  (keyword_target)
 ] @type.qualifier
 
 (target) @function.builtin
 
- [
+[
   (date)
   (time)
   (timestamp)
@@ -130,9 +129,7 @@ alias: (identifier) @variable.member
   (keyword_false)
 ] @boolean
 
-[
- (keyword_in)
-] @keyword.operator
+(keyword_in) @keyword.operator
 
 (function_definition
   (keyword_let)
@@ -145,7 +142,4 @@ alias: (identifier) @variable.member
   (keyword_let)
   name: (identifier) @constant)
 
-
- (keyword_null) @constant.builtin
-
-
+(keyword_null) @constant.builtin
diff --git a/queries/prql/injections.scm b/queries/prql/injections.scm
index ac266cc2d..e6cbeda35 100644
--- a/queries/prql/injections.scm
+++ b/queries/prql/injections.scm
@@ -1,6 +1,6 @@
 ((s_string) @injection.content
- (#set! injection.language "sql")
- (#offset! @injection.content 0 2 0 -1))
+  (#set! injection.language "sql")
+  (#offset! @injection.content 0 2 0 -1))
 
 (from_text
   (keyword_from_text)
@@ -10,4 +10,4 @@
   (#offset! @injection.content 0 3 0 -3))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/psv/highlights.scm b/queries/psv/highlights.scm
index b7303fe0b..1e886a0a4 100644
--- a/queries/psv/highlights.scm
+++ b/queries/psv/highlights.scm
@@ -1,3 +1,2 @@
 ; inherits: tsv
-
 "|" @punctuation.delimiter
diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index 7ac2c7c63..3645a7e3e 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -1,6 +1,7 @@
 (comment) @comment @spell
 
 (tag_name) @tag
+
 ((tag_name) @constant.builtin
   ; https://www.script-example.com/html-tag-liste
   ; format-ignore
@@ -17,6 +18,7 @@
     "script" "noscript" "template" "slot" "canvas"))
 
 (id) @constant
+
 (class) @property
 
 (doctype) @keyword.directive
@@ -28,54 +30,89 @@
     (attribute
       (attribute_name) @tag.attribute
       "=" @operator)))
+
 ((tag
-   (attributes
-     (attribute (attribute_name) @keyword)))
- (#match? @keyword "^(:|v-bind|v-|\\@)"))
+  (attributes
+    (attribute
+      (attribute_name) @keyword)))
+  (#match? @keyword "^(:|v-bind|v-|\\@)"))
+
 (quoted_attribute_value) @string
 
-(include (keyword) @keyword.import)
-(extends (keyword) @keyword.import)
+(include
+  (keyword) @keyword.import)
+
+(extends
+  (keyword) @keyword.import)
+
 (filename) @string.special.path
 
-(block_definition (keyword) @keyword)
-(block_append (keyword)+ @keyword)
-(block_prepend (keyword)+ @keyword)
+(block_definition
+  (keyword) @keyword)
+
+(block_append
+  (keyword)+ @keyword)
+
+(block_prepend
+  (keyword)+ @keyword)
+
 (block_name) @type
 
-(conditional (keyword) @keyword.conditional)
+(conditional
+  (keyword) @keyword.conditional)
+
 (case
   (keyword) @keyword.conditional
-  (when (keyword) @keyword.conditional)+)
+  (when
+    (keyword) @keyword.conditional)+)
 
-(each (keyword) @keyword.repeat)
-(while (keyword) @keyword.repeat)
+(each
+  (keyword) @keyword.repeat)
+
+(while
+  (keyword) @keyword.repeat)
 
 (mixin_use
   "+" @punctuation.delimiter
   (mixin_name) @function.call)
+
 (mixin_definition
   (keyword) @keyword.function
   (mixin_name) @function)
+
 (mixin_attributes
   (attribute_name) @variable.parameter)
 
 (filter
   ":" @punctuation.delimiter
   (filter_name) @function.method.call)
+
 (filter
   (attributes
-    (attribute (attribute_name) @variable.parameter)))
+    (attribute
+      (attribute_name) @variable.parameter)))
 
 [
- "(" ")"
- "#{" "}"
- ;; unsupported
- ; "!{"
- ; "#[" "]"
+  "("
+  ")"
+  "#{"
+  "}"
+  ; unsupported
+  ; "!{"
+  ; "#[" "]"
 ] @punctuation.bracket
 
-[ "," "." "|" ] @punctuation.delimiter
-(buffered_code "=" @punctuation.delimiter)
-(unbuffered_code "-" @punctuation.delimiter)
-(unescaped_buffered_code "!=" @punctuation.delimiter)
+[
+  ","
+  "."
+  "|"
+] @punctuation.delimiter
+
+(buffered_code
+  "=" @punctuation.delimiter)
+
+(unbuffered_code
+  "-" @punctuation.delimiter)
+
+(unescaped_buffered_code
+  "!=" @punctuation.delimiter)
diff --git a/queries/pug/injections.scm b/queries/pug/injections.scm
index a307a4eb2..d4bd712b5 100644
--- a/queries/pug/injections.scm
+++ b/queries/pug/injections.scm
@@ -1,8 +1,8 @@
 ((javascript) @injection.content
- (#set! injection.language "javascript"))
+  (#set! injection.language "javascript"))
 
 ((attribute_name) @_attribute_name
-  (quoted_attribute_value 
+  (quoted_attribute_value
     (attribute_value) @injection.content
     (#set! injection.language "javascript"))
   (#match? @_attribute_name "^(:|v-bind|v-|\\@)"))
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index aaf5dac39..8e99f1268 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -1,17 +1,17 @@
 ; Variables
-
 (identifier) @variable
 
 ; Includes
-
 "include" @keyword.import
 
-(include_statement (identifier) @type)
+(include_statement
+  (identifier) @type)
 
-(include_statement (class_identifier (identifier) @type . ))
+(include_statement
+  (class_identifier
+    (identifier) @type .))
 
 ; Keywords
-
 [
   "class"
   "inherits"
@@ -33,68 +33,99 @@
   "case"
 ] @keyword.conditional
 
-(default_case "default" @keyword.conditional)
+(default_case
+  "default" @keyword.conditional)
 
 ; Properties
+(attribute
+  name: (identifier) @property)
 
-(attribute name: (identifier) @property)
-(attribute name: (variable (identifier) @property))
+(attribute
+  name:
+    (variable
+      (identifier) @property))
 
 ; Parameters
+(lambda
+  (variable
+    (identifier) @variable.parameter))
 
-(lambda (variable (identifier) @variable.parameter))
-
-(parameter (variable (identifier) @variable.parameter))
-
-(function_call (identifier) @variable.parameter)
-
-(method_call (identifier) @variable.parameter)
-
-; Functions
-
-(function_declaration
-  "function" . (identifier) @function)
+(parameter
+  (variable
+    (identifier) @variable.parameter))
 
 (function_call
-  (identifier) @function.call "(")
-
-(defined_resource_type
-  "define" . (identifier) @function)
-
-; Methods
-
-(function_declaration
-  "function" . (class_identifier (identifier) @function.method . ))
-
-(function_call
-  (class_identifier (identifier) @function.method.call . ))
-
-(defined_resource_type
-  "define" . (class_identifier (identifier) @function.method . ))
+  (identifier) @variable.parameter)
 
 (method_call
-  "." . (identifier) @function.method.call)
+  (identifier) @variable.parameter)
+
+; Functions
+(function_declaration
+  "function"
+  .
+  (identifier) @function)
+
+(function_call
+  (identifier) @function.call
+  "(")
+
+(defined_resource_type
+  "define"
+  .
+  (identifier) @function)
+
+; Methods
+(function_declaration
+  "function"
+  .
+  (class_identifier
+    (identifier) @function.method .))
+
+(function_call
+  (class_identifier
+    (identifier) @function.method.call .))
+
+(defined_resource_type
+  "define"
+  .
+  (class_identifier
+    (identifier) @function.method .))
+
+(method_call
+  "."
+  .
+  (identifier) @function.method.call)
 
 ; Types
-
 (type) @type
 
 (builtin_type) @type.builtin
 
 (class_definition
   (identifier) @type)
-(class_definition
-  (class_identifier (identifier) @type . ))
 
-(class_inherits (identifier) @type)
-(class_inherits (class_identifier (identifier) @type . ))
+(class_definition
+  (class_identifier
+    (identifier) @type .))
+
+(class_inherits
+  (identifier) @type)
+
+(class_inherits
+  (class_identifier
+    (identifier) @type .))
 
 (resource_declaration
   (identifier) @type)
-(resource_declaration
-  (class_identifier (identifier) @type . ))
 
-(node_definition (node_name (identifier) @type))
+(resource_declaration
+  (class_identifier
+    (identifier) @type .))
+
+(node_definition
+  (node_name
+    (identifier) @type))
 
 ((identifier) @type
   (#lua-match? @type "^[A-Z]"))
@@ -103,11 +134,11 @@
   (#any-of? @type.builtin "Boolean" "Integer" "Float" "String" "Array" "Hash" "Regexp" "Variant" "Data" "Undef" "Default" "File"))
 
 ; "Namespaces"
-
-(class_identifier . (identifier) @module)
+(class_identifier
+  .
+  (identifier) @module)
 
 ; Operators
-
 [
   "or"
   "and"
@@ -142,7 +173,6 @@
 ] @operator
 
 ; Punctuation
-
 [
   "|"
   "."
@@ -153,13 +183,26 @@
   "=>"
 ] @punctuation.delimiter
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-(interpolation [ "${" "}" ] @punctuation.special)
+(interpolation
+  [
+    "${"
+    "}"
+  ] @punctuation.special)
 
 [
   "$"
@@ -168,7 +211,6 @@
 ] @punctuation.special
 
 ; Literals
-
 (number) @number
 
 (float) @number.float
@@ -187,5 +229,4 @@
 ] @variable.builtin
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/puppet/locals.scm b/queries/puppet/locals.scm
index cc13bc77b..37ac2d851 100644
--- a/queries/puppet/locals.scm
+++ b/queries/puppet/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (block)
   (defined_resource_type)
@@ -16,31 +15,50 @@
 ] @local.scope
 
 ; References
-
 [
   (identifier)
   (class_identifier)
-  (variable) 
+  (variable)
 ] @local.reference
 
 ; Definitions
-
-(attribute [(identifier) (variable)] @local.definition.field)
+(attribute
+  [
+    (identifier)
+    (variable)
+  ] @local.definition.field)
 
 (function_declaration
-  [(identifier) (class_identifier)] @local.definition.function)
+  [
+    (identifier)
+    (class_identifier)
+  ] @local.definition.function)
 
-(include_statement [(identifier) (class_identifier)] @local.definition.import)
+(include_statement
+  [
+    (identifier)
+    (class_identifier)
+  ] @local.definition.import)
 
-(parameter (variable) @local.definition.parameter)
+(parameter
+  (variable) @local.definition.parameter)
 
 (class_definition
-  [(identifier) (class_identifier)] @local.definition.type)
+  [
+    (identifier)
+    (class_identifier)
+  ] @local.definition.type)
 
 (node_definition
-  (node_name (identifier) @local.definition.type))
+  (node_name
+    (identifier) @local.definition.type))
 
 (resource_declaration
-  [(identifier) (class_identifier)] @local.definition.type)
+  [
+    (identifier)
+    (class_identifier)
+  ] @local.definition.type)
 
-(assignment . (variable) @local.definition.var)
+(assignment
+  .
+  (variable) @local.definition.var)
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index 247ea839e..b241ba852 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -1,152 +1,192 @@
 ; ----------------------------------------------------------------------------
 ; Literals and comments
-
 [
   (integer)
   (exp_negation)
 ] @number
- (exp_literal (number)) @number.float
- (char) @character
- [
-   (string)
-   (triple_quote_string)
- ] @string
 
- (comment) @comment @spell
+(exp_literal
+  (number)) @number.float
+
+(char) @character
+
+[
+  (string)
+  (triple_quote_string)
+] @string
+
+(comment) @comment @spell
 
 ; ----------------------------------------------------------------------------
 ; Punctuation
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
 
- [
-   "("
-   ")"
-   "{"
-   "}"
-   "["
-   "]"
- ] @punctuation.bracket
-
- [
- (comma)
- ";"
- (qualified_module)  ; grabs the `.` (dot), ex: import System.IO
- "."
- ] @punctuation.delimiter
-
+[
+  (comma)
+  ";"
+  (qualified_module) ; grabs the `.` (dot), ex: import System.IO
+  "."
+] @punctuation.delimiter
 
 ; ----------------------------------------------------------------------------
 ; Keywords, operators, includes
+[
+  "if"
+  "then"
+  "else"
+  "case"
+  "of"
+] @keyword.conditional
 
- [
-   "if"
-   "then"
-   "else"
-   "case"
-   "of"
- ] @keyword.conditional
+[
+  "import"
+  "module"
+] @keyword.import
 
- [
-   "import"
-   "module"
- ] @keyword.import
+[
+  (operator)
+  (constructor_operator)
+  (type_operator)
+  (all_names)
+  "="
+  "|"
+  "::"
+  "∷"
+  "=>"
+  "⇒"
+  "<="
+  "⇐"
+  "->"
+  "→"
+  "<-"
+  "←"
+  "\\"
+  "`"
+  "@"
+] @operator
 
- [
-   (operator)
-   (constructor_operator)
-   (type_operator)
-   (all_names)
+(qualified_module
+  (module) @constructor)
 
-   "="
-   "|"
-   "::"
-   "∷"
-   "=>"
-   "⇒"
-   "<="
-   "⇐"
-   "->"
-   "→"
-   "<-"
-   "←"
-   "\\"
-   "`"
-   "@"
- ] @operator
+(module) @module
 
- (qualified_module (module) @constructor)
- (module) @module
- (qualified_type (module) @module)
- (qualified_variable (module) @module)
- (import (module) @module)
+(qualified_type
+  (module) @module)
 
- [
-   (where)
-   "let"
-   "in"
-   "class"
-   "instance"
-   "derive"
-   "foreign"
-   "data"
-   "newtype"
-   "type"
-   "as"
-   "hiding"
-   "do"
-   "ado"
-   "forall"
-   "∀"
-   "infix"
-   "infixl"
-   "infixr"
- ] @keyword
+(qualified_variable
+  (module) @module)
 
- (class_instance "else" @keyword)
+(import
+  (module) @module)
 
- (type_role_declaration
-   "role" @keyword
-   role: (type_role) @type.qualifier)
+[
+  (where)
+  "let"
+  "in"
+  "class"
+  "instance"
+  "derive"
+  "foreign"
+  "data"
+  "newtype"
+  "type"
+  "as"
+  "hiding"
+  "do"
+  "ado"
+  "forall"
+  "∀"
+  "infix"
+  "infixl"
+  "infixr"
+] @keyword
 
- (hole) @character.special
+(class_instance
+  "else" @keyword)
 
- ; `_` wildcards in if-then-else and case-of expressions,
- ; as well as record updates and operator sections
- (wildcard) @variable.parameter
+(type_role_declaration
+  "role" @keyword
+  role: (type_role) @type.qualifier)
+
+(hole) @character.special
+
+; `_` wildcards in if-then-else and case-of expressions,
+; as well as record updates and operator sections
+(wildcard) @variable.parameter
 
 ; ----------------------------------------------------------------------------
 ; Functions and variables
+(variable) @variable
 
- (variable) @variable
- (exp_apply . (exp_name (variable) @function))
- (exp_apply . (exp_name (qualified_variable (variable) @function)))
+(exp_apply
+  .
+  (exp_name
+    (variable) @function))
 
- (row_field (field_name) @variable.member)
- (record_field (field_name) @variable.member)
- (record_accessor (variable) @variable.member)
- (exp_record_access (variable) @variable.member)
+(exp_apply
+  .
+  (exp_name
+    (qualified_variable
+      (variable) @function)))
 
- (signature name: (variable) @type)
- (kind_declaration (class_name) @type)
- (function name: (variable) @function)
- (foreign_import (variable) @function)
- (class_instance (instance_name) @function)
- (derive_declaration (instance_name) @function)
+(row_field
+  (field_name) @variable.member)
 
- ; true or false
- ((variable) @boolean
+(record_field
+  (field_name) @variable.member)
+
+(record_accessor
+  (variable) @variable.member)
+
+(exp_record_access
+  (variable) @variable.member)
+
+(signature
+  name: (variable) @type)
+
+(kind_declaration
+  (class_name) @type)
+
+(function
+  name: (variable) @function)
+
+(foreign_import
+  (variable) @function)
+
+(class_instance
+  (instance_name) @function)
+
+(derive_declaration
+  (instance_name) @function)
+
+; true or false
+((variable) @boolean
   (#any-of? @boolean "true" "false"))
 
- ; The former one works for `tree-sitter highlight` but not in Helix/Kakoune.
- ; The latter two work in Helix (but not Kakoune) and are a good compromise between not highlighting anything at all
- ; as an operator and leaving it to the child nodes, and highlighting everything as an operator.
- (exp_ticked (_) @operator)
- (exp_ticked (exp_name (variable) @operator))
- (exp_ticked (exp_name (qualified_variable (variable) @operator)))
+; The former one works for `tree-sitter highlight` but not in Helix/Kakoune.
+; The latter two work in Helix (but not Kakoune) and are a good compromise between not highlighting anything at all
+; as an operator and leaving it to the child nodes, and highlighting everything as an operator.
+(exp_ticked
+  (_) @operator)
+
+(exp_ticked
+  (exp_name
+    (variable) @operator))
+
+(exp_ticked
+  (exp_name
+    (qualified_variable
+      (variable) @operator)))
 
 ; ----------------------------------------------------------------------------
 ; Types
+(type) @type
 
- (type) @type
-
- (constructor) @constructor
-
+(constructor) @constructor
diff --git a/queries/purescript/injections.scm b/queries/purescript/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/purescript/injections.scm
+++ b/queries/purescript/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/purescript/locals.scm b/queries/purescript/locals.scm
index 0d42125e2..16265231d 100644
--- a/queries/purescript/locals.scm
+++ b/queries/purescript/locals.scm
@@ -1,4 +1,11 @@
-(signature name: (variable)) @local.definition.type
-(function name: (variable)) @local.definition.function
-(pat_name (variable)) @local.definition
-(exp_name (variable)) @local.reference
+(signature
+  name: (variable)) @local.definition.type
+
+(function
+  name: (variable)) @local.definition.function
+
+(pat_name
+  (variable)) @local.definition
+
+(exp_name
+  (variable)) @local.reference
diff --git a/queries/pymanifest/highlights.scm b/queries/pymanifest/highlights.scm
index 0f76a9383..11d8b605f 100644
--- a/queries/pymanifest/highlights.scm
+++ b/queries/pymanifest/highlights.scm
@@ -9,11 +9,16 @@
 (char_sequence) @string.special
 
 (char_sequence
-  [ "[" "]" ] @punctuation.bracket)
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
 
-(char_sequence "!" @operator)
+(char_sequence
+  "!" @operator)
 
-(char_range "-" @operator)
+(char_range
+  "-" @operator)
 
 (escaped_char) @string.escape
 
diff --git a/queries/pymanifest/injections.scm b/queries/pymanifest/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/pymanifest/injections.scm
+++ b/queries/pymanifest/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/python/folds.scm b/queries/python/folds.scm
index 78e1e2c00..7c547db38 100644
--- a/queries/python/folds.scm
+++ b/queries/python/folds.scm
@@ -1,28 +1,23 @@
 [
   (function_definition)
   (class_definition)
-
   (while_statement)
   (for_statement)
   (if_statement)
   (with_statement)
   (try_statement)
   (match_statement)
-
   (import_from_statement)
   (parameters)
   (argument_list)
-
   (parenthesized_expression)
   (generator_expression)
   (list_comprehension)
   (set_comprehension)
   (dictionary_comprehension)
-
   (tuple)
   (list)
   (set)
   (dictionary)
-
   (string)
 ] @fold
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 8d272185c..1d149162d 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -1,20 +1,20 @@
-;; From tree-sitter-python licensed under MIT License
+; From tree-sitter-python licensed under MIT License
 ; Copyright (c) 2016 Max Brunsfeld
-
 ; Variables
 (identifier) @variable
 
 ; Reset highlighting in f-string interpolations
 (interpolation) @none
 
-;; Identifier naming conventions
+; Identifier naming conventions
 ((identifier) @type
- (#lua-match? @type "^[A-Z].*[a-z]"))
+  (#lua-match? @type "^[A-Z].*[a-z]"))
+
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 ((identifier) @constant.builtin
- (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
+  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
   ; format-ignore
@@ -26,160 +26,188 @@
 "_" @constant.builtin ; match wildcard
 
 ((attribute
-    attribute: (identifier) @variable.member)
- (#lua-match? @variable.member "^[%l_].*$"))
+  attribute: (identifier) @variable.member)
+  (#lua-match? @variable.member "^[%l_].*$"))
 
 ((assignment
   left: (identifier) @type.definition
-  (type (identifier) @_annotation))
- (#eq? @_annotation "TypeAlias"))
+  (type
+    (identifier) @_annotation))
+  (#eq? @_annotation "TypeAlias"))
 
 ((assignment
   left: (identifier) @type.definition
-  right: (call
-    function: (identifier) @_func))
- (#any-of? @_func "TypeVar" "NewType"))
+  right:
+    (call
+      function: (identifier) @_func))
+  (#any-of? @_func "TypeVar" "NewType"))
 
 ; Function calls
-
 (call
   function: (identifier) @function.call)
 
 (call
-  function: (attribute
-              attribute: (identifier) @function.method.call))
+  function:
+    (attribute
+      attribute: (identifier) @function.method.call))
 
 ((call
-   function: (identifier) @constructor)
- (#lua-match? @constructor "^%u"))
+  function: (identifier) @constructor)
+  (#lua-match? @constructor "^%u"))
 
 ((call
-  function: (attribute
-              attribute: (identifier) @constructor))
- (#lua-match? @constructor "^%u"))
+  function:
+    (attribute
+      attribute: (identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
 
-;; Decorators
-
-((decorator "@" @attribute)
- (#set! "priority" 101))
+; Decorators
+((decorator
+  "@" @attribute)
+  (#set! "priority" 101))
 
 (decorator
   (identifier) @attribute)
+
 (decorator
   (attribute
     attribute: (identifier) @attribute))
+
 (decorator
-  (call (identifier) @attribute))
+  (call
+    (identifier) @attribute))
+
 (decorator
-  (call (attribute
-          attribute: (identifier) @attribute)))
+  (call
+    (attribute
+      attribute: (identifier) @attribute)))
 
 ((decorator
   (identifier) @attribute.builtin)
- (#any-of? @attribute.builtin "classmethod" "property"))
-
-;; Builtin functions
+  (#any-of? @attribute.builtin "classmethod" "property"))
 
+; Builtin functions
 ((call
   function: (identifier) @function.builtin)
- (#any-of? @function.builtin
-          "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
-          "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format"
-          "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
-          "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
-          "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
-          "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
-
-;; Function definitions
+  (#any-of? @function.builtin "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
 
+; Function definitions
 (function_definition
   name: (identifier) @function)
 
-(type (identifier) @type)
+(type
+  (identifier) @type)
+
 (type
   (subscript
     (identifier) @type)) ; type subscript: Tuple[int]
 
 ((call
   function: (identifier) @_isinstance
-  arguments: (argument_list
-    (_)
-    (identifier) @type))
- (#eq? @_isinstance "isinstance"))
+  arguments:
+    (argument_list
+      (_)
+      (identifier) @type))
+  (#eq? @_isinstance "isinstance"))
 
-;; Normal parameters
+; Normal parameters
 (parameters
   (identifier) @variable.parameter)
-;; Lambda parameters
+
+; Lambda parameters
 (lambda_parameters
   (identifier) @variable.parameter)
+
 (lambda_parameters
   (tuple_pattern
     (identifier) @variable.parameter))
+
 ; Default parameters
 (keyword_argument
   name: (identifier) @variable.parameter)
+
 ; Naming parameters on call-site
 (default_parameter
   name: (identifier) @variable.parameter)
+
 (typed_parameter
   (identifier) @variable.parameter)
+
 (typed_default_parameter
   name: (identifier) @variable.parameter)
+
 ; Variadic parameters *args, **kwargs
 (parameters
-  (list_splat_pattern ; *args
+  (list_splat_pattern
+    ; *args
     (identifier) @variable.parameter))
+
 (parameters
-  (dictionary_splat_pattern ; **kwargs
+  (dictionary_splat_pattern
+    ; **kwargs
     (identifier) @variable.parameter))
+
 (lambda_parameters
   (list_splat_pattern
     (identifier) @variable.parameter))
+
 (lambda_parameters
   (dictionary_splat_pattern
     (identifier) @variable.parameter))
 
-
-;; Literals
-
+; Literals
 (none) @constant.builtin
-[(true) (false)] @boolean
+
+[
+  (true)
+  (false)
+] @boolean
+
 ((identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
+  (#eq? @variable.builtin "self"))
+
 ((identifier) @variable.builtin
- (#eq? @variable.builtin "cls"))
+  (#eq? @variable.builtin "cls"))
 
 (integer) @number
+
 (float) @number.float
 
 (comment) @comment @spell
 
-((module . (comment) @keyword.directive)
+((module
+  .
+  (comment) @keyword.directive)
   (#lua-match? @keyword.directive "^#!/"))
 
 (string) @string
+
 [
   (escape_sequence)
   (escape_interpolation)
 ] @string.escape
 
 ; doc-strings
-
-(module . (expression_statement (string) @string.documentation @spell))
+(module
+  .
+  (expression_statement
+    (string) @string.documentation @spell))
 
 (class_definition
   body:
     (block
-      . (expression_statement (string) @string.documentation @spell)))
+      .
+      (expression_statement
+        (string) @string.documentation @spell)))
 
 (function_definition
   body:
     (block
-      . (expression_statement (string) @string.documentation @spell)))
+      .
+      (expression_statement
+        (string) @string.documentation @spell)))
 
 ; Tokens
-
 [
   "-"
   "-="
@@ -229,7 +257,6 @@
   "or"
   "is not"
   "not in"
-
   "del"
 ] @keyword.operator
 
@@ -260,19 +287,36 @@
   "return"
   "yield"
 ] @keyword.return
-(yield "from" @keyword.return)
+
+(yield
+  "from" @keyword.return)
 
 (future_import_statement
   "from" @keyword.import
   "__future__" @constant.builtin)
-(import_from_statement "from" @keyword.import)
+
+(import_from_statement
+  "from" @keyword.import)
+
 "import" @keyword.import
 
-(aliased_import "as" @keyword.import)
+(aliased_import
+  "as" @keyword.import)
 
-["if" "elif" "else" "match" "case"] @keyword.conditional
+[
+  "if"
+  "elif"
+  "else"
+  "match"
+  "case"
+] @keyword.conditional
 
-["for" "while" "break" "continue"] @keyword.repeat
+[
+  "for"
+  "while"
+  "break"
+  "continue"
+] @keyword.repeat
 
 [
   "try"
@@ -282,13 +326,21 @@
   "finally"
 ] @keyword.exception
 
-(raise_statement "from" @keyword.exception)
+(raise_statement
+  "from" @keyword.exception)
 
 (try_statement
   (else_clause
     "else" @keyword.exception))
 
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 (interpolation
   "{" @punctuation.special
@@ -296,40 +348,52 @@
 
 (type_conversion) @function.macro
 
-["," "." ":" ";" (ellipsis)] @punctuation.delimiter
+[
+  ","
+  "."
+  ":"
+  ";"
+  (ellipsis)
+] @punctuation.delimiter
 
-;; Class definitions
-
-(class_definition name: (identifier) @type)
+; Class definitions
+(class_definition
+  name: (identifier) @type)
 
 (class_definition
-  body: (block
-          (function_definition
-            name: (identifier) @function.method)))
+  body:
+    (block
+      (function_definition
+        name: (identifier) @function.method)))
 
 (class_definition
-  superclasses: (argument_list
-                  (identifier) @type))
+  superclasses:
+    (argument_list
+      (identifier) @type))
 
 ((class_definition
-  body: (block
-          (expression_statement
-            (assignment
-              left: (identifier) @variable.member))))
- (#lua-match? @variable.member "^%l.*$"))
+  body:
+    (block
+      (expression_statement
+        (assignment
+          left: (identifier) @variable.member))))
+  (#lua-match? @variable.member "^%l.*$"))
+
 ((class_definition
-  body: (block
-          (expression_statement
-            (assignment
-              left: (_
-                     (identifier) @variable.member)))))
- (#lua-match? @variable.member "^%l.*$"))
+  body:
+    (block
+      (expression_statement
+        (assignment
+          left:
+            (_
+              (identifier) @variable.member)))))
+  (#lua-match? @variable.member "^%l.*$"))
 
 ((class_definition
   (block
     (function_definition
       name: (identifier) @constructor)))
- (#any-of? @constructor "__new__" "__init__"))
+  (#any-of? @constructor "__new__" "__init__"))
 
 ((identifier) @type.builtin
   ; format-ignore
@@ -350,10 +414,14 @@
     "bool" "int" "float" "complex" "list" "tuple" "range" "str"
     "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
 
-;; Regex from the `re` module
-
+; Regex from the `re` module
 (call
-  function: (attribute
-              object: (identifier) @_re)
-  arguments: (argument_list . (string (string_content) @string.regexp))
+  function:
+    (attribute
+      object: (identifier) @_re)
+  arguments:
+    (argument_list
+      .
+      (string
+        (string_content) @string.regexp))
   (#eq? @_re "re"))
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index 338473f00..b89030425 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -1,82 +1,106 @@
 [
   (import_from_statement)
-
   (parenthesized_expression)
   (generator_expression)
   (list_comprehension)
   (set_comprehension)
   (dictionary_comprehension)
-
   (tuple_pattern)
   (list_pattern)
   (binary_operator)
-
   (lambda)
-
   (concatenated_string)
 ] @indent.begin
 
 ((list) @indent.align
- (#set! indent.open_delimiter "[")
- (#set! indent.close_delimiter "]")
-)
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]"))
+
 ((dictionary) @indent.align
- (#set! indent.open_delimiter "{")
- (#set! indent.close_delimiter "}")
-)
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
+
 ((set) @indent.align
- (#set! indent.open_delimiter "{")
- (#set! indent.close_delimiter "}")
-)
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
 
 ((for_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((if_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((while_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((try_statement) @indent.begin
- (#set! indent.immediate 1))
-(ERROR "try" ":" @indent.begin (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
+(ERROR
+  "try"
+  ":" @indent.begin
+  (#set! indent.immediate 1))
+
 ((function_definition) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((class_definition) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((with_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((match_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((case_clause) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
 
 (if_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
-  (#set! indent.avoid_last_matching_next 1)
-)
+  (#set! indent.avoid_last_matching_next 1))
+
 (while_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
-  (#set! indent.avoid_last_matching_next 1)
-)
+  (#set! indent.avoid_last_matching_next 1))
+
+(ERROR
+  "(" @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  .
+  (_))
 
-(ERROR "(" @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")") . (_)) 
 ((argument_list) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((parameters) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")")
- (#set! indent.avoid_last_matching_next 1))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1))
+
 ((tuple) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
-(ERROR "[" @indent.align (#set! indent.open_delimiter "[") (#set! indent.close_delimiter "]") . (_)) 
+(ERROR
+  "[" @indent.align
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]")
+  .
+  (_))
 
-(ERROR "{" @indent.align (#set! indent.open_delimiter "{") (#set! indent.close_delimiter "}") . (_)) 
+(ERROR
+  "{" @indent.align
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}")
+  .
+  (_))
 
 [
   (break_statement)
@@ -84,22 +108,37 @@
 ] @indent.dedent
 
 (ERROR
-  (_) @indent.branch ":" .
+  (_) @indent.branch
+  ":"
+  .
   (#lua-match? @indent.branch "^else"))
 
 (ERROR
-  (_) @indent.branch @indent.dedent ":" .
+  (_) @indent.branch @indent.dedent
+  ":"
+  .
   (#lua-match? @indent.branch "^elif"))
 
-(parenthesized_expression ")" @indent.end)
-(generator_expression ")" @indent.end)
-(list_comprehension "]" @indent.end)
-(set_comprehension "}" @indent.end)
-(dictionary_comprehension "}" @indent.end)
+(parenthesized_expression
+  ")" @indent.end)
 
-(tuple_pattern ")" @indent.end)
-(list_pattern "]" @indent.end)
+(generator_expression
+  ")" @indent.end)
 
+(list_comprehension
+  "]" @indent.end)
+
+(set_comprehension
+  "}" @indent.end)
+
+(dictionary_comprehension
+  "}" @indent.end)
+
+(tuple_pattern
+  ")" @indent.end)
+
+(list_pattern
+  "]" @indent.end)
 
 (return_statement
   [
@@ -111,10 +150,12 @@
         "}"
         "]"
       ] @indent.end .)
-    (attribute 
+    (attribute
       attribute: (_) @indent.end)
     (call
-      arguments: (_ ")" @indent.end))
+      arguments:
+        (_
+          ")" @indent.end))
     "return" @indent.end
   ] .)
 
@@ -129,4 +170,3 @@
 ] @indent.branch
 
 (string) @indent.auto
-
diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index 87d1c3478..3db20929e 100644
--- a/queries/python/injections.scm
+++ b/queries/python/injections.scm
@@ -1,15 +1,21 @@
 (call
-  function: (attribute
-              object: (identifier) @_re)
-  arguments: (argument_list . (string
-                              (string_content) @injection.content))
+  function:
+    (attribute
+      object: (identifier) @_re)
+  arguments:
+    (argument_list
+      .
+      (string
+        (string_content) @injection.content))
   (#eq? @_re "re")
   (#set! injection.language "regex"))
 
 ((binary_operator
-  left: (string (string_content) @injection.content)
+  left:
+    (string
+      (string_content) @injection.content)
   operator: "%")
- (#set! injection.language "printf"))
+  (#set! injection.language "printf"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/python/locals.scm b/queries/python/locals.scm
index 40c57dd44..80b4021c1 100644
--- a/queries/python/locals.scm
+++ b/queries/python/locals.scm
@@ -1,25 +1,35 @@
-;;; Program structure
+; Program structure
 (module) @local.scope
 
 (class_definition
-  body: (block
-          (expression_statement
-            (assignment
-              left: (identifier) @local.definition.field)))) @local.scope
+  body:
+    (block
+      (expression_statement
+        (assignment
+          left: (identifier) @local.definition.field)))) @local.scope
+
 (class_definition
-  body: (block
-          (expression_statement
-            (assignment
-              left: (_ 
-                     (identifier) @local.definition.field))))) @local.scope
+  body:
+    (block
+      (expression_statement
+        (assignment
+          left:
+            (_
+              (identifier) @local.definition.field))))) @local.scope
 
 ; Imports
 (aliased_import
   alias: (identifier) @local.definition.import)
+
 (import_statement
-  name: (dotted_name ((identifier) @local.definition.import)))
+  name:
+    (dotted_name
+      ((identifier) @local.definition.import)))
+
 (import_from_statement
-  name: (dotted_name ((identifier) @local.definition.import)))
+  name:
+    (dotted_name
+      ((identifier) @local.definition.import)))
 
 ; Function with parameters, defines parameters
 (parameters
@@ -47,69 +57,81 @@
 ; Function defines function and scope
 ((function_definition
   name: (identifier) @local.definition.function) @local.scope
- (#set! definition.function.scope "parent"))
-
+  (#set! definition.function.scope "parent"))
 
 ((class_definition
   name: (identifier) @local.definition.type) @local.scope
- (#set! definition.type.scope "parent"))
+  (#set! definition.type.scope "parent"))
 
 (class_definition
-  body: (block
-          (function_definition
-            name: (identifier) @local.definition.method)))
+  body:
+    (block
+      (function_definition
+        name: (identifier) @local.definition.method)))
 
-;;; Loops
+; Loops
 ; not a scope!
 (for_statement
-  left: (pattern_list
-          (identifier) @local.definition.var))
+  left:
+    (pattern_list
+      (identifier) @local.definition.var))
+
 (for_statement
-  left: (tuple_pattern
-          (identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (identifier) @local.definition.var))
+
 (for_statement
   left: (identifier) @local.definition.var)
 
 ; not a scope!
 ;(while_statement) @local.scope
-
 ; for in list comprehension
 (for_in_clause
   left: (identifier) @local.definition.var)
+
 (for_in_clause
-  left: (tuple_pattern
-          (identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (identifier) @local.definition.var))
+
 (for_in_clause
-  left: (pattern_list
-          (identifier) @local.definition.var))
+  left:
+    (pattern_list
+      (identifier) @local.definition.var))
 
 (dictionary_comprehension) @local.scope
+
 (list_comprehension) @local.scope
+
 (set_comprehension) @local.scope
 
-;;; Assignments
+; Assignments
+(assignment
+  left: (identifier) @local.definition.var)
 
 (assignment
- left: (identifier) @local.definition.var)
+  left:
+    (pattern_list
+      (identifier) @local.definition.var))
 
 (assignment
- left: (pattern_list
-   (identifier) @local.definition.var))
-(assignment
- left: (tuple_pattern
-   (identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (identifier) @local.definition.var))
 
 (assignment
- left: (attribute
-   (identifier)
-   (identifier) @local.definition.field))
+  left:
+    (attribute
+      (identifier)
+      (identifier) @local.definition.field))
 
 ; Walrus operator  x := 1
 (named_expression
   (identifier) @local.definition.var)
 
-(as_pattern 
+(as_pattern
   alias: (as_pattern_target) @local.definition.var)
 
-;;; REFERENCES
+; REFERENCES
 (identifier) @local.reference
diff --git a/queries/ql/folds.scm b/queries/ql/folds.scm
index 1a31eeb20..eb7f27273 100644
--- a/queries/ql/folds.scm
+++ b/queries/ql/folds.scm
@@ -1,7 +1,7 @@
 [
- (module)
- (classlessPredicate)
- (dataclass)
- (charpred)
- (memberPredicate)
+  (module)
+  (classlessPredicate)
+  (dataclass)
+  (charpred)
+  (memberPredicate)
 ] @fold
diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm
index d7d9500b0..39b7bc101 100644
--- a/queries/ql/highlights.scm
+++ b/queries/ql/highlights.scm
@@ -11,7 +11,6 @@
   "order"
   "select"
   "where"
-
   (predicate)
   (result)
   (specialId)
@@ -106,26 +105,43 @@
   "|"
 ] @punctuation.delimiter
 
-(moduleExpr (simpleId) @module)
-(module name: (moduleName) @module)
+(moduleExpr
+  (simpleId) @module)
 
-(dataclass name: (className) @type)
-(typeExpr name: (className) @type)
+(module
+  name: (moduleName) @module)
 
-(datatype name: (className) @type.definition)
+(dataclass
+  name: (className) @type)
+
+(typeExpr
+  name: (className) @type)
+
+(datatype
+  name: (className) @type.definition)
+
+(importModuleExpr
+  qualName: (simpleId) @variable)
 
-(importModuleExpr qualName: (simpleId) @variable)
 (varName) @variable
 
 (integer) @number
+
 (float) @number.float
 
 (string) @string
 
-(aritylessPredicateExpr (literalId) @function)
-(memberPredicate name: (predicateName) @function)
-(classlessPredicate name: (predicateName) @function)
-(charpred (className) @function)
+(aritylessPredicateExpr
+  (literalId) @function)
+
+(memberPredicate
+  name: (predicateName) @function)
+
+(classlessPredicate
+  name: (predicateName) @function)
+
+(charpred
+  (className) @function)
 
 [
   (line_comment)
diff --git a/queries/ql/injections.scm b/queries/ql/injections.scm
index baed9196d..090116c89 100644
--- a/queries/ql/injections.scm
+++ b/queries/ql/injections.scm
@@ -2,5 +2,5 @@
   (line_comment)
   (block_comment)
   (qldoc)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/ql/locals.scm b/queries/ql/locals.scm
index f9b1195ae..239420151 100644
--- a/queries/ql/locals.scm
+++ b/queries/ql/locals.scm
@@ -1,30 +1,49 @@
 ; SCOPES
 (module) @local.scope
+
 (dataclass) @local.scope
+
 (datatype) @local.scope
-;; TODO does not work
+
+; TODO does not work
 ;(classMember (body)  @local.scope)
-(memberPredicate (body)  @local.scope)
-(classlessPredicate (body)  @local.scope)
-(quantified (conjunction) @local.scope)
+(memberPredicate
+  (body) @local.scope)
+
+(classlessPredicate
+  (body) @local.scope)
+
+(quantified
+  (conjunction) @local.scope)
+
 (select) @local.scope
 
 ; DEFINITIONS
-
 ; module
-(module name: (moduleName) @local.definition.namespace)
+(module
+  name: (moduleName) @local.definition.namespace)
 
 ; classes
-(dataclass name: (className) @local.definition.type)
-(datatype name: (className) @local.definition.type)
+(dataclass
+  name: (className) @local.definition.type)
+
+(datatype
+  name: (className) @local.definition.type)
 
 ; predicates
-(charpred (className) @local.definition.method)
-(memberPredicate name: (predicateName) @local.definition.method)
-(classlessPredicate name: (predicateName) @local.definition.function)
+(charpred
+  (className) @local.definition.method)
+
+(memberPredicate
+  name: (predicateName) @local.definition.method)
+
+(classlessPredicate
+  name: (predicateName) @local.definition.function)
 
 ; variables
-(varDecl (varName (simpleId) @local.definition.var))
+(varDecl
+  (varName
+    (simpleId) @local.definition.var))
 
 ; REFERENCES
 (simpleId) @local.reference
diff --git a/queries/qmldir/highlights.scm b/queries/qmldir/highlights.scm
index a716e8c9e..780dbb3d4 100644
--- a/queries/qmldir/highlights.scm
+++ b/queries/qmldir/highlights.scm
@@ -1,24 +1,20 @@
 ; Preproc
-
-(command (identifier) @keyword.directive)
+(command
+  (identifier) @keyword.directive)
 
 ; Keywords
-
 (keyword) @keyword
 
 ; Literals
-
 (number) @number
 
 (float) @number.float
 
 ; Variables
-
 [
   (identifier)
   (unit)
 ] @variable
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/qmldir/injections.scm b/queries/qmldir/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/qmldir/injections.scm
+++ b/queries/qmldir/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 0b15f46cf..a6a17b25a 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -1,39 +1,44 @@
 ; inherits: ecma
-
 "pragma" @keyword.import
 
-;;; Annotations
-
+; Annotations
 (ui_annotation
   "@" @operator
-  type_name: [
-    (identifier) @attribute
-    (nested_identifier (identifier) @attribute)
-  ])
+  type_name:
+    [
+      (identifier) @attribute
+      (nested_identifier
+        (identifier) @attribute)
+    ])
 
-;; type
-(ui_property 
+; type
+(ui_property
   type: (type_identifier) @type)
 
-;;; Properties
-
+; Properties
 (ui_object_definition_binding
-  name: [
-    (identifier) @property
-    (nested_identifier (identifier) @property)
-  ])
+  name:
+    [
+      (identifier) @property
+      (nested_identifier
+        (identifier) @property)
+    ])
 
 (ui_binding
-  name: [
-    (identifier) @property
-    (nested_identifier (identifier) @property)
-  ])
+  name:
+    [
+      (identifier) @property
+      (nested_identifier
+        (identifier) @property)
+    ])
 
-;; locals query appears not working unless id: <ref> isn't a parameter.
+; locals query appears not working unless id: <ref> isn't a parameter.
 (ui_binding
   name: (identifier) @property
   (#eq? @property "id")
-  value: (expression_statement (identifier) @variable))
+  value:
+    (expression_statement
+      (identifier) @variable))
 
 (ui_property
   name: (identifier) @property)
@@ -42,47 +47,44 @@
   name: (identifier) @property)
 
 (ui_list_property_type
-  ["<" ">"] @punctuation.bracket)
-
-;;; Signals
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
+; Signals
 (ui_signal
   name: (identifier) @function)
 
 (ui_signal_parameter
   (identifier) @variable)
 
-;;; ui_object_definition
+; ui_object_definition
 (ui_object_definition
   type_name: (identifier) @type)
+
 (ui_object_definition
   type_name: (nested_identifier) @type)
 
-;;; namespace
+; namespace
 (nested_identifier
   (nested_identifier
-    (identifier) @module)
-)
+    (identifier) @module))
 
 ; Properties
 ;-----------
-
 (property_identifier) @property
 
-;;; function
+; function
 (call_expression
-  function: (member_expression
-    object: (identifier) @variable
-    property:(property_identifier) @function
-  )
-)
-;;; js
-
-
+  function:
+    (member_expression
+      object: (identifier) @variable
+      property: (property_identifier) @function))
 
+; js
 ; Literals
 ;---------
-
 [
   (true)
   (false)
@@ -101,26 +103,24 @@
 ] @string
 
 (regex) @string.regexp
+
 (number) @number
 
 ; Tokens
 ;-------
-
 [
   "abstract"
-
   "private"
   "protected"
   "public"
-
   "default"
   "readonly"
   "required"
 ] @type.qualifier
 
 ; from typescript
-
 (type_identifier) @type
+
 (predefined_type) @type.builtin
 
 ((identifier) @type
@@ -131,12 +131,13 @@
   ">" @punctuation.bracket)
 
 ; Variables
+(required_parameter
+  (identifier) @variable)
 
-(required_parameter (identifier) @variable)
-(optional_parameter (identifier) @variable)
+(optional_parameter
+  (identifier) @variable)
 
 ; Keywords
-
 [
   "on"
   "property"
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 8601b1365..cdedb23e2 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -1,14 +1,30 @@
 (string) @string
+
 (escape_sequence) @string.escape
-(capture (identifier) @type)
-(anonymous_node (identifier) @string)
-(predicate name: (identifier) @function.call)
-(named_node name: (identifier) @variable)
-(field_definition name: (identifier) @property)
-(negated_field "!" @operator (identifier) @property)
+
+(capture
+  (identifier) @type)
+
+(anonymous_node
+  (identifier) @string)
+
+(predicate
+  name: (identifier) @function.call)
+
+(named_node
+  name: (identifier) @variable)
+
+(field_definition
+  name: (identifier) @property)
+
+(negated_field
+  "!" @operator
+  (identifier) @property)
+
 (comment) @comment @spell
 
 (quantifier) @operator
+
 (predicate_type) @punctuation.special
 
 "." @operator
@@ -21,33 +37,51 @@
 ] @punctuation.bracket
 
 ":" @punctuation.delimiter
-["@" "#"] @punctuation.special
+
+[
+  "@"
+  "#"
+] @punctuation.special
+
 "_" @constant
 
-((parameters (identifier) @number)
- (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
+((parameters
+  (identifier) @number)
+  (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
 
-((program . (comment)* . (comment) @keyword.import)
- (#lua-match? @keyword.import "^;+ *inherits *:"))
+((program
+  .
+  (comment)*
+  .
+  (comment) @keyword.import)
+  (#lua-match? @keyword.import "^;+ *inherits *:"))
 
-((program . (comment)* . (comment) @keyword.directive)
- (#lua-match? @keyword.directive "^;+ *extends *$"))
+((program
+  .
+  (comment)*
+  .
+  (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^;+ *extends *$"))
 
 ((comment) @keyword.directive
   (#lua-match? @keyword.directive "^;+%s*format%-ignore%s*$"))
 
 ((predicate
   name: (identifier) @_name
-  parameters: (parameters (string "\"" @string "\"" @string) @string.regexp))
- (#any-of? @_name
-   "match"
-   "not-match"
-   "vim-match"
-   "not-vim-match"
-   "lua-match"
-   "not-lua-match"))
+  parameters:
+    (parameters
+      (string
+        "\"" @string
+        "\"" @string) @string.regexp))
+  (#any-of? @_name "match" "not-match" "vim-match" "not-vim-match" "lua-match" "not-lua-match"))
 
 ((predicate
   name: (identifier) @_name
-  parameters: (parameters (string "\"" @string "\"" @string) @string.regexp . (string) .))
- (#any-of? @_name "gsub" "not-gsub"))
+  parameters:
+    (parameters
+      (string
+        "\"" @string
+        "\"" @string) @string.regexp
+      .
+      (string) .))
+  (#any-of? @_name "gsub" "not-gsub"))
diff --git a/queries/query/indents.scm b/queries/query/indents.scm
index 0ee125be7..925d77060 100644
--- a/queries/query/indents.scm
+++ b/queries/query/indents.scm
@@ -1,12 +1,8 @@
-[
-  (list)
-] @indent.begin
+(list) @indent.begin
 
 [
   "["
   "]"
 ] @indent.begin
 
-[
-  "]"
-] @indent.branch
+"]" @indent.branch
diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index 150919ec0..dd1a8556c 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -1,23 +1,31 @@
-((predicate 
+((predicate
   name: (identifier) @_name
-  parameters: (parameters (string) @injection.content))
- (#any-of? @_name "match" "not-match" "vim-match" "not-vim-match")
- (#set! injection.language "regex")
- (#offset! @injection.content 0 1 0 -1))
+  parameters:
+    (parameters
+      (string) @injection.content))
+  (#any-of? @_name "match" "not-match" "vim-match" "not-vim-match")
+  (#set! injection.language "regex")
+  (#offset! @injection.content 0 1 0 -1))
 
 ((predicate
   name: (identifier) @_name
-  parameters: (parameters (string) @injection.content))
- (#any-of? @_name "lua-match" "not-lua-match")
- (#set! injection.language "luap")
- (#offset! @injection.content 0 1 0 -1))
+  parameters:
+    (parameters
+      (string) @injection.content))
+  (#any-of? @_name "lua-match" "not-lua-match")
+  (#set! injection.language "luap")
+  (#offset! @injection.content 0 1 0 -1))
 
 ((predicate
-   name: (identifier) @_name
-   parameters: (parameters (string) @injection.content . (string) .))
- (#any-of? @_name "gsub" "not-gsub")
- (#set! injection.language "luap")
- (#offset! @injection.content 0 1 0 -1))
+  name: (identifier) @_name
+  parameters:
+    (parameters
+      (string) @injection.content
+      .
+      (string) .))
+  (#any-of? @_name "gsub" "not-gsub")
+  (#set! injection.language "luap")
+  (#offset! @injection.content 0 1 0 -1))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/query/locals.scm b/queries/query/locals.scm
index 21d5fd7c9..eca196aba 100644
--- a/queries/query/locals.scm
+++ b/queries/query/locals.scm
@@ -1,7 +1,13 @@
 (program) @local.scope
-(program (named_node) @local.scope)
-(program (anonymous_node) @local.scope)
-(program (grouping) @local.scope)
+
+(program
+  (named_node) @local.scope)
+
+(program
+  (anonymous_node) @local.scope)
+
+(program
+  (grouping) @local.scope)
 
 (identifier) @local.reference
 
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index 03cf01bd7..cbb87f033 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -1,5 +1,4 @@
 ; highlights.scm
-
 ; Literals
 (integer) @number
 
@@ -8,96 +7,114 @@
 (complex) @number
 
 (string) @string
-(string (escape_sequence) @string.escape)
+
+(string
+  (escape_sequence) @string.escape)
 
 (comment) @comment @spell
 
-((program . (comment) @keyword.directive)
+((program
+  .
+  (comment) @keyword.directive)
   (#lua-match? @keyword.directive "^#!/"))
 
 (identifier) @variable
 
-((dollar (identifier) @variable.builtin)
- (#eq? @variable.builtin "self"))
+((dollar
+  (identifier) @variable.builtin)
+  (#eq? @variable.builtin "self"))
 
-((dollar _ (identifier) @variable.member))
+((dollar
+  _
+  (identifier) @variable.member))
 
 ; Parameters
-
-(formal_parameters (identifier) @variable.parameter)
+(formal_parameters
+  (identifier) @variable.parameter)
 
 (formal_parameters
- (default_parameter name: (identifier) @variable.parameter))
+  (default_parameter
+    name: (identifier) @variable.parameter))
 
-(default_argument name: (identifier) @variable.parameter)
+(default_argument
+  name: (identifier) @variable.parameter)
 
 ; Namespace
+(namespace_get
+  namespace: (identifier) @module)
 
-(namespace_get namespace: (identifier) @module)
-(namespace_get_internal namespace: (identifier) @module)
+(namespace_get_internal
+  namespace: (identifier) @module)
 
 ; Operators
 [
- "="
- "<-"
- "<<-"
- "->"
+  "="
+  "<-"
+  "<<-"
+  "->"
 ] @operator
 
-(unary operator: [
-  "-"
-  "+"
-  "!"
-  "~"
-  "?"
-] @operator)
+(unary
+  operator:
+    [
+      "-"
+      "+"
+      "!"
+      "~"
+      "?"
+    ] @operator)
 
-(binary operator: [
-  "-"
-  "+"
-  "*"
-  "/"
-  "^"
-  "<"
-  ">"
-  "<="
-  ">="
-  "=="
-  "!="
-  "||"
-  "|"
-  "&&"
-  "&"
-  ":"
-  "~"
-] @operator)
+(binary
+  operator:
+    [
+      "-"
+      "+"
+      "*"
+      "/"
+      "^"
+      "<"
+      ">"
+      "<="
+      ">="
+      "=="
+      "!="
+      "||"
+      "|"
+      "&&"
+      "&"
+      ":"
+      "~"
+    ] @operator)
 
 [
   "|>"
   (special)
 ] @operator
 
-(lambda_function "\\" @operator)
+(lambda_function
+  "\\" @operator)
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
-(dollar _ "$" @operator)
+(dollar
+  _
+  "$" @operator)
 
 (subset2
   "[[" @punctuation.bracket
   "]]" @punctuation.bracket)
 
 [
- (dots)
- (break)
- (next)
+  (dots)
+  (break)
+  (next)
 ] @keyword
 
 [
@@ -128,14 +145,19 @@
 "function" @keyword.function
 
 ; Functions/Methods
-
-(call function: (identifier) @function.call)
+(call
+  function: (identifier) @function.call)
 
 (call
-  (namespace_get function: (identifier) @function.call))
+  (namespace_get
+    function: (identifier) @function.call))
 
 (call
-  (namespace_get_internal function: (identifier) @function.call))
+  (namespace_get_internal
+    function: (identifier) @function.call))
 
 (call
-  function: ((dollar _ (identifier) @function.method.call)))
+  function:
+    ((dollar
+      _
+      (identifier) @function.method.call)))
diff --git a/queries/r/indents.scm b/queries/r/indents.scm
index 3b9e495ad..742b645e2 100644
--- a/queries/r/indents.scm
+++ b/queries/r/indents.scm
@@ -12,22 +12,22 @@
   "for"
 ] @indent.begin
 
-((binary operator: (special)) @indent.begin)
+((binary
+  operator: (special)) @indent.begin)
 
 [
   "}"
   ")"
 ] @indent.branch
 
-((formal_parameters (identifier)) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+((formal_parameters
+  (identifier)) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
 [
   ")"
   "}"
 ] @indent.end
 
-[
-  (comment)
-] @indent.ignore
+(comment) @indent.ignore
diff --git a/queries/r/injections.scm b/queries/r/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/r/injections.scm
+++ b/queries/r/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/r/locals.scm b/queries/r/locals.scm
index 38977b7b7..e98f773f5 100755
--- a/queries/r/locals.scm
+++ b/queries/r/locals.scm
@@ -1,11 +1,16 @@
 ; locals.scm
-
 (function_definition) @local.scope
 
-(formal_parameters (identifier) @local.definition.parameter)
+(formal_parameters
+  (identifier) @local.definition.parameter)
 
-(left_assignment name: (identifier) @local.definition)
-(equals_assignment name: (identifier) @local.definition)
-(right_assignment name: (identifier) @local.definition)
+(left_assignment
+  name: (identifier) @local.definition)
+
+(equals_assignment
+  name: (identifier) @local.definition)
+
+(right_assignment
+  name: (identifier) @local.definition)
 
 (identifier) @local.reference
diff --git a/queries/racket/folds.scm b/queries/racket/folds.scm
index 64a9a08e6..115809a77 100644
--- a/queries/racket/folds.scm
+++ b/queries/racket/folds.scm
@@ -1 +1,2 @@
-(program (list) @fold)
+(program
+  (list) @fold)
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index fdd392077..2de4d2efa 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -1,133 +1,120 @@
-;; A highlight query can override the highlights queries before it.
-;; So the order is important.
-;; We should highlight general rules, then highlight special forms.
-
-;;------------------------------------------------------------------;;
-;;                         Basic highlights                         ;;
-;;------------------------------------------------------------------;;
-
-;; basic ;;
-
+; A highlight query can override the highlights queries before it.
+; So the order is important.
+; We should highlight general rules, then highlight special forms.
+;------------------------------------------------------------------;;
+;                         Basic highlights                         ;;
+;------------------------------------------------------------------;;
+; basic ;;
 (number) @number
+
 (character) @character
+
 (boolean) @boolean
+
 (keyword) @string.special.symbol
 
-;; string ;;
-
-[(string)
- (here_string)
- (byte_string)] @string
+; string ;;
+[
+  (string)
+  (here_string)
+  (byte_string)
+] @string
 
 (escape_sequence) @string.escape
 
 (regex) @string.regexp
 
-;; comment ;;
+; comment ;;
+[
+  (comment)
+  (block_comment)
+  (sexp_comment)
+] @comment
 
-[(comment)
- (block_comment)
- (sexp_comment)] @comment
-
-[(comment)
- (block_comment)] @spell
-
-;; symbol ;;
+[
+  (comment)
+  (block_comment)
+] @spell
 
+; symbol ;;
 (symbol) @variable
 
 ((symbol) @comment
- (#lua-match? @comment "^#[cC][iIsS]$"))
-
-;; extension ;;
+  (#lua-match? @comment "^#[cC][iIsS]$"))
 
+; extension ;;
 (extension) @keyword
+
 (lang_name) @variable.builtin
 
-;; quote ;;
-
+; quote ;;
 (quote) @string.special.symbol
 
-;; list ;;
-
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
-
-;; procedure ;;
+; list ;;
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
+; procedure ;;
 (list
- .
- (symbol) @function)
-
-;;------------------------------------------------------------------;;
-;;                        Builtin highlights                        ;;
-;;------------------------------------------------------------------;;
-
-;; The following lists are generated by a racket script:
-;; https://gist.github.com/6cdh/65619e761753eb4166d15185a6236040
-;; Don't edit them directly.
-
-;; keyword ;;
+  .
+  (symbol) @function)
 
+;------------------------------------------------------------------;;
+;                        Builtin highlights                        ;;
+;------------------------------------------------------------------;;
+; The following lists are generated by a racket script:
+; https://gist.github.com/6cdh/65619e761753eb4166d15185a6236040
+; Don't edit them directly.
+; keyword ;;
 (list
   .
   (symbol) @keyword
-  (#any-of? @keyword
-  "#%app" "#%datum" "#%declare" "#%expression" "#%module-begin" "#%plain-app" "#%plain-lambda" "#%plain-module-begin" "#%printing-module-begin" "#%provide" "#%require" "#%stratified-body" "#%top" "#%top-interaction" "#%variable-reference" "->" "->*" "->*m" "->d" "->dm" "->i" "->m" "..." ":do-in" "==" "=>" "_" "absent" "abstract" "all-defined-out" "all-from-out" "and" "any" "augment" "augment*" "augment-final" "augment-final*" "augride" "augride*" "begin" "begin-for-syntax" "begin0" "case" "case->" "case->m" "case-lambda" "class" "class*" "class-field-accessor" "class-field-mutator" "class/c" "class/derived" "combine-in" "combine-out" "command-line" "compound-unit" "compound-unit/infer" "cond" "cons/dc" "contract" "contract-out" "contract-pos/neg-doubling" "contract-struct" "contracted" "current-contract-region" "define" "define-compound-unit" "define-compound-unit/infer" "define-contract-struct" "define-custom-hash-types" "define-custom-set-types" "define-for-syntax" "define-local-member-name" "define-logger" "define-match-expander" "define-member-name" "define-module-boundary-contract" "define-namespace-anchor" "define-opt/c" "define-sequence-syntax" "define-serializable-class" "define-serializable-class*" "define-signature" "define-signature-form" "define-splicing-for-clause-syntax" "define-struct" "define-struct/contract" "define-struct/derived" "define-syntax" "define-syntax-rule" "define-syntaxes" "define-unit" "define-unit-binding" "define-unit-from-context" "define-unit/contract" "define-unit/new-import-export" "define-unit/s" "define-values" "define-values-for-export" "define-values-for-syntax" "define-values/invoke-unit" "define-values/invoke-unit/infer" "define/augment" "define/augment-final" "define/augride" "define/contract" "define/final-prop" "define/match" "define/overment" "define/override" "define/override-final" "define/private" "define/public" "define/public-final" "define/pubment" "define/subexpression-pos-prop" "define/subexpression-pos-prop/name" "delay" "delay/idle" "delay/name" "delay/strict" "delay/sync" "delay/thread" "do" "else" "except" "except-in" "except-out" "export" "extends" "failure-cont" "field" "field-bound?" "file" "flat-murec-contract" "flat-rec-contract" "for" "for*" "for*/and" "for*/async" "for*/first" "for*/fold" "for*/fold/derived" "for*/foldr" "for*/foldr/derived" "for*/hash" "for*/hasheq" "for*/hasheqv" "for*/last" "for*/list" "for*/lists" "for*/mutable-set" "for*/mutable-seteq" "for*/mutable-seteqv" "for*/or" "for*/product" "for*/set" "for*/seteq" "for*/seteqv" "for*/stream" "for*/sum" "for*/vector" "for*/weak-set" "for*/weak-seteq" "for*/weak-seteqv" "for-label" "for-meta" "for-space" "for-syntax" "for-template" "for/and" "for/async" "for/first" "for/fold" "for/fold/derived" "for/foldr" "for/foldr/derived" "for/hash" "for/hasheq" "for/hasheqv" "for/last" "for/list" "for/lists" "for/mutable-set" "for/mutable-seteq" "for/mutable-seteqv" "for/or" "for/product" "for/set" "for/seteq" "for/seteqv" "for/stream" "for/sum" "for/vector" "for/weak-set" "for/weak-seteq" "for/weak-seteqv" "gen:custom-write" "gen:dict" "gen:equal+hash" "gen:set" "gen:stream" "generic" "get-field" "hash/dc" "if" "implies" "import" "include" "include-at/relative-to" "include-at/relative-to/reader" "include/reader" "inherit" "inherit-field" "inherit/inner" "inherit/super" "init" "init-depend" "init-field" "init-rest" "inner" "inspect" "instantiate" "interface" "interface*" "invariant-assertion" "invoke-unit" "invoke-unit/infer" "lambda" "lazy" "let" "let*" "let*-values" "let-syntax" "let-syntaxes" "let-values" "let/cc" "let/ec" "letrec" "letrec-syntax" "letrec-syntaxes" "letrec-syntaxes+values" "letrec-values" "lib" "link" "local" "local-require" "log-debug" "log-error" "log-fatal" "log-info" "log-warning" "match" "match*" "match*/derived" "match-define" "match-define-values" "match-lambda" "match-lambda*" "match-lambda**" "match-let" "match-let*" "match-let*-values" "match-let-values" "match-letrec" "match-letrec-values" "match/derived" "match/values" "member-name-key" "mixin" "module" "module*" "module+" "nand" "new" "nor" "object-contract" "object/c" "only" "only-in" "only-meta-in" "only-space-in" "open" "opt/c" "or" "overment" "overment*" "override" "override*" "override-final" "override-final*" "parameterize" "parameterize*" "parameterize-break" "parametric->/c" "place" "place*" "place/context" "planet" "prefix" "prefix-in" "prefix-out" "private" "private*" "prompt-tag/c" "prop:dict/contract" "protect-out" "provide" "provide-signature-elements" "provide/contract" "public" "public*" "public-final" "public-final*" "pubment" "pubment*" "quasiquote" "quasisyntax" "quasisyntax/loc" "quote" "quote-syntax" "quote-syntax/prune" "recontract-out" "recursive-contract" "relative-in" "rename" "rename-in" "rename-inner" "rename-out" "rename-super" "require" "send" "send*" "send+" "send-generic" "send/apply" "send/keyword-apply" "set!" "set!-values" "set-field!" "shared" "stream" "stream*" "stream-cons" "stream-lazy" "struct" "struct*" "struct-copy" "struct-field-index" "struct-guard/c" "struct-out" "struct/c" "struct/contract" "struct/ctc" "struct/dc" "struct/derived" "submod" "super" "super-instantiate" "super-make-object" "super-new" "syntax" "syntax-case" "syntax-case*" "syntax-id-rules" "syntax-rules" "syntax/loc" "tag" "this" "this%" "thunk" "thunk*" "time" "unconstrained-domain->" "unit" "unit-from-context" "unit/c" "unit/new-import-export" "unit/s" "unless" "unquote" "unquote-splicing" "unsyntax" "unsyntax-splicing" "values/drop" "when" "with-continuation-mark" "with-contract" "with-contract-continuation-mark" "with-handlers" "with-handlers*" "with-method" "with-syntax" "~?" "~@" "λ"
-   ))
-
-;; builtin procedures
-
+  (#any-of? @keyword "#%app" "#%datum" "#%declare" "#%expression" "#%module-begin" "#%plain-app" "#%plain-lambda" "#%plain-module-begin" "#%printing-module-begin" "#%provide" "#%require" "#%stratified-body" "#%top" "#%top-interaction" "#%variable-reference" "->" "->*" "->*m" "->d" "->dm" "->i" "->m" "..." ":do-in" "==" "=>" "_" "absent" "abstract" "all-defined-out" "all-from-out" "and" "any" "augment" "augment*" "augment-final" "augment-final*" "augride" "augride*" "begin" "begin-for-syntax" "begin0" "case" "case->" "case->m" "case-lambda" "class" "class*" "class-field-accessor" "class-field-mutator" "class/c" "class/derived" "combine-in" "combine-out" "command-line" "compound-unit" "compound-unit/infer" "cond" "cons/dc" "contract" "contract-out" "contract-pos/neg-doubling" "contract-struct" "contracted" "current-contract-region" "define" "define-compound-unit" "define-compound-unit/infer" "define-contract-struct" "define-custom-hash-types" "define-custom-set-types" "define-for-syntax" "define-local-member-name" "define-logger" "define-match-expander" "define-member-name" "define-module-boundary-contract" "define-namespace-anchor" "define-opt/c" "define-sequence-syntax" "define-serializable-class" "define-serializable-class*" "define-signature" "define-signature-form" "define-splicing-for-clause-syntax" "define-struct" "define-struct/contract" "define-struct/derived" "define-syntax" "define-syntax-rule" "define-syntaxes" "define-unit" "define-unit-binding" "define-unit-from-context" "define-unit/contract" "define-unit/new-import-export" "define-unit/s" "define-values" "define-values-for-export" "define-values-for-syntax" "define-values/invoke-unit" "define-values/invoke-unit/infer" "define/augment" "define/augment-final" "define/augride" "define/contract" "define/final-prop" "define/match" "define/overment" "define/override" "define/override-final" "define/private" "define/public" "define/public-final" "define/pubment" "define/subexpression-pos-prop" "define/subexpression-pos-prop/name" "delay" "delay/idle" "delay/name" "delay/strict" "delay/sync" "delay/thread" "do" "else" "except" "except-in" "except-out" "export" "extends" "failure-cont" "field" "field-bound?" "file" "flat-murec-contract" "flat-rec-contract" "for" "for*" "for*/and" "for*/async" "for*/first" "for*/fold" "for*/fold/derived" "for*/foldr" "for*/foldr/derived" "for*/hash" "for*/hasheq" "for*/hasheqv" "for*/last" "for*/list" "for*/lists" "for*/mutable-set" "for*/mutable-seteq" "for*/mutable-seteqv" "for*/or" "for*/product" "for*/set" "for*/seteq" "for*/seteqv" "for*/stream" "for*/sum" "for*/vector" "for*/weak-set" "for*/weak-seteq" "for*/weak-seteqv" "for-label" "for-meta" "for-space" "for-syntax" "for-template" "for/and" "for/async" "for/first" "for/fold" "for/fold/derived" "for/foldr" "for/foldr/derived" "for/hash" "for/hasheq" "for/hasheqv" "for/last" "for/list" "for/lists" "for/mutable-set" "for/mutable-seteq" "for/mutable-seteqv" "for/or" "for/product" "for/set" "for/seteq" "for/seteqv" "for/stream" "for/sum" "for/vector" "for/weak-set" "for/weak-seteq" "for/weak-seteqv" "gen:custom-write" "gen:dict" "gen:equal+hash" "gen:set" "gen:stream" "generic" "get-field" "hash/dc" "if" "implies" "import" "include" "include-at/relative-to" "include-at/relative-to/reader" "include/reader" "inherit" "inherit-field" "inherit/inner" "inherit/super" "init" "init-depend" "init-field" "init-rest" "inner" "inspect" "instantiate" "interface" "interface*" "invariant-assertion" "invoke-unit" "invoke-unit/infer" "lambda" "lazy" "let" "let*" "let*-values" "let-syntax" "let-syntaxes" "let-values" "let/cc" "let/ec" "letrec" "letrec-syntax" "letrec-syntaxes" "letrec-syntaxes+values" "letrec-values" "lib" "link" "local" "local-require" "log-debug" "log-error" "log-fatal" "log-info" "log-warning" "match" "match*" "match*/derived" "match-define" "match-define-values" "match-lambda" "match-lambda*" "match-lambda**" "match-let" "match-let*" "match-let*-values" "match-let-values" "match-letrec" "match-letrec-values" "match/derived" "match/values" "member-name-key" "mixin" "module" "module*" "module+" "nand" "new" "nor" "object-contract" "object/c" "only" "only-in" "only-meta-in" "only-space-in" "open" "opt/c" "or" "overment" "overment*" "override" "override*" "override-final" "override-final*" "parameterize" "parameterize*" "parameterize-break" "parametric->/c" "place" "place*" "place/context" "planet" "prefix" "prefix-in" "prefix-out" "private" "private*" "prompt-tag/c" "prop:dict/contract" "protect-out" "provide" "provide-signature-elements" "provide/contract" "public" "public*" "public-final" "public-final*" "pubment" "pubment*" "quasiquote" "quasisyntax" "quasisyntax/loc" "quote" "quote-syntax" "quote-syntax/prune" "recontract-out" "recursive-contract" "relative-in" "rename" "rename-in" "rename-inner" "rename-out" "rename-super" "require" "send" "send*" "send+" "send-generic" "send/apply" "send/keyword-apply" "set!" "set!-values" "set-field!" "shared" "stream" "stream*" "stream-cons" "stream-lazy" "struct" "struct*" "struct-copy" "struct-field-index" "struct-guard/c" "struct-out" "struct/c" "struct/contract" "struct/ctc" "struct/dc" "struct/derived" "submod" "super" "super-instantiate" "super-make-object" "super-new" "syntax" "syntax-case" "syntax-case*" "syntax-id-rules" "syntax-rules" "syntax/loc" "tag" "this" "this%" "thunk" "thunk*" "time" "unconstrained-domain->" "unit" "unit-from-context" "unit/c" "unit/new-import-export" "unit/s" "unless" "unquote" "unquote-splicing" "unsyntax" "unsyntax-splicing" "values/drop" "when" "with-continuation-mark" "with-contract" "with-contract-continuation-mark" "with-handlers" "with-handlers*" "with-method" "with-syntax" "~?" "~@" "λ")
+  )
+; builtin procedures
 ((symbol) @function.builtin
- (#any-of? @function.builtin
-  "*" "*list/c" "+" "-" "/" "<" "</c" "<=" "<=/c" "=" "=/c" ">" ">/c" ">=" ">=/c" "abort-current-continuation" "abs" "absolute-path?" "acos" "add-between" "add1" "alarm-evt" "and/c" "andmap" "angle" "any/c" "append" "append*" "append-map" "apply" "argmax" "argmin" "arithmetic-shift" "arity-at-least" "arity-at-least-value" "arity-at-least?" "arity-checking-wrapper" "arity-includes?" "arity=?" "arrow-contract-info" "arrow-contract-info-accepts-arglist" "arrow-contract-info-chaperone-procedure" "arrow-contract-info-check-first-order" "arrow-contract-info?" "asin" "assert-unreachable" "assf" "assoc" "assq" "assv" "atan" "bad-number-of-results" "banner" "base->-doms/c" "base->-rngs/c" "base->?" "between/c" "bitwise-and" "bitwise-bit-field" "bitwise-bit-set?" "bitwise-ior" "bitwise-not" "bitwise-xor" "blame-add-car-context" "blame-add-cdr-context" "blame-add-context" "blame-add-missing-party" "blame-add-nth-arg-context" "blame-add-range-context" "blame-add-unknown-context" "blame-context" "blame-contract" "blame-fmt->-string" "blame-missing-party?" "blame-negative" "blame-original?" "blame-positive" "blame-replace-negative" "blame-replaced-negative?" "blame-source" "blame-swap" "blame-swapped?" "blame-update" "blame-value" "blame?" "boolean=?" "boolean?" "bound-identifier=?" "box" "box-cas!" "box-immutable" "box-immutable/c" "box/c" "box?" "break-enabled" "break-parameterization?" "break-thread" "build-chaperone-contract-property" "build-compound-type-name" "build-contract-property" "build-flat-contract-property" "build-list" "build-path" "build-path/convention-type" "build-string" "build-vector" "byte-pregexp" "byte-pregexp?" "byte-ready?" "byte-regexp" "byte-regexp?" "byte?" "bytes" "bytes->immutable-bytes" "bytes->list" "bytes->path" "bytes->path-element" "bytes->string/latin-1" "bytes->string/locale" "bytes->string/utf-8" "bytes-append" "bytes-append*" "bytes-close-converter" "bytes-convert" "bytes-convert-end" "bytes-converter?" "bytes-copy" "bytes-copy!" "bytes-environment-variable-name?" "bytes-fill!" "bytes-join" "bytes-length" "bytes-no-nuls?" "bytes-open-converter" "bytes-ref" "bytes-set!" "bytes-utf-8-index" "bytes-utf-8-length" "bytes-utf-8-ref" "bytes<?" "bytes=?" "bytes>?" "bytes?" "caaaar" "caaadr" "caaar" "caadar" "caaddr" "caadr" "caar" "cadaar" "cadadr" "cadar" "caddar" "cadddr" "caddr" "cadr" "call-in-continuation" "call-in-nested-thread" "call-with-atomic-output-file" "call-with-break-parameterization" "call-with-composable-continuation" "call-with-continuation-barrier" "call-with-continuation-prompt" "call-with-current-continuation" "call-with-default-reading-parameterization" "call-with-escape-continuation" "call-with-exception-handler" "call-with-file-lock/timeout" "call-with-immediate-continuation-mark" "call-with-input-bytes" "call-with-input-file" "call-with-input-file*" "call-with-input-string" "call-with-output-bytes" "call-with-output-file" "call-with-output-file*" "call-with-output-string" "call-with-parameterization" "call-with-semaphore" "call-with-semaphore/enable-break" "call-with-values" "call/cc" "call/ec" "car" "cartesian-product" "cdaaar" "cdaadr" "cdaar" "cdadar" "cdaddr" "cdadr" "cdar" "cddaar" "cddadr" "cddar" "cdddar" "cddddr" "cdddr" "cddr" "cdr" "ceiling" "channel-get" "channel-put" "channel-put-evt" "channel-put-evt?" "channel-try-get" "channel/c" "channel?" "chaperone-box" "chaperone-channel" "chaperone-continuation-mark-key" "chaperone-contract-property?" "chaperone-contract?" "chaperone-evt" "chaperone-hash" "chaperone-hash-set" "chaperone-of?" "chaperone-procedure" "chaperone-procedure*" "chaperone-prompt-tag" "chaperone-struct" "chaperone-struct-type" "chaperone-vector" "chaperone-vector*" "chaperone?" "char->integer" "char-alphabetic?" "char-blank?" "char-ci<=?" "char-ci<?" "char-ci=?" "char-ci>=?" "char-ci>?" "char-downcase" "char-foldcase" "char-general-category" "char-graphic?" "char-in" "char-in/c" "char-iso-control?" "char-lower-case?" "char-numeric?" "char-punctuation?" "char-ready?" "char-symbolic?" "char-title-case?" "char-titlecase" "char-upcase" "char-upper-case?" "char-utf-8-length" "char-whitespace?" "char<=?" "char<?" "char=?" "char>=?" "char>?" "char?" "check-duplicate-identifier" "check-duplicates" "checked-procedure-check-and-extract" "choice-evt" "class->interface" "class-info" "class-seal" "class-unseal" "class?" "cleanse-path" "close-input-port" "close-output-port" "coerce-chaperone-contract" "coerce-chaperone-contracts" "coerce-contract" "coerce-contract/f" "coerce-contracts" "coerce-flat-contract" "coerce-flat-contracts" "collect-garbage" "collection-file-path" "collection-path" "combinations" "combine-output" "compile" "compile-allow-set!-undefined" "compile-context-preservation-enabled" "compile-enforce-module-constants" "compile-syntax" "compile-target-machine?" "compiled-expression-recompile" "compiled-expression?" "compiled-module-expression?" "complete-path?" "complex?" "compose" "compose1" "conjoin" "conjugate" "cons" "cons/c" "cons?" "const" "continuation-mark-key/c" "continuation-mark-key?" "continuation-mark-set->context" "continuation-mark-set->iterator" "continuation-mark-set->list" "continuation-mark-set->list*" "continuation-mark-set-first" "continuation-mark-set?" "continuation-marks" "continuation-prompt-available?" "continuation-prompt-tag?" "continuation?" "contract-custom-write-property-proc" "contract-equivalent?" "contract-exercise" "contract-first-order" "contract-first-order-passes?" "contract-late-neg-projection" "contract-name" "contract-proc" "contract-projection" "contract-property?" "contract-random-generate" "contract-random-generate-env?" "contract-random-generate-fail?" "contract-random-generate-get-current-environment" "contract-random-generate-stash" "contract-random-generate/choose" "contract-stronger?" "contract-struct-exercise" "contract-struct-generate" "contract-struct-late-neg-projection" "contract-struct-list-contract?" "contract-val-first-projection" "contract?" "convert-stream" "copy-directory/files" "copy-file" "copy-port" "cos" "cosh" "count" "current-blame-format" "current-break-parameterization" "current-code-inspector" "current-command-line-arguments" "current-compile" "current-compile-realm" "current-compile-target-machine" "current-compiled-file-roots" "current-continuation-marks" "current-custodian" "current-directory" "current-directory-for-user" "current-drive" "current-environment-variables" "current-error-message-adjuster" "current-error-port" "current-eval" "current-evt-pseudo-random-generator" "current-force-delete-permissions" "current-future" "current-gc-milliseconds" "current-get-interaction-evt" "current-get-interaction-input-port" "current-inexact-milliseconds" "current-inexact-monotonic-milliseconds" "current-input-port" "current-inspector" "current-library-collection-links" "current-library-collection-paths" "current-load" "current-load-extension" "current-load-relative-directory" "current-load/use-compiled" "current-locale" "current-logger" "current-memory-use" "current-milliseconds" "current-module-declare-name" "current-module-declare-source" "current-module-name-resolver" "current-module-path-for-load" "current-namespace" "current-output-port" "current-parameterization" "current-plumber" "current-preserved-thread-cell-values" "current-print" "current-process-milliseconds" "current-prompt-read" "current-pseudo-random-generator" "current-read-interaction" "current-reader-guard" "current-readtable" "current-seconds" "current-security-guard" "current-subprocess-custodian-mode" "current-subprocess-keep-file-descriptors" "current-thread" "current-thread-group" "current-thread-initial-stack-size" "current-write-relative-directory" "curry" "curryr" "custodian-box-value" "custodian-box?" "custodian-limit-memory" "custodian-managed-list" "custodian-memory-accounting-available?" "custodian-require-memory" "custodian-shut-down?" "custodian-shutdown-all" "custodian?" "custom-print-quotable-accessor" "custom-print-quotable?" "custom-write-accessor" "custom-write-property-proc" "custom-write?" "date" "date*" "date*-nanosecond" "date*-time-zone-name" "date*?" "date-day" "date-dst?" "date-hour" "date-minute" "date-month" "date-second" "date-time-zone-offset" "date-week-day" "date-year" "date-year-day" "date?" "datum->syntax" "datum-intern-literal" "default-continuation-prompt-tag" "degrees->radians" "delete-directory" "delete-directory/files" "delete-file" "denominator" "dict->list" "dict-can-functional-set?" "dict-can-remove-keys?" "dict-clear" "dict-clear!" "dict-copy" "dict-count" "dict-empty?" "dict-for-each" "dict-has-key?" "dict-implements/c" "dict-implements?" "dict-iter-contract" "dict-iterate-first" "dict-iterate-key" "dict-iterate-next" "dict-iterate-value" "dict-key-contract" "dict-keys" "dict-map" "dict-mutable?" "dict-ref" "dict-ref!" "dict-remove" "dict-remove!" "dict-set" "dict-set!" "dict-set*" "dict-set*!" "dict-update" "dict-update!" "dict-value-contract" "dict-values" "dict?" "directory-exists?" "directory-list" "disjoin" "display" "display-lines" "display-lines-to-file" "display-to-file" "displayln" "double-flonum?" "drop" "drop-common-prefix" "drop-right" "dropf" "dropf-right" "dump-memory-stats" "dup-input-port" "dup-output-port" "dynamic->*" "dynamic-get-field" "dynamic-object/c" "dynamic-place" "dynamic-place*" "dynamic-require" "dynamic-require-for-syntax" "dynamic-send" "dynamic-set-field!" "dynamic-wind" "eighth" "empty?" "environment-variables-copy" "environment-variables-names" "environment-variables-ref" "environment-variables-set!" "environment-variables?" "eof-evt" "eof-object?" "ephemeron-value" "ephemeron?" "eprintf" "eq-contract-val" "eq-contract?" "eq-hash-code" "eq?" "equal-contract-val" "equal-contract?" "equal-hash-code" "equal-secondary-hash-code" "equal?" "equal?/recur" "eqv-hash-code" "eqv?" "error" "error-contract->adjusted-string" "error-display-handler" "error-escape-handler" "error-message->adjusted-string" "error-print-context-length" "error-print-source-location" "error-print-width" "error-syntax->string-handler" "error-value->string-handler" "eval" "eval-jit-enabled" "eval-syntax" "even?" "evt/c" "evt?" "exact->inexact" "exact-ceiling" "exact-floor" "exact-integer?" "exact-nonnegative-integer?" "exact-positive-integer?" "exact-round" "exact-truncate" "exact?" "executable-yield-handler" "exit" "exit-handler" "exn" "exn-continuation-marks" "exn-message" "exn:break" "exn:break-continuation" "exn:break:hang-up" "exn:break:hang-up?" "exn:break:terminate" "exn:break:terminate?" "exn:break?" "exn:fail" "exn:fail:contract" "exn:fail:contract:arity" "exn:fail:contract:arity?" "exn:fail:contract:blame" "exn:fail:contract:blame-object" "exn:fail:contract:blame?" "exn:fail:contract:continuation" "exn:fail:contract:continuation?" "exn:fail:contract:divide-by-zero" "exn:fail:contract:divide-by-zero?" "exn:fail:contract:non-fixnum-result" "exn:fail:contract:non-fixnum-result?" "exn:fail:contract:variable" "exn:fail:contract:variable-id" "exn:fail:contract:variable?" "exn:fail:contract?" "exn:fail:filesystem" "exn:fail:filesystem:errno" "exn:fail:filesystem:errno-errno" "exn:fail:filesystem:errno?" "exn:fail:filesystem:exists" "exn:fail:filesystem:exists?" "exn:fail:filesystem:missing-module" "exn:fail:filesystem:missing-module-path" "exn:fail:filesystem:missing-module?" "exn:fail:filesystem:version" "exn:fail:filesystem:version?" "exn:fail:filesystem?" "exn:fail:network" "exn:fail:network:errno" "exn:fail:network:errno-errno" "exn:fail:network:errno?" "exn:fail:network?" "exn:fail:object" "exn:fail:object?" "exn:fail:out-of-memory" "exn:fail:out-of-memory?" "exn:fail:read" "exn:fail:read-srclocs" "exn:fail:read:eof" "exn:fail:read:eof?" "exn:fail:read:non-char" "exn:fail:read:non-char?" "exn:fail:read?" "exn:fail:syntax" "exn:fail:syntax-exprs" "exn:fail:syntax:missing-module" "exn:fail:syntax:missing-module-path" "exn:fail:syntax:missing-module?" "exn:fail:syntax:unbound" "exn:fail:syntax:unbound?" "exn:fail:syntax?" "exn:fail:unsupported" "exn:fail:unsupported?" "exn:fail:user" "exn:fail:user?" "exn:fail?" "exn:misc:match?" "exn:missing-module-accessor" "exn:missing-module?" "exn:srclocs-accessor" "exn:srclocs?" "exn?" "exp" "expand" "expand-once" "expand-syntax" "expand-syntax-once" "expand-syntax-to-top-form" "expand-to-top-form" "expand-user-path" "explode-path" "expt" "false?" "field-names" "fifth" "file->bytes" "file->bytes-lines" "file->lines" "file->list" "file->string" "file->value" "file-exists?" "file-name-from-path" "file-or-directory-identity" "file-or-directory-modify-seconds" "file-or-directory-permissions" "file-or-directory-stat" "file-or-directory-type" "file-position" "file-position*" "file-size" "file-stream-buffer-mode" "file-stream-port?" "file-truncate" "filename-extension" "filesystem-change-evt" "filesystem-change-evt-cancel" "filesystem-change-evt?" "filesystem-root-list" "filter" "filter-map" "filter-not" "filter-read-input-port" "find-compiled-file-roots" "find-executable-path" "find-files" "find-library-collection-links" "find-library-collection-paths" "find-relative-path" "find-system-path" "findf" "first" "first-or/c" "fixnum?" "flat-contract" "flat-contract-predicate" "flat-contract-property?" "flat-contract-with-explanation" "flat-contract?" "flat-named-contract" "flatten" "floating-point-bytes->real" "flonum?" "floor" "flush-output" "fold-files" "foldl" "foldr" "for-each" "force" "format" "fourth" "fprintf" "free-identifier=?" "free-label-identifier=?" "free-template-identifier=?" "free-transformer-identifier=?" "fsemaphore-count" "fsemaphore-post" "fsemaphore-try-wait?" "fsemaphore-wait" "fsemaphore?" "future" "future?" "futures-enabled?" "gcd" "generate-member-key" "generate-temporaries" "generic-set?" "generic?" "gensym" "get-output-bytes" "get-output-string" "get-preference" "get/build-late-neg-projection" "get/build-val-first-projection" "getenv" "global-port-print-handler" "group-by" "guard-evt" "handle-evt" "handle-evt?" "has-blame?" "has-contract?" "hash" "hash->list" "hash-clear" "hash-clear!" "hash-copy" "hash-copy-clear" "hash-count" "hash-empty?" "hash-ephemeron?" "hash-eq?" "hash-equal?" "hash-eqv?" "hash-for-each" "hash-has-key?" "hash-iterate-first" "hash-iterate-key" "hash-iterate-key+value" "hash-iterate-next" "hash-iterate-pair" "hash-iterate-value" "hash-keys" "hash-keys-subset?" "hash-map" "hash-placeholder?" "hash-ref" "hash-ref!" "hash-ref-key" "hash-remove" "hash-remove!" "hash-set" "hash-set!" "hash-set*" "hash-set*!" "hash-strong?" "hash-update" "hash-update!" "hash-values" "hash-weak?" "hash/c" "hash?" "hasheq" "hasheqv" "identifier-binding" "identifier-binding-portal-syntax" "identifier-binding-symbol" "identifier-distinct-binding" "identifier-label-binding" "identifier-prune-lexical-context" "identifier-prune-to-source-module" "identifier-remove-from-definition-context" "identifier-template-binding" "identifier-transformer-binding" "identifier?" "identity" "if/c" "imag-part" "immutable?" "impersonate-box" "impersonate-channel" "impersonate-continuation-mark-key" "impersonate-hash" "impersonate-hash-set" "impersonate-procedure" "impersonate-procedure*" "impersonate-prompt-tag" "impersonate-struct" "impersonate-vector" "impersonate-vector*" "impersonator-contract?" "impersonator-ephemeron" "impersonator-of?" "impersonator-property-accessor-procedure?" "impersonator-property?" "impersonator?" "implementation?" "implementation?/c" "in-bytes" "in-bytes-lines" "in-combinations" "in-cycle" "in-dict" "in-dict-keys" "in-dict-pairs" "in-dict-values" "in-directory" "in-ephemeron-hash" "in-ephemeron-hash-keys" "in-ephemeron-hash-pairs" "in-ephemeron-hash-values" "in-hash" "in-hash-keys" "in-hash-pairs" "in-hash-values" "in-immutable-hash" "in-immutable-hash-keys" "in-immutable-hash-pairs" "in-immutable-hash-values" "in-immutable-set" "in-inclusive-range" "in-indexed" "in-input-port-bytes" "in-input-port-chars" "in-lines" "in-list" "in-mlist" "in-mutable-hash" "in-mutable-hash-keys" "in-mutable-hash-pairs" "in-mutable-hash-values" "in-mutable-set" "in-naturals" "in-parallel" "in-permutations" "in-port" "in-producer" "in-range" "in-sequences" "in-set" "in-slice" "in-stream" "in-string" "in-syntax" "in-value" "in-values*-sequence" "in-values-sequence" "in-vector" "in-weak-hash" "in-weak-hash-keys" "in-weak-hash-pairs" "in-weak-hash-values" "in-weak-set" "inclusive-range" "index-of" "index-where" "indexes-of" "indexes-where" "inexact->exact" "inexact-real?" "inexact?" "infinite?" "input-port-append" "input-port?" "inspector-superior?" "inspector?" "instanceof/c" "integer->char" "integer->integer-bytes" "integer-bytes->integer" "integer-in" "integer-length" "integer-sqrt" "integer-sqrt/remainder" "integer?" "interface->method-names" "interface-extension?" "interface?" "internal-definition-context-add-scopes" "internal-definition-context-binding-identifiers" "internal-definition-context-introduce" "internal-definition-context-seal" "internal-definition-context-splice-binding-identifier" "internal-definition-context?" "is-a?" "is-a?/c" "keyword->string" "keyword-apply" "keyword-apply/dict" "keyword<?" "keyword?" "keywords-match" "kill-thread" "last" "last-pair" "lcm" "length" "liberal-define-context?" "link-exists?" "list" "list*" "list*of" "list->bytes" "list->mutable-set" "list->mutable-seteq" "list->mutable-seteqv" "list->set" "list->seteq" "list->seteqv" "list->string" "list->vector" "list->weak-set" "list->weak-seteq" "list->weak-seteqv" "list-contract?" "list-prefix?" "list-ref" "list-set" "list-tail" "list-update" "list/c" "list?" "listen-port-number?" "listof" "load" "load-extension" "load-on-demand-enabled" "load-relative" "load-relative-extension" "load/cd" "load/use-compiled" "local-expand" "local-expand/capture-lifts" "local-transformer-expand" "local-transformer-expand/capture-lifts" "locale-string-encoding" "log" "log-all-levels" "log-level-evt" "log-level?" "log-max-level" "log-message" "log-receiver?" "logger-name" "logger?" "magnitude" "make-arity-at-least" "make-base-empty-namespace" "make-base-namespace" "make-bytes" "make-channel" "make-chaperone-contract" "make-continuation-mark-key" "make-continuation-prompt-tag" "make-contract" "make-custodian" "make-custodian-box" "make-custom-hash" "make-custom-hash-types" "make-custom-set" "make-custom-set-types" "make-date" "make-date*" "make-derived-parameter" "make-directory" "make-directory*" "make-do-sequence" "make-empty-namespace" "make-environment-variables" "make-ephemeron" "make-ephemeron-hash" "make-ephemeron-hasheq" "make-ephemeron-hasheqv" "make-exn" "make-exn:break" "make-exn:break:hang-up" "make-exn:break:terminate" "make-exn:fail" "make-exn:fail:contract" "make-exn:fail:contract:arity" "make-exn:fail:contract:blame" "make-exn:fail:contract:continuation" "make-exn:fail:contract:divide-by-zero" "make-exn:fail:contract:non-fixnum-result" "make-exn:fail:contract:variable" "make-exn:fail:filesystem" "make-exn:fail:filesystem:errno" "make-exn:fail:filesystem:exists" "make-exn:fail:filesystem:missing-module" "make-exn:fail:filesystem:version" "make-exn:fail:network" "make-exn:fail:network:errno" "make-exn:fail:object" "make-exn:fail:out-of-memory" "make-exn:fail:read" "make-exn:fail:read:eof" "make-exn:fail:read:non-char" "make-exn:fail:syntax" "make-exn:fail:syntax:missing-module" "make-exn:fail:syntax:unbound" "make-exn:fail:unsupported" "make-exn:fail:user" "make-file-or-directory-link" "make-flat-contract" "make-fsemaphore" "make-generic" "make-handle-get-preference-locked" "make-hash" "make-hash-placeholder" "make-hasheq" "make-hasheq-placeholder" "make-hasheqv" "make-hasheqv-placeholder" "make-immutable-custom-hash" "make-immutable-hash" "make-immutable-hasheq" "make-immutable-hasheqv" "make-impersonator-property" "make-input-port" "make-input-port/read-to-peek" "make-inspector" "make-interned-syntax-introducer" "make-keyword-procedure" "make-known-char-range-list" "make-limited-input-port" "make-list" "make-lock-file-name" "make-log-receiver" "make-logger" "make-mixin-contract" "make-mutable-custom-set" "make-none/c" "make-object" "make-output-port" "make-parameter" "make-parent-directory*" "make-phantom-bytes" "make-pipe" "make-pipe-with-specials" "make-placeholder" "make-plumber" "make-polar" "make-portal-syntax" "make-prefab-struct" "make-primitive-class" "make-proj-contract" "make-pseudo-random-generator" "make-reader-graph" "make-readtable" "make-rectangular" "make-rename-transformer" "make-resolved-module-path" "make-security-guard" "make-semaphore" "make-set!-transformer" "make-shared-bytes" "make-sibling-inspector" "make-special-comment" "make-srcloc" "make-string" "make-struct-field-accessor" "make-struct-field-mutator" "make-struct-type" "make-struct-type-property" "make-syntax-delta-introducer" "make-syntax-introducer" "make-temporary-directory" "make-temporary-directory*" "make-temporary-file" "make-temporary-file*" "make-tentative-pretty-print-output-port" "make-thread-cell" "make-thread-group" "make-vector" "make-weak-box" "make-weak-custom-hash" "make-weak-custom-set" "make-weak-hash" "make-weak-hasheq" "make-weak-hasheqv" "make-will-executor" "map" "match-equality-test" "matches-arity-exactly?" "max" "mcar" "mcdr" "mcons" "member" "member-name-key-hash-code" "member-name-key=?" "member-name-key?" "memf" "memory-order-acquire" "memory-order-release" "memq" "memv" "merge-input" "method-in-interface?" "min" "module->exports" "module->imports" "module->indirect-exports" "module->language-info" "module->namespace" "module->realm" "module-compiled-cross-phase-persistent?" "module-compiled-exports" "module-compiled-imports" "module-compiled-indirect-exports" "module-compiled-language-info" "module-compiled-name" "module-compiled-realm" "module-compiled-submodules" "module-declared?" "module-path-index-join" "module-path-index-resolve" "module-path-index-split" "module-path-index-submodule" "module-path-index?" "module-path?" "module-predefined?" "module-provide-protected?" "modulo" "mpair?" "mutable-set" "mutable-seteq" "mutable-seteqv" "n->th" "nack-guard-evt" "namespace-anchor->empty-namespace" "namespace-anchor->namespace" "namespace-anchor?" "namespace-attach-module" "namespace-attach-module-declaration" "namespace-base-phase" "namespace-call-with-registry-lock" "namespace-mapped-symbols" "namespace-module-identifier" "namespace-module-registry" "namespace-require" "namespace-require/constant" "namespace-require/copy" "namespace-require/expansion-time" "namespace-set-variable-value!" "namespace-symbol->identifier" "namespace-syntax-introduce" "namespace-undefine-variable!" "namespace-unprotect-module" "namespace-variable-value" "namespace?" "nan?" "natural-number/c" "natural?" "negate" "negative-integer?" "negative?" "new-∀/c" "new-∃/c" "newline" "ninth" "non-empty-listof" "non-empty-string?" "none/c" "nonnegative-integer?" "nonpositive-integer?" "normal-case-path" "normalize-arity" "normalize-path" "normalized-arity?" "not" "not/c" "null?" "number->string" "number?" "numerator" "object->vector" "object-info" "object-interface" "object-method-arity-includes?" "object-name" "object-or-false=?" "object=-hash-code" "object=?" "object?" "odd?" "one-of/c" "open-input-bytes" "open-input-file" "open-input-output-file" "open-input-string" "open-output-bytes" "open-output-file" "open-output-nowhere" "open-output-string" "or/c" "order-of-magnitude" "ormap" "output-port?" "pair?" "parameter-procedure=?" "parameter/c" "parameter?" "parameterization?" "parse-command-line" "partition" "path->bytes" "path->complete-path" "path->directory-path" "path->string" "path-add-extension" "path-add-suffix" "path-convention-type" "path-element->bytes" "path-element->string" "path-element?" "path-for-some-system?" "path-get-extension" "path-has-extension?" "path-list-string->path-list" "path-only" "path-replace-extension" "path-replace-suffix" "path-string?" "path<?" "path?" "pathlist-closure" "peek-byte" "peek-byte-or-special" "peek-bytes" "peek-bytes!" "peek-bytes!-evt" "peek-bytes-avail!" "peek-bytes-avail!*" "peek-bytes-avail!-evt" "peek-bytes-avail!/enable-break" "peek-bytes-evt" "peek-char" "peek-char-or-special" "peek-string" "peek-string!" "peek-string!-evt" "peek-string-evt" "peeking-input-port" "permutations" "phantom-bytes?" "pipe-content-length" "place-break" "place-channel" "place-channel-get" "place-channel-put" "place-channel-put/get" "place-channel?" "place-dead-evt" "place-enabled?" "place-kill" "place-location?" "place-message-allowed?" "place-wait" "place?" "placeholder-get" "placeholder-set!" "placeholder?" "plumber-add-flush!" "plumber-flush-all" "plumber-flush-handle-remove!" "plumber-flush-handle?" "plumber?" "poll-guard-evt" "port->bytes" "port->bytes-lines" "port->lines" "port->list" "port->string" "port-closed-evt" "port-closed?" "port-commit-peeked" "port-count-lines!" "port-count-lines-enabled" "port-counts-lines?" "port-display-handler" "port-file-identity" "port-file-unlock" "port-next-location" "port-number?" "port-print-handler" "port-progress-evt" "port-provides-progress-evts?" "port-read-handler" "port-try-file-lock?" "port-waiting-peer?" "port-write-handler" "port-writes-atomic?" "port-writes-special?" "port?" "portal-syntax-content" "portal-syntax?" "positive-integer?" "positive?" "prefab-key->struct-type" "prefab-key?" "prefab-struct-key" "preferences-lock-file-mode" "pregexp" "pregexp?" "pretty-display" "pretty-format" "pretty-print" "pretty-print-.-symbol-without-bars" "pretty-print-abbreviate-read-macros" "pretty-print-columns" "pretty-print-current-style-table" "pretty-print-depth" "pretty-print-exact-as-decimal" "pretty-print-extend-style-table" "pretty-print-handler" "pretty-print-newline" "pretty-print-post-print-hook" "pretty-print-pre-print-hook" "pretty-print-print-hook" "pretty-print-print-line" "pretty-print-remap-stylable" "pretty-print-show-inexactness" "pretty-print-size-hook" "pretty-print-style-table?" "pretty-printing" "pretty-write" "primitive-closure?" "primitive-result-arity" "primitive?" "print" "print-as-expression" "print-boolean-long-form" "print-box" "print-graph" "print-hash-table" "print-mpair-curly-braces" "print-pair-curly-braces" "print-reader-abbreviations" "print-struct" "print-syntax-width" "print-unreadable" "print-value-columns" "print-vector-length" "printable/c" "printf" "println" "procedure->method" "procedure-arity" "procedure-arity-includes/c" "procedure-arity-includes?" "procedure-arity-mask" "procedure-arity?" "procedure-closure-contents-eq?" "procedure-extract-target" "procedure-impersonator*?" "procedure-keywords" "procedure-realm" "procedure-reduce-arity" "procedure-reduce-arity-mask" "procedure-reduce-keyword-arity" "procedure-reduce-keyword-arity-mask" "procedure-rename" "procedure-result-arity" "procedure-specialize" "procedure-struct-type?" "procedure?" "process" "process*" "process*/ports" "process/ports" "processor-count" "progress-evt?" "promise-forced?" "promise-running?" "promise/c" "promise/name?" "promise?" "prop:arrow-contract-get-info" "prop:arrow-contract?" "prop:orc-contract-get-subcontracts" "prop:orc-contract?" "prop:recursive-contract-unroll" "prop:recursive-contract?" "proper-subset?" "property/c" "pseudo-random-generator->vector" "pseudo-random-generator-vector?" "pseudo-random-generator?" "put-preferences" "putenv" "quotient" "quotient/remainder" "radians->degrees" "raise" "raise-argument-error" "raise-argument-error*" "raise-arguments-error" "raise-arguments-error*" "raise-arity-error" "raise-arity-error*" "raise-arity-mask-error" "raise-arity-mask-error*" "raise-blame-error" "raise-contract-error" "raise-mismatch-error" "raise-not-cons-blame-error" "raise-range-error" "raise-range-error*" "raise-result-arity-error" "raise-result-arity-error*" "raise-result-error" "raise-result-error*" "raise-syntax-error" "raise-type-error" "raise-user-error" "random" "random-seed" "range" "rational?" "rationalize" "read" "read-accept-bar-quote" "read-accept-box" "read-accept-compiled" "read-accept-dot" "read-accept-graph" "read-accept-infix-dot" "read-accept-lang" "read-accept-quasiquote" "read-accept-reader" "read-byte" "read-byte-or-special" "read-bytes" "read-bytes!" "read-bytes!-evt" "read-bytes-avail!" "read-bytes-avail!*" "read-bytes-avail!-evt" "read-bytes-avail!/enable-break" "read-bytes-evt" "read-bytes-line" "read-bytes-line-evt" "read-case-sensitive" "read-cdot" "read-char" "read-char-or-special" "read-curly-brace-as-paren" "read-curly-brace-with-tag" "read-decimal-as-inexact" "read-eval-print-loop" "read-installation-configuration-table" "read-language" "read-line" "read-line-evt" "read-on-demand-source" "read-single-flonum" "read-square-bracket-as-paren" "read-square-bracket-with-tag" "read-string" "read-string!" "read-string!-evt" "read-string-evt" "read-syntax" "read-syntax-accept-graph" "read-syntax/recursive" "read/recursive" "readtable-mapping" "readtable?" "real->decimal-string" "real->double-flonum" "real->floating-point-bytes" "real->single-flonum" "real-in" "real-part" "real?" "reencode-input-port" "reencode-output-port" "regexp" "regexp-match" "regexp-match*" "regexp-match-evt" "regexp-match-exact?" "regexp-match-peek" "regexp-match-peek-immediate" "regexp-match-peek-positions" "regexp-match-peek-positions*" "regexp-match-peek-positions-immediate" "regexp-match-peek-positions-immediate/end" "regexp-match-peek-positions/end" "regexp-match-positions" "regexp-match-positions*" "regexp-match-positions/end" "regexp-match/end" "regexp-match?" "regexp-max-lookbehind" "regexp-quote" "regexp-replace" "regexp-replace*" "regexp-replace-quote" "regexp-replaces" "regexp-split" "regexp-try-match" "regexp?" "relative-path?" "relocate-input-port" "relocate-output-port" "remainder" "remf" "remf*" "remove" "remove*" "remove-duplicates" "remq" "remq*" "remv" "remv*" "rename-contract" "rename-file-or-directory" "rename-transformer-target" "rename-transformer?" "replace-evt" "reroot-path" "resolve-path" "resolved-module-path-name" "resolved-module-path?" "rest" "reverse" "round" "second" "seconds->date" "security-guard?" "semaphore-peek-evt" "semaphore-peek-evt?" "semaphore-post" "semaphore-try-wait?" "semaphore-wait" "semaphore-wait/enable-break" "semaphore?" "sequence->list" "sequence->stream" "sequence-add-between" "sequence-andmap" "sequence-append" "sequence-count" "sequence-filter" "sequence-fold" "sequence-for-each" "sequence-generate" "sequence-generate*" "sequence-length" "sequence-map" "sequence-ormap" "sequence-ref" "sequence-tail" "sequence/c" "sequence?" "set" "set!-transformer-procedure" "set!-transformer?" "set->list" "set->stream" "set-add" "set-add!" "set-box!" "set-box*!" "set-clear" "set-clear!" "set-copy" "set-copy-clear" "set-count" "set-empty?" "set-eq?" "set-equal?" "set-eqv?" "set-first" "set-for-each" "set-implements/c" "set-implements?" "set-intersect" "set-intersect!" "set-map" "set-mcar!" "set-mcdr!" "set-member?" "set-mutable?" "set-phantom-bytes!" "set-port-next-location!" "set-remove" "set-remove!" "set-rest" "set-subtract" "set-subtract!" "set-symmetric-difference" "set-symmetric-difference!" "set-union" "set-union!" "set-weak?" "set/c" "set=?" "set?" "seteq" "seteqv" "seventh" "sgn" "sha1-bytes" "sha224-bytes" "sha256-bytes" "shared-bytes" "shell-execute" "shrink-path-wrt" "shuffle" "simple-form-path" "simplify-path" "sin" "single-flonum-available?" "single-flonum?" "sinh" "sixth" "skip-projection-wrapper?" "sleep" "some-system-path->string" "sort" "special-comment-value" "special-comment?" "special-filter-input-port" "split-at" "split-at-right" "split-common-prefix" "split-path" "splitf-at" "splitf-at-right" "sqr" "sqrt" "srcloc" "srcloc->string" "srcloc-column" "srcloc-line" "srcloc-position" "srcloc-source" "srcloc-span" "srcloc?" "stop-after" "stop-before" "stream->list" "stream-add-between" "stream-andmap" "stream-append" "stream-count" "stream-empty?" "stream-filter" "stream-first" "stream-fold" "stream-for-each" "stream-force" "stream-length" "stream-map" "stream-ormap" "stream-ref" "stream-rest" "stream-tail" "stream-take" "stream/c" "stream?" "string" "string->bytes/latin-1" "string->bytes/locale" "string->bytes/utf-8" "string->immutable-string" "string->keyword" "string->list" "string->number" "string->path" "string->path-element" "string->some-system-path" "string->symbol" "string->uninterned-symbol" "string->unreadable-symbol" "string-append" "string-append*" "string-append-immutable" "string-ci<=?" "string-ci<?" "string-ci=?" "string-ci>=?" "string-ci>?" "string-contains?" "string-copy" "string-copy!" "string-downcase" "string-environment-variable-name?" "string-fill!" "string-foldcase" "string-join" "string-len/c" "string-length" "string-locale-ci<?" "string-locale-ci=?" "string-locale-ci>?" "string-locale-downcase" "string-locale-upcase" "string-locale<?" "string-locale=?" "string-locale>?" "string-no-nuls?" "string-normalize-nfc" "string-normalize-nfd" "string-normalize-nfkc" "string-normalize-nfkd" "string-normalize-spaces" "string-port?" "string-prefix?" "string-ref" "string-replace" "string-set!" "string-split" "string-suffix?" "string-titlecase" "string-trim" "string-upcase" "string-utf-8-length" "string<=?" "string<?" "string=?" "string>=?" "string>?" "string?" "struct->vector" "struct-accessor-procedure?" "struct-constructor-procedure?" "struct-info" "struct-mutator-procedure?" "struct-predicate-procedure?" "struct-type-authentic?" "struct-type-info" "struct-type-make-constructor" "struct-type-make-predicate" "struct-type-property-accessor-procedure?" "struct-type-property-predicate-procedure?" "struct-type-property/c" "struct-type-property?" "struct-type-sealed?" "struct-type?" "struct?" "sub1" "subbytes" "subclass?" "subclass?/c" "subprocess" "subprocess-group-enabled" "subprocess-kill" "subprocess-pid" "subprocess-status" "subprocess-wait" "subprocess?" "subset?" "substring" "suggest/c" "symbol->string" "symbol-interned?" "symbol-unreadable?" "symbol<?" "symbol=?" "symbol?" "symbols" "sync" "sync/enable-break" "sync/timeout" "sync/timeout/enable-break" "syntax->datum" "syntax->list" "syntax-arm" "syntax-binding-set" "syntax-binding-set->syntax" "syntax-binding-set-extend" "syntax-binding-set?" "syntax-column" "syntax-debug-info" "syntax-deserialize" "syntax-disarm" "syntax-e" "syntax-line" "syntax-local-apply-transformer" "syntax-local-bind-syntaxes" "syntax-local-certifier" "syntax-local-context" "syntax-local-expand-expression" "syntax-local-get-shadower" "syntax-local-identifier-as-binding" "syntax-local-introduce" "syntax-local-lift-context" "syntax-local-lift-expression" "syntax-local-lift-module" "syntax-local-lift-module-end-declaration" "syntax-local-lift-provide" "syntax-local-lift-require" "syntax-local-lift-values-expression" "syntax-local-make-definition-context" "syntax-local-make-delta-introducer" "syntax-local-module-defined-identifiers" "syntax-local-module-exports" "syntax-local-module-interned-scope-symbols" "syntax-local-module-required-identifiers" "syntax-local-name" "syntax-local-phase-level" "syntax-local-submodules" "syntax-local-transforming-module-provides?" "syntax-local-value" "syntax-local-value/immediate" "syntax-original?" "syntax-position" "syntax-property" "syntax-property-preserved?" "syntax-property-remove" "syntax-property-symbol-keys" "syntax-protect" "syntax-rearm" "syntax-recertify" "syntax-serialize" "syntax-shift-phase-level" "syntax-source" "syntax-source-module" "syntax-span" "syntax-taint" "syntax-tainted?" "syntax-track-origin" "syntax-transforming-module-expression?" "syntax-transforming-with-lifts?" "syntax-transforming?" "syntax/c" "syntax?" "system" "system*" "system*/exit-code" "system-big-endian?" "system-idle-evt" "system-language+country" "system-library-subpath" "system-path-convention-type" "system-type" "system/exit-code" "tail-marks-match?" "take" "take-common-prefix" "take-right" "takef" "takef-right" "tan" "tanh" "tcp-abandon-port" "tcp-accept" "tcp-accept-evt" "tcp-accept-ready?" "tcp-accept/enable-break" "tcp-addresses" "tcp-close" "tcp-connect" "tcp-connect/enable-break" "tcp-listen" "tcp-listener?" "tcp-port?" "tentative-pretty-print-port-cancel" "tentative-pretty-print-port-transfer" "tenth" "terminal-port?" "third" "thread" "thread-cell-ref" "thread-cell-set!" "thread-cell-values?" "thread-cell?" "thread-dead-evt" "thread-dead?" "thread-group?" "thread-receive" "thread-receive-evt" "thread-resume" "thread-resume-evt" "thread-rewind-receive" "thread-running?" "thread-send" "thread-suspend" "thread-suspend-evt" "thread-try-receive" "thread-wait" "thread/suspend-to-kill" "thread?" "time-apply" "touch" "transplant-input-port" "transplant-output-port" "truncate" "udp-addresses" "udp-bind!" "udp-bound?" "udp-close" "udp-connect!" "udp-connected?" "udp-multicast-interface" "udp-multicast-join-group!" "udp-multicast-leave-group!" "udp-multicast-loopback?" "udp-multicast-set-interface!" "udp-multicast-set-loopback!" "udp-multicast-set-ttl!" "udp-multicast-ttl" "udp-open-socket" "udp-receive!" "udp-receive!*" "udp-receive!-evt" "udp-receive!/enable-break" "udp-receive-ready-evt" "udp-send" "udp-send*" "udp-send-evt" "udp-send-ready-evt" "udp-send-to" "udp-send-to*" "udp-send-to-evt" "udp-send-to/enable-break" "udp-send/enable-break" "udp-set-receive-buffer-size!" "udp-set-ttl!" "udp-ttl" "udp?" "unbox" "unbox*" "uncaught-exception-handler" "unit?" "unquoted-printing-string" "unquoted-printing-string-value" "unquoted-printing-string?" "unsupplied-arg?" "use-collection-link-paths" "use-compiled-file-check" "use-compiled-file-paths" "use-user-specific-search-paths" "value-blame" "value-contract" "values" "variable-reference->empty-namespace" "variable-reference->module-base-phase" "variable-reference->module-declaration-inspector" "variable-reference->module-path-index" "variable-reference->module-source" "variable-reference->namespace" "variable-reference->phase" "variable-reference->resolved-module-path" "variable-reference-constant?" "variable-reference-from-unsafe?" "variable-reference?" "vector" "vector*-length" "vector*-ref" "vector*-set!" "vector->immutable-vector" "vector->list" "vector->pseudo-random-generator" "vector->pseudo-random-generator!" "vector->values" "vector-append" "vector-argmax" "vector-argmin" "vector-cas!" "vector-copy" "vector-copy!" "vector-count" "vector-drop" "vector-drop-right" "vector-empty?" "vector-fill!" "vector-filter" "vector-filter-not" "vector-immutable" "vector-immutable/c" "vector-immutableof" "vector-length" "vector-map" "vector-map!" "vector-member" "vector-memq" "vector-memv" "vector-ref" "vector-set!" "vector-set*!" "vector-set-performance-stats!" "vector-sort" "vector-sort!" "vector-split-at" "vector-split-at-right" "vector-take" "vector-take-right" "vector/c" "vector?" "vectorof" "version" "void" "void?" "weak-box-value" "weak-box?" "weak-set" "weak-seteq" "weak-seteqv" "will-execute" "will-executor?" "will-register" "will-try-execute" "with-input-from-bytes" "with-input-from-file" "with-input-from-string" "with-output-to-bytes" "with-output-to-file" "with-output-to-string" "would-be-future" "wrap-evt" "write" "write-byte" "write-bytes" "write-bytes-avail" "write-bytes-avail*" "write-bytes-avail-evt" "write-bytes-avail/enable-break" "write-char" "write-special" "write-special-avail*" "write-special-evt" "write-string" "write-to-file" "writeln" "xor" "zero?" "~.a" "~.s" "~.v" "~a" "~e" "~r" "~s" "~v"
-  ))
-
-;; operators ;;
-
+  (#any-of? @function.builtin "*" "*list/c" "+" "-" "/" "<" "</c" "<=" "<=/c" "=" "=/c" ">" ">/c" ">=" ">=/c" "abort-current-continuation" "abs" "absolute-path?" "acos" "add-between" "add1" "alarm-evt" "and/c" "andmap" "angle" "any/c" "append" "append*" "append-map" "apply" "argmax" "argmin" "arithmetic-shift" "arity-at-least" "arity-at-least-value" "arity-at-least?" "arity-checking-wrapper" "arity-includes?" "arity=?" "arrow-contract-info" "arrow-contract-info-accepts-arglist" "arrow-contract-info-chaperone-procedure" "arrow-contract-info-check-first-order" "arrow-contract-info?" "asin" "assert-unreachable" "assf" "assoc" "assq" "assv" "atan" "bad-number-of-results" "banner" "base->-doms/c" "base->-rngs/c" "base->?" "between/c" "bitwise-and" "bitwise-bit-field" "bitwise-bit-set?" "bitwise-ior" "bitwise-not" "bitwise-xor" "blame-add-car-context" "blame-add-cdr-context" "blame-add-context" "blame-add-missing-party" "blame-add-nth-arg-context" "blame-add-range-context" "blame-add-unknown-context" "blame-context" "blame-contract" "blame-fmt->-string" "blame-missing-party?" "blame-negative" "blame-original?" "blame-positive" "blame-replace-negative" "blame-replaced-negative?" "blame-source" "blame-swap" "blame-swapped?" "blame-update" "blame-value" "blame?" "boolean=?" "boolean?" "bound-identifier=?" "box" "box-cas!" "box-immutable" "box-immutable/c" "box/c" "box?" "break-enabled" "break-parameterization?" "break-thread" "build-chaperone-contract-property" "build-compound-type-name" "build-contract-property" "build-flat-contract-property" "build-list" "build-path" "build-path/convention-type" "build-string" "build-vector" "byte-pregexp" "byte-pregexp?" "byte-ready?" "byte-regexp" "byte-regexp?" "byte?" "bytes" "bytes->immutable-bytes" "bytes->list" "bytes->path" "bytes->path-element" "bytes->string/latin-1" "bytes->string/locale" "bytes->string/utf-8" "bytes-append" "bytes-append*" "bytes-close-converter" "bytes-convert" "bytes-convert-end" "bytes-converter?" "bytes-copy" "bytes-copy!" "bytes-environment-variable-name?" "bytes-fill!" "bytes-join" "bytes-length" "bytes-no-nuls?" "bytes-open-converter" "bytes-ref" "bytes-set!" "bytes-utf-8-index" "bytes-utf-8-length" "bytes-utf-8-ref" "bytes<?" "bytes=?" "bytes>?" "bytes?" "caaaar" "caaadr" "caaar" "caadar" "caaddr" "caadr" "caar" "cadaar" "cadadr" "cadar" "caddar" "cadddr" "caddr" "cadr" "call-in-continuation" "call-in-nested-thread" "call-with-atomic-output-file" "call-with-break-parameterization" "call-with-composable-continuation" "call-with-continuation-barrier" "call-with-continuation-prompt" "call-with-current-continuation" "call-with-default-reading-parameterization" "call-with-escape-continuation" "call-with-exception-handler" "call-with-file-lock/timeout" "call-with-immediate-continuation-mark" "call-with-input-bytes" "call-with-input-file" "call-with-input-file*" "call-with-input-string" "call-with-output-bytes" "call-with-output-file" "call-with-output-file*" "call-with-output-string" "call-with-parameterization" "call-with-semaphore" "call-with-semaphore/enable-break" "call-with-values" "call/cc" "call/ec" "car" "cartesian-product" "cdaaar" "cdaadr" "cdaar" "cdadar" "cdaddr" "cdadr" "cdar" "cddaar" "cddadr" "cddar" "cdddar" "cddddr" "cdddr" "cddr" "cdr" "ceiling" "channel-get" "channel-put" "channel-put-evt" "channel-put-evt?" "channel-try-get" "channel/c" "channel?" "chaperone-box" "chaperone-channel" "chaperone-continuation-mark-key" "chaperone-contract-property?" "chaperone-contract?" "chaperone-evt" "chaperone-hash" "chaperone-hash-set" "chaperone-of?" "chaperone-procedure" "chaperone-procedure*" "chaperone-prompt-tag" "chaperone-struct" "chaperone-struct-type" "chaperone-vector" "chaperone-vector*" "chaperone?" "char->integer" "char-alphabetic?" "char-blank?" "char-ci<=?" "char-ci<?" "char-ci=?" "char-ci>=?" "char-ci>?" "char-downcase" "char-foldcase" "char-general-category" "char-graphic?" "char-in" "char-in/c" "char-iso-control?" "char-lower-case?" "char-numeric?" "char-punctuation?" "char-ready?" "char-symbolic?" "char-title-case?" "char-titlecase" "char-upcase" "char-upper-case?" "char-utf-8-length" "char-whitespace?" "char<=?" "char<?" "char=?" "char>=?" "char>?" "char?" "check-duplicate-identifier" "check-duplicates" "checked-procedure-check-and-extract" "choice-evt" "class->interface" "class-info" "class-seal" "class-unseal" "class?" "cleanse-path" "close-input-port" "close-output-port" "coerce-chaperone-contract" "coerce-chaperone-contracts" "coerce-contract" "coerce-contract/f" "coerce-contracts" "coerce-flat-contract" "coerce-flat-contracts" "collect-garbage" "collection-file-path" "collection-path" "combinations" "combine-output" "compile" "compile-allow-set!-undefined" "compile-context-preservation-enabled" "compile-enforce-module-constants" "compile-syntax" "compile-target-machine?" "compiled-expression-recompile" "compiled-expression?" "compiled-module-expression?" "complete-path?" "complex?" "compose" "compose1" "conjoin" "conjugate" "cons" "cons/c" "cons?" "const" "continuation-mark-key/c" "continuation-mark-key?" "continuation-mark-set->context" "continuation-mark-set->iterator" "continuation-mark-set->list" "continuation-mark-set->list*" "continuation-mark-set-first" "continuation-mark-set?" "continuation-marks" "continuation-prompt-available?" "continuation-prompt-tag?" "continuation?" "contract-custom-write-property-proc" "contract-equivalent?" "contract-exercise" "contract-first-order" "contract-first-order-passes?" "contract-late-neg-projection" "contract-name" "contract-proc" "contract-projection" "contract-property?" "contract-random-generate" "contract-random-generate-env?" "contract-random-generate-fail?" "contract-random-generate-get-current-environment" "contract-random-generate-stash" "contract-random-generate/choose" "contract-stronger?" "contract-struct-exercise" "contract-struct-generate" "contract-struct-late-neg-projection" "contract-struct-list-contract?" "contract-val-first-projection" "contract?" "convert-stream" "copy-directory/files" "copy-file" "copy-port" "cos" "cosh" "count" "current-blame-format" "current-break-parameterization" "current-code-inspector" "current-command-line-arguments" "current-compile" "current-compile-realm" "current-compile-target-machine" "current-compiled-file-roots" "current-continuation-marks" "current-custodian" "current-directory" "current-directory-for-user" "current-drive" "current-environment-variables" "current-error-message-adjuster" "current-error-port" "current-eval" "current-evt-pseudo-random-generator" "current-force-delete-permissions" "current-future" "current-gc-milliseconds" "current-get-interaction-evt" "current-get-interaction-input-port" "current-inexact-milliseconds" "current-inexact-monotonic-milliseconds" "current-input-port" "current-inspector" "current-library-collection-links" "current-library-collection-paths" "current-load" "current-load-extension" "current-load-relative-directory" "current-load/use-compiled" "current-locale" "current-logger" "current-memory-use" "current-milliseconds" "current-module-declare-name" "current-module-declare-source" "current-module-name-resolver" "current-module-path-for-load" "current-namespace" "current-output-port" "current-parameterization" "current-plumber" "current-preserved-thread-cell-values" "current-print" "current-process-milliseconds" "current-prompt-read" "current-pseudo-random-generator" "current-read-interaction" "current-reader-guard" "current-readtable" "current-seconds" "current-security-guard" "current-subprocess-custodian-mode" "current-subprocess-keep-file-descriptors" "current-thread" "current-thread-group" "current-thread-initial-stack-size" "current-write-relative-directory" "curry" "curryr" "custodian-box-value" "custodian-box?" "custodian-limit-memory" "custodian-managed-list" "custodian-memory-accounting-available?" "custodian-require-memory" "custodian-shut-down?" "custodian-shutdown-all" "custodian?" "custom-print-quotable-accessor" "custom-print-quotable?" "custom-write-accessor" "custom-write-property-proc" "custom-write?" "date" "date*" "date*-nanosecond" "date*-time-zone-name" "date*?" "date-day" "date-dst?" "date-hour" "date-minute" "date-month" "date-second" "date-time-zone-offset" "date-week-day" "date-year" "date-year-day" "date?" "datum->syntax" "datum-intern-literal" "default-continuation-prompt-tag" "degrees->radians" "delete-directory" "delete-directory/files" "delete-file" "denominator" "dict->list" "dict-can-functional-set?" "dict-can-remove-keys?" "dict-clear" "dict-clear!" "dict-copy" "dict-count" "dict-empty?" "dict-for-each" "dict-has-key?" "dict-implements/c" "dict-implements?" "dict-iter-contract" "dict-iterate-first" "dict-iterate-key" "dict-iterate-next" "dict-iterate-value" "dict-key-contract" "dict-keys" "dict-map" "dict-mutable?" "dict-ref" "dict-ref!" "dict-remove" "dict-remove!" "dict-set" "dict-set!" "dict-set*" "dict-set*!" "dict-update" "dict-update!" "dict-value-contract" "dict-values" "dict?" "directory-exists?" "directory-list" "disjoin" "display" "display-lines" "display-lines-to-file" "display-to-file" "displayln" "double-flonum?" "drop" "drop-common-prefix" "drop-right" "dropf" "dropf-right" "dump-memory-stats" "dup-input-port" "dup-output-port" "dynamic->*" "dynamic-get-field" "dynamic-object/c" "dynamic-place" "dynamic-place*" "dynamic-require" "dynamic-require-for-syntax" "dynamic-send" "dynamic-set-field!" "dynamic-wind" "eighth" "empty?" "environment-variables-copy" "environment-variables-names" "environment-variables-ref" "environment-variables-set!" "environment-variables?" "eof-evt" "eof-object?" "ephemeron-value" "ephemeron?" "eprintf" "eq-contract-val" "eq-contract?" "eq-hash-code" "eq?" "equal-contract-val" "equal-contract?" "equal-hash-code" "equal-secondary-hash-code" "equal?" "equal?/recur" "eqv-hash-code" "eqv?" "error" "error-contract->adjusted-string" "error-display-handler" "error-escape-handler" "error-message->adjusted-string" "error-print-context-length" "error-print-source-location" "error-print-width" "error-syntax->string-handler" "error-value->string-handler" "eval" "eval-jit-enabled" "eval-syntax" "even?" "evt/c" "evt?" "exact->inexact" "exact-ceiling" "exact-floor" "exact-integer?" "exact-nonnegative-integer?" "exact-positive-integer?" "exact-round" "exact-truncate" "exact?" "executable-yield-handler" "exit" "exit-handler" "exn" "exn-continuation-marks" "exn-message" "exn:break" "exn:break-continuation" "exn:break:hang-up" "exn:break:hang-up?" "exn:break:terminate" "exn:break:terminate?" "exn:break?" "exn:fail" "exn:fail:contract" "exn:fail:contract:arity" "exn:fail:contract:arity?" "exn:fail:contract:blame" "exn:fail:contract:blame-object" "exn:fail:contract:blame?" "exn:fail:contract:continuation" "exn:fail:contract:continuation?" "exn:fail:contract:divide-by-zero" "exn:fail:contract:divide-by-zero?" "exn:fail:contract:non-fixnum-result" "exn:fail:contract:non-fixnum-result?" "exn:fail:contract:variable" "exn:fail:contract:variable-id" "exn:fail:contract:variable?" "exn:fail:contract?" "exn:fail:filesystem" "exn:fail:filesystem:errno" "exn:fail:filesystem:errno-errno" "exn:fail:filesystem:errno?" "exn:fail:filesystem:exists" "exn:fail:filesystem:exists?" "exn:fail:filesystem:missing-module" "exn:fail:filesystem:missing-module-path" "exn:fail:filesystem:missing-module?" "exn:fail:filesystem:version" "exn:fail:filesystem:version?" "exn:fail:filesystem?" "exn:fail:network" "exn:fail:network:errno" "exn:fail:network:errno-errno" "exn:fail:network:errno?" "exn:fail:network?" "exn:fail:object" "exn:fail:object?" "exn:fail:out-of-memory" "exn:fail:out-of-memory?" "exn:fail:read" "exn:fail:read-srclocs" "exn:fail:read:eof" "exn:fail:read:eof?" "exn:fail:read:non-char" "exn:fail:read:non-char?" "exn:fail:read?" "exn:fail:syntax" "exn:fail:syntax-exprs" "exn:fail:syntax:missing-module" "exn:fail:syntax:missing-module-path" "exn:fail:syntax:missing-module?" "exn:fail:syntax:unbound" "exn:fail:syntax:unbound?" "exn:fail:syntax?" "exn:fail:unsupported" "exn:fail:unsupported?" "exn:fail:user" "exn:fail:user?" "exn:fail?" "exn:misc:match?" "exn:missing-module-accessor" "exn:missing-module?" "exn:srclocs-accessor" "exn:srclocs?" "exn?" "exp" "expand" "expand-once" "expand-syntax" "expand-syntax-once" "expand-syntax-to-top-form" "expand-to-top-form" "expand-user-path" "explode-path" "expt" "false?" "field-names" "fifth" "file->bytes" "file->bytes-lines" "file->lines" "file->list" "file->string" "file->value" "file-exists?" "file-name-from-path" "file-or-directory-identity" "file-or-directory-modify-seconds" "file-or-directory-permissions" "file-or-directory-stat" "file-or-directory-type" "file-position" "file-position*" "file-size" "file-stream-buffer-mode" "file-stream-port?" "file-truncate" "filename-extension" "filesystem-change-evt" "filesystem-change-evt-cancel" "filesystem-change-evt?" "filesystem-root-list" "filter" "filter-map" "filter-not" "filter-read-input-port" "find-compiled-file-roots" "find-executable-path" "find-files" "find-library-collection-links" "find-library-collection-paths" "find-relative-path" "find-system-path" "findf" "first" "first-or/c" "fixnum?" "flat-contract" "flat-contract-predicate" "flat-contract-property?" "flat-contract-with-explanation" "flat-contract?" "flat-named-contract" "flatten" "floating-point-bytes->real" "flonum?" "floor" "flush-output" "fold-files" "foldl" "foldr" "for-each" "force" "format" "fourth" "fprintf" "free-identifier=?" "free-label-identifier=?" "free-template-identifier=?" "free-transformer-identifier=?" "fsemaphore-count" "fsemaphore-post" "fsemaphore-try-wait?" "fsemaphore-wait" "fsemaphore?" "future" "future?" "futures-enabled?" "gcd" "generate-member-key" "generate-temporaries" "generic-set?" "generic?" "gensym" "get-output-bytes" "get-output-string" "get-preference" "get/build-late-neg-projection" "get/build-val-first-projection" "getenv" "global-port-print-handler" "group-by" "guard-evt" "handle-evt" "handle-evt?" "has-blame?" "has-contract?" "hash" "hash->list" "hash-clear" "hash-clear!" "hash-copy" "hash-copy-clear" "hash-count" "hash-empty?" "hash-ephemeron?" "hash-eq?" "hash-equal?" "hash-eqv?" "hash-for-each" "hash-has-key?" "hash-iterate-first" "hash-iterate-key" "hash-iterate-key+value" "hash-iterate-next" "hash-iterate-pair" "hash-iterate-value" "hash-keys" "hash-keys-subset?" "hash-map" "hash-placeholder?" "hash-ref" "hash-ref!" "hash-ref-key" "hash-remove" "hash-remove!" "hash-set" "hash-set!" "hash-set*" "hash-set*!" "hash-strong?" "hash-update" "hash-update!" "hash-values" "hash-weak?" "hash/c" "hash?" "hasheq" "hasheqv" "identifier-binding" "identifier-binding-portal-syntax" "identifier-binding-symbol" "identifier-distinct-binding" "identifier-label-binding" "identifier-prune-lexical-context" "identifier-prune-to-source-module" "identifier-remove-from-definition-context" "identifier-template-binding" "identifier-transformer-binding" "identifier?" "identity" "if/c" "imag-part" "immutable?" "impersonate-box" "impersonate-channel" "impersonate-continuation-mark-key" "impersonate-hash" "impersonate-hash-set" "impersonate-procedure" "impersonate-procedure*" "impersonate-prompt-tag" "impersonate-struct" "impersonate-vector" "impersonate-vector*" "impersonator-contract?" "impersonator-ephemeron" "impersonator-of?" "impersonator-property-accessor-procedure?" "impersonator-property?" "impersonator?" "implementation?" "implementation?/c" "in-bytes" "in-bytes-lines" "in-combinations" "in-cycle" "in-dict" "in-dict-keys" "in-dict-pairs" "in-dict-values" "in-directory" "in-ephemeron-hash" "in-ephemeron-hash-keys" "in-ephemeron-hash-pairs" "in-ephemeron-hash-values" "in-hash" "in-hash-keys" "in-hash-pairs" "in-hash-values" "in-immutable-hash" "in-immutable-hash-keys" "in-immutable-hash-pairs" "in-immutable-hash-values" "in-immutable-set" "in-inclusive-range" "in-indexed" "in-input-port-bytes" "in-input-port-chars" "in-lines" "in-list" "in-mlist" "in-mutable-hash" "in-mutable-hash-keys" "in-mutable-hash-pairs" "in-mutable-hash-values" "in-mutable-set" "in-naturals" "in-parallel" "in-permutations" "in-port" "in-producer" "in-range" "in-sequences" "in-set" "in-slice" "in-stream" "in-string" "in-syntax" "in-value" "in-values*-sequence" "in-values-sequence" "in-vector" "in-weak-hash" "in-weak-hash-keys" "in-weak-hash-pairs" "in-weak-hash-values" "in-weak-set" "inclusive-range" "index-of" "index-where" "indexes-of" "indexes-where" "inexact->exact" "inexact-real?" "inexact?" "infinite?" "input-port-append" "input-port?" "inspector-superior?" "inspector?" "instanceof/c" "integer->char" "integer->integer-bytes" "integer-bytes->integer" "integer-in" "integer-length" "integer-sqrt" "integer-sqrt/remainder" "integer?" "interface->method-names" "interface-extension?" "interface?" "internal-definition-context-add-scopes" "internal-definition-context-binding-identifiers" "internal-definition-context-introduce" "internal-definition-context-seal" "internal-definition-context-splice-binding-identifier" "internal-definition-context?" "is-a?" "is-a?/c" "keyword->string" "keyword-apply" "keyword-apply/dict" "keyword<?" "keyword?" "keywords-match" "kill-thread" "last" "last-pair" "lcm" "length" "liberal-define-context?" "link-exists?" "list" "list*" "list*of" "list->bytes" "list->mutable-set" "list->mutable-seteq" "list->mutable-seteqv" "list->set" "list->seteq" "list->seteqv" "list->string" "list->vector" "list->weak-set" "list->weak-seteq" "list->weak-seteqv" "list-contract?" "list-prefix?" "list-ref" "list-set" "list-tail" "list-update" "list/c" "list?" "listen-port-number?" "listof" "load" "load-extension" "load-on-demand-enabled" "load-relative" "load-relative-extension" "load/cd" "load/use-compiled" "local-expand" "local-expand/capture-lifts" "local-transformer-expand" "local-transformer-expand/capture-lifts" "locale-string-encoding" "log" "log-all-levels" "log-level-evt" "log-level?" "log-max-level" "log-message" "log-receiver?" "logger-name" "logger?" "magnitude" "make-arity-at-least" "make-base-empty-namespace" "make-base-namespace" "make-bytes" "make-channel" "make-chaperone-contract" "make-continuation-mark-key" "make-continuation-prompt-tag" "make-contract" "make-custodian" "make-custodian-box" "make-custom-hash" "make-custom-hash-types" "make-custom-set" "make-custom-set-types" "make-date" "make-date*" "make-derived-parameter" "make-directory" "make-directory*" "make-do-sequence" "make-empty-namespace" "make-environment-variables" "make-ephemeron" "make-ephemeron-hash" "make-ephemeron-hasheq" "make-ephemeron-hasheqv" "make-exn" "make-exn:break" "make-exn:break:hang-up" "make-exn:break:terminate" "make-exn:fail" "make-exn:fail:contract" "make-exn:fail:contract:arity" "make-exn:fail:contract:blame" "make-exn:fail:contract:continuation" "make-exn:fail:contract:divide-by-zero" "make-exn:fail:contract:non-fixnum-result" "make-exn:fail:contract:variable" "make-exn:fail:filesystem" "make-exn:fail:filesystem:errno" "make-exn:fail:filesystem:exists" "make-exn:fail:filesystem:missing-module" "make-exn:fail:filesystem:version" "make-exn:fail:network" "make-exn:fail:network:errno" "make-exn:fail:object" "make-exn:fail:out-of-memory" "make-exn:fail:read" "make-exn:fail:read:eof" "make-exn:fail:read:non-char" "make-exn:fail:syntax" "make-exn:fail:syntax:missing-module" "make-exn:fail:syntax:unbound" "make-exn:fail:unsupported" "make-exn:fail:user" "make-file-or-directory-link" "make-flat-contract" "make-fsemaphore" "make-generic" "make-handle-get-preference-locked" "make-hash" "make-hash-placeholder" "make-hasheq" "make-hasheq-placeholder" "make-hasheqv" "make-hasheqv-placeholder" "make-immutable-custom-hash" "make-immutable-hash" "make-immutable-hasheq" "make-immutable-hasheqv" "make-impersonator-property" "make-input-port" "make-input-port/read-to-peek" "make-inspector" "make-interned-syntax-introducer" "make-keyword-procedure" "make-known-char-range-list" "make-limited-input-port" "make-list" "make-lock-file-name" "make-log-receiver" "make-logger" "make-mixin-contract" "make-mutable-custom-set" "make-none/c" "make-object" "make-output-port" "make-parameter" "make-parent-directory*" "make-phantom-bytes" "make-pipe" "make-pipe-with-specials" "make-placeholder" "make-plumber" "make-polar" "make-portal-syntax" "make-prefab-struct" "make-primitive-class" "make-proj-contract" "make-pseudo-random-generator" "make-reader-graph" "make-readtable" "make-rectangular" "make-rename-transformer" "make-resolved-module-path" "make-security-guard" "make-semaphore" "make-set!-transformer" "make-shared-bytes" "make-sibling-inspector" "make-special-comment" "make-srcloc" "make-string" "make-struct-field-accessor" "make-struct-field-mutator" "make-struct-type" "make-struct-type-property" "make-syntax-delta-introducer" "make-syntax-introducer" "make-temporary-directory" "make-temporary-directory*" "make-temporary-file" "make-temporary-file*" "make-tentative-pretty-print-output-port" "make-thread-cell" "make-thread-group" "make-vector" "make-weak-box" "make-weak-custom-hash" "make-weak-custom-set" "make-weak-hash" "make-weak-hasheq" "make-weak-hasheqv" "make-will-executor" "map" "match-equality-test" "matches-arity-exactly?" "max" "mcar" "mcdr" "mcons" "member" "member-name-key-hash-code" "member-name-key=?" "member-name-key?" "memf" "memory-order-acquire" "memory-order-release" "memq" "memv" "merge-input" "method-in-interface?" "min" "module->exports" "module->imports" "module->indirect-exports" "module->language-info" "module->namespace" "module->realm" "module-compiled-cross-phase-persistent?" "module-compiled-exports" "module-compiled-imports" "module-compiled-indirect-exports" "module-compiled-language-info" "module-compiled-name" "module-compiled-realm" "module-compiled-submodules" "module-declared?" "module-path-index-join" "module-path-index-resolve" "module-path-index-split" "module-path-index-submodule" "module-path-index?" "module-path?" "module-predefined?" "module-provide-protected?" "modulo" "mpair?" "mutable-set" "mutable-seteq" "mutable-seteqv" "n->th" "nack-guard-evt" "namespace-anchor->empty-namespace" "namespace-anchor->namespace" "namespace-anchor?" "namespace-attach-module" "namespace-attach-module-declaration" "namespace-base-phase" "namespace-call-with-registry-lock" "namespace-mapped-symbols" "namespace-module-identifier" "namespace-module-registry" "namespace-require" "namespace-require/constant" "namespace-require/copy" "namespace-require/expansion-time" "namespace-set-variable-value!" "namespace-symbol->identifier" "namespace-syntax-introduce" "namespace-undefine-variable!" "namespace-unprotect-module" "namespace-variable-value" "namespace?" "nan?" "natural-number/c" "natural?" "negate" "negative-integer?" "negative?" "new-∀/c" "new-∃/c" "newline" "ninth" "non-empty-listof" "non-empty-string?" "none/c" "nonnegative-integer?" "nonpositive-integer?" "normal-case-path" "normalize-arity" "normalize-path" "normalized-arity?" "not" "not/c" "null?" "number->string" "number?" "numerator" "object->vector" "object-info" "object-interface" "object-method-arity-includes?" "object-name" "object-or-false=?" "object=-hash-code" "object=?" "object?" "odd?" "one-of/c" "open-input-bytes" "open-input-file" "open-input-output-file" "open-input-string" "open-output-bytes" "open-output-file" "open-output-nowhere" "open-output-string" "or/c" "order-of-magnitude" "ormap" "output-port?" "pair?" "parameter-procedure=?" "parameter/c" "parameter?" "parameterization?" "parse-command-line" "partition" "path->bytes" "path->complete-path" "path->directory-path" "path->string" "path-add-extension" "path-add-suffix" "path-convention-type" "path-element->bytes" "path-element->string" "path-element?" "path-for-some-system?" "path-get-extension" "path-has-extension?" "path-list-string->path-list" "path-only" "path-replace-extension" "path-replace-suffix" "path-string?" "path<?" "path?" "pathlist-closure" "peek-byte" "peek-byte-or-special" "peek-bytes" "peek-bytes!" "peek-bytes!-evt" "peek-bytes-avail!" "peek-bytes-avail!*" "peek-bytes-avail!-evt" "peek-bytes-avail!/enable-break" "peek-bytes-evt" "peek-char" "peek-char-or-special" "peek-string" "peek-string!" "peek-string!-evt" "peek-string-evt" "peeking-input-port" "permutations" "phantom-bytes?" "pipe-content-length" "place-break" "place-channel" "place-channel-get" "place-channel-put" "place-channel-put/get" "place-channel?" "place-dead-evt" "place-enabled?" "place-kill" "place-location?" "place-message-allowed?" "place-wait" "place?" "placeholder-get" "placeholder-set!" "placeholder?" "plumber-add-flush!" "plumber-flush-all" "plumber-flush-handle-remove!" "plumber-flush-handle?" "plumber?" "poll-guard-evt" "port->bytes" "port->bytes-lines" "port->lines" "port->list" "port->string" "port-closed-evt" "port-closed?" "port-commit-peeked" "port-count-lines!" "port-count-lines-enabled" "port-counts-lines?" "port-display-handler" "port-file-identity" "port-file-unlock" "port-next-location" "port-number?" "port-print-handler" "port-progress-evt" "port-provides-progress-evts?" "port-read-handler" "port-try-file-lock?" "port-waiting-peer?" "port-write-handler" "port-writes-atomic?" "port-writes-special?" "port?" "portal-syntax-content" "portal-syntax?" "positive-integer?" "positive?" "prefab-key->struct-type" "prefab-key?" "prefab-struct-key" "preferences-lock-file-mode" "pregexp" "pregexp?" "pretty-display" "pretty-format" "pretty-print" "pretty-print-.-symbol-without-bars" "pretty-print-abbreviate-read-macros" "pretty-print-columns" "pretty-print-current-style-table" "pretty-print-depth" "pretty-print-exact-as-decimal" "pretty-print-extend-style-table" "pretty-print-handler" "pretty-print-newline" "pretty-print-post-print-hook" "pretty-print-pre-print-hook" "pretty-print-print-hook" "pretty-print-print-line" "pretty-print-remap-stylable" "pretty-print-show-inexactness" "pretty-print-size-hook" "pretty-print-style-table?" "pretty-printing" "pretty-write" "primitive-closure?" "primitive-result-arity" "primitive?" "print" "print-as-expression" "print-boolean-long-form" "print-box" "print-graph" "print-hash-table" "print-mpair-curly-braces" "print-pair-curly-braces" "print-reader-abbreviations" "print-struct" "print-syntax-width" "print-unreadable" "print-value-columns" "print-vector-length" "printable/c" "printf" "println" "procedure->method" "procedure-arity" "procedure-arity-includes/c" "procedure-arity-includes?" "procedure-arity-mask" "procedure-arity?" "procedure-closure-contents-eq?" "procedure-extract-target" "procedure-impersonator*?" "procedure-keywords" "procedure-realm" "procedure-reduce-arity" "procedure-reduce-arity-mask" "procedure-reduce-keyword-arity" "procedure-reduce-keyword-arity-mask" "procedure-rename" "procedure-result-arity" "procedure-specialize" "procedure-struct-type?" "procedure?" "process" "process*" "process*/ports" "process/ports" "processor-count" "progress-evt?" "promise-forced?" "promise-running?" "promise/c" "promise/name?" "promise?" "prop:arrow-contract-get-info" "prop:arrow-contract?" "prop:orc-contract-get-subcontracts" "prop:orc-contract?" "prop:recursive-contract-unroll" "prop:recursive-contract?" "proper-subset?" "property/c" "pseudo-random-generator->vector" "pseudo-random-generator-vector?" "pseudo-random-generator?" "put-preferences" "putenv" "quotient" "quotient/remainder" "radians->degrees" "raise" "raise-argument-error" "raise-argument-error*" "raise-arguments-error" "raise-arguments-error*" "raise-arity-error" "raise-arity-error*" "raise-arity-mask-error" "raise-arity-mask-error*" "raise-blame-error" "raise-contract-error" "raise-mismatch-error" "raise-not-cons-blame-error" "raise-range-error" "raise-range-error*" "raise-result-arity-error" "raise-result-arity-error*" "raise-result-error" "raise-result-error*" "raise-syntax-error" "raise-type-error" "raise-user-error" "random" "random-seed" "range" "rational?" "rationalize" "read" "read-accept-bar-quote" "read-accept-box" "read-accept-compiled" "read-accept-dot" "read-accept-graph" "read-accept-infix-dot" "read-accept-lang" "read-accept-quasiquote" "read-accept-reader" "read-byte" "read-byte-or-special" "read-bytes" "read-bytes!" "read-bytes!-evt" "read-bytes-avail!" "read-bytes-avail!*" "read-bytes-avail!-evt" "read-bytes-avail!/enable-break" "read-bytes-evt" "read-bytes-line" "read-bytes-line-evt" "read-case-sensitive" "read-cdot" "read-char" "read-char-or-special" "read-curly-brace-as-paren" "read-curly-brace-with-tag" "read-decimal-as-inexact" "read-eval-print-loop" "read-installation-configuration-table" "read-language" "read-line" "read-line-evt" "read-on-demand-source" "read-single-flonum" "read-square-bracket-as-paren" "read-square-bracket-with-tag" "read-string" "read-string!" "read-string!-evt" "read-string-evt" "read-syntax" "read-syntax-accept-graph" "read-syntax/recursive" "read/recursive" "readtable-mapping" "readtable?" "real->decimal-string" "real->double-flonum" "real->floating-point-bytes" "real->single-flonum" "real-in" "real-part" "real?" "reencode-input-port" "reencode-output-port" "regexp" "regexp-match" "regexp-match*" "regexp-match-evt" "regexp-match-exact?" "regexp-match-peek" "regexp-match-peek-immediate" "regexp-match-peek-positions" "regexp-match-peek-positions*" "regexp-match-peek-positions-immediate" "regexp-match-peek-positions-immediate/end" "regexp-match-peek-positions/end" "regexp-match-positions" "regexp-match-positions*" "regexp-match-positions/end" "regexp-match/end" "regexp-match?" "regexp-max-lookbehind" "regexp-quote" "regexp-replace" "regexp-replace*" "regexp-replace-quote" "regexp-replaces" "regexp-split" "regexp-try-match" "regexp?" "relative-path?" "relocate-input-port" "relocate-output-port" "remainder" "remf" "remf*" "remove" "remove*" "remove-duplicates" "remq" "remq*" "remv" "remv*" "rename-contract" "rename-file-or-directory" "rename-transformer-target" "rename-transformer?" "replace-evt" "reroot-path" "resolve-path" "resolved-module-path-name" "resolved-module-path?" "rest" "reverse" "round" "second" "seconds->date" "security-guard?" "semaphore-peek-evt" "semaphore-peek-evt?" "semaphore-post" "semaphore-try-wait?" "semaphore-wait" "semaphore-wait/enable-break" "semaphore?" "sequence->list" "sequence->stream" "sequence-add-between" "sequence-andmap" "sequence-append" "sequence-count" "sequence-filter" "sequence-fold" "sequence-for-each" "sequence-generate" "sequence-generate*" "sequence-length" "sequence-map" "sequence-ormap" "sequence-ref" "sequence-tail" "sequence/c" "sequence?" "set" "set!-transformer-procedure" "set!-transformer?" "set->list" "set->stream" "set-add" "set-add!" "set-box!" "set-box*!" "set-clear" "set-clear!" "set-copy" "set-copy-clear" "set-count" "set-empty?" "set-eq?" "set-equal?" "set-eqv?" "set-first" "set-for-each" "set-implements/c" "set-implements?" "set-intersect" "set-intersect!" "set-map" "set-mcar!" "set-mcdr!" "set-member?" "set-mutable?" "set-phantom-bytes!" "set-port-next-location!" "set-remove" "set-remove!" "set-rest" "set-subtract" "set-subtract!" "set-symmetric-difference" "set-symmetric-difference!" "set-union" "set-union!" "set-weak?" "set/c" "set=?" "set?" "seteq" "seteqv" "seventh" "sgn" "sha1-bytes" "sha224-bytes" "sha256-bytes" "shared-bytes" "shell-execute" "shrink-path-wrt" "shuffle" "simple-form-path" "simplify-path" "sin" "single-flonum-available?" "single-flonum?" "sinh" "sixth" "skip-projection-wrapper?" "sleep" "some-system-path->string" "sort" "special-comment-value" "special-comment?" "special-filter-input-port" "split-at" "split-at-right" "split-common-prefix" "split-path" "splitf-at" "splitf-at-right" "sqr" "sqrt" "srcloc" "srcloc->string" "srcloc-column" "srcloc-line" "srcloc-position" "srcloc-source" "srcloc-span" "srcloc?" "stop-after" "stop-before" "stream->list" "stream-add-between" "stream-andmap" "stream-append" "stream-count" "stream-empty?" "stream-filter" "stream-first" "stream-fold" "stream-for-each" "stream-force" "stream-length" "stream-map" "stream-ormap" "stream-ref" "stream-rest" "stream-tail" "stream-take" "stream/c" "stream?" "string" "string->bytes/latin-1" "string->bytes/locale" "string->bytes/utf-8" "string->immutable-string" "string->keyword" "string->list" "string->number" "string->path" "string->path-element" "string->some-system-path" "string->symbol" "string->uninterned-symbol" "string->unreadable-symbol" "string-append" "string-append*" "string-append-immutable" "string-ci<=?" "string-ci<?" "string-ci=?" "string-ci>=?" "string-ci>?" "string-contains?" "string-copy" "string-copy!" "string-downcase" "string-environment-variable-name?" "string-fill!" "string-foldcase" "string-join" "string-len/c" "string-length" "string-locale-ci<?" "string-locale-ci=?" "string-locale-ci>?" "string-locale-downcase" "string-locale-upcase" "string-locale<?" "string-locale=?" "string-locale>?" "string-no-nuls?" "string-normalize-nfc" "string-normalize-nfd" "string-normalize-nfkc" "string-normalize-nfkd" "string-normalize-spaces" "string-port?" "string-prefix?" "string-ref" "string-replace" "string-set!" "string-split" "string-suffix?" "string-titlecase" "string-trim" "string-upcase" "string-utf-8-length" "string<=?" "string<?" "string=?" "string>=?" "string>?" "string?" "struct->vector" "struct-accessor-procedure?" "struct-constructor-procedure?" "struct-info" "struct-mutator-procedure?" "struct-predicate-procedure?" "struct-type-authentic?" "struct-type-info" "struct-type-make-constructor" "struct-type-make-predicate" "struct-type-property-accessor-procedure?" "struct-type-property-predicate-procedure?" "struct-type-property/c" "struct-type-property?" "struct-type-sealed?" "struct-type?" "struct?" "sub1" "subbytes" "subclass?" "subclass?/c" "subprocess" "subprocess-group-enabled" "subprocess-kill" "subprocess-pid" "subprocess-status" "subprocess-wait" "subprocess?" "subset?" "substring" "suggest/c" "symbol->string" "symbol-interned?" "symbol-unreadable?" "symbol<?" "symbol=?" "symbol?" "symbols" "sync" "sync/enable-break" "sync/timeout" "sync/timeout/enable-break" "syntax->datum" "syntax->list" "syntax-arm" "syntax-binding-set" "syntax-binding-set->syntax" "syntax-binding-set-extend" "syntax-binding-set?" "syntax-column" "syntax-debug-info" "syntax-deserialize" "syntax-disarm" "syntax-e" "syntax-line" "syntax-local-apply-transformer" "syntax-local-bind-syntaxes" "syntax-local-certifier" "syntax-local-context" "syntax-local-expand-expression" "syntax-local-get-shadower" "syntax-local-identifier-as-binding" "syntax-local-introduce" "syntax-local-lift-context" "syntax-local-lift-expression" "syntax-local-lift-module" "syntax-local-lift-module-end-declaration" "syntax-local-lift-provide" "syntax-local-lift-require" "syntax-local-lift-values-expression" "syntax-local-make-definition-context" "syntax-local-make-delta-introducer" "syntax-local-module-defined-identifiers" "syntax-local-module-exports" "syntax-local-module-interned-scope-symbols" "syntax-local-module-required-identifiers" "syntax-local-name" "syntax-local-phase-level" "syntax-local-submodules" "syntax-local-transforming-module-provides?" "syntax-local-value" "syntax-local-value/immediate" "syntax-original?" "syntax-position" "syntax-property" "syntax-property-preserved?" "syntax-property-remove" "syntax-property-symbol-keys" "syntax-protect" "syntax-rearm" "syntax-recertify" "syntax-serialize" "syntax-shift-phase-level" "syntax-source" "syntax-source-module" "syntax-span" "syntax-taint" "syntax-tainted?" "syntax-track-origin" "syntax-transforming-module-expression?" "syntax-transforming-with-lifts?" "syntax-transforming?" "syntax/c" "syntax?" "system" "system*" "system*/exit-code" "system-big-endian?" "system-idle-evt" "system-language+country" "system-library-subpath" "system-path-convention-type" "system-type" "system/exit-code" "tail-marks-match?" "take" "take-common-prefix" "take-right" "takef" "takef-right" "tan" "tanh" "tcp-abandon-port" "tcp-accept" "tcp-accept-evt" "tcp-accept-ready?" "tcp-accept/enable-break" "tcp-addresses" "tcp-close" "tcp-connect" "tcp-connect/enable-break" "tcp-listen" "tcp-listener?" "tcp-port?" "tentative-pretty-print-port-cancel" "tentative-pretty-print-port-transfer" "tenth" "terminal-port?" "third" "thread" "thread-cell-ref" "thread-cell-set!" "thread-cell-values?" "thread-cell?" "thread-dead-evt" "thread-dead?" "thread-group?" "thread-receive" "thread-receive-evt" "thread-resume" "thread-resume-evt" "thread-rewind-receive" "thread-running?" "thread-send" "thread-suspend" "thread-suspend-evt" "thread-try-receive" "thread-wait" "thread/suspend-to-kill" "thread?" "time-apply" "touch" "transplant-input-port" "transplant-output-port" "truncate" "udp-addresses" "udp-bind!" "udp-bound?" "udp-close" "udp-connect!" "udp-connected?" "udp-multicast-interface" "udp-multicast-join-group!" "udp-multicast-leave-group!" "udp-multicast-loopback?" "udp-multicast-set-interface!" "udp-multicast-set-loopback!" "udp-multicast-set-ttl!" "udp-multicast-ttl" "udp-open-socket" "udp-receive!" "udp-receive!*" "udp-receive!-evt" "udp-receive!/enable-break" "udp-receive-ready-evt" "udp-send" "udp-send*" "udp-send-evt" "udp-send-ready-evt" "udp-send-to" "udp-send-to*" "udp-send-to-evt" "udp-send-to/enable-break" "udp-send/enable-break" "udp-set-receive-buffer-size!" "udp-set-ttl!" "udp-ttl" "udp?" "unbox" "unbox*" "uncaught-exception-handler" "unit?" "unquoted-printing-string" "unquoted-printing-string-value" "unquoted-printing-string?" "unsupplied-arg?" "use-collection-link-paths" "use-compiled-file-check" "use-compiled-file-paths" "use-user-specific-search-paths" "value-blame" "value-contract" "values" "variable-reference->empty-namespace" "variable-reference->module-base-phase" "variable-reference->module-declaration-inspector" "variable-reference->module-path-index" "variable-reference->module-source" "variable-reference->namespace" "variable-reference->phase" "variable-reference->resolved-module-path" "variable-reference-constant?" "variable-reference-from-unsafe?" "variable-reference?" "vector" "vector*-length" "vector*-ref" "vector*-set!" "vector->immutable-vector" "vector->list" "vector->pseudo-random-generator" "vector->pseudo-random-generator!" "vector->values" "vector-append" "vector-argmax" "vector-argmin" "vector-cas!" "vector-copy" "vector-copy!" "vector-count" "vector-drop" "vector-drop-right" "vector-empty?" "vector-fill!" "vector-filter" "vector-filter-not" "vector-immutable" "vector-immutable/c" "vector-immutableof" "vector-length" "vector-map" "vector-map!" "vector-member" "vector-memq" "vector-memv" "vector-ref" "vector-set!" "vector-set*!" "vector-set-performance-stats!" "vector-sort" "vector-sort!" "vector-split-at" "vector-split-at-right" "vector-take" "vector-take-right" "vector/c" "vector?" "vectorof" "version" "void" "void?" "weak-box-value" "weak-box?" "weak-set" "weak-seteq" "weak-seteqv" "will-execute" "will-executor?" "will-register" "will-try-execute" "with-input-from-bytes" "with-input-from-file" "with-input-from-string" "with-output-to-bytes" "with-output-to-file" "with-output-to-string" "would-be-future" "wrap-evt" "write" "write-byte" "write-bytes" "write-bytes-avail" "write-bytes-avail*" "write-bytes-avail-evt" "write-bytes-avail/enable-break" "write-char" "write-special" "write-special-avail*" "write-special-evt" "write-string" "write-to-file" "writeln" "xor" "zero?" "~.a" "~.s" "~.v" "~a" "~e" "~r" "~s" "~v"))
+; operators ;;
 ((symbol) @operator
- (#any-of? @operator
-  "+" "-" "*" "/" "=" "<=" ">=" "<" ">"))
-
-;; builtin variables ;;
+  (#any-of? @operator "+" "-" "*" "/" "=" "<=" ">=" "<" ">"))
 
+; builtin variables ;;
 ((symbol) @variable.builtin
- (#any-of? @variable.builtin
-  "always-evt" "block-device-type-bits" "character-device-type-bits" "check-tail-contract" "contract-continuation-mark-key" "contract-random-generate-fail" "directory-type-bits" "empty" "empty-sequence" "empty-stream" "eof" "equal<%>" "error-message-adjuster-key" "externalizable<%>" "failure-result/c" "false" "false/c" "fifo-type-bits" "file-type-bits" "for-clause-syntax-protect" "group-execute-bit" "group-permission-bits" "group-read-bit" "group-write-bit" "impersonator-prop:application-mark" "impersonator-prop:blame" "impersonator-prop:contracted" "legacy-match-expander?" "match-...-nesting" "match-expander?" "mixin-contract" "never-evt" "null" "object%" "other-execute-bit" "other-permission-bits" "other-read-bit" "other-write-bit" "pi" "pi.f" "predicate/c" "printable<%>" "prop:arity-string" "prop:arrow-contract" "prop:authentic" "prop:blame" "prop:chaperone-contract" "prop:checked-procedure" "prop:contract" "prop:contracted" "prop:custom-print-quotable" "prop:custom-write" "prop:dict" "prop:equal+hash" "prop:evt" "prop:exn:missing-module" "prop:exn:srclocs" "prop:expansion-contexts" "prop:flat-contract" "prop:impersonator-of" "prop:input-port" "prop:legacy-match-expander" "prop:liberal-define-context" "prop:match-expander" "prop:object-name" "prop:orc-contract" "prop:output-port" "prop:place-location" "prop:procedure" "prop:recursive-contract" "prop:rename-transformer" "prop:sealed" "prop:sequence" "prop:set!-transformer" "prop:stream" "regular-file-type-bits" "set-group-id-bit" "set-user-id-bit" "socket-type-bits" "sticky-bit" "struct:arity-at-least" "struct:arrow-contract-info" "struct:date" "struct:date*" "struct:exn" "struct:exn:break" "struct:exn:break:hang-up" "struct:exn:break:terminate" "struct:exn:fail" "struct:exn:fail:contract" "struct:exn:fail:contract:arity" "struct:exn:fail:contract:blame" "struct:exn:fail:contract:continuation" "struct:exn:fail:contract:divide-by-zero" "struct:exn:fail:contract:non-fixnum-result" "struct:exn:fail:contract:variable" "struct:exn:fail:filesystem" "struct:exn:fail:filesystem:errno" "struct:exn:fail:filesystem:exists" "struct:exn:fail:filesystem:missing-module" "struct:exn:fail:filesystem:version" "struct:exn:fail:network" "struct:exn:fail:network:errno" "struct:exn:fail:object" "struct:exn:fail:out-of-memory" "struct:exn:fail:read" "struct:exn:fail:read:eof" "struct:exn:fail:read:non-char" "struct:exn:fail:syntax" "struct:exn:fail:syntax:missing-module" "struct:exn:fail:syntax:unbound" "struct:exn:fail:unsupported" "struct:exn:fail:user" "struct:srcloc" "symbolic-link-type-bits" "syntax-local-match-introduce" "syntax-pattern-variable?" "the-unsupplied-arg" "true" "unspecified-dom" "user-execute-bit" "user-permission-bits" "user-read-bit" "user-write-bit" "writable<%>"
-  ))
+  (#any-of? @variable.builtin "always-evt" "block-device-type-bits" "character-device-type-bits" "check-tail-contract" "contract-continuation-mark-key" "contract-random-generate-fail" "directory-type-bits" "empty" "empty-sequence" "empty-stream" "eof" "equal<%>" "error-message-adjuster-key" "externalizable<%>" "failure-result/c" "false" "false/c" "fifo-type-bits" "file-type-bits" "for-clause-syntax-protect" "group-execute-bit" "group-permission-bits" "group-read-bit" "group-write-bit" "impersonator-prop:application-mark" "impersonator-prop:blame" "impersonator-prop:contracted" "legacy-match-expander?" "match-...-nesting" "match-expander?" "mixin-contract" "never-evt" "null" "object%" "other-execute-bit" "other-permission-bits" "other-read-bit" "other-write-bit" "pi" "pi.f" "predicate/c" "printable<%>" "prop:arity-string" "prop:arrow-contract" "prop:authentic" "prop:blame" "prop:chaperone-contract" "prop:checked-procedure" "prop:contract" "prop:contracted" "prop:custom-print-quotable" "prop:custom-write" "prop:dict" "prop:equal+hash" "prop:evt" "prop:exn:missing-module" "prop:exn:srclocs" "prop:expansion-contexts" "prop:flat-contract" "prop:impersonator-of" "prop:input-port" "prop:legacy-match-expander" "prop:liberal-define-context" "prop:match-expander" "prop:object-name" "prop:orc-contract" "prop:output-port" "prop:place-location" "prop:procedure" "prop:recursive-contract" "prop:rename-transformer" "prop:sealed" "prop:sequence" "prop:set!-transformer" "prop:stream" "regular-file-type-bits" "set-group-id-bit" "set-user-id-bit" "socket-type-bits" "sticky-bit" "struct:arity-at-least" "struct:arrow-contract-info" "struct:date" "struct:date*" "struct:exn" "struct:exn:break" "struct:exn:break:hang-up" "struct:exn:break:terminate" "struct:exn:fail" "struct:exn:fail:contract" "struct:exn:fail:contract:arity" "struct:exn:fail:contract:blame" "struct:exn:fail:contract:continuation" "struct:exn:fail:contract:divide-by-zero" "struct:exn:fail:contract:non-fixnum-result" "struct:exn:fail:contract:variable" "struct:exn:fail:filesystem" "struct:exn:fail:filesystem:errno" "struct:exn:fail:filesystem:exists" "struct:exn:fail:filesystem:missing-module" "struct:exn:fail:filesystem:version" "struct:exn:fail:network" "struct:exn:fail:network:errno" "struct:exn:fail:object" "struct:exn:fail:out-of-memory" "struct:exn:fail:read" "struct:exn:fail:read:eof" "struct:exn:fail:read:non-char" "struct:exn:fail:syntax" "struct:exn:fail:syntax:missing-module" "struct:exn:fail:syntax:unbound" "struct:exn:fail:unsupported" "struct:exn:fail:user" "struct:srcloc" "symbolic-link-type-bits" "syntax-local-match-introduce" "syntax-pattern-variable?" "the-unsupplied-arg" "true" "unspecified-dom" "user-execute-bit" "user-permission-bits" "user-read-bit" "user-write-bit" "writable<%>"))
 
 (dot) @variable.builtin
 
-;;------------------------------------------------------------------;;
-;;                          Special cases                           ;;
-;;------------------------------------------------------------------;;
+;------------------------------------------------------------------;;
+;                          Special cases                           ;;
+;------------------------------------------------------------------;;
+(list
+  "["
+  (symbol) @variable
+  "]")
 
 (list
- "["
- (symbol) @variable
- "]")
+  .
+  (symbol) @_p
+  .
+  (list
+    (symbol) @variable)
+  (#any-of? @_p "lambda" "λ" "define-values" "define-syntaxes" "define-values-for-export" "define-values-for-syntax"))
 
+;------------------------------------------------------------------;;
+;                         Solve conflicts                          ;;
+;------------------------------------------------------------------;;
+; See `:h treesitter`, and search `priority`
 (list
- .
- (symbol) @_p
- .
- (list
-   (symbol) @variable)
- (#any-of? @_p
-  "lambda" "λ" "define-values" "define-syntaxes" "define-values-for-export"
-  "define-values-for-syntax"
-  ))
-
-;;------------------------------------------------------------------;;
-;;                         Solve conflicts                          ;;
-;;------------------------------------------------------------------;;
-
-;; See `:h treesitter`, and search `priority`
-
-(list
- .
- (symbol) @keyword.import
- (#eq? @keyword.import "require")
- (#set! "priority" 101))
+  .
+  (symbol) @keyword.import
+  (#eq? @keyword.import "require")
+  (#set! "priority" 101))
 
 (quote
   .
@@ -135,5 +122,4 @@
   (#set! "priority" 105)) @string.special.symbol
 
 ((sexp_comment) @comment
- (#set! "priority" 110))
-
+  (#set! "priority" 110))
diff --git a/queries/racket/injections.scm b/queries/racket/injections.scm
index b90c418a4..dc8982053 100644
--- a/queries/racket/injections.scm
+++ b/queries/racket/injections.scm
@@ -1,5 +1,5 @@
 ([
   (comment)
   (block_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/rasi/folds.scm b/queries/rasi/folds.scm
index 1557b831e..2fd6c9fa7 100644
--- a/queries/rasi/folds.scm
+++ b/queries/rasi/folds.scm
@@ -2,4 +2,4 @@
   (rule_set)
   (list_value)
   (distance_calc)
- ] @fold
+] @fold
diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index 7385e3245..cec2e5a03 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -1,15 +1,19 @@
 (comment) @comment @spell
 
 "@media" @keyword
+
 "@import" @keyword.import
+
 "@theme" @keyword.import
 
 (string_value) @string
+
 [
   (integer_value)
   (float_value)
   "0"
- ] @number
+] @number
+
 (boolean_value) @boolean
 
 [
@@ -22,59 +26,114 @@
   (orientation_value)
   (cursor_value)
   "inherit"
- ] @keyword
+] @keyword
 
+(url_image
+  "url" @function.builtin)
 
-(url_image "url" @function.builtin)
-(gradient_image "linear-gradient" @function.builtin)
-(distance_calc "calc" @function.builtin)
-(rgb_color ["rgb" "rgba"] @function.builtin)
-(hsl_color ["hsl" "hsla"] @function.builtin)
-(hwb_color ["hwb" "hwba"] @function.builtin)
-(cmyk_color "cmyk" @function.builtin)
+(gradient_image
+  "linear-gradient" @function.builtin)
+
+(distance_calc
+  "calc" @function.builtin)
+
+(rgb_color
+  [
+    "rgb"
+    "rgba"
+  ] @function.builtin)
+
+(hsl_color
+  [
+    "hsl"
+    "hsla"
+  ] @function.builtin)
+
+(hwb_color
+  [
+    "hwb"
+    "hwba"
+  ] @function.builtin)
+
+(cmyk_color
+  "cmyk" @function.builtin)
 
 [
- "("
- ")"
- "{"
- "}"
- "["
- "]"
- ] @punctuation.bracket
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
 
 (distance_op) @operator
 
 [
- ";"
- ","
- ":"
- "."
- ] @punctuation.delimiter
+  ";"
+  ","
+  ":"
+  "."
+] @punctuation.delimiter
 
 [
- (angle_unit)
- (integer_distance_unit)
- (float_distance_unit)
- ] @type
+  (angle_unit)
+  (integer_distance_unit)
+  (float_distance_unit)
+] @type
+
 (percentage) @number
-(percentage "%" @type)
+
+(percentage
+  "%" @type)
 
 [
   (global_selector)
   (id_selector)
- ] @module
+] @module
 
-(id_selector_view [ "normal" "selected" "alternate" ] @attribute)
-(id_selector_state [ "normal" "urgent" "active" ] @type.qualifier)
+(id_selector_view
+  [
+    "normal"
+    "selected"
+    "alternate"
+  ] @attribute)
+
+(id_selector_state
+  [
+    "normal"
+    "urgent"
+    "active"
+  ] @type.qualifier)
 
 (hex_color) @number
-(hex_color "#" @punctuation.special)
-(named_color (identifier) @string.special)
-(named_color "/" @operator)
-(reference_value "@" @punctuation.special (identifier) @variable)
-(reference_value "var" @function.builtin (identifier) @variable)
-(list_value (identifier) @variable)
-(environ_value "$" @punctuation.special (identifier) @variable)
-(environ_value "env" @function.builtin (identifier) @variable)
+
+(hex_color
+  "#" @punctuation.special)
+
+(named_color
+  (identifier) @string.special)
+
+(named_color
+  "/" @operator)
+
+(reference_value
+  "@" @punctuation.special
+  (identifier) @variable)
+
+(reference_value
+  "var" @function.builtin
+  (identifier) @variable)
+
+(list_value
+  (identifier) @variable)
+
+(environ_value
+  "$" @punctuation.special
+  (identifier) @variable)
+
+(environ_value
+  "env" @function.builtin
+  (identifier) @variable)
 
 (property_name) @variable
diff --git a/queries/rasi/indents.scm b/queries/rasi/indents.scm
index 398cf8b8f..849d8aeac 100644
--- a/queries/rasi/indents.scm
+++ b/queries/rasi/indents.scm
@@ -1,5 +1,6 @@
 (rule_set) @indent.begin
 
-(block "}" @indent.branch)
+(block
+  "}" @indent.branch)
 
 (comment) @indent.ignore
diff --git a/queries/rasi/locals.scm b/queries/rasi/locals.scm
index b8e221252..9210de6ea 100644
--- a/queries/rasi/locals.scm
+++ b/queries/rasi/locals.scm
@@ -1,5 +1,10 @@
-(rule_set (selectors (id_selector))) @local.scope
+(rule_set
+  (selectors
+    (id_selector))) @local.scope
 
-(block (declaration (property_name) @local.definition.var))
+(block
+  (declaration
+    (property_name) @local.definition.var))
 
-(reference_value name:(identifier) @local.reference)
+(reference_value
+  name: (identifier) @local.reference)
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index 4e46680a3..a627c256b 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -1,5 +1,4 @@
 ; Use directive
-
 (use_clause
   [
     (type_name)
@@ -7,7 +6,6 @@
   ] @type)
 
 ; Buitin constants and Keywords
-
 [
   "true"
   "false"
@@ -33,11 +31,10 @@
 "def" @keyword.function
 
 ; Members of declaration
-
 [
- "include"
- "extend"
- "prepend"
+  "include"
+  "extend"
+  "prepend"
 ] @function.method
 
 (visibility) @type.qualifier
@@ -47,30 +44,47 @@
 (method_member
   (method_name
     [
-     (identifier)
-     (constant)
-     (operator)
-     (setter)
+      (identifier)
+      (constant)
+      (operator)
+      (setter)
     ] @function.method))
 
-[(ivar_name) (cvar_name)] @property
+[
+  (ivar_name)
+  (cvar_name)
+] @property
 
-(alias_member (method_name) @function)
+(alias_member
+  (method_name) @function)
+
+(class_name
+  (constant) @type)
+
+(module_name
+  (constant) @type)
+
+(interface_name
+  (interface) @type)
+
+(alias_name
+  (identifier) @type)
 
-(class_name (constant) @type)
-(module_name (constant) @type)
-(interface_name (interface) @type)
-(alias_name (identifier) @type)
 (type_variable) @constant
-(namespace (constant) @module)
+
+(namespace
+  (constant) @module)
 
 (builtin_type) @type.builtin
 
-(const_name (constant) @constant)
+(const_name
+  (constant) @constant)
+
 (global_name) @property
 
 ; Standard Arguments
-(parameter (var_name) @variable.parameter)
+(parameter
+  (var_name) @variable.parameter)
 
 ; Keyword Arguments
 (keyword) @variable.parameter
@@ -79,39 +93,42 @@
 (self) @variable.builtin
 
 ; Literal
-(type (symbol_literal) @string.special.symbol)
+(type
+  (symbol_literal) @string.special.symbol)
 
-(type (string_literal (escape_sequence) @string.escape))
-(type (string_literal) @string)
+(type
+  (string_literal
+    (escape_sequence) @string.escape))
 
-(type (integer_literal) @number)
+(type
+  (string_literal) @string)
+
+(type
+  (integer_literal) @number)
 
 ; Operators
-
 [
- "="
- "->"
- "<"
- "**"
- "*"
- "&"
- "|"
- "^"
- ] @operator
+  "="
+  "->"
+  "<"
+  "**"
+  "*"
+  "&"
+  "|"
+  "^"
+] @operator
 
 ; Punctuation
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
- ] @punctuation.bracket
-
-
-[
- ","
- "."
- ] @punctuation.delimiter
+  ","
+  "."
+] @punctuation.delimiter
diff --git a/queries/rbs/injections.scm b/queries/rbs/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/rbs/injections.scm
+++ b/queries/rbs/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/re2c/highlights.scm b/queries/re2c/highlights.scm
index 7e679fbcc..4a51043bf 100644
--- a/queries/re2c/highlights.scm
+++ b/queries/re2c/highlights.scm
@@ -1,5 +1,4 @@
 ; Namespaces
-
 [
   "re2c"
   "re2c"
@@ -8,14 +7,12 @@
 ] @module
 
 ; Includes
-
 [
   "!use"
   "!include"
 ] @keyword.import
 
 ; Keywords
-
 [
   "flags"
   "define"
@@ -52,7 +49,6 @@
 ] @keyword.repeat
 
 ; Constants
-
 [
   "ignore"
   "substitute"
@@ -71,7 +67,6 @@
 (linedir) @constant.macro
 
 ; Operators
-
 [
   "="
   "=>"
@@ -95,9 +90,7 @@
 (condition
   (any) @constant.macro)
 
-
 ; Names
-
 (name) @type
 
 (block_name) @constant
@@ -107,7 +100,7 @@
 (option_name) @constant.builtin
 
 ((option_name) @constant.macro
- (#match? @constant.macro "^YY"))
+  (#match? @constant.macro "^YY"))
 
 (field_expression
   argument: (identifier) @variable)
@@ -115,7 +108,6 @@
 (field_identifier) @property
 
 ; Literals
-
 (regex) @string.regexp
 
 [
@@ -142,7 +134,6 @@
 ] @property
 
 ; Configurations
-
 (define
   option: (option_name) @_yy
   value: (dstring) @type
@@ -155,7 +146,6 @@
 (host_lang) @none
 
 ; Punctuation
-
 [
   ":"
   ";"
@@ -164,15 +154,22 @@
 ] @punctuation.delimiter
 
 [
-  "{" "}"
-  "[" "]"
-  "(" ")"
-  "<" ">"
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+  "<"
+  ">"
 ] @punctuation.bracket
 
 (repetition
   (limits
-    ["{" "}"] @punctuation.bracket))
+    [
+      "{"
+      "}"
+    ] @punctuation.bracket))
 
 [
   "!"
@@ -181,7 +178,6 @@
 ] @punctuation.special
 
 ; Comments and error
-
 [
   (comment)
   (ignore_block)
diff --git a/queries/re2c/indents.scm b/queries/re2c/indents.scm
index 72539143a..31ccf2a0f 100644
--- a/queries/re2c/indents.scm
+++ b/queries/re2c/indents.scm
@@ -1,11 +1,11 @@
 [
- (re2c)
- (action)
+  (re2c)
+  (action)
 ] @indent.begin
 
 "}" @indent.branch @indent.end
 
 [
- (comment)
- (linedir)
+  (comment)
+  (linedir)
 ] @indent.ignore
diff --git a/queries/re2c/injections.scm b/queries/re2c/injections.scm
index e5e40a09d..4f92ea051 100644
--- a/queries/re2c/injections.scm
+++ b/queries/re2c/injections.scm
@@ -2,8 +2,8 @@
   (#set! injection.parent))
 
 ((define
-   option: (option_name) @_yy
-   value: (dstring) @injection.content)
+  option: (option_name) @_yy
+  value: (dstring) @injection.content)
   (#any-of? @_yy "YYPEEK" "YYSKIP" "YYBACKUP" "YYBACKUPCTX" "YYRESTORE" "YYRESTORECTX" "YYFILL" "YYSHIFT")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.parent))
diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index ddcf1d92a..977bfd3be 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -1,39 +1,47 @@
-;; Forked from tree-sitter-regex
-;; The MIT License (MIT) Copyright (c) 2014 Max Brunsfeld
+; Forked from tree-sitter-regex
+; The MIT License (MIT) Copyright (c) 2014 Max Brunsfeld
 [
- "("
- ")"
- "(?"
- "(?:"
- "(?<"
- ">"
- "["
- "]" 
- "{" 
- "}"
+  "("
+  ")"
+  "(?"
+  "(?:"
+  "(?<"
+  ">"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 (group_name) @property
 
-;; These are escaped special characters that lost their special meaning
-;; -> no special highlighting
+; These are escaped special characters that lost their special meaning
+; -> no special highlighting
 (identity_escape) @string.regexp
 
 (class_character) @constant
 
 [
- (control_letter_escape)
- (character_class_escape)
- (control_escape)
- (boundary_assertion)
- (non_boundary_assertion)
+  (control_letter_escape)
+  (character_class_escape)
+  (control_escape)
+  (boundary_assertion)
+  (non_boundary_assertion)
 ] @string.escape
 
-[ "*" "+" "?" "|" "=" "!" "-"] @operator
+[
+  "*"
+  "+"
+  "?"
+  "|"
+  "="
+  "!"
+  "-"
+] @operator
 
 [
- (start_assertion)
- (end_assertion)
+  (start_assertion)
+  (end_assertion)
 ] @punctuation.delimiter
 
 (any_character) @variable.builtin
diff --git a/queries/rego/highlights.scm b/queries/rego/highlights.scm
index 5abaf0fd5..b738eb9db 100644
--- a/queries/rego/highlights.scm
+++ b/queries/rego/highlights.scm
@@ -1,6 +1,6 @@
 ; highlights.scm
 [
-  (import) 
+  (import)
   (package)
 ] @keyword.import
 
@@ -35,17 +35,26 @@
   (raw_string)
 ] @string
 
-(term (ref (var))) @variable
+(term
+  (ref
+    (var))) @variable
 
 (comment) @comment @spell
 
 (number) @number
 
-(expr_call func_name: (fn_name (var) @function .))
+(expr_call
+  func_name:
+    (fn_name
+      (var) @function .))
 
-(expr_call func_arguments: (fn_args (expr) @variable.parameter))
+(expr_call
+  func_arguments:
+    (fn_args
+      (expr) @variable.parameter))
 
-(rule_args (term) @variable.parameter)
+(rule_args
+  (term) @variable.parameter)
 
 [
   (open_paren)
@@ -56,9 +65,22 @@
   (close_curly)
 ] @punctuation.bracket
 
-(rule (rule_head (var) @function.method))
+(rule
+  (rule_head
+    (var) @function.method))
 
-(rule 
-  (rule_head (term (ref (var) @module)))
-  (rule_body (query (literal (expr (expr_infix (expr (term (ref (var)) @_output)))))) (#eq? @_output @module))
-)
+(rule
+  (rule_head
+    (term
+      (ref
+        (var) @module)))
+  (rule_body
+    (query
+      (literal
+        (expr
+          (expr_infix
+            (expr
+              (term
+                (ref
+                  (var)) @_output))))))
+    (#eq? @_output @module)))
diff --git a/queries/rego/injections.scm b/queries/rego/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/rego/injections.scm
+++ b/queries/rego/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/requirements/highlights.scm b/queries/requirements/highlights.scm
index 921c3204b..a04922a26 100644
--- a/queries/requirements/highlights.scm
+++ b/queries/requirements/highlights.scm
@@ -1,41 +1,48 @@
-;; packages
-
+; packages
 (package) @variable
 
-(extras (package) @variable.parameter)
+(extras
+  (package) @variable.parameter)
 
 (path) @string.special.path
 
 (url) @string.special.url
 
-;; versions
-
+; versions
 (version_cmp) @operator
 
 (version) @number
 
-;; markers
-
+; markers
 (marker_var) @attribute
 
 (marker_op) @keyword.operator
 
-;; options
-
+; options
 (option) @function
 
 "=" @operator
 
-;; punctuation
+; punctuation
+[
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "[" "]" "(" ")" ] @punctuation.bracket
+[
+  ","
+  ";"
+  "@"
+] @punctuation.delimiter
 
-[ "," ";" "@" ] @punctuation.delimiter
-
-[ "${" "}" ] @punctuation.special
-
-;; misc
+[
+  "${"
+  "}"
+] @punctuation.special
 
+; misc
 (env_var) @constant
 
 (quoted_string) @string
diff --git a/queries/requirements/injections.scm b/queries/requirements/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/requirements/injections.scm
+++ b/queries/requirements/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/rnoweb/folds.scm b/queries/rnoweb/folds.scm
index f451a3f3b..893758ccd 100644
--- a/queries/rnoweb/folds.scm
+++ b/queries/rnoweb/folds.scm
@@ -1,3 +1 @@
-[
- (rchunk)
-] @fold
+(rchunk) @fold
diff --git a/queries/rnoweb/highlights.scm b/queries/rnoweb/highlights.scm
index ab365f266..81afaf101 100644
--- a/queries/rnoweb/highlights.scm
+++ b/queries/rnoweb/highlights.scm
@@ -1 +1 @@
-;; This file is a placeholder to enable the highlighting of injected languages.
+; This file is a placeholder to enable the highlighting of injected languages.
diff --git a/queries/rnoweb/injections.scm b/queries/rnoweb/injections.scm
index 6b07ccdc4..123cfb8a3 100644
--- a/queries/rnoweb/injections.scm
+++ b/queries/rnoweb/injections.scm
@@ -1,6 +1,6 @@
 ((latex) @injection.content
- (#set! injection.language "latex")
- (#set! injection.combined))
+  (#set! injection.language "latex")
+  (#set! injection.combined))
 
 (rchunk
   (renv_content) @injection.content
diff --git a/queries/robot/highlights.scm b/queries/robot/highlights.scm
index b5f7bd105..b9db02468 100644
--- a/queries/robot/highlights.scm
+++ b/queries/robot/highlights.scm
@@ -10,15 +10,24 @@
   (test_case_setting)
 ] @keyword
 
-(variable_definition (variable_name) @variable)
-(keyword_definition (name) @function)
-(test_case_definition (name) @function)
+(variable_definition
+  (variable_name) @variable)
+
+(keyword_definition
+  (name) @function)
+
+(test_case_definition
+  (name) @function)
+
+(keyword_invocation
+  (keyword) @function.call)
 
-(keyword_invocation (keyword) @function.call)
 (ellipses) @punctuation.delimiter
 
 (text_chunk) @string
+
 (inline_python_expression) @string.special
+
 [
   (scalar_variable)
   (list_variable)
@@ -26,7 +35,6 @@
 ] @variable
 
 ; Control structures
-
 [
   "FOR"
   "IN"
@@ -36,22 +44,36 @@
   (break_statement)
   (continue_statement)
 ] @keyword.repeat
-(for_statement "END" @keyword.repeat)
+
+(for_statement
+  "END" @keyword.repeat)
 
 "WHILE" @keyword.repeat
-(while_statement "END" @keyword.repeat)
+
+(while_statement
+  "END" @keyword.repeat)
 
 [
   "IF"
   "ELSE IF"
 ] @keyword.conditional
-(if_statement "END" @keyword.conditional)
-(if_statement (else_statement "ELSE" @keyword.conditional))
+
+(if_statement
+  "END" @keyword.conditional)
+
+(if_statement
+  (else_statement
+    "ELSE" @keyword.conditional))
 
 [
   "TRY"
   "EXCEPT"
   "FINALLY"
 ] @keyword.exception
-(try_statement "END" @keyword.exception)
-(try_statement (else_statement "ELSE" @keyword.exception))
+
+(try_statement
+  "END" @keyword.exception)
+
+(try_statement
+  (else_statement
+    "ELSE" @keyword.exception))
diff --git a/queries/robot/indents.scm b/queries/robot/indents.scm
index ae34b83a2..a4d81c852 100644
--- a/queries/robot/indents.scm
+++ b/queries/robot/indents.scm
@@ -1,21 +1,45 @@
 (keyword_definition) @indent.begin
+
 (test_case_definition) @indent.begin
 
 (for_statement) @indent.begin
-(for_statement "END" @indent.branch)
+
 (for_statement
-  right: (_ (arguments (continuation (ellipses) @indent.branch))))
+  "END" @indent.branch)
+
+(for_statement
+  right:
+    (_
+      (arguments
+        (continuation
+          (ellipses) @indent.branch))))
 
 (while_statement) @indent.begin
-(while_statement "END" @indent.branch)
+
+(while_statement
+  "END" @indent.branch)
 
 (if_statement) @indent.begin
-(if_statement (elseif_statement) @indent.branch)
-(if_statement (else_statement) @indent.branch)
-(if_statement "END" @indent.branch)
+
+(if_statement
+  (elseif_statement) @indent.branch)
+
+(if_statement
+  (else_statement) @indent.branch)
+
+(if_statement
+  "END" @indent.branch)
 
 (try_statement) @indent.begin
-(try_statement (except_statement) @indent.branch)
-(try_statement (finally_statement) @indent.branch)
-(try_statement (else_statement) @indent.branch)
-(try_statement "END" @indent.branch)
+
+(try_statement
+  (except_statement) @indent.branch)
+
+(try_statement
+  (finally_statement) @indent.branch)
+
+(try_statement
+  (else_statement) @indent.branch)
+
+(try_statement
+  "END" @indent.branch)
diff --git a/queries/ron/highlights.scm b/queries/ron/highlights.scm
index 4b0a87a50..0cdfe4404 100644
--- a/queries/ron/highlights.scm
+++ b/queries/ron/highlights.scm
@@ -1,52 +1,62 @@
 ; Structs
 ;------------
-
 (enum_variant) @constant
-(struct_entry (identifier) @property)
-(struct_entry (enum_variant (identifier) @constant))
-(struct_name (identifier)) @type
+
+(struct_entry
+  (identifier) @property)
+
+(struct_entry
+  (enum_variant
+    (identifier) @constant))
+
+(struct_name
+  (identifier)) @type
 
 (unit_struct) @type.builtin
 
-
 ; Literals
 ;------------
-
 (string) @string
-(boolean) @boolean
-(integer) @number
-(float) @number.float
-(char) @character
 
+(boolean) @boolean
+
+(integer) @number
+
+(float) @number.float
+
+(char) @character
 
 ; Comments
 ;------------
-
 [
   (line_comment)
   (block_comment)
 ] @comment @spell
 
-
 ; Punctuation
 ;------------
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-["{" "}"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-["(" ")"] @punctuation.bracket
-
-["[" "]"] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   ","
   ":"
 ] @punctuation.delimiter
 
-[
-  "-"
-] @operator
+"-" @operator
 
 ; Special
 ;------------
-
 (escape_sequence) @string.escape
diff --git a/queries/ron/indents.scm b/queries/ron/indents.scm
index 7fd9a5ff2..689d01fac 100644
--- a/queries/ron/indents.scm
+++ b/queries/ron/indents.scm
@@ -5,8 +5,17 @@
   (struct)
 ] @indent.begin
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
diff --git a/queries/ron/injections.scm b/queries/ron/injections.scm
index c3522f945..3cd6aac8e 100644
--- a/queries/ron/injections.scm
+++ b/queries/ron/injections.scm
@@ -2,4 +2,4 @@
   (line_comment)
   (block_comment)
 ] @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/ron/locals.scm b/queries/ron/locals.scm
index 62ccbf09f..81e38d5ed 100644
--- a/queries/ron/locals.scm
+++ b/queries/ron/locals.scm
@@ -1,12 +1,25 @@
 (source_file) @local.scope
-(source_file (array) @local.scope)
-(source_file (map) @local.scope)
-(source_file (struct) @local.scope)
-(source_file (tuple) @local.scope)
+
+(source_file
+  (array) @local.scope)
+
+(source_file
+  (map) @local.scope)
+
+(source_file
+  (struct) @local.scope)
+
+(source_file
+  (tuple) @local.scope)
 
 (identifier) @local.reference
 
-(struct_entry (identifier) @local.definition.field)
-(struct_entry (identifier) @local.definition.enum (enum_variant))
+(struct_entry
+  (identifier) @local.definition.field)
 
-(struct (struct_name) @local.definition.type)
+(struct_entry
+  (identifier) @local.definition.enum
+  (enum_variant))
+
+(struct
+  (struct_name) @local.definition.type)
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index d83a21427..7d667eeea 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -1,5 +1,4 @@
-;; Marks
-
+; Marks
 [
   ".."
   "|"
@@ -14,24 +13,25 @@
   "bullet"
   "adornment"
 ] @markup.list
-;; Resets for injection
 
+; Resets for injection
 (doctest_block) @none
 
-;; Directives
-
+; Directives
 (directive
   name: (type) @function)
 
 (directive
-  body: (body (arguments) @variable.parameter))
+  body:
+    (body
+      (arguments) @variable.parameter))
 
 ((directive
   name: (type) @keyword.import)
- (#eq? @keyword.import "include"))
+  (#eq? @keyword.import "include"))
 
 ((directive
-   name: (type) @function.builtin)
+  name: (type) @function.builtin)
   ; format-ignore
   (#any-of? @function.builtin
     ; https://docutils.sourceforge.io/docs/ref/rst/directives.html
@@ -45,8 +45,7 @@
     "replace" "unicode" "date"
     "raw" "class" "role" "default-role" "title" "restructuredtext-test-directive"))
 
-;; Blocks
-
+; Blocks
 [
   (literal_block)
   (line_block)
@@ -68,18 +67,17 @@
   name: (name)? @markup.link.label
   link: (_)? @markup.link)
 
-;; Lists
-
+; Lists
 ; Definition lists
 (list_item
   (term) @markup.strong
   (classifier)? @markup.italic)
 
 ; Field lists
-(field (field_name) @constant)
-
-;; Inline markup
+(field
+  (field_name) @constant)
 
+; Inline markup
 (emphasis) @markup.italic
 
 (strong) @markup.strong
@@ -111,7 +109,7 @@
     ":raw:"))
 
 [
- "interpreted_text"
+  "interpreted_text"
   (literal)
 ] @markup.raw
 
@@ -119,33 +117,33 @@
 ((interpreted_text
   (role) @_role
   "interpreted_text" @markup.italic)
- (#eq? @_role ":emphasis:"))
+  (#eq? @_role ":emphasis:"))
 
 ((interpreted_text
   (role) @_role
   "interpreted_text" @markup.strong)
- (#eq? @_role ":strong:"))
+  (#eq? @_role ":strong:"))
 
 ((interpreted_text
   (role) @_role
   "interpreted_text" @none)
- (#eq? @_role ":math:"))
+  (#eq? @_role ":math:"))
 
 ; Suffix role
 ((interpreted_text
   "interpreted_text" @markup.italic
   (role) @_role)
- (#eq? @_role ":emphasis:"))
+  (#eq? @_role ":emphasis:"))
 
 ((interpreted_text
   "interpreted_text" @markup.strong
   (role) @_role)
- (#eq? @_role ":strong:"))
+  (#eq? @_role ":strong:"))
 
 ((interpreted_text
   "interpreted_text" @none
   (role) @_role)
- (#eq? @_role ":math:"))
+  (#eq? @_role ":math:"))
 
 [
   (inline_target)
@@ -155,17 +153,19 @@
   (reference)
 ] @markup.link @nospell
 
-;; Others
-
+; Others
 (title) @markup.heading
 
 (comment) @comment @spell
-(comment "..") @comment
+
+(comment
+  "..") @comment
 
 (directive
-    name: (type) @_directive
-    body: (body
-        (content) @spell
-        (#not-any-of? @_directive "code" "code-block" "sourcecode")))
+  name: (type) @_directive
+  body:
+    (body
+      (content) @spell
+      (#not-any-of? @_directive "code" "code-block" "sourcecode")))
 
 (paragraph) @spell
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index 7155b2a9b..e0bb380d2 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -1,80 +1,78 @@
 ((doctest_block) @injection.content
- (#set! injection.language "python"))
-
-;; Directives with nested content without arguments nor options
+  (#set! injection.language "python"))
+; Directives with nested content without arguments nor options
 ((directive
-   name: (type) @_type
-   body: (body) @injection.content)
- (#set! injection.language "rst")
- (#any-of?
-  @_type
-  "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
-  "line-block" "parsed-literal" "epigraph" "highlights" "pull-quote" "compound"
-  "header" "footer"
-  "meta"
-  "replace"))
+  name: (type) @_type
+  body: (body) @injection.content)
+  (#set! injection.language "rst")
+  (#any-of? @_type "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition" "line-block" "parsed-literal" "epigraph" "highlights" "pull-quote" "compound" "header" "footer" "meta" "replace"))
 
-;; Directives with nested content without arguments, but with options
+; Directives with nested content without arguments, but with options
 ((directive
-   name: (type) @_type
-   body: (body (options) (content) @injection.content))
- (#set! injection.language "rst")
- (#any-of?
-  @_type
-  "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
-  "line-block" "parsed-literal" "compound"))
+  name: (type) @_type
+  body:
+    (body
+      (options)
+      (content) @injection.content))
+  (#set! injection.language "rst")
+  (#any-of? @_type "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition" "line-block" "parsed-literal" "compound"))
 
-;; Directives with nested content with arguments and options
+; Directives with nested content with arguments and options
 ((directive
-   name: (type) @_type
-   body: (body (content) @injection.content))
- (#set! injection.language "rst")
- (#any-of?
-  @_type
-  "figure"
-  "topic" "sidebar" "container"
-  "table" "list-table"
-  "class" "role" "restructuredtext-test-directive"))
+  name: (type) @_type
+  body:
+    (body
+      (content) @injection.content))
+  (#set! injection.language "rst")
+  (#any-of? @_type "figure" "topic" "sidebar" "container" "table" "list-table" "class" "role" "restructuredtext-test-directive"))
 
-;; Special directives
+; Special directives
 ((directive
-   name: (type) @_type
-   body: (body (arguments) @injection.language (content) @injection.content))
- (#any-of? @_type "code" "code-block" "sourcecode"))
+  name: (type) @_type
+  body:
+    (body
+      (arguments) @injection.language
+      (content) @injection.content))
+  (#any-of? @_type "code" "code-block" "sourcecode"))
 
 ((directive
-   name: (type) @_type
-   body: (body (arguments) @injection.language (content) @injection.content))
- (#eq? @_type "raw"))
+  name: (type) @_type
+  body:
+    (body
+      (arguments) @injection.language
+      (content) @injection.content))
+  (#eq? @_type "raw"))
 
 ((directive
-   name: (type) @_type
-   body: (body (content) @injection.content))
- (#set! injection.language "latex")
- (#eq? @_type "math"))
+  name: (type) @_type
+  body:
+    (body
+      (content) @injection.content))
+  (#set! injection.language "latex")
+  (#eq? @_type "math"))
 
 ; TODO: re-add when a parser for csv is added.
 ((directive
-   name: (type) @_type
-   body: (body (content) @injection.content))
- (#set! injection.language "csv")
- (#eq? @_type "csv-table"))
-
-;; Special roles - prefix
+  name: (type) @_type
+  body:
+    (body
+      (content) @injection.content))
+  (#set! injection.language "csv")
+  (#eq? @_type "csv-table"))
 
+; Special roles - prefix
 ((interpreted_text
   (role) @_role
   "interpreted_text" @injection.content)
- (#eq? @_role ":math:")
- (#set! injection.language "latex"))
-
-;; Special roles - suffix
+  (#eq? @_role ":math:")
+  (#set! injection.language "latex"))
 
+; Special roles - suffix
 ((interpreted_text
   "interpreted_text" @injection.content
   (role) @_role)
- (#eq? @_role ":math:")
- (#set! injection.language "latex"))
+  (#eq? @_role ":math:")
+  (#set! injection.language "latex"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/rst/locals.scm b/queries/rst/locals.scm
index 3091064cb..477c4ef3b 100644
--- a/queries/rst/locals.scm
+++ b/queries/rst/locals.scm
@@ -1,11 +1,9 @@
-;; Scopes
-
+; Scopes
 (document) @local.scope
 
 (directive) @local.scope
 
-;; Definitions
-
+; Definitions
 (title) @local.definition
 
 (substitution_definition
@@ -26,15 +24,16 @@
 ; The role directive can define a new role
 ((directive
   name: (type) @_type
-  body: (body (arguments) @local.definition))
- (#eq? @_type "role"))
-
-;; References
+  body:
+    (body
+      (arguments) @local.definition))
+  (#eq? @_type "role"))
 
+; References
 [
- (substitution_reference)
- (footnote_reference)
- (citation_reference)
- (reference)
- (role)
+  (substitution_reference)
+  (footnote_reference)
+  (citation_reference)
+  (reference)
+  (role)
 ] @local.reference
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index d68c11847..6b8bb591c 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -1,32 +1,31 @@
 ; Variables
-
 (identifier) @variable
+
 (global_variable) @variable.global
 
 ; Keywords
+[
+  "alias"
+  "begin"
+  "class"
+  "do"
+  "end"
+  "ensure"
+  "module"
+  "rescue"
+  "then"
+] @keyword
 
 [
- "alias"
- "begin"
- "class"
- "do"
- "end"
- "ensure"
- "module"
- "rescue"
- "then"
- ] @keyword
-
-[
- "return"
- "yield"
+  "return"
+  "yield"
 ] @keyword.return
 
 [
- "and"
- "or"
- "in"
- "not"
+  "and"
+  "or"
+  "in"
+  "not"
 ] @keyword.operator
 
 [
@@ -38,139 +37,170 @@
   "end" @keyword.function)
 
 [
- "case"
- "else"
- "elsif"
- "if"
- "unless"
- "when"
- "then"
- ] @keyword.conditional
+  "case"
+  "else"
+  "elsif"
+  "if"
+  "unless"
+  "when"
+  "then"
+] @keyword.conditional
 
 (if
   "end" @keyword.conditional)
 
 [
- "for"
- "until"
- "while"
- "break"
- "redo"
- "retry"
- "next"
- ] @keyword.repeat
+  "for"
+  "until"
+  "while"
+  "break"
+  "redo"
+  "retry"
+  "next"
+] @keyword.repeat
 
 (constant) @constant
 
 ((identifier) @type.qualifier
- (#any-of? @type.qualifier "private" "protected" "public"))
+  (#any-of? @type.qualifier "private" "protected" "public"))
 
 [
- "rescue"
- "ensure"
- ] @keyword.exception
+  "rescue"
+  "ensure"
+] @keyword.exception
 
 ((identifier) @keyword.exception
- (#any-of? @keyword.exception "fail" "raise"))
+  (#any-of? @keyword.exception "fail" "raise"))
 
 ; Function calls
-
 "defined?" @function
 
 (call
-   receiver: (constant)? @type
-   method: [
-            (identifier)
-            (constant)
-            ] @function.call
-   )
+  receiver: (constant)? @type
+  method:
+    [
+      (identifier)
+      (constant)
+    ] @function.call)
 
 (program
- (call
-  (identifier) @keyword.import)
- (#any-of? @keyword.import "require" "require_relative" "load"))
+  (call
+    (identifier) @keyword.import)
+  (#any-of? @keyword.import "require" "require_relative" "load"))
 
 ; Function definitions
+(alias
+  (identifier) @function)
 
-(alias (identifier) @function)
-(setter (identifier) @function)
+(setter
+  (identifier) @function)
 
-(method name: [
-               (identifier) @function
-               (constant) @type
-               ])
+(method
+  name:
+    [
+      (identifier) @function
+      (constant) @type
+    ])
 
-(singleton_method name: [
-                         (identifier) @function
-                         (constant) @type
-                         ])
+(singleton_method
+  name:
+    [
+      (identifier) @function
+      (constant) @type
+    ])
 
-(class name: (constant) @type)
-(module name: (constant) @type)
-(superclass (constant) @type)
+(class
+  name: (constant) @type)
+
+(module
+  name: (constant) @type)
+
+(superclass
+  (constant) @type)
 
 ; Identifiers
 [
- (class_variable)
- (instance_variable)
- ] @label
+  (class_variable)
+  (instance_variable)
+] @label
 
 ((identifier) @constant.builtin
- (#match? @constant.builtin "^__(callee|dir|id|method|send|ENCODING|FILE|LINE)__$"))
+  (#match? @constant.builtin "^__(callee|dir|id|method|send|ENCODING|FILE|LINE)__$"))
 
 ((constant) @type
- (#not-lua-match? @type "^[A-Z0-9_]+$"))
+  (#not-lua-match? @type "^[A-Z0-9_]+$"))
 
 [
- (self)
- (super)
- ] @variable.builtin
+  (self)
+  (super)
+] @variable.builtin
 
-(method_parameters (identifier) @variable.parameter)
-(lambda_parameters (identifier) @variable.parameter)
-(block_parameters (identifier) @variable.parameter)
-(splat_parameter (identifier) @variable.parameter)
-(hash_splat_parameter (identifier) @variable.parameter)
-(optional_parameter (identifier) @variable.parameter)
-(destructured_parameter (identifier) @variable.parameter)
-(block_parameter (identifier) @variable.parameter)
-(keyword_parameter (identifier) @variable.parameter)
+(method_parameters
+  (identifier) @variable.parameter)
+
+(lambda_parameters
+  (identifier) @variable.parameter)
+
+(block_parameters
+  (identifier) @variable.parameter)
+
+(splat_parameter
+  (identifier) @variable.parameter)
+
+(hash_splat_parameter
+  (identifier) @variable.parameter)
+
+(optional_parameter
+  (identifier) @variable.parameter)
+
+(destructured_parameter
+  (identifier) @variable.parameter)
+
+(block_parameter
+  (identifier) @variable.parameter)
+
+(keyword_parameter
+  (identifier) @variable.parameter)
 
 ; TODO: Re-enable this once it is supported
 ; ((identifier) @function
 ;  (#is-not? local))
-
 ; Literals
+[
+  (string)
+  (bare_string)
+  (subshell)
+  (heredoc_body)
+] @string
 
 [
- (string)
- (bare_string)
- (subshell)
- (heredoc_body)
- ] @string
+  (heredoc_beginning)
+  (heredoc_end)
+] @constant
 
 [
- (heredoc_beginning)
- (heredoc_end)
- ] @constant
+  (bare_symbol)
+  (simple_symbol)
+  (delimited_symbol)
+  (hash_key_symbol)
+] @string.special.symbol
 
-[
- (bare_symbol)
- (simple_symbol)
- (delimited_symbol)
- (hash_key_symbol)
- ] @string.special.symbol
+(pair
+  key: (hash_key_symbol)
+  ":" @constant)
 
-(pair key: (hash_key_symbol) ":" @constant)
 (regex) @string.regexp
+
 (escape_sequence) @string.escape
+
 (integer) @number
+
 (float) @number.float
 
 [
- (true)
- (false)
- ] @boolean
+  (true)
+  (false)
+] @boolean
 
 (nil) @constant.builtin
 
@@ -182,75 +212,76 @@
 
 (module
   (comment)+ @comment.documentation
-  (body_statement (class)))
+  (body_statement
+    (class)))
 
 (class
   (comment)+ @comment.documentation
-  (body_statement (method)))
+  (body_statement
+    (method)))
 
 (body_statement
   (comment)+ @comment.documentation
   (method))
 
 ; Operators
+[
+  "!"
+  "="
+  "=="
+  "==="
+  "<=>"
+  "=>"
+  "->"
+  ">>"
+  "<<"
+  ">"
+  "<"
+  ">="
+  "<="
+  "**"
+  "*"
+  "/"
+  "%"
+  "+"
+  "-"
+  "&"
+  "|"
+  "^"
+  "&&"
+  "||"
+  "||="
+  "&&="
+  "!="
+  "%="
+  "+="
+  "-="
+  "*="
+  "/="
+  "=~"
+  "!~"
+  "?"
+  ":"
+  ".."
+  "..."
+] @operator
 
 [
- "!"
- "="
- "=="
- "==="
- "<=>"
- "=>"
- "->"
- ">>"
- "<<"
- ">"
- "<"
- ">="
- "<="
- "**"
- "*"
- "/"
- "%"
- "+"
- "-"
- "&"
- "|"
- "^"
- "&&"
- "||"
- "||="
- "&&="
- "!="
- "%="
- "+="
- "-="
- "*="
- "/="
- "=~"
- "!~"
- "?"
- ":"
- ".."
- "..."
- ] @operator
+  ","
+  ";"
+  "."
+] @punctuation.delimiter
 
 [
- ","
- ";"
- "."
- ] @punctuation.delimiter
-
-[
- "("
- ")"
- "["
- "]"
- "{"
- "}"
- "%w("
- "%i("
- ] @punctuation.bracket
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "%w("
+  "%i("
+] @punctuation.bracket
 
 (interpolation
   "#{" @punctuation.special
diff --git a/queries/ruby/injections.scm b/queries/ruby/injections.scm
index 381d96b2f..7d8be5b23 100644
--- a/queries/ruby/injections.scm
+++ b/queries/ruby/injections.scm
@@ -1,11 +1,11 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
 
 (heredoc_body
- (heredoc_content) @injection.content
- (heredoc_end) @injection.language
- (#downcase! @injection.language))
+  (heredoc_content) @injection.content
+  (heredoc_end) @injection.language
+  (#downcase! @injection.language))
 
-(regex 
-  (string_content) @injection.content 
+(regex
+  (string_content) @injection.content
   (#set! injection.language "regex"))
diff --git a/queries/ruby/locals.scm b/queries/ruby/locals.scm
index f08dcd49f..2a27c93a2 100644
--- a/queries/ruby/locals.scm
+++ b/queries/ruby/locals.scm
@@ -19,37 +19,77 @@
 ; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 ; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ; SOFTWARE.
-
-;;; DECLARATIONS AND SCOPES
+; DECLARATIONS AND SCOPES
 (method) @local.scope
+
 (class) @local.scope
 
 [
- (block)
- (do_block) 
- ] @local.scope
+  (block)
+  (do_block)
+] @local.scope
 
 (identifier) @local.reference
+
 (constant) @local.reference
+
 (instance_variable) @local.reference
 
-(module name: (constant) @local.definition.namespace)
-(class name: (constant) @local.definition.type)
-(method name: [(identifier) (constant)] @local.definition.function)
-(singleton_method name: [(identifier) (constant)] @local.definition.function)
+(module
+  name: (constant) @local.definition.namespace)
 
-(method_parameters (identifier) @local.definition.var)
-(lambda_parameters (identifier) @local.definition.var)
-(block_parameters (identifier) @local.definition.var)
-(splat_parameter (identifier) @local.definition.var)
-(hash_splat_parameter (identifier) @local.definition.var)
-(optional_parameter name: (identifier) @local.definition.var)
-(destructured_parameter (identifier) @local.definition.var)
-(block_parameter name: (identifier) @local.definition.var)
-(keyword_parameter name: (identifier) @local.definition.var)
+(class
+  name: (constant) @local.definition.type)
 
-(assignment left: (_) @local.definition.var)
+(method
+  name:
+    [
+      (identifier)
+      (constant)
+    ] @local.definition.function)
 
-(left_assignment_list (identifier) @local.definition.var)
-(rest_assignment (identifier) @local.definition.var)
-(destructured_left_assignment (identifier) @local.definition.var)
+(singleton_method
+  name:
+    [
+      (identifier)
+      (constant)
+    ] @local.definition.function)
+
+(method_parameters
+  (identifier) @local.definition.var)
+
+(lambda_parameters
+  (identifier) @local.definition.var)
+
+(block_parameters
+  (identifier) @local.definition.var)
+
+(splat_parameter
+  (identifier) @local.definition.var)
+
+(hash_splat_parameter
+  (identifier) @local.definition.var)
+
+(optional_parameter
+  name: (identifier) @local.definition.var)
+
+(destructured_parameter
+  (identifier) @local.definition.var)
+
+(block_parameter
+  name: (identifier) @local.definition.var)
+
+(keyword_parameter
+  name: (identifier) @local.definition.var)
+
+(assignment
+  left: (_) @local.definition.var)
+
+(left_assignment_list
+  (identifier) @local.definition.var)
+
+(rest_assignment
+  (identifier) @local.definition.var)
+
+(destructured_left_assignment
+  (identifier) @local.definition.var)
diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index 6372e6dfb..8d0b014fb 100644
--- a/queries/rust/folds.scm
+++ b/queries/rust/folds.scm
@@ -8,10 +8,8 @@
   (impl_item)
   (type_item)
   (union_item)
-
   (use_declaration)
   (let_declaration)
-
   (loop_expression)
   (for_expression)
   (while_expression)
@@ -19,9 +17,7 @@
   (match_expression)
   (call_expression)
   (array_expression)
-
   (macro_definition)
   (macro_invocation)
-
   (attribute_item)
 ] @fold
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index a262b6f08..2928271a3 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -1,9 +1,7 @@
 ; Forked from https://github.com/tree-sitter/tree-sitter-rust
 ; Copyright (c) 2017 Maxim Sokolov
 ; Licensed under the MIT license.
-
 ; Identifier conventions
-
 (identifier) @variable
 
 ((identifier) @type
@@ -13,77 +11,84 @@
   name: (identifier) @constant)
 
 ; Assume all-caps names are constants
-
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
 
 ; Other identifiers
-
 (type_identifier) @type
 
 (primitive_type) @type.builtin
 
 (field_identifier) @variable.member
 
-(shorthand_field_initializer (identifier) @variable.member)
+(shorthand_field_initializer
+  (identifier) @variable.member)
 
 (mod_item
   name: (identifier) @module)
 
 (self) @variable.builtin
 
-(label ["'" (identifier)] @label)
+(label
+  [
+    "'"
+    (identifier)
+  ] @label)
 
 ; Function definitions
+(function_item
+  (identifier) @function)
 
-(function_item (identifier) @function)
+(function_signature_item
+  (identifier) @function)
 
-(function_signature_item (identifier) @function)
+(parameter
+  (identifier) @variable.parameter)
 
-(parameter (identifier) @variable.parameter)
-
-(closure_parameters (_) @variable.parameter)
+(closure_parameters
+  (_) @variable.parameter)
 
 ; Function calls
-
 (call_expression
   function: (identifier) @function.call)
 
 (call_expression
-  function: (scoped_identifier
-              (identifier) @function.call .))
+  function:
+    (scoped_identifier
+      (identifier) @function.call .))
 
 (call_expression
-  function: (field_expression
-    field: (field_identifier) @function.call))
+  function:
+    (field_expression
+      field: (field_identifier) @function.call))
 
 (generic_function
   function: (identifier) @function.call)
 
 (generic_function
-  function: (scoped_identifier
-    name: (identifier) @function.call))
+  function:
+    (scoped_identifier
+      name: (identifier) @function.call))
 
 (generic_function
-  function: (field_expression
-    field: (field_identifier) @function.call))
+  function:
+    (field_expression
+      field: (field_identifier) @function.call))
 
 ; Assume other uppercase names are enum constructors
-
 ((field_identifier) @constant
- (#lua-match? @constant "^[A-Z]"))
+  (#lua-match? @constant "^[A-Z]"))
 
 (enum_variant
   name: (identifier) @constant)
 
 ; Assume that uppercase names in paths are types
-
 (scoped_identifier
   path: (identifier) @module)
 
 (scoped_identifier
- (scoped_identifier
-  name: (identifier) @module))
+  (scoped_identifier
+    name: (identifier) @module))
 
 (scoped_type_identifier
   path: (identifier) @module)
@@ -93,20 +98,20 @@
   (#lua-match? @type "^[A-Z]"))
 
 (scoped_type_identifier
- (scoped_identifier
-  name: (identifier) @module))
+  (scoped_identifier
+    name: (identifier) @module))
 
 ((scoped_identifier
   path: (identifier) @type)
- (#lua-match? @type "^[A-Z]"))
+  (#lua-match? @type "^[A-Z]"))
 
 ((scoped_identifier
-    name: (identifier) @type)
- (#lua-match? @type "^[A-Z]"))
+  name: (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
 
 ((scoped_identifier
-    name: (identifier) @constant)
- (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+  name: (identifier) @constant)
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
 
 ((scoped_identifier
   path: (identifier) @type
@@ -129,69 +134,85 @@
   path: (identifier) @module)
 
 (scoped_use_list
-  path: (scoped_identifier
-          (identifier) @module))
+  path:
+    (scoped_identifier
+      (identifier) @module))
 
-(use_list (scoped_identifier (identifier) @module . (_)))
+(use_list
+  (scoped_identifier
+    (identifier) @module
+    .
+    (_)))
 
-(use_list (identifier) @type (#lua-match? @type "^[A-Z]"))
+(use_list
+  (identifier) @type
+  (#lua-match? @type "^[A-Z]"))
 
-(use_as_clause alias: (identifier) @type (#lua-match? @type "^[A-Z]"))
+(use_as_clause
+  alias: (identifier) @type
+  (#lua-match? @type "^[A-Z]"))
 
 ; Correct enum constructors
-
 (call_expression
-  function: (scoped_identifier
-    "::"
-    name: (identifier) @constant)
+  function:
+    (scoped_identifier
+      "::"
+      name: (identifier) @constant)
   (#lua-match? @constant "^[A-Z]"))
 
 ; Assume uppercase names in a match arm are constants.
+((match_arm
+  pattern:
+    (match_pattern
+      (identifier) @constant))
+  (#lua-match? @constant "^[A-Z]"))
 
 ((match_arm
-   pattern: (match_pattern (identifier) @constant))
- (#lua-match? @constant "^[A-Z]"))
-
-((match_arm
-   pattern: (match_pattern
-     (scoped_identifier
-       name: (identifier) @constant)))
- (#lua-match? @constant "^[A-Z]"))
+  pattern:
+    (match_pattern
+      (scoped_identifier
+        name: (identifier) @constant)))
+  (#lua-match? @constant "^[A-Z]"))
 
 ((identifier) @constant.builtin
- (#any-of? @constant.builtin "Some" "None" "Ok" "Err"))
+  (#any-of? @constant.builtin "Some" "None" "Ok" "Err"))
 
 ; Macro definitions
-
 "$" @function.macro
 
 (metavariable) @function.macro
 
-(macro_definition "macro_rules!" @function.macro)
+(macro_definition
+  "macro_rules!" @function.macro)
 
 ; Attribute macros
+(attribute_item
+  (attribute
+    (identifier) @function.macro))
 
-(attribute_item (attribute (identifier) @function.macro))
-(inner_attribute_item (attribute (identifier) @function.macro))
+(inner_attribute_item
+  (attribute
+    (identifier) @function.macro))
 
-(attribute (scoped_identifier (identifier) @function.macro .))
+(attribute
+  (scoped_identifier
+    (identifier) @function.macro .))
 
 ; Derive macros (assume all arguments are types)
 ; (attribute
 ;   (identifier) @_name
 ;   arguments: (attribute (attribute (identifier) @type))
 ;   (#eq? @_name "derive"))
-
 ; Function-like macros
 (macro_invocation
   macro: (identifier) @function.macro)
 
 (macro_invocation
-  macro: (scoped_identifier
-           (identifier) @function.macro .))
+  macro:
+    (scoped_identifier
+      (identifier) @function.macro .))
 
 ; Literals
-
 [
   (line_comment)
   (block_comment)
@@ -228,13 +249,13 @@
 (char_literal) @character
 
 ; Keywords
-
 [
   "use"
   "mod"
 ] @keyword.import
 
-(use_as_clause "as" @keyword.import)
+(use_as_clause
+  "as" @keyword.import)
 
 [
   "default"
@@ -258,7 +279,7 @@
 
 [
   "ref"
- (mutable_specifier)
+  (mutable_specifier)
 ] @type.qualifier
 
 [
@@ -268,7 +289,11 @@
   "extern"
 ] @keyword.storage
 
-(lifetime ["'" (identifier)] @keyword.storage.lifetime)
+(lifetime
+  [
+    "'"
+    (identifier)
+  ] @keyword.storage.lifetime)
 
 "fn" @keyword.function
 
@@ -277,17 +302,31 @@
   "yield"
 ] @keyword.return
 
-(type_cast_expression "as" @keyword.operator)
+(type_cast_expression
+  "as" @keyword.operator)
 
-(qualified_type "as" @keyword.operator)
+(qualified_type
+  "as" @keyword.operator)
 
-(use_list (self) @module)
+(use_list
+  (self) @module)
 
-(scoped_use_list (self) @module)
+(scoped_use_list
+  (self) @module)
 
-(scoped_identifier [(crate) (super) (self)] @module)
+(scoped_identifier
+  [
+    (crate)
+    (super)
+    (self)
+  ] @module)
 
-(visibility_modifier [(crate) (super) (self)] @module)
+(visibility_modifier
+  [
+    (crate)
+    (super)
+    (self)
+  ] @module)
 
 [
   "if"
@@ -304,10 +343,11 @@
 ] @keyword.repeat
 
 "for" @keyword
-(for_expression "for" @keyword.repeat)
+
+(for_expression
+  "for" @keyword.repeat)
 
 ; Operators
-
 [
   "!"
   "!="
@@ -346,28 +386,66 @@
 ] @operator
 
 ; Punctuation
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+(closure_parameters
+  "|" @punctuation.bracket)
 
-(closure_parameters "|" @punctuation.bracket)
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
-(type_arguments  ["<" ">"] @punctuation.bracket)
+(type_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
-(type_parameters ["<" ">"] @punctuation.bracket)
+(bracketed_type
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
-(bracketed_type ["<" ">"] @punctuation.bracket)
+(for_lifetimes
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
-(for_lifetimes ["<" ">"] @punctuation.bracket)
+[
+  ","
+  "."
+  ":"
+  "::"
+  ";"
+  "->"
+  "=>"
+] @punctuation.delimiter
 
-["," "." ":" "::" ";" "->" "=>"] @punctuation.delimiter
+(attribute_item
+  "#" @punctuation.special)
 
-(attribute_item "#" @punctuation.special)
+(inner_attribute_item
+  [
+    "!"
+    "#"
+  ] @punctuation.special)
 
-(inner_attribute_item ["!" "#"] @punctuation.special)
+(macro_invocation
+  "!" @function.macro)
 
-(macro_invocation "!" @function.macro)
-
-(empty_type "!" @type.builtin)
+(empty_type
+  "!" @type.builtin)
 
 (macro_invocation
   macro: (identifier) @keyword.exception
diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index 0546efd25..6b9166518 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -23,24 +23,48 @@
   (token_tree)
   (macro_definition)
 ] @indent.begin
-(trait_item body: (_) @indent.begin)
-(string_literal (escape_sequence)) @indent.begin
 
-(block "}" @indent.end)
-(enum_item
-  body: (enum_variant_list "}" @indent.end))
-(impl_item
-  body: (declaration_list "}" @indent.end))
-(match_expression
-  body: (match_block "}" @indent.end))
-(mod_item
-  body: (declaration_list "}" @indent.end))
-(struct_item
-  body: (field_declaration_list "}" @indent.end))
 (trait_item
-  body: (declaration_list "}" @indent.end))
+  body: (_) @indent.begin)
 
-(impl_item (where_clause) @indent.dedent)
+(string_literal
+  (escape_sequence)) @indent.begin
+
+(block
+  "}" @indent.end)
+
+(enum_item
+  body:
+    (enum_variant_list
+      "}" @indent.end))
+
+(impl_item
+  body:
+    (declaration_list
+      "}" @indent.end))
+
+(match_expression
+  body:
+    (match_block
+      "}" @indent.end))
+
+(mod_item
+  body:
+    (declaration_list
+      "}" @indent.end))
+
+(struct_item
+  body:
+    (field_declaration_list
+      "}" @indent.end))
+
+(trait_item
+  body:
+    (declaration_list
+      "}" @indent.end))
+
+(impl_item
+  (where_clause) @indent.dedent)
 
 [
   "where"
@@ -48,13 +72,13 @@
   "]"
   "}"
 ] @indent.branch
-(impl_item (declaration_list) @indent.branch)
+
+(impl_item
+  (declaration_list) @indent.branch)
 
 [
   (line_comment)
   (string_literal)
 ] @indent.ignore
 
-
 (raw_string_literal) @indent.auto
-
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index d3abc13a6..b245e3b64 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -1,9 +1,10 @@
 (macro_invocation
-  (token_tree) @injection.content (#set! injection.language "rust"))
+  (token_tree) @injection.content
+  (#set! injection.language "rust"))
 
 (macro_definition
   (macro_rule
-    left: (token_tree_pattern) @injection.content 
+    left: (token_tree_pattern) @injection.content
     (#set! injection.language "rust")))
 
 (macro_definition
@@ -15,28 +16,39 @@
   (line_comment)
   (block_comment)
 ] @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((macro_invocation
-   macro: ((identifier) @injection.language)
-   (token_tree) @injection.content)
- (#eq? @injection.language "html"))
+  macro:
+    ((identifier) @injection.language)
+  (token_tree) @injection.content)
+  (#eq? @injection.language "html"))
 
 (call_expression
-  function: (scoped_identifier
-    path: (identifier) @_regex (#eq? @_regex "Regex")
-    name: (identifier) @_new (#eq? @_new "new"))
-  arguments: (arguments
-    (raw_string_literal) @injection.content)
-    (#set! injection.language "regex"))
+  function:
+    (scoped_identifier
+      path: (identifier) @_regex
+      (#eq? @_regex "Regex")
+      name: (identifier) @_new
+      (#eq? @_new "new"))
+  arguments:
+    (arguments
+      (raw_string_literal) @injection.content)
+  (#set! injection.language "regex"))
 
 (call_expression
-  function: (scoped_identifier
-    path: (scoped_identifier (identifier) @_regex (#eq? @_regex "Regex").)
-    name: (identifier) @_new (#eq? @_new "new"))
-  arguments: (arguments
-    (raw_string_literal) @injection.content)
-    (#set! injection.language "regex"))
+  function:
+    (scoped_identifier
+      path:
+        (scoped_identifier
+          (identifier) @_regex
+          (#eq? @_regex "Regex") .)
+      name: (identifier) @_new
+      (#eq? @_new "new"))
+  arguments:
+    (arguments
+      (raw_string_literal) @injection.content)
+  (#set! injection.language "regex"))
 
 ((block_comment) @injection.content
   (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
diff --git a/queries/rust/locals.scm b/queries/rust/locals.scm
index 24e2ffb0a..bba614536 100644
--- a/queries/rust/locals.scm
+++ b/queries/rust/locals.scm
@@ -1,42 +1,45 @@
 ; Imports
 (extern_crate_declaration
-    name: (identifier) @local.definition.import)
+  name: (identifier) @local.definition.import)
 
-(use_declaration 
-  argument: (scoped_identifier 
-              name: (identifier) @local.definition.import))  
+(use_declaration
+  argument:
+    (scoped_identifier
+      name: (identifier) @local.definition.import))
 
-(use_as_clause 
+(use_as_clause
   alias: (identifier) @local.definition.import)
 
 (use_list
-    (identifier) @local.definition.import) ; use std::process::{Child, Command, Stdio};
+  (identifier) @local.definition.import) ; use std::process::{Child, Command, Stdio};
 
 ; Functions
-(function_item 
-    name: (identifier) @local.definition.function)
+(function_item
+  name: (identifier) @local.definition.function)
 
-(function_item 
+(function_item
   name: (identifier) @local.definition.method
-  parameters: (parameters 
-                (self_parameter)))
+  parameters:
+    (parameters
+      (self_parameter)))
 
 ; Variables
-(parameter 
-  pattern: (identifier) @local.definition.var) 
-
-(let_declaration 
+(parameter
   pattern: (identifier) @local.definition.var)
 
-(const_item 
+(let_declaration
+  pattern: (identifier) @local.definition.var)
+
+(const_item
   name: (identifier) @local.definition.var)
 
 (tuple_pattern
-  (identifier) @local.definition.var) 
+  (identifier) @local.definition.var)
 
 (let_condition
-  pattern: (_
-             (identifier) @local.definition.var))
+  pattern:
+    (_
+      (identifier) @local.definition.var))
 
 (tuple_struct_pattern
   (identifier) @local.definition.var)
@@ -47,57 +50,55 @@
 (self_parameter
   (self) @local.definition.var)
 
-(for_expression 
+(for_expression
   pattern: (identifier) @local.definition.var)
 
 ; Types
 (struct_item
   name: (type_identifier) @local.definition.type)
 
-(constrained_type_parameter 
+(constrained_type_parameter
   left: (type_identifier) @local.definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
 
 (enum_item
   name: (type_identifier) @local.definition.type)
 
-
 ; Fields
 (field_declaration
   name: (field_identifier) @local.definition.field)
 
 (enum_variant
-  name: (identifier) @local.definition.field) 
+  name: (identifier) @local.definition.field)
 
 ; References
 (identifier) @local.reference
-((type_identifier) @local.reference
-                   (#set! reference.kind "type"))
-((field_identifier) @local.reference
-                   (#set! reference.kind "field"))
 
+((type_identifier) @local.reference
+  (#set! reference.kind "type"))
+
+((field_identifier) @local.reference
+  (#set! reference.kind "field"))
 
 ; Macros
 (macro_definition
   name: (identifier) @local.definition.macro)
 
 ; Module
-(mod_item 
+(mod_item
   name: (identifier) @local.definition.namespace)
 
 ; Scopes
 [
- (block)
- (function_item)
- (closure_expression)
- (while_expression)
- (for_expression)
- (loop_expression)
- (if_expression)
- (match_expression)
- (match_arm)
-
- (struct_item)
- (enum_item)
- (impl_item)
+  (block)
+  (function_item)
+  (closure_expression)
+  (while_expression)
+  (for_expression)
+  (loop_expression)
+  (if_expression)
+  (match_expression)
+  (match_arm)
+  (struct_item)
+  (enum_item)
+  (impl_item)
 ] @local.scope
-
diff --git a/queries/scala/folds.scm b/queries/scala/folds.scm
index e748e86df..b0f08188e 100644
--- a/queries/scala/folds.scm
+++ b/queries/scala/folds.scm
@@ -1,15 +1,16 @@
-(call_expression (block) @fold)
+(call_expression
+  (block) @fold)
 
-[(class_definition)
- (trait_definition)
- (object_definition)
- (function_definition)
- (val_definition)
- (import_declaration)
-
- (while_expression)
- (do_while_expression)
- (for_expression)
- (try_expression)
- (match_expression)
+[
+  (class_definition)
+  (trait_definition)
+  (object_definition)
+  (function_definition)
+  (val_definition)
+  (import_declaration)
+  (while_expression)
+  (do_while_expression)
+  (for_expression)
+  (try_expression)
+  (match_expression)
 ] @fold
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 2c483c46b..e4d219f40 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -1,5 +1,4 @@
 ; CREDITS @stumash (stuart.mashaal@gmail.com)
-
 (class_definition
   name: (identifier) @type)
 
@@ -18,25 +17,26 @@
 (simple_enum_case
   name: (identifier) @type)
 
-;; variables
-
-(class_parameter 
+; variables
+(class_parameter
   name: (identifier) @variable.parameter)
 
-(self_type (identifier) @variable.parameter)
+(self_type
+  (identifier) @variable.parameter)
 
-(interpolation (identifier) @none)
-(interpolation (block) @none)
+(interpolation
+  (identifier) @none)
 
-;; types
+(interpolation
+  (block) @none)
 
+; types
 (type_definition
   name: (type_identifier) @type.definition)
 
 (type_identifier) @type
 
-;; val/var definitions/declarations
-
+; val/var definitions/declarations
 (val_definition
   pattern: (identifier) @variable)
 
@@ -50,35 +50,46 @@
   name: (identifier) @variable)
 
 ; method definition
-
 (function_declaration
-      name: (identifier) @function.method)
+  name: (identifier) @function.method)
 
 (function_definition
-      name: (identifier) @function.method)
+  name: (identifier) @function.method)
 
 ; imports/exports
-
 (import_declaration
   path: (identifier) @module)
-((stable_identifier (identifier) @module))
+
+((stable_identifier
+  (identifier) @module))
 
 ((import_declaration
-  path: (identifier) @type) (#lua-match? @type "^[A-Z]"))
-((stable_identifier (identifier) @type) (#lua-match? @type "^[A-Z]"))
+  path: (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
+
+((stable_identifier
+  (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
 
 (export_declaration
   path: (identifier) @module)
-((stable_identifier (identifier) @module))
+
+((stable_identifier
+  (identifier) @module))
 
 ((export_declaration
-  path: (identifier) @type) (#lua-match? @type "^[A-Z]"))
-((stable_identifier (identifier) @type) (#lua-match? @type "^[A-Z]"))
+  path: (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
 
-((namespace_selectors (identifier) @type) (#lua-match? @type "^[A-Z]"))
+((stable_identifier
+  (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
+
+((namespace_selectors
+  (identifier) @type)
+  (#lua-match? @type "^[A-Z]"))
 
 ; method invocation
-
 (call_expression
   function: (identifier) @function.call)
 
@@ -86,12 +97,13 @@
   function: (operator_identifier) @function.call)
 
 (call_expression
-  function: (field_expression
-    field: (identifier) @function.method.call))
+  function:
+    (field_expression
+      field: (identifier) @function.method.call))
 
 ((call_expression
-   function: (identifier) @constructor)
- (#lua-match? @constructor "^[A-Z]"))
+  function: (identifier) @constructor)
+  (#lua-match? @constructor "^[A-Z]"))
 
 (generic_function
   function: (identifier) @function.call)
@@ -100,7 +112,6 @@
   interpolator: (identifier) @function.call)
 
 ; function definitions
-
 (function_definition
   name: (identifier) @function)
 
@@ -111,20 +122,30 @@
   name: (identifier) @variable.parameter)
 
 ; expressions
+(field_expression
+  field: (identifier) @property)
 
-(field_expression field: (identifier) @property)
-(field_expression value: (identifier) @type
- (#lua-match? @type "^[A-Z]"))
+(field_expression
+  value: (identifier) @type
+  (#lua-match? @type "^[A-Z]"))
 
-(infix_expression operator: (identifier) @operator)
-(infix_expression operator: (operator_identifier) @operator)
-(infix_type operator: (operator_identifier) @operator)
-(infix_type operator: (operator_identifier) @operator)
+(infix_expression
+  operator: (identifier) @operator)
+
+(infix_expression
+  operator: (operator_identifier) @operator)
+
+(infix_type
+  operator: (operator_identifier) @operator)
+
+(infix_type
+  operator: (operator_identifier) @operator)
 
 ; literals
-
 (boolean_literal) @boolean
+
 (integer_literal) @number
+
 (floating_point_literal) @number.float
 
 [
@@ -135,13 +156,16 @@
 
 (symbol_literal) @string.special.symbol
 
-(interpolation "$" @punctuation.special)
-
-;; keywords
+(interpolation
+  "$" @punctuation.special)
 
+; keywords
 (opaque_modifier) @type.qualifier
+
 (infix_modifier) @keyword
+
 (transparent_modifier) @type.qualifier
+
 (open_modifier) @type.qualifier
 
 [
@@ -151,8 +175,8 @@
   "extends"
   "derives"
   "finally"
-;; `forSome` existential types not implemented yet
-;; `macro` not implemented yet
+  ; `forSome` existential types not implemented yet
+  ; `macro` not implemented yet
   "object"
   "override"
   "package"
@@ -186,8 +210,7 @@
 
 (annotation) @attribute
 
-;; special keywords
-
+; special keywords
 "new" @keyword.operator
 
 [
@@ -198,17 +221,17 @@
 ] @keyword.conditional
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
-]  @punctuation.bracket
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 [
- "."
- ","
+  "."
+  ","
 ] @punctuation.delimiter
 
 [
@@ -221,12 +244,15 @@
 "def" @keyword.function
 
 [
- "=>"
- "<-"
- "@"
+  "=>"
+  "<-"
+  "@"
 ] @operator
 
-["import" "export"] @keyword.import
+[
+  "import"
+  "export"
+] @keyword.import
 
 [
   "try"
@@ -244,22 +270,23 @@
 ((block_comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
-;; `case` is a conditional keyword in case_block
-
+; `case` is a conditional keyword in case_block
 (case_block
-  (case_clause ("case") @keyword.conditional))
+  (case_clause
+    ("case") @keyword.conditional))
 
 (operator_identifier) @operator
 
-((identifier) @type (#lua-match? @type "^[A-Z]"))
+((identifier) @type
+  (#lua-match? @type "^[A-Z]"))
+
 ((identifier) @variable.builtin
- (#lua-match? @variable.builtin "^this$"))
+  (#lua-match? @variable.builtin "^this$"))
 
-(
-  (identifier) @function.builtin
-  (#lua-match? @function.builtin "^super$")
-)
+((identifier) @function.builtin
+  (#lua-match? @function.builtin "^super$"))
 
-;; Scala CLI using directives
+; Scala CLI using directives
 (using_directive_key) @variable.parameter
+
 (using_directive_value) @string
diff --git a/queries/scala/injections.scm b/queries/scala/injections.scm
index aebb54d93..1c2fe3cc9 100644
--- a/queries/scala/injections.scm
+++ b/queries/scala/injections.scm
@@ -1,5 +1,5 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((block_comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index 689b140b3..ec205c4e1 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (template_body)
   (lambda_expression)
@@ -9,16 +8,15 @@
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
-
 (function_declaration
   name: (identifier) @local.definition.function)
 
 (function_definition
-  name: ((identifier) @local.definition.function)
+  name:
+    ((identifier) @local.definition.function)
   (#set! definition.var.scope parent))
 
 (parameter
@@ -46,7 +44,8 @@
   name: (identifier) @local.definition.var)
 
 (for_expression
-  enumerators: (enumerators
-    (enumerator
-      (tuple_pattern
-        (identifier) @local.definition.var))))
+  enumerators:
+    (enumerators
+      (enumerator
+        (tuple_pattern
+          (identifier) @local.definition.var))))
diff --git a/queries/scfg/highlights.scm b/queries/scfg/highlights.scm
index 0fcfa7c9b..058f3e3d4 100644
--- a/queries/scfg/highlights.scm
+++ b/queries/scfg/highlights.scm
@@ -1,8 +1,10 @@
 [
- "{"
- "}"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 (comment) @comment @spell
+
 (directive_name) @type
+
 (directive_params) @variable.parameter
diff --git a/queries/scfg/injections.scm b/queries/scfg/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/scfg/injections.scm
+++ b/queries/scfg/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/scheme/folds.scm b/queries/scheme/folds.scm
index 64a9a08e6..115809a77 100644
--- a/queries/scheme/folds.scm
+++ b/queries/scheme/folds.scm
@@ -1 +1,2 @@
-(program (list) @fold)
+(program
+  (list) @fold)
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index fdd494d8b..202a6ab16 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -1,108 +1,103 @@
-;; A highlight query can override the highlights queries before it.
-;; So the order is important.
-;; We should highlight general rules, then highlight special forms.
-
+; A highlight query can override the highlights queries before it.
+; So the order is important.
+; We should highlight general rules, then highlight special forms.
 (number) @number
-(character) @character
-(boolean) @boolean
-(string) @string
-[(comment)
- (block_comment)] @comment @spell
 
-;; highlight for datum comment
-;; copied from ../clojure/highlights.scm
-([(comment) (directive)] @comment
- (#set! "priority" 105))
+(character) @character
+
+(boolean) @boolean
+
+(string) @string
+
+[
+  (comment)
+  (block_comment)
+] @comment @spell
+
+; highlight for datum comment
+; copied from ../clojure/highlights.scm
+([
+  (comment)
+  (directive)
+] @comment
+  (#set! "priority" 105))
 
 (escape_sequence) @string.escape
 
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
-
-;; variables
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
+; variables
 (symbol) @variable
+
 ((symbol) @variable.builtin
- (#any-of? @variable.builtin "..." "."))
+  (#any-of? @variable.builtin "..." "."))
 
-;; procedure
+; procedure
+(list
+  .
+  (symbol) @function)
+
+; special forms
+(list
+  "["
+  (symbol)+ @variable
+  "]")
 
 (list
- .
- (symbol) @function)
-
-;; special forms
+  .
+  (symbol) @_f
+  .
+  (list
+    (symbol) @variable)
+  (#any-of? @_f "lambda" "λ"))
 
 (list
- "["
- (symbol)+ @variable
- "]")
-
-(list
- .
- (symbol) @_f
- .
- (list
-   (symbol) @variable)
- (#any-of? @_f "lambda" "λ"))
-
-(list
- .
- (symbol) @_f
- .
- (list
-   (list
-     (symbol) @variable))
- (#any-of? @_f
-  "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*" "letrec-syntax"))
-
-;; operators
+  .
+  (symbol) @_f
+  .
+  (list
+    (list
+      (symbol) @variable))
+  (#any-of? @_f "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*" "letrec-syntax"))
 
+; operators
 ((symbol) @operator
- (#any-of? @operator
-  "+" "-" "*" "/" "=" "<=" ">=" "<" ">"))
-
-;; keyword
+  (#any-of? @operator "+" "-" "*" "/" "=" "<=" ">=" "<" ">"))
 
+; keyword
 ((symbol) @keyword
- (#any-of? @keyword
-  "define" "lambda" "λ" "begin" "do" "define-syntax"
-  "and" "or"
-  "if" "cond" "case" "when" "unless" "else" "=>"
-  "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*" "letrec-syntax"
-  "set!"
-  "syntax-rules" "identifier-syntax"
-  "quote" "unquote" "quote-splicing" "quasiquote" "unquote-splicing"
-  "delay"
-  "assert"
-  "library" "export" "import" "rename" "only" "except" "prefix"))
+  (#any-of? @keyword "define" "lambda" "λ" "begin" "do" "define-syntax" "and" "or" "if" "cond" "case" "when" "unless" "else" "=>" "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*" "letrec-syntax" "set!" "syntax-rules" "identifier-syntax" "quote" "unquote" "quote-splicing" "quasiquote" "unquote-splicing" "delay" "assert" "library" "export" "import" "rename" "only" "except" "prefix"))
 
 ((symbol) @keyword.conditional
- (#any-of? @keyword.conditional "if" "cond" "case" "when" "unless"))
-
-;; quote
+  (#any-of? @keyword.conditional "if" "cond" "case" "when" "unless"))
 
+; quote
 (quote
- "'"
- (symbol)) @string.special.symbol
+  "'"
+  (symbol)) @string.special.symbol
 
 (list
- .
- (symbol) @_f
- (#eq? @_f "quote")) @string.special.symbol
-
-;; library
+  .
+  (symbol) @_f
+  (#eq? @_f "quote")) @string.special.symbol
 
+; library
 (list
- .
- (symbol) @_lib
- .
- (symbol) @module
-
- (#eq? @_lib "library"))
-
-;; builtin procedures
-;; procedures in R5RS and R6RS but not in R6RS-lib
+  .
+  (symbol) @_lib
+  .
+  (symbol) @module
+  (#eq? @_lib "library"))
 
+; builtin procedures
+; procedures in R5RS and R6RS but not in R6RS-lib
 ((symbol) @function.builtin
   ; format-ignore
   (#any-of? @function.builtin
@@ -180,4 +175,3 @@
     "write" "display" "newline" "write-char"
     ; system
     "load" "transcript-on" "transcript-off"))
-
diff --git a/queries/scheme/injections.scm b/queries/scheme/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/scheme/injections.scm
+++ b/queries/scheme/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/scss/highlights.scm b/queries/scss/highlights.scm
index b0801bb6f..7ca542c83 100644
--- a/queries/scss/highlights.scm
+++ b/queries/scss/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: css
-
 [
   "@at-root"
   "@debug"
@@ -27,39 +26,61 @@
 ] @keyword.repeat
 
 (single_line_comment) @comment @spell
-(function_name) @function
 
+(function_name) @function
 
 [
   ">="
   "<="
 ] @operator
 
+(mixin_statement
+  (name) @function)
 
-(mixin_statement (name) @function)
-(mixin_statement (parameters (parameter) @variable.parameter))
+(mixin_statement
+  (parameters
+    (parameter) @variable.parameter))
 
-(function_statement (name) @function)
-(function_statement (parameters (parameter) @variable.parameter))
+(function_statement
+  (name) @function)
+
+(function_statement
+  (parameters
+    (parameter) @variable.parameter))
 
 (plain_value) @string
+
 (keyword_query) @function
+
 (identifier) @variable
+
 (variable_name) @variable
 
-(each_statement (key) @variable.parameter)
-(each_statement (value) @variable.parameter)
-(each_statement (variable_value) @variable.parameter)
+(each_statement
+  (key) @variable.parameter)
 
-(for_statement (variable) @variable.parameter)
-(for_statement (_ (variable_value) @variable.parameter))
+(each_statement
+  (value) @variable.parameter)
+
+(each_statement
+  (variable_value) @variable.parameter)
+
+(for_statement
+  (variable) @variable.parameter)
+
+(for_statement
+  (_
+    (variable_value) @variable.parameter))
 
 (argument) @variable.parameter
-(arguments (variable_value) @variable.parameter)
+
+(arguments
+  (variable_value) @variable.parameter)
 
 [
   "["
   "]"
 ] @punctuation.bracket
 
-(include_statement (identifier) @function)
+(include_statement
+  (identifier) @function)
diff --git a/queries/scss/indents.scm b/queries/scss/indents.scm
index 902eee7bb..94490879d 100644
--- a/queries/scss/indents.scm
+++ b/queries/scss/indents.scm
@@ -1,7 +1,6 @@
 ; inherits: css
-
 [
- (mixin_statement)
- (while_statement)
- (each_statement)
+  (mixin_statement)
+  (while_statement)
+  (each_statement)
 ] @indent.begin
diff --git a/queries/slang/folds.scm b/queries/slang/folds.scm
index c8cc87643..9f2b933d1 100644
--- a/queries/slang/folds.scm
+++ b/queries/slang/folds.scm
@@ -1,9 +1,8 @@
 ; inherits: hlsl
-
 [
- (interface_specifier)
- (extension_specifier)
- (property_declaration)
- (subscript_declaration)
- (init_declaration)
+  (interface_specifier)
+  (extension_specifier)
+  (property_declaration)
+  (subscript_declaration)
+  (init_declaration)
 ] @fold
diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
index e93682eee..2e01fcb98 100644
--- a/queries/slang/highlights.scm
+++ b/queries/slang/highlights.scm
@@ -1,41 +1,42 @@
 ; inherits: hlsl
-
 [
- "var"
- "let"
- "This"
+  "var"
+  "let"
+  "This"
 ] @type.builtin
 
 [
- "interface"
- "extension"
- "property"
-] @keyword 
+  "interface"
+  "extension"
+  "property"
+] @keyword
+
+"__init" @constructor
 
 [
- "__init"
-] @constructor
-
-[
- "__subscript"
- "get"
- "set"
+  "__subscript"
+  "get"
+  "set"
 ] @function.builtin
 
-(interface_requirements (identifier) @type)
+(interface_requirements
+  (identifier) @type)
 
 (binary_expression
-  ["is" "as"]
+  [
+    "is"
+    "as"
+  ]
   right: (identifier) @type)
 
 [
- "as"
- "is"
+  "as"
+  "is"
 ] @keyword.operator
 
 [
- "__exported"
- "import"
+  "__exported"
+  "import"
 ] @keyword.import
 
 (property_declaration
diff --git a/queries/slang/indents.scm b/queries/slang/indents.scm
index 6175ac5bc..f07cb0562 100644
--- a/queries/slang/indents.scm
+++ b/queries/slang/indents.scm
@@ -1,5 +1,4 @@
 ; inherits: hlsl
-
 [
   (interface_specifier)
   (extension_specifier)
diff --git a/queries/slang/injections.scm b/queries/slang/injections.scm
index bf83e478a..2fd39cba0 100644
--- a/queries/slang/injections.scm
+++ b/queries/slang/injections.scm
@@ -1,5 +1,5 @@
 ((preproc_arg) @injection.content
- (#set! injection.language "slang"))
+  (#set! injection.language "slang"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index a4fc7f4f3..673fc643d 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -1,154 +1,177 @@
 (identifier) @variable
+
 (type_identifier) @type
+
 (comment) @comment @spell
+
 (int_literal) @number
+
 (float_literal) @number.float
+
 (string_literal) @string
+
 (function_identifier) @function
+
 [
-(image_macro)
-(children_macro)
-(radial_grad_macro)
-(linear_grad_macro)
+  (image_macro)
+  (children_macro)
+  (radial_grad_macro)
+  (linear_grad_macro)
 ] @function.macro
+
 (call_expression
   function: (identifier) @function.call)
+
 (call_expression
-  function: (field_expression
-    field: (identifier) @function.call))
+  function:
+    (field_expression
+      field: (identifier) @function.call))
+
 (vis) @keyword.import
+
 (units) @type
+
 (array_literal
   (identifier) @type)
-(transition_statement state: (identifier) @variable.member)
-(state_expression state: (identifier) @variable.member)
+
+(transition_statement
+  state: (identifier) @variable.member)
+
+(state_expression
+  state: (identifier) @variable.member)
+
 (struct_block_definition
   (identifier) @variable.member)
 
 ; (state_identifier) @variable.member
-
 [
-"in"
-"for"
+  "in"
+  "for"
 ] @keyword.repeat
 
 "@" @keyword
 
 [
-"import"
-"from"
+  "import"
+  "from"
 ] @keyword.import
 
 [
-"if"
-"else"
+  "if"
+  "else"
 ] @keyword.conditional
 
 [
-"root"
-"parent"
-"duration"
-"easing"
+  "root"
+  "parent"
+  "duration"
+  "easing"
 ] @variable.builtin
 
 [
-"true"
-"false"
+  "true"
+  "false"
 ] @boolean
 
-
 [
-"struct"
-"property"
-"callback"
-"in"
-"animate"
-"states"
-"when"
-"out"
-"transitions"
-"global"
+  "struct"
+  "property"
+  "callback"
+  "in"
+  "animate"
+  "states"
+  "when"
+  "out"
+  "transitions"
+  "global"
 ] @keyword
 
 [
-"black"
-"transparent"
-"blue"
-"ease"
-"ease_in"
-"ease-in"
-"ease_in_out"
-"ease-in-out"
-"ease_out"
-"ease-out"
-"end"
-"green"
-"red"
-"red"
-"start"
-"yellow"
-"white"
-"gray"
+  "black"
+  "transparent"
+  "blue"
+  "ease"
+  "ease_in"
+  "ease-in"
+  "ease_in_out"
+  "ease-in-out"
+  "ease_out"
+  "ease-out"
+  "end"
+  "green"
+  "red"
+  "red"
+  "start"
+  "yellow"
+  "white"
+  "gray"
 ] @constant.builtin
 
-
 ; Punctuation
 [
-","
-"."
-";"
-":"
+  ","
+  "."
+  ";"
+  ":"
 ] @punctuation.delimiter
 
 ; Brackets
 [
-"("
-")"
-"["
-"]"
-"{"
-"}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
-(define_property ["<" ">"] @punctuation.bracket)
+(define_property
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 [
-"angle"
-"bool"
-"brush"
-"color"
-"float"
-"image"
-"int"
-"length"
-"percent"
-"physical-length"
-"physical_length"
-"string"
+  "angle"
+  "bool"
+  "brush"
+  "color"
+  "float"
+  "image"
+  "int"
+  "length"
+  "percent"
+  "physical-length"
+  "physical_length"
+  "string"
 ] @type.builtin
 
 [
- ":="
- "<=>"
- "!"
- "-"
- "+"
- "*"
- "/"
- "&&"
- "||"
- ">"
- "<"
- ">="
- "<="
- "="
- ":"
- "+="
- "-="
- "*="
- "/="
- "?"
- "=>"
- ] @operator
+  ":="
+  "<=>"
+  "!"
+  "-"
+  "+"
+  "*"
+  "/"
+  "&&"
+  "||"
+  ">"
+  "<"
+  ">="
+  "<="
+  "="
+  ":"
+  "+="
+  "-="
+  "*="
+  "/="
+  "?"
+  "=>"
+] @operator
 
-(ternary_expression [":" "?"] @keyword.conditional.ternary)
+(ternary_expression
+  [
+    ":"
+    "?"
+  ] @keyword.conditional.ternary)
diff --git a/queries/slint/indents.scm b/queries/slint/indents.scm
index db79aa0d5..587a8ecf3 100644
--- a/queries/slint/indents.scm
+++ b/queries/slint/indents.scm
@@ -1,10 +1,10 @@
 [
-(comp_body) 
-(state_statement)
-(transition_statement)
-(handler_body)
-(consequence_body)
-(global_single)
+  (comp_body)
+  (state_statement)
+  (transition_statement)
+  (handler_body)
+  (consequence_body)
+  (global_single)
 ] @indent.begin
 
 "}" @indent.end
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 9668c59ba..f1d56dbca 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -1,59 +1,69 @@
 ; Types
-
 (class_identifier
   (identifier) @type)
 
 (primitive_type) @type.builtin
 
 ((class_identifier
-   . (identifier) @_first @type.builtin
-   (identifier) @type.builtin)
+  .
+  (identifier) @_first @type.builtin
+  (identifier) @type.builtin)
   (#any-of? @_first "android" "dalvik" "java" "kotlinx"))
 
 ((class_identifier
-   . (identifier) @_first @type.builtin
-   .  (identifier) @_second @type.builtin
-   (identifier) @type.builtin)
+  .
+  (identifier) @_first @type.builtin
+  .
+  (identifier) @_second @type.builtin
+  (identifier) @type.builtin)
   (#eq? @_first "com")
   (#any-of? @_second "android" "google"))
 
 ; Methods
-
 (method_definition
-  (method_signature (method_identifier) @function.method))
+  (method_signature
+    (method_identifier) @function.method))
 
 (expression
   (opcode) @_invoke
-	(body
-	  (full_method_signature
-      (method_signature (method_identifier) @function.method.call)))
+  (body
+    (full_method_signature
+      (method_signature
+        (method_identifier) @function.method.call)))
   (#lua-match? @_invoke "^invoke"))
 
 (method_handle
   (full_method_signature
-	(method_signature (method_identifier) @function.method.call)))
+    (method_signature
+      (method_identifier) @function.method.call)))
 
 (custom_invoke
-  . (identifier) @function.method.call
-  (method_signature (method_identifier) @function.method.call))
+  .
+  (identifier) @function.method.call
+  (method_signature
+    (method_identifier) @function.method.call))
 
 (annotation_value
   (body
-    (method_signature (method_identifier) @function.method.call)))
+    (method_signature
+      (method_identifier) @function.method.call)))
 
 (annotation_value
   (body
     (full_method_signature
-      (method_signature (method_identifier) @function.method.call))))
+      (method_signature
+        (method_identifier) @function.method.call))))
 
 (field_definition
-	(body
-		(method_signature (method_identifier) @function.method.call)))
+  (body
+    (method_signature
+      (method_identifier) @function.method.call)))
 
 (field_definition
-	(body
-	  (full_method_signature
-		  (method_signature (method_identifier) @function.method.call))))
+  (body
+    (full_method_signature
+      (method_signature
+        (method_identifier) @function.method.call))))
 
 ((method_identifier) @constructor
   (#any-of? @constructor "<init>" "<clinit>"))
@@ -61,7 +71,6 @@
 "constructor" @constructor
 
 ; Fields
-
 [
   (field_identifier)
   (annotation_key)
@@ -71,26 +80,23 @@
   (#lua-match? @constant "^[%u_]*$"))
 
 ; Variables
-
 (variable) @variable.builtin
 
 (local_directive
   (identifier) @variable)
 
 ; Parameters
-
 (parameter) @variable.parameter.builtin
+
 (param_identifier) @variable.parameter
 
 ; Labels
-
 [
   (label)
   (jmp_label)
 ] @label
 
 ; Operators
-
 (opcode) @keyword.operator
 
 ((opcode) @keyword.return
@@ -114,7 +120,6 @@
 ] @operator
 
 ; Keywords
-
 [
   ".class"
   ".super"
@@ -146,9 +151,7 @@
   (epilogue_directive)
 ] @keyword
 
-[
-  ".source"
-] @keyword.import
+".source" @keyword.import
 
 [
   ".method"
@@ -161,9 +164,14 @@
 ] @keyword.exception
 
 ; Literals
-
 (string) @string
-(source_directive (string "\"" _ @string.special.url "\""))
+
+(source_directive
+  (string
+    "\""
+    _ @string.special.url
+    "\""))
+
 (escape_sequence) @string.escape
 
 (character) @character
@@ -173,9 +181,9 @@
 (number) @number
 
 [
- (float)
- (NaN)
- (Infinity)
+  (float)
+  (NaN)
+  (Infinity)
 ] @number.float
 
 (boolean) @boolean
@@ -183,7 +191,6 @@
 (null) @constant.builtin
 
 ; Misc
-
 (annotation_visibility) @keyword.storage
 
 (access_modifier) @type.qualifier
@@ -191,9 +198,15 @@
 (array_type
   "[" @punctuation.special)
 
-["{" "}"] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-["(" ")"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   "->"
@@ -204,10 +217,10 @@
   "/"
 ] @punctuation.delimiter
 
-(line_directive (number) @string.special)
+(line_directive
+  (number) @string.special)
 
 ; Comments
-
 (comment) @comment @spell
 
 (class_definition
diff --git a/queries/smali/indents.scm b/queries/smali/indents.scm
index c61d9528a..b4f37ddb4 100644
--- a/queries/smali/indents.scm
+++ b/queries/smali/indents.scm
@@ -24,7 +24,10 @@
   "}"
 ] @indent.end @indent.branch
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/smali/injections.scm b/queries/smali/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/smali/injections.scm
+++ b/queries/smali/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/smali/locals.scm b/queries/smali/locals.scm
index 77852a21d..a34b799ba 100644
--- a/queries/smali/locals.scm
+++ b/queries/smali/locals.scm
@@ -31,7 +31,8 @@
 (annotation_key) @local.definition.field
 
 (method_definition
-  (method_signature (method_identifier) @local.definition.method))
+  (method_signature
+    (method_identifier) @local.definition.method))
 
 (param_identifier) @local.definition.parameter
 
diff --git a/queries/smithy/highlights.scm b/queries/smithy/highlights.scm
index bb54dad73..1d0321864 100644
--- a/queries/smithy/highlights.scm
+++ b/queries/smithy/highlights.scm
@@ -1,20 +1,15 @@
 ; Preproc
-
 (control_key) @keyword.directive
 
 ; Namespace
-
 (namespace) @module
 
 ; Includes
-
-[
-  "use"
-] @keyword.import
+"use" @keyword.import
 
 ; Builtins
-
 (primitive) @type.builtin
+
 [
   "enum"
   "intEnum"
@@ -24,35 +19,35 @@
 ] @type.builtin
 
 ; Fields (Members)
-
 ; (field) @variable.member
-
 (key_identifier) @variable.member
+
 (shape_member
   (field) @variable.member)
+
 (operation_field) @variable.member
+
 (operation_error_field) @variable.member
 
 ; Constants
-
 (enum_member
   (enum_field) @constant)
 
 ; Types
-
 (identifier) @type
+
 (structure_resource
   (shape_id) @type)
 
 ; Attributes
-
 (mixins
   (shape_id) @attribute)
+
 (trait_statement
-  (shape_id (#set! "priority" 105)) @attribute)
+  (shape_id
+    (#set! "priority" 105)) @attribute)
 
 ; Operators
-
 [
   "@"
   "-"
@@ -61,7 +56,6 @@
 ] @operator
 
 ; Keywords
-
 [
   "namespace"
   "service"
@@ -76,8 +70,8 @@
 ] @keyword
 
 ; Literals
-
 (string) @string
+
 (escape_sequence) @string.escape
 
 (number) @number
@@ -89,17 +83,25 @@
 (null) @constant.builtin
 
 ; Misc
-
 [
   "$"
   "#"
 ] @punctuation.special
 
-["{" "}"] @punctuation.bracket
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-["(" ")"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-["[" "]"] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   ":"
@@ -107,7 +109,6 @@
 ] @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
 
 (documentation_comment) @comment.documentation @spell
diff --git a/queries/snakemake/highlights.scm b/queries/snakemake/highlights.scm
index 07f86e40d..65789ea96 100644
--- a/queries/snakemake/highlights.scm
+++ b/queries/snakemake/highlights.scm
@@ -1,63 +1,76 @@
 ; inherits: python
+; Compound directives
+[
+  "rule"
+  "checkpoint"
+  "module"
+] @keyword
 
-;; Compound directives
-["rule" "checkpoint" "module"] @keyword
+; Top level directives (eg. configfile, include)
+(module
+  (directive
+    name: _ @keyword))
 
-;; Top level directives (eg. configfile, include)
-(module (directive name: _ @keyword))
+; Subordinate directives (eg. input, output)
+(_
+  body:
+    (_
+      (directive
+        name: _ @label)))
 
-;; Subordinate directives (eg. input, output)
-(_ body: (_ (directive name: _ @label)))
+; rule/module/checkpoint names
+(rule_definition
+  name: (identifier) @type)
 
-;; rule/module/checkpoint names
-(rule_definition name: (identifier) @type)
-(module_definition name: (identifier) @type)
-(checkpoint_definition name: (identifier) @type)
+(module_definition
+  name: (identifier) @type)
 
+(checkpoint_definition
+  name: (identifier) @type)
 
-;; Rule imports
+; Rule imports
 (rule_import
   "use" @keyword.import
   "rule" @keyword.import
   "from" @keyword.import
   "as"? @keyword.import
-  "with"? @keyword.import
-)
+  "with"? @keyword.import)
 
-
-;; Rule inheritance
+; Rule inheritance
 (rule_inheritance
   "use" @keyword
   "rule" @keyword
-  "with" @keyword
-)
+  "with" @keyword)
 
+; Wildcard names
+(wildcard
+  (identifier) @variable)
 
-;; Wildcard names
-(wildcard (identifier) @variable)
-
-
-;; builtin variables
+; builtin variables
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "checkpoints" "config" "gather" "rules" "scatter" "workflow"))
 
-
-;; References to directive labels in wildcard interpolations
-
-;; the #any-of? queries are moved above the #has-ancestor? queries to
-;; short-circuit the potentially expensive tree traversal, if possible
-;; see:
-;; https://github.com/nvim-treesitter/nvim-treesitter/pull/4302#issuecomment-1685789790
-
-;; directive labels in wildcard context
-((wildcard (identifier) @label)
-  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
-((wildcard (attribute object: (identifier) @label))
-  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
-((wildcard (subscript value: (identifier) @label))
+; References to directive labels in wildcard interpolations
+; the #any-of? queries are moved above the #has-ancestor? queries to
+; short-circuit the potentially expensive tree traversal, if possible
+; see:
+; https://github.com/nvim-treesitter/nvim-treesitter/pull/4302#issuecomment-1685789790
+; directive labels in wildcard context
+((wildcard
+  (identifier) @label)
   (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
 
-;; directive labels in block context (eg. within 'run:')
+((wildcard
+  (attribute
+    object: (identifier) @label))
+  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+
+((wildcard
+  (subscript
+    value: (identifier) @label))
+  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+
+; directive labels in block context (eg. within 'run:')
 ((identifier) @label
   (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards")
   (#has-ancestor? @label "directive")
diff --git a/queries/snakemake/injections.scm b/queries/snakemake/injections.scm
index dd41cbadb..82072f2ad 100644
--- a/queries/snakemake/injections.scm
+++ b/queries/snakemake/injections.scm
@@ -1,4 +1,4 @@
 ; inherits: python
-
-(wildcard (constraint) @injection.content
+(wildcard
+  (constraint) @injection.content
   (#set! injection.language "regex"))
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 70ad31a1b..81c68f9d3 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -1,12 +1,12 @@
 ; Pragma
-
 [
-  "pragma" 
+  "pragma"
   "solidity"
 ] @keyword.directive
 
 (solidity_pragma_token
   "||" @string.special.symbol)
+
 (solidity_pragma_token
   "-" @string.special.symbol)
 
@@ -15,10 +15,9 @@
 (solidity_version) @string.special
 
 ; Literals
-
 [
- (string)
- (yul_string_literal)
+  (string)
+  (yul_string_literal)
 ] @string
 
 (hex_string_literal
@@ -30,77 +29,114 @@
   (_) @string)
 
 [
- (number_literal)
- (yul_decimal_number)
- (yul_hex_number)
+  (number_literal)
+  (yul_decimal_number)
+  (yul_hex_number)
 ] @number
 
 (yul_boolean) @boolean
 
 ; Variables
-
 [
   (identifier)
   (yul_identifier)
 ] @variable
 
 ; Types
+(type_name
+  (identifier) @type)
 
-(type_name (identifier) @type)
-(type_name (user_defined_type (identifier) @type))
-(type_name "mapping" @function.builtin)
+(type_name
+  (user_defined_type
+    (identifier) @type))
+
+(type_name
+  "mapping" @function.builtin)
 
 [
   (primitive_type)
   (number_unit)
 ] @type.builtin
 
-(contract_declaration name: (identifier) @type)
-(struct_declaration name: (identifier) @type)
-(struct_member name: (identifier) @variable.member)
-(enum_declaration name: (identifier) @type)
-(emit_statement . (identifier) @type)
+(contract_declaration
+  name: (identifier) @type)
+
+(struct_declaration
+  name: (identifier) @type)
+
+(struct_member
+  name: (identifier) @variable.member)
+
+(enum_declaration
+  name: (identifier) @type)
+
+(emit_statement
+  .
+  (identifier) @type)
+
 ; Handles ContractA, ContractB in function foo() override(ContractA, contractB) {}
-(override_specifier (user_defined_type) @type)
+(override_specifier
+  (user_defined_type) @type)
 
 ; Functions and parameters
-
 (function_definition
   name: (identifier) @function)
+
 (modifier_definition
   name: (identifier) @function)
+
 (yul_evm_builtin) @function.builtin
 
 ; Use constructor coloring for special functions
-(constructor_definition "constructor" @constructor)
+(constructor_definition
+  "constructor" @constructor)
 
-(modifier_invocation (identifier) @function)
+(modifier_invocation
+  (identifier) @function)
 
 ; Handles expressions like structVariable.g();
-(call_expression . (member_expression (identifier) @function.method.call))
+(call_expression
+  .
+  (member_expression
+    (identifier) @function.method.call))
 
 ; Handles expressions like g();
-(call_expression . (identifier) @function.call)
+(call_expression
+  .
+  (identifier) @function.call)
 
 ; Function parameters
-(event_paramater name: (identifier) @variable.parameter)
-(parameter name: (identifier) @variable.parameter)
+(event_paramater
+  name: (identifier) @variable.parameter)
+
+(parameter
+  name: (identifier) @variable.parameter)
 
 ; Yul functions
-(yul_function_call function: (yul_identifier) @function.call)
+(yul_function_call
+  function: (yul_identifier) @function.call)
 
 ; Yul function parameters
-(yul_function_definition . (yul_identifier) @function (yul_identifier) @variable.parameter)
+(yul_function_definition
+  .
+  (yul_identifier) @function
+  (yul_identifier) @variable.parameter)
 
-(meta_type_expression "type" @keyword)
+(meta_type_expression
+  "type" @keyword)
+
+(member_expression
+  property: (identifier) @variable.member)
+
+(call_struct_argument
+  name: (identifier) @variable.member)
+
+(struct_field_assignment
+  name: (identifier) @variable.member)
 
-(member_expression property: (identifier) @variable.member)
-(call_struct_argument name: (identifier) @variable.member)
-(struct_field_assignment name: (identifier) @variable.member)
 (enum_value) @constant
 
 ; Keywords
-
 [
   "contract"
   "interface"
@@ -124,8 +160,8 @@
 
 ; FIXME: update grammar
 ; (block_statement "unchecked" @keyword)
-
-(event_paramater "indexed" @keyword)
+(event_paramater
+  "indexed" @keyword)
 
 [
   "public"
@@ -180,21 +216,35 @@
 "function" @keyword.function
 
 [
-  "import" 
+  "import"
   "using"
 ] @keyword.import
-(import_directive "as" @keyword.import)
-(import_directive "from" @keyword.import)
-((import_directive source: (string) @string.special.path)
+
+(import_directive
+  "as" @keyword.import)
+
+(import_directive
+  "from" @keyword.import)
+
+((import_directive
+  source: (string) @string.special.path)
   (#offset! @string.special.path 0 1 0 -1))
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
-
-[ "(" ")" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
 [
   "."
@@ -207,7 +257,6 @@
 ] @punctuation.delimiter
 
 ; Operators
-
 [
   "&&"
   "||"
@@ -245,14 +294,15 @@
   "new"
 ] @keyword.operator
 
-(import_directive "*" @character.special)
+(import_directive
+  "*" @character.special)
 
 ; Comments
-
 (comment) @comment @spell
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///[^/]"))
+
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index def688ab2..f54a2f960 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -18,22 +18,25 @@
 (when_expression
   (field_list
     (dotted_identifier
-      (identifier) @property )))
+      (identifier) @property)))
 
 (else_expression
   (field_list
-    (identifier) @property ))
+    (identifier) @property))
 
 (else_expression
   (field_list
     (dotted_identifier
-      (identifier) @property )))
+      (identifier) @property)))
 
 (alias_expression
   (identifier) @label)
 
 (storage_identifier) @keyword.storage
-(_ function_name: (identifier) @function)
+
+(_
+  function_name: (identifier) @function)
+
 (date_literal) @string.special
 
 [
@@ -62,17 +65,25 @@
   ">="
 ] @operator
 
-(value_comparison_operator  [ "<" ">" ] @operator)
+(value_comparison_operator
+  [
+    "<"
+    ">"
+  ] @operator)
 
-(set_comparison_operator "IN" @keyword.operator)
+(set_comparison_operator
+  "IN" @keyword.operator)
 
 [
   (int)
   (decimal)
   (currency_literal)
 ] @number
+
 (string_literal) @string
+
 (date) @variable.readonly
+
 (date_time) @variable.readonly
 
 [
@@ -146,5 +157,3 @@
   "User_Mode"
   "UserId"
 ] @keyword
-
-
diff --git a/queries/sosl/highlights.scm b/queries/sosl/highlights.scm
index 085247b2c..f3b77be3b 100644
--- a/queries/sosl/highlights.scm
+++ b/queries/sosl/highlights.scm
@@ -1,10 +1,12 @@
 (find_clause
-          (term) @string )
+  (term) @string)
 
 (sobject_return
-        (identifier) @type )
+  (identifier) @type)
 
-(with_type (_ "=" @operator))
+(with_type
+  (_
+    "=" @operator))
 
 [
   "ALL"
diff --git a/queries/sparql/highlights.scm b/queries/sparql/highlights.scm
index 0a4b6a84c..db4e5a4d0 100644
--- a/queries/sparql/highlights.scm
+++ b/queries/sparql/highlights.scm
@@ -26,7 +26,6 @@
   "a"
 ] @variable.builtin
 
-
 [
   "ADD"
   "ALL"
@@ -78,13 +77,16 @@
 ] @keyword
 
 (string) @string
+
 (echar) @string.escape
 
 (integer) @number
+
 [
   (decimal)
   (double)
 ] @number.float
+
 (boolean_literal) @boolean
 
 [
@@ -172,36 +174,75 @@
 
 [
   "IN"
-  ("NOT" "IN")
+  ("NOT"
+    "IN")
 ] @keyword.operator
 
-
 (comment) @comment @spell
 
-
 ; Could this be summarized?
-(select_clause 
+(select_clause
   [
     bound_variable: (var)
     "*"
   ] @variable.parameter)
-(bind bound_variable: (var) @variable.parameter)
-(data_block bound_variable: (var) @variable.parameter)
-(group_condition bound_variable: (var) @variable.parameter)
 
-(iri_reference ["<" ">"] @module)
+(bind
+  bound_variable: (var) @variable.parameter)
+
+(data_block
+  bound_variable: (var) @variable.parameter)
+
+(group_condition
+  bound_variable: (var) @variable.parameter)
+
+(iri_reference
+  [
+    "<"
+    ">"
+  ] @module)
 
 (lang_tag) @type
-(rdf_literal 
+
+(rdf_literal
   "^^" @type
-	datatype: (_ ["<" ">" (namespace)] @type) @type)
+  datatype:
+    (_
+      [
+        "<"
+        ">"
+        (namespace)
+      ] @type) @type)
 
-(function_call identifier: (_) @function)
+(function_call
+  identifier: (_) @function)
 
-(function_call identifier: (iri_reference ["<" ">"] @function))
-(function_call identifier: (prefixed_name (namespace) @function))
-(base_declaration (iri_reference ["<" ">"] @variable))
-(prefix_declaration (iri_reference ["<" ">"] @variable))
+(function_call
+  identifier:
+    (iri_reference
+      [
+        "<"
+        ">"
+      ] @function))
+
+(function_call
+  identifier:
+    (prefixed_name
+      (namespace) @function))
+
+(base_declaration
+  (iri_reference
+    [
+      "<"
+      ">"
+    ] @variable))
+
+(prefix_declaration
+  (iri_reference
+    [
+      "<"
+      ">"
+    ] @variable))
 
 [
   (var)
diff --git a/queries/sparql/indents.scm b/queries/sparql/indents.scm
index a0cee376c..e070546df 100644
--- a/queries/sparql/indents.scm
+++ b/queries/sparql/indents.scm
@@ -9,6 +9,7 @@
   (blank_node_property_list)
   (collection)
 ] @indent.begin
+
 [
   "}"
   "]"
diff --git a/queries/sparql/injections.scm b/queries/sparql/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/sparql/injections.scm
+++ b/queries/sparql/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/sparql/locals.scm b/queries/sparql/locals.scm
index ba157a4d5..accf0d1d6 100644
--- a/queries/sparql/locals.scm
+++ b/queries/sparql/locals.scm
@@ -1,8 +1,14 @@
-(group_graph_pattern (triples_block) @local.scope)
+(group_graph_pattern
+  (triples_block) @local.scope)
 
-((sub_select (select_clause (var) @local.definition.var))
- (#set! "definition.var.scope" "parent"))
-((select_query (select_clause (var) @local.definition.var))
- (#set! "definition.var.scope" "parent"))
+((sub_select
+  (select_clause
+    (var) @local.definition.var))
+  (#set! "definition.var.scope" "parent"))
+
+((select_query
+  (select_clause
+    (var) @local.definition.var))
+  (#set! "definition.var.scope" "parent"))
 
 (var) @local.reference
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index aaadd0e2c..6c3530ae0 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -25,80 +25,83 @@
   alias: (identifier) @variable)
 
 ((term
-   value: (cast
-    name: (keyword_cast) @function.call
-    parameter: [(literal)]?)))
+  value:
+    (cast
+      name: (keyword_cast) @function.call
+      parameter: (literal)?)))
 
 (literal) @string
+
 (comment) @comment @spell
+
 (marginalia) @comment
 
 ((literal) @number
- (#lua-match? @number "^%d+$"))
+  (#lua-match? @number "^%d+$"))
 
 ((literal) @number.float
-(#lua-match? @number.float "^[-]?%d*\.%d*$"))
+  (#lua-match? @number.float "^[-]?%d*\.%d*$"))
 
 (parameter) @variable.parameter
 
 [
- (keyword_true)
- (keyword_false)
+  (keyword_true)
+  (keyword_false)
 ] @boolean
 
 [
- (keyword_asc)
- (keyword_desc)
- (keyword_terminated)
- (keyword_escaped)
- (keyword_unsigned)
- (keyword_nulls)
- (keyword_last)
- (keyword_delimited)
- (keyword_replication)
- (keyword_auto_increment)
- (keyword_default)
- (keyword_collate)
- (keyword_concurrently)
- (keyword_engine)
- (keyword_always)
- (keyword_generated)
- (keyword_preceding)
- (keyword_following)
- (keyword_first)
- (keyword_current_timestamp)
- (keyword_immutable)
- (keyword_atomic)
- (keyword_parallel)
- (keyword_leakproof)
- (keyword_safe)
- (keyword_cost)
- (keyword_strict)
+  (keyword_asc)
+  (keyword_desc)
+  (keyword_terminated)
+  (keyword_escaped)
+  (keyword_unsigned)
+  (keyword_nulls)
+  (keyword_last)
+  (keyword_delimited)
+  (keyword_replication)
+  (keyword_auto_increment)
+  (keyword_default)
+  (keyword_collate)
+  (keyword_concurrently)
+  (keyword_engine)
+  (keyword_always)
+  (keyword_generated)
+  (keyword_preceding)
+  (keyword_following)
+  (keyword_first)
+  (keyword_current_timestamp)
+  (keyword_immutable)
+  (keyword_atomic)
+  (keyword_parallel)
+  (keyword_leakproof)
+  (keyword_safe)
+  (keyword_cost)
+  (keyword_strict)
 ] @attribute
 
 [
- (keyword_materialized)
- (keyword_recursive)
- (keyword_temp)
- (keyword_temporary)
- (keyword_unlogged)
- (keyword_external)
- (keyword_parquet)
- (keyword_csv)
- (keyword_rcfile)
- (keyword_textfile)
- (keyword_orc)
- (keyword_avro)
- (keyword_jsonfile)
- (keyword_sequencefile)
- (keyword_volatile)
+  (keyword_materialized)
+  (keyword_recursive)
+  (keyword_temp)
+  (keyword_temporary)
+  (keyword_unlogged)
+  (keyword_external)
+  (keyword_parquet)
+  (keyword_csv)
+  (keyword_rcfile)
+  (keyword_textfile)
+  (keyword_orc)
+  (keyword_avro)
+  (keyword_jsonfile)
+  (keyword_sequencefile)
+  (keyword_volatile)
 ] @keyword.storage
 
 [
- (keyword_case)
- (keyword_when)
- (keyword_then)
- (keyword_else)
+  (keyword_case)
+  (keyword_when)
+  (keyword_then)
+  (keyword_else)
 ] @keyword.conditional
 
 [
@@ -307,29 +310,29 @@
 ] @keyword
 
 [
- (keyword_restrict)
- (keyword_unbounded)
- (keyword_unique)
- (keyword_cascade)
- (keyword_delayed)
- (keyword_high_priority)
- (keyword_low_priority)
- (keyword_ignore)
- (keyword_nothing)
- (keyword_check)
- (keyword_option)
- (keyword_local)
- (keyword_cascaded)
- (keyword_wait)
- (keyword_nowait)
- (keyword_metadata)
- (keyword_incremental)
- (keyword_bin_pack)
- (keyword_noscan)
- (keyword_stats)
- (keyword_statistics)
- (keyword_maxvalue)
- (keyword_minvalue)
+  (keyword_restrict)
+  (keyword_unbounded)
+  (keyword_unique)
+  (keyword_cascade)
+  (keyword_delayed)
+  (keyword_high_priority)
+  (keyword_low_priority)
+  (keyword_ignore)
+  (keyword_nothing)
+  (keyword_check)
+  (keyword_option)
+  (keyword_local)
+  (keyword_cascaded)
+  (keyword_wait)
+  (keyword_nowait)
+  (keyword_metadata)
+  (keyword_incremental)
+  (keyword_bin_pack)
+  (keyword_noscan)
+  (keyword_stats)
+  (keyword_statistics)
+  (keyword_maxvalue)
+  (keyword_minvalue)
 ] @type.qualifier
 
 [
diff --git a/queries/sql/indents.scm b/queries/sql/indents.scm
index b09f9b5bd..34ae079dd 100644
--- a/queries/sql/indents.scm
+++ b/queries/sql/indents.scm
@@ -1,27 +1,29 @@
 [
- (select)
- (cte)
- (column_definitions)
- (case)
- (subquery)
- (insert)
- (when_clause)
+  (select)
+  (cte)
+  (column_definitions)
+  (case)
+  (subquery)
+  (insert)
+  (when_clause)
 ] @indent.begin
 
 (block
-  (keyword_begin)
-) @indent.begin
+  (keyword_begin)) @indent.begin
 
-(column_definitions ")" @indent.branch)
+(column_definitions
+  ")" @indent.branch)
 
-(subquery ")" @indent.branch)
+(subquery
+  ")" @indent.branch)
 
-(cte ")" @indent.branch)
+(cte
+  ")" @indent.branch)
 
 [
- (keyword_end)
- (keyword_values)
- (keyword_into)
+  (keyword_end)
+  (keyword_values)
+  (keyword_into)
 ] @indent.branch
 
 (keyword_end) @indent.end
diff --git a/queries/sql/injections.scm b/queries/sql/injections.scm
index b298ff22f..602997440 100644
--- a/queries/sql/injections.scm
+++ b/queries/sql/injections.scm
@@ -1,6 +1,5 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((marginalia) @injection.content
- (#set! injection.language "comment"))
-
+  (#set! injection.language "comment"))
diff --git a/queries/squirrel/folds.scm b/queries/squirrel/folds.scm
index db0b9c581..c2903cc66 100644
--- a/queries/squirrel/folds.scm
+++ b/queries/squirrel/folds.scm
@@ -3,18 +3,14 @@
   (function_declaration)
   (member_declaration)
   (enum_declaration)
-
   (array)
   (block)
   (table)
   (anonymous_function)
   (parenthesized_expression)
-
   (string)
   (verbatim_string)
-
   (comment)
-
   (if_statement)
   (else_statement)
   (while_statement)
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index e7ac9150e..66bc2247c 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -1,5 +1,4 @@
 ; Keywords
-
 [
   "class"
   "clone"
@@ -11,9 +10,7 @@
   "var"
 ] @keyword
 
-[
-  "function"
-] @keyword.function
+"function" @keyword.function
 
 [
   "in"
@@ -27,12 +24,11 @@
 ] @keyword.return
 
 ((global_variable
-   "::"
-   (_) @keyword.coroutine)
+  "::"
+  (_) @keyword.coroutine)
   (#any-of? @keyword.coroutine "suspend" "newthread"))
 
 ; Conditionals
-
 [
   "if"
   "else"
@@ -43,7 +39,6 @@
 ] @keyword.conditional
 
 ; Repeats
-
 [
   "for"
   "foreach"
@@ -53,7 +48,6 @@
 ] @keyword.repeat
 
 ; Exceptions
-
 [
   "try"
   "catch"
@@ -61,26 +55,21 @@
 ] @keyword.exception
 
 ; Storageclasses
-
-[
-  "local"
-] @keyword.storage
+"local" @keyword.storage
 
 ; Qualifiers
-
 [
   "static"
   "const"
 ] @type.qualifier
 
 ; Variables
-
-(identifier) @variable 
+(identifier) @variable
 
 (local_declaration
   (identifier) @variable.local
-  . "=")
-
+  .
+  "=")
 
 (global_variable) @variable.global
 
@@ -88,58 +77,76 @@
   (#any-of? @variable.builtin "base" "this" "vargv"))
 
 ; Parameters
-
 (parameter
-  . (identifier) @variable.parameter)
+  .
+  (identifier) @variable.parameter)
 
 ; Properties (Slots)
-
 (deref_expression
   "."
-  . (identifier) @property)
+  .
+  (identifier) @property)
 
 (member_declaration
   (identifier) @property
-  . "=")
+  .
+  "=")
 
 ((table_slot
-  . (identifier) @property
-  . ["=" ":"])
+  .
+  (identifier) @property
+  .
+  [
+    "="
+    ":"
+  ])
   (#set! "priority" 105))
 
 ; Types
-
 ((identifier) @type
- (#lua-match? @type "^[A-Z]"))
+  (#lua-match? @type "^[A-Z]"))
 
 (class_declaration
   (identifier) @type
-  "extends"? . (identifier)? @type)
+  "extends"?
+  .
+  (identifier)? @type)
 
 (enum_declaration
   (identifier) @type)
 
 ; Attributes
-
 (attribute_declaration
   left: (identifier) @attribute)
 
 ; Functions & Methods
-
 (member_declaration
   (function_declaration
-    "::"? (_) @function.method . "(" (_)? ")"))
+    "::"?
+    (_) @function.method
+    .
+    "("
+    (_)?
+    ")"))
 
 ((function_declaration
-   "::"? (_) @function . "(" (_)? ")")
+  "::"?
+  (_) @function
+  .
+  "("
+  (_)?
+  ")")
   (#not-has-ancestor? @function member_declaration))
 
 (call_expression
   function: (identifier) @function.call)
 
 (call_expression
-  function: (deref_expression
-    "." . (identifier) @function.call))
+  function:
+    (deref_expression
+      "."
+      .
+      (identifier) @function.call))
 
 (call_expression
   (global_variable
@@ -152,11 +159,17 @@
   (lambda_expression
     "@" @string.special.symbol))
 
-(call_expression 
+(call_expression
   [
-   function: (identifier) @function.builtin
-   function: (global_variable "::" (_) @function.builtin)
-   function: (deref_expression "." (_) @function.builtin)
+    function: (identifier) @function.builtin
+    function:
+      (global_variable
+        "::"
+        (_) @function.builtin)
+    function:
+      (deref_expression
+        "."
+        (_) @function.builtin)
   ]
   ; format-ignore
   (#any-of? @function.builtin
@@ -206,20 +219,20 @@
   "constructor" @constructor)
 
 ; Constants
-
 (const_declaration
   "const"
-  . (identifier) @constant)
+  .
+  (identifier) @constant)
 
 (enum_declaration
   "{"
-  . (identifier) @constant)
+  .
+  (identifier) @constant)
 
 ((identifier) @constant
- (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
+  (#lua-match? @constant "^_*[A-Z][A-Z%d_]*$"))
 
 ; Operators
-
 [
   "+"
   "-"
@@ -255,14 +268,25 @@
 ] @operator
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
-
-[ "</" "/>" ] @punctuation.bracket
+[
+  "</"
+  "/>"
+] @punctuation.bracket
 
 [
   "."
@@ -277,13 +301,11 @@
 ] @punctuation.special
 
 ; Ternaries
-
 (ternary_expression
   "?" @keyword.conditional.ternary
   ":" @keyword.conditional.ternary)
 
 ; Literals
-
 (string) @string
 
 (verbatim_string) @string.special
@@ -301,7 +323,6 @@
 (null) @constant.builtin
 
 ; Comments
-
 (comment) @comment @spell
 
 ((comment) @comment.documentation
diff --git a/queries/squirrel/indents.scm b/queries/squirrel/indents.scm
index 0dbbab416..00245d6ae 100644
--- a/queries/squirrel/indents.scm
+++ b/queries/squirrel/indents.scm
@@ -2,13 +2,11 @@
   (class_declaration)
   (function_declaration)
   (enum_declaration)
-
   (array)
   (block)
   (table)
   (anonymous_function)
   (parenthesized_expression)
-
   (while_statement)
   (switch_statement)
   (for_statement)
@@ -17,10 +15,9 @@
   (catch_statement)
 ] @indent.begin
 
-(
-  (if_statement)
-  (ERROR "else") @indent.begin
-)
+((if_statement)
+  (ERROR
+    "else") @indent.begin)
 
 (if_statement
   condition: (_) @indent.begin)
@@ -37,11 +34,20 @@
   (_) @indent.begin
   (catch_statement) @indent.begin)
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
 [
   "}"
@@ -52,7 +58,6 @@
 [
   (ERROR)
   (comment)
-
   (string)
   (verbatim_string)
 ] @indent.auto
diff --git a/queries/squirrel/injections.scm b/queries/squirrel/injections.scm
index 34a0fce8b..ee864ca6f 100644
--- a/queries/squirrel/injections.scm
+++ b/queries/squirrel/injections.scm
@@ -1,5 +1,5 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((verbatim_string) @injection.content
   (#lua-match? @injection.content "^@\"<html")
diff --git a/queries/squirrel/locals.scm b/queries/squirrel/locals.scm
index 3e3b9da3e..3858eb6b0 100644
--- a/queries/squirrel/locals.scm
+++ b/queries/squirrel/locals.scm
@@ -1,18 +1,15 @@
 ; Scopes
-
 [
   (script)
   (class_declaration)
   (enum_declaration)
   (function_declaration)
   (attribute_declaration)
-
   (array)
   (block)
   (table)
   (anonymous_function)
   (parenthesized_expression)
-
   (if_statement)
   (else_statement)
   (while_statement)
@@ -24,44 +21,55 @@
   (catch_statement)
 ] @local.scope
 
-
 ; References
-
 [
   (identifier)
   (global_variable)
 ] @local.reference
 
 ; Definitions
-
 (const_declaration
-  . (identifier) @local.definition.constant)
+  .
+  (identifier) @local.definition.constant)
 
 (enum_declaration
-  . (identifier) @local.definition.enum)
+  .
+  (identifier) @local.definition.enum)
 
 (member_declaration
-  (identifier) @local.definition.field 
-  . "=")
+  (identifier) @local.definition.field
+  .
+  "=")
 
 (table_slot
-  . (identifier) @local.definition.field
-  . ["=" ":"])
+  .
+  (identifier) @local.definition.field
+  .
+  [
+    "="
+    ":"
+  ])
 
 ((function_declaration
-  . (identifier) @local.definition.function)
+  .
+  (identifier) @local.definition.function)
   (#not-has-ancestor? @local.definition.function member_declaration))
 
 (member_declaration
   (function_declaration
-    . (identifier) @local.definition.method))
+    .
+    (identifier) @local.definition.method))
 
 (class_declaration
-  . (identifier) @local.definition.type)
+  .
+  (identifier) @local.definition.type)
 
 (var_statement
-  "var" . (identifier) @local.definition.variable)
+  "var"
+  .
+  (identifier) @local.definition.variable)
 
 (local_declaration
-  (identifier) @local.definition.variable 
-  . "=")
+  (identifier) @local.definition.variable
+  .
+  "=")
diff --git a/queries/ssh_config/highlights.scm b/queries/ssh_config/highlights.scm
index c0a0ae3e2..9338eeedc 100644
--- a/queries/ssh_config/highlights.scm
+++ b/queries/ssh_config/highlights.scm
@@ -1,5 +1,4 @@
 ; Literals
-
 (string) @string
 
 (pattern) @string.regexp
@@ -21,23 +20,31 @@
 
 [
   ; generic
-  "yes" "no"
-  "ask" "auto"
-  "none" "any"
+  "yes"
+  "no"
+  "ask"
+  "auto"
+  "none"
+  "any"
   ; ControlMaster
   "autoask"
   ; FingerprintHash
-  "md5" "sha256"
+  "md5"
+  "sha256"
   ; PubkeyAuthentication
-  "unbound" "host-bound"
+  "unbound"
+  "host-bound"
   ; RequestTTY
   "force"
   ; SessionType
-  "subsystem" "default"
+  "subsystem"
+  "default"
   ; StrictHostKeyChecking
-  "accept-new" "off"
+  "accept-new"
+  "off"
   ; Tunnel
-  "point-to-point" "ethernet"
+  "point-to-point"
+  "ethernet"
   (ipqos)
   (verbosity)
   (facility)
@@ -47,20 +54,24 @@
 (uri) @string.special.url
 
 ; Keywords
+[
+  "Host"
+  "Match"
+] @keyword
 
-[ "Host" "Match" ] @keyword
+(parameter
+  keyword: _ @keyword)
 
-(parameter keyword: _ @keyword)
-
-(host_declaration argument: _ @module)
+(host_declaration
+  argument: _ @module)
 
 (match_declaration
-  (condition criteria: _ @attribute))
+  (condition
+    criteria: _ @attribute))
 
 "all" @attribute
 
 ; Misc
-
 [
   "SSH_AUTH_SOCK"
   (variable)
@@ -69,11 +80,27 @@
 (comment) @comment @spell
 
 ; Punctuation
+[
+  "${"
+  "}"
+] @punctuation.special
 
-[ "${" "}" ] @punctuation.special
+[
+  "\""
+  ","
+  ":"
+  "@"
+] @punctuation.delimiter
 
-[ "\"" "," ":" "@" ] @punctuation.delimiter
+[
+  "="
+  "!"
+  "+"
+  "-"
+  "^"
+] @operator
 
-[ "=" "!" "+" "-" "^" ] @operator
-
-[ "*" "?" ] @character.special
+[
+  "*"
+  "?"
+] @character.special
diff --git a/queries/ssh_config/indents.scm b/queries/ssh_config/indents.scm
index 0dd1eb6ca..df92f873a 100644
--- a/queries/ssh_config/indents.scm
+++ b/queries/ssh_config/indents.scm
@@ -2,6 +2,10 @@
   (host_declaration)
   (match_declaration)
 ] @indent.begin
-
 ; incomplete declarations
-(ERROR . [ "Host" "Match" ]) @indent.begin
+(ERROR
+  .
+  [
+    "Host"
+    "Match"
+  ]) @indent.begin
diff --git a/queries/ssh_config/injections.scm b/queries/ssh_config/injections.scm
index b71988471..6c7861e35 100644
--- a/queries/ssh_config/injections.scm
+++ b/queries/ssh_config/injections.scm
@@ -1,17 +1,18 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((condition
-   criteria: "exec"
-   argument: (string) @injection.content)
- (#set! injection.language "bash"))
+  criteria: "exec"
+  argument: (string) @injection.content)
+  (#set! injection.language "bash"))
 
 ((parameter
-   keyword: [
-              "KnownHostsCommand"
-              "LocalCommand"
-              "RemoteCommand"
-              "ProxyCommand"
-            ]
-   argument: (string) @injection.content)
- (#set! injection.language "bash"))
+  keyword:
+    [
+      "KnownHostsCommand"
+      "LocalCommand"
+      "RemoteCommand"
+      "ProxyCommand"
+    ]
+  argument: (string) @injection.content)
+  (#set! injection.language "bash"))
diff --git a/queries/starlark/folds.scm b/queries/starlark/folds.scm
index b4756a908..0c9d2a260 100644
--- a/queries/starlark/folds.scm
+++ b/queries/starlark/folds.scm
@@ -1,22 +1,17 @@
 [
   (function_definition)
-
   (for_statement)
   (if_statement)
   (while_statement)
   (with_statement)
   (match_statement)
-
   (parameters)
   (argument_list)
-
   (parenthesized_expression)
   (list_comprehension)
   (dictionary_comprehension)
-
   (tuple)
   (list)
   (dictionary)
-
   (string)
 ] @fold
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 9707632a5..5dd45f4dd 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -1,20 +1,20 @@
-;; From tree-sitter-python licensed under MIT License
+; From tree-sitter-python licensed under MIT License
 ; Copyright (c) 2016 Max Brunsfeld
-
 ; Variables
 (identifier) @variable
 
 ; Reset highlighting in f-string interpolations
 (interpolation) @none
 
-;; Identifier naming conventions
+; Identifier naming conventions
 ((identifier) @type
- (#lua-match? @type "^[A-Z].*[a-z]"))
+  (#lua-match? @type "^[A-Z].*[a-z]"))
+
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
 ((identifier) @constant.builtin
- (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
+  (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
   ; format-ignore
@@ -24,40 +24,48 @@
     "quit" "exit" "copyright" "credits" "license"))
 
 ((attribute
-    attribute: (identifier) @variable.member)
- (#lua-match? @variable.member "^[%l_].*$"))
+  attribute: (identifier) @variable.member)
+  (#lua-match? @variable.member "^[%l_].*$"))
 
 ((assignment
   left: (identifier) @type.definition
-  (type (identifier) @_annotation))
- (#eq? @_annotation "TypeAlias"))
+  (type
+    (identifier) @_annotation))
+  (#eq? @_annotation "TypeAlias"))
 
 ((assignment
   left: (identifier) @type.definition
-  right: (call
-    function: (identifier) @_func))
- (#any-of? @_func "TypeVar" "NewType"))
+  right:
+    (call
+      function: (identifier) @_func))
+  (#any-of? @_func "TypeVar" "NewType"))
 
-;; Decorators
-((decorator "@" @attribute)
- (#set! "priority" 101))
+; Decorators
+((decorator
+  "@" @attribute)
+  (#set! "priority" 101))
 
 (decorator
   (identifier) @attribute)
+
 (decorator
   (attribute
     attribute: (identifier) @attribute))
+
 (decorator
-  (call (identifier) @attribute))
+  (call
+    (identifier) @attribute))
+
 (decorator
-  (call (attribute
-          attribute: (identifier) @attribute)))
+  (call
+    (attribute
+      attribute: (identifier) @attribute)))
 
 ((decorator
   (identifier) @attribute.builtin)
- (#any-of? @attribute.builtin "classmethod" "property"))
+  (#any-of? @attribute.builtin "classmethod" "property"))
 
-;; Builtin functions
+; Builtin functions
 ((call
   function: (identifier) @function.builtin)
   ; format-ignore
@@ -69,21 +77,24 @@
     "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
     "struct" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
 
-;; Function definitions
+; Function definitions
 (function_definition
   name: (identifier) @function)
 
-(type (identifier) @type)
+(type
+  (identifier) @type)
+
 (type
   (subscript
     (identifier) @type)) ; type subscript: Tuple[int]
 
 ((call
   function: (identifier) @_isinstance
-  arguments: (argument_list
-    (_)
-    (identifier) @type))
- (#eq? @_isinstance "isinstance"))
+  arguments:
+    (argument_list
+      (_)
+      (identifier) @type))
+  (#eq? @_isinstance "isinstance"))
 
 ((identifier) @type.builtin
   ; format-ignore
@@ -104,67 +115,89 @@
     "bool" "int" "float" "complex" "list" "tuple" "range" "str"
     "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
 
-;; Normal parameters
+; Normal parameters
 (parameters
   (identifier) @variable.parameter)
-;; Lambda parameters
+
+; Lambda parameters
 (lambda_parameters
   (identifier) @variable.parameter)
+
 (lambda_parameters
   (tuple_pattern
     (identifier) @variable.parameter))
+
 ; Default parameters
 (keyword_argument
   name: (identifier) @variable.parameter)
+
 ; Naming parameters on call-site
 (default_parameter
   name: (identifier) @variable.parameter)
+
 (typed_parameter
   (identifier) @variable.parameter)
+
 (typed_default_parameter
   (identifier) @variable.parameter)
+
 ; Variadic parameters *args, **kwargs
 (parameters
-  (list_splat_pattern ; *args
+  (list_splat_pattern
+    ; *args
     (identifier) @variable.parameter))
+
 (parameters
-  (dictionary_splat_pattern ; **kwargs
+  (dictionary_splat_pattern
+    ; **kwargs
     (identifier) @variable.parameter))
 
-
-;; Literals
+; Literals
 (none) @constant.builtin
-[(true) (false)] @boolean
+
+[
+  (true)
+  (false)
+] @boolean
+
 ((identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
+  (#eq? @variable.builtin "self"))
+
 ((identifier) @variable.builtin
- (#eq? @variable.builtin "cls"))
+  (#eq? @variable.builtin "cls"))
 
 (integer) @number
+
 (float) @number.float
 
 (comment) @comment @spell
 
-((module . (comment) @keyword.directive)
+((module
+  .
+  (comment) @keyword.directive)
   (#lua-match? @keyword.directive "^#!/"))
 
 (string) @string
+
 [
   (escape_sequence)
   (escape_interpolation)
 ] @string.escape
 
 ; doc-strings
-
-(module . (expression_statement (string) @string.documentation @spell))
+(module
+  .
+  (expression_statement
+    (string) @string.documentation @spell))
 
 (function_definition
   body:
     (block
-      . (expression_statement (string) @string.documentation @spell)))
+      .
+      (expression_statement
+        (string) @string.documentation @spell)))
 
 ; Tokens
-
 [
   "-"
   "-="
@@ -211,7 +244,6 @@
   "in"
   "not"
   "or"
-
   "del"
 ] @keyword.operator
 
@@ -236,21 +268,38 @@
   "await"
 ] @keyword.coroutine
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 ((call
   function: (identifier) @keyword.import
-  arguments: (argument_list
-	(string) @string))
+  arguments:
+    (argument_list
+      (string) @string))
   (#eq? @keyword.import "load"))
 
-["if" "elif" "else" "match" "case"] @keyword.conditional
+[
+  "if"
+  "elif"
+  "else"
+  "match"
+  "case"
+] @keyword.conditional
 
-["for" "while" "break" "continue"] @keyword.repeat
+[
+  "for"
+  "while"
+  "break"
+  "continue"
+] @keyword.repeat
 
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 (interpolation
   "{" @punctuation.special
@@ -258,39 +307,44 @@
 
 (type_conversion) @function.macro
 
-["," "." ":" ";" (ellipsis)] @punctuation.delimiter
+[
+  ","
+  "."
+  ":"
+  ";"
+  (ellipsis)
+] @punctuation.delimiter
 
-;; Starlark-specific
-
-;; Assertion calls
+; Starlark-specific
+; Assertion calls
 (assert_keyword) @keyword
 
 (assert_builtin) @function.builtin
 
-;; Struct definitions
+; Struct definitions
 ((call
   function: (identifier) @_func
-  arguments: (argument_list
-    (keyword_argument
-	  name: (identifier) @variable.member)))
+  arguments:
+    (argument_list
+      (keyword_argument
+        name: (identifier) @variable.member)))
   (#eq? @_func "struct"))
 
-;; Function calls
-
+; Function calls
 (call
   function: (identifier) @function.call)
 
 (call
-  function: (attribute
-              attribute: (identifier) @function.method.call))
+  function:
+    (attribute
+      attribute: (identifier) @function.method.call))
 
 ((call
-   function: (identifier) @constructor)
- (#lua-match? @constructor "^[A-Z]"))
+  function: (identifier) @constructor)
+  (#lua-match? @constructor "^[A-Z]"))
 
 ((call
-  function: (attribute
-              attribute: (identifier) @constructor))
- (#lua-match? @constructor "^[A-Z]"))
-
-
+  function:
+    (attribute
+      attribute: (identifier) @constructor))
+  (#lua-match? @constructor "^[A-Z]"))
diff --git a/queries/starlark/indents.scm b/queries/starlark/indents.scm
index d87a8bc7f..1aeb9f60e 100644
--- a/queries/starlark/indents.scm
+++ b/queries/starlark/indents.scm
@@ -2,21 +2,17 @@
   (list)
   (dictionary)
   (set)
-
   (for_statement)
   (if_statement)
   (while_statement)
   (with_statement)
-
   (parenthesized_expression)
   (dictionary_comprehension)
   (list_comprehension)
   (set_comprehension)
-
   (tuple_pattern)
   (list_pattern)
   (binary_operator)
-
   (lambda)
   (function_definition)
 ] @indent.begin
@@ -24,23 +20,30 @@
 (if_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
-  (#set! indent.close_delimiter ")")
-)
-((ERROR "(" . (_)) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.close_delimiter ")"))
+
+((ERROR
+  "("
+  .
+  (_)) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((argument_list) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((argument_list) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((parameters) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((tuple) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
 [
   ")"
diff --git a/queries/starlark/locals.scm b/queries/starlark/locals.scm
index ff9af3803..5da211f65 100644
--- a/queries/starlark/locals.scm
+++ b/queries/starlark/locals.scm
@@ -1,4 +1,4 @@
-;;; Program structure
+; Program structure
 (module) @local.scope
 
 ; Function with parameters, defines parameters
@@ -27,65 +27,78 @@
 ; Function defines function and scope
 ((function_definition
   name: (identifier) @local.definition.function) @local.scope
- (#set! definition.function.scope "parent"))
+  (#set! definition.function.scope "parent"))
 
-;;; Loops
+; Loops
 ; not a scope!
 (for_statement
-  left: (pattern_list
-          (identifier) @local.definition.var))
+  left:
+    (pattern_list
+      (identifier) @local.definition.var))
+
 (for_statement
-  left: (tuple_pattern
-          (identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (identifier) @local.definition.var))
+
 (for_statement
   left: (identifier) @local.definition.var)
 
 ; for in list comprehension
 (for_in_clause
   left: (identifier) @local.definition.var)
+
 (for_in_clause
-  left: (tuple_pattern
-          (identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (identifier) @local.definition.var))
+
 (for_in_clause
-  left: (pattern_list
-          (identifier) @local.definition.var))
+  left:
+    (pattern_list
+      (identifier) @local.definition.var))
 
 (dictionary_comprehension) @local.scope
+
 (list_comprehension) @local.scope
+
 (set_comprehension) @local.scope
 
-;;; Assignments
+; Assignments
+(assignment
+  left: (identifier) @local.definition.var)
 
 (assignment
- left: (identifier) @local.definition.var)
+  left:
+    (pattern_list
+      (identifier) @local.definition.var))
 
 (assignment
- left: (pattern_list
-   (identifier) @local.definition.var))
-(assignment
- left: (tuple_pattern
-   (identifier) @local.definition.var))
+  left:
+    (tuple_pattern
+      (identifier) @local.definition.var))
 
 (assignment
- left: (attribute
-   (identifier)
-   (identifier) @local.definition.field))
+  left:
+    (attribute
+      (identifier)
+      (identifier) @local.definition.field))
 
 ; Walrus operator  x := 1
 (named_expression
   (identifier) @local.definition.var)
 
-(as_pattern 
+(as_pattern
   alias: (as_pattern_target) @local.definition.var)
 
-;;; REFERENCES
+; REFERENCES
 (identifier) @local.reference
 
-;; Starlark-specific
-
+; Starlark-specific
 ; Loads
 ((call
   function: (identifier) @_fn
-  arguments: (argument_list
-    (string) @local.definition.import))
+  arguments:
+    (argument_list
+      (string) @local.definition.import))
   (#eq? @_fn "load"))
diff --git a/queries/strace/highlights.scm b/queries/strace/highlights.scm
index 2bc45abb7..62fa724bd 100644
--- a/queries/strace/highlights.scm
+++ b/queries/strace/highlights.scm
@@ -16,7 +16,6 @@
 (syscall) @function.builtin
 
 ; Literals
-
 (integer) @number
 
 (pointer) @number.special
@@ -34,7 +33,6 @@
 ] @operator
 
 ; Punctuation
-
 [
   "+++"
   "---"
@@ -42,7 +40,12 @@
   "~"
 ] @punctuation.special
 
-[ "(" ")" "[" "]" ] @punctuation.bracket
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   ","
diff --git a/queries/supercollider/folds.scm b/queries/supercollider/folds.scm
index 214247bc0..2f5f1043a 100644
--- a/queries/supercollider/folds.scm
+++ b/queries/supercollider/folds.scm
@@ -1,7 +1,6 @@
 [
-(function_call)
-(code_block)
-(function_block)
-(control_structure)
+  (function_call)
+  (code_block)
+  (function_block)
+  (control_structure)
 ] @fold
-
diff --git a/queries/supercollider/highlights.scm b/queries/supercollider/highlights.scm
index 0d56de614..c8dbd70c7 100644
--- a/queries/supercollider/highlights.scm
+++ b/queries/supercollider/highlights.scm
@@ -1,20 +1,24 @@
 ; highlights.scm
 ; See this for full list: https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md
-
 ; comments
 (line_comment) @comment @spell
+
 (block_comment) @comment @spell
 
 ; Argument definition
-(argument name: (identifier) @variable.parameter)
+(argument
+  name: (identifier) @variable.parameter)
 
 ; Variables
-(local_var name: (identifier) @variable)
-(environment_var name:(identifier) @variable.builtin)
+(local_var
+  name: (identifier) @variable)
+
+(environment_var
+  name: (identifier) @variable.builtin)
+
 (builtin_var) @constant.builtin
 
 ; (variable) @variable
-
 ; Functions
 (function_definition
   name: (variable) @function)
@@ -25,49 +29,51 @@
 
 ; Methods
 (method_call
-        name: (method_name) @function.method)
+  name: (method_name) @function.method)
 
 ; Classes
 (class) @type
 
 ; Literals
 (number) @number
+
 (float) @number.float
 
 (string) @string
+
 (symbol) @string.special.symbol
 
 ; Operators
 [
-"&&"
-"||"
-"&"
-"|"
-"^"
-"=="
-"!="
-"<"
-"<="
-">"
-">="
-"<<"
-">>"
-"+"
-"-"
-"*"
-"/"
-"%"
-"="
+  "&&"
+  "||"
+  "&"
+  "|"
+  "^"
+  "=="
+  "!="
+  "<"
+  "<="
+  ">"
+  ">="
+  "<<"
+  ">>"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "="
 ] @operator
 
 ; Keywords
 [
-"arg"
-"classvar"
-"const"
-; "super"
-; "this"
-"var"
+  "arg"
+  "classvar"
+  "const"
+  ; "super"
+  ; "this"
+  "var"
 ] @keyword
 
 ; Brackets
diff --git a/queries/supercollider/indents.scm b/queries/supercollider/indents.scm
index 41241c6ec..c0cffab3c 100644
--- a/queries/supercollider/indents.scm
+++ b/queries/supercollider/indents.scm
@@ -10,13 +10,15 @@
   (const)
   (instance_var)
   (variable_definition)
-  (variable_definition_sequence (variable_definition))
+  (variable_definition_sequence
+    (variable_definition))
   (control_structure)
   (return_statement)
 ] @indent.begin
 
 [
-  (parameter_call_list (argument_calls))
+  (parameter_call_list
+    (argument_calls))
   "("
   ")"
   "{"
diff --git a/queries/supercollider/injections.scm b/queries/supercollider/injections.scm
index 43ae7287b..3cd6aac8e 100644
--- a/queries/supercollider/injections.scm
+++ b/queries/supercollider/injections.scm
@@ -1,5 +1,5 @@
 ([
   (line_comment)
   (block_comment)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/supercollider/locals.scm b/queries/supercollider/locals.scm
index d04677cae..1707b655a 100644
--- a/queries/supercollider/locals.scm
+++ b/queries/supercollider/locals.scm
@@ -1,27 +1,31 @@
 ; Scopes
 [
-(function_call)
-(code_block)
-(function_block)
-(control_structure)
+  (function_call)
+  (code_block)
+  (function_block)
+  (control_structure)
 ] @local.scope
 
 ; Definitions
-(argument 
-	name: (identifier) @local.definition.parameter
-	(#set! "definition.var.scope" "local")
-) 
+(argument
+  name: (identifier) @local.definition.parameter
+  (#set! "definition.var.scope" "local"))
 
-(variable_definition 
-	name: (variable (local_var (identifier) @local.definition.var
-	)))
+(variable_definition
+  name:
+    (variable
+      (local_var
+        (identifier) @local.definition.var)))
 
-(variable_definition 
-	name: (variable (environment_var (identifier) @local.definition.var))
-	(#set! "definition.var.scope" "global"))
+(variable_definition
+  name:
+    (variable
+      (environment_var
+        (identifier) @local.definition.var))
+  (#set! "definition.var.scope" "global"))
 
-(function_definition name: (variable) @local.definition.var
-	 (#set! "definition.var.scope" "parent")
-)
+(function_definition
+  name: (variable) @local.definition.var
+  (#set! "definition.var.scope" "parent"))
 
 (identifier) @local.reference
diff --git a/queries/surface/highlights.scm b/queries/surface/highlights.scm
index dc123172d..b874b8c1d 100644
--- a/queries/surface/highlights.scm
+++ b/queries/surface/highlights.scm
@@ -12,7 +12,7 @@
 
 ; Surface blocks are highlighted as keywords
 [
-  (start_block) 
+  (start_block)
   (end_block)
   (subblock)
 ] @keyword
@@ -41,4 +41,4 @@
 (directive_name) @keyword
 
 ; Surface operators
-["="] @operator
+"=" @operator
diff --git a/queries/surface/indents.scm b/queries/surface/indents.scm
index b9321b7ca..1df9fe6fd 100644
--- a/queries/surface/indents.scm
+++ b/queries/surface/indents.scm
@@ -1,4 +1,4 @@
-; Surface indents like HTML, with the addition of blocks 
+; Surface indents like HTML, with the addition of blocks
 [
   (component)
   (tag)
diff --git a/queries/surface/injections.scm b/queries/surface/injections.scm
index 0ee100999..72cab5e80 100644
--- a/queries/surface/injections.scm
+++ b/queries/surface/injections.scm
@@ -3,8 +3,8 @@
   (expression_value)
   (component_name)
 ] @injection.content
- (#set! injection.language "elixir"))
+  (#set! injection.language "elixir"))
 
 ; Surface comments are nvim-treesitter comments
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/svelte/folds.scm b/queries/svelte/folds.scm
index 795c32fc4..e8635d119 100644
--- a/queries/svelte/folds.scm
+++ b/queries/svelte/folds.scm
@@ -1,9 +1,9 @@
 [
- (style_element)
- (script_element)
- (element)
- (if_statement)
- (else_statement)
- (each_statement)
- (await_statement)
+  (style_element)
+  (script_element)
+  (element)
+  (if_statement)
+  (else_statement)
+  (each_statement)
+  (await_statement)
 ] @fold
diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 5581c40c1..3e1386d2f 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: html_tags
-
 (raw_text_expr) @none
 
 [
diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index 187b40f4d..912fa3467 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -1,11 +1,11 @@
 ; inherits: html_tags
-
 ((style_element
-    (start_tag
-      (attribute
-        (attribute_name) @_attr
-        (quoted_attribute_value (attribute_value) @_lang)))
-    (raw_text) @injection.content)
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (quoted_attribute_value
+        (attribute_value) @_lang)))
+  (raw_text) @injection.content)
   (#eq? @_attr "lang")
   (#any-of? @_lang "scss" "postcss" "less")
   (#set! injection.language "scss"))
@@ -14,24 +14,25 @@
   (raw_text_expr)
   (raw_text_each)
 ] @injection.content
- (#set! injection.language "javascript"))
+  (#set! injection.language "javascript"))
 
 ((script_element
-    (start_tag
-      (attribute
-        (attribute_name) @_attr
-        (quoted_attribute_value (attribute_value) @_lang)))
-    (raw_text) @injection.content)
- (#eq? @_attr "lang") 
- (#any-of? @_lang "ts" "typescript")
- (#set! injection.language "typescript"))
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (quoted_attribute_value
+        (attribute_value) @_lang)))
+  (raw_text) @injection.content)
+  (#eq? @_attr "lang")
+  (#any-of? @_lang "ts" "typescript")
+  (#set! injection.language "typescript"))
 
 ((element
-   (start_tag
-     (attribute
-       (attribute_name) @_attr
-       (quoted_attribute_value
-         (attribute_value) @injection.language)))
-   (text) @injection.content)
- (#eq? @_attr "lang") 
- (#eq? @injection.language "pug"))
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (quoted_attribute_value
+        (attribute_value) @injection.language)))
+  (text) @injection.content)
+  (#eq? @_attr "lang")
+  (#eq? @injection.language "pug"))
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 336497839..f3387dbef 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -1,10 +1,25 @@
-[ "." ";" ":" "," ] @punctuation.delimiter
+[
+  "."
+  ";"
+  ":"
+  ","
+] @punctuation.delimiter
 ; TODO: "\\(" ")" in interpolations should be @punctuation.special
-[ "\\(" "(" ")" "[" "]" "{" "}"] @punctuation.bracket
+[
+  "\\("
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 ; Identifiers
 (attribute) @variable
+
 (type_identifier) @type
+
 (self_expression) @variable.builtin
 
 ; Declarations
@@ -20,16 +35,35 @@
   (mutation_modifier)
 ] @type.qualifier
 
-(function_declaration (simple_identifier) @function.method)
-(function_declaration ["init" @constructor])
+(function_declaration
+  (simple_identifier) @function.method)
+
+(function_declaration
+  "init" @constructor)
+
 (throws) @keyword
+
 (where_keyword) @keyword
-(parameter external_name: (simple_identifier) @variable.parameter)
-(parameter name: (simple_identifier) @variable.parameter)
-(type_parameter (type_identifier) @variable.parameter)
-(inheritance_constraint (identifier (simple_identifier) @variable.parameter))
-(equality_constraint (identifier (simple_identifier) @variable.parameter))
-(pattern bound_identifier: (simple_identifier)) @variable
+
+(parameter
+  external_name: (simple_identifier) @variable.parameter)
+
+(parameter
+  name: (simple_identifier) @variable.parameter)
+
+(type_parameter
+  (type_identifier) @variable.parameter)
+
+(inheritance_constraint
+  (identifier
+    (simple_identifier) @variable.parameter))
+
+(equality_constraint
+  (identifier
+    (simple_identifier) @variable.parameter))
+
+(pattern
+  bound_identifier: (simple_identifier)) @variable
 
 [
   "typealias"
@@ -58,60 +92,114 @@
   (modify_specifier)
 ] @keyword
 
-(class_body (property_declaration (pattern (simple_identifier) @property)))
-(protocol_property_declaration (pattern (simple_identifier) @property))
+(class_body
+  (property_declaration
+    (pattern
+      (simple_identifier) @property)))
+
+(protocol_property_declaration
+  (pattern
+    (simple_identifier) @property))
+
 (navigation_expression
-  (navigation_suffix (simple_identifier) @property))
+  (navigation_suffix
+    (simple_identifier) @property))
+
 (value_argument
   name: (value_argument_label) @property)
 
-(import_declaration ["import" @keyword.import])
+(import_declaration
+  "import" @keyword.import)
 
-(enum_entry ["case" @keyword])
+(enum_entry
+  "case" @keyword)
 
 ; Function calls
-(call_expression (simple_identifier) @function.call) ; foo()
-(call_expression ; foo.bar.baz(): highlight the baz()
-  (navigation_expression
-    (navigation_suffix (simple_identifier) @function.call))) 
 (call_expression
-  (prefix_expression (simple_identifier) @function.call)) ; .foo()
+  (simple_identifier) @function.call) ; foo()
+
+(call_expression
+  ; foo.bar.baz(): highlight the baz()
+  (navigation_expression
+    (navigation_suffix
+      (simple_identifier) @function.call)))
+
+(call_expression
+  (prefix_expression
+    (simple_identifier) @function.call)) ; .foo()
+
 ((navigation_expression
-   (simple_identifier) @type) ; SomeType.method(): highlight SomeType as a type
-   (#lua-match? @type "^[A-Z]"))
+  (simple_identifier) @type) ; SomeType.method(): highlight SomeType as a type
+  (#lua-match? @type "^[A-Z]"))
 
 (directive) @function.macro
+
 (diagnostic) @function.macro
 
 ; Statements
-(for_statement ["for" @keyword.repeat])
-(for_statement ["in" @keyword.repeat])
-(for_statement (pattern) @variable)
+(for_statement
+  "for" @keyword.repeat)
+
+(for_statement
+  "in" @keyword.repeat)
+
+(for_statement
+  (pattern) @variable)
+
 (else) @keyword
+
 (as_operator) @keyword
 
-["while" "repeat" "continue" "break"] @keyword.repeat
+[
+  "while"
+  "repeat"
+  "continue"
+  "break"
+] @keyword.repeat
 
-["let" "var"] @keyword
+[
+  "let"
+  "var"
+] @keyword
+
+(guard_statement
+  "guard" @keyword.conditional)
+
+(if_statement
+  "if" @keyword.conditional)
+
+(switch_statement
+  "switch" @keyword.conditional)
+
+(switch_entry
+  "case" @keyword)
+
+(switch_entry
+  "fallthrough" @keyword)
+
+(switch_entry
+  (default_keyword) @keyword)
 
-(guard_statement ["guard" @keyword.conditional])
-(if_statement ["if" @keyword.conditional])
-(switch_statement ["switch" @keyword.conditional])
-(switch_entry ["case" @keyword])
-(switch_entry ["fallthrough" @keyword])
-(switch_entry (default_keyword) @keyword)
 "return" @keyword.return
-(ternary_expression
-  ["?" ":"] @keyword.conditional)
 
-["do" (throw_keyword) (catch_keyword)] @keyword
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional)
+
+[
+  "do"
+  (throw_keyword)
+  (catch_keyword)
+] @keyword
 
 (statement_label) @label
 
 ; Comments
 [
- (comment)
- (multiline_comment)
+  (comment)
+  (multiline_comment)
 ] @comment @spell
 
 ((comment) @comment.documentation
@@ -125,25 +213,38 @@
 
 ; String literals
 (line_str_text) @string
+
 (str_escaped_char) @string
+
 (multi_line_str_text) @string
+
 (raw_str_part) @string
+
 (raw_str_end_part) @string
+
 (raw_str_interpolation_start) @punctuation.special
-["\"" "\"\"\""] @string
+
+[
+  "\""
+  "\"\"\""
+] @string
 
 ; Lambda literals
-(lambda_literal ["in" @keyword.operator])
+(lambda_literal
+  "in" @keyword.operator)
 
 ; Basic literals
 [
- (integer_literal)
- (hex_literal)
- (oct_literal)
- (bin_literal)
+  (integer_literal)
+  (hex_literal)
+  (oct_literal)
+  (bin_literal)
 ] @number
+
 (real_literal) @number.float
+
 (boolean_literal) @boolean
+
 "nil" @constant.builtin
 
 ; Regex literals
@@ -151,39 +252,37 @@
 
 ; Operators
 (custom_operator) @operator
+
 [
- "try"
- "try?"
- "try!"
- "+"
- "-"
- "*"
- "/"
- "%"
- "="
- "+="
- "-="
- "*="
- "/="
- "<"
- ">"
- "<="
- ">="
- "++"
- "--"
- "&"
- "~"
- "%="
- "!="
- "!=="
- "=="
- "==="
- "??"
-
- "->"
-
- "..<"
- "..."
+  "try"
+  "try?"
+  "try!"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "<"
+  ">"
+  "<="
+  ">="
+  "++"
+  "--"
+  "&"
+  "~"
+  "%="
+  "!="
+  "!=="
+  "=="
+  "==="
+  "??"
+  "->"
+  "..<"
+  "..."
   (bang)
 ] @operator
-
diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index 63d1c9011..3204af3f3 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -47,16 +47,13 @@
   _ @indent.branch
   (#not-has-type? @indent.branch type_parameters parameter))
 
-
 (ERROR
   [
-    "<" 
-    "{" 
-    "(" 
+    "<"
+    "{"
+    "("
     "["
-  ]
-) @indent.begin
-
+  ]) @indent.begin
 
 ; if-elseif
 (if_statement
@@ -65,23 +62,34 @@
 ; case Foo:
 ; default Foo:
 ; @attribute default Foo:
-(switch_entry . _ @indent.branch)
+(switch_entry
+  .
+  _ @indent.branch)
 
-(function_declaration ")" @indent.branch)
+(function_declaration
+  ")" @indent.branch)
+
+(type_parameters
+  ">" @indent.branch @indent.end .)
+
+(tuple_expression
+  ")" @indent.branch @indent.end)
+
+(value_arguments
+  ")" @indent.branch @indent.end)
+
+(tuple_type
+  ")" @indent.branch @indent.end)
 
-(type_parameters ">" @indent.branch @indent.end .)
-(tuple_expression ")" @indent.branch @indent.end)
-(value_arguments ")" @indent.branch @indent.end)
-(tuple_type ")" @indent.branch @indent.end)
 (modifiers
-  (attribute ")" @indent.branch @indent.end))
+  (attribute
+    ")" @indent.branch @indent.end))
 
 [
   "}"
   "]"
 ] @indent.branch @indent.end
 
-
 [
   ; (ERROR)
   (comment)
diff --git a/queries/swift/locals.scm b/queries/swift/locals.scm
index 45d4f2f0a..dc8a62e9e 100644
--- a/queries/swift/locals.scm
+++ b/queries/swift/locals.scm
@@ -1,18 +1,21 @@
-(import_declaration (identifier) @local.definition.import)
-(function_declaration name: (simple_identifier) @local.definition.function)
+(import_declaration
+  (identifier) @local.definition.import)
+
+(function_declaration
+  name: (simple_identifier) @local.definition.function)
 
 ; Scopes
 [
- (statements)
- (for_statement)
- (while_statement)
- (repeat_while_statement)
- (do_statement)
- (if_statement)
- (guard_statement)
- (switch_statement)
- (property_declaration)
- (function_declaration)
- (class_declaration)
- (protocol_declaration)
+  (statements)
+  (for_statement)
+  (while_statement)
+  (repeat_while_statement)
+  (do_statement)
+  (if_statement)
+  (guard_statement)
+  (switch_statement)
+  (property_declaration)
+  (function_declaration)
+  (class_declaration)
+  (protocol_declaration)
 ] @local.scope
diff --git a/queries/sxhkdrc/folds.scm b/queries/sxhkdrc/folds.scm
index 178258dc6..c6634aaef 100644
--- a/queries/sxhkdrc/folds.scm
+++ b/queries/sxhkdrc/folds.scm
@@ -1,3 +1 @@
-[
- (binding)
-] @fold
+(binding) @fold
diff --git a/queries/sxhkdrc/highlights.scm b/queries/sxhkdrc/highlights.scm
index b4a58eb9a..3f633a73d 100644
--- a/queries/sxhkdrc/highlights.scm
+++ b/queries/sxhkdrc/highlights.scm
@@ -1,10 +1,19 @@
 (modifier) @keyword
+
 (operator) @operator
+
 (attribute) @attribute
+
 (command_sync_prefix) @type
+
 (punctuation) @punctuation.bracket
+
 (delimiter) @punctuation.delimiter
+
 (keysym) @variable
+
 (comment) @comment @spell
+
 (range) @number
+
 "\\\n" @punctuation.special
diff --git a/queries/sxhkdrc/injections.scm b/queries/sxhkdrc/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/sxhkdrc/injections.scm
+++ b/queries/sxhkdrc/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm
index 55571a1d8..d686d2a0c 100644
--- a/queries/systemtap/highlights.scm
+++ b/queries/systemtap/highlights.scm
@@ -8,7 +8,9 @@
 (preprocessor_constant) @constant.macro
 
 (number) @number
+
 (string) @string
+
 (escape_sequence) @string.escape
 
 [
@@ -35,10 +37,8 @@
   function: (identifier) @function.call)
 
 ((call_expression
-    function: (identifier) @function.builtin)
-  (#any-of? @function.builtin
-    "print" "printd" "printdln" "printf" "println"
-    "sprint" "sprintd" "sprintdln" "sprintf" "sprintln"))
+  function: (identifier) @function.builtin)
+  (#any-of? @function.builtin "print" "printd" "printdln" "printf" "println" "sprint" "sprintd" "sprintdln" "sprintf" "sprintln"))
 
 ((identifier) @variable.builtin
   (#lua-match? @variable.builtin "^\$+[0-9A-Z_a-z]+\$*$"))
@@ -117,7 +117,9 @@
 ] @keyword
 
 "function" @keyword.function
+
 "in" @keyword.operator
+
 "return" @keyword.return
 
 [
@@ -150,4 +152,5 @@
 "@define" @keyword.directive.define
 
 "private" @type.qualifier
+
 "global" @keyword.storage
diff --git a/queries/systemtap/injections.scm b/queries/systemtap/injections.scm
index 9a1099d6d..591df6012 100644
--- a/queries/systemtap/injections.scm
+++ b/queries/systemtap/injections.scm
@@ -1,5 +1,5 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((embedded_code) @injection.content
- (#set! injection.language "c"))
+  (#set! injection.language "c"))
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index a0e1e3c2d..e2b6c44c8 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -70,17 +70,15 @@
   "volatile"
 ] @type.qualifier
 
-
 ; Operators in comma and conditional HLL expressions
 (hll_comma_expression
   "," @operator)
 
 (hll_conditional_expression
   [
-   "?"
-   ":"
-] @keyword.conditional.ternary)
-
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 ; Strings and others literal types
 (access_class) @constant.builtin
@@ -108,6 +106,7 @@
 (hll_escape_sequence) @string.escape
 
 (path) @string.special.path
+
 (symbol) @string.special.symbol
 
 [
@@ -115,31 +114,29 @@
   (hll_char_literal)
 ] @character
 
-
 ; Types in HLL expressions
 [
- (hll_type_identifier)
- (hll_type_descriptor)
+  (hll_type_identifier)
+  (hll_type_descriptor)
 ] @type
 
 (hll_type_qualifier) @type.qualifier
 
 (hll_primitive_type) @type.builtin
 
-
 ; HLL expressions
 (hll_call_expression
   function: (identifier) @function.call)
 
 (hll_call_expression
-  function: (hll_field_expression
-    field: (hll_field_identifier) @function.call))
-
+  function:
+    (hll_field_expression
+      field: (hll_field_identifier) @function.call))
 
 ; HLL variables
 (identifier) @variable
-(hll_field_identifier) @variable.member
 
+(hll_field_identifier) @variable.member
 
 ; Commands
 (command_expression
@@ -151,44 +148,39 @@
 (call_expression
   function: (identifier) @function.builtin)
 
-
 ; Returns
-(
-  (command_expression
-    command: (identifier) @keyword.return)
-  (#match? @keyword.return "^[eE][nN][dD]([dD][oO])?$")
-)
-(
-  (command_expression
-    command: (identifier) @keyword.return)
-  (#lua-match? @keyword.return "^[rR][eE][tT][uU][rR][nN]$")
-)
+((command_expression
+  command: (identifier) @keyword.return)
+  (#match? @keyword.return "^[eE][nN][dD]([dD][oO])?$"))
 
+((command_expression
+  command: (identifier) @keyword.return)
+  (#lua-match? @keyword.return "^[rR][eE][tT][uU][rR][nN]$"))
 
 ; Subroutine calls
 (subroutine_call_expression
   command: (identifier) @keyword
   subroutine: (identifier) @function.call)
 
-
 ; Variables, constants and labels
 (macro) @variable.builtin
+
 (trace32_hll_variable) @variable.builtin
 
 (argument_list
   (identifier) @constant.builtin)
 
-(
-  (argument_list (identifier) @constant.builtin)
-  (#lua-match? @constant.builtin "^[%%/][%l%u][%l%u%d.]*$")
-)
+((argument_list
+  (identifier) @constant.builtin)
+  (#lua-match? @constant.builtin "^[%%/][%l%u][%l%u%d.]*$"))
 
-(
-  (command_expression
-    command: (identifier) @keyword
-    arguments: (argument_list . (identifier) @label))
-  (#lua-match? @keyword "^[gG][oO][tT][oO]$")
-)
+((command_expression
+  command: (identifier) @keyword
+  arguments:
+    (argument_list
+      .
+      (identifier) @label))
+  (#lua-match? @keyword "^[gG][oO][tT][oO]$"))
 
 (labeled_expression
   label: (identifier) @label)
@@ -199,7 +191,6 @@
 (format_expression
   (identifier) @constant.builtin)
 
-
 ; Subroutine blocks
 (subroutine_block
   command: (identifier) @keyword.function
@@ -209,24 +200,23 @@
   label: (identifier) @function
   (block))
 
-
 ; Parameter declarations
 (parameter_declaration
   command: (identifier) @keyword
   (identifier)? @constant.builtin
   macro: (macro) @variable.parameter)
 
-
 ; Control flow
 (if_block
   command: (identifier) @keyword.conditional)
+
 (else_block
   command: (identifier) @keyword.conditional)
 
 (while_block
   command: (identifier) @keyword.repeat)
+
 (repeat_block
   command: (identifier) @keyword.repeat)
 
-
 (comment) @comment @spell
diff --git a/queries/t32/injections.scm b/queries/t32/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/t32/injections.scm
+++ b/queries/t32/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/t32/locals.scm b/queries/t32/locals.scm
index bad645fdf..3c10c58ab 100644
--- a/queries/t32/locals.scm
+++ b/queries/t32/locals.scm
@@ -1,5 +1,4 @@
 (block) @local.scope
-
 ; Parameter definitions
 (parameter_declaration
   command: (identifier)
@@ -12,8 +11,9 @@
 
 (command_expression
   command: (identifier)
-  arguments: (argument_list
-    declarator: (trace32_hll_variable) @local.definition.var))
+  arguments:
+    (argument_list
+      declarator: (trace32_hll_variable) @local.definition.var))
 
 ; Function definitions
 (subroutine_block
@@ -25,12 +25,10 @@
   (block))
 
 ; References
-(
-  (subroutine_call_expression
-    command: (identifier)
-    subroutine: (identifier) @local.reference)
-  (#set! reference.kind "function")
-)
+((subroutine_call_expression
+  command: (identifier)
+  subroutine: (identifier) @local.reference)
+  (#set! reference.kind "function"))
 
 [
   (macro)
diff --git a/queries/tablegen/folds.scm b/queries/tablegen/folds.scm
index a1727b151..0e95ca527 100644
--- a/queries/tablegen/folds.scm
+++ b/queries/tablegen/folds.scm
@@ -8,6 +8,6 @@
   (defvar)
   (foreach)
   (if)
-  (let) 
+  (let)
   (value_suffix)
 ] @fold
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index aea94b4eb..7c6d71753 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -1,13 +1,10 @@
 ; Preprocs
-
 (preprocessor_directive) @keyword.directive
 
 ; Includes
-
 "include" @keyword.import
 
 ; Keywords
-
 [
   "assert"
   "class"
@@ -20,12 +17,9 @@
   "defvar"
 ] @keyword
 
-[
-  "in"
-] @keyword.operator
+"in" @keyword.operator
 
 ; Conditionals
-
 [
   "if"
   "else"
@@ -33,24 +27,18 @@
 ] @keyword.conditional
 
 ; Repeats
-
-[
-  "foreach"
-] @keyword.repeat
+"foreach" @keyword.repeat
 
 ; Variables
-
 (identifier) @variable
 
-(var) @variable.builtin 
+(var) @variable.builtin
 
 ; Parameters
-
-(template_arg (identifier) @variable.parameter)
-
+(template_arg
+  (identifier) @variable.parameter)
 
 ; Types
-
 (type) @type
 
 [
@@ -63,27 +51,41 @@
   "code"
 ] @type.builtin
 
-(class name: (identifier) @type)
+(class
+  name: (identifier) @type)
 
-(multiclass name: (identifier) @type)
+(multiclass
+  name: (identifier) @type)
 
-(def name: (value (_) @type))
+(def
+  name:
+    (value
+      (_) @type))
 
-(defm name: (value (_) @type))
+(defm
+  name:
+    (value
+      (_) @type))
 
-(defset name: (identifier) @type)
+(defset
+  name: (identifier) @type)
 
-(parent_class_list (identifier) @type (value (_) @type)?)
+(parent_class_list
+  (identifier) @type
+  (value
+    (_) @type)?)
 
-(anonymous_record (identifier) @type)
+(anonymous_record
+  (identifier) @type)
 
-(anonymous_record (value (_) @type))
+(anonymous_record
+  (value
+    (_) @type))
 
 ((identifier) @type
   (#lua-match? @type "^_*[A-Z][A-Z0-9_]+$"))
 
 ; Fields
-
 (instruction
   (identifier) @variable.member)
 
@@ -91,7 +93,6 @@
   (identifier) @variable.member)
 
 ; Functions
-
 ([
   (bang_operator)
   (cond_operator)
@@ -99,7 +100,6 @@
   (#set! "priority" 105))
 
 ; Operators
-
 [
   "="
   "#"
@@ -109,7 +109,6 @@
 ] @operator
 
 ; Literals
-
 (string) @string
 
 (code) @string.special
@@ -121,14 +120,25 @@
 (uninitialized_value) @constant.builtin
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-[ "[" "]" ] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-[ "(" ")" ] @punctuation.bracket
-
-[ "<" ">" ] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
 [
   "."
@@ -136,17 +146,13 @@
   ";"
 ] @punctuation.delimiter
 
-[
- "!"
-] @punctuation.special
+"!" @punctuation.special
 
 ; Comments
-
 [
   (comment)
   (multiline_comment)
 ] @comment @spell
 
-
 ((comment) @keyword.directive
   (#lua-match? @keyword.directive "^.*RUN"))
diff --git a/queries/tablegen/indents.scm b/queries/tablegen/indents.scm
index 5d73f8848..16748edf1 100644
--- a/queries/tablegen/indents.scm
+++ b/queries/tablegen/indents.scm
@@ -7,7 +7,7 @@
   (defvar)
   (foreach)
   (if)
-  (let) 
+  (let)
   (value_suffix)
 ] @indent.begin
 
@@ -18,10 +18,22 @@
   ">"
 ] @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
-[ "<" ">" ] @indent.branch
+[
+  "<"
+  ">"
+] @indent.branch
diff --git a/queries/tablegen/locals.scm b/queries/tablegen/locals.scm
index f1404adb6..98c52ceac 100644
--- a/queries/tablegen/locals.scm
+++ b/queries/tablegen/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (class)
   (multiclass)
@@ -13,14 +12,12 @@
 ] @local.scope
 
 ; References
-
 [
   (var)
   (identifier)
 ] @local.reference
 
 ; Definitions
-
 (instruction
   (identifier) @local.definition.field)
 
@@ -30,7 +27,8 @@
 (include_directive
   (string) @local.definition.import)
 
-(template_arg (identifier) @local.definition.parameter)
+(template_arg
+  (identifier) @local.definition.parameter)
 
 (class
   name: (identifier) @local.definition.type)
@@ -39,10 +37,14 @@
   name: (identifier) @local.definition.type)
 
 (def
-  name: (value (_) @local.definition.type))
+  name:
+    (value
+      (_) @local.definition.type))
 
 (defm
-  name: (value (_) @local.definition.type))
+  name:
+    (value
+      (_) @local.definition.type))
 
 (defset
   name: (identifier) @local.definition.type)
diff --git a/queries/teal/folds.scm b/queries/teal/folds.scm
index 4583057cf..27755de20 100644
--- a/queries/teal/folds.scm
+++ b/queries/teal/folds.scm
@@ -1,13 +1,13 @@
 [
-(do_statement)
-(numeric_for_statement)
-(generic_for_statement)
-(while_statement)
-(repeat_statement)
-(if_statement)
-(function_statement)
-(record_declaration)
-(enum_declaration)
-(anon_function)
-(table_constructor)
+  (do_statement)
+  (numeric_for_statement)
+  (generic_for_statement)
+  (while_statement)
+  (repeat_statement)
+  (if_statement)
+  (function_statement)
+  (record_declaration)
+  (enum_declaration)
+  (anon_function)
+  (table_constructor)
 ] @fold
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index aa71fc5b5..f74714290 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -1,91 +1,192 @@
-
-;; Primitives
+; Primitives
 (boolean) @boolean
+
 (comment) @comment @spell
+
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^[-][-][-]"))
+
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^[-][-](%s?)@"))
+
 (shebang_comment) @keyword.directive
+
 (identifier) @variable
+
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "self"))
+
 (nil) @constant.builtin
+
 (number) @number
+
 (string) @string
-(table_constructor ["{" "}"] @constructor)
-(varargs "..." @constant.builtin)
-[ "," "." ":" ";" ] @punctuation.delimiter
+
+(table_constructor
+  [
+    "{"
+    "}"
+  ] @constructor)
+
+(varargs
+  "..." @constant.builtin)
+
+[
+  ","
+  "."
+  ":"
+  ";"
+] @punctuation.delimiter
 
 (escape_sequence) @string.escape
+
 (format_specifier) @string.escape
 
-;; Basic statements/Keywords
-[ "if" "then" "elseif" "else" ] @keyword.conditional
-[ "for" "while" "repeat" "until" ] @keyword.repeat
+; Basic statements/Keywords
+[
+  "if"
+  "then"
+  "elseif"
+  "else"
+] @keyword.conditional
+
+[
+  "for"
+  "while"
+  "repeat"
+  "until"
+] @keyword.repeat
+
 "return" @keyword.return
-[ "in" "local" (break) (goto) "do" "end" ] @keyword
+
+[
+  "in"
+  "local"
+  (break)
+  (goto)
+  "do"
+  "end"
+] @keyword
+
 (label) @label
 
-;; Global isn't a real keyword, but it gets special treatment in these places
-(var_declaration "global" @keyword)
-(type_declaration "global" @keyword)
-(function_statement "global" @keyword)
-(record_declaration "global" @keyword)
-(enum_declaration "global" @keyword)
+; Global isn't a real keyword, but it gets special treatment in these places
+(var_declaration
+  "global" @keyword)
 
-;; Ops
-(bin_op (op) @operator)
-(unary_op (op) @operator)
-[ "=" "as" ] @operator
+(type_declaration
+  "global" @keyword)
 
-;; Functions
+(function_statement
+  "global" @keyword)
+
+(record_declaration
+  "global" @keyword)
+
+(enum_declaration
+  "global" @keyword)
+
+; Ops
+(bin_op
+  (op) @operator)
+
+(unary_op
+  (op) @operator)
+
+[
+  "="
+  "as"
+] @operator
+
+; Functions
 (function_statement
   "function" @keyword.function
-  . name: (_) @function)
+  .
+  name: (_) @function)
+
 (anon_function
   "function" @keyword.function)
-(function_body "end" @keyword.function)
 
-(arg name: (identifier) @variable.parameter)
+(function_body
+  "end" @keyword.function)
+
+(arg
+  name: (identifier) @variable.parameter)
 
 (function_signature
   (arguments
-    . (arg name: (identifier) @variable.builtin))
+    .
+    (arg
+      name: (identifier) @variable.builtin))
   (#eq? @variable.builtin "self"))
 
 (typeargs
   "<" @punctuation.bracket
-  . (_) @variable.parameter
-  . ("," . (_) @variable.parameter)*
-  . ">" @punctuation.bracket)
+  .
+  (_) @variable.parameter
+  .
+  (","
+    .
+    (_) @variable.parameter)*
+  .
+  ">" @punctuation.bracket)
 
 (function_call
-  (identifier) @function . (arguments))
-(function_call
-  (index (_) key: (identifier) @function) . (arguments))
-(function_call
-  (method_index (_) key: (identifier) @function) . (arguments))
+  (identifier) @function
+  .
+  (arguments))
 
-;; Types
+(function_call
+  (index
+    (_)
+    key: (identifier) @function)
+  .
+  (arguments))
+
+(function_call
+  (method_index
+    (_)
+    key: (identifier) @function)
+  .
+  (arguments))
+
+; Types
 (record_declaration
-  . "record" @keyword
+  .
+  "record" @keyword
   name: (identifier) @type)
-(anon_record . "record" @keyword)
+
+(anon_record
+  .
+  "record" @keyword)
+
 (record_body
   (record_declaration
-    . [ "record" ] @keyword
-    . name: (identifier) @type))
+    .
+    "record" @keyword
+    .
+    name: (identifier) @type))
+
 (record_body
   (enum_declaration
-    . [ "enum" ] @keyword
-    . name: (identifier) @type))
+    .
+    "enum" @keyword
+    .
+    name: (identifier) @type))
+
 (record_body
   (typedef
-    . "type" @keyword
-    . name: (identifier) @type . "="))
+    .
+    "type" @keyword
+    .
+    name: (identifier) @type
+    .
+    "="))
+
 (record_body
-  (metamethod "metamethod" @keyword))
+  (metamethod
+    "metamethod" @keyword))
+
 (record_body
   (userdata) @keyword)
 
@@ -93,27 +194,52 @@
   "enum" @keyword
   name: (identifier) @type)
 
-(type_declaration "type" @keyword)
-(type_declaration (identifier) @type)
-(simple_type name: (identifier) @type)
-(type_index (identifier) @type)
-(type_union "|" @operator)
-(function_type "function" @type)
+(type_declaration
+  "type" @keyword)
 
-;; The rest of it
-(var_declaration
-  declarators: (var_declarators
-      (var name: (identifier) @variable)))
-(var_declaration
-  declarators: (var_declarators
-    (var
-      "<" @punctuation.bracket
-      . attribute: (attribute) @attribute
-      . ">" @punctuation.bracket)))
-[ "(" ")" "[" "]" "{" "}" ] @punctuation.bracket
+(type_declaration
+  (identifier) @type)
 
-;; Only highlight format specifiers in calls to string.format
-;; string.format('...')
+(simple_type
+  name: (identifier) @type)
+
+(type_index
+  (identifier) @type)
+
+(type_union
+  "|" @operator)
+
+(function_type
+  "function" @type)
+
+; The rest of it
+(var_declaration
+  declarators:
+    (var_declarators
+      (var
+        name: (identifier) @variable)))
+
+(var_declaration
+  declarators:
+    (var_declarators
+      (var
+        "<" @punctuation.bracket
+        .
+        attribute: (attribute) @attribute
+        .
+        ">" @punctuation.bracket)))
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+; Only highlight format specifiers in calls to string.format
+; string.format('...')
 ;(function_call
 ;  called_object: (index
 ;    (identifier) @base
@@ -123,8 +249,7 @@
 ;
 ;  (#eq? @base "string")
 ;  (#eq? @entry "format"))
-
-;; ('...'):format()
+; ('...'):format()
 ;(function_call
 ;  called_object: (method_index
 ;    (string (format_specifier) @string.escape)
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index 789826452..ac42de4eb 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -1,47 +1,42 @@
-(
-  (function_call
-    (index
-      (identifier) @_cdef_identifier)
-    (arguments
-      (string) @injection.content)
-  )
-
+((function_call
+  (index
+    (identifier) @_cdef_identifier)
+  (arguments
+    (string) @injection.content))
   (#eq? @_cdef_identifier "cdef")
   (#lua-match? @injection.content "^[\"']")
   (#offset! @injection.content 0 1 0 -1)
-  (#set! injection.language "c")
-)
-
-(
-  (function_call
-    (index
-      (identifier) @_cdef_identifier)
-    (arguments
-      (string) @injection.content)
-  )
+  (#set! injection.language "c"))
 
+((function_call
+  (index
+    (identifier) @_cdef_identifier)
+  (arguments
+    (string) @injection.content))
   (#eq? @_cdef_identifier "cdef")
   (#lua-match? @injection.content "^%[%[")
   (#offset! @injection.content 0 2 0 -2)
-  (#set! injection.language "c")
-)
+  (#set! injection.language "c"))
 
 ; string.format('...')
 ((function_call
   (index
     (identifier) @_base
     key: (identifier) @_entry)
-  (arguments . (string) @injection.content))
- (#eq? @_base "string")
- (#eq? @_entry "format")
- (#set! injection.language "printf"))
+  (arguments
+    .
+    (string) @injection.content))
+  (#eq? @_base "string")
+  (#eq? @_entry "format")
+  (#set! injection.language "printf"))
 
 ; ('...'):format()
 ((function_call
-  (method_index (string) @printf
+  (method_index
+    (string) @printf
     key: (identifier) @_func))
- (#eq? @_func "format")
- (#set! injection.language "printf"))
+  (#eq? @_func "format")
+  (#set! injection.language "printf"))
 
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/teal/locals.scm b/queries/teal/locals.scm
index e26efc43e..25b56418f 100644
--- a/queries/teal/locals.scm
+++ b/queries/teal/locals.scm
@@ -1,23 +1,38 @@
 (var_declaration
-  declarators: (var_declarators
-  (var (identifier)) @local.definition.var))
+  declarators:
+    (var_declarators
+      (var
+        (identifier)) @local.definition.var))
 
 (var_assignment
-  variables: (assignment_variables
-    (var (identifier) @local.definition.var) @local.definition.associated))
+  variables:
+    (assignment_variables
+      (var
+        (identifier) @local.definition.var) @local.definition.associated))
 
-(arg name: (identifier) @local.definition.parameter)
+(arg
+  name: (identifier) @local.definition.parameter)
 
 (anon_function) @local.scope
+
 ((function_statement
   (function_name) @local.definition.function) @local.scope)
 
 (program) @local.scope
+
 (if_statement) @local.scope
-(generic_for_statement (for_body) @local.scope)
-(numeric_for_statement (for_body) @local.scope)
+
+(generic_for_statement
+  (for_body) @local.scope)
+
+(numeric_for_statement
+  (for_body) @local.scope)
+
 (repeat_statement) @local.scope
-(while_statement (while_body) @local.scope)
+
+(while_statement
+  (while_body) @local.scope)
+
 (do_statement) @local.scope
 
 (identifier) @local.reference
diff --git a/queries/templ/highlights.scm b/queries/templ/highlights.scm
index 1187344a9..f8e9d2359 100644
--- a/queries/templ/highlights.scm
+++ b/queries/templ/highlights.scm
@@ -1,5 +1,4 @@
 ; inherits: go
-
 (component_declaration
   name: (component_identifier) @function)
 
@@ -12,6 +11,7 @@
 
 (attribute
   name: (attribute_name) @tag.attribute)
+
 (attribute
   value: (quoted_attribute_value) @string)
 
@@ -21,8 +21,10 @@
 ] @string.special
 
 (css_identifier) @function
+
 (css_property
   name: (css_property_name) @attribute)
+
 (css_property
   value: (css_property_value) @attribute)
 
diff --git a/queries/templ/injections.scm b/queries/templ/injections.scm
index 54e8d6f68..df87ddc97 100644
--- a/queries/templ/injections.scm
+++ b/queries/templ/injections.scm
@@ -1,8 +1,12 @@
 ; inherits: go
+((element_comment) @injection.content
+  (#set! injection.language "comment"))
 
-((element_comment) @injection.content (#set! injection.language "comment"))
+((script_block_text) @injection.content
+  (#set! injection.language "javascript"))
 
-((script_block_text) @injection.content (#set! injection.language "javascript"))
-((script_element_text) @injection.content (#set! injection.language "javascript"))
+((script_element_text) @injection.content
+  (#set! injection.language "javascript"))
 
-((style_element_text) @injection.content (#set! injection.language "css"))
+((style_element_text) @injection.content
+  (#set! injection.language "css"))
diff --git a/queries/terraform/highlights.scm b/queries/terraform/highlights.scm
index d75b4284f..4050ce77a 100644
--- a/queries/terraform/highlights.scm
+++ b/queries/terraform/highlights.scm
@@ -1,21 +1,41 @@
 ; inherits: hcl
-
 ; Terraform specific references
 ;
 ;
 ; local/module/data/var/output
-(expression (variable_expr (identifier) @variable.builtin (#any-of? @variable.builtin "data" "var" "local" "module" "output")) (get_attr (identifier) @variable.member))
+(expression
+  (variable_expr
+    (identifier) @variable.builtin
+    (#any-of? @variable.builtin "data" "var" "local" "module" "output"))
+  (get_attr
+    (identifier) @variable.member))
 
 ; path.root/cwd/module
-(expression (variable_expr (identifier) @type.builtin (#eq? @type.builtin "path")) (get_attr (identifier) @variable.builtin (#any-of? @variable.builtin "root" "cwd" "module")))
+(expression
+  (variable_expr
+    (identifier) @type.builtin
+    (#eq? @type.builtin "path"))
+  (get_attr
+    (identifier) @variable.builtin
+    (#any-of? @variable.builtin "root" "cwd" "module")))
 
 ; terraform.workspace
-(expression (variable_expr (identifier) @type.builtin (#eq? @type.builtin "terraform")) (get_attr (identifier) @variable.builtin (#any-of? @variable.builtin "workspace")))
+(expression
+  (variable_expr
+    (identifier) @type.builtin
+    (#eq? @type.builtin "terraform"))
+  (get_attr
+    (identifier) @variable.builtin
+    (#any-of? @variable.builtin "workspace")))
 
 ; Terraform specific keywords
-
 ; FIXME: ideally only for identifiers under a `variable` block to minimize false positives
-((identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
-(object_elem val: (expression
-  (variable_expr
-    (identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
+((identifier) @type.builtin
+  (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
+
+(object_elem
+  val:
+    (expression
+      (variable_expr
+        (identifier) @type.builtin
+        (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
diff --git a/queries/textproto/highlights.scm b/queries/textproto/highlights.scm
index 439ca6875..451362216 100644
--- a/queries/textproto/highlights.scm
+++ b/queries/textproto/highlights.scm
@@ -5,8 +5,13 @@
 (comment) @comment
 
 (number) @number
+
 ; For stuff like "inf" and "-inf".
-(scalar_value [ (identifier) (signed_identifier) ]) @number
+(scalar_value
+  [
+    (identifier)
+    (signed_identifier)
+  ]) @number
 
 [
   (open_squiggly)
diff --git a/queries/textproto/indents.scm b/queries/textproto/indents.scm
index fd6db7ffb..155299e39 100644
--- a/queries/textproto/indents.scm
+++ b/queries/textproto/indents.scm
@@ -1,7 +1,14 @@
 (message_value) @indent.begin
-(message_value (close_squiggly) @indent.branch)
+
+(message_value
+  (close_squiggly) @indent.branch)
 
 (scalar_list) @indent.begin
-(scalar_list (close_square) @indent.branch)
+
+(scalar_list
+  (close_square) @indent.branch)
+
 (message_list) @indent.begin
-(message_list (close_square) @indent.branch)
+
+(message_list
+  (close_square) @indent.branch)
diff --git a/queries/thrift/folds.scm b/queries/thrift/folds.scm
index 1361be1f8..3beec3567 100644
--- a/queries/thrift/folds.scm
+++ b/queries/thrift/folds.scm
@@ -7,6 +7,5 @@
   (service_definition)
   (struct_definition)
   (union_definition)
-
   (comment)
 ] @fold
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index a1ccdc9a2..984e702e4 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -1,51 +1,54 @@
 ; Variables
-
 ((identifier) @variable
   (#set! "priority" 95))
 
 ; Includes
-
 [
   "include"
   "cpp_include"
 ] @keyword.import
 
 ; Function
-
 (function_definition
   (identifier) @function)
 
 ; Fields
-
-(field (identifier) @variable.member)
+(field
+  (identifier) @variable.member)
 
 ; Parameters
-
 (function_definition
   (parameters
-    (parameter (identifier) @variable.parameter)))
+    (parameter
+      (identifier) @variable.parameter)))
 
 (throws
   (parameters
-    (parameter (identifier) @variable.parameter)))
+    (parameter
+      (identifier) @variable.parameter)))
 
 ; Types
-
 (typedef_identifier) @type
+
 (struct_definition
-  "struct" (identifier) @type)
+  "struct"
+  (identifier) @type)
 
 (union_definition
-  "union" (identifier) @type)
+  "union"
+  (identifier) @type)
 
 (exception_definition
-  "exception" (identifier) @type)
+  "exception"
+  (identifier) @type)
 
 (service_definition
-  "service" (identifier) @type)
+  "service"
+  (identifier) @type)
 
 (interaction_definition
-  "interaction" (identifier) @type)
+  "interaction"
+  (identifier) @type)
 
 (type
   type: (identifier) @type)
@@ -57,16 +60,21 @@
   (#lua-match? @type "^[_]*[A-Z]"))
 
 ; Constants
+(const_definition
+  (identifier) @constant)
 
-(const_definition (identifier) @constant)
 ((identifier) @constant
   (#lua-match? @constant "^[_A-Z][A-Z0-9_]*$"))
-(enum_definition "enum"
-  . (identifier) @type
-  "{" (identifier) @constant "}")
+
+(enum_definition
+  "enum"
+  .
+  (identifier) @type
+  "{"
+  (identifier) @constant
+  "}")
 
 ; Builtin Types
-
 (primitive) @type.builtin
 
 [
@@ -79,35 +87,38 @@
 ] @type.builtin
 
 ; Namespace
-
 (namespace_declaration
   (namespace_scope) @tag
-  [(namespace) @module (_ (identifier) @module)])
+  [
+    (namespace) @module
+    (_
+      (identifier) @module)
+  ])
 
 ; Attributes
-
 (annotation_definition
-  (annotation_identifier (identifier) @attribute))
+  (annotation_identifier
+    (identifier) @attribute))
+
 (fb_annotation_definition
-  "@" @attribute (annotation_identifier (identifier) @attribute)
+  "@" @attribute
+  (annotation_identifier
+    (identifier) @attribute)
   (identifier)? @attribute)
-(namespace_uri (string) @attribute)
+
+(namespace_uri
+  (string) @attribute)
 
 ; Operators
-
 [
   "="
   "&"
 ] @operator
 
 ; Exceptions
-
-[
-  "throws"
-] @keyword.exception
+"throws" @keyword.exception
 
 ; Keywords
-
 [
   "enum"
   "exception"
@@ -123,7 +134,6 @@
 ] @keyword
 
 ; Deprecated Keywords
-
 [
   "cocoa_prefix"
   "cpp_namespace"
@@ -155,7 +165,6 @@
 ] @keyword.coroutine
 
 ; Qualifiers
-
 [
   "client"
   "const"
@@ -171,7 +180,6 @@
 ] @type.qualifier
 
 ; Literals
-
 (string) @string
 
 (escape_sequence) @string.escape
@@ -186,22 +194,30 @@
 (boolean) @boolean
 
 ; Typedefs
-
 (typedef_identifier) @type.definition
 
 ; Punctuation
+"*" @punctuation.special
 
 [
-  "*"
-] @punctuation.special
+  "{"
+  "}"
+] @punctuation.bracket
 
-["{" "}"] @punctuation.bracket
+[
+  "("
+  ")"
+] @punctuation.bracket
 
-["(" ")"] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
-["[" "]"] @punctuation.bracket
-
-["<" ">"] @punctuation.bracket
+[
+  "<"
+  ">"
+] @punctuation.bracket
 
 [
   "."
@@ -211,7 +227,6 @@
 ] @punctuation.delimiter
 
 ; Comments
-
 (comment) @comment @spell
 
 ((comment) @comment.documentation
@@ -219,6 +234,7 @@
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///[^/]"))
+
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
diff --git a/queries/thrift/indents.scm b/queries/thrift/indents.scm
index 32c6a2e9f..db49c0712 100644
--- a/queries/thrift/indents.scm
+++ b/queries/thrift/indents.scm
@@ -1,14 +1,21 @@
 (definition) @indent.begin
 
-((parameters (parameter)) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+((parameters
+  (parameter)) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
 "}" @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "(" ")" ] @indent.branch
+[
+  "("
+  ")"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/thrift/injections.scm b/queries/thrift/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/thrift/injections.scm
+++ b/queries/thrift/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/thrift/locals.scm b/queries/thrift/locals.scm
index d1c4af9a1..49f25bdde 100644
--- a/queries/thrift/locals.scm
+++ b/queries/thrift/locals.scm
@@ -1,51 +1,70 @@
 ; Scopes
-
 [
   (document)
   (definition)
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
-
 (annotation_identifier) @local.definition
 
-(const_definition (identifier) @local.definition.constant)
+(const_definition
+  (identifier) @local.definition.constant)
 
-(enum_definition "enum"
-  . (identifier) @local.definition.enum
-  "{" (identifier) @local.definition.constant "}")
+(enum_definition
+  "enum"
+  .
+  (identifier) @local.definition.enum
+  "{"
+  (identifier) @local.definition.constant
+  "}")
 
-(senum_definition "senum"
-  . (identifier) @local.definition.enum)
+(senum_definition
+  "senum"
+  .
+  (identifier) @local.definition.enum)
 
-(field (identifier) @local.definition.field)
+(field
+  (identifier) @local.definition.field)
 
-(function_definition (identifier) @local.definition.function)
+(function_definition
+  (identifier) @local.definition.function)
 
 (namespace_declaration
-  "namespace" (namespace_scope)
-  . (_) @local.definition.namespace
+  "namespace"
+  (namespace_scope)
+  .
+  (_) @local.definition.namespace
   (namespace_uri)?)
 
-(parameter (identifier) @local.definition.parameter)
+(parameter
+  (identifier) @local.definition.parameter)
 
 (struct_definition
-  "struct" . (identifier) @local.definition.type)
+  "struct"
+  .
+  (identifier) @local.definition.type)
 
 (union_definition
-  "union" . (identifier) @local.definition.type)
+  "union"
+  .
+  (identifier) @local.definition.type)
 
 (exception_definition
-  "exception" . (identifier) @local.definition.type)
+  "exception"
+  .
+  (identifier) @local.definition.type)
 
 (service_definition
-  "service" . (identifier) @local.definition.type)
+  "service"
+  .
+  (identifier) @local.definition.type)
 
 (interaction_definition
-  "interaction" . (identifier) @local.definition.type)
+  "interaction"
+  .
+  (identifier) @local.definition.type)
 
 (typedef_identifier) @local.definition.type
diff --git a/queries/tiger/folds.scm b/queries/tiger/folds.scm
index 24332a0f2..c74871bde 100644
--- a/queries/tiger/folds.scm
+++ b/queries/tiger/folds.scm
@@ -8,12 +8,9 @@
   (let_expression)
   (function_declaration)
   (primitive_declaration)
-
   (record_type)
-
   (class_declaration)
   (class_type)
   (method_declaration)
 ] @fold
-
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index 0516341c3..e77d80229 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -1,29 +1,20 @@
 ; Built-ins {{{
 ((function_call
   function: (identifier) @function.builtin)
-  (#any-of? @function.builtin "chr" "concat" "exit" "flush" "getchar" "not" "ord" "print" "print_err" "print_int" "size" "strcmp" "streq" "substring")
-  ; FIXME: not supported by neovim
-  ; (#is-not? local)
-  )
+  (#any-of? @function.builtin "chr" "concat" "exit" "flush" "getchar" "not" "ord" "print" "print_err" "print_int" "size" "strcmp" "streq" "substring"))
 
 ((type_identifier) @type.builtin
-  (#any-of? @type.builtin "int" "string" "Object")
-  ; FIXME: not supported by neovim
-  ; (#is-not? local)
-  )
+  (#any-of? @type.builtin "int" "string" "Object"))
 
 ((identifier) @variable.builtin
-  (#eq? @variable.builtin "self")
-  ; FIXME: not supported by neovim
-  ; (#is-not? local)
-  )
-; }}}
+  (#eq? @variable.builtin "self"))
 
+; }}}
 ; Keywords {{{
 [
- "function"
- "primitive"
- "method"
+  "function"
+  "primitive"
+  "method"
 ] @keyword.function
 
 [
@@ -49,73 +40,79 @@
   "then"
   "type"
   "var"
-
   "class"
   "extends"
-
   "_cast"
   "_chunks"
   "_exp"
   "_lvalue"
   "_namety"
 ] @keyword
-; }}}
 
+; }}}
 ; Operators {{{
 (operator) @operator
 
 [
- ","
- ";"
- ":"
- "."
+  ","
+  ";"
+  ":"
+  "."
 ] @punctuation.delimiter
 
 [
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
-; }}}
 
+; }}}
 ; Functions and methods {{{
 (function_call
   function: (identifier) @function)
+
 (function_declaration
   name: (identifier) @function)
+
 (primitive_declaration
   name: (identifier) @function)
 
 (method_call
   method: (identifier) @function.method)
+
 (method_declaration
   name: (identifier) @function.method)
 
 (parameters
   name: (identifier) @variable.parameter)
-; }}}
 
+; }}}
 ; Declarations {{{
 (import_declaration
   file: (string_literal) @string.special.path)
-; }}}
 
+; }}}
 ; Literals {{{
 (nil_literal) @constant.builtin
-(integer_literal) @number
-(string_literal) @string
-(escape_sequence) @string.escape
-; }}}
 
+(integer_literal) @number
+
+(string_literal) @string
+
+(escape_sequence) @string.escape
+
+; }}}
 ; Misc {{{
 (comment) @comment @spell
 
 (type_identifier) @type
-(field_identifier) @property
-(identifier) @variable
-; }}}
 
+(field_identifier) @property
+
+(identifier) @variable
+
+; }}}
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tiger/indents.scm b/queries/tiger/indents.scm
index 6f6c80bae..686bfde16 100644
--- a/queries/tiger/indents.scm
+++ b/queries/tiger/indents.scm
@@ -1,70 +1,104 @@
 ; Control flow {{{
 (if_expression) @indent.begin
+
 "then" @indent.branch
+
 "else" @indent.branch
 
 (while_expression) @indent.begin
+
 "do" @indent.branch
 
 (for_expression) @indent.begin
-"to" @indent.branch
-; }}}
 
+"to" @indent.branch
+
+; }}}
 ; Class {{{
 (class_declaration) @indent.begin
-(class_declaration "}" @indent.end)
+
+(class_declaration
+  "}" @indent.end)
 
 (class_type) @indent.begin
-(class_type "}" @indent.end)
-; }}}
 
+(class_type
+  "}" @indent.end)
+
+; }}}
 ; Groups {{{
 (let_expression) @indent.begin
+
 "in" @indent.branch
+
 "end" @indent.branch
-(let_expression "end" @indent.end)
+
+(let_expression
+  "end" @indent.end)
 
 (sequence_expression) @indent.begin
-")" @indent.branch
-(sequence_expression ")" @indent.end)
-; }}}
 
+")" @indent.branch
+
+(sequence_expression
+  ")" @indent.end)
+
+; }}}
 ; Functions and methods {{{
 (parameters) @indent.begin
-(parameters ")" @indent.end)
+
+(parameters
+  ")" @indent.end)
 
 (function_call) @indent.begin
-(function_call ")" @indent.end)
+
+(function_call
+  ")" @indent.end)
+
 (method_call) @indent.begin
+
 ")" @indent.branch
 
 (function_declaration) @indent.begin
-(primitive_declaration) @indent.begin
-(method_declaration) @indent.begin
-; }}}
 
+(primitive_declaration) @indent.begin
+
+(method_declaration) @indent.begin
+
+; }}}
 ; Values and expressions {{{
 (array_value) @indent.begin
+
 "]" @indent.branch
-(array_value "]" @indent.end)
+
+(array_value
+  "]" @indent.end)
 
 (array_expression) @indent.begin
+
 "of" @indent.branch
 
 (record_expression) @indent.begin
+
 "}" @indent.branch
-(record_expression "}" @indent.end)
+
+(record_expression
+  "}" @indent.end)
 
 (record_type) @indent.begin
+
 "}" @indent.branch
-(record_type "}" @indent.end)
+
+(record_type
+  "}" @indent.end)
 
 (variable_declaration) @indent.begin
-; }}}
 
+; }}}
 ; Misc{{{
 (comment) @indent.ignore
-(string_literal) @indent.ignore
-; }}}
 
+(string_literal) @indent.ignore
+
+; }}}
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tiger/injections.scm b/queries/tiger/injections.scm
index b0063012c..5dfaa7aeb 100644
--- a/queries/tiger/injections.scm
+++ b/queries/tiger/injections.scm
@@ -1,4 +1,3 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
-
+  (#set! injection.language "comment"))
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tiger/locals.scm b/queries/tiger/locals.scm
index df26bb2a0..f010dd0e8 100644
--- a/queries/tiger/locals.scm
+++ b/queries/tiger/locals.scm
@@ -3,15 +3,14 @@
 ; top-to-bottom).
 ;
 ; [1]: https://github.com/tree-sitter/tree-sitter/issues/918
-
 ; Scopes {{{
 [
- (for_expression)
- (let_expression)
- (function_declaration)
+  (for_expression)
+  (let_expression)
+  (function_declaration)
 ] @local.scope
-; }}}
 
+; }}}
 ; Definitions {{{
 (type_declaration
   name: (identifier) @local.definition.type
@@ -23,6 +22,7 @@
 (function_declaration
   name: (identifier) @local.definition.function
   (#set! "definition.var.scope" "parent"))
+
 (primitive_declaration
   name: (identifier) @local.definition.function
   (#set! "definition.var.scope" "parent"))
@@ -30,10 +30,10 @@
 (variable_declaration
   name: (identifier) @local.definition.var
   (#set! "definition.var.scope" "parent"))
-; }}}
 
+; }}}
 ; References {{{
 (identifier) @local.reference
-; }}}
 
+; }}}
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index f1ad576cf..be4b24581 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -1,8 +1,7 @@
-; ; Intended for consumption by nvim-treesitter 
+; ; Intended for consumption by nvim-treesitter
 ; ; Default capture names for nvim-treesitter found here:
 ; ; https://github.com/nvim-treesitter/nvim-treesitter/blob/e473630fe0872cb0ed97cd7085e724aa58bc1c84/lua/nvim-treesitter/highlight.lua#L14-L104
 ; ; In this file, captures defined later take precedence over captures defined earlier
-
 ; Keywords
 [
   "ACTION"
@@ -97,96 +96,203 @@
   "when"
   "with"
 ] @keyword
+
+"await" @keyword.coroutine
+
+(pcal_with
+  ("=") @keyword)
+
+(pcal_process
+  ("=") @keyword)
+
 [
-  "await"
-] @keyword.coroutine
-(pcal_with ("=") @keyword)
-(pcal_process ("=") @keyword)
-[ 
-  "if" 
-  "then" 
-  "else" 
+  "if"
+  "then"
+  "else"
   "elsif"
   (pcal_end_if)
   "either"
   (pcal_end_either)
 ] @keyword.conditional
-[ 
-  "while" 
-  "do" 
-  (pcal_end_while) 
-  "with" 
+
+[
+  "while"
+  "do"
+  (pcal_end_while)
+  "with"
   (pcal_end_with)
 ] @keyword.repeat
+
 ("return") @keyword.return
+
 ("print") @function.macro
 
-
 ; Literals
-(binary_number (format) @keyword)
-(binary_number (value) @number)
+(binary_number
+  (format) @keyword)
+
+(binary_number
+  (value) @number)
+
 (boolean) @boolean
+
 (boolean_set) @type
-(hex_number (format) @keyword)
-(hex_number (value) @number)
+
+(hex_number
+  (format) @keyword)
+
+(hex_number
+  (value) @number)
+
 (int_number_set) @type
+
 (nat_number) @number
+
 (nat_number_set) @type
-(octal_number (format) @keyword)
-(octal_number (value) @number)
+
+(octal_number
+  (format) @keyword)
+
+(octal_number
+  (value) @number)
+
 (real_number) @number
+
 (real_number_set) @type
+
 (string) @string
+
 (escape_char) @string.escape
+
 (string_set) @type
 
 ; Namespaces
-(extends (identifier_ref) @module)
-(instance (identifier_ref) @module)
-(module name: (identifier) @module)
-(pcal_algorithm name: (identifier) @module)
+(extends
+  (identifier_ref) @module)
+
+(instance
+  (identifier_ref) @module)
+
+(module
+  name: (identifier) @module)
+
+(pcal_algorithm
+  name: (identifier) @module)
 
 ; Operators, functions, and macros
-(bound_infix_op symbol: (_) @operator)
-(bound_nonfix_op symbol: (_) @operator)
-(bound_postfix_op symbol: (_) @operator)
-(bound_prefix_op symbol: (_) @operator)
+(bound_infix_op
+  symbol: (_) @operator)
+
+(bound_nonfix_op
+  symbol: (_) @operator)
+
+(bound_postfix_op
+  symbol: (_) @operator)
+
+(bound_prefix_op
+  symbol: (_) @operator)
+
 ((prefix_op_symbol) @operator)
+
 ((infix_op_symbol) @operator)
+
 ((postfix_op_symbol) @operator)
-(function_definition name: (identifier) @function)
-(module_definition name: (_) @keyword.import)
-(operator_definition name: (_) @function.macro)
-(pcal_macro_decl name: (identifier) @function.macro)
-(pcal_macro_call name: (identifier) @function.macro)
-(pcal_proc_decl name: (identifier) @function.macro)
-(pcal_process name: (identifier) @function)
-(recursive_declaration (identifier) @function.macro)
-(recursive_declaration (operator_declaration name: (_) @function.macro))
+
+(function_definition
+  name: (identifier) @function)
+
+(module_definition
+  name: (_) @keyword.import)
+
+(operator_definition
+  name: (_) @function.macro)
+
+(pcal_macro_decl
+  name: (identifier) @function.macro)
+
+(pcal_macro_call
+  name: (identifier) @function.macro)
+
+(pcal_proc_decl
+  name: (identifier) @function.macro)
+
+(pcal_process
+  name: (identifier) @function)
+
+(recursive_declaration
+  (identifier) @function.macro)
+
+(recursive_declaration
+  (operator_declaration
+    name: (_) @function.macro))
 
 ; Constants and variables
-(constant_declaration (identifier) @constant)
-(constant_declaration (operator_declaration name: (_) @constant))
-(pcal_var_decl (identifier) @variable)
-(pcal_with (identifier) @variable.parameter)
-((".") . (identifier) @attribute)
-(record_literal (identifier) @attribute)
-(set_of_records (identifier) @attribute)
-(variable_declaration (identifier) @variable)
+(constant_declaration
+  (identifier) @constant)
+
+(constant_declaration
+  (operator_declaration
+    name: (_) @constant))
+
+(pcal_var_decl
+  (identifier) @variable)
+
+(pcal_with
+  (identifier) @variable.parameter)
+
+((".")
+  .
+  (identifier) @attribute)
+
+(record_literal
+  (identifier) @attribute)
+
+(set_of_records
+  (identifier) @attribute)
+
+(variable_declaration
+  (identifier) @variable)
 
 ; Parameters
-(choose (identifier) @variable.parameter)
-(choose (tuple_of_identifiers (identifier) @variable.parameter))
-(lambda (identifier) @variable.parameter)
-(module_definition (operator_declaration name: (_) @variable.parameter))
-(module_definition parameter: (identifier) @variable.parameter)
-(operator_definition (operator_declaration name: (_) @variable.parameter))
-(operator_definition parameter: (identifier) @variable.parameter)
-(pcal_macro_decl parameter: (identifier) @variable.parameter)
-(pcal_proc_var_decl (identifier) @variable.parameter)
-(quantifier_bound (identifier) @variable.parameter)
-(quantifier_bound (tuple_of_identifiers (identifier) @variable.parameter))
-(unbounded_quantification (identifier) @variable.parameter)
+(choose
+  (identifier) @variable.parameter)
+
+(choose
+  (tuple_of_identifiers
+    (identifier) @variable.parameter))
+
+(lambda
+  (identifier) @variable.parameter)
+
+(module_definition
+  (operator_declaration
+    name: (_) @variable.parameter))
+
+(module_definition
+  parameter: (identifier) @variable.parameter)
+
+(operator_definition
+  (operator_declaration
+    name: (_) @variable.parameter))
+
+(operator_definition
+  parameter: (identifier) @variable.parameter)
+
+(pcal_macro_decl
+  parameter: (identifier) @variable.parameter)
+
+(pcal_proc_var_decl
+  (identifier) @variable.parameter)
+
+(quantifier_bound
+  (identifier) @variable.parameter)
+
+(quantifier_bound
+  (tuple_of_identifiers
+    (identifier) @variable.parameter))
+
+(unbounded_quantification
+  (identifier) @variable.parameter)
 
 ; Delimiters
 [
@@ -201,6 +307,7 @@
   "("
   ")"
 ] @punctuation.bracket
+
 [
   ","
   ":"
@@ -214,57 +321,69 @@
 ] @punctuation.delimiter
 
 ; Proofs
-(assume_prove (new (identifier) @variable.parameter))
-(assume_prove (new (operator_declaration name: (_) @variable.parameter)))
-(assumption name: (identifier) @constant)
-(pick_proof_step (identifier) @variable.parameter)
-(proof_step_id "<" @punctuation.bracket)
-(proof_step_id (level) @label)
-(proof_step_id (name) @label)
-(proof_step_id ">" @punctuation.bracket)
-(proof_step_ref "<" @punctuation.bracket)
-(proof_step_ref (level) @label)
-(proof_step_ref (name) @label)
-(proof_step_ref ">" @punctuation.bracket)
-(take_proof_step (identifier) @variable.parameter)
-(theorem name: (identifier) @constant)
+(assume_prove
+  (new
+    (identifier) @variable.parameter))
+
+(assume_prove
+  (new
+    (operator_declaration
+      name: (_) @variable.parameter)))
+
+(assumption
+  name: (identifier) @constant)
+
+(pick_proof_step
+  (identifier) @variable.parameter)
+
+(proof_step_id
+  "<" @punctuation.bracket)
+
+(proof_step_id
+  (level) @label)
+
+(proof_step_id
+  (name) @label)
+
+(proof_step_id
+  ">" @punctuation.bracket)
+
+(proof_step_ref
+  "<" @punctuation.bracket)
+
+(proof_step_ref
+  (level) @label)
+
+(proof_step_ref
+  (name) @label)
+
+(proof_step_ref
+  ">" @punctuation.bracket)
+
+(take_proof_step
+  (identifier) @variable.parameter)
+
+(theorem
+  name: (identifier) @constant)
 
 ; Comments and tags
-(block_comment "(*" @comment)
-(block_comment "*)" @comment)
-(block_comment_text) @comment @spell
-(comment) @comment @spell
-(single_line) @comment
-(_ label: (identifier) @label)
-(label name: (_) @label)
-(pcal_goto statement: (identifier) @label)
+(block_comment
+  "(*" @comment)
 
-; Reference highlighting with the same color as declarations.
-; `constant`, `operator`, and others are custom captures defined in locals.scm
-((identifier_ref) @constant (#is? @constant constant))
-((identifier_ref) @function (#is? @function function))
-((identifier_ref) @function.macro (#is? @function.macro macro))
-((identifier_ref) @include (#is? @include import))
-((identifier_ref) @parameter (#is? @parameter parameter))
-((identifier_ref) @variable (#is? @variable var))
-((prefix_op_symbol) @constant (#is? @constant constant))
-((prefix_op_symbol) @function.macro (#is? @function.macro macro))
-((prefix_op_symbol) @parameter (#is? @parameter parameter))
-((infix_op_symbol) @constant (#is? @constant constant))
-((infix_op_symbol) @function.macro (#is? @function.macro macro))
-((infix_op_symbol) @parameter (#is? @parameter parameter))
-((postfix_op_symbol) @constant (#is? @constant constant))
-((postfix_op_symbol) @function.macro (#is? @function.macro macro))
-((postfix_op_symbol) @parameter (#is? @parameter parameter))
-(bound_prefix_op symbol: (_) @constant (#is? @constant constant))
-(bound_prefix_op symbol: (_) @function.macro (#is? @function.macro macro))
-(bound_prefix_op symbol: (_) @parameter (#is? @parameter parameter))
-(bound_infix_op symbol: (_) @constant (#is? @constant constant))
-(bound_infix_op symbol: (_) @function.macro (#is? @function.macro macro))
-(bound_infix_op symbol: (_) @parameter (#is? @parameter parameter))
-(bound_postfix_op symbol: (_) @constant (#is? @constant constant))
-(bound_postfix_op symbol: (_) @function.macro (#is? @function.macro macro))
-(bound_postfix_op symbol: (_) @parameter (#is? @parameter parameter))
-(bound_nonfix_op symbol: (_) @constant (#is? @constant constant))
-(bound_nonfix_op symbol: (_) @function.macro (#is? @function.macro macro))
-(bound_nonfix_op symbol: (_) @parameter (#is? @parameter parameter))
+(block_comment
+  "*)" @comment)
+
+(block_comment_text) @comment @spell
+
+(comment) @comment @spell
+
+(single_line) @comment
+
+(_
+  label: (identifier) @label)
+
+(label
+  name: (_) @label)
+
+(pcal_goto
+  statement: (identifier) @label)
diff --git a/queries/tlaplus/injections.scm b/queries/tlaplus/injections.scm
index b88c1facb..fbeff500b 100644
--- a/queries/tlaplus/injections.scm
+++ b/queries/tlaplus/injections.scm
@@ -1,5 +1,5 @@
 ([
   (comment)
   (block_comment_text)
- ] @injection.content
- (#set! injection.language "comment"))
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/tlaplus/locals.scm b/queries/tlaplus/locals.scm
index fbb4abf97..26d36140e 100644
--- a/queries/tlaplus/locals.scm
+++ b/queries/tlaplus/locals.scm
@@ -2,11 +2,11 @@
 [
   (bounded_quantification)
   (choose)
-  (function_definition) 
+  (function_definition)
   (function_literal)
-  (lambda) 
+  (lambda)
   (let_in)
-  (module) 
+  (module)
   (module_definition)
   (operator_definition)
   (set_filter)
@@ -14,28 +14,63 @@
   (unbounded_quantification)
 ] @local.scope
 
-(choose (identifier) @local.definition.parameter)
-(choose (tuple_of_identifiers (identifier) @local.definition.parameter))
-(constant_declaration (identifier) @local.definition.constant)
-(constant_declaration (operator_declaration name: (_) @local.definition.constant))
+(choose
+  (identifier) @local.definition.parameter)
+
+(choose
+  (tuple_of_identifiers
+    (identifier) @local.definition.parameter))
+
+(constant_declaration
+  (identifier) @local.definition.constant)
+
+(constant_declaration
+  (operator_declaration
+    name: (_) @local.definition.constant))
+
 (function_definition
   name: (identifier) @local.definition.function
   (#set! "definition.function.scope" "parent"))
-(lambda (identifier) @local.definition.parameter)
+
+(lambda
+  (identifier) @local.definition.parameter)
+
 (module_definition
   name: (_) @local.definition.import
   (#set! "definition.import.scope" "parent"))
-(module_definition parameter: (identifier) @local.definition.parameter)
-(module_definition parameter: (operator_declaration name: (_) @local.definition.parameter))
+
+(module_definition
+  parameter: (identifier) @local.definition.parameter)
+
+(module_definition
+  parameter:
+    (operator_declaration
+      name: (_) @local.definition.parameter))
+
 (operator_definition
   name: (_) @local.definition.macro
   (#set! "definition.macro.scope" "parent"))
-(operator_definition parameter: (identifier) @local.definition.parameter)
-(operator_definition parameter: (operator_declaration name: (_) @local.definition.parameter))
-(quantifier_bound (identifier) @local.definition.parameter)
-(quantifier_bound (tuple_of_identifiers (identifier) @local.definition.parameter))
-(unbounded_quantification (identifier) @local.definition.parameter)
-(variable_declaration (identifier) @local.definition.var)
+
+(operator_definition
+  parameter: (identifier) @local.definition.parameter)
+
+(operator_definition
+  parameter:
+    (operator_declaration
+      name: (_) @local.definition.parameter))
+
+(quantifier_bound
+  (identifier) @local.definition.parameter)
+
+(quantifier_bound
+  (tuple_of_identifiers
+    (identifier) @local.definition.parameter))
+
+(unbounded_quantification
+  (identifier) @local.definition.parameter)
+
+(variable_declaration
+  (identifier) @local.definition.var)
 
 ; Proof scopes and definitions
 [
@@ -44,11 +79,24 @@
   (theorem)
 ] @local.scope
 
-(assume_prove (new (identifier) @local.definition.parameter))
-(assume_prove (new (operator_declaration name: (_) @local.definition.parameter)))
-(assumption name: (identifier) @local.definition.constant)
-(pick_proof_step (identifier) @local.definition.parameter)
-(take_proof_step (identifier) @local.definition.parameter)
+(assume_prove
+  (new
+    (identifier) @local.definition.parameter))
+
+(assume_prove
+  (new
+    (operator_declaration
+      name: (_) @local.definition.parameter)))
+
+(assumption
+  name: (identifier) @local.definition.constant)
+
+(pick_proof_step
+  (identifier) @local.definition.parameter)
+
+(take_proof_step
+  (identifier) @local.definition.parameter)
+
 (theorem
   name: (identifier) @local.definition.constant
   (#set! "definition.constant.scope" "parent"))
@@ -61,28 +109,61 @@
   (pcal_with)
 ] @local.scope
 
-(pcal_macro_decl parameter: (identifier) @local.definition.parameter)
-(pcal_proc_var_decl (identifier) @local.definition.parameter)
-(pcal_var_decl (identifier) @local.definition.var)
-(pcal_with (identifier) @local.definition.parameter)
+(pcal_macro_decl
+  parameter: (identifier) @local.definition.parameter)
+
+(pcal_proc_var_decl
+  (identifier) @local.definition.parameter)
+
+(pcal_var_decl
+  (identifier) @local.definition.var)
+
+(pcal_with
+  (identifier) @local.definition.parameter)
 
 ; Built-in PlusCal variables
 (pcal_algorithm_body
   [
-    (_ (identifier_ref) @local.definition.var)
-    (_ (_ (identifier_ref) @local.definition.var))
-    (_ (_ (_ (identifier_ref) @local.definition.var))) 
-    (_ (_ (_ (_ (identifier_ref) @local.definition.var))))
-    (_ (_ (_ (_ (_ (identifier_ref) @local.definition.var)))))
+    (_
+      (identifier_ref) @local.definition.var)
+    (_
+      (_
+        (identifier_ref) @local.definition.var))
+    (_
+      (_
+        (_
+          (identifier_ref) @local.definition.var)))
+    (_
+      (_
+        (_
+          (_
+            (identifier_ref) @local.definition.var))))
+    (_
+      (_
+        (_
+          (_
+            (_
+              (identifier_ref) @local.definition.var)))))
   ]
   (#any-of? @local.definition.var "self" "pc" "stack"))
 
 ; References
 (identifier_ref) @local.reference
+
 ((prefix_op_symbol) @local.reference)
-(bound_prefix_op symbol: (_) @local.reference)
+
+(bound_prefix_op
+  symbol: (_) @local.reference)
+
 ((infix_op_symbol) @local.reference)
-(bound_infix_op symbol: (_) @local.reference)
+
+(bound_infix_op
+  symbol: (_) @local.reference)
+
 ((postfix_op_symbol) @local.reference)
-(bound_postfix_op symbol: (_) @local.reference)
-(bound_nonfix_op symbol: (_) @local.reference)
+
+(bound_postfix_op
+  symbol: (_) @local.reference)
+
+(bound_nonfix_op
+  symbol: (_) @local.reference)
diff --git a/queries/todotxt/highlights.scm b/queries/todotxt/highlights.scm
index 37f91b8a7..1da096201 100644
--- a/queries/todotxt/highlights.scm
+++ b/queries/todotxt/highlights.scm
@@ -1,6 +1,16 @@
 (done_task) @comment
-(task (priority) @keyword)
-(task (date) @comment)
-(task (kv) @comment)
-(task (project) @string)
-(task (context) @type)
+
+(task
+  (priority) @keyword)
+
+(task
+  (date) @comment)
+
+(task
+  (kv) @comment)
+
+(task
+  (project) @string)
+
+(task
+  (context) @type)
diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index a54dc167e..4e3c41f97 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -1,34 +1,48 @@
 ; Properties
 ;-----------
-
 (bare_key) @type
+
 (quoted_key) @string
-(pair (bare_key)) @property
+
+(pair
+  (bare_key)) @property
 
 ; Literals
 ;---------
-
 (boolean) @boolean
+
 (comment) @comment @spell
+
 (string) @string
+
 (integer) @number
+
 (float) @number.float
+
 (offset_date_time) @string.special
+
 (local_date_time) @string.special
+
 (local_date) @string.special
+
 (local_time) @string.special
 
 ; Punctuation
 ;------------
-
 "." @punctuation.delimiter
+
 "," @punctuation.delimiter
 
 "=" @operator
 
 "[" @punctuation.bracket
+
 "]" @punctuation.bracket
+
 "[[" @punctuation.bracket
+
 "]]" @punctuation.bracket
+
 "{" @punctuation.bracket
+
 "}" @punctuation.bracket
diff --git a/queries/toml/injections.scm b/queries/toml/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/toml/injections.scm
+++ b/queries/toml/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/tsv/highlights.scm b/queries/tsv/highlights.scm
index d406bd903..f00f13da3 100644
--- a/queries/tsv/highlights.scm
+++ b/queries/tsv/highlights.scm
@@ -1,4 +1,7 @@
 (text) @string
+
 (number) @number
+
 (float) @number.float
+
 (boolean) @boolean
diff --git a/queries/turtle/highlights.scm b/queries/turtle/highlights.scm
index 4462d583a..f4db53c36 100644
--- a/queries/turtle/highlights.scm
+++ b/queries/turtle/highlights.scm
@@ -4,8 +4,8 @@
 
 [
   "_:"
-  "<" 
-  ">" 
+  "<"
+  ">"
   (namespace)
 ] @module
 
@@ -52,7 +52,12 @@
 
 (echar) @string.escape
 
-
-(rdf_literal 
+(rdf_literal
   "^^" @type
-	datatype: (_ ["<" ">" (namespace)] @type) @type)
+  datatype:
+    (_
+      [
+        "<"
+        ">"
+        (namespace)
+      ] @type) @type)
diff --git a/queries/turtle/indents.scm b/queries/turtle/indents.scm
index 4d40b3cbe..add94d18b 100644
--- a/queries/turtle/indents.scm
+++ b/queries/turtle/indents.scm
@@ -1,10 +1,10 @@
 [
- (statement)
- (blank_node_property_list)
- (collection)
+  (statement)
+  (blank_node_property_list)
+  (collection)
 ] @indent.begin
+
 [
   "]"
   ")"
 ] @indent.branch
-
diff --git a/queries/turtle/injections.scm b/queries/turtle/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/turtle/injections.scm
+++ b/queries/turtle/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/twig/highlights.scm b/queries/twig/highlights.scm
index a0a19160d..435fdc0f1 100644
--- a/queries/twig/highlights.scm
+++ b/queries/twig/highlights.scm
@@ -1,55 +1,81 @@
 (comment) @comment @spell
 
 (filter_identifier) @function.call
+
 (function_identifier) @function.call
+
 (test) @function.builtin
+
 (variable) @variable
+
 (string) @string
+
 (interpolated_string) @string
+
 (operator) @operator
+
 (number) @number
+
 (boolean) @boolean
+
 (null) @constant.builtin
+
 (keyword) @keyword
+
 (attribute) @attribute
+
 (tag) @tag
+
 (conditional) @keyword.conditional
+
 (repeat) @keyword.repeat
+
 (method) @function.method
+
 (parameter) @variable.parameter
 
 [
-    "{{"
-    "}}"
-    "{{-"
-    "-}}"
-    "{{~"
-    "~}}"
-    "{%"
-    "%}"
-    "{%-"
-    "-%}"
-    "{%~"
-    "~%}"
+  "{{"
+  "}}"
+  "{{-"
+  "-}}"
+  "{{~"
+  "~}}"
+  "{%"
+  "%}"
+  "{%-"
+  "-%}"
+  "{%~"
+  "~%}"
 ] @tag.delimiter
 
 [
-    ","
-    "."
+  ","
+  "."
 ] @punctuation.delimiter
 
 [
-    "?"
-    ":"
-    "="
-    "|"
+  "?"
+  ":"
+  "="
+  "|"
 ] @operator
 
-(interpolated_string ["#{" "}"] @punctuation.special)
+(interpolated_string
+  [
+    "#{"
+    "}"
+  ] @punctuation.special)
 
 [
-    "(" ")"
-    "[" "]"
+  "("
+  ")"
+  "["
+  "]"
 ] @punctuation.bracket
 
-(hash ["{" "}"] @punctuation.bracket)
+(hash
+  [
+    "{"
+    "}"
+  ] @punctuation.bracket)
diff --git a/queries/twig/injections.scm b/queries/twig/injections.scm
index 29ba009a8..c475757bf 100644
--- a/queries/twig/injections.scm
+++ b/queries/twig/injections.scm
@@ -1,4 +1,3 @@
 ((content) @injection.content
- (#set! injection.language "html")
- (#set! injection.combined))
-
+  (#set! injection.language "html")
+  (#set! injection.combined))
diff --git a/queries/typescript/folds.scm b/queries/typescript/folds.scm
index df0b8942a..006ba857a 100644
--- a/queries/typescript/folds.scm
+++ b/queries/typescript/folds.scm
@@ -1,5 +1,4 @@
 ; inherits: ecma
-
 [
   (interface_declaration)
   (internal_module)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index bc6478a45..4cfca6d81 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -1,8 +1,8 @@
 ; inherits: ecma
-
 "require" @keyword.import
 
-(import_require_clause source: (string) @string.special.url)
+(import_require_clause
+  source: (string) @string.special.url)
 
 [
   "declare"
@@ -24,9 +24,14 @@
   "satisfies"
 ] @keyword.operator
 
-(as_expression "as" @keyword.operator)
-(export_statement "as" @keyword.operator)
-(mapped_type_clause "as" @keyword.operator)
+(as_expression
+  "as" @keyword.operator)
+
+(export_statement
+  "as" @keyword.operator)
+
+(mapped_type_clause
+  "as" @keyword.operator)
 
 [
   "abstract"
@@ -37,35 +42,45 @@
 ] @type.qualifier
 
 ; types
-
 (type_identifier) @type
+
 (predefined_type) @type.builtin
 
-(import_statement "type"
+(import_statement
+  "type"
   (import_clause
     (named_imports
       ((import_specifier
-          name: (identifier) @type)))))
+        name: (identifier) @type)))))
 
 (template_literal_type) @string
 
-(non_null_expression "!" @operator)
-
-;; punctuation
+(non_null_expression
+  "!" @operator)
 
+; punctuation
 (type_arguments
-  ["<" ">"] @punctuation.bracket)
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (type_parameters
-  ["<" ">"] @punctuation.bracket)
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
 
 (object_type
-  ["{|" "|}"] @punctuation.bracket)
+  [
+    "{|"
+    "|}"
+  ] @punctuation.bracket)
 
 (union_type
   "|" @punctuation.delimiter)
 
-(intersection_type 
+(intersection_type
   "&" @punctuation.delimiter)
 
 (type_annotation
@@ -85,69 +100,103 @@
 
 "?." @punctuation.delimiter
 
-(abstract_method_signature "?" @punctuation.special)
-(method_signature "?" @punctuation.special)
-(method_definition "?" @punctuation.special)
-(property_signature "?" @punctuation.special)
-(optional_parameter "?" @punctuation.special)
-(optional_type "?" @punctuation.special)
-(public_field_definition [ "?" "!" ] @punctuation.special)
-(flow_maybe_type "?" @punctuation.special)
+(abstract_method_signature
+  "?" @punctuation.special)
 
-(template_type ["${" "}"] @punctuation.special)
+(method_signature
+  "?" @punctuation.special)
 
-(conditional_type ["?" ":"] @keyword.conditional.ternary)
+(method_definition
+  "?" @punctuation.special)
 
-;;; Parameters
-(required_parameter (identifier) @variable.parameter)
-(optional_parameter (identifier) @variable.parameter)
+(property_signature
+  "?" @punctuation.special)
+
+(optional_parameter
+  "?" @punctuation.special)
+
+(optional_type
+  "?" @punctuation.special)
+
+(public_field_definition
+  [
+    "?"
+    "!"
+  ] @punctuation.special)
+
+(flow_maybe_type
+  "?" @punctuation.special)
+
+(template_type
+  [
+    "${"
+    "}"
+  ] @punctuation.special)
+
+(conditional_type
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+; Parameters
+(required_parameter
+  (identifier) @variable.parameter)
+
+(optional_parameter
+  (identifier) @variable.parameter)
 
 (required_parameter
   (rest_pattern
     (identifier) @variable.parameter))
 
-;; ({ a }) => null
+; ({ a }) => null
 (required_parameter
   (object_pattern
     (shorthand_property_identifier_pattern) @variable.parameter))
 
-;; ({ a = b }) => null
+; ({ a = b }) => null
 (required_parameter
   (object_pattern
     (object_assignment_pattern
       (shorthand_property_identifier_pattern) @variable.parameter)))
 
-;; ({ a: b }) => null
+; ({ a: b }) => null
 (required_parameter
   (object_pattern
     (pair_pattern
       value: (identifier) @variable.parameter)))
 
-;; ([ a ]) => null
+; ([ a ]) => null
 (required_parameter
   (array_pattern
     (identifier) @variable.parameter))
 
-;; a => null
+; a => null
 (arrow_function
   parameter: (identifier) @variable.parameter)
 
-;; global declaration
-(ambient_declaration "global" @module)
+; global declaration
+(ambient_declaration
+  "global" @module)
 
-;; function signatures
+; function signatures
 (ambient_declaration
   (function_signature
     name: (identifier) @function))
 
-;; method signatures
-(method_signature name: (_) @function.method)
+; method signatures
+(method_signature
+  name: (_) @function.method)
 
-;; property signatures
+; property signatures
 (property_signature
   name: (property_identifier) @function.method
-  type: (type_annotation
-          [
-            (union_type (parenthesized_type (function_type)))
-            (function_type)
-          ]))
+  type:
+    (type_annotation
+      [
+        (union_type
+          (parenthesized_type
+            (function_type)))
+        (function_type)
+      ]))
diff --git a/queries/typescript/indents.scm b/queries/typescript/indents.scm
index 9a269ba75..23222051c 100644
--- a/queries/typescript/indents.scm
+++ b/queries/typescript/indents.scm
@@ -1,5 +1,4 @@
 ; inherits: ecma
-
 [
   (enum_declaration)
   (interface_declaration)
diff --git a/queries/typescript/locals.scm b/queries/typescript/locals.scm
index 8addb1b27..f1928484a 100644
--- a/queries/typescript/locals.scm
+++ b/queries/typescript/locals.scm
@@ -1,23 +1,26 @@
 ; inherits: ecma
-(required_parameter (identifier) @local.definition)
-(optional_parameter (identifier) @local.definition)
+(required_parameter
+  (identifier) @local.definition)
+
+(optional_parameter
+  (identifier) @local.definition)
 
 ; x => x
 (arrow_function
   parameter: (identifier) @local.definition.parameter)
 
-;; ({ a }) => null
+; ({ a }) => null
 (required_parameter
   (object_pattern
     (shorthand_property_identifier_pattern) @local.definition.parameter))
 
-;; ({ a: b }) => null
+; ({ a: b }) => null
 (required_parameter
   (object_pattern
     (pair_pattern
       value: (identifier) @local.definition.parameter)))
 
-;; ([ a ]) => null
+; ([ a ]) => null
 (required_parameter
   (array_pattern
     (identifier) @local.definition.parameter))
diff --git a/queries/typoscript/highlights.scm b/queries/typoscript/highlights.scm
index c1c483c3a..63327f178 100644
--- a/queries/typoscript/highlights.scm
+++ b/queries/typoscript/highlights.scm
@@ -3,11 +3,12 @@
 (constant) @constant
 
 (modifier_function) @function
+
 (modifier_predefined) @function.builtin
 
 [
-  (condition) 
-  (condition_end) 
+  (condition)
+  (condition_end)
   (condition_else)
 ] @keyword.conditional
 
@@ -40,7 +41,7 @@
 "," @punctuation.delimiter
 
 [
- "("
- ")"
- (block_punctuation)
- ] @punctuation.bracket
+  "("
+  ")"
+  (block_punctuation)
+] @punctuation.bracket
diff --git a/queries/typoscript/indents.scm b/queries/typoscript/indents.scm
index f3d15b720..4f5fb4797 100644
--- a/queries/typoscript/indents.scm
+++ b/queries/typoscript/indents.scm
@@ -1,5 +1,5 @@
 (block) @indent.begin
 
-"}" @indent.branch @indent.end 
+"}" @indent.branch @indent.end
 
 (comment) @indent.ignore
diff --git a/queries/typoscript/injections.scm b/queries/typoscript/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/typoscript/injections.scm
+++ b/queries/typoscript/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/udev/highlights.scm b/queries/udev/highlights.scm
index 1a8514ea8..1b19028ac 100644
--- a/queries/udev/highlights.scm
+++ b/queries/udev/highlights.scm
@@ -1,16 +1,21 @@
-(match key: _ @keyword)
+(match
+  key: _ @keyword)
 
-(assignment key: _ @property)
+(assignment
+  key: _ @property)
 
 (value) @string
 
 ; NOTE: higher priorities override bash highlights
+((fmt_sub
+  .
+  _ @character.special)
+  (#set! "priority" 101))
 
-((fmt_sub . _ @character.special)
- (#set! "priority" 101))
-
-((var_sub . _ @variable.builtin)
- (#set! "priority" 101))
+((var_sub
+  .
+  _ @variable.builtin)
+  (#set! "priority" 101))
 
 [
   (system_const)
@@ -21,21 +26,24 @@
 ] @attribute
 
 ((attribute) @attribute
- (#set! "priority" 101))
+  (#set! "priority" 101))
 
 ((env_var) @constant
- (#set! "priority" 101))
+  (#set! "priority" 101))
 
 ((pattern) @string.special
- (#set! "priority" 101))
+  (#set! "priority" 101))
 
-([ "\\\"" (c_escape) ] @string.escape
- (#set! "priority" 101))
+([
+  "\\\""
+  (c_escape)
+] @string.escape
+  (#set! "priority" 101))
 
 (octal) @number
 
 ((number) @number
- (#set! "priority" 101))
+  (#set! "priority" 101))
 
 [
   (match_op)
@@ -43,11 +51,17 @@
 ] @operator
 
 ("+" @punctuation.special
- (#set! "priority" 101))
+  (#set! "priority" 101))
 
-([ "{" "}" ] @punctuation.bracket
- (#set! "priority" 101))
+([
+  "{"
+  "}"
+] @punctuation.bracket
+  (#set! "priority" 101))
 
-[ "," (linebreak) ] @punctuation.delimiter
+[
+  ","
+  (linebreak)
+] @punctuation.delimiter
 
 (comment) @comment @spell
diff --git a/queries/udev/injections.scm b/queries/udev/injections.scm
index 5618e65de..1718349c6 100644
--- a/queries/udev/injections.scm
+++ b/queries/udev/injections.scm
@@ -1,12 +1,14 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((match
-   key: "PROGRAM"
-   (value (content) @injection.content))
- (#set! injection.language "bash"))
+  key: "PROGRAM"
+  (value
+    (content) @injection.content))
+  (#set! injection.language "bash"))
 
 ((assignment
-   key: "RUN"
-   (value (content) @injection.content))
- (#set! injection.language "bash"))
+  key: "RUN"
+  (value
+    (content) @injection.content))
+  (#set! injection.language "bash"))
diff --git a/queries/udev/locals.scm b/queries/udev/locals.scm
index f4923467c..e1a2f65d2 100644
--- a/queries/udev/locals.scm
+++ b/queries/udev/locals.scm
@@ -1,15 +1,15 @@
-;; labels
-
+; labels
 (assignment
   key: "LABEL"
-  (value (content) @local.definition))
+  (value
+    (content) @local.definition))
 
 (assignment
   key: "GOTO"
-  (value (content) @local.reference))
-
-;; env vars
+  (value
+    (content) @local.reference))
 
+; env vars
 (assignment
   key: "ENV"
   (env_var) @local.definition.var)
@@ -18,10 +18,10 @@
   key: "ENV"
   (env_var) @local.reference)
 
-(var_sub (env_var) @local.reference)
-
-;; misc
+(var_sub
+  (env_var) @local.reference)
 
+; misc
 [
   (attribute)
   (kernel_param)
diff --git a/queries/ungrammar/highlights.scm b/queries/ungrammar/highlights.scm
index 0e4448255..4ed523c9b 100644
--- a/queries/ungrammar/highlights.scm
+++ b/queries/ungrammar/highlights.scm
@@ -18,9 +18,7 @@
   "?"
 ] @keyword.repeat
 
-[
-  ":"
-] @punctuation.delimiter
+":" @punctuation.delimiter
 
 [
   "("
diff --git a/queries/ungrammar/injections.scm b/queries/ungrammar/injections.scm
index ac82a3e5f..2f0e58eb6 100644
--- a/queries/ungrammar/injections.scm
+++ b/queries/ungrammar/injections.scm
@@ -1,3 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
-
+  (#set! injection.language "comment"))
diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
index 88b2a1373..6f97474fa 100644
--- a/queries/unison/highlights.scm
+++ b/queries/unison/highlights.scm
@@ -1,12 +1,17 @@
-;; Primitives
+; Primitives
 (comment) @comment @spell
+
 (nat) @number
+
 (unit) @constant.builtin
+
 (literal_char) @character
+
 (literal_text) @string
+
 (literal_boolean) @boolean
 
-;; Keywords
+; Keywords
 [
   (kw_forall)
   (unique_kw)
@@ -18,18 +23,19 @@
 ] @keyword
 
 (kw_equals) @keyword.operator
+
 (structural_kw) @type.qualifier
+
 (unique) @type.qualifier
 
 (type_constructor) @constructor
 
 (doc_block) @comment.documentation
 
-
 [
   (operator)
-  (pipe) 
-  (arrow_symbol) 
+  (pipe)
+  (arrow_symbol)
   ">"
   (or)
 ] @keyword.operator
@@ -45,32 +51,52 @@
 
 (blank_pattern) @variable.builtin
 
-(pattern) @variable (constructor_or_variable_pattern) @type
+(pattern) @variable
+
+(constructor_or_variable_pattern) @type
 
 (use_clause) @keyword.import
 
-;; Types
-(record_field name: (wordy_id) @variable type: (wordy_id) @type)
+; Types
+(record_field
+  name: (wordy_id) @variable
+  type: (wordy_id) @type)
+
 (type_name) @type
 
-(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @variable.parameter)
-(effect (wordy_id) @attribute) ;; NOTE: an effect is a special type
+(ability_declaration
+  type_name: (wordy_id) @type
+  type_arg: (wordy_id) @variable.parameter)
 
+(effect
+  (wordy_id) @attribute) ; NOTE: an effect is a special type
 
-;; Namespaces
+; Namespaces
 (path) @module
+
 (namespace) @module
 
-;; Terms
-(type_signature term_name: (path) @module term_name: (wordy_id) @variable)
-(type_signature term_name: (wordy_id) @variable)
+; Terms
+(type_signature
+  term_name: (path) @module
+  term_name: (wordy_id) @variable)
+
+(type_signature
+  term_name: (wordy_id) @variable)
+
 (term_type) @type
 
-(function_application function_name: (path) function_name: (wordy_id) @function)
+(function_application
+  function_name: (path)
+  function_name: (wordy_id) @function)
 
-(term_definition name: (wordy_id) @variable)
-(term_definition param: (wordy_id) @variable.parameter)
-;; Punctuation
+(term_definition
+  name: (wordy_id) @variable)
+
+(term_definition
+  param: (wordy_id) @variable.parameter)
+
+; Punctuation
 [
   (type_signature_colon)
   ":"
@@ -85,4 +111,5 @@
   "]"
 ] @punctuation.bracket
 
-(test_watch_expression (wordy_id) @keyword.directive)
+(test_watch_expression
+  (wordy_id) @keyword.directive)
diff --git a/queries/unison/injections.scm b/queries/unison/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/unison/injections.scm
+++ b/queries/unison/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/usd/folds.scm b/queries/usd/folds.scm
index c4815bd07..fd7d23999 100644
--- a/queries/usd/folds.scm
+++ b/queries/usd/folds.scm
@@ -1,3 +1 @@
-[
-  (block)
-] @fold
+(block) @fold
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
index 180b6d219..894d1613d 100644
--- a/queries/usd/highlights.scm
+++ b/queries/usd/highlights.scm
@@ -1,28 +1,42 @@
 (None) @constant.builtin
+
 (asset_path) @string.special.url
+
 (attribute_property) @property
+
 (bool) @boolean
+
 (comment) @comment @spell
+
 (custom) @function.builtin
+
 (float) @number.float
+
 (integer) @number
+
 (orderer) @function.call
+
 (prim_path) @string.special
+
 (relationship_type) @type
+
 (string) @string
+
 (uniform) @function.builtin
+
 (variant_set_definition) @keyword
 
-;; Prefer namespace highlighting, if any.
-;;
-;; e.g. `rel fizz` - `fizz` uses `@identifier`
-;; e.g. `rel foo:bar:fizz` - `foo` and `bar` use `@module` and `fizz` uses `@identifier`
-;;
+; Prefer namespace highlighting, if any.
+;
+; e.g. `rel fizz` - `fizz` uses `@identifier`
+; e.g. `rel foo:bar:fizz` - `foo` and `bar` use `@module` and `fizz` uses `@identifier`
+;
 (identifier) @variable
+
 (namespace_identifier) @module
+
 (namespace_identifier
-  (identifier) @module
-)
+  (identifier) @module)
 
 [
   "class"
@@ -30,16 +44,26 @@
   "over"
 ] @keyword.function
 
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
-[":" ";" "."] @punctuation.delimiter
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
 
 [
-  "="
-] @operator
+  ":"
+  ";"
+  "."
+] @punctuation.delimiter
+
+"=" @operator
 
 (attribute_type) @type
-(
- (attribute_type) @type.builtin
+
+((attribute_type) @type.builtin
   ;format-ignore
   (#any-of? @type.builtin
     ;; Reference: https://openusd.org/release/api/sdf_page_front.html
@@ -98,8 +122,7 @@
     "Transform" "Transform[]"
     "Vec3f" "Vec3f[]"))
 
-(
- (identifier) @keyword
+((identifier) @keyword
   ; format-ignore
   (#any-of? @keyword
     ; Reference: https://openusd.org/release/api/sdf_page_front.html
@@ -159,20 +182,12 @@
     ; Prim metadata
     "instanceable"))
 
-;; Common attribute metadata
-(
- (layer_offset
+; Common attribute metadata
+((layer_offset
   (identifier) @keyword
-  (#any-of? @keyword
+  (#any-of? @keyword "offset" "scale")))
 
-   "offset"
-   "scale"
-  )
- )
-)
-
-;; Docstrings in USD
+; Docstrings in USD
 (metadata
- (comment)*
- (string) @comment.documentation
-)
+  (comment)*
+  (string) @comment.documentation)
diff --git a/queries/usd/indents.scm b/queries/usd/indents.scm
index 78146d188..217d12d3f 100644
--- a/queries/usd/indents.scm
+++ b/queries/usd/indents.scm
@@ -11,14 +11,29 @@
   (variant_set_definition)  ; The {}s in `variantSet "foo" = { "vr1" { ... } "vr2" { ... } }`
 ] @indent.begin
 
-(block "}" @indent.end)
-(dictionary "}" @indent.end)
-(list "]" @indent.end)
-(list_proxy "]" @indent.end)
-(metadata ")" @indent.end)
-(timeSamples "}" @indent.end)
-(tuple ")" @indent.end)
-(variant_set_definition "}" @indent.end)
+(block
+  "}" @indent.end)
+
+(dictionary
+  "}" @indent.end)
+
+(list
+  "]" @indent.end)
+
+(list_proxy
+  "]" @indent.end)
+
+(metadata
+  ")" @indent.end)
+
+(timeSamples
+  "}" @indent.end)
+
+(tuple
+  ")" @indent.end)
+
+(variant_set_definition
+  "}" @indent.end)
 
 [
   ")"
diff --git a/queries/uxntal/folds.scm b/queries/uxntal/folds.scm
index 2043df867..9e3f27db0 100644
--- a/queries/uxntal/folds.scm
+++ b/queries/uxntal/folds.scm
@@ -2,6 +2,5 @@
   (macro)
   (memory_execution)
   (subroutine)
-
   (comment)
 ] @fold
diff --git a/queries/uxntal/highlights.scm b/queries/uxntal/highlights.scm
index ce81e77ef..622e00b4f 100644
--- a/queries/uxntal/highlights.scm
+++ b/queries/uxntal/highlights.scm
@@ -1,15 +1,12 @@
 ; Includes
-
 (include
   "~" @keyword.import
   _ @string.special.url)
 
 ; Variables
-
 (identifier) @variable
 
 ; Macros
-
 (macro
   "%"
   (identifier) @function.macro)
@@ -18,22 +15,28 @@
   (#lua-match? @function.macro "^[a-z]?[0-9]*[A-Z-_]+$"))
 
 (rune
-  . rune_start: (rune_char ",")
-  . (identifier) @function.call)
+  .
+  rune_start:
+    (rune_char
+      ",")
+  .
+  (identifier) @function.call)
 
 (rune
-  . rune_start: (rune_char ";")
-  . (identifier) @function.call)
+  .
+  rune_start:
+    (rune_char
+      ";")
+  .
+  (identifier) @function.call)
 
 ((identifier) @function.call
   (#lua-match? @function.call "^:"))
 
 ; Keywords
-
 (opcode) @keyword
 
 ; Labels
-
 (label
   "@" @string.special.symbol
   (identifier) @function)
@@ -44,12 +47,10 @@
   (identifier) @label)
 
 ; Repeats
-
 ((identifier) @keyword.repeat
   (#eq? @keyword.repeat "while"))
 
 ; Literals
-
 (raw_ascii) @string
 
 (hex_literal
@@ -59,10 +60,15 @@
 (number) @number
 
 ; Punctuation
+[
+  "{"
+  "}"
+] @punctuation.bracket
 
-[ "{" "}" ] @punctuation.bracket
-
-[ "[" "]" ] @punctuation.bracket
+[
+  "["
+  "]"
+] @punctuation.bracket
 
 [
   "%"
@@ -80,5 +86,4 @@
 ] @punctuation.special
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/uxntal/indents.scm b/queries/uxntal/indents.scm
index cb07a52ee..b795b89ea 100644
--- a/queries/uxntal/indents.scm
+++ b/queries/uxntal/indents.scm
@@ -7,9 +7,15 @@
 
 "}" @indent.end
 
-[ "{" "}" ] @indent.branch
+[
+  "{"
+  "}"
+] @indent.branch
 
-[ "[" "]" ] @indent.branch
+[
+  "["
+  "]"
+] @indent.branch
 
 [
   (ERROR)
diff --git a/queries/uxntal/injections.scm b/queries/uxntal/injections.scm
index 6adae45a2..2f0e58eb6 100644
--- a/queries/uxntal/injections.scm
+++ b/queries/uxntal/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/uxntal/locals.scm b/queries/uxntal/locals.scm
index e31616223..41fbb5b66 100644
--- a/queries/uxntal/locals.scm
+++ b/queries/uxntal/locals.scm
@@ -1,5 +1,4 @@
 ; Scopes
-
 [
   (program)
   (macro)
@@ -8,15 +7,15 @@
 ] @local.scope
 
 ; References
-
 (identifier) @local.reference
 
 ; Definitions
-
 (label
   "@"
-  . (identifier) @local.definition.function)
+  .
+  (identifier) @local.definition.function)
 
 (macro
   "%"
-  . (identifier) @local.definition.macro)
+  .
+  (identifier) @local.definition.macro)
diff --git a/queries/v/folds.scm b/queries/v/folds.scm
index 8bed31c52..952b6bbe9 100644
--- a/queries/v/folds.scm
+++ b/queries/v/folds.scm
@@ -1,6 +1,8 @@
-[(function_declaration)
- (const_declaration)
- (type_declaration)
- (import_declaration)
- (if_expression)
- (struct_declaration)] @fold
+[
+  (function_declaration)
+  (const_declaration)
+  (type_declaration)
+  (import_declaration)
+  (if_expression)
+  (struct_declaration)
+] @fold
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 221b05028..821aef6be 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -1,12 +1,10 @@
 ; Includes
-
 [
   "import"
   "module"
 ] @keyword.import
 
 ; Keywords
-
 [
   "asm"
   "assert"
@@ -71,30 +69,29 @@
 ] @keyword.coroutine
 
 ; Variables
-
 (identifier) @variable
 
 ; Namespace
-
 (module_clause
- (identifier) @module)
+  (identifier) @module)
 
 (import_path
- (import_name) @module)
+  (import_name) @module)
 
 (import_alias
- (import_name) @module)
+  (import_name) @module)
 
 ; Literals
-
-[ (true) (false) ] @boolean
+[
+  (true)
+  (false)
+] @boolean
 
 (interpreted_string_literal) @string
 
 (string_interpolation) @none
 
 ; Types
-
 (struct_declaration
   name: (identifier) @type)
 
@@ -107,15 +104,17 @@
 (type_declaration
   name: (identifier) @type)
 
-(type_reference_expression (identifier) @type)
+(type_reference_expression
+  (identifier) @type)
 
 ; Labels
-
 (label_reference) @label
 
 ; Fields
-
-(selector_expression field: (reference_expression (identifier) @variable.member))
+(selector_expression
+  field:
+    (reference_expression
+      (identifier) @variable.member))
 
 (field_name) @variable.member
 
@@ -123,7 +122,6 @@
   name: (identifier) @variable.member)
 
 ; Parameters
-
 (parameter_declaration
   name: (identifier) @variable.parameter)
 
@@ -131,7 +129,6 @@
   name: (identifier) @variable.parameter)
 
 ; Constants
-
 ((identifier) @constant
   (#has-ancestor? @constant compile_time_if_expression))
 
@@ -148,11 +145,9 @@
   (#any-of? @variable.builtin "err" "macos" "linux" "windows"))
 
 ; Attributes
-
 (attribute) @attribute
 
 ; Functions
-
 (function_declaration
   name: (identifier) @function)
 
@@ -161,242 +156,38 @@
   name: (identifier) @function.method)
 
 (call_expression
- name: (selector_expression
-  field: (reference_expression) @function.method.call))
+  name:
+    (selector_expression
+      field: (reference_expression) @function.method.call))
 
 (call_expression
- name: (reference_expression) @function.call)
+  name: (reference_expression) @function.call)
 
 ((identifier) @function.builtin
-  (#any-of? @function.builtin
-    "eprint"
-    "eprintln"
-    "error"
-    "exit"
-    "panic"
-    "print"
-    "println"
-    "after"
-    "after_char"
-    "all"
-    "all_after"
-    "all_after_last"
-    "all_before"
-    "all_before_last"
-    "any"
-    "ascii_str"
-    "before"
-    "bool"
-    "byte"
-    "byterune"
-    "bytes"
-    "bytestr"
-    "c_error_number_str"
-    "capitalize"
-    "clear"
-    "clone"
-    "clone_to_depth"
-    "close"
-    "code"
-    "compare"
-    "compare_strings"
-    "contains"
-    "contains_any"
-    "contains_any_substr"
-    "copy"
-    "count"
-    "cstring_to_vstring"
-    "delete"
-    "delete_last"
-    "delete_many"
-    "ends_with"
-    "eprint"
-    "eprintln"
-    "eq_epsilon"
-    "error"
-    "error_with_code"
-    "exit"
-    "f32"
-    "f32_abs"
-    "f32_max"
-    "f32_min"
-    "f64"
-    "f64_max"
-    "fields"
-    "filter"
-    "find_between"
-    "first"
-    "flush_stderr"
-    "flush_stdout"
-    "free"
-    "gc_check_leaks"
-    "get_str_intp_u32_format"
-    "get_str_intp_u64_format"
-    "grow_cap"
-    "grow_len"
-    "hash"
-    "hex"
-    "hex2"
-    "hex_full"
-    "i16"
-    "i64"
-    "i8"
-    "index"
-    "index_after"
-    "index_any"
-    "index_byte"
-    "insert"
-    "int"
-    "is_alnum"
-    "is_bin_digit"
-    "is_capital"
-    "is_digit"
-    "is_hex_digit"
-    "is_letter"
-    "is_lower"
-    "is_oct_digit"
-    "is_space"
-    "is_title"
-    "is_upper"
-    "isnil"
-    "join"
-    "join_lines"
-    "keys"
-    "last"
-    "last_index"
-    "last_index_byte"
-    "length_in_bytes"
-    "limit"
-    "malloc"
-    "malloc_noscan"
-    "map"
-    "match_glob"
-    "memdup"
-    "memdup_noscan"
-    "move"
-    "msg"
-    "panic"
-    "panic_error_number"
-    "panic_lasterr"
-    "panic_optional_not_set"
-    "parse_int"
-    "parse_uint"
-    "pointers"
-    "pop"
-    "prepend"
-    "print"
-    "print_backtrace"
-    "println"
-    "proc_pidpath"
-    "ptr_str"
-    "push_many"
-    "realloc_data"
-    "reduce"
-    "repeat"
-    "repeat_to_depth"
-    "replace"
-    "replace_each"
-    "replace_once"
-    "reverse"
-    "reverse_in_place"
-    "runes"
-    "sort"
-    "sort_by_len"
-    "sort_ignore_case"
-    "sort_with_compare"
-    "split"
-    "split_any"
-    "split_into_lines"
-    "split_nth"
-    "starts_with"
-    "starts_with_capital"
-    "str"
-    "str_escaped"
-    "str_intp"
-    "str_intp_g32"
-    "str_intp_g64"
-    "str_intp_rune"
-    "str_intp_sq"
-    "str_intp_sub"
-    "strg"
-    "string_from_wide"
-    "string_from_wide2"
-    "strip_margin"
-    "strip_margin_custom"
-    "strlong"
-    "strsci"
-    "substr"
-    "substr_ni"
-    "substr_with_check"
-    "title"
-    "to_lower"
-    "to_upper"
-    "to_wide"
-    "tos"
-    "tos2"
-    "tos3"
-    "tos4"
-    "tos5"
-    "tos_clone"
-    "trim"
-    "trim_left"
-    "trim_pr"
-    "try_pop"
-    "try_push"
-    "utf32_decode_to_buffer"
-    "utf32_to_str"
-    "utf32_to_str_no_malloc"
-    "utf8_char_len"
-    "utf8_getchar"
-    "utf8_str_len"
-    "utf8_str_visible_length"
-    "utf8_to_utf32"
-    "v_realloc"
-    "vbytes"
-    "vcalloc"
-    "vcalloc_noscan"
-    "vmemcmp"
-    "vmemcpy"
-    "vmemmove"
-    "vmemset"
-    "vstring"
-    "vstring_literal"
-    "vstring_literal_with_len"
-    "vstring_with_len"
-    "vstrlen"
-    "vstrlen_char"
-    "winapi_lasterr_str"))
-
+  (#any-of? @function.builtin "eprint" "eprintln" "error" "exit" "panic" "print" "println" "after" "after_char" "all" "all_after" "all_after_last" "all_before" "all_before_last" "any" "ascii_str" "before" "bool" "byte" "byterune" "bytes" "bytestr" "c_error_number_str" "capitalize" "clear" "clone" "clone_to_depth" "close" "code" "compare" "compare_strings" "contains" "contains_any" "contains_any_substr" "copy" "count" "cstring_to_vstring" "delete" "delete_last" "delete_many" "ends_with" "eprint" "eprintln" "eq_epsilon" "error" "error_with_code" "exit" "f32" "f32_abs" "f32_max" "f32_min" "f64" "f64_max" "fields" "filter" "find_between" "first" "flush_stderr" "flush_stdout" "free" "gc_check_leaks" "get_str_intp_u32_format" "get_str_intp_u64_format" "grow_cap" "grow_len" "hash" "hex" "hex2" "hex_full" "i16" "i64" "i8" "index" "index_after" "index_any" "index_byte" "insert" "int" "is_alnum" "is_bin_digit" "is_capital" "is_digit" "is_hex_digit" "is_letter" "is_lower" "is_oct_digit" "is_space" "is_title" "is_upper" "isnil" "join" "join_lines" "keys" "last" "last_index" "last_index_byte" "length_in_bytes" "limit" "malloc" "malloc_noscan" "map" "match_glob" "memdup" "memdup_noscan" "move" "msg" "panic" "panic_error_number" "panic_lasterr" "panic_optional_not_set" "parse_int" "parse_uint" "pointers" "pop" "prepend" "print" "print_backtrace" "println" "proc_pidpath" "ptr_str" "push_many" "realloc_data" "reduce" "repeat" "repeat_to_depth" "replace" "replace_each" "replace_once" "reverse" "reverse_in_place" "runes" "sort" "sort_by_len" "sort_ignore_case" "sort_with_compare" "split" "split_any" "split_into_lines" "split_nth" "starts_with" "starts_with_capital" "str" "str_escaped" "str_intp" "str_intp_g32" "str_intp_g64" "str_intp_rune" "str_intp_sq" "str_intp_sub" "strg" "string_from_wide" "string_from_wide2" "strip_margin" "strip_margin_custom" "strlong" "strsci" "substr" "substr_ni" "substr_with_check" "title" "to_lower" "to_upper" "to_wide" "tos" "tos2" "tos3" "tos4" "tos5" "tos_clone" "trim" "trim_left" "trim_pr" "try_pop" "try_push" "utf32_decode_to_buffer" "utf32_to_str" "utf32_to_str_no_malloc" "utf8_char_len" "utf8_getchar" "utf8_str_len" "utf8_str_visible_length" "utf8_to_utf32" "v_realloc" "vbytes" "vcalloc" "vcalloc_noscan" "vmemcmp" "vmemcpy" "vmemmove" "vmemset" "vstring" "vstring_literal" "vstring_literal_with_len" "vstring_with_len" "vstrlen" "vstrlen_char" "winapi_lasterr_str"))
 ; Operators
-
 [
   "++"
   "--"
-
   "+"
   "-"
   "*"
   "/"
   "%"
-
   "~"
   "&"
   "|"
   "^"
-
   "!"
   "&&"
   "||"
   "!="
-
   "<<"
   ">>"
-
   "<"
   ">"
   "<="
   ">="
-
   "+="
   "-="
   "*="
@@ -406,11 +197,9 @@
   "^="
   "<<="
   ">>="
-
   "="
   ":="
   "=="
-
   "?"
   "<-"
   "$"
@@ -419,13 +208,23 @@
 ] @operator
 
 ; Punctuation
+[
+  "."
+  ","
+  ":"
+  ";"
+] @punctuation.delimiter
 
-[ "." "," ":" ";" ] @punctuation.delimiter
-
-[ "(" ")" "{" "}" "[" "]" ] @punctuation.bracket
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
 
 ; Literals
-
 (int_literal) @number
 
 (float_literal) @number.float
@@ -455,9 +254,12 @@
 (none) @variable.builtin
 
 ; Comments
-
 (comment) @comment @spell
 
 (_
   (comment)+ @comment.documentation
-  [(function_declaration) (type_declaration) (enum_declaration)])
+  [
+    (function_declaration)
+    (type_declaration)
+    (enum_declaration)
+  ])
diff --git a/queries/v/indents.scm b/queries/v/indents.scm
index a806b35ed..752585127 100644
--- a/queries/v/indents.scm
+++ b/queries/v/indents.scm
@@ -1,16 +1,17 @@
-[(import_declaration)
- (const_declaration)
- (type_declaration)
- (type_initializer)
- (block)
- (map_init_expression)
- (call_expression)
- (parameter_list)]
-@indent.begin
+[
+  (import_declaration)
+  (const_declaration)
+  (type_declaration)
+  (type_initializer)
+  (block)
+  (map_init_expression)
+  (call_expression)
+  (parameter_list)
+] @indent.begin
 
-[ "}"]
-@indent.branch
+"}" @indent.branch
 
-(parameter_list ")" @indent.branch)
+(parameter_list
+  ")" @indent.branch)
 
 (comment) @indent.ignore
diff --git a/queries/v/injections.scm b/queries/v/injections.scm
index 9fa581377..f7c0f6608 100644
--- a/queries/v/injections.scm
+++ b/queries/v/injections.scm
@@ -1,17 +1,22 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
-;; asm_statement if asm ever highlighted :)
-
-;; #include <...>
+  (#set! injection.language "comment"))
+; asm_statement if asm ever highlighted :)
+; #include <...>
 ((hash_statement) @injection.content
- (#set! injection.language "c"))
+  (#set! injection.language "c"))
 
-;; regex for the methods defined in `re` module
+; regex for the methods defined in `re` module
 ((call_expression
-    name: (selector_expression
-      field: (reference_expression (identifier) @_re))
-    arguments: (argument_list
-  (argument (literal (raw_string_literal) @injection.content 
-  (#offset! @injection.content 0 2 0 -1)))))
+  name:
+    (selector_expression
+      field:
+        (reference_expression
+          (identifier) @_re))
+  arguments:
+    (argument_list
+      (argument
+        (literal
+          (raw_string_literal) @injection.content
+          (#offset! @injection.content 0 2 0 -1)))))
   (#any-of? @_re "regex_base" "regex_opt" "compile_opt")
   (#set! injection.language "regex"))
diff --git a/queries/v/locals.scm b/queries/v/locals.scm
index 03623a717..524483b8e 100644
--- a/queries/v/locals.scm
+++ b/queries/v/locals.scm
@@ -1,28 +1,41 @@
 ((function_declaration
-     name: (identifier) @local.definition.function)) ;@function
+  name: (identifier) @local.definition.function)) ;@function
 
 (var_declaration
-  var_list: (expression_list
-              (reference_expression
-                (identifier) @local.definition.var)))
+  var_list:
+    (expression_list
+      (reference_expression
+        (identifier) @local.definition.var)))
 
 ((function_declaration
   name: (identifier) @local.definition.function))
 
-(const_declaration (const_definition name: (identifier) @local.definition.var))
+(const_declaration
+  (const_definition
+    name: (identifier) @local.definition.var))
 
 (identifier) @local.reference
 
-((call_expression name: (reference_expression (identifier)) @local.reference)
- (#set! reference.kind "call"))
+((call_expression
+  name:
+    (reference_expression
+      (identifier)) @local.reference)
+  (#set! reference.kind "call"))
 
 ((call_expression
-   name: (selector_expression
-                field: (reference_expression (identifier) @local.definition.function)))
- (#set! reference.kind "call"))
+  name:
+    (selector_expression
+      field:
+        (reference_expression
+          (identifier) @local.definition.function)))
+  (#set! reference.kind "call"))
 
 (source_file) @local.scope
+
 (function_declaration) @local.scope
+
 (if_expression) @local.scope
+
 (block) @local.scope
+
 (for_statement) @local.scope
diff --git a/queries/vala/folds.scm b/queries/vala/folds.scm
index 86b731eea..a334e609c 100644
--- a/queries/vala/folds.scm
+++ b/queries/vala/folds.scm
@@ -9,4 +9,3 @@
   (block)
   (class_member)
 ] @fold
-
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index 3250adcb4..31c02ad1b 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -1,118 +1,200 @@
 ; highlights.scm
-
 ; highlight comments and symbols
 (comment) @comment @spell
+
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
 (symbol) @string.special.symbol
-(member_access_expression (_) (identifier) @string.special.symbol)
+
+(member_access_expression
+  (_)
+  (identifier) @string.special.symbol)
 
 ; highlight constants
-(
-  (member_access_expression (identifier) @constant)
-  (#lua-match? @constant "^[%u][%u%d_]*$")
-)
+((member_access_expression
+  (identifier) @constant)
+  (#lua-match? @constant "^[%u][%u%d_]*$"))
 
-(
-  (member_access_expression (member_access_expression) @keyword.import (identifier) @constant)
-  (#lua-match? @constant "^[%u][%u%d_]*$")
-)
+((member_access_expression
+  (member_access_expression) @keyword.import
+  (identifier) @constant)
+  (#lua-match? @constant "^[%u][%u%d_]*$"))
 
 ; highlight types and probable types
-(type (symbol (_)? @module (identifier) @type))
-(
-  (member_access_expression . (identifier) @type)
-  (#match? @type "^[A-Z][A-Za-z_0-9]{2,}$")
-)
+(type
+  (symbol
+    (_)? @module
+    (identifier) @type))
+
+((member_access_expression
+  .
+  (identifier) @type)
+  (#match? @type "^[A-Z][A-Za-z_0-9]{2,}$"))
 
 ; highlight creation methods in object creation expressions
-(
-  (object_creation_expression (type (symbol (symbol (symbol)? @keyword.import (identifier) @type) (identifier) @constructor)))
-  (#lua-match? @constructor "^[%l][%l%d_]*$")
-)
+((object_creation_expression
+  (type
+    (symbol
+      (symbol
+        (symbol)? @keyword.import
+        (identifier) @type)
+      (identifier) @constructor)))
+  (#lua-match? @constructor "^[%l][%l%d_]*$"))
 
-(unqualified_type (symbol . (identifier) @type))
-(unqualified_type (symbol (symbol) @module (identifier) @type))
+(unqualified_type
+  (symbol
+    .
+    (identifier) @type))
+
+(unqualified_type
+  (symbol
+    (symbol) @module
+    (identifier) @type))
 
 (attribute) @attribute
-(namespace_declaration (symbol) @module)
-(method_declaration (symbol (symbol) @type (identifier) @function))
-(method_declaration (symbol (identifier) @function))
-(local_declaration (assignment (identifier) @variable))
-(local_function_declaration (identifier) @function)
-(destructor_declaration (identifier) @function)
-(creation_method_declaration (symbol (symbol) @type (identifier) @constructor))
-(creation_method_declaration (symbol (identifier) @constructor))
-(constructor_declaration (_)? "construct" @keyword.function)
-(enum_declaration (symbol) @type)
-(enum_value (identifier) @constant)
-(errordomain_declaration (symbol) @type)
-(errorcode (identifier) @constant)
-(constant_declaration (identifier) @constant)
-(method_call_expression (member_access_expression (identifier) @function))
+
+(namespace_declaration
+  (symbol) @module)
+
+(method_declaration
+  (symbol
+    (symbol) @type
+    (identifier) @function))
+
+(method_declaration
+  (symbol
+    (identifier) @function))
+
+(local_declaration
+  (assignment
+    (identifier) @variable))
+
+(local_function_declaration
+  (identifier) @function)
+
+(destructor_declaration
+  (identifier) @function)
+
+(creation_method_declaration
+  (symbol
+    (symbol) @type
+    (identifier) @constructor))
+
+(creation_method_declaration
+  (symbol
+    (identifier) @constructor))
+
+(constructor_declaration
+  (_)?
+  "construct" @keyword.function)
+
+(enum_declaration
+  (symbol) @type)
+
+(enum_value
+  (identifier) @constant)
+
+(errordomain_declaration
+  (symbol) @type)
+
+(errorcode
+  (identifier) @constant)
+
+(constant_declaration
+  (identifier) @constant)
+
+(method_call_expression
+  (member_access_expression
+    (identifier) @function))
+
 ; highlight macros
-(
- (method_call_expression (member_access_expression (identifier) @function.macro))
- (#match? @function.macro "^assert[A-Za-z_0-9]*|error|info|debug|print|warning|warning_once$")
-)
-(lambda_expression (identifier) @variable.parameter)
-(parameter (identifier) @variable.parameter)
-(property_declaration (symbol (identifier) @property))
-(field_declaration (identifier) @variable.member)
+((method_call_expression
+  (member_access_expression
+    (identifier) @function.macro))
+  (#match? @function.macro "^assert[A-Za-z_0-9]*|error|info|debug|print|warning|warning_once$"))
+
+(lambda_expression
+  (identifier) @variable.parameter)
+
+(parameter
+  (identifier) @variable.parameter)
+
+(property_declaration
+  (symbol
+    (identifier) @property))
+
+(field_declaration
+  (identifier) @variable.member)
+
 [
- (this_access)
- (base_access)
- (value_access)
+  (this_access)
+  (base_access)
+  (value_access)
 ] @constant.builtin
+
 (boolean) @boolean
+
 (character) @character
+
 (escape_sequence) @string.escape
+
 (integer) @number
+
 (null) @constant.builtin
+
 (real) @number.float
+
 (regex) @string.regexp
+
 (string) @string
+
 (string_formatter) @string.special
+
 (template_string) @string
+
 (template_string_expression) @string.special
+
 (verbatim_string) @string
+
 [
- "var"
- "void"
+  "var"
+  "void"
 ] @type.builtin
 
 (if_directive
-  expression: (_) @keyword.directive
-) @keyword
+  expression: (_) @keyword.directive) @keyword
+
 (elif_directive
-  expression: (_) @keyword.directive
-) @keyword
+  expression: (_) @keyword.directive) @keyword
+
 (else_directive) @keyword
+
 (endif_directive) @keyword
 
 [
- "abstract"
- "class"
- "construct"
- "continue"
- "default"
- "delegate"
- "enum"
- "errordomain"
- "get"
- "inline"
- "interface"
- "namespace"
- "new"
- "out"
- "override"
- "partial"
- "ref"
- "set"
- "signal"
- "struct"
- "virtual"
- "with"
+  "abstract"
+  "class"
+  "construct"
+  "continue"
+  "default"
+  "delegate"
+  "enum"
+  "errordomain"
+  "get"
+  "inline"
+  "interface"
+  "namespace"
+  "new"
+  "out"
+  "override"
+  "partial"
+  "ref"
+  "set"
+  "signal"
+  "struct"
+  "virtual"
+  "with"
 ] @keyword
 
 [
@@ -121,54 +203,66 @@
 ] @keyword.coroutine
 
 [
- "const"
- "dynamic"
- "owned"
- "weak"
- "unowned"
+  "const"
+  "dynamic"
+  "owned"
+  "weak"
+  "unowned"
 ] @type.qualifier
 
 [
- "case"
- "else"
- "if"
- "switch"
+  "case"
+  "else"
+  "if"
+  "switch"
 ] @keyword.conditional
 
 ; specially highlight break statements in switch sections
-(switch_section (break_statement "break" @keyword.conditional))
+(switch_section
+  (break_statement
+    "break" @keyword.conditional))
 
 [
- "extern"
- "internal"
- "private"
- "protected"
- "public"
- "static"
+  "extern"
+  "internal"
+  "private"
+  "protected"
+  "public"
+  "static"
 ] @keyword.storage
 
 [
- "and"
- "as"
- "delete"
- "in"
- "is"
- "lock"
- "not"
- "or"
- "sizeof"
- "typeof"
+  "and"
+  "as"
+  "delete"
+  "in"
+  "is"
+  "lock"
+  "not"
+  "or"
+  "sizeof"
+  "typeof"
 ] @keyword.operator
 
 "using" @keyword.import
-(using_directive (symbol) @module)
 
-(symbol "global::" @module)
+(using_directive
+  (symbol) @module)
 
-(array_creation_expression "new" @keyword.operator)
-(object_creation_expression "new" @keyword.operator)
-(argument "out" @keyword.operator)
-(argument "ref" @keyword.operator)
+(symbol
+  "global::" @module)
+
+(array_creation_expression
+  "new" @keyword.operator)
+
+(object_creation_expression
+  "new" @keyword.operator)
+
+(argument
+  "out" @keyword.operator)
+
+(argument
+  "ref" @keyword.operator)
 
 [
   "break"
@@ -187,64 +281,62 @@
   "try"
 ] @keyword.exception
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 [
- "="
- "=="
- "+"
- "+="
- "-"
- "-="
- "++"
- "--"
- "|"
- "|="
- "&"
- "&="
- "^"
- "^="
- "/"
- "/="
- "*"
- "*="
- "%"
- "%="
- "<<"
- "<<="
- ">>"
- ">>="
- "."
- "?."
- "->"
- "!"
- "!="
- "~"
- "??"
- "?"
- ":"
- "<"
- "<="
- ">"
- ">="
- "||"
- "&&"
- "=>"
+  "="
+  "=="
+  "+"
+  "+="
+  "-"
+  "-="
+  "++"
+  "--"
+  "|"
+  "|="
+  "&"
+  "&="
+  "^"
+  "^="
+  "/"
+  "/="
+  "*"
+  "*="
+  "%"
+  "%="
+  "<<"
+  "<<="
+  ">>"
+  ">>="
+  "."
+  "?."
+  "->"
+  "!"
+  "!="
+  "~"
+  "??"
+  "?"
+  ":"
+  "<"
+  "<="
+  ">"
+  ">="
+  "||"
+  "&&"
+  "=>"
 ] @operator
 
 [
- ","
- ";"
+  ","
+  ";"
 ] @punctuation.delimiter
 
 [
- "$("
- "("
- ")"
- "{"
- "}"
- "["
- "]"
+  "$("
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
 ] @punctuation.bracket
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 1c6e578f6..61c1e5974 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -1,5 +1,4 @@
 ; Keywords
-
 [
   ; block delimiters
   (module_keyword)
@@ -16,14 +15,12 @@
   "endchecker"
   "config"
   "endconfig"
-
   "pure"
   "virtual"
   "extends"
   "implements"
   "super"
   (class_item_qualifier)
-
   "parameter"
   "localparam"
   "defparam"
@@ -45,7 +42,6 @@
 [
   "function"
   "endfunction"
-
   "task"
   "endtask"
 ] @keyword.function
@@ -78,27 +74,28 @@
 (comment) @comment @spell
 
 (include_compiler_directive) @constant.macro
-(package_import_declaration
- "import" @keyword.import)
 
 (package_import_declaration
- (package_import_item
-  (package_identifier
-   (simple_identifier) @constant)))
+  "import" @keyword.import)
+
+(package_import_declaration
+  (package_import_item
+    (package_identifier
+      (simple_identifier) @constant)))
 
 (text_macro_identifier
- (simple_identifier) @constant.macro)
+  (simple_identifier) @constant.macro)
 
 (package_scope
- (package_identifier
-  (simple_identifier) @constant))
+  (package_identifier
+    (simple_identifier) @constant))
 
 (package_declaration
- (package_identifier
-  (simple_identifier) @constant))
+  (package_identifier
+    (simple_identifier) @constant))
 
 (parameter_port_list
- "#" @constructor)
+  "#" @constructor)
 
 [
   "="
@@ -139,13 +136,18 @@
 ] @keyword.operator
 
 (cast
- ["'" "(" ")"] @operator)
+  [
+    "'"
+    "("
+    ")"
+  ] @operator)
 
 (edge_identifier) @attribute
 
 (port_direction) @label
+
 (port_identifier
- (simple_identifier) @variable)
+  (simple_identifier) @variable)
 
 [
   (net_type)
@@ -159,20 +161,20 @@
 ] @type.qualifier
 
 (data_type
- (simple_identifier) @type)
+  (simple_identifier) @type)
 
 (method_call_body
   (method_identifier) @variable.member)
 
 (interface_identifier
- (simple_identifier) @type)
+  (simple_identifier) @type)
 
 (modport_identifier
- (modport_identifier
-  (simple_identifier) @variable.member))
+  (modport_identifier
+    (simple_identifier) @variable.member))
 
 (net_port_type1
- (simple_identifier) @type)
+  (simple_identifier) @type)
 
 [
   (double_quoted_string)
@@ -188,31 +190,30 @@
 
 ; begin/end label
 (seq_block
- (simple_identifier) @comment)
+  (simple_identifier) @comment)
 
 [
- ";"
- "::"
- ","
- "."
+  ";"
+  "::"
+  ","
+  "."
 ] @punctuation.delimiter
 
-
 (default_nettype_compiler_directive
- (default_nettype_value) @string)
+  (default_nettype_value) @string)
 
 (text_macro_identifier
- (simple_identifier) @constant)
+  (simple_identifier) @constant)
 
 (module_declaration
- (module_header
-  (simple_identifier) @constructor))
+  (module_header
+    (simple_identifier) @constructor))
 
 (class_constructor_declaration
- "new" @constructor)
+  "new" @constructor)
 
 (parameter_identifier
- (simple_identifier) @variable.parameter)
+  (simple_identifier) @variable.parameter)
 
 [
   (integral_number)
@@ -223,63 +224,61 @@
 (time_unit) @attribute
 
 (checker_instantiation
- (checker_identifier
-  (simple_identifier) @constructor))
+  (checker_identifier
+    (simple_identifier) @constructor))
 
 (module_instantiation
- (simple_identifier) @constructor)
+  (simple_identifier) @constructor)
 
 (name_of_instance
- (instance_identifier
-  (simple_identifier) @variable))
+  (instance_identifier
+    (simple_identifier) @variable))
 
 (interface_port_declaration
- (interface_identifier
-  (simple_identifier) @type))
+  (interface_identifier
+    (simple_identifier) @type))
 
 (net_declaration
- (simple_identifier) @type)
+  (simple_identifier) @type)
 
 (lifetime) @label
 
-(function_identifier 
- (function_identifier 
-  (simple_identifier) @function))
+(function_identifier
+  (function_identifier
+    (simple_identifier) @function))
 
-(function_subroutine_call 
- (subroutine_call
-  (tf_call
-   (simple_identifier) @function)))
+(function_subroutine_call
+  (subroutine_call
+    (tf_call
+      (simple_identifier) @function)))
 
-(function_subroutine_call 
- (subroutine_call
-  (system_tf_call
-   (system_tf_identifier) @function.builtin)))
+(function_subroutine_call
+  (subroutine_call
+    (system_tf_call
+      (system_tf_identifier) @function.builtin)))
 
 (task_identifier
- (task_identifier
-  (simple_identifier) @function.method))
+  (task_identifier
+    (simple_identifier) @function.method))
 
-;;TODO: fixme
+;TODO: fixme
 ;(assignment_pattern_expression
- ;(assignment_pattern
-  ;(parameter_identifier) @variable.member))
-
+;(assignment_pattern
+;(parameter_identifier) @variable.member))
 (type_declaration
-  (data_type ["packed"] @type.qualifier))
+  (data_type
+    "packed" @type.qualifier))
 
 (struct_union) @type
 
-[
-  "enum"
-] @type
+"enum" @type
 
 (enum_name_declaration
- (enum_identifier
-  (simple_identifier) @constant))
+  (enum_identifier
+    (simple_identifier) @constant))
 
 (type_declaration
- (simple_identifier) @type)
+  (simple_identifier) @type)
 
 [
   (integer_atom_type)
@@ -288,20 +287,20 @@
 ] @type.builtin
 
 (struct_union_member
- (list_of_variable_decl_assignments
-  (variable_decl_assignment
-   (simple_identifier) @variable.member)))
+  (list_of_variable_decl_assignments
+    (variable_decl_assignment
+      (simple_identifier) @variable.member)))
 
 (member_identifier
- (simple_identifier) @variable.member)
+  (simple_identifier) @variable.member)
 
 (struct_union_member
- (data_type_or_void
-  (data_type
-   (simple_identifier) @type)))
+  (data_type_or_void
+    (data_type
+      (simple_identifier) @type)))
 
 (type_declaration
- (simple_identifier) @type)
+  (simple_identifier) @type)
 
 (generate_block_identifier) @comment
 
diff --git a/queries/verilog/injections.scm b/queries/verilog/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/verilog/injections.scm
+++ b/queries/verilog/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/verilog/locals.scm b/queries/verilog/locals.scm
index 35b874ab4..e9ed89169 100644
--- a/queries/verilog/locals.scm
+++ b/queries/verilog/locals.scm
@@ -9,53 +9,52 @@
 ] @local.scope
 
 (data_declaration
- (list_of_variable_decl_assignments
-  (variable_decl_assignment
-   (simple_identifier) @local.definition.var)))
+  (list_of_variable_decl_assignments
+    (variable_decl_assignment
+      (simple_identifier) @local.definition.var)))
 
 (genvar_initialization
- (genvar_identifier
-  (simple_identifier) @local.definition.var))
+  (genvar_identifier
+    (simple_identifier) @local.definition.var))
 
 (for_initialization
- (for_variable_declaration
-  (simple_identifier) @local.definition.var))
+  (for_variable_declaration
+    (simple_identifier) @local.definition.var))
 
 (net_declaration
- (list_of_net_decl_assignments
-  (net_decl_assignment
-   (simple_identifier) @local.definition.var)))
+  (list_of_net_decl_assignments
+    (net_decl_assignment
+      (simple_identifier) @local.definition.var)))
 
 (ansi_port_declaration
- (port_identifier
-  (simple_identifier) @local.definition.var))
+  (port_identifier
+    (simple_identifier) @local.definition.var))
 
 (parameter_declaration
- (list_of_param_assignments
-  (param_assignment
-   (parameter_identifier
-    (simple_identifier) @local.definition.parameter))))
+  (list_of_param_assignments
+    (param_assignment
+      (parameter_identifier
+        (simple_identifier) @local.definition.parameter))))
 
 (local_parameter_declaration
- (list_of_param_assignments
-  (param_assignment
-   (parameter_identifier
-    (simple_identifier) @local.definition.parameter))))
+  (list_of_param_assignments
+    (param_assignment
+      (parameter_identifier
+        (simple_identifier) @local.definition.parameter))))
 
-;; TODO: fixme
+; TODO: fixme
 ;(function_declaration
- ;(function_identifier
-  ;(simple_identifier) @local.definition.function))
-
+;(function_identifier
+;(simple_identifier) @local.definition.function))
 (function_declaration
- (function_body_declaration
-  (function_identifier
-   (function_identifier
-    (simple_identifier) @local.definition.function))))
+  (function_body_declaration
+    (function_identifier
+      (function_identifier
+        (simple_identifier) @local.definition.function))))
 
 (tf_port_item1
- (port_identifier
-  (simple_identifier) @local.definition.parameter))
+  (port_identifier
+    (simple_identifier) @local.definition.parameter))
 
 ; too broad, now includes types etc
 (simple_identifier) @local.reference
diff --git a/queries/vhs/highlights.scm b/queries/vhs/highlights.scm
index 70b6ca20a..469fdd139 100644
--- a/queries/vhs/highlights.scm
+++ b/queries/vhs/highlights.scm
@@ -13,9 +13,11 @@
   "Type"
   "Sleep"
   "Hide"
-  "Show" ] @keyword
+  "Show"
+] @keyword
 
-[ "Shell"
+[
+  "Shell"
   "FontFamily"
   "FontSize"
   "Framerate"
@@ -27,13 +29,24 @@
   "Padding"
   "Theme"
   "LoopOffset"
-  "Width" ] @type
+  "Width"
+] @type
+
+"@" @operator
 
-[ "@" ] @operator
 (control) @function.macro
+
 (float) @number.float
+
 (integer) @number
+
 (comment) @comment @spell
-[(string) (json)] @string
+
+[
+  (string)
+  (json)
+] @string
+
 (path) @string.special.path
+
 (time) @string.special
diff --git a/queries/vim/folds.scm b/queries/vim/folds.scm
index 4c9973583..0a1fb695f 100644
--- a/queries/vim/folds.scm
+++ b/queries/vim/folds.scm
@@ -1,4 +1,4 @@
 [
- (if_statement)
- (function_definition)
+  (if_statement)
+  (function_definition)
 ] @fold
diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 7b28b4759..67f8546b0 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -1,9 +1,9 @@
 (identifier) @variable
+
 ((identifier) @constant
- (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
-
-;; Keywords
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
+; Keywords
 [
   "if"
   "else"
@@ -34,24 +34,43 @@
   "endfunction"
 ] @keyword.function
 
-;; Function related
-(function_declaration name: (_) @function)
-(call_expression function: (identifier) @function.call)
-(call_expression function: (scoped_identifier (identifier) @function.call))
-(parameters (identifier) @variable.parameter)
-(default_parameter (identifier) @variable.parameter)
+; Function related
+(function_declaration
+  name: (_) @function)
 
-[ (bang) (spread) ] @punctuation.special
+(call_expression
+  function: (identifier) @function.call)
+
+(call_expression
+  function:
+    (scoped_identifier
+      (identifier) @function.call))
+
+(parameters
+  (identifier) @variable.parameter)
+
+(default_parameter
+  (identifier) @variable.parameter)
+
+[
+  (bang)
+  (spread)
+] @punctuation.special
+
+[
+  (no_option)
+  (inv_option)
+  (default_option)
+  (option_name)
+] @variable.builtin
 
-[ (no_option) (inv_option) (default_option) (option_name) ] @variable.builtin
 [
   (scope)
   "a:"
   "$"
 ] @module
 
-;; Commands and user defined commands
-
+; Commands and user defined commands
 [
   "let"
   "unlet"
@@ -109,40 +128,46 @@
   "eval"
   "sign"
 ] @keyword
-(map_statement cmd: _ @keyword)
+
+(map_statement
+  cmd: _ @keyword)
+
 (command_name) @function.macro
 
-;; Filetype command
+; Filetype command
+(filetype_statement
+  [
+    "detect"
+    "plugin"
+    "indent"
+    "on"
+    "off"
+  ] @keyword)
 
-(filetype_statement [
-  "detect"
-  "plugin"
-  "indent"
-  "on"
-  "off"
-] @keyword)
+; Syntax command
+(syntax_statement
+  (keyword) @string)
 
-;; Syntax command
+(syntax_statement
+  [
+    "enable"
+    "on"
+    "off"
+    "reset"
+    "case"
+    "spell"
+    "foldlevel"
+    "iskeyword"
+    "keyword"
+    "match"
+    "cluster"
+    "region"
+    "clear"
+    "include"
+  ] @keyword)
 
-(syntax_statement (keyword) @string)
-(syntax_statement [
-  "enable"
-  "on"
-  "off"
-  "reset"
-  "case"
-  "spell"
-  "foldlevel"
-  "iskeyword"
-  "keyword"
-  "match"
-  "cluster"
-  "region"
-  "clear"
-  "include"
-] @keyword)
-
-(syntax_argument name: _ @keyword)
+(syntax_argument
+  name: _ @keyword)
 
 [
   "<buffer>"
@@ -156,70 +181,92 @@
 (augroup_name) @module
 
 (au_event) @constant
-(normal_statement (commands) @constant)
 
-;; Highlight command
+(normal_statement
+  (commands) @constant)
 
+; Highlight command
 (hl_attribute
   key: _ @property
   val: _ @constant)
 
 (hl_group) @type
 
-(highlight_statement [
-  "default"
-  "link"
-  "clear"
-] @keyword)
-
-;; Command command
+(highlight_statement
+  [
+    "default"
+    "link"
+    "clear"
+  ] @keyword)
 
+; Command command
 (command) @string
 
 (command_attribute
   name: _ @property
-  val: (behavior
-    name: _ @constant
-    val: (identifier)? @function)?)
+  val:
+    (behavior
+      name: _ @constant
+      val: (identifier)? @function)?)
 
-;; Edit command
+; Edit command
 (plus_plus_opt
   val: _? @constant) @property
-(plus_cmd "+" @property) @property
 
-;; Runtime command
+(plus_cmd
+  "+" @property) @property
 
-(runtime_statement (where) @keyword.operator)
+; Runtime command
+(runtime_statement
+  (where) @keyword.operator)
 
-;; Colorscheme command
+; Colorscheme command
+(colorscheme_statement
+  (name) @string)
 
-(colorscheme_statement (name) @string)
-
-;; Scriptencoding command
-
-(scriptencoding_statement (encoding) @string.special)
-
-;; Literals
+; Scriptencoding command
+(scriptencoding_statement
+  (encoding) @string.special)
 
+; Literals
 (string_literal) @string
+
 (integer_literal) @number
+
 (float_literal) @number.float
+
 (comment) @comment @spell
+
 (line_continuation_comment) @comment @spell
+
 (pattern) @string.special
+
 (pattern_multi) @string.regexp
+
 (filename) @string.special.path
-(heredoc (body) @string)
-(heredoc (parameter) @keyword)
-[ (marker_definition) (endmarker) ] @label
-(literal_dictionary (literal_key) @label)
+
+(heredoc
+  (body) @string)
+
+(heredoc
+  (parameter) @keyword)
+
+[
+  (marker_definition)
+  (endmarker)
+] @label
+
+(literal_dictionary
+  (literal_key) @label)
+
 ((scoped_identifier
-  (scope) @_scope . (identifier) @boolean)
- (#eq? @_scope "v:")
- (#any-of? @boolean "true" "false"))
-
-;; Operators
+  (scope) @_scope
+  .
+  (identifier) @boolean)
+  (#eq? @_scope "v:")
+  (#any-of? @boolean "true" "false"))
 
+; Operators
 [
   "||"
   "&&"
@@ -254,12 +301,13 @@
 ] @operator
 
 ; Some characters have different meanings based on the context
-(unary_operation "!" @operator)
-(binary_operation "." @operator)
+(unary_operation
+  "!" @operator)
 
+(binary_operation
+  "." @operator)
 
-;; Punctuation
-
+; Punctuation
 [
   "("
   ")"
@@ -270,27 +318,31 @@
   "#{"
 ] @punctuation.bracket
 
-(field_expression "." @punctuation.delimiter)
+(field_expression
+  "." @punctuation.delimiter)
 
 [
   ","
   ":"
 ] @punctuation.delimiter
 
-(ternary_expression ["?" ":"] @keyword.conditional.ternary)
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 ; Options
 ((set_value) @number
- (#lua-match? @number "^[%d]+(%.[%d]+)?$"))
+  (#lua-match? @number "^[%d]+(%.[%d]+)?$"))
 
-(inv_option "!" @operator)
-(set_item "?" @operator)
+(inv_option
+  "!" @operator)
+
+(set_item
+  "?" @operator)
 
 ((set_item
-   option: (option_name) @_option
-   value: (set_value) @function)
-  (#any-of? @_option
-    "tagfunc" "tfu"
-    "completefunc" "cfu"
-    "omnifunc" "ofu"
-    "operatorfunc" "opfunc"))
+  option: (option_name) @_option
+  value: (set_value) @function)
+  (#any-of? @_option "tagfunc" "tfu" "completefunc" "cfu" "omnifunc" "ofu" "operatorfunc" "opfunc"))
diff --git a/queries/vim/injections.scm b/queries/vim/injections.scm
index 553ac5e6a..c76feddb4 100644
--- a/queries/vim/injections.scm
+++ b/queries/vim/injections.scm
@@ -1,46 +1,42 @@
-(lua_statement 
-  (script 
+(lua_statement
+  (script
     (body) @injection.content
     (#set! injection.language "lua")))
-(lua_statement 
+
+(lua_statement
   (chunk) @injection.content
   (#set! injection.language "lua"))
-(ruby_statement 
-  (script 
-    (body) @injection.content 
-    (#set! injection.language "ruby")))
-(ruby_statement 
-  (chunk) @injection.content 
-  (#set! injection.language "ruby"))
-(python_statement 
-  (script 
-    (body) @injection.content 
-    (#set! injection.language "python")))
-(python_statement 
-  (chunk) @injection.content 
-  (#set! injection.language "python"))
-;; If we support perl at some point...
-;; (perl_statement (script (body) @perl))
-;; (perl_statement (chunk) @perl)
 
-(autocmd_statement 
-  (pattern) @injection.content 
+(ruby_statement
+  (script
+    (body) @injection.content
+    (#set! injection.language "ruby")))
+
+(ruby_statement
+  (chunk) @injection.content
+  (#set! injection.language "ruby"))
+
+(python_statement
+  (script
+    (body) @injection.content
+    (#set! injection.language "python")))
+
+(python_statement
+  (chunk) @injection.content
+  (#set! injection.language "python"))
+
+; If we support perl at some point...
+; (perl_statement (script (body) @perl))
+; (perl_statement (chunk) @perl)
+(autocmd_statement
+  (pattern) @injection.content
   (#set! injection.language "regex"))
 
 ((set_item
-   option: (option_name) @_option
-   value: (set_value) @injection.content)
-  (#any-of? @_option
-    "includeexpr" "inex"
-    "printexpr" "pexpr"
-    "formatexpr" "fex"
-    "indentexpr" "inde"
-    "foldtext" "fdt"
-    "foldexpr" "fde"
-    "diffexpr" "dex"
-    "patchexpr" "pex"
-    "charconvert" "ccv")
+  option: (option_name) @_option
+  value: (set_value) @injection.content)
+  (#any-of? @_option "includeexpr" "inex" "printexpr" "pexpr" "formatexpr" "fex" "indentexpr" "inde" "foldtext" "fdt" "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" "charconvert" "ccv")
   (#set! injection.language "vim"))
 
-((comment) @injection.content 
- (#set! injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/vim/locals.scm b/queries/vim/locals.scm
index 4ba551e40..dff662680 100644
--- a/queries/vim/locals.scm
+++ b/queries/vim/locals.scm
@@ -3,8 +3,18 @@
   (function_definition)
 ] @local.scope
 
-(function_declaration name: (identifier) @local.definition.function)
-(function_declaration parameters: (parameters (identifier) @local.definition.parameter))
-(let_statement [(scoped_identifier) (identifier)] @local.definition.var)
+(function_declaration
+  name: (identifier) @local.definition.function)
+
+(function_declaration
+  parameters:
+    (parameters
+      (identifier) @local.definition.parameter))
+
+(let_statement
+  [
+    (scoped_identifier)
+    (identifier)
+  ] @local.definition.var)
 
 (identifier) @local.reference
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index eefc4e74b..255bdfa66 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -1,31 +1,58 @@
 (h1) @markup.heading.1
+
 (h2) @markup.heading.2
+
 (h3) @markup.heading.3
+
 (column_heading) @markup.heading.4
+
 (column_heading
-   "~" @markup.heading.4.marker (#set! conceal ""))
+  "~" @markup.heading.4.marker
+  (#set! conceal ""))
+
 (tag
-   "*" @markup.heading.5.marker (#set! conceal "")
-   text: (_) @label)
+  "*" @markup.heading.5.marker
+  (#set! conceal "")
+  text: (_) @label)
+
 (taglink
-   "|" @markup.link (#set! conceal "")
-   text: (_) @markup.link)
+  "|" @markup.link
+  (#set! conceal "")
+  text: (_) @markup.link)
+
 (optionlink
-   text: (_) @markup.link)
+  text: (_) @markup.link)
+
 (codespan
-   "`" @markup.raw (#set! conceal "")
-   text: (_) @markup.raw)
-((codeblock) @markup.raw.block (#set! "priority" 90))
+  "`" @markup.raw
+  (#set! conceal "")
+  text: (_) @markup.raw)
+
+((codeblock) @markup.raw.block
+  (#set! "priority" 90))
+
 (codeblock
-   [">" (language)] @markup.raw.block (#set! conceal ""))
+  [
+    ">"
+    (language)
+  ] @markup.raw.block
+  (#set! conceal ""))
+
 (block
-   "<" @markup.raw.block (#set! conceal ""))
+  "<" @markup.raw.block
+  (#set! conceal ""))
+
 (argument) @variable.parameter
+
 (keycode) @string.special
+
 (url) @string.special.url
+
 ((note) @comment.hint
-   (#any-of? @comment.hint "Note:" "NOTE:" "Notes:"))
+  (#any-of? @comment.hint "Note:" "NOTE:" "Notes:"))
+
 ((note) @comment.warning
-   (#any-of? @comment.warning "Warning:" "WARNING:"))
+  (#any-of? @comment.warning "Warning:" "WARNING:"))
+
 ((note) @comment.error
-   (#any-of? @comment.error "Deprecated:" "DEPRECATED:"))
+  (#any-of? @comment.error "Deprecated:" "DEPRECATED:"))
diff --git a/queries/vimdoc/injections.scm b/queries/vimdoc/injections.scm
index 4ae65e19e..3b8fbf0f3 100644
--- a/queries/vimdoc/injections.scm
+++ b/queries/vimdoc/injections.scm
@@ -1,4 +1,4 @@
 ((codeblock
   (language) @injection.language
   (code) @injection.content)
-  (#set! injection.include-children)) 
+  (#set! injection.include-children))
diff --git a/queries/vue/highlights.scm b/queries/vue/highlights.scm
index e53ef4b8a..066586459 100644
--- a/queries/vue/highlights.scm
+++ b/queries/vue/highlights.scm
@@ -1,11 +1,11 @@
 ; inherits: html_tags
-
 [
   (directive_dynamic_argument)
   (directive_dynamic_argument_value)
 ] @tag
 
 (interpolation) @punctuation.special
+
 (interpolation
   (raw_text) @none)
 
@@ -15,7 +15,8 @@
   (quoted_attribute_value) @punctuation.special)
 
 (directive_attribute
-  (quoted_attribute_value (attribute_value) @none))
+  (quoted_attribute_value
+    (attribute_value) @none))
 
 [
   (directive_modifier)
diff --git a/queries/vue/indents.scm b/queries/vue/indents.scm
index 39355b020..8c8091ab5 100644
--- a/queries/vue/indents.scm
+++ b/queries/vue/indents.scm
@@ -1,7 +1,6 @@
 ; inherits: html_tags
+(template_element) @indent.begin
 
-[
-  (template_element)
-] @indent.begin
-
-(template_element (end_tag ">" @indent.end) @indent.branch)
+(template_element
+  (end_tag
+    ">" @indent.end) @indent.branch)
diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index 583a05c3f..2fbf22c92 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -1,59 +1,63 @@
 ; inherits html_tags
-
 ; <script lang="css">
 ((style_element
-    (start_tag
-      (attribute
-        (attribute_name) @_lang
-        (quoted_attribute_value (attribute_value) @injection.language)))
-    (raw_text) @injection.content)
-    (#eq? @_lang "lang")
-    (#any-of? @injection.language "css" "scss"))
+  (start_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @injection.language)))
+  (raw_text) @injection.content)
+  (#eq? @_lang "lang")
+  (#any-of? @injection.language "css" "scss"))
 
 ; TODO: When nvim-treesitter has postcss and less parsers, use @injection.language and @injection.content instead
 ; <script lang="scss">
 ((style_element
-    (start_tag
-      (attribute
-        (attribute_name) @_lang
-        (quoted_attribute_value (attribute_value) @_scss)))
-    (raw_text) @injection.content
-    (#eq? @_lang "lang")
-    (#any-of? @_scss "less" "postcss")
-    (#set! injection.language "scss")))
+  (start_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_scss)))
+  (raw_text) @injection.content
+  (#eq? @_lang "lang")
+  (#any-of? @_scss "less" "postcss")
+  (#set! injection.language "scss")))
 
 ; <script lang="js">
 ((script_element
-    (start_tag
-      (attribute
-        (attribute_name) @_lang
-        (quoted_attribute_value (attribute_value) @_js)))
-    (raw_text) @injection.content)
-    (#eq? @_lang "lang")
-    (#eq? @_js "js")
-    (#set! injection.language "javascript"))
+  (start_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_js)))
+  (raw_text) @injection.content)
+  (#eq? @_lang "lang")
+  (#eq? @_js "js")
+  (#set! injection.language "javascript"))
 
 ; <script lang="ts">
 ((script_element
-    (start_tag
-      (attribute
-        (attribute_name) @_lang
-        (quoted_attribute_value (attribute_value) @_ts)))
-    (raw_text) @injection.content)
-    (#eq? @_lang "lang")
-    (#eq? @_ts "ts")
-    (#set! injection.language "typescript"))
+  (start_tag
+    (attribute
+      (attribute_name) @_lang
+      (quoted_attribute_value
+        (attribute_value) @_ts)))
+  (raw_text) @injection.content)
+  (#eq? @_lang "lang")
+  (#eq? @_ts "ts")
+  (#set! injection.language "typescript"))
 
 ; <script lang="tsx">
 ; <script lang="jsx">
 ((script_element
-    (start_tag
-      (attribute
-        (attribute_name) @_attr
-        (quoted_attribute_value (attribute_value) @injection.language)))
-    (#eq? @_attr "lang")
-    (#any-of? @injection.language "tsx" "jsx")
-    (raw_text) @injection.content))
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (quoted_attribute_value
+        (attribute_value) @injection.language)))
+  (#eq? @_attr "lang")
+  (#any-of? @injection.language "tsx" "jsx")
+  (raw_text) @injection.content))
 
 ((interpolation
   (raw_text) @injection.content)
@@ -65,8 +69,9 @@
     (#set! injection.language "typescript")))
 
 (template_element
-    (start_tag
-      (attribute
-        (quoted_attribute_value (attribute_value) @injection.language)))
-    (text) @injection.content
-    (#eq? @injection.language "pug"))
+  (start_tag
+    (attribute
+      (quoted_attribute_value
+        (attribute_value) @injection.language)))
+  (text) @injection.content
+  (#eq? @injection.language "pug"))
diff --git a/queries/wgsl/folds.scm b/queries/wgsl/folds.scm
index d8000edee..60b526c53 100644
--- a/queries/wgsl/folds.scm
+++ b/queries/wgsl/folds.scm
@@ -1,10 +1,10 @@
 [
-    (struct_declaration)
-    (function_declaration)
-    (if_statement)
-    (switch_statement)
-    (switch_body)
-    (loop_statement)
-    (for_statement)
-    (while_statement)
+  (struct_declaration)
+  (function_declaration)
+  (if_statement)
+  (switch_statement)
+  (switch_body)
+  (loop_statement)
+  (for_statement)
+  (while_statement)
 ] @fold
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index 6e190f06e..970c4e2eb 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -1,104 +1,126 @@
 (identifier) @variable
+
 (int_literal) @number
+
 (float_literal) @number.float
+
 (bool_literal) @boolean
 
 (type_declaration) @type
 
 (function_declaration
-    (identifier) @function)
+  (identifier) @function)
 
 (parameter
-    (variable_identifier_declaration (identifier) @variable.parameter))
+  (variable_identifier_declaration
+    (identifier) @variable.parameter))
 
 (struct_declaration
-    (identifier) @type)
+  (identifier) @type)
 
 (struct_declaration
-    (struct_member (variable_identifier_declaration (identifier) @variable.member)))
+  (struct_member
+    (variable_identifier_declaration
+      (identifier) @variable.member)))
 
 (type_constructor_or_function_call_expression
-    (type_declaration) @function.call)
+  (type_declaration) @function.call)
 
 [
-    "struct"
-    "bitcast"
-    "discard"
-    "enable"
-    "fallthrough"
-    "let"
-    "type"
-    "var"
-    "override"
-    (texel_format)
+  "struct"
+  "bitcast"
+  "discard"
+  "enable"
+  "fallthrough"
+  "let"
+  "type"
+  "var"
+  "override"
+  (texel_format)
 ] @keyword
 
 [
-    "private"
-    "storage"
-    "uniform"
-    "workgroup"
+  "private"
+  "storage"
+  "uniform"
+  "workgroup"
 ] @keyword.storage
 
 [
-    "read"
-    "read_write"
-    "write"
+  "read"
+  "read_write"
+  "write"
 ] @type.qualifier
 
 "fn" @keyword.function
 
 "return" @keyword.return
 
-[ "," "." ":" ";" "->" ] @punctuation.delimiter
-
-["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+[
+  ","
+  "."
+  ":"
+  ";"
+  "->"
+] @punctuation.delimiter
 
 [
-    "loop"
-    "for"
-    "while"
-    "break"
-    "continue"
-    "continuing"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "loop"
+  "for"
+  "while"
+  "break"
+  "continue"
+  "continuing"
 ] @keyword.repeat
 
 [
-    "if"
-    "else"
-    "switch"
-    "case"
-    "default"
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
 ] @keyword.conditional
 
 [
-    "&"
-    "&&"
-    "/"
-    "!"
-    "="
-    "=="
-    "!="
-    ">"
-    ">="
-    ">>"
-    "<"
-    "<="
-    "<<"
-    "%"
-    "-"
-    "+"
-    "|"
-    "||"
-    "*"
-    "~"
-    "^"
-    "@"
-    "++"
-    "--"
+  "&"
+  "&&"
+  "/"
+  "!"
+  "="
+  "=="
+  "!="
+  ">"
+  ">="
+  ">>"
+  "<"
+  "<="
+  "<<"
+  "%"
+  "-"
+  "+"
+  "|"
+  "||"
+  "*"
+  "~"
+  "^"
+  "@"
+  "++"
+  "--"
 ] @operator
 
 (attribute
-    (identifier) @attribute)
+  (identifier) @attribute)
 
-[(line_comment) (block_comment)] @comment @spell
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
diff --git a/queries/wgsl/indents.scm b/queries/wgsl/indents.scm
index 08be2255e..b74e56e34 100644
--- a/queries/wgsl/indents.scm
+++ b/queries/wgsl/indents.scm
@@ -5,10 +5,17 @@
   (struct_declaration)
 ] @indent.begin
 
-(compound_statement "}" @indent.end)
-(loop_statement "}" @indent.end)
-(function_declaration ")" @indent.end)
-(struct_declaration "}" @indent.end)
+(compound_statement
+  "}" @indent.end)
+
+(loop_statement
+  "}" @indent.end)
+
+(function_declaration
+  ")" @indent.end)
+
+(struct_declaration
+  "}" @indent.end)
 
 [
   "else"
@@ -16,4 +23,7 @@
   "}"
 ] @indent.branch
 
-[(line_comment) (block_comment)] @indent.auto
+[
+  (line_comment)
+  (block_comment)
+] @indent.auto
diff --git a/queries/wgsl_bevy/folds.scm b/queries/wgsl_bevy/folds.scm
index 7d2547fa0..bb371406d 100644
--- a/queries/wgsl_bevy/folds.scm
+++ b/queries/wgsl_bevy/folds.scm
@@ -1,5 +1,2 @@
 ; inherits wgsl
-
-[
- (preproc_ifdef)
-] @fold
+(preproc_ifdef) @fold
diff --git a/queries/wgsl_bevy/highlights.scm b/queries/wgsl_bevy/highlights.scm
index d14276733..9cd796c72 100644
--- a/queries/wgsl_bevy/highlights.scm
+++ b/queries/wgsl_bevy/highlights.scm
@@ -1,36 +1,44 @@
 ; inherits wgsl
-
 [
- "virtual"
- "override"
+  "virtual"
+  "override"
 ] @keyword
 
 [
- "#import"
- "#define_import_path"
- "as"
+  "#import"
+  "#define_import_path"
+  "as"
 ] @keyword.import
 
 "::" @punctuation.delimiter
 
 (function_declaration
   (import_path
-    ((identifier) @function .)))
+    ((identifier) @function.)))
 
-(import_path (identifier) @module (identifier))
+(import_path
+  (identifier) @module
+  (identifier))
 
 (struct_declaration
-    (preproc_ifdef (struct_member (variable_identifier_declaration (identifier) @variable.member))))
+  (preproc_ifdef
+    (struct_member
+      (variable_identifier_declaration
+        (identifier) @variable.member))))
+
 (struct_declaration
-    (preproc_ifdef
-      (preproc_else (struct_member (variable_identifier_declaration (identifier) @variable.member)))))
+  (preproc_ifdef
+    (preproc_else
+      (struct_member
+        (variable_identifier_declaration
+          (identifier) @variable.member)))))
 
 (preproc_ifdef
   name: (identifier) @constant.macro)
 
 [
- "#ifdef"
- "#ifndef"
- "#endif"
- "#else"
+  "#ifdef"
+  "#ifndef"
+  "#endif"
+  "#else"
 ] @keyword.directive
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 3ef530746..2fb7268e7 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -1,39 +1,49 @@
 (identifier) @variable
+
 (reference_identifier) @variable
+
 (member_identifier) @property
 
 ; Classes
-
 (custom_type) @type
-(class_field 
+
+(class_field
   name: (identifier) @variable.member)
-(class_definition 
+
+(class_definition
   name: (identifier) @type)
+
 (method_definition
   name: (identifier) @function.method)
 
 ; Functions
-
 (keyword_argument_key) @variable.parameter
-(call 
-  caller: (reference 
-  	(nested_identifier 
-    	property: (member_identifier) @function.method.call)))
-(call 
-  caller: (reference 
-  	(reference_identifier) @function.method.call))
+
+(call
+  caller:
+    (reference
+      (nested_identifier
+        property: (member_identifier) @function.method.call)))
+
+(call
+  caller:
+    (reference
+      (reference_identifier) @function.method.call))
 
 ; Primitives
-
 (number) @number
+
 (duration) @constant
+
 (string) @string
+
 (bool) @boolean
+
 (builtin_type) @type.builtin
+
 (json_container_type) @type.builtin
 
 ; Special
-
 (comment) @comment @spell
 
 [
@@ -41,7 +51,7 @@
   ")"
   "{"
   "}"
-]  @punctuation.bracket
+] @punctuation.bracket
 
 [
   "-"
diff --git a/queries/wing/locals.scm b/queries/wing/locals.scm
index c5515d15e..9a860c5f2 100644
--- a/queries/wing/locals.scm
+++ b/queries/wing/locals.scm
@@ -1,4 +1,5 @@
 (block) @local.scope
+
 (variable_definition_statement
   name: (identifier) @local.definition)
 
diff --git a/queries/xcompose/highlights.scm b/queries/xcompose/highlights.scm
index 811a67b1d..82ef8e6d4 100644
--- a/queries/xcompose/highlights.scm
+++ b/queries/xcompose/highlights.scm
@@ -1,20 +1,38 @@
 (keysym) @constant
 
 ((keysym) @constant.builtin
- (#eq? @constant.builtin "Multi_key"))
+  (#eq? @constant.builtin "Multi_key"))
 
 (text) @string
 
 "include" @keyword.import
 
-[ (octal) (hex) ] @number
+[
+  (octal)
+  (hex)
+] @number
 
-[ (modifier) "None" ] @type.qualifier
+[
+  (modifier)
+  "None"
+] @type.qualifier
 
-[ "%L" "%H" "%S" ] @string.special
+[
+  "%L"
+  "%H"
+  "%S"
+] @string.special
 
-[ "!" "~" ] @operator
+[
+  "!"
+  "~"
+] @operator
 
-[ ":" "<" ">" "\"" ] @punctuation.delimiter
+[
+  ":"
+  "<"
+  ">"
+  "\""
+] @punctuation.delimiter
 
 (comment) @comment @spell
diff --git a/queries/xcompose/injections.scm b/queries/xcompose/injections.scm
index 321c90add..2f0e58eb6 100644
--- a/queries/xcompose/injections.scm
+++ b/queries/xcompose/injections.scm
@@ -1,2 +1,2 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
diff --git a/queries/xcompose/locals.scm b/queries/xcompose/locals.scm
index 365472da2..9b6f359bf 100644
--- a/queries/xcompose/locals.scm
+++ b/queries/xcompose/locals.scm
@@ -1,3 +1,5 @@
-(result (keysym) @local.definition)
+(result
+  (keysym) @local.definition)
 
-(event (keysym) @local.reference)
+(event
+  (keysym) @local.reference)
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index aa913352e..7881e0df0 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -1,53 +1,65 @@
 ; inherits: dtd
+; XML declaration
+(XMLDecl
+  "standalone" @tag.attribute)
 
-;; XML declaration
+(XMLDecl
+  [
+    "yes"
+    "no"
+  ] @boolean)
 
-(XMLDecl "standalone" @tag.attribute)
+; Processing instructions
+(XmlModelPI
+  "xml-model" @keyword.directive)
 
-(XMLDecl [ "yes" "no" ] @boolean)
+(StyleSheetPI
+  "xml-stylesheet" @keyword.directive)
 
-;; Processing instructions
+(PseudoAtt
+  (Name) @tag.attribute)
 
-(XmlModelPI "xml-model" @keyword.directive)
+(PseudoAtt
+  (PseudoAttValue) @string)
 
-(StyleSheetPI "xml-stylesheet" @keyword.directive)
+; Doctype declaration
+(doctypedecl
+  "DOCTYPE" @keyword.directive.define)
 
-(PseudoAtt (Name) @tag.attribute)
+(doctypedecl
+  (Name) @type.definition)
 
-(PseudoAtt (PseudoAttValue) @string)
+; Tags
+(STag
+  (Name) @tag)
 
-;; Doctype declaration
+(ETag
+  (Name) @tag)
 
-(doctypedecl "DOCTYPE" @keyword.directive.define)
+(EmptyElemTag
+  (Name) @tag)
 
-(doctypedecl (Name) @type.definition)
+; Attributes
+(Attribute
+  (Name) @tag.attribute)
 
-;; Tags
-
-(STag (Name) @tag)
-
-(ETag (Name) @tag)
-
-(EmptyElemTag (Name) @tag)
-
-;; Attributes
-
-(Attribute (Name) @tag.attribute)
-
-(Attribute (AttValue) @string)
-
-;; Text
+(Attribute
+  (AttValue) @string)
 
+; Text
 (CharData) @none @spell
 
 ((CDSect
   (CDStart) @markup.environment
   (CData) @markup.raw
   "]]>" @markup.environment)
- (#set! "priority" 105))
+  (#set! "priority" 105))
 
-;; Delimiters & punctuation
-
-[ "<" "</" "/>" ] @tag.delimiter
+; Delimiters & punctuation
+[
+  "<"
+  "</"
+  "/>"
+] @tag.delimiter
 
 "]" @punctuation.bracket
diff --git a/queries/xml/injections.scm b/queries/xml/injections.scm
index 99b3a9cc8..942e54575 100644
--- a/queries/xml/injections.scm
+++ b/queries/xml/injections.scm
@@ -1,29 +1,31 @@
-((Comment) @injection.content 
- (#set! injection.language "comment"))
-
+((Comment) @injection.content
+  (#set! injection.language "comment"))
 ; SVG style
 ((element
-   (STag (Name) @_name)
-   (content) @injection.content)
- (#eq? @_name "style")
- (#set! injection.combined)
- (#set! injection.include-children)
- (#set! injection.language "css"))
+  (STag
+    (Name) @_name)
+  (content) @injection.content)
+  (#eq? @_name "style")
+  (#set! injection.combined)
+  (#set! injection.include-children)
+  (#set! injection.language "css"))
 
 ; SVG script
 ((element
-   (STag (Name) @_name)
-   (content) @injection.content)
- (#eq? @_name "script")
- (#set! injection.combined)
- (#set! injection.include-children)
- (#set! injection.language "javascript"))
+  (STag
+    (Name) @_name)
+  (content) @injection.content)
+  (#eq? @_name "script")
+  (#set! injection.combined)
+  (#set! injection.include-children)
+  (#set! injection.language "javascript"))
 
 ; phpMyAdmin dump
 ((element
-   (STag (Name) @_name)
-   (content) @injection.content)
- (#eq? @_name "pma:table")
- (#set! injection.combined)
- (#set! injection.include-children)
- (#set! injection.language "sql"))
+  (STag
+    (Name) @_name)
+  (content) @injection.content)
+  (#eq? @_name "pma:table")
+  (#set! injection.combined)
+  (#set! injection.include-children)
+  (#set! injection.language "sql"))
diff --git a/queries/xml/locals.scm b/queries/xml/locals.scm
index 214b43818..2806b530c 100644
--- a/queries/xml/locals.scm
+++ b/queries/xml/locals.scm
@@ -1,25 +1,35 @@
-;; tags
-
-(elementdecl (Name) @local.definition.type)
+; tags
+(elementdecl
+  (Name) @local.definition.type)
 
 (elementdecl
   (contentspec
-    (children (Name) @local.reference)))
+    (children
+      (Name) @local.reference)))
 
-(AttlistDecl . (Name) @local.reference)
+(AttlistDecl
+  .
+  (Name) @local.reference)
 
-(STag (Name) @local.reference)
-(ETag (Name) @local.reference)
-(EmptyElemTag (Name) @local.reference)
+(STag
+  (Name) @local.reference)
 
-;; attributes
+(ETag
+  (Name) @local.reference)
 
-(AttDef (Name) @local.definition.field)
+(EmptyElemTag
+  (Name) @local.reference)
 
-(Attribute (Name) @local.reference)
+; attributes
+(AttDef
+  (Name) @local.definition.field)
 
-;; entities
+(Attribute
+  (Name) @local.reference)
 
-(GEDecl (Name) @local.definition.macro)
+; entities
+(GEDecl
+  (Name) @local.definition.macro)
 
-(EntityRef (Name) @local.reference)
+(EntityRef
+  (Name) @local.reference)
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index 03234a5ce..32f77c2cd 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -1,15 +1,28 @@
 (boolean_scalar) @boolean
+
 (null_scalar) @constant.builtin
+
 (double_quote_scalar) @string
+
 (single_quote_scalar) @string
-((block_scalar) @string (#set! "priority" 99))
+
+((block_scalar) @string
+  (#set! "priority" 99))
+
 (string_scalar) @string
+
 (escape_sequence) @string.escape
+
 (integer_scalar) @number
+
 (float_scalar) @number
+
 (comment) @comment @spell
+
 (anchor_name) @type
+
 (alias_name) @type
+
 (tag) @type
 
 [
@@ -19,34 +32,54 @@
 ] @keyword.directive
 
 (block_mapping_pair
-  key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @variable.member))
+  key:
+    (flow_node
+      [
+        (double_quote_scalar)
+        (single_quote_scalar)
+      ] @variable.member))
+
 (block_mapping_pair
-  key: (flow_node (plain_scalar (string_scalar) @variable.member)))
+  key:
+    (flow_node
+      (plain_scalar
+        (string_scalar) @variable.member)))
 
 (flow_mapping
-  (_ key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @variable.member)))
+  (_
+    key:
+      (flow_node
+        [
+          (double_quote_scalar)
+          (single_quote_scalar)
+        ] @variable.member)))
+
 (flow_mapping
-  (_ key: (flow_node (plain_scalar (string_scalar) @variable.member))))
+  (_
+    key:
+      (flow_node
+        (plain_scalar
+          (string_scalar) @variable.member))))
 
 [
- ","
- "-"
- ":"
- ">"
- "?"
- "|"
+  ","
+  "-"
+  ":"
+  ">"
+  "?"
+  "|"
 ] @punctuation.delimiter
 
 [
- "["
- "]"
- "{"
- "}"
+  "["
+  "]"
+  "{"
+  "}"
 ] @punctuation.bracket
 
 [
- "*"
- "&"
- "---"
- "..."
+  "*"
+  "&"
+  "---"
+  "..."
 ] @punctuation.special
diff --git a/queries/yaml/indents.scm b/queries/yaml/indents.scm
index f168bcc5a..f7146d316 100644
--- a/queries/yaml/indents.scm
+++ b/queries/yaml/indents.scm
@@ -1,5 +1,6 @@
 [
-  (block_mapping_pair value: (block_node))
+  (block_mapping_pair
+    value: (block_node))
   (block_sequence_item)
 ] @indent.begin
 
diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index ae86e7950..4661276e3 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -1,72 +1,87 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
-
-;; Github actions ("run") / Gitlab CI ("scripts")
+  (#set! injection.language "comment"))
+; Github actions ("run") / Gitlab CI ("scripts")
 (block_mapping_pair
-  key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script")
-  value: (flow_node
-           (plain_scalar
-             (string_scalar) @injection.content)
-           (#set! injection.language "bash")))
+  key: (flow_node) @_run
+  (#any-of? @_run "run" "script" "before_script" "after_script")
+  value:
+    (flow_node
+      (plain_scalar
+        (string_scalar) @injection.content)
+      (#set! injection.language "bash")))
 
 (block_mapping_pair
-  key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script")
-  value: (block_node
-           (block_scalar) @injection.content
-           (#set! injection.language "bash")
-           (#offset! @injection.content 0 1 0 0)))
+  key: (flow_node) @_run
+  (#any-of? @_run "run" "script" "before_script" "after_script")
+  value:
+    (block_node
+      (block_scalar) @injection.content
+      (#set! injection.language "bash")
+      (#offset! @injection.content 0 1 0 0)))
 
 (block_mapping_pair
-  key: (flow_node) @_run (#any-of? @_run "run" "script" "before_script" "after_script")
-  value: (block_node
-           (block_sequence
-             (block_sequence_item
-                (flow_node
-                  (plain_scalar
-                    (string_scalar) @injection.content))
-                (#set! injection.language "bash")))))
+  key: (flow_node) @_run
+  (#any-of? @_run "run" "script" "before_script" "after_script")
+  value:
+    (block_node
+      (block_sequence
+        (block_sequence_item
+          (flow_node
+            (plain_scalar
+              (string_scalar) @injection.content))
+          (#set! injection.language "bash")))))
 
 (block_mapping_pair
-  key: (flow_node) @_run (#any-of? @_run "script" "before_script" "after_script")
-  value: (block_node
-           (block_sequence
-             (block_sequence_item
-               (block_node
-                  (block_scalar) @injection.content
-                  (#set! injection.language "bash")
-                  (#offset! @injection.content 0 1 0 0))))))
+  key: (flow_node) @_run
+  (#any-of? @_run "script" "before_script" "after_script")
+  value:
+    (block_node
+      (block_sequence
+        (block_sequence_item
+          (block_node
+            (block_scalar) @injection.content
+            (#set! injection.language "bash")
+            (#offset! @injection.content 0 1 0 0))))))
 
-;; Prometheus Alertmanager ("expr")
+; Prometheus Alertmanager ("expr")
 (block_mapping_pair
-  key: (flow_node) @_expr (#eq? @_expr "expr")
-  value: (flow_node
-           (plain_scalar
-             (string_scalar) @injection.content)
-           (#set! injection.language "promql")))
+  key: (flow_node) @_expr
+  (#eq? @_expr "expr")
+  value:
+    (flow_node
+      (plain_scalar
+        (string_scalar) @injection.content)
+      (#set! injection.language "promql")))
 
 (block_mapping_pair
-  key: (flow_node) @_expr (#eq? @_expr "expr")
-  value: (block_node
-           (block_scalar) @injection.content
-           (#set! injection.language "promql")
-           (#offset! @injection.content 0 1 0 0)))
+  key: (flow_node) @_expr
+  (#eq? @_expr "expr")
+  value:
+    (block_node
+      (block_scalar) @injection.content
+      (#set! injection.language "promql")
+      (#offset! @injection.content 0 1 0 0)))
 
 (block_mapping_pair
-  key: (flow_node) @_expr (#eq? @_expr "expr")
-  value: (block_node
-           (block_sequence
-             (block_sequence_item
-               (flow_node
-                 (plain_scalar
-                   (string_scalar) @injection.content))
-               (#set! injection.language "promql")))))
+  key: (flow_node) @_expr
+  (#eq? @_expr "expr")
+  value:
+    (block_node
+      (block_sequence
+        (block_sequence_item
+          (flow_node
+            (plain_scalar
+              (string_scalar) @injection.content))
+          (#set! injection.language "promql")))))
 
 (block_mapping_pair
-  key: (flow_node) @_expr (#eq? @_expr "expr")
-  value: (block_node
-           (block_sequence
-             (block_sequence_item
-               (block_node
-                  (block_scalar) @injection.content
-                  (#set! injection.language "promql")
-                  (#offset! @injection.content 0 1 0 0))))))
+  key: (flow_node) @_expr
+  (#eq? @_expr "expr")
+  value:
+    (block_node
+      (block_sequence
+        (block_sequence_item
+          (block_node
+            (block_scalar) @injection.content
+            (#set! injection.language "promql")
+            (#offset! @injection.content 0 1 0 0))))))
diff --git a/queries/yaml/locals.scm b/queries/yaml/locals.scm
index 8a438434b..f7c79e082 100644
--- a/queries/yaml/locals.scm
+++ b/queries/yaml/locals.scm
@@ -1,8 +1,9 @@
 [
- (stream)
- (document)
- (block_node)
+  (stream)
+  (document)
+  (block_node)
 ] @local.scope
 
 (anchor_name) @local.definition
+
 (alias_name) @local.reference
diff --git a/queries/yang/folds.scm b/queries/yang/folds.scm
index adf0eb113..fd7d23999 100644
--- a/queries/yang/folds.scm
+++ b/queries/yang/folds.scm
@@ -1,3 +1 @@
-[
- (block)
-] @fold
+(block) @fold
diff --git a/queries/yang/highlights.scm b/queries/yang/highlights.scm
index 33e5517c3..133f99beb 100644
--- a/queries/yang/highlights.scm
+++ b/queries/yang/highlights.scm
@@ -1,29 +1,54 @@
-
 (comment) @comment @spell
-
 ; Module / submodule
-["module" "submodule"] @keyword
+[
+  "module"
+  "submodule"
+] @keyword
 
 ; Keywords
 (statement_keyword) @keyword
-(statement_keyword "import") @keyword.import
+
+(statement_keyword
+  "import") @keyword.import
+
 (extension_keyword) @function
 
 ; Arguments
 (built_in_type) @type.builtin
+
 (number) @number
+
 (boolean) @boolean
+
 (date) @number
-(range (_ ".." @punctuation.special))
-(range (_ "|" @punctuation.special))
-(quoted_range "\"" @string.special)
-(quoted_range "'" @string.special)
+
+(range
+  (_
+    ".." @punctuation.special))
+
+(range
+  (_
+    "|" @punctuation.special))
+
+(quoted_range
+  "\"" @string.special)
+
+(quoted_range
+  "'" @string.special)
+
 (yang_version) @constant.builtin
+
 (identifier) @variable
+
 (node_identifier) @variable
+
 (string) @string
-(string (escape_sequence) @string.escape)
+
+(string
+  (escape_sequence) @string.escape)
+
 (unquoted_string) @string
+
 (keypath) @string.special.path
 
 ; Always highlight the value of an enum statement as a string
@@ -31,13 +56,23 @@
 
 ; Highlight xpath and pattern strings differently from plain strings
 (statement
-  (statement_keyword "must")
-  (argument (string) @string.special))
+  (statement_keyword
+    "must")
+  (argument
+    (string) @string.special))
+
 (statement
-  (statement_keyword "pattern")
-  (argument (string) @string.regexp))
+  (statement_keyword
+    "pattern")
+  (argument
+    (string) @string.regexp))
 
 ; Punctuation
 (plus_symbol) @operator
-["{" "}"] @punctuation.bracket
-[";"] @punctuation.delimiter
+
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
+";" @punctuation.delimiter
diff --git a/queries/yang/indents.scm b/queries/yang/indents.scm
index d8782f955..cc4b3caee 100644
--- a/queries/yang/indents.scm
+++ b/queries/yang/indents.scm
@@ -1,11 +1,20 @@
 (module) @indent.begin
+
 (submodule) @indent.begin
+
 (statement) @indent.begin
+
 (extension_statement) @indent.begin
-(statement ";" @indent.end)
-(extension_statement ";" @indent.end)
-(block "}" @indent.end @indent.branch)
+
+(statement
+  ";" @indent.end)
+
+(extension_statement
+  ";" @indent.end)
+
+(block
+  "}" @indent.end @indent.branch)
 
 ((string) @indent.align
- (#set! indent.open_delimiter "\"")
- (#set! indent.close_delimiter "\""))
+  (#set! indent.open_delimiter "\"")
+  (#set! indent.close_delimiter "\""))
diff --git a/queries/yang/injections.scm b/queries/yang/injections.scm
index 44b0e44e9..4219eb30a 100644
--- a/queries/yang/injections.scm
+++ b/queries/yang/injections.scm
@@ -1,8 +1,10 @@
 ((comment) @injection.content
- (#set! injection.language "comment"))
+  (#set! injection.language "comment"))
 
 ((statement
-  (statement_keyword "pattern")
-  (argument (string) @injection.content))
- (#set! injection.language "regex")
- (#offset! @injection.content 0 1 0 -1))
+  (statement_keyword
+    "pattern")
+  (argument
+    (string) @injection.content))
+  (#set! injection.language "regex")
+  (#offset! @injection.content 0 1 0 -1))
diff --git a/queries/yuck/highlights.scm b/queries/yuck/highlights.scm
index c885d909d..bd414b8e7 100644
--- a/queries/yuck/highlights.scm
+++ b/queries/yuck/highlights.scm
@@ -1,66 +1,54 @@
 ; Tags
-
 ; TODO apply to every symbol in list? I think it should probably only be applied to the first child of the list
 (list
   (symbol) @tag)
 
 ; Includes
-
-(list .
+(list
+  .
   ((symbol) @keyword.import
     (#eq? @keyword.import "include")))
 
 ; Keywords
-
 ; I think there's a bug in tree-sitter the anchor doesn't seem to be working, see
 ; https://github.com/tree-sitter/tree-sitter/pull/2107
-(list .
+(list
+  .
   ((symbol) @keyword
     (#any-of? @keyword "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "geometry" "children" "struts")))
 
 ; Loop
+(loop_widget
+  .
+  "for" @keyword.repeat
+  .
+  (symbol) @variable
+  .
+  "in" @keyword.operator)
 
-(loop_widget . "for" @keyword.repeat . (symbol) @variable . "in" @keyword.operator)
-
-(loop_widget . "for" @keyword.repeat . (symbol) @variable . "in" @keyword.operator . (symbol) @variable)
+(loop_widget
+  .
+  "for" @keyword.repeat
+  .
+  (symbol) @variable
+  .
+  "in" @keyword.operator
+  .
+  (symbol) @variable)
 
 ; Builtin widgets
-
-(list .
+(list
+  .
   ((symbol) @tag.builtin
-    (#any-of? @tag.builtin
-      "box"
-      "button"
-      "calendar"
-      "centerbox"
-      "checkbox"
-      "circular-progress"
-      "color-button"
-      "color-chooser"
-      "combo-box-text"
-      "eventbox"
-      "expander"
-      "graph"
-      "image"
-      "input"
-      "label"
-      "literal"
-      "overlay"
-      "progress"
-      "revealer"
-      "scale"
-      "scroll"
-      "transform")))
+    (#any-of? @tag.builtin "box" "button" "calendar" "centerbox" "checkbox" "circular-progress" "color-button" "color-chooser" "combo-box-text" "eventbox" "expander" "graph" "image" "input" "label" "literal" "overlay" "progress" "revealer" "scale" "scroll" "transform")))
 
 ; Variables
-
 (ident) @variable
 
 (array
   (symbol) @variable)
 
 ; Properties & Fields
-
 (keyword) @property
 
 (json_access
@@ -87,12 +75,10 @@
     (ident) @variable.member))
 
 ; Functions
-
 (function_call
   name: (ident) @function.call)
 
 ; Operators
-
 [
   "+"
   "-"
@@ -114,17 +100,29 @@
 ] @operator
 
 ; Punctuation
+[
+  ":"
+  "."
+  ","
+] @punctuation.delimiter
 
-[":" "." ","] @punctuation.delimiter
-["{" "}" "[" "]" "(" ")"] @punctuation.bracket
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
 
 ; Ternary expression
-
 (ternary_expression
-  ["?" ":"] @keyword.conditional.ternary)
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
 
 ; Literals
-
 (number) @number
 
 (float) @number.float
@@ -132,8 +130,12 @@
 (boolean) @boolean
 
 ; Strings
-
-[ (string_fragment) "\"" "'" "`" ] @string
+[
+  (string_fragment)
+  "\""
+  "'"
+  "`"
+] @string
 
 (string_interpolation
   "${" @punctuation.special
@@ -142,5 +144,4 @@
 (escape_sequence) @string.escape
 
 ; Comments
-
 (comment) @comment @spell
diff --git a/queries/yuck/indents.scm b/queries/yuck/indents.scm
index bcf028ce4..cd326b923 100644
--- a/queries/yuck/indents.scm
+++ b/queries/yuck/indents.scm
@@ -6,21 +6,32 @@
   (json_object)
   (parenthesized_expression)
 ] @indent.begin
-
 ; TODO: can't get this to work, goal is to indent at the property ":" prefix
 ; ((list (identifier) (property)) @indent.align
 ;   (#set! indent.open_delimiter "(")
 ;   (#set! indent.close_delimiter ")"))
-
-[")" "}" "]"] @indent.end
-
-[ "{" "}" ] @indent.branch
-
-[ "(" ")" ] @indent.branch
-
-[ "[" "]" ] @indent.branch
+[
+  ")"
+  "}"
+  "]"
+] @indent.end
 
 [
- (ERROR)
- (comment)
+  "{"
+  "}"
+] @indent.branch
+
+[
+  "("
+  ")"
+] @indent.branch
+
+[
+  "["
+  "]"
+] @indent.branch
+
+[
+  (ERROR)
+  (comment)
 ] @indent.auto
diff --git a/queries/yuck/injections.scm b/queries/yuck/injections.scm
index 4bb7d675d..2f0e58eb6 100644
--- a/queries/yuck/injections.scm
+++ b/queries/yuck/injections.scm
@@ -1 +1,2 @@
-(comment) @comment
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/yuck/locals.scm b/queries/yuck/locals.scm
index 063d59b1a..9f40b2082 100644
--- a/queries/yuck/locals.scm
+++ b/queries/yuck/locals.scm
@@ -13,7 +13,7 @@
 (keyword) @local.definition.field
 
 (json_object
-	(simplexpr
+  (simplexpr
     (ident) @local.definition.field))
 
 (ast_block
diff --git a/queries/zig/folds.scm b/queries/zig/folds.scm
index 965987439..1d65a5280 100644
--- a/queries/zig/folds.scm
+++ b/queries/zig/folds.scm
@@ -6,11 +6,9 @@
   (AsmExpr)
   (ErrorSetDecl)
   (LINESTRING)
-  (
-    [
-      (IfPrefix)
-      (WhilePrefix)
-      (ForPrefix)
-    ]
-  )
+  ([
+    (IfPrefix)
+    (WhilePrefix)
+    (ForPrefix)
+  ])
 ] @fold
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 875235412..c0477986d 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -9,7 +9,6 @@
   variable: (IDENTIFIER)
   variable_type_function: (IDENTIFIER)
 ] @variable
-
 parameter: (IDENTIFIER) @variable.parameter
 
 [
@@ -17,56 +16,45 @@ parameter: (IDENTIFIER) @variable.parameter
   field_access: (IDENTIFIER)
 ] @variable.member
 
-;; assume TitleCase is a type
-(
-  [
-    variable_type_function: (IDENTIFIER)
-    field_access: (IDENTIFIER)
-    parameter: (IDENTIFIER)
-  ] @type
-  (#lua-match? @type "^%u([%l]+[%u%l%d]*)*$")
-)
-;; assume camelCase is a function
-(
-  [
-    variable_type_function: (IDENTIFIER)
-    field_access: (IDENTIFIER)
-    parameter: (IDENTIFIER)
-  ] @function
-  (#lua-match? @function "^%l+([%u][%l%d]*)+$")
-)
+; assume TitleCase is a type
+([
+  variable_type_function: (IDENTIFIER)
+  field_access: (IDENTIFIER)
+  parameter: (IDENTIFIER)
+] @type
+  (#lua-match? @type "^%u([%l]+[%u%l%d]*)*$"))
 
-;; assume all CAPS_1 is a constant
-(
-  [
-    variable_type_function: (IDENTIFIER)
-    field_access: (IDENTIFIER)
-  ] @constant
-  (#lua-match? @constant "^%u[%u%d_]+$")
-)
+; assume camelCase is a function
+([
+  variable_type_function: (IDENTIFIER)
+  field_access: (IDENTIFIER)
+  parameter: (IDENTIFIER)
+] @function
+  (#lua-match? @function "^%l+([%u][%l%d]*)+$"))
 
+; assume all CAPS_1 is a constant
+([
+  variable_type_function: (IDENTIFIER)
+  field_access: (IDENTIFIER)
+] @constant
+  (#lua-match? @constant "^%u[%u%d_]+$"))
 function: (IDENTIFIER) @function
 function_call: (IDENTIFIER) @function.call
-
 exception: "!" @keyword.exception
 
-(
-  (IDENTIFIER) @variable.builtin
-  (#eq? @variable.builtin "_")
-)
+((IDENTIFIER) @variable.builtin
+  (#eq? @variable.builtin "_"))
 
-(PtrTypeStart "c" @variable.builtin)
-
-(
-  (ContainerDeclType
-    [
-      (ErrorUnionExpr)
-      "enum"
-    ]
-  )
-  (ContainerField (IDENTIFIER) @constant)
-)
+(PtrTypeStart
+  "c" @variable.builtin)
 
+((ContainerDeclType
+  [
+    (ErrorUnionExpr)
+    "enum"
+  ])
+  (ContainerField
+    (IDENTIFIER) @constant))
 field_constant: (IDENTIFIER) @constant
 
 (BUILTINIDENTIFIER) @function.builtin
@@ -89,11 +77,16 @@ field_constant: (IDENTIFIER) @constant
 ] @string @spell
 
 (CHAR_LITERAL) @character
+
 (EscapeSequence) @string.escape
+
 (FormatSequence) @string.special
 
-(BreakLabel (IDENTIFIER) @label)
-(BlockLabel (IDENTIFIER) @label)
+(BreakLabel
+  (IDENTIFIER) @label)
+
+(BlockLabel
+  (IDENTIFIER) @label)
 
 [
   "asm"
@@ -115,9 +108,7 @@ field_constant: (IDENTIFIER) @constant
   "resume"
 ] @keyword.coroutine
 
-[
-  "fn"
-] @keyword.function
+"fn" @keyword.function
 
 [
   "and"
@@ -125,9 +116,7 @@ field_constant: (IDENTIFIER) @constant
   "orelse"
 ] @keyword.operator
 
-[
-  "return"
-] @keyword.return
+"return" @keyword.return
 
 [
   "if"
@@ -142,9 +131,7 @@ field_constant: (IDENTIFIER) @constant
   "continue"
 ] @keyword.repeat
 
-[
-  "usingnamespace"
-] @keyword.import
+"usingnamespace" @keyword.import
 
 [
   "try"
@@ -223,7 +210,10 @@ field_constant: (IDENTIFIER) @constant
   ")"
   "{"
   "}"
-  (Payload "|")
-  (PtrPayload "|")
-  (PtrIndexPayload "|")
+  (Payload
+    "|")
+  (PtrPayload
+    "|")
+  (PtrIndexPayload
+    "|")
 ] @punctuation.bracket
diff --git a/queries/zig/indents.scm b/queries/zig/indents.scm
index fdf7b183b..bf9d3e42a 100644
--- a/queries/zig/indents.scm
+++ b/queries/zig/indents.scm
@@ -5,7 +5,8 @@
   (InitList)
 ] @indent.begin
 
-(Block "}" @indent.end)
+(Block
+  "}" @indent.end)
 
 [
   "("
diff --git a/queries/zig/injections.scm b/queries/zig/injections.scm
index 31e15a328..9e687ca76 100644
--- a/queries/zig/injections.scm
+++ b/queries/zig/injections.scm
@@ -2,6 +2,5 @@
   (container_doc_comment)
   (doc_comment)
   (line_comment)
- ] @injection.content
- (#set! injection.language "comment"))
-  
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/zig/locals.scm b/queries/zig/locals.scm
index e69de29bb..8b1378917 100644
--- a/queries/zig/locals.scm
+++ b/queries/zig/locals.scm
@@ -0,0 +1 @@
+

From 76b85583e172f92395a04358e982e19af9401de5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 7 Jan 2024 13:39:55 +0100
Subject: [PATCH 0999/2704] docs: update CONTRIBUTING.md with formatting

---
 CONTRIBUTING.md | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8c98c46b3..c29994f18 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -69,6 +69,8 @@ Here are some global advices:
 - Examples of queries can be found in [queries/](queries/)
 - Matches in the bottom will override queries that are above of them.
 
+#### Inheriting languages
+
 If your language is an extension of a language (TypeScript is an extension of JavaScript for
 example), you can include the queries from your base language by adding the following _as the first
 line of your file_.
@@ -80,6 +82,15 @@ line of your file_.
 If you want to inherit a language, but don't want the languages inheriting from yours to inherit it,
 you can mark the language as optional (by putting it between parenthesis).
 
+#### Formatting
+
+All queries are expected to follow a standard format, with every node on a single line and indented by two spaces for each level of nesting. You can automatically format the bundled queries by running the provided formatter `./scripts/format-queries.lua` on a single file (ending in `.scm`) or directory to format.
+
+Should you need to preserve a specific format for a node, you can exempt it (and all contained nodes) by placing before it
+```query
+; format-ignore
+```
+
 ### Highlights
 
 As languages differ quite a lot, here is a set of captures available to you when building a `highlights.scm` query. Note that your colorscheme needs to define (or link) these captures as highlight groups.
@@ -170,7 +181,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 
 #### Punctuation
 
-```scheme
+```query
 @punctuation.delimiter ; delimiters (e.g. `;` / `.` / `,`)
 @punctuation.bracket   ; brackets (e.g. `()` / `{}` / `[]`)
 @punctuation.special   ; special symbols (e.g. `{}` in string interpolation)
@@ -224,7 +235,7 @@ Mainly for markup languages.
 @diff.delta      ; changed text (for diff files)
 ```
 
-```scheme
+```query
 @tag           ; XML tag names
 @tag.attribute ; XML tag attributes
 @tag.delimiter ; XML tag delimiters
@@ -281,7 +292,7 @@ documentation](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#loc
 Note that nvim-treesitter uses more specific subcaptures for definitions and
 **does not use locals for highlighting**.
 
-```scheme
+```query
 @local.definition            ; various definitions
 @local.definition.constant   ; constants
 @local.definition.function   ; functions
@@ -330,7 +341,7 @@ Possible scope values are:
 
 You can define folds for a given language by adding a `folds.scm` query :
 
-```scheme
+```query
 @fold ; fold this node
 ```
 
@@ -344,7 +355,7 @@ Some captures are related to language injection (like markdown code blocks). The
 If you want to dynamically detect the language (e.g. for Markdown blocks) use the `@injection.language` to capture
 the node describing the language and `@injection.content` to describe the injection region.
 
-```scheme
+```query
 @injection.language ; dynamic detection of the injection language (i.e. the text of the captured node describes the language)
 @injection.content  ; region for the dynamically detected language
 ```
@@ -368,7 +379,7 @@ To combine all matches of a pattern as one single block of content, add `(#set!
 
 ### Indents
 
-```scheme
+```query
 @indent.begin       ; indent children when matching this node
 @indent.end         ; marks the end of indented block
 @indent.align       ; behaves like python aligned/hanging indent

From 8c629a9327e13b77d4024c015aa120368d01cc86 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 28 Nov 2023 19:10:43 -0500
Subject: [PATCH 1000/2704] chore(rust): tweak injections, add json macro
 injection

---
 queries/rust/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index b245e3b64..d3d3bf512 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -22,7 +22,7 @@
   macro:
     ((identifier) @injection.language)
   (token_tree) @injection.content)
-  (#eq? @injection.language "html"))
+  (#any-of? @injection.language "html" "json"))
 
 (call_expression
   function:

From 4cd951d703349f422eebe2ce8096bb05f512952b Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 9 Jan 2024 11:34:26 +0200
Subject: [PATCH 1001/2704] feat(git_config): add missing injections

---
 queries/git_config/injections.scm | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 queries/git_config/injections.scm

diff --git a/queries/git_config/injections.scm b/queries/git_config/injections.scm
new file mode 100644
index 000000000..58330dcac
--- /dev/null
+++ b/queries/git_config/injections.scm
@@ -0,0 +1,8 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((variable
+  (name) @_name
+  value: (string) @injection.content)
+  (#any-of? @_name "cmd" "command" "textconv")
+  (#set! injection.language "bash"))

From 2f38c36294fde19a901b17589b153898b8a075e5 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 9 Jan 2024 11:50:31 +0200
Subject: [PATCH 1002/2704] fix(highlights): improve consistency

---
 queries/ada/highlights.scm           | 23 ++++++++++-------------
 queries/apex/highlights.scm          |  2 +-
 queries/bitbake/highlights.scm       |  5 +----
 queries/cmake/highlights.scm         |  2 +-
 queries/dot/highlights.scm           |  4 +---
 queries/elixir/highlights.scm        |  2 +-
 queries/elvish/highlights.scm        |  2 +-
 queries/git_config/highlights.scm    | 10 ++++++++++
 queries/http/highlights.scm          |  4 ++--
 queries/hurl/highlights.scm          |  5 +++--
 queries/mlir/highlights.scm          |  2 +-
 queries/ocaml/highlights.scm         |  3 ++-
 queries/proto/highlights.scm         |  5 +++--
 queries/ruby/highlights.scm          |  2 +-
 queries/scala/highlights.scm         |  3 ++-
 queries/smali/highlights.scm         |  7 +++----
 queries/supercollider/highlights.scm |  4 ++--
 queries/teal/highlights.scm          | 18 ------------------
 queries/tlaplus/highlights.scm       |  4 ----
 queries/verilog/highlights.scm       | 10 +++-------
 queries/wing/highlights.scm          | 17 ++++++++++++-----
 queries/yang/highlights.scm          |  4 ++--
 22 files changed, 62 insertions(+), 76 deletions(-)

diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index c15c4d9e3..c024afb4e 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -13,6 +13,7 @@
   "array"
   "at"
   "begin"
+  "body"
   "declare"
   "delay"
   "delta"
@@ -25,17 +26,26 @@
   "interface"
   "is"
   "limited"
+  "mod"
+  "new"
   "null"
   "of"
   "others"
   "out"
+  "overriding"
+  "package"
   "pragma"
   "private"
+  "protected"
   "range"
+  "record"
+  "separate"
+  "subtype"
   "synchronized"
   "tagged"
   "task"
   "terminate"
+  "type"
   "until"
   "when"
 ] @keyword
@@ -46,27 +56,14 @@
   "renames"
 ] @keyword.storage
 
-[
-  "mod"
-  "new"
-  "protected"
-  "record"
-  "subtype"
-  "type"
-] @keyword.type
-
 [
   "with"
   "use"
 ] @keyword.import
 
 [
-  "body"
   "function"
-  "overriding"
   "procedure"
-  "package"
-  "separate"
 ] @keyword.function
 
 [
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 64ff9168c..2cddf4684 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -256,4 +256,4 @@
   "inherited_sharing"
 ] @keyword
 
-"System.runAs" @type.builtin
+"System.runAs" @function.builtin
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index e555e40d7..6661db838 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -266,10 +266,7 @@
 ] @boolean
 
 ((python_identifier) @variable.builtin
-  (#eq? @variable.builtin "self"))
-
-((python_identifier) @variable.builtin
-  (#eq? @variable.builtin "cls"))
+  (#any-of? @variable.builtin "self" "cls"))
 
 (integer) @number
 
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 714893cb1..5a3875908 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -25,7 +25,7 @@
 [
   "ENV"
   "CACHE"
-] @keyword.storage
+] @module
 
 [
   "$"
diff --git a/queries/dot/highlights.scm b/queries/dot/highlights.scm
index 7919e87f5..b4a36f18d 100644
--- a/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -47,8 +47,6 @@
     (id
       (identifier) @constant))
 
-(comment) @comment
+(comment) @comment @spell
 
 (preproc) @keyword.directive
-
-(comment) @spell
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 57e299b17..4f1057f48 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -31,7 +31,7 @@
 (string) @string
 
 ; Modules
-(alias) @type
+(alias) @module
 
 ; Atoms & Keywords
 [
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
index a2fd9302c..d0a74c226 100644
--- a/queries/elvish/highlights.scm
+++ b/queries/elvish/highlights.scm
@@ -128,7 +128,7 @@
 
 ((variable
   (identifier) @function)
-  (#match? @function ".+\\~$"))
+  (#lua-match? @function ".+[~]$"))
 
 ((variable
   (identifier) @boolean)
diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index ebae70e51..5830c1b56 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -37,6 +37,16 @@
     (subsection_name)
   ] @string.special)
 
+((section_header
+  (section_name) @_name
+  (subsection_name) @string.special.url)
+  (#any-of? @_name "credential" "url"))
+
+((variable
+  (name) @_name
+  value: (string) @string.special.url)
+  (#eq? @_name "insteadOf"))
+
 ; Punctuation
 [
   "["
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index d1396ff63..a9c4dc079 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -1,5 +1,5 @@
-; Keywords
-(scheme) @keyword
+; Schemes
+(scheme) @type
 
 ; Methods
 (method) @function.method
diff --git a/queries/hurl/highlights.scm b/queries/hurl/highlights.scm
index 9ccaa2ee7..7dd08ec64 100644
--- a/queries/hurl/highlights.scm
+++ b/queries/hurl/highlights.scm
@@ -52,12 +52,13 @@
   "retry"
   "retry-interval"
   "retry-max-count"
-  (variable_option
-    "variable")
   "verbose"
   "very-verbose"
 ] @constant.builtin
 
+(variable_option
+  "variable" @constant.builtin)
+
 (boolean) @boolean
 
 (variable_name) @variable
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index cbe4ecf0d..6c2b8d0d9 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -340,7 +340,7 @@
 (block_arg_list
   (value_use) @variable.parameter)
 
-(caret_id) @tag
+(caret_id) @string.special
 
 (value_use) @variable
 
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 99151efdc..ee6127650 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -314,5 +314,6 @@
   (comment)
   (line_number_directive)
   (directive)
-  (shebang)
 ] @comment @spell
+
+(shebang) @keyword.directive
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index 102d5c20b..6324ae3bb 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -39,11 +39,12 @@
 (enum_field
   (identifier) @constant)
 
+(string) @string
+
 [
-  (string)
   "\"proto3\""
   "\"proto2\""
-] @string
+] @string.special
 
 (int_lit) @number
 
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 6b8bb591c..8116a503e 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -125,7 +125,7 @@
 ] @label
 
 ((identifier) @constant.builtin
-  (#match? @constant.builtin "^__(callee|dir|id|method|send|ENCODING|FILE|LINE)__$"))
+  (#any-of? @constant.builtin "__callee__" "__dir__" "__id__" "__method__" "__send__" "__ENCODING__" "__FILE__" "__LINE__"))
 
 ((constant) @type
   (#not-lua-match? @type "^[A-Z0-9_]+$"))
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index e4d219f40..5b4ee7b1b 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -150,10 +150,11 @@
 
 [
   (string)
-  (character_literal)
   (interpolated_string_expression)
 ] @string
 
+(character_literal) @character
+
 (symbol_literal) @string.special.symbol
 
 (interpolation
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index f1d56dbca..2771a1452 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -71,10 +71,9 @@
 "constructor" @constructor
 
 ; Fields
-[
-  (field_identifier)
-  (annotation_key)
-] @variable.member
+(field_identifier) @variable.member
+
+(annotation_key) @attribute
 
 ((field_identifier) @constant
   (#lua-match? @constant "^[%u_]*$"))
diff --git a/queries/supercollider/highlights.scm b/queries/supercollider/highlights.scm
index c8dbd70c7..c56bce69a 100644
--- a/queries/supercollider/highlights.scm
+++ b/queries/supercollider/highlights.scm
@@ -25,11 +25,11 @@
 
 ; For function calls
 (named_argument
-  name: (identifier) @property)
+  name: (identifier) @function.call)
 
 ; Methods
 (method_call
-  name: (method_name) @function.method)
+  name: (method_name) @function.method.call)
 
 ; Classes
 (class) @type
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index f74714290..8f5be2725 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -237,21 +237,3 @@
   "{"
   "}"
 ] @punctuation.bracket
-
-; Only highlight format specifiers in calls to string.format
-; string.format('...')
-;(function_call
-;  called_object: (index
-;    (identifier) @base
-;    key: (identifier) @entry)
-;  arguments: (arguments .
-;    (string (format_specifier) @string.escape))
-;
-;  (#eq? @base "string")
-;  (#eq? @entry "format"))
-; ('...'):format()
-;(function_call
-;  called_object: (method_index
-;    (string (format_specifier) @string.escape)
-;    key: (identifier) @func-name)
-;    (#eq? @func-name "format"))
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index be4b24581..c98e63f6b 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -1,7 +1,3 @@
-; ; Intended for consumption by nvim-treesitter
-; ; Default capture names for nvim-treesitter found here:
-; ; https://github.com/nvim-treesitter/nvim-treesitter/blob/e473630fe0872cb0ed97cd7085e724aa58bc1c84/lua/nvim-treesitter/highlight.lua#L14-L104
-; ; In this file, captures defined later take precedence over captures defined earlier
 ; Keywords
 [
   "ACTION"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 61c1e5974..e4f318ec8 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -1,6 +1,7 @@
 ; Keywords
 [
-  ; block delimiters
+  "begin"
+  "end"
   (module_keyword)
   "endmodule"
   "program"
@@ -48,11 +49,6 @@
 
 "return" @keyword.return
 
-[
-  "begin"
-  "end"
-] @label
-
 [
   (always_keyword)
   "generate"
@@ -144,7 +140,7 @@
 
 (edge_identifier) @attribute
 
-(port_direction) @label
+(port_direction) @keyword.storage
 
 (port_identifier
   (simple_identifier) @variable)
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 2fb7268e7..6063dc152 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -82,12 +82,19 @@
   "as"
   "bring"
   "class"
-  "else"
-  "for"
-  "if"
-  "in"
   "let"
   "new"
-  "return"
   (inflight_specifier)
 ] @keyword
+
+[
+  "for"
+  "in"
+] @keyword.repeat
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+"return" @keyword.return
diff --git a/queries/yang/highlights.scm b/queries/yang/highlights.scm
index 133f99beb..40891fbea 100644
--- a/queries/yang/highlights.scm
+++ b/queries/yang/highlights.scm
@@ -51,8 +51,8 @@
 
 (keypath) @string.special.path
 
-; Always highlight the value of an enum statement as a string
-(enum_value) @string
+; Always highlight the value of an enum statement as a constant
+(enum_value) @constant
 
 ; Highlight xpath and pattern strings differently from plain strings
 (statement

From fa38f4e6f94b4e67fb80af21178dba3b422efb12 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 10 Jan 2024 18:05:37 +0200
Subject: [PATCH 1003/2704] fix(highlights): improve member/property
 distinction

---
 queries/chatito/highlights.scm                   |  4 ++--
 queries/cpon/highlights.scm                      |  2 +-
 queries/ecma/highlights.scm                      |  6 +++---
 queries/facility/highlights.scm                  |  6 +++---
 queries/fortran/highlights.scm                   |  2 +-
 queries/gleam/highlights.scm                     | 10 +++++-----
 queries/glimmer/highlights.scm                   |  2 +-
 queries/hurl/highlights.scm                      |  9 ++++++---
 queries/json/highlights.scm                      |  2 +-
 queries/kotlin/highlights.scm                    |  6 +++---
 queries/matlab/highlights.scm                    |  6 +++---
 queries/objc/highlights.scm                      |  6 +++---
 queries/ocaml/highlights.scm                     | 13 ++++++++-----
 queries/pascal/highlights.scm                    | 16 ++++++++--------
 queries/phpdoc/highlights.scm                    |  2 +-
 queries/puppet/highlights.scm                    |  6 +++---
 queries/rbs/highlights.scm                       |  4 ++--
 queries/ron/highlights.scm                       |  2 +-
 queries/ruby/highlights.scm                      |  4 ++--
 queries/scala/highlights.scm                     |  2 +-
 queries/smali/highlights.scm                     |  2 +-
 queries/soql/highlights.scm                      | 14 +++++++-------
 queries/squirrel/highlights.scm                  |  6 +++---
 queries/swift/highlights.scm                     |  8 ++++----
 queries/tiger/highlights.scm                     |  2 +-
 queries/toml/highlights.scm                      |  4 ++++
 queries/vim/highlights.scm                       |  2 +-
 queries/wing/highlights.scm                      |  2 +-
 queries/yaml/highlights.scm                      | 15 ++++++++-------
 tests/query/highlights/ecma/test.ts              |  8 ++++----
 tests/query/highlights/gleam/type.gleam          | 16 ++++++++--------
 tests/query/highlights/tiger/identifiers.tig     |  8 ++++----
 tests/query/highlights/tiger/object-oriented.tig |  2 +-
 tests/query/highlights/wing/nested_method.w      |  2 +-
 34 files changed, 106 insertions(+), 95 deletions(-)

diff --git a/queries/chatito/highlights.scm b/queries/chatito/highlights.scm
index 0c2dd795a..be17f3457 100644
--- a/queries/chatito/highlights.scm
+++ b/queries/chatito/highlights.scm
@@ -33,12 +33,12 @@
 
 (variation) @type.qualifier
 
-(alias) @property
+(alias) @keyword.directive
 
 (number) @number
 
 (argument
-  key: (string) @label
+  key: (string) @property
   value: (string) @string)
 
 (escape) @string.escape
diff --git a/queries/cpon/highlights.scm b/queries/cpon/highlights.scm
index 531b3961f..15240d7ae 100644
--- a/queries/cpon/highlights.scm
+++ b/queries/cpon/highlights.scm
@@ -16,7 +16,7 @@
   (_) @string.special)
 
 (_
-  key: (_) @label)
+  key: (_) @property)
 
 (number) @number
 
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 223198410..8e62fd1f6 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -6,11 +6,11 @@
 
 ; Properties
 ;-----------
-(property_identifier) @property
+(property_identifier) @variable.member
 
-(shorthand_property_identifier) @property
+(shorthand_property_identifier) @variable.member
 
-(private_property_identifier) @property
+(private_property_identifier) @variable.member
 
 (variable_declarator
   name:
diff --git a/queries/facility/highlights.scm b/queries/facility/highlights.scm
index 01f1bab19..553550a70 100644
--- a/queries/facility/highlights.scm
+++ b/queries/facility/highlights.scm
@@ -33,7 +33,7 @@
   service_name: (identifier) @type)
 
 (error_set
-  (identifier) @property)
+  (identifier) @variable.member)
 
 (error_set
   name: (identifier) @type)
@@ -70,10 +70,10 @@
 ] @attribute.builtin
 
 (parameter
-  name: (identifier) @property)
+  name: (identifier) @variable.parameter)
 
 (field
-  name: (identifier) @variable)
+  name: (identifier) @variable.member)
 
 (method
   name: (identifier) @function.method)
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index c88ad9cec..86634e903 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -235,7 +235,7 @@
 
 ; Properties
 (derived_type_member_expression
-  (type_member) @property)
+  (type_member) @variable.member)
 
 ; Operators
 [
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index 5c34dde7a..e338115ac 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -128,20 +128,20 @@
   arguments:
     (arguments
       (argument
-        label: (label) @property)?))
+        label: (label) @variable.member)?))
 
 (record_pattern_argument
-  label: (label) @property)
+  label: (label) @variable.member)
 
 (record_update_argument
-  label: (label) @property)
+  label: (label) @variable.member)
 
 (field_access
   record: (identifier) @variable
-  field: (label) @property)
+  field: (label) @variable.member)
 
 (data_constructor_argument
-  (label) @property)
+  (label) @variable.member)
 
 ; Types
 [
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index cfb1af15f..1f2c4ed8a 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -8,7 +8,7 @@
 ((tag_name) @constructor
   (#lua-match? @constructor "^%u"))
 
-(attribute_name) @property
+(attribute_name) @attribute
 
 (string_literal) @string
 
diff --git a/queries/hurl/highlights.scm b/queries/hurl/highlights.scm
index 7dd08ec64..70b220985 100644
--- a/queries/hurl/highlights.scm
+++ b/queries/hurl/highlights.scm
@@ -1,4 +1,9 @@
 ; highlights.scm
+[
+  (key_string)
+  (json_key_string)
+] @property
+
 [
   "[QueryStringParams]"
   "[FormParams]"
@@ -8,9 +13,7 @@
   "[Asserts]"
   "[Options]"
   "[BasicAuth]"
-  (key_string)
-  (json_key_string)
-] @property
+] @module
 
 [
   "\\"
diff --git a/queries/json/highlights.scm b/queries/json/highlights.scm
index 17365ed34..ce5be98ae 100644
--- a/queries/json/highlights.scm
+++ b/queries/json/highlights.scm
@@ -8,7 +8,7 @@
 (number) @number
 
 (pair
-  key: (string) @label)
+  key: (string) @property)
 
 (pair
   value: (string) @string)
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 2e5c349d2..b09cb75b9 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -25,17 +25,17 @@
   "@" @variable.builtin)
 
 (class_parameter
-  (simple_identifier) @property)
+  (simple_identifier) @variable.member)
 
 (class_body
   (property_declaration
     (variable_declaration
-      (simple_identifier) @property)))
+      (simple_identifier) @variable.member)))
 
 ; id_1.id_2.id_3: `id_2` and `id_3` are assumed as object properties
 (_
   (navigation_suffix
-    (simple_identifier) @property))
+    (simple_identifier) @variable.member))
 
 ; SCREAMING CASE identifiers are assumed to be constants
 ((simple_identifier) @constant
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index 7a1b6c40a..d92808078 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -86,14 +86,14 @@
 
 (superclass
   "."
-  (identifier) @property)
+  (identifier) @variable.member)
 
 (property_name
   "."
-  (identifier) @property)
+  (identifier) @variable.member)
 
 (property
-  name: (identifier) @property)
+  name: (identifier) @variable.member)
 
 ; Types
 (class_definition
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index dfb513a07..5c56625b8 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -229,10 +229,10 @@
 ; Properties
 (property_implementation
   "@synthesize"
-  (identifier) @property)
+  (identifier) @variable.member)
 
-((identifier) @property
-  (#has-ancestor? @property struct_declaration))
+((identifier) @variable.member
+  (#has-ancestor? @variable.member struct_declaration))
 
 ; Parameters
 (method_parameter
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index ee6127650..3eba55f29 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -76,13 +76,16 @@
 ((value_name) @function.builtin
   (#any-of? @function.builtin "raise" "raise_notrace" "failwith" "invalid_arg"))
 
-; Properties
-;-----------
+; Fields
+;-------
 [
-  (label_name)
   (field_name)
   (instance_variable_name)
-] @property
+] @variable.member
+
+; Labels
+; ------
+(label_name) @label
 
 ; Constants
 ;----------
@@ -306,7 +309,7 @@
 
 ; Attributes
 ;-----------
-(attribute_id) @property
+(attribute_id) @attribute
 
 ; Comments
 ;---------
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index f8788a056..5849a167b 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -325,10 +325,10 @@
   name: (identifier) @function)
 
 (declProp
-  getter: (identifier) @property)
+  getter: (identifier) @variable.member)
 
 (declProp
-  setter: (identifier) @property)
+  setter: (identifier) @variable.member)
 
 ; -- Function parameters
 (declArg
@@ -399,26 +399,26 @@
 
 ; -- Fields
 (exprDot
-  rhs: (identifier) @property)
+  rhs: (identifier) @variable.member)
 
 (exprDot
-  rhs: (exprDot) @property)
+  rhs: (exprDot) @variable.member)
 
 (declClass
   (declField
-    name: (identifier) @property))
+    name: (identifier) @variable.member))
 
 (declSection
   (declField
-    name: (identifier) @property))
+    name: (identifier) @variable.member))
 
 (declSection
   (declVars
     (declVar
-      name: (identifier) @property)))
+      name: (identifier) @variable.member)))
 
 (recInitializerField
-  name: (identifier) @property)
+  name: (identifier) @variable.member)
 
 ; ---------------------------------------------- ;;;
 ; EVERYTHING BELOW THIS IS OF QUESTIONABLE VALUE ;;;
diff --git a/queries/phpdoc/highlights.scm b/queries/phpdoc/highlights.scm
index 076a7d528..5e96e93cc 100644
--- a/queries/phpdoc/highlights.scm
+++ b/queries/phpdoc/highlights.scm
@@ -8,7 +8,7 @@
 (tag
   (tag_name) @_tag
   (#eq? @_tag "@property")
-  (variable_name) @property)
+  (variable_name) @variable.member)
 
 (tag
   (tag_name) @_tag
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index 8e99f1268..cebb15e74 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -36,14 +36,14 @@
 (default_case
   "default" @keyword.conditional)
 
-; Properties
+; Attributes
 (attribute
-  name: (identifier) @property)
+  name: (identifier) @attribute)
 
 (attribute
   name:
     (variable
-      (identifier) @property))
+      (identifier) @attribute))
 
 ; Parameters
 (lambda
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index a627c256b..a40b5957b 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -53,7 +53,7 @@
 [
   (ivar_name)
   (cvar_name)
-] @property
+] @variable.member
 
 (alias_member
   (method_name) @function)
@@ -80,7 +80,7 @@
 (const_name
   (constant) @constant)
 
-(global_name) @property
+(global_name) @variable.global
 
 ; Standard Arguments
 (parameter
diff --git a/queries/ron/highlights.scm b/queries/ron/highlights.scm
index 0cdfe4404..96507323b 100644
--- a/queries/ron/highlights.scm
+++ b/queries/ron/highlights.scm
@@ -3,7 +3,7 @@
 (enum_variant) @constant
 
 (struct_entry
-  (identifier) @property)
+  (identifier) @variable.member)
 
 (struct_entry
   (enum_variant
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 8116a503e..4e619a772 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -122,7 +122,7 @@
 [
   (class_variable)
   (instance_variable)
-] @label
+] @variable.member
 
 ((identifier) @constant.builtin
   (#any-of? @constant.builtin "__callee__" "__dir__" "__id__" "__method__" "__send__" "__ENCODING__" "__FILE__" "__LINE__"))
@@ -176,7 +176,7 @@
 [
   (heredoc_beginning)
   (heredoc_end)
-] @constant
+] @label
 
 [
   (bare_symbol)
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 5b4ee7b1b..711cd36a0 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -123,7 +123,7 @@
 
 ; expressions
 (field_expression
-  field: (identifier) @property)
+  field: (identifier) @variable.member)
 
 (field_expression
   value: (identifier) @type
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 2771a1452..3220b19f2 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -73,7 +73,7 @@
 ; Fields
 (field_identifier) @variable.member
 
-(annotation_key) @attribute
+(annotation_key) @variable.member
 
 ((field_identifier) @constant
   (#lua-match? @constant "^[%u_]*$"))
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index f54a2f960..5356b8a7f 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -1,33 +1,33 @@
 (field_identifier
-  (identifier) @property)
+  (identifier) @variable.member)
 
 (field_identifier
   (dotted_identifier
-    (identifier) @property))
+    (identifier) @variable.member))
 
 (type_of_clause
-  (identifier) @property)
+  (identifier) @variable.member)
 
 (when_expression
   (identifier) @type)
 
 (when_expression
   (field_list
-    (identifier) @property))
+    (identifier) @variable.member))
 
 (when_expression
   (field_list
     (dotted_identifier
-      (identifier) @property)))
+      (identifier) @variable.member)))
 
 (else_expression
   (field_list
-    (identifier) @property))
+    (identifier) @variable.member))
 
 (else_expression
   (field_list
     (dotted_identifier
-      (identifier) @property)))
+      (identifier) @variable.member)))
 
 (alias_expression
   (identifier) @label)
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index 66bc2247c..b33aa41ec 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -85,16 +85,16 @@
 (deref_expression
   "."
   .
-  (identifier) @property)
+  (identifier) @variable.member)
 
 (member_declaration
-  (identifier) @property
+  (identifier) @variable.member
   .
   "=")
 
 ((table_slot
   .
-  (identifier) @property
+  (identifier) @variable.member
   .
   [
     "="
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index f3387dbef..9b8c25073 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -95,18 +95,18 @@
 (class_body
   (property_declaration
     (pattern
-      (simple_identifier) @property)))
+      (simple_identifier) @variable.member)))
 
 (protocol_property_declaration
   (pattern
-    (simple_identifier) @property))
+    (simple_identifier) @variable.member))
 
 (navigation_expression
   (navigation_suffix
-    (simple_identifier) @property))
+    (simple_identifier) @variable.member))
 
 (value_argument
-  name: (value_argument_label) @property)
+  name: (value_argument_label) @variable.member)
 
 (import_declaration
   "import" @keyword.import)
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index e77d80229..1d75a7028 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -110,7 +110,7 @@
 
 (type_identifier) @type
 
-(field_identifier) @property
+(field_identifier) @variable.member
 
 (identifier) @variable
 
diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index 4e3c41f97..e319f5ef2 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -7,6 +7,10 @@
 (pair
   (bare_key)) @property
 
+(pair
+  (dotted_key
+    (bare_key) @property))
+
 ; Literals
 ;---------
 (boolean) @boolean
diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 67f8546b0..54832ffa5 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -257,7 +257,7 @@
 ] @label
 
 (literal_dictionary
-  (literal_key) @label)
+  (literal_key) @property)
 
 ((scoped_identifier
   (scope) @_scope
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 6063dc152..931ca5620 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -2,7 +2,7 @@
 
 (reference_identifier) @variable
 
-(member_identifier) @property
+(member_identifier) @variable.member
 
 ; Classes
 (custom_type) @type
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index 32f77c2cd..375ced906 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -19,9 +19,10 @@
 
 (comment) @comment @spell
 
-(anchor_name) @type
-
-(alias_name) @type
+[
+  (anchor_name)
+  (alias_name)
+] @label
 
 (tag) @type
 
@@ -37,13 +38,13 @@
       [
         (double_quote_scalar)
         (single_quote_scalar)
-      ] @variable.member))
+      ] @property))
 
 (block_mapping_pair
   key:
     (flow_node
       (plain_scalar
-        (string_scalar) @variable.member)))
+        (string_scalar) @property)))
 
 (flow_mapping
   (_
@@ -52,14 +53,14 @@
         [
           (double_quote_scalar)
           (single_quote_scalar)
-        ] @variable.member)))
+        ] @property)))
 
 (flow_mapping
   (_
     key:
       (flow_node
         (plain_scalar
-          (string_scalar) @variable.member))))
+          (string_scalar) @property))))
 
 [
   ","
diff --git a/tests/query/highlights/ecma/test.ts b/tests/query/highlights/ecma/test.ts
index ecdfa8929..fa926f930 100644
--- a/tests/query/highlights/ecma/test.ts
+++ b/tests/query/highlights/ecma/test.ts
@@ -1,15 +1,15 @@
 class H {
   pub_field = "Hello";
-  //  ^ @property
+  //  ^ @variable.member
 
   #priv_field = "World!";
-  //   ^ @property
+  //   ^ @variable.member
 
   #private_method() {
     //  ^ @function.method
     return `${this.pub_field} -- ${this.#priv_field}`;
-    //                                      ^ @property
-    //                ^ @property
+    //                                      ^ @variable.member
+    //                ^ @variable.member
   }
 
   public_method() {
diff --git a/tests/query/highlights/gleam/type.gleam b/tests/query/highlights/gleam/type.gleam
index 0905e1ea4..da840c194 100644
--- a/tests/query/highlights/gleam/type.gleam
+++ b/tests/query/highlights/gleam/type.gleam
@@ -6,11 +6,11 @@ pub type Cat {
   Cat(name: String, cuteness: Int)
   // <- @constructor
   // ^ @punctuation.bracket
-  //  ^^^^ @property
+  //  ^^^^ @variable.member
   //      ^ @punctuation.delimiter
   //        ^^^^^^ @type.builtin
   //              ^ @punctuation.delimiter
-  //                ^^^^^^^^ @property
+  //                ^^^^^^^^ @variable.member
   //                        ^ @punctuation.delimiter
   //                          ^^^ @type.builtin
   //                             ^ @punctuation.bracket
@@ -20,11 +20,11 @@ fn cats() {
   Cat(name: "Nubi", cuteness: 2001)
   // <- @type
   // ^ @punctuation.bracket
-  //  ^^^^ @property
+  //  ^^^^ @variable.member
   //      ^ @punctuation.delimiter
   //        ^^^^^^ @string
   //              ^ @punctuation.delimiter
-  //                ^^^^^^^^ @property
+  //                ^^^^^^^^ @variable.member
   //                        ^ @punctuation.delimiter
   //                          ^^^^ @number
   //                              ^ @punctuation.bracket
@@ -47,7 +47,7 @@ type Box(inner_type) {
   Box(inner: inner_type)
   // <- @constructor
   // ^ @punctuation.bracket
-  //  ^^^^^ @property
+  //  ^^^^^ @variable.member
   //       ^ @punctuation.delimiter
   //         ^^^^^^^^^^ @type
   //                   ^ @punctuation.bracket
@@ -69,15 +69,15 @@ pub fn have_birthday(person) {
   //     ^^ @operator
   //       ^^^^^^ @variable
   //             ^ @punctuation.delimiter
-  //               ^^^ @property
+  //               ^^^ @variable.member
   //                  ^ @punctuation.delimiter
   //                    ^^^^^^ @variable
   //                          ^ @punctuation.delimiter
-  //                           ^^^ @property
+  //                           ^^^ @variable.member
   //                               ^ @operator
   //                                 ^ @number
   //                                  ^ @punctuation.delimiter
-  //                                    ^^^^^^^^ @property
+  //                                    ^^^^^^^^ @variable.member
   //                                            ^ @punctuation.delimiter
   //                                              ^^^^ @boolean
   //                                                  ^ @punctuation.bracket
diff --git a/tests/query/highlights/tiger/identifiers.tig b/tests/query/highlights/tiger/identifiers.tig
index e38749071..8d2207dd6 100644
--- a/tests/query/highlights/tiger/identifiers.tig
+++ b/tests/query/highlights/tiger/identifiers.tig
@@ -6,16 +6,16 @@ type int_array = array of int
 /*                        ^ @type.builtin */
 
 type record = {a: int, b: string}
-/*             ^ @property */
+/*             ^ @variable.member */
 /*                ^ @type.builtin */
-/*                     ^ @property */
+/*                     ^ @variable.member */
 /*                        ^ @type.builtin */
 
 var record := record {a = 12, b = "27"}
 /*  ^ @variable */
 /*            ^ @type */
-/*                    ^ @property */
-/*                            ^ @property */
+/*                    ^ @variable.member */
+/*                            ^ @variable.member */
 
 var array := int_array[12] of 27;
 /*  ^ @variable */
diff --git a/tests/query/highlights/tiger/object-oriented.tig b/tests/query/highlights/tiger/object-oriented.tig
index bf1632485..e67029c42 100644
--- a/tests/query/highlights/tiger/object-oriented.tig
+++ b/tests/query/highlights/tiger/object-oriented.tig
@@ -21,7 +21,7 @@ let
   /*            ^ @keyword.operator */
 in
   object.a := 27;
-  /*     ^ @property */
+  /*     ^ @variable.member */
 
   object.meth()
   /*     ^ @function.method */
diff --git a/tests/query/highlights/wing/nested_method.w b/tests/query/highlights/wing/nested_method.w
index 4fe5ceb6a..080d29793 100644
--- a/tests/query/highlights/wing/nested_method.w
+++ b/tests/query/highlights/wing/nested_method.w
@@ -1,4 +1,4 @@
 test1.test2.test3();
 // <- @variable
-//    ^ @property
+//    ^ @variable.member
 //          ^ @function.method.call

From 505a0e74cb82dfd1938dcc0eb2526c24abc345e2 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 10 Jan 2024 18:17:35 +0200
Subject: [PATCH 1004/2704] fix(css): make the highlights more sensible

---
 queries/css/highlights.scm   | 48 ++++++++++++++++++++----------------
 queries/pug/highlights.scm   |  4 +--
 queries/templ/highlights.scm |  4 +--
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index 506f78251..a07fcb7be 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -5,19 +5,32 @@
   "@supports"
   "@keyframes"
   (at_keyword)
+] @keyword.directive
+
+"@import" @keyword.import
+
+[
   (to)
   (from)
 ] @keyword
 
-"@import" @keyword.import
-
 (comment) @comment @spell
 
+(tag_name) @tag
+
+(class_name) @type
+
+(id_name) @constant
+
+[
+  (property_name)
+  (feature_name)
+] @property
+
 [
-  (tag_name)
   (nesting_selector)
   (universal_selector)
-] @type
+] @character.special
 
 (function_name) @function
 
@@ -50,26 +63,20 @@
 
 (pseudo_element_selector
   "::"
-  (tag_name) @property)
+  (tag_name) @attribute)
 
 (pseudo_class_selector
-  (class_name) @property)
+  (class_name) @attribute)
 
-[
-  (class_name)
-  (id_name)
-  (property_name)
-  (feature_name)
-  (attribute_name)
-] @property
+(attribute_name) @tag.attribute
 
 (namespace_name) @module
 
-((property_name) @type.definition
-  (#lua-match? @type.definition "^[-][-]"))
+((property_name) @variable
+  (#lua-match? @variable "^[-][-]"))
 
-((plain_value) @type
-  (#lua-match? @type "^[-][-]"))
+((plain_value) @variable
+  (#lua-match? @variable "^[-][-]"))
 
 [
   (string_value)
@@ -77,10 +84,9 @@
   (unit)
 ] @string
 
-[
-  (integer_value)
-  (float_value)
-] @number
+(integer_value) @number
+
+(float_value) @number.float
 
 [
   "#"
diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index 3645a7e3e..8441b737e 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -19,7 +19,7 @@
 
 (id) @constant
 
-(class) @property
+(class) @type
 
 (doctype) @keyword.directive
 
@@ -56,7 +56,7 @@
 (block_prepend
   (keyword)+ @keyword)
 
-(block_name) @type
+(block_name) @module
 
 (conditional
   (keyword) @keyword.conditional)
diff --git a/queries/templ/highlights.scm b/queries/templ/highlights.scm
index f8e9d2359..628b5bf15 100644
--- a/queries/templ/highlights.scm
+++ b/queries/templ/highlights.scm
@@ -23,10 +23,10 @@
 (css_identifier) @function
 
 (css_property
-  name: (css_property_name) @attribute)
+  name: (css_property_name) @property)
 
 (css_property
-  value: (css_property_value) @attribute)
+  value: (css_property_value) @string)
 
 [
   (expression)

From 757b4f6afba00ce48422d3e37b855a4280eba47b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 19 Jan 2024 16:08:40 +0000
Subject: [PATCH 1005/2704] Update parsers: printf, scala

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 42d210d0f..e04f74995 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -465,7 +465,7 @@
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
   },
   "printf": {
-    "revision": "8a3f07c1f620ae46d14873e5b7ee0d3e114c15e8"
+    "revision": "04696305caceab64a78e3a749774718d87ba85a1"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -555,7 +555,7 @@
     "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
   },
   "scala": {
-    "revision": "0c63ada18d34ac83eec6c7a2fba9a47e65cda48a"
+    "revision": "45b5ba0e749a8477a8fd2666f082f352859bdc3c"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"

From 4a4dbe1cb1da34d87fc42a40aaf8e218af4cfe0f Mon Sep 17 00:00:00 2001
From: Zeb Nicholls <zebedee.nicholls@climate-energy-college.org>
Date: Sat, 20 Jan 2024 03:21:57 +1100
Subject: [PATCH 1006/2704] fix(python): add support for typed (kw)args (PEP
 484) (#5875)

---
 queries/python/highlights.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 1d149162d..764521c7b 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -138,15 +138,25 @@
 
 ; Variadic parameters *args, **kwargs
 (parameters
-  (list_splat_pattern
-    ; *args
+  (list_splat_pattern ; *args
     (identifier) @variable.parameter))
 
 (parameters
-  (dictionary_splat_pattern
-    ; **kwargs
+  (dictionary_splat_pattern ; **kwargs
     (identifier) @variable.parameter))
 
+; Typed variadic parameters
+(parameters
+  (typed_parameter
+    (list_splat_pattern ; *args: type
+      (identifier) @variable.parameter)))
+
+(parameters
+  (typed_parameter
+    (dictionary_splat_pattern ; *kwargs: type
+      (identifier) @variable.parameter)))
+
+; Lambda parameters
 (lambda_parameters
   (list_splat_pattern
     (identifier) @variable.parameter))

From 1eb22367b97e277a7fbcf53f5de86167e1d2f523 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 19 Jan 2024 16:37:13 -0800
Subject: [PATCH 1007/2704] feat(html): comment injections

---
 queries/html_tags/injections.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 8cfcddf29..f16fc485a 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -1,3 +1,5 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
 ; <style>...</style>
 ; <style blocking> ...</style>
 ; Add "lang" to predicate check so that vue/svelte can inherit this

From 134a86f9ff0d25bb221e854087715ef0c8a3b092 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 20 Jan 2024 06:36:53 +0000
Subject: [PATCH 1008/2704] Update parsers: bash

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index e04f74995..4d915d387 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -24,7 +24,7 @@
     "revision": "dcf4ac4eaff601d87cc15604765a7ae329c1b2ee"
   },
   "bash": {
-    "revision": "7331995b19b8f8aba2d5e26deb51d2195c18bc94"
+    "revision": "f7239f638d3dc16762563a9027faeee518ce1bd9"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"

From f5a839d1e87fd1782849a98342fd6931c9066c9a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 19 Jan 2024 17:56:58 -0800
Subject: [PATCH 1009/2704] fix(markdown): remove @none from code fences

---
 queries/markdown/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 92c0e7486..423682496 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -98,8 +98,6 @@
 ;   @punctuation.special
 ;   (#eq? @punctuation.special "-")
 ;   (#set! conceal "—"))
-(code_fence_content) @none
-
 (thematic_break) @punctuation.special
 
 (task_list_marker_unchecked) @markup.list.unchecked

From d198a75e2c2e24885b05650515538d055d0c64e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sat, 20 Jan 2024 18:47:56 +0900
Subject: [PATCH 1010/2704] Fixup format (#5934)

* fix(format): newline between top-level field defs

* fixup: newline between node and comment

* fixup: optimize pattern
---
 queries/c/indents.scm             | 1 +
 queries/c_sharp/folds.scm         | 2 ++
 queries/clojure/highlights.scm    | 1 +
 queries/commonlisp/highlights.scm | 1 +
 queries/dart/highlights.scm       | 1 +
 queries/eex/highlights.scm        | 1 +
 queries/elixir/locals.scm         | 4 ++++
 queries/gdscript/folds.scm        | 1 +
 queries/gdscript/highlights.scm   | 1 +
 queries/html_tags/highlights.scm  | 1 +
 queries/html_tags/indents.scm     | 1 +
 queries/html_tags/injections.scm  | 1 +
 queries/jq/highlights.scm         | 1 +
 queries/jq/injections.scm         | 1 +
 queries/kotlin/injections.scm     | 1 +
 queries/leo/indents.scm           | 1 +
 queries/mlir/highlights.scm       | 1 +
 queries/nix/highlights.scm        | 1 +
 queries/pascal/injections.scm     | 1 +
 queries/prql/highlights.scm       | 1 +
 queries/racket/highlights.scm     | 2 ++
 queries/rst/injections.scm        | 1 +
 queries/ssh_config/indents.scm    | 1 +
 queries/swift/highlights.scm      | 1 +
 queries/t32/locals.scm            | 1 +
 queries/tiger/folds.scm           | 1 +
 queries/tiger/injections.scm      | 1 +
 queries/v/highlights.scm          | 1 +
 queries/v/injections.scm          | 1 +
 queries/xml/injections.scm        | 1 +
 queries/yaml/injections.scm       | 1 +
 queries/yang/highlights.scm       | 1 +
 queries/yuck/indents.scm          | 1 +
 queries/zig/highlights.scm        | 5 +++++
 scripts/format-queries.lua        | 7 ++++---
 35 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index 95d25fe1d..82660f20f 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -7,6 +7,7 @@
   (initializer_list)
   (init_declarator)
 ] @indent.begin
+
 ; With current indent logic, if we capture expression_statement with @indent.begin
 ; It will be affected by _parent_ node with error subnodes deep down the tree
 ; So narrow indent capture to check for error inside expression statement only,
diff --git a/queries/c_sharp/folds.scm b/queries/c_sharp/folds.scm
index 2b7c9773d..640242c67 100644
--- a/queries/c_sharp/folds.scm
+++ b/queries/c_sharp/folds.scm
@@ -4,7 +4,9 @@ body:
     (switch_body)
     (enum_member_declaration_list)
   ] @fold
+
 accessors: (accessor_list) @fold
+
 initializer: (initializer_expression) @fold
 
 (block) @fold
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 60bc4365b..26883ebe3 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -331,6 +331,7 @@
     "seq-to-map-for-destructuring" "update-keys" "update-vals"
     ;; 1.12
     "partitionv" "partitionv-all" "splitv-at"))
+
 ; >> Context based highlighting
 ; def-likes
 ; Correctly highlight docstrings
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 57775019b..567dbc68e 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -1,4 +1,5 @@
 (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))
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index de81cbc0b..be38a15ca 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -1,4 +1,5 @@
 (dotted_identifier_list) @string
+
 ; Methods
 ; --------------------
 (super) @function
diff --git a/queries/eex/highlights.scm b/queries/eex/highlights.scm
index ae91a2774..d032a7486 100644
--- a/queries/eex/highlights.scm
+++ b/queries/eex/highlights.scm
@@ -7,5 +7,6 @@
   "<%%="
   "<%="
 ] @tag.delimiter
+
 ; EEx comments are highlighted as such
 (comment) @comment @spell
diff --git a/queries/elixir/locals.scm b/queries/elixir/locals.scm
index 003ec4b1b..0ce0eab74 100644
--- a/queries/elixir/locals.scm
+++ b/queries/elixir/locals.scm
@@ -39,6 +39,7 @@
       (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @local.definition.var))))))))))))))))))))
     ]
   operator: "=")
+
 ; Stab Clause Definitions
 ; format-ignore
 (stab_clause
@@ -98,6 +99,7 @@
           ])
       operator: "when")
     ])
+
 ; Aliases
 ; format-ignore
 (call
@@ -155,6 +157,7 @@
           ]))
     ]?)
   (#set! definition.function.scope parent)(do_block)?) @local.scope
+
 ; ExUnit Test Definitions & Scopes
 ; format-ignore
 (call
@@ -193,5 +196,6 @@
         ])
     ])
   (do_block)?) @local.scope
+
 ; Stab Clause Scopes
 (stab_clause) @local.scope
diff --git a/queries/gdscript/folds.scm b/queries/gdscript/folds.scm
index 828ef807f..cda709077 100644
--- a/queries/gdscript/folds.scm
+++ b/queries/gdscript/folds.scm
@@ -15,6 +15,7 @@
   (lambda)
   (constructor_definition)
 ] @fold
+
 ; It's nice to be able to fold the if/elif/else clauses and the entire
 ; if_statement.
 (if_statement
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 212bc67e3..0e514eec7 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -304,6 +304,7 @@
     "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
     "is_instance_of" "len" "print_debug" "print_stack" "range"
     "type_exists"))
+
 ; Builtin Constants
 ((identifier) @constant.builtin
   ; format-ignore
diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index 9b84fbf8b..4fde36d9e 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -1,4 +1,5 @@
 (tag_name) @tag
+
 ; (erroneous_end_tag_name) @error ; we do not lint syntax errors
 (comment) @comment @spell
 
diff --git a/queries/html_tags/indents.scm b/queries/html_tags/indents.scm
index 59448d2fc..1eac15bfd 100644
--- a/queries/html_tags/indents.scm
+++ b/queries/html_tags/indents.scm
@@ -6,6 +6,7 @@
   (element
     (self_closing_tag))
 ] @indent.begin
+
 ; These tags are usually written one-lined and doesn't use self-closing tags so special-cased them
 ; but add indent to the tag to make sure attributes inside them are still indented if written multi-lined
 ((start_tag
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index f16fc485a..945084693 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -1,5 +1,6 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
 ; <style>...</style>
 ; <style blocking> ...</style>
 ; Add "lang" to predicate check so that vue/svelte can inherit this
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index d7c42a96c..d9a9a5f87 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -249,6 +249,7 @@
     "y0"
     "y1"
     "yn"))
+
 ; Keywords
 [
   "def"
diff --git a/queries/jq/injections.scm b/queries/jq/injections.scm
index 740af735e..f8a7a35b0 100644
--- a/queries/jq/injections.scm
+++ b/queries/jq/injections.scm
@@ -1,5 +1,6 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
 ; test(val)
 (query
   ((funcname) @_function
diff --git a/queries/kotlin/injections.scm b/queries/kotlin/injections.scm
index 335938309..b2bc233ff 100644
--- a/queries/kotlin/injections.scm
+++ b/queries/kotlin/injections.scm
@@ -3,6 +3,7 @@
   (multiline_comment)
 ] @injection.content
   (#set! injection.language "comment"))
+
 ; There are 3 ways to define a regex
 ;    - "[abc]?".toRegex()
 (call_expression
diff --git a/queries/leo/indents.scm b/queries/leo/indents.scm
index 0f1a0a500..473091fb1 100644
--- a/queries/leo/indents.scm
+++ b/queries/leo/indents.scm
@@ -16,6 +16,7 @@
   (items_block)
   (block)
 ] @indent.begin
+
 ; if "if" statement and conditional statement are in separate lines
 ; conditional should be indented and when the conditional block
 ; starts dedented
diff --git a/queries/mlir/highlights.scm b/queries/mlir/highlights.scm
index 6c2b8d0d9..97a0b0d0b 100644
--- a/queries/mlir/highlights.scm
+++ b/queries/mlir/highlights.scm
@@ -22,6 +22,7 @@
   "default"
   (arith_cmp_predicate)
 ] @keyword
+
 ; format-ignore
 [
   "module"
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 57f4c11b8..00db10b42 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -119,6 +119,7 @@
     ; primops, `__<tab>` in `nix repl`
    "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort")
   )
+
 ; constants
 (variable_expression
   name: (identifier) @constant.builtin
diff --git a/queries/pascal/injections.scm b/queries/pascal/injections.scm
index 31d9d4cea..f46e4b335 100644
--- a/queries/pascal/injections.scm
+++ b/queries/pascal/injections.scm
@@ -1,5 +1,6 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
 ; There is no parser for assembly language yet. Add an injection here when we
 ; have a parser.
 ; ((asmBody) @injection.content
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 2ab793ce7..921ca37b8 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -32,6 +32,7 @@
 
 (assignment
   alias: (field) @variable.member)
+
 alias: (identifier) @variable.member
 
 (comment) @comment @spell
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index 2de4d2efa..f84af9182 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -77,9 +77,11 @@
   (symbol) @keyword
   (#any-of? @keyword "#%app" "#%datum" "#%declare" "#%expression" "#%module-begin" "#%plain-app" "#%plain-lambda" "#%plain-module-begin" "#%printing-module-begin" "#%provide" "#%require" "#%stratified-body" "#%top" "#%top-interaction" "#%variable-reference" "->" "->*" "->*m" "->d" "->dm" "->i" "->m" "..." ":do-in" "==" "=>" "_" "absent" "abstract" "all-defined-out" "all-from-out" "and" "any" "augment" "augment*" "augment-final" "augment-final*" "augride" "augride*" "begin" "begin-for-syntax" "begin0" "case" "case->" "case->m" "case-lambda" "class" "class*" "class-field-accessor" "class-field-mutator" "class/c" "class/derived" "combine-in" "combine-out" "command-line" "compound-unit" "compound-unit/infer" "cond" "cons/dc" "contract" "contract-out" "contract-pos/neg-doubling" "contract-struct" "contracted" "current-contract-region" "define" "define-compound-unit" "define-compound-unit/infer" "define-contract-struct" "define-custom-hash-types" "define-custom-set-types" "define-for-syntax" "define-local-member-name" "define-logger" "define-match-expander" "define-member-name" "define-module-boundary-contract" "define-namespace-anchor" "define-opt/c" "define-sequence-syntax" "define-serializable-class" "define-serializable-class*" "define-signature" "define-signature-form" "define-splicing-for-clause-syntax" "define-struct" "define-struct/contract" "define-struct/derived" "define-syntax" "define-syntax-rule" "define-syntaxes" "define-unit" "define-unit-binding" "define-unit-from-context" "define-unit/contract" "define-unit/new-import-export" "define-unit/s" "define-values" "define-values-for-export" "define-values-for-syntax" "define-values/invoke-unit" "define-values/invoke-unit/infer" "define/augment" "define/augment-final" "define/augride" "define/contract" "define/final-prop" "define/match" "define/overment" "define/override" "define/override-final" "define/private" "define/public" "define/public-final" "define/pubment" "define/subexpression-pos-prop" "define/subexpression-pos-prop/name" "delay" "delay/idle" "delay/name" "delay/strict" "delay/sync" "delay/thread" "do" "else" "except" "except-in" "except-out" "export" "extends" "failure-cont" "field" "field-bound?" "file" "flat-murec-contract" "flat-rec-contract" "for" "for*" "for*/and" "for*/async" "for*/first" "for*/fold" "for*/fold/derived" "for*/foldr" "for*/foldr/derived" "for*/hash" "for*/hasheq" "for*/hasheqv" "for*/last" "for*/list" "for*/lists" "for*/mutable-set" "for*/mutable-seteq" "for*/mutable-seteqv" "for*/or" "for*/product" "for*/set" "for*/seteq" "for*/seteqv" "for*/stream" "for*/sum" "for*/vector" "for*/weak-set" "for*/weak-seteq" "for*/weak-seteqv" "for-label" "for-meta" "for-space" "for-syntax" "for-template" "for/and" "for/async" "for/first" "for/fold" "for/fold/derived" "for/foldr" "for/foldr/derived" "for/hash" "for/hasheq" "for/hasheqv" "for/last" "for/list" "for/lists" "for/mutable-set" "for/mutable-seteq" "for/mutable-seteqv" "for/or" "for/product" "for/set" "for/seteq" "for/seteqv" "for/stream" "for/sum" "for/vector" "for/weak-set" "for/weak-seteq" "for/weak-seteqv" "gen:custom-write" "gen:dict" "gen:equal+hash" "gen:set" "gen:stream" "generic" "get-field" "hash/dc" "if" "implies" "import" "include" "include-at/relative-to" "include-at/relative-to/reader" "include/reader" "inherit" "inherit-field" "inherit/inner" "inherit/super" "init" "init-depend" "init-field" "init-rest" "inner" "inspect" "instantiate" "interface" "interface*" "invariant-assertion" "invoke-unit" "invoke-unit/infer" "lambda" "lazy" "let" "let*" "let*-values" "let-syntax" "let-syntaxes" "let-values" "let/cc" "let/ec" "letrec" "letrec-syntax" "letrec-syntaxes" "letrec-syntaxes+values" "letrec-values" "lib" "link" "local" "local-require" "log-debug" "log-error" "log-fatal" "log-info" "log-warning" "match" "match*" "match*/derived" "match-define" "match-define-values" "match-lambda" "match-lambda*" "match-lambda**" "match-let" "match-let*" "match-let*-values" "match-let-values" "match-letrec" "match-letrec-values" "match/derived" "match/values" "member-name-key" "mixin" "module" "module*" "module+" "nand" "new" "nor" "object-contract" "object/c" "only" "only-in" "only-meta-in" "only-space-in" "open" "opt/c" "or" "overment" "overment*" "override" "override*" "override-final" "override-final*" "parameterize" "parameterize*" "parameterize-break" "parametric->/c" "place" "place*" "place/context" "planet" "prefix" "prefix-in" "prefix-out" "private" "private*" "prompt-tag/c" "prop:dict/contract" "protect-out" "provide" "provide-signature-elements" "provide/contract" "public" "public*" "public-final" "public-final*" "pubment" "pubment*" "quasiquote" "quasisyntax" "quasisyntax/loc" "quote" "quote-syntax" "quote-syntax/prune" "recontract-out" "recursive-contract" "relative-in" "rename" "rename-in" "rename-inner" "rename-out" "rename-super" "require" "send" "send*" "send+" "send-generic" "send/apply" "send/keyword-apply" "set!" "set!-values" "set-field!" "shared" "stream" "stream*" "stream-cons" "stream-lazy" "struct" "struct*" "struct-copy" "struct-field-index" "struct-guard/c" "struct-out" "struct/c" "struct/contract" "struct/ctc" "struct/dc" "struct/derived" "submod" "super" "super-instantiate" "super-make-object" "super-new" "syntax" "syntax-case" "syntax-case*" "syntax-id-rules" "syntax-rules" "syntax/loc" "tag" "this" "this%" "thunk" "thunk*" "time" "unconstrained-domain->" "unit" "unit-from-context" "unit/c" "unit/new-import-export" "unit/s" "unless" "unquote" "unquote-splicing" "unsyntax" "unsyntax-splicing" "values/drop" "when" "with-continuation-mark" "with-contract" "with-contract-continuation-mark" "with-handlers" "with-handlers*" "with-method" "with-syntax" "~?" "~@" "λ")
   )
+
 ; builtin procedures
 ((symbol) @function.builtin
   (#any-of? @function.builtin "*" "*list/c" "+" "-" "/" "<" "</c" "<=" "<=/c" "=" "=/c" ">" ">/c" ">=" ">=/c" "abort-current-continuation" "abs" "absolute-path?" "acos" "add-between" "add1" "alarm-evt" "and/c" "andmap" "angle" "any/c" "append" "append*" "append-map" "apply" "argmax" "argmin" "arithmetic-shift" "arity-at-least" "arity-at-least-value" "arity-at-least?" "arity-checking-wrapper" "arity-includes?" "arity=?" "arrow-contract-info" "arrow-contract-info-accepts-arglist" "arrow-contract-info-chaperone-procedure" "arrow-contract-info-check-first-order" "arrow-contract-info?" "asin" "assert-unreachable" "assf" "assoc" "assq" "assv" "atan" "bad-number-of-results" "banner" "base->-doms/c" "base->-rngs/c" "base->?" "between/c" "bitwise-and" "bitwise-bit-field" "bitwise-bit-set?" "bitwise-ior" "bitwise-not" "bitwise-xor" "blame-add-car-context" "blame-add-cdr-context" "blame-add-context" "blame-add-missing-party" "blame-add-nth-arg-context" "blame-add-range-context" "blame-add-unknown-context" "blame-context" "blame-contract" "blame-fmt->-string" "blame-missing-party?" "blame-negative" "blame-original?" "blame-positive" "blame-replace-negative" "blame-replaced-negative?" "blame-source" "blame-swap" "blame-swapped?" "blame-update" "blame-value" "blame?" "boolean=?" "boolean?" "bound-identifier=?" "box" "box-cas!" "box-immutable" "box-immutable/c" "box/c" "box?" "break-enabled" "break-parameterization?" "break-thread" "build-chaperone-contract-property" "build-compound-type-name" "build-contract-property" "build-flat-contract-property" "build-list" "build-path" "build-path/convention-type" "build-string" "build-vector" "byte-pregexp" "byte-pregexp?" "byte-ready?" "byte-regexp" "byte-regexp?" "byte?" "bytes" "bytes->immutable-bytes" "bytes->list" "bytes->path" "bytes->path-element" "bytes->string/latin-1" "bytes->string/locale" "bytes->string/utf-8" "bytes-append" "bytes-append*" "bytes-close-converter" "bytes-convert" "bytes-convert-end" "bytes-converter?" "bytes-copy" "bytes-copy!" "bytes-environment-variable-name?" "bytes-fill!" "bytes-join" "bytes-length" "bytes-no-nuls?" "bytes-open-converter" "bytes-ref" "bytes-set!" "bytes-utf-8-index" "bytes-utf-8-length" "bytes-utf-8-ref" "bytes<?" "bytes=?" "bytes>?" "bytes?" "caaaar" "caaadr" "caaar" "caadar" "caaddr" "caadr" "caar" "cadaar" "cadadr" "cadar" "caddar" "cadddr" "caddr" "cadr" "call-in-continuation" "call-in-nested-thread" "call-with-atomic-output-file" "call-with-break-parameterization" "call-with-composable-continuation" "call-with-continuation-barrier" "call-with-continuation-prompt" "call-with-current-continuation" "call-with-default-reading-parameterization" "call-with-escape-continuation" "call-with-exception-handler" "call-with-file-lock/timeout" "call-with-immediate-continuation-mark" "call-with-input-bytes" "call-with-input-file" "call-with-input-file*" "call-with-input-string" "call-with-output-bytes" "call-with-output-file" "call-with-output-file*" "call-with-output-string" "call-with-parameterization" "call-with-semaphore" "call-with-semaphore/enable-break" "call-with-values" "call/cc" "call/ec" "car" "cartesian-product" "cdaaar" "cdaadr" "cdaar" "cdadar" "cdaddr" "cdadr" "cdar" "cddaar" "cddadr" "cddar" "cdddar" "cddddr" "cdddr" "cddr" "cdr" "ceiling" "channel-get" "channel-put" "channel-put-evt" "channel-put-evt?" "channel-try-get" "channel/c" "channel?" "chaperone-box" "chaperone-channel" "chaperone-continuation-mark-key" "chaperone-contract-property?" "chaperone-contract?" "chaperone-evt" "chaperone-hash" "chaperone-hash-set" "chaperone-of?" "chaperone-procedure" "chaperone-procedure*" "chaperone-prompt-tag" "chaperone-struct" "chaperone-struct-type" "chaperone-vector" "chaperone-vector*" "chaperone?" "char->integer" "char-alphabetic?" "char-blank?" "char-ci<=?" "char-ci<?" "char-ci=?" "char-ci>=?" "char-ci>?" "char-downcase" "char-foldcase" "char-general-category" "char-graphic?" "char-in" "char-in/c" "char-iso-control?" "char-lower-case?" "char-numeric?" "char-punctuation?" "char-ready?" "char-symbolic?" "char-title-case?" "char-titlecase" "char-upcase" "char-upper-case?" "char-utf-8-length" "char-whitespace?" "char<=?" "char<?" "char=?" "char>=?" "char>?" "char?" "check-duplicate-identifier" "check-duplicates" "checked-procedure-check-and-extract" "choice-evt" "class->interface" "class-info" "class-seal" "class-unseal" "class?" "cleanse-path" "close-input-port" "close-output-port" "coerce-chaperone-contract" "coerce-chaperone-contracts" "coerce-contract" "coerce-contract/f" "coerce-contracts" "coerce-flat-contract" "coerce-flat-contracts" "collect-garbage" "collection-file-path" "collection-path" "combinations" "combine-output" "compile" "compile-allow-set!-undefined" "compile-context-preservation-enabled" "compile-enforce-module-constants" "compile-syntax" "compile-target-machine?" "compiled-expression-recompile" "compiled-expression?" "compiled-module-expression?" "complete-path?" "complex?" "compose" "compose1" "conjoin" "conjugate" "cons" "cons/c" "cons?" "const" "continuation-mark-key/c" "continuation-mark-key?" "continuation-mark-set->context" "continuation-mark-set->iterator" "continuation-mark-set->list" "continuation-mark-set->list*" "continuation-mark-set-first" "continuation-mark-set?" "continuation-marks" "continuation-prompt-available?" "continuation-prompt-tag?" "continuation?" "contract-custom-write-property-proc" "contract-equivalent?" "contract-exercise" "contract-first-order" "contract-first-order-passes?" "contract-late-neg-projection" "contract-name" "contract-proc" "contract-projection" "contract-property?" "contract-random-generate" "contract-random-generate-env?" "contract-random-generate-fail?" "contract-random-generate-get-current-environment" "contract-random-generate-stash" "contract-random-generate/choose" "contract-stronger?" "contract-struct-exercise" "contract-struct-generate" "contract-struct-late-neg-projection" "contract-struct-list-contract?" "contract-val-first-projection" "contract?" "convert-stream" "copy-directory/files" "copy-file" "copy-port" "cos" "cosh" "count" "current-blame-format" "current-break-parameterization" "current-code-inspector" "current-command-line-arguments" "current-compile" "current-compile-realm" "current-compile-target-machine" "current-compiled-file-roots" "current-continuation-marks" "current-custodian" "current-directory" "current-directory-for-user" "current-drive" "current-environment-variables" "current-error-message-adjuster" "current-error-port" "current-eval" "current-evt-pseudo-random-generator" "current-force-delete-permissions" "current-future" "current-gc-milliseconds" "current-get-interaction-evt" "current-get-interaction-input-port" "current-inexact-milliseconds" "current-inexact-monotonic-milliseconds" "current-input-port" "current-inspector" "current-library-collection-links" "current-library-collection-paths" "current-load" "current-load-extension" "current-load-relative-directory" "current-load/use-compiled" "current-locale" "current-logger" "current-memory-use" "current-milliseconds" "current-module-declare-name" "current-module-declare-source" "current-module-name-resolver" "current-module-path-for-load" "current-namespace" "current-output-port" "current-parameterization" "current-plumber" "current-preserved-thread-cell-values" "current-print" "current-process-milliseconds" "current-prompt-read" "current-pseudo-random-generator" "current-read-interaction" "current-reader-guard" "current-readtable" "current-seconds" "current-security-guard" "current-subprocess-custodian-mode" "current-subprocess-keep-file-descriptors" "current-thread" "current-thread-group" "current-thread-initial-stack-size" "current-write-relative-directory" "curry" "curryr" "custodian-box-value" "custodian-box?" "custodian-limit-memory" "custodian-managed-list" "custodian-memory-accounting-available?" "custodian-require-memory" "custodian-shut-down?" "custodian-shutdown-all" "custodian?" "custom-print-quotable-accessor" "custom-print-quotable?" "custom-write-accessor" "custom-write-property-proc" "custom-write?" "date" "date*" "date*-nanosecond" "date*-time-zone-name" "date*?" "date-day" "date-dst?" "date-hour" "date-minute" "date-month" "date-second" "date-time-zone-offset" "date-week-day" "date-year" "date-year-day" "date?" "datum->syntax" "datum-intern-literal" "default-continuation-prompt-tag" "degrees->radians" "delete-directory" "delete-directory/files" "delete-file" "denominator" "dict->list" "dict-can-functional-set?" "dict-can-remove-keys?" "dict-clear" "dict-clear!" "dict-copy" "dict-count" "dict-empty?" "dict-for-each" "dict-has-key?" "dict-implements/c" "dict-implements?" "dict-iter-contract" "dict-iterate-first" "dict-iterate-key" "dict-iterate-next" "dict-iterate-value" "dict-key-contract" "dict-keys" "dict-map" "dict-mutable?" "dict-ref" "dict-ref!" "dict-remove" "dict-remove!" "dict-set" "dict-set!" "dict-set*" "dict-set*!" "dict-update" "dict-update!" "dict-value-contract" "dict-values" "dict?" "directory-exists?" "directory-list" "disjoin" "display" "display-lines" "display-lines-to-file" "display-to-file" "displayln" "double-flonum?" "drop" "drop-common-prefix" "drop-right" "dropf" "dropf-right" "dump-memory-stats" "dup-input-port" "dup-output-port" "dynamic->*" "dynamic-get-field" "dynamic-object/c" "dynamic-place" "dynamic-place*" "dynamic-require" "dynamic-require-for-syntax" "dynamic-send" "dynamic-set-field!" "dynamic-wind" "eighth" "empty?" "environment-variables-copy" "environment-variables-names" "environment-variables-ref" "environment-variables-set!" "environment-variables?" "eof-evt" "eof-object?" "ephemeron-value" "ephemeron?" "eprintf" "eq-contract-val" "eq-contract?" "eq-hash-code" "eq?" "equal-contract-val" "equal-contract?" "equal-hash-code" "equal-secondary-hash-code" "equal?" "equal?/recur" "eqv-hash-code" "eqv?" "error" "error-contract->adjusted-string" "error-display-handler" "error-escape-handler" "error-message->adjusted-string" "error-print-context-length" "error-print-source-location" "error-print-width" "error-syntax->string-handler" "error-value->string-handler" "eval" "eval-jit-enabled" "eval-syntax" "even?" "evt/c" "evt?" "exact->inexact" "exact-ceiling" "exact-floor" "exact-integer?" "exact-nonnegative-integer?" "exact-positive-integer?" "exact-round" "exact-truncate" "exact?" "executable-yield-handler" "exit" "exit-handler" "exn" "exn-continuation-marks" "exn-message" "exn:break" "exn:break-continuation" "exn:break:hang-up" "exn:break:hang-up?" "exn:break:terminate" "exn:break:terminate?" "exn:break?" "exn:fail" "exn:fail:contract" "exn:fail:contract:arity" "exn:fail:contract:arity?" "exn:fail:contract:blame" "exn:fail:contract:blame-object" "exn:fail:contract:blame?" "exn:fail:contract:continuation" "exn:fail:contract:continuation?" "exn:fail:contract:divide-by-zero" "exn:fail:contract:divide-by-zero?" "exn:fail:contract:non-fixnum-result" "exn:fail:contract:non-fixnum-result?" "exn:fail:contract:variable" "exn:fail:contract:variable-id" "exn:fail:contract:variable?" "exn:fail:contract?" "exn:fail:filesystem" "exn:fail:filesystem:errno" "exn:fail:filesystem:errno-errno" "exn:fail:filesystem:errno?" "exn:fail:filesystem:exists" "exn:fail:filesystem:exists?" "exn:fail:filesystem:missing-module" "exn:fail:filesystem:missing-module-path" "exn:fail:filesystem:missing-module?" "exn:fail:filesystem:version" "exn:fail:filesystem:version?" "exn:fail:filesystem?" "exn:fail:network" "exn:fail:network:errno" "exn:fail:network:errno-errno" "exn:fail:network:errno?" "exn:fail:network?" "exn:fail:object" "exn:fail:object?" "exn:fail:out-of-memory" "exn:fail:out-of-memory?" "exn:fail:read" "exn:fail:read-srclocs" "exn:fail:read:eof" "exn:fail:read:eof?" "exn:fail:read:non-char" "exn:fail:read:non-char?" "exn:fail:read?" "exn:fail:syntax" "exn:fail:syntax-exprs" "exn:fail:syntax:missing-module" "exn:fail:syntax:missing-module-path" "exn:fail:syntax:missing-module?" "exn:fail:syntax:unbound" "exn:fail:syntax:unbound?" "exn:fail:syntax?" "exn:fail:unsupported" "exn:fail:unsupported?" "exn:fail:user" "exn:fail:user?" "exn:fail?" "exn:misc:match?" "exn:missing-module-accessor" "exn:missing-module?" "exn:srclocs-accessor" "exn:srclocs?" "exn?" "exp" "expand" "expand-once" "expand-syntax" "expand-syntax-once" "expand-syntax-to-top-form" "expand-to-top-form" "expand-user-path" "explode-path" "expt" "false?" "field-names" "fifth" "file->bytes" "file->bytes-lines" "file->lines" "file->list" "file->string" "file->value" "file-exists?" "file-name-from-path" "file-or-directory-identity" "file-or-directory-modify-seconds" "file-or-directory-permissions" "file-or-directory-stat" "file-or-directory-type" "file-position" "file-position*" "file-size" "file-stream-buffer-mode" "file-stream-port?" "file-truncate" "filename-extension" "filesystem-change-evt" "filesystem-change-evt-cancel" "filesystem-change-evt?" "filesystem-root-list" "filter" "filter-map" "filter-not" "filter-read-input-port" "find-compiled-file-roots" "find-executable-path" "find-files" "find-library-collection-links" "find-library-collection-paths" "find-relative-path" "find-system-path" "findf" "first" "first-or/c" "fixnum?" "flat-contract" "flat-contract-predicate" "flat-contract-property?" "flat-contract-with-explanation" "flat-contract?" "flat-named-contract" "flatten" "floating-point-bytes->real" "flonum?" "floor" "flush-output" "fold-files" "foldl" "foldr" "for-each" "force" "format" "fourth" "fprintf" "free-identifier=?" "free-label-identifier=?" "free-template-identifier=?" "free-transformer-identifier=?" "fsemaphore-count" "fsemaphore-post" "fsemaphore-try-wait?" "fsemaphore-wait" "fsemaphore?" "future" "future?" "futures-enabled?" "gcd" "generate-member-key" "generate-temporaries" "generic-set?" "generic?" "gensym" "get-output-bytes" "get-output-string" "get-preference" "get/build-late-neg-projection" "get/build-val-first-projection" "getenv" "global-port-print-handler" "group-by" "guard-evt" "handle-evt" "handle-evt?" "has-blame?" "has-contract?" "hash" "hash->list" "hash-clear" "hash-clear!" "hash-copy" "hash-copy-clear" "hash-count" "hash-empty?" "hash-ephemeron?" "hash-eq?" "hash-equal?" "hash-eqv?" "hash-for-each" "hash-has-key?" "hash-iterate-first" "hash-iterate-key" "hash-iterate-key+value" "hash-iterate-next" "hash-iterate-pair" "hash-iterate-value" "hash-keys" "hash-keys-subset?" "hash-map" "hash-placeholder?" "hash-ref" "hash-ref!" "hash-ref-key" "hash-remove" "hash-remove!" "hash-set" "hash-set!" "hash-set*" "hash-set*!" "hash-strong?" "hash-update" "hash-update!" "hash-values" "hash-weak?" "hash/c" "hash?" "hasheq" "hasheqv" "identifier-binding" "identifier-binding-portal-syntax" "identifier-binding-symbol" "identifier-distinct-binding" "identifier-label-binding" "identifier-prune-lexical-context" "identifier-prune-to-source-module" "identifier-remove-from-definition-context" "identifier-template-binding" "identifier-transformer-binding" "identifier?" "identity" "if/c" "imag-part" "immutable?" "impersonate-box" "impersonate-channel" "impersonate-continuation-mark-key" "impersonate-hash" "impersonate-hash-set" "impersonate-procedure" "impersonate-procedure*" "impersonate-prompt-tag" "impersonate-struct" "impersonate-vector" "impersonate-vector*" "impersonator-contract?" "impersonator-ephemeron" "impersonator-of?" "impersonator-property-accessor-procedure?" "impersonator-property?" "impersonator?" "implementation?" "implementation?/c" "in-bytes" "in-bytes-lines" "in-combinations" "in-cycle" "in-dict" "in-dict-keys" "in-dict-pairs" "in-dict-values" "in-directory" "in-ephemeron-hash" "in-ephemeron-hash-keys" "in-ephemeron-hash-pairs" "in-ephemeron-hash-values" "in-hash" "in-hash-keys" "in-hash-pairs" "in-hash-values" "in-immutable-hash" "in-immutable-hash-keys" "in-immutable-hash-pairs" "in-immutable-hash-values" "in-immutable-set" "in-inclusive-range" "in-indexed" "in-input-port-bytes" "in-input-port-chars" "in-lines" "in-list" "in-mlist" "in-mutable-hash" "in-mutable-hash-keys" "in-mutable-hash-pairs" "in-mutable-hash-values" "in-mutable-set" "in-naturals" "in-parallel" "in-permutations" "in-port" "in-producer" "in-range" "in-sequences" "in-set" "in-slice" "in-stream" "in-string" "in-syntax" "in-value" "in-values*-sequence" "in-values-sequence" "in-vector" "in-weak-hash" "in-weak-hash-keys" "in-weak-hash-pairs" "in-weak-hash-values" "in-weak-set" "inclusive-range" "index-of" "index-where" "indexes-of" "indexes-where" "inexact->exact" "inexact-real?" "inexact?" "infinite?" "input-port-append" "input-port?" "inspector-superior?" "inspector?" "instanceof/c" "integer->char" "integer->integer-bytes" "integer-bytes->integer" "integer-in" "integer-length" "integer-sqrt" "integer-sqrt/remainder" "integer?" "interface->method-names" "interface-extension?" "interface?" "internal-definition-context-add-scopes" "internal-definition-context-binding-identifiers" "internal-definition-context-introduce" "internal-definition-context-seal" "internal-definition-context-splice-binding-identifier" "internal-definition-context?" "is-a?" "is-a?/c" "keyword->string" "keyword-apply" "keyword-apply/dict" "keyword<?" "keyword?" "keywords-match" "kill-thread" "last" "last-pair" "lcm" "length" "liberal-define-context?" "link-exists?" "list" "list*" "list*of" "list->bytes" "list->mutable-set" "list->mutable-seteq" "list->mutable-seteqv" "list->set" "list->seteq" "list->seteqv" "list->string" "list->vector" "list->weak-set" "list->weak-seteq" "list->weak-seteqv" "list-contract?" "list-prefix?" "list-ref" "list-set" "list-tail" "list-update" "list/c" "list?" "listen-port-number?" "listof" "load" "load-extension" "load-on-demand-enabled" "load-relative" "load-relative-extension" "load/cd" "load/use-compiled" "local-expand" "local-expand/capture-lifts" "local-transformer-expand" "local-transformer-expand/capture-lifts" "locale-string-encoding" "log" "log-all-levels" "log-level-evt" "log-level?" "log-max-level" "log-message" "log-receiver?" "logger-name" "logger?" "magnitude" "make-arity-at-least" "make-base-empty-namespace" "make-base-namespace" "make-bytes" "make-channel" "make-chaperone-contract" "make-continuation-mark-key" "make-continuation-prompt-tag" "make-contract" "make-custodian" "make-custodian-box" "make-custom-hash" "make-custom-hash-types" "make-custom-set" "make-custom-set-types" "make-date" "make-date*" "make-derived-parameter" "make-directory" "make-directory*" "make-do-sequence" "make-empty-namespace" "make-environment-variables" "make-ephemeron" "make-ephemeron-hash" "make-ephemeron-hasheq" "make-ephemeron-hasheqv" "make-exn" "make-exn:break" "make-exn:break:hang-up" "make-exn:break:terminate" "make-exn:fail" "make-exn:fail:contract" "make-exn:fail:contract:arity" "make-exn:fail:contract:blame" "make-exn:fail:contract:continuation" "make-exn:fail:contract:divide-by-zero" "make-exn:fail:contract:non-fixnum-result" "make-exn:fail:contract:variable" "make-exn:fail:filesystem" "make-exn:fail:filesystem:errno" "make-exn:fail:filesystem:exists" "make-exn:fail:filesystem:missing-module" "make-exn:fail:filesystem:version" "make-exn:fail:network" "make-exn:fail:network:errno" "make-exn:fail:object" "make-exn:fail:out-of-memory" "make-exn:fail:read" "make-exn:fail:read:eof" "make-exn:fail:read:non-char" "make-exn:fail:syntax" "make-exn:fail:syntax:missing-module" "make-exn:fail:syntax:unbound" "make-exn:fail:unsupported" "make-exn:fail:user" "make-file-or-directory-link" "make-flat-contract" "make-fsemaphore" "make-generic" "make-handle-get-preference-locked" "make-hash" "make-hash-placeholder" "make-hasheq" "make-hasheq-placeholder" "make-hasheqv" "make-hasheqv-placeholder" "make-immutable-custom-hash" "make-immutable-hash" "make-immutable-hasheq" "make-immutable-hasheqv" "make-impersonator-property" "make-input-port" "make-input-port/read-to-peek" "make-inspector" "make-interned-syntax-introducer" "make-keyword-procedure" "make-known-char-range-list" "make-limited-input-port" "make-list" "make-lock-file-name" "make-log-receiver" "make-logger" "make-mixin-contract" "make-mutable-custom-set" "make-none/c" "make-object" "make-output-port" "make-parameter" "make-parent-directory*" "make-phantom-bytes" "make-pipe" "make-pipe-with-specials" "make-placeholder" "make-plumber" "make-polar" "make-portal-syntax" "make-prefab-struct" "make-primitive-class" "make-proj-contract" "make-pseudo-random-generator" "make-reader-graph" "make-readtable" "make-rectangular" "make-rename-transformer" "make-resolved-module-path" "make-security-guard" "make-semaphore" "make-set!-transformer" "make-shared-bytes" "make-sibling-inspector" "make-special-comment" "make-srcloc" "make-string" "make-struct-field-accessor" "make-struct-field-mutator" "make-struct-type" "make-struct-type-property" "make-syntax-delta-introducer" "make-syntax-introducer" "make-temporary-directory" "make-temporary-directory*" "make-temporary-file" "make-temporary-file*" "make-tentative-pretty-print-output-port" "make-thread-cell" "make-thread-group" "make-vector" "make-weak-box" "make-weak-custom-hash" "make-weak-custom-set" "make-weak-hash" "make-weak-hasheq" "make-weak-hasheqv" "make-will-executor" "map" "match-equality-test" "matches-arity-exactly?" "max" "mcar" "mcdr" "mcons" "member" "member-name-key-hash-code" "member-name-key=?" "member-name-key?" "memf" "memory-order-acquire" "memory-order-release" "memq" "memv" "merge-input" "method-in-interface?" "min" "module->exports" "module->imports" "module->indirect-exports" "module->language-info" "module->namespace" "module->realm" "module-compiled-cross-phase-persistent?" "module-compiled-exports" "module-compiled-imports" "module-compiled-indirect-exports" "module-compiled-language-info" "module-compiled-name" "module-compiled-realm" "module-compiled-submodules" "module-declared?" "module-path-index-join" "module-path-index-resolve" "module-path-index-split" "module-path-index-submodule" "module-path-index?" "module-path?" "module-predefined?" "module-provide-protected?" "modulo" "mpair?" "mutable-set" "mutable-seteq" "mutable-seteqv" "n->th" "nack-guard-evt" "namespace-anchor->empty-namespace" "namespace-anchor->namespace" "namespace-anchor?" "namespace-attach-module" "namespace-attach-module-declaration" "namespace-base-phase" "namespace-call-with-registry-lock" "namespace-mapped-symbols" "namespace-module-identifier" "namespace-module-registry" "namespace-require" "namespace-require/constant" "namespace-require/copy" "namespace-require/expansion-time" "namespace-set-variable-value!" "namespace-symbol->identifier" "namespace-syntax-introduce" "namespace-undefine-variable!" "namespace-unprotect-module" "namespace-variable-value" "namespace?" "nan?" "natural-number/c" "natural?" "negate" "negative-integer?" "negative?" "new-∀/c" "new-∃/c" "newline" "ninth" "non-empty-listof" "non-empty-string?" "none/c" "nonnegative-integer?" "nonpositive-integer?" "normal-case-path" "normalize-arity" "normalize-path" "normalized-arity?" "not" "not/c" "null?" "number->string" "number?" "numerator" "object->vector" "object-info" "object-interface" "object-method-arity-includes?" "object-name" "object-or-false=?" "object=-hash-code" "object=?" "object?" "odd?" "one-of/c" "open-input-bytes" "open-input-file" "open-input-output-file" "open-input-string" "open-output-bytes" "open-output-file" "open-output-nowhere" "open-output-string" "or/c" "order-of-magnitude" "ormap" "output-port?" "pair?" "parameter-procedure=?" "parameter/c" "parameter?" "parameterization?" "parse-command-line" "partition" "path->bytes" "path->complete-path" "path->directory-path" "path->string" "path-add-extension" "path-add-suffix" "path-convention-type" "path-element->bytes" "path-element->string" "path-element?" "path-for-some-system?" "path-get-extension" "path-has-extension?" "path-list-string->path-list" "path-only" "path-replace-extension" "path-replace-suffix" "path-string?" "path<?" "path?" "pathlist-closure" "peek-byte" "peek-byte-or-special" "peek-bytes" "peek-bytes!" "peek-bytes!-evt" "peek-bytes-avail!" "peek-bytes-avail!*" "peek-bytes-avail!-evt" "peek-bytes-avail!/enable-break" "peek-bytes-evt" "peek-char" "peek-char-or-special" "peek-string" "peek-string!" "peek-string!-evt" "peek-string-evt" "peeking-input-port" "permutations" "phantom-bytes?" "pipe-content-length" "place-break" "place-channel" "place-channel-get" "place-channel-put" "place-channel-put/get" "place-channel?" "place-dead-evt" "place-enabled?" "place-kill" "place-location?" "place-message-allowed?" "place-wait" "place?" "placeholder-get" "placeholder-set!" "placeholder?" "plumber-add-flush!" "plumber-flush-all" "plumber-flush-handle-remove!" "plumber-flush-handle?" "plumber?" "poll-guard-evt" "port->bytes" "port->bytes-lines" "port->lines" "port->list" "port->string" "port-closed-evt" "port-closed?" "port-commit-peeked" "port-count-lines!" "port-count-lines-enabled" "port-counts-lines?" "port-display-handler" "port-file-identity" "port-file-unlock" "port-next-location" "port-number?" "port-print-handler" "port-progress-evt" "port-provides-progress-evts?" "port-read-handler" "port-try-file-lock?" "port-waiting-peer?" "port-write-handler" "port-writes-atomic?" "port-writes-special?" "port?" "portal-syntax-content" "portal-syntax?" "positive-integer?" "positive?" "prefab-key->struct-type" "prefab-key?" "prefab-struct-key" "preferences-lock-file-mode" "pregexp" "pregexp?" "pretty-display" "pretty-format" "pretty-print" "pretty-print-.-symbol-without-bars" "pretty-print-abbreviate-read-macros" "pretty-print-columns" "pretty-print-current-style-table" "pretty-print-depth" "pretty-print-exact-as-decimal" "pretty-print-extend-style-table" "pretty-print-handler" "pretty-print-newline" "pretty-print-post-print-hook" "pretty-print-pre-print-hook" "pretty-print-print-hook" "pretty-print-print-line" "pretty-print-remap-stylable" "pretty-print-show-inexactness" "pretty-print-size-hook" "pretty-print-style-table?" "pretty-printing" "pretty-write" "primitive-closure?" "primitive-result-arity" "primitive?" "print" "print-as-expression" "print-boolean-long-form" "print-box" "print-graph" "print-hash-table" "print-mpair-curly-braces" "print-pair-curly-braces" "print-reader-abbreviations" "print-struct" "print-syntax-width" "print-unreadable" "print-value-columns" "print-vector-length" "printable/c" "printf" "println" "procedure->method" "procedure-arity" "procedure-arity-includes/c" "procedure-arity-includes?" "procedure-arity-mask" "procedure-arity?" "procedure-closure-contents-eq?" "procedure-extract-target" "procedure-impersonator*?" "procedure-keywords" "procedure-realm" "procedure-reduce-arity" "procedure-reduce-arity-mask" "procedure-reduce-keyword-arity" "procedure-reduce-keyword-arity-mask" "procedure-rename" "procedure-result-arity" "procedure-specialize" "procedure-struct-type?" "procedure?" "process" "process*" "process*/ports" "process/ports" "processor-count" "progress-evt?" "promise-forced?" "promise-running?" "promise/c" "promise/name?" "promise?" "prop:arrow-contract-get-info" "prop:arrow-contract?" "prop:orc-contract-get-subcontracts" "prop:orc-contract?" "prop:recursive-contract-unroll" "prop:recursive-contract?" "proper-subset?" "property/c" "pseudo-random-generator->vector" "pseudo-random-generator-vector?" "pseudo-random-generator?" "put-preferences" "putenv" "quotient" "quotient/remainder" "radians->degrees" "raise" "raise-argument-error" "raise-argument-error*" "raise-arguments-error" "raise-arguments-error*" "raise-arity-error" "raise-arity-error*" "raise-arity-mask-error" "raise-arity-mask-error*" "raise-blame-error" "raise-contract-error" "raise-mismatch-error" "raise-not-cons-blame-error" "raise-range-error" "raise-range-error*" "raise-result-arity-error" "raise-result-arity-error*" "raise-result-error" "raise-result-error*" "raise-syntax-error" "raise-type-error" "raise-user-error" "random" "random-seed" "range" "rational?" "rationalize" "read" "read-accept-bar-quote" "read-accept-box" "read-accept-compiled" "read-accept-dot" "read-accept-graph" "read-accept-infix-dot" "read-accept-lang" "read-accept-quasiquote" "read-accept-reader" "read-byte" "read-byte-or-special" "read-bytes" "read-bytes!" "read-bytes!-evt" "read-bytes-avail!" "read-bytes-avail!*" "read-bytes-avail!-evt" "read-bytes-avail!/enable-break" "read-bytes-evt" "read-bytes-line" "read-bytes-line-evt" "read-case-sensitive" "read-cdot" "read-char" "read-char-or-special" "read-curly-brace-as-paren" "read-curly-brace-with-tag" "read-decimal-as-inexact" "read-eval-print-loop" "read-installation-configuration-table" "read-language" "read-line" "read-line-evt" "read-on-demand-source" "read-single-flonum" "read-square-bracket-as-paren" "read-square-bracket-with-tag" "read-string" "read-string!" "read-string!-evt" "read-string-evt" "read-syntax" "read-syntax-accept-graph" "read-syntax/recursive" "read/recursive" "readtable-mapping" "readtable?" "real->decimal-string" "real->double-flonum" "real->floating-point-bytes" "real->single-flonum" "real-in" "real-part" "real?" "reencode-input-port" "reencode-output-port" "regexp" "regexp-match" "regexp-match*" "regexp-match-evt" "regexp-match-exact?" "regexp-match-peek" "regexp-match-peek-immediate" "regexp-match-peek-positions" "regexp-match-peek-positions*" "regexp-match-peek-positions-immediate" "regexp-match-peek-positions-immediate/end" "regexp-match-peek-positions/end" "regexp-match-positions" "regexp-match-positions*" "regexp-match-positions/end" "regexp-match/end" "regexp-match?" "regexp-max-lookbehind" "regexp-quote" "regexp-replace" "regexp-replace*" "regexp-replace-quote" "regexp-replaces" "regexp-split" "regexp-try-match" "regexp?" "relative-path?" "relocate-input-port" "relocate-output-port" "remainder" "remf" "remf*" "remove" "remove*" "remove-duplicates" "remq" "remq*" "remv" "remv*" "rename-contract" "rename-file-or-directory" "rename-transformer-target" "rename-transformer?" "replace-evt" "reroot-path" "resolve-path" "resolved-module-path-name" "resolved-module-path?" "rest" "reverse" "round" "second" "seconds->date" "security-guard?" "semaphore-peek-evt" "semaphore-peek-evt?" "semaphore-post" "semaphore-try-wait?" "semaphore-wait" "semaphore-wait/enable-break" "semaphore?" "sequence->list" "sequence->stream" "sequence-add-between" "sequence-andmap" "sequence-append" "sequence-count" "sequence-filter" "sequence-fold" "sequence-for-each" "sequence-generate" "sequence-generate*" "sequence-length" "sequence-map" "sequence-ormap" "sequence-ref" "sequence-tail" "sequence/c" "sequence?" "set" "set!-transformer-procedure" "set!-transformer?" "set->list" "set->stream" "set-add" "set-add!" "set-box!" "set-box*!" "set-clear" "set-clear!" "set-copy" "set-copy-clear" "set-count" "set-empty?" "set-eq?" "set-equal?" "set-eqv?" "set-first" "set-for-each" "set-implements/c" "set-implements?" "set-intersect" "set-intersect!" "set-map" "set-mcar!" "set-mcdr!" "set-member?" "set-mutable?" "set-phantom-bytes!" "set-port-next-location!" "set-remove" "set-remove!" "set-rest" "set-subtract" "set-subtract!" "set-symmetric-difference" "set-symmetric-difference!" "set-union" "set-union!" "set-weak?" "set/c" "set=?" "set?" "seteq" "seteqv" "seventh" "sgn" "sha1-bytes" "sha224-bytes" "sha256-bytes" "shared-bytes" "shell-execute" "shrink-path-wrt" "shuffle" "simple-form-path" "simplify-path" "sin" "single-flonum-available?" "single-flonum?" "sinh" "sixth" "skip-projection-wrapper?" "sleep" "some-system-path->string" "sort" "special-comment-value" "special-comment?" "special-filter-input-port" "split-at" "split-at-right" "split-common-prefix" "split-path" "splitf-at" "splitf-at-right" "sqr" "sqrt" "srcloc" "srcloc->string" "srcloc-column" "srcloc-line" "srcloc-position" "srcloc-source" "srcloc-span" "srcloc?" "stop-after" "stop-before" "stream->list" "stream-add-between" "stream-andmap" "stream-append" "stream-count" "stream-empty?" "stream-filter" "stream-first" "stream-fold" "stream-for-each" "stream-force" "stream-length" "stream-map" "stream-ormap" "stream-ref" "stream-rest" "stream-tail" "stream-take" "stream/c" "stream?" "string" "string->bytes/latin-1" "string->bytes/locale" "string->bytes/utf-8" "string->immutable-string" "string->keyword" "string->list" "string->number" "string->path" "string->path-element" "string->some-system-path" "string->symbol" "string->uninterned-symbol" "string->unreadable-symbol" "string-append" "string-append*" "string-append-immutable" "string-ci<=?" "string-ci<?" "string-ci=?" "string-ci>=?" "string-ci>?" "string-contains?" "string-copy" "string-copy!" "string-downcase" "string-environment-variable-name?" "string-fill!" "string-foldcase" "string-join" "string-len/c" "string-length" "string-locale-ci<?" "string-locale-ci=?" "string-locale-ci>?" "string-locale-downcase" "string-locale-upcase" "string-locale<?" "string-locale=?" "string-locale>?" "string-no-nuls?" "string-normalize-nfc" "string-normalize-nfd" "string-normalize-nfkc" "string-normalize-nfkd" "string-normalize-spaces" "string-port?" "string-prefix?" "string-ref" "string-replace" "string-set!" "string-split" "string-suffix?" "string-titlecase" "string-trim" "string-upcase" "string-utf-8-length" "string<=?" "string<?" "string=?" "string>=?" "string>?" "string?" "struct->vector" "struct-accessor-procedure?" "struct-constructor-procedure?" "struct-info" "struct-mutator-procedure?" "struct-predicate-procedure?" "struct-type-authentic?" "struct-type-info" "struct-type-make-constructor" "struct-type-make-predicate" "struct-type-property-accessor-procedure?" "struct-type-property-predicate-procedure?" "struct-type-property/c" "struct-type-property?" "struct-type-sealed?" "struct-type?" "struct?" "sub1" "subbytes" "subclass?" "subclass?/c" "subprocess" "subprocess-group-enabled" "subprocess-kill" "subprocess-pid" "subprocess-status" "subprocess-wait" "subprocess?" "subset?" "substring" "suggest/c" "symbol->string" "symbol-interned?" "symbol-unreadable?" "symbol<?" "symbol=?" "symbol?" "symbols" "sync" "sync/enable-break" "sync/timeout" "sync/timeout/enable-break" "syntax->datum" "syntax->list" "syntax-arm" "syntax-binding-set" "syntax-binding-set->syntax" "syntax-binding-set-extend" "syntax-binding-set?" "syntax-column" "syntax-debug-info" "syntax-deserialize" "syntax-disarm" "syntax-e" "syntax-line" "syntax-local-apply-transformer" "syntax-local-bind-syntaxes" "syntax-local-certifier" "syntax-local-context" "syntax-local-expand-expression" "syntax-local-get-shadower" "syntax-local-identifier-as-binding" "syntax-local-introduce" "syntax-local-lift-context" "syntax-local-lift-expression" "syntax-local-lift-module" "syntax-local-lift-module-end-declaration" "syntax-local-lift-provide" "syntax-local-lift-require" "syntax-local-lift-values-expression" "syntax-local-make-definition-context" "syntax-local-make-delta-introducer" "syntax-local-module-defined-identifiers" "syntax-local-module-exports" "syntax-local-module-interned-scope-symbols" "syntax-local-module-required-identifiers" "syntax-local-name" "syntax-local-phase-level" "syntax-local-submodules" "syntax-local-transforming-module-provides?" "syntax-local-value" "syntax-local-value/immediate" "syntax-original?" "syntax-position" "syntax-property" "syntax-property-preserved?" "syntax-property-remove" "syntax-property-symbol-keys" "syntax-protect" "syntax-rearm" "syntax-recertify" "syntax-serialize" "syntax-shift-phase-level" "syntax-source" "syntax-source-module" "syntax-span" "syntax-taint" "syntax-tainted?" "syntax-track-origin" "syntax-transforming-module-expression?" "syntax-transforming-with-lifts?" "syntax-transforming?" "syntax/c" "syntax?" "system" "system*" "system*/exit-code" "system-big-endian?" "system-idle-evt" "system-language+country" "system-library-subpath" "system-path-convention-type" "system-type" "system/exit-code" "tail-marks-match?" "take" "take-common-prefix" "take-right" "takef" "takef-right" "tan" "tanh" "tcp-abandon-port" "tcp-accept" "tcp-accept-evt" "tcp-accept-ready?" "tcp-accept/enable-break" "tcp-addresses" "tcp-close" "tcp-connect" "tcp-connect/enable-break" "tcp-listen" "tcp-listener?" "tcp-port?" "tentative-pretty-print-port-cancel" "tentative-pretty-print-port-transfer" "tenth" "terminal-port?" "third" "thread" "thread-cell-ref" "thread-cell-set!" "thread-cell-values?" "thread-cell?" "thread-dead-evt" "thread-dead?" "thread-group?" "thread-receive" "thread-receive-evt" "thread-resume" "thread-resume-evt" "thread-rewind-receive" "thread-running?" "thread-send" "thread-suspend" "thread-suspend-evt" "thread-try-receive" "thread-wait" "thread/suspend-to-kill" "thread?" "time-apply" "touch" "transplant-input-port" "transplant-output-port" "truncate" "udp-addresses" "udp-bind!" "udp-bound?" "udp-close" "udp-connect!" "udp-connected?" "udp-multicast-interface" "udp-multicast-join-group!" "udp-multicast-leave-group!" "udp-multicast-loopback?" "udp-multicast-set-interface!" "udp-multicast-set-loopback!" "udp-multicast-set-ttl!" "udp-multicast-ttl" "udp-open-socket" "udp-receive!" "udp-receive!*" "udp-receive!-evt" "udp-receive!/enable-break" "udp-receive-ready-evt" "udp-send" "udp-send*" "udp-send-evt" "udp-send-ready-evt" "udp-send-to" "udp-send-to*" "udp-send-to-evt" "udp-send-to/enable-break" "udp-send/enable-break" "udp-set-receive-buffer-size!" "udp-set-ttl!" "udp-ttl" "udp?" "unbox" "unbox*" "uncaught-exception-handler" "unit?" "unquoted-printing-string" "unquoted-printing-string-value" "unquoted-printing-string?" "unsupplied-arg?" "use-collection-link-paths" "use-compiled-file-check" "use-compiled-file-paths" "use-user-specific-search-paths" "value-blame" "value-contract" "values" "variable-reference->empty-namespace" "variable-reference->module-base-phase" "variable-reference->module-declaration-inspector" "variable-reference->module-path-index" "variable-reference->module-source" "variable-reference->namespace" "variable-reference->phase" "variable-reference->resolved-module-path" "variable-reference-constant?" "variable-reference-from-unsafe?" "variable-reference?" "vector" "vector*-length" "vector*-ref" "vector*-set!" "vector->immutable-vector" "vector->list" "vector->pseudo-random-generator" "vector->pseudo-random-generator!" "vector->values" "vector-append" "vector-argmax" "vector-argmin" "vector-cas!" "vector-copy" "vector-copy!" "vector-count" "vector-drop" "vector-drop-right" "vector-empty?" "vector-fill!" "vector-filter" "vector-filter-not" "vector-immutable" "vector-immutable/c" "vector-immutableof" "vector-length" "vector-map" "vector-map!" "vector-member" "vector-memq" "vector-memv" "vector-ref" "vector-set!" "vector-set*!" "vector-set-performance-stats!" "vector-sort" "vector-sort!" "vector-split-at" "vector-split-at-right" "vector-take" "vector-take-right" "vector/c" "vector?" "vectorof" "version" "void" "void?" "weak-box-value" "weak-box?" "weak-set" "weak-seteq" "weak-seteqv" "will-execute" "will-executor?" "will-register" "will-try-execute" "with-input-from-bytes" "with-input-from-file" "with-input-from-string" "with-output-to-bytes" "with-output-to-file" "with-output-to-string" "would-be-future" "wrap-evt" "write" "write-byte" "write-bytes" "write-bytes-avail" "write-bytes-avail*" "write-bytes-avail-evt" "write-bytes-avail/enable-break" "write-char" "write-special" "write-special-avail*" "write-special-evt" "write-string" "write-to-file" "writeln" "xor" "zero?" "~.a" "~.s" "~.v" "~a" "~e" "~r" "~s" "~v"))
+
 ; operators ;;
 ((symbol) @operator
   (#any-of? @operator "+" "-" "*" "/" "=" "<=" ">=" "<" ">"))
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index e0bb380d2..ea8df0586 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -1,5 +1,6 @@
 ((doctest_block) @injection.content
   (#set! injection.language "python"))
+
 ; Directives with nested content without arguments nor options
 ((directive
   name: (type) @_type
diff --git a/queries/ssh_config/indents.scm b/queries/ssh_config/indents.scm
index df92f873a..760707f17 100644
--- a/queries/ssh_config/indents.scm
+++ b/queries/ssh_config/indents.scm
@@ -2,6 +2,7 @@
   (host_declaration)
   (match_declaration)
 ] @indent.begin
+
 ; incomplete declarations
 (ERROR
   .
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 9b8c25073..7ed570ba1 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -4,6 +4,7 @@
   ":"
   ","
 ] @punctuation.delimiter
+
 ; TODO: "\\(" ")" in interpolations should be @punctuation.special
 [
   "\\("
diff --git a/queries/t32/locals.scm b/queries/t32/locals.scm
index 3c10c58ab..f1c022f6e 100644
--- a/queries/t32/locals.scm
+++ b/queries/t32/locals.scm
@@ -1,4 +1,5 @@
 (block) @local.scope
+
 ; Parameter definitions
 (parameter_declaration
   command: (identifier)
diff --git a/queries/tiger/folds.scm b/queries/tiger/folds.scm
index c74871bde..3b076bc18 100644
--- a/queries/tiger/folds.scm
+++ b/queries/tiger/folds.scm
@@ -13,4 +13,5 @@
   (class_type)
   (method_declaration)
 ] @fold
+
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/tiger/injections.scm b/queries/tiger/injections.scm
index 5dfaa7aeb..9735c5935 100644
--- a/queries/tiger/injections.scm
+++ b/queries/tiger/injections.scm
@@ -1,3 +1,4 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
 ; vim: sw=2 foldmethod=marker
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 821aef6be..9c57a19aa 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -165,6 +165,7 @@
 
 ((identifier) @function.builtin
   (#any-of? @function.builtin "eprint" "eprintln" "error" "exit" "panic" "print" "println" "after" "after_char" "all" "all_after" "all_after_last" "all_before" "all_before_last" "any" "ascii_str" "before" "bool" "byte" "byterune" "bytes" "bytestr" "c_error_number_str" "capitalize" "clear" "clone" "clone_to_depth" "close" "code" "compare" "compare_strings" "contains" "contains_any" "contains_any_substr" "copy" "count" "cstring_to_vstring" "delete" "delete_last" "delete_many" "ends_with" "eprint" "eprintln" "eq_epsilon" "error" "error_with_code" "exit" "f32" "f32_abs" "f32_max" "f32_min" "f64" "f64_max" "fields" "filter" "find_between" "first" "flush_stderr" "flush_stdout" "free" "gc_check_leaks" "get_str_intp_u32_format" "get_str_intp_u64_format" "grow_cap" "grow_len" "hash" "hex" "hex2" "hex_full" "i16" "i64" "i8" "index" "index_after" "index_any" "index_byte" "insert" "int" "is_alnum" "is_bin_digit" "is_capital" "is_digit" "is_hex_digit" "is_letter" "is_lower" "is_oct_digit" "is_space" "is_title" "is_upper" "isnil" "join" "join_lines" "keys" "last" "last_index" "last_index_byte" "length_in_bytes" "limit" "malloc" "malloc_noscan" "map" "match_glob" "memdup" "memdup_noscan" "move" "msg" "panic" "panic_error_number" "panic_lasterr" "panic_optional_not_set" "parse_int" "parse_uint" "pointers" "pop" "prepend" "print" "print_backtrace" "println" "proc_pidpath" "ptr_str" "push_many" "realloc_data" "reduce" "repeat" "repeat_to_depth" "replace" "replace_each" "replace_once" "reverse" "reverse_in_place" "runes" "sort" "sort_by_len" "sort_ignore_case" "sort_with_compare" "split" "split_any" "split_into_lines" "split_nth" "starts_with" "starts_with_capital" "str" "str_escaped" "str_intp" "str_intp_g32" "str_intp_g64" "str_intp_rune" "str_intp_sq" "str_intp_sub" "strg" "string_from_wide" "string_from_wide2" "strip_margin" "strip_margin_custom" "strlong" "strsci" "substr" "substr_ni" "substr_with_check" "title" "to_lower" "to_upper" "to_wide" "tos" "tos2" "tos3" "tos4" "tos5" "tos_clone" "trim" "trim_left" "trim_pr" "try_pop" "try_push" "utf32_decode_to_buffer" "utf32_to_str" "utf32_to_str_no_malloc" "utf8_char_len" "utf8_getchar" "utf8_str_len" "utf8_str_visible_length" "utf8_to_utf32" "v_realloc" "vbytes" "vcalloc" "vcalloc_noscan" "vmemcmp" "vmemcpy" "vmemmove" "vmemset" "vstring" "vstring_literal" "vstring_literal_with_len" "vstring_with_len" "vstrlen" "vstrlen_char" "winapi_lasterr_str"))
+
 ; Operators
 [
   "++"
diff --git a/queries/v/injections.scm b/queries/v/injections.scm
index f7c0f6608..ceb93cd3d 100644
--- a/queries/v/injections.scm
+++ b/queries/v/injections.scm
@@ -1,5 +1,6 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
 ; asm_statement if asm ever highlighted :)
 ; #include <...>
 ((hash_statement) @injection.content
diff --git a/queries/xml/injections.scm b/queries/xml/injections.scm
index 942e54575..02e99f02d 100644
--- a/queries/xml/injections.scm
+++ b/queries/xml/injections.scm
@@ -1,5 +1,6 @@
 ((Comment) @injection.content
   (#set! injection.language "comment"))
+
 ; SVG style
 ((element
   (STag
diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index 4661276e3..f7bff7360 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -1,5 +1,6 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
 ; Github actions ("run") / Gitlab CI ("scripts")
 (block_mapping_pair
   key: (flow_node) @_run
diff --git a/queries/yang/highlights.scm b/queries/yang/highlights.scm
index 40891fbea..1fb588af1 100644
--- a/queries/yang/highlights.scm
+++ b/queries/yang/highlights.scm
@@ -1,4 +1,5 @@
 (comment) @comment @spell
+
 ; Module / submodule
 [
   "module"
diff --git a/queries/yuck/indents.scm b/queries/yuck/indents.scm
index cd326b923..0f1305e25 100644
--- a/queries/yuck/indents.scm
+++ b/queries/yuck/indents.scm
@@ -6,6 +6,7 @@
   (json_object)
   (parenthesized_expression)
 ] @indent.begin
+
 ; TODO: can't get this to work, goal is to indent at the property ":" prefix
 ; ((list (identifier) (property)) @indent.align
 ;   (#set! indent.open_delimiter "(")
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index c0477986d..61ff5589c 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -9,6 +9,7 @@
   variable: (IDENTIFIER)
   variable_type_function: (IDENTIFIER)
 ] @variable
+
 parameter: (IDENTIFIER) @variable.parameter
 
 [
@@ -38,8 +39,11 @@ parameter: (IDENTIFIER) @variable.parameter
   field_access: (IDENTIFIER)
 ] @constant
   (#lua-match? @constant "^%u[%u%d_]+$"))
+
 function: (IDENTIFIER) @function
+
 function_call: (IDENTIFIER) @function.call
+
 exception: "!" @keyword.exception
 
 ((IDENTIFIER) @variable.builtin
@@ -55,6 +59,7 @@ exception: "!" @keyword.exception
   ])
   (ContainerField
     (IDENTIFIER) @constant))
+
 field_constant: (IDENTIFIER) @constant
 
 (BUILTINIDENTIFIER) @function.builtin
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 88933c630..d42d5b255 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -52,10 +52,7 @@ local format_queries = [[
 ;; Preserve inline comments
 (program
   . (_)
-  (_) @_comment
-  .
   (comment) @format.prepend-newline
-  (#not-has-type? @_comment comment)
   (#is-start-of-line? @format.prepend-newline))
 (program
   . (_)
@@ -77,7 +74,9 @@ local format_queries = [[
     (grouping)
     (named_node)
     (anonymous_node)
+    (field_definition)
   ] @format.prepend-newline)
+
 (program
   (comment) @_comment
   .
@@ -86,6 +85,8 @@ local format_queries = [[
     (grouping)
     (named_node)
     (anonymous_node)
+    (field_definition)
+    (comment)
   ] @format.cancel-prepend
   (#is-start-of-line? @_comment))
 ;; }}}

From 6548bb64c11e0860a504de3012e8aa14e1d51d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Boczar?= <yendreij@gmail.com>
Date: Fri, 19 Jan 2024 16:08:23 +0100
Subject: [PATCH 1011/2704] feat(meson): add indents.scm

---
 queries/meson/indents.scm        | 25 +++++++++++++++++++++++
 tests/indent/meson/cond.meson    | 16 +++++++++++++++
 tests/indent/meson/dict.meson    | 15 ++++++++++++++
 tests/indent/meson/func.meson    | 13 ++++++++++++
 tests/indent/meson/list.meson    | 14 +++++++++++++
 tests/indent/meson/loop.meson    |  8 ++++++++
 tests/indent/meson/meson.build   | 34 ++++++++++++++++++++++++++++++++
 tests/indent/meson/method.meson  |  8 ++++++++
 tests/indent/meson/ternary.meson | 11 +++++++++++
 tests/indent/meson_spec.lua      | 28 ++++++++++++++++++++++++++
 10 files changed, 172 insertions(+)
 create mode 100644 queries/meson/indents.scm
 create mode 100644 tests/indent/meson/cond.meson
 create mode 100644 tests/indent/meson/dict.meson
 create mode 100644 tests/indent/meson/func.meson
 create mode 100644 tests/indent/meson/list.meson
 create mode 100644 tests/indent/meson/loop.meson
 create mode 100644 tests/indent/meson/meson.build
 create mode 100644 tests/indent/meson/method.meson
 create mode 100644 tests/indent/meson/ternary.meson
 create mode 100644 tests/indent/meson_spec.lua

diff --git a/queries/meson/indents.scm b/queries/meson/indents.scm
new file mode 100644
index 000000000..231f8b055
--- /dev/null
+++ b/queries/meson/indents.scm
@@ -0,0 +1,25 @@
+[
+  (list)
+  (dictionaries)
+  (normal_command)
+  (if_condition)
+  (foreach_command)
+  (ternaryoperator)
+  (ERROR
+    "?") ; support partial ternary
+] @indent.begin
+
+[
+  ")"
+  "]"
+  "}"
+  (elseif_command)
+  (else_command)
+  "endif"
+  "endforeach"
+] @indent.branch @indent.end
+
+(experession_statement
+  object: (_)) @indent.begin
+
+(comment) @indent.auto
diff --git a/tests/indent/meson/cond.meson b/tests/indent/meson/cond.meson
new file mode 100644
index 000000000..a4b0b71df
--- /dev/null
+++ b/tests/indent/meson/cond.meson
@@ -0,0 +1,16 @@
+# vim: ft=meson
+
+if a == b
+endif
+
+if a == b
+  foo()
+endif
+
+if a == b
+  foo()
+elif a != b
+  foo()
+else
+  foo()
+endif
diff --git a/tests/indent/meson/dict.meson b/tests/indent/meson/dict.meson
new file mode 100644
index 000000000..d48689fa4
--- /dev/null
+++ b/tests/indent/meson/dict.meson
@@ -0,0 +1,15 @@
+# vim: ft=meson
+
+foo = {
+  'a': 1,
+  'b': 2,
+}
+
+bar = {
+  'a': 1,
+  'b': 2}
+
+baz = {'a': 1,
+  'b': 2
+}
+
diff --git a/tests/indent/meson/func.meson b/tests/indent/meson/func.meson
new file mode 100644
index 000000000..3e83e0fad
--- /dev/null
+++ b/tests/indent/meson/func.meson
@@ -0,0 +1,13 @@
+# vim: ft=meson
+
+executable('progname',
+)
+
+executable('progname',
+  sources: 'prog.c',
+  c_args: '-DFOO=1'
+)
+
+executable('progname',
+  sources: 'prog.c',
+  c_args: '-DFOO=1')
diff --git a/tests/indent/meson/list.meson b/tests/indent/meson/list.meson
new file mode 100644
index 000000000..0dd17d27f
--- /dev/null
+++ b/tests/indent/meson/list.meson
@@ -0,0 +1,14 @@
+# vim: ft=meson
+
+foo = [
+  'a',
+  'b',
+]
+
+bar = [
+  'a',
+  'b']
+
+baz = ['a',
+  'b'
+]
diff --git a/tests/indent/meson/loop.meson b/tests/indent/meson/loop.meson
new file mode 100644
index 000000000..ae9c4b7a7
--- /dev/null
+++ b/tests/indent/meson/loop.meson
@@ -0,0 +1,8 @@
+# vim: ft=meson
+
+foreach elem : list
+endforeach
+
+foreach elem : list
+  foo()
+endforeach
diff --git a/tests/indent/meson/meson.build b/tests/indent/meson/meson.build
new file mode 100644
index 000000000..b7e6e0568
--- /dev/null
+++ b/tests/indent/meson/meson.build
@@ -0,0 +1,34 @@
+project('simple', 'c')
+
+src = [
+  'source1.c',
+  'source2.c',
+]
+
+if 1 == 2
+  if meson.is_cross_build()
+    src += [
+      'src1.c',
+      'src2.c']
+  endif
+endif
+
+inc = include_directories([
+  'dir1/',
+])
+
+
+dep = declare_dependency(
+  sources : src,
+  include_directories : inc,
+)
+
+executable('myexe', src,
+  include_directories : [
+    'd1',
+    [
+      'd2',
+      'd3',
+    ]
+  ],
+  dependencies: dep)
diff --git a/tests/indent/meson/method.meson b/tests/indent/meson/method.meson
new file mode 100644
index 000000000..8c17be8a8
--- /dev/null
+++ b/tests/indent/meson/method.meson
@@ -0,0 +1,8 @@
+# vim: ft=meson
+
+myobj
+  .do_something('now')
+
+myobj.do_something('now')
+  .do_something('now')
+  .do_something('now')
diff --git a/tests/indent/meson/ternary.meson b/tests/indent/meson/ternary.meson
new file mode 100644
index 000000000..d3dec04ac
--- /dev/null
+++ b/tests/indent/meson/ternary.meson
@@ -0,0 +1,11 @@
+# vim: ft=meson
+
+x = cond ?
+  iftrue :
+  iffalse
+
+x = cond
+  ? iftrue
+  : iffalse
+
+x = cond ?
diff --git a/tests/indent/meson_spec.lua b/tests/indent/meson_spec.lua
new file mode 100644
index 000000000..bc2372ee0
--- /dev/null
+++ b/tests/indent/meson_spec.lua
@@ -0,0 +1,28 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/meson", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent Meson:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("cond.meson", { on_line = 3, text = "foo()", indent = 2 })
+    run:new_line("cond.meson", { on_line = 6, text = "foo()", indent = 2 })
+    run:new_line("cond.meson", { on_line = 7, text = "foo()", indent = 2 })
+    run:new_line("cond.meson", { on_line = 12, text = "foo()", indent = 2 })
+    run:new_line("cond.meson", { on_line = 14, text = "foo()", indent = 2 })
+    run:new_line("dict.meson", { on_line = 13, text = ",'x':1,", indent = 2 })
+    run:new_line("loop.meson", { on_line = 3, text = "foo()", indent = 2 })
+    run:new_line("loop.meson", { on_line = 7, text = "foo()", indent = 2 })
+    run:new_line("ternary.meson", { on_line = 11, text = "x : y", indent = 2 })
+  end)
+end)

From c41d38b70e8b420008b17b7b9a4c6366533260d5 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Tue, 26 Dec 2023 21:57:22 +0900
Subject: [PATCH 1012/2704] fix(rust): Add back 1 indent for macro rules
 (#5834)

---
 queries/rust/indents.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index 6b9166518..891d36ad8 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -24,6 +24,16 @@
   (macro_definition)
 ] @indent.begin
 
+; Typing in "(" inside macro definitions breaks the tree entirely
+; Making macro_definition becoming errors
+; Offset this by adding back one indent for start of macro rules
+(ERROR
+  .
+  "macro_rules!"
+  "(" @indent.begin
+  (#set! indent.immediate)
+  (#set! indent.start_at_same_line))
+
 (trait_item
   body: (_) @indent.begin)
 

From 1ce6000a95ab6fc23ad54a256974b2bbf6cef4c5 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 29 Nov 2023 13:41:54 -0500
Subject: [PATCH 1013/2704] fix(rust): add `const_item` to folds

---
 queries/rust/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index 8d0b014fb..4c8c61f28 100644
--- a/queries/rust/folds.scm
+++ b/queries/rust/folds.scm
@@ -8,6 +8,7 @@
   (impl_item)
   (type_item)
   (union_item)
+  (const_item)
   (use_declaration)
   (let_declaration)
   (loop_expression)

From 88261266deca304a161ba8e5445f65722fdf2037 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 20 Jan 2024 02:00:37 -0800
Subject: [PATCH 1014/2704] fix(markdown_inline): prioritize link URI (#5935)

---
 queries/markdown_inline/highlights.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index d9f48296d..6c114b402 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -7,21 +7,9 @@
 
 (strikethrough) @markup.strikethrough
 
-[
-  (link_destination)
-  (uri_autolink)
-] @markup.link.url @nospell
-
 (shortcut_link
   (link_text) @nospell)
 
-[
-  (link_label)
-  (link_text)
-  (link_title)
-  (image_description)
-] @markup.link.label
-
 [
   (backslash_escape)
   (hard_line_break)
@@ -82,6 +70,18 @@
   ] @markup.link
   (#set! conceal ""))
 
+[
+  (link_destination)
+  (uri_autolink)
+] @markup.link.url @nospell
+
+[
+  (link_label)
+  (link_text)
+  (link_title)
+  (image_description)
+] @markup.link.label
+
 ; Replace common HTML entities.
 ((entity_reference) @character.special
   (#eq? @character.special "&nbsp;")

From aeed349c0414b5efd9de2f85e5ac84aeec2bef89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sat, 20 Jan 2024 19:45:09 +0900
Subject: [PATCH 1015/2704] feat: folds for git config files

---
 queries/git_config/folds.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/git_config/folds.scm b/queries/git_config/folds.scm
index 8b1378917..cb376d5b5 100644
--- a/queries/git_config/folds.scm
+++ b/queries/git_config/folds.scm
@@ -1 +1,2 @@
-
+((section) @fold
+  (#trim! @fold))

From a8fa3047b5f90e0d82dd7f371b50c14162e3e25d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 19 Jan 2024 19:37:44 +0100
Subject: [PATCH 1016/2704] fix(highlights): use `markup.raw.delimiter` for
 fences

---
 queries/markdown/highlights.scm        | 2 +-
 queries/markdown_inline/highlights.scm | 4 ++--
 queries/vimdoc/highlights.scm          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 423682496..7c26fd710 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -54,7 +54,7 @@
   (#set! "priority" 90))
 
 (fenced_code_block
-  (fenced_code_block_delimiter) @conceal
+  (fenced_code_block_delimiter) @markup.raw.delimiter
   (#set! conceal ""))
 
 (fenced_code_block
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 6c114b402..e9b41c31d 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -16,10 +16,10 @@
 ] @string.escape
 
 ; Conceal codeblock and text style markers
-((code_span_delimiter) @markup.raw
+((code_span_delimiter) @markup.raw.delimiter
   (#set! conceal ""))
 
-((emphasis_delimiter) @markup.strong
+((emphasis_delimiter) @conceal
   (#set! conceal ""))
 
 ; Conceal inline links
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 255bdfa66..ed8e84a90 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -24,7 +24,7 @@
   text: (_) @markup.link)
 
 (codespan
-  "`" @markup.raw
+  "`" @markup.raw.delimiter
   (#set! conceal "")
   text: (_) @markup.raw)
 
@@ -35,11 +35,11 @@
   [
     ">"
     (language)
-  ] @markup.raw.block
+  ] @markup.raw.delimiter
   (#set! conceal ""))
 
 (block
-  "<" @markup.raw.block
+  "<" @markup.raw.delimiter
   (#set! conceal ""))
 
 (argument) @variable.parameter

From 64b3d5e5698d485a4f197ffbe85a4b6c29e16325 Mon Sep 17 00:00:00 2001
From: tk-shirasaka <tk.shirasaka@gmail.com>
Date: Sat, 20 Jan 2024 21:34:49 +0900
Subject: [PATCH 1017/2704] feat: add the php_only parser included in
 tree-sitter-php (#5876)

Add parser  `php_only` for PHP files without HTML embedded.
Make queries for combined parser `php` inherit from `php_only` (no extensions needed).

---------

Co-authored-by: shirasaka <tk.shirasaka@gmail>
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   9 +
 queries/php/folds.scm           |  17 +-
 queries/php/highlights.scm      | 374 +-------------------------------
 queries/php/indents.scm         |  39 +---
 queries/php/injections.scm      |  45 +---
 queries/php/locals.scm          |  87 +-------
 queries/php_only/folds.scm      |  16 ++
 queries/php_only/highlights.scm | 373 +++++++++++++++++++++++++++++++
 queries/php_only/indents.scm    |  38 ++++
 queries/php_only/injections.scm |  43 ++++
 queries/php_only/locals.scm     |  86 ++++++++
 13 files changed, 574 insertions(+), 557 deletions(-)
 create mode 100644 queries/php_only/folds.scm
 create mode 100644 queries/php_only/highlights.scm
 create mode 100644 queries/php_only/indents.scm
 create mode 100644 queries/php_only/injections.scm
 create mode 100644 queries/php_only/locals.scm

diff --git a/README.md b/README.md
index a765566f3..1cb65a6cf 100644
--- a/README.md
+++ b/README.md
@@ -322,6 +322,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
 - [x] [perl](https://github.com/tree-sitter-perl/tree-sitter-perl) (maintained by @RabbiVeesh, @LeoNerd)
 - [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
+- [x] [php_only](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
 - [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
 - [x] [pioasm](https://github.com/leo60228/tree-sitter-pioasm) (maintained by @leo60228)
 - [x] [po](https://github.com/erasin/tree-sitter-po) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 4d915d387..a8c051124 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -446,6 +446,9 @@
   "php": {
     "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
   },
+  "php_only": {
+    "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
+  },
   "phpdoc": {
     "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d60553206..7a945e11e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1332,6 +1332,15 @@ list.php = {
   maintainers = { "@tk-shirasaka" },
 }
 
+list.php_only = {
+  install_info = {
+    url = "https://github.com/tree-sitter/tree-sitter-php",
+    location = "php_only",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@tk-shirasaka" },
+}
+
 -- Parsers for injections
 list.phpdoc = {
   install_info = {
diff --git a/queries/php/folds.scm b/queries/php/folds.scm
index 56eb33e77..f32463888 100644
--- a/queries/php/folds.scm
+++ b/queries/php/folds.scm
@@ -1,16 +1 @@
-[
-  (if_statement)
-  (switch_statement)
-  (while_statement)
-  (do_statement)
-  (for_statement)
-  (foreach_statement)
-  (try_statement)
-  (function_definition)
-  (class_declaration)
-  (interface_declaration)
-  (trait_declaration)
-  (enum_declaration)
-  (function_static_declaration)
-  (method_declaration)
-] @fold
+; inherits: php_only
diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index cbc7e1839..f32463888 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -1,373 +1 @@
-; Variables
-(variable_name) @variable
-
-; Constants
-((name) @constant
-  (#lua-match? @constant "^_?[A-Z][A-Z%d_]*$"))
-
-((name) @constant.builtin
-  (#lua-match? @constant.builtin "^__[A-Z][A-Z%d_]+__$"))
-
-(const_declaration
-  (const_element
-    (name) @constant))
-
-; Types
-[
-  (primitive_type)
-  (cast_type)
-  (bottom_type)
-] @type.builtin
-
-(named_type
-  [
-    (name) @type
-    (qualified_name
-      (name) @type)
-  ])
-
-(class_declaration
-  name: (name) @type)
-
-(base_clause
-  [
-    (name) @type
-    (qualified_name
-      (name) @type)
-  ])
-
-(enum_declaration
-  name: (name) @type)
-
-(interface_declaration
-  name: (name) @type)
-
-(namespace_use_clause
-  [
-    (name) @type
-    (qualified_name
-      (name) @type)
-  ])
-
-(namespace_aliasing_clause
-  (name) @type.definition)
-
-(class_interface_clause
-  [
-    (name) @type
-    (qualified_name
-      (name) @type)
-  ])
-
-(scoped_call_expression
-  scope:
-    [
-      (name) @type
-      (qualified_name
-        (name) @type)
-    ])
-
-(class_constant_access_expression
-  .
-  [
-    (name) @type
-    (qualified_name
-      (name) @type)
-  ]
-  (name) @constant)
-
-(trait_declaration
-  name: (name) @type)
-
-(use_declaration
-  (name) @type)
-
-(binary_expression
-  operator: "instanceof"
-  right:
-    [
-      (name) @type
-      (qualified_name
-        (name) @type)
-    ])
-
-; Functions, methods, constructors
-(array_creation_expression
-  "array" @function.builtin)
-
-(list_literal
-  "list" @function.builtin)
-
-(method_declaration
-  name: (name) @function.method)
-
-(function_call_expression
-  function:
-    (qualified_name
-      (name) @function.call))
-
-(function_call_expression
-  (name) @function.call)
-
-(scoped_call_expression
-  name: (name) @function.call)
-
-(member_call_expression
-  name: (name) @function.method.call)
-
-(function_definition
-  name: (name) @function)
-
-(nullsafe_member_call_expression
-  name: (name) @function.method)
-
-(method_declaration
-  name: (name) @constructor
-  (#eq? @constructor "__construct"))
-
-(object_creation_expression
-  [
-    (name) @constructor
-    (qualified_name
-      (name) @constructor)
-  ])
-
-; Parameters
-[
-  (simple_parameter)
-  (variadic_parameter)
-] @variable.parameter
-
-(argument
-  (name) @variable.parameter)
-
-; Member
-(property_element
-  (variable_name) @property)
-
-(member_access_expression
-  name:
-    (variable_name
-      (name)) @property)
-
-(member_access_expression
-  name: (name) @property)
-
-; Variables
-(relative_scope) @variable.builtin
-
-((variable_name) @variable.builtin
-  (#eq? @variable.builtin "$this"))
-
-; Namespace
-(namespace_definition
-  name:
-    (namespace_name
-      (name) @module))
-
-(namespace_name_as_prefix
-  (namespace_name
-    (name) @module))
-
-; Attributes
-(attribute_list) @attribute
-
-; Conditions ( ? : )
-(conditional_expression) @keyword.conditional
-
-; Directives
-(declare_directive
-  [
-    "strict_types"
-    "ticks"
-    "encoding"
-  ] @variable.parameter)
-
-; Basic tokens
-[
-  (string)
-  (encapsed_string)
-  (heredoc_body)
-  (nowdoc_body)
-  (shell_command_expression) ; backtick operator: `ls -la`
-] @string
-
-(escape_sequence) @string.escape
-
-[
-  (heredoc_start)
-  (heredoc_end)
-] @label
-
-(nowdoc
-  "'" @label)
-
-(boolean) @boolean
-
-(null) @constant.builtin
-
-(integer) @number
-
-(float) @number.float
-
-(comment) @comment @spell
-
-(named_label_statement) @label
-
-; Keywords
-[
-  "and"
-  "as"
-  "instanceof"
-  "or"
-  "xor"
-] @keyword.operator
-
-[
-  "fn"
-  "function"
-] @keyword.function
-
-[
-  "break"
-  "class"
-  "clone"
-  "declare"
-  "default"
-  "echo"
-  "enddeclare"
-  "enum"
-  "extends"
-  "global"
-  "goto"
-  "implements"
-  "insteadof"
-  "interface"
-  "namespace"
-  "new"
-  "trait"
-  "unset"
-] @keyword
-
-[
-  "abstract"
-  "const"
-  "final"
-  "private"
-  "protected"
-  "public"
-  "readonly"
-  "static"
-] @type.qualifier
-
-[
-  "return"
-  "yield"
-] @keyword.return
-
-[
-  "case"
-  "else"
-  "elseif"
-  "endif"
-  "endswitch"
-  "if"
-  "switch"
-  "match"
-  "??"
-] @keyword.conditional
-
-[
-  "continue"
-  "do"
-  "endfor"
-  "endforeach"
-  "endwhile"
-  "for"
-  "foreach"
-  "while"
-] @keyword.repeat
-
-[
-  "catch"
-  "finally"
-  "throw"
-  "try"
-] @keyword.exception
-
-[
-  "include_once"
-  "include"
-  "require_once"
-  "require"
-  "use"
-] @keyword.import
-
-[
-  ","
-  ";"
-  ":"
-  "\\"
-] @punctuation.delimiter
-
-[
-  (php_tag)
-  "?>"
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-  "#["
-] @punctuation.bracket
-
-[
-  "="
-  "."
-  "-"
-  "*"
-  "/"
-  "+"
-  "%"
-  "**"
-  "~"
-  "|"
-  "^"
-  "&"
-  "<<"
-  ">>"
-  "<<<"
-  "->"
-  "?->"
-  "=>"
-  "<"
-  "<="
-  ">="
-  ">"
-  "<>"
-  "=="
-  "!="
-  "==="
-  "!=="
-  "!"
-  "&&"
-  "||"
-  ".="
-  "-="
-  "+="
-  "*="
-  "/="
-  "%="
-  "**="
-  "&="
-  "|="
-  "^="
-  "<<="
-  ">>="
-  "??="
-  "--"
-  "++"
-  "@"
-  "::"
-] @operator
+; inherits: php_only
diff --git a/queries/php/indents.scm b/queries/php/indents.scm
index a81faed62..f32463888 100644
--- a/queries/php/indents.scm
+++ b/queries/php/indents.scm
@@ -1,38 +1 @@
-[
-  (array_creation_expression)
-  (compound_statement)
-  (declaration_list)
-  (binary_expression)
-  (return_statement)
-  (arguments)
-  (formal_parameters)
-  (enum_declaration_list)
-  (switch_block)
-  (match_block)
-  (case_statement)
-] @indent.begin
-
-[
-  ")"
-  "}"
-  "]"
-] @indent.branch
-
-(comment) @indent.auto
-
-(compound_statement
-  "}" @indent.end)
-
-(ERROR
-  "(" @indent.align
-  .
-  (_)
-  (#set! indent.open_delimiter "(")
-  (#set! indent.close_delimiter ")"))
-
-(ERROR
-  "[" @indent.align
-  .
-  (_)
-  (#set! indent.open_delimiter "[")
-  (#set! indent.close_delimiter "]"))
+; inherits: php_only
diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index 0c9d25ce6..141f65eaa 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -1,47 +1,4 @@
+; inherits: php_only
 ((text) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
-
-((comment) @injection.content
-  (#set! injection.language "phpdoc"))
-
-((heredoc
-  (heredoc_body) @injection.content
-  (heredoc_end) @injection.language
-  (#set! injection.include-children)
-  (#downcase! @injection.language)))
-
-((nowdoc
-  (nowdoc_body) @injection.content
-  (heredoc_end) @injection.language
-  (#set! injection.include-children)
-  (#downcase! @injection.language)))
-
-; regex
-((function_call_expression
-  function: (_) @_preg_func_identifier
-  arguments:
-    (arguments
-      .
-      (argument
-        (_
-          (string_value) @injection.content))))
-  (#set! injection.language "regex")
-  (#lua-match? @_preg_func_identifier "^preg_"))
-
-; bash
-((function_call_expression
-  function: (_) @_shell_func_identifier
-  arguments:
-    (arguments
-      .
-      (argument
-        (_
-          (string_value) @injection.content))))
-  (#set! injection.language "bash")
-  (#any-of? @_shell_func_identifier "shell_exec" "escapeshellarg" "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec" "system"))
-
-(expression_statement
-  (shell_command_expression
-    (string_value) @injection.content)
-  (#set! injection.language "bash"))
diff --git a/queries/php/locals.scm b/queries/php/locals.scm
index 8d509b37c..f32463888 100644
--- a/queries/php/locals.scm
+++ b/queries/php/locals.scm
@@ -1,86 +1 @@
-; Scopes
-;-------
-((class_declaration
-  name: (name) @local.definition.type) @local.scope
-  (#set! definition.type.scope "parent"))
-
-((method_declaration
-  name: (name) @local.definition.method) @local.scope
-  (#set! definition.method.scope "parent"))
-
-((function_definition
-  name: (name) @local.definition.function) @local.scope
-  (#set! definition.function.scope "parent"))
-
-(anonymous_function_creation_expression
-  (anonymous_function_use_clause
-    (variable_name
-      (name) @local.definition.var))) @local.scope
-
-; Definitions
-;------------
-(simple_parameter
-  (variable_name
-    (name) @local.definition.var))
-
-(foreach_statement
-  (pair
-    (variable_name
-      (name) @local.definition.var)))
-
-(foreach_statement
-  (variable_name
-    (name) @local.reference
-    (#set! reference.kind "var"))
-  (variable_name
-    (name) @local.definition.var))
-
-(property_declaration
-  (property_element
-    (variable_name
-      (name) @local.definition.field)))
-
-(namespace_use_clause
-  (qualified_name
-    (name) @local.definition.type))
-
-; References
-;------------
-(named_type
-  (name) @local.reference
-  (#set! reference.kind "type"))
-
-(named_type
-  (qualified_name) @local.reference
-  (#set! reference.kind "type"))
-
-(variable_name
-  (name) @local.reference
-  (#set! reference.kind "var"))
-
-(member_access_expression
-  name: (name) @local.reference
-  (#set! reference.kind "field"))
-
-(member_call_expression
-  name: (name) @local.reference
-  (#set! reference.kind "method"))
-
-(function_call_expression
-  function:
-    (qualified_name
-      (name) @local.reference
-      (#set! reference.kind "function")))
-
-(object_creation_expression
-  (qualified_name
-    (name) @local.reference
-    (#set! reference.kind "type")))
-
-(scoped_call_expression
-  scope:
-    (qualified_name
-      (name) @local.reference
-      (#set! reference.kind "type"))
-  name: (name) @local.reference
-  (#set! reference.kind "method"))
+; inherits: php_only
diff --git a/queries/php_only/folds.scm b/queries/php_only/folds.scm
new file mode 100644
index 000000000..56eb33e77
--- /dev/null
+++ b/queries/php_only/folds.scm
@@ -0,0 +1,16 @@
+[
+  (if_statement)
+  (switch_statement)
+  (while_statement)
+  (do_statement)
+  (for_statement)
+  (foreach_statement)
+  (try_statement)
+  (function_definition)
+  (class_declaration)
+  (interface_declaration)
+  (trait_declaration)
+  (enum_declaration)
+  (function_static_declaration)
+  (method_declaration)
+] @fold
diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
new file mode 100644
index 000000000..cbc7e1839
--- /dev/null
+++ b/queries/php_only/highlights.scm
@@ -0,0 +1,373 @@
+; Variables
+(variable_name) @variable
+
+; Constants
+((name) @constant
+  (#lua-match? @constant "^_?[A-Z][A-Z%d_]*$"))
+
+((name) @constant.builtin
+  (#lua-match? @constant.builtin "^__[A-Z][A-Z%d_]+__$"))
+
+(const_declaration
+  (const_element
+    (name) @constant))
+
+; Types
+[
+  (primitive_type)
+  (cast_type)
+  (bottom_type)
+] @type.builtin
+
+(named_type
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
+(class_declaration
+  name: (name) @type)
+
+(base_clause
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
+(enum_declaration
+  name: (name) @type)
+
+(interface_declaration
+  name: (name) @type)
+
+(namespace_use_clause
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
+(namespace_aliasing_clause
+  (name) @type.definition)
+
+(class_interface_clause
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
+(scoped_call_expression
+  scope:
+    [
+      (name) @type
+      (qualified_name
+        (name) @type)
+    ])
+
+(class_constant_access_expression
+  .
+  [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ]
+  (name) @constant)
+
+(trait_declaration
+  name: (name) @type)
+
+(use_declaration
+  (name) @type)
+
+(binary_expression
+  operator: "instanceof"
+  right:
+    [
+      (name) @type
+      (qualified_name
+        (name) @type)
+    ])
+
+; Functions, methods, constructors
+(array_creation_expression
+  "array" @function.builtin)
+
+(list_literal
+  "list" @function.builtin)
+
+(method_declaration
+  name: (name) @function.method)
+
+(function_call_expression
+  function:
+    (qualified_name
+      (name) @function.call))
+
+(function_call_expression
+  (name) @function.call)
+
+(scoped_call_expression
+  name: (name) @function.call)
+
+(member_call_expression
+  name: (name) @function.method.call)
+
+(function_definition
+  name: (name) @function)
+
+(nullsafe_member_call_expression
+  name: (name) @function.method)
+
+(method_declaration
+  name: (name) @constructor
+  (#eq? @constructor "__construct"))
+
+(object_creation_expression
+  [
+    (name) @constructor
+    (qualified_name
+      (name) @constructor)
+  ])
+
+; Parameters
+[
+  (simple_parameter)
+  (variadic_parameter)
+] @variable.parameter
+
+(argument
+  (name) @variable.parameter)
+
+; Member
+(property_element
+  (variable_name) @property)
+
+(member_access_expression
+  name:
+    (variable_name
+      (name)) @property)
+
+(member_access_expression
+  name: (name) @property)
+
+; Variables
+(relative_scope) @variable.builtin
+
+((variable_name) @variable.builtin
+  (#eq? @variable.builtin "$this"))
+
+; Namespace
+(namespace_definition
+  name:
+    (namespace_name
+      (name) @module))
+
+(namespace_name_as_prefix
+  (namespace_name
+    (name) @module))
+
+; Attributes
+(attribute_list) @attribute
+
+; Conditions ( ? : )
+(conditional_expression) @keyword.conditional
+
+; Directives
+(declare_directive
+  [
+    "strict_types"
+    "ticks"
+    "encoding"
+  ] @variable.parameter)
+
+; Basic tokens
+[
+  (string)
+  (encapsed_string)
+  (heredoc_body)
+  (nowdoc_body)
+  (shell_command_expression) ; backtick operator: `ls -la`
+] @string
+
+(escape_sequence) @string.escape
+
+[
+  (heredoc_start)
+  (heredoc_end)
+] @label
+
+(nowdoc
+  "'" @label)
+
+(boolean) @boolean
+
+(null) @constant.builtin
+
+(integer) @number
+
+(float) @number.float
+
+(comment) @comment @spell
+
+(named_label_statement) @label
+
+; Keywords
+[
+  "and"
+  "as"
+  "instanceof"
+  "or"
+  "xor"
+] @keyword.operator
+
+[
+  "fn"
+  "function"
+] @keyword.function
+
+[
+  "break"
+  "class"
+  "clone"
+  "declare"
+  "default"
+  "echo"
+  "enddeclare"
+  "enum"
+  "extends"
+  "global"
+  "goto"
+  "implements"
+  "insteadof"
+  "interface"
+  "namespace"
+  "new"
+  "trait"
+  "unset"
+] @keyword
+
+[
+  "abstract"
+  "const"
+  "final"
+  "private"
+  "protected"
+  "public"
+  "readonly"
+  "static"
+] @type.qualifier
+
+[
+  "return"
+  "yield"
+] @keyword.return
+
+[
+  "case"
+  "else"
+  "elseif"
+  "endif"
+  "endswitch"
+  "if"
+  "switch"
+  "match"
+  "??"
+] @keyword.conditional
+
+[
+  "continue"
+  "do"
+  "endfor"
+  "endforeach"
+  "endwhile"
+  "for"
+  "foreach"
+  "while"
+] @keyword.repeat
+
+[
+  "catch"
+  "finally"
+  "throw"
+  "try"
+] @keyword.exception
+
+[
+  "include_once"
+  "include"
+  "require_once"
+  "require"
+  "use"
+] @keyword.import
+
+[
+  ","
+  ";"
+  ":"
+  "\\"
+] @punctuation.delimiter
+
+[
+  (php_tag)
+  "?>"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "#["
+] @punctuation.bracket
+
+[
+  "="
+  "."
+  "-"
+  "*"
+  "/"
+  "+"
+  "%"
+  "**"
+  "~"
+  "|"
+  "^"
+  "&"
+  "<<"
+  ">>"
+  "<<<"
+  "->"
+  "?->"
+  "=>"
+  "<"
+  "<="
+  ">="
+  ">"
+  "<>"
+  "=="
+  "!="
+  "==="
+  "!=="
+  "!"
+  "&&"
+  "||"
+  ".="
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "**="
+  "&="
+  "|="
+  "^="
+  "<<="
+  ">>="
+  "??="
+  "--"
+  "++"
+  "@"
+  "::"
+] @operator
diff --git a/queries/php_only/indents.scm b/queries/php_only/indents.scm
new file mode 100644
index 000000000..a81faed62
--- /dev/null
+++ b/queries/php_only/indents.scm
@@ -0,0 +1,38 @@
+[
+  (array_creation_expression)
+  (compound_statement)
+  (declaration_list)
+  (binary_expression)
+  (return_statement)
+  (arguments)
+  (formal_parameters)
+  (enum_declaration_list)
+  (switch_block)
+  (match_block)
+  (case_statement)
+] @indent.begin
+
+[
+  ")"
+  "}"
+  "]"
+] @indent.branch
+
+(comment) @indent.auto
+
+(compound_statement
+  "}" @indent.end)
+
+(ERROR
+  "(" @indent.align
+  .
+  (_)
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+(ERROR
+  "[" @indent.align
+  .
+  (_)
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]"))
diff --git a/queries/php_only/injections.scm b/queries/php_only/injections.scm
new file mode 100644
index 000000000..70f693853
--- /dev/null
+++ b/queries/php_only/injections.scm
@@ -0,0 +1,43 @@
+((comment) @injection.content
+  (#set! injection.language "phpdoc"))
+
+((heredoc
+  (heredoc_body) @injection.content
+  (heredoc_end) @injection.language
+  (#set! injection.include-children)
+  (#downcase! @injection.language)))
+
+((nowdoc
+  (nowdoc_body) @injection.content
+  (heredoc_end) @injection.language
+  (#set! injection.include-children)
+  (#downcase! @injection.language)))
+
+; regex
+((function_call_expression
+  function: (_) @_preg_func_identifier
+  arguments:
+    (arguments
+      .
+      (argument
+        (_
+          (string_value) @injection.content))))
+  (#set! injection.language "regex")
+  (#lua-match? @_preg_func_identifier "^preg_"))
+
+; bash
+((function_call_expression
+  function: (_) @_shell_func_identifier
+  arguments:
+    (arguments
+      .
+      (argument
+        (_
+          (string_value) @injection.content))))
+  (#set! injection.language "bash")
+  (#any-of? @_shell_func_identifier "shell_exec" "escapeshellarg" "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec" "system"))
+
+(expression_statement
+  (shell_command_expression
+    (string_value) @injection.content)
+  (#set! injection.language "bash"))
diff --git a/queries/php_only/locals.scm b/queries/php_only/locals.scm
new file mode 100644
index 000000000..8d509b37c
--- /dev/null
+++ b/queries/php_only/locals.scm
@@ -0,0 +1,86 @@
+; Scopes
+;-------
+((class_declaration
+  name: (name) @local.definition.type) @local.scope
+  (#set! definition.type.scope "parent"))
+
+((method_declaration
+  name: (name) @local.definition.method) @local.scope
+  (#set! definition.method.scope "parent"))
+
+((function_definition
+  name: (name) @local.definition.function) @local.scope
+  (#set! definition.function.scope "parent"))
+
+(anonymous_function_creation_expression
+  (anonymous_function_use_clause
+    (variable_name
+      (name) @local.definition.var))) @local.scope
+
+; Definitions
+;------------
+(simple_parameter
+  (variable_name
+    (name) @local.definition.var))
+
+(foreach_statement
+  (pair
+    (variable_name
+      (name) @local.definition.var)))
+
+(foreach_statement
+  (variable_name
+    (name) @local.reference
+    (#set! reference.kind "var"))
+  (variable_name
+    (name) @local.definition.var))
+
+(property_declaration
+  (property_element
+    (variable_name
+      (name) @local.definition.field)))
+
+(namespace_use_clause
+  (qualified_name
+    (name) @local.definition.type))
+
+; References
+;------------
+(named_type
+  (name) @local.reference
+  (#set! reference.kind "type"))
+
+(named_type
+  (qualified_name) @local.reference
+  (#set! reference.kind "type"))
+
+(variable_name
+  (name) @local.reference
+  (#set! reference.kind "var"))
+
+(member_access_expression
+  name: (name) @local.reference
+  (#set! reference.kind "field"))
+
+(member_call_expression
+  name: (name) @local.reference
+  (#set! reference.kind "method"))
+
+(function_call_expression
+  function:
+    (qualified_name
+      (name) @local.reference
+      (#set! reference.kind "function")))
+
+(object_creation_expression
+  (qualified_name
+    (name) @local.reference
+    (#set! reference.kind "type")))
+
+(scoped_call_expression
+  scope:
+    (qualified_name
+      (name) @local.reference
+      (#set! reference.kind "type"))
+  name: (name) @local.reference
+  (#set! reference.kind "method"))

From 5cc562748729b6dc9563ea5a3d676ff102ab38b1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 20 Jan 2024 17:41:40 +0100
Subject: [PATCH 1018/2704] fix(comments)!: consolidate note captures

Distinguishing `hint` and `info` is too confusing; it's enough to have
`error`, `warning`, `todo`, and `note`.
---
 CONTRIBUTING.md                  | 9 ++++-----
 queries/comment/highlights.scm   | 4 ++--
 queries/gitcommit/highlights.scm | 2 +-
 queries/vimdoc/highlights.scm    | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c29994f18..ca681832a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -193,11 +193,10 @@ As languages differ quite a lot, here is a set of captures available to you when
 @comment               ; line and block comments
 @comment.documentation ; comments documenting code
 
-@comment.error         ; error-type comments (e.g., `DEPRECATED:`)
-@comment.warning       ; warning-type comments (e.g., `WARNING:`, `FIX:`)
-@comment.hint          ; note-type comments (e.g., `NOTE:`)
-@comment.info          ; info-type comments
-@comment.todo          ; todo-type comments (e.g-, `TODO:`, `WIP:`)
+@comment.error         ; error-type comments (e.g. `ERROR`, `FIXME`, `DEPRECATED:`)
+@comment.warning       ; warning-type comments (e.g. `WARNING:`, `FIX:`, `HACK:`)
+@comment.todo          ; todo-type comments (e.g. `TODO:`, `WIP:`, `FIXME:`)
+@comment.note          ; note-type comments (e.g. `NOTE:`, `INFO:`, `XXX`)
 ```
 
 #### Markup
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 6556ec557..1c663735b 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -4,10 +4,10 @@
     (user) @constant
     ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @comment.todo "TODO" "WIP"))
+  (#any-of? @comment.todo "TODO" "WIP" "FIXME"))
 
 ("text" @comment.todo @nospell
-  (#any-of? @comment.todo "TODO" "WIP"))
+  (#any-of? @comment.todo "TODO" "WIP" "FIXME"))
 
 ((tag
   (name) @comment.note @nospell
diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index 880d05e01..8f7036a7e 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -44,7 +44,7 @@
 
 ; (trailer (value) @none)
 (breaking_change
-  (token) @comment.warning)
+  (token) @comment.error)
 
 (breaking_change
   (value) @none @spell)
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index ed8e84a90..294fa94f1 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -48,8 +48,8 @@
 
 (url) @string.special.url
 
-((note) @comment.hint
-  (#any-of? @comment.hint "Note:" "NOTE:" "Notes:"))
+((note) @comment.note
+  (#any-of? @comment.note "Note:" "NOTE:" "Notes:"))
 
 ((note) @comment.warning
   (#any-of? @comment.warning "Warning:" "WARNING:"))

From 4e0d1dd91ffacd7d21df7194fbc936a439a29d59 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 21 Jan 2024 06:36:29 +0000
Subject: [PATCH 1019/2704] Update parsers: gleam, perl, templ, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a8c051124..757ae4ae2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "62c5388a7badb4e29315690358267a76a734bf83"
+    "revision": "58b7cac8fc14c92b0677c542610d8738c373fa81"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -441,7 +441,7 @@
     "revision": "e01767921df18142055d97407595329d7629e643"
   },
   "perl": {
-    "revision": "9c0cea7720f65a5e832c4d924356d7793f519e36"
+    "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
     "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
@@ -642,7 +642,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "c3baaab33f1f1032eedd3613cd932284975bd21f"
+    "revision": "d7d19f10e50c41bce569ffef8b2ff38452594016"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -726,7 +726,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "ee58533169c654b8d7fd47fde01241e528674d8a"
+    "revision": "7c4c3551206f737bc4bfb51fbcc2344311984203"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 5d5eba78a7eee55df2c18d62cfc81ce9318bddd6 Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Sat, 20 Jan 2024 20:05:29 +0000
Subject: [PATCH 1020/2704] feat(perl): add more highlights

---
 queries/perl/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index a6405c948..9318b11a7 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -29,6 +29,9 @@
   "foreach"
 ] @keyword.repeat
 
+("continue" @keyword.repeat
+  (block))
+
 "return" @keyword.return
 
 "sub" @keyword.function

From 6806d7a783e3b7a3bfe775e5f8b9d2b66539fdbe Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 20 Jan 2024 11:15:16 +0100
Subject: [PATCH 1021/2704] docs(contributing): typos and examples

---
 CONTRIBUTING.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca681832a..25c13edfb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ If you haven't already, you should really come and reach out to us on our
 As you know, `nvim-treesitter` is roughly split in two parts:
 
 - Parser configurations : for various things like `locals`, `highlights`
-- What we like to call _modules_ : tiny lua modules that provide a given feature, based on parser configurations
+- What we like to call _modules_ : tiny Lua modules that provide a given feature, based on parser configurations
 
 Depending on which part of the plugin you want to contribute to, please read the appropriate section.
 
@@ -63,7 +63,7 @@ Here are some global advices:
   you can install the [playground plugin](https://github.com/nvim-treesitter/playground).
 - If your language is listed [here](https://github.com/nvim-treesitter/nvim-treesitter#supported-languages),
   you can debug and experiment with your queries there.
-- If not, you should consider installing the [tree-sitter cli](https://github.com/tree-sitter/tree-sitter/tree/master/cli),
+- If not, you should consider installing the [tree-sitter CLI](https://github.com/tree-sitter/tree-sitter/tree/master/cli),
   you should then be able to open a local playground using `tree-sitter build-wasm && tree-sitter web-ui` within the
   parsers repo.
 - Examples of queries can be found in [queries/](queries/)
@@ -93,7 +93,7 @@ Should you need to preserve a specific format for a node, you can exempt it (and
 
 ### Highlights
 
-As languages differ quite a lot, here is a set of captures available to you when building a `highlights.scm` query. Note that your colorscheme needs to define (or link) these captures as highlight groups.
+As languages differ quite a lot, here is a set of captures available to you when building a `highlights.scm` query. Note that your color scheme needs to define (or link) these captures as highlight groups.
 
 #### Identifiers
 
@@ -205,8 +205,8 @@ Mainly for markup languages.
 
 ```query
 @markup.strong         ; bold text
-@markup.italic         ; text with emphasis
-@markup.strikethrough  ; strikethrough text
+@markup.italic         ; italic text
+@markup.strikethrough  ; struck-through text
 @markup.underline      ; underlined text (only for literal underline markup!)
 
 @markup.heading        ; headings, titles (including markers)
@@ -219,7 +219,7 @@ Mainly for markup languages.
 @markup.link.label     ; link, reference descriptions
 @markup.link.url       ; URL-style links
 
-@markup.raw            ; literal or verbatim text (e.g., inline code)
+@markup.raw            ; literal or verbatim text (e.g. inline code)
 @markup.raw.block      ; literal or verbatim text as a stand-alone block
                        ; (use priority 90 for blocks with injections)
 
@@ -235,9 +235,9 @@ Mainly for markup languages.
 ```
 
 ```query
-@tag           ; XML tag names
-@tag.attribute ; XML tag attributes
-@tag.delimiter ; XML tag delimiters
+@tag           ; XML-style tag names (and similar)
+@tag.attribute ; XML-style tag attributes
+@tag.delimiter ; XML-style tag delimiters
 ```
 
 #### Non-highlighting captures

From 051193acba2cb669e853764bfc510c5a511874ea Mon Sep 17 00:00:00 2001
From: Sergey Slipchenko <faergeek@gmail.com>
Date: Sun, 21 Jan 2024 18:04:34 +0400
Subject: [PATCH 1022/2704] fix(jsdoc): add nospell to type and tag_name

---
 queries/jsdoc/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/jsdoc/highlights.scm b/queries/jsdoc/highlights.scm
index fcba0c188..e20a1bb5a 100644
--- a/queries/jsdoc/highlights.scm
+++ b/queries/jsdoc/highlights.scm
@@ -1,3 +1,3 @@
-(tag_name) @keyword
+(tag_name) @keyword @nospell
 
-(type) @type
+(type) @type @nospell

From 76ca66db38edb07bade5b7b233254b2c2ae7dc30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sun, 21 Jan 2024 21:13:04 +0900
Subject: [PATCH 1023/2704] fix(format-scripts): remove parens if possible

---
 scripts/format-queries.lua | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index d42d5b255..67b850976 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -204,7 +204,9 @@ local format_queries = [[
   [
     (named_node [ (named_node) (list) (grouping) (anonymous_node) (field_definition) ])
     (list "[" . (_) . (_) "]")
-    (grouping)
+    (grouping "(" . (_) . (_) ")")
+    (grouping
+      quantifier: (quantifier))
   ])
 
 ; ( (_) ) handler
@@ -240,6 +242,29 @@ local format_queries = [[
   (#not-has-type? @format.cancel-append comment))
 (grouping
   (capture) @format.prepend-space)
+;; Remove unnecessary parens
+(grouping
+  "(" @format.remove
+  .
+  (_)
+  .
+  ")" @format.remove .)
+(grouping
+  "(" @format.remove
+  .
+  [
+    (anonymous_node
+      name: (identifier) .)
+    (named_node
+      [
+        "_"
+        name: (identifier)
+      ] .)
+  ]
+  .
+  ")" @format.remove
+  .
+  (capture))
 
 (predicate
   (parameters

From 77e298e4de607d69aa7f37dc6dcba6aee131ac7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sun, 21 Jan 2024 22:05:44 +0900
Subject: [PATCH 1024/2704] chore: format queries

---
 queries/apex/highlights.scm          |  4 +--
 queries/bitbake/locals.scm           |  4 +--
 queries/c/highlights.scm             |  4 +--
 queries/c/indents.scm                |  4 +--
 queries/cmake/indents.scm            |  4 +--
 queries/comment/highlights.scm       |  2 +-
 queries/cpon/highlights.scm          |  2 +-
 queries/cpp/highlights.scm           |  4 +--
 queries/css/indents.scm              |  4 +--
 queries/dart/highlights.scm          |  2 +-
 queries/doxygen/injections.scm       |  4 +--
 queries/dtd/highlights.scm           |  4 +--
 queries/ecma/highlights.scm          |  4 +--
 queries/ecma/injections.scm          |  3 +-
 queries/ecma/locals.scm              |  4 +--
 queries/elixir/highlights.scm        |  6 ++--
 queries/gdscript/locals.scm          |  4 +--
 queries/gitattributes/highlights.scm |  4 +--
 queries/haskell/highlights.scm       | 42 ++++++++++++++--------------
 queries/haskell/injections.scm       | 20 ++++++-------
 queries/html_tags/injections.scm     | 10 +++----
 queries/javascript/locals.scm        |  4 +--
 queries/jq/highlights.scm            |  2 +-
 queries/json/highlights.scm          |  2 +-
 queries/jsx/highlights.scm           | 12 ++++----
 queries/jsx/indents.scm              |  2 +-
 queries/kotlin/highlights.scm        | 10 +++----
 queries/lalrpop/highlights.scm       |  2 +-
 queries/latex/highlights.scm         |  2 +-
 queries/ledger/highlights.scm        |  2 +-
 queries/nim/highlights.scm           |  4 +--
 queries/perl/highlights.scm          |  4 +--
 queries/php_only/injections.scm      |  8 +++---
 queries/python/locals.scm            |  4 +--
 queries/r/highlights.scm             |  8 +++---
 queries/r/indents.scm                |  4 +--
 queries/rust/injections.scm          |  3 +-
 queries/scala/highlights.scm         | 10 +++----
 queries/scala/locals.scm             |  3 +-
 queries/sql/highlights.scm           |  4 +--
 queries/swift/indents.scm            |  4 +--
 queries/teal/locals.scm              |  4 +--
 queries/tlaplus/highlights.scm       | 16 +++++------
 queries/tlaplus/locals.scm           |  6 ++--
 queries/typescript/highlights.scm    |  4 +--
 queries/usd/highlights.scm           |  4 +--
 queries/v/locals.scm                 |  8 +++---
 queries/vue/injections.scm           |  8 +++---
 queries/wgsl_bevy/highlights.scm     |  2 +-
 queries/zig/folds.scm                |  4 +--
 50 files changed, 143 insertions(+), 146 deletions(-)

diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 2cddf4684..ef264064d 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -57,8 +57,8 @@
 (type_arguments
   ">" @punctuation.delimiter)
 
-((field_access
-  object: (identifier) @type))
+(field_access
+  object: (identifier) @type)
 
 (field_access
   field: (identifier) @property)
diff --git a/queries/bitbake/locals.scm b/queries/bitbake/locals.scm
index 0f572584b..edee8b30b 100644
--- a/queries/bitbake/locals.scm
+++ b/queries/bitbake/locals.scm
@@ -11,12 +11,12 @@
 (import_statement
   name:
     (dotted_name
-      ((python_identifier) @local.definition.import)))
+      (python_identifier) @local.definition.import))
 
 (import_from_statement
   name:
     (dotted_name
-      ((python_identifier) @local.definition.import)))
+      (python_identifier) @local.definition.import))
 
 ; Function with parameters, defines parameters
 (parameters
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index c848f68dc..81dc19f91 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -232,10 +232,10 @@
   (argument_list
     (identifier) @variable.builtin))
 
-((attribute_specifier
+(attribute_specifier
   (argument_list
     (call_expression
-      function: (identifier) @variable.builtin))))
+      function: (identifier) @variable.builtin)))
 
 ((call_expression
   function: (identifier) @function.builtin)
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index 82660f20f..0a85373f4 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -42,7 +42,7 @@
   condition: (_) @indent.begin)
 
 ; Supports if without braces (but not both if-else without braces)
-((if_statement
+(if_statement
   consequence:
     (_
       ";" @indent.end) @_consequence
@@ -55,7 +55,7 @@
           (compound_statement) @indent.dedent)? @indent.dedent
         (compound_statement)? @indent.dedent
         (_)? @indent.dedent
-      ])?) @indent.begin)
+      ])?) @indent.begin
 
 (else_clause
   (_
diff --git a/queries/cmake/indents.scm b/queries/cmake/indents.scm
index e7f326b00..cbd976c7a 100644
--- a/queries/cmake/indents.scm
+++ b/queries/cmake/indents.scm
@@ -19,8 +19,8 @@
   (endblock_command)
 ] @indent.branch
 
-(")" @indent.branch)
+")" @indent.branch
 
-(")" @indent.end)
+")" @indent.end
 
 (argument_list) @indent.auto
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 1c663735b..14dbdefc7 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -46,4 +46,4 @@
 ("text" @number
   (#lua-match? @number "^#[0-9]+$"))
 
-((uri) @string.special.url @nospell)
+(uri) @string.special.url @nospell
diff --git a/queries/cpon/highlights.scm b/queries/cpon/highlights.scm
index 15240d7ae..9cc438ea5 100644
--- a/queries/cpon/highlights.scm
+++ b/queries/cpon/highlights.scm
@@ -47,7 +47,7 @@
   ">"
 ] @punctuation.bracket
 
-(("\"" @string)
+("\"" @string
   (#set! conceal ""))
 
 ; Comments
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index cb8f9c3f3..883c26faa 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -16,8 +16,8 @@
   declarator: (_) @variable.parameter)
 
 ;(field_expression) @variable.parameter ;; How to highlight this?
-(((field_expression
-  (field_identifier) @function.method)) @_parent
+((field_expression
+  (field_identifier) @function.method) @_parent
   (#has-parent? @_parent template_method function_declarator))
 
 (field_declaration
diff --git a/queries/css/indents.scm b/queries/css/indents.scm
index 8385bfc82..75e4a63a9 100644
--- a/queries/css/indents.scm
+++ b/queries/css/indents.scm
@@ -4,8 +4,8 @@
 ] @indent.begin
 
 (block
-  ("}") @indent.branch)
+  "}" @indent.branch)
 
-("}") @indent.dedent
+"}" @indent.dedent
 
 (comment) @indent.ignore
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index be38a15ca..ada4d212c 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -123,7 +123,7 @@
 ((identifier) @type
   (#lua-match? @type "^_?[%u].*[%l]")) ; catch Classes or IClasses not CLASSES
 
-("Function" @type)
+"Function" @type
 
 ; properties
 (unconditional_assignable_selector
diff --git a/queries/doxygen/injections.scm b/queries/doxygen/injections.scm
index e0eff433a..994f535ad 100644
--- a/queries/doxygen/injections.scm
+++ b/queries/doxygen/injections.scm
@@ -10,6 +10,6 @@
 ((link) @injection.content
   (#set! injection.language "html"))
 
-((code_block
+(code_block
   (code_block_language) @injection.language
-  (code_block_content) @injection.content))
+  (code_block_content) @injection.content)
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index 12a2093d1..fb98391b3 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -65,11 +65,11 @@
   "NOTATION" @keyword.directive
   (Name) @label)
 
-((NotationDecl
+(NotationDecl
   (ExternalID
     (SystemLiteral
       (URI) @string.special.url))
-  (#set! "priority" 105)))
+  (#set! "priority" 105))
 
 ; Attlist declaration
 (AttlistDecl
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 8e62fd1f6..4156222cb 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -283,11 +283,11 @@
   "}"
 ] @punctuation.bracket
 
-((template_substitution
+(template_substitution
   [
     "${"
     "}"
-  ] @punctuation.special) @none)
+  ] @punctuation.special) @none
 
 ; Keywords
 ;----------
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 9421d8113..51eb22a7e 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -7,8 +7,7 @@
 
 ; html(`...`), html`...`, sql(...) etc
 (call_expression
-  function:
-    ((identifier) @injection.language)
+  function: (identifier) @injection.language
   arguments:
     [
       (arguments
diff --git a/queries/ecma/locals.scm b/queries/ecma/locals.scm
index 54da79335..24297940c 100644
--- a/queries/ecma/locals.scm
+++ b/queries/ecma/locals.scm
@@ -28,11 +28,11 @@
   (identifier) @local.definition.import)
 
 (function_declaration
-  ((identifier) @local.definition.function)
+  (identifier) @local.definition.function
   (#set! definition.var.scope parent))
 
 (method_definition
-  ((property_identifier) @local.definition.function)
+  (property_identifier) @local.definition.function
   (#set! definition.var.scope parent))
 
 ; References
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 4f1057f48..9b4555a6f 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -176,7 +176,7 @@
 ; Non-String Sigils
 (sigil
   "~" @string.special
-  ((sigil_name) @string.special) @_sigil_name
+  (sigil_name) @string.special @_sigil_name
   quoted_start: _ @string.special
   quoted_end: _ @string.special
   ((sigil_modifiers) @string.special)?
@@ -185,7 +185,7 @@
 ; String Sigils
 (sigil
   "~" @string
-  ((sigil_name) @string) @_sigil_name
+  (sigil_name) @string @_sigil_name
   quoted_start: _ @string
   (quoted_content) @string
   quoted_end: _ @string
@@ -217,7 +217,7 @@
           (charlist)
           (sigil
             "~" @comment.documentation
-            ((sigil_name) @comment.documentation)
+            (sigil_name) @comment.documentation
             quoted_start: _ @comment.documentation
             (quoted_content) @comment.documentation
             quoted_end: _ @comment.documentation)
diff --git a/queries/gdscript/locals.scm b/queries/gdscript/locals.scm
index 83a1b4433..796ec1876 100644
--- a/queries/gdscript/locals.scm
+++ b/queries/gdscript/locals.scm
@@ -105,8 +105,8 @@
   (#set! "definition.method.scope" "parent"))
 
 ; Enum
-((enum_definition
-  (name) @local.definition.enum))
+(enum_definition
+  (name) @local.definition.enum)
 
 ; Repeat
 (for_statement
diff --git a/queries/gitattributes/highlights.scm b/queries/gitattributes/highlights.scm
index bc2e02e88..aec7750f6 100644
--- a/queries/gitattributes/highlights.scm
+++ b/queries/gitattributes/highlights.scm
@@ -1,7 +1,7 @@
 (dir_sep) @punctuation.delimiter
 
 (quoted_pattern
-  ("\"" @punctuation.special))
+  "\"" @punctuation.special)
 
 (range_notation) @string.special
 
@@ -18,7 +18,7 @@
 (character_class) @constant
 
 (class_range
-  ("-" @operator))
+  "-" @operator)
 
 [
   (ansi_c_escape)
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 1a3cfd485..ce18f98a3 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -277,7 +277,7 @@
 (pat_view
   (exp_name
     [
-      ((variable) @function.call)
+      (variable) @function.call
       (qualified_variable
         (variable) @function.call)
     ]))
@@ -293,14 +293,14 @@
 ; partially applied infix functions (sections) also get highlighted as operators
 (exp_section_right
   [
-    ((variable) @operator)
+    (variable) @operator
     (qualified_variable
       (variable) @operator)
   ])
 
 (exp_section_left
   [
-    ((variable) @operator)
+    (variable) @operator
     (qualified_variable
       (variable) @operator)
   ])
@@ -310,7 +310,7 @@
 (exp_infix
   (exp_name
     [
-      ((variable) @function.call)
+      (variable) @function.call
       (qualified_variable
         ((module) @module
           (variable) @function.call))
@@ -328,7 +328,7 @@
   .
   (exp_name
     [
-      ((variable) @variable)
+      (variable) @variable
       (qualified_variable
         (variable) @variable)
     ]))
@@ -336,7 +336,7 @@
 ; function calls with infix operators
 ((exp_name
   [
-    ((variable) @function.call)
+    (variable) @function.call
     (qualified_variable
       (variable) @function.call)
   ])
@@ -353,7 +353,7 @@
   .
   (exp_name
     [
-      ((variable) @function.call)
+      (variable) @function.call
       (qualified_variable
         (variable) @function.call)
     ]))
@@ -364,7 +364,7 @@
 ; function composition, arrows, monadic composition (lhs)
 ((exp_name
   [
-    ((variable) @function)
+    (variable) @function
     (qualified_variable
       (variable) @function)
   ])
@@ -381,7 +381,7 @@
   .
   (exp_name
     [
-      ((variable) @function)
+      (variable) @function
       (qualified_variable
         (variable) @function)
     ]))
@@ -394,7 +394,7 @@
   .
   (exp_name
     [
-      ((variable) @function)
+      (variable) @function
       (qualified_variable
         (variable) @function)
     ])
@@ -415,7 +415,7 @@
 (exp_apply
   (exp_name
     [
-      ((variable) @function.call)
+      (variable) @function.call
       (qualified_variable
         (variable) @function.call)
     ]))
@@ -428,7 +428,7 @@
     (exp_infix
       (exp_name
         [
-          ((variable) @function.call)
+          (variable) @function.call
           (qualified_variable
             (variable) @function.call)
         ])
@@ -444,7 +444,7 @@
       .
       (exp_name
         [
-          ((variable) @function.call)
+          (variable) @function.call
           (qualified_variable
             (variable) @function.call)
         ]))))
@@ -455,7 +455,7 @@
   .
   (exp_name
     [
-      ((variable) @variable)
+      (variable) @variable
       (qualified_variable
         (variable) @variable)
     ]))
@@ -493,9 +493,9 @@
 
 ; signatures that have a function type
 ; + functions that follow them
-((signature
+(signature
   (variable) @function
-  (fun)))
+  (fun))
 
 ((signature
   (variable) @_type
@@ -505,10 +505,10 @@
     (variable) @function)
   (#eq? @function @_type))
 
-((signature
+(signature
   (variable) @function
   (context
-    (fun))))
+    (fun)))
 
 ((signature
   (variable) @_type
@@ -570,8 +570,8 @@
   (quasiquote_body) @string)
 
 (quasiquote
-  ((_
-    (variable) @_name))
+  (_
+    (variable) @_name)
   (#eq? @_name "qq")
   (quasiquote_body) @string)
 
@@ -613,7 +613,7 @@
 (exp_field
   field:
     [
-      ((variable) @variable.member)
+      (variable) @variable.member
       (qualified_variable
         (variable) @variable.member)
     ])
diff --git a/queries/haskell/injections.scm b/queries/haskell/injections.scm
index d1c8fe5fb..59fe73357 100644
--- a/queries/haskell/injections.scm
+++ b/queries/haskell/injections.scm
@@ -1,8 +1,8 @@
 ; -----------------------------------------------------------------------------
 ; General language injection
 (quasiquote
-  ((quoter) @injection.language)
-  ((quasiquote_body) @injection.content))
+  (quoter) @injection.language
+  (quasiquote_body) @injection.content)
 
 ((comment) @injection.content
   (#set! injection.language "comment"))
@@ -21,28 +21,28 @@
 (quasiquote
   (quoter) @_name
   (#any-of? @_name "cassius" "lucius")
-  ((quasiquote_body) @injection.content)
+  (quasiquote_body) @injection.content
   (#set! injection.language "css"))
 
 ; HTML: Text.Hamlet
 (quasiquote
   (quoter) @_name
   (#any-of? @_name "shamlet" "xshamlet" "hamlet" "xhamlet" "ihamlet")
-  ((quasiquote_body) @injection.content)
+  (quasiquote_body) @injection.content
   (#set! injection.language "html"))
 
 ; JS: Text.Julius
 (quasiquote
   (quoter) @_name
   (#any-of? @_name "js" "julius")
-  ((quasiquote_body) @injection.content)
+  (quasiquote_body) @injection.content
   (#set! injection.language "javascript"))
 
 ; TS: Text.TypeScript
 (quasiquote
   (quoter) @_name
   (#any-of? @_name "tsc" "tscJSX")
-  ((quasiquote_body) @injection.content)
+  (quasiquote_body) @injection.content
   (#set! injection.language "typescript"))
 
 ; -----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 (quasiquote
   (quoter) @_name
   (#eq? @_name "hsx")
-  ((quasiquote_body) @injection.content)
+  (quasiquote_body) @injection.content
   (#set! injection.language "html"))
 
 ; -----------------------------------------------------------------------------
@@ -58,7 +58,7 @@
 (quasiquote
   (quoter) @_name
   (#eq? @_name "aesonQQ")
-  ((quasiquote_body) @injection.content)
+  (quasiquote_body) @injection.content
   (#set! injection.language "json"))
 
 ; -----------------------------------------------------------------------------
@@ -67,10 +67,10 @@
 (quasiquote
   (quoter) @injection.language
   (#eq? @injection.language "sql")
-  ((quasiquote_body) @injection.content))
+  (quasiquote_body) @injection.content)
 
 (quasiquote
   (quoter) @_name
   (#any-of? @_name "persistUpperCase" "persistLowerCase" "persistWith")
-  ((quasiquote_body) @injection.content)
+  (quasiquote_body) @injection.content
   (#set! injection.language "haskell_persistent"))
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 945084693..7c9c835ef 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -35,11 +35,11 @@
 ; <script type="mimetype-or-well-known-script-type">
 (script_element
   (start_tag
-    ((attribute
+    (attribute
       (attribute_name) @_attr
       (#eq? @_attr "type")
       (quoted_attribute_value
-        (attribute_value) @_type))))
+        (attribute_value) @_type)))
   (raw_text) @injection.content
   (#set-lang-from-mimetype! @_type))
 
@@ -72,14 +72,14 @@
   (_
     (tag_name) @_tagname
     (#eq? @_tagname "input")
-    ((attribute
+    (attribute
       (attribute_name) @_attr
       [
         (quoted_attribute_value
           (attribute_value) @injection.content)
         (attribute_value) @injection.content
       ]
-      (#eq? @_attr "pattern")))
+      (#eq? @_attr "pattern"))
     (#set! injection.language "regex")))
 
 ; <input type="checkbox" onchange="this.closest('form').elements.output.value = this.checked">
@@ -101,7 +101,7 @@
   ((attribute_name) @_name
     (#lua-match? @_name "^%*"))
   (quoted_attribute_value
-    ((attribute_value) @injection.content))
+    (attribute_value) @injection.content)
   (#set! injection.language "angular"))
 
 (element
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index 8c8d82363..36c14db91 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -58,10 +58,10 @@
 ;     baz(y) { y }
 ;   }
 (method_definition
-  ([
+  [
     (property_identifier)
     (private_property_identifier)
-  ] @local.definition.function)
+  ] @local.definition.function
   (#set! definition.var.scope parent))
 
 ; this.foo()
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index d9a9a5f87..2fdcb9468 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -28,7 +28,7 @@
   "false"
 ] @boolean
 
-("null") @type.builtin
+"null" @type.builtin
 
 ; Interpolation
 [
diff --git a/queries/json/highlights.scm b/queries/json/highlights.scm
index ce5be98ae..85915285a 100644
--- a/queries/json/highlights.scm
+++ b/queries/json/highlights.scm
@@ -28,7 +28,7 @@
   "}"
 ] @punctuation.bracket
 
-(("\"" @conceal)
+("\"" @conceal
   (#set! conceal ""))
 
 (escape_sequence) @string.escape
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index d99ae62ec..7f7177f83 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -38,9 +38,9 @@
 
 ; Handle the dot operator effectively - <My.Component>
 (jsx_opening_element
-  ((member_expression
+  (member_expression
     (identifier) @tag
-    (property_identifier) @constructor)))
+    (property_identifier) @constructor))
 
 (jsx_closing_element
   ((identifier) @constructor
@@ -48,9 +48,9 @@
 
 ; Handle the dot operator effectively - </My.Component>
 (jsx_closing_element
-  ((member_expression
+  (member_expression
     (identifier) @tag
-    (property_identifier) @constructor)))
+    (property_identifier) @constructor))
 
 (jsx_self_closing_element
   ((identifier) @constructor
@@ -58,8 +58,8 @@
 
 ; Handle the dot operator effectively - <My.Component />
 (jsx_self_closing_element
-  ((member_expression
+  (member_expression
     (identifier) @tag
-    (property_identifier) @constructor)))
+    (property_identifier) @constructor))
 
 (jsx_text) @none
diff --git a/queries/jsx/indents.scm b/queries/jsx/indents.scm
index eed9afeba..812bc255d 100644
--- a/queries/jsx/indents.scm
+++ b/queries/jsx/indents.scm
@@ -5,7 +5,7 @@
 ] @indent.begin
 
 (jsx_closing_element
-  (">" @indent.end))
+  ">" @indent.end)
 
 (jsx_self_closing_element
   "/>" @indent.end)
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index b09cb75b9..e75a7e96f 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -92,22 +92,22 @@
   (simple_identifier) @function)
 
 (getter
-  ("get") @function.builtin)
+  "get" @function.builtin)
 
 (setter
-  ("set") @function.builtin)
+  "set" @function.builtin)
 
 (primary_constructor) @constructor
 
 (secondary_constructor
-  ("constructor") @constructor)
+  "constructor" @constructor)
 
 (constructor_invocation
   (user_type
     (type_identifier) @constructor))
 
 (anonymous_initializer
-  ("init") @constructor)
+  "init" @constructor)
 
 (parameter
   (simple_identifier) @variable.parameter)
@@ -182,7 +182,7 @@
 ;    - "[abc]?".toRegex()
 (call_expression
   (navigation_expression
-    ((string_literal) @string.regexp)
+    (string_literal) @string.regexp
     (navigation_suffix
       ((simple_identifier) @_function
         (#eq? @_function "toRegex")))))
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index 450e657b4..58d7efd4f 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -45,7 +45,7 @@
 
 (bare_symbol
   (macro
-    ((macro_id) @type.definition)))
+    (macro_id) @type.definition))
 
 (bare_symbol
   (identifier) @type.definition)
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 47c923ee6..f1a8c814f 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -193,7 +193,7 @@
   command: _ @module
   authors:
     (curly_group_author_list
-      ((author)+ @markup.heading.1)))
+      (author)+ @markup.heading.1))
 
 (chapter
   command: _ @module
diff --git a/queries/ledger/highlights.scm b/queries/ledger/highlights.scm
index cdf8f6bb9..5198ad888 100644
--- a/queries/ledger/highlights.scm
+++ b/queries/ledger/highlights.scm
@@ -25,7 +25,7 @@
   (check_out)
 ] @markup.raw
 
-((account) @variable.member)
+(account) @variable.member
 
 "include" @keyword.import
 
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index d868be072..0eb0f8b46 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -629,7 +629,7 @@
 
 ; NOTE: needs to be after @type
 ; generic types when declaring
-((generic_parameter_list
+(generic_parameter_list
   (parameter_declaration
     (symbol_declaration_list
       (symbol_declaration
@@ -638,7 +638,7 @@
             (identifier) @variable.parameter
             (accent_quoted
               (identifier) @variable.parameter)
-          ])))))
+          ]))))
 
 ; for loop variables
 (for
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 9318b11a7..4a50cd7c0 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -244,12 +244,12 @@
 
 (comment) @comment
 
-([
+[
   "=>"
   ","
   ";"
   "->"
-] @punctuation.delimiter)
+] @punctuation.delimiter
 
 ([
   "["
diff --git a/queries/php_only/injections.scm b/queries/php_only/injections.scm
index 70f693853..828eb9d38 100644
--- a/queries/php_only/injections.scm
+++ b/queries/php_only/injections.scm
@@ -1,17 +1,17 @@
 ((comment) @injection.content
   (#set! injection.language "phpdoc"))
 
-((heredoc
+(heredoc
   (heredoc_body) @injection.content
   (heredoc_end) @injection.language
   (#set! injection.include-children)
-  (#downcase! @injection.language)))
+  (#downcase! @injection.language))
 
-((nowdoc
+(nowdoc
   (nowdoc_body) @injection.content
   (heredoc_end) @injection.language
   (#set! injection.include-children)
-  (#downcase! @injection.language)))
+  (#downcase! @injection.language))
 
 ; regex
 ((function_call_expression
diff --git a/queries/python/locals.scm b/queries/python/locals.scm
index 80b4021c1..e0454dbf4 100644
--- a/queries/python/locals.scm
+++ b/queries/python/locals.scm
@@ -24,12 +24,12 @@
 (import_statement
   name:
     (dotted_name
-      ((identifier) @local.definition.import)))
+      (identifier) @local.definition.import))
 
 (import_from_statement
   name:
     (dotted_name
-      ((identifier) @local.definition.import)))
+      (identifier) @local.definition.import))
 
 ; Function with parameters, defines parameters
 (parameters
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index cbb87f033..1ce166ee0 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -24,9 +24,9 @@
   (identifier) @variable.builtin)
   (#eq? @variable.builtin "self"))
 
-((dollar
+(dollar
   _
-  (identifier) @variable.member))
+  (identifier) @variable.member)
 
 ; Parameters
 (formal_parameters
@@ -158,6 +158,6 @@
 
 (call
   function:
-    ((dollar
+    (dollar
       _
-      (identifier) @function.method.call)))
+      (identifier) @function.method.call))
diff --git a/queries/r/indents.scm b/queries/r/indents.scm
index 742b645e2..ec76272aa 100644
--- a/queries/r/indents.scm
+++ b/queries/r/indents.scm
@@ -12,8 +12,8 @@
   "for"
 ] @indent.begin
 
-((binary
-  operator: (special)) @indent.begin)
+(binary
+  operator: (special)) @indent.begin
 
 [
   "}"
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index d3d3bf512..5c96dbc24 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -19,8 +19,7 @@
   (#set! injection.language "comment"))
 
 ((macro_invocation
-  macro:
-    ((identifier) @injection.language)
+  macro: (identifier) @injection.language
   (token_tree) @injection.content)
   (#any-of? @injection.language "html" "json"))
 
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 711cd36a0..032863c08 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -60,8 +60,8 @@
 (import_declaration
   path: (identifier) @module)
 
-((stable_identifier
-  (identifier) @module))
+(stable_identifier
+  (identifier) @module)
 
 ((import_declaration
   path: (identifier) @type)
@@ -74,8 +74,8 @@
 (export_declaration
   path: (identifier) @module)
 
-((stable_identifier
-  (identifier) @module))
+(stable_identifier
+  (identifier) @module)
 
 ((export_declaration
   path: (identifier) @type)
@@ -274,7 +274,7 @@
 ; `case` is a conditional keyword in case_block
 (case_block
   (case_clause
-    ("case") @keyword.conditional))
+    "case" @keyword.conditional))
 
 (operator_identifier) @operator
 
diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index ec205c4e1..0ba019cf8 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -15,8 +15,7 @@
   name: (identifier) @local.definition.function)
 
 (function_definition
-  name:
-    ((identifier) @local.definition.function)
+  name: (identifier) @local.definition.function
   (#set! definition.var.scope parent))
 
 (parameter
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 6c3530ae0..7ffa99edc 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -24,11 +24,11 @@
 (term
   alias: (identifier) @variable)
 
-((term
+(term
   value:
     (cast
       name: (keyword_cast) @function.call
-      parameter: (literal)?)))
+      parameter: (literal)?))
 
 (literal) @string
 
diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index 3204af3f3..264e9aaef 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -35,8 +35,8 @@
 ] @indent.begin
 
 ; @something(...)
-((modifiers
-  (attribute) @indent.begin))
+(modifiers
+  (attribute) @indent.begin)
 
 (function_declaration
   (modifiers
diff --git a/queries/teal/locals.scm b/queries/teal/locals.scm
index 25b56418f..d3a81f122 100644
--- a/queries/teal/locals.scm
+++ b/queries/teal/locals.scm
@@ -15,8 +15,8 @@
 
 (anon_function) @local.scope
 
-((function_statement
-  (function_name) @local.definition.function) @local.scope)
+(function_statement
+  (function_name) @local.definition.function) @local.scope
 
 (program) @local.scope
 
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index c98e63f6b..34c643310 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -96,10 +96,10 @@
 "await" @keyword.coroutine
 
 (pcal_with
-  ("=") @keyword)
+  "=" @keyword)
 
 (pcal_process
-  ("=") @keyword)
+  "=" @keyword)
 
 [
   "if"
@@ -119,9 +119,9 @@
   (pcal_end_with)
 ] @keyword.repeat
 
-("return") @keyword.return
+"return" @keyword.return
 
-("print") @function.macro
+"print" @function.macro
 
 ; Literals
 (binary_number
@@ -188,11 +188,11 @@
 (bound_prefix_op
   symbol: (_) @operator)
 
-((prefix_op_symbol) @operator)
+(prefix_op_symbol) @operator
 
-((infix_op_symbol) @operator)
+(infix_op_symbol) @operator
 
-((postfix_op_symbol) @operator)
+(postfix_op_symbol) @operator
 
 (function_definition
   name: (identifier) @function)
@@ -236,7 +236,7 @@
 (pcal_with
   (identifier) @variable.parameter)
 
-((".")
+("."
   .
   (identifier) @attribute)
 
diff --git a/queries/tlaplus/locals.scm b/queries/tlaplus/locals.scm
index 26d36140e..e30f9ec41 100644
--- a/queries/tlaplus/locals.scm
+++ b/queries/tlaplus/locals.scm
@@ -150,17 +150,17 @@
 ; References
 (identifier_ref) @local.reference
 
-((prefix_op_symbol) @local.reference)
+(prefix_op_symbol) @local.reference
 
 (bound_prefix_op
   symbol: (_) @local.reference)
 
-((infix_op_symbol) @local.reference)
+(infix_op_symbol) @local.reference
 
 (bound_infix_op
   symbol: (_) @local.reference)
 
-((postfix_op_symbol) @local.reference)
+(postfix_op_symbol) @local.reference
 
 (bound_postfix_op
   symbol: (_) @local.reference)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 4cfca6d81..3cc9b7f13 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -50,8 +50,8 @@
   "type"
   (import_clause
     (named_imports
-      ((import_specifier
-        name: (identifier) @type)))))
+      (import_specifier
+        name: (identifier) @type))))
 
 (template_literal_type) @string
 
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
index 894d1613d..e6f5e322c 100644
--- a/queries/usd/highlights.scm
+++ b/queries/usd/highlights.scm
@@ -183,9 +183,9 @@
     "instanceable"))
 
 ; Common attribute metadata
-((layer_offset
+(layer_offset
   (identifier) @keyword
-  (#any-of? @keyword "offset" "scale")))
+  (#any-of? @keyword "offset" "scale"))
 
 ; Docstrings in USD
 (metadata
diff --git a/queries/v/locals.scm b/queries/v/locals.scm
index 524483b8e..ba271e04d 100644
--- a/queries/v/locals.scm
+++ b/queries/v/locals.scm
@@ -1,5 +1,5 @@
-((function_declaration
-  name: (identifier) @local.definition.function)) ;@function
+(function_declaration
+  name: (identifier) @local.definition.function) ;@function
 
 (var_declaration
   var_list:
@@ -7,8 +7,8 @@
       (reference_expression
         (identifier) @local.definition.var)))
 
-((function_declaration
-  name: (identifier) @local.definition.function))
+(function_declaration
+  name: (identifier) @local.definition.function)
 
 (const_declaration
   (const_definition
diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index 2fbf22c92..6d3b8350b 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -12,7 +12,7 @@
 
 ; TODO: When nvim-treesitter has postcss and less parsers, use @injection.language and @injection.content instead
 ; <script lang="scss">
-((style_element
+(style_element
   (start_tag
     (attribute
       (attribute_name) @_lang
@@ -21,7 +21,7 @@
   (raw_text) @injection.content
   (#eq? @_lang "lang")
   (#any-of? @_scss "less" "postcss")
-  (#set! injection.language "scss")))
+  (#set! injection.language "scss"))
 
 ; <script lang="js">
 ((script_element
@@ -49,7 +49,7 @@
 
 ; <script lang="tsx">
 ; <script lang="jsx">
-((script_element
+(script_element
   (start_tag
     (attribute
       (attribute_name) @_attr
@@ -57,7 +57,7 @@
         (attribute_value) @injection.language)))
   (#eq? @_attr "lang")
   (#any-of? @injection.language "tsx" "jsx")
-  (raw_text) @injection.content))
+  (raw_text) @injection.content)
 
 ((interpolation
   (raw_text) @injection.content)
diff --git a/queries/wgsl_bevy/highlights.scm b/queries/wgsl_bevy/highlights.scm
index 9cd796c72..650006f18 100644
--- a/queries/wgsl_bevy/highlights.scm
+++ b/queries/wgsl_bevy/highlights.scm
@@ -14,7 +14,7 @@
 
 (function_declaration
   (import_path
-    ((identifier) @function.)))
+    (identifier) @function.))
 
 (import_path
   (identifier) @module
diff --git a/queries/zig/folds.scm b/queries/zig/folds.scm
index 1d65a5280..6953091be 100644
--- a/queries/zig/folds.scm
+++ b/queries/zig/folds.scm
@@ -6,9 +6,9 @@
   (AsmExpr)
   (ErrorSetDecl)
   (LINESTRING)
-  ([
+  [
     (IfPrefix)
     (WhilePrefix)
     (ForPrefix)
-  ])
+  ]
 ] @fold

From e0420e73c9cf4a9fe49d576be313718831a3822d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Mon, 22 Jan 2024 00:42:28 +0900
Subject: [PATCH 1025/2704] fix(wgsl_bevy): Correct formatter mistake

Old version of `format-queries` incorrectly took away a space, creating
a wrong capture.

This is a fixup for that.
---
 queries/wgsl_bevy/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/wgsl_bevy/highlights.scm b/queries/wgsl_bevy/highlights.scm
index 650006f18..2a6a9740c 100644
--- a/queries/wgsl_bevy/highlights.scm
+++ b/queries/wgsl_bevy/highlights.scm
@@ -14,7 +14,7 @@
 
 (function_declaration
   (import_path
-    (identifier) @function.))
+    (identifier) @function .))
 
 (import_path
   (identifier) @module

From 94bd4bcc5bbce8334303727627b628ece72e798d Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Mon, 22 Jan 2024 01:42:30 +0800
Subject: [PATCH 1026/2704] feat: add the zathurarc parser (#5948)

---
 README.md                        |  1 +
 lockfile.json                    |  3 +++
 lua/nvim-treesitter/parsers.lua  |  8 +++++++
 queries/zathurarc/highlights.scm | 36 ++++++++++++++++++++++++++++++++
 queries/zathurarc/injections.scm |  9 ++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 queries/zathurarc/highlights.scm
 create mode 100644 queries/zathurarc/injections.scm

diff --git a/README.md b/README.md
index 1cb65a6cf..690d42cbe 100644
--- a/README.md
+++ b/README.md
@@ -421,6 +421,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)
+- [x] [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) (maintained by @Freed-Wu)
 - [x] [zig](https://github.com/maxxnino/tree-sitter-zig) (maintained by @maxxnino)
 <!--parserinfo-->
 
diff --git a/lockfile.json b/lockfile.json
index 757ae4ae2..9c36b4ce8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -743,6 +743,9 @@
   "yuck": {
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
+  "zathurarc": {
+    "revision": "0086e9ee0bc306276964ae088957b77935b846fd"
+  },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
   }
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7a945e11e..05a76bd0e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2167,6 +2167,14 @@ list.yuck = {
   maintainers = { "@Philipp-M", "@amaanq" },
 }
 
+list.zathurarc = {
+  install_info = {
+    url = "https://github.com/Freed-Wu/tree-sitter-zathurarc",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Freed-Wu" },
+}
+
 list.zig = {
   install_info = {
     url = "https://github.com/maxxnino/tree-sitter-zig",
diff --git a/queries/zathurarc/highlights.scm b/queries/zathurarc/highlights.scm
new file mode 100644
index 000000000..04daa190a
--- /dev/null
+++ b/queries/zathurarc/highlights.scm
@@ -0,0 +1,36 @@
+; General
+(path) @string.special.path
+
+(option) @variable.builtin
+
+(command) @keyword
+
+(include_directive
+  (command) @keyword.import)
+
+(mode_name) @type.builtin
+
+(key) @constant
+
+(function) @function.call
+
+(argument) @variable.parameter
+
+; Comments
+(comment) @comment @spell
+
+; Literals
+(int) @number
+
+(float) @number.float
+
+(string) @string
+
+(bool) @boolean
+
+[
+  "<"
+  ">"
+  "["
+  "]"
+] @punctuation.bracket
diff --git a/queries/zathurarc/injections.scm b/queries/zathurarc/injections.scm
new file mode 100644
index 000000000..8e45396b7
--- /dev/null
+++ b/queries/zathurarc/injections.scm
@@ -0,0 +1,9 @@
+(set_directive
+  (option) @_option
+  (string) @injection.content
+  (#eq? @_option "synctex-editor-command")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "bash"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 97997c928bb038457f49343ffa5304d931545584 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Mon, 22 Jan 2024 06:39:26 +0000
Subject: [PATCH 1027/2704] Update parsers: phpdoc, templ, wing, zathurarc

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9c36b4ce8..d5b2e8340 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -450,7 +450,7 @@
     "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
   },
   "phpdoc": {
-    "revision": "915a527d5aafa81b31acf67fab31b0ac6b6319c0"
+    "revision": "eb9ef97a1a9a6489d003a45a36a9edbcc8177087"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
@@ -642,7 +642,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "d7d19f10e50c41bce569ffef8b2ff38452594016"
+    "revision": "a3ef3d8e73515b196d30adf9ee5115f057f7a2c6"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -726,7 +726,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "7c4c3551206f737bc4bfb51fbcc2344311984203"
+    "revision": "e18f14eaf817cba0d2f782ed4a2d51273faf1d44"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
@@ -744,7 +744,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "0086e9ee0bc306276964ae088957b77935b846fd"
+    "revision": "b47016df5688ef91ad4532138b6210c7944d6483"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From cd4e0909948eb33d3959e133c16f837e4db122c6 Mon Sep 17 00:00:00 2001
From: James Trew <j.trew10@gmail.com>
Date: Mon, 22 Jan 2024 10:12:14 -0500
Subject: [PATCH 1028/2704] fix(locals): index matches with split capture names

---
 lua/nvim-treesitter/locals.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index ab0f89fc1..650d2fa3b 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -41,8 +41,8 @@ function M.get_definitions(bufnr)
   local defs = {}
 
   for _, loc in ipairs(locals) do
-    if loc["local.definition"] then
-      table.insert(defs, loc["local.definition"])
+    if loc["local"]["definition"] then
+      table.insert(defs, loc["local"]["definition"])
     end
   end
 
@@ -55,8 +55,8 @@ function M.get_scopes(bufnr)
   local scopes = {}
 
   for _, loc in ipairs(locals) do
-    if loc["local.scope"] and loc["local.scope"].node then
-      table.insert(scopes, loc["local.scope"].node)
+    if loc["local"]["scope"] and loc["local"]["scope"].node then
+      table.insert(scopes, loc["local"]["scope"].node)
     end
   end
 
@@ -69,8 +69,8 @@ function M.get_references(bufnr)
   local refs = {}
 
   for _, loc in ipairs(locals) do
-    if loc["local.reference"] and loc["local.reference"].node then
-      table.insert(refs, loc["local.reference"].node)
+    if loc["local"]["reference"] and loc["local"]["reference"].node then
+      table.insert(refs, loc["local"]["reference"].node)
     end
   end
 

From ab2346439333653b31672daa0b7d29184ff4493b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Tue, 23 Jan 2024 06:37:37 +0000
Subject: [PATCH 1029/2704] Update parsers: c, html, luadoc, php, php_only,
 rust, swift, wing

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d5b2e8340..d0f3d191a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -45,7 +45,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "212a80f86452bb1316324fa0db730cf52f29e05a"
+    "revision": "34f4c7e751f4d661be3e23682fe2631d6615141d"
   },
   "c_sharp": {
     "revision": "dd5e59721a5f8dae34604060833902b882023aaf"
@@ -267,7 +267,7 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "d742025fa2d8e6100f134a6ea990443aa1f074b3"
+    "revision": "949b78051835564bca937565241e5e337d838502"
   },
   "htmldjango": {
     "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
@@ -351,7 +351,7 @@
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
   "luadoc": {
-    "revision": "990926b13488a4bc0fc0804fc0f8400b5b0a1fb4"
+    "revision": "6ebdac83b4789069c4939713efae7176cc3126de"
   },
   "luap": {
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
@@ -444,10 +444,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
+    "revision": "e3002a11a72773bbaf3bab0e59fb64e6992b79ab"
   },
   "php_only": {
-    "revision": "b569a5f2c0d592e67430520d1a0e1f765d83ceb0"
+    "revision": "e3002a11a72773bbaf3bab0e59fb64e6992b79ab"
   },
   "phpdoc": {
     "revision": "eb9ef97a1a9a6489d003a45a36a9edbcc8177087"
@@ -555,7 +555,7 @@
     "revision": "4d9ad3f010fdc47a8433adcf9ae30c8eb8475ae7"
   },
   "rust": {
-    "revision": "79456e6080f50fc1ca7c21845794308fa5d35a51"
+    "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"
   },
   "scala": {
     "revision": "45b5ba0e749a8477a8fd2666f082f352859bdc3c"
@@ -624,7 +624,7 @@
     "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
   },
   "swift": {
-    "revision": "f1a48a33a7ceaf8817f7a340ea4ef1b549ffa176"
+    "revision": "1c586339fb00014b23d6933f2cc32b588a226f3b"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -726,7 +726,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "e18f14eaf817cba0d2f782ed4a2d51273faf1d44"
+    "revision": "fcef888d09f5064a16e3648d48bd628726c766d3"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 177a775fd8b2a9de97011a43f13c74ad8d3739c8 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 21 Jan 2024 19:40:30 -0800
Subject: [PATCH 1030/2704] feat(git_config): shell command alias injections

---
 queries/git_config/injections.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/queries/git_config/injections.scm b/queries/git_config/injections.scm
index 58330dcac..dcccb21ba 100644
--- a/queries/git_config/injections.scm
+++ b/queries/git_config/injections.scm
@@ -6,3 +6,26 @@
   value: (string) @injection.content)
   (#any-of? @_name "cmd" "command" "textconv")
   (#set! injection.language "bash"))
+
+(section
+  (section_header
+    (section_name) @_alias)
+  (variable
+    value: (string) @injection.content)
+  (#eq? @_alias "alias")
+  (#lua-match? @injection.content "^!")
+  (#offset! @injection.content 0 1 0 0)
+  (#set! injection.language "bash"))
+
+(section
+  (section_header
+    (section_name) @_alias)
+  (variable
+    value:
+      (string
+        "\""
+        "\"") @injection.content)
+  (#eq? @_alias "alias")
+  (#lua-match? @injection.content "^\"!")
+  (#offset! @injection.content 0 2 0 -1)
+  (#set! injection.language "bash"))

From 41128a7724ec40a33ce01b133aec1e9928ca4312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Wed, 24 Jan 2024 12:11:12 +0900
Subject: [PATCH 1031/2704] fix(rust): Follow upstream injections

tree-sitter-rust and helix both have `injection.include-children` for
the pattern in this PR. So it's best to changed to match the intended
results
---
 queries/rust/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index 5c96dbc24..1537568c1 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -1,6 +1,7 @@
 (macro_invocation
   (token_tree) @injection.content
-  (#set! injection.language "rust"))
+  (#set! injection.language "rust")
+  (#set! injection.include-children))
 
 (macro_definition
   (macro_rule

From 37c808b8ce544ca6a89399abfd1fa65a675c9d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Boczar?= <yendreij@gmail.com>
Date: Wed, 24 Jan 2024 05:33:52 +0100
Subject: [PATCH 1032/2704] fix(devicetree): Adapt to upstream node changes
 (#5961)

---
 lockfile.json                     | 2 +-
 queries/devicetree/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d0f3d191a..d9739a329 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "f71e310a93010863f4b17a2a501ea8e2032c345b"
   },
   "devicetree": {
-    "revision": "53b4137bd37e726116ea918139767f982a1584d8"
+    "revision": "6b53bfdb20a54727bfe344aa40907351a298f75c"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
diff --git a/queries/devicetree/highlights.scm b/queries/devicetree/highlights.scm
index a81cf2c89..74ec89af1 100644
--- a/queries/devicetree/highlights.scm
+++ b/queries/devicetree/highlights.scm
@@ -30,8 +30,8 @@
 (property
   (identifier) @property)
 
-(labeled_item
-  (identifier) @label)
+(node
+  label: (_) @label)
 
 (call_expression
   (identifier) @function.macro)

From 55562407b69c36c3a429c12bc1d6da231f700cfb Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 24 Jan 2024 01:07:22 -0500
Subject: [PATCH 1033/2704] chore(python): update member lua pattern

---
 queries/python/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 764521c7b..329df4f14 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -387,7 +387,7 @@
       (expression_statement
         (assignment
           left: (identifier) @variable.member))))
-  (#lua-match? @variable.member "^%l.*$"))
+  (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition
   body:
@@ -397,7 +397,7 @@
           left:
             (_
               (identifier) @variable.member)))))
-  (#lua-match? @variable.member "^%l.*$"))
+  (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition
   (block

From 527eb602ff11ec64c4c658f94d4ee4f0240753e1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 24 Jan 2024 01:16:04 -0500
Subject: [PATCH 1034/2704] chore(rust): update highlights

---
 queries/rust/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 2928271a3..c651f34fa 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -2,6 +2,8 @@
 ; Copyright (c) 2017 Maxim Sokolov
 ; Licensed under the MIT license.
 ; Identifier conventions
+(shebang) @keyword.directive
+
 (identifier) @variable
 
 ((identifier) @type
@@ -277,6 +279,8 @@
   "await"
 ] @keyword.coroutine
 
+"try" @keyword.exception
+
 [
   "ref"
   (mutable_specifier)
@@ -364,6 +368,7 @@
   "-="
   ".."
   "..="
+  "..."
   "/"
   "/="
   "<"

From a938e98cb4c0b715799ad2b964f6fa39fc315020 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 24 Jan 2024 01:05:42 -0500
Subject: [PATCH 1035/2704] chore(luadoc): update parser & highlights

---
 lockfile.json                 |  2 +-
 queries/luadoc/highlights.scm | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d9739a329..fcc542404 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -351,7 +351,7 @@
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
   "luadoc": {
-    "revision": "6ebdac83b4789069c4939713efae7176cc3126de"
+    "revision": "d82b43018a6b22d70b264ed8713be1c4daf9b0e0"
   },
   "luap": {
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
index a73fefd27..324906eb8 100644
--- a/queries/luadoc/highlights.scm
+++ b/queries/luadoc/highlights.scm
@@ -13,6 +13,7 @@
   "@generic"
   "@vararg"
   "@diagnostic"
+  "@cast"
   "@deprecated"
   "@meta"
   "@source"
@@ -24,6 +25,7 @@
   "@enum"
   "@language"
   "@see"
+  "@as"
   "extends"
   (diagnostic_identifier)
 ] @keyword
@@ -54,9 +56,12 @@
   "public"
   "protected"
   "private"
+  "package"
   "@public"
   "@protected"
   "@private"
+  "(exact)"
+  "(key)"
 ] @type.qualifier
 
 ; Variables
@@ -93,6 +98,12 @@
   .
   (identifier) @variable.member)
 
+(member_type
+  (identifier) @module)
+
+(member_type
+  (identifier) @type .)
+
 ; Types
 (table_type
   "table" @type.builtin)
@@ -115,19 +126,35 @@
 (type) @type
 
 ; Operators
-"|" @operator
+[
+  "|"
+  "+"
+  "-"
+] @operator
 
 ; Literals
-(string) @module ; only used in @module
+[
+  (string)
+  (literal_type)
+  "`"
+] @string
 
-(literal_type) @string
+(module_annotation
+  (string) @module)
 
-(number) @number
+[
+  (number)
+  (numeric_literal_type)
+] @number
 
 ; Punctuation
 [
   "["
   "]"
+  "[["
+  "]]"
+  "[=["
+  "]=]"
 ] @punctuation.bracket
 
 [

From ae7ceaadad86694f4a553ed63703acd6b3e7063d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 24 Jan 2024 01:11:16 -0500
Subject: [PATCH 1036/2704] chore(c_sharp): highlight tweaks

---
 queries/c_sharp/highlights.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 3671dc258..73205c31d 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -4,6 +4,9 @@
   (#eq? @keyword "value")
   (#has-ancestor? @keyword accessor_declaration))
 
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "_"))
+
 (method_declaration
   name: (identifier) @function.method)
 
@@ -21,6 +24,9 @@
 
 (interpolation) @none
 
+(member_access_expression
+  name: (identifier) @variable.member)
+
 (invocation_expression
   (member_access_expression
     name: (identifier) @function.method.call))
@@ -41,6 +47,14 @@
 (qualified_name
   (identifier) @type)
 
+(namespace_declaration
+  name:
+    [
+      (qualified_name
+        (identifier) @module)
+      (identifier) @module
+    ])
+
 (invocation_expression
   (identifier) @function.method.call)
 
@@ -57,6 +71,10 @@
   (parameter
     name: (identifier) @variable.parameter))
 
+(implicit_parameter_list
+  (parameter
+    name: (identifier) @variable.parameter))
+
 (parameter_list
   (parameter
     type: (identifier) @type))
@@ -349,6 +367,7 @@
 [
   (this_expression)
   (base_expression)
+  "this"
 ] @variable.builtin
 
 [

From 023a8ee9a2e3fcb134f0155d9390e068e85bb4f4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 24 Jan 2024 10:27:03 +0100
Subject: [PATCH 1037/2704] ci: bump cache to v4

---
 .github/workflows/test-queries.yml | 2 +-
 .github/workflows/tests.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 768bab089..cd1d4c5f3 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -69,7 +69,7 @@ jobs:
 
       - name: Setup Parsers Cache
         id: parsers-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ./parser/
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3beda4631..d7c98556f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -49,7 +49,7 @@ jobs:
 
       - name: Setup Parsers Cache
         id: parsers-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ./parser/

From f72d9169f26e06d31fec2eafd054e19ea629c256 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 21 Jan 2024 20:52:06 -0800
Subject: [PATCH 1038/2704] fix(latex): better environment precedence

---
 queries/latex/highlights.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index f1a8c814f..78debda96 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -156,6 +156,12 @@
     (curly_group_text
       (_) @markup.link))
 
+; Formatting
+(text_mode
+  content:
+    (curly_group
+      (_) @none @spell))
+
 ; Math
 [
   (displayed_equation)
@@ -167,17 +173,17 @@
     command: _ @markup.math
     name:
       (curly_group_text
-        (text) @markup.math)))
+        (_) @markup.math)))
 
 (math_environment
-  (text) @markup.math)
+  (_) @markup.math)
 
 (math_environment
   (end
     command: _ @markup.math
     name:
       (curly_group_text
-        (text) @markup.math)))
+        (_) @markup.math)))
 
 ; Sectioning
 (title_declaration
@@ -276,12 +282,6 @@
       (text) @markup.heading))
   (#eq? @_name "\\frametitle"))
 
-; Formatting
-(text_mode
-  content:
-    (curly_group
-      (_) @none @spell))
-
 ((generic_command
   command: (command_name) @_name
   arg:

From c62874656ea88d00a01a1f1840152c42321cb9d1 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 21 Jan 2024 20:53:24 -0800
Subject: [PATCH 1039/2704] feat(latex): operator highlights for _ and ^

---
 queries/latex/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 78debda96..aad68e4f7 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -28,6 +28,8 @@
 [
   (operator)
   "="
+  "_"
+  "^"
 ] @operator
 
 "\\item" @punctuation.special

From aa0c60ca5a18e5d62ea467947303d6894550de4a Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 20 Jan 2024 16:13:57 +0200
Subject: [PATCH 1040/2704] fix(highlights): clean up tag highlights

---
 queries/cooklang/highlights.scm       | 18 +++++++++---------
 queries/godot_resource/highlights.scm |  3 ---
 queries/thrift/highlights.scm         |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/queries/cooklang/highlights.scm b/queries/cooklang/highlights.scm
index cd4eedade..ca870dd47 100644
--- a/queries/cooklang/highlights.scm
+++ b/queries/cooklang/highlights.scm
@@ -1,22 +1,22 @@
 (metadata) @comment
 
 (ingredient
-  "@" @tag
-  (name)? @markup.heading
+  "@" @punctuation.delimiter
+  (name)? @string.special.symbol
   (amount
     (quantity)? @number
-    (units)? @tag.attribute)?)
+    (units)? @constant)?)
 
 (timer
-  "~" @tag
-  (name)? @markup.heading
+  "~" @punctuation.delimiter
+  (name)? @string.special.symbol
   (amount
     (quantity)? @number
-    (units)? @tag.attribute)?)
+    (units)? @constant)?)
 
 (cookware
-  "#" @tag
-  (name)? @markup.heading
+  "#" @punctuation.delimiter
+  (name)? @string.special.symbol
   (amount
     (quantity)? @number
-    (units)? @tag.attribute)?)
+    (units)? @constant)?)
diff --git a/queries/godot_resource/highlights.scm b/queries/godot_resource/highlights.scm
index fbe297839..764818234 100644
--- a/queries/godot_resource/highlights.scm
+++ b/queries/godot_resource/highlights.scm
@@ -22,9 +22,6 @@
 [
   "["
   "]"
-] @tag.delimiter
-
-[
   "("
   ")"
   "{"
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 984e702e4..3df9b5b80 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -88,7 +88,7 @@
 
 ; Namespace
 (namespace_declaration
-  (namespace_scope) @tag
+  (namespace_scope) @string.special
   [
     (namespace) @module
     (_

From d23192fb175b39aecf5eadb964d38432fea83dbe Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 20 Jan 2024 18:17:24 +0200
Subject: [PATCH 1041/2704] fix(godot_resource): improve highlights

And add a comment injection
---
 queries/godot_resource/highlights.scm | 30 +++++++++++++++++++++------
 queries/godot_resource/injections.scm |  2 ++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 queries/godot_resource/injections.scm

diff --git a/queries/godot_resource/highlights.scm b/queries/godot_resource/highlights.scm
index 764818234..15cbadd10 100644
--- a/queries/godot_resource/highlights.scm
+++ b/queries/godot_resource/highlights.scm
@@ -1,7 +1,16 @@
-(identifier) @type.builtin
+(identifier) @variable
+
+(section
+  (identifier) @tag)
+
+(section
+  [
+    "["
+    "]"
+  ] @tag.delimiter)
 
 (attribute
-  (identifier) @property)
+  (identifier) @tag.attribute)
 
 (property
   (path) @property)
@@ -15,13 +24,20 @@
 
 (float) @number.float
 
-(true) @constant.builtin
+[
+  (true)
+  (false)
+] @boolean
 
-(false) @constant.builtin
+(null) @constant.builtin
+
+(array
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
 
 [
-  "["
-  "]"
   "("
   ")"
   "{"
@@ -29,3 +45,5 @@
 ] @punctuation.bracket
 
 "=" @operator
+
+(comment) @comment @spell
diff --git a/queries/godot_resource/injections.scm b/queries/godot_resource/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/godot_resource/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 81660800352ecab6a2e95f4ca30d637df1f3765e Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sun, 21 Jan 2024 12:57:34 +0200
Subject: [PATCH 1042/2704] feat(yuck): add missing injections

And builtin variable highlights
---
 queries/yuck/highlights.scm | 21 +++++++++++----------
 queries/yuck/injections.scm | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/queries/yuck/highlights.scm b/queries/yuck/highlights.scm
index bd414b8e7..2d5d01c0b 100644
--- a/queries/yuck/highlights.scm
+++ b/queries/yuck/highlights.scm
@@ -6,16 +6,14 @@
 ; Includes
 (list
   .
-  ((symbol) @keyword.import
-    (#eq? @keyword.import "include")))
+  (symbol) @keyword.import
+  (#eq? @keyword.import "include"))
 
 ; Keywords
-; I think there's a bug in tree-sitter the anchor doesn't seem to be working, see
-; https://github.com/tree-sitter/tree-sitter/pull/2107
 (list
   .
-  ((symbol) @keyword
-    (#any-of? @keyword "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "geometry" "children" "struts")))
+  (symbol) @keyword
+  (#any-of? @keyword "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "geometry" "children" "struts"))
 
 ; Loop
 (loop_widget
@@ -39,8 +37,8 @@
 ; Builtin widgets
 (list
   .
-  ((symbol) @tag.builtin
-    (#any-of? @tag.builtin "box" "button" "calendar" "centerbox" "checkbox" "circular-progress" "color-button" "color-chooser" "combo-box-text" "eventbox" "expander" "graph" "image" "input" "label" "literal" "overlay" "progress" "revealer" "scale" "scroll" "transform")))
+  (symbol) @tag.builtin
+  (#any-of? @tag.builtin "box" "button" "calendar" "centerbox" "checkbox" "circular-progress" "color-button" "color-chooser" "combo-box-text" "eventbox" "expander" "graph" "image" "input" "label" "literal" "overlay" "progress" "revealer" "scale" "scroll" "transform"))
 
 ; Variables
 (ident) @variable
@@ -48,7 +46,10 @@
 (array
   (symbol) @variable)
 
-; Properties & Fields
+((ident) @variable.builtin
+  (#any-of? @variable.builtin "EWW_TEMPS" "EWW_RAM" "EWW_DISK" "EWW_BATTERY" "EWW_CPU" "EWW_NET" "EWW_TIME" "EWW_CONFIG_DIR" "EWW_CMD" "EWW_EXECUTABLE"))
+
+; Properties
 (keyword) @property
 
 (json_access
@@ -72,7 +73,7 @@
 
 (json_object
   (simplexpr
-    (ident) @variable.member))
+    (ident) @property))
 
 ; Functions
 (function_call
diff --git a/queries/yuck/injections.scm b/queries/yuck/injections.scm
index 2f0e58eb6..298a8d070 100644
--- a/queries/yuck/injections.scm
+++ b/queries/yuck/injections.scm
@@ -1,2 +1,26 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((function_call
+  name: (ident) @_name
+  .
+  (simplexpr)
+  .
+  (simplexpr
+    (string
+      (string_fragment) @injection.content)+))
+  (#any-of? @_name "replace" "search" "matches" "captures")
+  (#set! injection.language "regex")
+  (#set! injection.combined))
+
+((function_call
+  name: (ident) @_name
+  .
+  (simplexpr)
+  .
+  (simplexpr
+    (string
+      (string_fragment) @injection.content)+))
+  (#eq? @_name "jq")
+  (#set! injection.language "jq")
+  (#set! injection.combined))

From 1bee80469d3d1569de47a62dd59824d9f9af0866 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 24 Jan 2024 18:14:19 +0200
Subject: [PATCH 1043/2704] feat(vim): highlight keycodes

---
 queries/vim/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 54832ffa5..cc51282a7 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -132,6 +132,8 @@
 (map_statement
   cmd: _ @keyword)
 
+(keycode) @character.special
+
 (command_name) @function.macro
 
 ; Filetype command

From 10903b13d8f7cf6a8d7a804253aa9261aec86cc1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 24 Jan 2024 17:50:09 -0500
Subject: [PATCH 1044/2704] chore(luau): update highlights and parser

---
 lockfile.json               |  2 +-
 queries/luau/highlights.scm | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fcc542404..fff691ba5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -357,7 +357,7 @@
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
   },
   "luau": {
-    "revision": "6953cd4fa5967c9aa3c769b4e4c7e69c904b9fa9"
+    "revision": "eaabb02c827e61f51a7dd13b8aba92924fc6dba0"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index ec765f1b9..added002c 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -43,6 +43,12 @@
     "end"
   ] @keyword.conditional)
 
+(if_expression
+  [
+    "if"
+    "then"
+  ] @keyword.conditional)
+
 (elseif_statement
   [
     "elseif"
@@ -50,12 +56,21 @@
     "end"
   ] @keyword.conditional)
 
+(elseif_clause
+  [
+    "elseif"
+    "then"
+  ] @keyword.conditional)
+
 (else_statement
   [
     "else"
     "end"
   ] @keyword.conditional)
 
+(else_clause
+  "else" @keyword.conditional)
+
 (for_statement
   [
     "for"
@@ -100,7 +115,6 @@
   ">"
   "="
   "&"
-  "~"
   "|"
   "?"
   "//"

From 2c1eb02e92734406866b993bd87111891830455b Mon Sep 17 00:00:00 2001
From: Miles Frain <milesfrain@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:12:34 -0800
Subject: [PATCH 1045/2704] feat(bash) Highlight concatenated words as strings

---
 queries/bash/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 21346ded8..20b9fd740 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -66,6 +66,13 @@
 (command
   argument: "$" @string) ; bare dollar
 
+(concatenation
+  [
+    (simple_expansion)
+    (expansion)
+  ]
+  (word) @string)
+
 [
   "if"
   "then"

From 4362b04a294857796156862c0127c6f236bc8da9 Mon Sep 17 00:00:00 2001
From: Colin Kennedy <colinvfx@gmail.com>
Date: Wed, 24 Jan 2024 16:25:40 -0800
Subject: [PATCH 1046/2704] feat: add tree-sitter-disassembly

---
 README.md                          |  1 +
 lockfile.json                      |  3 +++
 lua/nvim-treesitter/parsers.lua    |  8 ++++++++
 queries/disassembly/highlights.scm | 18 ++++++++++++++++++
 queries/disassembly/injections.scm |  6 ++++++
 5 files changed, 36 insertions(+)
 create mode 100644 queries/disassembly/highlights.scm
 create mode 100644 queries/disassembly/injections.scm

diff --git a/README.md b/README.md
index 690d42cbe..76ff66f00 100644
--- a/README.md
+++ b/README.md
@@ -210,6 +210,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) (maintained by @jedrzejboczar)
 - [x] [dhall](https://github.com/jbellerb/tree-sitter-dhall) (maintained by @amaanq)
 - [x] [diff](https://github.com/the-mikedavis/tree-sitter-diff) (maintained by @gbprod)
+- [x] [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) (maintained by @ColinKennedy)
 - [x] [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) (maintained by @camdencheek)
 - [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
 - [x] [doxygen](https://github.com/amaanq/tree-sitter-doxygen) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index fff691ba5..50ca6113a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -110,6 +110,9 @@
   "diff": {
     "revision": "c165725c28e69b36c5799ff0e458713a844f1aaf"
   },
+  "disassembly": {
+    "revision": "e48ebe20581145b381204cf21adf305e29329b5d"
+  },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 05a76bd0e..50ab51111 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -388,6 +388,14 @@ list.diff = {
   maintainers = { "@gbprod" },
 }
 
+list.disassembly = {
+  install_info = {
+    url = "https://github.com/ColinKennedy/tree-sitter-disassembly",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@ColinKennedy" },
+}
+
 list.dockerfile = {
   install_info = {
     url = "https://github.com/camdencheek/tree-sitter-dockerfile",
diff --git a/queries/disassembly/highlights.scm b/queries/disassembly/highlights.scm
new file mode 100644
index 000000000..2a1e2cdf4
--- /dev/null
+++ b/queries/disassembly/highlights.scm
@@ -0,0 +1,18 @@
+(byte) @constant
+
+[
+  (address)
+  (hexadecimal)
+  (integer)
+] @number
+
+(identifier) @variable
+
+(bad_instruction) @text.warning
+(code_location (identifier) @function.call)
+(comment) @comment
+(instruction) @function
+(memory_dump) @string
+
+["<" ">"] @punctuation.special
+["+" ":"] @punctuation.delimiter
diff --git a/queries/disassembly/injections.scm b/queries/disassembly/injections.scm
new file mode 100644
index 000000000..9fb52dafe
--- /dev/null
+++ b/queries/disassembly/injections.scm
@@ -0,0 +1,6 @@
+; TODO: https://github.com/nvim-treesitter/nvim-treesitter/pull/5548#issuecomment-1773707396
+;
+; To be added once a compatible Assembly parser is merged into nvim-treesitter
+;
+; ((instruction) @injection.content
+;  (#set! injection.language "asm"))

From 1d83fc08d4711077501d91deb4f0b2ae528e8b34 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 24 Jan 2024 19:35:31 -0500
Subject: [PATCH 1047/2704] fix: format disassembly

---
 queries/disassembly/highlights.scm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/queries/disassembly/highlights.scm b/queries/disassembly/highlights.scm
index 2a1e2cdf4..b1ece9ab6 100644
--- a/queries/disassembly/highlights.scm
+++ b/queries/disassembly/highlights.scm
@@ -8,11 +8,23 @@
 
 (identifier) @variable
 
-(bad_instruction) @text.warning
-(code_location (identifier) @function.call)
+(bad_instruction) @comment.warning
+
+(code_location
+  (identifier) @function.call)
+
 (comment) @comment
+
 (instruction) @function
+
 (memory_dump) @string
 
-["<" ">"] @punctuation.special
-["+" ":"] @punctuation.delimiter
+[
+  "<"
+  ">"
+] @punctuation.special
+
+[
+  "+"
+  ":"
+] @punctuation.delimiter

From 314fe31dc787b99fe2f8738c71270ddec4f1a16f Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 24 Jan 2024 10:47:26 -0800
Subject: [PATCH 1048/2704] fix(jsx): proper tag and builtin tag distinction

---
 queries/jsx/highlights.scm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 7f7177f83..5993ff7c4 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -24,42 +24,42 @@
   (property_identifier) @tag.attribute)
 
 (jsx_opening_element
-  name: (identifier) @tag)
+  name: (identifier) @tag.builtin)
 
 (jsx_closing_element
-  name: (identifier) @tag)
+  name: (identifier) @tag.builtin)
 
 (jsx_self_closing_element
-  name: (identifier) @tag)
+  name: (identifier) @tag.builtin)
 
 (jsx_opening_element
-  ((identifier) @constructor
-    (#lua-match? @constructor "^[A-Z]")))
+  ((identifier) @tag
+    (#lua-match? @tag "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component>
 (jsx_opening_element
   (member_expression
-    (identifier) @tag
-    (property_identifier) @constructor))
+    (identifier) @tag.builtin
+    (property_identifier) @tag))
 
 (jsx_closing_element
-  ((identifier) @constructor
-    (#lua-match? @constructor "^[A-Z]")))
+  ((identifier) @tag
+    (#lua-match? @tag "^[A-Z]")))
 
 ; Handle the dot operator effectively - </My.Component>
 (jsx_closing_element
   (member_expression
-    (identifier) @tag
-    (property_identifier) @constructor))
+    (identifier) @tag.builtin
+    (property_identifier) @tag))
 
 (jsx_self_closing_element
-  ((identifier) @constructor
-    (#lua-match? @constructor "^[A-Z]")))
+  ((identifier) @tag
+    (#lua-match? @tag "^[A-Z]")))
 
 ; Handle the dot operator effectively - <My.Component />
 (jsx_self_closing_element
   (member_expression
-    (identifier) @tag
-    (property_identifier) @constructor))
+    (identifier) @tag.builtin
+    (property_identifier) @tag))
 
 (jsx_text) @none

From 22025469b56ff189b777f33ee0be1c13a42323d2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 25 Jan 2024 09:33:02 +0100
Subject: [PATCH 1049/2704] fix: bump phpdoc parser and query

---
 lockfile.json                 | 2 +-
 queries/phpdoc/highlights.scm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 50ca6113a..fe80671aa 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -453,7 +453,7 @@
     "revision": "e3002a11a72773bbaf3bab0e59fb64e6992b79ab"
   },
   "phpdoc": {
-    "revision": "eb9ef97a1a9a6489d003a45a36a9edbcc8177087"
+    "revision": "67db260cf4e99a02283ae26b808d59b86d42dc0f"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
diff --git a/queries/phpdoc/highlights.scm b/queries/phpdoc/highlights.scm
index 5e96e93cc..418853813 100644
--- a/queries/phpdoc/highlights.scm
+++ b/queries/phpdoc/highlights.scm
@@ -23,7 +23,7 @@
 (parameter
   (variable_name) @variable.parameter)
 
-(type_list
+(union_type
   [
     (array_type)
     (primitive_type)
@@ -31,7 +31,7 @@
     (optional_type)
   ] @type)
 
-(type_list) @nospell
+(union_type) @nospell
 
 (variable_name) @nospell
 
@@ -48,7 +48,7 @@
 (tag
   (email_address) @string.special.url)
 
-(type_list
+(union_type
   "|" @keyword)
 
 (variable_name

From fb91060f597c4850847067d3f542fbdfc77480ac Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 25 Jan 2024 08:49:20 +0000
Subject: [PATCH 1050/2704] Update parsers: cpp, csv, disassembly, elixir,
 kconfig, luau, matlab, php, php_only, psv, tsv, wing

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fe80671aa..8a366a020 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -81,13 +81,13 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "a71474021410973b29bfe99440d57bcd750246b1"
+    "revision": "3deebb663506a06e179e0dd739d2b23e158f4157"
   },
   "css": {
     "revision": "98c7b3dceb24f1ee17f1322f3947e55638251c37"
   },
   "csv": {
-    "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
+    "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
     "revision": "2c6e806949197e7898910c78f514a3b7ff679068"
@@ -111,7 +111,7 @@
     "revision": "c165725c28e69b36c5799ff0e458713a844f1aaf"
   },
   "disassembly": {
-    "revision": "e48ebe20581145b381204cf21adf305e29329b5d"
+    "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
@@ -135,7 +135,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "11426c5fd20eef360d5ecaf10729191f6bc5d715"
+    "revision": "511ea5e0088779e4bdd76e12963ab9a5fe99983a"
   },
   "elm": {
     "revision": "c26afd7f2316f689410a1622f1780eff054994b1"
@@ -318,7 +318,7 @@
     "revision": "0c088d1ad270f02c4e84189247ac7001e86fe342"
   },
   "kconfig": {
-    "revision": "aaba009ba9d7881f0f81742da588ae70b572316d"
+    "revision": "2ba709d40caa6c1f68b26e55ff7a53e343154cfd"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -360,7 +360,7 @@
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
   },
   "luau": {
-    "revision": "eaabb02c827e61f51a7dd13b8aba92924fc6dba0"
+    "revision": "e5f7a020967407f73959592decdb147bb5fc30bb"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -375,7 +375,7 @@
     "revision": "28aa3baef73bd458d053b613b8bd10fd102b4405"
   },
   "matlab": {
-    "revision": "6071891a8c39600203eba20513666cf93b4d650a"
+    "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -447,10 +447,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "e3002a11a72773bbaf3bab0e59fb64e6992b79ab"
+    "revision": "dc8bd4150401f6c08591414f2a5480b7f2a874c8"
   },
   "php_only": {
-    "revision": "e3002a11a72773bbaf3bab0e59fb64e6992b79ab"
+    "revision": "dc8bd4150401f6c08591414f2a5480b7f2a874c8"
   },
   "phpdoc": {
     "revision": "67db260cf4e99a02283ae26b808d59b86d42dc0f"
@@ -489,7 +489,7 @@
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
   },
   "psv": {
-    "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
+    "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "pug": {
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
@@ -669,7 +669,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsv": {
-    "revision": "6c1957405bd6f7751b050f61367f1094fab91444"
+    "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "tsx": {
     "revision": "d847898fec3fe596798c9fda55cb8c05a799001a"
@@ -729,7 +729,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "fcef888d09f5064a16e3648d48bd628726c766d3"
+    "revision": "9c3a40d7e51c2963b19d1f7614f9b551cad66bb6"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From cc908cfcd7258b2e5c1a9c583e2f3feda0caf23b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 25 Jan 2024 12:40:17 +0100
Subject: [PATCH 1051/2704] fix(dart): replace slow indent with simpler
 strategy

Pattern for dedenting else blocks is painfully slow (~20% of total test
time), so replace with `@indent.auto` for the whole `if_statement` for
now.
---
 queries/dart/indents.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
index 8da3ebb14..03d9464bc 100644
--- a/queries/dart/indents.scm
+++ b/queries/dart/indents.scm
@@ -5,7 +5,6 @@
   (declaration
     (initializers))
   (switch_block)
-  (if_statement)
   (formal_parameter_list)
   (formal_parameter)
   (list_literal)
@@ -41,8 +40,10 @@
 (break_statement
   ";" @indent.end)
 
-; this one is for dedenting the else block
-(if_statement
-  (block) @indent.branch)
-
 (comment) @indent.ignore
+
+; dedenting the else block is painfully slow; replace with simpler strategy
+; (if_statement) @indent.begin
+; (if_statement
+;   (block) @indent.branch)
+(if_statement) @indent.auto

From ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a Mon Sep 17 00:00:00 2001
From: Leftas <info@leftas.dev>
Date: Thu, 25 Jan 2024 20:00:52 +0200
Subject: [PATCH 1052/2704] Fix find_usages

---
 lua/nvim-treesitter/locals.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index 650d2fa3b..fed835bbd 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -254,6 +254,7 @@ function M.find_usages(node, scope_node, bufnr)
   local usages = {}
 
   for match in M.iter_locals(bufnr, scope_node) do
+    match = match["local"]
     if match.reference and match.reference.node and ts.get_node_text(match.reference.node, bufnr) == node_text then
       local def_node, _, kind = M.find_definition(match.reference.node, bufnr)
 

From cb79d2446196d25607eb1d982c96939abdf67b8e Mon Sep 17 00:00:00 2001
From: Jongwook Choi <wookayin@gmail.com>
Date: Thu, 25 Jan 2024 16:14:41 -0500
Subject: [PATCH 1053/2704] feat(python): allow comments before module
 docstring

Example:

  ```python
  #!/usr/bin/env/python
  # some comment before module docstring
  # Copyright (c) LICENSE foo bar

  """module docstring."""
  ```

Python indeed recognizes it:

  ```
  $ python -c 'import testfile; print(testfile.__doc__)'
  module docstring.
  ```
---
 queries/python/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 329df4f14..0c7147b51 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -199,6 +199,8 @@
 
 ; doc-strings
 (module
+  .
+  (comment)*
   .
   (expression_statement
     (string) @string.documentation @spell))

From 0b697429c92d94146c636a14925bbf5649dcbb1e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 25 Jan 2024 08:55:18 -0800
Subject: [PATCH 1054/2704] fix(git_config): highlight parent relative path

---
 queries/git_config/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index 5830c1b56..fb9d3be2c 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -26,7 +26,7 @@
 (string) @string
 
 ((string) @string.special.path
-  (#lua-match? @string.special.path "^[.]?[/]"))
+  (#lua-match? @string.special.path "^[.]?[.]?[/]"))
 
 ((string) @string.special.path
   (#lua-match? @string.special.path "^[~]"))

From b7fd3d1db4a425e0d50711b2aa96f23ab720e1a7 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 26 Jan 2024 00:29:52 -0500
Subject: [PATCH 1055/2704] fix(lua): inject luadoc into comments immediately
 beginning with a `|`

---
 queries/lua/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 6042ea260..0ffac3e18 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -131,7 +131,7 @@
 
 (comment
   content: (_) @injection.content
-  (#lua-match? @injection.content "^[-][%s]*@")
+  (#lua-match? @injection.content "^[-][%s]*[@|]")
   (#set! injection.language "luadoc")
   (#offset! @injection.content 0 1 0 0))
 

From 7b9973fca91d83a9baeb259e5663617154c0e55b Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 26 Jan 2024 06:35:21 +0000
Subject: [PATCH 1056/2704] Update parsers: kconfig, php, php_only, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8a366a020..2e5326804 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "0c088d1ad270f02c4e84189247ac7001e86fe342"
   },
   "kconfig": {
-    "revision": "2ba709d40caa6c1f68b26e55ff7a53e343154cfd"
+    "revision": "7230f0618348d9289a24ee8cf90c9ab90acd76b1"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -447,10 +447,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "dc8bd4150401f6c08591414f2a5480b7f2a874c8"
+    "revision": "cd59e54aded87f9157dc2114060d33dd0f202658"
   },
   "php_only": {
-    "revision": "dc8bd4150401f6c08591414f2a5480b7f2a874c8"
+    "revision": "cd59e54aded87f9157dc2114060d33dd0f202658"
   },
   "phpdoc": {
     "revision": "67db260cf4e99a02283ae26b808d59b86d42dc0f"
@@ -729,7 +729,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "9c3a40d7e51c2963b19d1f7614f9b551cad66bb6"
+    "revision": "77a9b6a41a1a188168cd0a750ce9e5bf6a40cfe2"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 4bc1f9a4eb5e7a0a963636a8b2aa419c17234c62 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 26 Jan 2024 02:58:25 -0500
Subject: [PATCH 1057/2704] feat(kconfig): add new operator

---
 lockfile.json                  | 2 +-
 queries/kconfig/highlights.scm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 2e5326804..1f243aede 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "0c088d1ad270f02c4e84189247ac7001e86fe342"
   },
   "kconfig": {
-    "revision": "7230f0618348d9289a24ee8cf90c9ab90acd76b1"
+    "revision": "5fefd45628a32fc999aa9f4aebcc5ddcd071bcf2"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index 1cea0832c..bad7a26eb 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -41,6 +41,7 @@
   "<="
   ">="
   "!"
+  ":="
 ] @operator
 
 [
@@ -56,6 +57,8 @@
   ")"
 ] @punctuation.bracket
 
+"," @punctuation.delimiter
+
 (macro_variable
   [
     "$("

From ffb19d5deed8ff4c1191cf3d816fc4b8e29edfd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dai=20L=C3=B3pez?=
 <32249161+dpezto@users.noreply.github.com>
Date: Fri, 26 Jan 2024 05:30:43 -0600
Subject: [PATCH 1058/2704] feat(gnuplot): added gnuplot parser and queries
 (#5594)

* feat(gnuplot): added gnuplot parser and queries

---------

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>
Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/gnuplot/highlights.scm  | 635 ++++++++++++++++++++++++++++++++
 queries/gnuplot/injections.scm  |   2 +
 5 files changed, 649 insertions(+)
 create mode 100644 queries/gnuplot/highlights.scm
 create mode 100644 queries/gnuplot/injections.scm

diff --git a/README.md b/README.md
index 76ff66f00..7c2732aa1 100644
--- a/README.md
+++ b/README.md
@@ -244,6 +244,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [Glimmer and Ember](https://github.com/alexlafroscia/tree-sitter-glimmer) (maintained by @NullVoxPopuli)
 - [x] [glsl](https://github.com/theHamsta/tree-sitter-glsl) (maintained by @theHamsta)
 - [x] [GN (Generate Ninja)](https://github.com/amaanq/tree-sitter-gn) (maintained by @amaanq)
+- [x] [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) (maintained by @dpezto)
 - [x] [go](https://github.com/tree-sitter/tree-sitter-go) (maintained by @theHamsta, @WinWisely268)
 - [x] [Godot Resources (gdresource)](https://github.com/PrestonKnopp/tree-sitter-godot-resource) (maintained by @pierpo)
 - [x] [gomod](https://github.com/camdencheek/tree-sitter-go-mod) (maintained by @camdencheek)
diff --git a/lockfile.json b/lockfile.json
index 1f243aede..833f800ea 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -212,6 +212,9 @@
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
   },
+  "gnuplot": {
+    "revision": "7661b4d4883295a5effe96b678f563fe50aa3d7a"
+  },
   "go": {
     "revision": "ff86c7f1734873c8c4874ca4dd95603695686d7a"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 50ab51111..112a39c5c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -676,6 +676,14 @@ list.gn = {
   readme_name = "GN (Generate Ninja)",
 }
 
+list.gnuplot = {
+  install_info = {
+    url = "https://github.com/dpezto/tree-sitter-gnuplot",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@dpezto" },
+}
+
 list.go = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-go",
diff --git a/queries/gnuplot/highlights.scm b/queries/gnuplot/highlights.scm
new file mode 100644
index 000000000..1ba789118
--- /dev/null
+++ b/queries/gnuplot/highlights.scm
@@ -0,0 +1,635 @@
+; highlights.scm
+(comment) @comment @spell
+
+(identifier) @variable
+
+[
+  "-"
+  "+"
+  "~"
+  "!"
+  "$"
+  "|"
+  "**"
+  "*"
+  "/"
+  "%"
+  "=="
+  "!="
+  "<"
+  "<="
+  ">"
+  ">="
+  "<<"
+  ">>"
+  "&"
+  "^"
+  "&&"
+  "||"
+  "="
+  ","
+  "."
+] @operator
+
+[
+  "eq"
+  "ne"
+] @keyword.operator
+
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+"sum" @function.builtin
+
+[
+  "for"
+  "in"
+  "do"
+  "while"
+] @keyword.repeat
+
+[
+  (c_break)
+  (c_cd)
+  (c_clear)
+  "evaluate"
+  "fit"
+  "help"
+  "load"
+  "lower"
+  "print"
+  (c_replot)
+  (c_reread)
+  "reset"
+  "splot"
+  "cmd"
+  "test"
+  "undefine"
+  "vfill"
+] @keyword
+
+(c_pause
+  "pause" @keyword
+  "mouse" @variable.member
+  _? @attribute
+  (","
+    _ @attribute)?)
+
+(c_plot
+  "plot" @keyword)
+
+(c_show
+  "show" @keyword
+  "plot"? @attribute)
+
+(c_stats
+  "stats" @keyword
+  ("name"
+    (_))? @variable.member)
+
+[
+  "via"
+  "inverse"
+  "sample"
+] @keyword.function
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+(plot_element
+  "axes"? @variable.member)
+
+(cntrparam
+  "auto"? @variable.member)
+
+(colorbox
+  "origin"? @attribute)
+
+(contourfill
+  "auto"? @variable.member)
+
+(format
+  _? @attribute
+  (_)
+  _? @attribute)
+
+(key
+  "auto"? @variable.member)
+
+(style ; TODO: complete
+  [
+    "arrow"
+    "boxplot"
+    ("data"
+      [
+        (_)
+        "spiderplot" @attribute
+      ])
+    "fs"
+    "function"
+    "line"
+    "circle"
+    "rectangle"
+    "ellipse"
+    "parallelaxis"
+    ; (spiderplot) ; TODO: complete
+    "textbox"
+    ("watchpoint"
+      "labels" @attribute
+      (_)?)
+  ] @variable.member)
+
+(terminal
+  "name" @variable.member)
+
+; TODO: complete terminals in grammar and then simplify its options here
+(t_cairolatex
+  [
+    "eps"
+    "pdf"
+    "png"
+    "standalone"
+    "input"
+    "blacktext"
+    "colortext"
+    "colourtext"
+    ("header"
+      (_))
+    "mono"
+    "color"
+    "background"
+    "rounded"
+    "butt"
+  ]*
+     @attribute)
+
+; (t_canvas)
+; (t_cgm)
+; (t_context)
+; (t_domterm)
+; (t_dumb)
+; (t_dxf)
+; (t_emf)
+; (t_epscairo)
+; (t_epslatex)
+; (t_fig)
+; (t_gif)
+; (t_hpgl)
+; (t_jpeg)
+; (t_lua)
+; (t_pc15)
+; (t_pdfcairo)
+; (t_png)
+; (t_pngcairo)
+; (t_postscript)
+; (t_pslatex)
+; (t_pstricks)
+; (t_qt)
+; (t_sixelgd)
+; (t_svg [(font_spec)]* @attribute)
+; (t_tek4xxx)
+; (t_texdraw)
+; (t_tikz)
+; (t_tkcanvas)
+(plot_style
+  [
+    "lines"
+    "points"
+    "lp"
+    "financebars"
+    "dots"
+    "impulses"
+    "labels"
+    "surface"
+    "steps"
+    "fsteps"
+    "histeps"
+    "arrows"
+    "vectors"
+    "sectors"
+    "contourfill"
+    "errorbar"
+    "errorlines"
+    "parallelaxes"
+    "boxes"
+    "boxerrorbars"
+    "boxxyerror"
+    "isosurface"
+    "boxplot"
+    "candlesticks"
+    "circles"
+    "zerrorfill"
+    "ellipses"
+    "filledcurves"
+    "fillsteps"
+    "histograms"
+    "image"
+    "spiderplot"
+    "pm3d"
+    "rgbalpha"
+    "rgbimage"
+    "polygons"
+    "table"
+    "mask"
+  ] @attribute)
+
+[
+  "tc"
+  "fc"
+  "fs"
+  "lc"
+  "ls"
+  "lw"
+  "lt"
+  "pt"
+  "ps"
+  "pi"
+  "pn"
+  "dt"
+  "as"
+  "start"
+  "cycles"
+  "saturation"
+  "interval"
+  "format"
+  "keywidth"
+  "samplen"
+  "columns"
+  "title"
+  "notitle"
+  "every"
+  "index"
+  "using"
+  "with"
+  "frac"
+  "cb"
+  "arg"
+  "prefix"
+  "output"
+  "primary"
+  "specular"
+  "spec2"
+  "firstlinetype"
+  "width"
+  "height"
+  "expand"
+  "array"
+  "dx"
+  "dy"
+  "dz"
+  "filetype"
+  "center"
+  "record"
+] @variable.member
+
+; Workaround because formatter cannot handle 300 list nodes
+; format-ignore
+[
+  (angles)
+  (clip)
+  (colorsequence)
+  (contour)
+  (encoding)
+  (mapping)
+  (xdata)
+  (theta)
+  "wall"
+  "on"
+  "off"
+  "opaque"
+  "inside"
+  "outside"
+  "margin"
+  "cen"
+  "lef"
+  "rig"
+  "top"
+  "bot"
+  "lr"
+  "a"
+  "maxcols"
+  "maxrows"
+  "autojustify"
+  "overlap"
+  "spread"
+  "wrap"
+  "swarm"
+  "range"
+  "label"
+  "mixed"
+  "triangles"
+  "insidecolor"
+  "noinsidecolor"
+  "cycle"
+  "tics"
+  "ztics"
+  "cbtics"
+  "user"
+  "front"
+  "back"
+  "bdefault"
+  "time"
+  "palette"
+  "terminal"
+  "onecolor"
+  "invert"
+  "reverse"
+  "writeback"
+  "extend"
+  "restore"
+  "linear"
+  "cubicspline"
+  "bspline"
+  "points"
+  "order"
+  "levels"
+  "sorted"
+  "autofreq"
+  "add"
+  "inout"
+  "axis"
+  "mirror"
+  "type"
+  "rowsfirst"
+  "columnsfirst"
+  "downwards"
+  "upwards"
+  "prevnext"
+  "gray"
+  "color"
+  "gamma"
+  "defined"
+  "cubehelix"
+  "model"
+  "maxcolors"
+  "file"
+  "colormap"
+  "rgbformulae"
+  "viridis"
+  "positive"
+  "negative"
+  "nops_allcF"
+  "ps_allcF"
+  "quiet"
+  "full"
+  "trip"
+  "numbers"
+  "small"
+  "large"
+  "fullwidth"
+  "append"
+  "bind"
+  "errors"
+  "session"
+  "behind"
+  "polar"
+  "layerdefault"
+  "locale"
+  "axes"
+  "fix"
+  "keepfix"
+  "noextend"
+  "head"
+  "fixed"
+  "filled"
+  "nofilled"
+  "absolute"
+  "at"
+  "relative"
+  "enhanced"
+  "border"
+  "noborder"
+  "rgbcolor"
+  "empty"
+  "black"
+  "bgnd"
+  "nodraw"
+  "size"
+  "new"
+  "first"
+  "second"
+  "screen"
+  "graph"
+  "character"
+  "trianglepattern"
+  "undefined"
+  "noundefined"
+  "altdiagonal"
+  "bentover"
+  "vertical"
+  "horizontal"
+  "square"
+  "ratio"
+  "noratio"
+  "solid"
+  "transparent"
+  "pattern"
+  "from"
+  "to_rto"
+  "length"
+  "angle"
+  "columnheaders"
+  "fortran"
+  "nofpe_trap"
+  "missing"
+  "separator"
+  "commentschars"
+  "log"
+  "rangelimited"
+  "offset"
+  "nooffset"
+  "scale"
+  "font"
+  "point"
+  "nopoint"
+  "boxed"
+  "noboxed"
+  "hypertext"
+  "defaults"
+  "keyentry"
+  "splines"
+  "qnorm"
+  "gauss"
+  "cauchy"
+  "exp"
+  "box"
+  "hann"
+  "implicit"
+  "explicit"
+  "rotate"
+  "by"
+  "parallel"
+  "norotate"
+  "map"
+  "projection"
+  "equal"
+  "azimuth"
+  "nohidden3d"
+  "nocontours"
+  "nosurface"
+  "colornames"
+  "functions"
+  "variables"
+  "version"
+  "nologfile"
+  "logfile"
+  "fit_out"
+  "errorvariables"
+  "covariancevariables"
+  "errorscaling"
+  "prescale"
+  "maxiter"
+  "limit"
+  "limit_abs"
+  "start-lambda"
+  "lambda-factor"
+  "script"
+  "clip"
+  "fontscale"
+  "lighting"
+  "depthorder"
+  "interpolate"
+  "corners2color"
+  "flush"
+  "scanorder"
+  "hidden3d"
+  "clipcb"
+  "layout"
+  "margins"
+  "spacing"
+  "smooth"
+  "binary"
+  "skip"
+  "bins"
+  "binrange"
+  "binwidth"
+  "binvalue"
+  "mask"
+  "convexhull"
+  "concavehull"
+  "volatile"
+  "zsort"
+  "nonuniform"
+  "sparse"
+  "matrix"
+] @attribute
+
+[
+  "x1"
+  "x2"
+  "y1"
+  "y2"
+  "y"
+  "r"
+  "z"
+  "xy"
+  "xz"
+  "yz"
+  "xyz"
+  "x1y1"
+  "x2y2"
+  "x1y2"
+  "x2y1"
+  "columnheader"
+  "seconds"
+  "minutes"
+  "hours"
+  "days"
+  "weeks"
+  "months"
+  "years"
+  "cm"
+  "in"
+  "discrete"
+  "incremental"
+  "default"
+  "long"
+  "nogrid"
+  "unique"
+  "frequency"
+  "fnormal"
+  "cumulative"
+  "cnormal"
+  "csplines"
+  "acsplines"
+  "mcsplines"
+  "path"
+  "bezier"
+  "sbezier"
+  "unwrap"
+  "kdensity"
+  "closed"
+  "between"
+  "above"
+  "below"
+  "variable"
+  "pixels"
+  "RGB"
+  "CMY"
+  "HSV"
+  "base"
+  "begin"
+  "center"
+  "end"
+  "ftriangles"
+  "clip1in"
+  "clip4in"
+  "c2c"
+  "retrace"
+  "whitespace"
+  "tab"
+  "comma"
+  "push"
+  "pop"
+  "flipx"
+  "flipy"
+  "flipz"
+] @variable.member
+
+(colorspec
+  "palette" @attribute)
+
+(datafile_modifiers
+  "origin"? @variable.member)
+
+((datafile_modifiers
+  filetype: (identifier) @variable.member)
+  (#any-of? @variable.member "avs" "bin" "edf" "ehf" "gif" "gpbin" "jpeg" "jpg" "png" "raw" "rgb" "auto"))
+
+(macro) @function.macro
+
+(datablock) @function.macro
+
+(function
+  name: (identifier) @function)
+
+((function
+  name: (identifier) @function.builtin)
+  (#any-of? @function.builtin "abs" "acos" "acosh" "airy" "arg" "asin" "asinh" "atan" "atan2" "atanh" "besj0" "besj1" "besjn" "besy0" "besy1" "besyn" "besi0" "besi1" "besin" "cbrt" "ceil" "conj" "cos" "cosh" "EllipticK" "EllipticE" "EllipticPi" "erf" "erfc" "exp" "expint" "floor" "gamma" "ibeta" "inverf" "igamma" "imag" "int" "invnorm" "invibeta" "invigamma" "LambertW" "lambertw" "lgamma" "lnGamma" "log" "log10" "norm" "rand" "real" "round" "sgn" "sin" "sinh" "sqrt" "SynchrotronF" "tan" "tanh" "uigamma" "voigt" "zeta" "cerf" "cdawson" "faddeva" "erfi" "FresnelC" "FresnelS" "VP" "VP_fwhm" "Ai" "Bi" "BesselH1" "BesselH2" "BesselJ" "BesselY" "BesselI" "BesselK" "gprintf" "sprintf" "strlen" "strstrt" "substr" "strptime" "srtftime" "system" "trim" "word" "words" "time" "timecolumn" "tm_hour" "tm_mday" "tm_min" "tm_mon" "tm_sec" "tm_wday" "tm_week" "tm_yday" "tm_year" "weekday_iso" "weekday_cdc" "column" "columnhead" "exists" "hsv2rgb" "index" "palette" "rgbcolor" "stringcolumn" "valid" "value" "voxel"))
+
+((identifier) @variable.builtin
+  (#match? @variable.builtin "^\\w+_(records|headers|outofrange|invalid|blank|blocks|columns|column_header|index_(min|max)(_x|_y)?|(min|max)(_x|_y)?|mean(_err)?(_x|_y)?|stddev(_err)?(_x|_y)?)$"))
+
+((identifier) @variable.builtin
+  (#match? @variable.builtin "^\\w+_(sdd(_x|_y)?|(lo|up)_quartile(_x|_y)?|median(_x|_y)?|sum(sq)?(_x|_y)?|skewness(_err)?(_x|_y)?)$"))
+
+((identifier) @variable.builtin
+  (#match? @variable.builtin "^\\w+_(kurtosis(_err)?(_x|_y)?|adev(_x|_y)?|correlation|slope(_err)?|intercept(_err)?|sumxy|pos(_min|_max)_y|size(_x|_y))$"))
+
+((identifier) @variable.builtin
+  (#match? @variable.builtin "^((GPVAL|MOUSE|FIT)_\\w+|GNUTERM|NaN|VoxelDistance|GridDistance|pi)$"))
+
+(array_def
+  "array" @keyword.function)
+
+(array
+  (identifier) @function)
+
+(number) @number
+
+(string_literal) @string
diff --git a/queries/gnuplot/injections.scm b/queries/gnuplot/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/gnuplot/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From efda19a54a157da8635aa6cb84f56a10593b1a23 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 26 Jan 2024 12:11:00 +0100
Subject: [PATCH 1059/2704] feat(tests): allow check-queries to take list of
 parsers

`./scripts/check-queries.lua foo bar baz`
---
 scripts/check-queries.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 959969645..5e83bdcad 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -46,8 +46,8 @@ end
 
 local function do_check()
   local timings = {}
-  local parsers = require("nvim-treesitter.info").installed_parsers()
   local queries = require "nvim-treesitter.query"
+  local parsers = #_G.arg > 0 and { unpack(_G.arg) } or require("nvim-treesitter.info").installed_parsers()
   local query_types = queries.built_in_query_groups
 
   local captures = extract_captures()

From ed82d82b77e4fa3bd4593eda8fc4c4ff95a5eb25 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 26 Jan 2024 12:36:56 -0500
Subject: [PATCH 1060/2704] chore(Odin): update highlights

---
 lockfile.json               | 2 +-
 queries/odin/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 833f800ea..35f18a129 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -432,7 +432,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "751f7796fa76075cff52edd1afff569a8a09c2a7"
+    "revision": "f94c590ed5263e11f1e492d1b53356f8c8459b66"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index f599f6e97..b44d06429 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -47,6 +47,8 @@
   "case"
   "where"
   "break"
+  "or_break"
+  "or_continue"
   (fallthrough_statement)
 ] @keyword.conditional
 

From e0edcbb1d27b679a0f48f2557db655855ba5434c Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 26 Jan 2024 15:27:52 -0800
Subject: [PATCH 1061/2704] fix(make): highlight order-only prerequisite pipe

---
 queries/make/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index 1777aa610..01b8438f5 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -31,6 +31,7 @@
     "&:"
     ":"
     "::"
+    "|"
   ] @operator)
 
 (export_directive

From cf13c9605074388f8a2085bcfc573c7adb443ea2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 27 Jan 2024 10:16:40 +0100
Subject: [PATCH 1062/2704] fix(jsdoc): add scanner.c

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 35f18a129..8c37a4c04 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -303,7 +303,7 @@
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "d01984de49927c979b46ea5c01b78c8ddd79baf9"
+    "revision": "a5e363a98676136d9f5884cb558086e5f1fc32b6"
   },
   "json": {
     "revision": "3fef30de8aee74600f25ec2e319b62a1a870d51e"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 112a39c5c..af7ee2043 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -931,7 +931,7 @@ list.jq = {
 list.jsdoc = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-jsdoc",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@steelsojka" },
 }

From 589fa77c2355b1a1452948711a24a2d792b67538 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sat, 27 Jan 2024 09:31:50 +0000
Subject: [PATCH 1063/2704] Update parsers: astro, bitbake, c, cpp, dtd,
 gnuplot, json, php, php_only, wing, xml

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8c37a4c04..24c08a40a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
   },
   "astro": {
-    "revision": "a092afa5c330495fdfbc652766c29c66ec6880f4"
+    "revision": "e924787e12e8a03194f36a113290ac11d6dc10f3"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
@@ -39,13 +39,13 @@
     "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
   "bitbake": {
-    "revision": "10bacac929ff36a1e8f4056503fe4f8717b21b94"
+    "revision": "01ead542b1e6f52cc9a2c9c1c95e079702122161"
   },
   "blueprint": {
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "34f4c7e751f4d661be3e23682fe2631d6615141d"
+    "revision": "ecdd500806cf8154d944344f1df6418b32e0e9a7"
   },
   "c_sharp": {
     "revision": "dd5e59721a5f8dae34604060833902b882023aaf"
@@ -81,7 +81,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "3deebb663506a06e179e0dd739d2b23e158f4157"
+    "revision": "4ca37be8e70e5a40ae95688bec56b886ba945888"
   },
   "css": {
     "revision": "98c7b3dceb24f1ee17f1322f3947e55638251c37"
@@ -123,7 +123,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "dd7ef38c74d8430da729b4da815e4c40776e03bb"
+    "revision": "b1b5a3e48484bdc755f51e1f86cafa330dd52f82"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -213,7 +213,7 @@
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
   },
   "gnuplot": {
-    "revision": "7661b4d4883295a5effe96b678f563fe50aa3d7a"
+    "revision": "7549f6faf5cc9fb8cf78054a7af356a6b003c6f3"
   },
   "go": {
     "revision": "ff86c7f1734873c8c4874ca4dd95603695686d7a"
@@ -306,7 +306,7 @@
     "revision": "a5e363a98676136d9f5884cb558086e5f1fc32b6"
   },
   "json": {
-    "revision": "3fef30de8aee74600f25ec2e319b62a1a870d51e"
+    "revision": "c5a9a9af069de3fe0ef5fa2fa001b6a2e44d75b2"
   },
   "json5": {
     "revision": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"
@@ -450,10 +450,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "cd59e54aded87f9157dc2114060d33dd0f202658"
+    "revision": "3797c41da338e500e1e41c410c2244492aaa1860"
   },
   "php_only": {
-    "revision": "cd59e54aded87f9157dc2114060d33dd0f202658"
+    "revision": "3797c41da338e500e1e41c410c2244492aaa1860"
   },
   "phpdoc": {
     "revision": "67db260cf4e99a02283ae26b808d59b86d42dc0f"
@@ -732,13 +732,13 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "77a9b6a41a1a188168cd0a750ce9e5bf6a40cfe2"
+    "revision": "d4e17313d3c6e86b2737ec22b92764690cd66d0e"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
   },
   "xml": {
-    "revision": "dd7ef38c74d8430da729b4da815e4c40776e03bb"
+    "revision": "b1b5a3e48484bdc755f51e1f86cafa330dd52f82"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 2fb2100fedf8988f12b1f09efe38134f831e2d99 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Sat, 27 Jan 2024 12:17:25 +0100
Subject: [PATCH 1064/2704] feat(angular)!: switch to parser supporting v17
 (#5779)

---
 lockfile.json                    |   2 +-
 lua/nvim-treesitter/parsers.lua  |   7 +-
 queries/angular/folds.scm        |   1 +
 queries/angular/highlights.scm   | 116 +++++++++++++++++++++++--------
 queries/angular/indents.scm      |   1 +
 queries/angular/injections.scm   |   1 +
 queries/angular/locals.scm       |   1 +
 queries/ecma/injections.scm      |  62 +++++++++++++++++
 queries/html_tags/injections.scm |  20 ------
 9 files changed, 159 insertions(+), 52 deletions(-)
 create mode 100644 queries/angular/folds.scm
 create mode 100644 queries/angular/indents.scm
 create mode 100644 queries/angular/injections.scm
 create mode 100644 queries/angular/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 24c08a40a..c4d2e5233 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
   },
   "angular": {
-    "revision": "624ff108fe949727217cddb302f20e4f16997b1c"
+    "revision": "28119b4dc813d3f8267d451c44548e99124fbf9a"
   },
   "apex": {
     "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index af7ee2043..da83e0a22 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -95,10 +95,11 @@ list.agda = {
 
 list.angular = {
   install_info = {
-    url = "https://github.com/steelsojka/tree-sitter-angular",
-    files = { "src/parser.c" },
-    requires_generate_from_grammar = true,
+    url = "https://github.com/dlvandenberg/tree-sitter-angular",
+    files = { "src/parser.c", "src/scanner.c" },
+    generate_requires_npm = true,
   },
+  maintainers = { "@dlvandenberg" },
   experimental = true,
 }
 
diff --git a/queries/angular/folds.scm b/queries/angular/folds.scm
new file mode 100644
index 000000000..1f2129cf9
--- /dev/null
+++ b/queries/angular/folds.scm
@@ -0,0 +1 @@
+; inherits: html
diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index a109dc179..eb0107e2d 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -1,7 +1,7 @@
+; inherits: html_tags
 (identifier) @variable
 
-(pipe_sequence
-  "|" @operator)
+(pipe_operator) @operator
 
 (string) @string
 
@@ -15,6 +15,27 @@
     (pipe_arguments
       (identifier) @variable.parameter))
 
+(structural_directive
+  "*" @keyword
+  (identifier) @keyword)
+
+(attribute
+  (attribute_name) @variable.member
+  (#lua-match? @variable.member "#.*"))
+
+(binding_name
+  (identifier) @keyword)
+
+(event_binding
+  (binding_name
+    (identifier) @keyword))
+
+(event_binding
+  "\"" @punctuation.delimiter)
+
+(property_binding
+  "\"" @punctuation.delimiter)
+
 (structural_assignment
   operator: (identifier) @keyword)
 
@@ -29,10 +50,38 @@
     ((identifier) @function.builtin
       (#eq? @function.builtin "$any")))
 
+(pair
+  key:
+    ((identifier) @variable.builtin
+      (#eq? @variable.builtin "$implicit")))
+
+((control_keyword) @keyword.repeat
+  (#any-of? @keyword.repeat "for" "empty"))
+
+((control_keyword) @keyword.conditional
+  (#any-of? @keyword.conditional "if" "else" "switch" "case" "default"))
+
+((control_keyword) @keyword.coroutine
+  (#any-of? @keyword.coroutine "defer" "placeholder" "loading"))
+
+((control_keyword) @keyword.exception
+  (#eq? @keyword.exception "error"))
+
+(special_keyword) @keyword
+
+((identifier) @boolean
+  (#any-of? @boolean "true" "false"))
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "this" "$event"))
+
+((identifier) @constant.builtin
+  (#eq? @constant.builtin "null"))
+
 [
-  "let"
-  "as"
-] @keyword
+  (ternary_operator)
+  (conditional_operator)
+] @keyword.conditional.ternary
 
 [
   "("
@@ -41,8 +90,21 @@
   "]"
   "{"
   "}"
+  "@"
+  "} @"
+  (if_end_expression)
+  (for_end_expression)
+  (switch_end_expression)
+  (case_end_expression)
+  (default_end_expression)
+  (defer_end_expression)
 ] @punctuation.bracket
 
+[
+  "{{"
+  "}}"
+] @punctuation.special
+
 [
   ";"
   "."
@@ -50,27 +112,25 @@
   "?."
 ] @punctuation.delimiter
 
-((identifier) @boolean
-  (#any-of? @boolean "true" "false"))
+(concatination_expression
+  "+" @operator)
 
-((identifier) @variable.builtin
-  (#any-of? @variable.builtin "this" "\$event" "null"))
-
-[
-  "-"
-  "&&"
-  "+"
-  "<"
-  "<="
-  "="
-  "=="
-  "==="
-  "!="
-  "!=="
-  ">"
-  ">="
-  "*"
-  "/"
-  "||"
-  "%"
-] @operator
+(binary_expression
+  [
+    "-"
+    "&&"
+    "+"
+    "<"
+    "<="
+    "="
+    "=="
+    "==="
+    "!="
+    "!=="
+    ">"
+    ">="
+    "*"
+    "/"
+    "||"
+    "%"
+  ] @operator)
diff --git a/queries/angular/indents.scm b/queries/angular/indents.scm
new file mode 100644
index 000000000..448e94275
--- /dev/null
+++ b/queries/angular/indents.scm
@@ -0,0 +1 @@
+; inherits: html_tags
diff --git a/queries/angular/injections.scm b/queries/angular/injections.scm
new file mode 100644
index 000000000..448e94275
--- /dev/null
+++ b/queries/angular/injections.scm
@@ -0,0 +1 @@
+; inherits: html_tags
diff --git a/queries/angular/locals.scm b/queries/angular/locals.scm
new file mode 100644
index 000000000..1f2129cf9
--- /dev/null
+++ b/queries/angular/locals.scm
@@ -0,0 +1 @@
+; inherits: html
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 51eb22a7e..d23e2fdfa 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -137,3 +137,65 @@
     (string
       (string_fragment) @injection.content)
   (#set! injection.language "html"))
+
+;---- Angular injections -----
+; @Component({
+;   template: `<html>`
+; })
+(decorator
+  (call_expression
+    function:
+      ((identifier) @_name
+        (#eq? @_name "Component"))
+    arguments:
+      (arguments
+        (object
+          (pair
+            key:
+              ((property_identifier) @_prop
+                (#eq? @_prop "template"))
+            value:
+              ((template_string) @injection.content
+                (#offset! @injection.content 0 1 0 -1)
+                (#set! injection.language "angular")))))))
+
+; @Component({
+;   styles: [`<css>`]
+; })
+(decorator
+  (call_expression
+    function:
+      ((identifier) @_name
+        (#eq? @_name "Component"))
+    arguments:
+      (arguments
+        (object
+          (pair
+            key:
+              ((property_identifier) @_prop
+                (#eq? @_prop "styles"))
+            value:
+              (array
+                ((template_string) @injection.content
+                  (#offset! @injection.content 0 1 0 -1)
+                  (#set! injection.language "css"))))))))
+
+; @Component({
+;   styles: `<css>`
+; })
+(decorator
+  (call_expression
+    function:
+      ((identifier) @_name
+        (#eq? @_name "Component"))
+    arguments:
+      (arguments
+        (object
+          (pair
+            key:
+              ((property_identifier) @_prop
+                (#eq? @_prop "styles"))
+            value:
+              ((template_string) @injection.content
+                (#offset! @injection.content 0 1 0 -1)
+                (#set! injection.language "css")))))))
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
index 7c9c835ef..5b78e37b4 100644
--- a/queries/html_tags/injections.scm
+++ b/queries/html_tags/injections.scm
@@ -89,23 +89,3 @@
   (quoted_attribute_value
     (attribute_value) @injection.content)
   (#set! injection.language "javascript"))
-
-(attribute
-  ((attribute_name) @_name
-    (#lua-match? @_name "[%[%(].*[%)%]]"))
-  (quoted_attribute_value
-    (attribute_value) @injection.content)
-  (#set! injection.language "angular"))
-
-(attribute
-  ((attribute_name) @_name
-    (#lua-match? @_name "^%*"))
-  (quoted_attribute_value
-    (attribute_value) @injection.content)
-  (#set! injection.language "angular"))
-
-(element
-  ((text) @injection.content
-    (#lua-match? @injection.content "%{%{.*%}%}")
-    (#offset! @injection.content 0 2 0 -2))
-  (#set! injection.language "angular"))

From b4138891b3454beeb14eef171c91c92377fcd715 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github>
Date: Sat, 27 Jan 2024 11:17:37 +0000
Subject: [PATCH 1065/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7c2732aa1..e965db03d 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ We are looking for maintainers to add more parsers and to write query files for
 <!--parserinfo-->
 - [x] [ada](https://github.com/briot/tree-sitter-ada) (maintained by @briot)
 - [x] [agda](https://github.com/tree-sitter/tree-sitter-agda) (maintained by @Decodetalkers)
-- [ ] [angular](https://github.com/steelsojka/tree-sitter-angular) (experimental)
+- [x] [angular](https://github.com/dlvandenberg/tree-sitter-angular) (experimental, maintained by @dlvandenberg)
 - [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)

From 458ce4d16c1771fc601ec10a87820acae9981f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= <majosolano99@gmail.com>
Date: Sat, 27 Jan 2024 13:05:23 -0800
Subject: [PATCH 1066/2704] fix(incremental-selection): use cmd instead of :lua
 for command

---
 lua/nvim-treesitter/incremental_selection.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/incremental_selection.lua b/lua/nvim-treesitter/incremental_selection.lua
index b0fd7b65f..f95b71e02 100644
--- a/lua/nvim-treesitter/incremental_selection.lua
+++ b/lua/nvim-treesitter/incremental_selection.lua
@@ -148,7 +148,7 @@ function M.attach(bufnr)
         mode = "x"
         -- We need to move to command mode to access marks '< (visual area start) and '> (visual area end) which are not
         -- properly accessible in visual mode.
-        rhs = string.format(":lua require'nvim-treesitter.incremental_selection'.%s()<CR>", funcname)
+        rhs = string.format("<cmd>lua require'nvim-treesitter.incremental_selection'.%s()<CR>", funcname)
       end
       vim.keymap.set(
         mode,

From 6f586875e35e2b02358efa467317634c766fd1d4 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Sun, 28 Jan 2024 06:35:43 +0000
Subject: [PATCH 1067/2704] Update parsers: awk, haskell, php, php_only

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c4d2e5233..a0faa9c2b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -21,7 +21,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "dcf4ac4eaff601d87cc15604765a7ae329c1b2ee"
+    "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
     "revision": "f7239f638d3dc16762563a9027faeee518ce1bd9"
@@ -249,7 +249,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "dd924b8df1eb76261f009e149fc6f3291c5081c2"
+    "revision": "cf98de23e4285b8e6bcb57b050ef2326e2cc284b"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -450,10 +450,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "3797c41da338e500e1e41c410c2244492aaa1860"
+    "revision": "29a49d3a53353444ee2226e2efa140fec69dd3e0"
   },
   "php_only": {
-    "revision": "3797c41da338e500e1e41c410c2244492aaa1860"
+    "revision": "29a49d3a53353444ee2226e2efa140fec69dd3e0"
   },
   "phpdoc": {
     "revision": "67db260cf4e99a02283ae26b808d59b86d42dc0f"

From b5736698be1dae39ebcaf771641a66503f3a87a9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 28 Jan 2024 11:47:45 +0100
Subject: [PATCH 1068/2704] ci: use token for automated PRs

* Use a Github App token to allow CI to run automatically
(Following
https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens)

* Enable automerge

* make lint workflow only run once on PRs to master
---
 .github/workflows/lint.yml            |  3 ++-
 .github/workflows/update-lockfile.yml | 23 ++++++++++++++---------
 .github/workflows/update-readme.yml   | 19 +++++++++++++------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3092c418f..47a2ee386 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,8 +1,9 @@
 name: Linting and style checking
 
 on:
-  push:
   pull_request:
+    branches:
+      - "master"
 
 jobs:
   luacheck:
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index e44d7c954..f12ca893f 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -14,6 +14,12 @@ jobs:
         with:
           ref: master
 
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.TOKEN_ID }}
+          private-key: ${{ secrets.TOKEN_PRIVATE_KEY }}
+
       - name: Prepare
         env:
           NVIM_TAG: stable
@@ -32,21 +38,20 @@ jobs:
           # Pretty print
           cp lockfile.json /tmp/lockfile.json
           cat /tmp/lockfile.json | jq --sort-keys > lockfile.json
-
-      - name: Commit changes
-        run: |
-          git config user.name 'GitHub'
-          git config user.email 'noreply@github.com'
-          git add lockfile.json
           UPDATED_PARSERS=$(/tmp/jd -f merge /tmp/old_lockfile.json lockfile.json | jq -r 'keys | join(", ")')
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
-          git commit -m "Update parsers: $UPDATED_PARSERS" || echo 'No commit necessary!'
-          git clean -xf
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:
+          token: ${{ steps.app-token.outputs.token }}
+          commit-message: "Update parsers: ${{ env.UPDATED_PARSERS }}"
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
+          body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
           branch: update-lockfile-pr
           base: ${{ github.head_ref }}
-          draft: true
+
+      - name: Enable Pull Request Automerge
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh pr merge --rebase --auto update-lockfile-pr
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 6708ad103..1569e16a5 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -13,6 +13,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.TOKEN_ID }}
+          private-key: ${{ secrets.TOKEN_PRIVATE_KEY }}
+
       - name: Prepare
         env:
           NVIM_TAG: stable
@@ -21,18 +27,19 @@ jobs:
 
       - name: Check README
         run: |
-          git config user.email 'actions@github'
-          git config user.name 'Github Actions'
           nvim -l scripts/update-readme.lua || echo 'Needs update'
-          git add README.md
-          git commit -m 'Update README' || echo 'No commit necessary!'
-          git clean -xf
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:
+          token: ${{ steps.app-token.outputs.token }}
           commit-message: Update README
           title: Update README
+          body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
           branch: update-readme-pr
           base: ${{ github.head_ref }}
-          draft: true
+
+      - name: Enable Pull Request Automerge
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh pr merge --rebase --auto update-readme-pr

From 95987ee2d6698577af45ae49261159fa624ea593 Mon Sep 17 00:00:00 2001
From: clason <clason@users.noreply.github.com>
Date: Sun, 28 Jan 2024 12:26:08 +0000
Subject: [PATCH 1069/2704] Update parsers: query

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index a0faa9c2b..7a08271e6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -519,7 +519,7 @@
     "revision": "259133077f2fd854bcaa6f0149d3fc281fc8070b"
   },
   "query": {
-    "revision": "3a9808b22742d5bd906ef5d1a562f2f1ae57406d"
+    "revision": "67e9e009436c8c1f2de9f4c654ee3e7674675769"
   },
   "r": {
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"

From d4dac523d2546afc266eb9b5a7986690b5319c41 Mon Sep 17 00:00:00 2001
From: Murtaza <murtaza.javaid@gmail.com>
Date: Sun, 28 Jan 2024 16:17:50 -0500
Subject: [PATCH 1070/2704] feat(groovy)!: switch to more complete parser
 (#5957)

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 README.md                       |   2 +-
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   5 +-
 queries/groovy/folds.scm        |   6 +
 queries/groovy/highlights.scm   | 286 +++++++++++++++++++++++++++-----
 queries/groovy/indents.scm      |  35 ++++
 queries/groovy/injections.scm   |   4 +-
 queries/groovy/locals.scm       |   6 +
 8 files changed, 295 insertions(+), 51 deletions(-)
 create mode 100644 queries/groovy/folds.scm
 create mode 100644 queries/groovy/indents.scm
 create mode 100644 queries/groovy/locals.scm

diff --git a/README.md b/README.md
index e965db03d..786aa2276 100644
--- a/README.md
+++ b/README.md
@@ -252,7 +252,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
 - [x] [gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) (maintained by @ObserverOfTime)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
-- [x] [groovy](https://github.com/Decodetalkers/tree-sitter-groovy) (maintained by @Decodetalkers)
+- [x] [groovy](https://github.com/murtaza64/tree-sitter-groovy) (maintained by @murtaza64)
 - [x] [gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) (maintained by @theHamsta)
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
 - [x] [hare](https://github.com/amaanq/tree-sitter-hare) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 7a08271e6..705771637 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -237,7 +237,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "7e023227f46fee428b16a0288eeb0f65ee2523ec"
+    "revision": "e20f616e6223b66defabc82c29f52431ee66e269"
   },
   "gstlaunch": {
     "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index da83e0a22..e31f19747 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -737,11 +737,10 @@ list.gpg = {
 
 list.groovy = {
   install_info = {
-    url = "https://github.com/Decodetalkers/tree-sitter-groovy",
+    url = "https://github.com/murtaza64/tree-sitter-groovy",
     files = { "src/parser.c" },
-    branch = "gh-pages",
   },
-  maintainers = { "@Decodetalkers" },
+  maintainers = { "@murtaza64" },
 }
 
 list.graphql = {
diff --git a/queries/groovy/folds.scm b/queries/groovy/folds.scm
new file mode 100644
index 000000000..354861a61
--- /dev/null
+++ b/queries/groovy/folds.scm
@@ -0,0 +1,6 @@
+[
+  (argument_list)
+  (closure)
+  (list)
+  (map)
+] @fold
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index 4306f17a3..aadd04fe4 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -1,64 +1,86 @@
-(unit
-  (identifier) @variable)
+[
+  "!instanceof"
+  "assert"
+  "class"
+  "extends"
+  "instanceof"
+  "package"
+] @keyword
 
-(string
-  (identifier) @variable)
+[
+  "!in"
+  "as"
+  "in"
+] @keyword.operator
 
-(escape_sequence) @string.escape
+[
+  "case"
+  "default"
+  "else"
+  "if"
+  "switch"
+] @keyword.conditional
 
-(block
-  (unit
-    (identifier) @module))
+[
+  "catch"
+  "finally"
+  "try"
+] @keyword.exception
 
-(func
-  (identifier) @function)
+"def" @keyword.function
 
-(number) @number
+"import" @keyword.import
 
-((identifier) @boolean
-  (#any-of? @boolean "true" "false" "True" "False"))
+[
+  "for"
+  "while"
+  (break)
+  (continue)
+] @keyword.repeat
 
-((identifier) @constant
-  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+"return" @keyword.return
 
-((identifier) @constant.builtin
-  (#eq? @constant.builtin "null"))
+[
+  "true"
+  "false"
+] @boolean
 
-((identifier) @type
-  (#any-of? @type "String" "Map" "Object" "Boolean" "Integer" "List"))
+(null) @constant.builtin
 
-((identifier) @function.builtin
-  (#any-of? @function.builtin "void" "id" "version" "apply" "implementation" "testImplementation" "androidTestImplementation" "debugImplementation"))
+"this" @variable.builtin
 
-((identifier) @keyword
-  (#any-of? @keyword "static" "class" "def" "import" "package" "assert" "extends" "implements" "instanceof" "interface" "new"))
+[
+  "int"
+  "char"
+  "short"
+  "long"
+  "boolean"
+  "float"
+  "double"
+  "void"
+] @type.builtin
 
-((identifier) @type.qualifier
-  (#any-of? @type.qualifier "abstract" "protected" "private" "public"))
+[
+  "final"
+  "private"
+  "protected"
+  "public"
+  "static"
+  "synchronized"
+] @type.qualifier
 
-((identifier) @keyword.exception
-  (#any-of? @keyword.exception "throw" "finally" "try" "catch"))
+(comment) @comment @spell
+
+(shebang) @keyword.directive
 
 (string) @string
 
-[
-  (line_comment)
-  (block_comment)
-] @comment @spell
+(string
+  (escape_sequence) @string.escape)
 
-((block_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
-
-((line_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^///[^/]"))
-
-((line_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^///$"))
-
-[
-  (operators)
-  (leading_key)
-] @operator
+(string
+  (interpolation
+    "$" @punctuation.special))
 
 [
   "("
@@ -68,3 +90,179 @@
   "{"
   "}"
 ] @punctuation.bracket
+
+[
+  ":"
+  ","
+  "."
+] @punctuation.delimiter
+
+(number_literal) @number
+
+(identifier) @variable
+
+((identifier) @constant
+  (#match? @constant "^[A-Z][A-Z_]+"))
+
+[
+  "%"
+  "*"
+  "/"
+  "+"
+  "-"
+  "<<"
+  ">>"
+  ">>>"
+  ".."
+  "..<"
+  "<..<"
+  "<.."
+  "<"
+  "<="
+  ">"
+  ">="
+  "=="
+  "!="
+  "<=>"
+  "==="
+  "!=="
+  "=~"
+  "==~"
+  "&"
+  "^"
+  "|"
+  "&&"
+  "||"
+  "?:"
+  "+"
+  "*"
+  ".&"
+  ".@"
+  "?."
+  "*."
+  "*"
+  "*:"
+  "++"
+  "--"
+  "!"
+] @operator
+
+(string
+  "/" @string)
+
+(ternary_op
+  ([
+    "?"
+    ":"
+  ]) @keyword.conditional.ternary)
+
+(map
+  (map_item
+    key: (identifier) @variable.parameter))
+
+(parameter
+  type: (identifier) @type
+  name: (identifier) @variable.parameter)
+
+(generic_param
+  name: (identifier) @variable.parameter)
+
+(declaration
+  type: (identifier) @type)
+
+(function_definition
+  type: (identifier) @type)
+
+(function_declaration
+  type: (identifier) @type)
+
+(class_definition
+  name: (identifier) @type)
+
+(class_definition
+  superclass: (identifier) @type)
+
+(generic_param
+  superclass: (identifier) @type)
+
+(type_with_generics
+  (identifier) @type)
+
+(type_with_generics
+  (generics
+    (identifier) @type))
+
+(generics
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(generic_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+; TODO: Class literals with PascalCase
+(declaration
+  "=" @operator)
+
+(assignment
+  "=" @operator)
+
+(function_call
+  function: (identifier) @function)
+
+(function_call
+  function:
+    (dotted_identifier
+      (identifier) @function .))
+
+(function_call
+  (argument_list
+    (map_item
+      key: (identifier) @variable.parameter)))
+
+(juxt_function_call
+  function: (identifier) @function)
+
+(juxt_function_call
+  function:
+    (dotted_identifier
+      (identifier) @function .))
+
+(juxt_function_call
+  (argument_list
+    (map_item
+      key: (identifier) @variable.parameter)))
+
+(function_definition
+  function: (identifier) @function)
+
+(function_declaration
+  function: (identifier) @function)
+
+(annotation) @function.macro
+
+(annotation
+  (identifier) @function.macro)
+
+"@interface" @function.macro
+
+(groovy_doc) @comment.documentation @spell
+
+(groovy_doc
+  [
+    (groovy_doc_param)
+    (groovy_doc_throws)
+    (groovy_doc_tag)
+  ] @string.special @nospell)
+
+(groovy_doc
+  (groovy_doc_param
+    (identifier) @variable.parameter) @nospell)
+
+(groovy_doc
+  (groovy_doc_throws
+    (identifier) @type @nospell))
diff --git a/queries/groovy/indents.scm b/queries/groovy/indents.scm
new file mode 100644
index 000000000..888d50107
--- /dev/null
+++ b/queries/groovy/indents.scm
@@ -0,0 +1,35 @@
+[
+  (closure)
+  (map)
+  (list)
+  (argument_list)
+  (parameter_list)
+  (for_parameters)
+] @indent.begin
+
+; (function_definition "(" @indent.begin)
+(closure
+  "}" @indent.end)
+
+(argument_list
+  ")" @indent.end)
+
+(for_parameters
+  ")" @indent.end)
+
+((for_loop
+  body: (_) @_body) @indent.begin
+  (#not-has-type? @_body closure))
+
+; TODO: while, try
+(list
+  "]" @indent.end)
+
+(map
+  "]" @indent.end)
+
+[
+  "}"
+  ")"
+  "]"
+] @indent.branch
diff --git a/queries/groovy/injections.scm b/queries/groovy/injections.scm
index 14a5d393e..1c04c65fb 100644
--- a/queries/groovy/injections.scm
+++ b/queries/groovy/injections.scm
@@ -1,5 +1,5 @@
-((block_comment) @injection.content
+((comment) @injection.content
   (#set! injection.language "comment"))
 
-((line_comment) @injection.content
+((groovy_doc) @injection.content
   (#set! injection.language "comment"))
diff --git a/queries/groovy/locals.scm b/queries/groovy/locals.scm
new file mode 100644
index 000000000..23cb5f0cb
--- /dev/null
+++ b/queries/groovy/locals.scm
@@ -0,0 +1,6 @@
+(function_definition) @local.scope
+
+(parameter
+  name: (identifier) @local.definition.parameter)
+
+(identifier) @local.reference

From 4ea1a4ffa841acd8f1d51a7003f0cc9596ad8b64 Mon Sep 17 00:00:00 2001
From: kyazdani42 <kyazdani42@users.noreply.github.com>
Date: Mon, 29 Jan 2024 06:35:25 +0000
Subject: [PATCH 1071/2704] Update parsers: groovy, php, php_only

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 705771637..e3d8e024e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -237,7 +237,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "e20f616e6223b66defabc82c29f52431ee66e269"
+    "revision": "f723c6ee51f342e7ff29039d8771cd0b2f39ee5c"
   },
   "gstlaunch": {
     "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
@@ -450,10 +450,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "29a49d3a53353444ee2226e2efa140fec69dd3e0"
+    "revision": "3854d1cafab8dc02780d0eada9ed99c344b4a3db"
   },
   "php_only": {
-    "revision": "29a49d3a53353444ee2226e2efa140fec69dd3e0"
+    "revision": "3854d1cafab8dc02780d0eada9ed99c344b4a3db"
   },
   "phpdoc": {
     "revision": "67db260cf4e99a02283ae26b808d59b86d42dc0f"

From e24dab6696aa2a6682a117e241adc32c38e93d53 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 29 Jan 2024 10:14:42 +0100
Subject: [PATCH 1072/2704] ci: use nvim-treesitter-bot as committer

---
 .github/workflows/update-lockfile.yml | 1 +
 .github/workflows/update-readme.yml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index f12ca893f..f6a3f998f 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -45,6 +45,7 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
+          committer: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
           commit-message: "Update parsers: ${{ env.UPDATED_PARSERS }}"
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 1569e16a5..9852faafb 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -33,6 +33,7 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
+          committer: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
           commit-message: Update README
           title: Update README
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"

From 59a295f76aa9341a6ba42c680b9af99f2ae18edc Mon Sep 17 00:00:00 2001
From: kyazdani42 <kyazdani42@users.noreply.github.com>
Date: Tue, 30 Jan 2024 06:35:49 +0000
Subject: [PATCH 1073/2704] Update parsers: angular, beancount, liquidsoap,
 markdown, markdown_inline, purescript, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e3d8e024e..5241fddc6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
   },
   "angular": {
-    "revision": "28119b4dc813d3f8267d451c44548e99124fbf9a"
+    "revision": "dfdce7ec26fb23f6f3fd83d4c79370759d5286b5"
   },
   "apex": {
     "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
@@ -30,7 +30,7 @@
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
   },
   "beancount": {
-    "revision": "cd08aefa20dc0f3d5984b08b5d468f75bf4fd096"
+    "revision": "da1bf8c6eb0ae7a97588affde7227630bcd678b6"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -348,7 +348,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquidsoap": {
-    "revision": "691484ae766c4eee2ac59ec09e621b27b9ed9add"
+    "revision": "fb062bfc7ca09a741820debb7cb8a75a557b30f9"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -372,10 +372,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "28aa3baef73bd458d053b613b8bd10fd102b4405"
+    "revision": "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f"
   },
   "markdown_inline": {
-    "revision": "28aa3baef73bd458d053b613b8bd10fd102b4405"
+    "revision": "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f"
   },
   "matlab": {
     "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
@@ -501,7 +501,7 @@
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "purescript": {
-    "revision": "85a90951c10f118f819c1137f669800246890db7"
+    "revision": "cfd217d32aa0266401ec5bf3d929697fdeb835ba"
   },
   "pymanifest": {
     "revision": "a77547018ada84ca4bc115c7650b19441120f065"
@@ -732,7 +732,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d4e17313d3c6e86b2737ec22b92764690cd66d0e"
+    "revision": "f75d1e842021b051e24303eb637396ec6f0bba60"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 569d5dfadb591b2cadd4710dc1ca1f45aa16ec60 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 30 Jan 2024 09:00:58 +0100
Subject: [PATCH 1074/2704] ci: use nvim-treesitter-bot as author

---
 .github/workflows/update-lockfile.yml | 2 +-
 .github/workflows/update-readme.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index f6a3f998f..efcea9ee6 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -45,7 +45,7 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
-          committer: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
+          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
           commit-message: "Update parsers: ${{ env.UPDATED_PARSERS }}"
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 9852faafb..d8954e462 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -33,7 +33,7 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ steps.app-token.outputs.token }}
-          committer: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
+          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
           commit-message: Update README
           title: Update README
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"

From e9602f41192ba51842b4be4d02c718a64cd57acf Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 30 Jan 2024 09:57:54 +0100
Subject: [PATCH 1075/2704] fix(format): improve error message

---
 scripts/format-queries.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 67b850976..b7c230096 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -7,7 +7,8 @@ local get_node_text = ts.get_node_text
 local files
 
 if not _G.arg[1] then
-  error "Must specify specify file or directory to format!"
+  print "Must specify file or directory to format!"
+  return
 elseif _G.arg[1]:match ".*%.scm$" then
   files = { _G.arg[1] }
 else

From 5f950cdcb82d2cf74e6b30338897b3a4897f52b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Tue, 30 Jan 2024 22:19:54 +0700
Subject: [PATCH 1076/2704] fix(format): handle list with 300 nodes

---
 queries/gdscript/highlights.scm |  2 +-
 queries/gnuplot/highlights.scm  |  4 +---
 queries/make/highlights.scm     |  3 +--
 queries/matlab/highlights.scm   |  3 +--
 scripts/format-queries.lua      | 18 +++---------------
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 0e514eec7..f9d2b762f 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -277,9 +277,9 @@
   ))
 
 ; Builtin Funcs
+; format-ignore
 (call
   (identifier) @function.builtin
-  ; format-ignore
   (#any-of? @function.builtin
     ; @GlobalScope
     "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
diff --git a/queries/gnuplot/highlights.scm b/queries/gnuplot/highlights.scm
index 1ba789118..d8e546a03 100644
--- a/queries/gnuplot/highlights.scm
+++ b/queries/gnuplot/highlights.scm
@@ -165,8 +165,7 @@
     "background"
     "rounded"
     "butt"
-  ]*
-     @attribute)
+  ]* @attribute)
 
 ; (t_canvas)
 ; (t_cgm)
@@ -288,7 +287,6 @@
 ] @variable.member
 
 ; Workaround because formatter cannot handle 300 list nodes
-; format-ignore
 [
   (angles)
   (clip)
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index 01b8438f5..38adac07f 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -74,8 +74,7 @@
     ; ":::="
     "?="
     "!="
-  ]?
-     @operator
+  ]? @operator
   "endef" @keyword)
 
 (variable_assignment
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index d92808078..a2ebc153a 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -116,8 +116,7 @@
   [
     "end"
     "endfunction"
-  ]?
-     @keyword.function)
+  ]? @keyword.function)
 
 (function_signature
   name: (identifier) @function)
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index b7c230096..5cb0fb1a2 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -106,25 +106,19 @@ local format_queries = [[
 ;; Only starts indent if 2 or more elements
 (list
   "[" @format.indent.begin
-  .
-  (_)
-  .
-  (_)
   "]" @format.indent.dedent)
 ;; Otherwise, remove brackets
 (list
-  "[" @format.remove
+  "[" @format.remove @format.cancel-append
   .
   (_) @format.cancel-append
   .
   "]" @format.remove)
 ;; [ ... ] @capture1 @capture2
-(list
-  (capture) @format.prepend-space)
 ;; Append newlines for nodes inside the list
 (list
   (_) @format.append-newline
-  (#not-has-type? @format.append-newline capture))
+  (#not-has-type? @format.append-newline capture quantifier))
 
 ;; (_), "_" and _ handler
 ;; Start indents if it's one of these patterns
@@ -176,9 +170,6 @@ local format_queries = [[
     (anonymous_node)
     "."
   ] @format.append-newline)
-(named_node
-  (list
-    "[" . (_) @format.append-newline . "]"))
 
 ;; Collapse closing parentheses
 (named_node
@@ -192,10 +183,7 @@ local format_queries = [[
   (#not-has-type? @format.cancel-append comment))
 
 ;; All captures should be separated with a space
-(named_node
-  (capture) @format.prepend-space)
-(anonymous_node
-  (capture) @format.prepend-space)
+(capture) @format.prepend-space
 
 ;; Workaround to just use the string's content
 (anonymous_node (identifier) @format.keep)

From ba6454783493ac3a5dd209c25e491640b07bd8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= <majosolano99@gmail.com>
Date: Tue, 30 Jan 2024 13:34:46 -0800
Subject: [PATCH 1077/2704] fix(incremental-selection): second attempt at
 fixing command (#6014)

---
 lua/nvim-treesitter/incremental_selection.lua | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/incremental_selection.lua b/lua/nvim-treesitter/incremental_selection.lua
index f95b71e02..0ba10971e 100644
--- a/lua/nvim-treesitter/incremental_selection.lua
+++ b/lua/nvim-treesitter/incremental_selection.lua
@@ -23,8 +23,8 @@ end
 -- The range starts with 1 and the ending is inclusive.
 ---@return integer, integer, integer, integer
 local function visual_selection_range()
-  local _, csrow, cscol, _ = unpack(vim.fn.getpos "'<") ---@type integer, integer, integer, integer
-  local _, cerow, cecol, _ = unpack(vim.fn.getpos "'>") ---@type integer, integer, integer, integer
+  local _, csrow, cscol, _ = unpack(vim.fn.getpos "v") ---@type integer, integer, integer, integer
+  local _, cerow, cecol, _ = unpack(vim.fn.getpos ".") ---@type integer, integer, integer, integer
 
   local start_row, start_col, end_row, end_col ---@type integer, integer, integer, integer
 
@@ -146,9 +146,7 @@ function M.attach(bufnr)
         rhs = M[funcname]
       else
         mode = "x"
-        -- We need to move to command mode to access marks '< (visual area start) and '> (visual area end) which are not
-        -- properly accessible in visual mode.
-        rhs = string.format("<cmd>lua require'nvim-treesitter.incremental_selection'.%s()<CR>", funcname)
+        rhs = M[funcname] ---@type function
       end
       vim.keymap.set(
         mode,

From 45cde459b52e6939919f6b2f17355c2cf0027d7d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 06:35:05 +0000
Subject: [PATCH 1078/2704] Update parsers: apex, phpdoc, rbs, soql, sosl, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5241fddc6..b5e7e2427 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "dfdce7ec26fb23f6f3fd83d4c79370759d5286b5"
   },
   "apex": {
-    "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
+    "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
     "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
@@ -456,7 +456,7 @@
     "revision": "3854d1cafab8dc02780d0eada9ed99c344b4a3db"
   },
   "phpdoc": {
-    "revision": "67db260cf4e99a02283ae26b808d59b86d42dc0f"
+    "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
@@ -531,7 +531,7 @@
     "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
   },
   "rbs": {
-    "revision": "b28e1819d434e95916d11fe48ee6e8959b69197b"
+    "revision": "519a61132a51222e3ce73d3b7ef07465f587f346"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
@@ -594,10 +594,10 @@
     "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
   },
   "soql": {
-    "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
+    "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sosl": {
-    "revision": "ca70b2347a79615cd749517f6c6c2352e50a7ce9"
+    "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -732,7 +732,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f75d1e842021b051e24303eb637396ec6f0bba60"
+    "revision": "6c454c09c37d0fe4e4870c9a0d157e49a90edf75"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 364b86ec8ea88e4a77ba676b93fb10829d6a9cb3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 31 Jan 2024 10:42:21 +0100
Subject: [PATCH 1079/2704] ci: use M1 for macOS

GH Actions runners use M1 hardware for `macos-14` now. Since macOS is
one of the slowest platforms for parser compilation, switching should
give us not only ARM coverage but also shorter CI times.
---
 .github/workflows/test-queries.yml                            | 4 ++--
 .../{ci-install-macos-latest.sh => ci-install-macos-14.sh}    | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename scripts/{ci-install-macos-latest.sh => ci-install-macos-14.sh} (100%)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index cd1d4c5f3..d5a3894e4 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-2022, macos-latest]
+        os: [ubuntu-latest, windows-2022, macos-14]
         cc: [gcc, clang]
         nvim_tag: [stable]
         exclude:
@@ -30,7 +30,7 @@ jobs:
             cc: clang
             nvim_tag: stable
 
-          - os: macos-latest
+          - os: macos-14
             cc: gcc
             nvim_tag: stable
 
diff --git a/scripts/ci-install-macos-latest.sh b/scripts/ci-install-macos-14.sh
similarity index 100%
rename from scripts/ci-install-macos-latest.sh
rename to scripts/ci-install-macos-14.sh

From 6da205148fb43eb4fa70888fd6ac46a32f1fc3f2 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 31 Jan 2024 10:55:10 -0500
Subject: [PATCH 1080/2704] chore(ecma,jsx): update parser and queries

---
 lockfile.json               |  2 +-
 queries/ecma/folds.scm      |  2 +-
 queries/ecma/highlights.scm | 15 +++++++++------
 queries/ecma/injections.scm | 13 +++++++++++++
 queries/ecma/locals.scm     |  2 +-
 queries/jsx/highlights.scm  |  2 ++
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b5e7e2427..a0c8f28cd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -297,7 +297,7 @@
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
   },
   "javascript": {
-    "revision": "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"
+    "revision": "6d84193ae2395e54b699d9b7358bcf66cbcc19f5"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
diff --git a/queries/ecma/folds.scm b/queries/ecma/folds.scm
index 50f235a5d..5cc48064b 100644
--- a/queries/ecma/folds.scm
+++ b/queries/ecma/folds.scm
@@ -3,7 +3,7 @@
   (for_statement)
   (while_statement)
   (arrow_function)
-  (function)
+  (function_expression)
   (function_declaration)
   (class_declaration)
   (method_definition)
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 4156222cb..f5f2d5614 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -36,7 +36,7 @@
 
 ; Function and method definitions
 ;--------------------------------
-(function
+(function_expression
   name: (identifier) @function)
 
 (function_declaration
@@ -61,7 +61,7 @@
 
 (pair
   key: (property_identifier) @function.method
-  value: (function))
+  value: (function_expression))
 
 (pair
   key: (property_identifier) @function.method
@@ -77,7 +77,7 @@
   left:
     (member_expression
       property: (property_identifier) @function.method)
-  right: (function))
+  right: (function_expression))
 
 (variable_declarator
   name: (identifier) @function
@@ -85,7 +85,7 @@
 
 (variable_declarator
   name: (identifier) @function
-  value: (function))
+  value: (function_expression))
 
 (assignment_expression
   left: (identifier) @function
@@ -93,7 +93,7 @@
 
 (assignment_expression
   left: (identifier) @function
-  right: (function))
+  right: (function_expression))
 
 ; Function and method calls
 ;--------------------------
@@ -158,7 +158,10 @@
   (undefined)
 ] @constant.builtin
 
-(comment) @comment @spell
+[
+  (comment)
+  (html_comment)
+] @comment @spell
 
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index d23e2fdfa..00ff12c5a 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -16,6 +16,7 @@
     ]
   (#lua-match? @injection.language "^[a-zA-Z][a-zA-Z0-9]*$")
   (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
   (#not-eq? @injection.language "svg"))
 
 ; svg`...` or svg(`...`), which uses the html parser, so is not included in the previous query
@@ -30,6 +31,7 @@
       (template_string) @injection.content
     ]
   (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
   (#set! injection.language "html"))
 
 (call_expression
@@ -39,6 +41,7 @@
   arguments:
     ((template_string) @injection.content
       (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.include-children)
       (#set! injection.language "graphql")))
 
 (call_expression
@@ -48,6 +51,7 @@
   arguments:
     ((template_string) @injection.content
       (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.include-children)
       (#set! injection.language "glimmer")))
 
 ((glimmer_template) @injection.content
@@ -62,6 +66,7 @@
   arguments:
     ((template_string) @injection.content
       (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.include-children)
       (#set! injection.language "styled")))
 
 ; styled(Component)`<css>`
@@ -73,6 +78,7 @@
   arguments:
     ((template_string) @injection.content
       (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.include-children)
       (#set! injection.language "styled")))
 
 ; styled.div.attrs({ prop: "foo" })`<css>`
@@ -88,6 +94,7 @@
   arguments:
     ((template_string) @injection.content
       (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.include-children)
       (#set! injection.language "styled")))
 
 ; styled(Component).attrs({ prop: "foo" })`<css>`
@@ -103,6 +110,7 @@
   arguments:
     ((template_string) @injection.content
       (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.include-children)
       (#set! injection.language "styled")))
 
 ((regex_pattern) @injection.content
@@ -115,6 +123,7 @@
 ((template_string) @injection.content
   (#lua-match? @injection.content "^`#graphql")
   (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
   (#set! injection.language "graphql"))
 
 ; el.innerHTML = `<html>`
@@ -125,6 +134,7 @@
       (#any-of? @_prop "outerHTML" "innerHTML"))
   right: (template_string) @injection.content
   (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
   (#set! injection.language "html"))
 
 ; el.innerHTML = '<html>'
@@ -157,6 +167,7 @@
             value:
               ((template_string) @injection.content
                 (#offset! @injection.content 0 1 0 -1)
+                (#set! injection.include-children)
                 (#set! injection.language "angular")))))))
 
 ; @Component({
@@ -178,6 +189,7 @@
               (array
                 ((template_string) @injection.content
                   (#offset! @injection.content 0 1 0 -1)
+                  (#set! injection.include-children)
                   (#set! injection.language "css"))))))))
 
 ; @Component({
@@ -197,5 +209,6 @@
                 (#eq? @_prop "styles"))
             value:
               ((template_string) @injection.content
+                (#set! injection.include-children)
                 (#offset! @injection.content 0 1 0 -1)
                 (#set! injection.language "css")))))))
diff --git a/queries/ecma/locals.scm b/queries/ecma/locals.scm
index 24297940c..24ea7c0a8 100644
--- a/queries/ecma/locals.scm
+++ b/queries/ecma/locals.scm
@@ -2,7 +2,7 @@
 ;-------
 (statement_block) @local.scope
 
-(function) @local.scope
+(function_expression) @local.scope
 
 (arrow_function) @local.scope
 
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 5993ff7c4..f2200b6a2 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -62,4 +62,6 @@
     (identifier) @tag.builtin
     (property_identifier) @tag))
 
+(html_character_reference) @tag
+
 (jsx_text) @none

From 90327d9e7363e899b6a3c3fe5796eb7bf3ac6bcd Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 31 Jan 2024 10:56:51 -0500
Subject: [PATCH 1081/2704] chore(typescript,tsx): update parser and queries

---
 lockfile.json                     | 4 ++--
 queries/typescript/highlights.scm | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a0c8f28cd..6d931718b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -675,7 +675,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "tsx": {
-    "revision": "d847898fec3fe596798c9fda55cb8c05a799001a"
+    "revision": "7db8390a16a2cae317f4f4423a7b642cd4cad8c9"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -684,7 +684,7 @@
     "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
   },
   "typescript": {
-    "revision": "d847898fec3fe596798c9fda55cb8c05a799001a"
+    "revision": "7db8390a16a2cae317f4f4423a7b642cd4cad8c9"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 3cc9b7f13..ce1fa886a 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -17,6 +17,7 @@
   "asserts"
   "infer"
   "is"
+  "using"
 ] @keyword
 
 [
@@ -95,6 +96,9 @@
 (omitting_type_annotation
   "-?:" @punctuation.delimiter)
 
+(adding_type_annotation
+  "+?:" @punctuation.delimiter)
+
 (opting_type_annotation
   "?:" @punctuation.delimiter)
 

From 515b00598a4786631466d5c4b7c7fd0188ae1022 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 31 Jan 2024 16:03:12 -0500
Subject: [PATCH 1082/2704] chore(qmljs): temporarily remove the ecma inherit

---
 queries/qmljs/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index a6a17b25a..7cf08ed0a 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -1,4 +1,4 @@
-; inherits: ecma
+; temporarily removed the ecma inherit due to it breaking
 "pragma" @keyword.import
 
 ; Annotations

From 13599375c3d7759b1af14a421ea271bd6daa6811 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 06:36:44 +0000
Subject: [PATCH 1083/2704] Update parsers: bitbake, groovy, haskell, kconfig,
 luadoc, starlark, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6d931718b..4cb4ef7f1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -39,7 +39,7 @@
     "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
   },
   "bitbake": {
-    "revision": "01ead542b1e6f52cc9a2c9c1c95e079702122161"
+    "revision": "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"
   },
   "blueprint": {
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
@@ -237,7 +237,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "f723c6ee51f342e7ff29039d8771cd0b2f39ee5c"
+    "revision": "fdc03a7040945d551c009c0d2b39aa1d42894437"
   },
   "gstlaunch": {
     "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
@@ -249,7 +249,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "cf98de23e4285b8e6bcb57b050ef2326e2cc284b"
+    "revision": "9527ab807f8141fbfe5b48bf6a5878a05fb971fe"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -321,7 +321,7 @@
     "revision": "0c088d1ad270f02c4e84189247ac7001e86fe342"
   },
   "kconfig": {
-    "revision": "5fefd45628a32fc999aa9f4aebcc5ddcd071bcf2"
+    "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
   },
   "kdl": {
     "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
@@ -357,7 +357,7 @@
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
   "luadoc": {
-    "revision": "d82b43018a6b22d70b264ed8713be1c4daf9b0e0"
+    "revision": "bb310813b2661e5add6a79c11f63b05db52c1045"
   },
   "luap": {
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
@@ -612,7 +612,7 @@
     "revision": "096981397385f49833dfd66037fa98081bbd9ef9"
   },
   "starlark": {
-    "revision": "c45ce2b39062bbd12ea1c210bd200db250efb24a"
+    "revision": "b31a616aac5d05f927f3f9dd809789db7805b632"
   },
   "strace": {
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
@@ -732,7 +732,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "6c454c09c37d0fe4e4870c9a0d157e49a90edf75"
+    "revision": "0e25cada0e946c4710f6526f6116798c37177647"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 5fca7ae4960c415af0b038e89a2d84ef6e16d28d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 1 Feb 2024 02:40:11 -0500
Subject: [PATCH 1084/2704] chore(bicep): update highlights

---
 lockfile.json                |  2 +-
 queries/bicep/highlights.scm | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4cb4ef7f1..b1acc4f21 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
   },
   "bicep": {
-    "revision": "3604d8c961ab129d2bfc6dfca56419c236ccdb83"
+    "revision": "48a00c254671b5e847e615442678f4f3f5aa1e43"
   },
   "bitbake": {
     "revision": "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"
diff --git a/queries/bicep/highlights.scm b/queries/bicep/highlights.scm
index 0045f8b8c..d1f34b1e6 100644
--- a/queries/bicep/highlights.scm
+++ b/queries/bicep/highlights.scm
@@ -1,10 +1,11 @@
 ; Includes
-(import_statement
-  "import" @keyword.import)
-
-(import_with_statement
-  "import" @keyword.import
-  "with" @keyword.import)
+[
+  "import"
+  "provider"
+  "with"
+  "as"
+  "from"
+] @keyword.import
 
 ; Namespaces
 (module_declaration

From 129f8b97426212808a0e719d8bbe0c1a4cbb9cc0 Mon Sep 17 00:00:00 2001
From: Levi Frandsen <l3viop@gmail.com>
Date: Thu, 1 Feb 2024 10:24:57 -0600
Subject: [PATCH 1085/2704] fix(svelte): correct indents, add key block

resolves #6028
---
 queries/svelte/indents.scm | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/queries/svelte/indents.scm b/queries/svelte/indents.scm
index 6000c5900..9fde057c7 100644
--- a/queries/svelte/indents.scm
+++ b/queries/svelte/indents.scm
@@ -1,20 +1,23 @@
+; inherits: html_tags
+
 [
-  (element)
   (if_statement)
   (each_statement)
   (await_statement)
-  (script_element)
-  (style_element)
+  (key_statement)
 ] @indent.begin
 
+
+(if_end_expr "}" @indent.end)
+(each_end_expr "}" @indent.end)
+(await_end_expr "}" @indent.end)
+(key_end_expr "}" @indent.end)
+
 [
-  (end_tag)
-  (else_statement)
   (if_end_expr)
+  (else_if_statement)
+  (else_statement)
   (each_end_expr)
   (await_end_expr)
-  ">"
-  "/>"
+  (key_end_expr)
 ] @indent.branch
-
-(comment) @indent.ignore

From 7e4e92432d9252d327f4b2f91aabc198a08308d4 Mon Sep 17 00:00:00 2001
From: Levi Frandsen <l3viop@gmail.com>
Date: Thu, 1 Feb 2024 10:34:15 -0600
Subject: [PATCH 1086/2704] fix(svelte): correct formatting

---
 queries/svelte/indents.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/queries/svelte/indents.scm b/queries/svelte/indents.scm
index 9fde057c7..58224eae1 100644
--- a/queries/svelte/indents.scm
+++ b/queries/svelte/indents.scm
@@ -1,5 +1,4 @@
 ; inherits: html_tags
-
 [
   (if_statement)
   (each_statement)
@@ -7,11 +6,17 @@
   (key_statement)
 ] @indent.begin
 
+(if_end_expr
+  "}" @indent.end)
 
-(if_end_expr "}" @indent.end)
-(each_end_expr "}" @indent.end)
-(await_end_expr "}" @indent.end)
-(key_end_expr "}" @indent.end)
+(each_end_expr
+  "}" @indent.end)
+
+(await_end_expr
+  "}" @indent.end)
+
+(key_end_expr
+  "}" @indent.end)
 
 [
   (if_end_expr)

From f2119df35cdcdb0c6c9bf791a04000d4d131cef7 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Thu, 1 Feb 2024 17:40:21 +0300
Subject: [PATCH 1087/2704] feat(go): printf injections

https://pkg.go.dev/fmt#pkg-index
https://pkg.go.dev/fmt#Fscanf
https://pkg.go.dev/fmt#Appendf
https://pkg.go.dev/fmt#Sscanf
https://pkg.go.dev/testing#T.Skipf
https://pkg.go.dev/testing#F.Logf

The problem covered here:
https://github.com/nvim-treesitter/nvim-treesitter/issues/2917
---
 queries/go/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 7d9166e33..3e194e272 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -25,7 +25,7 @@
     (argument_list
       .
       (interpreted_string_literal) @injection.content))
-  (#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf")
+  (#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf" "Errorf" "Skipf" "Logf")
   (#set! injection.language "printf"))
 
 ((call_expression
@@ -37,5 +37,5 @@
       (_)
       .
       (interpreted_string_literal) @injection.content))
-  (#eq? @_method "Fprintf")
+  (#eq? @_method "Fprintf" "Fscanf" "Appendf" "Sscanf")
   (#set! injection.language "printf"))

From e7ea07e42c478cb466cf96124693b447add84011 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <IlyasYOY@gmail.com>
Date: Thu, 1 Feb 2024 18:33:28 +0300
Subject: [PATCH 1088/2704] fix(go): fix eq to any-of

---
 queries/go/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 3e194e272..20f615924 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -37,5 +37,5 @@
       (_)
       .
       (interpreted_string_literal) @injection.content))
-  (#eq? @_method "Fprintf" "Fscanf" "Appendf" "Sscanf")
+  (#any-of? @_method "Fprintf" "Fscanf" "Appendf" "Sscanf")
   (#set! injection.language "printf"))

From d2b4563230bb3564fa3c0f74373b2700d69f28b4 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 1 Feb 2024 01:19:51 -0500
Subject: [PATCH 1089/2704] chore(kconfig): update highlights

---
 queries/kconfig/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index bad7a26eb..307ce1a13 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -42,6 +42,8 @@
   ">="
   "!"
   ":="
+  "+="
+  "?="
 ] @operator
 
 [

From 8b99311ca1171015bda7d2bb2250a1aaf2d9ea8a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 2 Feb 2024 00:12:17 -0500
Subject: [PATCH 1090/2704] chore(bicep): update queries and add scanner

---
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua |  2 +-
 queries/bicep/highlights.scm    | 33 +++++++++++++++++++++------------
 queries/bicep/locals.scm        |  7 ++++++-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b1acc4f21..089648eeb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
   },
   "bicep": {
-    "revision": "48a00c254671b5e847e615442678f4f3f5aa1e43"
+    "revision": "b33f29563e102f5cdf70c3bb5fd65a1bf4cc2456"
   },
   "bitbake": {
     "revision": "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e31f19747..d74267c20 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -180,7 +180,7 @@ list.bibtex = {
 list.bicep = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-bicep",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@amaanq" },
 }
diff --git a/queries/bicep/highlights.scm b/queries/bicep/highlights.scm
index d1f34b1e6..35c9d6c17 100644
--- a/queries/bicep/highlights.scm
+++ b/queries/bicep/highlights.scm
@@ -22,6 +22,9 @@
 (call_expression
   function: (identifier) @function.call)
 
+(user_defined_function
+  name: (identifier) @function)
+
 ; Properties
 (object_property
   (identifier) @property
@@ -58,12 +61,6 @@
   "="
   (identifier) @type)
 
-(type_declaration
-  (identifier)
-  "="
-  (array_type
-    (identifier) @type))
-
 (type
   (identifier) @type)
 
@@ -89,6 +86,10 @@
     (member_expression
       object: (identifier) @variable.parameter)))
 
+(parameter
+  .
+  (identifier) @variable.parameter)
+
 ; Variables
 (variable_declaration
   (identifier) @variable
@@ -137,8 +138,14 @@
   "targetScope"
   "type"
   "var"
+  "using"
+  "test"
 ] @keyword
 
+"func" @keyword.function
+
+"assert" @keyword.exception
+
 ; Operators
 [
   "+"
@@ -160,19 +167,20 @@
   "??"
   "="
   "!"
+  ".?"
 ] @operator
 
+(subscript_expression
+  "?" @operator)
+
+(nullable_type
+  "?" @operator)
+
 "in" @keyword.operator
 
 ; Literals
 (string) @string
 
-(import_string
-  "'" @string
-  (import_name) @module
-  "@" @string.special.symbol
-  (import_version) @string.special)
-
 (escape_sequence) @string.escape
 
 (number) @number
@@ -204,6 +212,7 @@
 
 [
   "."
+  ":"
   "::"
   "=>"
 ] @punctuation.delimiter
diff --git a/queries/bicep/locals.scm b/queries/bicep/locals.scm
index 137753ae2..cc9c3c2cf 100644
--- a/queries/bicep/locals.scm
+++ b/queries/bicep/locals.scm
@@ -36,7 +36,8 @@
   (compatible_identifier) @local.definition.field
   (_))
 
-(import_name) @local.definition.import
+(user_defined_function
+  name: (identifier) @local.definition.function)
 
 (module_declaration
   (identifier) @local.definition.namespace)
@@ -45,6 +46,10 @@
   (identifier) @local.definition.parameter
   (_))
 
+(parameter
+  .
+  (identifier) @local.definition.parameter)
+
 (type_declaration
   (identifier) @local.definition.type
   (_))

From 95125827758ee49a398cce05750dc9563ee3a23d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 07:26:59 +0000
Subject: [PATCH 1091/2704] Update parsers: bicep, cpp, gitcommit, kdl, php,
 php_only, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 089648eeb..27d87b2e2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -36,7 +36,7 @@
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
   },
   "bicep": {
-    "revision": "b33f29563e102f5cdf70c3bb5fd65a1bf4cc2456"
+    "revision": "c3451d1049c80074b18078ba50007b7c00e063f8"
   },
   "bitbake": {
     "revision": "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"
@@ -81,7 +81,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "4ca37be8e70e5a40ae95688bec56b886ba945888"
+    "revision": "2e4d27f7728a4f90f292e3d9fe27e51ce51ca426"
   },
   "css": {
     "revision": "98c7b3dceb24f1ee17f1322f3947e55638251c37"
@@ -195,7 +195,7 @@
     "revision": "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"
   },
   "gitcommit": {
-    "revision": "e8d9eda4e5ea0b08aa39d48dab0f6553058fbe0f"
+    "revision": "dc8f5dea7fb2284cc51a4781977b5939416cdfd8"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -324,7 +324,7 @@
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
   },
   "kdl": {
-    "revision": "e180e05132c4cb229a8ba679b298790ef1eca77c"
+    "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
   },
   "kotlin": {
     "revision": "0ef87892401bb01c84b40916e1f150197bc134b1"
@@ -450,10 +450,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "3854d1cafab8dc02780d0eada9ed99c344b4a3db"
+    "revision": "71f56a90e75f954d7b701c1e9fc71d22fcc2080b"
   },
   "php_only": {
-    "revision": "3854d1cafab8dc02780d0eada9ed99c344b4a3db"
+    "revision": "71f56a90e75f954d7b701c1e9fc71d22fcc2080b"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -732,7 +732,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0e25cada0e946c4710f6526f6116798c37177647"
+    "revision": "3b77e233eb3d2b85986f4daeffb4d21f0ed3eeba"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From b7e1a6c2cdc934315cd1914f25763a2a8038c855 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 15:07:04 +0000
Subject: [PATCH 1092/2704] Update parsers: embedded_template, fennel,
 javascript, php, php_only, qmljs, ruby

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 27d87b2e2..94cef1a03 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"
+    "revision": "d04a1e82b368bd3b2c2d9bc8ed38c1a1f01b337f"
   },
   "erlang": {
     "revision": "54b6f814f43c4eac81eeedefaa7cc8762fec6683"
@@ -156,7 +156,7 @@
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
   },
   "fennel": {
-    "revision": "517195970428aacca60891b050aa53eabf4ba78d"
+    "revision": "15e4f8c417281768db17080c4447297f8ff5343a"
   },
   "firrtl": {
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
@@ -297,7 +297,7 @@
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
   },
   "javascript": {
-    "revision": "6d84193ae2395e54b699d9b7358bcf66cbcc19f5"
+    "revision": "24b9885a211bed50415acabe9a30e2d0f6896e6d"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -450,10 +450,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "71f56a90e75f954d7b701c1e9fc71d22fcc2080b"
+    "revision": "c7fb0aab36320fff216b514868694427ad7868f6"
   },
   "php_only": {
-    "revision": "71f56a90e75f954d7b701c1e9fc71d22fcc2080b"
+    "revision": "c7fb0aab36320fff216b514868694427ad7868f6"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -516,7 +516,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "259133077f2fd854bcaa6f0149d3fc281fc8070b"
+    "revision": "9fa49ff3315987f715ce5666ff979a7742fa8a98"
   },
   "query": {
     "revision": "67e9e009436c8c1f2de9f4c654ee3e7674675769"
@@ -558,7 +558,7 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "4d9ad3f010fdc47a8433adcf9ae30c8eb8475ae7"
+    "revision": "9061b0afbe4f19f58f4ac9cb7834b72648759cdb"
   },
   "rust": {
     "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"

From a536ecad5744d03e6a56f63d635c35ceea3207c0 Mon Sep 17 00:00:00 2001
From: Michael Strobel <mstrobel97@gmail.com>
Date: Fri, 2 Feb 2024 14:47:23 +0100
Subject: [PATCH 1093/2704] fix(php): add missing spaceship operator `<=>`

---
 queries/php_only/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index cbc7e1839..7887a9778 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -346,6 +346,7 @@
   ">="
   ">"
   "<>"
+  "<=>"
   "=="
   "!="
   "==="

From 1cda98132abfde758c1778096960f9b2c0bd78c1 Mon Sep 17 00:00:00 2001
From: Ilia Ilinykh <18665585+IlyasYOY@users.noreply.github.com>
Date: Fri, 2 Feb 2024 22:00:03 +0300
Subject: [PATCH 1094/2704] feat(java): inject printf in String.formatted
 (#6045)

https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html#formatted(java.lang.Object...)
---
 queries/java/injections.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 59e1be02b..8113bea28 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -18,3 +18,11 @@
         (_) @injection.content)))
   (#any-of? @_method "format" "printf")
   (#set! injection.language "printf"))
+
+((method_invocation
+  object:
+    (string_literal
+      (string_fragment) @injection.content)
+  name: (identifier) @_method)
+  (#eq? @_method "formatted")
+  (#set! injection.language "printf"))

From 140a486abe6dd3cbc40d0620985fccee6f5f609f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= <majosolano99@gmail.com>
Date: Wed, 31 Jan 2024 20:37:47 -0800
Subject: [PATCH 1095/2704] refactor(inc-selection): simplify keymap and add
 error message

---
 lua/nvim-treesitter/incremental_selection.lua | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/incremental_selection.lua b/lua/nvim-treesitter/incremental_selection.lua
index 0ba10971e..f6f8fb266 100644
--- a/lua/nvim-treesitter/incremental_selection.lua
+++ b/lua/nvim-treesitter/incremental_selection.lua
@@ -5,6 +5,7 @@ local ts_utils = require "nvim-treesitter.ts_utils"
 local locals = require "nvim-treesitter.locals"
 local parsers = require "nvim-treesitter.parsers"
 local queries = require "nvim-treesitter.query"
+local utils = require "nvim-treesitter.utils"
 
 local M = {}
 
@@ -138,22 +139,14 @@ function M.attach(bufnr)
   local config = configs.get_module "incremental_selection"
   for funcname, mapping in pairs(config.keymaps) do
     if mapping then
-      ---@type string, string|function
-      local mode, rhs
-      if funcname == "init_selection" then
-        mode = "n"
-        ---@type function
-        rhs = M[funcname]
+      local mode = funcname == "init_selection" and "n" or "x"
+      local rhs = M[funcname] ---@type function
+
+      if not rhs then
+        utils.notify("Unknown keybinding: " .. funcname .. debug.traceback(), vim.log.levels.ERROR)
       else
-        mode = "x"
-        rhs = M[funcname] ---@type function
+        vim.keymap.set(mode, mapping, rhs, { buffer = bufnr, silent = true, desc = FUNCTION_DESCRIPTIONS[funcname] })
       end
-      vim.keymap.set(
-        mode,
-        mapping,
-        rhs,
-        { buffer = bufnr, silent = true, noremap = true, desc = FUNCTION_DESCRIPTIONS[funcname] }
-      )
     end
   end
 end

From 4fbf150a1621d52f17b099506e1a32f107079210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= <majosolano99@gmail.com>
Date: Fri, 2 Feb 2024 13:15:27 -0800
Subject: [PATCH 1096/2704] fix(inc-selection): handle deleting non-existing
 keymaps

---
 lua/nvim-treesitter/incremental_selection.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/incremental_selection.lua b/lua/nvim-treesitter/incremental_selection.lua
index f6f8fb266..78f0915c8 100644
--- a/lua/nvim-treesitter/incremental_selection.lua
+++ b/lua/nvim-treesitter/incremental_selection.lua
@@ -155,10 +155,10 @@ function M.detach(bufnr)
   local config = configs.get_module "incremental_selection"
   for f, mapping in pairs(config.keymaps) do
     if mapping then
-      if f == "init_selection" then
-        vim.keymap.del("n", mapping, { buffer = bufnr })
-      else
-        vim.keymap.del("x", mapping, { buffer = bufnr })
+      local mode = f == "init_selection" and "n" or "x"
+      local ok, err = pcall(vim.keymap.del, mode, mapping, { buffer = bufnr })
+      if not ok then
+        utils.notify(string.format('%s "%s" for mode %s', err, mapping, mode), vim.log.levels.ERROR)
       end
     end
   end

From 0d14299a9de818b6ef1f37313eddb100edb1f974 Mon Sep 17 00:00:00 2001
From: Calum Smith <hello@calum.io>
Date: Mon, 5 Feb 2024 11:26:42 -0500
Subject: [PATCH 1097/2704] highlight(jsx,tsx): character references (a.k.a.
 entities)

---
 queries/jsx/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index f2200b6a2..98fc02f95 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -65,3 +65,5 @@
 (html_character_reference) @tag
 
 (jsx_text) @none
+
+(html_character_reference) @character.special

From 7bba891bae1ab70a01e464189b37a9ff96cbf025 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 06:35:47 +0000
Subject: [PATCH 1098/2704] Update parsers: angular, bash, gitcommit, glsl,
 hlsl, php, php_only, templ, wing

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 94cef1a03..0028477f6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
   },
   "angular": {
-    "revision": "dfdce7ec26fb23f6f3fd83d4c79370759d5286b5"
+    "revision": "3946b1040b98a12458beef2763ce4780a523e3c6"
   },
   "apex": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -24,7 +24,7 @@
     "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
-    "revision": "f7239f638d3dc16762563a9027faeee518ce1bd9"
+    "revision": "270c06b20567af619da1272dcd32ced9f42951d7"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -195,7 +195,7 @@
     "revision": "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"
   },
   "gitcommit": {
-    "revision": "dc8f5dea7fb2284cc51a4781977b5939416cdfd8"
+    "revision": "7c01af8d227b5344f62aade2ff00f19bd0c458ca"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -207,7 +207,7 @@
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
   },
   "glsl": {
-    "revision": "5bb58a6a5b0941d4e1256c6335e50d9780e74dde"
+    "revision": "c15d4e8b2599234745d5f3454695067e61092c20"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -264,7 +264,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "8b10faba024b536dc85f76e0c678f573b1776034"
+    "revision": "3ade6d065c69cd72c4da966d0c0af98bfb512f16"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -450,10 +450,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "c7fb0aab36320fff216b514868694427ad7868f6"
+    "revision": "5ceb92397f68b4aad73b09dee3c63639cb4611e7"
   },
   "php_only": {
-    "revision": "c7fb0aab36320fff216b514868694427ad7868f6"
+    "revision": "5ceb92397f68b4aad73b09dee3c63639cb4611e7"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -648,7 +648,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "a3ef3d8e73515b196d30adf9ee5115f057f7a2c6"
+    "revision": "b3e9f7c98e999f831fe1292166fcfc82cbb10f31"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -732,7 +732,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "3b77e233eb3d2b85986f4daeffb4d21f0ed3eeba"
+    "revision": "d2c60c4caebec98ef080391b2f27adebc4c5d5a8"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From 8d6192baa9f78990cf784c57784506e60ce573c4 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 4 Feb 2024 09:01:25 -0800
Subject: [PATCH 1099/2704] fix(latex): give comments higher precedence

This commit also moves things around to give text better precedence in
the case of `textit` and `textbf`.
---
 queries/latex/highlights.scm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index aad68e4f7..a249d04bb 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -11,15 +11,6 @@
   key: (_) @variable.parameter
   value: (_))
 
-[
-  (line_comment)
-  (block_comment)
-  (comment_environment)
-] @comment @spell
-
-((line_comment) @keyword.directive
-  (#lua-match? @keyword.directive "^%% !TeX"))
-
 [
   (brack_group)
   (brack_group_argc)
@@ -164,12 +155,6 @@
     (curly_group
       (_) @none @spell))
 
-; Math
-[
-  (displayed_equation)
-  (inline_formula)
-] @markup.math
-
 (math_environment
   (begin
     command: _ @markup.math
@@ -313,6 +298,15 @@
       (_) @markup.link.url))
   (#any-of? @_name "\\url" "\\href"))
 
+[
+  (line_comment)
+  (block_comment)
+  (comment_environment)
+] @comment @spell
+
+((line_comment) @keyword.directive
+  (#lua-match? @keyword.directive "^%% !TeX"))
+
 ; File inclusion commands
 (class_include
   command: _ @keyword.import
@@ -369,3 +363,9 @@
 (label_reference) @nospell
 
 (label_reference_range) @nospell
+
+; Math
+[
+  (displayed_equation)
+  (inline_formula)
+] @markup.math

From 127cf25737300c7cd5ea74d387576008a9eafe2a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 5 Feb 2024 10:10:18 -0800
Subject: [PATCH 1100/2704] feat(latex): pre-compiled header highlights, tests

Also moves comment highlights to the very end to make them more
future-proof.
---
 queries/latex/highlights.scm          | 21 +++++++++--------
 tests/query/highlights/latex/test.tex | 33 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 tests/query/highlights/latex/test.tex

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index a249d04bb..9649b5dd6 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -298,15 +298,6 @@
       (_) @markup.link.url))
   (#any-of? @_name "\\url" "\\href"))
 
-[
-  (line_comment)
-  (block_comment)
-  (comment_environment)
-] @comment @spell
-
-((line_comment) @keyword.directive
-  (#lua-match? @keyword.directive "^%% !TeX"))
-
 ; File inclusion commands
 (class_include
   command: _ @keyword.import
@@ -369,3 +360,15 @@
   (displayed_equation)
   (inline_formula)
 ] @markup.math
+
+[
+  (line_comment)
+  (block_comment)
+  (comment_environment)
+] @comment @spell
+
+((line_comment) @keyword.directive
+  (#lua-match? @keyword.directive "^%% !TeX"))
+
+((line_comment) @keyword.directive
+  (#lua-match? @keyword.directive "^%%&"))
diff --git a/tests/query/highlights/latex/test.tex b/tests/query/highlights/latex/test.tex
new file mode 100644
index 000000000..9e65b900a
--- /dev/null
+++ b/tests/query/highlights/latex/test.tex
@@ -0,0 +1,33 @@
+% vim:ft=latex
+% !TeX
+% ^ @keyword.directive
+%& filename
+%  ^ @keyword.directive
+      \begin{equation} \frac{4}{2} + 128 \text{hello} \sum_{n=1}^{\text{hi\_hi\^hi}} n \end{equation}
+%                            ^ @markup.math    ^ @none             ^ @function
+
+\begin{equation} 
+  a = b % Comment here
+%         ^ @comment
+% ^ @markup.math
+\end{equation}
+\begin{equation} 
+  a = b % Comment here
+%         ^ @comment
+  b = c
+\end{equation}
+\text{
+hi $here$ is some text % with a comment
+%                        ^ @comment
+%   ^ @markup.math
+}
+\textbf{
+here is some text $5 + 2$ % with a comment
+%                           ^ @comment
+%                  ^ @markup.math
+}
+\textit{
+here is some text $5 + 2$ % with a comment
+%                           ^ @comment
+%                  ^ @markup.math
+}

From 3722d5d772418401d88f9bebb30b0486c91f0b17 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dlvandenberg@gmail.com>
Date: Tue, 6 Feb 2024 10:30:01 +0100
Subject: [PATCH 1101/2704] fix(angular): nullish coalescing operator in
 Angular templates (#6052)

---
 queries/angular/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index eb0107e2d..0fd97f848 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -112,6 +112,9 @@
   "?."
 ] @punctuation.delimiter
 
+(nullish_coalescing_expression
+  (coalescing_operator) @operator)
+
 (concatination_expression
   "+" @operator)
 

From 5973b617a9a48212e40c5c0a0727ad7c91b27484 Mon Sep 17 00:00:00 2001
From: Anthony Shi <69449791+anthony-S93@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:51:50 +0800
Subject: [PATCH 1102/2704] fix(kotlin): remove slow highlight and local
 pattern (#5954)

This is a parser bug that needs to be fixed; temporary workaround to
remove the ~0.5s delay on opening highlight and locals queries.
---
 queries/kotlin/highlights.scm | 10 +++++-----
 queries/kotlin/locals.scm     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index e75a7e96f..2103e04df 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -27,11 +27,11 @@
 (class_parameter
   (simple_identifier) @variable.member)
 
-(class_body
-  (property_declaration
-    (variable_declaration
-      (simple_identifier) @variable.member)))
-
+; NOTE: temporary fix for treesitter bug that causes delay in file opening
+;(class_body
+;  (property_declaration
+;    (variable_declaration
+;      (simple_identifier) @variable.member)))
 ; id_1.id_2.id_3: `id_2` and `id_3` are assumed as object properties
 (_
   (navigation_suffix
diff --git a/queries/kotlin/locals.scm b/queries/kotlin/locals.scm
index 1bc044e85..93edf99f1 100644
--- a/queries/kotlin/locals.scm
+++ b/queries/kotlin/locals.scm
@@ -32,11 +32,11 @@
     (variable_declaration
       (simple_identifier) @local.definition.parameter)))
 
-(class_body
-  (property_declaration
-    (variable_declaration
-      (simple_identifier) @local.definition.field)))
-
+; NOTE: temporary fix for treesitter bug that causes delay in file opening
+;(class_body
+;  (property_declaration
+;    (variable_declaration
+;      (simple_identifier) @local.definition.field)))
 (class_declaration
   (primary_constructor
     (class_parameter

From 3e71d6544724ff10f2bdb4b50ea3e501ca8d5295 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 06:35:54 +0000
Subject: [PATCH 1103/2704] Update parsers: groovy, haskell, javascript,
 svelte, templ, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0028477f6..5fda6ae1f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -237,7 +237,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "fdc03a7040945d551c009c0d2b39aa1d42894437"
+    "revision": "235009aad0f580211fc12014bb0846c3910130c1"
   },
   "gstlaunch": {
     "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
@@ -249,7 +249,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "9527ab807f8141fbfe5b48bf6a5878a05fb971fe"
+    "revision": "1da347c88599faad7964e63facead5d163ac7dba"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -297,7 +297,7 @@
     "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
   },
   "javascript": {
-    "revision": "24b9885a211bed50415acabe9a30e2d0f6896e6d"
+    "revision": "098bd31b7f838a31cce08db4091e989ea42f3ef6"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -627,7 +627,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "697bb515471871e85ff799ea57a76298a71a9cca"
+    "revision": "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd"
   },
   "swift": {
     "revision": "1c586339fb00014b23d6933f2cc32b588a226f3b"
@@ -648,7 +648,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "b3e9f7c98e999f831fe1292166fcfc82cbb10f31"
+    "revision": "592faa3186ef857c92e4bd1c31d73c07a4a334db"
   },
   "terraform": {
     "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
@@ -732,7 +732,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "d2c60c4caebec98ef080391b2f27adebc4c5d5a8"
+    "revision": "2bb829b8b4682d7733a0bff926397641fd2af6a1"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From b444afa1dacd3d031c0ffe4763671d89afda5ddb Mon Sep 17 00:00:00 2001
From: Karl Hiner <karl.hiner@gmail.com>
Date: Thu, 8 Feb 2024 04:54:33 -0500
Subject: [PATCH 1104/2704] feat(faust): add tree-sitter-faust (#6043)

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   9 ++
 queries/faust/highlights.scm    | 218 ++++++++++++++++++++++++++++++++
 queries/faust/injections.scm    |   2 +
 5 files changed, 233 insertions(+)
 create mode 100644 queries/faust/highlights.scm
 create mode 100644 queries/faust/injections.scm

diff --git a/README.md b/README.md
index 786aa2276..0f7c50cb4 100644
--- a/README.md
+++ b/README.md
@@ -225,6 +225,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template)
 - [x] [erlang](https://github.com/WhatsApp/tree-sitter-erlang) (maintained by @filmor)
 - [x] [facility](https://github.com/FacilityApi/tree-sitter-facility) (maintained by @bryankenote)
+- [x] [faust](https://github.com/khiner/tree-sitter-faust) (maintained by @khiner)
 - [x] [fennel](https://github.com/travonted/tree-sitter-fennel) (maintained by @TravonteD)
 - [x] [firrtl](https://github.com/amaanq/tree-sitter-firrtl) (maintained by @amaanq)
 - [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
diff --git a/lockfile.json b/lockfile.json
index 5fda6ae1f..f6e095874 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -155,6 +155,9 @@
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
   },
+  "faust": {
+    "revision": "4609dd2c126a4803139db03eed784d26effe9844"
+  },
   "fennel": {
     "revision": "15e4f8c417281768db17080c4447297f8ff5343a"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d74267c20..b5c8778cb 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -514,6 +514,15 @@ list.facility = {
   maintainers = { "@bryankenote" },
 }
 
+list.faust = {
+  install_info = {
+    url = "https://github.com/khiner/tree-sitter-faust",
+    files = { "src/parser.c" },
+  },
+  filetype = "dsp",
+  maintainers = { "@khiner" },
+}
+
 list.fennel = {
   install_info = {
     url = "https://github.com/travonted/tree-sitter-fennel",
diff --git a/queries/faust/highlights.scm b/queries/faust/highlights.scm
new file mode 100644
index 000000000..012562971
--- /dev/null
+++ b/queries/faust/highlights.scm
@@ -0,0 +1,218 @@
+; Identifiers
+(identifier) @variable
+
+(process) @variable.builtin
+
+(parameters
+  (identifier)) @variable.parameter
+
+(global_metadata
+  key: (identifier) @variable.member)
+
+(function_metadata
+  function_name: (identifier) @variable.member)
+
+; Literals
+(_
+  filename: (string)) @string.special.path
+
+(documentation) @string.documentation @spell
+
+[
+  (string)
+  (fstring)
+] @string
+
+(int) @number
+
+(real) @number.float
+
+; Types
+(_
+  type:
+    [
+      (int_type)
+      (float_type)
+      (any_type)
+    ]) @type.builtin
+
+[
+  (single_precision)
+  (double_precision)
+  (quad_precision)
+  (fixed_point_precision)
+] @attribute
+
+; Functions
+(function_definition
+  name: (identifier) @function)
+
+(function_names) @function
+
+[
+  (lambda)
+  (prefix)
+  (prim1)
+  (prim2)
+  (prim3)
+  (prim4)
+  (prim5)
+  (function_call)
+] @function.call
+
+[
+  "exp"
+  "log"
+  "log10"
+  "sqrt"
+  "abs"
+  "floor"
+  "ceil"
+  "rint"
+  "round"
+  "acos"
+  "asin"
+  "atan"
+  "cos"
+  "sin"
+  "tan"
+  "atan2"
+  "int"
+  "float"
+  "pow"
+  "min"
+  "max"
+  "fmod"
+  "remainder"
+  "prefix"
+  "attach"
+  "enable"
+  "control"
+  "rdtable"
+  "rwtable"
+  "select2"
+  "select3"
+  "lowest"
+  "highest"
+  "assertbounds"
+  (par)
+  (seq)
+  (sum)
+  (prod)
+  (component)
+  (library)
+  (vslider_type)
+  (hslider_type)
+  (nentry_type)
+  (vbargraph_type)
+  (hbargraph_type)
+  (vgroup_type)
+  (hgroup_type)
+  (tgroup_type)
+  "button"
+  "checkbox"
+  "soundfile"
+  "inputs"
+  "outputs"
+  "route"
+] @function.builtin
+
+; xor is a @keyword.operator
+[
+  (add)
+  (sub)
+  (mult)
+  (div)
+  (mod)
+  (pow)
+  (or)
+  (and)
+  (lshift)
+  (rshift)
+  (lt)
+  (le)
+  (gt)
+  (ge)
+  (eq)
+  (neq)
+  (delay)
+  (one_sample_delay)
+  "="
+  "=>"
+  "->"
+] @operator
+
+(recursive
+  "~" @operator)
+
+(sequential
+  ":" @operator)
+
+(split
+  "<:" @operator)
+
+(merge
+  ":>" @operator)
+
+(parallel
+  "," @operator)
+
+; Keywords
+[
+  (par)
+  (seq)
+  (sum)
+  (prod)
+] @keyword.repeat
+
+(file_import
+  "import" @keyword.import)
+
+[
+  (wire)
+  (cut)
+  (mem)
+  "declare"
+  "with"
+  "environment"
+  "case"
+  "ffunction"
+  "fconstant"
+  "fvariable"
+] @keyword
+
+(xor) @keyword.operator
+
+; Punctuation
+[
+  ","
+  ";"
+  "."
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+; Comments
+(comment) @comment @spell
+
+; Tags
+[
+  "<mdoc>"
+  "</mdoc>"
+  "<metadata>"
+  "</metadata>"
+  "<equation>"
+  "</equation>"
+  "<diagram>"
+  "</diagram>"
+  "<listing"
+  "<notice"
+  "/>"
+] @tag
diff --git a/queries/faust/injections.scm b/queries/faust/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/faust/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From cbf0dfd92f3149a378164ab781d0b0a13da5b04a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 8 Feb 2024 11:03:21 -0800
Subject: [PATCH 1105/2704] feat(readline): add parser tree-sitter-readline
 (#6058)

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++
 queries/readline/folds.scm      |  1 +
 queries/readline/highlights.scm | 69 +++++++++++++++++++++++++++++++++
 queries/readline/indents.scm    |  8 ++++
 queries/readline/injections.scm |  2 +
 7 files changed, 92 insertions(+)
 create mode 100644 queries/readline/folds.scm
 create mode 100644 queries/readline/highlights.scm
 create mode 100644 queries/readline/indents.scm
 create mode 100644 queries/readline/injections.scm

diff --git a/README.md b/README.md
index 0f7c50cb4..f62213b41 100644
--- a/README.md
+++ b/README.md
@@ -353,6 +353,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
 - [x] [rbs](https://github.com/joker1007/tree-sitter-rbs) (maintained by @joker1007)
 - [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
+- [x] [readline](https://github.com/ribru17/tree-sitter-readline) (maintained by @ribru17)
 - [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index f6e095874..dc85a37d6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -539,6 +539,9 @@
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
   },
+  "readline": {
+    "revision": "221edd74cdca24bd5e54b39a0d73b7a1bd11d8cd"
+  },
   "regex": {
     "revision": "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b5c8778cb..852852986 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1595,6 +1595,14 @@ list.re2c = {
   maintainers = { "@amaanq" },
 }
 
+list.readline = {
+  install_info = {
+    url = "https://github.com/ribru17/tree-sitter-readline",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ribru17" },
+}
+
 list.regex = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-regex",
diff --git a/queries/readline/folds.scm b/queries/readline/folds.scm
new file mode 100644
index 000000000..57c9bc7da
--- /dev/null
+++ b/queries/readline/folds.scm
@@ -0,0 +1 @@
+(conditional_construct) @fold
diff --git a/queries/readline/highlights.scm b/queries/readline/highlights.scm
new file mode 100644
index 000000000..e7aaf817a
--- /dev/null
+++ b/queries/readline/highlights.scm
@@ -0,0 +1,69 @@
+(comment) @comment @spell
+
+"set" @keyword
+
+[
+  "$if"
+  "$else"
+  "$endif"
+] @keyword.conditional
+
+"$include" @keyword.import
+
+[
+  "="
+  "=="
+  "!="
+  ">="
+  "<="
+  ">"
+  "<"
+] @operator
+
+[
+  ":"
+  "-"
+] @punctuation.delimiter
+
+[
+  (application_name)
+  (keyname)
+  (keyseq)
+  (macro)
+  (string_value)
+  (term_name)
+] @string
+
+(file_path) @string.special.path
+
+(escape_sequence) @string.escape
+
+(symbolic_character_name) @character.special
+
+(key_literal) @character
+
+(function_name) @function
+
+[
+  (bell_variable)
+  (bool_variable)
+  (edit_mode_variable)
+  (keymap_variable)
+  (number_variable)
+  (string_variable)
+] @variable.builtin
+
+[
+  (bell_value)
+  (edit_mode_value)
+  (keymap_value)
+  "version"
+  "term"
+  "mode"
+] @constant.builtin
+
+(number_value) @number
+
+(version_number) @string.special
+
+(bool_value) @boolean
diff --git a/queries/readline/indents.scm b/queries/readline/indents.scm
new file mode 100644
index 000000000..aa6fd88a3
--- /dev/null
+++ b/queries/readline/indents.scm
@@ -0,0 +1,8 @@
+(conditional_construct) @indent.begin
+
+[
+  "$else"
+  "$endif"
+] @indent.branch
+
+"$endif" @indent.end
diff --git a/queries/readline/injections.scm b/queries/readline/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/readline/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 76700e147bfab7630e6b97f91b32397175e8153f Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 26 Jan 2024 02:48:26 -0500
Subject: [PATCH 1106/2704] feat(d)!: switch upstream parser to
 `gdamore/tree-sitter-d`

---
 README.md                       |   2 +-
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   9 +-
 queries/d/folds.scm             |   5 +-
 queries/d/highlights.scm        | 593 +++++++++++++++++++-------------
 queries/d/indents.scm           |  22 +-
 queries/d/injections.scm        |  23 +-
 queries/d/locals.scm            |  79 +++++
 8 files changed, 463 insertions(+), 272 deletions(-)
 create mode 100644 queries/d/locals.scm

diff --git a/README.md b/README.md
index f62213b41..24cc66b58 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [csv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [cuda](https://github.com/theHamsta/tree-sitter-cuda) (maintained by @theHamsta)
 - [x] [cue](https://github.com/eonpatapon/tree-sitter-cue) (maintained by @amaanq)
-- [x] [d](https://github.com/CyberShadow/tree-sitter-d) (experimental, maintained by @nawordar)
+- [x] [d](https://github.com/gdamore/tree-sitter-d) (maintained by @amaanq)
 - [x] [dart](https://github.com/UserNobody14/tree-sitter-dart) (maintained by @akinsho)
 - [x] [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) (maintained by @jedrzejboczar)
 - [x] [dhall](https://github.com/jbellerb/tree-sitter-dhall) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index dc85a37d6..4c5cef7ea 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
   },
   "d": {
-    "revision": "c2fbf21bd3aa45495fe13247e040ad5815250032"
+    "revision": "d9a1a2ed77017c23f715643f4739433a5ea7ab6f"
   },
   "dart": {
     "revision": "f71e310a93010863f4b17a2a501ea8e2032c345b"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 852852986..feca033d0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -346,13 +346,10 @@ list.cue = {
 
 list.d = {
   install_info = {
-    url = "https://github.com/CyberShadow/tree-sitter-d",
-    files = { "src/parser.c", "src/scanner.cc" },
-    requires_generate_from_grammar = true,
+    url = "https://github.com/gdamore/tree-sitter-d",
+    files = { "src/parser.c", "src/scanner.c" },
   },
-  -- Generating grammar takes ~60s
-  experimental = true,
-  maintainers = { "@nawordar" },
+  maintainers = { "@amaanq" },
 }
 
 list.dart = {
diff --git a/queries/d/folds.scm b/queries/d/folds.scm
index be4dee45e..49d6256f6 100644
--- a/queries/d/folds.scm
+++ b/queries/d/folds.scm
@@ -1 +1,4 @@
-(block_statement) @fold
+[
+  (block_statement)
+  (aggregate_body)
+] @fold
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
index 2b63dd48c..89ff704e7 100644
--- a/queries/d/highlights.scm
+++ b/queries/d/highlights.scm
@@ -1,21 +1,317 @@
-; Misc
+; Keywords
 [
-  (line_comment)
-  (block_comment)
-  (nesting_block_comment)
-] @comment @spell
+  (directive)
+  (shebang)
+] @keyword.directive
 
-((line_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^///[^/]"))
+[
+  (import)
+  (module)
+] @keyword.import
 
-((line_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^///$"))
+[
+  (alias)
+  (asm)
+  (class)
+  (delegate)
+  (delete)
+  (enum)
+  (interface)
+  (invariant)
+  (mixin)
+  (pragma)
+  (struct)
+  (template)
+  (union)
+  (unittest)
+  (version)
+  (with)
+  (traits)
+  (vector)
+  (parameters_)
+  (default)
+  (goto)
+] @keyword
 
-((block_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+(function) @keyword.function
 
-((nesting_block_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^/[+][+][^+].*[+]/$"))
+(synchronized) @keyword.coroutine
+
+[
+  (if)
+  (else)
+  (switch)
+  (case)
+  (break)
+] @keyword.conditional
+
+[
+  (do)
+  (for)
+  (foreach)
+  (foreach_reverse)
+  (while)
+  (continue)
+] @keyword.repeat
+
+(return) @keyword.return
+
+[
+  (abstract)
+  (deprecated)
+  (private)
+  (protected)
+  (public)
+  (package)
+  (immutable)
+  (final)
+  (const)
+  (override)
+  (static)
+] @type.qualifier
+
+[
+  (assert)
+  (try)
+  (catch)
+  (finally)
+  (throw)
+  (nothrow)
+] @keyword.exception
+
+[
+  (cast)
+  (new)
+  (in)
+  (is)
+  (not_in)
+  (not_is)
+  (typeid)
+  (typeof)
+] @keyword.operator
+
+[
+  (lazy)
+  (align)
+  (extern)
+  (scope)
+  (ref)
+  (pure)
+  (export)
+  (shared)
+  (gshared)
+  (out)
+  (inout)
+] @keyword.storage
+
+(parameter_attribute
+  (return) @keyword.storage)
+
+(parameter_attribute
+  (in) @keyword.storage)
+
+(parameter_attribute
+  (out) @keyword.storage)
+
+(debug) @keyword.debug
+
+; Operators
+[
+  "/="
+  "/"
+  ".."
+  "&"
+  "&="
+  "&&"
+  "|"
+  "|="
+  "||"
+  "-"
+  "-="
+  "--"
+  "+"
+  "+="
+  "++"
+  "<"
+  "<="
+  "<<"
+  "<<="
+  ">"
+  ">="
+  ">>="
+  ">>>="
+  ">>"
+  ">>>"
+  "!"
+  "!="
+  "$"
+  "="
+  "=="
+  "*"
+  "*="
+  "%"
+  "%="
+  "^"
+  "^="
+  "^^"
+  "^^="
+  "~"
+  "~="
+  "@"
+] @operator
+
+; Variables
+(identifier) @variable
+
+[
+  "exit"
+  "success"
+  "failure"
+  (this)
+  (super)
+] @variable.builtin
+
+(linkage_attribute
+  "("
+  _ @variable.builtin
+  ")")
+
+; Modules
+(module_fqn
+  (identifier) @module)
+
+; Attributes
+(at_attribute
+  (identifier) @attribute)
+
+; Constants
+(enum_member
+  (identifier) @constant)
+
+(manifest_declarator
+  .
+  (identifier) @constant)
+
+; Members
+(aggregate_body
+  (variable_declaration
+    (declarator
+      (identifier) @variable.member)))
+
+(property_expression
+  "."
+  (identifier) @variable.member)
+
+(type
+  "."
+  (identifier) @variable.member)
+
+; Types
+(class_declaration
+  (class)
+  .
+  (identifier) @type)
+
+(struct_declaration
+  (struct)
+  .
+  (identifier) @type)
+
+(union_declaration
+  (union)
+  .
+  (identifier) @type)
+
+(enum_declaration
+  (enum)
+  .
+  (identifier) @type)
+
+(alias_declaration
+  (alias)
+  .
+  (identifier) @type)
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z].*"))
+
+(type
+  .
+  (identifier) @type .)
+
+[
+  (auto)
+  (void)
+  (bool)
+  (byte)
+  (ubyte)
+  (char)
+  (short)
+  (ushort)
+  (wchar)
+  (dchar)
+  (int)
+  (uint)
+  (long)
+  (ulong)
+  (real)
+  (double)
+  (float)
+  (cent)
+  (ucent)
+  (ireal)
+  (idouble)
+  (ifloat)
+  (creal)
+  (double)
+  (cfloat)
+] @type.builtin
+
+; Functions
+(function_declaration
+  (identifier) @function)
+
+(call_expression
+  (identifier) @function)
+
+(call_expression
+  (type
+    (identifier) @function .))
+
+(call_expression
+  (property_expression
+    (call_expression)
+    (identifier) @function .))
+
+; Parameters
+(parameter
+  (_)
+  (identifier) @variable.parameter)
+
+(function_literal
+  "("
+  (type
+    (identifier) @variable.parameter))
+
+; Constructors
+(constructor
+  (this) @constructor)
+
+(destructor
+  (this) @constructor)
+
+(postblit
+  .
+  (this) @constructor)
+
+; Punctuation
+[
+  ";"
+  "."
+  ":"
+  ","
+  "=>"
+] @punctuation.delimiter
 
 [
   "("
@@ -26,250 +322,53 @@
   "}"
 ] @punctuation.bracket
 
-[
-  ","
-  ";"
-  "."
-  ":"
-] @punctuation.delimiter
+"..." @punctuation.special
+
+; Ternaries
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+; Labels
+(label
+  (identifier) @label)
+
+(goto_statement
+  (identifier) @label)
+
+; Literals
+(string_literal) @string
 
 [
-  ".."
-  "$"
-] @punctuation.special
+  (int_literal)
+  (float_literal)
+] @number
 
-; Constants
-[
-  "__FILE_FULL_PATH__"
-  "__FILE__"
-  "__FUNCTION__"
-  "__LINE__"
-  "__MODULE__"
-  "__PRETTY_FUNCTION__"
-] @constant.macro
+(char_literal) @character
 
 [
-  (wysiwyg_string)
-  (alternate_wysiwyg_string)
-  (double_quoted_string)
-  (hex_string)
-  (delimited_string)
-  (token_string)
-] @string
-
-(character_literal) @character
-
-(integer_literal) @number
-
-(float_literal) @number.float
-
-[
-  "true"
-  "false"
+  (true)
+  (false)
 ] @boolean
 
-; Functions
-(func_declarator
-  (identifier) @function)
-
 [
-  "__traits"
-  "__vector"
-  "assert"
-  "is"
-  "mixin"
-  "pragma"
-  "typeid"
-] @function.builtin
+  (null)
+  (special_keyword)
+] @constant.builtin
 
-(import_expression
-  "import" @function.builtin)
+; Comments
+(comment) @comment @spell
 
-(parameter
-  (var_declarator
-    (identifier) @variable.parameter))
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///[^/]"))
 
-(function_literal
-  (identifier) @variable.parameter)
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^///$"))
 
-(constructor
-  "this" @constructor)
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
-(destructor
-  "this" @constructor)
-
-; Keywords
-[
-  "case"
-  "default"
-  "else"
-  "if"
-  "switch"
-] @keyword.conditional
-
-[
-  "break"
-  "continue"
-  "do"
-  "for"
-  "foreach"
-  "foreach_reverse"
-  "while"
-] @keyword.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"
-] @keyword.exception
-
-"null" @constant.builtin
-
-[
-  "__gshared"
-  "const"
-  "immutable"
-  "shared"
-] @keyword.storage
-
-[
-  "abstract"
-  "deprecated"
-  "extern"
-  "final"
-  "inout"
-  "lazy"
-  "nothrow"
-  "private"
-  "protected"
-  "public"
-  "pure"
-  "ref"
-  "scope"
-  "synchronized"
-] @type.qualifier
-
-(alias_assignment
-  .
-  (identifier) @type.definition)
-
-(module_declaration
-  "module" @keyword.import)
-
-(import_declaration
-  "import" @keyword.import)
-
-(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) @module))
-
-(module_name) @module
-
-(at_attribute) @attribute
-
-(user_defined_attribute
-  "@" @attribute)
-
-; Variables
-(primary_expression
-  "this" @variable.builtin)
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[+][+][^+].*[+]/$"))
diff --git a/queries/d/indents.scm b/queries/d/indents.scm
index 81624cabd..c89b4e91d 100644
--- a/queries/d/indents.scm
+++ b/queries/d/indents.scm
@@ -1,20 +1,24 @@
 [
+  (parameters)
+  (template_parameters)
+  (expression_statement)
+  (aggregate_body)
+  (function_body)
+  (scope_statement)
   (block_statement)
   (case_statement)
-  (token_string)
 ] @indent.begin
 
+(comment) @indent.auto
+
 [
-  "("
-  ")"
-  "{"
+  (case)
+  (default)
   "}"
-  "["
   "]"
 ] @indent.branch
 
 [
-  (line_comment)
-  (block_comment)
-  (nesting_block_comment)
-] @indent.ignore
+  (directive)
+  (shebang)
+] @indent.zero
diff --git a/queries/d/injections.scm b/queries/d/injections.scm
index 7437b932b..163348100 100644
--- a/queries/d/injections.scm
+++ b/queries/d/injections.scm
@@ -1,9 +1,18 @@
-([
-  (line_comment)
-  (block_comment)
-  (nesting_block_comment)
-] @injection.content
+((comment) @injection.content
   (#set! injection.language "comment"))
 
-((token_string_tokens) @injection.content
-  (#set! injection.language "d"))
+((call_expression
+  (type) @_printf
+  (arguments
+    "("
+    .
+    (expression
+      (string_literal) @injection.content)))
+  (#eq? @_printf "printf")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "printf"))
+
+; TODO: uncomment when asm is added
+; ((asm_inline) @injection.content
+;   (#set! injection.language "asm")
+;   (#set! injection.combined))
diff --git a/queries/d/locals.scm b/queries/d/locals.scm
new file mode 100644
index 000000000..1d7d617d8
--- /dev/null
+++ b/queries/d/locals.scm
@@ -0,0 +1,79 @@
+; Scopes
+[
+  (source_file)
+  (block_statement)
+  (aggregate_body)
+] @local.scope
+
+; References
+(identifier) @local.reference
+
+; Definitions
+(module_def
+  (module_declaration
+    (module_fqn) @local.definition.namespace)
+  (#set! "definition.namespace.scope" "global"))
+
+(enum_declaration
+  (enum_member
+    .
+    (identifier) @local.definition.enum))
+
+(class_declaration
+  (class)
+  .
+  (identifier) @local.definition.type)
+
+(struct_declaration
+  (struct)
+  .
+  (identifier) @local.definition.type)
+
+(union_declaration
+  (union)
+  .
+  (identifier) @local.definition.type)
+
+(enum_declaration
+  (enum)
+  .
+  (identifier) @local.definition.type)
+
+(alias_declaration
+  (alias_initializer
+    .
+    (identifier) @local.definition.type))
+
+(constructor
+  (this) @local.definition.method)
+
+(destructor
+  (this) @local.definition.method)
+
+(postblit
+  (this) @local.definition.method)
+
+(aggregate_body
+  (function_declaration
+    (identifier) @local.definition.method))
+
+(manifest_declarator
+  .
+  (identifier) @local.definition.constant)
+
+(anonymous_enum_declaration
+  (enum_member
+    .
+    (identifier) @local.definition.constant))
+
+(variable_declaration
+  (declarator
+    (identifier) @local.definition.var))
+
+(aggregate_body
+  (variable_declaration
+    (declarator
+      (identifier) @local.definition.field)))
+
+(function_declaration
+  (identifier) @local.definition.function)

From 6d1ab048d2a1b4bcd1f61f675cf14e29888273f2 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 9 Feb 2024 03:09:46 -0500
Subject: [PATCH 1107/2704] chore(ruby): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4c5cef7ea..e57c7b318 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -564,7 +564,7 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "9061b0afbe4f19f58f4ac9cb7834b72648759cdb"
+    "revision": "863e4e9774ffcae8693611488eeb7194c86f265f"
   },
   "rust": {
     "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index feca033d0..840d53d47 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1660,7 +1660,7 @@ list.rst = {
 list.ruby = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-ruby",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@TravonteD" },
 }

From cab95b2f966561957ca25e3203951fe15139287f Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:50:46 +0800
Subject: [PATCH 1108/2704] feat: add tree-sitter-asm parser (#5946)

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/asm/highlights.scm      | 53 +++++++++++++++++++++++++++++++++
 queries/asm/injections.scm      |  5 ++++
 5 files changed, 70 insertions(+)
 create mode 100644 queries/asm/highlights.scm
 create mode 100644 queries/asm/injections.scm

diff --git a/README.md b/README.md
index 24cc66b58..aec3743bc 100644
--- a/README.md
+++ b/README.md
@@ -178,6 +178,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [angular](https://github.com/dlvandenberg/tree-sitter-angular) (experimental, maintained by @dlvandenberg)
 - [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
+- [x] [asm](https://github.com/rush-rs/tree-sitter-asm) (maintained by @RubixDev)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)
 - [x] [authzed](https://github.com/mleonidas/tree-sitter-authzed) (maintained by @mattpolzin)
 - [ ] [awk](https://github.com/Beaglefoot/tree-sitter-awk)
diff --git a/lockfile.json b/lockfile.json
index e57c7b318..a44949ec6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -14,6 +14,9 @@
   "arduino": {
     "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
   },
+  "asm": {
+    "revision": "c7b1167ac0b4ded65850d0751bbbb107ed527566"
+  },
   "astro": {
     "revision": "e924787e12e8a03194f36a113290ac11d6dc10f3"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 840d53d47..74e0be0f2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -120,6 +120,14 @@ list.arduino = {
   maintainers = { "@ObserverOfTime" },
 }
 
+list.asm = {
+  install_info = {
+    url = "https://github.com/RubixDev/tree-sitter-asm",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@RubixDev" },
+}
+
 list.astro = {
   install_info = {
     url = "https://github.com/virchau13/tree-sitter-astro",
diff --git a/queries/asm/highlights.scm b/queries/asm/highlights.scm
new file mode 100644
index 000000000..341205235
--- /dev/null
+++ b/queries/asm/highlights.scm
@@ -0,0 +1,53 @@
+; General
+(label
+  (ident) @label)
+
+(reg) @variable.builtin
+
+(meta
+  kind: (_) @function.builtin)
+
+(instruction
+  kind: (_) @function.builtin)
+
+; Comments
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+; Literals
+(int) @number
+
+(float) @number.float
+
+(string) @string
+
+; Keywords
+[
+  "byte"
+  "word"
+  "dword"
+  "qword"
+  "ptr"
+  "rel"
+] @keyword
+
+; Operators & Punctuation
+[
+  "+"
+  "-"
+  "*"
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ","
+  ":"
+] @punctuation.delimiter
diff --git a/queries/asm/injections.scm b/queries/asm/injections.scm
new file mode 100644
index 000000000..3cd6aac8e
--- /dev/null
+++ b/queries/asm/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))

From 01c159826ea9c6f66f55bed673a026f75a25f4e0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 08:50:58 +0000
Subject: [PATCH 1109/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aec3743bc..1501136f1 100644
--- a/README.md
+++ b/README.md
@@ -178,7 +178,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [angular](https://github.com/dlvandenberg/tree-sitter-angular) (experimental, maintained by @dlvandenberg)
 - [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
-- [x] [asm](https://github.com/rush-rs/tree-sitter-asm) (maintained by @RubixDev)
+- [x] [asm](https://github.com/RubixDev/tree-sitter-asm) (maintained by @RubixDev)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)
 - [x] [authzed](https://github.com/mleonidas/tree-sitter-authzed) (maintained by @mattpolzin)
 - [ ] [awk](https://github.com/Beaglefoot/tree-sitter-awk)

From bc07e58f425a5382acfac9ac34a317faa077943a Mon Sep 17 00:00:00 2001
From: Luckas <luckasranarison@gmail.com>
Date: Fri, 9 Feb 2024 12:19:46 +0300
Subject: [PATCH 1110/2704] feat: add hyprlang parser & queries (#5852)

Co-authored-by: Pham Huy Hoang <hoangtun0810@gmail.com>
---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/hyprlang/folds.scm      |  1 +
 queries/hyprlang/highlights.scm | 56 +++++++++++++++++++++++++++++++++
 queries/hyprlang/indents.scm    |  6 ++++
 6 files changed, 75 insertions(+)
 create mode 100644 queries/hyprlang/folds.scm
 create mode 100644 queries/hyprlang/highlights.scm
 create mode 100644 queries/hyprlang/indents.scm

diff --git a/README.md b/README.md
index 1501136f1..290b73a0d 100644
--- a/README.md
+++ b/README.md
@@ -270,6 +270,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq)
 - [x] [hurl](https://github.com/pfeiferj/tree-sitter-hurl) (maintained by @pfeiferj)
+- [x] [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) (maintained by @luckasRanarison)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
 - [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
diff --git a/lockfile.json b/lockfile.json
index a44949ec6..9cb6fc9b9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -290,6 +290,9 @@
   "hurl": {
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
   },
+  "hyprlang": {
+    "revision": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee"
+  },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 74e0be0f2..45bf2b784 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -891,6 +891,14 @@ list.hurl = {
   maintainers = { "@pfeiferj" },
 }
 
+list.hyprlang = {
+  install_info = {
+    url = "https://github.com/luckasRanarison/tree-sitter-hyprlang",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@luckasRanarison" },
+}
+
 list.ini = {
   install_info = {
     url = "https://github.com/justinmk/tree-sitter-ini",
diff --git a/queries/hyprlang/folds.scm b/queries/hyprlang/folds.scm
new file mode 100644
index 000000000..911798f5a
--- /dev/null
+++ b/queries/hyprlang/folds.scm
@@ -0,0 +1 @@
+(section) @fold
diff --git a/queries/hyprlang/highlights.scm b/queries/hyprlang/highlights.scm
new file mode 100644
index 000000000..d76993d12
--- /dev/null
+++ b/queries/hyprlang/highlights.scm
@@ -0,0 +1,56 @@
+(comment) @comment @spell
+
+[
+  "source"
+  "exec"
+  "exec-once"
+] @keyword
+
+(keyword
+  (name) @keyword)
+
+(assignment
+  (name) @property)
+
+(section
+  (name) @module)
+
+(section
+  device: (device_name) @type)
+
+(variable) @variable
+
+"$" @punctuation.special
+
+(boolean) @boolean
+
+(mod) @constant
+
+[
+  "rgb"
+  "rgba"
+] @function.builtin
+
+[
+  (number)
+  (legacy_hex)
+  (angle)
+  (hex)
+] @number
+
+"deg" @type
+
+"," @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "="
+  "-"
+  "+"
+] @operator
diff --git a/queries/hyprlang/indents.scm b/queries/hyprlang/indents.scm
new file mode 100644
index 000000000..731ae9a61
--- /dev/null
+++ b/queries/hyprlang/indents.scm
@@ -0,0 +1,6 @@
+(section) @indent.begin
+
+(section
+  "}" @indent.end)
+
+"}" @indent.branch

From de4a651da7fe68d7091dae9be853dc9ef5c04289 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 9 Feb 2024 10:33:35 +0100
Subject: [PATCH 1111/2704] ci: pin tree-sitter-cli version in npm install

This prevents bad tags from messing up CI
---
 .github/workflows/test-queries.yml | 2 +-
 .github/workflows/tests.yml        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index d5a3894e4..1842c758e 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/setup-node@v4
 
       - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli
+        run: npm i -g tree-sitter-cli@0.20.9
 
       - name: Install and prepare Neovim
         env:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d7c98556f..87499e4be 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/setup-node@v4
 
       - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli
+        run: npm i -g tree-sitter-cli@0.20.9
 
       - name: Test Dependencies
         run: |
@@ -43,7 +43,6 @@ jobs:
       - name: Install and prepare Neovim
         env:
           NVIM_TAG: stable
-          TREE_SITTER_CLI_TAG: v0.20.8
         run: |
           bash ./scripts/ci-install-${{ matrix.os }}.sh
 

From 8262ccf9900312b5e8cda061b0a9f2b01379cd43 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 9 Feb 2024 10:45:13 +0100
Subject: [PATCH 1112/2704] fixup: it's fine

---
 .github/workflows/test-queries.yml | 2 +-
 .github/workflows/tests.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 1842c758e..d5a3894e4 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/setup-node@v4
 
       - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli@0.20.9
+        run: npm i -g tree-sitter-cli
 
       - name: Install and prepare Neovim
         env:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 87499e4be..863f8d0a4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/setup-node@v4
 
       - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli@0.20.9
+        run: npm i -g tree-sitter-cli
 
       - name: Test Dependencies
         run: |

From 8812089919ff19614db75ba76d3950c0a58ca3b0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 9 Feb 2024 10:50:13 +0100
Subject: [PATCH 1113/2704] fix(unison): adapt to breaking parser change

---
 lockfile.json                 | 2 +-
 queries/unison/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9cb6fc9b9..96fd9f921 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -708,7 +708,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "a69d087590f2ca057d1ef1a393de7e22869bb557"
+    "revision": "fb49b8125509c079e08f345758c03a427129010e"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
index 6f97474fa..0092ef8d8 100644
--- a/queries/unison/highlights.scm
+++ b/queries/unison/highlights.scm
@@ -14,7 +14,7 @@
 ; Keywords
 [
   (kw_forall)
-  (unique_kw)
+  (unique)
   (type_kw)
   (do)
   (kw_let)
@@ -24,7 +24,7 @@
 
 (kw_equals) @keyword.operator
 
-(structural_kw) @type.qualifier
+(structural) @type.qualifier
 
 (unique) @type.qualifier
 

From 4b00de5633be5f51a2e8da4db5cc0b5cdf9f89e1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:12:37 +0000
Subject: [PATCH 1114/2704] Update parsers: asm, faust, readline, ruby, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 96fd9f921..60a3e99e9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
   },
   "asm": {
-    "revision": "c7b1167ac0b4ded65850d0751bbbb107ed527566"
+    "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
   },
   "astro": {
     "revision": "e924787e12e8a03194f36a113290ac11d6dc10f3"
@@ -159,7 +159,7 @@
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
   },
   "faust": {
-    "revision": "4609dd2c126a4803139db03eed784d26effe9844"
+    "revision": "9e514af33bfe061d0ccf1999dbcc93fca91f133c"
   },
   "fennel": {
     "revision": "15e4f8c417281768db17080c4447297f8ff5343a"
@@ -546,7 +546,7 @@
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
   },
   "readline": {
-    "revision": "221edd74cdca24bd5e54b39a0d73b7a1bd11d8cd"
+    "revision": "f2f98d4263949d696e69a425f65326c59d1ceedc"
   },
   "regex": {
     "revision": "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"
@@ -570,7 +570,7 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "863e4e9774ffcae8693611488eeb7194c86f265f"
+    "revision": "bb0eb0fe5f19eeae9a72e78978b533bf161a1509"
   },
   "rust": {
     "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"
@@ -744,7 +744,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2bb829b8b4682d7733a0bff926397641fd2af6a1"
+    "revision": "3d3bbcb7cb33709ec992e115e894500276753e22"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"

From f0d43eff134c5b3dc927c08a908cfd31ee5c7dff Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 11:58:02 +0000
Subject: [PATCH 1115/2704] Update parsers: ruby

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 60a3e99e9..6cb978c57 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -570,7 +570,7 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "bb0eb0fe5f19eeae9a72e78978b533bf161a1509"
+    "revision": "bdaab7da01967a68d0f5a6779a49b30ad3f28e3b"
   },
   "rust": {
     "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"

From 0f3183dda8df688a77223b9762475dee5b27271f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@gmail.com>
Date: Fri, 9 Feb 2024 14:46:57 +0100
Subject: [PATCH 1116/2704] feat(slint)!: change to the official parser (#6027)

This change replaces the slint parser written and maintained by @jrmoulton
with the official one hosted in the slint-ui organization on github.

A huge thank you to @jrmoulton for all his work on the tree-sitter
parser!

---------

Co-authored-by: jrmoulton <jaredmoulton3@gmail.com>
---
 README.md                       |   2 +-
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   5 +-
 queries/rust/injections.scm     |  20 ++
 queries/slint/folds.scm         |  11 +
 queries/slint/highlights.scm    | 368 ++++++++++++++++++++------------
 queries/slint/indents.scm       |  30 ++-
 queries/slint/injections.scm    |   2 +
 queries/slint/locals.scm        | 117 ++++++++++
 9 files changed, 401 insertions(+), 156 deletions(-)
 create mode 100644 queries/slint/folds.scm
 create mode 100644 queries/slint/injections.scm
 create mode 100644 queries/slint/locals.scm

diff --git a/README.md b/README.md
index 290b73a0d..1163e6d1a 100644
--- a/README.md
+++ b/README.md
@@ -370,7 +370,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
 - [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
-- [x] [slint](https://github.com/jrmoulton/tree-sitter-slint) (experimental, maintained by @jrmoulton)
+- [x] [slint](https://github.com/slint-ui/slint) (maintained by @hunger)
 - [x] [smali](https://git.sr.ht/~yotam/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
 - [ ] [snakemake](https://github.com/osthomas/tree-sitter-snakemake) (experimental)
diff --git a/lockfile.json b/lockfile.json
index 6cb978c57..315f81b81 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -591,7 +591,7 @@
     "revision": "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7"
   },
   "slint": {
-    "revision": "00c8a2d3645766f68c0d0460086c0a994e5b0d85"
+    "revision": "15618215b79b9db08f824a5c97a12d073dcc1c00"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 45bf2b784..b1907d255 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1734,11 +1734,10 @@ list.slang = {
 
 list.slint = {
   install_info = {
-    url = "https://github.com/jrmoulton/tree-sitter-slint",
+    url = "https://github.com/slint-ui/tree-sitter-slint",
     files = { "src/parser.c" },
   },
-  maintainers = { "@jrmoulton" },
-  experimental = true,
+  maintainers = { "@hunger" },
 }
 
 list.smali = {
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index 1537568c1..d561d4ec9 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -1,8 +1,28 @@
 (macro_invocation
+  macro:
+    [
+      (scoped_identifier
+        name: (_) @_macro_name)
+      (identifier) @_macro_name
+    ]
   (token_tree) @injection.content
+  (#not-eq? @_macro_name "slint")
   (#set! injection.language "rust")
   (#set! injection.include-children))
 
+(macro_invocation
+  macro:
+    [
+      (scoped_identifier
+        name: (_) @_macro_name)
+      (identifier) @_macro_name
+    ]
+  (token_tree) @injection.content
+  (#eq? @_macro_name "slint")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "slint")
+  (#set! injection.include-children))
+
 (macro_definition
   (macro_rule
     left: (token_tree_pattern) @injection.content
diff --git a/queries/slint/folds.scm b/queries/slint/folds.scm
new file mode 100644
index 000000000..4c5b1307a
--- /dev/null
+++ b/queries/slint/folds.scm
@@ -0,0 +1,11 @@
+[
+  (anon_struct_block)
+  (block)
+  (callback_event)
+  (component)
+  (enum_block)
+  (function_definition)
+  (global_definition)
+  (imperative_block)
+  (struct_block)
+] @fold
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 673fc643d..2e6d5997e 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -1,121 +1,113 @@
-(identifier) @variable
-
-(type_identifier) @type
-
 (comment) @comment @spell
 
-(int_literal) @number
+; Different types:
+(string_value) @string @spell
 
-(float_literal) @number.float
+(escape_sequence) @string.escape
 
-(string_literal) @string
-
-(function_identifier) @function
+(color_value) @constant
 
 [
-  (image_macro)
-  (children_macro)
-  (radial_grad_macro)
-  (linear_grad_macro)
-] @function.macro
-
-(call_expression
-  function: (identifier) @function.call)
-
-(call_expression
-  function:
-    (field_expression
-      field: (identifier) @function.call))
-
-(vis) @keyword.import
-
-(units) @type
-
-(array_literal
-  (identifier) @type)
-
-(transition_statement
-  state: (identifier) @variable.member)
-
-(state_expression
-  state: (identifier) @variable.member)
-
-(struct_block_definition
-  (identifier) @variable.member)
-
-; (state_identifier) @variable.member
-[
-  "in"
-  "for"
-] @keyword.repeat
-
-"@" @keyword
-
-[
-  "import"
-  "from"
-] @keyword.import
-
-[
-  "if"
-  "else"
-] @keyword.conditional
-
-[
-  "root"
-  "parent"
-  "duration"
-  "easing"
-] @variable.builtin
-
-[
-  "true"
-  "false"
-] @boolean
-
-[
-  "struct"
-  "property"
-  "callback"
-  "in"
-  "animate"
-  "states"
-  "when"
-  "out"
-  "transitions"
-  "global"
-] @keyword
-
-[
-  "black"
-  "transparent"
-  "blue"
-  "ease"
-  "ease_in"
-  "ease-in"
-  "ease_in_out"
-  "ease-in-out"
-  "ease_out"
-  "ease-out"
-  "end"
-  "green"
-  "red"
-  "red"
-  "start"
-  "yellow"
-  "white"
-  "gray"
+  (children_identifier)
+  (easing_kind_identifier)
 ] @constant.builtin
 
+(bool_value) @boolean
+
+[
+  (int_value)
+  (physical_length_value)
+] @number
+
+[
+  (angle_value)
+  (duration_value)
+  (float_value)
+  (length_value)
+  (percent_value)
+  (relative_font_size_value)
+] @number.float
+
+(purity) @type.qualifier
+
+(function_visibility) @type.qualifier
+
+(property_visibility) @type.qualifier
+
+(builtin_type_identifier) @type.builtin
+
+(reference_identifier) @variable.builtin
+
+(type
+  [
+    (type_list)
+    (user_type_identifier)
+    (anon_struct_block)
+  ]) @type
+
+(user_type_identifier) @type
+
+; Functions and callbacks
+(argument) @variable.parameter
+
+(function_call
+  name: (_) @function.call)
+
+; definitions
+(callback
+  name: (_) @function)
+
+(callback_alias
+  name: (_) @function)
+
+(callback_event
+  name: (simple_identifier) @function.call)
+
+(component
+  id: (_) @variable)
+
+(enum_definition
+  name: (_) @type)
+
+(function_definition
+  name: (_) @function)
+
+(struct_definition
+  name: (_) @type)
+
+(typed_identifier
+  type: (_) @type)
+
+; Operators
+(binary_expression
+  op: (_) @operator)
+
+(unary_expression
+  op: (_) @operator)
+
+[
+  (comparison_operator)
+  (mult_prec_operator)
+  (add_prec_operator)
+  (unary_prec_operator)
+  (assignment_prec_operator)
+] @operator
+
+[
+  ":="
+  "=>"
+  "->"
+  "<=>"
+] @operator
+
 ; Punctuation
 [
-  ","
-  "."
   ";"
+  "."
+  ","
   ":"
 ] @punctuation.delimiter
 
-; Brackets
 [
   "("
   ")"
@@ -125,53 +117,145 @@
   "}"
 ] @punctuation.bracket
 
-(define_property
+(property
   [
     "<"
     ">"
   ] @punctuation.bracket)
 
-[
-  "angle"
-  "bool"
-  "brush"
-  "color"
-  "float"
-  "image"
-  "int"
-  "length"
-  "percent"
-  "physical-length"
-  "physical_length"
-  "string"
-] @type.builtin
+; Properties, Variables and Constants:
+(component
+  id: (simple_identifier) @constant)
 
+(property
+  name: (simple_identifier) @property)
+
+(binding_alias
+  name: (simple_identifier) @property)
+
+(binding
+  name: (simple_identifier) @property)
+
+(struct_block
+  (simple_identifier) @variable.member)
+
+(anon_struct_block
+  (simple_identifier) @variable.member)
+
+(property_assignment
+  property: (simple_identifier) @property)
+
+(states_definition
+  name: (simple_identifier) @variable)
+
+(callback
+  name: (simple_identifier) @variable)
+
+(typed_identifier
+  name: (_) @variable)
+
+(simple_indexed_identifier
+  name: (simple_identifier) @variable
+  index_var: (simple_identifier) @variable)
+
+(expression
+  (simple_identifier) @variable)
+
+(member_access
+  member:
+    (expression
+      (simple_identifier) @property))
+
+(states_definition
+  name: (simple_identifier) @constant)
+
+; Attributes:
 [
-  ":="
-  "<=>"
-  "!"
-  "-"
-  "+"
-  "*"
-  "/"
-  "&&"
-  "||"
-  ">"
-  "<"
-  ">="
-  "<="
-  "="
-  ":"
-  "+="
-  "-="
-  "*="
-  "/="
-  "?"
-  "=>"
-] @operator
+  (linear_gradient_identifier)
+  (radial_gradient_identifier)
+  (radial_gradient_kind)
+] @attribute
+
+(image_call
+  "@image-url" @attribute)
+
+(tr
+  "@tr" @attribute)
+
+; Keywords:
+(animate_option_identifier) @keyword
+
+(export) @keyword
+
+(if_statement
+  "if" @keyword.conditional)
+
+(if_expr
+  [
+    "if"
+    "else"
+  ] @keyword.conditional)
 
 (ternary_expression
   [
-    ":"
     "?"
+    ":"
   ] @keyword.conditional.ternary)
+
+(animate_statement
+  "animate" @keyword)
+
+(callback
+  "callback" @keyword)
+
+(component_definition
+  [
+    "component"
+    "inherits"
+  ] @keyword)
+
+(enum_definition
+  "enum" @keyword)
+
+(for_loop
+  [
+    "for"
+    "in"
+  ] @keyword.repeat)
+
+(function_definition
+  "function" @keyword.function)
+
+(global_definition
+  "global" @keyword)
+
+(imperative_block
+  "return" @keyword.return)
+
+(import_statement
+  [
+    "import"
+    "from"
+  ] @keyword.import)
+
+(import_type
+  "as" @keyword.import)
+
+(property
+  "property" @keyword)
+
+(states_definition
+  [
+    "states"
+    "when"
+  ] @keyword)
+
+(struct_definition
+  "struct" @keyword)
+
+(transitions_definition
+  [
+    "transitions"
+    "in"
+    "out"
+  ] @keyword)
diff --git a/queries/slint/indents.scm b/queries/slint/indents.scm
index 587a8ecf3..d6bdeacde 100644
--- a/queries/slint/indents.scm
+++ b/queries/slint/indents.scm
@@ -1,14 +1,26 @@
 [
-  (comp_body)
-  (state_statement)
-  (transition_statement)
-  (handler_body)
-  (consequence_body)
-  (global_single)
+  (arguments)
+  (block)
+  (enum_block)
+  (global_block)
+  (imperative_block)
+  (struct_block)
+  (typed_identifier)
 ] @indent.begin
 
-"}" @indent.end
+([
+  (block)
+  (enum_block)
+  (global_block)
+  (imperative_block)
+  (struct_block)
+]
+  "}" @indent.end)
 
-(comment) @indent.auto
+([
+  (arguments)
+  (typed_identifier)
+]
+  ")" @indent.end)
 
-(string_literal) @indent.auto
+(string_value) @indent.auto
diff --git a/queries/slint/injections.scm b/queries/slint/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/slint/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/slint/locals.scm b/queries/slint/locals.scm
new file mode 100644
index 000000000..2d256b7ac
--- /dev/null
+++ b/queries/slint/locals.scm
@@ -0,0 +1,117 @@
+[
+  (anon_struct_block)
+  (block)
+  (callback_event)
+  (component)
+  (enum_block)
+  (function_definition)
+  (global_definition)
+  (imperative_block)
+  (struct_block)
+] @local.scope
+
+(anon_struct_block
+  (_) @local.definition.field)
+
+(argument) @local.definition.var
+
+(callback
+  name: (_) @local.definition.member)
+
+(component_definition
+  name: (_) @local.definition.type)
+
+(enum_definition
+  name: (_) @local.definition.type)
+
+(enum_block
+  (_) @local.definition.field)
+
+(function_definition
+  name: (_) @local.definition.function)
+
+(global_definition
+  name: (_) @local.definition.type)
+
+(import_type
+  import_name: (_)
+  !local_name) @local.definition.import
+
+(import_type
+  import_name: (_)
+  local_name: (_) @local.definition.import)
+
+(property
+  name: (_) @local.definition.field)
+
+(struct_block
+  (_) @local.definition.field)
+
+(struct_definition
+  name: (_) @local.definition.type)
+
+(typed_identifier
+  name: (_) @local.definition.var)
+
+(argument
+  (_) @local.reference)
+
+(binary_expression
+  left: (_) @local.reference)
+
+(binary_expression
+  right: (_) @local.reference)
+
+(callback_event
+  name: (_) @local.reference)
+
+(component
+  type: (_) @local.reference
+  (#set! reference.kind "type"))
+
+(component_definition
+  base_type: (_) @local.reference
+  (#set! reference.kind "type"))
+
+(function_call
+  name: (_) @local.reference)
+
+(index_op
+  index: (_) @local.reference)
+
+(index_op
+  left: (_) @local.reference)
+
+(member_access
+  base: (_) @local.reference)
+
+(member_access
+  member: (_) @local.reference)
+
+(parens_op
+  left: (_) @local.reference)
+
+(property
+  type: (_) @local.reference
+  (#set! reference.kind "type"))
+
+(property_assignment
+  property: (_) @local.reference
+  (#set! reference.kind "field"))
+
+(property_assignment
+  value: (_) @local.reference)
+
+(struct_block
+  (_) @local.reference
+  (#set! reference.kind "type"))
+
+(tr
+  percent: (_) @local.reference)
+
+(typed_identifier
+  type: (_) @local.reference
+  (#set! reference.kind "type"))
+
+(unary_expression
+  left: (_) @local.reference)

From 3dbea103d83366d4aa312e065812be19f4f16fd6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 13:47:09 +0000
Subject: [PATCH 1117/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1163e6d1a..7b5d2f175 100644
--- a/README.md
+++ b/README.md
@@ -370,7 +370,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
 - [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
-- [x] [slint](https://github.com/slint-ui/slint) (maintained by @hunger)
+- [x] [slint](https://github.com/slint-ui/tree-sitter-slint) (maintained by @hunger)
 - [x] [smali](https://git.sr.ht/~yotam/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
 - [ ] [snakemake](https://github.com/osthomas/tree-sitter-snakemake) (experimental)

From 95036477c16cdb061f37492410780d87a9b0d7aa Mon Sep 17 00:00:00 2001
From: Charles <63302440+Sarrus1@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:40:01 +0100
Subject: [PATCH 1118/2704] feat: add sourcepawn parser and queries (#5865)

---
 README.md                         |   1 +
 lockfile.json                     |   3 +
 lua/nvim-treesitter/parsers.lua   |   9 +
 queries/sourcepawn/highlights.scm | 302 ++++++++++++++++++++++++++++++
 queries/sourcepawn/injections.scm |   3 +
 queries/sourcepawn/locals.scm     |  19 ++
 6 files changed, 337 insertions(+)
 create mode 100644 queries/sourcepawn/highlights.scm
 create mode 100644 queries/sourcepawn/injections.scm
 create mode 100644 queries/sourcepawn/locals.scm

diff --git a/README.md b/README.md
index 7b5d2f175..26cd4f8cb 100644
--- a/README.md
+++ b/README.md
@@ -377,6 +377,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)
 - [x] [soql](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [sosl](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
+- [x] [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) (maintained by @Sarrus1)
 - [x] [sparql](https://github.com/BonaBeavis/tree-sitter-sparql) (maintained by @BonaBeavis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
 - [x] [squirrel](https://github.com/amaanq/tree-sitter-squirrel) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 315f81b81..79fde83f6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -611,6 +611,9 @@
   "sosl": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
+  "sourcepawn": {
+    "revision": "846ec647109a1f3dfab17c025c80ecdf6fd56581"
+  },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b1907d255..2fb93ec8b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1791,6 +1791,15 @@ list.sosl = {
   maintainers = { "@aheber" },
 }
 
+list.sourcepawn = {
+  install_info = {
+    url = "https://github.com/nilshelmig/tree-sitter-sourcepawn",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@Sarrus1" },
+  tier = 3,
+}
+
 list.sparql = {
   install_info = {
     url = "https://github.com/BonaBeavis/tree-sitter-sparql",
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
new file mode 100644
index 000000000..bbe37e061
--- /dev/null
+++ b/queries/sourcepawn/highlights.scm
@@ -0,0 +1,302 @@
+(identifier) @variable
+
+; Assume all-caps names are constants
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+
+; Function definitions/declarations
+(function_definition
+  name: (identifier) @function)
+
+(function_declaration
+  name: (identifier) @function)
+
+(parameter_declaration
+  name: (identifier) @variable.parameter)
+
+; Methods / Properties
+(field_access
+  field: (identifier) @variable.member)
+
+; Function calls
+(call_expression
+  function: (identifier) @function)
+
+(call_expression
+  function:
+    (field_access
+      field: (identifier) @function.method.call))
+
+; Types
+[
+  (builtin_type)
+  (any_type)
+] @type.builtin
+
+(type
+  (identifier) @type)
+
+; Variables
+(variable_declaration
+  name: (identifier) @variable)
+
+(old_variable_declaration
+  name: (identifier) @variable)
+
+[
+  (system_lib_string)
+  (string_literal)
+] @string
+
+; Preprocessor
+[
+  "#include"
+  "#tryinclude"
+] @keyword.import
+
+[
+  (preproc_assert)
+  (preproc_pragma)
+  (preproc_if)
+  (preproc_else)
+  (preproc_elseif)
+  (preproc_endinput)
+  (preproc_endif)
+  (preproc_error)
+  (preproc_warning)
+] @keyword.directive
+
+[
+  "#define"
+  "#undef"
+] @keyword.directive.define
+
+(macro_param) @variable.parameter
+
+(preproc_define
+  name: (identifier) @constant)
+
+(preproc_macro
+  name: (identifier) @function.macro)
+
+(preproc_undefine
+  name: (identifier) @constant)
+
+; Expressions
+(view_as) @function.builtin
+
+(sizeof_expression) @function.macro
+
+[
+  (this)
+  ; https://github.com/alliedmodders/sourcemod/blob/5c0ae11a4619e9cba93478683c7737253ea93ba6/plugins/include/handles.inc#L78
+  (hardcoded_symbol)
+] @variable.builtin
+
+; Comments
+(comment) @comment @spell
+
+; General
+(parameter_declaration
+  defaultValue: (identifier) @constant)
+
+[
+  (fixed_dimension)
+  (dimension)
+] @punctuation.bracket
+
+(escape_sequence) @string.escape
+
+; Constructors
+(new_expression
+  class: (identifier) @type
+  arguments: (call_arguments) @constructor)
+
+; Methodmaps
+(methodmap
+  name: (identifier) @type)
+
+(methodmap
+  inherits: (identifier) @type)
+
+(methodmap_method_constructor
+  name: (identifier) @constructor)
+
+(methodmap_method
+  name: (identifier) @function.method)
+
+(methodmap_native
+  name: (identifier) @function.method)
+
+(methodmap_property
+  name: (identifier) @property)
+
+[
+  (methodmap_property_getter)
+  (methodmap_property_setter)
+] @function.method
+
+; Enum structs
+(enum_struct
+  name: (identifier) @type)
+
+(enum_struct_field
+  name: (identifier) @variable.member)
+
+(enum_struct_method
+  name: (identifier) @function.method)
+
+; Non-type Keywords
+(variable_storage_class) @keyword.storage
+
+(visibility) @type.qualifier
+
+(assertion) @function.builtin
+
+(function_declaration_kind) @keyword.function
+
+[
+  "new"
+  "delete"
+] @keyword.operator
+
+[
+  "."
+  ","
+] @punctuation.delimiter
+
+; Operators
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "++"
+  "--"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "=="
+  "!="
+  "<"
+  ">"
+  ">="
+  "<="
+  "!"
+  "&&"
+  "||"
+  "&"
+  "|"
+  "~"
+  "^"
+  "<<"
+  ">>"
+  ">>>"
+  "|="
+  "&="
+  "^="
+  "~="
+  "<<="
+  ">>="
+  (ignore_argument)
+  (scope_access)
+  (rest_operator)
+] @operator
+
+; public Plugin myinfo
+(struct_declaration
+  name: (identifier) @variable.builtin)
+
+; Typedef/Typedef
+(typedef
+  name: (identifier) @type)
+
+(functag
+  name: (identifier) @type)
+
+(funcenum
+  name: (identifier) @type)
+
+(typeset
+  name: (identifier) @type)
+
+(typedef_expression) @keyword.function ; function void(int x)
+
+; Enums
+(enum
+  name: (identifier) @type)
+
+(enum_entry
+  name: (identifier) @constant)
+
+(enum_entry
+  value: (_) @constant)
+
+; Literals
+(int_literal) @number
+
+(char_literal) @character
+
+(float_literal) @number.float
+
+(string_literal) @string
+
+(array_literal) @punctuation.bracket
+
+(concatenated_string) @punctuation.delimiter
+
+(bool_literal) @boolean
+
+(null) @constant.builtin
+
+((identifier) @constant.builtin
+  (#eq? @constant.builtin "INVALID_HANDLE"))
+
+; Keywords
+"return" @keyword.return
+
+[
+  "if"
+  "else"
+  "case"
+  "default"
+  "switch"
+] @keyword.conditional
+
+[
+  "do"
+  "while"
+  "for"
+  "continue"
+  "break"
+] @keyword.repeat
+
+[
+  "__nullable__"
+  "defined"
+  "delete"
+  "enum"
+  "funcenum"
+  "functag"
+  "get"
+  "methodmap"
+  "new"
+  "property"
+  "public"
+  "set"
+  "struct"
+  "typedef"
+  "typeset"
+  "void"
+] @keyword
+
+[
+  "const"
+  "native"
+  "static"
+  "stock"
+  "forward"
+] @type.qualifier
diff --git a/queries/sourcepawn/injections.scm b/queries/sourcepawn/injections.scm
new file mode 100644
index 000000000..c579ffad8
--- /dev/null
+++ b/queries/sourcepawn/injections.scm
@@ -0,0 +1,3 @@
+; Parse JSDoc annotations in comments
+((comment) @injection.content
+  (#set! injection.language "jsdoc"))
diff --git a/queries/sourcepawn/locals.scm b/queries/sourcepawn/locals.scm
new file mode 100644
index 000000000..39d6fb516
--- /dev/null
+++ b/queries/sourcepawn/locals.scm
@@ -0,0 +1,19 @@
+[
+  (function_definition)
+  (alias_declaration)
+  (enum_struct_method)
+  (methodmap_method)
+  (methodmap_method_constructor)
+  (methodmap_method_destructor)
+  (methodmap_property_method)
+] @local.scope
+
+; Definitions
+(variable_declaration
+  name: (identifier) @local.definition)
+
+(old_variable_declaration
+  name: (identifier) @local.definition)
+
+; References
+(identifier) @local.reference

From 6b93dcd15a0f13d6ef74c743d8015ff34f367a8d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 9 Feb 2024 12:05:52 -0500
Subject: [PATCH 1119/2704] chore(vue): adapt to scanner rewrite (#6068)

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 79fde83f6..21b20893b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -738,7 +738,7 @@
     "revision": "ed8695ad8de39c3f073da130156f00b1148e2891"
   },
   "vue": {
-    "revision": "91fe2754796cd8fba5f229505a23fa08f3546c06"
+    "revision": "7e48557b903a9db9c38cea3b7839ef7e1f36c693"
   },
   "wgsl": {
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2fb93ec8b..d2985abb8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2146,8 +2146,8 @@ list.vimdoc = {
 
 list.vue = {
   install_info = {
-    url = "https://github.com/ikatyang/tree-sitter-vue",
-    files = { "src/parser.c", "src/scanner.cc" },
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-vue",
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@WhyNotHugo" },
 }

From 51d15ef5da4fcce3945fabc312ca6847dd64c6e3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:06:04 +0000
Subject: [PATCH 1120/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 26cd4f8cb..74539aaf9 100644
--- a/README.md
+++ b/README.md
@@ -419,7 +419,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
 - [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
 - [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason)
-- [x] [vue](https://github.com/ikatyang/tree-sitter-vue) (maintained by @WhyNotHugo)
+- [x] [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) (maintained by @WhyNotHugo)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
 - [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka, @MarkMcCulloh)

From b8840a426e38c486ddb365c8d9e663d1be659c15 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 9 Feb 2024 16:51:43 +0100
Subject: [PATCH 1121/2704] feat(tcl): add parser and queries

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +++
 queries/tcl/folds.scm           |   1 +
 queries/tcl/highlights.scm      | 105 ++++++++++++++++++++++++++++++++
 queries/tcl/indents.scm         |  25 ++++++++
 6 files changed, 143 insertions(+)
 create mode 100644 queries/tcl/folds.scm
 create mode 100644 queries/tcl/highlights.scm
 create mode 100644 queries/tcl/indents.scm

diff --git a/README.md b/README.md
index 74539aaf9..b2a9cb26f 100644
--- a/README.md
+++ b/README.md
@@ -394,6 +394,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
+- [x] [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) (maintained by @lewis6991)
 - [x] [templ](https://github.com/vrischmann/tree-sitter-templ) (maintained by @vrischmann)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) (maintained by @Porter)
diff --git a/lockfile.json b/lockfile.json
index 21b20893b..fa9d896d5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -662,6 +662,9 @@
   "teal": {
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
+  "tcl": {
+    "revision": "ca2643e3cd818771635a152899fb70b6b37d648a"
+  },
   "templ": {
     "revision": "592faa3186ef857c92e4bd1c31d73c07a4a334db"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d2985abb8..68d346b83 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1934,6 +1934,14 @@ list.teal = {
   maintainers = { "@euclidianAce" },
 }
 
+list.tcl = {
+  install_info = {
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-tcl",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@lewis6991" },
+}
+
 list.terraform = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
diff --git a/queries/tcl/folds.scm b/queries/tcl/folds.scm
new file mode 100644
index 000000000..9084c662c
--- /dev/null
+++ b/queries/tcl/folds.scm
@@ -0,0 +1 @@
+(braced_word) @fold
diff --git a/queries/tcl/highlights.scm b/queries/tcl/highlights.scm
new file mode 100644
index 000000000..5cb281dbd
--- /dev/null
+++ b/queries/tcl/highlights.scm
@@ -0,0 +1,105 @@
+(comment) @comment @spell
+
+(command
+  name: (simple_word) @function)
+
+"proc" @keyword.function
+
+(procedure
+  name: (_) @variable)
+
+(set
+  (simple_word) @variable)
+
+(argument
+  name: (_) @variable.parameter)
+
+((simple_word) @variable.builtin
+  (#any-of? @variable.builtin "argc" "argv" "argv0" "auto_path" "env" "errorCode" "errorInfo" "tcl_interactive" "tcl_library" "tcl_nonwordchars" "tcl_patchLevel" "tcl_pkgPath" "tcl_platform" "tcl_precision" "tcl_rcFileName" "tcl_traceCompile" "tcl_traceExec" "tcl_wordchars" "tcl_version"))
+
+"expr" @function.builtin
+
+(command
+  name: (simple_word) @function.builtin
+  (#any-of? @function.builtin "cd" "exec" "exit" "incr" "info" "join" "puts" "regexp" "regsub" "split" "subst" "trace" "source"))
+
+(command
+  name: (simple_word) @keyword
+  (#any-of? @keyword "append" "break" "catch" "continue" "default" "dict" "error" "eval" "global" "lappend" "lassign" "lindex" "linsert" "list" "llength" "lmap" "lrange" "lrepeat" "lreplace" "lreverse" "lsearch" "lset" "lsort" "package" "return" "switch" "throw" "unset" "variable"))
+
+[
+  "error"
+  "namespace"
+  "on"
+  "set"
+  "try"
+] @keyword
+
+(unpack) @operator
+
+[
+  "while"
+  "foreach"
+] @keyword.repeat
+
+[
+  "if"
+  "else"
+  "elseif"
+] @keyword.conditional
+
+[
+  "**"
+  "/"
+  "*"
+  "%"
+  "+"
+  "-"
+  "<<"
+  ">>"
+  ">"
+  "<"
+  ">="
+  "<="
+  "=="
+  "!="
+  "eq"
+  "ne"
+  "in"
+  "ni"
+  "&"
+  "^"
+  "|"
+  "&&"
+  "||"
+] @operator
+
+(variable_substitution) @variable
+
+(quoted_word) @string
+
+(escaped_character) @string.escape
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+  ";"
+] @punctuation.delimiter
+
+((simple_word) @number
+  (#lua-match? @number "^[0-9]+$"))
+
+((simple_word) @boolean
+  (#any-of? @boolean "true" "false"))
+
+; after apply array auto_execok auto_import auto_load auto_mkindex auto_qualify
+; auto_reset bgerror binary chan clock close coroutine dde encoding eof fblocked
+; fconfigure fcopy file fileevent filename flush format gets glob history http
+; interp load mathfunc mathop memory msgcat my next nextto open parray pid
+; pkg::create pkg_mkIndex platform platform::shell pwd re_syntax read refchan
+; registry rename safe scan seek self socket source string tailcall tcl::prefix
+; tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_startOfPreviousWord
+; tcl_wordBreakAfter tcl_wordBreakBefore tcltest tell time timerate tm
+; transchan unknown unload update uplevel upvar vwait yield yieldto zlib
diff --git a/queries/tcl/indents.scm b/queries/tcl/indents.scm
new file mode 100644
index 000000000..c4968d17d
--- /dev/null
+++ b/queries/tcl/indents.scm
@@ -0,0 +1,25 @@
+[
+  (braced_word_simple)
+  (namespace)
+  (command)
+  (conditional)
+  (foreach)
+  (while)
+  (try)
+  (procedure)
+  (command_substitution)
+] @indent.begin
+
+(quoted_word) @indent.align
+
+([
+  (expr)
+  (arguments)
+] @indent.align
+  (#set! "indent.open_delimiter" "{")
+  (#set! "indent.close_delimiter" "}"))
+
+[
+  "}"
+  "]"
+] @indent.branch @indent.end

From aa805bf22f4a2fb9f429de3a22e9dc45ec444833 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:29:52 +0000
Subject: [PATCH 1122/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b2a9cb26f..c1242c569 100644
--- a/README.md
+++ b/README.md
@@ -393,8 +393,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
 - [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
-- [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) (maintained by @lewis6991)
+- [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [templ](https://github.com/vrischmann/tree-sitter-templ) (maintained by @vrischmann)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) (maintained by @Porter)

From 8ec79c47851508ccc9957db7e7c28dbb1df922ce Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 9 Feb 2024 11:32:46 -0800
Subject: [PATCH 1123/2704] fix(readline): proper indents while editing

---
 queries/readline/indents.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/readline/indents.scm b/queries/readline/indents.scm
index aa6fd88a3..d7dc67421 100644
--- a/queries/readline/indents.scm
+++ b/queries/readline/indents.scm
@@ -1,5 +1,8 @@
 (conditional_construct) @indent.begin
 
+(ERROR
+  "$if") @indent.begin
+
 [
   "$else"
   "$endif"

From 841dde702ce2e58ffc3724808f3dbea2edee57d5 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 9 Feb 2024 11:33:36 -0800
Subject: [PATCH 1124/2704] fix(readline): more descriptive version number hl

---
 queries/readline/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/readline/highlights.scm b/queries/readline/highlights.scm
index e7aaf817a..570e55b3d 100644
--- a/queries/readline/highlights.scm
+++ b/queries/readline/highlights.scm
@@ -64,6 +64,6 @@
 
 (number_value) @number
 
-(version_number) @string.special
+(version_number) @number.float
 
 (bool_value) @boolean

From 817ca60370c3e08ae0344c75eef22174bbee36fa Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Feb 2024 06:35:29 +0000
Subject: [PATCH 1125/2704] Update parsers: arduino, bash, beancount, cpp, dtd,
 luadoc, slint, wing, xml

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fa9d896d5..dc5922c18 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "ff1045f5da90344d547022c50f1756be4adaf721"
+    "revision": "2fd27792dbd1c1995f088dc632497466a2c9c630"
   },
   "asm": {
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
@@ -27,13 +27,13 @@
     "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
-    "revision": "270c06b20567af619da1272dcd32ced9f42951d7"
+    "revision": "f25440a0c089989200d07260d4d0d447c26eaa3e"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
   },
   "beancount": {
-    "revision": "da1bf8c6eb0ae7a97588affde7227630bcd678b6"
+    "revision": "dd6f4ec9b01dd18cc4aa8c8517738414fb98cd63"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -84,7 +84,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "2e4d27f7728a4f90f292e3d9fe27e51ce51ca426"
+    "revision": "51da29228ea1d137d196edd1b41149f325cc6ecb"
   },
   "css": {
     "revision": "98c7b3dceb24f1ee17f1322f3947e55638251c37"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "b1b5a3e48484bdc755f51e1f86cafa330dd52f82"
+    "revision": "54411b29e115d45214dca1bc4c8a3d7493530f0e"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -366,7 +366,7 @@
     "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
   },
   "luadoc": {
-    "revision": "bb310813b2661e5add6a79c11f63b05db52c1045"
+    "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
   },
   "luap": {
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
@@ -591,7 +591,7 @@
     "revision": "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7"
   },
   "slint": {
-    "revision": "15618215b79b9db08f824a5c97a12d073dcc1c00"
+    "revision": "aae884b79f0e100576eea71fd8d5ac12601949a2"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
@@ -659,12 +659,12 @@
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
   },
-  "teal": {
-    "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
-  },
   "tcl": {
     "revision": "ca2643e3cd818771635a152899fb70b6b37d648a"
   },
+  "teal": {
+    "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
+  },
   "templ": {
     "revision": "592faa3186ef857c92e4bd1c31d73c07a4a334db"
   },
@@ -750,13 +750,13 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "3d3bbcb7cb33709ec992e115e894500276753e22"
+    "revision": "4ef6455bc3fa09db11833720278045c2b7621624"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
   },
   "xml": {
-    "revision": "b1b5a3e48484bdc755f51e1f86cafa330dd52f82"
+    "revision": "54411b29e115d45214dca1bc4c8a3d7493530f0e"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From baf4581159e003d96baef9289fde7e72d7ecaeb5 Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Fri, 9 Feb 2024 20:42:08 +0700
Subject: [PATCH 1126/2704] feat(ecma): highlight decorator and destructuring

---
 queries/ecma/highlights.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index f5f2d5614..233b20e00 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -12,10 +12,12 @@
 
 (private_property_identifier) @variable.member
 
-(variable_declarator
-  name:
-    (object_pattern
-      (shorthand_property_identifier_pattern))) @variable
+(object_pattern
+  (shorthand_property_identifier_pattern) @variable)
+
+(object_pattern
+  (object_assignment_pattern
+    (shorthand_property_identifier_pattern) @variable))
 
 ; Special identifiers
 ;--------------------
@@ -138,6 +140,17 @@
   (call_expression
     (identifier) @attribute))
 
+(decorator
+  "@" @attribute
+  (member_expression
+    (property_identifier) @attribute))
+
+(decorator
+  "@" @attribute
+  (call_expression
+    (member_expression
+      (property_identifier) @attribute)))
+
 ; Literals
 ;---------
 [

From 05962ae14a076c5806592b1d447adb0f9707c2c1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 10 Feb 2024 05:54:42 -0500
Subject: [PATCH 1127/2704] chore(bash): update parser and highlights

---
 lockfile.json               | 2 +-
 queries/bash/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index dc5922c18..7e6192f42 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
-    "revision": "f25440a0c089989200d07260d4d0d447c26eaa3e"
+    "revision": "d1a1a3fe7189fdab5bd29a54d1df4a5873db5cb1"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 20b9fd740..b4360ce7e 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -43,6 +43,7 @@
   "<<-"
   "<<<"
   ".."
+  "!"
 ] @operator
 
 ; Do *not* spell check strings since they typically have some sort of

From 143a342bd860d6e3d584edeb447fb49febab3355 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 10 Feb 2024 15:01:53 +0100
Subject: [PATCH 1128/2704] ci: use `windows-latest` over `windows-2022`

It's convenient to not need to manually update the runner version.
---
 .github/workflows/test-queries.yml | 12 ++++++------
 .github/workflows/tests.yml        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index d5a3894e4..0d713c836 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-2022, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-14]
         cc: [gcc, clang]
         nvim_tag: [stable]
         exclude:
@@ -34,12 +34,12 @@ jobs:
             cc: gcc
             nvim_tag: stable
 
-          - os: windows-2022
+          - os: windows-latest
             cc: clang
             nvim_tag: stable
 
         include:
-          - os: windows-2022
+          - os: windows-latest
             cc: cl
             nvim_tag: stable
 
@@ -51,8 +51,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       CC: ${{ matrix.cc }}
-      NVIM: ${{ matrix.os == 'windows-2022' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
-      ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-2022' && 'rnoweb' }}
+      NVIM: ${{ runner.os == 'Windows' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
+      ALLOWED_INSTALLATION_FAILURES: ${{ runner.os == 'Windows' && 'rnoweb' }}
     steps:
       - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
@@ -80,7 +80,7 @@ jobs:
         run: $NVIM --headless -c "lua require'nvim-treesitter.install'.prefer_git=false" -c "TSInstallSync all" -c "q"
 
       - name: Post compile Windows
-        if: matrix.os == 'windows-2022'
+        if: runner.os == 'Windows'
         run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser
 
       - name: Check query files
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 863f8d0a4..8c4043417 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -56,7 +56,7 @@ jobs:
           key: ${{ matrix.os }}-${{ matrix.cc }}-parsers-v1-${{ hashFiles('./lockfile.json', './lua/nvim-treesitter/parsers.lua', './lua/nvim-treesitter/install.lua', './lua/nvim-treesitter/shell_selectors.lua') }}
 
       - name: Compile parsers Unix like
-        if: ${{ matrix.os != 'windows-latest' && steps.parsers-cache.outputs.cache-hit != 'true' }}
+        if: ${{ runner.os != 'Windows' && steps.parsers-cache.outputs.cache-hit != 'true' }}
         run: |
           nvim --headless -c "TSInstallSync all" -c "q"
 

From 6444286cbf3a37862feaa7ff86456dd948f5cf8b Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 10 Feb 2024 15:33:57 +0100
Subject: [PATCH 1129/2704] ci: fix invalid workflow

Context variables aren't always available, so we can't rely on them for
e.g. environment variables.

Also merge all install scripts into `script/ci-install.sh`, that way it
can be called the same way regardless of system.
---
 .github/workflows/test-queries.yml    |  6 +++---
 .github/workflows/tests.yml           |  2 +-
 .github/workflows/update-lockfile.yml |  2 +-
 .github/workflows/update-readme.yml   |  2 +-
 scripts/ci-install-macos-14.sh        |  7 -------
 scripts/ci-install-ubuntu-latest.sh   |  8 --------
 scripts/ci-install-windows-2022.sh    |  7 -------
 scripts/ci-install.sh                 | 25 +++++++++++++++++++++++++
 8 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100755 scripts/ci-install-macos-14.sh
 delete mode 100755 scripts/ci-install-ubuntu-latest.sh
 delete mode 100755 scripts/ci-install-windows-2022.sh
 create mode 100755 scripts/ci-install.sh

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 0d713c836..e1606f2fc 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -51,8 +51,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       CC: ${{ matrix.cc }}
-      NVIM: ${{ runner.os == 'Windows' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
-      ALLOWED_INSTALLATION_FAILURES: ${{ runner.os == 'Windows' && 'rnoweb' }}
+      NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
+      ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-latest' && 'rnoweb' }}
     steps:
       - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
@@ -65,7 +65,7 @@ jobs:
         env:
           NVIM_TAG: ${{ matrix.nvim_tag }}
         run: |
-          bash ./scripts/ci-install-${{ matrix.os }}.sh
+          bash ./scripts/ci-install.sh
 
       - name: Setup Parsers Cache
         id: parsers-cache
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8c4043417..b3858b5de 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -44,7 +44,7 @@ jobs:
         env:
           NVIM_TAG: stable
         run: |
-          bash ./scripts/ci-install-${{ matrix.os }}.sh
+          bash ./scripts/ci-install.sh
 
       - name: Setup Parsers Cache
         id: parsers-cache
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index efcea9ee6..b163a3232 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -27,7 +27,7 @@ jobs:
           wget https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux
           mv jd-amd64-linux /tmp/jd
           chmod +x /tmp/jd
-          bash scripts/ci-install-ubuntu-latest.sh
+          bash scripts/ci-install.sh
 
       - name: Update parsers
         env:
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index d8954e462..e68b43d50 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -23,7 +23,7 @@ jobs:
         env:
           NVIM_TAG: stable
         run: |
-          bash ./scripts/ci-install-ubuntu-latest.sh
+          bash ./scripts/ci-install.sh
 
       - name: Check README
         run: |
diff --git a/scripts/ci-install-macos-14.sh b/scripts/ci-install-macos-14.sh
deleted file mode 100755
index 06bce74f7..000000000
--- a/scripts/ci-install-macos-14.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-macos.tar.gz | tar -xz
-sudo ln -s "$PWD"/nvim-macos/bin/nvim /usr/local/bin
-rm -rf "$PWD"/nvim-macos/lib/nvim/parser
-mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/scripts/ci-install-ubuntu-latest.sh b/scripts/ci-install-ubuntu-latest.sh
deleted file mode 100755
index 60f260cc8..000000000
--- a/scripts/ci-install-ubuntu-latest.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux64.tar.gz
-tar -zxf nvim-linux64.tar.gz
-sudo ln -s "$PWD"/nvim-linux64/bin/nvim /usr/local/bin
-rm -rf "$PWD"/nvim-linux64/lib/nvim/parser
-mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
diff --git a/scripts/ci-install-windows-2022.sh b/scripts/ci-install-windows-2022.sh
deleted file mode 100755
index 8d27ecc53..000000000
--- a/scripts/ci-install-windows-2022.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip
-unzip nvim-win64
-mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start
-mkdir -p ~/AppData/Local/nvim-data
-cp -r "$PWD" ~/AppData/Local/nvim/pack/nvim-treesitter/start
diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
new file mode 100755
index 000000000..4f4265465
--- /dev/null
+++ b/scripts/ci-install.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+os=$(uname -s)
+if [[ $os == Linux ]]; then
+  wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux64.tar.gz
+  tar -zxf nvim-linux64.tar.gz
+  sudo ln -s "$PWD"/nvim-linux64/bin/nvim /usr/local/bin
+  rm -rf "$PWD"/nvim-linux64/lib/nvim/parser
+  mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
+  ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
+elif [[ $os == Darwin ]]; then
+  curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-macos.tar.gz | tar -xz
+  sudo ln -s "$PWD"/nvim-macos/bin/nvim /usr/local/bin
+  rm -rf "$PWD"/nvim-macos/lib/nvim/parser
+  mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
+  ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
+else
+  curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip
+  unzip nvim-win64
+  mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start
+  mkdir -p ~/AppData/Local/nvim-data
+  cp -r "$PWD" ~/AppData/Local/nvim/pack/nvim-treesitter/start
+fi

From 96f190f7a18f007b5511f5ae06b4b2fd80635340 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Feb 2024 06:35:21 +0000
Subject: [PATCH 1130/2704] Update parsers: bash, cpp, dart, gitattributes,
 hyprlang, ruby, wing, zathurarc

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7e6192f42..c271784c9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
-    "revision": "d1a1a3fe7189fdab5bd29a54d1df4a5873db5cb1"
+    "revision": "1c6ebd1ae1d4afb140df094b2ac443a52bf7ff95"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -84,7 +84,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "51da29228ea1d137d196edd1b41149f325cc6ecb"
+    "revision": "ef61cb57bd10838e90957672e6b4c129fcbe3a25"
   },
   "css": {
     "revision": "98c7b3dceb24f1ee17f1322f3947e55638251c37"
@@ -102,7 +102,7 @@
     "revision": "d9a1a2ed77017c23f715643f4739433a5ea7ab6f"
   },
   "dart": {
-    "revision": "f71e310a93010863f4b17a2a501ea8e2032c345b"
+    "revision": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"
   },
   "devicetree": {
     "revision": "6b53bfdb20a54727bfe344aa40907351a298f75c"
@@ -198,7 +198,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"
+    "revision": "f682b3a5c5b5da7ac3577476eedf90b151294618"
   },
   "gitcommit": {
     "revision": "7c01af8d227b5344f62aade2ff00f19bd0c458ca"
@@ -291,7 +291,7 @@
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
   },
   "hyprlang": {
-    "revision": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee"
+    "revision": "86025136c12cd1058985479a6b1935829077f1af"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -570,7 +570,7 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "bdaab7da01967a68d0f5a6779a49b30ad3f28e3b"
+    "revision": "7a010836b74351855148818d5cb8170dc4df8e6a"
   },
   "rust": {
     "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"
@@ -750,7 +750,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "4ef6455bc3fa09db11833720278045c2b7621624"
+    "revision": "2c2fa59e7f7077790f55bffaae4aae9e35b702fe"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
@@ -768,7 +768,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "b47016df5688ef91ad4532138b6210c7944d6483"
+    "revision": "0162354dd343d13816569553f8d01d51b4912ad3"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 9860fceb73eb85a9ad424513fe163e6506dfb1fd Mon Sep 17 00:00:00 2001
From: Jongwook Choi <wookayin@gmail.com>
Date: Tue, 19 Sep 2023 17:20:26 -0400
Subject: [PATCH 1131/2704] fix: use augroup for auto_install autocmds

Problem: The FileType autocmd to automatically install parsers on a new
filetype (introduced in #3130) did not have augroup. As a result, when
`ts_configs.setup{ }` is called multiple times (for some reason),
duplicated installation requests will be made.

Solution: Use augroup with `clear = true`.
---
 lua/nvim-treesitter/install.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 82d233e20..0a7a9ae3d 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -555,6 +555,7 @@ end
 function M.setup_auto_install()
   vim.api.nvim_create_autocmd("FileType", {
     pattern = { "*" },
+    group = vim.api.nvim_create_augroup("NvimTreesitter-auto_install", { clear = true }),
     callback = function()
       local lang = parsers.get_buf_lang()
       if parsers.get_parser_configs()[lang] and not is_installed(lang) and not is_ignored_parser(lang) then

From 0aa7131044d4f59a13579f75e92ca1632d305c0c Mon Sep 17 00:00:00 2001
From: Turiiya <34311583+ttytm@users.noreply.github.com>
Date: Sun, 11 Feb 2024 15:28:04 +0700
Subject: [PATCH 1132/2704] chore(v): update repository url

---
 README.md                       | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c1242c569..f289cf502 100644
--- a/README.md
+++ b/README.md
@@ -414,7 +414,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [unison](https://github.com/kylegoetz/tree-sitter-unison) (maintained by @tapegram)
 - [x] [usd](https://github.com/ColinKennedy/tree-sitter-usd) (maintained by @ColinKennedy)
 - [x] [uxn tal](https://github.com/amaanq/tree-sitter-uxntal) (maintained by @amaanq)
-- [x] [v](https://github.com/v-analyzer/v-analyzer) (maintained by @kkharji, @amaanq)
+- [x] [v](https://github.com/vlang/v-analyzer) (maintained by @kkharji, @amaanq)
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 68d346b83..13270b38a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2102,7 +2102,7 @@ list.uxntal = {
 
 list.v = {
   install_info = {
-    url = "https://github.com/v-analyzer/v-analyzer",
+    url = "https://github.com/vlang/v-analyzer",
     files = { "src/parser.c" },
     location = "tree_sitter_v",
   },

From b52b298669f0813bbfbc12d07280c9e2f6f17ebc Mon Sep 17 00:00:00 2001
From: Turiiya <34311583+ttytm@users.noreply.github.com>
Date: Sun, 11 Feb 2024 20:01:25 +0700
Subject: [PATCH 1133/2704] chore(v): update lockfile

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index c271784c9..d04d9b737 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -723,7 +723,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "9ac84e62396bb13c8f1d11f967f0c0f2dec1a448"
+    "revision": "56d7905f423b82dff4b23c86e2869ddc06f6e419"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 10e8dffb7961fae98cf83efa0e170c22ae2cd33a Mon Sep 17 00:00:00 2001
From: Sean Boult <996134+Hacksore@users.noreply.github.com>
Date: Sun, 11 Feb 2024 17:51:12 -0600
Subject: [PATCH 1134/2704] feat(jsx): spell check text nodes (#6083)

---
 queries/jsx/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 98fc02f95..468eb8a3c 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -64,6 +64,6 @@
 
 (html_character_reference) @tag
 
-(jsx_text) @none
+(jsx_text) @none @spell
 
 (html_character_reference) @character.special

From 10d79b5dbbdffc3edf307b189284fb62e2e79a3e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 06:34:55 +0000
Subject: [PATCH 1135/2704] Update parsers: properties, scala, slang, wing,
 zathurarc

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d04d9b737..f14fd9023 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -492,7 +492,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "97253273bdf8b63546c8006e71ba155ecc27069e"
+    "revision": "8cf6e5f02dac7e6a0c45a27d7e2a1afb6de87642"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
@@ -576,7 +576,7 @@
     "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"
   },
   "scala": {
-    "revision": "45b5ba0e749a8477a8fd2666f082f352859bdc3c"
+    "revision": "310f87253bbc467e87ccf041b1d3e8649711d2f9"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -588,7 +588,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7"
+    "revision": "d8f845c7f39cc1bbd7cc6d9191dac186e6bc6369"
   },
   "slint": {
     "revision": "aae884b79f0e100576eea71fd8d5ac12601949a2"
@@ -750,7 +750,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "2c2fa59e7f7077790f55bffaae4aae9e35b702fe"
+    "revision": "f647945b1619b34c172825c43408ffc9dc5db2ea"
   },
   "xcompose": {
     "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
@@ -768,7 +768,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "0162354dd343d13816569553f8d01d51b4912ad3"
+    "revision": "0f93bfe8ecb104f60e42c3c8854bee78c54738c5"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 02ff2220d343981be0647feb73960b54bd9602e4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 13 Feb 2024 10:26:05 +0100
Subject: [PATCH 1136/2704] fix(xml): adapt to repo layout change

---
 lua/nvim-treesitter/parsers.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 13270b38a..63ec1e8be 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -428,9 +428,9 @@ list.doxygen = {
 
 list.dtd = {
   install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-xml",
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-xml",
     files = { "src/parser.c", "src/scanner.c" },
-    location = "tree-sitter-dtd",
+    location = "dtd",
   },
   maintainers = { "@ObserverOfTime" },
 }
@@ -2198,9 +2198,9 @@ list.xcompose = {
 
 list.xml = {
   install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-xml",
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-xml",
     files = { "src/parser.c", "src/scanner.c" },
-    location = "tree-sitter-xml",
+    location = "xml",
   },
   maintainers = { "@ObserverOfTime" },
 }

From 1843594962ece100c4a74dbe3327b8497e0251ed Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 06:35:35 +0000
Subject: [PATCH 1137/2704] Update parsers: arduino, bash, chatito, dtd,
 gitattributes, gpg, pem, poe_filter, printf, properties, pymanifest, rasi,
 requirements, scala, ssh_config, swift, udev, wing, xcompose, xml, zathurarc

---
 lockfile.json | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f14fd9023..1d0f33bcd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "2fd27792dbd1c1995f088dc632497466a2c9c630"
+    "revision": "2372f163b8416eeea674686fe0222e39fa06bad5"
   },
   "asm": {
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
@@ -27,7 +27,7 @@
     "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
-    "revision": "1c6ebd1ae1d4afb140df094b2ac443a52bf7ff95"
+    "revision": "8df9ea875d557a150d025d3a15b6e6a58624379a"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -60,7 +60,7 @@
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
-    "revision": "871622a3a483f0baf94923d8495c8e0bb2c09009"
+    "revision": "1be833b20d495110b0c1a5ff47d2b08d0dd0ed3b"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "54411b29e115d45214dca1bc4c8a3d7493530f0e"
+    "revision": "d52bc148b3f75677ab50c9b17bdda7b910cb4245"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -198,7 +198,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "f682b3a5c5b5da7ac3577476eedf90b151294618"
+    "revision": "3d03b37395f5707b6a2bfb43f62957fe0e669c0c"
   },
   "gitcommit": {
     "revision": "7c01af8d227b5344f62aade2ff00f19bd0c458ca"
@@ -237,7 +237,7 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "18b2690a15f061a6ff48730589f7a4039af2d002"
+    "revision": "e8a95ae3deed7d7637c33f635fc5b9fc9dbb3216"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
@@ -453,7 +453,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "pem": {
-    "revision": "e01767921df18142055d97407595329d7629e643"
+    "revision": "7905a168036e23605160a0d32a142f58ab5eaa06"
   },
   "perl": {
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
@@ -477,13 +477,13 @@
     "revision": "39da859947b94abdee43e431368e1ae975c0a424"
   },
   "poe_filter": {
-    "revision": "fa83292e04d27976ab5c354e0c980f2c67628a02"
+    "revision": "99ce487804eab781e1e1cb39de82aea236346c96"
   },
   "pony": {
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
   },
   "printf": {
-    "revision": "04696305caceab64a78e3a749774718d87ba85a1"
+    "revision": "ddff4ce4d630d1f1a3b591d77b2618a4169b36b9"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -492,7 +492,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "8cf6e5f02dac7e6a0c45a27d7e2a1afb6de87642"
+    "revision": "42b09c5ceeb11ae68cb235d2f446688d7940a07b"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
@@ -513,7 +513,7 @@
     "revision": "cfd217d32aa0266401ec5bf3d929697fdeb835ba"
   },
   "pymanifest": {
-    "revision": "a77547018ada84ca4bc115c7650b19441120f065"
+    "revision": "41a15c43252baa083729c25646cde83ee5c88277"
   },
   "python": {
     "revision": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc"
@@ -537,7 +537,7 @@
     "revision": "e4ba1a9674a3b4dd7905d04f194ae6f8331be342"
   },
   "rasi": {
-    "revision": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"
+    "revision": "43196d934a9a6ab3c7093a8683efd0111bb03db1"
   },
   "rbs": {
     "revision": "519a61132a51222e3ce73d3b7ef07465f587f346"
@@ -555,7 +555,7 @@
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
   },
   "requirements": {
-    "revision": "389dd46a39075ce36af6ee3af50393d9aa506d14"
+    "revision": "00084464ccad32dd71da60771c25554eeedb213c"
   },
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
@@ -576,7 +576,7 @@
     "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"
   },
   "scala": {
-    "revision": "310f87253bbc467e87ccf041b1d3e8649711d2f9"
+    "revision": "1abd3d94c8a315f0667a22e550ec2e663c124c03"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -624,7 +624,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "096981397385f49833dfd66037fa98081bbd9ef9"
+    "revision": "b8595820fa331977a5a44f5f9e0a445c456b5cbf"
   },
   "starlark": {
     "revision": "b31a616aac5d05f927f3f9dd809789db7805b632"
@@ -645,7 +645,7 @@
     "revision": "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd"
   },
   "swift": {
-    "revision": "1c586339fb00014b23d6933f2cc32b588a226f3b"
+    "revision": "dabbcf9a2311e08c1b020e1258849b8359e9de1a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -708,7 +708,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "udev": {
-    "revision": "baeac48a999abb9384cdcce320f0182937aec8ba"
+    "revision": "15d89be59a3802dcbe2e97e0f9d32b52f3aeda3f"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -750,13 +750,13 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "f647945b1619b34c172825c43408ffc9dc5db2ea"
+    "revision": "0911d0938af3726399af7f42c58da0152c5f1205"
   },
   "xcompose": {
-    "revision": "01344fed31a3cd37a63f03357ec80cbc592a93b5"
+    "revision": "8898238fca7e143760386448093392b87e58002e"
   },
   "xml": {
-    "revision": "54411b29e115d45214dca1bc4c8a3d7493530f0e"
+    "revision": "d52bc148b3f75677ab50c9b17bdda7b910cb4245"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"
@@ -768,7 +768,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "0f93bfe8ecb104f60e42c3c8854bee78c54738c5"
+    "revision": "5ce0c93b3738b3b0b1b02a6610a4f45f97cf9673"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 4416d21466bca9fe5337ee3782e2909690cc6b5d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:34:04 +0000
Subject: [PATCH 1138/2704] Update README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f289cf502..b4b9ee806 100644
--- a/README.md
+++ b/README.md
@@ -215,7 +215,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) (maintained by @camdencheek)
 - [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
 - [x] [doxygen](https://github.com/amaanq/tree-sitter-doxygen) (maintained by @amaanq)
-- [x] [dtd](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
+- [x] [dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
 - [x] [eds](https://github.com/uyha/tree-sitter-eds) (maintained by @uyha)
 - [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)
@@ -425,7 +425,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
 - [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka, @MarkMcCulloh)
 - [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
-- [x] [xml](https://github.com/ObserverOfTime/tree-sitter-xml) (maintained by @ObserverOfTime)
+- [x] [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)

From 2b6020247d44b691a219990a5d1410087c87463f Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Tue, 13 Feb 2024 21:03:32 +0900
Subject: [PATCH 1139/2704] fix(cpp): add back comment injection

---
 queries/cpp/injections.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 2038347a2..36852a995 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,6 +1,9 @@
 ((preproc_arg) @injection.content
   (#set! injection.language "cpp"))
 
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((comment) @injection.content
   (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
   (#set! injection.language "doxygen"))

From 1c72e797ba7a07c465633751502604258dd87255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Tue, 13 Feb 2024 23:00:53 +0700
Subject: [PATCH 1140/2704] fix(yuck): comment out start-of-line parens

---
 queries/yuck/indents.scm      | 24 ++++++++----------------
 tests/indent/yuck/indent.yuck | 17 +++++++++++++++++
 tests/indent/yuck_spec.lua    | 19 +++++++++++++++++++
 3 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 tests/indent/yuck/indent.yuck
 create mode 100644 tests/indent/yuck_spec.lua

diff --git a/queries/yuck/indents.scm b/queries/yuck/indents.scm
index 0f1305e25..515795021 100644
--- a/queries/yuck/indents.scm
+++ b/queries/yuck/indents.scm
@@ -15,23 +15,15 @@
   ")"
   "}"
   "]"
-] @indent.end
-
-[
-  "{"
-  "}"
-] @indent.branch
-
-[
-  "("
-  ")"
-] @indent.branch
-
-[
-  "["
-  "]"
-] @indent.branch
+] @indent.end @indent.branch
 
+; I do not know what/when this should be added.
+; Commenting this out for now
+; [
+;   "("
+;   "{"
+;   "["
+; ] @indent.branch
 [
   (ERROR)
   (comment)
diff --git a/tests/indent/yuck/indent.yuck b/tests/indent/yuck/indent.yuck
new file mode 100644
index 000000000..c224548af
--- /dev/null
+++ b/tests/indent/yuck/indent.yuck
@@ -0,0 +1,17 @@
+(defwidget name
+  :widget parameter
+  (box one
+    :box1 parameter
+    (box two
+      :box2 parameter
+    )
+  )
+)
+
+(defwidget name
+  :widget parameter
+  (box one
+  )
+)
+
+(defwidget name
diff --git a/tests/indent/yuck_spec.lua b/tests/indent/yuck_spec.lua
new file mode 100644
index 000000000..6ce15de6f
--- /dev/null
+++ b/tests/indent/yuck_spec.lua
@@ -0,0 +1,19 @@
+local Runner = require("tests.indent.common").Runner
+local run = Runner:new(it, "tests/indent/yuck", {
+  tabstop = 2,
+  shiftwidth = 2,
+  expandtab = true,
+})
+
+describe("indent yuck", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("indent.yuck", { on_line = 13, text = ":box1 parameter", indent = 4 })
+    run:new_line("indent.yuck", { on_line = 17, text = ")", indent = 0 })
+  end)
+end)

From f6342874b1113984dfedfcf595ad321c4cd1a896 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 17:00:38 +0000
Subject: [PATCH 1141/2704] Update parsers: c, chatito, dtd, lalrpop,
 properties, query, slint, wing, xml, zathurarc

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1d0f33bcd..afac4d52d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "ecdd500806cf8154d944344f1df6418b32e0e9a7"
+    "revision": "25ca2718aacaf0feda8b0709471332f303a0cef5"
   },
   "c_sharp": {
     "revision": "dd5e59721a5f8dae34604060833902b882023aaf"
@@ -60,7 +60,7 @@
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
-    "revision": "1be833b20d495110b0c1a5ff47d2b08d0dd0ed3b"
+    "revision": "308b5913fd2ae6b527183ba1b3a490f90da32012"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "d52bc148b3f75677ab50c9b17bdda7b910cb4245"
+    "revision": "049c8d708b0627b03c47994c436693e25af4354d"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -342,7 +342,7 @@
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
   },
   "lalrpop": {
-    "revision": "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"
+    "revision": "456dec2990ed7e9595eca82f85db14a1db46e126"
   },
   "latex": {
     "revision": "2ae2021d7b224fb6aa57b760e0d146059f943bb8"
@@ -492,7 +492,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "42b09c5ceeb11ae68cb235d2f446688d7940a07b"
+    "revision": "74e5d3c63d0da17c0800b3cf9090b24637ef6b59"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
@@ -528,7 +528,7 @@
     "revision": "9fa49ff3315987f715ce5666ff979a7742fa8a98"
   },
   "query": {
-    "revision": "67e9e009436c8c1f2de9f4c654ee3e7674675769"
+    "revision": "a49ed4fd541da90680d57cad760f9a4c9f128d9c"
   },
   "r": {
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
@@ -591,7 +591,7 @@
     "revision": "d8f845c7f39cc1bbd7cc6d9191dac186e6bc6369"
   },
   "slint": {
-    "revision": "aae884b79f0e100576eea71fd8d5ac12601949a2"
+    "revision": "68405a45f7a5311cd1f77e40ba84199573303f52"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
@@ -750,13 +750,13 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "0911d0938af3726399af7f42c58da0152c5f1205"
+    "revision": "870a1824cf95ed4774b1b282a9d7dac8f846ef06"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"
   },
   "xml": {
-    "revision": "d52bc148b3f75677ab50c9b17bdda7b910cb4245"
+    "revision": "049c8d708b0627b03c47994c436693e25af4354d"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"
@@ -768,7 +768,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "5ce0c93b3738b3b0b1b02a6610a4f45f97cf9673"
+    "revision": "db40fc0a2d4a65f56530163a3217a8dabfc08842"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 7e9139db685ae88bf55e224a7b68e02b5dcfcb88 Mon Sep 17 00:00:00 2001
From: Gartox <ewan71230@gmail.com>
Date: Tue, 13 Feb 2024 18:50:29 +0100
Subject: [PATCH 1142/2704] feat(lalrpop): highlight annotation macros

Lalrpop support putting annotation like `#[precedence(level = "1")]`.
This commit aims to highlight `precedence` with the `function.macro`
highlight group, like rust does with its proc macros.
---
 queries/lalrpop/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index 58d7efd4f..336845092 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -77,3 +77,6 @@
 (string_literal) @string
 
 (regex_literal) @string
+
+(annotation
+  (id) @function.macro)

From 883c72cddc34195a3b916905f6e61d789ddd3599 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 06:35:04 +0000
Subject: [PATCH 1143/2704] Update parsers: tcl, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index afac4d52d..4f3e5dbbc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -660,7 +660,7 @@
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
   },
   "tcl": {
-    "revision": "ca2643e3cd818771635a152899fb70b6b37d648a"
+    "revision": "78c71201c1b0939239e779a837dd35370c308948"
   },
   "teal": {
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
@@ -750,7 +750,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "870a1824cf95ed4774b1b282a9d7dac8f846ef06"
+    "revision": "c07f132418ef42c7b0c0433ccc15f7e3d6284325"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"

From 5a5cabd712b8bd14768c72034479fb9cd176beb6 Mon Sep 17 00:00:00 2001
From: Wu Zhenyu <wuzhenyu@ustc.edu>
Date: Mon, 12 Feb 2024 13:45:13 +0800
Subject: [PATCH 1144/2704] feat: add the hlsplaylist parser

---
 README.md                          |  1 +
 lockfile.json                      |  3 +++
 lua/nvim-treesitter/parsers.lua    |  8 ++++++
 queries/hlsplaylist/highlights.scm | 41 ++++++++++++++++++++++++++++++
 queries/hlsplaylist/injections.scm |  2 ++
 5 files changed, 55 insertions(+)
 create mode 100644 queries/hlsplaylist/highlights.scm
 create mode 100644 queries/hlsplaylist/injections.scm

diff --git a/README.md b/README.md
index b4b9ee806..5c27c7d6d 100644
--- a/README.md
+++ b/README.md
@@ -264,6 +264,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay)
 - [x] [hjson](https://github.com/winston0410/tree-sitter-hjson) (maintained by @winston0410)
 - [x] [hlsl](https://github.com/theHamsta/tree-sitter-hlsl) (maintained by @theHamsta)
+- [x] [hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) (maintained by @Freed-Wu)
 - [x] [hocon](https://github.com/antosha417/tree-sitter-hocon) (maintained by @antosha417)
 - [x] [hoon](https://github.com/urbit-pilled/tree-sitter-hoon) (experimental, maintained by @urbit-pilled)
 - [x] [html](https://github.com/tree-sitter/tree-sitter-html) (maintained by @TravonteD)
diff --git a/lockfile.json b/lockfile.json
index 4f3e5dbbc..2563cc057 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -272,6 +272,9 @@
   "hlsl": {
     "revision": "3ade6d065c69cd72c4da966d0c0af98bfb512f16"
   },
+  "hlsplaylist": {
+    "revision": "be3a18abfa9cef1f792324beb1f1e1c9ddba2748"
+  },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 63ec1e8be..c9e312784 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1123,6 +1123,14 @@ list.luau = {
   maintainers = { "@amaanq" },
 }
 
+list.hlsplaylist = {
+  install_info = {
+    url = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Freed-Wu" },
+}
+
 list.m68k = {
   install_info = {
     url = "https://github.com/grahambates/tree-sitter-m68k",
diff --git a/queries/hlsplaylist/highlights.scm b/queries/hlsplaylist/highlights.scm
new file mode 100644
index 000000000..9852aed6d
--- /dev/null
+++ b/queries/hlsplaylist/highlights.scm
@@ -0,0 +1,41 @@
+; Comments
+(comment) @comment @spell
+
+; General
+(uri) @string.special.url
+
+(tag_name) @keyword
+
+(attribute_name) @attribute
+
+[
+  (dec)
+  (hex)
+  (resolution)
+  (range)
+] @number
+
+(float) @number.float
+
+(string) @string
+
+[
+  (enum)
+  (date_time_msec)
+] @string.special
+
+(title) @markup.heading
+
+; Literals
+[
+  "="
+  "x"
+  "@"
+] @operator
+
+[
+  ":"
+  ","
+] @punctuation.delimiter
+
+"#" @punctuation.special
diff --git a/queries/hlsplaylist/injections.scm b/queries/hlsplaylist/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/hlsplaylist/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From d96bf9d522369eaf4ad57e607f134e51084ee1ad Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 14 Feb 2024 09:39:59 -0800
Subject: [PATCH 1145/2704] fix(python): better try-except indentation (#6097)

---
 queries/python/indents.scm          | 15 +++++++++++++--
 tests/indent/python/control_flow.py |  7 +++++++
 tests/indent/python_spec.lua        |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index b89030425..94005ebab 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -38,8 +38,19 @@
 
 (ERROR
   "try"
-  ":" @indent.begin
-  (#set! indent.immediate 1))
+  .
+  ":"
+  (#set! indent.immediate 1)) @indent.begin
+
+(ERROR
+  "try"
+  .
+  ":"
+  (ERROR
+    (block
+      (expression_statement
+        (identifier) @_except) @indent.branch))
+  (#eq? @_except "except"))
 
 ((function_definition) @indent.begin
   (#set! indent.immediate 1))
diff --git a/tests/indent/python/control_flow.py b/tests/indent/python/control_flow.py
index fca528a2d..387756f63 100644
--- a/tests/indent/python/control_flow.py
+++ b/tests/indent/python/control_flow.py
@@ -26,3 +26,10 @@ while (a > 4 and
     pass
 
 try:
+
+def foo():
+    print('indentme')
+
+    # comment
+    if True:
+        pass
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index ec44d551c..193b9901e 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -39,6 +39,7 @@ describe("indent Python:", function()
     run:new_line("control_flow.py", { on_line = 24, text = "c < 6 and", indent = 7 })
     run:new_line("control_flow.py", { on_line = 26, text = "x = 4", indent = 4 })
     run:new_line("control_flow.py", { on_line = 28, text = "x = 4", indent = 4 })
+    run:new_line("control_flow.py", { on_line = 31, text = "try:", indent = 4 })
     run:new_line("branches.py", { on_line = 25, text = "x > 9 and", indent = 4 })
     run:new_line("branches.py", { on_line = 29, text = "and x > 9", indent = 4 })
     run:new_line("hanging_indent.py", { on_line = 1, text = "arg0,", indent = 4 })

From 69e4b99f135521795562f38a2cee13f148ee55a0 Mon Sep 17 00:00:00 2001
From: gi1242 <gi1242+github@gmail.com>
Date: Thu, 15 Feb 2024 02:59:28 -0500
Subject: [PATCH 1146/2704] fix(latex): update bibstyle queries (#6102)

Match grammar.js from commit 0d598bb95ffe3ba63403979d0d32158210974ca5 in
latex-lsp/tree-sitter-latex

Co-authored-by: gi1242 <gi1242+nvim-treesitter@gmail.com>
---
 lockfile.json                | 2 +-
 queries/latex/highlights.scm | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2563cc057..ea77c2ddb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -348,7 +348,7 @@
     "revision": "456dec2990ed7e9595eca82f85db14a1db46e126"
   },
   "latex": {
-    "revision": "2ae2021d7b224fb6aa57b760e0d146059f943bb8"
+    "revision": "841f89ffbba9650529a40fb867f3456bf92bf9b1"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 9649b5dd6..c91a624f4 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -316,10 +316,14 @@
   directory: (curly_group_path) @string
   file: (curly_group_path) @string)
 
-(bibtex_include
+(bibstyle_include
   command: _ @keyword.import
   path: (curly_group_path) @string)
 
+(bibtex_include
+  command: _ @keyword.import
+  paths: (curly_group_path_list) @string)
+
 (biblatex_include
   "\\addbibresource" @keyword.import
   glob: (curly_group_glob_pattern) @string.regexp)

From e4a1cc6e8eaecfde4daa8d6295f5bc3e3c5cdbc4 Mon Sep 17 00:00:00 2001
From: Wu Zhenyu <wuzhenyu@ustc.edu>
Date: Wed, 14 Feb 2024 10:15:10 +0800
Subject: [PATCH 1147/2704] feat: add the muttrc parser

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  9 ++++++
 queries/muttrc/highlights.scm   | 53 +++++++++++++++++++++++++++++++++
 queries/muttrc/injections.scm   |  8 +++++
 5 files changed, 74 insertions(+)
 create mode 100644 queries/muttrc/highlights.scm
 create mode 100644 queries/muttrc/injections.scm

diff --git a/README.md b/README.md
index 5c27c7d6d..56066ec79 100644
--- a/README.md
+++ b/README.md
@@ -308,6 +308,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [mermaid](https://github.com/monaqa/tree-sitter-mermaid) (experimental)
 - [x] [meson](https://github.com/Decodetalkers/tree-sitter-meson) (maintained by @Decodetalkers)
 - [x] [mlir](https://github.com/artagnon/tree-sitter-mlir) (experimental, maintained by @artagnon)
+- [x] [muttrc](https://github.com/neomutt/tree-sitter-muttrc) (maintained by @Freed-Wu)
 - [x] [nasm](https://github.com/naclsn/tree-sitter-nasm) (maintained by @ObserverOfTime)
 - [ ] [nickel](https://github.com/nickel-lang/tree-sitter-nickel)
 - [x] [nim](https://github.com/alaviss/tree-sitter-nim) (maintained by @aMOPel)
diff --git a/lockfile.json b/lockfile.json
index ea77c2ddb..e6356a0f3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -404,6 +404,9 @@
   "mlir": {
     "revision": "650a8fb72013ba8d169bdb458e480d640fc545c9"
   },
+  "muttrc": {
+    "revision": "9d4e1774e754f55a867638ab6a81335cf1078c23"
+  },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c9e312784..10d450690 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -47,6 +47,7 @@ for ft, lang in pairs {
   xsd = "xml",
   xslt = "xml",
   sbt = "scala",
+  neomuttrc = "muttrc",
 } do
   register_lang(lang, ft)
 end
@@ -1212,6 +1213,14 @@ list.mlir = {
   maintainers = { "@artagnon" },
 }
 
+list.muttrc = {
+  install_info = {
+    url = "https://github.com/neomutt/tree-sitter-muttrc",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Freed-Wu" },
+}
+
 list.nasm = {
   install_info = {
     url = "https://github.com/naclsn/tree-sitter-nasm",
diff --git a/queries/muttrc/highlights.scm b/queries/muttrc/highlights.scm
new file mode 100644
index 000000000..187c6ee54
--- /dev/null
+++ b/queries/muttrc/highlights.scm
@@ -0,0 +1,53 @@
+; Comments
+(comment) @comment @spell
+
+; General
+(int) @number
+
+(string) @string
+
+[
+  (map)
+  (object)
+  (composeobject)
+  (color)
+  (attribute)
+] @string.special
+
+(quadoption) @boolean
+
+(path) @string.special.path
+
+(regex) @string.regexp
+
+[
+  (option)
+  (command_line_option)
+] @variable.builtin
+
+(command) @keyword
+
+(source_directive
+  (command) @keyword.import)
+
+(uri) @string.special.url
+
+(key_name) @constant.builtin
+
+(escape) @string.escape
+
+(function) @function.call
+
+; Literals
+[
+  "<"
+  ">"
+] @punctuation.bracket
+
+"," @punctuation.delimiter
+
+[
+  "&"
+  "?"
+  "*"
+] @character.special
diff --git a/queries/muttrc/injections.scm b/queries/muttrc/injections.scm
new file mode 100644
index 000000000..9c16ad15a
--- /dev/null
+++ b/queries/muttrc/injections.scm
@@ -0,0 +1,8 @@
+((regex) @injection.content
+  (#set! injection.language "regex"))
+
+((shell) @injection.content
+  (#set! injection.language "bash"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))

From e32ebdc01d245ec2faf666a1b5e354d74587a8d3 Mon Sep 17 00:00:00 2001
From: Wu Zhenyu <wuzhenyu@ustc.edu>
Date: Wed, 14 Feb 2024 10:25:39 +0800
Subject: [PATCH 1148/2704] feat: change some ft, lang pairs

mysql comes from $VIMRUNTIME/syntax/mysql.vim
expect comes from $VIMRUNTIME/syntax/expect.vim
---
 lua/nvim-treesitter/parsers.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 10d450690..e31d665f2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -30,14 +30,10 @@ for ft, lang in pairs {
   ecma = "javascript",
   jsx = "javascript",
   sh = "bash",
-  apkbuild = "bash",
-  PKGBUILD = "bash",
   html_tags = "html",
   ["typescript.tsx"] = "tsx",
   ["html.handlebars"] = "glimmer",
   systemverilog = "verilog",
-  cls = "latex",
-  sty = "latex",
   pandoc = "markdown",
   rmd = "markdown",
   quarto = "markdown",
@@ -46,6 +42,8 @@ for ft, lang in pairs {
   svg = "xml",
   xsd = "xml",
   xslt = "xml",
+  expect = "tcl",
+  mysql = "sql",
   sbt = "scala",
   neomuttrc = "muttrc",
 } do

From 1ea4a0afd5baac813e27a7b75dff4bfece6a793c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 15 Feb 2024 10:08:40 +0100
Subject: [PATCH 1149/2704] fix(haskell): comment out unsafe utf8 node

---
 queries/haskell/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index ce18f98a3..fed093197 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -87,7 +87,7 @@
 ; Keywords, operators, includes
 [
   "forall"
-  "∀"
+  ; "∀" ; utf-8 is not cross-platform safe
 ] @keyword.repeat
 
 (pragma) @keyword.directive

From bdaa6b817aaef459e2d1968c50ce0061e51410e8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Feb 2024 08:01:33 +0000
Subject: [PATCH 1150/2704] Update parsers: agda, bash, c, c_sharp, cpp, css,
 devicetree, dtd, embedded_template, go, haskell, html, java, javascript,
 jsdoc, json, julia, kotlin, ocaml, ocaml_interface, php, php_only, python,
 ql, regex, ruby, rust, scala, slang, sql, tsx, typescript, verilog, wing,
 xml, zathurarc

---
 lockfile.json | 72 +++++++++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e6356a0f3..cb1270f42 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -3,7 +3,7 @@
     "revision": "ba0894efa03beb70780156b91e28c716b7a4764d"
   },
   "agda": {
-    "revision": "c21c3a0f996363ed17b8ac99d827fe5a4821f217"
+    "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
     "revision": "3946b1040b98a12458beef2763ce4780a523e3c6"
@@ -27,7 +27,7 @@
     "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
-    "revision": "8df9ea875d557a150d025d3a15b6e6a58624379a"
+    "revision": "975bc70ad95dbbf2733872bc2e0a059c055db983"
   },
   "bass": {
     "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
@@ -48,10 +48,10 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "25ca2718aacaf0feda8b0709471332f303a0cef5"
+    "revision": "b20f858322c8cd9d55d057dc19113e556cd500c2"
   },
   "c_sharp": {
-    "revision": "dd5e59721a5f8dae34604060833902b882023aaf"
+    "revision": "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"
   },
   "cairo": {
     "revision": "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"
@@ -84,10 +84,10 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "ef61cb57bd10838e90957672e6b4c129fcbe3a25"
+    "revision": "3d988327a1cfd724c0d195b37a1056174fae99bc"
   },
   "css": {
-    "revision": "98c7b3dceb24f1ee17f1322f3947e55638251c37"
+    "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
   },
   "csv": {
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
@@ -105,7 +105,7 @@
     "revision": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"
   },
   "devicetree": {
-    "revision": "6b53bfdb20a54727bfe344aa40907351a298f75c"
+    "revision": "2087a5b965db2a9efabab958a27fd8ddf43038a2"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "049c8d708b0627b03c47994c436693e25af4354d"
+    "revision": "2743ff864eac85cec830ff400f2e0024b9ca588b"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -150,7 +150,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "d04a1e82b368bd3b2c2d9bc8ed38c1a1f01b337f"
+    "revision": "6d791b897ecda59baa0689a85a9906348a2a6414"
   },
   "erlang": {
     "revision": "54b6f814f43c4eac81eeedefaa7cc8762fec6683"
@@ -222,7 +222,7 @@
     "revision": "7549f6faf5cc9fb8cf78054a7af356a6b003c6f3"
   },
   "go": {
-    "revision": "ff86c7f1734873c8c4874ca4dd95603695686d7a"
+    "revision": "fd577c4358c28cbcb6748bbf65354cc85f1cf7a4"
   },
   "godot_resource": {
     "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
@@ -255,7 +255,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "1da347c88599faad7964e63facead5d163ac7dba"
+    "revision": "8a99848fc734f9c4ea523b3f2a07df133cbbcec2"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -282,7 +282,7 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "949b78051835564bca937565241e5e337d838502"
+    "revision": "438d694a1f51e1704cb779ad4fec2517523b1d7f"
   },
   "htmldjango": {
     "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
@@ -306,19 +306,19 @@
     "revision": "51271e260346878e1a1aa6c506ce6a797b7c25e2"
   },
   "java": {
-    "revision": "2b57cd9541f9fd3a89207d054ce8fbe72657c444"
+    "revision": "99b29f1ed957b3b424b6e21f57bd21a9732a622a"
   },
   "javascript": {
-    "revision": "098bd31b7f838a31cce08db4091e989ea42f3ef6"
+    "revision": "6e9cd56ebdf3d8dc08ef045b6d183bf2073c4395"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "a5e363a98676136d9f5884cb558086e5f1fc32b6"
+    "revision": "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"
   },
   "json": {
-    "revision": "c5a9a9af069de3fe0ef5fa2fa001b6a2e44d75b2"
+    "revision": "ac6ddfa7775795a3d8f5edab4a71e3a49f932b6a"
   },
   "json5": {
     "revision": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"
@@ -330,7 +330,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "0c088d1ad270f02c4e84189247ac7001e86fe342"
+    "revision": "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -339,7 +339,7 @@
     "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
   },
   "kotlin": {
-    "revision": "0ef87892401bb01c84b40916e1f150197bc134b1"
+    "revision": "4e909d6cc9ac96b4eaecb3fb538eaca48e9e9ee9"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -438,10 +438,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "4abfdc1c7af2c6c77a370aee974627be1c285b3b"
+    "revision": "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"
   },
   "ocaml_interface": {
-    "revision": "4abfdc1c7af2c6c77a370aee974627be1c285b3b"
+    "revision": "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -465,10 +465,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "5ceb92397f68b4aad73b09dee3c63639cb4611e7"
+    "revision": "caf4d67d55386d3e4f85d29450b8d9cacbb02d19"
   },
   "php_only": {
-    "revision": "5ceb92397f68b4aad73b09dee3c63639cb4611e7"
+    "revision": "caf4d67d55386d3e4f85d29450b8d9cacbb02d19"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -522,10 +522,10 @@
     "revision": "41a15c43252baa083729c25646cde83ee5c88277"
   },
   "python": {
-    "revision": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc"
+    "revision": "deba2badc88afd18e6cbd4341ee3c18c3a9bb4ed"
   },
   "ql": {
-    "revision": "bd087020f0d8c183080ca615d38de0ec827aeeaf"
+    "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
   },
   "qmldir": {
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
@@ -555,7 +555,7 @@
     "revision": "f2f98d4263949d696e69a425f65326c59d1ceedc"
   },
   "regex": {
-    "revision": "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"
+    "revision": "ba22e4e0cb42b2ef066948d0ea030ac509cef733"
   },
   "rego": {
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
@@ -576,13 +576,13 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "7a010836b74351855148818d5cb8170dc4df8e6a"
+    "revision": "22a0bb2678755a3714e194609862ea7f4516e807"
   },
   "rust": {
-    "revision": "e0e8b6de6e4aa354749c794f5f36a906dcccda74"
+    "revision": "836903cc72c6dd2a53cd0947a07d229fd6291cc6"
   },
   "scala": {
-    "revision": "1abd3d94c8a315f0667a22e550ec2e663c124c03"
+    "revision": "e02f003d78dc269fef287b9b7b9963dc1f26bd7e"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -594,7 +594,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "d8f845c7f39cc1bbd7cc6d9191dac186e6bc6369"
+    "revision": "4d3779d41eae12db0cdc0ba748c1998c60574630"
   },
   "slint": {
     "revision": "68405a45f7a5311cd1f77e40ba84199573303f52"
@@ -624,7 +624,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "fd70fb358d164cd93fbe2674a9cca276dc5203f7"
+    "revision": "da2d1eff425b146d3c8cab7be8dfa98b11d896dc"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -699,7 +699,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "tsx": {
-    "revision": "7db8390a16a2cae317f4f4423a7b642cd4cad8c9"
+    "revision": "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -708,7 +708,7 @@
     "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
   },
   "typescript": {
-    "revision": "7db8390a16a2cae317f4f4423a7b642cd4cad8c9"
+    "revision": "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
@@ -735,7 +735,7 @@
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
   },
   "verilog": {
-    "revision": "902031343056bc0b11f3e47b33f036a9cf59f58d"
+    "revision": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"
   },
   "vhs": {
     "revision": "9534865e614c95eb9418e5e73f061c32fa4d9540"
@@ -756,13 +756,13 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "c07f132418ef42c7b0c0433ccc15f7e3d6284325"
+    "revision": "992e76b445311e13ff18470542f5ca972fb28567"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"
   },
   "xml": {
-    "revision": "049c8d708b0627b03c47994c436693e25af4354d"
+    "revision": "2743ff864eac85cec830ff400f2e0024b9ca588b"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"
@@ -774,7 +774,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "db40fc0a2d4a65f56530163a3217a8dabfc08842"
+    "revision": "d6ad85f7791a8a5a40f6be51b31f20d6a8472457"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From d49a8f82f107b43b7cdded278dab4873024a6f36 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Fri, 16 Feb 2024 00:42:42 +0100
Subject: [PATCH 1151/2704] highlights(slang): add support for `associatedtype`

---
 lockfile.json                | 2 +-
 queries/slang/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index cb1270f42..a4a7686a2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -594,7 +594,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "4d3779d41eae12db0cdc0ba748c1998c60574630"
+    "revision": "130b2f5c7a1d5c24645c3518db4bc2b22dd90718"
   },
   "slint": {
     "revision": "68405a45f7a5311cd1f77e40ba84199573303f52"
diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
index 2e01fcb98..e417af43f 100644
--- a/queries/slang/highlights.scm
+++ b/queries/slang/highlights.scm
@@ -9,6 +9,7 @@
   "interface"
   "extension"
   "property"
+  "associatedtype"
 ] @keyword
 
 "__init" @constructor

From 581e87ba4e509a50689fcdd538e5f9388845eb78 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 06:36:42 +0000
Subject: [PATCH 1152/2704] Update parsers: glsl, hlsl, hlsplaylist, muttrc,
 purescript, query, wing, zathurarc

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a4a7686a2..b34b498d5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -213,7 +213,7 @@
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
   },
   "glsl": {
-    "revision": "c15d4e8b2599234745d5f3454695067e61092c20"
+    "revision": "284bed0e2f1d9f700756b96512baf33483642ff0"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -270,10 +270,10 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "3ade6d065c69cd72c4da966d0c0af98bfb512f16"
+    "revision": "840fd07f09304bca415b93a15483e9ab1e44bc3f"
   },
   "hlsplaylist": {
-    "revision": "be3a18abfa9cef1f792324beb1f1e1c9ddba2748"
+    "revision": "ff121d397cf7cc709e3bbc928107fc25529e11e0"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -405,7 +405,7 @@
     "revision": "650a8fb72013ba8d169bdb458e480d640fc545c9"
   },
   "muttrc": {
-    "revision": "9d4e1774e754f55a867638ab6a81335cf1078c23"
+    "revision": "0af0e0d8c8cf59dc21cfe565489da0c247374b9f"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
@@ -516,7 +516,7 @@
     "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
   },
   "purescript": {
-    "revision": "cfd217d32aa0266401ec5bf3d929697fdeb835ba"
+    "revision": "2517b1ee2236353af761edbd22570f740f1603f1"
   },
   "pymanifest": {
     "revision": "41a15c43252baa083729c25646cde83ee5c88277"
@@ -534,7 +534,7 @@
     "revision": "9fa49ff3315987f715ce5666ff979a7742fa8a98"
   },
   "query": {
-    "revision": "a49ed4fd541da90680d57cad760f9a4c9f128d9c"
+    "revision": "a0ccc351e5e868ec1f8135e97aa3b53c663cf2df"
   },
   "r": {
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
@@ -756,7 +756,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "992e76b445311e13ff18470542f5ca972fb28567"
+    "revision": "252c31021fe86337294bef8f657e4d4c140b1f43"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"
@@ -774,7 +774,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "d6ad85f7791a8a5a40f6be51b31f20d6a8472457"
+    "revision": "fe37e85db355c737573315f278672534c40fe140"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 504fe1043298c468f56a6ef6dc61f35b2d69495a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 16 Feb 2024 10:58:58 -0800
Subject: [PATCH 1153/2704] feat(ecma): highlight label identifiers

---
 queries/ecma/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 233b20e00..051d47749 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -36,6 +36,8 @@
 ((identifier) @type.builtin
   (#any-of? @type.builtin "Object" "Function" "Boolean" "Symbol" "Number" "Math" "Date" "String" "RegExp" "Map" "Set" "WeakMap" "WeakSet" "Promise" "Array" "Int8Array" "Uint8Array" "Uint8ClampedArray" "Int16Array" "Uint16Array" "Int32Array" "Uint32Array" "Float32Array" "Float64Array" "ArrayBuffer" "DataView" "Error" "EvalError" "InternalError" "RangeError" "ReferenceError" "SyntaxError" "TypeError" "URIError"))
 
+(statement_identifier) @label
+
 ; Function and method definitions
 ;--------------------------------
 (function_expression

From 47d013d025afc47f2093412f228f89a4cd0fe917 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Feb 2024 06:35:54 +0000
Subject: [PATCH 1154/2704] Update parsers: c, javascript, rust, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b34b498d5..088f4a0bf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "b20f858322c8cd9d55d057dc19113e556cd500c2"
+    "revision": "72a60ea888fb59a8e143883661f021139c905b74"
   },
   "c_sharp": {
     "revision": "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"
@@ -309,7 +309,7 @@
     "revision": "99b29f1ed957b3b424b6e21f57bd21a9732a622a"
   },
   "javascript": {
-    "revision": "6e9cd56ebdf3d8dc08ef045b6d183bf2073c4395"
+    "revision": "9802cc5812a19cd28168076af36e88b463dd3a18"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -579,7 +579,7 @@
     "revision": "22a0bb2678755a3714e194609862ea7f4516e807"
   },
   "rust": {
-    "revision": "836903cc72c6dd2a53cd0947a07d229fd6291cc6"
+    "revision": "a70daac064145c84e9d51767c2575bb68d51df58"
   },
   "scala": {
     "revision": "e02f003d78dc269fef287b9b7b9963dc1f26bd7e"
@@ -756,7 +756,7 @@
     "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
   },
   "wing": {
-    "revision": "252c31021fe86337294bef8f657e4d4c140b1f43"
+    "revision": "f7965a947d2eaa8b5b9bba1c42a0e1891f1a0b2a"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"

From eb1914bb10dc9b114a61197de0ec58a308c40071 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 16 Feb 2024 11:25:21 -0800
Subject: [PATCH 1155/2704] feat(latex): more text func highlights

---
 queries/latex/highlights.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index c91a624f4..5b5f19768 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -2,7 +2,11 @@
 (command_name) @function
 
 (text_mode
-  "\\text" @function)
+  [
+    "\\text"
+    "\\intertext"
+    "\\shortintertext"
+  ] @function)
 
 (caption
   command: _ @function)

From 17d68ac13c902f55253b7facb47df4c0ae532575 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 16 Feb 2024 11:47:10 +0100
Subject: [PATCH 1156/2704] feat(rust): add doc comments

---
 queries/rust/highlights.scm | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index c651f34fa..f5fff58d0 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -220,20 +220,11 @@
   (block_comment)
 ] @comment @spell
 
-((line_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^///[^/]"))
+(line_comment
+  (doc_comment)) @comment.documentation
 
-((line_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^///$"))
-
-((line_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^//!"))
-
-((block_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
-
-((block_comment) @comment.documentation
-  (#lua-match? @comment.documentation "^/[*][!]"))
+(block_comment
+  (doc_comment)) @comment.documentation
 
 (boolean_literal) @boolean
 

From 42acc3f6e778dd6eb6e0e92690c7d56eab859b6a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 17 Feb 2024 18:03:16 -0800
Subject: [PATCH 1157/2704] refactor(ecma): delimiter highlight consolidation

---
 queries/ecma/highlights.scm | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 051d47749..b969486cc 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -206,23 +206,12 @@
 
 ; Punctuation
 ;------------
-";" @punctuation.delimiter
-
-"." @punctuation.delimiter
-
-"," @punctuation.delimiter
-
-(pair
-  ":" @punctuation.delimiter)
-
-(pair_pattern
-  ":" @punctuation.delimiter)
-
-(switch_case
-  ":" @punctuation.delimiter)
-
-(switch_default
-  ":" @punctuation.delimiter)
+[
+  ";"
+  "."
+  ","
+  ":"
+] @punctuation.delimiter
 
 [
   "--"

From f75a5b4e144228e4b2ab3006ed167b6fe37d0b33 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Feb 2024 06:35:52 +0000
Subject: [PATCH 1158/2704] Update parsers: d, swift, wgsl_bevy

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 088f4a0bf..c35a54d14 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -99,7 +99,7 @@
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
   },
   "d": {
-    "revision": "d9a1a2ed77017c23f715643f4739433a5ea7ab6f"
+    "revision": "a33d400f025d6bbd37b4c681c93054976f579890"
   },
   "dart": {
     "revision": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"
@@ -651,7 +651,7 @@
     "revision": "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd"
   },
   "swift": {
-    "revision": "dabbcf9a2311e08c1b020e1258849b8359e9de1a"
+    "revision": "bd81fff1453a5512e554bea3b163d95a5bef4c4e"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -753,7 +753,7 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "a041228ae64632f59b9bd37346a0dbcb7817f36b"
+    "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
     "revision": "f7965a947d2eaa8b5b9bba1c42a0e1891f1a0b2a"

From 5d9e12ccf4cf7a2b90368a217aab57d965c2d624 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 17 Feb 2024 09:45:58 -0800
Subject: [PATCH 1159/2704] fix(bash): unordered concatenation highlights

---
 queries/bash/highlights.scm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index b4360ce7e..7c222f5c6 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -68,10 +68,6 @@
   argument: "$" @string) ; bare dollar
 
 (concatenation
-  [
-    (simple_expansion)
-    (expansion)
-  ]
   (word) @string)
 
 [

From c920b668f8d7a1522af1cb779636d9ed0fd9b5c8 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 17:31:02 +0300
Subject: [PATCH 1160/2704] feat: add typst queries

---
 queries/typst/folds.scm   |  3 +++
 queries/typst/indents.scm | 11 +++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 queries/typst/folds.scm
 create mode 100644 queries/typst/indents.scm

diff --git a/queries/typst/folds.scm b/queries/typst/folds.scm
new file mode 100644
index 000000000..02eb3830d
--- /dev/null
+++ b/queries/typst/folds.scm
@@ -0,0 +1,3 @@
+(set) @fold
+(let) @fold
+(call) @fold
diff --git a/queries/typst/indents.scm b/queries/typst/indents.scm
new file mode 100644
index 000000000..855095955
--- /dev/null
+++ b/queries/typst/indents.scm
@@ -0,0 +1,11 @@
+[
+ (set)
+ (let)
+ (call)
+] @indent.begin
+
+[
+ "]"
+ "}"
+ ")"
+] @indent.branch @indent.end

From 87bc770e605d7aab6cc3d96fe91dc723b38110fd Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 17:42:36 +0300
Subject: [PATCH 1161/2704] style: format queries

---
 queries/typst/folds.scm   |  2 ++
 queries/typst/indents.scm | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/queries/typst/folds.scm b/queries/typst/folds.scm
index 02eb3830d..e229f74cd 100644
--- a/queries/typst/folds.scm
+++ b/queries/typst/folds.scm
@@ -1,3 +1,5 @@
 (set) @fold
+
 (let) @fold
+
 (call) @fold
diff --git a/queries/typst/indents.scm b/queries/typst/indents.scm
index 855095955..b62d1181c 100644
--- a/queries/typst/indents.scm
+++ b/queries/typst/indents.scm
@@ -1,11 +1,11 @@
 [
- (set)
- (let)
- (call)
+  (set)
+  (let)
+  (call)
 ] @indent.begin
 
 [
- "]"
- "}"
- ")"
+  "]"
+  "}"
+  ")"
 ] @indent.branch @indent.end

From ab3ec330ec0687ceedda2748fb2f7a5c88672568 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 20:54:08 +0300
Subject: [PATCH 1162/2704] feat: add typst parser

---
 lua/nvim-treesitter/parsers.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e31d665f2..3a8733ce4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2071,6 +2071,14 @@ list.typoscript = {
   maintainers = { "@Teddytrombone" },
 }
 
+list.typst = {
+  install_info = {
+    url = "https://github.com/uben0/tree-sitter-typst",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@uben0", "@RaafatTurki" },
+}
+
 list.udev = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-udev",

From 2ba58a424cbeeee429abe01440ab32b2fb966d39 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 21:07:55 +0300
Subject: [PATCH 1163/2704] feat(typst): add highlight queries

---
 queries/typst/highlights.scm | 79 ++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 queries/typst/highlights.scm

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
new file mode 100644
index 000000000..ffcbd105b
--- /dev/null
+++ b/queries/typst/highlights.scm
@@ -0,0 +1,79 @@
+;; All scopes: comments
+(comment) @comment @spell
+
+;; Code
+;; punctuation
+["#"] @punctuation.special
+[":" ";" ","] @punctuation.delimiter
+["(" ")" "{" "}"] @punctuation.bracket
+;; TODO: context blocks?
+[ "[" "]" ] @punctuation.bracket
+;; operators
+[
+ "-"
+ "+"
+ "*"
+ "/"
+
+ "=="
+ "!="
+ "<"
+ "<="
+ ">"
+ ">="
+
+ "="
+
+ "in"
+ "and"
+ "or"
+ "not"
+] @operator
+;; keywords
+[ "import" "include" ] @include
+[ "let" "set" "show" ] @keyword
+;; control flow
+[ "for" "while" "break" "continue" ] @repeat
+[ "if" "else" ] @conditional
+;; special case: #for (ident) in (expr)
+(for "in" @repeat)
+;; type literals
+(number) @number
+(string) @string
+(bool) @boolean
+;; identifiers
+(builtin) @namespace
+(ident) @identifier
+;; name-value pairs
+(tagged
+  field: (ident)) @field
+;; function definitions, calls, etc.
+;; TODO: support for functions such as #calc.cos, tree view appears as
+;; (call)
+;;  item: (field)
+;;   (builtin)
+;    field: (ident)
+(call
+  item: (builtin)) @function.builtin
+(call
+  item: (ident)) @function.call
+
+;; Text
+(heading) @text.title
+(text) @text
+(strong) @text.strong
+(emph) @text.emph
+(url) @text.uri
+;; code blocks
+(raw_span) @text.literal
+(raw_span
+  (blob)) @text.literal
+(raw_blck) @text.literal
+(raw_blck
+  (blob)) @text.literal.block
+;; refs and labels
+(label) @text.reference
+(ref) @text.reference
+
+;; Math
+(math) @text.math

From 4cb1595f5b9eb350aa8a090d56c82abed9d56036 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 21:10:25 +0300
Subject: [PATCH 1164/2704] feat(typst): add #show to fold and indent queries

---
 queries/typst/folds.scm   | 2 ++
 queries/typst/indents.scm | 1 +
 2 files changed, 3 insertions(+)

diff --git a/queries/typst/folds.scm b/queries/typst/folds.scm
index e229f74cd..88b6d6556 100644
--- a/queries/typst/folds.scm
+++ b/queries/typst/folds.scm
@@ -2,4 +2,6 @@
 
 (let) @fold
 
+(show) @fold
+
 (call) @fold
diff --git a/queries/typst/indents.scm b/queries/typst/indents.scm
index b62d1181c..d43c586c1 100644
--- a/queries/typst/indents.scm
+++ b/queries/typst/indents.scm
@@ -1,6 +1,7 @@
 [
   (set)
   (let)
+  (show)
   (call)
 ] @indent.begin
 

From b3847b955103599689b2056fce305f7c77cc15aa Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 21:27:48 +0300
Subject: [PATCH 1165/2704] feat(typst): add comment injection

---
 queries/typst/injections.scm | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 queries/typst/injections.scm

diff --git a/queries/typst/injections.scm b/queries/typst/injections.scm
new file mode 100644
index 000000000..050826330
--- /dev/null
+++ b/queries/typst/injections.scm
@@ -0,0 +1,4 @@
+([
+  (comment)
+] @injection.content
+  (#set! injection.language "comment"))

From c76e7e2a28d22994293375593f588f006e659f8b Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 22:03:00 +0300
Subject: [PATCH 1166/2704] fix(typst): correct highlight captures

---
 queries/typst/highlights.scm | 105 +++++++++++++++++++++++------------
 1 file changed, 70 insertions(+), 35 deletions(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index ffcbd105b..4c6536899 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -1,13 +1,25 @@
-;; All scopes: comments
+;; comments
 (comment) @comment @spell
 
-;; Code
 ;; punctuation
-["#"] @punctuation.special
-[":" ";" ","] @punctuation.delimiter
-["(" ")" "{" "}"] @punctuation.bracket
-;; TODO: context blocks?
-[ "[" "]" ] @punctuation.bracket
+[
+ "#"
+ ] @punctuation.special
+[
+ ":"
+ ";"
+ ","
+ ] @punctuation.delimiter
+[
+ "(" ")"
+ "{" "}"
+ ] @punctuation.bracket
+; TODO: context blocks?
+[
+ "["
+ "]"
+ ] @punctuation.bracket
+
 ;; operators
 [
  "-"
@@ -28,25 +40,45 @@
  "and"
  "or"
  "not"
-] @operator
+ ] @operator
+
 ;; keywords
-[ "import" "include" ] @include
-[ "let" "set" "show" ] @keyword
+[
+ "import"
+ "include"
+ ] @keyword.import
+[
+ "let"
+ "set"
+ "show"
+ ] @keyword
+
 ;; control flow
-[ "for" "while" "break" "continue" ] @repeat
-[ "if" "else" ] @conditional
-;; special case: #for (ident) in (expr)
-(for "in" @repeat)
+[
+  "for"
+  "while"
+  "break"
+  "continue"
+] @keyword.repeat
+[
+  "if"
+  "else"
+] @keyword.conditional
+; special case: #for (ident) in (expr)
+(for "in" @keyword.repeat)
+
 ;; type literals
 (number) @number
 (string) @string
 (bool) @boolean
+
 ;; identifiers
-(builtin) @namespace
-(ident) @identifier
+(builtin) @module.builtin
+(ident) @constant
+
 ;; name-value pairs
 (tagged
-  field: (ident)) @field
+  field: (ident)) @variable.member
 ;; function definitions, calls, etc.
 ;; TODO: support for functions such as #calc.cos, tree view appears as
 ;; (call)
@@ -58,22 +90,25 @@
 (call
   item: (ident)) @function.call
 
-;; Text
-(heading) @text.title
-(text) @text
-(strong) @text.strong
-(emph) @text.emph
-(url) @text.uri
-;; code blocks
-(raw_span) @text.literal
-(raw_span
-  (blob)) @text.literal
-(raw_blck) @text.literal
-(raw_blck
-  (blob)) @text.literal.block
-;; refs and labels
-(label) @text.reference
-(ref) @text.reference
+;; text
+(text) @spell
+; TODO: use multi level headings
+(heading) @markup.heading
+(strong) @markup.strong
+(emph) @markup.italic
+(url) @markup.link.url
 
-;; Math
-(math) @text.math
+;; code blocks
+(raw_span) @markup.raw
+(raw_span
+  (blob)) @markup.raw
+(raw_blck) @markup.raw
+(raw_blck
+  (blob)) @markup.raw.block
+
+;; refs and labels
+(label) @markup.link.label
+(ref) @markup.link
+
+;; math
+(math) @markup.math

From 06d575ead4f67467db60a29aec4df1c9d7075184 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 22:04:02 +0300
Subject: [PATCH 1167/2704] fix(typst): prevent highlighting entire function
 calls

---
 queries/typst/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index 4c6536899..84d751b7d 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -86,9 +86,9 @@
 ;;   (builtin)
 ;    field: (ident)
 (call
-  item: (builtin)) @function.builtin
+  item: (builtin) @function.builtin)
 (call
-  item: (ident)) @function.call
+  item: (ident) @function.call)
 
 ;; text
 (text) @spell

From f85b205e83750af4fd926c6874dfe256e3fa4fb5 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 22:30:48 +0300
Subject: [PATCH 1168/2704] style(typst): format queries

---
 queries/typst/highlights.scm | 135 ++++++++++++++++++++---------------
 queries/typst/injections.scm |   4 +-
 2 files changed, 77 insertions(+), 62 deletions(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index 84d751b7d..f6164ca6f 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -1,114 +1,131 @@
-;; comments
+; comments
 (comment) @comment @spell
 
-;; punctuation
+; punctuation
+"#" @punctuation.special
+
 [
- "#"
- ] @punctuation.special
+  ":"
+  ";"
+  ","
+] @punctuation.delimiter
+
 [
- ":"
- ";"
- ","
- ] @punctuation.delimiter
-[
- "(" ")"
- "{" "}"
- ] @punctuation.bracket
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
 ; TODO: context blocks?
 [
- "["
- "]"
- ] @punctuation.bracket
+  "["
+  "]"
+] @punctuation.bracket
 
-;; operators
+; operators
 [
- "-"
- "+"
- "*"
- "/"
+  "-"
+  "+"
+  "*"
+  "/"
+  "=="
+  "!="
+  "<"
+  "<="
+  ">"
+  ">="
+  "="
+  "in"
+  "and"
+  "or"
+  "not"
+] @operator
 
- "=="
- "!="
- "<"
- "<="
- ">"
- ">="
-
- "="
-
- "in"
- "and"
- "or"
- "not"
- ] @operator
-
-;; keywords
+; keywords
 [
- "import"
- "include"
- ] @keyword.import
-[
- "let"
- "set"
- "show"
- ] @keyword
+  "import"
+  "include"
+] @keyword.import
 
-;; control flow
+[
+  "let"
+  "set"
+  "show"
+] @keyword
+
+; control flow
 [
   "for"
   "while"
   "break"
   "continue"
 ] @keyword.repeat
+
 [
   "if"
   "else"
 ] @keyword.conditional
-; special case: #for (ident) in (expr)
-(for "in" @keyword.repeat)
 
-;; type literals
+; special case: #for (ident) in (expr)
+(for
+  "in" @keyword.repeat)
+
+; type literals
 (number) @number
+
 (string) @string
+
 (bool) @boolean
 
-;; identifiers
+; identifiers
 (builtin) @module.builtin
+
 (ident) @constant
 
-;; name-value pairs
+; name-value pairs
 (tagged
   field: (ident)) @variable.member
-;; function definitions, calls, etc.
-;; TODO: support for functions such as #calc.cos, tree view appears as
-;; (call)
-;;  item: (field)
-;;   (builtin)
+
+; function definitions, calls, etc.
+; TODO: support for functions such as #calc.cos, tree view appears as
+; (call)
+;  item: (field)
+;   (builtin)
 ;    field: (ident)
 (call
   item: (builtin) @function.builtin)
+
 (call
   item: (ident) @function.call)
 
-;; text
+; text
 (text) @spell
+
 ; TODO: use multi level headings
 (heading) @markup.heading
+
 (strong) @markup.strong
+
 (emph) @markup.italic
+
 (url) @markup.link.url
 
-;; code blocks
+; code blocks
 (raw_span) @markup.raw
+
 (raw_span
   (blob)) @markup.raw
+
 (raw_blck) @markup.raw
+
 (raw_blck
   (blob)) @markup.raw.block
 
-;; refs and labels
+; refs and labels
 (label) @markup.link.label
+
 (ref) @markup.link
 
-;; math
+; math
 (math) @markup.math
diff --git a/queries/typst/injections.scm b/queries/typst/injections.scm
index 050826330..2f0e58eb6 100644
--- a/queries/typst/injections.scm
+++ b/queries/typst/injections.scm
@@ -1,4 +1,2 @@
-([
-  (comment)
-] @injection.content
+((comment) @injection.content
   (#set! injection.language "comment"))

From 097d6ffd5c3b5deaf0a22291c41373fd862ff30f Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Fri, 16 Feb 2024 23:26:48 +0300
Subject: [PATCH 1169/2704] fix(typst): move comment query to the bottom

---
 queries/typst/highlights.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index f6164ca6f..0fb20e054 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -1,6 +1,3 @@
-; comments
-(comment) @comment @spell
-
 ; punctuation
 "#" @punctuation.special
 
@@ -129,3 +126,6 @@
 
 ; math
 (math) @markup.math
+
+; comments
+(comment) @comment @spell

From 9772dd19a5c59365a84f1e3820a6aeacef6cee73 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Sat, 17 Feb 2024 00:56:38 +0300
Subject: [PATCH 1170/2704] style(typst): merge @punctuation.bracket clauses

---
 queries/typst/highlights.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index 0fb20e054..bb3f6a763 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -7,15 +7,12 @@
   ","
 ] @punctuation.delimiter
 
+; TODO: context blocks for "[" "]"?
 [
   "("
   ")"
   "{"
   "}"
-] @punctuation.bracket
-
-; TODO: context blocks?
-[
   "["
   "]"
 ] @punctuation.bracket

From bdff1ab16b5a46bf302b6816d100dc5ae217f5d7 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Sat, 17 Feb 2024 01:41:53 +0300
Subject: [PATCH 1171/2704] style(typst): group fold clauses

---
 queries/typst/folds.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/queries/typst/folds.scm b/queries/typst/folds.scm
index 88b6d6556..710ae953b 100644
--- a/queries/typst/folds.scm
+++ b/queries/typst/folds.scm
@@ -1,7 +1,6 @@
-(set) @fold
-
-(let) @fold
-
-(show) @fold
-
-(call) @fold
+[
+  (set)
+  (let)
+  (show)
+  (call)
+] @fold

From 3f2f770aad741b66dc5df04717f0042bbd430701 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@pm.me>
Date: Sun, 18 Feb 2024 10:28:21 +0300
Subject: [PATCH 1172/2704] fix(typst): nest @variable.member highlight capture

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 queries/typst/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index bb3f6a763..30c4d1bf5 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -79,7 +79,7 @@
 
 ; name-value pairs
 (tagged
-  field: (ident)) @variable.member
+  field: (ident) @variable.member)
 
 ; function definitions, calls, etc.
 ; TODO: support for functions such as #calc.cos, tree view appears as

From 4640135fdf7cc7e613892b7dd02ebbb7d2ef415a Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@pm.me>
Date: Sun, 18 Feb 2024 10:29:16 +0300
Subject: [PATCH 1173/2704] fix(typst): nest @markup.raw.block capture

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 queries/typst/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index 30c4d1bf5..00da22f28 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -114,7 +114,7 @@
 (raw_blck) @markup.raw
 
 (raw_blck
-  (blob)) @markup.raw.block
+  (blob) @markup.raw.block)
 
 ; refs and labels
 (label) @markup.link.label

From 13e4e75079b6db9ed53e2381d3ffcae6c3a69f90 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Sun, 18 Feb 2024 10:32:21 +0300
Subject: [PATCH 1174/2704] fix(typst): remove unneeded (blob) @markup.raw
 capture

---
 queries/typst/highlights.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index 00da22f28..a1a118eda 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -108,9 +108,6 @@
 ; code blocks
 (raw_span) @markup.raw
 
-(raw_span
-  (blob)) @markup.raw
-
 (raw_blck) @markup.raw
 
 (raw_blck

From 34cb6a474f6e2d133716b706f32e8a94e273d0cd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Feb 2024 11:35:05 +0000
Subject: [PATCH 1175/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 56066ec79..e68e3b42c 100644
--- a/README.md
+++ b/README.md
@@ -411,6 +411,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) (maintained by @Teddytrombone)
+- [x] [typst](https://github.com/uben0/tree-sitter-typst) (maintained by @uben0, @RaafatTurki)
 - [x] [udev](https://github.com/ObserverOfTime/tree-sitter-udev) (maintained by @ObserverOfTime)
 - [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
 - [x] [unison](https://github.com/kylegoetz/tree-sitter-unison) (maintained by @tapegram)

From 5e4b657181516e4aaf03ccbb4b21eca3b62b07dc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 18 Feb 2024 14:03:25 +0100
Subject: [PATCH 1176/2704] fix(typst): add lockfile entry

---
 lockfile.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lockfile.json b/lockfile.json
index c35a54d14..79057d3ff 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -713,6 +713,9 @@
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
+  "typst": {
+    "revision": "3a6c81bb56082604f5e63834cb2f946beeda1e76"
+  },
   "udev": {
     "revision": "15d89be59a3802dcbe2e97e0f9d32b52f3aeda3f"
   },

From fef26b5eeee1dca1699639dd0d76c47f15a45ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sun, 18 Feb 2024 23:13:39 +0900
Subject: [PATCH 1177/2704] fix(format): fix nested grouping indentation
 (#6128)

---
 queries/dart/highlights.scm | 7 ++++---
 scripts/format-queries.lua  | 7 ++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index ada4d212c..c41ff9c27 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -13,10 +13,11 @@
 ; 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
-  (#lua-match? @function "^_?[%l]")).
-(selector
+  (#lua-match? @function "^_?[%l]"))
   .
-  (argument_part))) @function
+  (selector
+    .
+    (argument_part))) @function
 
 ; Annotations
 ; --------------------
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 5cb0fb1a2..ab136d671 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -206,10 +206,15 @@ local format_queries = [[
     (named_node)                  ; ((foo))
     (list)                        ; ([foo] (...))
     (anonymous_node)              ; ("foo")
-    (grouping . (anonymous_node)) ; (("foo"))
   ] @format.indent.begin
   .
   (_))
+(grouping
+  "("
+  .
+  (grouping . (_)) @format.indent.begin
+  .
+  (_))
 (grouping
   "("
   .

From 8e1df60b13301c9e3a14b79cddd7ccee1088d878 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 18 Feb 2024 10:03:44 -0500
Subject: [PATCH 1178/2704] chore(puppet): update queries

---
 lockfile.json                 |  2 +-
 queries/puppet/folds.scm      |  2 +-
 queries/puppet/highlights.scm | 14 ++++++++------
 queries/puppet/indents.scm    |  1 -
 queries/puppet/locals.scm     |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 79057d3ff..1e5ab963c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -513,7 +513,7 @@
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
   },
   "puppet": {
-    "revision": "9ce9a5f7d64528572aaa8d59459ba869e634086b"
+    "revision": "3641b9e854ac9c84c7576e71c4c9a357bcfd9550"
   },
   "purescript": {
     "revision": "2517b1ee2236353af761edbd22570f740f1603f1"
diff --git a/queries/puppet/folds.scm b/queries/puppet/folds.scm
index c8fad6f92..78800fe4c 100644
--- a/queries/puppet/folds.scm
+++ b/queries/puppet/folds.scm
@@ -5,7 +5,7 @@
   (attribute_type_entry)
   (resource_declaration)
   (selector)
-  (method_call)
+  (iterator_statement)
   (case_statement)
   (hash)
   (array)
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index cebb15e74..e34cc883c 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -18,6 +18,7 @@
   "node"
   "type"
   "tag"
+  "require"
 ] @keyword
 
 [
@@ -57,8 +58,8 @@
 (function_call
   (identifier) @variable.parameter)
 
-(method_call
-  (identifier) @variable.parameter)
+(iterator_statement
+  (variable) @variable.parameter)
 
 ; Functions
 (function_declaration
@@ -92,10 +93,11 @@
   (class_identifier
     (identifier) @function.method .))
 
-(method_call
-  "."
-  .
-  (identifier) @function.method.call)
+(function_call
+  (field_expression
+    "."
+    (identifier) @function.method.call)
+  "(")
 
 ; Types
 (type) @type
diff --git a/queries/puppet/indents.scm b/queries/puppet/indents.scm
index 3522fe2f4..71c882f33 100644
--- a/queries/puppet/indents.scm
+++ b/queries/puppet/indents.scm
@@ -5,7 +5,6 @@
   (attribute_type_entry)
   (resource_declaration)
   (selector)
-  (method_call)
   (case_statement)
   (hash)
   (array)
diff --git a/queries/puppet/locals.scm b/queries/puppet/locals.scm
index 37ac2d851..f145fffbc 100644
--- a/queries/puppet/locals.scm
+++ b/queries/puppet/locals.scm
@@ -8,7 +8,7 @@
   (node_definition)
   (resource_declaration)
   (selector)
-  (method_call)
+  (iterator_statement)
   (case_statement)
   (hash)
   (array)

From d10e856c11ccc6ca4d9c11766a6ef605c375dd0a Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Sun, 18 Feb 2024 22:45:58 +0000
Subject: [PATCH 1179/2704] feat(beancount): add comment injection

---
 queries/beancount/injections.scm | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 queries/beancount/injections.scm

diff --git a/queries/beancount/injections.scm b/queries/beancount/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/beancount/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From f857a967744c626a34f50699eb4ac634279ad97e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 19 Feb 2024 06:56:42 +0100
Subject: [PATCH 1180/2704] fix(bass): revert to upstream parser (#6131)

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1e5ab963c..f31b82617 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -30,7 +30,7 @@
     "revision": "975bc70ad95dbbf2733872bc2e0a059c055db983"
   },
   "bass": {
-    "revision": "27f110dfe79620993f5493ffa0d0f2fe12d250ed"
+    "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
   },
   "beancount": {
     "revision": "dd6f4ec9b01dd18cc4aa8c8517738414fb98cd63"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3a8733ce4..d27117a1a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -161,7 +161,7 @@ list.bash = {
 
 list.bass = {
   install_info = {
-    url = "https://github.com/amaanq/tree-sitter-bass",
+    url = "https://github.com/vito/tree-sitter-bass",
     files = { "src/parser.c" },
   },
   maintainers = { "@amaanq" },

From 4704d7ad60a9eb93313d7d7f4cd853fee1362343 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 05:56:55 +0000
Subject: [PATCH 1181/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e68e3b42c..f660e1ffe 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [authzed](https://github.com/mleonidas/tree-sitter-authzed) (maintained by @mattpolzin)
 - [ ] [awk](https://github.com/Beaglefoot/tree-sitter-awk)
 - [x] [bash](https://github.com/tree-sitter/tree-sitter-bash) (maintained by @TravonteD)
-- [x] [bass](https://github.com/amaanq/tree-sitter-bass) (maintained by @amaanq)
+- [x] [bass](https://github.com/vito/tree-sitter-bass) (maintained by @amaanq)
 - [x] [beancount](https://github.com/polarmutex/tree-sitter-beancount) (maintained by @polarmutex)
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)

From b3e53e94232d2bc6d70516efbd932bcce3ba8e1e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 06:36:49 +0000
Subject: [PATCH 1182/2704] Update parsers: c, cpp, elm, html, markdown,
 markdown_inline, swift, vimdoc

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f31b82617..d8b4eae19 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "72a60ea888fb59a8e143883661f021139c905b74"
+    "revision": "f64a422d4e46a44315abe75295035554d334bdab"
   },
   "c_sharp": {
     "revision": "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"
@@ -84,7 +84,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "3d988327a1cfd724c0d195b37a1056174fae99bc"
+    "revision": "e0c1678a78731e78655b7d953efb4daecf58be46"
   },
   "css": {
     "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
@@ -141,7 +141,7 @@
     "revision": "511ea5e0088779e4bdd76e12963ab9a5fe99983a"
   },
   "elm": {
-    "revision": "c26afd7f2316f689410a1622f1780eff054994b1"
+    "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -282,7 +282,7 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "438d694a1f51e1704cb779ad4fec2517523b1d7f"
+    "revision": "74cab04e10b71811a32dfdde10fd0162d55c54cc"
   },
   "htmldjango": {
     "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
@@ -384,10 +384,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f"
+    "revision": "2821521a4e6eab37b63dff6a8e169cd88554047d"
   },
   "markdown_inline": {
-    "revision": "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f"
+    "revision": "2821521a4e6eab37b63dff6a8e169cd88554047d"
   },
   "matlab": {
     "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
@@ -651,7 +651,7 @@
     "revision": "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd"
   },
   "swift": {
-    "revision": "bd81fff1453a5512e554bea3b163d95a5bef4c4e"
+    "revision": "e1ac0c3b48f4c42c40f92f400f14c6561369d4dd"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -747,7 +747,7 @@
     "revision": "32c76f150347c1cd044e90b8e2bc73c00677fa55"
   },
   "vimdoc": {
-    "revision": "ed8695ad8de39c3f073da130156f00b1148e2891"
+    "revision": "40fcd50a2c7b5a3ef98294795116773b24fb61ab"
   },
   "vue": {
     "revision": "7e48557b903a9db9c38cea3b7839ef7e1f36c693"

From 3a7b5a9fb46c261b83eadb126463a6e7bdfc8c78 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 19 Feb 2024 02:53:49 -0500
Subject: [PATCH 1183/2704] feat(svelte)!: switch upstream parser

---
 README.md                       |  2 +-
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua |  4 ++--
 queries/svelte/folds.scm        | 11 +++++++----
 queries/svelte/highlights.scm   | 34 ++++++++++++++++++++++-----------
 queries/svelte/indents.scm      | 27 +++++++++++++++-----------
 queries/svelte/injections.scm   |  5 +----
 queries/svelte/locals.scm       |  1 +
 8 files changed, 52 insertions(+), 34 deletions(-)
 create mode 100644 queries/svelte/locals.scm

diff --git a/README.md b/README.md
index f660e1ffe..70f5c33b0 100644
--- a/README.md
+++ b/README.md
@@ -389,7 +389,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [styled](https://github.com/mskelton/tree-sitter-styled) (maintained by @mskelton)
 - [x] [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) (maintained by @madskjeldgaard)
 - [x] [surface](https://github.com/connorlay/tree-sitter-surface) (maintained by @connorlay)
-- [x] [svelte](https://github.com/Himujjal/tree-sitter-svelte) (maintained by @elianiva)
+- [x] [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) (maintained by @amaanq)
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
diff --git a/lockfile.json b/lockfile.json
index d8b4eae19..22675c886 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -648,7 +648,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd"
+    "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
     "revision": "e1ac0c3b48f4c42c40f92f400f14c6561369d4dd"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d27117a1a..2f3654fc5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1893,10 +1893,10 @@ list.surface = {
 
 list.svelte = {
   install_info = {
-    url = "https://github.com/Himujjal/tree-sitter-svelte",
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-svelte",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@elianiva" },
+  maintainers = { "@amaanq" },
 }
 
 list.swift = {
diff --git a/queries/svelte/folds.scm b/queries/svelte/folds.scm
index e8635d119..d46a81ec4 100644
--- a/queries/svelte/folds.scm
+++ b/queries/svelte/folds.scm
@@ -1,9 +1,12 @@
+; inherits: html
 [
-  (style_element)
-  (script_element)
-  (element)
   (if_statement)
-  (else_statement)
+  (else_if_block)
+  (else_block)
   (each_statement)
   (await_statement)
+  (then_block)
+  (catch_block)
+  (key_statement)
+  (snippet_statement)
 ] @fold
diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 3e1386d2f..0746879e0 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -1,20 +1,32 @@
-; inherits: html_tags
-(raw_text_expr) @none
+; inherits: html
+(raw_text) @none
 
 [
-  (special_block_keyword)
-  (then)
-  (as)
+  "as"
+  "key"
+  "html"
+  "snippet"
+  "render"
 ] @keyword
 
-((special_block_keyword) @keyword.coroutine
-  (#eq? @keyword.coroutine "await"))
+"const" @type.qualifier
 
-((special_block_keyword) @keyword.exception
-  (#eq? @keyword.exception "catch"))
+[
+  "if"
+  "else"
+  "then"
+] @keyword.conditional
 
-((special_block_keyword) @keyword.conditional
-  (#any-of? @keyword.conditional "if" "else"))
+"each" @keyword.repeat
+
+[
+  "await"
+  "then"
+] @keyword.coroutine
+
+"catch" @keyword.exception
+
+"debug" @keyword.debug
 
 [
   "{"
diff --git a/queries/svelte/indents.scm b/queries/svelte/indents.scm
index 58224eae1..8e6124d75 100644
--- a/queries/svelte/indents.scm
+++ b/queries/svelte/indents.scm
@@ -1,28 +1,33 @@
-; inherits: html_tags
+; inherits: html
 [
   (if_statement)
   (each_statement)
   (await_statement)
   (key_statement)
+  (snippet_statement)
 ] @indent.begin
 
-(if_end_expr
+(if_end
   "}" @indent.end)
 
-(each_end_expr
+(each_end
   "}" @indent.end)
 
-(await_end_expr
+(await_end
   "}" @indent.end)
 
-(key_end_expr
+(key_end
+  "}" @indent.end)
+
+(snippet_end
   "}" @indent.end)
 
 [
-  (if_end_expr)
-  (else_if_statement)
-  (else_statement)
-  (each_end_expr)
-  (await_end_expr)
-  (key_end_expr)
+  (if_end)
+  (else_if_block)
+  (else_block)
+  (each_end)
+  (await_end)
+  (key_end)
+  (snippet_end)
 ] @indent.branch
diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index 912fa3467..a101fe668 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -10,10 +10,7 @@
   (#any-of? @_lang "scss" "postcss" "less")
   (#set! injection.language "scss"))
 
-([
-  (raw_text_expr)
-  (raw_text_each)
-] @injection.content
+((svelte_raw_text) @injection.content
   (#set! injection.language "javascript"))
 
 ((script_element
diff --git a/queries/svelte/locals.scm b/queries/svelte/locals.scm
new file mode 100644
index 000000000..1f2129cf9
--- /dev/null
+++ b/queries/svelte/locals.scm
@@ -0,0 +1 @@
+; inherits: html

From 9bc21966f27d48ab8eac4c42d5b130ef6c411304 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Mon, 19 Feb 2024 16:49:04 +0100
Subject: [PATCH 1184/2704] fix: typos

---
 lua/nvim-treesitter/indent.lua  | 4 ++--
 queries/apex/highlights.scm     | 2 +-
 queries/markdown/highlights.scm | 2 +-
 queries/nim/injections.scm      | 2 +-
 queries/rbs/highlights.scm      | 2 +-
 queries/squirrel/injections.scm | 2 +-
 scripts/format-queries.lua      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 18d239571..a9e5e6cee 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -249,9 +249,9 @@ function M.get_indent(lnum)
     if is_in_err and not q["indent.align"][node:id()] then
       -- only when the node is in error, promote the
       -- first child's aligned indent to the error node
-      -- to work around ((ERROR "X" . (_)) @aligned_indent (#set! "delimeter" "AB"))
+      -- to work around ((ERROR "X" . (_)) @aligned_indent (#set! "delimiter" "AB"))
       -- matching for all X, instead set do
-      -- (ERROR "X" @aligned_indent (#set! "delimeter" "AB") . (_))
+      -- (ERROR "X" @aligned_indent (#set! "delimiter" "AB") . (_))
       -- and we will fish it out here.
       for c in node:iter_children() do
         if q["indent.align"][c:id()] then
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index ef264064d..2d1859688 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -17,7 +17,7 @@
   ";"
 ] @punctuation.delimiter
 
-; Default general color defination
+; Default general color definition
 (identifier) @variable
 
 (type_identifier) @type
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 7c26fd710..e4d375b54 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -79,7 +79,7 @@
 
 ; NOTE: The following has been commented out due to issues with spaces in the
 ; list marker nodes generated by the parser. If those spaces ever get captured
-; by a different node (e.g. block_continuation) we can safely readd these
+; by a different node (e.g. block_continuation) we can safely re-add these
 ; conceals.
 ; ;; Conceal bullet points
 ; ([(list_marker_plus) (list_marker_star)]
diff --git a/queries/nim/injections.scm b/queries/nim/injections.scm
index 776d36e3a..2b3f0a990 100644
--- a/queries/nim/injections.scm
+++ b/queries/nim/injections.scm
@@ -26,7 +26,7 @@
   (#eq? @_string_prefix "&"))
 
 ; sql in generalized_strings
-; and anyhting you like as long as the function name is the same as the injected language's parser
+; and anything you like as long as the function name is the same as the injected language's parser
 (generalized_string
   function: (identifier) @injection.language
   (string_content) @injection.content
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index a40b5957b..11dbf7c2c 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -5,7 +5,7 @@
     (simple_type_name)
   ] @type)
 
-; Buitin constants and Keywords
+; Builtin constants and Keywords
 [
   "true"
   "false"
diff --git a/queries/squirrel/injections.scm b/queries/squirrel/injections.scm
index ee864ca6f..578a9eeca 100644
--- a/queries/squirrel/injections.scm
+++ b/queries/squirrel/injections.scm
@@ -8,5 +8,5 @@
 
 ((verbatim_string) @injection.content
   (#lua-match? @injection.content "@\"<!DOCTYPE html>")
-  (#set! injection.languge "html")
+  (#set! injection.language "html")
   (#offset! @injection.content 0 2 0 -1))
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index ab136d671..ab7aa237b 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -189,7 +189,7 @@ local format_queries = [[
 (anonymous_node (identifier) @format.keep)
 (field_definition
   name: (_)
-  ":" @format.indent.begin @format.append-newline ; surpress trailing whitespaces with forced newlines
+  ":" @format.indent.begin @format.append-newline ; suppress trailing whitespaces with forced newlines
   [
     (named_node [ (named_node) (list) (grouping) (anonymous_node) (field_definition) ])
     (list "[" . (_) . (_) "]")

From 5b3e9861a2df635558008ab5129a35d90145028a Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Mon, 19 Feb 2024 16:19:54 +0100
Subject: [PATCH 1185/2704] ci: simplify cache key

Also ensure new matrix fields are automatically added to cache key.
---
 .github/workflows/test-queries.yml | 6 +++++-
 .github/workflows/tests.yml        | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index e1606f2fc..6b7772201 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -74,7 +74,11 @@ jobs:
           path: |
             ./parser/
             ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/
-          key: ${{ matrix.os }}-${{ matrix.cc }}-${{ matrix.nvim_tag }}-parsers-v1-${{ hashFiles('./lockfile.json', './lua/nvim-treesitter/parsers.lua', './lua/nvim-treesitter/install.lua', './lua/nvim-treesitter/shell_command_selectors.lua') }}
+          key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
+            './lockfile.json',
+            './lua/nvim-treesitter/install.lua',
+            './lua/nvim-treesitter/parsers.lua',
+            './lua/nvim-treesitter/shell_command_selectors.lua') }}
 
       - name: Compile parsers
         run: $NVIM --headless -c "lua require'nvim-treesitter.install'.prefer_git=false" -c "TSInstallSync all" -c "q"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b3858b5de..8d71edeb0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -53,7 +53,11 @@ jobs:
           path: |
             ./parser/
             ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/
-          key: ${{ matrix.os }}-${{ matrix.cc }}-parsers-v1-${{ hashFiles('./lockfile.json', './lua/nvim-treesitter/parsers.lua', './lua/nvim-treesitter/install.lua', './lua/nvim-treesitter/shell_selectors.lua') }}
+          key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
+            './lockfile.json',
+            './lua/nvim-treesitter/install.lua',
+            './lua/nvim-treesitter/parsers.lua',
+            './lua/nvim-treesitter/shell_selectors.lua') }}
 
       - name: Compile parsers Unix like
         if: ${{ runner.os != 'Windows' && steps.parsers-cache.outputs.cache-hit != 'true' }}

From e04ce8bcec4dec3551d7ec4fa6d737d183433bfd Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Tue, 20 Feb 2024 03:26:32 +0800
Subject: [PATCH 1186/2704] feat: add tmux parser

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/tmux/highlights.scm     | 52 +++++++++++++++++++++++++++++++++
 queries/tmux/injections.scm     |  5 ++++
 5 files changed, 69 insertions(+)
 create mode 100644 queries/tmux/highlights.scm
 create mode 100644 queries/tmux/injections.scm

diff --git a/README.md b/README.md
index 70f5c33b0..0e3987d1c 100644
--- a/README.md
+++ b/README.md
@@ -403,6 +403,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [thrift](https://github.com/duskmoon314/tree-sitter-thrift) (maintained by @amaanq, @duskmoon314)
 - [x] [tiger](https://github.com/ambroisie/tree-sitter-tiger) (maintained by @ambroisie)
 - [x] [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) (maintained by @ahelwer, @susliko)
+- [x] [tmux](https://github.com/Freed-Wu/tree-sitter-tmux) (maintained by @Freed-Wu)
 - [x] [todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) (experimental, maintained by @arnarg)
 - [x] [toml](https://github.com/ikatyang/tree-sitter-toml) (maintained by @tk-shirasaka)
 - [x] [tsv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 22675c886..48f072b09 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -689,6 +689,9 @@
   "tlaplus": {
     "revision": "aaf5bb5c1df0a6e583bb51efa519a9ac788b2ad8"
   },
+  "tmux": {
+    "revision": "10737f5dc4d8e68c9667f11a6996688a1185755f"
+  },
   "todotxt": {
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2f3654fc5..087f28fc8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1999,6 +1999,14 @@ list.tlaplus = {
   maintainers = { "@ahelwer", "@susliko" },
 }
 
+list.tmux = {
+  install_info = {
+    url = "https://github.com/Freed-Wu/tree-sitter-tmux",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@Freed-Wu" },
+}
+
 list.todotxt = {
   install_info = {
     url = "https://github.com/arnarg/tree-sitter-todotxt.git",
diff --git a/queries/tmux/highlights.scm b/queries/tmux/highlights.scm
new file mode 100644
index 000000000..50da7d7d8
--- /dev/null
+++ b/queries/tmux/highlights.scm
@@ -0,0 +1,52 @@
+; Comments
+(comment) @comment @spell
+
+; General
+[
+  (string)
+  (raw_string)
+] @string
+
+(int) @number
+
+(path) @string.special.path
+
+[
+  (option)
+  (variable_name)
+] @variable
+
+(command_line_option) @variable.builtin
+
+((option) @variable.builtin
+  (#not-lua-match? @variable.builtin "^@"))
+
+(command) @keyword
+
+(source_file_directive
+  (command) @keyword.import)
+
+(attribute) @attribute
+
+(function_name) @function.call
+
+"=" @operator
+
+[
+  ","
+  ":"
+] @punctuation.delimiter
+
+[
+  "#"
+  "?"
+] @punctuation.special
+
+[
+  "#{"
+  "}"
+  "#["
+  "]"
+  "["
+  "{"
+] @punctuation.bracket
diff --git a/queries/tmux/injections.scm b/queries/tmux/injections.scm
new file mode 100644
index 000000000..5bf6e27d2
--- /dev/null
+++ b/queries/tmux/injections.scm
@@ -0,0 +1,5 @@
+((shell) @injection.content
+  (#set! injection.language "bash"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 4b27f87fef2df2feaca47a8498f5f7f51e94b765 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 19 Feb 2024 18:43:32 +0100
Subject: [PATCH 1187/2704] fix(scripts): format-queries defaults to cwd

---
 .github/workflows/lint.yml |  2 +-
 scripts/format-queries.lua | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 47a2ee386..b73f03cf8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -46,5 +46,5 @@ jobs:
 
       - name: Lint
         run: |
-          nvim -l scripts/format-queries.lua queries
+          nvim -l scripts/format-queries.lua
           git diff --exit-code
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index ab7aa237b..61309f817 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -6,13 +6,11 @@ local get_node_text = ts.get_node_text
 ---@type string[]
 local files
 
-if not _G.arg[1] then
-  print "Must specify file or directory to format!"
-  return
-elseif _G.arg[1]:match ".*%.scm$" then
-  files = { _G.arg[1] }
+local arg = _G.arg[1] or "."
+if arg:match ".*%.scm$" then
+  files = { arg }
 else
-  files = vim.fn.split(vim.fn.glob(_G.arg[1] .. "/**/*.scm"))
+  files = vim.fn.split(vim.fn.glob(arg .. "/**/*.scm"))
 end
 
 ts.query.add_predicate("has-type?", function(match, _, _, pred)

From 917d696592a34917a12208f579d5e72c1a904aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Tue, 20 Feb 2024 09:59:50 +0900
Subject: [PATCH 1188/2704] fix(scripts): add missing \n for nested grouping

---
 scripts/format-queries.lua | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 61309f817..41ab16ce3 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -204,15 +204,10 @@ local format_queries = [[
     (named_node)                  ; ((foo))
     (list)                        ; ([foo] (...))
     (anonymous_node)              ; ("foo")
+    (grouping . (_))
   ] @format.indent.begin
   .
   (_))
-(grouping
-  "("
-  .
-  (grouping . (_)) @format.indent.begin
-  .
-  (_))
 (grouping
   "("
   .
@@ -225,6 +220,7 @@ local format_queries = [[
     (named_node)
     (list)
     (predicate)
+    (grouping . (_))
     "."
   ] @format.append-newline
   (_) .)

From 1f6bd57192dd74ff56f991b84952fb8a0a8481dc Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Mon, 19 Feb 2024 23:21:27 +0100
Subject: [PATCH 1189/2704] ci: remove mergify.yml as it's no longer used

---
 .github/mergify.yml | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
deleted file mode 100644
index b95a074a5..000000000
--- a/.github/mergify.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-pull_request_rules:
-  - name: Merge lockfile updates
-    conditions:
-      - "title=Update lockfile.json"
-    actions:
-      review:
-        type: APPROVE
-        message: Automatically approving lockfile updates
-      merge:
-        method: merge
-
-  - name: Prepare for merge
-    conditions:
-      - and:
-        - "-draft"
-        - "#approved-reviews-by=1"
-        - "#review-requested=0"
-    actions:
-      comment:
-        message: |
-          This PR is ready to be merged, and will be in 1 day if nothing happens before.
-          If you want other people to review your PR, request their reviews.
-          If you don't want this PR to be merged now, mark it as a Draft.
-
-  - name: Merge on approval
-    conditions:
-      - and:
-        - or:
-          - "#approved-reviews-by>=2"
-          - and:
-            - "#approved-reviews-by=1"
-            - "updated-at>=1 day ago"
-        - "-draft"
-        - "#review-requested=0"
-    actions:
-      merge:
-        method: rebase

From ea3ddedd8306b90880a83f53678e087e13ebf131 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 20 Feb 2024 09:56:34 +0100
Subject: [PATCH 1190/2704] fix(meson): adapt to renamed node

---
 lockfile.json             | 2 +-
 queries/meson/indents.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 48f072b09..f0c929b9c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -399,7 +399,7 @@
     "revision": "e26a5f8898a8174f02b4cc9a9050eb3ccfb799f3"
   },
   "meson": {
-    "revision": "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"
+    "revision": "d6ec8ce0963c3c8180161391f15d8f7d415f650d"
   },
   "mlir": {
     "revision": "650a8fb72013ba8d169bdb458e480d640fc545c9"
diff --git a/queries/meson/indents.scm b/queries/meson/indents.scm
index 231f8b055..3e27d9200 100644
--- a/queries/meson/indents.scm
+++ b/queries/meson/indents.scm
@@ -19,7 +19,7 @@
   "endforeach"
 ] @indent.branch @indent.end
 
-(experession_statement
+(expression_statement
   object: (_)) @indent.begin
 
 (comment) @indent.auto

From d87074a06b3dfef0f8ed6bbf5953fca96abd312a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 09:11:16 +0000
Subject: [PATCH 1191/2704] Update parsers: gdscript, hlsplaylist, html,
 muttrc, wing, zathurarc

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f0c929b9c..fe4bb3bfe 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -189,7 +189,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gdscript": {
-    "revision": "03f20b94707a21bed90bb95101684bc4036139ce"
+    "revision": "645d7616cad9279d8d06684c7d7a356176174ebb"
   },
   "git_config": {
     "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
@@ -273,7 +273,7 @@
     "revision": "840fd07f09304bca415b93a15483e9ab1e44bc3f"
   },
   "hlsplaylist": {
-    "revision": "ff121d397cf7cc709e3bbc928107fc25529e11e0"
+    "revision": "5be34b0f6ea01b24f017c2c715729a3a919f57fd"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -282,7 +282,7 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "74cab04e10b71811a32dfdde10fd0162d55c54cc"
+    "revision": "5760f521fac79263de4ca71a590ef516594c9f37"
   },
   "htmldjango": {
     "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
@@ -405,7 +405,7 @@
     "revision": "650a8fb72013ba8d169bdb458e480d640fc545c9"
   },
   "muttrc": {
-    "revision": "0af0e0d8c8cf59dc21cfe565489da0c247374b9f"
+    "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
@@ -762,7 +762,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "f7965a947d2eaa8b5b9bba1c42a0e1891f1a0b2a"
+    "revision": "d4e159eceffb7ae870f750aa4bc9d50a173e05e0"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"
@@ -780,7 +780,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "fe37e85db355c737573315f278672534c40fe140"
+    "revision": "353bdf25e7af9c2830e254977fd3fb57ccaa8203"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 7eeb26e69cd923f4ebc2e708a6acf40777d4b157 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 19 Feb 2024 20:20:59 -0800
Subject: [PATCH 1192/2704] feat(ecma): folding for function arguments

---
 queries/ecma/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/ecma/folds.scm b/queries/ecma/folds.scm
index 5cc48064b..ef1bda52f 100644
--- a/queries/ecma/folds.scm
+++ b/queries/ecma/folds.scm
@@ -1,4 +1,5 @@
 [
+  (arguments)
   (for_in_statement)
   (for_statement)
   (while_statement)

From 6bd108a6f10aa01b854c3c673b6d9d61662a8c93 Mon Sep 17 00:00:00 2001
From: LamprosPitsillos <61395246+LamprosPitsillos@users.noreply.github.com>
Date: Tue, 20 Feb 2024 15:46:58 +0200
Subject: [PATCH 1193/2704] feat(typst): add raw block injections

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 queries/typst/injections.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/typst/injections.scm b/queries/typst/injections.scm
index 2f0e58eb6..344c6a308 100644
--- a/queries/typst/injections.scm
+++ b/queries/typst/injections.scm
@@ -1,2 +1,6 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+(raw_blck
+  (ident) @injection.language
+  (blob) @injection.content)

From c4c1f516ec3444d8f376acb08933dced683f94a9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 06:34:39 +0000
Subject: [PATCH 1194/2704] Update parsers: cuda, dtd, gdscript, hlsl,
 readline, slang, sourcepawn, wing, xml

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fe4bb3bfe..062071ed9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "2c6e806949197e7898910c78f514a3b7ff679068"
+    "revision": "221179d4287a2c24c08e4c67ff383ef67dc32156"
   },
   "cue": {
     "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "2743ff864eac85cec830ff400f2e0024b9ca588b"
+    "revision": "851ff145b12313382f49f56a3f9a399ba2bf0232"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -189,7 +189,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gdscript": {
-    "revision": "645d7616cad9279d8d06684c7d7a356176174ebb"
+    "revision": "73fd7c540a57da01c7e099ca5d5fc434f5273bcd"
   },
   "git_config": {
     "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
@@ -270,7 +270,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "840fd07f09304bca415b93a15483e9ab1e44bc3f"
+    "revision": "f820ee8417451f69020791cf691904ec1b63f20d"
   },
   "hlsplaylist": {
     "revision": "5be34b0f6ea01b24f017c2c715729a3a919f57fd"
@@ -552,7 +552,7 @@
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
   },
   "readline": {
-    "revision": "f2f98d4263949d696e69a425f65326c59d1ceedc"
+    "revision": "1530fb8c1ec21cdd529342b5d48bcf941c69bd59"
   },
   "regex": {
     "revision": "ba22e4e0cb42b2ef066948d0ea030ac509cef733"
@@ -594,7 +594,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "130b2f5c7a1d5c24645c3518db4bc2b22dd90718"
+    "revision": "0cdfb1741323f38e9a33798674145c22cfc0092b"
   },
   "slint": {
     "revision": "68405a45f7a5311cd1f77e40ba84199573303f52"
@@ -618,7 +618,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "846ec647109a1f3dfab17c025c80ecdf6fd56581"
+    "revision": "bc1f7348b42b8eeec5c3053865d8d36217504d13"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -762,13 +762,13 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "d4e159eceffb7ae870f750aa4bc9d50a173e05e0"
+    "revision": "e621578ce680afce92090392367d0eda9d6c0c7f"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"
   },
   "xml": {
-    "revision": "2743ff864eac85cec830ff400f2e0024b9ca588b"
+    "revision": "851ff145b12313382f49f56a3f9a399ba2bf0232"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 01cdcfb21645cbdc8ad34a0956ee177ce475036f Mon Sep 17 00:00:00 2001
From: Stephan Seitz <sseitz@nvidia.com>
Date: Wed, 21 Feb 2024 01:23:02 +0100
Subject: [PATCH 1195/2704] highlights(slang): add support for `where`

---
 queries/slang/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
index e417af43f..f60fb0aae 100644
--- a/queries/slang/highlights.scm
+++ b/queries/slang/highlights.scm
@@ -10,6 +10,7 @@
   "extension"
   "property"
   "associatedtype"
+  "where"
 ] @keyword
 
 "__init" @constructor

From 455f6586bae558f99b51c0b07d46adc736f3822c Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 21 Feb 2024 01:47:09 -0800
Subject: [PATCH 1196/2704] feat(query): indents that reflect the formatter
 (#6154)

* feat(query): indents that reflect the formatter

Indentation queries that reflect the query formatter. Only applicable if `lispoptions=expr:1`
---
 queries/query/indents.scm   | 20 ++++++++++++++----
 tests/indent/common.lua     |  2 +-
 tests/indent/query/test.scm | 41 +++++++++++++++++++++++++++++++++++++
 tests/indent/query_spec.lua | 25 ++++++++++++++++++++++
 4 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 tests/indent/query/test.scm
 create mode 100644 tests/indent/query_spec.lua

diff --git a/queries/query/indents.scm b/queries/query/indents.scm
index 925d77060..2ce40d299 100644
--- a/queries/query/indents.scm
+++ b/queries/query/indents.scm
@@ -1,8 +1,20 @@
-(list) @indent.begin
-
 [
+  (list)
+  (named_node)
+  (grouping)
+  (predicate) ; WIP to newline wrap any-of?
   "["
-  "]"
 ] @indent.begin
 
-"]" @indent.branch
+; ERROR node indents
+(ERROR
+  "(") @indent.begin
+
+"]" @indent.branch @indent.end
+
+")" @indent.end
+
+; Captures always mark the end of a node
+; Because of that, mark it as indent.end
+(capture
+  name: (identifier) @indent.end)
diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index 451d2f626..1ddd91a40 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -83,7 +83,7 @@ local function compare_indent(before, after, xfail)
 end
 
 local function set_buf_indent_opts(opts)
-  local optnames = { "tabstop", "shiftwidth", "softtabstop", "expandtab", "filetype" }
+  local optnames = { "tabstop", "shiftwidth", "softtabstop", "expandtab", "filetype", "lispoptions" }
   for _, opt in ipairs(optnames) do
     if opts[opt] ~= nil then
       vim.bo[opt] = opts[opt]
diff --git a/tests/indent/query/test.scm b/tests/indent/query/test.scm
new file mode 100644
index 000000000..62b94417c
--- /dev/null
+++ b/tests/indent/query/test.scm
@@ -0,0 +1,41 @@
+; vim:ft=query
+; format-ignore
+(fenced_code_block (fenced_code_block_delimiter) @label
+  (info_string
+    (language) @_lang)
+  (#offset! @label 0 1 0 -1)
+  (#ft-conceal! @_lang))
+
+([
+  (list_marker_minus)
+  (list_marker_plus)
+  (list_marker_star)
+] @markup.list
+  (#offset-first-n! @markup.list 1)
+  (#set! conceal "•"))
+
+(list
+  (list_item
+    (list
+      (list_item
+        ([
+          (list_marker_minus)
+          (list_marker_plus)
+          (list_marker_star)
+        ] @markup.list
+          (#offset-first-n! @markup.list 1)
+          (#set! conceal "◦"))))))
+
+; comment
+(while_statement
+  [
+    "while"
+    "do"
+  ] @open.loop
+  "end" @close.loop) @scope.loop
+
+[
+  "toplevel"
+  "list"
+] @variable
+((
diff --git a/tests/indent/query_spec.lua b/tests/indent/query_spec.lua
new file mode 100644
index 000000000..1f9c2315d
--- /dev/null
+++ b/tests/indent/query_spec.lua
@@ -0,0 +1,25 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/query", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 2,
+  expandtab = true,
+  lispoptions = "expr:1",
+})
+
+describe("indent Query:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {})
+  end)
+  describe("new line:", function()
+    run:new_line("test.scm", { on_line = 3, text = "(node)", indent = 2 })
+    run:new_line("test.scm", { on_line = 5, text = "(node)", indent = 2 })
+    run:new_line("test.scm", { on_line = 12, text = "(node)", indent = 2 })
+    run:new_line("test.scm", { on_line = 25, text = "(#my-directive!)", indent = 10 })
+    run:new_line("test.scm", { on_line = 34, text = '"more"', indent = 2 })
+    run:new_line("test.scm", { on_line = 35, text = "(node)", indent = 0 })
+    run:new_line("test.scm", { on_line = 40, text = "(node)", indent = 0 })
+    run:new_line("test.scm", { on_line = 41, text = "node_name", indent = 2 })
+  end)
+end)

From d1484a1507b36ca6af7f7925c627846010faeabe Mon Sep 17 00:00:00 2001
From: Wu Zhenyu <wuzhenyu@ustc.edu>
Date: Fri, 16 Feb 2024 20:50:06 +0800
Subject: [PATCH 1197/2704] feat: improve queries/muttrc/highlights.scm

---
 queries/muttrc/highlights.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/queries/muttrc/highlights.scm b/queries/muttrc/highlights.scm
index 187c6ee54..27754cc53 100644
--- a/queries/muttrc/highlights.scm
+++ b/queries/muttrc/highlights.scm
@@ -20,10 +20,12 @@
 
 (regex) @string.regexp
 
-[
-  (option)
-  (command_line_option)
-] @variable.builtin
+(option) @variable
+
+(command_line_option) @variable.builtin
+
+((option) @variable.builtin
+  (#not-lua-match? @variable.builtin "^my_"))
 
 (command) @keyword
 

From 71ae32c187b54f25fe867de7e58aec0d9fc495ec Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 21 Feb 2024 14:37:51 +0100
Subject: [PATCH 1198/2704] docs(template): use builtin commands

---
 .github/ISSUE_TEMPLATE/highlighting_issue.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/highlighting_issue.yml b/.github/ISSUE_TEMPLATE/highlighting_issue.yml
index 2713df8a1..a429b5eb8 100644
--- a/.github/ISSUE_TEMPLATE/highlighting_issue.yml
+++ b/.github/ISSUE_TEMPLATE/highlighting_issue.yml
@@ -11,10 +11,10 @@ body:
         - I have updated my neovim version to latest _master_.
         - I have updated my plugin to the latest version.
         - I have run `:TSUpdate`.
-        - I have inspected the syntax tree using https://github.com/nvim-treesitter/playground and made sure
+        - I have inspected the syntax tree using `:InspectTree` and made sure
           that no `ERROR` nodes are in the syntax tree. nvim-treesitter can not guarantee correct highlighting in the
           presence of `ERROR`s -- in this case, please report the bug directly at corresponding parser's repository. (You can find all repository URLs in [README.md](https://github.com/nvim-treesitter/nvim-treesitter#supported-languages).)
-        - I have used `:TSHighlightCapturesUnderCursor` from https://github.com/nvim-treesitter/playground to inspect which highlight groups Neovim is using and that legacy syntax highlighting is not interfering (i.e., what you are observing is actual tree-sitter highlighting).
+        - I have used `:Inspect` to inspect which highlight groups Neovim is using and that legacy syntax highlighting is not interfering (i.e., what you are observing is actual tree-sitter highlighting).
 
   - type: textarea
     attributes:
@@ -34,8 +34,8 @@ body:
     attributes:
       label: Tree-sitter parsing result
       description: |
-        Please provide the output of `:TSPlaygroundToggle` from https://github.com/nvim-treesitter/playground
-        (screenshot or plain text) with the following options enabled (pressing the key):
+        Please provide the output of `:InspectTree` (screenshot or plain text)
+        with the following options enabled (pressing the key):
         - `I` (name of the parsed language)
         - `t` (toggle injected languages)
         - `a` (show anonymous nodes)
@@ -66,7 +66,7 @@ body:
       description: |
         Please provide a screenshot of the current highlighting. Please also tell us the `:h colorscheme` you are using
         and how to install it. If applicable, you can also upload a screenshot with the contents of
-        `:TSHighlightCapturesUnderCursor`.
+        `:Inspect`.
     validations:
       required: true
 

From 7d1bab65469bd53e7a68666de071d9a82a522a40 Mon Sep 17 00:00:00 2001
From: Alexei Mozaidze <lexerpexer@proton.me>
Date: Wed, 21 Feb 2024 17:44:01 +0400
Subject: [PATCH 1199/2704] feat(fennel)!: switch to maintained parser (#6132)

Change the Fennel parser to a simpler and more consistent one, along with updating all the queries.
---
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   4 +-
 queries/fennel/folds.scm        |  38 ++++-
 queries/fennel/highlights.scm   | 267 +++++++++++++++++++++++---------
 queries/fennel/injections.scm   | 146 +++++++++++++++++
 queries/fennel/locals.scm       |  48 +++---
 6 files changed, 398 insertions(+), 107 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 062071ed9..f6e2e5b5b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -162,7 +162,7 @@
     "revision": "9e514af33bfe061d0ccf1999dbcc93fca91f133c"
   },
   "fennel": {
-    "revision": "15e4f8c417281768db17080c4447297f8ff5343a"
+    "revision": "389e9ec34d9a56ecf3dd74232de8675b3c4b5487"
   },
   "firrtl": {
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 087f28fc8..324529cad 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -529,10 +529,10 @@ list.faust = {
 
 list.fennel = {
   install_info = {
-    url = "https://github.com/travonted/tree-sitter-fennel",
+    url = "https://github.com/alexmozaidze/tree-sitter-fennel",
     files = { "src/parser.c" },
   },
-  maintainers = { "@TravonteD" },
+  maintainers = { "@alexmozaidze" },
 }
 
 list.firrtl = {
diff --git a/queries/fennel/folds.scm b/queries/fennel/folds.scm
index 619300c4f..b4901d96a 100644
--- a/queries/fennel/folds.scm
+++ b/queries/fennel/folds.scm
@@ -1,11 +1,35 @@
 [
   (list)
   (table)
-  (sequential_table)
-  (let)
-  (fn)
-  (let_clause)
-  (quoted_list)
-  (local)
-  (global)
+  (sequence)
 ] @fold
+
+(list
+  .
+  (symbol) @_let
+  (#eq? @_let "let")
+  .
+  (sequence) @fold) @fold
+
+(list
+  .
+  (symbol) @_local
+  (#eq? @_local "local")) @fold
+
+(list
+  .
+  (symbol) @_global
+  (#eq? @_global "global")) @fold
+
+(list
+  .
+  (symbol) @_fn
+  (#any-of? @_fn "fn" "lambda" "λ" "hashfn")) @fold
+
+(reader_macro
+  macro:
+    [
+      "'"
+      "`"
+    ]
+  expression: (_) @fold)
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index ec2a82759..d9f375312 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -1,3 +1,6 @@
+; Most primitive nodes
+(shebang) @keyword.directive
+
 (comment) @comment @spell
 
 [
@@ -9,18 +12,8 @@
   "]"
 ] @punctuation.bracket
 
-[
-  ":"
-  ":until"
-  "&"
-  "&as"
-  "?"
-] @punctuation.special
-
 (nil) @constant.builtin
 
-(vararg) @punctuation.special
-
 (boolean) @boolean
 
 (number) @number
@@ -33,11 +26,7 @@
 
 (multi_symbol
   "." @punctuation.delimiter
-  (symbol) @variable.member)
-
-(multi_symbol_method
-  ":" @punctuation.delimiter
-  (symbol) @function.method.call .)
+  member: (symbol_fragment) @variable.member)
 
 (list
   .
@@ -46,80 +35,218 @@
 (list
   .
   (multi_symbol
-    (symbol) @function.call .))
+    member: (symbol_fragment) @function.call .))
 
-((symbol) @variable.builtin
-  (#lua-match? @variable.builtin "^[$]"))
+(multi_symbol_method
+  ":" @punctuation.delimiter
+  method: (symbol_fragment) @function.method.call .)
 
-(binding) @string.special.symbol
+; Just `&` is only used in destructuring
+((symbol) @punctuation.special
+  (#eq? @punctuation.special "&"))
 
-[
-  "fn"
-  "lambda"
-  "hashfn"
-  "#"
-] @keyword.function
+; BUG: $ arguments should only be valid inside hashfn of any depth, but
+; it's impossible to express such query at the moment of writing.
+; See tree-sitter/tree-sitter#880
+((symbol) @variable.parameter
+  (#eq? @variable.parameter "$..."))
 
-(fn
-  name:
-    [
-      (symbol) @function
-      (multi_symbol
-        (symbol) @function .)
-    ])
+((symbol) @variable.parameter
+  (#lua-match? @variable.parameter "^%$[1-9]$"))
 
-(lambda
-  name:
-    [
-      (symbol) @function
-      (multi_symbol
-        (symbol) @function .)
-    ])
+((symbol) @operator
+  ; format-ignore
+  (#any-of? @operator
+    ; arithmetic
+    "+" "-" "*" "/" "//" "%" "^"
+    ; comparison
+    ">" "<" ">=" "<=" "=" "~="
+    ; other
+    "#" "." "?." ".."))
 
-[
-  "for"
-  "each"
-] @keyword.repeat
+((symbol) @keyword.operator
+  ; format-ignore
+  (#any-of? @keyword.operator
+    ; comparison
+    "not="
+    ; boolean
+    "and" "or" "not"
+    ; bitwise
+    "lshift" "rshift" "band" "bor" "bxor" "bnot"
+    ; other
+    "length"))
+
+(reader_macro
+  macro: "#" @keyword.function)
+
+((symbol) @keyword.function
+  (#any-of? @keyword.function "fn" "lambda" "λ" "hashfn"))
 
 ((symbol) @keyword.repeat
-  (#any-of? @keyword.repeat "while"))
-
-"match" @keyword.conditional
+  (#any-of? @keyword.repeat "for" "each" "while"))
 
 ((symbol) @keyword.conditional
-  (#any-of? @keyword.conditional "if" "when"))
-
-[
-  "global"
-  "local"
-  "let"
-  "set"
-  "var"
-  "where"
-  "or"
-] @keyword
+  (#any-of? @keyword.conditional "if" "when" "match" "case"))
 
 ((symbol) @keyword
-  (#any-of? @keyword "comment" "do" "doc" "eval-compiler" "lua" "macros" "quote" "tset" "values"))
+  ; format-ignore
+  (#any-of? @keyword
+    "global"
+    "local"
+    "let"
+    "set"
+    "var"
+    "comment"
+    "do"
+    "doc"
+    "eval-compiler"
+    "lua"
+    "macros"
+    "unquote"
+    "quote"
+    "tset"
+    "values"
+    "tail!"))
 
 ((symbol) @keyword.import
   (#any-of? @keyword.import "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"))
+  ; format-ignore
+  (#any-of? @function.macro
+    "collect"
+    "icollect"
+    "fcollect"
+    "accumulate"
+    "faccumulate"
+    "->"
+    "->>"
+    "-?>"
+    "-?>>"
+    "?."
+    "doto"
+    "macro"
+    "macrodebug"
+    "partial"
+    "pick-args"
+    "pick-values"
+    "with-open"))
+
+; TODO: Highlight builtin methods (`table.unpack`, etc) as @function.builtin
+([
+  (symbol) @module.builtin
+  (multi_symbol
+    base: (symbol_fragment) @module.builtin)
+]
+  (#any-of? @module.builtin "vim" "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
+
+([
+  (symbol) @variable.builtin
+  (multi_symbol
+    .
+    (symbol_fragment) @variable.builtin)
+]
+  (#eq? @variable.builtin "arg"))
+
+((symbol) @variable.builtin
+  (#eq? @variable.builtin "..."))
 
-; Lua builtins
 ((symbol) @constant.builtin
-  (#any-of? @constant.builtin "arg" "_ENV" "_G" "_VERSION"))
+  (#eq? @constant.builtin "_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"))
+  ; format-ignore
+  (#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"
+    "module"
+    "setfenv"
+    "loadstring"
+    "unpack"))
 
-((symbol) @function.builtin
-  (#any-of? @function.builtin "loadstring" "module" "setfenv" "unpack"))
+(table
+  (table_pair
+    key: (symbol) @keyword.directive
+    (#eq? @keyword.directive "&as")))
+
+(list
+  .
+  (symbol) @keyword.function
+  (#any-of? @keyword.function "fn" "lambda" "λ")
+  .
+  [
+    (symbol) @function
+    (multi_symbol
+      (symbol_fragment) @function .)
+  ]
+  .
+  (sequence
+    ((symbol) @variable.parameter
+      (#not-any-of? @variable.parameter "&" "..."))))
+
+(list
+  .
+  (symbol) @function.macro
+  (#any-of? @function.macro "collect" "icollect" "fcollect")
+  .
+  (sequence
+    [
+      (symbol)
+      (string)
+    ] @keyword.directive
+    (#any-of? @keyword.directive "&into" ":into")))
+
+(list
+  .
+  (symbol) @function.macro
+  (#any-of? @function.macro "for" "each" "collect" "icollect" "fcollect" "accumulate" "faccumulate")
+  .
+  (sequence
+    [
+      (symbol)
+      (string)
+    ] @keyword.directive
+    (#any-of? @keyword.directive "&until" ":until")))
+
+(list
+  .
+  (symbol) @keyword.conditional
+  (#any-of? @keyword.conditional "match" "case")
+  .
+  (_)
+  .
+  ((list
+    .
+    (symbol) @keyword
+    (#eq? @keyword "where"))
+    .
+    (_))*
+  .
+  (list
+    .
+    (symbol) @keyword
+    (#eq? @keyword "where"))
+  .
+  (_)? .)
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
index 2f0e58eb6..cea50c4a3 100644
--- a/queries/fennel/injections.scm
+++ b/queries/fennel/injections.scm
@@ -1,2 +1,148 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+(list
+  .
+  (multi_symbol) @_vimcmd_identifier
+  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec2")
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "vim")))
+
+; NOTE: Matches *exactly* `ffi.cdef`
+(list
+  .
+  (multi_symbol) @_cdef_identifier
+  (#eq? @_cdef_identifier "ffi.cdef")
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "c")))
+
+(list
+  .
+  (multi_symbol) @_ts_query_identifier
+  (#any-of? @_ts_query_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse")
+  .
+  (_)
+  .
+  (_)
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "query")))
+
+(list
+  .
+  (multi_symbol) @_vimcmd_identifier
+  (#eq? @_vimcmd_identifier "vim.api.nvim_create_autocmd")
+  .
+  (_)
+  .
+  (table
+    (table_pair
+      key:
+        (string
+          (string_content) @_command
+          (#eq? @_command "command"))
+      value:
+        (string
+          (string_content) @injection.content
+          (#set! injection.language "vim")))))
+
+(list
+  .
+  (multi_symbol) @_user_cmd
+  (#eq? @_user_cmd "vim.api.nvim_create_user_command")
+  .
+  (_)
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "vim")))
+
+(list
+  .
+  (multi_symbol) @_user_cmd
+  (#eq? @_user_cmd "vim.api.nvim_buf_create_user_command")
+  .
+  (_)
+  .
+  (_)
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "vim")))
+
+(list
+  .
+  (multi_symbol) @_map
+  (#any-of? @_map "vim.api.nvim_set_keymap" "vim.keymap.set")
+  .
+  (_)
+  .
+  (_)
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "vim")))
+
+(list
+  .
+  (multi_symbol) @_map
+  (#eq? @_map "vim.api.nvim_buf_set_keymap")
+  .
+  (_)
+  .
+  (_)
+  .
+  (_)
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "vim")))
+
+; highlight string as query if starts with `; query`
+(string
+  (string_content) @injection.content
+  (#lua-match? @injection.content "^%s*;+%s?query")
+  (#set! injection.language "query"))
+
+; ──────────────────────────────────────────────────────────────────────
+; (string.match "123" "%d+")
+(list
+  .
+  (multi_symbol
+    member: (symbol_fragment) @_func
+    .
+    (#any-of? @_func "find" "match" "gmatch" "gsub"))
+  .
+  (_)
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "luap")
+    (#set! injection.include-children)))
+
+; (my-string:match "%d+")
+(list
+  .
+  (multi_symbol_method
+    method: (symbol_fragment) @_method
+    (#any-of? @_method "find" "match" "gmatch" "gsub"))
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "luap")
+    (#set! injection.include-children)))
+
+; (string.format "pi = %.2f" 3.14159)
+(list
+  .
+  (multi_symbol) @_func
+  (#eq? @_func "string.format")
+  .
+  (string
+    (string_content) @injection.content
+    (#set! injection.language "printf")))
diff --git a/queries/fennel/locals.scm b/queries/fennel/locals.scm
index bf3701a50..05c9582de 100644
--- a/queries/fennel/locals.scm
+++ b/queries/fennel/locals.scm
@@ -1,32 +1,26 @@
-[
-  (program)
-  (fn)
-  (lambda)
-  (let)
-  (each)
-  (for)
-  (match)
-] @local.scope
+; TODO: Add tests
+; TODO: Improve queries
+(program) @local.scope
 
 ((list
   .
-  (symbol) @_special) @local.scope
-  (#any-of? @_special "while" "if" "when" "do" "collect" "icollect" "accumulate"))
-
-(fn
-  name: (symbol) @local.definition.function
-  (#set! definition.function.scope "parent"))
-
-(lambda
-  name: (symbol) @local.definition.function
-  (#set! definition.function.scope "parent"))
-
-; TODO: use @local.definition.parameter for parameters
-(binding
-  (symbol) @local.definition.var)
-
-(for_clause
-  .
-  (symbol) @local.definition.var)
+  (symbol) @_call) @local.scope
+  (#any-of? @_call "let" "fn" "lambda" "λ" "while" "each" "for" "if" "when" "do" "collect" "icollect" "accumulate" "case" "match"))
 
 (symbol) @local.reference
+
+(list
+  .
+  (symbol) @_fn
+  (#any-of? @_fn "fn" "lambda" "λ")
+  .
+  [
+    (symbol) @local.definition.function
+    (multi_symbol
+      member: (symbol_fragment) @local.definition.function .)
+  ]
+  (#set! definition.function.scope "parent")
+  .
+  (sequence
+    (symbol)* @local.definition.parameter
+    (#not-contains? @local.definition.parameter "&")))

From 977d94975d352ae4a37ac99605876cbe41707c81 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 13:44:13 +0000
Subject: [PATCH 1200/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e3987d1c..1b27de703 100644
--- a/README.md
+++ b/README.md
@@ -227,7 +227,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [erlang](https://github.com/WhatsApp/tree-sitter-erlang) (maintained by @filmor)
 - [x] [facility](https://github.com/FacilityApi/tree-sitter-facility) (maintained by @bryankenote)
 - [x] [faust](https://github.com/khiner/tree-sitter-faust) (maintained by @khiner)
-- [x] [fennel](https://github.com/travonted/tree-sitter-fennel) (maintained by @TravonteD)
+- [x] [fennel](https://github.com/alexmozaidze/tree-sitter-fennel) (maintained by @alexmozaidze)
 - [x] [firrtl](https://github.com/amaanq/tree-sitter-firrtl) (maintained by @amaanq)
 - [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
 - [x] [foam](https://github.com/FoamScience/tree-sitter-foam) (experimental, maintained by @FoamScience)

From ca46eb3ac96cd96e963895004589f0c9b2a44491 Mon Sep 17 00:00:00 2001
From: gbprod <contact@gb-prod.fr>
Date: Wed, 21 Feb 2024 14:59:31 +0100
Subject: [PATCH 1201/2704] fix(highlights): highlight @type in phpdoc

Currently, phpdoc types that are not union type are not highlighted, this change
allows to apply `@type` group to all types.
---
 queries/phpdoc/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/phpdoc/highlights.scm b/queries/phpdoc/highlights.scm
index 418853813..3ebe4a66e 100644
--- a/queries/phpdoc/highlights.scm
+++ b/queries/phpdoc/highlights.scm
@@ -23,6 +23,13 @@
 (parameter
   (variable_name) @variable.parameter)
 
+[
+  (array_type)
+  (primitive_type)
+  (named_type)
+  (optional_type)
+] @type
+
 (union_type
   [
     (array_type)

From ebf0532d422cef34be5207e02929764885c47a05 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 21 Feb 2024 21:33:01 +0200
Subject: [PATCH 1202/2704] feat(chatito): update queries

---
 lockfile.json                  | 2 +-
 queries/chatito/highlights.scm | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f6e2e5b5b..171ec1c29 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -60,7 +60,7 @@
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
-    "revision": "308b5913fd2ae6b527183ba1b3a490f90da32012"
+    "revision": "7162ec1e8e9154fb334e84aa7637a4af051dfe42"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
diff --git a/queries/chatito/highlights.scm b/queries/chatito/highlights.scm
index be17f3457..492718320 100644
--- a/queries/chatito/highlights.scm
+++ b/queries/chatito/highlights.scm
@@ -9,10 +9,9 @@
   ")"
 ] @punctuation.bracket
 
-[
-  ":"
-  ","
-] @punctuation.delimiter
+"," @punctuation.delimiter
+
+(eq) @operator
 
 ([
   "\""

From 1398b1ba4619cef240abd496b500b95819c8c496 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 06:35:40 +0000
Subject: [PATCH 1203/2704] Update parsers: cmake, dtd, faust, fennel,
 gdscript, html, lua, php, php_only, rust, sourcepawn, typst, vim, wing, xml

---
 lockfile.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 171ec1c29..8e909e250 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -66,7 +66,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "73ab4b8e9522f014a67f87f585e820d36fa47408"
+    "revision": "3175c3f5fdccfec8d3e506f6d95b485cbd6f93fb"
   },
   "comment": {
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "851ff145b12313382f49f56a3f9a399ba2bf0232"
+    "revision": "d747bcff8af333fa35b93620f2689406ec5b55b2"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -159,10 +159,10 @@
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
   },
   "faust": {
-    "revision": "9e514af33bfe061d0ccf1999dbcc93fca91f133c"
+    "revision": "4a8ada6eb1ac2ade8f310e3822b86301f439e463"
   },
   "fennel": {
-    "revision": "389e9ec34d9a56ecf3dd74232de8675b3c4b5487"
+    "revision": "9265a7d635d2f82a10738b9ad65ba8dd8bd4a84a"
   },
   "firrtl": {
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
@@ -189,7 +189,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gdscript": {
-    "revision": "73fd7c540a57da01c7e099ca5d5fc434f5273bcd"
+    "revision": "b5dea4d852db65f0872d849c24533eb121e03c76"
   },
   "git_config": {
     "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
@@ -282,7 +282,7 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "5760f521fac79263de4ca71a590ef516594c9f37"
+    "revision": "b5d9758e22b4d3d25704b72526670759a9e4d195"
   },
   "htmldjango": {
     "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
@@ -366,7 +366,7 @@
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
   },
   "lua": {
-    "revision": "9668709211b2e683f27f414454a8b51bf0a6bda1"
+    "revision": "04c9579dcb917255b2e5f8199df4ae7f587d472f"
   },
   "luadoc": {
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
@@ -465,10 +465,10 @@
     "revision": "a30394f61b607f48c841c6e085d5219f23872816"
   },
   "php": {
-    "revision": "caf4d67d55386d3e4f85d29450b8d9cacbb02d19"
+    "revision": "710754c879435178b7643e525c84cd53f32c510c"
   },
   "php_only": {
-    "revision": "caf4d67d55386d3e4f85d29450b8d9cacbb02d19"
+    "revision": "710754c879435178b7643e525c84cd53f32c510c"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -579,7 +579,7 @@
     "revision": "22a0bb2678755a3714e194609862ea7f4516e807"
   },
   "rust": {
-    "revision": "a70daac064145c84e9d51767c2575bb68d51df58"
+    "revision": "85a21c96d31b2a5c4369e5836a7f4ab059268fea"
   },
   "scala": {
     "revision": "e02f003d78dc269fef287b9b7b9963dc1f26bd7e"
@@ -618,7 +618,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "bc1f7348b42b8eeec5c3053865d8d36217504d13"
+    "revision": "cea67796eb919322785172c1bc7b11dc6c2d52b7"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -717,7 +717,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "3a6c81bb56082604f5e63834cb2f946beeda1e76"
+    "revision": "c757be0898e2a58f4e9761aa164dc413bf5beaf8"
   },
   "udev": {
     "revision": "15d89be59a3802dcbe2e97e0f9d32b52f3aeda3f"
@@ -747,7 +747,7 @@
     "revision": "9534865e614c95eb9418e5e73f061c32fa4d9540"
   },
   "vim": {
-    "revision": "32c76f150347c1cd044e90b8e2bc73c00677fa55"
+    "revision": "bc1364d922952138957a62105171ed68e73fbb6c"
   },
   "vimdoc": {
     "revision": "40fcd50a2c7b5a3ef98294795116773b24fb61ab"
@@ -762,13 +762,13 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "e621578ce680afce92090392367d0eda9d6c0c7f"
+    "revision": "e8a5f3ade226509f422dbd4c5900288df3729a62"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"
   },
   "xml": {
-    "revision": "851ff145b12313382f49f56a3f9a399ba2bf0232"
+    "revision": "d747bcff8af333fa35b93620f2689406ec5b55b2"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 19bf991be2403c10fa379fa0fb11b7de2560ac31 Mon Sep 17 00:00:00 2001
From: JD Rudie <j.rudie@draftkings.com>
Date: Wed, 21 Feb 2024 18:17:32 -0500
Subject: [PATCH 1204/2704] feat(c-sharp): add enum member declaration
 highlight query

---
 queries/c_sharp/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 73205c31d..fdc8b60ba 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -141,6 +141,9 @@
 (enum_declaration
   name: (identifier) @type)
 
+(enum_member_declaration
+  name: (identifier) @variable.member)
+
 (constructor_declaration
   name: (identifier) @constructor)
 

From a8d2b54e28b25cbea1a5fae312165f56674168de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A2=E9=B9=8F?= <chaopeng@chaopeng.me>
Date: Thu, 22 Feb 2024 21:57:07 -0500
Subject: [PATCH 1205/2704] feat: add fidl parser

---
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  9 +++++
 queries/fidl/folds.scm          |  6 ++++
 queries/fidl/highlights.scm     | 64 +++++++++++++++++++++++++++++++++
 queries/fidl/injections.scm     |  2 ++
 5 files changed, 84 insertions(+)
 create mode 100644 queries/fidl/folds.scm
 create mode 100644 queries/fidl/highlights.scm
 create mode 100644 queries/fidl/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 8e909e250..5a2d278b5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -164,6 +164,9 @@
   "fennel": {
     "revision": "9265a7d635d2f82a10738b9ad65ba8dd8bd4a84a"
   },
+  "fidl": {
+    "revision": "0e1180bb126f280711a62f2a21e3609923fd8b0c"
+  },
   "firrtl": {
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 324529cad..bd647d595 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -535,6 +535,15 @@ list.fennel = {
   maintainers = { "@alexmozaidze" },
 }
 
+list.fidl = {
+  install_info = {
+    url = "https://github.com/google/tree-sitter-fidl",
+    files = { "src/parser.c" },
+    requires_generate_from_grammar = true,
+  },
+  maintainers = { "@chaopeng" },
+}
+
 list.firrtl = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-firrtl",
diff --git a/queries/fidl/folds.scm b/queries/fidl/folds.scm
new file mode 100644
index 000000000..f524c455b
--- /dev/null
+++ b/queries/fidl/folds.scm
@@ -0,0 +1,6 @@
+[
+  (layout_declaration)
+  (protocol_declaration)
+  (resource_declaration)
+  (service_declaration)
+] @fold
diff --git a/queries/fidl/highlights.scm b/queries/fidl/highlights.scm
new file mode 100644
index 000000000..ce7727010
--- /dev/null
+++ b/queries/fidl/highlights.scm
@@ -0,0 +1,64 @@
+[
+  "ajar"
+  "alias"
+  "as"
+  "bits"
+  "closed"
+  "compose"
+  "const"
+  "enum"
+  "error"
+  "flexible"
+  "library"
+  "open"
+  ; "optional" we did not specify a node for optional yet
+  "overlay"
+  "protocol"
+  "reserved"
+  "resource"
+  "service"
+  "strict"
+  "struct"
+  "table"
+  "type"
+  "union"
+  "using"
+] @keyword
+
+(primitives_type) @type.builtin
+
+(builtin_complex_type) @type.builtin
+
+(const_declaration
+  (identifier) @constant)
+
+[
+  "="
+  "|"
+  "&"
+  "->"
+] @operator
+
+(attribute
+  "@" @attribute
+  (identifier) @attribute)
+
+(string_literal) @string
+
+(numeric_literal) @number
+
+[
+  (true)
+  (false)
+] @boolean
+
+(comment) @comment
+
+[
+  "("
+  ")"
+  "<"
+  ">"
+  "{"
+  "}"
+] @punctuation.bracket
diff --git a/queries/fidl/injections.scm b/queries/fidl/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/fidl/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 9ecf980277d70f5a540b4e8deaace708432d54c0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 02:57:19 +0000
Subject: [PATCH 1206/2704] Update README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1b27de703..6823484b4 100644
--- a/README.md
+++ b/README.md
@@ -228,6 +228,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [facility](https://github.com/FacilityApi/tree-sitter-facility) (maintained by @bryankenote)
 - [x] [faust](https://github.com/khiner/tree-sitter-faust) (maintained by @khiner)
 - [x] [fennel](https://github.com/alexmozaidze/tree-sitter-fennel) (maintained by @alexmozaidze)
+- [x] [fidl](https://github.com/google/tree-sitter-fidl) (maintained by @chaopeng)
 - [x] [firrtl](https://github.com/amaanq/tree-sitter-firrtl) (maintained by @amaanq)
 - [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
 - [x] [foam](https://github.com/FoamScience/tree-sitter-foam) (experimental, maintained by @FoamScience)

From a29058fe8b4ba291a63422073e5bd3d8920942ac Mon Sep 17 00:00:00 2001
From: Karl Hiner <karl.hiner@gmail.com>
Date: Fri, 23 Feb 2024 01:41:28 -0500
Subject: [PATCH 1207/2704] feat(faust): better highlighting of function calls,
 built-in variables, and member access

---
 lockfile.json                |  2 +-
 queries/faust/highlights.scm | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5a2d278b5..a16ecc14f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -159,7 +159,7 @@
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
   },
   "faust": {
-    "revision": "4a8ada6eb1ac2ade8f310e3822b86301f439e463"
+    "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
     "revision": "9265a7d635d2f82a10738b9ad65ba8dd8bd4a84a"
diff --git a/queries/faust/highlights.scm b/queries/faust/highlights.scm
index 012562971..df2c3e70a 100644
--- a/queries/faust/highlights.scm
+++ b/queries/faust/highlights.scm
@@ -1,11 +1,17 @@
 ; Identifiers
 (identifier) @variable
 
-(process) @variable.builtin
+[
+  "process"
+  "effect"
+] @variable.builtin
 
 (parameters
   (identifier)) @variable.parameter
 
+(access
+  definition: (identifier) @variable.member)
+
 (global_metadata
   key: (identifier) @variable.member)
 
@@ -49,16 +55,12 @@
 
 (function_names) @function
 
-[
-  (lambda)
-  (prefix)
-  (prim1)
-  (prim2)
-  (prim3)
-  (prim4)
-  (prim5)
-  (function_call)
-] @function.call
+(function_call
+  (identifier) @function.call)
+
+(function_call
+  (access
+    definition: (identifier) @function.call))
 
 [
   "exp"

From 31641d72a4c33536e9d5fc8f829d2ba84211af8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=8D=E7=94=9F=E8=8A=B1?= <hoangtun0810@gmail.com>
Date: Fri, 23 Feb 2024 17:42:01 +0900
Subject: [PATCH 1208/2704] feat(format-scripts): linewrap predicates

"format-ignore".kick()
---
 queries/arduino/highlights.scm      |  93 ++---
 queries/awk/highlights.scm          |   8 +-
 queries/bash/highlights.scm         |  29 +-
 queries/bass/highlights.scm         |  17 +-
 queries/bitbake/highlights.scm      |  48 +--
 queries/clojure/highlights.scm      | 239 +++++-------
 queries/cmake/highlights.scm        |  37 +-
 queries/commonlisp/highlights.scm   | 134 ++++++-
 queries/dart/highlights.scm         |   4 +-
 queries/ecma/highlights.scm         |  11 +-
 queries/eds/highlights.scm          |   3 +-
 queries/elixir/highlights.scm       |   8 +-
 queries/elvish/highlights.scm       |   4 +-
 queries/fennel/highlights.scm       |  76 +---
 queries/fennel/locals.scm           |   4 +-
 queries/fish/highlights.scm         |   6 +-
 queries/gdscript/highlights.scm     | 282 +++++++-------
 queries/gnuplot/highlights.scm      |  25 +-
 queries/go/highlights.scm           |   9 +-
 queries/go/injections.scm           |   4 +-
 queries/haskell/highlights.scm      |  11 +-
 queries/ispc/highlights.scm         | 159 ++------
 queries/janet_simple/highlights.scm | 306 +++++----------
 queries/jq/highlights.scm           | 211 +----------
 queries/julia/highlights.scm        | 247 ++----------
 queries/kotlin/highlights.scm       |  14 +-
 queries/linkerscript/highlights.scm |   5 +-
 queries/lua/highlights.scm          |  14 +-
 queries/lua/injections.scm          |   3 +-
 queries/luau/highlights.scm         |  10 +-
 queries/make/highlights.scm         |  10 +-
 queries/ninja/highlights.scm        |   4 +-
 queries/nix/highlights.scm          |  30 +-
 queries/ocaml/highlights.scm        |   4 +-
 queries/odin/highlights.scm         |   8 +-
 queries/perl/highlights.scm         |  14 +-
 queries/php_only/injections.scm     |   4 +-
 queries/pug/highlights.scm          |  20 +-
 queries/puppet/highlights.scm       |   4 +-
 queries/python/highlights.scm       |  40 +-
 queries/query/indents.scm           |   2 +-
 queries/racket/highlights.scm       | 566 +++++++++++++++++++++++++++-
 queries/re2c/injections.scm         |   3 +-
 queries/rst/highlights.scm          |  36 +-
 queries/rst/injections.scm          |  13 +-
 queries/ruby/highlights.scm         |   3 +-
 queries/scheme/highlights.scm       |  90 ++---
 queries/squirrel/highlights.scm     |  70 ++--
 queries/starlark/highlights.scm     |  49 ++-
 queries/systemtap/highlights.scm    |   4 +-
 queries/tcl/highlights.scm          |  14 +-
 queries/tiger/highlights.scm        |   4 +-
 queries/usd/highlights.scm          |  58 +--
 queries/v/highlights.scm            |  29 +-
 queries/vim/injections.scm          |   4 +-
 queries/yuck/highlights.scm         |  12 +-
 scripts/format-queries.lua          |  43 ++-
 57 files changed, 1622 insertions(+), 1537 deletions(-)

diff --git a/queries/arduino/highlights.scm b/queries/arduino/highlights.scm
index 9620f1f73..d905c5eb3 100644
--- a/queries/arduino/highlights.scm
+++ b/queries/arduino/highlights.scm
@@ -1,74 +1,31 @@
 ; inherits: cpp
 ((identifier) @function.builtin
-  ; format-ignore
   (#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"))
+    ; 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"))
diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
index 90c9f3437..305a20828 100644
--- a/queries/awk/highlights.scm
+++ b/queries/awk/highlights.scm
@@ -9,11 +9,15 @@
 
 ; https://www.gnu.org/software/gawk/manual/html_node/Auto_002dset.html
 ((identifier) @constant.builtin
-  (#any-of? @constant.builtin "ARGC" "ARGV" "ARGIND" "ENVIRON" "ERRNO" "FILENAME" "FNR" "NF" "FUNCTAB" "NR" "PROCINFO" "RLENGTH" "RSTART" "RT" "SYMTAB"))
+  (#any-of? @constant.builtin
+    "ARGC" "ARGV" "ARGIND" "ENVIRON" "ERRNO" "FILENAME" "FNR" "NF" "FUNCTAB" "NR" "PROCINFO"
+    "RLENGTH" "RSTART" "RT" "SYMTAB"))
 
 ; https://www.gnu.org/software/gawk/manual/html_node/User_002dmodified.html
 ((identifier) @variable.builtin
-  (#any-of? @variable.builtin "BINMODE" "CONVFMT" "FIELDWIDTHS" "FPAT" "FS" "IGNORECASE" "LINT" "OFMT" "OFS" "ORS" "PREC" "ROUNDMODE" "RS" "SUBSEP" "TEXTDOMAIN"))
+  (#any-of? @variable.builtin
+    "BINMODE" "CONVFMT" "FIELDWIDTHS" "FPAT" "FS" "IGNORECASE" "LINT" "OFMT" "OFS" "ORS" "PREC"
+    "ROUNDMODE" "RS" "SUBSEP" "TEXTDOMAIN"))
 
 (number) @number
 
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 7c222f5c6..86f9a6734 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -106,7 +106,15 @@
 
 ; 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]))?)$"))
+  (#any-of? @constant.builtin
+    "SIGHUP" "SIGINT" "SIGQUIT" "SIGILL" "SIGTRAP" "SIGABRT" "SIGBUS" "SIGFPE" "SIGKILL" "SIGUSR1"
+    "SIGSEGV" "SIGUSR2" "SIGPIPE" "SIGALRM" "SIGTERM" "SIGSTKFLT" "SIGCHLD" "SIGCONT" "SIGSTOP"
+    "SIGTSTP" "SIGTTIN" "SIGTTOU" "SIGURG" "SIGXCPU" "SIGXFSZ" "SIGVTALRM" "SIGPROF" "SIGWINCH"
+    "SIGIO" "SIGPWR" "SIGSYS" "SIGRTMIN" "SIGRTMIN+1" "SIGRTMIN+2" "SIGRTMIN+3" "SIGRTMIN+4"
+    "SIGRTMIN+5" "SIGRTMIN+6" "SIGRTMIN+7" "SIGRTMIN+8" "SIGRTMIN+9" "SIGRTMIN+10" "SIGRTMIN+11"
+    "SIGRTMIN+12" "SIGRTMIN+13" "SIGRTMIN+14" "SIGRTMIN+15" "SIGRTMAX-14" "SIGRTMAX-13"
+    "SIGRTMAX-12" "SIGRTMAX-11" "SIGRTMAX-10" "SIGRTMAX-9" "SIGRTMAX-8" "SIGRTMAX-7" "SIGRTMAX-6"
+    "SIGRTMAX-5" "SIGRTMAX-4" "SIGRTMAX-3" "SIGRTMAX-2" "SIGRTMAX-1" "SIGRTMAX"))
 
 ((word) @boolean
   (#any-of? @boolean "true" "false"))
@@ -152,19 +160,14 @@
 (command_name
   (word) @function.call)
 
-((command_name
-  (word) @function.builtin)
-  ; format-ignore
+(command_name
+  (word) @function.builtin
   (#any-of? @function.builtin
-    "alias" "bg" "bind" "break" "builtin" "caller" "cd"
-    "command" "compgen" "complete" "compopt" "continue"
-    "coproc" "dirs" "disown" "echo" "enable" "eval"
-    "exec" "exit" "fc" "fg" "getopts" "hash" "help"
-    "history" "jobs" "kill" "let" "logout" "mapfile"
-    "popd" "printf" "pushd" "pwd" "read" "readarray"
-    "return" "set" "shift" "shopt" "source" "suspend"
-    "test" "time" "times" "trap" "type" "typeset"
-    "ulimit" "umask" "unalias" "wait"))
+    "alias" "bg" "bind" "break" "builtin" "caller" "cd" "command" "compgen" "complete" "compopt"
+    "continue" "coproc" "dirs" "disown" "echo" "enable" "eval" "exec" "exit" "fc" "fg" "getopts"
+    "hash" "help" "history" "jobs" "kill" "let" "logout" "mapfile" "popd" "printf" "pushd" "pwd"
+    "read" "readarray" "return" "set" "shift" "shopt" "source" "suspend" "test" "time" "times"
+    "trap" "type" "typeset" "ulimit" "umask" "unalias" "wait"))
 
 (command
   argument:
diff --git a/queries/bass/highlights.scm b/queries/bass/highlights.scm
index 8a92a59e9..f84993af1 100644
--- a/queries/bass/highlights.scm
+++ b/queries/bass/highlights.scm
@@ -55,10 +55,23 @@
   (#any-of? @keyword.function "def" "defop" "defn" "fn"))
 
 ((symbol) @function.builtin
-  (#any-of? @function.builtin "dump" "mkfs" "json" "log" "error" "now" "cons" "wrap" "unwrap" "eval" "make-scope" "bind" "meta" "with-meta" "null?" "ignore?" "boolean?" "number?" "string?" "symbol?" "scope?" "sink?" "source?" "list?" "pair?" "applicative?" "operative?" "combiner?" "path?" "empty?" "thunk?" "+" "*" "quot" "-" "max" "min" "=" ">" ">=" "<" "<=" "list->source" "across" "emit" "next" "reduce-kv" "assoc" "symbol->string" "string->symbol" "str" "substring" "trim" "scope->list" "string->fs-path" "string->cmd-path" "string->dir" "subpath" "path-name" "path-stem" "with-image" "with-dir" "with-args" "with-cmd" "with-stdin" "with-env" "with-insecure" "with-label" "with-port" "with-tls" "with-mount" "thunk-cmd" "thunk-args" "resolve" "start" "addr" "wait" "read" "cache-dir" "binds?" "recall-memo" "store-memo" "mask" "list" "list*" "first" "rest" "length" "second" "third" "map" "map-pairs" "foldr" "foldl" "append" "filter" "conj" "list->scope" "merge" "apply" "id" "always" "vals" "keys" "memo" "succeeds?" "run" "last" "take" "take-all" "insecure!" "from" "cd" "wrap-cmd" "mkfile" "path-base" "not"))
+  (#any-of? @function.builtin
+    "dump" "mkfs" "json" "log" "error" "now" "cons" "wrap" "unwrap" "eval" "make-scope" "bind"
+    "meta" "with-meta" "null?" "ignore?" "boolean?" "number?" "string?" "symbol?" "scope?" "sink?"
+    "source?" "list?" "pair?" "applicative?" "operative?" "combiner?" "path?" "empty?" "thunk?" "+"
+    "*" "quot" "-" "max" "min" "=" ">" ">=" "<" "<=" "list->source" "across" "emit" "next"
+    "reduce-kv" "assoc" "symbol->string" "string->symbol" "str" "substring" "trim" "scope->list"
+    "string->fs-path" "string->cmd-path" "string->dir" "subpath" "path-name" "path-stem"
+    "with-image" "with-dir" "with-args" "with-cmd" "with-stdin" "with-env" "with-insecure"
+    "with-label" "with-port" "with-tls" "with-mount" "thunk-cmd" "thunk-args" "resolve" "start"
+    "addr" "wait" "read" "cache-dir" "binds?" "recall-memo" "store-memo" "mask" "list" "list*"
+    "first" "rest" "length" "second" "third" "map" "map-pairs" "foldr" "foldl" "append" "filter"
+    "conj" "list->scope" "merge" "apply" "id" "always" "vals" "keys" "memo" "succeeds?" "run" "last"
+    "take" "take-all" "insecure!" "from" "cd" "wrap-cmd" "mkfile" "path-base" "not"))
 
 ((symbol) @function.macro
-  (#any-of? @function.macro "op" "current-scope" "quote" "let" "provide" "module" "or" "and" "curryfn" "for" "$" "linux"))
+  (#any-of? @function.macro
+    "op" "current-scope" "quote" "let" "provide" "module" "or" "and" "curryfn" "for" "$" "linux"))
 
 ; Conditionals
 ((symbol) @keyword.conditional
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index 6661db838..67acd757e 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -125,11 +125,9 @@
   (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((python_identifier) @constant.builtin
-  ; format-ignore
-  (#any-of? @constant.builtin 
+  (#any-of? @constant.builtin
     ; https://docs.python.org/3/library/constants.html
-    "NotImplemented" "Ellipsis" 
-    "quit" "exit" "copyright" "credits" "license"))
+    "NotImplemented" "Ellipsis" "quit" "exit" "copyright" "credits" "license"))
 
 ((assignment
   left: (python_identifier) @type.definition
@@ -172,7 +170,14 @@
 
 ((call
   function: (python_identifier) @function.builtin)
-  (#any-of? @function.builtin "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+  (#any-of? @function.builtin
+    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr"
+    "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec"
+    "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id"
+    "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview"
+    "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed"
+    "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type"
+    "vars" "zip" "__import__"))
 
 (python_function_definition
   name: (python_identifier) @function)
@@ -385,22 +390,23 @@
   (identifier)
   (python_identifier)
 ] @type.builtin
-  ; format-ignore
   (#any-of? @type.builtin
-      ; https://docs.python.org/3/library/exceptions.html
-      "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-      "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
-      "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-      "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-      "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-      "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-      "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-      "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-      "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-      "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-      "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-      ; https://docs.python.org/3/library/stdtypes.html
-      "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-      "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+    ; https://docs.python.org/3/library/exceptions.html
+    "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError"
+    "AttributeError" "EOFError" "FloatingPointError" "GeneratorExit" "ImportError"
+    "ModuleNotFoundError" "IndexError" "KeyError" "KeyboardInterrupt" "MemoryError" "NameError"
+    "NotImplementedError" "OSError" "OverflowError" "RecursionError" "ReferenceError" "RuntimeError"
+    "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError" "SystemError"
+    "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError"
+    "UnicodeDecodeError" "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError"
+    "IOError" "WindowsError" "BlockingIOError" "ChildProcessError" "ConnectionError"
+    "BrokenPipeError" "ConnectionAbortedError" "ConnectionRefusedError" "ConnectionResetError"
+    "FileExistsError" "FileNotFoundError" "InterruptedError" "IsADirectoryError"
+    "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+    "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+    ; https://docs.python.org/3/library/stdtypes.html
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str" "bytes" "bytearray" "memoryview"
+    "set" "frozenset" "dict" "type" "object"))
 
 (comment) @comment @spell
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 26883ebe3..feb3dc62d 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -85,20 +85,14 @@
 
 ; Builtin dynamic variables
 ((sym_lit) @variable.builtin
-  ; format-ignore
   (#any-of? @variable.builtin
-    "*agent*" "*allow-unresolved-vars*" "*assert*"
-    "*clojure-version*" "*command-line-args*"
-    "*compile-files*" "*compile-path*" "*compiler-options*"
-    "*data-readers*" "*default-data-reader-fn*"
-    "*err*" "*file*" "*flush-on-newline*" "*fn-loader*"
-    "*in*" "*math-context*" "*ns*" "*out*"
-    "*print-dup*" "*print-length*" "*print-level*"
-    "*print-meta*" "*print-namespace-maps*" "*print-readably*"
-    "*read-eval*" "*reader-resolver*"
-    "*source-path*" "*suppress-read*"
-    "*unchecked-math*" "*use-context-classloader*"
-    "*verbose-defrecords*" "*warn-on-reflection*"))
+    "*agent*" "*allow-unresolved-vars*" "*assert*" "*clojure-version*" "*command-line-args*"
+    "*compile-files*" "*compile-path*" "*compiler-options*" "*data-readers*"
+    "*default-data-reader-fn*" "*err*" "*file*" "*flush-on-newline*" "*fn-loader*" "*in*"
+    "*math-context*" "*ns*" "*out*" "*print-dup*" "*print-length*" "*print-level*" "*print-meta*"
+    "*print-namespace-maps*" "*print-readably*" "*read-eval*" "*reader-resolver*" "*source-path*"
+    "*suppress-read*" "*unchecked-math*" "*use-context-classloader*" "*verbose-defrecords*"
+    "*warn-on-reflection*"))
 
 ; Builtin repl variables
 ((sym_lit) @variable.builtin
@@ -148,13 +142,17 @@
 
 ; Definition functions
 ((sym_lit) @keyword
-  (#any-of? @keyword "def" "defonce" "defrecord" "defmacro" "definline" "definterface" "defmulti" "defmethod" "defstruct" "defprotocol" "deftype"))
+  (#any-of? @keyword
+    "def" "defonce" "defrecord" "defmacro" "definline" "definterface" "defmulti" "defmethod"
+    "defstruct" "defprotocol" "deftype"))
 
 ((sym_lit) @keyword
   (#eq? @keyword "declare"))
 
 ((sym_name) @keyword.coroutine
-  (#any-of? @keyword.coroutine "alts!" "alts!!" "await" "await-for" "await1" "chan" "close!" "future" "go" "sync" "thread" "timeout" "<!" "<!!" ">!" ">!!"))
+  (#any-of? @keyword.coroutine
+    "alts!" "alts!!" "await" "await-for" "await1" "chan" "close!" "future" "go" "sync" "thread"
+    "timeout" "<!" "<!!" ">!" ">!!"))
 
 ((sym_lit) @keyword.function
   (#any-of? @keyword.function "defn" "defn-" "fn" "fn*"))
@@ -188,18 +186,13 @@
 ; Builtin macros
 ; TODO: Do all these items belong here?
 ((sym_lit) @function.macro
-  ; format-ignore
   (#any-of? @function.macro
-    "." ".." "->" "->>" "amap" "areduce" "as->" "assert"
-    "binding" "bound-fn" "delay" "do" "dosync"
-    "doto" "extend-protocol" "extend-type"
-    "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->>"
-    "time" "unquote" "unquote-splicing" "var" "vswap!"
-    "with-bindings" "with-in-str" "with-loading-context" "with-local-vars"
-    "with-open" "with-out-str" "with-precision" "with-redefs"))
+    "." ".." "->" "->>" "amap" "areduce" "as->" "assert" "binding" "bound-fn" "delay" "do" "dosync"
+    "doto" "extend-protocol" "extend-type" "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->>" "time" "unquote" "unquote-splicing" "var"
+    "vswap!" "with-bindings" "with-in-str" "with-loading-context" "with-local-vars" "with-open"
+    "with-out-str" "with-precision" "with-redefs"))
 
 ; All builtin functions
 ; (->> (ns-publics *ns*)
@@ -208,128 +201,82 @@
 ;      clojure.pprint/pprint))
 ; ...and then lots of manual filtering...
 ((sym_lit) @function.builtin
-  ; format-ignore
   (#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" "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"
-    ;; earlier
-    "drop" "drop-last" "drop-while"
-    "double?" "doubles"
-    "ex-data" "ex-info"
-    ;; 1.10
+    "->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" "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"
+    ; earlier
+    "drop" "drop-last" "drop-while" "double?" "doubles" "ex-data" "ex-info"
+    ; 1.10
     "ex-cause" "ex-message"
-    ;; 1.11
-    "NaN?" "abs" "infinite?" "iteration" "random-uuid"
-    "parse-boolean" "parse-double" "parse-long" "parse-uuid"
-    "seq-to-map-for-destructuring" "update-keys" "update-vals"
-    ;; 1.12
+    ; 1.11
+    "NaN?" "abs" "infinite?" "iteration" "random-uuid" "parse-boolean" "parse-double" "parse-long"
+    "parse-uuid" "seq-to-map-for-destructuring" "update-keys" "update-vals"
+    ; 1.12
     "partitionv" "partitionv-all" "splitv-at"))
 
 ; >> Context based highlighting
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 5a3875908..de9c24094 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -102,35 +102,26 @@
   (if)
   (argument_list
     (argument) @keyword.operator)
-  ; format-ignore
-  (#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"
-  ))
+  (#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"))
 
 (elseif_command
   (elseif)
   (argument_list
     (argument) @keyword.operator)
-  ; format-ignore
-  (#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"
-  ))
+  (#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)$"))
+  (#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
@@ -179,7 +170,9 @@
     (argument) @constant
     .
     (argument) @variable
-    (#any-of? @constant "APPEND" "FILTER" "INSERT" "POP_BACK" "POP_FRONT" "PREPEND" "REMOVE_ITEM" "REMOVE_AT" "REMOVE_DUPLICATES" "REVERSE" "SORT")))
+    (#any-of? @constant
+      "APPEND" "FILTER" "INSERT" "POP_BACK" "POP_FRONT" "PREPEND" "REMOVE_ITEM" "REMOVE_AT"
+      "REMOVE_DUPLICATES" "REVERSE" "SORT")))
 
 (normal_command
   (identifier) @_function
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 567dbc68e..0f3524e99 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -154,9 +154,21 @@
   .
   (sym_lit) @function.macro
   ; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
-  ; format-ignore
   (#any-of? @function.macro
-    "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda" "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass" "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf" "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream" "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or" "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro" "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace" "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist" "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander" "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string" "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter" "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless" "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block" "time" "restart-case" "prog*" "define-method-combination" "optimize"))
+    "do*" "step" "handler-bind" "decf" "prog1" "destructuring-bind" "defconstant" "do" "lambda"
+    "with-standard-io-syntax" "case" "restart-bind" "ignore-errors" "with-slots" "prog2" "defclass"
+    "define-condition" "print-unreadable-object" "defvar" "when" "with-open-file" "prog" "incf"
+    "declaim" "and" "loop-finish" "multiple-value-bind" "pop" "psetf" "defmacro" "with-open-stream"
+    "define-modify-macro" "defsetf" "formatter" "call-method" "handler-case" "pushnew" "or"
+    "with-hash-table-iterator" "ecase" "cond" "defun" "remf" "ccase" "define-compiler-macro"
+    "dotimes" "multiple-value-list" "assert" "deftype" "with-accessors" "trace"
+    "with-simple-restart" "do-symbols" "nth-value" "define-symbol-macro" "psetq" "rotatef" "dolist"
+    "check-type" "multiple-value-setq" "push" "pprint-pop" "loop" "define-setf-expander"
+    "pprint-exit-if-list-exhausted" "with-condition-restarts" "defstruct" "with-input-from-string"
+    "with-compilation-unit" "defgeneric" "with-output-to-string" "untrace" "defparameter"
+    "ctypecase" "do-external-symbols" "etypecase" "do-all-symbols" "with-package-iterator" "unless"
+    "defmethod" "in-package" "defpackage" "return" "typecase" "shiftf" "setf" "pprint-logical-block"
+    "time" "restart-case" "prog*" "define-method-combination" "optimize"))
 
 ; constant
 ((sym_lit) @constant
@@ -176,9 +188,123 @@
   .
   (sym_lit) @function.builtin
   ; Generated via https://github.com/theHamsta/nvim-treesitter-commonlisp/blob/22fdc9fd6ed594176cc7299cc6f68dd21c94c63b/scripts/generate-symbols.lisp#L1-L21
-  ; format-ignore
   (#any-of? @function.builtin
-    "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*" "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream" "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type" "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if" "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort" "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords" "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp" "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream" "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size" "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max" "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1" "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang" "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar" "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar" "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth" "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p" "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not" "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab" "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance" "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda" "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring" "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p" "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case" "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file" "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect" "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor" "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp" "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf" "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character" "alphanumericp" "find-method" "nintersection" "defclass" "define-condition" "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp" "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash" "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf" "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random" "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not" "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and" "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop" "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<=" "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize" "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read" "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble" "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output" "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr" "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method" "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value" "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type" "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst" "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<" "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator" "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character" "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase" "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension" "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code" "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host" "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second" "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp" "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval" "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or" "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp" "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte" "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep" "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall" "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if" "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete" "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr" "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport" "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth" "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value" "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn" "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<" "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort" "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring" "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim" "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-" "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length" "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*" "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion" "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output" "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array" "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet" "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if" "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod" "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe" "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>=" "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance" "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits" "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar" "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar" "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length" "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string" "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase" "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class" "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search" "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp" "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator" "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole" "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member" "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position" "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan" "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference" "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate" "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand" "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of" "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find" "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr" "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern" "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase" "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size" "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length" "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh" "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand" "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line" "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream" "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize" "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly" "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast")
+    "apropos-list" "subst" "substitute" "pprint-linear" "file-namestring" "write-char" "do*"
+    "slot-exists-p" "file-author" "macro-function" "rassoc" "make-echo-stream"
+    "arithmetic-error-operation" "position-if-not" "list" "cdadr" "lisp-implementation-type"
+    "vector-push" "let" "length" "string-upcase" "adjoin" "digit-char" "step" "member-if"
+    "handler-bind" "lognot" "apply" "gcd" "slot-unbound" "stringp" "values-list" "stable-sort"
+    "decode-float" "make-list" "rplaca" "isqrt" "export" "synonym-stream-symbol" "function-keywords"
+    "replace" "tanh" "maphash" "code-char" "decf" "array-displacement" "string-not-lessp"
+    "slot-value" "remove-if" "cell-error-name" "vectorp" "cdddar" "two-way-stream-output-stream"
+    "parse-integer" "get-internal-real-time" "fourth" "make-string" "slot-missing" "byte-size"
+    "string-trim" "nstring-downcase" "cdaddr" "<" "labels" "interactive-stream-p" "fifth" "max"
+    "logxor" "pathname-name" "function" "realp" "eql" "logand" "short-site-name" "prog1"
+    "user-homedir-pathname" "list-all-packages" "exp" "cadar" "read-char-no-hang"
+    "package-error-package" "stream-external-format" "bit-andc2" "nsubstitute-if" "mapcar"
+    "complement" "load-logical-pathname-translations" "pprint-newline" "oddp" "caaar"
+    "destructuring-bind" "copy-alist" "acos" "go" "bit-nor" "defconstant" "fceiling" "tenth"
+    "nreverse" "=" "nunion" "slot-boundp" "string>" "count-if" "atom" "char=" "random-state-p"
+    "row-major-aref" "bit-andc1" "translate-pathname" "simple-vector-p" "coerce" "substitute-if-not"
+    "zerop" "invalid-method-error" "compile" "realpart" "remove-if-not" "pprint-tab"
+    "hash-table-rehash-threshold" "invoke-restart" "if" "count" "/=" "do" "initialize-instance"
+    "abs" "schar" "simple-condition-format-control" "delete-package" "subst-if" "lambda"
+    "hash-table-count" "array-has-fill-pointer-p" "bit" "with-standard-io-syntax" "parse-namestring"
+    "proclaim" "array-in-bounds-p" "multiple-value-call" "rplacd" "some" "graphic-char-p"
+    "read-from-string" "consp" "cadaar" "acons" "every" "make-pathname" "mask-field" "case"
+    "set-macro-character" "bit-and" "restart-bind" "echo-stream-input-stream" "compile-file"
+    "fill-pointer" "numberp" "acosh" "array-dimensions" "documentation" "minusp" "inspect"
+    "copy-structure" "integer-length" "ensure-generic-function" "char>=" "quote" "lognor"
+    "make-two-way-stream" "ignore-errors" "tailp" "with-slots" "fboundp"
+    "logical-pathname-translations" "equal" "float-sign" "shadow" "sleep" "numerator" "prog2" "getf"
+    "ldb-test" "round" "locally" "echo-stream-output-stream" "log" "get-macro-character"
+    "alphanumericp" "find-method" "nintersection" "defclass" "define-condition"
+    "print-unreadable-object" "defvar" "broadcast-stream-streams" "floatp" "subst-if-not" "integerp"
+    "translate-logical-pathname" "subsetp" "when" "write-string" "with-open-file" "clrhash"
+    "apropos" "intern" "min" "string-greaterp" "import" "nset-difference" "prog" "incf"
+    "both-case-p" "multiple-value-prog1" "characterp" "streamp" "digit-char-p" "random"
+    "string-lessp" "make-string-input-stream" "copy-symbol" "read-sequence" "logcount" "bit-not"
+    "boundp" "encode-universal-time" "third" "declaim" "map" "cons" "set-syntax-from-char" "and"
+    "cis" "symbol-plist" "loop-finish" "standard-char-p" "multiple-value-bind" "asin" "string" "pop"
+    "complex" "fdefinition" "psetf" "type-error-datum" "output-stream-p" "floor" "write-line" "<="
+    "defmacro" "rational" "hash-table-test" "with-open-stream" "read-char" "string-capitalize"
+    "get-properties" "y-or-n-p" "use-package" "remove" "compiler-macro-function" "read"
+    "package-nicknames" "remove-duplicates" "make-load-form-saving-slots" "dribble"
+    "define-modify-macro" "make-dispatch-macro-character" "close" "cosh" "open" "finish-output"
+    "string-downcase" "car" "nstring-capitalize" "software-type" "read-preserving-whitespace" "cadr"
+    "fround" "nsublis" "defsetf" "find-all-symbols" "char>" "no-applicable-method"
+    "compute-restarts" "pathname" "bit-orc2" "write-sequence" "pprint-tabular" "symbol-value"
+    "char-name" "get-decoded-time" "formatter" "bit-vector-p" "intersection" "pathname-type"
+    "clear-input" "call-method" "princ-to-string" "symbolp" "make-load-form" "nsubst"
+    "pprint-dispatch" "handler-case" "method-combination-error" "probe-file" "atan" "string<"
+    "type-error-expected-type" "pushnew" "unread-char" "print" "or" "with-hash-table-iterator"
+    "make-sequence" "ecase" "unwind-protect" "require" "sixth" "get-dispatch-macro-character"
+    "char-not-lessp" "read-byte" "tagbody" "file-error-pathname" "catch" "rationalp" "char-downcase"
+    "char-int" "array-rank" "cond" "last" "make-string-output-stream" "array-dimension"
+    "host-namestring" "input-stream-p" "decode-universal-time" "defun" "eval-when" "char-code"
+    "pathname-directory" "evenp" "subseq" "pprint" "ftruncate" "make-instance" "pathname-host"
+    "logbitp" "remf" "1+" "copy-pprint-dispatch" "char-upcase" "error" "read-line" "second"
+    "make-package" "directory" "special-operator-p" "open-stream-p" "rassoc-if-not" "ccase" "equalp"
+    "substitute-if" "*" "char/=" "cdr" "sqrt" "lcm" "logical-pathname" "eval"
+    "define-compiler-macro" "nsubstitute-if-not" "mapcon" "imagpart" "set-exclusive-or"
+    "simple-condition-format-arguments" "expt" "concatenate" "file-position" "macrolet" "keywordp"
+    "hash-table-rehash-size" "+" "eighth" "use-value" "char-equal" "bit-xor" "format" "byte"
+    "dotimes" "namestring" "char-not-equal" "multiple-value-list" "assert" "append" "notany" "typep"
+    "delete-file" "makunbound" "cdaar" "file-write-date" ">" "cdddr" "write-to-string" "funcall"
+    "member-if-not" "deftype" "readtable-case" "with-accessors" "truename" "constantp" "rassoc-if"
+    "caaadr" "tree-equal" "nset-exclusive-or" "nsubstitute" "make-instances-obsolete"
+    "package-use-list" "invoke-debugger" "provide" "count-if-not" "trace" "logandc1" "nthcdr"
+    "char<=" "functionp" "with-simple-restart" "set-dispatch-macro-character" "logorc2" "unexport"
+    "rest" "unbound-slot-instance" "make-hash-table" "hash-table-p" "reinitialize-instance" "nth"
+    "do-symbols" "nreconc" "macroexpand" "store-value" "float-precision" "remprop" "nth-value"
+    "define-symbol-macro" "update-instance-for-redefined-class" "identity" "progv" "progn"
+    "return-from" "readtablep" "rem" "symbol-name" "psetq" "wild-pathname-p" "char" "list*" "char<"
+    "plusp" "pairlis" "cddar" "pprint-indent" "union" "compiled-function-p" "rotatef" "abort"
+    "machine-type" "concatenated-stream-streams" "string-right-trim" "enough-namestring"
+    "arithmetic-error-operands" "ceiling" "dolist" "delete" "make-condition" "string-left-trim"
+    "integer-decode-float" "check-type" "notevery" "function-lambda-expression" "-"
+    "multiple-value-setq" "name-char" "push" "pprint-pop" "compile-file-pathname" "list-length"
+    "nstring-upcase" "eq" "find-if" "method-qualifiers" "caadr" "cddr" "string=" "let*"
+    "remove-method" "pathname-match-p" "find-package" "truncate" "caaddr" "get-setf-expansion"
+    "loop" "define-setf-expander" "caddr" "package-shadowing-symbols" "force-output"
+    "slot-makunbound" "string-not-greaterp" "cdadar" "cdaadr" "logandc2" "make-array"
+    "merge-pathnames" "sin" "1-" "machine-version" "ffloor" "packagep" "set-pprint-dispatch" "flet"
+    "gensym" "pprint-exit-if-list-exhausted" "cos" "get" "mapl" "delete-if"
+    "with-condition-restarts" "atanh" "copy-list" "fill" "char-not-greaterp" "bit-orc1" "mod"
+    "package-used-by-list" "warn" "add-method" "simple-string-p" "find-restart" "describe"
+    "pathname-version" "peek-char" "yes-or-no-p" "complexp" "aref" "not" "position-if" "string>="
+    "defstruct" "float-radix" "ninth" "caadar" "subtypep" "set" "butlast" "allocate-instance"
+    "with-input-from-string" "assoc" "write" "make-random-state" "bit-eqv" "float-digits"
+    "long-site-name" "with-compilation-unit" "delete-duplicates" "make-symbol" "room" "cdar"
+    "pprint-fill" "defgeneric" "macroexpand-1" "scale-float" "cdaaar"
+    "update-instance-for-different-class" "array-row-major-index" "ed" "file-string-length"
+    "ensure-directories-exist" "copy-readtable" "string<=" "seventh" "with-output-to-string"
+    "signum" "elt" "untrace" "null" "defparameter" "block" "prin1" "revappend" "gentemp" "ctypecase"
+    "ash" "sxhash" "listp" "do-external-symbols" "bit-ior" "etypecase" "sort" "change-class"
+    "find-class" "alpha-char-p" "map-into" "terpri" "do-all-symbols" "ldb" "logorc1" "search"
+    "fmakunbound" "load" "character" "string-not-equal" "pathnamep" "make-broadcast-stream" "arrayp"
+    "mapcan" "cerror" "invoke-restart-interactively" "assoc-if-not" "with-package-iterator"
+    "get-internal-run-time" "read-delimited-list" "unless" "lower-case-p" "restart-name" "/" "boole"
+    "defmethod" "float" "software-version" "vector-pop" "vector-push-extend" "caar" "ldiff" "member"
+    "find-symbol" "reduce" "svref" "describe-object" "logior" "string-equal" "type-of" "position"
+    "cddadr" "pathname-device" "get-output-stream-string" "symbol-package" "tan"
+    "compute-applicable-methods" "cddddr" "nsubst-if-not" "sublis" "set-difference"
+    "two-way-stream-input-stream" "adjustable-array-p" "machine-instance" "signal" "conjugate"
+    "caaaar" "endp" "lisp-implementation-version" "cddaar" "package-name" "adjust-array" "bit-nand"
+    "gethash" "in-package" "symbol-function" "make-concatenated-stream" "defpackage" "class-of"
+    "no-next-method" "logeqv" "deposit-field" "disassemble" "unuse-package" "copy-tree" "find"
+    "asinh" "class-name" "rename-file" "values" "print-not-readable-object" "mismatch" "cadadr"
+    "shadowing-import" "delete-if-not" "maplist" "listen" "return" "stream-element-type" "unintern"
+    "merge" "make-synonym-stream" "prin1-to-string" "nsubst-if" "byte-position" "phase"
+    "muffle-warning" "remhash" "continue" "load-time-value" "hash-table-size"
+    "upgraded-complex-part-type" "char-lessp" "sbit" "upgraded-array-element-type" "file-length"
+    "typecase" "cadddr" "first" "rationalize" "logtest" "find-if-not" "dpb" "mapc" "sinh"
+    "char-greaterp" "shiftf" "denominator" "get-universal-time" "nconc" "setf" "lognand"
+    "rename-package" "pprint-logical-block" "break" "symbol-macrolet" "the" "fresh-line"
+    "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream"
+    "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize"
+    "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly"
+    "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast")
   )
 
 (list_lit
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index c41ff9c27..ba7a8ede7 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -249,7 +249,9 @@
 
 ; 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"))
+  (#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"
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index b969486cc..b645ae385 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -34,7 +34,12 @@
   (#any-of? @variable.builtin "arguments" "module" "console" "window" "document"))
 
 ((identifier) @type.builtin
-  (#any-of? @type.builtin "Object" "Function" "Boolean" "Symbol" "Number" "Math" "Date" "String" "RegExp" "Map" "Set" "WeakMap" "WeakSet" "Promise" "Array" "Int8Array" "Uint8Array" "Uint8ClampedArray" "Int16Array" "Uint16Array" "Int32Array" "Uint32Array" "Float32Array" "Float64Array" "ArrayBuffer" "DataView" "Error" "EvalError" "InternalError" "RangeError" "ReferenceError" "SyntaxError" "TypeError" "URIError"))
+  (#any-of? @type.builtin
+    "Object" "Function" "Boolean" "Symbol" "Number" "Math" "Date" "String" "RegExp" "Map" "Set"
+    "WeakMap" "WeakSet" "Promise" "Array" "Int8Array" "Uint8Array" "Uint8ClampedArray" "Int16Array"
+    "Uint16Array" "Int32Array" "Uint32Array" "Float32Array" "Float64Array" "ArrayBuffer" "DataView"
+    "Error" "EvalError" "InternalError" "RangeError" "ReferenceError" "SyntaxError" "TypeError"
+    "URIError"))
 
 (statement_identifier) @label
 
@@ -119,7 +124,9 @@
   (#eq? @module.builtin "Intl"))
 
 ((identifier) @function.builtin
-  (#any-of? @function.builtin "eval" "isFinite" "isNaN" "parseFloat" "parseInt" "decodeURI" "decodeURIComponent" "encodeURI" "encodeURIComponent" "require"))
+  (#any-of? @function.builtin
+    "eval" "isFinite" "isNaN" "parseFloat" "parseInt" "decodeURI" "decodeURIComponent" "encodeURI"
+    "encodeURIComponent" "require"))
 
 ; Constructor
 ;------------
diff --git a/queries/eds/highlights.scm b/queries/eds/highlights.scm
index 2ce79c048..5fef3ab46 100644
--- a/queries/eds/highlights.scm
+++ b/queries/eds/highlights.scm
@@ -6,7 +6,8 @@
 ] @punctuation.bracket
 
 ((section_name) @variable.builtin
-  (#match? @variable.builtin "\\c^(FileInfo|DeviceInfo|DummyUsage|MandatoryObjects|OptionalObjects)$"))
+  (#match? @variable.builtin
+    "\\c^(FileInfo|DeviceInfo|DummyUsage|MandatoryObjects|OptionalObjects)$"))
 
 ((section_name) @variable.builtin
   (#lua-match? @variable.builtin "^1"))
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 9b4555a6f..43208f40f 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -109,7 +109,9 @@
 (call
   target:
     ((identifier) @keyword.function
-      (#any-of? @keyword.function "def" "defdelegate" "defexception" "defguard" "defguardp" "defimpl" "defmacro" "defmacrop" "defmodule" "defn" "defnp" "defoverridable" "defp" "defprotocol" "defstruct"))
+      (#any-of? @keyword.function
+        "def" "defdelegate" "defexception" "defguard" "defguardp" "defimpl" "defmacro" "defmacrop"
+        "defmodule" "defn" "defnp" "defoverridable" "defp" "defprotocol" "defstruct"))
   (arguments
     [
       (call
@@ -126,7 +128,9 @@
 (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")))
+      (#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
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
index d0a74c226..9836a6c78 100644
--- a/queries/elvish/highlights.scm
+++ b/queries/elvish/highlights.scm
@@ -136,7 +136,9 @@
 
 ((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"))
+  (#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"))
 
 [
   "$"
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index d9f375312..e58b35883 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -55,7 +55,6 @@
   (#lua-match? @variable.parameter "^%$[1-9]$"))
 
 ((symbol) @operator
-  ; format-ignore
   (#any-of? @operator
     ; arithmetic
     "+" "-" "*" "/" "//" "%" "^"
@@ -65,7 +64,6 @@
     "#" "." "?." ".."))
 
 ((symbol) @keyword.operator
-  ; format-ignore
   (#any-of? @keyword.operator
     ; comparison
     "not="
@@ -89,48 +87,17 @@
   (#any-of? @keyword.conditional "if" "when" "match" "case"))
 
 ((symbol) @keyword
-  ; format-ignore
   (#any-of? @keyword
-    "global"
-    "local"
-    "let"
-    "set"
-    "var"
-    "comment"
-    "do"
-    "doc"
-    "eval-compiler"
-    "lua"
-    "macros"
-    "unquote"
-    "quote"
-    "tset"
-    "values"
-    "tail!"))
+    "global" "local" "let" "set" "var" "comment" "do" "doc" "eval-compiler" "lua" "macros" "unquote"
+    "quote" "tset" "values" "tail!"))
 
 ((symbol) @keyword.import
   (#any-of? @keyword.import "require" "require-macros" "import-macros" "include"))
 
 ((symbol) @function.macro
-  ; format-ignore
   (#any-of? @function.macro
-    "collect"
-    "icollect"
-    "fcollect"
-    "accumulate"
-    "faccumulate"
-    "->"
-    "->>"
-    "-?>"
-    "-?>>"
-    "?."
-    "doto"
-    "macro"
-    "macrodebug"
-    "partial"
-    "pick-args"
-    "pick-values"
-    "with-open"))
+    "collect" "icollect" "fcollect" "accumulate" "faccumulate" "->" "->>" "-?>" "-?>>" "?." "doto"
+    "macro" "macrodebug" "partial" "pick-args" "pick-values" "with-open"))
 
 ; TODO: Highlight builtin methods (`table.unpack`, etc) as @function.builtin
 ([
@@ -138,7 +105,8 @@
   (multi_symbol
     base: (symbol_fragment) @module.builtin)
 ]
-  (#any-of? @module.builtin "vim" "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
+  (#any-of? @module.builtin
+    "vim" "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
 
 ([
   (symbol) @variable.builtin
@@ -155,36 +123,10 @@
   (#eq? @constant.builtin "_VERSION"))
 
 ((symbol) @function.builtin
-  ; format-ignore
   (#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"
-    "module"
-    "setfenv"
-    "loadstring"
-    "unpack"))
+    "assert" "collectgarbage" "dofile" "error" "getmetatable" "ipairs" "load" "loadfile" "next"
+    "pairs" "pcall" "print" "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setmetatable"
+    "tonumber" "tostring" "type" "warn" "xpcall" "module" "setfenv" "loadstring" "unpack"))
 
 (table
   (table_pair
diff --git a/queries/fennel/locals.scm b/queries/fennel/locals.scm
index 05c9582de..4aac44c6b 100644
--- a/queries/fennel/locals.scm
+++ b/queries/fennel/locals.scm
@@ -5,7 +5,9 @@
 ((list
   .
   (symbol) @_call) @local.scope
-  (#any-of? @_call "let" "fn" "lambda" "λ" "while" "each" "for" "if" "when" "do" "collect" "icollect" "accumulate" "case" "match"))
+  (#any-of? @_call
+    "let" "fn" "lambda" "λ" "while" "each" "for" "if" "when" "do" "collect" "icollect" "accumulate"
+    "case" "match"))
 
 (symbol) @local.reference
 
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 77dccbf89..506602098 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -116,7 +116,11 @@
   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")
+      (#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")
     ])
 
 ; Functions
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index f9d2b762f..757ffe81e 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -233,166 +233,170 @@
 ((annotation
   "@" @attribute
   (identifier) @attribute)
-  ; format-ignore
   (#any-of? @attribute
     ; @GDScript
-    "export" "export_category" "export_color_no_alpha" "export_dir"
-    "export_enum" "export_exp_easing" "export_file" "export_flags"
-    "export_flags_2d_navigation" "export_flags_2d_physics"
-    "export_flags_2d_render" "export_flags_3d_navigation"
-    "export_flags_3d_physics" "export_flags_3d_render" "export_global_dir"
-    "export_global_file" "export_group" "export_multiline" "export_node_path"
-    "export_placeholder" "export_range" "export_subgroup" "icon" "onready"
-    "rpc" "tool" "warning_ignore"))
+    "export" "export_category" "export_color_no_alpha" "export_dir" "export_enum"
+    "export_exp_easing" "export_file" "export_flags" "export_flags_2d_navigation"
+    "export_flags_2d_physics" "export_flags_2d_render" "export_flags_3d_navigation"
+    "export_flags_3d_physics" "export_flags_3d_render" "export_global_dir" "export_global_file"
+    "export_group" "export_multiline" "export_node_path" "export_placeholder" "export_range"
+    "export_subgroup" "icon" "onready" "rpc" "tool" "warning_ignore"))
 
 ; Builtin Types
 ([
   (identifier)
   (type)
 ] @type.builtin
-  ; format-ignore
   (#any-of? @type.builtin
-   ; from godot-vscode-plugin
-   "Vector2" "Vector2i" "Vector3" "Vector3i"
-   "Color" "Rect2" "Rect2i" "Array" "Basis" "Dictionary"
-   "Plane" "Quat" "RID" "Rect3" "Transform" "Transform2D"
-   "Transform3D" "AABB" "String" "NodePath" "Object"
-   "PoolByteArray" "PoolIntArray" "PoolRealArray"
-   "PoolStringArray" "PoolVector2Array" "PoolVector3Array"
-   "PoolColorArray" "bool" "int" "float" "StringName" "Quaternion"
-   "PackedByteArray" "PackedInt32Array" "PackedInt64Array"
-   "PackedFloat32Array" "PackedFloat64Array" "PackedStringArray"
-   "PackedVector2Array" "PackedVector2iArray" "PackedVector3Array"
-   "PackedVector3iArray" "PackedColorArray"
-
-   ; @GlobalScope
-   "AudioServer" "CameraServer" "ClassDB" "DisplayServer" "Engine"
-   "EngineDebugger" "GDExtensionManager" "Geometry2D" "Geometry3D" "GodotSharp"
-   "IP" "Input" "InputMap" "JavaClassWrapper" "JavaScriptBridge" "Marshalls"
-   "NavigationMeshGenerator" "NavigationServer2D" "NavigationServer3D" "OS"
-   "Performance" "PhysicsServer2D" "PhysicsServer2DManager" "PhysicsServer3D"
-   "PhysicsServer3DManager" "ProjectSettings" "RenderingServer" "ResourceLoader"
-   "ResourceSaver" "ResourceUID" "TextServerManager" "ThemeDB" "Time"
-   "TranslationServer" "WorkerThreadPool" "XRServer"
-  ))
+    ; from godot-vscode-plugin
+    "Vector2" "Vector2i" "Vector3" "Vector3i" "Color" "Rect2" "Rect2i" "Array" "Basis" "Dictionary"
+    "Plane" "Quat" "RID" "Rect3" "Transform" "Transform2D" "Transform3D" "AABB" "String" "NodePath"
+    "Object" "PoolByteArray" "PoolIntArray" "PoolRealArray" "PoolStringArray" "PoolVector2Array"
+    "PoolVector3Array" "PoolColorArray" "bool" "int" "float" "StringName" "Quaternion"
+    "PackedByteArray" "PackedInt32Array" "PackedInt64Array" "PackedFloat32Array"
+    "PackedFloat64Array" "PackedStringArray" "PackedVector2Array" "PackedVector2iArray"
+    "PackedVector3Array" "PackedVector3iArray" "PackedColorArray"
+    ; @GlobalScope
+    "AudioServer" "CameraServer" "ClassDB" "DisplayServer" "Engine" "EngineDebugger"
+    "GDExtensionManager" "Geometry2D" "Geometry3D" "GodotSharp" "IP" "Input" "InputMap"
+    "JavaClassWrapper" "JavaScriptBridge" "Marshalls" "NavigationMeshGenerator" "NavigationServer2D"
+    "NavigationServer3D" "OS" "Performance" "PhysicsServer2D" "PhysicsServer2DManager"
+    "PhysicsServer3D" "PhysicsServer3DManager" "ProjectSettings" "RenderingServer" "ResourceLoader"
+    "ResourceSaver" "ResourceUID" "TextServerManager" "ThemeDB" "Time" "TranslationServer"
+    "WorkerThreadPool" "XRServer"))
 
 ; Builtin Funcs
-; format-ignore
 (call
   (identifier) @function.builtin
   (#any-of? @function.builtin
     ; @GlobalScope
-    "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
-    "bezier_interpolate" "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf"
-    "ceili" "clamp" "clampf" "clampi" "cos" "cosh" "cubic_interpolate"
-    "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
-    "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string"
-    "exp" "floor" "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id"
-    "inverse_lerp" "is_equal_approx" "is_finite" "is_inf" "is_instance_id_valid"
-    "is_instance_valid" "is_nan" "is_same" "is_zero_approx" "lerp" "lerp_angle"
-    "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min" "minf" "mini"
-    "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
-    "print_verbose" "printerr" "printraw" "prints" "printt" "push_error"
-    "push_warning" "rad_to_deg" "rand_from_seed" "randf" "randf_range" "randfn"
-    "randi" "randi_range" "randomize" "remap" "rid_allocate_id" "rid_from_int64"
-    "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin" "sinh"
-    "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str"
-    "str_to_var" "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects"
-    "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
-
+    "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative" "bezier_interpolate"
+    "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf" "ceili" "clamp" "clampf" "clampi"
+    "cos" "cosh" "cubic_interpolate" "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
+    "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string" "exp" "floor"
+    "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id" "inverse_lerp" "is_equal_approx"
+    "is_finite" "is_inf" "is_instance_id_valid" "is_instance_valid" "is_nan" "is_same"
+    "is_zero_approx" "lerp" "lerp_angle" "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min"
+    "minf" "mini" "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
+    "print_verbose" "printerr" "printraw" "prints" "printt" "push_error" "push_warning" "rad_to_deg"
+    "rand_from_seed" "randf" "randf_range" "randfn" "randi" "randi_range" "randomize" "remap"
+    "rid_allocate_id" "rid_from_int64" "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin"
+    "sinh" "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str" "str_to_var"
+    "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects" "var_to_str" "weakref" "wrap"
+    "wrapf" "wrapi"
     ; @GDScript
-    "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
-    "is_instance_of" "len" "print_debug" "print_stack" "range"
-    "type_exists"))
+    "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict" "is_instance_of"
+    "len" "print_debug" "print_stack" "range" "type_exists"))
 
 ; Builtin Constants
 ((identifier) @constant.builtin
-  ; format-ignore
   (#any-of? @constant.builtin
     ; @GDScript
     "PI" "TAU" "INF" "NAN"
-
     ; @GlobalScope
-    "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT" "CORNER_BOTTOM_RIGHT"
-    "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE" "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT"
-    "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
-    "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL" "INLINE_ALIGNMENT_TOP_TO"
-    "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP"
-    "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
-    "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK"
-    "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ" "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE"
-    "KEY_SPECIAL" "KEY_ESCAPE" "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
-    "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP" "KEY_RIGHT" "KEY_DOWN"
-    "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT" "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK"
-    "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5" "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12"
-    "KEY_F13" "KEY_F14" "KEY_F15" "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
-    "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33" "KEY_F34" "KEY_F35"
-    "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD" "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2"
-    "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6" "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP"
-    "KEY_BACK" "KEY_FORWARD" "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
-    "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE" "KEY_FAVORITES" "KEY_SEARCH"
-    "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA" "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3"
-    "KEY_LAUNCH4" "KEY_LAUNCH5" "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
-    "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM" "KEY_QUOTEDBL"
-    "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE" "KEY_PARENLEFT" "KEY_PARENRIGHT"
-    "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD" "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4"
-    "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9" "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION"
-    "KEY_AT" "KEY_A" "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
-    "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y" "KEY_Z"
-    "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE" "KEY_QUOTELEFT" "KEY_BRACELEFT"
-    "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN" "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU"
-    "KEY_JIS_KANA" "KEY_CODE_MASK" "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT"
-    "KEY_MASK_META" "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
-    "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN" "MOUSE_BUTTON_WHEEL_LEFT"
-    "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1" "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT"
-    "MOUSE_BUTTON_MASK_RIGHT" "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
-    "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y" "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE"
-    "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK" "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER"
-    "JOY_BUTTON_RIGHT_SHOULDER" "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
-    "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3" "JOY_BUTTON_PADDLE4"
-    "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y"
-    "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX"
-    "JOY_AXIS_MAX" "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
-    "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE" "MIDI_MESSAGE_PITCH_BEND"
-    "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
-    "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST" "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START"
-    "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP" "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED"
-    "ERR_UNAVAILABLE" "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
-    "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION" "ERR_FILE_ALREADY_IN_USE"
-    "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ" "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT"
-    "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF" "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED"
-    "ERR_ALREADY_IN_USE" "ERR_LOCKED" "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
-    "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER" "ERR_ALREADY_EXISTS"
-    "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND"
-    "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED" "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL"
-    "ERR_PARSE_ERROR" "ERR_BUSY" "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE"
-    "PROPERTY_HINT_RANGE" "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
-    "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER" "PROPERTY_HINT_LAYERS_2D_PHYSICS"
-    "PROPERTY_HINT_LAYERS_2D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
-    "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR" "PROPERTY_HINT_GLOBAL_FILE"
-    "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE" "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION"
-    "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
-    "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_NODE_PATH_VALID_TYPES"
-    "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE" "PROPERTY_HINT_INT_IS_OBJECTID"
-    "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE" "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING"
-    "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
+    "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT"
+    "CORNER_BOTTOM_RIGHT" "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE"
+    "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT" "HORIZONTAL_ALIGNMENT_CENTER"
+    "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
+    "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL"
+    "INLINE_ALIGNMENT_TOP_TO" "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO"
+    "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP" "INLINE_ALIGNMENT_TO_CENTER"
+    "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
+    "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK"
+    "INLINE_ALIGNMENT_TEXT_MASK" "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ"
+    "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE" "KEY_SPECIAL" "KEY_ESCAPE"
+    "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
+    "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP"
+    "KEY_RIGHT" "KEY_DOWN" "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT"
+    "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK" "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5"
+    "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12" "KEY_F13" "KEY_F14" "KEY_F15"
+    "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
+    "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33"
+    "KEY_F34" "KEY_F35" "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD"
+    "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2" "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6"
+    "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP" "KEY_BACK" "KEY_FORWARD"
+    "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
+    "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE"
+    "KEY_FAVORITES" "KEY_SEARCH" "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA"
+    "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3" "KEY_LAUNCH4" "KEY_LAUNCH5"
+    "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
+    "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM"
+    "KEY_QUOTEDBL" "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE"
+    "KEY_PARENLEFT" "KEY_PARENRIGHT" "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD"
+    "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4" "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9"
+    "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION" "KEY_AT" "KEY_A"
+    "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
+    "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y"
+    "KEY_Z" "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE"
+    "KEY_QUOTELEFT" "KEY_BRACELEFT" "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN"
+    "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU" "KEY_JIS_KANA" "KEY_CODE_MASK"
+    "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT" "KEY_MASK_META"
+    "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
+    "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN"
+    "MOUSE_BUTTON_WHEEL_LEFT" "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1"
+    "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT" "MOUSE_BUTTON_MASK_RIGHT"
+    "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
+    "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y"
+    "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE" "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK"
+    "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER" "JOY_BUTTON_RIGHT_SHOULDER"
+    "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
+    "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3"
+    "JOY_BUTTON_PADDLE4" "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX"
+    "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y" "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y"
+    "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX" "JOY_AXIS_MAX"
+    "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
+    "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE"
+    "MIDI_MESSAGE_PITCH_BEND" "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME"
+    "MIDI_MESSAGE_SONG_POSITION_POINTER" "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST"
+    "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START" "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP"
+    "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED" "ERR_UNAVAILABLE"
+    "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
+    "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION"
+    "ERR_FILE_ALREADY_IN_USE" "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ"
+    "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT" "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF"
+    "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED" "ERR_ALREADY_IN_USE" "ERR_LOCKED"
+    "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
+    "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER"
+    "ERR_ALREADY_EXISTS" "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE"
+    "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND" "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED"
+    "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL" "ERR_PARSE_ERROR" "ERR_BUSY"
+    "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE" "PROPERTY_HINT_RANGE"
+    "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
+    "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER"
+    "PROPERTY_HINT_LAYERS_2D_PHYSICS" "PROPERTY_HINT_LAYERS_2D_NAVIGATION"
+    "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
+    "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR"
+    "PROPERTY_HINT_GLOBAL_FILE" "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE"
+    "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION" "PROPERTY_HINT_PLACEHOLDER_TEXT"
+    "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
+    "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG"
+    "PROPERTY_HINT_NODE_PATH_VALID_TYPES" "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE"
+    "PROPERTY_HINT_INT_IS_OBJECTID" "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE"
+    "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING" "PROPERTY_HINT_NODE_TYPE"
+    "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
     "PROPERTY_USAGE_NONE" "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_INTERNAL"
-    "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_CATEGORY"
-    "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_NO_INSTANCE_STATE"
-    "PROPERTY_USAGE_RESTART_IF_CHANGED" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
-    "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_CLASS_IS_ENUM"
-    "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
-    "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT"
-    "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
-    "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_READ_ONLY"
-    "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR" "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST"
-    "METHOD_FLAG_VIRTUAL" "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
-    "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I" "TYPE_RECT2" "TYPE_RECT2I"
-    "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4" "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION"
-    "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D" "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH"
-    "TYPE_RID" "TYPE_OBJECT" "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
-    "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY" "TYPE_PACKED_FLOAT64_ARRAY"
-    "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX"
-    "OP_EQUAL" "OP_NOT_EQUAL" "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT"
-    "OP_MULTIPLY" "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
-    "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"))
+    "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP"
+    "PROPERTY_USAGE_CATEGORY" "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD"
+    "PROPERTY_USAGE_NO_INSTANCE_STATE" "PROPERTY_USAGE_RESTART_IF_CHANGED"
+    "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
+    "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE"
+    "PROPERTY_USAGE_CLASS_IS_ENUM" "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY"
+    "PROPERTY_USAGE_ALWAYS_DUPLICATE" "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX"
+    "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT" "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT"
+    "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
+    "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING"
+    "PROPERTY_USAGE_READ_ONLY" "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR"
+    "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST" "METHOD_FLAG_VIRTUAL"
+    "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
+    "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I"
+    "TYPE_RECT2" "TYPE_RECT2I" "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4"
+    "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION" "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D"
+    "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH" "TYPE_RID" "TYPE_OBJECT"
+    "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
+    "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY"
+    "TYPE_PACKED_FLOAT64_ARRAY" "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY"
+    "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX" "OP_EQUAL" "OP_NOT_EQUAL"
+    "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT" "OP_MULTIPLY"
+    "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
+    "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN"
+    "OP_MAX"))
diff --git a/queries/gnuplot/highlights.scm b/queries/gnuplot/highlights.scm
index d8e546a03..884c7263d 100644
--- a/queries/gnuplot/highlights.scm
+++ b/queries/gnuplot/highlights.scm
@@ -597,7 +597,8 @@
 
 ((datafile_modifiers
   filetype: (identifier) @variable.member)
-  (#any-of? @variable.member "avs" "bin" "edf" "ehf" "gif" "gpbin" "jpeg" "jpg" "png" "raw" "rgb" "auto"))
+  (#any-of? @variable.member
+    "avs" "bin" "edf" "ehf" "gif" "gpbin" "jpeg" "jpg" "png" "raw" "rgb" "auto"))
 
 (macro) @function.macro
 
@@ -608,16 +609,30 @@
 
 ((function
   name: (identifier) @function.builtin)
-  (#any-of? @function.builtin "abs" "acos" "acosh" "airy" "arg" "asin" "asinh" "atan" "atan2" "atanh" "besj0" "besj1" "besjn" "besy0" "besy1" "besyn" "besi0" "besi1" "besin" "cbrt" "ceil" "conj" "cos" "cosh" "EllipticK" "EllipticE" "EllipticPi" "erf" "erfc" "exp" "expint" "floor" "gamma" "ibeta" "inverf" "igamma" "imag" "int" "invnorm" "invibeta" "invigamma" "LambertW" "lambertw" "lgamma" "lnGamma" "log" "log10" "norm" "rand" "real" "round" "sgn" "sin" "sinh" "sqrt" "SynchrotronF" "tan" "tanh" "uigamma" "voigt" "zeta" "cerf" "cdawson" "faddeva" "erfi" "FresnelC" "FresnelS" "VP" "VP_fwhm" "Ai" "Bi" "BesselH1" "BesselH2" "BesselJ" "BesselY" "BesselI" "BesselK" "gprintf" "sprintf" "strlen" "strstrt" "substr" "strptime" "srtftime" "system" "trim" "word" "words" "time" "timecolumn" "tm_hour" "tm_mday" "tm_min" "tm_mon" "tm_sec" "tm_wday" "tm_week" "tm_yday" "tm_year" "weekday_iso" "weekday_cdc" "column" "columnhead" "exists" "hsv2rgb" "index" "palette" "rgbcolor" "stringcolumn" "valid" "value" "voxel"))
+  (#any-of? @function.builtin
+    "abs" "acos" "acosh" "airy" "arg" "asin" "asinh" "atan" "atan2" "atanh" "besj0" "besj1" "besjn"
+    "besy0" "besy1" "besyn" "besi0" "besi1" "besin" "cbrt" "ceil" "conj" "cos" "cosh" "EllipticK"
+    "EllipticE" "EllipticPi" "erf" "erfc" "exp" "expint" "floor" "gamma" "ibeta" "inverf" "igamma"
+    "imag" "int" "invnorm" "invibeta" "invigamma" "LambertW" "lambertw" "lgamma" "lnGamma" "log"
+    "log10" "norm" "rand" "real" "round" "sgn" "sin" "sinh" "sqrt" "SynchrotronF" "tan" "tanh"
+    "uigamma" "voigt" "zeta" "cerf" "cdawson" "faddeva" "erfi" "FresnelC" "FresnelS" "VP" "VP_fwhm"
+    "Ai" "Bi" "BesselH1" "BesselH2" "BesselJ" "BesselY" "BesselI" "BesselK" "gprintf" "sprintf"
+    "strlen" "strstrt" "substr" "strptime" "srtftime" "system" "trim" "word" "words" "time"
+    "timecolumn" "tm_hour" "tm_mday" "tm_min" "tm_mon" "tm_sec" "tm_wday" "tm_week" "tm_yday"
+    "tm_year" "weekday_iso" "weekday_cdc" "column" "columnhead" "exists" "hsv2rgb" "index" "palette"
+    "rgbcolor" "stringcolumn" "valid" "value" "voxel"))
 
 ((identifier) @variable.builtin
-  (#match? @variable.builtin "^\\w+_(records|headers|outofrange|invalid|blank|blocks|columns|column_header|index_(min|max)(_x|_y)?|(min|max)(_x|_y)?|mean(_err)?(_x|_y)?|stddev(_err)?(_x|_y)?)$"))
+  (#match? @variable.builtin
+    "^\\w+_(records|headers|outofrange|invalid|blank|blocks|columns|column_header|index_(min|max)(_x|_y)?|(min|max)(_x|_y)?|mean(_err)?(_x|_y)?|stddev(_err)?(_x|_y)?)$"))
 
 ((identifier) @variable.builtin
-  (#match? @variable.builtin "^\\w+_(sdd(_x|_y)?|(lo|up)_quartile(_x|_y)?|median(_x|_y)?|sum(sq)?(_x|_y)?|skewness(_err)?(_x|_y)?)$"))
+  (#match? @variable.builtin
+    "^\\w+_(sdd(_x|_y)?|(lo|up)_quartile(_x|_y)?|median(_x|_y)?|sum(sq)?(_x|_y)?|skewness(_err)?(_x|_y)?)$"))
 
 ((identifier) @variable.builtin
-  (#match? @variable.builtin "^\\w+_(kurtosis(_err)?(_x|_y)?|adev(_x|_y)?|correlation|slope(_err)?|intercept(_err)?|sumxy|pos(_min|_max)_y|size(_x|_y))$"))
+  (#match? @variable.builtin
+    "^\\w+_(kurtosis(_err)?(_x|_y)?|adev(_x|_y)?|correlation|slope(_err)?|intercept(_err)?|sumxy|pos(_min|_max)_y|size(_x|_y))$"))
 
 ((identifier) @variable.builtin
   (#match? @variable.builtin "^((GPVAL|MOUSE|FIT)_\\w+|GNUTERM|NaN|VoxelDistance|GridDistance|pi)$"))
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index d23ac6f73..2fa3973d7 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -139,11 +139,16 @@
 ] @type.builtin
 
 ((type_identifier) @type.builtin
-  (#any-of? @type.builtin "any" "bool" "byte" "comparable" "complex128" "complex64" "error" "float32" "float64" "int" "int16" "int32" "int64" "int8" "rune" "string" "uint" "uint16" "uint32" "uint64" "uint8" "uintptr"))
+  (#any-of? @type.builtin
+    "any" "bool" "byte" "comparable" "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" "clear" "close" "complex" "copy" "delete" "imag" "len" "make" "max" "min" "new" "panic" "print" "println" "real" "recover"))
+  (#any-of? @function.builtin
+    "append" "cap" "clear" "close" "complex" "copy" "delete" "imag" "len" "make" "max" "min" "new"
+    "panic" "print" "println" "real" "recover"))
 
 ; Delimiters
 "." @punctuation.delimiter
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 20f615924..3bc76cd7a 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -3,7 +3,9 @@
 
 (call_expression
   (selector_expression) @_function
-  (#any-of? @_function "regexp.Match" "regexp.MatchReader" "regexp.MatchString" "regexp.Compile" "regexp.CompilePOSIX" "regexp.MustCompile" "regexp.MustCompilePOSIX")
+  (#any-of? @_function
+    "regexp.Match" "regexp.MatchReader" "regexp.MatchString" "regexp.Compile" "regexp.CompilePOSIX"
+    "regexp.MustCompile" "regexp.MustCompilePOSIX")
   (argument_list
     .
     [
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index fed093197..33d9d2950 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -586,12 +586,19 @@
 ; ----------------------------------------------------------------------------
 ; Exceptions/error handling
 ((variable) @keyword.exception
-  (#any-of? @keyword.exception "error" "undefined" "try" "tryJust" "tryAny" "catch" "catches" "catchJust" "handle" "handleJust" "throw" "throwIO" "throwTo" "throwError" "ioError" "mask" "mask_" "uninterruptibleMask" "uninterruptibleMask_" "bracket" "bracket_" "bracketOnErrorSource" "finally" "fail" "onException" "expectationFailure"))
+  (#any-of? @keyword.exception
+    "error" "undefined" "try" "tryJust" "tryAny" "catch" "catches" "catchJust" "handle" "handleJust"
+    "throw" "throwIO" "throwTo" "throwError" "ioError" "mask" "mask_" "uninterruptibleMask"
+    "uninterruptibleMask_" "bracket" "bracket_" "bracketOnErrorSource" "finally" "fail"
+    "onException" "expectationFailure"))
 
 ; ----------------------------------------------------------------------------
 ; Debugging
 ((variable) @keyword.debug
-  (#any-of? @keyword.debug "trace" "traceId" "traceShow" "traceShowId" "traceWith" "traceShowWith" "traceStack" "traceIO" "traceM" "traceShowM" "traceEvent" "traceEventWith" "traceEventIO" "flushEventLog" "traceMarker" "traceMarkerIO"))
+  (#any-of? @keyword.debug
+    "trace" "traceId" "traceShow" "traceShowId" "traceWith" "traceShowWith" "traceStack" "traceIO"
+    "traceM" "traceShowM" "traceEvent" "traceEventWith" "traceEventIO" "flushEventLog" "traceMarker"
+    "traceMarkerIO"))
 
 ; ----------------------------------------------------------------------------
 ; Fields
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 3877bafa3..7ac7d2966 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -68,144 +68,43 @@
 
 ; built-in variables
 ((identifier) @variable.builtin
-  (#any-of? @variable.builtin "programCount" "programIndex" "taskCount" "taskCount0" "taskCount1" "taskCount2" "taskIndex" "taskIndex0" "taskIndex1" "taskIndex2" "threadCount" "threadIndex"))
+  (#any-of? @variable.builtin
+    "programCount" "programIndex" "taskCount" "taskCount0" "taskCount1" "taskCount2" "taskIndex"
+    "taskIndex0" "taskIndex1" "taskIndex2" "threadCount" "threadIndex"))
 
 ; preprocessor constants
 ((identifier) @constant.builtin
-  (#any-of? @constant.builtin "ISPC" "ISPC_FP16_SUPPORTED" "ISPC_FP64_SUPPORTED" "ISPC_LLVM_INTRINSICS_ENABLED" "ISPC_MAJOR_VERSION" "ISPC_MINOR_VERSION" "ISPC_POINTER_SIZE" "ISPC_TARGET_AVX" "ISPC_TARGET_AVX2" "ISPC_TARGET_AVX512KNL" "ISPC_TARGET_AVX512SKX" "ISPC_TARGET_AVX512SPR" "ISPC_TARGET_NEON" "ISPC_TARGET_SSE2" "ISPC_TARGET_SSE4" "ISPC_UINT_IS_DEFINED" "PI" "TARGET_ELEMENT_WIDTH" "TARGET_WIDTH"))
+  (#any-of? @constant.builtin
+    "ISPC" "ISPC_FP16_SUPPORTED" "ISPC_FP64_SUPPORTED" "ISPC_LLVM_INTRINSICS_ENABLED"
+    "ISPC_MAJOR_VERSION" "ISPC_MINOR_VERSION" "ISPC_POINTER_SIZE" "ISPC_TARGET_AVX"
+    "ISPC_TARGET_AVX2" "ISPC_TARGET_AVX512KNL" "ISPC_TARGET_AVX512SKX" "ISPC_TARGET_AVX512SPR"
+    "ISPC_TARGET_NEON" "ISPC_TARGET_SSE2" "ISPC_TARGET_SSE4" "ISPC_UINT_IS_DEFINED" "PI"
+    "TARGET_ELEMENT_WIDTH" "TARGET_WIDTH"))
 
 ; standard library built-in
 ((type_identifier) @type.builtin
   (#lua-match? @type.builtin "^RNGState"))
 
-; format-ignore
 (call_expression
   function: (identifier) @function.builtin
   (#any-of? @function.builtin
-    "abs"
-    "acos"
-    "all"
-    "alloca"
-    "and"
-    "any"
-    "aos_to_soa2"
-    "aos_to_soa3"
-    "aos_to_soa4"
-    "asin"
-    "assert"
-    "assume"
-    "atan"
-    "atan2"
-    "atomic_add_global"
-    "atomic_add_local"
-    "atomic_and_global"
-    "atomic_and_local"
-    "atomic_compare_exchange_global"
-    "atomic_compare_exchange_local"
-    "atomic_max_global"
-    "atomic_max_local"
-    "atomic_min_global"
-    "atomic_min_local"
-    "atomic_or_global"
-    "atomic_or_local"
-    "atomic_subtract_global"
-    "atomic_subtract_local"
-    "atomic_swap_global"
-    "atomic_swap_local"
-    "atomic_xor_global"
-    "atomic_xor_local"
-    "avg_down"
-    "avg_up"
-    "broadcast"
-    "ceil"
-    "clamp"
-    "clock"
-    "cos"
-    "count_leading_zeros"
-    "count_trailing_zeros"
-    "doublebits"
-    "exclusive_scan_add"
-    "exclusive_scan_and"
-    "exclusive_scan_or"
-    "exp"
-    "extract"
-    "fastmath"
-    "float16bits"
-    "floatbits"
-    "float_to_half"
-    "float_to_half_fast"
-    "float_to_srgb8"
-    "floor"
-    "frandom"
-    "frexp"
-    "half_to_float"
-    "half_to_float_fast"
-    "insert"
-    "intbits"
-    "invoke_sycl"
-    "isnan"
-    "ISPCAlloc"
-    "ISPCLaunch"
-    "ISPCSync"
-    "lanemask"
-    "ldexp"
-    "log"
-    "max"
-    "memcpy"
-    "memcpy64"
-    "memmove"
-    "memmove64"
-    "memory_barrier"
-    "memset"
-    "memset64"
-    "min"
-    "none"
-    "num_cores"
-    "or"
-    "packed_load_active"
-    "packed_store_active"
-    "packed_store_active2"
-    "packmask"
-    "popcnt"
-    "pow"
-    "prefetch_l1"
-    "prefetch_l2"
-    "prefetch_l3"
-    "prefetch_nt"
-    "prefetchw_l1"
-    "prefetchw_l2"
-    "prefetchw_l3"
-    "print"
-    "random"
-    "rcp"
-    "rcp_fast"
-    "rdrand"
-    "reduce_add"
-    "reduce_equal"
-    "reduce_max"
-    "reduce_min"
-    "rotate"
-    "round"
-    "rsqrt"
-    "rsqrt_fast"
-    "saturating_add"
-    "saturating_div"
-    "saturating_mul"
-    "saturating_sub"
-    "seed_rng"
-    "select"
-    "shift"
-    "shuffle"
-    "signbits"
-    "sign_extend"
-    "sin"
-    "sincos"
-    "soa_to_aos2"
-    "soa_to_aos3"
-    "soa_to_aos4"
-    "sqrt"
-    "streaming_load"
-    "streaming_load_uniform"
-    "streaming_store"
-    "tan"
-    "trunc"))
+    "abs" "acos" "all" "alloca" "and" "any" "aos_to_soa2" "aos_to_soa3" "aos_to_soa4" "asin"
+    "assert" "assume" "atan" "atan2" "atomic_add_global" "atomic_add_local" "atomic_and_global"
+    "atomic_and_local" "atomic_compare_exchange_global" "atomic_compare_exchange_local"
+    "atomic_max_global" "atomic_max_local" "atomic_min_global" "atomic_min_local" "atomic_or_global"
+    "atomic_or_local" "atomic_subtract_global" "atomic_subtract_local" "atomic_swap_global"
+    "atomic_swap_local" "atomic_xor_global" "atomic_xor_local" "avg_down" "avg_up" "broadcast"
+    "ceil" "clamp" "clock" "cos" "count_leading_zeros" "count_trailing_zeros" "doublebits"
+    "exclusive_scan_add" "exclusive_scan_and" "exclusive_scan_or" "exp" "extract" "fastmath"
+    "float16bits" "floatbits" "float_to_half" "float_to_half_fast" "float_to_srgb8" "floor"
+    "frandom" "frexp" "half_to_float" "half_to_float_fast" "insert" "intbits" "invoke_sycl" "isnan"
+    "ISPCAlloc" "ISPCLaunch" "ISPCSync" "lanemask" "ldexp" "log" "max" "memcpy" "memcpy64" "memmove"
+    "memmove64" "memory_barrier" "memset" "memset64" "min" "none" "num_cores" "or"
+    "packed_load_active" "packed_store_active" "packed_store_active2" "packmask" "popcnt" "pow"
+    "prefetch_l1" "prefetch_l2" "prefetch_l3" "prefetch_nt" "prefetchw_l1" "prefetchw_l2"
+    "prefetchw_l3" "print" "random" "rcp" "rcp_fast" "rdrand" "reduce_add" "reduce_equal"
+    "reduce_max" "reduce_min" "rotate" "round" "rsqrt" "rsqrt_fast" "saturating_add"
+    "saturating_div" "saturating_mul" "saturating_sub" "seed_rng" "select" "shift" "shuffle"
+    "signbits" "sign_extend" "sin" "sincos" "soa_to_aos2" "soa_to_aos3" "soa_to_aos4" "sqrt"
+    "streaming_load" "streaming_load_uniform" "streaming_store" "tan" "trunc")
+  )
diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 94614c7a2..179b4fefa 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -67,53 +67,21 @@
 ;     (when (info :macro)
 ;       (print name))))
 ((sym_lit) @function.macro
-  ; format-ignore
   (#any-of? @function.macro
     ; special forms
-    "break"
-    "def" "do"
-    "fn"
-    "if"
-    "quasiquote" "quote"
-    "set" "splice"
-    "unquote" "upscope"
-    "var"
+    "break" "def" "do" "fn" "if" "quasiquote" "quote" "set" "splice" "unquote" "upscope" "var"
     "while"
     ; macros
-    "%=" "*="
-    "++" "+="
-    "--" "-="
-    "->" "->>" "-?>" "-?>>"
-    "/="
-    "and" "as->" "as-macro" "as?->" "assert"
-    "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen"
-    "cond" "coro"
-    "def-" "default" "defdyn" "defer" "defmacro" "defmacro-"
-    "defn" "defn-"
-    "delay" "doc"
-    "each" "eachk" "eachp"
-    "eachy" 
+    "%=" "*=" "++" "+=" "--" "-=" "->" "->>" "-?>" "-?>>" "/=" "and" "as->" "as-macro" "as?->"
+    "assert" "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro" "def-"
+    "default" "defdyn" "defer" "defmacro" "defmacro-" "defn" "defn-" "delay" "doc" "each" "eachk"
+    "eachp" "eachy"
     ; XXX: obsolete
-    "edefer"
-    "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread"
-    "ev/with-deadline"
-    "ffi/defbind"
-    "fiber-fn"
-    "for" "forever" "forv"
-    "generate"
-    "if-let" "if-not" "if-with" "import"
-    "juxt"
-    "label" "let" "loop"
-    "match"
-    "or"
-    "prompt" "protect"
-    "repeat"
-    "seq" "short-fn"
-    "tabseq" "toggle" "tracev" "try"
-    "unless" "use"
-    "var-" "varfn"
-    "when" "when-let" "when-with"
-    "with" "with-dyns" "with-syms" "with-vars"))
+    "edefer" "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread" "ev/with-deadline"
+    "ffi/defbind" "fiber-fn" "for" "forever" "forv" "generate" "if-let" "if-not" "if-with" "import"
+    "juxt" "label" "let" "loop" "match" "or" "prompt" "protect" "repeat" "seq" "short-fn" "tabseq"
+    "toggle" "tracev" "try" "unless" "use" "var-" "varfn" "when" "when-let" "when-with" "with"
+    "with-dyns" "with-syms" "with-vars"))
 
 ; All builtin functions
 ;
@@ -124,189 +92,83 @@
 ;                    (cfunction? (info :value))))
 ;       (print name))))
 ((sym_lit) @function.builtin
-  ; format-ignore
   (#any-of? @function.builtin
-    "%" "*" "+" "-" "/"
-    "<" "<=" "=" ">" ">="
+    "%" "*" "+" "-" "/" "<" "<=" "=" ">" ">="
     ; debugging -- start janet with -d and use (debug) to see these
-    ".break" ".breakall" ".bytecode"
-    ".clear" ".clearall"
-    ".disasm"
-    ".fiber" ".fn" ".frame"
-    ".locals"
-    ".next" ".nextc"
-    ".ppasm"
-    ".signal" ".slot" ".slots" ".source" ".stack" ".step"
+    ".break" ".breakall" ".bytecode" ".clear" ".clearall" ".disasm" ".fiber" ".fn" ".frame"
+    ".locals" ".next" ".nextc" ".ppasm" ".signal" ".slot" ".slots" ".source" ".stack" ".step"
     ; back to regularly scheduled program
-    "abstract?" "accumulate" "accumulate2" "all" "all-bindings"
-    "all-dynamics" "any?" "apply"
-    "array"
-    "array/clear" "array/concat" "array/ensure" "array/fill"
-    "array/insert" "array/new" "array/new-filled" "array/peek"
-    "array/pop" "array/push" "array/remove" "array/slice" "array/trim"
-    "array?"
-    "asm"
-    "bad-compile" "bad-parse"
-    "band" "blshift" "bnot"
-    "boolean?"
-    "bor" "brshift" "brushift"
-    "buffer"
-    "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
-    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill"
-    "buffer/format" "buffer/new" "buffer/new-filled" "buffer/popn"
-    "buffer/push" "buffer/push-at" "buffer/push-byte"
-    "buffer/push-string" "buffer/push-word" "buffer/slice"
-    "buffer/trim"
-    "buffer?"
-    "bxor"
-    "bytes?"
-    "cancel"
-    "cfunction?"
-    "cli-main"
-    "cmp" "comp" "compare" "compare<" "compare<=" "compare="
-    "compare>" "compare>="
-    "compile" "complement" "count" "curenv"
-    "debug"
-    "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage"
-    "debug/stack" "debug/stacktrace" "debug/step" "debug/unbreak"
-    "debug/unfbreak"
-    "debugger" "debugger-on-status"
-    "dec" "deep-not=" "deep=" "defglobal" "describe"
-    "dictionary?"
-    "disasm" "distinct" "div" "doc*" "doc-format" "doc-of" "dofile"
-    "drop" "drop-until" "drop-while" "dyn"
-    "eflush" "empty?" "env-lookup"
-    "eprin" "eprinf" "eprint" "eprintf" "error" "errorf"
-    "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
-    "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan"
-    "ev/chan-close" "ev/chunk" "ev/close" "ev/count" "ev/deadline"
-    "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
-    "ev/read" "ev/release-lock" "ev/release-rlock"
-    "ev/release-wlock" "ev/rselect" "ev/rwlock" "ev/select"
-    "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write"
-    "eval" "eval-string" "even?" "every?" "extreme"
-    "false?"
-    "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
-    "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc"
-    "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction"
-    "ffi/read" "ffi/signature" "ffi/size" "ffi/struct"
-    "ffi/trampoline" "ffi/write"
-    "fiber/can-resume?" "fiber/current" "fiber/getenv"
-    "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
-    "fiber/setenv" "fiber/setmaxstack" "fiber/status"
-    "fiber?"
-    "file/close" "file/flush" "file/lines" "file/open" "file/read"
-    "file/seek" "file/tell" "file/temp" "file/write"
-    "filter" "find" "find-index" "first" "flatten" "flatten-into"
-    "flush" "flycheck" "freeze" "frequencies" "from-pairs"
-    "function?"
-    "gccollect" "gcinterval" "gcsetinterval"
-    "gensym" "get" "get-in" "getline" "getproto" "group-by"
-    "has-key?" "has-value?" "hash"
-    "idempotent?" "identity" "import*" "in" "inc" "index-of"
-    "indexed?"
-    "int/s64" "int/to-bytes" "int/to-number" "int/u64"
-    "int?"
-    "interleave" "interpose" "invert"
-    "juxt*"
-    "keep" "keep-syntax" "keep-syntax!" "keys"
-    "keyword"
-    "keyword/slice"
-    "keyword?"
-    "kvs"
-    "last" "length" "load-image"
-    "macex" "macex1" "maclintf"
-    "make-env" "make-image" "map" "mapcat" "marshal"
-    "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh"
-    "math/atan" "math/atan2" "math/atanh" "math/cbrt" "math/ceil"
-    "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
-    "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd"
-    "math/hypot" "math/lcm" "math/log" "math/log-gamma"
-    "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
-    "math/random" "math/rng" "math/rng-buffer" "math/rng-int"
-    "math/rng-uniform" "math/round" "math/seedrandom" "math/sin"
-    "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc"
-    "max" "max-of" "mean" "memcmp" "merge" "merge-into"
-    "merge-module" "min" "min-of" "mod"
-    "module/add-paths" "module/expand-path" "module/find"
-    "module/value"
-    "nan?" "nat?" "native" "neg?"
-    "net/accept" "net/accept-loop" "net/address"
-    "net/address-unpack" "net/chunk" "net/close" "net/connect"
-    "net/flush" "net/listen" "net/localname" "net/peername"
-    "net/read" "net/recv-from" "net/send-to" "net/server"
-    "net/setsockopt" "net/shutdown" "net/write"
-    "next"
-    "nil?"
-    "not" "not="
-    "number?"
-    "odd?" "one?"
-    "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
-    "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir"
-    "os/environ" "os/execute" "os/exit" "os/getenv" "os/link"
-    "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
-    "os/perm-string" "os/pipe" "os/proc-close" "os/proc-kill"
-    "os/proc-wait" "os/readlink" "os/realpath" "os/rename"
-    "os/rm" "os/rmdir" "os/setenv" "os/shell" "os/sleep"
-    "os/spawn" "os/stat" "os/symlink" "os/time" "os/touch"
-    "os/umask" "os/which"
-    "pairs"
-    "parse" "parse-all"
-    "parser/byte" "parser/clone" "parser/consume" "parser/eof"
-    "parser/error" "parser/flush" "parser/has-more"
-    "parser/insert" "parser/new" "parser/produce" "parser/state"
-    "parser/status" "parser/where"
-    "partial" "partition" "partition-by"
-    "peg/compile" "peg/find" "peg/find-all" "peg/match"
-    "peg/replace" "peg/replace-all"
-    "pos?" "postwalk" "pp" "prewalk"
-    "prin" "prinf" "print" "printf"
-    "product" "propagate" "put" "put-in"
-    "quit"
-    "range" "reduce" "reduce2" "repl" "require" "resume"
-    "return" "reverse" "reverse!" "run-context"
-    "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
-    "some" "sort" "sort-by" "sorted" "sorted-by" "spit"
-    "string"
-    "string/ascii-lower" "string/ascii-upper" "string/bytes"
-    "string/check-set" "string/find" "string/find-all"
-    "string/format" "string/from-bytes" "string/has-prefix?"
-    "string/has-suffix?" "string/join" "string/repeat"
-    "string/replace" "string/replace-all" "string/reverse"
-    "string/slice" "string/split" "string/trim" "string/triml"
-    "string/trimr"
-    "string?"
-    "struct"
-    "struct/getproto" "struct/proto-flatten" "struct/to-table"
-    "struct/with-proto"
-    "struct?"
-    "sum"
-    "symbol"
-    "symbol/slice"
-    "symbol?"
-    "table"
-    "table/clear" "table/clone" "table/getproto" "table/new"
-    "table/proto-flatten" "table/rawget" "table/setproto"
-    "table/to-struct"
-    "table?"
-    "take" "take-until" "take-while"
+    "abstract?" "accumulate" "accumulate2" "all" "all-bindings" "all-dynamics" "any?" "apply"
+    "array" "array/clear" "array/concat" "array/ensure" "array/fill" "array/insert" "array/new"
+    "array/new-filled" "array/peek" "array/pop" "array/push" "array/remove" "array/slice"
+    "array/trim" "array?" "asm" "bad-compile" "bad-parse" "band" "blshift" "bnot" "boolean?" "bor"
+    "brshift" "brushift" "buffer" "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
+    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill" "buffer/format" "buffer/new"
+    "buffer/new-filled" "buffer/popn" "buffer/push" "buffer/push-at" "buffer/push-byte"
+    "buffer/push-string" "buffer/push-word" "buffer/slice" "buffer/trim" "buffer?" "bxor" "bytes?"
+    "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare" "compare<" "compare<=" "compare="
+    "compare>" "compare>=" "compile" "complement" "count" "curenv" "debug" "debug/arg-stack"
+    "debug/break" "debug/fbreak" "debug/lineage" "debug/stack" "debug/stacktrace" "debug/step"
+    "debug/unbreak" "debug/unfbreak" "debugger" "debugger-on-status" "dec" "deep-not=" "deep="
+    "defglobal" "describe" "dictionary?" "disasm" "distinct" "div" "doc*" "doc-format" "doc-of"
+    "dofile" "drop" "drop-until" "drop-while" "dyn" "eflush" "empty?" "env-lookup" "eprin" "eprinf"
+    "eprint" "eprintf" "error" "errorf" "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
+    "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan" "ev/chan-close" "ev/chunk"
+    "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
+    "ev/read" "ev/release-lock" "ev/release-rlock" "ev/release-wlock" "ev/rselect" "ev/rwlock"
+    "ev/select" "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write" "eval" "eval-string"
+    "even?" "every?" "extreme" "false?" "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
+    "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc" "ffi/native" "ffi/pointer-buffer"
+    "ffi/pointer-cfunction" "ffi/read" "ffi/signature" "ffi/size" "ffi/struct" "ffi/trampoline"
+    "ffi/write" "fiber/can-resume?" "fiber/current" "fiber/getenv" "fiber/last-value"
+    "fiber/maxstack" "fiber/new" "fiber/root" "fiber/setenv" "fiber/setmaxstack" "fiber/status"
+    "fiber?" "file/close" "file/flush" "file/lines" "file/open" "file/read" "file/seek" "file/tell"
+    "file/temp" "file/write" "filter" "find" "find-index" "first" "flatten" "flatten-into" "flush"
+    "flycheck" "freeze" "frequencies" "from-pairs" "function?" "gccollect" "gcinterval"
+    "gcsetinterval" "gensym" "get" "get-in" "getline" "getproto" "group-by" "has-key?" "has-value?"
+    "hash" "idempotent?" "identity" "import*" "in" "inc" "index-of" "indexed?" "int/s64"
+    "int/to-bytes" "int/to-number" "int/u64" "int?" "interleave" "interpose" "invert" "juxt*" "keep"
+    "keep-syntax" "keep-syntax!" "keys" "keyword" "keyword/slice" "keyword?" "kvs" "last" "length"
+    "load-image" "macex" "macex1" "maclintf" "make-env" "make-image" "map" "mapcat" "marshal"
+    "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh" "math/atan" "math/atan2"
+    "math/atanh" "math/cbrt" "math/ceil" "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
+    "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd" "math/hypot" "math/lcm" "math/log"
+    "math/log-gamma" "math/log10" "math/log1p" "math/log2" "math/next" "math/pow" "math/random"
+    "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform" "math/round" "math/seedrandom"
+    "math/sin" "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc" "max" "max-of" "mean"
+    "memcmp" "merge" "merge-into" "merge-module" "min" "min-of" "mod" "module/add-paths"
+    "module/expand-path" "module/find" "module/value" "nan?" "nat?" "native" "neg?" "net/accept"
+    "net/accept-loop" "net/address" "net/address-unpack" "net/chunk" "net/close" "net/connect"
+    "net/flush" "net/listen" "net/localname" "net/peername" "net/read" "net/recv-from" "net/send-to"
+    "net/server" "net/setsockopt" "net/shutdown" "net/write" "next" "nil?" "not" "not=" "number?"
+    "odd?" "one?" "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler" "os/cpu-count"
+    "os/cryptorand" "os/cwd" "os/date" "os/dir" "os/environ" "os/execute" "os/exit" "os/getenv"
+    "os/link" "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int" "os/perm-string" "os/pipe"
+    "os/proc-close" "os/proc-kill" "os/proc-wait" "os/readlink" "os/realpath" "os/rename" "os/rm"
+    "os/rmdir" "os/setenv" "os/shell" "os/sleep" "os/spawn" "os/stat" "os/symlink" "os/time"
+    "os/touch" "os/umask" "os/which" "pairs" "parse" "parse-all" "parser/byte" "parser/clone"
+    "parser/consume" "parser/eof" "parser/error" "parser/flush" "parser/has-more" "parser/insert"
+    "parser/new" "parser/produce" "parser/state" "parser/status" "parser/where" "partial"
+    "partition" "partition-by" "peg/compile" "peg/find" "peg/find-all" "peg/match" "peg/replace"
+    "peg/replace-all" "pos?" "postwalk" "pp" "prewalk" "prin" "prinf" "print" "printf" "product"
+    "propagate" "put" "put-in" "quit" "range" "reduce" "reduce2" "repl" "require" "resume" "return"
+    "reverse" "reverse!" "run-context" "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
+    "some" "sort" "sort-by" "sorted" "sorted-by" "spit" "string" "string/ascii-lower"
+    "string/ascii-upper" "string/bytes" "string/check-set" "string/find" "string/find-all"
+    "string/format" "string/from-bytes" "string/has-prefix?" "string/has-suffix?" "string/join"
+    "string/repeat" "string/replace" "string/replace-all" "string/reverse" "string/slice"
+    "string/split" "string/trim" "string/triml" "string/trimr" "string?" "struct" "struct/getproto"
+    "struct/proto-flatten" "struct/to-table" "struct/with-proto" "struct?" "sum" "symbol"
+    "symbol/slice" "symbol?" "table" "table/clear" "table/clone" "table/getproto" "table/new"
+    "table/proto-flatten" "table/rawget" "table/setproto" "table/to-struct" "table?" "take"
+    "take-until" "take-while"
     ; XXX: obsolete
-    "tarray/buffer" "tarray/copy-bytes" "tarray/length"
-    "tarray/new" "tarray/properties" "tarray/slice"
-    "tarray/swap-bytes"
+    "tarray/buffer" "tarray/copy-bytes" "tarray/length" "tarray/new" "tarray/properties"
+    "tarray/slice" "tarray/swap-bytes"
     ; XXX: obsolete
-    "thread/close" "thread/current" "thread/exit" "thread/new"
-    "thread/receive" "thread/send"
+    "thread/close" "thread/current" "thread/exit" "thread/new" "thread/receive" "thread/send"
     ; end of obsolete
-    "trace" "true?" "truthy?"
-    "tuple"
-    "tuple/brackets" "tuple/setmap" "tuple/slice"
-    "tuple/sourcemap" "tuple/type"
-    "tuple?"
-    "type"
-    "unmarshal" "untrace" "update" "update-in"
-    "values" "varglobal"
-    "walk" "warn-compile"
-    "xprin" "xprinf" "xprint" "xprintf"
-    "yield"
-    "zero?" "zipcoll"))
+    "trace" "true?" "truthy?" "tuple" "tuple/brackets" "tuple/setmap" "tuple/slice"
+    "tuple/sourcemap" "tuple/type" "tuple?" "type" "unmarshal" "untrace" "update" "update-in"
+    "values" "varglobal" "walk" "warn-compile" "xprin" "xprinf" "xprint" "xprintf" "yield" "zero?"
+    "zipcoll"))
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index 2fdcb9468..d994d759f 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -57,198 +57,27 @@
 
 ; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
 ((funcname) @function.builtin
-  ; format-ignore
   (#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"))
+    "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
 [
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 74b2b8fca..9bc6b91cf 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -63,7 +63,13 @@
 
 ; Builtins
 ((identifier) @function.builtin
-  (#any-of? @function.builtin "_abstracttype" "_apply_iterate" "_apply_pure" "_call_in_world" "_call_in_world_total" "_call_latest" "_equiv_typedef" "_expr" "_primitivetype" "_setsuper!" "_structtype" "_typebody!" "_typevar" "applicable" "apply_type" "arrayref" "arrayset" "arraysize" "const_arrayref" "donotdelete" "fieldtype" "get_binding_type" "getfield" "ifelse" "invoke" "isa" "isdefined" "modifyfield!" "nfields" "replacefield!" "set_binding_type!" "setfield!" "sizeof" "svec" "swapfield!" "throw" "tuple" "typeassert" "typeof"))
+  (#any-of? @function.builtin
+    "_abstracttype" "_apply_iterate" "_apply_pure" "_call_in_world" "_call_in_world_total"
+    "_call_latest" "_equiv_typedef" "_expr" "_primitivetype" "_setsuper!" "_structtype" "_typebody!"
+    "_typevar" "applicable" "apply_type" "arrayref" "arrayset" "arraysize" "const_arrayref"
+    "donotdelete" "fieldtype" "get_binding_type" "getfield" "ifelse" "invoke" "isa" "isdefined"
+    "modifyfield!" "nfields" "replacefield!" "set_binding_type!" "setfield!" "sizeof" "svec"
+    "swapfield!" "throw" "tuple" "typeassert" "typeof"))
 
 ; Parameters
 (parameter_list
@@ -135,217 +141,36 @@
 ;  type_names = sort(union(get_types(Core), get_types(Base)))
 ;
 ((identifier) @type.builtin
-  ; format-ignore
   (#any-of? @type.builtin
-    "AbstractArray"
-    "AbstractChannel"
-    "AbstractChar"
-    "AbstractDict"
-    "AbstractDisplay"
-    "AbstractFloat"
-    "AbstractIrrational"
-    "AbstractLock"
-    "AbstractMatch"
-    "AbstractMatrix"
-    "AbstractPattern"
-    "AbstractRange"
-    "AbstractSet"
-    "AbstractSlices"
-    "AbstractString"
-    "AbstractUnitRange"
-    "AbstractVecOrMat"
-    "AbstractVector"
-    "Any"
-    "ArgumentError"
-    "Array"
-    "AssertionError"
-    "Atomic"
-    "BigFloat"
-    "BigInt"
-    "BitArray"
-    "BitMatrix"
-    "BitSet"
-    "BitVector"
-    "Bool"
-    "BoundsError"
-    "By"
-    "CanonicalIndexError"
-    "CapturedException"
-    "CartesianIndex"
-    "CartesianIndices"
-    "Cchar"
-    "Cdouble"
-    "Cfloat"
-    "Channel"
-    "Char"
-    "Cint"
-    "Cintmax_t"
-    "Clong"
-    "Clonglong"
-    "Cmd"
-    "Colon"
-    "ColumnSlices"
-    "Complex"
-    "ComplexF16"
-    "ComplexF32"
-    "ComplexF64"
-    "ComposedFunction"
-    "CompositeException"
-    "ConcurrencyViolationError"
-    "Condition"
-    "Cptrdiff_t"
-    "Cshort"
-    "Csize_t"
-    "Cssize_t"
-    "Cstring"
-    "Cuchar"
-    "Cuint"
-    "Cuintmax_t"
-    "Culong"
-    "Culonglong"
-    "Cushort"
-    "Cvoid"
-    "Cwchar_t"
-    "Cwstring"
-    "DataType"
-    "DenseArray"
-    "DenseMatrix"
-    "DenseVecOrMat"
-    "DenseVector"
-    "Dict"
-    "DimensionMismatch"
-    "Dims"
-    "DivideError"
-    "DomainError"
-    "EOFError"
-    "Enum"
-    "ErrorException"
-    "Exception"
-    "ExponentialBackOff"
-    "Expr"
-    "Float16"
-    "Float32"
-    "Float64"
-    "Function"
-    "GlobalRef"
-    "HTML"
-    "IO"
-    "IOBuffer"
-    "IOContext"
-    "IOStream"
-    "IdDict"
-    "IndexCartesian"
-    "IndexLinear"
-    "IndexStyle"
-    "InexactError"
-    "InitError"
-    "Int"
-    "Int128"
-    "Int16"
-    "Int32"
-    "Int64"
-    "Int8"
-    "Integer"
-    "InterruptException"
-    "InvalidStateException"
-    "Irrational"
-    "KeyError"
-    "LazyString"
-    "LinRange"
-    "LineNumberNode"
-    "LinearIndices"
-    "LoadError"
-    "Lt"
-    "MIME"
-    "Matrix"
-    "Method"
-    "MethodError"
-    "Missing"
-    "MissingException"
-    "Module"
-    "NTuple"
-    "NamedTuple"
-    "Nothing"
-    "Number"
-    "Ordering"
-    "OrdinalRange"
-    "OutOfMemoryError"
-    "OverflowError"
-    "Pair"
-    "ParseError"
-    "PartialQuickSort"
-    "Perm"
-    "PermutedDimsArray"
-    "Pipe"
-    "ProcessFailedException"
-    "Ptr"
-    "QuoteNode"
-    "Rational"
-    "RawFD"
-    "ReadOnlyMemoryError"
-    "Real"
-    "ReentrantLock"
-    "Ref"
-    "Regex"
-    "RegexMatch"
-    "Returns"
-    "ReverseOrdering"
-    "RoundingMode"
-    "RowSlices"
-    "SegmentationFault"
-    "Set"
-    "Signed"
-    "Slices"
-    "Some"
-    "SpinLock"
-    "StackFrame"
-    "StackOverflowError"
-    "StackTrace"
-    "Stateful"
-    "StepRange"
-    "StepRangeLen"
-    "StridedArray"
-    "StridedMatrix"
-    "StridedVecOrMat"
-    "StridedVector"
-    "String"
-    "StringIndexError"
-    "SubArray"
-    "SubString"
-    "SubstitutionString"
-    "Symbol"
-    "SystemError"
-    "Task"
-    "TaskFailedException"
-    "Text"
-    "TextDisplay"
-    "Timer"
-    "Tmstruct"
-    "Tuple"
-    "Type"
-    "TypeError"
-    "TypeVar"
-    "UInt"
-    "UInt128"
-    "UInt16"
-    "UInt32"
-    "UInt64"
-    "UInt8"
-    "UndefInitializer"
-    "UndefKeywordError"
-    "UndefRefError"
-    "UndefVarError"
-    "Union"
-    "UnionAll"
-    "UnitRange"
-    "Unsigned"
-    "Val"
-    "VecElement"
-    "VecOrMat"
-    "Vector"
-    "VersionNumber"
-    "WeakKeyDict"
-    "WeakRef"))
+    "AbstractArray" "AbstractChannel" "AbstractChar" "AbstractDict" "AbstractDisplay"
+    "AbstractFloat" "AbstractIrrational" "AbstractLock" "AbstractMatch" "AbstractMatrix"
+    "AbstractPattern" "AbstractRange" "AbstractSet" "AbstractSlices" "AbstractString"
+    "AbstractUnitRange" "AbstractVecOrMat" "AbstractVector" "Any" "ArgumentError" "Array"
+    "AssertionError" "Atomic" "BigFloat" "BigInt" "BitArray" "BitMatrix" "BitSet" "BitVector" "Bool"
+    "BoundsError" "By" "CanonicalIndexError" "CapturedException" "CartesianIndex" "CartesianIndices"
+    "Cchar" "Cdouble" "Cfloat" "Channel" "Char" "Cint" "Cintmax_t" "Clong" "Clonglong" "Cmd" "Colon"
+    "ColumnSlices" "Complex" "ComplexF16" "ComplexF32" "ComplexF64" "ComposedFunction"
+    "CompositeException" "ConcurrencyViolationError" "Condition" "Cptrdiff_t" "Cshort" "Csize_t"
+    "Cssize_t" "Cstring" "Cuchar" "Cuint" "Cuintmax_t" "Culong" "Culonglong" "Cushort" "Cvoid"
+    "Cwchar_t" "Cwstring" "DataType" "DenseArray" "DenseMatrix" "DenseVecOrMat" "DenseVector" "Dict"
+    "DimensionMismatch" "Dims" "DivideError" "DomainError" "EOFError" "Enum" "ErrorException"
+    "Exception" "ExponentialBackOff" "Expr" "Float16" "Float32" "Float64" "Function" "GlobalRef"
+    "HTML" "IO" "IOBuffer" "IOContext" "IOStream" "IdDict" "IndexCartesian" "IndexLinear"
+    "IndexStyle" "InexactError" "InitError" "Int" "Int128" "Int16" "Int32" "Int64" "Int8" "Integer"
+    "InterruptException" "InvalidStateException" "Irrational" "KeyError" "LazyString" "LinRange"
+    "LineNumberNode" "LinearIndices" "LoadError" "Lt" "MIME" "Matrix" "Method" "MethodError"
+    "Missing" "MissingException" "Module" "NTuple" "NamedTuple" "Nothing" "Number" "Ordering"
+    "OrdinalRange" "OutOfMemoryError" "OverflowError" "Pair" "ParseError" "PartialQuickSort" "Perm"
+    "PermutedDimsArray" "Pipe" "ProcessFailedException" "Ptr" "QuoteNode" "Rational" "RawFD"
+    "ReadOnlyMemoryError" "Real" "ReentrantLock" "Ref" "Regex" "RegexMatch" "Returns"
+    "ReverseOrdering" "RoundingMode" "RowSlices" "SegmentationFault" "Set" "Signed" "Slices" "Some"
+    "SpinLock" "StackFrame" "StackOverflowError" "StackTrace" "Stateful" "StepRange" "StepRangeLen"
+    "StridedArray" "StridedMatrix" "StridedVecOrMat" "StridedVector" "String" "StringIndexError"
+    "SubArray" "SubString" "SubstitutionString" "Symbol" "SystemError" "Task" "TaskFailedException"
+    "Text" "TextDisplay" "Timer" "Tmstruct" "Tuple" "Type" "TypeError" "TypeVar" "UInt" "UInt128"
+    "UInt16" "UInt32" "UInt64" "UInt8" "UndefInitializer" "UndefKeywordError" "UndefRefError"
+    "UndefVarError" "Union" "UnionAll" "UnitRange" "Unsigned" "Val" "VecElement" "VecOrMat" "Vector"
+    "VersionNumber" "WeakKeyDict" "WeakRef"))
 
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "begin" "end")
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 2103e04df..ae7dcdf31 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -58,7 +58,11 @@
   (type_identifier) @type.definition)
 
 ((type_identifier) @type.builtin
-  (#any-of? @type.builtin "Byte" "Short" "Int" "Long" "UByte" "UShort" "UInt" "ULong" "Float" "Double" "Boolean" "Char" "String" "Array" "ByteArray" "ShortArray" "IntArray" "LongArray" "UByteArray" "UShortArray" "UIntArray" "ULongArray" "FloatArray" "DoubleArray" "BooleanArray" "CharArray" "Map" "Set" "List" "EmptyMap" "EmptySet" "EmptyList" "MutableMap" "MutableSet" "MutableList"))
+  (#any-of? @type.builtin
+    "Byte" "Short" "Int" "Long" "UByte" "UShort" "UInt" "ULong" "Float" "Double" "Boolean" "Char"
+    "String" "Array" "ByteArray" "ShortArray" "IntArray" "LongArray" "UByteArray" "UShortArray"
+    "UIntArray" "ULongArray" "FloatArray" "DoubleArray" "BooleanArray" "CharArray" "Map" "Set"
+    "List" "EmptyMap" "EmptySet" "EmptyList" "MutableMap" "MutableSet" "MutableList"))
 
 (package_header
   "package" @keyword
@@ -141,7 +145,13 @@
 (call_expression
   .
   (simple_identifier) @function.builtin
-  (#any-of? @function.builtin "arrayOf" "arrayOfNulls" "byteArrayOf" "shortArrayOf" "intArrayOf" "longArrayOf" "ubyteArrayOf" "ushortArrayOf" "uintArrayOf" "ulongArrayOf" "floatArrayOf" "doubleArrayOf" "booleanArrayOf" "charArrayOf" "emptyArray" "mapOf" "setOf" "listOf" "emptyMap" "emptySet" "emptyList" "mutableMapOf" "mutableSetOf" "mutableListOf" "print" "println" "error" "TODO" "run" "runCatching" "repeat" "lazy" "lazyOf" "enumValues" "enumValueOf" "assert" "check" "checkNotNull" "require" "requireNotNull" "with" "suspend" "synchronized"))
+  (#any-of? @function.builtin
+    "arrayOf" "arrayOfNulls" "byteArrayOf" "shortArrayOf" "intArrayOf" "longArrayOf" "ubyteArrayOf"
+    "ushortArrayOf" "uintArrayOf" "ulongArrayOf" "floatArrayOf" "doubleArrayOf" "booleanArrayOf"
+    "charArrayOf" "emptyArray" "mapOf" "setOf" "listOf" "emptyMap" "emptySet" "emptyList"
+    "mutableMapOf" "mutableSetOf" "mutableListOf" "print" "println" "error" "TODO" "run"
+    "runCatching" "repeat" "lazy" "lazyOf" "enumValues" "enumValueOf" "assert" "check"
+    "checkNotNull" "require" "requireNotNull" "with" "suspend" "synchronized"))
 
 ; Literals
 [
diff --git a/queries/linkerscript/highlights.scm b/queries/linkerscript/highlights.scm
index accaad5ca..23a483745 100644
--- a/queries/linkerscript/highlights.scm
+++ b/queries/linkerscript/highlights.scm
@@ -32,7 +32,10 @@
 
 ((call_expression
   function: (symbol) @function.builtin)
-  (#any-of? @function.builtin "ABSOLUTE" "ALIAS" "ADDR" "ALIGN" "ALIGNOF" "BASE" "BLOCK" "CHIP" "DATA_SEGMENT_ALIGN" "DATA_SEGMENT_END" "DATA_SEGMENT_RELRO_END" "END" "LENGTH" "LOADADDR" "LOG2CEIL" "MAX" "MIN" "NEXT" "ORIGIN" "SEGMENT_START" "SIZEOF" "BYTE" "FILL" "LONG" "SHORT" "QUAD" "SQUAD" "WORD"))
+  (#any-of? @function.builtin
+    "ABSOLUTE" "ALIAS" "ADDR" "ALIGN" "ALIGNOF" "BASE" "BLOCK" "CHIP" "DATA_SEGMENT_ALIGN"
+    "DATA_SEGMENT_END" "DATA_SEGMENT_RELRO_END" "END" "LENGTH" "LOADADDR" "LOG2CEIL" "MAX" "MIN"
+    "NEXT" "ORIGIN" "SEGMENT_START" "SIZEOF" "BYTE" "FILL" "LONG" "SHORT" "QUAD" "SQUAD" "WORD"))
 
 [
   "KEEP"
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 0b0bf35a8..053d8116d 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -222,16 +222,14 @@
 
 (function_call
   (identifier) @function.builtin
-  ; format-ignore
   (#any-of? @function.builtin
     ; built-in functions in Lua 5.1
-    "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
-    "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
-    "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
-    "tonumber" "tostring" "type" "unpack" "xpcall"
-    "__add" "__band" "__bnot" "__bor" "__bxor" "__call" "__concat" "__div" "__eq" "__gc"
-    "__idiv" "__index" "__le" "__len" "__lt" "__metatable" "__mod" "__mul" "__name" "__newindex"
-    "__pairs" "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
+    "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs" "load" "loadfile"
+    "loadstring" "module" "next" "pairs" "pcall" "print" "rawequal" "rawget" "rawlen" "rawset"
+    "require" "select" "setfenv" "setmetatable" "tonumber" "tostring" "type" "unpack" "xpcall"
+    "__add" "__band" "__bnot" "__bor" "__bxor" "__call" "__concat" "__div" "__eq" "__gc" "__idiv"
+    "__index" "__le" "__len" "__lt" "__metatable" "__mod" "__mul" "__name" "__newindex" "__pairs"
+    "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
 
 ; Others
 (comment) @comment @spell
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 0ffac3e18..d1dcf87d6 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -20,7 +20,8 @@
       (string
         content: _ @injection.content)))
   (#set! injection.language "vim")
-  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_command" "vim.api.nvim_exec2"))
+  (#any-of? @_vimcmd_identifier
+    "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_command" "vim.api.nvim_exec2"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index added002c..8b71a31eb 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -213,14 +213,12 @@
 
 (function_call
   (identifier) @function.builtin
-  ; format-ignore
   (#any-of? @function.builtin
     ; built-in functions in Lua 5.1
-    "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
-    "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
-    "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
-    "tonumber" "tostring" "type" "unpack" "xpcall" "typeof"
-    "__add" "__band" "__bnot" "__bor" "__bxor" "__call" "__concat" "__div" "__eq" "__gc"
+    "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs" "load" "loadfile"
+    "loadstring" "module" "next" "pairs" "pcall" "print" "rawequal" "rawget" "rawlen" "rawset"
+    "require" "select" "setfenv" "setmetatable" "tonumber" "tostring" "type" "unpack" "xpcall"
+    "typeof" "__add" "__band" "__bnot" "__bor" "__bxor" "__call" "__concat" "__div" "__eq" "__gc"
     "__idiv" "__index" "__le" "__len" "__lt" "__metatable" "__mod" "__mul" "__name" "__newindex"
     "__pairs" "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
 
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index 38adac07f..b02dc4eba 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -24,7 +24,10 @@
 (rule
   (targets
     (word) @function.builtin
-    (#any-of? @function.builtin ".DEFAULT" ".SUFFIXES" ".DELETE_ON_ERROR" ".EXPORT_ALL_VARIABLES" ".IGNORE" ".INTERMEDIATE" ".LOW_RESOLUTION_TIME" ".NOTPARALLEL" ".ONESHELL" ".PHONY" ".POSIX" ".PRECIOUS" ".SECONDARY" ".SECONDEXPANSION" ".SILENT" ".SUFFIXES")))
+    (#any-of? @function.builtin
+      ".DEFAULT" ".SUFFIXES" ".DELETE_ON_ERROR" ".EXPORT_ALL_VARIABLES" ".IGNORE" ".INTERMEDIATE"
+      ".LOW_RESOLUTION_TIME" ".NOTPARALLEL" ".ONESHELL" ".PHONY" ".POSIX" ".PRECIOUS" ".SECONDARY"
+      ".SECONDEXPANSION" ".SILENT" ".SUFFIXES")))
 
 (rule
   [
@@ -79,7 +82,10 @@
 
 (variable_assignment
   (word) @variable.builtin
-  (#any-of? @variable.builtin ".DEFAULT_GOAL" ".EXTRA_PREREQS" ".FEATURES" ".INCLUDE_DIRS" ".RECIPEPREFIX" ".SHELLFLAGS" ".VARIABLES" "MAKEARGS" "MAKEFILE_LIST" "MAKEFLAGS" "MAKE_RESTARTS" "MAKE_TERMERR" "MAKE_TERMOUT" "SHELL"))
+  (#any-of? @variable.builtin
+    ".DEFAULT_GOAL" ".EXTRA_PREREQS" ".FEATURES" ".INCLUDE_DIRS" ".RECIPEPREFIX" ".SHELLFLAGS"
+    ".VARIABLES" "MAKEARGS" "MAKEFILE_LIST" "MAKEFLAGS" "MAKE_RESTARTS" "MAKE_TERMERR"
+    "MAKE_TERMOUT" "SHELL"))
 
 ; Use string to match bash
 (variable_reference
diff --git a/queries/ninja/highlights.scm b/queries/ninja/highlights.scm
index d216c3f71..8e7268953 100644
--- a/queries/ninja/highlights.scm
+++ b/queries/ninja/highlights.scm
@@ -75,7 +75,9 @@
   (body
     (let
       name: (identifier) @constant.builtin
-      (#not-any-of? @constant.builtin "command" "depfile" "deps" "msvc_deps_prefix" "description" "dyndep" "generator" "in" "in_newline" "out" "restat" "rspfile" "rspfile_content" "pool"))))
+      (#not-any-of? @constant.builtin
+        "command" "depfile" "deps" "msvc_deps_prefix" "description" "dyndep" "generator" "in"
+        "in_newline" "out" "restat" "rspfile" "rspfile_content" "pool"))))
 
 ;
 ; Expansion
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 00db10b42..9baf8c4a7 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -112,18 +112,40 @@
 ; builtin functions (without builtins prefix)
 (variable_expression
   name: (identifier) @function.builtin
-  ; format-ignore
   (#any-of? @function.builtin
     ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
-    "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf" "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap" "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs" "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength" "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose" "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext" "unsafeGetAttrPos" "zipAttrsWith"
+    "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf"
+    "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap"
+    "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit"
+    "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile"
+    "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr"
+    "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head"
+    "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath"
+    "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName"
+    "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs"
+    "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength"
+    "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose"
+    "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext"
+    "unsafeGetAttrPos" "zipAttrsWith"
     ; primops, `__<tab>` in `nix repl`
-   "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt" "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath" "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames" "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring" "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs" "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match" "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath" "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr" "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf" "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime" "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir" "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem" "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort")
+    "__add" "__filter" "__isFunction" "__split" "__addErrorContext" "__filterSource" "__isInt"
+    "__splitVersion" "__all" "__findFile" "__isList" "__storeDir" "__any" "__floor" "__isPath"
+    "__storePath" "__appendContext" "__foldl'" "__isString" "__stringLength" "__attrNames"
+    "__fromJSON" "__langVersion" "__sub" "__attrValues" "__functionArgs" "__length" "__substring"
+    "__bitAnd" "__genList" "__lessThan" "__tail" "__bitOr" "__genericClosure" "__listToAttrs"
+    "__toFile" "__bitXor" "__getAttr" "__mapAttrs" "__toJSON" "__catAttrs" "__getContext" "__match"
+    "__toPath" "__ceil" "__getEnv" "__mul" "__toXML" "__compareVersions" "__getFlake" "__nixPath"
+    "__trace" "__concatLists" "__groupBy" "__nixVersion" "__traceVerbose" "__concatMap" "__hasAttr"
+    "__parseDrvName" "__tryEval" "__concatStringsSep" "__hasContext" "__partition" "__typeOf"
+    "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime"
+    "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir"
+    "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem"
+    "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort")
   )
 
 ; constants
 (variable_expression
   name: (identifier) @constant.builtin
-  ; format-ignore
   (#any-of? @constant.builtin
     ; nix eval --impure --expr 'with builtins; filter (x: !(isFunction builtins.${x} || isBool builtins.${x})) (attrNames builtins)'
     "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"))
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 3eba55f29..0a5f274c6 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -8,7 +8,9 @@
 ; Types
 ;------
 ((type_constructor) @type.builtin
-  (#any-of? @type.builtin "int" "char" "bytes" "string" "float" "bool" "unit" "exn" "array" "list" "option" "int32" "int64" "nativeint" "format6" "lazy_t"))
+  (#any-of? @type.builtin
+    "int" "char" "bytes" "string" "float" "bool" "unit" "exn" "array" "list" "option" "int32"
+    "int64" "nativeint" "format6" "lazy_t"))
 
 [
   (class_name)
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index b44d06429..2c3457e07 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -129,7 +129,13 @@
 
 ((type
   (identifier) @type.builtin)
-  (#any-of? @type.builtin "bool" "byte" "b8" "b16" "b32" "b64" "int" "i8" "i16" "i32" "i64" "i128" "uint" "u8" "u16" "u32" "u64" "u128" "uintptr" "i16le" "i32le" "i64le" "i128le" "u16le" "u32le" "u64le" "u128le" "i16be" "i32be" "i64be" "i128be" "u16be" "u32be" "u64be" "u128be" "float" "double" "f16" "f32" "f64" "f16le" "f32le" "f64le" "f16be" "f32be" "f64be" "complex32" "complex64" "complex128" "complex_float" "complex_double" "quaternion64" "quaternion128" "quaternion256" "rune" "string" "cstring" "rawptr" "typeid" "any"))
+  (#any-of? @type.builtin
+    "bool" "byte" "b8" "b16" "b32" "b64" "int" "i8" "i16" "i32" "i64" "i128" "uint" "u8" "u16" "u32"
+    "u64" "u128" "uintptr" "i16le" "i32le" "i64le" "i128le" "u16le" "u32le" "u64le" "u128le" "i16be"
+    "i32be" "i64be" "i128be" "u16be" "u32be" "u64be" "u128be" "float" "double" "f16" "f32" "f64"
+    "f16le" "f32le" "f64le" "f16be" "f32be" "f64be" "complex32" "complex64" "complex128"
+    "complex_float" "complex_double" "quaternion64" "quaternion128" "quaternion256" "rune" "string"
+    "cstring" "rawptr" "typeid" "any"))
 
 "..." @type.builtin
 
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 4a50cd7c0..1b0dc2dc1 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -169,7 +169,16 @@
   (expression_statement
     (bareword))
 ] @function.builtin
-  (#any-of? @function.builtin "accept" "atan2" "bind" "binmode" "bless" "crypt" "chmod" "chown" "connect" "die" "dbmopen" "exec" "fcntl" "flock" "formline" "getpriority" "getprotobynumber" "gethostbyaddr" "getnetbyaddr" "getservbyname" "getservbyport" "getsockopt" "glob" "index" "ioctl" "join" "kill" "link" "listen" "mkdir" "msgctl" "msgget" "msgrcv" "msgsend" "open" "opendir" "print" "printf" "push" "pack" "pipe" "return" "rename" "rindex" "read" "recv" "reverse" "say" "select" "seek" "semctl" "semget" "semop" "send" "setpgrp" "setpriority" "seekdir" "setsockopt" "shmctl" "shmread" "shmwrite" "shutdown" "socket" "socketpair" "split" "sprintf" "splice" "substr" "system" "symlink" "syscall" "sysopen" "sysseek" "sysread" "syswrite" "tie" "truncate" "unlink" "unpack" "utime" "unshift" "vec" "warn" "waitpid"))
+  (#any-of? @function.builtin
+    "accept" "atan2" "bind" "binmode" "bless" "crypt" "chmod" "chown" "connect" "die" "dbmopen"
+    "exec" "fcntl" "flock" "formline" "getpriority" "getprotobynumber" "gethostbyaddr"
+    "getnetbyaddr" "getservbyname" "getservbyport" "getsockopt" "glob" "index" "ioctl" "join" "kill"
+    "link" "listen" "mkdir" "msgctl" "msgget" "msgrcv" "msgsend" "open" "opendir" "print" "printf"
+    "push" "pack" "pipe" "return" "rename" "rindex" "read" "recv" "reverse" "say" "select" "seek"
+    "semctl" "semget" "semop" "send" "setpgrp" "setpriority" "seekdir" "setsockopt" "shmctl"
+    "shmread" "shmwrite" "shutdown" "socket" "socketpair" "split" "sprintf" "splice" "substr"
+    "system" "symlink" "syscall" "sysopen" "sysseek" "sysread" "syswrite" "tie" "truncate" "unlink"
+    "unpack" "utime" "unshift" "vec" "warn" "waitpid"))
 
 (function) @function
 
@@ -187,7 +196,8 @@
   (varname)
   (filehandle)
 ] @variable.builtin
-  (#any-of? @variable.builtin "ENV" "ARGV" "INC" "ARGVOUT" "SIG" "STDIN" "STDOUT" "STDERR" "a" "b" "_"))
+  (#any-of? @variable.builtin
+    "ENV" "ARGV" "INC" "ARGVOUT" "SIG" "STDIN" "STDOUT" "STDERR" "a" "b" "_"))
 
 ((varname) @variable.builtin
   ; highlights all the reserved ^ vars like ${^THINGS}
diff --git a/queries/php_only/injections.scm b/queries/php_only/injections.scm
index 828eb9d38..8e60cdd34 100644
--- a/queries/php_only/injections.scm
+++ b/queries/php_only/injections.scm
@@ -35,7 +35,9 @@
         (_
           (string_value) @injection.content))))
   (#set! injection.language "bash")
-  (#any-of? @_shell_func_identifier "shell_exec" "escapeshellarg" "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec" "system"))
+  (#any-of? @_shell_func_identifier
+    "shell_exec" "escapeshellarg" "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec"
+    "system"))
 
 (expression_statement
   (shell_command_expression
diff --git a/queries/pug/highlights.scm b/queries/pug/highlights.scm
index 8441b737e..e32cb21e1 100644
--- a/queries/pug/highlights.scm
+++ b/queries/pug/highlights.scm
@@ -4,18 +4,16 @@
 
 ((tag_name) @constant.builtin
   ; https://www.script-example.com/html-tag-liste
-  ; format-ignore
   (#any-of? @constant.builtin
-    "head" "title" "base" "link" "meta" "style"
-    "body" "article" "section" "nav" "aside" "h1" "h2" "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address"
-    "p" "hr" "pre" "blockquote" "ol" "ul" "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div"
-    "a" "em" "strong" "small" "s" "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i" "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr"
-    "ins" "del"
-    "picture" "source" "img" "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area"
-    "table" "caption" "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th "
-    "form" "label" "input" "button" "select" "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
-    "details" "summary" "dialog"
-    "script" "noscript" "template" "slot" "canvas"))
+    "head" "title" "base" "link" "meta" "style" "body" "article" "section" "nav" "aside" "h1" "h2"
+    "h3" "h4" "h5" "h6" "hgroup" "header" "footer" "address" "p" "hr" "pre" "blockquote" "ol" "ul"
+    "menu" "li" "dl" "dt" "dd" "figure" "figcaption" "main" "div" "a" "em" "strong" "small" "s"
+    "cite" "q" "dfn" "abbr" "ruby" "rt" "rp" "data" "time" "code" "var" "samp" "kbd" "sub" "sup" "i"
+    "b" "u" "mark" "bdi" "bdo" "span" "br" "wbr" "ins" "del" "picture" "source" "img" "iframe"
+    "embed" "object" "param" "video" "audio" "track" "map" "area" "table" "caption" "colgroup" "col"
+    "tbody" "thead" "tfoot" "tr" "td" "th " "form" "label" "input" "button" "select" "datalist"
+    "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend" "details"
+    "summary" "dialog" "script" "noscript" "template" "slot" "canvas"))
 
 (id) @constant
 
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index e34cc883c..582e50764 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -133,7 +133,9 @@
   (#lua-match? @type "^[A-Z]"))
 
 ((identifier) @type.builtin
-  (#any-of? @type.builtin "Boolean" "Integer" "Float" "String" "Array" "Hash" "Regexp" "Variant" "Data" "Undef" "Default" "File"))
+  (#any-of? @type.builtin
+    "Boolean" "Integer" "Float" "String" "Array" "Hash" "Regexp" "Variant" "Data" "Undef" "Default"
+    "File"))
 
 ; "Namespaces"
 (class_identifier
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 0c7147b51..fea97bed3 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -17,11 +17,9 @@
   (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
-  ; format-ignore
-  (#any-of? @constant.builtin 
+  (#any-of? @constant.builtin
     ; https://docs.python.org/3/library/constants.html
-    "NotImplemented" "Ellipsis" 
-    "quit" "exit" "copyright" "credits" "license"))
+    "NotImplemented" "Ellipsis" "quit" "exit" "copyright" "credits" "license"))
 
 "_" @constant.builtin ; match wildcard
 
@@ -89,7 +87,14 @@
 ; Builtin functions
 ((call
   function: (identifier) @function.builtin)
-  (#any-of? @function.builtin "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+  (#any-of? @function.builtin
+    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr"
+    "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec"
+    "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id"
+    "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview"
+    "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed"
+    "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type"
+    "vars" "zip" "__import__"))
 
 ; Function definitions
 (function_definition
@@ -408,23 +413,24 @@
   (#any-of? @constructor "__new__" "__init__"))
 
 ((identifier) @type.builtin
-  ; format-ignore
   (#any-of? @type.builtin
     ; https://docs.python.org/3/library/exceptions.html
-    "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-    "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
-    "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-    "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-    "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-    "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-    "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-    "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-    "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+    "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError"
+    "AttributeError" "EOFError" "FloatingPointError" "GeneratorExit" "ImportError"
+    "ModuleNotFoundError" "IndexError" "KeyError" "KeyboardInterrupt" "MemoryError" "NameError"
+    "NotImplementedError" "OSError" "OverflowError" "RecursionError" "ReferenceError" "RuntimeError"
+    "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError" "SystemError"
+    "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError"
+    "UnicodeDecodeError" "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError"
+    "IOError" "WindowsError" "BlockingIOError" "ChildProcessError" "ConnectionError"
+    "BrokenPipeError" "ConnectionAbortedError" "ConnectionRefusedError" "ConnectionResetError"
+    "FileExistsError" "FileNotFoundError" "InterruptedError" "IsADirectoryError"
+    "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
     "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
     "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
     ; https://docs.python.org/3/library/stdtypes.html
-    "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-    "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str" "bytes" "bytearray" "memoryview"
+    "set" "frozenset" "dict" "type" "object"))
 
 ; Regex from the `re` module
 (call
diff --git a/queries/query/indents.scm b/queries/query/indents.scm
index 2ce40d299..d1cdb3eef 100644
--- a/queries/query/indents.scm
+++ b/queries/query/indents.scm
@@ -2,7 +2,7 @@
   (list)
   (named_node)
   (grouping)
-  (predicate) ; WIP to newline wrap any-of?
+  (predicate)
   "["
 ] @indent.begin
 
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index f84af9182..30e4cb4c8 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -75,12 +75,535 @@
 (list
   .
   (symbol) @keyword
-  (#any-of? @keyword "#%app" "#%datum" "#%declare" "#%expression" "#%module-begin" "#%plain-app" "#%plain-lambda" "#%plain-module-begin" "#%printing-module-begin" "#%provide" "#%require" "#%stratified-body" "#%top" "#%top-interaction" "#%variable-reference" "->" "->*" "->*m" "->d" "->dm" "->i" "->m" "..." ":do-in" "==" "=>" "_" "absent" "abstract" "all-defined-out" "all-from-out" "and" "any" "augment" "augment*" "augment-final" "augment-final*" "augride" "augride*" "begin" "begin-for-syntax" "begin0" "case" "case->" "case->m" "case-lambda" "class" "class*" "class-field-accessor" "class-field-mutator" "class/c" "class/derived" "combine-in" "combine-out" "command-line" "compound-unit" "compound-unit/infer" "cond" "cons/dc" "contract" "contract-out" "contract-pos/neg-doubling" "contract-struct" "contracted" "current-contract-region" "define" "define-compound-unit" "define-compound-unit/infer" "define-contract-struct" "define-custom-hash-types" "define-custom-set-types" "define-for-syntax" "define-local-member-name" "define-logger" "define-match-expander" "define-member-name" "define-module-boundary-contract" "define-namespace-anchor" "define-opt/c" "define-sequence-syntax" "define-serializable-class" "define-serializable-class*" "define-signature" "define-signature-form" "define-splicing-for-clause-syntax" "define-struct" "define-struct/contract" "define-struct/derived" "define-syntax" "define-syntax-rule" "define-syntaxes" "define-unit" "define-unit-binding" "define-unit-from-context" "define-unit/contract" "define-unit/new-import-export" "define-unit/s" "define-values" "define-values-for-export" "define-values-for-syntax" "define-values/invoke-unit" "define-values/invoke-unit/infer" "define/augment" "define/augment-final" "define/augride" "define/contract" "define/final-prop" "define/match" "define/overment" "define/override" "define/override-final" "define/private" "define/public" "define/public-final" "define/pubment" "define/subexpression-pos-prop" "define/subexpression-pos-prop/name" "delay" "delay/idle" "delay/name" "delay/strict" "delay/sync" "delay/thread" "do" "else" "except" "except-in" "except-out" "export" "extends" "failure-cont" "field" "field-bound?" "file" "flat-murec-contract" "flat-rec-contract" "for" "for*" "for*/and" "for*/async" "for*/first" "for*/fold" "for*/fold/derived" "for*/foldr" "for*/foldr/derived" "for*/hash" "for*/hasheq" "for*/hasheqv" "for*/last" "for*/list" "for*/lists" "for*/mutable-set" "for*/mutable-seteq" "for*/mutable-seteqv" "for*/or" "for*/product" "for*/set" "for*/seteq" "for*/seteqv" "for*/stream" "for*/sum" "for*/vector" "for*/weak-set" "for*/weak-seteq" "for*/weak-seteqv" "for-label" "for-meta" "for-space" "for-syntax" "for-template" "for/and" "for/async" "for/first" "for/fold" "for/fold/derived" "for/foldr" "for/foldr/derived" "for/hash" "for/hasheq" "for/hasheqv" "for/last" "for/list" "for/lists" "for/mutable-set" "for/mutable-seteq" "for/mutable-seteqv" "for/or" "for/product" "for/set" "for/seteq" "for/seteqv" "for/stream" "for/sum" "for/vector" "for/weak-set" "for/weak-seteq" "for/weak-seteqv" "gen:custom-write" "gen:dict" "gen:equal+hash" "gen:set" "gen:stream" "generic" "get-field" "hash/dc" "if" "implies" "import" "include" "include-at/relative-to" "include-at/relative-to/reader" "include/reader" "inherit" "inherit-field" "inherit/inner" "inherit/super" "init" "init-depend" "init-field" "init-rest" "inner" "inspect" "instantiate" "interface" "interface*" "invariant-assertion" "invoke-unit" "invoke-unit/infer" "lambda" "lazy" "let" "let*" "let*-values" "let-syntax" "let-syntaxes" "let-values" "let/cc" "let/ec" "letrec" "letrec-syntax" "letrec-syntaxes" "letrec-syntaxes+values" "letrec-values" "lib" "link" "local" "local-require" "log-debug" "log-error" "log-fatal" "log-info" "log-warning" "match" "match*" "match*/derived" "match-define" "match-define-values" "match-lambda" "match-lambda*" "match-lambda**" "match-let" "match-let*" "match-let*-values" "match-let-values" "match-letrec" "match-letrec-values" "match/derived" "match/values" "member-name-key" "mixin" "module" "module*" "module+" "nand" "new" "nor" "object-contract" "object/c" "only" "only-in" "only-meta-in" "only-space-in" "open" "opt/c" "or" "overment" "overment*" "override" "override*" "override-final" "override-final*" "parameterize" "parameterize*" "parameterize-break" "parametric->/c" "place" "place*" "place/context" "planet" "prefix" "prefix-in" "prefix-out" "private" "private*" "prompt-tag/c" "prop:dict/contract" "protect-out" "provide" "provide-signature-elements" "provide/contract" "public" "public*" "public-final" "public-final*" "pubment" "pubment*" "quasiquote" "quasisyntax" "quasisyntax/loc" "quote" "quote-syntax" "quote-syntax/prune" "recontract-out" "recursive-contract" "relative-in" "rename" "rename-in" "rename-inner" "rename-out" "rename-super" "require" "send" "send*" "send+" "send-generic" "send/apply" "send/keyword-apply" "set!" "set!-values" "set-field!" "shared" "stream" "stream*" "stream-cons" "stream-lazy" "struct" "struct*" "struct-copy" "struct-field-index" "struct-guard/c" "struct-out" "struct/c" "struct/contract" "struct/ctc" "struct/dc" "struct/derived" "submod" "super" "super-instantiate" "super-make-object" "super-new" "syntax" "syntax-case" "syntax-case*" "syntax-id-rules" "syntax-rules" "syntax/loc" "tag" "this" "this%" "thunk" "thunk*" "time" "unconstrained-domain->" "unit" "unit-from-context" "unit/c" "unit/new-import-export" "unit/s" "unless" "unquote" "unquote-splicing" "unsyntax" "unsyntax-splicing" "values/drop" "when" "with-continuation-mark" "with-contract" "with-contract-continuation-mark" "with-handlers" "with-handlers*" "with-method" "with-syntax" "~?" "~@" "λ")
+  (#any-of? @keyword
+    "#%app" "#%datum" "#%declare" "#%expression" "#%module-begin" "#%plain-app" "#%plain-lambda"
+    "#%plain-module-begin" "#%printing-module-begin" "#%provide" "#%require" "#%stratified-body"
+    "#%top" "#%top-interaction" "#%variable-reference" "->" "->*" "->*m" "->d" "->dm" "->i" "->m"
+    "..." ":do-in" "==" "=>" "_" "absent" "abstract" "all-defined-out" "all-from-out" "and" "any"
+    "augment" "augment*" "augment-final" "augment-final*" "augride" "augride*" "begin"
+    "begin-for-syntax" "begin0" "case" "case->" "case->m" "case-lambda" "class" "class*"
+    "class-field-accessor" "class-field-mutator" "class/c" "class/derived" "combine-in"
+    "combine-out" "command-line" "compound-unit" "compound-unit/infer" "cond" "cons/dc" "contract"
+    "contract-out" "contract-pos/neg-doubling" "contract-struct" "contracted"
+    "current-contract-region" "define" "define-compound-unit" "define-compound-unit/infer"
+    "define-contract-struct" "define-custom-hash-types" "define-custom-set-types"
+    "define-for-syntax" "define-local-member-name" "define-logger" "define-match-expander"
+    "define-member-name" "define-module-boundary-contract" "define-namespace-anchor" "define-opt/c"
+    "define-sequence-syntax" "define-serializable-class" "define-serializable-class*"
+    "define-signature" "define-signature-form" "define-splicing-for-clause-syntax" "define-struct"
+    "define-struct/contract" "define-struct/derived" "define-syntax" "define-syntax-rule"
+    "define-syntaxes" "define-unit" "define-unit-binding" "define-unit-from-context"
+    "define-unit/contract" "define-unit/new-import-export" "define-unit/s" "define-values"
+    "define-values-for-export" "define-values-for-syntax" "define-values/invoke-unit"
+    "define-values/invoke-unit/infer" "define/augment" "define/augment-final" "define/augride"
+    "define/contract" "define/final-prop" "define/match" "define/overment" "define/override"
+    "define/override-final" "define/private" "define/public" "define/public-final" "define/pubment"
+    "define/subexpression-pos-prop" "define/subexpression-pos-prop/name" "delay" "delay/idle"
+    "delay/name" "delay/strict" "delay/sync" "delay/thread" "do" "else" "except" "except-in"
+    "except-out" "export" "extends" "failure-cont" "field" "field-bound?" "file"
+    "flat-murec-contract" "flat-rec-contract" "for" "for*" "for*/and" "for*/async" "for*/first"
+    "for*/fold" "for*/fold/derived" "for*/foldr" "for*/foldr/derived" "for*/hash" "for*/hasheq"
+    "for*/hasheqv" "for*/last" "for*/list" "for*/lists" "for*/mutable-set" "for*/mutable-seteq"
+    "for*/mutable-seteqv" "for*/or" "for*/product" "for*/set" "for*/seteq" "for*/seteqv"
+    "for*/stream" "for*/sum" "for*/vector" "for*/weak-set" "for*/weak-seteq" "for*/weak-seteqv"
+    "for-label" "for-meta" "for-space" "for-syntax" "for-template" "for/and" "for/async" "for/first"
+    "for/fold" "for/fold/derived" "for/foldr" "for/foldr/derived" "for/hash" "for/hasheq"
+    "for/hasheqv" "for/last" "for/list" "for/lists" "for/mutable-set" "for/mutable-seteq"
+    "for/mutable-seteqv" "for/or" "for/product" "for/set" "for/seteq" "for/seteqv" "for/stream"
+    "for/sum" "for/vector" "for/weak-set" "for/weak-seteq" "for/weak-seteqv" "gen:custom-write"
+    "gen:dict" "gen:equal+hash" "gen:set" "gen:stream" "generic" "get-field" "hash/dc" "if"
+    "implies" "import" "include" "include-at/relative-to" "include-at/relative-to/reader"
+    "include/reader" "inherit" "inherit-field" "inherit/inner" "inherit/super" "init" "init-depend"
+    "init-field" "init-rest" "inner" "inspect" "instantiate" "interface" "interface*"
+    "invariant-assertion" "invoke-unit" "invoke-unit/infer" "lambda" "lazy" "let" "let*"
+    "let*-values" "let-syntax" "let-syntaxes" "let-values" "let/cc" "let/ec" "letrec"
+    "letrec-syntax" "letrec-syntaxes" "letrec-syntaxes+values" "letrec-values" "lib" "link" "local"
+    "local-require" "log-debug" "log-error" "log-fatal" "log-info" "log-warning" "match" "match*"
+    "match*/derived" "match-define" "match-define-values" "match-lambda" "match-lambda*"
+    "match-lambda**" "match-let" "match-let*" "match-let*-values" "match-let-values" "match-letrec"
+    "match-letrec-values" "match/derived" "match/values" "member-name-key" "mixin" "module"
+    "module*" "module+" "nand" "new" "nor" "object-contract" "object/c" "only" "only-in"
+    "only-meta-in" "only-space-in" "open" "opt/c" "or" "overment" "overment*" "override" "override*"
+    "override-final" "override-final*" "parameterize" "parameterize*" "parameterize-break"
+    "parametric->/c" "place" "place*" "place/context" "planet" "prefix" "prefix-in" "prefix-out"
+    "private" "private*" "prompt-tag/c" "prop:dict/contract" "protect-out" "provide"
+    "provide-signature-elements" "provide/contract" "public" "public*" "public-final"
+    "public-final*" "pubment" "pubment*" "quasiquote" "quasisyntax" "quasisyntax/loc" "quote"
+    "quote-syntax" "quote-syntax/prune" "recontract-out" "recursive-contract" "relative-in" "rename"
+    "rename-in" "rename-inner" "rename-out" "rename-super" "require" "send" "send*" "send+"
+    "send-generic" "send/apply" "send/keyword-apply" "set!" "set!-values" "set-field!" "shared"
+    "stream" "stream*" "stream-cons" "stream-lazy" "struct" "struct*" "struct-copy"
+    "struct-field-index" "struct-guard/c" "struct-out" "struct/c" "struct/contract" "struct/ctc"
+    "struct/dc" "struct/derived" "submod" "super" "super-instantiate" "super-make-object"
+    "super-new" "syntax" "syntax-case" "syntax-case*" "syntax-id-rules" "syntax-rules" "syntax/loc"
+    "tag" "this" "this%" "thunk" "thunk*" "time" "unconstrained-domain->" "unit" "unit-from-context"
+    "unit/c" "unit/new-import-export" "unit/s" "unless" "unquote" "unquote-splicing" "unsyntax"
+    "unsyntax-splicing" "values/drop" "when" "with-continuation-mark" "with-contract"
+    "with-contract-continuation-mark" "with-handlers" "with-handlers*" "with-method" "with-syntax"
+    "~?" "~@" "λ")
   )
 
 ; builtin procedures
 ((symbol) @function.builtin
-  (#any-of? @function.builtin "*" "*list/c" "+" "-" "/" "<" "</c" "<=" "<=/c" "=" "=/c" ">" ">/c" ">=" ">=/c" "abort-current-continuation" "abs" "absolute-path?" "acos" "add-between" "add1" "alarm-evt" "and/c" "andmap" "angle" "any/c" "append" "append*" "append-map" "apply" "argmax" "argmin" "arithmetic-shift" "arity-at-least" "arity-at-least-value" "arity-at-least?" "arity-checking-wrapper" "arity-includes?" "arity=?" "arrow-contract-info" "arrow-contract-info-accepts-arglist" "arrow-contract-info-chaperone-procedure" "arrow-contract-info-check-first-order" "arrow-contract-info?" "asin" "assert-unreachable" "assf" "assoc" "assq" "assv" "atan" "bad-number-of-results" "banner" "base->-doms/c" "base->-rngs/c" "base->?" "between/c" "bitwise-and" "bitwise-bit-field" "bitwise-bit-set?" "bitwise-ior" "bitwise-not" "bitwise-xor" "blame-add-car-context" "blame-add-cdr-context" "blame-add-context" "blame-add-missing-party" "blame-add-nth-arg-context" "blame-add-range-context" "blame-add-unknown-context" "blame-context" "blame-contract" "blame-fmt->-string" "blame-missing-party?" "blame-negative" "blame-original?" "blame-positive" "blame-replace-negative" "blame-replaced-negative?" "blame-source" "blame-swap" "blame-swapped?" "blame-update" "blame-value" "blame?" "boolean=?" "boolean?" "bound-identifier=?" "box" "box-cas!" "box-immutable" "box-immutable/c" "box/c" "box?" "break-enabled" "break-parameterization?" "break-thread" "build-chaperone-contract-property" "build-compound-type-name" "build-contract-property" "build-flat-contract-property" "build-list" "build-path" "build-path/convention-type" "build-string" "build-vector" "byte-pregexp" "byte-pregexp?" "byte-ready?" "byte-regexp" "byte-regexp?" "byte?" "bytes" "bytes->immutable-bytes" "bytes->list" "bytes->path" "bytes->path-element" "bytes->string/latin-1" "bytes->string/locale" "bytes->string/utf-8" "bytes-append" "bytes-append*" "bytes-close-converter" "bytes-convert" "bytes-convert-end" "bytes-converter?" "bytes-copy" "bytes-copy!" "bytes-environment-variable-name?" "bytes-fill!" "bytes-join" "bytes-length" "bytes-no-nuls?" "bytes-open-converter" "bytes-ref" "bytes-set!" "bytes-utf-8-index" "bytes-utf-8-length" "bytes-utf-8-ref" "bytes<?" "bytes=?" "bytes>?" "bytes?" "caaaar" "caaadr" "caaar" "caadar" "caaddr" "caadr" "caar" "cadaar" "cadadr" "cadar" "caddar" "cadddr" "caddr" "cadr" "call-in-continuation" "call-in-nested-thread" "call-with-atomic-output-file" "call-with-break-parameterization" "call-with-composable-continuation" "call-with-continuation-barrier" "call-with-continuation-prompt" "call-with-current-continuation" "call-with-default-reading-parameterization" "call-with-escape-continuation" "call-with-exception-handler" "call-with-file-lock/timeout" "call-with-immediate-continuation-mark" "call-with-input-bytes" "call-with-input-file" "call-with-input-file*" "call-with-input-string" "call-with-output-bytes" "call-with-output-file" "call-with-output-file*" "call-with-output-string" "call-with-parameterization" "call-with-semaphore" "call-with-semaphore/enable-break" "call-with-values" "call/cc" "call/ec" "car" "cartesian-product" "cdaaar" "cdaadr" "cdaar" "cdadar" "cdaddr" "cdadr" "cdar" "cddaar" "cddadr" "cddar" "cdddar" "cddddr" "cdddr" "cddr" "cdr" "ceiling" "channel-get" "channel-put" "channel-put-evt" "channel-put-evt?" "channel-try-get" "channel/c" "channel?" "chaperone-box" "chaperone-channel" "chaperone-continuation-mark-key" "chaperone-contract-property?" "chaperone-contract?" "chaperone-evt" "chaperone-hash" "chaperone-hash-set" "chaperone-of?" "chaperone-procedure" "chaperone-procedure*" "chaperone-prompt-tag" "chaperone-struct" "chaperone-struct-type" "chaperone-vector" "chaperone-vector*" "chaperone?" "char->integer" "char-alphabetic?" "char-blank?" "char-ci<=?" "char-ci<?" "char-ci=?" "char-ci>=?" "char-ci>?" "char-downcase" "char-foldcase" "char-general-category" "char-graphic?" "char-in" "char-in/c" "char-iso-control?" "char-lower-case?" "char-numeric?" "char-punctuation?" "char-ready?" "char-symbolic?" "char-title-case?" "char-titlecase" "char-upcase" "char-upper-case?" "char-utf-8-length" "char-whitespace?" "char<=?" "char<?" "char=?" "char>=?" "char>?" "char?" "check-duplicate-identifier" "check-duplicates" "checked-procedure-check-and-extract" "choice-evt" "class->interface" "class-info" "class-seal" "class-unseal" "class?" "cleanse-path" "close-input-port" "close-output-port" "coerce-chaperone-contract" "coerce-chaperone-contracts" "coerce-contract" "coerce-contract/f" "coerce-contracts" "coerce-flat-contract" "coerce-flat-contracts" "collect-garbage" "collection-file-path" "collection-path" "combinations" "combine-output" "compile" "compile-allow-set!-undefined" "compile-context-preservation-enabled" "compile-enforce-module-constants" "compile-syntax" "compile-target-machine?" "compiled-expression-recompile" "compiled-expression?" "compiled-module-expression?" "complete-path?" "complex?" "compose" "compose1" "conjoin" "conjugate" "cons" "cons/c" "cons?" "const" "continuation-mark-key/c" "continuation-mark-key?" "continuation-mark-set->context" "continuation-mark-set->iterator" "continuation-mark-set->list" "continuation-mark-set->list*" "continuation-mark-set-first" "continuation-mark-set?" "continuation-marks" "continuation-prompt-available?" "continuation-prompt-tag?" "continuation?" "contract-custom-write-property-proc" "contract-equivalent?" "contract-exercise" "contract-first-order" "contract-first-order-passes?" "contract-late-neg-projection" "contract-name" "contract-proc" "contract-projection" "contract-property?" "contract-random-generate" "contract-random-generate-env?" "contract-random-generate-fail?" "contract-random-generate-get-current-environment" "contract-random-generate-stash" "contract-random-generate/choose" "contract-stronger?" "contract-struct-exercise" "contract-struct-generate" "contract-struct-late-neg-projection" "contract-struct-list-contract?" "contract-val-first-projection" "contract?" "convert-stream" "copy-directory/files" "copy-file" "copy-port" "cos" "cosh" "count" "current-blame-format" "current-break-parameterization" "current-code-inspector" "current-command-line-arguments" "current-compile" "current-compile-realm" "current-compile-target-machine" "current-compiled-file-roots" "current-continuation-marks" "current-custodian" "current-directory" "current-directory-for-user" "current-drive" "current-environment-variables" "current-error-message-adjuster" "current-error-port" "current-eval" "current-evt-pseudo-random-generator" "current-force-delete-permissions" "current-future" "current-gc-milliseconds" "current-get-interaction-evt" "current-get-interaction-input-port" "current-inexact-milliseconds" "current-inexact-monotonic-milliseconds" "current-input-port" "current-inspector" "current-library-collection-links" "current-library-collection-paths" "current-load" "current-load-extension" "current-load-relative-directory" "current-load/use-compiled" "current-locale" "current-logger" "current-memory-use" "current-milliseconds" "current-module-declare-name" "current-module-declare-source" "current-module-name-resolver" "current-module-path-for-load" "current-namespace" "current-output-port" "current-parameterization" "current-plumber" "current-preserved-thread-cell-values" "current-print" "current-process-milliseconds" "current-prompt-read" "current-pseudo-random-generator" "current-read-interaction" "current-reader-guard" "current-readtable" "current-seconds" "current-security-guard" "current-subprocess-custodian-mode" "current-subprocess-keep-file-descriptors" "current-thread" "current-thread-group" "current-thread-initial-stack-size" "current-write-relative-directory" "curry" "curryr" "custodian-box-value" "custodian-box?" "custodian-limit-memory" "custodian-managed-list" "custodian-memory-accounting-available?" "custodian-require-memory" "custodian-shut-down?" "custodian-shutdown-all" "custodian?" "custom-print-quotable-accessor" "custom-print-quotable?" "custom-write-accessor" "custom-write-property-proc" "custom-write?" "date" "date*" "date*-nanosecond" "date*-time-zone-name" "date*?" "date-day" "date-dst?" "date-hour" "date-minute" "date-month" "date-second" "date-time-zone-offset" "date-week-day" "date-year" "date-year-day" "date?" "datum->syntax" "datum-intern-literal" "default-continuation-prompt-tag" "degrees->radians" "delete-directory" "delete-directory/files" "delete-file" "denominator" "dict->list" "dict-can-functional-set?" "dict-can-remove-keys?" "dict-clear" "dict-clear!" "dict-copy" "dict-count" "dict-empty?" "dict-for-each" "dict-has-key?" "dict-implements/c" "dict-implements?" "dict-iter-contract" "dict-iterate-first" "dict-iterate-key" "dict-iterate-next" "dict-iterate-value" "dict-key-contract" "dict-keys" "dict-map" "dict-mutable?" "dict-ref" "dict-ref!" "dict-remove" "dict-remove!" "dict-set" "dict-set!" "dict-set*" "dict-set*!" "dict-update" "dict-update!" "dict-value-contract" "dict-values" "dict?" "directory-exists?" "directory-list" "disjoin" "display" "display-lines" "display-lines-to-file" "display-to-file" "displayln" "double-flonum?" "drop" "drop-common-prefix" "drop-right" "dropf" "dropf-right" "dump-memory-stats" "dup-input-port" "dup-output-port" "dynamic->*" "dynamic-get-field" "dynamic-object/c" "dynamic-place" "dynamic-place*" "dynamic-require" "dynamic-require-for-syntax" "dynamic-send" "dynamic-set-field!" "dynamic-wind" "eighth" "empty?" "environment-variables-copy" "environment-variables-names" "environment-variables-ref" "environment-variables-set!" "environment-variables?" "eof-evt" "eof-object?" "ephemeron-value" "ephemeron?" "eprintf" "eq-contract-val" "eq-contract?" "eq-hash-code" "eq?" "equal-contract-val" "equal-contract?" "equal-hash-code" "equal-secondary-hash-code" "equal?" "equal?/recur" "eqv-hash-code" "eqv?" "error" "error-contract->adjusted-string" "error-display-handler" "error-escape-handler" "error-message->adjusted-string" "error-print-context-length" "error-print-source-location" "error-print-width" "error-syntax->string-handler" "error-value->string-handler" "eval" "eval-jit-enabled" "eval-syntax" "even?" "evt/c" "evt?" "exact->inexact" "exact-ceiling" "exact-floor" "exact-integer?" "exact-nonnegative-integer?" "exact-positive-integer?" "exact-round" "exact-truncate" "exact?" "executable-yield-handler" "exit" "exit-handler" "exn" "exn-continuation-marks" "exn-message" "exn:break" "exn:break-continuation" "exn:break:hang-up" "exn:break:hang-up?" "exn:break:terminate" "exn:break:terminate?" "exn:break?" "exn:fail" "exn:fail:contract" "exn:fail:contract:arity" "exn:fail:contract:arity?" "exn:fail:contract:blame" "exn:fail:contract:blame-object" "exn:fail:contract:blame?" "exn:fail:contract:continuation" "exn:fail:contract:continuation?" "exn:fail:contract:divide-by-zero" "exn:fail:contract:divide-by-zero?" "exn:fail:contract:non-fixnum-result" "exn:fail:contract:non-fixnum-result?" "exn:fail:contract:variable" "exn:fail:contract:variable-id" "exn:fail:contract:variable?" "exn:fail:contract?" "exn:fail:filesystem" "exn:fail:filesystem:errno" "exn:fail:filesystem:errno-errno" "exn:fail:filesystem:errno?" "exn:fail:filesystem:exists" "exn:fail:filesystem:exists?" "exn:fail:filesystem:missing-module" "exn:fail:filesystem:missing-module-path" "exn:fail:filesystem:missing-module?" "exn:fail:filesystem:version" "exn:fail:filesystem:version?" "exn:fail:filesystem?" "exn:fail:network" "exn:fail:network:errno" "exn:fail:network:errno-errno" "exn:fail:network:errno?" "exn:fail:network?" "exn:fail:object" "exn:fail:object?" "exn:fail:out-of-memory" "exn:fail:out-of-memory?" "exn:fail:read" "exn:fail:read-srclocs" "exn:fail:read:eof" "exn:fail:read:eof?" "exn:fail:read:non-char" "exn:fail:read:non-char?" "exn:fail:read?" "exn:fail:syntax" "exn:fail:syntax-exprs" "exn:fail:syntax:missing-module" "exn:fail:syntax:missing-module-path" "exn:fail:syntax:missing-module?" "exn:fail:syntax:unbound" "exn:fail:syntax:unbound?" "exn:fail:syntax?" "exn:fail:unsupported" "exn:fail:unsupported?" "exn:fail:user" "exn:fail:user?" "exn:fail?" "exn:misc:match?" "exn:missing-module-accessor" "exn:missing-module?" "exn:srclocs-accessor" "exn:srclocs?" "exn?" "exp" "expand" "expand-once" "expand-syntax" "expand-syntax-once" "expand-syntax-to-top-form" "expand-to-top-form" "expand-user-path" "explode-path" "expt" "false?" "field-names" "fifth" "file->bytes" "file->bytes-lines" "file->lines" "file->list" "file->string" "file->value" "file-exists?" "file-name-from-path" "file-or-directory-identity" "file-or-directory-modify-seconds" "file-or-directory-permissions" "file-or-directory-stat" "file-or-directory-type" "file-position" "file-position*" "file-size" "file-stream-buffer-mode" "file-stream-port?" "file-truncate" "filename-extension" "filesystem-change-evt" "filesystem-change-evt-cancel" "filesystem-change-evt?" "filesystem-root-list" "filter" "filter-map" "filter-not" "filter-read-input-port" "find-compiled-file-roots" "find-executable-path" "find-files" "find-library-collection-links" "find-library-collection-paths" "find-relative-path" "find-system-path" "findf" "first" "first-or/c" "fixnum?" "flat-contract" "flat-contract-predicate" "flat-contract-property?" "flat-contract-with-explanation" "flat-contract?" "flat-named-contract" "flatten" "floating-point-bytes->real" "flonum?" "floor" "flush-output" "fold-files" "foldl" "foldr" "for-each" "force" "format" "fourth" "fprintf" "free-identifier=?" "free-label-identifier=?" "free-template-identifier=?" "free-transformer-identifier=?" "fsemaphore-count" "fsemaphore-post" "fsemaphore-try-wait?" "fsemaphore-wait" "fsemaphore?" "future" "future?" "futures-enabled?" "gcd" "generate-member-key" "generate-temporaries" "generic-set?" "generic?" "gensym" "get-output-bytes" "get-output-string" "get-preference" "get/build-late-neg-projection" "get/build-val-first-projection" "getenv" "global-port-print-handler" "group-by" "guard-evt" "handle-evt" "handle-evt?" "has-blame?" "has-contract?" "hash" "hash->list" "hash-clear" "hash-clear!" "hash-copy" "hash-copy-clear" "hash-count" "hash-empty?" "hash-ephemeron?" "hash-eq?" "hash-equal?" "hash-eqv?" "hash-for-each" "hash-has-key?" "hash-iterate-first" "hash-iterate-key" "hash-iterate-key+value" "hash-iterate-next" "hash-iterate-pair" "hash-iterate-value" "hash-keys" "hash-keys-subset?" "hash-map" "hash-placeholder?" "hash-ref" "hash-ref!" "hash-ref-key" "hash-remove" "hash-remove!" "hash-set" "hash-set!" "hash-set*" "hash-set*!" "hash-strong?" "hash-update" "hash-update!" "hash-values" "hash-weak?" "hash/c" "hash?" "hasheq" "hasheqv" "identifier-binding" "identifier-binding-portal-syntax" "identifier-binding-symbol" "identifier-distinct-binding" "identifier-label-binding" "identifier-prune-lexical-context" "identifier-prune-to-source-module" "identifier-remove-from-definition-context" "identifier-template-binding" "identifier-transformer-binding" "identifier?" "identity" "if/c" "imag-part" "immutable?" "impersonate-box" "impersonate-channel" "impersonate-continuation-mark-key" "impersonate-hash" "impersonate-hash-set" "impersonate-procedure" "impersonate-procedure*" "impersonate-prompt-tag" "impersonate-struct" "impersonate-vector" "impersonate-vector*" "impersonator-contract?" "impersonator-ephemeron" "impersonator-of?" "impersonator-property-accessor-procedure?" "impersonator-property?" "impersonator?" "implementation?" "implementation?/c" "in-bytes" "in-bytes-lines" "in-combinations" "in-cycle" "in-dict" "in-dict-keys" "in-dict-pairs" "in-dict-values" "in-directory" "in-ephemeron-hash" "in-ephemeron-hash-keys" "in-ephemeron-hash-pairs" "in-ephemeron-hash-values" "in-hash" "in-hash-keys" "in-hash-pairs" "in-hash-values" "in-immutable-hash" "in-immutable-hash-keys" "in-immutable-hash-pairs" "in-immutable-hash-values" "in-immutable-set" "in-inclusive-range" "in-indexed" "in-input-port-bytes" "in-input-port-chars" "in-lines" "in-list" "in-mlist" "in-mutable-hash" "in-mutable-hash-keys" "in-mutable-hash-pairs" "in-mutable-hash-values" "in-mutable-set" "in-naturals" "in-parallel" "in-permutations" "in-port" "in-producer" "in-range" "in-sequences" "in-set" "in-slice" "in-stream" "in-string" "in-syntax" "in-value" "in-values*-sequence" "in-values-sequence" "in-vector" "in-weak-hash" "in-weak-hash-keys" "in-weak-hash-pairs" "in-weak-hash-values" "in-weak-set" "inclusive-range" "index-of" "index-where" "indexes-of" "indexes-where" "inexact->exact" "inexact-real?" "inexact?" "infinite?" "input-port-append" "input-port?" "inspector-superior?" "inspector?" "instanceof/c" "integer->char" "integer->integer-bytes" "integer-bytes->integer" "integer-in" "integer-length" "integer-sqrt" "integer-sqrt/remainder" "integer?" "interface->method-names" "interface-extension?" "interface?" "internal-definition-context-add-scopes" "internal-definition-context-binding-identifiers" "internal-definition-context-introduce" "internal-definition-context-seal" "internal-definition-context-splice-binding-identifier" "internal-definition-context?" "is-a?" "is-a?/c" "keyword->string" "keyword-apply" "keyword-apply/dict" "keyword<?" "keyword?" "keywords-match" "kill-thread" "last" "last-pair" "lcm" "length" "liberal-define-context?" "link-exists?" "list" "list*" "list*of" "list->bytes" "list->mutable-set" "list->mutable-seteq" "list->mutable-seteqv" "list->set" "list->seteq" "list->seteqv" "list->string" "list->vector" "list->weak-set" "list->weak-seteq" "list->weak-seteqv" "list-contract?" "list-prefix?" "list-ref" "list-set" "list-tail" "list-update" "list/c" "list?" "listen-port-number?" "listof" "load" "load-extension" "load-on-demand-enabled" "load-relative" "load-relative-extension" "load/cd" "load/use-compiled" "local-expand" "local-expand/capture-lifts" "local-transformer-expand" "local-transformer-expand/capture-lifts" "locale-string-encoding" "log" "log-all-levels" "log-level-evt" "log-level?" "log-max-level" "log-message" "log-receiver?" "logger-name" "logger?" "magnitude" "make-arity-at-least" "make-base-empty-namespace" "make-base-namespace" "make-bytes" "make-channel" "make-chaperone-contract" "make-continuation-mark-key" "make-continuation-prompt-tag" "make-contract" "make-custodian" "make-custodian-box" "make-custom-hash" "make-custom-hash-types" "make-custom-set" "make-custom-set-types" "make-date" "make-date*" "make-derived-parameter" "make-directory" "make-directory*" "make-do-sequence" "make-empty-namespace" "make-environment-variables" "make-ephemeron" "make-ephemeron-hash" "make-ephemeron-hasheq" "make-ephemeron-hasheqv" "make-exn" "make-exn:break" "make-exn:break:hang-up" "make-exn:break:terminate" "make-exn:fail" "make-exn:fail:contract" "make-exn:fail:contract:arity" "make-exn:fail:contract:blame" "make-exn:fail:contract:continuation" "make-exn:fail:contract:divide-by-zero" "make-exn:fail:contract:non-fixnum-result" "make-exn:fail:contract:variable" "make-exn:fail:filesystem" "make-exn:fail:filesystem:errno" "make-exn:fail:filesystem:exists" "make-exn:fail:filesystem:missing-module" "make-exn:fail:filesystem:version" "make-exn:fail:network" "make-exn:fail:network:errno" "make-exn:fail:object" "make-exn:fail:out-of-memory" "make-exn:fail:read" "make-exn:fail:read:eof" "make-exn:fail:read:non-char" "make-exn:fail:syntax" "make-exn:fail:syntax:missing-module" "make-exn:fail:syntax:unbound" "make-exn:fail:unsupported" "make-exn:fail:user" "make-file-or-directory-link" "make-flat-contract" "make-fsemaphore" "make-generic" "make-handle-get-preference-locked" "make-hash" "make-hash-placeholder" "make-hasheq" "make-hasheq-placeholder" "make-hasheqv" "make-hasheqv-placeholder" "make-immutable-custom-hash" "make-immutable-hash" "make-immutable-hasheq" "make-immutable-hasheqv" "make-impersonator-property" "make-input-port" "make-input-port/read-to-peek" "make-inspector" "make-interned-syntax-introducer" "make-keyword-procedure" "make-known-char-range-list" "make-limited-input-port" "make-list" "make-lock-file-name" "make-log-receiver" "make-logger" "make-mixin-contract" "make-mutable-custom-set" "make-none/c" "make-object" "make-output-port" "make-parameter" "make-parent-directory*" "make-phantom-bytes" "make-pipe" "make-pipe-with-specials" "make-placeholder" "make-plumber" "make-polar" "make-portal-syntax" "make-prefab-struct" "make-primitive-class" "make-proj-contract" "make-pseudo-random-generator" "make-reader-graph" "make-readtable" "make-rectangular" "make-rename-transformer" "make-resolved-module-path" "make-security-guard" "make-semaphore" "make-set!-transformer" "make-shared-bytes" "make-sibling-inspector" "make-special-comment" "make-srcloc" "make-string" "make-struct-field-accessor" "make-struct-field-mutator" "make-struct-type" "make-struct-type-property" "make-syntax-delta-introducer" "make-syntax-introducer" "make-temporary-directory" "make-temporary-directory*" "make-temporary-file" "make-temporary-file*" "make-tentative-pretty-print-output-port" "make-thread-cell" "make-thread-group" "make-vector" "make-weak-box" "make-weak-custom-hash" "make-weak-custom-set" "make-weak-hash" "make-weak-hasheq" "make-weak-hasheqv" "make-will-executor" "map" "match-equality-test" "matches-arity-exactly?" "max" "mcar" "mcdr" "mcons" "member" "member-name-key-hash-code" "member-name-key=?" "member-name-key?" "memf" "memory-order-acquire" "memory-order-release" "memq" "memv" "merge-input" "method-in-interface?" "min" "module->exports" "module->imports" "module->indirect-exports" "module->language-info" "module->namespace" "module->realm" "module-compiled-cross-phase-persistent?" "module-compiled-exports" "module-compiled-imports" "module-compiled-indirect-exports" "module-compiled-language-info" "module-compiled-name" "module-compiled-realm" "module-compiled-submodules" "module-declared?" "module-path-index-join" "module-path-index-resolve" "module-path-index-split" "module-path-index-submodule" "module-path-index?" "module-path?" "module-predefined?" "module-provide-protected?" "modulo" "mpair?" "mutable-set" "mutable-seteq" "mutable-seteqv" "n->th" "nack-guard-evt" "namespace-anchor->empty-namespace" "namespace-anchor->namespace" "namespace-anchor?" "namespace-attach-module" "namespace-attach-module-declaration" "namespace-base-phase" "namespace-call-with-registry-lock" "namespace-mapped-symbols" "namespace-module-identifier" "namespace-module-registry" "namespace-require" "namespace-require/constant" "namespace-require/copy" "namespace-require/expansion-time" "namespace-set-variable-value!" "namespace-symbol->identifier" "namespace-syntax-introduce" "namespace-undefine-variable!" "namespace-unprotect-module" "namespace-variable-value" "namespace?" "nan?" "natural-number/c" "natural?" "negate" "negative-integer?" "negative?" "new-∀/c" "new-∃/c" "newline" "ninth" "non-empty-listof" "non-empty-string?" "none/c" "nonnegative-integer?" "nonpositive-integer?" "normal-case-path" "normalize-arity" "normalize-path" "normalized-arity?" "not" "not/c" "null?" "number->string" "number?" "numerator" "object->vector" "object-info" "object-interface" "object-method-arity-includes?" "object-name" "object-or-false=?" "object=-hash-code" "object=?" "object?" "odd?" "one-of/c" "open-input-bytes" "open-input-file" "open-input-output-file" "open-input-string" "open-output-bytes" "open-output-file" "open-output-nowhere" "open-output-string" "or/c" "order-of-magnitude" "ormap" "output-port?" "pair?" "parameter-procedure=?" "parameter/c" "parameter?" "parameterization?" "parse-command-line" "partition" "path->bytes" "path->complete-path" "path->directory-path" "path->string" "path-add-extension" "path-add-suffix" "path-convention-type" "path-element->bytes" "path-element->string" "path-element?" "path-for-some-system?" "path-get-extension" "path-has-extension?" "path-list-string->path-list" "path-only" "path-replace-extension" "path-replace-suffix" "path-string?" "path<?" "path?" "pathlist-closure" "peek-byte" "peek-byte-or-special" "peek-bytes" "peek-bytes!" "peek-bytes!-evt" "peek-bytes-avail!" "peek-bytes-avail!*" "peek-bytes-avail!-evt" "peek-bytes-avail!/enable-break" "peek-bytes-evt" "peek-char" "peek-char-or-special" "peek-string" "peek-string!" "peek-string!-evt" "peek-string-evt" "peeking-input-port" "permutations" "phantom-bytes?" "pipe-content-length" "place-break" "place-channel" "place-channel-get" "place-channel-put" "place-channel-put/get" "place-channel?" "place-dead-evt" "place-enabled?" "place-kill" "place-location?" "place-message-allowed?" "place-wait" "place?" "placeholder-get" "placeholder-set!" "placeholder?" "plumber-add-flush!" "plumber-flush-all" "plumber-flush-handle-remove!" "plumber-flush-handle?" "plumber?" "poll-guard-evt" "port->bytes" "port->bytes-lines" "port->lines" "port->list" "port->string" "port-closed-evt" "port-closed?" "port-commit-peeked" "port-count-lines!" "port-count-lines-enabled" "port-counts-lines?" "port-display-handler" "port-file-identity" "port-file-unlock" "port-next-location" "port-number?" "port-print-handler" "port-progress-evt" "port-provides-progress-evts?" "port-read-handler" "port-try-file-lock?" "port-waiting-peer?" "port-write-handler" "port-writes-atomic?" "port-writes-special?" "port?" "portal-syntax-content" "portal-syntax?" "positive-integer?" "positive?" "prefab-key->struct-type" "prefab-key?" "prefab-struct-key" "preferences-lock-file-mode" "pregexp" "pregexp?" "pretty-display" "pretty-format" "pretty-print" "pretty-print-.-symbol-without-bars" "pretty-print-abbreviate-read-macros" "pretty-print-columns" "pretty-print-current-style-table" "pretty-print-depth" "pretty-print-exact-as-decimal" "pretty-print-extend-style-table" "pretty-print-handler" "pretty-print-newline" "pretty-print-post-print-hook" "pretty-print-pre-print-hook" "pretty-print-print-hook" "pretty-print-print-line" "pretty-print-remap-stylable" "pretty-print-show-inexactness" "pretty-print-size-hook" "pretty-print-style-table?" "pretty-printing" "pretty-write" "primitive-closure?" "primitive-result-arity" "primitive?" "print" "print-as-expression" "print-boolean-long-form" "print-box" "print-graph" "print-hash-table" "print-mpair-curly-braces" "print-pair-curly-braces" "print-reader-abbreviations" "print-struct" "print-syntax-width" "print-unreadable" "print-value-columns" "print-vector-length" "printable/c" "printf" "println" "procedure->method" "procedure-arity" "procedure-arity-includes/c" "procedure-arity-includes?" "procedure-arity-mask" "procedure-arity?" "procedure-closure-contents-eq?" "procedure-extract-target" "procedure-impersonator*?" "procedure-keywords" "procedure-realm" "procedure-reduce-arity" "procedure-reduce-arity-mask" "procedure-reduce-keyword-arity" "procedure-reduce-keyword-arity-mask" "procedure-rename" "procedure-result-arity" "procedure-specialize" "procedure-struct-type?" "procedure?" "process" "process*" "process*/ports" "process/ports" "processor-count" "progress-evt?" "promise-forced?" "promise-running?" "promise/c" "promise/name?" "promise?" "prop:arrow-contract-get-info" "prop:arrow-contract?" "prop:orc-contract-get-subcontracts" "prop:orc-contract?" "prop:recursive-contract-unroll" "prop:recursive-contract?" "proper-subset?" "property/c" "pseudo-random-generator->vector" "pseudo-random-generator-vector?" "pseudo-random-generator?" "put-preferences" "putenv" "quotient" "quotient/remainder" "radians->degrees" "raise" "raise-argument-error" "raise-argument-error*" "raise-arguments-error" "raise-arguments-error*" "raise-arity-error" "raise-arity-error*" "raise-arity-mask-error" "raise-arity-mask-error*" "raise-blame-error" "raise-contract-error" "raise-mismatch-error" "raise-not-cons-blame-error" "raise-range-error" "raise-range-error*" "raise-result-arity-error" "raise-result-arity-error*" "raise-result-error" "raise-result-error*" "raise-syntax-error" "raise-type-error" "raise-user-error" "random" "random-seed" "range" "rational?" "rationalize" "read" "read-accept-bar-quote" "read-accept-box" "read-accept-compiled" "read-accept-dot" "read-accept-graph" "read-accept-infix-dot" "read-accept-lang" "read-accept-quasiquote" "read-accept-reader" "read-byte" "read-byte-or-special" "read-bytes" "read-bytes!" "read-bytes!-evt" "read-bytes-avail!" "read-bytes-avail!*" "read-bytes-avail!-evt" "read-bytes-avail!/enable-break" "read-bytes-evt" "read-bytes-line" "read-bytes-line-evt" "read-case-sensitive" "read-cdot" "read-char" "read-char-or-special" "read-curly-brace-as-paren" "read-curly-brace-with-tag" "read-decimal-as-inexact" "read-eval-print-loop" "read-installation-configuration-table" "read-language" "read-line" "read-line-evt" "read-on-demand-source" "read-single-flonum" "read-square-bracket-as-paren" "read-square-bracket-with-tag" "read-string" "read-string!" "read-string!-evt" "read-string-evt" "read-syntax" "read-syntax-accept-graph" "read-syntax/recursive" "read/recursive" "readtable-mapping" "readtable?" "real->decimal-string" "real->double-flonum" "real->floating-point-bytes" "real->single-flonum" "real-in" "real-part" "real?" "reencode-input-port" "reencode-output-port" "regexp" "regexp-match" "regexp-match*" "regexp-match-evt" "regexp-match-exact?" "regexp-match-peek" "regexp-match-peek-immediate" "regexp-match-peek-positions" "regexp-match-peek-positions*" "regexp-match-peek-positions-immediate" "regexp-match-peek-positions-immediate/end" "regexp-match-peek-positions/end" "regexp-match-positions" "regexp-match-positions*" "regexp-match-positions/end" "regexp-match/end" "regexp-match?" "regexp-max-lookbehind" "regexp-quote" "regexp-replace" "regexp-replace*" "regexp-replace-quote" "regexp-replaces" "regexp-split" "regexp-try-match" "regexp?" "relative-path?" "relocate-input-port" "relocate-output-port" "remainder" "remf" "remf*" "remove" "remove*" "remove-duplicates" "remq" "remq*" "remv" "remv*" "rename-contract" "rename-file-or-directory" "rename-transformer-target" "rename-transformer?" "replace-evt" "reroot-path" "resolve-path" "resolved-module-path-name" "resolved-module-path?" "rest" "reverse" "round" "second" "seconds->date" "security-guard?" "semaphore-peek-evt" "semaphore-peek-evt?" "semaphore-post" "semaphore-try-wait?" "semaphore-wait" "semaphore-wait/enable-break" "semaphore?" "sequence->list" "sequence->stream" "sequence-add-between" "sequence-andmap" "sequence-append" "sequence-count" "sequence-filter" "sequence-fold" "sequence-for-each" "sequence-generate" "sequence-generate*" "sequence-length" "sequence-map" "sequence-ormap" "sequence-ref" "sequence-tail" "sequence/c" "sequence?" "set" "set!-transformer-procedure" "set!-transformer?" "set->list" "set->stream" "set-add" "set-add!" "set-box!" "set-box*!" "set-clear" "set-clear!" "set-copy" "set-copy-clear" "set-count" "set-empty?" "set-eq?" "set-equal?" "set-eqv?" "set-first" "set-for-each" "set-implements/c" "set-implements?" "set-intersect" "set-intersect!" "set-map" "set-mcar!" "set-mcdr!" "set-member?" "set-mutable?" "set-phantom-bytes!" "set-port-next-location!" "set-remove" "set-remove!" "set-rest" "set-subtract" "set-subtract!" "set-symmetric-difference" "set-symmetric-difference!" "set-union" "set-union!" "set-weak?" "set/c" "set=?" "set?" "seteq" "seteqv" "seventh" "sgn" "sha1-bytes" "sha224-bytes" "sha256-bytes" "shared-bytes" "shell-execute" "shrink-path-wrt" "shuffle" "simple-form-path" "simplify-path" "sin" "single-flonum-available?" "single-flonum?" "sinh" "sixth" "skip-projection-wrapper?" "sleep" "some-system-path->string" "sort" "special-comment-value" "special-comment?" "special-filter-input-port" "split-at" "split-at-right" "split-common-prefix" "split-path" "splitf-at" "splitf-at-right" "sqr" "sqrt" "srcloc" "srcloc->string" "srcloc-column" "srcloc-line" "srcloc-position" "srcloc-source" "srcloc-span" "srcloc?" "stop-after" "stop-before" "stream->list" "stream-add-between" "stream-andmap" "stream-append" "stream-count" "stream-empty?" "stream-filter" "stream-first" "stream-fold" "stream-for-each" "stream-force" "stream-length" "stream-map" "stream-ormap" "stream-ref" "stream-rest" "stream-tail" "stream-take" "stream/c" "stream?" "string" "string->bytes/latin-1" "string->bytes/locale" "string->bytes/utf-8" "string->immutable-string" "string->keyword" "string->list" "string->number" "string->path" "string->path-element" "string->some-system-path" "string->symbol" "string->uninterned-symbol" "string->unreadable-symbol" "string-append" "string-append*" "string-append-immutable" "string-ci<=?" "string-ci<?" "string-ci=?" "string-ci>=?" "string-ci>?" "string-contains?" "string-copy" "string-copy!" "string-downcase" "string-environment-variable-name?" "string-fill!" "string-foldcase" "string-join" "string-len/c" "string-length" "string-locale-ci<?" "string-locale-ci=?" "string-locale-ci>?" "string-locale-downcase" "string-locale-upcase" "string-locale<?" "string-locale=?" "string-locale>?" "string-no-nuls?" "string-normalize-nfc" "string-normalize-nfd" "string-normalize-nfkc" "string-normalize-nfkd" "string-normalize-spaces" "string-port?" "string-prefix?" "string-ref" "string-replace" "string-set!" "string-split" "string-suffix?" "string-titlecase" "string-trim" "string-upcase" "string-utf-8-length" "string<=?" "string<?" "string=?" "string>=?" "string>?" "string?" "struct->vector" "struct-accessor-procedure?" "struct-constructor-procedure?" "struct-info" "struct-mutator-procedure?" "struct-predicate-procedure?" "struct-type-authentic?" "struct-type-info" "struct-type-make-constructor" "struct-type-make-predicate" "struct-type-property-accessor-procedure?" "struct-type-property-predicate-procedure?" "struct-type-property/c" "struct-type-property?" "struct-type-sealed?" "struct-type?" "struct?" "sub1" "subbytes" "subclass?" "subclass?/c" "subprocess" "subprocess-group-enabled" "subprocess-kill" "subprocess-pid" "subprocess-status" "subprocess-wait" "subprocess?" "subset?" "substring" "suggest/c" "symbol->string" "symbol-interned?" "symbol-unreadable?" "symbol<?" "symbol=?" "symbol?" "symbols" "sync" "sync/enable-break" "sync/timeout" "sync/timeout/enable-break" "syntax->datum" "syntax->list" "syntax-arm" "syntax-binding-set" "syntax-binding-set->syntax" "syntax-binding-set-extend" "syntax-binding-set?" "syntax-column" "syntax-debug-info" "syntax-deserialize" "syntax-disarm" "syntax-e" "syntax-line" "syntax-local-apply-transformer" "syntax-local-bind-syntaxes" "syntax-local-certifier" "syntax-local-context" "syntax-local-expand-expression" "syntax-local-get-shadower" "syntax-local-identifier-as-binding" "syntax-local-introduce" "syntax-local-lift-context" "syntax-local-lift-expression" "syntax-local-lift-module" "syntax-local-lift-module-end-declaration" "syntax-local-lift-provide" "syntax-local-lift-require" "syntax-local-lift-values-expression" "syntax-local-make-definition-context" "syntax-local-make-delta-introducer" "syntax-local-module-defined-identifiers" "syntax-local-module-exports" "syntax-local-module-interned-scope-symbols" "syntax-local-module-required-identifiers" "syntax-local-name" "syntax-local-phase-level" "syntax-local-submodules" "syntax-local-transforming-module-provides?" "syntax-local-value" "syntax-local-value/immediate" "syntax-original?" "syntax-position" "syntax-property" "syntax-property-preserved?" "syntax-property-remove" "syntax-property-symbol-keys" "syntax-protect" "syntax-rearm" "syntax-recertify" "syntax-serialize" "syntax-shift-phase-level" "syntax-source" "syntax-source-module" "syntax-span" "syntax-taint" "syntax-tainted?" "syntax-track-origin" "syntax-transforming-module-expression?" "syntax-transforming-with-lifts?" "syntax-transforming?" "syntax/c" "syntax?" "system" "system*" "system*/exit-code" "system-big-endian?" "system-idle-evt" "system-language+country" "system-library-subpath" "system-path-convention-type" "system-type" "system/exit-code" "tail-marks-match?" "take" "take-common-prefix" "take-right" "takef" "takef-right" "tan" "tanh" "tcp-abandon-port" "tcp-accept" "tcp-accept-evt" "tcp-accept-ready?" "tcp-accept/enable-break" "tcp-addresses" "tcp-close" "tcp-connect" "tcp-connect/enable-break" "tcp-listen" "tcp-listener?" "tcp-port?" "tentative-pretty-print-port-cancel" "tentative-pretty-print-port-transfer" "tenth" "terminal-port?" "third" "thread" "thread-cell-ref" "thread-cell-set!" "thread-cell-values?" "thread-cell?" "thread-dead-evt" "thread-dead?" "thread-group?" "thread-receive" "thread-receive-evt" "thread-resume" "thread-resume-evt" "thread-rewind-receive" "thread-running?" "thread-send" "thread-suspend" "thread-suspend-evt" "thread-try-receive" "thread-wait" "thread/suspend-to-kill" "thread?" "time-apply" "touch" "transplant-input-port" "transplant-output-port" "truncate" "udp-addresses" "udp-bind!" "udp-bound?" "udp-close" "udp-connect!" "udp-connected?" "udp-multicast-interface" "udp-multicast-join-group!" "udp-multicast-leave-group!" "udp-multicast-loopback?" "udp-multicast-set-interface!" "udp-multicast-set-loopback!" "udp-multicast-set-ttl!" "udp-multicast-ttl" "udp-open-socket" "udp-receive!" "udp-receive!*" "udp-receive!-evt" "udp-receive!/enable-break" "udp-receive-ready-evt" "udp-send" "udp-send*" "udp-send-evt" "udp-send-ready-evt" "udp-send-to" "udp-send-to*" "udp-send-to-evt" "udp-send-to/enable-break" "udp-send/enable-break" "udp-set-receive-buffer-size!" "udp-set-ttl!" "udp-ttl" "udp?" "unbox" "unbox*" "uncaught-exception-handler" "unit?" "unquoted-printing-string" "unquoted-printing-string-value" "unquoted-printing-string?" "unsupplied-arg?" "use-collection-link-paths" "use-compiled-file-check" "use-compiled-file-paths" "use-user-specific-search-paths" "value-blame" "value-contract" "values" "variable-reference->empty-namespace" "variable-reference->module-base-phase" "variable-reference->module-declaration-inspector" "variable-reference->module-path-index" "variable-reference->module-source" "variable-reference->namespace" "variable-reference->phase" "variable-reference->resolved-module-path" "variable-reference-constant?" "variable-reference-from-unsafe?" "variable-reference?" "vector" "vector*-length" "vector*-ref" "vector*-set!" "vector->immutable-vector" "vector->list" "vector->pseudo-random-generator" "vector->pseudo-random-generator!" "vector->values" "vector-append" "vector-argmax" "vector-argmin" "vector-cas!" "vector-copy" "vector-copy!" "vector-count" "vector-drop" "vector-drop-right" "vector-empty?" "vector-fill!" "vector-filter" "vector-filter-not" "vector-immutable" "vector-immutable/c" "vector-immutableof" "vector-length" "vector-map" "vector-map!" "vector-member" "vector-memq" "vector-memv" "vector-ref" "vector-set!" "vector-set*!" "vector-set-performance-stats!" "vector-sort" "vector-sort!" "vector-split-at" "vector-split-at-right" "vector-take" "vector-take-right" "vector/c" "vector?" "vectorof" "version" "void" "void?" "weak-box-value" "weak-box?" "weak-set" "weak-seteq" "weak-seteqv" "will-execute" "will-executor?" "will-register" "will-try-execute" "with-input-from-bytes" "with-input-from-file" "with-input-from-string" "with-output-to-bytes" "with-output-to-file" "with-output-to-string" "would-be-future" "wrap-evt" "write" "write-byte" "write-bytes" "write-bytes-avail" "write-bytes-avail*" "write-bytes-avail-evt" "write-bytes-avail/enable-break" "write-char" "write-special" "write-special-avail*" "write-special-evt" "write-string" "write-to-file" "writeln" "xor" "zero?" "~.a" "~.s" "~.v" "~a" "~e" "~r" "~s" "~v"))
+  (#any-of? @function.builtin
+    "*" "*list/c" "+" "-" "/" "<" "</c" "<=" "<=/c" "=" "=/c" ">" ">/c" ">=" ">=/c"
+    "abort-current-continuation" "abs" "absolute-path?" "acos" "add-between" "add1" "alarm-evt"
+    "and/c" "andmap" "angle" "any/c" "append" "append*" "append-map" "apply" "argmax" "argmin"
+    "arithmetic-shift" "arity-at-least" "arity-at-least-value" "arity-at-least?"
+    "arity-checking-wrapper" "arity-includes?" "arity=?" "arrow-contract-info"
+    "arrow-contract-info-accepts-arglist" "arrow-contract-info-chaperone-procedure"
+    "arrow-contract-info-check-first-order" "arrow-contract-info?" "asin" "assert-unreachable"
+    "assf" "assoc" "assq" "assv" "atan" "bad-number-of-results" "banner" "base->-doms/c"
+    "base->-rngs/c" "base->?" "between/c" "bitwise-and" "bitwise-bit-field" "bitwise-bit-set?"
+    "bitwise-ior" "bitwise-not" "bitwise-xor" "blame-add-car-context" "blame-add-cdr-context"
+    "blame-add-context" "blame-add-missing-party" "blame-add-nth-arg-context"
+    "blame-add-range-context" "blame-add-unknown-context" "blame-context" "blame-contract"
+    "blame-fmt->-string" "blame-missing-party?" "blame-negative" "blame-original?" "blame-positive"
+    "blame-replace-negative" "blame-replaced-negative?" "blame-source" "blame-swap" "blame-swapped?"
+    "blame-update" "blame-value" "blame?" "boolean=?" "boolean?" "bound-identifier=?" "box"
+    "box-cas!" "box-immutable" "box-immutable/c" "box/c" "box?" "break-enabled"
+    "break-parameterization?" "break-thread" "build-chaperone-contract-property"
+    "build-compound-type-name" "build-contract-property" "build-flat-contract-property" "build-list"
+    "build-path" "build-path/convention-type" "build-string" "build-vector" "byte-pregexp"
+    "byte-pregexp?" "byte-ready?" "byte-regexp" "byte-regexp?" "byte?" "bytes"
+    "bytes->immutable-bytes" "bytes->list" "bytes->path" "bytes->path-element"
+    "bytes->string/latin-1" "bytes->string/locale" "bytes->string/utf-8" "bytes-append"
+    "bytes-append*" "bytes-close-converter" "bytes-convert" "bytes-convert-end" "bytes-converter?"
+    "bytes-copy" "bytes-copy!" "bytes-environment-variable-name?" "bytes-fill!" "bytes-join"
+    "bytes-length" "bytes-no-nuls?" "bytes-open-converter" "bytes-ref" "bytes-set!"
+    "bytes-utf-8-index" "bytes-utf-8-length" "bytes-utf-8-ref" "bytes<?" "bytes=?" "bytes>?"
+    "bytes?" "caaaar" "caaadr" "caaar" "caadar" "caaddr" "caadr" "caar" "cadaar" "cadadr" "cadar"
+    "caddar" "cadddr" "caddr" "cadr" "call-in-continuation" "call-in-nested-thread"
+    "call-with-atomic-output-file" "call-with-break-parameterization"
+    "call-with-composable-continuation" "call-with-continuation-barrier"
+    "call-with-continuation-prompt" "call-with-current-continuation"
+    "call-with-default-reading-parameterization" "call-with-escape-continuation"
+    "call-with-exception-handler" "call-with-file-lock/timeout"
+    "call-with-immediate-continuation-mark" "call-with-input-bytes" "call-with-input-file"
+    "call-with-input-file*" "call-with-input-string" "call-with-output-bytes"
+    "call-with-output-file" "call-with-output-file*" "call-with-output-string"
+    "call-with-parameterization" "call-with-semaphore" "call-with-semaphore/enable-break"
+    "call-with-values" "call/cc" "call/ec" "car" "cartesian-product" "cdaaar" "cdaadr" "cdaar"
+    "cdadar" "cdaddr" "cdadr" "cdar" "cddaar" "cddadr" "cddar" "cdddar" "cddddr" "cdddr" "cddr"
+    "cdr" "ceiling" "channel-get" "channel-put" "channel-put-evt" "channel-put-evt?"
+    "channel-try-get" "channel/c" "channel?" "chaperone-box" "chaperone-channel"
+    "chaperone-continuation-mark-key" "chaperone-contract-property?" "chaperone-contract?"
+    "chaperone-evt" "chaperone-hash" "chaperone-hash-set" "chaperone-of?" "chaperone-procedure"
+    "chaperone-procedure*" "chaperone-prompt-tag" "chaperone-struct" "chaperone-struct-type"
+    "chaperone-vector" "chaperone-vector*" "chaperone?" "char->integer" "char-alphabetic?"
+    "char-blank?" "char-ci<=?" "char-ci<?" "char-ci=?" "char-ci>=?" "char-ci>?" "char-downcase"
+    "char-foldcase" "char-general-category" "char-graphic?" "char-in" "char-in/c"
+    "char-iso-control?" "char-lower-case?" "char-numeric?" "char-punctuation?" "char-ready?"
+    "char-symbolic?" "char-title-case?" "char-titlecase" "char-upcase" "char-upper-case?"
+    "char-utf-8-length" "char-whitespace?" "char<=?" "char<?" "char=?" "char>=?" "char>?" "char?"
+    "check-duplicate-identifier" "check-duplicates" "checked-procedure-check-and-extract"
+    "choice-evt" "class->interface" "class-info" "class-seal" "class-unseal" "class?" "cleanse-path"
+    "close-input-port" "close-output-port" "coerce-chaperone-contract" "coerce-chaperone-contracts"
+    "coerce-contract" "coerce-contract/f" "coerce-contracts" "coerce-flat-contract"
+    "coerce-flat-contracts" "collect-garbage" "collection-file-path" "collection-path"
+    "combinations" "combine-output" "compile" "compile-allow-set!-undefined"
+    "compile-context-preservation-enabled" "compile-enforce-module-constants" "compile-syntax"
+    "compile-target-machine?" "compiled-expression-recompile" "compiled-expression?"
+    "compiled-module-expression?" "complete-path?" "complex?" "compose" "compose1" "conjoin"
+    "conjugate" "cons" "cons/c" "cons?" "const" "continuation-mark-key/c" "continuation-mark-key?"
+    "continuation-mark-set->context" "continuation-mark-set->iterator" "continuation-mark-set->list"
+    "continuation-mark-set->list*" "continuation-mark-set-first" "continuation-mark-set?"
+    "continuation-marks" "continuation-prompt-available?" "continuation-prompt-tag?" "continuation?"
+    "contract-custom-write-property-proc" "contract-equivalent?" "contract-exercise"
+    "contract-first-order" "contract-first-order-passes?" "contract-late-neg-projection"
+    "contract-name" "contract-proc" "contract-projection" "contract-property?"
+    "contract-random-generate" "contract-random-generate-env?" "contract-random-generate-fail?"
+    "contract-random-generate-get-current-environment" "contract-random-generate-stash"
+    "contract-random-generate/choose" "contract-stronger?" "contract-struct-exercise"
+    "contract-struct-generate" "contract-struct-late-neg-projection"
+    "contract-struct-list-contract?" "contract-val-first-projection" "contract?" "convert-stream"
+    "copy-directory/files" "copy-file" "copy-port" "cos" "cosh" "count" "current-blame-format"
+    "current-break-parameterization" "current-code-inspector" "current-command-line-arguments"
+    "current-compile" "current-compile-realm" "current-compile-target-machine"
+    "current-compiled-file-roots" "current-continuation-marks" "current-custodian"
+    "current-directory" "current-directory-for-user" "current-drive" "current-environment-variables"
+    "current-error-message-adjuster" "current-error-port" "current-eval"
+    "current-evt-pseudo-random-generator" "current-force-delete-permissions" "current-future"
+    "current-gc-milliseconds" "current-get-interaction-evt" "current-get-interaction-input-port"
+    "current-inexact-milliseconds" "current-inexact-monotonic-milliseconds" "current-input-port"
+    "current-inspector" "current-library-collection-links" "current-library-collection-paths"
+    "current-load" "current-load-extension" "current-load-relative-directory"
+    "current-load/use-compiled" "current-locale" "current-logger" "current-memory-use"
+    "current-milliseconds" "current-module-declare-name" "current-module-declare-source"
+    "current-module-name-resolver" "current-module-path-for-load" "current-namespace"
+    "current-output-port" "current-parameterization" "current-plumber"
+    "current-preserved-thread-cell-values" "current-print" "current-process-milliseconds"
+    "current-prompt-read" "current-pseudo-random-generator" "current-read-interaction"
+    "current-reader-guard" "current-readtable" "current-seconds" "current-security-guard"
+    "current-subprocess-custodian-mode" "current-subprocess-keep-file-descriptors" "current-thread"
+    "current-thread-group" "current-thread-initial-stack-size" "current-write-relative-directory"
+    "curry" "curryr" "custodian-box-value" "custodian-box?" "custodian-limit-memory"
+    "custodian-managed-list" "custodian-memory-accounting-available?" "custodian-require-memory"
+    "custodian-shut-down?" "custodian-shutdown-all" "custodian?" "custom-print-quotable-accessor"
+    "custom-print-quotable?" "custom-write-accessor" "custom-write-property-proc" "custom-write?"
+    "date" "date*" "date*-nanosecond" "date*-time-zone-name" "date*?" "date-day" "date-dst?"
+    "date-hour" "date-minute" "date-month" "date-second" "date-time-zone-offset" "date-week-day"
+    "date-year" "date-year-day" "date?" "datum->syntax" "datum-intern-literal"
+    "default-continuation-prompt-tag" "degrees->radians" "delete-directory" "delete-directory/files"
+    "delete-file" "denominator" "dict->list" "dict-can-functional-set?" "dict-can-remove-keys?"
+    "dict-clear" "dict-clear!" "dict-copy" "dict-count" "dict-empty?" "dict-for-each"
+    "dict-has-key?" "dict-implements/c" "dict-implements?" "dict-iter-contract" "dict-iterate-first"
+    "dict-iterate-key" "dict-iterate-next" "dict-iterate-value" "dict-key-contract" "dict-keys"
+    "dict-map" "dict-mutable?" "dict-ref" "dict-ref!" "dict-remove" "dict-remove!" "dict-set"
+    "dict-set!" "dict-set*" "dict-set*!" "dict-update" "dict-update!" "dict-value-contract"
+    "dict-values" "dict?" "directory-exists?" "directory-list" "disjoin" "display" "display-lines"
+    "display-lines-to-file" "display-to-file" "displayln" "double-flonum?" "drop"
+    "drop-common-prefix" "drop-right" "dropf" "dropf-right" "dump-memory-stats" "dup-input-port"
+    "dup-output-port" "dynamic->*" "dynamic-get-field" "dynamic-object/c" "dynamic-place"
+    "dynamic-place*" "dynamic-require" "dynamic-require-for-syntax" "dynamic-send"
+    "dynamic-set-field!" "dynamic-wind" "eighth" "empty?" "environment-variables-copy"
+    "environment-variables-names" "environment-variables-ref" "environment-variables-set!"
+    "environment-variables?" "eof-evt" "eof-object?" "ephemeron-value" "ephemeron?" "eprintf"
+    "eq-contract-val" "eq-contract?" "eq-hash-code" "eq?" "equal-contract-val" "equal-contract?"
+    "equal-hash-code" "equal-secondary-hash-code" "equal?" "equal?/recur" "eqv-hash-code" "eqv?"
+    "error" "error-contract->adjusted-string" "error-display-handler" "error-escape-handler"
+    "error-message->adjusted-string" "error-print-context-length" "error-print-source-location"
+    "error-print-width" "error-syntax->string-handler" "error-value->string-handler" "eval"
+    "eval-jit-enabled" "eval-syntax" "even?" "evt/c" "evt?" "exact->inexact" "exact-ceiling"
+    "exact-floor" "exact-integer?" "exact-nonnegative-integer?" "exact-positive-integer?"
+    "exact-round" "exact-truncate" "exact?" "executable-yield-handler" "exit" "exit-handler" "exn"
+    "exn-continuation-marks" "exn-message" "exn:break" "exn:break-continuation" "exn:break:hang-up"
+    "exn:break:hang-up?" "exn:break:terminate" "exn:break:terminate?" "exn:break?" "exn:fail"
+    "exn:fail:contract" "exn:fail:contract:arity" "exn:fail:contract:arity?"
+    "exn:fail:contract:blame" "exn:fail:contract:blame-object" "exn:fail:contract:blame?"
+    "exn:fail:contract:continuation" "exn:fail:contract:continuation?"
+    "exn:fail:contract:divide-by-zero" "exn:fail:contract:divide-by-zero?"
+    "exn:fail:contract:non-fixnum-result" "exn:fail:contract:non-fixnum-result?"
+    "exn:fail:contract:variable" "exn:fail:contract:variable-id" "exn:fail:contract:variable?"
+    "exn:fail:contract?" "exn:fail:filesystem" "exn:fail:filesystem:errno"
+    "exn:fail:filesystem:errno-errno" "exn:fail:filesystem:errno?" "exn:fail:filesystem:exists"
+    "exn:fail:filesystem:exists?" "exn:fail:filesystem:missing-module"
+    "exn:fail:filesystem:missing-module-path" "exn:fail:filesystem:missing-module?"
+    "exn:fail:filesystem:version" "exn:fail:filesystem:version?" "exn:fail:filesystem?"
+    "exn:fail:network" "exn:fail:network:errno" "exn:fail:network:errno-errno"
+    "exn:fail:network:errno?" "exn:fail:network?" "exn:fail:object" "exn:fail:object?"
+    "exn:fail:out-of-memory" "exn:fail:out-of-memory?" "exn:fail:read" "exn:fail:read-srclocs"
+    "exn:fail:read:eof" "exn:fail:read:eof?" "exn:fail:read:non-char" "exn:fail:read:non-char?"
+    "exn:fail:read?" "exn:fail:syntax" "exn:fail:syntax-exprs" "exn:fail:syntax:missing-module"
+    "exn:fail:syntax:missing-module-path" "exn:fail:syntax:missing-module?"
+    "exn:fail:syntax:unbound" "exn:fail:syntax:unbound?" "exn:fail:syntax?" "exn:fail:unsupported"
+    "exn:fail:unsupported?" "exn:fail:user" "exn:fail:user?" "exn:fail?" "exn:misc:match?"
+    "exn:missing-module-accessor" "exn:missing-module?" "exn:srclocs-accessor" "exn:srclocs?" "exn?"
+    "exp" "expand" "expand-once" "expand-syntax" "expand-syntax-once" "expand-syntax-to-top-form"
+    "expand-to-top-form" "expand-user-path" "explode-path" "expt" "false?" "field-names" "fifth"
+    "file->bytes" "file->bytes-lines" "file->lines" "file->list" "file->string" "file->value"
+    "file-exists?" "file-name-from-path" "file-or-directory-identity"
+    "file-or-directory-modify-seconds" "file-or-directory-permissions" "file-or-directory-stat"
+    "file-or-directory-type" "file-position" "file-position*" "file-size" "file-stream-buffer-mode"
+    "file-stream-port?" "file-truncate" "filename-extension" "filesystem-change-evt"
+    "filesystem-change-evt-cancel" "filesystem-change-evt?" "filesystem-root-list" "filter"
+    "filter-map" "filter-not" "filter-read-input-port" "find-compiled-file-roots"
+    "find-executable-path" "find-files" "find-library-collection-links"
+    "find-library-collection-paths" "find-relative-path" "find-system-path" "findf" "first"
+    "first-or/c" "fixnum?" "flat-contract" "flat-contract-predicate" "flat-contract-property?"
+    "flat-contract-with-explanation" "flat-contract?" "flat-named-contract" "flatten"
+    "floating-point-bytes->real" "flonum?" "floor" "flush-output" "fold-files" "foldl" "foldr"
+    "for-each" "force" "format" "fourth" "fprintf" "free-identifier=?" "free-label-identifier=?"
+    "free-template-identifier=?" "free-transformer-identifier=?" "fsemaphore-count"
+    "fsemaphore-post" "fsemaphore-try-wait?" "fsemaphore-wait" "fsemaphore?" "future" "future?"
+    "futures-enabled?" "gcd" "generate-member-key" "generate-temporaries" "generic-set?" "generic?"
+    "gensym" "get-output-bytes" "get-output-string" "get-preference" "get/build-late-neg-projection"
+    "get/build-val-first-projection" "getenv" "global-port-print-handler" "group-by" "guard-evt"
+    "handle-evt" "handle-evt?" "has-blame?" "has-contract?" "hash" "hash->list" "hash-clear"
+    "hash-clear!" "hash-copy" "hash-copy-clear" "hash-count" "hash-empty?" "hash-ephemeron?"
+    "hash-eq?" "hash-equal?" "hash-eqv?" "hash-for-each" "hash-has-key?" "hash-iterate-first"
+    "hash-iterate-key" "hash-iterate-key+value" "hash-iterate-next" "hash-iterate-pair"
+    "hash-iterate-value" "hash-keys" "hash-keys-subset?" "hash-map" "hash-placeholder?" "hash-ref"
+    "hash-ref!" "hash-ref-key" "hash-remove" "hash-remove!" "hash-set" "hash-set!" "hash-set*"
+    "hash-set*!" "hash-strong?" "hash-update" "hash-update!" "hash-values" "hash-weak?" "hash/c"
+    "hash?" "hasheq" "hasheqv" "identifier-binding" "identifier-binding-portal-syntax"
+    "identifier-binding-symbol" "identifier-distinct-binding" "identifier-label-binding"
+    "identifier-prune-lexical-context" "identifier-prune-to-source-module"
+    "identifier-remove-from-definition-context" "identifier-template-binding"
+    "identifier-transformer-binding" "identifier?" "identity" "if/c" "imag-part" "immutable?"
+    "impersonate-box" "impersonate-channel" "impersonate-continuation-mark-key" "impersonate-hash"
+    "impersonate-hash-set" "impersonate-procedure" "impersonate-procedure*" "impersonate-prompt-tag"
+    "impersonate-struct" "impersonate-vector" "impersonate-vector*" "impersonator-contract?"
+    "impersonator-ephemeron" "impersonator-of?" "impersonator-property-accessor-procedure?"
+    "impersonator-property?" "impersonator?" "implementation?" "implementation?/c" "in-bytes"
+    "in-bytes-lines" "in-combinations" "in-cycle" "in-dict" "in-dict-keys" "in-dict-pairs"
+    "in-dict-values" "in-directory" "in-ephemeron-hash" "in-ephemeron-hash-keys"
+    "in-ephemeron-hash-pairs" "in-ephemeron-hash-values" "in-hash" "in-hash-keys" "in-hash-pairs"
+    "in-hash-values" "in-immutable-hash" "in-immutable-hash-keys" "in-immutable-hash-pairs"
+    "in-immutable-hash-values" "in-immutable-set" "in-inclusive-range" "in-indexed"
+    "in-input-port-bytes" "in-input-port-chars" "in-lines" "in-list" "in-mlist" "in-mutable-hash"
+    "in-mutable-hash-keys" "in-mutable-hash-pairs" "in-mutable-hash-values" "in-mutable-set"
+    "in-naturals" "in-parallel" "in-permutations" "in-port" "in-producer" "in-range" "in-sequences"
+    "in-set" "in-slice" "in-stream" "in-string" "in-syntax" "in-value" "in-values*-sequence"
+    "in-values-sequence" "in-vector" "in-weak-hash" "in-weak-hash-keys" "in-weak-hash-pairs"
+    "in-weak-hash-values" "in-weak-set" "inclusive-range" "index-of" "index-where" "indexes-of"
+    "indexes-where" "inexact->exact" "inexact-real?" "inexact?" "infinite?" "input-port-append"
+    "input-port?" "inspector-superior?" "inspector?" "instanceof/c" "integer->char"
+    "integer->integer-bytes" "integer-bytes->integer" "integer-in" "integer-length" "integer-sqrt"
+    "integer-sqrt/remainder" "integer?" "interface->method-names" "interface-extension?"
+    "interface?" "internal-definition-context-add-scopes"
+    "internal-definition-context-binding-identifiers" "internal-definition-context-introduce"
+    "internal-definition-context-seal" "internal-definition-context-splice-binding-identifier"
+    "internal-definition-context?" "is-a?" "is-a?/c" "keyword->string" "keyword-apply"
+    "keyword-apply/dict" "keyword<?" "keyword?" "keywords-match" "kill-thread" "last" "last-pair"
+    "lcm" "length" "liberal-define-context?" "link-exists?" "list" "list*" "list*of" "list->bytes"
+    "list->mutable-set" "list->mutable-seteq" "list->mutable-seteqv" "list->set" "list->seteq"
+    "list->seteqv" "list->string" "list->vector" "list->weak-set" "list->weak-seteq"
+    "list->weak-seteqv" "list-contract?" "list-prefix?" "list-ref" "list-set" "list-tail"
+    "list-update" "list/c" "list?" "listen-port-number?" "listof" "load" "load-extension"
+    "load-on-demand-enabled" "load-relative" "load-relative-extension" "load/cd" "load/use-compiled"
+    "local-expand" "local-expand/capture-lifts" "local-transformer-expand"
+    "local-transformer-expand/capture-lifts" "locale-string-encoding" "log" "log-all-levels"
+    "log-level-evt" "log-level?" "log-max-level" "log-message" "log-receiver?" "logger-name"
+    "logger?" "magnitude" "make-arity-at-least" "make-base-empty-namespace" "make-base-namespace"
+    "make-bytes" "make-channel" "make-chaperone-contract" "make-continuation-mark-key"
+    "make-continuation-prompt-tag" "make-contract" "make-custodian" "make-custodian-box"
+    "make-custom-hash" "make-custom-hash-types" "make-custom-set" "make-custom-set-types"
+    "make-date" "make-date*" "make-derived-parameter" "make-directory" "make-directory*"
+    "make-do-sequence" "make-empty-namespace" "make-environment-variables" "make-ephemeron"
+    "make-ephemeron-hash" "make-ephemeron-hasheq" "make-ephemeron-hasheqv" "make-exn"
+    "make-exn:break" "make-exn:break:hang-up" "make-exn:break:terminate" "make-exn:fail"
+    "make-exn:fail:contract" "make-exn:fail:contract:arity" "make-exn:fail:contract:blame"
+    "make-exn:fail:contract:continuation" "make-exn:fail:contract:divide-by-zero"
+    "make-exn:fail:contract:non-fixnum-result" "make-exn:fail:contract:variable"
+    "make-exn:fail:filesystem" "make-exn:fail:filesystem:errno" "make-exn:fail:filesystem:exists"
+    "make-exn:fail:filesystem:missing-module" "make-exn:fail:filesystem:version"
+    "make-exn:fail:network" "make-exn:fail:network:errno" "make-exn:fail:object"
+    "make-exn:fail:out-of-memory" "make-exn:fail:read" "make-exn:fail:read:eof"
+    "make-exn:fail:read:non-char" "make-exn:fail:syntax" "make-exn:fail:syntax:missing-module"
+    "make-exn:fail:syntax:unbound" "make-exn:fail:unsupported" "make-exn:fail:user"
+    "make-file-or-directory-link" "make-flat-contract" "make-fsemaphore" "make-generic"
+    "make-handle-get-preference-locked" "make-hash" "make-hash-placeholder" "make-hasheq"
+    "make-hasheq-placeholder" "make-hasheqv" "make-hasheqv-placeholder" "make-immutable-custom-hash"
+    "make-immutable-hash" "make-immutable-hasheq" "make-immutable-hasheqv"
+    "make-impersonator-property" "make-input-port" "make-input-port/read-to-peek" "make-inspector"
+    "make-interned-syntax-introducer" "make-keyword-procedure" "make-known-char-range-list"
+    "make-limited-input-port" "make-list" "make-lock-file-name" "make-log-receiver" "make-logger"
+    "make-mixin-contract" "make-mutable-custom-set" "make-none/c" "make-object" "make-output-port"
+    "make-parameter" "make-parent-directory*" "make-phantom-bytes" "make-pipe"
+    "make-pipe-with-specials" "make-placeholder" "make-plumber" "make-polar" "make-portal-syntax"
+    "make-prefab-struct" "make-primitive-class" "make-proj-contract" "make-pseudo-random-generator"
+    "make-reader-graph" "make-readtable" "make-rectangular" "make-rename-transformer"
+    "make-resolved-module-path" "make-security-guard" "make-semaphore" "make-set!-transformer"
+    "make-shared-bytes" "make-sibling-inspector" "make-special-comment" "make-srcloc" "make-string"
+    "make-struct-field-accessor" "make-struct-field-mutator" "make-struct-type"
+    "make-struct-type-property" "make-syntax-delta-introducer" "make-syntax-introducer"
+    "make-temporary-directory" "make-temporary-directory*" "make-temporary-file"
+    "make-temporary-file*" "make-tentative-pretty-print-output-port" "make-thread-cell"
+    "make-thread-group" "make-vector" "make-weak-box" "make-weak-custom-hash" "make-weak-custom-set"
+    "make-weak-hash" "make-weak-hasheq" "make-weak-hasheqv" "make-will-executor" "map"
+    "match-equality-test" "matches-arity-exactly?" "max" "mcar" "mcdr" "mcons" "member"
+    "member-name-key-hash-code" "member-name-key=?" "member-name-key?" "memf" "memory-order-acquire"
+    "memory-order-release" "memq" "memv" "merge-input" "method-in-interface?" "min"
+    "module->exports" "module->imports" "module->indirect-exports" "module->language-info"
+    "module->namespace" "module->realm" "module-compiled-cross-phase-persistent?"
+    "module-compiled-exports" "module-compiled-imports" "module-compiled-indirect-exports"
+    "module-compiled-language-info" "module-compiled-name" "module-compiled-realm"
+    "module-compiled-submodules" "module-declared?" "module-path-index-join"
+    "module-path-index-resolve" "module-path-index-split" "module-path-index-submodule"
+    "module-path-index?" "module-path?" "module-predefined?" "module-provide-protected?" "modulo"
+    "mpair?" "mutable-set" "mutable-seteq" "mutable-seteqv" "n->th" "nack-guard-evt"
+    "namespace-anchor->empty-namespace" "namespace-anchor->namespace" "namespace-anchor?"
+    "namespace-attach-module" "namespace-attach-module-declaration" "namespace-base-phase"
+    "namespace-call-with-registry-lock" "namespace-mapped-symbols" "namespace-module-identifier"
+    "namespace-module-registry" "namespace-require" "namespace-require/constant"
+    "namespace-require/copy" "namespace-require/expansion-time" "namespace-set-variable-value!"
+    "namespace-symbol->identifier" "namespace-syntax-introduce" "namespace-undefine-variable!"
+    "namespace-unprotect-module" "namespace-variable-value" "namespace?" "nan?" "natural-number/c"
+    "natural?" "negate" "negative-integer?" "negative?" "new-∀/c" "new-∃/c" "newline" "ninth"
+    "non-empty-listof" "non-empty-string?" "none/c" "nonnegative-integer?" "nonpositive-integer?"
+    "normal-case-path" "normalize-arity" "normalize-path" "normalized-arity?" "not" "not/c" "null?"
+    "number->string" "number?" "numerator" "object->vector" "object-info" "object-interface"
+    "object-method-arity-includes?" "object-name" "object-or-false=?" "object=-hash-code" "object=?"
+    "object?" "odd?" "one-of/c" "open-input-bytes" "open-input-file" "open-input-output-file"
+    "open-input-string" "open-output-bytes" "open-output-file" "open-output-nowhere"
+    "open-output-string" "or/c" "order-of-magnitude" "ormap" "output-port?" "pair?"
+    "parameter-procedure=?" "parameter/c" "parameter?" "parameterization?" "parse-command-line"
+    "partition" "path->bytes" "path->complete-path" "path->directory-path" "path->string"
+    "path-add-extension" "path-add-suffix" "path-convention-type" "path-element->bytes"
+    "path-element->string" "path-element?" "path-for-some-system?" "path-get-extension"
+    "path-has-extension?" "path-list-string->path-list" "path-only" "path-replace-extension"
+    "path-replace-suffix" "path-string?" "path<?" "path?" "pathlist-closure" "peek-byte"
+    "peek-byte-or-special" "peek-bytes" "peek-bytes!" "peek-bytes!-evt" "peek-bytes-avail!"
+    "peek-bytes-avail!*" "peek-bytes-avail!-evt" "peek-bytes-avail!/enable-break" "peek-bytes-evt"
+    "peek-char" "peek-char-or-special" "peek-string" "peek-string!" "peek-string!-evt"
+    "peek-string-evt" "peeking-input-port" "permutations" "phantom-bytes?" "pipe-content-length"
+    "place-break" "place-channel" "place-channel-get" "place-channel-put" "place-channel-put/get"
+    "place-channel?" "place-dead-evt" "place-enabled?" "place-kill" "place-location?"
+    "place-message-allowed?" "place-wait" "place?" "placeholder-get" "placeholder-set!"
+    "placeholder?" "plumber-add-flush!" "plumber-flush-all" "plumber-flush-handle-remove!"
+    "plumber-flush-handle?" "plumber?" "poll-guard-evt" "port->bytes" "port->bytes-lines"
+    "port->lines" "port->list" "port->string" "port-closed-evt" "port-closed?" "port-commit-peeked"
+    "port-count-lines!" "port-count-lines-enabled" "port-counts-lines?" "port-display-handler"
+    "port-file-identity" "port-file-unlock" "port-next-location" "port-number?" "port-print-handler"
+    "port-progress-evt" "port-provides-progress-evts?" "port-read-handler" "port-try-file-lock?"
+    "port-waiting-peer?" "port-write-handler" "port-writes-atomic?" "port-writes-special?" "port?"
+    "portal-syntax-content" "portal-syntax?" "positive-integer?" "positive?"
+    "prefab-key->struct-type" "prefab-key?" "prefab-struct-key" "preferences-lock-file-mode"
+    "pregexp" "pregexp?" "pretty-display" "pretty-format" "pretty-print"
+    "pretty-print-.-symbol-without-bars" "pretty-print-abbreviate-read-macros"
+    "pretty-print-columns" "pretty-print-current-style-table" "pretty-print-depth"
+    "pretty-print-exact-as-decimal" "pretty-print-extend-style-table" "pretty-print-handler"
+    "pretty-print-newline" "pretty-print-post-print-hook" "pretty-print-pre-print-hook"
+    "pretty-print-print-hook" "pretty-print-print-line" "pretty-print-remap-stylable"
+    "pretty-print-show-inexactness" "pretty-print-size-hook" "pretty-print-style-table?"
+    "pretty-printing" "pretty-write" "primitive-closure?" "primitive-result-arity" "primitive?"
+    "print" "print-as-expression" "print-boolean-long-form" "print-box" "print-graph"
+    "print-hash-table" "print-mpair-curly-braces" "print-pair-curly-braces"
+    "print-reader-abbreviations" "print-struct" "print-syntax-width" "print-unreadable"
+    "print-value-columns" "print-vector-length" "printable/c" "printf" "println" "procedure->method"
+    "procedure-arity" "procedure-arity-includes/c" "procedure-arity-includes?"
+    "procedure-arity-mask" "procedure-arity?" "procedure-closure-contents-eq?"
+    "procedure-extract-target" "procedure-impersonator*?" "procedure-keywords" "procedure-realm"
+    "procedure-reduce-arity" "procedure-reduce-arity-mask" "procedure-reduce-keyword-arity"
+    "procedure-reduce-keyword-arity-mask" "procedure-rename" "procedure-result-arity"
+    "procedure-specialize" "procedure-struct-type?" "procedure?" "process" "process*"
+    "process*/ports" "process/ports" "processor-count" "progress-evt?" "promise-forced?"
+    "promise-running?" "promise/c" "promise/name?" "promise?" "prop:arrow-contract-get-info"
+    "prop:arrow-contract?" "prop:orc-contract-get-subcontracts" "prop:orc-contract?"
+    "prop:recursive-contract-unroll" "prop:recursive-contract?" "proper-subset?" "property/c"
+    "pseudo-random-generator->vector" "pseudo-random-generator-vector?" "pseudo-random-generator?"
+    "put-preferences" "putenv" "quotient" "quotient/remainder" "radians->degrees" "raise"
+    "raise-argument-error" "raise-argument-error*" "raise-arguments-error" "raise-arguments-error*"
+    "raise-arity-error" "raise-arity-error*" "raise-arity-mask-error" "raise-arity-mask-error*"
+    "raise-blame-error" "raise-contract-error" "raise-mismatch-error" "raise-not-cons-blame-error"
+    "raise-range-error" "raise-range-error*" "raise-result-arity-error" "raise-result-arity-error*"
+    "raise-result-error" "raise-result-error*" "raise-syntax-error" "raise-type-error"
+    "raise-user-error" "random" "random-seed" "range" "rational?" "rationalize" "read"
+    "read-accept-bar-quote" "read-accept-box" "read-accept-compiled" "read-accept-dot"
+    "read-accept-graph" "read-accept-infix-dot" "read-accept-lang" "read-accept-quasiquote"
+    "read-accept-reader" "read-byte" "read-byte-or-special" "read-bytes" "read-bytes!"
+    "read-bytes!-evt" "read-bytes-avail!" "read-bytes-avail!*" "read-bytes-avail!-evt"
+    "read-bytes-avail!/enable-break" "read-bytes-evt" "read-bytes-line" "read-bytes-line-evt"
+    "read-case-sensitive" "read-cdot" "read-char" "read-char-or-special" "read-curly-brace-as-paren"
+    "read-curly-brace-with-tag" "read-decimal-as-inexact" "read-eval-print-loop"
+    "read-installation-configuration-table" "read-language" "read-line" "read-line-evt"
+    "read-on-demand-source" "read-single-flonum" "read-square-bracket-as-paren"
+    "read-square-bracket-with-tag" "read-string" "read-string!" "read-string!-evt" "read-string-evt"
+    "read-syntax" "read-syntax-accept-graph" "read-syntax/recursive" "read/recursive"
+    "readtable-mapping" "readtable?" "real->decimal-string" "real->double-flonum"
+    "real->floating-point-bytes" "real->single-flonum" "real-in" "real-part" "real?"
+    "reencode-input-port" "reencode-output-port" "regexp" "regexp-match" "regexp-match*"
+    "regexp-match-evt" "regexp-match-exact?" "regexp-match-peek" "regexp-match-peek-immediate"
+    "regexp-match-peek-positions" "regexp-match-peek-positions*"
+    "regexp-match-peek-positions-immediate" "regexp-match-peek-positions-immediate/end"
+    "regexp-match-peek-positions/end" "regexp-match-positions" "regexp-match-positions*"
+    "regexp-match-positions/end" "regexp-match/end" "regexp-match?" "regexp-max-lookbehind"
+    "regexp-quote" "regexp-replace" "regexp-replace*" "regexp-replace-quote" "regexp-replaces"
+    "regexp-split" "regexp-try-match" "regexp?" "relative-path?" "relocate-input-port"
+    "relocate-output-port" "remainder" "remf" "remf*" "remove" "remove*" "remove-duplicates" "remq"
+    "remq*" "remv" "remv*" "rename-contract" "rename-file-or-directory" "rename-transformer-target"
+    "rename-transformer?" "replace-evt" "reroot-path" "resolve-path" "resolved-module-path-name"
+    "resolved-module-path?" "rest" "reverse" "round" "second" "seconds->date" "security-guard?"
+    "semaphore-peek-evt" "semaphore-peek-evt?" "semaphore-post" "semaphore-try-wait?"
+    "semaphore-wait" "semaphore-wait/enable-break" "semaphore?" "sequence->list" "sequence->stream"
+    "sequence-add-between" "sequence-andmap" "sequence-append" "sequence-count" "sequence-filter"
+    "sequence-fold" "sequence-for-each" "sequence-generate" "sequence-generate*" "sequence-length"
+    "sequence-map" "sequence-ormap" "sequence-ref" "sequence-tail" "sequence/c" "sequence?" "set"
+    "set!-transformer-procedure" "set!-transformer?" "set->list" "set->stream" "set-add" "set-add!"
+    "set-box!" "set-box*!" "set-clear" "set-clear!" "set-copy" "set-copy-clear" "set-count"
+    "set-empty?" "set-eq?" "set-equal?" "set-eqv?" "set-first" "set-for-each" "set-implements/c"
+    "set-implements?" "set-intersect" "set-intersect!" "set-map" "set-mcar!" "set-mcdr!"
+    "set-member?" "set-mutable?" "set-phantom-bytes!" "set-port-next-location!" "set-remove"
+    "set-remove!" "set-rest" "set-subtract" "set-subtract!" "set-symmetric-difference"
+    "set-symmetric-difference!" "set-union" "set-union!" "set-weak?" "set/c" "set=?" "set?" "seteq"
+    "seteqv" "seventh" "sgn" "sha1-bytes" "sha224-bytes" "sha256-bytes" "shared-bytes"
+    "shell-execute" "shrink-path-wrt" "shuffle" "simple-form-path" "simplify-path" "sin"
+    "single-flonum-available?" "single-flonum?" "sinh" "sixth" "skip-projection-wrapper?" "sleep"
+    "some-system-path->string" "sort" "special-comment-value" "special-comment?"
+    "special-filter-input-port" "split-at" "split-at-right" "split-common-prefix" "split-path"
+    "splitf-at" "splitf-at-right" "sqr" "sqrt" "srcloc" "srcloc->string" "srcloc-column"
+    "srcloc-line" "srcloc-position" "srcloc-source" "srcloc-span" "srcloc?" "stop-after"
+    "stop-before" "stream->list" "stream-add-between" "stream-andmap" "stream-append" "stream-count"
+    "stream-empty?" "stream-filter" "stream-first" "stream-fold" "stream-for-each" "stream-force"
+    "stream-length" "stream-map" "stream-ormap" "stream-ref" "stream-rest" "stream-tail"
+    "stream-take" "stream/c" "stream?" "string" "string->bytes/latin-1" "string->bytes/locale"
+    "string->bytes/utf-8" "string->immutable-string" "string->keyword" "string->list"
+    "string->number" "string->path" "string->path-element" "string->some-system-path"
+    "string->symbol" "string->uninterned-symbol" "string->unreadable-symbol" "string-append"
+    "string-append*" "string-append-immutable" "string-ci<=?" "string-ci<?" "string-ci=?"
+    "string-ci>=?" "string-ci>?" "string-contains?" "string-copy" "string-copy!" "string-downcase"
+    "string-environment-variable-name?" "string-fill!" "string-foldcase" "string-join"
+    "string-len/c" "string-length" "string-locale-ci<?" "string-locale-ci=?" "string-locale-ci>?"
+    "string-locale-downcase" "string-locale-upcase" "string-locale<?" "string-locale=?"
+    "string-locale>?" "string-no-nuls?" "string-normalize-nfc" "string-normalize-nfd"
+    "string-normalize-nfkc" "string-normalize-nfkd" "string-normalize-spaces" "string-port?"
+    "string-prefix?" "string-ref" "string-replace" "string-set!" "string-split" "string-suffix?"
+    "string-titlecase" "string-trim" "string-upcase" "string-utf-8-length" "string<=?" "string<?"
+    "string=?" "string>=?" "string>?" "string?" "struct->vector" "struct-accessor-procedure?"
+    "struct-constructor-procedure?" "struct-info" "struct-mutator-procedure?"
+    "struct-predicate-procedure?" "struct-type-authentic?" "struct-type-info"
+    "struct-type-make-constructor" "struct-type-make-predicate"
+    "struct-type-property-accessor-procedure?" "struct-type-property-predicate-procedure?"
+    "struct-type-property/c" "struct-type-property?" "struct-type-sealed?" "struct-type?" "struct?"
+    "sub1" "subbytes" "subclass?" "subclass?/c" "subprocess" "subprocess-group-enabled"
+    "subprocess-kill" "subprocess-pid" "subprocess-status" "subprocess-wait" "subprocess?" "subset?"
+    "substring" "suggest/c" "symbol->string" "symbol-interned?" "symbol-unreadable?" "symbol<?"
+    "symbol=?" "symbol?" "symbols" "sync" "sync/enable-break" "sync/timeout"
+    "sync/timeout/enable-break" "syntax->datum" "syntax->list" "syntax-arm" "syntax-binding-set"
+    "syntax-binding-set->syntax" "syntax-binding-set-extend" "syntax-binding-set?" "syntax-column"
+    "syntax-debug-info" "syntax-deserialize" "syntax-disarm" "syntax-e" "syntax-line"
+    "syntax-local-apply-transformer" "syntax-local-bind-syntaxes" "syntax-local-certifier"
+    "syntax-local-context" "syntax-local-expand-expression" "syntax-local-get-shadower"
+    "syntax-local-identifier-as-binding" "syntax-local-introduce" "syntax-local-lift-context"
+    "syntax-local-lift-expression" "syntax-local-lift-module"
+    "syntax-local-lift-module-end-declaration" "syntax-local-lift-provide"
+    "syntax-local-lift-require" "syntax-local-lift-values-expression"
+    "syntax-local-make-definition-context" "syntax-local-make-delta-introducer"
+    "syntax-local-module-defined-identifiers" "syntax-local-module-exports"
+    "syntax-local-module-interned-scope-symbols" "syntax-local-module-required-identifiers"
+    "syntax-local-name" "syntax-local-phase-level" "syntax-local-submodules"
+    "syntax-local-transforming-module-provides?" "syntax-local-value" "syntax-local-value/immediate"
+    "syntax-original?" "syntax-position" "syntax-property" "syntax-property-preserved?"
+    "syntax-property-remove" "syntax-property-symbol-keys" "syntax-protect" "syntax-rearm"
+    "syntax-recertify" "syntax-serialize" "syntax-shift-phase-level" "syntax-source"
+    "syntax-source-module" "syntax-span" "syntax-taint" "syntax-tainted?" "syntax-track-origin"
+    "syntax-transforming-module-expression?" "syntax-transforming-with-lifts?"
+    "syntax-transforming?" "syntax/c" "syntax?" "system" "system*" "system*/exit-code"
+    "system-big-endian?" "system-idle-evt" "system-language+country" "system-library-subpath"
+    "system-path-convention-type" "system-type" "system/exit-code" "tail-marks-match?" "take"
+    "take-common-prefix" "take-right" "takef" "takef-right" "tan" "tanh" "tcp-abandon-port"
+    "tcp-accept" "tcp-accept-evt" "tcp-accept-ready?" "tcp-accept/enable-break" "tcp-addresses"
+    "tcp-close" "tcp-connect" "tcp-connect/enable-break" "tcp-listen" "tcp-listener?" "tcp-port?"
+    "tentative-pretty-print-port-cancel" "tentative-pretty-print-port-transfer" "tenth"
+    "terminal-port?" "third" "thread" "thread-cell-ref" "thread-cell-set!" "thread-cell-values?"
+    "thread-cell?" "thread-dead-evt" "thread-dead?" "thread-group?" "thread-receive"
+    "thread-receive-evt" "thread-resume" "thread-resume-evt" "thread-rewind-receive"
+    "thread-running?" "thread-send" "thread-suspend" "thread-suspend-evt" "thread-try-receive"
+    "thread-wait" "thread/suspend-to-kill" "thread?" "time-apply" "touch" "transplant-input-port"
+    "transplant-output-port" "truncate" "udp-addresses" "udp-bind!" "udp-bound?" "udp-close"
+    "udp-connect!" "udp-connected?" "udp-multicast-interface" "udp-multicast-join-group!"
+    "udp-multicast-leave-group!" "udp-multicast-loopback?" "udp-multicast-set-interface!"
+    "udp-multicast-set-loopback!" "udp-multicast-set-ttl!" "udp-multicast-ttl" "udp-open-socket"
+    "udp-receive!" "udp-receive!*" "udp-receive!-evt" "udp-receive!/enable-break"
+    "udp-receive-ready-evt" "udp-send" "udp-send*" "udp-send-evt" "udp-send-ready-evt" "udp-send-to"
+    "udp-send-to*" "udp-send-to-evt" "udp-send-to/enable-break" "udp-send/enable-break"
+    "udp-set-receive-buffer-size!" "udp-set-ttl!" "udp-ttl" "udp?" "unbox" "unbox*"
+    "uncaught-exception-handler" "unit?" "unquoted-printing-string" "unquoted-printing-string-value"
+    "unquoted-printing-string?" "unsupplied-arg?" "use-collection-link-paths"
+    "use-compiled-file-check" "use-compiled-file-paths" "use-user-specific-search-paths"
+    "value-blame" "value-contract" "values" "variable-reference->empty-namespace"
+    "variable-reference->module-base-phase" "variable-reference->module-declaration-inspector"
+    "variable-reference->module-path-index" "variable-reference->module-source"
+    "variable-reference->namespace" "variable-reference->phase"
+    "variable-reference->resolved-module-path" "variable-reference-constant?"
+    "variable-reference-from-unsafe?" "variable-reference?" "vector" "vector*-length" "vector*-ref"
+    "vector*-set!" "vector->immutable-vector" "vector->list" "vector->pseudo-random-generator"
+    "vector->pseudo-random-generator!" "vector->values" "vector-append" "vector-argmax"
+    "vector-argmin" "vector-cas!" "vector-copy" "vector-copy!" "vector-count" "vector-drop"
+    "vector-drop-right" "vector-empty?" "vector-fill!" "vector-filter" "vector-filter-not"
+    "vector-immutable" "vector-immutable/c" "vector-immutableof" "vector-length" "vector-map"
+    "vector-map!" "vector-member" "vector-memq" "vector-memv" "vector-ref" "vector-set!"
+    "vector-set*!" "vector-set-performance-stats!" "vector-sort" "vector-sort!" "vector-split-at"
+    "vector-split-at-right" "vector-take" "vector-take-right" "vector/c" "vector?" "vectorof"
+    "version" "void" "void?" "weak-box-value" "weak-box?" "weak-set" "weak-seteq" "weak-seteqv"
+    "will-execute" "will-executor?" "will-register" "will-try-execute" "with-input-from-bytes"
+    "with-input-from-file" "with-input-from-string" "with-output-to-bytes" "with-output-to-file"
+    "with-output-to-string" "would-be-future" "wrap-evt" "write" "write-byte" "write-bytes"
+    "write-bytes-avail" "write-bytes-avail*" "write-bytes-avail-evt"
+    "write-bytes-avail/enable-break" "write-char" "write-special" "write-special-avail*"
+    "write-special-evt" "write-string" "write-to-file" "writeln" "xor" "zero?" "~.a" "~.s" "~.v"
+    "~a" "~e" "~r" "~s" "~v"))
 
 ; operators ;;
 ((symbol) @operator
@@ -88,7 +611,40 @@
 
 ; builtin variables ;;
 ((symbol) @variable.builtin
-  (#any-of? @variable.builtin "always-evt" "block-device-type-bits" "character-device-type-bits" "check-tail-contract" "contract-continuation-mark-key" "contract-random-generate-fail" "directory-type-bits" "empty" "empty-sequence" "empty-stream" "eof" "equal<%>" "error-message-adjuster-key" "externalizable<%>" "failure-result/c" "false" "false/c" "fifo-type-bits" "file-type-bits" "for-clause-syntax-protect" "group-execute-bit" "group-permission-bits" "group-read-bit" "group-write-bit" "impersonator-prop:application-mark" "impersonator-prop:blame" "impersonator-prop:contracted" "legacy-match-expander?" "match-...-nesting" "match-expander?" "mixin-contract" "never-evt" "null" "object%" "other-execute-bit" "other-permission-bits" "other-read-bit" "other-write-bit" "pi" "pi.f" "predicate/c" "printable<%>" "prop:arity-string" "prop:arrow-contract" "prop:authentic" "prop:blame" "prop:chaperone-contract" "prop:checked-procedure" "prop:contract" "prop:contracted" "prop:custom-print-quotable" "prop:custom-write" "prop:dict" "prop:equal+hash" "prop:evt" "prop:exn:missing-module" "prop:exn:srclocs" "prop:expansion-contexts" "prop:flat-contract" "prop:impersonator-of" "prop:input-port" "prop:legacy-match-expander" "prop:liberal-define-context" "prop:match-expander" "prop:object-name" "prop:orc-contract" "prop:output-port" "prop:place-location" "prop:procedure" "prop:recursive-contract" "prop:rename-transformer" "prop:sealed" "prop:sequence" "prop:set!-transformer" "prop:stream" "regular-file-type-bits" "set-group-id-bit" "set-user-id-bit" "socket-type-bits" "sticky-bit" "struct:arity-at-least" "struct:arrow-contract-info" "struct:date" "struct:date*" "struct:exn" "struct:exn:break" "struct:exn:break:hang-up" "struct:exn:break:terminate" "struct:exn:fail" "struct:exn:fail:contract" "struct:exn:fail:contract:arity" "struct:exn:fail:contract:blame" "struct:exn:fail:contract:continuation" "struct:exn:fail:contract:divide-by-zero" "struct:exn:fail:contract:non-fixnum-result" "struct:exn:fail:contract:variable" "struct:exn:fail:filesystem" "struct:exn:fail:filesystem:errno" "struct:exn:fail:filesystem:exists" "struct:exn:fail:filesystem:missing-module" "struct:exn:fail:filesystem:version" "struct:exn:fail:network" "struct:exn:fail:network:errno" "struct:exn:fail:object" "struct:exn:fail:out-of-memory" "struct:exn:fail:read" "struct:exn:fail:read:eof" "struct:exn:fail:read:non-char" "struct:exn:fail:syntax" "struct:exn:fail:syntax:missing-module" "struct:exn:fail:syntax:unbound" "struct:exn:fail:unsupported" "struct:exn:fail:user" "struct:srcloc" "symbolic-link-type-bits" "syntax-local-match-introduce" "syntax-pattern-variable?" "the-unsupplied-arg" "true" "unspecified-dom" "user-execute-bit" "user-permission-bits" "user-read-bit" "user-write-bit" "writable<%>"))
+  (#any-of? @variable.builtin
+    "always-evt" "block-device-type-bits" "character-device-type-bits" "check-tail-contract"
+    "contract-continuation-mark-key" "contract-random-generate-fail" "directory-type-bits" "empty"
+    "empty-sequence" "empty-stream" "eof" "equal<%>" "error-message-adjuster-key"
+    "externalizable<%>" "failure-result/c" "false" "false/c" "fifo-type-bits" "file-type-bits"
+    "for-clause-syntax-protect" "group-execute-bit" "group-permission-bits" "group-read-bit"
+    "group-write-bit" "impersonator-prop:application-mark" "impersonator-prop:blame"
+    "impersonator-prop:contracted" "legacy-match-expander?" "match-...-nesting" "match-expander?"
+    "mixin-contract" "never-evt" "null" "object%" "other-execute-bit" "other-permission-bits"
+    "other-read-bit" "other-write-bit" "pi" "pi.f" "predicate/c" "printable<%>" "prop:arity-string"
+    "prop:arrow-contract" "prop:authentic" "prop:blame" "prop:chaperone-contract"
+    "prop:checked-procedure" "prop:contract" "prop:contracted" "prop:custom-print-quotable"
+    "prop:custom-write" "prop:dict" "prop:equal+hash" "prop:evt" "prop:exn:missing-module"
+    "prop:exn:srclocs" "prop:expansion-contexts" "prop:flat-contract" "prop:impersonator-of"
+    "prop:input-port" "prop:legacy-match-expander" "prop:liberal-define-context"
+    "prop:match-expander" "prop:object-name" "prop:orc-contract" "prop:output-port"
+    "prop:place-location" "prop:procedure" "prop:recursive-contract" "prop:rename-transformer"
+    "prop:sealed" "prop:sequence" "prop:set!-transformer" "prop:stream" "regular-file-type-bits"
+    "set-group-id-bit" "set-user-id-bit" "socket-type-bits" "sticky-bit" "struct:arity-at-least"
+    "struct:arrow-contract-info" "struct:date" "struct:date*" "struct:exn" "struct:exn:break"
+    "struct:exn:break:hang-up" "struct:exn:break:terminate" "struct:exn:fail"
+    "struct:exn:fail:contract" "struct:exn:fail:contract:arity" "struct:exn:fail:contract:blame"
+    "struct:exn:fail:contract:continuation" "struct:exn:fail:contract:divide-by-zero"
+    "struct:exn:fail:contract:non-fixnum-result" "struct:exn:fail:contract:variable"
+    "struct:exn:fail:filesystem" "struct:exn:fail:filesystem:errno"
+    "struct:exn:fail:filesystem:exists" "struct:exn:fail:filesystem:missing-module"
+    "struct:exn:fail:filesystem:version" "struct:exn:fail:network" "struct:exn:fail:network:errno"
+    "struct:exn:fail:object" "struct:exn:fail:out-of-memory" "struct:exn:fail:read"
+    "struct:exn:fail:read:eof" "struct:exn:fail:read:non-char" "struct:exn:fail:syntax"
+    "struct:exn:fail:syntax:missing-module" "struct:exn:fail:syntax:unbound"
+    "struct:exn:fail:unsupported" "struct:exn:fail:user" "struct:srcloc" "symbolic-link-type-bits"
+    "syntax-local-match-introduce" "syntax-pattern-variable?" "the-unsupplied-arg" "true"
+    "unspecified-dom" "user-execute-bit" "user-permission-bits" "user-read-bit" "user-write-bit"
+    "writable<%>"))
 
 (dot) @variable.builtin
 
@@ -106,7 +662,9 @@
   .
   (list
     (symbol) @variable)
-  (#any-of? @_p "lambda" "λ" "define-values" "define-syntaxes" "define-values-for-export" "define-values-for-syntax"))
+  (#any-of? @_p
+    "lambda" "λ" "define-values" "define-syntaxes" "define-values-for-export"
+    "define-values-for-syntax"))
 
 ;------------------------------------------------------------------;;
 ;                         Solve conflicts                          ;;
diff --git a/queries/re2c/injections.scm b/queries/re2c/injections.scm
index 4f92ea051..f0cb1a989 100644
--- a/queries/re2c/injections.scm
+++ b/queries/re2c/injections.scm
@@ -4,7 +4,8 @@
 ((define
   option: (option_name) @_yy
   value: (dstring) @injection.content)
-  (#any-of? @_yy "YYPEEK" "YYSKIP" "YYBACKUP" "YYBACKUPCTX" "YYRESTORE" "YYRESTORECTX" "YYFILL" "YYSHIFT")
+  (#any-of? @_yy
+    "YYPEEK" "YYSKIP" "YYBACKUP" "YYBACKUPCTX" "YYRESTORE" "YYRESTORECTX" "YYFILL" "YYSHIFT")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.parent))
 
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index 7d667eeea..27c37142c 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -30,20 +30,15 @@
   name: (type) @keyword.import)
   (#eq? @keyword.import "include"))
 
-((directive
-  name: (type) @function.builtin)
-  ; format-ignore
+(directive
+  name: (type) @function.builtin
   (#any-of? @function.builtin
     ; https://docutils.sourceforge.io/docs/ref/rst/directives.html
     "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
-    "image" "figure"
-    "topic" "sidebar" "line-block" "parsed-literal" "code" "math" "rubric" "epigraph" "highlights" "pull-quote" "compound" "container"
-    "table" "csv-table" "list-table"
-    "contents" "sectnum" "section-numbering" "header" "footer"
-    "target-notes"
-    "meta"
-    "replace" "unicode" "date"
-    "raw" "class" "role" "default-role" "title" "restructuredtext-test-directive"))
+    "image" "figure" "topic" "sidebar" "line-block" "parsed-literal" "code" "math" "rubric"
+    "epigraph" "highlights" "pull-quote" "compound" "container" "table" "csv-table" "list-table"
+    "contents" "sectnum" "section-numbering" "header" "footer" "target-notes" "meta" "replace"
+    "unicode" "date" "raw" "class" "role" "default-role" "title" "restructuredtext-test-directive"))
 
 ; Blocks
 [
@@ -87,25 +82,10 @@
 (role) @function
 
 ((role) @function.builtin
-  ; format-ignore
   (#any-of? @function.builtin
     ; https://docutils.sourceforge.io/docs/ref/rst/roles.html
-    ":emphasis:"
-    ":literal:"
-    ":code:"
-    ":math:"
-    ":pep-reference:"
-    ":PEP:"
-    ":rfc-reference:"
-    ":RFC:"
-    ":strong:"
-    ":subscript:"
-    ":sub:"
-    ":superscript:"
-    ":sup:"
-    ":title-reference:"
-    ":title:"
-    ":t:"
+    ":emphasis:" ":literal:" ":code:" ":math:" ":pep-reference:" ":PEP:" ":rfc-reference:" ":RFC:"
+    ":strong:" ":subscript:" ":sub:" ":superscript:" ":sup:" ":title-reference:" ":title:" ":t:"
     ":raw:"))
 
 [
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index ea8df0586..7ca479a65 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -6,7 +6,10 @@
   name: (type) @_type
   body: (body) @injection.content)
   (#set! injection.language "rst")
-  (#any-of? @_type "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition" "line-block" "parsed-literal" "epigraph" "highlights" "pull-quote" "compound" "header" "footer" "meta" "replace"))
+  (#any-of? @_type
+    "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
+    "line-block" "parsed-literal" "epigraph" "highlights" "pull-quote" "compound" "header" "footer"
+    "meta" "replace"))
 
 ; Directives with nested content without arguments, but with options
 ((directive
@@ -16,7 +19,9 @@
       (options)
       (content) @injection.content))
   (#set! injection.language "rst")
-  (#any-of? @_type "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition" "line-block" "parsed-literal" "compound"))
+  (#any-of? @_type
+    "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
+    "line-block" "parsed-literal" "compound"))
 
 ; Directives with nested content with arguments and options
 ((directive
@@ -25,7 +30,9 @@
     (body
       (content) @injection.content))
   (#set! injection.language "rst")
-  (#any-of? @_type "figure" "topic" "sidebar" "container" "table" "list-table" "class" "role" "restructuredtext-test-directive"))
+  (#any-of? @_type
+    "figure" "topic" "sidebar" "container" "table" "list-table" "class" "role"
+    "restructuredtext-test-directive"))
 
 ; Special directives
 ((directive
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 4e619a772..50e8c9093 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -125,7 +125,8 @@
 ] @variable.member
 
 ((identifier) @constant.builtin
-  (#any-of? @constant.builtin "__callee__" "__dir__" "__id__" "__method__" "__send__" "__ENCODING__" "__FILE__" "__LINE__"))
+  (#any-of? @constant.builtin
+    "__callee__" "__dir__" "__id__" "__method__" "__send__" "__ENCODING__" "__FILE__" "__LINE__"))
 
 ((constant) @type
   (#not-lua-match? @type "^[A-Z0-9_]+$"))
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index 202a6ab16..ed69a7822 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -65,7 +65,8 @@
   (list
     (list
       (symbol) @variable))
-  (#any-of? @_f "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*" "letrec-syntax"))
+  (#any-of? @_f
+    "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*" "letrec-syntax"))
 
 ; operators
 ((symbol) @operator
@@ -73,7 +74,12 @@
 
 ; keyword
 ((symbol) @keyword
-  (#any-of? @keyword "define" "lambda" "λ" "begin" "do" "define-syntax" "and" "or" "if" "cond" "case" "when" "unless" "else" "=>" "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*" "letrec-syntax" "set!" "syntax-rules" "identifier-syntax" "quote" "unquote" "quote-splicing" "quasiquote" "unquote-splicing" "delay" "assert" "library" "export" "import" "rename" "only" "except" "prefix"))
+  (#any-of? @keyword
+    "define" "lambda" "λ" "begin" "do" "define-syntax" "and" "or" "if" "cond" "case" "when"
+    "unless" "else" "=>" "let" "let*" "let-syntax" "let-values" "let*-values" "letrec" "letrec*"
+    "letrec-syntax" "set!" "syntax-rules" "identifier-syntax" "quote" "unquote" "quote-splicing"
+    "quasiquote" "unquote-splicing" "delay" "assert" "library" "export" "import" "rename" "only"
+    "except" "prefix"))
 
 ((symbol) @keyword.conditional
   (#any-of? @keyword.conditional "if" "cond" "case" "when" "unless"))
@@ -99,76 +105,54 @@
 ; builtin procedures
 ; procedures in R5RS and R6RS but not in R6RS-lib
 ((symbol) @function.builtin
-  ; format-ignore
   (#any-of? @function.builtin
     ; eq
     "eqv?" "eq?" "equal?"
     ; number
-    "number?" "complex?" "real?" "rational?" "integer?"
-    "exact?" "inexact?"
-    "zero?" "positive?" "negative?" "odd?" "even?" "finite?" "infinite?" "nan?"
-    "max" "min"
-    "abs" "quotient" "remainder" "modulo"
-    "div" "div0" "mod" "mod0" "div-and-mod" "div0-and-mod0"
-    "gcd" "lcm" "numerator" "denominator"
-    "floor" "ceiling" "truncate" "round"
-    "rationalize"
-    "exp" "log" "sin" "cos" "tan" "asin" "acos" "atan"
-    "sqrt" "expt"
-    "exact-integer-sqrt"
-    "make-rectangular" "make-polar" "real-part" "imag-part" "magnitude" "angle"
-    "real-valued" "rational-valued?" "integer-valued?"
-    "exact" "inexact" "exact->inexact" "inexact->exact"
-    "number->string" "string->number"
+    "number?" "complex?" "real?" "rational?" "integer?" "exact?" "inexact?" "zero?" "positive?"
+    "negative?" "odd?" "even?" "finite?" "infinite?" "nan?" "max" "min" "abs" "quotient" "remainder"
+    "modulo" "div" "div0" "mod" "mod0" "div-and-mod" "div0-and-mod0" "gcd" "lcm" "numerator"
+    "denominator" "floor" "ceiling" "truncate" "round" "rationalize" "exp" "log" "sin" "cos" "tan"
+    "asin" "acos" "atan" "sqrt" "expt" "exact-integer-sqrt" "make-rectangular" "make-polar"
+    "real-part" "imag-part" "magnitude" "angle" "real-valued" "rational-valued?" "integer-valued?"
+    "exact" "inexact" "exact->inexact" "inexact->exact" "number->string" "string->number"
     ; boolean
     "boolean?" "not" "boolean=?"
     ; pair
-    "pair?" "cons" 
-    "car" "cdr" 
-    "caar" "cadr" "cdar" "cddr" 
-    "caaar" "caadr" "cadar" "caddr" "cdaar" "cdadr" "cddar" "cdddr"
-    "caaaar" "caaadr" "caadar" "caaddr" "cadaar" "cadadr" "caddar" "cadddr"
-    "cdaaar" "cdaadr" "cdadar" "cdaddr" "cddaar" "cddadr" "cdddar" "cddddr"
-    "set-car!" "set-cdr!"
+    "pair?" "cons" "car" "cdr" "caar" "cadr" "cdar" "cddr" "caaar" "caadr" "cadar" "caddr" "cdaar"
+    "cdadr" "cddar" "cdddr" "caaaar" "caaadr" "caadar" "caaddr" "cadaar" "cadadr" "caddar" "cadddr"
+    "cdaaar" "cdaadr" "cdadar" "cdaddr" "cddaar" "cddadr" "cdddar" "cddddr" "set-car!" "set-cdr!"
     ; list
-    "null?" "list?"
-    "list" "length" "append" "reverse" "list-tail" "list-ref"
-    "map" "for-each"
+    "null?" "list?" "list" "length" "append" "reverse" "list-tail" "list-ref" "map" "for-each"
     "memq" "memv" "member" "assq" "assv" "assoc"
     ; symbol
     "symbol?" "symbol->string" "string->symbol" "symbol=?"
     ; char
-    "char?" "char=?" "char<?" "char>?" "char<=?" "char>=?"
-    "char-ci=?" "char-ci<?" "char-ci>?" "char-ci<=?" "char-ci>=?"
-    "char-alphabetic?" "char-numeric?" "char-whitespace?" "char-upper-case?" "char-lower-case?"
-    "char->integer" "integer->char"
-    "char-upcase" "char-downcase"
+    "char?" "char=?" "char<?" "char>?" "char<=?" "char>=?" "char-ci=?" "char-ci<?" "char-ci>?"
+    "char-ci<=?" "char-ci>=?" "char-alphabetic?" "char-numeric?" "char-whitespace?"
+    "char-upper-case?" "char-lower-case?" "char->integer" "integer->char" "char-upcase"
+    "char-downcase"
     ; string
-    "string?" "make-string" "string" "string-length" "string-ref" "string-set!"
-    "string=?" "string-ci=?" "string<?" "string>?" "string<=?" "string>=?"
-    "string-ci<?" "string-ci>?" "string-ci<=?" "string-ci>=?"
-    "substring" "string-append" "string->list" "list->string"
-    "string-for-each"
-    "string-copy" "string-fill!"
-    "string-upcase" "string-downcase"
+    "string?" "make-string" "string" "string-length" "string-ref" "string-set!" "string=?"
+    "string-ci=?" "string<?" "string>?" "string<=?" "string>=?" "string-ci<?" "string-ci>?"
+    "string-ci<=?" "string-ci>=?" "substring" "string-append" "string->list" "list->string"
+    "string-for-each" "string-copy" "string-fill!" "string-upcase" "string-downcase"
     ; vector
-    "vector?" "make-vector" "vector" "vector-length" "vector-ref" "vector-set!"
-    "vector->list" "list->vector" "vector-fill!" "vector-map" "vector-for-each"
+    "vector?" "make-vector" "vector" "vector-length" "vector-ref" "vector-set!" "vector->list"
+    "list->vector" "vector-fill!" "vector-map" "vector-for-each"
     ; bytevector
-    "bytevector?" "native-endianness"
-    "make-bytevector" "bytevector-length" "bytevector=?" "bytevector-fill!"
-    "bytevector-copy!" "bytevector-copy"
+    "bytevector?" "native-endianness" "make-bytevector" "bytevector-length" "bytevector=?"
+    "bytevector-fill!" "bytevector-copy!" "bytevector-copy"
     ; error
     "error" "assertion-violation"
     ; control
-    "procedure?" "apply" "force"
-    "call-with-current-continuation" "call/cc"
-    "values" "call-with-values" "dynamic-wind"
-    "eval" "scheme-report-environment" "null-environment" "interaction-environment"
+    "procedure?" "apply" "force" "call-with-current-continuation" "call/cc" "values"
+    "call-with-values" "dynamic-wind" "eval" "scheme-report-environment" "null-environment"
+    "interaction-environment"
     ; IO
-    "call-with-input-file" "call-with-output-file" "input-port?" "output-port?"
-    "current-input-port" "current-output-port" "with-input-from-file" "with-output-to-file"
-    "open-input-file" "open-output-file" "close-input-port" "close-output-port"
+    "call-with-input-file" "call-with-output-file" "input-port?" "output-port?" "current-input-port"
+    "current-output-port" "with-input-from-file" "with-output-to-file" "open-input-file"
+    "open-output-file" "close-input-port" "close-output-port"
     ; input
     "read" "read-char" "peek-char" "eof-object?" "char-ready?"
     ; output
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index b33aa41ec..da7bef337 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -171,49 +171,35 @@
         "."
         (_) @function.builtin)
   ]
-  ; format-ignore
   (#any-of? @function.builtin
-   ; General Methods
-   "assert" "array" "callee" "collectgarbage" "compilestring"
-   "enabledebughook" "enabledebuginfo" "error" "getconsttable"
-   "getroottable" "print" "resurrectunreachable" "setconsttable"
-   "setdebughook" "seterrorhandler" "setroottable" "type"
-
-   ; Hidden Methods
-   "_charsize_" "_intsize_" "_floatsize_" "_version_" "_versionnumber_"
-
-   ; Number Methods
-   "tofloat" "tostring" "tointeger" "tochar"
-
-   ; String Methods
-   "len" "slice" "find" "tolower" "toupper"
-
-   ; Table Methods
-   "rawget" "rawset" "rawdelete" "rawin" "clear" 
-   "setdelegate" "getdelegate" "filter" "keys" "values"
-
-   ; Array Methods
-   "append" "push" "extend" "pop" "top" "insert" "remove" "resize" "sort"
-   "reverse" "map" "apply" "reduce"
-
-   ; Function Methods
-   "call" "pcall" "acall" "pacall" "setroot" "getroot" "bindenv" "getinfos"
-
-   ; Class Methods
-   "instance" "getattributes" "setattributes" "newmember" "rawnewmember"
-
-   ; Class Instance Methods
-   "getclass"
-
-   ; Generator Methods
-   "getstatus"
-
-   ; Thread Methods
-   "call" "wakeup" "wakeupthrow" "getstackinfos"
-
-   ; Weak Reference Methods
-   "ref" "weakref"
-))
+    ; General Methods
+    "assert" "array" "callee" "collectgarbage" "compilestring" "enabledebughook" "enabledebuginfo"
+    "error" "getconsttable" "getroottable" "print" "resurrectunreachable" "setconsttable"
+    "setdebughook" "seterrorhandler" "setroottable" "type"
+    ; Hidden Methods
+    "_charsize_" "_intsize_" "_floatsize_" "_version_" "_versionnumber_"
+    ; Number Methods
+    "tofloat" "tostring" "tointeger" "tochar"
+    ; String Methods
+    "len" "slice" "find" "tolower" "toupper"
+    ; Table Methods
+    "rawget" "rawset" "rawdelete" "rawin" "clear" "setdelegate" "getdelegate" "filter" "keys"
+    "values"
+    ; Array Methods
+    "append" "push" "extend" "pop" "top" "insert" "remove" "resize" "sort" "reverse" "map" "apply"
+    "reduce"
+    ; Function Methods
+    "call" "pcall" "acall" "pacall" "setroot" "getroot" "bindenv" "getinfos"
+    ; Class Methods
+    "instance" "getattributes" "setattributes" "newmember" "rawnewmember"
+    ; Class Instance Methods
+    "getclass"
+    ; Generator Methods
+    "getstatus"
+    ; Thread Methods
+    "call" "wakeup" "wakeupthrow" "getstackinfos"
+    ; Weak Reference Methods
+    "ref" "weakref"))
 
 (member_declaration
   "constructor" @constructor)
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 5dd45f4dd..9affc32c1 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -17,11 +17,9 @@
   (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
 
 ((identifier) @constant.builtin
-  ; format-ignore
-  (#any-of? @constant.builtin 
+  (#any-of? @constant.builtin
     ; https://docs.python.org/3/library/constants.html
-    "NotImplemented" "Ellipsis" 
-    "quit" "exit" "copyright" "credits" "license"))
+    "NotImplemented" "Ellipsis" "quit" "exit" "copyright" "credits" "license"))
 
 ((attribute
   attribute: (identifier) @variable.member)
@@ -68,14 +66,14 @@
 ; Builtin functions
 ((call
   function: (identifier) @function.builtin)
-  ; format-ignore
   (#any-of? @function.builtin
-    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
-    "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "fail" "filter" "float" "format"
-    "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
-    "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
-    "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
-    "struct" "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr"
+    "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec"
+    "fail" "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex"
+    "id" "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max"
+    "memoryview" "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr"
+    "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "struct" "sum" "super"
+    "tuple" "type" "vars" "zip" "__import__"))
 
 ; Function definitions
 (function_definition
@@ -97,23 +95,24 @@
   (#eq? @_isinstance "isinstance"))
 
 ((identifier) @type.builtin
-  ; format-ignore
   (#any-of? @type.builtin
     ; https://docs.python.org/3/library/exceptions.html
-    "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
-    "EOFError" "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError"
-    "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
-    "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
-    "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
-    "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
-    "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
-    "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
-    "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-    "FutureWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+    "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError" "EOFError"
+    "FloatingPointError" "ModuleNotFoundError" "IndexError" "KeyError" "KeyboardInterrupt"
+    "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+    "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError"
+    "IndentationError" "TabError" "SystemError" "SystemExit" "TypeError" "UnboundLocalError"
+    "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError" "UnicodeTranslateError" "ValueError"
+    "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError" "BlockingIOError"
+    "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+    "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError"
+    "InterruptedError" "IsADirectoryError" "NotADirectoryError" "PermissionError"
+    "ProcessLookupError" "TimeoutError" "Warning" "UserWarning" "DeprecationWarning"
+    "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning" "FutureWarning" "UnicodeWarning"
+    "BytesWarning" "ResourceWarning"
     ; https://docs.python.org/3/library/stdtypes.html
-    "bool" "int" "float" "complex" "list" "tuple" "range" "str"
-    "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type"))
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str" "bytes" "bytearray" "memoryview"
+    "set" "frozenset" "dict" "type"))
 
 ; Normal parameters
 (parameters
diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm
index d686d2a0c..a2832ae2b 100644
--- a/queries/systemtap/highlights.scm
+++ b/queries/systemtap/highlights.scm
@@ -38,7 +38,9 @@
 
 ((call_expression
   function: (identifier) @function.builtin)
-  (#any-of? @function.builtin "print" "printd" "printdln" "printf" "println" "sprint" "sprintd" "sprintdln" "sprintf" "sprintln"))
+  (#any-of? @function.builtin
+    "print" "printd" "printdln" "printf" "println" "sprint" "sprintd" "sprintdln" "sprintf"
+    "sprintln"))
 
 ((identifier) @variable.builtin
   (#lua-match? @variable.builtin "^\$+[0-9A-Z_a-z]+\$*$"))
diff --git a/queries/tcl/highlights.scm b/queries/tcl/highlights.scm
index 5cb281dbd..f36f65623 100644
--- a/queries/tcl/highlights.scm
+++ b/queries/tcl/highlights.scm
@@ -15,17 +15,25 @@
   name: (_) @variable.parameter)
 
 ((simple_word) @variable.builtin
-  (#any-of? @variable.builtin "argc" "argv" "argv0" "auto_path" "env" "errorCode" "errorInfo" "tcl_interactive" "tcl_library" "tcl_nonwordchars" "tcl_patchLevel" "tcl_pkgPath" "tcl_platform" "tcl_precision" "tcl_rcFileName" "tcl_traceCompile" "tcl_traceExec" "tcl_wordchars" "tcl_version"))
+  (#any-of? @variable.builtin
+    "argc" "argv" "argv0" "auto_path" "env" "errorCode" "errorInfo" "tcl_interactive" "tcl_library"
+    "tcl_nonwordchars" "tcl_patchLevel" "tcl_pkgPath" "tcl_platform" "tcl_precision"
+    "tcl_rcFileName" "tcl_traceCompile" "tcl_traceExec" "tcl_wordchars" "tcl_version"))
 
 "expr" @function.builtin
 
 (command
   name: (simple_word) @function.builtin
-  (#any-of? @function.builtin "cd" "exec" "exit" "incr" "info" "join" "puts" "regexp" "regsub" "split" "subst" "trace" "source"))
+  (#any-of? @function.builtin
+    "cd" "exec" "exit" "incr" "info" "join" "puts" "regexp" "regsub" "split" "subst" "trace"
+    "source"))
 
 (command
   name: (simple_word) @keyword
-  (#any-of? @keyword "append" "break" "catch" "continue" "default" "dict" "error" "eval" "global" "lappend" "lassign" "lindex" "linsert" "list" "llength" "lmap" "lrange" "lrepeat" "lreplace" "lreverse" "lsearch" "lset" "lsort" "package" "return" "switch" "throw" "unset" "variable"))
+  (#any-of? @keyword
+    "append" "break" "catch" "continue" "default" "dict" "error" "eval" "global" "lappend" "lassign"
+    "lindex" "linsert" "list" "llength" "lmap" "lrange" "lrepeat" "lreplace" "lreverse" "lsearch"
+    "lset" "lsort" "package" "return" "switch" "throw" "unset" "variable"))
 
 [
   "error"
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index 1d75a7028..901e2d571 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -1,7 +1,9 @@
 ; Built-ins {{{
 ((function_call
   function: (identifier) @function.builtin)
-  (#any-of? @function.builtin "chr" "concat" "exit" "flush" "getchar" "not" "ord" "print" "print_err" "print_int" "size" "strcmp" "streq" "substring"))
+  (#any-of? @function.builtin
+    "chr" "concat" "exit" "flush" "getchar" "not" "ord" "print" "print_err" "print_int" "size"
+    "strcmp" "streq" "substring"))
 
 ((type_identifier) @type.builtin
   (#any-of? @type.builtin "int" "string" "Object"))
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
index e6f5e322c..0889f1925 100644
--- a/queries/usd/highlights.scm
+++ b/queries/usd/highlights.scm
@@ -123,62 +123,22 @@
     "Vec3f" "Vec3f[]"))
 
 ((identifier) @keyword
-  ; format-ignore
   (#any-of? @keyword
     ; Reference: https://openusd.org/release/api/sdf_page_front.html
     ; LIVRPS names
-    "inherits"
-    "payload"
-    "references"
-    "specializes"
-    "variantSets"
-    "variants"
-
+    "inherits" "payload" "references" "specializes" "variantSets" "variants"
     ; assetInfo names
-    "assetInfo"
-    "identifier"
-    "name"
-    "payloadAssetDependencies"
-    "version"
-
+    "assetInfo" "identifier" "name" "payloadAssetDependencies" "version"
     ; clips names
-    "clips"
-
-    "active"
-    "assetPaths"
-    "manifestAssetPath"
-    "primPath"
-    "templateAssetPath"
-    "templateEndTime"
-    "templateStartTime"
-    "templateStride"
-    "times"
-
+    "clips" "active" "assetPaths" "manifestAssetPath" "primPath" "templateAssetPath"
+    "templateEndTime" "templateStartTime" "templateStride" "times"
     ; customData names
-    "customData"
-
-    "apiSchemaAutoApplyTo"
-    "apiSchemaOverridePropertyNames"
-    "className"
-    "extraPlugInfo"
-    "isUsdShadeContainer"
-    "libraryName"
-    "providesUsdShadeConnectableAPIBehavior"
-    "requiresUsdShadeEncapsulation"
-    "skipCodeGeneration"
-
+    "customData" "apiSchemaAutoApplyTo" "apiSchemaOverridePropertyNames" "className" "extraPlugInfo"
+    "isUsdShadeContainer" "libraryName" "providesUsdShadeConnectableAPIBehavior"
+    "requiresUsdShadeEncapsulation" "skipCodeGeneration"
     ; Layer metadata names
-    "colorConfiguration"
-    "colorManagementSystem"
-    "customLayerData"
-    "defaultPrim"
-    "doc"
-    "endTimeCode"
-    "framesPerSecond"
-    "owner"
-    "startTimeCode"
-    "subLayers"
-
+    "colorConfiguration" "colorManagementSystem" "customLayerData" "defaultPrim" "doc" "endTimeCode"
+    "framesPerSecond" "owner" "startTimeCode" "subLayers"
     ; Prim metadata
     "instanceable"))
 
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 9c57a19aa..74001da65 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -164,7 +164,34 @@
   name: (reference_expression) @function.call)
 
 ((identifier) @function.builtin
-  (#any-of? @function.builtin "eprint" "eprintln" "error" "exit" "panic" "print" "println" "after" "after_char" "all" "all_after" "all_after_last" "all_before" "all_before_last" "any" "ascii_str" "before" "bool" "byte" "byterune" "bytes" "bytestr" "c_error_number_str" "capitalize" "clear" "clone" "clone_to_depth" "close" "code" "compare" "compare_strings" "contains" "contains_any" "contains_any_substr" "copy" "count" "cstring_to_vstring" "delete" "delete_last" "delete_many" "ends_with" "eprint" "eprintln" "eq_epsilon" "error" "error_with_code" "exit" "f32" "f32_abs" "f32_max" "f32_min" "f64" "f64_max" "fields" "filter" "find_between" "first" "flush_stderr" "flush_stdout" "free" "gc_check_leaks" "get_str_intp_u32_format" "get_str_intp_u64_format" "grow_cap" "grow_len" "hash" "hex" "hex2" "hex_full" "i16" "i64" "i8" "index" "index_after" "index_any" "index_byte" "insert" "int" "is_alnum" "is_bin_digit" "is_capital" "is_digit" "is_hex_digit" "is_letter" "is_lower" "is_oct_digit" "is_space" "is_title" "is_upper" "isnil" "join" "join_lines" "keys" "last" "last_index" "last_index_byte" "length_in_bytes" "limit" "malloc" "malloc_noscan" "map" "match_glob" "memdup" "memdup_noscan" "move" "msg" "panic" "panic_error_number" "panic_lasterr" "panic_optional_not_set" "parse_int" "parse_uint" "pointers" "pop" "prepend" "print" "print_backtrace" "println" "proc_pidpath" "ptr_str" "push_many" "realloc_data" "reduce" "repeat" "repeat_to_depth" "replace" "replace_each" "replace_once" "reverse" "reverse_in_place" "runes" "sort" "sort_by_len" "sort_ignore_case" "sort_with_compare" "split" "split_any" "split_into_lines" "split_nth" "starts_with" "starts_with_capital" "str" "str_escaped" "str_intp" "str_intp_g32" "str_intp_g64" "str_intp_rune" "str_intp_sq" "str_intp_sub" "strg" "string_from_wide" "string_from_wide2" "strip_margin" "strip_margin_custom" "strlong" "strsci" "substr" "substr_ni" "substr_with_check" "title" "to_lower" "to_upper" "to_wide" "tos" "tos2" "tos3" "tos4" "tos5" "tos_clone" "trim" "trim_left" "trim_pr" "try_pop" "try_push" "utf32_decode_to_buffer" "utf32_to_str" "utf32_to_str_no_malloc" "utf8_char_len" "utf8_getchar" "utf8_str_len" "utf8_str_visible_length" "utf8_to_utf32" "v_realloc" "vbytes" "vcalloc" "vcalloc_noscan" "vmemcmp" "vmemcpy" "vmemmove" "vmemset" "vstring" "vstring_literal" "vstring_literal_with_len" "vstring_with_len" "vstrlen" "vstrlen_char" "winapi_lasterr_str"))
+  (#any-of? @function.builtin
+    "eprint" "eprintln" "error" "exit" "panic" "print" "println" "after" "after_char" "all"
+    "all_after" "all_after_last" "all_before" "all_before_last" "any" "ascii_str" "before" "bool"
+    "byte" "byterune" "bytes" "bytestr" "c_error_number_str" "capitalize" "clear" "clone"
+    "clone_to_depth" "close" "code" "compare" "compare_strings" "contains" "contains_any"
+    "contains_any_substr" "copy" "count" "cstring_to_vstring" "delete" "delete_last" "delete_many"
+    "ends_with" "eprint" "eprintln" "eq_epsilon" "error" "error_with_code" "exit" "f32" "f32_abs"
+    "f32_max" "f32_min" "f64" "f64_max" "fields" "filter" "find_between" "first" "flush_stderr"
+    "flush_stdout" "free" "gc_check_leaks" "get_str_intp_u32_format" "get_str_intp_u64_format"
+    "grow_cap" "grow_len" "hash" "hex" "hex2" "hex_full" "i16" "i64" "i8" "index" "index_after"
+    "index_any" "index_byte" "insert" "int" "is_alnum" "is_bin_digit" "is_capital" "is_digit"
+    "is_hex_digit" "is_letter" "is_lower" "is_oct_digit" "is_space" "is_title" "is_upper" "isnil"
+    "join" "join_lines" "keys" "last" "last_index" "last_index_byte" "length_in_bytes" "limit"
+    "malloc" "malloc_noscan" "map" "match_glob" "memdup" "memdup_noscan" "move" "msg" "panic"
+    "panic_error_number" "panic_lasterr" "panic_optional_not_set" "parse_int" "parse_uint"
+    "pointers" "pop" "prepend" "print" "print_backtrace" "println" "proc_pidpath" "ptr_str"
+    "push_many" "realloc_data" "reduce" "repeat" "repeat_to_depth" "replace" "replace_each"
+    "replace_once" "reverse" "reverse_in_place" "runes" "sort" "sort_by_len" "sort_ignore_case"
+    "sort_with_compare" "split" "split_any" "split_into_lines" "split_nth" "starts_with"
+    "starts_with_capital" "str" "str_escaped" "str_intp" "str_intp_g32" "str_intp_g64"
+    "str_intp_rune" "str_intp_sq" "str_intp_sub" "strg" "string_from_wide" "string_from_wide2"
+    "strip_margin" "strip_margin_custom" "strlong" "strsci" "substr" "substr_ni" "substr_with_check"
+    "title" "to_lower" "to_upper" "to_wide" "tos" "tos2" "tos3" "tos4" "tos5" "tos_clone" "trim"
+    "trim_left" "trim_pr" "try_pop" "try_push" "utf32_decode_to_buffer" "utf32_to_str"
+    "utf32_to_str_no_malloc" "utf8_char_len" "utf8_getchar" "utf8_str_len" "utf8_str_visible_length"
+    "utf8_to_utf32" "v_realloc" "vbytes" "vcalloc" "vcalloc_noscan" "vmemcmp" "vmemcpy" "vmemmove"
+    "vmemset" "vstring" "vstring_literal" "vstring_literal_with_len" "vstring_with_len" "vstrlen"
+    "vstrlen_char" "winapi_lasterr_str"))
 
 ; Operators
 [
diff --git a/queries/vim/injections.scm b/queries/vim/injections.scm
index c76feddb4..30d11cbb4 100644
--- a/queries/vim/injections.scm
+++ b/queries/vim/injections.scm
@@ -35,7 +35,9 @@
 ((set_item
   option: (option_name) @_option
   value: (set_value) @injection.content)
-  (#any-of? @_option "includeexpr" "inex" "printexpr" "pexpr" "formatexpr" "fex" "indentexpr" "inde" "foldtext" "fdt" "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" "charconvert" "ccv")
+  (#any-of? @_option
+    "includeexpr" "inex" "printexpr" "pexpr" "formatexpr" "fex" "indentexpr" "inde" "foldtext" "fdt"
+    "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" "charconvert" "ccv")
   (#set! injection.language "vim"))
 
 ((comment) @injection.content
diff --git a/queries/yuck/highlights.scm b/queries/yuck/highlights.scm
index 2d5d01c0b..7b9a9d203 100644
--- a/queries/yuck/highlights.scm
+++ b/queries/yuck/highlights.scm
@@ -13,7 +13,8 @@
 (list
   .
   (symbol) @keyword
-  (#any-of? @keyword "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "geometry" "children" "struts"))
+  (#any-of? @keyword
+    "defwindow" "defwidget" "defvar" "defpoll" "deflisten" "geometry" "children" "struts"))
 
 ; Loop
 (loop_widget
@@ -38,7 +39,10 @@
 (list
   .
   (symbol) @tag.builtin
-  (#any-of? @tag.builtin "box" "button" "calendar" "centerbox" "checkbox" "circular-progress" "color-button" "color-chooser" "combo-box-text" "eventbox" "expander" "graph" "image" "input" "label" "literal" "overlay" "progress" "revealer" "scale" "scroll" "transform"))
+  (#any-of? @tag.builtin
+    "box" "button" "calendar" "centerbox" "checkbox" "circular-progress" "color-button"
+    "color-chooser" "combo-box-text" "eventbox" "expander" "graph" "image" "input" "label" "literal"
+    "overlay" "progress" "revealer" "scale" "scroll" "transform"))
 
 ; Variables
 (ident) @variable
@@ -47,7 +51,9 @@
   (symbol) @variable)
 
 ((ident) @variable.builtin
-  (#any-of? @variable.builtin "EWW_TEMPS" "EWW_RAM" "EWW_DISK" "EWW_BATTERY" "EWW_CPU" "EWW_NET" "EWW_TIME" "EWW_CONFIG_DIR" "EWW_CMD" "EWW_EXECUTABLE"))
+  (#any-of? @variable.builtin
+    "EWW_TEMPS" "EWW_RAM" "EWW_DISK" "EWW_BATTERY" "EWW_CPU" "EWW_NET" "EWW_TIME" "EWW_CONFIG_DIR"
+    "EWW_CMD" "EWW_EXECUTABLE"))
 
 ; Properties
 (keyword) @property
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 41ab16ce3..ec2197956 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -34,6 +34,7 @@ end)
 
 --- Control the indent here. Change to \t if uses tab instead
 local indent_str = "  "
+local textwidth = 100
 
 -- Query to control the formatter
 local format_queries = [[
@@ -174,8 +175,8 @@ local format_queries = [[
   [
     "_"
     name: (identifier)
-  ]
-  (_) @format.cancel-append
+    (_)
+  ] @format.cancel-append
   .
   ")"
   (#not-has-type? @format.cancel-append comment))
@@ -254,9 +255,26 @@ local format_queries = [[
   .
   (capture))
 
+; Separate this query to avoid capture duplication
+(predicate
+  "(" @format.indent.begin @format.cancel-append)
 (predicate
   (parameters
-    (_) @format.prepend-space))
+    (comment) @format.prepend-newline
+    .
+    (_) @format.cancel-prepend)
+  (#is-start-of-line? @format.prepend-newline))
+(predicate
+  (parameters
+    (_) @format.prepend-space)
+  (#set! conditional-newline))
+(predicate
+  (parameters
+    .
+    (capture)
+    . (_) @format.prepend-space)
+  (#set! lookahead-newline)
+  (#set! conditional-newline))
 ;; Workaround to keep the string's content
 (string) @format.keep
 
@@ -322,7 +340,24 @@ local function iter(bufnr, node, lines, q, level)
         if q["format.prepend-newline"][id] then
           lines[#lines + 1] = string.rep(indent_str, level)
         elseif q["format.prepend-space"][id] then
-          lines[#lines] = lines[#lines] .. " "
+          if not q["format.prepend-space"][id]["conditional-newline"] then
+            lines[#lines] = lines[#lines] .. " "
+          elseif child:byte_length() + 1 + #lines[#lines] > textwidth then
+            lines[#lines + 1] = string.rep(indent_str, level)
+          else
+            -- Do a rough guess of the actual byte length. If it's larger than `columns` then add a newline first
+            -- column - byte_end + byte_start
+            local _, _, byte_start = child:start()
+            local _, _, byte_end = node:end_()
+            if
+              q["format.prepend-space"][id]["lookahead-newline"]
+              and textwidth - (byte_end - byte_start) - #lines[#lines] < 0
+            then
+              lines[#lines + 1] = string.rep(indent_str, level)
+            else
+              lines[#lines] = lines[#lines] .. " "
+            end
+          end
         end
       end
       if q["format.replace"][id] then

From f148c8a76638cb6b6a6818924f647534f4eef301 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 06:43:28 +0000
Subject: [PATCH 1209/2704] Update parsers: arduino, cmake, dtd, fidl, mlir,
 perl, slint, sourcepawn, wing, xml

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a16ecc14f..fee1e0e54 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "2372f163b8416eeea674686fe0222e39fa06bad5"
+    "revision": "a282270857b7be447b8be91411468349a31d73b7"
   },
   "asm": {
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
@@ -66,7 +66,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "3175c3f5fdccfec8d3e506f6d95b485cbd6f93fb"
+    "revision": "f8de25f30757a2def006a7c144354710fe63dcf3"
   },
   "comment": {
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "d747bcff8af333fa35b93620f2689406ec5b55b2"
+    "revision": "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -165,7 +165,7 @@
     "revision": "9265a7d635d2f82a10738b9ad65ba8dd8bd4a84a"
   },
   "fidl": {
-    "revision": "0e1180bb126f280711a62f2a21e3609923fd8b0c"
+    "revision": "cdb35101270f2da3f0b151d11283a7965a09bf98"
   },
   "firrtl": {
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
@@ -405,7 +405,7 @@
     "revision": "d6ec8ce0963c3c8180161391f15d8f7d415f650d"
   },
   "mlir": {
-    "revision": "650a8fb72013ba8d169bdb458e480d640fc545c9"
+    "revision": "117cbbc46bbf82ae30b24f8939573655017226da"
   },
   "muttrc": {
     "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
@@ -465,7 +465,7 @@
     "revision": "7905a168036e23605160a0d32a142f58ab5eaa06"
   },
   "perl": {
-    "revision": "a30394f61b607f48c841c6e085d5219f23872816"
+    "revision": "fd8b951cf6f72d48dfd07679de8cf0260836b231"
   },
   "php": {
     "revision": "710754c879435178b7643e525c84cd53f32c510c"
@@ -600,7 +600,7 @@
     "revision": "0cdfb1741323f38e9a33798674145c22cfc0092b"
   },
   "slint": {
-    "revision": "68405a45f7a5311cd1f77e40ba84199573303f52"
+    "revision": "3c82235f41b63f35a01ae3888206e93585cbb84a"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
@@ -621,7 +621,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "cea67796eb919322785172c1bc7b11dc6c2d52b7"
+    "revision": "4cf55de594d8029e1034726aacac80dfd0e9010c"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -765,13 +765,13 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "e8a5f3ade226509f422dbd4c5900288df3729a62"
+    "revision": "3e74a6215e9b931ced84e9b059924dd7cfa3573e"
   },
   "xcompose": {
     "revision": "8898238fca7e143760386448093392b87e58002e"
   },
   "xml": {
-    "revision": "d747bcff8af333fa35b93620f2689406ec5b55b2"
+    "revision": "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From e159a531e5470f48a174425713a82208952b9b1c Mon Sep 17 00:00:00 2001
From: chaopeng <chaopeng@chaopeng.me>
Date: Fri, 23 Feb 2024 09:36:14 -0500
Subject: [PATCH 1210/2704] fix(fidl): remove requires_generate_from_grammar

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fee1e0e54..b6bc19876 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "9265a7d635d2f82a10738b9ad65ba8dd8bd4a84a"
   },
   "fidl": {
-    "revision": "cdb35101270f2da3f0b151d11283a7965a09bf98"
+    "revision": "bdbb635a7f5035e424f6173f2f11b9cd79703f8d"
   },
   "firrtl": {
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index bd647d595..6209ccc84 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -539,7 +539,6 @@ list.fidl = {
   install_info = {
     url = "https://github.com/google/tree-sitter-fidl",
     files = { "src/parser.c" },
-    requires_generate_from_grammar = true,
   },
   maintainers = { "@chaopeng" },
 }

From e105b5e67df1a9bbd9d35a9aef4d40d0119d708d Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 23 Feb 2024 17:21:26 +0200
Subject: [PATCH 1211/2704] feat(properties): update parser & queries

---
 README.md                         |  2 +-
 lockfile.json                     |  2 +-
 lua/nvim-treesitter/parsers.lua   |  4 ++--
 queries/properties/highlights.scm | 16 +++++++++++-----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6823484b4..c25e98e3a 100644
--- a/README.md
+++ b/README.md
@@ -340,7 +340,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [printf](https://github.com/ObserverOfTime/tree-sitter-printf) (maintained by @ObserverOfTime)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
-- [x] [properties](https://github.com/ObserverOfTime/tree-sitter-properties) (maintained by @ObserverOfTime)
+- [x] [properties](https://github.com/tree-sitter-grammars/tree-sitter-properties) (maintained by @ObserverOfTime)
 - [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
 - [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
 - [x] [psv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index b6bc19876..9adbcbe67 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -501,7 +501,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "74e5d3c63d0da17c0800b3cf9090b24637ef6b59"
+    "revision": "189b3cc18d36871c27ebb0adcf0cddd123b0cbba"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6209ccc84..59cef4d53 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1484,8 +1484,8 @@ list.promql = {
 
 list.properties = {
   install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-properties",
-    files = { "src/parser.c" },
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-properties",
+    files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "jproperties",
   maintainers = { "@ObserverOfTime" },
diff --git a/queries/properties/highlights.scm b/queries/properties/highlights.scm
index d819e20a5..b9390be8c 100644
--- a/queries/properties/highlights.scm
+++ b/queries/properties/highlights.scm
@@ -13,7 +13,17 @@
 ((value) @number
   (#lua-match? @number "^%d+$"))
 
-(index) @number
+((index) @number
+  (#lua-match? @number "^%d+$"))
+
+((substitution
+  (key) @constant)
+  (#lua-match? @constant "^[A-Z_][A-Z0-9_]*$"))
+
+(substitution
+  (key) @function
+  "::" @punctuation.special
+  (secret) @constant.macro)
 
 (property
   [
@@ -38,7 +48,3 @@
   "."
   "\\"
 ] @punctuation.delimiter
-
-((substitution
-  (key) @constant)
-  (#lua-match? @constant "^[A-Z_][A-Z0-9_]*$"))

From adf72368f6af026b4cd19851d34a313a54159857 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 23 Feb 2024 18:19:25 +0100
Subject: [PATCH 1212/2704] feat(nickel): adapt to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9adbcbe67..d1a90345b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -414,7 +414,7 @@
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
   },
   "nickel": {
-    "revision": "091b5dcc7d138901bcc162da9409c0bb626c0d27"
+    "revision": "19fb551196d18b75160631f5e3a8a006b3875276"
   },
   "nim": {
     "revision": "70ceee835e033acbc7092cd7f4f6a251789af121"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 59cef4d53..3d41a5f0a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1238,7 +1238,7 @@ list.nasm = {
 list.nickel = {
   install_info = {
     url = "https://github.com/nickel-lang/tree-sitter-nickel",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
 }
 

From c06292fdc641d71d185d2f1a507ad8232b6cf528 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 24 Feb 2024 06:36:37 +0000
Subject: [PATCH 1213/2704] Update parsers: c, fennel, gitattributes, json,
 nim, pem, poe_filter, printf, readline, sourcepawn, wing, xcompose

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d1a90345b..0efb75572 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "f64a422d4e46a44315abe75295035554d334bdab"
+    "revision": "652433fce487d8c3943207da38e3e65e4550e288"
   },
   "c_sharp": {
     "revision": "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"
@@ -162,7 +162,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "9265a7d635d2f82a10738b9ad65ba8dd8bd4a84a"
+    "revision": "215e3913524abc119daa9db7cf6ad2f2f5620189"
   },
   "fidl": {
     "revision": "bdbb635a7f5035e424f6173f2f11b9cd79703f8d"
@@ -201,7 +201,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "3d03b37395f5707b6a2bfb43f62957fe0e669c0c"
+    "revision": "0750b5904f37d6b2f47f6e4655001c2c35a172ec"
   },
   "gitcommit": {
     "revision": "7c01af8d227b5344f62aade2ff00f19bd0c458ca"
@@ -321,7 +321,7 @@
     "revision": "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"
   },
   "json": {
-    "revision": "ac6ddfa7775795a3d8f5edab4a71e3a49f932b6a"
+    "revision": "3b129203f4b72d532f58e72c5310c0a7db3b8e6d"
   },
   "json5": {
     "revision": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"
@@ -417,7 +417,7 @@
     "revision": "19fb551196d18b75160631f5e3a8a006b3875276"
   },
   "nim": {
-    "revision": "70ceee835e033acbc7092cd7f4f6a251789af121"
+    "revision": "c5f0ce3b65222f5dbb1a12f9fe894524881ad590"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -462,7 +462,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "pem": {
-    "revision": "7905a168036e23605160a0d32a142f58ab5eaa06"
+    "revision": "db307bbb7dc4f721bf2f5ba7fcedaf58feeb59e0"
   },
   "perl": {
     "revision": "fd8b951cf6f72d48dfd07679de8cf0260836b231"
@@ -486,13 +486,13 @@
     "revision": "39da859947b94abdee43e431368e1ae975c0a424"
   },
   "poe_filter": {
-    "revision": "99ce487804eab781e1e1cb39de82aea236346c96"
+    "revision": "bf912df70f60b356c70631d9cbb317b41c1ea319"
   },
   "pony": {
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
   },
   "printf": {
-    "revision": "ddff4ce4d630d1f1a3b591d77b2618a4169b36b9"
+    "revision": "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -555,7 +555,7 @@
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
   },
   "readline": {
-    "revision": "1530fb8c1ec21cdd529342b5d48bcf941c69bd59"
+    "revision": "e436eaef452266a3d00c195f0eb757d6502c767a"
   },
   "regex": {
     "revision": "ba22e4e0cb42b2ef066948d0ea030ac509cef733"
@@ -621,7 +621,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "4cf55de594d8029e1034726aacac80dfd0e9010c"
+    "revision": "39ce73ad42b2c4f52848d16093c24feddaa7d226"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -765,10 +765,10 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "3e74a6215e9b931ced84e9b059924dd7cfa3573e"
+    "revision": "52ef462f76e199845a5df4834b838339e0a6efdb"
   },
   "xcompose": {
-    "revision": "8898238fca7e143760386448093392b87e58002e"
+    "revision": "7fd14940e0478fce79ea195067ed14a2c42c654a"
   },
   "xml": {
     "revision": "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a"

From 9896ef5f701cc8258c4f04c6944b77e7cfa244e3 Mon Sep 17 00:00:00 2001
From: Preston Knopp <prestonknopp@gmail.com>
Date: Sat, 24 Feb 2024 09:21:19 -0800
Subject: [PATCH 1214/2704] feat(gdscript): update parsers and queries. (#6176)

* feat(gdscript): add highlight for (pattern_guard "when")

* feat(gdscript): update (type) highlights and support typed array

* feat(gdscript): add highlight to attribute subscript ident

* feat(gdscript): only apply @ constructor to init ident

* feat(gdscript): replace greedy (parameters) match with independent match

* feat(gdscript): add (typed_default_parameter) highlight

* feat(gdscript): add (constructor_definition) indent

* feat(gdscript): update big wall of built-in identifiers
---
 queries/gdscript/highlights.scm | 345 +++++++++++++++++---------------
 queries/gdscript/indents.scm    |   1 +
 2 files changed, 181 insertions(+), 165 deletions(-)

diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 757ffe81e..bf951aa83 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -3,7 +3,8 @@
 
 (name) @variable
 
-(type) @type
+(type
+  (identifier) @type)
 
 (comment) @comment @spell
 
@@ -55,20 +56,15 @@
 (expression_statement
   (string) @comment @spell)
 
-; Identifier naming conventions
-((identifier) @type
-  (#lua-match? @type "^[A-Z]"))
-
-((identifier) @constant
-  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
-
 ; Functions
-(constructor_definition) @constructor
+(constructor_definition
+  "_init" @constructor)
 
 (function_definition
-  (name) @function
-  (parameters
-    (identifier) @variable.parameter)*)
+  (name) @function)
+
+(parameters
+  (identifier) @variable.parameter)
 
 (typed_parameter
   (identifier) @variable.parameter)
@@ -76,6 +72,9 @@
 (default_parameter
   (identifier) @variable.parameter)
 
+(typed_default_parameter
+  (identifier) @variable.parameter)
+
 (call
   (identifier) @function.call)
 
@@ -101,10 +100,22 @@
 (attribute_call
   (identifier) @function.method.call)
 
+(attribute_subscript
+  (identifier) @property)
+
 (attribute
   (_)
   (identifier) @property)
 
+; Identifier naming conventions
+; - Make sure the following query is below the attribute queries so that it
+;   takes precedence on a `(type (attribute (identifier)))`
+((identifier) @type
+  (#lua-match? @type "^[A-Z]"))
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+
 ; Enums
 (enumerator
   left: (identifier) @constant)
@@ -145,6 +156,9 @@
   "match"
 ] @keyword.conditional
 
+(pattern_guard
+  "when" @keyword.conditional)
+
 [
   "for"
   "while"
@@ -225,178 +239,179 @@
 
 ; Builtins
 ; generated from
-; - https://github.com/godotengine/godot/blob/491ded18983a4ae963ce9c29e8df5d5680873ccb/doc/classes/@GlobalScope.xml
-; - https://github.com/godotengine/godot/blob/491ded18983a4ae963ce9c29e8df5d5680873ccb/modules/gdscript/doc_classes/@GDScript.xml
-; some from:
-; - https://github.com/godotengine/godot-vscode-plugin/blob/0636797c22bf1e23a41fd24d55cdb9be62e0c992/syntaxes/GDScript.tmLanguage.json
+; - godot commit: fb10e67fef
+; - https://github.com/godotengine/godot/blob/fb10e67fef/doc/classes
+; - https://github.com/godotengine/godot/blob/fb10e67fef/doc/classes/@GlobalScope.xml
+; - https://github.com/godotengine/godot/blob/fb10e67fef/modules/gdscript/doc_classes/@GDScript.xml
 ; Built-in Annotations
 ((annotation
   "@" @attribute
   (identifier) @attribute)
   (#any-of? @attribute
-    ; @GDScript
+    ; from modules/gdscript/doc_classes/@GDScript.xml
     "export" "export_category" "export_color_no_alpha" "export_dir" "export_enum"
     "export_exp_easing" "export_file" "export_flags" "export_flags_2d_navigation"
     "export_flags_2d_physics" "export_flags_2d_render" "export_flags_3d_navigation"
-    "export_flags_3d_physics" "export_flags_3d_render" "export_global_dir" "export_global_file"
-    "export_group" "export_multiline" "export_node_path" "export_placeholder" "export_range"
-    "export_subgroup" "icon" "onready" "rpc" "tool" "warning_ignore"))
+    "export_flags_3d_physics" "export_flags_3d_render" "export_flags_avoidance" "export_global_dir"
+    "export_global_file" "export_group" "export_multiline" "export_node_path" "export_placeholder"
+    "export_range" "export_subgroup" "icon" "onready" "rpc" "static_unload" "tool" "warning_ignore"))
 
 ; Builtin Types
-([
-  (identifier)
-  (type)
-] @type.builtin
+((identifier) @type.builtin
   (#any-of? @type.builtin
-    ; from godot-vscode-plugin
-    "Vector2" "Vector2i" "Vector3" "Vector3i" "Color" "Rect2" "Rect2i" "Array" "Basis" "Dictionary"
-    "Plane" "Quat" "RID" "Rect3" "Transform" "Transform2D" "Transform3D" "AABB" "String" "NodePath"
-    "Object" "PoolByteArray" "PoolIntArray" "PoolRealArray" "PoolStringArray" "PoolVector2Array"
-    "PoolVector3Array" "PoolColorArray" "bool" "int" "float" "StringName" "Quaternion"
-    "PackedByteArray" "PackedInt32Array" "PackedInt64Array" "PackedFloat32Array"
-    "PackedFloat64Array" "PackedStringArray" "PackedVector2Array" "PackedVector2iArray"
-    "PackedVector3Array" "PackedVector3iArray" "PackedColorArray"
-    ; @GlobalScope
-    "AudioServer" "CameraServer" "ClassDB" "DisplayServer" "Engine" "EngineDebugger"
-    "GDExtensionManager" "Geometry2D" "Geometry3D" "GodotSharp" "IP" "Input" "InputMap"
-    "JavaClassWrapper" "JavaScriptBridge" "Marshalls" "NavigationMeshGenerator" "NavigationServer2D"
-    "NavigationServer3D" "OS" "Performance" "PhysicsServer2D" "PhysicsServer2DManager"
-    "PhysicsServer3D" "PhysicsServer3DManager" "ProjectSettings" "RenderingServer" "ResourceLoader"
-    "ResourceSaver" "ResourceUID" "TextServerManager" "ThemeDB" "Time" "TranslationServer"
-    "WorkerThreadPool" "XRServer"))
+    ; from doc/classes/*.xml
+    "AABB" "Array" "Basis" "Callable" "Color" "Dictionary" "NodePath" "PackedByteArray"
+    "PackedColorArray" "PackedFloat32Array" "PackedFloat64Array" "PackedInt32Array"
+    "PackedInt64Array" "PackedStringArray" "PackedVector2Array" "PackedVector3Array" "Plane"
+    "Projection" "Quaternion" "RID" "Rect2" "Rect2i" "Signal" "String" "StringName" "Transform2D"
+    "Transform3D" "Vector2" "Vector2i" "Vector3" "Vector3i" "Vector4" "Vector4i" "bool" "float"
+    "int"
+    ; from doc/classes/@GlobalScope.xml
+    "AudioServer" "CameraServer" "ClassDB" "DisplayServer" "EditorInterface" "Engine"
+    "EngineDebugger" "GDExtensionManager" "Geometry2D" "Geometry3D" "GodotSharp" "IP" "Input"
+    "InputMap" "JavaClassWrapper" "JavaScriptBridge" "Marshalls" "NavigationMeshGenerator"
+    "NavigationServer2D" "NavigationServer3D" "OS" "Performance" "PhysicsServer2D"
+    "PhysicsServer2DManager" "PhysicsServer3D" "PhysicsServer3DManager" "ProjectSettings"
+    "RenderingServer" "ResourceLoader" "ResourceSaver" "ResourceUID" "TextServerManager" "ThemeDB"
+    "Time" "TranslationServer" "WorkerThreadPool" "XRServer"))
 
 ; Builtin Funcs
 (call
   (identifier) @function.builtin
   (#any-of? @function.builtin
-    ; @GlobalScope
-    "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative" "bezier_interpolate"
-    "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf" "ceili" "clamp" "clampf" "clampi"
-    "cos" "cosh" "cubic_interpolate" "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
-    "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string" "exp" "floor"
-    "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id" "inverse_lerp" "is_equal_approx"
-    "is_finite" "is_inf" "is_instance_id_valid" "is_instance_valid" "is_nan" "is_same"
-    "is_zero_approx" "lerp" "lerp_angle" "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min"
-    "minf" "mini" "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
-    "print_verbose" "printerr" "printraw" "prints" "printt" "push_error" "push_warning" "rad_to_deg"
-    "rand_from_seed" "randf" "randf_range" "randfn" "randi" "randi_range" "randomize" "remap"
-    "rid_allocate_id" "rid_from_int64" "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin"
+    ; from doc/classes/@GlobalScope.xml
+    "abs" "absf" "absi" "acos" "acosh" "angle_difference" "asin" "asinh" "atan" "atan2" "atanh"
+    "bezier_derivative" "bezier_interpolate" "bytes_to_var" "bytes_to_var_with_objects" "ceil"
+    "ceilf" "ceili" "clamp" "clampf" "clampi" "cos" "cosh" "cubic_interpolate"
+    "cubic_interpolate_angle" "cubic_interpolate_angle_in_time" "cubic_interpolate_in_time"
+    "db_to_linear" "deg_to_rad" "ease" "error_string" "exp" "floor" "floorf" "floori" "fmod"
+    "fposmod" "hash" "instance_from_id" "inverse_lerp" "is_equal_approx" "is_finite" "is_inf"
+    "is_instance_id_valid" "is_instance_valid" "is_nan" "is_same" "is_zero_approx" "lerp"
+    "lerp_angle" "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min" "minf" "mini" "move_toward"
+    "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich" "print_verbose" "printerr"
+    "printraw" "prints" "printt" "push_error" "push_warning" "rad_to_deg" "rand_from_seed" "randf"
+    "randf_range" "randfn" "randi" "randi_range" "randomize" "remap" "rid_allocate_id"
+    "rid_from_int64" "rotate_toward" "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin"
     "sinh" "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str" "str_to_var"
-    "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects" "var_to_str" "weakref" "wrap"
-    "wrapf" "wrapi"
-    ; @GDScript
+    "tan" "tanh" "type_convert" "type_string" "typeof" "var_to_bytes" "var_to_bytes_with_objects"
+    "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
+    ; from modules/gdscript/doc_classes/@GDScript.xml
     "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict" "is_instance_of"
-    "len" "print_debug" "print_stack" "range" "type_exists"))
+    "len" "load" "preload" "print_debug" "print_stack" "range" "type_exists")
+  )
 
 ; Builtin Constants
 ((identifier) @constant.builtin
   (#any-of? @constant.builtin
-    ; @GDScript
-    "PI" "TAU" "INF" "NAN"
-    ; @GlobalScope
-    "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT"
-    "CORNER_BOTTOM_RIGHT" "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE"
-    "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT" "HORIZONTAL_ALIGNMENT_CENTER"
-    "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
-    "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL"
-    "INLINE_ALIGNMENT_TOP_TO" "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO"
-    "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP" "INLINE_ALIGNMENT_TO_CENTER"
-    "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
-    "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK"
-    "INLINE_ALIGNMENT_TEXT_MASK" "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ"
-    "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE" "KEY_SPECIAL" "KEY_ESCAPE"
-    "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
-    "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP"
-    "KEY_RIGHT" "KEY_DOWN" "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT"
-    "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK" "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5"
-    "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12" "KEY_F13" "KEY_F14" "KEY_F15"
-    "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
-    "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33"
-    "KEY_F34" "KEY_F35" "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD"
-    "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2" "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6"
-    "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP" "KEY_BACK" "KEY_FORWARD"
-    "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
-    "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE"
-    "KEY_FAVORITES" "KEY_SEARCH" "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA"
-    "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3" "KEY_LAUNCH4" "KEY_LAUNCH5"
-    "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
-    "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM"
-    "KEY_QUOTEDBL" "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE"
-    "KEY_PARENLEFT" "KEY_PARENRIGHT" "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD"
-    "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4" "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9"
-    "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION" "KEY_AT" "KEY_A"
-    "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
-    "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y"
-    "KEY_Z" "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE"
-    "KEY_QUOTELEFT" "KEY_BRACELEFT" "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN"
-    "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU" "KEY_JIS_KANA" "KEY_CODE_MASK"
-    "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT" "KEY_MASK_META"
-    "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
-    "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN"
-    "MOUSE_BUTTON_WHEEL_LEFT" "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1"
-    "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT" "MOUSE_BUTTON_MASK_RIGHT"
-    "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
-    "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y"
-    "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE" "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK"
-    "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER" "JOY_BUTTON_RIGHT_SHOULDER"
-    "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
-    "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3"
-    "JOY_BUTTON_PADDLE4" "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX"
-    "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y" "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y"
-    "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX" "JOY_AXIS_MAX"
-    "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
-    "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE"
-    "MIDI_MESSAGE_PITCH_BEND" "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME"
-    "MIDI_MESSAGE_SONG_POSITION_POINTER" "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST"
-    "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START" "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP"
-    "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED" "ERR_UNAVAILABLE"
-    "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
-    "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION"
-    "ERR_FILE_ALREADY_IN_USE" "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ"
-    "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT" "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF"
-    "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED" "ERR_ALREADY_IN_USE" "ERR_LOCKED"
-    "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
-    "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER"
-    "ERR_ALREADY_EXISTS" "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE"
-    "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND" "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED"
-    "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL" "ERR_PARSE_ERROR" "ERR_BUSY"
-    "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE" "PROPERTY_HINT_RANGE"
-    "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
-    "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER"
-    "PROPERTY_HINT_LAYERS_2D_PHYSICS" "PROPERTY_HINT_LAYERS_2D_NAVIGATION"
-    "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
-    "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR"
-    "PROPERTY_HINT_GLOBAL_FILE" "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE"
-    "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION" "PROPERTY_HINT_PLACEHOLDER_TEXT"
-    "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
-    "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG"
-    "PROPERTY_HINT_NODE_PATH_VALID_TYPES" "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE"
-    "PROPERTY_HINT_INT_IS_OBJECTID" "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE"
-    "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING" "PROPERTY_HINT_NODE_TYPE"
-    "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
-    "PROPERTY_USAGE_NONE" "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_INTERNAL"
-    "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP"
-    "PROPERTY_USAGE_CATEGORY" "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD"
-    "PROPERTY_USAGE_NO_INSTANCE_STATE" "PROPERTY_USAGE_RESTART_IF_CHANGED"
-    "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
-    "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE"
-    "PROPERTY_USAGE_CLASS_IS_ENUM" "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY"
-    "PROPERTY_USAGE_ALWAYS_DUPLICATE" "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX"
-    "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT" "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT"
-    "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
-    "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING"
-    "PROPERTY_USAGE_READ_ONLY" "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR"
-    "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST" "METHOD_FLAG_VIRTUAL"
-    "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
-    "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I"
-    "TYPE_RECT2" "TYPE_RECT2I" "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4"
-    "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION" "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D"
-    "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH" "TYPE_RID" "TYPE_OBJECT"
-    "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
-    "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY"
-    "TYPE_PACKED_FLOAT64_ARRAY" "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY"
-    "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX" "OP_EQUAL" "OP_NOT_EQUAL"
-    "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT" "OP_MULTIPLY"
-    "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
-    "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN"
-    "OP_MAX"))
+    ; from modules/gdscript/doc_classes/@GDScript.xml
+    "INF" "NAN" "PI" "TAU"
+    ; from doc/classes/@GlobalScope.xml
+    "CLOCKWISE" "CORNER_BOTTOM_LEFT" "CORNER_BOTTOM_RIGHT" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT"
+    "COUNTERCLOCKWISE" "ERR_ALREADY_EXISTS" "ERR_ALREADY_IN_USE" "ERR_BUG" "ERR_BUSY"
+    "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_CONNECT" "ERR_CANT_CREATE" "ERR_CANT_FORK" "ERR_CANT_OPEN"
+    "ERR_CANT_RESOLVE" "ERR_COMPILATION_FAILED" "ERR_CONNECTION_ERROR" "ERR_CYCLIC_LINK"
+    "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_DOES_NOT_EXIST" "ERR_DUPLICATE_SYMBOL"
+    "ERR_FILE_ALREADY_IN_USE" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_CANT_OPEN"
+    "ERR_FILE_CANT_READ" "ERR_FILE_CANT_WRITE" "ERR_FILE_CORRUPT" "ERR_FILE_EOF"
+    "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_NOT_FOUND" "ERR_FILE_NO_PERMISSION"
+    "ERR_FILE_UNRECOGNIZED" "ERR_HELP" "ERR_INVALID_DATA" "ERR_INVALID_DECLARATION"
+    "ERR_INVALID_PARAMETER" "ERR_LINK_FAILED" "ERR_LOCKED" "ERR_METHOD_NOT_FOUND"
+    "ERR_OUT_OF_MEMORY" "ERR_PARAMETER_RANGE_ERROR" "ERR_PARSE_ERROR" "ERR_PRINTER_ON_FIRE"
+    "ERR_QUERY_FAILED" "ERR_SCRIPT_FAILED" "ERR_SKIP" "ERR_TIMEOUT" "ERR_UNAUTHORIZED"
+    "ERR_UNAVAILABLE" "ERR_UNCONFIGURED" "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ"
+    "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "FAILED" "HORIZONTAL"
+    "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_FILL" "HORIZONTAL_ALIGNMENT_LEFT"
+    "HORIZONTAL_ALIGNMENT_RIGHT" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM"
+    "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_CENTER_TO"
+    "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK" "INLINE_ALIGNMENT_TOP"
+    "INLINE_ALIGNMENT_TOP_TO" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM"
+    "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_TOP" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X"
+    "JOY_AXIS_LEFT_Y" "JOY_AXIS_MAX" "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_SDL_MAX"
+    "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_BACK"
+    "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT" "JOY_BUTTON_DPAD_UP"
+    "JOY_BUTTON_GUIDE" "JOY_BUTTON_INVALID" "JOY_BUTTON_LEFT_SHOULDER" "JOY_BUTTON_LEFT_STICK"
+    "JOY_BUTTON_MAX" "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2"
+    "JOY_BUTTON_PADDLE3" "JOY_BUTTON_PADDLE4" "JOY_BUTTON_RIGHT_SHOULDER" "JOY_BUTTON_RIGHT_STICK"
+    "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_START" "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_X" "JOY_BUTTON_Y"
+    "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4" "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9" "KEY_A"
+    "KEY_ALT" "KEY_AMPERSAND" "KEY_APOSTROPHE" "KEY_ASCIICIRCUM" "KEY_ASCIITILDE" "KEY_ASTERISK"
+    "KEY_AT" "KEY_B" "KEY_BACK" "KEY_BACKSLASH" "KEY_BACKSPACE" "KEY_BACKTAB" "KEY_BAR"
+    "KEY_BRACELEFT" "KEY_BRACERIGHT" "KEY_BRACKETLEFT" "KEY_BRACKETRIGHT" "KEY_C" "KEY_CAPSLOCK"
+    "KEY_CLEAR" "KEY_CODE_MASK" "KEY_COLON" "KEY_COMMA" "KEY_CTRL" "KEY_D" "KEY_DELETE" "KEY_DOLLAR"
+    "KEY_DOWN" "KEY_E" "KEY_END" "KEY_ENTER" "KEY_EQUAL" "KEY_ESCAPE" "KEY_EXCLAM" "KEY_F" "KEY_F1"
+    "KEY_F10" "KEY_F11" "KEY_F12" "KEY_F13" "KEY_F14" "KEY_F15" "KEY_F16" "KEY_F17" "KEY_F18"
+    "KEY_F19" "KEY_F2" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24" "KEY_F25" "KEY_F26"
+    "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F3" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33" "KEY_F34"
+    "KEY_F35" "KEY_F4" "KEY_F5" "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_FAVORITES" "KEY_FORWARD"
+    "KEY_G" "KEY_GLOBE" "KEY_GREATER" "KEY_H" "KEY_HELP" "KEY_HOME" "KEY_HOMEPAGE" "KEY_HYPER"
+    "KEY_I" "KEY_INSERT" "KEY_J" "KEY_JIS_EISU" "KEY_JIS_KANA" "KEY_K" "KEY_KEYBOARD" "KEY_KP_0"
+    "KEY_KP_1" "KEY_KP_2" "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6" "KEY_KP_7" "KEY_KP_8"
+    "KEY_KP_9" "KEY_KP_ADD" "KEY_KP_DIVIDE" "KEY_KP_ENTER" "KEY_KP_MULTIPLY" "KEY_KP_PERIOD"
+    "KEY_KP_SUBTRACT" "KEY_L" "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3" "KEY_LAUNCH4"
+    "KEY_LAUNCH5" "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA"
+    "KEY_LAUNCHB" "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_LAUNCHMAIL"
+    "KEY_LAUNCHMEDIA" "KEY_LEFT" "KEY_LESS" "KEY_LOCATION_LEFT" "KEY_LOCATION_RIGHT"
+    "KEY_LOCATION_UNSPECIFIED" "KEY_M" "KEY_MASK_ALT" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_CTRL"
+    "KEY_MASK_GROUP_SWITCH" "KEY_MASK_KPAD" "KEY_MASK_META" "KEY_MASK_SHIFT" "KEY_MEDIANEXT"
+    "KEY_MEDIAPLAY" "KEY_MEDIAPREVIOUS" "KEY_MEDIARECORD" "KEY_MEDIASTOP" "KEY_MENU" "KEY_META"
+    "KEY_MINUS" "KEY_MODIFIER_MASK" "KEY_N" "KEY_NONE" "KEY_NUMBERSIGN" "KEY_NUMLOCK" "KEY_O"
+    "KEY_OPENURL" "KEY_P" "KEY_PAGEDOWN" "KEY_PAGEUP" "KEY_PARENLEFT" "KEY_PARENRIGHT" "KEY_PAUSE"
+    "KEY_PERCENT" "KEY_PERIOD" "KEY_PLUS" "KEY_PRINT" "KEY_Q" "KEY_QUESTION" "KEY_QUOTEDBL"
+    "KEY_QUOTELEFT" "KEY_R" "KEY_REFRESH" "KEY_RIGHT" "KEY_S" "KEY_SCROLLLOCK" "KEY_SEARCH"
+    "KEY_SECTION" "KEY_SEMICOLON" "KEY_SHIFT" "KEY_SLASH" "KEY_SPACE" "KEY_SPECIAL" "KEY_STANDBY"
+    "KEY_STOP" "KEY_SYSREQ" "KEY_T" "KEY_TAB" "KEY_U" "KEY_UNDERSCORE" "KEY_UNKNOWN" "KEY_UP"
+    "KEY_V" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_W" "KEY_X" "KEY_Y" "KEY_YEN"
+    "KEY_Z" "METHOD_FLAGS_DEFAULT" "METHOD_FLAG_CONST" "METHOD_FLAG_EDITOR" "METHOD_FLAG_NORMAL"
+    "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAG_STATIC" "METHOD_FLAG_VARARG" "METHOD_FLAG_VIRTUAL"
+    "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_AFTERTOUCH" "MIDI_MESSAGE_CHANNEL_PRESSURE"
+    "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_NONE"
+    "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_PITCH_BEND"
+    "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
+    "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_START" "MIDI_MESSAGE_STOP"
+    "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_SYSTEM_RESET" "MIDI_MESSAGE_TIMING_CLOCK"
+    "MIDI_MESSAGE_TUNE_REQUEST" "MOUSE_BUTTON_LEFT" "MOUSE_BUTTON_MASK_LEFT"
+    "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2" "MOUSE_BUTTON_MASK_MIDDLE"
+    "MOUSE_BUTTON_MASK_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_RIGHT"
+    "MOUSE_BUTTON_WHEEL_DOWN" "MOUSE_BUTTON_WHEEL_LEFT" "MOUSE_BUTTON_WHEEL_RIGHT"
+    "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_XBUTTON1" "MOUSE_BUTTON_XBUTTON2" "OK" "OP_ADD" "OP_AND"
+    "OP_BIT_AND" "OP_BIT_NEGATE" "OP_BIT_OR" "OP_BIT_XOR" "OP_DIVIDE" "OP_EQUAL" "OP_GREATER"
+    "OP_GREATER_EQUAL" "OP_IN" "OP_LESS" "OP_LESS_EQUAL" "OP_MAX" "OP_MODULE" "OP_MULTIPLY"
+    "OP_NEGATE" "OP_NOT" "OP_NOT_EQUAL" "OP_OR" "OP_POSITIVE" "OP_POWER" "OP_SHIFT_LEFT"
+    "OP_SHIFT_RIGHT" "OP_SUBTRACT" "OP_XOR" "PROPERTY_HINT_ARRAY_TYPE"
+    "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_DIR" "PROPERTY_HINT_ENUM"
+    "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXPRESSION" "PROPERTY_HINT_EXP_EASING"
+    "PROPERTY_HINT_FILE" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_GLOBAL_DIR"
+    "PROPERTY_HINT_GLOBAL_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE"
+    "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_INT_IS_OBJECTID"
+    "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_LAYERS_2D_NAVIGATION"
+    "PROPERTY_HINT_LAYERS_2D_PHYSICS" "PROPERTY_HINT_LAYERS_2D_RENDER"
+    "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
+    "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_AVOIDANCE" "PROPERTY_HINT_LINK"
+    "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING" "PROPERTY_HINT_MAX"
+    "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE"
+    "PROPERTY_HINT_NODE_PATH_VALID_TYPES" "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_NONE"
+    "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_PASSWORD"
+    "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_RANGE" "PROPERTY_HINT_RESOURCE_TYPE"
+    "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_TYPE_STRING" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
+    "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_CATEGORY" "PROPERTY_USAGE_CHECKABLE"
+    "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_CLASS_IS_ENUM"
+    "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE" "PROPERTY_USAGE_EDITOR"
+    "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT"
+    "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_INTERNAL"
+    "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_NEVER_DUPLICATE"
+    "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT" "PROPERTY_USAGE_NONE"
+    "PROPERTY_USAGE_NO_EDITOR" "PROPERTY_USAGE_NO_INSTANCE_STATE" "PROPERTY_USAGE_READ_ONLY"
+    "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_RESTART_IF_CHANGED"
+    "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_SECRET"
+    "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_STORE_IF_NULL" "PROPERTY_USAGE_SUBGROUP"
+    "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "SIDE_BOTTOM" "SIDE_LEFT" "SIDE_RIGHT" "SIDE_TOP"
+    "TYPE_AABB" "TYPE_ARRAY" "TYPE_BASIS" "TYPE_BOOL" "TYPE_CALLABLE" "TYPE_COLOR" "TYPE_DICTIONARY"
+    "TYPE_FLOAT" "TYPE_INT" "TYPE_MAX" "TYPE_NIL" "TYPE_NODE_PATH" "TYPE_OBJECT"
+    "TYPE_PACKED_BYTE_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY"
+    "TYPE_PACKED_FLOAT64_ARRAY" "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY"
+    "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PLANE"
+    "TYPE_PROJECTION" "TYPE_QUATERNION" "TYPE_RECT2" "TYPE_RECT2I" "TYPE_RID" "TYPE_SIGNAL"
+    "TYPE_STRING" "TYPE_STRING_NAME" "TYPE_TRANSFORM2D" "TYPE_TRANSFORM3D" "TYPE_VECTOR2"
+    "TYPE_VECTOR2I" "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_VECTOR4" "TYPE_VECTOR4I" "VERTICAL"
+    "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_FILL"
+    "VERTICAL_ALIGNMENT_TOP"))
diff --git a/queries/gdscript/indents.scm b/queries/gdscript/indents.scm
index 22d155e6f..36b989f93 100644
--- a/queries/gdscript/indents.scm
+++ b/queries/gdscript/indents.scm
@@ -1,6 +1,7 @@
 [
   (lambda)
   (function_definition)
+  (constructor_definition)
   (for_statement)
   (while_statement)
   (if_statement)

From ede5b461c9e11404b5ba0a2ba452fffaaf252907 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 25 Feb 2024 06:35:13 +0000
Subject: [PATCH 1215/2704] Update parsers: gpg, properties, pymanifest,
 requirements, rust, ssh_config, swift, udev, v

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0efb75572..a940128ac 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -240,7 +240,7 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "e8a95ae3deed7d7637c33f635fc5b9fc9dbb3216"
+    "revision": "7fd855d7b5442d6eb4b3f2f8797b572b78d4afe6"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
@@ -501,7 +501,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "189b3cc18d36871c27ebb0adcf0cddd123b0cbba"
+    "revision": "ce2f4f66454edb69f66bfa3a1884f601fccd9e08"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
@@ -522,7 +522,7 @@
     "revision": "2517b1ee2236353af761edbd22570f740f1603f1"
   },
   "pymanifest": {
-    "revision": "41a15c43252baa083729c25646cde83ee5c88277"
+    "revision": "69ad424b5dd41088206bd74ebcdd61d987b7825c"
   },
   "python": {
     "revision": "deba2badc88afd18e6cbd4341ee3c18c3a9bb4ed"
@@ -564,7 +564,7 @@
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
   },
   "requirements": {
-    "revision": "00084464ccad32dd71da60771c25554eeedb213c"
+    "revision": "d43b6ec982902df01ce00df85a0cdb6ec8d3e81f"
   },
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
@@ -582,7 +582,7 @@
     "revision": "22a0bb2678755a3714e194609862ea7f4516e807"
   },
   "rust": {
-    "revision": "85a21c96d31b2a5c4369e5836a7f4ab059268fea"
+    "revision": "2d7bac5164c344c95530c16dd5c8fa1319e34308"
   },
   "scala": {
     "revision": "e02f003d78dc269fef287b9b7b9963dc1f26bd7e"
@@ -633,7 +633,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "b8595820fa331977a5a44f5f9e0a445c456b5cbf"
+    "revision": "3a1a5e139514a0e2789d1d7c5065c01bb71756f2"
   },
   "starlark": {
     "revision": "b31a616aac5d05f927f3f9dd809789db7805b632"
@@ -654,7 +654,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "e1ac0c3b48f4c42c40f92f400f14c6561369d4dd"
+    "revision": "fc00cbb460b40228b30f322b5a34ea0e8f35a9f8"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -723,7 +723,7 @@
     "revision": "c757be0898e2a58f4e9761aa164dc413bf5beaf8"
   },
   "udev": {
-    "revision": "15d89be59a3802dcbe2e97e0f9d32b52f3aeda3f"
+    "revision": "caa721ff38704c1186c2afeb467bead8c27ea382"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -738,7 +738,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "56d7905f423b82dff4b23c86e2869ddc06f6e419"
+    "revision": "46b8341458bb620a82ef1d8009a3e2f00bc0dad9"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 6f1f407d712d1c451451db74ff3a6eb72190548d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 25 Feb 2024 02:14:48 -0500
Subject: [PATCH 1216/2704] feat(rust): add more regex injection queries

---
 queries/rust/injections.scm | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index d561d4ec9..629f707c7 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -48,7 +48,7 @@
   function:
     (scoped_identifier
       path: (identifier) @_regex
-      (#eq? @_regex "Regex")
+      (#any-of? @_regex "Regex" "ByteRegexBuilder")
       name: (identifier) @_new
       (#eq? @_new "new"))
   arguments:
@@ -62,7 +62,7 @@
       path:
         (scoped_identifier
           (identifier) @_regex
-          (#eq? @_regex "Regex") .)
+          (#any-of? @_regex "Regex" "ByteRegexBuilder") .)
       name: (identifier) @_new
       (#eq? @_new "new"))
   arguments:
@@ -70,6 +70,34 @@
       (raw_string_literal) @injection.content)
   (#set! injection.language "regex"))
 
+(call_expression
+  function:
+    (scoped_identifier
+      path: (identifier) @_regex
+      (#any-of? @_regex "RegexSet" "RegexSetBuilder")
+      name: (identifier) @_new
+      (#eq? @_new "new"))
+  arguments:
+    (arguments
+      (array_expression
+        (raw_string_literal) @injection.content))
+  (#set! injection.language "regex"))
+
+(call_expression
+  function:
+    (scoped_identifier
+      path:
+        (scoped_identifier
+          (identifier) @_regex
+          (#any-of? @_regex "RegexSet" "RegexSetBuilder") .)
+      name: (identifier) @_new
+      (#eq? @_new "new"))
+  arguments:
+    (arguments
+      (array_expression
+        (raw_string_literal) @injection.content))
+  (#set! injection.language "regex"))
+
 ((block_comment) @injection.content
   (#match? @injection.content "/\\*!([a-zA-Z]+:)?re2c")
   (#set! injection.language "re2c"))

From 6e2b56cbe75ddf18e6efecee44bc3936d70b0b3e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 25 Feb 2024 16:59:20 +0100
Subject: [PATCH 1217/2704] feat(cooklang): update to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a940128ac..188bd5db8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -75,7 +75,7 @@
     "revision": "cf10fc38bc24faf0549d59217ff37c789973dfdc"
   },
   "cooklang": {
-    "revision": "5e113412aadb78955c27010daa4dbe1d202013cf"
+    "revision": "81c2a8667846b1e60db68b5601d864fe00fd1d3a"
   },
   "corn": {
     "revision": "604d73c38d4c28ca68e9e441ffd405d68cb63051"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3d41a5f0a..c9c22886d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -287,7 +287,7 @@ list.commonlisp = {
 list.cooklang = {
   install_info = {
     url = "https://github.com/addcninblue/tree-sitter-cooklang",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@addcninblue" },
 }

From fad40f2010c6f50aaad285b2752551a37d8772e4 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 06:35:41 +0000
Subject: [PATCH 1218/2704] Update parsers: arduino, php, php_only, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 188bd5db8..587ce7831 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "a282270857b7be447b8be91411468349a31d73b7"
+    "revision": "7722d4398d87ea22c4877264f88b45bd7ce0cba5"
   },
   "asm": {
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
@@ -468,10 +468,10 @@
     "revision": "fd8b951cf6f72d48dfd07679de8cf0260836b231"
   },
   "php": {
-    "revision": "710754c879435178b7643e525c84cd53f32c510c"
+    "revision": "78a78df5e06b4c13173af2a1f607c9a853d0f240"
   },
   "php_only": {
-    "revision": "710754c879435178b7643e525c84cd53f32c510c"
+    "revision": "78a78df5e06b4c13173af2a1f607c9a853d0f240"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -765,7 +765,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "52ef462f76e199845a5df4834b838339e0a6efdb"
+    "revision": "745df1efa28a64514cb0d5b0d853a0d25392a22d"
   },
   "xcompose": {
     "revision": "7fd14940e0478fce79ea195067ed14a2c42c654a"

From 18aa5ae3fd7245137bc41b5348102fe254405509 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 25 Feb 2024 19:49:49 -0800
Subject: [PATCH 1219/2704] feat(c): local label highlights

---
 queries/c/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 81dc19f91..e80819fa3 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -159,6 +159,11 @@
 
 (statement_identifier) @label
 
+(declaration
+  type: (type_identifier) @_type
+  declarator: (identifier) @label
+  (#eq? @_type "__label__"))
+
 [
   (type_identifier)
   (type_descriptor)

From db12bd416e2764420047e4a5d6b96fe44e4377d5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 06:34:39 +0000
Subject: [PATCH 1220/2704] Update parsers: fidl, haskell, nickel, python,
 solidity, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 587ce7831..9ba5bad4d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "215e3913524abc119daa9db7cf6ad2f2f5620189"
   },
   "fidl": {
-    "revision": "bdbb635a7f5035e424f6173f2f11b9cd79703f8d"
+    "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
   },
   "firrtl": {
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
@@ -258,7 +258,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "8a99848fc734f9c4ea523b3f2a07df133cbbcec2"
+    "revision": "6b5ec205c9d4f23eb36a163f1edc4f2db8c98e4a"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -414,7 +414,7 @@
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
   },
   "nickel": {
-    "revision": "19fb551196d18b75160631f5e3a8a006b3875276"
+    "revision": "33a64ec9a27058c52e4195f1030235dcdfc04747"
   },
   "nim": {
     "revision": "c5f0ce3b65222f5dbb1a12f9fe894524881ad590"
@@ -525,7 +525,7 @@
     "revision": "69ad424b5dd41088206bd74ebcdd61d987b7825c"
   },
   "python": {
-    "revision": "deba2badc88afd18e6cbd4341ee3c18c3a9bb4ed"
+    "revision": "64619c41cbed4c144f551a51939622ec0d5d5dca"
   },
   "ql": {
     "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
@@ -612,7 +612,7 @@
     "revision": "65a6c3b4671877821082164da0a310851b211953"
   },
   "solidity": {
-    "revision": "168020304759ad5d8b4a88a541a699134e3730c5"
+    "revision": "5cb506ae419c4ad620c77210fd47500d3d169dbc"
   },
   "soql": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -765,7 +765,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "745df1efa28a64514cb0d5b0d853a0d25392a22d"
+    "revision": "7020d597caf5136d9ef7c68bd99e0538ae4addce"
   },
   "xcompose": {
     "revision": "7fd14940e0478fce79ea195067ed14a2c42c654a"

From 31d06480554789557d24f1c2b7eacf627e43510c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 06:36:41 +0000
Subject: [PATCH 1221/2704] Update parsers: angular, javascript, nim, perl,
 python, typst, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9ba5bad4d..c261031df 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "3946b1040b98a12458beef2763ce4780a523e3c6"
+    "revision": "6f34e6b82b4765a288b0477be08912600fdc1483"
   },
   "apex": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -312,7 +312,7 @@
     "revision": "99b29f1ed957b3b424b6e21f57bd21a9732a622a"
   },
   "javascript": {
-    "revision": "9802cc5812a19cd28168076af36e88b463dd3a18"
+    "revision": "51aed7263d33bee46b0a8a5e165ffcb690d5aca8"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -417,7 +417,7 @@
     "revision": "33a64ec9a27058c52e4195f1030235dcdfc04747"
   },
   "nim": {
-    "revision": "c5f0ce3b65222f5dbb1a12f9fe894524881ad590"
+    "revision": "f5cec6a841b585e4e7388a120ded07e60ae19c43"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -465,7 +465,7 @@
     "revision": "db307bbb7dc4f721bf2f5ba7fcedaf58feeb59e0"
   },
   "perl": {
-    "revision": "fd8b951cf6f72d48dfd07679de8cf0260836b231"
+    "revision": "6526e5d5bf31501de0dc51c42ac3583078a8fdab"
   },
   "php": {
     "revision": "78a78df5e06b4c13173af2a1f607c9a853d0f240"
@@ -525,7 +525,7 @@
     "revision": "69ad424b5dd41088206bd74ebcdd61d987b7825c"
   },
   "python": {
-    "revision": "64619c41cbed4c144f551a51939622ec0d5d5dca"
+    "revision": "22d3f87bdafac2782e907330babe4af574f5d0b4"
   },
   "ql": {
     "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
@@ -720,7 +720,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "c757be0898e2a58f4e9761aa164dc413bf5beaf8"
+    "revision": "baddc325e858afff90501dbefa00ecfa28528931"
   },
   "udev": {
     "revision": "caa721ff38704c1186c2afeb467bead8c27ea382"
@@ -765,7 +765,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "7020d597caf5136d9ef7c68bd99e0538ae4addce"
+    "revision": "77327e10402194009d8d65574454c7bb101b54ca"
   },
   "xcompose": {
     "revision": "7fd14940e0478fce79ea195067ed14a2c42c654a"

From 15d521c9235831421e7278c4d3e1139e0d363ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Wed, 28 Feb 2024 23:27:42 +0900
Subject: [PATCH 1222/2704] fix(purescript): comment out utf-8 char

---
 lockfile.json                     |  2 +-
 queries/purescript/highlights.scm | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c261031df..ce6aa9a08 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -519,7 +519,7 @@
     "revision": "3641b9e854ac9c84c7576e71c4c9a357bcfd9550"
   },
   "purescript": {
-    "revision": "2517b1ee2236353af761edbd22570f740f1603f1"
+    "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
   },
   "pymanifest": {
     "revision": "69ad424b5dd41088206bd74ebcdd61d987b7825c"
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index b241ba852..7f108df80 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -58,15 +58,15 @@
   "="
   "|"
   "::"
-  "∷"
+  ; "∷"
   "=>"
-  "⇒"
+  ; "⇒"
   "<="
-  "⇐"
+  ; "⇐"
   "->"
-  "→"
+  ; "→"
   "<-"
-  "←"
+  ; "←"
   "\\"
   "`"
   "@"
@@ -102,7 +102,7 @@
   "do"
   "ado"
   "forall"
-  "∀"
+  ; "∀" ; utf-8 is not cross-platform safe
   "infix"
   "infixl"
   "infixr"

From c5b19f66e05c760ed056279ae3d8ade3c98ea1b1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 28 Feb 2024 19:52:01 +0100
Subject: [PATCH 1223/2704] fix(typst): adapt queries to breaking parser update

---
 lockfile.json                |  2 +-
 queries/typst/highlights.scm | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ce6aa9a08..adcb568e4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -720,7 +720,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "baddc325e858afff90501dbefa00ecfa28528931"
+    "revision": "3c3e5f8e0caeba6157e26a1bedf8321e1da62799"
   },
   "udev": {
     "revision": "caa721ff38704c1186c2afeb467bead8c27ea382"
diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index a1a118eda..e36105413 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -72,24 +72,12 @@
 
 (bool) @boolean
 
-; identifiers
-(builtin) @module.builtin
-
 (ident) @constant
 
 ; name-value pairs
 (tagged
   field: (ident) @variable.member)
 
-; function definitions, calls, etc.
-; TODO: support for functions such as #calc.cos, tree view appears as
-; (call)
-;  item: (field)
-;   (builtin)
-;    field: (ident)
-(call
-  item: (builtin) @function.builtin)
-
 (call
   item: (ident) @function.call)
 

From d2f58c0b6507a4ad02ca0b647c130fb8396b4587 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 19:03:14 +0000
Subject: [PATCH 1224/2704] Update parsers: dtd, gitattributes, hyprlang, tcl,
 wing, xml

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index adcb568e4..5eb1debe0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a"
+    "revision": "c23bd31d0aa72bfc01238b2546d5e823d8006709"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -201,7 +201,7 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "0750b5904f37d6b2f47f6e4655001c2c35a172ec"
+    "revision": "e4f5a2c843b59e6299bbb746777cd7395d0f62ee"
   },
   "gitcommit": {
     "revision": "7c01af8d227b5344f62aade2ff00f19bd0c458ca"
@@ -297,7 +297,7 @@
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
   },
   "hyprlang": {
-    "revision": "86025136c12cd1058985479a6b1935829077f1af"
+    "revision": "fc1d331586e4da2b5f5bcfa89d630ebafe66458b"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -669,7 +669,7 @@
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
   },
   "tcl": {
-    "revision": "78c71201c1b0939239e779a837dd35370c308948"
+    "revision": "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8"
   },
   "teal": {
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
@@ -765,13 +765,13 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "77327e10402194009d8d65574454c7bb101b54ca"
+    "revision": "508bd430e78e9d2a8509948c4e42dbeb3ecc3265"
   },
   "xcompose": {
     "revision": "7fd14940e0478fce79ea195067ed14a2c42c654a"
   },
   "xml": {
-    "revision": "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a"
+    "revision": "c23bd31d0aa72bfc01238b2546d5e823d8006709"
   },
   "yaml": {
     "revision": "0e36bed171768908f331ff7dff9d956bae016efb"

From 4a8901b0d5398b45e075fcdbf9b8fe546349cc14 Mon Sep 17 00:00:00 2001
From: Brian Ryall <me@brianryall.xyz>
Date: Wed, 28 Feb 2024 22:13:51 -0500
Subject: [PATCH 1225/2704] feat(beancount): refactor scanner to c

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5eb1debe0..edc7000e1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
   },
   "beancount": {
-    "revision": "dd6f4ec9b01dd18cc4aa8c8517738414fb98cd63"
+    "revision": "b2c12eb49e308f33312269da1e31469f40c7b3c1"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c9c22886d..aef843213 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -170,7 +170,7 @@ list.bass = {
 list.beancount = {
   install_info = {
     url = "https://github.com/polarmutex/tree-sitter-beancount",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@polarmutex" },
 }

From 4349af8a6e8171d5e313a2e4e33d912745ef5e1e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 06:35:15 +0000
Subject: [PATCH 1226/2704] Update parsers: chatito, gitattributes, gitcommit,
 gpg, groovy, hlsl, mermaid, pem, poe_filter, properties, pymanifest,
 requirements, ssh_config, udev, wing, xcompose

---
 lockfile.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index edc7000e1..14cb8c036 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -60,7 +60,7 @@
     "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
   },
   "chatito": {
-    "revision": "7162ec1e8e9154fb334e84aa7637a4af051dfe42"
+    "revision": "fe7a2a75d3d74c1215141b7a7ebebb57ae17a370"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
@@ -201,10 +201,10 @@
     "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
   },
   "gitattributes": {
-    "revision": "e4f5a2c843b59e6299bbb746777cd7395d0f62ee"
+    "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "7c01af8d227b5344f62aade2ff00f19bd0c458ca"
+    "revision": "7fe4245d5095f195ddfb3e981e7c42d5e0d6c5f1"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -240,13 +240,13 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "7fd855d7b5442d6eb4b3f2f8797b572b78d4afe6"
+    "revision": "d4c9cc0060cd4d1b8ca6d7add9f34352ad310a09"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "235009aad0f580211fc12014bb0846c3910130c1"
+    "revision": "3c25d1ce6c1eb9da34215060372792dc9f439b0c"
   },
   "gstlaunch": {
     "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
@@ -273,7 +273,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "f820ee8417451f69020791cf691904ec1b63f20d"
+    "revision": "ee24be127560f0de0c4741e382416f45ab47eb76"
   },
   "hlsplaylist": {
     "revision": "5be34b0f6ea01b24f017c2c715729a3a919f57fd"
@@ -399,7 +399,7 @@
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
   },
   "mermaid": {
-    "revision": "e26a5f8898a8174f02b4cc9a9050eb3ccfb799f3"
+    "revision": "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98"
   },
   "meson": {
     "revision": "d6ec8ce0963c3c8180161391f15d8f7d415f650d"
@@ -462,7 +462,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "pem": {
-    "revision": "db307bbb7dc4f721bf2f5ba7fcedaf58feeb59e0"
+    "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
     "revision": "6526e5d5bf31501de0dc51c42ac3583078a8fdab"
@@ -486,7 +486,7 @@
     "revision": "39da859947b94abdee43e431368e1ae975c0a424"
   },
   "poe_filter": {
-    "revision": "bf912df70f60b356c70631d9cbb317b41c1ea319"
+    "revision": "592476d81f95d2451f2ca107dc872224c76fecdf"
   },
   "pony": {
     "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
@@ -501,7 +501,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "ce2f4f66454edb69f66bfa3a1884f601fccd9e08"
+    "revision": "9d09f5f200c356c50c4103d36441309fd61b48d1"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
@@ -522,7 +522,7 @@
     "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
   },
   "pymanifest": {
-    "revision": "69ad424b5dd41088206bd74ebcdd61d987b7825c"
+    "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
   },
   "python": {
     "revision": "22d3f87bdafac2782e907330babe4af574f5d0b4"
@@ -564,7 +564,7 @@
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
   },
   "requirements": {
-    "revision": "d43b6ec982902df01ce00df85a0cdb6ec8d3e81f"
+    "revision": "2764b6b219b2576577b0ce55c27e9d772e6f64c2"
   },
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
@@ -633,7 +633,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "3a1a5e139514a0e2789d1d7c5065c01bb71756f2"
+    "revision": "4fab1c9116cb7890885508e4630cc8e6a8373a41"
   },
   "starlark": {
     "revision": "b31a616aac5d05f927f3f9dd809789db7805b632"
@@ -723,7 +723,7 @@
     "revision": "3c3e5f8e0caeba6157e26a1bedf8321e1da62799"
   },
   "udev": {
-    "revision": "caa721ff38704c1186c2afeb467bead8c27ea382"
+    "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
@@ -765,10 +765,10 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "508bd430e78e9d2a8509948c4e42dbeb3ecc3265"
+    "revision": "749aa08e4aaa73ca5818d4e5200cf640668b0519"
   },
   "xcompose": {
-    "revision": "7fd14940e0478fce79ea195067ed14a2c42c654a"
+    "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
     "revision": "c23bd31d0aa72bfc01238b2546d5e823d8006709"

From 06b5fda797ea4c363e9fe17b160c33818be8d319 Mon Sep 17 00:00:00 2001
From: GodOfAvacyn <59858208+GodOfAvacyn@users.noreply.github.com>
Date: Thu, 29 Feb 2024 02:30:33 -0800
Subject: [PATCH 1227/2704] feat: add support for gdshader (#6153)

Godot shading language

---------

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   9 ++
 queries/gdshader/highlights.scm | 142 ++++++++++++++++++++++++++++++++
 queries/gdshader/injections.scm |   2 +
 5 files changed, 157 insertions(+)
 create mode 100644 queries/gdshader/highlights.scm
 create mode 100644 queries/gdshader/injections.scm

diff --git a/README.md b/README.md
index c25e98e3a..986ab537c 100644
--- a/README.md
+++ b/README.md
@@ -238,6 +238,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
 - [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
 - [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
+- [x] [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) (maintained by @godofavacyn)
 - [x] [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
 - [x] [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) (maintained by @gbprod)
 - [x] [gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index 14cb8c036..c87237b91 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -194,6 +194,9 @@
   "gdscript": {
     "revision": "b5dea4d852db65f0872d849c24533eb121e03c76"
   },
+  "gdshader": {
+    "revision": "ffd9f958df13cae04593781d7d2562295a872455"
+  },
   "git_config": {
     "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index aef843213..89102f405 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -619,6 +619,15 @@ list.gdscript = {
   readme_name = "Godot (gdscript)",
 }
 
+list.gdshader = {
+  install_info = {
+    url = "https://github.com/GodOfAvacyn/tree-sitter-gdshader",
+    files = { "src/parser.c" },
+  },
+  filetype = "gdshaderinc",
+  maintainers = { "@godofavacyn" },
+}
+
 list.git_rebase = {
   install_info = {
     url = "https://github.com/the-mikedavis/tree-sitter-git-rebase",
diff --git a/queries/gdshader/highlights.scm b/queries/gdshader/highlights.scm
new file mode 100644
index 000000000..797681a0c
--- /dev/null
+++ b/queries/gdshader/highlights.scm
@@ -0,0 +1,142 @@
+[
+  "render_mode"
+  "shader_type"
+  "group_uniforms"
+  "global"
+  "instance"
+  "const"
+  "varying"
+  "uniform"
+  "struct"
+] @keyword
+
+[
+  (precision_qualifier)
+  (interpolation_qualifier)
+] @type.qualifier
+
+[
+  "in"
+  "out"
+  "inout"
+] @keyword.storage
+
+[
+  "while"
+  "for"
+] @keyword.repeat
+
+[
+  "continue"
+  "break"
+  "return"
+] @keyword.return
+
+[
+  "if"
+  "else"
+  "switch"
+  "case"
+  "default"
+] @keyword.conditional
+
+[
+  "#"
+  "include"
+] @keyword.directive
+
+(string) @string
+
+[
+  "="
+  "+="
+  "-="
+  "!"
+  "~"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "||"
+  "&&"
+  "|"
+  "^"
+  "&"
+  "=="
+  "!="
+  ">"
+  ">="
+  "<="
+  "<"
+  "<<"
+  ">>"
+  "++"
+  "--"
+] @operator
+
+(boolean) @boolean
+
+(integer) @number
+
+(float) @number.float
+
+[
+  "."
+  ","
+  ";"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(builtin_type) @type.builtin
+
+(ident_type) @type.definition
+
+[
+  (shader_type)
+  (render_mode)
+  (hint_name)
+] @attribute
+
+(builtin_variable) @constant.builtin
+
+(builtin_function) @function.builtin
+
+(group_uniforms_declaration
+  group_name: (ident) @property
+  subgroup_name: (ident) @property)
+
+(struct_declaration
+  name: (ident) @type)
+
+(struct_member
+  name: (ident) @property)
+
+(function_declaration
+  name: (ident) @function)
+
+(parameter
+  name: (ident) @variable.parameter)
+
+(member_expr
+  member: (ident) @property)
+
+(call_expr
+  function:
+    [
+      (ident)
+      (builtin_type)
+    ] @function)
+
+(call_expr
+  function: (builtin_type) @function.call)
+
+(comment) @comment @spell
diff --git a/queries/gdshader/injections.scm b/queries/gdshader/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/gdshader/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 84daea50b1e53bce085b27fe44204708fc8b1d96 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 11:58:51 +0000
Subject: [PATCH 1228/2704] Update parsers: angular, gitcommit, vimdoc, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c87237b91..e90c23af8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "6f34e6b82b4765a288b0477be08912600fdc1483"
+    "revision": "6d02054ae9aa1fedf5097fe6d93dd78f751dff21"
   },
   "apex": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -207,7 +207,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "7fe4245d5095f195ddfb3e981e7c42d5e0d6c5f1"
+    "revision": "6bd81962d1abe309bf5dffde3315e4a5988f35fd"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -756,7 +756,7 @@
     "revision": "bc1364d922952138957a62105171ed68e73fbb6c"
   },
   "vimdoc": {
-    "revision": "40fcd50a2c7b5a3ef98294795116773b24fb61ab"
+    "revision": "b63be26fa571259b512e1939f01755d9d6e78fbd"
   },
   "vue": {
     "revision": "7e48557b903a9db9c38cea3b7839ef7e1f36c693"
@@ -768,7 +768,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "749aa08e4aaa73ca5818d4e5200cf640668b0519"
+    "revision": "1fc9b789267f751ec7a9163882da3aa786a45798"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 62b0bb4f24ad09f535efe44cc9d088f90dcd2498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Mon, 19 Feb 2024 00:00:07 +0900
Subject: [PATCH 1229/2704] feat(format): extra newline after modeline

---
 queries/angular/highlights.scm    |  1 +
 queries/apex/highlights.scm       |  1 +
 queries/arduino/highlights.scm    |  1 +
 queries/astro/highlights.scm      |  1 +
 queries/astro/injections.scm      |  1 +
 queries/cpp/folds.scm             |  1 +
 queries/cpp/highlights.scm        |  1 +
 queries/cpp/indents.scm           |  1 +
 queries/cpp/locals.scm            |  1 +
 queries/csv/highlights.scm        |  1 +
 queries/cuda/highlights.scm       |  1 +
 queries/glsl/highlights.scm       |  1 +
 queries/hjson/indents.scm         |  1 +
 queries/hlsl/highlights.scm       |  1 +
 queries/html/highlights.scm       |  1 +
 queries/ispc/folds.scm            |  1 +
 queries/ispc/highlights.scm       |  1 +
 queries/ispc/indents.scm          |  1 +
 queries/ispc/locals.scm           |  1 +
 queries/javascript/highlights.scm |  1 +
 queries/javascript/locals.scm     |  1 +
 queries/jsonc/highlights.scm      |  1 +
 queries/jsonc/indents.scm         |  1 +
 queries/luau/folds.scm            |  1 +
 queries/luau/indents.scm          |  1 +
 queries/nqc/highlights.scm        |  1 +
 queries/objc/folds.scm            |  1 +
 queries/objc/highlights.scm       |  1 +
 queries/objc/injections.scm       |  1 +
 queries/php/injections.scm        |  1 +
 queries/psv/highlights.scm        |  1 +
 queries/scss/highlights.scm       |  1 +
 queries/scss/indents.scm          |  1 +
 queries/slang/folds.scm           |  1 +
 queries/slang/highlights.scm      |  1 +
 queries/slang/indents.scm         |  1 +
 queries/snakemake/folds.scm       |  1 +
 queries/snakemake/highlights.scm  |  1 +
 queries/snakemake/injections.scm  |  1 +
 queries/svelte/folds.scm          |  1 +
 queries/svelte/highlights.scm     |  1 +
 queries/svelte/indents.scm        |  1 +
 queries/svelte/injections.scm     |  1 +
 queries/templ/highlights.scm      |  1 +
 queries/templ/injections.scm      |  1 +
 queries/terraform/highlights.scm  |  1 +
 queries/typescript/folds.scm      |  1 +
 queries/typescript/highlights.scm |  1 +
 queries/typescript/indents.scm    |  1 +
 queries/typescript/locals.scm     |  1 +
 queries/vue/highlights.scm        |  1 +
 queries/vue/indents.scm           |  1 +
 queries/xml/highlights.scm        |  1 +
 scripts/format-queries.lua        | 17 ++++++++++++++++-
 54 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 0fd97f848..af1c58e45 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: html_tags
+
 (identifier) @variable
 
 (pipe_operator) @operator
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 2d1859688..2d2f8819d 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: soql
+
 ; Apex + SOQL
 [
   "["
diff --git a/queries/arduino/highlights.scm b/queries/arduino/highlights.scm
index d905c5eb3..e6bf14784 100644
--- a/queries/arduino/highlights.scm
+++ b/queries/arduino/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: cpp
+
 ((identifier) @function.builtin
   (#any-of? @function.builtin
     ; Digital I/O
diff --git a/queries/astro/highlights.scm b/queries/astro/highlights.scm
index 650a489e4..bdaf88e32 100644
--- a/queries/astro/highlights.scm
+++ b/queries/astro/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: html
+
 "---" @punctuation.delimiter
 
 [
diff --git a/queries/astro/injections.scm b/queries/astro/injections.scm
index 9b1f285db..717712ad5 100644
--- a/queries/astro/injections.scm
+++ b/queries/astro/injections.scm
@@ -1,4 +1,5 @@
 ; inherits: html_tags
+
 (frontmatter
   (raw_text) @injection.content
   (#set! injection.language "typescript"))
diff --git a/queries/cpp/folds.scm b/queries/cpp/folds.scm
index 26a068a55..f5f566480 100644
--- a/queries/cpp/folds.scm
+++ b/queries/cpp/folds.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 [
   (for_range_loop)
   (class_specifier)
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 883c26faa..786391e32 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 ((identifier) @variable.member
   (#lua-match? @variable.member "^m_.*$"))
 
diff --git a/queries/cpp/indents.scm b/queries/cpp/indents.scm
index be6826d6e..0782d226e 100644
--- a/queries/cpp/indents.scm
+++ b/queries/cpp/indents.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 (condition_clause) @indent.begin
 
 ((field_initializer_list) @indent.begin
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
index 863f9de7d..8b1d8dcc1 100644
--- a/queries/cpp/locals.scm
+++ b/queries/cpp/locals.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 ; Parameters
 (variadic_parameter_declaration
   declarator:
diff --git a/queries/csv/highlights.scm b/queries/csv/highlights.scm
index 94abe21cc..de2213aa1 100644
--- a/queries/csv/highlights.scm
+++ b/queries/csv/highlights.scm
@@ -1,2 +1,3 @@
 ; inherits: tsv
+
 "," @punctuation.delimiter
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
index 0b2a13e49..565daaa91 100644
--- a/queries/cuda/highlights.scm
+++ b/queries/cuda/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: cpp
+
 [
   "<<<"
   ">>>"
diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index dbf3ed07b..af037c160 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 [
   "in"
   "out"
diff --git a/queries/hjson/indents.scm b/queries/hjson/indents.scm
index 350f670a0..3b01ca999 100644
--- a/queries/hjson/indents.scm
+++ b/queries/hjson/indents.scm
@@ -1,2 +1,3 @@
 ; inherits: json
+
 (comment) @indent.ignore
diff --git a/queries/hlsl/highlights.scm b/queries/hlsl/highlights.scm
index b85c1a7fd..d70a83790 100644
--- a/queries/hlsl/highlights.scm
+++ b/queries/hlsl/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: cpp
+
 [
   "in"
   "out"
diff --git a/queries/html/highlights.scm b/queries/html/highlights.scm
index ae4e396c0..4e2371d64 100644
--- a/queries/html/highlights.scm
+++ b/queries/html/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: html_tags
+
 (doctype) @constant
 
 "<!" @tag.delimiter
diff --git a/queries/ispc/folds.scm b/queries/ispc/folds.scm
index 331c70345..45d0ba131 100644
--- a/queries/ispc/folds.scm
+++ b/queries/ispc/folds.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 [
   (foreach_statement)
   (foreach_instance_statement)
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 7ac7d2966..45d7be584 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 [
   "soa"
   "task"
diff --git a/queries/ispc/indents.scm b/queries/ispc/indents.scm
index bf64a963b..80723afb4 100644
--- a/queries/ispc/indents.scm
+++ b/queries/ispc/indents.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 ((foreach_statement
   body: (_) @_body) @indent.begin
   (#not-has-type? @_body compound_statement))
diff --git a/queries/ispc/locals.scm b/queries/ispc/locals.scm
index 54e328083..985b3c9e0 100644
--- a/queries/ispc/locals.scm
+++ b/queries/ispc/locals.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 (reference_declarator
   (identifier) @local.definition.var)
 
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index 9b166d1fd..257a731ad 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: ecma,jsx
+
 ; Parameters
 (formal_parameters
   (identifier) @variable.parameter)
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index 36c14db91..892901c26 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -1,4 +1,5 @@
 ; inherits: ecma,jsx
+
 ; Both properties are matched here.
 ;
 ;   class Foo {
diff --git a/queries/jsonc/highlights.scm b/queries/jsonc/highlights.scm
index 763cd5998..e50112155 100644
--- a/queries/jsonc/highlights.scm
+++ b/queries/jsonc/highlights.scm
@@ -1,2 +1,3 @@
 ; inherits: json
+
 (comment) @comment @spell
diff --git a/queries/jsonc/indents.scm b/queries/jsonc/indents.scm
index 350f670a0..3b01ca999 100644
--- a/queries/jsonc/indents.scm
+++ b/queries/jsonc/indents.scm
@@ -1,2 +1,3 @@
 ; inherits: json
+
 (comment) @indent.ignore
diff --git a/queries/luau/folds.scm b/queries/luau/folds.scm
index c35ce1304..8ddaf9476 100644
--- a/queries/luau/folds.scm
+++ b/queries/luau/folds.scm
@@ -1,2 +1,3 @@
 ; inherits: lua
+
 (object_type) @fold
diff --git a/queries/luau/indents.scm b/queries/luau/indents.scm
index 03da6320b..f0af4dd33 100644
--- a/queries/luau/indents.scm
+++ b/queries/luau/indents.scm
@@ -1,2 +1,3 @@
 ; inherits: lua
+
 (object_type) @indent.begin
diff --git a/queries/nqc/highlights.scm b/queries/nqc/highlights.scm
index d1ff8de9c..215ffbc4d 100644
--- a/queries/nqc/highlights.scm
+++ b/queries/nqc/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 [
   "task"
   "sub"
diff --git a/queries/objc/folds.scm b/queries/objc/folds.scm
index 90469b9c3..b922f8bf8 100644
--- a/queries/objc/folds.scm
+++ b/queries/objc/folds.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 [
   (class_declaration)
   (class_interface)
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index 5c56625b8..7a83376c2 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 ; Preprocs
 (preproc_undef
   name: (_) @constant) @keyword.directive
diff --git a/queries/objc/injections.scm b/queries/objc/injections.scm
index f5d13f38e..359420d10 100644
--- a/queries/objc/injections.scm
+++ b/queries/objc/injections.scm
@@ -1,4 +1,5 @@
 ; inherits: c
+
 ; TODO(amaanq): uncomment/add when I add asm support
 ; (ms_asm_block "{" _ @asm "}")
 ;
diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index 141f65eaa..3ccbb2bb4 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -1,4 +1,5 @@
 ; inherits: php_only
+
 ((text) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
diff --git a/queries/psv/highlights.scm b/queries/psv/highlights.scm
index 1e886a0a4..b7303fe0b 100644
--- a/queries/psv/highlights.scm
+++ b/queries/psv/highlights.scm
@@ -1,2 +1,3 @@
 ; inherits: tsv
+
 "|" @punctuation.delimiter
diff --git a/queries/scss/highlights.scm b/queries/scss/highlights.scm
index 7ca542c83..726256f8e 100644
--- a/queries/scss/highlights.scm
+++ b/queries/scss/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: css
+
 [
   "@at-root"
   "@debug"
diff --git a/queries/scss/indents.scm b/queries/scss/indents.scm
index 94490879d..3d54a0467 100644
--- a/queries/scss/indents.scm
+++ b/queries/scss/indents.scm
@@ -1,4 +1,5 @@
 ; inherits: css
+
 [
   (mixin_statement)
   (while_statement)
diff --git a/queries/slang/folds.scm b/queries/slang/folds.scm
index 9f2b933d1..e0ae6853e 100644
--- a/queries/slang/folds.scm
+++ b/queries/slang/folds.scm
@@ -1,4 +1,5 @@
 ; inherits: hlsl
+
 [
   (interface_specifier)
   (extension_specifier)
diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
index f60fb0aae..5dcdc4c38 100644
--- a/queries/slang/highlights.scm
+++ b/queries/slang/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: hlsl
+
 [
   "var"
   "let"
diff --git a/queries/slang/indents.scm b/queries/slang/indents.scm
index f07cb0562..6175ac5bc 100644
--- a/queries/slang/indents.scm
+++ b/queries/slang/indents.scm
@@ -1,4 +1,5 @@
 ; inherits: hlsl
+
 [
   (interface_specifier)
   (extension_specifier)
diff --git a/queries/snakemake/folds.scm b/queries/snakemake/folds.scm
index 36ed2318b..99850bd9b 100644
--- a/queries/snakemake/folds.scm
+++ b/queries/snakemake/folds.scm
@@ -1,4 +1,5 @@
 ; inherits: python
+
 [
   (rule_definition)
   (module_definition)
diff --git a/queries/snakemake/highlights.scm b/queries/snakemake/highlights.scm
index 65789ea96..b28117402 100644
--- a/queries/snakemake/highlights.scm
+++ b/queries/snakemake/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: python
+
 ; Compound directives
 [
   "rule"
diff --git a/queries/snakemake/injections.scm b/queries/snakemake/injections.scm
index 82072f2ad..fa56daabb 100644
--- a/queries/snakemake/injections.scm
+++ b/queries/snakemake/injections.scm
@@ -1,4 +1,5 @@
 ; inherits: python
+
 (wildcard
   (constraint) @injection.content
   (#set! injection.language "regex"))
diff --git a/queries/svelte/folds.scm b/queries/svelte/folds.scm
index d46a81ec4..6440301af 100644
--- a/queries/svelte/folds.scm
+++ b/queries/svelte/folds.scm
@@ -1,4 +1,5 @@
 ; inherits: html
+
 [
   (if_statement)
   (else_if_block)
diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 0746879e0..961a8ed5b 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: html
+
 (raw_text) @none
 
 [
diff --git a/queries/svelte/indents.scm b/queries/svelte/indents.scm
index 8e6124d75..0c67647d7 100644
--- a/queries/svelte/indents.scm
+++ b/queries/svelte/indents.scm
@@ -1,4 +1,5 @@
 ; inherits: html
+
 [
   (if_statement)
   (each_statement)
diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index a101fe668..d17849446 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -1,4 +1,5 @@
 ; inherits: html_tags
+
 ((style_element
   (start_tag
     (attribute
diff --git a/queries/templ/highlights.scm b/queries/templ/highlights.scm
index 628b5bf15..e24dbeba8 100644
--- a/queries/templ/highlights.scm
+++ b/queries/templ/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: go
+
 (component_declaration
   name: (component_identifier) @function)
 
diff --git a/queries/templ/injections.scm b/queries/templ/injections.scm
index df87ddc97..b9cf5a06a 100644
--- a/queries/templ/injections.scm
+++ b/queries/templ/injections.scm
@@ -1,4 +1,5 @@
 ; inherits: go
+
 ((element_comment) @injection.content
   (#set! injection.language "comment"))
 
diff --git a/queries/terraform/highlights.scm b/queries/terraform/highlights.scm
index 4050ce77a..1655af31d 100644
--- a/queries/terraform/highlights.scm
+++ b/queries/terraform/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: hcl
+
 ; Terraform specific references
 ;
 ;
diff --git a/queries/typescript/folds.scm b/queries/typescript/folds.scm
index 006ba857a..df0b8942a 100644
--- a/queries/typescript/folds.scm
+++ b/queries/typescript/folds.scm
@@ -1,4 +1,5 @@
 ; inherits: ecma
+
 [
   (interface_declaration)
   (internal_module)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index ce1fa886a..961ec99ec 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: ecma
+
 "require" @keyword.import
 
 (import_require_clause
diff --git a/queries/typescript/indents.scm b/queries/typescript/indents.scm
index 23222051c..9a269ba75 100644
--- a/queries/typescript/indents.scm
+++ b/queries/typescript/indents.scm
@@ -1,4 +1,5 @@
 ; inherits: ecma
+
 [
   (enum_declaration)
   (interface_declaration)
diff --git a/queries/typescript/locals.scm b/queries/typescript/locals.scm
index f1928484a..b89d9a0c0 100644
--- a/queries/typescript/locals.scm
+++ b/queries/typescript/locals.scm
@@ -1,4 +1,5 @@
 ; inherits: ecma
+
 (required_parameter
   (identifier) @local.definition)
 
diff --git a/queries/vue/highlights.scm b/queries/vue/highlights.scm
index 066586459..410dd0fff 100644
--- a/queries/vue/highlights.scm
+++ b/queries/vue/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: html_tags
+
 [
   (directive_dynamic_argument)
   (directive_dynamic_argument_value)
diff --git a/queries/vue/indents.scm b/queries/vue/indents.scm
index 8c8091ab5..6b377f323 100644
--- a/queries/vue/indents.scm
+++ b/queries/vue/indents.scm
@@ -1,4 +1,5 @@
 ; inherits: html_tags
+
 (template_element) @indent.begin
 
 (template_element
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index 7881e0df0..4585d2ae3 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -1,4 +1,5 @@
 ; inherits: dtd
+
 ; XML declaration
 (XMLDecl
   "standalone" @tag.attribute)
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index ec2197956..1bc7532b8 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -61,6 +61,19 @@ local format_queries = [[
   (comment) @format.prepend-newline
   (#not-is-start-of-line? @_comment)
   (#is-start-of-line? @format.prepend-newline))
+; Extra newline for modelines
+(program
+  (comment) @_modeline
+  .
+  (_) @format.prepend-newline
+  (#is-start-of-line? @_modeline)
+  (#contains? @_modeline "^;+%s*inherits:"))
+(program
+  (comment) @_modeline
+  .
+  (_) @format.prepend-newline
+  (#is-start-of-line? @_modeline)
+  (#contains? @_modeline "^;+%s*extends%s*$"))
 ;; }}}
 ;; Making sure all top-level patterns are separated
 (program
@@ -88,7 +101,9 @@ local format_queries = [[
     (field_definition)
     (comment)
   ] @format.cancel-prepend
-  (#is-start-of-line? @_comment))
+  (#is-start-of-line? @_comment)
+  (#not-lua-match? @_comment "^;+%s*inherits:")
+  (#not-lua-match? @_comment "^;+%s*extends%s*$"))
 ;; }}}
 
 ;; delims

From 8e349b1ea938ca47e439f84811851c8d33ce9b75 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 29 Feb 2024 10:41:43 -0800
Subject: [PATCH 1230/2704] feat(gitcommit): highlight overflow in commit body

---
 queries/gitcommit/highlights.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index 8f7036a7e..4542413c8 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -15,8 +15,7 @@
 
 (subject) @markup.heading @spell
 
-(subject
-  (overflow) @none @spell)
+(overflow) @comment.warning @spell
 
 (subject
   (subject_prefix) @function @nospell)

From 3ad0e410f8c9c647ff0381d6c2ffc35b97f34e9d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 1 Mar 2024 08:29:03 +0100
Subject: [PATCH 1231/2704] fix(astro): update to scanner rewrite

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e90c23af8..5bb9e0921 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
   },
   "astro": {
-    "revision": "e924787e12e8a03194f36a113290ac11d6dc10f3"
+    "revision": "dfa0893bdc4bdfada102043404758c66e3580568"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 89102f405..5333d19f1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -130,7 +130,7 @@ list.asm = {
 list.astro = {
   install_info = {
     url = "https://github.com/virchau13/tree-sitter-astro",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@virchau13" },
 }

From 30a41f52f91e589ed10549e618f207e3d747d77a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 1 Mar 2024 08:43:57 +0100
Subject: [PATCH 1232/2704] ci: bump create-pull-request to v6

---
 .github/workflows/update-lockfile.yml | 2 +-
 .github/workflows/update-readme.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index b163a3232..80fc5e565 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -42,7 +42,7 @@ jobs:
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ steps.app-token.outputs.token }}
           author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index e68b43d50..94c4a879f 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -30,7 +30,7 @@ jobs:
           nvim -l scripts/update-readme.lua || echo 'Needs update'
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ steps.app-token.outputs.token }}
           author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"

From c2a265156d5799adbd9f9e7d5385735fa5d21776 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 07:39:10 +0000
Subject: [PATCH 1233/2704] Update parsers: beancount, requirements, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5bb9e0921..eedb9b67a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
   },
   "beancount": {
-    "revision": "b2c12eb49e308f33312269da1e31469f40c7b3c1"
+    "revision": "1f19abf1e162e1828013cb5434c6cf30f4054e80"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -567,7 +567,7 @@
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
   },
   "requirements": {
-    "revision": "2764b6b219b2576577b0ce55c27e9d772e6f64c2"
+    "revision": "8666a4dfeb3107144398158bc3dd7a3f59d89ccb"
   },
   "rnoweb": {
     "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
@@ -741,7 +741,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "46b8341458bb620a82ef1d8009a3e2f00bc0dad9"
+    "revision": "be121f724e4f3e2159dfa193c876be605c1de7fa"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -768,7 +768,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "1fc9b789267f751ec7a9163882da3aa786a45798"
+    "revision": "13b79ea3f343b15f233c6e7ac930797748191615"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From cbaad1951e87396f386e6fcc1ff7011ec67fe402 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 06:35:11 +0000
Subject: [PATCH 1234/2704] Update parsers: sourcepawn

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index eedb9b67a..82a4f5fa1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -624,7 +624,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "39ce73ad42b2c4f52848d16093c24feddaa7d226"
+    "revision": "b1ae9e3c4a41ebf666582da24fcce316f38a0613"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"

From a47540fd737eb5c03ee21ee69eb8134ce5568fb6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 09:08:39 +0000
Subject: [PATCH 1235/2704] Update parsers: vimdoc

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 82a4f5fa1..b88cc25f4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -756,7 +756,7 @@
     "revision": "bc1364d922952138957a62105171ed68e73fbb6c"
   },
   "vimdoc": {
-    "revision": "b63be26fa571259b512e1939f01755d9d6e78fbd"
+    "revision": "016ad75faa854e4e13bc40c517015183b795eed9"
   },
   "vue": {
     "revision": "7e48557b903a9db9c38cea3b7839ef7e1f36c693"

From ada920f2a43f87a26356d386cefe656bd6b3e9a8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 2 Mar 2024 16:54:16 +0100
Subject: [PATCH 1236/2704] feat(vue): switch to new parser (#6233)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(vue): switch to new parser

---------

Co-authored-by: Phạm Huy Hoàng <hoangtun0810@gmail.com>
---
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua |  3 ++-
 queries/vue/highlights.scm      | 32 +++++++++++++++++++++++++-------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b88cc25f4..41bbc7755 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -759,7 +759,7 @@
     "revision": "016ad75faa854e4e13bc40c517015183b795eed9"
   },
   "vue": {
-    "revision": "7e48557b903a9db9c38cea3b7839ef7e1f36c693"
+    "revision": "085e99bcc46b2e63ff06a830a31a55132ce95aa5"
   },
   "wgsl": {
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5333d19f1..a9beebaf3 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2204,8 +2204,9 @@ list.vue = {
   install_info = {
     url = "https://github.com/tree-sitter-grammars/tree-sitter-vue",
     files = { "src/parser.c", "src/scanner.c" },
+    branch = "main",
   },
-  maintainers = { "@WhyNotHugo" },
+  maintainers = { "@WhyNotHugo", "@lucario387" },
 }
 
 list.wgsl = {
diff --git a/queries/vue/highlights.scm b/queries/vue/highlights.scm
index 410dd0fff..64195c346 100644
--- a/queries/vue/highlights.scm
+++ b/queries/vue/highlights.scm
@@ -1,17 +1,38 @@
 ; inherits: html_tags
 
 [
-  (directive_dynamic_argument)
-  (directive_dynamic_argument_value)
-] @tag
+  "["
+  "]"
+] @punctuation.bracket
 
 (interpolation) @punctuation.special
 
 (interpolation
   (raw_text) @none)
 
+(dynamic_directive_inner_value) @variable
+
 (directive_name) @tag.attribute
 
+; Accessing a component object's field
+(":"
+  .
+  (directive_value) @variable.member)
+
+("."
+  .
+  (directive_value) @property)
+
+; @click is like onclick for HTML
+("@"
+  .
+  (directive_value) @function.method)
+
+; Used in v-slot, declaring position the element should be put in
+("#"
+  .
+  (directive_value) @variable)
+
 (directive_attribute
   (quoted_attribute_value) @punctuation.special)
 
@@ -19,7 +40,4 @@
   (quoted_attribute_value
     (attribute_value) @none))
 
-[
-  (directive_modifier)
-  (directive_argument)
-] @function.method
+(directive_modifier) @function.method

From e3e5ff4ebddcbfa8f5798253ebd1f9b449e8ee69 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 15:54:28 +0000
Subject: [PATCH 1237/2704] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 986ab537c..eff088f50 100644
--- a/README.md
+++ b/README.md
@@ -426,7 +426,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
 - [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
 - [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason)
-- [x] [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) (maintained by @WhyNotHugo)
+- [x] [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) (maintained by @WhyNotHugo, @lucario387)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
 - [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka, @MarkMcCulloh)

From 22c5a0d833ac70e07a7a70ba4e29081a1072422b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 2 Mar 2024 16:58:50 +0100
Subject: [PATCH 1238/2704] ci: teach bot about conventional commits

---
 .github/workflows/update-lockfile.yml | 2 +-
 .github/workflows/update-readme.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 80fc5e565..b994622bf 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           token: ${{ steps.app-token.outputs.token }}
           author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
-          commit-message: "Update parsers: ${{ env.UPDATED_PARSERS }}"
+          commit-message: "bot(lockfile): update ${{ env.UPDATED_PARSERS }}"
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
           branch: update-lockfile-pr
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 94c4a879f..44f10a425 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           token: ${{ steps.app-token.outputs.token }}
           author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
-          commit-message: Update README
+          commit-message: "bot(readme): update"
           title: Update README
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
           branch: update-readme-pr

From 99ddf573531c4dbe53f743ecbc1595af5eb1d32f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 3 Mar 2024 11:00:11 +0100
Subject: [PATCH 1239/2704] feat(highlights)!: enforce documented captures
 (#6232)

Problem: Allowing undocumented "secret" (sub)captures makes it harder
to write comprehensive colorschemes and catch inconsistent captures.

Solution: Only allow captures listed in CONTRIBUTING.md. Add useful
(cross-language) subcaptures and drop language-specific or too niche
ones.

Follow-up: Adding further `*.builtin` captures and changing queries to
use them.

Language-specific subcaptures should instead be added in user config or
a custom language plugin.
---
 CONTRIBUTING.md                         | 24 ++++++++++++++++-------
 queries/cpp/highlights.scm              |  5 ++---
 queries/cue/locals.scm                  |  6 +++---
 queries/ebnf/highlights.scm             |  4 ++--
 queries/firrtl/highlights.scm           |  2 +-
 queries/fsh/highlights.scm              |  2 +-
 queries/hare/locals.scm                 |  2 +-
 queries/hoon/highlights.scm             |  2 +-
 queries/jsonnet/highlights.scm          |  2 +-
 queries/latex/highlights.scm            | 14 ++++++-------
 queries/linkerscript/highlights.scm     |  2 +-
 queries/markdown/highlights.scm         | 20 +++++++++----------
 queries/markdown_inline/highlights.scm  |  8 ++++----
 queries/objc/highlights.scm             |  4 ++--
 queries/perl/highlights.scm             | 26 ++++++++++++-------------
 queries/rbs/highlights.scm              |  2 +-
 queries/rst/injections.scm              | 11 +----------
 queries/ruby/highlights.scm             |  7 ++++---
 queries/rust/highlights.scm             |  2 +-
 queries/slint/locals.scm                |  2 +-
 queries/soql/highlights.scm             |  7 ++++---
 queries/squirrel/highlights.scm         |  9 +++++----
 queries/squirrel/locals.scm             |  4 ++--
 queries/strace/highlights.scm           |  7 ++++---
 queries/ungrammar/locals.scm            |  7 ++++---
 queries/vimdoc/highlights.scm           | 17 ++++++++--------
 queries/xml/highlights.scm              |  4 ++--
 scripts/check-queries.lua               | 14 ++-----------
 tests/query/highlights/markdown/test.md |  4 ++--
 29 files changed, 108 insertions(+), 112 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 25c13edfb..9c2f4e033 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -98,10 +98,11 @@ As languages differ quite a lot, here is a set of captures available to you when
 #### Identifiers
 
 ```query
-@variable            ; various variable names
-@variable.builtin    ; built-in variable names (e.g. `this`)
-@variable.parameter  ; parameters of a function
-@variable.member     ; object and struct fields
+@variable                    ; various variable names
+@variable.builtin            ; built-in variable names (e.g. `this`)
+@variable.parameter          ; parameters of a function
+@variable.parameter.builtin  ; special parameters (e.g. `_`, `it`)
+@variable.member             ; object and struct fields
 
 @constant          ; constant identifiers
 @constant.builtin  ; built-in constant values
@@ -111,6 +112,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 @module.builtin    ; built-in modules or namespaces
 @label             ; GOTO and other labels (e.g. `label:` in C), including heredoc labels
 ```
+
 #### Literals
 
 ```query
@@ -139,8 +141,9 @@ As languages differ quite a lot, here is a set of captures available to you when
 @type.definition  ; identifiers in type definitions (e.g. `typedef <type> <identifier>` in C)
 @type.qualifier   ; type qualifiers (e.g. `const`)
 
-@attribute        ; attribute annotations (e.g. Python decorators)
-@property         ; the key in key/value pairs
+@attribute          ; attribute annotations (e.g. Python decorators)
+@attribute.builtin  ; builtin annotations (e.g. `@property` in Python)
+@property           ; the key in key/value pairs
 ```
 
 #### Functions
@@ -167,6 +170,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 @keyword.operator          ; operators that are English words (e.g. `and` / `or`)
 @keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
 @keyword.storage           ; modifiers that affect storage in memory or life-time
+@keyword.type              ; keywords describing composite types (e.g. `struct`, `enum`)
 @keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
 @keyword.return            ; keywords like `return` and `yield`
 @keyword.debug             ; keywords related to debugging
@@ -210,10 +214,15 @@ Mainly for markup languages.
 @markup.underline      ; underlined text (only for literal underline markup!)
 
 @markup.heading        ; headings, titles (including markers)
+@markup.heading.1      ; top-level heading
+@markup.heading.2      ; section heading
+@markup.heading.3      ; subsection heading
+@markup.heading.4      ; and so on
+@markup.heading.5      ; and so forth
+@markup.heading.6      ; six levels ought to be enough for anybody
 
 @markup.quote          ; block quotes
 @markup.math           ; math environments (e.g. `$ ... $` in LaTeX)
-@markup.environment    ; environments (e.g. in LaTeX)
 
 @markup.link           ; text references, footnotes, citations, etc.
 @markup.link.label     ; link, reference descriptions
@@ -236,6 +245,7 @@ Mainly for markup languages.
 
 ```query
 @tag           ; XML-style tag names (and similar)
+@tag.builtin   ; builtin tag names (e.g. HTML5 tags)
 @tag.attribute ; XML-style tag attributes
 @tag.delimiter ; XML-style tag delimiters
 ```
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 786391e32..b021e8b37 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -220,12 +220,11 @@
   "constexpr"
 ] @keyword
 
-"co_await" @keyword.coroutine
-
 [
+  "co_await"
   "co_yield"
   "co_return"
-] @keyword.coroutine.return
+] @keyword.coroutine
 
 [
   "public"
diff --git a/queries/cue/locals.scm b/queries/cue/locals.scm
index 9c5a7378e..b2a8972f7 100644
--- a/queries/cue/locals.scm
+++ b/queries/cue/locals.scm
@@ -19,13 +19,13 @@
 (package_identifier) @local.definition.namespace
 
 (for_clause
-  (identifier) @local.definition.variable
+  (identifier) @local.definition.var
   (expression))
 
 (for_clause
   (identifier)
-  (identifier) @local.definition.variable
+  (identifier) @local.definition.var
   (expression))
 
 (let_clause
-  (identifier) @local.definition.variable)
+  (identifier) @local.definition.var)
diff --git a/queries/ebnf/highlights.scm b/queries/ebnf/highlights.scm
index 8715091b1..4254d04dd 100644
--- a/queries/ebnf/highlights.scm
+++ b/queries/ebnf/highlights.scm
@@ -1,7 +1,7 @@
 ; Simple tokens ;;;;
-(terminal) @string.grammar
+(terminal) @string
 
-(special_sequence) @string.special.grammar
+(special_sequence) @string.special
 
 (integer) @number
 
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index 8e078fad2..14f12b169 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -87,7 +87,7 @@
   "reader"
   "writer"
   "readwriter"
-] @variable.member.builtin
+] @variable.member
 
 ((field_id) @variable.member
   (#set! "priority" 105))
diff --git a/queries/fsh/highlights.scm b/queries/fsh/highlights.scm
index 3404fa7c6..2354a2037 100644
--- a/queries/fsh/highlights.scm
+++ b/queries/fsh/highlights.scm
@@ -86,7 +86,7 @@
 ; Constants
 (strength_value) @constant
 
-(bool) @constant.boolean
+(bool) @boolean
 
 (flag) @constant
 
diff --git a/queries/hare/locals.scm b/queries/hare/locals.scm
index b81ee5135..12a214bf7 100644
--- a/queries/hare/locals.scm
+++ b/queries/hare/locals.scm
@@ -61,5 +61,5 @@
 (let_declaration
   "let"
   .
-  (identifier) @local.definition.variable
+  (identifier) @local.definition.var
   ","?)
diff --git a/queries/hoon/highlights.scm b/queries/hoon/highlights.scm
index 767b0dd22..d98ee44e0 100644
--- a/queries/hoon/highlights.scm
+++ b/queries/hoon/highlights.scm
@@ -28,7 +28,7 @@
 
 (mold) @string.special.symbol
 
-(specialIndex) @number.builtin
+(specialIndex) @number
 
 (lark) @operator
 
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index acd838cbe..85670a25c 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -118,7 +118,7 @@
   identifier: (id) @variable.parameter)
 
 (bind
-  (id) @variable.local)
+  (id) @variable)
 
 (bind
   function: (id) @function)
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 5b5f19768..819a2ff94 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -41,16 +41,16 @@
 
 ; General environments
 (begin
-  command: _ @markup.environment
+  command: _ @module
   name:
     (curly_group_text
-      (text) @markup.environment.name))
+      (text) @label))
 
 (end
-  command: _ @markup.environment
+  command: _ @module
   name:
     (curly_group_text
-      (text) @markup.environment.name))
+      (text) @label))
 
 ; Definitions and references
 (new_command_definition
@@ -77,7 +77,7 @@
   command: _ @function.macro
   name:
     (curly_group_text
-      (_) @markup.environment.name))
+      (_) @label))
 
 (paired_delimiter_definition
   command: _ @function.macro
@@ -260,8 +260,8 @@
   (begin
     name:
       (curly_group_text
-        (text) @markup.environment.name)
-    (#any-of? @markup.environment.name "frame"))
+        (text) @label)
+    (#any-of? @label "frame"))
   .
   (curly_group
     (_) @markup.heading))
diff --git a/queries/linkerscript/highlights.scm b/queries/linkerscript/highlights.scm
index 23a483745..12330169e 100644
--- a/queries/linkerscript/highlights.scm
+++ b/queries/linkerscript/highlights.scm
@@ -63,7 +63,7 @@
   "LENGTH"
   "len"
   "l"
-] @variable.member.builtin
+] @variable.member
 
 ; Constants
 ((symbol) @constant
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index e4d375b54..5d77e7217 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -1,34 +1,34 @@
 ;From MDeiml/tree-sitter-markdown & Helix
 (setext_heading
   (paragraph) @markup.heading.1
-  (setext_h1_underline) @markup.heading.1.marker)
+  (setext_h1_underline) @markup.heading.1)
 
 (setext_heading
   (paragraph) @markup.heading.2
-  (setext_h2_underline) @markup.heading.2.marker)
+  (setext_h2_underline) @markup.heading.2)
 
 (atx_heading
-  (atx_h1_marker) @markup.heading.1.marker
+  (atx_h1_marker) @markup.heading.1
   (inline) @markup.heading.1)
 
 (atx_heading
-  (atx_h2_marker) @markup.heading.2.marker
+  (atx_h2_marker) @markup.heading.2
   (inline) @markup.heading.2)
 
 (atx_heading
-  (atx_h3_marker) @markup.heading.3.marker
+  (atx_h3_marker) @markup.heading.3
   (inline) @markup.heading.3)
 
 (atx_heading
-  (atx_h4_marker) @markup.heading.4.marker
+  (atx_h4_marker) @markup.heading.4
   (inline) @markup.heading.4)
 
 (atx_heading
-  (atx_h5_marker) @markup.heading.5.marker
+  (atx_h5_marker) @markup.heading.5
   (inline) @markup.heading.5)
 
 (atx_heading
-  (atx_h6_marker) @markup.heading.6.marker
+  (atx_h6_marker) @markup.heading.6
   (inline) @markup.heading.6)
 
 (info_string) @label
@@ -54,12 +54,12 @@
   (#set! "priority" 90))
 
 (fenced_code_block
-  (fenced_code_block_delimiter) @markup.raw.delimiter
+  (fenced_code_block_delimiter) @markup.raw.block
   (#set! conceal ""))
 
 (fenced_code_block
   (info_string
-    (language) @conceal
+    (language) @label
     (#set! conceal "")))
 
 (link_destination) @markup.link.url
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index e9b41c31d..cae8acfb4 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -16,10 +16,10 @@
 ] @string.escape
 
 ; Conceal codeblock and text style markers
-((code_span_delimiter) @markup.raw.delimiter
-  (#set! conceal ""))
-
-((emphasis_delimiter) @conceal
+([
+  (code_span_delimiter)
+  (emphasis_delimiter)
+] @conceal
   (#set! conceal ""))
 
 ; Conceal inline links
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index 7a83376c2..dd2c796bd 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -174,12 +174,12 @@
     "__unsafe_unretained"
     "__unused"
     "__weak"
-  ]) @function.macro.builtin
+  ]) @function.macro
 
 [
   "__real"
   "__imag"
-] @function.macro.builtin
+] @function.macro
 
 ((call_expression
   function: (identifier) @function.macro)
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 1b0dc2dc1..fcd0f3071 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -65,7 +65,7 @@
 (yadayada) @keyword.exception
 
 (phaser_statement
-  phase: _ @keyword.phaser)
+  phase: _ @keyword)
 
 [
   "or"
@@ -207,50 +207,50 @@
   ; highlights punc vars and also numeric only like $11
   (#lua-match? @variable.builtin "^%A+$"))
 
-(scalar) @variable.scalar
+(scalar) @variable
 
 (scalar_deref_expression
   [
     "$"
     "*"
-  ] @variable.scalar)
+  ] @variable)
 
 [
   (array)
   (arraylen)
-] @variable.array
+] @variable
 
 (array_deref_expression
   [
     "@"
     "*"
-  ] @variable.array)
+  ] @variable)
 
-(hash) @variable.hash
+(hash) @variable
 
 (hash_deref_expression
   [
     "%"
     "*"
-  ] @variable.hash)
+  ] @variable)
 
 (array_element_expression
-  array: (_) @variable.array)
+  array: (_) @variable)
 
 (slice_expression
-  array: (_) @variable.array)
+  array: (_) @variable)
 
 (keyval_expression
-  array: (_) @variable.array)
+  array: (_) @variable)
 
 (hash_element_expression
-  hash: (_) @variable.hash)
+  hash: (_) @variable)
 
 (slice_expression
-  hash: (_) @variable.hash)
+  hash: (_) @variable)
 
 (keyval_expression
-  hash: (_) @variable.hash)
+  hash: (_) @variable)
 
 (comment) @comment
 
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index 11dbf7c2c..340bc254e 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -80,7 +80,7 @@
 (const_name
   (constant) @constant)
 
-(global_name) @variable.global
+(global_name) @variable
 
 ; Standard Arguments
 (parameter
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index 7ca479a65..da57daa65 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -41,15 +41,7 @@
     (body
       (arguments) @injection.language
       (content) @injection.content))
-  (#any-of? @_type "code" "code-block" "sourcecode"))
-
-((directive
-  name: (type) @_type
-  body:
-    (body
-      (arguments) @injection.language
-      (content) @injection.content))
-  (#eq? @_type "raw"))
+  (#any-of? @_type "raw" "code" "code-block" "sourcecode"))
 
 ((directive
   name: (type) @_type
@@ -59,7 +51,6 @@
   (#set! injection.language "latex")
   (#eq? @_type "math"))
 
-; TODO: re-add when a parser for csv is added.
 ((directive
   name: (type) @_type
   body:
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 50e8c9093..5b5fcbf9f 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -1,7 +1,8 @@
 ; Variables
-(identifier) @variable
-
-(global_variable) @variable.global
+[
+  (identifier)
+  (global_variable)
+] @variable
 
 ; Keywords
 [
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index f5fff58d0..4639d8859 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -288,7 +288,7 @@
   [
     "'"
     (identifier)
-  ] @keyword.storage.lifetime)
+  ] @keyword.storage)
 
 "fn" @keyword.function
 
diff --git a/queries/slint/locals.scm b/queries/slint/locals.scm
index 2d256b7ac..7e895a6b5 100644
--- a/queries/slint/locals.scm
+++ b/queries/slint/locals.scm
@@ -16,7 +16,7 @@
 (argument) @local.definition.var
 
 (callback
-  name: (_) @local.definition.member)
+  name: (_) @local.definition.field)
 
 (component_definition
   name: (_) @local.definition.type)
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index 5356b8a7f..721e84ed2 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -82,9 +82,10 @@
 
 (string_literal) @string
 
-(date) @variable.readonly
-
-(date_time) @variable.readonly
+[
+  (date)
+  (date_time)
+] @string.special
 
 [
   "TRUE"
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index da7bef337..28d072029 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -64,15 +64,16 @@
 ] @type.qualifier
 
 ; Variables
-(identifier) @variable
+[
+  (identifier)
+  (global_variable)
+] @variable
 
 (local_declaration
-  (identifier) @variable.local
+  (identifier) @variable
   .
   "=")
 
-(global_variable) @variable.global
-
 ((identifier) @variable.builtin
   (#any-of? @variable.builtin "base" "this" "vargv"))
 
diff --git a/queries/squirrel/locals.scm b/queries/squirrel/locals.scm
index 3858eb6b0..e5fce7d57 100644
--- a/queries/squirrel/locals.scm
+++ b/queries/squirrel/locals.scm
@@ -67,9 +67,9 @@
 (var_statement
   "var"
   .
-  (identifier) @local.definition.variable)
+  (identifier) @local.definition.var)
 
 (local_declaration
-  (identifier) @local.definition.variable
+  (identifier) @local.definition.var
   .
   "=")
diff --git a/queries/strace/highlights.scm b/queries/strace/highlights.scm
index 62fa724bd..70a14fd2d 100644
--- a/queries/strace/highlights.scm
+++ b/queries/strace/highlights.scm
@@ -16,9 +16,10 @@
 (syscall) @function.builtin
 
 ; Literals
-(integer) @number
-
-(pointer) @number.special
+[
+  (integer)
+  (pointer)
+] @number
 
 (value) @label
 
diff --git a/queries/ungrammar/locals.scm b/queries/ungrammar/locals.scm
index 389d5c262..0f745bd14 100644
--- a/queries/ungrammar/locals.scm
+++ b/queries/ungrammar/locals.scm
@@ -1,7 +1,8 @@
 (grammar) @local.scope
 
-(definition) @local.definition
-
-(label_name) @local.definition.label
+[
+  (definition)
+  (label_name)
+] @local.definition
 
 (identifier) @local.reference
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 294fa94f1..21b2b98c6 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -7,11 +7,11 @@
 (column_heading) @markup.heading.4
 
 (column_heading
-  "~" @markup.heading.4.marker
+  "~" @markup.heading.4
   (#set! conceal ""))
 
 (tag
-  "*" @markup.heading.5.marker
+  "*" @label
   (#set! conceal "")
   text: (_) @label)
 
@@ -24,7 +24,7 @@
   text: (_) @markup.link)
 
 (codespan
-  "`" @markup.raw.delimiter
+  "`" @markup.raw
   (#set! conceal "")
   text: (_) @markup.raw)
 
@@ -32,14 +32,15 @@
   (#set! "priority" 90))
 
 (codeblock
-  [
-    ">"
-    (language)
-  ] @markup.raw.delimiter
+  ">" @markup.raw
+  (#set! conceal ""))
+
+(codeblock
+  (language) @label
   (#set! conceal ""))
 
 (block
-  "<" @markup.raw.delimiter
+  "<" @markup.raw
   (#set! conceal ""))
 
 (argument) @variable.parameter
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index 4585d2ae3..464207990 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -51,9 +51,9 @@
 (CharData) @none @spell
 
 ((CDSect
-  (CDStart) @markup.environment
+  (CDStart) @module
   (CData) @markup.raw
-  "]]>" @markup.environment)
+  "]]>" @module)
   (#set! "priority" 105))
 
 ; Delimiters & punctuation
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 5e83bdcad..f3b45ea1a 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -1,4 +1,5 @@
 #!/usr/bin/env -S nvim -l
+vim.opt.rtp:prepend "./"
 
 -- Equivalent to print(), but this will ensure consistent output regardless of
 -- operating system.
@@ -35,15 +36,6 @@ local function extract_captures()
   return captures
 end
 
-local function list_any(list, predicate)
-  for _, v in pairs(list) do
-    if predicate(v) then
-      return true
-    end
-  end
-  return false
-end
-
 local function do_check()
   local timings = {}
   local queries = require "nvim-treesitter.query"
@@ -72,9 +64,7 @@ local function do_check()
           for _, capture in ipairs(query.captures) do
             local is_valid = (
               vim.startswith(capture, "_") -- Helpers.
-              or list_any(captures[query_type], function(documented_capture)
-                return vim.startswith(capture, documented_capture)
-              end)
+              or vim.tbl_contains(captures[query_type], capture)
             )
             if not is_valid then
               local error = string.format("(x) Invalid capture @%s in %s for %s.", capture, query_type, lang)
diff --git a/tests/query/highlights/markdown/test.md b/tests/query/highlights/markdown/test.md
index 87b28520e..01acfcc19 100644
--- a/tests/query/highlights/markdown/test.md
+++ b/tests/query/highlights/markdown/test.md
@@ -1,8 +1,8 @@
 # H1
-<!-- <- @markup.heading.1.marker -->
+<!-- <- @markup.heading.1 -->
 
 ## H2
-<!-- <- @markup.heading.2.marker -->
+<!-- <- @markup.heading.2 -->
 
 - Item 1
 - Item 2

From 533ad655ad38e41d482b3507b5c1a35039fb3409 Mon Sep 17 00:00:00 2001
From: Wu Zhenyu <wuzhenyu@ustc.edu>
Date: Fri, 1 Mar 2024 13:08:36 +0800
Subject: [PATCH 1240/2704] feat: map automake to make

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a9beebaf3..12c935034 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -26,6 +26,7 @@ local function register_lang(lang, ft)
 end
 
 for ft, lang in pairs {
+  automake = "make",
   javascriptreact = "javascript",
   ecma = "javascript",
   jsx = "javascript",

From 00bd760a0e334b197a2979f730febd449e8a13b0 Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Sun, 3 Mar 2024 02:24:46 -0800
Subject: [PATCH 1241/2704] feat(csharp): highlight excape sequences (#6229)

---
 queries/c_sharp/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index fdc8b60ba..99d85b193 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -93,6 +93,8 @@
   (interpolated_string_expression)
 ] @string
 
+(escape_sequence) @string.escape
+
 (boolean_literal) @boolean
 
 (predefined_type) @type.builtin

From f8d4e5c1ba2b24b7d13830eeca394fc24c808d83 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 3 Mar 2024 09:41:12 +0000
Subject: [PATCH 1242/2704] bot(lockfile): update arduino, gpg, sourcepawn,
 ssh_config, vue, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 41bbc7755..1161173ba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "7722d4398d87ea22c4877264f88b45bd7ce0cba5"
+    "revision": "72eee09b501f42a039b757c969a9f32e2b61d2a7"
   },
   "asm": {
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
@@ -243,7 +243,7 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "d4c9cc0060cd4d1b8ca6d7add9f34352ad310a09"
+    "revision": "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
@@ -624,7 +624,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "b1ae9e3c4a41ebf666582da24fcce316f38a0613"
+    "revision": "a08f8b5c1ebbce93cf5d751ff4bd03b75179f3a9"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -636,7 +636,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "4fab1c9116cb7890885508e4630cc8e6a8373a41"
+    "revision": "514695df4985f56455b8f139a319453a2325cdcf"
   },
   "starlark": {
     "revision": "b31a616aac5d05f927f3f9dd809789db7805b632"
@@ -759,7 +759,7 @@
     "revision": "016ad75faa854e4e13bc40c517015183b795eed9"
   },
   "vue": {
-    "revision": "085e99bcc46b2e63ff06a830a31a55132ce95aa5"
+    "revision": "3b9d52087100bdfce43dad2ca46d75b0e21613f6"
   },
   "wgsl": {
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
@@ -768,7 +768,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "13b79ea3f343b15f233c6e7ac930797748191615"
+    "revision": "365827a3aa52a1a8093281d204e59ef80e4a210b"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 9e1f3c336940e77adee81ca340e1bf0635e655f3 Mon Sep 17 00:00:00 2001
From: qvalentin <valentin.theodor@web.de>
Date: Sun, 4 Feb 2024 11:23:23 +0100
Subject: [PATCH 1243/2704] feat: add gotemplate and helm parser support

---
 README.md                       |   2 +
 lockfile.json                   |   6 ++
 lua/nvim-treesitter/parsers.lua |  17 +++++
 queries/gotmpl/highlights.scm   | 108 ++++++++++++++++++++++++++++++++
 queries/gotmpl/injections.scm   |  34 ++++++++++
 queries/helm/highlights.scm     |  46 ++++++++++++++
 queries/helm/injections.scm     |  39 ++++++++++++
 7 files changed, 252 insertions(+)
 create mode 100644 queries/gotmpl/highlights.scm
 create mode 100644 queries/gotmpl/injections.scm
 create mode 100644 queries/helm/highlights.scm
 create mode 100644 queries/helm/injections.scm

diff --git a/README.md b/README.md
index eff088f50..a529d4ea3 100644
--- a/README.md
+++ b/README.md
@@ -254,6 +254,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gomod](https://github.com/camdencheek/tree-sitter-go-mod) (maintained by @camdencheek)
 - [x] [gosum](https://github.com/amaanq/tree-sitter-go-sum) (maintained by @amaanq)
 - [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
+- [x] [gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) (maintained by @qvalentin)
 - [x] [gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) (maintained by @ObserverOfTime)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
 - [x] [groovy](https://github.com/murtaza64/tree-sitter-groovy) (maintained by @murtaza64)
@@ -264,6 +265,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) (maintained by @lykahb)
 - [x] [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay)
+- [x] [helm](https://github.com/ngalaiko/tree-sitter-go-template) (maintained by @qvalentin)
 - [x] [hjson](https://github.com/winston0410/tree-sitter-hjson) (maintained by @winston0410)
 - [x] [hlsl](https://github.com/theHamsta/tree-sitter-hlsl) (maintained by @theHamsta)
 - [x] [hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) (maintained by @Freed-Wu)
diff --git a/lockfile.json b/lockfile.json
index 1161173ba..5f2257f34 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -242,6 +242,9 @@
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
+  "gotmpl": {
+    "revision": "17144a77be0acdecebd9d557398883569fed41de"
+  },
   "gpg": {
     "revision": "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675"
   },
@@ -272,6 +275,9 @@
   "heex": {
     "revision": "4a36c9a388505180da6ee0eda1d8afb8c83481c8"
   },
+  "helm": {
+    "revision": "17144a77be0acdecebd9d557398883569fed41de"
+  },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 12c935034..bbd07e17a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -758,6 +758,14 @@ list.gowork = {
   maintainers = { "@omertuc" },
 }
 
+list.gotmpl = {
+  install_info = {
+    url = "https://github.com/ngalaiko/tree-sitter-go-template",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@qvalentin" },
+}
+
 list.gpg = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-gpg-config",
@@ -838,6 +846,15 @@ list.heex = {
   maintainers = { "@connorlay" },
 }
 
+list.helm = {
+  install_info = {
+    url = "https://github.com/ngalaiko/tree-sitter-go-template",
+    location = "dialects/helm",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@qvalentin" },
+}
+
 list.hjson = {
   install_info = {
     url = "https://github.com/winston0410/tree-sitter-hjson",
diff --git a/queries/gotmpl/highlights.scm b/queries/gotmpl/highlights.scm
new file mode 100644
index 000000000..e1629f816
--- /dev/null
+++ b/queries/gotmpl/highlights.scm
@@ -0,0 +1,108 @@
+; Identifiers
+[
+  (field)
+  (field_identifier)
+] @variable.member
+
+(variable) @variable
+
+; Function calls
+(function_call
+  function: (identifier) @function)
+
+(method_call
+  method:
+    (selector_expression
+      field: (field_identifier) @function))
+
+; Builtin functions
+(function_call
+  function: (identifier) @function.builtin
+  (#any-of? @function.builtin
+    "and" "call" "html" "index" "slice" "js" "len" "not" "or" "print" "printf" "println" "urlquery"
+    "eq" "ne" "lt" "ge" "gt" "ge"))
+
+; Operators
+[
+  "|"
+  ":="
+] @operator
+
+; Delimiters
+[
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "{{"
+  "}}"
+  "{{-"
+  "-}}"
+  ")"
+  "("
+] @punctuation.bracket
+
+; Actions
+(if_action
+  [
+    "if"
+    "else"
+    "else if"
+    "end"
+  ] @keyword.conditional)
+
+(range_action
+  [
+    "range"
+    "else"
+    "end"
+  ] @keyword.repeat)
+
+(template_action
+  "template" @function.builtin)
+
+(block_action
+  [
+    "block"
+    "end"
+  ] @keyword.directive)
+
+(define_action
+  [
+    "define"
+    "end"
+  ] @keyword.directive.define)
+
+(with_action
+  [
+    "with"
+    "else"
+    "end"
+  ] @keyword.conditional)
+
+; Literals
+[
+  (interpreted_string_literal)
+  (raw_string_literal)
+] @string
+
+(rune_literal) @string.special.symbol
+
+(escape_sequence) @string.escape
+
+[
+  (int_literal)
+  (imaginary_literal)
+] @number
+
+(float_literal) @number.float
+
+[
+  (true)
+  (false)
+] @boolean
+
+(nil) @constant.builtin
+
+(comment) @comment @spell
diff --git a/queries/gotmpl/injections.scm b/queries/gotmpl/injections.scm
new file mode 100644
index 000000000..787ca9925
--- /dev/null
+++ b/queries/gotmpl/injections.scm
@@ -0,0 +1,34 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+; {{"put" | printf "%s%s" "out" | printf "%q"}}
+(function_call
+  function: (identifier) @_function
+  arguments:
+    (argument_list
+      .
+      (interpreted_string_literal) @injection.content)
+  (#eq? @_function "printf")
+  (#set! injection.language "printf"))
+
+; {{ js "var a = 1 + 1" }}
+(function_call
+  function: (identifier) @_function
+  arguments:
+    (argument_list
+      .
+      (interpreted_string_literal) @injection.content)
+  (#eq? @_function "js")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "javascript"))
+
+; {{ html "<h1>hello</h1>" }}
+(function_call
+  function: (identifier) @_function
+  arguments:
+    (argument_list
+      .
+      (interpreted_string_literal) @injection.content)
+  (#eq? @_function "html")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "html"))
diff --git a/queries/helm/highlights.scm b/queries/helm/highlights.scm
new file mode 100644
index 000000000..ab5803a8a
--- /dev/null
+++ b/queries/helm/highlights.scm
@@ -0,0 +1,46 @@
+; inherits: gotmpl
+
+; Builtin functions
+(function_call
+  function: (identifier) @function.builtin
+  (#any-of? @function.builtin
+    "and" "or" "not" "eq" "ne" "lt" "le" "gt" "ge" "default" "required" "empty" "fail" "coalesce"
+    "ternary" "print" "println" "printf" "trim" "trimAll" "trimPrefix" "trimSuffix" "lower" "upper"
+    "title" "untitle" "repeat" "substr" "nospace" "trunc" "abbrev" "abbrevboth" "initials"
+    "randAlphaNum" "randAlpha" "randNumeric" "randAscii" "wrap" "wrapWith" "contains" "hasPrefix"
+    "hasSuffix" "quote" "squote" "cat" "indent" "nindent" "replace" "plural" "snakecase" "camelcase"
+    "kebabcase" "swapcase" "shuffle" "toStrings" "toDecimal" "toJson" "mustToJson" "toPrettyJson"
+    "mustToPrettyJson" "toRawJson" "mustToRawJson" "fromYaml" "fromJson" "fromJsonArray"
+    "fromYamlArray" "toYaml" "regexMatch" "mustRegexMatch" "regexFindAll" "mustRegexFinDall"
+    "regexFind" "mustRegexFind" "regexReplaceAll" "mustRegexReplaceAll" "regexReplaceAllLiteral"
+    "mustRegexReplaceAllLiteral" "regexSplit" "mustRegexSplit" "sha1sum" "sha256sum" "adler32sum"
+    "htpasswd" "derivePassword" "genPrivateKey" "buildCustomCert" "genCA" "genSelfSignedCert"
+    "genSignedCert" "encryptAES" "decryptAES" "now" "ago" "date" "dateInZone" "duration"
+    "durationRound" "unixEpoch" "dateModify" "mustDateModify" "htmlDate" "htmlDateInZone" "toDate"
+    "mustToDate" "dict" "get" "set" "unset" "hasKey" "pluck" "dig" "merge" "mustMerge"
+    "mergeOverwrite" "mustMergeOverwrite" "keys" "pick" "omit" "values" "deepCopy" "mustDeepCopy"
+    "b64enc" "b64dec" "b32enc" "b32dec" "list" "first" "mustFirst" "rest" "mustRest" "last"
+    "mustLast" "initial" "mustInitial" "append" "mustAppend" "prepend" "mustPrepend" "concat"
+    "reverse" "mustReverse" "uniq" "mustUniq" "without" "mustWithout" "has" "mustHas" "compact"
+    "mustCompact" "index" "slice" "mustSlice" "until" "untilStep" "seq" "add" "add1" "sub" "div"
+    "mod" "mul" "max" "min" "len" "addf" "add1f" "subf" "divf" "mulf" "maxf" "minf" "floor" "ceil"
+    "round" "getHostByName" "base" "dir" "clean" "ext" "isAbs" "kindOf" "kindIs" "typeOf" "typeIs"
+    "typeIsLike" "deepequal" "semver" "semverCompare" "urlParse" "urlJoin" "urlquery" "lookup"
+    "include")
+  )
+
+; {{ .Values.test }}
+(selector_expression
+  operand:
+    (field
+      name: (identifier) @constant.builtin
+      (#any-of? @constant.builtin
+        "Values" "Chart" "Release" "Capabilities" "Files" "Subcharts" "Template"))
+  (field_identifier))
+
+; {{ $.Values.test }}
+(selector_expression
+  operand: (variable)
+  field: (field_identifier) @constant.builtin
+  (#any-of? @constant.builtin
+    "Values" "Chart" "Release" "Capabilities" "Files" "Subcharts" "Template"))
diff --git a/queries/helm/injections.scm b/queries/helm/injections.scm
new file mode 100644
index 000000000..12f1b7cc7
--- /dev/null
+++ b/queries/helm/injections.scm
@@ -0,0 +1,39 @@
+; inherits: gotmpl
+
+((text) @injection.content
+  (#set! injection.language "yaml")
+  (#set! injection.combined))
+
+; {{ regexFind "[a-zA-Z][1-9]" "abcd1234" }}
+(function_call
+  function: (identifier) @_function
+  arguments:
+    (argument_list
+      .
+      (interpreted_string_literal) @injection.content)
+  (#any-of? @_function
+    "regexMatch" "mustRegexMatch" "regexFindAll" "mustRegexFinDall" "regexFind" "mustRegexFind"
+    "regexReplaceAll" "mustRegexReplaceAll" "regexReplaceAllLiteral" "mustRegexReplaceAllLiteral"
+    "regexSplit" "mustRegexSplit")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "regex"))
+
+(function_call
+  function: (identifier) @_function
+  arguments:
+    (argument_list
+      .
+      (interpreted_string_literal) @injection.content)
+  (#any-of? @_function "fromYaml" "fromYamlArray")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "yaml"))
+
+(function_call
+  function: (identifier) @_function
+  arguments:
+    (argument_list
+      .
+      (interpreted_string_literal) @injection.content)
+  (#any-of? @_function "fromJson" "fromJsonArray")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "json"))

From 8a9bef9327bc06c9c4158d4873d87bb1bf3ed112 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 3 Mar 2024 12:09:32 +0000
Subject: [PATCH 1244/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a529d4ea3..a5651470a 100644
--- a/README.md
+++ b/README.md
@@ -253,8 +253,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [Godot Resources (gdresource)](https://github.com/PrestonKnopp/tree-sitter-godot-resource) (maintained by @pierpo)
 - [x] [gomod](https://github.com/camdencheek/tree-sitter-go-mod) (maintained by @camdencheek)
 - [x] [gosum](https://github.com/amaanq/tree-sitter-go-sum) (maintained by @amaanq)
-- [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
 - [x] [gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) (maintained by @qvalentin)
+- [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
 - [x] [gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) (maintained by @ObserverOfTime)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
 - [x] [groovy](https://github.com/murtaza64/tree-sitter-groovy) (maintained by @murtaza64)

From 3d08cdd741ea02ab820406582f8ea0b1198e368d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 3 Mar 2024 15:50:48 +0100
Subject: [PATCH 1245/2704] fix(comment): remove duplicate 'FIXME'

---
 CONTRIBUTING.md                | 8 ++++----
 queries/comment/highlights.scm | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9c2f4e033..9db53d688 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -197,10 +197,10 @@ As languages differ quite a lot, here is a set of captures available to you when
 @comment               ; line and block comments
 @comment.documentation ; comments documenting code
 
-@comment.error         ; error-type comments (e.g. `ERROR`, `FIXME`, `DEPRECATED:`)
-@comment.warning       ; warning-type comments (e.g. `WARNING:`, `FIX:`, `HACK:`)
-@comment.todo          ; todo-type comments (e.g. `TODO:`, `WIP:`, `FIXME:`)
-@comment.note          ; note-type comments (e.g. `NOTE:`, `INFO:`, `XXX`)
+@comment.error         ; error-type comments (e.g. `ERROR`, `FIXME`, `DEPRECATED`)
+@comment.warning       ; warning-type comments (e.g. `WARNING`, `FIX`, `HACK`)
+@comment.todo          ; todo-type comments (e.g. `TODO`, `WIP`)
+@comment.note          ; note-type comments (e.g. `NOTE`, `INFO`, `XXX`)
 ```
 
 #### Markup
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index 14dbdefc7..5d18b790a 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -4,10 +4,10 @@
     (user) @constant
     ")" @punctuation.bracket)?
   ":" @punctuation.delimiter)
-  (#any-of? @comment.todo "TODO" "WIP" "FIXME"))
+  (#any-of? @comment.todo "TODO" "WIP"))
 
 ("text" @comment.todo @nospell
-  (#any-of? @comment.todo "TODO" "WIP" "FIXME"))
+  (#any-of? @comment.todo "TODO" "WIP"))
 
 ((tag
   (name) @comment.note @nospell

From 63ca90eaa3ce1cc668add8828a9e3d6728dbbdf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sun, 3 Mar 2024 23:56:32 +0900
Subject: [PATCH 1246/2704] feat(swift): add will/didSet indent

Fixes CI error in PR.6237
---
 lockfile.json                         | 2 +-
 queries/swift/indents.scm             | 3 +++
 tests/indent/swift/declarations.swift | 3 +++
 tests/indent/swift_spec.lua           | 5 +++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5f2257f34..22b858fd5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "fc00cbb460b40228b30f322b5a34ea0e8f35a9f8"
+    "revision": "8a87eebcc3ca249e1eeb65b226e81b7e711eea7a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index 264e9aaef..33d39b025 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -32,6 +32,9 @@
   (array_literal)               ; [ foo, bar ]
   (dictionary_literal)          ; [ foo: bar, x: y ]
   (lambda_literal) 
+  (willset_didset_block)
+  (willset_clause)
+  (didset_clause)
 ] @indent.begin
 
 ; @something(...)
diff --git a/tests/indent/swift/declarations.swift b/tests/indent/swift/declarations.swift
index a6f576ef2..d4bc6e054 100644
--- a/tests/indent/swift/declarations.swift
+++ b/tests/indent/swift/declarations.swift
@@ -16,6 +16,9 @@ class EquilateralTriangle: NamedShape {
   var perimeter: Double {
     willSet {
     }
+    didSet {
+
+    }
   }
 
   @funcattr
diff --git a/tests/indent/swift_spec.lua b/tests/indent/swift_spec.lua
index 6ba0d2cf0..5f07ee825 100644
--- a/tests/indent/swift_spec.lua
+++ b/tests/indent/swift_spec.lua
@@ -15,7 +15,8 @@ describe("indent Swift:", function()
     run:new_line("declarations.swift", { on_line = 6, text = "var x = 1", indent = 2 })
     run:new_line("declarations.swift", { on_line = 12, text = "var textInsideInit = true", indent = 4 })
     run:new_line("declarations.swift", { on_line = 17, text = "var textInsideWillSet = 1", indent = 6 })
-    run:new_line("declarations.swift", { on_line = 22, text = "var textInsideOverrideFunc", indent = 4 })
-    run:new_line("declarations.swift", { on_line = 28, text = "var InsideProtocol: String { get }", indent = 2 })
+    run:new_line("declarations.swift", { on_line = 20, text = "var textInsideDidSet = 1", indent = 6 })
+    run:new_line("declarations.swift", { on_line = 25, text = "var textInsideOverrideFunc", indent = 4 })
+    run:new_line("declarations.swift", { on_line = 31, text = "var InsideProtocol: String { get }", indent = 2 })
   end)
 end)

From e479db627c89c660e577647900b370c0989cb754 Mon Sep 17 00:00:00 2001
From: Charles <63302440+Sarrus1@users.noreply.github.com>
Date: Mon, 4 Mar 2024 10:33:25 +0100
Subject: [PATCH 1247/2704] fix(sourcepawn) update queries to grammar change
 (#6247)

---
 lockfile.json                     | 2 +-
 queries/sourcepawn/highlights.scm | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 22b858fd5..9e4cacb82 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -630,7 +630,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "a08f8b5c1ebbce93cf5d751ff4bd03b75179f3a9"
+    "revision": "30ba6d614b07e6f1a9302af8e9fd57711c5f38f2"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
index bbe37e061..b134a0035 100644
--- a/queries/sourcepawn/highlights.scm
+++ b/queries/sourcepawn/highlights.scm
@@ -201,6 +201,7 @@
   "~="
   "<<="
   ">>="
+  "..."
   (ignore_argument)
   (scope_access)
   (rest_operator)
@@ -246,8 +247,6 @@
 
 (array_literal) @punctuation.bracket
 
-(concatenated_string) @punctuation.delimiter
-
 (bool_literal) @boolean
 
 (null) @constant.builtin

From 70f03829afa31f8b619b56296cdcaa921118d912 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 09:34:27 +0000
Subject: [PATCH 1248/2704] bot(lockfile): update puppet, swift, t32, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9e4cacb82..67c9926d8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -239,12 +239,12 @@
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
-  "gowork": {
-    "revision": "949a8a470559543857a62102c84700d291fc984c"
-  },
   "gotmpl": {
     "revision": "17144a77be0acdecebd9d557398883569fed41de"
   },
+  "gowork": {
+    "revision": "949a8a470559543857a62102c84700d291fc984c"
+  },
   "gpg": {
     "revision": "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675"
   },
@@ -525,7 +525,7 @@
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
   },
   "puppet": {
-    "revision": "3641b9e854ac9c84c7576e71c4c9a357bcfd9550"
+    "revision": "5849f9694197a6e822872945b415429c285fdd54"
   },
   "purescript": {
     "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "8a87eebcc3ca249e1eeb65b226e81b7e711eea7a"
+    "revision": "f99631b21e3b6a3b30ee86558e1091a54d61a430"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -672,7 +672,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "b904af353fb2f1df6ac45d8d3e3a5ee85a6cc306"
+    "revision": "0a457a557be7779336bc8ac2b396e73797bc68f7"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "365827a3aa52a1a8093281d204e59ef80e4a210b"
+    "revision": "e3d2cde3d6989d7f3cf97e269dcd1cc40466bd5b"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 212b7a504cf56f85d1acc5be237261b42d7560c5 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Mon, 4 Mar 2024 14:05:53 +0100
Subject: [PATCH 1249/2704] fix(angular): typo in capture name (#6249)

---
 lockfile.json                  | 2 +-
 queries/angular/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 67c9926d8..6b36bc221 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "6d02054ae9aa1fedf5097fe6d93dd78f751dff21"
+    "revision": "a1b5ff462875e5f92e6265fc630702847e0dcbb3"
   },
   "apex": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index af1c58e45..2bf743cd1 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -116,7 +116,7 @@
 (nullish_coalescing_expression
   (coalescing_operator) @operator)
 
-(concatination_expression
+(concatenation_expression
   "+" @operator)
 
 (binary_expression

From cc6b108ea1251bd361f091b7d5a0dd41c04f8611 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 06:35:09 +0000
Subject: [PATCH 1250/2704] bot(lockfile): update gleam, php, php_only, swift,
 wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6b36bc221..ed01ea354 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -213,7 +213,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "58b7cac8fc14c92b0677c542610d8738c373fa81"
+    "revision": "2012f294baacf30e7a62414754021284377366c6"
   },
   "glimmer": {
     "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
@@ -477,10 +477,10 @@
     "revision": "6526e5d5bf31501de0dc51c42ac3583078a8fdab"
   },
   "php": {
-    "revision": "78a78df5e06b4c13173af2a1f607c9a853d0f240"
+    "revision": "365fd18542aaba90466580f8400e4ba3fb71c5fb"
   },
   "php_only": {
-    "revision": "78a78df5e06b4c13173af2a1f607c9a853d0f240"
+    "revision": "365fd18542aaba90466580f8400e4ba3fb71c5fb"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "f99631b21e3b6a3b30ee86558e1091a54d61a430"
+    "revision": "eebf8bc3f8d4204124c59ff48b1a19417bbf99df"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "e3d2cde3d6989d7f3cf97e269dcd1cc40466bd5b"
+    "revision": "1b3e8be7035a43e8fccd8ca0ab9c93cbd1500092"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From c09932bd2de01dc9c01e870fe83060693c67de13 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 06:36:04 +0000
Subject: [PATCH 1251/2704] bot(lockfile): update cue, gitcommit, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ed01ea354..95dec4eee 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "221179d4287a2c24c08e4c67ff383ef67dc32156"
   },
   "cue": {
-    "revision": "2df92e6755337e9234ad18ffef37f35d95e2ba9d"
+    "revision": "cdfe1a8594fe5be45c883a385ab543acc646d018"
   },
   "d": {
     "revision": "a33d400f025d6bbd37b4c681c93054976f579890"
@@ -207,7 +207,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "6bd81962d1abe309bf5dffde3315e4a5988f35fd"
+    "revision": "247406593c835065828230bdcecd933138691f68"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "1b3e8be7035a43e8fccd8ca0ab9c93cbd1500092"
+    "revision": "e9424683889e10568af225b5338d130f13b54952"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 51d7c36e5f0d85429fe6eba6a59444f68cab7c6b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 06:35:38 +0000
Subject: [PATCH 1252/2704] bot(lockfile): update python, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 95dec4eee..c36188abf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -534,7 +534,7 @@
     "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
   },
   "python": {
-    "revision": "22d3f87bdafac2782e907330babe4af574f5d0b4"
+    "revision": "03e88c170cb23142559a406b6e7621c4af3128f5"
   },
   "ql": {
     "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "e9424683889e10568af225b5338d130f13b54952"
+    "revision": "845360a7877629185cac62ac9464b21a91c12608"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From a0f18ee98c53b9b20a7bda1696f1382cd79216e6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 4 Mar 2024 23:52:39 -0800
Subject: [PATCH 1253/2704] feat(markdown): highlight link label delimiter

---
 queries/markdown/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 5d77e7217..ac582e3f9 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -69,6 +69,10 @@
   (link_label)
 ] @markup.link.label
 
+((link_label)
+  .
+  ":" @punctuation.delimiter)
+
 [
   (list_marker_plus)
   (list_marker_minus)

From 9775d5d7c724f81acdd441e7e9edefc4514e990b Mon Sep 17 00:00:00 2001
From: Kai Moschcau <mail@kmoschcau.de>
Date: Thu, 7 Mar 2024 11:52:02 +0100
Subject: [PATCH 1254/2704] fix(luadoc): `@nospell` identifiers and keywords

---
 queries/luadoc/highlights.scm | 56 +++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
index 324906eb8..5e835b3b0 100644
--- a/queries/luadoc/highlights.scm
+++ b/queries/luadoc/highlights.scm
@@ -2,7 +2,7 @@
 [
   "@module"
   "@package"
-] @keyword.import
+] @keyword.import @nospell
 
 [
   "@class"
@@ -28,28 +28,28 @@
   "@as"
   "extends"
   (diagnostic_identifier)
-] @keyword
+] @keyword @nospell
 
-"@async" @keyword.coroutine
+"@async" @keyword.coroutine @nospell
 
 (language_injection
   "@language"
-  (identifier) @keyword)
+  (identifier) @keyword @nospell)
 
 (function_type
   [
     "fun"
     "function"
-  ] @keyword.function)
+  ] @keyword.function @nospell)
 
 (source_annotation
-  filename: (identifier) @string.special.path
-  extension: (identifier) @string.special.path)
+  filename: (identifier) @string.special.path @nospell
+  extension: (identifier) @string.special.path @nospell)
 
 (version_annotation
-  version: _ @constant.builtin)
+  version: _ @constant.builtin @nospell)
 
-"@return" @keyword.return
+"@return" @keyword.return @nospell
 
 ; Qualifiers
 [
@@ -62,33 +62,33 @@
   "@private"
   "(exact)"
   "(key)"
-] @type.qualifier
+] @type.qualifier @nospell
 
 ; Variables
-(identifier) @variable
+(identifier) @variable @nospell
 
 [
   "..."
   "self"
-] @variable.builtin
+] @variable.builtin @nospell
 
 ; Macros
 (alias_annotation
-  (identifier) @function.macro)
+  (identifier) @function.macro @nospell)
 
 ; Parameters
 (param_annotation
-  (identifier) @variable.parameter)
+  (identifier) @variable.parameter @nospell)
 
 (parameter
-  (identifier) @variable.parameter)
+  (identifier) @variable.parameter @nospell)
 
 ; Fields
 (field_annotation
-  (identifier) @variable.member)
+  (identifier) @variable.member @nospell)
 
 (table_literal_type
-  field: (identifier) @variable.member)
+  field: (identifier) @variable.member @nospell)
 
 (member_type
   [
@@ -96,25 +96,25 @@
     "."
   ]
   .
-  (identifier) @variable.member)
+  (identifier) @variable.member @nospell)
 
 (member_type
-  (identifier) @module)
+  (identifier) @module @nospell)
 
 (member_type
-  (identifier) @type .)
+  (identifier) @type @nospell .)
 
 ; Types
 (table_type
-  "table" @type.builtin)
+  "table" @type.builtin @nospell)
 
-(builtin_type) @type.builtin
+(builtin_type) @type.builtin @nospell
 
 (class_annotation
-  (identifier) @type)
+  (identifier) @type @nospell)
 
 (enum_annotation
-  (identifier) @type)
+  (identifier) @type @nospell)
 
 ((array_type
   [
@@ -140,7 +140,7 @@
 ] @string
 
 (module_annotation
-  (string) @module)
+  (string) @module @nospell)
 
 [
   (number)
@@ -188,11 +188,11 @@
 (comment) @comment @spell
 
 (at_comment
-  (identifier) @type
+  (identifier) @type @nospell
   (_) @comment @spell)
 
 (class_at_comment
-  (identifier) @type
+  (identifier) @type @nospell
   ("extends"?
-    (identifier)? @type)
+    (identifier)? @type @nospell)
   (_) @comment @spell)

From b4553bef58463ef45841fc1571a654089585e5cc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 8 Mar 2024 19:09:17 +0800
Subject: [PATCH 1255/2704] fix(nickel): update highlights to grammar change

---
 lockfile.json                 | 12 ++++++------
 queries/nickel/highlights.scm |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c36188abf..b558bb4e5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -270,7 +270,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
+    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
   },
   "heex": {
     "revision": "4a36c9a388505180da6ee0eda1d8afb8c83481c8"
@@ -423,7 +423,7 @@
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
   },
   "nickel": {
-    "revision": "33a64ec9a27058c52e4195f1030235dcdfc04747"
+    "revision": "58baf89db8fdae54a84bcf22c80ff10ee3f929ed"
   },
   "nim": {
     "revision": "f5cec6a841b585e4e7388a120ded07e60ae19c43"
@@ -546,7 +546,7 @@
     "revision": "9fa49ff3315987f715ce5666ff979a7742fa8a98"
   },
   "query": {
-    "revision": "a0ccc351e5e868ec1f8135e97aa3b53c663cf2df"
+    "revision": "176a380df78800167565118bb0dadfc961abbd43"
   },
   "r": {
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
@@ -609,7 +609,7 @@
     "revision": "0cdfb1741323f38e9a33798674145c22cfc0092b"
   },
   "slint": {
-    "revision": "3c82235f41b63f35a01ae3888206e93585cbb84a"
+    "revision": "cdb307898345cb0465922be447a063b9c294afca"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
@@ -630,7 +630,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "sourcepawn": {
-    "revision": "30ba6d614b07e6f1a9302af8e9fd57711c5f38f2"
+    "revision": "3ca89fdf998340a7973e276b39516d8902950f86"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -687,7 +687,7 @@
     "revision": "592faa3186ef857c92e4bd1c31d73c07a4a334db"
   },
   "terraform": {
-    "revision": "e135399cb31b95fac0760b094556d1d5ce84acf0"
+    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
   },
   "textproto": {
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
diff --git a/queries/nickel/highlights.scm b/queries/nickel/highlights.scm
index d77bf7373..3bb63ca2c 100644
--- a/queries/nickel/highlights.scm
+++ b/queries/nickel/highlights.scm
@@ -67,8 +67,8 @@
 
 (fun_expr
   pats:
-    (pattern
-      id: (ident) @variable.parameter))
+    (pattern_fun
+      (ident) @variable.parameter))
 
 (applicative
   t1:

From 57205313dda0ac82ac69e21d5e2a80f3297c14cc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:40:31 +0000
Subject: [PATCH 1256/2704] bot(lockfile): update mlir, wing

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b558bb4e5..5db4cc7b7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -414,7 +414,7 @@
     "revision": "d6ec8ce0963c3c8180161391f15d8f7d415f650d"
   },
   "mlir": {
-    "revision": "117cbbc46bbf82ae30b24f8939573655017226da"
+    "revision": "a56445f841ae7246e4aa3fdf7b4ef0bccdc82e7c"
   },
   "muttrc": {
     "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "845360a7877629185cac62ac9464b21a91c12608"
+    "revision": "4a9f8210586aa2903dd839538cf5dccc614e6f94"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 7ff51f53b0efb6228df2e8539b51bb2e737b77f3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 9 Mar 2024 06:36:37 +0000
Subject: [PATCH 1257/2704] bot(lockfile): update swift, vim, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5db4cc7b7..0c8f3c934 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "eebf8bc3f8d4204124c59ff48b1a19417bbf99df"
+    "revision": "7e5b912761c9abca60996b1250f40be1f46cf39a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -759,7 +759,7 @@
     "revision": "9534865e614c95eb9418e5e73f061c32fa4d9540"
   },
   "vim": {
-    "revision": "bc1364d922952138957a62105171ed68e73fbb6c"
+    "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
   },
   "vimdoc": {
     "revision": "016ad75faa854e4e13bc40c517015183b795eed9"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "4a9f8210586aa2903dd839538cf5dccc614e6f94"
+    "revision": "dbe7de9dff20725577393fc9ff0c2e7853091164"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 488bec03254207b1dd071be8cb1fb78434b6e777 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 10 Mar 2024 06:34:24 +0000
Subject: [PATCH 1258/2704] bot(lockfile): update arduino, beancount, ocaml,
 ocaml_interface

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0c8f3c934..9f3c3705e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "72eee09b501f42a039b757c969a9f32e2b61d2a7"
+    "revision": "e3a0a7f60e544afc478b72cdda7ffc0f2f889db0"
   },
   "asm": {
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
@@ -33,7 +33,7 @@
     "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
   },
   "beancount": {
-    "revision": "1f19abf1e162e1828013cb5434c6cf30f4054e80"
+    "revision": "6c665e7cf15d76a1687959643868a78fb381458d"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -450,10 +450,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"
+    "revision": "712d9bfa1d537c5899dde5538767ed2d8bb37a93"
   },
   "ocaml_interface": {
-    "revision": "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"
+    "revision": "712d9bfa1d537c5899dde5538767ed2d8bb37a93"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"

From b781fd058224f67df7469b8f376c42a8d85e11db Mon Sep 17 00:00:00 2001
From: Chad Condon <thetic@users.noreply.github.com>
Date: Mon, 11 Mar 2024 10:02:53 -0700
Subject: [PATCH 1259/2704] fix(c): improve doxygen comment matching (#6278)

---
 queries/c/injections.scm   | 2 +-
 queries/cpp/injections.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 6349fe2d1..308994bc0 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -9,7 +9,7 @@
   (#set! injection.language "re2c"))
 
 ((comment) @injection.content
-  (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
+  (#lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
   (#set! injection.language "doxygen"))
 
 ((call_expression
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 36852a995..6e1657229 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -5,7 +5,7 @@
   (#set! injection.language "comment"))
 
 ((comment) @injection.content
-  (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
+  (#lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
   (#set! injection.language "doxygen"))
 
 (raw_string_literal

From 9d39f00a9559cf3505d73b486c0b8055a6db4215 Mon Sep 17 00:00:00 2001
From: Tobias S <seifert@devlabor.com>
Date: Mon, 11 Mar 2024 23:07:15 +0100
Subject: [PATCH 1260/2704] fix(php): highlight property access using nullsafe
 operator, move `@property` to `@variable.member`

---
 queries/php_only/highlights.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 7887a9778..a3792cad7 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -148,10 +148,18 @@
 (member_access_expression
   name:
     (variable_name
-      (name)) @property)
+      (name)) @variable.member)
 
 (member_access_expression
-  name: (name) @property)
+  name: (name) @variable.member)
+
+(nullsafe_member_access_expression
+  name:
+    (variable_name
+      (name)) @variable.member)
+
+(nullsafe_member_access_expression
+  name: (name) @variable.member)
 
 ; Variables
 (relative_scope) @variable.builtin

From 8d3176cfbc0e3c5b8eadf4dfc20681878529c3af Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 11 Mar 2024 18:58:08 +0200
Subject: [PATCH 1261/2704] fix(scripts): actually skip lockfile updates

---
 scripts/update-lockfile.sh | 16 +++++++---------
 scripts/write-lockfile.lua |  1 -
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/scripts/update-lockfile.sh b/scripts/update-lockfile.sh
index 8fcf553ed..22460d14b 100755
--- a/scripts/update-lockfile.sh
+++ b/scripts/update-lockfile.sh
@@ -1,20 +1,18 @@
 #!/usr/bin/env bash
 
 make_ignored() {
-  if [ -n "$1" ]
-  then
+  if [[ -n $1 ]]; then
     while read -r lang; do
-      if [ "$lang" != "$1" ]
-      then
-        printf "%s," "$lang"
+      if [[ $lang != "$1" ]]; then
+        printf '%s,' "$lang"
       fi
-    done < <(jq 'keys|@sh' -c lockfile.json)
+    done < <(jq -r 'keys[]' lockfile.json)
   fi
 }
 
-TO_IGNORE=$(make_ignored $1)
+SKIP_LOCKFILE_UPDATE_FOR_LANGS="$(make_ignored "$1")" \
+  nvim --headless -c 'luafile ./scripts/write-lockfile.lua' +q
 
-SKIP_LOCKFILE_UPDATE_FOR_LANGS="$TO_IGNORE" nvim --headless -c "luafile ./scripts/write-lockfile.lua" -c "q"
 # Pretty print
 cp lockfile.json /tmp/lockfile.json
-cat /tmp/lockfile.json | jq --sort-keys > lockfile.json
+jq --sort-keys > lockfile.json < /tmp/lockfile.json
diff --git a/scripts/write-lockfile.lua b/scripts/write-lockfile.lua
index c1d5d6d8d..7a7606c51 100755
--- a/scripts/write-lockfile.lua
+++ b/scripts/write-lockfile.lua
@@ -10,6 +10,5 @@ else
   skip_langs = vim.fn.split(skip_langs, ",")
 end
 
-print("Skipping languages: " .. vim.inspect(skip_langs))
 require("nvim-treesitter.install").write_lockfile("verbose", skip_langs)
 vim.cmd "q"

From e73c775aa9d540f0c33585ed1b5ea572a64bdac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=8D=E7=94=9F=E8=8A=B1?= <hoangtun0810@gmail.com>
Date: Mon, 11 Mar 2024 18:20:10 +0900
Subject: [PATCH 1262/2704] feat(swift): add init/deinit indents
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Phạm Huy Hoàng <hoangtun0810@gmail.com>
---
 lockfile.json                         |  2 +-
 queries/swift/indents.scm             | 18 ++++++++++++++++++
 tests/indent/swift/declarations.swift |  2 ++
 tests/indent/swift_spec.lua           |  8 ++++----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9f3c3705e..c8037e67f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "7e5b912761c9abca60996b1250f40be1f46cf39a"
+    "revision": "78f2d72e375f83b2ba6cfb5cc7750db3c94e9785"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index 33d39b025..f208292c7 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -5,6 +5,8 @@
   (class_body)                  ; class Foo { ... }
   (enum_class_body)             ; enum Foo { ... }
   (function_declaration)        ; func Foo (...) {...}
+  (init_declaration)            ; init(...) {...}
+  (deinit_declaration)          ; deinit {...}
   (computed_property)           ; { ... }
   (subscript_declaration)       ; subscript Foo(...) { ... }
 
@@ -37,6 +39,22 @@
   (didset_clause)
 ] @indent.begin
 
+(init_declaration) @indent.begin
+
+(init_declaration
+  [
+    "init"
+    "("
+  ] @indent.branch)
+
+; indentation for init parameters
+(init_declaration
+  ")" @indent.branch @indent.end)
+
+(init_declaration
+  (parameter) @indent.begin
+  (#set! indent.immediate))
+
 ; @something(...)
 (modifiers
   (attribute) @indent.begin)
diff --git a/tests/indent/swift/declarations.swift b/tests/indent/swift/declarations.swift
index d4bc6e054..67a7e5544 100644
--- a/tests/indent/swift/declarations.swift
+++ b/tests/indent/swift/declarations.swift
@@ -12,6 +12,8 @@ class EquilateralTriangle: NamedShape {
   ) {
     self.sideLength = sideLength
   }
+  deinit {
+  }
 
   var perimeter: Double {
     willSet {
diff --git a/tests/indent/swift_spec.lua b/tests/indent/swift_spec.lua
index 5f07ee825..501cbfa81 100644
--- a/tests/indent/swift_spec.lua
+++ b/tests/indent/swift_spec.lua
@@ -14,9 +14,9 @@ describe("indent Swift:", function()
   describe("new line:", function()
     run:new_line("declarations.swift", { on_line = 6, text = "var x = 1", indent = 2 })
     run:new_line("declarations.swift", { on_line = 12, text = "var textInsideInit = true", indent = 4 })
-    run:new_line("declarations.swift", { on_line = 17, text = "var textInsideWillSet = 1", indent = 6 })
-    run:new_line("declarations.swift", { on_line = 20, text = "var textInsideDidSet = 1", indent = 6 })
-    run:new_line("declarations.swift", { on_line = 25, text = "var textInsideOverrideFunc", indent = 4 })
-    run:new_line("declarations.swift", { on_line = 31, text = "var InsideProtocol: String { get }", indent = 2 })
+    run:new_line("declarations.swift", { on_line = 19, text = "var textInsideWillSet = 1", indent = 6 })
+    run:new_line("declarations.swift", { on_line = 22, text = "var textInsideDidSet = 1", indent = 6 })
+    run:new_line("declarations.swift", { on_line = 27, text = "var textInsideOverrideFunc", indent = 4 })
+    run:new_line("declarations.swift", { on_line = 33, text = "var InsideProtocol: String { get }", indent = 2 })
   end)
 end)

From 6576041660226bd80c51e2a3510c8e18e6ce3f13 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 11 Mar 2024 18:55:36 +0200
Subject: [PATCH 1263/2704] feat(vimdoc): highlight modeline

---
 lockfile.json                 | 2 +-
 queries/vimdoc/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index c8037e67f..39af4391c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -762,7 +762,7 @@
     "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
   },
   "vimdoc": {
-    "revision": "016ad75faa854e4e13bc40c517015183b795eed9"
+    "revision": "90a396267e117835c778bdbda6f7db86b601d829"
   },
   "vue": {
     "revision": "3b9d52087100bdfce43dad2ca46d75b0e21613f6"
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 21b2b98c6..a1c14f02e 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -49,6 +49,8 @@
 
 (url) @string.special.url
 
+(modeline) @keyword.directive
+
 ((note) @comment.note
   (#any-of? @comment.note "Note:" "NOTE:" "Notes:"))
 

From fec37b6f97831e85dbd6d91bf4b870d14ed34c3c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 03:17:22 +0000
Subject: [PATCH 1264/2704] bot(lockfile): update angular, bash, c, cmake, cue,
 java, javascript, kotlin, lua, php, php_only, python, racket, ruby, rust,
 scala, scheme, slint, solidity, tlaplus, tsx, typescript, wing

---
 lockfile.json | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 39af4391c..11ed69078 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "a1b5ff462875e5f92e6265fc630702847e0dcbb3"
+    "revision": "52594e26562a8af8fa73234678e600575c5388ee"
   },
   "apex": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -27,7 +27,7 @@
     "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
   },
   "bash": {
-    "revision": "975bc70ad95dbbf2733872bc2e0a059c055db983"
+    "revision": "f3f26f47a126797c011c311cec9d449d855c3eab"
   },
   "bass": {
     "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "652433fce487d8c3943207da38e3e65e4550e288"
+    "revision": "371fd0bf0650581b6e49f06f438c88c419859696"
   },
   "c_sharp": {
     "revision": "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"
@@ -66,7 +66,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "f8de25f30757a2def006a7c144354710fe63dcf3"
+    "revision": "7dc15823107831729c64a917c796a93cf5c6a7e3"
   },
   "comment": {
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
@@ -96,7 +96,7 @@
     "revision": "221179d4287a2c24c08e4c67ff383ef67dc32156"
   },
   "cue": {
-    "revision": "cdfe1a8594fe5be45c883a385ab543acc646d018"
+    "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
     "revision": "a33d400f025d6bbd37b4c681c93054976f579890"
@@ -318,10 +318,10 @@
     "revision": "51271e260346878e1a1aa6c506ce6a797b7c25e2"
   },
   "java": {
-    "revision": "99b29f1ed957b3b424b6e21f57bd21a9732a622a"
+    "revision": "5e62fbb519b608dfd856000fdc66536304c414de"
   },
   "javascript": {
-    "revision": "51aed7263d33bee46b0a8a5e165ffcb690d5aca8"
+    "revision": "de1e682289a417354df5b4437a3e4f92e0722a0f"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -351,7 +351,7 @@
     "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
   },
   "kotlin": {
-    "revision": "4e909d6cc9ac96b4eaecb3fb538eaca48e9e9ee9"
+    "revision": "d84fcd3236f120965f4fdd6f004151911e1c5cab"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -378,7 +378,7 @@
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
   },
   "lua": {
-    "revision": "04c9579dcb917255b2e5f8199df4ae7f587d472f"
+    "revision": "a24dab177e58c9c6832f96b9a73102a0cfbced4a"
   },
   "luadoc": {
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
@@ -477,10 +477,10 @@
     "revision": "6526e5d5bf31501de0dc51c42ac3583078a8fdab"
   },
   "php": {
-    "revision": "365fd18542aaba90466580f8400e4ba3fb71c5fb"
+    "revision": "ad414fa5497328e96ef992d80896f19c77584f7c"
   },
   "php_only": {
-    "revision": "365fd18542aaba90466580f8400e4ba3fb71c5fb"
+    "revision": "ad414fa5497328e96ef992d80896f19c77584f7c"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -534,7 +534,7 @@
     "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
   },
   "python": {
-    "revision": "03e88c170cb23142559a406b6e7621c4af3128f5"
+    "revision": "b8a4c64121ba66b460cb878e934e3157ecbfb124"
   },
   "ql": {
     "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
@@ -552,7 +552,7 @@
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
-    "revision": "e4ba1a9674a3b4dd7905d04f194ae6f8331be342"
+    "revision": "b5a2fe74cac87dc5342b366f50db71d421e7cf8f"
   },
   "rasi": {
     "revision": "43196d934a9a6ab3c7093a8683efd0111bb03db1"
@@ -588,19 +588,19 @@
     "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
   },
   "ruby": {
-    "revision": "22a0bb2678755a3714e194609862ea7f4516e807"
+    "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
   },
   "rust": {
-    "revision": "2d7bac5164c344c95530c16dd5c8fa1319e34308"
+    "revision": "3a56481f8d13b6874a28752502a58520b9139dc7"
   },
   "scala": {
-    "revision": "e02f003d78dc269fef287b9b7b9963dc1f26bd7e"
+    "revision": "b3ac6a5d959d3137e7f3146d4d9f7899872177de"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
   },
   "scheme": {
-    "revision": "85b6188fb77c03dfb01d13e58e2844450506860c"
+    "revision": "6c77a5bcfb9baceeaa79ef67354b2d501b37b085"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -609,7 +609,7 @@
     "revision": "0cdfb1741323f38e9a33798674145c22cfc0092b"
   },
   "slint": {
-    "revision": "cdb307898345cb0465922be447a063b9c294afca"
+    "revision": "f5fa844d2adbcfdc7a0ec4daae4539887959d9ff"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
@@ -621,7 +621,7 @@
     "revision": "65a6c3b4671877821082164da0a310851b211953"
   },
   "solidity": {
-    "revision": "5cb506ae419c4ad620c77210fd47500d3d169dbc"
+    "revision": "b239a95f94cfcc6e7b3e961bc73a28d55e214f02"
   },
   "soql": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -699,7 +699,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "aaf5bb5c1df0a6e583bb51efa519a9ac788b2ad8"
+    "revision": "3896a5be761f04ffb22a841b2a0672f7a8a43ef9"
   },
   "tmux": {
     "revision": "10737f5dc4d8e68c9667f11a6996688a1185755f"
@@ -714,7 +714,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "tsx": {
-    "revision": "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"
+    "revision": "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -723,7 +723,7 @@
     "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
   },
   "typescript": {
-    "revision": "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"
+    "revision": "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "dbe7de9dff20725577393fc9ff0c2e7853091164"
+    "revision": "f3344cc9ce289be07108df79262df74afa265544"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 76f699dcc89642eedf69fafaef79bc235b7ef51e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 06:35:40 +0000
Subject: [PATCH 1265/2704] bot(lockfile): update kotlin, scala

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 11ed69078..f06c072cd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -351,7 +351,7 @@
     "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
   },
   "kotlin": {
-    "revision": "d84fcd3236f120965f4fdd6f004151911e1c5cab"
+    "revision": "aa1130ebfde68ed70366c58d9d318e6656220111"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -594,7 +594,7 @@
     "revision": "3a56481f8d13b6874a28752502a58520b9139dc7"
   },
   "scala": {
-    "revision": "b3ac6a5d959d3137e7f3146d4d9f7899872177de"
+    "revision": "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"

From 35c1a32b267c969a024ef651c8a25d7ff9018d22 Mon Sep 17 00:00:00 2001
From: Mark Skelton <mdskelton99@gmail.com>
Date: Wed, 13 Mar 2024 09:02:55 -0500
Subject: [PATCH 1266/2704] * feat(ecma): styled injection for `css` and
 `keyframes`

---
 queries/ecma/injections.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 00ff12c5a..011d953bf 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -17,9 +17,12 @@
   (#lua-match? @injection.language "^[a-zA-Z][a-zA-Z0-9]*$")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children)
-  (#not-eq? @injection.language "svg"))
+  ; Languages excluded from auto-injection due to special rules
+  ; - svg uses the html parser
+  ; - css uses the styled parser
+  (#not-any-of? @injection.language "svg" "css"))
 
-; svg`...` or svg(`...`), which uses the html parser, so is not included in the previous query
+; svg`...` or svg(`...`)
 (call_expression
   function:
     ((identifier) @_name
@@ -57,6 +60,16 @@
 ((glimmer_template) @injection.content
   (#set! injection.language "glimmer"))
 
+; css`<css>`, keyframes`<css>`
+(call_expression
+  function: (identifier) @_name
+  (#any-of? @_name "css" "keyframes")
+  arguments:
+    ((template_string) @injection.content
+      (#offset! @injection.content 0 1 0 -1)
+      (#set! injection.include-children)
+      (#set! injection.language "styled")))
+
 ; styled.div`<css>`
 (call_expression
   function:

From 497fe685ff526773564b98fd08436145e94af5c3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 06:35:52 +0000
Subject: [PATCH 1267/2704] bot(lockfile): update angular, awk, heex, html,
 kotlin, markdown, markdown_inline, sql, swift, wing

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f06c072cd..ab6f4eaed 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "52594e26562a8af8fa73234678e600575c5388ee"
+    "revision": "62179d7bbfb5fd8a8f7298495ac654d252a1bd52"
   },
   "apex": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -24,7 +24,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "207b04974c83d8d25a947e4d09763675c4617da7"
+    "revision": "ba7472152d79a8c916550c80fdbfd5724d07a0c9"
   },
   "bash": {
     "revision": "f3f26f47a126797c011c311cec9d449d855c3eab"
@@ -273,7 +273,7 @@
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
   },
   "heex": {
-    "revision": "4a36c9a388505180da6ee0eda1d8afb8c83481c8"
+    "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
   },
   "helm": {
     "revision": "17144a77be0acdecebd9d557398883569fed41de"
@@ -294,7 +294,7 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "b5d9758e22b4d3d25704b72526670759a9e4d195"
+    "revision": "b285e25c1ba8729399ce4f15ac5375cf6c3aa5be"
   },
   "htmldjango": {
     "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
@@ -351,7 +351,7 @@
     "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
   },
   "kotlin": {
-    "revision": "aa1130ebfde68ed70366c58d9d318e6656220111"
+    "revision": "260afd9a92bac51b3a4546303103c3d40a430639"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -396,10 +396,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "2821521a4e6eab37b63dff6a8e169cd88554047d"
+    "revision": "b2f01981a76e3251f5b660378136c248ed106b81"
   },
   "markdown_inline": {
-    "revision": "2821521a4e6eab37b63dff6a8e169cd88554047d"
+    "revision": "b2f01981a76e3251f5b660378136c248ed106b81"
   },
   "matlab": {
     "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
@@ -636,7 +636,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "da2d1eff425b146d3c8cab7be8dfa98b11d896dc"
+    "revision": "cdb7cde9bf70b194ab8beb5069fbbc3c9640284e"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "78f2d72e375f83b2ba6cfb5cc7750db3c94e9785"
+    "revision": "505bd4ce213ecceb3670adf0f74ff2b25c43916a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "f3344cc9ce289be07108df79262df74afa265544"
+    "revision": "06128477ae1f875e832493ada7c93170af822a9f"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 3ae78f376c2e721ce4feb23e9a5e8bc6062a2657 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 14 Mar 2024 18:46:10 +0800
Subject: [PATCH 1268/2704] fix(vimdoc): adapt to breaking Neovim change

Problem:
https://github.com/neovim/neovim/commit/cb46f6e467268edf917cc3617b4c024a66b256de#diff-edf997b0c2d42d31828800641ac1f5a46487fe24a0d46ccf70bcd58a14f3868f
introduced a regression on how `#set!` behaves with several matches in a
single pattern, breaking conceals in, e.g., taglinks.

Solution: Separate taglink etc. patterns into concealed marker and
contents. Also add URL support for concealed markdown links.
---
 queries/markdown_inline/highlights.scm |  5 +++++
 queries/vimdoc/highlights.scm          | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index cae8acfb4..e38ef3d7b 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -33,6 +33,11 @@
   ] @markup.link
   (#set! conceal ""))
 
+(inline_link
+  (link_text) @markup.link.label
+  (link_destination) @markup.link
+  (#set! @markup.link.label "url" @markup.link))
+
 ; Conceal image links
 (image
   [
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index a1c14f02e..70a3a2f20 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -12,12 +12,16 @@
 
 (tag
   "*" @label
-  (#set! conceal "")
+  (#set! conceal ""))
+
+(tag
   text: (_) @label)
 
 (taglink
   "|" @markup.link
-  (#set! conceal "")
+  (#set! conceal ""))
+
+(taglink
   text: (_) @markup.link)
 
 (optionlink
@@ -25,7 +29,9 @@
 
 (codespan
   "`" @markup.raw
-  (#set! conceal "")
+  (#set! conceal ""))
+
+(codespan
   text: (_) @markup.raw)
 
 ((codeblock) @markup.raw.block

From 904f373fc4e6fb474e3df35b57f78edee8e45267 Mon Sep 17 00:00:00 2001
From: Luckas <luckasranarison@gmail.com>
Date: Fri, 15 Mar 2024 03:18:33 +0300
Subject: [PATCH 1269/2704] feat(dot): add indents queries

* feat(dot): add indents queries

* add: tests

* fix: test
---
 queries/dot/indents.scm   |  9 +++++++++
 tests/indent/dot/test.dot |  8 ++++++++
 tests/indent/dot_spec.lua | 25 +++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 queries/dot/indents.scm
 create mode 100644 tests/indent/dot/test.dot
 create mode 100644 tests/indent/dot_spec.lua

diff --git a/queries/dot/indents.scm b/queries/dot/indents.scm
new file mode 100644
index 000000000..a951e5511
--- /dev/null
+++ b/queries/dot/indents.scm
@@ -0,0 +1,9 @@
+[
+  (block)
+  (attr_list)
+] @indent.begin
+
+[
+  "}"
+  "]"
+] @indent.branch @indent.end
diff --git a/tests/indent/dot/test.dot b/tests/indent/dot/test.dot
new file mode 100644
index 000000000..b3fe35fca
--- /dev/null
+++ b/tests/indent/dot/test.dot
@@ -0,0 +1,8 @@
+digraph {
+  node [
+    shape=ellipse,
+  ];
+  subgraph sub {
+    a1 -> a2 -> a3;
+  }
+}
diff --git a/tests/indent/dot_spec.lua b/tests/indent/dot_spec.lua
new file mode 100644
index 000000000..ac78f8d92
--- /dev/null
+++ b/tests/indent/dot_spec.lua
@@ -0,0 +1,25 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/dot", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent dot:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    run:new_line("test.dot", { on_line = 1, text = "node [", indent = 2 })
+    run:new_line("test.dot", { on_line = 2, text = "shape=ellipse,", indent = 4 })
+    run:new_line("test.dot", { on_line = 4, text = "subgraph sub {", indent = 2 })
+    run:new_line("test.dot", { on_line = 5, text = "a1 -> a2 -> a3;", indent = 4 })
+    run:new_line("test.dot", { on_line = 6, text = "}", indent = 2 })
+    run:new_line("test.dot", { on_line = 7, text = "}", indent = 0 })
+  end)
+end)

From 16398a6c357d9b8ad80221e6220e133092977726 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Mar 2024 06:35:35 +0000
Subject: [PATCH 1270/2704] bot(lockfile): update gitcommit, mlir, rnoweb,
 swift, vimdoc, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ab6f4eaed..c7a7cb336 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -207,7 +207,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "247406593c835065828230bdcecd933138691f68"
+    "revision": "523a1a4f0f674eff7fbf46addfa6ef7644151aae"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -414,7 +414,7 @@
     "revision": "d6ec8ce0963c3c8180161391f15d8f7d415f650d"
   },
   "mlir": {
-    "revision": "a56445f841ae7246e4aa3fdf7b4ef0bccdc82e7c"
+    "revision": "992c756686eb968af752ce75a874591042a8e24c"
   },
   "muttrc": {
     "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
@@ -576,7 +576,7 @@
     "revision": "8666a4dfeb3107144398158bc3dd7a3f59d89ccb"
   },
   "rnoweb": {
-    "revision": "502c1126dc6777f09af5bef16e72a42f75bd081e"
+    "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
   },
   "robot": {
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "505bd4ce213ecceb3670adf0f74ff2b25c43916a"
+    "revision": "78a736d77094b0b3c35e811e6765c4d38a72724e"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -762,7 +762,7 @@
     "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
   },
   "vimdoc": {
-    "revision": "90a396267e117835c778bdbda6f7db86b601d829"
+    "revision": "f431bfa7d433f4d629943147817193a4fccbd303"
   },
   "vue": {
     "revision": "3b9d52087100bdfce43dad2ca46d75b0e21613f6"
@@ -774,7 +774,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "06128477ae1f875e832493ada7c93170af822a9f"
+    "revision": "07f6740ab9f4f74c49413b9056154cac51f4b2d7"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From b8f07b30eff75504b5e01ede43f38809948f5682 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 15 Mar 2024 03:13:26 -0400
Subject: [PATCH 1271/2704] feat(yaml)!: switch upstream parser

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c7a7cb336..c638eb020 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -783,7 +783,7 @@
     "revision": "c23bd31d0aa72bfc01238b2546d5e823d8006709"
   },
   "yaml": {
-    "revision": "0e36bed171768908f331ff7dff9d956bae016efb"
+    "revision": "9e59b9bbf839ba231fbcb953617d8b9b9a059e38"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index bbd07e17a..a365e219c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2274,10 +2274,10 @@ list.xml = {
 
 list.yaml = {
   install_info = {
-    url = "https://github.com/ikatyang/tree-sitter-yaml",
-    files = { "src/parser.c", "src/scanner.cc" },
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-yaml",
+    files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@stsewd" },
+  maintainers = { "@amaanq" },
 }
 
 list.yang = {

From f87882858438834d2fbb6379aa2be37de901751b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Mar 2024 07:55:36 +0000
Subject: [PATCH 1272/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a5651470a..23020bc39 100644
--- a/README.md
+++ b/README.md
@@ -434,7 +434,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka, @MarkMcCulloh)
 - [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
 - [x] [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
-- [x] [yaml](https://github.com/ikatyang/tree-sitter-yaml) (maintained by @stsewd)
+- [x] [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) (maintained by @amaanq)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)
 - [x] [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) (maintained by @Freed-Wu)

From 998b230a77b544761bae8aa7518d40b91a5c9559 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Fri, 8 Mar 2024 19:09:51 +0900
Subject: [PATCH 1273/2704] =?UTF-8?q?feat(highlights)!:=20keyword=20`@type?=
 =?UTF-8?q?.qualifier`=20=E2=86=92=20`@keyword.modifier`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTING.md                               |  1 +
 queries/apex/highlights.scm                   |  2 +-
 queries/bitbake/highlights.scm                |  2 +-
 queries/c/highlights.scm                      |  2 +-
 queries/c_sharp/highlights.scm                |  2 +-
 queries/capnp/highlights.scm                  |  2 +-
 queries/cpp/highlights.scm                    |  2 +-
 queries/css/highlights.scm                    |  2 +-
 queries/cuda/highlights.scm                   |  2 +-
 queries/d/highlights.scm                      |  2 +-
 queries/dart/highlights.scm                   |  2 +-
 queries/dtd/highlights.scm                    |  2 +-
 queries/firrtl/highlights.scm                 |  2 +-
 queries/fortran/highlights.scm                |  2 +-
 queries/func/highlights.scm                   |  2 +-
 queries/gdscript/highlights.scm               |  4 ++--
 queries/gdshader/highlights.scm               |  2 +-
 queries/gleam/highlights.scm                  |  2 +-
 queries/glsl/highlights.scm                   |  2 +-
 queries/gpg/highlights.scm                    |  2 +-
 queries/groovy/highlights.scm                 |  2 +-
 queries/hack/highlights.scm                   |  2 +-
 queries/hare/highlights.scm                   |  2 +-
 queries/hlsl/highlights.scm                   |  2 +-
 queries/ispc/highlights.scm                   |  2 +-
 queries/java/highlights.scm                   |  4 ++--
 queries/julia/highlights.scm                  |  2 +-
 queries/kotlin/highlights.scm                 |  2 +-
 queries/kusto/highlights.scm                  |  2 +-
 queries/leo/highlights.scm                    |  2 +-
 queries/llvm/highlights.scm                   |  2 +-
 queries/luadoc/highlights.scm                 |  2 +-
 queries/mermaid/highlights.scm                |  2 +-
 queries/nim/highlights.scm                    | 22 +++++++++----------
 queries/objc/highlights.scm                   |  2 +-
 queries/ocaml/highlights.scm                  |  2 +-
 queries/pascal/highlights.scm                 |  2 +-
 queries/php_only/highlights.scm               |  2 +-
 queries/pioasm/highlights.scm                 |  2 +-
 queries/pony/highlights.scm                   |  2 +-
 queries/proto/highlights.scm                  |  2 +-
 queries/prql/highlights.scm                   |  2 +-
 queries/purescript/highlights.scm             |  2 +-
 queries/ql/highlights.scm                     |  2 +-
 queries/qmljs/highlights.scm                  |  2 +-
 queries/rasi/highlights.scm                   |  2 +-
 queries/rbs/highlights.scm                    |  2 +-
 queries/ruby/highlights.scm                   |  4 ++--
 queries/rust/highlights.scm                   |  2 +-
 queries/scala/highlights.scm                  |  8 +++----
 queries/slint/highlights.scm                  |  6 ++---
 queries/smali/highlights.scm                  |  2 +-
 queries/solidity/highlights.scm               |  2 +-
 queries/sourcepawn/highlights.scm             |  4 ++--
 queries/sql/highlights.scm                    |  2 +-
 queries/squirrel/highlights.scm               |  2 +-
 queries/svelte/highlights.scm                 |  2 +-
 queries/swift/highlights.scm                  |  2 +-
 queries/systemtap/highlights.scm              |  2 +-
 queries/t32/highlights.scm                    |  4 ++--
 queries/thrift/highlights.scm                 |  2 +-
 queries/typescript/highlights.scm             |  2 +-
 queries/unison/highlights.scm                 |  4 ++--
 queries/v/highlights.scm                      |  2 +-
 queries/vala/highlights.scm                   |  2 +-
 queries/verilog/highlights.scm                |  4 ++--
 queries/wgsl/highlights.scm                   |  2 +-
 queries/xcompose/highlights.scm               |  2 +-
 queries/zig/highlights.scm                    |  2 +-
 tests/query/highlights/capnp/test.capnp       |  2 +-
 tests/query/highlights/gleam/function.gleam   | 12 +++++-----
 tests/query/highlights/gleam/type.gleam       |  6 ++---
 tests/query/highlights/hack/generics.hack     |  6 ++---
 .../smali/baksmali_test_class.smali           |  2 +-
 tests/query/highlights/t32/var.cmm            |  4 ++--
 tests/query/highlights/xhp-intro.hack         |  4 ++--
 76 files changed, 109 insertions(+), 108 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9db53d688..a6369a5ae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -171,6 +171,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 @keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
 @keyword.storage           ; modifiers that affect storage in memory or life-time
 @keyword.type              ; keywords describing composite types (e.g. `struct`, `enum`)
+@keyword.modifier          ; keywords modifying other constructs (e.g. `const`, `static`, `public`)
 @keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
 @keyword.return            ; keywords like `return` and `yield`
 @keyword.debug             ; keywords related to debugging
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 2d2f8819d..55acadd62 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -202,7 +202,7 @@
   "protected"
   "public"
   "static"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "if"
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index 67acd757e..a56acab56 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -92,7 +92,7 @@
   "append"
   "prepend"
   "remove"
-] @type.qualifier
+] @keyword.modifier
 
 ; Variables
 [
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index e80819fa3..5a26d7b48 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -175,7 +175,7 @@
   (type_qualifier)
   (gnu_asm_qualifier)
   "__extension__"
-] @type.qualifier
+] @keyword.modifier
 
 (linkage_specification
   "extern" @keyword.storage)
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 99d85b193..c36c66057 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -450,7 +450,7 @@
   "partial"
   "sealed"
   "virtual"
-] @type.qualifier
+] @keyword.modifier
 
 (parameter_modifier) @operator
 
diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm
index 4ce923ce4..b77852ef0 100644
--- a/queries/capnp/highlights.scm
+++ b/queries/capnp/highlights.scm
@@ -27,7 +27,7 @@
 ] @keyword
 
 ; Builtins
-"const" @type.qualifier
+"const" @keyword.modifier
 
 [
   (primitive_type)
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index b021e8b37..f2ba879fb 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -232,7 +232,7 @@
   "protected"
   "virtual"
   "final"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "new"
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index a07fcb7be..7066d6906 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -56,7 +56,7 @@
   "only"
 ] @keyword.operator
 
-(important) @type.qualifier
+(important) @keyword.modifier
 
 (attribute_selector
   (plain_value) @string)
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
index 565daaa91..afa03b3b3 100644
--- a/queries/cuda/highlights.scm
+++ b/queries/cuda/highlights.scm
@@ -13,4 +13,4 @@
   "__noinline__"
 ] @keyword.storage
 
-"__launch_bounds__" @type.qualifier
+"__launch_bounds__" @keyword.modifier
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
index 89ff704e7..24c8e03c2 100644
--- a/queries/d/highlights.scm
+++ b/queries/d/highlights.scm
@@ -68,7 +68,7 @@
   (const)
   (override)
   (static)
-] @type.qualifier
+] @keyword.modifier
 
 [
   (assert)
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index ba7a8ede7..2b0f0c6de 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -245,7 +245,7 @@
   "final"
   "base"
   "sealed"
-] @type.qualifier
+] @keyword.modifier
 
 ; when used as an identifier:
 ((identifier) @variable.builtin
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index fb98391b3..7bc7a7ed1 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -31,7 +31,7 @@
 [
   "EMPTY"
   "ANY"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "*"
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index 14f12b169..158a6eedc 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -38,7 +38,7 @@
 ] @keyword
 
 ; Qualifiers
-(qualifier) @type.qualifier
+(qualifier) @keyword.modifier
 
 ; Storageclasses
 [
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 86634e903..935f12adb 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -130,7 +130,7 @@
   "value"
   "volatile"
   (procedure_qualifier)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "common"
diff --git a/queries/func/highlights.scm b/queries/func/highlights.scm
index a6fb6bd0b..9fd6dd82d 100644
--- a/queries/func/highlights.scm
+++ b/queries/func/highlights.scm
@@ -54,7 +54,7 @@
   "const"
   "global"
   (var)
-] @type.qualifier
+] @keyword.modifier
 
 ; Variables
 (identifier) @variable
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index bf951aa83..76dc89061 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -28,7 +28,7 @@
 (get_body
   "get" @keyword.function)
 
-(static_keyword) @type.qualifier
+(static_keyword) @keyword.modifier
 
 (tool_statement) @keyword
 
@@ -50,7 +50,7 @@
   (name) @type) @keyword
 
 (const_statement
-  "const" @type.qualifier
+  "const" @keyword.modifier
   (name) @constant)
 
 (expression_statement
diff --git a/queries/gdshader/highlights.scm b/queries/gdshader/highlights.scm
index 797681a0c..c0cb2905e 100644
--- a/queries/gdshader/highlights.scm
+++ b/queries/gdshader/highlights.scm
@@ -13,7 +13,7 @@
 [
   (precision_qualifier)
   (interpolation_qualifier)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "in"
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index e338115ac..49dd8777c 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -159,7 +159,7 @@
   "external"
   (opacity_modifier)
   (visibility_modifier)
-] @type.qualifier
+] @keyword.modifier
 
 ; Tuples
 (tuple_access
diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index af037c160..590cf93b3 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -25,7 +25,7 @@
   "noperspective"
   "invariant"
   "precise"
-] @type.qualifier
+] @keyword.modifier
 
 "subroutine" @keyword.function
 
diff --git a/queries/gpg/highlights.scm b/queries/gpg/highlights.scm
index 09656b302..f02834429 100644
--- a/queries/gpg/highlights.scm
+++ b/queries/gpg/highlights.scm
@@ -26,7 +26,7 @@
 
 (format) @character.special
 
-"sensitive:" @type.qualifier
+"sensitive:" @keyword.modifier
 
 (filter_name) @variable.parameter
 
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index aadd04fe4..1dad58363 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -67,7 +67,7 @@
   "public"
   "static"
   "synchronized"
-] @type.qualifier
+] @keyword.modifier
 
 (comment) @comment @spell
 
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index 22fa7ea50..f561dfe36 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -64,7 +64,7 @@
   (static_modifier)
   (visibility_modifier)
   (xhp_modifier)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "shape"
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index 817084886..67d3eb499 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -74,7 +74,7 @@
   "const"
   "static"
   "nullable"
-] @type.qualifier
+] @keyword.modifier
 
 ; Attributes
 [
diff --git a/queries/hlsl/highlights.scm b/queries/hlsl/highlights.scm
index d70a83790..839d8d79a 100644
--- a/queries/hlsl/highlights.scm
+++ b/queries/hlsl/highlights.scm
@@ -24,7 +24,7 @@
   "triangleadj"
   "lineadj"
   "triangle"
-] @type.qualifier
+] @keyword.modifier
 
 ((identifier) @variable.builtin
   (#lua-match? @variable.builtin "^SV_"))
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 45d7be584..14e614260 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -31,7 +31,7 @@
 [
   "varying"
   "uniform"
-] @type.qualifier
+] @keyword.modifier
 
 "__regcall" @attribute
 
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index ee36bf0bf..16abeacb2 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -199,10 +199,10 @@
   "static"
   "strictfp"
   "transitive"
-] @type.qualifier
+] @keyword.modifier
 
 (modifiers
-  "synchronized" @type.qualifier)
+  "synchronized" @keyword.modifier)
 
 [
   "transient"
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 9bc6b91cf..1ff8b8e4e 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -309,7 +309,7 @@
 [
   "const"
   "mutable"
-] @type.qualifier
+] @keyword.modifier
 
 ; Operators & Punctuation
 [
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index ae7dcdf31..4af95c4c3 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -237,7 +237,7 @@
   (visibility_modifier)
   (reification_modifier)
   (inheritance_modifier)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "val"
diff --git a/queries/kusto/highlights.scm b/queries/kusto/highlights.scm
index 00bf4b067..5f00f751c 100644
--- a/queries/kusto/highlights.scm
+++ b/queries/kusto/highlights.scm
@@ -42,7 +42,7 @@
 
 (type) @type
 
-(join_types) @type.qualifier
+(join_types) @keyword.modifier
 
 [
   "("
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index c4500ddf3..c0e2e4065 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -24,7 +24,7 @@
   "constant"
   "private"
   "public"
-] @type.qualifier
+] @keyword.modifier
 
 "self" @variable.builtin
 
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index 2ccae3693..7e3056c14 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -100,7 +100,7 @@
   (dso_local)
   (linkage_aux)
   (visibility)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "thread_local"
diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
index 5e835b3b0..b1b04da2d 100644
--- a/queries/luadoc/highlights.scm
+++ b/queries/luadoc/highlights.scm
@@ -62,7 +62,7 @@
   "@private"
   "(exact)"
   "(key)"
-] @type.qualifier @nospell
+] @keyword.modifier @nospell
 
 ; Variables
 (identifier) @variable @nospell
diff --git a/queries/mermaid/highlights.scm b/queries/mermaid/highlights.scm
index 3289c4e5c..2b7b56374 100644
--- a/queries/mermaid/highlights.scm
+++ b/queries/mermaid/highlights.scm
@@ -244,6 +244,6 @@
 [
   (er_attribute_key_type_pk)
   (er_attribute_key_type_fk)
-] @type.qualifier
+] @keyword.modifier
 
 (er_attribute_comment) @string @spell
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index 0eb0f8b46..104979b3f 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -724,36 +724,36 @@
         ])))
 
 ; =============================================================================
-; @type.qualifier  ; type qualifiers (e.g. `const`)
+; @keyword.modifier  ; type qualifier keywords (e.g. `const`)
 (var_type
-  "var" @type.qualifier)
+  "var" @keyword.modifier)
 
 (out_type
-  "out" @type.qualifier)
+  "out" @keyword.modifier)
 
 (distinct_type
-  "distinct" @type.qualifier)
+  "distinct" @keyword.modifier)
 
 (ref_type
-  "ref" @type.qualifier)
+  "ref" @keyword.modifier)
 
 (pointer_type
-  "ptr" @type.qualifier)
+  "ptr" @keyword.modifier)
 
 (var_parameter
-  "var" @type.qualifier)
+  "var" @keyword.modifier)
 
 (type_parameter
-  "type" @type.qualifier)
+  "type" @keyword.modifier)
 
 (static_parameter
-  "static" @type.qualifier)
+  "static" @keyword.modifier)
 
 (ref_parameter
-  "ref" @type.qualifier)
+  "ref" @keyword.modifier)
 
 (pointer_parameter
-  "ptr" @type.qualifier)
+  "ptr" @keyword.modifier)
 
 ; =============================================================================
 ; @variable.member           ; object and struct fields
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index dd2c796bd..d0c60af5f 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -21,7 +21,7 @@
   "__covariant"
   "__contravariant"
   (visibility_specification)
-] @type.qualifier
+] @keyword.modifier
 
 ; Storageclasses
 [
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 0a5f274c6..3863d405e 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -153,7 +153,7 @@
   "rec"
   "private"
   "virtual"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "fun"
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index 5849a167b..a28fa546e 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -79,7 +79,7 @@
   (kStrict)
   (kRequired)
   (kOptional)
-] @type.qualifier
+] @keyword.modifier
 
 [
   (kPacked)
diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index a3792cad7..20d35c18e 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -266,7 +266,7 @@
   "public"
   "readonly"
   "static"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "return"
diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm
index 8bb9dca01..a5d75fe8a 100644
--- a/queries/pioasm/highlights.scm
+++ b/queries/pioasm/highlights.scm
@@ -62,7 +62,7 @@
 [
   (optional)
   (irq_modifiers)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "block"
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
index 5884a3e89..06b0006b3 100644
--- a/queries/pony/highlights.scm
+++ b/queries/pony/highlights.scm
@@ -45,7 +45,7 @@
   "#share"
   "#alias"
   "#any"
-] @type.qualifier
+] @keyword.modifier
 
 ; Conditionals
 [
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index 6324ae3bb..f67f4574e 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -19,7 +19,7 @@
   "optional"
   "repeated"
   "required"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "package"
diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 921ca37b8..6e6094a92 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -106,7 +106,7 @@ alias: (identifier) @variable.member
 [
   (keyword_version)
   (keyword_target)
-] @type.qualifier
+] @keyword.modifier
 
 (target) @function.builtin
 
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index 7f108df80..c14ded077 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -113,7 +113,7 @@
 
 (type_role_declaration
   "role" @keyword
-  role: (type_role) @type.qualifier)
+  role: (type_role) @keyword.modifier)
 
 (hole) @character.special
 
diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm
index 39b7bc101..434ec3316 100644
--- a/queries/ql/highlights.scm
+++ b/queries/ql/highlights.scm
@@ -54,7 +54,7 @@
 [
   "asc"
   "desc"
-] @type.qualifier
+] @keyword.modifier
 
 [
   (true)
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 7cf08ed0a..b4b30d0aa 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -116,7 +116,7 @@
   "default"
   "readonly"
   "required"
-] @type.qualifier
+] @keyword.modifier
 
 ; from typescript
 (type_identifier) @type
diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index cec2e5a03..1a0b8659c 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -104,7 +104,7 @@
     "normal"
     "urgent"
     "active"
-  ] @type.qualifier)
+  ] @keyword.modifier)
 
 (hex_color) @number
 
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index 340bc254e..f2066d855 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -37,7 +37,7 @@
   "prepend"
 ] @function.method
 
-(visibility) @type.qualifier
+(visibility) @keyword.modifier
 
 (comment) @comment @spell
 
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 5b5fcbf9f..c0e71e1dc 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -62,8 +62,8 @@
 
 (constant) @constant
 
-((identifier) @type.qualifier
-  (#any-of? @type.qualifier "private" "protected" "public"))
+((identifier) @keyword.modifier
+  (#any-of? @keyword.modifier "private" "protected" "public"))
 
 [
   "rescue"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 4639d8859..2c04347dc 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -275,7 +275,7 @@
 [
   "ref"
   (mutable_specifier)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "const"
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 032863c08..3e1ee8ba7 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -161,13 +161,13 @@
   "$" @punctuation.special)
 
 ; keywords
-(opaque_modifier) @type.qualifier
+(opaque_modifier) @keyword.modifier
 
 (infix_modifier) @keyword
 
-(transparent_modifier) @type.qualifier
+(transparent_modifier) @keyword.modifier
 
-(open_modifier) @type.qualifier
+(open_modifier) @keyword.modifier
 
 [
   "case"
@@ -201,7 +201,7 @@
   "sealed"
   "private"
   "protected"
-] @type.qualifier
+] @keyword.modifier
 
 (inline_modifier) @keyword.storage
 
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 2e6d5997e..d93ba299e 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -28,11 +28,11 @@
   (relative_font_size_value)
 ] @number.float
 
-(purity) @type.qualifier
+(purity) @keyword.modifier
 
-(function_visibility) @type.qualifier
+(function_visibility) @keyword.modifier
 
-(property_visibility) @type.qualifier
+(property_visibility) @keyword.modifier
 
 (builtin_type_identifier) @type.builtin
 
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 3220b19f2..13ac0e291 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -192,7 +192,7 @@
 ; Misc
 (annotation_visibility) @keyword.storage
 
-(access_modifier) @type.qualifier
+(access_modifier) @keyword.modifier
 
 (array_type
   "[" @punctuation.special)
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 81c68f9d3..20c07ce7b 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -172,7 +172,7 @@
   "view"
   "payable"
   (immutable)
-] @type.qualifier
+] @keyword.modifier
 
 [
   "memory"
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
index b134a0035..e3d7f107a 100644
--- a/queries/sourcepawn/highlights.scm
+++ b/queries/sourcepawn/highlights.scm
@@ -149,7 +149,7 @@
 ; Non-type Keywords
 (variable_storage_class) @keyword.storage
 
-(visibility) @type.qualifier
+(visibility) @keyword.modifier
 
 (assertion) @function.builtin
 
@@ -298,4 +298,4 @@
   "static"
   "stock"
   "forward"
-] @type.qualifier
+] @keyword.modifier
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 7ffa99edc..21f2605b3 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -333,7 +333,7 @@
   (keyword_statistics)
   (keyword_maxvalue)
   (keyword_minvalue)
-] @type.qualifier
+] @keyword.modifier
 
 [
   (keyword_int)
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index 28d072029..15879cee0 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -61,7 +61,7 @@
 [
   "static"
   "const"
-] @type.qualifier
+] @keyword.modifier
 
 ; Variables
 [
diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 961a8ed5b..600eb9986 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -10,7 +10,7 @@
   "render"
 ] @keyword
 
-"const" @type.qualifier
+"const" @keyword.modifier
 
 [
   "if"
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 7ed570ba1..377420003 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -34,7 +34,7 @@
   (parameter_modifier)
   (inheritance_modifier)
   (mutation_modifier)
-] @type.qualifier
+] @keyword.modifier
 
 (function_declaration
   (simple_identifier) @function.method)
diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm
index a2832ae2b..e44882f17 100644
--- a/queries/systemtap/highlights.scm
+++ b/queries/systemtap/highlights.scm
@@ -153,6 +153,6 @@
 
 "@define" @keyword.directive.define
 
-"private" @type.qualifier
+"private" @keyword.modifier
 
 "global" @keyword.storage
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index e2b6c44c8..d98ccd76a 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -68,7 +68,7 @@
 [
   "const"
   "volatile"
-] @type.qualifier
+] @keyword.modifier
 
 ; Operators in comma and conditional HLL expressions
 (hll_comma_expression
@@ -120,7 +120,7 @@
   (hll_type_descriptor)
 ] @type
 
-(hll_type_qualifier) @type.qualifier
+(hll_type_qualifier) @keyword.modifier
 
 (hll_primitive_type) @type.builtin
 
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 3df9b5b80..afb0eee4f 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -177,7 +177,7 @@
   "server"
   "stateful"
   "transient"
-] @type.qualifier
+] @keyword.modifier
 
 ; Literals
 (string) @string
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 961ec99ec..48f891cc4 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -41,7 +41,7 @@
   "protected"
   "public"
   "readonly"
-] @type.qualifier
+] @keyword.modifier
 
 ; types
 (type_identifier) @type
diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
index 0092ef8d8..80ca65251 100644
--- a/queries/unison/highlights.scm
+++ b/queries/unison/highlights.scm
@@ -24,9 +24,9 @@
 
 (kw_equals) @keyword.operator
 
-(structural) @type.qualifier
+(structural) @keyword.modifier
 
-(unique) @type.qualifier
+(unique) @keyword.modifier
 
 (type_constructor) @constructor
 
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 74001da65..647a498a6 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -59,7 +59,7 @@
 [
   "pub"
   "mut"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "go"
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index 31c02ad1b..bd046278b 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -208,7 +208,7 @@
   "owned"
   "weak"
   "unowned"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "case"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index e4f318ec8..393e54519 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -154,7 +154,7 @@
 [
   "signed"
   "unsigned"
-] @type.qualifier
+] @keyword.modifier
 
 (data_type
   (simple_identifier) @type)
@@ -263,7 +263,7 @@
 ;(parameter_identifier) @variable.member))
 (type_declaration
   (data_type
-    "packed" @type.qualifier))
+    "packed" @keyword.modifier))
 
 (struct_union) @type
 
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index 970c4e2eb..0d974dd2e 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -50,7 +50,7 @@
   "read"
   "read_write"
   "write"
-] @type.qualifier
+] @keyword.modifier
 
 "fn" @keyword.function
 
diff --git a/queries/xcompose/highlights.scm b/queries/xcompose/highlights.scm
index 82ef8e6d4..2afab42f9 100644
--- a/queries/xcompose/highlights.scm
+++ b/queries/xcompose/highlights.scm
@@ -15,7 +15,7 @@
 [
   (modifier)
   "None"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "%L"
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 61ff5589c..5690a5010 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -154,7 +154,7 @@ field_constant: (IDENTIFIER) @constant
   "volatile"
   "allowzero"
   "noalias"
-] @type.qualifier
+] @keyword.modifier
 
 [
   "addrspace"
diff --git a/tests/query/highlights/capnp/test.capnp b/tests/query/highlights/capnp/test.capnp
index ce12b07ac..9480affd3 100644
--- a/tests/query/highlights/capnp/test.capnp
+++ b/tests/query/highlights/capnp/test.capnp
@@ -328,7 +328,7 @@ struct TestEmptyStruct {}
 
 struct TestConstants {
   const voidConst      :Void    = void;
-# ^^^^^ @type.qualifier
+# ^^^^^ @keyword.modifier
   const boolConst      :Bool    = true;
   const int8Const      :Int8    = -123;
   const int16Const     :Int16   = -12345;
diff --git a/tests/query/highlights/gleam/function.gleam b/tests/query/highlights/gleam/function.gleam
index ff2b690ca..f1924aaf9 100644
--- a/tests/query/highlights/gleam/function.gleam
+++ b/tests/query/highlights/gleam/function.gleam
@@ -1,5 +1,5 @@
 pub fn add(x: Int, y: Int) -> Int {
-// <- @type.qualifier
+// <- @keyword.modifier
 //  ^^ @keyword.function
 //     ^^^ @function
 //        ^ @punctuation.bracket
@@ -18,7 +18,7 @@ pub fn add(x: Int, y: Int) -> Int {
 // <- @punctuation.bracket
 
 pub fn twice(f: fn(t) -> t, x: t) -> t {
-// <- @type.qualifier
+// <- @keyword.modifier
 //  ^ @keyword.function
 //     ^^^^^ @function
 //          ^ @punctuation.bracket
@@ -100,8 +100,8 @@ fn replace(
 // <- @punctuation.bracket
 
 pub external fn random_float() -> Float = "rand" "uniform"
-// <- @type.qualifier
-//  ^^^^^^^^ @type.qualifier
+// <- @keyword.modifier
+//  ^^^^^^^^ @keyword.modifier
 //           ^^ @keyword.function
 //              ^^^^^^^^^^^^ @function
 //                          ^ @punctuation.bracket
@@ -113,8 +113,8 @@ pub external fn random_float() -> Float = "rand" "uniform"
 //                                               ^^^^^^^^^ @function
 
 pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
-// <- @type.qualifier
-//  ^^^^^^^^ @type.qualifier
+// <- @keyword.modifier
+//  ^^^^^^^^ @keyword.modifier
 //           ^^ @keyword.function
 //              ^^^^^^^ @function
 //                     ^ @punctuation.bracket
diff --git a/tests/query/highlights/gleam/type.gleam b/tests/query/highlights/gleam/type.gleam
index da840c194..8ee82419e 100644
--- a/tests/query/highlights/gleam/type.gleam
+++ b/tests/query/highlights/gleam/type.gleam
@@ -1,5 +1,5 @@
 pub type Cat {
-// <- @type.qualifier
+// <- @keyword.modifier
 //  ^^^^ @keyword
 //       ^^^ @type
 //           ^ @punctuation.bracket
@@ -54,8 +54,8 @@ type Box(inner_type) {
 }
 
 pub opaque type Counter {
-// <- @type.qualifier
-//  ^^^^^^ @type.qualifier
+// <- @keyword.modifier
+//  ^^^^^^ @keyword.modifier
 //         ^^^^ @keyword
 //              ^^^^^^^ @type
 //                      ^ @punctuation.bracket
diff --git a/tests/query/highlights/hack/generics.hack b/tests/query/highlights/hack/generics.hack
index fc41a86a9..50bd50e34 100644
--- a/tests/query/highlights/hack/generics.hack
+++ b/tests/query/highlights/hack/generics.hack
@@ -2,21 +2,21 @@ class Box<T> {
   //      ^ @type
   //   ^ @type
   protected T $data;
-  // ^ @type.qualifier
+  // ^ @keyword.modifier
   //        ^ @type
 
   public function __construct(T $data) {
   //                          ^ @type
   //                             ^ @variable.parameter
   //        ^ @keyword.function
-  // ^ @type.qualifier
+  // ^ @keyword.modifier
   //                    ^ @function.method
     $this->data = $data;
   }
 
   public function getData(): T {
                 // ^ @function.method
-  // ^ @type.qualifier
+  // ^ @keyword.modifier
     return $this->data;
               // ^ @operator
           // ^ @variable.builtin
diff --git a/tests/query/highlights/smali/baksmali_test_class.smali b/tests/query/highlights/smali/baksmali_test_class.smali
index 6412f8784..ee3bc6ad4 100644
--- a/tests/query/highlights/smali/baksmali_test_class.smali
+++ b/tests/query/highlights/smali/baksmali_test_class.smali
@@ -1,6 +1,6 @@
 .class public Lbaksmali/test/class;
 # <- @keyword
-#      ^^^^^^ @type.qualifier
+#      ^^^^^^ @keyword.modifier
 .super Ljava/lang/Object;
 #      ^ @character.special
 #       ^^^^ @type.builtin
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
index 8e251afef..b8dc463b5 100644
--- a/tests/query/highlights/t32/var.cmm
+++ b/tests/query/highlights/t32/var.cmm
@@ -39,8 +39,8 @@ Var.Assign sp = &s.n+offset
 Var.Assign padd = (CAddition const * volatile)&d
 ;          ^ @variable
 ;                  ^ @type
-;                            ^ @type.qualifier
-;                                    ^ @type.qualifier
+;                            ^ @keyword.modifier
+;                                    ^ @keyword.modifier
 ;                                              ^ @variable
 Var.Assign e1 = (enum e2)&e
 ;          ^ @variable
diff --git a/tests/query/highlights/xhp-intro.hack b/tests/query/highlights/xhp-intro.hack
index 06f7e30a2..0f8cffe02 100644
--- a/tests/query/highlights/xhp-intro.hack
+++ b/tests/query/highlights/xhp-intro.hack
@@ -5,8 +5,8 @@ use type Facebook\XHP\HTML\{XHPHTMLHelpers, a, form};
 
 
 final xhp class a_post extends x\element {
-// ^ @type.qualifier
-//     ^ @type.qualifier
+// ^ @keyword.modifier
+//     ^ @keyword.modifier
 //                        ^ @keyword
   use XHPHTMLHelpers;
 

From dccf31f9b1fbbbd09e6720c7d8f5f1a2433fd32d Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 16 Mar 2024 14:23:57 +0900
Subject: [PATCH 1274/2704] =?UTF-8?q?feat(highlights)!:=20`@keyword.storag?=
 =?UTF-8?q?e`=20=E2=86=92=20`@keyword.modifier`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTING.md                                        | 1 -
 queries/ada/highlights.scm                             | 2 +-
 queries/bitbake/highlights.scm                         | 2 +-
 queries/c/highlights.scm                               | 4 ++--
 queries/c_sharp/highlights.scm                         | 2 +-
 queries/cairo/highlights.scm                           | 2 +-
 queries/cmake/highlights.scm                           | 6 +++---
 queries/cuda/highlights.scm                            | 2 +-
 queries/d/highlights.scm                               | 8 ++++----
 queries/doxygen/highlights.scm                         | 2 +-
 queries/firrtl/highlights.scm                          | 2 +-
 queries/fortran/highlights.scm                         | 2 +-
 queries/gdshader/highlights.scm                        | 2 +-
 queries/glsl/highlights.scm                            | 2 +-
 queries/java/highlights.scm                            | 2 +-
 queries/lalrpop/highlights.scm                         | 2 +-
 queries/llvm/highlights.scm                            | 2 +-
 queries/objc/highlights.scm                            | 2 +-
 queries/odin/highlights.scm                            | 2 +-
 queries/pascal/highlights.scm                          | 2 +-
 queries/pioasm/highlights.scm                          | 2 +-
 queries/rust/highlights.scm                            | 4 ++--
 queries/scala/highlights.scm                           | 2 +-
 queries/smali/highlights.scm                           | 2 +-
 queries/solidity/highlights.scm                        | 2 +-
 queries/soql/highlights.scm                            | 2 +-
 queries/sourcepawn/highlights.scm                      | 2 +-
 queries/sql/highlights.scm                             | 2 +-
 queries/squirrel/highlights.scm                        | 2 +-
 queries/systemtap/highlights.scm                       | 2 +-
 queries/v/highlights.scm                               | 2 +-
 queries/vala/highlights.scm                            | 2 +-
 queries/verilog/highlights.scm                         | 2 +-
 queries/wgsl/highlights.scm                            | 2 +-
 queries/zig/highlights.scm                             | 2 +-
 tests/query/highlights/smali/baksmali_test_class.smali | 4 ++--
 36 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a6369a5ae..1f80341e0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -169,7 +169,6 @@ As languages differ quite a lot, here is a set of captures available to you when
 @keyword.function          ; keywords that define a function (e.g. `func` in Go, `def` in Python)
 @keyword.operator          ; operators that are English words (e.g. `and` / `or`)
 @keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
-@keyword.storage           ; modifiers that affect storage in memory or life-time
 @keyword.type              ; keywords describing composite types (e.g. `struct`, `enum`)
 @keyword.modifier          ; keywords modifying other constructs (e.g. `const`, `static`, `public`)
 @keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index c024afb4e..5b6a09978 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -54,7 +54,7 @@
   "aliased"
   "constant"
   "renames"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "with"
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index a56acab56..b8bbfea3f 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -86,7 +86,7 @@
 [
   "before"
   "after"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "append"
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 5a26d7b48..e22aac997 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -169,7 +169,7 @@
   (type_descriptor)
 ] @type
 
-(storage_class_specifier) @keyword.storage
+(storage_class_specifier) @keyword.modifier
 
 [
   (type_qualifier)
@@ -178,7 +178,7 @@
 ] @keyword.modifier
 
 (linkage_specification
-  "extern" @keyword.storage)
+  "extern" @keyword.modifier)
 
 (type_definition
   declarator: (type_identifier) @type.definition)
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index c36c66057..bd80f3146 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -439,7 +439,7 @@
   "static"
   "volatile"
   "required"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "abstract"
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index aa25847c9..e7a4faf9c 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -138,7 +138,7 @@
 [
   "tempvar"
   "extern"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "if"
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index de9c24094..e2bcd9278 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -136,7 +136,7 @@
   (argument_list
     .
     (argument)
-    ((argument) @_cache @keyword.storage
+    ((argument) @_cache @keyword.modifier
       .
       (argument) @_type @type
       (#any-of? @_cache "CACHE")
@@ -148,8 +148,8 @@
   (argument_list
     .
     (argument)
-    (argument) @keyword.storage
-    (#any-of? @keyword.storage "CACHE" "PARENT_SCOPE")))
+    (argument) @keyword.modifier
+    (#any-of? @keyword.modifier "CACHE" "PARENT_SCOPE")))
 
 (normal_command
   (identifier) @_function
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
index afa03b3b3..8b81ce870 100644
--- a/queries/cuda/highlights.scm
+++ b/queries/cuda/highlights.scm
@@ -11,6 +11,6 @@
   "__global__"
   "__forceinline__"
   "__noinline__"
-] @keyword.storage
+] @keyword.modifier
 
 "__launch_bounds__" @keyword.modifier
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
index 24c8e03c2..11d08a1b7 100644
--- a/queries/d/highlights.scm
+++ b/queries/d/highlights.scm
@@ -102,16 +102,16 @@
   (gshared)
   (out)
   (inout)
-] @keyword.storage
+] @keyword.modifier
 
 (parameter_attribute
-  (return) @keyword.storage)
+  (return) @keyword.modifier)
 
 (parameter_attribute
-  (in) @keyword.storage)
+  (in) @keyword.modifier)
 
 (parameter_attribute
-  (out) @keyword.storage)
+  (out) @keyword.modifier)
 
 (debug) @keyword.debug
 
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
index e3e26881e..da39bdd83 100644
--- a/queries/doxygen/highlights.scm
+++ b/queries/doxygen/highlights.scm
@@ -31,7 +31,7 @@
   "in"
   "out"
   "inout"
-] @keyword.storage
+] @keyword.modifier
 
 "~" @operator
 
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index 158a6eedc..b2cfd08a6 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -44,7 +44,7 @@
 [
   "input"
   "output"
-] @keyword.storage
+] @keyword.modifier
 
 ; Conditionals
 [
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 935f12adb..bbe0dd6ee 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -137,7 +137,7 @@
   "in"
   "inout"
   "out"
-] @keyword.storage
+] @keyword.modifier
 
 ; Labels
 [
diff --git a/queries/gdshader/highlights.scm b/queries/gdshader/highlights.scm
index c0cb2905e..334aece0f 100644
--- a/queries/gdshader/highlights.scm
+++ b/queries/gdshader/highlights.scm
@@ -19,7 +19,7 @@
   "in"
   "out"
   "inout"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "while"
diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index 590cf93b3..d4583f0ea 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -29,7 +29,7 @@
 
 "subroutine" @keyword.function
 
-(extension_storage_class) @keyword.storage
+(extension_storage_class) @keyword.modifier
 
 ((identifier) @variable.builtin
   (#lua-match? @variable.builtin "^gl_"))
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 16abeacb2..b515358e1 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -207,7 +207,7 @@
 [
   "transient"
   "volatile"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "return"
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index 336845092..a3cf8d897 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -72,7 +72,7 @@
 ] @punctuation.delimiter
 
 (lifetime
-  (identifier) @keyword.storage)
+  (identifier) @keyword.modifier)
 
 (string_literal) @string
 
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index 7e3056c14..ea48272f5 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -109,7 +109,7 @@
   "localexec"
   (unnamed_addr)
   (dll_storage_class)
-] @keyword.storage
+] @keyword.modifier
 
 (attribute_name) @attribute
 
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index d0c60af5f..50ac7a78b 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -30,7 +30,7 @@
   "@dynamic"
   "volatile"
   (protocol_qualifier)
-] @keyword.storage
+] @keyword.modifier
 
 ; Keywords
 [
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 2c3457e07..6c8a7965b 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -36,7 +36,7 @@
 [
   "distinct"
   "dynamic"
-] @keyword.storage
+] @keyword.modifier
 
 ; Conditionals
 [
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index a28fa546e..3511386ca 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -84,7 +84,7 @@
 [
   (kPacked)
   (kAbsolute)
-] @keyword.storage
+] @keyword.modifier
 
 (kUses) @keyword.import
 
diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm
index a5d75fe8a..325005928 100644
--- a/queries/pioasm/highlights.scm
+++ b/queries/pioasm/highlights.scm
@@ -75,7 +75,7 @@
   "ifempty"
 ] @keyword.conditional
 
-"public" @keyword.storage
+"public" @keyword.modifier
 
 (integer) @number
 
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 2c04347dc..7b229984f 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -282,13 +282,13 @@
   "static"
   "dyn"
   "extern"
-] @keyword.storage
+] @keyword.modifier
 
 (lifetime
   [
     "'"
     (identifier)
-  ] @keyword.storage)
+  ] @keyword.modifier)
 
 "fn" @keyword.function
 
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 3e1ee8ba7..74fde4ea9 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -203,7 +203,7 @@
   "protected"
 ] @keyword.modifier
 
-(inline_modifier) @keyword.storage
+(inline_modifier) @keyword.modifier
 
 (null_literal) @constant.builtin
 
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 13ac0e291..161b732b2 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -190,7 +190,7 @@
 (null) @constant.builtin
 
 ; Misc
-(annotation_visibility) @keyword.storage
+(annotation_visibility) @keyword.modifier
 
 (access_modifier) @keyword.modifier
 
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 20c07ce7b..9941cf905 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -179,7 +179,7 @@
   "storage"
   "calldata"
   "constant"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "for"
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index 721e84ed2..f87e5147e 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -32,7 +32,7 @@
 (alias_expression
   (identifier) @label)
 
-(storage_identifier) @keyword.storage
+(storage_identifier) @keyword.modifier
 
 (_
   function_name: (identifier) @function)
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
index e3d7f107a..f89331846 100644
--- a/queries/sourcepawn/highlights.scm
+++ b/queries/sourcepawn/highlights.scm
@@ -147,7 +147,7 @@
   name: (identifier) @function.method)
 
 ; Non-type Keywords
-(variable_storage_class) @keyword.storage
+(variable_storage_class) @keyword.modifier
 
 (visibility) @keyword.modifier
 
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 21f2605b3..bd706f879 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -95,7 +95,7 @@
   (keyword_jsonfile)
   (keyword_sequencefile)
   (keyword_volatile)
-] @keyword.storage
+] @keyword.modifier
 
 [
   (keyword_case)
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index 15879cee0..a8c37215d 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -55,7 +55,7 @@
 ] @keyword.exception
 
 ; Storageclasses
-"local" @keyword.storage
+"local" @keyword.modifier
 
 ; Qualifiers
 [
diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm
index e44882f17..d1348dc91 100644
--- a/queries/systemtap/highlights.scm
+++ b/queries/systemtap/highlights.scm
@@ -155,4 +155,4 @@
 
 "private" @keyword.modifier
 
-"global" @keyword.storage
+"global" @keyword.modifier
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 647a498a6..be038aa34 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -54,7 +54,7 @@
   "shared"
   "static"
   "const"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "pub"
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index bd046278b..b89df9432 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -229,7 +229,7 @@
   "protected"
   "public"
   "static"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "and"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 393e54519..c723dc14a 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -140,7 +140,7 @@
 
 (edge_identifier) @attribute
 
-(port_direction) @keyword.storage
+(port_direction) @keyword.modifier
 
 (port_identifier
   (simple_identifier) @variable)
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index 0d974dd2e..e5dd7b6ac 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -44,7 +44,7 @@
   "storage"
   "uniform"
   "workgroup"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "read"
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 5690a5010..9ceede3e5 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -161,7 +161,7 @@ field_constant: (IDENTIFIER) @constant
   "align"
   "callconv"
   "linksection"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "comptime"
diff --git a/tests/query/highlights/smali/baksmali_test_class.smali b/tests/query/highlights/smali/baksmali_test_class.smali
index ee3bc6ad4..1d2a4cb40 100644
--- a/tests/query/highlights/smali/baksmali_test_class.smali
+++ b/tests/query/highlights/smali/baksmali_test_class.smali
@@ -14,7 +14,7 @@
 
 
 .annotation build Lsome/annotation;
-#           ^^^^^ @keyword.storage
+#           ^^^^^ @keyword.modifier
 #                  ^^^^ @type
 #                                 ^ @punctuation.delimiter
     value1 = "test"
@@ -93,7 +93,7 @@
 
 .field public static staticFieldWithAnnotation:I
     .annotation runtime La/field/annotation;
-#               ^^^^^^^ @keyword.storage
+#               ^^^^^^^ @keyword.modifier
         this = "is"
         a = "test"
     .end annotation

From 5d75359a9ae20c492f96e6591e3a9e229d320c87 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 16 Mar 2024 14:20:55 +0900
Subject: [PATCH 1275/2704] feat(highlights)!: remove non-keyword
 `@type.qualifier`

* blueprint: Don't specially highlight template_name_qualifier. This is
  similar to inheritance base class. Other languages don't highlight
  them specially.
* eds: `@type` for all `*Type` keys
* chatito: `@attribute` for variation
---
 CONTRIBUTING.md                  |  1 -
 queries/blueprint/highlights.scm |  3 ---
 queries/chatito/highlights.scm   |  2 +-
 queries/eds/highlights.scm       | 16 +---------------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1f80341e0..b024961a9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -139,7 +139,6 @@ As languages differ quite a lot, here is a set of captures available to you when
 @type             ; type or class definitions and annotations
 @type.builtin     ; built-in types
 @type.definition  ; identifiers in type definitions (e.g. `typedef <type> <identifier>` in C)
-@type.qualifier   ; type qualifiers (e.g. `const`)
 
 @attribute          ; attribute annotations (e.g. Python decorators)
 @attribute.builtin  ; builtin annotations (e.g. `@property` in Python)
diff --git a/queries/blueprint/highlights.scm b/queries/blueprint/highlights.scm
index faefd319d..f3c39f232 100644
--- a/queries/blueprint/highlights.scm
+++ b/queries/blueprint/highlights.scm
@@ -49,9 +49,6 @@
 (menu_item
   "item" @function.macro)
 
-(template_definition
-  (template_name_qualifier) @type.qualifier)
-
 (import_statement
   (gobject_library) @module)
 
diff --git a/queries/chatito/highlights.scm b/queries/chatito/highlights.scm
index 492718320..47113f2cf 100644
--- a/queries/chatito/highlights.scm
+++ b/queries/chatito/highlights.scm
@@ -30,7 +30,7 @@
 
 (slot) @type
 
-(variation) @type.qualifier
+(variation) @attribute
 
 (alias) @keyword.directive
 
diff --git a/queries/eds/highlights.scm b/queries/eds/highlights.scm
index 5fef3ab46..0e008c979 100644
--- a/queries/eds/highlights.scm
+++ b/queries/eds/highlights.scm
@@ -27,21 +27,7 @@
   (section_name) @_name
   (statement
     (key) @_key) @type
-  (#match? @_key "\\c^ObjectType$")
-  (#not-match? @_name "\\c^Comments$"))
-
-(section
-  (section_name) @_name
-  (statement
-    (key) @_key) @type
-  (#match? @_key "\\c^DataType$")
-  (#not-match? @_name "\\c^Comments$"))
-
-(section
-  (section_name) @_name
-  (statement
-    (key) @_key) @type.qualifier
-  (#match? @_key "\\c^AccessType$")
+  (#match? @_key "\\c^(ObjectType|DataType|AccessType)$")
   (#not-match? @_name "\\c^Comments$"))
 
 (section

From 8f5513a1f2ec6ee5b378c2e32e53fc3c2a8f1e13 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 16 Mar 2024 14:39:24 +0900
Subject: [PATCH 1276/2704] feat(rust,lalrpop): `@attribute` for lifetimes

`@keyword` is only for language-defined keywords.
---
 CONTRIBUTING.md                |  2 +-
 queries/lalrpop/highlights.scm |  9 ++++++++-
 queries/rust/highlights.scm    | 12 ++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b024961a9..8e3081e82 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -140,7 +140,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 @type.builtin     ; built-in types
 @type.definition  ; identifiers in type definitions (e.g. `typedef <type> <identifier>` in C)
 
-@attribute          ; attribute annotations (e.g. Python decorators)
+@attribute          ; attribute annotations (e.g. Python decorators, Rust lifetimes)
 @attribute.builtin  ; builtin annotations (e.g. `@property` in Python)
 @property           ; the key in key/value pairs
 ```
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index a3cf8d897..951192ea8 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -72,7 +72,14 @@
 ] @punctuation.delimiter
 
 (lifetime
-  (identifier) @keyword.modifier)
+  "'" @keyword.modifier)
+
+(lifetime
+  (identifier) @attribute)
+
+(lifetime
+  (identifier) @attribute.builtin
+  (#any-of? @attribute.builtin "static" "_"))
 
 (string_literal) @string
 
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 7b229984f..64976b663 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -285,10 +285,14 @@
 ] @keyword.modifier
 
 (lifetime
-  [
-    "'"
-    (identifier)
-  ] @keyword.modifier)
+  "'" @keyword.modifier)
+
+(lifetime
+  (identifier) @attribute)
+
+(lifetime
+  (identifier) @attribute.builtin
+  (#any-of? @attribute.builtin "static" "_"))
 
 "fn" @keyword.function
 

From f5062ebc8d5c0542465c6e2432d6cd544a92f348 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 16 Mar 2024 14:41:47 +0900
Subject: [PATCH 1277/2704] feat(verilog): `@keyword.modifier` for lifetime

---
 queries/verilog/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index c723dc14a..483f194ec 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -237,7 +237,7 @@
 (net_declaration
   (simple_identifier) @type)
 
-(lifetime) @label
+(lifetime) @keyword.modifier
 
 (function_identifier
   (function_identifier

From 53891f1492498b30eea4483bfcd71266d2f1c157 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 16 Mar 2024 06:35:48 +0000
Subject: [PATCH 1278/2704] bot(lockfile): update devicetree, dtd, htmldjango,
 perl, racket, scheme, v, wing, xml

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c638eb020..6e34cdfaf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -105,7 +105,7 @@
     "revision": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"
   },
   "devicetree": {
-    "revision": "2087a5b965db2a9efabab958a27fd8ddf43038a2"
+    "revision": "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "c23bd31d0aa72bfc01238b2546d5e823d8006709"
+    "revision": "29485b6587cacb99555c19ca53bea78b9e54ffd4"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -297,7 +297,7 @@
     "revision": "b285e25c1ba8729399ce4f15ac5375cf6c3aa5be"
   },
   "htmldjango": {
-    "revision": "8873e3df89f9ea1d33f6235e516b600009288557"
+    "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
     "revision": "6824a247d1326079aab4fa9f9164e9319678081d"
@@ -474,7 +474,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "6526e5d5bf31501de0dc51c42ac3583078a8fdab"
+    "revision": "fd7b2fe5b967d5eee8ce17938052886e2d5987ed"
   },
   "php": {
     "revision": "ad414fa5497328e96ef992d80896f19c77584f7c"
@@ -552,7 +552,7 @@
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
-    "revision": "b5a2fe74cac87dc5342b366f50db71d421e7cf8f"
+    "revision": "d9858a0f607578814f2d34662ad4bc21aa37a455"
   },
   "rasi": {
     "revision": "43196d934a9a6ab3c7093a8683efd0111bb03db1"
@@ -600,7 +600,7 @@
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
   },
   "scheme": {
-    "revision": "6c77a5bcfb9baceeaa79ef67354b2d501b37b085"
+    "revision": "184e7596ee0cbaef79230cae1b4ee5bb4fbad314"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -747,7 +747,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "be121f724e4f3e2159dfa193c876be605c1de7fa"
+    "revision": "0cf2108de92d043a684a963199d772899486089b"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -774,13 +774,13 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "07f6740ab9f4f74c49413b9056154cac51f4b2d7"
+    "revision": "d9beaf168149dff81314631f6def484869a63e2e"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "c23bd31d0aa72bfc01238b2546d5e823d8006709"
+    "revision": "29485b6587cacb99555c19ca53bea78b9e54ffd4"
   },
   "yaml": {
     "revision": "9e59b9bbf839ba231fbcb953617d8b9b9a059e38"

From 5b8458c5aa533803febabe31c018030826f86ac7 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 16 Mar 2024 16:28:31 +0200
Subject: [PATCH 1279/2704] fix(htmldjango): update highlights

---
 queries/htmldjango/highlights.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index 5bbc4211b..a411e8f15 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -12,10 +12,13 @@
   (end_paired_statement)
 ] @punctuation.bracket
 
-[
-  "end"
-  (tag_name)
-] @function
+(tag_name) @function
+
+((tag_name) @keyword.conditional
+  (#any-of? @keyword.conditional "if" "elif" "else" "endif"))
+
+((tag_name) @keyword.repeat
+  (#any-of? @keyword.repeat "for" "endfor"))
 
 (variable_name) @variable
 

From 3c7a0e9d949d3968bc3f95743f7d2c8c4666048c Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 16 Mar 2024 17:36:53 -0700
Subject: [PATCH 1280/2704] feat(rust): move pub to `@keyword.modifier`

Also consolidates most of the captures
---
 queries/rust/highlights.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 64976b663..332ee12fa 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -256,7 +256,6 @@
   "impl"
   "let"
   "move"
-  "pub"
   "struct"
   "trait"
   "type"
@@ -274,10 +273,8 @@
 
 [
   "ref"
+  "pub"
   (mutable_specifier)
-] @keyword.modifier
-
-[
   "const"
   "static"
   "dyn"

From df3e6a24ac500043012f20027555cdbaa41f1f6d Mon Sep 17 00:00:00 2001
From: Luckas <luckasranarison@gmail.com>
Date: Sat, 16 Mar 2024 16:26:52 +0300
Subject: [PATCH 1281/2704] feat(hyprlang): add bash injections

---
 queries/hyprlang/injections.scm | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 queries/hyprlang/injections.scm

diff --git a/queries/hyprlang/injections.scm b/queries/hyprlang/injections.scm
new file mode 100644
index 000000000..1f0199ed8
--- /dev/null
+++ b/queries/hyprlang/injections.scm
@@ -0,0 +1,3 @@
+(exec
+  (string) @injection.content
+  (#set! injection.language "bash"))

From 143ca5ce17ae21233101246b5785b90d53aa8329 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Sat, 16 Mar 2024 19:50:13 -0500
Subject: [PATCH 1282/2704] feat(php): improve indents in return statements &
 chained methods

---
 queries/php_only/indents.scm    | 22 +++++++++++
 tests/indent/php/issue-4848.php | 66 +++++++++++++++++++++++++++++++++
 tests/indent/php_spec.lua       | 38 +++++++++++++++++++
 3 files changed, 126 insertions(+)
 create mode 100644 tests/indent/php/issue-4848.php

diff --git a/queries/php_only/indents.scm b/queries/php_only/indents.scm
index a81faed62..9ee04e770 100644
--- a/queries/php_only/indents.scm
+++ b/queries/php_only/indents.scm
@@ -1,7 +1,9 @@
 [
   (array_creation_expression)
+  (parenthesized_expression)
   (compound_statement)
   (declaration_list)
+  (member_call_expression)
   (binary_expression)
   (return_statement)
   (arguments)
@@ -12,6 +14,17 @@
   (case_statement)
 ] @indent.begin
 
+(return_statement
+  [
+    (object_creation_expression)
+    (anonymous_function_creation_expression)
+    (arrow_function)
+    (match_expression)
+  ]) @indent.dedent
+
+(member_call_expression
+  object: (member_call_expression) @indent.branch)
+
 [
   ")"
   "}"
@@ -20,9 +33,18 @@
 
 (comment) @indent.auto
 
+(arguments
+  ")" @indent.end)
+
+(formal_parameters
+  ")" @indent.end)
+
 (compound_statement
   "}" @indent.end)
 
+(return_statement
+  ";" @indent.end)
+
 (ERROR
   "(" @indent.align
   .
diff --git a/tests/indent/php/issue-4848.php b/tests/indent/php/issue-4848.php
new file mode 100644
index 000000000..8d112ea14
--- /dev/null
+++ b/tests/indent/php/issue-4848.php
@@ -0,0 +1,66 @@
+<?php
+
+if (
+) {
+}
+
+return (
+);
+
+return true
+    ;
+
+return fn () => (
+);
+
+return fn (
+) => (
+);
+
+return function (
+) {
+};
+
+return function () {
+};
+
+return match (
+) {
+};
+
+return match () {
+};
+
+return new class
+{
+    public function up()
+    {
+    }
+
+    public function down(
+    ) {
+    }
+};
+
+$this->foo()
+    ->bar(
+    )
+    ->baz();
+
+$this->get()
+    ->each(function () {
+    })
+    ->each(
+        function (
+        ) {
+        },
+    );
+
+return $this->get()
+    ->each(function () {
+    })
+    ->each(
+        function (
+        ) {
+        },
+    );
diff --git a/tests/indent/php_spec.lua b/tests/indent/php_spec.lua
index f7067501e..3fc681c29 100644
--- a/tests/indent/php_spec.lua
+++ b/tests/indent/php_spec.lua
@@ -24,5 +24,43 @@ describe("indent PHP:", function()
     run:new_line("unfinished-call.php", { on_line = 6, text = "$a =", indent = 4 })
     run:new_line("issue-3591.php", { on_line = 4, text = "$a =", indent = 8 })
     run:new_line("enum-indent.php", { on_line = 4, text = "case", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 3, text = "true", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 4, text = "return;", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 7, text = "true", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 10, text = "|| false", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 11, text = "$a = 0;", indent = 0 })
+    run:new_line("issue-4848.php", { on_line = 13, text = "true", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 16, text = "$a,", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 17, text = "true", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 20, text = "$a,", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 21, text = "return $a;", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 24, text = "return;", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 27, text = "true", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 28, text = "true => null,", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 31, text = "true => null,", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 35, text = "function a() {}", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 37, text = "return;", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 40, text = "$a,", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 41, text = "return $a;", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 45, text = "->foo()", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 46, text = "$a,", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 47, text = "->foo()", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 48, text = "$a;", indent = 0 })
+    run:new_line("issue-4848.php", { on_line = 50, text = "->foo()", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 51, text = "return $a;", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 52, text = "->foo()", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 53, text = "$a,", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 54, text = "$a,", indent = 12 })
+    run:new_line("issue-4848.php", { on_line = 55, text = "return $a;", indent = 12 })
+    run:new_line("issue-4848.php", { on_line = 56, text = "$a,", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 57, text = "$a;", indent = 0 })
+    run:new_line("issue-4848.php", { on_line = 59, text = "->foo()", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 60, text = "return $a;", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 61, text = "->foo()", indent = 4 })
+    run:new_line("issue-4848.php", { on_line = 62, text = "$a,", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 63, text = "$a,", indent = 12 })
+    run:new_line("issue-4848.php", { on_line = 64, text = "return $a;", indent = 12 })
+    run:new_line("issue-4848.php", { on_line = 65, text = "$a,", indent = 8 })
+    run:new_line("issue-4848.php", { on_line = 66, text = "$a;", indent = 0 })
   end)
 end)

From bb3dd60ebcf6f75f73f39c44724b4a426ece6b7b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 17 Mar 2024 06:36:20 +0000
Subject: [PATCH 1283/2704] bot(lockfile): update c_sharp, glimmer, hyprlang,
 meson, mlir, ocaml, ocaml_interface, swift, v

adapt to ocaml grammar location change
---
 lockfile.json                   | 18 +++++++++---------
 lua/nvim-treesitter/parsers.lua |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6e34cdfaf..0023e9583 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "371fd0bf0650581b6e49f06f438c88c419859696"
   },
   "c_sharp": {
-    "revision": "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"
+    "revision": "92c0a9431400cd8b6b6ee7503f81da3ae83fc830"
   },
   "cairo": {
     "revision": "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"
@@ -216,7 +216,7 @@
     "revision": "2012f294baacf30e7a62414754021284377366c6"
   },
   "glimmer": {
-    "revision": "f9746dc1d0707717fbba84cb5c22a71586af23e1"
+    "revision": "5dc6d1040e8ff8978ff3680e818d85447bbc10aa"
   },
   "glsl": {
     "revision": "284bed0e2f1d9f700756b96512baf33483642ff0"
@@ -306,7 +306,7 @@
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
   },
   "hyprlang": {
-    "revision": "fc1d331586e4da2b5f5bcfa89d630ebafe66458b"
+    "revision": "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -411,10 +411,10 @@
     "revision": "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98"
   },
   "meson": {
-    "revision": "d6ec8ce0963c3c8180161391f15d8f7d415f650d"
+    "revision": "3ebd060b1a2eec450ff46b73428c63f9148a07ff"
   },
   "mlir": {
-    "revision": "992c756686eb968af752ce75a874591042a8e24c"
+    "revision": "c8629729bebfa23023c2d7a14ed1a7eec3042a1a"
   },
   "muttrc": {
     "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
@@ -450,10 +450,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "712d9bfa1d537c5899dde5538767ed2d8bb37a93"
+    "revision": "d33ad2685500008cb89a93714e2f867dd8af8fe3"
   },
   "ocaml_interface": {
-    "revision": "712d9bfa1d537c5899dde5538767ed2d8bb37a93"
+    "revision": "d33ad2685500008cb89a93714e2f867dd8af8fe3"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "78a736d77094b0b3c35e811e6765c4d38a72724e"
+    "revision": "071b7cc9a4a4e978c08069fcc6c61f811730395c"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -747,7 +747,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "0cf2108de92d043a684a963199d772899486089b"
+    "revision": "59d104a4f3a860c71bdd93f6c897a2139b0f369b"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a365e219c..53d1b7d96 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1339,7 +1339,7 @@ list.ocaml = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-ocaml",
     files = { "src/parser.c", "src/scanner.c" },
-    location = "ocaml",
+    location = "grammars/ocaml",
   },
   maintainers = { "@undu" },
 }
@@ -1348,7 +1348,7 @@ list.ocaml_interface = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-ocaml",
     files = { "src/parser.c", "src/scanner.c" },
-    location = "interface",
+    location = "grammars/interface",
   },
   filetype = "ocamlinterface",
   maintainers = { "@undu" },

From c4e0f290d744ceede4ec0c464a5f985e821b1502 Mon Sep 17 00:00:00 2001
From: NTBBloodbath <bloodbathalchemist@protonmail.com>
Date: Sun, 17 Mar 2024 07:27:42 -0400
Subject: [PATCH 1284/2704] feat(http): switch to new parser version

fix(http): use `@variable.member` for fields

fix(http): keep the comment injection

fix(http): keep `method` capture as `@function.method`

docs(README.md): update HTTP parser maintainers list

feat(http): remove redundant captures

cleanup(http): remove unneedeed highlighting captures
---
 README.md                       |  2 +-
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua |  3 +--
 queries/http/highlights.scm     | 31 ++++++++++++++++++++++++-------
 queries/http/injections.scm     | 10 ++++++++--
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 23020bc39..496a9a82b 100644
--- a/README.md
+++ b/README.md
@@ -273,7 +273,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [hoon](https://github.com/urbit-pilled/tree-sitter-hoon) (experimental, maintained by @urbit-pilled)
 - [x] [html](https://github.com/tree-sitter/tree-sitter-html) (maintained by @TravonteD)
 - [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
-- [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq)
+- [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq, @NTBBloodbath)
 - [x] [hurl](https://github.com/pfeiferj/tree-sitter-hurl) (maintained by @pfeiferj)
 - [x] [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) (maintained by @luckasRanarison)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
diff --git a/lockfile.json b/lockfile.json
index 0023e9583..aaeef174e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -300,7 +300,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "6824a247d1326079aab4fa9f9164e9319678081d"
+    "revision": "e1c1085f1b36a19e82892cc1fc912cc9c968bb26"
   },
   "hurl": {
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 53d1b7d96..1d587cdfa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -912,9 +912,8 @@ list.http = {
   install_info = {
     url = "https://github.com/rest-nvim/tree-sitter-http",
     files = { "src/parser.c" },
-    generate_requires_npm = true,
   },
-  maintainers = { "@amaanq" },
+  maintainers = { "@amaanq", "@NTBBloodbath" },
 }
 
 list.hurl = {
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index a9c4dc079..8d9d0e640 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -1,5 +1,5 @@
-; Schemes
-(scheme) @type
+; Keywords
+(scheme) @module
 
 ; Methods
 (method) @function.method
@@ -7,13 +7,24 @@
 ; Constants
 (const_spec) @constant
 
+; Headers
+(header
+  name: (name) @constant)
+
 ; Variables
-(identifier) @variable
+(variable_declaration
+  name: (identifier) @variable)
 
 ; Fields
 (pair
   name: (identifier) @variable.member)
 
+; URL / Host
+(host) @string.special.url
+
+(path
+  (identifier) @string.special.url)
+
 ; Parameters
 (query_param
   (key) @variable.parameter)
@@ -24,17 +35,19 @@
   "?"
   "&"
   "@"
+  "<"
 ] @operator
 
 ; Literals
-(string) @string
-
 (target_url) @string.special.url
 
+(http_version) @constant
+
+(string) @string
+
 (number) @number
 
-; (boolean) @boolean
-(null) @constant.builtin
+(boolean) @boolean
 
 ; Punctuation
 [
@@ -44,5 +57,9 @@
 
 ":" @punctuation.delimiter
 
+; external JSON body
+(external_body
+  file_path: (path) @string.special.path)
+
 ; Comments
 (comment) @comment @spell
diff --git a/queries/http/injections.scm b/queries/http/injections.scm
index a0cc1b4e9..68268afcb 100644
--- a/queries/http/injections.scm
+++ b/queries/http/injections.scm
@@ -1,11 +1,17 @@
+; Comments
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
+; Body
 ((json_body) @injection.content
   (#set! injection.language "json"))
 
 ((xml_body) @injection.content
   (#set! injection.language "xml"))
 
-; ((graphql_body) @injection.content
-;  (#set! injection.language "graphql")) ; Not used as of now..
+((graphql_body) @injection.content
+  (#set! injection.language "graphql"))
+
+; Lua scripting
+((script_variable) @injection.content
+  (#set! injection.language "lua"))

From 6a2572c9ed0342ae9e1012b9c8a774a1ea009e71 Mon Sep 17 00:00:00 2001
From: gi1242 <gi1242+nvim-treesitter@gmail.com>
Date: Sat, 16 Mar 2024 20:00:09 -0400
Subject: [PATCH 1285/2704] fix(latex): Fold \iffalse..\fi comments

---
 queries/latex/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/latex/folds.scm b/queries/latex/folds.scm
index f00289493..1ee7946b8 100644
--- a/queries/latex/folds.scm
+++ b/queries/latex/folds.scm
@@ -9,5 +9,6 @@
   (generic_environment)
   (math_environment)
   (comment_environment)
+  (block_comment)
   (displayed_equation)
 ] @fold

From e6d80e5efdbec343c4ff30d627cee129e545b878 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 06:36:52 +0000
Subject: [PATCH 1286/2704] bot(lockfile): update arduino, cmake, dtd, http,
 mlir, ocaml, ocaml_interface, slint, swift, vimdoc, wing, xml

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index aaeef174e..4636d756b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "e3a0a7f60e544afc478b72cdda7ffc0f2f889db0"
+    "revision": "94219a5ac207a0fadd680b285378d08669d5bbc8"
   },
   "asm": {
     "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
@@ -66,7 +66,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "7dc15823107831729c64a917c796a93cf5c6a7e3"
+    "revision": "ce71cae5e022f0fa9031f067673d139d8e9dd63e"
   },
   "comment": {
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
@@ -126,7 +126,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "29485b6587cacb99555c19ca53bea78b9e54ffd4"
+    "revision": "ab85469fedbf4f32da9310dd76dcedba059fc482"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -300,7 +300,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "e1c1085f1b36a19e82892cc1fc912cc9c968bb26"
+    "revision": "c98247ff34ae690629c4754add1d6daecfcd9388"
   },
   "hurl": {
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
@@ -414,7 +414,7 @@
     "revision": "3ebd060b1a2eec450ff46b73428c63f9148a07ff"
   },
   "mlir": {
-    "revision": "c8629729bebfa23023c2d7a14ed1a7eec3042a1a"
+    "revision": "3da76a44a6a5db05aef03966a2045c7c73571d77"
   },
   "muttrc": {
     "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
@@ -450,10 +450,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "d33ad2685500008cb89a93714e2f867dd8af8fe3"
+    "revision": "dabe60a96553fbbda0a58b6ccda12b7d44047cb5"
   },
   "ocaml_interface": {
-    "revision": "d33ad2685500008cb89a93714e2f867dd8af8fe3"
+    "revision": "dabe60a96553fbbda0a58b6ccda12b7d44047cb5"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -609,7 +609,7 @@
     "revision": "0cdfb1741323f38e9a33798674145c22cfc0092b"
   },
   "slint": {
-    "revision": "f5fa844d2adbcfdc7a0ec4daae4539887959d9ff"
+    "revision": "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"
   },
   "smali": {
     "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
@@ -663,7 +663,7 @@
     "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
   },
   "swift": {
-    "revision": "071b7cc9a4a4e978c08069fcc6c61f811730395c"
+    "revision": "a8cf05cd49b3b97d70a03fd65c9c279fc76662f7"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -762,7 +762,7 @@
     "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
   },
   "vimdoc": {
-    "revision": "f431bfa7d433f4d629943147817193a4fccbd303"
+    "revision": "cee98887944bfe979c95386785ae388d8ecb3715"
   },
   "vue": {
     "revision": "3b9d52087100bdfce43dad2ca46d75b0e21613f6"
@@ -774,13 +774,13 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "d9beaf168149dff81314631f6def484869a63e2e"
+    "revision": "8f3d8031b47ee95b9d1ca1e1562c4da74b1d3e2d"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "29485b6587cacb99555c19ca53bea78b9e54ffd4"
+    "revision": "ab85469fedbf4f32da9310dd76dcedba059fc482"
   },
   "yaml": {
     "revision": "9e59b9bbf839ba231fbcb953617d8b9b9a059e38"

From 2014f8285e306f4c8a896c7d3af53fdd599e5a4f Mon Sep 17 00:00:00 2001
From: Matthew Taylor <wrapperup4@gmail.com>
Date: Mon, 18 Mar 2024 05:00:22 -0400
Subject: [PATCH 1287/2704] feat: add vento support (#6261)

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  9 +++++++++
 queries/vento/highlights.scm    | 13 +++++++++++++
 queries/vento/injections.scm    |  9 +++++++++
 5 files changed, 35 insertions(+)
 create mode 100644 queries/vento/highlights.scm
 create mode 100644 queries/vento/injections.scm

diff --git a/README.md b/README.md
index 496a9a82b..0dc48866b 100644
--- a/README.md
+++ b/README.md
@@ -424,6 +424,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [uxn tal](https://github.com/amaanq/tree-sitter-uxntal) (maintained by @amaanq)
 - [x] [v](https://github.com/vlang/v-analyzer) (maintained by @kkharji, @amaanq)
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
+- [x] [vento](https://github.com/ventojs/tree-sitter-vento) (maintained by @wrapperup, @oscarotero)
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
 - [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
diff --git a/lockfile.json b/lockfile.json
index 4636d756b..9fbe30bd1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -752,6 +752,9 @@
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
   },
+  "vento": {
+    "revision": "c1eb14b130c37267be7c6bb38ce949c3077dd4b3"
+  },
   "verilog": {
     "revision": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1d587cdfa..c7010e10c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2183,6 +2183,15 @@ list.vala = {
   maintainers = { "@Prince781" },
 }
 
+list.vento = {
+  install_info = {
+    url = "https://github.com/ventojs/tree-sitter-vento",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  filetype = "vto",
+  maintainers = { "@wrapperup", "@oscarotero" },
+}
+
 list.verilog = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-verilog",
diff --git a/queries/vento/highlights.scm b/queries/vento/highlights.scm
new file mode 100644
index 000000000..9d35b2f66
--- /dev/null
+++ b/queries/vento/highlights.scm
@@ -0,0 +1,13 @@
+(comment) @comment @spell
+
+(keyword) @keyword
+
+(tag
+  [
+    "{{"
+    "{{-"
+    "}}"
+    "-}}"
+  ] @punctuation.special)
+
+"|>" @operator
diff --git a/queries/vento/injections.scm b/queries/vento/injections.scm
new file mode 100644
index 000000000..66023c7f8
--- /dev/null
+++ b/queries/vento/injections.scm
@@ -0,0 +1,9 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((content) @injection.content
+  (#set! injection.language "html")
+  (#set! injection.combined))
+
+((code) @injection.content
+  (#set! injection.language "javascript"))

From 567a76780cd4f982dae1ec57e3dad6174bef3680 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 06:34:34 +0000
Subject: [PATCH 1288/2704] bot(lockfile): update asm, erlang, gleam, html,
 http, v, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9fbe30bd1..d20279eec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "94219a5ac207a0fadd680b285378d08669d5bbc8"
   },
   "asm": {
-    "revision": "6ace266be7ad6bf486a95427ca3fc949aff66211"
+    "revision": "f4032c9dbcc10dfbf9b302b2a449148483293593"
   },
   "astro": {
     "revision": "dfa0893bdc4bdfada102043404758c66e3580568"
@@ -153,7 +153,7 @@
     "revision": "6d791b897ecda59baa0689a85a9906348a2a6414"
   },
   "erlang": {
-    "revision": "54b6f814f43c4eac81eeedefaa7cc8762fec6683"
+    "revision": "20ce5a9234c7248b3f91c5b0b028f1760b954dde"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -213,7 +213,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "2012f294baacf30e7a62414754021284377366c6"
+    "revision": "bcf9c45b56cbe46e9dac5eee0aee75df270000ac"
   },
   "glimmer": {
     "revision": "5dc6d1040e8ff8978ff3680e818d85447bbc10aa"
@@ -294,13 +294,13 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "b285e25c1ba8729399ce4f15ac5375cf6c3aa5be"
+    "revision": "4e5f3345f74cda667ee8dd94b17184a592ce0374"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "c98247ff34ae690629c4754add1d6daecfcd9388"
+    "revision": "86ad05ac2de3c63c69f65e58f0182a76c1658d1e"
   },
   "hurl": {
     "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
@@ -747,7 +747,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "59d104a4f3a860c71bdd93f6c897a2139b0f369b"
+    "revision": "46f809776e90ef6f039c8a45008644822dc292e2"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -777,7 +777,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "8f3d8031b47ee95b9d1ca1e1562c4da74b1d3e2d"
+    "revision": "ed54e0cd92ba1b9325e1e96f39c4b8babfbe9fa5"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 03f650705c0c10f97b214ca4ecca3c25ff9bee7d Mon Sep 17 00:00:00 2001
From: Noah <noah.bogart@hey.com>
Date: Tue, 19 Mar 2024 17:10:41 -0400
Subject: [PATCH 1289/2704] Update Clojure highlights to be metadata aware
 (#6213)

---
 queries/clojure/highlights.scm          | 59 ++++++++++++---------
 tests/query/highlights/clojure/test.clj | 70 +++++++++++++++++++++++--
 2 files changed, 99 insertions(+), 30 deletions(-)

diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index feb3dc62d..62e59ae58 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -77,7 +77,10 @@
 
 ; Inline function variables
 ((sym_lit) @variable.builtin
-  (#lua-match? @variable.builtin "^%%"))
+  (#lua-match? @variable.builtin "^%%%d*$"))
+
+((sym_lit) @variable.builtin
+  (#eq? @variable.builtin "%&"))
 
 ; Constructor
 ((sym_lit) @constructor
@@ -98,39 +101,39 @@
 ((sym_lit) @variable.builtin
   (#any-of? @variable.builtin "*1" "*2" "*3" "*e"))
 
-; Gensym
-; Might not be needed
-((sym_lit) @variable
-  (#lua-match? @variable "^.*#$"))
-
 ; Types
-; TODO: improve?
-((sym_lit) @type
-  (#lua-match? @type "^[%u][^/]*$"))
+(sym_lit
+  name: (sym_name) @_name
+  (#lua-match? @_name "^[%u][^/%s]*$")) @type
 
 ; Symbols with `.` but not `/`
-((sym_lit) @type
-  (#lua-match? @type "^[^/]+[.][^/]*$"))
+(sym_lit
+  !namespace
+  name: (sym_name) @_name
+  (#lua-match? @_name "^[^.]+[.]")) @type
 
 ; Interop
 ; (.instanceMember instance args*)
 ; (.instanceMember Classname args*)
-((sym_lit) @function.method
-  (#lua-match? @function.method "^%.[^-]"))
+((sym_lit
+  name: (sym_name) @_name) @function.method
+  (#lua-match? @_name "^%.[^-]"))
 
 ; (.-instanceField instance)
-((sym_lit) @variable.member
-  (#lua-match? @variable.member "^%.%-.*"))
+((sym_name) @variable.member
+  (#lua-match? @variable.member "^%.%-%S*"))
 
 ;  Classname/staticField
-((sym_lit) @variable.member
-  (#lua-match? @variable.member "^[%u].*/.+"))
+(sym_lit
+  namespace: (sym_ns) @_namespace
+  (#lua-match? @_namespace "^[%u]%S*$")) @variable.member
 
 ; (Classname/staticMethod args*)
 (list_lit
   .
-  (sym_lit) @function.method
-  (#lua-match? @function.method "^[%u].*/.+"))
+  (sym_lit
+    namespace: (sym_ns) @_namespace
+    (#lua-match? @_namespace "^%u")) @function.method)
 
 ; TODO: Special casing for the `.` macro
 ; Operators
@@ -154,12 +157,13 @@
     "alts!" "alts!!" "await" "await-for" "await1" "chan" "close!" "future" "go" "sync" "thread"
     "timeout" "<!" "<!!" ">!" ">!!"))
 
-((sym_lit) @keyword.function
-  (#any-of? @keyword.function "defn" "defn-" "fn" "fn*"))
+((sym_lit
+  name: (sym_name) @_keyword.function.name) @keyword.function
+  (#any-of? @_keyword.function.name "defn" "defn-" "fn" "fn*"))
 
 ; Comment
 ((sym_lit) @comment
-  (#any-of? @comment "comment"))
+  (#eq? @comment "comment"))
 
 ; Conditionals
 ((sym_lit) @keyword.conditional
@@ -185,7 +189,8 @@
 
 ; Builtin macros
 ; TODO: Do all these items belong here?
-((sym_lit) @function.macro
+((sym_lit
+  name: (sym_name) @function.macro)
   (#any-of? @function.macro
     "." ".." "->" "->>" "amap" "areduce" "as->" "assert" "binding" "bound-fn" "delay" "do" "dosync"
     "doto" "extend-protocol" "extend-type" "gen-class" "gen-interface" "io!" "lazy-cat" "lazy-seq"
@@ -200,7 +205,8 @@
 ;      sort
 ;      clojure.pprint/pprint))
 ; ...and then lots of manual filtering...
-((sym_lit) @function.builtin
+((sym_lit
+  name: (sym_name) @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"
@@ -299,8 +305,9 @@
 ; Function definitions
 (list_lit
   .
-  (sym_lit) @_keyword.function
-  (#any-of? @_keyword.function "fn" "fn*" "defn" "defn-")
+  ((sym_lit
+    name: (sym_name) @_keyword.function.name)
+    (#any-of? @_keyword.function.name "defn" "defn-" "fn" "fn*"))
   .
   (sym_lit)? @function
   .
diff --git a/tests/query/highlights/clojure/test.clj b/tests/query/highlights/clojure/test.clj
index 5c9ca649b..7401019e8 100644
--- a/tests/query/highlights/clojure/test.clj
+++ b/tests/query/highlights/clojure/test.clj
@@ -13,10 +13,14 @@
 ;^^^^ @function.call
 ;     ^^^ @variable
 
- #(+ % %1 %&)
+ #(+ % %1 %& %a)
 ;^ @punctuation.special
 ;  ^ @function.call
 ;    ^ ^^ ^^ @variable.builtin
+;            ^^ @variable
+
+ abc#
+;^^^^ @variable
 
  &
 ;^ @variable.parameter
@@ -30,13 +34,16 @@
  *1 *2 *3 *e
 ;^^ ^^ ^^ ^^ @variable.builtin
 
-(.method)
+ .method
 ;^^^^^^^ @function.method
 
-(.-field)
+(.method foo)
+;^^^^^^^ @function.method
+
+(.-field foo)
 ;^^^^^^^ @variable.member
 
- Abc/method
+ Abc/member
 ;^^^^^^^^^^ @variable.member
 
 (Abc/method)
@@ -50,3 +57,58 @@
 
  ^abc
 ;^ @punctuation.special
+
+^java.io.File file
+; <- @punctuation.special
+;^^^^^^^^^^^^ @type
+;             ^^^^ @variable
+
+^java.io.File java.io.File.
+; <- @punctuation.special
+;^^^^^^^^^^^^ @type
+;             ^^^^ @variable
+
+^java.io.File file.
+; <- @punctuation.special
+;^^^^^^^^^^^^ @type
+;             ^^^^ @variable
+
+(^java.io.File file)
+;^ @punctuation.special
+; ^^^^^^^^^^^^ @type
+;              ^^^^ @function.call
+
+(^java.io.File .file foo)
+;^ @punctuation.special
+; ^^^^^^^^^^^^ @type
+;              ^^^^ @function.method
+;                    ^^^@variable
+
+(^java.io.File .-file foo)
+;^ @punctuation.special
+; ^^^^^^^^^^^^ @type
+;              ^^^^ @variable.member
+;                     ^^^@variable
+
+(^java.io.File Abc/method foo)
+;^ @punctuation.special
+; ^^^^^^^^^^^^ @type
+;              ^^^^^^^^^^ @function.method
+;                         ^^^ @variable
+
+ (defn foo [arg1] (+ arg1 1))
+;^         ^    ^ ^        ^^ @punctuation.bracket
+; ^^^^ @keyword.function
+;      ^^^ @function
+;           ^^^^     ^^^^ @variable
+;                  ^ @operator
+;                         ^ @number
+
+ clojure.core/dfn
+;^^^^^^^^^^^^^^^^ @variable
+
+ clojure.core/defn
+;^^^^^^^^^^^^^^^^ @keyword.function
+
+ any-ns/defn
+;^^^^^^^^^^^ @keyword.function

From 5c1830262b08d4cf43f83224a1aac105cfc57933 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 06:36:29 +0000
Subject: [PATCH 1290/2704] bot(lockfile): update asm, cmake, glimmer, php,
 php_only, typst, vimdoc, wing

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d20279eec..c2147b9af 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "94219a5ac207a0fadd680b285378d08669d5bbc8"
   },
   "asm": {
-    "revision": "f4032c9dbcc10dfbf9b302b2a449148483293593"
+    "revision": "f7158e1c22bdb4bf2c3e139c0ec3050d142cde6d"
   },
   "astro": {
     "revision": "dfa0893bdc4bdfada102043404758c66e3580568"
@@ -66,7 +66,7 @@
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
   },
   "cmake": {
-    "revision": "ce71cae5e022f0fa9031f067673d139d8e9dd63e"
+    "revision": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"
   },
   "comment": {
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
@@ -216,7 +216,7 @@
     "revision": "bcf9c45b56cbe46e9dac5eee0aee75df270000ac"
   },
   "glimmer": {
-    "revision": "5dc6d1040e8ff8978ff3680e818d85447bbc10aa"
+    "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
     "revision": "284bed0e2f1d9f700756b96512baf33483642ff0"
@@ -477,10 +477,10 @@
     "revision": "fd7b2fe5b967d5eee8ce17938052886e2d5987ed"
   },
   "php": {
-    "revision": "ad414fa5497328e96ef992d80896f19c77584f7c"
+    "revision": "b1eb65e04cf31a5df611fea139ad54d611599dc4"
   },
   "php_only": {
-    "revision": "ad414fa5497328e96ef992d80896f19c77584f7c"
+    "revision": "b1eb65e04cf31a5df611fea139ad54d611599dc4"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -729,7 +729,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "3c3e5f8e0caeba6157e26a1bedf8321e1da62799"
+    "revision": "f457c77edffd4b93190794355ff5acf7acfb99c6"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
@@ -765,7 +765,7 @@
     "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
   },
   "vimdoc": {
-    "revision": "cee98887944bfe979c95386785ae388d8ecb3715"
+    "revision": "66f4fee37b07cff0dd3400089eebccd02e61e5c2"
   },
   "vue": {
     "revision": "3b9d52087100bdfce43dad2ca46d75b0e21613f6"
@@ -777,7 +777,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "ed54e0cd92ba1b9325e1e96f39c4b8babfbe9fa5"
+    "revision": "9a77bb6c1f4d65a9e8cd19585361b9a0786d5565"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 19b726f9ceb5c91199baf4255e67b1b7ce74204e Mon Sep 17 00:00:00 2001
From: TLW <58749948+TinyLittleWheatley@users.noreply.github.com>
Date: Wed, 20 Mar 2024 11:23:05 +0330
Subject: [PATCH 1291/2704] feat(install): add blob filter to git clone command
 (#6325)

---
 lua/nvim-treesitter/shell_command_selectors.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 0479956f1..03425c117 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -297,6 +297,7 @@ function M.select_download_commands(repo, project_name, cache_folder, revision,
             "clone",
             repo.url,
             project_name,
+            "--filter=blob:none",
           },
           cwd = cache_folder,
         },

From 93a9632b63c1a6878551b37688e0884c04178525 Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Fri, 15 Mar 2024 18:44:02 -0700
Subject: [PATCH 1292/2704] feat(sql): highlight fields in column definition

---
 queries/sql/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index bd706f879..83d4bf9b2 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -21,6 +21,9 @@
 (field
   name: (identifier) @variable.member)
 
+(column_definition
+  name: (identifier) @variable.member)
+
 (term
   alias: (identifier) @variable)
 

From 36860295919fb18e57cd637b2a5f22e16f750c2f Mon Sep 17 00:00:00 2001
From: Levi <35459268+LeviOP@users.noreply.github.com>
Date: Wed, 20 Mar 2024 10:00:44 -0500
Subject: [PATCH 1293/2704] fix(graphql): end indent after block

---
 queries/graphql/indents.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/graphql/indents.scm b/queries/graphql/indents.scm
index df47aff88..fcffeb822 100644
--- a/queries/graphql/indents.scm
+++ b/queries/graphql/indents.scm
@@ -7,3 +7,5 @@
   "{"
   "}"
 ] @indent.branch
+
+"}" @indent.end

From 4d76587eeca434a47f460fb7f1c900de49400688 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 20 Mar 2024 17:12:26 -0400
Subject: [PATCH 1294/2704] fix(rust): dedent on macro definition end

---
 queries/rust/indents.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index 891d36ad8..ac16a2e75 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -30,10 +30,21 @@
 (ERROR
   .
   "macro_rules!"
-  "(" @indent.begin
+  [
+    "("
+    "{"
+    "["
+  ] @indent.begin
   (#set! indent.immediate)
   (#set! indent.start_at_same_line))
 
+(macro_definition
+  [
+    ")"
+    "}"
+    "]"
+  ] @indent.end)
+
 (trait_item
   body: (_) @indent.begin)
 

From f60b33c1e5d30b5ffb95b82838257fd5b6cb6fb0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 06:38:30 +0000
Subject: [PATCH 1295/2704] bot(lockfile): update asm, c, d, html, svelte, v,
 wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c2147b9af..386ee5678 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "94219a5ac207a0fadd680b285378d08669d5bbc8"
   },
   "asm": {
-    "revision": "f7158e1c22bdb4bf2c3e139c0ec3050d142cde6d"
+    "revision": "62e49328113ff318128c640bf0cf6dd3d3d51553"
   },
   "astro": {
     "revision": "dfa0893bdc4bdfada102043404758c66e3580568"
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "371fd0bf0650581b6e49f06f438c88c419859696"
+    "revision": "72084f447c2051e01a7cd6c6e0477ec71a9297ed"
   },
   "c_sharp": {
     "revision": "92c0a9431400cd8b6b6ee7503f81da3ae83fc830"
@@ -99,7 +99,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "a33d400f025d6bbd37b4c681c93054976f579890"
+    "revision": "322d119d50ebe6d0a323dfb00c4aeba31a44fb6f"
   },
   "dart": {
     "revision": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"
@@ -294,7 +294,7 @@
     "revision": "0135187126370cbf112d759a50eab4a5c913a827"
   },
   "html": {
-    "revision": "4e5f3345f74cda667ee8dd94b17184a592ce0374"
+    "revision": "cc53b6878a003cf26d213025af49c78388cebe21"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -660,7 +660,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "04a126d9210def99f06d9ab84a255110b862d47c"
+    "revision": "b974719d47447666687d49c68a51b278b2320e99"
   },
   "swift": {
     "revision": "a8cf05cd49b3b97d70a03fd65c9c279fc76662f7"
@@ -747,7 +747,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "46f809776e90ef6f039c8a45008644822dc292e2"
+    "revision": "366d30c2438ca396f2f8304d891ca22e7c14b922"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -777,7 +777,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "9a77bb6c1f4d65a9e8cd19585361b9a0786d5565"
+    "revision": "1bb6a572d5e3ced0012a4f6702c6f5662187b901"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From cf685ce85f335bab0c523bfd5fed92fedc5a8b3d Mon Sep 17 00:00:00 2001
From: Tomas Sandven <tomas@sandven.email>
Date: Sun, 3 Mar 2024 21:02:10 +0100
Subject: [PATCH 1296/2704] Add "just" parser

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/just/folds.scm          |   6 ++
 queries/just/highlights.scm     | 133 ++++++++++++++++++++++++++++++++
 queries/just/indents.scm        |  14 ++++
 queries/just/injections.scm     |  41 ++++++++++
 queries/just/locals.scm         |  35 +++++++++
 7 files changed, 240 insertions(+)
 create mode 100644 queries/just/folds.scm
 create mode 100644 queries/just/highlights.scm
 create mode 100644 queries/just/indents.scm
 create mode 100644 queries/just/injections.scm
 create mode 100644 queries/just/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 386ee5678..7d11de232 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -344,6 +344,9 @@
   "julia": {
     "revision": "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"
   },
+  "just": {
+    "revision": "5fe40d3622042c66465c4673b209a71e8376f902"
+  },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c7010e10c..b1360eda0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1033,6 +1033,14 @@ list.julia = {
   maintainers = { "@theHamsta" },
 }
 
+list.just = {
+  install_info = {
+    url = "https://github.com/IndianBoy42/tree-sitter-just",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@Hubro" },
+}
+
 list.kconfig = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-kconfig",
diff --git a/queries/just/folds.scm b/queries/just/folds.scm
new file mode 100644
index 000000000..fea3a5058
--- /dev/null
+++ b/queries/just/folds.scm
@@ -0,0 +1,6 @@
+([
+  (recipe)
+  (string)
+  (external_command)
+] @fold
+  (#trim! @fold))
diff --git a/queries/just/highlights.scm b/queries/just/highlights.scm
new file mode 100644
index 000000000..ae054c12b
--- /dev/null
+++ b/queries/just/highlights.scm
@@ -0,0 +1,133 @@
+[
+  "true"
+  "false"
+] @boolean
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+[
+  "alias"
+  "set"
+  "shell"
+  "mod"
+] @keyword
+
+[
+  "import"
+  "export"
+] @keyword.import
+
+[
+  ":="
+  "?"
+  "=="
+  "!="
+  "=~"
+  "@"
+  "="
+  "$"
+  "*"
+  "+"
+  "&&"
+  "@-"
+  "-@"
+  "-"
+  "/"
+  ":"
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{{"
+  "}}"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "`"
+  "```"
+] @punctuation.special
+
+"," @punctuation.delimiter
+
+(shebang) @keyword.directive
+
+(comment) @comment @spell
+
+[
+  (string)
+  (external_command)
+] @string
+
+(escape_sequence) @string.escape
+
+(module
+  (identifier) @module)
+
+(assignment
+  (identifier) @variable)
+
+(alias
+  (identifier) @variable)
+
+(value
+  (identifier) @variable)
+
+; Recipe definitions
+(recipe_header
+  (identifier) @function)
+
+(dependency
+  (identifier) @function.call)
+
+(dependency_expression
+  (identifier) @function.call)
+
+(parameter
+  (identifier) @variable.parameter)
+
+(dependency_expression
+  (expression
+    (value
+      (identifier) @variable.parameter)))
+
+; Fallback highlighting for recipe bodies
+(recipe
+  (recipe_body) @string
+  (#set! "priority" 90))
+
+; Ref: https://just.systems/man/en/chapter_26.html
+;(setting (identifier) @error)
+(setting
+  (identifier) @constant.builtin
+  (#any-of? @constant.builtin
+    "allow-duplicate-recipes" "dotenv-filename" "dotenv-load" "dotenv-path" "export" "fallback"
+    "ignore-comments" "positional-arguments" "tempdir" "windows-powershell" "windows-shell"))
+
+; Ref: https://just.systems/man/en/chapter_32.html
+;(recipe (attribute (identifier) @error))
+(recipe
+  (attribute
+    (identifier) @attribute)
+  (#any-of? @attribute
+    "confirm" "linux" "macos" "no-cd" "no-exit-message" "no-quiet" "private" "unix" "windows"))
+
+; Ref: https://just.systems/man/en/chapter_31.html
+;(function_call (identifier) @error)
+(function_call
+  (identifier) @function.call
+  (#any-of? @function.call
+    "arch" "num_cpus" "os" "os_family" "env_var" "env_var_or_default" "env" "invocation_directory"
+    "invocation_directory_native" "justfile" "justfile_directory" "just_executable" "quote"
+    "replace" "replace_regex" "trim" "trim_end" "trim_end_match" "trim_end_matches" "trim_start"
+    "trim_start_match" "trim_start_matches" "capitalize" "kebabcase" "lowercamelcase" "lowercase"
+    "shoutykebabcase" "shoutysnakecase" "snakecase" "titlecase" "uppercamelcase" "uppercase"
+    "absolute_path" "extension" "file_name" "file_stem" "parent_directory" "without_extension"
+    "clean" "join" "path_exists" "error" "sha256" "sha256_file" "uuid" "semver_matches"))
diff --git a/queries/just/indents.scm b/queries/just/indents.scm
new file mode 100644
index 000000000..1402a0c03
--- /dev/null
+++ b/queries/just/indents.scm
@@ -0,0 +1,14 @@
+; Source: https://github.com/IndianBoy42/tree-sitter-just/blob/main/queries/just/indents.scm
+[
+  (recipe)
+  (string)
+  (external_command)
+] @indent.begin
+
+(string
+  [
+    "'''"
+    "\"\"\""
+  ] @indent.branch @indent.end)
+
+(comment) @indent.auto
diff --git a/queries/just/injections.scm b/queries/just/injections.scm
new file mode 100644
index 000000000..dab656b69
--- /dev/null
+++ b/queries/just/injections.scm
@@ -0,0 +1,41 @@
+; The right side of =~ literals
+(regex_literal
+  (_) @injection.content
+  (#set! injection.language "regex"))
+
+; Default to bash highlighting for non-shebang recipes and commands
+(recipe
+  (recipe_body
+    !shebang) @injection.content
+  (#set! injection.include-children)
+  (#set! injection.language "bash"))
+
+(external_command
+  (command_body) @injection.content
+  (#set! injection.language "bash"))
+
+; For shebang recipes, use the shebang executable name as the language by default
+(recipe
+  (recipe_body
+    (shebang
+      (language) @injection.language)) @injection.content
+  (#not-any-of? @injection.language "python3" "nodejs" "node")
+  (#set! injection.include-children))
+
+; python3 -> python
+(recipe
+  (recipe_body
+    (shebang
+      (language) @_lang)) @injection.content
+  (#eq? @_lang "python3")
+  (#set! injection.language "python")
+  (#set! injection.include-children))
+
+; node/nodejs -> javascript
+(recipe
+  (recipe_body
+    (shebang
+      (language) @_lang)) @injection.content
+  (#any-of? @_lang "node" "nodejs")
+  (#set! injection.language "javascript")
+  (#set! injection.include-children))
diff --git a/queries/just/locals.scm b/queries/just/locals.scm
new file mode 100644
index 000000000..80549f35b
--- /dev/null
+++ b/queries/just/locals.scm
@@ -0,0 +1,35 @@
+; Source: https://github.com/IndianBoy42/tree-sitter-just/blob/main/queries/just/locals.scm
+; Scope
+(recipe) @local.scope
+
+; Definitions
+(alias
+  left: (identifier) @local.definition.var)
+
+(assignment
+  left: (identifier) @local.definition.var)
+
+(module
+  name: (identifier) @local.definition.namespace)
+
+(parameter
+  name: (identifier) @local.definition.var)
+
+(recipe_header
+  name: (identifier) @local.definition.function)
+
+; References
+(alias
+  right: (identifier) @local.reference)
+
+(function_call
+  name: (identifier) @local.reference)
+
+(dependency
+  name: (identifier) @local.reference)
+
+(dependency_expression
+  name: (identifier) @local.reference)
+
+(value
+  (identifier) @local.reference)

From 3a92c540ddf73fb6777987edbe08bbe1822ad722 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 09:32:23 +0000
Subject: [PATCH 1297/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0dc48866b..bd4187d53 100644
--- a/README.md
+++ b/README.md
@@ -288,6 +288,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) (maintained by @WhyNotHugo)
 - [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
 - [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @theHamsta)
+- [x] [just](https://github.com/IndianBoy42/tree-sitter-just) (maintained by @Hubro)
 - [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
 - [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)
 - [x] [kotlin](https://github.com/fwcd/tree-sitter-kotlin) (maintained by @SalBakraa)

From c28396de30b92a5af049037c2bd543a932a37a78 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 21 Mar 2024 06:33:27 -0400
Subject: [PATCH 1298/2704] feat(rust): improve indents

---
 queries/rust/indents.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index ac16a2e75..c4737ab80 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -5,9 +5,8 @@
   (impl_item)
   (for_expression)
   (struct_expression)
-  (match_expression)
+  (struct_pattern)
   (tuple_expression)
-  (match_arm)
   (match_block)
   (call_expression)
   (assignment_expression)
@@ -21,6 +20,7 @@
   (enum_variant_list)
   (parameters)
   (token_tree)
+  (token_repetition)
   (macro_definition)
 ] @indent.begin
 
@@ -79,6 +79,14 @@
     (field_declaration_list
       "}" @indent.end))
 
+(struct_expression
+  body:
+    (field_initializer_list
+      "}" @indent.end))
+
+(struct_pattern
+  "}" @indent.end)
+
 (trait_item
   body:
     (declaration_list

From 722617e6726c1508adadf83d531f54987c703be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Thu, 21 Mar 2024 20:44:35 +0900
Subject: [PATCH 1299/2704] refactor(format): drop extra indentation for field

---
 queries/angular/highlights.scm           |  15 +-
 queries/apex/highlights.scm              |  59 +-
 queries/apex/locals.scm                  |  10 +-
 queries/authzed/highlights.scm           |   7 +-
 queries/awk/highlights.scm               |  10 +-
 queries/bash/highlights.scm              |  11 +-
 queries/bash/injections.scm              |  27 +-
 queries/bitbake/highlights.scm           |  31 +-
 queries/bitbake/indents.scm              |   5 +-
 queries/bitbake/injections.scm           |  12 +-
 queries/bitbake/locals.scm               |  60 +-
 queries/c/highlights.scm                 |  12 +-
 queries/c/indents.scm                    |  22 +-
 queries/c/injections.scm                 |  54 +-
 queries/c_sharp/folds.scm                |  11 +-
 queries/c_sharp/highlights.scm           |  39 +-
 queries/c_sharp/locals.scm               |   5 +-
 queries/cairo/highlights.scm             |  49 +-
 queries/cairo/indents.scm                |  25 +-
 queries/cairo/locals.scm                 |   5 +-
 queries/commonlisp/highlights.scm        |  32 +-
 queries/commonlisp/locals.scm            |  32 +-
 queries/cpp/highlights.scm               |  20 +-
 queries/cpp/locals.scm                   |  25 +-
 queries/cue/highlights.scm               |   7 +-
 queries/dot/highlights.scm               |  15 +-
 queries/ecma/highlights.scm              |  31 +-
 queries/ecma/injections.scm              | 239 ++++----
 queries/elixir/highlights.scm            | 109 ++--
 queries/elixir/injections.scm            |  24 +-
 queries/elixir/locals.scm                |   5 +-
 queries/elm/highlights.scm               |  36 +-
 queries/erlang/highlights.scm            |  30 +-
 queries/faust/highlights.scm             |  11 +-
 queries/fennel/folds.scm                 |   9 +-
 queries/fennel/injections.scm            |  14 +-
 queries/fish/highlights.scm              |  46 +-
 queries/foam/locals.scm                  |   5 +-
 queries/gdshader/highlights.scm          |   9 +-
 queries/git_config/injections.scm        |   7 +-
 queries/gleam/highlights.scm             |  22 +-
 queries/glimmer/highlights.scm           |  33 +-
 queries/go/highlights.scm                |   5 +-
 queries/go/injections.scm                |  26 +-
 queries/go/locals.scm                    |  37 +-
 queries/gotmpl/highlights.scm            |   5 +-
 queries/gotmpl/injections.scm            |  21 +-
 queries/groovy/highlights.scm            |  10 +-
 queries/hack/highlights.scm              |  23 +-
 queries/haskell/highlights.scm           |  86 ++-
 queries/hcl/highlights.scm               |   7 +-
 queries/helm/highlights.scm              |   9 +-
 queries/helm/injections.scm              |  21 +-
 queries/java/highlights.scm              |   5 +-
 queries/java/injections.scm              |  14 +-
 queries/java/locals.scm                  |  10 +-
 queries/javascript/locals.scm            |  16 +-
 queries/jsonnet/highlights.scm           |  12 +-
 queries/jsonnet/locals.scm               |   5 +-
 queries/jsx/highlights.scm               |  22 +-
 queries/julia/highlights.scm             |  10 +-
 queries/latex/highlights.scm             | 215 +++----
 queries/latex/injections.scm             |  10 +-
 queries/lua/highlights.scm               |  64 +-
 queries/lua/injections.scm               | 157 +++--
 queries/lua/locals.scm                   |  18 +-
 queries/luau/highlights.scm              |  45 +-
 queries/luau/injections.scm              |  42 +-
 queries/luau/locals.scm                  |  18 +-
 queries/m68k/locals.scm                  |   5 +-
 queries/make/highlights.scm              |   5 +-
 queries/nickel/highlights.scm            |  10 +-
 queries/nim/highlights.scm               | 713 +++++++++++------------
 queries/nim/injections.scm               |   5 +-
 queries/nim/locals.scm                   | 285 +++++----
 queries/nim_format_string/highlights.scm |   5 +-
 queries/ninja/highlights.scm             |   5 +-
 queries/nix/highlights.scm               |  25 +-
 queries/nix/injections.scm               | 262 ++++-----
 queries/objc/highlights.scm              |  10 +-
 queries/ocaml/highlights.scm             |  24 +-
 queries/ocaml/locals.scm                 |  12 +-
 queries/pascal/highlights.scm            |  76 +--
 queries/pascal/locals.scm                |   5 +-
 queries/php_only/highlights.scm          |  42 +-
 queries/php_only/injections.scm          |  22 +-
 queries/php_only/locals.scm              |  14 +-
 queries/pony/highlights.scm              |  43 +-
 queries/puppet/highlights.scm            |   5 +-
 queries/python/highlights.scm            |  87 ++-
 queries/python/indents.scm               |   5 +-
 queries/python/injections.scm            |  19 +-
 queries/python/locals.scm                |  75 +--
 queries/qmljs/highlights.scm             |  45 +-
 queries/query/highlights.scm             |  22 +-
 queries/query/injections.scm             |  19 +-
 queries/r/highlights.scm                 |  61 +-
 queries/rego/highlights.scm              |  10 +-
 queries/robot/indents.scm                |   9 +-
 queries/rst/highlights.scm               |  12 +-
 queries/rst/injections.scm               |  29 +-
 queries/rst/locals.scm                   |   5 +-
 queries/ruby/highlights.scm              |  27 +-
 queries/ruby/locals.scm                  |  18 +-
 queries/rust/highlights.scm              |  49 +-
 queries/rust/indents.scm                 |  35 +-
 queries/rust/injections.scm              |  96 ++-
 queries/rust/locals.scm                  |  15 +-
 queries/scala/highlights.scm             |   5 +-
 queries/scala/locals.scm                 |   9 +-
 queries/slint/highlights.scm             |   5 +-
 queries/snakemake/highlights.scm         |   7 +-
 queries/sourcepawn/highlights.scm        |   5 +-
 queries/sparql/highlights.scm            |  29 +-
 queries/sql/highlights.scm               |   7 +-
 queries/squirrel/highlights.scm          |  23 +-
 queries/ssh_config/injections.scm        |  13 +-
 queries/starlark/highlights.scm          |  43 +-
 queries/starlark/locals.scm              |  42 +-
 queries/supercollider/locals.scm         |  14 +-
 queries/t32/highlights.scm               |  12 +-
 queries/t32/locals.scm                   |   5 +-
 queries/tablegen/highlights.scm          |  10 +-
 queries/tablegen/locals.scm              |  10 +-
 queries/teal/highlights.scm              |  22 +-
 queries/teal/locals.scm                  |  14 +-
 queries/terraform/highlights.scm         |   9 +-
 queries/tlaplus/locals.scm               |  10 +-
 queries/turtle/highlights.scm            |  13 +-
 queries/typescript/highlights.scm        |  15 +-
 queries/uxntal/highlights.scm            |  10 +-
 queries/v/highlights.scm                 |  10 +-
 queries/v/injections.scm                 |  19 +-
 queries/v/locals.scm                     |  20 +-
 queries/vim/highlights.scm               |  12 +-
 queries/vim/locals.scm                   |   5 +-
 queries/wing/highlights.scm              |  12 +-
 queries/yaml/highlights.scm              |  42 +-
 queries/yaml/injections.scm              |  96 ++-
 scripts/format-queries.lua               |  10 -
 140 files changed, 2146 insertions(+), 2766 deletions(-)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 2bf743cd1..f3aa27d25 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -12,9 +12,8 @@
   name: (identifier) @function)
 
 (pipe_call
-  arguments:
-    (pipe_arguments
-      (identifier) @variable.parameter))
+  arguments: (pipe_arguments
+    (identifier) @variable.parameter))
 
 (structural_directive
   "*" @keyword
@@ -47,14 +46,12 @@
   function: (identifier) @function)
 
 (call_expression
-  function:
-    ((identifier) @function.builtin
-      (#eq? @function.builtin "$any")))
+  function: ((identifier) @function.builtin
+    (#eq? @function.builtin "$any")))
 
 (pair
-  key:
-    ((identifier) @variable.builtin
-      (#eq? @variable.builtin "$implicit")))
+  key: ((identifier) @variable.builtin
+    (#eq? @variable.builtin "$implicit")))
 
 ((control_keyword) @keyword.repeat
   (#any-of? @keyword.repeat "for" "empty"))
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 55acadd62..50812f214 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -106,36 +106,34 @@
 ] @operator
 
 (binary_expression
-  operator:
-    [
-      ">"
-      "<"
-      "=="
-      "==="
-      "!=="
-      "&&"
-      "||"
-      "+"
-      "-"
-      "*"
-      "/"
-      "&"
-      "|"
-      "^"
-      "%"
-      "<<"
-      ">>"
-      ">>>"
-    ] @operator)
+  operator: [
+    ">"
+    "<"
+    "=="
+    "==="
+    "!=="
+    "&&"
+    "||"
+    "+"
+    "-"
+    "*"
+    "/"
+    "&"
+    "|"
+    "^"
+    "%"
+    "<<"
+    ">>"
+    ">>>"
+  ] @operator)
 
 (unary_expression
-  operator:
-    [
-      "+"
-      "-"
-      "!"
-      "~"
-    ]) @operator
+  operator: [
+    "+"
+    "-"
+    "!"
+    "~"
+  ]) @operator
 
 (map_initializer
   "=>" @operator)
@@ -147,9 +145,8 @@
 
 ; Fields
 (field_declaration
-  declarator:
-    (variable_declarator
-      name: (identifier) @variable.member))
+  declarator: (variable_declarator
+    name: (identifier) @variable.member))
 
 (field_access
   field: (identifier) @variable.member)
diff --git a/queries/apex/locals.scm b/queries/apex/locals.scm
index d3cbfa73b..2457752fa 100644
--- a/queries/apex/locals.scm
+++ b/queries/apex/locals.scm
@@ -48,9 +48,8 @@
   name: (identifier) @local.definition.method)
 
 (local_variable_declaration
-  declarator:
-    (variable_declarator
-      name: (identifier) @local.definition.var))
+  declarator: (variable_declarator
+    name: (identifier) @local.definition.var))
 
 (enhanced_for_statement
   name: (identifier) @local.definition.var)
@@ -62,9 +61,8 @@
   name: (identifier) @local.definition.parameter)
 
 (field_declaration
-  declarator:
-    (variable_declarator
-      name: (identifier) @local.definition.field))
+  declarator: (variable_declarator
+    name: (identifier) @local.definition.field))
 
 ; REFERENCES
 (identifier) @local.reference
diff --git a/queries/authzed/highlights.scm b/queries/authzed/highlights.scm
index 2009b78e3..fb946caaf 100644
--- a/queries/authzed/highlights.scm
+++ b/queries/authzed/highlights.scm
@@ -25,10 +25,9 @@
   (identifier) @property)
 
 (call_expression
-  function:
-    (selector_expression
-      operand: (identifier) @constant
-      field: (field_identifier) @function.method))
+  function: (selector_expression
+    operand: (identifier) @constant
+    field: (field_identifier) @function.method))
 
 (perm_expression
   (stabby) @operator
diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
index 305a20828..bc6395439 100644
--- a/queries/awk/highlights.scm
+++ b/queries/awk/highlights.scm
@@ -41,14 +41,12 @@
   "::" @punctuation.delimiter)
 
 (func_def
-  name:
-    (_
-      (identifier) @function) @function)
+  name: (_
+    (identifier) @function) @function)
 
 (func_call
-  name:
-    (_
-      (identifier) @function) @function)
+  name: (_
+    (identifier) @function) @function)
 
 (func_def
   (param_list
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 86f9a6734..32e40dbf8 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -170,12 +170,11 @@
     "trap" "type" "typeset" "ulimit" "umask" "unalias" "wait"))
 
 (command
-  argument:
-    [
-      (word) @variable.parameter
-      (concatenation
-        (word) @variable.parameter)
-    ])
+  argument: [
+    (word) @variable.parameter
+    (concatenation
+      (word) @variable.parameter)
+  ])
 
 (number) @number
 
diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 83bb6359e..169ad1358 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -13,11 +13,10 @@
 ((command
   name: (command_name) @_command
   .
-  argument:
-    [
-      (string)
-      (raw_string)
-    ] @injection.content)
+  argument: [
+    (string)
+    (raw_string)
+  ] @injection.content)
   (#eq? @_command "printf")
   (#set! injection.language "printf"))
 
@@ -28,11 +27,10 @@
   .
   (_)
   .
-  argument:
-    [
-      (string)
-      (raw_string)
-    ] @injection.content)
+  argument: [
+    (string)
+    (raw_string)
+  ] @injection.content)
   (#eq? @_command "printf")
   (#eq? @_arg "-v")
   (#set! injection.language "printf"))
@@ -42,11 +40,10 @@
   name: (command_name) @_command
   argument: (word) @_arg
   .
-  argument:
-    [
-      (string)
-      (raw_string)
-    ] @injection.content)
+  argument: [
+    (string)
+    (raw_string)
+  ] @injection.content)
   (#eq? @_command "printf")
   (#eq? @_arg "--")
   (#set! injection.language "printf"))
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index b8bbfea3f..4b03fbc27 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -137,9 +137,8 @@
 
 ((assignment
   left: (python_identifier) @type.definition
-  right:
-    (call
-      function: (python_identifier) @_func))
+  right: (call
+    function: (python_identifier) @_func))
   (#any-of? @_func "TypeVar" "NewType"))
 
 ; Fields
@@ -154,18 +153,16 @@
   function: (python_identifier) @function.call)
 
 (call
-  function:
-    (attribute
-      attribute: (python_identifier) @function.method.call))
+  function: (attribute
+    attribute: (python_identifier) @function.method.call))
 
 ((call
   function: (python_identifier) @constructor)
   (#lua-match? @constructor "^%u"))
 
 ((call
-  function:
-    (attribute
-      attribute: (python_identifier) @constructor))
+  function: (attribute
+    attribute: (python_identifier) @constructor))
   (#lua-match? @constructor "^%u"))
 
 ((call
@@ -191,10 +188,9 @@
 
 ((call
   function: (python_identifier) @_isinstance
-  arguments:
-    (argument_list
-      (_)
-      (python_identifier) @type))
+  arguments: (argument_list
+    (_)
+    (python_identifier) @type))
   (#eq? @_isinstance "isinstance"))
 
 (anonymous_python_function
@@ -216,11 +212,10 @@
   (identifier) @function)
 
 (python_function_definition
-  body:
-    (block
-      .
-      (expression_statement
-        (python_string) @string.documentation @spell)))
+  body: (block
+    .
+    (expression_statement
+      (python_string) @string.documentation @spell)))
 
 ; Namespace
 (inherit_path) @module
diff --git a/queries/bitbake/indents.scm b/queries/bitbake/indents.scm
index ee60d0fda..5f2081868 100644
--- a/queries/bitbake/indents.scm
+++ b/queries/bitbake/indents.scm
@@ -154,9 +154,8 @@
     (attribute
       attribute: (_) @indent.end)
     (call
-      arguments:
-        (_
-          ")" @indent.end))
+      arguments: (_
+        ")" @indent.end))
     "return" @indent.end
   ] .)
 
diff --git a/queries/bitbake/injections.scm b/queries/bitbake/injections.scm
index 39182e838..35c984a5b 100644
--- a/queries/bitbake/injections.scm
+++ b/queries/bitbake/injections.scm
@@ -1,11 +1,9 @@
 (call
-  function:
-    (attribute
-      object: (python_identifier) @_re)
-  arguments:
-    (argument_list
-      (python_string
-        (string_content) @injection.content) @_string)
+  function: (attribute
+    object: (python_identifier) @_re)
+  arguments: (argument_list
+    (python_string
+      (string_content) @injection.content) @_string)
   (#eq? @_re "re")
   (#lua-match? @_string "^r.*")
   (#set! injection.language "regex"))
diff --git a/queries/bitbake/locals.scm b/queries/bitbake/locals.scm
index edee8b30b..e4726ec51 100644
--- a/queries/bitbake/locals.scm
+++ b/queries/bitbake/locals.scm
@@ -9,14 +9,12 @@
   alias: (python_identifier) @local.definition.import)
 
 (import_statement
-  name:
-    (dotted_name
-      (python_identifier) @local.definition.import))
+  name: (dotted_name
+    (python_identifier) @local.definition.import))
 
 (import_from_statement
-  name:
-    (dotted_name
-      (python_identifier) @local.definition.import))
+  name: (dotted_name
+    (python_identifier) @local.definition.import))
 
 ; Function with parameters, defines parameters
 (parameters
@@ -55,14 +53,12 @@
 ; Loops
 ; not a scope!
 (for_statement
-  left:
-    (pattern_list
-      (python_identifier) @local.definition.var))
+  left: (pattern_list
+    (python_identifier) @local.definition.var))
 
 (for_statement
-  left:
-    (tuple_pattern
-      (python_identifier) @local.definition.var))
+  left: (tuple_pattern
+    (python_identifier) @local.definition.var))
 
 (for_statement
   left: (python_identifier) @local.definition.var)
@@ -74,14 +70,12 @@
   left: (python_identifier) @local.definition.var)
 
 (for_in_clause
-  left:
-    (tuple_pattern
-      (python_identifier) @local.definition.var))
+  left: (tuple_pattern
+    (python_identifier) @local.definition.var))
 
 (for_in_clause
-  left:
-    (pattern_list
-      (python_identifier) @local.definition.var))
+  left: (pattern_list
+    (python_identifier) @local.definition.var))
 
 (dictionary_comprehension) @local.scope
 
@@ -94,30 +88,26 @@
   left: (python_identifier) @local.definition.var)
 
 (assignment
-  left:
-    (pattern_list
-      (python_identifier) @local.definition.var))
+  left: (pattern_list
+    (python_identifier) @local.definition.var))
 
 (assignment
-  left:
-    (tuple_pattern
-      (python_identifier) @local.definition.var))
+  left: (tuple_pattern
+    (python_identifier) @local.definition.var))
 
 (assignment
-  left:
-    (attribute
-      (python_identifier)
-      (python_identifier) @local.definition.field))
+  left: (attribute
+    (python_identifier)
+    (python_identifier) @local.definition.field))
 
 (variable_assignment
   (identifier)
-  operator:
-    [
-      "="
-      "?="
-      "??="
-      ":="
-    ] @local.definition.var)
+  operator: [
+    "="
+    "?="
+    "??="
+    ":="
+  ] @local.definition.var)
 
 ; Walrus operator  x := 1
 (named_expression
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index e22aac997..f9e2ef800 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -263,18 +263,16 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (field_expression
-      field: (field_identifier) @function.call))
+  function: (field_expression
+    field: (field_identifier) @function.call))
 
 (function_declarator
   declarator: (identifier) @function)
 
 (function_declarator
-  declarator:
-    (parenthesized_declarator
-      (pointer_declarator
-        declarator: (field_identifier) @function)))
+  declarator: (parenthesized_declarator
+    (pointer_declarator
+      declarator: (field_identifier) @function)))
 
 (preproc_function_def
   name: (identifier) @function.macro)
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index 0a85373f4..372a26c6c 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -43,19 +43,17 @@
 
 ; Supports if without braces (but not both if-else without braces)
 (if_statement
-  consequence:
-    (_
-      ";" @indent.end) @_consequence
+  consequence: (_
+    ";" @indent.end) @_consequence
   (#not-has-type? @_consequence compound_statement)
-  alternative:
-    (else_clause
-      "else" @indent.branch
-      [
-        (if_statement
-          (compound_statement) @indent.dedent)? @indent.dedent
-        (compound_statement)? @indent.dedent
-        (_)? @indent.dedent
-      ])?) @indent.begin
+  alternative: (else_clause
+    "else" @indent.branch
+    [
+      (if_statement
+        (compound_statement) @indent.dedent)? @indent.dedent
+      (compound_statement)? @indent.dedent
+      (_)? @indent.dedent
+    ])?) @indent.begin
 
 (else_clause
   (_
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 308994bc0..00c1443b4 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -14,11 +14,10 @@
 
 ((call_expression
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      .
-      (string_literal
-        (string_content) @injection.content)))
+  arguments: (argument_list
+    .
+    (string_literal
+      (string_content) @injection.content)))
   ; format-ignore
   (#any-of? @_function 
     "printf" "printf_s"
@@ -36,12 +35,11 @@
 
 ((call_expression
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      (_)
-      .
-      (string_literal
-        (string_content) @injection.content)))
+  arguments: (argument_list
+    (_)
+    .
+    (string_literal
+      (string_content) @injection.content)))
   ; format-ignore
   (#any-of? @_function 
     "fprintf" "fprintf_s"
@@ -68,14 +66,13 @@
 
 ((call_expression
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      (_)
-      .
-      (_)
-      .
-      (string_literal
-        (string_content) @injection.content)))
+  arguments: (argument_list
+    (_)
+    .
+    (_)
+    .
+    (string_literal
+      (string_content) @injection.content)))
   ; format-ignore
   (#any-of? @_function 
     "sprintf_s"
@@ -92,16 +89,15 @@
 
 ((call_expression
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      (_)
-      .
-      (_)
-      .
-      (_)
-      .
-      (string_literal
-        (string_content) @injection.content)))
+  arguments: (argument_list
+    (_)
+    .
+    (_)
+    .
+    (_)
+    .
+    (string_literal
+      (string_content) @injection.content)))
   (#any-of? @_function "mvwprintw" "mvwscanw")
   (#set! injection.language "printf"))
 
diff --git a/queries/c_sharp/folds.scm b/queries/c_sharp/folds.scm
index 640242c67..bdd7b6551 100644
--- a/queries/c_sharp/folds.scm
+++ b/queries/c_sharp/folds.scm
@@ -1,9 +1,8 @@
-body:
-  [
-    (declaration_list)
-    (switch_body)
-    (enum_member_declaration_list)
-  ] @fold
+body: [
+  (declaration_list)
+  (switch_body)
+  (enum_member_declaration_list)
+] @fold
 
 accessors: (accessor_list) @fold
 
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index bd80f3146..e097907c2 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -32,28 +32,25 @@
     name: (identifier) @function.method.call))
 
 (invocation_expression
-  function:
-    (conditional_access_expression
-      (member_binding_expression
-        name: (identifier) @function.method.call)))
+  function: (conditional_access_expression
+    (member_binding_expression
+      name: (identifier) @function.method.call)))
 
 (namespace_declaration
-  name:
-    [
-      (qualified_name)
-      (identifier)
-    ] @module)
+  name: [
+    (qualified_name)
+    (identifier)
+  ] @module)
 
 (qualified_name
   (identifier) @type)
 
 (namespace_declaration
-  name:
-    [
-      (qualified_name
-        (identifier) @module)
-      (identifier) @module
-    ])
+  name: [
+    (qualified_name
+      (identifier) @module)
+    (identifier) @module
+  ])
 
 (invocation_expression
   (identifier) @function.method.call)
@@ -184,16 +181,14 @@
     (identifier) @type))
 
 (_
-  type:
-    (generic_name
-      (identifier) @type))
+  type: (generic_name
+    (identifier) @type))
 
 ; Generic Method invocation with generic type
 (invocation_expression
-  function:
-    (generic_name
-      .
-      (identifier) @function.method.call))
+  function: (generic_name
+    .
+    (identifier) @function.method.call))
 
 (invocation_expression
   (member_access_expression
diff --git a/queries/c_sharp/locals.scm b/queries/c_sharp/locals.scm
index 0476a1695..33df9bb37 100644
--- a/queries/c_sharp/locals.scm
+++ b/queries/c_sharp/locals.scm
@@ -14,9 +14,8 @@
   left: (identifier) @local.definition.var)
 
 (for_each_statement
-  left:
-    (tuple_pattern
-      (identifier) @local.definition.var))
+  left: (tuple_pattern
+    (identifier) @local.definition.var))
 
 (parameter
   (identifier) @local.definition.parameter)
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index e7a4faf9c..be4a749c4 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -10,9 +10,8 @@
     "from"
     "import"
   ] @keyword.import
-  module_name:
-    (dotted_name
-      (identifier) @module .))
+  module_name: (dotted_name
+    (identifier) @module .))
 
 [
   "as"
@@ -74,9 +73,8 @@
   path: (identifier) @module)
 
 (scoped_use_list
-  path:
-    (scoped_identifier
-      (identifier) @module))
+  path: (scoped_identifier
+    (identifier) @module))
 
 (use_list
   (scoped_identifier
@@ -228,14 +226,12 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (scoped_identifier
-      (identifier) @function.call .))
+  function: (scoped_identifier
+    (identifier) @function.call .))
 
 (call_expression
-  function:
-    (field_expression
-      field: (field_identifier) @function.call))
+  function: (field_expression
+    field: (field_identifier) @function.call))
 
 "jmp" @function.builtin
 
@@ -267,23 +263,20 @@
   name: (identifier) @constant)
 
 (call_expression
-  function:
+  function: (scoped_identifier
+    "::"
+    name: (identifier) @constant)
+  (#lua-match? @constant "^[A-Z]"))
+
+((match_arm
+  pattern: (match_pattern
+    (identifier) @constant))
+  (#lua-match? @constant "^[A-Z]"))
+
+((match_arm
+  pattern: (match_pattern
     (scoped_identifier
-      "::"
-      name: (identifier) @constant)
-  (#lua-match? @constant "^[A-Z]"))
-
-((match_arm
-  pattern:
-    (match_pattern
-      (identifier) @constant))
-  (#lua-match? @constant "^[A-Z]"))
-
-((match_arm
-  pattern:
-    (match_pattern
-      (scoped_identifier
-        name: (identifier) @constant)))
+      name: (identifier) @constant)))
   (#lua-match? @constant "^[A-Z]"))
 
 ((identifier) @constant.builtin
diff --git a/queries/cairo/indents.scm b/queries/cairo/indents.scm
index a97bd24a4..f63ef36fe 100644
--- a/queries/cairo/indents.scm
+++ b/queries/cairo/indents.scm
@@ -25,29 +25,24 @@
   "}" @indent.end)
 
 (enum_item
-  body:
-    (enum_variant_list
-      "}" @indent.end))
+  body: (enum_variant_list
+    "}" @indent.end))
 
 (match_expression
-  body:
-    (match_block
-      "}" @indent.end))
+  body: (match_block
+    "}" @indent.end))
 
 (mod_item
-  body:
-    (declaration_list
-      "}" @indent.end))
+  body: (declaration_list
+    "}" @indent.end))
 
 (struct_item
-  body:
-    (field_declaration_list
-      "}" @indent.end))
+  body: (field_declaration_list
+    "}" @indent.end))
 
 (trait_item
-  body:
-    (declaration_list
-      "}" @indent.end))
+  body: (declaration_list
+    "}" @indent.end))
 
 [
   ")"
diff --git a/queries/cairo/locals.scm b/queries/cairo/locals.scm
index 27ec73542..0573cf6db 100644
--- a/queries/cairo/locals.scm
+++ b/queries/cairo/locals.scm
@@ -22,9 +22,8 @@
 ] @local.scope
 
 (use_declaration
-  argument:
-    (scoped_identifier
-      name: (identifier) @local.definition.import))
+  argument: (scoped_identifier
+    name: (identifier) @local.definition.import))
 
 (use_as_clause
   alias: (identifier) @local.definition.import)
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 0f3524e99..84f132e48 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -11,30 +11,26 @@
   function_name: (_) @function)
 
 (defun_header
-  lambda_list:
-    (list_lit
-      (sym_lit) @variable.parameter))
+  lambda_list: (list_lit
+    (sym_lit) @variable.parameter))
 
 (defun_header
-  keyword:
-    (defun_keyword
-      "defmethod")
-  lambda_list:
+  keyword: (defun_keyword
+    "defmethod")
+  lambda_list: (list_lit
     (list_lit
-      (list_lit
-        .
-        (sym_lit)
-        .
-        (sym_lit) @string.special.symbol)))
+      .
+      (sym_lit)
+      .
+      (sym_lit) @string.special.symbol)))
 
 (defun_header
-  lambda_list:
+  lambda_list: (list_lit
     (list_lit
-      (list_lit
-        .
-        (sym_lit) @variable.parameter
-        .
-        (_))))
+      .
+      (sym_lit) @variable.parameter
+      .
+      (_))))
 
 (defun_header
   specifier: (sym_lit) @string.special.symbol)
diff --git a/queries/commonlisp/locals.scm b/queries/commonlisp/locals.scm
index 2865c1f0f..98036d322 100644
--- a/queries/commonlisp/locals.scm
+++ b/queries/commonlisp/locals.scm
@@ -3,30 +3,26 @@
   (#set! definition.function.scope "parent"))
 
 (defun_header
-  lambda_list:
-    (list_lit
-      (sym_lit) @local.definition.parameter))
+  lambda_list: (list_lit
+    (sym_lit) @local.definition.parameter))
 
 (defun_header
-  keyword:
-    (defun_keyword
-      "defmethod")
-  lambda_list:
+  keyword: (defun_keyword
+    "defmethod")
+  lambda_list: (list_lit
     (list_lit
-      (list_lit
-        .
-        (sym_lit)
-        .
-        (sym_lit) @local.definition.type)))
+      .
+      (sym_lit)
+      .
+      (sym_lit) @local.definition.type)))
 
 (defun_header
-  lambda_list:
+  lambda_list: (list_lit
     (list_lit
-      (list_lit
-        .
-        (sym_lit) @local.definition.parameter
-        .
-        (_))))
+      .
+      (sym_lit) @local.definition.parameter
+      .
+      (_))))
 
 (sym_lit) @local.reference
 
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index f2ba879fb..594e0dc24 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -8,9 +8,8 @@
 
 ; function(Foo ...foo)
 (variadic_parameter_declaration
-  declarator:
-    (variadic_declarator
-      (_) @variable.parameter))
+  declarator: (variadic_declarator
+    (_) @variable.parameter))
 
 ; int foo = 0
 (optional_parameter_declaration
@@ -44,9 +43,8 @@
   (#lua-match? @type "^[%u]"))
 
 (case_statement
-  value:
-    (qualified_identifier
-      (identifier) @constant))
+  value: (qualified_identifier
+    (identifier) @constant))
 
 (using_declaration
   .
@@ -167,15 +165,13 @@
   (#lua-match? @constructor "^%u"))
 
 ((call_expression
-  function:
-    (qualified_identifier
-      name: (identifier) @constructor))
+  function: (qualified_identifier
+    name: (identifier) @constructor))
   (#lua-match? @constructor "^%u"))
 
 ((call_expression
-  function:
-    (field_expression
-      field: (field_identifier) @constructor))
+  function: (field_expression
+    field: (field_identifier) @constructor))
   (#lua-match? @constructor "^%u"))
 
 ; constructing a type in an initializer list: Constructor ():  **SuperType (1)**
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
index 8b1d8dcc1..b24ada85f 100644
--- a/queries/cpp/locals.scm
+++ b/queries/cpp/locals.scm
@@ -2,9 +2,8 @@
 
 ; Parameters
 (variadic_parameter_declaration
-  declarator:
-    (variadic_declarator
-      (identifier) @local.definition.parameter))
+  declarator: (variadic_declarator
+    (identifier) @local.definition.parameter))
 
 (optional_parameter_declaration
   declarator: (identifier) @local.definition.parameter)
@@ -19,9 +18,8 @@
   (identifier) @local.definition.var)
 
 (struct_specifier
-  name:
-    (qualified_identifier
-      name: (type_identifier) @local.definition.type))
+  name: (qualified_identifier
+    name: (type_identifier) @local.definition.type))
 
 (class_specifier
   name: (type_identifier) @local.definition.type)
@@ -30,9 +28,8 @@
   name: (identifier) @local.definition.type)
 
 (class_specifier
-  name:
-    (qualified_identifier
-      name: (type_identifier) @local.definition.type))
+  name: (qualified_identifier
+    name: (type_identifier) @local.definition.type))
 
 (alias_declaration
   name: (type_identifier) @local.definition.type)
@@ -63,14 +60,12 @@
   name: (field_identifier) @local.definition.method) @local.scope
 
 (function_declarator
-  declarator:
-    (qualified_identifier
-      name: (identifier) @local.definition.function)) @local.scope
+  declarator: (qualified_identifier
+    name: (identifier) @local.definition.function)) @local.scope
 
 (field_declaration
-  declarator:
-    (function_declarator
-      (field_identifier) @local.definition.method))
+  declarator: (function_declarator
+    (field_identifier) @local.definition.method))
 
 (lambda_expression) @local.scope
 
diff --git a/queries/cue/highlights.scm b/queries/cue/highlights.scm
index 3371bc33e..27d4daddc 100644
--- a/queries/cue/highlights.scm
+++ b/queries/cue/highlights.scm
@@ -71,10 +71,9 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (selector_expression
-      (_)
-      (identifier) @function.call))
+  function: (selector_expression
+    (_)
+    (identifier) @function.call))
 
 (call_expression
   function: (builtin_function) @function.call)
diff --git a/queries/dot/highlights.scm b/queries/dot/highlights.scm
index b4a36f18d..75ad92271 100644
--- a/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -33,19 +33,16 @@
 ] @punctuation.bracket
 
 (subgraph
-  id:
-    (id
-      (identifier) @module))
+  id: (id
+    (identifier) @module))
 
 (attribute
-  name:
-    (id
-      (identifier) @variable.member))
+  name: (id
+    (identifier) @variable.member))
 
 (attribute
-  value:
-    (id
-      (identifier) @constant))
+  value: (id
+    (identifier) @constant))
 
 (comment) @comment @spell
 
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index b645ae385..58785d454 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -58,11 +58,10 @@
   name: (identifier) @function)
 
 (method_definition
-  name:
-    [
-      (property_identifier)
-      (private_property_identifier)
-    ] @function.method)
+  name: [
+    (property_identifier)
+    (private_property_identifier)
+  ] @function.method)
 
 (method_definition
   name: (property_identifier) @constructor
@@ -77,15 +76,13 @@
   value: (arrow_function))
 
 (assignment_expression
-  left:
-    (member_expression
-      property: (property_identifier) @function.method)
+  left: (member_expression
+    property: (property_identifier) @function.method)
   right: (arrow_function))
 
 (assignment_expression
-  left:
-    (member_expression
-      property: (property_identifier) @function.method)
+  left: (member_expression
+    property: (property_identifier) @function.method)
   right: (function_expression))
 
 (variable_declarator
@@ -110,13 +107,11 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (member_expression
-      property:
-        [
-          (property_identifier)
-          (private_property_identifier)
-        ] @function.method.call))
+  function: (member_expression
+    property: [
+      (property_identifier)
+      (private_property_identifier)
+    ] @function.method.call))
 
 ; Builtins
 ;---------
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 011d953bf..74d583849 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -8,12 +8,11 @@
 ; html(`...`), html`...`, sql(...) etc
 (call_expression
   function: (identifier) @injection.language
-  arguments:
-    [
-      (arguments
-        (template_string) @injection.content)
-      (template_string) @injection.content
-    ]
+  arguments: [
+    (arguments
+      (template_string) @injection.content)
+    (template_string) @injection.content
+  ]
   (#lua-match? @injection.language "^[a-zA-Z][a-zA-Z0-9]*$")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children)
@@ -24,38 +23,32 @@
 
 ; svg`...` or svg(`...`)
 (call_expression
-  function:
-    ((identifier) @_name
-      (#eq? @_name "svg"))
-  arguments:
-    [
-      (arguments
-        (template_string) @injection.content)
-      (template_string) @injection.content
-    ]
+  function: ((identifier) @_name
+    (#eq? @_name "svg"))
+  arguments: [
+    (arguments
+      (template_string) @injection.content)
+    (template_string) @injection.content
+  ]
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children)
   (#set! injection.language "html"))
 
 (call_expression
-  function:
-    ((identifier) @_name
-      (#eq? @_name "gql"))
-  arguments:
-    ((template_string) @injection.content
-      (#offset! @injection.content 0 1 0 -1)
-      (#set! injection.include-children)
-      (#set! injection.language "graphql")))
+  function: ((identifier) @_name
+    (#eq? @_name "gql"))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "graphql")))
 
 (call_expression
-  function:
-    ((identifier) @_name
-      (#eq? @_name "hbs"))
-  arguments:
-    ((template_string) @injection.content
-      (#offset! @injection.content 0 1 0 -1)
-      (#set! injection.include-children)
-      (#set! injection.language "glimmer")))
+  function: ((identifier) @_name
+    (#eq? @_name "hbs"))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "glimmer")))
 
 ((glimmer_template) @injection.content
   (#set! injection.language "glimmer"))
@@ -64,67 +57,54 @@
 (call_expression
   function: (identifier) @_name
   (#any-of? @_name "css" "keyframes")
-  arguments:
-    ((template_string) @injection.content
-      (#offset! @injection.content 0 1 0 -1)
-      (#set! injection.include-children)
-      (#set! injection.language "styled")))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "styled")))
 
 ; styled.div`<css>`
 (call_expression
-  function:
-    (member_expression
-      object: (identifier) @_name
-      (#eq? @_name "styled"))
-  arguments:
-    ((template_string) @injection.content
-      (#offset! @injection.content 0 1 0 -1)
-      (#set! injection.include-children)
-      (#set! injection.language "styled")))
+  function: (member_expression
+    object: (identifier) @_name
+    (#eq? @_name "styled"))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "styled")))
 
 ; styled(Component)`<css>`
 (call_expression
-  function:
-    (call_expression
-      function: (identifier) @_name
-      (#eq? @_name "styled"))
-  arguments:
-    ((template_string) @injection.content
-      (#offset! @injection.content 0 1 0 -1)
-      (#set! injection.include-children)
-      (#set! injection.language "styled")))
+  function: (call_expression
+    function: (identifier) @_name
+    (#eq? @_name "styled"))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "styled")))
 
 ; styled.div.attrs({ prop: "foo" })`<css>`
 (call_expression
-  function:
-    (call_expression
-      function:
-        (member_expression
-          object:
-            (member_expression
-              object: (identifier) @_name
-              (#eq? @_name "styled"))))
-  arguments:
-    ((template_string) @injection.content
-      (#offset! @injection.content 0 1 0 -1)
-      (#set! injection.include-children)
-      (#set! injection.language "styled")))
+  function: (call_expression
+    function: (member_expression
+      object: (member_expression
+        object: (identifier) @_name
+        (#eq? @_name "styled"))))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "styled")))
 
 ; styled(Component).attrs({ prop: "foo" })`<css>`
 (call_expression
-  function:
-    (call_expression
-      function:
-        (member_expression
-          object:
-            (call_expression
-              function: (identifier) @_name
-              (#eq? @_name "styled"))))
-  arguments:
-    ((template_string) @injection.content
-      (#offset! @injection.content 0 1 0 -1)
-      (#set! injection.include-children)
-      (#set! injection.language "styled")))
+  function: (call_expression
+    function: (member_expression
+      object: (call_expression
+        function: (identifier) @_name
+        (#eq? @_name "styled"))))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "styled")))
 
 ((regex_pattern) @injection.content
   (#set! injection.language "regex"))
@@ -141,10 +121,9 @@
 
 ; el.innerHTML = `<html>`
 (assignment_expression
-  left:
-    (member_expression
-      property: (property_identifier) @_prop
-      (#any-of? @_prop "outerHTML" "innerHTML"))
+  left: (member_expression
+    property: (property_identifier) @_prop
+    (#any-of? @_prop "outerHTML" "innerHTML"))
   right: (template_string) @injection.content
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children)
@@ -152,13 +131,11 @@
 
 ; el.innerHTML = '<html>'
 (assignment_expression
-  left:
-    (member_expression
-      property: (property_identifier) @_prop
-      (#any-of? @_prop "outerHTML" "innerHTML"))
-  right:
-    (string
-      (string_fragment) @injection.content)
+  left: (member_expression
+    property: (property_identifier) @_prop
+    (#any-of? @_prop "outerHTML" "innerHTML"))
+  right: (string
+    (string_fragment) @injection.content)
   (#set! injection.language "html"))
 
 ;---- Angular injections -----
@@ -167,61 +144,49 @@
 ; })
 (decorator
   (call_expression
-    function:
-      ((identifier) @_name
-        (#eq? @_name "Component"))
-    arguments:
-      (arguments
-        (object
-          (pair
-            key:
-              ((property_identifier) @_prop
-                (#eq? @_prop "template"))
-            value:
-              ((template_string) @injection.content
-                (#offset! @injection.content 0 1 0 -1)
-                (#set! injection.include-children)
-                (#set! injection.language "angular")))))))
+    function: ((identifier) @_name
+      (#eq? @_name "Component"))
+    arguments: (arguments
+      (object
+        (pair
+          key: ((property_identifier) @_prop
+            (#eq? @_prop "template"))
+          value: ((template_string) @injection.content
+            (#offset! @injection.content 0 1 0 -1)
+            (#set! injection.include-children)
+            (#set! injection.language "angular")))))))
 
 ; @Component({
 ;   styles: [`<css>`]
 ; })
 (decorator
   (call_expression
-    function:
-      ((identifier) @_name
-        (#eq? @_name "Component"))
-    arguments:
-      (arguments
-        (object
-          (pair
-            key:
-              ((property_identifier) @_prop
-                (#eq? @_prop "styles"))
-            value:
-              (array
-                ((template_string) @injection.content
-                  (#offset! @injection.content 0 1 0 -1)
-                  (#set! injection.include-children)
-                  (#set! injection.language "css"))))))))
+    function: ((identifier) @_name
+      (#eq? @_name "Component"))
+    arguments: (arguments
+      (object
+        (pair
+          key: ((property_identifier) @_prop
+            (#eq? @_prop "styles"))
+          value: (array
+            ((template_string) @injection.content
+              (#offset! @injection.content 0 1 0 -1)
+              (#set! injection.include-children)
+              (#set! injection.language "css"))))))))
 
 ; @Component({
 ;   styles: `<css>`
 ; })
 (decorator
   (call_expression
-    function:
-      ((identifier) @_name
-        (#eq? @_name "Component"))
-    arguments:
-      (arguments
-        (object
-          (pair
-            key:
-              ((property_identifier) @_prop
-                (#eq? @_prop "styles"))
-            value:
-              ((template_string) @injection.content
-                (#set! injection.include-children)
-                (#offset! @injection.content 0 1 0 -1)
-                (#set! injection.language "css")))))))
+    function: ((identifier) @_name
+      (#eq? @_name "Component"))
+    arguments: (arguments
+      (object
+        (pair
+          key: ((property_identifier) @_prop
+            (#eq? @_prop "styles"))
+          value: ((template_string) @injection.content
+            (#set! injection.include-children)
+            (#offset! @injection.content 0 1 0 -1)
+            (#set! injection.language "css")))))))
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
index 43208f40f..cbdb40de5 100644
--- a/queries/elixir/highlights.scm
+++ b/queries/elixir/highlights.scm
@@ -95,42 +95,37 @@
 
 ; Remote Function Calls
 (call
-  target:
-    (dot
-      left:
-        [
-          (atom) @type
-          (_)
-        ]
-      right: (identifier) @function.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"))
+  target: ((identifier) @keyword.function
+    (#any-of? @keyword.function
+      "def" "defdelegate" "defexception" "defguard" "defguardp" "defimpl" "defmacro" "defmacrop"
+      "defmodule" "defn" "defnp" "defoverridable" "defp" "defprotocol" "defstruct"))
   (arguments
     [
       (call
         (identifier) @function)
       (identifier) @function
       (binary_operator
-        left:
-          (call
-            target: (identifier) @function)
+        left: (call
+          target: (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")))
+  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
@@ -160,22 +155,19 @@
 ; Capture Operator
 (unary_operator
   operator: "&"
-  operand:
-    [
-      (integer) @operator
-      (binary_operator
-        left:
-          [
-            (call
-              target:
-                (dot
-                  left: (_)
-                  right: (identifier) @function))
-            (identifier) @function
-          ]
-        operator: "/"
-        right: (integer) @operator)
-    ])
+  operand: [
+    (integer) @operator
+    (binary_operator
+      left: [
+        (call
+          target: (dot
+            left: (_)
+            right: (identifier) @function))
+        (identifier) @function
+      ]
+      operator: "/"
+      right: (integer) @operator)
+  ])
 
 ; Non-String Sigils
 (sigil
@@ -199,30 +191,27 @@
 ; Module attributes
 (unary_operator
   operator: "@"
-  operand:
-    [
-      (identifier)
-      (call
-        target: (identifier))
-    ] @constant) @constant
+  operand: [
+    (identifier)
+    (call
+      target: (identifier))
+  ] @constant) @constant
 
 ; Documentation
 (unary_operator
   operator: "@"
-  operand:
-    (call
-      target:
-        ((identifier) @_identifier
-          (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc")) @comment.documentation
-      (arguments
-        [
-          (string)
-          (boolean)
-          (charlist)
-          (sigil
-            "~" @comment.documentation
-            (sigil_name) @comment.documentation
-            quoted_start: _ @comment.documentation
-            (quoted_content) @comment.documentation
-            quoted_end: _ @comment.documentation)
-        ] @comment.documentation))) @comment.documentation
+  operand: (call
+    target: ((identifier) @_identifier
+      (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc")) @comment.documentation
+    (arguments
+      [
+        (string)
+        (boolean)
+        (charlist)
+        (sigil
+          "~" @comment.documentation
+          (sigil_name) @comment.documentation
+          quoted_start: _ @comment.documentation
+          (quoted_content) @comment.documentation
+          quoted_end: _ @comment.documentation)
+      ] @comment.documentation))) @comment.documentation
diff --git a/queries/elixir/injections.scm b/queries/elixir/injections.scm
index b580f2ea6..cc74f792a 100644
--- a/queries/elixir/injections.scm
+++ b/queries/elixir/injections.scm
@@ -5,19 +5,17 @@
 ; Documentation
 (unary_operator
   operator: "@"
-  operand:
-    (call
-      target:
-        ((identifier) @_identifier
-          (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc"))
-      (arguments
-        [
-          (string
-            (quoted_content) @injection.content)
-          (sigil
-            (quoted_content) @injection.content)
-        ])
-      (#set! injection.language "markdown")))
+  operand: (call
+    target: ((identifier) @_identifier
+      (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc"))
+    (arguments
+      [
+        (string
+          (quoted_content) @injection.content)
+        (sigil
+          (quoted_content) @injection.content)
+      ])
+    (#set! injection.language "markdown")))
 
 ; HEEx
 (sigil
diff --git a/queries/elixir/locals.scm b/queries/elixir/locals.scm
index 0ce0eab74..ac9d86e36 100644
--- a/queries/elixir/locals.scm
+++ b/queries/elixir/locals.scm
@@ -5,9 +5,8 @@
 
 ; Module Definitions
 (call
-  target:
-    ((identifier) @_identifier
-      (#eq? @_identifier "defmodule"))
+  target: ((identifier) @_identifier
+    (#eq? @_identifier "defmodule"))
   (arguments
     (alias) @local.definition.type))
 
diff --git a/queries/elm/highlights.scm b/queries/elm/highlights.scm
index 86351fe60..fc18566c9 100644
--- a/queries/elm/highlights.scm
+++ b/queries/elm/highlights.scm
@@ -97,40 +97,34 @@
 ; Functions
 ;----------
 (value_declaration
-  functionDeclarationLeft:
-    (function_declaration_left
-      (lower_case_identifier) @function
-      (pattern)))
+  functionDeclarationLeft: (function_declaration_left
+    (lower_case_identifier) @function
+    (pattern)))
 
 (value_declaration
-  functionDeclarationLeft:
-    (function_declaration_left
-      (lower_case_identifier) @function
-      pattern: (_)))
+  functionDeclarationLeft: (function_declaration_left
+    (lower_case_identifier) @function
+    pattern: (_)))
 
 (value_declaration
-  functionDeclarationLeft:
-    (function_declaration_left
-      (lower_case_identifier) @function)
+  functionDeclarationLeft: (function_declaration_left
+    (lower_case_identifier) @function)
   body: (anonymous_function_expr))
 
 (type_annotation
   name: (lower_case_identifier) @function
-  typeExpression:
-    (type_expression
-      (arrow)))
+  typeExpression: (type_expression
+    (arrow)))
 
 (port_annotation
   name: (lower_case_identifier) @function
-  typeExpression:
-    (type_expression
-      (arrow)))
+  typeExpression: (type_expression
+    (arrow)))
 
 (function_call_expr
-  target:
-    (value_expr
-      (value_qid
-        (lower_case_identifier) @function.call)))
+  target: (value_expr
+    (value_qid
+      (lower_case_identifier) @function.call)))
 
 ; Operators
 ;----------
diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
index 1b9aeaf4e..1ce046689 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -106,10 +106,9 @@
 (export_type_attribute) @type.definition
 
 (export_type_attribute
-  types:
-    (fa
-      fun: _ @type
-      (#set! "priority" 101)))
+  types: (fa
+    fun: _ @type
+    (#set! "priority" 101)))
 
 (behaviour_attribute) @keyword.import
 
@@ -117,9 +116,8 @@
   (atom) @module) @keyword.import
 
 (wild_attribute
-  name:
-    (attr_name
-      name: _ @attribute)) @attribute
+  name: (attr_name
+    name: _ @attribute)) @attribute
 
 ; Records
 (record_expr) @type
@@ -157,12 +155,11 @@
 
 ; expr_function_call
 (call
-  expr:
-    [
-      (atom)
-      (remote)
-      (var)
-    ] @function)
+  expr: [
+    (atom)
+    (remote)
+    (var)
+  ] @function)
 
 (call
   (atom) @keyword.exception
@@ -170,10 +167,9 @@
 
 ; Parenthesized expression: (SomeFunc)(), only highlight the parens
 (call
-  expr:
-    (paren_expr
-      "(" @function.call
-      ")" @function.call))
+  expr: (paren_expr
+    "(" @function.call
+    ")" @function.call))
 
 ; function
 (external_fun) @function.call
diff --git a/queries/faust/highlights.scm b/queries/faust/highlights.scm
index df2c3e70a..6e7ef1d92 100644
--- a/queries/faust/highlights.scm
+++ b/queries/faust/highlights.scm
@@ -35,12 +35,11 @@
 
 ; Types
 (_
-  type:
-    [
-      (int_type)
-      (float_type)
-      (any_type)
-    ]) @type.builtin
+  type: [
+    (int_type)
+    (float_type)
+    (any_type)
+  ]) @type.builtin
 
 [
   (single_precision)
diff --git a/queries/fennel/folds.scm b/queries/fennel/folds.scm
index b4901d96a..ad65bf78c 100644
--- a/queries/fennel/folds.scm
+++ b/queries/fennel/folds.scm
@@ -27,9 +27,8 @@
   (#any-of? @_fn "fn" "lambda" "λ" "hashfn")) @fold
 
 (reader_macro
-  macro:
-    [
-      "'"
-      "`"
-    ]
+  macro: [
+    "'"
+    "`"
+  ]
   expression: (_) @fold)
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
index cea50c4a3..b6b0bbcfe 100644
--- a/queries/fennel/injections.scm
+++ b/queries/fennel/injections.scm
@@ -42,14 +42,12 @@
   .
   (table
     (table_pair
-      key:
-        (string
-          (string_content) @_command
-          (#eq? @_command "command"))
-      value:
-        (string
-          (string_content) @injection.content
-          (#set! injection.language "vim")))))
+      key: (string
+        (string_content) @_command
+        (#eq? @_command "command"))
+      value: (string
+        (string_content) @injection.content
+        (#set! injection.language "vim")))))
 
 (list
   .
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 506602098..e8ba18efe 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -98,11 +98,10 @@
 
 ; Commands
 (command
-  argument:
-    [
-      (word) @variable.parameter
-      (#lua-match? @variable.parameter "^[-]")
-    ])
+  argument: [
+    (word) @variable.parameter
+    (#lua-match? @variable.parameter "^[-]")
+  ])
 
 (command_substitution
   "$" @punctuation.bracket)
@@ -113,15 +112,14 @@
 
 ; 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")
-    ])
+  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")
+  ])
 
 ; Functions
 (function_definition
@@ -131,19 +129,17 @@
   ] @keyword.function)
 
 (function_definition
-  name:
-    [
-      (word)
-      (concatenation)
-    ] @function)
+  name: [
+    (word)
+    (concatenation)
+  ] @function)
 
 (function_definition
-  option:
-    [
-      (word)
-      (concatenation
-        (word))
-    ] @variable.parameter
+  option: [
+    (word)
+    (concatenation
+      (word))
+  ] @variable.parameter
   (#lua-match? @variable.parameter "^[-]"))
 
 ; Strings
diff --git a/queries/foam/locals.scm b/queries/foam/locals.scm
index 508643672..f3f689081 100644
--- a/queries/foam/locals.scm
+++ b/queries/foam/locals.scm
@@ -7,6 +7,5 @@
   keyword: (_) @local.definition.parameter)
 
 (key_value
-  value:
-    (macro
-      (identifier)*)* @local.reference)
+  value: (macro
+    (identifier)*)* @local.reference)
diff --git a/queries/gdshader/highlights.scm b/queries/gdshader/highlights.scm
index 334aece0f..fb8c053e7 100644
--- a/queries/gdshader/highlights.scm
+++ b/queries/gdshader/highlights.scm
@@ -130,11 +130,10 @@
   member: (ident) @property)
 
 (call_expr
-  function:
-    [
-      (ident)
-      (builtin_type)
-    ] @function)
+  function: [
+    (ident)
+    (builtin_type)
+  ] @function)
 
 (call_expr
   function: (builtin_type) @function.call)
diff --git a/queries/git_config/injections.scm b/queries/git_config/injections.scm
index dcccb21ba..7a53af2ee 100644
--- a/queries/git_config/injections.scm
+++ b/queries/git_config/injections.scm
@@ -21,10 +21,9 @@
   (section_header
     (section_name) @_alias)
   (variable
-    value:
-      (string
-        "\""
-        "\"") @injection.content)
+    value: (string
+      "\""
+      "\"") @injection.content)
   (#eq? @_alias "alias")
   (#lua-match? @injection.content "^\"!")
   (#offset! @injection.content 0 2 0 -1)
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index 49dd8777c..8754f3ed6 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -92,8 +92,7 @@
 (module) @module
 
 (import
-  alias:
-    ((identifier) @module)?)
+  alias: ((identifier) @module)?)
 
 (remote_type_identifier
   module: (identifier) @module)
@@ -114,10 +113,9 @@
 
 ; Function Parameter Labels
 (function_call
-  arguments:
-    (arguments
-      (argument
-        label: (label) @label)))
+  arguments: (arguments
+    (argument
+      label: (label) @label)))
 
 (function_parameter
   label: (label)? @label
@@ -125,10 +123,9 @@
 
 ; Records
 (record
-  arguments:
-    (arguments
-      (argument
-        label: (label) @variable.member)?))
+  arguments: (arguments
+    (argument
+      label: (label) @variable.member)?))
 
 (record_pattern_argument
   label: (label) @variable.member)
@@ -173,9 +170,8 @@
   function: (identifier) @function.call)
 
 (function_call
-  function:
-    (field_access
-      field: (label) @function.call))
+  function: (field_access
+    field: (label) @function.call))
 
 ; External Functions
 (external_function
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index 1f2c4ed8a..9f11468d4 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -50,12 +50,11 @@
 
 ; As are arguments in a block statement
 (block_statement_start
-  argument:
-    [
-      (path_expression
-        (identifier) @variable)
-      (identifier) @variable
-    ])
+  argument: [
+    (path_expression
+      (identifier) @variable)
+    (identifier) @variable
+  ])
 
 ; As is an identifier in a block param
 (block_params
@@ -63,12 +62,11 @@
 
 ; As are helper arguments
 ((helper_invocation
-  argument:
-    [
-      (path_expression
-        (identifier) @variable)
-      (identifier) @variable
-    ])
+  argument: [
+    (path_expression
+      (identifier) @variable)
+    (identifier) @variable
+  ])
   (#not-eq? @variable "this"))
 
 ; `this` should be highlighted as a built-in variable
@@ -82,12 +80,11 @@
 
 ; Helpers are functions
 ((helper_invocation
-  helper:
-    [
-      (path_expression
-        (identifier) @function)
-      (identifier) @function
-    ])
+  helper: [
+    (path_expression
+      (identifier) @function)
+    (identifier) @function
+  ])
   (#not-any-of? @function "if" "yield"))
 
 ((helper_invocation
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 2fa3973d7..715fd133a 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -29,9 +29,8 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (selector_expression
-      field: (field_identifier) @function.method.call))
+  function: (selector_expression
+    field: (field_identifier) @function.method.call))
 
 ; Function definitions
 (function_declaration
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 3bc76cd7a..38ba3e110 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -20,24 +20,20 @@
   (#set! injection.language "re2c"))
 
 ((call_expression
-  function:
-    (selector_expression
-      field: (field_identifier) @_method)
-  arguments:
-    (argument_list
-      .
-      (interpreted_string_literal) @injection.content))
+  function: (selector_expression
+    field: (field_identifier) @_method)
+  arguments: (argument_list
+    .
+    (interpreted_string_literal) @injection.content))
   (#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf" "Errorf" "Skipf" "Logf")
   (#set! injection.language "printf"))
 
 ((call_expression
-  function:
-    (selector_expression
-      field: (field_identifier) @_method)
-  arguments:
-    (argument_list
-      (_)
-      .
-      (interpreted_string_literal) @injection.content))
+  function: (selector_expression
+    field: (field_identifier) @_method)
+  arguments: (argument_list
+    (_)
+    .
+    (interpreted_string_literal) @injection.content))
   (#any-of? @_method "Fprintf" "Fscanf" "Appendf" "Sscanf")
   (#set! injection.language "printf"))
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
index a8325f97c..608c45826 100644
--- a/queries/go/locals.scm
+++ b/queries/go/locals.scm
@@ -7,9 +7,8 @@
   )
 
 (short_var_declaration
-  left:
-    (expression_list
-      (identifier) @local.definition.var))
+  left: (expression_list
+    (identifier) @local.definition.var))
 
 (var_spec
   name: (identifier) @local.definition.var)
@@ -22,9 +21,8 @@
 
 (for_statement
   (range_clause
-    left:
-      (expression_list
-        (identifier) @local.definition.var)))
+    left: (expression_list
+      (identifier) @local.definition.var)))
 
 (const_declaration
   (const_spec
@@ -57,22 +55,19 @@
   (#set! reference.kind "call"))
 
 ((call_expression
-  function:
+  function: (selector_expression
+    field: (field_identifier) @local.reference))
+  (#set! reference.kind "call"))
+
+((call_expression
+  function: (parenthesized_expression
+    (identifier) @local.reference))
+  (#set! reference.kind "call"))
+
+((call_expression
+  function: (parenthesized_expression
     (selector_expression
-      field: (field_identifier) @local.reference))
-  (#set! reference.kind "call"))
-
-((call_expression
-  function:
-    (parenthesized_expression
-      (identifier) @local.reference))
-  (#set! reference.kind "call"))
-
-((call_expression
-  function:
-    (parenthesized_expression
-      (selector_expression
-        field: (field_identifier) @local.reference)))
+      field: (field_identifier) @local.reference)))
   (#set! reference.kind "call"))
 
 ; Scopes
diff --git a/queries/gotmpl/highlights.scm b/queries/gotmpl/highlights.scm
index e1629f816..ba69dc07d 100644
--- a/queries/gotmpl/highlights.scm
+++ b/queries/gotmpl/highlights.scm
@@ -11,9 +11,8 @@
   function: (identifier) @function)
 
 (method_call
-  method:
-    (selector_expression
-      field: (field_identifier) @function))
+  method: (selector_expression
+    field: (field_identifier) @function))
 
 ; Builtin functions
 (function_call
diff --git a/queries/gotmpl/injections.scm b/queries/gotmpl/injections.scm
index 787ca9925..3cfc26361 100644
--- a/queries/gotmpl/injections.scm
+++ b/queries/gotmpl/injections.scm
@@ -4,20 +4,18 @@
 ; {{"put" | printf "%s%s" "out" | printf "%q"}}
 (function_call
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      .
-      (interpreted_string_literal) @injection.content)
+  arguments: (argument_list
+    .
+    (interpreted_string_literal) @injection.content)
   (#eq? @_function "printf")
   (#set! injection.language "printf"))
 
 ; {{ js "var a = 1 + 1" }}
 (function_call
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      .
-      (interpreted_string_literal) @injection.content)
+  arguments: (argument_list
+    .
+    (interpreted_string_literal) @injection.content)
   (#eq? @_function "js")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.language "javascript"))
@@ -25,10 +23,9 @@
 ; {{ html "<h1>hello</h1>" }}
 (function_call
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      .
-      (interpreted_string_literal) @injection.content)
+  arguments: (argument_list
+    .
+    (interpreted_string_literal) @injection.content)
   (#eq? @_function "html")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.language "html"))
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index 1dad58363..0266ee1f7 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -215,9 +215,8 @@
   function: (identifier) @function)
 
 (function_call
-  function:
-    (dotted_identifier
-      (identifier) @function .))
+  function: (dotted_identifier
+    (identifier) @function .))
 
 (function_call
   (argument_list
@@ -228,9 +227,8 @@
   function: (identifier) @function)
 
 (juxt_function_call
-  function:
-    (dotted_identifier
-      (identifier) @function .))
+  function: (dotted_identifier
+    (identifier) @function .))
 
 (juxt_function_call
   (argument_list
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index f561dfe36..35d71e722 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -195,20 +195,17 @@
   (variable) @variable.parameter)
 
 (call_expression
-  function:
+  function: (qualified_identifier
+    (identifier) @function.call .))
+
+(call_expression
+  function: (scoped_identifier
+    (identifier) @function.call .))
+
+(call_expression
+  function: (selection_expression
     (qualified_identifier
-      (identifier) @function.call .))
-
-(call_expression
-  function:
-    (scoped_identifier
-      (identifier) @function.call .))
-
-(call_expression
-  function:
-    (selection_expression
-      (qualified_identifier
-        (identifier) @function.method.call .)))
+      (identifier) @function.method.call .)))
 
 (qualified_identifier
   (_) @module
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 33d9d2950..9cb4c8104 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -7,23 +7,20 @@
 (pat_wildcard) @variable
 
 (function
-  patterns:
-    (patterns
-      (_) @variable.parameter))
+  patterns: (patterns
+    (_) @variable.parameter))
 
 (exp_lambda
   (_)+ @variable.parameter
   "->")
 
 (function
-  infix:
-    (infix
-      lhs: (_) @variable.parameter))
+  infix: (infix
+    lhs: (_) @variable.parameter))
 
 (function
-  infix:
-    (infix
-      rhs: (_) @variable.parameter))
+  infix: (infix
+    rhs: (_) @variable.parameter))
 
 ; ----------------------------------------------------------------------------
 ; Literals and comments
@@ -185,7 +182,24 @@
 
 (function
   name: (variable) @variable
-  rhs:
+  rhs: [
+    (exp_literal)
+    (exp_apply
+      (exp_name
+        [
+          (constructor)
+          (variable)
+          (qualified_variable)
+        ]))
+    (quasiquote)
+    ((exp_name)
+      .
+      (operator))
+  ])
+
+(function
+  name: (variable) @variable
+  rhs: (exp_infix
     [
       (exp_literal)
       (exp_apply
@@ -199,26 +213,7 @@
       ((exp_name)
         .
         (operator))
-    ])
-
-(function
-  name: (variable) @variable
-  rhs:
-    (exp_infix
-      [
-        (exp_literal)
-        (exp_apply
-          (exp_name
-            [
-              (constructor)
-              (variable)
-              (qualified_variable)
-            ]))
-        (quasiquote)
-        ((exp_name)
-          .
-          (operator))
-      ]))
+    ]))
 
 ; Consider signatures (and accompanying functions)
 ; with only one value on the rhs as variables
@@ -403,14 +398,13 @@
 ; function defined in terms of a function composition
 (function
   name: (variable) @function
-  rhs:
-    (exp_infix
-      (_)
-      .
-      (operator) @_op
-      .
-      (_)
-      (#any-of? @_op "." ">>>" "***" ">=>" "<=<")))
+  rhs: (exp_infix
+    (_)
+    .
+    (operator) @_op
+    .
+    (_)
+    (#any-of? @_op "." ">>>" "***" ">=>" "<=<")))
 
 (exp_apply
   (exp_name
@@ -486,9 +480,8 @@
 
 ; scoped function types (func :: a -> b)
 (pat_typed
-  pattern:
-    (pat_name
-      (variable) @function)
+  pattern: (pat_name
+    (variable) @function)
   type: (fun))
 
 ; signatures that have a function type
@@ -618,12 +611,11 @@
     (variable) @variable.member))
 
 (exp_field
-  field:
-    [
-      (variable) @variable.member
-      (qualified_variable
-        (variable) @variable.member)
-    ])
+  field: [
+    (variable) @variable.member
+    (qualified_variable
+      (variable) @variable.member)
+  ])
 
 ; ----------------------------------------------------------------------------
 ; Spell checking
diff --git a/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
index 45a120dff..4fb7d1fca 100644
--- a/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -104,10 +104,9 @@
 ;
 ; highlight identifier keys as though they were block attributes
 (object_elem
-  key:
-    (expression
-      (variable_expr
-        (identifier) @variable.member)))
+  key: (expression
+    (variable_expr
+      (identifier) @variable.member)))
 
 ; var.foo, data.bar
 ;
diff --git a/queries/helm/highlights.scm b/queries/helm/highlights.scm
index ab5803a8a..05028ba93 100644
--- a/queries/helm/highlights.scm
+++ b/queries/helm/highlights.scm
@@ -31,11 +31,10 @@
 
 ; {{ .Values.test }}
 (selector_expression
-  operand:
-    (field
-      name: (identifier) @constant.builtin
-      (#any-of? @constant.builtin
-        "Values" "Chart" "Release" "Capabilities" "Files" "Subcharts" "Template"))
+  operand: (field
+    name: (identifier) @constant.builtin
+    (#any-of? @constant.builtin
+      "Values" "Chart" "Release" "Capabilities" "Files" "Subcharts" "Template"))
   (field_identifier))
 
 ; {{ $.Values.test }}
diff --git a/queries/helm/injections.scm b/queries/helm/injections.scm
index 12f1b7cc7..2adf8743a 100644
--- a/queries/helm/injections.scm
+++ b/queries/helm/injections.scm
@@ -7,10 +7,9 @@
 ; {{ regexFind "[a-zA-Z][1-9]" "abcd1234" }}
 (function_call
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      .
-      (interpreted_string_literal) @injection.content)
+  arguments: (argument_list
+    .
+    (interpreted_string_literal) @injection.content)
   (#any-of? @_function
     "regexMatch" "mustRegexMatch" "regexFindAll" "mustRegexFinDall" "regexFind" "mustRegexFind"
     "regexReplaceAll" "mustRegexReplaceAll" "regexReplaceAllLiteral" "mustRegexReplaceAllLiteral"
@@ -20,20 +19,18 @@
 
 (function_call
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      .
-      (interpreted_string_literal) @injection.content)
+  arguments: (argument_list
+    .
+    (interpreted_string_literal) @injection.content)
   (#any-of? @_function "fromYaml" "fromYamlArray")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.language "yaml"))
 
 (function_call
   function: (identifier) @_function
-  arguments:
-    (argument_list
-      .
-      (interpreted_string_literal) @injection.content)
+  arguments: (argument_list
+    .
+    (interpreted_string_literal) @injection.content)
   (#any-of? @_function "fromJson" "fromJsonArray")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.language "json"))
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index b515358e1..07bc6cd2f 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -111,9 +111,8 @@
 
 ; Fields
 (field_declaration
-  declarator:
-    (variable_declarator
-      name: (identifier) @variable.member))
+  declarator: (variable_declarator
+    name: (identifier) @variable.member))
 
 (field_access
   field: (identifier) @variable.member)
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 8113bea28..2ad7e5fe1 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -10,19 +10,17 @@
 
 ((method_invocation
   name: (identifier) @_method
-  arguments:
-    (argument_list
+  arguments: (argument_list
+    .
+    (string_literal
       .
-      (string_literal
-        .
-        (_) @injection.content)))
+      (_) @injection.content)))
   (#any-of? @_method "format" "printf")
   (#set! injection.language "printf"))
 
 ((method_invocation
-  object:
-    (string_literal
-      (string_fragment) @injection.content)
+  object: (string_literal
+    (string_fragment) @injection.content)
   name: (identifier) @_method)
   (#eq? @_method "formatted")
   (#set! injection.language "printf"))
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
index ac0715c93..53e950908 100644
--- a/queries/java/locals.scm
+++ b/queries/java/locals.scm
@@ -67,9 +67,8 @@
   name: (identifier) @local.definition.method)
 
 (local_variable_declaration
-  declarator:
-    (variable_declarator
-      name: (identifier) @local.definition.var))
+  declarator: (variable_declarator
+    name: (identifier) @local.definition.var))
 
 (enhanced_for_statement
   ; for (var item : items) {
@@ -92,9 +91,8 @@
   (#has-ancestor? @local.definition.import import_declaration))
 
 (field_declaration
-  declarator:
-    (variable_declarator
-      name: (identifier) @local.definition.field))
+  declarator: (variable_declarator
+    name: (identifier) @local.definition.field))
 
 ; REFERENCES
 (identifier) @local.reference
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index 892901c26..6d6846fc7 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -7,18 +7,16 @@
 ;     this.quuz = "qux";
 ;   }
 (field_definition
-  property:
-    [
-      (property_identifier)
-      (private_property_identifier)
-    ] @local.definition.var)
+  property: [
+    (property_identifier)
+    (private_property_identifier)
+  ] @local.definition.var)
 
 ; this.foo = "bar"
 (assignment_expression
-  left:
-    (member_expression
-      object: (this)
-      property: (property_identifier) @local.definition.var))
+  left: (member_expression
+    object: (this)
+    property: (property_identifier) @local.definition.var))
 
 (formal_parameters
   (identifier) @local.definition.parameter)
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
index 85670a25c..1e67baa32 100644
--- a/queries/jsonnet/highlights.scm
+++ b/queries/jsonnet/highlights.scm
@@ -104,15 +104,13 @@
 
 ; Functions
 (field
-  function:
-    (fieldname
-      (id) @function))
+  function: (fieldname
+    (id) @function))
 
 (field
-  function:
-    (fieldname
-      (string
-        (string_content) @function)))
+  function: (fieldname
+    (string
+      (string_content) @function)))
 
 (param
   identifier: (id) @variable.parameter)
diff --git a/queries/jsonnet/locals.scm b/queries/jsonnet/locals.scm
index ca03ef077..aa3a16c75 100644
--- a/queries/jsonnet/locals.scm
+++ b/queries/jsonnet/locals.scm
@@ -9,9 +9,8 @@
 (local_bind) @local.scope
 
 (field
-  function:
-    (fieldname
-      (id) @local.definition.function)
+  function: (fieldname
+    (id) @local.definition.function)
   (#set! "definition.function.scope" "parent"))
 
 (bind
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index 468eb8a3c..deb3c1598 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -1,18 +1,16 @@
 (jsx_element
-  open_tag:
-    (jsx_opening_element
-      [
-        "<"
-        ">"
-      ] @tag.delimiter))
+  open_tag: (jsx_opening_element
+    [
+      "<"
+      ">"
+    ] @tag.delimiter))
 
 (jsx_element
-  close_tag:
-    (jsx_closing_element
-      [
-        "</"
-        ">"
-      ] @tag.delimiter))
+  close_tag: (jsx_closing_element
+    [
+      "</"
+      ">"
+    ] @tag.delimiter))
 
 (jsx_self_closing_element
   [
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 1ff8b8e4e..5b8cf5bbb 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -31,14 +31,12 @@
   name: (identifier) @function)
 
 (function_definition
-  name:
-    (field_expression
-      (identifier) @function .))
+  name: (field_expression
+    (identifier) @function .))
 
 (short_function_definition
-  name:
-    (field_expression
-      (identifier) @function .))
+  name: (field_expression
+    (identifier) @function .))
 
 ; calls
 (call_expression
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 819a2ff94..1d795fc23 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -42,22 +42,19 @@
 ; General environments
 (begin
   command: _ @module
-  name:
-    (curly_group_text
-      (text) @label))
+  name: (curly_group_text
+    (text) @label))
 
 (end
   command: _ @module
-  name:
-    (curly_group_text
-      (text) @label))
+  name: (curly_group_text
+    (text) @label))
 
 ; Definitions and references
 (new_command_definition
   command: _ @function.macro
-  declaration:
-    (curly_group_command_name
-      (_) @function))
+  declaration: (curly_group_command_name
+    (_) @function))
 
 (old_command_definition
   command: _ @function.macro
@@ -69,48 +66,40 @@
 
 (environment_definition
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 (theorem_definition
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @label))
+  name: (curly_group_text
+    (_) @label))
 
 (paired_delimiter_definition
   command: _ @function.macro
-  declaration:
-    (curly_group_command_name
-      (_) @function))
+  declaration: (curly_group_command_name
+    (_) @function))
 
 (label_definition
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 (label_reference_range
   command: _ @function.macro
-  from:
-    (curly_group_text
-      (_) @markup.link)
-  to:
-    (curly_group_text
-      (_) @markup.link))
+  from: (curly_group_text
+    (_) @markup.link)
+  to: (curly_group_text
+    (_) @markup.link))
 
 (label_reference
   command: _ @function.macro
-  names:
-    (curly_group_text_list
-      (_) @markup.link))
+  names: (curly_group_text_list
+    (_) @markup.link))
 
 (label_number
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link)
+  name: (curly_group_text
+    (_) @markup.link)
   number: (_) @markup.link)
 
 (citation
@@ -119,52 +108,44 @@
 
 (glossary_entry_definition
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 (glossary_entry_reference
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 (acronym_definition
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 (acronym_reference
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 (color_definition
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 (color_reference
   command: _ @function.macro
-  name:
-    (curly_group_text
-      (_) @markup.link))
+  name: (curly_group_text
+    (_) @markup.link))
 
 ; Formatting
 (text_mode
-  content:
-    (curly_group
-      (_) @none @spell))
+  content: (curly_group
+    (_) @none @spell))
 
 (math_environment
   (begin
     command: _ @markup.math
-    name:
-      (curly_group_text
-        (_) @markup.math)))
+    name: (curly_group_text
+      (_) @markup.math)))
 
 (math_environment
   (_) @markup.math)
@@ -172,95 +153,76 @@
 (math_environment
   (end
     command: _ @markup.math
-    name:
-      (curly_group_text
-        (_) @markup.math)))
+    name: (curly_group_text
+      (_) @markup.math)))
 
 ; Sectioning
 (title_declaration
   command: _ @module
-  options:
-    (brack_group
-      (_) @markup.heading.1)?
-  text:
-    (curly_group
-      (_) @markup.heading.1))
+  options: (brack_group
+    (_) @markup.heading.1)?
+  text: (curly_group
+    (_) @markup.heading.1))
 
 (author_declaration
   command: _ @module
-  authors:
-    (curly_group_author_list
-      (author)+ @markup.heading.1))
+  authors: (curly_group_author_list
+    (author)+ @markup.heading.1))
 
 (chapter
   command: _ @module
-  toc:
-    (brack_group
-      (_) @markup.heading.2)?
-  text:
-    (curly_group
-      (_) @markup.heading.2))
+  toc: (brack_group
+    (_) @markup.heading.2)?
+  text: (curly_group
+    (_) @markup.heading.2))
 
 (part
   command: _ @module
-  toc:
-    (brack_group
-      (_) @markup.heading.2)?
-  text:
-    (curly_group
-      (_) @markup.heading.2))
+  toc: (brack_group
+    (_) @markup.heading.2)?
+  text: (curly_group
+    (_) @markup.heading.2))
 
 (section
   command: _ @module
-  toc:
-    (brack_group
-      (_) @markup.heading.3)?
-  text:
-    (curly_group
-      (_) @markup.heading.3))
+  toc: (brack_group
+    (_) @markup.heading.3)?
+  text: (curly_group
+    (_) @markup.heading.3))
 
 (subsection
   command: _ @module
-  toc:
-    (brack_group
-      (_) @markup.heading.4)?
-  text:
-    (curly_group
-      (_) @markup.heading.4))
+  toc: (brack_group
+    (_) @markup.heading.4)?
+  text: (curly_group
+    (_) @markup.heading.4))
 
 (subsubsection
   command: _ @module
-  toc:
-    (brack_group
-      (_) @markup.heading.5)?
-  text:
-    (curly_group
-      (_) @markup.heading.5))
+  toc: (brack_group
+    (_) @markup.heading.5)?
+  text: (curly_group
+    (_) @markup.heading.5))
 
 (paragraph
   command: _ @module
-  toc:
-    (brack_group
-      (_) @markup.heading.6)?
-  text:
-    (curly_group
-      (_) @markup.heading.6))
+  toc: (brack_group
+    (_) @markup.heading.6)?
+  text: (curly_group
+    (_) @markup.heading.6))
 
 (subparagraph
   command: _ @module
-  toc:
-    (brack_group
-      (_) @markup.heading.6)?
-  text:
-    (curly_group
-      (_) @markup.heading.6))
+  toc: (brack_group
+    (_) @markup.heading.6)?
+  text: (curly_group
+    (_) @markup.heading.6))
 
 ; Beamer frames
 (generic_environment
   (begin
-    name:
-      (curly_group_text
-        (text) @label)
+    name: (curly_group_text
+      (text) @label)
     (#any-of? @label "frame"))
   .
   (curly_group
@@ -268,38 +230,33 @@
 
 ((generic_command
   command: (command_name) @_name
-  arg:
-    (curly_group
-      (text) @markup.heading))
+  arg: (curly_group
+    (text) @markup.heading))
   (#eq? @_name "\\frametitle"))
 
 ((generic_command
   command: (command_name) @_name
-  arg:
-    (curly_group
-      (_) @markup.italic))
+  arg: (curly_group
+    (_) @markup.italic))
   (#eq? @_name "\\emph"))
 
 ((generic_command
   command: (command_name) @_name
-  arg:
-    (curly_group
-      (_) @markup.italic))
+  arg: (curly_group
+    (_) @markup.italic))
   (#any-of? @_name "\\textit" "\\mathit"))
 
 ((generic_command
   command: (command_name) @_name
-  arg:
-    (curly_group
-      (_) @markup.strong))
+  arg: (curly_group
+    (_) @markup.strong))
   (#any-of? @_name "\\textbf" "\\mathbf"))
 
 ((generic_command
   command: (command_name) @_name
   .
-  arg:
-    (curly_group
-      (_) @markup.link.url))
+  arg: (curly_group
+    (_) @markup.link.url))
   (#any-of? @_name "\\url" "\\href"))
 
 ; File inclusion commands
diff --git a/queries/latex/injections.scm b/queries/latex/injections.scm
index 189987a38..c0dbdc0a6 100644
--- a/queries/latex/injections.scm
+++ b/queries/latex/injections.scm
@@ -19,15 +19,13 @@
 
 (minted_environment
   (begin
-    language:
-      (curly_group_text
-        (text) @injection.language))
+    language: (curly_group_text
+      (text) @injection.language))
   (source_code) @injection.content)
 
 ((generic_environment
   (begin
-    name:
-      (curly_group_text
-        (text) @_env))) @injection.content
+    name: (curly_group_text
+      (text) @_env))) @injection.content
   (#set! injection.language "c")
   (#any-of? @_env "asy" "asydef"))
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 053d8116d..0c8f07f29 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -180,27 +180,24 @@
 (vararg_expression) @variable.parameter.builtin
 
 (function_declaration
-  name:
-    [
-      (identifier) @function
-      (dot_index_expression
-        field: (identifier) @function)
-    ])
+  name: [
+    (identifier) @function
+    (dot_index_expression
+      field: (identifier) @function)
+  ])
 
 (function_declaration
-  name:
-    (method_index_expression
-      method: (identifier) @function.method))
+  name: (method_index_expression
+    method: (identifier) @function.method))
 
 (assignment_statement
   (variable_list
     .
-    name:
-      [
-        (identifier) @function
-        (dot_index_expression
-          field: (identifier) @function)
-      ])
+    name: [
+      (identifier) @function
+      (dot_index_expression
+        field: (identifier) @function)
+    ])
   (expression_list
     .
     value: (function_definition)))
@@ -211,14 +208,13 @@
     value: (function_definition)))
 
 (function_call
-  name:
-    [
-      (identifier) @function.call
-      (dot_index_expression
-        field: (identifier) @function.call)
-      (method_index_expression
-        method: (identifier) @function.method.call)
-    ])
+  name: [
+    (identifier) @function.call
+    (dot_index_expression
+      field: (identifier) @function.call)
+    (method_index_expression
+      method: (identifier) @function.method.call)
+  ])
 
 (function_call
   (identifier) @function.builtin
@@ -253,21 +249,19 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (string
-        content: (string_content) @string.regexp)))
+  arguments: (arguments
+    .
+    (_)
+    .
+    (string
+      content: (string_content) @string.regexp)))
 
 ;("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (string
-        content: (string_content) @string.regexp)))
+  arguments: (arguments
+    .
+    (string
+      content: (string_content) @string.regexp)))
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index d1dcf87d6..4fccbcb14 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -1,49 +1,44 @@
 ((function_call
-  name:
-    [
-      (identifier) @_cdef_identifier
-      (_
-        _
-        (identifier) @_cdef_identifier)
-    ]
-  arguments:
-    (arguments
-      (string
-        content: _ @injection.content)))
+  name: [
+    (identifier) @_cdef_identifier
+    (_
+      _
+      (identifier) @_cdef_identifier)
+  ]
+  arguments: (arguments
+    (string
+      content: _ @injection.content)))
   (#set! injection.language "c")
   (#eq? @_cdef_identifier "cdef"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments:
-    (arguments
-      (string
-        content: _ @injection.content)))
+  arguments: (arguments
+    (string
+      content: _ @injection.content)))
   (#set! injection.language "vim")
   (#any-of? @_vimcmd_identifier
     "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_command" "vim.api.nvim_exec2"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments:
-    (arguments
-      (string
-        content: _ @injection.content) .))
+  arguments: (arguments
+    (string
+      content: _ @injection.content) .))
   (#set! injection.language "query")
   (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (string
-        content: _ @_method)
-      .
-      (string
-        content: _ @injection.content)))
+  arguments: (arguments
+    .
+    (_)
+    .
+    (string
+      content: _ @_method)
+    .
+    (string
+      content: _ @injection.content)))
   (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
   (#eq? @_method "nvim_exec_lua")
   (#set! injection.language "lua"))
@@ -51,17 +46,15 @@
 ; vim.api.nvim_create_autocmd("FileType", { command = "injected here" })
 (function_call
   name: (_) @_vimcmd_identifier
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (table_constructor
-        (field
-          name: (identifier) @_command
-          value:
-            (string
-              content: (_) @injection.content))) .)
+  arguments: (arguments
+    .
+    (_)
+    .
+    (table_constructor
+      (field
+        name: (identifier) @_command
+        value: (string
+          content: (_) @injection.content))) .)
   ; limit so only 2-argument functions gets matched before pred handle
   (#eq? @_vimcmd_identifier "vim.api.nvim_create_autocmd")
   (#eq? @_command "command")
@@ -69,31 +62,29 @@
 
 (function_call
   name: (_) @_user_cmd
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (string
-        content: (_) @injection.content)
-      .
-      (_) .)
+  arguments: (arguments
+    .
+    (_)
+    .
+    (string
+      content: (_) @injection.content)
+    .
+    (_) .)
   (#eq? @_user_cmd "vim.api.nvim_create_user_command")
   (#set! injection.language "vim"))
 
 (function_call
   name: (_) @_user_cmd
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (_)
-      .
-      (string
-        content: (_) @injection.content)
-      .
-      (_) .)
+  arguments: (arguments
+    .
+    (_)
+    .
+    (_)
+    .
+    (string
+      content: (_) @injection.content)
+    .
+    (_) .)
   ; Limiting predicate handling to only functions with 4 arguments
   (#eq? @_user_cmd "vim.api.nvim_buf_create_user_command")
   (#set! injection.language "vim"))
@@ -141,48 +132,44 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (string
-        content: (string_content) @injection.content
-        (#set! injection.language "luap")
-        (#set! injection.include-children))))
+  arguments: (arguments
+    .
+    (_)
+    .
+    (string
+      content: (string_content) @injection.content
+      (#set! injection.language "luap")
+      (#set! injection.include-children))))
 
 ;("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (string
-        content: (string_content) @injection.content
-        (#set! injection.language "luap")
-        (#set! injection.include-children))))
+  arguments: (arguments
+    .
+    (string
+      content: (string_content) @injection.content
+      (#set! injection.language "luap")
+      (#set! injection.include-children))))
 
 ; string.format("pi = %.2f", 3.14159)
 ((function_call
   (dot_index_expression
     field: (identifier) @_method)
-  arguments:
-    (arguments
-      .
-      (string
-        (string_content) @injection.content)))
+  arguments: (arguments
+    .
+    (string
+      (string_content) @injection.content)))
   (#eq? @_method "format")
   (#set! injection.language "printf"))
 
 ; ("pi = %.2f"):format(3.14159)
 ((function_call
   (method_index_expression
-    table:
-      (_
-        (string
-          (string_content) @injection.content))
+    table: (_
+      (string
+        (string_content) @injection.content))
     method: (identifier) @_method))
   (#eq? @_method "format")
   (#set! injection.language "printf"))
diff --git a/queries/lua/locals.scm b/queries/lua/locals.scm
index 8f50e844f..c4f36e8d4 100644
--- a/queries/lua/locals.scm
+++ b/queries/lua/locals.scm
@@ -27,19 +27,17 @@
   (#set! definition.function.scope "parent"))
 
 ((function_declaration
-  name:
-    (dot_index_expression
-      .
-      (_) @local.definition.associated
-      (identifier) @local.definition.function))
+  name: (dot_index_expression
+    .
+    (_) @local.definition.associated
+    (identifier) @local.definition.function))
   (#set! definition.method.scope "parent"))
 
 ((function_declaration
-  name:
-    (method_index_expression
-      .
-      (_) @local.definition.associated
-      (identifier) @local.definition.method))
+  name: (method_index_expression
+    .
+    (_) @local.definition.associated
+    (identifier) @local.definition.method))
   (#set! definition.method.scope "parent"))
 
 (for_generic_clause
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 8b71a31eb..08ed56b83 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -199,14 +199,12 @@
   name: (identifier) @function)
 
 (function_call
-  name:
-    (dot_index_expression
-      field: (identifier) @function.call))
+  name: (dot_index_expression
+    field: (identifier) @function.call))
 
 (function_declaration
-  name:
-    (dot_index_expression
-      field: (identifier) @function))
+  name: (dot_index_expression
+    field: (identifier) @function))
 
 (method_index_expression
   method: (identifier) @function.method.call)
@@ -256,13 +254,12 @@
 ] @punctuation.bracket
 
 (variable_list
-  attribute:
-    (attribute
-      ([
-        "<"
-        ">"
-      ] @punctuation.bracket
-        (identifier) @attribute)))
+  attribute: (attribute
+    ([
+      "<"
+      ">"
+    ] @punctuation.bracket
+      (identifier) @attribute)))
 
 (generic_type
   [
@@ -290,21 +287,19 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (string
-        content: _ @string.regexp)))
+  arguments: (arguments
+    .
+    (_)
+    .
+    (string
+      content: _ @string.regexp)))
 
 ; ("123"):match("%d+")
 (function_call
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (string
-        content: _ @string.regexp)))
+  arguments: (arguments
+    .
+    (string
+      content: _ @string.regexp)))
diff --git a/queries/luau/injections.scm b/queries/luau/injections.scm
index 4563f8ed4..558791520 100644
--- a/queries/luau/injections.scm
+++ b/queries/luau/injections.scm
@@ -1,15 +1,13 @@
 ((function_call
-  name:
-    [
-      (identifier) @_cdef_identifier
-      (_
-        _
-        (identifier) @_cdef_identifier)
-    ]
-  arguments:
-    (arguments
-      (string
-        content: _ @injection.content)))
+  name: [
+    (identifier) @_cdef_identifier
+    (_
+      _
+      (identifier) @_cdef_identifier)
+  ]
+  arguments: (arguments
+    (string
+      content: _ @injection.content)))
   (#eq? @_cdef_identifier "cdef")
   (#set! injection.language "c"))
 
@@ -23,13 +21,12 @@
   (dot_index_expression
     field: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (_)
-      .
-      (string
-        content: _ @injection.content))
+  arguments: (arguments
+    .
+    (_)
+    .
+    (string
+      content: _ @injection.content))
   (#set! injection.language "luap"))
 
 ; ("123"):match("%d+")
@@ -37,11 +34,10 @@
   (method_index_expression
     method: (identifier) @_method
     (#any-of? @_method "find" "format" "match" "gmatch" "gsub"))
-  arguments:
-    (arguments
-      .
-      (string
-        content: _ @injection.content))
+  arguments: (arguments
+    .
+    (string
+      content: _ @injection.content))
   (#set! injection.language "luap"))
 
 ((comment) @injection.content
diff --git a/queries/luau/locals.scm b/queries/luau/locals.scm
index 8e45c4743..d5420b4c8 100644
--- a/queries/luau/locals.scm
+++ b/queries/luau/locals.scm
@@ -30,19 +30,17 @@
   (#set! definition.function.scope "parent"))
 
 ((function_declaration
-  name:
-    (dot_index_expression
-      .
-      (_) @local.definition.associated
-      (identifier) @local.definition.function))
+  name: (dot_index_expression
+    .
+    (_) @local.definition.associated
+    (identifier) @local.definition.function))
   (#set! definition.method.scope "parent"))
 
 ((function_declaration
-  name:
-    (method_index_expression
-      .
-      (_) @local.definition.associated
-      (identifier) @local.definition.method))
+  name: (method_index_expression
+    .
+    (_) @local.definition.associated
+    (identifier) @local.definition.method))
   (#set! definition.method.scope "parent"))
 
 (for_generic_clause
diff --git a/queries/m68k/locals.scm b/queries/m68k/locals.scm
index 6e958b6f5..54e948a4b 100644
--- a/queries/m68k/locals.scm
+++ b/queries/m68k/locals.scm
@@ -20,8 +20,7 @@
   name: (symbol) @local.definition.constant)
 
 (external_reference
-  symbols:
-    (symbol_list
-      (symbol) @local.definition.import))
+  symbols: (symbol_list
+    (symbol) @local.definition.import))
 
 (symbol) @local.reference
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index b02dc4eba..f51616006 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -48,9 +48,8 @@
     "include"
     "-include"
   ] @keyword.import
-  filenames:
-    (list
-      (word) @string.special.path))
+  filenames: (list
+    (word) @string.special.path))
 
 (variable_assignment
   name: (word) @string.special.symbol
diff --git a/queries/nickel/highlights.scm b/queries/nickel/highlights.scm
index 3bb63ca2c..07673d797 100644
--- a/queries/nickel/highlights.scm
+++ b/queries/nickel/highlights.scm
@@ -66,11 +66,9 @@
 (builtin) @function.builtin
 
 (fun_expr
-  pats:
-    (pattern_fun
-      (ident) @variable.parameter))
+  pats: (pattern_fun
+    (ident) @variable.parameter))
 
 (applicative
-  t1:
-    (applicative
-      (record_operand) @function))
+  t1: (applicative
+    (record_operand) @function))
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index 104979b3f..c5207ff62 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -35,20 +35,16 @@
 ; NOTE: has to be before literals and punctuation etc.
 ; identifiers in "case" "of" branches have to be enums
 (case
-  alternative:
-    (of_branch
-      values:
-        (expression_list
-          (_) @constant)))
+  alternative: (of_branch
+    values: (expression_list
+      (_) @constant)))
 
 ; NOTE: has to be before literals and punctuation etc.
 ; in variant objects with "case" "of"
 (variant_declaration
-  alternative:
-    (of_branch
-      values:
-        (expression_list
-          (_) @constant)))
+  alternative: (of_branch
+    values: (expression_list
+      (_) @constant)))
 
 ; NOTE: has to be before literals and punctuation etc.
 ; =============================================================================
@@ -154,9 +150,8 @@
     (colon_expression
       left: (identifier) @_emit_keyword
       (#eq? @_emit_keyword "emit")
-      right:
-        (_
-          (string_content) @none))))
+      right: (_
+        (string_content) @none))))
 
 ; =============================================================================
 ; @string.escape        ; escape sequences
@@ -184,240 +179,215 @@
 ; =============================================================================
 ; @function         ; function definitions
 (proc_declaration
-  name:
-    [
-      (identifier) @function
+  name: [
+    (identifier) @function
+    (accent_quoted
+      (identifier) @function)
+    (exported_symbol
+      (identifier) @function)
+    (exported_symbol
       (accent_quoted
-        (identifier) @function)
-      (exported_symbol
-        (identifier) @function)
-      (exported_symbol
-        (accent_quoted
-          (identifier) @function))
-    ])
+        (identifier) @function))
+  ])
 
 (func_declaration
-  name:
-    [
-      (identifier) @function
+  name: [
+    (identifier) @function
+    (accent_quoted
+      (identifier) @function)
+    (exported_symbol
+      (identifier) @function)
+    (exported_symbol
       (accent_quoted
-        (identifier) @function)
-      (exported_symbol
-        (identifier) @function)
-      (exported_symbol
-        (accent_quoted
-          (identifier) @function))
-    ])
+        (identifier) @function))
+  ])
 
 (iterator_declaration
-  name:
-    [
-      (identifier) @function
+  name: [
+    (identifier) @function
+    (accent_quoted
+      (identifier) @function)
+    (exported_symbol
+      (identifier) @function)
+    (exported_symbol
       (accent_quoted
-        (identifier) @function)
-      (exported_symbol
-        (identifier) @function)
-      (exported_symbol
-        (accent_quoted
-          (identifier) @function))
-    ])
+        (identifier) @function))
+  ])
 
 (converter_declaration
-  name:
-    [
-      (identifier) @function
+  name: [
+    (identifier) @function
+    (accent_quoted
+      (identifier) @function)
+    (exported_symbol
+      (identifier) @function)
+    (exported_symbol
       (accent_quoted
-        (identifier) @function)
-      (exported_symbol
-        (identifier) @function)
-      (exported_symbol
-        (accent_quoted
-          (identifier) @function))
-    ])
+        (identifier) @function))
+  ])
 
 ; =============================================================================
 ; @function.call    ; function calls
 (call
-  function:
-    [
-      (identifier) @function.call
-      (accent_quoted
-        (identifier) @function.call)
-      ; generic types
-      (bracket_expression
-        left: (identifier) @function.call)
-      (bracket_expression
-        left:
-          (accent_quoted
-            (identifier) @function.call))
-      ; dot accessor
-      (dot_expression
-        right: (identifier) @function.call)
-      (dot_expression
-        right:
-          (accent_quoted
-            (identifier) @function.call))
-      ; both
-      (bracket_expression
-        left:
-          (dot_expression
-            right: (identifier) @function.call))
-      (bracket_expression
-        left:
-          (dot_expression
-            right:
-              (accent_quoted
-                (identifier) @function.call)))
-    ])
+  function: [
+    (identifier) @function.call
+    (accent_quoted
+      (identifier) @function.call)
+    ; generic types
+    (bracket_expression
+      left: (identifier) @function.call)
+    (bracket_expression
+      left: (accent_quoted
+        (identifier) @function.call))
+    ; dot accessor
+    (dot_expression
+      right: (identifier) @function.call)
+    (dot_expression
+      right: (accent_quoted
+        (identifier) @function.call))
+    ; both
+    (bracket_expression
+      left: (dot_expression
+        right: (identifier) @function.call))
+    (bracket_expression
+      left: (dot_expression
+        right: (accent_quoted
+          (identifier) @function.call)))
+  ])
 
 (dot_generic_call
-  function:
-    [
-      (identifier) @function.call
-      (accent_quoted
-        (identifier) @function.call)
-    ])
+  function: [
+    (identifier) @function.call
+    (accent_quoted
+      (identifier) @function.call)
+  ])
 
 ; generalized_string is a function call
 ; `identifier"string literal"`
 ; is short for
 ; `identifier(r"string literal")`
 (generalized_string
-  function:
-    [
-      (identifier) @function.call
-      (accent_quoted
-        (identifier) @function.call)
-    ])
+  function: [
+    (identifier) @function.call
+    (accent_quoted
+      (identifier) @function.call)
+  ])
 
 ; call with leading literal
 (dot_expression
-  left:
-    [
-      (nil_literal)
-      (integer_literal)
-      (float_literal)
-      (custom_numeric_literal)
-      (char_literal)
-      (interpreted_string_literal)
-      (long_string_literal)
-      (raw_string_literal)
-      (generalized_string)
+  left: [
+    (nil_literal)
+    (integer_literal)
+    (float_literal)
+    (custom_numeric_literal)
+    (char_literal)
+    (interpreted_string_literal)
+    (long_string_literal)
+    (raw_string_literal)
+    (generalized_string)
+    (array_construction)
+    ; for sequences
+    (prefix_expression
+      operator: (operator) @_at
       (array_construction)
-      ; for sequences
-      (prefix_expression
-        operator: (operator) @_at
-        (array_construction)
-        (#eq? @_at "@"))
-      (tuple_construction)
-      (curly_construction)
-    ]
-  right:
-    [
-      (identifier) @function.call
-      (accent_quoted
-        (identifier) @function.call)
-    ])
+      (#eq? @_at "@"))
+    (tuple_construction)
+    (curly_construction)
+  ]
+  right: [
+    (identifier) @function.call
+    (accent_quoted
+      (identifier) @function.call)
+  ])
 
 ; NOTE: will double capture as @function.call if it also has argument_list
 ; function.calls in `varargs[type, routine]`
 (bracket_expression
   left: (identifier) @_varargs
-  right:
-    (argument_list
-      .
-      (_)
-      .
-      [
-        (identifier) @function.call
-        (accent_quoted
-          (identifier) @function.call)
-        (dot_expression
-          right: (identifier) @function.call)
-        (dot_expression
-          right:
-            (accent_quoted
-              (identifier) @function.call))
-      ])
+  right: (argument_list
+    .
+    (_)
+    .
+    [
+      (identifier) @function.call
+      (accent_quoted
+        (identifier) @function.call)
+      (dot_expression
+        right: (identifier) @function.call)
+      (dot_expression
+        right: (accent_quoted
+          (identifier) @function.call))
+    ])
   (#eq? @_varargs "varargs"))
 
 ; =============================================================================
 ; @function.macro   ; preprocessor macros
 (template_declaration
-  name:
-    [
-      (identifier) @function.macro
+  name: [
+    (identifier) @function.macro
+    (accent_quoted
+      (identifier) @function.macro)
+    (exported_symbol
+      (identifier) @function.macro)
+    (exported_symbol
       (accent_quoted
-        (identifier) @function.macro)
-      (exported_symbol
-        (identifier) @function.macro)
-      (exported_symbol
-        (accent_quoted
-          (identifier) @function.macro))
-    ])
+        (identifier) @function.macro))
+  ])
 
 (macro_declaration
-  name:
-    [
-      (identifier) @function.macro
+  name: [
+    (identifier) @function.macro
+    (accent_quoted
+      (identifier) @function.macro)
+    (exported_symbol
+      (identifier) @function.macro)
+    (exported_symbol
       (accent_quoted
-        (identifier) @function.macro)
-      (exported_symbol
-        (identifier) @function.macro)
-      (exported_symbol
-        (accent_quoted
-          (identifier) @function.macro))
-    ])
+        (identifier) @function.macro))
+  ])
 
 ; =============================================================================
 ; @function.method           ; method definitions
 (method_declaration
-  name:
-    [
-      (identifier) @function.method
+  name: [
+    (identifier) @function.method
+    (accent_quoted
+      (identifier) @function.method)
+    (exported_symbol
+      (identifier) @function.method)
+    (exported_symbol
       (accent_quoted
-        (identifier) @function.method)
-      (exported_symbol
-        (identifier) @function.method)
-      (exported_symbol
-        (accent_quoted
-          (identifier) @function.method))
-    ])
+        (identifier) @function.method))
+  ])
 
 ; =============================================================================
 ; @constructor      ; constructor calls and definitions
 (call
-  function:
-    [
-      (identifier) @constructor
-      (accent_quoted
-        (identifier) @constructor)
-      ; generic types
-      (bracket_expression
-        left: (identifier) @constructor)
-      (bracket_expression
-        left:
-          (accent_quoted
-            (identifier) @constructor))
-      ; dot accessor
-      (dot_expression
-        right: (identifier) @constructor)
-      (dot_expression
-        right:
-          (accent_quoted
-            (identifier) @constructor))
-      ; both
-      (bracket_expression
-        left:
-          (dot_expression
-            right: (identifier) @constructor))
-      (bracket_expression
-        left:
-          (dot_expression
-            right:
-              (accent_quoted
-                (identifier) @constructor)))
-    ]
+  function: [
+    (identifier) @constructor
+    (accent_quoted
+      (identifier) @constructor)
+    ; generic types
+    (bracket_expression
+      left: (identifier) @constructor)
+    (bracket_expression
+      left: (accent_quoted
+        (identifier) @constructor))
+    ; dot accessor
+    (dot_expression
+      right: (identifier) @constructor)
+    (dot_expression
+      right: (accent_quoted
+        (identifier) @constructor))
+    ; both
+    (bracket_expression
+      left: (dot_expression
+        right: (identifier) @constructor))
+    (bracket_expression
+      left: (dot_expression
+        right: (accent_quoted
+          (identifier) @constructor)))
+  ]
   (argument_list
     (colon_expression)+))
 
@@ -520,12 +490,11 @@
 ; =============================================================================
 ; @label               ; GOTO and other labels (e.g. `label:` in C)
 (block
-  label:
-    [
-      (identifier) @label
-      (accent_quoted
-        (identifier) @label)
-    ])
+  label: [
+    (identifier) @label
+    (accent_quoted
+      (identifier) @label)
+  ])
 
 ; =============================================================================
 ; @keyword.import             ; keywords for including modules (e.g. `import` / `from` in Python)
@@ -554,9 +523,8 @@
 ; @type            ; type or class definitions and annotations
 ; generic types when calling
 (call
-  function:
-    (bracket_expression
-      right: (argument_list) @type))
+  function: (bracket_expression
+    right: (argument_list) @type))
 
 ; NOTE: this also falsely matches
 ; when accessing and directly call elements from an array of routines
@@ -567,11 +535,10 @@
 
 ; right side of `is` operator is always type
 (infix_expression
-  operator:
-    [
-      "is"
-      "isnot"
-    ]
+  operator: [
+    "is"
+    "isnot"
+  ]
   right: (_) @type)
 
 ; except branch always contains types of errors
@@ -582,16 +549,14 @@
 ; overrule special case in (except_branch) with "as" operator
 ; `except module.exception[gen_type] as variable:`
 (except_branch
-  values:
-    (expression_list
-      (infix_expression
-        operator: "as"
-        right:
-          [
-            (identifier) @variable
-            (accent_quoted
-              (identifier) @variable)
-          ])))
+  values: (expression_list
+    (infix_expression
+      operator: "as"
+      right: [
+        (identifier) @variable
+        (accent_quoted
+          (identifier) @variable)
+      ])))
 
 ; for inline tuple types
 ; `type a = tuple[a: int]`
@@ -608,24 +573,22 @@
 ; call(parameter_name=arg)
 (argument_list
   (equal_expression
-    left:
-      [
-        (identifier) @variable.parameter
-        (accent_quoted
-          (identifier) @variable.parameter)
-      ]))
+    left: [
+      (identifier) @variable.parameter
+      (accent_quoted
+        (identifier) @variable.parameter)
+    ]))
 
 ; parameters in function declaration
 (parameter_declaration_list
   (parameter_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name:
-          [
-            (identifier) @variable.parameter
-            (accent_quoted
-              (identifier) @variable.parameter)
-          ]))))
+        name: [
+          (identifier) @variable.parameter
+          (accent_quoted
+            (identifier) @variable.parameter)
+        ]))))
 
 ; NOTE: needs to be after @type
 ; generic types when declaring
@@ -633,43 +596,38 @@
   (parameter_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name:
-          [
-            (identifier) @variable.parameter
-            (accent_quoted
-              (identifier) @variable.parameter)
-          ]))))
+        name: [
+          (identifier) @variable.parameter
+          (accent_quoted
+            (identifier) @variable.parameter)
+        ]))))
 
 ; for loop variables
 (for
-  left:
-    (symbol_declaration_list
-      (symbol_declaration
-        name:
-          [
-            (identifier) @variable.parameter
-            (accent_quoted
-              (identifier) @variable.parameter)
-          ])))
+  left: (symbol_declaration_list
+    (symbol_declaration
+      name: [
+        (identifier) @variable.parameter
+        (accent_quoted
+          (identifier) @variable.parameter)
+      ])))
 
 ((tuple_deconstruct_declaration
   (symbol_declaration
-    name:
-      [
-        (identifier) @variable.parameter
-        (accent_quoted
-          (identifier) @variable.parameter)
-      ])) @_tuple_decons
+    name: [
+      (identifier) @variable.parameter
+      (accent_quoted
+        (identifier) @variable.parameter)
+    ])) @_tuple_decons
   (#has-ancestor? @_tuple_decons for))
 
 (concept_declaration
-  parameters:
-    (parameter_list
-      [
-        (identifier) @variable.parameter
-        (accent_quoted
-          (identifier) @variable.parameter)
-      ]))
+  parameters: (parameter_list
+    [
+      (identifier) @variable.parameter
+      (accent_quoted
+        (identifier) @variable.parameter)
+    ]))
 
 (var_parameter
   [
@@ -711,17 +669,16 @@
 (type_section
   (type_declaration
     (type_symbol_declaration
-      name:
-        [
-          (identifier) @type.definition
+      name: [
+        (identifier) @type.definition
+        (accent_quoted
+          (identifier) @type.definition)
+        (exported_symbol
+          (identifier) @type.definition)
+        (exported_symbol
           (accent_quoted
-            (identifier) @type.definition)
-          (exported_symbol
-            (identifier) @type.definition)
-          (exported_symbol
-            (accent_quoted
-              (identifier) @type.definition))
-        ])))
+            (identifier) @type.definition))
+      ])))
 
 ; =============================================================================
 ; @keyword.modifier  ; type qualifier keywords (e.g. `const`)
@@ -761,8 +718,41 @@
 (field_declaration
   (symbol_declaration_list
     (symbol_declaration
-      name:
-        [
+      name: [
+        (identifier) @variable.member
+        (accent_quoted
+          (identifier) @variable.member)
+        (exported_symbol
+          (identifier) @variable.member)
+        (exported_symbol
+          (accent_quoted
+            (identifier) @variable.member))
+      ])))
+
+; fields in object construction
+(call
+  (argument_list
+    (colon_expression
+      left: [
+        (identifier) @variable.member
+        (accent_quoted
+          (identifier) @variable.member)
+      ])))
+
+; fields in tuple construction
+(tuple_construction
+  (colon_expression
+    left: [
+      (identifier) @variable.member
+      (accent_quoted
+        (identifier) @variable.member)
+    ]))
+
+(variant_declaration
+  (variant_discriminator_declaration
+    (symbol_declaration_list
+      (symbol_declaration
+        name: [
           (identifier) @variable.member
           (accent_quoted
             (identifier) @variable.member)
@@ -771,44 +761,7 @@
           (exported_symbol
             (accent_quoted
               (identifier) @variable.member))
-        ])))
-
-; fields in object construction
-(call
-  (argument_list
-    (colon_expression
-      left:
-        [
-          (identifier) @variable.member
-          (accent_quoted
-            (identifier) @variable.member)
-        ])))
-
-; fields in tuple construction
-(tuple_construction
-  (colon_expression
-    left:
-      [
-        (identifier) @variable.member
-        (accent_quoted
-          (identifier) @variable.member)
-      ]))
-
-(variant_declaration
-  (variant_discriminator_declaration
-    (symbol_declaration_list
-      (symbol_declaration
-        name:
-          [
-            (identifier) @variable.member
-            (accent_quoted
-              (identifier) @variable.member)
-            (exported_symbol
-              (identifier) @variable.member)
-            (exported_symbol
-              (accent_quoted
-                (identifier) @variable.member))
-          ]))))
+        ]))))
 
 ; =============================================================================
 ; @variable.builtin ; built-in variable names (e.g. `this`)
@@ -824,84 +777,75 @@
 ; enum declaration
 (enum_field_declaration
   (symbol_declaration
-    name:
-      [
-        (identifier) @constant
-        (accent_quoted
-          (identifier) @constant)
-      ]))
+    name: [
+      (identifier) @constant
+      (accent_quoted
+        (identifier) @constant)
+    ]))
 
 ; constant declaration
 (const_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name:
-          [
-            (identifier) @constant
+        name: [
+          (identifier) @constant
+          (accent_quoted
+            (identifier) @constant)
+          (exported_symbol
+            (identifier) @constant)
+          (exported_symbol
             (accent_quoted
-              (identifier) @constant)
-            (exported_symbol
-              (identifier) @constant)
-            (exported_symbol
-              (accent_quoted
-                (identifier) @constant))
-          ]))))
+              (identifier) @constant))
+        ]))))
 
 ((tuple_deconstruct_declaration
   (symbol_declaration
-    name:
-      [
-        (identifier) @constant
+    name: [
+      (identifier) @constant
+      (accent_quoted
+        (identifier) @constant)
+      (exported_symbol
+        (identifier) @constant)
+      (exported_symbol
         (accent_quoted
-          (identifier) @constant)
-        (exported_symbol
-          (identifier) @constant)
-        (exported_symbol
-          (accent_quoted
-            (identifier) @constant))
-      ])) @_tuple_decons
+          (identifier) @constant))
+    ])) @_tuple_decons
   (#has-ancestor? @_tuple_decons const_section))
 
 ; constants x and y in `array[x..y, type]`
 (bracket_expression
   left: (identifier) @_array
-  right:
-    (argument_list
-      .
-      (infix_expression
-        right:
-          [
-            (identifier) @constant
-            (accent_quoted
-              (identifier) @constant)
-            (dot_expression
-              right: (identifier) @constant)
-            (dot_expression
-              right:
-                (accent_quoted
-                  (identifier) @constant))
-          ]))
+  right: (argument_list
+    .
+    (infix_expression
+      right: [
+        (identifier) @constant
+        (accent_quoted
+          (identifier) @constant)
+        (dot_expression
+          right: (identifier) @constant)
+        (dot_expression
+          right: (accent_quoted
+            (identifier) @constant))
+      ]))
   (#any-of? @_array "array" "range"))
 
 (bracket_expression
   left: (identifier) @_array
-  right:
-    (argument_list
-      .
-      (infix_expression
-        left:
-          [
-            (identifier) @constant
-            (accent_quoted
-              (identifier) @constant)
-            (dot_expression
-              right: (identifier) @constant)
-            (dot_expression
-              right:
-                (accent_quoted
-                  (identifier) @constant))
-          ]))
+  right: (argument_list
+    .
+    (infix_expression
+      left: [
+        (identifier) @constant
+        (accent_quoted
+          (identifier) @constant)
+        (dot_expression
+          right: (identifier) @constant)
+        (dot_expression
+          right: (accent_quoted
+            (identifier) @constant))
+      ]))
   (#any-of? @_array "array" "range"))
 
 ; NOTE: can only do this for (infix_expression)s, since standalone identifiers
@@ -926,19 +870,17 @@
   (expression_list
     (infix_expression
       operator: (operator) @_operator
-      right:
-        [
-          (identifier) @module
-          (array_construction
-            (identifier) @module)
-        ]))
+      right: [
+        (identifier) @module
+        (array_construction
+          (identifier) @module)
+      ]))
   (#eq? @_operator "/"))
 
 (import_from_statement
-  module:
-    (infix_expression
-      operator: (operator) @_operator
-      right: (identifier) @module)
+  module: (infix_expression
+    operator: (operator) @_operator
+    right: (identifier) @module)
   (#eq? @_operator "/"))
 
 (export_statement
@@ -949,12 +891,11 @@
 ; overrule things
 ; left identifier in dot_expression
 (dot_expression
-  left:
-    [
-      (identifier) @none
-      (accent_quoted
-        (identifier) @none)
-    ])
+  left: [
+    (identifier) @none
+    (accent_quoted
+      (identifier) @none)
+  ])
 
 ; NOTE: we can't know what the left identifier is, so better leave it alone
 ; for consistency
diff --git a/queries/nim/injections.scm b/queries/nim/injections.scm
index 2b3f0a990..da15fd84c 100644
--- a/queries/nim/injections.scm
+++ b/queries/nim/injections.scm
@@ -52,9 +52,8 @@
       (colon_expression
         left: (identifier) @_emit_keyword
         (#eq? @_emit_keyword "emit")
-        right:
-          (_
-            (string_content) @injection.content)))))
+        right: (_
+          (string_content) @injection.content)))))
 
 ; =============================================================================
 ; asm statement
diff --git a/queries/nim/locals.scm b/queries/nim/locals.scm
index d4d89b048..95279e2ea 100644
--- a/queries/nim/locals.scm
+++ b/queries/nim/locals.scm
@@ -1,11 +1,10 @@
 ; ==============================================================================
 ; @local.definition            ; various definitions
 (block
-  label:
-    [
-      (identifier) @local.definition
-      (accent_quoted) @local.definition
-    ])
+  label: [
+    (identifier) @local.definition
+    (accent_quoted) @local.definition
+  ])
 
 ; ==============================================================================
 ; @local.definition.constant   ; constants
@@ -13,79 +12,73 @@
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name:
-          [
-            (identifier) @local.definition.constant
-            (accent_quoted) @local.definition.constant
-            (exported_symbol
-              (identifier) @local.definition.constant)
-            (exported_symbol
-              (accent_quoted) @local.definition.constant)
-          ]))
+        name: [
+          (identifier) @local.definition.constant
+          (accent_quoted) @local.definition.constant
+          (exported_symbol
+            (identifier) @local.definition.constant)
+          (exported_symbol
+            (accent_quoted) @local.definition.constant)
+        ]))
     type: (type_expression)? @local.definition.associated))
 
 ; ==============================================================================
 ; @local.definition.function   ; functions
 (proc_declaration
-  name:
-    [
-      (identifier) @local.definition.function
-      (accent_quoted) @local.definition.function
-      (exported_symbol
-        (identifier) @local.definition.function)
-      (exported_symbol
-        (accent_quoted) @local.definition.function)
-    ]
+  name: [
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol
+      (identifier) @local.definition.function)
+    (exported_symbol
+      (accent_quoted) @local.definition.function)
+  ]
   (#set! "definition.function.scope" "parent"))
 
 (func_declaration
-  name:
-    [
-      (identifier) @local.definition.function
-      (accent_quoted) @local.definition.function
-      (exported_symbol
-        (identifier) @local.definition.function)
-      (exported_symbol
-        (accent_quoted) @local.definition.function)
-    ]
+  name: [
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol
+      (identifier) @local.definition.function)
+    (exported_symbol
+      (accent_quoted) @local.definition.function)
+  ]
   (#set! "definition.function.scope" "parent"))
 
 (iterator_declaration
-  name:
-    [
-      (identifier) @local.definition.function
-      (accent_quoted) @local.definition.function
-      (exported_symbol
-        (identifier) @local.definition.function)
-      (exported_symbol
-        (accent_quoted) @local.definition.function)
-    ]
+  name: [
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol
+      (identifier) @local.definition.function)
+    (exported_symbol
+      (accent_quoted) @local.definition.function)
+  ]
   (#set! "definition.function.scope" "parent"))
 
 (converter_declaration
-  name:
-    [
-      (identifier) @local.definition.function
-      (accent_quoted) @local.definition.function
-      (exported_symbol
-        (identifier) @local.definition.function)
-      (exported_symbol
-        (accent_quoted) @local.definition.function)
-    ]
+  name: [
+    (identifier) @local.definition.function
+    (accent_quoted) @local.definition.function
+    (exported_symbol
+      (identifier) @local.definition.function)
+    (exported_symbol
+      (accent_quoted) @local.definition.function)
+  ]
   (#set! "definition.function.scope" "parent"))
 
 ; ==============================================================================
 ; @local.definition.method     ; methods
 (method_declaration
-  name:
-    [
-      (identifier) @local.definition.method
-      (accent_quoted) @local.definition.method
-      (exported_symbol
-        (identifier) @local.definition.method)
-      (exported_symbol
-        (accent_quoted) @local.definition.method)
-    ]
+  name: [
+    (identifier) @local.definition.method
+    (accent_quoted) @local.definition.method
+    (exported_symbol
+      (identifier) @local.definition.method)
+    (exported_symbol
+      (accent_quoted) @local.definition.method)
+  ]
   (#set! "definition.method.scope" "parent"))
 
 ; ==============================================================================
@@ -94,72 +87,65 @@
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name:
-          [
-            (identifier) @local.definition.var
-            (accent_quoted) @local.definition.var
-            (exported_symbol
-              (identifier) @local.definition.var)
-            (exported_symbol
-              (accent_quoted) @local.definition.var)
-          ]))
+        name: [
+          (identifier) @local.definition.var
+          (accent_quoted) @local.definition.var
+          (exported_symbol
+            (identifier) @local.definition.var)
+          (exported_symbol
+            (accent_quoted) @local.definition.var)
+        ]))
     type: (type_expression)? @local.definition.associated))
 
 (let_section
   (variable_declaration
     (symbol_declaration_list
       (symbol_declaration
-        name:
-          [
-            (identifier) @local.definition.var
-            (accent_quoted) @local.definition.var
-            (exported_symbol
-              (identifier) @local.definition.var)
-            (exported_symbol
-              (accent_quoted) @local.definition.var)
-          ]))
+        name: [
+          (identifier) @local.definition.var
+          (accent_quoted) @local.definition.var
+          (exported_symbol
+            (identifier) @local.definition.var)
+          (exported_symbol
+            (accent_quoted) @local.definition.var)
+        ]))
     type: (type_expression)? @local.definition.associated))
 
 (for
   (symbol_declaration_list
     (symbol_declaration
-      name:
-        [
-          (identifier) @local.definition.var
-          (accent_quoted) @local.definition.var
-        ])))
+      name: [
+        (identifier) @local.definition.var
+        (accent_quoted) @local.definition.var
+      ])))
 
 (try
   (except_branch
-    values:
-      (expression_list
-        (infix_expression
-          right:
-            [
-              (identifier) @local.definition.var
-              (accent_quoted) @local.definition.var
-            ]))))
+    values: (expression_list
+      (infix_expression
+        right: [
+          (identifier) @local.definition.var
+          (accent_quoted) @local.definition.var
+        ]))))
 
 ; ==============================================================================
 ; @local.definition.parameter  ; parameters
 (parameter_declaration
   (symbol_declaration_list
     (symbol_declaration
-      name:
-        [
-          (identifier) @local.definition.parameter
-          (accent_quoted) @local.definition.parameter
-        ]))
+      name: [
+        (identifier) @local.definition.parameter
+        (accent_quoted) @local.definition.parameter
+      ]))
   type: (type_expression)? @local.definition.associated)
 
 (concept_declaration
-  parameters:
-    (parameter_list
-      [
-        (identifier) @local.definition.parameter
-        (accent_quoted
-          (identifier) @local.definition.parameter)
-      ]))
+  parameters: (parameter_list
+    [
+      (identifier) @local.definition.parameter
+      (accent_quoted
+        (identifier) @local.definition.parameter)
+    ]))
 
 (var_parameter
   [
@@ -199,42 +185,39 @@
 ; ==============================================================================
 ; @local.definition.macro      ; preprocessor macros
 (template_declaration
-  name:
-    [
-      (identifier) @local.definition.macro
-      (accent_quoted) @local.definition.macro
-      (exported_symbol
-        (identifier) @local.definition.macro)
-      (exported_symbol
-        (accent_quoted) @local.definition.macro)
-    ]
+  name: [
+    (identifier) @local.definition.macro
+    (accent_quoted) @local.definition.macro
+    (exported_symbol
+      (identifier) @local.definition.macro)
+    (exported_symbol
+      (accent_quoted) @local.definition.macro)
+  ]
   (#set! "definition.macro.scope" "parent"))
 
 (macro_declaration
-  name:
-    [
-      (identifier) @local.definition.macro
-      (accent_quoted) @local.definition.macro
-      (exported_symbol
-        (identifier) @local.definition.macro)
-      (exported_symbol
-        (accent_quoted) @local.definition.macro)
-    ]
+  name: [
+    (identifier) @local.definition.macro
+    (accent_quoted) @local.definition.macro
+    (exported_symbol
+      (identifier) @local.definition.macro)
+    (exported_symbol
+      (accent_quoted) @local.definition.macro)
+  ]
   (#set! "definition.macro.scope" "parent"))
 
 ; ==============================================================================
 ; @local.definition.type       ; types or classes
 (type_declaration
   (type_symbol_declaration
-    name:
-      [
-        (identifier) @local.definition.type
-        (accent_quoted) @local.definition.type
-        (exported_symbol
-          (identifier) @local.definition.type)
-        (exported_symbol
-          (accent_quoted) @local.definition.type)
-      ]))
+    name: [
+      (identifier) @local.definition.type
+      (accent_quoted) @local.definition.type
+      (exported_symbol
+        (identifier) @local.definition.type)
+      (exported_symbol
+        (accent_quoted) @local.definition.type)
+    ]))
 
 ; ==============================================================================
 ; @local.definition.field      ; fields or properties
@@ -246,15 +229,14 @@
 (field_declaration
   (symbol_declaration_list
     (symbol_declaration
-      name:
-        [
-          (identifier) @local.definition.field
-          (accent_quoted) @local.definition.field
-          (exported_symbol
-            (identifier) @local.definition.field)
-          (exported_symbol
-            (accent_quoted) @local.definition.field)
-        ]))
+      name: [
+        (identifier) @local.definition.field
+        (accent_quoted) @local.definition.field
+        (exported_symbol
+          (identifier) @local.definition.field)
+        (exported_symbol
+          (accent_quoted) @local.definition.field)
+      ]))
   type: (type_expression)? @local.definition.associated)
 
 ; ==============================================================================
@@ -262,11 +244,10 @@
 (enum_declaration
   (enum_field_declaration
     (symbol_declaration
-      name:
-        [
-          (identifier) @local.definition.enum
-          (accent_quoted) @local.definition.enum
-        ])))
+      name: [
+        (identifier) @local.definition.enum
+        (accent_quoted) @local.definition.enum
+      ])))
 
 ; ==============================================================================
 ; @local.definition.namespace  ; modules or namespaces
@@ -285,19 +266,17 @@
   (expression_list
     (infix_expression
       operator: (operator) @_operator
-      right:
-        [
-          (identifier) @local.definition.namespace
-          (array_construction
-            (identifier) @local.definition.namespace)
-        ]))
+      right: [
+        (identifier) @local.definition.namespace
+        (array_construction
+          (identifier) @local.definition.namespace)
+      ]))
   (#eq? @_operator "/"))
 
 (import_from_statement
-  module:
-    (infix_expression
-      operator: (operator) @_operator
-      right: (identifier) @local.definition.namespace)
+  module: (infix_expression
+    operator: (operator) @_operator
+    right: (identifier) @local.definition.namespace)
   (expression_list
     [
       (identifier) @local.definition.import
diff --git a/queries/nim_format_string/highlights.scm b/queries/nim_format_string/highlights.scm
index 44fc80260..fde9e4ba0 100644
--- a/queries/nim_format_string/highlights.scm
+++ b/queries/nim_format_string/highlights.scm
@@ -16,6 +16,5 @@
   type: (type)? @type)
 
 (matching_curlies
-  nim_expression:
-    (nim_expression
-      escaped_curly: (escaped_curly)+ @string.escape) @none)
+  nim_expression: (nim_expression
+    escaped_curly: (escaped_curly)+ @string.escape) @none)
diff --git a/queries/ninja/highlights.scm b/queries/ninja/highlights.scm
index 8e7268953..8323ee9e9 100644
--- a/queries/ninja/highlights.scm
+++ b/queries/ninja/highlights.scm
@@ -65,9 +65,8 @@
 ; ------------------
 (manifest
   (let
-    name:
-      ((identifier) @constant.builtin
-        (#any-of? @constant.builtin "builddir" "ninja_required_version"))))
+    name: ((identifier) @constant.builtin
+      (#any-of? @constant.builtin "builddir" "ninja_required_version"))))
 
 ; Rules bindings
 ; -----------------
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 9baf8c4a7..9f00167c4 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -84,9 +84,8 @@
 
 ; function calls
 (apply_expression
-  function:
-    (variable_expression
-      name: (identifier) @function.call))
+  function: (variable_expression
+    name: (identifier) @function.call))
 
 ; basic identifiers
 (variable_expression) @variable
@@ -101,12 +100,10 @@
 
 ; builtin functions (with builtins prefix)
 (select_expression
-  expression:
-    (variable_expression
-      name: (identifier) @_id)
-  attrpath:
-    (attrpath
-      attr: (identifier) @function.builtin)
+  expression: (variable_expression
+    name: (identifier) @_id)
+  attrpath: (attrpath
+    attr: (identifier) @function.builtin)
   (#eq? @_id "builtins"))
 
 ; builtin functions (without builtins prefix)
@@ -158,9 +155,8 @@
 
 (select_expression
   expression: (_) @_expr
-  attrpath:
-    (attrpath
-      attr: (identifier) @variable.member)
+  attrpath: (attrpath
+    attr: (identifier) @variable.member)
   (#not-eq? @_expr "builtins"))
 
 (attrset_expression
@@ -179,9 +175,8 @@
 
 ; function definition
 (binding
-  attrpath:
-    (attrpath
-      attr: (identifier) @function)
+  attrpath: (attrpath
+    attr: (identifier) @function)
   expression: (function_expression))
 
 ; unary operators
diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index 5d86d3697..8feff0f8a 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -14,193 +14,165 @@
 
 (apply_expression
   function: (_) @_func
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "regex")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "regex")))
-    ]
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "regex")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "regex")))
+  ]
   (#match? @_func "(^|\\.)match$")
   (#set! injection.combined))
 
 (binding
-  attrpath:
-    (attrpath
-      (identifier) @_path)
-  expression:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "bash")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "bash")))
-    ]
+  attrpath: (attrpath
+    (identifier) @_path)
+  expression: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ]
   (#match? @_path "(^\\w+(Phase|Hook|Check)|(pre|post)[A-Z]\\w+|script)$"))
 
 (apply_expression
   function: (_) @_func
-  argument:
+  argument: (_
+    (_)*
     (_
       (_)*
-      (_
-        (_)*
-        (binding
-          attrpath:
-            (attrpath
-              (identifier) @_path)
-          expression:
-            [
-              (string_expression
-                ((string_fragment) @injection.content
-                  (#set! injection.language "bash")))
-              (indented_string_expression
-                ((string_fragment) @injection.content
-                  (#set! injection.language "bash")))
-            ])))
+      (binding
+        attrpath: (attrpath
+          (identifier) @_path)
+        expression: [
+          (string_expression
+            ((string_fragment) @injection.content
+              (#set! injection.language "bash")))
+          (indented_string_expression
+            ((string_fragment) @injection.content
+              (#set! injection.language "bash")))
+        ])))
   (#match? @_func "(^|\\.)writeShellApplication$")
   (#match? @_path "^text$")
   (#set! injection.combined))
 
 (apply_expression
-  function:
-    (apply_expression
-      function:
-        (apply_expression
-          function: (_) @_func))
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "bash")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "bash")))
-    ]
+  function: (apply_expression
+    function: (apply_expression
+      function: (_) @_func))
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ]
   (#match? @_func "(^|\\.)runCommand((No)?CC)?(Local)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function:
-    (apply_expression
-      function: (_) @_func)
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "bash")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "bash")))
-    ])
+  function: (apply_expression
+    function: (_) @_func)
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ])
   (#match? @_func "(^|\\.)write(Bash|Dash|ShellScript)(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function:
-    (apply_expression
-      function: (_) @_func)
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "fish")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "fish")))
-    ])
+  function: (apply_expression
+    function: (_) @_func)
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "fish")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "fish")))
+  ])
   (#match? @_func "(^|\\.)writeFish(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function:
-    (apply_expression
-      function:
-        (apply_expression
-          function: (_) @_func))
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "haskell")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "haskell")))
-    ])
+  function: (apply_expression
+    function: (apply_expression
+      function: (_) @_func))
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "haskell")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "haskell")))
+  ])
   (#match? @_func "(^|\\.)writeHaskell(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function:
-    (apply_expression
-      function:
-        (apply_expression
-          function: (_) @_func))
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "javascript")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "javascript")))
-    ])
+  function: (apply_expression
+    function: (apply_expression
+      function: (_) @_func))
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "javascript")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "javascript")))
+  ])
   (#match? @_func "(^|\\.)writeJS(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function:
-    (apply_expression
-      function:
-        (apply_expression
-          function: (_) @_func))
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "perl")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "perl")))
-    ])
+  function: (apply_expression
+    function: (apply_expression
+      function: (_) @_func))
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "perl")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "perl")))
+  ])
   (#match? @_func "(^|\\.)writePerl(Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function:
-    (apply_expression
-      function:
-        (apply_expression
-          function: (_) @_func))
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "python")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "python")))
-    ])
+  function: (apply_expression
+    function: (apply_expression
+      function: (_) @_func))
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "python")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "python")))
+  ])
   (#match? @_func "(^|\\.)write(PyPy|Python)[23](Bin)?$")
   (#set! injection.combined))
 
 ((apply_expression
-  function:
-    (apply_expression
-      function:
-        (apply_expression
-          function: (_) @_func))
-  argument:
-    [
-      (string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "rust")))
-      (indented_string_expression
-        ((string_fragment) @injection.content
-          (#set! injection.language "rust")))
-    ])
+  function: (apply_expression
+    function: (apply_expression
+      function: (_) @_func))
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "rust")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "rust")))
+  ])
   (#match? @_func "(^|\\.)writeRust(Bin)?$")
   (#set! injection.combined))
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index 50ac7a78b..b068bf13c 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -244,12 +244,10 @@
   declarator: (identifier) @variable.parameter)
 
 (parameter_declaration
-  declarator:
-    (function_declarator
-      declarator:
-        (parenthesized_declarator
-          (block_pointer_declarator
-            declarator: (identifier) @variable.parameter))))
+  declarator: (function_declarator
+    declarator: (parenthesized_declarator
+      (block_pointer_declarator
+        declarator: (identifier) @variable.parameter))))
 
 "..." @variable.parameter.builtin
 
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 3863d405e..abd0f6bd4 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -40,11 +40,10 @@
 
 (let_binding
   pattern: (value_name) @function
-  body:
-    [
-      (fun_expression)
-      (function_expression)
-    ])
+  body: [
+    (fun_expression)
+    (function_expression)
+  ])
 
 (value_specification
   (value_name) @function)
@@ -57,23 +56,20 @@
 ; Application
 ;------------
 (infix_expression
-  left:
-    (value_path
-      (value_name) @function.call)
+  left: (value_path
+    (value_name) @function.call)
   operator: (concat_operator) @_operator
   (#eq? @_operator "@@"))
 
 (infix_expression
   operator: (rel_operator) @_operator
-  right:
-    (value_path
-      (value_name) @function.call)
+  right: (value_path
+    (value_name) @function.call)
   (#eq? @_operator "|>"))
 
 (application_expression
-  function:
-    (value_path
-      (value_name) @function.call))
+  function: (value_path
+    (value_name) @function.call))
 
 ((value_name) @function.builtin
   (#any-of? @function.builtin "raise" "raise_notrace" "failwith" "invalid_arg"))
diff --git a/queries/ocaml/locals.scm b/queries/ocaml/locals.scm
index 38f1f15f2..38d392609 100644
--- a/queries/ocaml/locals.scm
+++ b/queries/ocaml/locals.scm
@@ -28,16 +28,14 @@
   (#set! definition.var.scope "parent"))
 
 (let_binding
-  pattern:
-    (tuple_pattern
-      (value_name) @local.definition.var)
+  pattern: (tuple_pattern
+    (value_name) @local.definition.var)
   (#set! definition.var.scope "parent"))
 
 (let_binding
-  pattern:
-    (record_pattern
-      (field_pattern
-        (value_name) @local.definition.var))
+  pattern: (record_pattern
+    (field_pattern
+      (value_name) @local.definition.var))
   (#set! definition.var.scope "parent"))
 
 (external
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index 3511386ca..d6014ee1d 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -291,9 +291,8 @@
   name: (identifier) @type)
 
 (declType
-  name:
-    (genericTpl
-      entity: (identifier) @type))
+  name: (genericTpl
+    entity: (identifier) @type))
 
 ; -- Procedure & function declarations
 ; foobar
@@ -302,23 +301,19 @@
 
 ; foobar<t>
 (declProc
-  name:
-    (genericTpl
-      entity: (identifier) @function))
+  name: (genericTpl
+    entity: (identifier) @function))
 
 ; foo.bar
 (declProc
-  name:
-    (genericDot
-      rhs: (identifier) @function))
+  name: (genericDot
+    rhs: (identifier) @function))
 
 ; foo.bar<t>
 (declProc
-  name:
-    (genericDot
-      rhs:
-        (genericTpl
-          entity: (identifier) @function)))
+  name: (genericDot
+    rhs: (genericTpl
+      entity: (identifier) @function)))
 
 ; Treat property declarations like functions
 (declProp
@@ -342,9 +337,8 @@
   type: (typeref) @type)
 
 (declProc
-  name:
-    (genericDot
-      lhs: (identifier) @type))
+  name: (genericDot
+    lhs: (identifier) @type))
 
 (declType
   (genericDot
@@ -362,9 +356,8 @@
   entity: (identifier) @type)
 
 (genericTpl
-  entity:
-    (genericDot
-      (identifier) @type))
+  entity: (genericDot
+    (identifier) @type))
 
 ; -- Exception parameters
 (exceptionHandler
@@ -432,23 +425,19 @@
 
 ; foobar<t>
 (exprCall
-  entity:
-    (exprTpl
-      entity: (identifier) @function))
+  entity: (exprTpl
+    entity: (identifier) @function))
 
 ; foo.bar
 (exprCall
-  entity:
-    (exprDot
-      rhs: (identifier) @function))
+  entity: (exprDot
+    rhs: (identifier) @function))
 
 ; foo.bar<t>
 (exprCall
-  entity:
-    (exprDot
-      rhs:
-        (exprTpl
-          entity: (identifier) @function)))
+  entity: (exprDot
+    rhs: (exprTpl
+      entity: (identifier) @function)))
 
 (inherited) @function
 
@@ -469,9 +458,8 @@
 
 (statement
   (exprDot
-    rhs:
-      (exprTpl
-        entity: (identifier) @function)))
+    rhs: (exprTpl
+      entity: (identifier) @function)))
 
 ; -- Break, Continue & Exit
 ; (Not ideal: ideally, there would be a way to check if these special
@@ -482,9 +470,8 @@
 
 (statement
   (exprCall
-    entity:
-      ((identifier) @keyword.return
-        (#lua-match? @keyword.return "^[eE][xX][iI][tT]$"))))
+    entity: ((identifier) @keyword.return
+      (#lua-match? @keyword.return "^[eE][xX][iI][tT]$"))))
 
 (statement
   ((identifier) @keyword.repeat
@@ -505,9 +492,8 @@
     (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
 
 (assignment
-  rhs:
-    ((identifier) @constant
-      (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+  rhs: ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
 
 (exprBrackets
   ((identifier) @constant
@@ -518,14 +504,12 @@
     (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
 
 (exprDot
-  rhs:
-    ((identifier) @constant
-      (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+  rhs: ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
 
 (exprTpl
-  args:
-    ((identifier) @constant
-      (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
+  args: ((identifier) @constant
+    (#match? @constant "^[A-Z][A-Z0-9_]+$|^[a-z]{2,3}[A-Z].+$")))
 
 (exprArgs
   ((identifier) @constant
diff --git a/queries/pascal/locals.scm b/queries/pascal/locals.scm
index bb12cb2d2..d74d54ad4 100644
--- a/queries/pascal/locals.scm
+++ b/queries/pascal/locals.scm
@@ -45,9 +45,8 @@
   name: (identifier) @local.definition)
 
 (declType
-  name:
-    (genericTpl
-      entity: (identifier) @local.definition))
+  name: (genericTpl
+    entity: (identifier) @local.definition))
 
 (declProc
   name: (identifier) @local.definition)
diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 20d35c18e..557421d9f 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -60,12 +60,11 @@
   ])
 
 (scoped_call_expression
-  scope:
-    [
-      (name) @type
-      (qualified_name
-        (name) @type)
-    ])
+  scope: [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
 
 (class_constant_access_expression
   .
@@ -84,12 +83,11 @@
 
 (binary_expression
   operator: "instanceof"
-  right:
-    [
-      (name) @type
-      (qualified_name
-        (name) @type)
-    ])
+  right: [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
 
 ; Functions, methods, constructors
 (array_creation_expression
@@ -102,9 +100,8 @@
   name: (name) @function.method)
 
 (function_call_expression
-  function:
-    (qualified_name
-      (name) @function.call))
+  function: (qualified_name
+    (name) @function.call))
 
 (function_call_expression
   (name) @function.call)
@@ -146,17 +143,15 @@
   (variable_name) @property)
 
 (member_access_expression
-  name:
-    (variable_name
-      (name)) @variable.member)
+  name: (variable_name
+    (name)) @variable.member)
 
 (member_access_expression
   name: (name) @variable.member)
 
 (nullsafe_member_access_expression
-  name:
-    (variable_name
-      (name)) @variable.member)
+  name: (variable_name
+    (name)) @variable.member)
 
 (nullsafe_member_access_expression
   name: (name) @variable.member)
@@ -169,9 +164,8 @@
 
 ; Namespace
 (namespace_definition
-  name:
-    (namespace_name
-      (name) @module))
+  name: (namespace_name
+    (name) @module))
 
 (namespace_name_as_prefix
   (namespace_name
diff --git a/queries/php_only/injections.scm b/queries/php_only/injections.scm
index 8e60cdd34..b13449b9f 100644
--- a/queries/php_only/injections.scm
+++ b/queries/php_only/injections.scm
@@ -16,24 +16,22 @@
 ; regex
 ((function_call_expression
   function: (_) @_preg_func_identifier
-  arguments:
-    (arguments
-      .
-      (argument
-        (_
-          (string_value) @injection.content))))
+  arguments: (arguments
+    .
+    (argument
+      (_
+        (string_value) @injection.content))))
   (#set! injection.language "regex")
   (#lua-match? @_preg_func_identifier "^preg_"))
 
 ; bash
 ((function_call_expression
   function: (_) @_shell_func_identifier
-  arguments:
-    (arguments
-      .
-      (argument
-        (_
-          (string_value) @injection.content))))
+  arguments: (arguments
+    .
+    (argument
+      (_
+        (string_value) @injection.content))))
   (#set! injection.language "bash")
   (#any-of? @_shell_func_identifier
     "shell_exec" "escapeshellarg" "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec"
diff --git a/queries/php_only/locals.scm b/queries/php_only/locals.scm
index 8d509b37c..aff2b3dae 100644
--- a/queries/php_only/locals.scm
+++ b/queries/php_only/locals.scm
@@ -67,10 +67,9 @@
   (#set! reference.kind "method"))
 
 (function_call_expression
-  function:
-    (qualified_name
-      (name) @local.reference
-      (#set! reference.kind "function")))
+  function: (qualified_name
+    (name) @local.reference
+    (#set! reference.kind "function")))
 
 (object_creation_expression
   (qualified_name
@@ -78,9 +77,8 @@
     (#set! reference.kind "type")))
 
 (scoped_call_expression
-  scope:
-    (qualified_name
-      (name) @local.reference
-      (#set! reference.kind "type"))
+  scope: (qualified_name
+    (name) @local.reference
+    (#set! reference.kind "type"))
   name: (name) @local.reference
   (#set! reference.kind "method"))
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
index 06b0006b3..53024d5e5 100644
--- a/queries/pony/highlights.scm
+++ b/queries/pony/highlights.scm
@@ -133,15 +133,14 @@
   (#set! "priority" 105))
 
 (call_expression
-  callee:
-    [
-      (identifier) @function.method.call
-      (ffi_identifier
-        (identifier) @function.method.call)
-      (member_expression
-        "."
-        (identifier) @function.method.call)
-    ])
+  callee: [
+    (identifier) @function.method.call
+    (ffi_identifier
+      (identifier) @function.method.call)
+    (member_expression
+      "."
+      (identifier) @function.method.call)
+  ])
 
 ; Parameters
 (parameter
@@ -168,22 +167,20 @@
 
 ; Operators
 (unary_expression
-  operator:
-    [
-      "not"
-      "addressof"
-      "digestof"
-    ] @keyword.operator)
+  operator: [
+    "not"
+    "addressof"
+    "digestof"
+  ] @keyword.operator)
 
 (binary_expression
-  operator:
-    [
-      "and"
-      "or"
-      "xor"
-      "is"
-      "isnt"
-    ] @keyword.operator)
+  operator: [
+    "and"
+    "or"
+    "xor"
+    "is"
+    "isnt"
+  ] @keyword.operator)
 
 [
   "="
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index 582e50764..d1698d736 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -42,9 +42,8 @@
   name: (identifier) @attribute)
 
 (attribute
-  name:
-    (variable
-      (identifier) @attribute))
+  name: (variable
+    (identifier) @attribute))
 
 ; Parameters
 (lambda
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index fea97bed3..d35f7307c 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -35,9 +35,8 @@
 
 ((assignment
   left: (identifier) @type.definition
-  right:
-    (call
-      function: (identifier) @_func))
+  right: (call
+    function: (identifier) @_func))
   (#any-of? @_func "TypeVar" "NewType"))
 
 ; Function calls
@@ -45,18 +44,16 @@
   function: (identifier) @function.call)
 
 (call
-  function:
-    (attribute
-      attribute: (identifier) @function.method.call))
+  function: (attribute
+    attribute: (identifier) @function.method.call))
 
 ((call
   function: (identifier) @constructor)
   (#lua-match? @constructor "^%u"))
 
 ((call
-  function:
-    (attribute
-      attribute: (identifier) @constructor))
+  function: (attribute
+    attribute: (identifier) @constructor))
   (#lua-match? @constructor "^%u"))
 
 ; Decorators
@@ -109,10 +106,9 @@
 
 ((call
   function: (identifier) @_isinstance
-  arguments:
-    (argument_list
-      (_)
-      (identifier) @type))
+  arguments: (argument_list
+    (_)
+    (identifier) @type))
   (#eq? @_isinstance "isinstance"))
 
 ; Normal parameters
@@ -211,18 +207,16 @@
     (string) @string.documentation @spell))
 
 (class_definition
-  body:
-    (block
-      .
-      (expression_statement
-        (string) @string.documentation @spell)))
+  body: (block
+    .
+    (expression_statement
+      (string) @string.documentation @spell)))
 
 (function_definition
-  body:
-    (block
-      .
-      (expression_statement
-        (string) @string.documentation @spell)))
+  body: (block
+    .
+    (expression_statement
+      (string) @string.documentation @spell)))
 
 ; Tokens
 [
@@ -378,32 +372,27 @@
   name: (identifier) @type)
 
 (class_definition
-  body:
-    (block
-      (function_definition
-        name: (identifier) @function.method)))
+  body: (block
+    (function_definition
+      name: (identifier) @function.method)))
 
 (class_definition
-  superclasses:
-    (argument_list
-      (identifier) @type))
+  superclasses: (argument_list
+    (identifier) @type))
 
 ((class_definition
-  body:
-    (block
-      (expression_statement
-        (assignment
-          left: (identifier) @variable.member))))
+  body: (block
+    (expression_statement
+      (assignment
+        left: (identifier) @variable.member))))
   (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition
-  body:
-    (block
-      (expression_statement
-        (assignment
-          left:
-            (_
-              (identifier) @variable.member)))))
+  body: (block
+    (expression_statement
+      (assignment
+        left: (_
+          (identifier) @variable.member)))))
   (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition
@@ -434,12 +423,10 @@
 
 ; Regex from the `re` module
 (call
-  function:
-    (attribute
-      object: (identifier) @_re)
-  arguments:
-    (argument_list
-      .
-      (string
-        (string_content) @string.regexp))
+  function: (attribute
+    object: (identifier) @_re)
+  arguments: (argument_list
+    .
+    (string
+      (string_content) @string.regexp))
   (#eq? @_re "re"))
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index 94005ebab..dbda25b5c 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -164,9 +164,8 @@
     (attribute
       attribute: (_) @indent.end)
     (call
-      arguments:
-        (_
-          ")" @indent.end))
+      arguments: (_
+        ")" @indent.end))
     "return" @indent.end
   ] .)
 
diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index 3db20929e..bbc924be4 100644
--- a/queries/python/injections.scm
+++ b/queries/python/injections.scm
@@ -1,19 +1,16 @@
 (call
-  function:
-    (attribute
-      object: (identifier) @_re)
-  arguments:
-    (argument_list
-      .
-      (string
-        (string_content) @injection.content))
+  function: (attribute
+    object: (identifier) @_re)
+  arguments: (argument_list
+    .
+    (string
+      (string_content) @injection.content))
   (#eq? @_re "re")
   (#set! injection.language "regex"))
 
 ((binary_operator
-  left:
-    (string
-      (string_content) @injection.content)
+  left: (string
+    (string_content) @injection.content)
   operator: "%")
   (#set! injection.language "printf"))
 
diff --git a/queries/python/locals.scm b/queries/python/locals.scm
index e0454dbf4..6a9dffe23 100644
--- a/queries/python/locals.scm
+++ b/queries/python/locals.scm
@@ -2,34 +2,29 @@
 (module) @local.scope
 
 (class_definition
-  body:
-    (block
-      (expression_statement
-        (assignment
-          left: (identifier) @local.definition.field)))) @local.scope
+  body: (block
+    (expression_statement
+      (assignment
+        left: (identifier) @local.definition.field)))) @local.scope
 
 (class_definition
-  body:
-    (block
-      (expression_statement
-        (assignment
-          left:
-            (_
-              (identifier) @local.definition.field))))) @local.scope
+  body: (block
+    (expression_statement
+      (assignment
+        left: (_
+          (identifier) @local.definition.field))))) @local.scope
 
 ; Imports
 (aliased_import
   alias: (identifier) @local.definition.import)
 
 (import_statement
-  name:
-    (dotted_name
-      (identifier) @local.definition.import))
+  name: (dotted_name
+    (identifier) @local.definition.import))
 
 (import_from_statement
-  name:
-    (dotted_name
-      (identifier) @local.definition.import))
+  name: (dotted_name
+    (identifier) @local.definition.import))
 
 ; Function with parameters, defines parameters
 (parameters
@@ -64,22 +59,19 @@
   (#set! definition.type.scope "parent"))
 
 (class_definition
-  body:
-    (block
-      (function_definition
-        name: (identifier) @local.definition.method)))
+  body: (block
+    (function_definition
+      name: (identifier) @local.definition.method)))
 
 ; Loops
 ; not a scope!
 (for_statement
-  left:
-    (pattern_list
-      (identifier) @local.definition.var))
+  left: (pattern_list
+    (identifier) @local.definition.var))
 
 (for_statement
-  left:
-    (tuple_pattern
-      (identifier) @local.definition.var))
+  left: (tuple_pattern
+    (identifier) @local.definition.var))
 
 (for_statement
   left: (identifier) @local.definition.var)
@@ -91,14 +83,12 @@
   left: (identifier) @local.definition.var)
 
 (for_in_clause
-  left:
-    (tuple_pattern
-      (identifier) @local.definition.var))
+  left: (tuple_pattern
+    (identifier) @local.definition.var))
 
 (for_in_clause
-  left:
-    (pattern_list
-      (identifier) @local.definition.var))
+  left: (pattern_list
+    (identifier) @local.definition.var))
 
 (dictionary_comprehension) @local.scope
 
@@ -111,20 +101,17 @@
   left: (identifier) @local.definition.var)
 
 (assignment
-  left:
-    (pattern_list
-      (identifier) @local.definition.var))
+  left: (pattern_list
+    (identifier) @local.definition.var))
 
 (assignment
-  left:
-    (tuple_pattern
-      (identifier) @local.definition.var))
+  left: (tuple_pattern
+    (identifier) @local.definition.var))
 
 (assignment
-  left:
-    (attribute
-      (identifier)
-      (identifier) @local.definition.field))
+  left: (attribute
+    (identifier)
+    (identifier) @local.definition.field))
 
 ; Walrus operator  x := 1
 (named_expression
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index b4b30d0aa..d543074be 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -4,12 +4,11 @@
 ; Annotations
 (ui_annotation
   "@" @operator
-  type_name:
-    [
-      (identifier) @attribute
-      (nested_identifier
-        (identifier) @attribute)
-    ])
+  type_name: [
+    (identifier) @attribute
+    (nested_identifier
+      (identifier) @attribute)
+  ])
 
 ; type
 (ui_property
@@ -17,28 +16,25 @@
 
 ; Properties
 (ui_object_definition_binding
-  name:
-    [
-      (identifier) @property
-      (nested_identifier
-        (identifier) @property)
-    ])
+  name: [
+    (identifier) @property
+    (nested_identifier
+      (identifier) @property)
+  ])
 
 (ui_binding
-  name:
-    [
-      (identifier) @property
-      (nested_identifier
-        (identifier) @property)
-    ])
+  name: [
+    (identifier) @property
+    (nested_identifier
+      (identifier) @property)
+  ])
 
 ; locals query appears not working unless id: <ref> isn't a parameter.
 (ui_binding
   name: (identifier) @property
   (#eq? @property "id")
-  value:
-    (expression_statement
-      (identifier) @variable))
+  value: (expression_statement
+    (identifier) @variable))
 
 (ui_property
   name: (identifier) @property)
@@ -77,10 +73,9 @@
 
 ; function
 (call_expression
-  function:
-    (member_expression
-      object: (identifier) @variable
-      property: (property_identifier) @function))
+  function: (member_expression
+    object: (identifier) @variable
+    property: (property_identifier) @function))
 
 ; js
 ; Literals
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index cdedb23e2..abc7aa50a 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -68,20 +68,18 @@
 
 ((predicate
   name: (identifier) @_name
-  parameters:
-    (parameters
-      (string
-        "\"" @string
-        "\"" @string) @string.regexp))
+  parameters: (parameters
+    (string
+      "\"" @string
+      "\"" @string) @string.regexp))
   (#any-of? @_name "match" "not-match" "vim-match" "not-vim-match" "lua-match" "not-lua-match"))
 
 ((predicate
   name: (identifier) @_name
-  parameters:
-    (parameters
-      (string
-        "\"" @string
-        "\"" @string) @string.regexp
-      .
-      (string) .))
+  parameters: (parameters
+    (string
+      "\"" @string
+      "\"" @string) @string.regexp
+    .
+    (string) .))
   (#any-of? @_name "gsub" "not-gsub"))
diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index dd1a8556c..408d88e28 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -1,28 +1,25 @@
 ((predicate
   name: (identifier) @_name
-  parameters:
-    (parameters
-      (string) @injection.content))
+  parameters: (parameters
+    (string) @injection.content))
   (#any-of? @_name "match" "not-match" "vim-match" "not-vim-match")
   (#set! injection.language "regex")
   (#offset! @injection.content 0 1 0 -1))
 
 ((predicate
   name: (identifier) @_name
-  parameters:
-    (parameters
-      (string) @injection.content))
+  parameters: (parameters
+    (string) @injection.content))
   (#any-of? @_name "lua-match" "not-lua-match")
   (#set! injection.language "luap")
   (#offset! @injection.content 0 1 0 -1))
 
 ((predicate
   name: (identifier) @_name
-  parameters:
-    (parameters
-      (string) @injection.content
-      .
-      (string) .))
+  parameters: (parameters
+    (string) @injection.content
+    .
+    (string) .))
   (#any-of? @_name "gsub" "not-gsub")
   (#set! injection.language "luap")
   (#offset! @injection.content 0 1 0 -1))
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index 1ce166ee0..784a54242 100755
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -55,36 +55,34 @@
 ] @operator
 
 (unary
-  operator:
-    [
-      "-"
-      "+"
-      "!"
-      "~"
-      "?"
-    ] @operator)
+  operator: [
+    "-"
+    "+"
+    "!"
+    "~"
+    "?"
+  ] @operator)
 
 (binary
-  operator:
-    [
-      "-"
-      "+"
-      "*"
-      "/"
-      "^"
-      "<"
-      ">"
-      "<="
-      ">="
-      "=="
-      "!="
-      "||"
-      "|"
-      "&&"
-      "&"
-      ":"
-      "~"
-    ] @operator)
+  operator: [
+    "-"
+    "+"
+    "*"
+    "/"
+    "^"
+    "<"
+    ">"
+    "<="
+    ">="
+    "=="
+    "!="
+    "||"
+    "|"
+    "&&"
+    "&"
+    ":"
+    "~"
+  ] @operator)
 
 [
   "|>"
@@ -157,7 +155,6 @@
     function: (identifier) @function.call))
 
 (call
-  function:
-    (dollar
-      _
-      (identifier) @function.method.call))
+  function: (dollar
+    _
+    (identifier) @function.method.call))
diff --git a/queries/rego/highlights.scm b/queries/rego/highlights.scm
index b738eb9db..3cc32949d 100644
--- a/queries/rego/highlights.scm
+++ b/queries/rego/highlights.scm
@@ -44,14 +44,12 @@
 (number) @number
 
 (expr_call
-  func_name:
-    (fn_name
-      (var) @function .))
+  func_name: (fn_name
+    (var) @function .))
 
 (expr_call
-  func_arguments:
-    (fn_args
-      (expr) @variable.parameter))
+  func_arguments: (fn_args
+    (expr) @variable.parameter))
 
 (rule_args
   (term) @variable.parameter)
diff --git a/queries/robot/indents.scm b/queries/robot/indents.scm
index a4d81c852..457fbff66 100644
--- a/queries/robot/indents.scm
+++ b/queries/robot/indents.scm
@@ -8,11 +8,10 @@
   "END" @indent.branch)
 
 (for_statement
-  right:
-    (_
-      (arguments
-        (continuation
-          (ellipses) @indent.branch))))
+  right: (_
+    (arguments
+      (continuation
+        (ellipses) @indent.branch))))
 
 (while_statement) @indent.begin
 
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index 27c37142c..2d1b33eff 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -22,9 +22,8 @@
   name: (type) @function)
 
 (directive
-  body:
-    (body
-      (arguments) @variable.parameter))
+  body: (body
+    (arguments) @variable.parameter))
 
 ((directive
   name: (type) @keyword.import)
@@ -143,9 +142,8 @@
 
 (directive
   name: (type) @_directive
-  body:
-    (body
-      (content) @spell
-      (#not-any-of? @_directive "code" "code-block" "sourcecode")))
+  body: (body
+    (content) @spell
+    (#not-any-of? @_directive "code" "code-block" "sourcecode")))
 
 (paragraph) @spell
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index da57daa65..7178de9da 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -14,10 +14,9 @@
 ; Directives with nested content without arguments, but with options
 ((directive
   name: (type) @_type
-  body:
-    (body
-      (options)
-      (content) @injection.content))
+  body: (body
+    (options)
+    (content) @injection.content))
   (#set! injection.language "rst")
   (#any-of? @_type
     "attention" "caution" "danger" "error" "hint" "important" "note" "tip" "warning" "admonition"
@@ -26,9 +25,8 @@
 ; Directives with nested content with arguments and options
 ((directive
   name: (type) @_type
-  body:
-    (body
-      (content) @injection.content))
+  body: (body
+    (content) @injection.content))
   (#set! injection.language "rst")
   (#any-of? @_type
     "figure" "topic" "sidebar" "container" "table" "list-table" "class" "role"
@@ -37,25 +35,22 @@
 ; Special directives
 ((directive
   name: (type) @_type
-  body:
-    (body
-      (arguments) @injection.language
-      (content) @injection.content))
+  body: (body
+    (arguments) @injection.language
+    (content) @injection.content))
   (#any-of? @_type "raw" "code" "code-block" "sourcecode"))
 
 ((directive
   name: (type) @_type
-  body:
-    (body
-      (content) @injection.content))
+  body: (body
+    (content) @injection.content))
   (#set! injection.language "latex")
   (#eq? @_type "math"))
 
 ((directive
   name: (type) @_type
-  body:
-    (body
-      (content) @injection.content))
+  body: (body
+    (content) @injection.content))
   (#set! injection.language "csv")
   (#eq? @_type "csv-table"))
 
diff --git a/queries/rst/locals.scm b/queries/rst/locals.scm
index 477c4ef3b..ce4235b43 100644
--- a/queries/rst/locals.scm
+++ b/queries/rst/locals.scm
@@ -24,9 +24,8 @@
 ; The role directive can define a new role
 ((directive
   name: (type) @_type
-  body:
-    (body
-      (arguments) @local.definition))
+  body: (body
+    (arguments) @local.definition))
   (#eq? @_type "role"))
 
 ; References
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index c0e71e1dc..15f709128 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -78,11 +78,10 @@
 
 (call
   receiver: (constant)? @type
-  method:
-    [
-      (identifier)
-      (constant)
-    ] @function.call)
+  method: [
+    (identifier)
+    (constant)
+  ] @function.call)
 
 (program
   (call
@@ -97,18 +96,16 @@
   (identifier) @function)
 
 (method
-  name:
-    [
-      (identifier) @function
-      (constant) @type
-    ])
+  name: [
+    (identifier) @function
+    (constant) @type
+  ])
 
 (singleton_method
-  name:
-    [
-      (identifier) @function
-      (constant) @type
-    ])
+  name: [
+    (identifier) @function
+    (constant) @type
+  ])
 
 (class
   name: (constant) @type)
diff --git a/queries/ruby/locals.scm b/queries/ruby/locals.scm
index 2a27c93a2..29a67e2ba 100644
--- a/queries/ruby/locals.scm
+++ b/queries/ruby/locals.scm
@@ -42,18 +42,16 @@
   name: (constant) @local.definition.type)
 
 (method
-  name:
-    [
-      (identifier)
-      (constant)
-    ] @local.definition.function)
+  name: [
+    (identifier)
+    (constant)
+  ] @local.definition.function)
 
 (singleton_method
-  name:
-    [
-      (identifier)
-      (constant)
-    ] @local.definition.function)
+  name: [
+    (identifier)
+    (constant)
+  ] @local.definition.function)
 
 (method_parameters
   (identifier) @local.definition.var)
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 332ee12fa..4b83014a0 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -55,27 +55,23 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (scoped_identifier
-      (identifier) @function.call .))
+  function: (scoped_identifier
+    (identifier) @function.call .))
 
 (call_expression
-  function:
-    (field_expression
-      field: (field_identifier) @function.call))
+  function: (field_expression
+    field: (field_identifier) @function.call))
 
 (generic_function
   function: (identifier) @function.call)
 
 (generic_function
-  function:
-    (scoped_identifier
-      name: (identifier) @function.call))
+  function: (scoped_identifier
+    name: (identifier) @function.call))
 
 (generic_function
-  function:
-    (field_expression
-      field: (field_identifier) @function.call))
+  function: (field_expression
+    field: (field_identifier) @function.call))
 
 ; Assume other uppercase names are enum constructors
 ((field_identifier) @constant
@@ -136,9 +132,8 @@
   path: (identifier) @module)
 
 (scoped_use_list
-  path:
-    (scoped_identifier
-      (identifier) @module))
+  path: (scoped_identifier
+    (identifier) @module))
 
 (use_list
   (scoped_identifier
@@ -156,24 +151,21 @@
 
 ; Correct enum constructors
 (call_expression
-  function:
-    (scoped_identifier
-      "::"
-      name: (identifier) @constant)
+  function: (scoped_identifier
+    "::"
+    name: (identifier) @constant)
   (#lua-match? @constant "^[A-Z]"))
 
 ; Assume uppercase names in a match arm are constants.
 ((match_arm
-  pattern:
-    (match_pattern
-      (identifier) @constant))
+  pattern: (match_pattern
+    (identifier) @constant))
   (#lua-match? @constant "^[A-Z]"))
 
 ((match_arm
-  pattern:
-    (match_pattern
-      (scoped_identifier
-        name: (identifier) @constant)))
+  pattern: (match_pattern
+    (scoped_identifier
+      name: (identifier) @constant)))
   (#lua-match? @constant "^[A-Z]"))
 
 ((identifier) @constant.builtin
@@ -210,9 +202,8 @@
   macro: (identifier) @function.macro)
 
 (macro_invocation
-  macro:
-    (scoped_identifier
-      (identifier) @function.macro .))
+  macro: (scoped_identifier
+    (identifier) @function.macro .))
 
 ; Literals
 [
diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index c4737ab80..d56a246c6 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -55,42 +55,35 @@
   "}" @indent.end)
 
 (enum_item
-  body:
-    (enum_variant_list
-      "}" @indent.end))
+  body: (enum_variant_list
+    "}" @indent.end))
 
 (impl_item
-  body:
-    (declaration_list
-      "}" @indent.end))
+  body: (declaration_list
+    "}" @indent.end))
 
 (match_expression
-  body:
-    (match_block
-      "}" @indent.end))
+  body: (match_block
+    "}" @indent.end))
 
 (mod_item
-  body:
-    (declaration_list
-      "}" @indent.end))
+  body: (declaration_list
+    "}" @indent.end))
 
 (struct_item
-  body:
-    (field_declaration_list
-      "}" @indent.end))
+  body: (field_declaration_list
+    "}" @indent.end))
 
 (struct_expression
-  body:
-    (field_initializer_list
-      "}" @indent.end))
+  body: (field_initializer_list
+    "}" @indent.end))
 
 (struct_pattern
   "}" @indent.end)
 
 (trait_item
-  body:
-    (declaration_list
-      "}" @indent.end))
+  body: (declaration_list
+    "}" @indent.end))
 
 (impl_item
   (where_clause) @indent.dedent)
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index 629f707c7..c8c360199 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -1,22 +1,20 @@
 (macro_invocation
-  macro:
-    [
-      (scoped_identifier
-        name: (_) @_macro_name)
-      (identifier) @_macro_name
-    ]
+  macro: [
+    (scoped_identifier
+      name: (_) @_macro_name)
+    (identifier) @_macro_name
+  ]
   (token_tree) @injection.content
   (#not-eq? @_macro_name "slint")
   (#set! injection.language "rust")
   (#set! injection.include-children))
 
 (macro_invocation
-  macro:
-    [
-      (scoped_identifier
-        name: (_) @_macro_name)
-      (identifier) @_macro_name
-    ]
+  macro: [
+    (scoped_identifier
+      name: (_) @_macro_name)
+    (identifier) @_macro_name
+  ]
   (token_tree) @injection.content
   (#eq? @_macro_name "slint")
   (#offset! @injection.content 0 1 0 -1)
@@ -45,57 +43,47 @@
   (#any-of? @injection.language "html" "json"))
 
 (call_expression
-  function:
-    (scoped_identifier
-      path: (identifier) @_regex
-      (#any-of? @_regex "Regex" "ByteRegexBuilder")
-      name: (identifier) @_new
-      (#eq? @_new "new"))
-  arguments:
-    (arguments
-      (raw_string_literal) @injection.content)
+  function: (scoped_identifier
+    path: (identifier) @_regex
+    (#any-of? @_regex "Regex" "ByteRegexBuilder")
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (raw_string_literal) @injection.content)
   (#set! injection.language "regex"))
 
 (call_expression
-  function:
-    (scoped_identifier
-      path:
-        (scoped_identifier
-          (identifier) @_regex
-          (#any-of? @_regex "Regex" "ByteRegexBuilder") .)
-      name: (identifier) @_new
-      (#eq? @_new "new"))
-  arguments:
-    (arguments
-      (raw_string_literal) @injection.content)
+  function: (scoped_identifier
+    path: (scoped_identifier
+      (identifier) @_regex
+      (#any-of? @_regex "Regex" "ByteRegexBuilder") .)
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (raw_string_literal) @injection.content)
   (#set! injection.language "regex"))
 
 (call_expression
-  function:
-    (scoped_identifier
-      path: (identifier) @_regex
-      (#any-of? @_regex "RegexSet" "RegexSetBuilder")
-      name: (identifier) @_new
-      (#eq? @_new "new"))
-  arguments:
-    (arguments
-      (array_expression
-        (raw_string_literal) @injection.content))
+  function: (scoped_identifier
+    path: (identifier) @_regex
+    (#any-of? @_regex "RegexSet" "RegexSetBuilder")
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (array_expression
+      (raw_string_literal) @injection.content))
   (#set! injection.language "regex"))
 
 (call_expression
-  function:
-    (scoped_identifier
-      path:
-        (scoped_identifier
-          (identifier) @_regex
-          (#any-of? @_regex "RegexSet" "RegexSetBuilder") .)
-      name: (identifier) @_new
-      (#eq? @_new "new"))
-  arguments:
-    (arguments
-      (array_expression
-        (raw_string_literal) @injection.content))
+  function: (scoped_identifier
+    path: (scoped_identifier
+      (identifier) @_regex
+      (#any-of? @_regex "RegexSet" "RegexSetBuilder") .)
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (array_expression
+      (raw_string_literal) @injection.content))
   (#set! injection.language "regex"))
 
 ((block_comment) @injection.content
diff --git a/queries/rust/locals.scm b/queries/rust/locals.scm
index bba614536..2b1469bf6 100644
--- a/queries/rust/locals.scm
+++ b/queries/rust/locals.scm
@@ -3,9 +3,8 @@
   name: (identifier) @local.definition.import)
 
 (use_declaration
-  argument:
-    (scoped_identifier
-      name: (identifier) @local.definition.import))
+  argument: (scoped_identifier
+    name: (identifier) @local.definition.import))
 
 (use_as_clause
   alias: (identifier) @local.definition.import)
@@ -19,9 +18,8 @@
 
 (function_item
   name: (identifier) @local.definition.method
-  parameters:
-    (parameters
-      (self_parameter)))
+  parameters: (parameters
+    (self_parameter)))
 
 ; Variables
 (parameter
@@ -37,9 +35,8 @@
   (identifier) @local.definition.var)
 
 (let_condition
-  pattern:
-    (_
-      (identifier) @local.definition.var))
+  pattern: (_
+    (identifier) @local.definition.var))
 
 (tuple_struct_pattern
   (identifier) @local.definition.var)
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 74fde4ea9..45ef1ada4 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -97,9 +97,8 @@
   function: (operator_identifier) @function.call)
 
 (call_expression
-  function:
-    (field_expression
-      field: (identifier) @function.method.call))
+  function: (field_expression
+    field: (identifier) @function.method.call))
 
 ((call_expression
   function: (identifier) @constructor)
diff --git a/queries/scala/locals.scm b/queries/scala/locals.scm
index 0ba019cf8..7128a4984 100644
--- a/queries/scala/locals.scm
+++ b/queries/scala/locals.scm
@@ -43,8 +43,7 @@
   name: (identifier) @local.definition.var)
 
 (for_expression
-  enumerators:
-    (enumerators
-      (enumerator
-        (tuple_pattern
-          (identifier) @local.definition.var))))
+  enumerators: (enumerators
+    (enumerator
+      (tuple_pattern
+        (identifier) @local.definition.var))))
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index d93ba299e..4e108e28d 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -162,9 +162,8 @@
   (simple_identifier) @variable)
 
 (member_access
-  member:
-    (expression
-      (simple_identifier) @property))
+  member: (expression
+    (simple_identifier) @property))
 
 (states_definition
   name: (simple_identifier) @constant)
diff --git a/queries/snakemake/highlights.scm b/queries/snakemake/highlights.scm
index b28117402..3e75f142d 100644
--- a/queries/snakemake/highlights.scm
+++ b/queries/snakemake/highlights.scm
@@ -14,10 +14,9 @@
 
 ; Subordinate directives (eg. input, output)
 (_
-  body:
-    (_
-      (directive
-        name: _ @label)))
+  body: (_
+    (directive
+      name: _ @label)))
 
 ; rule/module/checkpoint names
 (rule_definition
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
index f89331846..6fe94e610 100644
--- a/queries/sourcepawn/highlights.scm
+++ b/queries/sourcepawn/highlights.scm
@@ -23,9 +23,8 @@
   function: (identifier) @function)
 
 (call_expression
-  function:
-    (field_access
-      field: (identifier) @function.method.call))
+  function: (field_access
+    field: (identifier) @function.method.call))
 
 ; Types
 [
diff --git a/queries/sparql/highlights.scm b/queries/sparql/highlights.scm
index db4e5a4d0..19c0257ca 100644
--- a/queries/sparql/highlights.scm
+++ b/queries/sparql/highlights.scm
@@ -206,29 +206,26 @@
 
 (rdf_literal
   "^^" @type
-  datatype:
-    (_
-      [
-        "<"
-        ">"
-        (namespace)
-      ] @type) @type)
+  datatype: (_
+    [
+      "<"
+      ">"
+      (namespace)
+    ] @type) @type)
 
 (function_call
   identifier: (_) @function)
 
 (function_call
-  identifier:
-    (iri_reference
-      [
-        "<"
-        ">"
-      ] @function))
+  identifier: (iri_reference
+    [
+      "<"
+      ">"
+    ] @function))
 
 (function_call
-  identifier:
-    (prefixed_name
-      (namespace) @function))
+  identifier: (prefixed_name
+    (namespace) @function))
 
 (base_declaration
   (iri_reference
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 83d4bf9b2..051dbc825 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -28,10 +28,9 @@
   alias: (identifier) @variable)
 
 (term
-  value:
-    (cast
-      name: (keyword_cast) @function.call
-      parameter: (literal)?))
+  value: (cast
+    name: (keyword_cast) @function.call
+    parameter: (literal)?))
 
 (literal) @string
 
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index a8c37215d..db4e12429 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -143,11 +143,10 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (deref_expression
-      "."
-      .
-      (identifier) @function.call))
+  function: (deref_expression
+    "."
+    .
+    (identifier) @function.call))
 
 (call_expression
   (global_variable
@@ -163,14 +162,12 @@
 (call_expression
   [
     function: (identifier) @function.builtin
-    function:
-      (global_variable
-        "::"
-        (_) @function.builtin)
-    function:
-      (deref_expression
-        "."
-        (_) @function.builtin)
+    function: (global_variable
+      "::"
+      (_) @function.builtin)
+    function: (deref_expression
+      "."
+      (_) @function.builtin)
   ]
   (#any-of? @function.builtin
     ; General Methods
diff --git a/queries/ssh_config/injections.scm b/queries/ssh_config/injections.scm
index 6c7861e35..d1b24be61 100644
--- a/queries/ssh_config/injections.scm
+++ b/queries/ssh_config/injections.scm
@@ -7,12 +7,11 @@
   (#set! injection.language "bash"))
 
 ((parameter
-  keyword:
-    [
-      "KnownHostsCommand"
-      "LocalCommand"
-      "RemoteCommand"
-      "ProxyCommand"
-    ]
+  keyword: [
+    "KnownHostsCommand"
+    "LocalCommand"
+    "RemoteCommand"
+    "ProxyCommand"
+  ]
   argument: (string) @injection.content)
   (#set! injection.language "bash"))
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 9affc32c1..9ca7aa8b5 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -33,9 +33,8 @@
 
 ((assignment
   left: (identifier) @type.definition
-  right:
-    (call
-      function: (identifier) @_func))
+  right: (call
+    function: (identifier) @_func))
   (#any-of? @_func "TypeVar" "NewType"))
 
 ; Decorators
@@ -88,10 +87,9 @@
 
 ((call
   function: (identifier) @_isinstance
-  arguments:
-    (argument_list
-      (_)
-      (identifier) @type))
+  arguments: (argument_list
+    (_)
+    (identifier) @type))
   (#eq? @_isinstance "isinstance"))
 
 ((identifier) @type.builtin
@@ -190,11 +188,10 @@
     (string) @string.documentation @spell))
 
 (function_definition
-  body:
-    (block
-      .
-      (expression_statement
-        (string) @string.documentation @spell)))
+  body: (block
+    .
+    (expression_statement
+      (string) @string.documentation @spell)))
 
 ; Tokens
 [
@@ -271,9 +268,8 @@
 
 ((call
   function: (identifier) @keyword.import
-  arguments:
-    (argument_list
-      (string) @string))
+  arguments: (argument_list
+    (string) @string))
   (#eq? @keyword.import "load"))
 
 [
@@ -323,10 +319,9 @@
 ; Struct definitions
 ((call
   function: (identifier) @_func
-  arguments:
-    (argument_list
-      (keyword_argument
-        name: (identifier) @variable.member)))
+  arguments: (argument_list
+    (keyword_argument
+      name: (identifier) @variable.member)))
   (#eq? @_func "struct"))
 
 ; Function calls
@@ -334,16 +329,14 @@
   function: (identifier) @function.call)
 
 (call
-  function:
-    (attribute
-      attribute: (identifier) @function.method.call))
+  function: (attribute
+    attribute: (identifier) @function.method.call))
 
 ((call
   function: (identifier) @constructor)
   (#lua-match? @constructor "^[A-Z]"))
 
 ((call
-  function:
-    (attribute
-      attribute: (identifier) @constructor))
+  function: (attribute
+    attribute: (identifier) @constructor))
   (#lua-match? @constructor "^[A-Z]"))
diff --git a/queries/starlark/locals.scm b/queries/starlark/locals.scm
index 5da211f65..82ec0b5d2 100644
--- a/queries/starlark/locals.scm
+++ b/queries/starlark/locals.scm
@@ -32,14 +32,12 @@
 ; Loops
 ; not a scope!
 (for_statement
-  left:
-    (pattern_list
-      (identifier) @local.definition.var))
+  left: (pattern_list
+    (identifier) @local.definition.var))
 
 (for_statement
-  left:
-    (tuple_pattern
-      (identifier) @local.definition.var))
+  left: (tuple_pattern
+    (identifier) @local.definition.var))
 
 (for_statement
   left: (identifier) @local.definition.var)
@@ -49,14 +47,12 @@
   left: (identifier) @local.definition.var)
 
 (for_in_clause
-  left:
-    (tuple_pattern
-      (identifier) @local.definition.var))
+  left: (tuple_pattern
+    (identifier) @local.definition.var))
 
 (for_in_clause
-  left:
-    (pattern_list
-      (identifier) @local.definition.var))
+  left: (pattern_list
+    (identifier) @local.definition.var))
 
 (dictionary_comprehension) @local.scope
 
@@ -69,20 +65,17 @@
   left: (identifier) @local.definition.var)
 
 (assignment
-  left:
-    (pattern_list
-      (identifier) @local.definition.var))
+  left: (pattern_list
+    (identifier) @local.definition.var))
 
 (assignment
-  left:
-    (tuple_pattern
-      (identifier) @local.definition.var))
+  left: (tuple_pattern
+    (identifier) @local.definition.var))
 
 (assignment
-  left:
-    (attribute
-      (identifier)
-      (identifier) @local.definition.field))
+  left: (attribute
+    (identifier)
+    (identifier) @local.definition.field))
 
 ; Walrus operator  x := 1
 (named_expression
@@ -98,7 +91,6 @@
 ; Loads
 ((call
   function: (identifier) @_fn
-  arguments:
-    (argument_list
-      (string) @local.definition.import))
+  arguments: (argument_list
+    (string) @local.definition.import))
   (#eq? @_fn "load"))
diff --git a/queries/supercollider/locals.scm b/queries/supercollider/locals.scm
index 1707b655a..ea1229047 100644
--- a/queries/supercollider/locals.scm
+++ b/queries/supercollider/locals.scm
@@ -12,16 +12,14 @@
   (#set! "definition.var.scope" "local"))
 
 (variable_definition
-  name:
-    (variable
-      (local_var
-        (identifier) @local.definition.var)))
+  name: (variable
+    (local_var
+      (identifier) @local.definition.var)))
 
 (variable_definition
-  name:
-    (variable
-      (environment_var
-        (identifier) @local.definition.var))
+  name: (variable
+    (environment_var
+      (identifier) @local.definition.var))
   (#set! "definition.var.scope" "global"))
 
 (function_definition
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index d98ccd76a..3ddce588a 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -129,9 +129,8 @@
   function: (identifier) @function.call)
 
 (hll_call_expression
-  function:
-    (hll_field_expression
-      field: (hll_field_identifier) @function.call))
+  function: (hll_field_expression
+    field: (hll_field_identifier) @function.call))
 
 ; HLL variables
 (identifier) @variable
@@ -176,10 +175,9 @@
 
 ((command_expression
   command: (identifier) @keyword
-  arguments:
-    (argument_list
-      .
-      (identifier) @label))
+  arguments: (argument_list
+    .
+    (identifier) @label))
   (#lua-match? @keyword "^[gG][oO][tT][oO]$"))
 
 (labeled_expression
diff --git a/queries/t32/locals.scm b/queries/t32/locals.scm
index f1c022f6e..91bf7660e 100644
--- a/queries/t32/locals.scm
+++ b/queries/t32/locals.scm
@@ -12,9 +12,8 @@
 
 (command_expression
   command: (identifier)
-  arguments:
-    (argument_list
-      declarator: (trace32_hll_variable) @local.definition.var))
+  arguments: (argument_list
+    declarator: (trace32_hll_variable) @local.definition.var))
 
 ; Function definitions
 (subroutine_block
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index 7c6d71753..e4084be26 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -58,14 +58,12 @@
   name: (identifier) @type)
 
 (def
-  name:
-    (value
-      (_) @type))
+  name: (value
+    (_) @type))
 
 (defm
-  name:
-    (value
-      (_) @type))
+  name: (value
+    (_) @type))
 
 (defset
   name: (identifier) @type)
diff --git a/queries/tablegen/locals.scm b/queries/tablegen/locals.scm
index 98c52ceac..c73100193 100644
--- a/queries/tablegen/locals.scm
+++ b/queries/tablegen/locals.scm
@@ -37,14 +37,12 @@
   name: (identifier) @local.definition.type)
 
 (def
-  name:
-    (value
-      (_) @local.definition.type))
+  name: (value
+    (_) @local.definition.type))
 
 (defm
-  name:
-    (value
-      (_) @local.definition.type))
+  name: (value
+    (_) @local.definition.type))
 
 (defset
   name: (identifier) @local.definition.type)
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index 8f5be2725..ec80ead0f 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -214,20 +214,18 @@
 
 ; The rest of it
 (var_declaration
-  declarators:
-    (var_declarators
-      (var
-        name: (identifier) @variable)))
+  declarators: (var_declarators
+    (var
+      name: (identifier) @variable)))
 
 (var_declaration
-  declarators:
-    (var_declarators
-      (var
-        "<" @punctuation.bracket
-        .
-        attribute: (attribute) @attribute
-        .
-        ">" @punctuation.bracket)))
+  declarators: (var_declarators
+    (var
+      "<" @punctuation.bracket
+      .
+      attribute: (attribute) @attribute
+      .
+      ">" @punctuation.bracket)))
 
 [
   "("
diff --git a/queries/teal/locals.scm b/queries/teal/locals.scm
index d3a81f122..c2386c632 100644
--- a/queries/teal/locals.scm
+++ b/queries/teal/locals.scm
@@ -1,14 +1,12 @@
 (var_declaration
-  declarators:
-    (var_declarators
-      (var
-        (identifier)) @local.definition.var))
+  declarators: (var_declarators
+    (var
+      (identifier)) @local.definition.var))
 
 (var_assignment
-  variables:
-    (assignment_variables
-      (var
-        (identifier) @local.definition.var) @local.definition.associated))
+  variables: (assignment_variables
+    (var
+      (identifier) @local.definition.var) @local.definition.associated))
 
 (arg
   name: (identifier) @local.definition.parameter)
diff --git a/queries/terraform/highlights.scm b/queries/terraform/highlights.scm
index 1655af31d..a6bf83cdb 100644
--- a/queries/terraform/highlights.scm
+++ b/queries/terraform/highlights.scm
@@ -35,8 +35,7 @@
   (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
 
 (object_elem
-  val:
-    (expression
-      (variable_expr
-        (identifier) @type.builtin
-        (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
+  val: (expression
+    (variable_expr
+      (identifier) @type.builtin
+      (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
diff --git a/queries/tlaplus/locals.scm b/queries/tlaplus/locals.scm
index e30f9ec41..f7b481c72 100644
--- a/queries/tlaplus/locals.scm
+++ b/queries/tlaplus/locals.scm
@@ -43,9 +43,8 @@
   parameter: (identifier) @local.definition.parameter)
 
 (module_definition
-  parameter:
-    (operator_declaration
-      name: (_) @local.definition.parameter))
+  parameter: (operator_declaration
+    name: (_) @local.definition.parameter))
 
 (operator_definition
   name: (_) @local.definition.macro
@@ -55,9 +54,8 @@
   parameter: (identifier) @local.definition.parameter)
 
 (operator_definition
-  parameter:
-    (operator_declaration
-      name: (_) @local.definition.parameter))
+  parameter: (operator_declaration
+    name: (_) @local.definition.parameter))
 
 (quantifier_bound
   (identifier) @local.definition.parameter)
diff --git a/queries/turtle/highlights.scm b/queries/turtle/highlights.scm
index f4db53c36..30d1f4513 100644
--- a/queries/turtle/highlights.scm
+++ b/queries/turtle/highlights.scm
@@ -54,10 +54,9 @@
 
 (rdf_literal
   "^^" @type
-  datatype:
-    (_
-      [
-        "<"
-        ">"
-        (namespace)
-      ] @type) @type)
+  datatype: (_
+    [
+      "<"
+      ">"
+      (namespace)
+    ] @type) @type)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 48f891cc4..5fae21b96 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -197,11 +197,10 @@
 ; property signatures
 (property_signature
   name: (property_identifier) @function.method
-  type:
-    (type_annotation
-      [
-        (union_type
-          (parenthesized_type
-            (function_type)))
-        (function_type)
-      ]))
+  type: (type_annotation
+    [
+      (union_type
+        (parenthesized_type
+          (function_type)))
+      (function_type)
+    ]))
diff --git a/queries/uxntal/highlights.scm b/queries/uxntal/highlights.scm
index 622e00b4f..962b6d7b9 100644
--- a/queries/uxntal/highlights.scm
+++ b/queries/uxntal/highlights.scm
@@ -16,17 +16,15 @@
 
 (rune
   .
-  rune_start:
-    (rune_char
-      ",")
+  rune_start: (rune_char
+    ",")
   .
   (identifier) @function.call)
 
 (rune
   .
-  rune_start:
-    (rune_char
-      ";")
+  rune_start: (rune_char
+    ";")
   .
   (identifier) @function.call)
 
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index be038aa34..4e72a0514 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -112,9 +112,8 @@
 
 ; Fields
 (selector_expression
-  field:
-    (reference_expression
-      (identifier) @variable.member))
+  field: (reference_expression
+    (identifier) @variable.member))
 
 (field_name) @variable.member
 
@@ -156,9 +155,8 @@
   name: (identifier) @function.method)
 
 (call_expression
-  name:
-    (selector_expression
-      field: (reference_expression) @function.method.call))
+  name: (selector_expression
+    field: (reference_expression) @function.method.call))
 
 (call_expression
   name: (reference_expression) @function.call)
diff --git a/queries/v/injections.scm b/queries/v/injections.scm
index ceb93cd3d..f27ab8954 100644
--- a/queries/v/injections.scm
+++ b/queries/v/injections.scm
@@ -8,16 +8,13 @@
 
 ; regex for the methods defined in `re` module
 ((call_expression
-  name:
-    (selector_expression
-      field:
-        (reference_expression
-          (identifier) @_re))
-  arguments:
-    (argument_list
-      (argument
-        (literal
-          (raw_string_literal) @injection.content
-          (#offset! @injection.content 0 2 0 -1)))))
+  name: (selector_expression
+    field: (reference_expression
+      (identifier) @_re))
+  arguments: (argument_list
+    (argument
+      (literal
+        (raw_string_literal) @injection.content
+        (#offset! @injection.content 0 2 0 -1)))))
   (#any-of? @_re "regex_base" "regex_opt" "compile_opt")
   (#set! injection.language "regex"))
diff --git a/queries/v/locals.scm b/queries/v/locals.scm
index ba271e04d..a3423f696 100644
--- a/queries/v/locals.scm
+++ b/queries/v/locals.scm
@@ -2,10 +2,9 @@
   name: (identifier) @local.definition.function) ;@function
 
 (var_declaration
-  var_list:
-    (expression_list
-      (reference_expression
-        (identifier) @local.definition.var)))
+  var_list: (expression_list
+    (reference_expression
+      (identifier) @local.definition.var)))
 
 (function_declaration
   name: (identifier) @local.definition.function)
@@ -17,17 +16,14 @@
 (identifier) @local.reference
 
 ((call_expression
-  name:
-    (reference_expression
-      (identifier)) @local.reference)
+  name: (reference_expression
+    (identifier)) @local.reference)
   (#set! reference.kind "call"))
 
 ((call_expression
-  name:
-    (selector_expression
-      field:
-        (reference_expression
-          (identifier) @local.definition.function)))
+  name: (selector_expression
+    field: (reference_expression
+      (identifier) @local.definition.function)))
   (#set! reference.kind "call"))
 
 (source_file) @local.scope
diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index cc51282a7..2950278f9 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -42,9 +42,8 @@
   function: (identifier) @function.call)
 
 (call_expression
-  function:
-    (scoped_identifier
-      (identifier) @function.call))
+  function: (scoped_identifier
+    (identifier) @function.call))
 
 (parameters
   (identifier) @variable.parameter)
@@ -206,10 +205,9 @@
 
 (command_attribute
   name: _ @property
-  val:
-    (behavior
-      name: _ @constant
-      val: (identifier)? @function)?)
+  val: (behavior
+    name: _ @constant
+    val: (identifier)? @function)?)
 
 ; Edit command
 (plus_plus_opt
diff --git a/queries/vim/locals.scm b/queries/vim/locals.scm
index dff662680..870647279 100644
--- a/queries/vim/locals.scm
+++ b/queries/vim/locals.scm
@@ -7,9 +7,8 @@
   name: (identifier) @local.definition.function)
 
 (function_declaration
-  parameters:
-    (parameters
-      (identifier) @local.definition.parameter))
+  parameters: (parameters
+    (identifier) @local.definition.parameter))
 
 (let_statement
   [
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 931ca5620..e33829b81 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -20,15 +20,13 @@
 (keyword_argument_key) @variable.parameter
 
 (call
-  caller:
-    (reference
-      (nested_identifier
-        property: (member_identifier) @function.method.call)))
+  caller: (reference
+    (nested_identifier
+      property: (member_identifier) @function.method.call)))
 
 (call
-  caller:
-    (reference
-      (reference_identifier) @function.method.call))
+  caller: (reference
+    (reference_identifier) @function.method.call))
 
 ; Primitives
 (number) @number
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index 375ced906..342d7e563 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -33,34 +33,30 @@
 ] @keyword.directive
 
 (block_mapping_pair
-  key:
-    (flow_node
+  key: (flow_node
+    [
+      (double_quote_scalar)
+      (single_quote_scalar)
+    ] @property))
+
+(block_mapping_pair
+  key: (flow_node
+    (plain_scalar
+      (string_scalar) @property)))
+
+(flow_mapping
+  (_
+    key: (flow_node
       [
         (double_quote_scalar)
         (single_quote_scalar)
-      ] @property))
+      ] @property)))
 
-(block_mapping_pair
-  key:
-    (flow_node
+(flow_mapping
+  (_
+    key: (flow_node
       (plain_scalar
-        (string_scalar) @property)))
-
-(flow_mapping
-  (_
-    key:
-      (flow_node
-        [
-          (double_quote_scalar)
-          (single_quote_scalar)
-        ] @property)))
-
-(flow_mapping
-  (_
-    key:
-      (flow_node
-        (plain_scalar
-          (string_scalar) @property))))
+        (string_scalar) @property))))
 
 [
   ","
diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index f7bff7360..b05c332fe 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -5,84 +5,76 @@
 (block_mapping_pair
   key: (flow_node) @_run
   (#any-of? @_run "run" "script" "before_script" "after_script")
-  value:
-    (flow_node
-      (plain_scalar
-        (string_scalar) @injection.content)
-      (#set! injection.language "bash")))
+  value: (flow_node
+    (plain_scalar
+      (string_scalar) @injection.content)
+    (#set! injection.language "bash")))
 
 (block_mapping_pair
   key: (flow_node) @_run
   (#any-of? @_run "run" "script" "before_script" "after_script")
-  value:
-    (block_node
-      (block_scalar) @injection.content
-      (#set! injection.language "bash")
-      (#offset! @injection.content 0 1 0 0)))
+  value: (block_node
+    (block_scalar) @injection.content
+    (#set! injection.language "bash")
+    (#offset! @injection.content 0 1 0 0)))
 
 (block_mapping_pair
   key: (flow_node) @_run
   (#any-of? @_run "run" "script" "before_script" "after_script")
-  value:
-    (block_node
-      (block_sequence
-        (block_sequence_item
-          (flow_node
-            (plain_scalar
-              (string_scalar) @injection.content))
-          (#set! injection.language "bash")))))
+  value: (block_node
+    (block_sequence
+      (block_sequence_item
+        (flow_node
+          (plain_scalar
+            (string_scalar) @injection.content))
+        (#set! injection.language "bash")))))
 
 (block_mapping_pair
   key: (flow_node) @_run
   (#any-of? @_run "script" "before_script" "after_script")
-  value:
-    (block_node
-      (block_sequence
-        (block_sequence_item
-          (block_node
-            (block_scalar) @injection.content
-            (#set! injection.language "bash")
-            (#offset! @injection.content 0 1 0 0))))))
+  value: (block_node
+    (block_sequence
+      (block_sequence_item
+        (block_node
+          (block_scalar) @injection.content
+          (#set! injection.language "bash")
+          (#offset! @injection.content 0 1 0 0))))))
 
 ; Prometheus Alertmanager ("expr")
 (block_mapping_pair
   key: (flow_node) @_expr
   (#eq? @_expr "expr")
-  value:
-    (flow_node
-      (plain_scalar
-        (string_scalar) @injection.content)
-      (#set! injection.language "promql")))
+  value: (flow_node
+    (plain_scalar
+      (string_scalar) @injection.content)
+    (#set! injection.language "promql")))
 
 (block_mapping_pair
   key: (flow_node) @_expr
   (#eq? @_expr "expr")
-  value:
-    (block_node
-      (block_scalar) @injection.content
-      (#set! injection.language "promql")
-      (#offset! @injection.content 0 1 0 0)))
+  value: (block_node
+    (block_scalar) @injection.content
+    (#set! injection.language "promql")
+    (#offset! @injection.content 0 1 0 0)))
 
 (block_mapping_pair
   key: (flow_node) @_expr
   (#eq? @_expr "expr")
-  value:
-    (block_node
-      (block_sequence
-        (block_sequence_item
-          (flow_node
-            (plain_scalar
-              (string_scalar) @injection.content))
-          (#set! injection.language "promql")))))
+  value: (block_node
+    (block_sequence
+      (block_sequence_item
+        (flow_node
+          (plain_scalar
+            (string_scalar) @injection.content))
+        (#set! injection.language "promql")))))
 
 (block_mapping_pair
   key: (flow_node) @_expr
   (#eq? @_expr "expr")
-  value:
-    (block_node
-      (block_sequence
-        (block_sequence_item
-          (block_node
-            (block_scalar) @injection.content
-            (#set! injection.language "promql")
-            (#offset! @injection.content 0 1 0 0))))))
+  value: (block_node
+    (block_sequence
+      (block_sequence_item
+        (block_node
+          (block_scalar) @injection.content
+          (#set! injection.language "promql")
+          (#offset! @injection.content 0 1 0 0))))))
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 1bc7532b8..f5b129cde 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -201,16 +201,6 @@ local format_queries = [[
 
 ;; Workaround to just use the string's content
 (anonymous_node (identifier) @format.keep)
-(field_definition
-  name: (_)
-  ":" @format.indent.begin @format.append-newline ; suppress trailing whitespaces with forced newlines
-  [
-    (named_node [ (named_node) (list) (grouping) (anonymous_node) (field_definition) ])
-    (list "[" . (_) . (_) "]")
-    (grouping "(" . (_) . (_) ")")
-    (grouping
-      quantifier: (quantifier))
-  ])
 
 ; ( (_) ) handler
 (grouping

From 829f36b0b7e94f7c3eb9954a98a06a8c978a740b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 06:36:24 +0000
Subject: [PATCH 1300/2704] bot(lockfile): update hoon, just, v, wing

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7d11de232..64196a05a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -291,7 +291,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "0135187126370cbf112d759a50eab4a5c913a827"
+    "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
     "revision": "cc53b6878a003cf26d213025af49c78388cebe21"
@@ -345,7 +345,7 @@
     "revision": "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"
   },
   "just": {
-    "revision": "5fe40d3622042c66465c4673b209a71e8376f902"
+    "revision": "442538ab5ae0913b05e0269a988b4d452dfa5361"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -750,7 +750,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "366d30c2438ca396f2f8304d891ca22e7c14b922"
+    "revision": "3439620ad96aa540f8dc454a332bc2d59314178f"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -780,7 +780,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "1bb6a572d5e3ced0012a4f6702c6f5662187b901"
+    "revision": "55c0ea5356b627dcdbe4882c6e10052dd2417b3f"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 2205694d43e636f3c517eb36ec23a930d624d724 Mon Sep 17 00:00:00 2001
From: Noah Bogart <noah.bogart@hey.com>
Date: Tue, 19 Mar 2024 22:01:59 -0400
Subject: [PATCH 1301/2704] feat: add djot support (#6326)

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/djot/highlights.scm     | 276 ++++++++++++++++++++++++++++++++
 queries/djot/injections.scm     |  17 ++
 3 files changed, 301 insertions(+)
 create mode 100644 queries/djot/highlights.scm
 create mode 100644 queries/djot/injections.scm

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b1360eda0..2bcaea9f2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -402,6 +402,14 @@ list.disassembly = {
   maintainers = { "@ColinKennedy" },
 }
 
+list.djot = {
+  install_info = {
+    url = "https://github.com/treeman/tree-sitter-djot",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@NoahTheDuke" },
+}
+
 list.dockerfile = {
   install_info = {
     url = "https://github.com/camdencheek/tree-sitter-dockerfile",
diff --git a/queries/djot/highlights.scm b/queries/djot/highlights.scm
new file mode 100644
index 000000000..0ec1ca5f9
--- /dev/null
+++ b/queries/djot/highlights.scm
@@ -0,0 +1,276 @@
+(heading1) @markup.heading.1
+
+(heading2) @markup.heading.2
+
+(heading3) @markup.heading.3
+
+(heading4) @markup.heading.4
+
+(heading5) @markup.heading.5
+
+(heading6) @markup.heading.6
+
+(thematic_break) @string.special
+
+[
+  (div_marker_begin)
+  (div_marker_end)
+] @punctuation.delimiter
+
+([
+  (code_block)
+  (raw_block)
+  (frontmatter)
+] @markup.raw
+  (#set! "priority" 90))
+
+; Remove @markup.raw for code with a language spec
+(code_block
+  .
+  (code_block_marker_begin)
+  (language)
+  (code) @none)
+
+[
+  (code_block_marker_begin)
+  (code_block_marker_end)
+  (raw_block_marker_begin)
+  (raw_block_marker_end)
+] @punctuation.delimiter
+
+(language) @label
+
+((language_marker) @punctuation.delimiter
+  (#set! conceal ""))
+
+(block_quote) @markup.quote
+
+(block_quote_marker) @punctuation.special
+
+(table_header) @markup.heading
+
+(table_header
+  "|" @punctuation.special)
+
+(table_row
+  "|" @punctuation.special)
+
+(table_separator) @punctuation.special
+
+(table_caption
+  (marker) @punctuation.special)
+
+(table_caption) @markup.heading
+
+[
+  (list_marker_dash)
+  (list_marker_plus)
+  (list_marker_star)
+  (list_marker_definition)
+  (list_marker_decimal_period)
+  (list_marker_decimal_paren)
+  (list_marker_decimal_parens)
+  (list_marker_lower_alpha_period)
+  (list_marker_lower_alpha_paren)
+  (list_marker_lower_alpha_parens)
+  (list_marker_upper_alpha_period)
+  (list_marker_upper_alpha_paren)
+  (list_marker_upper_alpha_parens)
+  (list_marker_lower_roman_period)
+  (list_marker_lower_roman_paren)
+  (list_marker_lower_roman_parens)
+  (list_marker_upper_roman_period)
+  (list_marker_upper_roman_paren)
+  (list_marker_upper_roman_parens)
+] @markup.list
+
+(list_marker_task
+  (unchecked) @constant.builtin) @markup.list.unchecked
+
+(list_marker_task
+  (checked) @constant.builtin) @markup.list.checked
+
+[
+  (ellipsis)
+  (en_dash)
+  (em_dash)
+  (straight_quote)
+] @string.special
+
+(frontmatter_marker) @punctuation.delimiter
+
+(emphasis) @markup.italic
+
+(strong) @markup.strong
+
+(emphasis
+  (emphasis_begin) @punctuation.delimiter)
+
+(emphasis
+  (emphasis_end) @punctuation.delimiter)
+
+(strong
+  (strong_begin) @punctuation.delimiter)
+
+(strong
+  (strong_end) @punctuation.delimiter)
+
+(highlighted
+  [
+    "{="
+    "=}"
+  ] @punctuation.delimiter)
+
+(insert
+  [
+    "{+"
+    "+}"
+  ] @punctuation.delimiter)
+
+(delete
+  [
+    "{-"
+    "-}"
+  ] @punctuation.delimiter)
+
+(superscript
+  [
+    "^"
+    "{^"
+    "^}"
+  ] @punctuation.delimiter)
+
+(subscript
+  [
+    "~"
+    "{~"
+    "~}"
+  ] @punctuation.delimiter)
+
+(verbatim) @markup.raw
+
+[
+  (verbatim_marker_begin)
+  (verbatim_marker_end)
+] @punctuation.delimiter
+
+(math) @markup.math
+
+[
+  (math_marker)
+  (math_marker_begin)
+  (math_marker_end)
+] @punctuation.delimiter
+
+(raw_inline) @markup.raw
+
+[
+  (raw_inline_attribute)
+  (raw_inline_marker_begin)
+  (raw_inline_marker_end)
+] @punctuation.delimiter
+
+[
+  "{"
+  "}"
+  "!["
+  "["
+  "]"
+  "("
+  ")"
+  "<"
+  ">"
+] @punctuation.bracket
+
+(comment) @comment
+
+(class) @type
+
+(identifier) @tag
+
+(key_value
+  "=" @operator)
+
+(key_value
+  (key) @property)
+
+(key_value
+  (value) @string)
+
+[
+  (backslash_escape)
+  (hard_line_break)
+] @string.escape
+
+(link_reference_definition
+  ":" @punctuation.special)
+
+(full_reference_link
+  (link_text) @markup.link)
+
+(full_reference_link
+  (link_label) @markup.link.label)
+
+(collapsed_reference_link
+  (link_text) @markup.link)
+
+(collapsed_reference_link
+  (link_text) @markup.link.label)
+
+(inline_link
+  (link_text) @markup.link)
+
+(full_reference_image
+  (link_label) @markup.link.label)
+
+(image_description) @markup.link.label
+
+(link_reference_definition
+  (link_label) @markup.link.label)
+
+[
+  (autolink)
+  (inline_link_destination)
+  (link_destination)
+  (link_reference_definition)
+] @markup.link.url
+
+(footnote
+  (reference_label) @markup.link)
+
+(footnote_reference
+  (reference_label) @markup.link)
+
+[
+  (footnote_marker_begin)
+  (footnote_marker_end)
+] @punctuation.bracket
+
+[
+  (paragraph)
+  (comment)
+  (table_cell)
+] @spell
+
+[
+  (autolink)
+  (inline_link_destination)
+  (link_destination)
+  (code_block)
+  (raw_block)
+  (math)
+  (raw_inline)
+  (verbatim)
+  (reference_label)
+  (class)
+  (class_name)
+  (identifier)
+  (key_value)
+  (frontmatter)
+] @nospell
+
+(full_reference_link
+  (link_label) @nospell)
+
+(full_reference_image
+  (link_label) @nospell)
diff --git a/queries/djot/injections.scm b/queries/djot/injections.scm
new file mode 100644
index 000000000..b590e084f
--- /dev/null
+++ b/queries/djot/injections.scm
@@ -0,0 +1,17 @@
+(code_block
+  (language) @injection.language
+  (code) @injection.content)
+
+(raw_block
+  (raw_block_info
+    (language) @injection.language)
+  (content) @injection.content)
+
+(raw_inline
+  (content) @injection.content
+  (raw_inline_attribute
+    (language) @injection.language))
+
+(frontmatter
+  (language) @injection.language
+  (frontmatter_content) @injection.content)

From 6e7b41106e9b15a5b47d149378d53482c9d9c7a3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 08:02:47 +0000
Subject: [PATCH 1302/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bd4187d53..85f9c4941 100644
--- a/README.md
+++ b/README.md
@@ -212,6 +212,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [dhall](https://github.com/jbellerb/tree-sitter-dhall) (maintained by @amaanq)
 - [x] [diff](https://github.com/the-mikedavis/tree-sitter-diff) (maintained by @gbprod)
 - [x] [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) (maintained by @ColinKennedy)
+- [x] [djot](https://github.com/treeman/tree-sitter-djot) (maintained by @NoahTheDuke)
 - [x] [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) (maintained by @camdencheek)
 - [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
 - [x] [doxygen](https://github.com/amaanq/tree-sitter-doxygen) (maintained by @amaanq)

From e2ba4d2af1cd738b8810277dc755185791b53406 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 22 Mar 2024 18:05:45 +0100
Subject: [PATCH 1303/2704] feat(tlaplus): move to C scanner

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 64196a05a..c1f1bf0a4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -702,7 +702,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "3896a5be761f04ffb22a841b2a0672f7a8a43ef9"
+    "revision": "7455f17038d551ecd2b082c39e4a63bcb403e158"
   },
   "tmux": {
     "revision": "10737f5dc4d8e68c9667f11a6996688a1185755f"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2bcaea9f2..a906db97e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2043,7 +2043,7 @@ list.tiger = {
 list.tlaplus = {
   install_info = {
     url = "https://github.com/tlaplus-community/tree-sitter-tlaplus",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "tla",
   maintainers = { "@ahelwer", "@susliko" },

From a951dcb7ec253544b0150251008de8b06a0874cd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:23:14 +0000
Subject: [PATCH 1304/2704] bot(lockfile): update djot, lalrpop, markdown,
 markdown_inline, wing

---
 lockfile.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c1f1bf0a4..9128b524b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -116,6 +116,9 @@
   "disassembly": {
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
+  "djot": {
+    "revision": "e1cfe895a9984f09045f6a2462ade0ee131aa7a0"
+  },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
   },
@@ -360,7 +363,7 @@
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
   },
   "lalrpop": {
-    "revision": "456dec2990ed7e9595eca82f85db14a1db46e126"
+    "revision": "123d8b472e949b59f348c32e245107a34a3d8945"
   },
   "latex": {
     "revision": "841f89ffbba9650529a40fb867f3456bf92bf9b1"
@@ -399,10 +402,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "b2f01981a76e3251f5b660378136c248ed106b81"
+    "revision": "d427744e2128668f3b4bac3dc63f840ebb7e87c3"
   },
   "markdown_inline": {
-    "revision": "b2f01981a76e3251f5b660378136c248ed106b81"
+    "revision": "d427744e2128668f3b4bac3dc63f840ebb7e87c3"
   },
   "matlab": {
     "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
@@ -780,7 +783,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "55c0ea5356b627dcdbe4882c6e10052dd2417b3f"
+    "revision": "f11359345a2475b434a8e1dd3cfa02f2bc9b7e21"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From b009aba903565163442f2adecff72bc3193bb8fd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 23 Mar 2024 06:37:29 +0000
Subject: [PATCH 1305/2704] bot(lockfile): update djot, gitcommit, gnuplot,
 just, latex, php, php_only, v

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9128b524b..a0f11c4cb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "e1cfe895a9984f09045f6a2462ade0ee131aa7a0"
+    "revision": "cb109f52e85da90893e4c65e51314dd56a3ee3d4"
   },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
@@ -210,7 +210,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "523a1a4f0f674eff7fbf46addfa6ef7644151aae"
+    "revision": "a427a79653b6829aa5b663b5b9a6b39e954858b7"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -228,7 +228,7 @@
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
   },
   "gnuplot": {
-    "revision": "7549f6faf5cc9fb8cf78054a7af356a6b003c6f3"
+    "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
     "revision": "fd577c4358c28cbcb6748bbf65354cc85f1cf7a4"
@@ -348,7 +348,7 @@
     "revision": "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"
   },
   "just": {
-    "revision": "442538ab5ae0913b05e0269a988b4d452dfa5361"
+    "revision": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -366,7 +366,7 @@
     "revision": "123d8b472e949b59f348c32e245107a34a3d8945"
   },
   "latex": {
-    "revision": "841f89ffbba9650529a40fb867f3456bf92bf9b1"
+    "revision": "6d764f17f4d28c9db736009fb0e10ffe04866661"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -483,10 +483,10 @@
     "revision": "fd7b2fe5b967d5eee8ce17938052886e2d5987ed"
   },
   "php": {
-    "revision": "b1eb65e04cf31a5df611fea139ad54d611599dc4"
+    "revision": "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"
   },
   "php_only": {
-    "revision": "b1eb65e04cf31a5df611fea139ad54d611599dc4"
+    "revision": "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -753,7 +753,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "3439620ad96aa540f8dc454a332bc2d59314178f"
+    "revision": "a50fc40276aded4b422bdf9f092aa7c8db6c33d3"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 8532b1d941b5859b4844310fa71d6db0f633be33 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 23 Mar 2024 22:51:55 +0100
Subject: [PATCH 1306/2704] fix(liquidsoap): move scanner to C

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a0f11c4cb..4e5d1d53c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -378,7 +378,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquidsoap": {
-    "revision": "fb062bfc7ca09a741820debb7cb8a75a557b30f9"
+    "revision": "09a9e31e2af734a8974dad6ed349648f601eee8c"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a906db97e..68eb3ff2e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1134,7 +1134,7 @@ list.linkerscript = {
 list.liquidsoap = {
   install_info = {
     url = "https://github.com/savonet/tree-sitter-liquidsoap",
-    files = { "src/parser.c", "src/scanner.cc" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@toots" },
 }

From 5e4f959d5979730ddb2ee9ae60f5133081502b23 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 24 Mar 2024 06:34:33 +0000
Subject: [PATCH 1307/2704] bot(lockfile): update d, djot, hurl, java,
 markdown, markdown_inline, ocaml, ocaml_interface, swift, t32, v, vimdoc

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4e5d1d53c..7231e191b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -99,7 +99,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "322d119d50ebe6d0a323dfb00c4aeba31a44fb6f"
+    "revision": "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"
   },
   "dart": {
     "revision": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "cb109f52e85da90893e4c65e51314dd56a3ee3d4"
+    "revision": "4dd87f88df82c3a77bab3929ec0b37d11e2721b7"
   },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
@@ -306,7 +306,7 @@
     "revision": "86ad05ac2de3c63c69f65e58f0182a76c1658d1e"
   },
   "hurl": {
-    "revision": "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"
+    "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
   },
   "hyprlang": {
     "revision": "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3"
@@ -321,7 +321,7 @@
     "revision": "51271e260346878e1a1aa6c506ce6a797b7c25e2"
   },
   "java": {
-    "revision": "5e62fbb519b608dfd856000fdc66536304c414de"
+    "revision": "2aae502017d3aed587ba85e3c7e0cbc138f3e07a"
   },
   "javascript": {
     "revision": "de1e682289a417354df5b4437a3e4f92e0722a0f"
@@ -402,10 +402,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "d427744e2128668f3b4bac3dc63f840ebb7e87c3"
+    "revision": "44017499c51cb6431635ed51d5080e1fd05c2c21"
   },
   "markdown_inline": {
-    "revision": "d427744e2128668f3b4bac3dc63f840ebb7e87c3"
+    "revision": "44017499c51cb6431635ed51d5080e1fd05c2c21"
   },
   "matlab": {
     "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
@@ -456,10 +456,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "dabe60a96553fbbda0a58b6ccda12b7d44047cb5"
+    "revision": "f7e63111ed1bc1908eacafe6af1ee8d01bfcf7ae"
   },
   "ocaml_interface": {
-    "revision": "dabe60a96553fbbda0a58b6ccda12b7d44047cb5"
+    "revision": "f7e63111ed1bc1908eacafe6af1ee8d01bfcf7ae"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -669,7 +669,7 @@
     "revision": "b974719d47447666687d49c68a51b278b2320e99"
   },
   "swift": {
-    "revision": "a8cf05cd49b3b97d70a03fd65c9c279fc76662f7"
+    "revision": "bb3fe96bb65d9b71e2d04b7ebe27dc1947f2cd5d"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -678,7 +678,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "0a457a557be7779336bc8ac2b396e73797bc68f7"
+    "revision": "95caba87f00c51177b254e95be55b2dc46d2ac78"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -753,7 +753,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "a50fc40276aded4b422bdf9f092aa7c8db6c33d3"
+    "revision": "b21db154e8be920277c494b1cb81367d4da40a98"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -771,7 +771,7 @@
     "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
   },
   "vimdoc": {
-    "revision": "66f4fee37b07cff0dd3400089eebccd02e61e5c2"
+    "revision": "a75a932449675bbd260213a95f4cd8b3193286f0"
   },
   "vue": {
     "revision": "3b9d52087100bdfce43dad2ca46d75b0e21613f6"

From aa6323e834a181c1035208d1c3c80f31f07e0162 Mon Sep 17 00:00:00 2001
From: michaelPotter <mpotter.dev@gmail.com>
Date: Sun, 24 Mar 2024 08:31:35 -0700
Subject: [PATCH 1308/2704] feat(bash): align substitutions with expansions

The bash manual[1] considers command and process substitutions to be
forms of expansions, so they should be highlighted the same as other
expansions. This is traditionally how they have been highlighted in the
past too.

[1] https://www.gnu.org/software/bash/manual/html_node/Shell-Expansions.html
---
 queries/bash/highlights.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 32e40dbf8..6547bea7a 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -124,10 +124,15 @@
 (test_operator) @operator
 
 (command_substitution
-  "$(" @punctuation.bracket)
+  "$(" @punctuation.special
+  ")" @punctuation.special)
 
 (process_substitution
-  "<(" @punctuation.bracket)
+  [
+    "<("
+    ">("
+  ] @punctuation.special
+  ")" @punctuation.special)
 
 (arithmetic_expansion
   [

From 8d9736cf3ec2495415d59daba200da3ee4fa6b9c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 06:39:23 +0000
Subject: [PATCH 1309/2704] bot(lockfile): update arduino, djot, haskell, mlir,
 norg, v, wing

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7231e191b..1517026b1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "94219a5ac207a0fadd680b285378d08669d5bbc8"
+    "revision": "e3d0dea39dbb8032e754bafe5aec3ed5a234d986"
   },
   "asm": {
     "revision": "62e49328113ff318128c640bf0cf6dd3d3d51553"
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "4dd87f88df82c3a77bab3929ec0b37d11e2721b7"
+    "revision": "d5d4a8409688a6ebb545cee3203e1449bc0c5856"
   },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
@@ -267,7 +267,7 @@
     "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
   },
   "haskell": {
-    "revision": "6b5ec205c9d4f23eb36a163f1edc4f2db8c98e4a"
+    "revision": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -420,7 +420,7 @@
     "revision": "3ebd060b1a2eec450ff46b73428c63f9148a07ff"
   },
   "mlir": {
-    "revision": "3da76a44a6a5db05aef03966a2045c7c73571d77"
+    "revision": "d9a79cf19da13812e1a4fe1f816b68750ac65cb3"
   },
   "muttrc": {
     "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
@@ -444,7 +444,7 @@
     "revision": "763168fa916a333a459434f1424b5d30645f015d"
   },
   "norg": {
-    "revision": "014073fe8016d1ac440c51d22c77e3765d8f6855"
+    "revision": "9766442985fd546e2d33f8d1c7e7619ed07860cf"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -753,7 +753,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "b21db154e8be920277c494b1cb81367d4da40a98"
+    "revision": "e1f14c4b92f571bb1063ca5260c9172256844540"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -783,7 +783,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "f11359345a2475b434a8e1dd3cfa02f2bc9b7e21"
+    "revision": "ea40325cea1af68d3433fd5d08e43d2a18b87851"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 33c9db832b6f25446f7bd2dd3353f7737a3476c4 Mon Sep 17 00:00:00 2001
From: Joshua Haas <haas.josh.a@gmail.com>
Date: Mon, 25 Mar 2024 03:40:35 -0400
Subject: [PATCH 1310/2704] fix(install): remove extra space during cd (#6355)

breaks xonsh
---
 lua/nvim-treesitter/shell_command_selectors.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 03425c117..c215aa77f 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -329,7 +329,7 @@ function M.make_directory_change_for_command(dir, command)
       return string.format("pushd %s ; %s ; popd", cmdpath(dir), command)
     end
   else
-    return string.format("cd %s;\n %s", dir, command)
+    return string.format("cd %s;\n%s", dir, command)
   end
 end
 

From 7051a7275568c4c790be115ef06f1170b6dd1c19 Mon Sep 17 00:00:00 2001
From: datwaft <datwaftx@gmail.com>
Date: Tue, 19 Mar 2024 15:20:30 -0600
Subject: [PATCH 1311/2704] feat(lua): add injections for `vim.filetype.add`

---
 queries/lua/injections.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 4fccbcb14..45a5fb8b8 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -177,3 +177,21 @@
 (comment
   content: (_) @injection.content
   (#set! injection.language "comment"))
+
+; vim.filetype.add({ pattern = { ["some lua pattern here"] = "filetype" } })
+((function_call
+  name: (_) @_filetypeadd_identifier
+  arguments:
+    (arguments
+      (table_constructor
+        (field
+          name: (_) @_pattern_key
+          value:
+            (table_constructor
+              (field
+                name:
+                  (string
+                    content: _ @injection.content)))))))
+  (#set! injection.language "luap")
+  (#eq? @_filetypeadd_identifier "vim.filetype.add")
+  (#eq? @_pattern_key "pattern"))

From 965f2e7239ab5e1c5f133d498591f1e70746410c Mon Sep 17 00:00:00 2001
From: datwaft <datwaftx@gmail.com>
Date: Fri, 22 Mar 2024 16:13:40 -0600
Subject: [PATCH 1312/2704] style: format query

---
 queries/lua/injections.scm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 45a5fb8b8..431fc7f7d 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -181,17 +181,14 @@
 ; vim.filetype.add({ pattern = { ["some lua pattern here"] = "filetype" } })
 ((function_call
   name: (_) @_filetypeadd_identifier
-  arguments:
-    (arguments
-      (table_constructor
-        (field
-          name: (_) @_pattern_key
-          value:
-            (table_constructor
-              (field
-                name:
-                  (string
-                    content: _ @injection.content)))))))
+  arguments: (arguments
+    (table_constructor
+      (field
+        name: (_) @_pattern_key
+        value: (table_constructor
+          (field
+            name: (string
+              content: _ @injection.content)))))))
   (#set! injection.language "luap")
   (#eq? @_filetypeadd_identifier "vim.filetype.add")
   (#eq? @_pattern_key "pattern"))

From cf737c341d7c8a5b59321bb919d162e6552c6719 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 24 Mar 2024 16:26:31 +0100
Subject: [PATCH 1313/2704] fix(smali): move to github mirror

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1517026b1..d3673f3fe 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -618,7 +618,7 @@
     "revision": "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"
   },
   "smali": {
-    "revision": "72e334b2630f5852825ba5ff9dfd872447175eb5"
+    "revision": "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c"
   },
   "smithy": {
     "revision": "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 68eb3ff2e..756c5408e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1807,7 +1807,7 @@ list.slint = {
 
 list.smali = {
   install_info = {
-    url = "https://git.sr.ht/~yotam/tree-sitter-smali",
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-smali",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@amaanq" },

From 20042941df6c014f611e948cd656afd482823d81 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 13:36:29 +0000
Subject: [PATCH 1314/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 85f9c4941..2851b05bf 100644
--- a/README.md
+++ b/README.md
@@ -379,7 +379,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
 - [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
 - [x] [slint](https://github.com/slint-ui/tree-sitter-slint) (maintained by @hunger)
-- [x] [smali](https://git.sr.ht/~yotam/tree-sitter-smali) (maintained by @amaanq)
+- [x] [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
 - [ ] [snakemake](https://github.com/osthomas/tree-sitter-snakemake) (experimental)
 - [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)

From aa31b8d4ccaa05e1ab30120e103f72adbd2837bc Mon Sep 17 00:00:00 2001
From: Wojciech Kulik <3128467+wojciech-kulik@users.noreply.github.com>
Date: Sun, 24 Mar 2024 01:10:18 +0100
Subject: [PATCH 1315/2704] fix(swift): highlights

---
 queries/swift/highlights.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 377420003..3ee1d2e8b 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -39,7 +39,7 @@
 (function_declaration
   (simple_identifier) @function.method)
 
-(function_declaration
+(init_declaration
   "init" @constructor)
 
 (throws) @keyword
@@ -80,6 +80,11 @@
   "convenience"
   "required"
   "some"
+  "any"
+  "weak"
+  "unowned"
+  "didSet"
+  "willSet"
 ] @keyword
 
 [
@@ -115,6 +120,15 @@
 (enum_entry
   "case" @keyword)
 
+; Attributes
+(modifiers
+  (attribute) @attribute.builtin)
+
+(modifiers
+  (attribute
+    (user_type
+      (type_identifier) @attribute.builtin)))
+
 ; Function calls
 (call_expression
   (simple_identifier) @function.call) ; foo()
@@ -275,6 +289,9 @@
   "++"
   "--"
   "&"
+  "&&"
+  "|"
+  "||"
   "~"
   "%="
   "!="

From 1c3fb9eac2a04230e4af23715fa2c190cbeacd70 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 06:37:11 +0000
Subject: [PATCH 1316/2704] bot(lockfile): update djot, dtd, hyprlang, perl,
 tlaplus, v, wing, xml

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d3673f3fe..35e0b39fc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "d5d4a8409688a6ebb545cee3203e1449bc0c5856"
+    "revision": "c4a269d55b02a8d9afccc3445b9ccbed65d4cf27"
   },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
@@ -129,7 +129,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "ab85469fedbf4f32da9310dd76dcedba059fc482"
+    "revision": "24b662eb61e369757d13c4b5f0624284dc3fe7e8"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -309,7 +309,7 @@
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
   },
   "hyprlang": {
-    "revision": "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3"
+    "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -480,7 +480,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "fd7b2fe5b967d5eee8ce17938052886e2d5987ed"
+    "revision": "96a17c4c2dd345dc61f330d040684538d634bbc2"
   },
   "php": {
     "revision": "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"
@@ -705,7 +705,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "7455f17038d551ecd2b082c39e4a63bcb403e158"
+    "revision": "b2ffee62569b78719de352178f5332ecab5dac90"
   },
   "tmux": {
     "revision": "10737f5dc4d8e68c9667f11a6996688a1185755f"
@@ -753,7 +753,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "e1f14c4b92f571bb1063ca5260c9172256844540"
+    "revision": "3165e0487fea1b7727089a7d2ac5b96fc7c48956"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -783,13 +783,13 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "ea40325cea1af68d3433fd5d08e43d2a18b87851"
+    "revision": "388ca5520d336bdf5e117824d27379ad11569e54"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "ab85469fedbf4f32da9310dd76dcedba059fc482"
+    "revision": "24b662eb61e369757d13c4b5f0624284dc3fe7e8"
   },
   "yaml": {
     "revision": "9e59b9bbf839ba231fbcb953617d8b9b9a059e38"

From 7f3179315959bd762abd0f8dbe0361db805fb2d4 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 26 Mar 2024 08:19:51 -0700
Subject: [PATCH 1317/2704] feat(markdown): yaml, toml metadata highlights
 (#6360)

---
 queries/markdown/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index ac582e3f9..4b445e02f 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -111,6 +111,12 @@
 ((block_quote) @markup.quote
   (#set! "priority" 90))
 
+([
+  (plus_metadata)
+  (minus_metadata)
+] @keyword.directive
+  (#set! "priority" 90))
+
 [
   (block_continuation)
   (block_quote_marker)

From 3d473a4d5da377782fca014e06b47877fc453180 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 26 Mar 2024 21:23:03 -0400
Subject: [PATCH 1318/2704] fix(rust): indentation in tuple struct patterns

---
 queries/rust/indents.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index d56a246c6..3fa7e7731 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -6,6 +6,7 @@
   (for_expression)
   (struct_expression)
   (struct_pattern)
+  (tuple_struct_pattern)
   (tuple_expression)
   (match_block)
   (call_expression)
@@ -81,6 +82,9 @@
 (struct_pattern
   "}" @indent.end)
 
+(tuple_struct_pattern
+  ")" @indent.end)
+
 (trait_item
   body: (declaration_list
     "}" @indent.end))

From 839dec615a101a7246ece1ede1de337c958019c8 Mon Sep 17 00:00:00 2001
From: Christian Degnbol Madsen <christian.degnbol@gmail.com>
Date: Wed, 20 Mar 2024 17:37:03 +1100
Subject: [PATCH 1319/2704] feat(julia): broadcast pipe

Add support for capturing function call after a broadcasted pipe.
Currently works for unbroadcasted pipe.
There might be a better more complicated way to do this, since this will capture the broadcasting dot as part of the `@_pipe` capture.
---
 queries/julia/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 5b8cf5bbb..f48d97d97 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -57,7 +57,7 @@
   (_)
   (operator) @_pipe
   (identifier) @function.call
-  (#eq? @_pipe "|>"))
+  (#any-of? @_pipe "|>" ".|>"))
 
 ; Builtins
 ((identifier) @function.builtin

From 68ba579eb64d3f69fb4780945f85a687c4202108 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 06:35:09 +0000
Subject: [PATCH 1320/2704] bot(lockfile): update djot, hlsplaylist, html,
 meson, muttrc, query, svelte, tlaplus, tmux, v, vue, wing, zathurarc

---
 lockfile.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 35e0b39fc..60fc52da0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "c4a269d55b02a8d9afccc3445b9ccbed65d4cf27"
+    "revision": "b8ff9a0a07c1d53bae27875958b6be14f7593736"
   },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
@@ -288,7 +288,7 @@
     "revision": "ee24be127560f0de0c4741e382416f45ab47eb76"
   },
   "hlsplaylist": {
-    "revision": "5be34b0f6ea01b24f017c2c715729a3a919f57fd"
+    "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -297,7 +297,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "cc53b6878a003cf26d213025af49c78388cebe21"
+    "revision": "bfa075d83c6b97cd48440b3829ab8d24a2319809"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -417,13 +417,13 @@
     "revision": "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98"
   },
   "meson": {
-    "revision": "3ebd060b1a2eec450ff46b73428c63f9148a07ff"
+    "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
     "revision": "d9a79cf19da13812e1a4fe1f816b68750ac65cb3"
   },
   "muttrc": {
-    "revision": "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"
+    "revision": "2f918f9c887109fdf1419f98158a0cfff644af75"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
@@ -552,7 +552,7 @@
     "revision": "9fa49ff3315987f715ce5666ff979a7742fa8a98"
   },
   "query": {
-    "revision": "176a380df78800167565118bb0dadfc961abbd43"
+    "revision": "2e31ca2771f6042b0e4e0c41a6290014a9e1face"
   },
   "r": {
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
@@ -666,7 +666,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "b974719d47447666687d49c68a51b278b2320e99"
+    "revision": "6909efa7179cd655f9b48123357d65ce8fc661fd"
   },
   "swift": {
     "revision": "bb3fe96bb65d9b71e2d04b7ebe27dc1947f2cd5d"
@@ -705,10 +705,10 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "b2ffee62569b78719de352178f5332ecab5dac90"
+    "revision": "496322c1f78647ae0cc1ec96e7b2523656d34846"
   },
   "tmux": {
-    "revision": "10737f5dc4d8e68c9667f11a6996688a1185755f"
+    "revision": "7cb35fc925cad06992e57672a027d4971ee935a7"
   },
   "todotxt": {
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
@@ -753,7 +753,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "3165e0487fea1b7727089a7d2ac5b96fc7c48956"
+    "revision": "180b5d3ebbedd197821d1364ddd83489faa71489"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -774,7 +774,7 @@
     "revision": "a75a932449675bbd260213a95f4cd8b3193286f0"
   },
   "vue": {
-    "revision": "3b9d52087100bdfce43dad2ca46d75b0e21613f6"
+    "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"
   },
   "wgsl": {
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
@@ -783,7 +783,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "388ca5520d336bdf5e117824d27379ad11569e54"
+    "revision": "9473b8d7547b3075cc9c68a086155f643a1d7b45"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
@@ -801,7 +801,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "353bdf25e7af9c2830e254977fd3fb57ccaa8203"
+    "revision": "aad4302fb5a5176004b688fcab4ae7dcf36bf49a"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 34007887059238f63a49ab4d382d839d9405c66c Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Mon, 18 Mar 2024 21:19:50 -0500
Subject: [PATCH 1321/2704] feat(php): add highlight tests

---
 queries/php_only/highlights.scm          |   1 +
 tests/query/highlights/php/keywords.php  | 173 +++++++++++++++++++++++
 tests/query/highlights/php/literals.php  |  26 ++++
 tests/query/highlights/php/types.php     |  23 +++
 tests/query/highlights/php/variables.php |  28 ++++
 5 files changed, 251 insertions(+)
 create mode 100644 tests/query/highlights/php/keywords.php
 create mode 100644 tests/query/highlights/php/literals.php
 create mode 100644 tests/query/highlights/php/types.php
 create mode 100644 tests/query/highlights/php/variables.php

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 557421d9f..0bba534d0 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -216,6 +216,7 @@
 
 (named_label_statement) @label
 
+
 ; Keywords
 [
   "and"
diff --git a/tests/query/highlights/php/keywords.php b/tests/query/highlights/php/keywords.php
new file mode 100644
index 000000000..e11a9f351
--- /dev/null
+++ b/tests/query/highlights/php/keywords.php
@@ -0,0 +1,173 @@
+<?php
+//^^^ @punctuation.bracket
+
+declare(strict_types=1);
+//^^^^^ @keyword
+//      ^^^^^^^^^^^^ @variable.parameter
+//                  ^ @operator
+//                   ^ @number
+//                     ^ @punctuation.delimiter
+
+include "file.php";
+//^^^^^ @keyword.import
+//      ^^^^^^^^^ @string
+include_once "file.php";
+//^^^^^^^^^^ @keyword.import
+require "file.php";
+//^^^^^ @keyword.import
+require_once "file.php";
+//^^^^^^^^^^ @keyword.import
+
+namespace A\B;
+//^^^^^^^ @keyword
+//        ^^^ @module
+
+if ($a and $b or $c xor $d) {} elseif ($b) {} else {}
+// <- @keyword.conditional
+//     ^^^ @keyword.operator
+//            ^^ @keyword.operator
+//                  ^^^ @keyword.operator
+//                             ^^^^^^ @keyword.conditional
+//                                            ^^^^ @keyword.conditional
+
+for ($i = 0; $i < 1; $i++) { continue; }
+// <- @keyword.repeat
+//              ^ @operator
+//                     ^^ @operator
+//                           ^^^^^^^^ @keyword.repeat
+
+while ($b) {}
+//^^^ @keyword.repeat
+
+do { } while ($c);
+// <- @keyword.repeat
+//     ^^^^^ @keyword.repeat
+
+foreach ($foos as $foo) {}
+//^^^^^ @keyword.repeat
+//             ^^ @keyword.operator
+
+try {} catch (Exception $e) {} finally {}
+//^ @keyword.exception
+//     ^^^^^ @keyword.exception
+//            ^^^^^^^^^ @type
+//                             ^^^^^^^ @keyword.exception
+
+function a() {}
+//^^^^^^ @keyword.function
+//       ^ @function
+
+abstract class A
+//^^^^^^ @keyword.modifier
+//       ^^^^^ @keyword
+//             ^ @type
+{
+  private const BAR = 1;
+//^^^^^^^ @keyword.modifier
+//        ^^^^^ @keyword.modifier
+  //            ^^^ @constant
+  protected readonly static $a;
+//^^^^^^^^^ @keyword.modifier
+//          ^^^^^^^^ @keyword.modifier
+//                   ^^^^^^ @keyword.modifier
+  //                        ^^ @property
+  final public $b;
+//^^^^^ @keyword.modifier
+  public static function foo(): static {}
+//^^^^^^ @keyword.modifier
+//       ^^^^^^ @keyword.modifier
+//              ^^^^^^^^ @keyword.function
+//                       ^^^ @function.method
+//                              ^^^^^^ @type.builtin
+  public function __construct() {}
+//                ^^^^^^^^^^^ @constructor
+}
+
+class B extends A implements T
+//    ^ @type
+//      ^^^^^^^ @keyword
+//              ^ @type
+//                ^^^^^^^^^^ @keyword
+//                           ^ @type
+{
+  use T, U {
+//^^^ @keyword.import
+//     ^ @punctuation.delimiter
+    U::small insteadof T;
+//  ^ @type
+//   ^^ @operator
+//     ^^^^^ @constant
+//           ^^^^^^^^^ @keyword
+//                     ^ @type
+  }
+  public function foo(callable $call): self
+//                    ^^^^^^^^ @type.builtin
+//                                     ^^^^ @type.builtin
+  {
+    $call instanceof Closure;
+//  ^^^^^ @variable
+//        ^^^^^^^^^^ @keyword
+//                   ^^^^^^^ @type
+    fn ($a, $b) => $a + $b;
+//  ^^ @keyword.function
+    static $a;
+//  ^^^^^^ @keyword.modifier
+    global $a;
+//  ^^^^^^ @keyword
+    clone $call;
+//  ^^^^^ @keyword
+    match ($a) {
+//  ^^^^^ @keyword.conditional
+      default => "other",
+//    ^^^^^^^ @keyword
+//            ^^ @operator
+    };
+
+    switch ($a) {
+//  ^^^^^^ @keyword.conditional
+      case 'value':
+//    ^^^^ @keyword.conditional
+        break;
+//      ^^^^^ @keyword
+      default:
+//    ^^^^^^^ @keyword
+    }
+    yield $a;
+//  ^^^^^ @keyword.return
+    yield from $a;
+//        ^^^^ @keyword.return
+    return $a;
+//  ^^^^^^ @keyword.return
+    goto a;
+//  ^^^^ @keyword
+    echo "a";
+//  ^^^^ @keyword
+    print "a";
+//  ^^^^^ @keyword
+    print("a");
+//  ^^^^^ @keyword
+    exit;
+//  ^^^^ @keyword
+    exit();
+//  ^^^^ @function.builtin
+    exit(1);
+//  ^^^^ @function.builtin
+  }
+}
+
+throw new Exception("oh");
+//^^^ @keyword.exception
+//    ^^^ @keyword
+//        ^^^^^^^^^ @constructor
+
+interface T {}
+//^^^^^^^ @keyword
+//        ^ @type
+
+trait T { public function small(): void {} }
+//^^^ @keyword
+//    ^ @type
+//                                 ^^^^ @type.builtin
+enum Foo { case Bar; }
+//^^ @keyword
+//         ^^^^  @keyword.conditional
diff --git a/tests/query/highlights/php/literals.php b/tests/query/highlights/php/literals.php
new file mode 100644
index 000000000..17b539362
--- /dev/null
+++ b/tests/query/highlights/php/literals.php
@@ -0,0 +1,26 @@
+<?php
+
+echo <<<OMG
+//   ^^^ @operator
+//      ^^^ @label
+              something
+OMG;
+//^ @label
+
+echo true, TRUE, false, FALSE;
+//   ^^^^ @boolean
+//         ^^^^ @boolean
+//               ^^^^^ @boolean
+//                      ^^^^^ @boolean
+
+echo PI_314;
+//   ^^^^^^ @constant
+
+echo __DIR__;
+//   ^^^^^^^ @constant.builtin
+
+echo null, 42, 42.524, "Testing\n";
+//   ^^^^ @constant.builtin
+//         ^^ @number
+//             ^^^^^^ @number.float
+//                             ^^ @string.escape
diff --git a/tests/query/highlights/php/types.php b/tests/query/highlights/php/types.php
new file mode 100644
index 000000000..7a3adb233
--- /dev/null
+++ b/tests/query/highlights/php/types.php
@@ -0,0 +1,23 @@
+<?php
+
+function b(int $a, string $b, Person $e): Foo\Dog {}
+//         ^^^ @type.builtin
+//             ^^ @variable
+//                 ^^^^^^ @type.builtin
+//                            ^^^^^^ @type
+//                                        ^^^ @module
+//                                            ^^^ @type
+
+function a(array $b) {
+//         ^^^^^ @type.builtin
+  echo (int) $foo;
+//      ^^^ @type.builtin
+}
+
+class A {
+  public function foo(self $a): self {}
+//                    ^^^^ @type.builtin
+//                              ^^^^ @type.builtin
+  private function baz(): static {}
+//                        ^^^^^^ @type.builtin
+}
diff --git a/tests/query/highlights/php/variables.php b/tests/query/highlights/php/variables.php
new file mode 100644
index 000000000..6a466357c
--- /dev/null
+++ b/tests/query/highlights/php/variables.php
@@ -0,0 +1,28 @@
+<?php
+
+class A {
+  public function foo(self $a): self {
+//                          ^ @variable
+    new self();
+//      ^^^^ @constructor
+    new static();
+//      ^^^^^^ @constructor
+    new parent();
+//      ^^^^^^ @constructor
+    $this->foo();
+//   ^^^^ @variable.builtin
+//       ^^ @operator
+//         ^^^ @function.method.call
+    self::foo();
+//  ^^^^ @variable.builtin
+//        ^^^ @function.call
+    static::foo();
+//  ^^^^^^ @variable.builtin
+    parent::foo();
+//  ^^^^^^ @variable.builtin
+    $this->foo;
+//         ^^^ @variable.member
+    $this->foo(a: 5);
+//             ^ @variable.parameter
+  }
+}

From 1c9a94bd60b7a662a2d36a1bb753f26946f4cda4 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Mon, 18 Mar 2024 22:09:53 -0500
Subject: [PATCH 1322/2704] fix(php): add missing keyword highlights, fix
 static keyword

---
 queries/php_only/highlights.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 0bba534d0..ab95ea603 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -26,6 +26,9 @@
       (name) @type)
   ])
 
+(named_type (name) @type.builtin
+  (#any-of? @type.builtin "static" "self"))
+
 (class_declaration
   name: (name) @type)
 
@@ -96,6 +99,8 @@
 (list_literal
   "list" @function.builtin)
 
+(exit_statement "exit" @function.builtin "(")
+
 (method_declaration
   name: (name) @function.method)
 
@@ -216,7 +221,6 @@
 
 (named_label_statement) @label
 
-
 ; Keywords
 [
   "and"
@@ -246,6 +250,7 @@
   "implements"
   "insteadof"
   "interface"
+  "print"
   "namespace"
   "new"
   "trait"
@@ -260,14 +265,22 @@
   "protected"
   "public"
   "readonly"
-  "static"
+  (static_modifier)
 ] @keyword.modifier
 
+(function_static_declaration
+  "static" @keyword.modifier)
+
 [
   "return"
+  "exit"
   "yield"
 ] @keyword.return
 
+(yield_expression
+  "from" @keyword.return)
+
+
 [
   "case"
   "else"

From 7d938c1c72ac21cd059ed9a71d50f1329b33d988 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Mon, 18 Mar 2024 22:42:44 -0500
Subject: [PATCH 1323/2704] fix(php): fix use_{as,instead_of}_clause highlights

---
 queries/php_only/highlights.scm         | 20 +++++++++++++++++---
 tests/query/highlights/php/keywords.php | 17 ++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index ab95ea603..e8b4a7825 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -26,7 +26,8 @@
       (name) @type)
   ])
 
-(named_type (name) @type.builtin
+(named_type
+  (name) @type.builtin
   (#any-of? @type.builtin "static" "self"))
 
 (class_declaration
@@ -99,7 +100,9 @@
 (list_literal
   "list" @function.builtin)
 
-(exit_statement "exit" @function.builtin "(")
+(exit_statement
+  "exit" @function.builtin
+  "(")
 
 (method_declaration
   name: (name) @function.method)
@@ -123,6 +126,18 @@
 (nullsafe_member_call_expression
   name: (name) @function.method)
 
+(use_instead_of_clause
+  (class_constant_access_expression
+    (_)
+    (name) @function.method)
+  (name) @type)
+
+(use_as_clause
+  (class_constant_access_expression
+    (_)
+    (name) @function.method)*
+  (name) @function.method)
+
 (method_declaration
   name: (name) @constructor
   (#eq? @constructor "__construct"))
@@ -280,7 +295,6 @@
 (yield_expression
   "from" @keyword.return)
 
-
 [
   "case"
   "else"
diff --git a/tests/query/highlights/php/keywords.php b/tests/query/highlights/php/keywords.php
index e11a9f351..4bacf1c9d 100644
--- a/tests/query/highlights/php/keywords.php
+++ b/tests/query/highlights/php/keywords.php
@@ -96,9 +96,20 @@ class B extends A implements T
     U::small insteadof T;
 //  ^ @type
 //   ^^ @operator
-//     ^^^^^ @constant
+//     ^^^^^ @function.method
 //           ^^^^^^^^^ @keyword
 //                     ^ @type
+    T::big as protected tBig;
+//  ^ @type
+//     ^^^ @function.method
+//         ^^ @keyword.operator
+//            ^^^^^^^^^ @keyword.modifier
+//                      ^^^^ @function.method
+    big as private tBig;
+//  ^^^ @function.method
+//      ^^ @keyword.operator
+//         ^^^^^^^^^ @keyword.modifier
+//                 ^^^^ @function.method
   }
   public function foo(callable $call): self
 //                    ^^^^^^^^ @type.builtin
@@ -106,7 +117,7 @@ class B extends A implements T
   {
     $call instanceof Closure;
 //  ^^^^^ @variable
-//        ^^^^^^^^^^ @keyword
+//        ^^^^^^^^^^ @keyword.operator
 //                   ^^^^^^^ @type
     fn ($a, $b) => $a + $b;
 //  ^^ @keyword.function
@@ -147,7 +158,7 @@ class B extends A implements T
     print("a");
 //  ^^^^^ @keyword
     exit;
-//  ^^^^ @keyword
+//  ^^^^ @keyword.return
     exit();
 //  ^^^^ @function.builtin
     exit(1);

From 4ebf4ca4fad78866359d6e7126202f1791264416 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Tue, 19 Mar 2024 09:02:08 -0500
Subject: [PATCH 1324/2704] chore(php): trim down tests

---
 tests/query/highlights/php/keywords.php  | 122 -----------------------
 tests/query/highlights/php/literals.php  |  26 -----
 tests/query/highlights/php/types.php     |   7 +-
 tests/query/highlights/php/variables.php |   1 -
 4 files changed, 3 insertions(+), 153 deletions(-)
 delete mode 100644 tests/query/highlights/php/literals.php

diff --git a/tests/query/highlights/php/keywords.php b/tests/query/highlights/php/keywords.php
index 4bacf1c9d..f3d3f95a7 100644
--- a/tests/query/highlights/php/keywords.php
+++ b/tests/query/highlights/php/keywords.php
@@ -1,101 +1,28 @@
 <?php
-//^^^ @punctuation.bracket
-
-declare(strict_types=1);
-//^^^^^ @keyword
-//      ^^^^^^^^^^^^ @variable.parameter
-//                  ^ @operator
-//                   ^ @number
-//                     ^ @punctuation.delimiter
-
-include "file.php";
-//^^^^^ @keyword.import
-//      ^^^^^^^^^ @string
-include_once "file.php";
-//^^^^^^^^^^ @keyword.import
-require "file.php";
-//^^^^^ @keyword.import
-require_once "file.php";
-//^^^^^^^^^^ @keyword.import
-
-namespace A\B;
-//^^^^^^^ @keyword
-//        ^^^ @module
-
-if ($a and $b or $c xor $d) {} elseif ($b) {} else {}
-// <- @keyword.conditional
-//     ^^^ @keyword.operator
-//            ^^ @keyword.operator
-//                  ^^^ @keyword.operator
-//                             ^^^^^^ @keyword.conditional
-//                                            ^^^^ @keyword.conditional
-
-for ($i = 0; $i < 1; $i++) { continue; }
-// <- @keyword.repeat
-//              ^ @operator
-//                     ^^ @operator
-//                           ^^^^^^^^ @keyword.repeat
-
-while ($b) {}
-//^^^ @keyword.repeat
-
-do { } while ($c);
-// <- @keyword.repeat
-//     ^^^^^ @keyword.repeat
-
-foreach ($foos as $foo) {}
-//^^^^^ @keyword.repeat
-//             ^^ @keyword.operator
-
-try {} catch (Exception $e) {} finally {}
-//^ @keyword.exception
-//     ^^^^^ @keyword.exception
-//            ^^^^^^^^^ @type
-//                             ^^^^^^^ @keyword.exception
-
-function a() {}
-//^^^^^^ @keyword.function
-//       ^ @function
 
 abstract class A
-//^^^^^^ @keyword.modifier
-//       ^^^^^ @keyword
-//             ^ @type
 {
-  private const BAR = 1;
-//^^^^^^^ @keyword.modifier
-//        ^^^^^ @keyword.modifier
-  //            ^^^ @constant
   protected readonly static $a;
 //^^^^^^^^^ @keyword.modifier
 //          ^^^^^^^^ @keyword.modifier
 //                   ^^^^^^ @keyword.modifier
-  //                        ^^ @property
-  final public $b;
-//^^^^^ @keyword.modifier
   public static function foo(): static {}
 //^^^^^^ @keyword.modifier
 //       ^^^^^^ @keyword.modifier
 //              ^^^^^^^^ @keyword.function
 //                       ^^^ @function.method
 //                              ^^^^^^ @type.builtin
-  public function __construct() {}
-//                ^^^^^^^^^^^ @constructor
 }
 
 class B extends A implements T
 //    ^ @type
 //      ^^^^^^^ @keyword
-//              ^ @type
 //                ^^^^^^^^^^ @keyword
-//                           ^ @type
 {
   use T, U {
 //^^^ @keyword.import
-//     ^ @punctuation.delimiter
     U::small insteadof T;
 //  ^ @type
-//   ^^ @operator
 //     ^^^^^ @function.method
 //           ^^^^^^^^^ @keyword
 //                     ^ @type
@@ -115,44 +42,12 @@ class B extends A implements T
 //                    ^^^^^^^^ @type.builtin
 //                                     ^^^^ @type.builtin
   {
-    $call instanceof Closure;
-//  ^^^^^ @variable
-//        ^^^^^^^^^^ @keyword.operator
-//                   ^^^^^^^ @type
-    fn ($a, $b) => $a + $b;
-//  ^^ @keyword.function
     static $a;
 //  ^^^^^^ @keyword.modifier
-    global $a;
-//  ^^^^^^ @keyword
-    clone $call;
-//  ^^^^^ @keyword
-    match ($a) {
-//  ^^^^^ @keyword.conditional
-      default => "other",
-//    ^^^^^^^ @keyword
-//            ^^ @operator
-    };
-
-    switch ($a) {
-//  ^^^^^^ @keyword.conditional
-      case 'value':
-//    ^^^^ @keyword.conditional
-        break;
-//      ^^^^^ @keyword
-      default:
-//    ^^^^^^^ @keyword
-    }
     yield $a;
 //  ^^^^^ @keyword.return
     yield from $a;
 //        ^^^^ @keyword.return
-    return $a;
-//  ^^^^^^ @keyword.return
-    goto a;
-//  ^^^^ @keyword
-    echo "a";
-//  ^^^^ @keyword
     print "a";
 //  ^^^^^ @keyword
     print("a");
@@ -165,20 +60,3 @@ class B extends A implements T
 //  ^^^^ @function.builtin
   }
 }
-
-throw new Exception("oh");
-//^^^ @keyword.exception
-//    ^^^ @keyword
-//        ^^^^^^^^^ @constructor
-
-interface T {}
-//^^^^^^^ @keyword
-//        ^ @type
-
-trait T { public function small(): void {} }
-//^^^ @keyword
-//    ^ @type
-//                                 ^^^^ @type.builtin
-enum Foo { case Bar; }
-//^^ @keyword
-//         ^^^^  @keyword.conditional
diff --git a/tests/query/highlights/php/literals.php b/tests/query/highlights/php/literals.php
deleted file mode 100644
index 17b539362..000000000
--- a/tests/query/highlights/php/literals.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-echo <<<OMG
-//   ^^^ @operator
-//      ^^^ @label
-              something
-OMG;
-//^ @label
-
-echo true, TRUE, false, FALSE;
-//   ^^^^ @boolean
-//         ^^^^ @boolean
-//               ^^^^^ @boolean
-//                      ^^^^^ @boolean
-
-echo PI_314;
-//   ^^^^^^ @constant
-
-echo __DIR__;
-//   ^^^^^^^ @constant.builtin
-
-echo null, 42, 42.524, "Testing\n";
-//   ^^^^ @constant.builtin
-//         ^^ @number
-//             ^^^^^^ @number.float
-//                             ^^ @string.escape
diff --git a/tests/query/highlights/php/types.php b/tests/query/highlights/php/types.php
index 7a3adb233..5985d6361 100644
--- a/tests/query/highlights/php/types.php
+++ b/tests/query/highlights/php/types.php
@@ -1,12 +1,11 @@
 <?php
 
-function b(int $a, string $b, Person $e): Foo\Dog {}
+function b(int $a, string $b): Foo\Dog {}
 //         ^^^ @type.builtin
 //             ^^ @variable
 //                 ^^^^^^ @type.builtin
-//                            ^^^^^^ @type
-//                                        ^^^ @module
-//                                            ^^^ @type
+//                             ^^^ @module
+//                                 ^^^ @type
 
 function a(array $b) {
 //         ^^^^^ @type.builtin
diff --git a/tests/query/highlights/php/variables.php b/tests/query/highlights/php/variables.php
index 6a466357c..a9c099ff2 100644
--- a/tests/query/highlights/php/variables.php
+++ b/tests/query/highlights/php/variables.php
@@ -11,7 +11,6 @@ class A {
 //      ^^^^^^ @constructor
     $this->foo();
 //   ^^^^ @variable.builtin
-//       ^^ @operator
 //         ^^^ @function.method.call
     self::foo();
 //  ^^^^ @variable.builtin

From ac1742436c2453820c406060cff59579f6906cef Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Tue, 19 Mar 2024 09:03:05 -0500
Subject: [PATCH 1325/2704] chore(php): move keywords to top of queries

---
 queries/php_only/highlights.scm | 334 ++++++++++++++++----------------
 1 file changed, 167 insertions(+), 167 deletions(-)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index e8b4a7825..2ef9ea38f 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -1,3 +1,170 @@
+; Keywords
+[
+  "and"
+  "as"
+  "instanceof"
+  "or"
+  "xor"
+] @keyword.operator
+
+[
+  "fn"
+  "function"
+] @keyword.function
+
+[
+  "break"
+  "class"
+  "clone"
+  "declare"
+  "default"
+  "echo"
+  "enddeclare"
+  "enum"
+  "extends"
+  "global"
+  "goto"
+  "implements"
+  "insteadof"
+  "interface"
+  "print"
+  "namespace"
+  "new"
+  "trait"
+  "unset"
+] @keyword
+
+[
+  "abstract"
+  "const"
+  "final"
+  "private"
+  "protected"
+  "public"
+  "readonly"
+  (static_modifier)
+] @keyword.modifier
+
+(function_static_declaration
+  "static" @keyword.modifier)
+
+[
+  "return"
+  "exit"
+  "yield"
+] @keyword.return
+
+(yield_expression
+  "from" @keyword.return)
+
+[
+  "case"
+  "else"
+  "elseif"
+  "endif"
+  "endswitch"
+  "if"
+  "switch"
+  "match"
+  "??"
+] @keyword.conditional
+
+[
+  "continue"
+  "do"
+  "endfor"
+  "endforeach"
+  "endwhile"
+  "for"
+  "foreach"
+  "while"
+] @keyword.repeat
+
+[
+  "catch"
+  "finally"
+  "throw"
+  "try"
+] @keyword.exception
+
+[
+  "include_once"
+  "include"
+  "require_once"
+  "require"
+  "use"
+] @keyword.import
+
+[
+  ","
+  ";"
+  ":"
+  "\\"
+] @punctuation.delimiter
+
+[
+  (php_tag)
+  "?>"
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "#["
+] @punctuation.bracket
+
+[
+  "="
+  "."
+  "-"
+  "*"
+  "/"
+  "+"
+  "%"
+  "**"
+  "~"
+  "|"
+  "^"
+  "&"
+  "<<"
+  ">>"
+  "<<<"
+  "->"
+  "?->"
+  "=>"
+  "<"
+  "<="
+  ">="
+  ">"
+  "<>"
+  "<=>"
+  "=="
+  "!="
+  "==="
+  "!=="
+  "!"
+  "&&"
+  "||"
+  ".="
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "**="
+  "&="
+  "|="
+  "^="
+  "<<="
+  ">>="
+  "??="
+  "--"
+  "++"
+  "@"
+  "::"
+] @operator
+
 ; Variables
 (variable_name) @variable
 
@@ -235,170 +402,3 @@
 (comment) @comment @spell
 
 (named_label_statement) @label
-
-; Keywords
-[
-  "and"
-  "as"
-  "instanceof"
-  "or"
-  "xor"
-] @keyword.operator
-
-[
-  "fn"
-  "function"
-] @keyword.function
-
-[
-  "break"
-  "class"
-  "clone"
-  "declare"
-  "default"
-  "echo"
-  "enddeclare"
-  "enum"
-  "extends"
-  "global"
-  "goto"
-  "implements"
-  "insteadof"
-  "interface"
-  "print"
-  "namespace"
-  "new"
-  "trait"
-  "unset"
-] @keyword
-
-[
-  "abstract"
-  "const"
-  "final"
-  "private"
-  "protected"
-  "public"
-  "readonly"
-  (static_modifier)
-] @keyword.modifier
-
-(function_static_declaration
-  "static" @keyword.modifier)
-
-[
-  "return"
-  "exit"
-  "yield"
-] @keyword.return
-
-(yield_expression
-  "from" @keyword.return)
-
-[
-  "case"
-  "else"
-  "elseif"
-  "endif"
-  "endswitch"
-  "if"
-  "switch"
-  "match"
-  "??"
-] @keyword.conditional
-
-[
-  "continue"
-  "do"
-  "endfor"
-  "endforeach"
-  "endwhile"
-  "for"
-  "foreach"
-  "while"
-] @keyword.repeat
-
-[
-  "catch"
-  "finally"
-  "throw"
-  "try"
-] @keyword.exception
-
-[
-  "include_once"
-  "include"
-  "require_once"
-  "require"
-  "use"
-] @keyword.import
-
-[
-  ","
-  ";"
-  ":"
-  "\\"
-] @punctuation.delimiter
-
-[
-  (php_tag)
-  "?>"
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-  "#["
-] @punctuation.bracket
-
-[
-  "="
-  "."
-  "-"
-  "*"
-  "/"
-  "+"
-  "%"
-  "**"
-  "~"
-  "|"
-  "^"
-  "&"
-  "<<"
-  ">>"
-  "<<<"
-  "->"
-  "?->"
-  "=>"
-  "<"
-  "<="
-  ">="
-  ">"
-  "<>"
-  "<=>"
-  "=="
-  "!="
-  "==="
-  "!=="
-  "!"
-  "&&"
-  "||"
-  ".="
-  "-="
-  "+="
-  "*="
-  "/="
-  "%="
-  "**="
-  "&="
-  "|="
-  "^="
-  "<<="
-  ">>="
-  "??="
-  "--"
-  "++"
-  "@"
-  "::"
-] @operator

From aa8d8bc600e00f84d11b9d40c6900d72d0f68fa3 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Tue, 26 Mar 2024 22:08:38 -0500
Subject: [PATCH 1326/2704] fix(php): capture `break` as keyword.repeat

---
 queries/php_only/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 2ef9ea38f..e97b49a91 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -13,7 +13,6 @@
 ] @keyword.function
 
 [
-  "break"
   "class"
   "clone"
   "declare"
@@ -70,6 +69,7 @@
 ] @keyword.conditional
 
 [
+  "break"
   "continue"
   "do"
   "endfor"

From 07a404570f3d912afdfe92bbf74ff55886293369 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sun, 24 Mar 2024 14:55:46 +0900
Subject: [PATCH 1327/2704] fix(c): don't highlight preproc_arg

`preproc_arg` is used for the body of `#define` macro definition, which
is not appropriate to highlight with `@function.macro`. In addition,
this region has an injection to C, so it will get highlights anyway.
---
 queries/c/highlights.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index f9e2ef800..c901b96f3 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -142,9 +142,6 @@
 
 (char_literal) @character
 
-((preproc_arg) @function.macro
-  (#set! "priority" 90))
-
 (preproc_defined) @function.macro
 
 ((field_expression

From 23ba63028c6acca29be6462c0a291fc4a1b9eae8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 06:36:21 +0000
Subject: [PATCH 1328/2704] bot(lockfile): update elixir, groovy, tmux, wing,
 yaml

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 60fc52da0..2a4a24763 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "511ea5e0088779e4bdd76e12963ab9a5fe99983a"
+    "revision": "868620e19f070a5e6b0b685dc6069a611a86259a"
   },
   "elm": {
     "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
@@ -255,7 +255,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "3c25d1ce6c1eb9da34215060372792dc9f439b0c"
+    "revision": "b398a5a243c67f0b4d54728c983fa586bd5cd52e"
   },
   "gstlaunch": {
     "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
@@ -708,7 +708,7 @@
     "revision": "496322c1f78647ae0cc1ec96e7b2523656d34846"
   },
   "tmux": {
-    "revision": "7cb35fc925cad06992e57672a027d4971ee935a7"
+    "revision": "7499587642a46ee156e1bb58851904ac750dcc7c"
   },
   "todotxt": {
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
@@ -783,7 +783,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "9473b8d7547b3075cc9c68a086155f643a1d7b45"
+    "revision": "35b8e3a4f320355eaa60da7b035b487b90aa47a8"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
@@ -792,7 +792,7 @@
     "revision": "24b662eb61e369757d13c4b5f0624284dc3fe7e8"
   },
   "yaml": {
-    "revision": "9e59b9bbf839ba231fbcb953617d8b9b9a059e38"
+    "revision": "10c6c7a69dde767ad229e1510e0c1c7aacd8c83a"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From 29f176c25732c89bc4c0df1b0d14214f5d1c6329 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 06:36:20 +0000
Subject: [PATCH 1329/2704] bot(lockfile): update mlir, v, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2a4a24763..3fd6cb5ac 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -420,7 +420,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "d9a79cf19da13812e1a4fe1f816b68750ac65cb3"
+    "revision": "a89a5f2bbcf7e82e46b106138977c99d6a644db2"
   },
   "muttrc": {
     "revision": "2f918f9c887109fdf1419f98158a0cfff644af75"
@@ -753,7 +753,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "180b5d3ebbedd197821d1364ddd83489faa71489"
+    "revision": "fdf58fdf2c4feb6d056128a58b7f4a7996fb922c"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -783,7 +783,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "35b8e3a4f320355eaa60da7b035b487b90aa47a8"
+    "revision": "4e7b0d296eb259b985766fe35da60e8aaec8daa1"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From f84887230af1f7581e29ccd5d93f59d98058d565 Mon Sep 17 00:00:00 2001
From: Hank Jackson <hjackson277@gmail.com>
Date: Fri, 29 Mar 2024 04:47:26 -0400
Subject: [PATCH 1330/2704] feat(liquid): add new parser tree-sitter-liquid
 (#6359)

(templating language)
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/liquid/highlights.scm   | 130 ++++++++++++++++++++++++++++++++
 queries/liquid/injections.scm   |  22 ++++++
 5 files changed, 164 insertions(+)
 create mode 100644 queries/liquid/highlights.scm
 create mode 100644 queries/liquid/injections.scm

diff --git a/README.md b/README.md
index 2851b05bf..678b436c3 100644
--- a/README.md
+++ b/README.md
@@ -299,6 +299,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
 - [x] [leo](https://github.com/r001/tree-sitter-leo) (maintained by @r001)
 - [x] [linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) (maintained by @amaanq)
+- [x] [liquid](https://github.com/hankthetank27/tree-sitter-liquid) (maintained by @hankthetank27)
 - [x] [liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) (maintained by @toots)
 - [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
 - [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
diff --git a/lockfile.json b/lockfile.json
index 3fd6cb5ac..4fbfd8abf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -377,6 +377,9 @@
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
+  "liquid": {
+    "revision": "06a18b68eaa5665c6eeef30e355878835e473d15"
+  },
   "liquidsoap": {
     "revision": "09a9e31e2af734a8974dad6ed349648f601eee8c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 756c5408e..70379f1dd 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1131,6 +1131,14 @@ list.linkerscript = {
   maintainers = { "@amaanq" },
 }
 
+list.liquid = {
+  install_info = {
+    url = "https://github.com/hankthetank27/tree-sitter-liquid",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@hankthetank27" },
+}
+
 list.liquidsoap = {
   install_info = {
     url = "https://github.com/savonet/tree-sitter-liquidsoap",
diff --git a/queries/liquid/highlights.scm b/queries/liquid/highlights.scm
new file mode 100644
index 000000000..a1bf61169
--- /dev/null
+++ b/queries/liquid/highlights.scm
@@ -0,0 +1,130 @@
+((comment) @comment @spell
+  (#set! priority 110))
+
+(raw_statement
+  (raw_content) @spell
+  (#set! priority 110))
+
+((identifier) @variable
+  (#set! priority 110))
+
+((string) @string
+  (#set! priority 110))
+
+((boolean) @boolean
+  (#set! priority 110))
+
+((number) @number
+  (#set! priority 110))
+
+(filter
+  name: (identifier) @function.call
+  (#set! priority 110))
+
+([
+  "as"
+  "assign"
+  "capture"
+  "decrement"
+  "echo"
+  "endcapture"
+  "endform"
+  "endjavascript"
+  "endraw"
+  "endschema"
+  "endstyle"
+  "form"
+  "increment"
+  "javascript"
+  "layout"
+  "liquid"
+  "raw"
+  "schema"
+  "style"
+  "with"
+] @keyword
+  (#set! priority 110))
+
+([
+  "case"
+  "else"
+  "elsif"
+  "endcase"
+  "endif"
+  "endunless"
+  "if"
+  "unless"
+  "when"
+] @keyword.conditional
+  (#set! priority 110))
+
+([
+  "break"
+  "by"
+  "continue"
+  "cycle"
+  "endfor"
+  "endpaginate"
+  "endtablerow"
+  "for"
+  "paginate"
+  "tablerow"
+] @keyword.repeat
+  (#set! priority 110))
+
+([
+  "and"
+  "contains"
+  "in"
+  "or"
+] @keyword.operator
+  (#set! priority 110))
+
+([
+  "{{"
+  "}}"
+  "{{-"
+  "-}}"
+  "{%"
+  "%}"
+  "{%-"
+  "-%}"
+] @tag.delimiter
+  (#set! priority 110))
+
+[
+  "include"
+  "render"
+  "section"
+  "sections"
+] @keyword.import
+
+[
+  "|"
+  ":"
+  "="
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "^"
+  "=="
+  "<"
+  "<="
+  "!="
+  ">="
+  ">"
+] @operator
+
+[
+  "]"
+  "["
+  ")"
+  "("
+] @punctuation.bracket
+
+[
+  ","
+  "."
+] @punctuation.delimiter
diff --git a/queries/liquid/injections.scm b/queries/liquid/injections.scm
new file mode 100644
index 000000000..fa7457659
--- /dev/null
+++ b/queries/liquid/injections.scm
@@ -0,0 +1,22 @@
+((template_content) @injection.content
+  (#set! injection.language "html")
+  (#set! injection.combined))
+
+; TODO we can switch to quantifiers once neovim 0.10 becomes stable
+(javascript_statement
+  (js_content) @injection.content
+  (#set! injection.language "javascript")
+  (#set! injection.combined))
+
+(schema_statement
+  (json_content) @injection.content
+  (#set! injection.language "json")
+  (#set! injection.combined))
+
+(style_statement
+  (style_content) @injection.content
+  (#set! injection.language "css")
+  (#set! injection.combined))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))

From c65413f2ac20d1d4b91fe4eb32d9d25525b34b83 Mon Sep 17 00:00:00 2001
From: vsajko <vsajko@gmail.com>
Date: Sat, 30 Mar 2024 00:30:13 +0100
Subject: [PATCH 1331/2704] fix(python): add staticmethod to builtin decorators

---
 queries/python/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index d35f7307c..4d62aeff0 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -79,7 +79,7 @@
 
 ((decorator
   (identifier) @attribute.builtin)
-  (#any-of? @attribute.builtin "classmethod" "property"))
+  (#any-of? @attribute.builtin "classmethod" "property" "staticmethod"))
 
 ; Builtin functions
 ((call

From 5127a844073d56df9ee4e64ccfc17ecc294e38b5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 30 Mar 2024 06:35:04 +0000
Subject: [PATCH 1332/2704] bot(lockfile): update beancount, liquid, ocaml,
 ocaml_interface, v, vento, wing

---
 lockfile.json            | 14 +++++++-------
 queries/v/highlights.scm |  7 +++++--
 queries/v/indents.scm    |  5 ++++-
 queries/v/injections.scm |  5 ++++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4fbfd8abf..b38362eb6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
   },
   "beancount": {
-    "revision": "6c665e7cf15d76a1687959643868a78fb381458d"
+    "revision": "c25f8034c977681653a8acd541c8b4877a58f474"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -378,7 +378,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "06a18b68eaa5665c6eeef30e355878835e473d15"
+    "revision": "293369818da219d97327908aab33707b04b63fd9"
   },
   "liquidsoap": {
     "revision": "09a9e31e2af734a8974dad6ed349648f601eee8c"
@@ -459,10 +459,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "f7e63111ed1bc1908eacafe6af1ee8d01bfcf7ae"
+    "revision": "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"
   },
   "ocaml_interface": {
-    "revision": "f7e63111ed1bc1908eacafe6af1ee8d01bfcf7ae"
+    "revision": "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -756,13 +756,13 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "fdf58fdf2c4feb6d056128a58b7f4a7996fb922c"
+    "revision": "0077997267edee446315b69acac7464e5f8e52ae"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
   },
   "vento": {
-    "revision": "c1eb14b130c37267be7c6bb38ce949c3077dd4b3"
+    "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"
   },
   "verilog": {
     "revision": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"
@@ -786,7 +786,7 @@
     "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
   },
   "wing": {
-    "revision": "4e7b0d296eb259b985766fe35da60e8aaec8daa1"
+    "revision": "4c03dd8eebbbaf350a61e3c2227bc8a5d9dbdb3f"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 4e72a0514..484f7fe59 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -280,10 +280,13 @@
 (none) @variable.builtin
 
 ; Comments
-(comment) @comment @spell
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
 
 (_
-  (comment)+ @comment.documentation
+  (line_comment)+ @comment.documentation
   [
     (function_declaration)
     (type_declaration)
diff --git a/queries/v/indents.scm b/queries/v/indents.scm
index 752585127..bf090efae 100644
--- a/queries/v/indents.scm
+++ b/queries/v/indents.scm
@@ -14,4 +14,7 @@
 (parameter_list
   ")" @indent.branch)
 
-(comment) @indent.ignore
+[
+  (line_comment)
+  (block_comment)
+] @indent.ignore
diff --git a/queries/v/injections.scm b/queries/v/injections.scm
index f27ab8954..2d7618b3e 100644
--- a/queries/v/injections.scm
+++ b/queries/v/injections.scm
@@ -1,4 +1,7 @@
-((comment) @injection.content
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
   (#set! injection.language "comment"))
 
 ; asm_statement if asm ever highlighted :)

From 6e0b031ebb212e7082bc3007f8b9614cb393465c Mon Sep 17 00:00:00 2001
From: Oliver Thomas <thomaso@ie-freiburg.mpg.de>
Date: Sat, 30 Mar 2024 12:11:51 +0100
Subject: [PATCH 1333/2704] feat(snakemake): add indentation queries

---
 queries/snakemake/indents.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 queries/snakemake/indents.scm

diff --git a/queries/snakemake/indents.scm b/queries/snakemake/indents.scm
new file mode 100644
index 000000000..a4648eff4
--- /dev/null
+++ b/queries/snakemake/indents.scm
@@ -0,0 +1,16 @@
+; inherits: python
+
+((rule_definition) @indent.begin
+  (#set! indent.immediate 1))
+
+((checkpoint_definition) @indent.begin
+  (#set! indent.immediate 1))
+
+((rule_inheritance) @indent.begin
+  (#set! indent.immediate 1))
+
+((module_definition) @indent.begin
+  (#set! indent.immediate 1))
+
+((directive) @indent.begin
+  (#set! indent.immediate 1))

From ff797254282b56d98849f6fa1082f3b2f99ebe43 Mon Sep 17 00:00:00 2001
From: Seb Tomasini <sebt@qgates.com>
Date: Sun, 31 Mar 2024 10:37:53 +0100
Subject: [PATCH 1334/2704] fix(uninstall): use correct path separator on
 windows (#6369)

---
 lua/nvim-treesitter/install.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 0a7a9ae3d..1f2bd7b16 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -526,6 +526,7 @@ local function install(options)
     if err then
       return api.nvim_err_writeln(err)
     end
+    install_folder = install_folder and clean_path(install_folder)
     assert(install_folder)
 
     local languages ---@type string[]
@@ -621,6 +622,7 @@ function M.uninstall(...)
       if err then
         return api.nvim_err_writeln(err)
       end
+      install_dir = install_dir and clean_path(install_dir)
 
       if vim.tbl_contains(ensure_installed_parsers, lang) then
         vim.notify(

From 1d1d92e94aea9ac0273015341438b63d2db528a5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 31 Mar 2024 06:35:04 +0000
Subject: [PATCH 1335/2704] bot(lockfile): update djot, snakemake, v

---
 lockfile.json               | 6 +++---
 queries/djot/highlights.scm | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b38362eb6..0bd368304 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "b8ff9a0a07c1d53bae27875958b6be14f7593736"
+    "revision": "63f176e7db5fca073b55b98b7e5e95afd1587fcb"
   },
   "dockerfile": {
     "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
@@ -627,7 +627,7 @@
     "revision": "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"
   },
   "snakemake": {
-    "revision": "65a6c3b4671877821082164da0a310851b211953"
+    "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
     "revision": "b239a95f94cfcc6e7b3e961bc73a28d55e214f02"
@@ -756,7 +756,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "0077997267edee446315b69acac7464e5f8e52ae"
+    "revision": "bb6ca96b1b205fd2f2504fb7d0e19cf0e4888cd6"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
diff --git a/queries/djot/highlights.scm b/queries/djot/highlights.scm
index 0ec1ca5f9..42e7a0ceb 100644
--- a/queries/djot/highlights.scm
+++ b/queries/djot/highlights.scm
@@ -94,7 +94,7 @@
   (ellipsis)
   (en_dash)
   (em_dash)
-  (straight_quote)
+  (quotation_marks)
 ] @string.special
 
 (frontmatter_marker) @punctuation.delimiter

From 905fedfa28d294ebe4f696282b9b3710cf543086 Mon Sep 17 00:00:00 2001
From: nat-418 <93013864+nat-418@users.noreply.github.com>
Date: Sun, 31 Mar 2024 19:43:49 +0200
Subject: [PATCH 1336/2704] feat(roc): add new parser tree-sitter-roc

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/roc/highlights.scm      | 189 ++++++++++++++++++++++++++++++++
 queries/roc/injections.scm      |   5 +
 queries/roc/locals.scm          |  40 +++++++
 6 files changed, 246 insertions(+)
 create mode 100644 queries/roc/highlights.scm
 create mode 100644 queries/roc/injections.scm
 create mode 100644 queries/roc/locals.scm

diff --git a/README.md b/README.md
index 678b436c3..cd86e7612 100644
--- a/README.md
+++ b/README.md
@@ -370,6 +370,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
 - [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
+- [x] [roc](https://github.com/nat-418/tree-sitter-roc) (maintained by @nat-418)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
diff --git a/lockfile.json b/lockfile.json
index 0bd368304..58ec40a1b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -590,6 +590,9 @@
   "robot": {
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
+  "roc": {
+    "revision": "14c66eeceb7db2d5c98616036d861863b273bab8"
+  },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 70379f1dd..e136ead56 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1730,6 +1730,14 @@ list.robot = {
   maintainers = { "@Hubro" },
 }
 
+list.roc = {
+  install_info = {
+    url = "https://github.com/nat-418/tree-sitter-roc",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@nat-418" },
+}
+
 list.ron = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-ron",
diff --git a/queries/roc/highlights.scm b/queries/roc/highlights.scm
new file mode 100644
index 000000000..d47c8770e
--- /dev/null
+++ b/queries/roc/highlights.scm
@@ -0,0 +1,189 @@
+;---Most generic types---
+(module) @module
+
+(identifier) @variable
+
+(concrete_type) @type
+
+;---annotations----
+(annotation_type_def
+  (annotation_pre_colon
+    (identifier) @type))
+
+(annotation_type_def
+  (annotation_pre_colon
+    (identifier) @function)
+  (function_type))
+
+;----decleration types----
+(value_declaration
+  (decl_left
+    (identifier_pattern
+      (identifier) @variable.parameter)))
+
+;---records----
+(field_name) @variable.member
+
+(record_field_pattern
+  (_
+    (identifier) @variable))
+
+;matches the second identifier and all subsequent ones
+(field_access_expr
+  (identifier) @variable.member)
+
+;----comments----
+(line_comment) @comment @spell
+
+(doc_comment) @comment.documentation @spell
+
+;-----Punctuation----
+[
+  "?"
+  (arrow)
+  (back_arrow)
+  (backslash)
+  ","
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  "|"
+  "&"
+  (operator)
+] @operator
+
+(wildcard_pattern) @constant.builtin
+
+[
+  "if"
+  "then"
+  "else"
+] @keyword.conditional
+
+[
+  (implements)
+  (when)
+  (is)
+  "as"
+  (to)
+] @keyword
+
+;----headers-----
+(interface_header
+  (name) @type.definition)
+
+(imports
+  (imports_entry
+    (module) @module))
+
+(packages
+  (record_pattern
+    (record_field_pattern
+      (field_name) @module)))
+
+(app_name) @string.special
+
+(import_path) @string.special.path
+
+[
+  "app"
+  "packages"
+  "provides"
+  "interface"
+  "exposes"
+  "expect"
+] @keyword
+
+[
+  (import_as)
+  "imports"
+] @keyword.import
+
+(backpassing_expr
+  assignee: (identifier_pattern
+    (identifier) @variable.parameter))
+
+(value_declaration
+  (decl_left
+    (identifier_pattern
+      (identifier) @function))
+  (expr_body
+    (anon_fun_expr)))
+
+;----tags----
+(tags_type
+  (apply_type
+    (concrete_type) @constructor))
+
+[
+  (tag)
+  (opaque_tag)
+] @constructor
+
+;-----builtins----
+(variable_expr
+  (module) @module
+  (identifier) @boolean
+  (#any-of? @boolean "true" "false")
+  (#eq? @module "Bool"))
+
+"dbg" @keyword.debug
+
+;----function invocations ----
+(function_call_expr
+  caller: (variable_expr
+    (identifier) @function.call))
+
+(function_call_expr
+  caller: (field_access_expr
+    (identifier) @function.call .))
+
+(bin_op_expr
+  (operator
+    "|>") @operator
+  (variable_expr
+    (identifier) @function))
+
+;----function arguments----
+(argument_patterns
+  (identifier_pattern
+    (identifier) @variable.parameter))
+
+(argument_patterns
+  (_
+    (identifier_pattern
+      (identifier) @variable.parameter)))
+
+(argument_patterns
+  (_
+    (_
+      (identifier_pattern
+        (identifier) @variable.parameter))))
+
+;-----consts-----
+[
+  (int)
+  (uint)
+  (iint)
+  (xint)
+  (natural)
+] @number
+
+[
+  (decimal)
+  (float)
+] @number.float
+
+(string) @string
+
+(char) @character
diff --git a/queries/roc/injections.scm b/queries/roc/injections.scm
new file mode 100644
index 000000000..326478351
--- /dev/null
+++ b/queries/roc/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (doc_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/roc/locals.scm b/queries/roc/locals.scm
new file mode 100644
index 000000000..71bb19407
--- /dev/null
+++ b/queries/roc/locals.scm
@@ -0,0 +1,40 @@
+(expr_body) @local.scope
+
+(argument_patterns
+  (identifier_pattern
+    (identifier) @local.definition))
+
+; (argument_patterns(long_identifier)@local.definition)
+(exposes_list
+  (ident) @local.reference)
+
+(opaque_type_def
+  (apply_type
+    (concrete_type) @local.definition.type))
+
+(alias_type_def
+  (apply_type
+    (concrete_type) @local.definition.type))
+
+(value_declaration
+  (decl_left
+    (identifier_pattern
+      (identifier) @local.definition.function))
+  (expr_body
+    (anon_fun_expr)))
+
+(value_declaration
+  (decl_left
+    (identifier_pattern
+      (identifier) @local.definition.var)))
+
+(identifier_pattern
+  (identifier) @local.definition)
+
+(exposes
+  (ident) @local.reference)
+
+(identifier) @local.reference
+
+(tag_expr
+  (tag)) @local.reference

From ee2785ba6a40ab5416a26e1b3a8fcd2a1a27d613 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 06:35:59 +0000
Subject: [PATCH 1337/2704] bot(lockfile): update gdscript, rst, swift, v

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 58ec40a1b..e1adeb0af 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -195,7 +195,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gdscript": {
-    "revision": "b5dea4d852db65f0872d849c24533eb121e03c76"
+    "revision": "1f1e782fe2600f50ae57b53876505b8282388d77"
   },
   "gdshader": {
     "revision": "ffd9f958df13cae04593781d7d2562295a872455"
@@ -597,7 +597,7 @@
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
   "rst": {
-    "revision": "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"
+    "revision": "c6f7444fd77271862730af49e757c60405fba991"
   },
   "ruby": {
     "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
@@ -675,7 +675,7 @@
     "revision": "6909efa7179cd655f9b48123357d65ce8fc661fd"
   },
   "swift": {
-    "revision": "bb3fe96bb65d9b71e2d04b7ebe27dc1947f2cd5d"
+    "revision": "67ea4e9ea7302b731d392cd8b1aad7b8e79a5547"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "bb6ca96b1b205fd2f2504fb7d0e19cf0e4888cd6"
+    "revision": "cae4a2c641a0668fba36df5410ffaa25864ba2e7"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 3c996dc9fa5aba9896dd6e7bb7a3171e747b88ec Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 30 Mar 2024 19:30:07 -0700
Subject: [PATCH 1338/2704] feat(nix): misc. operator/punctuation highlights

---
 queries/nix/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 9f00167c4..9ec484d1c 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -55,6 +55,7 @@
 [
   "."
   ";"
+  ":"
   ","
 ] @punctuation.delimiter
 
@@ -187,6 +188,12 @@
 (binary_expression
   operator: _ @operator)
 
+[
+  "="
+  "@"
+  "?"
+] @operator
+
 ; integers, also highlight a unary -
 [
   (unary_expression

From 0bfa0be5e4c8f4e70dad81bea1ce0cda2d76ca24 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 30 Mar 2024 19:35:32 -0700
Subject: [PATCH 1339/2704] fix(nix): highlight ellipsis as builtin parameter

This maintains consistency with a lot of other languages that also have
ellipses as parameter types, which we typically highlight as
`@variable.parameter.builtin`
---
 queries/nix/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 9ec484d1c..33cdaf409 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -75,7 +75,7 @@
   "?"? @operator)
 
 ; `...` in `{ ... }`, used to ignore unknown named function arguments (see above)
-(ellipses) @punctuation.special
+(ellipses) @variable.parameter.builtin
 
 ; universal is the parameter of the function expression
 ; `:` in `x: y`, used to separate function argument from body (see above)

From 25ed904c7522b34ea2d1d01e598067b6fd4d037e Mon Sep 17 00:00:00 2001
From: Jonas Hietala <mail@jonashietala.se>
Date: Mon, 1 Apr 2024 13:42:12 +0200
Subject: [PATCH 1340/2704] feat(djot): update queries (#6375)

- Adjust some highlights to fit context better
- Conceal inline content
- Add locals
- Add folds
---
 queries/djot/folds.scm      |   7 ++
 queries/djot/highlights.scm | 228 +++++++++++++++++++++++++++---------
 queries/djot/indents.scm    |  10 ++
 queries/djot/locals.scm     |  17 +++
 4 files changed, 208 insertions(+), 54 deletions(-)
 create mode 100644 queries/djot/folds.scm
 create mode 100644 queries/djot/indents.scm
 create mode 100644 queries/djot/locals.scm

diff --git a/queries/djot/folds.scm b/queries/djot/folds.scm
new file mode 100644
index 000000000..94f3724eb
--- /dev/null
+++ b/queries/djot/folds.scm
@@ -0,0 +1,7 @@
+[
+  (section)
+  (code_block)
+  (raw_block)
+  (list)
+  (div)
+] @fold
diff --git a/queries/djot/highlights.scm b/queries/djot/highlights.scm
index 42e7a0ceb..e788891e0 100644
--- a/queries/djot/highlights.scm
+++ b/queries/djot/highlights.scm
@@ -21,7 +21,7 @@
   (code_block)
   (raw_block)
   (frontmatter)
-] @markup.raw
+] @markup.raw.block
   (#set! "priority" 90))
 
 ; Remove @markup.raw for code with a language spec
@@ -29,7 +29,8 @@
   .
   (code_block_marker_begin)
   (language)
-  (code) @none)
+  (code) @none
+  (#set! "priority" 90))
 
 [
   (code_block_marker_begin)
@@ -38,7 +39,11 @@
   (raw_block_marker_end)
 ] @punctuation.delimiter
 
-(language) @label
+(language) @attribute
+
+(inline_attribute
+  _ @conceal
+  (#set! conceal ""))
 
 ((language_marker) @punctuation.delimiter
   (#set! conceal ""))
@@ -60,7 +65,7 @@
 (table_caption
   (marker) @punctuation.special)
 
-(table_caption) @markup.heading
+(table_caption) @markup.italic
 
 [
   (list_marker_dash)
@@ -85,10 +90,14 @@
 ] @markup.list
 
 (list_marker_task
-  (unchecked) @constant.builtin) @markup.list.unchecked
+  (unchecked)) @markup.list.unchecked
 
 (list_marker_task
-  (checked) @constant.builtin) @markup.list.checked
+  (checked)) @markup.list.checked
+
+; Colorize `x` in `[x]`
+((checked) @constant.builtin
+  (#offset! @constant.builtin 0 1 0 -1))
 
 [
   (ellipsis)
@@ -97,94 +106,137 @@
   (quotation_marks)
 ] @string.special
 
+(list_item
+  (term) @type.definition)
+
+; Conceal { and } but leave " and '
+((quotation_marks) @string.special
+  (#any-of? @string.special "\"}" "'}")
+  (#offset! @string.special 0 1 0 0)
+  (#set! conceal ""))
+
+((quotation_marks) @string.special
+  (#any-of? @string.special "\\\"" "\\'" "{'" "{\"")
+  (#offset! @string.special 0 0 0 -1)
+  (#set! conceal ""))
+
+[
+  (hard_line_break)
+  (backslash_escape)
+] @string.escape
+
+; Only conceal \ but leave escaped character.
+((backslash_escape) @string.escape
+  (#offset! @string.escape 0 0 0 -1)
+  (#set! conceal ""))
+
 (frontmatter_marker) @punctuation.delimiter
 
 (emphasis) @markup.italic
 
 (strong) @markup.strong
 
-(emphasis
-  (emphasis_begin) @punctuation.delimiter)
+(symbol) @string.special.symbol
 
-(emphasis
-  (emphasis_end) @punctuation.delimiter)
+(insert) @markup.underline
 
-(strong
-  (strong_begin) @punctuation.delimiter)
+(delete) @markup.strikethrough
 
-(strong
-  (strong_end) @punctuation.delimiter)
+[
+  (highlighted)
+  (superscript)
+  (subscript)
+] @string.special
 
+; We need to target tokens specifically because `{=` etc can exist as fallback symbols in
+; regular text, which we don't want to highlight or conceal.
 (highlighted
   [
     "{="
     "=}"
-  ] @punctuation.delimiter)
+  ] @punctuation.delimiter
+  (#set! conceal ""))
 
 (insert
   [
     "{+"
     "+}"
-  ] @punctuation.delimiter)
+  ] @punctuation.delimiter
+  (#set! conceal ""))
 
 (delete
   [
     "{-"
     "-}"
-  ] @punctuation.delimiter)
+  ] @punctuation.delimiter
+  (#set! conceal ""))
 
 (superscript
   [
     "^"
     "{^"
     "^}"
-  ] @punctuation.delimiter)
+  ] @punctuation.delimiter
+  (#set! conceal ""))
 
 (subscript
   [
     "~"
     "{~"
     "~}"
-  ] @punctuation.delimiter)
+  ] @punctuation.delimiter
+  (#set! conceal ""))
 
-(verbatim) @markup.raw
-
-[
+([
+  (emphasis_begin)
+  (emphasis_end)
+  (strong_begin)
+  (strong_end)
   (verbatim_marker_begin)
   (verbatim_marker_end)
-] @punctuation.delimiter
-
-(math) @markup.math
-
-[
   (math_marker)
   (math_marker_begin)
   (math_marker_end)
-] @punctuation.delimiter
-
-(raw_inline) @markup.raw
-
-[
   (raw_inline_attribute)
   (raw_inline_marker_begin)
   (raw_inline_marker_end)
 ] @punctuation.delimiter
+  (#set! conceal ""))
+
+((math) @markup.math
+  (#set! "priority" 90))
+
+(verbatim) @markup.raw
+
+((raw_inline) @markup.raw
+  (#set! "priority" 90))
+
+(comment
+  "%" @comment
+  (#set! conceal ""))
+
+(span
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
+
+(inline_attribute
+  [
+    "{"
+    "}"
+  ] @punctuation.bracket)
+
+(block_attribute
+  [
+    "{"
+    "}"
+  ] @punctuation.bracket)
 
 [
-  "{"
-  "}"
-  "!["
-  "["
-  "]"
-  "("
-  ")"
-  "<"
-  ">"
-] @punctuation.bracket
-
-(comment) @comment
-
-(class) @type
+  (class)
+  (class_name)
+] @type
 
 (identifier) @tag
 
@@ -197,10 +249,23 @@
 (key_value
   (value) @string)
 
-[
-  (backslash_escape)
-  (hard_line_break)
-] @string.escape
+(link_text
+  [
+    "["
+    "]"
+  ] @punctuation.bracket
+  (#set! conceal ""))
+
+(autolink
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket
+  (#set! conceal ""))
+
+(inline_link
+  (inline_link_destination) @markup.link.url
+  (#set! conceal ""))
 
 (link_reference_definition
   ":" @punctuation.special)
@@ -209,7 +274,19 @@
   (link_text) @markup.link)
 
 (full_reference_link
-  (link_label) @markup.link.label)
+  (link_label) @markup.link.label
+  (#set! conceal ""))
+
+(collapsed_reference_link
+  "[]" @punctuation.bracket
+  (#set! conceal ""))
+
+(full_reference_link
+  [
+    "["
+    "]"
+  ] @punctuation.bracket
+  (#set! conceal ""))
 
 (collapsed_reference_link
   (link_text) @markup.link)
@@ -223,11 +300,48 @@
 (full_reference_image
   (link_label) @markup.link.label)
 
-(image_description) @markup.link.label
+(full_reference_image
+  [
+    "!["
+    "["
+    "]"
+  ] @punctuation.bracket)
+
+(collapsed_reference_image
+  [
+    "!["
+    "]"
+  ] @punctuation.bracket)
+
+(inline_image
+  [
+    "!["
+    "]"
+  ] @punctuation.bracket)
+
+(image_description) @markup.italic
+
+(image_description
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
+
+(link_reference_definition
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
 
 (link_reference_definition
   (link_label) @markup.link.label)
 
+(inline_link_destination
+  [
+    "("
+    ")"
+  ] @punctuation.bracket)
+
 [
   (autolink)
   (inline_link_destination)
@@ -236,16 +350,22 @@
 ] @markup.link.url
 
 (footnote
-  (reference_label) @markup.link)
+  (reference_label) @markup.link.label)
 
 (footnote_reference
-  (reference_label) @markup.link)
+  (reference_label) @markup.link.label)
 
 [
   (footnote_marker_begin)
   (footnote_marker_end)
 ] @punctuation.bracket
 
+(todo) @comment.todo
+
+(note) @comment.note
+
+(fixme) @comment.error
+
 [
   (paragraph)
   (comment)
diff --git a/queries/djot/indents.scm b/queries/djot/indents.scm
new file mode 100644
index 000000000..3b1a56ebd
--- /dev/null
+++ b/queries/djot/indents.scm
@@ -0,0 +1,10 @@
+; The intention here is to rely on Neovims `autoindent` setting.
+; This allows us to not indent after just a single list item
+; so we can create narrow lists quickly, but indent blocks inside list items
+; to the previous paragraph.
+(list_item_content) @indent.auto
+
+(footnote_content) @indent.align
+
+((table_caption) @indent.begin
+  (#set! indent.immediate 1))
diff --git a/queries/djot/locals.scm b/queries/djot/locals.scm
new file mode 100644
index 000000000..1ac27529f
--- /dev/null
+++ b/queries/djot/locals.scm
@@ -0,0 +1,17 @@
+(link_reference_definition
+  (link_label) @local.definition)
+
+(footnote
+  (reference_label) @local.definition)
+
+(collapsed_reference_link
+  (link_text) @local.reference)
+
+(full_reference_link
+  (link_label) @local.reference)
+
+(full_reference_image
+  (link_label) @local.reference)
+
+(footnote_reference
+  (reference_label) @local.reference)

From e4ba167af0abdb520fa930ddb8a2bbe827d92b46 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 1 Apr 2024 14:40:35 +0200
Subject: [PATCH 1341/2704] fix(latex)!: adjust to dropped parser.c

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index e1adeb0af..081506c3f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -366,7 +366,7 @@
     "revision": "123d8b472e949b59f348c32e245107a34a3d8945"
   },
   "latex": {
-    "revision": "6d764f17f4d28c9db736009fb0e10ffe04866661"
+    "revision": "a834712c5e04029a451a262456bf6290b8ef6f37"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e136ead56..a0a77e420 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1093,6 +1093,7 @@ list.latex = {
   install_info = {
     url = "https://github.com/latex-lsp/tree-sitter-latex",
     files = { "src/parser.c", "src/scanner.c" },
+    requires_generate_from_grammar = true,
   },
   filetype = "tex",
   maintainers = { "@theHamsta", "@clason" },

From c51d50386867c2e04f3b420439985aac985dd8d4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 1 Apr 2024 15:06:16 +0200
Subject: [PATCH 1342/2704] docs(readme): update roadmap link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd86e7612..80a1081b6 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ More examples can be found in [our gallery](https://github.com/nvim-treesitter/n
 **Warning: Treesitter and nvim-treesitter highlighting are an experimental feature of Neovim.
 Please consider the experience with this plug-in as experimental until Tree-Sitter support in Neovim is stable!
 We recommend using the nightly builds of Neovim if possible.
-You can find the current roadmap [here](https://github.com/nvim-treesitter/nvim-treesitter/projects/1).
+You can find the current roadmap [here](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767).
 The roadmap and all features of this plugin are open to change, and any suggestion will be highly appreciated!**
 
 Nvim-treesitter is based on three interlocking features: [**language parsers**](#language-parsers), [**queries**](#adding-queries), and [**modules**](#available-modules), where _modules_ provide features – e.g., highlighting – based on _queries_ for syntax objects extracted from a given buffer by _language parsers_.

From 30492e7e1c9e5af3642e8a74c2f88dc1f50ec305 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:22:25 +0000
Subject: [PATCH 1343/2704] bot(lockfile): update cuda, hlsl, latex, roc

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 081506c3f..d5ee66dc7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "221179d4287a2c24c08e4c67ff383ef67dc32156"
+    "revision": "a18550206a205a0b056437652cf4802f377c4a92"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -285,7 +285,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "ee24be127560f0de0c4741e382416f45ab47eb76"
+    "revision": "2c2732db3ac55028af9456f89ab12683e02822bf"
   },
   "hlsplaylist": {
     "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
@@ -366,7 +366,7 @@
     "revision": "123d8b472e949b59f348c32e245107a34a3d8945"
   },
   "latex": {
-    "revision": "a834712c5e04029a451a262456bf6290b8ef6f37"
+    "revision": "eb552c7022cbd1379138bdc1b2fe464a99d25640"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -591,7 +591,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "14c66eeceb7db2d5c98616036d861863b273bab8"
+    "revision": "f2547612cc1cc93450dd4d27da6160b1fab87c80"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"

From d31eb5442deb4940a98b5573b78eb822b74fbcea Mon Sep 17 00:00:00 2001
From: Mitchell Hanberg <mitch@mitchellhanberg.com>
Date: Fri, 29 Mar 2024 16:54:44 -0400
Subject: [PATCH 1344/2704] feat(elixir): add stab_clause to folds

---
 queries/elixir/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/elixir/folds.scm b/queries/elixir/folds.scm
index b99a6d9e0..7abfe6797 100644
--- a/queries/elixir/folds.scm
+++ b/queries/elixir/folds.scm
@@ -1,5 +1,6 @@
 [
   (anonymous_function)
+  (stab_clause)
   (arguments)
   (block)
   (do_block)

From 54cf9180a36299265e217858e6e531245074c3f4 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 06:38:00 +0000
Subject: [PATCH 1345/2704] bot(lockfile): update commonlisp, dart, glsl,
 godot_resource, roc, slang, v, wgsl_bevy, wing

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d5ee66dc7..bdac85250 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
   },
   "commonlisp": {
-    "revision": "cf10fc38bc24faf0549d59217ff37c789973dfdc"
+    "revision": "a2a67494c223ccf8aa419ac419d9cdf483dbb8ca"
   },
   "cooklang": {
     "revision": "81c2a8667846b1e60db68b5601d864fe00fd1d3a"
@@ -102,7 +102,7 @@
     "revision": "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"
   },
   "dart": {
-    "revision": "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"
+    "revision": "7861a4889e7682af453afa4811ae85b1d7a6e415"
   },
   "devicetree": {
     "revision": "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"
@@ -222,7 +222,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "284bed0e2f1d9f700756b96512baf33483642ff0"
+    "revision": "339fe659aed7618b822d27120c1ec5b5cd83c61c"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -234,7 +234,7 @@
     "revision": "fd577c4358c28cbcb6748bbf65354cc85f1cf7a4"
   },
   "godot_resource": {
-    "revision": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"
+    "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
   },
   "gomod": {
     "revision": "bbe2fe3be4b87e06a613e685250f473d2267f430"
@@ -591,7 +591,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "f2547612cc1cc93450dd4d27da6160b1fab87c80"
+    "revision": "649c3b68eb863f350f0aafeb68f4a8ca4f13081a"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
@@ -618,7 +618,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "0cdfb1741323f38e9a33798674145c22cfc0092b"
+    "revision": "6015bdc81e5e447a2bb8b342da27048a031b2713"
   },
   "slint": {
     "revision": "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "cae4a2c641a0668fba36df5410ffaa25864ba2e7"
+    "revision": "95869fa2058fbc9098f640b87399971c6d7552c0"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -786,10 +786,10 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "cbd58ee33e24f46d16b9882b001eefb25a958ee2"
+    "revision": "4d7b4697dd2598c60a6ccbc51db8b768cd8700b8"
   },
   "wing": {
-    "revision": "4c03dd8eebbbaf350a61e3c2227bc8a5d9dbdb3f"
+    "revision": "5151f4a33d81ff68f94ff451a3404c581705eb96"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From be4d6e858fe7543dcafa085118ebb7759246ed7c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 06:36:19 +0000
Subject: [PATCH 1346/2704] bot(lockfile): update cuda, dtd, fish, glsl, hlsl,
 markdown, markdown_inline, slang, solidity, templ, tlaplus, wing, xml, yaml

---
 lockfile.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bdac85250..c5137043c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "a18550206a205a0b056437652cf4802f377c4a92"
+    "revision": "4ec5afdf98041d137c25b555958a1f825c7c1272"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -129,7 +129,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "24b662eb61e369757d13c4b5f0624284dc3fe7e8"
+    "revision": "2282ad5cb8e815523e70d5c82404620bd9a1494c"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -174,7 +174,7 @@
     "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
   },
   "fish": {
-    "revision": "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"
+    "revision": "a78aef9abc395c600c38a037ac779afc7e3cc9e0"
   },
   "foam": {
     "revision": "04664b40c0dadb7ef37028acf3422c63271d377b"
@@ -222,7 +222,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "339fe659aed7618b822d27120c1ec5b5cd83c61c"
+    "revision": "f7040966a97c6c5a644a230df7fe74623f963d2f"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -285,7 +285,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "2c2732db3ac55028af9456f89ab12683e02822bf"
+    "revision": "ef428a36b2faa20450ee979a618f802228b38318"
   },
   "hlsplaylist": {
     "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
@@ -405,10 +405,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "44017499c51cb6431635ed51d5080e1fd05c2c21"
+    "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "markdown_inline": {
-    "revision": "44017499c51cb6431635ed51d5080e1fd05c2c21"
+    "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "matlab": {
     "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
@@ -618,7 +618,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "6015bdc81e5e447a2bb8b342da27048a031b2713"
+    "revision": "13fdd899bfa62527cc39887abd74ec24cd626dec"
   },
   "slint": {
     "revision": "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"
@@ -633,7 +633,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "b239a95f94cfcc6e7b3e961bc73a28d55e214f02"
+    "revision": "a8ed2f5d600fed77f8ed3084d1479998c649bca1"
   },
   "soql": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -696,7 +696,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "592faa3186ef857c92e4bd1c31d73c07a4a334db"
+    "revision": "db662414ccd6f7c78b1e834e7abe11c224b04759"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -711,7 +711,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "496322c1f78647ae0cc1ec96e7b2523656d34846"
+    "revision": "439dad01355e4db335fe9cd12eb177b4f2563dd6"
   },
   "tmux": {
     "revision": "7499587642a46ee156e1bb58851904ac750dcc7c"
@@ -789,16 +789,16 @@
     "revision": "4d7b4697dd2598c60a6ccbc51db8b768cd8700b8"
   },
   "wing": {
-    "revision": "5151f4a33d81ff68f94ff451a3404c581705eb96"
+    "revision": "0cdff2bc50e3664049905e952746cadf4ac62f15"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "24b662eb61e369757d13c4b5f0624284dc3fe7e8"
+    "revision": "2282ad5cb8e815523e70d5c82404620bd9a1494c"
   },
   "yaml": {
-    "revision": "10c6c7a69dde767ad229e1510e0c1c7aacd8c83a"
+    "revision": "c9ee63b15c92656a89f7007f38a98f21c3eca81d"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From cc0e29727a9651e27869b7444e835c44fb1e7b4c Mon Sep 17 00:00:00 2001
From: Stephan Seitz <sseitz@nvidia.com>
Date: Tue, 2 Apr 2024 22:53:27 +0200
Subject: [PATCH 1347/2704] highlights(cuda): add support for `__managed__`

See https://github.com/tree-sitter-grammars/tree-sitter-cuda/pull/68
---
 queries/cuda/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
index 8b81ce870..6605c5a72 100644
--- a/queries/cuda/highlights.scm
+++ b/queries/cuda/highlights.scm
@@ -9,6 +9,7 @@
   "__host__"
   "__device__"
   "__global__"
+  "__managed__"
   "__forceinline__"
   "__noinline__"
 ] @keyword.modifier

From bf80e253a8f6145c5705ad0563c5254fb99cacc5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 06:35:53 +0000
Subject: [PATCH 1348/2704] bot(lockfile): update angular, gitcommit, nix, roc,
 rst, templ, tlaplus, v, wing

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c5137043c..e75d732b4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "62179d7bbfb5fd8a8f7298495ac654d252a1bd52"
+    "revision": "b7a7167762e3863b3d6247c708b7f9bca1ca7bea"
   },
   "apex": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
@@ -210,7 +210,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "a427a79653b6829aa5b663b5b9a6b39e954858b7"
+    "revision": "edd817e0532f179b7f7f371dc180629070945f0c"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -444,7 +444,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "763168fa916a333a459434f1424b5d30645f015d"
+    "revision": "b3cda619248e7dd0f216088bd152f59ce0bbe488"
   },
   "norg": {
     "revision": "9766442985fd546e2d33f8d1c7e7619ed07860cf"
@@ -591,13 +591,13 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "649c3b68eb863f350f0aafeb68f4a8ca4f13081a"
+    "revision": "65ec48bf818967ce71680da2afc6db9fa3a03937"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
   },
   "rst": {
-    "revision": "c6f7444fd77271862730af49e757c60405fba991"
+    "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
     "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
@@ -696,7 +696,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "db662414ccd6f7c78b1e834e7abe11c224b04759"
+    "revision": "044ad200092170727650fa6d368df66a8da98f9d"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -711,7 +711,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "439dad01355e4db335fe9cd12eb177b4f2563dd6"
+    "revision": "c10ad7e82aa4d77fcb5c4aaec193c9f2dfd3afcb"
   },
   "tmux": {
     "revision": "7499587642a46ee156e1bb58851904ac750dcc7c"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "95869fa2058fbc9098f640b87399971c6d7552c0"
+    "revision": "12f5f6a073f9c48fd8733f3102fe4162dcf1c514"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -789,7 +789,7 @@
     "revision": "4d7b4697dd2598c60a6ccbc51db8b768cd8700b8"
   },
   "wing": {
-    "revision": "0cdff2bc50e3664049905e952746cadf4ac62f15"
+    "revision": "8a88d30ea4f4ace694c18b0c54a8c38e5fa8351c"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 4d4b63692f78dff0f4a798e21534fd3cbcbd4851 Mon Sep 17 00:00:00 2001
From: ganhaque <ganhaquegnq@gmail.com>
Date: Wed, 3 Apr 2024 18:48:19 -0500
Subject: [PATCH 1349/2704] fix(rust): indentation in tuple type patterns

---
 queries/rust/indents.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index 3fa7e7731..d04784565 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -8,6 +8,7 @@
   (struct_pattern)
   (tuple_struct_pattern)
   (tuple_expression)
+  (tuple_type)
   (match_block)
   (call_expression)
   (assignment_expression)
@@ -85,6 +86,9 @@
 (tuple_struct_pattern
   ")" @indent.end)
 
+(tuple_type
+  ")" @indent.end)
+
 (trait_item
   body: (declaration_list
     "}" @indent.end))

From 5489e2150f95365757e26314a4ae441b7cbda52d Mon Sep 17 00:00:00 2001
From: ganhaque <ganhaquegnq@gmail.com>
Date: Wed, 3 Apr 2024 19:40:50 -0500
Subject: [PATCH 1350/2704] fix(rust): indentation in multi-line for expression

Fix indentation when the for loop expression is on multiple lines

Example:

previous:

```rust
for (
    abc,
    def
) in thing.iter() {
        // ...
    }
```
new:

```rust
for (
    abc,
    def
) in thing.iter() {
    // ...
}
```
---
 queries/rust/indents.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index d04784565..283d9ae89 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -3,7 +3,6 @@
   (struct_item)
   (enum_item)
   (impl_item)
-  (for_expression)
   (struct_expression)
   (struct_pattern)
   (tuple_struct_pattern)

From 8f444c9fcb7f9610184a34b44e922fa30989c96f Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Wed, 3 Apr 2024 19:30:34 +0100
Subject: [PATCH 1351/2704] chore: update downstream fish highlights

---
 queries/fish/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index e8ba18efe..987982d80 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -4,6 +4,8 @@
   "&&"
   "||"
   "|"
+  "&|"
+  "2>|"
   "&"
   ".."
   "!"

From 1b050206e490a4146cdf25c7b38969c1711b5620 Mon Sep 17 00:00:00 2001
From: ganhaque <ganhaquegnq@gmail.com>
Date: Thu, 4 Apr 2024 10:12:31 -0500
Subject: [PATCH 1352/2704] fix(rust): indentation in multi-line tuple pattern
 (#6402)

* fix(rust): indentation in multi-line tuple pattern

* test(indent): rust - add test for tuple pattern indent
---
 queries/rust/indents.scm   | 4 ++++
 tests/indent/rust/tuple.rs | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 tests/indent/rust/tuple.rs

diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index 283d9ae89..dfe0a3805 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -8,6 +8,7 @@
   (tuple_struct_pattern)
   (tuple_expression)
   (tuple_type)
+  (tuple_pattern)
   (match_block)
   (call_expression)
   (assignment_expression)
@@ -88,6 +89,9 @@
 (tuple_type
   ")" @indent.end)
 
+(tuple_pattern
+  ")" @indent.end)
+
 (trait_item
   body: (declaration_list
     "}" @indent.end))
diff --git a/tests/indent/rust/tuple.rs b/tests/indent/rust/tuple.rs
new file mode 100644
index 000000000..9001f77a5
--- /dev/null
+++ b/tests/indent/rust/tuple.rs
@@ -0,0 +1,8 @@
+fn foo() {
+    for (
+        a,
+        b
+    ) in c.iter() {
+        // ...
+    }
+}

From 8183bfa75e43acac73a890b7a35b95691292a4f2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 5 Apr 2024 06:37:46 +0000
Subject: [PATCH 1353/2704] bot(lockfile): update c, cpp, latex, rust, wing

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e75d732b4..cad31d143 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "72084f447c2051e01a7cd6c6e0477ec71a9297ed"
+    "revision": "ff7f769c2d7aa3f954ce4ae98311e09f6e863c9c"
   },
   "c_sharp": {
     "revision": "92c0a9431400cd8b6b6ee7503f81da3ae83fc830"
@@ -84,7 +84,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "e0c1678a78731e78655b7d953efb4daecf58be46"
+    "revision": "d0b4e006ca3c4466f834d9a4bf709bfede13d359"
   },
   "css": {
     "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
@@ -366,7 +366,7 @@
     "revision": "123d8b472e949b59f348c32e245107a34a3d8945"
   },
   "latex": {
-    "revision": "eb552c7022cbd1379138bdc1b2fe464a99d25640"
+    "revision": "ae2134af67f6c5e45587ace9ec748dd6e7b356a2"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -603,7 +603,7 @@
     "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
   },
   "rust": {
-    "revision": "3a56481f8d13b6874a28752502a58520b9139dc7"
+    "revision": "b0cd98e1c60cb55dc358c6b6781346886b980e86"
   },
   "scala": {
     "revision": "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"
@@ -789,7 +789,7 @@
     "revision": "4d7b4697dd2598c60a6ccbc51db8b768cd8700b8"
   },
   "wing": {
-    "revision": "8a88d30ea4f4ace694c18b0c54a8c38e5fa8351c"
+    "revision": "33211e61248d933f5c81d2d111931ce34eb319be"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 00debd1fb1e86fe92d479b793521173352fb5a72 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 4 Apr 2024 10:15:40 +0200
Subject: [PATCH 1354/2704] feat(lua): add `exec_lua` injection for nvim tests

---
 queries/lua/injections.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 431fc7f7d..7b46f0243 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -43,6 +43,15 @@
   (#eq? @_method "nvim_exec_lua")
   (#set! injection.language "lua"))
 
+; exec_lua [[ ... ]] in functionaltests
+((function_call
+  name: (identifier) @_function
+  arguments: (arguments
+    (string
+      content: (string_content) @injection.content)))
+  (#eq? @_function "exec_lua")
+  (#set! injection.language "lua"))
+
 ; vim.api.nvim_create_autocmd("FileType", { command = "injected here" })
 (function_call
   name: (_) @_vimcmd_identifier

From e6cd337e30962cc0982d51fa03beedcc6bc70e3d Mon Sep 17 00:00:00 2001
From: David Guevara <datwaftx@gmail.com>
Date: Fri, 5 Apr 2024 02:01:19 -0600
Subject: [PATCH 1355/2704] fix(bash): fix printf injection queries (#6405)

---
 queries/bash/injections.scm | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 169ad1358..2f385bfdc 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -14,9 +14,15 @@
   name: (command_name) @_command
   .
   argument: [
-    (string)
-    (raw_string)
-  ] @injection.content)
+    (string
+      (string_content) @injection.content)
+    (concatenation
+      (string
+        (string_content) @injection.content))
+    (raw_string) @injection.content
+    (concatenation
+      (raw_string) @injection.content)
+  ])
   (#eq? @_command "printf")
   (#set! injection.language "printf"))
 
@@ -28,9 +34,15 @@
   (_)
   .
   argument: [
-    (string)
-    (raw_string)
-  ] @injection.content)
+    (string
+      (string_content) @injection.content)
+    (concatenation
+      (string
+        (string_content) @injection.content))
+    (raw_string) @injection.content
+    (concatenation
+      (raw_string) @injection.content)
+  ])
   (#eq? @_command "printf")
   (#eq? @_arg "-v")
   (#set! injection.language "printf"))
@@ -41,9 +53,15 @@
   argument: (word) @_arg
   .
   argument: [
-    (string)
-    (raw_string)
-  ] @injection.content)
+    (string
+      (string_content) @injection.content)
+    (concatenation
+      (string
+        (string_content) @injection.content))
+    (raw_string) @injection.content
+    (concatenation
+      (raw_string) @injection.content)
+  ])
   (#eq? @_command "printf")
   (#eq? @_arg "--")
   (#set! injection.language "printf"))

From a2d6678bb21052013d0dd7cb35dffbac13846c98 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 06:35:50 +0000
Subject: [PATCH 1356/2704] bot(lockfile): update c, cuda, glsl, hlsl,
 javascript, python, rust, slang, tlaplus, typst, v, wing

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cad31d143..a575cde4b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "ff7f769c2d7aa3f954ce4ae98311e09f6e863c9c"
+    "revision": "5c3ab3a9ef85124cb0493427c1334ca85b7c2e8e"
   },
   "c_sharp": {
     "revision": "92c0a9431400cd8b6b6ee7503f81da3ae83fc830"
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "4ec5afdf98041d137c25b555958a1f825c7c1272"
+    "revision": "f6e9ef75aa332567252dd8ba097c98a3752cb35e"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -222,7 +222,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "f7040966a97c6c5a644a230df7fe74623f963d2f"
+    "revision": "2656718ba951014f3b5bd850ac36b460bac91331"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -285,7 +285,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "ef428a36b2faa20450ee979a618f802228b38318"
+    "revision": "bd414eace891a649e7ce03a9e24adbd5d0a66b51"
   },
   "hlsplaylist": {
     "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
@@ -324,7 +324,7 @@
     "revision": "2aae502017d3aed587ba85e3c7e0cbc138f3e07a"
   },
   "javascript": {
-    "revision": "de1e682289a417354df5b4437a3e4f92e0722a0f"
+    "revision": "d9b3a5841bd8f05e15db0748848ef3f5af5b5b44"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -543,7 +543,7 @@
     "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
   },
   "python": {
-    "revision": "b8a4c64121ba66b460cb878e934e3157ecbfb124"
+    "revision": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a"
   },
   "ql": {
     "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
@@ -603,7 +603,7 @@
     "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
   },
   "rust": {
-    "revision": "b0cd98e1c60cb55dc358c6b6781346886b980e86"
+    "revision": "927a1b57c12c70dc5906bcebd58ffa354c3ce62b"
   },
   "scala": {
     "revision": "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"
@@ -618,7 +618,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "13fdd899bfa62527cc39887abd74ec24cd626dec"
+    "revision": "0968d2c6e0f395dfec48232e586f7d04ddc11c83"
   },
   "slint": {
     "revision": "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"
@@ -711,7 +711,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "c10ad7e82aa4d77fcb5c4aaec193c9f2dfd3afcb"
+    "revision": "0545ebd097338f1a119c2cb61eb3600409fce715"
   },
   "tmux": {
     "revision": "7499587642a46ee156e1bb58851904ac750dcc7c"
@@ -741,7 +741,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "f457c77edffd4b93190794355ff5acf7acfb99c6"
+    "revision": "1ad9724e4e4ea5ab81192e843e74cf664eacc59b"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "12f5f6a073f9c48fd8733f3102fe4162dcf1c514"
+    "revision": "c9049436e16bd4182d4a1593e6163652f748e59b"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -789,7 +789,7 @@
     "revision": "4d7b4697dd2598c60a6ccbc51db8b768cd8700b8"
   },
   "wing": {
-    "revision": "33211e61248d933f5c81d2d111931ce34eb319be"
+    "revision": "1bfc04707486cf19476ce046960810b553659a1a"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 53c48a9229eb93a3829c06a801ca13f8ec8bcd12 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 7 Apr 2024 02:46:13 -0400
Subject: [PATCH 1357/2704] fix(rust): update queries from upstream

---
 lockfile.json               | 2 +-
 queries/rust/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a575cde4b..ceeaad1d0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -603,7 +603,7 @@
     "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
   },
   "rust": {
-    "revision": "927a1b57c12c70dc5906bcebd58ffa354c3ce62b"
+    "revision": "886e8df3c6ac02723c05fc431a61eb8c27dc118d"
   },
   "scala": {
     "revision": "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 4b83014a0..abbd2eba6 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -432,7 +432,7 @@
 (macro_invocation
   "!" @function.macro)
 
-(empty_type
+(never_type
   "!" @type.builtin)
 
 (macro_invocation

From 11a3584b81c3249d2b6279305aee1c7ad273985a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 7 Apr 2024 06:59:39 +0000
Subject: [PATCH 1358/2704] bot(lockfile): update c, commonlisp, cuda, dart,
 glsl, gstlaunch, hlsl, javascript, roc, slang, t32, v, wgsl_bevy

---
 lockfile.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ceeaad1d0..bdc6b62c6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
   },
   "c": {
-    "revision": "5c3ab3a9ef85124cb0493427c1334ca85b7c2e8e"
+    "revision": "1aafaff4d26dac5a36dd3495be33e1c20161d761"
   },
   "c_sharp": {
     "revision": "92c0a9431400cd8b6b6ee7503f81da3ae83fc830"
@@ -72,7 +72,7 @@
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
   },
   "commonlisp": {
-    "revision": "a2a67494c223ccf8aa419ac419d9cdf483dbb8ca"
+    "revision": "83ae738bed7e914cee9090c3fe4c80a32ab45905"
   },
   "cooklang": {
     "revision": "81c2a8667846b1e60db68b5601d864fe00fd1d3a"
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "f6e9ef75aa332567252dd8ba097c98a3752cb35e"
+    "revision": "6e25c94f8be4388a4fec6dadc23f3b662388ec20"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -102,7 +102,7 @@
     "revision": "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"
   },
   "dart": {
-    "revision": "7861a4889e7682af453afa4811ae85b1d7a6e415"
+    "revision": "923fbe0d3e62340ea78422551166ce946bc05222"
   },
   "devicetree": {
     "revision": "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"
@@ -222,7 +222,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "2656718ba951014f3b5bd850ac36b460bac91331"
+    "revision": "4d01f7bed6fb7abab795656db11785864e167737"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -258,7 +258,7 @@
     "revision": "b398a5a243c67f0b4d54728c983fa586bd5cd52e"
   },
   "gstlaunch": {
-    "revision": "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"
+    "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
   },
   "hack": {
     "revision": "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"
@@ -285,7 +285,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "bd414eace891a649e7ce03a9e24adbd5d0a66b51"
+    "revision": "027fa2e142db1258026cc6497b9f32bbf11f392d"
   },
   "hlsplaylist": {
     "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
@@ -324,7 +324,7 @@
     "revision": "2aae502017d3aed587ba85e3c7e0cbc138f3e07a"
   },
   "javascript": {
-    "revision": "d9b3a5841bd8f05e15db0748848ef3f5af5b5b44"
+    "revision": "ac10a11e0c8db512f70e6b798260d2516d22454c"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -591,7 +591,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "65ec48bf818967ce71680da2afc6db9fa3a03937"
+    "revision": "7df2c0892e62efb81a7504d9799d4e0d0443d241"
   },
   "ron": {
     "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
@@ -618,7 +618,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "0968d2c6e0f395dfec48232e586f7d04ddc11c83"
+    "revision": "08021fe6e55662281744de289c747197173a1170"
   },
   "slint": {
     "revision": "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"
@@ -684,7 +684,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "95caba87f00c51177b254e95be55b2dc46d2ac78"
+    "revision": "8487a14874f3e3138877655f303322d9e7222cec"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "c9049436e16bd4182d4a1593e6163652f748e59b"
+    "revision": "395d22e718b6211d05b72fe10bfb371cb7a7aff3"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -786,7 +786,7 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "4d7b4697dd2598c60a6ccbc51db8b768cd8700b8"
+    "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
     "revision": "1bfc04707486cf19476ce046960810b553659a1a"

From 46b587eb38701c02360042fce284cc8ec2653c30 Mon Sep 17 00:00:00 2001
From: neuromagus <63796667+neuromagus@users.noreply.github.com>
Date: Tue, 9 Apr 2024 00:54:47 +0300
Subject: [PATCH 1359/2704] fix(c_sharp): highlight `raw_string_literal`

---
 queries/c_sharp/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index e097907c2..e31420193 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -86,6 +86,7 @@
 
 [
   (string_literal)
+  (raw_string_literal)
   (verbatim_string_literal)
   (interpolated_string_expression)
 ] @string

From e9321bb914b3a5a88b7dff5392f0f5f8d83bee67 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 8 Apr 2024 22:20:26 -0700
Subject: [PATCH 1360/2704] feat(nix): misc cleanups + comment injection
 (#6418)

* fix(nix): highlight strings within interpolations

* feat(nix): move `derivation` to function.builtin

* fix(nix): removes all `priority` workarounds

* feat(nix): arbitrary injections using `#` comments
---
 queries/nix/highlights.scm          | 44 +++++++++++++----------------
 queries/nix/injections.scm          | 12 ++++++++
 tests/query/highlights/nix/test.nix |  5 ++++
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 33cdaf409..0a0d9ac6f 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -8,17 +8,6 @@
   "with"
 ] @keyword
 
-(variable_expression
-  name: (identifier) @keyword
-  (#eq? @keyword "derivation")
-  (#set! "priority" 101))
-
-; exceptions
-(variable_expression
-  name: (identifier) @keyword.exception
-  (#any-of? @keyword.exception "abort" "throw")
-  (#set! "priority" 101))
-
 ; if/then/else
 [
   "if"
@@ -33,11 +22,13 @@
 (comment) @comment @spell
 
 ; strings
-([
-  (string_expression)
-  (indented_string_expression)
-]
-  (#set! "priority" 99)) @string
+(string_fragment) @string
+
+(string_expression
+  "\"" @string)
+
+(indented_string_expression
+  "''" @string)
 
 ; paths and URLs
 [
@@ -111,16 +102,16 @@
 (variable_expression
   name: (identifier) @function.builtin
   (#any-of? @function.builtin
-    ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "derivation" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
+    ; nix eval --impure --expr 'with builtins; filter (x: !(elem x [ "abort" "import" "throw" ]) && isFunction builtins.${x}) (attrNames builtins)'
     "add" "addErrorContext" "all" "any" "appendContext" "attrNames" "attrValues" "baseNameOf"
     "bitAnd" "bitOr" "bitXor" "break" "catAttrs" "ceil" "compareVersions" "concatLists" "concatMap"
-    "concatStringsSep" "deepSeq" "derivationStrict" "dirOf" "div" "elem" "elemAt" "fetchGit"
-    "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource" "findFile"
-    "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure" "getAttr"
-    "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile" "hashString" "head"
-    "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList" "isNull" "isPath"
-    "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul" "parseDrvName"
-    "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs"
+    "concatStringsSep" "deepSeq" "derivation" "derivationStrict" "dirOf" "div" "elem" "elemAt"
+    "fetchGit" "fetchMercurial" "fetchTarball" "fetchTree" "fetchurl" "filter" "filterSource"
+    "findFile" "floor" "foldl'" "fromJSON" "fromTOML" "functionArgs" "genList" "genericClosure"
+    "getAttr" "getContext" "getEnv" "getFlake" "groupBy" "hasAttr" "hasContext" "hashFile"
+    "hashString" "head" "intersectAttrs" "isAttrs" "isBool" "isFloat" "isFunction" "isInt" "isList"
+    "isNull" "isPath" "isString" "length" "lessThan" "listToAttrs" "map" "mapAttrs" "match" "mul"
+    "parseDrvName" "partition" "path" "pathExists" "placeholder" "readDir" "readFile" "removeAttrs"
     "replaceStrings" "scopedImport" "seq" "sort" "split" "splitVersion" "storePath" "stringLength"
     "sub" "substring" "tail" "toFile" "toJSON" "toPath" "toString" "toXML" "trace" "traceVerbose"
     "tryEval" "typeOf" "unsafeDiscardOutputDependency" "unsafeDiscardStringContext"
@@ -209,3 +200,8 @@
     (float_expression))
   (float_expression)
 ] @number.float
+
+; exceptions
+(variable_expression
+  name: (identifier) @keyword.exception
+  (#any-of? @keyword.exception "abort" "throw"))
diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index 8feff0f8a..d5e8483f4 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -12,6 +12,18 @@
   (#gsub! @injection.language "/%*%s*([%w%p]+)%s*%*/" "%1")
   (#set! injection.combined))
 
+; #-style Comments
+((comment) @injection.language
+  . ; this is to make sure only adjacent comments are accounted for the injections
+  [
+    (string_expression
+      (string_fragment) @injection.content)
+    (indented_string_expression
+      (string_fragment) @injection.content)
+  ]
+  (#gsub! @injection.language "#%s*([%w%p]+)%s*" "%1")
+  (#set! injection.combined))
+
 (apply_expression
   function: (_) @_func
   argument: [
diff --git a/tests/query/highlights/nix/test.nix b/tests/query/highlights/nix/test.nix
index 8ab067a2e..296a5a934 100644
--- a/tests/query/highlights/nix/test.nix
+++ b/tests/query/highlights/nix/test.nix
@@ -13,4 +13,9 @@
 # ^ @variable.member
       # ^ @function.call
               # ^ @string.special.path
+  hi = if true then 9 else throw "an error ${here + "string"}";
+                           # ^ @keyword.exception
+                                  # ^ @string
+                                             # ^ @variable
+                                                     # ^ @string
 }

From fbe76211f45413feadb155a89073bf65b5766b2e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2024 06:37:08 +0000
Subject: [PATCH 1361/2704] bot(lockfile): update arduino, c_sharp, dart,
 elixir, glsl, java, json, mlir, rust, swift, v, wing

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bdc6b62c6..f1346384d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "e3d0dea39dbb8032e754bafe5aec3ed5a234d986"
+    "revision": "f491d929f5af4e6ede4067095c7a649716b23ee8"
   },
   "asm": {
     "revision": "62e49328113ff318128c640bf0cf6dd3d3d51553"
@@ -51,7 +51,7 @@
     "revision": "1aafaff4d26dac5a36dd3495be33e1c20161d761"
   },
   "c_sharp": {
-    "revision": "92c0a9431400cd8b6b6ee7503f81da3ae83fc830"
+    "revision": "9de565257ada70ac441c640e3b5d6850e2df5ab8"
   },
   "cairo": {
     "revision": "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"
@@ -102,7 +102,7 @@
     "revision": "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"
   },
   "dart": {
-    "revision": "923fbe0d3e62340ea78422551166ce946bc05222"
+    "revision": "6da46473ab8accb13da48113f4634e729a71d335"
   },
   "devicetree": {
     "revision": "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"
@@ -141,7 +141,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "868620e19f070a5e6b0b685dc6069a611a86259a"
+    "revision": "de690fa8a028f122af46d9d2685679fe5f2d7d60"
   },
   "elm": {
     "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
@@ -222,7 +222,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "4d01f7bed6fb7abab795656db11785864e167737"
+    "revision": "31064ce53385150f894a6c72d61b94076adf640a"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -321,7 +321,7 @@
     "revision": "51271e260346878e1a1aa6c506ce6a797b7c25e2"
   },
   "java": {
-    "revision": "2aae502017d3aed587ba85e3c7e0cbc138f3e07a"
+    "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
     "revision": "ac10a11e0c8db512f70e6b798260d2516d22454c"
@@ -333,7 +333,7 @@
     "revision": "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"
   },
   "json": {
-    "revision": "3b129203f4b72d532f58e72c5310c0a7db3b8e6d"
+    "revision": "80e623c2165887f9829357acfa9c0a0bab34a3cd"
   },
   "json5": {
     "revision": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"
@@ -423,7 +423,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "a89a5f2bbcf7e82e46b106138977c99d6a644db2"
+    "revision": "c2845c1c0b23e2faf6febfa72a042e5346374ebf"
   },
   "muttrc": {
     "revision": "2f918f9c887109fdf1419f98158a0cfff644af75"
@@ -603,7 +603,7 @@
     "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
   },
   "rust": {
-    "revision": "886e8df3c6ac02723c05fc431a61eb8c27dc118d"
+    "revision": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"
   },
   "scala": {
     "revision": "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"
@@ -675,7 +675,7 @@
     "revision": "6909efa7179cd655f9b48123357d65ce8fc661fd"
   },
   "swift": {
-    "revision": "67ea4e9ea7302b731d392cd8b1aad7b8e79a5547"
+    "revision": "e15e9676d5fa35848cb6021c105702b2fd86bc54"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "395d22e718b6211d05b72fe10bfb371cb7a7aff3"
+    "revision": "3cb964b9023388d2dd261070ccf772863afc3ea6"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -789,7 +789,7 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "1bfc04707486cf19476ce046960810b553659a1a"
+    "revision": "5e2b8b23b922ad525c2d9ecf546bba4d4173c7fd"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From c16f66cca0c38b4e21371d8330b7f2ad6404f6dc Mon Sep 17 00:00:00 2001
From: Guilherme Soares <48023091+guilhas07@users.noreply.github.com>
Date: Tue, 9 Apr 2024 21:25:02 +0200
Subject: [PATCH 1362/2704] feat(java): add when operator (#6420)

---
 queries/java/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 07bc6cd2f..3bc7fcdd6 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -221,6 +221,7 @@
   "else"
   "switch"
   "case"
+  "when"
 ] @keyword.conditional
 
 (ternary_expression

From d90e11756da30959da59eeb8888ecf16e877d86a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 10 Apr 2024 03:22:05 -0400
Subject: [PATCH 1363/2704] fix(solidity): update queries from upstream (#6424)

---
 lockfile.json                   | 2 +-
 queries/solidity/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f1346384d..874b3fe5b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -633,7 +633,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "a8ed2f5d600fed77f8ed3084d1479998c649bca1"
+    "revision": "08338dcee32603383fcef08f36321900bb7a354b"
   },
   "soql": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 9941cf905..e08231cf4 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -106,7 +106,7 @@
   (identifier) @function.call)
 
 ; Function parameters
-(event_paramater
+(event_parameter
   name: (identifier) @variable.parameter)
 
 (parameter
@@ -160,7 +160,7 @@
 
 ; FIXME: update grammar
 ; (block_statement "unchecked" @keyword)
-(event_paramater
+(event_parameter
   "indexed" @keyword)
 
 [

From 3af2d894d460e32bed1897506df5d116aa9b98bf Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 8 Apr 2024 12:30:54 -0400
Subject: [PATCH 1364/2704] fix(go): update queries from upstream

also bump templ to match
---
 lockfile.json             | 4 ++--
 queries/go/highlights.scm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 874b3fe5b..901566511 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -231,7 +231,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "fd577c4358c28cbcb6748bbf65354cc85f1cf7a4"
+    "revision": "5c0024cfbb10f0a6b54ed4b14dc5acadacd19b61"
   },
   "godot_resource": {
     "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
@@ -696,7 +696,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "044ad200092170727650fa6d368df66a8da98f9d"
+    "revision": "65fae2cb1d92c746d06d38df37f5ec148e2269b1"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 715fd133a..06406923b 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -39,7 +39,7 @@
 (method_declaration
   name: (field_identifier) @function.method)
 
-(method_spec
+(method_elem
   name: (field_identifier) @function.method)
 
 ; Constructors

From 8253aac4199e61da6e1311a65d48fc40eb02530d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 08:14:06 +0000
Subject: [PATCH 1365/2704] bot(lockfile): update arduino, asm, go, odin,
 styled, typst, v, wing, yaml

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 901566511..798e1d75a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,10 +12,10 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "f491d929f5af4e6ede4067095c7a649716b23ee8"
+    "revision": "0dc863c1bba5413284d73372c103476a014e4c4b"
   },
   "asm": {
-    "revision": "62e49328113ff318128c640bf0cf6dd3d3d51553"
+    "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
   },
   "astro": {
     "revision": "dfa0893bdc4bdfada102043404758c66e3580568"
@@ -231,7 +231,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "5c0024cfbb10f0a6b54ed4b14dc5acadacd19b61"
+    "revision": "eb68645662a3f7bf7fdd4bcb9531585f54c8570e"
   },
   "godot_resource": {
     "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
@@ -468,7 +468,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "f94c590ed5263e11f1e492d1b53356f8c8459b66"
+    "revision": "b5f668ef8918aab13812ce73acd89fe191fb8c5e"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
@@ -663,7 +663,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "5e52758b32e02adca16bb93f95b3f9c050c72b56"
+    "revision": "c68a4572e2d6403b6e99066c9a113b43f4a07a27"
   },
   "supercollider": {
     "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
@@ -741,7 +741,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "1ad9724e4e4ea5ab81192e843e74cf664eacc59b"
+    "revision": "13863ddcbaa7b68ee6221cea2e3143415e64aea4"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "3cb964b9023388d2dd261070ccf772863afc3ea6"
+    "revision": "42798b5108fbc9aed968adfc7407f22a68174ad7"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -789,7 +789,7 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "5e2b8b23b922ad525c2d9ecf546bba4d4173c7fd"
+    "revision": "6bd05c6672da132d9a330b708197f2965a3f1e89"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
@@ -798,7 +798,7 @@
     "revision": "2282ad5cb8e815523e70d5c82404620bd9a1494c"
   },
   "yaml": {
-    "revision": "c9ee63b15c92656a89f7007f38a98f21c3eca81d"
+    "revision": "3975596d84650e8d8ab8ef3128b1b7f0fec324f8"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From 2bad828b48aed74efe8f7e4ea15550e18c7b482d Mon Sep 17 00:00:00 2001
From: Laytan <laytanlaats@hotmail.com>
Date: Wed, 10 Apr 2024 12:46:25 +0200
Subject: [PATCH 1366/2704] fix(odin): updates queries from upstream (#6425)

---
 queries/odin/highlights.scm |  5 +++++
 queries/odin/indents.scm    | 37 ++++++++++++++++++++++++++++---------
 queries/odin/locals.scm     |  4 ++++
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 6c8a7965b..5aafc4941 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -24,6 +24,7 @@
   "map"
   "bit_set"
   "matrix"
+  "bit_field"
 ] @keyword
 
 "proc" @keyword.function
@@ -151,6 +152,10 @@
   (identifier) @type
   "::")
 
+(bit_field_declaration
+  (identifier) @type
+  "::")
+
 (const_declaration
   (identifier) @type
   "::"
diff --git a/queries/odin/indents.scm b/queries/odin/indents.scm
index 11dab0544..9c8632978 100644
--- a/queries/odin/indents.scm
+++ b/queries/odin/indents.scm
@@ -1,24 +1,43 @@
 [
   (block)
-  (procedure_declaration)
-  (overloaded_procedure_declaration)
   (enum_declaration)
   (union_declaration)
-  (if_statement)
-  (else_if_clause)
-  (else_clause)
-  (when_statement)
-  (else_when_clause)
-  (for_statement)
+  (bit_field_declaration)
+  (struct_declaration)
+  (struct)
+  (parameters)
+  (tuple_type)
+  (call_expression)
   (switch_case)
 ] @indent.begin
 
+; hello(
+((identifier)
+  .
+  (ERROR
+    "(" @indent.begin))
+
 [
-  "}"
   ")"
   "]"
 ] @indent.branch @indent.end
 
+; Have to do all closing brackets separately because the one for switch statements shouldn't end.
+(block
+  "}" @indent.branch @indent.end)
+
+(enum_declaration
+  "}" @indent.branch @indent.end)
+
+(union_declaration
+  "}" @indent.branch @indent.end)
+
+(struct_declaration
+  "}" @indent.branch @indent.end)
+
+(struct
+  "}" @indent.branch @indent.end)
+
 [
   (comment)
   (block_comment)
diff --git a/queries/odin/locals.scm b/queries/odin/locals.scm
index 6c55f8a1a..3e794b2f6 100644
--- a/queries/odin/locals.scm
+++ b/queries/odin/locals.scm
@@ -30,6 +30,10 @@
   (identifier) @local.definition.type
   "::")
 
+(bit_field_declaration
+  (identifier) @local.definition.type
+  "::")
+
 (variable_declaration
   (identifier) @local.definition.var
   ":=")

From b7339ffb9affdd5c843d4aae1d5f949039294d89 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 06:36:52 +0000
Subject: [PATCH 1367/2704] bot(lockfile): update svelte, v, wing

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 798e1d75a..34cb87b21 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -672,7 +672,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "6909efa7179cd655f9b48123357d65ce8fc661fd"
+    "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
     "revision": "e15e9676d5fa35848cb6021c105702b2fd86bc54"
@@ -759,7 +759,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "42798b5108fbc9aed968adfc7407f22a68174ad7"
+    "revision": "9ba1aa8c46e11f2239ab6fac3c61522362b05c9f"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -789,7 +789,7 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "6bd05c6672da132d9a330b708197f2965a3f1e89"
+    "revision": "a9cacfc7b877267aa006b3d436feae253f54ed29"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From 5c4892b0556d1258c423e2369d6a602d9b2a4988 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 11 Apr 2024 17:03:22 +0100
Subject: [PATCH 1368/2704] fix(textproto): use 'pbtxt' filetype (#6427)

This is the actual name of the detected filetype.
---
 lua/nvim-treesitter/parsers.lua | 1 +
 scripts/minimal_init.lua        | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a0a77e420..255efe570 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2038,6 +2038,7 @@ list.textproto = {
     url = "https://github.com/PorterAtGoogle/tree-sitter-textproto",
     files = { "src/parser.c" },
   },
+  filetype = "pbtxt",
   maintainers = { "@Porter" },
 }
 
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 45a7b0243..f7a7ee590 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -8,7 +8,6 @@ vim.filetype.add {
     cmm = "t32",
     hurl = "hurl",
     ncl = "nickel",
-    textproto = "textproto",
     tig = "tiger",
     usd = "usd",
     usda = "usd",

From 6ae470fd8fdab6ea391ae1999bcaee0529408a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= <glehmann@users.noreply.github.com>
Date: Thu, 11 Apr 2024 23:06:52 +0200
Subject: [PATCH 1369/2704] feat: add earthfile parser (#6395)

---------

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 lockfile.json                    |   3 +
 lua/nvim-treesitter/parsers.lua  |   8 ++
 queries/earthfile/highlights.scm | 129 +++++++++++++++++++++++++++++++
 queries/earthfile/injections.scm |   9 +++
 4 files changed, 149 insertions(+)
 create mode 100644 queries/earthfile/highlights.scm
 create mode 100644 queries/earthfile/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 34cb87b21..536f1a36e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -131,6 +131,9 @@
   "dtd": {
     "revision": "2282ad5cb8e815523e70d5c82404620bd9a1494c"
   },
+  "earthfile": {
+    "revision": "2a6ab191f5f962562e495a818aa4e7f45f8a556a"
+  },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 255efe570..39c3b1875 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -443,6 +443,14 @@ list.dtd = {
   maintainers = { "@ObserverOfTime" },
 }
 
+list.earthfile = {
+  install_info = {
+    url = "https://github.com/glehmann/tree-sitter-earthfile",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@glehmann" },
+}
+
 list.ebnf = {
   install_info = {
     url = "https://github.com/RubixDev/ebnf",
diff --git a/queries/earthfile/highlights.scm b/queries/earthfile/highlights.scm
new file mode 100644
index 000000000..cc7dce298
--- /dev/null
+++ b/queries/earthfile/highlights.scm
@@ -0,0 +1,129 @@
+(string_array
+  "," @punctuation.delimiter)
+
+(string_array
+  [
+    "["
+    "]"
+  ] @punctuation.bracket)
+
+[
+  "ARG"
+  "AS LOCAL"
+  "BUILD"
+  "CACHE"
+  "CMD"
+  "COPY"
+  "DO"
+  "ENTRYPOINT"
+  "ENV"
+  "EXPOSE"
+  "FROM DOCKERFILE"
+  "FROM"
+  "FUNCTION"
+  "GIT CLONE"
+  "HOST"
+  "IMPORT"
+  "LABEL"
+  "LET"
+  "PROJECT"
+  "RUN"
+  "SAVE ARTIFACT"
+  "SAVE IMAGE"
+  "SET"
+  "USER"
+  "VERSION"
+  "VOLUME"
+  "WORKDIR"
+] @keyword
+
+(for_command
+  [
+    "FOR"
+    "IN"
+    "END"
+  ] @keyword.repeat)
+
+(if_command
+  [
+    "IF"
+    "END"
+  ] @keyword.conditional)
+
+(elif_block
+  "ELSE IF" @keyword.conditional)
+
+(else_block
+  "ELSE" @keyword.conditional)
+
+(import_command
+  [
+    "IMPORT"
+    "AS"
+  ] @keyword.import)
+
+(try_command
+  [
+    "TRY"
+    "FINALLY"
+    "END"
+  ] @keyword.exception)
+
+(wait_command
+  [
+    "WAIT"
+    "END"
+  ] @keyword)
+
+(with_docker_command
+  [
+    "WITH DOCKER"
+    "END"
+  ] @keyword)
+
+[
+  (comment)
+  (line_continuation_comment)
+] @comment @spell
+
+[
+  (target_ref)
+  (target_artifact)
+  (function_ref)
+] @function
+
+(target
+  (identifier) @function)
+
+[
+  (double_quoted_string)
+  (single_quoted_string)
+] @string
+
+(unquoted_string) @string.special
+
+(escape_sequence) @string.escape
+
+(variable) @variable
+
+(expansion
+  [
+    "$"
+    "{"
+    "}"
+    "("
+    ")"
+  ] @punctuation.special)
+
+(build_arg
+  [
+    "--"
+    (variable)
+  ] @variable.parameter)
+
+(options
+  (_) @property)
+
+"=" @operator
+
+(line_continuation) @operator
diff --git a/queries/earthfile/injections.scm b/queries/earthfile/injections.scm
new file mode 100644
index 000000000..7435a400e
--- /dev/null
+++ b/queries/earthfile/injections.scm
@@ -0,0 +1,9 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((line_continuation_comment) @injection.content
+  (#set! injection.language "comment"))
+
+((shell_fragment) @injection.content
+  (#set! injection.language "bash")
+  (#set! injection.include-children))

From b0ac1135fe304edd34e18204304906744db0fe63 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 21:07:08 +0000
Subject: [PATCH 1370/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 80a1081b6..cd3370d34 100644
--- a/README.md
+++ b/README.md
@@ -217,6 +217,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
 - [x] [doxygen](https://github.com/amaanq/tree-sitter-doxygen) (maintained by @amaanq)
 - [x] [dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
+- [x] [earthfile](https://github.com/glehmann/tree-sitter-earthfile) (maintained by @glehmann)
 - [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
 - [x] [eds](https://github.com/uyha/tree-sitter-eds) (maintained by @uyha)
 - [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)

From 7e6b044be8187c4c28dffa90ad0dc623dbe243f3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 06:35:59 +0000
Subject: [PATCH 1371/2704] bot(lockfile): update bash, cpp, earthfile,
 mermaid, muttrc, pascal, racket, scheme, tcl, v, wing

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 536f1a36e..3d8aabe22 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "ba7472152d79a8c916550c80fdbfd5724d07a0c9"
   },
   "bash": {
-    "revision": "f3f26f47a126797c011c311cec9d449d855c3eab"
+    "revision": "f8fb3274f72a30896075585b32b0c54cad65c086"
   },
   "bass": {
     "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
@@ -84,7 +84,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "d0b4e006ca3c4466f834d9a4bf709bfede13d359"
+    "revision": "f79b9d98592bcc307ace9c9a2441b04eb175a1c2"
   },
   "css": {
     "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
@@ -132,7 +132,7 @@
     "revision": "2282ad5cb8e815523e70d5c82404620bd9a1494c"
   },
   "earthfile": {
-    "revision": "2a6ab191f5f962562e495a818aa4e7f45f8a556a"
+    "revision": "fda374bd4e908b3a34be097b94857e08c22b1ec3"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -420,7 +420,7 @@
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
   },
   "mermaid": {
-    "revision": "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98"
+    "revision": "49442bd087901c60f019b4e34dcb6ecdc8849067"
   },
   "meson": {
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
@@ -429,7 +429,7 @@
     "revision": "c2845c1c0b23e2faf6febfa72a042e5346374ebf"
   },
   "muttrc": {
-    "revision": "2f918f9c887109fdf1419f98158a0cfff644af75"
+    "revision": "ce5b31451b3c0f90be884571b2ff4f569182f1d8"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
@@ -477,7 +477,7 @@
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
   },
   "pascal": {
-    "revision": "9e995404ddff8319631d72d4b46552e737206912"
+    "revision": "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"
   },
   "passwd": {
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
@@ -564,7 +564,7 @@
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
   },
   "racket": {
-    "revision": "d9858a0f607578814f2d34662ad4bc21aa37a455"
+    "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
   },
   "rasi": {
     "revision": "43196d934a9a6ab3c7093a8683efd0111bb03db1"
@@ -615,7 +615,7 @@
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
   },
   "scheme": {
-    "revision": "184e7596ee0cbaef79230cae1b4ee5bb4fbad314"
+    "revision": "8f9dff3d038f09934db5ea113cebc59c74447743"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -693,7 +693,7 @@
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
   },
   "tcl": {
-    "revision": "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8"
+    "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
   },
   "teal": {
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
@@ -762,7 +762,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "9ba1aa8c46e11f2239ab6fac3c61522362b05c9f"
+    "revision": "78282918559ab0d8981d6366f2f1100f3102e540"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -792,7 +792,7 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "a9cacfc7b877267aa006b3d436feae253f54ed29"
+    "revision": "4e5335ae03cbf7f3914eab5bf6ffae533c2acb1d"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From ef267f0c285928ea3a0d3362a260a0728fd4a146 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Fri, 12 Apr 2024 14:11:01 +0200
Subject: [PATCH 1372/2704] fix: add highlights for static member expression
 (#6393)

---
 queries/angular/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index f3aa27d25..7d3f45f04 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -4,7 +4,10 @@
 
 (pipe_operator) @operator
 
-(string) @string
+[
+  (string)
+  (static_member_expression)
+] @string
 
 (number) @number
 

From 3e1d836e0e5abe5c47d0cef67d51494e2e48d7ba Mon Sep 17 00:00:00 2001
From: JoranHonig <JoranHonig@users.noreply.github.com>
Date: Sat, 13 Apr 2024 18:46:25 +0200
Subject: [PATCH 1373/2704] fix(solidity): adapt queries to parser changes

---
 lockfile.json                   |  2 +-
 queries/solidity/highlights.scm | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3d8aabe22..1fde53c3c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -636,7 +636,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "08338dcee32603383fcef08f36321900bb7a354b"
+    "revision": "1653da09ccd183f4312fba819056a13af22a65f6"
   },
   "soql": {
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index e08231cf4..a9da981f4 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -72,7 +72,8 @@
 
 (emit_statement
   .
-  (identifier) @type)
+  (expression
+    (identifier)) @type)
 
 ; Handles ContractA, ContractB in function foo() override(ContractA, contractB) {}
 (override_specifier
@@ -97,20 +98,22 @@
 ; Handles expressions like structVariable.g();
 (call_expression
   .
-  (member_expression
-    (identifier) @function.method.call))
+  (expression
+    (member_expression
+      (identifier) @function.method.call)))
 
 ; Handles expressions like g();
 (call_expression
   .
-  (identifier) @function.call)
+  (expression
+    (identifier) @function.call))
 
 ; Function parameters
 (event_parameter
-  name: (identifier) @variable.parameter)
+  name: (_) @variable.parameter)
 
 (parameter
-  name: (identifier) @variable.parameter)
+  name: (_) @variable.parameter)
 
 ; Yul functions
 (yul_function_call
@@ -126,10 +129,10 @@
   "type" @keyword)
 
 (member_expression
-  property: (identifier) @variable.member)
+  property: (_) @variable.member)
 
 (call_struct_argument
-  name: (identifier) @variable.member)
+  name: (_) @variable.member)
 
 (struct_field_assignment
   name: (identifier) @variable.member)

From f08a9d97f7a2ac02115a5c1c8e3973b2634d996b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 Apr 2024 19:56:41 +0200
Subject: [PATCH 1374/2704] ci(tests): drop flaky wing parser tests

---
 tests/query/highlights/wing/class.w         | 19 -------------------
 tests/query/highlights/wing/nested_method.w |  4 ----
 2 files changed, 23 deletions(-)
 delete mode 100644 tests/query/highlights/wing/class.w
 delete mode 100644 tests/query/highlights/wing/nested_method.w

diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
deleted file mode 100644
index c210fc611..000000000
--- a/tests/query/highlights/wing/class.w
+++ /dev/null
@@ -1,19 +0,0 @@
-bring cloud;
-// <- @keyword
-
-class Foo {
-// <- @keyword
-//    ^   @variable
-//        ^ @punctuation.bracket
-  name: str;
-//^    @variable.member
-//      ^   @type.builtin
-//         ^ @punctuation.delimiter
-  new(name:  str) {
-//^    @keyword
-//    ^    @variable
-    this.name = name;
-//      ^ @punctuation.delimiter
-//            ^ @operator
-  }
-}
diff --git a/tests/query/highlights/wing/nested_method.w b/tests/query/highlights/wing/nested_method.w
deleted file mode 100644
index 080d29793..000000000
--- a/tests/query/highlights/wing/nested_method.w
+++ /dev/null
@@ -1,4 +0,0 @@
-test1.test2.test3();
-// <- @variable
-//    ^ @variable.member
-//          ^ @function.method.call

From 2c6ab9a09c27800a761fc39aac7ce179e4f23a32 Mon Sep 17 00:00:00 2001
From: Christoph Sax <c_sax@mailbox.org>
Date: Fri, 12 Apr 2024 22:24:38 +0200
Subject: [PATCH 1375/2704] feat(t32): use filetype "trace32"

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 39c3b1875..e7761e2b4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2004,6 +2004,7 @@ list.t32 = {
     url = "https://gitlab.com/xasc/tree-sitter-t32.git",
     files = { "src/parser.c", "src/scanner.c" },
   },
+  filetype = "trace32",
   maintainers = { "@xasc" },
 }
 

From f22f024e78757bb5411ad1530a24c994340c23ae Mon Sep 17 00:00:00 2001
From: Christoph Sax <xasc@users.noreply.github.com>
Date: Sun, 14 Apr 2024 12:58:21 +0200
Subject: [PATCH 1376/2704] feat(t32): update queries from upstream (#6440)

Adds support for new node type `elif_block`.
---
 lockfile.json                           | 2 +-
 queries/t32/highlights.scm              | 3 +++
 queries/t32/indents.scm                 | 2 ++
 tests/query/highlights/t32/keywords.cmm | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1fde53c3c..e639813f2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -687,7 +687,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "t32": {
-    "revision": "8487a14874f3e3138877655f303322d9e7222cec"
+    "revision": "6182836f4128725f1e74ce986840d7317021a015"
   },
   "tablegen": {
     "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index 3ddce588a..1e7b420f0 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -208,6 +208,9 @@
 (if_block
   command: (identifier) @keyword.conditional)
 
+(elif_block
+  command: (identifier) @keyword.conditional)
+
 (else_block
   command: (identifier) @keyword.conditional)
 
diff --git a/queries/t32/indents.scm b/queries/t32/indents.scm
index b30b916d2..01d5f3967 100644
--- a/queries/t32/indents.scm
+++ b/queries/t32/indents.scm
@@ -6,6 +6,8 @@
 (if_block
   (block)) @indent.dedent
 
+(elif_block) @indent.branch
+
 (else_block) @indent.branch
 
 (else_block
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
index f04df3ed1..d1516eb29 100644
--- a/tests/query/highlights/t32/keywords.cmm
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -41,7 +41,9 @@ ELSE
     IF !&pass
         GOTO fail
 ;            ^ @label
-    ELSE
+    ELSE IF &debug
+;   ^ @keyword.conditional
+;        ^ @keyword.conditional
     (
         GOSUB start_debug
 ;             ^ @function.call

From 65ce6fde2d49f57824f7de8c25acc0ba438f5e8d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 14 Apr 2024 08:04:31 +0000
Subject: [PATCH 1377/2704] bot(lockfile): update arduino, cuda, dtd, glsl,
 hlsl, http, norg, slang, slint, sql, swift, templ, tlaplus, unison, wing,
 xml, yaml

---
 lockfile.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e639813f2..a9e063751 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "0dc863c1bba5413284d73372c103476a014e4c4b"
+    "revision": "4ddf79edaa87170ec12bd6a8d03a8ac528fe0ae7"
   },
   "asm": {
     "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "6e25c94f8be4388a4fec6dadc23f3b662388ec20"
+    "revision": "322f288884a035eded1fbbdcb19829eb3abf6d1d"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -129,7 +129,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "2282ad5cb8e815523e70d5c82404620bd9a1494c"
+    "revision": "00363c3d8279adc7c729ac25f68179d1f8e91c60"
   },
   "earthfile": {
     "revision": "fda374bd4e908b3a34be097b94857e08c22b1ec3"
@@ -225,7 +225,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "31064ce53385150f894a6c72d61b94076adf640a"
+    "revision": "7bc5d2decba04ca787cb5305f5ede066d77ac82f"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -288,7 +288,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "027fa2e142db1258026cc6497b9f32bbf11f392d"
+    "revision": "4d1e3f4a1515c257ad5cc2553347d2dc23537b09"
   },
   "hlsplaylist": {
     "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
@@ -306,7 +306,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "86ad05ac2de3c63c69f65e58f0182a76c1658d1e"
+    "revision": "a71c919cef9431cf0786d70bc69bd8b0f86208f4"
   },
   "hurl": {
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
@@ -450,7 +450,7 @@
     "revision": "b3cda619248e7dd0f216088bd152f59ce0bbe488"
   },
   "norg": {
-    "revision": "9766442985fd546e2d33f8d1c7e7619ed07860cf"
+    "revision": "a53313574fdc34bf336101c94ef2ed7fe98d4991"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -621,10 +621,10 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "08021fe6e55662281744de289c747197173a1170"
+    "revision": "6d2e955ee54084896461a307c1fdba0bb2024c86"
   },
   "slint": {
-    "revision": "acc77c93ef4b73ba8c3a581b8c99d95b55f7178b"
+    "revision": "f42fa5a44e8477f0443fcd3312a828ccba4f481e"
   },
   "smali": {
     "revision": "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c"
@@ -651,7 +651,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "cdb7cde9bf70b194ab8beb5069fbbc3c9640284e"
+    "revision": "54f1f7da46bac43d2b562fe70cb3ac5905832387"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -678,7 +678,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "e15e9676d5fa35848cb6021c105702b2fd86bc54"
+    "revision": "e2f0b7cf8136b801e4743790b7a956ab29a4d6b0"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -699,7 +699,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "65fae2cb1d92c746d06d38df37f5ec148e2269b1"
+    "revision": "1f9dae9c273136551684cb41461d00e565150e23"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -714,7 +714,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "0545ebd097338f1a119c2cb61eb3600409fce715"
+    "revision": "3c8ce503563ea04ba1cc07c468ed064b1974c3ba"
   },
   "tmux": {
     "revision": "7499587642a46ee156e1bb58851904ac750dcc7c"
@@ -753,7 +753,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "fb49b8125509c079e08f345758c03a427129010e"
+    "revision": "feaae3e630e7f0208bba6fc60857a45457cc99e8"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
@@ -792,16 +792,16 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "4e5335ae03cbf7f3914eab5bf6ffae533c2acb1d"
+    "revision": "65d7da7211ef5d40d22aa9dcfb59aa7a757fcdeb"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "2282ad5cb8e815523e70d5c82404620bd9a1494c"
+    "revision": "00363c3d8279adc7c729ac25f68179d1f8e91c60"
   },
   "yaml": {
-    "revision": "3975596d84650e8d8ab8ef3128b1b7f0fec324f8"
+    "revision": "ee093118211be521742b9866a8ed8ce6d87c7a94"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From 78bfee7ddbe960a531435cb013f29337c10df339 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 14 Apr 2024 13:26:18 +0200
Subject: [PATCH 1378/2704] ci(tests): use nvim nightly for win+cl

---
 .github/workflows/test-queries.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 6b7772201..fdfb38097 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -41,7 +41,7 @@ jobs:
         include:
           - os: windows-latest
             cc: cl
-            nvim_tag: stable
+            nvim_tag: nightly
 
           - os: ubuntu-latest
             cc: gcc

From 9a39ec072a02e6bfce9971408a090f26325f29ce Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 14 Apr 2024 13:08:19 +0200
Subject: [PATCH 1379/2704] fix(install): do not generate bindings when
 generating parser

These are irrelevant for us and may lead to conflicts with committed
outdated bindings (e.g., wing).
---
 lua/nvim-treesitter/install.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 1f2bd7b16..c2d961fb8 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -360,9 +360,9 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
     if not M.ts_generate_args then
       local ts_cli_version = utils.ts_cli_version()
       if ts_cli_version and vim.split(ts_cli_version, " ")[1] > "0.20.2" then
-        M.ts_generate_args = { "generate", "--abi", vim.treesitter.language_version }
+        M.ts_generate_args = { "generate", "--no-bindings", "--abi", vim.treesitter.language_version }
       else
-        M.ts_generate_args = { "generate" }
+        M.ts_generate_args = { "generate", "--no-bindings" }
       end
     end
   end

From bfa217af767beacc5c8f220c75fa5642d7ef2035 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 14 Apr 2024 13:09:19 +0200
Subject: [PATCH 1380/2704] Revert "ci(tests): drop flaky wing parser tests"

This reverts commit f08a9d97f7a2ac02115a5c1c8e3973b2634d996b.

(Fixed by skipping bindings when generating.)
---
 tests/query/highlights/wing/class.w         | 19 +++++++++++++++++++
 tests/query/highlights/wing/nested_method.w |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 tests/query/highlights/wing/class.w
 create mode 100644 tests/query/highlights/wing/nested_method.w

diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
new file mode 100644
index 000000000..c210fc611
--- /dev/null
+++ b/tests/query/highlights/wing/class.w
@@ -0,0 +1,19 @@
+bring cloud;
+// <- @keyword
+
+class Foo {
+// <- @keyword
+//    ^   @variable
+//        ^ @punctuation.bracket
+  name: str;
+//^    @variable.member
+//      ^   @type.builtin
+//         ^ @punctuation.delimiter
+  new(name:  str) {
+//^    @keyword
+//    ^    @variable
+    this.name = name;
+//      ^ @punctuation.delimiter
+//            ^ @operator
+  }
+}
diff --git a/tests/query/highlights/wing/nested_method.w b/tests/query/highlights/wing/nested_method.w
new file mode 100644
index 000000000..080d29793
--- /dev/null
+++ b/tests/query/highlights/wing/nested_method.w
@@ -0,0 +1,4 @@
+test1.test2.test3();
+// <- @variable
+//    ^ @variable.member
+//          ^ @function.method.call

From 497208692f177aa2d333219232cbf7bb8c6b84b1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 14 Apr 2024 13:47:18 +0200
Subject: [PATCH 1381/2704] fix(compile): add `/utf-8` flag on win+cl

---
 lua/nvim-treesitter/shell_command_selectors.lua |  1 +
 queries/haskell/highlights.scm                  |  2 +-
 queries/purescript/highlights.scm               | 12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index c215aa77f..96ad6acc4 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -91,6 +91,7 @@ function M.select_compiler_args(repo, compiler)
       "/Isrc",
       repo.files,
       "-Os",
+      "/utf-8",
       "/LD",
     }
   elseif string.match(compiler, "zig$") or string.match(compiler, "zig.exe$") then
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 9cb4c8104..a75dd0119 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -84,7 +84,7 @@
 ; Keywords, operators, includes
 [
   "forall"
-  ; "∀" ; utf-8 is not cross-platform safe
+  "∀"
 ] @keyword.repeat
 
 (pragma) @keyword.directive
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index c14ded077..ae9e930ca 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -58,15 +58,15 @@
   "="
   "|"
   "::"
-  ; "∷"
+  "∷"
   "=>"
-  ; "⇒"
+  "⇒"
   "<="
-  ; "⇐"
+  "⇐"
   "->"
-  ; "→"
+  "→"
   "<-"
-  ; "←"
+  "←"
   "\\"
   "`"
   "@"
@@ -102,7 +102,7 @@
   "do"
   "ado"
   "forall"
-  ; "∀" ; utf-8 is not cross-platform safe
+  "∀"
   "infix"
   "infixl"
   "infixr"

From 86ac7e9274535038f8f5f5f80397f0885bea0326 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 14 Apr 2024 14:07:47 +0200
Subject: [PATCH 1382/2704] ci: replace node with upstream action

---
 .github/workflows/test-queries.yml | 5 +----
 .github/workflows/tests.yml        | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index fdfb38097..bc4a18d52 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -55,11 +55,8 @@ jobs:
       ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-latest' && 'rnoweb' }}
     steps:
       - uses: actions/checkout@v4
+      - uses: tree-sitter/setup-action/cli@v1
       - uses: ilammy/msvc-dev-cmd@v1
-      - uses: actions/setup-node@v4
-
-      - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli
 
       - name: Install and prepare Neovim
         env:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8d71edeb0..6c4ad9578 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,10 +27,7 @@ jobs:
       CC: ${{ matrix.cc }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-
-      - name: Install tree-sitter CLI
-        run: npm i -g tree-sitter-cli
+      - uses: tree-sitter/setup-action/cli@v1
 
       - name: Test Dependencies
         run: |

From d2f4c7830377d6d036e9621ae696dbd28f089897 Mon Sep 17 00:00:00 2001
From: "Sergio A. Vargas" <savargasqu+git@unal.edu.co>
Date: Sun, 14 Apr 2024 07:23:46 -0500
Subject: [PATCH 1383/2704] fix(julia): adapt queries to grammar changes
 (#6429)

---
 lockfile.json                        |  2 +-
 queries/julia/highlights.scm         | 62 ++++++----------------------
 queries/julia/indents.scm            |  4 --
 queries/julia/injections.scm         |  1 -
 queries/julia/locals.scm             | 33 ++++-----------
 tests/query/highlights/julia/test.jl |  2 +-
 6 files changed, 23 insertions(+), 81 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a9e063751..196b2582c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -348,7 +348,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"
+    "revision": "c0acda09c0c70d4515402f9ebb1ad369fa0afabf"
   },
   "just": {
     "revision": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index f48d97d97..99aa9d1b3 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -4,14 +4,6 @@
 ; ;; If you want type highlighting based on Julia naming conventions (this might collide with mathematical notation)
 ; ((identifier) @type
 ;   (match? @type "^[A-Z][^_]"))  ; exception: Highlight `A_foo` sort of identifiers as variables
-(macro_identifier) @function.macro
-
-(macro_identifier
-  (identifier) @function.macro) ; for any one using the variable highlight
-
-(macro_definition
-  name: (identifier) @function.macro)
-
 (quote_expression
   ":" @string.special.symbol
   [
@@ -22,22 +14,6 @@
 (field_expression
   (identifier) @variable.member .)
 
-; Function names
-; Definitions
-(function_definition
-  name: (identifier) @function)
-
-(short_function_definition
-  name: (identifier) @function)
-
-(function_definition
-  name: (field_expression
-    (identifier) @function .))
-
-(short_function_definition
-  name: (field_expression
-    (identifier) @function .))
-
 ; calls
 (call_expression
   (identifier) @function.call)
@@ -59,6 +35,17 @@
   (identifier) @function.call
   (#any-of? @_pipe "|>" ".|>"))
 
+(macro_identifier) @function.macro
+
+(macro_identifier
+  (identifier) @function.macro) ; for any one using the variable highlight
+
+(macro_definition
+  (signature
+    (call_expression
+      .
+      (identifier) @function.macro)))
+
 ; Builtins
 ((identifier) @function.builtin
   (#any-of? @function.builtin
@@ -69,25 +56,6 @@
     "modifyfield!" "nfields" "replacefield!" "set_binding_type!" "setfield!" "sizeof" "svec"
     "swapfield!" "throw" "tuple" "typeassert" "typeof"))
 
-; Parameters
-(parameter_list
-  (identifier) @variable.parameter)
-
-(optional_parameter
-  .
-  (identifier) @variable.parameter)
-
-(slurp_parameter
-  (identifier) @variable.parameter)
-
-(typed_parameter
-  parameter: (identifier)? @variable.parameter
-  type: (_) @type)
-
-(function_expression
-  .
-  (identifier) @variable.parameter) ; Single parameter arrow functions
-
 ; Types
 ; Definitions
 (abstract_definition
@@ -118,11 +86,8 @@
 (typed_expression
   (identifier) @type .)
 
-(function_definition
-  return_type: (identifier) @type)
-
-(short_function_definition
-  return_type: (identifier) @type)
+(unary_typed_expression
+  (identifier) @type .)
 
 (where_clause
   (identifier) @type)
@@ -387,7 +352,6 @@
     (abstract_definition)
     (struct_definition)
     (function_definition)
-    (short_function_definition)
     (assignment)
     (const_statement)
   ])
diff --git a/queries/julia/indents.scm b/queries/julia/indents.scm
index bf4932ec3..7b40f876e 100644
--- a/queries/julia/indents.scm
+++ b/queries/julia/indents.scm
@@ -47,10 +47,6 @@
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
-((parameter_list) @indent.align
-  (#set! indent.open_delimiter "(")
-  (#set! indent.close_delimiter ")"))
-
 ((curly_expression) @indent.align
   (#set! indent.open_delimiter "{")
   (#set! indent.close_delimiter "}"))
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 07af15a11..d8bae2e99 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -6,7 +6,6 @@
     (abstract_definition)
     (struct_definition)
     (function_definition)
-    (short_function_definition)
     (assignment)
     (const_statement)
   ]
diff --git a/queries/julia/locals.scm b/queries/julia/locals.scm
index 3e7654b06..767239f15 100644
--- a/queries/julia/locals.scm
+++ b/queries/julia/locals.scm
@@ -39,35 +39,18 @@
 (import_statement
   (identifier) @local.definition.import)
 
-; Parameters
-(parameter_list
-  (identifier) @local.definition.parameter)
-
-(optional_parameter
-  .
-  (identifier) @local.definition.parameter)
-
-(slurp_parameter
-  (identifier) @local.definition.parameter)
-
-(typed_parameter
-  parameter: (identifier) @local.definition.parameter
-  (_))
-
-; Single parameter arrow function
-(function_expression
-  .
-  (identifier) @local.definition.parameter)
-
 ; Function/macro definitions
 (function_definition
-  name: (identifier) @local.definition.function) @local.scope
-
-(short_function_definition
-  name: (identifier) @local.definition.function) @local.scope
+  (signature
+    (call_expression
+      .
+      (identifier) @local.definition.function))) @local.scope
 
 (macro_definition
-  name: (identifier) @local.definition.macro) @local.scope
+  (signature
+    (call_expression
+      .
+      (identifier) @local.definition.function))) @local.scope
 
 (identifier) @local.reference
 
diff --git a/tests/query/highlights/julia/test.jl b/tests/query/highlights/julia/test.jl
index 065df5c9e..445efaa1f 100644
--- a/tests/query/highlights/julia/test.jl
+++ b/tests/query/highlights/julia/test.jl
@@ -1,6 +1,6 @@
 function load_data(::Symbol; ::Int) :: Tuple
 # <- @keyword.function
-#        ^ @function
+#        ^ @function.call
 #                 ^ @punctuation.bracket
 #                  ^^ @punctuation.delimiter
 #                    ^ @type.builtin

From 40e8c92f99ef26625ff2206f5e183ac3109f20ba Mon Sep 17 00:00:00 2001
From: Mark McCulloh <Mark.McCulloh@gmail.com>
Date: Sun, 14 Apr 2024 11:53:37 -0400
Subject: [PATCH 1384/2704] fix(wing): update to new repo (#6446)

---
 README.md                           | 2 +-
 lockfile.json                       | 2 +-
 lua/nvim-treesitter/parsers.lua     | 5 +----
 queries/wing/highlights.scm         | 6 ++++++
 tests/query/highlights/wing/class.w | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index cd3370d34..52540cafe 100644
--- a/README.md
+++ b/README.md
@@ -437,7 +437,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) (maintained by @WhyNotHugo, @lucario387)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
-- [x] [wing](https://github.com/winglang/wing) (experimental, maintained by @gshpychka, @MarkMcCulloh)
+- [x] [wing](https://github.com/winglang/tree-sitter-wing) (maintained by @gshpychka, @MarkMcCulloh)
 - [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
 - [x] [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 196b2582c..cbe90080c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -792,7 +792,7 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "65d7da7211ef5d40d22aa9dcfb59aa7a757fcdeb"
+    "revision": "5b6c2a5818a602557778d1bfc265d016cafa0712"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e7761e2b4..9f1cb76c3 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2297,13 +2297,10 @@ list.wgsl_bevy = {
 
 list.wing = {
   install_info = {
-    url = "https://github.com/winglang/wing",
+    url = "https://github.com/winglang/tree-sitter-wing",
     files = { "src/parser.c", "src/scanner.c" },
-    location = "libs/tree-sitter-wing",
-    requires_generate_from_grammar = true,
   },
   maintainers = { "@gshpychka", "@MarkMcCulloh" },
-  experimental = true,
 }
 
 list.xcompose = {
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index e33829b81..0171e09de 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -95,4 +95,10 @@
   "else"
 ] @keyword.conditional
 
+[
+  "pub"
+  "protected"
+  "internal"
+] @keyword.modifier
+
 "return" @keyword.return
diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
index c210fc611..602b2f749 100644
--- a/tests/query/highlights/wing/class.w
+++ b/tests/query/highlights/wing/class.w
@@ -3,7 +3,7 @@ bring cloud;
 
 class Foo {
 // <- @keyword
-//    ^   @variable
+//    ^   @type
 //        ^ @punctuation.bracket
   name: str;
 //^    @variable.member

From 1ba86026f7d4650d98fb9d4c0f2ab409c428ae41 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 06:35:25 +0000
Subject: [PATCH 1385/2704] bot(lockfile): update cpp, cuda, glsl, hlsl, http,
 julia, norg, slang, unison, v

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cbe90080c..5bf2f0ebf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -84,7 +84,7 @@
     "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
   },
   "cpp": {
-    "revision": "f79b9d98592bcc307ace9c9a2441b04eb175a1c2"
+    "revision": "72fd00128f1c38319670cbf4bcedbba0dc849d96"
   },
   "css": {
     "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "322f288884a035eded1fbbdcb19829eb3abf6d1d"
+    "revision": "50a28f4600c559e3d19a1825e854dfe6dcac1d49"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -225,7 +225,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "7bc5d2decba04ca787cb5305f5ede066d77ac82f"
+    "revision": "e7817c982e0e921c5ee89a1e0283121bb5cc5e01"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -288,7 +288,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "4d1e3f4a1515c257ad5cc2553347d2dc23537b09"
+    "revision": "d200375a29b24764b78d7051df0024ed7c2f1ab0"
   },
   "hlsplaylist": {
     "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
@@ -306,7 +306,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "a71c919cef9431cf0786d70bc69bd8b0f86208f4"
+    "revision": "a10b13eb63ab978969585d9c0fa80e77a9e82872"
   },
   "hurl": {
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
@@ -348,7 +348,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "c0acda09c0c70d4515402f9ebb1ad369fa0afabf"
+    "revision": "0a80d33aca49dd257625ab25ef3a506e2b99a554"
   },
   "just": {
     "revision": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"
@@ -450,7 +450,7 @@
     "revision": "b3cda619248e7dd0f216088bd152f59ce0bbe488"
   },
   "norg": {
-    "revision": "a53313574fdc34bf336101c94ef2ed7fe98d4991"
+    "revision": "ceb44e4cdb58fbeea52301835bdd461817ddb57e"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -621,7 +621,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "6d2e955ee54084896461a307c1fdba0bb2024c86"
+    "revision": "b950ddf54c564fec0efead602268b6e0d3e5f26e"
   },
   "slint": {
     "revision": "f42fa5a44e8477f0443fcd3312a828ccba4f481e"
@@ -753,7 +753,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "feaae3e630e7f0208bba6fc60857a45457cc99e8"
+    "revision": "d2c875ad758885429a4d91f471a9590ab7c47aee"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
@@ -762,7 +762,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "78282918559ab0d8981d6366f2f1100f3102e540"
+    "revision": "e8cbd4d61606186061967a80a30f2f3b5b1b5025"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 2a95ff14764af20d32ec1edb27e11c38a84b9478 Mon Sep 17 00:00:00 2001
From: Liam Woodleigh-Hardinge <liam.woodleigh@gmail.com>
Date: Mon, 15 Apr 2024 13:01:56 +0200
Subject: [PATCH 1386/2704] feat(wit): Add wit parser (#6428)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat: Add injections.scm

fix: reverse order of matching

Co-authored-by: 再生花 <hoangtun0810@gmail.com>

fix: lua match for functions

doc: Resolve conflict

fix: Amend incorrect alphabetical order
---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++
 queries/wit/highlights.scm      | 81 +++++++++++++++++++++++++++++++++
 queries/wit/injections.scm      |  5 ++
 5 files changed, 98 insertions(+)
 create mode 100644 queries/wit/highlights.scm
 create mode 100644 queries/wit/injections.scm

diff --git a/README.md b/README.md
index 52540cafe..2bf7c9175 100644
--- a/README.md
+++ b/README.md
@@ -438,6 +438,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
 - [x] [wing](https://github.com/winglang/tree-sitter-wing) (maintained by @gshpychka, @MarkMcCulloh)
+- [x] [wit](https://github.com/liamwh/tree-sitter-wit) (maintained by @liamwh)
 - [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
 - [x] [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 5bf2f0ebf..529ad4e93 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -794,6 +794,9 @@
   "wing": {
     "revision": "5b6c2a5818a602557778d1bfc265d016cafa0712"
   },
+  "wit": {
+    "revision": "39e81d6b4b0d811a62bcde46c876bf32e1475b5b"
+  },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9f1cb76c3..8e69192cd 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2303,6 +2303,14 @@ list.wing = {
   maintainers = { "@gshpychka", "@MarkMcCulloh" },
 }
 
+list.wit = {
+  install_info = {
+    url = "https://github.com/liamwh/tree-sitter-wit",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@liamwh" },
+}
+
 list.xcompose = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-xcompose",
diff --git a/queries/wit/highlights.scm b/queries/wit/highlights.scm
new file mode 100644
index 000000000..237858ba2
--- /dev/null
+++ b/queries/wit/highlights.scm
@@ -0,0 +1,81 @@
+; Comments
+(line_comment) @comment
+
+(block_comment) @comment
+
+; Primitive Types
+[
+  "bool"
+  "s8"
+  "s16"
+  "s32"
+  "s64"
+  "u8"
+  "u16"
+  "u32"
+  "u64"
+  "float32"
+  "float64"
+  "char"
+  "string"
+  ; Container Types
+  "list"
+  "tuple"
+  "option"
+  "result"
+] @type.builtin
+
+"func" @keyword.function
+
+; Keywords for file structure and components
+[
+  "record"
+  "enum"
+  "variant"
+  "flags"
+  "resource"
+] @keyword.type
+
+; Keywords for importing and exporting
+[
+  "package"
+  "world"
+  "use"
+  "import"
+] @keyword.import
+
+; Resource Keywords
+"static" @keyword.modifier
+
+; Named Types (Capitalized identifiers)
+((identifier) @type
+  (#match? @type "^[A-Z]"))
+
+((identifier) @variable
+  (#match? @variable "^[a-z_][a-zA-Z0-9_]*$"))
+
+; Constants (UPPER_CASE names and Enums)
+((identifier) @constant
+  (#match? @constant "^[A-Z][A-Z0-9_]+$"))
+
+; Functions and Methods (lowercase names followed by parentheses)
+((identifier) @function
+  (#match? @function "^[a-z_][a-zA-Z0-9_]*%("))
+
+; Punctuation
+[
+  ";"
+  ":"
+  "->"
+] @punctuation.special
+
+; Delimiters
+"," @punctuation.delimiter
+
+; Brackets
+[
+  "{"
+  "}"
+  "("
+  ")"
+] @punctuation.bracket
diff --git a/queries/wit/injections.scm b/queries/wit/injections.scm
new file mode 100644
index 000000000..50b9b8fa9
--- /dev/null
+++ b/queries/wit/injections.scm
@@ -0,0 +1,5 @@
+((line_comment) @comment
+  (#set! injection.language "comment"))
+
+((block_comment) @comment
+  (#set! injection.language "comment"))

From 7099c9e5310ec3ef70f99e8c935c061ae9990cdd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 06:35:55 +0000
Subject: [PATCH 1387/2704] bot(lockfile): update diff, dtd, scala, slint,
 vimdoc, wing, wit, xml

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 529ad4e93..e0fcda382 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -111,7 +111,7 @@
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
   },
   "diff": {
-    "revision": "c165725c28e69b36c5799ff0e458713a844f1aaf"
+    "revision": "710e881127512bda8157096e26c1f3e91702823a"
   },
   "disassembly": {
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
@@ -129,7 +129,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "00363c3d8279adc7c729ac25f68179d1f8e91c60"
+    "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "earthfile": {
     "revision": "fda374bd4e908b3a34be097b94857e08c22b1ec3"
@@ -609,7 +609,7 @@
     "revision": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"
   },
   "scala": {
-    "revision": "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"
+    "revision": "d3eb6b2382f3051cca164f4cc41cdb5bf0876e10"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -624,7 +624,7 @@
     "revision": "b950ddf54c564fec0efead602268b6e0d3e5f26e"
   },
   "slint": {
-    "revision": "f42fa5a44e8477f0443fcd3312a828ccba4f481e"
+    "revision": "cce8df0a04e2db04ba7b5896a99139e4aac212a5"
   },
   "smali": {
     "revision": "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c"
@@ -780,7 +780,7 @@
     "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
   },
   "vimdoc": {
-    "revision": "a75a932449675bbd260213a95f4cd8b3193286f0"
+    "revision": "0b36856db88680f662cc67545c82af4ce83bf158"
   },
   "vue": {
     "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"
@@ -792,16 +792,16 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "5b6c2a5818a602557778d1bfc265d016cafa0712"
+    "revision": "d66dd90031f96ae05abec9cf8248cd7f70650f5f"
   },
   "wit": {
-    "revision": "39e81d6b4b0d811a62bcde46c876bf32e1475b5b"
+    "revision": "08c217866df739855d1cb16c3f62dad1fdfbb897"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "00363c3d8279adc7c729ac25f68179d1f8e91c60"
+    "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "yaml": {
     "revision": "ee093118211be521742b9866a8ed8ce6d87c7a94"

From 4c84b831082da6d3987edb0a51fabbcca6ceaa83 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 16 Apr 2024 17:09:09 -0700
Subject: [PATCH 1388/2704] fix(r): highlight comma separators

---
 queries/r/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)
 mode change 100755 => 100644 queries/r/highlights.scm

diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
old mode 100755
new mode 100644
index 784a54242..87b6ca36d
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -101,6 +101,8 @@
   "}"
 ] @punctuation.bracket
 
+"," @punctuation.delimiter
+
 (dollar
   _
   "$" @operator)

From 037c6af78fb50ec5ca9401c3fce437b95db8e09d Mon Sep 17 00:00:00 2001
From: Colin Kennedy <colinvfx@gmail.com>
Date: Tue, 16 Apr 2024 21:23:55 -0700
Subject: [PATCH 1389/2704] fix(python): captures inner string contents with
 spell

---
 queries/python/highlights.scm | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 4d62aeff0..4737fd401 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -204,19 +204,41 @@
   (comment)*
   .
   (expression_statement
-    (string) @string.documentation @spell))
+    (string) @string.documentation))
 
 (class_definition
   body: (block
     .
     (expression_statement
-      (string) @string.documentation @spell)))
+      (string) @string.documentation)))
 
 (function_definition
   body: (block
     .
     (expression_statement
-      (string) @string.documentation @spell)))
+      (string) @string.documentation)))
+
+(module
+  .
+  (comment)*
+  .
+  (expression_statement
+    (string
+      (string_content) @spell)))
+
+(class_definition
+  body: (block
+    .
+    (expression_statement
+      (string
+        (string_content) @spell))))
+
+(function_definition
+  body: (block
+    .
+    (expression_statement
+      (string
+        (string_content) @spell))))
 
 ; Tokens
 [

From b350369740e885c85f0f62dd8fe645c6f887ddc6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 06:38:18 +0000
Subject: [PATCH 1390/2704] bot(lockfile): update earthfile, groovy, norg,
 scala, slint, templ, v

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e0fcda382..7716b0466 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "earthfile": {
-    "revision": "fda374bd4e908b3a34be097b94857e08c22b1ec3"
+    "revision": "a079e6c472eeedd6b9a1e03ca0b6c82cd6a112a4"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -258,7 +258,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "b398a5a243c67f0b4d54728c983fa586bd5cd52e"
+    "revision": "6c5c8813233fe326e24c5ef032858d13f8006a8d"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -450,7 +450,7 @@
     "revision": "b3cda619248e7dd0f216088bd152f59ce0bbe488"
   },
   "norg": {
-    "revision": "ceb44e4cdb58fbeea52301835bdd461817ddb57e"
+    "revision": "dbe0bf559b379564bf63ffc139524fea0a983a95"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -609,7 +609,7 @@
     "revision": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"
   },
   "scala": {
-    "revision": "d3eb6b2382f3051cca164f4cc41cdb5bf0876e10"
+    "revision": "b76db435a7f876cf1ede837d66054c534783c72f"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -624,7 +624,7 @@
     "revision": "b950ddf54c564fec0efead602268b6e0d3e5f26e"
   },
   "slint": {
-    "revision": "cce8df0a04e2db04ba7b5896a99139e4aac212a5"
+    "revision": "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"
   },
   "smali": {
     "revision": "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c"
@@ -699,7 +699,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "1f9dae9c273136551684cb41461d00e565150e23"
+    "revision": "ba859a973d3e9a901c425134f4477e083a305ed5"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -762,7 +762,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "e8cbd4d61606186061967a80a30f2f3b5b1b5025"
+    "revision": "80b4a87c3b2f2ce572ce87cbe74dbb8de38ab8b1"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 3e10cffbb2a022cd8e2aaea9f4fffb514065e77c Mon Sep 17 00:00:00 2001
From: "Sergio A. Vargas" <savargasqu+git@unal.edu.co>
Date: Wed, 17 Apr 2024 13:59:37 -0500
Subject: [PATCH 1391/2704] Julia outer keyword (#6461)

---
 lockfile.json                | 2 +-
 queries/julia/highlights.scm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 7716b0466..13f8daa56 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -348,7 +348,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "0a80d33aca49dd257625ab25ef3a506e2b99a554"
+    "revision": "acd5ca12cc278df7960629c2429a096c7ac4bbea"
   },
   "just": {
     "revision": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 99aa9d1b3..18ef586ac 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -215,6 +215,9 @@
 (for_clause
   "for" @keyword.repeat)
 
+(for_binding
+  "outer" @keyword.repeat)
+
 [
   (break_statement)
   (continue_statement)

From 208d504421e4ac53f4230a34cd4b831e8e76cb69 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 06:37:44 +0000
Subject: [PATCH 1392/2704] bot(lockfile): update earthfile, hlsplaylist,
 muttrc, nim, norg, tmux, unison, v, zathurarc

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 13f8daa56..e288f1e96 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "earthfile": {
-    "revision": "a079e6c472eeedd6b9a1e03ca0b6c82cd6a112a4"
+    "revision": "cc888b4b02a29013db3a7183f5e33190c1435493"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -291,7 +291,7 @@
     "revision": "d200375a29b24764b78d7051df0024ed7c2f1ab0"
   },
   "hlsplaylist": {
-    "revision": "5305c061efce2841942dbbac6f9a5b21e3e4eb35"
+    "revision": "3e65f652b9dea8d38f9a44b5b0898a51c9247eb8"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -429,7 +429,7 @@
     "revision": "c2845c1c0b23e2faf6febfa72a042e5346374ebf"
   },
   "muttrc": {
-    "revision": "ce5b31451b3c0f90be884571b2ff4f569182f1d8"
+    "revision": "1a3d3c98de86689f2bb1e59c8db8067c6784aaed"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
@@ -438,7 +438,7 @@
     "revision": "58baf89db8fdae54a84bcf22c80ff10ee3f929ed"
   },
   "nim": {
-    "revision": "f5cec6a841b585e4e7388a120ded07e60ae19c43"
+    "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -450,7 +450,7 @@
     "revision": "b3cda619248e7dd0f216088bd152f59ce0bbe488"
   },
   "norg": {
-    "revision": "dbe0bf559b379564bf63ffc139524fea0a983a95"
+    "revision": "8ef790631cba8110c17361b3d0080326a7c86dd5"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -717,7 +717,7 @@
     "revision": "3c8ce503563ea04ba1cc07c468ed064b1974c3ba"
   },
   "tmux": {
-    "revision": "7499587642a46ee156e1bb58851904ac750dcc7c"
+    "revision": "1415bd8b5bb69c230947663deceb62c2a0ae4155"
   },
   "todotxt": {
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
@@ -753,7 +753,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "d2c875ad758885429a4d91f471a9590ab7c47aee"
+    "revision": "f34fbf337d4c8658e9a7d890d352b79ba2548a86"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
@@ -762,7 +762,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "80b4a87c3b2f2ce572ce87cbe74dbb8de38ab8b1"
+    "revision": "0f97daa1395e0b7ec91b3411c976c8a04d04f483"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -813,7 +813,7 @@
     "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
   },
   "zathurarc": {
-    "revision": "aad4302fb5a5176004b688fcab4ae7dcf36bf49a"
+    "revision": "09b837dc8f7445fd86e1245c23b1a7804229edd4"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From baaae36ac709f405c0ee5d39ef9ffd8d8160f1a3 Mon Sep 17 00:00:00 2001
From: Guilherme Soares <48023091+guilhas07@users.noreply.github.com>
Date: Fri, 19 Apr 2024 08:00:32 +0200
Subject: [PATCH 1393/2704] feat(templ): add highlights (#6464)

---
 queries/templ/highlights.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/queries/templ/highlights.scm b/queries/templ/highlights.scm
index e24dbeba8..034c91d5b 100644
--- a/queries/templ/highlights.scm
+++ b/queries/templ/highlights.scm
@@ -10,6 +10,8 @@
   (style_element)
 ] @tag
 
+(doctype) @constant
+
 (attribute
   name: (attribute_name) @tag.attribute)
 
@@ -41,6 +43,14 @@
 
 (element_comment) @comment @spell
 
+[
+  "<"
+  ">"
+  "</"
+  "/>"
+  "<!"
+] @tag.delimiter
+
 "@" @operator
 
 [

From dd0c1185967c91ad7b6a44809e2136c2e40df949 Mon Sep 17 00:00:00 2001
From: Alejandro <bloodbathalchemist@protonmail.com>
Date: Fri, 19 Apr 2024 03:24:29 -0400
Subject: [PATCH 1394/2704] feat(http): update queries to parser changes
 (#6467)

---
 queries/http/highlights.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index 8d9d0e640..efa77d27e 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -4,9 +4,6 @@
 ; Methods
 (method) @function.method
 
-; Constants
-(const_spec) @constant
-
 ; Headers
 (header
   name: (name) @constant)

From fea5808a58dc00b7131163886fe2648bbcae9dff Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 06:38:55 +0000
Subject: [PATCH 1395/2704] bot(lockfile): update earthfile, http, javascript,
 sql, tlaplus, unison, wit

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e288f1e96..17723a6d6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "earthfile": {
-    "revision": "cc888b4b02a29013db3a7183f5e33190c1435493"
+    "revision": "b05876f7c206fdaa57c5cefeaefdb2623927c77e"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -306,7 +306,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "a10b13eb63ab978969585d9c0fa80e77a9e82872"
+    "revision": "8d22f33faa5aa95c6526606fb656ada342e59e40"
   },
   "hurl": {
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
@@ -327,7 +327,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "ac10a11e0c8db512f70e6b798260d2516d22454c"
+    "revision": "aa08ce31d9ddcb1ada668ef1fc58fe0cd277efd1"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -651,7 +651,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "54f1f7da46bac43d2b562fe70cb3ac5905832387"
+    "revision": "25f94f998de79bae9df28add9782f9ea6ea0e2b8"
   },
   "squirrel": {
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
@@ -714,7 +714,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "3c8ce503563ea04ba1cc07c468ed064b1974c3ba"
+    "revision": "410122a012abb06fbacc8c0b8f288b684f8113e1"
   },
   "tmux": {
     "revision": "1415bd8b5bb69c230947663deceb62c2a0ae4155"
@@ -753,7 +753,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "f34fbf337d4c8658e9a7d890d352b79ba2548a86"
+    "revision": "a1eba0fef887800de97126e2c9ae4109c1c6a2ea"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
@@ -795,7 +795,7 @@
     "revision": "d66dd90031f96ae05abec9cf8248cd7f70650f5f"
   },
   "wit": {
-    "revision": "08c217866df739855d1cb16c3f62dad1fdfbb897"
+    "revision": "6f511f9c6676e597c2f0930e4d2629595319882d"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From bc808622986b0ba8eb64780b94d30cdfbd7c6a9f Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 19 Apr 2024 09:00:11 -0700
Subject: [PATCH 1396/2704] fix(vimscript): miscellaneous fixups

- Highlights the `abort` keyword
- Moves `is(not)?` from `@operator` to `@keyword.operator`
- Highlights the `->` operator
---
 queries/vim/highlights.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 2950278f9..14e5a8128 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -126,6 +126,7 @@
   "view"
   "eval"
   "sign"
+  "abort"
 ] @keyword
 
 (map_statement
@@ -277,8 +278,6 @@
   "/"
   "%"
   ".."
-  "is"
-  "isnot"
   "=="
   "!="
   ">"
@@ -297,9 +296,15 @@
   "..="
   "<<"
   "=<<"
+  "->"
   (match_case)
 ] @operator
 
+[
+  "is"
+  "isnot"
+] @keyword.operator
+
 ; Some characters have different meanings based on the context
 (unary_operation
   "!" @operator)

From d8bf42b2621f5af274ccd4ac3f742caea04723b4 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 20 Apr 2024 00:29:52 +0300
Subject: [PATCH 1397/2704] feat(dockerfile): adapt for parser update

---
 lockfile.json                     | 2 +-
 lua/nvim-treesitter/parsers.lua   | 2 +-
 queries/dockerfile/highlights.scm | 9 +++++++++
 queries/dockerfile/injections.scm | 8 +++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 17723a6d6..e3e33d021 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -120,7 +120,7 @@
     "revision": "63f176e7db5fca073b55b98b7e5e95afd1587fcb"
   },
   "dockerfile": {
-    "revision": "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"
+    "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
   },
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8e69192cd..b1f9ececd 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -413,7 +413,7 @@ list.djot = {
 list.dockerfile = {
   install_info = {
     url = "https://github.com/camdencheek/tree-sitter-dockerfile",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@camdencheek" },
 }
diff --git a/queries/dockerfile/highlights.scm b/queries/dockerfile/highlights.scm
index 762e34426..5a8f0c7cc 100644
--- a/queries/dockerfile/highlights.scm
+++ b/queries/dockerfile/highlights.scm
@@ -36,6 +36,15 @@
 
 (double_quoted_string) @string
 
+[
+  (heredoc_marker)
+  (heredoc_end)
+] @label
+
+((heredoc_block
+  (heredoc_line) @string)
+  (#set! "priority" 90))
+
 (expansion
   [
     "$"
diff --git a/queries/dockerfile/injections.scm b/queries/dockerfile/injections.scm
index 0304f982e..5d3bbffb7 100644
--- a/queries/dockerfile/injections.scm
+++ b/queries/dockerfile/injections.scm
@@ -1,6 +1,12 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-((shell_command) @injection.content
+((shell_command
+  (shell_fragment) @injection.content)
+  (#set! injection.language "bash")
+  (#set! injection.combined))
+
+((run_instruction
+  (heredoc_block) @injection.content)
   (#set! injection.language "bash")
   (#set! injection.include-children))

From eb93c3b2fbe9ca55d70e9297d5c037880b997559 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2024 06:36:41 +0000
Subject: [PATCH 1398/2704] bot(lockfile): update astro, earthfile, javascript,
 norg, ssh_config, wing

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e3e33d021..98166d57f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
   },
   "astro": {
-    "revision": "dfa0893bdc4bdfada102043404758c66e3580568"
+    "revision": "4e766a11148e174a109851d746e8ab8fc43ef419"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
@@ -132,7 +132,7 @@
     "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "earthfile": {
-    "revision": "b05876f7c206fdaa57c5cefeaefdb2623927c77e"
+    "revision": "7d5cc9e27e3e340c8b521d11c8da84047494fe30"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -327,7 +327,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "aa08ce31d9ddcb1ada668ef1fc58fe0cd277efd1"
+    "revision": "fff4560044bdc51d9f6995f1edc797b7cd72b9dc"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -450,7 +450,7 @@
     "revision": "b3cda619248e7dd0f216088bd152f59ce0bbe488"
   },
   "norg": {
-    "revision": "8ef790631cba8110c17361b3d0080326a7c86dd5"
+    "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -657,7 +657,7 @@
     "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
   },
   "ssh_config": {
-    "revision": "514695df4985f56455b8f139a319453a2325cdcf"
+    "revision": "77450e8bce8853921512348f83c73c168c71fdfb"
   },
   "starlark": {
     "revision": "b31a616aac5d05f927f3f9dd809789db7805b632"
@@ -792,7 +792,7 @@
     "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
   },
   "wing": {
-    "revision": "d66dd90031f96ae05abec9cf8248cd7f70650f5f"
+    "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
     "revision": "6f511f9c6676e597c2f0930e4d2629595319882d"

From a005f6fec9b508fd85b5710ca0a556e2eba81569 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2024 12:51:11 +0000
Subject: [PATCH 1399/2704] bot(lockfile): update bicep, capnp, cpon, firrtl,
 hare, luau, po, pony, puppet, ron, smali, squirrel, tablegen, templ, thrift,
 v, yuck

---
 lockfile.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 98166d57f..e14c00fae 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -39,7 +39,7 @@
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
   },
   "bicep": {
-    "revision": "c3451d1049c80074b18078ba50007b7c00e063f8"
+    "revision": "0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0"
   },
   "bitbake": {
     "revision": "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"
@@ -57,7 +57,7 @@
     "revision": "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"
   },
   "capnp": {
-    "revision": "dc28c9f4212809eab74d10996086297853eb34e5"
+    "revision": "7b0883c03e5edd34ef7bcf703194204299d7099f"
   },
   "chatito": {
     "revision": "fe7a2a75d3d74c1215141b7a7ebebb57ae17a370"
@@ -81,7 +81,7 @@
     "revision": "604d73c38d4c28ca68e9e441ffd405d68cb63051"
   },
   "cpon": {
-    "revision": "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"
+    "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
     "revision": "72fd00128f1c38319670cbf4bcedbba0dc849d96"
@@ -174,7 +174,7 @@
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
   },
   "firrtl": {
-    "revision": "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"
+    "revision": "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5"
   },
   "fish": {
     "revision": "a78aef9abc395c600c38a037ac779afc7e3cc9e0"
@@ -267,7 +267,7 @@
     "revision": "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"
   },
   "hare": {
-    "revision": "3d4af179414525a35dd069ba0208c9b71093d8b3"
+    "revision": "070524937539eb8bb4f10debd9c83b66c434f3a2"
   },
   "haskell": {
     "revision": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be"
@@ -399,7 +399,7 @@
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
   },
   "luau": {
-    "revision": "e5f7a020967407f73959592decdb147bb5fc30bb"
+    "revision": "5b088fac748f2666a315cafd1638a214388eb23e"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -501,7 +501,7 @@
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
   },
   "po": {
-    "revision": "d6aed225290bc71a15ab6f06305cb11419360c56"
+    "revision": "bd860a0f57f697162bf28e576674be9c1500db5e"
   },
   "pod": {
     "revision": "39da859947b94abdee43e431368e1ae975c0a424"
@@ -510,7 +510,7 @@
     "revision": "592476d81f95d2451f2ca107dc872224c76fecdf"
   },
   "pony": {
-    "revision": "16f930b250433cfcd4fb4144df92bb98ad344c20"
+    "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "printf": {
     "revision": "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"
@@ -537,7 +537,7 @@
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
   },
   "puppet": {
-    "revision": "5849f9694197a6e822872945b415429c285fdd54"
+    "revision": "584522f32495d648b18a53ccb52d988e60de127d"
   },
   "purescript": {
     "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
@@ -597,7 +597,7 @@
     "revision": "7df2c0892e62efb81a7504d9799d4e0d0443d241"
   },
   "ron": {
-    "revision": "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"
+    "revision": "f0ddc95a4b7bb21a7308642255a80f5496e69c5b"
   },
   "rst": {
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
@@ -627,7 +627,7 @@
     "revision": "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"
   },
   "smali": {
-    "revision": "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c"
+    "revision": "3f6517855898ef23023e5d64a8b175d4ee8d646e"
   },
   "smithy": {
     "revision": "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"
@@ -654,7 +654,7 @@
     "revision": "25f94f998de79bae9df28add9782f9ea6ea0e2b8"
   },
   "squirrel": {
-    "revision": "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"
+    "revision": "f93fd2864dd05cc39b0490145fd86a1a93bfa3a3"
   },
   "ssh_config": {
     "revision": "77450e8bce8853921512348f83c73c168c71fdfb"
@@ -690,7 +690,7 @@
     "revision": "6182836f4128725f1e74ce986840d7317021a015"
   },
   "tablegen": {
-    "revision": "300f6a490e71f895e644ed2deec6920860a2e107"
+    "revision": "6b7eb096621443627cc5e29c8c34ff1fde482cf3"
   },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
@@ -699,7 +699,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "ba859a973d3e9a901c425134f4477e083a305ed5"
+    "revision": "e2218a2376e3ff18c9963b21aa567770baab0462"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -708,7 +708,7 @@
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
   },
   "thrift": {
-    "revision": "d4deb1bd9e848f2dbe81103a151d99e8546de480"
+    "revision": "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"
   },
   "tiger": {
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
@@ -762,7 +762,7 @@
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
   },
   "v": {
-    "revision": "0f97daa1395e0b7ec91b3411c976c8a04d04f483"
+    "revision": "7e11a6f8f369df935664fadd2f0c99d90fe3226f"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -810,7 +810,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "c348825d3f86dec71dee0e1223c6bd73114e3579"
+    "revision": "a513732feb813426b51d1ead8397a9c285c411be"
   },
   "zathurarc": {
     "revision": "09b837dc8f7445fd86e1245c23b1a7804229edd4"

From ea4f6d5175812a3f48302d638a766bc18fcbb04a Mon Sep 17 00:00:00 2001
From: virchau13 <virchau13@hexular.net>
Date: Sat, 20 Apr 2024 21:31:54 +0800
Subject: [PATCH 1400/2704] feat(astro): update injections to match parser
 rewrite (#6478)

---
 lockfile.json                |  2 +-
 queries/astro/injections.scm | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e14c00fae..edc9965c1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
   },
   "astro": {
-    "revision": "4e766a11148e174a109851d746e8ab8fc43ef419"
+    "revision": "b422ccd41f0b433260a3d28df7e39fa2ff63ef9c"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
diff --git a/queries/astro/injections.scm b/queries/astro/injections.scm
index 717712ad5..4d868c58f 100644
--- a/queries/astro/injections.scm
+++ b/queries/astro/injections.scm
@@ -1,12 +1,16 @@
 ; inherits: html_tags
 
 (frontmatter
-  (raw_text) @injection.content
+  (frontmatter_js_block) @injection.content
   (#set! injection.language "typescript"))
 
-(interpolation
-  (raw_text) @injection.content
-  (#set! injection.language "tsx"))
+(attribute_interpolation
+  (attribute_js_expr) @injection.content
+  (#set! injection.language "typescript"))
+
+(html_interpolation
+  (permissible_text) @injection.content
+  (#set! injection.language "typescript"))
 
 (script_element
   (raw_text) @injection.content

From 9b1c2096e0b353ab44bc5fb242306dde50761109 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 21 Apr 2024 06:36:54 +0000
Subject: [PATCH 1401/2704] bot(lockfile): update astro, djot, earthfile

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index edc9965c1..5cd54248a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
   },
   "astro": {
-    "revision": "b422ccd41f0b433260a3d28df7e39fa2ff63ef9c"
+    "revision": "1aab99ed2af477fe4283365226589908809a696d"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "63f176e7db5fca073b55b98b7e5e95afd1587fcb"
+    "revision": "cd47aa66e7cf7645c7feb35d5e73dfe8617c679e"
   },
   "dockerfile": {
     "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
@@ -132,7 +132,7 @@
     "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "earthfile": {
-    "revision": "7d5cc9e27e3e340c8b521d11c8da84047494fe30"
+    "revision": "513598b175928b6989e02bfc7ff73332955dcbf9"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"

From 28aebb7308a3b3070d38d7041f692469b7f37e6c Mon Sep 17 00:00:00 2001
From: Vir Chaudhury <virchau13@hexular.net>
Date: Sun, 21 Apr 2024 09:18:24 +0800
Subject: [PATCH 1402/2704] feat(astro): add backtick string injections

This also updates a highlight to be more accurate
and bumps the lockfile to fix a few bugs.
---
 lockfile.json                | 2 +-
 queries/astro/injections.scm | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 5cd54248a..12cdfab48 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
   },
   "astro": {
-    "revision": "1aab99ed2af477fe4283365226589908809a696d"
+    "revision": "506515c1dce4220fc9db278ce9eae2ad4e239cff"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
diff --git a/queries/astro/injections.scm b/queries/astro/injections.scm
index 4d868c58f..d4f15ba56 100644
--- a/queries/astro/injections.scm
+++ b/queries/astro/injections.scm
@@ -8,6 +8,10 @@
   (attribute_js_expr) @injection.content
   (#set! injection.language "typescript"))
 
+(attribute
+  (attribute_backtick_string) @injection.content
+  (#set! injection.language "typescript"))
+
 (html_interpolation
   (permissible_text) @injection.content
   (#set! injection.language "typescript"))

From 1e20226231add3f8fad4e28fd66a68e3ae370b93 Mon Sep 17 00:00:00 2001
From: Tomasz N <przepompownia@users.noreply.github.com>
Date: Sun, 21 Apr 2024 21:09:52 +0200
Subject: [PATCH 1403/2704] feat(php): fold consecutive imports (#6482)

* feat(php): fold consecutive imports

* Inslude possible comment too

* Format query

* Revert respecting comments
---
 queries/php_only/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/php_only/folds.scm b/queries/php_only/folds.scm
index 56eb33e77..43453b174 100644
--- a/queries/php_only/folds.scm
+++ b/queries/php_only/folds.scm
@@ -13,4 +13,5 @@
   (enum_declaration)
   (function_static_declaration)
   (method_declaration)
+  (namespace_use_declaration)+
 ] @fold

From 075b7594cac0cc353cfc4cea5f39268b0a3e5646 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 06:36:52 +0000
Subject: [PATCH 1404/2704] bot(lockfile): update arduino, djot, hlsplaylist,
 muttrc, readline, swift, templ, tmux, unison, zathurarc

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 12cdfab48..f535a58ec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
   },
   "arduino": {
-    "revision": "4ddf79edaa87170ec12bd6a8d03a8ac528fe0ae7"
+    "revision": "8518c3fa6b8562af545a496d55c9abd78f53e732"
   },
   "asm": {
     "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "cd47aa66e7cf7645c7feb35d5e73dfe8617c679e"
+    "revision": "66e1b8a51e297971795b7a8c9d3d271237174538"
   },
   "dockerfile": {
     "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
@@ -291,7 +291,7 @@
     "revision": "d200375a29b24764b78d7051df0024ed7c2f1ab0"
   },
   "hlsplaylist": {
-    "revision": "3e65f652b9dea8d38f9a44b5b0898a51c9247eb8"
+    "revision": "936d399ed501c12636cf6d3a417063e49c98cee5"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -429,7 +429,7 @@
     "revision": "c2845c1c0b23e2faf6febfa72a042e5346374ebf"
   },
   "muttrc": {
-    "revision": "1a3d3c98de86689f2bb1e59c8db8067c6784aaed"
+    "revision": "394e4e88ada3bad05054193e204c5cb592f6630d"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
@@ -576,7 +576,7 @@
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
   },
   "readline": {
-    "revision": "e436eaef452266a3d00c195f0eb757d6502c767a"
+    "revision": "3d4768b04d7cfaf40533e12b28672603428b8f31"
   },
   "regex": {
     "revision": "ba22e4e0cb42b2ef066948d0ea030ac509cef733"
@@ -678,7 +678,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "e2f0b7cf8136b801e4743790b7a956ab29a4d6b0"
+    "revision": "c982633802f3c099663addff29e56d27800965d8"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -699,7 +699,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "e2218a2376e3ff18c9963b21aa567770baab0462"
+    "revision": "4bedd882d47c55f22226307fe6bc6a7a87a94f43"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -717,7 +717,7 @@
     "revision": "410122a012abb06fbacc8c0b8f288b684f8113e1"
   },
   "tmux": {
-    "revision": "1415bd8b5bb69c230947663deceb62c2a0ae4155"
+    "revision": "d3cacd0821b90d42ac57ec1388a55987ea30cc03"
   },
   "todotxt": {
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
@@ -753,7 +753,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "a1eba0fef887800de97126e2c9ae4109c1c6a2ea"
+    "revision": "056a926d8998e24eaa687755767b83217901a1cc"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
@@ -813,7 +813,7 @@
     "revision": "a513732feb813426b51d1ead8397a9c285c411be"
   },
   "zathurarc": {
-    "revision": "09b837dc8f7445fd86e1245c23b1a7804229edd4"
+    "revision": "2266ac3315e873e37edd24d7e6b6513b8798dab3"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 46f8778fbf7218fe878f006fadd80d25c2dfb6aa Mon Sep 17 00:00:00 2001
From: Alexei Mozaidze <lexerpexer@proton.me>
Date: Mon, 22 Apr 2024 13:57:55 +0400
Subject: [PATCH 1405/2704] feat(fennel)!: update parser and queries (#6460)

---
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   3 +-
 queries/fennel/folds.scm        |  67 ++++++++-----
 queries/fennel/highlights.scm   | 173 ++++++++++++++++----------------
 queries/fennel/injections.scm   |  82 +++++++--------
 queries/fennel/locals.scm       |  66 ++++++++----
 6 files changed, 213 insertions(+), 180 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f535a58ec..83319c029 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -168,7 +168,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "215e3913524abc119daa9db7cf6ad2f2f5620189"
+    "revision": "ea4a536bca8997e30b22709f210f44f97e75bf7d"
   },
   "fidl": {
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b1f9ececd..18f5ceb63 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -547,7 +547,8 @@ list.faust = {
 list.fennel = {
   install_info = {
     url = "https://github.com/alexmozaidze/tree-sitter-fennel",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
+    generate_requires_npm = true,
   },
   maintainers = { "@alexmozaidze" },
 }
diff --git a/queries/fennel/folds.scm b/queries/fennel/folds.scm
index ad65bf78c..0862e5926 100644
--- a/queries/fennel/folds.scm
+++ b/queries/fennel/folds.scm
@@ -1,34 +1,51 @@
+; compounds
 [
   (list)
   (table)
   (sequence)
 ] @fold
 
-(list
-  .
-  (symbol) @_let
-  (#eq? @_let "let")
-  .
-  (sequence) @fold) @fold
+; sub-forms / special compounds
+[
+  (list_binding)
+  (table_binding)
+  (sequence_binding)
+  (table_metadata)
+  (sequence_arguments)
+  (let_vars)
+  (case_guard_or_special)
+  (case_guard)
+  (case_catch)
+] @fold
 
-(list
-  .
-  (symbol) @_local
-  (#eq? @_local "local")) @fold
+; forms
+[
+  (quote_form)
+  (unquote_form)
+  (local_form)
+  (var_form)
+  (set_form)
+  (global_form)
+  (let_form)
+  (fn_form)
+  (lambda_form)
+  (hashfn_form)
+  (each_form)
+  (collect_form)
+  (icollect_form)
+  (accumulate_form)
+  (for_form)
+  (fcollect_form)
+  (faccumulate_form)
+  (case_form)
+  (match_form)
+  (case_try_form)
+  (match_try_form)
+] @fold
 
-(list
-  .
-  (symbol) @_global
-  (#eq? @_global "global")) @fold
-
-(list
-  .
-  (symbol) @_fn
-  (#any-of? @_fn "fn" "lambda" "λ" "hashfn")) @fold
-
-(reader_macro
-  macro: [
-    "'"
-    "`"
-  ]
+; reader macros
+(quote_reader_macro
+  expression: (_) @fold)
+
+(quasi_quote_reader_macro
   expression: (_) @fold)
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
index e58b35883..2f0b5f738 100644
--- a/queries/fennel/highlights.scm
+++ b/queries/fennel/highlights.scm
@@ -12,44 +12,97 @@
   "]"
 ] @punctuation.bracket
 
-(nil) @constant.builtin
+[
+  (nil)
+  (nil_binding)
+] @constant.builtin
 
-(boolean) @boolean
+[
+  (boolean)
+  (boolean_binding)
+] @boolean
 
-(number) @number
+[
+  (number)
+  (number_binding)
+] @number
 
-(string) @string
+[
+  (string)
+  (string_binding)
+] @string
+
+[
+  (symbol)
+  (symbol_binding)
+] @variable
+
+(symbol_option) @keyword.directive
 
 (escape_sequence) @string.escape
 
-(symbol) @variable
-
 (multi_symbol
   "." @punctuation.delimiter
   member: (symbol_fragment) @variable.member)
 
 (list
-  .
-  (symbol) @function.call)
+  call: (symbol) @function.call)
 
 (list
-  .
-  (multi_symbol
+  call: (multi_symbol
     member: (symbol_fragment) @function.call .))
 
 (multi_symbol_method
   ":" @punctuation.delimiter
-  method: (symbol_fragment) @function.method.call .)
+  method: (symbol_fragment) @function.method.call)
 
-; Just `&` is only used in destructuring
-((symbol) @punctuation.special
-  (#eq? @punctuation.special "&"))
+(quasi_quote_reader_macro
+  macro: _ @punctuation.special)
+
+(quote_reader_macro
+  macro: _ @punctuation.special)
+
+(unquote_reader_macro
+  macro: _ @punctuation.special)
+
+(hashfn_reader_macro
+  macro: _ @keyword.function)
+
+(sequence_arguments
+  (symbol_binding) @variable.parameter)
+
+(sequence_arguments
+  (rest_binding
+    rhs: (symbol_binding) @variable.parameter))
+
+(docstring) @string.documentation
+
+(fn_form
+  name: [
+    (symbol) @function
+    (multi_symbol
+      member: (symbol_fragment) @function .)
+  ])
+
+(lambda_form
+  name: [
+    (symbol) @function
+    (multi_symbol
+      member: (symbol_fragment) @function .)
+  ])
+
+; NOTE: The macro name is highlighted as @variable because it
+; gives a nicer contrast instead of everything being the same
+; color. Rust queries use this workaround too for `macro_rules!`.
+(macro_form
+  name: [
+    (symbol) @variable
+    (multi_symbol
+      member: (symbol_fragment) @variable .)
+  ])
 
-; BUG: $ arguments should only be valid inside hashfn of any depth, but
-; it's impossible to express such query at the moment of writing.
-; See tree-sitter/tree-sitter#880
 ((symbol) @variable.parameter
-  (#eq? @variable.parameter "$..."))
+  (#any-of? @variable.parameter "$" "$..."))
 
 ((symbol) @variable.parameter
   (#lua-match? @variable.parameter "^%$[1-9]$"))
@@ -74,8 +127,11 @@
     ; other
     "length"))
 
-(reader_macro
-  macro: "#" @keyword.function)
+(case_guard
+  call: (_) @keyword.conditional)
+
+(case_guard_or_special
+  call: (_) @keyword.conditional)
 
 ((symbol) @keyword.function
   (#any-of? @keyword.function "fn" "lambda" "λ" "hashfn"))
@@ -84,7 +140,7 @@
   (#any-of? @keyword.repeat "for" "each" "while"))
 
 ((symbol) @keyword.conditional
-  (#any-of? @keyword.conditional "if" "when" "match" "case"))
+  (#any-of? @keyword.conditional "if" "when" "match" "case" "match-try" "case-try"))
 
 ((symbol) @keyword
   (#any-of? @keyword
@@ -92,13 +148,21 @@
     "quote" "tset" "values" "tail!"))
 
 ((symbol) @keyword.import
-  (#any-of? @keyword.import "require" "require-macros" "import-macros" "include"))
+  (#any-of? @keyword.import "require-macros" "import-macros" "include"))
 
 ((symbol) @function.macro
   (#any-of? @function.macro
     "collect" "icollect" "fcollect" "accumulate" "faccumulate" "->" "->>" "-?>" "-?>>" "?." "doto"
     "macro" "macrodebug" "partial" "pick-args" "pick-values" "with-open"))
 
+(case_catch
+  call: (symbol) @keyword)
+
+(import_macros_form
+  imports: (table_binding
+    (table_binding_pair
+      value: (symbol_binding) @function.macro)))
+
 ; TODO: Highlight builtin methods (`table.unpack`, etc) as @function.builtin
 ([
   (symbol) @module.builtin
@@ -127,68 +191,3 @@
     "assert" "collectgarbage" "dofile" "error" "getmetatable" "ipairs" "load" "loadfile" "next"
     "pairs" "pcall" "print" "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setmetatable"
     "tonumber" "tostring" "type" "warn" "xpcall" "module" "setfenv" "loadstring" "unpack"))
-
-(table
-  (table_pair
-    key: (symbol) @keyword.directive
-    (#eq? @keyword.directive "&as")))
-
-(list
-  .
-  (symbol) @keyword.function
-  (#any-of? @keyword.function "fn" "lambda" "λ")
-  .
-  [
-    (symbol) @function
-    (multi_symbol
-      (symbol_fragment) @function .)
-  ]
-  .
-  (sequence
-    ((symbol) @variable.parameter
-      (#not-any-of? @variable.parameter "&" "..."))))
-
-(list
-  .
-  (symbol) @function.macro
-  (#any-of? @function.macro "collect" "icollect" "fcollect")
-  .
-  (sequence
-    [
-      (symbol)
-      (string)
-    ] @keyword.directive
-    (#any-of? @keyword.directive "&into" ":into")))
-
-(list
-  .
-  (symbol) @function.macro
-  (#any-of? @function.macro "for" "each" "collect" "icollect" "fcollect" "accumulate" "faccumulate")
-  .
-  (sequence
-    [
-      (symbol)
-      (string)
-    ] @keyword.directive
-    (#any-of? @keyword.directive "&until" ":until")))
-
-(list
-  .
-  (symbol) @keyword.conditional
-  (#any-of? @keyword.conditional "match" "case")
-  .
-  (_)
-  .
-  ((list
-    .
-    (symbol) @keyword
-    (#eq? @keyword "where"))
-    .
-    (_))*
-  .
-  (list
-    .
-    (symbol) @keyword
-    (#eq? @keyword "where"))
-  .
-  (_)? .)
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
index b6b0bbcfe..f6724d328 100644
--- a/queries/fennel/injections.scm
+++ b/queries/fennel/injections.scm
@@ -1,46 +1,42 @@
-((comment) @injection.content
+((comment_body) @injection.content
   (#set! injection.language "comment"))
 
 (list
-  .
-  (multi_symbol) @_vimcmd_identifier
+  call: (multi_symbol) @_vimcmd_identifier
   (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec2")
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "vim")))
 
 ; NOTE: Matches *exactly* `ffi.cdef`
 (list
-  .
-  (multi_symbol) @_cdef_identifier
+  call: (multi_symbol) @_cdef_identifier
   (#eq? @_cdef_identifier "ffi.cdef")
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "c")))
 
 (list
-  .
-  (multi_symbol) @_ts_query_identifier
+  call: (multi_symbol) @_ts_query_identifier
   (#any-of? @_ts_query_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse")
   .
-  (_)
+  item: (_)
   .
-  (_)
+  item: (_)
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "query")))
 
 (list
-  .
-  (multi_symbol) @_vimcmd_identifier
+  call: (multi_symbol) @_vimcmd_identifier
   (#eq? @_vimcmd_identifier "vim.api.nvim_create_autocmd")
   .
-  (_)
+  item: (_)
   .
-  (table
+  item: (table
     (table_pair
       key: (string
         (string_content) @_command
@@ -50,54 +46,50 @@
         (#set! injection.language "vim")))))
 
 (list
-  .
-  (multi_symbol) @_user_cmd
+  call: (multi_symbol) @_user_cmd
   (#eq? @_user_cmd "vim.api.nvim_create_user_command")
   .
-  (_)
+  item: (_)
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "vim")))
 
 (list
-  .
-  (multi_symbol) @_user_cmd
+  call: (multi_symbol) @_user_cmd
   (#eq? @_user_cmd "vim.api.nvim_buf_create_user_command")
   .
-  (_)
+  item: (_)
   .
-  (_)
+  item: (_)
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "vim")))
 
 (list
-  .
-  (multi_symbol) @_map
+  call: (multi_symbol) @_map
   (#any-of? @_map "vim.api.nvim_set_keymap" "vim.keymap.set")
   .
-  (_)
+  item: (_)
   .
-  (_)
+  item: (_)
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "vim")))
 
 (list
-  .
-  (multi_symbol) @_map
+  call: (multi_symbol) @_map
   (#eq? @_map "vim.api.nvim_buf_set_keymap")
   .
-  (_)
+  item: (_)
   .
-  (_)
+  item: (_)
   .
-  (_)
+  item: (_)
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "vim")))
 
@@ -107,40 +99,36 @@
   (#lua-match? @injection.content "^%s*;+%s?query")
   (#set! injection.language "query"))
 
-; ──────────────────────────────────────────────────────────────────────
 ; (string.match "123" "%d+")
 (list
-  .
-  (multi_symbol
+  call: (multi_symbol
     member: (symbol_fragment) @_func
     .
     (#any-of? @_func "find" "match" "gmatch" "gsub"))
   .
-  (_)
+  item: (_)
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "luap")
     (#set! injection.include-children)))
 
 ; (my-string:match "%d+")
 (list
-  .
-  (multi_symbol_method
+  call: (multi_symbol_method
     method: (symbol_fragment) @_method
     (#any-of? @_method "find" "match" "gmatch" "gsub"))
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "luap")
     (#set! injection.include-children)))
 
 ; (string.format "pi = %.2f" 3.14159)
 (list
-  .
-  (multi_symbol) @_func
+  call: (multi_symbol) @_func
   (#eq? @_func "string.format")
   .
-  (string
+  item: (string
     (string_content) @injection.content
     (#set! injection.language "printf")))
diff --git a/queries/fennel/locals.scm b/queries/fennel/locals.scm
index 4aac44c6b..be63e728f 100644
--- a/queries/fennel/locals.scm
+++ b/queries/fennel/locals.scm
@@ -1,28 +1,56 @@
-; TODO: Add tests
-; TODO: Improve queries
 (program) @local.scope
 
-((list
-  .
-  (symbol) @_call) @local.scope
-  (#any-of? @_call
-    "let" "fn" "lambda" "λ" "while" "each" "for" "if" "when" "do" "collect" "icollect" "accumulate"
-    "case" "match"))
-
 (symbol) @local.reference
 
+[
+  (let_form)
+  (fn_form)
+  (lambda_form)
+  (each_form)
+  (for_form)
+  (collect_form)
+  (icollect_form)
+  (accumulate_form)
+  (for_form)
+  (fcollect_form)
+  (faccumulate_form)
+  (case_form)
+  (match_form)
+  (case_try_form)
+  (match_try_form)
+  (if_form)
+] @local.scope
+
 (list
-  .
-  (symbol) @_fn
-  (#any-of? @_fn "fn" "lambda" "λ")
-  .
-  [
+  call: (symbol) @_call
+  (#any-of? @_call "while" "when" "do")) @local.scope
+
+(fn_form
+  name: [
     (symbol) @local.definition.function
     (multi_symbol
       member: (symbol_fragment) @local.definition.function .)
   ]
-  (#set! definition.function.scope "parent")
-  .
-  (sequence
-    (symbol)* @local.definition.parameter
-    (#not-contains? @local.definition.parameter "&")))
+  args: (sequence_arguments
+    (symbol_binding) @local.definition.parameter)
+  (#set! definition.function.scope "parent"))
+
+(lambda_form
+  name: [
+    (symbol) @local.definition.function
+    (multi_symbol
+      member: (symbol_fragment) @local.definition.function .)
+  ]
+  args: (sequence_arguments
+    (symbol_binding) @local.definition.parameter)
+  (#set! definition.function.scope "parent"))
+
+(macro_form
+  name: [
+    (symbol) @local.definition.function
+    (multi_symbol
+      member: (symbol_fragment) @local.definition.function .)
+  ]
+  args: (sequence_arguments
+    (symbol_binding) @local.definition.parameter)
+  (#set! definition.function.scope "parent"))

From c1d1b4084ef5239e2671f64d35962d184251aea4 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:36:49 +0000
Subject: [PATCH 1406/2704] bot(lockfile): update djot, fennel, hlsplaylist,
 muttrc, swift, tlaplus, tmux, typst, wit, zathurarc

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 83319c029..6b3ca7b51 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "66e1b8a51e297971795b7a8c9d3d271237174538"
+    "revision": "9d3fddf9ba8e9bd45c999d769a08d2515608ed5e"
   },
   "dockerfile": {
     "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
@@ -168,7 +168,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "ea4a536bca8997e30b22709f210f44f97e75bf7d"
+    "revision": "e9e3e3f75e80e602b0d42fa3f713f2531fff16fd"
   },
   "fidl": {
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
@@ -291,7 +291,7 @@
     "revision": "d200375a29b24764b78d7051df0024ed7c2f1ab0"
   },
   "hlsplaylist": {
-    "revision": "936d399ed501c12636cf6d3a417063e49c98cee5"
+    "revision": "64f19029339e75d6762feae39e7878595860c980"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -429,7 +429,7 @@
     "revision": "c2845c1c0b23e2faf6febfa72a042e5346374ebf"
   },
   "muttrc": {
-    "revision": "394e4e88ada3bad05054193e204c5cb592f6630d"
+    "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
   },
   "nasm": {
     "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
@@ -678,7 +678,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "c982633802f3c099663addff29e56d27800965d8"
+    "revision": "ee04ee19910bb9ea6daf14be7d1e5362a208207d"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -714,10 +714,10 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "410122a012abb06fbacc8c0b8f288b684f8113e1"
+    "revision": "932d41c0f5b1884a84560718ab063af9259f126b"
   },
   "tmux": {
-    "revision": "d3cacd0821b90d42ac57ec1388a55987ea30cc03"
+    "revision": "9138ea508410e0f34da2666609f600f65e944f22"
   },
   "todotxt": {
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
@@ -744,7 +744,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "13863ddcbaa7b68ee6221cea2e3143415e64aea4"
+    "revision": "4610172f312e8ce5184e6882be5ad1a1cd800fbe"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
@@ -795,7 +795,7 @@
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
-    "revision": "6f511f9c6676e597c2f0930e4d2629595319882d"
+    "revision": "ed13e0a3ee77833900a095d57d2685a1f7f91237"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
@@ -813,7 +813,7 @@
     "revision": "a513732feb813426b51d1ead8397a9c285c411be"
   },
   "zathurarc": {
-    "revision": "2266ac3315e873e37edd24d7e6b6513b8798dab3"
+    "revision": "e9e8de071ab79ed1f6e3365f05fcf890b6d85a2f"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From dc71d94fe223763d28ab49ee3de4fd7081a84891 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 06:38:18 +0000
Subject: [PATCH 1407/2704] bot(lockfile): update djot, fennel, mermaid, query,
 tlaplus, vim, vimdoc

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6b3ca7b51..4fdd6071e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "9d3fddf9ba8e9bd45c999d769a08d2515608ed5e"
+    "revision": "7be89f13c3a5e3c2ed34d29310259158ebe2e493"
   },
   "dockerfile": {
     "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
@@ -168,7 +168,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "e9e3e3f75e80e602b0d42fa3f713f2531fff16fd"
+    "revision": "325a3315be968b3d8ecdc5c414159be3c8bab212"
   },
   "fidl": {
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
@@ -420,7 +420,7 @@
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
   },
   "mermaid": {
-    "revision": "49442bd087901c60f019b4e34dcb6ecdc8849067"
+    "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
   },
   "meson": {
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
@@ -558,7 +558,7 @@
     "revision": "9fa49ff3315987f715ce5666ff979a7742fa8a98"
   },
   "query": {
-    "revision": "2e31ca2771f6042b0e4e0c41a6290014a9e1face"
+    "revision": "608c01187fb9f525a1e4cf585bb63d73dea280b7"
   },
   "r": {
     "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
@@ -714,7 +714,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "932d41c0f5b1884a84560718ab063af9259f126b"
+    "revision": "c842127c4385190c3326d5477c92d0816260b547"
   },
   "tmux": {
     "revision": "9138ea508410e0f34da2666609f600f65e944f22"
@@ -777,10 +777,10 @@
     "revision": "9534865e614c95eb9418e5e73f061c32fa4d9540"
   },
   "vim": {
-    "revision": "052279cd5e1d73b075640c64cef97e7bdcd32611"
+    "revision": "b448ca63f972ade12c373c808acdd2bf972937db"
   },
   "vimdoc": {
-    "revision": "0b36856db88680f662cc67545c82af4ce83bf158"
+    "revision": "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4"
   },
   "vue": {
     "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"

From b04ccbd0e041bb05f3eef271124da02497d9d10c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 24 Apr 2024 06:40:15 +0000
Subject: [PATCH 1408/2704] bot(lockfile): update astro, dart, gleam,
 liquidsoap, tlaplus

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4fdd6071e..ad99489c6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
   },
   "astro": {
-    "revision": "506515c1dce4220fc9db278ce9eae2ad4e239cff"
+    "revision": "4be180759ec13651f72bacee65fa477c64222a1a"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
@@ -102,7 +102,7 @@
     "revision": "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"
   },
   "dart": {
-    "revision": "6da46473ab8accb13da48113f4634e729a71d335"
+    "revision": "4e101058b4ec7ce4ba92496311a7dd10a4c9c66a"
   },
   "devicetree": {
     "revision": "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"
@@ -219,7 +219,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "bcf9c45b56cbe46e9dac5eee0aee75df270000ac"
+    "revision": "a0b11a15935b95848176c747a8b5776752d90d7c"
   },
   "glimmer": {
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
@@ -384,7 +384,7 @@
     "revision": "293369818da219d97327908aab33707b04b63fd9"
   },
   "liquidsoap": {
-    "revision": "09a9e31e2af734a8974dad6ed349648f601eee8c"
+    "revision": "ea97fa1f7d6665a018353cb4483d07c8b121e374"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -714,7 +714,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "c842127c4385190c3326d5477c92d0816260b547"
+    "revision": "763f9a4edcb1747595842164614aa143eec084dd"
   },
   "tmux": {
     "revision": "9138ea508410e0f34da2666609f600f65e944f22"

From f0e91fd9b9dcf111dee299b3f91366585b30d2a9 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 23 Apr 2024 20:29:59 -0700
Subject: [PATCH 1409/2704] feat(qml): add back `ecma` inheritance

Fixed after the grammar dependencies were updated. This time inheritance
is given to the injections queries also.
---
 queries/qmljs/highlights.scm | 43 ++++--------------------------------
 queries/qmljs/injections.scm |  1 +
 2 files changed, 5 insertions(+), 39 deletions(-)
 create mode 100644 queries/qmljs/injections.scm

diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index d543074be..cef6639de 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -1,4 +1,5 @@
-; temporarily removed the ecma inherit due to it breaking
+; inherits: ecma
+
 "pragma" @keyword.import
 
 ; Annotations
@@ -67,40 +68,6 @@
   (nested_identifier
     (identifier) @module))
 
-; Properties
-;-----------
-(property_identifier) @property
-
-; function
-(call_expression
-  function: (member_expression
-    object: (identifier) @variable
-    property: (property_identifier) @function))
-
-; js
-; Literals
-;---------
-[
-  (true)
-  (false)
-] @boolean
-
-[
-  (null)
-  (undefined)
-] @constant.builtin
-
-(comment) @comment @spell
-
-[
-  (string)
-  (template_string)
-] @string
-
-(regex) @string.regexp
-
-(number) @number
-
 ; Tokens
 ;-------
 [
@@ -118,9 +85,6 @@
 
 (predefined_type) @type.builtin
 
-((identifier) @type
-  (#lua-match? @type "^%u"))
-
 (type_arguments
   "<" @punctuation.bracket
   ">" @punctuation.bracket)
@@ -142,8 +106,9 @@
   "export"
   "implements"
   "interface"
-  "keyof"
   "namespace"
   "type"
   "override"
 ] @keyword
+
+"keyof" @keyword.operator
diff --git a/queries/qmljs/injections.scm b/queries/qmljs/injections.scm
new file mode 100644
index 000000000..04328f099
--- /dev/null
+++ b/queries/qmljs/injections.scm
@@ -0,0 +1 @@
+; inherits: ecma

From e245f0919719cfc3cf6392d74bf2044806c5e84e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 06:37:42 +0000
Subject: [PATCH 1410/2704] bot(lockfile): update asm, djot, mlir, unison, vhs

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ad99489c6..fbb7fbe6e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "8518c3fa6b8562af545a496d55c9abd78f53e732"
   },
   "asm": {
-    "revision": "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"
+    "revision": "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"
   },
   "astro": {
     "revision": "4be180759ec13651f72bacee65fa477c64222a1a"
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "7be89f13c3a5e3c2ed34d29310259158ebe2e493"
+    "revision": "bc94a2867f7a1040c416212207e7e28e79ef0339"
   },
   "dockerfile": {
     "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
@@ -426,7 +426,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "c2845c1c0b23e2faf6febfa72a042e5346374ebf"
+    "revision": "c930b5f4a1fceec146b9074b8eb54bedcc266e56"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -753,7 +753,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "056a926d8998e24eaa687755767b83217901a1cc"
+    "revision": "5d1af86e954be775fc338396d27cd5858d0286be"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
@@ -774,7 +774,7 @@
     "revision": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"
   },
   "vhs": {
-    "revision": "9534865e614c95eb9418e5e73f061c32fa4d9540"
+    "revision": "90028bbadb267ead5b87830380f6a825147f0c0f"
   },
   "vim": {
     "revision": "b448ca63f972ade12c373c808acdd2bf972937db"

From 876111c8df409a6ad17ba1ff6e1a90bac22b4a42 Mon Sep 17 00:00:00 2001
From: Silas Groh <silas.groh@t-online.de>
Date: Thu, 25 Apr 2024 14:49:58 +0800
Subject: [PATCH 1411/2704] feat(asm): update queries from upstream (#6505)

adds support for TC assembly
---
 queries/asm/highlights.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/queries/asm/highlights.scm b/queries/asm/highlights.scm
index 341205235..eccf9c996 100644
--- a/queries/asm/highlights.scm
+++ b/queries/asm/highlights.scm
@@ -1,6 +1,9 @@
 ; General
 (label
-  (ident) @label)
+  [
+    (ident)
+    (word)
+  ] @label)
 
 (reg) @variable.builtin
 
@@ -10,6 +13,9 @@
 (instruction
   kind: (_) @function.builtin)
 
+(const
+  name: (word) @constant)
+
 ; Comments
 [
   (line_comment)
@@ -31,6 +37,8 @@
   "qword"
   "ptr"
   "rel"
+  "label"
+  "const"
 ] @keyword
 
 ; Operators & Punctuation
@@ -38,6 +46,11 @@
   "+"
   "-"
   "*"
+  "/"
+  "%"
+  "|"
+  "^"
+  "&"
 ] @operator
 
 [

From 28a914eb573d6d374d57a5705faba355c1ec4d99 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 23 Apr 2024 10:52:01 -0700
Subject: [PATCH 1412/2704] fix(php): parameter and operator touch-ups

---
 queries/php_only/highlights.scm          | 14 +++++++++-----
 tests/query/highlights/php/types.php     |  2 +-
 tests/query/highlights/php/variables.php |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index e97b49a91..3d88567e6 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -317,10 +317,12 @@
   ])
 
 ; Parameters
-[
-  (simple_parameter)
-  (variadic_parameter)
-] @variable.parameter
+(variadic_parameter
+  "..." @operator
+  name: (variable_name) @variable.parameter)
+
+(simple_parameter
+  name: (variable_name) @variable.parameter)
 
 (argument
   (name) @variable.parameter)
@@ -362,7 +364,9 @@
 (attribute_list) @attribute
 
 ; Conditions ( ? : )
-(conditional_expression) @keyword.conditional
+(conditional_expression
+  "?" @keyword.conditional.ternary
+  ":" @keyword.conditional.ternary)
 
 ; Directives
 (declare_directive
diff --git a/tests/query/highlights/php/types.php b/tests/query/highlights/php/types.php
index 5985d6361..67a1c2f43 100644
--- a/tests/query/highlights/php/types.php
+++ b/tests/query/highlights/php/types.php
@@ -2,7 +2,7 @@
 
 function b(int $a, string $b): Foo\Dog {}
 //         ^^^ @type.builtin
-//             ^^ @variable
+//             ^^ @variable.parameter
 //                 ^^^^^^ @type.builtin
 //                             ^^^ @module
 //                                 ^^^ @type
diff --git a/tests/query/highlights/php/variables.php b/tests/query/highlights/php/variables.php
index a9c099ff2..f6477e131 100644
--- a/tests/query/highlights/php/variables.php
+++ b/tests/query/highlights/php/variables.php
@@ -2,7 +2,7 @@
 
 class A {
   public function foo(self $a): self {
-//                          ^ @variable
+//                          ^ @variable.parameter
     new self();
 //      ^^^^ @constructor
     new static();

From df111f886cfe53e9022f835ec3cce71b338c2a18 Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Thu, 25 Apr 2024 03:05:06 -0700
Subject: [PATCH 1413/2704] feat(rasi): Highlight captures similar to CSS
 (#6507)

---
 queries/rasi/highlights.scm | 13 ++++++-------
 queries/rasi/injections.scm |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 queries/rasi/injections.scm

diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm
index 1a0b8659c..d095cef63 100644
--- a/queries/rasi/highlights.scm
+++ b/queries/rasi/highlights.scm
@@ -80,17 +80,16 @@
   (angle_unit)
   (integer_distance_unit)
   (float_distance_unit)
-] @type
+] @string
 
 (percentage) @number
 
 (percentage
-  "%" @type)
+  "%" @string)
 
-[
-  (global_selector)
-  (id_selector)
-] @module
+(global_selector) @character.special
+
+(id_selector) @constant
 
 (id_selector_view
   [
@@ -136,4 +135,4 @@
   "env" @function.builtin
   (identifier) @variable)
 
-(property_name) @variable
+(property_name) @property
diff --git a/queries/rasi/injections.scm b/queries/rasi/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/rasi/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 19c6b0c4c9b35962e45b782e2b85a3214d2ac4d5 Mon Sep 17 00:00:00 2001
From: Ian Hobson <ian.r.hobson@gmail.com>
Date: Thu, 25 Apr 2024 15:43:41 +0200
Subject: [PATCH 1414/2704] feat: add koto

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/koto/folds.scm          |   9 +++
 queries/koto/highlights.scm     | 131 ++++++++++++++++++++++++++++++++
 queries/koto/injections.scm     |   2 +
 queries/koto/locals.scm         |  28 +++++++
 7 files changed, 182 insertions(+)
 create mode 100644 queries/koto/folds.scm
 create mode 100644 queries/koto/highlights.scm
 create mode 100644 queries/koto/injections.scm
 create mode 100644 queries/koto/locals.scm

diff --git a/README.md b/README.md
index 2bf7c9175..2eea8f14b 100644
--- a/README.md
+++ b/README.md
@@ -294,6 +294,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
 - [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)
 - [x] [kotlin](https://github.com/fwcd/tree-sitter-kotlin) (maintained by @SalBakraa)
+- [x] [koto](https://github.com/koto-lang/tree-sitter-koto) (maintained by @irh)
 - [x] [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) (maintained by @Willem-J-an)
 - [x] [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) (maintained by @traxys)
 - [x] [latex](https://github.com/latex-lsp/tree-sitter-latex) (maintained by @theHamsta, @clason)
diff --git a/lockfile.json b/lockfile.json
index fbb7fbe6e..16bc7720c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -362,6 +362,9 @@
   "kotlin": {
     "revision": "260afd9a92bac51b3a4546303103c3d40a430639"
   },
+  "koto": {
+    "revision": "85e689c17abab691e033080da726a792b3711df0"
+  },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 18f5ceb63..c6f169d63 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1082,6 +1082,14 @@ list.kotlin = {
   maintainers = { "@SalBakraa" },
 }
 
+list.koto = {
+  install_info = {
+    url = "https://github.com/koto-lang/tree-sitter-koto",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@irh" },
+}
+
 list.kusto = {
   install_info = {
     url = "https://github.com/Willem-J-an/tree-sitter-kusto",
diff --git a/queries/koto/folds.scm b/queries/koto/folds.scm
new file mode 100644
index 000000000..d20d0120b
--- /dev/null
+++ b/queries/koto/folds.scm
@@ -0,0 +1,9 @@
+[
+  (assign)
+  (comment)
+  (function)
+  (list)
+  (map)
+  (tuple)
+  (string)
+] @fold
diff --git a/queries/koto/highlights.scm b/queries/koto/highlights.scm
new file mode 100644
index 000000000..021e504cf
--- /dev/null
+++ b/queries/koto/highlights.scm
@@ -0,0 +1,131 @@
+[
+  "="
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "=="
+  "!="
+  "<"
+  ">"
+  "<="
+  ">="
+  ".."
+  "..="
+] @operator
+
+[
+  "and"
+  "not"
+  "or"
+] @keyword.operator
+
+[
+  "return"
+  "yield"
+] @keyword.return
+
+[
+  "if"
+  "then"
+  "else"
+  "else if"
+  "match"
+  "switch"
+] @keyword.conditional
+
+[
+  (break)
+  (continue)
+  "for"
+  "in"
+  "loop"
+  "until"
+  "while"
+] @keyword.repeat
+
+[
+  "throw"
+  "try"
+  "catch"
+  "finally"
+] @keyword.exception
+
+[
+  "export"
+  "from"
+  "import"
+  "as"
+] @keyword.import
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "|"
+] @punctuation.bracket
+
+(identifier) @variable
+
+(import_module
+  (identifier) @module)
+
+(import_item
+  (identifier) @module)
+
+(export
+  (identifier) @module)
+
+(chain
+  lookup: (identifier) @variable.member)
+
+(chain
+  start: (identifier) @function.call)
+
+[
+  (true)
+  (false)
+] @boolean
+
+(comment) @comment @spell
+
+(debug) @keyword.debug
+
+(string) @string
+
+(fill_char) @punctuation.delimiter
+
+(alignment) @operator
+
+(escape) @string.escape
+
+(null) @constant.builtin
+
+(number) @number
+
+(meta) @keyword.directive
+
+(meta
+  name: (identifier) @variable.member)
+
+(entry_inline
+  key: (identifier) @variable.member)
+
+(entry_block
+  key: (identifier) @variable.member)
+
+(self) @variable.builtin
+
+(arg
+  (identifier) @variable.parameter)
+
+(ellipsis) @variable.parameter
diff --git a/queries/koto/injections.scm b/queries/koto/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/koto/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/koto/locals.scm b/queries/koto/locals.scm
new file mode 100644
index 000000000..7c7097e14
--- /dev/null
+++ b/queries/koto/locals.scm
@@ -0,0 +1,28 @@
+; Scopes
+(function
+  body: (_) @local.scope)
+
+; Definitions
+(arg
+  (identifier) @local.definition.parameter)
+
+(assign
+  (identifier) @local.definition.var)
+
+(for_args
+  (identifier) @local.definition.var)
+
+(match_patterns
+  (identifier) @local.definition.var)
+
+(import_item
+  (identifier) @local.definition.import)
+
+(entry_block
+  (identifier) @local.definition.field)
+
+(entry_inline
+  (identifier) @local.definition.field)
+
+; References
+(identifier) @local.reference

From 3ef8d25df2d8eca6f15a6889cb2bc9d4c6101096 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 06:39:19 +0000
Subject: [PATCH 1415/2704] bot(lockfile): update earthfile, mlir, rust, unison

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 16bc7720c..133d54178 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
   },
   "earthfile": {
-    "revision": "513598b175928b6989e02bfc7ff73332955dcbf9"
+    "revision": "41e7d7fb61dc072cdddcf68af9919ab0a9c6d10e"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -429,7 +429,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "c930b5f4a1fceec146b9074b8eb54bedcc266e56"
+    "revision": "f92e2e11a34a3b9e64252164ffdf5fc857628ad9"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -609,7 +609,7 @@
     "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
   },
   "rust": {
-    "revision": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"
+    "revision": "04352146022062c101b8ddd853adf17eadd8cf56"
   },
   "scala": {
     "revision": "b76db435a7f876cf1ede837d66054c534783c72f"
@@ -756,7 +756,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "5d1af86e954be775fc338396d27cd5858d0286be"
+    "revision": "59d36a09282be7e4d3374854126590f3dcebee6e"
   },
   "usd": {
     "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"

From 466da58e5b87ff158220c7acb329a9e02402f6bc Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:40:20 -0700
Subject: [PATCH 1416/2704] feat(css): highlight square brackets

---
 queries/css/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index 7066d6906..acc2b638d 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -102,4 +102,6 @@
   ")"
   "("
   "}"
+  "["
+  "]"
 ] @punctuation.bracket

From 75beaf363287923fde8d8e4910a50f2213f42da2 Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:40:35 -0700
Subject: [PATCH 1417/2704] feat(toml): highlight escape sequences

---
 queries/toml/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index e319f5ef2..1370f9121 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -19,6 +19,8 @@
 
 (string) @string
 
+(escape_sequence) @string.escape
+
 (integer) @number
 
 (float) @number.float

From 01963961b5b02511c700932da167ca666e5ccbff Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 26 Apr 2024 21:42:06 -0400
Subject: [PATCH 1418/2704] feat(glimmer): highlight builtin tags

---
 queries/ecma/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 58785d454..2d969aa36 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -43,6 +43,10 @@
 
 (statement_identifier) @label
 
+(glimmer_opening_tag) @tag.builtin
+
+(glimmer_closing_tag) @tag.builtin
+
 ; Function and method definitions
 ;--------------------------------
 (function_expression

From ab3b3ff01028fef83cfb79b651bf65afb76ee062 Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Sat, 27 Apr 2024 09:42:35 +0800
Subject: [PATCH 1419/2704] feat(gitconfig): add more injections

---
 queries/git_config/injections.scm | 41 ++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/queries/git_config/injections.scm b/queries/git_config/injections.scm
index 7a53af2ee..7bda6979c 100644
--- a/queries/git_config/injections.scm
+++ b/queries/git_config/injections.scm
@@ -4,7 +4,46 @@
 ((variable
   (name) @_name
   value: (string) @injection.content)
-  (#any-of? @_name "cmd" "command" "textconv")
+  (#any-of? @_name "cmd" "command" "textconv" "sendmailCmd")
+  (#set! injection.language "bash"))
+
+(section
+  (variable
+    (name) @_name
+    value: (string) @injection.content)
+  (#eq? @_name "tool")
+  (#set! injection.language "bash"))
+
+(section
+  (section_header
+    (section_name) @_pager)
+  (variable
+    value: (string) @injection.content)
+  (#eq? @_pager "pager")
+  (#set! injection.language "bash"))
+
+(section
+  (section_header
+    (section_name) @_interactive)
+  (variable
+    (name) @_name
+    value: (string) @injection.content)
+  (#eq? @_interactive "interactive")
+  (#eq? @_name "diffFilter")
+  (#set! injection.language "bash"))
+
+; https://github.com/git-lfs/git-lfs
+; git lfs install
+(section
+  (section_header
+    (section_name) @_filter
+    (subsection_name) @_lfs)
+  (variable
+    (name) @_name
+    value: (string) @injection.content)
+  (#eq? @_filter "filter")
+  (#eq? @_lfs "lfs")
+  (#any-of? @_name "smudge" "process" "clean")
   (#set! injection.language "bash"))
 
 (section

From 0883ff05655117a3fc79ab295a640c4984cfd415 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 27 Apr 2024 06:36:18 +0000
Subject: [PATCH 1420/2704] bot(lockfile): update cuda, dtd, glsl, hlsl, koto,
 slang, wgsl_bevy, xml

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 133d54178..e4d99e4d1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -93,7 +93,7 @@
     "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
   },
   "cuda": {
-    "revision": "50a28f4600c559e3d19a1825e854dfe6dcac1d49"
+    "revision": "c794560823013fc4cc29944d862b7158d9585408"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -129,7 +129,7 @@
     "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
   },
   "dtd": {
-    "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
+    "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
   },
   "earthfile": {
     "revision": "41e7d7fb61dc072cdddcf68af9919ab0a9c6d10e"
@@ -225,7 +225,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "e7817c982e0e921c5ee89a1e0283121bb5cc5e01"
+    "revision": "9f611774fb5b95993e31e03f137b4a689c63f827"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -288,7 +288,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "d200375a29b24764b78d7051df0024ed7c2f1ab0"
+    "revision": "de5d490e52aa7be2a877df7022f93dff05f03eb9"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -363,7 +363,7 @@
     "revision": "260afd9a92bac51b3a4546303103c3d40a430639"
   },
   "koto": {
-    "revision": "85e689c17abab691e033080da726a792b3711df0"
+    "revision": "919440e1376109bab4edac52594c17c02ae0be5a"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -624,7 +624,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "b950ddf54c564fec0efead602268b6e0d3e5f26e"
+    "revision": "a9ca9d9a8c56d43cf5265779a482b4fd67d004ee"
   },
   "slint": {
     "revision": "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"
@@ -792,7 +792,7 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "f5980f534ee64256b1e64b0a42e2864d91154a5d"
+    "revision": "59d5fbd562c0e17c45312f49485098cce467f5ac"
   },
   "wing": {
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
@@ -804,7 +804,7 @@
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "96beba9f3e4156aaae64bb86997503b1ceb1283d"
+    "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
   },
   "yaml": {
     "revision": "ee093118211be521742b9866a8ed8ce6d87c7a94"

From 37ac5f1f9f28af2e36f73e28a9ebac9490fcd731 Mon Sep 17 00:00:00 2001
From: DragonBillow <42114817+cathaysia@users.noreply.github.com>
Date: Sun, 28 Apr 2024 16:26:39 +0800
Subject: [PATCH 1421/2704] feat: add idl

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/idl/highlights.scm      | 205 ++++++++++++++++++++++++++++++++
 queries/idl/injections.scm      |   8 ++
 4 files changed, 224 insertions(+)
 create mode 100644 queries/idl/highlights.scm
 create mode 100644 queries/idl/injections.scm

diff --git a/lockfile.json b/lockfile.json
index e4d99e4d1..a01129a21 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -314,6 +314,9 @@
   "hyprlang": {
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
+  "idl": {
+    "revision": "ea10c7b6c45d0a53e37afc54a825efe92d0b8f1e"
+  },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c6f169d63..ad8cbf904 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -949,6 +949,14 @@ list.hyprlang = {
   maintainers = { "@luckasRanarison" },
 }
 
+list.idl = {
+  install_info = {
+    url = "https://github.com/cathaysia/tree-sitter-idl",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@cathaysa" },
+}
+
 list.ini = {
   install_info = {
     url = "https://github.com/justinmk/tree-sitter-ini",
diff --git a/queries/idl/highlights.scm b/queries/idl/highlights.scm
new file mode 100644
index 000000000..47ea00c25
--- /dev/null
+++ b/queries/idl/highlights.scm
@@ -0,0 +1,205 @@
+; https://neovim.io/doc/user/treesitter.html#treesitter-highlight-groups
+(comment) @comment @spell
+
+[
+  "enum"
+  "struct"
+  "union"
+  "bitmask"
+  "bitset"
+  "@annotation"
+  "interface"
+  "exception"
+  "typedef"
+] @keyword.type
+
+[
+  "module"
+  "attribute"
+] @keyword
+
+[
+  "const"
+  "readonly"
+] @keyword.modifier
+
+[
+  "switch"
+  "case"
+  "default"
+] @keyword.conditional
+
+[
+  "void"
+  (signed_short_int)
+  (signed_long_int)
+  (signed_longlong_int)
+  (unsigned_tiny_int)
+  (boolean_type)
+  (fixed_pt_const_type)
+  (octet_type)
+  (signed_tiny_int)
+  (unsigned_short_int)
+  (unsigned_long_int)
+  (unsigned_longlong_int)
+  (floating_pt_type)
+  (char_type)
+  (scoped_name)
+  (string_type)
+  (any_type)
+  (fixed_pt_type)
+  (sequence_type)
+  (map_type)
+] @type.builtin
+
+(boolean_literal) @boolean
+
+(number_literal) @number
+
+(char_literal) @character
+
+(string_literal) @string
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "<"
+  ">"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "-"
+  "*"
+  "+"
+  "="
+  "<<"
+  ">>"
+  "%"
+  "~"
+  "|"
+  "^"
+  "$"
+] @operator
+
+[
+  "::"
+  ";"
+  ":"
+  ","
+] @punctuation.delimiter
+
+(readonly_attr_declarator
+  (simple_declarator) @variable.member)
+
+(attr_declarator) @variable.member
+
+(annotation_appl
+  "@" @attribute
+  (scoped_name) @attribute)
+
+(op_dcl
+  (identifier) @function.method)
+
+(type_declarator
+  (simple_type_spec) @type
+  (any_declarators) @type)
+
+(param_dcl
+  (simple_declarator) @variable.parameter)
+
+(raises_expr
+  "raises" @keyword.exception
+  (scoped_name
+    (identifier) @type))
+
+(param_dcl
+  (param_attribute) @keyword.modifier)
+
+(preproc_call
+  directive: (preproc_directive) @keyword.directive
+  argument: (_) @constant)
+
+(module_dcl
+  (identifier) @module)
+
+(struct_def
+  (identifier) @type
+  parent: (scoped_name)? @type)
+
+(enum_dcl
+  (enumerator
+    (identifier) @constant))
+
+(annotation_dcl
+  (identifier) @type)
+
+(struct_forward_dcl
+  (identifier) @type)
+
+(bitmask_dcl
+  (identifier) @type)
+
+(bitset_dcl
+  (identifier) @type
+  (scoped_name)* @type)
+
+(enum_dcl
+  (identifier) @type)
+
+(union_forward_dcl
+  (identifier) @type)
+
+(interface_forward_dcl
+  (identifier) @type)
+
+(interface_header
+  (identifier) @type)
+
+(interface_inheritance_spec
+  (interface_name) @type)
+
+(union_def
+  (identifier) @type
+  (switch_type_spec) @type)
+
+(except_dcl
+  (identifier) @type)
+
+(annotation_member_type) @type
+
+(bitfield
+  (bitfield_spec
+    "bitfield" @keyword.modifier
+    (positive_int_const) @number
+    (destination_type)* @type)
+  (identifier) @variable.parameter)
+
+(bit_value) @constant
+
+(annotation_member
+  (annotation_member_type) @type
+  (simple_declarator) @property)
+
+(const_dcl
+  (const_type) @type
+  (identifier) @constant)
+
+(case_label
+  (const_expr) @constant)
+
+(simple_type_spec
+  (scoped_name
+    (identifier) @type))
+
+(simple_declarator
+  (identifier) @attribute)
+
+(array_declarator
+  (identifier) @attribute)
+
+(annotation_appl_param
+  (identifier) @attribute)
diff --git a/queries/idl/injections.scm b/queries/idl/injections.scm
new file mode 100644
index 000000000..e4a286e42
--- /dev/null
+++ b/queries/idl/injections.scm
@@ -0,0 +1,8 @@
+((comment) @injection.content
+  (#lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
+  (#set! injection.language "doxygen"))
+
+((comment) @injection.content
+  (#not-lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
+  (#not-lua-match? @injection.content "//@[a-zA-Z]")
+  (#set! injection.language "comment"))

From a95de26cd75a04df9283e0af1fd38f001238eb25 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 28 Apr 2024 08:26:51 +0000
Subject: [PATCH 1422/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2eea8f14b..c3f3afa3b 100644
--- a/README.md
+++ b/README.md
@@ -278,6 +278,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq, @NTBBloodbath)
 - [x] [hurl](https://github.com/pfeiferj/tree-sitter-hurl) (maintained by @pfeiferj)
 - [x] [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) (maintained by @luckasRanarison)
+- [x] [idl](https://github.com/cathaysia/tree-sitter-idl) (maintained by @cathaysa)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
 - [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)

From eab58e9bff2a97448ad05b6bd025f6829bb07095 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 28 Apr 2024 06:35:57 +0000
Subject: [PATCH 1423/2704] bot(lockfile): update apex, bitbake, cairo,
 chatito, commonlisp, csv, doxygen, fsh, func, psv, slang, smithy, soql, sosl,
 tsv, verilog

---
 lockfile.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a01129a21..248c2817f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "b7a7167762e3863b3d6247c708b7f9bca1ca7bea"
   },
   "apex": {
-    "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
+    "revision": "74368c27537a932539904394df8e6beae8990c7f"
   },
   "arduino": {
     "revision": "8518c3fa6b8562af545a496d55c9abd78f53e732"
@@ -42,7 +42,7 @@
     "revision": "0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0"
   },
   "bitbake": {
-    "revision": "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"
+    "revision": "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"
   },
   "blueprint": {
     "revision": "863cea9f83ad5637300478e0559262f1e791684b"
@@ -54,13 +54,13 @@
     "revision": "9de565257ada70ac441c640e3b5d6850e2df5ab8"
   },
   "cairo": {
-    "revision": "6216c6ee5e9fc0649c4bd7b1aedd884a55bdd9ef"
+    "revision": "6238f609bea233040fe927858156dee5515a0745"
   },
   "capnp": {
     "revision": "7b0883c03e5edd34ef7bcf703194204299d7099f"
   },
   "chatito": {
-    "revision": "fe7a2a75d3d74c1215141b7a7ebebb57ae17a370"
+    "revision": "a461f20dedb43905febb12c1635bc7d2e43e96f0"
   },
   "clojure": {
     "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
@@ -72,7 +72,7 @@
     "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
   },
   "commonlisp": {
-    "revision": "83ae738bed7e914cee9090c3fe4c80a32ab45905"
+    "revision": "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"
   },
   "cooklang": {
     "revision": "81c2a8667846b1e60db68b5601d864fe00fd1d3a"
@@ -90,7 +90,7 @@
     "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
   },
   "csv": {
-    "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
+    "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
     "revision": "c794560823013fc4cc29944d862b7158d9585408"
@@ -126,7 +126,7 @@
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
   "doxygen": {
-    "revision": "a750758da90955c86fcc22fcbb6fa44a7d009865"
+    "revision": "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"
   },
   "dtd": {
     "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
@@ -189,10 +189,10 @@
     "revision": "f73d473e3530862dee7cbb38520f28824e7804f6"
   },
   "fsh": {
-    "revision": "fa3347712f7a59ed02ccf508284554689c6cde28"
+    "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
   "func": {
-    "revision": "0834e35ecf8b23fbf9ad15b088af6a897e19d4a8"
+    "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"
   },
   "fusion": {
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
@@ -537,7 +537,7 @@
     "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
   },
   "psv": {
-    "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
+    "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "pug": {
     "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
@@ -627,7 +627,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "a9ca9d9a8c56d43cf5265779a482b4fd67d004ee"
+    "revision": "c4b7c53e5de64d73b04017da9ce4ec1bc221cfba"
   },
   "slint": {
     "revision": "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"
@@ -636,7 +636,7 @@
     "revision": "3f6517855898ef23023e5d64a8b175d4ee8d646e"
   },
   "smithy": {
-    "revision": "8327eb84d55639ffbe08c9dc82da7fff72a1ad07"
+    "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
@@ -645,10 +645,10 @@
     "revision": "1653da09ccd183f4312fba819056a13af22a65f6"
   },
   "soql": {
-    "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
+    "revision": "74368c27537a932539904394df8e6beae8990c7f"
   },
   "sosl": {
-    "revision": "857077f9e6bb04df0f769c18d32bfe036911adc8"
+    "revision": "74368c27537a932539904394df8e6beae8990c7f"
   },
   "sourcepawn": {
     "revision": "3ca89fdf998340a7973e276b39516d8902950f86"
@@ -732,7 +732,7 @@
     "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
   },
   "tsv": {
-    "revision": "cda48a5e890b30619da5bc3ff55be1b1d3d08c8d"
+    "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
     "revision": "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"
@@ -777,7 +777,7 @@
     "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"
   },
   "verilog": {
-    "revision": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"
+    "revision": "075ebfc84543675f12e79a955f79d717772dcef3"
   },
   "vhs": {
     "revision": "90028bbadb267ead5b87830380f6a825147f0c0f"

From dbbaa3f66e736a8e446572e1079ffa2f6d40b266 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 28 Apr 2024 11:38:16 +0200
Subject: [PATCH 1424/2704] fix(latex): update parser and queries

---
 lockfile.json                | 2 +-
 queries/latex/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 248c2817f..74266b4c5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -375,7 +375,7 @@
     "revision": "123d8b472e949b59f348c32e245107a34a3d8945"
   },
   "latex": {
-    "revision": "ae2134af67f6c5e45587ace9ec748dd6e7b356a2"
+    "revision": "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 1d795fc23..de652d6b5 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -71,7 +71,7 @@
 
 (theorem_definition
   command: _ @function.macro
-  name: (curly_group_text
+  name: (curly_group_text_list
     (_) @label))
 
 (paired_delimiter_definition

From 223f8dd2e475ab790d9fede23681cd3c016fab79 Mon Sep 17 00:00:00 2001
From: Liam Woodleigh-Hardinge <liam.woodleigh@gmail.com>
Date: Sun, 28 Apr 2024 18:13:51 +0200
Subject: [PATCH 1425/2704] fix(wit): update parser and queries (#6528)

---
 lockfile.json              |   2 +-
 queries/wit/highlights.scm | 181 +++++++++++++++++++++++++------------
 queries/wit/injections.scm |   5 +-
 3 files changed, 127 insertions(+), 61 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 74266b4c5..7970934ce 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -801,7 +801,7 @@
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
-    "revision": "ed13e0a3ee77833900a095d57d2685a1f7f91237"
+    "revision": "16e263143e230b79a00f6cc353f6fd860c4e5de5"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
diff --git a/queries/wit/highlights.scm b/queries/wit/highlights.scm
index 237858ba2..983987b90 100644
--- a/queries/wit/highlights.scm
+++ b/queries/wit/highlights.scm
@@ -1,81 +1,150 @@
-; Comments
-(line_comment) @comment
+(comment) @comment @spell
 
-(block_comment) @comment
+(ty
+  (id)) @type
+
+(package_decl
+  (id)) @module
+
+(valid_semver) @string.special
+
+(world_item
+  name: (id) @module)
+
+(interface_item
+  name: (id) @module)
+
+(import_item
+  name: (id) @module
+  (extern_type
+    (interface_body)))
+
+(import_item
+  name: (id) @function
+  (extern_type
+    (func_type)))
+
+(export_item
+  name: (id) @module
+  (extern_type
+    (interface_body)))
+
+(export_item
+  name: (id) @function
+  (extern_type
+    (func_type)))
+
+(type_item
+  alias: (id) @type.definition)
+
+(func_item
+  name: (id) @function)
+
+(handle
+  (id) @type)
+
+(named_type
+  name: (id) @variable.parameter)
+
+(record_item
+  name: (id) @type)
+
+(record_field
+  name: (id) @variable.member)
+
+(flags_items
+  name: (id) @type)
+
+(flags_body
+  (id) @variable.member)
+
+(variant_items
+  name: (id) @type)
+
+(variant_case
+  name: (id) @type)
+
+(enum_items
+  name: (id) @type)
+
+(enum_body
+  enum_cases: (id) @constant)
+
+(resource_item
+  name: (id) @type)
+
+(resource_method
+  "constructor" @constructor)
+
+(toplevel_use_item
+  "use" @keyword.import)
+
+(use_item
+  "use" @keyword.import)
+
+(use_path
+  (id) @module)
+
+"func" @keyword.function
+
+[
+  "type"
+  "interface"
+  "world"
+  "package"
+  "resource"
+  "record"
+  "enum"
+  "flags"
+  "variant"
+] @keyword.type
+
+"static" @keyword.modifier
+
+[
+  "include"
+  "import"
+  "export"
+] @keyword.import
 
-; Primitive Types
 [
-  "bool"
-  "s8"
-  "s16"
-  "s32"
-  "s64"
   "u8"
   "u16"
   "u32"
   "u64"
-  "float32"
-  "float64"
+  "s8"
+  "s16"
+  "s32"
+  "s64"
+  "f32"
+  "f64"
   "char"
+  "bool"
   "string"
-  ; Container Types
-  "list"
   "tuple"
+  "list"
   "option"
   "result"
+  "borrow"
 ] @type.builtin
 
-"func" @keyword.function
-
-; Keywords for file structure and components
 [
-  "record"
-  "enum"
-  "variant"
-  "flags"
-  "resource"
-] @keyword.type
-
-; Keywords for importing and exporting
-[
-  "package"
-  "world"
-  "use"
-  "import"
-] @keyword.import
-
-; Resource Keywords
-"static" @keyword.modifier
-
-; Named Types (Capitalized identifiers)
-((identifier) @type
-  (#match? @type "^[A-Z]"))
-
-((identifier) @variable
-  (#match? @variable "^[a-z_][a-zA-Z0-9_]*$"))
-
-; Constants (UPPER_CASE names and Enums)
-((identifier) @constant
-  (#match? @constant "^[A-Z][A-Z0-9_]+$"))
-
-; Functions and Methods (lowercase names followed by parentheses)
-((identifier) @function
-  (#match? @function "^[a-z_][a-zA-Z0-9_]*%("))
-
-; Punctuation
-[
-  ";"
-  ":"
+  "@"
   "->"
 ] @punctuation.special
 
-; Delimiters
-"," @punctuation.delimiter
+[
+  "/"
+  ";"
+  ":"
+  ","
+] @punctuation.delimiter
 
-; Brackets
 [
   "{"
   "}"
   "("
   ")"
 ] @punctuation.bracket
+
+"=" @operator
diff --git a/queries/wit/injections.scm b/queries/wit/injections.scm
index 50b9b8fa9..2f0e58eb6 100644
--- a/queries/wit/injections.scm
+++ b/queries/wit/injections.scm
@@ -1,5 +1,2 @@
-((line_comment) @comment
-  (#set! injection.language "comment"))
-
-((block_comment) @comment
+((comment) @injection.content
   (#set! injection.language "comment"))

From 19f69a5b434470723c32311cdc4d8d0e8db76358 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 28 Apr 2024 16:14:52 +0000
Subject: [PATCH 1426/2704] bot(lockfile): update blueprint, idl, python,
 qmljs, rbs, slang

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7970934ce..ddfe66a70 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -45,7 +45,7 @@
     "revision": "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"
   },
   "blueprint": {
-    "revision": "863cea9f83ad5637300478e0559262f1e791684b"
+    "revision": "60ba73739c6083c693d86a1a7cf039c07eb4ed59"
   },
   "c": {
     "revision": "1aafaff4d26dac5a36dd3495be33e1c20161d761"
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "ea10c7b6c45d0a53e37afc54a825efe92d0b8f1e"
+    "revision": "150d24bff72501640e8b6126c94b282450c4c479"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -552,7 +552,7 @@
     "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
   },
   "python": {
-    "revision": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a"
+    "revision": "b466ffb4d7ce0a833754429ad8d3a02e950ed74c"
   },
   "ql": {
     "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
@@ -561,7 +561,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "9fa49ff3315987f715ce5666ff979a7742fa8a98"
+    "revision": "239f2627b4c7859fd9adc53609cb40fa0a5431ce"
   },
   "query": {
     "revision": "608c01187fb9f525a1e4cf585bb63d73dea280b7"
@@ -576,7 +576,7 @@
     "revision": "43196d934a9a6ab3c7093a8683efd0111bb03db1"
   },
   "rbs": {
-    "revision": "519a61132a51222e3ce73d3b7ef07465f587f346"
+    "revision": "e5e807a50fcd104a2d740d354632fc671700a0bf"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
@@ -627,7 +627,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "c4b7c53e5de64d73b04017da9ce4ec1bc221cfba"
+    "revision": "68587530d86aaeb1f1cb17fdada795281cdd0556"
   },
   "slint": {
     "revision": "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"

From c3ab6a59039293cc27cea8a07e74c2d0ce28e36c Mon Sep 17 00:00:00 2001
From: Andrey Sidorov <takandar@gmail.com>
Date: Mon, 29 Apr 2024 07:39:02 +0300
Subject: [PATCH 1427/2704] make sass to be highlighted in vue files (#6526)

---
 queries/vue/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index 6d3b8350b..586964011 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -20,7 +20,7 @@
         (attribute_value) @_scss)))
   (raw_text) @injection.content
   (#eq? @_lang "lang")
-  (#any-of? @_scss "less" "postcss")
+  (#any-of? @_scss "less" "postcss" "sass")
   (#set! injection.language "scss"))
 
 ; <script lang="js">

From 160e5d52c841dc9261c0b2dc6f253bddbcf3d766 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 06:38:06 +0000
Subject: [PATCH 1428/2704] bot(lockfile): update dart, idl, swift, usd

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ddfe66a70..ae1910051 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"
   },
   "dart": {
-    "revision": "4e101058b4ec7ce4ba92496311a7dd10a4c9c66a"
+    "revision": "ac0bb849ccd1a923963af47573b5e396736ff582"
   },
   "devicetree": {
     "revision": "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "150d24bff72501640e8b6126c94b282450c4c479"
+    "revision": "d9a260eda455deaa36d2edf398963b0736ed0845"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -684,7 +684,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "ee04ee19910bb9ea6daf14be7d1e5362a208207d"
+    "revision": "ae648bc42aac4473122918bf792bc3b50158deef"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -762,7 +762,7 @@
     "revision": "59d36a09282be7e4d3374854126590f3dcebee6e"
   },
   "usd": {
-    "revision": "ab8c30bde2df0e58c4b3f01f220fb0125ecb57a7"
+    "revision": "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"
   },
   "uxntal": {
     "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"

From 30ed7031afb4f15802eba2756162f81dddc27999 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2024 06:37:12 +0000
Subject: [PATCH 1429/2704] bot(lockfile): update angular, apex, earthfile,
 fennel, soql, sosl, supercollider, wit, yaml

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ae1910051..8bf01a93f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,10 +6,10 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "b7a7167762e3863b3d6247c708b7f9bca1ca7bea"
+    "revision": "a9ec402bf8e0509f389dba64a6dba037ad199233"
   },
   "apex": {
-    "revision": "74368c27537a932539904394df8e6beae8990c7f"
+    "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "arduino": {
     "revision": "8518c3fa6b8562af545a496d55c9abd78f53e732"
@@ -132,7 +132,7 @@
     "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
   },
   "earthfile": {
-    "revision": "41e7d7fb61dc072cdddcf68af9919ab0a9c6d10e"
+    "revision": "3ded1cba9eab14b07377b700b1132d259480abae"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -168,7 +168,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "325a3315be968b3d8ecdc5c414159be3c8bab212"
+    "revision": "8ad17704b3c2469155947d4e8fcb618cf1328459"
   },
   "fidl": {
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
@@ -645,10 +645,10 @@
     "revision": "1653da09ccd183f4312fba819056a13af22a65f6"
   },
   "soql": {
-    "revision": "74368c27537a932539904394df8e6beae8990c7f"
+    "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sosl": {
-    "revision": "74368c27537a932539904394df8e6beae8990c7f"
+    "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
     "revision": "3ca89fdf998340a7973e276b39516d8902950f86"
@@ -675,7 +675,7 @@
     "revision": "c68a4572e2d6403b6e99066c9a113b43f4a07a27"
   },
   "supercollider": {
-    "revision": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"
+    "revision": "f8ccdc2bb4013d314c59c56079d9c2c8cbb2b624"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -801,7 +801,7 @@
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
-    "revision": "16e263143e230b79a00f6cc353f6fd860c4e5de5"
+    "revision": "3d6124cfe88555ecee1ba97d6d76c70d13af927a"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
@@ -810,7 +810,7 @@
     "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
   },
   "yaml": {
-    "revision": "ee093118211be521742b9866a8ed8ce6d87c7a94"
+    "revision": "49db816e6a644ea5914daad801514d9f830e4c88"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From 121d0c4c6718833ccbaaa4c32a9be0d0a6aab7c1 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Tue, 30 Apr 2024 12:14:54 +0200
Subject: [PATCH 1430/2704] feat(angular): Add support for ICU expressions.
 (#6288)

---
 queries/angular/highlights.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 7d3f45f04..09e3abfd0 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -101,6 +101,12 @@
   (defer_end_expression)
 ] @punctuation.bracket
 
+(two_way_binding
+  [
+    "[("
+    ")]"
+  ] @punctuation.bracket)
+
 [
   "{{"
   "}}"
@@ -119,6 +125,10 @@
 (concatenation_expression
   "+" @operator)
 
+(icu_clause) @keyword.operator
+
+(icu_category) @keyword.conditional
+
 (binary_expression
   [
     "-"

From 1a4274c9e1226fb4c2009f4c0c3521b1931b0c5c Mon Sep 17 00:00:00 2001
From: Lucas Lopes <lucaslquintino@gmail.com>
Date: Tue, 30 Apr 2024 12:10:19 -0300
Subject: [PATCH 1431/2704] feat(svelte): add javascript injection (#6540)

---
 queries/svelte/injections.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index d17849446..f20ae66c8 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -25,6 +25,17 @@
   (#any-of? @_lang "ts" "typescript")
   (#set! injection.language "typescript"))
 
+((script_element
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (quoted_attribute_value
+        (attribute_value) @_lang)))
+  (raw_text) @injection.content)
+  (#eq? @_attr "lang")
+  (#any-of? @_lang "js" "javascript")
+  (#set! injection.language "javascript"))
+
 ((element
   (start_tag
     (attribute

From f0a1a1331617e145e89ef394847b406545309bfc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 1 May 2024 06:37:09 +0000
Subject: [PATCH 1432/2704] bot(lockfile): update angular, cpp, djot, html,
 json5, mlir, python, solidity, supercollider, yaml

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8bf01a93f..e6aa45875 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "a9ec402bf8e0509f389dba64a6dba037ad199233"
+    "revision": "f12fc56469d778285fb35b5bdb943edcfe77c48a"
   },
   "apex": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -84,7 +84,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "72fd00128f1c38319670cbf4bcedbba0dc849d96"
+    "revision": "2369fa991eba294e9238e28280ffcd58132f94bc"
   },
   "css": {
     "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
@@ -117,7 +117,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "bc94a2867f7a1040c416212207e7e28e79ef0339"
+    "revision": "0e9a836ec47612ade15645fb1680adb549894a6c"
   },
   "dockerfile": {
     "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
@@ -300,7 +300,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "bfa075d83c6b97cd48440b3829ab8d24a2319809"
+    "revision": "eee29ca0ce287b699d9d52118f9c1cd9094c48f9"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -342,7 +342,7 @@
     "revision": "80e623c2165887f9829357acfa9c0a0bab34a3cd"
   },
   "json5": {
-    "revision": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d"
+    "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
   },
   "jsonc": {
     "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
@@ -432,7 +432,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "f92e2e11a34a3b9e64252164ffdf5fc857628ad9"
+    "revision": "d04201a28c9f93656634ca1c1d6ba775149522a0"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -552,7 +552,7 @@
     "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
   },
   "python": {
-    "revision": "b466ffb4d7ce0a833754429ad8d3a02e950ed74c"
+    "revision": "71778c2a472ed00a64abf4219544edbf8e4b86d7"
   },
   "ql": {
     "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
@@ -642,7 +642,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "1653da09ccd183f4312fba819056a13af22a65f6"
+    "revision": "fa5c61c7c5a2d9e8e99439e2cec90225f4acb86b"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -675,7 +675,7 @@
     "revision": "c68a4572e2d6403b6e99066c9a113b43f4a07a27"
   },
   "supercollider": {
-    "revision": "f8ccdc2bb4013d314c59c56079d9c2c8cbb2b624"
+    "revision": "affa4389186b6939d89673e1e9d2b28364f5ca6f"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -810,7 +810,7 @@
     "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
   },
   "yaml": {
-    "revision": "49db816e6a644ea5914daad801514d9f830e4c88"
+    "revision": "08ab1fbc18beac06b2938495a2c6ab17b5a6abc5"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From f58cae6c228e26681039253cb172de16cd764408 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 23 Apr 2024 12:23:15 -0700
Subject: [PATCH 1433/2704] feat: more `@keyword.type` captures

---
 CONTRIBUTING.md                               |  2 +-
 queries/ada/highlights.scm                    |  3 ++-
 queries/agda/highlights.scm                   |  3 ++-
 queries/apex/highlights.scm                   |  9 ++++---
 queries/c/highlights.scm                      | 11 +++++---
 queries/c_sharp/highlights.scm                | 19 ++++++++------
 queries/cairo/highlights.scm                  | 13 ++++++----
 queries/capnp/highlights.scm                  | 13 +++++-----
 queries/cpp/highlights.scm                    | 13 ++++++----
 queries/dart/highlights.scm                   |  9 ++++---
 queries/ecma/highlights.scm                   |  3 ++-
 queries/facility/highlights.scm               | 14 +++++++----
 queries/fidl/highlights.scm                   | 17 +++++++------
 queries/fortran/highlights.scm                | 25 +++++++++++--------
 queries/fusion/highlights.scm                 |  2 +-
 queries/gdscript/highlights.scm               |  7 ++++--
 queries/gdshader/highlights.scm               |  3 ++-
 queries/go/highlights.scm                     |  9 ++++---
 queries/graphql/highlights.scm                | 11 +++++---
 queries/groovy/highlights.scm                 |  3 ++-
 queries/hack/highlights.scm                   | 11 +++++---
 queries/hare/highlights.scm                   | 11 +++++---
 queries/java/highlights.scm                   | 11 +++++---
 queries/julia/highlights.scm                  |  2 +-
 queries/kotlin/highlights.scm                 |  7 ++++--
 queries/lalrpop/highlights.scm                | 13 ++++++----
 queries/leo/highlights.scm                    |  7 ++++--
 queries/matlab/highlights.scm                 | 10 ++++++--
 queries/nim/highlights.scm                    |  9 ++++---
 queries/objc/highlights.scm                   |  4 +--
 queries/ocaml/highlights.scm                  | 11 +++++---
 queries/odin/highlights.scm                   | 11 +++++---
 queries/php_only/highlights.scm               | 13 ++++++----
 queries/pony/highlights.scm                   | 15 ++++++-----
 queries/prisma/highlights.scm                 |  7 ++++--
 queries/proto/highlights.scm                  |  9 ++++---
 queries/puppet/highlights.scm                 |  7 ++++--
 queries/purescript/highlights.scm             |  9 ++++---
 queries/python/highlights.scm                 |  7 ++++--
 queries/ql/highlights.scm                     |  7 ++++--
 queries/qmljs/highlights.scm                  | 11 +++++---
 queries/rbs/highlights.scm                    | 15 ++++++++---
 queries/ruby/highlights.scm                   |  3 ++-
 queries/rust/highlights.scm                   | 13 ++++++----
 queries/scala/highlights.scm                  | 11 +++++---
 queries/slint/highlights.scm                  |  4 +--
 queries/smithy/highlights.scm                 | 14 +++++------
 queries/solidity/highlights.scm               | 11 +++++---
 queries/sourcepawn/highlights.scm             | 11 +++++---
 queries/squirrel/highlights.scm               |  7 ++++--
 queries/swift/highlights.scm                  | 12 +++++----
 queries/t32/highlights.scm                    |  2 +-
 queries/tablegen/highlights.scm               |  7 ++++--
 queries/tcl/highlights.scm                    |  3 ++-
 queries/teal/highlights.scm                   | 10 ++++----
 queries/thrift/highlights.scm                 | 17 +++++++------
 queries/tiger/highlights.scm                  |  3 ++-
 queries/typescript/highlights.scm             |  9 ++++---
 queries/usd/highlights.scm                    |  3 ++-
 queries/v/highlights.scm                      | 13 ++++++----
 queries/vala/highlights.scm                   | 16 +++++++-----
 queries/verilog/highlights.scm                | 18 +++++++------
 queries/wgsl/highlights.scm                   |  3 ++-
 queries/wing/highlights.scm                   |  3 ++-
 queries/zig/highlights.scm                    |  9 ++++---
 tests/query/highlights/capnp/test.capnp       | 12 ++++-----
 tests/query/highlights/cpp/concepts.cpp       |  2 +-
 tests/query/highlights/fusion/basic.fusion    |  2 +-
 tests/query/highlights/hack/use.hack          |  4 +--
 tests/query/highlights/prisma/test.prisma     |  2 +-
 tests/query/highlights/solidity/test.sol      |  2 +-
 tests/query/highlights/t32/var.cmm            |  6 ++---
 .../highlights/tiger/object-oriented.tig      |  4 +--
 tests/query/highlights/wing/class.w           |  2 +-
 74 files changed, 395 insertions(+), 239 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e3081e82..7528eece5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -168,7 +168,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 @keyword.function          ; keywords that define a function (e.g. `func` in Go, `def` in Python)
 @keyword.operator          ; operators that are English words (e.g. `and` / `or`)
 @keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
-@keyword.type              ; keywords describing composite types (e.g. `struct`, `enum`)
+@keyword.type              ; keywords describing namespaces and composite types (e.g. `struct`, `enum`)
 @keyword.modifier          ; keywords modifying other constructs (e.g. `const`, `static`, `public`)
 @keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
 @keyword.return            ; keywords like `return` and `yield`
diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index 5b6a09978..0d42b70f9 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -38,7 +38,6 @@
   "private"
   "protected"
   "range"
-  "record"
   "separate"
   "subtype"
   "synchronized"
@@ -50,6 +49,8 @@
   "when"
 ] @keyword
 
+"record" @keyword.type
+
 [
   "aliased"
   "constant"
diff --git a/queries/agda/highlights.scm b/queries/agda/highlights.scm
index 657e657f9..4626a8c12 100644
--- a/queries/agda/highlights.scm
+++ b/queries/agda/highlights.scm
@@ -70,9 +70,10 @@
   "infix"
   "infixl"
   "infixr"
-  "record"
 ] @keyword
 
+"record" @keyword.type
+
 ;(expr
 ;	f_name: (atom) @function)
 ; Brackets
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 50812f214..85453b227 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -227,17 +227,14 @@
 
 [
   "abstract"
-  "class"
   "continue"
   "default"
-  "enum"
   "extends"
   "final"
   "get"
   "global"
   "implements"
   "instanceof"
-  "interface"
   "on"
   "private"
   "protected"
@@ -254,4 +251,10 @@
   "inherited_sharing"
 ] @keyword
 
+[
+  "interface"
+  "class"
+  "enum"
+] @keyword.type
+
 "System.runAs" @function.builtin
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index c901b96f3..170937c8f 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -7,15 +7,18 @@
 
 [
   "default"
-  "enum"
-  "struct"
-  "typedef"
-  "union"
   "goto"
   "asm"
   "__asm__"
 ] @keyword
 
+[
+  "enum"
+  "struct"
+  "union"
+  "typedef"
+] @keyword.type
+
 [
   "sizeof"
   "offsetof"
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index e31420193..7d2621bcc 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -403,18 +403,10 @@
   "implicit"
   "explicit"
   "override"
-  "class"
-  "delegate"
-  "enum"
-  "interface"
-  "namespace"
-  "struct"
   "get"
   "set"
   "init"
   "where"
-  "record"
-  "event"
   "add"
   "remove"
   "checked"
@@ -423,6 +415,17 @@
   "alias"
 ] @keyword
 
+[
+  "enum"
+  "record"
+  "class"
+  "struct"
+  "interface"
+  "namespace"
+  "event"
+  "delegate"
+] @keyword.type
+
 [
   "async"
   "await"
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index be4a749c4..1ea6245d3 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -94,8 +94,6 @@
 [
   ; 0.x
   "using"
-  "namespace"
-  "struct"
   "let"
   "const"
   "local"
@@ -109,16 +107,21 @@
   "call"
   "nondet"
   ; 1.0
-  "type"
   "impl"
   "implicits"
   "of"
   "ref"
   "mut"
-  "trait"
-  "enum"
 ] @keyword
 
+[
+  "struct"
+  "enum"
+  "namespace"
+  "type"
+  "trait"
+] @keyword.type
+
 [
   "func"
   "fn"
diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm
index b77852ef0..a48c007ed 100644
--- a/queries/capnp/highlights.scm
+++ b/queries/capnp/highlights.scm
@@ -15,16 +15,17 @@
 (import_path) @string.special.path
 
 ; Keywords
+"extends" @keyword
+
 [
-  "annotation"
-  "enum"
-  "group"
-  "interface"
   "struct"
+  "interface"
   "union"
-  "extends"
+  "enum"
+  "annotation"
+  "group"
   "namespace"
-] @keyword
+] @keyword.type
 
 ; Builtins
 "const" @keyword.modifier
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 594e0dc24..1779d59e8 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -202,20 +202,23 @@
 ] @keyword.exception
 
 [
-  "class"
   "decltype"
   "explicit"
   "friend"
-  "namespace"
   "override"
-  "template"
-  "typename"
   "using"
-  "concept"
   "requires"
   "constexpr"
 ] @keyword
 
+[
+  "class"
+  "namespace"
+  "template"
+  "typename"
+  "concept"
+] @keyword.type
+
 [
   "co_await"
   "co_yield"
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 2b0f0c6de..142c6e190 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -196,10 +196,7 @@
   (case_builtin)
   "late"
   "required"
-  "extension"
   "on"
-  "class"
-  "enum"
   "extends"
   "in"
   "is"
@@ -208,6 +205,12 @@
   "with"
 ] @keyword
 
+[
+  "class"
+  "enum"
+  "extension"
+] @keyword.type
+
 "return" @keyword.return
 
 ; Built in identifiers:
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 2d969aa36..12068af17 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -338,7 +338,6 @@
 
 [
   "break"
-  "class"
   "const"
   "debugger"
   "export"
@@ -352,6 +351,8 @@
   "with"
 ] @keyword
 
+"class" @keyword.type
+
 [
   "async"
   "await"
diff --git a/queries/facility/highlights.scm b/queries/facility/highlights.scm
index 553550a70..6816b480e 100644
--- a/queries/facility/highlights.scm
+++ b/queries/facility/highlights.scm
@@ -17,15 +17,19 @@
 
 (doc_comment) @comment.documentation @spell
 
-"method" @keyword.function
-
 [
   "service"
   "errors"
-  "data"
+] @keyword
+
+"method" @keyword.function
+
+[
   "enum"
-  "extern"
-] @type.builtin
+  "data"
+] @keyword.type
+
+"extern" @keyword.modifier
 
 (type) @type.builtin
 
diff --git a/queries/fidl/highlights.scm b/queries/fidl/highlights.scm
index ce7727010..f1960c612 100644
--- a/queries/fidl/highlights.scm
+++ b/queries/fidl/highlights.scm
@@ -6,7 +6,6 @@
   "closed"
   "compose"
   "const"
-  "enum"
   "error"
   "flexible"
   "library"
@@ -15,16 +14,20 @@
   "overlay"
   "protocol"
   "reserved"
-  "resource"
-  "service"
   "strict"
-  "struct"
-  "table"
-  "type"
-  "union"
   "using"
 ] @keyword
 
+[
+  "enum"
+  "struct"
+  "table"
+  "union"
+  "resource"
+  "service"
+  "type"
+] @keyword.type
+
 (primitives_type) @type.builtin
 
 (builtin_complex_type) @type.builtin
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index bbe0dd6ee..34b612c8b 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -49,28 +49,18 @@
   "attributes"
   "associate"
   "block"
-  "class"
   "classis"
   "contains"
   "default"
   "dimension"
   "endassociate"
-  "endenum"
-  "endinterface"
-  "endmodule"
   "endselect"
-  "endsubmodule"
-  "endtype"
-  "enum"
   "enumerator"
   "equivalence"
   "extends"
   "goto"
-  "interface"
   "intrinsic"
   "non_intrinsic"
-  "module"
-  "submodule"
   "namelist"
   "parameter"
   "quiet"
@@ -82,10 +72,23 @@
   "sequence"
   "stop"
   "target"
-  "type"
   "typeis"
 ] @keyword
 
+[
+  "class"
+  "enum"
+  "endenum"
+  "type"
+  "endtype"
+  "module"
+  "endmodule"
+  "submodule"
+  "endsubmodule"
+  "interface"
+  "endinterface"
+] @keyword.type
+
 (default) @keyword
 
 ; Types
diff --git a/queries/fusion/highlights.scm b/queries/fusion/highlights.scm
index dca576f84..7108e5705 100644
--- a/queries/fusion/highlights.scm
+++ b/queries/fusion/highlights.scm
@@ -46,7 +46,7 @@
   (source_file) @string.special.url)
 
 (namespace_declaration
-  "namespace" @keyword
+  "namespace" @keyword.type
   (alias_namespace) @module)
 
 (type
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 76dc89061..691d836ce 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -210,11 +210,9 @@
 
 [
   "pass"
-  "class"
   "class_name"
   "extends"
   "signal"
-  "enum"
   "var"
   "onready"
   "export"
@@ -227,6 +225,11 @@
   "puppetsync"
 ] @keyword
 
+[
+  "enum"
+  "class"
+] @keyword.type
+
 "func" @keyword.function
 
 "return" @keyword.return
diff --git a/queries/gdshader/highlights.scm b/queries/gdshader/highlights.scm
index fb8c053e7..c93fd4721 100644
--- a/queries/gdshader/highlights.scm
+++ b/queries/gdshader/highlights.scm
@@ -7,9 +7,10 @@
   "const"
   "varying"
   "uniform"
-  "struct"
 ] @keyword
 
+"struct" @keyword.type
+
 [
   (precision_qualifier)
   (interpolation_qualifier)
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 06406923b..62497b0c9 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -102,15 +102,18 @@
   "default"
   "defer"
   "goto"
-  "interface"
   "range"
   "select"
-  "struct"
-  "type"
   "var"
   "fallthrough"
 ] @keyword
 
+[
+  "type"
+  "struct"
+  "interface"
+] @keyword.type
+
 "func" @keyword.function
 
 "return" @keyword.return
diff --git a/queries/graphql/highlights.scm b/queries/graphql/highlights.scm
index 24db06645..c1ee501c4 100644
--- a/queries/graphql/highlights.scm
+++ b/queries/graphql/highlights.scm
@@ -123,10 +123,6 @@
   "subscription"
   "fragment"
   "scalar"
-  "type"
-  "interface"
-  "union"
-  "enum"
   "input"
   "extend"
   "directive"
@@ -136,6 +132,13 @@
   "implements"
 ] @keyword
 
+[
+  "enum"
+  "union"
+  "type"
+  "interface"
+] @keyword.type
+
 ; Punctuation
 ;------------
 [
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index 0266ee1f7..de62bbb4f 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -1,12 +1,13 @@
 [
   "!instanceof"
   "assert"
-  "class"
   "extends"
   "instanceof"
   "package"
 ] @keyword
 
+"class" @keyword.type
+
 [
   "!in"
   "as"
diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm
index 35d71e722..bb9d2a55c 100644
--- a/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -22,18 +22,21 @@
 "function" @keyword.function
 
 [
-  "type"
-  "interface"
   "implements"
-  "class"
   "using"
-  "namespace"
   "attribute"
   "const"
   "extends"
   "insteadof"
 ] @keyword
 
+[
+  "class"
+  "type"
+  "interface"
+  "namespace"
+] @keyword.type
+
 [
   "async"
   "await"
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index 67d3eb499..dc7947725 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -41,14 +41,17 @@
 ; Keywords
 [
   "def"
-  "enum"
   "export"
   "let"
-  "struct"
-  "type"
-  "union"
 ] @keyword
 
+[
+  "enum"
+  "struct"
+  "union"
+  "type"
+] @keyword.type
+
 "fn" @keyword.function
 
 [
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 3bc7fcdd6..aadb804af 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -168,20 +168,23 @@
 ; Keywords
 [
   "assert"
-  "class"
-  "record"
   "default"
-  "enum"
   "extends"
   "implements"
   "instanceof"
-  "interface"
   "@interface"
   "permits"
   "to"
   "with"
 ] @keyword
 
+[
+  "record"
+  "class"
+  "enum"
+  "interface"
+] @keyword.type
+
 (synchronized_statement
   "synchronized" @keyword)
 
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 18ef586ac..d67c69c3e 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -249,7 +249,7 @@
   [
     "struct"
     "end"
-  ] @keyword)
+  ] @keyword.type)
 
 (macro_definition
   [
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 4af95c4c3..f30986542 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -242,12 +242,15 @@
 [
   "val"
   "var"
+  ;	"typeof" ; NOTE: It is reserved for future use
+] @keyword
+
+[
   "enum"
   "class"
   "object"
   "interface"
-  ;	"typeof" ; NOTE: It is reserved for future use
-] @keyword
+] @keyword.type
 
 [
   "return"
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index 951192ea8..1295f3f61 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -1,11 +1,14 @@
+"grammar" @keyword
+
 [
-  "enum"
-  "extern"
-  "grammar"
-  "match"
   "type"
+  "enum"
+] @keyword.type
+
+[
   "pub"
-] @keyword
+  "extern"
+] @keyword.modifier
 
 [
   "match"
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index c0e2e4065..88e98850e 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -12,12 +12,15 @@
   "let"
   "mapping"
   "program"
-  "record"
   "self"
-  "struct"
   "then"
 ] @keyword
 
+[
+  "record"
+  "struct"
+] @keyword.type
+
 "in" @keyword.operator
 
 [
diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index a2ebc153a..2740ef054 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -5,9 +5,7 @@
 ; Keywords
 [
   "arguments"
-  "classdef"
   "end"
-  "enumeration"
   "events"
   "global"
   "methods"
@@ -15,6 +13,14 @@
   "properties"
 ] @keyword
 
+"enumeration" @keyword.type
+
+(class_definition
+  [
+    "classdef"
+    "end"
+  ] @keyword.type)
+
 ; Conditionals
 (if_statement
   [
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index c5207ff62..df42c0f7f 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -408,7 +408,6 @@
   "const"
   "let"
   "var"
-  "type"
   "concept"
   "asm"
   "bind"
@@ -416,14 +415,18 @@
   "do"
   "mixin"
   "static"
-  "object"
   "tuple"
-  "enum"
   "block"
   "using"
   "discard"
 ] @keyword
 
+[
+  "enum"
+  "object"
+  "type"
+] @keyword.type
+
 ; =============================================================================
 ; @keyword.function    ; keywords that define a function (e.g. `func` in Go, `def` in Python)
 [
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index b068bf13c..0f412404f 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -46,8 +46,8 @@
 ] @keyword
 
 (class_declaration
-  "@" @keyword
-  "class" @keyword) ; I hate Obj-C for allowing "@ class" :)
+  "@" @keyword.type
+  "class" @keyword.type) ; I hate Obj-C for allowing "@ class" :)
 
 (method_definition
   [
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index abd0f6bd4..10c0eb956 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -120,7 +120,6 @@
   "as"
   "assert"
   "begin"
-  "class"
   "constraint"
   "end"
   "external"
@@ -132,16 +131,20 @@
   "method"
   "module"
   "new"
-  "object"
   "of"
   "sig"
-  "struct"
-  "type"
   "val"
   "when"
   "with"
 ] @keyword
 
+[
+  "object"
+  "class"
+  "struct"
+  "type"
+] @keyword.type
+
 [
   "lazy"
   "mutable"
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 5aafc4941..0d041f6bb 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -14,9 +14,6 @@
 [
   "foreign"
   "using"
-  "struct"
-  "enum"
-  "union"
   "defer"
   "cast"
   "transmute"
@@ -24,9 +21,15 @@
   "map"
   "bit_set"
   "matrix"
-  "bit_field"
 ] @keyword
 
+[
+  "struct"
+  "enum"
+  "union"
+  "bit_field"
+] @keyword.type
+
 "proc" @keyword.function
 
 [
diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 3d88567e6..8047cc901 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -13,26 +13,29 @@
 ] @keyword.function
 
 [
-  "class"
   "clone"
   "declare"
   "default"
   "echo"
   "enddeclare"
-  "enum"
   "extends"
   "global"
   "goto"
   "implements"
   "insteadof"
-  "interface"
   "print"
-  "namespace"
   "new"
-  "trait"
   "unset"
 ] @keyword
 
+[
+  "enum"
+  "class"
+  "interface"
+  "namespace"
+  "trait"
+] @keyword.type
+
 [
   "abstract"
   "const"
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
index 53024d5e5..aa65866df 100644
--- a/queries/pony/highlights.scm
+++ b/queries/pony/highlights.scm
@@ -3,13 +3,7 @@
 
 ; Keywords
 [
-  "type"
-  "actor"
-  "class"
   "primitive"
-  "interface"
-  "trait"
-  "struct"
   "embed"
   "let"
   "var"
@@ -21,6 +15,15 @@
   "where"
 ] @keyword
 
+[
+  "class"
+  "struct"
+  "type"
+  "interface"
+  "trait"
+  "actor"
+] @keyword.type
+
 "fun" @keyword.function
 
 "be" @keyword.coroutine
diff --git a/queries/prisma/highlights.scm b/queries/prisma/highlights.scm
index ce9c25590..9d2d1934e 100644
--- a/queries/prisma/highlights.scm
+++ b/queries/prisma/highlights.scm
@@ -2,13 +2,16 @@
 
 [
   "datasource"
-  "enum"
   "generator"
   "model"
-  "type"
   "view"
 ] @keyword
 
+[
+  "type"
+  "enum"
+] @keyword.type
+
 (comment) @comment @spell
 
 (developer_comment) @comment.documentation @spell
diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm
index f67f4574e..51f44a754 100644
--- a/queries/proto/highlights.scm
+++ b/queries/proto/highlights.scm
@@ -1,16 +1,19 @@
 [
-  "enum"
   "extend"
   "extensions"
-  "message"
   "oneof"
   "option"
   "reserved"
-  "service"
   "syntax"
   "to"
 ] @keyword
 
+[
+  "enum"
+  "service"
+  "message"
+] @keyword.type
+
 "rpc" @keyword.function
 
 "returns" @keyword.return
diff --git a/queries/puppet/highlights.scm b/queries/puppet/highlights.scm
index d1698d736..10621930f 100644
--- a/queries/puppet/highlights.scm
+++ b/queries/puppet/highlights.scm
@@ -13,14 +13,17 @@
 
 ; Keywords
 [
-  "class"
   "inherits"
   "node"
-  "type"
   "tag"
   "require"
 ] @keyword
 
+[
+  "type"
+  "class"
+] @keyword.type
+
 [
   "define"
   "function"
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index ae9e930ca..5f07e9b48 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -90,13 +90,10 @@
   (where)
   "let"
   "in"
-  "class"
   "instance"
   "derive"
   "foreign"
   "data"
-  "newtype"
-  "type"
   "as"
   "hiding"
   "do"
@@ -108,6 +105,12 @@
   "infixr"
 ] @keyword
 
+[
+  "type"
+  "newtype"
+  "class"
+] @keyword.type
+
 (class_instance
   "else" @keyword)
 
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 4737fd401..663fccf55 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -300,7 +300,6 @@
 
 [
   "assert"
-  "class"
   "exec"
   "global"
   "nonlocal"
@@ -308,9 +307,13 @@
   "print"
   "with"
   "as"
-  "type"
 ] @keyword
 
+[
+  "type"
+  "class"
+] @keyword.type
+
 [
   "async"
   "await"
diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm
index 434ec3316..f42812068 100644
--- a/queries/ql/highlights.scm
+++ b/queries/ql/highlights.scm
@@ -1,13 +1,11 @@
 [
   "as"
   "by"
-  "class"
   "extends"
   "from"
   "implies"
   "in"
   "module"
-  "newtype"
   "order"
   "select"
   "where"
@@ -16,6 +14,11 @@
   (specialId)
 ] @keyword
 
+[
+  "newtype"
+  "class"
+] @keyword.type
+
 [
   "and"
   "not"
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index cef6639de..2caeb7ba3 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -102,13 +102,16 @@
   "property"
   "signal"
   "declare"
-  "enum"
   "export"
   "implements"
-  "interface"
-  "namespace"
-  "type"
   "override"
 ] @keyword
 
+[
+  "interface"
+  "type"
+  "enum"
+  "namespace"
+] @keyword.type
+
 "keyof" @keyword.operator
diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index f2066d855..1000e3bed 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -16,10 +16,7 @@
 [
   "use"
   "as"
-  "class"
   "module"
-  "interface"
-  "type"
   "def"
   "attr_reader"
   "attr_writer"
@@ -28,6 +25,18 @@
   "alias"
 ] @keyword
 
+[
+  "interface"
+  "type"
+  "class"
+] @keyword.type
+
+(class_decl
+  "end" @keyword.type)
+
+(interface_decl
+  "end" @keyword.type)
+
 "def" @keyword.function
 
 ; Members of declaration
diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 15f709128..83cffffd4 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -8,7 +8,6 @@
 [
   "alias"
   "begin"
-  "class"
   "do"
   "end"
   "ensure"
@@ -17,6 +16,8 @@
   "then"
 ] @keyword
 
+"class" @keyword.type
+
 [
   "return"
   "yield"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index abbd2eba6..c392c030f 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -243,18 +243,21 @@
 
 [
   "default"
-  "enum"
   "impl"
   "let"
   "move"
-  "struct"
-  "trait"
-  "type"
-  "union"
   "unsafe"
   "where"
 ] @keyword
 
+[
+  "enum"
+  "struct"
+  "union"
+  "trait"
+  "type"
+] @keyword.type
+
 [
   "async"
   "await"
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 45ef1ada4..ffecefaf4 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -170,8 +170,6 @@
 
 [
   "case"
-  "class"
-  "enum"
   "extends"
   "derives"
   "finally"
@@ -180,8 +178,6 @@
   "object"
   "override"
   "package"
-  "trait"
-  "type"
   "val"
   "var"
   "with"
@@ -193,6 +189,13 @@
   "with"
 ] @keyword
 
+[
+  "enum"
+  "class"
+  "trait"
+  "type"
+] @keyword.type
+
 [
   "abstract"
   "final"
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 4e108e28d..562499733 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -214,7 +214,7 @@
   ] @keyword)
 
 (enum_definition
-  "enum" @keyword)
+  "enum" @keyword.type)
 
 (for_loop
   [
@@ -250,7 +250,7 @@
   ] @keyword)
 
 (struct_definition
-  "struct" @keyword)
+  "struct" @keyword.type)
 
 (transitions_definition
   [
diff --git a/queries/smithy/highlights.scm b/queries/smithy/highlights.scm
index 1d0321864..24389281a 100644
--- a/queries/smithy/highlights.scm
+++ b/queries/smithy/highlights.scm
@@ -16,7 +16,13 @@
   "list"
   "map"
   "set"
-] @type.builtin
+  "structure"
+  "union"
+  "namespace"
+  "service"
+  "operation"
+  "resource"
+] @keyword.type
 
 ; Fields (Members)
 ; (field) @variable.member
@@ -57,12 +63,6 @@
 
 ; Keywords
 [
-  "namespace"
-  "service"
-  "structure"
-  "operation"
-  "union"
-  "resource"
   "metadata"
   "apply"
   "for"
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index a9da981f4..1f1d2fe96 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -141,12 +141,8 @@
 
 ; Keywords
 [
-  "contract"
-  "interface"
   "library"
   "is"
-  "struct"
-  "enum"
   "event"
   "assembly"
   "emit"
@@ -161,6 +157,13 @@
   (virtual)
 ] @keyword
 
+[
+  "enum"
+  "struct"
+  "contract"
+  "interface"
+] @keyword.type
+
 ; FIXME: update grammar
 ; (block_statement "unchecked" @keyword)
 (event_parameter
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
index 6fe94e610..21cbb9733 100644
--- a/queries/sourcepawn/highlights.scm
+++ b/queries/sourcepawn/highlights.scm
@@ -276,8 +276,6 @@
   "__nullable__"
   "defined"
   "delete"
-  "enum"
-  "funcenum"
   "functag"
   "get"
   "methodmap"
@@ -285,12 +283,17 @@
   "property"
   "public"
   "set"
-  "struct"
-  "typedef"
   "typeset"
   "void"
 ] @keyword
 
+[
+  "enum"
+  "funcenum"
+  "struct"
+  "typedef"
+] @keyword.type
+
 [
   "const"
   "native"
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index db4e12429..351cb5d25 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -1,15 +1,18 @@
 ; Keywords
 [
-  "class"
   "clone"
   "delete"
-  "enum"
   "extends"
   "rawcall"
   "resume"
   "var"
 ] @keyword
 
+[
+  "class"
+  "enum"
+] @keyword.type
+
 "function" @keyword.function
 
 [
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 3ee1d2e8b..decb506e0 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -67,11 +67,6 @@
   bound_identifier: (simple_identifier)) @variable
 
 [
-  "typealias"
-  "struct"
-  "class"
-  "actor"
-  "enum"
   "protocol"
   "extension"
   "indirect"
@@ -87,6 +82,13 @@
   "willSet"
 ] @keyword
 
+[
+  "enum"
+  "struct"
+  "class"
+  "typealias"
+] @keyword.type
+
 [
   "async"
   "await"
diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm
index 1e7b420f0..9211a49d2 100644
--- a/queries/t32/highlights.scm
+++ b/queries/t32/highlights.scm
@@ -61,7 +61,7 @@
   "enum"
   "struct"
   "union"
-] @keyword
+] @keyword.type
 
 "sizeof" @keyword.operator
 
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index e4084be26..8c3c42be6 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -7,8 +7,6 @@
 ; Keywords
 [
   "assert"
-  "class"
-  "multiclass"
   "field"
   "let"
   "def"
@@ -17,6 +15,11 @@
   "defvar"
 ] @keyword
 
+[
+  "multiclass"
+  "class"
+] @keyword.type
+
 "in" @keyword.operator
 
 ; Conditionals
diff --git a/queries/tcl/highlights.scm b/queries/tcl/highlights.scm
index f36f65623..c5f1f4c36 100644
--- a/queries/tcl/highlights.scm
+++ b/queries/tcl/highlights.scm
@@ -37,12 +37,13 @@
 
 [
   "error"
-  "namespace"
   "on"
   "set"
   "try"
 ] @keyword
 
+"namespace" @keyword.type
+
 (unpack) @operator
 
 [
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index ec80ead0f..e58d588bb 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -153,24 +153,24 @@
 ; Types
 (record_declaration
   .
-  "record" @keyword
+  "record" @keyword.type
   name: (identifier) @type)
 
 (anon_record
   .
-  "record" @keyword)
+  "record" @keyword.type)
 
 (record_body
   (record_declaration
     .
-    "record" @keyword
+    "record" @keyword.type
     .
     name: (identifier) @type))
 
 (record_body
   (enum_declaration
     .
-    "enum" @keyword
+    "enum" @keyword.type
     .
     name: (identifier) @type))
 
@@ -191,7 +191,7 @@
   (userdata) @keyword)
 
 (enum_declaration
-  "enum" @keyword
+  "enum" @keyword.type
   name: (identifier) @type)
 
 (type_declaration
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index afb0eee4f..8955faa1f 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -120,19 +120,22 @@
 
 ; Keywords
 [
-  "enum"
   "exception"
   "extends"
-  "interaction"
-  "namespace"
-  "senum"
-  "service"
-  "struct"
   "typedef"
-  "union"
   "uri"
 ] @keyword
 
+[
+  "enum"
+  "struct"
+  "union"
+  "senum"
+  "interaction"
+  "namespace"
+  "service"
+] @keyword.type
+
 ; Deprecated Keywords
 [
   "cocoa_prefix"
diff --git a/queries/tiger/highlights.scm b/queries/tiger/highlights.scm
index 901e2d571..cbb1f2310 100644
--- a/queries/tiger/highlights.scm
+++ b/queries/tiger/highlights.scm
@@ -42,7 +42,6 @@
   "then"
   "type"
   "var"
-  "class"
   "extends"
   "_cast"
   "_chunks"
@@ -51,6 +50,8 @@
   "_namety"
 ] @keyword
 
+"class" @keyword.type
+
 ; }}}
 ; Operators {{{
 (operator) @operator
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 5fae21b96..bd13b1cb5 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -7,12 +7,9 @@
 
 [
   "declare"
-  "enum"
   "export"
   "implements"
-  "interface"
   "type"
-  "namespace"
   "override"
   "module"
   "asserts"
@@ -21,6 +18,12 @@
   "using"
 ] @keyword
 
+[
+  "namespace"
+  "interface"
+  "enum"
+] @keyword.type
+
 [
   "keyof"
   "satisfies"
diff --git a/queries/usd/highlights.scm b/queries/usd/highlights.scm
index 0889f1925..d6c2a3668 100644
--- a/queries/usd/highlights.scm
+++ b/queries/usd/highlights.scm
@@ -39,11 +39,12 @@
   (identifier) @module)
 
 [
-  "class"
   "def"
   "over"
 ] @keyword.function
 
+"class" @keyword.type
+
 [
   "("
   ")"
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 484f7fe59..b20389624 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -10,16 +10,19 @@
   "assert"
   "const"
   "defer"
-  "enum"
   "goto"
-  "interface"
-  "struct"
   "sql"
-  "type"
-  "union"
   "unsafe"
 ] @keyword
 
+[
+  "enum"
+  "union"
+  "struct"
+  "interface"
+  "type"
+] @keyword.type
+
 [
   "as"
   "in"
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index b89df9432..0ba11caa1 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -174,17 +174,12 @@
 
 [
   "abstract"
-  "class"
   "construct"
   "continue"
   "default"
-  "delegate"
-  "enum"
   "errordomain"
   "get"
   "inline"
-  "interface"
-  "namespace"
   "new"
   "out"
   "override"
@@ -192,11 +187,20 @@
   "ref"
   "set"
   "signal"
-  "struct"
   "virtual"
   "with"
 ] @keyword
 
+[
+  "enum"
+  "class"
+  "struct"
+  "interface"
+  "namespace"
+] @keyword.type
+
+"delegate" @keyword.function
+
 [
   "async"
   "yield"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 483f194ec..e5393ac52 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -6,10 +6,6 @@
   "endmodule"
   "program"
   "endprogram"
-  "class"
-  "endclass"
-  "interface"
-  "endinterface"
   "package"
   "endpackage"
   "checker"
@@ -40,6 +36,16 @@
   (unique_priority)
 ] @keyword
 
+[
+  "class"
+  "endclass"
+  "interface"
+  "endinterface"
+  "enum"
+  "struct"
+  "union"
+] @keyword.type
+
 [
   "function"
   "endfunction"
@@ -265,10 +271,6 @@
   (data_type
     "packed" @keyword.modifier))
 
-(struct_union) @type
-
-"enum" @type
-
 (enum_name_declaration
   (enum_identifier
     (simple_identifier) @constant))
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index e5dd7b6ac..854ffe921 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -27,7 +27,6 @@
   (type_declaration) @function.call)
 
 [
-  "struct"
   "bitcast"
   "discard"
   "enable"
@@ -39,6 +38,8 @@
   (texel_format)
 ] @keyword
 
+"struct" @keyword.type
+
 [
   "private"
   "storage"
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 0171e09de..d417675e1 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -79,12 +79,13 @@
 [
   "as"
   "bring"
-  "class"
   "let"
   "new"
   (inflight_specifier)
 ] @keyword
 
+"class" @keyword.type
+
 [
   "for"
   "in"
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 9ceede3e5..f0597ce34 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -98,13 +98,16 @@ field_constant: (IDENTIFIER) @constant
   "defer"
   "errdefer"
   "test"
-  "struct"
-  "union"
-  "enum"
   "opaque"
   "error"
 ] @keyword
 
+[
+  "struct"
+  "union"
+  "enum"
+] @keyword.type
+
 [
   "async"
   "await"
diff --git a/tests/query/highlights/capnp/test.capnp b/tests/query/highlights/capnp/test.capnp
index 9480affd3..b70e91358 100644
--- a/tests/query/highlights/capnp/test.capnp
+++ b/tests/query/highlights/capnp/test.capnp
@@ -35,7 +35,7 @@ using Cxx = import "c++.capnp";
 $Cxx.namespace("capnproto_test::capnp::test");
 
 enum TestEnum {
-# <- @keyword
+# <- @keyword.type
 #    ^^^^^^^^ @type
   foo @0;
 # ^^^ @constant
@@ -51,7 +51,7 @@ enum TestEnum {
 # <- @punctuation.bracket
 
 struct TestAllTypes {
-# <- @keyword
+# <- @keyword.type
   voidField      @0  : Void;
 # ^^^^^^^^^ @variable.member
 #                    ^ @punctuation.special
@@ -97,7 +97,7 @@ struct TestInterleavedGroups {
     foo @0 :UInt32;
     bar @2 :UInt64;
     union {
-#   ^^^^^ @keyword
+#   ^^^^^ @keyword.type
       qux @4 :UInt16;
       corge :group {
 #     ^^^^^ @type
@@ -114,7 +114,7 @@ struct TestInterleavedGroups {
   }
 
   group2 :group {
-#         ^^^^^ @keyword
+#         ^^^^^ @keyword.type
     foo @1 :UInt32;
     bar @3 :UInt64;
     union {
@@ -214,7 +214,7 @@ struct TestGenerics(Foo, Bar) {
       qux @3 :Qux;
 
       interface DeepNestInterface(Quux) {
-#     ^^^^^^^^^ @keyword
+#     ^^^^^^^^^ @keyword.type
         # At one time this failed to compile.
         call @0 () -> ();
 #       ^^^^ @function.method
@@ -230,7 +230,7 @@ struct TestGenerics(Foo, Bar) {
   }
 
   annotation ann(struct) :Foo;
-# ^^^^^^^^^^ @keyword
+# ^^^^^^^^^^ @keyword.type
 #            ^^^ @function.method
 #                ^^^^^^ @variable.parameter.builtin
 
diff --git a/tests/query/highlights/cpp/concepts.cpp b/tests/query/highlights/cpp/concepts.cpp
index 09d975c98..3189813bc 100644
--- a/tests/query/highlights/cpp/concepts.cpp
+++ b/tests/query/highlights/cpp/concepts.cpp
@@ -1,7 +1,7 @@
 
 template <class T, class U>
 concept Derived = std::is_base_of<U, T>::value;
-//  ^ @keyword
+//  ^ @keyword.type
 //       ^ @type.definition
 
 template<typename T>
diff --git a/tests/query/highlights/fusion/basic.fusion b/tests/query/highlights/fusion/basic.fusion
index 16b99f431..5f3cc346a 100644
--- a/tests/query/highlights/fusion/basic.fusion
+++ b/tests/query/highlights/fusion/basic.fusion
@@ -3,7 +3,7 @@ include: SomeFile.fusion
 //       ^ @string.special.url
 
 namespace: ns = Neos.Fusion.Space
-//<- @keyword
+//<- @keyword.type
 //         ^ @module
 //            ^ @operator
 //              ^ @module
diff --git a/tests/query/highlights/hack/use.hack b/tests/query/highlights/hack/use.hack
index 0b1fde364..ab17d1140 100644
--- a/tests/query/highlights/hack/use.hack
+++ b/tests/query/highlights/hack/use.hack
@@ -5,9 +5,9 @@ use function Space\Func\F as E;
 //                           ^ @function
 //                      ^ @function
 use type Space\Type\T;
-//  ^ @keyword
+//  ^ @keyword.type
 use namespace Space\Name\N as M;
-//  ^ @keyword
+//  ^ @keyword.type
 //             ^ @module
 
 use namespace Space\Name2\N2, Space\Nothing\N3 as N8, type Space\Type2\N4,;
diff --git a/tests/query/highlights/prisma/test.prisma b/tests/query/highlights/prisma/test.prisma
index 6a5795699..5517e9eb5 100644
--- a/tests/query/highlights/prisma/test.prisma
+++ b/tests/query/highlights/prisma/test.prisma
@@ -47,7 +47,7 @@ model Reaction {
 }
 
 enum ReactionType {
-// ^ keyword
+// ^ keyword.type
   LIKE
   HAHA
   SAD
diff --git a/tests/query/highlights/solidity/test.sol b/tests/query/highlights/solidity/test.sol
index b53dd857d..52334bd7e 100644
--- a/tests/query/highlights/solidity/test.sol
+++ b/tests/query/highlights/solidity/test.sol
@@ -12,7 +12,7 @@ import * as something from "anotherFile";
 /// @title Voting with delegation.
 // <- @comment
 contract Ballot {
-// ^keyword
+// ^keyword.type
 //       ^ @type
     // This declares a new complex type which will
     // be used for variables later.
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
index b8dc463b5..0deed996f 100644
--- a/tests/query/highlights/t32/var.cmm
+++ b/tests/query/highlights/t32/var.cmm
@@ -44,17 +44,17 @@ Var.Assign padd = (CAddition const * volatile)&d
 ;                                              ^ @variable
 Var.Assign e1 = (enum e2)&e
 ;          ^ @variable
-;                ^ @keyword
+;                ^ @keyword.type
 ;                     ^ @type
 ;                         ^ @variable
 Var.Assign *vector = (struct Vector3d*)&acceleration
 ;           ^ @variable
-;                     ^ @keyword
+;                     ^ @keyword.type
 ;                            ^ @type
 ;                                       ^ @variable
 Var.Assign z = (union foo)x
 ;          ^ @variable
-;               ^ @keyword
+;               ^ @keyword.type
 ;                     ^ @type
 ;                         ^ @variable
 Var.Assign b = -a
diff --git a/tests/query/highlights/tiger/object-oriented.tig b/tests/query/highlights/tiger/object-oriented.tig
index e67029c42..5c48c543e 100644
--- a/tests/query/highlights/tiger/object-oriented.tig
+++ b/tests/query/highlights/tiger/object-oriented.tig
@@ -1,11 +1,11 @@
 let
   class A extends Object {}
-  /* <- @keyword */
+  /* <- @keyword.type */
   /*      ^ @keyword */
   /*              ^ @type.builtin */
 
   type B = class extends A {
-  /*       ^ @keyword */
+  /*       ^ @keyword.type */
   /*             ^ @keyword */
   /*                     ^ @type */
 
diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
index 602b2f749..9f76b16e8 100644
--- a/tests/query/highlights/wing/class.w
+++ b/tests/query/highlights/wing/class.w
@@ -2,7 +2,7 @@ bring cloud;
 // <- @keyword
 
 class Foo {
-// <- @keyword
+// <- @keyword.type
 //    ^   @type
 //        ^ @punctuation.bracket
   name: str;

From 9a47a523e3b9e49d3fa14d5743b9860a66eca731 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 21 Apr 2024 17:15:08 -0700
Subject: [PATCH 1434/2704] feat: import statement folds for common languages

---
 queries/c/folds.scm       | 1 +
 queries/c_sharp/folds.scm | 5 ++++-
 queries/css/folds.scm     | 5 ++++-
 queries/ecma/folds.scm    | 2 +-
 queries/haskell/folds.scm | 1 +
 queries/java/folds.scm    | 1 +
 queries/python/folds.scm  | 5 +++++
 queries/rust/folds.scm    | 2 +-
 8 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/queries/c/folds.scm b/queries/c/folds.scm
index 2e2a6b4d0..bb26a62eb 100644
--- a/queries/c/folds.scm
+++ b/queries/c/folds.scm
@@ -16,6 +16,7 @@
   (preproc_function_def)
   (initializer_list)
   (gnu_asm_expression)
+  (preproc_include)+
 ] @fold
 
 (compound_statement
diff --git a/queries/c_sharp/folds.scm b/queries/c_sharp/folds.scm
index bdd7b6551..80ae4e44b 100644
--- a/queries/c_sharp/folds.scm
+++ b/queries/c_sharp/folds.scm
@@ -8,4 +8,7 @@ accessors: (accessor_list) @fold
 
 initializer: (initializer_expression) @fold
 
-(block) @fold
+[
+  (block)
+  (using_directive)+
+] @fold
diff --git a/queries/css/folds.scm b/queries/css/folds.scm
index 2c244d63f..dc3c14df9 100644
--- a/queries/css/folds.scm
+++ b/queries/css/folds.scm
@@ -1 +1,4 @@
-(rule_set) @fold
+[
+  (rule_set)
+  (import_statement)+
+] @fold
diff --git a/queries/ecma/folds.scm b/queries/ecma/folds.scm
index ef1bda52f..0d4124a70 100644
--- a/queries/ecma/folds.scm
+++ b/queries/ecma/folds.scm
@@ -13,7 +13,7 @@
   (switch_statement)
   (switch_case)
   (switch_default)
-  (import_statement)
+  (import_statement)+
   (if_statement)
   (try_statement)
   (catch_clause)
diff --git a/queries/haskell/folds.scm b/queries/haskell/folds.scm
index a1af2a169..5bb256563 100644
--- a/queries/haskell/folds.scm
+++ b/queries/haskell/folds.scm
@@ -2,4 +2,5 @@
   (exp_apply)
   (exp_do)
   (function)
+  (import)+
 ] @fold
diff --git a/queries/java/folds.scm b/queries/java/folds.scm
index b0cdead4b..2cc143a78 100644
--- a/queries/java/folds.scm
+++ b/queries/java/folds.scm
@@ -4,4 +4,5 @@
   (constructor_declaration)
   (argument_list)
   (annotation_argument_list)
+  (import_declaration)+
 ] @fold
diff --git a/queries/python/folds.scm b/queries/python/folds.scm
index 7c547db38..ecb9352d7 100644
--- a/queries/python/folds.scm
+++ b/queries/python/folds.scm
@@ -21,3 +21,8 @@
   (dictionary)
   (string)
 ] @fold
+
+[
+  (import_statement)
+  (import_from_statement)
+]+ @fold
diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index 4c8c61f28..e5721c021 100644
--- a/queries/rust/folds.scm
+++ b/queries/rust/folds.scm
@@ -9,7 +9,7 @@
   (type_item)
   (union_item)
   (const_item)
-  (use_declaration)
+  (use_declaration)+
   (let_declaration)
   (loop_expression)
   (for_expression)

From c371992bcd1b296643f922154001b2d8811b72aa Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Wed, 1 May 2024 04:31:28 -0700
Subject: [PATCH 1435/2704] feat(git_config): Highlight escape sequences

---
 queries/git_config/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index fb9d3be2c..3423e1b0c 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -25,6 +25,8 @@
 
 (string) @string
 
+(escape_sequence) @string.escape
+
 ((string) @string.special.path
   (#lua-match? @string.special.path "^[.]?[.]?[/]"))
 

From 46cac01880606f07004f35eed174c2f1b01cce46 Mon Sep 17 00:00:00 2001
From: Kai Moschcau <kai.moschcau@blecon.de>
Date: Mon, 29 Apr 2024 14:48:27 +0200
Subject: [PATCH 1436/2704] feat(bash,fish): deactivate spelling in shebangs

---
 queries/bash/highlights.scm | 2 +-
 queries/fish/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 6547bea7a..feb0e038e 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -228,5 +228,5 @@
 
 ((program
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 987982d80..10ed533d3 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -172,5 +172,5 @@
 
 ((program
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))

From 60c2b084c2646d0664fd7fce9418a01d387dd713 Mon Sep 17 00:00:00 2001
From: Kai Moschcau <kai.moschcau@blecon.de>
Date: Mon, 29 Apr 2024 14:56:57 +0200
Subject: [PATCH 1437/2704] feat(awk,cmake,python,r,starlark): deactivate
 spelling in shebangs

---
 queries/awk/highlights.scm      | 2 +-
 queries/cmake/highlights.scm    | 2 +-
 queries/python/highlights.scm   | 2 +-
 queries/r/highlights.scm        | 2 +-
 queries/starlark/highlights.scm | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
index bc6395439..904cf2a9a 100644
--- a/queries/awk/highlights.scm
+++ b/queries/awk/highlights.scm
@@ -31,7 +31,7 @@
 
 ((program
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
 
 (ns_qualified_name
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index e2bcd9278..d6e0f243d 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -219,5 +219,5 @@
 
 ((source_file
   .
-  (line_comment) @keyword.directive)
+  (line_comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 663fccf55..5e5a2a88d 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -188,7 +188,7 @@
 
 ((module
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
 
 (string) @string
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index 87b6ca36d..cedd25909 100644
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -15,7 +15,7 @@
 
 ((program
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
 
 (identifier) @variable
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 9ca7aa8b5..78c129949 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -171,7 +171,7 @@
 
 ((module
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
 
 (string) @string

From e99b79c9c1dfd88a0919c6d4d502c0fbb76fd02e Mon Sep 17 00:00:00 2001
From: Kai Moschcau <kai.moschcau@blecon.de>
Date: Mon, 29 Apr 2024 14:58:01 +0200
Subject: [PATCH 1438/2704] feat(perl): activate spelling in comments

---
 queries/perl/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index fcd0f3071..aaf583d54 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -252,7 +252,7 @@
 (keyval_expression
   hash: (_) @variable)
 
-(comment) @comment
+(comment) @comment @spell
 
 [
   "=>"

From 57476501e2bda6f4fcaa481d1b34714bda13bcd7 Mon Sep 17 00:00:00 2001
From: Kai Moschcau <kai.moschcau@blecon.de>
Date: Mon, 29 Apr 2024 14:58:23 +0200
Subject: [PATCH 1439/2704] feat(perl): deactivate spelling in shebangs

---
 queries/perl/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index aaf583d54..04d8d78a4 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -1,6 +1,6 @@
 ((source_file
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
 
 [

From ead283734bf0310f6ae2f05243ce0367de9e14b0 Mon Sep 17 00:00:00 2001
From: Kai Moschcau <mail@kmoschcau.de>
Date: Wed, 1 May 2024 10:43:21 +0200
Subject: [PATCH 1440/2704] feat(latex, query, tablegen, thrift): disable
 spelling in shebangs

---
 queries/latex/highlights.scm    | 4 ++--
 queries/query/highlights.scm    | 6 +++---
 queries/tablegen/highlights.scm | 2 +-
 queries/thrift/highlights.scm   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index de652d6b5..3fa25f3f5 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -332,8 +332,8 @@
   (comment_environment)
 ] @comment @spell
 
-((line_comment) @keyword.directive
+((line_comment) @keyword.directive @nospell
   (#lua-match? @keyword.directive "^%% !TeX"))
 
-((line_comment) @keyword.directive
+((line_comment) @keyword.directive @nospell
   (#lua-match? @keyword.directive "^%%&"))
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index abc7aa50a..210d03dc3 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -53,17 +53,17 @@
   .
   (comment)*
   .
-  (comment) @keyword.import)
+  (comment) @keyword.import @nospell)
   (#lua-match? @keyword.import "^;+ *inherits *:"))
 
 ((program
   .
   (comment)*
   .
-  (comment) @keyword.directive)
+  (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^;+ *extends *$"))
 
-((comment) @keyword.directive
+((comment) @keyword.directive @nospell
   (#lua-match? @keyword.directive "^;+%s*format%-ignore%s*$"))
 
 ((predicate
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index 8c3c42be6..a7b200378 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -155,5 +155,5 @@
   (multiline_comment)
 ] @comment @spell
 
-((comment) @keyword.directive
+((comment) @keyword.directive @nospell
   (#lua-match? @keyword.directive "^.*RUN"))
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 8955faa1f..b88106f1e 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -241,5 +241,5 @@
 ((comment) @comment.documentation
   (#lua-match? @comment.documentation "^///$"))
 
-((comment) @keyword.directive
+((comment) @keyword.directive @nospell
   (#lua-match? @keyword.directive "#!.*"))

From bbc67f736e22c37c23f2c11a05bfa23b715af30c Mon Sep 17 00:00:00 2001
From: Levi Frandsen <l3viop@gmail.com>
Date: Wed, 1 May 2024 09:44:51 -0500
Subject: [PATCH 1441/2704] fix(html_tags): stop indenting void elements

---
 queries/html_tags/indents.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/queries/html_tags/indents.scm b/queries/html_tags/indents.scm
index 1eac15bfd..6fe984fa9 100644
--- a/queries/html_tags/indents.scm
+++ b/queries/html_tags/indents.scm
@@ -1,17 +1,19 @@
 [
   ((element
     (start_tag
-      (tag_name) @_not_special))
-    (#not-any-of? @_not_special "meta" "link"))
+      (tag_name) @_not_void_element))
+    (#not-any-of? @_not_void_element
+      "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
+      "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr"))
   (element
     (self_closing_tag))
 ] @indent.begin
 
-; These tags are usually written one-lined and doesn't use self-closing tags so special-cased them
-; but add indent to the tag to make sure attributes inside them are still indented if written multi-lined
 ((start_tag
-  (tag_name) @_special)
-  (#any-of? @_special "meta" "link")) @indent.begin
+  (tag_name) @_void_element)
+  (#any-of? @_void_element
+    "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
+    "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr")) @indent.begin
 
 ; These are the nodes that will be captured when we do `normal o`
 ; But last element has already been ended, so capturing this

From 9d5cee38b317a50a316dad46eb105b172220262c Mon Sep 17 00:00:00 2001
From: DimensionalDot <dimensionaldot@gmail.com>
Date: Thu, 2 May 2024 01:10:43 -0400
Subject: [PATCH 1442/2704] feat(ecma): inject async template functions

---
 queries/ecma/injections.scm | 44 ++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 74d583849..c9d7f5a52 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -5,9 +5,13 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-; html(`...`), html`...`, sql(...) etc
+; html(`...`), html`...`, sql(`...`), etc.
 (call_expression
-  function: (identifier) @injection.language
+  function: [
+    (await_expression
+      (identifier)) @injection.language
+    (identifier) @injection.language
+  ]
   arguments: [
     (arguments
       (template_string) @injection.content)
@@ -23,8 +27,13 @@
 
 ; svg`...` or svg(`...`)
 (call_expression
-  function: ((identifier) @_name
-    (#eq? @_name "svg"))
+  function: [
+    (await_expression
+      (identifier) @_name
+      (#eq? @_name "svg"))
+    (identifier) @_name
+    (#eq? @_name "svg")
+  ]
   arguments: [
     (arguments
       (template_string) @injection.content)
@@ -35,16 +44,26 @@
   (#set! injection.language "html"))
 
 (call_expression
-  function: ((identifier) @_name
-    (#eq? @_name "gql"))
+  function: [
+    (await_expression
+      (identifier) @_name
+      (#eq? @_name "gql"))
+    (identifier) @_name
+    (#eq? @_name "gql")
+  ]
   arguments: ((template_string) @injection.content
     (#offset! @injection.content 0 1 0 -1)
     (#set! injection.include-children)
     (#set! injection.language "graphql")))
 
 (call_expression
-  function: ((identifier) @_name
-    (#eq? @_name "hbs"))
+  function: [
+    (await_expression
+      (identifier) @_name
+      (#eq? @_name "hbs"))
+    (identifier) @_name
+    (#eq? @_name "hbs")
+  ]
   arguments: ((template_string) @injection.content
     (#offset! @injection.content 0 1 0 -1)
     (#set! injection.include-children)
@@ -55,8 +74,13 @@
 
 ; css`<css>`, keyframes`<css>`
 (call_expression
-  function: (identifier) @_name
-  (#any-of? @_name "css" "keyframes")
+  function: [
+    (await_expression
+      (identifier) @_name
+      (#any-of? @_name "css" "keyframes"))
+    (identifier) @_name
+    (#any-of? @_name "css" "keyframes")
+  ]
   arguments: ((template_string) @injection.content
     (#offset! @injection.content 0 1 0 -1)
     (#set! injection.include-children)

From 99d3e799b46f5c2a1fc0d7a42d7ab452de48c067 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 06:36:36 +0000
Subject: [PATCH 1443/2704] bot(lockfile): update c_sharp, just, liquidsoap,
 templ

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e6aa45875..1fde2002b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "1aafaff4d26dac5a36dd3495be33e1c20161d761"
   },
   "c_sharp": {
-    "revision": "9de565257ada70ac441c640e3b5d6850e2df5ab8"
+    "revision": "e1384e2f132936019b43aaaae154cd780fb497ce"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -354,7 +354,7 @@
     "revision": "acd5ca12cc278df7960629c2429a096c7ac4bbea"
   },
   "just": {
-    "revision": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"
+    "revision": "72937dde3be430468796d4b91c0f0f104962b132"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -390,7 +390,7 @@
     "revision": "293369818da219d97327908aab33707b04b63fd9"
   },
   "liquidsoap": {
-    "revision": "ea97fa1f7d6665a018353cb4483d07c8b121e374"
+    "revision": "a9b8012366eab7d0c28bbda5f75a847be931008f"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -705,7 +705,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "4bedd882d47c55f22226307fe6bc6a7a87a94f43"
+    "revision": "85a0bb071e9d7405915220bcca82d0b62c39167b"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"

From b1f3f02027f1fd21956c1e219878764014498a59 Mon Sep 17 00:00:00 2001
From: Brayden Zee <brayden@blueish.dev>
Date: Thu, 2 May 2024 17:27:26 -0400
Subject: [PATCH 1444/2704] fix(java): compact constructor highlights (#6531)

---
 queries/java/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index aadb804af..0f7e4feca 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -87,6 +87,9 @@
 (constructor_declaration
   name: (identifier) @type)
 
+(compact_constructor_declaration
+  name: (identifier) @type)
+
 (type_identifier) @type
 
 ((type_identifier) @type.builtin

From c0c32abc51181d735e24c93991324050b28429de Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 06:36:54 +0000
Subject: [PATCH 1445/2704] bot(lockfile): update javascript, just, mlir,
 slint, templ

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1fde2002b..ad6002095 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -330,7 +330,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "fff4560044bdc51d9f6995f1edc797b7cd72b9dc"
+    "revision": "c0027460e8f9629afeeb27f7949ecf961c82d707"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -354,7 +354,7 @@
     "revision": "acd5ca12cc278df7960629c2429a096c7ac4bbea"
   },
   "just": {
-    "revision": "72937dde3be430468796d4b91c0f0f104962b132"
+    "revision": "fd814fc6c579f68c2a642f5e0268cf69daae92d7"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -432,7 +432,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "d04201a28c9f93656634ca1c1d6ba775149522a0"
+    "revision": "ed528701a1ee52d4735c3439da262c898e506fc3"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -630,7 +630,7 @@
     "revision": "68587530d86aaeb1f1cb17fdada795281cdd0556"
   },
   "slint": {
-    "revision": "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"
+    "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
   },
   "smali": {
     "revision": "3f6517855898ef23023e5d64a8b175d4ee8d646e"
@@ -705,7 +705,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "85a0bb071e9d7405915220bcca82d0b62c39167b"
+    "revision": "c06e7bf0edfa211f6a7665a3c7fa25c1198850b2"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"

From 7441b82fe558306b37c979a91c6c21d6bfae9a3c Mon Sep 17 00:00:00 2001
From: Yorick Peterse <git@yorickpeterse.com>
Date: Fri, 3 May 2024 01:13:43 +0200
Subject: [PATCH 1446/2704] feat(inko): add support for Inko

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/inko/folds.scm          |  17 +++
 queries/inko/highlights.scm     | 195 ++++++++++++++++++++++++++++++++
 queries/inko/indents.scm        |  40 +++++++
 queries/inko/injections.scm     |   2 +
 queries/inko/locals.scm         |  57 ++++++++++
 8 files changed, 323 insertions(+)
 create mode 100644 queries/inko/folds.scm
 create mode 100644 queries/inko/highlights.scm
 create mode 100644 queries/inko/indents.scm
 create mode 100644 queries/inko/injections.scm
 create mode 100644 queries/inko/locals.scm

diff --git a/README.md b/README.md
index c3f3afa3b..072583dc0 100644
--- a/README.md
+++ b/README.md
@@ -280,6 +280,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) (maintained by @luckasRanarison)
 - [x] [idl](https://github.com/cathaysia/tree-sitter-idl) (maintained by @cathaysa)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
+- [x] [inko](https://github.com/inko-lang/tree-sitter-inko) (maintained by @yorickpeterse)
 - [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
diff --git a/lockfile.json b/lockfile.json
index ad6002095..b59cb74e4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -320,6 +320,9 @@
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
   },
+  "inko": {
+    "revision": "6983354c13a14bc621d7a3619f1790149e901187"
+  },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ad8cbf904..4a9d9695e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -966,6 +966,14 @@ list.ini = {
   experimental = true,
 }
 
+list.inko = {
+  install_info = {
+    url = "https://github.com/inko-lang/tree-sitter-inko",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@yorickpeterse" },
+}
+
 list.ispc = {
   install_info = {
     url = "https://github.com/fab4100/tree-sitter-ispc",
diff --git a/queries/inko/folds.scm b/queries/inko/folds.scm
new file mode 100644
index 000000000..b0fbc064e
--- /dev/null
+++ b/queries/inko/folds.scm
@@ -0,0 +1,17 @@
+[
+  (call)
+  (class)
+  (closure)
+  (define_case)
+  (define_constant)
+  (define_field)
+  (define_variable)
+  (external_function)
+  (if)
+  (import)+
+  (loop)
+  (match)
+  (method)
+  (trait)
+  (while)
+] @fold
diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
new file mode 100644
index 000000000..c19eb3a3a
--- /dev/null
+++ b/queries/inko/highlights.scm
@@ -0,0 +1,195 @@
+; Brackets and operators
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  ","
+  "->"
+  "."
+  ":"
+] @punctuation.delimiter
+
+[
+  "!="
+  "%"
+  "%="
+  "&"
+  "&="
+  "*"
+  "**"
+  "**="
+  "*="
+  "+"
+  "+="
+  "-"
+  "-="
+  "/"
+  "/="
+  "<"
+  "<<"
+  "<<="
+  "<="
+  "<="
+  "=="
+  ">"
+  ">="
+  ">="
+  ">>"
+  ">>="
+  ">>>"
+  ">>>="
+  "^"
+  "^="
+  "|"
+  "|="
+] @operator
+
+; Keywords
+[
+  "as"
+  "for"
+  "impl"
+  "let"
+  "mut"
+  "ref"
+  "uni"
+  "move"
+  "recover"
+] @keyword
+
+"fn" @keyword.function
+
+"import" @keyword.import
+
+[
+  "and"
+  "or"
+] @keyword.operator
+
+[
+  "class"
+  "trait"
+] @keyword.type
+
+[
+  "extern"
+  (modifier)
+  (visibility)
+] @keyword.modifier
+
+[
+  "loop"
+  "while"
+  (break)
+  (next)
+] @keyword.repeat
+
+"return" @keyword.return
+
+[
+  "throw"
+  "try"
+] @keyword.exception
+
+[
+  "case"
+  "else"
+  "if"
+  "match"
+] @keyword.conditional
+
+; Identifiers/variable references
+(identifier) @variable
+
+; Comments
+(line_comment) @comment @spell
+
+; Literals
+(self) @variable.builtin
+
+(nil) @constant.builtin
+
+[
+  (true)
+  (false)
+] @boolean
+
+(integer) @number
+
+(float) @number.float
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+(interpolation
+  "${" @punctuation.special
+  "}" @punctuation.special) @none
+
+(constant) @constant
+
+; Patterns
+(integer_pattern) @number
+
+(string_pattern) @string
+
+(constant_pattern) @constant
+
+; Types
+(generic_type
+  name: _ @type)
+
+(type) @type
+
+; Imports
+(extern_import
+  path: _ @string)
+
+(import
+  (path
+    (identifier) @module))
+
+; Classes
+(class
+  name: _ @type)
+
+(define_field
+  name: _ @variable.member)
+
+; Traits
+(trait
+  name: _ @type)
+
+; Implementations
+(implement_trait
+  class: _ @type)
+
+(reopen_class
+  name: _ @type)
+
+(bound
+  name: _ @type)
+
+; Methods
+(method
+  name: _ @function)
+
+(external_function
+  name: _ @function)
+
+(argument
+  name: _ @variable.parameter)
+
+(named_argument
+  name: _ @variable.parameter)
+
+(call
+  name: _ @function)
+
+(field) @variable.member
diff --git a/queries/inko/indents.scm b/queries/inko/indents.scm
new file mode 100644
index 000000000..8a09edd97
--- /dev/null
+++ b/queries/inko/indents.scm
@@ -0,0 +1,40 @@
+[
+  (arguments)
+  (array)
+  (assign_field)
+  (assign_local)
+  (assign_receiver_field)
+  (binary)
+  (block)
+  (bounds)
+  (cast)
+  (class)
+  (class_pattern)
+  (compound_assign_field)
+  (compound_assign_local)
+  (compound_assign_receiver_field)
+  (define_constant)
+  (define_variable)
+  (grouped_expression)
+  (implement_trait)
+  (match)
+  (or_pattern)
+  (reopen_class)
+  (replace_field)
+  (replace_local)
+  (symbols)
+  (trait)
+  (tuple)
+  (tuple_pattern)
+  (type_arguments)
+] @indent.begin
+
+[
+  ")"
+  "]"
+  "}"
+] @indent.end @indent.branch
+
+(line_comment) @indent.auto
+
+(string) @indent.auto
diff --git a/queries/inko/injections.scm b/queries/inko/injections.scm
new file mode 100644
index 000000000..36849c873
--- /dev/null
+++ b/queries/inko/injections.scm
@@ -0,0 +1,2 @@
+((line_comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/inko/locals.scm b/queries/inko/locals.scm
new file mode 100644
index 000000000..09450f525
--- /dev/null
+++ b/queries/inko/locals.scm
@@ -0,0 +1,57 @@
+[
+  (method)
+  (block)
+] @local.scope
+
+(method
+  name: _ @local.definition.method)
+
+(external_function
+  name: _ @local.definition.function)
+
+(argument
+  name: _ @local.definition.parameter)
+
+(define_variable
+  name: _ @local.definition.var)
+
+(define_constant
+  name: _ @local.definition.constant)
+
+(define_field
+  name: _ @local.definition.field)
+
+(named_argument
+  name: _ @local.definition.parameter)
+
+(class
+  modifier: (modifier
+    "enum")
+  name: _ @local.definition.enum)
+
+(class
+  modifier: (modifier
+    "enum")
+  body: (class_body
+    (define_case
+      name: _ @local.definition.field)))
+
+(class
+  name: _ @local.definition.type)
+
+(trait
+  name: _ @local.definition.type)
+
+(import
+  (symbols
+    [
+      (identifier)
+      (constant)
+      (self)
+    ] @local.definition.import))
+
+(identifier) @local.reference
+
+(field) @local.reference
+
+(constant) @local.reference

From b659a6c2c351522562af7f681158fee344447f69 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 May 2024 11:28:46 +0200
Subject: [PATCH 1447/2704] feat(toml): switch to upstream fork

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b59cb74e4..7919b6de4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -732,7 +732,7 @@
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
   },
   "toml": {
-    "revision": "8bd2056818b21860e3d756b5a58c4f6e05fb744e"
+    "revision": "221526cb106e4f0e26d715922e573c2903ecc72a"
   },
   "tsv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4a9d9695e..20e65ff94 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2120,7 +2120,7 @@ list.todotxt = {
 
 list.toml = {
   install_info = {
-    url = "https://github.com/ikatyang/tree-sitter-toml",
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-toml",
     files = { "src/parser.c", "src/scanner.c" },
     generate_requires_npm = true,
   },

From b157b0d4127d2ab4c43a8779932f824bb6a3a1ed Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 09:46:30 +0000
Subject: [PATCH 1448/2704] bot(lockfile): update nasm

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 7919b6de4..410234f51 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -441,7 +441,7 @@
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
   },
   "nasm": {
-    "revision": "3bc691d2cfba44bea339a775ad496c8bc552c60d"
+    "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
   "nickel": {
     "revision": "58baf89db8fdae54a84bcf22c80ff10ee3f929ed"

From 96defe1cbd444cfedb0927796a6c0c1308e5b988 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 09:54:46 +0000
Subject: [PATCH 1449/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 072583dc0..7a0bf9bf6 100644
--- a/README.md
+++ b/README.md
@@ -417,7 +417,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) (maintained by @ahelwer, @susliko)
 - [x] [tmux](https://github.com/Freed-Wu/tree-sitter-tmux) (maintained by @Freed-Wu)
 - [x] [todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) (experimental, maintained by @arnarg)
-- [x] [toml](https://github.com/ikatyang/tree-sitter-toml) (maintained by @tk-shirasaka)
+- [x] [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) (maintained by @tk-shirasaka)
 - [x] [tsv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [tsx](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [turtle](https://github.com/BonaBeavis/tree-sitter-turtle) (maintained by @BonaBeavis)

From cbf9090a4c715fa9eb38be71062bf19194b45bd2 Mon Sep 17 00:00:00 2001
From: Jakub Donovan <jakubdonovan@protonmail.com>
Date: Fri, 3 May 2024 20:01:37 +0700
Subject: [PATCH 1450/2704] feat(ecma) fold `array` (#6564)

---
 queries/ecma/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/ecma/folds.scm b/queries/ecma/folds.scm
index 0d4124a70..a348f3444 100644
--- a/queries/ecma/folds.scm
+++ b/queries/ecma/folds.scm
@@ -17,6 +17,7 @@
   (if_statement)
   (try_statement)
   (catch_clause)
+  (array)
   (object)
   (generator_function)
   (generator_function_declaration)

From 440f177277e6049d665382a94ce1af602900b5c7 Mon Sep 17 00:00:00 2001
From: Novus Nota <68142933+novusnota@users.noreply.github.com>
Date: Fri, 3 May 2024 18:42:51 +0200
Subject: [PATCH 1451/2704] feat: add support for Tact (#6554)

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/tact/folds.scm          |  16 ++
 queries/tact/highlights.scm     | 307 ++++++++++++++++++++++++++++++++
 queries/tact/indents.scm        |  50 ++++++
 queries/tact/injections.scm     |   2 +
 queries/tact/locals.scm         |  72 ++++++++
 8 files changed, 459 insertions(+)
 create mode 100644 queries/tact/folds.scm
 create mode 100644 queries/tact/highlights.scm
 create mode 100644 queries/tact/indents.scm
 create mode 100644 queries/tact/injections.scm
 create mode 100644 queries/tact/locals.scm

diff --git a/README.md b/README.md
index 7a0bf9bf6..3cb08346a 100644
--- a/README.md
+++ b/README.md
@@ -407,6 +407,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
 - [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
+- [x] [tact](https://github.com/tact-lang/tree-sitter-tact) (maintained by @novusnota)
 - [x] [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) (maintained by @lewis6991)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [templ](https://github.com/vrischmann/tree-sitter-templ) (maintained by @vrischmann)
diff --git a/lockfile.json b/lockfile.json
index 410234f51..2e1150139 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -701,6 +701,9 @@
   "tablegen": {
     "revision": "6b7eb096621443627cc5e29c8c34ff1fde482cf3"
   },
+  "tact": {
+    "revision": "83d5de4c0566ce4415c30cd4633e4ebb09a1d6b8"
+  },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 20e65ff94..169ffea2d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2041,6 +2041,14 @@ list.tablegen = {
   maintainers = { "@amaanq" },
 }
 
+list.tact = {
+  install_info = {
+    url = "https://github.com/tact-lang/tree-sitter-tact",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@novusnota" },
+}
+
 list.teal = {
   install_info = {
     url = "https://github.com/euclidianAce/tree-sitter-teal",
diff --git a/queries/tact/folds.scm b/queries/tact/folds.scm
new file mode 100644
index 000000000..8e286c340
--- /dev/null
+++ b/queries/tact/folds.scm
@@ -0,0 +1,16 @@
+[
+  ; import …
+  (import_statement)+
+  ; (…, …)
+  (parameter_list)
+  (argument_list)
+  ; {…, …}
+  (instance_argument_list)
+  ; {…; …}
+  (message_body)
+  (struct_body)
+  (contract_body)
+  (trait_body)
+  (function_body)
+  (block_statement)
+] @fold
diff --git a/queries/tact/highlights.scm b/queries/tact/highlights.scm
new file mode 100644
index 000000000..394463c65
--- /dev/null
+++ b/queries/tact/highlights.scm
@@ -0,0 +1,307 @@
+; variable
+; --------
+(identifier) @variable
+
+; variable.builtin
+; ----------------
+(self) @variable.builtin
+
+; variable.parameter
+; ------------------
+(parameter
+  name: (identifier) @variable.parameter)
+
+; punctuation.delimiter
+; ---------------------
+[
+  ";"
+  ","
+  "."
+  ":"
+  "?"
+] @punctuation.delimiter
+
+; punctuation.bracket
+; -------------------
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
+; operator
+; --------
+[
+  "-"
+  "-="
+  "+"
+  "+="
+  "*"
+  "*="
+  "/"
+  "/="
+  "%"
+  "%="
+  "="
+  "=="
+  "!"
+  "!="
+  "!!"
+  "<"
+  "<="
+  "<<"
+  ">"
+  ">="
+  ">>"
+  "&"
+  "|"
+  "^"
+  "&&"
+  "||"
+] @operator
+
+; constructor
+; -----------
+(instance_expression
+  name: (identifier) @constructor)
+
+(initOf
+  name: (identifier) @constructor)
+
+; type
+; ----
+(type_identifier) @type
+
+; type.builtin
+; ------------
+((identifier) @type.builtin
+  (#eq? @type.builtin "SendParameters"))
+
+(bounced_type
+  "bounced" @type.builtin
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+(map_type
+  "map" @type.builtin
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+((type_identifier) @type.builtin
+  (#any-of? @type.builtin "Address" "Bool" "Builder" "Cell" "Int" "Slice" "String" "StringBuilder"))
+
+(tlb_serialization
+  "as" @keyword
+  type: (identifier) @type.builtin
+  (#any-of? @type.builtin
+    "int8" "int16" "int32" "int64" "int128" "int256" "int257" "uint8" "uint16" "uint32" "uint64"
+    "uint128" "uint256" "coins" "remaining" "bytes32" "bytes64"))
+
+; string
+; ------
+(string) @string
+
+; string.escape
+; -------------
+(escape_sequence) @string.escape
+
+; string.special.path
+; -------------------
+(import_statement
+  library: (string) @string.special.path)
+
+; boolean
+; -------
+(boolean) @boolean
+
+; constant
+; --------
+(constant
+  name: (identifier) @constant)
+
+; constant.builtin
+; ----------------
+(null) @constant.builtin
+
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin
+    "SendBounceIfActionFail" "SendPayGasSeparately" "SendIgnoreErrors" "SendDestroyIfZero"
+    "SendRemainingValue" "SendRemainingBalance" "ReserveExact" "ReserveAllExcept" "ReserveAtMost"
+    "ReserveAddOriginalBalance" "ReserveInvertSign" "ReserveBounceIfActionFail"))
+
+; property
+; --------
+(instance_argument
+  name: (identifier) @variable.member)
+
+(lvalue
+  (_)
+  (_) @variable.member)
+
+(field_access_expression
+  name: (identifier) @variable.member)
+
+(trait_body
+  (constant
+    name: (identifier) @variable.member))
+
+(contract_body
+  (constant
+    name: (identifier) @variable.member))
+
+(field
+  name: (identifier) @variable.member)
+
+; number
+; ------
+(integer) @number
+
+; keyword
+; -------
+[
+  "with"
+  "const"
+  "let"
+  ; "public" ; -- not used, but declared in grammar.ohm
+  ; "extend" ; -- not used, but declared in grammar.ohm
+] @keyword
+
+; keyword.type
+; ------------
+[
+  "contract"
+  "trait"
+  "struct"
+  "message"
+] @keyword.type
+
+; keyword.function
+; ----------------
+[
+  "fun"
+  "native"
+] @keyword.function
+
+; keyword.operator
+; ----------------
+"initOf" @keyword.operator
+
+; keyword.import
+; --------------
+"import" @keyword.import
+
+; keyword.modifier
+; ---------------
+[
+  "get"
+  "mutates"
+  "extends"
+  "virtual"
+  "override"
+  "inline"
+  "abstract"
+] @keyword.modifier
+
+; keyword.repeat
+; --------------
+(foreach_statement
+  .
+  (_)
+  .
+  (_)
+  .
+  "in" @keyword.repeat)
+
+[
+  "while"
+  "repeat"
+  "do"
+  "until"
+  "foreach"
+] @keyword.repeat
+
+; keyword.return
+; --------------
+"return" @keyword.return
+
+; keyword.exception
+; -----------------
+[
+  "try"
+  "catch"
+] @keyword.exception
+
+; keyword.conditional
+; -------------------
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+; keyword.directive.define
+; ------------------------
+"primitive" @keyword.directive.define
+
+; function
+; --------
+(native_function
+  name: (identifier) @function)
+
+(static_function
+  name: (identifier) @function)
+
+(func_identifier) @function
+
+; function.method
+; ---------------
+(init_function
+  "init" @function.method)
+
+(receive_function
+  "receive" @function.method)
+
+(bounced_function
+  "bounced" @function.method)
+
+(external_function
+  "external" @function.method)
+
+(function
+  name: (identifier) @function.method)
+
+; function.call
+; -------------
+(static_call_expression
+  name: (identifier) @function.call)
+
+; function.method.call
+; ---------------
+(method_call_expression
+  name: (identifier) @function.method.call)
+
+; function.builtin
+; ----------------
+(static_call_expression
+  name: (identifier) @function.builtin
+  (#any-of? @function.builtin
+    "log" "log2" "send" "sender" "require" "now" "myBalance" "myAddress" "newAddress"
+    "contractAddress" "contractAddressExt" "emit" "cell" "ton" "dump" "dumpStack" "beginString"
+    "beginComment" "beginTailString" "beginStringFromBuilder" "beginCell" "emptyCell" "randomInt"
+    "random" "checkSignature" "checkDataSignature" "sha256" "min" "max" "abs" "pow" "pow2" "throw"
+    "nativeThrowWhen" "nativeThrowUnless" "getConfigParam" "nativeRandomize" "nativeRandomizeLt"
+    "nativePrepareRandom" "nativeRandom" "nativeRandomInterval" "nativeReserve"))
+
+; comment
+; -------
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+
+; attribute
+; ---------
+[
+  "@name"
+  "@interface"
+] @attribute
diff --git a/queries/tact/indents.scm b/queries/tact/indents.scm
new file mode 100644
index 000000000..749ab2469
--- /dev/null
+++ b/queries/tact/indents.scm
@@ -0,0 +1,50 @@
+; indent.begin       ; indent children when matching this node
+; ------------
+[
+  ; (..., ...)
+  (parameter_list)
+  (argument_list)
+  ; {..., ...}
+  (instance_argument_list)
+  ; {...; ...}
+  (message_body)
+  (struct_body)
+  (contract_body)
+  (trait_body)
+  (function_body)
+  (block_statement)
+  ; misc.
+  (binary_expression)
+  (ternary_expression)
+  (return_statement)
+  (static_call_expression)
+  (method_call_expression)
+] @indent.begin
+
+; indent.branch      ; dedent itself when matching this node
+; -------------
+[
+  "}"
+  ")"
+  ">"
+] @indent.branch
+
+; indent.end         ; marks the end of indented block
+; ----------
+[
+  "}"
+  ")"
+  ">"
+] @indent.end
+
+; indent.auto        ; behaves like 'autoindent' buffer option
+; -----------
+[
+  (comment)
+  (ERROR)
+] @indent.auto
+
+; indent.align       ; behaves like python aligned/hanging indent
+; indent.dedent      ; dedent children when matching this node
+; indent.ignore      ; do not indent in this node
+; indent.zero        ; sets this node at position 0 (no indent)
diff --git a/queries/tact/injections.scm b/queries/tact/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/tact/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/tact/locals.scm b/queries/tact/locals.scm
new file mode 100644
index 000000000..87ad953ff
--- /dev/null
+++ b/queries/tact/locals.scm
@@ -0,0 +1,72 @@
+; Scopes       @local.scope
+; -------------------------
+[
+  (static_function)
+  (init_function)
+  (bounced_function)
+  (receive_function)
+  (external_function)
+  (function)
+  (block_statement)
+] @local.scope
+
+; Definitions  @local.definition
+; ------------------------------
+; variables
+(let_statement
+  name: (identifier) @local.definition.var)
+
+; constants
+(constant
+  name: (identifier) @local.definition.constant)
+
+; functions
+(static_function
+  name: (identifier) @local.definition.function
+  (#set! definition.var.scope parent))
+
+; methods (functions off of contracts and traits)
+(init_function
+  "init" @local.definition.method
+  (#set! definition.var.scope parent))
+
+(bounced_function
+  "bounced" @local.definition.method
+  (#set! definition.var.scope parent))
+
+(receive_function
+  "receive" @local.definition.method
+  (#set! definition.var.scope parent))
+
+(external_function
+  "external" @local.definition.method
+  (#set! definition.var.scope parent))
+
+(function
+  name: (identifier) @local.definition.method
+  (#set! definition.var.scope parent))
+
+; parameters
+(parameter
+  name: (identifier) @local.definition.parameter)
+
+; user-defined types (structs and messages)
+(type_identifier) @local.definition.type
+
+; fields (and properties)
+(field
+  name: (identifier) @local.definition.field)
+
+; imports
+(import_statement
+  (string) @local.definition.import)
+
+; References   @local.reference
+; -----------------------------
+(self) @local.reference
+
+(value_expression
+  (identifier) @local.reference)
+
+(lvalue
+  (identifier) @local.reference)

From 4ae2b452e9bd67ff618e3bb0e3488e49c98465e9 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <git@yorickpeterse.com>
Date: Fri, 3 May 2024 22:06:54 +0200
Subject: [PATCH 1452/2704] fix(inko): highlighting of numeric call names
 (#6566)

Inko allows for syntax such as `some_value.42.to_string`, where `42` is
a method name. Similar to other languages that allow this (e.g. Rust),
these numeric names should be highlighted as numbers instead of
identifiers.

To fix this, the query to highlight call names is adjusted to only
highlight "name" and "constant" nodes as the function group, ensuring
the remaining possible node ("integer") continues to use the same group
as regular numbers.
---
 queries/inko/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
index c19eb3a3a..eff00fc02 100644
--- a/queries/inko/highlights.scm
+++ b/queries/inko/highlights.scm
@@ -190,6 +190,9 @@
   name: _ @variable.parameter)
 
 (call
-  name: _ @function)
+  name: [
+    (name)
+    (constant)
+  ] @function)
 
 (field) @variable.member

From fed32362ad3850e708f0797b9d9458a24589e07e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 4 May 2024 06:36:10 +0000
Subject: [PATCH 1453/2704] bot(lockfile): update bass, c_sharp, cooklang,
 haskell, php, php_only, ql, r, solidity, tact, toml

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2e1150139..646e11808 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -30,7 +30,7 @@
     "revision": "f8fb3274f72a30896075585b32b0c54cad65c086"
   },
   "bass": {
-    "revision": "c9ba4568af24cd3403029730687c0a43d1350a43"
+    "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
   },
   "beancount": {
     "revision": "c25f8034c977681653a8acd541c8b4877a58f474"
@@ -75,7 +75,7 @@
     "revision": "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"
   },
   "cooklang": {
-    "revision": "81c2a8667846b1e60db68b5601d864fe00fd1d3a"
+    "revision": "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"
   },
   "corn": {
     "revision": "604d73c38d4c28ca68e9e441ffd405d68cb63051"
@@ -270,7 +270,7 @@
     "revision": "070524937539eb8bb4f10debd9c83b66c434f3a2"
   },
   "haskell": {
-    "revision": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be"
+    "revision": "af32d884088ce7b74541b5e51820baa7e305caae"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -558,7 +558,7 @@
     "revision": "71778c2a472ed00a64abf4219544edbf8e4b86d7"
   },
   "ql": {
-    "revision": "ff04ba61857ba05b80221e71b423b2728dbebe1e"
+    "revision": "fa5c3821dd2161f5c8528a8cbdb258daa6dc4de6"
   },
   "qmldir": {
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
@@ -570,7 +570,7 @@
     "revision": "608c01187fb9f525a1e4cf585bb63d73dea280b7"
   },
   "r": {
-    "revision": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57"
+    "revision": "391400572538ff9854341a175ed8ab4b1e45f44b"
   },
   "racket": {
     "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
@@ -702,7 +702,7 @@
     "revision": "6b7eb096621443627cc5e29c8c34ff1fde482cf3"
   },
   "tact": {
-    "revision": "83d5de4c0566ce4415c30cd4633e4ebb09a1d6b8"
+    "revision": "68c48c51a9b9ef5280a172acfa3c73b35078e8a7"
   },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
@@ -735,7 +735,7 @@
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
   },
   "toml": {
-    "revision": "221526cb106e4f0e26d715922e573c2903ecc72a"
+    "revision": "16a30c83ce427385b8d14939c45c137fcfca6c42"
   },
   "tsv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"

From c579d186bec0a4af9d0741b235cfa0627ffd9f15 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 3 May 2024 15:04:15 -0700
Subject: [PATCH 1454/2704] fix(markdown): align link with image highlights

---
 queries/markdown_inline/highlights.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index e38ef3d7b..233ab411c 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -33,10 +33,17 @@
   ] @markup.link
   (#set! conceal ""))
 
+[
+  (link_label)
+  (link_text)
+  (link_title)
+  (image_description)
+] @markup.link.label
+
 (inline_link
-  (link_text) @markup.link.label
-  (link_destination) @markup.link
-  (#set! @markup.link.label "url" @markup.link))
+  (link_text) @_label
+  (link_destination) @_url
+  (#set! @_label "url" @_url))
 
 ; Conceal image links
 (image
@@ -80,13 +87,6 @@
   (uri_autolink)
 ] @markup.link.url @nospell
 
-[
-  (link_label)
-  (link_text)
-  (link_title)
-  (image_description)
-] @markup.link.label
-
 ; Replace common HTML entities.
 ((entity_reference) @character.special
   (#eq? @character.special "&nbsp;")

From 4e21361e15b1d4147830c5fe571556eb1b14e6f9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 May 2024 10:25:15 +0200
Subject: [PATCH 1455/2704] fix(php): update parser and queries

---
 lockfile.json                   | 4 ++--
 queries/php_only/injections.scm | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 646e11808..f4644305b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -498,10 +498,10 @@
     "revision": "96a17c4c2dd345dc61f330d040684538d634bbc2"
   },
   "php": {
-    "revision": "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"
+    "revision": "58054be104db0809ea6f119514a4d904f95e5b5c"
   },
   "php_only": {
-    "revision": "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"
+    "revision": "58054be104db0809ea6f119514a4d904f95e5b5c"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
diff --git a/queries/php_only/injections.scm b/queries/php_only/injections.scm
index b13449b9f..368177643 100644
--- a/queries/php_only/injections.scm
+++ b/queries/php_only/injections.scm
@@ -20,7 +20,7 @@
     .
     (argument
       (_
-        (string_value) @injection.content))))
+        (string_content) @injection.content))))
   (#set! injection.language "regex")
   (#lua-match? @_preg_func_identifier "^preg_"))
 
@@ -31,7 +31,7 @@
     .
     (argument
       (_
-        (string_value) @injection.content))))
+        (string_content) @injection.content))))
   (#set! injection.language "bash")
   (#any-of? @_shell_func_identifier
     "shell_exec" "escapeshellarg" "escapeshellcmd" "exec" "passthru" "proc_open" "shell_exec"
@@ -39,5 +39,5 @@
 
 (expression_statement
   (shell_command_expression
-    (string_value) @injection.content)
+    (string_content) @injection.content)
   (#set! injection.language "bash"))

From 73fdd31377d76aa1eea63e66581a8c6b7a71da94 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 5 May 2024 06:37:22 +0000
Subject: [PATCH 1456/2704] bot(lockfile): update css, html, inko, kotlin,
 swift, tact

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f4644305b..74485290b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -87,7 +87,7 @@
     "revision": "2369fa991eba294e9238e28280ffcd58132f94bc"
   },
   "css": {
-    "revision": "02b4ee757654b7d54fe35352fd8e53a8a4385d42"
+    "revision": "2e868a75a518531656b493cba36ef60d8c61cc89"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -300,7 +300,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "eee29ca0ce287b699d9d52118f9c1cd9094c48f9"
+    "revision": "e4d834eb4918df01dcad5c27d1b15d56e3bd94cd"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -321,7 +321,7 @@
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
   },
   "inko": {
-    "revision": "6983354c13a14bc621d7a3619f1790149e901187"
+    "revision": "4cef9aa4980606311b906b2f2b8c6cf791c60396"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
@@ -366,7 +366,7 @@
     "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
   },
   "kotlin": {
-    "revision": "260afd9a92bac51b3a4546303103c3d40a430639"
+    "revision": "eca05edbab1918d7d36a0d30d086ba7b6b1e8803"
   },
   "koto": {
     "revision": "919440e1376109bab4edac52594c17c02ae0be5a"
@@ -687,7 +687,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "ae648bc42aac4473122918bf792bc3b50158deef"
+    "revision": "5f5d7a2a04f2d367a010ed908cc956e7b05fde4f"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -702,7 +702,7 @@
     "revision": "6b7eb096621443627cc5e29c8c34ff1fde482cf3"
   },
   "tact": {
-    "revision": "68c48c51a9b9ef5280a172acfa3c73b35078e8a7"
+    "revision": "f65460eb0746037bc15913e2737afcf87745b66b"
   },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"

From 4b70dde72753a179333b4bba02518d234a30510e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 5 May 2024 13:51:20 -0700
Subject: [PATCH 1457/2704] feat(lalrpop): highlight touchups, folds

---
 queries/lalrpop/folds.scm      |  5 ++++
 queries/lalrpop/highlights.scm | 42 +++++++++++++++++++---------------
 queries/lalrpop/injections.scm |  3 +++
 3 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 queries/lalrpop/folds.scm

diff --git a/queries/lalrpop/folds.scm b/queries/lalrpop/folds.scm
new file mode 100644
index 000000000..beeed9ba5
--- /dev/null
+++ b/queries/lalrpop/folds.scm
@@ -0,0 +1,5 @@
+[
+  (grammar_item)
+  (use)+
+  (action)
+] @fold
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index 1295f3f61..046d39790 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -1,3 +1,5 @@
+(comment) @comment @spell
+
 "grammar" @keyword
 
 [
@@ -8,6 +10,7 @@
 [
   "pub"
   "extern"
+  (mut)
 ] @keyword.modifier
 
 [
@@ -23,29 +26,26 @@
   ; =>
   "=>@L"
   "=>@R"
+  "="
+  "&"
 ] @operator
 
-(grammar_type_params
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
-
-(symbol
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
-
-(binding_symbol
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
-
 (binding_symbol
   name: (identifier) @variable.parameter)
 
+(annotation
+  "#" @punctuation.special)
+
+(grammar_parameter
+  (identifier) @variable.parameter)
+
+(associated_type
+  (identifier) @type)
+
+(parametrized_type
+  (path
+    (identifier) @type))
+
 (bare_symbol
   (macro
     (macro_id) @type.definition))
@@ -67,11 +67,17 @@
   ")"
   "["
   "]"
+  "}"
+  "{"
+  ">"
+  "<"
 ] @punctuation.bracket
 
 [
   ";"
   ":"
+  "::"
+  ","
 ] @punctuation.delimiter
 
 (lifetime
diff --git a/queries/lalrpop/injections.scm b/queries/lalrpop/injections.scm
index b0c83a11a..17d0ace48 100644
--- a/queries/lalrpop/injections.scm
+++ b/queries/lalrpop/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ([
   (normal_action)
   (failible_action)

From fc7657a071ad7be0616d7c66a74991a3c1b1dbcd Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Sun, 5 May 2024 20:16:26 -0700
Subject: [PATCH 1458/2704] feat(c): inject printf in concatenated strings

---
 queries/c/injections.scm | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 00c1443b4..77b4d7a86 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -16,8 +16,13 @@
   function: (identifier) @_function
   arguments: (argument_list
     .
-    (string_literal
-      (string_content) @injection.content)))
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
   ; format-ignore
   (#any-of? @_function 
     "printf" "printf_s"
@@ -38,8 +43,13 @@
   arguments: (argument_list
     (_)
     .
-    (string_literal
-      (string_content) @injection.content)))
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
   ; format-ignore
   (#any-of? @_function 
     "fprintf" "fprintf_s"
@@ -71,8 +81,13 @@
     .
     (_)
     .
-    (string_literal
-      (string_content) @injection.content)))
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
   ; format-ignore
   (#any-of? @_function 
     "sprintf_s"
@@ -96,8 +111,13 @@
     .
     (_)
     .
-    (string_literal
-      (string_content) @injection.content)))
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
   (#any-of? @_function "mvwprintw" "mvwscanw")
   (#set! injection.language "printf"))
 

From 20b9a9845dec7d382a368bc15d9ff67dc2309257 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 6 May 2024 06:38:04 +0000
Subject: [PATCH 1459/2704] bot(lockfile): update arduino, css,
 embedded_template, idl, javascript, jsdoc, mlir, perl, php, php_only, regex,
 ron, ruby, rust, smali, squirrel, swift, tablegen, templ, tsx, typescript,
 typst, uxntal, yuck

---
 lockfile.json | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 74485290b..93f279a93 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "arduino": {
-    "revision": "8518c3fa6b8562af545a496d55c9abd78f53e732"
+    "revision": "babb6d4da69b359bbb80adbf1fe39c0da9175210"
   },
   "asm": {
     "revision": "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"
@@ -87,7 +87,7 @@
     "revision": "2369fa991eba294e9238e28280ffcd58132f94bc"
   },
   "css": {
-    "revision": "2e868a75a518531656b493cba36ef60d8c61cc89"
+    "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -156,7 +156,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "6d791b897ecda59baa0689a85a9906348a2a6414"
+    "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
     "revision": "20ce5a9234c7248b3f91c5b0b028f1760b954dde"
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "d9a260eda455deaa36d2edf398963b0736ed0845"
+    "revision": "3bb3c69a050c68c24482e45465b41652628044b7"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -333,13 +333,13 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "c0027460e8f9629afeeb27f7949ecf961c82d707"
+    "revision": "c67e8556d09bfdc21919839486d03e37ee44a6ce"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"
+    "revision": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14"
   },
   "json": {
     "revision": "80e623c2165887f9829357acfa9c0a0bab34a3cd"
@@ -435,7 +435,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "ed528701a1ee52d4735c3439da262c898e506fc3"
+    "revision": "ab7708c4aed1ff0919d6f6fd3e463fe75ba645be"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -495,13 +495,13 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "96a17c4c2dd345dc61f330d040684538d634bbc2"
+    "revision": "d4ebabd45bcb053fcc7f6688b5c8ed80c7ae7a32"
   },
   "php": {
-    "revision": "58054be104db0809ea6f119514a4d904f95e5b5c"
+    "revision": "d5aea05a70c5d021fa746516391f156d35658875"
   },
   "php_only": {
-    "revision": "58054be104db0809ea6f119514a4d904f95e5b5c"
+    "revision": "d5aea05a70c5d021fa746516391f156d35658875"
   },
   "phpdoc": {
     "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
@@ -588,7 +588,7 @@
     "revision": "3d4768b04d7cfaf40533e12b28672603428b8f31"
   },
   "regex": {
-    "revision": "ba22e4e0cb42b2ef066948d0ea030ac509cef733"
+    "revision": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"
   },
   "rego": {
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
@@ -606,16 +606,16 @@
     "revision": "7df2c0892e62efb81a7504d9799d4e0d0443d241"
   },
   "ron": {
-    "revision": "f0ddc95a4b7bb21a7308642255a80f5496e69c5b"
+    "revision": "78938553b93075e638035f624973083451b29055"
   },
   "rst": {
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "9d86f3761bb30e8dcc81e754b81d3ce91848477e"
+    "revision": "788a63ca1b7619288980aaafd37d890ee2469421"
   },
   "rust": {
-    "revision": "04352146022062c101b8ddd853adf17eadd8cf56"
+    "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
     "revision": "b76db435a7f876cf1ede837d66054c534783c72f"
@@ -636,7 +636,7 @@
     "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
   },
   "smali": {
-    "revision": "3f6517855898ef23023e5d64a8b175d4ee8d646e"
+    "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
   },
   "smithy": {
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
@@ -663,7 +663,7 @@
     "revision": "25f94f998de79bae9df28add9782f9ea6ea0e2b8"
   },
   "squirrel": {
-    "revision": "f93fd2864dd05cc39b0490145fd86a1a93bfa3a3"
+    "revision": "0a50d31098e83c668d34d1160a0f6c7d23b571cc"
   },
   "ssh_config": {
     "revision": "77450e8bce8853921512348f83c73c168c71fdfb"
@@ -687,7 +687,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "5f5d7a2a04f2d367a010ed908cc956e7b05fde4f"
+    "revision": "c9c669b4513479e07a0ff44cf14f72351959ac21"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -699,7 +699,7 @@
     "revision": "6182836f4128725f1e74ce986840d7317021a015"
   },
   "tablegen": {
-    "revision": "6b7eb096621443627cc5e29c8c34ff1fde482cf3"
+    "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
     "revision": "f65460eb0746037bc15913e2737afcf87745b66b"
@@ -711,7 +711,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "c06e7bf0edfa211f6a7665a3c7fa25c1198850b2"
+    "revision": "81e16d4ca796407361dad83ffee472715015339c"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -741,7 +741,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"
+    "revision": "dcbbd9406a63fd1e0a42c90ab9451c6127ebd4b3"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -750,13 +750,13 @@
     "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
   },
   "typescript": {
-    "revision": "b00b8eb44f0b9f02556da0b1a4e2f71faed7e61b"
+    "revision": "dcbbd9406a63fd1e0a42c90ab9451c6127ebd4b3"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "4610172f312e8ce5184e6882be5ad1a1cd800fbe"
+    "revision": "b19e64087a426fe059fc6103ff0766c607f41888"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
@@ -771,7 +771,7 @@
     "revision": "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"
   },
   "uxntal": {
-    "revision": "4c5ecd6326ebd61f6f9a22a370cbd100e0d601da"
+    "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
     "revision": "7e11a6f8f369df935664fadd2f0c99d90fe3226f"
@@ -822,7 +822,7 @@
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
   },
   "yuck": {
-    "revision": "a513732feb813426b51d1ead8397a9c285c411be"
+    "revision": "e877f6ade4b77d5ef8787075141053631ba12318"
   },
   "zathurarc": {
     "revision": "e9e8de071ab79ed1f6e3365f05fcf890b6d85a2f"

From 268611e3ece8463bfb5b09044dcd1b76a28ffbb6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 6 May 2024 13:44:43 +0200
Subject: [PATCH 1460/2704] fix(query): update to support supertypes

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 93f279a93..a141efa84 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -567,7 +567,7 @@
     "revision": "239f2627b4c7859fd9adc53609cb40fa0a5431ce"
   },
   "query": {
-    "revision": "608c01187fb9f525a1e4cf585bb63d73dea280b7"
+    "revision": "0c0ed8eaa9eb8c694348a018d95921d006ba7dfc"
   },
   "r": {
     "revision": "391400572538ff9854341a175ed8ab4b1e45f44b"

From 0319e6eef520a8abd1a595ef78146c8cc54a5ed6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 06:37:56 +0000
Subject: [PATCH 1461/2704] bot(lockfile): update bash, json, lalrpop, phpdoc,
 qmljs, query, tsx, typescript

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a141efa84..3af9878a5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "ba7472152d79a8c916550c80fdbfd5724d07a0c9"
   },
   "bash": {
-    "revision": "f8fb3274f72a30896075585b32b0c54cad65c086"
+    "revision": "2fbd860f802802ca76a6661ce025b3a3bca2d3ed"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -342,7 +342,7 @@
     "revision": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14"
   },
   "json": {
-    "revision": "80e623c2165887f9829357acfa9c0a0bab34a3cd"
+    "revision": "94f5c527b2965465956c2000ed6134dd24daf2a7"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -375,7 +375,7 @@
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
   },
   "lalrpop": {
-    "revision": "123d8b472e949b59f348c32e245107a34a3d8945"
+    "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
     "revision": "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"
@@ -504,7 +504,7 @@
     "revision": "d5aea05a70c5d021fa746516391f156d35658875"
   },
   "phpdoc": {
-    "revision": "f285e338d328a03920a9bfd8dda78585c7ddcca3"
+    "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
@@ -564,10 +564,10 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "239f2627b4c7859fd9adc53609cb40fa0a5431ce"
+    "revision": "2c57cac27e207425f8df15327884434cb12365a3"
   },
   "query": {
-    "revision": "0c0ed8eaa9eb8c694348a018d95921d006ba7dfc"
+    "revision": "d25e8d183f319497b8b22a2a1585975b020da722"
   },
   "r": {
     "revision": "391400572538ff9854341a175ed8ab4b1e45f44b"
@@ -741,7 +741,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "dcbbd9406a63fd1e0a42c90ab9451c6127ebd4b3"
+    "revision": "7b4275d077ae196fc0ce42ab3ad091574e3ec519"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -750,7 +750,7 @@
     "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
   },
   "typescript": {
-    "revision": "dcbbd9406a63fd1e0a42c90ab9451c6127ebd4b3"
+    "revision": "7b4275d077ae196fc0ce42ab3ad091574e3ec519"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"

From da0efd7398713a3177da5ce8690f0e5c5415763d Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Tue, 7 May 2024 09:27:44 +0200
Subject: [PATCH 1462/2704] fix(haskell): update queries and tests for
 rewritten parser (#6580)

---
 lockfile.json                          |   2 +-
 queries/haskell/folds.scm              |   4 +-
 queries/haskell/highlights.scm         | 566 +++++++++----------------
 queries/haskell/locals.scm             |   9 +
 tests/query/highlights/haskell/test.hs |  29 +-
 tests/query/highlights_spec.lua        |   1 +
 6 files changed, 238 insertions(+), 373 deletions(-)
 create mode 100644 queries/haskell/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 3af9878a5..5574366c8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -270,7 +270,7 @@
     "revision": "070524937539eb8bb4f10debd9c83b66c434f3a2"
   },
   "haskell": {
-    "revision": "af32d884088ce7b74541b5e51820baa7e305caae"
+    "revision": "e29c59236283198d93740a796c50d1394bccbef5"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
diff --git a/queries/haskell/folds.scm b/queries/haskell/folds.scm
index 5bb256563..d7b820c9f 100644
--- a/queries/haskell/folds.scm
+++ b/queries/haskell/folds.scm
@@ -1,6 +1,6 @@
 [
-  (exp_apply)
-  (exp_do)
+  (apply)
+  (do)
   (function)
   (import)+
 ] @fold
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index a75dd0119..975a8c188 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -4,66 +4,37 @@
 ; and don't override destructured parameters
 (variable) @variable
 
-(pat_wildcard) @variable
+(pattern/wildcard) @variable
 
-(function
+(decl/function
   patterns: (patterns
     (_) @variable.parameter))
 
-(exp_lambda
+(expression/lambda
   (_)+ @variable.parameter
   "->")
 
-(function
-  infix: (infix
-    lhs: (_) @variable.parameter))
-
-(function
-  infix: (infix
-    rhs: (_) @variable.parameter))
+(decl/function
+  (infix
+    (pattern) @variable.parameter))
 
 ; ----------------------------------------------------------------------------
 ; Literals and comments
 (integer) @number
 
-(exp_negation) @number
+(negation) @number
 
-(exp_literal
+(expression/literal
   (float)) @number.float
 
 (char) @character
 
 (string) @string
 
-(con_unit) @string.special.symbol ; unit, as in ()
-
 (comment) @comment
 
-; FIXME: The below documentation comment queries are inefficient
-; and need to be anchored, using something like
-; ((comment) @_first . (comment)+ @comment.documentation)
-; once https://github.com/neovim/neovim/pull/24738 has been merged.
-;
-; ((comment) @comment.documentation
-;   (#lua-match? @comment.documentation "^-- |"))
-;
-; ((comment) @_first @comment.documentation
-;  (comment) @comment.documentation
-;   (#lua-match? @_first "^-- |"))
-;
-; ((comment) @comment.documentation
-;   (#lua-match? @comment.documentation "^-- %^"))
-;
-; ((comment) @_first @comment.documentation
-;  (comment) @comment.documentation
-;   (#lua-match? @_first "^-- %^"))
-;
-; ((comment) @comment.documentation
-;   (#lua-match? @comment.documentation "^{-"))
-;
-; ((comment) @_first @comment.documentation
-;  (comment) @comment.documentation
-;   (#lua-match? @_first "^{-"))
+(haddock) @comment.documentation
+
 ; ----------------------------------------------------------------------------
 ; Punctuation
 [
@@ -76,7 +47,7 @@
 ] @punctuation.bracket
 
 [
-  (comma)
+  ","
   ";"
 ] @punctuation.delimiter
 
@@ -84,7 +55,7 @@
 ; Keywords, operators, includes
 [
   "forall"
-  "∀"
+  ; "∀" ; utf-8 is not cross-platform safe
 ] @keyword.repeat
 
 (pragma) @keyword.directive
@@ -106,11 +77,6 @@
 [
   (operator)
   (constructor_operator)
-  (type_operator)
-  (tycon_arrow)
-  (qualified_module) ; grabs the `.` (dot), ex: import System.IO
-  (qualified_type)
-  (qualified_variable)
   (all_names)
   (wildcard)
   "."
@@ -126,29 +92,11 @@
   "@"
 ] @operator
 
-(module) @module
-
-((qualified_module
-  (module) @constructor)
-  .
-  (module))
-
-(qualified_type
-  (module) @module)
-
-(qualified_variable
-  (module) @module)
-
-(import
-  (module) @module)
-
-(import
-  (module) @constructor
-  .
-  (module))
+(module
+  (module_id) @module)
 
 [
-  (where)
+  "where"
   "let"
   "in"
   "class"
@@ -174,212 +122,157 @@
 
 ; ----------------------------------------------------------------------------
 ; Functions and variables
-(signature
-  name: (variable) @function)
-
-(function
-  name: (variable) @function)
-
-(function
-  name: (variable) @variable
-  rhs: [
-    (exp_literal)
-    (exp_apply
-      (exp_name
-        [
-          (constructor)
-          (variable)
-          (qualified_variable)
-        ]))
-    (quasiquote)
-    ((exp_name)
-      .
-      (operator))
+(decl
+  [
+    name: (variable) @function
+    names: (binding_list
+      (variable) @function)
   ])
 
-(function
-  name: (variable) @variable
-  rhs: (exp_infix
-    [
-      (exp_literal)
-      (exp_apply
-        (exp_name
-          [
-            (constructor)
-            (variable)
-            (qualified_variable)
-          ]))
-      (quasiquote)
-      ((exp_name)
-        .
-        (operator))
-    ]))
+(decl/bind
+  name: (variable) @variable)
 
 ; Consider signatures (and accompanying functions)
 ; with only one value on the rhs as variables
-(signature
-  .
-  (variable) @variable
-  .
-  (_) .)
+(decl/signature
+  name: (variable) @variable
+  type: (type))
 
-((signature
-  .
-  (variable) @_name
-  .
-  (_) .)
-  .
-  (function
-    name: (variable) @variable)
-  (#eq? @_name @variable))
-
-; but consider a type that involves 'IO' a function
-(signature
-  name: (variable) @function
-  .
-  (type_apply
-    (type_name) @_type)
-  (#eq? @_type "IO"))
-
-((signature
+((decl/signature
   name: (variable) @_name
+  type: (type))
   .
-  (type_apply
-    (type_name) @_type)
+  (decl
+    name: (variable) @variable)
+  match: (_)(#eq? @_name @variable))
+
+; but consider a type that involves 'IO' a decl/function
+(decl/signature
+  name: (variable) @function
+  type: (type/apply
+    constructor: (name) @_type)
+  (#eq? @_type "IO"))
+
+((decl/signature
+  name: (variable) @_name
+  type: (type/apply
+    constructor: (name) @_type)
   (#eq? @_type "IO"))
   .
-  (function
+  (decl
     name: (variable) @function)
-  (#eq? @_name @function))
+  match: (_)(#eq? @_name @function))
 
-; functions with parameters
-; + accompanying signatures
-(function
-  name: (variable) @function
-  patterns: (patterns))
-
-((signature) @function
+((decl/signature) @function
   .
-  (function
-    name: (variable) @function
-    patterns: (patterns)))
+  (decl/function
+    name: (variable) @function))
 
-(function
+(decl/bind
   name: (variable) @function
-  rhs: (exp_lambda))
+  (match
+    expression: (expression/lambda)))
 
 ; view patterns
-(pat_view
-  (exp_name
-    [
-      (variable) @function.call
-      (qualified_variable
-        (variable) @function.call)
-    ]))
+(view_pattern
+  [
+    (expression/variable) @function.call
+    (expression/qualified
+      (variable) @function.call)
+  ])
 
 ; consider infix functions as operators
-(exp_infix
+(infix_id
   [
     (variable) @operator
-    (qualified_variable
+    (qualified
       (variable) @operator)
   ])
 
-; partially applied infix functions (sections) also get highlighted as operators
-(exp_section_right
-  [
-    (variable) @operator
-    (qualified_variable
-      (variable) @operator)
-  ])
-
-(exp_section_left
-  [
-    (variable) @operator
-    (qualified_variable
-      (variable) @operator)
-  ])
-
-; function calls with an infix operator
+; decl/function calls with an infix operator
 ; e.g. func <$> a <*> b
-(exp_infix
-  (exp_name
-    [
-      (variable) @function.call
-      (qualified_variable
-        ((module) @module
-          (variable) @function.call))
-    ])
-  .
-  (operator))
+(infix
+  left_operand: [
+    (variable) @function.call
+    (qualified
+      ((module) @module
+        (variable) @function.call))
+  ])
 
 ; infix operators applied to variables
-((exp_name
-  (variable) @variable)
+((expression/variable) @variable
   .
   (operator))
 
 ((operator)
   .
-  (exp_name
-    [
-      (variable) @variable
-      (qualified_variable
-        (variable) @variable)
-    ]))
-
-; function calls with infix operators
-((exp_name
   [
-    (variable) @function.call
-    (qualified_variable
-      (variable) @function.call)
+    (expression/variable) @variable
+    (expression/qualified
+      (variable) @variable)
   ])
+
+; infix operator function definitions
+(function
+  (infix
+    left_operand: [
+      (variable) @variable
+      (qualified
+        ((module) @module
+          (variable) @variable))
+    ])
+  match: (match))
+
+; decl/function calls with infix operators
+([
+  (expression/variable) @function.call
+  (expression/qualified
+    (variable) @function.call)
+]
   .
   (operator) @_op
   (#any-of? @_op "$" "<$>" ">>=" "=<<"))
 
 ; right hand side of infix operator
-((exp_infix
+((infix
   [
     (operator)
-    (variable)
+    (infix_id
+      (variable))
   ] ; infix or `func`
   .
-  (exp_name
-    [
-      (variable) @function.call
-      (qualified_variable
-        (variable) @function.call)
-    ]))
+  [
+    (variable) @function.call
+    (qualified
+      (variable) @function.call)
+  ])
   .
   (operator) @_op
   (#any-of? @_op "$" "<$>" "=<<"))
 
-; function composition, arrows, monadic composition (lhs)
-((exp_name
-  [
-    (variable) @function
-    (qualified_variable
-      (variable) @function)
-  ])
+; decl/function composition, arrows, monadic composition (lhs)
+([
+  (expression/variable) @function
+  (expression/qualified
+    (variable) @function)
+]
   .
   (operator) @_op
   (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
 
 ; right hand side of infix operator
-((exp_infix
+((infix
   [
     (operator)
-    (variable)
+    (infix_id
+      (variable))
   ] ; infix or `func`
   .
-  (exp_name
-    [
-      (variable) @function
-      (qualified_variable
-        (variable) @function)
-    ]))
+  [
+    (variable) @function
+    (qualified
+      (variable) @function)
+  ])
   .
   (operator) @_op
   (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
@@ -387,157 +280,123 @@
 ; function composition, arrows, monadic composition (rhs)
 ((operator) @_op
   .
-  (exp_name
-    [
-      (variable) @function
-      (qualified_variable
-        (variable) @function)
-    ])
+  [
+    (expression/variable) @function
+    (expression/qualified
+      (variable) @function)
+  ]
   (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))
 
 ; function defined in terms of a function composition
-(function
+(decl/function
   name: (variable) @function
-  rhs: (exp_infix
-    (_)
-    .
-    (operator) @_op
-    .
-    (_)
-    (#any-of? @_op "." ">>>" "***" ">=>" "<=<")))
+  (match
+    expression: (infix
+      operator: (operator) @_op
+      (#any-of? @_op "." ">>>" "***" ">=>" "<=<"))))
 
-(exp_apply
-  (exp_name
-    [
-      (variable) @function.call
-      (qualified_variable
-        (variable) @function.call)
-    ]))
+(apply
+  [
+    (expression/variable) @function.call
+    (expression/qualified
+      (variable) @function.call)
+  ])
 
 ; function compositions, in parentheses, applied
 ; lhs
-(exp_apply
+(apply
   .
-  (exp_parens
-    (exp_infix
-      (exp_name
-        [
-          (variable) @function.call
-          (qualified_variable
-            (variable) @function.call)
-        ])
+  (expression/parens
+    (infix
+      [
+        (variable) @function.call
+        (qualified
+          (variable) @function.call)
+      ]
       .
       (operator))))
 
 ; rhs
-(exp_apply
+(apply
   .
-  (exp_parens
-    (exp_infix
+  (expression/parens
+    (infix
       (operator)
       .
-      (exp_name
-        [
-          (variable) @function.call
-          (qualified_variable
-            (variable) @function.call)
-        ]))))
+      [
+        (variable) @function.call
+        (qualified
+          (variable) @function.call)
+      ])))
 
 ; variables being passed to a function call
-(exp_apply
-  (_)+
-  .
-  (exp_name
-    [
-      (variable) @variable
-      (qualified_variable
-        (variable) @variable)
-    ]))
-
-; Consider functions with only one value on the rhs
-; as variables, e.g. x = Rec {} or x = foo
-(function
-  .
-  (variable) @variable
+(apply
+  (_)
   .
   [
-    (exp_record)
-    (exp_name
-      [
-        (variable)
-        (qualified_variable)
-      ])
-    (exp_list)
-    (exp_tuple)
-    (exp_cond)
-  ] .)
+    (expression/variable) @variable
+    (expression/qualified
+      (variable) @variable)
+  ])
 
 ; main is always a function
 ; (this prevents `main = undefined` from being highlighted as a variable)
-(function
+(decl/bind
   name: (variable) @function
   (#eq? @function "main"))
 
 ; scoped function types (func :: a -> b)
-(pat_typed
-  pattern: (pat_name
-    (variable) @function)
-  type: (fun))
+(signature
+  pattern: (pattern/variable) @function
+  type: (function))
 
 ; signatures that have a function type
-; + functions that follow them
-(signature
-  (variable) @function
-  (fun))
+; + binds that follow them
+(decl/signature
+  name: (variable) @function
+  type: (function))
 
-((signature
-  (variable) @_type
-  (fun))
+((decl/signature
+  name: (variable) @_name
+  type: (quantified_type))
   .
-  (function
+  (decl/bind
     (variable) @function)
-  (#eq? @function @_type))
+  (#eq? @function @_name))
 
-(signature
-  (variable) @function
-  (context
-    (fun)))
+; Treat constructor assignments (smart constructors) as functions, e.g. mkJust = Just
+(bind
+  name: (variable) @function
+  match: (match
+    expression: (constructor)))
 
-((signature
-  (variable) @_type
-  (context
-    (fun)))
-  .
-  (function
-    (variable) @function)
-  (#eq? @function @_type))
-
-((signature
-  (variable) @function
-  (forall
-    (context
-      (fun))))
-  .
-  (function
-    (variable)))
-
-((signature
-  (variable) @_type
-  (forall
-    (context
-      (fun))))
-  .
-  (function
-    (variable) @function)
-  (#eq? @function @_type))
+; Function composition
+(bind
+  name: (variable) @function
+  match: (match
+    expression: (infix
+      operator: (operator) @_op
+      (#eq? @_op "."))))
 
 ; ----------------------------------------------------------------------------
 ; Types
-(type) @type
+(name) @type
 
-(type_star) @type
+(type/unit) @type
 
-(type_variable) @type
+(type/unit
+  [
+    "("
+    ")"
+  ] @type)
+
+(type/list
+  [
+    "["
+    "]"
+  ] @type)
+
+(type/star) @type
 
 (constructor) @constructor
 
@@ -554,26 +413,24 @@
 (quoter) @function.call
 
 (quasiquote
-  [
+  quoter: [
     (quoter) @_name
-    (_
-      (variable) @_name)
+    (quoter
+      (qualified
+        id: (variable) @_name))
   ]
   (#eq? @_name "qq")
-  (quasiquote_body) @string)
-
-(quasiquote
-  (_
-    (variable) @_name)
-  (#eq? @_name "qq")
-  (quasiquote_body) @string)
+  body: (quasiquote_body) @string)
 
 ; namespaced quasi-quoter
-(quasiquote
-  (_
-    (module) @module
-    .
-    (variable) @function.call))
+(quoter
+  [
+    (variable) @function.call
+    (_
+      (module) @module
+      .
+      (variable) @function.call)
+  ])
 
 ; Highlighting of quasiquote_body for other languages is handled by injections.scm
 ; ----------------------------------------------------------------------------
@@ -595,28 +452,15 @@
 
 ; ----------------------------------------------------------------------------
 ; Fields
-(field
+(field_name
   (variable) @variable.member)
 
-(pat_field
-  (variable) @variable.member)
-
-(exp_projection
-  field: (variable) @variable.member)
-
-(import_item
-  (type)
+(import_name
+  (name)
   .
-  (import_con_names
+  (children
     (variable) @variable.member))
 
-(exp_field
-  field: [
-    (variable) @variable.member
-    (qualified_variable
-      (variable) @variable.member)
-  ])
-
 ; ----------------------------------------------------------------------------
 ; Spell checking
 (comment) @spell
diff --git a/queries/haskell/locals.scm b/queries/haskell/locals.scm
new file mode 100644
index 000000000..7177f9dee
--- /dev/null
+++ b/queries/haskell/locals.scm
@@ -0,0 +1,9 @@
+(signature
+  name: (variable)) @local.definition
+
+(function
+  name: (variable)) @local.definition
+
+(pattern/variable) @local.definition
+
+(expression/variable) @local.reference
diff --git a/tests/query/highlights/haskell/test.hs b/tests/query/highlights/haskell/test.hs
index 7734a448b..f719981ff 100644
--- a/tests/query/highlights/haskell/test.hs
+++ b/tests/query/highlights/haskell/test.hs
@@ -1,10 +1,13 @@
 {-# LANGUAGE QuasiQuotes #-}
 -- ^ @keyword.directive
 
+{-| Main module -}
+ -- ^ @comment.documentation
 module Main 
 -- ^ @keyword.import
      -- ^ @module
   ( main
+   -- ^ @variable
   ) where
    -- ^ @keyword
 
@@ -16,12 +19,12 @@ import Prelude hiding (show)
 import Data.Map (fromList)
       -- ^ @module
 import qualified Data.Map as Map
-                -- ^ @constructor
+                -- ^ @module
                            -- ^ @module
 import qualified Chronos
                 -- ^ @module
 import qualified Chronos as C
-                -- ^ @constructor
+                -- ^ @module
                          -- ^ @module
 import FooMod (BarTy (barField))
                       -- ^ @variable.member
@@ -47,9 +50,9 @@ mkAQualified x = SomeModule.A x
 
 class Ord a => PartialOrd a
     -- ^ @type
-       -- ^ @type
+       -- ^ @variable
                 -- ^ @type
-                       -- ^ @type
+                       -- ^ @variable
 
 instance Ord ADT where
       -- ^ @type
@@ -78,7 +81,7 @@ main :: IO ()
 -- ^ @function
   -- ^ @operator
      -- ^ @type
-         -- ^ @string.special.symbol
+        -- ^ @type
 main = undefined
 -- ^ @function
       -- ^ @keyword.exception
@@ -95,14 +98,20 @@ someFunc0 x = someFunc1 x
                -- ^ @number
 scopedTypeParam (x :: Int) = someFunc x
               -- ^ @variable.parameter
+                   -- ^ @type
 scopedTypeParam (Just x :: Int) = someFunc x
+              -- ^ @constructor
                    -- ^ @variable.parameter
+                         -- ^ @type
+scopedTypeParam (f :: Int -> Int) = someFunc x
+              -- ^ @function
 
 someInfix :: Integral a => a -> Double
             -- ^ @type
-                   -- ^ @type
+                   -- ^ @variable
                       -- ^ @operator
-                        -- ^ @type
+                        -- ^ @variable
+                              -- ^ @type
 someInfix x = fromIntegral x `myAdd` floatVal
                 -- ^ @function.call
                         -- ^ @variable
@@ -149,8 +158,10 @@ someInfix x = fromIntegral x `myAdd` floatVal
 
 someIOaction :: IO ()
 -- ^ @function
-someIOaction = do
-            -- ^ @keyword
+anotherIOaction :: IO ()
+anotherIOaction = do
+-- ^ @function
+               -- ^ @keyword
   foo <- SomeModule.someFun <$> getArgs
 -- ^ @variable
             -- ^ @module
diff --git a/tests/query/highlights_spec.lua b/tests/query/highlights_spec.lua
index 548a7eeba..ff6a7523d 100644
--- a/tests/query/highlights_spec.lua
+++ b/tests/query/highlights_spec.lua
@@ -4,6 +4,7 @@ local ts = vim.treesitter
 
 local COMMENT_NODES = {
   markdown = "html_block",
+  haskell = "haddock",
 }
 
 local function check_assertions(file)

From db034435823045a9544f79883d5d21a406f6dd17 Mon Sep 17 00:00:00 2001
From: Ananda Umamil <zweimach@zweimach.org>
Date: Wed, 8 May 2024 00:14:15 +0700
Subject: [PATCH 1463/2704] fix(ecma): template string injections (#6590)

---
 queries/ecma/injections.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index c9d7f5a52..85e0383c3 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -9,7 +9,7 @@
 (call_expression
   function: [
     (await_expression
-      (identifier)) @injection.language
+      (identifier) @injection.language)
     (identifier) @injection.language
   ]
   arguments: [
@@ -31,8 +31,8 @@
     (await_expression
       (identifier) @_name
       (#eq? @_name "svg"))
-    (identifier) @_name
-    (#eq? @_name "svg")
+    ((identifier) @_name
+      (#eq? @_name "svg"))
   ]
   arguments: [
     (arguments
@@ -48,8 +48,8 @@
     (await_expression
       (identifier) @_name
       (#eq? @_name "gql"))
-    (identifier) @_name
-    (#eq? @_name "gql")
+    ((identifier) @_name
+      (#eq? @_name "gql"))
   ]
   arguments: ((template_string) @injection.content
     (#offset! @injection.content 0 1 0 -1)
@@ -61,8 +61,8 @@
     (await_expression
       (identifier) @_name
       (#eq? @_name "hbs"))
-    (identifier) @_name
-    (#eq? @_name "hbs")
+    ((identifier) @_name
+      (#eq? @_name "hbs"))
   ]
   arguments: ((template_string) @injection.content
     (#offset! @injection.content 0 1 0 -1)
@@ -78,8 +78,8 @@
     (await_expression
       (identifier) @_name
       (#any-of? @_name "css" "keyframes"))
-    (identifier) @_name
-    (#any-of? @_name "css" "keyframes")
+    ((identifier) @_name
+      (#any-of? @_name "css" "keyframes"))
   ]
   arguments: ((template_string) @injection.content
     (#offset! @injection.content 0 1 0 -1)

From acefffae27b5105a717b213e19c5975bf7a4ba68 Mon Sep 17 00:00:00 2001
From: Laytan Laats <laytanlaats@hotmail.com>
Date: Tue, 7 May 2024 20:47:25 +0200
Subject: [PATCH 1464/2704] feat(odin): more lenient towards different function
 naming convention

PR originally made and merged upstream here: https://github.com/tree-sitter-grammars/tree-sitter-odin/pull/15
---
 queries/odin/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 0d041f6bb..9e65937aa 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -193,7 +193,7 @@
 
 ((identifier) @type
   (#lua-match? @type "^[A-Z][a-zA-Z0-9]*$")
-  (#not-has-parent? @type parameter procedure_declaration))
+  (#not-has-parent? @type parameter procedure_declaration call_expression))
 
 ; Fields
 (member_expression

From 3607d9c59cb16ed5368ecfed53e8ca1735bb98fb Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 06:36:11 +0000
Subject: [PATCH 1465/2704] bot(lockfile): update angular, gleam, haskell, idl,
 javascript, kotlin, odin, ql, tlaplus

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5574366c8..635548f39 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "f12fc56469d778285fb35b5bdb943edcfe77c48a"
+    "revision": "10f21f3f1b10584e62ecc113ab3cda1196d0ceb8"
   },
   "apex": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -219,7 +219,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "a0b11a15935b95848176c747a8b5776752d90d7c"
+    "revision": "8432ffe32ccd360534837256747beb5b1c82fca1"
   },
   "glimmer": {
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
@@ -270,7 +270,7 @@
     "revision": "070524937539eb8bb4f10debd9c83b66c434f3a2"
   },
   "haskell": {
-    "revision": "e29c59236283198d93740a796c50d1394bccbef5"
+    "revision": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "3bb3c69a050c68c24482e45465b41652628044b7"
+    "revision": "9d7380151583d43a333add8a5a6918aec8c3f275"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -333,7 +333,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "c67e8556d09bfdc21919839486d03e37ee44a6ce"
+    "revision": "4928d3d18019a848906855476fde2dc8be030217"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -366,7 +366,7 @@
     "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
   },
   "kotlin": {
-    "revision": "eca05edbab1918d7d36a0d30d086ba7b6b1e8803"
+    "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
   },
   "koto": {
     "revision": "919440e1376109bab4edac52594c17c02ae0be5a"
@@ -480,7 +480,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "b5f668ef8918aab13812ce73acd89fe191fb8c5e"
+    "revision": "f25b8c5201c1480dc0c8c4155a059a79a5a40719"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
@@ -558,7 +558,7 @@
     "revision": "71778c2a472ed00a64abf4219544edbf8e4b86d7"
   },
   "ql": {
-    "revision": "fa5c3821dd2161f5c8528a8cbdb258daa6dc4de6"
+    "revision": "42becd6f8f7bae82c818fa3abb1b6ff34b552310"
   },
   "qmldir": {
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
@@ -726,7 +726,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "763f9a4edcb1747595842164614aa143eec084dd"
+    "revision": "08d915655d360bb0b7592d38a533dcc17dcb8dfb"
   },
   "tmux": {
     "revision": "9138ea508410e0f34da2666609f600f65e944f22"

From 1be5aa99e3e0e4a36c31fa7066dcf46a4e0142dd Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 7 May 2024 13:36:07 -0700
Subject: [PATCH 1466/2704] feat(rust): underscore match arms, parameters

---
 queries/rust/highlights.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index c392c030f..1609a81a2 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -29,7 +29,10 @@
 (mod_item
   name: (identifier) @module)
 
-(self) @variable.builtin
+[
+  (self)
+  "_"
+] @variable.builtin
 
 (label
   [
@@ -45,7 +48,10 @@
   (identifier) @function)
 
 (parameter
-  (identifier) @variable.parameter)
+  [
+    (identifier)
+    "_"
+  ] @variable.parameter)
 
 (closure_parameters
   (_) @variable.parameter)

From 9e1cda4e71a763ba1f1ac099498c7ce40edc6dd2 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <git@yorickpeterse.com>
Date: Wed, 8 May 2024 17:01:41 +0200
Subject: [PATCH 1467/2704] fix(inko): indent call nodes

This ensures that when you add a new call line in the middle of a call
chain, the line is indented like so:

    foo
      .bar
      .new_line_here
      .baz

Instead of it being indented like so:

    foo
      .bar
    .new_line_here
      .baz
---
 queries/inko/indents.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/inko/indents.scm b/queries/inko/indents.scm
index 8a09edd97..d2d9a5724 100644
--- a/queries/inko/indents.scm
+++ b/queries/inko/indents.scm
@@ -7,6 +7,7 @@
   (binary)
   (block)
   (bounds)
+  (call)
   (cast)
   (class)
   (class_pattern)

From 1b2f0067035c3d3ae7e0642614b8b03a2f19f49d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 06:37:15 +0000
Subject: [PATCH 1468/2704] bot(lockfile): update comment, yaml

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 635548f39..f5ae9dcb4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"
   },
   "comment": {
-    "revision": "aefcc2813392eb6ffe509aa0fc8b4e9b57413ee1"
+    "revision": "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"
   },
   "commonlisp": {
     "revision": "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"
@@ -816,7 +816,7 @@
     "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
   },
   "yaml": {
-    "revision": "08ab1fbc18beac06b2938495a2c6ab17b5a6abc5"
+    "revision": "7b03feefd36b5f155465ca736c6304aca983b267"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From 707b0dcf7641fa3a2aaad5053b215503f54f89aa Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 7 May 2024 10:22:17 -0700
Subject: [PATCH 1469/2704] feat(query): pattern injections for new predicates

---
 queries/query/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index 408d88e28..c6a74f82f 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -2,7 +2,7 @@
   name: (identifier) @_name
   parameters: (parameters
     (string) @injection.content))
-  (#any-of? @_name "match" "not-match" "vim-match" "not-vim-match")
+  (#any-of? @_name "match" "not-match" "any-match" "vim-match" "not-vim-match" "any-vim-match")
   (#set! injection.language "regex")
   (#offset! @injection.content 0 1 0 -1))
 
@@ -10,7 +10,7 @@
   name: (identifier) @_name
   parameters: (parameters
     (string) @injection.content))
-  (#any-of? @_name "lua-match" "not-lua-match")
+  (#any-of? @_name "lua-match" "not-lua-match" "any-lua-match")
   (#set! injection.language "luap")
   (#offset! @injection.content 0 1 0 -1))
 

From d6dcfe888724d271dcbaa6f2c80f9f706b39cd2a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 06:37:33 +0000
Subject: [PATCH 1470/2704] bot(lockfile): update c, dockerfile, dtd, mlir,
 templ, typst, xml

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f5ae9dcb4..8e8c1ecdf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "60ba73739c6083c693d86a1a7cf039c07eb4ed59"
   },
   "c": {
-    "revision": "1aafaff4d26dac5a36dd3495be33e1c20161d761"
+    "revision": "82fb86aa544843bd17a9f0f3dc16edf645a34349"
   },
   "c_sharp": {
     "revision": "e1384e2f132936019b43aaaae154cd780fb497ce"
@@ -120,7 +120,7 @@
     "revision": "0e9a836ec47612ade15645fb1680adb549894a6c"
   },
   "dockerfile": {
-    "revision": "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"
+    "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"
   },
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
@@ -129,7 +129,7 @@
     "revision": "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"
   },
   "dtd": {
-    "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
+    "revision": "7c467645e7ab77c57ba9d293e2e28d563829cbdc"
   },
   "earthfile": {
     "revision": "3ded1cba9eab14b07377b700b1132d259480abae"
@@ -435,7 +435,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "ab7708c4aed1ff0919d6f6fd3e463fe75ba645be"
+    "revision": "2812b6c6aa03f1ca8dba2fb1c33d14abb87809e7"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -711,7 +711,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "81e16d4ca796407361dad83ffee472715015339c"
+    "revision": "d631f60287c0904770bc41aa865e249594b52422"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
@@ -756,7 +756,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "b19e64087a426fe059fc6103ff0766c607f41888"
+    "revision": "3924cb9ed9e0e62ce7df9c4fe0faa4c234795999"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
@@ -813,7 +813,7 @@
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "5910ee285378e07ff1e63a9f5d21898f62310aed"
+    "revision": "7c467645e7ab77c57ba9d293e2e28d563829cbdc"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From fa1515b015ab9894aa9866410b1c23e03d2be4af Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 11 May 2024 06:35:20 +0000
Subject: [PATCH 1471/2704] bot(lockfile): update dtd, go, idl, javascript,
 tact, xml

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8e8c1ecdf..e1eba4e4b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -129,7 +129,7 @@
     "revision": "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"
   },
   "dtd": {
-    "revision": "7c467645e7ab77c57ba9d293e2e28d563829cbdc"
+    "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
     "revision": "3ded1cba9eab14b07377b700b1132d259480abae"
@@ -234,7 +234,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "eb68645662a3f7bf7fdd4bcb9531585f54c8570e"
+    "revision": "7ee8d928db5202f6831a78f8112fd693bf69f98b"
   },
   "godot_resource": {
     "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "9d7380151583d43a333add8a5a6918aec8c3f275"
+    "revision": "e885d7fd66c2549b7a28172400d645d27656f5cb"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -333,7 +333,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "4928d3d18019a848906855476fde2dc8be030217"
+    "revision": "e88537c2703546f3f0887dd3f16898e1749cdba5"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -702,7 +702,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "f65460eb0746037bc15913e2737afcf87745b66b"
+    "revision": "034df2162ed7b654efd999942e266be713c7cde0"
   },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
@@ -813,7 +813,7 @@
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
   },
   "xml": {
-    "revision": "7c467645e7ab77c57ba9d293e2e28d563829cbdc"
+    "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 6587d8e6942b8d2146d61bab4c4acff9dec5ae59 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 3 May 2024 20:10:58 -0400
Subject: [PATCH 1472/2704] feat(c_sharp): update parser & queries

---
 README.md                       |   2 +-
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   2 +-
 queries/c_sharp/folds.scm       |   3 +
 queries/c_sharp/highlights.scm  | 244 +++++++++++++++++++++++---------
 queries/c_sharp/locals.scm      |   4 +-
 6 files changed, 183 insertions(+), 74 deletions(-)

diff --git a/README.md b/README.md
index 3cb08346a..e04e700d3 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bitbake](https://github.com/amaanq/tree-sitter-bitbake) (maintained by @amaanq)
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
-- [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @Luxed)
+- [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
 - [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
 - [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index e1eba4e4b..195172133 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "82fb86aa544843bd17a9f0f3dc16edf645a34349"
   },
   "c_sharp": {
-    "revision": "e1384e2f132936019b43aaaae154cd780fb497ce"
+    "revision": "f47328563999efb9d6438d8ea28999711fbe473f"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 169ffea2d..031b2658e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -224,7 +224,7 @@ list.c_sharp = {
     files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "cs",
-  maintainers = { "@Luxed" },
+  maintainers = { "@amaanq" },
 }
 
 list.cairo = {
diff --git a/queries/c_sharp/folds.scm b/queries/c_sharp/folds.scm
index 80ae4e44b..16967b69d 100644
--- a/queries/c_sharp/folds.scm
+++ b/queries/c_sharp/folds.scm
@@ -10,5 +10,8 @@ initializer: (initializer_expression) @fold
 
 [
   (block)
+  (preproc_if)
+  (preproc_elif)
+  (preproc_else)
   (using_directive)+
 ] @fold
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 7d2621bcc..20cc80747 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -1,12 +1,15 @@
-(identifier) @variable
+[
+  (identifier)
+  (preproc_arg)
+] @variable
+
+((preproc_arg) @constant.macro
+  (#lua-match? @constant.macro "^[_A-Z][_A-Z0-9]*$"))
 
 ((identifier) @keyword
   (#eq? @keyword "value")
   (#has-ancestor? @keyword accessor_declaration))
 
-((identifier) @variable.builtin
-  (#eq? @variable.builtin "_"))
-
 (method_declaration
   name: (identifier) @function.method)
 
@@ -14,8 +17,23 @@
   name: (identifier) @function.method)
 
 (method_declaration
+  returns: [
+    (identifier) @type
+    (generic_name
+      (identifier) @type)
+  ])
+
+(event_declaration
   type: (identifier) @type)
 
+(event_declaration
+  name: (identifier) @variable.member)
+
+(event_field_declaration
+  (variable_declaration
+    (variable_declarator
+      name: (identifier) @variable.member)))
+
 (declaration_pattern
   type: (identifier) @type)
 
@@ -46,11 +64,16 @@
   (identifier) @type)
 
 (namespace_declaration
-  name: [
-    (qualified_name
-      (identifier) @module)
-    (identifier) @module
-  ])
+  name: (identifier) @module)
+
+(file_scoped_namespace_declaration
+  name: (identifier) @module)
+
+(qualified_name
+  (identifier) @module
+  (#not-has-ancestor? @module method_declaration)
+  (#not-has-ancestor? @module record_declaration)
+  (#has-ancestor? @module namespace_declaration file_scoped_namespace_declaration))
 
 (invocation_expression
   (identifier) @function.method.call)
@@ -64,13 +87,16 @@
   (assignment_expression
     left: (identifier) @variable.member))
 
-(parameter_list
-  (parameter
-    name: (identifier) @variable.parameter))
+(parameter
+  name: (identifier) @variable.parameter)
 
-(implicit_parameter_list
-  (parameter
-    name: (identifier) @variable.parameter))
+(parameter_list
+  name: (identifier) @variable.parameter)
+
+(bracketed_parameter_list
+  name: (identifier) @variable.parameter)
+
+(implicit_parameter) @variable.parameter
 
 (parameter_list
   (parameter
@@ -82,6 +108,15 @@
 
 (null_literal) @constant.builtin
 
+(calling_convention
+  [
+    (identifier)
+    "Cdecl"
+    "Stdcall"
+    "Thiscall"
+    "Fastcall"
+  ] @attribute.builtin)
+
 (character_literal) @character
 
 [
@@ -93,7 +128,10 @@
 
 (escape_sequence) @string.escape
 
-(boolean_literal) @boolean
+[
+  "true"
+  "false"
+] @boolean
 
 (predefined_type) @type.builtin
 
@@ -114,8 +152,7 @@
   (identifier) @type)
 
 (using_directive
-  (name_equals
-    (identifier) @type.definition))
+  (type) @type.definition)
 
 (property_declaration
   name: (identifier) @property)
@@ -124,7 +161,16 @@
   type: (identifier) @type)
 
 (nullable_type
-  (identifier) @type)
+  type: (identifier) @type)
+
+(array_type
+  type: (identifier) @type)
+
+(ref_type
+  type: (identifier) @type)
+
+(pointer_type
+  type: (identifier) @type)
 
 (catch_declaration
   type: (identifier) @type)
@@ -138,15 +184,48 @@
 (record_declaration
   name: (identifier) @type)
 
+(struct_declaration
+  name: (identifier) @type)
+
 (enum_declaration
   name: (identifier) @type)
 
 (enum_member_declaration
   name: (identifier) @variable.member)
 
+(operator_declaration
+  type: (identifier) @type)
+
+(conversion_operator_declaration
+  type: (identifier) @type)
+
+(explicit_interface_specifier
+  [
+    (identifier) @type
+    (generic_name
+      (identifier) @type)
+  ])
+
+(explicit_interface_specifier
+  (identifier) @type)
+
+(primary_constructor_base_type
+  type: (identifier) @type)
+
+[
+  "assembly"
+  "module"
+  "this"
+  "base"
+  (discard)
+] @variable.builtin
+
 (constructor_declaration
   name: (identifier) @constructor)
 
+(destructor_declaration
+  name: (identifier) @constructor)
+
 (constructor_initializer
   "base" @constructor)
 
@@ -157,7 +236,7 @@
   (identifier) @type)
 
 ; Generic Types.
-(type_of_expression
+(typeof_expression
   (generic_name
     (identifier) @type))
 
@@ -169,9 +248,13 @@
   (generic_name
     (identifier) @type))
 
-(type_constraint
-  (generic_name
-    (identifier) @type))
+(type_parameter_constraint
+  [
+    (identifier) @type
+    (type
+      (generic_name
+        (identifier) @type))
+  ])
 
 (object_creation_expression
   (generic_name
@@ -205,15 +288,26 @@
 (type_parameter_list
   (type_parameter) @type)
 
+(type_parameter
+  name: (identifier) @type)
+
 (type_parameter_constraints_clause
-  target: (identifier) @type)
+  "where"
+  .
+  (identifier) @type)
 
 (attribute
   name: (identifier) @attribute)
 
-(for_each_statement
+(foreach_statement
   type: (identifier) @type)
 
+(goto_statement
+  (identifier) @label)
+
+(labeled_statement
+  (identifier) @label)
+
 (tuple_element
   type: (identifier) @type)
 
@@ -222,43 +316,48 @@
     (declaration_expression
       type: (identifier) @type)))
 
+(cast_expression
+  type: (identifier) @type)
+
+(lambda_expression
+  type: (identifier) @type)
+
 (as_expression
   right: (identifier) @type)
 
-(type_of_expression
+(typeof_expression
   (identifier) @type)
 
-(name_colon
-  (identifier) @variable.parameter)
-
-(warning_directive) @comment.warning
-
-(error_directive) @keyword.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
+(preproc_error) @keyword.exception
 
 [
-  (nullable_directive)
-  (region_directive)
-  (endregion_directive)
+  "#define"
+  "#undef"
+] @keyword.directive.define
+
+[
+  "#if"
+  "#elif"
+  "#else"
+  "#endif"
+  "#region"
+  "#endregion"
+  "#line"
+  "#pragma"
+  "#nullable"
+  "#error"
+  (shebang_directive)
+] @keyword.directive
+
+[
+  (preproc_line)
+  (preproc_pragma)
+  (preproc_nullable)
 ] @constant.macro
 
+(preproc_pragma
+  (identifier) @constant)
+
 [
   "if"
   "else"
@@ -266,16 +365,15 @@
   "break"
   "case"
   "when"
-  (if_directive)
-  (elif_directive)
-  (else_directive)
-  (endif_directive)
 ] @keyword.conditional
 
-(if_directive
+(preproc_pragma
   (identifier) @constant)
 
-(elif_directive
+(preproc_if
+  (identifier) @constant)
+
+(preproc_if
   (identifier) @constant)
 
 [
@@ -335,6 +433,7 @@
   "=>"
   "??"
   "??="
+  ".."
 ] @operator
 
 [
@@ -359,18 +458,14 @@
   ")"
 ] @punctuation.bracket
 
+(interpolation_brace) @punctuation.special
+
 (type_argument_list
   [
     "<"
     ">"
   ] @punctuation.bracket)
 
-[
-  (this_expression)
-  (base_expression)
-  "this"
-] @variable.builtin
-
 [
   "using"
   "as"
@@ -390,6 +485,9 @@
   "or"
   "not"
   "stackalloc"
+  "__makeref"
+  "__reftype"
+  "__refvalue"
   "in"
   "out"
   "ref"
@@ -413,8 +511,14 @@
   "unchecked"
   "fixed"
   "alias"
+  "file"
+  "unsafe"
 ] @keyword
 
+(attribute_target_specifier
+  .
+  _ @keyword)
+
 [
   "enum"
   "record"
@@ -438,9 +542,9 @@
   "static"
   "volatile"
   "required"
-] @keyword.modifier
-
-[
+  "managed"
+  "unmanaged"
+  "notnull"
   "abstract"
   "private"
   "protected"
@@ -449,9 +553,11 @@
   "partial"
   "sealed"
   "virtual"
+  "global"
 ] @keyword.modifier
 
-(parameter_modifier) @operator
+(scoped_type
+  "scoped" @keyword.modifier)
 
 (query_expression
   (_
diff --git a/queries/c_sharp/locals.scm b/queries/c_sharp/locals.scm
index 33df9bb37..bef094007 100644
--- a/queries/c_sharp/locals.scm
+++ b/queries/c_sharp/locals.scm
@@ -10,10 +10,10 @@
 (declaration_expression
   name: (identifier) @local.definition.var)
 
-(for_each_statement
+(foreach_statement
   left: (identifier) @local.definition.var)
 
-(for_each_statement
+(foreach_statement
   left: (tuple_pattern
     (identifier) @local.definition.var))
 

From c4f65272a971b9d5d6ac7ed4607e50dd6207923f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 12 May 2024 10:08:06 +0200
Subject: [PATCH 1473/2704] fix(solidity): disable broken operators

---
 queries/solidity/highlights.scm | 65 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 1f1d2fe96..37f2d6df0 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -262,39 +262,38 @@
   "=>"
 ] @punctuation.delimiter
 
-; Operators
-[
-  "&&"
-  "||"
-  ">>"
-  ">>>"
-  "<<"
-  "&"
-  "^"
-  "|"
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-  "**"
-  "="
-  "<"
-  "<="
-  "=="
-  "!="
-  "!=="
-  ">="
-  ">"
-  "!"
-  "~"
-  "-"
-  "+"
-  "++"
-  "--"
-  ":="
-] @operator
-
+; Operators: currently broken: https://github.com/JoranHonig/tree-sitter-solidity/issues/59
+;[
+;  "&&"
+;  "||"
+;  ">>"
+;  ">>>"
+;  "<<"
+;  "&"
+;  "^"
+;  "|"
+;  "+"
+;  "-"
+;  "*"
+;  "/"
+;  "%"
+;  "**"
+;  "="
+;  "<"
+;  "<="
+;  "=="
+;  "!="
+;  "!=="
+;  ">="
+;  ">"
+;  "!"
+;  "~"
+;  "-"
+;  "+"
+;  "++"
+;  "--"
+;  ":="
+;] @operator
 [
   "delete"
   "new"

From 0d2c80b4d00c8f793e17d2d1d24d4aa5aaa88bc2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 12 May 2024 08:30:45 +0000
Subject: [PATCH 1474/2704] bot(lockfile): update c_sharp, cuda, glsl, hlsl,
 mlir, solidity, sourcepawn

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 195172133..a27ebd5a7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "82fb86aa544843bd17a9f0f3dc16edf645a34349"
   },
   "c_sharp": {
-    "revision": "f47328563999efb9d6438d8ea28999711fbe473f"
+    "revision": "82fa8f05f41a33e9bc830f85d74a9548f0291738"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -93,7 +93,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "c794560823013fc4cc29944d862b7158d9585408"
+    "revision": "e7878a9cf4157e9d6c8013ff5605c9f26d62894d"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -225,7 +225,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "9f611774fb5b95993e31e03f137b4a689c63f827"
+    "revision": "8c9fb41836dc202bbbcf0e2369f256055786dedb"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -288,7 +288,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "de5d490e52aa7be2a877df7022f93dff05f03eb9"
+    "revision": "feea0ff6eccda8be958c133985dca8977db3d887"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -435,7 +435,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "2812b6c6aa03f1ca8dba2fb1c33d14abb87809e7"
+    "revision": "a708e9b3f3d7f2fc85ac3fd1d4317c51b101eab0"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -645,7 +645,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "fa5c61c7c5a2d9e8e99439e2cec90225f4acb86b"
+    "revision": "b5a23ead0f69d38b5c9a630f52f5c129132c16ed"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -654,7 +654,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "3ca89fdf998340a7973e276b39516d8902950f86"
+    "revision": "6a67772eed866cd6d247cc478a28c6a9272fc0ef"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"

From d5a1c2b0c8ec5bb377a41c1c414b315d6b3e9432 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 12 May 2024 18:00:55 -0700
Subject: [PATCH 1475/2704] feat: standardize and document export keywords

Many export keywords are captured as `@keyword.import`. This commit
makes it so they are all captured like that, and mentions it in the
documentation.
---
 CONTRIBUTING.md                   |  2 +-
 queries/bash/highlights.scm       |  3 ++-
 queries/ecma/highlights.scm       | 15 ++-------------
 queries/gdscript/highlights.scm   |  3 ++-
 queries/hare/highlights.scm       |  6 ++++--
 queries/luau/highlights.scm       |  3 ++-
 queries/make/highlights.scm       |  6 ++++--
 queries/qmljs/highlights.scm      |  1 -
 queries/slint/highlights.scm      |  2 +-
 queries/typescript/highlights.scm |  4 ----
 queries/zig/highlights.scm        |  6 ++++--
 11 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7528eece5..449cddcbd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -167,7 +167,7 @@ As languages differ quite a lot, here is a set of captures available to you when
 @keyword.coroutine         ; keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)
 @keyword.function          ; keywords that define a function (e.g. `func` in Go, `def` in Python)
 @keyword.operator          ; operators that are English words (e.g. `and` / `or`)
-@keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
+@keyword.import            ; keywords for including or exporting modules (e.g. `import` / `from` in Python)
 @keyword.type              ; keywords describing namespaces and composite types (e.g. `struct`, `enum`)
 @keyword.modifier          ; keywords modifying other constructs (e.g. `const`, `static`, `public`)
 @keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index feb0e038e..7ad3478e4 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -93,13 +93,14 @@
 [
   "declare"
   "typeset"
-  "export"
   "readonly"
   "local"
   "unset"
   "unsetenv"
 ] @keyword
 
+"export" @keyword.import
+
 "function" @keyword.function
 
 (special_variable_name) @constant
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 12068af17..f60406272 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -314,20 +314,10 @@
 [
   "import"
   "from"
+  "as"
+  "export"
 ] @keyword.import
 
-(export_specifier
-  "as" @keyword.import)
-
-(import_specifier
-  "as" @keyword.import)
-
-(namespace_export
-  "as" @keyword.import)
-
-(namespace_import
-  "as" @keyword.import)
-
 [
   "for"
   "of"
@@ -340,7 +330,6 @@
   "break"
   "const"
   "debugger"
-  "export"
   "extends"
   "get"
   "let"
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 691d836ce..9f122e473 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -215,7 +215,6 @@
   "signal"
   "var"
   "onready"
-  "export"
   "setget"
   "remote"
   "master"
@@ -225,6 +224,8 @@
   "puppetsync"
 ] @keyword
 
+"export" @keyword.import
+
 [
   "enum"
   "class"
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index dc7947725..68a3e1881 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -20,7 +20,10 @@
   (#lua-match? @constant "^[A-Z_]+$"))
 
 ; Includes
-"use" @keyword.import
+[
+  "use"
+  "export"
+] @keyword.import
 
 (use_statement
   (scoped_type_identifier
@@ -41,7 +44,6 @@
 ; Keywords
 [
   "def"
-  "export"
   "let"
 ] @keyword
 
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 08ed56b83..23780731c 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -7,9 +7,10 @@
 [
   "local"
   "type"
-  "export"
 ] @keyword
 
+"export" @keyword.import
+
 (do_statement
   [
     "do"
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index f51616006..1a3cac749 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -37,8 +37,10 @@
     "|"
   ] @operator)
 
-(export_directive
-  "export" @keyword)
+[
+  "export"
+  "unexport"
+] @keyword.import
 
 (override_directive
   "override" @keyword)
diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm
index 2caeb7ba3..27f332028 100644
--- a/queries/qmljs/highlights.scm
+++ b/queries/qmljs/highlights.scm
@@ -102,7 +102,6 @@
   "property"
   "signal"
   "declare"
-  "export"
   "implements"
   "override"
 ] @keyword
diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 562499733..8ab232c83 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -184,7 +184,7 @@
 ; Keywords:
 (animate_option_identifier) @keyword
 
-(export) @keyword
+(export) @keyword.import
 
 (if_statement
   "if" @keyword.conditional)
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index bd13b1cb5..663c4a4a6 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -7,7 +7,6 @@
 
 [
   "declare"
-  "export"
   "implements"
   "type"
   "override"
@@ -32,9 +31,6 @@
 (as_expression
   "as" @keyword.operator)
 
-(export_statement
-  "as" @keyword.operator)
-
 (mapped_type_clause
   "as" @keyword.operator)
 
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index f0597ce34..521f97d20 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -139,7 +139,10 @@ field_constant: (IDENTIFIER) @constant
   "continue"
 ] @keyword.repeat
 
-"usingnamespace" @keyword.import
+[
+  "usingnamespace"
+  "export"
+] @keyword.import
 
 [
   "try"
@@ -168,7 +171,6 @@ field_constant: (IDENTIFIER) @constant
 
 [
   "comptime"
-  "export"
   "extern"
   "inline"
   "noinline"

From 925490e34d6a4c6148a38bf1d331cd43dd55002a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 12 May 2024 14:33:12 -0700
Subject: [PATCH 1476/2704] feat(zig): misc improvements

---
 queries/zig/highlights.scm | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 521f97d20..b4d578a98 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -100,6 +100,8 @@ field_constant: (IDENTIFIER) @constant
   "test"
   "opaque"
   "error"
+  "const"
+  "var"
 ] @keyword
 
 [
@@ -155,27 +157,22 @@ field_constant: (IDENTIFIER) @constant
 ] @type.builtin
 
 [
-  "const"
-  "var"
   "volatile"
   "allowzero"
   "noalias"
-] @keyword.modifier
-
-[
   "addrspace"
   "align"
   "callconv"
   "linksection"
+  "pub"
+  "inline"
+  "noinline"
+  "extern"
 ] @keyword.modifier
 
 [
   "comptime"
-  "extern"
-  "inline"
-  "noinline"
   "packed"
-  "pub"
   "threadlocal"
 ] @attribute
 
@@ -206,6 +203,7 @@ field_constant: (IDENTIFIER) @constant
   "."
   ","
   ":"
+  "=>"
 ] @punctuation.delimiter
 
 [
@@ -220,10 +218,18 @@ field_constant: (IDENTIFIER) @constant
   ")"
   "{"
   "}"
-  (Payload
-    "|")
-  (PtrPayload
-    "|")
-  (PtrIndexPayload
-    "|")
 ] @punctuation.bracket
+
+(Payload
+  "|" @punctuation.bracket)
+
+(PtrPayload
+  "|" @punctuation.bracket)
+
+(PtrIndexPayload
+  "|" @punctuation.bracket)
+
+(ParamType
+  (ErrorUnionExpr
+    (SuffixExpr
+      variable_type_function: (IDENTIFIER) @type)))

From 6f54846f2b269c40091895277095dd10b365fca7 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Thu, 2 May 2024 11:43:02 -0500
Subject: [PATCH 1477/2704] feat(php): add highlights for
 scoped_property_access

---
 queries/php_only/highlights.scm          | 10 ++++++++++
 tests/query/highlights/php/variables.php |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 8047cc901..2b9e4ea95 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -249,6 +249,16 @@
   ]
   (name) @constant)
 
+(scoped_property_access_expression
+  scope: [
+    (name) @type
+    (qualified_name
+      (name) @type)
+  ])
+
+(scoped_property_access_expression
+  name: (variable_name) @variable.member)
+
 (trait_declaration
   name: (name) @type)
 
diff --git a/tests/query/highlights/php/variables.php b/tests/query/highlights/php/variables.php
index f6477e131..7d6c6241e 100644
--- a/tests/query/highlights/php/variables.php
+++ b/tests/query/highlights/php/variables.php
@@ -23,5 +23,8 @@ class A {
 //         ^^^ @variable.member
     $this->foo(a: 5);
 //             ^ @variable.parameter
+    A::$foo::$bar;
+//      ^^^ @variable.member
+//            ^^^ @variable.member
   }
 }

From 14cd8c5db1261ecbc46d090f3ccffe98844caa25 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 12 May 2024 18:07:34 -0700
Subject: [PATCH 1478/2704] feat(slint): highlight enum members as constants

---
 queries/slint/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm
index 8ab232c83..1b56b1c0d 100644
--- a/queries/slint/highlights.scm
+++ b/queries/slint/highlights.scm
@@ -47,6 +47,9 @@
 
 (user_type_identifier) @type
 
+(enum_block
+  (user_type_identifier) @constant)
+
 ; Functions and callbacks
 (argument) @variable.parameter
 

From cd626dc48e42b2677d501a740622cf4aed43863f Mon Sep 17 00:00:00 2001
From: Tomasz N <przepompownia@users.noreply.github.com>
Date: Tue, 14 May 2024 06:07:42 +0200
Subject: [PATCH 1479/2704] feat(php): indent after `default_statement`

---
 queries/php_only/indents.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/php_only/indents.scm b/queries/php_only/indents.scm
index 9ee04e770..ca619a320 100644
--- a/queries/php_only/indents.scm
+++ b/queries/php_only/indents.scm
@@ -12,6 +12,7 @@
   (switch_block)
   (match_block)
   (case_statement)
+  (default_statement)
 ] @indent.begin
 
 (return_statement

From 3aa2e2f3747ee11dc4460ad98b25e887c33bb610 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 12 May 2024 11:21:42 -0700
Subject: [PATCH 1480/2704] feat(diff): more comprehensive highlights

---
 lockfile.json               |  2 +-
 queries/diff/highlights.scm | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a27ebd5a7..c3f54ecb3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -111,7 +111,7 @@
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
   },
   "diff": {
-    "revision": "710e881127512bda8157096e26c1f3e91702823a"
+    "revision": "629676fc3919606964231b2c7b9677d6998a2cb4"
   },
   "disassembly": {
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
diff --git a/queries/diff/highlights.scm b/queries/diff/highlights.scm
index d8e600882..44506c056 100644
--- a/queries/diff/highlights.scm
+++ b/queries/diff/highlights.scm
@@ -12,4 +12,35 @@
 
 (location) @attribute
 
-(command) @function
+(command
+  "diff" @function
+  (argument) @variable.parameter)
+
+(filename) @string.special.path
+
+(mode) @number
+
+[
+  ".."
+  "+"
+  "++"
+  "+++"
+  "++++"
+  "-"
+  "--"
+  "---"
+  "----"
+] @punctuation.special
+
+[
+  (binary_change)
+  (similarity)
+  (file_change)
+] @label
+
+(index
+  "index" @keyword)
+
+(similarity
+  (score) @number
+  "%" @number)

From f224fef9d28e1fd30ccd9a9c374ced2546dde6ea Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 14 May 2024 06:38:12 +0000
Subject: [PATCH 1481/2704] bot(lockfile): update idl, php, php_only, wit

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c3f54ecb3..6b16d920f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "e885d7fd66c2549b7a28172400d645d27656f5cb"
+    "revision": "d1ee47cbe7fbe3c68a491e5e50236f009f618faa"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -498,10 +498,10 @@
     "revision": "d4ebabd45bcb053fcc7f6688b5c8ed80c7ae7a32"
   },
   "php": {
-    "revision": "d5aea05a70c5d021fa746516391f156d35658875"
+    "revision": "27afeb02e49ff30acd17b67897b1c0114561a38c"
   },
   "php_only": {
-    "revision": "d5aea05a70c5d021fa746516391f156d35658875"
+    "revision": "27afeb02e49ff30acd17b67897b1c0114561a38c"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -807,7 +807,7 @@
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
-    "revision": "3d6124cfe88555ecee1ba97d6d76c70d13af927a"
+    "revision": "cab94791450524a542324d8cbe8017d69c516d8e"
   },
   "xcompose": {
     "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"

From c26cfc75bc77b3538f4f288b013bc927a371bf2e Mon Sep 17 00:00:00 2001
From: Hilmar Wiegand <me@hwgnd.de>
Date: Mon, 13 May 2024 10:47:04 +0200
Subject: [PATCH 1482/2704] feat(typespec): add support for typespec

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/typespec/highlights.scm | 135 ++++++++++++++++++++++++++++++++
 queries/typespec/indents.scm    |  18 +++++
 queries/typespec/injections.scm |   5 ++
 6 files changed, 170 insertions(+)
 create mode 100644 queries/typespec/highlights.scm
 create mode 100644 queries/typespec/indents.scm
 create mode 100644 queries/typespec/injections.scm

diff --git a/README.md b/README.md
index e04e700d3..955d6628c 100644
--- a/README.md
+++ b/README.md
@@ -424,6 +424,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [turtle](https://github.com/BonaBeavis/tree-sitter-turtle) (maintained by @BonaBeavis)
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
+- [x] [typespec](https://github.com/happenslol/tree-sitter-typespec) (maintained by @happenslol)
 - [x] [typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) (maintained by @Teddytrombone)
 - [x] [typst](https://github.com/uben0/tree-sitter-typst) (maintained by @uben0, @RaafatTurki)
 - [x] [udev](https://github.com/ObserverOfTime/tree-sitter-udev) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index 6b16d920f..5da794a4a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -752,6 +752,9 @@
   "typescript": {
     "revision": "7b4275d077ae196fc0ce42ab3ad091574e3ec519"
   },
+  "typespec": {
+    "revision": "fd9a83c6c0aaaff4b1354454b5b9f130f59dd553"
+  },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 031b2658e..a3351d176 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2181,6 +2181,14 @@ list.typescript = {
   maintainers = { "@steelsojka" },
 }
 
+list.typespec = {
+  install_info = {
+    url = "https://github.com/happenslol/tree-sitter-typespec",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@happenslol" },
+}
+
 list.typoscript = {
   install_info = {
     url = "https://github.com/Teddytrombone/tree-sitter-typoscript",
diff --git a/queries/typespec/highlights.scm b/queries/typespec/highlights.scm
new file mode 100644
index 000000000..68c67c0d1
--- /dev/null
+++ b/queries/typespec/highlights.scm
@@ -0,0 +1,135 @@
+(identifier_or_member_expression) @type
+
+[
+  "is"
+  "extends"
+  "valueof"
+] @keyword.operator
+
+[
+  "namespace"
+  "model"
+  "scalar"
+  "interface"
+  "enum"
+  "union"
+  "alias"
+] @keyword.type
+
+[
+  "op"
+  "fn"
+  "dec"
+] @keyword.function
+
+"extern" @keyword.modifier
+
+[
+  "import"
+  "using"
+] @keyword.import
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "<"
+  ">"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ","
+  ";"
+  "."
+  ":"
+] @punctuation.delimiter
+
+[
+  "|"
+  "&"
+  "="
+  "..."
+] @operator
+
+"?" @punctuation.special
+
+[
+  (single_line_comment)
+  (multi_line_comment)
+] @comment @spell
+
+[
+  (quoted_string_literal)
+  (triple_quoted_string_literal)
+] @string
+
+(boolean_literal) @boolean
+
+[
+  (decimal_literal)
+  (hex_integer_literal)
+  (binary_integer_literal)
+] @number
+
+(escape_sequence) @string.escape
+
+(builtin_type) @type.builtin
+
+(decorator
+  "@" @attribute
+  name: (identifier_or_member_expression) @attribute)
+
+(augment_decorator_statement
+  name: (identifier_or_member_expression) @attribute)
+
+(using_statement
+  module: (identifier_or_member_expression) @module)
+
+(namespace_statement
+  name: (identifier_or_member_expression) @module)
+
+(model_statement
+  name: (identifier) @type)
+
+(model_property
+  name: (identifier) @variable.member)
+
+(union_statement
+  name: (identifier) @type)
+
+(union_variant
+  name: (identifier) @variable.member)
+
+(scalar_statement
+  name: (identifier) @type)
+
+(interface_statement
+  name: (identifier) @type)
+
+(enum_statement
+  name: (identifier) @type)
+
+(enum_member
+  name: (identifier) @constant)
+
+(operation_statement
+  name: (identifier) @function)
+
+(template_parameter
+  name: (identifier) @type)
+
+(alias_statement
+  name: (identifier) @type)
+
+(decorator_declaration_statement
+  name: (identifier) @attribute)
+
+(function_parameter
+  name: (identifier) @variable.parameter)
+
+(operation_arguments
+  (model_property
+    name: (identifier) @variable.parameter))
diff --git a/queries/typespec/indents.scm b/queries/typespec/indents.scm
new file mode 100644
index 000000000..aee01f35a
--- /dev/null
+++ b/queries/typespec/indents.scm
@@ -0,0 +1,18 @@
+[
+  (model_expression)
+  (tuple_expression)
+  (namespace_body)
+  (interface_body)
+  (union_body)
+  (enum_body)
+  (template_arguments)
+  (template_parameters)
+  (operation_arguments)
+] @indent.begin
+
+[
+  "}"
+  ")"
+  ">"
+  "]"
+] @indent.end
diff --git a/queries/typespec/injections.scm b/queries/typespec/injections.scm
new file mode 100644
index 000000000..81d7734cb
--- /dev/null
+++ b/queries/typespec/injections.scm
@@ -0,0 +1,5 @@
+([
+  (single_line_comment)
+  (multi_line_comment)
+] @injection.content
+  (#set! injection.language "comment"))

From aa0c7dd29631ee8c2df738d99bd33b762b3a6e22 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 06:38:00 +0000
Subject: [PATCH 1483/2704] bot(lockfile): update idl, sourcepawn

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5da794a4a..8834914d5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "d1ee47cbe7fbe3c68a491e5e50236f009f618faa"
+    "revision": "385a75b737fb3bd0c33e59d779021adfe644de2d"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -654,7 +654,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "6a67772eed866cd6d247cc478a28c6a9272fc0ef"
+    "revision": "4c62065c4136873ef42a9efe128380cbe7ae4f64"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"

From 8012b55eee65eba1d1ee4df0a186d30e72dcbe65 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 16 May 2024 06:34:41 +0000
Subject: [PATCH 1484/2704] bot(lockfile): update clojure, earthfile, erlang,
 idl, tlaplus, tsx, typescript

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8834914d5..c5d83000b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -63,7 +63,7 @@
     "revision": "a461f20dedb43905febb12c1635bc7d2e43e96f0"
   },
   "clojure": {
-    "revision": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9"
+    "revision": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e"
   },
   "cmake": {
     "revision": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"
@@ -132,7 +132,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "3ded1cba9eab14b07377b700b1132d259480abae"
+    "revision": "cc99a3f5e4281b63fdd63dca4750e808fd52628f"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -159,7 +159,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "20ce5a9234c7248b3f91c5b0b028f1760b954dde"
+    "revision": "868306b033f5163658e8777940da68d61afad5cb"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "385a75b737fb3bd0c33e59d779021adfe644de2d"
+    "revision": "006a5266d771cab57da58a6ade483ebd3075638d"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -726,7 +726,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "08d915655d360bb0b7592d38a533dcc17dcb8dfb"
+    "revision": "ef18145e7f985f592ad41b04004b24a590f58b71"
   },
   "tmux": {
     "revision": "9138ea508410e0f34da2666609f600f65e944f22"
@@ -741,7 +741,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "7b4275d077ae196fc0ce42ab3ad091574e3ec519"
+    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -750,7 +750,7 @@
     "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
   },
   "typescript": {
-    "revision": "7b4275d077ae196fc0ce42ab3ad091574e3ec519"
+    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
   },
   "typespec": {
     "revision": "fd9a83c6c0aaaff4b1354454b5b9f130f59dd553"

From 4d9fb7d8b0621db203959e8bc7ecc68afdf5f3d9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 May 2024 08:50:23 +0200
Subject: [PATCH 1485/2704] ci: Nvim 0.10 macos artifact name

---
 scripts/ci-install.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
index 4f4265465..4677bb92e 100755
--- a/scripts/ci-install.sh
+++ b/scripts/ci-install.sh
@@ -11,9 +11,10 @@ if [[ $os == Linux ]]; then
   mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
   ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
 elif [[ $os == Darwin ]]; then
-  curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-macos.tar.gz | tar -xz
-  sudo ln -s "$PWD"/nvim-macos/bin/nvim /usr/local/bin
-  rm -rf "$PWD"/nvim-macos/lib/nvim/parser
+  RELEASE_NAME="nvim-macos-$(uname -m)"
+  curl -L "https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/$RELEASE_NAME.tar.gz" | tar -xz
+  sudo ln -s "$PWD/$RELEASE_NAME/bin/nvim" /usr/local/bin
+  rm -rf "$PWD/$RELEASE_NAME/lib/nvim/parser"
   mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
   ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
 else

From 4b8ea9fea6b739986665aa72c238e4e0a968ea9a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 06:37:50 +0000
Subject: [PATCH 1486/2704] bot(lockfile): update earthfile, erlang,
 janet_simple

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c5d83000b..8aabb1b1d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "cc99a3f5e4281b63fdd63dca4750e808fd52628f"
+    "revision": "450546b6db9a37a178fd87aeda93a287301e9570"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -159,7 +159,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "868306b033f5163658e8777940da68d61afad5cb"
+    "revision": "b2ab8f2ef8f4a8aba3e44f7007d1793a9ee5bb70"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -327,7 +327,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "51271e260346878e1a1aa6c506ce6a797b7c25e2"
+    "revision": "25d0687433ed0ed8e320861c2c625711ce1716f9"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"

From 19ac9e8b5c1e5eedd2ae7957243e25b32e269ea7 Mon Sep 17 00:00:00 2001
From: milanglacier <dev@milanglacier.com>
Date: Fri, 17 May 2024 04:34:52 -0400
Subject: [PATCH 1487/2704] fix(injection): lower-case language name for
 markdown strings

---
 lua/nvim-treesitter/query_predicates.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index d4726107c..61400e478 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -171,7 +171,7 @@ query.add_directive("set-lang-from-info-string!", function(match, _, bufnr, pred
   if not node then
     return
   end
-  local injection_alias = vim.treesitter.get_node_text(node, bufnr)
+  local injection_alias = vim.treesitter.get_node_text(node, bufnr):lower()
   metadata["injection.language"] = get_parser_from_markdown_info_string(injection_alias)
 end, true)
 

From 3d268f9db4e3b1bf8ba1de792407fe89ed1274db Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 May 2024 09:39:19 +0200
Subject: [PATCH 1488/2704] fix: adapt to Nvim 0.11 deprecations

---
 lua/nvim-treesitter/compat.lua                  | 12 ++++++++++++
 lua/nvim-treesitter/install.lua                 |  9 +++++----
 lua/nvim-treesitter/shell_command_selectors.lua |  2 +-
 lua/nvim-treesitter/utils.lua                   |  2 +-
 tests/indent/common.lua                         |  2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
index c56e12b18..a683502ff 100644
--- a/lua/nvim-treesitter/compat.lua
+++ b/lua/nvim-treesitter/compat.lua
@@ -24,4 +24,16 @@ function M.get_node_text(node, bufnr)
   return (ts.get_node_text or tsq.get_node_text)(node, bufnr)
 end
 
+function M.require_language(lang, opts)
+  return (ts.language.add or ts.language.require_language)(lang, opts)
+end
+
+function M.flatten(t)
+  if vim.fn.has "nvim-0.10" then
+    return vim.iter(t):flatten():totable()
+  else
+    return vim.tbl_flatten(t)
+  end
+end
+
 return M
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c2d961fb8..ec7d6245b 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -7,6 +7,7 @@ local parsers = require "nvim-treesitter.parsers"
 local info = require "nvim-treesitter.info"
 local configs = require "nvim-treesitter.configs"
 local shell = require "nvim-treesitter.shell_command_selectors"
+local compat = require "nvim-treesitter.compat"
 
 local M = {}
 
@@ -59,7 +60,7 @@ local function reattach_if_possible_fn(lang, error_on_fail)
           local ft = vim.bo[buf].filetype
           ok, err = pcall(vim.treesitter.language.add, lang, { filetype = ft })
         else
-          ok, err = pcall(vim.treesitter.language.require_language, lang)
+          ok, err = pcall(compat.require_language, lang)
         end
         if not ok and error_on_fail then
           vim.notify("Could not load parser for " .. lang .. ": " .. vim.inspect(err))
@@ -535,7 +536,7 @@ local function install(options)
       languages = parsers.available_parsers()
       ask = false
     else
-      languages = vim.tbl_flatten { ... }
+      languages = compat.flatten { ... }
       ask = ask_reinstall
     end
 
@@ -573,7 +574,7 @@ function M.update(options)
     reset_progress_counter()
     if ... and ... ~= "all" then
       ---@type string[]
-      local languages = vim.tbl_flatten { ... }
+      local languages = compat.flatten { ... }
       local installed = 0
       for _, lang in ipairs(languages) do
         if (not is_installed(lang)) or (needs_update(lang)) then
@@ -616,7 +617,7 @@ function M.uninstall(...)
     ensure_installed_parsers = utils.difference(ensure_installed_parsers, configs.get_ignored_parser_installs())
 
     ---@type string[]
-    local languages = vim.tbl_flatten { ... }
+    local languages = compat.flatten { ... }
     for _, lang in ipairs(languages) do
       local install_dir, err = configs.get_parser_install_dir()
       if err then
diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 96ad6acc4..f1d557a74 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -152,7 +152,7 @@ function M.select_compile_command(repo, cc, compile_location)
       info = "Compiling...",
       err = "Error during compilation",
       opts = {
-        args = vim.tbl_flatten(M.select_compiler_args(repo, cc)),
+        args = require("nvim-treesitter.compat").flatten(M.select_compiler_args(repo, cc)),
         cwd = compile_location,
       },
     }
diff --git a/lua/nvim-treesitter/utils.lua b/lua/nvim-treesitter/utils.lua
index 4aa8e5984..d920f4a61 100644
--- a/lua/nvim-treesitter/utils.lua
+++ b/lua/nvim-treesitter/utils.lua
@@ -83,7 +83,7 @@ function M.setup_commands(mod, commands)
     local f_args = def.f_args or "<f-args>"
     local call_fn =
       string.format("lua require'nvim-treesitter.%s'.commands.%s['run<bang>'](%s)", mod, command_name, f_args)
-    local parts = vim.tbl_flatten {
+    local parts = require("nvim-treesitter.compat").flatten {
       "command!",
       "-bar",
       def.args,
diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index 1ddd91a40..6cfedafff 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -180,7 +180,7 @@ function Runner:whole_file(dirs, opts)
     assert.is.same(1, vim.fn.isdirectory(dir.filename))
     return dir.filename
   end, dirs)
-  local files = vim.tbl_flatten(vim.tbl_map(scan_dir, dirs))
+  local files = require("nvim-treesitter.compat").flatten(vim.tbl_map(scan_dir, dirs))
   for _, file in ipairs(files) do
     local relpath = Path:new(file):make_relative(self.base_dir.filename)
     self.it(relpath, function()

From 7b6aefa69a498c72ac30a61cdf5b9ce2f3f697c5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 May 2024 17:59:40 +0200
Subject: [PATCH 1489/2704] fixup: adapt to Nvim 0.11 deprecations

---
 lua/nvim-treesitter/compat.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
index a683502ff..d4526c505 100644
--- a/lua/nvim-treesitter/compat.lua
+++ b/lua/nvim-treesitter/compat.lua
@@ -29,7 +29,7 @@ function M.require_language(lang, opts)
 end
 
 function M.flatten(t)
-  if vim.fn.has "nvim-0.10" then
+  if vim.fn.has "nvim-0.10" == 1 then
     return vim.iter(t):flatten():totable()
   else
     return vim.tbl_flatten(t)

From 00a8cfd562dc805eb4d732fbca35e23640dbf7c8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 May 2024 19:52:02 +0200
Subject: [PATCH 1490/2704] fixup: adapt to Nvim 0.11 deprecations

---
 lua/nvim-treesitter/compat.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
index d4526c505..0ad010030 100644
--- a/lua/nvim-treesitter/compat.lua
+++ b/lua/nvim-treesitter/compat.lua
@@ -29,7 +29,7 @@ function M.require_language(lang, opts)
 end
 
 function M.flatten(t)
-  if vim.fn.has "nvim-0.10" == 1 then
+  if vim.fn.has "nvim-0.11" == 1 then
     return vim.iter(t):flatten():totable()
   else
     return vim.tbl_flatten(t)

From 1eabe69bfa8f78e14fcf5d42a2b3881babaca30a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 18 May 2024 06:35:38 +0000
Subject: [PATCH 1491/2704] bot(lockfile): update earthfile, gotmpl, helm,
 hlsl, slang, sourcepawn, tlaplus

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8aabb1b1d..b03f1f121 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "450546b6db9a37a178fd87aeda93a287301e9570"
+    "revision": "875d81149e3130f843503f157b3f41732e29ce0b"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -246,7 +246,7 @@
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gotmpl": {
-    "revision": "17144a77be0acdecebd9d557398883569fed41de"
+    "revision": "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -282,13 +282,13 @@
     "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
   },
   "helm": {
-    "revision": "17144a77be0acdecebd9d557398883569fed41de"
+    "revision": "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "feea0ff6eccda8be958c133985dca8977db3d887"
+    "revision": "a84e8d4f675d0006f7c07f6c7bcea2fca04cdb6e"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -630,7 +630,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "68587530d86aaeb1f1cb17fdada795281cdd0556"
+    "revision": "35684819cec627bc32955600ee9a093ed29c3375"
   },
   "slint": {
     "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
@@ -654,7 +654,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "4c62065c4136873ef42a9efe128380cbe7ae4f64"
+    "revision": "227656e72a5f0d430bb82a467bc8078f078bba84"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -726,7 +726,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "ef18145e7f985f592ad41b04004b24a590f58b71"
+    "revision": "200f9dab6b23f3b9bb8f67fc811221517f56c373"
   },
   "tmux": {
     "revision": "9138ea508410e0f34da2666609f600f65e944f22"

From ccfa76d4cb53224cb0ecefb12f79ecdbbf1fd62d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 19 May 2024 06:36:18 +0000
Subject: [PATCH 1492/2704] bot(lockfile): update php, php_only, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b03f1f121..8a547b831 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -498,10 +498,10 @@
     "revision": "d4ebabd45bcb053fcc7f6688b5c8ed80c7ae7a32"
   },
   "php": {
-    "revision": "27afeb02e49ff30acd17b67897b1c0114561a38c"
+    "revision": "b38c53537769df05871643c9688c264074fb6076"
   },
   "php_only": {
-    "revision": "27afeb02e49ff30acd17b67897b1c0114561a38c"
+    "revision": "b38c53537769df05871643c9688c264074fb6076"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -687,7 +687,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "c9c669b4513479e07a0ff44cf14f72351959ac21"
+    "revision": "03af4d057afc56edf6a703e6606b86f782353f22"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From d184407e33084f4a57302bc1adf991997ccdd1da Mon Sep 17 00:00:00 2001
From: DragonBillow <42114817+cathaysia@users.noreply.github.com>
Date: Mon, 20 May 2024 10:47:12 +0800
Subject: [PATCH 1493/2704] feat(queries): update idl hightlight (#6625)

Signed-off-by: DragonBillow <DragonBillow@outlook.com>
---
 queries/idl/highlights.scm | 144 ++++++++++++++++++++++++++++++++++---
 1 file changed, 134 insertions(+), 10 deletions(-)

diff --git a/queries/idl/highlights.scm b/queries/idl/highlights.scm
index 47ea00c25..54b38fc08 100644
--- a/queries/idl/highlights.scm
+++ b/queries/idl/highlights.scm
@@ -8,19 +8,45 @@
   "bitmask"
   "bitset"
   "@annotation"
-  "interface"
   "exception"
   "typedef"
+  "home"
+  "typeid"
+  "typeprefix"
+  (interface_kind)
+  (value_kind)
+  "component"
+  "porttype"
+  "connector"
+  "eventtype"
+  "valuetype"
 ] @keyword.type
 
+(import_dcl
+  "import" @keyword.directive)
+
 [
   "module"
   "attribute"
+  "factory"
+  "manages"
 ] @keyword
 
 [
   "const"
   "readonly"
+  "abstract"
+  "custom"
+  "supports"
+  "provides"
+  "uses"
+  "port"
+  "mirrorport"
+  "emits"
+  "publishes"
+  "consumes"
+  "primarykey"
+  "finder"
 ] @keyword.modifier
 
 [
@@ -44,14 +70,17 @@
   (unsigned_longlong_int)
   (floating_pt_type)
   (char_type)
-  (scoped_name)
   (string_type)
   (any_type)
   (fixed_pt_type)
   (sequence_type)
   (map_type)
+  (object_type)
+  (value_base_type)
 ] @type.builtin
 
+(scoped_name) @type
+
 (boolean_literal) @boolean
 
 (number_literal) @number
@@ -95,7 +124,8 @@
 (readonly_attr_declarator
   (simple_declarator) @variable.member)
 
-(attr_declarator) @variable.member
+(attr_declarator
+  (simple_declarator) @variable.member)
 
 (annotation_appl
   "@" @attribute
@@ -176,7 +206,7 @@
     "bitfield" @keyword.modifier
     (positive_int_const) @number
     (destination_type)* @type)
-  (identifier) @variable.parameter)
+  (identifier) @variable.member)
 
 (bit_value) @constant
 
@@ -195,11 +225,105 @@
   (scoped_name
     (identifier) @type))
 
-(simple_declarator
-  (identifier) @attribute)
-
-(array_declarator
-  (identifier) @attribute)
-
 (annotation_appl_param
   (identifier) @attribute)
+
+(home_header
+  (identifier) @type)
+
+(factory_dcl
+  (identifier) @type)
+
+(factory_param_dcl
+  "in" @keyword.modifier)
+
+(op_oneway_dcl
+  "oneway" @keyword.modifier
+  (identifier) @function.method)
+
+(in_param_dcl
+  "in" @keyword.modifier)
+
+(context_expr
+  "context" @keyword.modifier)
+
+(get_excep_expr
+  "getraises" @keyword.exception)
+
+(set_excep_expr
+  "setraises" @keyword.exception)
+
+(value_header
+  (identifier) @type)
+
+(value_abs_def
+  (identifier) @type)
+
+(value_forward_dcl
+  (identifier) @type)
+
+(value_box_def
+  (identifier) @type)
+
+(provides_dcl
+  (interface_type) @type
+  (identifier) @variable.member)
+
+(uses_dcl
+  (identifier) @variable.member)
+
+(component_forward_dcl
+  (identifier) @type)
+
+(component_header
+  (identifier) @type)
+
+(porttype_forward_dcl
+  (identifier) @type)
+
+(porttype_def
+  (identifier) @type)
+
+(port_dcl
+  (identifier) @variable.member)
+
+(connector_header
+  (identifier) @type)
+
+(emits_dcl
+  (identifier) @variable.member)
+
+(publishes_dcl
+  (identifier) @variable.member)
+
+(consumes_dcl
+  (identifier) @variable.member)
+
+(event_forward_dcl
+  (identifier) @type)
+
+(event_header
+  (identifier) @type)
+
+(event_abs_def
+  (identifier) @type)
+
+(template_module_dcl
+  (identifier) @type)
+
+(formal_parameter
+  (formal_parameter_type) @type
+  (identifier) @variable.member)
+
+(init_param_dcl
+  "in" @keyword.modifier
+  (simple_declarator) @variable.parameter)
+
+(finder_dcl
+  (identifier) @function.method)
+
+(member
+  identifier: (declarators) @variable.member)
+
+(factory_param_dcl
+  (simple_declarator) @variable.parameter)

From 7c9c5bed8340031f8a6dad47a58a26eaf15b9a56 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 20 May 2024 06:38:04 +0000
Subject: [PATCH 1494/2704] bot(lockfile): update javascript, liquidsoap, odin

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8a547b831..8fa60cd09 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -333,7 +333,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "e88537c2703546f3f0887dd3f16898e1749cdba5"
+    "revision": "ce29c27450810249dde98ca9d0d95b6ae25fe154"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -393,7 +393,7 @@
     "revision": "293369818da219d97327908aab33707b04b63fd9"
   },
   "liquidsoap": {
-    "revision": "a9b8012366eab7d0c28bbda5f75a847be931008f"
+    "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
   },
   "llvm": {
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
@@ -480,7 +480,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "f25b8c5201c1480dc0c8c4155a059a79a5a40719"
+    "revision": "edfc92802b0df40c1dcf7f6e624714c21121ac44"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"

From 73fb37ed77b18ac357ca8e6e35835a8db6602332 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 06:39:22 +0000
Subject: [PATCH 1495/2704] bot(lockfile): update earthfile, idl, inko,
 janet_simple, luau, odin, perl, requirements

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8fa60cd09..58b97ad46 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "875d81149e3130f843503f157b3f41732e29ce0b"
+    "revision": "b556c9f4cf1c6a4a8ebbca47e520653801fcf535"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -315,19 +315,19 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "006a5266d771cab57da58a6ade483ebd3075638d"
+    "revision": "32eade147a3714c768049ba0ddabd3f3ecbe5e99"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
   },
   "inko": {
-    "revision": "4cef9aa4980606311b906b2f2b8c6cf791c60396"
+    "revision": "7860637ce1b43f5f79cfb7cc3311bf3234e9479f"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "25d0687433ed0ed8e320861c2c625711ce1716f9"
+    "revision": "f3d6e09cc47e76833f23f83b2c59ea0878660953"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -408,7 +408,7 @@
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
   },
   "luau": {
-    "revision": "5b088fac748f2666a315cafd1638a214388eb23e"
+    "revision": "09df1696adefcee8a4422dea85990a56e668547e"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -480,7 +480,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "edfc92802b0df40c1dcf7f6e624714c21121ac44"
+    "revision": "d37b8f24f653378b268ec18404e9c14ad355b128"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
@@ -495,7 +495,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "d4ebabd45bcb053fcc7f6688b5c8ed80c7ae7a32"
+    "revision": "b5b65720fa1a8640ea36602a0ac8287284fb4e42"
   },
   "php": {
     "revision": "b38c53537769df05871643c9688c264074fb6076"
@@ -594,7 +594,7 @@
     "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
   },
   "requirements": {
-    "revision": "8666a4dfeb3107144398158bc3dd7a3f59d89ccb"
+    "revision": "360c6a6b31076a482663806f7a8241de9cad6b4e"
   },
   "rnoweb": {
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"

From 7add411eba7a9345c1a4c9a5bafdb10979f140f7 Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Tue, 21 May 2024 19:03:22 -0700
Subject: [PATCH 1496/2704] feat(bash): Highlight declaration and unset command
 parameters (#6634)

---
 queries/bash/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 7ad3478e4..0e192bbcd 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -182,6 +182,12 @@
       (word) @variable.parameter)
   ])
 
+(declaration_command
+  (word) @variable.parameter)
+
+(unset_command
+  (word) @variable.parameter)
+
 (number) @number
 
 ((word) @number

From 14db0433e145c8ea63efc42ddbdf517d6036d372 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 21 May 2024 22:39:04 -0400
Subject: [PATCH 1497/2704] feat(luau): update queries from upstream

---
 queries/luau/highlights.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index 23780731c..dcb866c51 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -133,12 +133,10 @@
 (identifier) @variable
 
 ; Types
-(type
-  (identifier) @type)
+(type/identifier) @type
 
-(type
-  (generic_type
-    (identifier) @type))
+(generic_type
+  (identifier) @type)
 
 (builtin_type) @type.builtin
 
@@ -163,6 +161,8 @@
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "self"))
 
+"..." @variable.builtin
+
 ((identifier) @module.builtin
   (#any-of? @module.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
 

From 30de5e7e9486fb1b1b8c2a1e71052b13f94f1cb0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 22 May 2024 06:37:41 +0000
Subject: [PATCH 1498/2704] bot(lockfile): update idl, rasi, ruby, templ

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 58b97ad46..d9bfb03c8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "32eade147a3714c768049ba0ddabd3f3ecbe5e99"
+    "revision": "b5b53e2ca0521b98277d5e4b109f0b0e362e850e"
   },
   "ini": {
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
@@ -576,7 +576,7 @@
     "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
   },
   "rasi": {
-    "revision": "43196d934a9a6ab3c7093a8683efd0111bb03db1"
+    "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
   "rbs": {
     "revision": "e5e807a50fcd104a2d740d354632fc671700a0bf"
@@ -612,7 +612,7 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "788a63ca1b7619288980aaafd37d890ee2469421"
+    "revision": "b41dc0f4c8e040905fcbb5d93bab667541c08ec7"
   },
   "rust": {
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
@@ -711,7 +711,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "d631f60287c0904770bc41aa865e249594b52422"
+    "revision": "33d261ad46bd66f5f1fa12d41d0c78e55e97e48b"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"

From 3e454836ce8350d1f7b780a1a34e5cbfc9ecf715 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 23 May 2024 06:38:46 +0000
Subject: [PATCH 1499/2704] bot(lockfile): update ada, clojure, mlir, templ

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d9bfb03c8..b153620bf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "ba0894efa03beb70780156b91e28c716b7a4764d"
+    "revision": "5417b9ffc790d2b2aff61db5113d6d89b0d17a25"
   },
   "agda": {
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
@@ -63,7 +63,7 @@
     "revision": "a461f20dedb43905febb12c1635bc7d2e43e96f0"
   },
   "clojure": {
-    "revision": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e"
+    "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
     "revision": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"
@@ -435,7 +435,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "a708e9b3f3d7f2fc85ac3fd1d4317c51b101eab0"
+    "revision": "c31894561aa7f747ef84a8fb4f6e37689b086f85"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -711,7 +711,7 @@
     "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
   },
   "templ": {
-    "revision": "33d261ad46bd66f5f1fa12d41d0c78e55e97e48b"
+    "revision": "cf84ea53e2e2531f23009d676ac206090c1e2392"
   },
   "terraform": {
     "revision": "e936d3fef8bac884661472dce71ad82284761eb1"

From 298a9dd4f8a0d95b347a7ebd301849d8b0e3917e Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 23 May 2024 17:30:26 +0200
Subject: [PATCH 1500/2704] feat(bp): add support for Android Blueprint (#6626)

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/bp/folds.scm            |  6 ++++
 queries/bp/highlights.scm       | 55 +++++++++++++++++++++++++++++++++
 queries/bp/indents.scm          | 38 +++++++++++++++++++++++
 queries/bp/injections.scm       |  2 ++
 queries/bp/locals.scm           | 12 +++++++
 8 files changed, 125 insertions(+)
 create mode 100644 queries/bp/folds.scm
 create mode 100644 queries/bp/highlights.scm
 create mode 100644 queries/bp/indents.scm
 create mode 100644 queries/bp/injections.scm
 create mode 100644 queries/bp/locals.scm

diff --git a/README.md b/README.md
index 955d6628c..6887b6f71 100644
--- a/README.md
+++ b/README.md
@@ -189,6 +189,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
 - [x] [bitbake](https://github.com/amaanq/tree-sitter-bitbake) (maintained by @amaanq)
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
+- [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
 - [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index b153620bf..5f443bf8d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -47,6 +47,9 @@
   "blueprint": {
     "revision": "60ba73739c6083c693d86a1a7cf039c07eb4ed59"
   },
+  "bp": {
+    "revision": "2326d709fb9cf73cf124fdbc803c267f851721a4"
+  },
   "c": {
     "revision": "82fb86aa544843bd17a9f0f3dc16edf645a34349"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a3351d176..d2abb9d53 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -210,6 +210,14 @@ list.blueprint = {
   experimental = true,
 }
 
+list.bp = {
+  install_info = {
+    url = "https://github.com/ambroisie/tree-sitter-bp",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ambroisie" },
+}
+
 list.c = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-c",
diff --git a/queries/bp/folds.scm b/queries/bp/folds.scm
new file mode 100644
index 000000000..c40ea3df4
--- /dev/null
+++ b/queries/bp/folds.scm
@@ -0,0 +1,6 @@
+[
+  (list_expression)
+  (map_expression)
+  (module)
+  (select_expression)
+] @fold
diff --git a/queries/bp/highlights.scm b/queries/bp/highlights.scm
new file mode 100644
index 000000000..d18e6eea0
--- /dev/null
+++ b/queries/bp/highlights.scm
@@ -0,0 +1,55 @@
+(comment) @comment @spell
+
+(operator) @operator
+
+(integer_literal
+  "-" @operator)
+
+[
+  ","
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(boolean_literal) @boolean
+
+(integer_literal) @number
+
+[
+  (raw_string_literal)
+  (interpreted_string_literal)
+] @string
+
+(escape_sequence) @string.escape
+
+(identifier) @variable
+
+(module
+  type: (identifier) @function.call)
+
+(module
+  (property
+    field: (identifier) @variable.parameter))
+
+[
+  (unset)
+  (default)
+] @variable.builtin
+
+(condition
+  name: (identifier) @function.builtin)
+
+(map_expression
+  (property
+    field: (identifier) @property))
+
+(select_expression
+  "select" @keyword.conditional)
diff --git a/queries/bp/indents.scm b/queries/bp/indents.scm
new file mode 100644
index 000000000..8cf8adc83
--- /dev/null
+++ b/queries/bp/indents.scm
@@ -0,0 +1,38 @@
+(list_expression) @indent.begin
+
+(list_expression
+  "]" @indent.branch)
+
+(map_expression) @indent.begin
+
+(map_expression
+  "}" @indent.branch)
+
+(select_expression) @indent.begin
+
+(select_expression
+  ")" @indent.branch)
+
+(select_value) @indent.begin
+
+(select_value
+  ")" @indent.branch)
+
+(select_pattern
+  "(" @indent.begin)
+
+(select_pattern
+  ")" @indent.branch)
+
+(select_cases) @indent.begin
+
+(select_cases
+  "}" @indent.branch)
+
+(module) @indent.begin
+
+(module
+  ")" @indent.branch)
+
+(module
+  "}" @indent.branch)
diff --git a/queries/bp/injections.scm b/queries/bp/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/bp/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/bp/locals.scm b/queries/bp/locals.scm
new file mode 100644
index 000000000..66b444fc6
--- /dev/null
+++ b/queries/bp/locals.scm
@@ -0,0 +1,12 @@
+(module
+  (property
+    field: (identifier) @local.definition.parameter))
+
+(map_expression
+  (property
+    field: (identifier) @local.definition.field))
+
+(assignment
+  left: (identifier) @local.definition.var)
+
+(identifier) @local.reference

From 6d56c5f404d3b116bab167bc03993cfb0a83f8aa Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 06:38:01 +0000
Subject: [PATCH 1501/2704] bot(lockfile): update ada, erlang, glsl, mlir,
 ruby, slang, wgsl_bevy

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5f443bf8d..94540f22f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -1,6 +1,6 @@
 {
   "ada": {
-    "revision": "5417b9ffc790d2b2aff61db5113d6d89b0d17a25"
+    "revision": "e8e2515465cc2d7c444498e68bdb9f1d86767f95"
   },
   "agda": {
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
@@ -162,7 +162,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "b2ab8f2ef8f4a8aba3e44f7007d1793a9ee5bb70"
+    "revision": "98ea1f9c957b2ad520415eecb5a5b406e931101e"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -228,7 +228,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "8c9fb41836dc202bbbcf0e2369f256055786dedb"
+    "revision": "33a16b6ff4d7206a16f2dc96c40e149c657db65f"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -438,7 +438,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "c31894561aa7f747ef84a8fb4f6e37689b086f85"
+    "revision": "640c1ed624364dbdd3e4e2b36c9efe7075c44f64"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -615,7 +615,7 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "b41dc0f4c8e040905fcbb5d93bab667541c08ec7"
+    "revision": "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b"
   },
   "rust": {
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
@@ -633,7 +633,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "35684819cec627bc32955600ee9a093ed29c3375"
+    "revision": "989bfe5ae69e7bad13454b8f52e4ab0c343d8ded"
   },
   "slint": {
     "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
@@ -807,7 +807,7 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "59d5fbd562c0e17c45312f49485098cce467f5ac"
+    "revision": "1e12c7925c41bb09818d86e30cd78644fde7d31a"
   },
   "wing": {
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"

From 78e11ab7cedabe5dfb3b600c6682712271c59acf Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 06:38:42 +0000
Subject: [PATCH 1502/2704] bot(lockfile): update earthfile, javascript, luau,
 mlir, perl, query, starlark

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 94540f22f..894fb999a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "b556c9f4cf1c6a4a8ebbca47e520653801fcf535"
+    "revision": "91fc9434283aec06139e37fc007ad00922f278b4"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -336,7 +336,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "ce29c27450810249dde98ca9d0d95b6ae25fe154"
+    "revision": "a5de24dc7939cb07a758f8d89c089cfdb6f479aa"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -411,7 +411,7 @@
     "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
   },
   "luau": {
-    "revision": "09df1696adefcee8a4422dea85990a56e668547e"
+    "revision": "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -438,7 +438,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "640c1ed624364dbdd3e4e2b36c9efe7075c44f64"
+    "revision": "00c32d8562dc957b187da110a3443307962b8da8"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -498,7 +498,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "b5b65720fa1a8640ea36602a0ac8287284fb4e42"
+    "revision": "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"
   },
   "php": {
     "revision": "b38c53537769df05871643c9688c264074fb6076"
@@ -570,7 +570,7 @@
     "revision": "2c57cac27e207425f8df15327884434cb12365a3"
   },
   "query": {
-    "revision": "d25e8d183f319497b8b22a2a1585975b020da722"
+    "revision": "a12c4a1cd8aa6e0340ecb7089a05cd345a12bae3"
   },
   "r": {
     "revision": "391400572538ff9854341a175ed8ab4b1e45f44b"
@@ -672,7 +672,7 @@
     "revision": "77450e8bce8853921512348f83c73c168c71fdfb"
   },
   "starlark": {
-    "revision": "b31a616aac5d05f927f3f9dd809789db7805b632"
+    "revision": "018d0e09d9d0f0dd6740a37682b8ee4512e8b2ac"
   },
   "strace": {
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"

From d3acd105bd48b6529cb5dc02e73d96990862e196 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 25 May 2024 19:09:55 +0200
Subject: [PATCH 1503/2704] ci(lint): make sure query parser is installed from
 this repo

Problem: format-queries.lua in CI uses the bundled query parser from
Neovim, meaning breaking changes are not reflected in tests.

Solution: Install nvim-treesitter in the lint workflow and use it to
install the query parser.
---
 .github/workflows/lint.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b73f03cf8..7123332b7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -36,15 +36,16 @@ jobs:
   format-queries:
     name: Lint queries
     runs-on: ubuntu-latest
+    env:
+      NVIM_TAG: stable
     steps:
       - uses: actions/checkout@v4
       - name: Prepare
         run: |
-          wget https://github.com/neovim/neovim/releases/download/nightly/nvim-linux64.tar.gz
-          tar -zxf nvim-linux64.tar.gz
-          sudo ln -s "$PWD"/nvim-linux64/bin/nvim /usr/local/bin
+          bash ./scripts/ci-install.sh
 
       - name: Lint
         run: |
+          nvim --headless -c "TSInstallSync query" -c "q"
           nvim -l scripts/format-queries.lua
           git diff --exit-code

From 488e39a8f1fcb7935deaaf1852e3d6c28ca253d0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Fri, 24 May 2024 11:48:47 -0400
Subject: [PATCH 1504/2704] feat(query): adapt to upstream changes

---
 lockfile.json                | 2 +-
 queries/query/highlights.scm | 3 ---
 scripts/format-queries.lua   | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 894fb999a..b7ddfb86e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -570,7 +570,7 @@
     "revision": "2c57cac27e207425f8df15327884434cb12365a3"
   },
   "query": {
-    "revision": "a12c4a1cd8aa6e0340ecb7089a05cd345a12bae3"
+    "revision": "e6a775551f6e32cc0efd5b822b2987138c338d9b"
   },
   "r": {
     "revision": "391400572538ff9854341a175ed8ab4b1e45f44b"
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 210d03dc3..c02ee3f2a 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -5,9 +5,6 @@
 (capture
   (identifier) @type)
 
-(anonymous_node
-  (identifier) @string)
-
 (predicate
   name: (identifier) @function.call)
 
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index f5b129cde..ec0e81a57 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -200,7 +200,7 @@ local format_queries = [[
 (capture) @format.prepend-space
 
 ;; Workaround to just use the string's content
-(anonymous_node (identifier) @format.keep)
+(anonymous_node (string) @format.keep)
 
 ; ( (_) ) handler
 (grouping
@@ -248,7 +248,7 @@ local format_queries = [[
   .
   [
     (anonymous_node
-      name: (identifier) .)
+      name: (string) .)
     (named_node
       [
         "_"

From ba149fa3b100bb05ff0185dd5e644f455e6696bf Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 26 May 2024 11:29:35 +0200
Subject: [PATCH 1505/2704] fix(solidity): re-enable unbroken operators

---
 lockfile.json                   |  2 +-
 queries/solidity/highlights.scm | 65 +++++++++++++++++----------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b7ddfb86e..48fa81ec5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -648,7 +648,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "b5a23ead0f69d38b5c9a630f52f5c129132c16ed"
+    "revision": "e8bd851a3c95ff277e49be07d0e20dfa9ac3700c"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 37f2d6df0..1f1d2fe96 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -262,38 +262,39 @@
   "=>"
 ] @punctuation.delimiter
 
-; Operators: currently broken: https://github.com/JoranHonig/tree-sitter-solidity/issues/59
-;[
-;  "&&"
-;  "||"
-;  ">>"
-;  ">>>"
-;  "<<"
-;  "&"
-;  "^"
-;  "|"
-;  "+"
-;  "-"
-;  "*"
-;  "/"
-;  "%"
-;  "**"
-;  "="
-;  "<"
-;  "<="
-;  "=="
-;  "!="
-;  "!=="
-;  ">="
-;  ">"
-;  "!"
-;  "~"
-;  "-"
-;  "+"
-;  "++"
-;  "--"
-;  ":="
-;] @operator
+; Operators
+[
+  "&&"
+  "||"
+  ">>"
+  ">>>"
+  "<<"
+  "&"
+  "^"
+  "|"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "**"
+  "="
+  "<"
+  "<="
+  "=="
+  "!="
+  "!=="
+  ">="
+  ">"
+  "!"
+  "~"
+  "-"
+  "+"
+  "++"
+  "--"
+  ":="
+] @operator
+
 [
   "delete"
   "new"

From d551bc70d5d8ce0c86f5abc3b4a1571406a77df6 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 26 May 2024 06:00:26 -0400
Subject: [PATCH 1506/2704] fix(cpp): update parser and queries (#6687)

---
 lockfile.json              | 2 +-
 queries/cpp/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 48fa81ec5..0e86ab481 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "2369fa991eba294e9238e28280ffcd58132f94bc"
+    "revision": "d29fbff09a8c9ff4f3074de2595dfca12cb33da9"
   },
   "css": {
     "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 1779d59e8..e39a2925c 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -229,8 +229,8 @@
   "public"
   "private"
   "protected"
-  "virtual"
   "final"
+  (virtual)
 ] @keyword.modifier
 
 [

From 245da4eb2e52d14b034bbbedec9671e997ede764 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 26 May 2024 10:01:22 +0000
Subject: [PATCH 1507/2704] bot(lockfile): update c, earthfile, query, solidity

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0e86ab481..529ec1c3f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "2326d709fb9cf73cf124fdbc803c267f851721a4"
   },
   "c": {
-    "revision": "82fb86aa544843bd17a9f0f3dc16edf645a34349"
+    "revision": "00ed08f1a6c18141bfd7a81638e4d239a0bb55cc"
   },
   "c_sharp": {
     "revision": "82fa8f05f41a33e9bc830f85d74a9548f0291738"
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "91fc9434283aec06139e37fc007ad00922f278b4"
+    "revision": "336001d79dd62668088bc6fe6d72a774a449fa2d"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -570,7 +570,7 @@
     "revision": "2c57cac27e207425f8df15327884434cb12365a3"
   },
   "query": {
-    "revision": "e6a775551f6e32cc0efd5b822b2987138c338d9b"
+    "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
   },
   "r": {
     "revision": "391400572538ff9854341a175ed8ab4b1e45f44b"
@@ -648,7 +648,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "e8bd851a3c95ff277e49be07d0e20dfa9ac3700c"
+    "revision": "520f04a9579f9d2a7079b0c81a4439e5d5c9156f"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"

From aa02427dfeaead86fae038024ae7b29299f08b8c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 06:40:36 +0000
Subject: [PATCH 1508/2704] bot(lockfile): update eds, solidity

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 529ec1c3f..a2d64d076 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "eds": {
-    "revision": "fde62029d4c715562230070b9af51a9500c2ce10"
+    "revision": "5517bdb90c90703df49579a4b04689a614780be2"
   },
   "eex": {
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
@@ -648,7 +648,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "520f04a9579f9d2a7079b0c81a4439e5d5c9156f"
+    "revision": "2c5f1e7318fe7d9c8eb38d7d64ebe558d9f41ebc"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"

From ea2b137f35fb1e87a6471ec311805920fdf45745 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 28 May 2024 06:39:01 +0000
Subject: [PATCH 1509/2704] bot(lockfile): update inko, nickel, solidity,
 swift, zathurarc

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a2d64d076..419eeca1c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
   },
   "inko": {
-    "revision": "7860637ce1b43f5f79cfb7cc3311bf3234e9479f"
+    "revision": "234c87be1dac20f766ddf6f486a7bde2a4bc5594"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
@@ -447,7 +447,7 @@
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
   "nickel": {
-    "revision": "58baf89db8fdae54a84bcf22c80ff10ee3f929ed"
+    "revision": "52478738c5a072ab3ad62c74db5d0902dab064cd"
   },
   "nim": {
     "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"
@@ -648,7 +648,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "2c5f1e7318fe7d9c8eb38d7d64ebe558d9f41ebc"
+    "revision": "1c94fe3d5351dfcff3551ec1f49614cbf758e444"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -690,7 +690,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "03af4d057afc56edf6a703e6606b86f782353f22"
+    "revision": "26354ddec08c7efde4fa16bd29429f3310d2e2c5"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -831,7 +831,7 @@
     "revision": "e877f6ade4b77d5ef8787075141053631ba12318"
   },
   "zathurarc": {
-    "revision": "e9e8de071ab79ed1f6e3365f05fcf890b6d85a2f"
+    "revision": "5918bf1785662c43a841b0b6a27a129337ec3a23"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 5aadae3f543ad9f83d5c2eb209d85f3ee26587ab Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 29 May 2024 08:55:35 +0200
Subject: [PATCH 1510/2704] fix(koto): update parser and queries

---
 lockfile.json           | 2 +-
 queries/koto/locals.scm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 419eeca1c..956b3a011 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -372,7 +372,7 @@
     "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
   },
   "koto": {
-    "revision": "919440e1376109bab4edac52594c17c02ae0be5a"
+    "revision": "2ff158a3c7c8ac8e50c1aefe8a3162a9156a73e7"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
diff --git a/queries/koto/locals.scm b/queries/koto/locals.scm
index 7c7097e14..c18487483 100644
--- a/queries/koto/locals.scm
+++ b/queries/koto/locals.scm
@@ -4,16 +4,16 @@
 
 ; Definitions
 (arg
-  (identifier) @local.definition.parameter)
+  (variable) @local.definition.parameter)
 
 (assign
   (identifier) @local.definition.var)
 
 (for_args
-  (identifier) @local.definition.var)
+  (variable) @local.definition.var)
 
 (match_patterns
-  (identifier) @local.definition.var)
+  (variable) @local.definition.var)
 
 (import_item
   (identifier) @local.definition.import)

From b91ae14fc3bb801c7ea69bc283fe860b32b5163d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 29 May 2024 07:22:03 +0000
Subject: [PATCH 1511/2704] bot(lockfile): update cuda, gleam, glsl, hlsl, ini,
 slang, zathurarc

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 956b3a011..376fe9830 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "e7878a9cf4157e9d6c8013ff5605c9f26d62894d"
+    "revision": "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -222,13 +222,13 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "8432ffe32ccd360534837256747beb5b1c82fca1"
+    "revision": "02a17bf9d0553406268cdbf466d57808ae712bf3"
   },
   "glimmer": {
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "33a16b6ff4d7206a16f2dc96c40e149c657db65f"
+    "revision": "7f91bf34cadc06a96efc475df501ffca4dda9410"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -291,7 +291,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "a84e8d4f675d0006f7c07f6c7bcea2fca04cdb6e"
+    "revision": "5e1225a30712ca0a9040509806c7ba274a1bbcde"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -321,7 +321,7 @@
     "revision": "b5b53e2ca0521b98277d5e4b109f0b0e362e850e"
   },
   "ini": {
-    "revision": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"
+    "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
   },
   "inko": {
     "revision": "234c87be1dac20f766ddf6f486a7bde2a4bc5594"
@@ -633,7 +633,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "989bfe5ae69e7bad13454b8f52e4ab0c343d8ded"
+    "revision": "865d79e236c7f0e04276c969453d021d1da4b15f"
   },
   "slint": {
     "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
@@ -831,7 +831,7 @@
     "revision": "e877f6ade4b77d5ef8787075141053631ba12318"
   },
   "zathurarc": {
-    "revision": "5918bf1785662c43a841b0b6a27a129337ec3a23"
+    "revision": "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"
   },
   "zig": {
     "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"

From 5c924407cf110e9da4f3ba02ffed127b4198ad89 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 30 May 2024 06:38:54 +0000
Subject: [PATCH 1512/2704] bot(lockfile): update idl, julia, nickel,
 sourcepawn

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 376fe9830..84303eeeb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "b5b53e2ca0521b98277d5e4b109f0b0e362e850e"
+    "revision": "66709df69626b5f1f139a868ad8480179e60481d"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -357,7 +357,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "acd5ca12cc278df7960629c2429a096c7ac4bbea"
+    "revision": "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"
   },
   "just": {
     "revision": "fd814fc6c579f68c2a642f5e0268cf69daae92d7"
@@ -447,7 +447,7 @@
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
   "nickel": {
-    "revision": "52478738c5a072ab3ad62c74db5d0902dab064cd"
+    "revision": "0a796f3a312917724c1d9f486a201f7402a8acfd"
   },
   "nim": {
     "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"
@@ -657,7 +657,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "227656e72a5f0d430bb82a467bc8078f078bba84"
+    "revision": "64ad670dd59e88c5d32bc3d759ae8562b522cad9"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"

From f770df9c8cd56c05b878cdf35115ad872c822bc0 Mon Sep 17 00:00:00 2001
From: player01osu <player01osu@gmail.com>
Date: Thu, 30 May 2024 21:55:22 -0400
Subject: [PATCH 1513/2704] fix(odin): highlight types with underscores

---
 queries/odin/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 9e65937aa..ea8d401e2 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -192,7 +192,7 @@
   (identifier) @type)
 
 ((identifier) @type
-  (#lua-match? @type "^[A-Z][a-zA-Z0-9]*$")
+  (#lua-match? @type "^[_A-Z][_a-zA-Z0-9]*$")
   (#not-has-parent? @type parameter procedure_declaration call_expression))
 
 ; Fields

From b7d50e59b1b2990b3ce8761d4cf595f4b71c87e2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 06:38:32 +0000
Subject: [PATCH 1514/2704] bot(lockfile): update earthfile, idl, javascript

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 84303eeeb..71519af92 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "336001d79dd62668088bc6fe6d72a774a449fa2d"
+    "revision": "934d3c5e2e7ce94031fa9a55c73c5344e1eaae17"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -318,7 +318,7 @@
     "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
   },
   "idl": {
-    "revision": "66709df69626b5f1f139a868ad8480179e60481d"
+    "revision": "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -336,7 +336,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "a5de24dc7939cb07a758f8d89c089cfdb6f479aa"
+    "revision": "391a8fcc48a11f63bf18ec9885f6f069e760949a"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"

From f9773e4a5e0dbeda0d6f8a78d7d61eb802b6d0e1 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 31 May 2024 20:33:56 -0700
Subject: [PATCH 1515/2704] test: fix tests broken after 0.10 update (#6714)

---
 lua/nvim-treesitter/ts_utils.lua |  1 +
 queries/html_tags/indents.scm    | 19 +++++++++----------
 tests/query/highlights_spec.lua  | 12 +++++++-----
 tests/query/injection_spec.lua   |  7 +++----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
index 655c62881..9e9ada6aa 100644
--- a/lua/nvim-treesitter/ts_utils.lua
+++ b/lua/nvim-treesitter/ts_utils.lua
@@ -397,6 +397,7 @@ function M.swap_nodes(node_or_range1, node_or_range2, bufnr, cursor_to_second)
 
   local edit1 = { range = range1, newText = table.concat(text2, "\n") }
   local edit2 = { range = range2, newText = table.concat(text1, "\n") }
+  bufnr = bufnr == 0 and vim.api.nvim_get_current_buf() or bufnr
   vim.lsp.util.apply_text_edits({ edit1, edit2 }, bufnr, "utf-8")
 
   if cursor_to_second then
diff --git a/queries/html_tags/indents.scm b/queries/html_tags/indents.scm
index 6fe984fa9..dc57c333a 100644
--- a/queries/html_tags/indents.scm
+++ b/queries/html_tags/indents.scm
@@ -1,13 +1,12 @@
-[
-  ((element
-    (start_tag
-      (tag_name) @_not_void_element))
-    (#not-any-of? @_not_void_element
-      "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
-      "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr"))
-  (element
-    (self_closing_tag))
-] @indent.begin
+((element
+  (start_tag
+    (tag_name) @_not_void_element))
+  (#not-any-of? @_not_void_element
+    "area" "base" "basefont" "bgsound" "br" "col" "command" "embed" "frame" "hr" "image" "img"
+    "input" "isindex" "keygen" "link" "menuitem" "meta" "nextid" "param" "source" "track" "wbr")) @indent.begin
+
+(element
+  (self_closing_tag)) @indent.begin
 
 ((start_tag
   (tag_name) @_void_element)
diff --git a/tests/query/highlights_spec.lua b/tests/query/highlights_spec.lua
index ff6a7523d..3bb03d49d 100644
--- a/tests/query/highlights_spec.lua
+++ b/tests/query/highlights_spec.lua
@@ -29,6 +29,7 @@ local function check_assertions(file)
     )
   )
   local parser = parsers.get_parser(buf, lang)
+  parser:parse(true)
 
   local self = highlighter.new(parser, {})
 
@@ -39,12 +40,13 @@ local function check_assertions(file)
 
     local captures = {}
     local highlights = {}
-    self.tree:for_each_tree(function(tstree, tree)
-      if not tstree then
+    self:prepare_highlight_states(row, row + 1)
+    self:for_each_highlight_state(function(state)
+      if not state.tstree then
         return
       end
 
-      local root = tstree:root()
+      local root = state.tstree:root()
       local root_start_row, _, root_end_row, _ = root:range()
 
       -- Only worry about trees within the line range
@@ -52,7 +54,7 @@ local function check_assertions(file)
         return
       end
 
-      local query = self:get_query(tree:lang())
+      local query = state.highlighter_query
 
       -- Some injected languages may not have highlight queries.
       if not query:query() then
@@ -62,7 +64,7 @@ local function check_assertions(file)
       local iter = query:query():iter_captures(root, self.bufnr, row, row + 1)
 
       for capture, node, _ in iter do
-        local hl = query.hl_cache[capture]
+        local hl = query:get_hl_from_capture(capture)
         assert.is.truthy(hl)
 
         assert.Truthy(node)
diff --git a/tests/query/injection_spec.lua b/tests/query/injection_spec.lua
index 7efbab315..95ad12eec 100644
--- a/tests/query/injection_spec.lua
+++ b/tests/query/injection_spec.lua
@@ -1,5 +1,4 @@
 require "nvim-treesitter.highlight" -- yes, this is necessary to set the hlmap
-local highlighter = require "vim.treesitter.highlighter"
 local configs = require "nvim-treesitter.configs"
 local parsers = require "nvim-treesitter.parsers"
 local ts = vim.treesitter
@@ -21,8 +20,8 @@ local function check_assertions(file)
   )
   local parser = parsers.get_parser(buf, lang)
 
-  local self = highlighter.new(parser, {})
-  local top_level_root = parser:parse()[1]:root()
+  local self = parser
+  local top_level_root = parser:parse(true)[1]:root()
 
   for _, assertion in ipairs(assertions) do
     local row = assertion.position.row
@@ -32,7 +31,7 @@ local function check_assertions(file)
     assertion.expected_capture_name = neg_assert and assertion.expected_capture_name:sub(2)
       or assertion.expected_capture_name
     local found = false
-    self.tree:for_each_tree(function(tstree, tree)
+    self:for_each_tree(function(tstree, tree)
       if not tstree then
         return
       end

From 979beffc1a86e7ba19bd6535c0370d8e1aaaad3c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 1 Jun 2024 06:37:29 +0000
Subject: [PATCH 1516/2704] bot(lockfile): update c, fennel, janet_simple,
 rego, slint

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 71519af92..5cc7dd211 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "2326d709fb9cf73cf124fdbc803c267f851721a4"
   },
   "c": {
-    "revision": "00ed08f1a6c18141bfd7a81638e4d239a0bb55cc"
+    "revision": "deca017a554045b4c203e7ddff39ae64ff05e071"
   },
   "c_sharp": {
     "revision": "82fa8f05f41a33e9bc830f85d74a9548f0291738"
@@ -171,7 +171,7 @@
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
   },
   "fennel": {
-    "revision": "8ad17704b3c2469155947d4e8fcb618cf1328459"
+    "revision": "cfbfa478dc2dbef267ee94ae4323d9c886f45e94"
   },
   "fidl": {
     "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
@@ -330,7 +330,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "f3d6e09cc47e76833f23f83b2c59ea0878660953"
+    "revision": "6bfbaadac2ba0da21087041eff85d26129c4c920"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -594,7 +594,7 @@
     "revision": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"
   },
   "rego": {
-    "revision": "9ac75e71b2d791e0aadeef68098319d86a2a14cf"
+    "revision": "39771ed2d7eec293543c81afe705617f39d607f5"
   },
   "requirements": {
     "revision": "360c6a6b31076a482663806f7a8241de9cad6b4e"
@@ -636,7 +636,7 @@
     "revision": "865d79e236c7f0e04276c969453d021d1da4b15f"
   },
   "slint": {
-    "revision": "0701312b74b87fe20e61aa662ba41c5815b5d428"
+    "revision": "59ace2390848e8ab17b47e0b9fa1e5fde8077316"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"

From deb76a224a4ad1de9552c828c5d907acf9f288f0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 2 Jun 2024 06:37:46 +0000
Subject: [PATCH 1517/2704] bot(lockfile): update styled

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 5cc7dd211..217890e6c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -678,7 +678,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "c68a4572e2d6403b6e99066c9a113b43f4a07a27"
+    "revision": "65835cca33a5f033bcde580ed66cde01c1fabbbe"
   },
   "supercollider": {
     "revision": "affa4389186b6939d89673e1e9d2b28364f5ca6f"

From a80fe081b4c5890980561e0de2458f64aaffbfc7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Jun 2024 13:37:08 +0200
Subject: [PATCH 1518/2704] feat(predicates)!: rename `has-type` to `kind-eq`
 to align with Helix

No point in having a different name for the same predicate.
---
 lua/nvim-treesitter/query_predicates.lua | 2 +-
 queries/c/indents.scm                    | 6 +++---
 queries/ecma/indents.scm                 | 6 +++---
 queries/groovy/indents.scm               | 2 +-
 queries/ispc/indents.scm                 | 4 ++--
 queries/ocaml/indents.scm                | 2 +-
 queries/swift/indents.scm                | 2 +-
 scripts/format-queries.lua               | 8 ++++----
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 61400e478..2d61ca6b4 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -124,7 +124,7 @@ end, true)
 ---@param _bufnr integer
 ---@param pred string[]
 ---@return boolean|nil
-query.add_predicate("has-type?", function(match, _pattern, _bufnr, pred)
+query.add_predicate("kind-eq?", function(match, _pattern, _bufnr, pred)
   if not valid_args(pred[1], pred, 2) then
     return
   end
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
index 372a26c6c..1932ce8d6 100644
--- a/queries/c/indents.scm
+++ b/queries/c/indents.scm
@@ -24,14 +24,14 @@
 
 ((for_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 (while_statement
   condition: (_) @indent.begin)
 
 ((while_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 ((if_statement)
   .
@@ -45,7 +45,7 @@
 (if_statement
   consequence: (_
     ";" @indent.end) @_consequence
-  (#not-has-type? @_consequence compound_statement)
+  (#not-kind-eq? @_consequence "compound_statement")
   alternative: (else_clause
     "else" @indent.branch
     [
diff --git a/queries/ecma/indents.scm b/queries/ecma/indents.scm
index 03b10c605..966664219 100644
--- a/queries/ecma/indents.scm
+++ b/queries/ecma/indents.scm
@@ -29,15 +29,15 @@
 
 (arrow_function
   body: (_) @_body
-  (#not-has-type? @_body statement_block)) @indent.begin
+  (#not-kind-eq? @_body "statement_block")) @indent.begin
 
 (assignment_expression
   right: (_) @_right
-  (#not-has-type? @_right arrow_function function)) @indent.begin
+  (#not-kind-eq? @_right "arrow_function" "function")) @indent.begin
 
 (variable_declarator
   value: (_) @_value
-  (#not-has-type? @_value arrow_function call_expression function)) @indent.begin
+  (#not-kind-eq? @_value "arrow_function" "call_expression" "function")) @indent.begin
 
 (arguments
   ")" @indent.end)
diff --git a/queries/groovy/indents.scm b/queries/groovy/indents.scm
index 888d50107..ba3a2e844 100644
--- a/queries/groovy/indents.scm
+++ b/queries/groovy/indents.scm
@@ -19,7 +19,7 @@
 
 ((for_loop
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body closure))
+  (#not-kind-eq? @_body "closure"))
 
 ; TODO: while, try
 (list
diff --git a/queries/ispc/indents.scm b/queries/ispc/indents.scm
index 80723afb4..f8c04e3a9 100644
--- a/queries/ispc/indents.scm
+++ b/queries/ispc/indents.scm
@@ -2,8 +2,8 @@
 
 ((foreach_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
 
 ((foreach_instance_statement
   body: (_) @_body) @indent.begin
-  (#not-has-type? @_body compound_statement))
+  (#not-kind-eq? @_body "compound_statement"))
diff --git a/queries/ocaml/indents.scm b/queries/ocaml/indents.scm
index 9181dcadf..d7f05367d 100644
--- a/queries/ocaml/indents.scm
+++ b/queries/ocaml/indents.scm
@@ -28,7 +28,7 @@
 
 ((else_clause
   (_) @_not_if) @indent.begin
-  (#not-has-type? @_not_if if_expression))
+  (#not-kind-eq? @_not_if "if_expression"))
 
 ((parameter) @indent.begin
   (#set! indent.start_at_same_line))
diff --git a/queries/swift/indents.scm b/queries/swift/indents.scm
index f208292c7..2366c3bd6 100644
--- a/queries/swift/indents.scm
+++ b/queries/swift/indents.scm
@@ -66,7 +66,7 @@
     (_)* @indent.branch)
   .
   _ @indent.branch
-  (#not-has-type? @indent.branch type_parameters parameter))
+  (#not-kind-eq? @indent.branch "type_parameters" "parameter"))
 
 (ERROR
   [
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index ec0e81a57..f241fa819 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -13,7 +13,7 @@ else
   files = vim.fn.split(vim.fn.glob(arg .. "/**/*.scm"))
 end
 
-ts.query.add_predicate("has-type?", function(match, _, _, pred)
+ts.query.add_predicate("kind-eq?", function(match, _, _, pred)
   local node = match[pred[2]]
   if not node then
     return true
@@ -132,7 +132,7 @@ local format_queries = [[
 ;; Append newlines for nodes inside the list
 (list
   (_) @format.append-newline
-  (#not-has-type? @format.append-newline capture quantifier))
+  (#not-kind-eq? @format.append-newline "capture" "quantifier"))
 
 ;; (_), "_" and _ handler
 ;; Start indents if it's one of these patterns
@@ -194,7 +194,7 @@ local format_queries = [[
   ] @format.cancel-append
   .
   ")"
-  (#not-has-type? @format.cancel-append comment))
+  (#not-kind-eq? @format.cancel-append "comment"))
 
 ;; All captures should be separated with a space
 (capture) @format.prepend-space
@@ -233,7 +233,7 @@ local format_queries = [[
 ;; Collapsing closing parens
 (grouping
   (_) @format.cancel-append . ")"
-  (#not-has-type? @format.cancel-append comment))
+  (#not-kind-eq? @format.cancel-append "comment"))
 (grouping
   (capture) @format.prepend-space)
 ;; Remove unnecessary parens

From 121bf634fea767a9d58a0aee801bae5d68685d80 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 06:39:27 +0000
Subject: [PATCH 1519/2704] bot(lockfile): update arduino, earthfile, koto,
 rego, slint, sql, teal, typespec

---
 lockfile.json               | 16 ++++++++--------
 queries/teal/injections.scm |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 217890e6c..8e7a2442c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "arduino": {
-    "revision": "babb6d4da69b359bbb80adbf1fe39c0da9175210"
+    "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
   },
   "asm": {
     "revision": "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "934d3c5e2e7ce94031fa9a55c73c5344e1eaae17"
+    "revision": "6de809419cdfb23e3a8383b6575fa3634900f276"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -372,7 +372,7 @@
     "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
   },
   "koto": {
-    "revision": "2ff158a3c7c8ac8e50c1aefe8a3162a9156a73e7"
+    "revision": "eb8d866cff5751c0a7650623d244280618b0a378"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -594,7 +594,7 @@
     "revision": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"
   },
   "rego": {
-    "revision": "39771ed2d7eec293543c81afe705617f39d607f5"
+    "revision": "23b1da8de9766d766c4f01531e8be14b5c00c493"
   },
   "requirements": {
     "revision": "360c6a6b31076a482663806f7a8241de9cad6b4e"
@@ -636,7 +636,7 @@
     "revision": "865d79e236c7f0e04276c969453d021d1da4b15f"
   },
   "slint": {
-    "revision": "59ace2390848e8ab17b47e0b9fa1e5fde8077316"
+    "revision": "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -663,7 +663,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "25f94f998de79bae9df28add9782f9ea6ea0e2b8"
+    "revision": "6a99f4aff780f98bc119c7f034406e41d7e0b80d"
   },
   "squirrel": {
     "revision": "0a50d31098e83c668d34d1160a0f6c7d23b571cc"
@@ -711,7 +711,7 @@
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
   },
   "teal": {
-    "revision": "33482c92a0dfa694491d34e167a1d2f52b0dccb1"
+    "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
     "revision": "cf84ea53e2e2531f23009d676ac206090c1e2392"
@@ -756,7 +756,7 @@
     "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
   },
   "typespec": {
-    "revision": "fd9a83c6c0aaaff4b1354454b5b9f130f59dd553"
+    "revision": "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index ac42de4eb..830b745ba 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -33,7 +33,8 @@
 ; ('...'):format()
 ((function_call
   (method_index
-    (string) @printf
+    (parenthesized_expression
+      (string) @printf)
     key: (identifier) @_func))
   (#eq? @_func "format")
   (#set! injection.language "printf"))

From 512e2122e0c4332006c8ba9806ef1d4d5e878e25 Mon Sep 17 00:00:00 2001
From: Arstoien <2979182+tdroxler@users.noreply.github.com>
Date: Tue, 4 Jun 2024 09:49:26 +0200
Subject: [PATCH 1520/2704] feat: add `ralph` (#6675)

https://github.com/alephium/tree-sitter-ralph
---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/ralph/highlights.scm    | 137 ++++++++++++++++++++++++++++++++
 queries/ralph/injections.scm    |   2 +
 5 files changed, 151 insertions(+)
 create mode 100644 queries/ralph/highlights.scm
 create mode 100644 queries/ralph/injections.scm

diff --git a/README.md b/README.md
index 6887b6f71..28b24faff 100644
--- a/README.md
+++ b/README.md
@@ -366,6 +366,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
 - [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
+- [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
 - [x] [rbs](https://github.com/joker1007/tree-sitter-rbs) (maintained by @joker1007)
 - [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 8e7a2442c..c92f3eb16 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -578,6 +578,9 @@
   "racket": {
     "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
   },
+  "ralph": {
+    "revision": "48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0"
+  },
   "rasi": {
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d2abb9d53..6c01b3eff 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1699,6 +1699,14 @@ list.racket = {
   },
 }
 
+list.ralph = {
+  install_info = {
+    url = "https://github.com/alephium/tree-sitter-ralph",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@tdroxler" },
+}
+
 list.rasi = {
   install_info = {
     url = "https://github.com/Fymyte/tree-sitter-rasi",
diff --git a/queries/ralph/highlights.scm b/queries/ralph/highlights.scm
new file mode 100644
index 000000000..e56ffa5a2
--- /dev/null
+++ b/queries/ralph/highlights.scm
@@ -0,0 +1,137 @@
+(type_identifier) @type
+
+(identifier) @variable
+
+[
+  (primitive_type)
+  (alph_token_id)
+] @type.builtin
+
+(var_declaration) @variable
+
+(struct_field
+  (identifier) @variable.member)
+
+(arg_def
+  (identifier) @variable.parameter)
+
+(event_field
+  (identifier) @variable.parameter)
+
+(struct_constructor_field
+  (identifier) @variable.parameter)
+
+[
+  (hex_num)
+  (integer)
+  (typed_num)
+] @number
+
+[
+  (bool)
+  (bytes)
+  (address)
+] @constant.builtin
+
+(func_id
+  [
+    (identifier)
+    "!"
+  ] @function)
+
+(annotation
+  [
+    "@"
+    (identifier)
+  ] @attribute)
+
+(map_def
+  (identifier) @variable.parameter)
+
+"fn" @keyword.function
+
+[
+  "Contract"
+  "TxScript"
+  "Interface"
+  "AssetScript"
+  "struct"
+  "enum"
+  "event"
+  "mapping"
+] @keyword.type
+
+[
+  "pub"
+  "Abstract"
+  (mutable)
+] @keyword.modifier
+
+[
+  "while"
+  "for"
+] @keyword.repeat
+
+"return" @keyword.return
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+[
+  "const"
+  "let"
+  "emit"
+  "extends"
+  "embeds"
+  "implements"
+] @keyword
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "."
+  ","
+  ":"
+  ";"
+] @punctuation.delimiter
+
+[
+  "="
+  "->"
+  (op_byte_vec_add)
+  (op_add)
+  (op_sub)
+  (op_mul)
+  (op_exp)
+  (op_mod_exp)
+  (op_div)
+  (op_mod)
+  (op_mod_add)
+  (op_mod_sub)
+  (op_mod_mul)
+  (op_shl)
+  (op_shr)
+  (op_bit_and)
+  (op_xor)
+  (op_bit_or)
+  (op_eq)
+  (op_ne)
+  (op_lt)
+  (op_le)
+  (op_gt)
+  (op_ge)
+  (op_and)
+  (op_or)
+  (op_not)
+] @operator
+
+(line_comment) @comment @spell
diff --git a/queries/ralph/injections.scm b/queries/ralph/injections.scm
new file mode 100644
index 000000000..36849c873
--- /dev/null
+++ b/queries/ralph/injections.scm
@@ -0,0 +1,2 @@
+((line_comment) @injection.content
+  (#set! injection.language "comment"))

From 048c14140cec57671fa46f7e876dd2ce35071af9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:23:51 +0000
Subject: [PATCH 1521/2704] bot(lockfile): update cpp, djot

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c92f3eb16..3a18bd54b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "d29fbff09a8c9ff4f3074de2595dfca12cb33da9"
+    "revision": "9d412ba7e597fe158f209da33e60f31b1f0df967"
   },
   "css": {
     "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
@@ -120,7 +120,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "0e9a836ec47612ade15645fb1680adb549894a6c"
+    "revision": "ea851b9cf1a71e475f4e2ac4dc03609a1b9ca56d"
   },
   "dockerfile": {
     "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"

From 5a8e9644c49f992f47bacd7900f4404df6fd9d38 Mon Sep 17 00:00:00 2001
From: seanbreckenridge <seanbrecke@gmail.com>
Date: Tue, 4 Jun 2024 03:02:35 -0700
Subject: [PATCH 1522/2704] feat(jq): update builtin functions (#6726)

---
 queries/jq/highlights.scm | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
index d994d759f..5d6050f4c 100644
--- a/queries/jq/highlights.scm
+++ b/queries/jq/highlights.scm
@@ -58,26 +58,25 @@
 ; 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"))
+    "IN" "INDEX" "JOIN" "abs" "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" "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" "pick" "pow"
+    "pow10" "range" "recurse" "remainder" "repeat" "reverse" "rindex" "rint" "round" "rtrimstr"
+    "scalars" "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
 [

From 69e41a2c1405ad9626ed502b86e75245f8118531 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 4 Jun 2024 19:14:43 +0200
Subject: [PATCH 1523/2704] feat(vimdoc): update parser and queries

---
 lockfile.json                 |  2 +-
 queries/vimdoc/highlights.scm | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3a18bd54b..12bdbd265 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -801,7 +801,7 @@
     "revision": "b448ca63f972ade12c373c808acdd2bf972937db"
   },
   "vimdoc": {
-    "revision": "b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4"
+    "revision": "1b177bd9f53995dac83616e84b552a8d4f6c5f7e"
   },
   "vue": {
     "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 70a3a2f20..194c80362 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -1,13 +1,19 @@
-(h1) @markup.heading.1
+(h1
+  (delimiter) @markup.heading.1
+  (heading) @markup.heading.1)
 
-(h2) @markup.heading.2
+(h2
+  (delimiter) @markup.heading.2
+  (heading) @markup.heading.2)
 
-(h3) @markup.heading.3
-
-(column_heading) @markup.heading.4
+(h3
+  (heading) @markup.heading.3)
 
 (column_heading
-  "~" @markup.heading.4
+  (heading) @markup.heading.4)
+
+(column_heading
+  (delimiter) @markup.heading.4
   (#set! conceal ""))
 
 (tag

From 49e4e2b4b62360677568c47b6467f31c809b391c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 06:39:13 +0000
Subject: [PATCH 1524/2704] bot(lockfile): update earthfile, nickel

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 12bdbd265..cbf777a9f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "6de809419cdfb23e3a8383b6575fa3634900f276"
+    "revision": "b2672286174c078eb80cdffc61375d0364e7fafb"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -447,7 +447,7 @@
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
   "nickel": {
-    "revision": "0a796f3a312917724c1d9f486a201f7402a8acfd"
+    "revision": "43433d8477b24cd13acaac20a66deda49b7e2547"
   },
   "nim": {
     "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"

From fc9ee79f64b18bf431e862c2462d4f76d488492a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 6 Jun 2024 06:38:37 +0000
Subject: [PATCH 1525/2704] bot(lockfile): update cmake, elixir, pymanifest,
 requirements, sql

---
 lockfile.json                | 10 +++++-----
 queries/cmake/highlights.scm |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cbf777a9f..ca577c749 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"
+    "revision": "4864abb95a1f6e54d6b362677beef9fb674b41e9"
   },
   "comment": {
     "revision": "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"
@@ -147,7 +147,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "de690fa8a028f122af46d9d2685679fe5f2d7d60"
+    "revision": "c7ae8b77e2749826dcf23df6514f08fdd68c66a3"
   },
   "elm": {
     "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
@@ -555,7 +555,7 @@
     "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
   },
   "pymanifest": {
-    "revision": "e3b82b78721aee07f676dac8473ae69db51debcf"
+    "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
     "revision": "71778c2a472ed00a64abf4219544edbf8e4b86d7"
@@ -600,7 +600,7 @@
     "revision": "23b1da8de9766d766c4f01531e8be14b5c00c493"
   },
   "requirements": {
-    "revision": "360c6a6b31076a482663806f7a8241de9cad6b4e"
+    "revision": "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2"
   },
   "rnoweb": {
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
@@ -666,7 +666,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "6a99f4aff780f98bc119c7f034406e41d7e0b80d"
+    "revision": "504a551555393e6771d2aad06f1166b7a5248fab"
   },
   "squirrel": {
     "revision": "0a50d31098e83c668d34d1160a0f6c7d23b571cc"
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index d6e0f243d..fbbf0d542 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -31,8 +31,6 @@
   "$"
   "{"
   "}"
-  "<"
-  ">"
 ] @punctuation.special
 
 [

From 3a74b5831058d0daf8952a5b8c556c61b30a3f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=9Blisue=20=28Ali=20sue=E3=83=BB=E3=81=82=E3=82=8A?=
 =?UTF-8?q?=E3=81=99=E3=81=88=29?= <lambdalisue@gmail.com>
Date: Thu, 6 Jun 2024 22:56:50 +0900
Subject: [PATCH 1526/2704] docs(readme): fix example of the parser install
 directory (#6737)

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 28b24faff..f3a860d31 100644
--- a/README.md
+++ b/README.md
@@ -548,11 +548,13 @@ If you want to install the parsers to a custom directory you can specify this
 directory with `parser_install_dir` option in that is passed to `setup`.
 `nvim-treesitter` will then install the parser files into this directory.
 
-This directory must be writeable and must be explicitly added to the
+This directory must be writeable and must be explicitly prepended to the
 `runtimepath`. For example:
 
 ```lua
-  vim.opt.runtimepath:append("/some/path/to/store/parsers")
+  -- It MUST be at the beginning of runtimepath. Otherwise the parsers from Neovim itself
+  -- is loaded that may not be compatible with the queries from the 'nvim-treesitter' plugin.
+  vim.opt.runtimepath:prepend("/some/path/to/store/parsers")
 
   require'nvim-treesitter.configs'.setup {
     parser_install_dir = "/some/path/to/store/parsers",

From c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 06:39:40 +0000
Subject: [PATCH 1527/2704] bot(lockfile): update eds, koto, php, php_only

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ca577c749..92999b6ca 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "eds": {
-    "revision": "5517bdb90c90703df49579a4b04689a614780be2"
+    "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
   },
   "eex": {
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
@@ -372,7 +372,7 @@
     "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
   },
   "koto": {
-    "revision": "eb8d866cff5751c0a7650623d244280618b0a378"
+    "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -501,10 +501,10 @@
     "revision": "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"
   },
   "php": {
-    "revision": "b38c53537769df05871643c9688c264074fb6076"
+    "revision": "1d01c6184c7c7daf3bd63b4be2255ba1b2a3ac96"
   },
   "php_only": {
-    "revision": "b38c53537769df05871643c9688c264074fb6076"
+    "revision": "1d01c6184c7c7daf3bd63b4be2255ba1b2a3ac96"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"

From c1e1e24b6433d4539bad9f5daa207df39633071b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 8 Jun 2024 06:37:29 +0000
Subject: [PATCH 1528/2704] bot(lockfile): update erlang, php, php_only, sql,
 swift

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 92999b6ca..88d134615 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -162,7 +162,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "98ea1f9c957b2ad520415eecb5a5b406e931101e"
+    "revision": "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -501,10 +501,10 @@
     "revision": "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"
   },
   "php": {
-    "revision": "1d01c6184c7c7daf3bd63b4be2255ba1b2a3ac96"
+    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
   },
   "php_only": {
-    "revision": "1d01c6184c7c7daf3bd63b4be2255ba1b2a3ac96"
+    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -666,7 +666,7 @@
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
   },
   "sql": {
-    "revision": "504a551555393e6771d2aad06f1166b7a5248fab"
+    "revision": "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"
   },
   "squirrel": {
     "revision": "0a50d31098e83c668d34d1160a0f6c7d23b571cc"
@@ -693,7 +693,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "26354ddec08c7efde4fa16bd29429f3310d2e2c5"
+    "revision": "a9e6289ee526b0bb3b805c4313f12470b96cf1e9"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 3fc41e145c1e171b93b5d91cd1ed877edc28b1fe Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 9 Jun 2024 06:38:03 +0000
Subject: [PATCH 1529/2704] bot(lockfile): update kdl, luap, sourcepawn, swift,
 vimdoc

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 88d134615..bfd174396 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -366,7 +366,7 @@
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
   },
   "kdl": {
-    "revision": "49fb89a854d93b58a65a19724ac307195ca11941"
+    "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
     "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
@@ -408,7 +408,7 @@
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
   },
   "luap": {
-    "revision": "31461ae9bd0866cb5117cfe5de71189854fd0f3e"
+    "revision": "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a"
   },
   "luau": {
     "revision": "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"
@@ -660,7 +660,7 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "64ad670dd59e88c5d32bc3d759ae8562b522cad9"
+    "revision": "645d093763bcaaf7535edbdf6575a5c978b16491"
   },
   "sparql": {
     "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
@@ -693,7 +693,7 @@
     "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
   },
   "swift": {
-    "revision": "a9e6289ee526b0bb3b805c4313f12470b96cf1e9"
+    "revision": "13ffaec4068facfff608e3afbdb7a581c185f6a6"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -801,7 +801,7 @@
     "revision": "b448ca63f972ade12c373c808acdd2bf972937db"
   },
   "vimdoc": {
-    "revision": "1b177bd9f53995dac83616e84b552a8d4f6c5f7e"
+    "revision": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245"
   },
   "vue": {
     "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"

From 9ebc589329083522f9594f408fc2652090b41139 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Sat, 8 Jun 2024 21:29:28 -0500
Subject: [PATCH 1530/2704] fix(php): remove recursive member_call_expression
 indent branch

---
 queries/php_only/indents.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/queries/php_only/indents.scm b/queries/php_only/indents.scm
index ca619a320..4a67a8b0b 100644
--- a/queries/php_only/indents.scm
+++ b/queries/php_only/indents.scm
@@ -23,9 +23,6 @@
     (match_expression)
   ]) @indent.dedent
 
-(member_call_expression
-  object: (member_call_expression) @indent.branch)
-
 [
   ")"
   "}"

From da7ea8f335da52ef558d7405f314a6dde8d673c9 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 9 Jun 2024 18:00:44 -0700
Subject: [PATCH 1531/2704] feat(markdown_inline): No spell for emails and HTML
 entities

---
 queries/markdown_inline/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 233ab411c..0afb0d983 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -85,8 +85,11 @@
 [
   (link_destination)
   (uri_autolink)
+  (email_autolink)
 ] @markup.link.url @nospell
 
+(entity_reference) @nospell
+
 ; Replace common HTML entities.
 ((entity_reference) @character.special
   (#eq? @character.special "&nbsp;")

From b47dde81a0a4b9b62e9a73a71ff0df2202323dd9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 06:40:11 +0000
Subject: [PATCH 1532/2704] bot(lockfile): update doxygen

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index bfd174396..3eb93d366 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -129,7 +129,7 @@
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
   },
   "doxygen": {
-    "revision": "4a30eba5d047d6a8c5b005202b4848c0b33d76ca"
+    "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"

From 3b5704440f88ecc98fb5afb5378b95acd4b2fa7f Mon Sep 17 00:00:00 2001
From: "Johannes R. L. Dickenson"
 <71744831+johannesrld@users.noreply.github.com>
Date: Mon, 10 Jun 2024 23:15:41 +0800
Subject: [PATCH 1533/2704] fix(commonlisp): correctly highlight quotes (#6565)

---
 queries/commonlisp/highlights.scm | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
index 84f132e48..7236c84de 100644
--- a/queries/commonlisp/highlights.scm
+++ b/queries/commonlisp/highlights.scm
@@ -105,24 +105,19 @@
   (#lua-match? @variable.builtin "^[*].+[*]$"))
 
 ; quote
-"'" @string.escape
-
 (format_specifier) @string.escape
 
-(quoting_lit) @string.escape
+(quoting_lit
+  "'" @string.escape)
 
-; syntax quote
-"`" @string.escape
+(syn_quoting_lit
+  "`" @string.escape)
 
-"," @string.escape
+(unquoting_lit
+  "," @string.escape)
 
-",@" @string.escape
-
-(syn_quoting_lit) @string.escape
-
-(unquoting_lit) @none
-
-(unquote_splicing_lit) @none
+(unquote_splicing_lit
+  ",@" @string.escape)
 
 [
   "("

From 94f9a46b37f2a7ac674d518f80cf5b1d9eb8445e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 10 Jun 2024 09:44:00 -0700
Subject: [PATCH 1534/2704] feat(rust): fold block expressions (#6754)

---
 queries/rust/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index e5721c021..542904192 100644
--- a/queries/rust/folds.scm
+++ b/queries/rust/folds.scm
@@ -21,4 +21,5 @@
   (macro_definition)
   (macro_invocation)
   (attribute_item)
+  (block)
 ] @fold

From eb59a3df509322924631c1ed85b0d2ec696bb78d Mon Sep 17 00:00:00 2001
From: Colin Bruins <139183701+bruinscolin@users.noreply.github.com>
Date: Mon, 10 Jun 2024 10:05:10 -0700
Subject: [PATCH 1535/2704] feat(swift): highlight shebang lines

---
 queries/swift/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index decb506e0..562be5e33 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -100,6 +100,8 @@
   (modify_specifier)
 ] @keyword
 
+(shebang_line) @keyword.directive
+
 (class_body
   (property_declaration
     (pattern

From 9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421 Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Mon, 10 Jun 2024 19:07:48 -0700
Subject: [PATCH 1536/2704] feat(htmldjango): highlight keyword arguments for
 tags (#6660)

---
 queries/htmldjango/highlights.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index a411e8f15..5648e72fc 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -22,6 +22,15 @@
 
 (variable_name) @variable
 
+(unpaired_statement
+  (tag_name)
+  (variable
+    (variable_name) @variable.parameter)
+  .
+  "="
+  .
+  (_))
+
 (filter_name) @function.method
 
 (filter_argument) @variable.parameter

From f29c2d9867004151f9417f2f19b068fb973c29cc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 06:38:43 +0000
Subject: [PATCH 1537/2704] bot(lockfile): update liquid

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 3eb93d366..cd275afdb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -393,7 +393,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "293369818da219d97327908aab33707b04b63fd9"
+    "revision": "0419ac4868585320eee8615c90b864a1b04ef433"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"

From 26171d8f105d97746371d1b6c07c8d88bf13fec2 Mon Sep 17 00:00:00 2001
From: Charles Chiu <mail@charliie.dev>
Date: Wed, 12 Jun 2024 16:18:54 +0800
Subject: [PATCH 1538/2704] chore: clean duplicate node

---
 queries/lua/indents.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/lua/indents.scm b/queries/lua/indents.scm
index 2c3dc2448..c05cc4e5f 100644
--- a/queries/lua/indents.scm
+++ b/queries/lua/indents.scm
@@ -12,7 +12,6 @@
   (return_statement)
   (table_constructor)
   (arguments)
-  (return_statement)
 ] @indent.begin
 
 [

From 9636d5a3f4f531256fba147a30b882c44f28fae1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 06:38:58 +0000
Subject: [PATCH 1539/2704] bot(lockfile): update rego, solidity

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cd275afdb..799fb855c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -597,7 +597,7 @@
     "revision": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"
   },
   "rego": {
-    "revision": "23b1da8de9766d766c4f01531e8be14b5c00c493"
+    "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
   },
   "requirements": {
     "revision": "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2"
@@ -651,7 +651,7 @@
     "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
   },
   "solidity": {
-    "revision": "1c94fe3d5351dfcff3551ec1f49614cbf758e444"
+    "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"

From cdc613c630598779dc9f975bae12a4dc7c001950 Mon Sep 17 00:00:00 2001
From: Oliver Thomas <thomaso@ie-freiburg.mpg.de>
Date: Thu, 13 Jun 2024 21:02:52 +0200
Subject: [PATCH 1540/2704] feat(snakemake): add rule_inheritance to folds

---
 queries/snakemake/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/snakemake/folds.scm b/queries/snakemake/folds.scm
index 99850bd9b..d154f3cde 100644
--- a/queries/snakemake/folds.scm
+++ b/queries/snakemake/folds.scm
@@ -2,6 +2,7 @@
 
 [
   (rule_definition)
+  (rule_inheritance)
   (module_definition)
   (checkpoint_definition)
 ] @fold

From e5af2d7fdcdcbafd75e0bdb4e53d3be55c5761c4 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 13 Jun 2024 22:07:43 -0700
Subject: [PATCH 1541/2704] fix(gitcommit): correct the file path capture
 (#6765)

---
 queries/gitcommit/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index 4542413c8..a15530510 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -9,7 +9,7 @@
 
 (change) @keyword
 
-(filepath) @string.special.url
+(filepath) @string.special.path
 
 (arrow) @punctuation.delimiter
 

From bb0eb73014fe7de0b31f2cbaf1d9b984bb7b58dc Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 13 Jun 2024 21:08:40 -0700
Subject: [PATCH 1542/2704] fix(markdown): capture entire heading line

---
 queries/markdown/highlights.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 4b445e02f..a9ce4df20 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -8,28 +8,22 @@
   (setext_h2_underline) @markup.heading.2)
 
 (atx_heading
-  (atx_h1_marker) @markup.heading.1
-  (inline) @markup.heading.1)
+  (atx_h1_marker)) @markup.heading.1
 
 (atx_heading
-  (atx_h2_marker) @markup.heading.2
-  (inline) @markup.heading.2)
+  (atx_h2_marker)) @markup.heading.2
 
 (atx_heading
-  (atx_h3_marker) @markup.heading.3
-  (inline) @markup.heading.3)
+  (atx_h3_marker)) @markup.heading.3
 
 (atx_heading
-  (atx_h4_marker) @markup.heading.4
-  (inline) @markup.heading.4)
+  (atx_h4_marker)) @markup.heading.4
 
 (atx_heading
-  (atx_h5_marker) @markup.heading.5
-  (inline) @markup.heading.5)
+  (atx_h5_marker)) @markup.heading.5
 
 (atx_heading
-  (atx_h6_marker) @markup.heading.6
-  (inline) @markup.heading.6)
+  (atx_h6_marker)) @markup.heading.6
 
 (info_string) @label
 

From 8dd40c7609c04d7bad7eb21d71f78c3fa4dc1c2c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 06:39:49 +0000
Subject: [PATCH 1543/2704] bot(lockfile): update snakemake, zig

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 799fb855c..d3b6b8d2b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -648,7 +648,7 @@
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
-    "revision": "ba1b3868eaa960b945593404af9a7c2f296d3643"
+    "revision": "5a7b14074bca95b25935e865ca8f1efad32317e4"
   },
   "solidity": {
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
@@ -837,6 +837,6 @@
     "revision": "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"
   },
   "zig": {
-    "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
+    "revision": "7c5a29b721d409be8842017351bf007d7e384401"
   }
 }

From 9d68e876cce94fc9f8f8819da0c956a4429a3766 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 7 Jun 2024 21:33:49 -0700
Subject: [PATCH 1544/2704] feat: more comment injections

---
 queries/ada/injections.scm        | 2 ++
 queries/agda/injections.scm       | 2 ++
 queries/apex/injections.scm       | 5 +++++
 queries/bibtex/injections.scm     | 2 ++
 queries/blueprint/injections.scm  | 2 ++
 queries/cmake/injections.scm      | 5 +++++
 queries/commonlisp/injections.scm | 5 +++++
 queries/cooklang/highlights.scm   | 2 ++
 queries/cooklang/injections.scm   | 2 ++
 queries/corn/injections.scm       | 2 ++
 queries/djot/injections.scm       | 3 +++
 queries/ebnf/injections.scm       | 2 ++
 queries/erlang/injections.scm     | 2 ++
 queries/foam/injections.scm       | 3 +++
 queries/fortran/injections.scm    | 2 ++
 queries/fsh/injections.scm        | 2 ++
 queries/func/injections.scm       | 2 ++
 queries/fusion/injections.scm     | 5 +++++
 queries/git_rebase/injections.scm | 3 +++
 queries/gitignore/injections.scm  | 2 ++
 queries/glimmer/injections.scm    | 2 ++
 queries/hack/injections.scm       | 5 +++++
 queries/hoon/highlights.scm       | 2 +-
 queries/hoon/injections.scm       | 2 ++
 queries/htmldjango/injections.scm | 6 ++++++
 queries/hurl/injections.scm       | 3 +++
 queries/hyprlang/injections.scm   | 3 +++
 queries/ini/injections.scm        | 2 ++
 queries/jsonnet/injections.scm    | 2 ++
 queries/just/injections.scm       | 3 +++
 queries/liquidsoap/highlights.scm | 2 +-
 queries/liquidsoap/injections.scm | 2 ++
 queries/llvm/injections.scm       | 2 ++
 queries/menhir/injections.scm     | 7 +++++++
 queries/mermaid/injections.scm    | 2 ++
 queries/mlir/injections.scm       | 2 ++
 queries/nickel/injections.scm     | 2 ++
 queries/ninja/injections.scm      | 2 ++
 queries/prisma/injections.scm     | 5 +++++
 queries/promql/injections.scm     | 3 +++
 queries/proto/injections.scm      | 2 ++
 queries/pug/injections.scm        | 3 +++
 queries/robot/injections.scm      | 5 +++++
 queries/scss/injections.scm       | 2 ++
 queries/smithy/injections.scm     | 5 +++++
 queries/solidity/injections.scm   | 2 ++
 queries/swift/injections.scm      | 5 +++++
 queries/tcl/injections.scm        | 2 ++
 queries/textproto/highlights.scm  | 2 +-
 queries/textproto/injections.scm  | 2 ++
 queries/twig/injections.scm       | 3 +++
 queries/usd/injections.scm        | 2 ++
 queries/vala/injections.scm       | 2 ++
 queries/vhs/injections.scm        | 2 ++
 queries/wgsl/injections.scm       | 5 +++++
 queries/wing/injections.scm       | 2 ++
 56 files changed, 157 insertions(+), 3 deletions(-)
 create mode 100644 queries/ada/injections.scm
 create mode 100644 queries/agda/injections.scm
 create mode 100644 queries/apex/injections.scm
 create mode 100644 queries/bibtex/injections.scm
 create mode 100644 queries/blueprint/injections.scm
 create mode 100644 queries/cmake/injections.scm
 create mode 100644 queries/commonlisp/injections.scm
 create mode 100644 queries/cooklang/injections.scm
 create mode 100644 queries/corn/injections.scm
 create mode 100644 queries/ebnf/injections.scm
 create mode 100644 queries/erlang/injections.scm
 create mode 100644 queries/fortran/injections.scm
 create mode 100644 queries/fsh/injections.scm
 create mode 100644 queries/func/injections.scm
 create mode 100644 queries/fusion/injections.scm
 create mode 100644 queries/gitignore/injections.scm
 create mode 100644 queries/glimmer/injections.scm
 create mode 100644 queries/hack/injections.scm
 create mode 100644 queries/hoon/injections.scm
 create mode 100644 queries/ini/injections.scm
 create mode 100644 queries/jsonnet/injections.scm
 create mode 100644 queries/liquidsoap/injections.scm
 create mode 100644 queries/llvm/injections.scm
 create mode 100644 queries/mermaid/injections.scm
 create mode 100644 queries/mlir/injections.scm
 create mode 100644 queries/nickel/injections.scm
 create mode 100644 queries/ninja/injections.scm
 create mode 100644 queries/prisma/injections.scm
 create mode 100644 queries/proto/injections.scm
 create mode 100644 queries/robot/injections.scm
 create mode 100644 queries/scss/injections.scm
 create mode 100644 queries/smithy/injections.scm
 create mode 100644 queries/solidity/injections.scm
 create mode 100644 queries/swift/injections.scm
 create mode 100644 queries/tcl/injections.scm
 create mode 100644 queries/textproto/injections.scm
 create mode 100644 queries/usd/injections.scm
 create mode 100644 queries/vala/injections.scm
 create mode 100644 queries/vhs/injections.scm
 create mode 100644 queries/wgsl/injections.scm
 create mode 100644 queries/wing/injections.scm

diff --git a/queries/ada/injections.scm b/queries/ada/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/ada/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/agda/injections.scm b/queries/agda/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/agda/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/apex/injections.scm b/queries/apex/injections.scm
new file mode 100644
index 000000000..3cd6aac8e
--- /dev/null
+++ b/queries/apex/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/bibtex/injections.scm b/queries/bibtex/injections.scm
new file mode 100644
index 000000000..98ad387d9
--- /dev/null
+++ b/queries/bibtex/injections.scm
@@ -0,0 +1,2 @@
+((junk) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/blueprint/injections.scm b/queries/blueprint/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/blueprint/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/cmake/injections.scm b/queries/cmake/injections.scm
new file mode 100644
index 000000000..eb8e21503
--- /dev/null
+++ b/queries/cmake/injections.scm
@@ -0,0 +1,5 @@
+([
+  (bracket_comment)
+  (line_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/commonlisp/injections.scm b/queries/commonlisp/injections.scm
new file mode 100644
index 000000000..dc8982053
--- /dev/null
+++ b/queries/commonlisp/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/cooklang/highlights.scm b/queries/cooklang/highlights.scm
index ca870dd47..21aba3ce8 100644
--- a/queries/cooklang/highlights.scm
+++ b/queries/cooklang/highlights.scm
@@ -1,5 +1,7 @@
 (metadata) @comment
 
+(comment) @comment @spell
+
 (ingredient
   "@" @punctuation.delimiter
   (name)? @string.special.symbol
diff --git a/queries/cooklang/injections.scm b/queries/cooklang/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/cooklang/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/corn/injections.scm b/queries/corn/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/corn/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/djot/injections.scm b/queries/djot/injections.scm
index b590e084f..078b40366 100644
--- a/queries/djot/injections.scm
+++ b/queries/djot/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 (code_block
   (language) @injection.language
   (code) @injection.content)
diff --git a/queries/ebnf/injections.scm b/queries/ebnf/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/ebnf/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/erlang/injections.scm b/queries/erlang/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/erlang/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/foam/injections.scm b/queries/foam/injections.scm
index e1c223bd2..b9f8f838f 100644
--- a/queries/foam/injections.scm
+++ b/queries/foam/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; Pass code blocks to Cpp highlighter
 (code
   (code_body) @injection.content
diff --git a/queries/fortran/injections.scm b/queries/fortran/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/fortran/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/fsh/injections.scm b/queries/fsh/injections.scm
new file mode 100644
index 000000000..7bf6d006a
--- /dev/null
+++ b/queries/fsh/injections.scm
@@ -0,0 +1,2 @@
+((fsh_comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/func/injections.scm b/queries/func/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/func/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/fusion/injections.scm b/queries/fusion/injections.scm
new file mode 100644
index 000000000..085cdb458
--- /dev/null
+++ b/queries/fusion/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (afx_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/git_rebase/injections.scm b/queries/git_rebase/injections.scm
index da2628667..c831594bd 100644
--- a/queries/git_rebase/injections.scm
+++ b/queries/git_rebase/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((operation
   (command) @_command
   (message) @injection.content)
diff --git a/queries/gitignore/injections.scm b/queries/gitignore/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/gitignore/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/glimmer/injections.scm b/queries/glimmer/injections.scm
new file mode 100644
index 000000000..d0400c30e
--- /dev/null
+++ b/queries/glimmer/injections.scm
@@ -0,0 +1,2 @@
+((comment_statement) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/hack/injections.scm b/queries/hack/injections.scm
new file mode 100644
index 000000000..655c29ec5
--- /dev/null
+++ b/queries/hack/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (heredoc)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/hoon/highlights.scm b/queries/hoon/highlights.scm
index d98ee44e0..90ac87217 100644
--- a/queries/hoon/highlights.scm
+++ b/queries/hoon/highlights.scm
@@ -20,7 +20,7 @@
 
 (aura) @constant.builtin
 
-(Gap) @comment
+(lineComment) @comment
 
 (boolean) @constant.builtin
 
diff --git a/queries/hoon/injections.scm b/queries/hoon/injections.scm
new file mode 100644
index 000000000..a004ba0b4
--- /dev/null
+++ b/queries/hoon/injections.scm
@@ -0,0 +1,2 @@
+((lineComment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/htmldjango/injections.scm b/queries/htmldjango/injections.scm
index c475757bf..2d3bdb6cd 100644
--- a/queries/htmldjango/injections.scm
+++ b/queries/htmldjango/injections.scm
@@ -1,3 +1,9 @@
+([
+  (paired_comment)
+  (unpaired_comment)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ((content) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
diff --git a/queries/hurl/injections.scm b/queries/hurl/injections.scm
index ea62b8f5f..109d9125f 100644
--- a/queries/hurl/injections.scm
+++ b/queries/hurl/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; injections.scm
 ((json_value) @injection.content
   (#set! injection.language "json"))
diff --git a/queries/hyprlang/injections.scm b/queries/hyprlang/injections.scm
index 1f0199ed8..d38d499b2 100644
--- a/queries/hyprlang/injections.scm
+++ b/queries/hyprlang/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 (exec
   (string) @injection.content
   (#set! injection.language "bash"))
diff --git a/queries/ini/injections.scm b/queries/ini/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/ini/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/jsonnet/injections.scm b/queries/jsonnet/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/jsonnet/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/just/injections.scm b/queries/just/injections.scm
index dab656b69..90db6b725 100644
--- a/queries/just/injections.scm
+++ b/queries/just/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ; The right side of =~ literals
 (regex_literal
   (_) @injection.content
diff --git a/queries/liquidsoap/highlights.scm b/queries/liquidsoap/highlights.scm
index 38a386548..c5608f897 100644
--- a/queries/liquidsoap/highlights.scm
+++ b/queries/liquidsoap/highlights.scm
@@ -104,7 +104,7 @@
 
 (bool) @boolean
 
-(comment) @comment
+(comment) @comment @spell
 
 (regexp) @string.regexp
 
diff --git a/queries/liquidsoap/injections.scm b/queries/liquidsoap/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/liquidsoap/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/llvm/injections.scm b/queries/llvm/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/llvm/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/menhir/injections.scm b/queries/menhir/injections.scm
index 9343d60af..16a3f8157 100644
--- a/queries/menhir/injections.scm
+++ b/queries/menhir/injections.scm
@@ -1,2 +1,9 @@
+([
+  (comment)
+  (line_comment)
+  (ocaml_comment)
+] @injection.content
+  (#set! injection.language "comment"))
+
 ((ocaml) @injection.content
   (#set! injection.language "ocaml"))
diff --git a/queries/mermaid/injections.scm b/queries/mermaid/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/mermaid/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/mlir/injections.scm b/queries/mlir/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/mlir/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/nickel/injections.scm b/queries/nickel/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/nickel/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/ninja/injections.scm b/queries/ninja/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/ninja/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/prisma/injections.scm b/queries/prisma/injections.scm
new file mode 100644
index 000000000..ac427dd68
--- /dev/null
+++ b/queries/prisma/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (developer_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/promql/injections.scm b/queries/promql/injections.scm
index 4fbe37a00..4e7c1b261 100644
--- a/queries/promql/injections.scm
+++ b/queries/promql/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((label_value) @injection.content
   (#set! injection.language "regex")
   (#offset! @injection.content 0 1 0 -1))
diff --git a/queries/proto/injections.scm b/queries/proto/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/proto/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/pug/injections.scm b/queries/pug/injections.scm
index d4bd712b5..0c01e47eb 100644
--- a/queries/pug/injections.scm
+++ b/queries/pug/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((javascript) @injection.content
   (#set! injection.language "javascript"))
 
diff --git a/queries/robot/injections.scm b/queries/robot/injections.scm
new file mode 100644
index 000000000..56e37005e
--- /dev/null
+++ b/queries/robot/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (extra_text)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/scss/injections.scm b/queries/scss/injections.scm
new file mode 100644
index 000000000..c3a252a79
--- /dev/null
+++ b/queries/scss/injections.scm
@@ -0,0 +1,2 @@
+((single_line_comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/smithy/injections.scm b/queries/smithy/injections.scm
new file mode 100644
index 000000000..cb85ecaa1
--- /dev/null
+++ b/queries/smithy/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (documentation_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/solidity/injections.scm b/queries/solidity/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/solidity/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/swift/injections.scm b/queries/swift/injections.scm
new file mode 100644
index 000000000..19aae904e
--- /dev/null
+++ b/queries/swift/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (multiline_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/tcl/injections.scm b/queries/tcl/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/tcl/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/textproto/highlights.scm b/queries/textproto/highlights.scm
index 451362216..527af0398 100644
--- a/queries/textproto/highlights.scm
+++ b/queries/textproto/highlights.scm
@@ -2,7 +2,7 @@
 
 (field_name) @variable.member
 
-(comment) @comment
+(comment) @comment @spell
 
 (number) @number
 
diff --git a/queries/textproto/injections.scm b/queries/textproto/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/textproto/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/twig/injections.scm b/queries/twig/injections.scm
index c475757bf..3fd93feb7 100644
--- a/queries/twig/injections.scm
+++ b/queries/twig/injections.scm
@@ -1,3 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
 ((content) @injection.content
   (#set! injection.language "html")
   (#set! injection.combined))
diff --git a/queries/usd/injections.scm b/queries/usd/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/usd/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/vala/injections.scm b/queries/vala/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/vala/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/vhs/injections.scm b/queries/vhs/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/vhs/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/wgsl/injections.scm b/queries/wgsl/injections.scm
new file mode 100644
index 000000000..3cd6aac8e
--- /dev/null
+++ b/queries/wgsl/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/wing/injections.scm b/queries/wing/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/wing/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 921763b23d2028fc630bfcdec4b43b708740ed12 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 15 Jun 2024 13:26:03 +0200
Subject: [PATCH 1545/2704] feat(hyprlang): update parser and queries

---
 lockfile.json                   | 2 +-
 queries/hyprlang/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index d3b6b8d2b..d4856e482 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
   },
   "hyprlang": {
-    "revision": "e5da7d0aa44403153e0394d87d9edea4e5bd6609"
+    "revision": "088bcd4052de1b9b5d051dffc3d76e658f295a50"
   },
   "idl": {
     "revision": "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"
diff --git a/queries/hyprlang/highlights.scm b/queries/hyprlang/highlights.scm
index d76993d12..597edcbf4 100644
--- a/queries/hyprlang/highlights.scm
+++ b/queries/hyprlang/highlights.scm
@@ -36,6 +36,8 @@
   (legacy_hex)
   (angle)
   (hex)
+  (display)
+  (position)
 ] @number
 
 "deg" @type

From 47994d7e8960d59fa78e414f038d1266db98c0e2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 15 Jun 2024 13:35:42 +0200
Subject: [PATCH 1546/2704] feat(roc): switch to active upstream

---
 README.md                       |  2 +-
 lockfile.json                   |  2 +-
 lua/nvim-treesitter/parsers.lua |  2 +-
 queries/roc/highlights.scm      | 28 +++++++---------------------
 queries/roc/locals.scm          |  7 ++++---
 5 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index f3a860d31..51ced3a25 100644
--- a/README.md
+++ b/README.md
@@ -376,7 +376,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
 - [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
-- [x] [roc](https://github.com/nat-418/tree-sitter-roc) (maintained by @nat-418)
+- [x] [roc](https://github.com/faldor20/tree-sitter-roc) (maintained by @nat-418)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
diff --git a/lockfile.json b/lockfile.json
index d4856e482..f57f84002 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -609,7 +609,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "7df2c0892e62efb81a7504d9799d4e0d0443d241"
+    "revision": "df46a85abda9f948d38f5d4e3684cec49c42fef2"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6c01b3eff..314f1e4af 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1782,7 +1782,7 @@ list.robot = {
 
 list.roc = {
   install_info = {
-    url = "https://github.com/nat-418/tree-sitter-roc",
+    url = "https://github.com/faldor20/tree-sitter-roc",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@nat-418" },
diff --git a/queries/roc/highlights.scm b/queries/roc/highlights.scm
index d47c8770e..89b42a6a5 100644
--- a/queries/roc/highlights.scm
+++ b/queries/roc/highlights.scm
@@ -79,29 +79,12 @@
 ] @keyword
 
 ;----headers-----
-(interface_header
-  (name) @type.definition)
-
-(imports
-  (imports_entry
-    (module) @module))
-
-(packages
-  (record_pattern
-    (record_field_pattern
-      (field_name) @module)))
-
-(app_name) @string.special
-
-(import_path) @string.special.path
-
 [
   "app"
-  "packages"
-  "provides"
-  "interface"
-  "exposes"
   "expect"
+  "module"
+  "package"
+  "import"
 ] @keyword
 
 [
@@ -184,6 +167,9 @@
   (float)
 ] @number.float
 
-(string) @string
+[
+  (string)
+  (multiline_string)
+] @string
 
 (char) @character
diff --git a/queries/roc/locals.scm b/queries/roc/locals.scm
index 71bb19407..134fe0119 100644
--- a/queries/roc/locals.scm
+++ b/queries/roc/locals.scm
@@ -8,6 +8,10 @@
 (exposes_list
   (ident) @local.reference)
 
+(import_expr
+  (as)
+  (module) @local.definition)
+
 (opaque_type_def
   (apply_type
     (concrete_type) @local.definition.type))
@@ -31,9 +35,6 @@
 (identifier_pattern
   (identifier) @local.definition)
 
-(exposes
-  (ident) @local.reference)
-
 (identifier) @local.reference
 
 (tag_expr

From 9916da1bfd99d6fb18ac6ef4ca6a79d00fcf6fcc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 15 Jun 2024 12:00:50 +0000
Subject: [PATCH 1547/2704] bot(lockfile): update qmljs, v

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f57f84002..a0be2ec7f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -567,7 +567,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "2c57cac27e207425f8df15327884434cb12365a3"
+    "revision": "febf48a5b6928600cd8fb2a01254743af550780d"
   },
   "query": {
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
@@ -783,7 +783,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "7e11a6f8f369df935664fadd2f0c99d90fe3226f"
+    "revision": "c5bb1659385a9a82af63f07d3a1bb321e1de75e4"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From c911f19d91079954affd34934fd0d4d1107c477f Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 12 May 2024 18:23:41 -0700
Subject: [PATCH 1548/2704] feat(scala): add some missing highlights

---
 queries/scala/highlights.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index ffecefaf4..5f3936d2f 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -120,6 +120,9 @@
 (binding
   name: (identifier) @variable.parameter)
 
+(lambda_expression
+  parameters: (identifier) @variable.parameter)
+
 ; expressions
 (field_expression
   field: (identifier) @variable.member)
@@ -177,7 +180,6 @@
   ; `macro` not implemented yet
   "object"
   "override"
-  "package"
   "val"
   "var"
   "with"
@@ -211,6 +213,8 @@
 
 (wildcard) @variable.parameter
 
+(namespace_wildcard) @punctuation.special
+
 (annotation) @attribute
 
 ; special keywords
@@ -235,6 +239,7 @@
 [
   "."
   ","
+  ":"
 ] @punctuation.delimiter
 
 [
@@ -248,6 +253,9 @@
 
 [
   "=>"
+  "?=>"
+  "="
+  "!"
   "<-"
   "@"
 ] @operator
@@ -255,6 +263,7 @@
 [
   "import"
   "export"
+  "package"
 ] @keyword.import
 
 [
@@ -278,6 +287,10 @@
   (case_clause
     "case" @keyword.conditional))
 
+(case_block
+  (case_clause
+    "=>" @punctuation.delimiter))
+
 (operator_identifier) @operator
 
 ((identifier) @type

From 4d112977c706034370a7fed65f7c957ec268eaa2 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 13 May 2024 15:42:09 -0700
Subject: [PATCH 1549/2704] feat(corn): more highlights, comment injections

---
 queries/corn/highlights.scm | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/queries/corn/highlights.scm b/queries/corn/highlights.scm
index 029291462..8f394ed79 100644
--- a/queries/corn/highlights.scm
+++ b/queries/corn/highlights.scm
@@ -1,6 +1,7 @@
-"let" @keyword
-
-"in" @keyword
+[
+  "let"
+  "in"
+] @keyword
 
 [
   "{"
@@ -11,8 +12,15 @@
 
 "." @punctuation.delimiter
 
+[
+  ".."
+  "="
+] @operator
+
 (input) @constant
 
+(null) @constant.builtin
+
 (comment) @comment @spell
 
 (string) @string
@@ -21,6 +29,9 @@
 
 (float) @number.float
 
+(float
+  "." @number.float)
+
 (boolean) @boolean
 
-(null) @keyword
+(path_seg) @property

From 71a8e8b4b6ebab39765615334d4241a18090a651 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 16 Jun 2024 06:39:09 +0000
Subject: [PATCH 1550/2704] bot(lockfile): update earthfile, hyprlang,
 janet_simple, svelte, twig, v

---
 lockfile.json                   | 12 ++++++------
 lua/nvim-treesitter/parsers.lua |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a0be2ec7f..65c40c629 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "b2672286174c078eb80cdffc61375d0364e7fafb"
+    "revision": "1a4ec8431bf6c8d77dc00f75f57eacde3ed6826f"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -315,7 +315,7 @@
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
   },
   "hyprlang": {
-    "revision": "088bcd4052de1b9b5d051dffc3d76e658f295a50"
+    "revision": "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"
   },
   "idl": {
     "revision": "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"
@@ -330,7 +330,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "6bfbaadac2ba0da21087041eff85d26129c4c920"
+    "revision": "b5ce47537b47c408d83440efed44a10c9ba28c34"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -690,7 +690,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"
+    "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
   },
   "swift": {
     "revision": "13ffaec4068facfff608e3afbdb7a581c185f6a6"
@@ -753,7 +753,7 @@
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
   },
   "twig": {
-    "revision": "eaf80e6af969e25993576477a9dbdba3e48c1305"
+    "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
     "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
@@ -783,7 +783,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "c5bb1659385a9a82af63f07d3a1bb321e1de75e4"
+    "revision": "e91f8a42de7842f24f4ce600754f2b6651985fd4"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 314f1e4af..da2b2f6fa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -454,7 +454,7 @@ list.dtd = {
 list.earthfile = {
   install_info = {
     url = "https://github.com/glehmann/tree-sitter-earthfile",
-    files = { "src/parser.c", "src/scanner.c" },
+    files = { "src/parser.c" },
   },
   maintainers = { "@glehmann" },
 }

From 382c80b5759e909ff22b0e8ceab1f68564e38971 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 06:41:16 +0000
Subject: [PATCH 1551/2704] bot(lockfile): update corn, earthfile, hcl,
 janet_simple, rbs

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 65c40c629..a2e6c928f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -81,7 +81,7 @@
     "revision": "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"
   },
   "corn": {
-    "revision": "604d73c38d4c28ca68e9e441ffd405d68cb63051"
+    "revision": "464654742cbfd3a3de560aba120998f1d5dfa844"
   },
   "cpon": {
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "1a4ec8431bf6c8d77dc00f75f57eacde3ed6826f"
+    "revision": "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -279,7 +279,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
+    "revision": "e2d416afeba80e8cf711ed6792e089ed5c8e184e"
   },
   "heex": {
     "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
@@ -330,7 +330,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "b5ce47537b47c408d83440efed44a10c9ba28c34"
+    "revision": "2a05cab838dfec52daa76f10920917d2e69a85bc"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -585,7 +585,7 @@
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
   "rbs": {
-    "revision": "e5e807a50fcd104a2d740d354632fc671700a0bf"
+    "revision": "88d8ed487b5449ddda2fc0c4fe23b71cba29ca24"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"

From f7edd3f5f636dceebc874a59bdcf9de6a41dbc68 Mon Sep 17 00:00:00 2001
From: Jannik Buhr <17450586+jmbuhr@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:04:00 +0200
Subject: [PATCH 1552/2704] fix(markdown): conceal nbsp entity as space (#6778)

---
 queries/markdown_inline/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 0afb0d983..10bb5b060 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -93,7 +93,7 @@
 ; Replace common HTML entities.
 ((entity_reference) @character.special
   (#eq? @character.special "&nbsp;")
-  (#set! conceal ""))
+  (#set! conceal " "))
 
 ((entity_reference) @character.special
   (#eq? @character.special "&lt;")

From 09953e394b202877b82aa2688a140bdd75afaf2a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 17 Jun 2024 15:23:06 +0100
Subject: [PATCH 1553/2704] fix(gleam): remove incorrect builtin highlight
 (#6757)

---
 queries/gleam/highlights.scm                |  3 ---
 tests/query/highlights/gleam/function.gleam | 16 ++++++++--------
 tests/query/highlights/gleam/type.gleam     |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index 8754f3ed6..9daf9b8b2 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -147,9 +147,6 @@
   (type_var)
 ] @type
 
-((type_identifier) @type.builtin
-  (#any-of? @type.builtin "Int" "Float" "String" "List"))
-
 ; Type Qualifiers
 [
   "const"
diff --git a/tests/query/highlights/gleam/function.gleam b/tests/query/highlights/gleam/function.gleam
index f1924aaf9..15fc5cc7e 100644
--- a/tests/query/highlights/gleam/function.gleam
+++ b/tests/query/highlights/gleam/function.gleam
@@ -5,14 +5,14 @@ pub fn add(x: Int, y: Int) -> Int {
 //        ^ @punctuation.bracket
 //         ^ @variable.parameter
 //          ^ @punctuation.delimiter
-//            ^^^ @type.builtin
+//            ^^^ @type
 //               ^ @punctuation.delimiter
 //                 ^ @variable.parameter
 //                  ^ @punctuation.delimiter
-//                    ^^^ @type.builtin
+//                    ^^^ @type
 //                       ^ @punctuation.bracket
 //                         ^ @punctuation.delimiter
-//                            ^^^ @type.builtin
+//                            ^^^ @type
 //                                ^ @punctuation.bracket
 }
 // <- @punctuation.bracket
@@ -50,7 +50,7 @@ fn list_of_two(my_value: a) -> List(a) {
 //                       ^ @type
 //                        ^ @punctuation.bracket
 //                          ^ @punctuation.delimiter
-//                             ^^^^ @type.builtin
+//                             ^^^^ @type
 //                                 ^ @punctuation.bracket
 //                                  ^ @type
 //                                   ^ @punctuation.bracket
@@ -66,19 +66,19 @@ fn replace(
   // <- @label
   // ^^^^^^ @variable.parameter
   //       ^ @punctuation.delimiter
-  //         ^^^^^^ @type.builtin
+  //         ^^^^^^ @type
   //               ^ @punctuation.delimiter
   each pattern: String,
   // <- @label
   //   ^^^^^^^ @variable.parameter
   //          ^ @punctuation.delimiter
-  //            ^^^^^^ @type.builtin
+  //            ^^^^^^ @type
   //                  ^ @punctuation.delimiter
   with replacement: String,
   // <- @label
   //   ^^^^^^^^^^^ @variable.parameter
   //              ^ @punctuation.delimiter
-  //                ^^^^^^ @type.builtin
+  //                ^^^^^^ @type
   //                      ^ @punctuation.delimiter
 ) {
   replace(in: "A,B,C", each: ",", with: " ")
@@ -107,7 +107,7 @@ pub external fn random_float() -> Float = "rand" "uniform"
 //                          ^ @punctuation.bracket
 //                           ^ @punctuation.bracket
 //                             ^^ @punctuation.delimiter
-//                                ^^^^^ @type.builtin
+//                                ^^^^^ @type
 //                                      ^ @operator
 //                                        ^^^^^^ @module
 //                                               ^^^^^^^^^ @function
diff --git a/tests/query/highlights/gleam/type.gleam b/tests/query/highlights/gleam/type.gleam
index 8ee82419e..de0f9c4af 100644
--- a/tests/query/highlights/gleam/type.gleam
+++ b/tests/query/highlights/gleam/type.gleam
@@ -8,11 +8,11 @@ pub type Cat {
   // ^ @punctuation.bracket
   //  ^^^^ @variable.member
   //      ^ @punctuation.delimiter
-  //        ^^^^^^ @type.builtin
+  //        ^^^^^^ @type
   //              ^ @punctuation.delimiter
   //                ^^^^^^^^ @variable.member
   //                        ^ @punctuation.delimiter
-  //                          ^^^ @type.builtin
+  //                          ^^^ @type
   //                             ^ @punctuation.bracket
 }
 

From c29989f5d735a30b6d2350b54d5cd50be811f8b2 Mon Sep 17 00:00:00 2001
From: Sarath Addanki <1752644+asknet@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:29:06 -0400
Subject: [PATCH 1554/2704] apex: highlights: change the constant variable
 order to recognize it (#6779)

---
 queries/apex/highlights.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 85453b227..15b016552 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -152,6 +152,9 @@
   field: (identifier) @variable.member)
 
 ; Variables
+(variable_declarator
+  (identifier) @property)
+
 (field_declaration
   (modifiers
     (modifier
@@ -167,9 +170,6 @@
   (variable_declarator
     name: (identifier) @constant))
 
-(variable_declarator
-  (identifier) @property)
-
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z0-9_]+$")) ; SCREAM SNAKE CASE
 

From 2e9c346aefda680bd14ebf40a50c2897fd637bc2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 06:39:35 +0000
Subject: [PATCH 1555/2704] bot(lockfile): update cpp, hcl, swift, terraform

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a2e6c928f..4f257062c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "9d412ba7e597fe158f209da33e60f31b1f0df967"
+    "revision": "7ce8946cae4bb25adebe5b50394f702beb007026"
   },
   "css": {
     "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
@@ -279,7 +279,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "e2d416afeba80e8cf711ed6792e089ed5c8e184e"
+    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
   },
   "heex": {
     "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
@@ -693,7 +693,7 @@
     "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
   },
   "swift": {
-    "revision": "13ffaec4068facfff608e3afbdb7a581c185f6a6"
+    "revision": "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -720,7 +720,7 @@
     "revision": "cf84ea53e2e2531f23009d676ac206090c1e2392"
   },
   "terraform": {
-    "revision": "e936d3fef8bac884661472dce71ad82284761eb1"
+    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
   },
   "textproto": {
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"

From 4bbd2e72f877ce6835c8ccc1b588ed465446c6ab Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 17 Jun 2024 20:12:16 -0700
Subject: [PATCH 1556/2704] fix(cooklang): add some missing highlights

---
 queries/cooklang/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/cooklang/highlights.scm b/queries/cooklang/highlights.scm
index 21aba3ce8..4ac391899 100644
--- a/queries/cooklang/highlights.scm
+++ b/queries/cooklang/highlights.scm
@@ -2,6 +2,13 @@
 
 (comment) @comment @spell
 
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
+"%" @punctuation.special
+
 (ingredient
   "@" @punctuation.delimiter
   (name)? @string.special.symbol

From 53881422f600b7837b55d06e7d426bc875bccb90 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 06:39:12 +0000
Subject: [PATCH 1557/2704] bot(lockfile): update djot, tsx, typescript

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4f257062c..7512cbe7b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -120,7 +120,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "ea851b9cf1a71e475f4e2ac4dc03609a1b9ca56d"
+    "revision": "87bf82874c86dcf563f5521069d603ed50e5f0cc"
   },
   "dockerfile": {
     "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"
@@ -747,7 +747,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
+    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
   },
   "turtle": {
     "revision": "085437f5cb117703b7f520dd92161140a684f092"
@@ -756,7 +756,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "4ad3010c91d700026d036b5230e2d99ba94ae8a4"
+    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
   },
   "typespec": {
     "revision": "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"

From 66ae8748fd4e8550c8b17cf115c9739aea1e4067 Mon Sep 17 00:00:00 2001
From: sogaiu <33044872+sogaiu@users.noreply.github.com>
Date: Wed, 19 Jun 2024 22:27:34 +0900
Subject: [PATCH 1558/2704] feat(janet): update highlights (#6789)

Co-authored-by: sogaiu <983021772@users.noreply.github.com>
---
 queries/janet_simple/highlights.scm | 156 ++++++++++++++--------------
 1 file changed, 80 insertions(+), 76 deletions(-)

diff --git a/queries/janet_simple/highlights.scm b/queries/janet_simple/highlights.scm
index 179b4fefa..552f865c6 100644
--- a/queries/janet_simple/highlights.scm
+++ b/queries/janet_simple/highlights.scm
@@ -75,13 +75,14 @@
     "%=" "*=" "++" "+=" "--" "-=" "->" "->>" "-?>" "-?>>" "/=" "and" "as->" "as-macro" "as?->"
     "assert" "case" "catseq" "chr" "comment" "compif" "comptime" "compwhen" "cond" "coro" "def-"
     "default" "defdyn" "defer" "defmacro" "defmacro-" "defn" "defn-" "delay" "doc" "each" "eachk"
-    "eachp" "eachy"
-    ; XXX: obsolete
-    "edefer" "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread" "ev/with-deadline"
-    "ffi/defbind" "fiber-fn" "for" "forever" "forv" "generate" "if-let" "if-not" "if-with" "import"
-    "juxt" "label" "let" "loop" "match" "or" "prompt" "protect" "repeat" "seq" "short-fn" "tabseq"
-    "toggle" "tracev" "try" "unless" "use" "var-" "varfn" "when" "when-let" "when-with" "with"
-    "with-dyns" "with-syms" "with-vars"))
+    "eachp" "edefer" "ev/do-thread" "ev/gather" "ev/spawn" "ev/spawn-thread" "ev/with-deadline"
+    "ev/with-lock" "ev/with-rlock" "ev/with-wlock" "ffi/defbind" "ffi/defbind-alias" "fiber-fn"
+    "for" "forever" "forv" "generate" "if-let" "if-not" "if-with" "import" "juxt" "label" "let"
+    "loop" "match" "or" "prompt" "protect" "repeat" "seq" "short-fn" "tabseq" "toggle" "tracev"
+    "try" "unless" "use" "var-" "varfn" "when" "when-let" "when-with" "with" "with-dyns" "with-env"
+    "with-syms" "with-vars"
+    ; obsolete builtin macros
+    "eachy"))
 
 ; All builtin functions
 ;
@@ -101,74 +102,77 @@
     "abstract?" "accumulate" "accumulate2" "all" "all-bindings" "all-dynamics" "any?" "apply"
     "array" "array/clear" "array/concat" "array/ensure" "array/fill" "array/insert" "array/new"
     "array/new-filled" "array/peek" "array/pop" "array/push" "array/remove" "array/slice"
-    "array/trim" "array?" "asm" "bad-compile" "bad-parse" "band" "blshift" "bnot" "boolean?" "bor"
-    "brshift" "brushift" "buffer" "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
-    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill" "buffer/format" "buffer/new"
-    "buffer/new-filled" "buffer/popn" "buffer/push" "buffer/push-at" "buffer/push-byte"
-    "buffer/push-string" "buffer/push-word" "buffer/slice" "buffer/trim" "buffer?" "bxor" "bytes?"
-    "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare" "compare<" "compare<=" "compare="
-    "compare>" "compare>=" "compile" "complement" "count" "curenv" "debug" "debug/arg-stack"
-    "debug/break" "debug/fbreak" "debug/lineage" "debug/stack" "debug/stacktrace" "debug/step"
-    "debug/unbreak" "debug/unfbreak" "debugger" "debugger-on-status" "dec" "deep-not=" "deep="
-    "defglobal" "describe" "dictionary?" "disasm" "distinct" "div" "doc*" "doc-format" "doc-of"
-    "dofile" "drop" "drop-until" "drop-while" "dyn" "eflush" "empty?" "env-lookup" "eprin" "eprinf"
-    "eprint" "eprintf" "error" "errorf" "ev/acquire-lock" "ev/acquire-rlock" "ev/acquire-wlock"
-    "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan" "ev/chan-close" "ev/chunk"
-    "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give" "ev/give-supervisor" "ev/go" "ev/lock"
-    "ev/read" "ev/release-lock" "ev/release-rlock" "ev/release-wlock" "ev/rselect" "ev/rwlock"
-    "ev/select" "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write" "eval" "eval-string"
-    "even?" "every?" "extreme" "false?" "ffi/align" "ffi/call" "ffi/calling-convetions" "ffi/close"
-    "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup" "ffi/malloc" "ffi/native" "ffi/pointer-buffer"
-    "ffi/pointer-cfunction" "ffi/read" "ffi/signature" "ffi/size" "ffi/struct" "ffi/trampoline"
-    "ffi/write" "fiber/can-resume?" "fiber/current" "fiber/getenv" "fiber/last-value"
-    "fiber/maxstack" "fiber/new" "fiber/root" "fiber/setenv" "fiber/setmaxstack" "fiber/status"
-    "fiber?" "file/close" "file/flush" "file/lines" "file/open" "file/read" "file/seek" "file/tell"
-    "file/temp" "file/write" "filter" "find" "find-index" "first" "flatten" "flatten-into" "flush"
-    "flycheck" "freeze" "frequencies" "from-pairs" "function?" "gccollect" "gcinterval"
-    "gcsetinterval" "gensym" "get" "get-in" "getline" "getproto" "group-by" "has-key?" "has-value?"
-    "hash" "idempotent?" "identity" "import*" "in" "inc" "index-of" "indexed?" "int/s64"
-    "int/to-bytes" "int/to-number" "int/u64" "int?" "interleave" "interpose" "invert" "juxt*" "keep"
-    "keep-syntax" "keep-syntax!" "keys" "keyword" "keyword/slice" "keyword?" "kvs" "last" "length"
-    "load-image" "macex" "macex1" "maclintf" "make-env" "make-image" "map" "mapcat" "marshal"
-    "math/abs" "math/acos" "math/acosh" "math/asin" "math/asinh" "math/atan" "math/atan2"
-    "math/atanh" "math/cbrt" "math/ceil" "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp"
-    "math/exp2" "math/expm1" "math/floor" "math/gamma" "math/gcd" "math/hypot" "math/lcm" "math/log"
-    "math/log-gamma" "math/log10" "math/log1p" "math/log2" "math/next" "math/pow" "math/random"
-    "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform" "math/round" "math/seedrandom"
-    "math/sin" "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc" "max" "max-of" "mean"
-    "memcmp" "merge" "merge-into" "merge-module" "min" "min-of" "mod" "module/add-paths"
-    "module/expand-path" "module/find" "module/value" "nan?" "nat?" "native" "neg?" "net/accept"
-    "net/accept-loop" "net/address" "net/address-unpack" "net/chunk" "net/close" "net/connect"
-    "net/flush" "net/listen" "net/localname" "net/peername" "net/read" "net/recv-from" "net/send-to"
-    "net/server" "net/setsockopt" "net/shutdown" "net/write" "next" "nil?" "not" "not=" "number?"
-    "odd?" "one?" "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler" "os/cpu-count"
-    "os/cryptorand" "os/cwd" "os/date" "os/dir" "os/environ" "os/execute" "os/exit" "os/getenv"
-    "os/link" "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int" "os/perm-string" "os/pipe"
-    "os/proc-close" "os/proc-kill" "os/proc-wait" "os/readlink" "os/realpath" "os/rename" "os/rm"
-    "os/rmdir" "os/setenv" "os/shell" "os/sleep" "os/spawn" "os/stat" "os/symlink" "os/time"
-    "os/touch" "os/umask" "os/which" "pairs" "parse" "parse-all" "parser/byte" "parser/clone"
-    "parser/consume" "parser/eof" "parser/error" "parser/flush" "parser/has-more" "parser/insert"
-    "parser/new" "parser/produce" "parser/state" "parser/status" "parser/where" "partial"
-    "partition" "partition-by" "peg/compile" "peg/find" "peg/find-all" "peg/match" "peg/replace"
-    "peg/replace-all" "pos?" "postwalk" "pp" "prewalk" "prin" "prinf" "print" "printf" "product"
-    "propagate" "put" "put-in" "quit" "range" "reduce" "reduce2" "repl" "require" "resume" "return"
-    "reverse" "reverse!" "run-context" "sandbox" "scan-number" "setdyn" "signal" "slice" "slurp"
-    "some" "sort" "sort-by" "sorted" "sorted-by" "spit" "string" "string/ascii-lower"
-    "string/ascii-upper" "string/bytes" "string/check-set" "string/find" "string/find-all"
-    "string/format" "string/from-bytes" "string/has-prefix?" "string/has-suffix?" "string/join"
-    "string/repeat" "string/replace" "string/replace-all" "string/reverse" "string/slice"
-    "string/split" "string/trim" "string/triml" "string/trimr" "string?" "struct" "struct/getproto"
-    "struct/proto-flatten" "struct/to-table" "struct/with-proto" "struct?" "sum" "symbol"
-    "symbol/slice" "symbol?" "table" "table/clear" "table/clone" "table/getproto" "table/new"
-    "table/proto-flatten" "table/rawget" "table/setproto" "table/to-struct" "table?" "take"
-    "take-until" "take-while"
+    "array/trim" "array/weak" "array?" "asm" "bad-compile" "bad-parse" "band" "blshift" "bnot"
+    "boolean?" "bor" "brshift" "brushift" "buffer" "buffer/bit" "buffer/bit-clear" "buffer/bit-set"
+    "buffer/bit-toggle" "buffer/blit" "buffer/clear" "buffer/fill" "buffer/format"
+    "buffer/format-at" "buffer/from-bytes" "buffer/new" "buffer/new-filled" "buffer/popn"
+    "buffer/push" "buffer/push-at" "buffer/push-byte" "buffer/push-float32" "buffer/push-float64"
+    "buffer/push-string" "buffer/push-uint16" "buffer/push-uint32" "buffer/push-uint64"
+    "buffer/push-word" "buffer/slice" "buffer/trim" "buffer?" "bundle/add" "bundle/add-directory"
+    "bundle/add-file" "bundle/install" "bundle/installed?" "bundle/list" "bundle/manifest"
+    "bundle/prune" "bundle/reinstall" "bundle/topolist" "bundle/uninstall" "bundle/update-all"
+    "bxor" "bytes?" "cancel" "cfunction?" "cli-main" "cmp" "comp" "compare" "compare<" "compare<="
+    "compare=" "compare>" "compare>=" "compile" "complement" "count" "curenv" "debug"
+    "debug/arg-stack" "debug/break" "debug/fbreak" "debug/lineage" "debug/stack" "debug/stacktrace"
+    "debug/step" "debug/unbreak" "debug/unfbreak" "debugger" "debugger-on-status" "dec" "deep-not="
+    "deep=" "defglobal" "describe" "dictionary?" "disasm" "distinct" "div" "doc*" "doc-format"
+    "doc-of" "dofile" "drop" "drop-until" "drop-while" "dyn" "eflush" "empty?" "env-lookup" "eprin"
+    "eprinf" "eprint" "eprintf" "error" "errorf" "ev/acquire-lock" "ev/acquire-rlock"
+    "ev/acquire-wlock" "ev/all-tasks" "ev/call" "ev/cancel" "ev/capacity" "ev/chan" "ev/chan-close"
+    "ev/chunk" "ev/close" "ev/count" "ev/deadline" "ev/full" "ev/give" "ev/give-supervisor" "ev/go"
+    "ev/lock" "ev/read" "ev/release-lock" "ev/release-rlock" "ev/release-wlock" "ev/rselect"
+    "ev/rwlock" "ev/select" "ev/sleep" "ev/take" "ev/thread" "ev/thread-chan" "ev/write" "eval"
+    "eval-string" "even?" "every?" "extreme" "false?" "ffi/align" "ffi/call"
+    "ffi/calling-conventions" "ffi/close" "ffi/context" "ffi/free" "ffi/jitfn" "ffi/lookup"
+    "ffi/malloc" "ffi/native" "ffi/pointer-buffer" "ffi/pointer-cfunction" "ffi/read"
+    "ffi/signature" "ffi/size" "ffi/struct" "ffi/trampoline" "ffi/write" "fiber/can-resume?"
+    "fiber/current" "fiber/getenv" "fiber/last-value" "fiber/maxstack" "fiber/new" "fiber/root"
+    "fiber/setenv" "fiber/setmaxstack" "fiber/status" "fiber?" "file/close" "file/flush"
+    "file/lines" "file/open" "file/read" "file/seek" "file/tell" "file/temp" "file/write" "filter"
+    "find" "find-index" "first" "flatten" "flatten-into" "flush" "flycheck" "freeze" "frequencies"
+    "from-pairs" "function?" "gccollect" "gcinterval" "gcsetinterval" "gensym" "get" "get-in"
+    "getline" "getproto" "group-by" "has-key?" "has-value?" "hash" "idempotent?" "identity"
+    "import*" "in" "inc" "index-of" "indexed?" "int/s64" "int/to-bytes" "int/to-number" "int/u64"
+    "int?" "interleave" "interpose" "invert" "juxt*" "keep" "keep-syntax" "keep-syntax!" "keys"
+    "keyword" "keyword/slice" "keyword?" "kvs" "last" "length" "lengthable?" "load-image" "macex"
+    "macex1" "maclintf" "make-env" "make-image" "map" "mapcat" "marshal" "math/abs" "math/acos"
+    "math/acosh" "math/asin" "math/asinh" "math/atan" "math/atan2" "math/atanh" "math/cbrt"
+    "math/ceil" "math/cos" "math/cosh" "math/erf" "math/erfc" "math/exp" "math/exp2" "math/expm1"
+    "math/floor" "math/frexp" "math/gamma" "math/gcd" "math/hypot" "math/lcm" "math/ldexp"
+    "math/log" "math/log-gamma" "math/log10" "math/log1p" "math/log2" "math/next" "math/pow"
+    "math/random" "math/rng" "math/rng-buffer" "math/rng-int" "math/rng-uniform" "math/round"
+    "math/seedrandom" "math/sin" "math/sinh" "math/sqrt" "math/tan" "math/tanh" "math/trunc" "max"
+    "max-of" "mean" "memcmp" "merge" "merge-into" "merge-module" "min" "min-of" "mod"
+    "module/add-paths" "module/expand-path" "module/find" "module/value" "nan?" "nat?" "native"
+    "neg?" "net/accept" "net/accept-loop" "net/address" "net/address-unpack" "net/chunk" "net/close"
+    "net/connect" "net/flush" "net/listen" "net/localname" "net/peername" "net/read" "net/recv-from"
+    "net/send-to" "net/server" "net/setsockopt" "net/shutdown" "net/write" "next" "nil?" "not"
+    "not=" "number?" "odd?" "one?" "os/arch" "os/cd" "os/chmod" "os/clock" "os/compiler"
+    "os/cpu-count" "os/cryptorand" "os/cwd" "os/date" "os/dir" "os/environ" "os/execute" "os/exit"
+    "os/getenv" "os/isatty" "os/link" "os/lstat" "os/mkdir" "os/mktime" "os/open" "os/perm-int"
+    "os/perm-string" "os/pipe" "os/posix-exec" "os/posix-fork" "os/proc-close" "os/proc-kill"
+    "os/proc-wait" "os/readlink" "os/realpath" "os/rename" "os/rm" "os/rmdir" "os/setenv"
+    "os/setlocale" "os/shell" "os/sigaction" "os/sleep" "os/spawn" "os/stat" "os/strftime"
+    "os/symlink" "os/time" "os/touch" "os/umask" "os/which" "pairs" "parse" "parse-all"
+    "parser/byte" "parser/clone" "parser/consume" "parser/eof" "parser/error" "parser/flush"
+    "parser/has-more" "parser/insert" "parser/new" "parser/produce" "parser/state" "parser/status"
+    "parser/where" "partial" "partition" "partition-by" "peg/compile" "peg/find" "peg/find-all"
+    "peg/match" "peg/replace" "peg/replace-all" "pos?" "postwalk" "pp" "prewalk" "prin" "prinf"
+    "print" "printf" "product" "propagate" "put" "put-in" "quit" "range" "reduce" "reduce2" "repl"
+    "require" "resume" "return" "reverse" "reverse!" "run-context" "sandbox" "scan-number" "setdyn"
+    "signal" "slice" "slurp" "some" "sort" "sort-by" "sorted" "sorted-by" "spit" "string"
+    "string/ascii-lower" "string/ascii-upper" "string/bytes" "string/check-set" "string/find"
+    "string/find-all" "string/format" "string/from-bytes" "string/has-prefix?" "string/has-suffix?"
+    "string/join" "string/repeat" "string/replace" "string/replace-all" "string/reverse"
+    "string/slice" "string/split" "string/trim" "string/triml" "string/trimr" "string?" "struct"
+    "struct/getproto" "struct/proto-flatten" "struct/to-table" "struct/with-proto" "struct?" "sum"
+    "symbol" "symbol/slice" "symbol?" "table" "table/clear" "table/clone" "table/getproto"
+    "table/new" "table/proto-flatten" "table/rawget" "table/setproto" "table/to-struct" "table/weak"
+    "table/weak-keys" "table/weak-values" "table?" "take" "take-until" "take-while" "thaw" "trace"
+    "true?" "truthy?" "tuple" "tuple/brackets" "tuple/setmap" "tuple/slice" "tuple/sourcemap"
+    "tuple/type" "tuple?" "type" "unmarshal" "untrace" "update" "update-in" "values" "varglobal"
+    "walk" "warn-compile" "xprin" "xprinf" "xprint" "xprintf" "yield" "zero?" "zipcoll"
     ; XXX: obsolete
     "tarray/buffer" "tarray/copy-bytes" "tarray/length" "tarray/new" "tarray/properties"
-    "tarray/slice" "tarray/swap-bytes"
-    ; XXX: obsolete
-    "thread/close" "thread/current" "thread/exit" "thread/new" "thread/receive" "thread/send"
-    ; end of obsolete
-    "trace" "true?" "truthy?" "tuple" "tuple/brackets" "tuple/setmap" "tuple/slice"
-    "tuple/sourcemap" "tuple/type" "tuple?" "type" "unmarshal" "untrace" "update" "update-in"
-    "values" "varglobal" "walk" "warn-compile" "xprin" "xprinf" "xprint" "xprintf" "yield" "zero?"
-    "zipcoll"))
+    "tarray/slice" "tarray/swap-bytes" "thread/close" "thread/current" "thread/exit" "thread/new"
+    "thread/receive" "thread/send"))

From 7b04b398f868563cac37ae90baffd7c3dca513fe Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2024 06:39:18 +0000
Subject: [PATCH 1559/2704] bot(lockfile): update cmake, earthfile, idl, mlir

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7512cbe7b..f15ddc28f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "4864abb95a1f6e54d6b362677beef9fb674b41e9"
+    "revision": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"
   },
   "comment": {
     "revision": "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"
@@ -135,7 +135,7 @@
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
   },
   "earthfile": {
-    "revision": "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"
+    "revision": "5a864159ff728b6d4f7d0aab3723f85a467d180f"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -318,7 +318,7 @@
     "revision": "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"
   },
   "idl": {
-    "revision": "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"
+    "revision": "6aa57adb5f6d14ea768d5d1b3d8a3fae11e6b97f"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -438,7 +438,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "00c32d8562dc957b187da110a3443307962b8da8"
+    "revision": "268bc99020f7ba7a219f839e3a6a31c36ad0826b"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"

From b967bbc27b564001c3d3b8ea93444cf6d0b21d23 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 06:40:33 +0000
Subject: [PATCH 1560/2704] bot(lockfile): update roc, ruby

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f15ddc28f..b9851c0ba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -609,7 +609,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "df46a85abda9f948d38f5d4e3684cec49c42fef2"
+    "revision": "a662513450e163dc2056603b1f426b4787aac0fd"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
@@ -618,7 +618,7 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b"
+    "revision": "0ffe457fb6aabf064f173fd30ea356845cef2513"
   },
   "rust": {
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"

From 122b4d3db1616c1f1305b847c5ed2217c4c329f1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 22 Jun 2024 06:37:39 +0000
Subject: [PATCH 1561/2704] bot(lockfile): update erlang, janet_simple, nix

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b9851c0ba..561d4135f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -162,7 +162,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"
+    "revision": "54cecce7454bab1e1c92d6fdeeb2e34625684397"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -330,7 +330,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "2a05cab838dfec52daa76f10920917d2e69a85bc"
+    "revision": "4e23a9ef6ec8769bc4063f0fdb049b4d564ea6bc"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -459,7 +459,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "b3cda619248e7dd0f216088bd152f59ce0bbe488"
+    "revision": "0fdada10f1f845ca9116e279ad8f5d0ca93e9949"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"

From a8904e7f833e9302232484986c5807f9b8aa43fb Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 06:38:04 +0000
Subject: [PATCH 1562/2704] bot(lockfile): update cuda, glsl, hlsl,
 janet_simple, latex, scala, slang, wgsl_bevy

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 561d4135f..186eba574 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"
+    "revision": "b93070b5a91ee9537d45e59d741737b1289c5dcc"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -228,7 +228,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "7f91bf34cadc06a96efc475df501ffca4dda9410"
+    "revision": "3736dfc811c07fa749ca818f94c9a3977734dd26"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -291,7 +291,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "5e1225a30712ca0a9040509806c7ba274a1bbcde"
+    "revision": "80517ca13317fb8591503c0d99f2ad76e8979a72"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -330,7 +330,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "4e23a9ef6ec8769bc4063f0fdb049b4d564ea6bc"
+    "revision": "6eb1525872013f58c64b0526ac9d64174f7136f1"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -381,7 +381,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"
+    "revision": "5a1b4165add2dd705e0a460e5ac12d5baa35a354"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -624,7 +624,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "b76db435a7f876cf1ede837d66054c534783c72f"
+    "revision": "5bce09bdd9d3dda5af5f4c67ca5e9bcbc7c44be2"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -636,7 +636,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "865d79e236c7f0e04276c969453d021d1da4b15f"
+    "revision": "ea77a4d91dd93f4483965efcc41f3faebb9131c8"
   },
   "slint": {
     "revision": "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"
@@ -810,7 +810,7 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "1e12c7925c41bb09818d86e30cd78644fde7d31a"
+    "revision": "0f06f24e259ac725045956436b9025dab008ff9f"
   },
   "wing": {
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"

From 9581d86f97fce43f2302895673cf9cac4c6f7045 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 17 Jun 2024 18:19:08 -0700
Subject: [PATCH 1563/2704] fix(verilog): various touch-ups

---
 queries/verilog/highlights.scm | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index e5393ac52..69363d64b 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -22,7 +22,6 @@
   "localparam"
   "defparam"
   "assign"
-  "typedef"
   "modport"
   "fork"
   "join"
@@ -44,6 +43,7 @@
   "enum"
   "struct"
   "union"
+  "typedef"
 ] @keyword.type
 
 [
@@ -96,9 +96,6 @@
   (package_identifier
     (simple_identifier) @constant))
 
-(parameter_port_list
-  "#" @constructor)
-
 [
   "="
   "-"
@@ -110,12 +107,9 @@
   "|"
   "&&"
   "||"
-  ":"
-  "{"
-  "}"
-  "'{"
   "<="
   "@"
+  "@*"
   "=="
   "!="
   "==="
@@ -130,8 +124,12 @@
   "|="
   (unary_operator)
   (inc_or_dec_operator)
+  "#"
 ] @operator
 
+(parameter_port_list
+  "#" @constructor)
+
 [
   "or"
   "and"
@@ -160,6 +158,8 @@
 [
   "signed"
   "unsigned"
+  "input"
+  "output"
 ] @keyword.modifier
 
 (data_type
@@ -197,10 +197,17 @@
 [
   ";"
   "::"
+  ":"
   ","
   "."
 ] @punctuation.delimiter
 
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
 (default_nettype_compiler_directive
   (default_nettype_value) @string)
 
@@ -223,7 +230,7 @@
   (unbased_unsized_literal)
 ] @number
 
-(time_unit) @attribute
+(time_unit) @type.builtin
 
 (checker_instantiation
   (checker_identifier
@@ -307,4 +314,7 @@
   "]"
   "("
   ")"
+  "{"
+  "}"
+  "'{"
 ] @punctuation.bracket

From 55d5772a6c514bd19cd4587352799b0783798c04 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 22 Jun 2024 12:37:41 +0200
Subject: [PATCH 1564/2704] feat(latex): highlight hyperlinks

---
 queries/latex/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 3fa25f3f5..94206162a 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -39,6 +39,8 @@
   "}"
 ] @punctuation.bracket ; "(" ")" has no syntactical meaning in LaTeX
 
+(hyperlink) @string.special.url @nospell
+
 ; General environments
 (begin
   command: _ @module

From c233773abf17cd6bbf7720718faa140f04c7838e Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Sun, 23 Jun 2024 15:41:48 +0200
Subject: [PATCH 1565/2704] feat(latex): improve hyperlinks

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 lockfile.json                |  2 +-
 queries/latex/highlights.scm | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 186eba574..d21eec282 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -381,7 +381,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "5a1b4165add2dd705e0a460e5ac12d5baa35a354"
+    "revision": "1218adae6179fd49ec9945b00bd3211866acc119"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 94206162a..3831069ff 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -39,8 +39,6 @@
   "}"
 ] @punctuation.bracket ; "(" ")" has no syntactical meaning in LaTeX
 
-(hyperlink) @string.special.url @nospell
-
 ; General environments
 (begin
   command: _ @module
@@ -254,12 +252,10 @@
     (_) @markup.strong))
   (#any-of? @_name "\\textbf" "\\mathbf"))
 
-((generic_command
-  command: (command_name) @_name
-  .
-  arg: (curly_group
-    (_) @markup.link.url))
-  (#any-of? @_name "\\url" "\\href"))
+(hyperlink
+  command: _ @function @nospell
+  uri: (curly_group_uri
+    (_) @markup.link.url @nospell))
 
 ; File inclusion commands
 (class_include

From 0941c1147a1c8d7f9c8f712a9856412db3fbc560 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 23 Jun 2024 17:48:31 +0200
Subject: [PATCH 1566/2704] fix(latex): correct lockfile hash

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index d21eec282..6914eba51 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -381,7 +381,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "1218adae6179fd49ec9945b00bd3211866acc119"
+    "revision": "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"

From b5b64ac9fb544421250f6c581c0e43c886f3f7fa Mon Sep 17 00:00:00 2001
From: zhangwwpeng <133727312+zhangwwpeng@users.noreply.github.com>
Date: Mon, 24 Jun 2024 00:36:01 +0800
Subject: [PATCH 1567/2704] feat: add systemverilog support (#6775)

---
 README.md                            |   1 +
 lockfile.json                        |   3 +
 lua/nvim-treesitter/parsers.lua      |   9 +-
 queries/systemverilog/folds.scm      |  23 ++
 queries/systemverilog/highlights.scm | 595 +++++++++++++++++++++++++++
 queries/systemverilog/injections.scm |   5 +
 6 files changed, 635 insertions(+), 1 deletion(-)
 create mode 100644 queries/systemverilog/folds.scm
 create mode 100644 queries/systemverilog/highlights.scm
 create mode 100644 queries/systemverilog/injections.scm

diff --git a/README.md b/README.md
index 51ced3a25..2b9f91cf5 100644
--- a/README.md
+++ b/README.md
@@ -407,6 +407,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
+- [x] [systemverilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
 - [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [tact](https://github.com/tact-lang/tree-sitter-tact) (maintained by @novusnota)
diff --git a/lockfile.json b/lockfile.json
index 6914eba51..a3ea9cba1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -701,6 +701,9 @@
   "systemtap": {
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
+  "systemverilog": {
+    "revision": "7dc4904578a29315c64f0f6500920baff41cc3af"
+  },
   "t32": {
     "revision": "6182836f4128725f1e74ce986840d7317021a015"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index da2b2f6fa..16a425168 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -34,7 +34,6 @@ for ft, lang in pairs {
   html_tags = "html",
   ["typescript.tsx"] = "tsx",
   ["html.handlebars"] = "glimmer",
-  systemverilog = "verilog",
   pandoc = "markdown",
   rmd = "markdown",
   quarto = "markdown",
@@ -2040,6 +2039,14 @@ list.systemtap = {
   maintainers = { "@ok-ryoko" },
 }
 
+list.systemverilog = {
+  install_info = {
+    url = "https://github.com/zhangwwpeng/tree-sitter-systemverilog",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@zhangwwpeng" },
+}
+
 list.t32 = {
   install_info = {
     url = "https://gitlab.com/xasc/tree-sitter-t32.git",
diff --git a/queries/systemverilog/folds.scm b/queries/systemverilog/folds.scm
new file mode 100644
index 000000000..ea52476a4
--- /dev/null
+++ b/queries/systemverilog/folds.scm
@@ -0,0 +1,23 @@
+[
+  (seq_block)
+  (function_body_declaration)
+  (task_body_declaration)
+  (generate_block)
+  (always_construct)
+  (property_declaration)
+  (checker_declaration)
+  (class_declaration)
+  (config_declaration)
+  (covergroup_declaration)
+  (clocking_declaration)
+  (interface_declaration)
+  (module_declaration)
+  (package_declaration)
+  (module_instantiation)
+  (program_declaration)
+  (specify_block)
+  (generate_region)
+  (package_import_declaration)
+  (text_macro_definition)
+  (include_compiler_directive)+
+] @fold
diff --git a/queries/systemverilog/highlights.scm b/queries/systemverilog/highlights.scm
new file mode 100644
index 000000000..c8cff453f
--- /dev/null
+++ b/queries/systemverilog/highlights.scm
@@ -0,0 +1,595 @@
+; Keywords
+[
+  "begin"
+  "end"
+  "generate"
+  "endgenerate"
+  (module_keyword)
+  "endmodule"
+  "program"
+  "endprogram"
+  "package"
+  "endpackage"
+  "checker"
+  "endchecker"
+  "config"
+  "endconfig"
+  "pure"
+  "virtual"
+  "extends"
+  "implements"
+  "super"
+  (class_item_qualifier)
+  "parameter"
+  "localparam"
+  "defparam"
+  "assign"
+  "modport"
+  "fork"
+  "join"
+  "join_none"
+  "join_any"
+  "default"
+  "break"
+  "tagged"
+  "extern"
+  "alias"
+  "posedge"
+  "negedge"
+  "bind"
+  "expect"
+  "type"
+  "void"
+  "coverpoint"
+  "cross"
+  "nettype"
+  "export"
+  "force"
+  "release"
+  "timeunit"
+  "timeprecision"
+  "sequence"
+  "endsequence"
+  "property"
+  "endproperty"
+  "clocking"
+  "endclocking"
+  "covergroup"
+  "endgroup"
+  "specify"
+  "endspecify"
+  "primitive"
+  "endprimitive"
+  "wait"
+  "wait_order"
+  "const"
+  "constraint"
+  "unique"
+  "do"
+  "genvar"
+  "inside"
+  "rand"
+  "continue"
+  "randc"
+  "event"
+  "global"
+  "ref"
+  "initial"
+  (unique_priority)
+  (bins_keyword)
+  (always_keyword)
+] @keyword
+
+[
+  "class"
+  "endclass"
+  "interface"
+  "endinterface"
+  "enum"
+  "struct"
+  "union"
+  "typedef"
+] @keyword.type
+
+[
+  "function"
+  "endfunction"
+  "task"
+  "endtask"
+] @keyword.function
+
+"return" @keyword.return
+
+[
+  "for"
+  "foreach"
+  "repeat"
+  "forever"
+  "while"
+] @keyword.repeat
+
+; for
+(loop_generate_construct
+  (generate_block
+    [
+      "begin"
+      "end"
+    ] @keyword.conditional))
+
+; foreach
+(loop_statement
+  (statement
+    (statement_item
+      (seq_block
+        [
+          "begin"
+          "end"
+        ] @keyword.conditional))))
+
+; repeat forever while
+(loop_statement
+  (statement_or_null
+    (statement
+      (statement_item
+        (seq_block
+          [
+            "begin"
+            "end"
+          ] @keyword.conditional)))))
+
+[
+  "if"
+  "else"
+  "iff"
+  (case_keyword)
+  "endcase"
+] @keyword.conditional
+
+[
+  "="
+  "-"
+  "+"
+  "/"
+  "*"
+  "^"
+  "&"
+  "|"
+  "&&"
+  "||"
+  "<="
+  "=="
+  "!="
+  "==="
+  "!=="
+  "-:"
+  "<"
+  ">"
+  ">="
+  "%"
+  ">>"
+  "<<"
+  "|="
+  "|=>"
+  "|->"
+  ">>>"
+  "<<<"
+  "->>"
+  "->"
+  "=>"
+  "*>"
+  ".*"
+  (unary_operator)
+  (inc_or_dec_operator)
+  (queue_dimension)
+] @operator
+
+"#" @constructor
+
+[
+  ";"
+  "::"
+  ","
+  "."
+  ":"
+] @punctuation.delimiter
+
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+[
+  "["
+  "]"
+  "("
+  ")"
+  "{"
+  "}"
+  "'{"
+] @punctuation.bracket
+
+[
+  "or"
+  "and"
+] @keyword.operator
+
+[
+  "input"
+  "output"
+  "inout"
+  "signed"
+  "unsigned"
+  "assert"
+  "cover"
+  "assume"
+  "disable"
+  "automatic"
+  "static"
+  (dpi_function_import_property)
+  (dpi_task_import_property)
+] @keyword.modifier
+
+[
+  "include"
+  "import"
+  "directive_include"
+] @keyword.import
+
+(comment) @comment @spell
+
+[
+  "@"
+  (cycle_delay_range)
+  (delay_control)
+  (cycle_delay)
+  (attribute_instance)
+] @attribute
+
+(attribute_instance
+  (attr_spec
+    (simple_identifier) @property))
+
+[
+  (integral_number)
+  (unbased_unsized_literal)
+  (fixed_point_number)
+  (unsigned_number)
+] @number
+
+[
+  (net_type)
+  (data_type)
+  (time_unit)
+] @type.builtin
+
+; variable
+(list_of_variable_decl_assignments
+  (variable_decl_assignment
+    name: (simple_identifier) @variable))
+
+(hierarchical_identifier
+  (simple_identifier) @variable)
+
+(tf_port_item
+  (simple_identifier) @variable)
+
+port_name: (simple_identifier) @variable
+
+(port
+  (simple_identifier) @variable)
+
+(list_of_port_identifiers
+  (simple_identifier) @variable)
+
+(net_lvalue
+  (simple_identifier) @variable)
+
+(sequence_port_item
+  (simple_identifier) @variable)
+
+(property_port_item
+  (simple_identifier) @variable)
+
+(net_decl_assignment
+  (simple_identifier) @variable)
+
+(ERROR
+  (simple_identifier) @variable)
+
+; variable.member
+(hierarchical_identifier
+  (simple_identifier)
+  (simple_identifier) @variable.member)
+
+(select
+  (simple_identifier) @variable.member)
+
+(named_port_connection
+  port_name: (simple_identifier) @variable.member)
+
+(ordered_port_connection
+  (expression
+    (primary
+      (hierarchical_identifier
+        (simple_identifier) @variable.member))))
+
+(coverage_option
+  (simple_identifier) @variable.member)
+
+; variable.builtin
+(method_call_body
+  arguments: (list_of_arguments
+    (expression) @variable.builtin
+    (#any-of? @variable.builtin "this")))
+
+(implicit_class_handle) @variable.builtin
+
+; variable.parameter
+(named_parameter_assignment
+  (simple_identifier) @variable.parameter)
+
+(parameter_declaration
+  (list_of_param_assignments
+    (param_assignment
+      (simple_identifier) @variable.parameter)))
+
+(local_parameter_declaration
+  (list_of_param_assignments
+    (param_assignment
+      (simple_identifier) @variable.parameter)))
+
+; function builtin
+[
+  (simulation_control_task)
+  (system_tf_identifier)
+  (severity_system_task)
+  (randomize_call)
+  (array_or_queue_method_name)
+  "new"
+] @function.builtin
+
+; declaration
+(task_body_declaration
+  .
+  name: (simple_identifier) @function
+  (simple_identifier)? @label)
+
+(function_body_declaration
+  .
+  name: (simple_identifier) @function
+  (simple_identifier)? @label)
+
+(function_body_declaration
+  .
+  (data_type_or_void)
+  name: (simple_identifier) @function
+  (simple_identifier)? @label)
+
+(clocking_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(sequence_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(property_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(class_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(interface_class_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(covergroup_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(package_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(checker_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(interface_declaration
+  .
+  [
+    (simple_identifier) @constructor
+    (interface_nonansi_header
+      (simple_identifier) @constructor)
+    (interface_ansi_header
+      (simple_identifier) @constructor)
+  ]
+  (simple_identifier)? @label)
+
+(module_declaration
+  .
+  [
+    (simple_identifier) @constructor
+    (module_nonansi_header
+      (simple_identifier) @constructor)
+    (module_ansi_header
+      (simple_identifier) @constructor)
+  ]
+  (simple_identifier)? @label)
+
+(program_declaration
+  .
+  [
+    (simple_identifier) @constructor
+    (program_nonansi_header
+      (simple_identifier) @constructor)
+    (program_ansi_header
+      (simple_identifier) @constructor)
+  ]
+  (simple_identifier)? @label)
+
+; function.call
+(method_call_body
+  name: (simple_identifier) @function.call)
+
+(tf_call
+  (hierarchical_identifier
+    (simple_identifier) @function.call))
+
+; instance
+(module_instantiation
+  instance_type: (simple_identifier) @constructor)
+
+(name_of_instance
+  instance_name: (simple_identifier) @module)
+
+(sequence_instance
+  (hierarchical_identifier
+    (simple_identifier) @module))
+
+(udp_instantiation
+  (simple_identifier) @constructor)
+
+(ansi_port_declaration
+  (interface_port_header
+    interface_name: (simple_identifier) @variable
+    modport_name: (simple_identifier) @variable.member)
+  port_name: (simple_identifier) @variable)
+
+; bind
+(bind_directive
+  (bind_target_scope
+    (simple_identifier) @constructor))
+
+(bind_target_instance
+  (hierarchical_identifier
+    (simple_identifier) @module))
+
+; assertion
+(concurrent_assertion_item
+  (simple_identifier) @label)
+
+; converge
+(cover_point
+  name: (simple_identifier) @label)
+
+(cover_cross
+  name: (simple_identifier) @module)
+
+(list_of_cross_items
+  (simple_identifier) @constructor)
+
+;package
+(package_import_item
+  (simple_identifier) @constructor)
+
+; label
+(seq_block
+  (simple_identifier) @label)
+
+(statement
+  block_name: (simple_identifier) @label)
+
+; dpi
+(dpi_spec_string) @string
+
+c_name: (c_identifier) @function
+
+(dpi_import_export
+  name: (simple_identifier) @function)
+
+; type def
+(class_type
+  (simple_identifier) @constructor)
+
+(class_type
+  (simple_identifier)
+  (simple_identifier) @type)
+
+(data_type
+  (class_scope
+    (class_type
+      (simple_identifier) @constructor)))
+
+(task_prototype
+  name: (simple_identifier) @function)
+
+(function_prototype
+  name: (simple_identifier) @function)
+
+(type_assignment
+  name: (simple_identifier) @type.definition)
+
+(interface_class_type
+  (simple_identifier) @type.definition)
+
+(package_scope
+  (simple_identifier) @constructor)
+
+(data_declaration
+  (type_declaration
+    type_name: (simple_identifier) @type.definition))
+
+(net_declaration
+  (simple_identifier) @type)
+
+(constraint_declaration
+  (simple_identifier) @constructor)
+
+(method_call
+  (primary
+    (hierarchical_identifier
+      (simple_identifier) @constructor)))
+
+(string_literal
+  (quoted_string) @string)
+
+; include
+(include_statement
+  (file_path_spec) @string.special.path)
+
+; directive
+[
+  "directive_define"
+  "directive_default_nettype"
+  "directive_resetall"
+  "directive_timescale"
+  "directive_undef"
+  "directive_undefineall"
+  "directive_ifdef"
+  "directive_elsif"
+  "directive_endif"
+  "directive_else"
+] @keyword.directive.define
+
+(include_compiler_directive
+  (quoted_string) @string.special.path)
+
+(include_compiler_directive
+  (system_lib_string) @string)
+
+(default_nettype_compiler_directive
+  (default_nettype_value) @type.builtin)
+
+(text_macro_definition
+  (text_macro_name
+    (simple_identifier) @keyword.directive))
+
+(text_macro_usage) @keyword.directive
+
+(ifdef_condition
+  (simple_identifier) @keyword.directive)
+
+(undefine_compiler_directive
+  (simple_identifier) @keyword.directive)
diff --git a/queries/systemverilog/injections.scm b/queries/systemverilog/injections.scm
new file mode 100644
index 000000000..b6d2d4721
--- /dev/null
+++ b/queries/systemverilog/injections.scm
@@ -0,0 +1,5 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((macro_text) @injection.content
+  (#set! injection.language "systemverilog"))

From 9d80c1497ec343f81c0c5800b65f2e73ca569025 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:36:15 +0000
Subject: [PATCH 1568/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2b9f91cf5..fbf2cc27c 100644
--- a/README.md
+++ b/README.md
@@ -407,7 +407,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
-- [x] [systemverilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
+- [x] [systemverilog](https://github.com/zhangwwpeng/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
 - [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [tact](https://github.com/tact-lang/tree-sitter-tact) (maintained by @novusnota)

From cebb7e7c5bf1ab643dba49f1857f9b00d2a0ba81 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 06:40:48 +0000
Subject: [PATCH 1569/2704] bot(lockfile): update hcl, luau, terraform

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a3ea9cba1..541dc4604 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -279,7 +279,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
+    "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "heex": {
     "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
@@ -411,7 +411,7 @@
     "revision": "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a"
   },
   "luau": {
-    "revision": "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"
+    "revision": "fbadc96272f718dba267628ba7b0e694c368cef3"
   },
   "m68k": {
     "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
@@ -723,7 +723,7 @@
     "revision": "cf84ea53e2e2531f23009d676ac206090c1e2392"
   },
   "terraform": {
-    "revision": "422cbe1d93a8ae3847744b664041fc76876babcd"
+    "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "textproto": {
     "revision": "8dacf02aa402892c91079f8577998ed5148c0496"

From d4a888ae3cff358cb239643c45b2b38bb60e29c6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 08:36:19 +0000
Subject: [PATCH 1570/2704] bot(lockfile): update systemverilog

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 541dc4604..d1c6d6224 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -702,7 +702,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "systemverilog": {
-    "revision": "7dc4904578a29315c64f0f6500920baff41cc3af"
+    "revision": "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"
   },
   "t32": {
     "revision": "6182836f4128725f1e74ce986840d7317021a015"

From 0c7a0ddaf4feda708b1811a8fba60536112e0b68 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 06:40:43 +0000
Subject: [PATCH 1571/2704] bot(lockfile): update just, nickel, ralph

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d1c6d6224..bd13e07ea 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -360,7 +360,7 @@
     "revision": "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"
   },
   "just": {
-    "revision": "fd814fc6c579f68c2a642f5e0268cf69daae92d7"
+    "revision": "379fbe36d1e441bc9414ea050ad0c85c9d6935ea"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -447,7 +447,7 @@
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
   "nickel": {
-    "revision": "43433d8477b24cd13acaac20a66deda49b7e2547"
+    "revision": "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"
   },
   "nim": {
     "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"
@@ -579,7 +579,7 @@
     "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
   },
   "ralph": {
-    "revision": "48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0"
+    "revision": "f6d81bf7a4599c77388035439cf5801cd461ff77"
   },
   "rasi": {
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"

From 09700b88b41ed96391de3d2010d74dc54fd5c210 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 25 Jun 2024 09:31:11 +0200
Subject: [PATCH 1572/2704] feat(tact): update parser and queries

---
 lockfile.json               |  2 +-
 queries/tact/folds.scm      |  2 +-
 queries/tact/highlights.scm | 38 ++++++++++++++++++-------------------
 queries/tact/locals.scm     | 17 ++++++++++-------
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bd13e07ea..257a6ec6c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -711,7 +711,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "034df2162ed7b654efd999942e266be713c7cde0"
+    "revision": "91cc49a83f4f0b3a756bf7d0e65403a9cf757003"
   },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
diff --git a/queries/tact/folds.scm b/queries/tact/folds.scm
index 8e286c340..03713dd7c 100644
--- a/queries/tact/folds.scm
+++ b/queries/tact/folds.scm
@@ -1,6 +1,6 @@
 [
   ; import …
-  (import_statement)+
+  (import)+
   ; (…, …)
   (parameter_list)
   (argument_list)
diff --git a/queries/tact/highlights.scm b/queries/tact/highlights.scm
index 394463c65..d5bec39fa 100644
--- a/queries/tact/highlights.scm
+++ b/queries/tact/highlights.scm
@@ -108,7 +108,7 @@
 
 ; string.special.path
 ; -------------------
-(import_statement
+(import
   library: (string) @string.special.path)
 
 ; boolean
@@ -117,7 +117,10 @@
 
 ; constant
 ; --------
-(constant
+(global_constant
+  name: (identifier) @constant)
+
+(storage_constant
   name: (identifier) @constant)
 
 ; constant.builtin
@@ -142,17 +145,12 @@
 (field_access_expression
   name: (identifier) @variable.member)
 
-(trait_body
-  (constant
-    name: (identifier) @variable.member))
-
-(contract_body
-  (constant
-    name: (identifier) @variable.member))
-
 (field
   name: (identifier) @variable.member)
 
+(storage_variable
+  name: (identifier) @variable.member)
+
 ; number
 ; ------
 (integer) @number
@@ -248,7 +246,7 @@
 (native_function
   name: (identifier) @function)
 
-(static_function
+(global_function
   name: (identifier) @function)
 
 (func_identifier) @function
@@ -267,7 +265,7 @@
 (external_function
   "external" @function.method)
 
-(function
+(storage_function
   name: (identifier) @function.method)
 
 ; function.call
@@ -289,19 +287,19 @@
     "contractAddress" "contractAddressExt" "emit" "cell" "ton" "dump" "dumpStack" "beginString"
     "beginComment" "beginTailString" "beginStringFromBuilder" "beginCell" "emptyCell" "randomInt"
     "random" "checkSignature" "checkDataSignature" "sha256" "min" "max" "abs" "pow" "pow2" "throw"
-    "nativeThrowWhen" "nativeThrowUnless" "getConfigParam" "nativeRandomize" "nativeRandomizeLt"
+    "nativeThrowIf" "nativeThrowUnless" "getConfigParam" "nativeRandomize" "nativeRandomizeLt"
     "nativePrepareRandom" "nativeRandom" "nativeRandomInterval" "nativeReserve"))
 
-; comment
-; -------
-(comment) @comment @spell
-
-((comment) @comment.documentation
-  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
-
 ; attribute
 ; ---------
 [
   "@name"
   "@interface"
 ] @attribute
+
+; comment
+; -------
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
diff --git a/queries/tact/locals.scm b/queries/tact/locals.scm
index 87ad953ff..0c1522606 100644
--- a/queries/tact/locals.scm
+++ b/queries/tact/locals.scm
@@ -1,12 +1,12 @@
 ; Scopes       @local.scope
 ; -------------------------
 [
-  (static_function)
+  (global_function)
   (init_function)
   (bounced_function)
   (receive_function)
   (external_function)
-  (function)
+  (storage_function)
   (block_statement)
 ] @local.scope
 
@@ -17,11 +17,14 @@
   name: (identifier) @local.definition.var)
 
 ; constants
-(constant
+(global_constant
+  name: (identifier) @local.definition.constant)
+
+(storage_constant
   name: (identifier) @local.definition.constant)
 
 ; functions
-(static_function
+(global_function
   name: (identifier) @local.definition.function
   (#set! definition.var.scope parent))
 
@@ -42,7 +45,7 @@
   "external" @local.definition.method
   (#set! definition.var.scope parent))
 
-(function
+(storage_function
   name: (identifier) @local.definition.method
   (#set! definition.var.scope parent))
 
@@ -53,12 +56,12 @@
 ; user-defined types (structs and messages)
 (type_identifier) @local.definition.type
 
-; fields (and properties)
+; fields (of messages and structs)
 (field
   name: (identifier) @local.definition.field)
 
 ; imports
-(import_statement
+(import
   (string) @local.definition.import)
 
 ; References   @local.reference

From d467f7d5617ce30f70f31254537c4ce44c108214 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 06:40:23 +0000
Subject: [PATCH 1573/2704] bot(lockfile): update janet_simple, roc, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 257a6ec6c..92b84dc05 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -330,7 +330,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "6eb1525872013f58c64b0526ac9d64174f7136f1"
+    "revision": "74f054bfe916a8f5fd5e5f90bda5549000eaaa56"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -609,7 +609,7 @@
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
   "roc": {
-    "revision": "a662513450e163dc2056603b1f426b4787aac0fd"
+    "revision": "6ea64b6434a45472bd87b0772fd84a017de0a557"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
@@ -693,7 +693,7 @@
     "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
   },
   "swift": {
-    "revision": "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"
+    "revision": "631f1e66bfbf55791b7a9ed23fa6dc90ee55550a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 53b32a6aa3e1de224e82f88cbdc08584c753adb7 Mon Sep 17 00:00:00 2001
From: Turiiya <34311583+ttytm@users.noreply.github.com>
Date: Wed, 26 Jun 2024 09:52:56 +0200
Subject: [PATCH 1574/2704] feat(v): add shebang query

---
 queries/v/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index b20389624..d4ea0e298 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -1,3 +1,5 @@
+(shebang) @keyword.directive
+
 ; Includes
 [
   "import"

From c723b87ef67159ddaef32d7e9c048a9bdfaa0934 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 06:39:38 +0000
Subject: [PATCH 1575/2704] bot(lockfile): update gitcommit, hyprlang, m68k,
 sparql

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 92b84dc05..314a0e4fb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -216,7 +216,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "edd817e0532f179b7f7f371dc180629070945f0c"
+    "revision": "821994a8029b0e271171da4331b8cfc0294d08ed"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -315,7 +315,7 @@
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
   },
   "hyprlang": {
-    "revision": "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"
+    "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
     "revision": "6aa57adb5f6d14ea768d5d1b3d8a3fae11e6b97f"
@@ -414,7 +414,7 @@
     "revision": "fbadc96272f718dba267628ba7b0e694c368cef3"
   },
   "m68k": {
-    "revision": "d097b123f19c6eaba2bf181c05420d88b9fc489d"
+    "revision": "fe7cde600d3d4f6f67a9766f58690431b5a1c9f4"
   },
   "make": {
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
@@ -663,7 +663,7 @@
     "revision": "645d093763bcaaf7535edbdf6575a5c978b16491"
   },
   "sparql": {
-    "revision": "05f949d3c1c15e3261473a244d3ce87777374dec"
+    "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
     "revision": "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"

From 173515a5d2be6e98c2996189f77ee5993620e2aa Mon Sep 17 00:00:00 2001
From: gbprod <contact@gb-prod.fr>
Date: Wed, 26 Jun 2024 21:53:01 +0200
Subject: [PATCH 1576/2704] feat(gitcommit): remove overflow rule

This commit remove the highlight of the overflow node in gitcommit syntax
introduced [by this PR](https://github.com/nvim-treesitter/nvim-treesitter/pull/6222).
This node will be removed when [this PR](https://github.com/gbprod/tree-sitter-gitcommit/pull/68)
will be merge.
---
 queries/gitcommit/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
index a15530510..b096056cc 100644
--- a/queries/gitcommit/highlights.scm
+++ b/queries/gitcommit/highlights.scm
@@ -15,8 +15,6 @@
 
 (subject) @markup.heading @spell
 
-(overflow) @comment.warning @spell
-
 (subject
   (subject_prefix) @function @nospell)
 

From 5373c90c55a33408604d17713edaa9560306b83d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 15 Jun 2024 14:39:06 +0200
Subject: [PATCH 1577/2704] feat(r)!: update parser and queries

---
 .github/workflows/tests.yml     |   1 -
 README.md                       |   2 +-
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   1 -
 queries/r/highlights.scm        | 191 ++++++++++++++------------------
 queries/r/indents.scm           |  16 +--
 queries/r/locals.scm            |  20 ++--
 tests/indent/r_spec.lua         |   7 +-
 tests/query/highlights/r/test.r |   9 +-
 9 files changed, 117 insertions(+), 132 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6c4ad9578..5c775eda4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -57,7 +57,6 @@ jobs:
             './lua/nvim-treesitter/shell_selectors.lua') }}
 
       - name: Compile parsers Unix like
-        if: ${{ runner.os != 'Windows' && steps.parsers-cache.outputs.cache-hit != 'true' }}
         run: |
           nvim --headless -c "TSInstallSync all" -c "q"
 
diff --git a/README.md b/README.md
index fbf2cc27c..d617d63dc 100644
--- a/README.md
+++ b/README.md
@@ -364,7 +364,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
 - [x] [qmljs](https://github.com/yuja/tree-sitter-qmljs) (maintained by @Decodetalkers)
 - [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
-- [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @echasnovski)
+- [x] [r](https://github.com/r-lib/tree-sitter-r)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
 - [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
diff --git a/lockfile.json b/lockfile.json
index 314a0e4fb..6ebaedf8e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -573,7 +573,7 @@
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
   },
   "r": {
-    "revision": "391400572538ff9854341a175ed8ab4b1e45f44b"
+    "revision": "b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d"
   },
   "racket": {
     "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 16a425168..409a4b845 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1688,7 +1688,6 @@ list.r = {
     url = "https://github.com/r-lib/tree-sitter-r",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@echasnovski" },
 }
 
 list.racket = {
diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index cedd25909..d6d1da0e4 100644
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -1,4 +1,3 @@
-; highlights.scm
 ; Literals
 (integer) @number
 
@@ -9,8 +8,10 @@
 (string) @string
 
 (string
-  (escape_sequence) @string.escape)
+  (string_content
+    (escape_sequence) @string.escape))
 
+; Comments
 (comment) @comment @spell
 
 ((program
@@ -18,123 +19,113 @@
   (comment) @keyword.directive @nospell)
   (#lua-match? @keyword.directive "^#!/"))
 
-(identifier) @variable
-
-((dollar
-  (identifier) @variable.builtin)
-  (#eq? @variable.builtin "self"))
-
-(dollar
-  _
-  (identifier) @variable.member)
-
-; Parameters
-(formal_parameters
-  (identifier) @variable.parameter)
-
-(formal_parameters
-  (default_parameter
-    name: (identifier) @variable.parameter))
-
-(default_argument
-  name: (identifier) @variable.parameter)
-
-; Namespace
-(namespace_get
-  namespace: (identifier) @module)
-
-(namespace_get_internal
-  namespace: (identifier) @module)
-
 ; Operators
 [
+  "?"
+  ":="
   "="
   "<-"
   "<<-"
   "->"
-] @operator
-
-(unary
-  operator: [
-    "-"
-    "+"
-    "!"
-    "~"
-    "?"
-  ] @operator)
-
-(binary
-  operator: [
-    "-"
-    "+"
-    "*"
-    "/"
-    "^"
-    "<"
-    ">"
-    "<="
-    ">="
-    "=="
-    "!="
-    "||"
-    "|"
-    "&&"
-    "&"
-    ":"
-    "~"
-  ] @operator)
-
-[
+  "->>"
+  "~"
   "|>"
-  (special)
+  "||"
+  "|"
+  "&&"
+  "&"
+  "<"
+  "<="
+  ">"
+  ">="
+  "=="
+  "!="
+  "+"
+  "-"
+  "*"
+  "/"
+  "::"
+  ":::"
+  "**"
+  "^"
+  "$"
+  "@"
+  ":"
+  "special"
 ] @operator
 
-(lambda_function
-  "\\" @operator)
-
+; Punctuation
 [
   "("
   ")"
-  "["
-  "]"
   "{"
   "}"
+  "["
+  "]"
+  "[["
+  "]]"
 ] @punctuation.bracket
 
-"," @punctuation.delimiter
+(comma) @punctuation.delimiter
 
-(dollar
-  _
-  "$" @operator)
+; Variables
+(identifier) @variable
 
-(subset2
-  "[[" @punctuation.bracket
-  "]]" @punctuation.bracket)
+; Functions
+(binary_operator
+  lhs: (identifier) @function
+  operator: "<-"
+  rhs: (function_definition))
+
+(binary_operator
+  lhs: (identifier) @function
+  operator: "="
+  rhs: (function_definition))
+
+; Calls
+(call
+  function: (identifier) @function.call)
+
+; Parameters
+(parameters
+  (parameter
+    name: (identifier) @variable.parameter))
+
+(arguments
+  (argument
+    name: (identifier) @variable.parameter))
+
+; Namespace
+(namespace_operator
+  lhs: (identifier) @module)
+
+(call
+  function: (namespace_operator
+    rhs: (identifier) @function))
+
+; Keywords
+(function_definition
+  name: "function" @keyword.function)
+
+(function_definition
+  name: "\\" @operator)
 
 [
-  (dots)
-  (break)
+  "in"
+  (return)
   (next)
+  (break)
 ] @keyword
 
-[
-  (nan)
-  (na)
-  (null)
-  (inf)
-] @constant.builtin
-
 [
   "if"
   "else"
-  "switch"
 ] @keyword.conditional
 
 [
   "while"
   "repeat"
   "for"
-  "in"
 ] @keyword.repeat
 
 [
@@ -142,21 +133,11 @@
   (false)
 ] @boolean
 
-"function" @keyword.function
-
-; Functions/Methods
-(call
-  function: (identifier) @function.call)
-
-(call
-  (namespace_get
-    function: (identifier) @function.call))
-
-(call
-  (namespace_get_internal
-    function: (identifier) @function.call))
-
-(call
-  function: (dollar
-    _
-    (identifier) @function.method.call))
+[
+  (null)
+  (inf)
+  (nan)
+  (na)
+  (dots)
+  (dot_dot_i)
+] @constant.builtin
diff --git a/queries/r/indents.scm b/queries/r/indents.scm
index ec76272aa..86acddc5f 100644
--- a/queries/r/indents.scm
+++ b/queries/r/indents.scm
@@ -1,9 +1,8 @@
 [
-  (brace_list)
-  (paren_list)
-  (special)
-  (pipe)
+  (braced_expression)
+  (parenthesized_expression)
   (call)
+  "special"
   "|>"
   "if"
   "else"
@@ -12,16 +11,17 @@
   "for"
 ] @indent.begin
 
-(binary
-  operator: (special)) @indent.begin
+(binary_operator
+  operator: (_)) @indent.begin
 
 [
   "}"
   ")"
 ] @indent.branch
 
-((formal_parameters
-  (identifier)) @indent.align
+((parameters
+  (parameter
+    name: (identifier))) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
diff --git a/queries/r/locals.scm b/queries/r/locals.scm
index e98f773f5..3377552c8 100755
--- a/queries/r/locals.scm
+++ b/queries/r/locals.scm
@@ -1,16 +1,22 @@
 ; locals.scm
 (function_definition) @local.scope
 
-(formal_parameters
-  (identifier) @local.definition.parameter)
-
-(left_assignment
+(argument
   name: (identifier) @local.definition)
 
-(equals_assignment
+(parameter
   name: (identifier) @local.definition)
 
-(right_assignment
-  name: (identifier) @local.definition)
+(binary_operator
+  lhs: (identifier) @local.definition
+  operator: "<-")
+
+(binary_operator
+  lhs: (identifier) @local.definition
+  operator: "=")
+
+(binary_operator
+  operator: "->"
+  rhs: (identifier) @local.definition)
 
 (identifier) @local.reference
diff --git a/tests/indent/r_spec.lua b/tests/indent/r_spec.lua
index 662ea5809..dc3fe9b8c 100644
--- a/tests/indent/r_spec.lua
+++ b/tests/indent/r_spec.lua
@@ -11,7 +11,7 @@ local run = Runner:new(it, "tests/indent/r", {
 describe("indent R:", function()
   describe("whole file:", function()
     run:whole_file(".", {
-      expected_failures = {},
+      expected_failures = { "./pipe.R" },
     })
   end)
 
@@ -34,8 +34,9 @@ describe("indent R:", function()
     run:new_line("loop.R", { on_line = 8, text = "x <- x + 1", indent = 2 })
     run:new_line("loop.R", { on_line = 14, text = "print('lol')", indent = 4 })
 
-    run:new_line("pipe.R", { on_line = 1, text = "head(n = 10L) |>", indent = 2 })
-    run:new_line("pipe.R", { on_line = 9, text = "head()", indent = 2 })
+    -- FIXME: |>, %>% indent broken after parser update
+    -- run:new_line("pipe.R", { on_line = 1, text = "head(n = 10L) |>", indent = 2 })
+    -- run:new_line("pipe.R", { on_line = 9, text = "head()", indent = 2 })
 
     run:new_line("aligned_indent.R", { on_line = 1, text = "z,", indent = 17 })
   end)
diff --git a/tests/query/highlights/r/test.r b/tests/query/highlights/r/test.r
index c67df6096..667be4bea 100644
--- a/tests/query/highlights/r/test.r
+++ b/tests/query/highlights/r/test.r
@@ -5,7 +5,6 @@ init <- 1
 
 r"{(\1\2)}" -> `%r%`
 #  ^ @string
-#    ^ @string.escape
 #           ^ @operator
 #               ^ @variable
 
@@ -24,21 +23,21 @@ b <- list(name = "r", version = R.version$major)
 #          ^ @variable.parameter
 #                 ^ @string
 #                                        ^ @operator
-#                                           ^ @variable.member
+#                                           ^ @variable
 
 Lang$new(name = "r")$print()
-#     ^ @function.method.call
+#     ^ @variable
 
 for(i in 1:10) {
 # <- @keyword.repeat
-#      ^ @keyword.repeat
+#      ^ @keyword
 }
 
 add <- function(a, b = 1, ...) {
 #        ^ @keyword.function
 #               ^ @variable.parameter
 #                  ^ @variable.parameter
-#                         ^ @keyword
+#                         ^ @constant.builtin
   return(a + b)
 }
 

From 8caffadee12885c2ab2306acf4da8aa37c52d9f3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 13:31:55 +0000
Subject: [PATCH 1578/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d617d63dc..6e8f68ddc 100644
--- a/README.md
+++ b/README.md
@@ -364,7 +364,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
 - [x] [qmljs](https://github.com/yuja/tree-sitter-qmljs) (maintained by @Decodetalkers)
 - [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
-- [x] [r](https://github.com/r-lib/tree-sitter-r)
+- [ ] [r](https://github.com/r-lib/tree-sitter-r)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
 - [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)

From 984604288d56265d7cfc443fa9dc9f67ec19d60d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 13:34:52 +0000
Subject: [PATCH 1579/2704] bot(lockfile): update erlang, janet_simple, m68k

---
 lockfile.json                   | 6 +++---
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6ebaedf8e..ee7861751 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -162,7 +162,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "54cecce7454bab1e1c92d6fdeeb2e34625684397"
+    "revision": "da275db3ae46bbd00f97d11f888d8c58c14faa6d"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -330,7 +330,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "74f054bfe916a8f5fd5e5f90bda5549000eaaa56"
+    "revision": "3b08641373cb3e37bc531e6e3cdb85d02b454702"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -414,7 +414,7 @@
     "revision": "fbadc96272f718dba267628ba7b0e694c368cef3"
   },
   "m68k": {
-    "revision": "fe7cde600d3d4f6f67a9766f58690431b5a1c9f4"
+    "revision": "9e082a2253c50eb3d80e84bbd635e57cfb1476a2"
   },
   "make": {
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 409a4b845..d529fa82a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -528,7 +528,7 @@ list.embedded_template = {
 list.erlang = {
   install_info = {
     url = "https://github.com/WhatsApp/tree-sitter-erlang",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@filmor" },
 }

From cf7baac35aa5c103b960bcb3f15c690a4aa5c6f1 Mon Sep 17 00:00:00 2001
From: Turiiya <34311583+ttytm@users.noreply.github.com>
Date: Fri, 28 Jun 2024 05:33:06 +0200
Subject: [PATCH 1580/2704] fix(v): anchor comment highlight query

* fix(v): use `source_file` as parent node for comment highlight query

* fix: correctly recognize doc comment
---
 queries/v/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index d4ea0e298..982f3dbd5 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -292,6 +292,7 @@
 
 (_
   (line_comment)+ @comment.documentation
+  .
   [
     (function_declaration)
     (type_declaration)

From ec6307e5b042c73c5a26a75c7b6737b8efa85493 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Fri, 28 Jun 2024 09:41:53 +0300
Subject: [PATCH 1581/2704] refactor(python): merge docstring queries

---
 queries/python/highlights.scm | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 5e5a2a88d..b4fa1fc46 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -199,46 +199,27 @@
 ] @string.escape
 
 ; doc-strings
-(module
-  .
-  (comment)*
-  .
-  (expression_statement
-    (string) @string.documentation))
-
-(class_definition
-  body: (block
-    .
-    (expression_statement
-      (string) @string.documentation)))
-
-(function_definition
-  body: (block
-    .
-    (expression_statement
-      (string) @string.documentation)))
-
 (module
   .
   (comment)*
   .
   (expression_statement
     (string
-      (string_content) @spell)))
+      (string_content) @spell) @string.documentation))
 
 (class_definition
   body: (block
     .
     (expression_statement
       (string
-        (string_content) @spell))))
+        (string_content) @spell) @string.documentation)))
 
 (function_definition
   body: (block
     .
     (expression_statement
       (string
-        (string_content) @spell))))
+        (string_content) @spell) @string.documentation)))
 
 ; Tokens
 [

From f8d27e1abf23c3edefd513199a2695f155579b78 Mon Sep 17 00:00:00 2001
From: Vladimir Levin <34550675+opa-oz@users.noreply.github.com>
Date: Fri, 28 Jun 2024 17:08:49 +0900
Subject: [PATCH 1582/2704] fix: use terraform parser for terraform-vars

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d529fa82a..962ae335d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -33,6 +33,7 @@ for ft, lang in pairs {
   sh = "bash",
   html_tags = "html",
   ["typescript.tsx"] = "tsx",
+  ["terraform-vars"] = "terraform",
   ["html.handlebars"] = "glimmer",
   pandoc = "markdown",
   rmd = "markdown",

From c11d49cbefb3c22550747840843eb86ab4a3b267 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 06:39:56 +0000
Subject: [PATCH 1583/2704] bot(lockfile): update idl, xcompose

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ee7861751..b59645aca 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "6aa57adb5f6d14ea768d5d1b3d8a3fae11e6b97f"
+    "revision": "dcc727329d383145a57f8ce7209f20c19a3765c6"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -822,7 +822,7 @@
     "revision": "cab94791450524a542324d8cbe8017d69c516d8e"
   },
   "xcompose": {
-    "revision": "2383cc69a2c42cfade41c7cb971fb3862bec6df1"
+    "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
     "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"

From 3e535e826da265748b875b18dbfb361bd1a1701c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sat, 29 Jun 2024 00:26:38 +0900
Subject: [PATCH 1584/2704] fix(r): adapt indent queries

- Anchor parameter query. There's no need for multiple indent.align
  captures
- Narrow down binary_operator indent.begin. From tree-sitter-r corpus
  and highlight tests, this seems to be appropriate.
---
 queries/r/indents.scm   | 4 +++-
 tests/indent/r_spec.lua | 9 +++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/queries/r/indents.scm b/queries/r/indents.scm
index 86acddc5f..600214eaf 100644
--- a/queries/r/indents.scm
+++ b/queries/r/indents.scm
@@ -12,7 +12,8 @@
 ] @indent.begin
 
 (binary_operator
-  operator: (_)) @indent.begin
+  rhs: (_) @_no_indent
+  (#not-kind-eq? @_no_indent function_definition)) @indent.begin
 
 [
   "}"
@@ -20,6 +21,7 @@
 ] @indent.branch
 
 ((parameters
+  .
   (parameter
     name: (identifier))) @indent.align
   (#set! indent.open_delimiter "(")
diff --git a/tests/indent/r_spec.lua b/tests/indent/r_spec.lua
index dc3fe9b8c..60271b6a7 100644
--- a/tests/indent/r_spec.lua
+++ b/tests/indent/r_spec.lua
@@ -10,9 +10,7 @@ local run = Runner:new(it, "tests/indent/r", {
 
 describe("indent R:", function()
   describe("whole file:", function()
-    run:whole_file(".", {
-      expected_failures = { "./pipe.R" },
-    })
+    run:whole_file(".", {})
   end)
 
   describe("new line:", function()
@@ -34,9 +32,8 @@ describe("indent R:", function()
     run:new_line("loop.R", { on_line = 8, text = "x <- x + 1", indent = 2 })
     run:new_line("loop.R", { on_line = 14, text = "print('lol')", indent = 4 })
 
-    -- FIXME: |>, %>% indent broken after parser update
-    -- run:new_line("pipe.R", { on_line = 1, text = "head(n = 10L) |>", indent = 2 })
-    -- run:new_line("pipe.R", { on_line = 9, text = "head()", indent = 2 })
+    run:new_line("pipe.R", { on_line = 1, text = "head(n = 10L) |>", indent = 2 })
+    run:new_line("pipe.R", { on_line = 9, text = "head()", indent = 2 })
 
     run:new_line("aligned_indent.R", { on_line = 1, text = "z,", indent = 17 })
   end)

From fa19150d0057b22dde98746680162b9a7ab61d1e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 29 Jun 2024 06:38:10 +0000
Subject: [PATCH 1585/2704] bot(lockfile): update templ, zig

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b59645aca..a471deb8c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -720,7 +720,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "cf84ea53e2e2531f23009d676ac206090c1e2392"
+    "revision": "a4f14aa248b84df73cc1c00bf06edac8d7c96acd"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -840,6 +840,6 @@
     "revision": "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"
   },
   "zig": {
-    "revision": "7c5a29b721d409be8842017351bf007d7e384401"
+    "revision": "2bac4cc6c697d46a193905fef6d003bfa0bfabfd"
   }
 }

From f0e3b5c5fe38d0012c63368db90017fef87c85a2 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 28 Jun 2024 21:52:23 -0700
Subject: [PATCH 1586/2704] fix(r): resolve highlight regressions

---
 queries/r/highlights.scm        | 17 +++++++++++------
 tests/query/highlights/r/test.r |  7 ++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/queries/r/highlights.scm b/queries/r/highlights.scm
index d6d1da0e4..c849dd838 100644
--- a/queries/r/highlights.scm
+++ b/queries/r/highlights.scm
@@ -51,6 +51,7 @@
   "$"
   "@"
   ":"
+  "!"
   "special"
 ] @operator
 
@@ -86,6 +87,12 @@
 (call
   function: (identifier) @function.call)
 
+(extract_operator
+  rhs: (identifier) @variable.member)
+
+function: (extract_operator
+  rhs: (identifier) @function.method.call)
+
 ; Parameters
 (parameters
   (parameter
@@ -110,12 +117,7 @@
 (function_definition
   name: "\\" @operator)
 
-[
-  "in"
-  (return)
-  (next)
-  (break)
-] @keyword
+(return) @keyword.return
 
 [
   "if"
@@ -126,6 +128,9 @@
   "while"
   "repeat"
   "for"
+  "in"
+  (break)
+  (next)
 ] @keyword.repeat
 
 [
diff --git a/tests/query/highlights/r/test.r b/tests/query/highlights/r/test.r
index 667be4bea..5fa36cc56 100644
--- a/tests/query/highlights/r/test.r
+++ b/tests/query/highlights/r/test.r
@@ -23,14 +23,14 @@ b <- list(name = "r", version = R.version$major)
 #          ^ @variable.parameter
 #                 ^ @string
 #                                        ^ @operator
-#                                           ^ @variable
+#                                           ^ @variable.member
 
 Lang$new(name = "r")$print()
-#     ^ @variable
+#     ^ @function.method.call
 
 for(i in 1:10) {
 # <- @keyword.repeat
-#      ^ @keyword
+#      ^ @keyword.repeat
 }
 
 add <- function(a, b = 1, ...) {
@@ -39,6 +39,7 @@ add <- function(a, b = 1, ...) {
 #                  ^ @variable.parameter
 #                         ^ @constant.builtin
   return(a + b)
+# ^ @keyword.return
 }
 
 base::letters

From 58733401e3cdf2976044027d0a3965aa7fe7a11e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 29 Jun 2024 23:00:04 -0700
Subject: [PATCH 1587/2704] chore: add maintainer for r (#6833)

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 962ae335d..dcd03849d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1689,6 +1689,7 @@ list.r = {
     url = "https://github.com/r-lib/tree-sitter-r",
     files = { "src/parser.c", "src/scanner.c" },
   },
+  maintainers = { "@ribru17" },
 }
 
 list.racket = {

From e70472794dd797e4be938152d129e4cfae61fefa Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 30 Jun 2024 06:00:17 +0000
Subject: [PATCH 1588/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e8f68ddc..df00d0059 100644
--- a/README.md
+++ b/README.md
@@ -364,7 +364,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
 - [x] [qmljs](https://github.com/yuja/tree-sitter-qmljs) (maintained by @Decodetalkers)
 - [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
-- [ ] [r](https://github.com/r-lib/tree-sitter-r)
+- [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @ribru17)
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
 - [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)

From 533da572ae357704d67878b6604db8ded25f7fc1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 30 Jun 2024 06:38:01 +0000
Subject: [PATCH 1589/2704] bot(lockfile): update http, matlab, scala

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a471deb8c..001a1b827 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -309,7 +309,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "8d22f33faa5aa95c6526606fb656ada342e59e40"
+    "revision": "2dacda923bafcfeae487e457df0fc1c95f6d1848"
   },
   "hurl": {
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
@@ -426,7 +426,7 @@
     "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "matlab": {
-    "revision": "79d8b25f57b48f83ae1333aff6723b83c9532e37"
+    "revision": "2825fb578325ac308945318881445a89ea06e0f6"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -624,7 +624,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "5bce09bdd9d3dda5af5f4c67ca5e9bcbc7c44be2"
+    "revision": "de465b0fd6149bf30721ae565689f323c006c676"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"

From acea74c514f54c71c3e9e5a7b1857e61ec21c3bb Mon Sep 17 00:00:00 2001
From: Vladimir Levin <34550675+opa-oz@users.noreply.github.com>
Date: Sun, 30 Jun 2024 17:12:36 +0900
Subject: [PATCH 1590/2704] feat: robots.txt support

---
 lockfile.json                   | 3 +++
 lua/nvim-treesitter/parsers.lua | 8 ++++++++
 queries/robots/highlights.scm   | 7 +++++++
 queries/robots/injections.scm   | 2 ++
 4 files changed, 20 insertions(+)
 create mode 100644 queries/robots/highlights.scm
 create mode 100644 queries/robots/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 001a1b827..6fc5a1b8f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -608,6 +608,9 @@
   "robot": {
     "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
   },
+  "robots": {
+    "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
+  },
   "roc": {
     "revision": "6ea64b6434a45472bd87b0772fd84a017de0a557"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index dcd03849d..652f5dbbe 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1780,6 +1780,14 @@ list.robot = {
   maintainers = { "@Hubro" },
 }
 
+list.robots = {
+  install_info = {
+    url = "https://github.com/opa-oz/tree-sitter-robots-txt",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@opa-oz" },
+}
+
 list.roc = {
   install_info = {
     url = "https://github.com/faldor20/tree-sitter-roc",
diff --git a/queries/robots/highlights.scm b/queries/robots/highlights.scm
new file mode 100644
index 000000000..a2c55c74f
--- /dev/null
+++ b/queries/robots/highlights.scm
@@ -0,0 +1,7 @@
+(comment) @comment @spell
+
+(directive) @property
+
+(value) @string
+
+":" @punctuation.delimiter
diff --git a/queries/robots/injections.scm b/queries/robots/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/robots/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 30 Jun 2024 08:12:52 +0000
Subject: [PATCH 1591/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index df00d0059..e603abe00 100644
--- a/README.md
+++ b/README.md
@@ -376,6 +376,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
 - [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
+- [x] [robots](https://github.com/opa-oz/tree-sitter-robots-txt) (maintained by @opa-oz)
 - [x] [roc](https://github.com/faldor20/tree-sitter-roc) (maintained by @nat-418)
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)

From 1e546c0f5e0b3e8427ef637c2b1f4c4dc92bbb13 Mon Sep 17 00:00:00 2001
From: DragonBillow <DragonBillow@outlook.com>
Date: Mon, 1 Jul 2024 16:32:56 +0800
Subject: [PATCH 1592/2704] feat(idl): update highlight

Signed-off-by: DragonBillow <DragonBillow@outlook.com>
---
 lockfile.json              |  2 +-
 queries/idl/highlights.scm | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6fc5a1b8f..b5b911b87 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "dcc727329d383145a57f8ce7209f20c19a3765c6"
+    "revision": "2831737ee4187af867b2febce6f35d0475a3a3ca"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
diff --git a/queries/idl/highlights.scm b/queries/idl/highlights.scm
index 54b38fc08..47ce31b7b 100644
--- a/queries/idl/highlights.scm
+++ b/queries/idl/highlights.scm
@@ -79,6 +79,8 @@
   (value_base_type)
 ] @type.builtin
 
+(escape_sequence) @string.escape
+
 (scoped_name) @type
 
 (boolean_literal) @boolean
@@ -111,7 +113,7 @@
   "~"
   "|"
   "^"
-  "$"
+  "&"
 ] @operator
 
 [
@@ -128,15 +130,22 @@
   (simple_declarator) @variable.member)
 
 (annotation_appl
-  "@" @attribute
+  "@" @attribute)
+
+(annotation_appl
   (scoped_name) @attribute)
 
+(annotation_appl
+  (annotation_built_name) @attribute.builtin)
+
 (op_dcl
   (identifier) @function.method)
 
 (type_declarator
-  (simple_type_spec) @type
-  (any_declarators) @type)
+  (simple_type_spec) @type)
+
+(type_declarator
+  (any_declarators) @variable.member)
 
 (param_dcl
   (simple_declarator) @variable.parameter)
@@ -205,8 +214,8 @@
   (bitfield_spec
     "bitfield" @keyword.modifier
     (positive_int_const) @number
-    (destination_type)* @type)
-  (identifier) @variable.member)
+    (destination_type)? @type)
+  (identifier)* @variable.member)
 
 (bit_value) @constant
 
@@ -327,3 +336,6 @@
 
 (factory_param_dcl
   (simple_declarator) @variable.parameter)
+
+(element_spec
+  (declarator) @variable.member)

From 5d2473d05c692b86c65c1ff11b9e294ac9829ea5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 09:39:40 +0000
Subject: [PATCH 1593/2704] bot(lockfile): update angular, diff, dtd, idl,
 ocaml, ocaml_interface, scala, xml

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b5b911b87..16c164e36 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "10f21f3f1b10584e62ecc113ab3cda1196d0ceb8"
+    "revision": "5c9b47c6a978072808b356065fe8f223cdc8fc07"
   },
   "apex": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -114,7 +114,7 @@
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
   },
   "diff": {
-    "revision": "629676fc3919606964231b2c7b9677d6998a2cb4"
+    "revision": "19dd5aa52fe339a1d974768a09ee2537303e8ca5"
   },
   "disassembly": {
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
@@ -132,7 +132,7 @@
     "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
-    "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
+    "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
   },
   "earthfile": {
     "revision": "5a864159ff728b6d4f7d0aab3723f85a467d180f"
@@ -318,7 +318,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "2831737ee4187af867b2febce6f35d0475a3a3ca"
+    "revision": "966797b8c581526efdd2252f815dde6de1a8f932"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -474,10 +474,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"
+    "revision": "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"
   },
   "ocaml_interface": {
-    "revision": "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"
+    "revision": "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -627,7 +627,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "de465b0fd6149bf30721ae565689f323c006c676"
+    "revision": "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"
   },
   "scfg": {
     "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
@@ -828,7 +828,7 @@
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
-    "revision": "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"
+    "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 020c5bc03fb34082c45b3cc31ad8160129512fa2 Mon Sep 17 00:00:00 2001
From: DragonBillow <42114817+cathaysia@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:06:12 +0800
Subject: [PATCH 1594/2704] fix(idl): fix author name (#6840)

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 652f5dbbe..4d655727b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -962,7 +962,7 @@ list.idl = {
     url = "https://github.com/cathaysia/tree-sitter-idl",
     files = { "src/parser.c" },
   },
-  maintainers = { "@cathaysa" },
+  maintainers = { "@cathaysia" },
 }
 
 list.ini = {

From 4ee5fdd666f46fb379302a32750f932d25448d98 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:06:25 +0000
Subject: [PATCH 1595/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e603abe00..14ce6d358 100644
--- a/README.md
+++ b/README.md
@@ -279,7 +279,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq, @NTBBloodbath)
 - [x] [hurl](https://github.com/pfeiferj/tree-sitter-hurl) (maintained by @pfeiferj)
 - [x] [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) (maintained by @luckasRanarison)
-- [x] [idl](https://github.com/cathaysia/tree-sitter-idl) (maintained by @cathaysa)
+- [x] [idl](https://github.com/cathaysia/tree-sitter-idl) (maintained by @cathaysia)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
 - [x] [inko](https://github.com/inko-lang/tree-sitter-inko) (maintained by @yorickpeterse)
 - [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)

From 699766a0b9652224057ecbceec713a01fc7ed639 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 1 Jul 2024 15:19:08 +0100
Subject: [PATCH 1596/2704] feat(bp): update parser and queries (#6843)

---
 lockfile.json             | 2 +-
 queries/bp/highlights.scm | 1 +
 queries/bp/locals.scm     | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 16c164e36..a9bc00f15 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "60ba73739c6083c693d86a1a7cf039c07eb4ed59"
   },
   "bp": {
-    "revision": "2326d709fb9cf73cf124fdbc803c267f851721a4"
+    "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
     "revision": "deca017a554045b4c203e7ddff39ae64ff05e071"
diff --git a/queries/bp/highlights.scm b/queries/bp/highlights.scm
index d18e6eea0..5f94f4c11 100644
--- a/queries/bp/highlights.scm
+++ b/queries/bp/highlights.scm
@@ -42,6 +42,7 @@
 [
   (unset)
   (default)
+  (any)
 ] @variable.builtin
 
 (condition
diff --git a/queries/bp/locals.scm b/queries/bp/locals.scm
index 66b444fc6..c8a5a1719 100644
--- a/queries/bp/locals.scm
+++ b/queries/bp/locals.scm
@@ -9,4 +9,7 @@
 (assignment
   left: (identifier) @local.definition.var)
 
+(pattern_binding
+  binding: (identifier) @local.definition.var)
+
 (identifier) @local.reference

From ffd7725102f47e7391d7a5e7621d178689602a52 Mon Sep 17 00:00:00 2001
From: DragonBillow <DragonBillow@outlook.com>
Date: Mon, 1 Jul 2024 18:11:47 +0800
Subject: [PATCH 1597/2704] feat(idl): add indents

Signed-off-by: DragonBillow <DragonBillow@outlook.com>
---
 queries/idl/indents.scm | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 queries/idl/indents.scm

diff --git a/queries/idl/indents.scm b/queries/idl/indents.scm
new file mode 100644
index 000000000..5c75c52b5
--- /dev/null
+++ b/queries/idl/indents.scm
@@ -0,0 +1,7 @@
+";" @indent.end
+
+"}" @indent.branch
+
+(definition) @indent.begin
+
+(predefine) @indent.ignore

From 495c93b0d4f49f688a83f493bee0908fe1d2d2df Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 06:40:21 +0000
Subject: [PATCH 1598/2704] bot(lockfile): update git_rebase, gitcommit

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a9bc00f15..7a4276583 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -210,13 +210,13 @@
     "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
   },
   "git_rebase": {
-    "revision": "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"
+    "revision": "274e27ea0f09371122ab55b8a812a32d6ef644e8"
   },
   "gitattributes": {
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "821994a8029b0e271171da4331b8cfc0294d08ed"
+    "revision": "aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"

From e0d6c7643dc953acc2e817d0cebfc2f1f8c008e1 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 1 Jul 2024 15:01:37 -0700
Subject: [PATCH 1599/2704] feat(diff): Highlight comments

---
 queries/diff/highlights.scm | 2 ++
 queries/diff/injections.scm | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 queries/diff/injections.scm

diff --git a/queries/diff/highlights.scm b/queries/diff/highlights.scm
index 44506c056..2a064eb7a 100644
--- a/queries/diff/highlights.scm
+++ b/queries/diff/highlights.scm
@@ -1,3 +1,5 @@
+(comment) @comment @spell
+
 [
   (addition)
   (new_file)
diff --git a/queries/diff/injections.scm b/queries/diff/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/diff/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 6cd4ce6cab184e8787f164a182954534221f2af2 Mon Sep 17 00:00:00 2001
From: Stefano Volpe <foxy@teapot.ovh>
Date: Tue, 2 Jul 2024 14:57:30 +0000
Subject: [PATCH 1600/2704] feat: add prolog and problog parser and queries
 (#6810)

---
 README.md                       |  2 ++
 lockfile.json                   |  6 +++++
 lua/nvim-treesitter/parsers.lua | 18 ++++++++++++++
 queries/problog/folds.scm       |  1 +
 queries/problog/highlights.scm  |  4 +++
 queries/problog/indents.scm     |  1 +
 queries/problog/injections.scm  |  1 +
 queries/prolog/folds.scm        |  6 +++++
 queries/prolog/highlights.scm   | 43 +++++++++++++++++++++++++++++++++
 queries/prolog/indents.scm      | 16 ++++++++++++
 queries/prolog/injections.scm   |  2 ++
 11 files changed, 100 insertions(+)
 create mode 100644 queries/problog/folds.scm
 create mode 100644 queries/problog/highlights.scm
 create mode 100644 queries/problog/indents.scm
 create mode 100644 queries/problog/injections.scm
 create mode 100644 queries/prolog/folds.scm
 create mode 100644 queries/prolog/highlights.scm
 create mode 100644 queries/prolog/indents.scm
 create mode 100644 queries/prolog/injections.scm

diff --git a/README.md b/README.md
index 14ce6d358..b62481fbb 100644
--- a/README.md
+++ b/README.md
@@ -350,6 +350,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [printf](https://github.com/ObserverOfTime/tree-sitter-printf) (maintained by @ObserverOfTime)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
+- [x] [problog](https://codeberg.org/foxy/tree-sitter-prolog) (maintained by @foxyseta)
+- [x] [prolog](https://codeberg.org/foxy/tree-sitter-prolog) (maintained by @foxyseta)
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
 - [x] [properties](https://github.com/tree-sitter-grammars/tree-sitter-properties) (maintained by @ObserverOfTime)
 - [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
diff --git a/lockfile.json b/lockfile.json
index 7a4276583..4e1048953 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -530,6 +530,12 @@
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
+  "problog": {
+    "revision": "d8bc22c007825d3af3d62b4326f9d8f9ca529974"
+  },
+  "prolog": {
+    "revision": "d8bc22c007825d3af3d62b4326f9d8f9ca529974"
+  },
   "promql": {
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4d655727b..8a783483c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1565,6 +1565,24 @@ list.prisma = {
   maintainers = { "@elianiva" },
 }
 
+list.problog = {
+  install_info = {
+    url = "https://codeberg.org/foxy/tree-sitter-prolog",
+    files = { "src/parser.c" },
+    location = "grammars/problog",
+  },
+  maintainers = { "@foxyseta" },
+}
+
+list.prolog = {
+  install_info = {
+    url = "https://codeberg.org/foxy/tree-sitter-prolog",
+    files = { "src/parser.c" },
+    location = "grammars/prolog",
+  },
+  maintainers = { "@foxyseta" },
+}
+
 list.promql = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-promql",
diff --git a/queries/problog/folds.scm b/queries/problog/folds.scm
new file mode 100644
index 000000000..768718207
--- /dev/null
+++ b/queries/problog/folds.scm
@@ -0,0 +1 @@
+; inherits: prolog
diff --git a/queries/problog/highlights.scm b/queries/problog/highlights.scm
new file mode 100644
index 000000000..de1715662
--- /dev/null
+++ b/queries/problog/highlights.scm
@@ -0,0 +1,4 @@
+; inherits: prolog
+
+(probability_label
+  _ @attribute)
diff --git a/queries/problog/indents.scm b/queries/problog/indents.scm
new file mode 100644
index 000000000..768718207
--- /dev/null
+++ b/queries/problog/indents.scm
@@ -0,0 +1 @@
+; inherits: prolog
diff --git a/queries/problog/injections.scm b/queries/problog/injections.scm
new file mode 100644
index 000000000..768718207
--- /dev/null
+++ b/queries/problog/injections.scm
@@ -0,0 +1 @@
+; inherits: prolog
diff --git a/queries/prolog/folds.scm b/queries/prolog/folds.scm
new file mode 100644
index 000000000..70a401511
--- /dev/null
+++ b/queries/prolog/folds.scm
@@ -0,0 +1,6 @@
+[
+  (directive_term)
+  (clause_term)
+  (arg_list)
+  (list_notation)
+] @fold
diff --git a/queries/prolog/highlights.scm b/queries/prolog/highlights.scm
new file mode 100644
index 000000000..fc89b6fef
--- /dev/null
+++ b/queries/prolog/highlights.scm
@@ -0,0 +1,43 @@
+(comment) @comment @spell
+
+(atom) @constant
+
+((atom) @boolean
+  (#any-of? @boolean "true" "false"))
+
+(functional_notation
+  function: (atom) @function.call)
+
+(integer) @number
+
+(float_number) @number.float
+
+(directive_head) @operator
+
+(operator_notation
+  operator: _ @operator)
+
+[
+  (open)
+  (open_ct)
+  (close)
+  (open_list)
+  "|"
+  (close_list)
+  (open_curly)
+  (close_curly)
+] @punctuation.bracket
+
+[
+  (arg_list_separator)
+  (comma)
+  (end)
+  (list_notation_separator)
+] @punctuation.delimiter
+
+(operator_notation
+  operator: (semicolon) @punctuation.delimiter)
+
+(double_quoted_list_notation) @string
+
+(variable_term) @variable
diff --git a/queries/prolog/indents.scm b/queries/prolog/indents.scm
new file mode 100644
index 000000000..a7f9b0383
--- /dev/null
+++ b/queries/prolog/indents.scm
@@ -0,0 +1,16 @@
+(directive_term) @indent.zero
+
+(clause_term) @indent.zero
+
+(functional_notation
+  (atom)
+  (open_ct) @indent.begin
+  (close) @indent.end)
+
+(list_notation
+  (open_list) @indent.begin
+  (close_list) @indent.end)
+
+(curly_bracketed_notation
+  (open_curly) @indent.begin
+  (close_curly) @indent.end)
diff --git a/queries/prolog/injections.scm b/queries/prolog/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/prolog/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 0209151fd236016dd217168a61bd9197b1a1b272 Mon Sep 17 00:00:00 2001
From: Derek Gustafson <degustaf@gmail.com>
Date: Wed, 3 Jul 2024 03:49:13 -0400
Subject: [PATCH 1601/2704] feat(elm): add folds queries

---
 queries/elm/folds.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 queries/elm/folds.scm

diff --git a/queries/elm/folds.scm b/queries/elm/folds.scm
new file mode 100644
index 000000000..56987d9f9
--- /dev/null
+++ b/queries/elm/folds.scm
@@ -0,0 +1,14 @@
+((function_call_expr) @_fn
+  (#not-has-parent? @_fn parenthesized_expr)) @fold
+
+[
+  (case_of_branch)
+  (case_of_expr)
+  (value_declaration)
+  (type_declaration)
+  (type_alias_declaration)
+  (list_expr)
+  (record_expr)
+  (parenthesized_expr)
+  (import_clause)+
+] @fold

From f1a4a75005cd262a1c2798a161757ef2a9941074 Mon Sep 17 00:00:00 2001
From: Kai Moschcau <kai.moschcau@blecon.de>
Date: Wed, 3 Jul 2024 09:59:18 +0200
Subject: [PATCH 1602/2704] feat(gotmpl,helm): raise highlight priorities
 (#6712)

---
 queries/gotmpl/highlights.scm | 67 ++++++++++++++++++++++++-----------
 queries/helm/highlights.scm   |  5 +++
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/queries/gotmpl/highlights.scm b/queries/gotmpl/highlights.scm
index ba69dc07d..fd8189453 100644
--- a/queries/gotmpl/highlights.scm
+++ b/queries/gotmpl/highlights.scm
@@ -1,39 +1,49 @@
+; Priorities of the highlight queries are raised, so that they overrule the
+; often surrounding and overlapping highlights from the non-gotmpl injections.
+;
 ; Identifiers
-[
+([
   (field)
   (field_identifier)
 ] @variable.member
+  (#set! priority 110))
 
-(variable) @variable
+((variable) @variable
+  (#set! priority 110))
 
 ; Function calls
 (function_call
-  function: (identifier) @function)
+  function: (identifier) @function
+  (#set! priority 110))
 
 (method_call
   method: (selector_expression
-    field: (field_identifier) @function))
+    field: (field_identifier) @function
+    (#set! priority 110)))
 
 ; Builtin functions
 (function_call
   function: (identifier) @function.builtin
+  (#set! priority 110)
   (#any-of? @function.builtin
     "and" "call" "html" "index" "slice" "js" "len" "not" "or" "print" "printf" "println" "urlquery"
     "eq" "ne" "lt" "ge" "gt" "ge"))
 
 ; Operators
-[
+([
   "|"
   ":="
 ] @operator
+  (#set! priority 110))
 
 ; Delimiters
-[
+([
   "."
   ","
 ] @punctuation.delimiter
+  (#set! priority 110))
 
-[
+([
   "{{"
   "}}"
   "{{-"
@@ -41,6 +51,7 @@
   ")"
   "("
 ] @punctuation.bracket
+  (#set! priority 110))
 
 ; Actions
 (if_action
@@ -49,59 +60,73 @@
     "else"
     "else if"
     "end"
-  ] @keyword.conditional)
+  ] @keyword.conditional
+  (#set! priority 110))
 
 (range_action
   [
     "range"
     "else"
     "end"
-  ] @keyword.repeat)
+  ] @keyword.repeat
+  (#set! priority 110))
 
 (template_action
-  "template" @function.builtin)
+  "template" @function.builtin
+  (#set! priority 110))
 
 (block_action
   [
     "block"
     "end"
-  ] @keyword.directive)
+  ] @keyword.directive
+  (#set! priority 110))
 
 (define_action
   [
     "define"
     "end"
-  ] @keyword.directive.define)
+  ] @keyword.directive.define
+  (#set! priority 110))
 
 (with_action
   [
     "with"
     "else"
     "end"
-  ] @keyword.conditional)
+  ] @keyword.conditional
+  (#set! priority 110))
 
 ; Literals
-[
+([
   (interpreted_string_literal)
   (raw_string_literal)
 ] @string
+  (#set! priority 110))
 
-(rune_literal) @string.special.symbol
+((rune_literal) @string.special.symbol
+  (#set! priority 110))
 
-(escape_sequence) @string.escape
+((escape_sequence) @string.escape
+  (#set! priority 110))
 
-[
+([
   (int_literal)
   (imaginary_literal)
 ] @number
+  (#set! priority 110))
 
-(float_literal) @number.float
+((float_literal) @number.float
+  (#set! priority 110))
 
-[
+([
   (true)
   (false)
 ] @boolean
+  (#set! priority 110))
 
-(nil) @constant.builtin
+((nil) @constant.builtin
+  (#set! priority 110))
 
-(comment) @comment @spell
+((comment) @comment @spell
+  (#set! priority 110))
diff --git a/queries/helm/highlights.scm b/queries/helm/highlights.scm
index 05028ba93..f9af8a596 100644
--- a/queries/helm/highlights.scm
+++ b/queries/helm/highlights.scm
@@ -1,8 +1,11 @@
 ; inherits: gotmpl
 
+; For the reasoning concerning the priorities, see gotmpl highlights.
+;
 ; Builtin functions
 (function_call
   function: (identifier) @function.builtin
+  (#set! priority 110)
   (#any-of? @function.builtin
     "and" "or" "not" "eq" "ne" "lt" "le" "gt" "ge" "default" "required" "empty" "fail" "coalesce"
     "ternary" "print" "println" "printf" "trim" "trimAll" "trimPrefix" "trimSuffix" "lower" "upper"
@@ -33,6 +36,7 @@
 (selector_expression
   operand: (field
     name: (identifier) @constant.builtin
+    (#set! priority 110)
     (#any-of? @constant.builtin
       "Values" "Chart" "Release" "Capabilities" "Files" "Subcharts" "Template"))
   (field_identifier))
@@ -41,5 +45,6 @@
 (selector_expression
   operand: (variable)
   field: (field_identifier) @constant.builtin
+  (#set! priority 110)
   (#any-of? @constant.builtin
     "Values" "Chart" "Release" "Capabilities" "Files" "Subcharts" "Template"))

From 7adae51ff323c8e9c52f63796cd6b97687a5d2c8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 3 Jul 2024 09:54:37 +0200
Subject: [PATCH 1603/2704] fix(turtle): update parser and queries

also update changed user names
---
 README.md                       | 4 ++--
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 8 ++++----
 queries/turtle/folds.scm        | 3 ++-
 queries/turtle/indents.scm      | 3 ++-
 queries/turtle/locals.scm       | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index b62481fbb..1bc745b6d 100644
--- a/README.md
+++ b/README.md
@@ -397,7 +397,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [soql](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [sosl](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
 - [x] [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) (maintained by @Sarrus1)
-- [x] [sparql](https://github.com/BonaBeavis/tree-sitter-sparql) (maintained by @BonaBeavis)
+- [x] [sparql](https://github.com/GordianDziwis/tree-sitter-sparql) (maintained by @GordianDziwis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
 - [x] [squirrel](https://github.com/amaanq/tree-sitter-squirrel) (maintained by @amaanq)
 - [x] [ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) (maintained by @ObserverOfTime)
@@ -427,7 +427,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) (maintained by @tk-shirasaka)
 - [x] [tsv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [tsx](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
-- [x] [turtle](https://github.com/BonaBeavis/tree-sitter-turtle) (maintained by @BonaBeavis)
+- [x] [turtle](https://github.com/GordianDziwis/tree-sitter-turtle) (maintained by @GordianDziwis)
 - [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
 - [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
 - [x] [typespec](https://github.com/happenslol/tree-sitter-typespec) (maintained by @happenslol)
diff --git a/lockfile.json b/lockfile.json
index 4e1048953..7dce69528 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -762,7 +762,7 @@
     "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
   },
   "turtle": {
-    "revision": "085437f5cb117703b7f520dd92161140a684f092"
+    "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
   },
   "twig": {
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8a783483c..7711f7ca1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1959,10 +1959,10 @@ list.sourcepawn = {
 
 list.sparql = {
   install_info = {
-    url = "https://github.com/BonaBeavis/tree-sitter-sparql",
+    url = "https://github.com/GordianDziwis/tree-sitter-sparql",
     files = { "src/parser.c" },
   },
-  maintainers = { "@BonaBeavis" },
+  maintainers = { "@GordianDziwis" },
 }
 
 list.sql = {
@@ -2207,10 +2207,10 @@ list.tsx = {
 
 list.turtle = {
   install_info = {
-    url = "https://github.com/BonaBeavis/tree-sitter-turtle",
+    url = "https://github.com/GordianDziwis/tree-sitter-turtle",
     files = { "src/parser.c" },
   },
-  maintainers = { "@BonaBeavis" },
+  maintainers = { "@GordianDziwis" },
 }
 
 list.twig = {
diff --git a/queries/turtle/folds.scm b/queries/turtle/folds.scm
index 863e442a7..f932a3731 100644
--- a/queries/turtle/folds.scm
+++ b/queries/turtle/folds.scm
@@ -1,4 +1,5 @@
 [
-  (statement)
+  (directive)
+  (triple)
   (blank_node_property_list)
 ] @fold
diff --git a/queries/turtle/indents.scm b/queries/turtle/indents.scm
index add94d18b..a60105667 100644
--- a/queries/turtle/indents.scm
+++ b/queries/turtle/indents.scm
@@ -1,5 +1,6 @@
 [
-  (statement)
+  (directive)
+  (triple)
   (blank_node_property_list)
   (collection)
 ] @indent.begin
diff --git a/queries/turtle/locals.scm b/queries/turtle/locals.scm
index db3455df8..0e251e2fa 100644
--- a/queries/turtle/locals.scm
+++ b/queries/turtle/locals.scm
@@ -1,4 +1,4 @@
-(turtle_doc) @local.scope
+(document) @local.scope
 
 (subject
   [

From fe5c581ed526f9fd21f8957f4e2c7561ef642d17 Mon Sep 17 00:00:00 2001
From: DragonBillow <42114817+cathaysia@users.noreply.github.com>
Date: Wed, 3 Jul 2024 18:00:51 +0800
Subject: [PATCH 1604/2704] feat(idl): update idl parser and queries (#6854)

---
 lockfile.json              |  2 +-
 queries/idl/highlights.scm | 67 ++++++++++++++++++++++++++++++++++++--
 queries/idl/indents.scm    |  5 ++-
 3 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7dce69528..dadcc1b4a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "966797b8c581526efdd2252f815dde6de1a8f932"
+    "revision": "1121e5cf044ecab7202695174c74cfa89a18b6a0"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
diff --git a/queries/idl/highlights.scm b/queries/idl/highlights.scm
index 47ce31b7b..051690836 100644
--- a/queries/idl/highlights.scm
+++ b/queries/idl/highlights.scm
@@ -49,6 +49,27 @@
   "finder"
 ] @keyword.modifier
 
+[
+  "SEQUENTIAL"
+  "HASH"
+  "FINAL"
+  "APPENDABLE"
+  "MUTABLE"
+  "c"
+  "c++"
+  "java"
+  "idl"
+  "*"
+  "BEGIN_FILE"
+  "BEFORE_DECLARATION"
+  "BEGIN_DECLARATION"
+  "END_DECLARATION"
+  "AFTER_DECLARATION"
+  "END_FILE"
+  "CORBA"
+  "DDS"
+] @constant
+
 [
   "switch"
   "case"
@@ -132,11 +153,43 @@
 (annotation_appl
   "@" @attribute)
 
-(annotation_appl
+(annotation_appl_custom_body
   (scoped_name) @attribute)
 
-(annotation_appl
-  (annotation_built_name) @attribute.builtin)
+(annotation_appl_builtin_body
+  (_
+    [
+      "id"
+      "autoid"
+      "optional"
+      "position"
+      "value"
+      "extensibility"
+      "final"
+      "appendable"
+      "mutable"
+      "key"
+      "must_understand"
+      "default_literal"
+      "default"
+      "range"
+      "min"
+      "max"
+      "unit"
+      "bit_bound"
+      "external"
+      "nested"
+      "verbatim"
+      "service"
+      "oneway"
+      "ami"
+    ] @attribute.builtin))
+
+(min_expr
+  "min" @attribute.builtin)
+
+(max_expr
+  "max" @attribute.builtin)
 
 (op_dcl
   (identifier) @function.method)
@@ -339,3 +392,11 @@
 
 (element_spec
   (declarator) @variable.member)
+
+(preproc_include
+  (keyword_include) @type
+  path: (_) @string)
+
+(system_lib_string
+  "<" @string
+  ">" @string)
diff --git a/queries/idl/indents.scm b/queries/idl/indents.scm
index 5c75c52b5..2256fb701 100644
--- a/queries/idl/indents.scm
+++ b/queries/idl/indents.scm
@@ -4,4 +4,7 @@
 
 (definition) @indent.begin
 
-(predefine) @indent.ignore
+[
+  (preproc_define)
+  (preproc_include)
+] @indent.ignore

From 8a04f1aaa9f6fdd1f29e68a33ef9a1ae0423816c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:03:04 +0000
Subject: [PATCH 1605/2704] bot(lockfile): update idl, rbs, v

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dadcc1b4a..cc18c9d9f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -318,7 +318,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "1121e5cf044ecab7202695174c74cfa89a18b6a0"
+    "revision": "dd5ce556451e51d6f67a8f53f103193e39ee49aa"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -591,7 +591,7 @@
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
   "rbs": {
-    "revision": "88d8ed487b5449ddda2fc0c4fe23b71cba29ca24"
+    "revision": "8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99"
   },
   "re2c": {
     "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
@@ -795,7 +795,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "e91f8a42de7842f24f4ce600754f2b6651985fd4"
+    "revision": "7f80a0441ff2ca6aa8ced8e1ee87cead9dd26515"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From caf275382f91ec8a2498d455c4d7d3fd0265ebd3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 3 Jul 2024 09:47:31 +0200
Subject: [PATCH 1606/2704] fix(prolog): switch to github mirror

---
 README.md                       | 4 ++--
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1bc745b6d..a573cd5c7 100644
--- a/README.md
+++ b/README.md
@@ -350,8 +350,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
 - [x] [printf](https://github.com/ObserverOfTime/tree-sitter-printf) (maintained by @ObserverOfTime)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
-- [x] [problog](https://codeberg.org/foxy/tree-sitter-prolog) (maintained by @foxyseta)
-- [x] [prolog](https://codeberg.org/foxy/tree-sitter-prolog) (maintained by @foxyseta)
+- [x] [problog](https://github.com/foxyseta/tree-sitter-prolog) (maintained by @foxyseta)
+- [x] [prolog](https://github.com/foxyseta/tree-sitter-prolog) (maintained by @foxyseta)
 - [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
 - [x] [properties](https://github.com/tree-sitter-grammars/tree-sitter-properties) (maintained by @ObserverOfTime)
 - [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7711f7ca1..5078a3e7d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1567,7 +1567,7 @@ list.prisma = {
 
 list.problog = {
   install_info = {
-    url = "https://codeberg.org/foxy/tree-sitter-prolog",
+    url = "https://github.com/foxyseta/tree-sitter-prolog",
     files = { "src/parser.c" },
     location = "grammars/problog",
   },
@@ -1576,7 +1576,7 @@ list.problog = {
 
 list.prolog = {
   install_info = {
-    url = "https://codeberg.org/foxy/tree-sitter-prolog",
+    url = "https://github.com/foxyseta/tree-sitter-prolog",
     files = { "src/parser.c" },
     location = "grammars/prolog",
   },

From fa611f612a7b04c239d07f61ba80e09cb95c5af4 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 3 Jul 2024 19:13:16 -0700
Subject: [PATCH 1607/2704] fix(ecma): indent single-line if statements (#6846)

Fixes #5898.
---
 queries/ecma/indents.scm         | 13 +++++++++----
 tests/indent/ecma/if_else.js     |  6 ++++++
 tests/indent/javascript_spec.lua |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/queries/ecma/indents.scm b/queries/ecma/indents.scm
index 966664219..d56741670 100644
--- a/queries/ecma/indents.scm
+++ b/queries/ecma/indents.scm
@@ -59,10 +59,11 @@
 (statement_block
   "{" @indent.branch)
 
-(parenthesized_expression
-  ("("
-    (_)
-    ")" @indent.end))
+((parenthesized_expression
+  "("
+  (_)
+  ")" @indent.end) @_outer
+  (#not-has-parent? @_outer if_statement))
 
 [
   "}"
@@ -75,3 +76,7 @@
   (comment)
   (ERROR)
 ] @indent.auto
+
+(if_statement
+  consequence: (_) @indent.dedent
+  (#not-kind-eq? @indent.dedent statement_block)) @indent.begin
diff --git a/tests/indent/ecma/if_else.js b/tests/indent/ecma/if_else.js
index 4f971c8fc..990ccd19a 100644
--- a/tests/indent/ecma/if_else.js
+++ b/tests/indent/ecma/if_else.js
@@ -11,3 +11,9 @@ if (cond1) {
 } else {
   do_fallback()
 }
+
+if (true)
+  console.log('hi')
+console.log('hi')
+
+if (true)
diff --git a/tests/indent/javascript_spec.lua b/tests/indent/javascript_spec.lua
index 827539eeb..5659b22a1 100644
--- a/tests/indent/javascript_spec.lua
+++ b/tests/indent/javascript_spec.lua
@@ -75,6 +75,8 @@ describe("indent JavaScript:", function()
       { 9, 2 },
       { 12, 2 },
       { 13, 0 },
+      { 16, 0 },
+      { 19, 2 },
     } do
       run:new_line("ecma/if_else.js", { on_line = info[1], text = "hello()", indent = info[2] }, info[3], info[4])
     end

From acc1708b962e12cc1d671cd530782727801804c3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 06:40:02 +0000
Subject: [PATCH 1608/2704] bot(lockfile): update c_sharp, erlang

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cc18c9d9f..87b8165f2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "deca017a554045b4c203e7ddff39ae64ff05e071"
   },
   "c_sharp": {
-    "revision": "82fa8f05f41a33e9bc830f85d74a9548f0291738"
+    "revision": "8623a7276b63a99b19f7793b1f81357335adb54f"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -162,7 +162,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "da275db3ae46bbd00f97d11f888d8c58c14faa6d"
+    "revision": "9a04980accfe29a708e738376af50b96d8b562b7"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"

From 5d1646893a01397f2b4abea6ad546c4aa6c6efed Mon Sep 17 00:00:00 2001
From: Omar Valdez <80359343+ValdezFOmar@users.noreply.github.com>
Date: Thu, 4 Jul 2024 10:23:44 -0700
Subject: [PATCH 1609/2704] feat: editorconfig parser and queries

---
 lockfile.json                       |  3 ++
 lua/nvim-treesitter/parsers.lua     |  8 +++++
 queries/editorconfig/folds.scm      |  1 +
 queries/editorconfig/highlights.scm | 56 +++++++++++++++++++++++++++++
 queries/editorconfig/injections.scm |  2 ++
 5 files changed, 70 insertions(+)
 create mode 100644 queries/editorconfig/folds.scm
 create mode 100644 queries/editorconfig/highlights.scm
 create mode 100644 queries/editorconfig/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 87b8165f2..77f91f989 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -140,6 +140,9 @@
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
+  "editorconfig": {
+    "revision": "aec8400b9554eae784125054ac4af7b767804844"
+  },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5078a3e7d..14555c57a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -469,6 +469,14 @@ list.ebnf = {
   experimental = true,
 }
 
+list.editorconfig = {
+  install_info = {
+    url = "https://github.com/ValdezFOmar/tree-sitter-editorconfig",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@ValdezFOmar" },
+}
+
 list.eds = {
   install_info = {
     url = "https://github.com/uyha/tree-sitter-eds",
diff --git a/queries/editorconfig/folds.scm b/queries/editorconfig/folds.scm
new file mode 100644
index 000000000..911798f5a
--- /dev/null
+++ b/queries/editorconfig/folds.scm
@@ -0,0 +1 @@
+(section) @fold
diff --git a/queries/editorconfig/highlights.scm b/queries/editorconfig/highlights.scm
new file mode 100644
index 000000000..fd69bc4c8
--- /dev/null
+++ b/queries/editorconfig/highlights.scm
@@ -0,0 +1,56 @@
+(comment) @comment @spell
+
+; consistency with toml and ini
+(section
+  (section_name) @type)
+
+(character_choice
+  (character) @constant)
+
+(character_range
+  start: (character) @constant
+  end: (character) @constant)
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  ","
+  ".."
+  (path_separator)
+] @punctuation.delimiter
+
+[
+  "-"
+  "="
+  (negation)
+] @operator
+
+[
+  (wildcard_characters)
+  (wildcard_any_characters)
+  (wildcard_single_character)
+] @character.special
+
+(escaped_character) @string.escape
+
+(pair
+  key: (identifier) @property
+  value: (_) @string)
+
+(boolean) @boolean
+
+(integer) @number
+
+(unset) @constant.builtin
+
+[
+  (spelling_language)
+  (indent_style)
+  (end_of_line)
+  (charset)
+] @string.special
diff --git a/queries/editorconfig/injections.scm b/queries/editorconfig/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/editorconfig/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From f2f828c5e995af156106a4aa5647463e49fff66a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 17:23:56 +0000
Subject: [PATCH 1610/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a573cd5c7..ae6f873d1 100644
--- a/README.md
+++ b/README.md
@@ -220,6 +220,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
 - [x] [earthfile](https://github.com/glehmann/tree-sitter-earthfile) (maintained by @glehmann)
 - [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
+- [x] [editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) (maintained by @ValdezFOmar)
 - [x] [eds](https://github.com/uyha/tree-sitter-eds) (maintained by @uyha)
 - [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)
 - [x] [elixir](https://github.com/elixir-lang/tree-sitter-elixir) (maintained by @connorlay)

From f0dbe180004d3566a994b1093e3a37893cc141c1 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 4 Jul 2024 16:42:11 -0700
Subject: [PATCH 1611/2704] feat(jsdoc): add missing highlights

---
 queries/jsdoc/highlights.scm | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/queries/jsdoc/highlights.scm b/queries/jsdoc/highlights.scm
index e20a1bb5a..c6459efb7 100644
--- a/queries/jsdoc/highlights.scm
+++ b/queries/jsdoc/highlights.scm
@@ -1,3 +1,40 @@
 (tag_name) @keyword @nospell
 
 (type) @type @nospell
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ":"
+  "/"
+  "."
+  "#"
+  "~"
+] @punctuation.delimiter
+
+(identifier) @variable
+
+(tag
+  (tag_name) @_name
+  (identifier) @function
+  (#any-of? @_name "@callback" "@function" "@func" "@method"))
+
+(tag
+  (tag_name) @_name
+  (identifier) @variable.parameter
+  (#any-of? @_name "@param" "@arg" "@argument"))
+
+(tag
+  (tag_name) @_name
+  (identifier) @property
+  (#any-of? @_name "@prop" "@property"))
+
+(tag
+  (tag_name) @_name
+  (identifier) @type
+  (#eq? @_name "@typedef"))

From f7c05e3e0510df7c742d455c802e27b6ee7ab384 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 4 Jul 2024 19:09:26 -0700
Subject: [PATCH 1612/2704] fix(html): correct the link label highlight (#6866)

Unlike the `href` attribute, the inner text of the `a` tag is the label
of the link, not the actual URL.
---
 queries/html_tags/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index 4fde36d9e..6c5063c5f 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -86,7 +86,7 @@
 ((element
   (start_tag
     (tag_name) @_tag)
-  (text) @string.special.url)
+  (text) @markup.link.label)
   (#eq? @_tag "a"))
 
 ((attribute

From f197ce27d91b4a2920b51a7ae0140acd294bf319 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 5 Jul 2024 09:30:49 +0200
Subject: [PATCH 1613/2704] docs(readme): update outdated information

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ae6f873d1..f45c2bfe5 100644
--- a/README.md
+++ b/README.md
@@ -105,8 +105,8 @@ All modules are disabled by default and need to be activated explicitly in your
 
 ```lua
 require'nvim-treesitter.configs'.setup {
-  -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "c", "lua", "vim", "vimdoc", "query" },
+  -- A list of parser names, or "all" (the listed parsers MUST always be installed)
+  ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline" },
 
   -- Install parsers synchronously (only applied to `ensure_installed`)
   sync_install = false,
@@ -635,18 +635,18 @@ like the `queries` folder of this plugin, e.g. `queries/{language}/{locals,highl
 Other modules may require additional queries such as `folding.scm`. You can find a
 list of all supported capture names in [CONTRIBUTING.md](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#parser-configurations).
 
-All queries found in the runtime directories will be combined.
-By convention, if you want to write a query, use the `queries/` directory,
-but if you want to extend a query use the `after/queries/` directory.
+The first query file on `runtimepath` will be used (see `:h treesitter-query`).
+If you want to make a query on the user config extend other queries instead of
+replacing them, see `:h treesitter-query-modeline-extends`.
 
-If you want to completely override a query, you can use `:h set_query()`.
+If you want to completely override a query, you can use `:h vim.treesitter.query.set()`.
 For example, to override the `injections` queries from `c` with your own:
 
 ```lua
-require("vim.treesitter.query").set_query("c", "injections", "(comment) @comment")
+vim.treesitter.query.set("c", "injections", "(comment) @comment")
 ```
 
-Note: when using `set_query`, all queries in the runtime directories will be ignored.
+Note: when using `query.set()`, all queries in the runtime directories will be ignored.
 
 ## Adding modules
 

From ee29084ce689c5a8bdc780f5fbec463b8f6e4786 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 06:40:36 +0000
Subject: [PATCH 1614/2704] bot(lockfile): update editorconfig, javascript, wit

---
 lockfile.json              | 6 +++---
 queries/wit/highlights.scm | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 77f91f989..89b3ae6d4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "aec8400b9554eae784125054ac4af7b767804844"
+    "revision": "a1f293faf993209cbbc324c4d73cd907a6aee205"
   },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
@@ -339,7 +339,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "391a8fcc48a11f63bf18ec9885f6f069e760949a"
+    "revision": "12e45374422f6051648717be62f0ffc40a279ee2"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -831,7 +831,7 @@
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
-    "revision": "cab94791450524a542324d8cbe8017d69c516d8e"
+    "revision": "7351db0da11900e7f0c754b3483d39fc6a9d53e8"
   },
   "xcompose": {
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
diff --git a/queries/wit/highlights.scm b/queries/wit/highlights.scm
index 983987b90..8b5ab4aa0 100644
--- a/queries/wit/highlights.scm
+++ b/queries/wit/highlights.scm
@@ -67,8 +67,8 @@
 (enum_items
   name: (id) @type)
 
-(enum_body
-  enum_cases: (id) @constant)
+(enum_case
+  name: (id) @constant)
 
 (resource_item
   name: (id) @type)

From 55a13862cd47b1fb3afcab792b022d97765940e6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 31 Mar 2024 09:20:18 -0700
Subject: [PATCH 1615/2704] feat(nix): indentation queries

---
 queries/nix/indents.scm      |  75 ++++++++++++++++++++
 tests/indent/nix/conds.nix   | 134 +++++++++++++++++++++++++++++++++++
 tests/indent/nix/general.nix | 130 +++++++++++++++++++++++++++++++++
 tests/indent/nix_spec.lua    |  40 +++++++++++
 4 files changed, 379 insertions(+)
 create mode 100644 queries/nix/indents.scm
 create mode 100644 tests/indent/nix/conds.nix
 create mode 100644 tests/indent/nix/general.nix
 create mode 100644 tests/indent/nix_spec.lua

diff --git a/queries/nix/indents.scm b/queries/nix/indents.scm
new file mode 100644
index 000000000..757511b6b
--- /dev/null
+++ b/queries/nix/indents.scm
@@ -0,0 +1,75 @@
+[
+  (list_expression)
+  (indented_string_expression)
+  (let_expression)
+  (if_expression)
+  (binding)
+  (parenthesized_expression)
+] @indent.begin
+
+((attrset_expression) @indent.begin
+  (#not-has-parent? @indent.begin if_expression))
+
+((rec_attrset_expression) @indent.begin
+  (#not-has-parent? @indent.begin if_expression))
+
+((binding
+  "=" @indent.begin)
+  (#set! indent.immediate 1))
+
+(binding
+  ";" @indent.end)
+
+(parenthesized_expression
+  ")" @indent.branch @indent.end)
+
+(attrset_expression
+  "}" @indent.branch @indent.end)
+
+(rec_attrset_expression
+  "}" @indent.branch @indent.end)
+
+(list_expression
+  "]" @indent.branch @indent.dedent)
+
+(indented_string_expression
+  "''" @indent.branch @indent.end .)
+
+[
+  "else"
+  "in"
+] @indent.branch
+
+(let_expression
+  body: (_) @indent.end @indent.dedent)
+
+(string_fragment) @indent.ignore @indent.auto
+
+(if_expression
+  condition: (_) @indent.auto)
+
+alternative: (if_expression) @indent.dedent
+
+(interpolation) @indent.begin @indent.dedent
+
+(interpolation
+  "}" @indent.end @indent.branch)
+
+(ERROR
+  "then" @indent.begin)
+
+(ERROR
+  "then"
+  .
+  (formals) @indent.begin)
+
+(ERROR
+  "then"
+  .
+  (formals
+    "}" @indent.branch @indent.end))
+
+(ERROR
+  "let") @indent.begin
+
+(comment) @indent.ignore
diff --git a/tests/indent/nix/conds.nix b/tests/indent/nix/conds.nix
new file mode 100644
index 000000000..4307fc84e
--- /dev/null
+++ b/tests/indent/nix/conds.nix
@@ -0,0 +1,134 @@
+{ lib }:
+with lib.lists;
+with lib.types;
+with lib.attrsets;
+with lib.strings; {
+  doubleFromSystem = { cpu, kernel, abi, ... }:
+    if abi == abis.cygnus then
+      "${cpu.name}-cygwin"
+    else if kernel.families ? darwin then
+      "${cpu.name}-darwin"
+    else
+      "${cpu.name}-${kernelName kernel}";
+
+  tripleFromSystem = { cpu, vendor, kernel, abi, ... }@sys:
+    assert isSystem sys;
+    let
+      optExecFormat = lib.optionalString (kernel.name == "netbsd"
+        && gnuNetBSDDefaultExecFormat cpu != kernel.execFormat)
+        kernel.execFormat.name;
+      optAbi = lib.optionalString (abi != abis.unknown) "-${abi.name}";
+    in "${cpu.name}-${vendor.name}-${
+      kernelName kernel
+    }${optExecFormat}${optAbi}";
+
+  mkSystemFromSkeleton = { cpu,
+    # Optional, but fallback too complex for here.
+    # Inferred below instead.
+    vendor ? assert false; null, kernel,
+    # Also inferred below
+    abi ? assert false; null, }@args:
+    let
+      getCpu = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}");
+      getVendor = name: vendors.${name} or (throw "Unknown vendor: ${name}");
+      getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}");
+      getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}");
+
+      parsed = {
+        cpu = getCpu args.cpu;
+        vendor = if args ? vendor then
+          getVendor args.vendor
+        else if isDarwin parsed then
+          vendors.apple
+        else if isWindows parsed then
+          vendors.pc
+        else
+          vendors.unknown;
+        kernel = if hasPrefix "darwin" args.kernel then
+          getKernel "darwin"
+        else if hasPrefix "netbsd" args.kernel then
+          getKernel "netbsd"
+        else
+          getKernel args.kernel;
+        abi = if args ? abi then
+          getAbi args.abi
+        else if isLinux parsed || isWindows parsed then
+          if isAarch32 parsed then
+            if lib.versionAtLeast (parsed.cpu.version or "0") "6" then
+              abis.gnueabihf
+            else
+              abis.gnueabi
+          else if isPower64 parsed && isBigEndian parsed then
+            abis.gnuabielfv2
+          else
+            abis.gnu
+        else
+          abis.unknown;
+      };
+    in mkSystem parsed;
+
+  mkSkeletonFromList = l:
+    {
+      "1" = if elemAt l 0 == "avr" then {
+        cpu = elemAt l 0;
+        kernel = "none";
+        abi = "unknown";
+      } else
+        throw "Target specification with 1 components is ambiguous";
+      "2" = # We only do 2-part hacks for things Nix already supports
+        if elemAt l 1 == "cygwin" then {
+          cpu = elemAt l 0;
+          kernel = "windows";
+          abi = "cygnus";
+        } else if elemAt l 1 == "windows" then {
+          cpu = elemAt l 0;
+          kernel = "windows";
+          abi = "msvc";
+        } else if (elemAt l 1) == "elf" then {
+          cpu = elemAt l 0;
+          vendor = "unknown";
+          kernel = "none";
+          abi = elemAt l 1;
+        } else {
+          cpu = elemAt l 0;
+          kernel = elemAt l 1;
+        };
+      "3" =
+        # cpu-kernel-environment
+        if elemAt l 1 == "linux"
+        || elem (elemAt l 2) [ "eabi" "eabihf" "elf" "gnu" ] then {
+          cpu = elemAt l 0;
+          kernel = elemAt l 1;
+          abi = elemAt l 2;
+          vendor = "unknown";
+        } else if elemAt l 1 == "apple"
+        || elem (elemAt l 2) [ "wasi" "redox" "mmixware" "ghcjs" "mingw32" ]
+        || hasPrefix "freebsd" (elemAt l 2) || hasPrefix "netbsd" (elemAt l 2)
+        || hasPrefix "genode" (elemAt l 2) then {
+          cpu = elemAt l 0;
+          vendor = elemAt l 1;
+          kernel = if elemAt l 2 == "mingw32" then
+            "windows" # autotools breaks on -gnu for window
+          else
+            elemAt l 2;
+        } else
+          throw "Target specification with 3 components is ambiguous";
+      "4" = {
+        cpu = elemAt l 0;
+        vendor = elemAt l 1;
+        kernel = elemAt l 2;
+        abi = elemAt l 3;
+      };
+    }.${toString (length l)} or (throw
+      "system string has invalid number of hyphen-separated components");
+
+  # GNU build systems assume that older NetBSD architectures are using a.out.
+  gnuNetBSDDefaultExecFormat = cpu:
+    if (cpu.family == "arm" && cpu.bits == 32)
+    || (cpu.family == "sparc" && cpu.bits == 32)
+    || (cpu.family == "m68k" && cpu.bits == 32)
+    || (cpu.family == "x86" && cpu.bits == 32) then
+      execFormats.aout
+    else
+      execFormats.elf;
+}
diff --git a/tests/indent/nix/general.nix b/tests/indent/nix/general.nix
new file mode 100644
index 000000000..f79214bad
--- /dev/null
+++ b/tests/indent/nix/general.nix
@@ -0,0 +1,130 @@
+{ lib }:
+with lib.lists;
+with lib.types;
+with lib.attrsets;
+with lib.strings;
+with (import ./inspect.nix { inherit lib; }).predicates;
+
+let
+  inherit (lib.options) mergeOneOption;
+
+  setTypes = type:
+    mapAttrs (name: value:
+      assert type.check value;
+      setType type.name ({ inherit name; } // value));
+
+in rec {
+
+  ################################################################################
+
+  types.openSignificantByte = mkOptionType {
+    name = "significant-byte";
+    description = "Endianness";
+    merge = mergeOneOption;
+  };
+
+  types.significantByte = enum (attrValues significantBytes);
+
+  significantBytes = setTypes types.openSignificantByte {
+    bigEndian = { };
+    littleEndian = { };
+  };
+
+  ################################################################################
+
+  # Reasonable power of 2
+  types.bitWidth = enum [ 8 16 32 64 128 ];
+
+  ################################################################################
+
+  types.openCpuType = mkOptionType {
+    name = "cpu-type";
+    description = "instruction set architecture name and information";
+    merge = mergeOneOption;
+    check = x:
+      types.bitWidth.check x.bits && (if 8 < x.bits then
+        types.significantByte.check x.significantByte
+      else
+        !(x ? significantByte));
+  };
+
+  types.cpuType = enum (attrValues cpuTypes);
+
+  cpuTypes = with significantBytes;
+    setTypes types.openCpuType {
+      arm = {
+        bits = 32;
+        significantByte = littleEndian;
+        family = "arm";
+      };
+      armv5tel = {
+        bits = 32;
+        significantByte = littleEndian;
+        family = "arm";
+        version = "5";
+        arch = "armv5t";
+      };
+    };
+
+  isCompatible = a: b:
+    with cpuTypes;
+    lib.any lib.id [
+      # x86
+      (b == i386 && isCompatible a i486)
+      (b == i486 && isCompatible a i586)
+      (b == i586 && isCompatible a i686)
+
+      # ARMv6
+      (b == armv6l && isCompatible a armv6m)
+      (b == armv6m && isCompatible a armv7l)
+    ];
+
+  ################################################################################
+
+  types.openVendor = mkOptionType {
+    name = "vendor";
+    description = "vendor for the platform";
+    merge = mergeOneOption;
+  };
+
+  abis = setTypes types.openAbi {
+    cygnus = { };
+    msvc = { };
+
+    # Other architectures should use ELF in embedded situations.
+    elf = { };
+
+    androideabi = { };
+    android = {
+      assertions = [{
+        assertion = platform: !platform.isAarch32;
+        message = ''
+          The "android" ABI is not for 32-bit ARM. Use "androideabi" instead.
+        '';
+      }];
+    };
+  };
+
+  ################################################################################
+
+  types.parsedPlatform = mkOptionType {
+    name = "system";
+    description =
+      "fully parsed representation of llvm- or nix-style platform tuple";
+    merge = mergeOneOption;
+    check = { cpu, vendor, kernel, abi, }:
+      types.cpuType.check cpu && types.vendor.check vendor
+      && types.kernel.check kernel && types.abi.check abi;
+  };
+
+  isSystem = isType "system";
+
+  mkSystem = components:
+    assert types.parsedPlatform.check components;
+    setType "system" components;
+
+  mkSystemFromString = s:
+    mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s));
+
+  ################################################################################
+}
diff --git a/tests/indent/nix_spec.lua b/tests/indent/nix_spec.lua
new file mode 100644
index 000000000..709a0a109
--- /dev/null
+++ b/tests/indent/nix_spec.lua
@@ -0,0 +1,40 @@
+local Runner = require("tests.indent.common").Runner
+
+local runner = Runner:new(it, "tests/indent/nix", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 2,
+  expandtab = true,
+})
+
+describe("indent Nix:", function()
+  describe("whole file:", function()
+    runner:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+
+  describe("new line:", function()
+    for _, info in ipairs {
+      { 14, 2 },
+      { 16, 2 },
+      { 48, 4 },
+      { 112, 6 },
+    } do
+      runner:new_line("general.nix", { on_line = info[1], text = "x = 1;", indent = info[2] })
+    end
+
+    for _, info in ipairs {
+      { 115, 6 },
+      { 113, 10 },
+      { 6, 4 },
+      { 12, 2 },
+      { 16, 6 },
+      { 35, 6 },
+      { 23, 2 },
+      { 21, 6 },
+    } do
+      runner:new_line("conds.nix", { on_line = info[1], text = "x = 1;", indent = info[2] })
+    end
+  end)
+end)

From 2d917106d172d8a207042f357c8d983afd391050 Mon Sep 17 00:00:00 2001
From: Abhinav Natarajan <abhinav.v.natarajan@gmail.com>
Date: Wed, 3 Jul 2024 14:16:42 +0100
Subject: [PATCH 1616/2704] fix(indent): indent empty lines correctly

fix(indent):
---
 lua/nvim-treesitter/indent.lua | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index a9e5e6cee..19e7ef1ee 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -17,12 +17,19 @@ local function getline(lnum)
   return vim.api.nvim_buf_get_lines(0, lnum - 1, lnum, false)[1] or ""
 end
 
+---@param lnum integer
+---@return integer
+local function get_indentcols_at_line(lnum)
+  local _, indentcols = getline(lnum):find "^%s*"
+  return indentcols or 0
+end
+
 ---@param root TSNode
 ---@param lnum integer
 ---@param col? integer
 ---@return TSNode
 local function get_first_node_at_line(root, lnum, col)
-  col = col or vim.fn.indent(lnum)
+  col = col or get_indentcols_at_line(lnum)
   return root:descendant_for_range(lnum - 1, col, lnum - 1, col + 1)
 end
 
@@ -152,20 +159,20 @@ function M.get_indent(lnum)
   local node ---@type TSNode
   if is_empty_line then
     local prevlnum = vim.fn.prevnonblank(lnum)
-    local indent = vim.fn.indent(prevlnum)
+    local indentcols = get_indentcols_at_line(prevlnum)
     local prevline = vim.trim(getline(prevlnum))
     -- The final position can be trailing spaces, which should not affect indentation
-    node = get_last_node_at_line(root, prevlnum, indent + #prevline - 1)
+    node = get_last_node_at_line(root, prevlnum, indentcols + #prevline - 1)
     if node:type():match "comment" then
       -- The final node we capture of the previous line can be a comment node, which should also be ignored
       -- Unless the last line is an entire line of comment, ignore the comment range and find the last node again
-      local first_node = get_first_node_at_line(root, prevlnum, indent)
+      local first_node = get_first_node_at_line(root, prevlnum, indentcols)
       local _, scol, _, _ = node:range()
       if first_node:id() ~= node:id() then
         -- In case the last captured node is a trailing comment node, re-trim the string
-        prevline = vim.trim(prevline:sub(1, scol - indent))
+        prevline = vim.trim(prevline:sub(1, scol - indentcols))
         -- Add back indent as indent of prevline was trimmed away
-        local col = indent + #prevline - 1
+        local col = indentcols + #prevline - 1
         node = get_last_node_at_line(root, prevlnum, col)
       end
     end

From 74dc34a7fa8e1ea4bcc4578f7a4b14e3ec8c189f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Fri, 5 Jul 2024 21:48:45 +0900
Subject: [PATCH 1617/2704] fix(go): narrow down } usage

---
 queries/go/indents.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/queries/go/indents.scm b/queries/go/indents.scm
index b26811c83..a4fea2721 100644
--- a/queries/go/indents.scm
+++ b/queries/go/indents.scm
@@ -12,10 +12,21 @@
   (block)
   (call_expression)
   (parameter_list)
-  (struct_type)
+  (field_declaration_list)
+  (interface_type)
 ] @indent.begin
 
-"}" @indent.branch
+(literal_value
+  "}" @indent.branch)
+
+(block
+  "}" @indent.branch)
+
+(field_declaration_list
+  "}" @indent.branch)
+
+(interface_type
+  "}" @indent.branch)
 
 (const_declaration
   ")" @indent.branch)

From a8c082b4f5b3b70bde2ffb08cc112dfd7e515fb3 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 5 Jul 2024 06:46:34 -0700
Subject: [PATCH 1618/2704] feat(jsx): apply HTML-based highlight improvements
 (#6867)

---
 queries/jsx/highlights.scm | 84 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index deb3c1598..a53b95339 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -65,3 +65,87 @@
 (jsx_text) @none @spell
 
 (html_character_reference) @character.special
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.heading)
+  (#eq? @_tag "title"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.heading.1)
+  (#eq? @_tag "h1"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.heading.2)
+  (#eq? @_tag "h2"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.heading.3)
+  (#eq? @_tag "h3"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.heading.4)
+  (#eq? @_tag "h4"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.heading.5)
+  (#eq? @_tag "h5"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.heading.6)
+  (#eq? @_tag "h6"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.strong)
+  (#any-of? @_tag "strong" "b"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.italic)
+  (#any-of? @_tag "em" "i"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.strikethrough)
+  (#any-of? @_tag "s" "del"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.underline)
+  (#eq? @_tag "u"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.raw)
+  (#any-of? @_tag "code" "kbd"))
+
+((jsx_element
+  (jsx_opening_element
+    name: (identifier) @_tag)
+  (jsx_text) @markup.link.label)
+  (#eq? @_tag "a"))
+
+((jsx_attribute
+  (property_identifier) @_attr
+  (string
+    (string_fragment) @string.special.url))
+  (#any-of? @_attr "href" "src"))

From ad43c7f19ec44da807264cee88f3f929db1233d5 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete.matsy@gmail.com>
Date: Sun, 7 Jul 2024 18:24:57 +0300
Subject: [PATCH 1619/2704] feat(ruby): highlights for special methods (#6735)

---
 queries/ruby/highlights.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 83cffffd4..738f9c9f8 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -71,9 +71,6 @@
   "ensure"
 ] @keyword.exception
 
-((identifier) @keyword.exception
-  (#any-of? @keyword.exception "fail" "raise"))
-
 ; Function calls
 "defined?" @function
 
@@ -127,6 +124,14 @@
   (#any-of? @constant.builtin
     "__callee__" "__dir__" "__id__" "__method__" "__send__" "__ENCODING__" "__FILE__" "__LINE__"))
 
+((identifier) @function.builtin
+  (#any-of? @function.builtin
+    "include" "extend" "prepend" "attr_reader" "attr_writer" "attr_accessor" "module_function"
+    "refine" "using"))
+
+((identifier) @keyword.exception
+  (#any-of? @keyword.exception "raise" "fail" "catch" "throw"))
+
 ((constant) @type
   (#not-lua-match? @type "^[A-Z0-9_]+$"))
 

From f9aa4f060ef73b487932696a84ed48b67eb1373e Mon Sep 17 00:00:00 2001
From: zhaown <51357674+chaozwn@users.noreply.github.com>
Date: Sun, 7 Jul 2024 23:27:21 +0800
Subject: [PATCH 1620/2704] feat: add goctl parser and queries

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++
 queries/goctl/folds.scm         | 11 +++++
 queries/goctl/highlights.scm    | 79 +++++++++++++++++++++++++++++++++
 queries/goctl/injections.scm    |  3 ++
 6 files changed, 105 insertions(+)
 create mode 100644 queries/goctl/folds.scm
 create mode 100644 queries/goctl/highlights.scm
 create mode 100644 queries/goctl/injections.scm

diff --git a/README.md b/README.md
index f45c2bfe5..7946ca252 100644
--- a/README.md
+++ b/README.md
@@ -254,6 +254,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [GN (Generate Ninja)](https://github.com/amaanq/tree-sitter-gn) (maintained by @amaanq)
 - [x] [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) (maintained by @dpezto)
 - [x] [go](https://github.com/tree-sitter/tree-sitter-go) (maintained by @theHamsta, @WinWisely268)
+- [x] [goctl](https://github.com/chaozwn/tree-sitter-goctl) (maintained by @chaozwn)
 - [x] [Godot Resources (gdresource)](https://github.com/PrestonKnopp/tree-sitter-godot-resource) (maintained by @pierpo)
 - [x] [gomod](https://github.com/camdencheek/tree-sitter-go-mod) (maintained by @camdencheek)
 - [x] [gosum](https://github.com/amaanq/tree-sitter-go-sum) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 89b3ae6d4..0d02affec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -242,6 +242,9 @@
   "go": {
     "revision": "7ee8d928db5202f6831a78f8112fd693bf69f98b"
   },
+  "goctl": {
+    "revision": "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3"
+  },
   "godot_resource": {
     "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 14555c57a..65d9313ae 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -757,6 +757,14 @@ list.go = {
   maintainers = { "@theHamsta", "@WinWisely268" },
 }
 
+list.goctl = {
+  install_info = {
+    url = "https://github.com/chaozwn/tree-sitter-goctl.git",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@chaozwn" },
+}
+
 list.godot_resource = {
   install_info = {
     url = "https://github.com/PrestonKnopp/tree-sitter-godot-resource",
diff --git a/queries/goctl/folds.scm b/queries/goctl/folds.scm
new file mode 100644
index 000000000..704928675
--- /dev/null
+++ b/queries/goctl/folds.scm
@@ -0,0 +1,11 @@
+[
+  (typeGroupSpec)
+  (typeSingleSpec)
+  (typeStruct)
+  (serviceSpec)
+  (serviceBody)
+  (importStatement)
+  (serviceServerSpec)
+  (infoStatement)
+  (structType)
+] @fold
diff --git a/queries/goctl/highlights.scm b/queries/goctl/highlights.scm
new file mode 100644
index 000000000..a4b809a1c
--- /dev/null
+++ b/queries/goctl/highlights.scm
@@ -0,0 +1,79 @@
+; Key Symbol
+"=" @operator
+
+[
+  "."
+  ","
+  ":"
+  ";"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+; Keywords
+[
+  "syntax"
+  "info"
+  "service"
+] @keyword
+
+"import" @keyword.import
+
+"returns" @keyword.return
+
+[
+  "type"
+  "struct"
+] @keyword.type
+
+[
+  "@doc"
+  "@handler"
+  "@server"
+] @attribute
+
+; Service
+(serviceName) @type
+
+; Httpmethod
+(HTTPMETHOD) @keyword.operator
+
+; Field
+(fieldType) @type.builtin
+
+(fieldName) @variable.member
+
+(anonymousField) @variable.member
+
+; Functions
+(handlerValue) @function.method
+
+; Strings
+(VALUE) @string
+
+(tag) @string.documentation
+
+(PATH) @string.special.path
+
+; Comments
+(comment) @comment @spell
+
+(key) @variable.member
+
+(identValue) @string
+
+(DURATION) @number
+
+(NUMBER) @number
+
+; Struct
+(structNameId) @type
+
+(body) @type
diff --git a/queries/goctl/injections.scm b/queries/goctl/injections.scm
new file mode 100644
index 000000000..a53abee57
--- /dev/null
+++ b/queries/goctl/injections.scm
@@ -0,0 +1,3 @@
+; Inject comment language for goctl
+((comment) @injection.content
+  (#set! injection.language "comment"))

From b32fb412847e32870b6cc2e3a762a364e1a7863b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 7 Jul 2024 17:29:49 +0200
Subject: [PATCH 1621/2704] fix(parsers): drop .git suffix from URLs

---
 lua/nvim-treesitter/parsers.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 65d9313ae..c2d26acf9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -203,7 +203,7 @@ list.bitbake = {
 
 list.blueprint = {
   install_info = {
-    url = "https://gitlab.com/gabmus/tree-sitter-blueprint.git",
+    url = "https://gitlab.com/gabmus/tree-sitter-blueprint",
     files = { "src/parser.c" },
   },
   maintainers = { "@gabmus" },
@@ -638,7 +638,7 @@ list.func = {
 
 list.fusion = {
   install_info = {
-    url = "https://gitlab.com/jirgn/tree-sitter-fusion.git",
+    url = "https://gitlab.com/jirgn/tree-sitter-fusion",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@jirgn" },
@@ -759,7 +759,7 @@ list.go = {
 
 list.goctl = {
   install_info = {
-    url = "https://github.com/chaozwn/tree-sitter-goctl.git",
+    url = "https://github.com/chaozwn/tree-sitter-goctl",
     files = { "src/parser.c" },
   },
   maintainers = { "@chaozwn" },
@@ -1066,7 +1066,7 @@ list.json5 = {
 
 list.jsonc = {
   install_info = {
-    url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git",
+    url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc",
     files = { "src/parser.c" },
     generate_requires_npm = true,
   },
@@ -1461,7 +1461,7 @@ list.org = {
 
 list.pascal = {
   install_info = {
-    url = "https://github.com/Isopod/tree-sitter-pascal.git",
+    url = "https://github.com/Isopod/tree-sitter-pascal",
     files = { "src/parser.c" },
   },
   maintainers = { "@Isopod" },
@@ -2092,7 +2092,7 @@ list.systemverilog = {
 
 list.t32 = {
   install_info = {
-    url = "https://gitlab.com/xasc/tree-sitter-t32.git",
+    url = "https://gitlab.com/xasc/tree-sitter-t32",
     files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "trace32",
@@ -2185,7 +2185,7 @@ list.tmux = {
 
 list.todotxt = {
   install_info = {
-    url = "https://github.com/arnarg/tree-sitter-todotxt.git",
+    url = "https://github.com/arnarg/tree-sitter-todotxt",
     files = { "src/parser.c" },
   },
   maintainers = { "@arnarg" },

From adf6730dc58bac0c0939b8095a41c9413cb0ad1e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 7 Jul 2024 15:30:07 +0000
Subject: [PATCH 1622/2704] bot(readme): update

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7946ca252..cc23b226a 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
 - [x] [bitbake](https://github.com/amaanq/tree-sitter-bitbake) (maintained by @amaanq)
-- [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
+- [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) (experimental, maintained by @gabmus)
 - [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
@@ -240,7 +240,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [fortran](https://github.com/stadelmanma/tree-sitter-fortran) (maintained by @amaanq)
 - [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
-- [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
+- [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion) (maintained by @jirgn)
 - [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
 - [x] [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) (maintained by @godofavacyn)
 - [x] [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
@@ -292,7 +292,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) (maintained by @steelsojka)
 - [x] [json](https://github.com/tree-sitter/tree-sitter-json) (maintained by @steelsojka)
 - [x] [json5](https://github.com/Joakker/tree-sitter-json5) (maintained by @Joakker)
-- [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) (maintained by @WhyNotHugo)
+- [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) (maintained by @WhyNotHugo)
 - [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
 - [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @theHamsta)
 - [x] [just](https://github.com/IndianBoy42/tree-sitter-just) (maintained by @Hubro)
@@ -338,7 +338,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) (maintained by @undu)
 - [x] [odin](https://github.com/amaanq/tree-sitter-odin) (maintained by @amaanq)
 - [ ] [org](https://github.com/milisims/tree-sitter-org)
-- [x] [pascal](https://github.com/Isopod/tree-sitter-pascal.git) (maintained by @Isopod)
+- [x] [pascal](https://github.com/Isopod/tree-sitter-pascal) (maintained by @Isopod)
 - [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
 - [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
 - [x] [perl](https://github.com/tree-sitter-perl/tree-sitter-perl) (maintained by @RabbiVeesh, @LeoNerd)
@@ -413,7 +413,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
 - [x] [systemverilog](https://github.com/zhangwwpeng/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
-- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
+- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [tact](https://github.com/tact-lang/tree-sitter-tact) (maintained by @novusnota)
 - [x] [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) (maintained by @lewis6991)
@@ -425,7 +425,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [tiger](https://github.com/ambroisie/tree-sitter-tiger) (maintained by @ambroisie)
 - [x] [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) (maintained by @ahelwer, @susliko)
 - [x] [tmux](https://github.com/Freed-Wu/tree-sitter-tmux) (maintained by @Freed-Wu)
-- [x] [todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) (experimental, maintained by @arnarg)
+- [x] [todotxt](https://github.com/arnarg/tree-sitter-todotxt) (experimental, maintained by @arnarg)
 - [x] [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) (maintained by @tk-shirasaka)
 - [x] [tsv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [tsx](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)

From b7c0dbbe7d724f4741af37779135653bc3860304 Mon Sep 17 00:00:00 2001
From: Liam Woodleigh-Hardinge <liam.woodleigh@gmail.com>
Date: Sun, 7 Jul 2024 17:57:06 +0200
Subject: [PATCH 1623/2704] fix(wit): highlight <> as brackets (#6879)

---
 lockfile.json              | 2 +-
 queries/wit/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 0d02affec..cef1d9c68 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -834,7 +834,7 @@
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
-    "revision": "7351db0da11900e7f0c754b3483d39fc6a9d53e8"
+    "revision": "cd7e6534fd9a22e3e9a7a85feecf4e35461e47cb"
   },
   "xcompose": {
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
diff --git a/queries/wit/highlights.scm b/queries/wit/highlights.scm
index 8b5ab4aa0..bc9b59bb0 100644
--- a/queries/wit/highlights.scm
+++ b/queries/wit/highlights.scm
@@ -145,6 +145,8 @@
   "}"
   "("
   ")"
+  ">"
+  "<"
 ] @punctuation.bracket
 
 "=" @operator

From 64f6f0ab4e3f613aa682eb5fe29c5025db500ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Yngve=20Lerv=C3=A5g?= <karl.yngve+git@gmail.com>
Date: Sun, 7 Jul 2024 18:37:02 +0200
Subject: [PATCH 1624/2704] fix(hurl): multiline injection query needs
 injection.combined

fixes: #6882, https://github.com/pfeiferj/tree-sitter-hurl/issues/10
---
 queries/hurl/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/hurl/injections.scm b/queries/hurl/injections.scm
index 109d9125f..41abb387b 100644
--- a/queries/hurl/injections.scm
+++ b/queries/hurl/injections.scm
@@ -11,4 +11,5 @@
 (multiline_string
   (multiline_string_type) @_lang
   (multiline_string_content) @injection.content
-  (#set-lang-from-info-string! @_lang))
+  (#set-lang-from-info-string! @_lang)
+  (#set! injection.combined))

From b149008257e67334885dee7ecd694bf3f8b5acd0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 8 Jul 2024 10:37:00 +0200
Subject: [PATCH 1625/2704] fix(parsers): keep .git suffix for gitlab urls

---
 lua/nvim-treesitter/parsers.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c2d26acf9..0c185c2c5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -203,7 +203,7 @@ list.bitbake = {
 
 list.blueprint = {
   install_info = {
-    url = "https://gitlab.com/gabmus/tree-sitter-blueprint",
+    url = "https://gitlab.com/gabmus/tree-sitter-blueprint.git",
     files = { "src/parser.c" },
   },
   maintainers = { "@gabmus" },
@@ -638,7 +638,7 @@ list.func = {
 
 list.fusion = {
   install_info = {
-    url = "https://gitlab.com/jirgn/tree-sitter-fusion",
+    url = "https://gitlab.com/jirgn/tree-sitter-fusion.git",
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@jirgn" },
@@ -1066,7 +1066,7 @@ list.json5 = {
 
 list.jsonc = {
   install_info = {
-    url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc",
+    url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git",
     files = { "src/parser.c" },
     generate_requires_npm = true,
   },
@@ -2092,7 +2092,7 @@ list.systemverilog = {
 
 list.t32 = {
   install_info = {
-    url = "https://gitlab.com/xasc/tree-sitter-t32",
+    url = "https://gitlab.com/xasc/tree-sitter-t32.git",
     files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "trace32",

From 55b30b908ece8d04609f88d9991f6d4127487c8b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 08:37:16 +0000
Subject: [PATCH 1626/2704] bot(readme): update

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cc23b226a..10506067e 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
 - [x] [bitbake](https://github.com/amaanq/tree-sitter-bitbake) (maintained by @amaanq)
-- [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) (experimental, maintained by @gabmus)
+- [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
@@ -240,7 +240,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [fortran](https://github.com/stadelmanma/tree-sitter-fortran) (maintained by @amaanq)
 - [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
-- [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion) (maintained by @jirgn)
+- [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
 - [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
 - [x] [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) (maintained by @godofavacyn)
 - [x] [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
@@ -292,7 +292,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) (maintained by @steelsojka)
 - [x] [json](https://github.com/tree-sitter/tree-sitter-json) (maintained by @steelsojka)
 - [x] [json5](https://github.com/Joakker/tree-sitter-json5) (maintained by @Joakker)
-- [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) (maintained by @WhyNotHugo)
+- [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) (maintained by @WhyNotHugo)
 - [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
 - [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @theHamsta)
 - [x] [just](https://github.com/IndianBoy42/tree-sitter-just) (maintained by @Hubro)
@@ -413,7 +413,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
 - [x] [systemverilog](https://github.com/zhangwwpeng/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
-- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32) (maintained by @xasc)
+- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [tact](https://github.com/tact-lang/tree-sitter-tact) (maintained by @novusnota)
 - [x] [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) (maintained by @lewis6991)

From 66ec1b3c4e1828d00f59fb97ebfd33afcd352eb8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 08:38:13 +0000
Subject: [PATCH 1627/2704] bot(lockfile): update editorconfig, fortran, hare,
 idl, mlir, nim, php, php_only, python, squirrel, tlaplus

---
 lockfile.json                  | 22 +++++++++++-----------
 queries/tlaplus/highlights.scm |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cef1d9c68..f6a682a31 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "a1f293faf993209cbbc324c4d73cd907a6aee205"
+    "revision": "c5f83685a64117872ae750ce14333a7a1dddcf0b"
   },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
@@ -192,7 +192,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "f73d473e3530862dee7cbb38520f28824e7804f6"
+    "revision": "dde9829554b831cf6cbf927294f22dfb9a8f0419"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -276,7 +276,7 @@
     "revision": "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"
   },
   "hare": {
-    "revision": "070524937539eb8bb4f10debd9c83b66c434f3a2"
+    "revision": "4af5d82cf9ec39f67cb1db5b7a9269d337406592"
   },
   "haskell": {
     "revision": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "dd5ce556451e51d6f67a8f53f103193e39ee49aa"
+    "revision": "443308c0f32af6681e5b0a09bb7071f3c0c85d74"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -444,7 +444,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "268bc99020f7ba7a219f839e3a6a31c36ad0826b"
+    "revision": "935a551f76fb07f66d0ce6f1f6e955d22cd44f15"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -456,7 +456,7 @@
     "revision": "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"
   },
   "nim": {
-    "revision": "961c2798cec9250c44f7d7225ddb33d47d25856a"
+    "revision": "bb2f809b65c5c943d16c45dd17e631bf3d5d4f07"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
@@ -507,10 +507,10 @@
     "revision": "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"
   },
   "php": {
-    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
+    "revision": "575a0801f430c8672db70b73493c033a9dcfc328"
   },
   "php_only": {
-    "revision": "4f124bc6075e1c3333e80190c1c170933ed72c95"
+    "revision": "575a0801f430c8672db70b73493c033a9dcfc328"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -570,7 +570,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "71778c2a472ed00a64abf4219544edbf8e4b86d7"
+    "revision": "ccc2408e558029ad82b0dea63ff55ada495965da"
   },
   "ql": {
     "revision": "42becd6f8f7bae82c818fa3abb1b6ff34b552310"
@@ -684,7 +684,7 @@
     "revision": "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"
   },
   "squirrel": {
-    "revision": "0a50d31098e83c668d34d1160a0f6c7d23b571cc"
+    "revision": "072c969749e66f000dba35a33c387650e203e96e"
   },
   "ssh_config": {
     "revision": "77450e8bce8853921512348f83c73c168c71fdfb"
@@ -750,7 +750,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "200f9dab6b23f3b9bb8f67fc811221517f56c373"
+    "revision": "bba02e79f85e335f310fc95e21c677e49f2c4439"
   },
   "tmux": {
     "revision": "9138ea508410e0f34da2666609f600f65e944f22"
diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index 34c643310..ed668d020 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -86,7 +86,7 @@
   "or"
   "procedure"
   "process"
-  "skip"
+  (pcal_skip)
   "variable"
   "variables"
   "when"
@@ -119,7 +119,7 @@
   (pcal_end_with)
 ] @keyword.repeat
 
-"return" @keyword.return
+(pcal_return) @keyword.return
 
 "print" @function.macro
 

From ebdffa78bdb16af84fb76ff6a75978496d4dcbec Mon Sep 17 00:00:00 2001
From: Wadii Hajji <hajji.wadii@yahoo.fr>
Date: Mon, 8 Jul 2024 15:58:24 +0200
Subject: [PATCH 1628/2704] fix(ruby): highlight "&." as
 `@punctuation.delimiter` (#6887)

---
 queries/ruby/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 738f9c9f8..6ea2eab02 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -275,6 +275,7 @@
   ","
   ";"
   "."
+  "&."
 ] @punctuation.delimiter
 
 [

From 53c79ddc28b0df3263d629f5e20c9283b05841ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=8D=E7=94=9F=E8=8A=B1?= <hoangtun0810@gmail.com>
Date: Tue, 9 Jul 2024 10:12:29 +0900
Subject: [PATCH 1629/2704] fix(php): do not indent after class/enum decl

---
 queries/php_only/indents.scm    |  6 ++++++
 tests/indent/php/issue-6888.php | 12 ++++++++++++
 tests/indent/php_spec.lua       |  5 +++++
 3 files changed, 23 insertions(+)
 create mode 100644 tests/indent/php/issue-6888.php

diff --git a/queries/php_only/indents.scm b/queries/php_only/indents.scm
index 4a67a8b0b..fef026757 100644
--- a/queries/php_only/indents.scm
+++ b/queries/php_only/indents.scm
@@ -40,6 +40,12 @@
 (compound_statement
   "}" @indent.end)
 
+(declaration_list
+  "}" @indent.end)
+
+(enum_declaration_list
+  "}" @indent.end)
+
 (return_statement
   ";" @indent.end)
 
diff --git a/tests/indent/php/issue-6888.php b/tests/indent/php/issue-6888.php
new file mode 100644
index 000000000..950cb8119
--- /dev/null
+++ b/tests/indent/php/issue-6888.php
@@ -0,0 +1,12 @@
+<?php
+enum DaysOfWeek: int
+{
+    case Sunday = 0;
+    case Monday = 1;
+}
+
+class Foo {
+    public int $id;
+    public string $brand;
+}
+?>
\ No newline at end of file
diff --git a/tests/indent/php_spec.lua b/tests/indent/php_spec.lua
index 3fc681c29..2a41079ff 100644
--- a/tests/indent/php_spec.lua
+++ b/tests/indent/php_spec.lua
@@ -62,5 +62,10 @@ describe("indent PHP:", function()
     run:new_line("issue-4848.php", { on_line = 64, text = "return $a;", indent = 12 })
     run:new_line("issue-4848.php", { on_line = 65, text = "$a,", indent = 8 })
     run:new_line("issue-4848.php", { on_line = 66, text = "$a;", indent = 0 })
+    run:new_line("issue-6888.php", { on_line = 2, text = "$a;", indent = 0 })
+    run:new_line("issue-6888.php", { on_line = 3, text = "case Funday = 2;", indent = 4 })
+    run:new_line("issue-6888.php", { on_line = 6, text = "$a;", indent = 0 })
+    run:new_line("issue-6888.php", { on_line = 8, text = "$a;", indent = 4 })
+    run:new_line("issue-6888.php", { on_line = 11, text = "$a;", indent = 0 })
   end)
 end)

From c1ad655b6a0c83ab48e55240f367e2bc0c15af31 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2024 06:43:08 +0000
Subject: [PATCH 1630/2704] bot(lockfile): update c_sharp, liquid, mlir, tsx,
 typescript

---
 lockfile.json                 | 10 +++++-----
 queries/liquid/highlights.scm |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f6a682a31..2166433bc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "deca017a554045b4c203e7ddff39ae64ff05e071"
   },
   "c_sharp": {
-    "revision": "8623a7276b63a99b19f7793b1f81357335adb54f"
+    "revision": "31a64b28292aac6adf44071e449fa03fb80eaf4e"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -399,7 +399,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "0419ac4868585320eee8615c90b864a1b04ef433"
+    "revision": "7862a3424832c3a9d45eb21143b375837bd6573b"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
@@ -444,7 +444,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "935a551f76fb07f66d0ce6f1f6e955d22cd44f15"
+    "revision": "affbd6f3b08155826a22cfa8373147acbf60f1f1"
   },
   "muttrc": {
     "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
@@ -765,7 +765,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
+    "revision": "e45cb3225bf47a04da827e4575b9791523d953fd"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -774,7 +774,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"
+    "revision": "e45cb3225bf47a04da827e4575b9791523d953fd"
   },
   "typespec": {
     "revision": "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"
diff --git a/queries/liquid/highlights.scm b/queries/liquid/highlights.scm
index a1bf61169..3f49f60a3 100644
--- a/queries/liquid/highlights.scm
+++ b/queries/liquid/highlights.scm
@@ -59,9 +59,9 @@
   (#set! priority 110))
 
 ([
-  "break"
+  (break_statement)
+  (continue_statement)
   "by"
-  "continue"
   "cycle"
   "endfor"
   "endpaginate"

From a64ce9f989bea1754ce2cd25d832578be86bce32 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 9 Jul 2024 16:57:08 +0200
Subject: [PATCH 1631/2704] feat(parser): register common short-hand as
 filetypes

Problem: Cannot use short-hands for @injection.language (e.g., `py` for
Python).

Solution: Register common short-hand as filetypes for some languages.

List taken from https://github.com/helix-editor/helix/blob/master/languages.toml

Also remove deprecation custom filetype->parser mapping.
---
 lua/nvim-treesitter/parsers.lua | 51 +++++++++------------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0c185c2c5..730dd393a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1,36 +1,11 @@
 local api = vim.api
 local ts = vim.treesitter
 
-local new_lang_api = ts.language.register ~= nil
-
-local filetype_to_parsername = {}
-
-if new_lang_api then
-  filetype_to_parsername = setmetatable({}, {
-    __newindex = function(_, k, v)
-      require("nvim-treesitter.utils").notify(
-        "filetype_to_parsername is deprecated, please use 'vim.treesitter.language.register'",
-        vim.log.levels.WARN
-      )
-      ts.language.register(v, k)
-    end,
-  })
-end
-
-local function register_lang(lang, ft)
-  if new_lang_api then
-    ts.language.register(lang, ft)
-    return
-  end
-  filetype_to_parsername[ft] = lang
-end
-
 for ft, lang in pairs {
   automake = "make",
   javascriptreact = "javascript",
   ecma = "javascript",
   jsx = "javascript",
-  sh = "bash",
   html_tags = "html",
   ["typescript.tsx"] = "tsx",
   ["terraform-vars"] = "terraform",
@@ -47,8 +22,18 @@ for ft, lang in pairs {
   mysql = "sql",
   sbt = "scala",
   neomuttrc = "muttrc",
+  --- short-hand list from https://github.com/helix-editor/helix/blob/master/languages.toml
+  rs = "rust",
+  ex = "elixir",
+  js = "javascript",
+  ts = "typescript",
+  ["c-sharp"] = "csharp",
+  hs = "haskell",
+  py = "python",
+  erl = "erlang",
+  typ = "typst",
 } do
-  register_lang(lang, ft)
+  ts.language.register(lang, ft)
 end
 
 ---@class InstallInfo
@@ -73,7 +58,7 @@ end
 local list = setmetatable({}, {
   __newindex = function(table, parsername, parserconfig)
     rawset(table, parsername, parserconfig)
-    register_lang(parsername, parserconfig.filetype or parsername)
+    ts.language.register(parsername, parserconfig.filetype or parsername)
   end,
 })
 
@@ -2485,23 +2470,15 @@ list.templ = {
 
 local M = {
   list = list,
-  filetype_to_parsername = filetype_to_parsername,
 }
 
-local function get_lang(ft)
-  if new_lang_api then
-    return ts.language.get_lang(ft)
-  end
-  return filetype_to_parsername[ft]
-end
-
 function M.ft_to_lang(ft)
-  local result = get_lang(ft)
+  local result = ts.language.get_lang(ft)
   if result then
     return result
   else
     ft = vim.split(ft, ".", { plain = true })[1]
-    return get_lang(ft) or ft
+    return ts.language.get_lang(ft) or ft
   end
 end
 

From e9ec8b4658880ab41986dba3cf8eaf1f805659bb Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 06:40:59 +0000
Subject: [PATCH 1632/2704] bot(lockfile): update idl, swift

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2166433bc..0c671acc8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "443308c0f32af6681e5b0a09bb7071f3c0c85d74"
+    "revision": "995d917f120ef428a086d15935d20ab2fb8c345c"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -708,7 +708,7 @@
     "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
   },
   "swift": {
-    "revision": "631f1e66bfbf55791b7a9ed23fa6dc90ee55550a"
+    "revision": "6248145bd1c221f75feb3460e59de57f81fda58f"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From d5969c481e811958123f25c2c559cb7b4b6ca217 Mon Sep 17 00:00:00 2001
From: DragonBillow <42114817+cathaysia@users.noreply.github.com>
Date: Wed, 10 Jul 2024 20:05:13 +0800
Subject: [PATCH 1633/2704] feat(idl): update parser and queries (#6901)

Signed-off-by: DragonBillow <DragonBillow@outlook.com>
---
 lockfile.json              |  2 +-
 queries/idl/highlights.scm | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0c671acc8..07ca9dea1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "995d917f120ef428a086d15935d20ab2fb8c345c"
+    "revision": "d8c1cf254f2e9d0cf9f111190c408bf3480e34e2"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
diff --git a/queries/idl/highlights.scm b/queries/idl/highlights.scm
index 051690836..9c51513d9 100644
--- a/queries/idl/highlights.scm
+++ b/queries/idl/highlights.scm
@@ -106,7 +106,12 @@
 
 (boolean_literal) @boolean
 
-(number_literal) @number
+(integer_literal) @number
+
+[
+  (floating_pt_literal)
+  (fixed_pt_literal)
+] @number.float
 
 (char_literal) @character
 
@@ -400,3 +405,11 @@
 (system_lib_string
   "<" @string
   ">" @string)
+
+(extend_annotation_appl
+  "//@" @attribute
+  (annotation_appl_custom_body))
+
+(extend_annotation_appl
+  "//@" @attribute.builtin
+  (annotation_appl_builtin_body))

From 656ac242338d3d78a5e64d2b3b7f06892aeabfea Mon Sep 17 00:00:00 2001
From: zhaown <51357674+chaozwn@users.noreply.github.com>
Date: Thu, 11 Jul 2024 00:36:01 +0800
Subject: [PATCH 1634/2704] feat(goctl): add indents

---
 queries/goctl/indents.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 queries/goctl/indents.scm

diff --git a/queries/goctl/indents.scm b/queries/goctl/indents.scm
new file mode 100644
index 000000000..ffa126905
--- /dev/null
+++ b/queries/goctl/indents.scm
@@ -0,0 +1,15 @@
+[
+  (importGroup)
+  (typeGroupSpec)
+  (structType)
+  (infoStatement)
+  (serviceServerSpec)
+  (serviceSpec)
+] @indent.begin
+
+[
+  ")"
+  "}"
+] @indent.branch @indent.end
+
+(comment) @indent.ignore

From 4068e1c0966eee10bc8937b54f8cf8f68b76961f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 10 Jul 2024 22:56:04 +0200
Subject: [PATCH 1635/2704] fix(scfg): switch to github mirror

---
 README.md                       | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 10506067e..61b9e99b0 100644
--- a/README.md
+++ b/README.md
@@ -387,7 +387,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
 - [x] [rust](https://github.com/tree-sitter/tree-sitter-rust) (maintained by @amaanq)
 - [x] [scala](https://github.com/tree-sitter/tree-sitter-scala) (maintained by @stevanmilic)
-- [x] [scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) (maintained by @WhyNotHugo)
+- [x] [scfg](https://github.com/rockorager/tree-sitter-scfg) (maintained by @WhyNotHugo)
 - [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
 - [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 730dd393a..49b177e41 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1857,7 +1857,7 @@ list.scala = {
 
 list.scfg = {
   install_info = {
-    url = "https://git.sr.ht/~rockorager/tree-sitter-scfg",
+    url = "https://github.com/rockorager/tree-sitter-scfg",
     files = { "src/parser.c" },
     requires_generate_from_grammar = true,
   },

From 465840f8c14126e5193d777bbff94036eb875bd5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 06:39:33 +0000
Subject: [PATCH 1636/2704] bot(lockfile): update idl, scfg

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 07ca9dea1..717f06ddb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "d8c1cf254f2e9d0cf9f111190c408bf3480e34e2"
+    "revision": "321c03fd838df7f742705ac586010e3603af51b9"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -642,7 +642,7 @@
     "revision": "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"
   },
   "scfg": {
-    "revision": "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"
+    "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
   },
   "scheme": {
     "revision": "8f9dff3d038f09934db5ea113cebc59c74447743"

From 972aa544efb56e2f2f53c5f3c2537e43467dd5cb Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2024 06:39:50 +0000
Subject: [PATCH 1637/2704] bot(lockfile): update http, idl, nim

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 717f06ddb..45637eb55 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "2dacda923bafcfeae487e457df0fc1c95f6d1848"
+    "revision": "e061995f0caf2fa30f68fa1fdf2c08bcbd4629a8"
   },
   "hurl": {
     "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "321c03fd838df7f742705ac586010e3603af51b9"
+    "revision": "1a495f4520fdd85ae4c9286fb69d9d92fb623343"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -456,7 +456,7 @@
     "revision": "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"
   },
   "nim": {
-    "revision": "bb2f809b65c5c943d16c45dd17e631bf3d5d4f07"
+    "revision": "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7"
   },
   "nim_format_string": {
     "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"

From 7f4ac678770175cdf0d42c015f4a5b6e18b6cb33 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 13 Jul 2024 06:38:34 +0000
Subject: [PATCH 1638/2704] bot(lockfile): update erlang, groovy, typst

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 45637eb55..9adbc4c22 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "9a04980accfe29a708e738376af50b96d8b562b7"
+    "revision": "19ca500fa5a17ab58dc18aa03b50e2db305e7a8a"
   },
   "facility": {
     "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
@@ -267,7 +267,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "6c5c8813233fe326e24c5ef032858d13f8006a8d"
+    "revision": "f3615006429251a966d7452bd46a0171364bcb7b"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -783,7 +783,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "3924cb9ed9e0e62ce7df9c4fe0faa4c234795999"
+    "revision": "90f6af21271dee246a9cafe109e2b456c5bc10a6"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"

From a6b2f4ecc8a47011868632142a9b687d7e0f9aaf Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 06:42:06 +0000
Subject: [PATCH 1639/2704] bot(lockfile): update earthfile, python, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9adbc4c22..7d6581422 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
   },
   "earthfile": {
-    "revision": "5a864159ff728b6d4f7d0aab3723f85a467d180f"
+    "revision": "b0a9bc5737340a9b80b489fe9ae93d7b2fe78cd7"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -570,7 +570,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "ccc2408e558029ad82b0dea63ff55ada495965da"
+    "revision": "0dee05ef958ba2eae88d1e65f24b33cad70d4367"
   },
   "ql": {
     "revision": "42becd6f8f7bae82c818fa3abb1b6ff34b552310"
@@ -708,7 +708,7 @@
     "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
   },
   "swift": {
-    "revision": "6248145bd1c221f75feb3460e59de57f81fda58f"
+    "revision": "9653f291ab2179185dc3703672d9fbbd29e80cfb"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From d9aa422863b29c53e88b6972c9c971ce4124da91 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 06:40:55 +0000
Subject: [PATCH 1640/2704] bot(lockfile): update angular, facility, idl,
 ocaml, ocaml_interface, templ

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7d6581422..622a24c49 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "5c9b47c6a978072808b356065fe8f223cdc8fc07"
+    "revision": "3d7f50e88acc34d7452d6fcec1b11b555da60f00"
   },
   "apex": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -168,7 +168,7 @@
     "revision": "19ca500fa5a17ab58dc18aa03b50e2db305e7a8a"
   },
   "facility": {
-    "revision": "a52579670e2b14ec03d410c3c980fafaf6d659c4"
+    "revision": "a09ba9fea4b5e0a489d1fad9b03e3be7c12044ff"
   },
   "faust": {
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "1a495f4520fdd85ae4c9286fb69d9d92fb623343"
+    "revision": "2c6abedc335989f070a5b00fc8837530d0aa30bd"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -480,10 +480,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"
+    "revision": "036226e5edb410aec004cc7ac0f4b2014dd04a0e"
   },
   "ocaml_interface": {
-    "revision": "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"
+    "revision": "036226e5edb410aec004cc7ac0f4b2014dd04a0e"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -735,7 +735,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "a4f14aa248b84df73cc1c00bf06edac8d7c96acd"
+    "revision": "23c820e2bd2b53198763d9e7bf12cebb4bf7b98f"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From a8c1f36d2c7246125da565642a4d015732b61458 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann <vincent@rischmann.fr>
Date: Tue, 16 Jul 2024 10:19:41 +0200
Subject: [PATCH 1641/2704] feat(templ): add folds

---
 queries/templ/folds.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 queries/templ/folds.scm

diff --git a/queries/templ/folds.scm b/queries/templ/folds.scm
new file mode 100644
index 000000000..adbbb103f
--- /dev/null
+++ b/queries/templ/folds.scm
@@ -0,0 +1,15 @@
+[
+  (component_block)
+  (css_declaration)
+  (script_declaration)
+  (element)
+  (style_element)
+  (script_element)
+  (component_switch_statement)
+  (field_declaration_list)
+  (block)
+  (interface_type)
+  (comment)
+  (const_declaration)
+  (var_declaration)
+] @fold

From f16a77583047d6d3ea684092c679bbe88398cb01 Mon Sep 17 00:00:00 2001
From: Grace Petryk <gracepetryk99@gmail.com>
Date: Tue, 16 Jul 2024 04:13:41 -0700
Subject: [PATCH 1642/2704] feat(python): Improved python indentation (#6859)

* feat: improve python indentation

* use lua-match

* revert concatenated_string changes, handle function def hanging indents

* lint

* add delimiters to param query

* add test cases
---
 queries/python/indents.scm                    | 39 +++++++++++++++++--
 tests/indent/python/aligned_indent.py         | 11 ++++++
 .../indent/python/parenthesized_conditions.py | 35 +++++++++++++++++
 3 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 tests/indent/python/parenthesized_conditions.py

diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index dbda25b5c..2414812a7 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -1,6 +1,5 @@
 [
   (import_from_statement)
-  (parenthesized_expression)
   (generator_expression)
   (list_comprehension)
   (set_comprehension)
@@ -24,6 +23,10 @@
   (#set! indent.open_delimiter "{")
   (#set! indent.close_delimiter "}"))
 
+((parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((for_statement) @indent.begin
   (#set! indent.immediate 1))
 
@@ -67,14 +70,40 @@
 ((case_clause) @indent.begin
   (#set! indent.immediate 1))
 
+; if (cond1
+;     or cond2
+;         or cond3):
+;     pass
+;
 (if_statement
   condition: (parenthesized_expression) @indent.align
+  (#lua-match? @indent.align "^%([^\n]")
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
   (#set! indent.avoid_last_matching_next 1))
 
+; while (
+;     cond1
+;     or cond2
+;         or cond3):
+;     pass
+;
 (while_statement
   condition: (parenthesized_expression) @indent.align
+  (#lua-match? @indent.align "[^\n ]%)$")
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1))
+
+; if (
+;     cond1
+;     or cond2
+;         or cond3):
+;     pass
+;
+(if_statement
+  condition: (parenthesized_expression) @indent.align
+  (#lua-match? @indent.align "[^\n ]%)$")
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
   (#set! indent.avoid_last_matching_next 1))
@@ -91,6 +120,11 @@
   (#set! indent.close_delimiter ")"))
 
 ((parameters) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+((parameters) @indent.align
+  (#lua-match? @indent.align "[^\n ]%)$")
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
   (#set! indent.avoid_last_matching_next 1))
@@ -130,9 +164,6 @@
   .
   (#lua-match? @indent.branch "^elif"))
 
-(parenthesized_expression
-  ")" @indent.end)
-
 (generator_expression
   ")" @indent.end)
 
diff --git a/tests/indent/python/aligned_indent.py b/tests/indent/python/aligned_indent.py
index b92356740..bdba8467a 100644
--- a/tests/indent/python/aligned_indent.py
+++ b/tests/indent/python/aligned_indent.py
@@ -2,6 +2,12 @@ def aligned_indent(arg1,
                    arg2):
     pass
 
+def aligned_indent2(
+    arg1,
+    arg2
+):
+    pass
+
 aligned_indent(1,
                2)
 
@@ -10,5 +16,10 @@ aligned_indent(1,
                2
                )
 
+aligned_indent(
+    1,
+    2
+)
+
 foodsadsa(sdada,
           2
diff --git a/tests/indent/python/parenthesized_conditions.py b/tests/indent/python/parenthesized_conditions.py
new file mode 100644
index 000000000..d30f2b1af
--- /dev/null
+++ b/tests/indent/python/parenthesized_conditions.py
@@ -0,0 +1,35 @@
+if (
+    True
+    or 1
+    or False
+):
+    pass
+
+if (
+    True
+    or 1
+        or False):
+    pass
+
+if (True
+    or 1
+        or False):
+    pass
+
+while (
+    False
+    or 1
+    or False
+):
+    pass
+
+while (
+    False
+    or 1
+        or False):
+    pass
+
+while (False
+       or 1
+       or False):
+    pass

From 4836c1df6516cc2f895e362f3d00a15a236407b3 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 5 Jul 2024 10:17:41 -0700
Subject: [PATCH 1643/2704] fix(lua): indent functions before they are closed

Fixes #6786
---
 queries/lua/indents.scm   | 7 ++++++-
 tests/indent/lua/func.lua | 2 ++
 tests/indent/lua_spec.lua | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/queries/lua/indents.scm b/queries/lua/indents.scm
index c05cc4e5f..a5f66ebcc 100644
--- a/queries/lua/indents.scm
+++ b/queries/lua/indents.scm
@@ -16,10 +16,12 @@
 
 [
   "end"
-  ")"
   "}"
 ] @indent.end
 
+(")" @indent.end
+  (#not-has-parent? @indent.end parameters))
+
 (return_statement
   (expression_list
     (function_call))) @indent.dedent
@@ -39,3 +41,6 @@
 (comment) @indent.auto
 
 (string) @indent.auto
+
+(ERROR
+  "function") @indent.begin
diff --git a/tests/indent/lua/func.lua b/tests/indent/lua/func.lua
index 1f95ca97a..e2c3c037f 100644
--- a/tests/indent/lua/func.lua
+++ b/tests/indent/lua/func.lua
@@ -7,3 +7,5 @@ function foo(x)
     1,
     2)
 end
+
+function hi()
diff --git a/tests/indent/lua_spec.lua b/tests/indent/lua_spec.lua
index 3fd4d58a1..b54ec6512 100644
--- a/tests/indent/lua_spec.lua
+++ b/tests/indent/lua_spec.lua
@@ -23,6 +23,7 @@ describe("indent Lua:", function()
     run:new_line("func.lua", { on_line = 4, text = "y = y + 1", indent = 2 })
     run:new_line("func.lua", { on_line = 5, text = "3,", indent = 4 })
     run:new_line("func.lua", { on_line = 9, text = "x = x + 1", indent = 0 })
+    run:new_line("func.lua", { on_line = 11, text = "x = x + 1", indent = 2 })
     run:new_line("string.lua", { on_line = 1, text = "x", indent = 0 })
     run:new_line("string.lua", { on_line = 2, text = "x", indent = 0 })
     run:new_line("string.lua", { on_line = 3, text = "x", indent = 2 })

From 3076b9a98a130a3601a41c5e3def1ffb8b796367 Mon Sep 17 00:00:00 2001
From: Bryan Kenote <9691017+bryankenote@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:03:58 +0000
Subject: [PATCH 1644/2704] fix(facility): add highlight for event keyword

---
 queries/facility/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/facility/highlights.scm b/queries/facility/highlights.scm
index 6816b480e..592bf5311 100644
--- a/queries/facility/highlights.scm
+++ b/queries/facility/highlights.scm
@@ -22,7 +22,10 @@
   "errors"
 ] @keyword
 
-"method" @keyword.function
+[
+  "method"
+  "event"
+] @keyword.function
 
 [
   "enum"

From 03883041b21413444df1cb22d9483d3fffb889c4 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Tue, 16 Jul 2024 10:45:28 +0200
Subject: [PATCH 1645/2704] feat: change angular filetype to vim's htmlangular

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 49b177e41..bc42d79d6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -84,6 +84,7 @@ list.angular = {
     files = { "src/parser.c", "src/scanner.c" },
     generate_requires_npm = true,
   },
+  filetype = "htmlangular",
   maintainers = { "@dlvandenberg" },
   experimental = true,
 }

From 276c343b6b0f5f3954b1bc296e3fc791ed14ff57 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Tue, 16 Jul 2024 20:29:03 +0200
Subject: [PATCH 1646/2704] feat!: update angular parser to new major

BREAKING CHANGE: This changes the capture groups for all Control Flow
statements.
---
 lockfile.json                  | 2 +-
 queries/angular/highlights.scm | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 622a24c49..b8cae5a88 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "3d7f50e88acc34d7452d6fcec1b11b555da60f00"
+    "revision": "b96a0d1605da3492f6474245098b6f0c503e596d"
   },
   "apex": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 09e3abfd0..07b59517c 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -92,13 +92,6 @@
   "{"
   "}"
   "@"
-  "} @"
-  (if_end_expression)
-  (for_end_expression)
-  (switch_end_expression)
-  (case_end_expression)
-  (default_end_expression)
-  (defer_end_expression)
 ] @punctuation.bracket
 
 (two_way_binding

From 0d5e1214a5c386a168dc8e19d7da0ceb0e0bd6f2 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Tue, 16 Jul 2024 20:29:19 +0200
Subject: [PATCH 1647/2704] feat: add indentation queries for angular

---
 queries/angular/indents.scm           | 15 ++++++
 tests/indent/angular/defer.html       |  9 ++++
 tests/indent/angular/for.html         |  5 ++
 tests/indent/angular/if-else.html     | 15 ++++++
 tests/indent/angular/switch-case.html | 13 +++++
 tests/indent/angular_spec.lua         | 70 +++++++++++++++++++++++++++
 6 files changed, 127 insertions(+)
 create mode 100644 tests/indent/angular/defer.html
 create mode 100644 tests/indent/angular/for.html
 create mode 100644 tests/indent/angular/if-else.html
 create mode 100644 tests/indent/angular/switch-case.html
 create mode 100644 tests/indent/angular_spec.lua

diff --git a/queries/angular/indents.scm b/queries/angular/indents.scm
index 448e94275..2f46aa5bc 100644
--- a/queries/angular/indents.scm
+++ b/queries/angular/indents.scm
@@ -1 +1,16 @@
 ; inherits: html_tags
+
+[
+  (statement_block)
+  (switch_statement)
+] @indent.begin
+
+(statement_block
+  "{" @indent.branch)
+
+(statement_block
+  "}" @indent.end)
+
+"}" @indent.branch
+
+"}" @indent.end
diff --git a/tests/indent/angular/defer.html b/tests/indent/angular/defer.html
new file mode 100644
index 000000000..a85313986
--- /dev/null
+++ b/tests/indent/angular/defer.html
@@ -0,0 +1,9 @@
+@defer (on viewport) {
+  <calendar-cmp />
+} @placeholder (minimum 100ms) {
+  <small-component />
+} @loading (after 100s; minimum 200ms){
+  <loading-spinner />
+} @error {
+  <error-message />
+}
diff --git a/tests/indent/angular/for.html b/tests/indent/angular/for.html
new file mode 100644
index 000000000..591472e23
--- /dev/null
+++ b/tests/indent/angular/for.html
@@ -0,0 +1,5 @@
+@for (item of items; track item.id) {
+  <li>{{ item.name }}</li>
+} @empty {
+  <p>No items</p>
+}
diff --git a/tests/indent/angular/if-else.html b/tests/indent/angular/if-else.html
new file mode 100644
index 000000000..7854e1bc8
--- /dev/null
+++ b/tests/indent/angular/if-else.html
@@ -0,0 +1,15 @@
+@if (someCondition) {
+  <p>someCondition is true</p>
+} @else {
+  <p>someCondition is false</p>
+}
+
+<div>
+  @if (someOther) {
+    <span>True</span>
+
+    @if (nestedCondition) {
+      <span>Nested</span>
+    }
+  }
+</div>
diff --git a/tests/indent/angular/switch-case.html b/tests/indent/angular/switch-case.html
new file mode 100644
index 000000000..17df96609
--- /dev/null
+++ b/tests/indent/angular/switch-case.html
@@ -0,0 +1,13 @@
+<div>
+  @switch (obj.property) {
+    @case (1) {
+      <p>Case 1</p>
+    }
+    @case (2) {
+      <p>Case 2</p>
+    }
+    @default {
+      <p>Default</p>
+    }
+  }
+</div>
diff --git a/tests/indent/angular_spec.lua b/tests/indent/angular_spec.lua
new file mode 100644
index 000000000..2090420ce
--- /dev/null
+++ b/tests/indent/angular_spec.lua
@@ -0,0 +1,70 @@
+local Runner = require("tests.indent.common").Runner
+local runner = Runner:new(it, "tests/indent/angular", {
+  tabstop = 2,
+  shiftwidth = 2,
+  expandtab = true,
+  filetype = "htmlangular",
+})
+
+describe("indent HTML Angular:", function()
+  describe("whole file:", function()
+    runner:whole_file "."
+  end)
+
+  describe("new line:", function()
+    for _, info in ipairs {
+      { 1, 2 },
+      { 2, 2 },
+      { 3, 2 },
+      { 4, 2 },
+      { 6, 0 },
+      { 7, 2 },
+      { 8, 4 },
+      { 10, 4 },
+      { 11, 6 },
+      { 12, 6 },
+      { 13, 4 },
+      { 14, 2 },
+    } do
+      runner:new_line("if-else.html", { on_line = info[1], text = "//", indent = info[2] })
+    end
+
+    for _, info in ipairs {
+      { 1, 2 },
+      { 2, 4 },
+      { 3, 6 },
+      { 4, 6 },
+      { 6, 6 },
+      { 7, 6 },
+      { 9, 6 },
+      { 10, 6 },
+      { 12, 2 },
+    } do
+      runner:new_line("switch-case.html", { on_line = info[1], text = "//", indent = info[2] })
+    end
+
+    for _, info in ipairs {
+      { 1, 2 },
+      { 2, 2 },
+      { 3, 2 },
+      { 4, 2 },
+      { 5, 0 },
+    } do
+      runner:new_line("for.html", { on_line = info[1], text = "//", indent = info[2] })
+    end
+
+    for _, info in ipairs {
+      { 1, 2 },
+      { 2, 2 },
+      { 3, 2 },
+      { 4, 2 },
+      { 5, 2 },
+      { 6, 2 },
+      { 7, 2 },
+      { 8, 2 },
+      { 9, 0 },
+    } do
+      runner:new_line("defer.html", { on_line = info[1], text = "//", indent = info[2] })
+    end
+  end)
+end)

From 067415e9710526f6d8dccd4848f0c9a291b48edf Mon Sep 17 00:00:00 2001
From: Vladimir Levin <34550675+opa-oz@users.noreply.github.com>
Date: Wed, 17 Jul 2024 16:47:59 +0900
Subject: [PATCH 1648/2704] feat: add nginx

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/nginx/folds.scm         |  1 +
 queries/nginx/highlights.scm    | 59 +++++++++++++++++++++++++++++++++
 queries/nginx/injections.scm    |  2 ++
 6 files changed, 74 insertions(+)
 create mode 100644 queries/nginx/folds.scm
 create mode 100644 queries/nginx/highlights.scm
 create mode 100644 queries/nginx/injections.scm

diff --git a/README.md b/README.md
index 61b9e99b0..455c55f78 100644
--- a/README.md
+++ b/README.md
@@ -324,6 +324,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [mlir](https://github.com/artagnon/tree-sitter-mlir) (experimental, maintained by @artagnon)
 - [x] [muttrc](https://github.com/neomutt/tree-sitter-muttrc) (maintained by @Freed-Wu)
 - [x] [nasm](https://github.com/naclsn/tree-sitter-nasm) (maintained by @ObserverOfTime)
+- [x] [nginx](https://github.com/opa-oz/tree-sitter-nginx) (maintained by @opa-oz)
 - [ ] [nickel](https://github.com/nickel-lang/tree-sitter-nickel)
 - [x] [nim](https://github.com/alaviss/tree-sitter-nim) (maintained by @aMOPel)
 - [x] [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) (maintained by @aMOPel)
diff --git a/lockfile.json b/lockfile.json
index b8cae5a88..7edf39bba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -452,6 +452,9 @@
   "nasm": {
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
   },
+  "nginx": {
+    "revision": "281d184b8240b2b22670b8907b57b6d6842db6f3"
+  },
   "nickel": {
     "revision": "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index bc42d79d6..db69132b4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1329,6 +1329,14 @@ list.nasm = {
   maintainers = { "@ObserverOfTime" },
 }
 
+list.nginx = {
+  install_info = {
+    url = "https://github.com/opa-oz/tree-sitter-nginx",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@opa-oz" },
+}
+
 list.nickel = {
   install_info = {
     url = "https://github.com/nickel-lang/tree-sitter-nickel",
diff --git a/queries/nginx/folds.scm b/queries/nginx/folds.scm
new file mode 100644
index 000000000..fd7d23999
--- /dev/null
+++ b/queries/nginx/folds.scm
@@ -0,0 +1 @@
+(block) @fold
diff --git a/queries/nginx/highlights.scm b/queries/nginx/highlights.scm
new file mode 100644
index 000000000..58fcc0b14
--- /dev/null
+++ b/queries/nginx/highlights.scm
@@ -0,0 +1,59 @@
+(comment) @comment @spell
+
+(value) @variable
+
+[
+  (location_modifier)
+  "="
+] @operator
+
+[
+  (keyword)
+  "location"
+] @keyword
+
+[
+  "if"
+  "map"
+] @keyword.conditional
+
+(boolean) @boolean
+
+[
+  (auto)
+  (constant)
+  (level)
+  (connection_method)
+  (var)
+  (condition)
+] @variable.builtin
+
+[
+  (file)
+  (mask)
+] @string.special.path
+
+[
+  (string_literal)
+  (quoted_string_literal)
+] @string
+
+(directive
+  (variable
+    (keyword) @variable.parameter))
+
+(location_route) @string.special
+
+";" @punctuation.delimiter
+
+[
+  (numeric_literal)
+  (time)
+  (size)
+  (cpumask)
+] @number
+
+[
+  "{"
+  "}"
+] @punctuation.bracket
diff --git a/queries/nginx/injections.scm b/queries/nginx/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/nginx/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 14dff71d381737f29df9a6e5335e16d3d9815309 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 7 Jul 2024 09:52:43 -0700
Subject: [PATCH 1649/2704] feat(wit): add folds, missing highlights

References:

https://github.com/liamwh/tree-sitter-wit/blob/main/grammar.js
https://github.com/zed-industries/zed/blob/79f364632535ef85c190fcf1be9834bbffc19c95/crates/extension_api/wit/since_v0.0.4/extension.wit
https://github.com/fermyon/spin/blob/436ad589237c02f7aa4693e984132808fd80b863/wit/mqtt.wit
https://github.com/bytecodealliance/wasmtime/blob/a068bfe06435a048502bf4afc426451dab5294af/crates/wasi-nn/wit/wasi-nn.wit
---
 queries/wit/folds.scm      | 12 ++++++++++++
 queries/wit/highlights.scm | 22 ++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 queries/wit/folds.scm

diff --git a/queries/wit/folds.scm b/queries/wit/folds.scm
new file mode 100644
index 000000000..7f84ddd2e
--- /dev/null
+++ b/queries/wit/folds.scm
@@ -0,0 +1,12 @@
+[
+  (world_items)
+  (world_body)
+  (interface_items)
+  (interface_body)
+] @fold
+
+(world_items
+  [
+    (use_item)
+    (import_item)
+  ])+ @fold
diff --git a/queries/wit/highlights.scm b/queries/wit/highlights.scm
index bc9b59bb0..1f4b01cce 100644
--- a/queries/wit/highlights.scm
+++ b/queries/wit/highlights.scm
@@ -4,7 +4,7 @@
   (id)) @type
 
 (package_decl
-  (id)) @module
+  (id) @module)
 
 (valid_semver) @string.special
 
@@ -38,7 +38,7 @@
   alias: (id) @type.definition)
 
 (func_item
-  name: (id) @function)
+  name: (id) @function.method)
 
 (handle
   (id) @type)
@@ -62,7 +62,7 @@
   name: (id) @type)
 
 (variant_case
-  name: (id) @type)
+  name: (id) @constant)
 
 (enum_items
   name: (id) @type)
@@ -73,18 +73,27 @@
 (resource_item
   name: (id) @type)
 
+(resource_method
+  (id) @function.method)
+
 (resource_method
   "constructor" @constructor)
 
 (toplevel_use_item
   "use" @keyword.import)
 
+(toplevel_use_item
+  alias: (id) @module)
+
 (use_item
   "use" @keyword.import)
 
 (use_path
   (id) @module)
 
+(use_names_item
+  (id) @module)
+
 "func" @keyword.function
 
 [
@@ -105,6 +114,7 @@
   "include"
   "import"
   "export"
+  "as"
 ] @keyword.import
 
 [
@@ -118,6 +128,8 @@
   "s64"
   "f32"
   "f64"
+  "float32" ; deprecated
+  "float64" ; deprecated
   "char"
   "bool"
   "string"
@@ -130,7 +142,7 @@
 
 [
   "@"
-  "->"
+  "_"
 ] @punctuation.special
 
 [
@@ -138,6 +150,8 @@
   ";"
   ":"
   ","
+  "."
+  "->"
 ] @punctuation.delimiter
 
 [

From 7a38515741768c0a0712253de4ce64454cb24c1a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2024 07:50:51 +0000
Subject: [PATCH 1650/2704] bot(lockfile): update facility, idl, templ

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7edf39bba..260d756ff 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -168,7 +168,7 @@
     "revision": "19ca500fa5a17ab58dc18aa03b50e2db305e7a8a"
   },
   "facility": {
-    "revision": "a09ba9fea4b5e0a489d1fad9b03e3be7c12044ff"
+    "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
   },
   "faust": {
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "2c6abedc335989f070a5b00fc8837530d0aa30bd"
+    "revision": "556f2878db1c26da33a921df8226f3268fadef75"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -738,7 +738,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "23c820e2bd2b53198763d9e7bf12cebb4bf7b98f"
+    "revision": "de0d0ee129cf643872e8e0d5c4a6589b5a3aae23"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From f649c2ff757f6196bac385f7e929e063aef390ba Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Jul 2024 15:45:25 +0200
Subject: [PATCH 1651/2704] fix(php): correct line endings

---
 tests/indent/php/issue-6888.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/indent/php/issue-6888.php b/tests/indent/php/issue-6888.php
index 950cb8119..a0bcb3717 100644
--- a/tests/indent/php/issue-6888.php
+++ b/tests/indent/php/issue-6888.php
@@ -1,12 +1,12 @@
-<?php
-enum DaysOfWeek: int
-{
-    case Sunday = 0;
-    case Monday = 1;
-}
-
-class Foo {
-    public int $id;
-    public string $brand;
-}
-?>
\ No newline at end of file
+<?php
+enum DaysOfWeek: int
+{
+    case Sunday = 0;
+    case Monday = 1;
+}
+
+class Foo {
+    public int $id;
+    public string $brand;
+}
+?>

From 804a6473df62196709f5f1552c9c9f20fcdd7bb8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Jul 2024 16:33:10 +0200
Subject: [PATCH 1652/2704] fix(install): pass `--show-error` to curl

---
 lua/nvim-treesitter/shell_command_selectors.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index f1d557a74..9622f5801 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -252,6 +252,7 @@ function M.select_download_commands(repo, project_name, cache_folder, revision,
         opts = {
           args = {
             "--silent",
+            "--show-error",
             "-L", -- follow redirects
             is_github and url .. "/archive/" .. revision .. ".tar.gz"
               or url .. "/-/archive/" .. revision .. "/" .. project_name .. "-" .. revision .. ".tar.gz",

From dd7bb795c48b5b9795bde0537bb29ddf9fb7b42d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Jul 2024 18:03:09 +0200
Subject: [PATCH 1653/2704] docs(readme): recommend builtin foldexpr

---
 README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 455c55f78..c83a7804e 100644
--- a/README.md
+++ b/README.md
@@ -537,12 +537,11 @@ require'nvim-treesitter.configs'.setup {
 
 #### Folding
 
-Tree-sitter based folding. _(Technically not a module because it's per windows and not per buffer.)_
+Tree-sitter based folding (implemented in Neovim itself, see `:h vim.treesitter.foldexpr()`). To enable it for the current window, set
 
-```vim
-set foldmethod=expr
-set foldexpr=nvim_treesitter#foldexpr()
-set nofoldenable                     " Disable folding at startup.
+```lua
+vim.wo.foldmethod = 'expr'
+vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
 ```
 
 This will respect your `foldminlines` and `foldnestmax` settings.

From 0758155d4dfacfa959ad82ffa3879cb69c82e719 Mon Sep 17 00:00:00 2001
From: wzy <32936898+Freed-Wu@users.noreply.github.com>
Date: Thu, 18 Jul 2024 00:59:58 +0800
Subject: [PATCH 1654/2704] feat(parsers): register python for gyp files

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index db69132b4..707e0e294 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -6,6 +6,7 @@ for ft, lang in pairs {
   javascriptreact = "javascript",
   ecma = "javascript",
   jsx = "javascript",
+  gyp = "python",
   html_tags = "html",
   ["typescript.tsx"] = "tsx",
   ["terraform-vars"] = "terraform",

From c80d0d9ca9232263062a46adc136e3bf3bbf62ae Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 17 Jul 2024 23:44:56 -0700
Subject: [PATCH 1655/2704] fix(filetype): add missing shorthands for Perl, Uxn
 Tal

---
 lua/nvim-treesitter/parsers.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 707e0e294..70aa9f5bc 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -33,6 +33,8 @@ for ft, lang in pairs {
   py = "python",
   erl = "erlang",
   typ = "typst",
+  pl = "perl",
+  uxn = "uxntal",
 } do
   ts.language.register(lang, ft)
 end

From 355af0c8cef433fd5f0aa6cd05b62ad618df1609 Mon Sep 17 00:00:00 2001
From: John-Philip Taylor <41227383+jpt13653903@users.noreply.github.com>
Date: Thu, 18 Jul 2024 08:46:12 +0200
Subject: [PATCH 1656/2704] feat: add vhdl parser and queries

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/vhdl/folds.scm          |  46 ++++
 queries/vhdl/highlights.scm     | 427 ++++++++++++++++++++++++++++++++
 queries/vhdl/injections.scm     |   7 +
 6 files changed, 492 insertions(+)
 create mode 100644 queries/vhdl/folds.scm
 create mode 100644 queries/vhdl/highlights.scm
 create mode 100644 queries/vhdl/injections.scm

diff --git a/README.md b/README.md
index c83a7804e..d7b68fa82 100644
--- a/README.md
+++ b/README.md
@@ -445,6 +445,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
 - [x] [vento](https://github.com/ventojs/tree-sitter-vento) (maintained by @wrapperup, @oscarotero)
 - [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
+- [x] [vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) (maintained by @jpt13653903)
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
 - [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
 - [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason)
diff --git a/lockfile.json b/lockfile.json
index 260d756ff..a955c3b4c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -815,6 +815,9 @@
   "verilog": {
     "revision": "075ebfc84543675f12e79a955f79d717772dcef3"
   },
+  "vhdl": {
+    "revision": "f4c492accff02b5c85517ff5dd4720e2229feb75"
+  },
   "vhs": {
     "revision": "90028bbadb267ead5b87830380f6a825147f0c0f"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 70aa9f5bc..906160ed7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2347,6 +2347,14 @@ list.verilog = {
   maintainers = { "@zegervdv" },
 }
 
+list.vhdl = {
+  install_info = {
+    url = "https://github.com/jpt13653903/tree-sitter-vhdl",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@jpt13653903" },
+}
+
 list.vhs = {
   install_info = {
     url = "https://github.com/charmbracelet/tree-sitter-vhs",
diff --git a/queries/vhdl/folds.scm b/queries/vhdl/folds.scm
new file mode 100644
index 000000000..9fc6deafe
--- /dev/null
+++ b/queries/vhdl/folds.scm
@@ -0,0 +1,46 @@
+[
+  (block_comment)
+  (architecture_definition)
+  (architecture_head)
+  (concurrent_block)
+  (configuration_declaration)
+  (component_instantiation_statement)
+  (generic_map_aspect)
+  (port_map_aspect)
+  (process_statement)
+  (process_head)
+  (sequential_block)
+  (block_configuration)
+  (block_statement)
+  (block_head)
+  (component_declaration)
+  (component_configuration)
+  (generic_clause)
+  (port_clause)
+  (entity_declaration)
+  (entity_head)
+  (entity_body)
+  (package_declaration)
+  (package_definition)
+  (function_specification)
+  (subprogram_declaration)
+  (subprogram_definition)
+  (subprogram_head)
+  (procedure_specification)
+  (sequential_block)
+  (loop_statement)
+  (if_statement_block)
+  (if_statement)
+  (elsif_statement)
+  (else_statement)
+  (case_statement)
+  (case_statement_alternative)
+  (for_generate_statement)
+  (if_generate_statement)
+  (if_generate)
+  (elsif_generate)
+  (else_generate)
+  (case_generate_statement)
+  (case_generate_alternative)
+  (type_declaration)
+] @fold
diff --git a/queries/vhdl/highlights.scm b/queries/vhdl/highlights.scm
new file mode 100644
index 000000000..36cd56207
--- /dev/null
+++ b/queries/vhdl/highlights.scm
@@ -0,0 +1,427 @@
+(line_comment
+  (comment_content) @spell) @comment
+
+(block_comment
+  (comment_content) @spell) @comment.documentation
+
+(identifier) @variable
+
+[
+  "access"
+  "after"
+  "alias"
+  "architecture"
+  "array"
+  ; "assume"
+  "attribute"
+  "block"
+  "body"
+  "component"
+  "configuration"
+  "context"
+  ; "cover"
+  "disconnect"
+  "entity"
+  ; "fairness"
+  "file"
+  "force"
+  "generate"
+  "generic"
+  "group"
+  "label"
+  "literal"
+  "map"
+  "new"
+  "package"
+  "parameter"
+  "port"
+  "property"
+  "range"
+  "reject"
+  "release"
+  ; "restrict"
+  "sequence"
+  "transport"
+  "unaffected"
+  "view"
+  ; "vmode"
+  ; "vpkg"
+  ; "vprop"
+  "vunit"
+] @keyword
+
+[
+  (ALL)
+  (OTHERS)
+  "<>"
+  (DEFAULT)
+  (OPEN)
+] @constant.builtin
+
+[
+  "is"
+  "begin"
+  "end"
+] @keyword
+
+(parameter_specification
+  "in" @keyword)
+
+[
+  "process"
+  "wait"
+  "on"
+  "until"
+] @keyword.coroutine
+
+(end_process
+  "end" @keyword.coroutine)
+
+(timeout_clause
+  "for" @keyword.coroutine)
+
+[
+  "function"
+  "procedure"
+] @keyword.function
+
+(subprogram_end
+  "end" @keyword.function)
+
+[
+  "to"
+  "downto"
+  "of"
+] @keyword.operator
+
+[
+  "library"
+  "use"
+] @keyword.import
+
+[
+  "subtype"
+  "type"
+  "record"
+  "units"
+  "constant"
+  "signal"
+  "variable"
+] @keyword.type
+
+[
+  "protected"
+  "private"
+  "pure"
+  "impure"
+  "inertial"
+  "postponed"
+  ; "strong"
+  "guarded"
+  "out"
+  "inout"
+  "linkage"
+  "buffer"
+  "register"
+  "bus"
+  "shared"
+] @keyword.modifier
+
+(mode
+  "in" @keyword.modifier)
+
+(force_mode
+  "in" @keyword.modifier)
+
+[
+  "while"
+  "loop"
+  "next"
+  "exit"
+] @keyword.repeat
+
+(end_loop
+  "end" @keyword.repeat)
+
+(for_loop
+  "for" @keyword.repeat)
+
+(block_configuration
+  "for" @keyword)
+
+(configuration_specification
+  "for" @keyword)
+
+(component_configuration
+  "for" @keyword)
+
+(end_for
+  "for" @keyword)
+
+"return" @keyword.return
+
+[
+  "assert"
+  "report"
+  "severity"
+] @keyword.debug
+
+[
+  "if"
+  "then"
+  "elsif"
+  "case"
+] @keyword.conditional
+
+(end_if
+  "end" @keyword.conditional)
+
+(end_case
+  "end" @keyword.conditional)
+
+(when_element
+  "when" @keyword.conditional)
+
+(case_generate_alternative
+  "when" @keyword.conditional)
+
+(else_statement
+  "else" @keyword.conditional)
+
+(else_generate
+  "else" @keyword.conditional)
+
+[
+  "with"
+  "select"
+] @keyword.conditional.ternary
+
+(when_expression
+  "when" @keyword.conditional.ternary)
+
+(else_expression
+  "else" @keyword.conditional.ternary)
+
+(else_waveform
+  "else" @keyword.conditional.ternary)
+
+(else_expression_or_unaffected
+  "else" @keyword.conditional.ternary)
+
+"null" @constant.builtin
+
+(user_directive) @keyword.directive
+
+(protect_directive) @keyword.directive
+
+(warning_directive) @keyword.directive
+
+(error_directive) @keyword.directive
+
+(if_conditional_analysis
+  "if" @keyword.directive)
+
+(if_conditional_analysis
+  "then" @keyword.directive)
+
+(elsif_conditional_analysis
+  "elsif" @keyword.directive)
+
+(else_conditional_analysis
+  "else" @keyword.directive)
+
+(end_conditional_analysis
+  "end" @keyword.directive)
+
+(end_conditional_analysis
+  "if" @keyword.directive)
+
+(directive_body) @keyword.directive
+
+(directive_constant_builtin) @constant.macro
+
+(directive_error) @comment.error
+
+(directive_protect) @keyword.directive
+
+(directive_warning) @comment.warning
+
+[
+  (condition_conversion)
+  (relational_operator)
+  (sign)
+  (adding_operator)
+  (exponentiate)
+  (variable_assignment)
+  (signal_assignment)
+  "*"
+  "/"
+  ":"
+  "=>"
+] @operator
+
+[
+  (unary_operator)
+  (logical_operator)
+  (shift_operator)
+  "mod"
+  "not"
+  "rem"
+] @keyword.operator
+
+[
+  "'"
+  ","
+  "."
+  ";"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "<<"
+  ">>"
+] @punctuation.bracket
+
+"@" @punctuation.special
+
+[
+  (decimal_integer)
+  (string_literal_std_logic)
+] @number
+
+(decimal_float) @number.float
+
+(bit_string_length) @property
+
+(bit_string_base) @type.builtin
+
+(bit_string_value) @number
+
+(based_literal
+  (based_base) @type.builtin
+  (based_integer) @number)
+
+(based_literal
+  (based_base) @type.builtin
+  (based_float) @number.float)
+
+(string_literal) @string @spell
+
+(character_literal) @character
+
+(library_constant_std_logic) @constant.builtin
+
+(library_constant) @constant.builtin
+
+(library_function) @function.builtin
+
+(library_constant_boolean) @boolean
+
+(library_constant_character) @character
+
+(library_constant_debug) @keyword.debug
+
+(unit) @keyword.modifier
+
+(library_constant_unit) @keyword.modifier
+
+(label) @label
+
+(generic_map_aspect
+  "generic" @constructor
+  "map" @constructor)
+
+(port_map_aspect
+  "port" @constructor
+  "map" @constructor)
+
+(selection
+  (identifier) @variable.member)
+
+(_
+  view: (_) @type)
+
+(_
+  type: (_) @type)
+
+(_
+  library: (_) @module)
+
+(_
+  package: (_) @module)
+
+(_
+  entity: (_) @module)
+
+(_
+  component: (_) @module)
+
+(_
+  configuration: (_) @property)
+
+(_
+  architecture: (_) @property)
+
+(_
+  function: (_) @function)
+
+(_
+  procedure: (_) @function.method)
+
+(_
+  attribute: (_) @attribute)
+
+(_
+  constant: (_) @constant)
+
+(_
+  generic: (_) @variable.parameter)
+
+(_
+  view: (name
+    (_)) @type)
+
+(_
+  type: (name
+    (_)) @type)
+
+(_
+  entity: (name
+    (_)) @module)
+
+(_
+  component: (name
+    (_)) @module)
+
+(_
+  configuration: (name
+    (_)) @module)
+
+(library_type) @type.builtin
+
+[
+  (attribute_function)
+  (attribute_impure_function)
+  (attribute_mode_view)
+  (attribute_pure_function)
+  (attribute_range)
+  (attribute_signal)
+  (attribute_subtype)
+  (attribute_type)
+  (attribute_value)
+  (library_attribute)
+] @attribute.builtin
+
+(library_namespace) @module.builtin
+
+(subtype_declaration
+  (identifier) @type.definition)
+
+(type_declaration
+  (identifier) @type.definition)
+
+(mode_view_declaration
+  (identifier) @type.definition)
diff --git a/queries/vhdl/injections.scm b/queries/vhdl/injections.scm
new file mode 100644
index 000000000..5cbc06cb4
--- /dev/null
+++ b/queries/vhdl/injections.scm
@@ -0,0 +1,7 @@
+(line_comment
+  (comment_content) @injection.content
+  (#set! injection.language "comment"))
+
+(block_comment
+  (comment_content) @injection.content
+  (#set! injection.language "comment"))

From 874b99065b4b00b84b0ca5fa63490c93728a45ab Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 06:41:07 +0000
Subject: [PATCH 1657/2704] bot(lockfile): update djot, fortran, scala

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a955c3b4c..3fd2bdb6f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -120,7 +120,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "87bf82874c86dcf563f5521069d603ed50e5f0cc"
+    "revision": "1aacaf472117fb855e2f80f744b7704ef4dc75dc"
   },
   "dockerfile": {
     "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"
@@ -192,7 +192,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "dde9829554b831cf6cbf927294f22dfb9a8f0419"
+    "revision": "6b633433fb3f132f21250cf8e8be76d5a6389b7e"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -642,7 +642,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"
+    "revision": "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"

From 35fa869b538a933c41dc4a122edaeab52e912eb3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 18 Jul 2024 17:38:19 +0200
Subject: [PATCH 1658/2704] feat(latex): injections for luacode, asy{def}
 environments

---
 lockfile.json                |  2 +-
 queries/latex/injections.scm | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3fd2bdb6f..04e483412 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"
+    "revision": "107435ada4c4c422ba4f951336b5e566b86ac3ca"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
diff --git a/queries/latex/injections.scm b/queries/latex/injections.scm
index c0dbdc0a6..53d808c1d 100644
--- a/queries/latex/injections.scm
+++ b/queries/latex/injections.scm
@@ -17,15 +17,20 @@
   code: (source_code) @injection.content
   (#set! injection.language "python"))
 
+(luacode_environment
+  code: (source_code) @injection.content
+  (#set! injection.language "lua"))
+
+(asy_environment
+  code: (source_code) @injection.content
+  (#set! injection.language "c"))
+
+(asydef_environment
+  code: (source_code) @injection.content
+  (#set! injection.language "c"))
+
 (minted_environment
   (begin
     language: (curly_group_text
       (text) @injection.language))
   (source_code) @injection.content)
-
-((generic_environment
-  (begin
-    name: (curly_group_text
-      (text) @_env))) @injection.content
-  (#set! injection.language "c")
-  (#any-of? @_env "asy" "asydef"))

From d78ab90f8e40d91bab98f58582d6dd5119e6088f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:44:30 +0000
Subject: [PATCH 1659/2704] bot(lockfile): update angular, djot, slint, vhdl

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 04e483412..ee28954d8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "b96a0d1605da3492f6474245098b6f0c503e596d"
+    "revision": "31182d43b062a350d4bd2449f2fc0d5654972be9"
   },
   "apex": {
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
@@ -120,7 +120,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "1aacaf472117fb855e2f80f744b7704ef4dc75dc"
+    "revision": "886601b67d1f4690173a4925c214343c30704d32"
   },
   "dockerfile": {
     "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"
@@ -657,7 +657,7 @@
     "revision": "ea77a4d91dd93f4483965efcc41f3faebb9131c8"
   },
   "slint": {
-    "revision": "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"
+    "revision": "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -816,7 +816,7 @@
     "revision": "075ebfc84543675f12e79a955f79d717772dcef3"
   },
   "vhdl": {
-    "revision": "f4c492accff02b5c85517ff5dd4720e2229feb75"
+    "revision": "4ab3e251eae8890a020d083d00acd1b8c2653c07"
   },
   "vhs": {
     "revision": "90028bbadb267ead5b87830380f6a825147f0c0f"

From de8d91d0efb9016004f04279aae115edb4ef5bf2 Mon Sep 17 00:00:00 2001
From: hrzlgnm <hrzlgnm@users.noreply.github.com>
Date: Thu, 18 Jul 2024 18:54:05 +0200
Subject: [PATCH 1660/2704] docs(utils): fix deprecation notice

Co-authored-by: Valentin Batz <vbatz@linetco.com>
---
 lua/nvim-treesitter/ts_utils.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
index 9e9ada6aa..f2ee7f524 100644
--- a/lua/nvim-treesitter/ts_utils.lua
+++ b/lua/nvim-treesitter/ts_utils.lua
@@ -57,13 +57,13 @@ function M._get_line_for_node(node, type_patterns, transform_fn, bufnr)
 end
 
 -- Gets the actual text content of a node
--- @deprecated Use vim.treesitter.query.get_node_text
+-- @deprecated Use vim.treesitter.get_node_text
 -- @param node the node to get the text from
 -- @param bufnr the buffer containing the node
 -- @return list of lines of text of the node
 function M.get_node_text(node, bufnr)
   vim.notify_once(
-    "nvim-treesitter.ts_utils.get_node_text is deprecated: use vim.treesitter.query.get_node_text",
+    "nvim-treesitter.ts_utils.get_node_text is deprecated: use vim.treesitter.get_node_text",
     vim.log.levels.WARN
   )
   return get_node_text(node, bufnr)

From 0ffe62722307f6755d2c7049837cb2cd6d7d275a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 06:40:15 +0000
Subject: [PATCH 1661/2704] bot(lockfile): update cuda, idl

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ee28954d8..c4953d375 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "b93070b5a91ee9537d45e59d741737b1289c5dcc"
+    "revision": "30c29607aba8e23cf4f77ceaa0a19a34f93b3ae0"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "556f2878db1c26da33a921df8226f3268fadef75"
+    "revision": "92bb2f3bb0514d56be61f2131e950da1c913c7f2"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"

From d9ea5035d4138e49ccd08a9480882dcb94ea164d Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Fri, 19 Jul 2024 12:24:46 +0200
Subject: [PATCH 1662/2704] feat(latex): add additional include highlights

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 3831069ff..f0cff7791 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -268,12 +268,16 @@
 
 (latex_include
   command: _ @keyword.import
-  path: (curly_group_path) @string)
+  path: (curly_group_path) @string.special.path)
+
+(verbatim_include
+  command: _ @keyword.import
+  path: (curly_group_path) @string.special.path)
 
 (import_include
   command: _ @keyword.import
-  directory: (curly_group_path) @string
-  file: (curly_group_path) @string)
+  directory: (curly_group_path) @string.special.path
+  file: (curly_group_path) @string.special.path)
 
 (bibstyle_include
   command: _ @keyword.import
@@ -281,7 +285,7 @@
 
 (bibtex_include
   command: _ @keyword.import
-  paths: (curly_group_path_list) @string)
+  paths: (curly_group_path_list) @string.special.path)
 
 (biblatex_include
   "\\addbibresource" @keyword.import
@@ -289,7 +293,15 @@
 
 (graphics_include
   command: _ @keyword.import
-  path: (curly_group_path) @string)
+  path: (curly_group_path) @string.special.path)
+
+(svg_include
+  command: _ @keyword.import
+  path: (curly_group_path) @string.special.path)
+
+(inkscape_include
+  command: _ @keyword.import
+  path: (curly_group_path) @string.special.path)
 
 (tikz_library_import
   command: _ @keyword.import

From 4e387dd47833c1bb8c8df6c3a7cab0d4c55583f3 Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Fri, 19 Jul 2024 15:52:29 +0200
Subject: [PATCH 1663/2704] feat(latex): capture placeholder as variable

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index f0cff7791..b0987f56a 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -1,6 +1,8 @@
 ; General syntax
 (command_name) @function
 
+(placeholder) @variable
+
 (text_mode
   [
     "\\text"

From b3c54c31887b05d91be41a41392c811876807fd8 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Fri, 19 Jul 2024 21:53:27 -0700
Subject: [PATCH 1664/2704] feat(bash): readline injections (#6947)

* feat(bash): Readline injections

* Update queries/bash/injections.scm

Co-authored-by: Riley Bruins <ribru17@hotmail.com>

---------

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 queries/bash/injections.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 2f385bfdc..328630808 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -65,3 +65,15 @@
   (#eq? @_command "printf")
   (#eq? @_arg "--")
   (#set! injection.language "printf"))
+
+((command
+  name: (command_name) @_command
+  .
+  argument: [
+    (string)
+    (raw_string)
+  ] @injection.content)
+  (#eq? @_command "bind")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "readline"))

From e8d74461da831f9b4eb31d2d652bfd0c99a2bd7b Mon Sep 17 00:00:00 2001
From: Tyler Miller <tmillr@proton.me>
Date: Thu, 18 Jul 2024 02:24:20 -0700
Subject: [PATCH 1665/2704] fix(gitignore): hl/capture non-special pattern
 chars

Capture regular, non-special characters (as `@string.special.path`)
allowing them to be highlighted.
---
 queries/gitignore/highlights.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/queries/gitignore/highlights.scm b/queries/gitignore/highlights.scm
index 10ae3f309..aafbe541e 100644
--- a/queries/gitignore/highlights.scm
+++ b/queries/gitignore/highlights.scm
@@ -1,5 +1,7 @@
 (comment) @comment @spell
 
+(pattern_char) @string.special.path
+
 [
   (directory_separator)
   (directory_separator_escaped)
@@ -9,16 +11,17 @@
   (wildcard_char_single)
   (wildcard_chars)
   (wildcard_chars_allow_slash)
-  (bracket_negation)
-] @operator
-
-(negation) @punctuation.special
+] @character.special
 
 [
   (pattern_char_escaped)
   (bracket_char_escaped)
 ] @string.escape
 
+(negation) @punctuation.special
+
+(bracket_negation) @operator
+
 ; bracket expressions
 [
   "["

From 667b9dbbfa2d0071c5677c429ddcf89fb931b53f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 20 Jul 2024 06:39:40 +0000
Subject: [PATCH 1666/2704] bot(lockfile): update beancount, gleam, idl

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c4953d375..9da436895 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
   },
   "beancount": {
-    "revision": "c25f8034c977681653a8acd541c8b4877a58f474"
+    "revision": "384c55ede2a1f13e83d8e18dbef8f11304c379c2"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -225,7 +225,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "02a17bf9d0553406268cdbf466d57808ae712bf3"
+    "revision": "84fa6b0d53b6dd9414797e659923719799e3b0a8"
   },
   "glimmer": {
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "92bb2f3bb0514d56be61f2131e950da1c913c7f2"
+    "revision": "be067aa6146d88ac7b6276f72fc22a681f744ccb"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"

From 625e7e58d0d6134102eb0b7f013589fcbea81211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Dujava?=
 <19737748+jdujava@users.noreply.github.com>
Date: Sun, 21 Jul 2024 10:53:59 +0200
Subject: [PATCH 1667/2704] feat(latex): capture `&` as
 `@punctuation.delimiter`

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 lockfile.json                | 2 +-
 queries/latex/highlights.scm | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9da436895..a70e0293e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "107435ada4c4c422ba4f951336b5e566b86ac3ca"
+    "revision": "d018f2e6620bbaee229cb31fc8b67fabd713d770"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index b0987f56a..f5db212b7 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -31,8 +31,7 @@
 
 "\\item" @punctuation.special
 
-((word) @punctuation.delimiter
-  (#eq? @punctuation.delimiter "&"))
+(delimiter) @punctuation.delimiter
 
 [
   "["

From aba69e495b3195e753e73184cf6498d3abe070ce Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 21 Jul 2024 06:41:00 +0000
Subject: [PATCH 1668/2704] bot(lockfile): update c, cpp, cuda, glsl,
 snakemake, svelte, swift, tsx, typescript

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a70e0293e..8aaf0c8c6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "deca017a554045b4c203e7ddff39ae64ff05e071"
+    "revision": "be23d2c9d8e5b550e713ef0f86126a248462ca6e"
   },
   "c_sharp": {
     "revision": "31a64b28292aac6adf44071e449fa03fb80eaf4e"
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "7ce8946cae4bb25adebe5b50394f702beb007026"
+    "revision": "0b4aa47f07d958a49260aadc87e8474b03897c23"
   },
   "css": {
     "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "30c29607aba8e23cf4f77ceaa0a19a34f93b3ae0"
+    "revision": "07f2f157d484a27dc91c04cc116f94f6fd4fc654"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -231,7 +231,7 @@
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
   },
   "glsl": {
-    "revision": "3736dfc811c07fa749ca818f94c9a3977734dd26"
+    "revision": "ddc3137a2d775aca93084ff997fa13cc1691058a"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -666,7 +666,7 @@
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
-    "revision": "5a7b14074bca95b25935e865ca8f1efad32317e4"
+    "revision": "46d4de8e6cfca8a97c0489aea936bb15beeaf666"
   },
   "solidity": {
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
@@ -708,10 +708,10 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"
+    "revision": "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"
   },
   "swift": {
-    "revision": "9653f291ab2179185dc3703672d9fbbd29e80cfb"
+    "revision": "b3dc8cc5c266effd7bcfde01aa086b83927f2eda"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -768,7 +768,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "e45cb3225bf47a04da827e4575b9791523d953fd"
+    "revision": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -777,7 +777,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "e45cb3225bf47a04da827e4575b9791523d953fd"
+    "revision": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"
   },
   "typespec": {
     "revision": "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"

From 733fa85db27079ec2757183c5c840ba15a303e1f Mon Sep 17 00:00:00 2001
From: Oliver Thomas <thomaso@ie-freiburg.mpg.de>
Date: Sat, 20 Jul 2024 22:17:30 +0200
Subject: [PATCH 1669/2704] feat(snakemake): add wildcard flag

---
 queries/snakemake/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/snakemake/highlights.scm b/queries/snakemake/highlights.scm
index 3e75f142d..58e921e88 100644
--- a/queries/snakemake/highlights.scm
+++ b/queries/snakemake/highlights.scm
@@ -44,7 +44,8 @@
 
 ; Wildcard names
 (wildcard
-  (identifier) @variable)
+  (identifier) @variable
+  (flag) @variable.parameter.builtin)
 
 ; builtin variables
 ((identifier) @variable.builtin

From 002537a3e364b6662c6b63e3f4b33b33e219cc6c Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Sun, 21 Jul 2024 23:49:48 +0200
Subject: [PATCH 1670/2704] feat(latex): simplify captures of font changing

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index f5db212b7..4eb39de87 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -239,13 +239,7 @@
   command: (command_name) @_name
   arg: (curly_group
     (_) @markup.italic))
-  (#eq? @_name "\\emph"))
-
-((generic_command
-  command: (command_name) @_name
-  arg: (curly_group
-    (_) @markup.italic))
-  (#any-of? @_name "\\textit" "\\mathit"))
+  (#any-of? @_name "\\emph" "\\textit" "\\mathit"))
 
 ((generic_command
   command: (command_name) @_name

From 2883d0c03f4d0f80bbc1eacff61675cde7ed255b Mon Sep 17 00:00:00 2001
From: Tyler Miller <tmillr@proton.me>
Date: Sun, 21 Jul 2024 18:12:27 -0700
Subject: [PATCH 1671/2704] fix(lua): use @property for keys in table literals
 (#6956)

`@property` should be used for key-value pairs, while `@variable.member`
is used for field-access/index-expressions. Using different captures
also provides the benefit of allowing the two to be highlighted
differently.
---
 queries/lua/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 0c8f07f29..01c280f2d 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -162,7 +162,7 @@
 
 ; Tables
 (field
-  name: (identifier) @variable.member)
+  name: (identifier) @property)
 
 (dot_index_expression
   field: (identifier) @variable.member)

From aca4432ef6670adc5f5663bc0635fbe91180c3f1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 06:41:44 +0000
Subject: [PATCH 1672/2704] bot(lockfile): update idl, latex

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8aaf0c8c6..5466d2a09 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "be067aa6146d88ac7b6276f72fc22a681f744ccb"
+    "revision": "3e6c8bbdb5b3485f8a50d951040a6d80c70a97b0"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "d018f2e6620bbaee229cb31fc8b67fabd713d770"
+    "revision": "12523bd1ffd2c428b2dad177e2b4555574d90973"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"

From dfd047d15f5ab38ea0df524e94ea1db4870e54d4 Mon Sep 17 00:00:00 2001
From: qvalentin <valentin.theodor@web.de>
Date: Sat, 6 Jul 2024 19:19:55 +0200
Subject: [PATCH 1673/2704] feat(gotmpl,helm): add fold queries

---
 queries/gotmpl/folds.scm | 8 ++++++++
 queries/helm/folds.scm   | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 queries/gotmpl/folds.scm
 create mode 100644 queries/helm/folds.scm

diff --git a/queries/gotmpl/folds.scm b/queries/gotmpl/folds.scm
new file mode 100644
index 000000000..f3a22e90c
--- /dev/null
+++ b/queries/gotmpl/folds.scm
@@ -0,0 +1,8 @@
+[
+  (if_action)
+  (range_action)
+  (block_action)
+  (with_action)
+  (define_action)
+  (comment)
+] @fold
diff --git a/queries/helm/folds.scm b/queries/helm/folds.scm
new file mode 100644
index 000000000..6ffb4b7d4
--- /dev/null
+++ b/queries/helm/folds.scm
@@ -0,0 +1 @@
+; inherits: gotmpl

From 4075376a2543f6cc968c70c4aac58b8cffcc7c11 Mon Sep 17 00:00:00 2001
From: qvalentin <valentin.theodor@web.de>
Date: Sat, 6 Jul 2024 19:20:59 +0200
Subject: [PATCH 1674/2704] feat(gotmpl,helm): add locals (wip)

---
 queries/gotmpl/locals.scm | 12 ++++++++++++
 queries/helm/locals.scm   |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 queries/gotmpl/locals.scm
 create mode 100644 queries/helm/locals.scm

diff --git a/queries/gotmpl/locals.scm b/queries/gotmpl/locals.scm
new file mode 100644
index 000000000..528e9fabb
--- /dev/null
+++ b/queries/gotmpl/locals.scm
@@ -0,0 +1,12 @@
+[
+  (if_action)
+  (range_action)
+  (block_action)
+  (with_action)
+  (define_action)
+] @local.scope
+
+(variable_definition
+  variable: (variable) @local.definition.var)
+
+(variable) @local.reference
diff --git a/queries/helm/locals.scm b/queries/helm/locals.scm
new file mode 100644
index 000000000..6ffb4b7d4
--- /dev/null
+++ b/queries/helm/locals.scm
@@ -0,0 +1 @@
+; inherits: gotmpl

From 468f6ed66b450b2ed637e92774195eecf8fc6330 Mon Sep 17 00:00:00 2001
From: DragonBillow <DragonBillow@outlook.com>
Date: Mon, 22 Jul 2024 16:19:13 +0800
Subject: [PATCH 1675/2704] fix(idl): fix break changes

Signed-off-by: DragonBillow <DragonBillow@outlook.com>
---
 lockfile.json              |  2 +-
 queries/idl/highlights.scm | 76 ++++++++++----------------------------
 2 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5466d2a09..c5c4f0f34 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "3e6c8bbdb5b3485f8a50d951040a6d80c70a97b0"
+    "revision": "e0fb8591d0acbb195d190d644140f821671f0011"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
diff --git a/queries/idl/highlights.scm b/queries/idl/highlights.scm
index 9c51513d9..7446b0d4e 100644
--- a/queries/idl/highlights.scm
+++ b/queries/idl/highlights.scm
@@ -49,27 +49,6 @@
   "finder"
 ] @keyword.modifier
 
-[
-  "SEQUENTIAL"
-  "HASH"
-  "FINAL"
-  "APPENDABLE"
-  "MUTABLE"
-  "c"
-  "c++"
-  "java"
-  "idl"
-  "*"
-  "BEGIN_FILE"
-  "BEFORE_DECLARATION"
-  "BEGIN_DECLARATION"
-  "END_DECLARATION"
-  "AFTER_DECLARATION"
-  "END_FILE"
-  "CORBA"
-  "DDS"
-] @constant
-
 [
   "switch"
   "case"
@@ -98,6 +77,8 @@
   (map_type)
   (object_type)
   (value_base_type)
+  (wide_string_type)
+  (wide_char_type)
 ] @type.builtin
 
 (escape_sequence) @string.escape
@@ -115,8 +96,12 @@
 
 (char_literal) @character
 
+(wide_character_literal) @character
+
 (string_literal) @string
 
+(wide_string_literal) @string
+
 [
   "("
   ")"
@@ -161,41 +146,6 @@
 (annotation_appl_custom_body
   (scoped_name) @attribute)
 
-(annotation_appl_builtin_body
-  (_
-    [
-      "id"
-      "autoid"
-      "optional"
-      "position"
-      "value"
-      "extensibility"
-      "final"
-      "appendable"
-      "mutable"
-      "key"
-      "must_understand"
-      "default_literal"
-      "default"
-      "range"
-      "min"
-      "max"
-      "unit"
-      "bit_bound"
-      "external"
-      "nested"
-      "verbatim"
-      "service"
-      "oneway"
-      "ami"
-    ] @attribute.builtin))
-
-(min_expr
-  "min" @attribute.builtin)
-
-(max_expr
-  "max" @attribute.builtin)
-
 (op_dcl
   (identifier) @function.method)
 
@@ -413,3 +363,17 @@
 (extend_annotation_appl
   "//@" @attribute.builtin
   (annotation_appl_builtin_body))
+
+[
+  (autoid_kind)
+  (extensibility_kind)
+  (verbatim_language)
+  (placement_kind)
+  (service_platform)
+  (try_construct_fail_action)
+  (data_representation_mask)
+] @constant
+
+(anno_name) @attribute.builtin
+
+(range_kind) @attribute.builtin

From debf5816eee21b7d51025ef17ba0647386226cb5 Mon Sep 17 00:00:00 2001
From: Jean-Sebastien Trottier <jst@qualipsoft.com>
Date: Mon, 22 Jul 2024 04:06:19 -0400
Subject: [PATCH 1676/2704] fix(install): abort installation using git in
 active git session

Problem: Installing a parser using git in an active git session (e.g.,
when editing a commit message) can corrupt the corresponding repository.

Solution: Check for typical environment variables first and abort
installation if found.
---
 .../shell_command_selectors.lua               | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 9622f5801..f95c84ae8 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -289,6 +289,31 @@ function M.select_download_commands(repo, project_name, cache_folder, revision,
     local git_folder = utils.join_path(cache_folder, project_name)
     local clone_error = "Error during download, please verify your internet connection"
 
+    -- Running `git clone` or `git checkout` while running under Git (such as
+    -- editing a `git commit` message) will likely fail to install parsers
+    -- (such as 'gitcommit') and can also corrupt the index file of the current
+    -- Git repository. Check for typical git environemnt variables and abort if found.
+    for _, k in pairs {
+      "GIT_ALTERNATE_OBJECT_DIRECTORIES",
+      "GIT_CEILING_DIRECTORIES",
+      "GIT_DIR",
+      "GIT_INDEX",
+      "GIT_INDEX_FILE",
+      "GIT_OBJECT_DIRECTORY",
+      "GIT_PREFIX",
+      "GIT_WORK_TREE",
+    } do
+      if vim.uv.os_getenv(k) then
+        vim.api.nvim_err_writeln(
+          string.format(
+            "Cannot install %s with git in an active git session. Exit the session and run ':TSInstall %s' manually",
+            project_name
+          )
+        )
+        return {}
+      end
+    end
+
     return {
       {
         cmd = "git",

From 4ee9f12ff5352547fea8695fe6899e55293fc837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Dujava?=
 <19737748+jdujava@users.noreply.github.com>
Date: Mon, 22 Jul 2024 23:12:18 +0200
Subject: [PATCH 1677/2704] refactor(latex): deduplicate captures, reorder

---
 queries/latex/highlights.scm | 78 ++++++++++++------------------------
 1 file changed, 26 insertions(+), 52 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 4eb39de87..672111878 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -1,18 +1,20 @@
 ; General syntax
-(command_name) @function
-
-(placeholder) @variable
-
-(text_mode
-  [
-    "\\text"
-    "\\intertext"
-    "\\shortintertext"
-  ] @function)
+(command_name) @function @nospell
 
 (caption
   command: _ @function)
 
+(placeholder) @variable
+
+; Turn spelling on for text
+(text) @spell
+
+; \text, \intertext, \shortintertext, ...
+(text_mode
+  command: _ @function @nospell
+  content: (curly_group
+    (_) @none @spell))
+
 (key_value_pair
   key: (_) @variable.parameter
   value: (_))
@@ -53,17 +55,13 @@
 
 ; Definitions and references
 (new_command_definition
-  command: _ @function.macro
-  declaration: (curly_group_command_name
-    (_) @function))
+  command: _ @function.macro)
 
 (old_command_definition
-  command: _ @function.macro
-  declaration: (_) @function)
+  command: _ @function.macro)
 
 (let_command_definition
-  command: _ @function.macro
-  declaration: (_) @function)
+  command: _ @function.macro)
 
 (environment_definition
   command: _ @function.macro
@@ -107,6 +105,11 @@
   command: _ @function.macro
   keys: (curly_group_text_list) @markup.link)
 
+(hyperlink
+  command: _ @function @nospell
+  uri: (curly_group_uri
+    (_) @markup.link.url @nospell))
+
 (glossary_entry_definition
   command: _ @function.macro
   name: (curly_group_text
@@ -137,26 +140,6 @@
   name: (curly_group_text
     (_) @markup.link))
 
-; Formatting
-(text_mode
-  content: (curly_group
-    (_) @none @spell))
-
-(math_environment
-  (begin
-    command: _ @markup.math
-    name: (curly_group_text
-      (_) @markup.math)))
-
-(math_environment
-  (_) @markup.math)
-
-(math_environment
-  (end
-    command: _ @markup.math
-    name: (curly_group_text
-      (_) @markup.math)))
-
 ; Sectioning
 (title_declaration
   command: _ @module
@@ -232,7 +215,7 @@
 ((generic_command
   command: (command_name) @_name
   arg: (curly_group
-    (text) @markup.heading))
+    (_) @markup.heading))
   (#eq? @_name "\\frametitle"))
 
 ((generic_command
@@ -247,11 +230,6 @@
     (_) @markup.strong))
   (#any-of? @_name "\\textbf" "\\mathbf"))
 
-(hyperlink
-  command: _ @function @nospell
-  uri: (curly_group_uri
-    (_) @markup.link.url @nospell))
-
 ; File inclusion commands
 (class_include
   command: _ @keyword.import
@@ -302,12 +280,6 @@
   command: _ @keyword.import
   paths: (curly_group_path_list) @string)
 
-(text) @spell
-
-(inline_formula) @nospell
-
-(displayed_equation) @nospell
-
 (key_value_pair) @nospell
 
 (generic_environment
@@ -317,8 +289,6 @@
 (citation
   keys: _ @nospell)
 
-(command_name) @nospell
-
 (label_definition) @nospell
 
 (label_reference) @nospell
@@ -329,8 +299,12 @@
 [
   (displayed_equation)
   (inline_formula)
-] @markup.math
+] @markup.math @nospell
 
+(math_environment
+  (_) @markup.math)
+
+; Comments
 [
   (line_comment)
   (block_comment)

From c5b3560306c93498cd745f597880d4afe95ec5c8 Mon Sep 17 00:00:00 2001
From: Andrey Chalkin <L2jLiga@gmail.com>
Date: Mon, 22 Jul 2024 23:14:45 +0200
Subject: [PATCH 1678/2704] feat: add powershell language

---
 README.md                         |   1 +
 lockfile.json                     |   3 +
 lua/nvim-treesitter/parsers.lua   |   9 +
 queries/powershell/folds.scm      |  13 ++
 queries/powershell/highlights.scm | 325 ++++++++++++++++++++++++++++++
 queries/powershell/indents.scm    |  41 ++++
 queries/powershell/injections.scm |  27 +++
 queries/powershell/locals.scm     |  81 ++++++++
 8 files changed, 500 insertions(+)
 create mode 100644 queries/powershell/folds.scm
 create mode 100644 queries/powershell/highlights.scm
 create mode 100644 queries/powershell/indents.scm
 create mode 100644 queries/powershell/injections.scm
 create mode 100644 queries/powershell/locals.scm

diff --git a/README.md b/README.md
index d7b68fa82..10114e826 100644
--- a/README.md
+++ b/README.md
@@ -351,6 +351,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [pod](https://github.com/tree-sitter-perl/tree-sitter-pod) (maintained by @RabbiVeesh, @LeoNerd)
 - [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
 - [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
+- [x] [powershell](https://github.com/airbus-cert/tree-sitter-powershell) (maintained by @L2jLiga)
 - [x] [printf](https://github.com/ObserverOfTime/tree-sitter-printf) (maintained by @ObserverOfTime)
 - [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
 - [x] [problog](https://github.com/foxyseta/tree-sitter-prolog) (maintained by @foxyseta)
diff --git a/lockfile.json b/lockfile.json
index c5c4f0f34..0b5531d40 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -533,6 +533,9 @@
   "pony": {
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
+  "powershell": {
+    "revision": "804d86fd4ad286bd0cc1c1f0f7b28bd7af6755ad"
+  },
   "printf": {
     "revision": "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 906160ed7..1cdb1b186 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1562,6 +1562,15 @@ list.pony = {
   maintainers = { "@amaanq", "@mfelsche" },
 }
 
+list.powershell = {
+  install_info = {
+    url = "https://github.com/airbus-cert/tree-sitter-powershell",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  filetype = "ps1",
+  maintainers = { "L2jLiga" },
+}
+
 list.printf = {
   install_info = {
     url = "https://github.com/ObserverOfTime/tree-sitter-printf",
diff --git a/queries/powershell/folds.scm b/queries/powershell/folds.scm
new file mode 100644
index 000000000..d87e3f688
--- /dev/null
+++ b/queries/powershell/folds.scm
@@ -0,0 +1,13 @@
+[
+  (expandable_here_string_literal)
+  (verbatim_here_string_characters)
+  (function_statement)
+  (param_block)
+  (script_block_expression)
+  (statement_block)
+  (switch_body)
+  (array_expression)
+  (hash_literal_expression)
+  (class_statement)
+  (class_method_definition)
+] @fold
diff --git a/queries/powershell/highlights.scm b/queries/powershell/highlights.scm
new file mode 100644
index 000000000..851e69a47
--- /dev/null
+++ b/queries/powershell/highlights.scm
@@ -0,0 +1,325 @@
+; Punctuation
+;------------
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(hash_literal_expression
+  [
+    "@{"
+    "}"
+  ] @punctuation.special)
+
+(array_expression
+  [
+    "@("
+    ")"
+  ] @punctuation.special)
+
+[
+  "."
+  "::"
+  ","
+  ";"
+  (empty_statement)
+  (command_argument_sep)
+] @punctuation.delimiter
+
+; Keywords
+;---------
+[
+  "if"
+  "elseif"
+  "else"
+  "switch"
+] @keyword.conditional
+
+[
+  "foreach"
+  "for"
+  "while"
+  "do"
+  "until"
+  "in"
+  "break"
+  "continue"
+] @keyword.repeat
+
+[
+  "function"
+  "filter"
+  "workflow"
+  "exit"
+  "trap"
+  "param"
+  "inlinescript"
+] @keyword.function
+
+"return" @keyword.return
+
+[
+  "class"
+  "enum"
+] @keyword.type
+
+(class_attribute) @keyword.modifier
+
+[
+  "throw"
+  "try"
+  "catch"
+  "finally"
+] @keyword.exception
+
+[
+  "parallel"
+  "sequence"
+] @keyword.coroutine
+
+[
+  "param"
+  "dynamicparam"
+  "begin"
+  "process"
+  "end"
+  ; TODO: not supported by parser yet, can be used to declare constants
+  "data"
+] @keyword
+
+; Operators
+;----------
+[
+  "-and"
+  "-or"
+  "-xor"
+  "-band"
+  "-bor"
+  "-bxor"
+  "+"
+  "-"
+  "/"
+  "\\"
+  "%"
+  "*"
+  ".."
+  "-not"
+  "-bnot"
+  "!"
+  "="
+  "|"
+  (pre_increment_expression)
+  (pre_decrement_expression)
+  (post_increment_expression)
+  (post_decrement_expression)
+  (comparison_operator)
+  (assignement_operator)
+] @operator
+
+; Generic types
+;--------------
+(string_literal) @string
+
+(integer_literal) @number
+
+(real_literal) @number.float
+
+(variable) @variable
+
+((variable) @variable.builtin
+  (#any-of? @variable.builtin
+    "$$" "$?" "$^" "$_" "$args" "$ConsoleFileName" "$EnabledExperimentalFeatures" "$Error" "$Event"
+    "$EventArgs" "$EventSubscriber" "$ExecutionContext" "$false" "$foreach" "$HOME" "$Host" "$input"
+    "$IsCoreCLR" "$IsLinux" "$IsMacOS" "$IsWindows" "$LASTEXITCODE" "$Matches" "$MyInvocation"
+    "$NestedPromptLevel" "$null" "$PID" "$PROFILE" "$PSBoundParameters" "$PSCmdlet" "$PSCommandPath"
+    "$PSCulture" "$PSDebugContext" "$PSEdition" "$PSHOME" "$PSItem" "$PSScriptRoot" "$PSSenderInfo"
+    "$PSUICulture" "$PSVersionTable" "$PWD" "$Sender" "ShellId" "$StackTrace" "$switch" "$this"
+    "$true"))
+
+((variable) @variable.builtin
+  (#lua-match? @variable.builtin "^\$env:"))
+
+(comment) @comment @spell
+
+; Booleans
+;---------
+([
+  (generic_token)
+  (command_name)
+  (variable)
+  (command)
+] @boolean
+  (#any-of? @boolean "True" "False" "$true" "$false"))
+
+; switch -regex
+;--------------
+(switch_statement
+  (switch_parameters
+    (switch_parameter) @_parameter)
+  (switch_body
+    (switch_clauses
+      (switch_clause
+        (switch_clause_condition
+          (string_literal) @string.regexp))))
+  (#eq? @_parameter "-regex")
+  (#offset! @string.regexp 0 1 0 -1))
+
+; Multiline strings
+;------------------
+([
+  (verbatim_here_string_characters)
+  (expandable_here_string_literal)
+] @markup.raw.block
+  (#offset! @markup.raw.block 0 2 0 -2))
+
+; Type references and definitions
+;--------------------------------
+(type_spec
+  (type_name) @type)
+
+(class_statement
+  (simple_name) @type)
+
+(type_spec
+  (type_name) @type.builtin
+  (#any-of? @type.builtin
+    "bool" "Boolean" "System.Boolean" "char" "Char" "System.Char" "string" "String" "System.String"
+    "int" "Int32" "System.Int32" "long" "Int64" "System.Int64" "byte" "Byte" "System.Byte" "float"
+    "Single" "System.Single" "double" "Double" "System.Double" "decimal" "Decimal" "System.Decimal"
+    "array" "Array" "System.Array" "regex" "Regex" "System.Text.RegularExpressions.Regex" "ref"
+    "Management.Automation.PSReference" "System.Management.Automation.PSReference" "scriptblock"
+    "Management.Automation.ScriptBlock" "System.Management.Automation.ScriptBlock" "datetime"
+    "DateTime" "System.DateTime" "enum" "Enum" "System.Enum" "IO.DirectoryInfo"
+    "System.IO.DirectoryInfo" "IO.FileAttributes" "System.IO.FileAttributes" "IO.FileInfo"
+    "System.IO.FileInfo" "IO.Path" "System.IO.Path" "Text.RegularExpressions.RegexOptions"
+    "System.Text.RegularExpressions.RegexOptions" "Math" "System.Math" "PSObject" "System.PSObject"
+    "Object" "System.Object" "ValueType" "System.ValueType" "Hashtable"
+    "System.Collections.Hashtable" "Collections.Stack" "System.Collections.Generic.Stack"
+    "Collections.Dictionary" "System.Collections.Dictionary" "Collections.DictionaryEntry"
+    "System.Collections.DictionaryEntry" "Collections.ArrayList" "System.Collections.ArrayList"
+    "Management.Automation.SwitchParameter" "System.Management.Automation.SwitchParameter"
+    "Management.Automation.ActionPreference" "System.Management.Automation.ActionPreference"
+    "Management.Automation.ConfirmImpact" "System.Management.Automation.ConfirmImpact"
+    "Management.Automation.CommandInfo" "System.Management.Automation.CommandInfo"
+    "Management.Automation.ProviderInfo" "System.Management.Automation.ProviderInfo"
+    "Management.Automation.PSDriveInfo" "System.Management.Automation.PSDriveInfo"
+    "Management.Automation.PSVariable" "System.Management.Automation.PSVariable"
+    "Management.Automation.AliasInfo" "System.Management.Automation.AliasInfo"
+    "Management.Automation.PathInfo" "System.Management.Automation.PathInfo"
+    "Management.Automation.PathInfoStack" "System.Management.Automation.PathInfoStack"
+    "Management.Automation.ApplicationInfo" "System.Management.Automation.ApplicationInfo"
+    "Management.Automation.CmdletInfo" "System.Management.Automation.CmdletInfo"
+    "Management.Automation.ExternalScriptInfo" "System.Management.Automation.ExternalScriptInfo"
+    "Management.Automation.FunctionInfo" "System.Management.Automation.FunctionInfo"
+    "Management.Automation.CommandTypes" "System.Management.CommandTypes"
+    "Management.Automation.ScopedItemOptions" "System.Management.Automation.ScopedItemOptions"
+    "Management.Automation.PSTypeName" "System.Management.Automation.PSTypeName"
+    "Management.Automation.ParameterMetadata" "System.Management.Automation.ParameterMetadata"
+    "Management.Automation.CommandParameterSetInfo"
+    "System.Management.Automation.CommandParameterSetInfo"
+    "Management.Automation.SessionStateEntryVisibility"
+    "System.Management.Automation.SessionStateEntryVisibility" "Management.Automation.FilterInfo"
+    "System.Management.Automation.FilterInfo" "Management.Automation.ModuleType"
+    "System.Management.Automation.ModuleType" "Management.Automation.PSModuleInfo"
+    "System.Management.Automation.PSModuleInfo" "Management.Automation.PSCustomObject"
+    "System.Management.Automation.PSCustomObject" "Management.Automation.PSScriptCmdlet"
+    "System.Management.Automation.PSScriptCmdlet" "Management.Automation.ErrorRecord"
+    "System.Management.Automation.ErrorRecord" "Management.Automation.PSCredential"
+    "System.Management.Automation.PSCredential" "Management.Automation.PSMethod"
+    "System.Management.Automation.PSMethod")
+  )
+
+; Function definitions
+;---------------------
+(function_statement
+  (function_name) @function)
+
+; Classes, fields and methods definitions
+;----------------------------------------
+(class_property_definition
+  (variable) @variable.member)
+
+(class_method_definition
+  (simple_name) @function.method)
+
+(class_statement
+  (simple_name) @_class_name
+  (class_method_definition
+    (simple_name) @constructor)
+  (#eq? @constructor @_class_name))
+
+(key_expression) @property
+
+; Functions, methods calls and properties access
+;--------------------------
+(command_invokation_operator) @operator
+
+(invokation_expression
+  (member_name) @function.call)
+
+(invokation_expression
+  (member_name) @constructor
+  (#eq? @constructor "new"))
+
+(member_access
+  (member_name
+    [
+      (simple_name)
+      (variable)
+    ] @variable.member))
+
+; Commands execution
+;-------------------
+(command
+  command_name: (command_name) @function.call)
+
+(command
+  command_name: (command_name) @function.builtin
+  (#any-of? @function.builtin
+    ; Locations & Paths
+    "cd" "cd.." "cd\\" "cd~" "help" "Get-Location" "Pop-Location" "Push-Location" "Set-Location"
+    "Convert-Path" "Join-Path" "Resolve-Path" "Split-Path" "Test-Path"
+    ; Files & Directories
+    "Clear-Item" "Clear-ItemProperty" "Copy-Item" "Copy-ItemProperty" "Get-Item" "Get-ItemProperty"
+    "Get-ItemPropertyValue" "Invoke-Item" "Move-Item" "Move-ItemProperty" "New-Item"
+    "New-ItemProperty" "Remove-Item" "Remove-ItemProperty" "Rename-Item" "Rename-ItemProperty"
+    "Set-Item" "Set-ItemProperty"
+    ; Aliases
+    "New-Alias" "Get-Alias" "Set-Alias" "Remove-Alias" "Import-Alias" "Export-Alias"
+    ; Host (prompt)
+    "prompt" "cls" "echo" "Clear-Host" "Get-Host" "Out-Host" "Read-Host" "Write-Host" "Out-String"
+    ; Expressions
+    "Invoke-Expression"
+    ; Objects
+    "Compare-Object" "ForEach-Object" "Group-Object" "Measure-Object" "New-Object" "Select-Object"
+    "Sort-Object" "Tee-Object" "Where-Object"
+    ; Modules
+    "Export-ModuleMember" "Find-Module" "Get-Module" "Import-Module" "Install-Module" "New-Module"
+    "New-ModuleManifest" "Publish-Module" "Remove-Module" "Save-Module" "Test-ModuleManifest"
+    "Uninstall-Module" "Update-Module" "Update-ModuleManifest"))
+
+; Parameters and call arguments
+;------------------------------
+(command_elements
+  (generic_token) @variable.parameter)
+
+(switch_parameter) @variable.parameter.builtin
+
+(command_parameter) @variable.parameter.builtin
+
+(script_parameter
+  (variable) @variable.parameter)
+
+(class_method_parameter
+  (variable) @variable.parameter)
+
+; Document encoding
+;------------------
+((program
+  .
+  (comment) @keyword.directive @nospell)
+  (#lua-match? @keyword.directive "Encoding$"))
diff --git a/queries/powershell/indents.scm b/queries/powershell/indents.scm
new file mode 100644
index 000000000..3be2ed161
--- /dev/null
+++ b/queries/powershell/indents.scm
@@ -0,0 +1,41 @@
+(function_statement
+  "}" @indent.branch) @indent.begin
+
+(param_block
+  [
+    "param"
+    "("
+    ")"
+  ] @indent.branch) @indent.begin
+
+(script_block_expression
+  "}" @indent.branch) @indent.begin
+
+(statement_block
+  "}" @indent.branch) @indent.begin
+
+(switch_body
+  "}" @indent.branch) @indent.begin
+
+(array_expression
+  ")" @indent.branch) @indent.begin
+
+(hash_literal_expression
+  "}" @indent.branch) @indent.begin
+
+(class_statement
+  "}" @indent.branch) @indent.begin
+
+(class_method_definition
+  "}" @indent.branch) @indent.begin
+
+[
+  "}"
+  ")"
+] @indent.end
+
+[
+  (comment)
+  (string_literal)
+  (ERROR)
+] @indent.auto
diff --git a/queries/powershell/injections.scm b/queries/powershell/injections.scm
new file mode 100644
index 000000000..677e8b267
--- /dev/null
+++ b/queries/powershell/injections.scm
@@ -0,0 +1,27 @@
+; comments and block-comments
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+; dynamic invocation like & "$env:ChocolateyInstall\bin\choco.exe"
+(command
+  (command_invokation_operator) @_operator
+  (command_name_expr
+    (string_literal) @injection.content)
+  (#eq? @_operator "&")
+  (#set! injection.language "powershell")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children))
+
+; switch -regex
+(switch_statement
+  (switch_parameters
+    (switch_parameter) @_parameter)
+  (switch_body
+    (switch_clauses
+      (switch_clause
+        (switch_clause_condition
+          (string_literal) @injection.content))))
+  (#eq? @_parameter "-regex")
+  (#set! injection.language "regex")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children))
diff --git a/queries/powershell/locals.scm b/queries/powershell/locals.scm
new file mode 100644
index 000000000..3a8158d3f
--- /dev/null
+++ b/queries/powershell/locals.scm
@@ -0,0 +1,81 @@
+; Scopes
+;-------
+(class_statement) @local.scope
+
+(class_method_definition) @local.scope
+
+(statement_block) @local.scope
+
+(function_statement) @local.scope
+
+; Definitions
+;------------
+(class_statement
+  (simple_name) @local.definition.type
+  (#set! definition.var.scope "parent"))
+
+(class_property_definition
+  (variable) @local.definition.field
+  (#set! definition.var.scope "parent"))
+
+(class_method_definition
+  (simple_name) @local.definition.method
+  (#set! definition.var.scope "parent"))
+
+(function_statement
+  (function_name) @local.definition.function
+  (#set! definition.var.scope "parent"))
+
+; function, script block parameters
+(parameter_list
+  (script_parameter
+    (attribute_list
+      (attribute
+        (type_literal
+          (type_spec) @local.definition.associated)))
+    (variable) @local.definition.parameter))
+
+; variable assignment
+(assignment_expression
+  (left_assignment_expression
+    (logical_expression
+      (bitwise_expression
+        (comparison_expression
+          (additive_expression
+            (multiplicative_expression
+              (format_expression
+                (range_expression
+                  (array_literal_expression
+                    (unary_expression
+                      (variable) @local.definition.var)))))))))))
+
+; variable with type assignment
+(assignment_expression
+  (left_assignment_expression
+    (logical_expression
+      (bitwise_expression
+        (comparison_expression
+          (additive_expression
+            (multiplicative_expression
+              (format_expression
+                (range_expression
+                  (array_literal_expression
+                    (unary_expression
+                      (expression_with_unary_operator
+                        (cast_expression
+                          (type_literal
+                            (type_spec) @local.definition.associated)
+                          (unary_expression
+                            (variable) @local.definition.var))))))))))))))
+
+; References
+;-----------
+(variable) @local.reference
+
+(command_name) @local.reference
+
+(invokation_expression
+  (variable) @_variable
+  (member_name
+    (simple_name) @local.reference)
+  (#eq? @_variable "$this"))

From 5f5077f8f7fa545065a0846406011cd3cc49093b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 22 Jul 2024 23:16:28 +0200
Subject: [PATCH 1679/2704] fix(parsers): powershell maintainer

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1cdb1b186..1fb398ac2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1568,7 +1568,7 @@ list.powershell = {
     files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "ps1",
-  maintainers = { "L2jLiga" },
+  maintainers = { "@L2jLiga" },
 }
 
 list.printf = {

From 49452ab703304a2c8e5b1e5ce369ac56fb9639df Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 22 Jul 2024 20:19:23 -0700
Subject: [PATCH 1680/2704] fix(zig): add some missing highlights

---
 queries/zig/highlights.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index b4d578a98..d0f6e5b79 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -52,13 +52,13 @@ exception: "!" @keyword.exception
 (PtrTypeStart
   "c" @variable.builtin)
 
-((ContainerDeclType
-  [
-    (ErrorUnionExpr)
-    "enum"
-  ])
+(ContainerDecl
+  (ContainerDeclType
+    "enum")
   (ContainerField
-    (IDENTIFIER) @constant))
+    (ErrorUnionExpr
+      (SuffixExpr
+        (IDENTIFIER) @constant))))
 
 field_constant: (IDENTIFIER) @constant
 
@@ -190,6 +190,7 @@ field_constant: (IDENTIFIER) @constant
   (AssignOp)
   (MultiplyOp)
   (PrefixOp)
+  "="
   "*"
   "**"
   "->"
@@ -229,6 +230,9 @@ field_constant: (IDENTIFIER) @constant
 (PtrIndexPayload
   "|" @punctuation.bracket)
 
+(PtrListPayload
+  "|" @punctuation.bracket)
+
 (ParamType
   (ErrorUnionExpr
     (SuffixExpr

From 803e5bd14de3df27dcbd7264c2f1bfac19e08fb8 Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Tue, 18 Jun 2024 21:03:28 +0200
Subject: [PATCH 1681/2704] fix(latex): more `@nospell`

Apply `@nospell` to command/label names, paths, etc.
Where appropriate, turn spelling off for the whole node.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 70 ++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 672111878..dcc068e95 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -16,7 +16,7 @@
     (_) @none @spell))
 
 (key_value_pair
-  key: (_) @variable.parameter
+  key: (_) @variable.parameter @nospell
   value: (_))
 
 [
@@ -46,42 +46,42 @@
 (begin
   command: _ @module
   name: (curly_group_text
-    (text) @label))
+    (text) @label @nospell))
 
 (end
   command: _ @module
   name: (curly_group_text
-    (text) @label))
+    (text) @label @nospell))
 
 ; Definitions and references
 (new_command_definition
-  command: _ @function.macro)
+  command: _ @function.macro @nospell)
 
 (old_command_definition
-  command: _ @function.macro)
+  command: _ @function.macro @nospell)
 
 (let_command_definition
-  command: _ @function.macro)
+  command: _ @function.macro @nospell)
 
 (environment_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text
     (_) @markup.link))
 
 (theorem_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text_list
-    (_) @label))
+    (_) @label @nospell))
 
 (paired_delimiter_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   declaration: (curly_group_command_name
     (_) @function))
 
 (label_definition
   command: _ @function.macro
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @markup.link @nospell))
 
 (label_reference_range
   command: _ @function.macro
@@ -102,8 +102,8 @@
   number: (_) @markup.link)
 
 (citation
-  command: _ @function.macro
-  keys: (curly_group_text_list) @markup.link)
+  command: _ @function.macro @nospell
+  keys: (curly_group_text_list) @markup.link @nospell)
 
 (hyperlink
   command: _ @function @nospell
@@ -111,9 +111,9 @@
     (_) @markup.link.url @nospell))
 
 (glossary_entry_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @markup.link @nospell))
 
 (glossary_entry_reference
   command: _ @function.macro
@@ -121,9 +121,9 @@
     (_) @markup.link))
 
 (acronym_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @markup.link @nospell))
 
 (acronym_reference
   command: _ @function.macro
@@ -280,20 +280,28 @@
   command: _ @keyword.import
   paths: (curly_group_path_list) @string)
 
-(key_value_pair) @nospell
-
-(generic_environment
-  begin: _ @nospell
-  end: _ @nospell)
-
-(citation
-  keys: _ @nospell)
-
-(label_definition) @nospell
-
-(label_reference) @nospell
-
-(label_reference_range) @nospell
+; Turn spelling off for whole nodes
+[
+  (label_reference)
+  (label_reference_range)
+  (label_number)
+  (glossary_entry_reference)
+  (acronym_reference)
+  (color_definition)
+  (color_reference)
+  (class_include)
+  (package_include)
+  (latex_include)
+  (verbatim_include)
+  (import_include)
+  (bibstyle_include)
+  (bibtex_include)
+  (biblatex_include)
+  (graphics_include)
+  (svg_include)
+  (inkscape_include)
+  (tikz_library_import)
+] @nospell
 
 ; Math
 [

From 820b14a34c3c5a53aa99213bdac2ee19cb107ad5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 06:41:08 +0000
Subject: [PATCH 1682/2704] bot(lockfile): update git_rebase, perl, sourcepawn,
 sql, typst

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0b5531d40..d20a9a747 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -213,7 +213,7 @@
     "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
   },
   "git_rebase": {
-    "revision": "274e27ea0f09371122ab55b8a812a32d6ef644e8"
+    "revision": "bff4b66b44b020d918d67e2828eada1974a966aa"
   },
   "gitattributes": {
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"
+    "revision": "7384aa0903f55b9a2247775b29f09df6c093cd1a"
   },
   "php": {
     "revision": "575a0801f430c8672db70b73493c033a9dcfc328"
@@ -681,13 +681,13 @@
     "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
   },
   "sourcepawn": {
-    "revision": "645d093763bcaaf7535edbdf6575a5c978b16491"
+    "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
   },
   "sparql": {
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"
+    "revision": "91c5ce054925728109f90d5c057cbf5b47f93fda"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -789,7 +789,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "90f6af21271dee246a9cafe109e2b456c5bc10a6"
+    "revision": "abe60cbed7986ee475d93f816c1be287f220c5d8"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"

From 3fa183e34e9ea73bfdea353e72020fe990f8e92b Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Tue, 23 Jul 2024 09:25:54 +0200
Subject: [PATCH 1683/2704] feat(latex): improve parameters

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index dcc068e95..c0f0bb2ba 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -4,8 +4,6 @@
 (caption
   command: _ @function)
 
-(placeholder) @variable
-
 ; Turn spelling on for text
 (text) @spell
 
@@ -15,14 +13,17 @@
   content: (curly_group
     (_) @none @spell))
 
+; Variables, parameters
+(placeholder) @variable
+
 (key_value_pair
   key: (_) @variable.parameter @nospell
   value: (_))
 
-[
-  (brack_group)
-  (brack_group_argc)
-] @variable.parameter
+(curly_group_spec
+  (text) @variable.parameter)
+
+(brack_group_argc) @variable.parameter
 
 [
   (operator)

From 9d252d00210ed8d43197ef048daa94e6dc821bd6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 07:41:38 +0000
Subject: [PATCH 1684/2704] bot(lockfile): update editorconfig, latex

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d20a9a747..b83d4d33c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "c5f83685a64117872ae750ce14333a7a1dddcf0b"
+    "revision": "fd0d64d2fc91eab903bed4c11ce280b62e46f16e"
   },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "12523bd1ffd2c428b2dad177e2b4555574d90973"
+    "revision": "6706f88d5b563ed8aaf7babb45e5f85dab001db1"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"

From 205102f37243e49fc1608635a38811ecc282d14c Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Tue, 23 Jul 2024 20:08:03 -0500
Subject: [PATCH 1685/2704] feat(markdown): set url attribute on plain URLs

Setting the url attribute on actual URLs will cause Nvim to use the OSC
8 sequence on the entire URL, which enables terminal emulators to detect
the URL even when it is wrapped.

The (uri_autolink) node must use an #offset! directive to strip the
surrounding <> characters from the URL.
---
 queries/markdown_inline/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 10bb5b060..ac99cce5f 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -88,6 +88,13 @@
   (email_autolink)
 ] @markup.link.url @nospell
 
+((link_destination) @_url
+  (#set! @_url "url" @_url))
+
+((uri_autolink) @_url
+  (#offset! @_url 0 1 0 -1)
+  (#set! @_url "url" @_url))
+
 (entity_reference) @nospell
 
 ; Replace common HTML entities.

From b1e88723eeef24935e70f68efcc8cfe1c63bcb5f Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Tue, 23 Jul 2024 20:19:01 -0500
Subject: [PATCH 1686/2704] feat(html): set url attribute for HTML URLs

---
 queries/html_tags/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index 6c5063c5f..c6abe111b 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -93,7 +93,8 @@
   (attribute_name) @_attr
   (quoted_attribute_value
     (attribute_value) @string.special.url))
-  (#any-of? @_attr "href" "src"))
+  (#any-of? @_attr "href" "src")
+  (#set! @string.special.url "url" @string.special.url))
 
 [
   "<"

From a0732ca9f0b2549d795aafadd42b357dffb231d0 Mon Sep 17 00:00:00 2001
From: Dheepak Krishnamurthy <noreply@kdheepak.com>
Date: Tue, 23 Jul 2024 20:26:57 -0400
Subject: [PATCH 1687/2704] feat(julia): Add syntax highlighting for markdown
 and bash prefixed_string_literals

---
 queries/julia/injections.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index d8bae2e99..f3c5d0c43 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -13,14 +13,27 @@
   (#set! injection.language "markdown")
   (#offset! @injection.content 0 3 0 -3))
 
+; Inject comments
 ([
   (line_comment)
   (block_comment)
 ] @injection.content
   (#set! injection.language "comment"))
 
+; Inject regex in r"hello\bworld"
 ((prefixed_string_literal
   prefix: (identifier) @_prefix) @injection.content
   (#eq? @_prefix "r")
   (#set! injection.language "regex")
   (#offset! @injection.content 0 2 0 -1))
+
+; Inject markdown in md"**Bold** and _Italics_"
+((prefixed_string_literal
+  prefix: (identifier) @_prefix) @injection.content
+  (#eq? @_prefix "md")
+  (#set! injection.language "markdown")
+  (#offset! @injection.content 0 3 0 -1))
+
+; Inject bash in `git add --help`
+((command_literal) @injection.content
+  (#set! injection.language "bash"))

From c760e4037cc02336ddd00737f95ee26e128fa745 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 06:40:55 +0000
Subject: [PATCH 1688/2704] bot(lockfile): update heex, perl, sql

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b83d4d33c..58785e4cd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -288,7 +288,7 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "heex": {
-    "revision": "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"
+    "revision": "6dd0303acf7138dd2b9b432a229e16539581c701"
   },
   "helm": {
     "revision": "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "7384aa0903f55b9a2247775b29f09df6c093cd1a"
+    "revision": "7581cbf8fb793bce94d0241c89fe49b01b1477f9"
   },
   "php": {
     "revision": "575a0801f430c8672db70b73493c033a9dcfc328"
@@ -687,7 +687,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "91c5ce054925728109f90d5c057cbf5b47f93fda"
+    "revision": "bd0a2de0ae5e1dd5ded77b26f8a3e67367e90560"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"

From 96c5cb23342db3e51994680781da54b45d7e0c9b Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Wed, 24 Jul 2024 14:17:39 -0500
Subject: [PATCH 1689/2704] feat(vimdoc): set url attribute for URLs

---
 queries/vimdoc/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 194c80362..322b58a23 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -59,7 +59,8 @@
 
 (keycode) @string.special
 
-(url) @string.special.url
+((url) @string.special.url
+  (#set! @string.special.url "url" @string.special.url))
 
 (modeline) @keyword.directive
 

From 63be47f203d3e9174fdac3872fb9766e5bcc5a11 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 06:40:54 +0000
Subject: [PATCH 1690/2704] bot(lockfile): update erlang, janet_simple, latex,
 m68k, matlab

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 58785e4cd..5361d1977 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "19ca500fa5a17ab58dc18aa03b50e2db305e7a8a"
+    "revision": "8f41b588fe38b981156651ef56b192ed3d158efd"
   },
   "facility": {
     "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
@@ -336,7 +336,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "3b08641373cb3e37bc531e6e3cdb85d02b454702"
+    "revision": "ea842cb57a90865c8f50bcb4499de1a94860f3a4"
   },
   "java": {
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "6706f88d5b563ed8aaf7babb45e5f85dab001db1"
+    "revision": "f567ce7863533f81b043e91801064f790645cb27"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -420,7 +420,7 @@
     "revision": "fbadc96272f718dba267628ba7b0e694c368cef3"
   },
   "m68k": {
-    "revision": "9e082a2253c50eb3d80e84bbd635e57cfb1476a2"
+    "revision": "e128454c2210c0e0c10b68fe45ddb8fee80182a3"
   },
   "make": {
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
@@ -432,7 +432,7 @@
     "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "matlab": {
-    "revision": "2825fb578325ac308945318881445a89ea06e0f6"
+    "revision": "821f7bdf9d922822302a0170c2f157e36ffb7a94"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"

From e0faad4a9e2804d0d9fd5c509289bd630253dfc3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 06:41:46 +0000
Subject: [PATCH 1691/2704] bot(lockfile): update gleam, idl, sql

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5361d1977..66e531223 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -225,7 +225,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "84fa6b0d53b6dd9414797e659923719799e3b0a8"
+    "revision": "426e67087fd62be5f4533581b5916b2cf010fb5b"
   },
   "glimmer": {
     "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "e0fb8591d0acbb195d190d644140f821671f0011"
+    "revision": "be58a725cccee2e9e555500d97a543940bded18a"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -687,7 +687,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "bd0a2de0ae5e1dd5ded77b26f8a3e67367e90560"
+    "revision": "431233e5720cd356aaccb4db7fab00093d7b80ba"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"

From e265fec94c7dc0c8c64cb86820ff5ad3ee135c7d Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Fri, 26 Jul 2024 12:14:14 +0200
Subject: [PATCH 1692/2704] fix(latex): environment name should be label

Environment names are captured as `@label` in `(begin)` and `(end)`
nodes, and so should they be when we are defining environments.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index c0f0bb2ba..956c753f7 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -67,7 +67,7 @@
 (environment_definition
   command: _ @function.macro @nospell
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @label @nospell))
 
 (theorem_definition
   command: _ @function.macro @nospell

From 1899c8c8ec98dee5c61da4c98b3e989c8ef840d1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 27 Jul 2024 06:44:28 +0000
Subject: [PATCH 1693/2704] bot(lockfile): update groovy, idl, latex, php,
 php_only, sql, systemverilog

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 66e531223..c99c6d812 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -267,7 +267,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "f3615006429251a966d7452bd46a0171364bcb7b"
+    "revision": "391229139d9f79879ccc84cb271889c9240c28a1"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "be58a725cccee2e9e555500d97a543940bded18a"
+    "revision": "1a6683f6809f7bc630f10fcad7d9ac6471deb706"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "f567ce7863533f81b043e91801064f790645cb27"
+    "revision": "f074e142ade9cdc292346d0484be27f9ebdbc4ea"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -510,10 +510,10 @@
     "revision": "7581cbf8fb793bce94d0241c89fe49b01b1477f9"
   },
   "php": {
-    "revision": "575a0801f430c8672db70b73493c033a9dcfc328"
+    "revision": "c07d69739ba71b5a449bdbb7735991f8aabf8546"
   },
   "php_only": {
-    "revision": "575a0801f430c8672db70b73493c033a9dcfc328"
+    "revision": "c07d69739ba71b5a449bdbb7735991f8aabf8546"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -687,7 +687,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "431233e5720cd356aaccb4db7fab00093d7b80ba"
+    "revision": "a9664463580473e92d8f5e29fa06fb1be88752af"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -723,7 +723,7 @@
     "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
   },
   "systemverilog": {
-    "revision": "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"
+    "revision": "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e"
   },
   "t32": {
     "revision": "6182836f4128725f1e74ce986840d7317021a015"

From 886b496763245b9698fd56293d7393effc17d47f Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Fri, 26 Jul 2024 04:33:52 -0700
Subject: [PATCH 1694/2704] feat(query): Highlight key in set! directive

---
 queries/query/highlights.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index c02ee3f2a..6fb23ac6d 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -12,7 +12,7 @@
   name: (identifier) @variable)
 
 (field_definition
-  name: (identifier) @property)
+  name: (identifier) @variable.member)
 
 (negated_field
   "!" @operator
@@ -63,6 +63,15 @@
 ((comment) @keyword.directive @nospell
   (#lua-match? @keyword.directive "^;+%s*format%-ignore%s*$"))
 
+((predicate
+  name: (identifier) @_name
+  parameters: (parameters
+    .
+    (capture)?
+    .
+    (identifier) @property))
+  (#eq? @_name "set"))
+
 ((predicate
   name: (identifier) @_name
   parameters: (parameters

From 2b4881286ad73c9ece7e5e4da130b2e4726c09fc Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 6 Apr 2024 03:13:46 -0700
Subject: [PATCH 1695/2704] feat(luap): Make class captures similar to regex
 captures

---
 queries/luap/highlights.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/queries/luap/highlights.scm b/queries/luap/highlights.scm
index 64bb60c85..40d2bd37b 100644
--- a/queries/luap/highlights.scm
+++ b/queries/luap/highlights.scm
@@ -32,7 +32,11 @@
 (negated_set
   (character) @constant)
 
-(class) @keyword
+(class) @string.escape
+
+(class
+  "%" @string.regexp
+  (escape_char) @string.regexp)
 
 (negated_set
   "^" @operator)

From 7cec6219c4ac5ce01ef2f29df23f8b3cebca8b09 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 27 Jul 2024 07:54:27 -0700
Subject: [PATCH 1696/2704] fix(query): properly apply predicate injections

I think these have been broken since the query parser update. Basically
the inner node for the string content was preventing injections because
include-children was not set.
---
 queries/query/injections.scm                  | 18 ++++++-------
 .../query/test-query-injections.scm           | 27 +++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 tests/query/injections/query/test-query-injections.scm

diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index c6a74f82f..759f9b2e2 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -1,28 +1,28 @@
 ((predicate
   name: (identifier) @_name
   parameters: (parameters
-    (string) @injection.content))
+    (string
+      (string_content) @injection.content)))
   (#any-of? @_name "match" "not-match" "any-match" "vim-match" "not-vim-match" "any-vim-match")
-  (#set! injection.language "regex")
-  (#offset! @injection.content 0 1 0 -1))
+  (#set! injection.language "regex"))
 
 ((predicate
   name: (identifier) @_name
   parameters: (parameters
-    (string) @injection.content))
+    (string
+      (string_content) @injection.content)))
   (#any-of? @_name "lua-match" "not-lua-match" "any-lua-match")
-  (#set! injection.language "luap")
-  (#offset! @injection.content 0 1 0 -1))
+  (#set! injection.language "luap"))
 
 ((predicate
   name: (identifier) @_name
   parameters: (parameters
-    (string) @injection.content
+    (string
+      (string_content) @injection.content)
     .
     (string) .))
   (#any-of? @_name "gsub" "not-gsub")
-  (#set! injection.language "luap")
-  (#offset! @injection.content 0 1 0 -1))
+  (#set! injection.language "luap"))
 
 ((comment) @injection.content
   (#set! injection.language "comment"))
diff --git a/tests/query/injections/query/test-query-injections.scm b/tests/query/injections/query/test-query-injections.scm
new file mode 100644
index 000000000..f382eddd9
--- /dev/null
+++ b/tests/query/injections/query/test-query-injections.scm
@@ -0,0 +1,27 @@
+; vim: ft=query
+; format-ignore
+(((symbol) @constant
+  (#not-lua-match? @constant "^_*[A-Z][A-Z0-9_]*$"))
+;                             ^ @luap
+)
+
+; format-ignore
+(((tag
+  (attributes
+    (attribute
+      (attribute_name) @keyword)))
+  (#match? @keyword "^(:|v-bind|v-|\\@)"))
+;                    ^ @regex
+)
+
+((comment) @injection.language
+  .
+  [
+    (string_expression
+      (string_fragment) @injection.content)
+    (indented_string_expression
+      (string_fragment) @injection.content)
+  ]
+  (#gsub! @injection.language "#%s*([%w%p]+)%s*" "%1")
+  ;                            ^ @luap
+  (#set! injection.combined))

From f97e0de0053df1cb3b9f74b9b1239acced1b7d9a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 27 Jul 2024 08:34:30 -0700
Subject: [PATCH 1697/2704] feat: add rescript parser and queries (#6671)

---
 README.md                             |   1 +
 lockfile.json                         |   3 +
 lua/nvim-treesitter/parsers.lua       |   8 +
 queries/rescript/folds.scm            |  12 +
 queries/rescript/highlights.scm       | 335 ++++++++++++++++++++++++++
 queries/rescript/indents.scm          |  36 +++
 queries/rescript/injections.scm       |  33 +++
 queries/rescript/locals.scm           |   9 +
 tests/indent/rescript/basic.res       |  23 ++
 tests/indent/rescript/complex.res     | 151 ++++++++++++
 tests/indent/rescript/conditional.res | 104 ++++++++
 tests/indent/rescript_spec.lua        |  33 +++
 12 files changed, 748 insertions(+)
 create mode 100644 queries/rescript/folds.scm
 create mode 100644 queries/rescript/highlights.scm
 create mode 100644 queries/rescript/indents.scm
 create mode 100644 queries/rescript/injections.scm
 create mode 100644 queries/rescript/locals.scm
 create mode 100644 tests/indent/rescript/basic.res
 create mode 100644 tests/indent/rescript/complex.res
 create mode 100644 tests/indent/rescript/conditional.res
 create mode 100644 tests/indent/rescript_spec.lua

diff --git a/README.md b/README.md
index 10114e826..f65e118b4 100644
--- a/README.md
+++ b/README.md
@@ -380,6 +380,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
 - [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
 - [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
+- [x] [rescript](https://github.com/rescript-lang/tree-sitter-rescript) (maintained by @ribru17)
 - [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
 - [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
 - [x] [robots](https://github.com/opa-oz/tree-sitter-robots-txt) (maintained by @opa-oz)
diff --git a/lockfile.json b/lockfile.json
index c99c6d812..6b1123024 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -620,6 +620,9 @@
   "requirements": {
     "revision": "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2"
   },
+  "rescript": {
+    "revision": "444c127686714b2358622427c3bdba7eb09021c6"
+  },
   "rnoweb": {
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1fb398ac2..ad6068d02 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1804,6 +1804,14 @@ list.requirements = {
   readme_name = "pip requirements",
 }
 
+list.rescript = {
+  install_info = {
+    url = "https://github.com/rescript-lang/tree-sitter-rescript",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@ribru17" },
+}
+
 list.rnoweb = {
   install_info = {
     url = "https://github.com/bamonroe/tree-sitter-rnoweb",
diff --git a/queries/rescript/folds.scm b/queries/rescript/folds.scm
new file mode 100644
index 000000000..4e658a57c
--- /dev/null
+++ b/queries/rescript/folds.scm
@@ -0,0 +1,12 @@
+[
+  (block)
+  (function)
+  (module_declaration)
+  (type_declaration)
+  (external_declaration)
+  (call_expression)
+  (switch_expression)
+  (parenthesized_expression)
+  (record)
+  (include_statement)+
+] @fold
diff --git a/queries/rescript/highlights.scm b/queries/rescript/highlights.scm
new file mode 100644
index 000000000..e7cba9be8
--- /dev/null
+++ b/queries/rescript/highlights.scm
@@ -0,0 +1,335 @@
+(comment) @comment @spell
+
+; Identifiers
+;------------
+; Escaped identifiers like \"+."
+((value_identifier) @constant.macro
+  (#lua-match? @constant.macro "^%.*$"))
+
+(value_identifier) @variable
+
+[
+  (type_identifier)
+  (unit_type)
+  (list)
+  (list_pattern)
+] @type
+
+((type_identifier) @type.builtin
+  (#any-of? @type.builtin "int" "char" "string" "float" "bool" "unit"))
+
+[
+  (variant_identifier)
+  (polyvar_identifier)
+] @constructor
+
+(record_type_field
+  (property_identifier) @property)
+
+(record_field
+  (property_identifier) @property)
+
+(object
+  (field
+    (property_identifier) @property))
+
+(object_type
+  (field
+    (property_identifier) @property))
+
+(module_identifier) @module
+
+(member_expression
+  (property_identifier) @variable.member)
+
+(value_identifier_path
+  (module_identifier)
+  (value_identifier) @variable)
+
+(record_pattern
+  (value_identifier_path
+    (value_identifier) @variable.member))
+
+(record_pattern
+  (value_identifier) @variable)
+
+(labeled_argument
+  label: (value_identifier) @variable.parameter)
+
+; Parameters
+;----------------
+(list_pattern
+  (value_identifier) @variable.parameter)
+
+(spread_pattern
+  (value_identifier) @variable.parameter)
+
+; String literals
+;----------------
+[
+  (string)
+  (template_string)
+] @string
+
+(character) @character
+
+(escape_sequence) @string.escape
+
+; Other literals
+;---------------
+[
+  (true)
+  (false)
+] @boolean
+
+(number) @number
+
+(polyvar) @constructor
+
+(polyvar_string) @constructor
+
+; Functions
+;----------
+; parameter(s) in parens
+(parameter
+  (value_identifier) @variable.parameter)
+
+(labeled_parameter
+  (value_identifier) @variable.parameter)
+
+; single parameter with no parens
+(function
+  parameter: (value_identifier) @variable.parameter)
+
+(parameter
+  (tuple_pattern
+    (tuple_item_pattern
+      (value_identifier) @variable.parameter)))
+
+(parameter
+  (array_pattern
+    (value_identifier) @variable.parameter))
+
+(parameter
+  (record_pattern
+    (value_identifier) @variable.parameter))
+
+; function identifier in let binding
+(let_binding
+  pattern: (value_identifier) @function
+  body: (function))
+
+; function calls
+(call_expression
+  function: (value_identifier_path
+    (value_identifier) @function.method.call .))
+
+(call_expression
+  function: (value_identifier) @function.call)
+
+; highlight the right-hand side of a pipe operator as a function call
+(pipe_expression
+  (value_identifier) @function.call .)
+
+(pipe_expression
+  (value_identifier_path
+    (value_identifier) @function.method.call .) .)
+
+; Meta
+;-----
+(decorator_identifier) @attribute
+
+(extension_identifier) @keyword
+
+"%" @keyword
+
+; Misc
+;-----
+(polyvar_type_pattern
+  "#" @constructor)
+
+[
+  "include"
+  "open"
+] @keyword.import
+
+[
+  "private"
+  "mutable"
+  "rec"
+] @keyword.modifier
+
+"type" @keyword.type
+
+[
+  "and"
+  "with"
+  "as"
+] @keyword.operator
+
+[
+  "export"
+  "external"
+  "let"
+  "module"
+  "assert"
+  "await"
+  "lazy"
+  "constraint"
+] @keyword
+
+"await" @keyword.coroutine
+
+(function
+  "async" @keyword.coroutine)
+
+(module_unpack
+  "unpack" @keyword)
+
+[
+  "if"
+  "else"
+  "switch"
+  "when"
+] @keyword.conditional
+
+[
+  "exception"
+  "try"
+  "catch"
+] @keyword.exception
+
+(call_expression
+  function: (value_identifier) @keyword.exception
+  (#eq? @keyword.exception "raise"))
+
+[
+  "for"
+  "in"
+  "to"
+  "downto"
+  "while"
+] @keyword.repeat
+
+[
+  "."
+  ","
+  "|"
+  ":"
+] @punctuation.delimiter
+
+[
+  "++"
+  "+"
+  "+."
+  "-"
+  "-."
+  "*"
+  "**"
+  "*."
+  "/."
+  "<="
+  "=="
+  "==="
+  "!"
+  "!="
+  "!=="
+  ">="
+  "&&"
+  "||"
+  "="
+  ":="
+  "->"
+  "|>"
+  ":>"
+  "+="
+  "=>"
+  (uncurry)
+] @operator
+
+; Explicitly enclose these operators with binary_expression
+; to avoid confusion with JSX tag delimiters
+(binary_expression
+  [
+    "<"
+    ">"
+    "/"
+  ] @operator)
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+  "<"
+  ">"
+] @punctuation.bracket
+
+(unit
+  [
+    "("
+    ")"
+  ] @constant.builtin)
+
+(template_substitution
+  "${" @punctuation.special
+  "}" @punctuation.special) @none
+
+(polyvar_type
+  [
+    "["
+    "[>"
+    "[<"
+    "]"
+  ] @punctuation.bracket)
+
+[
+  "~"
+  "?"
+  ".."
+  "..."
+] @punctuation.special
+
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+; JSX
+;----------
+(jsx_identifier) @tag
+
+(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)
diff --git a/queries/rescript/indents.scm b/queries/rescript/indents.scm
new file mode 100644
index 000000000..0b635dd4d
--- /dev/null
+++ b/queries/rescript/indents.scm
@@ -0,0 +1,36 @@
+[
+  (block)
+  (record_type)
+  (record)
+  (parenthesized_expression)
+  (call_expression)
+  (function_type_parameters)
+  (function)
+  (switch_match)
+  (let_declaration)
+  (jsx_element)
+  (jsx_fragment)
+  (jsx_self_closing_element)
+  (object_type)
+] @indent.begin
+
+[
+  "}"
+  ")"
+  (jsx_closing_element)
+] @indent.branch @indent.end
+
+(jsx_self_closing_element
+  "/" @indent.branch
+  ">"? @indent.end)
+
+; </> is captured as 3 different anonymous nodes
+(jsx_fragment
+  "<"
+  "<" @indent.branch)
+
+(jsx_fragment
+  ">"
+  ">" @indent.end)
+
+(comment) @indent.auto
diff --git a/queries/rescript/injections.scm b/queries/rescript/injections.scm
new file mode 100644
index 000000000..434404bef
--- /dev/null
+++ b/queries/rescript/injections.scm
@@ -0,0 +1,33 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+(extension_expression
+  (extension_identifier) @_name
+  (#eq? @_name "re")
+  (expression_statement
+    (_) @injection.content
+    (#set! injection.language "regex")))
+
+(extension_expression
+  (extension_identifier) @_name
+  (#eq? @_name "raw")
+  (expression_statement
+    (_
+      (_) @injection.content
+      (#set! injection.language "javascript"))))
+
+(extension_expression
+  (extension_identifier) @_name
+  (#eq? @_name "graphql")
+  (expression_statement
+    (_
+      (_) @injection.content
+      (#set! injection.language "graphql"))))
+
+(extension_expression
+  (extension_identifier) @_name
+  (#eq? @_name "relay")
+  (expression_statement
+    (_
+      (_) @injection.content
+      (#set! injection.language "graphql"))))
diff --git a/queries/rescript/locals.scm b/queries/rescript/locals.scm
new file mode 100644
index 000000000..10a663bd7
--- /dev/null
+++ b/queries/rescript/locals.scm
@@ -0,0 +1,9 @@
+(switch_expression) @local.scope
+
+; Definitions
+;------------
+(type_declaration) @local.definition.type
+
+(let_binding) @local.definition.var
+
+(module_declaration) @local.definition.namespace
diff --git a/tests/indent/rescript/basic.res b/tests/indent/rescript/basic.res
new file mode 100644
index 000000000..c5138a7b3
--- /dev/null
+++ b/tests/indent/rescript/basic.res
@@ -0,0 +1,23 @@
+@genType
+type person = {
+  name: string,
+  age: int,
+}
+
+@genType
+type renderMe<'a> = React.component<{
+  "randomString": string,
+  "poly": 'a,
+}>
+
+@genType.import("./hookExample") @react.component
+external make: (
+  ~person: person,
+  ~children: React.element,
+  ~renderMe: renderMe<'a>,
+) => React.element = "makeRenamed"
+
+@genType.import("./hookExample")
+external foo: (~person: person) => string = "foo"
+
+let hi = 'a'
diff --git a/tests/indent/rescript/complex.res b/tests/indent/rescript/complex.res
new file mode 100644
index 000000000..1f21c3364
--- /dev/null
+++ b/tests/indent/rescript/complex.res
@@ -0,0 +1,151 @@
+let hit = ({hit, children}: DocSearch.hitComponent) => {
+  let toTitle = str =>
+    str->Js.String2.charAt(0)->Js.String2.toUpperCase ++ Js.String2.sliceToEnd(str, ~from=1)
+
+  let description = switch hit.url
+    ->Js.String2.split("/")
+    ->Js.Array2.sliceFrom(1)
+    ->Belt.List.fromArray {
+    | list{"blog" as r | "community" as r, ..._} => r->toTitle
+    | list{"docs", doc, version, ...rest} =>
+      let path = rest->Belt.List.toArray
+
+      let info =
+        path
+        ->Js.Array2.slice(~start=0, ~end_=Js.Array2.length(path) - 1)
+        ->Js.Array2.map(path =>
+          switch path {
+          | "api" => "API"
+          | other => toTitle(other)
+        }
+        )
+
+      [doc->toTitle, version->toTitle]->Js.Array2.concat(info)->Js.Array2.joinWith(" / ")
+    | _ => ""
+  }
+
+  <Next.Link href={hit.url} className="flex flex-col w-full">
+    <span className="text-gray-60 captions px-4 pt-3 pb-1 block">
+      {description->React.string}
+    </span>
+    children
+  </Next.Link>
+}
+
+let transformItems = (items: DocSearch.transformItems) => {
+  items->Belt.Array.keepMap(item => {
+    let url = try Webapi.URL.make(item.url)->Some catch {
+      | Js.Exn.Error(obj) =>
+        Js.Console.error2(`Failed to parse URL ${item.url}`, obj)
+        None
+    }
+    switch url {
+    | Some({pathname, hash}) => {...item, url: pathname ++ hash}->Some
+    | None => None
+  }
+  })
+}
+
+@react.component
+let make = () => {
+  let (state, setState) = React.useState(_ => Inactive)
+  let router = Next.Router.useRouter()
+
+  let version = switch Url.parse(router.route).version {
+    | Version(v) => v
+    | _ => "latest"
+  }
+
+  let handleCloseModal = () => {
+    let () = switch ReactDOM.querySelector(".DocSearch-Modal") {
+      | Some(modal) =>
+        switch ReactDOM.querySelector("body") {
+        | Some(body) =>
+          open Webapi
+          body->Element.classList->ClassList.remove("DocSearch--active")
+          modal->Element.addEventListener("transitionend", () => {
+            setState(_ => Inactive)
+          })
+        | None => setState(_ => Inactive)
+      }
+      | None => ()
+    }
+  }
+
+  React.useEffect(() => {
+    let isEditableTag = el =>
+      switch el->tagName {
+      | "TEXTAREA" | "SELECT" | "INPUT" => true
+      | _ => false
+    }
+
+    let focusSearch = e => {
+      switch activeElement {
+      | Some(el) if el->isEditableTag || el->isContentEditable => ()
+      | _ =>
+        setState(_ => Active)
+        e->keyboardEventPreventDefault
+    }
+    }
+
+    let handleGlobalKeyDown = e => {
+      switch e.key {
+      | "/" => focusSearch(e)
+      | "k" if e.ctrlKey || e.metaKey => focusSearch(e)
+      | "Escape" => handleCloseModal()
+      | _ => ()
+    }
+    }
+    addKeyboardEventListener("keydown", handleGlobalKeyDown)
+    Some(() => removeKeyboardEventListener("keydown", handleGlobalKeyDown))
+  }, [setState])
+
+  let onClick = _ => {
+    setState(_ => Active)
+  }
+
+  let onClose = React.useCallback(() => {
+    handleCloseModal()
+  }, [setState])
+
+  <>
+    <button onClick type_="button" className="text-gray-60 hover:text-fire-50 p-2">
+      <Icon.MagnifierGlass className="fill-current" />
+    </button>
+    {switch state {
+      | Active =>
+        switch ReactDOM.querySelector("body") {
+        | Some(element) =>
+          ReactDOM.createPortal(
+            <DocSearch
+              apiKey
+              appId
+              indexName
+              onClose
+              searchParameters={facetFilters: ["version:" ++ version]}
+              initialScrollY={window->scrollY}
+              transformItems={transformItems}
+              hitComponent=hit
+            />
+            element,
+          )
+        | None => React.null
+      }
+      | Inactive => React.null
+    }}
+  </>
+}
+
+let comparable = (type key, ~cmp) => {
+  module N = MakeComparable({
+    type t = key
+    let cmp = cmp
+  })
+  module(N: Comparable with type t = key)
+}
+
+<Next.Link href={hit.url} className="flex flex-col w-full">
+<span className="text-gray-60 captions px-4 pt-3 pb-1 block">
+  {description->React.string}
+  children
+</Next.Link>
diff --git a/tests/indent/rescript/conditional.res b/tests/indent/rescript/conditional.res
new file mode 100644
index 000000000..db8328f26
--- /dev/null
+++ b/tests/indent/rescript/conditional.res
@@ -0,0 +1,104 @@
+include UseClient
+include UseQuery
+include UseMutation
+include UseSubscription
+
+type hookResponse<'ret> = Types.Hooks.hookResponse<'ret> = {
+  operation: Types.operation,
+  fetching: bool,
+  data: option<'ret>,
+  error: option<CombinedError.t>,
+  response: Types.Hooks.response<'ret>,
+  extensions: option<Js.Json.t>,
+  stale: bool,
+}
+
+Js.Array2.slice(~start=0, ~end_=Js.Array2.length(moduleRoute) - 1)
+
+let pathModule = Path.join([dir, version, `${moduleName}.json`])
+
+let {Api.LocMsg.row: row, column, shortMsg} = locMsg
+
+let message = `${"error"->red}: failed to compile examples from ${kind} ${test.id->cyan}\n${errorMessage}`
+
+let version = (evt->ReactEvent.Form.target)["value"]
+
+let rehypePlugins =
+  [Rehype.WithOptions([Plugin(Rehype.slug), SlugOption({prefix: slugPrefix ++ "-"})])]->Some
+
+module Item = {
+  type t = {
+    name: string,
+    sellIn: int,
+    quality: int,
+  }
+
+  let make = (~name, ~sellIn, ~quality): t => {
+    name,
+    sellIn,
+    quality,
+  }
+}
+
+let updateQuality = (items: array<Item.t>) => {
+  items->Js.Array2.map(item => {
+    let newItem = ref(item)
+
+    call(
+      asdf,
+      asdf
+    )
+
+    if (
+      newItem.contents.name != "Aged Brie" && 5 > 2 &&
+      newItem.contents.name != "Backstage passes to a TAFKAL80ETC concert"
+    ) {
+      if newItem.contents.quality > 0 {
+        if newItem.contents.name != "Sulfuras, Hand of Ragnaros" {
+          newItem := {...newItem.contents, quality: newItem.contents.quality - 1}
+        }
+      }
+    } else if newItem.contents.quality < 50 {
+      newItem := {...newItem.contents, quality: newItem.contents.quality + 1}
+
+      if newItem.contents.name == "Backstage passes to a TAFKAL80ETC concert" {
+        if newItem.contents.sellIn < 11 {
+          if newItem.contents.quality < 50 {
+            newItem := {...newItem.contents, quality: newItem.contents.quality + 1}
+          }
+        }
+
+        if newItem.contents.sellIn < 6 {
+          if newItem.contents.quality < 50 {
+            newItem := {...newItem.contents, quality: newItem.contents.quality + 1}
+          }
+        }
+      }
+    }
+
+    if newItem.contents.name != "Sulfuras, Hand of Ragnaros" {
+      newItem := {...newItem.contents, sellIn: newItem.contents.sellIn - 1}
+    }
+
+    if newItem.contents.sellIn < 0 {
+      if newItem.contents.name != "Aged Brie" {
+        if newItem.contents.name != "Backstage passes to a TAFKAL80ETC concert" {
+          if newItem.contents.quality > 0 {
+            if newItem.contents.name != "Sulfuras, Hand of Ragnaros" {
+              newItem := {...newItem.contents, quality: newItem.contents.quality - 1}
+            }
+          }
+        } else {
+          newItem := {
+            ...newItem.contents,
+            quality: newItem.contents.quality - newItem.contents.quality,
+          }
+        }
+      } else if newItem.contents.quality < 50 {
+        newItem := {...newItem.contents, quality: newItem.contents.quality + 1}
+      }
+    }
+
+    newItem.contents
+  })
+}
diff --git a/tests/indent/rescript_spec.lua b/tests/indent/rescript_spec.lua
new file mode 100644
index 000000000..5b1f06abd
--- /dev/null
+++ b/tests/indent/rescript_spec.lua
@@ -0,0 +1,33 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/rescript", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe("indent ReScript:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {})
+  end)
+
+  describe("new line:", function()
+    run:new_line("basic.res", { on_line = 5, text = "x", indent = 0 })
+    run:new_line("basic.res", { on_line = 9, text = '"another": here,', indent = 2 })
+    run:new_line("basic.res", { on_line = 10, text = "}", indent = 0 })
+    run:new_line("basic.res", { on_line = 14, text = "~test: test,", indent = 2 })
+    run:new_line("basic.res", { on_line = 18, text = "x", indent = 0 })
+
+    run:new_line("complex.res", { on_line = 3, text = "x", indent = 2 })
+    run:new_line("complex.res", { on_line = 5, text = "x", indent = 4 })
+    run:new_line("complex.res", { on_line = 17, text = "|", indent = 10 })
+    run:new_line("complex.res", { on_line = 25, text = "x", indent = 2 })
+    run:new_line("complex.res", { on_line = 60, text = "x", indent = 6 })
+    run:new_line("complex.res", { on_line = 120, text = "x", indent = 14 })
+    run:new_line("complex.res", { on_line = 136, text = "x", indent = 2 })
+
+    run:new_line("conditional.res", { on_line = 6, text = "test: bool,", indent = 2 })
+    run:new_line("conditional.res", { on_line = 95, text = "x", indent = 10 })
+  end)
+end)

From ed871c970a35b1c0918239afed0fe3c7cfed89e5 Mon Sep 17 00:00:00 2001
From: Richard Macklin <1863540+rmacklin@users.noreply.github.com>
Date: Sun, 28 Jul 2024 02:15:13 -0700
Subject: [PATCH 1698/2704] docs(install): fix typo

---
 lua/nvim-treesitter/shell_command_selectors.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index f95c84ae8..a386226e3 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -292,7 +292,7 @@ function M.select_download_commands(repo, project_name, cache_folder, revision,
     -- Running `git clone` or `git checkout` while running under Git (such as
     -- editing a `git commit` message) will likely fail to install parsers
     -- (such as 'gitcommit') and can also corrupt the index file of the current
-    -- Git repository. Check for typical git environemnt variables and abort if found.
+    -- Git repository. Check for typical git environment variables and abort if found.
     for _, k in pairs {
       "GIT_ALTERNATE_OBJECT_DIRECTORIES",
       "GIT_CEILING_DIRECTORIES",

From 88aa09e6e96718012879b05a626cad09723fa159 Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Sat, 27 Jul 2024 23:18:55 +0200
Subject: [PATCH 1699/2704] feat(latex): capture left/right math delimiters

Capture math delimiters provided by commands such as
`\left` and `\right`.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 956c753f7..9b36634e6 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -36,6 +36,12 @@
 
 (delimiter) @punctuation.delimiter
 
+(math_delimiter
+  left_command: _ @punctuation.delimiter
+  left_delimiter: _ @punctuation.delimiter
+  right_command: _ @punctuation.delimiter
+  right_delimiter: _ @punctuation.delimiter)
+
 [
   "["
   "]"

From 51bba660a89e0027929206b622c9c1cbdd995cfb Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 27 Jul 2024 16:28:19 -0700
Subject: [PATCH 1700/2704] refactor(queries): Remove quotes from properties in
 set! directive

---
 CONTRIBUTING.md                        |  4 ++--
 queries/c/highlights.scm               |  2 +-
 queries/clojure/highlights.scm         |  2 +-
 queries/d/locals.scm                   |  2 +-
 queries/djot/highlights.scm            |  8 ++++----
 queries/dockerfile/highlights.scm      |  2 +-
 queries/doxygen/highlights.scm         |  2 +-
 queries/dtd/highlights.scm             |  2 +-
 queries/erlang/highlights.scm          | 10 +++++-----
 queries/firrtl/highlights.scm          |  2 +-
 queries/gdscript/locals.scm            |  6 +++---
 queries/hare/highlights.scm            |  6 +++---
 queries/html_tags/highlights.scm       |  4 ++--
 queries/jsonnet/locals.scm             |  2 +-
 queries/just/highlights.scm            |  2 +-
 queries/kdl/highlights.scm             |  6 +++---
 queries/kotlin/locals.scm              |  8 ++++----
 queries/leo/highlights.scm             |  2 +-
 queries/luadoc/highlights.scm          |  2 +-
 queries/markdown/highlights.scm        |  6 +++---
 queries/markdown_inline/highlights.scm |  6 +++---
 queries/nim/highlights.scm             |  4 ++--
 queries/nim/locals.scm                 | 14 +++++++-------
 queries/ocaml/highlights.scm           |  2 +-
 queries/odin/highlights.scm            |  2 +-
 queries/perl/highlights.scm            |  2 +-
 queries/pod/highlights.scm             |  2 +-
 queries/pony/highlights.scm            |  2 +-
 queries/python/highlights.scm          |  2 +-
 queries/racket/highlights.scm          |  6 +++---
 queries/scheme/highlights.scm          |  2 +-
 queries/smithy/highlights.scm          |  2 +-
 queries/sparql/locals.scm              |  4 ++--
 queries/squirrel/highlights.scm        |  2 +-
 queries/starlark/highlights.scm        |  2 +-
 queries/supercollider/locals.scm       |  6 +++---
 queries/tablegen/highlights.scm        |  2 +-
 queries/tcl/indents.scm                |  4 ++--
 queries/thrift/highlights.scm          |  2 +-
 queries/tiger/locals.scm               |  8 ++++----
 queries/tlaplus/locals.scm             |  8 ++++----
 queries/udev/highlights.scm            | 18 +++++++++---------
 queries/vimdoc/highlights.scm          |  4 ++--
 queries/xml/highlights.scm             |  2 +-
 queries/yaml/highlights.scm            |  2 +-
 45 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 449cddcbd..23321f0f7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -287,7 +287,7 @@ A conceal can be restricted to part of the capture via the [`#offset!` directive
 #### Priority
 
 Captures can be assigned a priority to control precedence of highlights via the
-`#set! "priority" <number>` directive (see `:h treesitter-highlight-priority`).
+`#set! priority <number>` directive (see `:h treesitter-highlight-priority`).
 The default priority for treesitter highlights is `100`; queries should only
 set priorities between `90` and `120`, to avoid conflict with other sources of
 highlighting (such as diagnostics or LSP semantic tokens).
@@ -336,7 +336,7 @@ doSomething(); // Should point to the declaration as the definition
 ```query
 (function_declaration
   ((identifier) @local.definition.var)
-   (#set! "definition.var.scope" "parent"))
+   (#set! definition.var.scope "parent"))
 ```
 
 Possible scope values are:
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 170937c8f..eba272d5c 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -1,6 +1,6 @@
 ; Lower priority to prefer @variable.parameter when identifier appears in parameter_declaration.
 ((identifier) @variable
-  (#set! "priority" 95))
+  (#set! priority 95))
 
 (preproc_def
   (preproc_arg) @variable)
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
index 62e59ae58..264276634 100644
--- a/queries/clojure/highlights.scm
+++ b/queries/clojure/highlights.scm
@@ -11,7 +11,7 @@
 ; have multiple highlight groups applied to them.
 ; >> Literals
 ((dis_expr) @comment
-  (#set! "priority" 105)
+  (#set! priority 105)
   ; Higher priority to mark the whole sexpr as a comment
   )
 
diff --git a/queries/d/locals.scm b/queries/d/locals.scm
index 1d7d617d8..2cd7b9e89 100644
--- a/queries/d/locals.scm
+++ b/queries/d/locals.scm
@@ -12,7 +12,7 @@
 (module_def
   (module_declaration
     (module_fqn) @local.definition.namespace)
-  (#set! "definition.namespace.scope" "global"))
+  (#set! definition.namespace.scope "global"))
 
 (enum_declaration
   (enum_member
diff --git a/queries/djot/highlights.scm b/queries/djot/highlights.scm
index e788891e0..8df7c9269 100644
--- a/queries/djot/highlights.scm
+++ b/queries/djot/highlights.scm
@@ -22,7 +22,7 @@
   (raw_block)
   (frontmatter)
 ] @markup.raw.block
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 ; Remove @markup.raw for code with a language spec
 (code_block
@@ -30,7 +30,7 @@
   (code_block_marker_begin)
   (language)
   (code) @none
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 [
   (code_block_marker_begin)
@@ -204,12 +204,12 @@
   (#set! conceal ""))
 
 ((math) @markup.math
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 (verbatim) @markup.raw
 
 ((raw_inline) @markup.raw
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 (comment
   "%" @comment
diff --git a/queries/dockerfile/highlights.scm b/queries/dockerfile/highlights.scm
index 5a8f0c7cc..72893f8b0 100644
--- a/queries/dockerfile/highlights.scm
+++ b/queries/dockerfile/highlights.scm
@@ -43,7 +43,7 @@
 
 ((heredoc_block
   (heredoc_line) @string)
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 (expansion
   [
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
index da39bdd83..454500d64 100644
--- a/queries/doxygen/highlights.scm
+++ b/queries/doxygen/highlights.scm
@@ -1,5 +1,5 @@
 ((tag_name) @keyword
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 [
   "@code"
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index 7bc7a7ed1..e573ca387 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -69,7 +69,7 @@
   (ExternalID
     (SystemLiteral
       (URI) @string.special.url))
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 ; Attlist declaration
 (AttlistDecl
diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
index 1ce046689..8bba348d9 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -1,5 +1,5 @@
 ((atom) @constant
-  (#set! "priority" "90"))
+  (#set! priority "90"))
 
 (var) @variable
 
@@ -86,15 +86,15 @@
 
 ; Macros
 ((macro_call_expr) @constant.macro
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 ; Preprocessor
 (pp_define
   lhs: _ @constant.macro
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 (_preprocessor_directive) @keyword.directive
-(#set! "priority" 99)
+(#set! priority 99)
 
 ; Attributes
 (pp_include) @keyword.import
@@ -108,7 +108,7 @@
 (export_type_attribute
   types: (fa
     fun: _ @type
-    (#set! "priority" 101)))
+    (#set! priority 101)))
 
 (behaviour_attribute) @keyword.import
 
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index b2cfd08a6..0a90fa55b 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -90,7 +90,7 @@
 ] @variable.member
 
 ((field_id) @variable.member
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 (port
   (identifier) @variable.member)
diff --git a/queries/gdscript/locals.scm b/queries/gdscript/locals.scm
index 796ec1876..62166e6f0 100644
--- a/queries/gdscript/locals.scm
+++ b/queries/gdscript/locals.scm
@@ -48,7 +48,7 @@
 ; Function Definition
 ((function_definition
   (name) @local.definition.function)
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 ; Lambda
 ; lambda names are not accessible and are only for debugging.
@@ -74,7 +74,7 @@
 ; Class
 ((class_definition
   (name) @local.definition.type)
-  (#set! "definition.type.scope" "parent"))
+  (#set! definition.type.scope "parent"))
 
 (class_definition
   (body
@@ -102,7 +102,7 @@
   (body
     (function_definition
       (name) @local.definition.method)))
-  (#set! "definition.method.scope" "parent"))
+  (#set! definition.method.scope "parent"))
 
 ; Enum
 (enum_definition
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index 68a3e1881..deaecd283 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -39,7 +39,7 @@
 
 ((scoped_type_identifier
   path: (_) @module)
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 ; Keywords
 [
@@ -93,7 +93,7 @@
 
 ; Labels
 ((label) @label
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 ; Functions
 (function_declaration
@@ -144,7 +144,7 @@
 ((member_expression
   "."
   (_) @variable.member)
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 (field
   .
diff --git a/queries/html_tags/highlights.scm b/queries/html_tags/highlights.scm
index c6abe111b..9eaf813be 100644
--- a/queries/html_tags/highlights.scm
+++ b/queries/html_tags/highlights.scm
@@ -7,7 +7,7 @@
 
 ((attribute
   (quoted_attribute_value) @string)
-  (#set! "priority" 99))
+  (#set! priority 99))
 
 (text) @none @spell
 
@@ -94,7 +94,7 @@
   (quoted_attribute_value
     (attribute_value) @string.special.url))
   (#any-of? @_attr "href" "src")
-  (#set! @string.special.url "url" @string.special.url))
+  (#set! @string.special.url url @string.special.url))
 
 [
   "<"
diff --git a/queries/jsonnet/locals.scm b/queries/jsonnet/locals.scm
index aa3a16c75..778077764 100644
--- a/queries/jsonnet/locals.scm
+++ b/queries/jsonnet/locals.scm
@@ -11,7 +11,7 @@
 (field
   function: (fieldname
     (id) @local.definition.function)
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 (bind
   (id) @local.definition.var)
diff --git a/queries/just/highlights.scm b/queries/just/highlights.scm
index ae054c12b..b15a8574a 100644
--- a/queries/just/highlights.scm
+++ b/queries/just/highlights.scm
@@ -101,7 +101,7 @@
 ; Fallback highlighting for recipe bodies
 (recipe
   (recipe_body) @string
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 ; Ref: https://just.systems/man/en/chapter_26.html
 ;(setting (identifier) @error)
diff --git a/queries/kdl/highlights.scm b/queries/kdl/highlights.scm
index d15845e13..e61361f96 100644
--- a/queries/kdl/highlights.scm
+++ b/queries/kdl/highlights.scm
@@ -58,13 +58,13 @@
 
 (node
   (node_comment)
-  (#set! "priority" 105)) @comment
+  (#set! priority 105)) @comment
 
 (node
   (node_field
     (node_field_comment)
-    (#set! "priority" 105)) @comment)
+    (#set! priority 105)) @comment)
 
 (node_children
   (node_children_comment)
-  (#set! "priority" 105)) @comment
+  (#set! priority 105)) @comment
diff --git a/queries/kotlin/locals.scm b/queries/kotlin/locals.scm
index 93edf99f1..330803f1b 100644
--- a/queries/kotlin/locals.scm
+++ b/queries/kotlin/locals.scm
@@ -13,13 +13,13 @@
 (function_declaration
   .
   (simple_identifier) @local.definition.function
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 (class_body
   (function_declaration
     .
     (simple_identifier) @local.definition.method)
-  (#set! "definition.method.scope" "parent"))
+  (#set! definition.method.scope "parent"))
 
 ; Variables
 (function_declaration
@@ -52,11 +52,11 @@
 ; Types
 (class_declaration
   (type_identifier) @local.definition.type
-  (#set! "definition.type.scope" "parent"))
+  (#set! definition.type.scope "parent"))
 
 (type_alias
   (type_identifier) @local.definition.type
-  (#set! "definition.type.scope" "parent"))
+  (#set! definition.type.scope "parent"))
 
 ; Scopes
 [
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 88e98850e..67a398d6c 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -181,7 +181,7 @@
   (address_literal)
   (signature_literal)
   ((affine_group_literal)
-    (#set! "priority" 101))
+    (#set! priority 101))
   (field_literal)
   (product_group_literal)
   (scalar_literal)
diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm
index b1b04da2d..1649e5d9b 100644
--- a/queries/luadoc/highlights.scm
+++ b/queries/luadoc/highlights.scm
@@ -121,7 +121,7 @@
     "["
     "]"
   ] @type)
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 (type) @type
 
diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index a9ce4df20..a12669ca2 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -45,7 +45,7 @@
 (indented_code_block) @markup.raw.block
 
 ((fenced_code_block) @markup.raw.block
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 (fenced_code_block
   (fenced_code_block_delimiter) @markup.raw.block
@@ -103,13 +103,13 @@
 (task_list_marker_checked) @markup.list.checked
 
 ((block_quote) @markup.quote
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 ([
   (plus_metadata)
   (minus_metadata)
 ] @keyword.directive
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 [
   (block_continuation)
diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index ac99cce5f..bfbcf1c62 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -43,7 +43,7 @@
 (inline_link
   (link_text) @_label
   (link_destination) @_url
-  (#set! @_label "url" @_url))
+  (#set! @_label url @_url))
 
 ; Conceal image links
 (image
@@ -89,11 +89,11 @@
 ] @markup.link.url @nospell
 
 ((link_destination) @_url
-  (#set! @_url "url" @_url))
+  (#set! @_url url @_url))
 
 ((uri_autolink) @_url
   (#offset! @_url 0 1 0 -1)
-  (#set! @_url "url" @_url))
+  (#set! @_url url @_url))
 
 (entity_reference) @nospell
 
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index df42c0f7f..722c0abdf 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -4,7 +4,7 @@
 ; =============================================================================
 ; catch all rules
 ((identifier) @variable
-  (#set! "priority" 99))
+  (#set! priority 99))
 
 ; NOTE: we need priority, since (identifier) is most specific and we have to
 ; capture nodes containing (identifier) as a whole, while overruling the
@@ -12,7 +12,7 @@
 (type_expression) @type
 
 ; NOTE: has to be after
-; ((identifier) @variable (#set! "priority" 99))
+; ((identifier) @variable (#set! priority 99))
 ; overrule identifiers in pragmas in (proc_type)s and (pragma_expression)s
 (proc_type
   pragmas: (pragma_list) @variable)
diff --git a/queries/nim/locals.scm b/queries/nim/locals.scm
index 95279e2ea..d79fe728e 100644
--- a/queries/nim/locals.scm
+++ b/queries/nim/locals.scm
@@ -33,7 +33,7 @@
     (exported_symbol
       (accent_quoted) @local.definition.function)
   ]
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 (func_declaration
   name: [
@@ -44,7 +44,7 @@
     (exported_symbol
       (accent_quoted) @local.definition.function)
   ]
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 (iterator_declaration
   name: [
@@ -55,7 +55,7 @@
     (exported_symbol
       (accent_quoted) @local.definition.function)
   ]
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 (converter_declaration
   name: [
@@ -66,7 +66,7 @@
     (exported_symbol
       (accent_quoted) @local.definition.function)
   ]
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 ; ==============================================================================
 ; @local.definition.method     ; methods
@@ -79,7 +79,7 @@
     (exported_symbol
       (accent_quoted) @local.definition.method)
   ]
-  (#set! "definition.method.scope" "parent"))
+  (#set! definition.method.scope "parent"))
 
 ; ==============================================================================
 ; @local.definition.var        ; variables
@@ -193,7 +193,7 @@
     (exported_symbol
       (accent_quoted) @local.definition.macro)
   ]
-  (#set! "definition.macro.scope" "parent"))
+  (#set! definition.macro.scope "parent"))
 
 (macro_declaration
   name: [
@@ -204,7 +204,7 @@
     (exported_symbol
       (accent_quoted) @local.definition.macro)
   ]
-  (#set! "definition.macro.scope" "parent"))
+  (#set! definition.macro.scope "parent"))
 
 ; ==============================================================================
 ; @local.definition.type       ; types or classes
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 10c0eb956..6c7851378 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -89,7 +89,7 @@
 ;----------
 ; Don't let normal parens take priority over this
 ((unit) @constant.builtin
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 (boolean) @boolean
 
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index ea8d401e2..b7e2176a8 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -64,7 +64,7 @@
     "else"
     "when"
   ] @keyword.conditional.ternary)
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 ; Repeats
 [
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 04d8d78a4..619923a9b 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -270,4 +270,4 @@
   ")"
 ] @punctuation.bracket
   ; priority hack so nvim + ts-cli behave the same
-  (#set! "priority" 90))
+  (#set! priority 90))
diff --git a/queries/pod/highlights.scm b/queries/pod/highlights.scm
index 6e4779c85..8252ac1ba 100644
--- a/queries/pod/highlights.scm
+++ b/queries/pod/highlights.scm
@@ -8,7 +8,7 @@
 ((command_paragraph
   (command) @keyword
   (content) @string)
-  (#set! "priority" 99))
+  (#set! priority 99))
 
 (command_paragraph
   (command) @keyword
diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm
index aa65866df..f3d4b5dca 100644
--- a/queries/pony/highlights.scm
+++ b/queries/pony/highlights.scm
@@ -133,7 +133,7 @@
 
 ((ffi_method
   (string) @string.special)
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 (call_expression
   callee: [
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index b4fa1fc46..71356264c 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -59,7 +59,7 @@
 ; Decorators
 ((decorator
   "@" @attribute)
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 (decorator
   (identifier) @attribute)
diff --git a/queries/racket/highlights.scm b/queries/racket/highlights.scm
index 30e4cb4c8..9e3066743 100644
--- a/queries/racket/highlights.scm
+++ b/queries/racket/highlights.scm
@@ -674,12 +674,12 @@
   .
   (symbol) @keyword.import
   (#eq? @keyword.import "require")
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 (quote
   .
   (symbol)
-  (#set! "priority" 105)) @string.special.symbol
+  (#set! priority 105)) @string.special.symbol
 
 ((sexp_comment) @comment
-  (#set! "priority" 110))
+  (#set! priority 110))
diff --git a/queries/scheme/highlights.scm b/queries/scheme/highlights.scm
index ed69a7822..3d41e4951 100644
--- a/queries/scheme/highlights.scm
+++ b/queries/scheme/highlights.scm
@@ -20,7 +20,7 @@
   (comment)
   (directive)
 ] @comment
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 (escape_sequence) @string.escape
 
diff --git a/queries/smithy/highlights.scm b/queries/smithy/highlights.scm
index 24389281a..14e1f20fd 100644
--- a/queries/smithy/highlights.scm
+++ b/queries/smithy/highlights.scm
@@ -51,7 +51,7 @@
 
 (trait_statement
   (shape_id
-    (#set! "priority" 105)) @attribute)
+    (#set! priority 105)) @attribute)
 
 ; Operators
 [
diff --git a/queries/sparql/locals.scm b/queries/sparql/locals.scm
index accf0d1d6..cbb2bb252 100644
--- a/queries/sparql/locals.scm
+++ b/queries/sparql/locals.scm
@@ -4,11 +4,11 @@
 ((sub_select
   (select_clause
     (var) @local.definition.var))
-  (#set! "definition.var.scope" "parent"))
+  (#set! definition.var.scope "parent"))
 
 ((select_query
   (select_clause
     (var) @local.definition.var))
-  (#set! "definition.var.scope" "parent"))
+  (#set! definition.var.scope "parent"))
 
 (var) @local.reference
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index 351cb5d25..03acacadc 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -104,7 +104,7 @@
     "="
     ":"
   ])
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 ; Types
 ((identifier) @type
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 78c129949..7d37b03b6 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -40,7 +40,7 @@
 ; Decorators
 ((decorator
   "@" @attribute)
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 (decorator
   (identifier) @attribute)
diff --git a/queries/supercollider/locals.scm b/queries/supercollider/locals.scm
index ea1229047..066bbf9ab 100644
--- a/queries/supercollider/locals.scm
+++ b/queries/supercollider/locals.scm
@@ -9,7 +9,7 @@
 ; Definitions
 (argument
   name: (identifier) @local.definition.parameter
-  (#set! "definition.var.scope" "local"))
+  (#set! definition.var.scope "local"))
 
 (variable_definition
   name: (variable
@@ -20,10 +20,10 @@
   name: (variable
     (environment_var
       (identifier) @local.definition.var))
-  (#set! "definition.var.scope" "global"))
+  (#set! definition.var.scope "global"))
 
 (function_definition
   name: (variable) @local.definition.var
-  (#set! "definition.var.scope" "parent"))
+  (#set! definition.var.scope "parent"))
 
 (identifier) @local.reference
diff --git a/queries/tablegen/highlights.scm b/queries/tablegen/highlights.scm
index a7b200378..c2f63b093 100644
--- a/queries/tablegen/highlights.scm
+++ b/queries/tablegen/highlights.scm
@@ -98,7 +98,7 @@
   (bang_operator)
   (cond_operator)
 ] @function
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 ; Operators
 [
diff --git a/queries/tcl/indents.scm b/queries/tcl/indents.scm
index c4968d17d..bc0355372 100644
--- a/queries/tcl/indents.scm
+++ b/queries/tcl/indents.scm
@@ -16,8 +16,8 @@
   (expr)
   (arguments)
 ] @indent.align
-  (#set! "indent.open_delimiter" "{")
-  (#set! "indent.close_delimiter" "}"))
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
 
 [
   "}"
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index b88106f1e..6d81291b3 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -1,6 +1,6 @@
 ; Variables
 ((identifier) @variable
-  (#set! "priority" 95))
+  (#set! priority 95))
 
 ; Includes
 [
diff --git a/queries/tiger/locals.scm b/queries/tiger/locals.scm
index f010dd0e8..cd8dcd65f 100644
--- a/queries/tiger/locals.scm
+++ b/queries/tiger/locals.scm
@@ -14,22 +14,22 @@
 ; Definitions {{{
 (type_declaration
   name: (identifier) @local.definition.type
-  (#set! "definition.var.scope" "parent"))
+  (#set! definition.var.scope "parent"))
 
 (parameters
   name: (identifier) @local.definition.parameter)
 
 (function_declaration
   name: (identifier) @local.definition.function
-  (#set! "definition.var.scope" "parent"))
+  (#set! definition.var.scope "parent"))
 
 (primitive_declaration
   name: (identifier) @local.definition.function
-  (#set! "definition.var.scope" "parent"))
+  (#set! definition.var.scope "parent"))
 
 (variable_declaration
   name: (identifier) @local.definition.var
-  (#set! "definition.var.scope" "parent"))
+  (#set! definition.var.scope "parent"))
 
 ; }}}
 ; References {{{
diff --git a/queries/tlaplus/locals.scm b/queries/tlaplus/locals.scm
index f7b481c72..e105351ef 100644
--- a/queries/tlaplus/locals.scm
+++ b/queries/tlaplus/locals.scm
@@ -30,14 +30,14 @@
 
 (function_definition
   name: (identifier) @local.definition.function
-  (#set! "definition.function.scope" "parent"))
+  (#set! definition.function.scope "parent"))
 
 (lambda
   (identifier) @local.definition.parameter)
 
 (module_definition
   name: (_) @local.definition.import
-  (#set! "definition.import.scope" "parent"))
+  (#set! definition.import.scope "parent"))
 
 (module_definition
   parameter: (identifier) @local.definition.parameter)
@@ -48,7 +48,7 @@
 
 (operator_definition
   name: (_) @local.definition.macro
-  (#set! "definition.macro.scope" "parent"))
+  (#set! definition.macro.scope "parent"))
 
 (operator_definition
   parameter: (identifier) @local.definition.parameter)
@@ -97,7 +97,7 @@
 
 (theorem
   name: (identifier) @local.definition.constant
-  (#set! "definition.constant.scope" "parent"))
+  (#set! definition.constant.scope "parent"))
 
 ; PlusCal scopes and definitions
 [
diff --git a/queries/udev/highlights.scm b/queries/udev/highlights.scm
index 1b19028ac..f95238d70 100644
--- a/queries/udev/highlights.scm
+++ b/queries/udev/highlights.scm
@@ -10,12 +10,12 @@
 ((fmt_sub
   .
   _ @character.special)
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 ((var_sub
   .
   _ @variable.builtin)
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 [
   (system_const)
@@ -26,24 +26,24 @@
 ] @attribute
 
 ((attribute) @attribute
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 ((env_var) @constant
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 ((pattern) @string.special
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 ([
   "\\\""
   (c_escape)
 ] @string.escape
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 (octal) @number
 
 ((number) @number
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 [
   (match_op)
@@ -51,13 +51,13 @@
 ] @operator
 
 ("+" @punctuation.special
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 ([
   "{"
   "}"
 ] @punctuation.bracket
-  (#set! "priority" 101))
+  (#set! priority 101))
 
 [
   ","
diff --git a/queries/vimdoc/highlights.scm b/queries/vimdoc/highlights.scm
index 322b58a23..829a643ae 100644
--- a/queries/vimdoc/highlights.scm
+++ b/queries/vimdoc/highlights.scm
@@ -41,7 +41,7 @@
   text: (_) @markup.raw)
 
 ((codeblock) @markup.raw.block
-  (#set! "priority" 90))
+  (#set! priority 90))
 
 (codeblock
   ">" @markup.raw
@@ -60,7 +60,7 @@
 (keycode) @string.special
 
 ((url) @string.special.url
-  (#set! @string.special.url "url" @string.special.url))
+  (#set! @string.special.url url @string.special.url))
 
 (modeline) @keyword.directive
 
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index 464207990..fc15343da 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -54,7 +54,7 @@
   (CDStart) @module
   (CData) @markup.raw
   "]]>" @module)
-  (#set! "priority" 105))
+  (#set! priority 105))
 
 ; Delimiters & punctuation
 [
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index 342d7e563..d41068359 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -7,7 +7,7 @@
 (single_quote_scalar) @string
 
 ((block_scalar) @string
-  (#set! "priority" 99))
+  (#set! priority 99))
 
 (string_scalar) @string
 

From 45b3f7a8cf69ee4504c04383e67810c47f5e05a4 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 28 Jul 2024 02:41:07 -0700
Subject: [PATCH 1701/2704] fix(strace): Fix comment injection

---
 queries/strace/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/strace/injections.scm b/queries/strace/injections.scm
index 2659fdc47..2f0e58eb6 100644
--- a/queries/strace/injections.scm
+++ b/queries/strace/injections.scm
@@ -1,2 +1,2 @@
-((comment) @injection.language
-  (#set! @injection.language "comment"))
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 2d5133f67429f82547ea5fad33a0b1e7d4f78a1c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 28 Jul 2024 06:39:43 +0000
Subject: [PATCH 1702/2704] bot(lockfile)!: update d, latex

adapt d injections to breaking grammar change
---
 lockfile.json            | 4 ++--
 queries/d/injections.scm | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6b1123024..ef635b8f3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"
+    "revision": "f0fb364270b1a5a086b2b6b8cb7eb1a3fb9d9a8e"
   },
   "dart": {
     "revision": "ac0bb849ccd1a923963af47573b5e396736ff582"
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "f074e142ade9cdc292346d0484be27f9ebdbc4ea"
+    "revision": "efe5afdbb59b70214e6d70db5197dc945d5b213e"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
diff --git a/queries/d/injections.scm b/queries/d/injections.scm
index 163348100..cfc1bf986 100644
--- a/queries/d/injections.scm
+++ b/queries/d/injections.scm
@@ -3,11 +3,12 @@
 
 ((call_expression
   (type) @_printf
-  (arguments
+  (named_arguments
     "("
     .
-    (expression
-      (string_literal) @injection.content)))
+    (named_argument
+      (expression
+        (string_literal) @injection.content))))
   (#eq? @_printf "printf")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.language "printf"))

From 8dbab597735fe65250c3607964c54253193c04f5 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sun, 28 Jul 2024 23:29:01 +0300
Subject: [PATCH 1703/2704] feat(powershell): highlight shebang

---
 queries/powershell/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/powershell/highlights.scm b/queries/powershell/highlights.scm
index 851e69a47..62fd7f5eb 100644
--- a/queries/powershell/highlights.scm
+++ b/queries/powershell/highlights.scm
@@ -145,6 +145,11 @@
 
 (comment) @comment @spell
 
+((program
+  .
+  (comment) @keyword.directive)
+  (#lua-match? @keyword.directive "^#!/"))
+
 ; Booleans
 ;---------
 ([

From a7ba147b4b51631f7cf7d9da56f7d5763073b18d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 06:40:48 +0000
Subject: [PATCH 1704/2704] bot(lockfile): update d, kotlin, problog, prolog,
 rescript

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ef635b8f3..e05d4a11c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "f0fb364270b1a5a086b2b6b8cb7eb1a3fb9d9a8e"
+    "revision": "c067ff38b84d860c993d8b8906124e96694593e4"
   },
   "dart": {
     "revision": "ac0bb849ccd1a923963af47573b5e396736ff582"
@@ -375,7 +375,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "c9cb8504b81684375e7beb8907517dbd6947a1be"
+    "revision": "3d81f4dcb382be4a3ae9c807f00c722212474432"
   },
   "koto": {
     "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
@@ -543,10 +543,10 @@
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
   },
   "problog": {
-    "revision": "d8bc22c007825d3af3d62b4326f9d8f9ca529974"
+    "revision": "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"
   },
   "prolog": {
-    "revision": "d8bc22c007825d3af3d62b4326f9d8f9ca529974"
+    "revision": "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"
   },
   "promql": {
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
@@ -621,7 +621,7 @@
     "revision": "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2"
   },
   "rescript": {
-    "revision": "444c127686714b2358622427c3bdba7eb09021c6"
+    "revision": "4606cd81c4c31d1d02390fee530858323410a74c"
   },
   "rnoweb": {
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"

From cc69a061fed0fa1caae08079f7c5a55ded4a0765 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 06:41:26 +0000
Subject: [PATCH 1705/2704] bot(lockfile): update d, just, kotlin, wit

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e05d4a11c..30771ce96 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "c067ff38b84d860c993d8b8906124e96694593e4"
+    "revision": "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"
   },
   "dart": {
     "revision": "ac0bb849ccd1a923963af47573b5e396736ff582"
@@ -366,7 +366,7 @@
     "revision": "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"
   },
   "just": {
-    "revision": "379fbe36d1e441bc9414ea050ad0c85c9d6935ea"
+    "revision": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -375,7 +375,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "3d81f4dcb382be4a3ae9c807f00c722212474432"
+    "revision": "fe73604cca8cac5c8756b286e7eeb1821852b7dc"
   },
   "koto": {
     "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
@@ -846,7 +846,7 @@
     "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
   },
   "wit": {
-    "revision": "cd7e6534fd9a22e3e9a7a85feecf4e35461e47cb"
+    "revision": "c52f0b07786603df17ad0197f6cef680f312eb2c"
   },
   "xcompose": {
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"

From 9f8c99e980f55e72148a95a0fb2e260c95f6341b Mon Sep 17 00:00:00 2001
From: belltoy <belltoy@gmail.com>
Date: Sun, 28 Jul 2024 13:15:43 +0800
Subject: [PATCH 1706/2704] feat(vrl): Add vrl parser and queries

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +++
 queries/vrl/folds.scm           |   6 ++
 queries/vrl/highlights.scm      | 108 ++++++++++++++++++++++++++++++++
 queries/vrl/indents.scm         |  24 +++++++
 queries/vrl/injections.scm      |   6 ++
 queries/vrl/locals.scm          |  16 +++++
 8 files changed, 172 insertions(+)
 create mode 100644 queries/vrl/folds.scm
 create mode 100644 queries/vrl/highlights.scm
 create mode 100644 queries/vrl/indents.scm
 create mode 100644 queries/vrl/injections.scm
 create mode 100644 queries/vrl/locals.scm

diff --git a/README.md b/README.md
index f65e118b4..6e50e6be6 100644
--- a/README.md
+++ b/README.md
@@ -451,6 +451,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
 - [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
 - [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason)
+- [x] [vrl](https://github.com/belltoy/tree-sitter-vrl) (maintained by @belltoy)
 - [x] [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) (maintained by @WhyNotHugo, @lucario387)
 - [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
 - [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
diff --git a/lockfile.json b/lockfile.json
index 30771ce96..18be9e2f4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -833,6 +833,9 @@
   "vimdoc": {
     "revision": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245"
   },
+  "vrl": {
+    "revision": "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba"
+  },
   "vue": {
     "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ad6068d02..969c75fea 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2398,6 +2398,14 @@ list.vimdoc = {
   maintainers = { "@clason" },
 }
 
+list.vrl = {
+  install_info = {
+    url = "https://github.com/belltoy/tree-sitter-vrl",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@belltoy" },
+}
+
 list.vue = {
   install_info = {
     url = "https://github.com/tree-sitter-grammars/tree-sitter-vue",
diff --git a/queries/vrl/folds.scm b/queries/vrl/folds.scm
new file mode 100644
index 000000000..6c6d587de
--- /dev/null
+++ b/queries/vrl/folds.scm
@@ -0,0 +1,6 @@
+[
+  (block)
+  (object)
+  (array)
+  (arguments)
+] @fold
diff --git a/queries/vrl/highlights.scm b/queries/vrl/highlights.scm
new file mode 100644
index 000000000..f74d6dd55
--- /dev/null
+++ b/queries/vrl/highlights.scm
@@ -0,0 +1,108 @@
+(comment) @comment @spell
+
+(null) @constant.builtin
+
+(timestamp) @constant
+
+(closure_variables
+  (ident) @variable.parameter)
+
+(integer) @number
+
+(float) @number.float
+
+[
+  (string)
+  (raw_string)
+] @string
+
+[
+  (raw_string_escape_sequence)
+  (escape_sequence)
+  (regex_escape_sequence)
+] @string.escape
+
+(string_template
+  "{{" @punctuation.special
+  (_)
+  "}}" @punctuation.special)
+
+(regex) @string.regexp
+
+(boolean) @boolean
+
+(ident) @variable
+
+(noop) @variable.builtin
+
+(function_call
+  (ident) @function.call)
+
+; VRL queries
+(query
+  [
+    (event)
+    (metadata)
+  ] @variable.builtin)
+
+(query
+  (path
+    [
+      (field) @variable
+      (string) @string
+      (index) @number
+      "." @punctuation.delimiter
+    ]))
+
+"return" @keyword.return
+
+"abort" @keyword.exception
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+[
+  "="
+  "=="
+  "!="
+  "|="
+  ">"
+  ">="
+  "<"
+  "<="
+  "+"
+  "-"
+  "*"
+  "/"
+  "&&"
+  "||"
+  "??"
+  "|"
+  "!"
+] @operator
+
+[
+  "->"
+  ":"
+  ";"
+  ","
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(closure_variables
+  "|" @punctuation.bracket)
+
+(function_call
+  (ident) @keyword.exception
+  "!"
+  (#any-of? @keyword.exception "assert" "assert_eq"))
diff --git a/queries/vrl/indents.scm b/queries/vrl/indents.scm
new file mode 100644
index 000000000..1fc1249e0
--- /dev/null
+++ b/queries/vrl/indents.scm
@@ -0,0 +1,24 @@
+[
+  (block)
+  (object)
+  (array)
+  (arguments)
+] @indent.begin
+
+(block
+  "}" @indent.end)
+
+(object
+  "}" @indent.end)
+
+(array
+  "]" @indent.end)
+
+(arguments
+  ")" @indent.end)
+
+[
+  ")"
+  "]"
+  "}"
+] @indent.branch
diff --git a/queries/vrl/injections.scm b/queries/vrl/injections.scm
new file mode 100644
index 000000000..5aaf9bcd2
--- /dev/null
+++ b/queries/vrl/injections.scm
@@ -0,0 +1,6 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((regex) @injection.content
+  (#offset! @injection.content 0 2 0 -1)
+  (#set! injection.language "regex"))
diff --git a/queries/vrl/locals.scm b/queries/vrl/locals.scm
new file mode 100644
index 000000000..786da98c5
--- /dev/null
+++ b/queries/vrl/locals.scm
@@ -0,0 +1,16 @@
+(closure_variables
+  (ident) @local.definition.parameter)
+
+[
+  (ident)
+  (metadata)
+] @local.reference
+
+(query
+  (event) @local.reference)
+
+[
+  (block)
+  (closure)
+  (if_statement)
+] @local.scope

From 8e569bc4b5eee3ef011c948f92493fda2e2a6a32 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 06:34:38 +0000
Subject: [PATCH 1707/2704] bot(lockfile): update http, hurl, matlab, sql,
 swift

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 18be9e2f4..25f8d6526 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,10 +315,10 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "e061995f0caf2fa30f68fa1fdf2c08bcbd4629a8"
+    "revision": "5ae6c7cfa62a7d7325c26171a1de4f6b866702b5"
   },
   "hurl": {
-    "revision": "ad705af8c44c737bdb965fc081329c50716d2d03"
+    "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
   },
   "hyprlang": {
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
@@ -432,7 +432,7 @@
     "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "matlab": {
-    "revision": "821f7bdf9d922822302a0170c2f157e36ffb7a94"
+    "revision": "0d5a05e543af2de60cdb5e71f0f5888c95ab936f"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -690,7 +690,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "a9664463580473e92d8f5e29fa06fb1be88752af"
+    "revision": "b8175006d9c8120d41cf40a4ef3711bbbbc08973"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -717,7 +717,7 @@
     "revision": "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"
   },
   "swift": {
-    "revision": "b3dc8cc5c266effd7bcfde01aa086b83927f2eda"
+    "revision": "769bb834feb2947f2c706d82830b0a05958727de"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 65310b64eee19a6e74e1b6f607a9f46f751290fe Mon Sep 17 00:00:00 2001
From: Oliver Thomas <thomaso@ie-freiburg.mpg.de>
Date: Tue, 30 Jul 2024 21:05:09 +0200
Subject: [PATCH 1708/2704] fix: prevent double indent from pipes

---
 queries/r/indents.scm            | 2 --
 tests/indent/r/incomplete_pipe.R | 2 ++
 tests/indent/r_spec.lua          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 tests/indent/r/incomplete_pipe.R

diff --git a/queries/r/indents.scm b/queries/r/indents.scm
index 600214eaf..79dbe5167 100644
--- a/queries/r/indents.scm
+++ b/queries/r/indents.scm
@@ -2,8 +2,6 @@
   (braced_expression)
   (parenthesized_expression)
   (call)
-  "special"
-  "|>"
   "if"
   "else"
   "while"
diff --git a/tests/indent/r/incomplete_pipe.R b/tests/indent/r/incomplete_pipe.R
new file mode 100644
index 000000000..199cc83fa
--- /dev/null
+++ b/tests/indent/r/incomplete_pipe.R
@@ -0,0 +1,2 @@
+mtcars %>%
+  head() %>%
diff --git a/tests/indent/r_spec.lua b/tests/indent/r_spec.lua
index 60271b6a7..08df5e11b 100644
--- a/tests/indent/r_spec.lua
+++ b/tests/indent/r_spec.lua
@@ -35,6 +35,8 @@ describe("indent R:", function()
     run:new_line("pipe.R", { on_line = 1, text = "head(n = 10L) |>", indent = 2 })
     run:new_line("pipe.R", { on_line = 9, text = "head()", indent = 2 })
 
+    run:new_line("incomplete_pipe.R", { on_line = 2, text = "head %>%", indent = 2 })
+
     run:new_line("aligned_indent.R", { on_line = 1, text = "z,", indent = 17 })
   end)
 end)

From 929e4739ccdf67263d327c042e71a16a80845dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=8D=E7=94=9F=E8=8A=B1?= <hoangtun0810@gmail.com>
Date: Thu, 1 Aug 2024 15:40:23 +0900
Subject: [PATCH 1709/2704] fix(format): field_def inside grouping

---
 queries/hare/indents.scm       | 3 ++-
 queries/haskell/highlights.scm | 6 ++++--
 scripts/format-queries.lua     | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/queries/hare/indents.scm b/queries/hare/indents.scm
index d729663e1..9e41ea6d0 100644
--- a/queries/hare/indents.scm
+++ b/queries/hare/indents.scm
@@ -14,7 +14,8 @@
 
 (if_statement
   ("("
-    condition: (_)")") @indent.begin)
+    condition: (_)
+    ")") @indent.begin)
 
 [
   "}"
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 975a8c188..9373b6e1d 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -144,7 +144,8 @@
   .
   (decl
     name: (variable) @variable)
-  match: (_)(#eq? @_name @variable))
+  match: (_)
+  (#eq? @_name @variable))
 
 ; but consider a type that involves 'IO' a decl/function
 (decl/signature
@@ -161,7 +162,8 @@
   .
   (decl
     name: (variable) @function)
-  match: (_)(#eq? @_name @function))
+  match: (_)
+  (#eq? @_name @function))
 
 ((decl/signature) @function
   .
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index f241fa819..0f6b77f1e 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -227,6 +227,7 @@ local format_queries = [[
     (list)
     (predicate)
     (grouping . (_))
+    (field_definition)
     "."
   ] @format.append-newline
   (_) .)

From fcf79acfd17e7a8da3c96f29be7022bba5607201 Mon Sep 17 00:00:00 2001
From: Andrey Chalkin <L2jLiga@gmail.com>
Date: Thu, 1 Aug 2024 08:40:44 +0200
Subject: [PATCH 1710/2704] feat(powershell): added data section name
 highlights

---
 queries/powershell/highlights.scm | 10 +++++++---
 queries/powershell/locals.scm     |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/queries/powershell/highlights.scm b/queries/powershell/highlights.scm
index 62fd7f5eb..3885ba833 100644
--- a/queries/powershell/highlights.scm
+++ b/queries/powershell/highlights.scm
@@ -67,7 +67,10 @@
   "enum"
 ] @keyword.type
 
-(class_attribute) @keyword.modifier
+[
+  "data"
+  (class_attribute)
+] @keyword.modifier
 
 [
   "throw"
@@ -87,8 +90,6 @@
   "begin"
   "process"
   "end"
-  ; TODO: not supported by parser yet, can be used to declare constants
-  "data"
 ] @keyword
 
 ; Operators
@@ -143,6 +144,9 @@
 ((variable) @variable.builtin
   (#lua-match? @variable.builtin "^\$env:"))
 
+(data_name
+  (simple_name) @constant)
+
 (comment) @comment @spell
 
 ((program
diff --git a/queries/powershell/locals.scm b/queries/powershell/locals.scm
index 3a8158d3f..e98410992 100644
--- a/queries/powershell/locals.scm
+++ b/queries/powershell/locals.scm
@@ -68,6 +68,10 @@
                           (unary_expression
                             (variable) @local.definition.var))))))))))))))
 
+; data sections
+(data_name
+  (simple_name) @local.definition.var)
+
 ; References
 ;-----------
 (variable) @local.reference

From c67881c265059f44fe22aa212ad7ea2bfc36bee8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 06:41:23 +0000
Subject: [PATCH 1711/2704] bot(lockfile): update gomod, groovy, powershell,
 roc

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 25f8d6526..48ebade70 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -249,7 +249,7 @@
     "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
   },
   "gomod": {
-    "revision": "bbe2fe3be4b87e06a613e685250f473d2267f430"
+    "revision": "1f55029bacd0a6a11f6eb894c4312d429dcf735c"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -267,7 +267,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "391229139d9f79879ccc84cb271889c9240c28a1"
+    "revision": "105ee343682b7eee86b38ec6858a269e16474a72"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -534,7 +534,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "804d86fd4ad286bd0cc1c1f0f7b28bd7af6755ad"
+    "revision": "fc15514b2f1dbba9c58528d15a3708f89eda6a01"
   },
   "printf": {
     "revision": "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"
@@ -633,7 +633,7 @@
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
   },
   "roc": {
-    "revision": "6ea64b6434a45472bd87b0772fd84a017de0a557"
+    "revision": "ef46edd0c03ea30a22f7e92bc68628fb7231dc8a"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"

From d13f0183ba93f9b5aba7359146f294abfffff9c3 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Thu, 1 Aug 2024 01:24:40 -0700
Subject: [PATCH 1712/2704] feat(highlights): capture wildcard imports as
 `@character.special`

---
 queries/ecma/highlights.scm   | 18 +++++++++++++-----
 queries/groovy/highlights.scm |  2 ++
 queries/java/highlights.scm   |  4 ++++
 queries/kotlin/highlights.scm |  2 ++
 queries/python/highlights.scm |  3 +++
 queries/rust/highlights.scm   |  3 +++
 queries/scala/highlights.scm  |  6 +++++-
 7 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index f60406272..37913f65b 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -132,11 +132,6 @@
 (new_expression
   constructor: (identifier) @constructor)
 
-; Variables
-;----------
-(namespace_import
-  (identifier) @module)
-
 ; Decorators
 ;----------
 (decorator
@@ -302,6 +297,19 @@
     "}"
   ] @punctuation.special) @none
 
+; Imports
+;----------
+(namespace_import
+  "*" @character.special
+  (identifier) @module)
+
+(namespace_export
+  "*" @character.special
+  (identifier) @module)
+
+(export_statement
+  "*" @character.special)
+
 ; Keywords
 ;----------
 [
diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm
index de62bbb4f..4504e16e2 100644
--- a/queries/groovy/highlights.scm
+++ b/queries/groovy/highlights.scm
@@ -148,6 +148,8 @@
   "!"
 ] @operator
 
+(wildcard_import) @character.special
+
 (string
   "/" @string)
 
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 0f7e4feca..316987178 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -257,6 +257,10 @@
   "uses"
 ] @keyword.import
 
+(import_declaration
+  (asterisk
+    "*" @character.special))
+
 ; Punctuation
 [
   ";"
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index f30986542..a53fd3a04 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -73,6 +73,8 @@
 (import_header
   "import" @keyword.import)
 
+(wildcard_import) @character.special
+
 ; The last `simple_identifier` in a `import_header` will always either be a function
 ; or a type. Classes can appear anywhere in the import path, unlike functions
 (import_header
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 71356264c..232d40916 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -320,6 +320,9 @@
 (aliased_import
   "as" @keyword.import)
 
+(wildcard_import
+  "*" @character.special)
+
 [
   "if"
   "elif"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 1609a81a2..f411dda40 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -382,6 +382,9 @@
   "||"
 ] @operator
 
+(use_wildcard
+  "*" @character.special)
+
 ; Punctuation
 [
   "("
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 5f3936d2f..3ff64309f 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -213,7 +213,11 @@
 
 (wildcard) @variable.parameter
 
-(namespace_wildcard) @punctuation.special
+(namespace_wildcard
+  [
+    "*"
+    "_"
+  ] @character.special)
 
 (annotation) @attribute
 

From 110a50e37103148141039da386b8d0a976cab1cb Mon Sep 17 00:00:00 2001
From: DimensionalDot <dimensionaldot@gmail.com>
Date: Fri, 2 Aug 2024 03:28:35 -0400
Subject: [PATCH 1713/2704] feat(ecma): inject sql template methods

---
 queries/ecma/injections.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 85e0383c3..93cf70674 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -43,6 +43,25 @@
   (#set! injection.include-children)
   (#set! injection.language "html"))
 
+; Vercel PostgreSQL
+; foo.sql`...` or foo.sql(`...`)
+(call_expression
+  function: [
+    (await_expression
+      (member_expression
+        property: (property_identifier) @injection.language))
+    (member_expression
+      property: (property_identifier) @injection.language)
+  ]
+  arguments: [
+    (arguments
+      (template_string) @injection.content)
+    (template_string) @injection.content
+  ]
+  (#eq? @injection.language "sql")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children))
+
 (call_expression
   function: [
     (await_expression

From 8453015093ae156f1776d2c913b6c5206e80e26f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2024 06:43:00 +0000
Subject: [PATCH 1714/2704] bot(lockfile): update kotlin, nix, perl

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 48ebade70..86e1de300 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -375,7 +375,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "fe73604cca8cac5c8756b286e7eeb1821852b7dc"
+    "revision": "754394c69811e5b586f16c462855d66dfc747a03"
   },
   "koto": {
     "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "0fdada10f1f845ca9116e279ad8f5d0ca93e9949"
+    "revision": "68d3b7999ad89d31690461884270e5658e0a22c4"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "7581cbf8fb793bce94d0241c89fe49b01b1477f9"
+    "revision": "ccd3070e557516bf27c72d898d2bd3419356e51b"
   },
   "php": {
     "revision": "c07d69739ba71b5a449bdbb7735991f8aabf8546"

From 09bad640e4507885fa0e7035348c7854c531b3d6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 2 Aug 2024 06:05:25 -0700
Subject: [PATCH 1715/2704] fix(query): proper indentation after quantifiers

---
 queries/query/indents.scm   | 7 ++++++-
 tests/indent/query/test.scm | 9 +++++++++
 tests/indent/query_spec.lua | 5 ++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/queries/query/indents.scm b/queries/query/indents.scm
index d1cdb3eef..5cea97e1e 100644
--- a/queries/query/indents.scm
+++ b/queries/query/indents.scm
@@ -12,7 +12,12 @@
 
 "]" @indent.branch @indent.end
 
-")" @indent.end
+[
+  ")"
+  "?"
+  "*"
+  "+"
+] @indent.end
 
 ; Captures always mark the end of a node
 ; Because of that, mark it as indent.end
diff --git a/tests/indent/query/test.scm b/tests/indent/query/test.scm
index 62b94417c..56d755690 100644
--- a/tests/indent/query/test.scm
+++ b/tests/indent/query/test.scm
@@ -38,4 +38,13 @@
   "toplevel"
   "list"
 ] @variable
+
+[
+  (parent
+    (child))+
+  (parent
+    (child))*
+  (parent
+    (child))?
+] @cap
 ((
diff --git a/tests/indent/query_spec.lua b/tests/indent/query_spec.lua
index 1f9c2315d..ca2ccdef5 100644
--- a/tests/indent/query_spec.lua
+++ b/tests/indent/query_spec.lua
@@ -20,6 +20,9 @@ describe("indent Query:", function()
     run:new_line("test.scm", { on_line = 34, text = '"more"', indent = 2 })
     run:new_line("test.scm", { on_line = 35, text = "(node)", indent = 0 })
     run:new_line("test.scm", { on_line = 40, text = "(node)", indent = 0 })
-    run:new_line("test.scm", { on_line = 41, text = "node_name", indent = 2 })
+    run:new_line("test.scm", { on_line = 44, text = "(node)", indent = 2 })
+    run:new_line("test.scm", { on_line = 46, text = "(node)", indent = 2 })
+    run:new_line("test.scm", { on_line = 48, text = "(node)", indent = 2 })
+    run:new_line("test.scm", { on_line = 50, text = "node_name", indent = 2 })
   end)
 end)

From ddbcc38d46ca1726740878241d3ada1aa99cebfa Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 3 Aug 2024 06:40:22 +0000
Subject: [PATCH 1716/2704] bot(lockfile): update cuda, hlsl, kotlin, slang,
 typespec, vim

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 86e1de300..cc982822d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "07f2f157d484a27dc91c04cc116f94f6fd4fc654"
+    "revision": "7c97acb8398734d790c86210c53c320df61ff66b"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -297,7 +297,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "80517ca13317fb8591503c0d99f2ad76e8979a72"
+    "revision": "81dbfa44a2e0f9e36d16f449fc792020e2f38426"
   },
   "hlsplaylist": {
     "revision": "64f19029339e75d6762feae39e7878595860c980"
@@ -375,7 +375,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "754394c69811e5b586f16c462855d66dfc747a03"
+    "revision": "8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5"
   },
   "koto": {
     "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
@@ -660,7 +660,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "slang": {
-    "revision": "ea77a4d91dd93f4483965efcc41f3faebb9131c8"
+    "revision": "d84b43d75d65bbc4ba57166ce17555f32c0b8983"
   },
   "slint": {
     "revision": "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74"
@@ -786,7 +786,7 @@
     "revision": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"
   },
   "typespec": {
-    "revision": "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"
+    "revision": "af7a97eea5d4c62473b29655a238d4f4e055798b"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
@@ -828,7 +828,7 @@
     "revision": "90028bbadb267ead5b87830380f6a825147f0c0f"
   },
   "vim": {
-    "revision": "b448ca63f972ade12c373c808acdd2bf972937db"
+    "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"
   },
   "vimdoc": {
     "revision": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245"

From a7a3b9c10e8a5fe0da05ebb65db3ed1d164e612d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 3 Aug 2024 11:25:42 +0200
Subject: [PATCH 1717/2704] ci: skip updates for javascript

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index b994622bf..8d721fa35 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "javascript"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From d7353a6b72008b38aa873ace49aa97bea257941b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 4 Aug 2024 06:39:13 +0000
Subject: [PATCH 1718/2704] bot(lockfile): update perl, typespec

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cc982822d..290299601 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "ccd3070e557516bf27c72d898d2bd3419356e51b"
+    "revision": "3a21d9cb2a20a062c17f8f53d5983fd473c4673c"
   },
   "php": {
     "revision": "c07d69739ba71b5a449bdbb7735991f8aabf8546"
@@ -786,7 +786,7 @@
     "revision": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"
   },
   "typespec": {
-    "revision": "af7a97eea5d4c62473b29655a238d4f4e055798b"
+    "revision": "0ee05546d73d8eb64635ed8125de6f35c77759fe"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"

From 558c7ad7bf147c1394d971e6a734ea16e440d51a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 4 Aug 2024 18:26:18 -0700
Subject: [PATCH 1719/2704] fix(lua): proper indent after multiline string arg

---
 queries/lua/indents.scm     | 1 +
 tests/indent/lua/string.lua | 4 ++++
 tests/indent/lua_spec.lua   | 1 +
 3 files changed, 6 insertions(+)

diff --git a/queries/lua/indents.scm b/queries/lua/indents.scm
index a5f66ebcc..84303b8ab 100644
--- a/queries/lua/indents.scm
+++ b/queries/lua/indents.scm
@@ -17,6 +17,7 @@
 [
   "end"
   "}"
+  "]]"
 ] @indent.end
 
 (")" @indent.end
diff --git a/tests/indent/lua/string.lua b/tests/indent/lua/string.lua
index adfebf76a..f44fc7231 100644
--- a/tests/indent/lua/string.lua
+++ b/tests/indent/lua/string.lua
@@ -3,3 +3,7 @@ a
   multiline
     string
 ]]
+
+print [[
+test
+]]
diff --git a/tests/indent/lua_spec.lua b/tests/indent/lua_spec.lua
index b54ec6512..6d99a0fff 100644
--- a/tests/indent/lua_spec.lua
+++ b/tests/indent/lua_spec.lua
@@ -28,6 +28,7 @@ describe("indent Lua:", function()
     run:new_line("string.lua", { on_line = 2, text = "x", indent = 0 })
     run:new_line("string.lua", { on_line = 3, text = "x", indent = 2 })
     run:new_line("string.lua", { on_line = 4, text = "x", indent = 4 })
+    run:new_line("string.lua", { on_line = 9, text = "x", indent = 0 })
     run:new_line("table.lua", { on_line = 1, text = "b = 0,", indent = 2 })
     run:new_line("table.lua", { on_line = 5, text = "4,", indent = 4 })
     run:new_line("table.lua", { on_line = 7, text = "4,", indent = 4 })

From 1aad04ecde5ebf8f2b3eea5c6f39d38b251757f5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 06:41:55 +0000
Subject: [PATCH 1720/2704] bot(lockfile): update apex, hlsplaylist, muttrc,
 nix, soql, sosl, tmux, zathurarc

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 290299601..a2c7292ad 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "31182d43b062a350d4bd2449f2fc0d5654972be9"
   },
   "apex": {
-    "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
+    "revision": "c7518e9289241d7e9f3d522da994b9bdbea99b33"
   },
   "arduino": {
     "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
@@ -300,7 +300,7 @@
     "revision": "81dbfa44a2e0f9e36d16f449fc792020e2f38426"
   },
   "hlsplaylist": {
-    "revision": "64f19029339e75d6762feae39e7878595860c980"
+    "revision": "3bfda9271e3adb08d35f47a2102fe957009e1c55"
   },
   "hocon": {
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
@@ -447,7 +447,7 @@
     "revision": "affbd6f3b08155826a22cfa8373147acbf60f1f1"
   },
   "muttrc": {
-    "revision": "90ef60852c410bd964cd3b954366e4c403c17314"
+    "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
   },
   "nasm": {
     "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "68d3b7999ad89d31690461884270e5658e0a22c4"
+    "revision": "919613dcff7bdc38b946ea5f767dec25ee1ed129"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"
@@ -678,10 +678,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
+    "revision": "c7518e9289241d7e9f3d522da994b9bdbea99b33"
   },
   "sosl": {
-    "revision": "c99ad4b16d112fea91745e3f1b769754239fdaba"
+    "revision": "c7518e9289241d7e9f3d522da994b9bdbea99b33"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -762,7 +762,7 @@
     "revision": "bba02e79f85e335f310fc95e21c677e49f2c4439"
   },
   "tmux": {
-    "revision": "9138ea508410e0f34da2666609f600f65e944f22"
+    "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"
   },
   "todotxt": {
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
@@ -867,7 +867,7 @@
     "revision": "e877f6ade4b77d5ef8787075141053631ba12318"
   },
   "zathurarc": {
-    "revision": "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"
+    "revision": "0554b4a5d313244b7fc000cbb41c04afae4f4e31"
   },
   "zig": {
     "revision": "2bac4cc6c697d46a193905fef6d003bfa0bfabfd"

From c79b068f395817c39ed147d4ee76855c36b846e6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 06:42:49 +0000
Subject: [PATCH 1721/2704] bot(lockfile): update apex, beancount, idl,
 snakemake, soql, sosl

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a2c7292ad..793893b5c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "31182d43b062a350d4bd2449f2fc0d5654972be9"
   },
   "apex": {
-    "revision": "c7518e9289241d7e9f3d522da994b9bdbea99b33"
+    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
   },
   "arduino": {
     "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
@@ -33,7 +33,7 @@
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
   },
   "beancount": {
-    "revision": "384c55ede2a1f13e83d8e18dbef8f11304c379c2"
+    "revision": "01c0da29e0fc7130420a09d939ecc524e09b6ba6"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "1a6683f6809f7bc630f10fcad7d9ac6471deb706"
+    "revision": "4eb0e642c02420ba32e9435c1038080a6b5b6877"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -672,16 +672,16 @@
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
-    "revision": "46d4de8e6cfca8a97c0489aea936bb15beeaf666"
+    "revision": "e909815acdbe37e69440261ebb1091ed52e1dec6"
   },
   "solidity": {
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "c7518e9289241d7e9f3d522da994b9bdbea99b33"
+    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
   },
   "sosl": {
-    "revision": "c7518e9289241d7e9f3d522da994b9bdbea99b33"
+    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"

From 9e66d5c72dabfc6417c6015ed8991f3c4b504f7d Mon Sep 17 00:00:00 2001
From: Sergio Alejandro Vargas <savargasqu+git@unal.edu.co>
Date: Tue, 6 Aug 2024 17:27:04 -0500
Subject: [PATCH 1722/2704] fix(julia): macro definition docstrings

Inject markdown in macro definition docstrings.
---
 queries/julia/injections.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index f3c5d0c43..2ed0eb4c9 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -6,6 +6,7 @@
     (abstract_definition)
     (struct_definition)
     (function_definition)
+    (macro_definition)
     (assignment)
     (const_statement)
   ]

From e28614cb1a5712166afef80081f68c28db92e3e0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 06:42:27 +0000
Subject: [PATCH 1723/2704] bot(lockfile): update idl, scala

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 793893b5c..d99a2c25f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "4eb0e642c02420ba32e9435c1038080a6b5b6877"
+    "revision": "1ad1289813e237cb98cf8e5c3e792c8d2353acc6"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -648,7 +648,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8"
+    "revision": "c694c1b623fa11a6b4f901b4ec713cc2265bebcc"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"

From 88aad97312787c11154afbe16068fc2b1e18b249 Mon Sep 17 00:00:00 2001
From: Oliver Thomas <thomaso@ie-freiburg.mpg.de>
Date: Mon, 5 Aug 2024 21:56:30 +0200
Subject: [PATCH 1724/2704] feat(snakemake): update highlights and indents

---
 queries/snakemake/highlights.scm | 24 ++++++++++++++----------
 queries/snakemake/indents.scm    |  9 +++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/queries/snakemake/highlights.scm b/queries/snakemake/highlights.scm
index 58e921e88..8781b405c 100644
--- a/queries/snakemake/highlights.scm
+++ b/queries/snakemake/highlights.scm
@@ -13,10 +13,9 @@
     name: _ @keyword))
 
 ; Subordinate directives (eg. input, output)
-(_
-  body: (_
-    (directive
-      name: _ @label)))
+body: (_
+  (directive
+    name: _ @label))
 
 ; rule/module/checkpoint names
 (rule_definition
@@ -30,11 +29,14 @@
 
 ; Rule imports
 (rule_import
-  "use" @keyword.import
-  "rule" @keyword.import
-  "from" @keyword.import
-  "as"? @keyword.import
-  "with"? @keyword.import)
+  [
+    "use"
+    "rule"
+    "from"
+    "exclude"
+    "as"
+    "with"
+  ] @keyword.import)
 
 ; Rule inheritance
 (rule_inheritance
@@ -44,7 +46,9 @@
 
 ; Wildcard names
 (wildcard
-  (identifier) @variable
+  (identifier) @variable)
+
+(wildcard
   (flag) @variable.parameter.builtin)
 
 ; builtin variables
diff --git a/queries/snakemake/indents.scm b/queries/snakemake/indents.scm
index a4648eff4..140b7fb3c 100644
--- a/queries/snakemake/indents.scm
+++ b/queries/snakemake/indents.scm
@@ -9,8 +9,17 @@
 ((rule_inheritance) @indent.begin
   (#set! indent.immediate 1))
 
+((rule_import
+  "with"
+  ":") @indent.begin
+  (#set! indent.immediate 1))
+
 ((module_definition) @indent.begin
   (#set! indent.immediate 1))
 
 ((directive) @indent.begin
   (#set! indent.immediate 1))
+
+; end indentation after last parameter node (no following ',')
+(directive_parameters
+  (_) @indent.end .)

From 3e0feeb062b29bb7d6d6df1e32ba28111c2bb734 Mon Sep 17 00:00:00 2001
From: Paul Evans <leonerd@leonerd.org.uk>
Date: Wed, 7 Aug 2024 14:30:44 +0100
Subject: [PATCH 1725/2704] feat(perl): update highlights and folds

---
 queries/perl/folds.scm      | 13 ++++++++++++-
 queries/perl/highlights.scm | 25 +++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/queries/perl/folds.scm b/queries/perl/folds.scm
index 21950324d..a457a0a50 100644
--- a/queries/perl/folds.scm
+++ b/queries/perl/folds.scm
@@ -2,20 +2,31 @@
 
 (pod) @fold
 
-; fold the block-typed package statements only
+; fold the block-typed package and class statements only
 (package_statement
   (block)) @fold
 
+(class_statement
+  (block)) @fold
+
 [
   (subroutine_declaration_statement)
+  (method_declaration_statement)
   (conditional_statement)
   (loop_statement)
   (for_statement)
   (cstyle_for_statement)
   (block_statement)
+  (defer_statement)
   (phaser_statement)
 ] @fold
 
+(try_statement
+  (block) @fold)
+
+(eval_expression
+  (block) @fold)
+
 (anonymous_subroutine_expression) @fold
 
 ; perhaps folks want to fold these too?
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 619923a9b..f654577f6 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -32,9 +32,18 @@
 ("continue" @keyword.repeat
   (block))
 
+[
+  "try"
+  "catch"
+  "finally"
+] @keyword.exception
+
 "return" @keyword.return
 
-"sub" @keyword.function
+[
+  "sub"
+  "method"
+] @keyword.function
 
 [
   "map"
@@ -42,14 +51,20 @@
   "sort"
 ] @function.builtin
 
-"package" @keyword.import
+[
+  "package"
+  "class"
+] @keyword.import
 
 [
+  "defer"
   "do"
+  "eval"
   "my"
   "our"
   "local"
   "state"
+  "field"
   "last"
   "next"
   "redo"
@@ -129,12 +144,18 @@
 (package_statement
   (package) @type)
 
+(class_statement
+  (package) @type)
+
 (require_expression
   (bareword) @type)
 
 (subroutine_declaration_statement
   name: (bareword) @function)
 
+(method_declaration_statement
+  name: (bareword) @function)
+
 (attribute_name) @attribute
 
 (attribute_value) @string

From da7b1189eadf61a69f3c1456bf590e5f25a72ca4 Mon Sep 17 00:00:00 2001
From: DragonBillow <DragonBillow@outlook.com>
Date: Thu, 8 Aug 2024 14:13:08 +0800
Subject: [PATCH 1726/2704] feat(idl): update highlights

Signed-off-by: DragonBillow <DragonBillow@outlook.com>
---
 queries/idl/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/idl/highlights.scm b/queries/idl/highlights.scm
index 7446b0d4e..de1937203 100644
--- a/queries/idl/highlights.scm
+++ b/queries/idl/highlights.scm
@@ -168,7 +168,7 @@
 
 (preproc_call
   directive: (preproc_directive) @keyword.directive
-  argument: (_) @constant)
+  argument: (_)? @constant)
 
 (module_dcl
   (identifier) @module)

From 2e01c7104c0983467ee1b9f569e0874b8d2b44c6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 8 Aug 2024 06:42:23 +0000
Subject: [PATCH 1727/2704] bot(lockfile): update hlsl, idl, nix, pascal,
 scala, sql, systemtap

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d99a2c25f..141dbaed3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -297,7 +297,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "81dbfa44a2e0f9e36d16f449fc792020e2f38426"
+    "revision": "5d788a46727c8199a7c63a3c849092e0364375b6"
   },
   "hlsplaylist": {
     "revision": "3bfda9271e3adb08d35f47a2102fe957009e1c55"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "1ad1289813e237cb98cf8e5c3e792c8d2353acc6"
+    "revision": "e2fa5d23a3f1854d5608454ac8773feb181aa0e7"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "919613dcff7bdc38b946ea5f767dec25ee1ed129"
+    "revision": "486bb0337ee94575f53367b53bffeaea99063f2c"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"
@@ -498,7 +498,7 @@
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
   },
   "pascal": {
-    "revision": "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"
+    "revision": "d0ebabefaea9ac3f6fc3004cf08cd121b66da9e4"
   },
   "passwd": {
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
@@ -648,7 +648,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "c694c1b623fa11a6b4f901b4ec713cc2265bebcc"
+    "revision": "999f21869645d2b19465adc912caf83d95f82be0"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -690,7 +690,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "b8175006d9c8120d41cf40a4ef3711bbbbc08973"
+    "revision": "3f51da54347f4561541c71b0d384ca3ef3b38d9d"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -723,7 +723,7 @@
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
   },
   "systemtap": {
-    "revision": "1af543a96d060b1f808982037bfc54cc02218edd"
+    "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "systemverilog": {
     "revision": "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e"

From a8535b2329a082c7f4e0b11b91b1792770425eaa Mon Sep 17 00:00:00 2001
From: Kyle Minshall <kyleminshall@gmail.com>
Date: Thu, 8 Aug 2024 08:35:07 -0700
Subject: [PATCH 1728/2704] fix(install): correct arguments for `string.format`

---
 lua/nvim-treesitter/shell_command_selectors.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index a386226e3..89df8644b 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -307,6 +307,7 @@ function M.select_download_commands(repo, project_name, cache_folder, revision,
         vim.api.nvim_err_writeln(
           string.format(
             "Cannot install %s with git in an active git session. Exit the session and run ':TSInstall %s' manually",
+            project_name,
             project_name
           )
         )

From 3d1f5e7df8d9981ec0bcf4aa635c0cc0a7ee89d9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2024 06:41:57 +0000
Subject: [PATCH 1729/2704] bot(lockfile): update idl, scala

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 141dbaed3..7b17e1dd9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "e2fa5d23a3f1854d5608454ac8773feb181aa0e7"
+    "revision": "4ebc74fa805baec21fca01ff500f986dc0f595c5"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -648,7 +648,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "999f21869645d2b19465adc912caf83d95f82be0"
+    "revision": "be7184df70dd3b5790becfb2c93ba796b2797781"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"

From 176e4464736c1feca190d77f481ed5972b513516 Mon Sep 17 00:00:00 2001
From: Steve Vermeulen <sfvermeulen@gmail.com>
Date: Fri, 9 Aug 2024 21:06:51 +0800
Subject: [PATCH 1730/2704] fix(install): vim.uv compatibility shim for 0.9

---
 lua/nvim-treesitter/shell_command_selectors.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 89df8644b..48f610169 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -1,5 +1,6 @@
 local fn = vim.fn
 local utils = require "nvim-treesitter.utils"
+local uv = vim.uv or vim.loop
 
 -- Convert path for cmd.exe on Windows.
 -- This is needed when vim.opt.shellslash is in use.
@@ -303,7 +304,7 @@ function M.select_download_commands(repo, project_name, cache_folder, revision,
       "GIT_PREFIX",
       "GIT_WORK_TREE",
     } do
-      if vim.uv.os_getenv(k) then
+      if uv.os_getenv(k) then
         vim.api.nvim_err_writeln(
           string.format(
             "Cannot install %s with git in an active git session. Exit the session and run ':TSInstall %s' manually",

From c8f8dd15516e7f8663de2b715797e0c2758ab921 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 06:39:52 +0000
Subject: [PATCH 1731/2704] bot(lockfile): update apex, asm, devicetree, idl,
 julia, soql, sosl, sql

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7b17e1dd9..ddff0a678 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,13 +9,13 @@
     "revision": "31182d43b062a350d4bd2449f2fc0d5654972be9"
   },
   "apex": {
-    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
+    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
   },
   "arduino": {
     "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
   },
   "asm": {
-    "revision": "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"
+    "revision": "2a35fccebcc08aa8b6c7bb3cff1f07cf0f8cff83"
   },
   "astro": {
     "revision": "4be180759ec13651f72bacee65fa477c64222a1a"
@@ -108,7 +108,7 @@
     "revision": "ac0bb849ccd1a923963af47573b5e396736ff582"
   },
   "devicetree": {
-    "revision": "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"
+    "revision": "296b3c294a8bcfca6673296d99f9cd37049b8026"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "4ebc74fa805baec21fca01ff500f986dc0f595c5"
+    "revision": "7412851348d9d8ba93dc6abd5e60aba9b50a4811"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -363,7 +363,7 @@
     "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
   },
   "julia": {
-    "revision": "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"
+    "revision": "a528de39923448e6b809a6b9f686f3472728f202"
   },
   "just": {
     "revision": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"
@@ -678,10 +678,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
+    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
   },
   "sosl": {
-    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
+    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -690,7 +690,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "3f51da54347f4561541c71b0d384ca3ef3b38d9d"
+    "revision": "c67ecbd37d8d12f22e4cc7138afd14bc20253e10"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"

From 9a0db4040363c0dd3a7c78c641ab7e1eddfeb567 Mon Sep 17 00:00:00 2001
From: Xi Xiao <xi.xiao007@gmail.com>
Date: Sat, 10 Aug 2024 11:05:48 +0300
Subject: [PATCH 1732/2704] feat(sflog): add sflog (Salesforce debug log)
 parser and highlights

Co-authored-by: xi xiao <tdxiaoxi2@gmail.com>
---
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua | 15 ++++++++---
 queries/sflog/highlights.scm    | 48 +++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 queries/sflog/highlights.scm

diff --git a/lockfile.json b/lockfile.json
index ddff0a678..eda35ede1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -659,6 +659,9 @@
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
+  "sflog": {
+    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
+  },
   "slang": {
     "revision": "d84b43d75d65bbc4ba57166ce17555f32c0b8983"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 969c75fea..77e059841 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -98,7 +98,7 @@ list.apex = {
     files = { "src/parser.c" },
     location = "apex",
   },
-  maintainers = { "@aheber" },
+  maintainers = { "@aheber", "@xixiaofinland" },
 }
 
 list.arduino = {
@@ -1908,6 +1908,15 @@ list.scss = {
   maintainers = { "@elianiva" },
 }
 
+list.sflog = {
+  install_info = {
+    url = "https://github.com/aheber/tree-sitter-sfapex",
+    files = { "src/parser.c" },
+    location = "sflog",
+  },
+  maintainers = { "@aheber", "@xixiaofinland" },
+}
+
 list.slang = {
   install_info = {
     url = "https://github.com/theHamsta/tree-sitter-slang",
@@ -1966,7 +1975,7 @@ list.soql = {
     files = { "src/parser.c" },
     location = "soql",
   },
-  maintainers = { "@aheber" },
+  maintainers = { "@aheber", "@xixiaofinland" },
 }
 
 list.sosl = {
@@ -1975,7 +1984,7 @@ list.sosl = {
     files = { "src/parser.c" },
     location = "sosl",
   },
-  maintainers = { "@aheber" },
+  maintainers = { "@aheber", "@xixiaofinland" },
 }
 
 list.sourcepawn = {
diff --git a/queries/sflog/highlights.scm b/queries/sflog/highlights.scm
new file mode 100644
index 000000000..8eeee5d24
--- /dev/null
+++ b/queries/sflog/highlights.scm
@@ -0,0 +1,48 @@
+; highlights.scm
+[
+  "|"
+  "|["
+  "]"
+  "("
+  ")"
+  "|("
+  ")|"
+] @punctuation.bracket
+
+[
+  ","
+  ";"
+  ":"
+] @punctuation.delimiter
+
+"EXTERNAL" @keyword
+
+"out of" @property
+
+(number) @number
+
+(identifier) @variable
+
+(version) @string.special
+
+(anonymous_block) @string
+
+(limit) @property
+
+(time) @function
+
+(limit
+  (identifier) @string)
+
+(event_detail
+  (event_detail_value) @string)
+
+(log_level_setting
+  (component) @type)
+
+(log_level_setting
+  (log_level) @constant)
+
+(log_entry
+  (event_identifier
+    (identifier) @type))

From 4d0da6b5ace8cd7b0affeb7e91a4aa28e0f30c10 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 08:06:00 +0000
Subject: [PATCH 1733/2704] bot(readme): update

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6e50e6be6..8e2e992bb 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ada](https://github.com/briot/tree-sitter-ada) (maintained by @briot)
 - [x] [agda](https://github.com/tree-sitter/tree-sitter-agda) (maintained by @Decodetalkers)
 - [x] [angular](https://github.com/dlvandenberg/tree-sitter-angular) (experimental, maintained by @dlvandenberg)
-- [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
+- [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
 - [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
 - [x] [asm](https://github.com/RubixDev/tree-sitter-asm) (maintained by @RubixDev)
 - [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)
@@ -393,14 +393,15 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [scfg](https://github.com/rockorager/tree-sitter-scfg) (maintained by @WhyNotHugo)
 - [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
+- [x] [sflog](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
 - [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
 - [x] [slint](https://github.com/slint-ui/tree-sitter-slint) (maintained by @hunger)
 - [x] [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
 - [ ] [snakemake](https://github.com/osthomas/tree-sitter-snakemake) (experimental)
 - [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)
-- [x] [soql](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
-- [x] [sosl](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber)
+- [x] [soql](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
+- [x] [sosl](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
 - [x] [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) (maintained by @Sarrus1)
 - [x] [sparql](https://github.com/GordianDziwis/tree-sitter-sparql) (maintained by @GordianDziwis)
 - [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)

From 8a966f32c973511f9697264b3533e9846d29fd09 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Aug 2024 08:28:05 +0000
Subject: [PATCH 1734/2704] bot(lockfile): update sflog

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index eda35ede1..1da5ada9c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -660,7 +660,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "caffc6ebd1ab16ba4d4dec367cebb03ca2411872"
+    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
   },
   "slang": {
     "revision": "d84b43d75d65bbc4ba57166ce17555f32c0b8983"

From 079af15600ceaca92e6ce96e40d37955307aa11e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 11 Aug 2024 06:40:15 +0000
Subject: [PATCH 1735/2704] bot(lockfile): update apex, dart, nix, sflog, soql,
 sosl

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1da5ada9c..7d7c3631b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "31182d43b062a350d4bd2449f2fc0d5654972be9"
   },
   "apex": {
-    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
+    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
   },
   "arduino": {
     "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
@@ -105,7 +105,7 @@
     "revision": "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"
   },
   "dart": {
-    "revision": "ac0bb849ccd1a923963af47573b5e396736ff582"
+    "revision": "cf72df5d4a623ca705e81bf9e9d264e1fe9d5da0"
   },
   "devicetree": {
     "revision": "296b3c294a8bcfca6673296d99f9cd37049b8026"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "486bb0337ee94575f53367b53bffeaea99063f2c"
+    "revision": "80b9318aa0e05d9539c7adb74f4aee5cf650a25e"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"
@@ -660,7 +660,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
+    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
   },
   "slang": {
     "revision": "d84b43d75d65bbc4ba57166ce17555f32c0b8983"
@@ -681,10 +681,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
+    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
   },
   "sosl": {
-    "revision": "c47a639e1a0e5407ee39a8761ec1accebe6dacfc"
+    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"

From e5a05ba5e298cc1e1dad8eb8095b8d4d89a7f793 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 11 Aug 2024 08:56:24 -0700
Subject: [PATCH 1736/2704] fix(ini): Fix injection in comments (#7033)

---
 queries/ini/injections.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/ini/injections.scm b/queries/ini/injections.scm
index 2f0e58eb6..8bfeee22d 100644
--- a/queries/ini/injections.scm
+++ b/queries/ini/injections.scm
@@ -1,2 +1,3 @@
-((comment) @injection.content
+((comment
+  (text) @injection.content)
   (#set! injection.language "comment"))

From 047ce49ccf9a2dce22e1cf3843bef3b5682a8144 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 13 Aug 2024 06:42:03 +0000
Subject: [PATCH 1737/2704] bot(lockfile): update groovy, liquid, scala, templ

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7d7c3631b..d3c7b91f2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -267,7 +267,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "105ee343682b7eee86b38ec6858a269e16474a72"
+    "revision": "6b91d508bee2e7679fcdac5312644fc5e5cfacb8"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -399,7 +399,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "7862a3424832c3a9d45eb21143b375837bd6573b"
+    "revision": "f84c94a4c0e93fe1231f6cda9c3a14df9c839ab2"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
@@ -648,7 +648,7 @@
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
   },
   "scala": {
-    "revision": "be7184df70dd3b5790becfb2c93ba796b2797781"
+    "revision": "ae9db4bdea5f90751718f4f9a90551c809d180f7"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -747,7 +747,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "de0d0ee129cf643872e8e0d5c4a6589b5a3aae23"
+    "revision": "4dc2c5e2b5469dc35afc3cfae4c3783d971fd51b"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From db92f60ed0c50e747155d685e977b18327f20b3a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 06:40:49 +0000
Subject: [PATCH 1738/2704] bot(lockfile): update angular

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index d3c7b91f2..9952700ca 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "31182d43b062a350d4bd2449f2fc0d5654972be9"
+    "revision": "660e6c4d0d533da8a1d4faa1bb0870f8ccbdbf92"
   },
   "apex": {
     "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"

From 3de418e73d5b912096229aaeea8bb7aef5094e0d Mon Sep 17 00:00:00 2001
From: Hank Jackson <hjackson277@gmail.com>
Date: Wed, 14 Aug 2024 08:08:32 -0400
Subject: [PATCH 1739/2704] feat(liquid): add highlights (#7035)

---
 queries/liquid/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/liquid/highlights.scm b/queries/liquid/highlights.scm
index 3f49f60a3..17b3d6fe9 100644
--- a/queries/liquid/highlights.scm
+++ b/queries/liquid/highlights.scm
@@ -25,6 +25,7 @@
   "as"
   "assign"
   "capture"
+  (custom_unpaired_statement)
   "decrement"
   "echo"
   "endcapture"
@@ -94,6 +95,7 @@
 
 [
   "include"
+  "include_relative"
   "render"
   "section"
   "sections"

From bfb50de9cb0673a3bff620d881f690fb7e0d1328 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 06:42:33 +0000
Subject: [PATCH 1740/2704] bot(lockfile): update erlang, goctl, liquid, nix

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9952700ca..95451d880 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
   },
   "erlang": {
-    "revision": "8f41b588fe38b981156651ef56b192ed3d158efd"
+    "revision": "0b5a0dcfcedd9b397252cb5568cc55ab1905b1a9"
   },
   "facility": {
     "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
@@ -243,7 +243,7 @@
     "revision": "7ee8d928db5202f6831a78f8112fd693bf69f98b"
   },
   "goctl": {
-    "revision": "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3"
+    "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
   },
   "godot_resource": {
     "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
@@ -399,7 +399,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "f84c94a4c0e93fe1231f6cda9c3a14df9c839ab2"
+    "revision": "5be130ef4308d65bdd3d323dbb8a93e2bd16d623"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "80b9318aa0e05d9539c7adb74f4aee5cf650a25e"
+    "revision": "c00de3108b4f868e83ba67e78550e4829b3de27e"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"

From 59cc5f35656f97bc964229e3ec5066a7b5a8ee5b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 06:40:34 +0000
Subject: [PATCH 1741/2704] bot(lockfile): update jsonnet, liquid, matlab,
 nickel, nix

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 95451d880..8413fc01f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -360,7 +360,7 @@
     "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
   },
   "jsonnet": {
-    "revision": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"
+    "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
     "revision": "a528de39923448e6b809a6b9f686f3472728f202"
@@ -399,7 +399,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "5be130ef4308d65bdd3d323dbb8a93e2bd16d623"
+    "revision": "4c19cc5b2b408de590f83497a90cc941ed59ea06"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
@@ -432,7 +432,7 @@
     "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "matlab": {
-    "revision": "0d5a05e543af2de60cdb5e71f0f5888c95ab936f"
+    "revision": "ad1c471f30ba754578d4b2e27a4c4ec662a10e6f"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -456,7 +456,7 @@
     "revision": "281d184b8240b2b22670b8907b57b6d6842db6f3"
   },
   "nickel": {
-    "revision": "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"
+    "revision": "88d836a24b3b11c8720874a1a9286b8ae838d30a"
   },
   "nim": {
     "revision": "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "c00de3108b4f868e83ba67e78550e4829b3de27e"
+    "revision": "306a0f70a8f398fac921c3b53c15fe3b7304fff3"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"

From 63e1337f1b60c84a4100ebedfb1dc80924c49122 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 06:39:32 +0000
Subject: [PATCH 1742/2704] bot(lockfile): update c, cpp, css, go, idl, nix,
 python, ruby

---
 lockfile.json          | 16 ++++++++--------
 queries/go/indents.scm |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8413fc01f..a866e5358 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "be23d2c9d8e5b550e713ef0f86126a248462ca6e"
+    "revision": "fd3e67ac628c45bdec322c8fcfb65393df0e5307"
   },
   "c_sharp": {
     "revision": "31a64b28292aac6adf44071e449fa03fb80eaf4e"
@@ -87,10 +87,10 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "0b4aa47f07d958a49260aadc87e8474b03897c23"
+    "revision": "6a0007a2ea50be65a682ed726cdeb2ec4d16e76c"
   },
   "css": {
-    "revision": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"
+    "revision": "9af0bdd9d225edee12f489cfa8284e248321959b"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -240,7 +240,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "7ee8d928db5202f6831a78f8112fd693bf69f98b"
+    "revision": "f3904998a3cbe7bffb1dead89542b91509b4a53a"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -324,7 +324,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "7412851348d9d8ba93dc6abd5e60aba9b50a4811"
+    "revision": "5573b295410201ed22771776b34d636900eba368"
   },
   "ini": {
     "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "306a0f70a8f398fac921c3b53c15fe3b7304fff3"
+    "revision": "c8a24d3ce7fc773eafe7d30f3c7131f33f110c50"
   },
   "norg": {
     "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"
@@ -576,7 +576,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "0dee05ef958ba2eae88d1e65f24b33cad70d4367"
+    "revision": "62165d7fd1d6288456c6bb81872bdfc42656e71b"
   },
   "ql": {
     "revision": "42becd6f8f7bae82c818fa3abb1b6ff34b552310"
@@ -642,7 +642,7 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "0ffe457fb6aabf064f173fd30ea356845cef2513"
+    "revision": "390a15b17648ad6311d1c9f76c5086a918739c1a"
   },
   "rust": {
     "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
diff --git a/queries/go/indents.scm b/queries/go/indents.scm
index a4fea2721..28edfe973 100644
--- a/queries/go/indents.scm
+++ b/queries/go/indents.scm
@@ -34,7 +34,7 @@
 (import_spec_list
   ")" @indent.branch)
 
-(var_declaration
+(var_spec_list
   ")" @indent.branch)
 
 [

From 6d74da7f0a29c35ee7636e157e72dd221e8d6197 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Sat, 17 Aug 2024 23:04:32 +0200
Subject: [PATCH 1743/2704] fix(inko): add highlight for boolean patterns
 (#7050)

---
 queries/inko/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
index eff00fc02..589d746ce 100644
--- a/queries/inko/highlights.scm
+++ b/queries/inko/highlights.scm
@@ -141,6 +141,8 @@
 
 (constant_pattern) @constant
 
+(boolean_pattern) @boolean
+
 ; Types
 (generic_type
   name: _ @type)

From 24ddf60d68daa921d4e909d2b6c5b03ef6bce8ce Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 06:40:32 +0000
Subject: [PATCH 1744/2704] bot(lockfile): update go, html, json, python, rust,
 swift, vhs

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a866e5358..7d2b220e2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -240,7 +240,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "f3904998a3cbe7bffb1dead89542b91509b4a53a"
+    "revision": "8c0f0e7a6012283d9f0dd650feb8075ad1ffad5e"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -309,7 +309,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "e4d834eb4918df01dcad5c27d1b15d56e3bd94cd"
+    "revision": "d11201a263d02169d303db903ba0bb13dc59e068"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -351,7 +351,7 @@
     "revision": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14"
   },
   "json": {
-    "revision": "94f5c527b2965465956c2000ed6134dd24daf2a7"
+    "revision": "bdd69eb8c8a58a9f54df03de0488d9990179be46"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -576,7 +576,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "62165d7fd1d6288456c6bb81872bdfc42656e71b"
+    "revision": "55a9b8a4fbfbaf0d10cdd47dd4a9d02606c4c218"
   },
   "ql": {
     "revision": "42becd6f8f7bae82c818fa3abb1b6ff34b552310"
@@ -645,7 +645,7 @@
     "revision": "390a15b17648ad6311d1c9f76c5086a918739c1a"
   },
   "rust": {
-    "revision": "9c84af007b0f144954adb26b3f336495cbb320a7"
+    "revision": "2b43eafe64470846cdaa0eaae1e287c120ee5f03"
   },
   "scala": {
     "revision": "ae9db4bdea5f90751718f4f9a90551c809d180f7"
@@ -720,7 +720,7 @@
     "revision": "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"
   },
   "swift": {
-    "revision": "769bb834feb2947f2c706d82830b0a05958727de"
+    "revision": "bad2e675c58c1f5403bf0914a0f30ac045e9f15b"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -828,7 +828,7 @@
     "revision": "4ab3e251eae8890a020d083d00acd1b8c2653c07"
   },
   "vhs": {
-    "revision": "90028bbadb267ead5b87830380f6a825147f0c0f"
+    "revision": "780a8a21e8e8d85bf2f33f1fef06951b47ccd8ca"
   },
   "vim": {
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"

From ec8776ed9ef56ffe7a61e67b64d5d6b6aba2c631 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Sun, 18 Aug 2024 05:30:04 -0500
Subject: [PATCH 1745/2704] feat(php): php 8.4 support (#6741)

* chore(php): update maintainers

* feat(php): update php rules, highlight imported functions/consts

* feat(php): indent inside property hooks

* chore: update php and php_only revision
---
 README.md                               |  4 +--
 lockfile.json                           |  4 +--
 lua/nvim-treesitter/parsers.lua         |  4 +--
 queries/php_only/highlights.scm         | 25 ++++++++++++++----
 queries/php_only/indents.scm            |  6 ++++-
 queries/php_only/locals.scm             |  2 +-
 tests/indent/php/property-hooks.php     | 13 +++++++++
 tests/indent/php_spec.lua               |  5 ++++
 tests/query/highlights/php/keywords.php | 35 +++++++++++++++++++++++++
 9 files changed, 85 insertions(+), 13 deletions(-)
 create mode 100644 tests/indent/php/property-hooks.php

diff --git a/README.md b/README.md
index 8e2e992bb..721816dcc 100644
--- a/README.md
+++ b/README.md
@@ -343,8 +343,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
 - [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
 - [x] [perl](https://github.com/tree-sitter-perl/tree-sitter-perl) (maintained by @RabbiVeesh, @LeoNerd)
-- [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
-- [x] [php_only](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
+- [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka, @calebdw)
+- [x] [php_only](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka, @calebdw)
 - [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
 - [x] [pioasm](https://github.com/leo60228/tree-sitter-pioasm) (maintained by @leo60228)
 - [x] [po](https://github.com/erasin/tree-sitter-po) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 7d2b220e2..decd07eb9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -510,10 +510,10 @@
     "revision": "3a21d9cb2a20a062c17f8f53d5983fd473c4673c"
   },
   "php": {
-    "revision": "c07d69739ba71b5a449bdbb7735991f8aabf8546"
+    "revision": "71605bf96303144c2ecfc2c0b69d95c716ed9e13"
   },
   "php_only": {
-    "revision": "c07d69739ba71b5a449bdbb7735991f8aabf8546"
+    "revision": "71605bf96303144c2ecfc2c0b69d95c716ed9e13"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 77e059841..67fdb418c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1495,7 +1495,7 @@ list.php = {
     location = "php",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@tk-shirasaka" },
+  maintainers = { "@tk-shirasaka", "@calebdw" },
 }
 
 list.php_only = {
@@ -1504,7 +1504,7 @@ list.php_only = {
     location = "php_only",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@tk-shirasaka" },
+  maintainers = { "@tk-shirasaka", "@calebdw" },
 }
 
 -- Parsers for injections
diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 2b9e4ea95..790bd088f 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -221,10 +221,26 @@
     (name) @type
     (qualified_name
       (name) @type)
+    alias: (name) @type.definition
   ])
 
-(namespace_aliasing_clause
-  (name) @type.definition)
+(namespace_use_clause
+  type: "function"
+  [
+    (name) @function
+    (qualified_name
+      (name) @function)
+    alias: (name) @function
+  ])
+
+(namespace_use_clause
+  type: "const"
+  [
+    (name) @constant
+    (qualified_name
+      (name) @constant)
+    alias: (name) @constant
+  ])
 
 (class_interface_clause
   [
@@ -369,9 +385,8 @@
   name: (namespace_name
     (name) @module))
 
-(namespace_name_as_prefix
-  (namespace_name
-    (name) @module))
+(namespace_name
+  (name) @module)
 
 ; Attributes
 (attribute_list) @attribute
diff --git a/queries/php_only/indents.scm b/queries/php_only/indents.scm
index fef026757..1755d4285 100644
--- a/queries/php_only/indents.scm
+++ b/queries/php_only/indents.scm
@@ -13,12 +13,13 @@
   (match_block)
   (case_statement)
   (default_statement)
+  (property_hook_list)
 ] @indent.begin
 
 (return_statement
   [
     (object_creation_expression)
-    (anonymous_function_creation_expression)
+    (anonymous_function)
     (arrow_function)
     (match_expression)
   ]) @indent.dedent
@@ -49,6 +50,9 @@
 (return_statement
   ";" @indent.end)
 
+(property_hook_list
+  "}" @indent.end)
+
 (ERROR
   "(" @indent.align
   .
diff --git a/queries/php_only/locals.scm b/queries/php_only/locals.scm
index aff2b3dae..6739b383d 100644
--- a/queries/php_only/locals.scm
+++ b/queries/php_only/locals.scm
@@ -12,7 +12,7 @@
   name: (name) @local.definition.function) @local.scope
   (#set! definition.function.scope "parent"))
 
-(anonymous_function_creation_expression
+(anonymous_function
   (anonymous_function_use_clause
     (variable_name
       (name) @local.definition.var))) @local.scope
diff --git a/tests/indent/php/property-hooks.php b/tests/indent/php/property-hooks.php
new file mode 100644
index 000000000..e4aea4fdd
--- /dev/null
+++ b/tests/indent/php/property-hooks.php
@@ -0,0 +1,13 @@
+<?php
+
+class Foo
+{
+    private string $_baz;
+
+    public string $baz {
+        &get => $this->_baz;
+        set {
+            $this->_baz = strtoupper($value);
+        }
+    }
+}
diff --git a/tests/indent/php_spec.lua b/tests/indent/php_spec.lua
index 2a41079ff..c3f84e6e2 100644
--- a/tests/indent/php_spec.lua
+++ b/tests/indent/php_spec.lua
@@ -67,5 +67,10 @@ describe("indent PHP:", function()
     run:new_line("issue-6888.php", { on_line = 6, text = "$a;", indent = 0 })
     run:new_line("issue-6888.php", { on_line = 8, text = "$a;", indent = 4 })
     run:new_line("issue-6888.php", { on_line = 11, text = "$a;", indent = 0 })
+    run:new_line("property-hooks.php", { on_line = 7, text = "get;", indent = 8 })
+    run:new_line("property-hooks.php", { on_line = 8, text = "set;", indent = 8 })
+    run:new_line("property-hooks.php", { on_line = 9, text = "$a;", indent = 12 })
+    run:new_line("property-hooks.php", { on_line = 11, text = "get;", indent = 8 })
+    run:new_line("property-hooks.php", { on_line = 12, text = "get;", indent = 4 })
   end)
 end)
diff --git a/tests/query/highlights/php/keywords.php b/tests/query/highlights/php/keywords.php
index f3d3f95a7..6b938c43f 100644
--- a/tests/query/highlights/php/keywords.php
+++ b/tests/query/highlights/php/keywords.php
@@ -1,5 +1,40 @@
 <?php
 
+namespace Foo\Bar;
+//^^^^^^^ @keyword.type
+//        ^^^ @module
+//            ^^^ @module
+
+use Foo\Baz as Baaz;
+//^ @keyword.import
+//  ^^^ @module
+//      ^^^ @type
+//          ^^ @keyword.operator
+//             ^^^^ @type.definition
+
+use function Foo\foo as fooo;
+//  ^^^^^^^^ @keyword.function
+//               ^^^ @function
+//                      ^^^^ @function
+
+use const Foo\FOO as FOOO;
+//  ^^^^^ @keyword.modifier
+//            ^^^ @constant
+//                   ^^^^ @constant
+
+use Foo\Baz\{
+//  ^^^ @module
+//      ^^^ @module
+  Bar,
+//^^^ @type
+  function foo,
+//^^^^^^^^ @keyword.function
+//         ^^^ @function
+  const FOO,
+//^^^^^ @keyword.modifier
+//      ^^^ @constant
+};
+
 abstract class A
 {
   protected readonly static $a;

From 26e7fdb24348e584ceb00a1291f971c4b66325b6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 06:42:58 +0000
Subject: [PATCH 1746/2704] bot(lockfile): update c, comment, cpp,
 embedded_template, kotlin, latex, php, php_only, ruby, scala, templ

---
 lockfile.json                 | 22 +++++++++++-----------
 queries/kotlin/highlights.scm |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index decd07eb9..4e90e84b8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "fd3e67ac628c45bdec322c8fcfb65393df0e5307"
+    "revision": "927da1f210ebb24b7f109230a61a55b428875985"
   },
   "c_sharp": {
     "revision": "31a64b28292aac6adf44071e449fa03fb80eaf4e"
@@ -72,7 +72,7 @@
     "revision": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"
   },
   "comment": {
-    "revision": "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"
+    "revision": "ca6ef6c8ae0f1970d7e691d47f75ccca884a6060"
   },
   "commonlisp": {
     "revision": "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "6a0007a2ea50be65a682ed726cdeb2ec4d16e76c"
+    "revision": "b1a4e2b25148f3cfcb5f241cbc4c49f001a6fb35"
   },
   "css": {
     "revision": "9af0bdd9d225edee12f489cfa8284e248321959b"
@@ -162,7 +162,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "38d5004a797298dc42c85e7706c5ceac46a3f29f"
+    "revision": "ffbf64942c334933ee7982e144557b6efb76d0b9"
   },
   "erlang": {
     "revision": "0b5a0dcfcedd9b397252cb5568cc55ab1905b1a9"
@@ -375,7 +375,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5"
+    "revision": "dc5e8a14cb1f45582a8c221a270a199a5f8bdb63"
   },
   "koto": {
     "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
@@ -387,7 +387,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "efe5afdbb59b70214e6d70db5197dc945d5b213e"
+    "revision": "90fd9894bebddce79f5b8041e7f82523364a619b"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -510,10 +510,10 @@
     "revision": "3a21d9cb2a20a062c17f8f53d5983fd473c4673c"
   },
   "php": {
-    "revision": "71605bf96303144c2ecfc2c0b69d95c716ed9e13"
+    "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"
   },
   "php_only": {
-    "revision": "71605bf96303144c2ecfc2c0b69d95c716ed9e13"
+    "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
@@ -642,13 +642,13 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "390a15b17648ad6311d1c9f76c5086a918739c1a"
+    "revision": "7dbc1e2d0e2d752577655881f73b4573f3fe85d4"
   },
   "rust": {
     "revision": "2b43eafe64470846cdaa0eaae1e287c120ee5f03"
   },
   "scala": {
-    "revision": "ae9db4bdea5f90751718f4f9a90551c809d180f7"
+    "revision": "dd7fe4d7838ca751f5259718658dd309d999855b"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -747,7 +747,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "4dc2c5e2b5469dc35afc3cfae4c3783d971fd51b"
+    "revision": "7e878d63a25c27c9c151303129b0b8c04b075890"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index a53fd3a04..8eda6ef61 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -177,7 +177,7 @@
 ] @number
 
 [
-  "null"
+  (null_literal)
   ; should be highlighted the same as booleans
   (boolean_literal)
 ] @boolean

From 1e860567fbc19f117a03c0d2c46dcc01325c1b8b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 19 Aug 2024 09:54:50 +0200
Subject: [PATCH 1747/2704] chore: remove obsolete CODEOWNERS

---
 .github/CODEOWNERS | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index 8fcb7cd9e..000000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,7 +0,0 @@
-/lua/nvim-treesitter/textobjects/ @theHamsta
-/lua/nvim-treesitter/incremental_selection.lua @theHamsta
-
-/lua/nvim-treesitter/fold.lua @vigoux
-/lua/nvim-treesitter/highlight.lua @vigoux
-
-/lua/nvim-treesitter/refactor/ @steelsojka

From cfd2095e66e49ea0dfbef6b41be2efd0ba6cc4ee Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 06:42:09 +0000
Subject: [PATCH 1748/2704] bot(lockfile): update groovy, matlab

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4e90e84b8..5b2c03796 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -267,7 +267,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "6b91d508bee2e7679fcdac5312644fc5e5cfacb8"
+    "revision": "171b3b7412bc93284fc0dad0a7a7bbbbd1b51289"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -432,7 +432,7 @@
     "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "matlab": {
-    "revision": "ad1c471f30ba754578d4b2e27a4c4ec662a10e6f"
+    "revision": "e770bddc7bfc938f24d06dd98dcbfe3469fcece4"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"

From 6699eae8ba4551fe927da0f0f3f61ae085f836aa Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 20 Aug 2024 19:49:18 +0200
Subject: [PATCH 1749/2704] Revert "ci: skip updates for javascript"

This reverts commit a7a3b9c10e8a5fe0da05ebb65db3ed1d164e612d.
---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 8d721fa35..b994622bf 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "javascript"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 0fd6d324828952eaa4596d0d3d8043acc401bc05 Mon Sep 17 00:00:00 2001
From: Alejandro <bloodbathalchemist@protonmail.com>
Date: Wed, 21 Aug 2024 03:08:45 -0400
Subject: [PATCH 1750/2704] feat(http): switch to new parser version (#7063)

---
 lockfile.json               |  2 +-
 queries/http/highlights.scm | 56 +++++++++++++++----------------------
 queries/http/injections.scm | 19 ++++++++++---
 3 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5b2c03796..d4301beed 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "5ae6c7cfa62a7d7325c26171a1de4f6b866702b5"
+    "revision": "b88cd0c7dba0128b8f28fcb25cca13eea0d193b3"
   },
   "hurl": {
     "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index efa77d27e..76d62778c 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -1,50 +1,36 @@
-; Keywords
-(scheme) @module
-
 ; Methods
 (method) @function.method
 
 ; Headers
 (header
-  name: (name) @constant)
+  name: (_) @constant)
 
 ; Variables
 (variable_declaration
   name: (identifier) @variable)
 
-; Fields
-(pair
-  name: (identifier) @variable.member)
-
-; URL / Host
-(host) @string.special.url
-
-(path
-  (identifier) @string.special.url)
-
-; Parameters
-(query_param
-  (key) @variable.parameter)
-
 ; Operators
-[
-  "="
-  "?"
-  "&"
-  "@"
-  "<"
-] @operator
+(comment
+  "=" @operator)
+
+(variable_declaration
+  "=" @operator)
+
+; keywords
+(comment
+  "@" @keyword
+  name: (_) @keyword)
 
 ; Literals
-(target_url) @string.special.url
+(request
+  url: (_) @string.special.url)
 
 (http_version) @constant
 
-(string) @string
+; Response
+(status_code) @number
 
-(number) @number
-
-(boolean) @boolean
+(status_text) @string
 
 ; Punctuation
 [
@@ -52,11 +38,15 @@
   "}}"
 ] @punctuation.bracket
 
-":" @punctuation.delimiter
+(header
+  ":" @punctuation.delimiter)
 
 ; external JSON body
 (external_body
-  file_path: (path) @string.special.path)
+  path: (_) @string.special.path)
 
 ; Comments
-(comment) @comment @spell
+[
+  (comment)
+  (request_separator)
+] @comment @spell
diff --git a/queries/http/injections.scm b/queries/http/injections.scm
index 68268afcb..0eebd0fae 100644
--- a/queries/http/injections.scm
+++ b/queries/http/injections.scm
@@ -9,9 +9,20 @@
 ((xml_body) @injection.content
   (#set! injection.language "xml"))
 
-((graphql_body) @injection.content
+((graphql_data) @injection.content
   (#set! injection.language "graphql"))
 
-; Lua scripting
-((script_variable) @injection.content
-  (#set! injection.language "lua"))
+; Script (default to javascript)
+((script) @injection.content
+  (#offset! @injection.content 0 2 0 -2)
+  (#set! injection.language "javascript"))
+
+; Script with other languages
+((comment
+  name: (_) @_name
+  (#eq? @_name "lang")
+  value: (_) @injection.language)
+  .
+  (_
+    (script) @injection.content
+    (#offset! @injection.content 0 2 0 -2)))

From 0b8b78f9d08dc338a146eb4cd4bcbed8dd36a783 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 21 Aug 2024 07:10:51 +0000
Subject: [PATCH 1751/2704] bot(lockfile): update cuda, glimmer, javascript,
 matlab, styled, templ

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d4301beed..944eaf867 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "7c97acb8398734d790c86210c53c320df61ff66b"
+    "revision": "22ad3429b839d5ab23b74ce3d77b61b3b5395abb"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -228,7 +228,7 @@
     "revision": "426e67087fd62be5f4533581b5916b2cf010fb5b"
   },
   "glimmer": {
-    "revision": "6b25d265c990139353e1f7f97baf84987ebb7bf0"
+    "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
   },
   "glsl": {
     "revision": "ddc3137a2d775aca93084ff997fa13cc1691058a"
@@ -342,7 +342,7 @@
     "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
   },
   "javascript": {
-    "revision": "12e45374422f6051648717be62f0ffc40a279ee2"
+    "revision": "15887341e5b57ffdb423aff840aef142b8f53d6d"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -432,7 +432,7 @@
     "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
   },
   "matlab": {
-    "revision": "e770bddc7bfc938f24d06dd98dcbfe3469fcece4"
+    "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -708,7 +708,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "65835cca33a5f033bcde580ed66cde01c1fabbbe"
+    "revision": "e8bf912db4996b32515639d42fe2b258517f135e"
   },
   "supercollider": {
     "revision": "affa4389186b6939d89673e1e9d2b28364f5ca6f"
@@ -747,7 +747,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "7e878d63a25c27c9c151303129b0b8c04b075890"
+    "revision": "58aed18580c476d7bc211f187e7b07a6cd12bb1f"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From 6ed65c3a1d0ebc1813a0fcec3d930c149dcf00aa Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 06:41:37 +0000
Subject: [PATCH 1752/2704] bot(lockfile): update perl

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 944eaf867..b50658327 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "3a21d9cb2a20a062c17f8f53d5983fd473c4673c"
+    "revision": "18f855fcac9a2aa055ffb9f1a0b29d2db3e2f514"
   },
   "php": {
     "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"

From 8724e7d028ba11604dde94dc4be63f70cccf16e0 Mon Sep 17 00:00:00 2001
From: Tobias Schmitz <tobiasschmitz2001@gmail.com>
Date: Thu, 22 Aug 2024 02:13:46 +0200
Subject: [PATCH 1753/2704] feat(rust): add highlight for
 shorthand_field_identifier

---
 queries/rust/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index f411dda40..046b541d1 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -23,6 +23,8 @@
 
 (field_identifier) @variable.member
 
+(shorthand_field_identifier) @variable.member
+
 (shorthand_field_initializer
   (identifier) @variable.member)
 

From 04401b5dd17c3419dae5141677bd256f52d54733 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 06:40:54 +0000
Subject: [PATCH 1754/2704] bot(lockfile): update angular, apex, cuda, http,
 norg, sflog, soql, sosl, swift

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b50658327..6a352d76a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,10 +6,10 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "660e6c4d0d533da8a1d4faa1bb0870f8ccbdbf92"
+    "revision": "c2d1f6d4c5f1993afce7f984ca2675af8d67457c"
   },
   "apex": {
-    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
+    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "arduino": {
     "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
@@ -96,7 +96,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "22ad3429b839d5ab23b74ce3d77b61b3b5395abb"
+    "revision": "8812343a1f8496fc219f3d07a270f9c1d6ba3391"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -315,7 +315,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "b88cd0c7dba0128b8f28fcb25cca13eea0d193b3"
+    "revision": "bbcd67642e5749b90277c353b72e762f3be16993"
   },
   "hurl": {
     "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
@@ -471,7 +471,7 @@
     "revision": "c8a24d3ce7fc773eafe7d30f3c7131f33f110c50"
   },
   "norg": {
-    "revision": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"
+    "revision": "1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -660,7 +660,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
+    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "slang": {
     "revision": "d84b43d75d65bbc4ba57166ce17555f32c0b8983"
@@ -681,10 +681,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
+    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "sosl": {
-    "revision": "9fe5d1fbfd75c11ba48a32db27ac0ed5da57ec78"
+    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -720,7 +720,7 @@
     "revision": "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"
   },
   "swift": {
-    "revision": "bad2e675c58c1f5403bf0914a0f30ac045e9f15b"
+    "revision": "261d880b081def748da113262a96279ff4fffeb1"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 0f6be799628589c2576194f5735924138f537c2f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 24 Aug 2024 06:39:35 +0000
Subject: [PATCH 1755/2704] bot(lockfile): update java, nix, perl, pod

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6a352d76a..f81fbb09e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -339,7 +339,7 @@
     "revision": "ea842cb57a90865c8f50bcb4499de1a94860f3a4"
   },
   "java": {
-    "revision": "953abfc8bb3eb2f578e1f461edba4a9885f974b8"
+    "revision": "576d8097e495b411f31daaee28cb34c1752ac702"
   },
   "javascript": {
     "revision": "15887341e5b57ffdb423aff840aef142b8f53d6d"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "c8a24d3ce7fc773eafe7d30f3c7131f33f110c50"
+    "revision": "0553955c53f564e5205f4f187d94973078c05ee7"
   },
   "norg": {
     "revision": "1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612"
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "18f855fcac9a2aa055ffb9f1a0b29d2db3e2f514"
+    "revision": "e78a161d5b1f3d0c7ebe439bfc6b2dff6f530ea8"
   },
   "php": {
     "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"
@@ -525,7 +525,7 @@
     "revision": "bd860a0f57f697162bf28e576674be9c1500db5e"
   },
   "pod": {
-    "revision": "39da859947b94abdee43e431368e1ae975c0a424"
+    "revision": "0bf8387987c21bf2f8ed41d2575a8f22b139687f"
   },
   "poe_filter": {
     "revision": "592476d81f95d2451f2ca107dc872224c76fecdf"

From e085c614fcd716eedb8e2e55bae2ccad4becd40d Mon Sep 17 00:00:00 2001
From: Novus Nota <68142933+novusnota@users.noreply.github.com>
Date: Sat, 24 Aug 2024 15:08:40 +0200
Subject: [PATCH 1756/2704] feat(tact): update parser and queries

---
 lockfile.json               | 2 +-
 queries/tact/highlights.scm | 4 ----
 queries/tact/locals.scm     | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f81fbb09e..c67cf73bd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -738,7 +738,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "91cc49a83f4f0b3a756bf7d0e65403a9cf757003"
+    "revision": "f264041de35b9e89393169dc464cfd9d3a5c750b"
   },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
diff --git a/queries/tact/highlights.scm b/queries/tact/highlights.scm
index d5bec39fa..13afd9a3c 100644
--- a/queries/tact/highlights.scm
+++ b/queries/tact/highlights.scm
@@ -138,10 +138,6 @@
 (instance_argument
   name: (identifier) @variable.member)
 
-(lvalue
-  (_)
-  (_) @variable.member)
-
 (field_access_expression
   name: (identifier) @variable.member)
 
diff --git a/queries/tact/locals.scm b/queries/tact/locals.scm
index 0c1522606..d580d6a7e 100644
--- a/queries/tact/locals.scm
+++ b/queries/tact/locals.scm
@@ -71,5 +71,5 @@
 (value_expression
   (identifier) @local.reference)
 
-(lvalue
-  (identifier) @local.reference)
+(field_access_expression
+  name: (identifier) @local.reference)

From 081dfa6e0f72f0440aefd808a46ea9e4ae48d263 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 06:39:31 +0000
Subject: [PATCH 1757/2704] bot(lockfile): update comment, perl, qmljs, swift,
 tact, vhs

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c67cf73bd..1c320bd12 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"
   },
   "comment": {
-    "revision": "ca6ef6c8ae0f1970d7e691d47f75ccca884a6060"
+    "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
   },
   "commonlisp": {
     "revision": "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "e78a161d5b1f3d0c7ebe439bfc6b2dff6f530ea8"
+    "revision": "ad69b44c32dc099e8dc90322fe52fe1d0206ce5f"
   },
   "php": {
     "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"
@@ -585,7 +585,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "febf48a5b6928600cd8fb2a01254743af550780d"
+    "revision": "cc4186f15e2829385be33440561fdd17b1c40cf7"
   },
   "query": {
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
@@ -720,7 +720,7 @@
     "revision": "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"
   },
   "swift": {
-    "revision": "261d880b081def748da113262a96279ff4fffeb1"
+    "revision": "d627a54d7266f0a8ee61b447b34d0ad07dadf1d6"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -738,7 +738,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "f264041de35b9e89393169dc464cfd9d3a5c750b"
+    "revision": "b3710fe2723bd9b285de7f3d0c0717bebf3f17bd"
   },
   "tcl": {
     "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
@@ -828,7 +828,7 @@
     "revision": "4ab3e251eae8890a020d083d00acd1b8c2653c07"
   },
   "vhs": {
-    "revision": "780a8a21e8e8d85bf2f33f1fef06951b47ccd8ca"
+    "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"
   },
   "vim": {
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"

From bef7ec6f7a01ba0717da73082e33c224bdc2ddcc Mon Sep 17 00:00:00 2001
From: LeviOP <l3viop@gmail.com>
Date: Sat, 24 Aug 2024 13:09:11 -0500
Subject: [PATCH 1758/2704] feat(proto): add indents

---
 queries/proto/indents.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 queries/proto/indents.scm

diff --git a/queries/proto/indents.scm b/queries/proto/indents.scm
new file mode 100644
index 000000000..4307b2a19
--- /dev/null
+++ b/queries/proto/indents.scm
@@ -0,0 +1,11 @@
+[
+  (message_body)
+  (enum_body)
+] @indent.begin
+
+"}" @indent.end @indent.branch
+
+[
+  (ERROR)
+  (comment)
+] @indent.auto

From 39023b61d2eade04810b2188b2f3d4917b2886de Mon Sep 17 00:00:00 2001
From: Dimitris Dimitropoulos <dimitris.dimitropoulos00@gmail.com>
Date: Sun, 25 Aug 2024 23:10:09 +0300
Subject: [PATCH 1759/2704] feat(matlab): capture comment sections

Signed-off-by: Dimitris Dimitropoulos <dimitris.dimitropoulos00@gmail.com>
---
 queries/matlab/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/matlab/highlights.scm b/queries/matlab/highlights.scm
index 2740ef054..d2ab6053e 100644
--- a/queries/matlab/highlights.scm
+++ b/queries/matlab/highlights.scm
@@ -211,3 +211,6 @@
   (comment)
   (line_continuation)
 ] @comment @spell
+
+((comment) @keyword.directive
+  (#lua-match? @keyword.directive "^%%%% "))

From 397982d197768ebdefc0e2db396d95c4d371ca86 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 25 Aug 2024 13:42:49 -0700
Subject: [PATCH 1760/2704] chore: remove r locals executable status

---
 queries/r/locals.scm | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 queries/r/locals.scm

diff --git a/queries/r/locals.scm b/queries/r/locals.scm
old mode 100755
new mode 100644

From f9b76256c3f995d9275db7018046aeb1643eb2a5 Mon Sep 17 00:00:00 2001
From: r001 <rob@nyar.eu>
Date: Mon, 26 Aug 2024 01:24:54 -0300
Subject: [PATCH 1761/2704] feat(leo): async keyword (#7083)

* async keyword added

* lockfile update
---
 lockfile.json              | 2 +-
 queries/leo/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 1c320bd12..08ca3d152 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -393,7 +393,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "304611b5eaf53aca07459a0a03803b83b6dfd3b3"
+    "revision": "2ce5d9c7a66430aeb1c500275fae7a32f60913a2"
   },
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 67a398d6c..e34b9942d 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -31,6 +31,8 @@
 
 "self" @variable.builtin
 
+"async" @keyword.coroutine
+
 [
   "finalize"
   "function"

From 86a9b67f1a9a072e1eb380d511b3aea29e015ba2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 06:42:25 +0000
Subject: [PATCH 1762/2704] bot(lockfile): update asm, gotmpl, helm, leo, perl

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 08ca3d152..bea907a3b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
   },
   "asm": {
-    "revision": "2a35fccebcc08aa8b6c7bb3cff1f07cf0f8cff83"
+    "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
   },
   "astro": {
     "revision": "4be180759ec13651f72bacee65fa477c64222a1a"
@@ -255,7 +255,7 @@
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gotmpl": {
-    "revision": "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"
+    "revision": "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -291,7 +291,7 @@
     "revision": "6dd0303acf7138dd2b9b432a229e16539581c701"
   },
   "helm": {
-    "revision": "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"
+    "revision": "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -393,7 +393,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "2ce5d9c7a66430aeb1c500275fae7a32f60913a2"
+    "revision": "f5ecaaa869a845e689399092cb9a61feca66cf12"
   },
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "ad69b44c32dc099e8dc90322fe52fe1d0206ce5f"
+    "revision": "55fb764e6a94512ceeaa1b9e4d53f6103e0610b2"
   },
   "php": {
     "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"

From d0c5116fa0f34bbf11714ec5a1ec33ceab8b049e Mon Sep 17 00:00:00 2001
From: r001 <rob@nyar.eu>
Date: Mon, 26 Aug 2024 04:37:52 -0300
Subject: [PATCH 1763/2704] feat(leo): add string literals (#7084)

---
 queries/leo/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index e34b9942d..e33aed7bc 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -191,4 +191,6 @@
   (unsigned_literal)
 ] @number
 
+(string_literal) @string
+
 (annotation) @attribute

From 54becf661a12598fa9a9244cdeadb0e162daf335 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 25 Aug 2024 15:55:38 -0700
Subject: [PATCH 1764/2704] feat(make): highlight more special characters

---
 queries/make/highlights.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index 1a3cac749..afdfbe336 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -114,6 +114,22 @@
     ")"
   ] @operator)
 
+(automatic_variable
+  "$"
+  _ @character.special
+  (#set! priority 105))
+
+(automatic_variable
+  [
+    "$"
+    "("
+    ")"
+  ] @operator
+  (#set! priority 105))
+
+(recipe_line
+  "@" @character.special)
+
 (function_call
   [
     "subst"

From 7499f7379459db3b31c75cf5cec45f785be6e2c7 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 25 Aug 2024 15:12:57 -0700
Subject: [PATCH 1765/2704] feat(ruby): string/punctuation highlight
 improvements

---
 queries/ruby/highlights.scm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 6ea2eab02..c3b9c6cb1 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -172,10 +172,10 @@
 ;  (#is-not? local))
 ; Literals
 [
-  (string)
-  (bare_string)
-  (subshell)
-  (heredoc_body)
+  (string_content)
+  (heredoc_content)
+  "\""
+  "`"
 ] @string
 
 [
@@ -190,11 +190,8 @@
   (hash_key_symbol)
 ] @string.special.symbol
 
-(pair
-  key: (hash_key_symbol)
-  ":" @constant)
-
-(regex) @string.regexp
+(regex
+  (string_content) @string.regexp)
 
 (escape_sequence) @string.escape
 
@@ -276,8 +273,15 @@
   ";"
   "."
   "&."
+  "::"
 ] @punctuation.delimiter
 
+(regex
+  "/" @punctuation.bracket)
+
+(pair
+  ":" @punctuation.delimiter)
+
 [
   "("
   ")"
@@ -289,6 +293,9 @@
   "%i("
 ] @punctuation.bracket
 
+(block_parameters
+  "|" @punctuation.bracket)
+
 (interpolation
   "#{" @punctuation.special
-  "}" @punctuation.special) @none
+  "}" @punctuation.special)

From aaa119cb1c09e1fb0b1eb17f6a7185d21bcef2d3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Aug 2024 06:42:43 +0000
Subject: [PATCH 1766/2704] bot(lockfile): update go, janet_simple, mlir, nix,
 python, slint, sql, v

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bea907a3b..66d0fb6cd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -240,7 +240,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "8c0f0e7a6012283d9f0dd650feb8075ad1ffad5e"
+    "revision": "6204b7308a32e991a8daed2e9895a90be55a510a"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -336,7 +336,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "ea842cb57a90865c8f50bcb4499de1a94860f3a4"
+    "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
     "revision": "576d8097e495b411f31daaee28cb34c1752ac702"
@@ -444,7 +444,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "affbd6f3b08155826a22cfa8373147acbf60f1f1"
+    "revision": "fd8cbd544bdff4acdfe1da63b403b5c591059aeb"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -468,7 +468,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "0553955c53f564e5205f4f187d94973078c05ee7"
+    "revision": "537095ddc80cf610fa75a2a0149fe9799b011014"
   },
   "norg": {
     "revision": "1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612"
@@ -576,7 +576,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "55a9b8a4fbfbaf0d10cdd47dd4a9d02606c4c218"
+    "revision": "346fa42dc2990d2a2736cc60891369d0d3d8e65c"
   },
   "ql": {
     "revision": "42becd6f8f7bae82c818fa3abb1b6ff34b552310"
@@ -666,7 +666,7 @@
     "revision": "d84b43d75d65bbc4ba57166ce17555f32c0b8983"
   },
   "slint": {
-    "revision": "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74"
+    "revision": "34ccfd58d3baee7636f62d9326f32092264e8407"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -693,7 +693,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "c67ecbd37d8d12f22e4cc7138afd14bc20253e10"
+    "revision": "a8b10c76759a372d0f92bb070b4f5c993e0ce5f9"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -813,7 +813,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "7f80a0441ff2ca6aa8ced8e1ee87cead9dd26515"
+    "revision": "a18d695ec105f0cda1903d1974f493207e122b35"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 2eb50352c039009cf046f43241b649b162ee5148 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 27 Aug 2024 14:29:54 +0200
Subject: [PATCH 1767/2704] ci: bump stylua-action to v4

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7123332b7..cd0e51982 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Lint with stylua
-        uses: JohnnyMorganz/stylua-action@v3
+        uses: JohnnyMorganz/stylua-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: latest

From 5071ca777ce37df866305cbd272cd4ef7c30624a Mon Sep 17 00:00:00 2001
From: r001 <rob@nyar.eu>
Date: Wed, 28 Aug 2024 04:51:27 -0300
Subject: [PATCH 1768/2704] fix(leo): update queries (#7086)

* small bugfixes of variables, records, and struct highlighting

* lockfile.json update

* fixed @constant bug, and added self.address, and network.id as builtins to highlight

* fixed associated function calls
---
 lockfile.json              |  2 +-
 queries/leo/highlights.scm | 35 ++++++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 66d0fb6cd..e7c370f9c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -393,7 +393,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "f5ecaaa869a845e689399092cb9a61feca66cf12"
+    "revision": "07fbb1d1dd193cf9995945e5412aff61c95c67e0"
   },
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index e33aed7bc..53db26ab5 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -1,7 +1,3 @@
-(variable_identifier) @variable
-
-(constant_identifier) @constant
-
 [
   "assert"
   "assert_eq"
@@ -31,6 +27,8 @@
 
 "self" @variable.builtin
 
+"network" @variable.builtin
+
 "async" @keyword.coroutine
 
 [
@@ -115,7 +113,15 @@
 (boolean_literal) @boolean
 
 (constant_declaration
-  (identifier) @constant)
+  (identifier
+    (constant_identifier) @constant))
+
+(variable
+  (constant_identifier) @constant)
+
+(associated_constant) @constant
+
+(variable) @variable
 
 [
   (program_id)
@@ -124,7 +130,7 @@
 
 ;record declaration
 (record_declaration
-  (identifier) @variable.member)
+  (identifier) @type.definition)
 
 ;struct component
 (struct_component_declaration
@@ -132,18 +138,26 @@
 
 (type) @type
 
-(associated_constant) @constant
-
 [
   (block_height)
+  (self_address)
   (self_caller)
   (self_signer)
+  (network_id)
 ] @constant.builtin
 
 (free_function_call
   (locator
     (identifier) @function))
 
+(associated_function_call
+  (named_type
+    (identifier
+      (constant_identifier) @function)))
+
+(associated_function_call
+  (identifier) @function.call)
+
 (record_type
   (locator
     (identifier) @variable.member))
@@ -173,11 +187,10 @@
   (identifier) @variable.parameter)
 
 (struct_declaration
-  name: (identifier) @variable.member)
+  name: (identifier) @type.definition)
 
 (variable_declaration
-  (identifier_or_identifiers
-    (identifier) @variable))
+  (identifier) @variable)
 
 [
   (address_literal)

From 39490604b064a930b37f2bbd092fc40c43965e79 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 07:53:32 +0000
Subject: [PATCH 1769/2704] bot(lockfile): update editorconfig, fortran, php,
 php_only

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e7c370f9c..68dcc0e04 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "fd0d64d2fc91eab903bed4c11ce280b62e46f16e"
+    "revision": "faf014c607f912ff666b20183d32a03dcfc3111d"
   },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
@@ -192,7 +192,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "6b633433fb3f132f21250cf8e8be76d5a6389b7e"
+    "revision": "8f842945abefb76b9a68c0835619b37060b8f098"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -510,10 +510,10 @@
     "revision": "55fb764e6a94512ceeaa1b9e4d53f6103e0610b2"
   },
   "php": {
-    "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"
+    "revision": "d13c91bc48aedf7db8240c52503eee694134ec53"
   },
   "php_only": {
-    "revision": "a552625b56c19006932cff1f207ebc07b55ed12d"
+    "revision": "d13c91bc48aedf7db8240c52503eee694134ec53"
   },
   "phpdoc": {
     "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"

From 7a64148896289a91cb2a92e9da3f76d5512a3fb8 Mon Sep 17 00:00:00 2001
From: gh-liu <liugh.cs@gmail.com>
Date: Wed, 28 Aug 2024 11:23:34 +0800
Subject: [PATCH 1770/2704] feat(diff): add folds

---
 queries/diff/folds.scm | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 queries/diff/folds.scm

diff --git a/queries/diff/folds.scm b/queries/diff/folds.scm
new file mode 100644
index 000000000..3560abb3e
--- /dev/null
+++ b/queries/diff/folds.scm
@@ -0,0 +1,5 @@
+[
+  (block)
+  (hunks)
+  (hunk)
+] @fold

From 585860a1865853d2c287c8ef534297da8115818e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 06:42:27 +0000
Subject: [PATCH 1771/2704] bot(lockfile): update angular, mlir

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 68dcc0e04..4420a8132 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "c2d1f6d4c5f1993afce7f984ca2675af8d67457c"
+    "revision": "c473dbc54ca27f95d8928cfdb2a1a79300e16951"
   },
   "apex": {
     "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
@@ -444,7 +444,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "fd8cbd544bdff4acdfe1da63b403b5c591059aeb"
+    "revision": "02af5a1a1cfa69a094e3136b10dfb602f968232e"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"

From ba921c9aef386ad895b0a6551968126ff90a288d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 29 Aug 2024 22:37:17 -0400
Subject: [PATCH 1772/2704] feat!: switch upstream Zig parser

The new parser is faster, does not lag while editing, correctly parses
the entire Zig code base, and is much easier to write queries for.
---
 README.md                       |   2 +-
 lockfile.json                   |   2 +-
 lua/nvim-treesitter/parsers.lua |   4 +-
 queries/zig/folds.scm           |  33 ++--
 queries/zig/highlights.scm      | 310 ++++++++++++++++++--------------
 queries/zig/indents.scm         |  15 +-
 queries/zig/injections.scm      |  14 +-
 7 files changed, 217 insertions(+), 163 deletions(-)

diff --git a/README.md b/README.md
index 721816dcc..bcce59334 100644
--- a/README.md
+++ b/README.md
@@ -464,7 +464,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)
 - [x] [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) (maintained by @Freed-Wu)
-- [x] [zig](https://github.com/maxxnino/tree-sitter-zig) (maintained by @maxxnino)
+- [x] [zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) (maintained by @amaanq)
 <!--parserinfo-->
 
 For related information on the supported languages, including related plugins, see [this wiki page](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Supported-Languages-Information).
diff --git a/lockfile.json b/lockfile.json
index 4420a8132..33f87d99d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -873,6 +873,6 @@
     "revision": "0554b4a5d313244b7fc000cbb41c04afae4f4e31"
   },
   "zig": {
-    "revision": "2bac4cc6c697d46a193905fef6d003bfa0bfabfd"
+    "revision": "21e2218e0ec7f4e3c0640d16bf8c67e6f0a61e18"
   }
 }
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 67fdb418c..419f34db0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2508,10 +2508,10 @@ list.zathurarc = {
 
 list.zig = {
   install_info = {
-    url = "https://github.com/maxxnino/tree-sitter-zig",
+    url = "https://github.com/tree-sitter-grammars/tree-sitter-zig",
     files = { "src/parser.c" },
   },
-  maintainers = { "@maxxnino" },
+  maintainers = { "@amaanq" },
 }
 
 list.templ = {
diff --git a/queries/zig/folds.scm b/queries/zig/folds.scm
index 6953091be..6be5c62ba 100644
--- a/queries/zig/folds.scm
+++ b/queries/zig/folds.scm
@@ -1,14 +1,23 @@
 [
-  (Block)
-  (ContainerDecl)
-  (SwitchExpr)
-  (InitList)
-  (AsmExpr)
-  (ErrorSetDecl)
-  (LINESTRING)
-  [
-    (IfPrefix)
-    (WhilePrefix)
-    (ForPrefix)
-  ]
+  (block)
+  (switch_expression)
+  (initializer_list)
+  (asm_expression)
+  (multiline_string)
+  (if_statement)
+  (while_statement)
+  (for_statement)
+  (if_expression)
+  (else_clause)
+  (for_expression)
+  (while_expression)
+  (if_type_expression)
+  (function_signature)
+  (parameters)
+  (call_expression)
+  (struct_declaration)
+  (opaque_declaration)
+  (enum_declaration)
+  (union_declaration)
+  (error_set_declaration)
 ] @fold
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index d0f6e5b79..1f9006781 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -1,104 +1,116 @@
-(line_comment) @comment @spell
+; Variables
+(identifier) @variable
+
+; Parameters
+(parameter
+  name: (identifier) @variable.parameter)
+
+(payload
+  (identifier) @variable.parameter)
+
+; Types
+(parameter
+  type: (identifier) @type)
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z_][a-zA-Z0-9_]*"))
+
+(variable_declaration
+  (identifier) @type
+  "="
+  [
+    (struct_declaration)
+    (enum_declaration)
+    (union_declaration)
+    (opaque_declaration)
+  ])
 
 [
-  (container_doc_comment)
-  (doc_comment)
-] @comment.documentation @spell
+  (builtin_type)
+  "anyframe"
+] @type.builtin
+
+; Constants
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]+$"))
 
 [
-  variable: (IDENTIFIER)
-  variable_type_function: (IDENTIFIER)
-] @variable
+  "null"
+  "unreachable"
+  "undefined"
+] @constant.builtin
 
-parameter: (IDENTIFIER) @variable.parameter
+(field_expression
+  .
+  member: (identifier) @constant)
 
+(enum_declaration
+  (container_field
+    type: (identifier) @constant))
+
+; Labels
+(block_label
+  (identifier) @label)
+
+(break_label
+  (identifier) @label)
+
+; Fields
+(field_initializer
+  .
+  (identifier) @variable.member)
+
+(field_expression
+  (_)
+  member: (identifier) @variable.member)
+
+(container_field
+  name: (identifier) @variable.member)
+
+(initializer_list
+  (assignment_expression
+    left: (field_expression
+      .
+      member: (identifier) @variable.member)))
+
+; Functions
+(builtin_identifier) @function.builtin
+
+(call_expression
+  function: (identifier) @function.call)
+
+(call_expression
+  function: (field_expression
+    member: (identifier) @function.call))
+
+(function_declaration
+  name: (identifier) @function)
+
+; Modules
+(variable_declaration
+  (identifier) @module
+  (builtin_function
+    (builtin_identifier) @keyword.import
+    (#any-of? @keyword.import "@import" "@cImport")))
+
+; Builtins
 [
-  field_member: (IDENTIFIER)
-  field_access: (IDENTIFIER)
-] @variable.member
+  "c"
+  "..."
+] @variable.builtin
 
-; assume TitleCase is a type
-([
-  variable_type_function: (IDENTIFIER)
-  field_access: (IDENTIFIER)
-  parameter: (IDENTIFIER)
-] @type
-  (#lua-match? @type "^%u([%l]+[%u%l%d]*)*$"))
-
-; assume camelCase is a function
-([
-  variable_type_function: (IDENTIFIER)
-  field_access: (IDENTIFIER)
-  parameter: (IDENTIFIER)
-] @function
-  (#lua-match? @function "^%l+([%u][%l%d]*)+$"))
-
-; assume all CAPS_1 is a constant
-([
-  variable_type_function: (IDENTIFIER)
-  field_access: (IDENTIFIER)
-] @constant
-  (#lua-match? @constant "^%u[%u%d_]+$"))
-
-function: (IDENTIFIER) @function
-
-function_call: (IDENTIFIER) @function.call
-
-exception: "!" @keyword.exception
-
-((IDENTIFIER) @variable.builtin
+((identifier) @variable.builtin
   (#eq? @variable.builtin "_"))
 
-(PtrTypeStart
-  "c" @variable.builtin)
-
-(ContainerDecl
-  (ContainerDeclType
-    "enum")
-  (ContainerField
-    (ErrorUnionExpr
-      (SuffixExpr
-        (IDENTIFIER) @constant))))
-
-field_constant: (IDENTIFIER) @constant
-
-(BUILTINIDENTIFIER) @function.builtin
-
-((BUILTINIDENTIFIER) @keyword.import
-  (#any-of? @keyword.import "@import" "@cImport"))
-
-(INTEGER) @number
-
-(FLOAT) @number.float
-
-[
-  "true"
-  "false"
-] @boolean
-
-[
-  (LINESTRING)
-  (STRINGLITERALSINGLE)
-] @string @spell
-
-(CHAR_LITERAL) @character
-
-(EscapeSequence) @string.escape
-
-(FormatSequence) @string.special
-
-(BreakLabel
-  (IDENTIFIER) @label)
-
-(BlockLabel
-  (IDENTIFIER) @label)
+(calling_convention
+  (identifier) @variable.builtin)
 
+; Keywords
 [
   "asm"
   "defer"
   "errdefer"
   "test"
-  "opaque"
   "error"
   "const"
   "var"
@@ -108,6 +120,7 @@ field_constant: (IDENTIFIER) @constant
   "struct"
   "union"
   "enum"
+  "opaque"
 ] @keyword.type
 
 [
@@ -151,11 +164,6 @@ field_constant: (IDENTIFIER) @constant
   "catch"
 ] @keyword.exception
 
-[
-  "anytype"
-  (BuildinTypeExpr)
-] @type.builtin
-
 [
   "volatile"
   "allowzero"
@@ -168,50 +176,85 @@ field_constant: (IDENTIFIER) @constant
   "inline"
   "noinline"
   "extern"
-] @keyword.modifier
-
-[
   "comptime"
   "packed"
   "threadlocal"
-] @attribute
+] @keyword.modifier
 
+; Operator
 [
-  "null"
-  "unreachable"
-  "undefined"
-] @constant.builtin
-
-[
-  (CompareOp)
-  (BitwiseOp)
-  (BitShiftOp)
-  (AdditionOp)
-  (AssignOp)
-  (MultiplyOp)
-  (PrefixOp)
   "="
+  "*="
+  "*%="
+  "*|="
+  "/="
+  "%="
+  "+="
+  "+%="
+  "+|="
+  "-="
+  "-%="
+  "-|="
+  "<<="
+  "<<|="
+  ">>="
+  "&="
+  "^="
+  "|="
+  "!"
+  "~"
+  "-"
+  "-%"
+  "&"
+  "=="
+  "!="
+  ">"
+  ">="
+  "<="
+  "<"
+  "&"
+  "^"
+  "|"
+  "<<"
+  ">>"
+  "<<|"
+  "+"
+  "++"
+  "+%"
+  "-%"
+  "+|"
+  "-|"
   "*"
+  "/"
+  "%"
   "**"
-  "->"
-  ".?"
+  "*%"
+  "*|"
+  "||"
   ".*"
+  ".?"
   "?"
+  ".."
 ] @operator
 
-[
-  ";"
-  "."
-  ","
-  ":"
-  "=>"
-] @punctuation.delimiter
+; Literals
+(character) @character
 
-[
-  ".."
-  "..."
-] @punctuation.special
+([
+  (string)
+  (multiline_string)
+] @string
+  (#set! "priority" 95))
 
+(integer) @number
+
+(float) @number.float
+
+(boolean) @boolean
+
+(escape_sequence) @string.escape
+
+; Punctuation
 [
   "["
   "]"
@@ -221,19 +264,20 @@ field_constant: (IDENTIFIER) @constant
   "}"
 ] @punctuation.bracket
 
-(Payload
+[
+  ";"
+  "."
+  ","
+  ":"
+  "=>"
+  "->"
+] @punctuation.delimiter
+
+(payload
   "|" @punctuation.bracket)
 
-(PtrPayload
-  "|" @punctuation.bracket)
+; Comments
+(comment) @comment @spell
 
-(PtrIndexPayload
-  "|" @punctuation.bracket)
-
-(PtrListPayload
-  "|" @punctuation.bracket)
-
-(ParamType
-  (ErrorUnionExpr
-    (SuffixExpr
-      variable_type_function: (IDENTIFIER) @type)))
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^//!"))
diff --git a/queries/zig/indents.scm b/queries/zig/indents.scm
index bf9d3e42a..431aed5b6 100644
--- a/queries/zig/indents.scm
+++ b/queries/zig/indents.scm
@@ -1,11 +1,10 @@
 [
-  (Block)
-  (ContainerDecl)
-  (SwitchExpr)
-  (InitList)
+  (block)
+  (switch_expression)
+  (initializer_list)
 ] @indent.begin
 
-(Block
+(block
   "}" @indent.end)
 
 [
@@ -18,8 +17,6 @@
 ] @indent.branch
 
 [
-  (line_comment)
-  (container_doc_comment)
-  (doc_comment)
-  (LINESTRING)
+  (comment)
+  (multiline_string)
 ] @indent.ignore
diff --git a/queries/zig/injections.scm b/queries/zig/injections.scm
index 9e687ca76..48a1b44c9 100644
--- a/queries/zig/injections.scm
+++ b/queries/zig/injections.scm
@@ -1,6 +1,10 @@
-([
-  (container_doc_comment)
-  (doc_comment)
-  (line_comment)
-] @injection.content
+((comment) @injection.content
   (#set! injection.language "comment"))
+
+; TODO: add when asm is added
+; (asm_output_item (string) @injection.content
+;   (#set! injection.language "asm"))
+; (asm_input_item (string) @injection.content
+;   (#set! injection.language "asm"))
+; (asm_clobbers (string) @injection.content
+;   (#set! injection.language "asm"))

From c15385281c7944734a99c98120ecbab742d836d9 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Fri, 30 Aug 2024 01:26:22 -0700
Subject: [PATCH 1773/2704] fix(c_sharp): remove duplicated queries (#7099)

---
 queries/c_sharp/highlights.scm | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 20cc80747..90d0d3407 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -358,6 +358,9 @@
 (preproc_pragma
   (identifier) @constant)
 
+(preproc_if
+  (identifier) @constant)
+
 [
   "if"
   "else"
@@ -367,15 +370,6 @@
   "when"
 ] @keyword.conditional
 
-(preproc_pragma
-  (identifier) @constant)
-
-(preproc_if
-  (identifier) @constant)
-
-(preproc_if
-  (identifier) @constant)
-
 [
   "while"
   "for"

From 9ac3931bf6891cecd59c432d343d6490afd401e5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 06:42:19 +0000
Subject: [PATCH 1774/2704] bot(lockfile): update http, ini, leo

---
 lockfile.json              | 6 +++---
 queries/leo/highlights.scm | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 33f87d99d..a93dee70e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "bbcd67642e5749b90277c353b72e762f3be16993"
+    "revision": "f762623c6a52a96898db325574de1ba18580cc2d"
   },
   "hurl": {
     "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
@@ -327,7 +327,7 @@
     "revision": "5573b295410201ed22771776b34d636900eba368"
   },
   "ini": {
-    "revision": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"
+    "revision": "fc37e95b8d9651c60d81cccbcbbc55867dbb0afd"
   },
   "inko": {
     "revision": "234c87be1dac20f766ddf6f486a7bde2a4bc5594"
@@ -393,7 +393,7 @@
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
   },
   "leo": {
-    "revision": "07fbb1d1dd193cf9995945e5412aff61c95c67e0"
+    "revision": "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"
   },
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 53db26ab5..4e10de013 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -123,10 +123,7 @@
 
 (variable) @variable
 
-[
-  (program_id)
-  (this_program_id)
-] @string.special
+(program_id) @string.special
 
 ;record declaration
 (record_declaration

From 95933209d408d8341847e7b8a6a4272e2f185e44 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Fri, 30 Aug 2024 08:05:07 -0500
Subject: [PATCH 1775/2704] feat(markdown): set url attribute on image links

---
 queries/markdown_inline/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index bfbcf1c62..148ef0fad 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -45,6 +45,11 @@
   (link_destination) @_url
   (#set! @_label url @_url))
 
+(image
+  (image_description) @_label
+  (link_destination) @_url
+  (#set! @_label url @_url))
+
 ; Conceal image links
 (image
   [

From fd9663acca289598086b7c5a366be8b2fa5d7960 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 30 Aug 2024 15:57:07 +0200
Subject: [PATCH 1776/2704] fix(query): explicitly opt-in to legacy behavior
 (#7101)

---
 lua/nvim-treesitter/query.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index 51310545b..4aba9f2fd 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -248,7 +248,7 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
     return t
   end
 
-  local matches = query:iter_matches(qnode, bufnr, start_row, end_row)
+  local matches = query:iter_matches(qnode, bufnr, start_row, end_row, { all = false })
 
   local function iterator()
     local pattern, match, metadata = matches()

From 64cc1ef764a0b137a642d05cacdfe1126124fb35 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 31 Aug 2024 06:40:00 +0000
Subject: [PATCH 1777/2704] bot(lockfile): update http, kotlin, perl, templ

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a93dee70e..4426a4878 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "f762623c6a52a96898db325574de1ba18580cc2d"
+    "revision": "827efb386ad4b393e19193c0627809d0ba69e0cb"
   },
   "hurl": {
     "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
@@ -375,7 +375,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "dc5e8a14cb1f45582a8c221a270a199a5f8bdb63"
+    "revision": "7276b93ca6754c21f9630757e753f1b6aec500c1"
   },
   "koto": {
     "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
@@ -507,7 +507,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "55fb764e6a94512ceeaa1b9e4d53f6103e0610b2"
+    "revision": "05d6a22c903ab7d12e93a039332ad6687c8c7b7d"
   },
   "php": {
     "revision": "d13c91bc48aedf7db8240c52503eee694134ec53"
@@ -747,7 +747,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "58aed18580c476d7bc211f187e7b07a6cd12bb1f"
+    "revision": "5c19fba6dc99315d02160ed928bbc5cd8ac9ffe1"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From b33a34e8839091986f775da2a78e11fab63b00bd Mon Sep 17 00:00:00 2001
From: Seongmin Lee <60088301+boltlessengineer@users.noreply.github.com>
Date: Sun, 1 Sep 2024 01:52:23 +0900
Subject: [PATCH 1778/2704] fix(http): update injections queries (#7078)

---
 queries/http/injections.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/queries/http/injections.scm b/queries/http/injections.scm
index 0eebd0fae..f0e086580 100644
--- a/queries/http/injections.scm
+++ b/queries/http/injections.scm
@@ -13,16 +13,12 @@
   (#set! injection.language "graphql"))
 
 ; Script (default to javascript)
-((script) @injection.content
-  (#offset! @injection.content 0 2 0 -2)
-  (#set! injection.language "javascript"))
-
-; Script with other languages
 ((comment
   name: (_) @_name
   (#eq? @_name "lang")
-  value: (_) @injection.language)
+  value: (_) @injection.language)?
   .
   (_
     (script) @injection.content
-    (#offset! @injection.content 0 2 0 -2)))
+    (#offset! @injection.content 0 2 0 -2))
+  (#set! injection.language "javascript"))

From 0b61eb492370ec619b9d646a2cd89bc3924bbf5f Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 31 Aug 2024 10:14:13 -0700
Subject: [PATCH 1779/2704] fix(ini): highlight setting value as `@string`
 (#7104)

Values are not typed in INI files and are interpreted as literal strings.
---
 queries/ini/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/ini/highlights.scm b/queries/ini/highlights.scm
index 4da3c7b4c..b71c502aa 100644
--- a/queries/ini/highlights.scm
+++ b/queries/ini/highlights.scm
@@ -13,4 +13,4 @@
 (setting
   (setting_name) @property)
 
-; (setting_value) @none ; grammar does not support subtypes
+(setting_value) @string

From 628f53e4cb61aec510a1458848771cab6152c12b Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 31 Aug 2024 13:15:40 -0400
Subject: [PATCH 1780/2704] feat(glimmer): add glimmer-javascript and
 glimmer-typescript (#7064)

---
 lockfile.json                             |  6 +++
 lua/nvim-treesitter/parsers.lua           | 22 +++++++-
 queries/ecma/highlights.scm               |  4 --
 queries/ecma/injections.scm               |  3 --
 queries/glimmer/injections.scm            | 19 +++++++
 queries/glimmer_javascript/highlights.scm | 61 +++++++++++++++++++++++
 queries/glimmer_javascript/indents.scm    |  5 ++
 queries/glimmer_javascript/injections.scm | 15 ++++++
 queries/glimmer_javascript/locals.scm     |  1 +
 queries/glimmer_typescript/highlights.scm |  6 +++
 queries/glimmer_typescript/indents.scm    |  3 ++
 queries/glimmer_typescript/injections.scm | 15 ++++++
 12 files changed, 152 insertions(+), 8 deletions(-)
 create mode 100644 queries/glimmer_javascript/highlights.scm
 create mode 100644 queries/glimmer_javascript/indents.scm
 create mode 100644 queries/glimmer_javascript/injections.scm
 create mode 100644 queries/glimmer_javascript/locals.scm
 create mode 100644 queries/glimmer_typescript/highlights.scm
 create mode 100644 queries/glimmer_typescript/indents.scm
 create mode 100644 queries/glimmer_typescript/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 4426a4878..e70a1302b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -230,6 +230,12 @@
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
   },
+  "glimmer_javascript": {
+    "revision": "a260911201684f80cf815418b3771e6c39309f81"
+  },
+  "glimmer_typescript": {
+    "revision": "9d018a0f93417e6951264a26093b89ee63df7315"
+  },
   "glsl": {
     "revision": "ddc3137a2d775aca93084ff997fa13cc1691058a"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 419f34db0..b450bd52e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -704,7 +704,7 @@ list.gleam = {
 
 list.glimmer = {
   install_info = {
-    url = "https://github.com/alexlafroscia/tree-sitter-glimmer",
+    url = "https://github.com/ember-tooling/tree-sitter-glimmer",
     files = { "src/parser.c", "src/scanner.c" },
   },
   filetype = "handlebars",
@@ -712,6 +712,26 @@ list.glimmer = {
   readme_name = "Glimmer and Ember",
 }
 
+list.glimmer_javascript = {
+  install_info = {
+    url = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript",
+    files = { "src/parser.c", "src/scanner.c" },
+    generate_requires_npm = true,
+  },
+  filetype = "javascript.glimmer",
+  maintainers = { "@NullVoxPopuli" },
+}
+
+list.glimmer_typescript = {
+  install_info = {
+    url = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript",
+    files = { "src/parser.c", "src/scanner.c" },
+    generate_requires_npm = true,
+  },
+  filetype = "typescript.glimmer",
+  maintainers = { "@NullVoxPopuli" },
+}
+
 list.glsl = {
   install_info = {
     url = "https://github.com/theHamsta/tree-sitter-glsl",
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 37913f65b..038df5619 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -43,10 +43,6 @@
 
 (statement_identifier) @label
 
-(glimmer_opening_tag) @tag.builtin
-
-(glimmer_closing_tag) @tag.builtin
-
 ; Function and method definitions
 ;--------------------------------
 (function_expression
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 93cf70674..ef5e14297 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -88,9 +88,6 @@
     (#set! injection.include-children)
     (#set! injection.language "glimmer")))
 
-((glimmer_template) @injection.content
-  (#set! injection.language "glimmer"))
-
 ; css`<css>`, keyframes`<css>`
 (call_expression
   function: [
diff --git a/queries/glimmer/injections.scm b/queries/glimmer/injections.scm
index d0400c30e..30b438682 100644
--- a/queries/glimmer/injections.scm
+++ b/queries/glimmer/injections.scm
@@ -1,2 +1,21 @@
+; comments
 ((comment_statement) @injection.content
   (#set! injection.language "comment"))
+
+; <style> tags
+((element_node
+  (element_node_start
+    (tag_name) @_tag_name
+    (#eq? @_tag_name "style"))) @injection.content
+  (#offset! @injection.content 0 7 0 -8)
+  (#set! injection.language "css")
+  (#set! injection.include-children))
+
+; <script> tags
+((element_node
+  (element_node_start
+    (tag_name) @_tag_name
+    (#eq? @_tag_name "script"))) @injection.content
+  (#offset! @injection.content 0 8 0 -9)
+  (#set! injection.language "glimmer_javascript")
+  (#set! injection.include-children))
diff --git a/queries/glimmer_javascript/highlights.scm b/queries/glimmer_javascript/highlights.scm
new file mode 100644
index 000000000..5bec5b149
--- /dev/null
+++ b/queries/glimmer_javascript/highlights.scm
@@ -0,0 +1,61 @@
+; inherits: ecma
+
+(glimmer_opening_tag) @tag.builtin
+
+(glimmer_closing_tag) @tag.builtin
+
+; Copied from javascript
+; Parameters
+(formal_parameters
+  (identifier) @variable.parameter)
+
+(formal_parameters
+  (rest_pattern
+    (identifier) @variable.parameter))
+
+; ({ a }) => null
+(formal_parameters
+  (object_pattern
+    (shorthand_property_identifier_pattern) @variable.parameter))
+
+; ({ a = b }) => null
+(formal_parameters
+  (object_pattern
+    (object_assignment_pattern
+      (shorthand_property_identifier_pattern) @variable.parameter)))
+
+; ({ a: b }) => null
+(formal_parameters
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @variable.parameter)))
+
+; ([ a ]) => null
+(formal_parameters
+  (array_pattern
+    (identifier) @variable.parameter))
+
+; ({ a } = { a }) => null
+(formal_parameters
+  (assignment_pattern
+    (object_pattern
+      (shorthand_property_identifier_pattern) @variable.parameter)))
+
+; ({ a = b } = { a }) => null
+(formal_parameters
+  (assignment_pattern
+    (object_pattern
+      (object_assignment_pattern
+        (shorthand_property_identifier_pattern) @variable.parameter))))
+
+; a => null
+(arrow_function
+  parameter: (identifier) @variable.parameter)
+
+; optional parameters
+(formal_parameters
+  (assignment_pattern
+    left: (identifier) @variable.parameter))
+
+; punctuation
+(optional_chain) @punctuation.delimiter
diff --git a/queries/glimmer_javascript/indents.scm b/queries/glimmer_javascript/indents.scm
new file mode 100644
index 000000000..2bf2b7801
--- /dev/null
+++ b/queries/glimmer_javascript/indents.scm
@@ -0,0 +1,5 @@
+; inherits: ecma
+
+(glimmer_opening_tag) @indent.begin
+
+(glimmer_closing_tag) @indent.end
diff --git a/queries/glimmer_javascript/injections.scm b/queries/glimmer_javascript/injections.scm
new file mode 100644
index 000000000..38cf529b7
--- /dev/null
+++ b/queries/glimmer_javascript/injections.scm
@@ -0,0 +1,15 @@
+; inherits: ecma
+
+; Parse Ember/Glimmer/Handlebars/HTMLBars/etc. template literals
+; e.g.: await render(hbs`<SomeComponent />`)
+(call_expression
+  function: ((identifier) @_name
+    (#eq? @_name "hbs"))
+  arguments: ((template_string) @glimmer
+    (#offset! @glimmer 0 1 0 -1)))
+
+; Ember Unified <template> syntax
+; e.g.: <template><SomeComponent @arg={{double @value}} /></template>
+((glimmer_template) @injection.content
+  (#set! injection.language "glimmer")
+  (#set! injection.include-children))
diff --git a/queries/glimmer_javascript/locals.scm b/queries/glimmer_javascript/locals.scm
new file mode 100644
index 000000000..04328f099
--- /dev/null
+++ b/queries/glimmer_javascript/locals.scm
@@ -0,0 +1 @@
+; inherits: ecma
diff --git a/queries/glimmer_typescript/highlights.scm b/queries/glimmer_typescript/highlights.scm
new file mode 100644
index 000000000..042387b21
--- /dev/null
+++ b/queries/glimmer_typescript/highlights.scm
@@ -0,0 +1,6 @@
+; inherits: typescript
+
+; Sub-language delimeters
+(glimmer_opening_tag) @tag.builtin
+
+(glimmer_closing_tag) @tag.builtin
diff --git a/queries/glimmer_typescript/indents.scm b/queries/glimmer_typescript/indents.scm
new file mode 100644
index 000000000..237254d4c
--- /dev/null
+++ b/queries/glimmer_typescript/indents.scm
@@ -0,0 +1,3 @@
+(glimmer_opening_tag) @indent.begin
+
+(glimmer_closing_tag) @indent.end
diff --git a/queries/glimmer_typescript/injections.scm b/queries/glimmer_typescript/injections.scm
new file mode 100644
index 000000000..487d69734
--- /dev/null
+++ b/queries/glimmer_typescript/injections.scm
@@ -0,0 +1,15 @@
+; inherits: typescript
+
+; Parse Ember/Glimmer/Handlebars/HTMLBars/etc. template literals
+; e.g.: await render(hbs`<SomeComponent />`)
+(call_expression
+  function: ((identifier) @_name
+    (#eq? @_name "hbs"))
+  arguments: ((template_string) @glimmer
+    (#offset! @glimmer 0 1 0 -1)))
+
+; Ember Unified <template> syntax
+; e.g.: <template><SomeComponent @arg={{double @value}} /></template>
+((glimmer_template) @injection.content
+  (#set! injection.language "glimmer")
+  (#set! injection.include-children))

From c7920f2bc5080e1d04708332f6a0e7e9368b2197 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 31 Aug 2024 17:15:52 +0000
Subject: [PATCH 1781/2704] bot(readme): update

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bcce59334..b9155a5ff 100644
--- a/README.md
+++ b/README.md
@@ -249,7 +249,9 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) (maintained by @gbprod)
 - [x] [gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) (maintained by @theHamsta)
 - [x] [gleam](https://github.com/gleam-lang/tree-sitter-gleam) (maintained by @amaanq)
-- [x] [Glimmer and Ember](https://github.com/alexlafroscia/tree-sitter-glimmer) (maintained by @NullVoxPopuli)
+- [x] [Glimmer and Ember](https://github.com/ember-tooling/tree-sitter-glimmer) (maintained by @NullVoxPopuli)
+- [x] [glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) (maintained by @NullVoxPopuli)
+- [x] [glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) (maintained by @NullVoxPopuli)
 - [x] [glsl](https://github.com/theHamsta/tree-sitter-glsl) (maintained by @theHamsta)
 - [x] [GN (Generate Ninja)](https://github.com/amaanq/tree-sitter-gn) (maintained by @amaanq)
 - [x] [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) (maintained by @dpezto)

From 749df308870381979dc098063973f6ace9968ef6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 31 Aug 2024 15:32:46 -0700
Subject: [PATCH 1782/2704] feat(query): highlight supertype "/" delimiters

---
 queries/query/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 6fb23ac6d..e459b4460 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -33,7 +33,10 @@
   ")"
 ] @punctuation.bracket
 
-":" @punctuation.delimiter
+[
+  ":"
+  "/"
+] @punctuation.delimiter
 
 [
   "@"

From aa339f6ab611da07183a7fe44daa482605392502 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 06:41:55 +0000
Subject: [PATCH 1783/2704] bot(lockfile): update http, styled, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e70a1302b..83db120a8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -321,7 +321,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "827efb386ad4b393e19193c0627809d0ba69e0cb"
+    "revision": "49e1ceefcdcf89abfd4d8f013359cf90c615b1cd"
   },
   "hurl": {
     "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
@@ -714,7 +714,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "e8bf912db4996b32515639d42fe2b258517f135e"
+    "revision": "b729198642b3058d4ea0f864d86efb271d594595"
   },
   "supercollider": {
     "revision": "affa4389186b6939d89673e1e9d2b28364f5ca6f"
@@ -726,7 +726,7 @@
     "revision": "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"
   },
   "swift": {
-    "revision": "d627a54d7266f0a8ee61b447b34d0ad07dadf1d6"
+    "revision": "5254a12fae5ddcb62ca8cbf57eca83c1c41cd884"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 4e47268c6dbbc72d53c651f393a612c3e4a3f84e Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Sun, 1 Sep 2024 17:15:59 +0200
Subject: [PATCH 1784/2704] feat(latex): set url attribute for hyperlinks

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 9b36634e6..5a18e0203 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -112,10 +112,11 @@
   command: _ @function.macro @nospell
   keys: (curly_group_text_list) @markup.link @nospell)
 
-(hyperlink
+((hyperlink
   command: _ @function @nospell
   uri: (curly_group_uri
-    (_) @markup.link.url @nospell))
+    (_) @markup.link.url @nospell)) @_hyperlink
+  (#set! @_hyperlink url @markup.link.url))
 
 (glossary_entry_definition
   command: _ @function.macro @nospell

From 2d8f0f37c4056022b6643cbe8671319881f8b369 Mon Sep 17 00:00:00 2001
From: Reinis Cirpons <43414125+reiniscirpons@users.noreply.github.com>
Date: Sun, 1 Sep 2024 21:13:10 +0100
Subject: [PATCH 1785/2704] feat(gap): add gap and gaptst parser and queries
 (#7110)

---
 README.md                       |   2 +
 lockfile.json                   |   6 +
 lua/nvim-treesitter/parsers.lua |  18 +++
 queries/gap/folds.scm           |  12 ++
 queries/gap/highlights.scm      | 208 ++++++++++++++++++++++++++++++++
 queries/gap/injections.scm      |   2 +
 queries/gap/locals.scm          |  43 +++++++
 queries/gaptst/folds.scm        |   7 ++
 queries/gaptst/highlights.scm   |  19 +++
 queries/gaptst/injections.scm   |   9 ++
 10 files changed, 326 insertions(+)
 create mode 100644 queries/gap/folds.scm
 create mode 100644 queries/gap/highlights.scm
 create mode 100644 queries/gap/injections.scm
 create mode 100644 queries/gap/locals.scm
 create mode 100644 queries/gaptst/folds.scm
 create mode 100644 queries/gaptst/highlights.scm
 create mode 100644 queries/gaptst/injections.scm

diff --git a/README.md b/README.md
index b9155a5ff..a953df38f 100644
--- a/README.md
+++ b/README.md
@@ -241,6 +241,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
 - [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
+- [x] [GAP system](https://github.com/gap-system/tree-sitter-gap) (maintained by @reiniscirpons)
+- [x] [GAP system test files](https://github.com/gap-system/tree-sitter-gaptst) (maintained by @reiniscirpons)
 - [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
 - [x] [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) (maintained by @godofavacyn)
 - [x] [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 83db120a8..89eb5fa3b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -203,6 +203,12 @@
   "fusion": {
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
+  "gap": {
+    "revision": "141b063335e85299bde3f61b4888d02d674a1abc"
+  },
+  "gaptst": {
+    "revision": "e0723dc6136309b3d5904dad2c73ef71267428c1"
+  },
   "gdscript": {
     "revision": "1f1e782fe2600f50ae57b53876505b8282388d77"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b450bd52e..b975ec41c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -633,6 +633,24 @@ list.fusion = {
   maintainers = { "@jirgn" },
 }
 
+list.gap = {
+  install_info = {
+    url = "https://github.com/gap-system/tree-sitter-gap",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@reiniscirpons" },
+  readme_name = "GAP system",
+}
+
+list.gaptst = {
+  install_info = {
+    url = "https://github.com/gap-system/tree-sitter-gaptst",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@reiniscirpons" },
+  readme_name = "GAP system test files",
+}
+
 list.gdscript = {
   install_info = {
     url = "https://github.com/PrestonKnopp/tree-sitter-gdscript",
diff --git a/queries/gap/folds.scm b/queries/gap/folds.scm
new file mode 100644
index 000000000..7cf0888b6
--- /dev/null
+++ b/queries/gap/folds.scm
@@ -0,0 +1,12 @@
+[
+  (if_statement)
+  (elif_clause)
+  (else_clause)
+  (while_statement)
+  (repeat_statement)
+  (for_statement)
+  (atomic_statement)
+  (lambda)
+  (function)
+  (atomic_function)
+] @fold
diff --git a/queries/gap/highlights.scm b/queries/gap/highlights.scm
new file mode 100644
index 000000000..6c0c856c5
--- /dev/null
+++ b/queries/gap/highlights.scm
@@ -0,0 +1,208 @@
+(identifier) @variable
+
+; Functions
+(assignment_statement
+  left: (identifier) @function
+  right: (function))
+
+(assignment_statement
+  left: (identifier) @function
+  right: (atomic_function))
+
+(assignment_statement
+  left: (identifier) @function
+  right: (lambda))
+
+(call
+  function: (identifier) @function.call)
+
+((call
+  function: (identifier) @function.builtin)
+  (#any-of? @function.builtin "Assert" "Info" "IsBound" "Unbind" "TryNextMethod"))
+
+(parameters
+  (identifier) @variable.parameter)
+
+(qualified_parameters
+  (identifier) @variable.parameter)
+
+(qualified_parameters
+  (qualified_identifier
+    (identifier) @variable.parameter))
+
+(lambda_parameters
+  (identifier) @variable.parameter)
+
+; arg is treated specially when it is the only parameter of a function
+((parameters
+  .
+  (identifier) @variable.parameter.builtin .)
+  (#eq? @variable.parameter.builtin "arg"))
+
+((qualified_parameters
+  .
+  (identifier) @variable.parameter.builtin .)
+  (#eq? @variable.parameter.builtin "arg"))
+
+((qualified_parameters
+  .
+  (qualified_identifier
+    (identifier) @variable.parameter.builtin) .)
+  (#eq? @variable.parameter.builtin "arg"))
+
+((lambda_parameters
+  .
+  (identifier) @variable.parameter.builtin .)
+  (#eq? @variable.parameter.builtin "arg"))
+
+; Literals
+(bool) @constant.builtin
+
+(integer) @number
+
+(float) @number.float
+
+(string) @string
+
+(char) @character
+
+(escape_sequence) @string.escape
+
+[
+  (help_topic)
+  (help_book)
+] @string.special
+
+(tilde) @variable.builtin
+
+; Record selectors
+(record_entry
+  left: [
+    (identifier)
+    (integer)
+  ] @variable.member)
+
+(record_selector
+  selector: [
+    (identifier)
+    (integer)
+  ] @variable.member)
+
+(component_selector
+  selector: [
+    (identifier)
+    (integer)
+  ] @variable.member)
+
+(function_call_option
+  [
+    (identifier)
+    (record_entry ;Record entries specify global properties in function calls
+      left: [
+        (identifier)
+        (integer)
+      ])
+  ] @property)
+
+(help_statement
+  (help_selector) @property)
+
+; Operators
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "^"
+  "->"
+  ":="
+  "<"
+  "<="
+  "<>"
+  "="
+  ">"
+  ">="
+  ".."
+  (ellipsis)
+] @operator
+
+(help_statement
+  (help_operator) @operator)
+
+; Keywords
+[
+  (break_statement)
+  (continue_statement)
+  "atomic"
+  (quit_statement)
+] @keyword
+
+[
+  "function"
+  "local"
+  "end"
+] @keyword.function
+
+[
+  "and"
+  "in"
+  "mod"
+  "not"
+  "or"
+] @keyword.operator
+
+"rec" @keyword.type
+
+[
+  "readonly"
+  "readwrite"
+] @keyword.modifier
+
+(atomic_function
+  "atomic" @keyword.modifier)
+
+[
+  "for"
+  "while"
+  "do"
+  "od"
+  "repeat"
+  "until"
+] @keyword.repeat
+
+[
+  "if"
+  "then"
+  "elif"
+  "else"
+  "fi"
+] @keyword.conditional
+
+"return" @keyword.return
+
+(pragma) @keyword.directive
+
+;Punctuation
+[
+  ","
+  ";"
+  "."
+  "!."
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "!["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+(help_statement
+  "?" @punctuation.special)
+
+;Comments
+(comment) @comment @spell
diff --git a/queries/gap/injections.scm b/queries/gap/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/gap/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/gap/locals.scm b/queries/gap/locals.scm
new file mode 100644
index 000000000..d695d1f2d
--- /dev/null
+++ b/queries/gap/locals.scm
@@ -0,0 +1,43 @@
+[
+  (lambda)
+  (function)
+  (atomic_function)
+] @local.scope
+
+(parameters
+  (identifier) @local.definition.parameter)
+
+(qualified_parameters
+  (identifier) @local.definition.parameter)
+
+(qualified_parameters
+  (qualified_identifier
+    (identifier) @local.definition.parameter))
+
+(lambda_parameters
+  (identifier) @local.definition.parameter)
+
+(locals
+  (identifier) @local.definition.var)
+
+(record_entry
+  left: [
+    (identifier)
+    (integer)
+  ] @local.definition.field)
+
+(assignment_statement
+  left: (identifier) @local.definition.var)
+
+(for_statement
+  identifier: (identifier) @local.definition.var)
+
+(assignment_statement
+  left: (identifier) @local.definition.function
+  right: [
+    (lambda)
+    (function)
+    (atomic_function)
+  ])
+
+(identifier) @local.reference
diff --git a/queries/gaptst/folds.scm b/queries/gaptst/folds.scm
new file mode 100644
index 000000000..0ec72d135
--- /dev/null
+++ b/queries/gaptst/folds.scm
@@ -0,0 +1,7 @@
+[
+  (if_statement)
+  (else_clause)
+  (local_statement)
+  (exec_statement)
+  (test_case)
+] @fold
diff --git a/queries/gaptst/highlights.scm b/queries/gaptst/highlights.scm
new file mode 100644
index 000000000..22ab2d0a0
--- /dev/null
+++ b/queries/gaptst/highlights.scm
@@ -0,0 +1,19 @@
+(output_line) @markup.raw.block
+
+[
+  "#@local"
+  "#@exec"
+] @keyword
+
+[
+  "gap> "
+  "> "
+] @keyword.debug
+
+[
+  "#@if"
+  "#@else"
+  "#@fi"
+] @keyword.conditional
+
+(comment) @comment @spell
diff --git a/queries/gaptst/injections.scm b/queries/gaptst/injections.scm
new file mode 100644
index 000000000..bdcba35dc
--- /dev/null
+++ b/queries/gaptst/injections.scm
@@ -0,0 +1,9 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((gap_expression) @injection.content
+  (#set! injection.language "gap"))
+
+((input_line) @injection.content
+  (#set! injection.language "gap")
+  (#set! injection.combined))

From bbf1f3e54685120e009c75232e4fedae76f36cd1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 06:43:45 +0000
Subject: [PATCH 1786/2704] bot(lockfile): update arduino, c_sharp, dart,
 embedded_template, gleam, ini, java, racket, scheme, vhdl

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 89eb5fa3b..a74f11fe4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "arduino": {
-    "revision": "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"
+    "revision": "1db90b2b54c995ee8ff8e64dabeb4a5971287c16"
   },
   "asm": {
     "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
@@ -54,7 +54,7 @@
     "revision": "927da1f210ebb24b7f109230a61a55b428875985"
   },
   "c_sharp": {
-    "revision": "31a64b28292aac6adf44071e449fa03fb80eaf4e"
+    "revision": "fd7f7402db6e66afd70b402fb2e367b2d71c10d6"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -105,7 +105,7 @@
     "revision": "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"
   },
   "dart": {
-    "revision": "cf72df5d4a623ca705e81bf9e9d264e1fe9d5da0"
+    "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
   },
   "devicetree": {
     "revision": "296b3c294a8bcfca6673296d99f9cd37049b8026"
@@ -162,7 +162,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "ffbf64942c334933ee7982e144557b6efb76d0b9"
+    "revision": "62b0a6e45900a7dff7c37da95fec20a09968ba52"
   },
   "erlang": {
     "revision": "0b5a0dcfcedd9b397252cb5568cc55ab1905b1a9"
@@ -231,7 +231,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "426e67087fd62be5f4533581b5916b2cf010fb5b"
+    "revision": "0d38bfdc04cc90d7541c21e39089e35e40c429d3"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
@@ -339,7 +339,7 @@
     "revision": "5573b295410201ed22771776b34d636900eba368"
   },
   "ini": {
-    "revision": "fc37e95b8d9651c60d81cccbcbbc55867dbb0afd"
+    "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
     "revision": "234c87be1dac20f766ddf6f486a7bde2a4bc5594"
@@ -351,7 +351,7 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "576d8097e495b411f31daaee28cb34c1752ac702"
+    "revision": "245b05c6ba900fa708242835f6168ef76f9d951e"
   },
   "javascript": {
     "revision": "15887341e5b57ffdb423aff840aef142b8f53d6d"
@@ -606,7 +606,7 @@
     "revision": "b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d"
   },
   "racket": {
-    "revision": "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"
+    "revision": "24dbb1dfc08e0f99dfbd0eddc5e73ef307f538dc"
   },
   "ralph": {
     "revision": "f6d81bf7a4599c77388035439cf5801cd461ff77"
@@ -666,7 +666,7 @@
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
   },
   "scheme": {
-    "revision": "8f9dff3d038f09934db5ea113cebc59c74447743"
+    "revision": "432c338093c69222efbeb124feb90715da306cc7"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -837,7 +837,7 @@
     "revision": "075ebfc84543675f12e79a955f79d717772dcef3"
   },
   "vhdl": {
-    "revision": "4ab3e251eae8890a020d083d00acd1b8c2653c07"
+    "revision": "3f13cd14952b39ccf6817f58880834b84565ca54"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"

From e090c5b22d0d061e749f8ce33cb9b9a7e6b8ab55 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 31 Aug 2024 18:28:56 -0700
Subject: [PATCH 1787/2704] feat(wing): add many missing highlights

...as well as some fold and injection queries.
---
 queries/wing/folds.scm              |  2 +
 queries/wing/highlights.scm         | 96 +++++++++++++++++++++++++----
 queries/wing/injections.scm         | 13 ++++
 tests/query/highlights/wing/class.w |  6 +-
 4 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/queries/wing/folds.scm b/queries/wing/folds.scm
index 60de6116d..9c5a28483 100644
--- a/queries/wing/folds.scm
+++ b/queries/wing/folds.scm
@@ -12,4 +12,6 @@
   (enum_definition)
   (try_catch_statement)
   (method_definition)
+  (import_statement)+
+  (initializer)
 ] @fold
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index d417675e1..6f6fe4a30 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -8,17 +8,34 @@
 (custom_type) @type
 
 (class_field
-  name: (identifier) @variable.member)
+  name: (identifier) @property)
+
+(struct_field
+  name: (identifier) @property)
 
 (class_definition
   name: (identifier) @type)
 
+(struct_definition
+  name: (identifier) @type)
+
+(interface_definition
+  name: (identifier) @type)
+
 (method_definition
   name: (identifier) @function.method)
 
+(json_literal_member
+  (identifier) @property)
+
 ; Functions
 (keyword_argument_key) @variable.parameter
 
+(parameter_definition
+  name: (identifier) @variable.parameter)
+
+(variadic) @variable.parameter.builtin
+
 (call
   caller: (reference
     (nested_identifier
@@ -37,24 +54,30 @@
 
 (bool) @boolean
 
-(builtin_type) @type.builtin
+[
+  (builtin_type)
+  "MutSet"
+  "MutMap"
+  "MutArray"
+  "Json"
+  "Set"
+  "Map"
+  "Array"
+  "MutJson"
+] @type.builtin
 
 (json_container_type) @type.builtin
 
 ; Special
 (comment) @comment @spell
 
-[
-  "("
-  ")"
-  "{"
-  "}"
-] @punctuation.bracket
-
 [
   "-"
+  "-="
   "+"
+  "+="
   "*"
+  "**"
   "/"
   "%"
   "<"
@@ -68,23 +91,54 @@
   "&&"
   "??"
   "||"
+  "?"
 ] @operator
 
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+(mutable_container_type
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(immutable_container_type
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
 [
   ";"
   "."
   ","
+  ":"
+  "=>"
 ] @punctuation.delimiter
 
 [
   "as"
-  "bring"
   "let"
   "new"
   (inflight_specifier)
+  "impl"
+  "test"
 ] @keyword
 
-"class" @keyword.type
+"bring" @keyword.import
+
+[
+  "class"
+  "struct"
+  "interface"
+] @keyword.type
 
 [
   "for"
@@ -100,6 +154,26 @@
   "pub"
   "protected"
   "internal"
+  "extern"
+  (static)
 ] @keyword.modifier
 
 "return" @keyword.return
+
+(import_statement
+  module_name: (identifier) @module)
+
+(import_statement
+  alias: (identifier) @module)
+
+(call
+  (reference
+    (nested_identifier
+      object: (reference) @_ref
+      property: (member_identifier) @_ident))
+  (argument_list
+    (positional_argument
+      (string) @string.regexp))
+  (#eq? @_ref "regex")
+  (#eq? @_ident "compile")
+  (#offset! @string.regexp 0 1 0 -1))
diff --git a/queries/wing/injections.scm b/queries/wing/injections.scm
index 2f0e58eb6..bd3fdaec5 100644
--- a/queries/wing/injections.scm
+++ b/queries/wing/injections.scm
@@ -1,2 +1,15 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+(call
+  (reference
+    (nested_identifier
+      object: (reference) @_ref
+      property: (member_identifier) @_ident))
+  (argument_list
+    (positional_argument
+      (string) @injection.content))
+  (#eq? @_ref "regex")
+  (#eq? @_ident "compile")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "regex"))
diff --git a/tests/query/highlights/wing/class.w b/tests/query/highlights/wing/class.w
index 9f76b16e8..1507d7574 100644
--- a/tests/query/highlights/wing/class.w
+++ b/tests/query/highlights/wing/class.w
@@ -1,12 +1,13 @@
 bring cloud;
-// <- @keyword
+// <- @keyword.import
+//    ^ @module
 
 class Foo {
 // <- @keyword.type
 //    ^   @type
 //        ^ @punctuation.bracket
   name: str;
-//^    @variable.member
+//^    @property
 //      ^   @type.builtin
 //         ^ @punctuation.delimiter
   new(name:  str) {
@@ -14,6 +15,7 @@ class Foo {
 //    ^    @variable
     this.name = name;
 //      ^ @punctuation.delimiter
+//       ^ @variable.member
 //            ^ @operator
   }
 }

From a1573a9135c608e68cb383f752623527be84bdce Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 2 Sep 2024 03:56:02 -0400
Subject: [PATCH 1788/2704] feat(javascript): update parser and queries

---
 lockfile.json               |  2 +-
 queries/ecma/injections.scm | 75 ++++++++++++-------------------------
 2 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a74f11fe4..724aa3629 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -354,7 +354,7 @@
     "revision": "245b05c6ba900fa708242835f6168ef76f9d951e"
   },
   "javascript": {
-    "revision": "15887341e5b57ffdb423aff840aef142b8f53d6d"
+    "revision": "463fec0831011cab830429fbe1da2796cfc1cfb4"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index ef5e14297..04abafcde 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -7,11 +7,7 @@
 
 ; html(`...`), html`...`, sql(`...`), etc.
 (call_expression
-  function: [
-    (await_expression
-      (identifier) @injection.language)
-    (identifier) @injection.language
-  ]
+  function: (identifier) @injection.language
   arguments: [
     (arguments
       (template_string) @injection.content)
@@ -27,13 +23,8 @@
 
 ; svg`...` or svg(`...`)
 (call_expression
-  function: [
-    (await_expression
-      (identifier) @_name
-      (#eq? @_name "svg"))
-    ((identifier) @_name
-      (#eq? @_name "svg"))
-  ]
+  function: (identifier) @_name
+  (#eq? @_name "svg")
   arguments: [
     (arguments
       (template_string) @injection.content)
@@ -46,13 +37,8 @@
 ; Vercel PostgreSQL
 ; foo.sql`...` or foo.sql(`...`)
 (call_expression
-  function: [
-    (await_expression
-      (member_expression
-        property: (property_identifier) @injection.language))
-    (member_expression
-      property: (property_identifier) @injection.language)
-  ]
+  function: (member_expression
+    property: (property_identifier) @injection.language)
   arguments: [
     (arguments
       (template_string) @injection.content)
@@ -63,44 +49,29 @@
   (#set! injection.include-children))
 
 (call_expression
-  function: [
-    (await_expression
-      (identifier) @_name
-      (#eq? @_name "gql"))
-    ((identifier) @_name
-      (#eq? @_name "gql"))
-  ]
-  arguments: ((template_string) @injection.content
-    (#offset! @injection.content 0 1 0 -1)
-    (#set! injection.include-children)
-    (#set! injection.language "graphql")))
+  function: (identifier) @_name
+  (#eq? @_name "gql")
+  arguments: (template_string) @injection.content
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "graphql"))
 
 (call_expression
-  function: [
-    (await_expression
-      (identifier) @_name
-      (#eq? @_name "hbs"))
-    ((identifier) @_name
-      (#eq? @_name "hbs"))
-  ]
-  arguments: ((template_string) @injection.content
-    (#offset! @injection.content 0 1 0 -1)
-    (#set! injection.include-children)
-    (#set! injection.language "glimmer")))
+  function: (identifier) @_name
+  (#eq? @_name "hbs")
+  arguments: (template_string) @injection.content
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "glimmer"))
 
 ; css`<css>`, keyframes`<css>`
 (call_expression
-  function: [
-    (await_expression
-      (identifier) @_name
-      (#any-of? @_name "css" "keyframes"))
-    ((identifier) @_name
-      (#any-of? @_name "css" "keyframes"))
-  ]
-  arguments: ((template_string) @injection.content
-    (#offset! @injection.content 0 1 0 -1)
-    (#set! injection.include-children)
-    (#set! injection.language "styled")))
+  function: (identifier) @_name
+  (#any-of? @_name "css" "keyframes")
+  arguments: (template_string) @injection.content
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "styled"))
 
 ; styled.div`<css>`
 (call_expression

From 5b8b126de02ebfd92e46ed5986b3e58e870b85de Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Tue, 3 Sep 2024 01:24:16 -0700
Subject: [PATCH 1789/2704] fix(highlights): section headings in ini,
 git_config editorconfig (#7108)

Section headers should be `@markup.heading` in ini-like grammars and `@string.special.path` in editorconfig.
---
 queries/editorconfig/highlights.scm | 3 +--
 queries/git_config/highlights.scm   | 2 +-
 queries/ini/highlights.scm          | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/queries/editorconfig/highlights.scm b/queries/editorconfig/highlights.scm
index fd69bc4c8..feb0a524c 100644
--- a/queries/editorconfig/highlights.scm
+++ b/queries/editorconfig/highlights.scm
@@ -1,8 +1,7 @@
 (comment) @comment @spell
 
-; consistency with toml and ini
 (section
-  (section_name) @type)
+  (section_name) @string.special.path)
 
 (character_choice
   (character) @constant)
diff --git a/queries/git_config/highlights.scm b/queries/git_config/highlights.scm
index 3423e1b0c..6b37e9090 100644
--- a/queries/git_config/highlights.scm
+++ b/queries/git_config/highlights.scm
@@ -1,5 +1,5 @@
 ; Sections
-(section_name) @type
+(section_name) @markup.heading
 
 ((section_name) @keyword.import
   (#eq? @keyword.import "include"))
diff --git a/queries/ini/highlights.scm b/queries/ini/highlights.scm
index b71c502aa..cbf958e84 100644
--- a/queries/ini/highlights.scm
+++ b/queries/ini/highlights.scm
@@ -1,5 +1,5 @@
 (section_name
-  (text) @type) ; consistency with toml
+  (text) @markup.heading)
 
 (comment) @comment @spell
 

From 3826d0c42ac635f560479b5b6ab522f6627a3466 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 4 Sep 2024 09:08:06 +0200
Subject: [PATCH 1790/2704] fix(query): explicitly opt-in to legacy behavior

---
 lua/nvim-treesitter/query_predicates.lua | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 2d61ca6b4..5caaaa8b8 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -15,6 +15,9 @@ local non_filetype_match_injection_language_aliases = {
   ts = "typescript",
 }
 
+-- compatibility shim for breaking change on nightly/0.11
+local opts = vim.fn.has "nvim-0.10" == 1 and { force = true, all = false } or true
+
 local function get_parser_from_markdown_info_string(injection_alias)
   local match = vim.filetype.match { filename = "a." .. injection_alias }
   return match or non_filetype_match_injection_language_aliases[injection_alias] or injection_alias
@@ -57,7 +60,7 @@ query.add_predicate("nth?", function(match, _pattern, _bufnr, pred)
   end
 
   return false
-end, true)
+end, opts)
 
 ---@param match (TSNode|nil)[]
 ---@param _pattern string
@@ -91,9 +94,9 @@ local function has_ancestor(match, _pattern, _bufnr, pred)
   return false
 end
 
-query.add_predicate("has-ancestor?", has_ancestor, true)
+query.add_predicate("has-ancestor?", has_ancestor, opts)
 
-query.add_predicate("has-parent?", has_ancestor, true)
+query.add_predicate("has-parent?", has_ancestor, opts)
 
 ---@param match (TSNode|nil)[]
 ---@param _pattern string
@@ -117,7 +120,7 @@ query.add_predicate("is?", function(match, _pattern, bufnr, pred)
   local _, _, kind = locals.find_definition(node, bufnr)
 
   return vim.tbl_contains(types, kind)
-end, true)
+end, opts)
 
 ---@param match (TSNode|nil)[]
 ---@param _pattern string
@@ -137,7 +140,7 @@ query.add_predicate("kind-eq?", function(match, _pattern, _bufnr, pred)
   end
 
   return vim.tbl_contains(types, node:type())
-end, true)
+end, opts)
 
 ---@param match (TSNode|nil)[]
 ---@param _ string
@@ -158,7 +161,7 @@ query.add_directive("set-lang-from-mimetype!", function(match, _, bufnr, pred, m
     local parts = vim.split(type_attr_value, "/", {})
     metadata["injection.language"] = parts[#parts]
   end
-end, true)
+end, opts)
 
 ---@param match (TSNode|nil)[]
 ---@param _ string
@@ -173,10 +176,10 @@ query.add_directive("set-lang-from-info-string!", function(match, _, bufnr, pred
   end
   local injection_alias = vim.treesitter.get_node_text(node, bufnr):lower()
   metadata["injection.language"] = get_parser_from_markdown_info_string(injection_alias)
-end, true)
+end, opts)
 
 -- Just avoid some annoying warnings for this directive
-query.add_directive("make-range!", function() end, true)
+query.add_directive("make-range!", function() end, opts)
 
 --- transform node text to lower case (e.g., to make @injection.language case insensitive)
 ---
@@ -197,7 +200,7 @@ query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
     metadata[id] = {}
   end
   metadata[id].text = string.lower(text)
-end, true)
+end, opts)
 
 -- Trim blank lines from end of the region
 -- Arguments are the captures to trim.
@@ -235,4 +238,4 @@ query.add_directive("trim!", function(match, _, bufnr, pred, metadata)
       metadata[id].range = { start_row, start_col, end_row, end_col }
     end
   end
-end, true)
+end, opts)

From bfe74a4899882a4ef45abb80813f14644a110a34 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 13:25:50 +0000
Subject: [PATCH 1791/2704] bot(lockfile): update arduino, awk, bash, c, cpp,
 css, cuda, go, groovy, haskell, hlsl, html, http, javascript, jsdoc, json,
 julia, liquid, norg, ocaml, ocaml_interface, php, php_only, phpdoc, python,
 ql, regex, ruby, rust, scala, slang, tcl, templ, tsx, typescript, v, wing

---
 lockfile.json               | 74 ++++++++++++++++++-------------------
 queries/cpp/highlights.scm  |  2 +-
 queries/wing/folds.scm      |  2 +-
 queries/wing/highlights.scm |  2 +-
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 724aa3629..81d3235ba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "arduino": {
-    "revision": "1db90b2b54c995ee8ff8e64dabeb4a5971287c16"
+    "revision": "ce02903e3ae74c729e9415dc32c276447b1c8afd"
   },
   "asm": {
     "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
@@ -24,10 +24,10 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "ba7472152d79a8c916550c80fdbfd5724d07a0c9"
+    "revision": "553fdc4afb3b603332c3f4baf50c711506f4e797"
   },
   "bash": {
-    "revision": "2fbd860f802802ca76a6661ce025b3a3bca2d3ed"
+    "revision": "c8713e50f0bd77d080832fc61ad128bc8f2934e9"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -51,7 +51,7 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "927da1f210ebb24b7f109230a61a55b428875985"
+    "revision": "bc85948c0bec746ebe921f72d2296d47e17d4ea7"
   },
   "c_sharp": {
     "revision": "fd7f7402db6e66afd70b402fb2e367b2d71c10d6"
@@ -87,16 +87,16 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "b1a4e2b25148f3cfcb5f241cbc4c49f001a6fb35"
+    "revision": "30f973c2244f0bff444186185f475c3bd76bc3a5"
   },
   "css": {
-    "revision": "9af0bdd9d225edee12f489cfa8284e248321959b"
+    "revision": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "8812343a1f8496fc219f3d07a270f9c1d6ba3391"
+    "revision": "635e8aa3747823a0c4e9660c07cef76fe8d3ef93"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -252,7 +252,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "6204b7308a32e991a8daed2e9895a90be55a510a"
+    "revision": "81a11f8252998ee6b98d59e6da91fc307491e53d"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -279,7 +279,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "171b3b7412bc93284fc0dad0a7a7bbbbd1b51289"
+    "revision": "84077d93f8267f8374476f8ef636bf21c43f679f"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -291,7 +291,7 @@
     "revision": "4af5d82cf9ec39f67cb1db5b7a9269d337406592"
   },
   "haskell": {
-    "revision": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19"
+    "revision": "558b997049fddcb07fc513528189c57d6129a260"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -309,7 +309,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "5d788a46727c8199a7c63a3c849092e0364375b6"
+    "revision": "cf432a7420eb71e9b40954aa829dcb8a9bf6b546"
   },
   "hlsplaylist": {
     "revision": "3bfda9271e3adb08d35f47a2102fe957009e1c55"
@@ -321,13 +321,13 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "d11201a263d02169d303db903ba0bb13dc59e068"
+    "revision": "14bdaf0da9e26e2de9b30178c2242539d2b0b285"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "49e1ceefcdcf89abfd4d8f013359cf90c615b1cd"
+    "revision": "7c68e1c8ce6eeef6bc4b749330c540dbbda5ba44"
   },
   "hurl": {
     "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
@@ -354,16 +354,16 @@
     "revision": "245b05c6ba900fa708242835f6168ef76f9d951e"
   },
   "javascript": {
-    "revision": "463fec0831011cab830429fbe1da2796cfc1cfb4"
+    "revision": "b6f0624c1447bc209830b195999b78a56b10a579"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14"
+    "revision": "bc09606fc786ead131a301e4b7524888f2d5c517"
   },
   "json": {
-    "revision": "bdd69eb8c8a58a9f54df03de0488d9990179be46"
+    "revision": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -375,7 +375,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "a528de39923448e6b809a6b9f686f3472728f202"
+    "revision": "78b05f3506ecbb0cef10b228a2edeb73bf966e5f"
   },
   "just": {
     "revision": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"
@@ -411,7 +411,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "4c19cc5b2b408de590f83497a90cc941ed59ea06"
+    "revision": "23ac814111e2b4b4b083e2c92219af2d5b74d13d"
   },
   "liquidsoap": {
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
@@ -483,7 +483,7 @@
     "revision": "537095ddc80cf610fa75a2a0149fe9799b011014"
   },
   "norg": {
-    "revision": "1aab69c95bd9d5e7c0e172ecbe5d29bcf5834612"
+    "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
   },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
@@ -495,10 +495,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "036226e5edb410aec004cc7ac0f4b2014dd04a0e"
+    "revision": "14beb5ef0e7488bf1d93b8c67f69942324fee557"
   },
   "ocaml_interface": {
-    "revision": "036226e5edb410aec004cc7ac0f4b2014dd04a0e"
+    "revision": "14beb5ef0e7488bf1d93b8c67f69942324fee557"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -522,13 +522,13 @@
     "revision": "05d6a22c903ab7d12e93a039332ad6687c8c7b7d"
   },
   "php": {
-    "revision": "d13c91bc48aedf7db8240c52503eee694134ec53"
+    "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"
   },
   "php_only": {
-    "revision": "d13c91bc48aedf7db8240c52503eee694134ec53"
+    "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"
   },
   "phpdoc": {
-    "revision": "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"
+    "revision": "df5e7da4b83da072f99135079ac3436550b8d67d"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
@@ -588,10 +588,10 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "346fa42dc2990d2a2736cc60891369d0d3d8e65c"
+    "revision": "8c65e256f971812276ff2a69a2f515c218ed7f82"
   },
   "ql": {
-    "revision": "42becd6f8f7bae82c818fa3abb1b6ff34b552310"
+    "revision": "c73c31c89cb0019ef56fe8bc1723e7c36e0be607"
   },
   "qmldir": {
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
@@ -624,7 +624,7 @@
     "revision": "3d4768b04d7cfaf40533e12b28672603428b8f31"
   },
   "regex": {
-    "revision": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"
+    "revision": "f70251e1f1d72bd6dc1f897f956f9112f8668441"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -654,13 +654,13 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "7dbc1e2d0e2d752577655881f73b4573f3fe85d4"
+    "revision": "a66579f70d6f50ffd81a16fc3d3358e2ac173c88"
   },
   "rust": {
-    "revision": "2b43eafe64470846cdaa0eaae1e287c120ee5f03"
+    "revision": "6b7d1fc73ded57f73b1619bcf4371618212208b1"
   },
   "scala": {
-    "revision": "dd7fe4d7838ca751f5259718658dd309d999855b"
+    "revision": "a366c0d52485b84d2d9ba66dee530398526acb01"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -675,7 +675,7 @@
     "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "slang": {
-    "revision": "d84b43d75d65bbc4ba57166ce17555f32c0b8983"
+    "revision": "4a3fabd26b09efd7431ea4899e5f2d81b568a4b9"
   },
   "slint": {
     "revision": "34ccfd58d3baee7636f62d9326f32092264e8407"
@@ -753,13 +753,13 @@
     "revision": "b3710fe2723bd9b285de7f3d0c0717bebf3f17bd"
   },
   "tcl": {
-    "revision": "8784024358c233efd0f3a6fd9e7a3c5852e628bc"
+    "revision": "46e6acd5c5376047338dd64d955b743f90d8e772"
   },
   "teal": {
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "5c19fba6dc99315d02160ed928bbc5cd8ac9ffe1"
+    "revision": "0524da9e1f14b9b7d7d6d36608293f85a550b263"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -789,7 +789,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"
+    "revision": "9951831c5f05be434514dce38b30eef213667601"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -798,7 +798,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"
+    "revision": "9951831c5f05be434514dce38b30eef213667601"
   },
   "typespec": {
     "revision": "0ee05546d73d8eb64635ed8125de6f35c77759fe"
@@ -825,7 +825,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "a18d695ec105f0cda1903d1974f493207e122b35"
+    "revision": "d63bc6c08a88715c89f4b1b06642e130dd899aba"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
@@ -861,7 +861,7 @@
     "revision": "0f06f24e259ac725045956436b9025dab008ff9f"
   },
   "wing": {
-    "revision": "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"
+    "revision": "76e0c25844a66ebc6e866d690fcc5f4e90698947"
   },
   "wit": {
     "revision": "c52f0b07786603df17ad0197f6cef680f312eb2c"
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index e39a2925c..85ff2dc40 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -230,7 +230,7 @@
   "private"
   "protected"
   "final"
-  (virtual)
+  "virtual"
 ] @keyword.modifier
 
 [
diff --git a/queries/wing/folds.scm b/queries/wing/folds.scm
index 9c5a28483..0acd8adeb 100644
--- a/queries/wing/folds.scm
+++ b/queries/wing/folds.scm
@@ -7,7 +7,7 @@
   (while_statement)
   (if_statement)
   (if_let_statement)
-  (elif_block)
+  (else_if_block)
   (struct_definition)
   (enum_definition)
   (try_catch_statement)
diff --git a/queries/wing/highlights.scm b/queries/wing/highlights.scm
index 6f6fe4a30..31e914f07 100644
--- a/queries/wing/highlights.scm
+++ b/queries/wing/highlights.scm
@@ -127,7 +127,7 @@
   "as"
   "let"
   "new"
-  (inflight_specifier)
+  (phase_specifier)
   "impl"
   "test"
 ] @keyword

From 093b29f2b409278e2ed69a90462fee54714b5a84 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 06:42:29 +0000
Subject: [PATCH 1792/2704] bot(lockfile): update julia, kotlin, tcl

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 81d3235ba..82a2bda93 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -375,7 +375,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "78b05f3506ecbb0cef10b228a2edeb73bf966e5f"
+    "revision": "3520b57e418f734f582215181ecd926a6178c90f"
   },
   "just": {
     "revision": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"
@@ -387,7 +387,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "7276b93ca6754c21f9630757e753f1b6aec500c1"
+    "revision": "ec985672ff21f7fd7f835869d8021e8f87304bb4"
   },
   "koto": {
     "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
@@ -753,7 +753,7 @@
     "revision": "b3710fe2723bd9b285de7f3d0c0717bebf3f17bd"
   },
   "tcl": {
-    "revision": "46e6acd5c5376047338dd64d955b743f90d8e772"
+    "revision": "cdba4ab96a9896492d0d5219b70300c8783ca4e7"
   },
   "teal": {
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"

From ccbaee59547425ef8b766433a6020ac191f3151f Mon Sep 17 00:00:00 2001
From: Avi Areman <avi.areman@gmail.com>
Date: Sat, 7 Sep 2024 00:18:06 +0900
Subject: [PATCH 1793/2704] feat(mermaid): indents and folds

---
 queries/mermaid/folds.scm   | 10 ++++++++++
 queries/mermaid/indents.scm | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 queries/mermaid/folds.scm
 create mode 100644 queries/mermaid/indents.scm

diff --git a/queries/mermaid/folds.scm b/queries/mermaid/folds.scm
new file mode 100644
index 000000000..5f28abf5b
--- /dev/null
+++ b/queries/mermaid/folds.scm
@@ -0,0 +1,10 @@
+[
+  (diagram_sequence)
+  (diagram_class)
+  (diagram_state)
+  (diagram_gantt)
+  (diagram_pie)
+  (diagram_er)
+  (diagram_flow)
+  (flow_stmt_subgraph)
+] @fold
diff --git a/queries/mermaid/indents.scm b/queries/mermaid/indents.scm
new file mode 100644
index 000000000..fb95bd8de
--- /dev/null
+++ b/queries/mermaid/indents.scm
@@ -0,0 +1,18 @@
+([
+  (diagram_sequence)
+  (diagram_class)
+  (diagram_state)
+  (diagram_gantt)
+  (diagram_pie)
+  (diagram_er)
+  (diagram_flow)
+  (flow_stmt_subgraph)
+] @indent.begin
+  (#set! indent.immediate 1))
+
+"end" @indent.branch
+
+[
+  (ERROR)
+  (comment)
+] @indent.auto

From 00f128dd73086aa578dc3d9142de06c633b7c685 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 7 Sep 2024 06:41:43 +0000
Subject: [PATCH 1794/2704] bot(lockfile): update elixir, erlang, groovy, r,
 svelte, swift

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 82a2bda93..0c3b793c1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -150,7 +150,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "c7ae8b77e2749826dcf23df6514f08fdd68c66a3"
+    "revision": "27efab52e7c955ccd68e0fd82a1c6d83002bc7c8"
   },
   "elm": {
     "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
@@ -165,7 +165,7 @@
     "revision": "62b0a6e45900a7dff7c37da95fec20a09968ba52"
   },
   "erlang": {
-    "revision": "0b5a0dcfcedd9b397252cb5568cc55ab1905b1a9"
+    "revision": "0dfcdf18b35dd9cfcf92be42659794d07d819d88"
   },
   "facility": {
     "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
@@ -279,7 +279,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "groovy": {
-    "revision": "84077d93f8267f8374476f8ef636bf21c43f679f"
+    "revision": "0d8884514fe10c4fa47527d9a0284d207f38ddea"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -603,7 +603,7 @@
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
   },
   "r": {
-    "revision": "b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d"
+    "revision": "c8b6e5f3f3c055cfc76471ebc912286e9e73d7d2"
   },
   "racket": {
     "revision": "24dbb1dfc08e0f99dfbd0eddc5e73ef307f538dc"
@@ -729,10 +729,10 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"
+    "revision": "6fe714f0c9026a986b916bf39c1021ffcb1e995b"
   },
   "swift": {
-    "revision": "5254a12fae5ddcb62ca8cbf57eca83c1c41cd884"
+    "revision": "caa953d26c9479d18a373873125733f01342c40a"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 58030e6d6f1d6609b43dcb765d54539dcc6a1a76 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 7 Sep 2024 08:24:47 -0700
Subject: [PATCH 1795/2704] fix(formatter): adapt formatter for nightly

After Neovim pull #30193, the formatter was broken due to changes in the
way node data is passed to predicates.
---
 scripts/format-queries.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 0f6b77f1e..9deccdc07 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -14,7 +14,8 @@ else
 end
 
 ts.query.add_predicate("kind-eq?", function(match, _, _, pred)
-  local node = match[pred[2]]
+  local cap = match[pred[2]]
+  local node = type(cap) == "table" and cap[1] or cap
   if not node then
     return true
   end
@@ -24,7 +25,8 @@ ts.query.add_predicate("kind-eq?", function(match, _, _, pred)
 end, true)
 
 ts.query.add_predicate("is-start-of-line?", function(match, _, _, pred)
-  local node = match[pred[2]]
+  local cap = match[pred[2]]
+  local node = type(cap) == "table" and cap[1] or cap
   if not node then
     return true
   end

From 4770d9a1a77b0cc2b723c646c3dbe43a9133e5db Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 8 Sep 2024 06:40:28 +0000
Subject: [PATCH 1796/2704] bot(lockfile): update earthfile, racket, scheme,
 svelte

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0c3b793c1..285d982ec 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -135,7 +135,7 @@
     "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
   },
   "earthfile": {
-    "revision": "b0a9bc5737340a9b80b489fe9ae93d7b2fe78cd7"
+    "revision": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -606,7 +606,7 @@
     "revision": "c8b6e5f3f3c055cfc76471ebc912286e9e73d7d2"
   },
   "racket": {
-    "revision": "24dbb1dfc08e0f99dfbd0eddc5e73ef307f538dc"
+    "revision": "5b211bf93021d1c45f39aa96898be9f794f087e4"
   },
   "ralph": {
     "revision": "f6d81bf7a4599c77388035439cf5801cd461ff77"
@@ -666,7 +666,7 @@
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
   },
   "scheme": {
-    "revision": "432c338093c69222efbeb124feb90715da306cc7"
+    "revision": "63e25a4a84142ae7ee0ee01fe3a32c985ca16745"
   },
   "scss": {
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
@@ -729,7 +729,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "6fe714f0c9026a986b916bf39c1021ffcb1e995b"
+    "revision": "774a65aea563accc35f5d45fafa4d96ec5761f57"
   },
   "swift": {
     "revision": "caa953d26c9479d18a373873125733f01342c40a"

From 13ee7f8844211e44b939ac730ab778edff593b6b Mon Sep 17 00:00:00 2001
From: Jonas Dujava <jonas.dujava@gmail.com>
Date: Tue, 10 Sep 2024 00:18:15 +0200
Subject: [PATCH 1797/2704] feat(latex): capture conditionals

Generically, macros/commands in LaTeX starting on `if` are either
directly conditionals, or have similar purpose/funcionality.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 5a18e0203..048c8609f 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -238,6 +238,14 @@
     (_) @markup.strong))
   (#any-of? @_name "\\textbf" "\\mathbf"))
 
+(generic_command
+  (command_name) @keyword.conditional
+  (#lua-match? @keyword.conditional "^\\if[a-zA-Z@]+$"))
+
+(generic_command
+  (command_name) @keyword.conditional
+  (#any-of? @keyword.conditional "\\fi" "\\else"))
+
 ; File inclusion commands
 (class_include
   command: _ @keyword.import

From f8bbb820a8a2bdb3c3408fa1110b5323e8bbe4bd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 06:42:51 +0000
Subject: [PATCH 1798/2704] bot(lockfile): update elixir, gleam, lua, markdown,
 markdown_inline, perl, scala, swift

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 285d982ec..82a98dd23 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -150,7 +150,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "27efab52e7c955ccd68e0fd82a1c6d83002bc7c8"
+    "revision": "2c6e93171477973b38de4b1d2be427cc99f990a6"
   },
   "elm": {
     "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
@@ -231,7 +231,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "0d38bfdc04cc90d7541c21e39089e35e40c429d3"
+    "revision": "9586f38658da115c90e2d01099c83479eb0eea99"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
@@ -420,7 +420,7 @@
     "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
   },
   "lua": {
-    "revision": "a24dab177e58c9c6832f96b9a73102a0cfbced4a"
+    "revision": "99fc677e6971c425e8d407f59c77ab897e585c92"
   },
   "luadoc": {
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
@@ -438,10 +438,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
+    "revision": "a3481e1db0b5f9aecfa7124d362a6485286a8e72"
   },
   "markdown_inline": {
-    "revision": "7fe453beacecf02c86f7736439f238f5bb8b5c9b"
+    "revision": "a3481e1db0b5f9aecfa7124d362a6485286a8e72"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
@@ -519,7 +519,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "05d6a22c903ab7d12e93a039332ad6687c8c7b7d"
+    "revision": "70db420b20885ecd7268e5a710ebb3aeaef3a293"
   },
   "php": {
     "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"
@@ -660,7 +660,7 @@
     "revision": "6b7d1fc73ded57f73b1619bcf4371618212208b1"
   },
   "scala": {
-    "revision": "a366c0d52485b84d2d9ba66dee530398526acb01"
+    "revision": "b02af60518ae1633d552ae2d0f25ca5e05f274f7"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -732,7 +732,7 @@
     "revision": "774a65aea563accc35f5d45fafa4d96ec5761f57"
   },
   "swift": {
-    "revision": "caa953d26c9479d18a373873125733f01342c40a"
+    "revision": "7d303df70012edb7385a6a3b3938e0e7b89ecfbd"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From c9003a3cb19280bc252e24bfb813027643016e5f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 10 Sep 2024 10:17:19 +0200
Subject: [PATCH 1799/2704] ci(update): bump create-pull-request to v7 and sign
 commits

---
 .github/workflows/update-lockfile.yml | 7 ++++---
 .github/workflows/update-readme.yml   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index b994622bf..1a38f8d38 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -42,10 +42,11 @@ jobs:
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        id: pr
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.app-token.outputs.token }}
-          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
+          sign-commits: true
           commit-message: "bot(lockfile): update ${{ env.UPDATED_PARSERS }}"
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
@@ -55,4 +56,4 @@ jobs:
       - name: Enable Pull Request Automerge
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh pr merge --rebase --auto update-lockfile-pr
+        run: gh pr merge --rebase --auto ${{ steps.pr.outputs.pull-request-number }}
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 44f10a425..6e5119f71 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -30,10 +30,11 @@ jobs:
           nvim -l scripts/update-readme.lua || echo 'Needs update'
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        id: pr
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.app-token.outputs.token }}
-          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
+          sign-commits: true
           commit-message: "bot(readme): update"
           title: Update README
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
@@ -43,4 +44,4 @@ jobs:
       - name: Enable Pull Request Automerge
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh pr merge --rebase --auto update-readme-pr
+        run: gh pr merge --rebase --auto ${{ steps.pr.outputs.pull-request-number }}

From c436d45eeeeb78e5482cb28b59de1d7a77c93d86 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 10 Sep 2024 10:20:29 +0200
Subject: [PATCH 1800/2704] Revert "ci(update): bump create-pull-request to v7
 and sign commits"

This reverts commit c9003a3cb19280bc252e24bfb813027643016e5f.
---
 .github/workflows/update-lockfile.yml | 7 +++----
 .github/workflows/update-readme.yml   | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 1a38f8d38..b994622bf 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -42,11 +42,10 @@ jobs:
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
 
       - name: Create Pull Request
-        id: pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ steps.app-token.outputs.token }}
-          sign-commits: true
+          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
           commit-message: "bot(lockfile): update ${{ env.UPDATED_PARSERS }}"
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
@@ -56,4 +55,4 @@ jobs:
       - name: Enable Pull Request Automerge
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh pr merge --rebase --auto ${{ steps.pr.outputs.pull-request-number }}
+        run: gh pr merge --rebase --auto update-lockfile-pr
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 6e5119f71..44f10a425 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -30,11 +30,10 @@ jobs:
           nvim -l scripts/update-readme.lua || echo 'Needs update'
 
       - name: Create Pull Request
-        id: pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ steps.app-token.outputs.token }}
-          sign-commits: true
+          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
           commit-message: "bot(readme): update"
           title: Update README
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
@@ -44,4 +43,4 @@ jobs:
       - name: Enable Pull Request Automerge
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh pr merge --rebase --auto ${{ steps.pr.outputs.pull-request-number }}
+        run: gh pr merge --rebase --auto update-readme-pr

From 6a3c6a42a6e24414bdf337b05a84a0ea013dd155 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 10 Sep 2024 13:47:17 -0400
Subject: [PATCH 1801/2704] fix(rust): comment marker should not be `@operator`
 (#7135)

---
 queries/rust/highlights.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 046b541d1..2836a95c2 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -214,17 +214,6 @@
     (identifier) @function.macro .))
 
 ; Literals
-[
-  (line_comment)
-  (block_comment)
-] @comment @spell
-
-(line_comment
-  (doc_comment)) @comment.documentation
-
-(block_comment
-  (doc_comment)) @comment.documentation
-
 (boolean_literal) @boolean
 
 (integer_literal) @number
@@ -463,3 +452,17 @@
   macro: (identifier) @keyword.debug
   "!" @keyword.debug
   (#eq? @keyword.debug "dbg"))
+
+; Comments
+[
+  (line_comment)
+  (block_comment)
+  (outer_doc_comment_marker)
+  (inner_doc_comment_marker)
+] @comment @spell
+
+(line_comment
+  (doc_comment)) @comment.documentation
+
+(block_comment
+  (doc_comment)) @comment.documentation

From 2871a4a65723d549bd53382f828d70aa67e13eb9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 06:42:41 +0000
Subject: [PATCH 1802/2704] bot(lockfile): update markdown, markdown_inline

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 82a98dd23..f651dbba2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -438,10 +438,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "a3481e1db0b5f9aecfa7124d362a6485286a8e72"
+    "revision": "c25b6354120182f1e0d5caa52f717b097a7e46a3"
   },
   "markdown_inline": {
-    "revision": "a3481e1db0b5f9aecfa7124d362a6485286a8e72"
+    "revision": "c25b6354120182f1e0d5caa52f717b097a7e46a3"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"

From d22166e3d8d375b761c32b303176f3e955560b0c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 11 Sep 2024 09:17:34 +0200
Subject: [PATCH 1803/2704] ci: bump create-pull-request to v7

---
 .github/workflows/update-lockfile.yml | 4 ++--
 .github/workflows/update-readme.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index b994622bf..38aab1cfc 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -42,10 +42,10 @@ jobs:
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.app-token.outputs.token }}
-          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
+          sign-commits: true
           commit-message: "bot(lockfile): update ${{ env.UPDATED_PARSERS }}"
           title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 44f10a425..a3fa018e5 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -30,10 +30,10 @@ jobs:
           nvim -l scripts/update-readme.lua || echo 'Needs update'
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.app-token.outputs.token }}
-          author: "nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>"
+          sign-commits: true
           commit-message: "bot(readme): update"
           title: Update README
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"

From b6a6d8997c46dc15682020ce4fddc5a89ee1ac0d Mon Sep 17 00:00:00 2001
From: Juhan <92646057+Juhan280@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:01:11 +0600
Subject: [PATCH 1804/2704] feat(gleam): add `@local.scope` capture for block
 (#7128)

---
 queries/gleam/locals.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/gleam/locals.scm b/queries/gleam/locals.scm
index ba0632c0b..39909a4aa 100644
--- a/queries/gleam/locals.scm
+++ b/queries/gleam/locals.scm
@@ -24,6 +24,9 @@
 ; References
 (identifier) @local.reference
 
+; Block Scope
+(block) @local.scope
+
 ; Function Body Scope
 (function_body) @local.scope
 

From 66a7655a5e57605ccd1fcced74de99a84d2f09c2 Mon Sep 17 00:00:00 2001
From: Jerome Dalbert <jerome.dalbert@gmail.com>
Date: Wed, 11 Sep 2024 05:45:19 -0700
Subject: [PATCH 1805/2704] feat(ruby): improve identifiers highlighting

---
 queries/ruby/highlights.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index c3b9c6cb1..2b608d3cc 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -125,9 +125,12 @@
     "__callee__" "__dir__" "__id__" "__method__" "__send__" "__ENCODING__" "__FILE__" "__LINE__"))
 
 ((identifier) @function.builtin
-  (#any-of? @function.builtin
-    "include" "extend" "prepend" "attr_reader" "attr_writer" "attr_accessor" "module_function"
-    "refine" "using"))
+  (#any-of? @function.builtin "attr_reader" "attr_writer" "attr_accessor" "module_function"))
+
+((call
+  !receiver
+  method: (identifier) @function.builtin)
+  (#any-of? @function.builtin "include" "extend" "prepend" "refine" "using"))
 
 ((identifier) @keyword.exception
   (#any-of? @keyword.exception "raise" "fail" "catch" "throw"))

From 4af16a10b7f1e79275f712a1c6dcf725d301a303 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 06:43:21 +0000
Subject: [PATCH 1806/2704] bot(lockfile): update gomod, latex, markdown,
 markdown_inline, perl, scala

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f651dbba2..d30e9a8e1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -261,7 +261,7 @@
     "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
   },
   "gomod": {
-    "revision": "1f55029bacd0a6a11f6eb894c4312d429dcf735c"
+    "revision": "3b01edce2b9ea6766ca19328d1850e456fde3103"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -399,7 +399,7 @@
     "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
   },
   "latex": {
-    "revision": "90fd9894bebddce79f5b8041e7f82523364a619b"
+    "revision": "1e4e30342b7a3b3a24886a632fbac53035d98871"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -438,10 +438,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "c25b6354120182f1e0d5caa52f717b097a7e46a3"
+    "revision": "d9287a6f36347064e55c36858e9e522eb652c1ad"
   },
   "markdown_inline": {
-    "revision": "c25b6354120182f1e0d5caa52f717b097a7e46a3"
+    "revision": "d9287a6f36347064e55c36858e9e522eb652c1ad"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
@@ -519,7 +519,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "70db420b20885ecd7268e5a710ebb3aeaef3a293"
+    "revision": "465983954cae2d2f984eae82de5ed5f11ca291dc"
   },
   "php": {
     "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"
@@ -660,7 +660,7 @@
     "revision": "6b7d1fc73ded57f73b1619bcf4371618212208b1"
   },
   "scala": {
-    "revision": "b02af60518ae1633d552ae2d0f25ca5e05f274f7"
+    "revision": "42c065ca40760884301b887c56e344ca4d6feab3"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"

From e0338f2b74fbad808f2569c7d4eadd8796af2118 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 06:43:25 +0000
Subject: [PATCH 1807/2704] bot(lockfile): update glsl, hlsl, scala, slang

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d30e9a8e1..b81fce406 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -243,7 +243,7 @@
     "revision": "9d018a0f93417e6951264a26093b89ee63df7315"
   },
   "glsl": {
-    "revision": "ddc3137a2d775aca93084ff997fa13cc1691058a"
+    "revision": "66aec57f7119c7e8e40665b723cd7af5594f15ee"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -309,7 +309,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "cf432a7420eb71e9b40954aa829dcb8a9bf6b546"
+    "revision": "543930235970a04c2f0d549c9e88815847c7a74a"
   },
   "hlsplaylist": {
     "revision": "3bfda9271e3adb08d35f47a2102fe957009e1c55"
@@ -660,7 +660,7 @@
     "revision": "6b7d1fc73ded57f73b1619bcf4371618212208b1"
   },
   "scala": {
-    "revision": "42c065ca40760884301b887c56e344ca4d6feab3"
+    "revision": "ec13dd674bb8dd89213e0d6b1fe45efb68d5878f"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -675,7 +675,7 @@
     "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
   },
   "slang": {
-    "revision": "4a3fabd26b09efd7431ea4899e5f2d81b568a4b9"
+    "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
   },
   "slint": {
     "revision": "34ccfd58d3baee7636f62d9326f32092264e8407"

From 583395810e40373c1394d2e2e2393a63213ccbcd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 14 Sep 2024 06:42:48 +0000
Subject: [PATCH 1808/2704] bot(lockfile): update r

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index b81fce406..6bda383cb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -603,7 +603,7 @@
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
   },
   "r": {
-    "revision": "c8b6e5f3f3c055cfc76471ebc912286e9e73d7d2"
+    "revision": "4279b699c47fa87956045980c46c7d30f8c0121b"
   },
   "racket": {
     "revision": "5b211bf93021d1c45f39aa96898be9f794f087e4"

From 399062d072355be7cd3441a7931cb05378a6c6a2 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 14 Sep 2024 14:12:49 -0700
Subject: [PATCH 1809/2704] fix(lua): remove duplicate ellipsis highlight

---
 queries/lua/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 01c280f2d..79ab165aa 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -151,8 +151,6 @@
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
-(vararg_expression) @constant
-
 (nil) @constant.builtin
 
 [

From b7160e87aadbb3f5f6ee87ce139406fe3433044e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 15 Sep 2024 06:41:57 +0000
Subject: [PATCH 1810/2704] bot(lockfile): update hurl, v

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6bda383cb..d1bc6b54d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -330,7 +330,7 @@
     "revision": "7c68e1c8ce6eeef6bc4b749330c540dbbda5ba44"
   },
   "hurl": {
-    "revision": "fba6ed8db3a009b9e7d656511931b181a3ee5b08"
+    "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
   },
   "hyprlang": {
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
@@ -825,7 +825,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "d63bc6c08a88715c89f4b1b06642e130dd899aba"
+    "revision": "83b7286d8f4f33c88dff102bad22149d8e29d9eb"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 5c42228e586bd46cc75478f982f1d29655a7f9ef Mon Sep 17 00:00:00 2001
From: Heber <Anthony.Heber@gmail.com>
Date: Mon, 16 Sep 2024 00:15:57 -0600
Subject: [PATCH 1811/2704] feat(apex): update parser and highlights (#7151)

---
 lockfile.json               | 8 ++++----
 queries/apex/highlights.scm | 9 +++++----
 queries/soql/highlights.scm | 1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d1bc6b54d..0c18fa2c7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "c473dbc54ca27f95d8928cfdb2a1a79300e16951"
   },
   "apex": {
-    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
+    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
   },
   "arduino": {
     "revision": "ce02903e3ae74c729e9415dc32c276447b1c8afd"
@@ -672,7 +672,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
+    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
   },
   "slang": {
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
@@ -693,10 +693,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
+    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
   },
   "sosl": {
-    "revision": "602cc4b050ef1e14a69acc2ea094968bf928fa59"
+    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 15b016552..930972668 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -159,13 +159,13 @@
   (modifiers
     (modifier
       [
-        "final"
-        "static"
+        (final)
+        (static)
       ])
     (modifier
       [
-        "final"
-        "static"
+        (final)
+        (static)
       ]))
   (variable_declarator
     name: (identifier) @constant))
@@ -227,6 +227,7 @@
 
 [
   "abstract"
+  (all_rows_clause)
   "continue"
   "default"
   "extends"
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index f87e5147e..c2c08c86d 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -97,7 +97,6 @@
 [
   "ABOVE"
   "ABOVE_OR_BELOW"
-  "ALL_ROWS"
   "ALL"
   "AS"
   "ASC"

From b9002f6fe679e2b8025a46116081c0da629a6b8c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 06:44:39 +0000
Subject: [PATCH 1812/2704] bot(lockfile): update apex, sflog, soql, sosl,
 swift

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0c18fa2c7..f263662d4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "c473dbc54ca27f95d8928cfdb2a1a79300e16951"
   },
   "apex": {
-    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
+    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
   },
   "arduino": {
     "revision": "ce02903e3ae74c729e9415dc32c276447b1c8afd"
@@ -672,7 +672,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
+    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
   },
   "slang": {
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
@@ -693,10 +693,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
+    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
   },
   "sosl": {
-    "revision": "3cb650c4f85aa9d92266c2d7f6c0090bff6819c9"
+    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -732,7 +732,7 @@
     "revision": "774a65aea563accc35f5d45fafa4d96ec5761f57"
   },
   "swift": {
-    "revision": "7d303df70012edb7385a6a3b3938e0e7b89ecfbd"
+    "revision": "032930d6218d8ae23bde074cf29ce8d276b87533"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From cad9ff2fbc4a3c931cd7023611e931b0f337c9ae Mon Sep 17 00:00:00 2001
From: Jerome Dalbert <jerome.dalbert@gmail.com>
Date: Wed, 11 Sep 2024 04:20:29 -0700
Subject: [PATCH 1813/2704] feat(ruby): detect shebang directive

---
 queries/ruby/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm
index 2b608d3cc..8de0251b1 100644
--- a/queries/ruby/highlights.scm
+++ b/queries/ruby/highlights.scm
@@ -211,6 +211,11 @@
 
 (comment) @comment @spell
 
+((program
+  .
+  (comment) @keyword.directive @nospell)
+  (#lua-match? @keyword.directive "^#!/"))
+
 (program
   (comment)+ @comment.documentation
   (class))

From 4d94c24d6cb9985347bdf0692c1fd81088c6c8b2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 06:41:56 +0000
Subject: [PATCH 1814/2704] bot(lockfile): update d, http, nix

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f263662d4..28ceeea22 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"
+    "revision": "c0dc93c0268c61567a1c9325137c5f107f12e3fb"
   },
   "dart": {
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
@@ -327,7 +327,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "7c68e1c8ce6eeef6bc4b749330c540dbbda5ba44"
+    "revision": "a2865ebbe419da8ecb0f42cc4d3c53b14d9ea039"
   },
   "hurl": {
     "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
@@ -480,7 +480,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "537095ddc80cf610fa75a2a0149fe9799b011014"
+    "revision": "ceaf10eb2ae877175d58e6304f83ec6f4d704295"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"

From 3c6af36794b26e1bcac3f126b43e0f646154725d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 06:42:44 +0000
Subject: [PATCH 1815/2704] bot(lockfile): update d, fortran, go, inko, nix, r,
 tlaplus

---
 lockfile.json                  | 14 +++++++-------
 queries/fortran/highlights.scm |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 28ceeea22..dcd581dce 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "c0dc93c0268c61567a1c9325137c5f107f12e3fb"
+    "revision": "b0edd520697f7ea849fae0514490f5e094cfb680"
   },
   "dart": {
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
@@ -192,7 +192,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "8f842945abefb76b9a68c0835619b37060b8f098"
+    "revision": "7cdd245093c92fc9c5c80fa62d08ed46bcd98d04"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -252,7 +252,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "81a11f8252998ee6b98d59e6da91fc307491e53d"
+    "revision": "ecc20866d1bd4d80f3aef06456ed3014d4d598e6"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -342,7 +342,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "234c87be1dac20f766ddf6f486a7bde2a4bc5594"
+    "revision": "3a8887ca16dd8add3905216ce63796d4097c7a6f"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
@@ -480,7 +480,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "ceaf10eb2ae877175d58e6304f83ec6f4d704295"
+    "revision": "637ea4b4748bd4dae62976cccbff031198e688fc"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -603,7 +603,7 @@
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
   },
   "r": {
-    "revision": "4279b699c47fa87956045980c46c7d30f8c0121b"
+    "revision": "2097fa502efa21349d26af0ffee55d773015e481"
   },
   "racket": {
     "revision": "5b211bf93021d1c45f39aa96898be9f794f087e4"
@@ -774,7 +774,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "bba02e79f85e335f310fc95e21c677e49f2c4439"
+    "revision": "a9f9c136baa9b73c63850be92301fb5f1fc9b2fd"
   },
   "tmux": {
     "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 34b612c8b..6a6dbba35 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -1,5 +1,5 @@
 ; Preprocs
-(preproc_file_line) @keyword.directive
+(preproc_directive) @keyword.directive
 
 ; Namespaces
 (program_statement

From 45ee50d02bc3fa1b9cc3770da41242b07afcd6f3 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Wed, 18 Sep 2024 22:03:28 -0700
Subject: [PATCH 1816/2704] feat(htmldjango): improve punctuation highlighting

In Django templates `{{` and `{%` are interpolations, so they should be
highlighted as @punctuation.special.

Don't highlight quotes as delimiters (consistency) and add missing comma
delimiter.
---
 queries/htmldjango/highlights.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index 5648e72fc..3992b826d 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -10,7 +10,7 @@
   "{%"
   "%}"
   (end_paired_statement)
-] @punctuation.bracket
+] @punctuation.special
 
 (tag_name) @function
 
@@ -69,6 +69,5 @@
 
 [
   ":"
-  "'"
-  "\""
+  ","
 ] @punctuation.delimiter

From 12e339e370aa7c7ec8a57579425dd5d95a309b7e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 17 Sep 2024 14:33:30 -0700
Subject: [PATCH 1817/2704] feat(swift): add many missing highlights

---
 queries/swift/highlights.scm | 129 ++++++++++++++++++++++-------------
 1 file changed, 83 insertions(+), 46 deletions(-)

diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 562be5e33..5c52ee9d6 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -5,9 +5,7 @@
   ","
 ] @punctuation.delimiter
 
-; TODO: "\\(" ")" in interpolations should be @punctuation.special
 [
-  "\\("
   "("
   ")"
   "["
@@ -17,14 +15,18 @@
 ] @punctuation.bracket
 
 ; Identifiers
-(attribute) @variable
-
 (type_identifier) @type
 
-(self_expression) @variable.builtin
+[
+  (self_expression)
+  (super_expression)
+] @variable.builtin
 
 ; Declarations
-"func" @keyword.function
+[
+  "func"
+  "deinit"
+] @keyword.function
 
 [
   (visibility_modifier)
@@ -36,16 +38,17 @@
   (mutation_modifier)
 ] @keyword.modifier
 
+(simple_identifier) @variable
+
 (function_declaration
   (simple_identifier) @function.method)
 
+(protocol_function_declaration
+  name: (simple_identifier) @function.method)
+
 (init_declaration
   "init" @constructor)
 
-(throws) @keyword
-
-(where_keyword) @keyword
-
 (parameter
   external_name: (simple_identifier) @variable.parameter)
 
@@ -63,9 +66,6 @@
   (identifier
     (simple_identifier) @variable.parameter))
 
-(pattern
-  bound_identifier: (simple_identifier)) @variable
-
 [
   "protocol"
   "extension"
@@ -80,6 +80,16 @@
   "unowned"
   "didSet"
   "willSet"
+  "subscript"
+  "let"
+  "var"
+  (throws)
+  (where_keyword)
+  (getter_specifier)
+  (setter_specifier)
+  (modify_specifier)
+  (else)
+  (as_operator)
 ] @keyword
 
 [
@@ -94,12 +104,6 @@
   "await"
 ] @keyword.coroutine
 
-[
-  (getter_specifier)
-  (setter_specifier)
-  (modify_specifier)
-] @keyword
-
 (shebang_line) @keyword.directive
 
 (class_body
@@ -116,7 +120,8 @@
     (simple_identifier) @variable.member))
 
 (value_argument
-  name: (value_argument_label) @variable.member)
+  name: (value_argument_label
+    (simple_identifier) @variable.member))
 
 (import_declaration
   "import" @keyword.import)
@@ -124,14 +129,11 @@
 (enum_entry
   "case" @keyword)
 
-; Attributes
-(modifiers
-  (attribute) @attribute.builtin)
-
 (modifiers
   (attribute
+    "@" @attribute
     (user_type
-      (type_identifier) @attribute.builtin)))
+      (type_identifier) @attribute)))
 
 ; Function calls
 (call_expression
@@ -151,9 +153,30 @@
   (simple_identifier) @type) ; SomeType.method(): highlight SomeType as a type
   (#lua-match? @type "^[A-Z]"))
 
-(directive) @function.macro
+(directive) @keyword.directive
 
-(diagnostic) @function.macro
+; See https://docs.swift.org/swift-book/documentation/the-swift-programming-language/lexicalstructure/#Keywords-and-Punctuation
+[
+  (diagnostic)
+  "#available"
+  "#unavailable"
+  "#fileLiteral"
+  "#colorLiteral"
+  "#imageLiteral"
+  "#keyPath"
+  "#selector"
+  "#externalMacro"
+] @function.macro
+
+[
+  "#column"
+  "#dsohandle"
+  "#fileID"
+  "#filePath"
+  "#file"
+  "#function"
+  "#line"
+] @constant.macro
 
 ; Statements
 (for_statement
@@ -162,13 +185,6 @@
 (for_statement
   "in" @keyword.repeat)
 
-(for_statement
-  (pattern) @variable)
-
-(else) @keyword
-
-(as_operator) @keyword
-
 [
   "while"
   "repeat"
@@ -176,11 +192,6 @@
   "break"
 ] @keyword.repeat
 
-[
-  "let"
-  "var"
-] @keyword
-
 (guard_statement
   "guard" @keyword.conditional)
 
@@ -205,13 +216,14 @@
   [
     "?"
     ":"
-  ] @keyword.conditional)
+  ] @keyword.conditional.ternary)
 
 [
+  (try_operator)
   "do"
   (throw_keyword)
   (catch_keyword)
-] @keyword
+] @keyword.exception
 
 (statement_label) @label
 
@@ -233,7 +245,7 @@
 ; String literals
 (line_str_text) @string
 
-(str_escaped_char) @string
+(str_escaped_char) @string.escape
 
 (multi_line_str_text) @string
 
@@ -241,7 +253,23 @@
 
 (raw_str_end_part) @string
 
-(raw_str_interpolation_start) @punctuation.special
+(line_string_literal
+  [
+    "\\("
+    ")"
+  ] @punctuation.special)
+
+(multi_line_string_literal
+  [
+    "\\("
+    ")"
+  ] @punctuation.special)
+
+(raw_str_interpolation
+  [
+    (raw_str_interpolation_start)
+    ")"
+  ] @punctuation.special)
 
 [
   "\""
@@ -266,6 +294,8 @@
 
 "nil" @constant.builtin
 
+(wildcard_pattern) @character.special
+
 ; Regex literals
 (regex_literal) @string.regexp
 
@@ -273,9 +303,6 @@
 (custom_operator) @operator
 
 [
-  "try"
-  "try?"
-  "try!"
   "+"
   "-"
   "*"
@@ -288,10 +315,13 @@
   "/="
   "<"
   ">"
+  "<<"
+  ">>"
   "<="
   ">="
   "++"
   "--"
+  "^"
   "&"
   "&&"
   "|"
@@ -302,9 +332,16 @@
   "!=="
   "=="
   "==="
+  "?"
   "??"
   "->"
   "..<"
   "..."
   (bang)
 ] @operator
+
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)

From 63c532fde5fe52a6ad907b577cdc3fa136475fc6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 17 Sep 2024 17:53:26 -0700
Subject: [PATCH 1818/2704] feat(swift): fold queries

---
 queries/swift/folds.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 queries/swift/folds.scm

diff --git a/queries/swift/folds.scm b/queries/swift/folds.scm
new file mode 100644
index 000000000..cfbc6d0b1
--- /dev/null
+++ b/queries/swift/folds.scm
@@ -0,0 +1,35 @@
+; format-ignore
+[
+  (protocol_body)               ; protocol Foo { ... }
+  (class_body)                  ; class Foo { ... }
+  (enum_class_body)             ; enum Foo { ... }
+  (function_body)               ; func Foo (...) {...}
+  (computed_property)           ; { ... }
+
+  (computed_getter)             ; get { ... }
+  (computed_setter)             ; set { ... }
+
+  (do_statement)
+  (if_statement)
+  (for_statement)
+  (switch_statement)
+  (while_statement)
+  (guard_statement)
+  (switch_entry)
+
+  (type_parameters)             ; x<Foo>
+  (tuple_type)                  ; (...)
+  (array_type)                  ; [String]
+  (dictionary_type)             ; [Foo: Bar]
+
+  (call_expression)             ; callFunc(...)
+  (tuple_expression)            ; ( foo + bar )
+  (array_literal)               ; [ foo, bar ]
+  (dictionary_literal)          ; [ foo: bar, x: y ]
+  (lambda_literal) 
+  (willset_didset_block)
+  (willset_clause)
+  (didset_clause)
+
+  (import_declaration)+
+] @fold

From 2b2ac302324f4cd2194c5dcaa59332b65e1c6403 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 19 Sep 2024 06:44:21 +0000
Subject: [PATCH 1819/2704] bot(lockfile): update editorconfig, fortran, nix,
 perl

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dcd581dce..cc447f718 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "faf014c607f912ff666b20183d32a03dcfc3111d"
+    "revision": "a761198025448c77ea11bcf22505b395a77fc0d0"
   },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
@@ -192,7 +192,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "7cdd245093c92fc9c5c80fa62d08ed46bcd98d04"
+    "revision": "c52e978afadf3faed52bb3c8082cc472c915f4e7"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -480,7 +480,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "637ea4b4748bd4dae62976cccbff031198e688fc"
+    "revision": "01bc5b18693055aab7a863d7608f4b3f85843cf8"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -519,7 +519,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "465983954cae2d2f984eae82de5ed5f11ca291dc"
+    "revision": "458e694f63d59edc72a9fb321443f70f740e04e8"
   },
   "php": {
     "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"

From 188b1a6d01fd9bcf04bf2bc932d611809b154acc Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Thu, 19 Sep 2024 23:15:01 -0700
Subject: [PATCH 1820/2704] feat(highlights): capture wildcard patterns as
 `@character.special` (#7153)

---
 queries/c_sharp/highlights.scm    |  6 +++++-
 queries/elm/highlights.scm        |  4 ++--
 queries/gdscript/highlights.scm   |  7 ++++---
 queries/haskell/highlights.scm    |  5 ++---
 queries/java/highlights.scm       |  2 ++
 queries/menhir/highlights.scm     |  3 ++-
 queries/ocaml/highlights.scm      |  6 ++++++
 queries/purescript/highlights.scm |  7 ++++---
 queries/python/highlights.scm     |  2 +-
 queries/query/highlights.scm      |  2 +-
 queries/roc/highlights.scm        |  2 +-
 queries/rust/highlights.scm       | 17 +++++++++++++----
 queries/scala/highlights.scm      |  3 ++-
 13 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 90d0d3407..f23d7ec65 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -217,7 +217,6 @@
   "module"
   "this"
   "base"
-  (discard)
 ] @variable.builtin
 
 (constructor_declaration
@@ -430,6 +429,11 @@
   ".."
 ] @operator
 
+(list_pattern
+  ".." @character.special)
+
+(discard) @character.special
+
 [
   ";"
   "."
diff --git a/queries/elm/highlights.scm b/queries/elm/highlights.scm
index fc18566c9..cfa09caf1 100644
--- a/queries/elm/highlights.scm
+++ b/queries/elm/highlights.scm
@@ -67,7 +67,7 @@
   (lower_case_identifier) @variable)
 
 (anything_pattern
-  (underscore) @variable)
+  (underscore) @character.special)
 
 (record_base_identifier
   (lower_case_identifier) @variable)
@@ -88,7 +88,7 @@
 
 (function_declaration_left
   (anything_pattern
-    (underscore) @variable.parameter))
+    (underscore) @character.special))
 
 (function_declaration_left
   (lower_pattern
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 9f122e473..bc62bc2f5 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -129,9 +129,10 @@
   (#eq? @keyword.operator "new"))
 
 ; Match Pattern
-(underscore) @constant ; The "_" pattern.
-
-(pattern_open_ending) @operator ; The ".." pattern.
+[
+  (underscore)
+  (pattern_open_ending)
+] @character.special
 
 ; Alternations
 [
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
index 9373b6e1d..0880f020e 100644
--- a/queries/haskell/highlights.scm
+++ b/queries/haskell/highlights.scm
@@ -4,8 +4,6 @@
 ; and don't override destructured parameters
 (variable) @variable
 
-(pattern/wildcard) @variable
-
 (decl/function
   patterns: (patterns
     (_) @variable.parameter))
@@ -78,7 +76,6 @@
   (operator)
   (constructor_operator)
   (all_names)
-  (wildcard)
   "."
   ".."
   "="
@@ -92,6 +89,8 @@
   "@"
 ] @operator
 
+(wildcard) @character.special
+
 (module
   (module_id) @module)
 
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 316987178..d29d12632 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -2,6 +2,8 @@
 ; Variables
 (identifier) @variable
 
+(underscore_pattern) @character.special
+
 ; Methods
 (method_declaration
   name: (identifier) @function.method)
diff --git a/queries/menhir/highlights.scm b/queries/menhir/highlights.scm
index 6a7ceb085..022fda82e 100644
--- a/queries/menhir/highlights.scm
+++ b/queries/menhir/highlights.scm
@@ -27,11 +27,12 @@
 [
   "="
   "~"
-  "_"
 ] @operator
 
 (modifier) @operator
 
+"_" @character.special
+
 [
   "<"
   ">"
diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm
index 6c7851378..891ff7bd5 100644
--- a/queries/ocaml/highlights.scm
+++ b/queries/ocaml/highlights.scm
@@ -32,6 +32,9 @@
 
 (value_pattern) @variable.parameter
 
+((value_pattern) @character.special
+  (#eq? @character.special "_"))
+
 ; Functions
 ;----------
 (let_binding
@@ -272,6 +275,9 @@
   ".."
 ] @punctuation.delimiter
 
+(range_pattern
+  ".." @character.special)
+
 ; Operators
 ;----------
 [
diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm
index 5f07e9b48..02426b0ab 100644
--- a/queries/purescript/highlights.scm
+++ b/queries/purescript/highlights.scm
@@ -118,11 +118,12 @@
   "role" @keyword
   role: (type_role) @keyword.modifier)
 
-(hole) @character.special
-
 ; `_` wildcards in if-then-else and case-of expressions,
 ; as well as record updates and operator sections
-(wildcard) @variable.parameter
+[
+  "_"
+  (hole)
+] @character.special
 
 ; ----------------------------------------------------------------------------
 ; Functions and variables
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 232d40916..2363dc323 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -21,7 +21,7 @@
     ; https://docs.python.org/3/library/constants.html
     "NotImplemented" "Ellipsis" "quit" "exit" "copyright" "credits" "license"))
 
-"_" @constant.builtin ; match wildcard
+"_" @character.special ; match wildcard
 
 ((attribute
   attribute: (identifier) @variable.member)
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index e459b4460..f839ec985 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -43,7 +43,7 @@
   "#"
 ] @punctuation.special
 
-"_" @constant
+"_" @character.special
 
 ((parameters
   (identifier) @number)
diff --git a/queries/roc/highlights.scm b/queries/roc/highlights.scm
index 89b42a6a5..1f950cbc0 100644
--- a/queries/roc/highlights.scm
+++ b/queries/roc/highlights.scm
@@ -62,7 +62,7 @@
   (operator)
 ] @operator
 
-(wildcard_pattern) @constant.builtin
+(wildcard_pattern) @character.special
 
 [
   "if"
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 2836a95c2..c202206ca 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -31,10 +31,9 @@
 (mod_item
   name: (identifier) @module)
 
-[
-  (self)
-  "_"
-] @variable.builtin
+(self) @variable.builtin
+
+"_" @character.special
 
 (label
   [
@@ -376,6 +375,16 @@
 (use_wildcard
   "*" @character.special)
 
+(remaining_field_pattern
+  ".." @character.special)
+
+(range_pattern
+  [
+    ".."
+    "..="
+    "..."
+  ] @character.special)
+
 ; Punctuation
 [
   "("
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 3ff64309f..e53dcd06d 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -211,7 +211,8 @@
 
 (null_literal) @constant.builtin
 
-(wildcard) @variable.parameter
+(wildcard
+  "_") @character.special
 
 (namespace_wildcard
   [

From 1fbc25fc111cf5c7e73819657c8968dc5fa302ad Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2024 06:44:40 +0000
Subject: [PATCH 1821/2704] bot(lockfile): update elm, lalrpop, v

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cc447f718..d720424d4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -153,7 +153,7 @@
     "revision": "2c6e93171477973b38de4b1d2be427cc99f990a6"
   },
   "elm": {
-    "revision": "09dbf221d7491dc8d8839616b27c21b9c025c457"
+    "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -396,7 +396,7 @@
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
   },
   "lalrpop": {
-    "revision": "854a40e99f7c70258e522bdb8ab584ede6196e2e"
+    "revision": "194c25539f435de415ee0551a5f07058833da915"
   },
   "latex": {
     "revision": "1e4e30342b7a3b3a24886a632fbac53035d98871"
@@ -825,7 +825,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "83b7286d8f4f33c88dff102bad22149d8e29d9eb"
+    "revision": "60f2bc0e6ffae43e96a45f26db80c27196e079d3"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From b8ad0473f4d5d7b59e17a67ad0b68711b0232486 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 20 Sep 2024 12:11:21 -0700
Subject: [PATCH 1822/2704] fix(markdown): broader link recognition

**Problem:** Neovim's `gx` will not work when the cursor is on the first
`[` of an inline Markdown link.

**Solution:** Set the `url` metadata property on the link parent node,
rather than just the link label node
---
 queries/markdown_inline/highlights.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 148ef0fad..2070e9b3b 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -40,14 +40,12 @@
   (image_description)
 ] @markup.link.label
 
-(inline_link
-  (link_text) @_label
-  (link_destination) @_url
+((inline_link
+  (link_destination) @_url) @_label
   (#set! @_label url @_url))
 
-(image
-  (image_description) @_label
-  (link_destination) @_url
+((image
+  (link_destination) @_url) @_label
   (#set! @_label url @_url))
 
 ; Conceal image links

From 929ca9c76ee20bb27cffbde4ee90583b6c54d616 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 21 Sep 2024 06:41:24 +0000
Subject: [PATCH 1823/2704] bot(lockfile): update cpp, d, http, v

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d720424d4..fa7bf6082 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "30f973c2244f0bff444186185f475c3bd76bc3a5"
+    "revision": "b53713a1194daf625fca185d1e54e6988d97ea1e"
   },
   "css": {
     "revision": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7"
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "b0edd520697f7ea849fae0514490f5e094cfb680"
+    "revision": "345206d1c4eb0ec70903d025d8bbb9e97379ccd1"
   },
   "dart": {
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
@@ -327,7 +327,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "a2865ebbe419da8ecb0f42cc4d3c53b14d9ea039"
+    "revision": "231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94"
   },
   "hurl": {
     "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
@@ -825,7 +825,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "60f2bc0e6ffae43e96a45f26db80c27196e079d3"
+    "revision": "4f93826aeb31066eb241f4ccbca61f052239803f"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 2b2635551c83f26f87bf122ad25fcaf90b9a6be0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 22 Sep 2024 06:41:52 +0000
Subject: [PATCH 1824/2704] bot(lockfile): update d, ocaml, ocaml_interface,
 supercollider

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fa7bf6082..16c017718 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "d": {
-    "revision": "345206d1c4eb0ec70903d025d8bbb9e97379ccd1"
+    "revision": "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"
   },
   "dart": {
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
@@ -495,10 +495,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "14beb5ef0e7488bf1d93b8c67f69942324fee557"
+    "revision": "19639e5dcd68a34f7704ea2e39a5730308c2234c"
   },
   "ocaml_interface": {
-    "revision": "14beb5ef0e7488bf1d93b8c67f69942324fee557"
+    "revision": "19639e5dcd68a34f7704ea2e39a5730308c2234c"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -723,7 +723,7 @@
     "revision": "b729198642b3058d4ea0f864d86efb271d594595"
   },
   "supercollider": {
-    "revision": "affa4389186b6939d89673e1e9d2b28364f5ca6f"
+    "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From 20b5cbfa92cac93ab78f3fefeb6169e4ea303189 Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Sun, 22 Sep 2024 21:15:38 +0300
Subject: [PATCH 1825/2704] feat(perl): support more modern syntax

---
 lockfile.json               |  2 +-
 queries/perl/highlights.scm | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 16c017718..061b68a5b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -519,7 +519,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "458e694f63d59edc72a9fb321443f70f740e04e8"
+    "revision": "81c57e274c541c30d6c204c8dbceb90ec647ed8d"
   },
   "php": {
     "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index f654577f6..554743b32 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -45,6 +45,11 @@
   "method"
 ] @keyword.function
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 [
   "map"
   "grep"
@@ -54,6 +59,7 @@
 [
   "package"
   "class"
+  "role"
 ] @keyword.import
 
 [
@@ -63,6 +69,7 @@
   "my"
   "our"
   "local"
+  "dynamically"
   "state"
   "field"
   "last"
@@ -82,10 +89,16 @@
 (phaser_statement
   phase: _ @keyword)
 
+(class_phaser_statement
+  phase: _ @keyword)
+
 [
   "or"
+  "xor"
   "and"
   "eq"
+  "equ"
+  "eqr"
   "ne"
   "cmp"
   "lt"
@@ -106,6 +119,8 @@
   (version)
 ] @number
 
+(boolean) @boolean
+
 [
   (string_literal)
   (interpolated_string_literal)

From 621f5901f0b3e762cc4c5ed0f9246cf1495193ad Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 06:44:41 +0000
Subject: [PATCH 1826/2704] bot(lockfile): update apex, c, cpp, ocaml,
 ocaml_interface, sflog, soql, sosl, zig

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 061b68a5b..8ada0febc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "c473dbc54ca27f95d8928cfdb2a1a79300e16951"
   },
   "apex": {
-    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
+    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
   },
   "arduino": {
     "revision": "ce02903e3ae74c729e9415dc32c276447b1c8afd"
@@ -51,7 +51,7 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "bc85948c0bec746ebe921f72d2296d47e17d4ea7"
+    "revision": "f4c21152f1952a99f4744e8c41d3ffb8038ae78c"
   },
   "c_sharp": {
     "revision": "fd7f7402db6e66afd70b402fb2e367b2d71c10d6"
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "b53713a1194daf625fca185d1e54e6988d97ea1e"
+    "revision": "30d2fa385735378388a55917e2910965fce19748"
   },
   "css": {
     "revision": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7"
@@ -495,10 +495,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "19639e5dcd68a34f7704ea2e39a5730308c2234c"
+    "revision": "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"
   },
   "ocaml_interface": {
-    "revision": "19639e5dcd68a34f7704ea2e39a5730308c2234c"
+    "revision": "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -672,7 +672,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
+    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
   },
   "slang": {
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
@@ -693,10 +693,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
+    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
   },
   "sosl": {
-    "revision": "45994a30c6e421995ebc61f8c4c61cf75d249e27"
+    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -885,6 +885,6 @@
     "revision": "0554b4a5d313244b7fc000cbb41c04afae4f4e31"
   },
   "zig": {
-    "revision": "21e2218e0ec7f4e3c0640d16bf8c67e6f0a61e18"
+    "revision": "eb7d58c2dc4fbeea4745019dee8df013034ae66b"
   }
 }

From 160b1714ec5024e480da0a356cada1bec2474f7f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 06:44:43 +0000
Subject: [PATCH 1827/2704] bot(lockfile): update angular, powershell

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8ada0febc..53c61ec20 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
   },
   "angular": {
-    "revision": "c473dbc54ca27f95d8928cfdb2a1a79300e16951"
+    "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
     "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
@@ -546,7 +546,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "fc15514b2f1dbba9c58528d15a3708f89eda6a01"
+    "revision": "ebe2ab2f642eda2072c68c8de02e83973c26f33c"
   },
   "printf": {
     "revision": "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"

From 6511cd984ab4b21e28f83af488f38dc89c3b0586 Mon Sep 17 00:00:00 2001
From: Kai Moschcau <mail@kmoschcau.de>
Date: Tue, 24 Sep 2024 09:26:55 +0200
Subject: [PATCH 1828/2704] fix(jsdoc): disable spelling for identifiers
 (#7172)

---
 queries/jsdoc/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/jsdoc/highlights.scm b/queries/jsdoc/highlights.scm
index c6459efb7..08953a062 100644
--- a/queries/jsdoc/highlights.scm
+++ b/queries/jsdoc/highlights.scm
@@ -17,7 +17,7 @@
   "~"
 ] @punctuation.delimiter
 
-(identifier) @variable
+(identifier) @variable @nospell
 
 (tag
   (tag_name) @_name

From 0c8a582e474e248f2a4406188e0c653f92a064cf Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2024 06:44:42 +0000
Subject: [PATCH 1829/2704] bot(lockfile): update odin

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 53c61ec20..9a5225a5f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -504,7 +504,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "d37b8f24f653378b268ec18404e9c14ad355b128"
+    "revision": "3fee7964bbfb2554deef12c224344f3870d15375"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"

From a1b791604b079c5aaac3cb67aafffd30fb371bc0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 06:44:30 +0000
Subject: [PATCH 1830/2704] bot(lockfile): update re2c

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 9a5225a5f..1189924de 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -618,7 +618,7 @@
     "revision": "8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99"
   },
   "re2c": {
-    "revision": "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"
+    "revision": "c18a3c2f4b6665e35b7e50d6048ea3cff770c572"
   },
   "readline": {
     "revision": "3d4768b04d7cfaf40533e12b28672603428b8f31"

From 679883ad31f1752cac92a4ca182cee8b2751d4f1 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 26 Sep 2024 00:09:41 -0700
Subject: [PATCH 1831/2704] feat(gleam,luau): use `@keyword.type` captures
 (#7181)

---
 queries/gleam/highlights.scm            | 3 ++-
 queries/luau/highlights.scm             | 7 +++----
 tests/query/highlights/gleam/type.gleam | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index 9daf9b8b2..5238c601b 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -4,10 +4,11 @@
   "let"
   "panic"
   "todo"
-  "type"
   "use"
 ] @keyword
 
+"type" @keyword.type
+
 ; Function Keywords
 "fn" @keyword.function
 
diff --git a/queries/luau/highlights.scm b/queries/luau/highlights.scm
index dcb866c51..f6f64b30c 100644
--- a/queries/luau/highlights.scm
+++ b/queries/luau/highlights.scm
@@ -4,10 +4,9 @@
 ; Keywords
 "return" @keyword.return
 
-[
-  "local"
-  "type"
-] @keyword
+"local" @keyword
+
+"type" @keyword.type
 
 "export" @keyword.import
 
diff --git a/tests/query/highlights/gleam/type.gleam b/tests/query/highlights/gleam/type.gleam
index de0f9c4af..5b0aa021f 100644
--- a/tests/query/highlights/gleam/type.gleam
+++ b/tests/query/highlights/gleam/type.gleam
@@ -1,6 +1,6 @@
 pub type Cat {
 // <- @keyword.modifier
-//  ^^^^ @keyword
+//  ^^^^ @keyword.type
 //       ^^^ @type
 //           ^ @punctuation.bracket
   Cat(name: String, cuteness: Int)
@@ -38,7 +38,7 @@ fn cats() {
 }
 
 type Box(inner_type) {
-// <- @keyword
+// <- @keyword.type
 //   ^^^ @type
 //      ^ @punctuation.bracket
 //       ^^^^^^^^^^ @type
@@ -56,7 +56,7 @@ type Box(inner_type) {
 pub opaque type Counter {
 // <- @keyword.modifier
 //  ^^^^^^ @keyword.modifier
-//         ^^^^ @keyword
+//         ^^^^ @keyword.type
 //              ^^^^^^^ @type
 //                      ^ @punctuation.bracket
   Counter(value: Int)

From f027762845fa35ff27fe0487c86537a74a480a0c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 06:45:06 +0000
Subject: [PATCH 1832/2704] bot(lockfile): update devicetree, fortran, gleam,
 inko, markdown, markdown_inline, nix, ocaml, ocaml_interface, tact, templ

---
 lockfile.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1189924de..c6eb4fbef 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,7 +108,7 @@
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
   },
   "devicetree": {
-    "revision": "296b3c294a8bcfca6673296d99f9cd37049b8026"
+    "revision": "07a647c8fb70e6b06379a60526721e3141aa2fd2"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -192,7 +192,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "c52e978afadf3faed52bb3c8082cc472c915f4e7"
+    "revision": "4a593dda9cbc050a6686187249f8350ceea292ce"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -231,7 +231,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "9586f38658da115c90e2d01099c83479eb0eea99"
+    "revision": "57c9951b290c8084d7c60b0aee7a2b30986ea031"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
@@ -342,7 +342,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "3a8887ca16dd8add3905216ce63796d4097c7a6f"
+    "revision": "6f9c072d023c3886aabcd8012274461b35d2d0a9"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
@@ -438,10 +438,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "d9287a6f36347064e55c36858e9e522eb652c1ad"
+    "revision": "b7eba93e6a3e588e259e831416ac11abdaa8616a"
   },
   "markdown_inline": {
-    "revision": "d9287a6f36347064e55c36858e9e522eb652c1ad"
+    "revision": "b7eba93e6a3e588e259e831416ac11abdaa8616a"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
@@ -480,7 +480,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "01bc5b18693055aab7a863d7608f4b3f85843cf8"
+    "revision": "e68105245140008bd83ef4c28299f018fa876194"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -495,10 +495,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"
+    "revision": "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e"
   },
   "ocaml_interface": {
-    "revision": "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"
+    "revision": "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -750,7 +750,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "b3710fe2723bd9b285de7f3d0c0717bebf3f17bd"
+    "revision": "d16804029968f53f26f5afc695166a55bb0b68b2"
   },
   "tcl": {
     "revision": "cdba4ab96a9896492d0d5219b70300c8783ca4e7"
@@ -759,7 +759,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "0524da9e1f14b9b7d7d6d36608293f85a550b263"
+    "revision": "2b0c7b5848309567693fc6c86f654003e820ca1d"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From 84836f08ef840756990cab874f9f5e18d4f173f5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 28 Sep 2024 06:42:57 +0000
Subject: [PATCH 1833/2704] bot(lockfile): update koto, nix

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c6eb4fbef..0ecd22d11 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -390,7 +390,7 @@
     "revision": "ec985672ff21f7fd7f835869d8021e8f87304bb4"
   },
   "koto": {
-    "revision": "d4109879ba1387d19095269a7473bd7d274ab848"
+    "revision": "cbf637e5163065934c827d254b293f4d2f08f523"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -480,7 +480,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "e68105245140008bd83ef4c28299f018fa876194"
+    "revision": "fcf1857e254ab654e0fb73fe9706e33c52e79a5c"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"

From 36b78d112bddd69a05e24679241962e29e494d9e Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 28 Sep 2024 09:45:49 -0700
Subject: [PATCH 1834/2704] fix(markdown): don't set link metadata twice

Otherwise the same link will be opened twice when the cursor is on the
link text itself.
---
 queries/markdown_inline/highlights.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/queries/markdown_inline/highlights.scm b/queries/markdown_inline/highlights.scm
index 2070e9b3b..5fb9e911d 100644
--- a/queries/markdown_inline/highlights.scm
+++ b/queries/markdown_inline/highlights.scm
@@ -91,9 +91,6 @@
   (email_autolink)
 ] @markup.link.url @nospell
 
-((link_destination) @_url
-  (#set! @_url url @_url))
-
 ((uri_autolink) @_url
   (#offset! @_url 0 1 0 -1)
   (#set! @_url url @_url))

From 1f2059f29329560e11438b0e5b3e7282bb7e8c59 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 29 Sep 2024 06:43:41 +0000
Subject: [PATCH 1835/2704] bot(lockfile): update arduino, elixir, templ,
 tlaplus

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0ecd22d11..525cc8a3b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
   },
   "arduino": {
-    "revision": "ce02903e3ae74c729e9415dc32c276447b1c8afd"
+    "revision": "415ebc8f75eb02a748faa03f5af199f08ced120f"
   },
   "asm": {
     "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
@@ -150,7 +150,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "2c6e93171477973b38de4b1d2be427cc99f990a6"
+    "revision": "ef124b83a3f3572b0af23db4efae3f8de06a15e1"
   },
   "elm": {
     "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
@@ -759,7 +759,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "2b0c7b5848309567693fc6c86f654003e820ca1d"
+    "revision": "80d1a04e6bf3ced1c924bcb05527aa2eaf3f6239"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -774,7 +774,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "a9f9c136baa9b73c63850be92301fb5f1fc9b2fd"
+    "revision": "b9e3978f363b3f8884c886a01d15e41bd14d30bd"
   },
   "tmux": {
     "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"

From 707313b80a2f1e65fa06dba2052cc49ce6762a60 Mon Sep 17 00:00:00 2001
From: Nikolaj Sidorenco <Nikolaj176@hotmail.com>
Date: Sun, 29 Sep 2024 11:08:21 +0200
Subject: [PATCH 1836/2704] feat(fsharp): add parser and queries (#7166)

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   9 +
 queries/fsharp/highlights.scm   | 411 ++++++++++++++++++++++++++++++++
 queries/fsharp/injections.scm   |  11 +
 5 files changed, 435 insertions(+)
 create mode 100644 queries/fsharp/highlights.scm
 create mode 100644 queries/fsharp/injections.scm

diff --git a/README.md b/README.md
index a953df38f..40ac497f1 100644
--- a/README.md
+++ b/README.md
@@ -239,6 +239,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [forth](https://github.com/AlexanderBrevig/tree-sitter-forth) (maintained by @amaanq)
 - [x] [fortran](https://github.com/stadelmanma/tree-sitter-fortran) (maintained by @amaanq)
 - [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
+- [x] [fsharp](https://github.com/ionide/tree-sitter-fsharp) (maintained by @nsidorenco)
 - [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
 - [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
 - [x] [GAP system](https://github.com/gap-system/tree-sitter-gap) (maintained by @reiniscirpons)
diff --git a/lockfile.json b/lockfile.json
index 525cc8a3b..945d50e4a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -197,6 +197,9 @@
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
+  "fsharp": {
+    "revision": "f920105eec2d574eb911d7a25c81cdaa079a3f72"
+  },
   "func": {
     "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b975ec41c..22800a9bd 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -617,6 +617,15 @@ list.fsh = {
   maintainers = { "@mgramigna" },
 }
 
+list.fsharp = {
+  install_info = {
+    url = "https://github.com/ionide/tree-sitter-fsharp",
+    files = { "src/parser.c", "src/scanner.c" },
+    location = "fsharp",
+  },
+  maintainers = { "@nsidorenco" },
+}
+
 list.func = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-func",
diff --git a/queries/fsharp/highlights.scm b/queries/fsharp/highlights.scm
new file mode 100644
index 000000000..e400e3522
--- /dev/null
+++ b/queries/fsharp/highlights.scm
@@ -0,0 +1,411 @@
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+((line_comment) @comment.documentation @spell
+  (#lua-match? @comment.documentation "^///"))
+
+(const
+  [
+    (_) @constant
+    (unit) @constant.builtin
+  ])
+
+(primary_constr_args
+  (_) @variable.parameter)
+
+(class_as_reference
+  (_) @variable.parameter.builtin)
+
+(type_name
+  type_name: (_) @type.definition)
+
+[
+  (_type)
+  (atomic_type)
+] @type
+
+(member_signature
+  .
+  (identifier) @function.method)
+
+(member_signature
+  (curried_spec
+    (arguments_spec
+      (argument_spec
+        (argument_name_spec
+          "?"? @character.special
+          name: (_) @variable.parameter)))))
+
+(union_type_case
+  (identifier) @constant)
+
+(rules
+  (rule
+    pattern: (_) @constant
+    block: (_)))
+
+(wildcard_pattern) @character.special
+
+(identifier_pattern
+  .
+  (_) @constant
+  .
+  (_) @variable)
+
+(optional_pattern
+  "?" @character.special)
+
+(fsi_directive_decl
+  .
+  (string) @module)
+
+(import_decl
+  .
+  (_) @module)
+
+(named_module
+  name: (_) @module)
+
+(namespace
+  name: (_) @module)
+
+(module_defn
+  (identifier) @module)
+
+(ce_expression
+  .
+  (_) @constant.macro)
+
+(field_initializer
+  field: (_) @property)
+
+(record_fields
+  (record_field
+    .
+    (identifier) @property))
+
+(value_declaration_left
+  .
+  (_) @variable)
+
+(function_declaration_left
+  .
+  (_) @function)
+
+(argument_patterns
+  [
+    (const)
+    (long_identifier)
+    (_pattern)
+  ] @variable.parameter)
+
+(argument_patterns
+  (typed_pattern
+    (_pattern) @variable.parameter
+    (_type) @type))
+
+(argument_patterns
+  (record_pattern
+    (field_pattern
+      .
+      (long_identifier) @variable.parameter)))
+
+(argument_patterns
+  (array_pattern
+    (_pattern)? @variable.parameter))
+
+(argument_patterns
+  (list_pattern
+    (_pattern)? @variable.parameter))
+
+((argument_patterns
+  (long_identifier
+    (identifier) @character.special))
+  (#lua-match? @character.special "^\_.*"))
+
+(member_defn
+  (method_or_prop_defn
+    [
+      (property_or_ident) @function
+      (property_or_ident
+        instance: (identifier) @variable.parameter.builtin
+        method: (identifier) @function.method)
+    ]
+    args: (_)* @variable.parameter))
+
+(dot_expression
+  .
+  (_) @variable.member
+  .
+  (_))
+
+(application_expression
+  .
+  (_) @function.call
+  .
+  (_) @variable)
+
+((infix_expression
+  .
+  (_)
+  .
+  (infix_op) @operator
+  .
+  (_) @function.call)
+  (#eq? @operator "|>"))
+
+((infix_expression
+  .
+  (_) @function.call
+  .
+  (infix_op) @operator
+  .
+  (_))
+  (#eq? @operator "<|"))
+
+[
+  (xint)
+  (int)
+  (int16)
+  (uint16)
+  (int32)
+  (uint32)
+  (int64)
+  (uint64)
+  (nativeint)
+  (unativeint)
+] @number
+
+[
+  (ieee32)
+  (ieee64)
+  (float)
+  (decimal)
+] @number.float
+
+(bool) @boolean
+
+[
+  (string)
+  (triple_quoted_string)
+  (verbatim_string)
+  (char)
+] @spell @string
+
+(compiler_directive_decl) @keyword.directive
+
+(preproc_line
+  "#line" @keyword.directive)
+
+(attribute
+  target: (identifier)? @keyword
+  (_type) @attribute)
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  ".["
+  "["
+  "]"
+  "[|"
+  "|]"
+  "{|"
+  "|}"
+] @punctuation.bracket
+
+[
+  "[<"
+  ">]"
+] @punctuation.special
+
+(format_string_eval
+  [
+    "{"
+    "}"
+  ] @punctuation.special)
+
+[
+  ","
+  ";"
+  ":"
+  "."
+] @punctuation.delimiter
+
+[
+  "|"
+  "="
+  ">"
+  "<"
+  "-"
+  "~"
+  "->"
+  "<-"
+  "&"
+  "&&"
+  "|"
+  "||"
+  ":>"
+  ":?>"
+  ".."
+  "*"
+  (infix_op)
+  (prefix_op)
+  (op_identifier)
+] @operator
+
+(generic_type
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+[
+  "if"
+  "then"
+  "else"
+  "elif"
+  "when"
+  "match"
+  "match!"
+] @keyword.conditional
+
+[
+  "and"
+  "or"
+  "not"
+  "upcast"
+  "downcast"
+] @keyword.operator
+
+[
+  "return"
+  "return!"
+  "yield"
+  "yield!"
+] @keyword.return
+
+[
+  "for"
+  "while"
+  "downto"
+  "to"
+] @keyword.repeat
+
+[
+  "open"
+  "#r"
+  "#load"
+] @keyword.import
+
+[
+  "abstract"
+  "delegate"
+  "static"
+  "inline"
+  "mutable"
+  "override"
+  "rec"
+  "global"
+  (access_modifier)
+] @keyword.modifier
+
+[
+  "let"
+  "let!"
+  "use"
+  "use!"
+  "member"
+] @keyword.function
+
+[
+  "enum"
+  "type"
+  "inherit"
+  "interface"
+  "and"
+  "class"
+  "struct"
+] @keyword.type
+
+((identifier) @keyword.exception
+  (#any-of? @keyword.exception "failwith" "failwithf" "raise" "reraise"))
+
+[
+  "as"
+  "assert"
+  "begin"
+  "end"
+  "done"
+  "default"
+  "in"
+  "do"
+  "do!"
+  "fun"
+  "function"
+  "get"
+  "set"
+  "lazy"
+  "new"
+  "of"
+  "struct"
+  "val"
+  "module"
+  "namespace"
+  "with"
+] @keyword
+
+[
+  "null"
+  (unit)
+] @constant.builtin
+
+(match_expression
+  "with" @keyword.conditional)
+
+(try_expression
+  [
+    "try"
+    "with"
+    "finally"
+  ] @keyword.exception)
+
+(application_expression
+  (unit) @function.call)
+
+((_type
+  (long_identifier
+    (identifier) @type.builtin))
+  (#any-of? @type.builtin
+    "bool" "byte" "sbyte" "int16" "uint16" "int" "uint" "int64" "uint64" "nativeint" "unativeint"
+    "decimal" "float" "double" "float32" "single" "char" "string" "unit"))
+
+(preproc_if
+  [
+    "#if" @keyword.directive
+    "#endif" @keyword.directive
+  ]
+  condition: (_)? @keyword.directive)
+
+(preproc_else
+  "#else" @keyword.directive)
+
+((identifier) @module.builtin
+  (#any-of? @module.builtin
+    "Array" "Async" "Directory" "File" "List" "Option" "Path" "Map" "Set" "Lazy" "Seq" "Task"
+    "String" "Result"))
+
+((value_declaration
+  (attributes
+    (attribute
+      (_type
+        (long_identifier
+          (identifier) @attribute))))
+  (function_or_value_defn
+    (value_declaration_left
+      .
+      (_) @constant)))
+  (#eq? @attribute "Literal"))
diff --git a/queries/fsharp/injections.scm b/queries/fsharp/injections.scm
new file mode 100644
index 000000000..211b263f3
--- /dev/null
+++ b/queries/fsharp/injections.scm
@@ -0,0 +1,11 @@
+([
+  (line_comment)
+  (block_comment_content)
+] @injection.content
+  (#set! injection.language "comment"))
+
+((line_comment) @injection.content
+  (#lua-match? @injection.content "^///")
+  (#offset! @injection.content 0 3 0 0)
+  (#set! injection.language "xml")
+  (#set! injection.combined))

From 140f534ce9c02189921b80f5c8a68ab9e3f92ce8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 29 Sep 2024 15:29:50 +0200
Subject: [PATCH 1837/2704] fix(parsers): adapt to upstream change in Nvim 0.11

In Nvim 0.11, `vim.treesitter.lang.get_lang(filetype)` falls back
to `filetype` by default, so filetypes no longer have to be registered
for languages with the same name.
---
 lua/nvim-treesitter/parsers.lua | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 22800a9bd..8bc1f9d9e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -58,12 +58,15 @@ end
 ---@field readme_name string|nil
 
 ---@type ParserInfo[]
-local list = setmetatable({}, {
-  __newindex = function(table, parsername, parserconfig)
-    rawset(table, parsername, parserconfig)
-    ts.language.register(parsername, parserconfig.filetype or parsername)
-  end,
-})
+local list = {}
+if vim.fn.has "nvim-0.11" == 0 then
+  setmetatable(list, {
+    __newindex = function(table, parsername, parserconfig)
+      rawset(table, parsername, parserconfig)
+      ts.language.register(parsername, parserconfig.filetype or parsername)
+    end,
+  })
+end
 
 list.ada = {
   install_info = {

From d1e1f17cea23f14cbe230635b9bb654a835f02d7 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 06:45:46 +0000
Subject: [PATCH 1838/2704] bot(lockfile): update swift, tact, tlaplus, v

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 945d50e4a..d24a2616e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -735,7 +735,7 @@
     "revision": "774a65aea563accc35f5d45fafa4d96ec5761f57"
   },
   "swift": {
-    "revision": "032930d6218d8ae23bde074cf29ce8d276b87533"
+    "revision": "4bff50b78b4d3c0517e4d0f0a344aca165f00146"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -753,7 +753,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "d16804029968f53f26f5afc695166a55bb0b68b2"
+    "revision": "09c57b6b9759560b4d067e0546c9953ee0e065da"
   },
   "tcl": {
     "revision": "cdba4ab96a9896492d0d5219b70300c8783ca4e7"
@@ -777,7 +777,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "b9e3978f363b3f8884c886a01d15e41bd14d30bd"
+    "revision": "da9cf9793686e236327aadfbad449414c895bf84"
   },
   "tmux": {
     "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"
@@ -828,7 +828,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "4f93826aeb31066eb241f4ccbca61f052239803f"
+    "revision": "bc5b3caa85f7a8d4597f51aeaf92b83162ed6b33"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 1a6fa428b812ad53e942ebaf7603fd8a0540b5f7 Mon Sep 17 00:00:00 2001
From: Tim Culverhouse <tim@timculverhouse.com>
Date: Mon, 9 Sep 2024 09:19:58 -0500
Subject: [PATCH 1839/2704] feat(ziggy): add ziggy parser and queries

[Ziggy](https://github.com/kristoff-it/ziggy) is a data serialization
format used in the zine static site generator.
---
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  9 ++++++++
 queries/ziggy/highlights.scm    | 41 +++++++++++++++++++++++++++++++++
 queries/ziggy/indents.scm       | 10 ++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 queries/ziggy/highlights.scm
 create mode 100644 queries/ziggy/indents.scm

diff --git a/lockfile.json b/lockfile.json
index d24a2616e..5ebfc8c29 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -889,5 +889,8 @@
   },
   "zig": {
     "revision": "eb7d58c2dc4fbeea4745019dee8df013034ae66b"
+  },
+  "ziggy": {
+    "revision": "c66f47bc632c66668d61fa06eda112b41d6e5130"
   }
 }
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8bc1f9d9e..6d445dece 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2564,6 +2564,15 @@ list.zig = {
   maintainers = { "@amaanq" },
 }
 
+list.ziggy = {
+  install_info = {
+    url = "https://github.com/kristoff-it/ziggy",
+    files = { "src/parser.c" },
+    location = "tree-sitter-ziggy",
+  },
+  maintainers = { "@rockorager" },
+}
+
 list.templ = {
   install_info = {
     url = "https://github.com/vrischmann/tree-sitter-templ",
diff --git a/queries/ziggy/highlights.scm b/queries/ziggy/highlights.scm
new file mode 100644
index 000000000..27f6c9a48
--- /dev/null
+++ b/queries/ziggy/highlights.scm
@@ -0,0 +1,41 @@
+[
+  (true)
+  (false)
+] @constant.builtin
+
+(null) @constant.builtin
+
+[
+  (integer)
+  (float)
+] @number
+
+(struct_field
+  key: (_) @keyword)
+
+(struct
+  name: (_) @type)
+
+(tag) @function
+
+[
+  (string)
+  (line_string)*
+] @string
+
+(comment) @comment
+
+(escape_sequence) @string.escape
+
+"," @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+  "("
+  ")"
+] @punctuation.bracket
+
+(top_comment) @comment
diff --git a/queries/ziggy/indents.scm b/queries/ziggy/indents.scm
new file mode 100644
index 000000000..223bde81a
--- /dev/null
+++ b/queries/ziggy/indents.scm
@@ -0,0 +1,10 @@
+[
+  (struct)
+  (map)
+  (array)
+] @indent.begin
+
+[
+  "]"
+  "}"
+] @indent.end

From 58c702c4d5343475bb7e04f36722456b40b477c6 Mon Sep 17 00:00:00 2001
From: Tim Culverhouse <tim@timculverhouse.com>
Date: Mon, 9 Sep 2024 09:27:03 -0500
Subject: [PATCH 1840/2704] feat(ziggy-schema): Add ziggy-schema parser and
 queries

Ziggy-schema is the schema definition file format for a ziggy file.
---
 lockfile.json                       |  3 +++
 lua/nvim-treesitter/parsers.lua     |  9 +++++++
 queries/ziggy_schema/highlights.scm | 38 +++++++++++++++++++++++++++++
 queries/ziggy_schema/indents.scm    |  3 +++
 4 files changed, 53 insertions(+)
 create mode 100644 queries/ziggy_schema/highlights.scm
 create mode 100644 queries/ziggy_schema/indents.scm

diff --git a/lockfile.json b/lockfile.json
index 5ebfc8c29..88cf10e77 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -892,5 +892,8 @@
   },
   "ziggy": {
     "revision": "c66f47bc632c66668d61fa06eda112b41d6e5130"
+  },
+  "ziggy_schema": {
+    "revision": "c66f47bc632c66668d61fa06eda112b41d6e5130"
   }
 }
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6d445dece..a72a35687 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2573,6 +2573,15 @@ list.ziggy = {
   maintainers = { "@rockorager" },
 }
 
+list.ziggy_schema = {
+  install_info = {
+    url = "https://github.com/kristoff-it/ziggy",
+    files = { "src/parser.c" },
+    location = "tree-sitter-ziggy-schema",
+  },
+  maintainers = { "@rockorager" },
+}
+
 list.templ = {
   install_info = {
     url = "https://github.com/vrischmann/tree-sitter-templ",
diff --git a/queries/ziggy_schema/highlights.scm b/queries/ziggy_schema/highlights.scm
new file mode 100644
index 000000000..4e1770127
--- /dev/null
+++ b/queries/ziggy_schema/highlights.scm
@@ -0,0 +1,38 @@
+(struct_field
+  key: (_) @keyword)
+
+(tag_name) @function
+
+[
+  "unknown"
+  "any"
+  "struct"
+  "root"
+  "enum"
+  "map"
+] @keyword
+
+(identifier) @type
+
+"?" @type
+
+[
+  "bool"
+  "bytes"
+  "int"
+  "float"
+] @constant.builtin
+
+(doc_comment) @comment.documentation
+
+[
+  ","
+  "|"
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
diff --git a/queries/ziggy_schema/indents.scm b/queries/ziggy_schema/indents.scm
new file mode 100644
index 000000000..6f7f7b87c
--- /dev/null
+++ b/queries/ziggy_schema/indents.scm
@@ -0,0 +1,3 @@
+(struct) @indent.begin
+
+"}" @indent.end

From df0f8cb58e0c38408d50bd18f6004408f04252eb Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 21:34:05 +0000
Subject: [PATCH 1841/2704] bot(readme): update

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 40ac497f1..f78341d96 100644
--- a/README.md
+++ b/README.md
@@ -470,6 +470,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)
 - [x] [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) (maintained by @Freed-Wu)
 - [x] [zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) (maintained by @amaanq)
+- [x] [ziggy](https://github.com/kristoff-it/ziggy) (maintained by @rockorager)
+- [x] [ziggy_schema](https://github.com/kristoff-it/ziggy) (maintained by @rockorager)
 <!--parserinfo-->
 
 For related information on the supported languages, including related plugins, see [this wiki page](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Supported-Languages-Information).

From 707e352df6d737e545e1a7204f7395ba82e6d2d3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 1 Oct 2024 02:06:47 +0200
Subject: [PATCH 1842/2704] fix(parsers): register explicit filetypes
 unconditionally (#7202)

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 lua/nvim-treesitter/parsers.lua | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a72a35687..1c6b1dd5d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -58,15 +58,14 @@ end
 ---@field readme_name string|nil
 
 ---@type ParserInfo[]
-local list = {}
-if vim.fn.has "nvim-0.11" == 0 then
-  setmetatable(list, {
-    __newindex = function(table, parsername, parserconfig)
-      rawset(table, parsername, parserconfig)
+local list = setmetatable({}, {
+  __newindex = function(table, parsername, parserconfig)
+    rawset(table, parsername, parserconfig)
+    if parserconfig.filetype or vim.fn.has "nvim-0.11" == 0 then
       ts.language.register(parsername, parserconfig.filetype or parsername)
-    end,
-  })
-end
+    end
+  end,
+})
 
 list.ada = {
   install_info = {

From ef52e44bb24161e5138b3de5beadab3f3fcff233 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 06:46:02 +0000
Subject: [PATCH 1843/2704] bot(lockfile): update java, mlir, nix, slint,
 textproto, ziggy, ziggy_schema

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 88cf10e77..40792fcc4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -354,7 +354,7 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "245b05c6ba900fa708242835f6168ef76f9d951e"
+    "revision": "490d878cf33b0ad5ae7a7253ff30597a5bdc348e"
   },
   "javascript": {
     "revision": "b6f0624c1447bc209830b195999b78a56b10a579"
@@ -459,7 +459,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "02af5a1a1cfa69a094e3136b10dfb602f968232e"
+    "revision": "cf7761f9e5249f2ddac1dfd5ee92f838223ab3f8"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "fcf1857e254ab654e0fb73fe9706e33c52e79a5c"
+    "revision": "a61cef3b93ff3fa0d8af1359ae496172166012f9"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -681,7 +681,7 @@
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
   },
   "slint": {
-    "revision": "34ccfd58d3baee7636f62d9326f32092264e8407"
+    "revision": "37c8e12ee1198f41d4eb5cc58d21a9c21196224f"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -768,7 +768,7 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "textproto": {
-    "revision": "8dacf02aa402892c91079f8577998ed5148c0496"
+    "revision": "d900077aef9f5dcb0d47c86be33585013ed5db9a"
   },
   "thrift": {
     "revision": "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"
@@ -891,9 +891,9 @@
     "revision": "eb7d58c2dc4fbeea4745019dee8df013034ae66b"
   },
   "ziggy": {
-    "revision": "c66f47bc632c66668d61fa06eda112b41d6e5130"
+    "revision": "42b6f5d7320340bc5903c4c29d34065e8517a549"
   },
   "ziggy_schema": {
-    "revision": "c66f47bc632c66668d61fa06eda112b41d6e5130"
+    "revision": "42b6f5d7320340bc5903c4c29d34065e8517a549"
   }
 }

From da61d31a3d51f38a78a739392aabf79e7b2f523f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 1 Oct 2024 21:03:52 +0200
Subject: [PATCH 1844/2704] fix(parsers): don't register rmd and quarto for
 markdown

---
 lua/nvim-treesitter/parsers.lua | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1c6b1dd5d..877635967 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -11,9 +11,6 @@ for ft, lang in pairs {
   ["typescript.tsx"] = "tsx",
   ["terraform-vars"] = "terraform",
   ["html.handlebars"] = "glimmer",
-  pandoc = "markdown",
-  rmd = "markdown",
-  quarto = "markdown",
   dosini = "ini",
   confini = "ini",
   svg = "xml",

From 3af8476530caa0906aa68f4dc911f76e77b478a9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 06:43:59 +0000
Subject: [PATCH 1845/2704] bot(lockfile): update erlang, mlir, nickel, nix,
 php, php_only, readline, scala, styled

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 40792fcc4..0f03720e3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "62b0a6e45900a7dff7c37da95fec20a09968ba52"
   },
   "erlang": {
-    "revision": "0dfcdf18b35dd9cfcf92be42659794d07d819d88"
+    "revision": "b079ba57a7918a85e0780df29e7f45f51d622200"
   },
   "facility": {
     "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
@@ -459,7 +459,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "cf7761f9e5249f2ddac1dfd5ee92f838223ab3f8"
+    "revision": "612a71d978d9d3e8edaece497845ce8708b44b2d"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -471,7 +471,7 @@
     "revision": "281d184b8240b2b22670b8907b57b6d6842db6f3"
   },
   "nickel": {
-    "revision": "88d836a24b3b11c8720874a1a9286b8ae838d30a"
+    "revision": "ddaa2bc22355effd97c0d6b09ff5962705c6368d"
   },
   "nim": {
     "revision": "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "a61cef3b93ff3fa0d8af1359ae496172166012f9"
+    "revision": "49adb0f7656fe1737bb11aff593692157905d1b1"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -525,10 +525,10 @@
     "revision": "81c57e274c541c30d6c204c8dbceb90ec647ed8d"
   },
   "php": {
-    "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"
+    "revision": "a342f7c0ad1db48afc6d2420cdd87b55b51a0644"
   },
   "php_only": {
-    "revision": "74c6b0d560c2660db4d9e8c76b681f538d494160"
+    "revision": "a342f7c0ad1db48afc6d2420cdd87b55b51a0644"
   },
   "phpdoc": {
     "revision": "df5e7da4b83da072f99135079ac3436550b8d67d"
@@ -624,7 +624,7 @@
     "revision": "c18a3c2f4b6665e35b7e50d6048ea3cff770c572"
   },
   "readline": {
-    "revision": "3d4768b04d7cfaf40533e12b28672603428b8f31"
+    "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
     "revision": "f70251e1f1d72bd6dc1f897f956f9112f8668441"
@@ -663,7 +663,7 @@
     "revision": "6b7d1fc73ded57f73b1619bcf4371618212208b1"
   },
   "scala": {
-    "revision": "ec13dd674bb8dd89213e0d6b1fe45efb68d5878f"
+    "revision": "2cfbb6e3fcdfd51e0d477a43cc37ae8c6f87dc2e"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -723,7 +723,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "b729198642b3058d4ea0f864d86efb271d594595"
+    "revision": "764af55fc6b8e5ae177eb272f5c5de6238db23e6"
   },
   "supercollider": {
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"

From 98a33cc524c85a78a1ff5a707998629b24cbf8c2 Mon Sep 17 00:00:00 2001
From: "ricardo.demeterko" <ninodemeterko@hotmail.com>
Date: Tue, 1 Oct 2024 10:57:00 -0300
Subject: [PATCH 1846/2704] feat(angular): update highlight query

---
 queries/angular/highlights.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 07b59517c..3783933f8 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -56,6 +56,11 @@
   key: ((identifier) @variable.builtin
     (#eq? @variable.builtin "$implicit")))
 
+[
+  (control_keyword)
+  (special_keyword)
+] @keyword
+
 ((control_keyword) @keyword.repeat
   (#any-of? @keyword.repeat "for" "empty"))
 
@@ -68,8 +73,6 @@
 ((control_keyword) @keyword.exception
   (#eq? @keyword.exception "error"))
 
-(special_keyword) @keyword
-
 ((identifier) @boolean
   (#any-of? @boolean "true" "false"))
 

From cc2c11c403a9143827501223b4ee64432dcaf246 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 06:45:36 +0000
Subject: [PATCH 1847/2704] bot(lockfile): update fsharp, wit

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 0f03720e3..7e42c9c17 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
   "fsharp": {
-    "revision": "f920105eec2d574eb911d7a25c81cdaa079a3f72"
+    "revision": "5202637c203fcf8876affbd18b04ff43256d4c4a"
   },
   "func": {
     "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"
@@ -867,7 +867,7 @@
     "revision": "76e0c25844a66ebc6e866d690fcc5f4e90698947"
   },
   "wit": {
-    "revision": "c52f0b07786603df17ad0197f6cef680f312eb2c"
+    "revision": "81490b4e74c792369e005f72b0d46fe082d3fed2"
   },
   "xcompose": {
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"

From 45386764cc9535200d2288cab929c5093d33660e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2024 06:46:15 +0000
Subject: [PATCH 1848/2704] bot(lockfile): update nix, php, php_only, slint,
 unison

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7e42c9c17..c9312e8bb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "49adb0f7656fe1737bb11aff593692157905d1b1"
+    "revision": "588539bf3ff2560c57b4ee847f95688bc701eaad"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -525,10 +525,10 @@
     "revision": "81c57e274c541c30d6c204c8dbceb90ec647ed8d"
   },
   "php": {
-    "revision": "a342f7c0ad1db48afc6d2420cdd87b55b51a0644"
+    "revision": "07a04599ed9ac97f82c6383a24ae139a807930f3"
   },
   "php_only": {
-    "revision": "a342f7c0ad1db48afc6d2420cdd87b55b51a0644"
+    "revision": "07a04599ed9ac97f82c6383a24ae139a807930f3"
   },
   "phpdoc": {
     "revision": "df5e7da4b83da072f99135079ac3436550b8d67d"
@@ -681,7 +681,7 @@
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
   },
   "slint": {
-    "revision": "37c8e12ee1198f41d4eb5cc58d21a9c21196224f"
+    "revision": "4e2765d4cac1f03ada6f635eeb6008d1d0aff5a3"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -819,7 +819,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "59d36a09282be7e4d3374854126590f3dcebee6e"
+    "revision": "985aaf5857a61fad3aeb262e64816105b746ad30"
   },
   "usd": {
     "revision": "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"

From 5bcc338c3dfe2164a893c6dbeca4210f65f9c4e2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 5 Oct 2024 06:43:24 +0000
Subject: [PATCH 1849/2704] bot(lockfile): update erlang, mlir, nix, unison

---
 lockfile.json                 | 8 ++++----
 queries/unison/highlights.scm | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c9312e8bb..6ffcef7b1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "62b0a6e45900a7dff7c37da95fec20a09968ba52"
   },
   "erlang": {
-    "revision": "b079ba57a7918a85e0780df29e7f45f51d622200"
+    "revision": "f1919a34af3a9c79402c4a3d6c52986e9c2ea949"
   },
   "facility": {
     "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
@@ -459,7 +459,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "612a71d978d9d3e8edaece497845ce8708b44b2d"
+    "revision": "5da32586f41659cc566d6f8145f9aaff3b842c96"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "588539bf3ff2560c57b4ee847f95688bc701eaad"
+    "revision": "42b5c693e7cd8f2309661438e956d947de30080e"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -819,7 +819,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "985aaf5857a61fad3aeb262e64816105b746ad30"
+    "revision": "bc06e1eb100e1c0fab9bd89a9ca55d646ac80fc4"
   },
   "usd": {
     "revision": "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"
diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
index 80ca65251..39c2393c2 100644
--- a/queries/unison/highlights.scm
+++ b/queries/unison/highlights.scm
@@ -65,8 +65,8 @@
 (type_name) @type
 
 (ability_declaration
-  type_name: (wordy_id) @type
-  type_arg: (wordy_id) @variable.parameter)
+  (ability_name) @type
+  (type_argument) @variable.parameter)
 
 (effect
   (wordy_id) @attribute) ; NOTE: an effect is a special type

From 7821feb7e7d55a76b7ffeeb6b0bfb7b8f499ce94 Mon Sep 17 00:00:00 2001
From: Heber <Anthony.Heber@gmail.com>
Date: Sat, 5 Oct 2024 10:35:26 -0600
Subject: [PATCH 1850/2704] fix(apex): update parser and highlights

---
 lockfile.json               |  8 ++++----
 queries/apex/highlights.scm | 34 ++++++++++++++++------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6ffcef7b1..8fc97e36b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
+    "revision": "779684231107cef4d86ac16f74320e9324680da3"
   },
   "arduino": {
     "revision": "415ebc8f75eb02a748faa03f5af199f08ced120f"
@@ -675,7 +675,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
+    "revision": "779684231107cef4d86ac16f74320e9324680da3"
   },
   "slang": {
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
@@ -696,10 +696,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
+    "revision": "779684231107cef4d86ac16f74320e9324680da3"
   },
   "sosl": {
-    "revision": "69330ef89fb6b7b2dd16b639d86811e9262c7369"
+    "revision": "779684231107cef4d86ac16f74320e9324680da3"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 930972668..d3a3b526c 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -84,11 +84,7 @@
 
 (assignment_operator) @operator
 
-(update_expression
-  [
-    "++"
-    "--"
-  ] @operator)
+(update_operator) @operator
 
 (trigger_declaration
   name: (identifier) @type
@@ -226,30 +222,32 @@
 "new" @keyword.operator
 
 [
-  "abstract"
+  (abstract)
   (all_rows_clause)
   "continue"
   "default"
   "extends"
-  "final"
+  (final)
   "get"
-  "global"
+  (global)
   "implements"
   "instanceof"
   "on"
-  "private"
-  "protected"
-  "public"
+  (override)
+  (private)
+  (protected)
+  (public)
   "set"
-  "static"
-  "testMethod"
-  "transient"
+  (static)
+  (testMethod)
+  (webservice)
+  (transient)
   "trigger"
-  "virtual"
+  (virtual)
   "when"
-  "with_sharing"
-  "without_sharing"
-  "inherited_sharing"
+  (with_sharing)
+  (without_sharing)
+  (inherited_sharing)
 ] @keyword
 
 [

From da7e9751f173e9463163241d54fe43c19e7bc563 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 06:43:26 +0000
Subject: [PATCH 1851/2704] bot(lockfile): update latex, nix, ruby

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8fc97e36b..05d1f2554 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -402,7 +402,7 @@
     "revision": "194c25539f435de415ee0551a5f07058833da915"
   },
   "latex": {
-    "revision": "1e4e30342b7a3b3a24886a632fbac53035d98871"
+    "revision": "87e4059f01bed363230dc349f794ce4cc580e862"
   },
   "ledger": {
     "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "42b5c693e7cd8f2309661438e956d947de30080e"
+    "revision": "8be0e516904650a868639aa8d3923ebe84f62627"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -657,7 +657,7 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "a66579f70d6f50ffd81a16fc3d3358e2ac173c88"
+    "revision": "0b4729672f9aec4810c01a0f971541dcb433fef5"
   },
   "rust": {
     "revision": "6b7d1fc73ded57f73b1619bcf4371618212208b1"

From 1bcdd79088f9ecca42090f41dd77c1a9b35578ff Mon Sep 17 00:00:00 2001
From: Tim Culverhouse <tim@timculverhouse.com>
Date: Mon, 9 Sep 2024 09:50:54 -0500
Subject: [PATCH 1852/2704] feat(superhtml): add superhtml parser and queries

SuperHTML is a templating language used by the zine static site
generator.
---
 lockfile.json                    |  3 +++
 lua/nvim-treesitter/parsers.lua  | 12 +++++++++
 queries/superhtml/highlights.scm | 44 ++++++++++++++++++++++++++++++++
 queries/superhtml/injections.scm |  7 +++++
 4 files changed, 66 insertions(+)
 create mode 100644 queries/superhtml/highlights.scm
 create mode 100644 queries/superhtml/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 05d1f2554..1c293b253 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -728,6 +728,9 @@
   "supercollider": {
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
+  "superhtml": {
+    "revision": "3edb67236291d45ba97a79cdac3b91692487a352"
+  },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 877635967..b5853c04f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2109,6 +2109,18 @@ list.supercollider = {
   maintainers = { "@madskjeldgaard" },
 }
 
+list.superhtml = {
+  install_info = {
+    url = "https://github.com/kristoff-it/superhtml",
+    files = {
+      "src/parser.c",
+      "src/scanner.c",
+    },
+    location = "tree-sitter-superhtml",
+  },
+  maintainers = { "@rockorager" },
+}
+
 list.surface = {
   install_info = {
     url = "https://github.com/connorlay/tree-sitter-surface",
diff --git a/queries/superhtml/highlights.scm b/queries/superhtml/highlights.scm
new file mode 100644
index 000000000..cbf366d1c
--- /dev/null
+++ b/queries/superhtml/highlights.scm
@@ -0,0 +1,44 @@
+(doctype) @constant
+
+(comment) @comment
+
+(tag_name) @tag
+
+((tag_name) @string.special
+  (#any-of? @string.special "super" "extend"))
+
+(attribute_name) @attribute
+
+(attribute_value) @string
+
+((element
+  (start_tag
+    (attribute
+      (attribute_name) @_attribute
+      [
+        (attribute_value) @markup.link.url
+        (quoted_attribute_value
+          (attribute_value) @markup.link.url)
+      ]))
+  (element
+    (start_tag
+      (tag_name) @tag)))
+  (#eq? @tag "super")
+  (#eq? @_attribute "id"))
+
+(element
+  (start_tag
+    (tag_name) @string.special)
+  (#eq? @string.special "super"))
+
+"\"" @string
+
+[
+  "<"
+  ">"
+  "</"
+  "/>"
+  "<!"
+] @punctuation.bracket
+
+"=" @punctuation.delimiter
diff --git a/queries/superhtml/injections.scm b/queries/superhtml/injections.scm
new file mode 100644
index 000000000..138fe7c23
--- /dev/null
+++ b/queries/superhtml/injections.scm
@@ -0,0 +1,7 @@
+((script_element
+  (raw_text) @injection.content)
+  (#set! injection.language "javascript"))
+
+((style_element
+  (raw_text) @injection.content)
+  (#set! injection.language "css"))

From 4f04fb7027ce786ac4adfd1c629ca40aea96ffec Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 6 Oct 2024 09:48:00 +0000
Subject: [PATCH 1853/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f78341d96..65a6b4d4c 100644
--- a/README.md
+++ b/README.md
@@ -416,6 +416,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [strace](https://github.com/sigmaSd/tree-sitter-strace) (maintained by @amaanq)
 - [x] [styled](https://github.com/mskelton/tree-sitter-styled) (maintained by @mskelton)
 - [x] [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) (maintained by @madskjeldgaard)
+- [x] [superhtml](https://github.com/kristoff-it/superhtml) (maintained by @rockorager)
 - [x] [surface](https://github.com/connorlay/tree-sitter-surface) (maintained by @connorlay)
 - [x] [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) (maintained by @amaanq)
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)

From 45e0d66246f31306d890b91301993fa1623e79f1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 06:45:08 +0000
Subject: [PATCH 1854/2704] bot(lockfile): update apex, mlir, nix, sflog, soql,
 sosl, superhtml, swift, templ, typst

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1c293b253..c17f6813a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "779684231107cef4d86ac16f74320e9324680da3"
+    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
   },
   "arduino": {
     "revision": "415ebc8f75eb02a748faa03f5af199f08ced120f"
@@ -459,7 +459,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "5da32586f41659cc566d6f8145f9aaff3b842c96"
+    "revision": "ccf732d3dbe6ca415a29b9be887c783111b297c7"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "8be0e516904650a868639aa8d3923ebe84f62627"
+    "revision": "9ef77ceefff61d31a63133d8d697f219ab62c841"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -675,7 +675,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "779684231107cef4d86ac16f74320e9324680da3"
+    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
   },
   "slang": {
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
@@ -696,10 +696,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "779684231107cef4d86ac16f74320e9324680da3"
+    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
   },
   "sosl": {
-    "revision": "779684231107cef4d86ac16f74320e9324680da3"
+    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -729,7 +729,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "3edb67236291d45ba97a79cdac3b91692487a352"
+    "revision": "b684bbe28ecd740a7110ead5674355770186ca9c"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -738,7 +738,7 @@
     "revision": "774a65aea563accc35f5d45fafa4d96ec5761f57"
   },
   "swift": {
-    "revision": "4bff50b78b4d3c0517e4d0f0a344aca165f00146"
+    "revision": "14668554259c5a82fc0c8ca825aa3bb895034c67"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -765,7 +765,7 @@
     "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
   },
   "templ": {
-    "revision": "80d1a04e6bf3ced1c924bcb05527aa2eaf3f6239"
+    "revision": "e3e894ef9e490c3d36d94a51458ec55480991730"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -813,7 +813,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "abe60cbed7986ee475d93f816c1be287f220c5d8"
+    "revision": "8b8b16ef1b40cbecbe3f754b1c1c966b5a0904fe"
   },
   "udev": {
     "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"

From 18adcafad0e817da303c41859d7dbe4ce5946759 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 7 Oct 2024 10:42:58 -0700
Subject: [PATCH 1855/2704] fix(dart): more highlight coverage, import folds

---
 queries/dart/folds.scm      |  1 +
 queries/dart/highlights.scm | 51 +++++++++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/queries/dart/folds.scm b/queries/dart/folds.scm
index 8dc4e7815..fc75ac219 100644
--- a/queries/dart/folds.scm
+++ b/queries/dart/folds.scm
@@ -9,4 +9,5 @@
   (list_literal)
   (set_or_map_literal)
   (string_literal)
+  (import_or_export)+
 ] @fold
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 142c6e190..5189a407a 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -1,27 +1,28 @@
+(identifier) @variable
+
 (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) @function.call)
 
 ; ((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
-  (#lua-match? @function "^_?[%l]"))
+(((identifier) @function.call
+  (#lua-match? @function.call "^_?[%l]"))
   .
   (selector
     .
-    (argument_part))) @function
+    (argument_part))) @function.call
 
 ; Annotations
 ; --------------------
 (annotation
+  "@" @attribute
   name: (identifier) @attribute)
 
 ; Operators and Tokens
@@ -38,13 +39,12 @@
 (escape_sequence) @string.escape
 
 [
-  "@"
   "=>"
   ".."
   "??"
   "=="
+  "!"
   "?"
-  ":"
   "&&"
   "%"
   "<"
@@ -53,6 +53,20 @@
   ">="
   "<="
   "||"
+  ">>>="
+  ">>="
+  "<<="
+  "&="
+  "|="
+  "??="
+  "%="
+  "+="
+  "-="
+  "*="
+  "/="
+  "^="
+  "~/="
+  (shift_operator)
   (multiplicative_operator)
   (increment_operator)
   (is_operator)
@@ -76,6 +90,9 @@
   ";"
   "."
   ","
+  ":"
+  "?."
+  "?"
 ] @punctuation.delimiter
 
 ; Types
@@ -116,6 +133,12 @@
 (type_alias
   (type_identifier) @type.definition)
 
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
 ; Variables
 ; --------------------
 ; var keyword
@@ -133,16 +156,12 @@
 (conditional_assignable_selector
   (identifier) @property)
 
-; assignments
-(assignment_expression
-  left: (assignable_expression) @variable)
-
 (this) @variable.builtin
 
 ; Parameters
 ; --------------------
 (formal_parameter
-  name: (identifier) @variable.parameter)
+  (identifier) @variable.parameter)
 
 (named_argument
   (label
@@ -263,6 +282,12 @@
   "default"
 ] @keyword.conditional
 
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
 [
   "try"
   "throw"

From 86c10df7ef77daf45a0e4a918934bb59083db1e1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2024 06:45:31 +0000
Subject: [PATCH 1856/2704] bot(lockfile): update cmake, llvm, perl, vhdl

---
 .github/workflows/update-lockfile.yml | 2 +-
 lockfile.json                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 38aab1cfc..70d628742 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "djot"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua
diff --git a/lockfile.json b/lockfile.json
index c17f6813a..2459470f0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -69,7 +69,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"
+    "revision": "f2569dd1fce0f252097a25bcbcb9ed8898840310"
   },
   "comment": {
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
@@ -420,7 +420,7 @@
     "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
   },
   "llvm": {
-    "revision": "1b96e58faf558ce057d4dc664b904528aee743cb"
+    "revision": "c14cb839003348692158b845db9edda201374548"
   },
   "lua": {
     "revision": "99fc677e6971c425e8d407f59c77ab897e585c92"
@@ -522,7 +522,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "81c57e274c541c30d6c204c8dbceb90ec647ed8d"
+    "revision": "72a08a496a23212f23802490ef6f4700d68cfd0e"
   },
   "php": {
     "revision": "07a04599ed9ac97f82c6383a24ae139a807930f3"
@@ -843,7 +843,7 @@
     "revision": "075ebfc84543675f12e79a955f79d717772dcef3"
   },
   "vhdl": {
-    "revision": "3f13cd14952b39ccf6817f58880834b84565ca54"
+    "revision": "d6e8301999336b47d663052d43f983c3edeb01dd"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"

From 009e981c30c84fee7167aae57f9ace35c77728c0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 06:45:20 +0000
Subject: [PATCH 1857/2704] bot(lockfile): update superhtml, v

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2459470f0..e2c73f8da 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -729,7 +729,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "b684bbe28ecd740a7110ead5674355770186ca9c"
+    "revision": "36f37aa5aa440805f27d4a9f5203e616a303c6a1"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -831,7 +831,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "bc5b3caa85f7a8d4597f51aeaf92b83162ed6b33"
+    "revision": "ea538758a1273b59774dc9179cde460d9c73fd89"
   },
   "vala": {
     "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"

From 9d2acd49976e2a9da72949008df03436f781fd23 Mon Sep 17 00:00:00 2001
From: Novus Nota <68142933+novusnota@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:21:33 +0200
Subject: [PATCH 1858/2704] feat(tact): update parser and queries (#7196)

---
 queries/tact/folds.scm      |  2 ++
 queries/tact/highlights.scm | 29 ++++++++++-------------------
 queries/tact/indents.scm    |  2 ++
 queries/tact/locals.scm     |  8 ++++++++
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/queries/tact/folds.scm b/queries/tact/folds.scm
index 03713dd7c..66e7bdaa9 100644
--- a/queries/tact/folds.scm
+++ b/queries/tact/folds.scm
@@ -13,4 +13,6 @@
   (trait_body)
   (function_body)
   (block_statement)
+  (asm_function_body)
+  (asm_list)
 ] @fold
diff --git a/queries/tact/highlights.scm b/queries/tact/highlights.scm
index 13afd9a3c..d65b501cf 100644
--- a/queries/tact/highlights.scm
+++ b/queries/tact/highlights.scm
@@ -59,6 +59,7 @@
   "^"
   "&&"
   "||"
+  "->"
 ] @operator
 
 ; constructor
@@ -76,7 +77,7 @@
 ; type.builtin
 ; ------------
 ((identifier) @type.builtin
-  (#eq? @type.builtin "SendParameters"))
+  (#any-of? @type.builtin "Context" "SendParameters" "StateInit" "StdAddress" "VarAddress"))
 
 (bounced_type
   "bounced" @type.builtin
@@ -93,10 +94,7 @@
 
 (tlb_serialization
   "as" @keyword
-  type: (identifier) @type.builtin
-  (#any-of? @type.builtin
-    "int8" "int16" "int32" "int64" "int128" "int256" "int257" "uint8" "uint16" "uint32" "uint64"
-    "uint128" "uint256" "coins" "remaining" "bytes32" "bytes64"))
+  type: (identifier) @type.builtin)
 
 ; string
 ; ------
@@ -130,8 +128,9 @@
 ((identifier) @constant.builtin
   (#any-of? @constant.builtin
     "SendBounceIfActionFail" "SendPayGasSeparately" "SendIgnoreErrors" "SendDestroyIfZero"
-    "SendRemainingValue" "SendRemainingBalance" "ReserveExact" "ReserveAllExcept" "ReserveAtMost"
-    "ReserveAddOriginalBalance" "ReserveInvertSign" "ReserveBounceIfActionFail"))
+    "SendRemainingValue" "SendRemainingBalance" "SendOnlyEstimateFee" "ReserveExact"
+    "ReserveAllExcept" "ReserveAtMost" "ReserveAddOriginalBalance" "ReserveInvertSign"
+    "ReserveBounceIfActionFail"))
 
 ; property
 ; --------
@@ -175,6 +174,7 @@
 [
   "fun"
   "native"
+  "asm"
 ] @keyword.function
 
 ; keyword.operator
@@ -242,6 +242,9 @@
 (native_function
   name: (identifier) @function)
 
+(asm_function
+  name: (identifier) @function)
+
 (global_function
   name: (identifier) @function)
 
@@ -274,18 +277,6 @@
 (method_call_expression
   name: (identifier) @function.method.call)
 
-; function.builtin
-; ----------------
-(static_call_expression
-  name: (identifier) @function.builtin
-  (#any-of? @function.builtin
-    "log" "log2" "send" "sender" "require" "now" "myBalance" "myAddress" "newAddress"
-    "contractAddress" "contractAddressExt" "emit" "cell" "ton" "dump" "dumpStack" "beginString"
-    "beginComment" "beginTailString" "beginStringFromBuilder" "beginCell" "emptyCell" "randomInt"
-    "random" "checkSignature" "checkDataSignature" "sha256" "min" "max" "abs" "pow" "pow2" "throw"
-    "nativeThrowIf" "nativeThrowUnless" "getConfigParam" "nativeRandomize" "nativeRandomizeLt"
-    "nativePrepareRandom" "nativeRandom" "nativeRandomInterval" "nativeReserve"))
-
 ; attribute
 ; ---------
 [
diff --git a/queries/tact/indents.scm b/queries/tact/indents.scm
index 749ab2469..b26ce1460 100644
--- a/queries/tact/indents.scm
+++ b/queries/tact/indents.scm
@@ -13,6 +13,8 @@
   (trait_body)
   (function_body)
   (block_statement)
+  (asm_function_body)
+  (asm_list)
   ; misc.
   (binary_expression)
   (ternary_expression)
diff --git a/queries/tact/locals.scm b/queries/tact/locals.scm
index d580d6a7e..042afb941 100644
--- a/queries/tact/locals.scm
+++ b/queries/tact/locals.scm
@@ -1,6 +1,7 @@
 ; Scopes       @local.scope
 ; -------------------------
 [
+  (asm_function)
   (global_function)
   (init_function)
   (bounced_function)
@@ -13,6 +14,9 @@
 ; Definitions  @local.definition
 ; ------------------------------
 ; variables
+(storage_variable
+  name: (identifier) @local.definition.var)
+
 (let_statement
   name: (identifier) @local.definition.var)
 
@@ -24,6 +28,10 @@
   name: (identifier) @local.definition.constant)
 
 ; functions
+(asm_function
+  name: (identifier) @local.definition.function
+  (#set! definition.var.scope parent))
+
 (global_function
   name: (identifier) @local.definition.function
   (#set! definition.var.scope parent))

From 9b1e607298dd5fc2ee6549488324cc92dafb99c0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 06:45:01 +0000
Subject: [PATCH 1859/2704] bot(lockfile): update editorconfig, kotlin, mlir,
 nix, swift, tact

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e2c73f8da..d4ce87787 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "a761198025448c77ea11bcf22505b395a77fc0d0"
+    "revision": "d710520b712afa2c74d57cc3cb6093a77916c08b"
   },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
@@ -390,7 +390,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "ec985672ff21f7fd7f835869d8021e8f87304bb4"
+    "revision": "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"
   },
   "koto": {
     "revision": "cbf637e5163065934c827d254b293f4d2f08f523"
@@ -459,7 +459,7 @@
     "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
   },
   "mlir": {
-    "revision": "ccf732d3dbe6ca415a29b9be887c783111b297c7"
+    "revision": "a6727f883344079383faaf768065d2f5fea285a5"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "9ef77ceefff61d31a63133d8d697f219ab62c841"
+    "revision": "d240e9a525aa5963eda0704c899037c0ea305e7e"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -738,7 +738,7 @@
     "revision": "774a65aea563accc35f5d45fafa4d96ec5761f57"
   },
   "swift": {
-    "revision": "14668554259c5a82fc0c8ca825aa3bb895034c67"
+    "revision": "a6ec57ad4d12c68d952ba1f869bd373a7ac95832"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -756,7 +756,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "09c57b6b9759560b4d067e0546c9953ee0e065da"
+    "revision": "83e264928fa194b7283428527259e88e54205264"
   },
   "tcl": {
     "revision": "cdba4ab96a9896492d0d5219b70300c8783ca4e7"

From 84bdd59c0365944e8914697e508d1c087977ee33 Mon Sep 17 00:00:00 2001
From: Heber <Anthony.Heber@gmail.com>
Date: Thu, 10 Oct 2024 14:57:54 -0600
Subject: [PATCH 1860/2704] fix(apex): update parser and queries (#7230)

---
 lockfile.json               | 8 ++++----
 queries/apex/highlights.scm | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d4ce87787..7be72b6c7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
+    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
   },
   "arduino": {
     "revision": "415ebc8f75eb02a748faa03f5af199f08ced120f"
@@ -675,7 +675,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
+    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
   },
   "slang": {
     "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
@@ -696,10 +696,10 @@
     "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
   },
   "soql": {
-    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
+    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
   },
   "sosl": {
-    "revision": "943a3eb7f55733929ccafe06841087c3004cb4e0"
+    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index d3a3b526c..6dd24a94c 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -131,8 +131,7 @@
     "~"
   ]) @operator
 
-(map_initializer
-  "=>" @operator)
+"=>" @operator
 
 [
   (boolean_type)

From 19079207ba4a8c7ed956f40a111a22b1a2dfa6e8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2024 06:45:11 +0000
Subject: [PATCH 1861/2704] bot(lockfile): update editorconfig, meson, nix,
 phpdoc, teal

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7be72b6c7..4827ee928 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "d710520b712afa2c74d57cc3cb6093a77916c08b"
+    "revision": "efbe0b2f2eaa248e8c657a80a8c2305056bda477"
   },
   "eds": {
     "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
@@ -456,7 +456,7 @@
     "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
   },
   "meson": {
-    "revision": "bd17c824196ce70800f64ad39cfddd1b17acc13f"
+    "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
     "revision": "a6727f883344079383faaf768065d2f5fea285a5"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "d240e9a525aa5963eda0704c899037c0ea305e7e"
+    "revision": "924b2dcb12fe77c90f0253e446677faf4e9c38ac"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -531,7 +531,7 @@
     "revision": "07a04599ed9ac97f82c6383a24ae139a807930f3"
   },
   "phpdoc": {
-    "revision": "df5e7da4b83da072f99135079ac3436550b8d67d"
+    "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
   },
   "pioasm": {
     "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
@@ -762,7 +762,7 @@
     "revision": "cdba4ab96a9896492d0d5219b70300c8783ca4e7"
   },
   "teal": {
-    "revision": "19b02da829d1721a521bf7b802eb80a50bd53aab"
+    "revision": "485fbdc00d811b01b2090dff4d0469fd1d0350f5"
   },
   "templ": {
     "revision": "e3e894ef9e490c3d36d94a51458ec55480991730"

From 5a2ff8b7ca5470b1011ed82ef3fdd53139ffc467 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 12 Oct 2024 06:43:02 +0000
Subject: [PATCH 1862/2704] bot(lockfile): update mlir, nix, perl, pioasm

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4827ee928..7979902bb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -459,7 +459,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "a6727f883344079383faaf768065d2f5fea285a5"
+    "revision": "0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -483,7 +483,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "924b2dcb12fe77c90f0253e446677faf4e9c38ac"
+    "revision": "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -522,7 +522,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "72a08a496a23212f23802490ef6f4700d68cfd0e"
+    "revision": "76ab9a52b9dd2a1758aae3da8286519d995037e9"
   },
   "php": {
     "revision": "07a04599ed9ac97f82c6383a24ae139a807930f3"
@@ -534,7 +534,7 @@
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
   },
   "pioasm": {
-    "revision": "924aadaf5dea2a6074d72027b064f939acf32e20"
+    "revision": "afece58efdb30440bddd151ef1347fa8d6f744a9"
   },
   "po": {
     "revision": "bd860a0f57f697162bf28e576674be9c1500db5e"

From 245ffff7ac1f4aab19cb31d5ca3251d003a67e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Dujava?= <jonas.dujava@gmail.com>
Date: Mon, 14 Oct 2024 15:33:36 +0200
Subject: [PATCH 1863/2704] fix(latex): capture nameless color change (#7243)

Color can be changed by directly passing color `model` and `spec`,
so make the `name` field optional.

Signed-off-by: Jonas Dujava <jonas.dujava@gmail.com>
---
 queries/latex/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index 048c8609f..c39cd1b14 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -146,7 +146,7 @@
 (color_reference
   command: _ @function.macro
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @markup.link)?)
 
 ; Sectioning
 (title_declaration

From 2953b6ae786ae46b6f04b467d9b4df187bc14b11 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 13 Oct 2024 04:52:54 -0400
Subject: [PATCH 1864/2704] fix(slang): adapt to parser changes

---
 queries/slang/highlights.scm | 306 ++++++++++++++++++++++++++++++++++-
 1 file changed, 305 insertions(+), 1 deletion(-)

diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
index 5dcdc4c38..166964c62 100644
--- a/queries/slang/highlights.scm
+++ b/queries/slang/highlights.scm
@@ -1,4 +1,308 @@
-; inherits: hlsl
+; inherits: c
+
+; cpp
+((identifier) @variable.member
+  (#lua-match? @variable.member "^m_.*$"))
+
+(parameter_declaration
+  declarator: (reference_declarator) @variable.parameter)
+
+; function(Foo ...foo)
+(variadic_parameter_declaration
+  declarator: (variadic_declarator
+    (_) @variable.parameter))
+
+; int foo = 0
+(optional_parameter_declaration
+  declarator: (_) @variable.parameter)
+
+;(field_expression) @variable.parameter ;; How to highlight this?
+((field_expression
+  (field_identifier) @function.method) @_parent
+  (#has-parent? @_parent template_method function_declarator))
+
+(field_declaration
+  (field_identifier) @variable.member)
+
+(field_initializer
+  (field_identifier) @property)
+
+(function_declarator
+  declarator: (field_identifier) @function.method)
+
+(concept_definition
+  name: (identifier) @type.definition)
+
+(alias_declaration
+  name: (type_identifier) @type.definition)
+
+(namespace_identifier) @module
+
+((namespace_identifier) @type
+  (#lua-match? @type "^[%u]"))
+
+(case_statement
+  value: (qualified_identifier
+    (identifier) @constant))
+
+(using_declaration
+  .
+  "using"
+  .
+  "namespace"
+  .
+  [
+    (qualified_identifier)
+    (identifier)
+  ] @module)
+
+(destructor_name
+  (identifier) @function.method)
+
+; functions
+(function_declarator
+  (qualified_identifier
+    (identifier) @function))
+
+(function_declarator
+  (qualified_identifier
+    (qualified_identifier
+      (identifier) @function)))
+
+(function_declarator
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function))))
+
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function)))) @_parent
+  (#has-ancestor? @_parent function_declarator))
+
+(function_declarator
+  (template_function
+    (identifier) @function))
+
+(operator_name) @function
+
+"operator" @function
+
+"static_assert" @function.builtin
+
+(call_expression
+  (qualified_identifier
+    (identifier) @function.call))
+
+(call_expression
+  (qualified_identifier
+    (qualified_identifier
+      (identifier) @function.call)))
+
+(call_expression
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function.call))))
+
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function.call)))) @_parent
+  (#has-ancestor? @_parent call_expression))
+
+(call_expression
+  (template_function
+    (identifier) @function.call))
+
+(call_expression
+  (qualified_identifier
+    (template_function
+      (identifier) @function.call)))
+
+(call_expression
+  (qualified_identifier
+    (qualified_identifier
+      (template_function
+        (identifier) @function.call))))
+
+(call_expression
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (template_function
+          (identifier) @function.call)))))
+
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (template_function
+          (identifier) @function.call))))) @_parent
+  (#has-ancestor? @_parent call_expression))
+
+; methods
+(function_declarator
+  (template_method
+    (field_identifier) @function.method))
+
+(call_expression
+  (field_expression
+    (field_identifier) @function.method.call))
+
+; constructors
+((function_declarator
+  (qualified_identifier
+    (identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
+
+((call_expression
+  function: (identifier) @constructor)
+  (#lua-match? @constructor "^%u"))
+
+((call_expression
+  function: (qualified_identifier
+    name: (identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
+
+((call_expression
+  function: (field_expression
+    field: (field_identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
+
+; constructing a type in an initializer list: Constructor ():  **SuperType (1)**
+((field_initializer
+  (field_identifier) @constructor
+  (argument_list))
+  (#lua-match? @constructor "^%u"))
+
+; Constants
+(this) @variable.builtin
+
+(null
+  "nullptr" @constant.builtin)
+
+(true) @boolean
+
+(false) @boolean
+
+; Literals
+(raw_string_literal) @string
+
+; Keywords
+[
+  "try"
+  "catch"
+  "noexcept"
+  "throw"
+] @keyword.exception
+
+[
+  "decltype"
+  "explicit"
+  "friend"
+  "override"
+  "using"
+  "requires"
+  "constexpr"
+] @keyword
+
+[
+  "class"
+  "namespace"
+  "template"
+  "typename"
+  "concept"
+] @keyword.type
+
+[
+  "co_await"
+  "co_yield"
+  "co_return"
+] @keyword.coroutine
+
+[
+  "public"
+  "private"
+  "protected"
+  "final"
+  "virtual"
+] @keyword.modifier
+
+[
+  "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)
+
+(template_parameter_list
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(literal_suffix) @operator
+
+; hlsl
+[
+  "in"
+  "out"
+  "inout"
+  "uniform"
+  "shared"
+  "groupshared"
+  "discard"
+  "cbuffer"
+  "row_major"
+  "column_major"
+  "globallycoherent"
+  "centroid"
+  "noperspective"
+  "nointerpolation"
+  "sample"
+  "linear"
+  "snorm"
+  "unorm"
+  "point"
+  "line"
+  "triangleadj"
+  "lineadj"
+  "triangle"
+] @keyword.modifier
+
+((identifier) @variable.builtin
+  (#lua-match? @variable.builtin "^SV_"))
+
+(hlsl_attribute) @attribute
+
+(hlsl_attribute
+  [
+    "["
+    "]"
+  ] @attribute)
 
 [
   "var"

From 86728435273b63fe71fa64a66c2a6d49e94613a2 Mon Sep 17 00:00:00 2001
From: Nikolai Devolder <nikolai.devolder@yamabiko.eu>
Date: Mon, 7 Oct 2024 11:46:28 +0200
Subject: [PATCH 1865/2704] Fix(auto_install): Install parser if Filetype
 already known

If setup function was called after `FileType` autocommand triggers
the installation of parser was not done.

This commit checks if filetype is already know before adding the autocommand.
---
 lua/nvim-treesitter/install.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index ec7d6245b..cd12dbb81 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -555,15 +555,19 @@ local function install(options)
 end
 
 function M.setup_auto_install()
+  local function try_install_curr_lang()
+    local lang = parsers.get_buf_lang()
+    if parsers.get_parser_configs()[lang] and not is_installed(lang) and not is_ignored_parser(lang) then
+      install() { lang }
+    end
+  end
+
+  try_install_curr_lang()
+
   vim.api.nvim_create_autocmd("FileType", {
     pattern = { "*" },
     group = vim.api.nvim_create_augroup("NvimTreesitter-auto_install", { clear = true }),
-    callback = function()
-      local lang = parsers.get_buf_lang()
-      if parsers.get_parser_configs()[lang] and not is_installed(lang) and not is_ignored_parser(lang) then
-        install() { lang }
-      end
-    end,
+    callback = try_install_curr_lang,
   })
 end
 

From 049d42a31e677eb517d17acaa39666c58888d7be Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 14 Oct 2024 19:14:14 -0700
Subject: [PATCH 1866/2704] feat(regex): better count quantifier highlights

---
 queries/regex/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index 977bfd3be..e529a98a0 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -21,6 +21,8 @@
 
 (class_character) @constant
 
+(decimal_digits) @number
+
 [
   (control_letter_escape)
   (character_class_escape)
@@ -42,6 +44,7 @@
 [
   (start_assertion)
   (end_assertion)
+  ","
 ] @punctuation.delimiter
 
 (any_character) @variable.builtin

From a8052a8819f7b7b80dd3cf1e4fee08873055de31 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 14 Oct 2024 18:56:52 -0700
Subject: [PATCH 1867/2704] fix(diff): delta highlights override punctuation

---
 queries/diff/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/diff/highlights.scm b/queries/diff/highlights.scm
index 2a064eb7a..54c57a807 100644
--- a/queries/diff/highlights.scm
+++ b/queries/diff/highlights.scm
@@ -22,7 +22,7 @@
 
 (mode) @number
 
-[
+([
   ".."
   "+"
   "++"
@@ -33,6 +33,7 @@
   "---"
   "----"
 ] @punctuation.special
+  (#set! priority 95))
 
 [
   (binary_change)

From ca7993e6066077b1edcb71b82eb9bbaa61a7b90e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 06:45:28 +0000
Subject: [PATCH 1868/2704] bot(lockfile): update agda, bash, c, c_sharp,
 cmake, cpp, css, diff, editorconfig, eds, elixir, embedded_template,
 gitcommit, go, gotmpl, haskell, helm, hlsl, html, java, javascript, jsdoc,
 julia, just, ledger, php, php_only, python, ql, qmljs, regex, ruby, rust,
 slang, templ, tsx, typescript, verilog

---
 lockfile.json                  | 76 +++++++++++++++++-----------------
 queries/verilog/highlights.scm |  2 -
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7979902bb..3d23f864b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -3,7 +3,7 @@
     "revision": "e8e2515465cc2d7c444498e68bdb9f1d86767f95"
   },
   "agda": {
-    "revision": "d3dc807692e6bca671d4491b3bf5c67eeca8c016"
+    "revision": "6516cfec35479d62c0ad3c8e7e546a9774b489fd"
   },
   "angular": {
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
@@ -27,7 +27,7 @@
     "revision": "553fdc4afb3b603332c3f4baf50c711506f4e797"
   },
   "bash": {
-    "revision": "c8713e50f0bd77d080832fc61ad128bc8f2934e9"
+    "revision": "597a5ed6ed4d932fd44697feec988f977081ae59"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -51,10 +51,10 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "f4c21152f1952a99f4744e8c41d3ffb8038ae78c"
+    "revision": "79284a14a0d7e4495b095b38acdd8a27acbe870e"
   },
   "c_sharp": {
-    "revision": "fd7f7402db6e66afd70b402fb2e367b2d71c10d6"
+    "revision": "3a85187e0a9e8db01dec6b3eb2f4e7cdfecc9d88"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -69,7 +69,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "f2569dd1fce0f252097a25bcbcb9ed8898840310"
+    "revision": "e409ae33f00e04cde30f2bcffb979caf1a33562a"
   },
   "comment": {
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
@@ -87,10 +87,10 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "30d2fa385735378388a55917e2910965fce19748"
+    "revision": "16bf9d2c451957aee976c982c2c668b1c0d12014"
   },
   "css": {
-    "revision": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7"
+    "revision": "ccc4e2c4b30ddabc4b41c577ad0550b3cac4a74a"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -114,7 +114,7 @@
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
   },
   "diff": {
-    "revision": "19dd5aa52fe339a1d974768a09ee2537303e8ca5"
+    "revision": "63439b5e6e35750aff1e53d9eecc663d369c54bc"
   },
   "disassembly": {
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
@@ -141,16 +141,16 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "efbe0b2f2eaa248e8c657a80a8c2305056bda477"
+    "revision": "79bb1dc197d0eb7499843b19d3dd0f9a2ee34d3c"
   },
   "eds": {
-    "revision": "0ad62cb635c2f4353359a88dec9e3a57bbf9f66d"
+    "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
   },
   "eex": {
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "ef124b83a3f3572b0af23db4efae3f8de06a15e1"
+    "revision": "827d15deada6ca2f40eece82d1bbe65df07af954"
   },
   "elm": {
     "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
@@ -162,7 +162,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "62b0a6e45900a7dff7c37da95fec20a09968ba52"
+    "revision": "7e319b065c5864bac2fb68f7e14a338b919e8bb3"
   },
   "erlang": {
     "revision": "f1919a34af3a9c79402c4a3d6c52986e9c2ea949"
@@ -228,7 +228,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7"
+    "revision": "79fdc5de52d0e2c6854db924525196af22100dad"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -255,7 +255,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "ecc20866d1bd4d80f3aef06456ed3014d4d598e6"
+    "revision": "df2ce2e206d2810bf010d73055055bfcff1b55aa"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -270,7 +270,7 @@
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gotmpl": {
-    "revision": "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"
+    "revision": "ca52fbfc98366c585b84f4cb3745df49f33cd140"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -294,7 +294,7 @@
     "revision": "4af5d82cf9ec39f67cb1db5b7a9269d337406592"
   },
   "haskell": {
-    "revision": "558b997049fddcb07fc513528189c57d6129a260"
+    "revision": "70ea0757986ea58a0d39ddfcd9d791beadeb0f43"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -306,13 +306,13 @@
     "revision": "6dd0303acf7138dd2b9b432a229e16539581c701"
   },
   "helm": {
-    "revision": "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"
+    "revision": "ca52fbfc98366c585b84f4cb3745df49f33cd140"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "543930235970a04c2f0d549c9e88815847c7a74a"
+    "revision": "b309425a7ab4456605cfe78774b80f7e275ca87d"
   },
   "hlsplaylist": {
     "revision": "3bfda9271e3adb08d35f47a2102fe957009e1c55"
@@ -324,7 +324,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "14bdaf0da9e26e2de9b30178c2242539d2b0b285"
+    "revision": "c30792dee70aaa1910e66a39557a841b6e4386d5"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -354,16 +354,16 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "490d878cf33b0ad5ae7a7253ff30597a5bdc348e"
+    "revision": "3f8679368cf00ed10ec086975fa87f697b91b7bc"
   },
   "javascript": {
-    "revision": "b6f0624c1447bc209830b195999b78a56b10a579"
+    "revision": "c4ce9dc8e7e98ea25757ea26bfe9a022043ccd77"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "bc09606fc786ead131a301e4b7524888f2d5c517"
+    "revision": "b2237872e528b8372ed008068f717db66c16a725"
   },
   "json": {
     "revision": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"
@@ -378,10 +378,10 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "3520b57e418f734f582215181ecd926a6178c90f"
+    "revision": "19f62656dc7f2ff3756a8ef3dcf9ab1c01a9eb58"
   },
   "just": {
-    "revision": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"
+    "revision": "6aee3d2f5b3a47286bae0916daaa6c7a217f6fa4"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -405,7 +405,7 @@
     "revision": "87e4059f01bed363230dc349f794ce4cc580e862"
   },
   "ledger": {
-    "revision": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a"
+    "revision": "a2eff7fee59ee6adfc4a3646e2f41ba3b340a97d"
   },
   "leo": {
     "revision": "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"
@@ -525,10 +525,10 @@
     "revision": "76ab9a52b9dd2a1758aae3da8286519d995037e9"
   },
   "php": {
-    "revision": "07a04599ed9ac97f82c6383a24ae139a807930f3"
+    "revision": "69af07eedf60bc1992c59a8fd6b5e41f25442715"
   },
   "php_only": {
-    "revision": "07a04599ed9ac97f82c6383a24ae139a807930f3"
+    "revision": "69af07eedf60bc1992c59a8fd6b5e41f25442715"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -591,16 +591,16 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "8c65e256f971812276ff2a69a2f515c218ed7f82"
+    "revision": "7f4b9c2d8039701b0579b7c060a918f8548aa7cd"
   },
   "ql": {
-    "revision": "c73c31c89cb0019ef56fe8bc1723e7c36e0be607"
+    "revision": "1d3e2ff34f1113fadc0ff174c8a01cd4227af7fd"
   },
   "qmldir": {
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "cc4186f15e2829385be33440561fdd17b1c40cf7"
+    "revision": "6d4db242185721e1f5ef21fde613ca90c743ec47"
   },
   "query": {
     "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
@@ -627,7 +627,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "f70251e1f1d72bd6dc1f897f956f9112f8668441"
+    "revision": "123552e5849fae9a7c536eac84d471579c7f3328"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -657,10 +657,10 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "0b4729672f9aec4810c01a0f971541dcb433fef5"
+    "revision": "83aec5f7d1659aaa79e6f24b406a9cd49b87e8e8"
   },
   "rust": {
-    "revision": "6b7d1fc73ded57f73b1619bcf4371618212208b1"
+    "revision": "2ace7a922a755960f44d73a7bb1efffeb4cc5501"
   },
   "scala": {
     "revision": "2cfbb6e3fcdfd51e0d477a43cc37ae8c6f87dc2e"
@@ -678,7 +678,7 @@
     "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
   },
   "slang": {
-    "revision": "dd991eb3b6957a33d9044e0f5914588f7f449a78"
+    "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
   },
   "slint": {
     "revision": "4e2765d4cac1f03ada6f635eeb6008d1d0aff5a3"
@@ -765,7 +765,7 @@
     "revision": "485fbdc00d811b01b2090dff4d0469fd1d0350f5"
   },
   "templ": {
-    "revision": "e3e894ef9e490c3d36d94a51458ec55480991730"
+    "revision": "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -795,7 +795,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "9951831c5f05be434514dce38b30eef213667601"
+    "revision": "73c4447796b251295b498227bad028d88dc1918b"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -804,7 +804,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "9951831c5f05be434514dce38b30eef213667601"
+    "revision": "73c4447796b251295b498227bad028d88dc1918b"
   },
   "typespec": {
     "revision": "0ee05546d73d8eb64635ed8125de6f35c77759fe"
@@ -840,7 +840,7 @@
     "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"
   },
   "verilog": {
-    "revision": "075ebfc84543675f12e79a955f79d717772dcef3"
+    "revision": "5a01c57fa8e3d8801953a67ae7c6b240e2284ee8"
   },
   "vhdl": {
     "revision": "d6e8301999336b47d663052d43f983c3edeb01dd"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 69363d64b..dd58c3829 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -10,8 +10,6 @@
   "endpackage"
   "checker"
   "endchecker"
-  "config"
-  "endconfig"
   "pure"
   "virtual"
   "extends"

From 96290ae7ea0d24b9611e8e81a80736e577d41cd9 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 31 Aug 2024 19:24:08 -0700
Subject: [PATCH 1869/2704] refactor(toml): highlight queries

---
 queries/toml/highlights.scm | 74 +++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index 1370f9121..f0a5177a7 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -1,54 +1,58 @@
-; Properties
-;-----------
-(bare_key) @type
+(table
+  [
+    (bare_key) @markup.heading
+    (dotted_key
+      (bare_key) @markup.heading)
+  ])
 
-(quoted_key) @string
+(table_array_element
+  [
+    (bare_key) @markup.heading
+    (dotted_key
+      (bare_key) @markup.heading)
+  ])
 
 (pair
-  (bare_key)) @property
+  [
+    (bare_key) @property
+    (dotted_key
+      (bare_key) @property)
+  ])
 
-(pair
-  (dotted_key
-    (bare_key) @property))
+[
+  (string)
+  (quoted_key)
+] @string
 
-; Literals
-;---------
 (boolean) @boolean
 
 (comment) @comment @spell
 
-(string) @string
-
 (escape_sequence) @string.escape
 
 (integer) @number
 
 (float) @number.float
 
-(offset_date_time) @string.special
-
-(local_date_time) @string.special
-
-(local_date) @string.special
-
-(local_time) @string.special
-
-; Punctuation
-;------------
-"." @punctuation.delimiter
-
-"," @punctuation.delimiter
+[
+  (local_date)
+  (local_date_time)
+  (local_time)
+  (offset_date_time)
+] @string.special
 
 "=" @operator
 
-"[" @punctuation.bracket
+[
+  "."
+  ","
+] @punctuation.delimiter
 
-"]" @punctuation.bracket
-
-"[[" @punctuation.bracket
-
-"]]" @punctuation.bracket
-
-"{" @punctuation.bracket
-
-"}" @punctuation.bracket
+[
+  "["
+  "]"
+  "[["
+  "]]"
+  "{"
+  "}"
+] @punctuation.bracket

From 39904fd016120d87010a93ccb9845c821ba2f1dd Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 14 Oct 2024 00:19:10 -0700
Subject: [PATCH 1870/2704] don't capture tables as headings

---
 queries/toml/highlights.scm | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index f0a5177a7..f4eaf3f77 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -1,23 +1,4 @@
-(table
-  [
-    (bare_key) @markup.heading
-    (dotted_key
-      (bare_key) @markup.heading)
-  ])
-
-(table_array_element
-  [
-    (bare_key) @markup.heading
-    (dotted_key
-      (bare_key) @markup.heading)
-  ])
-
-(pair
-  [
-    (bare_key) @property
-    (dotted_key
-      (bare_key) @property)
-  ])
+(bare_key) @property
 
 [
   (string)

From da926103921117cc6dc8a518bc9b949c90d1c70c Mon Sep 17 00:00:00 2001
From: Igor <igorlfs@ufmg.br>
Date: Tue, 15 Oct 2024 15:40:49 -0300
Subject: [PATCH 1871/2704] feat(typst): fold sections

---
 queries/typst/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/typst/folds.scm b/queries/typst/folds.scm
index 710ae953b..f2c13cc2c 100644
--- a/queries/typst/folds.scm
+++ b/queries/typst/folds.scm
@@ -3,4 +3,5 @@
   (let)
   (show)
   (call)
+  (section)
 ] @fold

From d0f567251b25974f508527253d590019c4062887 Mon Sep 17 00:00:00 2001
From: Mae Brooks <138945353+MaeBrooks@users.noreply.github.com>
Date: Tue, 15 Oct 2024 18:14:39 -0700
Subject: [PATCH 1872/2704] feat(gren): gren parser and queries (#7237)

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +++
 queries/gren/highlights.scm     | 121 ++++++++++++++++++++++++++++++++
 queries/gren/injections.scm     |   5 ++
 4 files changed, 137 insertions(+)
 create mode 100644 queries/gren/highlights.scm
 create mode 100644 queries/gren/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 3d23f864b..2d53b1bf7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -278,6 +278,9 @@
   "gpg": {
     "revision": "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675"
   },
+  "gren": {
+    "revision": "19cd4c08ef86afb6fa7566fee9ac642e53b996d5"
+  },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b5853c04f..9c85ae118 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -850,6 +850,14 @@ list.gpg = {
   maintainers = { "@ObserverOfTime" },
 }
 
+list.gren = {
+  install_info = {
+    files = { "src/parser.c", "src/scanner.c" },
+    url = "https://github.com/MaeBrooks/tree-sitter-gren",
+  },
+  maintainers = { "@MaeBrooks" },
+}
+
 list.groovy = {
   install_info = {
     url = "https://github.com/murtaza64/tree-sitter-groovy",
diff --git a/queries/gren/highlights.scm b/queries/gren/highlights.scm
new file mode 100644
index 000000000..5cc6fff54
--- /dev/null
+++ b/queries/gren/highlights.scm
@@ -0,0 +1,121 @@
+; Keywords
+[
+  (as)
+  (port)
+  (exposing)
+  (alias)
+  (infix)
+] @keyword
+
+; Keywords - Conditionals
+[
+  "if"
+  "then"
+  "else"
+  "let"
+  "in"
+  (case)
+  (of)
+] @keyword.conditional
+
+; Keywords - Imports
+[
+  (import)
+  (module)
+] @keyword.import
+
+; Operators
+[
+  (arrow)
+  (backslash)
+  (colon)
+  (operator_identifier)
+  (eq)
+] @operator
+
+; Punctuation
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  ","
+  "|"
+  (dot)
+] @punctuation.delimiter
+
+; Comments
+[
+  (block_comment)
+  (line_comment)
+] @comment
+
+; Strings
+[
+  (close_quote)
+  (open_quote)
+  (regular_string_part)
+] @string
+
+; Strings - Escape
+(string_escape) @string.escape
+
+; Characters
+[
+  (open_char)
+  (close_char)
+] @character
+
+(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)
+
+(field_access_expr
+  (value_expr
+    (value_qid) @variable.member))
+
+(lower_pattern) @variable.parameter
+
+(record_base_identifier) @variable
+
+(number_constant_expr) @number
+
+(type) @keyword.type
+
+(type_declaration
+  (upper_case_identifier) @type)
+
+(type_ref) @type
+
+(type_alias_declaration
+  name: (upper_case_identifier) @type)
+
+(union_variant
+  (upper_case_identifier) @type)
+
+(union_pattern
+  constructor: (upper_case_qid
+    (upper_case_identifier) @label
+    (dot)
+    (upper_case_identifier) @type))
+
+(union_pattern
+  constructor: (upper_case_qid
+    (upper_case_identifier) @type))
+
+(value_expr
+  (upper_case_qid
+    (upper_case_identifier)) @type)
diff --git a/queries/gren/injections.scm b/queries/gren/injections.scm
new file mode 100644
index 000000000..3cd6aac8e
--- /dev/null
+++ b/queries/gren/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))

From 596b16da17698e1aafc9f20438241bf3b14a5fb9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 01:14:55 +0000
Subject: [PATCH 1873/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 65a6b4d4c..75cc8e949 100644
--- a/README.md
+++ b/README.md
@@ -267,6 +267,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
 - [x] [gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) (maintained by @ObserverOfTime)
 - [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
+- [x] [gren](https://github.com/MaeBrooks/tree-sitter-gren) (maintained by @MaeBrooks)
 - [x] [groovy](https://github.com/murtaza64/tree-sitter-groovy) (maintained by @murtaza64)
 - [x] [gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) (maintained by @theHamsta)
 - [ ] [hack](https://github.com/slackhq/tree-sitter-hack)

From b139d21726e95ac484318dfb20d1aa031097e05f Mon Sep 17 00:00:00 2001
From: henrykvdb <henrykdev@gmail.com>
Date: Wed, 16 Oct 2024 08:35:35 +0200
Subject: [PATCH 1874/2704] feat(verilog)!: use systemverilog parser and
 queries (#7170)

---
 README.md                            |   3 +-
 lockfile.json                        |   5 +-
 lua/nvim-treesitter/parsers.lua      |  13 +-
 queries/systemverilog/folds.scm      |  23 -
 queries/systemverilog/highlights.scm | 595 -----------------------
 queries/systemverilog/injections.scm |   5 -
 queries/verilog/folds.scm            |  17 +
 queries/verilog/highlights.scm       | 673 +++++++++++++++++++--------
 queries/verilog/injections.scm       |   3 +
 queries/verilog/locals.scm           |  60 ---
 10 files changed, 500 insertions(+), 897 deletions(-)
 delete mode 100644 queries/systemverilog/folds.scm
 delete mode 100644 queries/systemverilog/highlights.scm
 delete mode 100644 queries/systemverilog/injections.scm
 delete mode 100644 queries/verilog/locals.scm

diff --git a/README.md b/README.md
index 75cc8e949..a85448e9a 100644
--- a/README.md
+++ b/README.md
@@ -423,7 +423,6 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
-- [x] [systemverilog](https://github.com/zhangwwpeng/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
 - [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
 - [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
 - [x] [tact](https://github.com/tact-lang/tree-sitter-tact) (maintained by @novusnota)
@@ -454,7 +453,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [v](https://github.com/vlang/v-analyzer) (maintained by @kkharji, @amaanq)
 - [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
 - [x] [vento](https://github.com/ventojs/tree-sitter-vento) (maintained by @wrapperup, @oscarotero)
-- [x] [verilog](https://github.com/tree-sitter/tree-sitter-verilog) (maintained by @zegervdv)
+- [x] [verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
 - [x] [vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) (maintained by @jpt13653903)
 - [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
 - [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
diff --git a/lockfile.json b/lockfile.json
index 2d53b1bf7..d8e71e7a1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -749,9 +749,6 @@
   "systemtap": {
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
-  "systemverilog": {
-    "revision": "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e"
-  },
   "t32": {
     "revision": "6182836f4128725f1e74ce986840d7317021a015"
   },
@@ -843,7 +840,7 @@
     "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"
   },
   "verilog": {
-    "revision": "5a01c57fa8e3d8801953a67ae7c6b240e2284ee8"
+    "revision": "0dacb911daa9614a7c7e79a594d4cb9f478e6554"
   },
   "vhdl": {
     "revision": "d6e8301999336b47d663052d43f983c3edeb01dd"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9c85ae118..48beabd9b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -11,6 +11,7 @@ for ft, lang in pairs {
   ["typescript.tsx"] = "tsx",
   ["terraform-vars"] = "terraform",
   ["html.handlebars"] = "glimmer",
+  systemverilog = "verilog",
   dosini = "ini",
   confini = "ini",
   svg = "xml",
@@ -2171,14 +2172,6 @@ list.systemtap = {
   maintainers = { "@ok-ryoko" },
 }
 
-list.systemverilog = {
-  install_info = {
-    url = "https://github.com/zhangwwpeng/tree-sitter-systemverilog",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@zhangwwpeng" },
-}
-
 list.t32 = {
   install_info = {
     url = "https://gitlab.com/xasc/tree-sitter-t32.git",
@@ -2433,10 +2426,10 @@ list.vento = {
 
 list.verilog = {
   install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-verilog",
+    url = "https://github.com/gmlarumbe/tree-sitter-systemverilog",
     files = { "src/parser.c" },
   },
-  maintainers = { "@zegervdv" },
+  maintainers = { "@zhangwwpeng" },
 }
 
 list.vhdl = {
diff --git a/queries/systemverilog/folds.scm b/queries/systemverilog/folds.scm
deleted file mode 100644
index ea52476a4..000000000
--- a/queries/systemverilog/folds.scm
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-  (seq_block)
-  (function_body_declaration)
-  (task_body_declaration)
-  (generate_block)
-  (always_construct)
-  (property_declaration)
-  (checker_declaration)
-  (class_declaration)
-  (config_declaration)
-  (covergroup_declaration)
-  (clocking_declaration)
-  (interface_declaration)
-  (module_declaration)
-  (package_declaration)
-  (module_instantiation)
-  (program_declaration)
-  (specify_block)
-  (generate_region)
-  (package_import_declaration)
-  (text_macro_definition)
-  (include_compiler_directive)+
-] @fold
diff --git a/queries/systemverilog/highlights.scm b/queries/systemverilog/highlights.scm
deleted file mode 100644
index c8cff453f..000000000
--- a/queries/systemverilog/highlights.scm
+++ /dev/null
@@ -1,595 +0,0 @@
-; Keywords
-[
-  "begin"
-  "end"
-  "generate"
-  "endgenerate"
-  (module_keyword)
-  "endmodule"
-  "program"
-  "endprogram"
-  "package"
-  "endpackage"
-  "checker"
-  "endchecker"
-  "config"
-  "endconfig"
-  "pure"
-  "virtual"
-  "extends"
-  "implements"
-  "super"
-  (class_item_qualifier)
-  "parameter"
-  "localparam"
-  "defparam"
-  "assign"
-  "modport"
-  "fork"
-  "join"
-  "join_none"
-  "join_any"
-  "default"
-  "break"
-  "tagged"
-  "extern"
-  "alias"
-  "posedge"
-  "negedge"
-  "bind"
-  "expect"
-  "type"
-  "void"
-  "coverpoint"
-  "cross"
-  "nettype"
-  "export"
-  "force"
-  "release"
-  "timeunit"
-  "timeprecision"
-  "sequence"
-  "endsequence"
-  "property"
-  "endproperty"
-  "clocking"
-  "endclocking"
-  "covergroup"
-  "endgroup"
-  "specify"
-  "endspecify"
-  "primitive"
-  "endprimitive"
-  "wait"
-  "wait_order"
-  "const"
-  "constraint"
-  "unique"
-  "do"
-  "genvar"
-  "inside"
-  "rand"
-  "continue"
-  "randc"
-  "event"
-  "global"
-  "ref"
-  "initial"
-  (unique_priority)
-  (bins_keyword)
-  (always_keyword)
-] @keyword
-
-[
-  "class"
-  "endclass"
-  "interface"
-  "endinterface"
-  "enum"
-  "struct"
-  "union"
-  "typedef"
-] @keyword.type
-
-[
-  "function"
-  "endfunction"
-  "task"
-  "endtask"
-] @keyword.function
-
-"return" @keyword.return
-
-[
-  "for"
-  "foreach"
-  "repeat"
-  "forever"
-  "while"
-] @keyword.repeat
-
-; for
-(loop_generate_construct
-  (generate_block
-    [
-      "begin"
-      "end"
-    ] @keyword.conditional))
-
-; foreach
-(loop_statement
-  (statement
-    (statement_item
-      (seq_block
-        [
-          "begin"
-          "end"
-        ] @keyword.conditional))))
-
-; repeat forever while
-(loop_statement
-  (statement_or_null
-    (statement
-      (statement_item
-        (seq_block
-          [
-            "begin"
-            "end"
-          ] @keyword.conditional)))))
-
-[
-  "if"
-  "else"
-  "iff"
-  (case_keyword)
-  "endcase"
-] @keyword.conditional
-
-[
-  "="
-  "-"
-  "+"
-  "/"
-  "*"
-  "^"
-  "&"
-  "|"
-  "&&"
-  "||"
-  "<="
-  "=="
-  "!="
-  "==="
-  "!=="
-  "-:"
-  "<"
-  ">"
-  ">="
-  "%"
-  ">>"
-  "<<"
-  "|="
-  "|=>"
-  "|->"
-  ">>>"
-  "<<<"
-  "->>"
-  "->"
-  "=>"
-  "*>"
-  ".*"
-  (unary_operator)
-  (inc_or_dec_operator)
-  (queue_dimension)
-] @operator
-
-"#" @constructor
-
-[
-  ";"
-  "::"
-  ","
-  "."
-  ":"
-] @punctuation.delimiter
-
-(conditional_expression
-  [
-    "?"
-    ":"
-  ] @keyword.conditional.ternary)
-
-[
-  "["
-  "]"
-  "("
-  ")"
-  "{"
-  "}"
-  "'{"
-] @punctuation.bracket
-
-[
-  "or"
-  "and"
-] @keyword.operator
-
-[
-  "input"
-  "output"
-  "inout"
-  "signed"
-  "unsigned"
-  "assert"
-  "cover"
-  "assume"
-  "disable"
-  "automatic"
-  "static"
-  (dpi_function_import_property)
-  (dpi_task_import_property)
-] @keyword.modifier
-
-[
-  "include"
-  "import"
-  "directive_include"
-] @keyword.import
-
-(comment) @comment @spell
-
-[
-  "@"
-  (cycle_delay_range)
-  (delay_control)
-  (cycle_delay)
-  (attribute_instance)
-] @attribute
-
-(attribute_instance
-  (attr_spec
-    (simple_identifier) @property))
-
-[
-  (integral_number)
-  (unbased_unsized_literal)
-  (fixed_point_number)
-  (unsigned_number)
-] @number
-
-[
-  (net_type)
-  (data_type)
-  (time_unit)
-] @type.builtin
-
-; variable
-(list_of_variable_decl_assignments
-  (variable_decl_assignment
-    name: (simple_identifier) @variable))
-
-(hierarchical_identifier
-  (simple_identifier) @variable)
-
-(tf_port_item
-  (simple_identifier) @variable)
-
-port_name: (simple_identifier) @variable
-
-(port
-  (simple_identifier) @variable)
-
-(list_of_port_identifiers
-  (simple_identifier) @variable)
-
-(net_lvalue
-  (simple_identifier) @variable)
-
-(sequence_port_item
-  (simple_identifier) @variable)
-
-(property_port_item
-  (simple_identifier) @variable)
-
-(net_decl_assignment
-  (simple_identifier) @variable)
-
-(ERROR
-  (simple_identifier) @variable)
-
-; variable.member
-(hierarchical_identifier
-  (simple_identifier)
-  (simple_identifier) @variable.member)
-
-(select
-  (simple_identifier) @variable.member)
-
-(named_port_connection
-  port_name: (simple_identifier) @variable.member)
-
-(ordered_port_connection
-  (expression
-    (primary
-      (hierarchical_identifier
-        (simple_identifier) @variable.member))))
-
-(coverage_option
-  (simple_identifier) @variable.member)
-
-; variable.builtin
-(method_call_body
-  arguments: (list_of_arguments
-    (expression) @variable.builtin
-    (#any-of? @variable.builtin "this")))
-
-(implicit_class_handle) @variable.builtin
-
-; variable.parameter
-(named_parameter_assignment
-  (simple_identifier) @variable.parameter)
-
-(parameter_declaration
-  (list_of_param_assignments
-    (param_assignment
-      (simple_identifier) @variable.parameter)))
-
-(local_parameter_declaration
-  (list_of_param_assignments
-    (param_assignment
-      (simple_identifier) @variable.parameter)))
-
-; function builtin
-[
-  (simulation_control_task)
-  (system_tf_identifier)
-  (severity_system_task)
-  (randomize_call)
-  (array_or_queue_method_name)
-  "new"
-] @function.builtin
-
-; declaration
-(task_body_declaration
-  .
-  name: (simple_identifier) @function
-  (simple_identifier)? @label)
-
-(function_body_declaration
-  .
-  name: (simple_identifier) @function
-  (simple_identifier)? @label)
-
-(function_body_declaration
-  .
-  (data_type_or_void)
-  name: (simple_identifier) @function
-  (simple_identifier)? @label)
-
-(clocking_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(sequence_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(property_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(class_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(interface_class_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(covergroup_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(package_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(checker_declaration
-  .
-  name: (simple_identifier) @constructor
-  (simple_identifier)? @label)
-
-(interface_declaration
-  .
-  [
-    (simple_identifier) @constructor
-    (interface_nonansi_header
-      (simple_identifier) @constructor)
-    (interface_ansi_header
-      (simple_identifier) @constructor)
-  ]
-  (simple_identifier)? @label)
-
-(module_declaration
-  .
-  [
-    (simple_identifier) @constructor
-    (module_nonansi_header
-      (simple_identifier) @constructor)
-    (module_ansi_header
-      (simple_identifier) @constructor)
-  ]
-  (simple_identifier)? @label)
-
-(program_declaration
-  .
-  [
-    (simple_identifier) @constructor
-    (program_nonansi_header
-      (simple_identifier) @constructor)
-    (program_ansi_header
-      (simple_identifier) @constructor)
-  ]
-  (simple_identifier)? @label)
-
-; function.call
-(method_call_body
-  name: (simple_identifier) @function.call)
-
-(tf_call
-  (hierarchical_identifier
-    (simple_identifier) @function.call))
-
-; instance
-(module_instantiation
-  instance_type: (simple_identifier) @constructor)
-
-(name_of_instance
-  instance_name: (simple_identifier) @module)
-
-(sequence_instance
-  (hierarchical_identifier
-    (simple_identifier) @module))
-
-(udp_instantiation
-  (simple_identifier) @constructor)
-
-(ansi_port_declaration
-  (interface_port_header
-    interface_name: (simple_identifier) @variable
-    modport_name: (simple_identifier) @variable.member)
-  port_name: (simple_identifier) @variable)
-
-; bind
-(bind_directive
-  (bind_target_scope
-    (simple_identifier) @constructor))
-
-(bind_target_instance
-  (hierarchical_identifier
-    (simple_identifier) @module))
-
-; assertion
-(concurrent_assertion_item
-  (simple_identifier) @label)
-
-; converge
-(cover_point
-  name: (simple_identifier) @label)
-
-(cover_cross
-  name: (simple_identifier) @module)
-
-(list_of_cross_items
-  (simple_identifier) @constructor)
-
-;package
-(package_import_item
-  (simple_identifier) @constructor)
-
-; label
-(seq_block
-  (simple_identifier) @label)
-
-(statement
-  block_name: (simple_identifier) @label)
-
-; dpi
-(dpi_spec_string) @string
-
-c_name: (c_identifier) @function
-
-(dpi_import_export
-  name: (simple_identifier) @function)
-
-; type def
-(class_type
-  (simple_identifier) @constructor)
-
-(class_type
-  (simple_identifier)
-  (simple_identifier) @type)
-
-(data_type
-  (class_scope
-    (class_type
-      (simple_identifier) @constructor)))
-
-(task_prototype
-  name: (simple_identifier) @function)
-
-(function_prototype
-  name: (simple_identifier) @function)
-
-(type_assignment
-  name: (simple_identifier) @type.definition)
-
-(interface_class_type
-  (simple_identifier) @type.definition)
-
-(package_scope
-  (simple_identifier) @constructor)
-
-(data_declaration
-  (type_declaration
-    type_name: (simple_identifier) @type.definition))
-
-(net_declaration
-  (simple_identifier) @type)
-
-(constraint_declaration
-  (simple_identifier) @constructor)
-
-(method_call
-  (primary
-    (hierarchical_identifier
-      (simple_identifier) @constructor)))
-
-(string_literal
-  (quoted_string) @string)
-
-; include
-(include_statement
-  (file_path_spec) @string.special.path)
-
-; directive
-[
-  "directive_define"
-  "directive_default_nettype"
-  "directive_resetall"
-  "directive_timescale"
-  "directive_undef"
-  "directive_undefineall"
-  "directive_ifdef"
-  "directive_elsif"
-  "directive_endif"
-  "directive_else"
-] @keyword.directive.define
-
-(include_compiler_directive
-  (quoted_string) @string.special.path)
-
-(include_compiler_directive
-  (system_lib_string) @string)
-
-(default_nettype_compiler_directive
-  (default_nettype_value) @type.builtin)
-
-(text_macro_definition
-  (text_macro_name
-    (simple_identifier) @keyword.directive))
-
-(text_macro_usage) @keyword.directive
-
-(ifdef_condition
-  (simple_identifier) @keyword.directive)
-
-(undefine_compiler_directive
-  (simple_identifier) @keyword.directive)
diff --git a/queries/systemverilog/injections.scm b/queries/systemverilog/injections.scm
deleted file mode 100644
index b6d2d4721..000000000
--- a/queries/systemverilog/injections.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-((comment) @injection.content
-  (#set! injection.language "comment"))
-
-((macro_text) @injection.content
-  (#set! injection.language "systemverilog"))
diff --git a/queries/verilog/folds.scm b/queries/verilog/folds.scm
index efc0ac66b..ea52476a4 100644
--- a/queries/verilog/folds.scm
+++ b/queries/verilog/folds.scm
@@ -3,4 +3,21 @@
   (function_body_declaration)
   (task_body_declaration)
   (generate_block)
+  (always_construct)
+  (property_declaration)
+  (checker_declaration)
+  (class_declaration)
+  (config_declaration)
+  (covergroup_declaration)
+  (clocking_declaration)
+  (interface_declaration)
+  (module_declaration)
+  (package_declaration)
+  (module_instantiation)
+  (program_declaration)
+  (specify_block)
+  (generate_region)
+  (package_import_declaration)
+  (text_macro_definition)
+  (include_compiler_directive)+
 ] @fold
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index dd58c3829..c8cff453f 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -2,6 +2,8 @@
 [
   "begin"
   "end"
+  "generate"
+  "endgenerate"
   (module_keyword)
   "endmodule"
   "program"
@@ -10,6 +12,8 @@
   "endpackage"
   "checker"
   "endchecker"
+  "config"
+  "endconfig"
   "pure"
   "virtual"
   "extends"
@@ -27,10 +31,53 @@
   "join_any"
   "default"
   "break"
-  "assert"
   "tagged"
   "extern"
+  "alias"
+  "posedge"
+  "negedge"
+  "bind"
+  "expect"
+  "type"
+  "void"
+  "coverpoint"
+  "cross"
+  "nettype"
+  "export"
+  "force"
+  "release"
+  "timeunit"
+  "timeprecision"
+  "sequence"
+  "endsequence"
+  "property"
+  "endproperty"
+  "clocking"
+  "endclocking"
+  "covergroup"
+  "endgroup"
+  "specify"
+  "endspecify"
+  "primitive"
+  "endprimitive"
+  "wait"
+  "wait_order"
+  "const"
+  "constraint"
+  "unique"
+  "do"
+  "genvar"
+  "inside"
+  "rand"
+  "continue"
+  "randc"
+  "event"
+  "global"
+  "ref"
+  "initial"
   (unique_priority)
+  (bins_keyword)
+  (always_keyword)
 ] @keyword
 
 [
@@ -54,46 +101,50 @@
 "return" @keyword.return
 
 [
-  (always_keyword)
-  "generate"
   "for"
   "foreach"
   "repeat"
   "forever"
-  "initial"
   "while"
 ] @keyword.repeat
 
+; for
+(loop_generate_construct
+  (generate_block
+    [
+      "begin"
+      "end"
+    ] @keyword.conditional))
+
+; foreach
+(loop_statement
+  (statement
+    (statement_item
+      (seq_block
+        [
+          "begin"
+          "end"
+        ] @keyword.conditional))))
+
+; repeat forever while
+(loop_statement
+  (statement_or_null
+    (statement
+      (statement_item
+        (seq_block
+          [
+            "begin"
+            "end"
+          ] @keyword.conditional)))))
+
 [
   "if"
   "else"
+  "iff"
   (case_keyword)
   "endcase"
 ] @keyword.conditional
 
-(comment) @comment @spell
-
-(include_compiler_directive) @constant.macro
-
-(package_import_declaration
-  "import" @keyword.import)
-
-(package_import_declaration
-  (package_import_item
-    (package_identifier
-      (simple_identifier) @constant)))
-
-(text_macro_identifier
-  (simple_identifier) @constant.macro)
-
-(package_scope
-  (package_identifier
-    (simple_identifier) @constant))
-
-(package_declaration
-  (package_identifier
-    (simple_identifier) @constant))
-
 [
   "="
   "-"
@@ -106,8 +157,6 @@
   "&&"
   "||"
   "<="
-  "@"
-  "@*"
   "=="
   "!="
   "==="
@@ -120,84 +169,28 @@
   ">>"
   "<<"
   "|="
+  "|=>"
+  "|->"
+  ">>>"
+  "<<<"
+  "->>"
+  "->"
+  "=>"
+  "*>"
+  ".*"
   (unary_operator)
   (inc_or_dec_operator)
-  "#"
+  (queue_dimension)
 ] @operator
 
-(parameter_port_list
-  "#" @constructor)
-
-[
-  "or"
-  "and"
-] @keyword.operator
-
-(cast
-  [
-    "'"
-    "("
-    ")"
-  ] @operator)
-
-(edge_identifier) @attribute
-
-(port_direction) @keyword.modifier
-
-(port_identifier
-  (simple_identifier) @variable)
-
-[
-  (net_type)
-  (integer_vector_type)
-  (integer_atom_type)
-] @type.builtin
-
-[
-  "signed"
-  "unsigned"
-  "input"
-  "output"
-] @keyword.modifier
-
-(data_type
-  (simple_identifier) @type)
-
-(method_call_body
-  (method_identifier) @variable.member)
-
-(interface_identifier
-  (simple_identifier) @type)
-
-(modport_identifier
-  (modport_identifier
-    (simple_identifier) @variable.member))
-
-(net_port_type1
-  (simple_identifier) @type)
-
-[
-  (double_quoted_string)
-  (string_literal)
-] @string
-
-[
-  (default_nettype_compiler_directive)
-  (timescale_compiler_directive)
-] @keyword.directive
-
-(include_compiler_directive) @keyword.import
-
-; begin/end label
-(seq_block
-  (simple_identifier) @comment)
+"#" @constructor
 
 [
   ";"
   "::"
-  ":"
   ","
   "."
+  ":"
 ] @punctuation.delimiter
 
 (conditional_expression
@@ -206,107 +199,6 @@
     ":"
   ] @keyword.conditional.ternary)
 
-(default_nettype_compiler_directive
-  (default_nettype_value) @string)
-
-(text_macro_identifier
-  (simple_identifier) @constant)
-
-(module_declaration
-  (module_header
-    (simple_identifier) @constructor))
-
-(class_constructor_declaration
-  "new" @constructor)
-
-(parameter_identifier
-  (simple_identifier) @variable.parameter)
-
-[
-  (integral_number)
-  (unsigned_number)
-  (unbased_unsized_literal)
-] @number
-
-(time_unit) @type.builtin
-
-(checker_instantiation
-  (checker_identifier
-    (simple_identifier) @constructor))
-
-(module_instantiation
-  (simple_identifier) @constructor)
-
-(name_of_instance
-  (instance_identifier
-    (simple_identifier) @variable))
-
-(interface_port_declaration
-  (interface_identifier
-    (simple_identifier) @type))
-
-(net_declaration
-  (simple_identifier) @type)
-
-(lifetime) @keyword.modifier
-
-(function_identifier
-  (function_identifier
-    (simple_identifier) @function))
-
-(function_subroutine_call
-  (subroutine_call
-    (tf_call
-      (simple_identifier) @function)))
-
-(function_subroutine_call
-  (subroutine_call
-    (system_tf_call
-      (system_tf_identifier) @function.builtin)))
-
-(task_identifier
-  (task_identifier
-    (simple_identifier) @function.method))
-
-;TODO: fixme
-;(assignment_pattern_expression
-;(assignment_pattern
-;(parameter_identifier) @variable.member))
-(type_declaration
-  (data_type
-    "packed" @keyword.modifier))
-
-(enum_name_declaration
-  (enum_identifier
-    (simple_identifier) @constant))
-
-(type_declaration
-  (simple_identifier) @type)
-
-[
-  (integer_atom_type)
-  (non_integer_type)
-  "genvar"
-] @type.builtin
-
-(struct_union_member
-  (list_of_variable_decl_assignments
-    (variable_decl_assignment
-      (simple_identifier) @variable.member)))
-
-(member_identifier
-  (simple_identifier) @variable.member)
-
-(struct_union_member
-  (data_type_or_void
-    (data_type
-      (simple_identifier) @type)))
-
-(type_declaration
-  (simple_identifier) @type)
-
-(generate_block_identifier) @comment
-
 [
   "["
   "]"
@@ -316,3 +208,388 @@
   "}"
   "'{"
 ] @punctuation.bracket
+
+[
+  "or"
+  "and"
+] @keyword.operator
+
+[
+  "input"
+  "output"
+  "inout"
+  "signed"
+  "unsigned"
+  "assert"
+  "cover"
+  "assume"
+  "disable"
+  "automatic"
+  "static"
+  (dpi_function_import_property)
+  (dpi_task_import_property)
+] @keyword.modifier
+
+[
+  "include"
+  "import"
+  "directive_include"
+] @keyword.import
+
+(comment) @comment @spell
+
+[
+  "@"
+  (cycle_delay_range)
+  (delay_control)
+  (cycle_delay)
+  (attribute_instance)
+] @attribute
+
+(attribute_instance
+  (attr_spec
+    (simple_identifier) @property))
+
+[
+  (integral_number)
+  (unbased_unsized_literal)
+  (fixed_point_number)
+  (unsigned_number)
+] @number
+
+[
+  (net_type)
+  (data_type)
+  (time_unit)
+] @type.builtin
+
+; variable
+(list_of_variable_decl_assignments
+  (variable_decl_assignment
+    name: (simple_identifier) @variable))
+
+(hierarchical_identifier
+  (simple_identifier) @variable)
+
+(tf_port_item
+  (simple_identifier) @variable)
+
+port_name: (simple_identifier) @variable
+
+(port
+  (simple_identifier) @variable)
+
+(list_of_port_identifiers
+  (simple_identifier) @variable)
+
+(net_lvalue
+  (simple_identifier) @variable)
+
+(sequence_port_item
+  (simple_identifier) @variable)
+
+(property_port_item
+  (simple_identifier) @variable)
+
+(net_decl_assignment
+  (simple_identifier) @variable)
+
+(ERROR
+  (simple_identifier) @variable)
+
+; variable.member
+(hierarchical_identifier
+  (simple_identifier)
+  (simple_identifier) @variable.member)
+
+(select
+  (simple_identifier) @variable.member)
+
+(named_port_connection
+  port_name: (simple_identifier) @variable.member)
+
+(ordered_port_connection
+  (expression
+    (primary
+      (hierarchical_identifier
+        (simple_identifier) @variable.member))))
+
+(coverage_option
+  (simple_identifier) @variable.member)
+
+; variable.builtin
+(method_call_body
+  arguments: (list_of_arguments
+    (expression) @variable.builtin
+    (#any-of? @variable.builtin "this")))
+
+(implicit_class_handle) @variable.builtin
+
+; variable.parameter
+(named_parameter_assignment
+  (simple_identifier) @variable.parameter)
+
+(parameter_declaration
+  (list_of_param_assignments
+    (param_assignment
+      (simple_identifier) @variable.parameter)))
+
+(local_parameter_declaration
+  (list_of_param_assignments
+    (param_assignment
+      (simple_identifier) @variable.parameter)))
+
+; function builtin
+[
+  (simulation_control_task)
+  (system_tf_identifier)
+  (severity_system_task)
+  (randomize_call)
+  (array_or_queue_method_name)
+  "new"
+] @function.builtin
+
+; declaration
+(task_body_declaration
+  .
+  name: (simple_identifier) @function
+  (simple_identifier)? @label)
+
+(function_body_declaration
+  .
+  name: (simple_identifier) @function
+  (simple_identifier)? @label)
+
+(function_body_declaration
+  .
+  (data_type_or_void)
+  name: (simple_identifier) @function
+  (simple_identifier)? @label)
+
+(clocking_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(sequence_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(property_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(class_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(interface_class_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(covergroup_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(package_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(checker_declaration
+  .
+  name: (simple_identifier) @constructor
+  (simple_identifier)? @label)
+
+(interface_declaration
+  .
+  [
+    (simple_identifier) @constructor
+    (interface_nonansi_header
+      (simple_identifier) @constructor)
+    (interface_ansi_header
+      (simple_identifier) @constructor)
+  ]
+  (simple_identifier)? @label)
+
+(module_declaration
+  .
+  [
+    (simple_identifier) @constructor
+    (module_nonansi_header
+      (simple_identifier) @constructor)
+    (module_ansi_header
+      (simple_identifier) @constructor)
+  ]
+  (simple_identifier)? @label)
+
+(program_declaration
+  .
+  [
+    (simple_identifier) @constructor
+    (program_nonansi_header
+      (simple_identifier) @constructor)
+    (program_ansi_header
+      (simple_identifier) @constructor)
+  ]
+  (simple_identifier)? @label)
+
+; function.call
+(method_call_body
+  name: (simple_identifier) @function.call)
+
+(tf_call
+  (hierarchical_identifier
+    (simple_identifier) @function.call))
+
+; instance
+(module_instantiation
+  instance_type: (simple_identifier) @constructor)
+
+(name_of_instance
+  instance_name: (simple_identifier) @module)
+
+(sequence_instance
+  (hierarchical_identifier
+    (simple_identifier) @module))
+
+(udp_instantiation
+  (simple_identifier) @constructor)
+
+(ansi_port_declaration
+  (interface_port_header
+    interface_name: (simple_identifier) @variable
+    modport_name: (simple_identifier) @variable.member)
+  port_name: (simple_identifier) @variable)
+
+; bind
+(bind_directive
+  (bind_target_scope
+    (simple_identifier) @constructor))
+
+(bind_target_instance
+  (hierarchical_identifier
+    (simple_identifier) @module))
+
+; assertion
+(concurrent_assertion_item
+  (simple_identifier) @label)
+
+; converge
+(cover_point
+  name: (simple_identifier) @label)
+
+(cover_cross
+  name: (simple_identifier) @module)
+
+(list_of_cross_items
+  (simple_identifier) @constructor)
+
+;package
+(package_import_item
+  (simple_identifier) @constructor)
+
+; label
+(seq_block
+  (simple_identifier) @label)
+
+(statement
+  block_name: (simple_identifier) @label)
+
+; dpi
+(dpi_spec_string) @string
+
+c_name: (c_identifier) @function
+
+(dpi_import_export
+  name: (simple_identifier) @function)
+
+; type def
+(class_type
+  (simple_identifier) @constructor)
+
+(class_type
+  (simple_identifier)
+  (simple_identifier) @type)
+
+(data_type
+  (class_scope
+    (class_type
+      (simple_identifier) @constructor)))
+
+(task_prototype
+  name: (simple_identifier) @function)
+
+(function_prototype
+  name: (simple_identifier) @function)
+
+(type_assignment
+  name: (simple_identifier) @type.definition)
+
+(interface_class_type
+  (simple_identifier) @type.definition)
+
+(package_scope
+  (simple_identifier) @constructor)
+
+(data_declaration
+  (type_declaration
+    type_name: (simple_identifier) @type.definition))
+
+(net_declaration
+  (simple_identifier) @type)
+
+(constraint_declaration
+  (simple_identifier) @constructor)
+
+(method_call
+  (primary
+    (hierarchical_identifier
+      (simple_identifier) @constructor)))
+
+(string_literal
+  (quoted_string) @string)
+
+; include
+(include_statement
+  (file_path_spec) @string.special.path)
+
+; directive
+[
+  "directive_define"
+  "directive_default_nettype"
+  "directive_resetall"
+  "directive_timescale"
+  "directive_undef"
+  "directive_undefineall"
+  "directive_ifdef"
+  "directive_elsif"
+  "directive_endif"
+  "directive_else"
+] @keyword.directive.define
+
+(include_compiler_directive
+  (quoted_string) @string.special.path)
+
+(include_compiler_directive
+  (system_lib_string) @string)
+
+(default_nettype_compiler_directive
+  (default_nettype_value) @type.builtin)
+
+(text_macro_definition
+  (text_macro_name
+    (simple_identifier) @keyword.directive))
+
+(text_macro_usage) @keyword.directive
+
+(ifdef_condition
+  (simple_identifier) @keyword.directive)
+
+(undefine_compiler_directive
+  (simple_identifier) @keyword.directive)
diff --git a/queries/verilog/injections.scm b/queries/verilog/injections.scm
index 2f0e58eb6..05aa24d8f 100644
--- a/queries/verilog/injections.scm
+++ b/queries/verilog/injections.scm
@@ -1,2 +1,5 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((macro_text) @injection.content
+  (#set! injection.language "verilog"))
diff --git a/queries/verilog/locals.scm b/queries/verilog/locals.scm
deleted file mode 100644
index e9ed89169..000000000
--- a/queries/verilog/locals.scm
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-  (loop_generate_construct)
-  (loop_statement)
-  (conditional_statement)
-  (case_item)
-  (function_declaration)
-  (always_construct)
-  (module_declaration)
-] @local.scope
-
-(data_declaration
-  (list_of_variable_decl_assignments
-    (variable_decl_assignment
-      (simple_identifier) @local.definition.var)))
-
-(genvar_initialization
-  (genvar_identifier
-    (simple_identifier) @local.definition.var))
-
-(for_initialization
-  (for_variable_declaration
-    (simple_identifier) @local.definition.var))
-
-(net_declaration
-  (list_of_net_decl_assignments
-    (net_decl_assignment
-      (simple_identifier) @local.definition.var)))
-
-(ansi_port_declaration
-  (port_identifier
-    (simple_identifier) @local.definition.var))
-
-(parameter_declaration
-  (list_of_param_assignments
-    (param_assignment
-      (parameter_identifier
-        (simple_identifier) @local.definition.parameter))))
-
-(local_parameter_declaration
-  (list_of_param_assignments
-    (param_assignment
-      (parameter_identifier
-        (simple_identifier) @local.definition.parameter))))
-
-; TODO: fixme
-;(function_declaration
-;(function_identifier
-;(simple_identifier) @local.definition.function))
-(function_declaration
-  (function_body_declaration
-    (function_identifier
-      (function_identifier
-        (simple_identifier) @local.definition.function))))
-
-(tf_port_item1
-  (port_identifier
-    (simple_identifier) @local.definition.parameter))
-
-; too broad, now includes types etc
-(simple_identifier) @local.reference

From cbc0d1d96ed40787029b4e5f176783c52f4bae4d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:04:07 -0400
Subject: [PATCH 1875/2704] fix(apex): remove unused rule

---
 queries/apex/highlights.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm
index 6dd24a94c..82ce23414 100644
--- a/queries/apex/highlights.scm
+++ b/queries/apex/highlights.scm
@@ -224,7 +224,6 @@
   (abstract)
   (all_rows_clause)
   "continue"
-  "default"
   "extends"
   (final)
   "get"

From 25f11725d6a2cb203909059c9ede4c0eb4713c6a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:04:13 -0400
Subject: [PATCH 1876/2704] fix(astro): remove unused rule

---
 queries/astro/highlights.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/queries/astro/highlights.scm b/queries/astro/highlights.scm
index bdaf88e32..e4baf5380 100644
--- a/queries/astro/highlights.scm
+++ b/queries/astro/highlights.scm
@@ -1,4 +1,8 @@
-; inherits: html
+; inherits: html_tags
+
+(doctype) @constant
+
+"<!" @tag.delimiter
 
 "---" @punctuation.delimiter
 

From c729bb2487a4cf87e60416b0c75d580efa6d086c Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:04:49 -0400
Subject: [PATCH 1877/2704] fix(bitbake): remove unused rule

---
 queries/bitbake/highlights.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index 4b03fbc27..c7316de6e 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -102,7 +102,6 @@
 
 [
   "noexec"
-  "INHERIT"
   "OVERRIDES"
   "$BB_ENV_PASSTHROUGH"
   "$BB_ENV_PASSTHROUGH_ADDITIONS"

From f2094105133a89c31d144f7d1d9305c1361baadc Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:04:54 -0400
Subject: [PATCH 1878/2704] fix(dart): remove unused rule

---
 queries/dart/highlights.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 5189a407a..072a10d26 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -261,7 +261,6 @@
   (final_builtin)
   "abstract"
   "covariant"
-  "dynamic"
   "external"
   "static"
   "final"

From 1a506b60078f5dd75dbe180a82441fc64aef1639 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:04:59 -0400
Subject: [PATCH 1879/2704] fix(nqc): remove unused rule

---
 queries/nqc/highlights.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/queries/nqc/highlights.scm b/queries/nqc/highlights.scm
index 215ffbc4d..0d0b770a8 100644
--- a/queries/nqc/highlights.scm
+++ b/queries/nqc/highlights.scm
@@ -1,9 +1,6 @@
 ; inherits: c
 
-[
-  "task"
-  "sub"
-] @keyword.function
+"task" @keyword.function
 
 "until" @keyword.repeat
 

From 439fedf446097191b1fbcf713fccb84ac209cef0 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:07 -0400
Subject: [PATCH 1880/2704] fix(ocaml_interface): remove unused rule

---
 queries/ocaml_interface/highlights.scm | 328 ++++++++++++++++++++++++-
 1 file changed, 327 insertions(+), 1 deletion(-)

diff --git a/queries/ocaml_interface/highlights.scm b/queries/ocaml_interface/highlights.scm
index 6d3dfbcf2..b623e432b 100644
--- a/queries/ocaml_interface/highlights.scm
+++ b/queries/ocaml_interface/highlights.scm
@@ -1 +1,327 @@
-; inherits: ocaml
+; Modules
+;--------
+[
+  (module_name)
+  (module_type_name)
+] @module
+
+; Types
+;------
+((type_constructor) @type.builtin
+  (#any-of? @type.builtin
+    "int" "char" "bytes" "string" "float" "bool" "unit" "exn" "array" "list" "option" "int32"
+    "int64" "nativeint" "format6" "lazy_t"))
+
+[
+  (class_name)
+  (class_type_name)
+  (type_constructor)
+] @type
+
+[
+  (constructor_name)
+  (tag)
+] @constructor
+
+; Variables
+;----------
+[
+  (value_name)
+  (type_variable)
+] @variable
+
+(value_pattern) @variable.parameter
+
+((value_pattern) @character.special
+  (#eq? @character.special "_"))
+
+; Functions
+;----------
+(let_binding
+  pattern: (value_name) @function
+  (parameter))
+
+(let_binding
+  pattern: (value_name) @function
+  body: [
+    (fun_expression)
+    (function_expression)
+  ])
+
+(value_specification
+  (value_name) @function)
+
+(external
+  (value_name) @function)
+
+(method_name) @function.method
+
+; Application
+;------------
+(infix_expression
+  left: (value_path
+    (value_name) @function.call)
+  operator: (concat_operator) @_operator
+  (#eq? @_operator "@@"))
+
+(infix_expression
+  operator: (rel_operator) @_operator
+  right: (value_path
+    (value_name) @function.call)
+  (#eq? @_operator "|>"))
+
+(application_expression
+  function: (value_path
+    (value_name) @function.call))
+
+((value_name) @function.builtin
+  (#any-of? @function.builtin "raise" "raise_notrace" "failwith" "invalid_arg"))
+
+; Fields
+;-------
+[
+  (field_name)
+  (instance_variable_name)
+] @variable.member
+
+; Labels
+; ------
+(label_name) @label
+
+; Constants
+;----------
+; Don't let normal parens take priority over this
+((unit) @constant.builtin
+  (#set! priority 105))
+
+(boolean) @boolean
+
+[
+  (number)
+  (signed_number)
+] @number
+
+(character) @character
+
+(string) @string
+
+(quoted_string
+  "{" @string
+  "}" @string) @string
+
+(escape_sequence) @string.escape
+
+[
+  (conversion_specification)
+  (pretty_printing_indication)
+] @string.special
+
+; Keywords
+;---------
+[
+  "and"
+  "as"
+  "assert"
+  "begin"
+  "constraint"
+  "end"
+  "external"
+  "in"
+  "inherit"
+  "initializer"
+  "let"
+  "match"
+  "method"
+  "module"
+  "new"
+  "of"
+  "sig"
+  "val"
+  "when"
+  "with"
+] @keyword
+
+[
+  "object"
+  "class"
+  "struct"
+  "type"
+] @keyword.type
+
+[
+  "lazy"
+  "mutable"
+  "nonrec"
+  "rec"
+  "private"
+  "virtual"
+] @keyword.modifier
+
+[
+  "fun"
+  "function"
+  "functor"
+] @keyword.function
+
+[
+  "if"
+  "then"
+  "else"
+] @keyword.conditional
+
+[
+  "exception"
+  "try"
+] @keyword.exception
+
+[
+  "include"
+  "open"
+] @keyword.import
+
+[
+  "for"
+  "to"
+  "downto"
+  "while"
+  "do"
+  "done"
+] @keyword.repeat
+
+; Punctuation
+;------------
+(attribute
+  [
+    "[@"
+    "]"
+  ] @punctuation.special)
+
+(item_attribute
+  [
+    "[@@"
+    "]"
+  ] @punctuation.special)
+
+(floating_attribute
+  [
+    "[@@@"
+    "]"
+  ] @punctuation.special)
+
+(extension
+  [
+    "[%"
+    "]"
+  ] @punctuation.special)
+
+(item_extension
+  [
+    "[%%"
+    "]"
+  ] @punctuation.special)
+
+(quoted_extension
+  [
+    "{%"
+    "}"
+  ] @punctuation.special)
+
+(quoted_item_extension
+  [
+    "{%%"
+    "}"
+  ] @punctuation.special)
+
+"%" @punctuation.special
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "[|"
+  "|]"
+  "[<"
+  "[>"
+] @punctuation.bracket
+
+(object_type
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+[
+  ","
+  "."
+  ";"
+  ":"
+  "="
+  "|"
+  "~"
+  "?"
+  "+"
+  "-"
+  "!"
+  ">"
+  "&"
+  "->"
+  ";;"
+  ":>"
+  "+="
+  ":="
+  ".."
+] @punctuation.delimiter
+
+(range_pattern
+  ".." @character.special)
+
+; Operators
+;----------
+[
+  (prefix_operator)
+  (sign_operator)
+  (pow_operator)
+  (mult_operator)
+  (add_operator)
+  (concat_operator)
+  (rel_operator)
+  (and_operator)
+  (or_operator)
+  (assign_operator)
+  (hash_operator)
+  (indexing_operator)
+  (let_operator)
+  (and_operator)
+  (match_operator)
+] @operator
+
+(match_expression
+  (match_operator) @keyword)
+
+(value_definition
+  [
+    (let_operator)
+    (let_and_operator)
+  ] @keyword)
+
+[
+  "*"
+  "#"
+  "::"
+  "<-"
+] @operator
+
+; Attributes
+;-----------
+(attribute_id) @attribute
+
+; Comments
+;---------
+[
+  (comment)
+  (line_number_directive)
+  (directive)
+] @comment @spell

From 6940055133083b58ce7c634be80854fd595bc670 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:13 -0400
Subject: [PATCH 1881/2704] fix(prql): remove unused rules

---
 queries/prql/highlights.scm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm
index 6e6094a92..d24777dc0 100644
--- a/queries/prql/highlights.scm
+++ b/queries/prql/highlights.scm
@@ -69,7 +69,6 @@ alias: (identifier) @variable.member
 [
   ","
   "."
-  (pipe)
   "->"
 ] @punctuation.delimiter
 
@@ -87,15 +86,7 @@ alias: (identifier) @variable.member
   (keyword_sum)
   (keyword_stddev)
   (keyword_count)
-  (keyword_lag)
-  (keyword_lead)
-  (keyword_first)
-  (keyword_last)
   (keyword_rank)
-  (keyword_row_number)
-  (keyword_round)
-  (keyword_all)
-  (keyword_map)
 ] @function
 
 [
@@ -130,8 +121,6 @@ alias: (identifier) @variable.member
   (keyword_false)
 ] @boolean
 
-(keyword_in) @keyword.operator
-
 (function_definition
   (keyword_let)
   name: (identifier) @function)

From 37163336e23338d96a63dfda58705a444f3692f1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:19 -0400
Subject: [PATCH 1882/2704] fix(re2c): remove unused rule

---
 queries/re2c/highlights.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/re2c/highlights.scm b/queries/re2c/highlights.scm
index 4a51043bf..c89c30745 100644
--- a/queries/re2c/highlights.scm
+++ b/queries/re2c/highlights.scm
@@ -31,7 +31,6 @@
   "sentinel"
   "condprefix"
   "condenumprefix"
-  "labelprefix"
   "startlabel"
   "posix-captures"
   "max"

From 584d96b46b1d8938db9c7477dd6e4dd31c5b51e8 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:24 -0400
Subject: [PATCH 1883/2704] fix(scala): remove unused rule

---
 queries/scala/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index e53dcd06d..f85c502a4 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -157,8 +157,6 @@
 
 (character_literal) @character
 
-(symbol_literal) @string.special.symbol
-
 (interpolation
   "$" @punctuation.special)
 

From 07d4f138cb65e56bd58c9f97e578f7ad32fb68d6 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:29 -0400
Subject: [PATCH 1884/2704] fix(soql): remove unused rule

---
 queries/soql/highlights.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index c2c08c86d..e61a81141 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -43,7 +43,6 @@
   ","
   "."
   ":"
-  "?"
   "("
   ")"
 ] @punctuation.delimiter

From d912ede29005063c14abbbbf62c0d3566d605680 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:35 -0400
Subject: [PATCH 1885/2704] fix(sql): remove unused rules

---
 queries/sql/highlights.scm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 051dbc825..67eef18ae 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -152,9 +152,6 @@
   (keyword_for)
   (keyword_if)
   (keyword_exists)
-  (keyword_max)
-  (keyword_min)
-  (keyword_avg)
   (keyword_column)
   (keyword_columns)
   (keyword_cross)
@@ -200,7 +197,6 @@
   (keyword_current)
   (keyword_ties)
   (keyword_others)
-  (keyword_preserve)
   (keyword_zerofill)
   (keyword_format)
   (keyword_fields)
@@ -224,7 +220,6 @@
   (keyword_vacuum)
   (keyword_cache)
   (keyword_language)
-  (keyword_sql)
   (keyword_called)
   (keyword_conflict)
   (keyword_declare)
@@ -234,8 +229,6 @@
   (keyword_name)
   (keyword_oid)
   (keyword_oids)
-  (keyword_options)
-  (keyword_plpgsql)
   (keyword_precision)
   (keyword_regclass)
   (keyword_regnamespace)

From 6115c3664cb2375a1700beb0f0df60e3ebbefebb Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:45 -0400
Subject: [PATCH 1886/2704] fix(starlark): remove unused rules

---
 queries/starlark/highlights.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index 7d37b03b6..fe3dce89b 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -250,19 +250,14 @@
 
 [
   "async"
-  "await"
   "exec"
-  "nonlocal"
   "pass"
   "print"
   "with"
   "as"
 ] @keyword
 
-[
-  "async"
-  "await"
-] @keyword.coroutine
+"async" @keyword.coroutine
 
 "return" @keyword.return
 

From 8944dc64ef3f33c2c79de5cd133a2de4ea08d920 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:05:51 -0400
Subject: [PATCH 1887/2704] fix(tlaplus): remove unused rules

---
 queries/tlaplus/highlights.scm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/queries/tlaplus/highlights.scm b/queries/tlaplus/highlights.scm
index ed668d020..2eca927e7 100644
--- a/queries/tlaplus/highlights.scm
+++ b/queries/tlaplus/highlights.scm
@@ -13,9 +13,7 @@
   "DEF"
   "DEFINE"
   "DEFS"
-  "DOMAIN"
   "ELSE"
-  "ENABLED"
   "EXCEPT"
   "EXTENDS"
   "HAVE"
@@ -41,14 +39,11 @@
   "RECURSIVE"
   "SF_"
   "STATE"
-  "SUBSET"
   "SUFFICES"
   "TAKE"
   "TEMPORAL"
   "THEN"
   "THEOREM"
-  "UNCHANGED"
-  "UNION"
   "USE"
   "VARIABLE"
   "VARIABLES"

From ed438691dfa47a9920f5d393b2217c98619f5432 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 15 Oct 2024 12:06:00 -0400
Subject: [PATCH 1888/2704] fix(xml): remove unused rules

---
 queries/xml/highlights.scm | 149 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 148 insertions(+), 1 deletion(-)

diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index fc15343da..c6362c5c7 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -1,4 +1,151 @@
-; inherits: dtd
+; XML declaration
+(XMLDecl
+  "xml" @keyword.directive)
+
+(XMLDecl
+  [
+    "version"
+    "encoding"
+  ] @tag.attribute)
+
+(XMLDecl
+  (EncName) @string.special)
+
+(XMLDecl
+  (VersionNum) @number)
+
+; Processing instructions
+(PI) @keyword.directive
+
+; Element declaration
+(elementdecl
+  "ELEMENT" @keyword.directive.define
+  (Name) @tag)
+
+(contentspec
+  (_
+    (Name) @tag.attribute))
+
+"#PCDATA" @type.builtin
+
+[
+  "EMPTY"
+  "ANY"
+] @keyword.modifier
+
+[
+  "*"
+  "?"
+  "+"
+] @character.special
+
+; Entity declaration
+(GEDecl
+  "ENTITY" @keyword.directive.define
+  (Name) @constant)
+
+(GEDecl
+  (EntityValue) @string)
+
+(NDataDecl
+  "NDATA" @keyword
+  (Name) @label)
+
+; Parsed entity declaration
+(PEDecl
+  "ENTITY" @keyword.directive.define
+  "%" @operator
+  (Name) @function.macro)
+
+(PEDecl
+  (EntityValue) @string)
+
+; Notation declaration
+(NotationDecl
+  "NOTATION" @keyword.directive
+  (Name) @label)
+
+(NotationDecl
+  (ExternalID
+    (SystemLiteral
+      (URI) @string.special.url))
+  (#set! priority 105))
+
+; Attlist declaration
+(AttlistDecl
+  "ATTLIST" @keyword.directive.define
+  (Name) @tag)
+
+(AttDef
+  (Name) @tag.attribute)
+
+(AttDef
+  (Enumeration
+    (Nmtoken) @string))
+
+[
+  (StringType)
+  (TokenizedType)
+] @type.builtin
+
+(NotationType
+  "NOTATION" @type.builtin)
+
+[
+  "#REQUIRED"
+  "#IMPLIED"
+  "#FIXED"
+] @attribute
+
+; Entities
+(EntityRef) @constant
+
+((EntityRef) @constant.builtin
+  (#any-of? @constant.builtin "&amp;" "&lt;" "&gt;" "&quot;" "&apos;"))
+
+(CharRef) @character
+
+(PEReference) @function.macro
+
+; External references
+[
+  "PUBLIC"
+  "SYSTEM"
+] @keyword
+
+(PubidLiteral) @string.special
+
+(SystemLiteral
+  (URI) @string.special.url)
+
+; Delimiters & punctuation
+[
+  "<?"
+  "?>"
+  "<!"
+  ">"
+  "]]>"
+] @tag.delimiter
+
+[
+  "("
+  ")"
+  "["
+] @punctuation.bracket
+
+[
+  "\""
+  "'"
+] @punctuation.delimiter
+
+[
+  ","
+  "|"
+  "="
+] @operator
+
+; Misc
+(Comment) @comment @spell
 
 ; XML declaration
 (XMLDecl

From 92725df6222614307c4712eb9982e5287f21aa11 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 06:45:27 +0000
Subject: [PATCH 1889/2704] bot(lockfile): update elixir, fsharp,
 glimmer_javascript, glimmer_typescript, gren, java, php, php_only, scala, t32

---
 lockfile.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d8e71e7a1..1e5f831ba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -150,7 +150,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "827d15deada6ca2f40eece82d1bbe65df07af954"
+    "revision": "2ac7a0f81f0731d83068b2872c4a8fee39263a85"
   },
   "elm": {
     "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
@@ -198,7 +198,7 @@
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
   "fsharp": {
-    "revision": "5202637c203fcf8876affbd18b04ff43256d4c4a"
+    "revision": "971da5ff0266bfe4a6ecfb94616548032d6d1ba0"
   },
   "func": {
     "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"
@@ -240,10 +240,10 @@
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
   },
   "glimmer_javascript": {
-    "revision": "a260911201684f80cf815418b3771e6c39309f81"
+    "revision": "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3"
   },
   "glimmer_typescript": {
-    "revision": "9d018a0f93417e6951264a26093b89ee63df7315"
+    "revision": "4006128790efb58ca82a4492d8ef0983b260fc6a"
   },
   "glsl": {
     "revision": "66aec57f7119c7e8e40665b723cd7af5594f15ee"
@@ -278,12 +278,12 @@
   "gpg": {
     "revision": "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675"
   },
-  "gren": {
-    "revision": "19cd4c08ef86afb6fa7566fee9ac642e53b996d5"
-  },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
+  "gren": {
+    "revision": "c06e272341363c5d8e19ac34bc7c56258a37e71b"
+  },
   "groovy": {
     "revision": "0d8884514fe10c4fa47527d9a0284d207f38ddea"
   },
@@ -357,7 +357,7 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "3f8679368cf00ed10ec086975fa87f697b91b7bc"
+    "revision": "b864ed97b9675e86de7c15a70c12e4c1ca85fbf9"
   },
   "javascript": {
     "revision": "c4ce9dc8e7e98ea25757ea26bfe9a022043ccd77"
@@ -528,10 +528,10 @@
     "revision": "76ab9a52b9dd2a1758aae3da8286519d995037e9"
   },
   "php": {
-    "revision": "69af07eedf60bc1992c59a8fd6b5e41f25442715"
+    "revision": "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b"
   },
   "php_only": {
-    "revision": "69af07eedf60bc1992c59a8fd6b5e41f25442715"
+    "revision": "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -666,7 +666,7 @@
     "revision": "2ace7a922a755960f44d73a7bb1efffeb4cc5501"
   },
   "scala": {
-    "revision": "2cfbb6e3fcdfd51e0d477a43cc37ae8c6f87dc2e"
+    "revision": "18ee845787b040d56e9c03408deda296da23163d"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -750,7 +750,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "6182836f4128725f1e74ce986840d7317021a015"
+    "revision": "0f6a5b1e031c97ebf58d3c76eadb2c6bf1e4f780"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"

From 03452942dfbd998701d4123ccad2090e1bc7e9f1 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 06:45:31 +0000
Subject: [PATCH 1890/2704] bot(lockfile): update gitcommit, scala, superhtml,
 textproto

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1e5f831ba..ef016b500 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -228,7 +228,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "79fdc5de52d0e2c6854db924525196af22100dad"
+    "revision": "66e2585f4a3e73e768d42ef1223a5fb0a447bae6"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -666,7 +666,7 @@
     "revision": "2ace7a922a755960f44d73a7bb1efffeb4cc5501"
   },
   "scala": {
-    "revision": "18ee845787b040d56e9c03408deda296da23163d"
+    "revision": "a9af6356f8e31f04e870587bca79bc2b15808ff5"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -732,7 +732,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "36f37aa5aa440805f27d4a9f5203e616a303c6a1"
+    "revision": "3325bbb2dda260131a8db0cae1f1f557d17ebced"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -771,7 +771,7 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "textproto": {
-    "revision": "d900077aef9f5dcb0d47c86be33585013ed5db9a"
+    "revision": "568471b80fd8793d37ed01865d8c2208a9fefd1b"
   },
   "thrift": {
     "revision": "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"

From 68b2bdd99d889e9705f7e90ae64d990f3ff03cf3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 06:44:51 +0000
Subject: [PATCH 1891/2704] bot(lockfile): update wgsl_bevy

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index ef016b500..770ee94d0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -864,7 +864,7 @@
     "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
   },
   "wgsl_bevy": {
-    "revision": "0f06f24e259ac725045956436b9025dab008ff9f"
+    "revision": "47c1818d245a6156a488c4c4d06e9336714bae9b"
   },
   "wing": {
     "revision": "76e0c25844a66ebc6e866d690fcc5f4e90698947"

From a3ca2e60563064cea008555d0b7d031430305b09 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 19 Oct 2024 06:43:12 +0000
Subject: [PATCH 1892/2704] bot(lockfile): update gitcommit, regex

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 770ee94d0..d37013a75 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -228,7 +228,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "66e2585f4a3e73e768d42ef1223a5fb0a447bae6"
+    "revision": "67ab180883ba5ce3f5b0a5f4288cc6d9f9d83a5d"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -630,7 +630,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "123552e5849fae9a7c536eac84d471579c7f3328"
+    "revision": "58f4caf9db12db3b38b81c77d274aa73c9e85aca"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"

From 9a94cc23cb5499222923bf6119f6199edf84f381 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 20 Oct 2024 06:43:15 +0000
Subject: [PATCH 1893/2704] bot(lockfile): update devicetree, editorconfig,
 json, markdown, markdown_inline, svelte

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d37013a75..c11692a43 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,7 +108,7 @@
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
   },
   "devicetree": {
-    "revision": "07a647c8fb70e6b06379a60526721e3141aa2fd2"
+    "revision": "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"
   },
   "dhall": {
     "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "79bb1dc197d0eb7499843b19d3dd0f9a2ee34d3c"
+    "revision": "f5b5ac3f718523fe9d5ee926f64eb177306afdb6"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -369,7 +369,7 @@
     "revision": "b2237872e528b8372ed008068f717db66c16a725"
   },
   "json": {
-    "revision": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"
+    "revision": "f2503f1c437fe24560876557868ac94c9cfd3216"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -444,10 +444,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "b7eba93e6a3e588e259e831416ac11abdaa8616a"
+    "revision": "be81c59efc552bd875650fe078bf6b78d57330ca"
   },
   "markdown_inline": {
-    "revision": "b7eba93e6a3e588e259e831416ac11abdaa8616a"
+    "revision": "be81c59efc552bd875650fe078bf6b78d57330ca"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
@@ -738,7 +738,7 @@
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
   },
   "svelte": {
-    "revision": "774a65aea563accc35f5d45fafa4d96ec5761f57"
+    "revision": "ae5199db47757f785e43a14b332118a5474de1a2"
   },
   "swift": {
     "revision": "a6ec57ad4d12c68d952ba1f869bd373a7ac95832"

From 3ba21f96a434facb306f9fbe2f2e106859b28ba4 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 20 Oct 2024 01:10:30 -0700
Subject: [PATCH 1894/2704] feat(xresources): add parser and queries (#7260)

---
 lockfile.json                     |  3 ++
 lua/nvim-treesitter/parsers.lua   |  9 ++++
 queries/xresources/folds.scm      | 10 +++++
 queries/xresources/highlights.scm | 75 +++++++++++++++++++++++++++++++
 queries/xresources/injections.scm |  5 +++
 queries/xresources/locals.scm     | 12 +++++
 6 files changed, 114 insertions(+)
 create mode 100644 queries/xresources/folds.scm
 create mode 100644 queries/xresources/highlights.scm
 create mode 100644 queries/xresources/injections.scm
 create mode 100644 queries/xresources/locals.scm

diff --git a/lockfile.json b/lockfile.json
index c11692a43..1077dcfd6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -878,6 +878,9 @@
   "xml": {
     "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
   },
+  "xresources": {
+    "revision": "702e1e64ae14635346ffeb945d16f42d009c147a"
+  },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 48beabd9b..f6731303d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2533,6 +2533,15 @@ list.xml = {
   maintainers = { "@ObserverOfTime" },
 }
 
+list.xresources = {
+  install_info = {
+    url = "https://github.com/ValdezFOmar/tree-sitter-xresources",
+    files = { "src/parser.c" },
+  },
+  filetype = "xdefaults",
+  maintainers = { "@ValdezFOmar" },
+}
+
 list.yaml = {
   install_info = {
     url = "https://github.com/tree-sitter-grammars/tree-sitter-yaml",
diff --git a/queries/xresources/folds.scm b/queries/xresources/folds.scm
new file mode 100644
index 000000000..9cc7d5cec
--- /dev/null
+++ b/queries/xresources/folds.scm
@@ -0,0 +1,10 @@
+[
+  (elif_directive)
+  (elifdef_directive)
+  (else_directive)
+  (if_directive)
+  (ifdef_directive)
+  (preprocessor_comment)
+  (comment)+
+  (include_directive)+
+] @fold
diff --git a/queries/xresources/highlights.scm b/queries/xresources/highlights.scm
new file mode 100644
index 000000000..4bf394788
--- /dev/null
+++ b/queries/xresources/highlights.scm
@@ -0,0 +1,75 @@
+[
+  (comment)
+  (preprocessor_comment)
+] @comment @spell
+
+"#include" @keyword.import
+
+[
+  "#define"
+  "#undef"
+] @keyword.directive.define
+
+[
+  "#if"
+  "#ifdef"
+  "#ifndef"
+  "#elif"
+  "#elifdef"
+  "#elifndef"
+  "#else"
+  "#endif"
+  (directive)
+] @keyword.directive
+
+(identifier) @variable
+
+(define_directive
+  name: (identifier) @constant.macro)
+
+(define_function_directive
+  name: (identifier) @function.macro)
+
+(parameters
+  (identifier) @variable.parameter)
+
+"..." @variable.parameter.builtin
+
+(undef_directive
+  name: (identifier) @constant.macro)
+
+(ifdef_directive
+  condition: (identifier) @constant.macro)
+
+(elifdef_directive
+  condition: (identifier) @constant.macro)
+
+(expansion) @markup.raw
+
+(component) @variable.member
+
+(components
+  (component) @property .)
+
+[
+  (string)
+  (resource_value)
+] @string
+
+(escape_sequence) @string.escape
+
+[
+  "*"
+  (any_component)
+] @character.special
+
+[
+  "."
+  ","
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+] @punctuation.bracket
diff --git a/queries/xresources/injections.scm b/queries/xresources/injections.scm
new file mode 100644
index 000000000..1f12a2148
--- /dev/null
+++ b/queries/xresources/injections.scm
@@ -0,0 +1,5 @@
+([
+  (comment)
+  (preprocessor_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/xresources/locals.scm b/queries/xresources/locals.scm
new file mode 100644
index 000000000..a7f932418
--- /dev/null
+++ b/queries/xresources/locals.scm
@@ -0,0 +1,12 @@
+(define_directive
+  name: (identifier) @local.definition.macro)
+
+(define_function_directive
+  name: (identifier) @local.definition.macro)
+
+(parameters
+  (identifier) @local.definition.parameter)
+
+(identifier) @local.reference
+
+(resources) @local.scope

From d53df0c987d2f731001f73d176090efb73d8f60f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 20 Oct 2024 08:10:48 +0000
Subject: [PATCH 1895/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a85448e9a..1205209cd 100644
--- a/README.md
+++ b/README.md
@@ -466,6 +466,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [wit](https://github.com/liamwh/tree-sitter-wit) (maintained by @liamwh)
 - [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
 - [x] [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
+- [x] [xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) (maintained by @ValdezFOmar)
 - [x] [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) (maintained by @amaanq)
 - [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
 - [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)

From 18cf02f5efe677d992fe7f96f395ef40a2f329d2 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 20 Oct 2024 10:53:45 -0700
Subject: [PATCH 1896/2704] feat(c): use `@constant.macro` for macro
 identifiers (#7266)

---
 queries/c/highlights.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index eba272d5c..bd6857fd1 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -252,13 +252,22 @@
 
 ; Preproc def / undef
 (preproc_def
-  name: (_) @constant)
+  name: (_) @constant.macro)
 
 (preproc_call
   directive: (preproc_directive) @_u
-  argument: (_) @constant
+  argument: (_) @constant.macro
   (#eq? @_u "#undef"))
 
+(preproc_ifdef
+  name: (identifier) @constant.macro)
+
+(preproc_elifdef
+  name: (identifier) @constant.macro)
+
+(preproc_defined
+  (identifier) @constant.macro)
+
 (call_expression
   function: (identifier) @function.call)
 

From df20c049694474021cffb2cc8687c809adc1cbba Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 06:46:46 +0000
Subject: [PATCH 1897/2704] bot(lockfile): update swift, tlaplus, vimdoc,
 xresources

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1077dcfd6..89dee9353 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -741,7 +741,7 @@
     "revision": "ae5199db47757f785e43a14b332118a5474de1a2"
   },
   "swift": {
-    "revision": "a6ec57ad4d12c68d952ba1f869bd373a7ac95832"
+    "revision": "d351cb321c28f0a3e66242ef2f61b1f890ec4b44"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -780,7 +780,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "da9cf9793686e236327aadfbad449414c895bf84"
+    "revision": "8a8413f1d08e7ee40b347206d26eac4324db9fd9"
   },
   "tmux": {
     "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"
@@ -852,7 +852,7 @@
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"
   },
   "vimdoc": {
-    "revision": "2249c44ecd3f5cf22da3dcccfb74f816ddb29245"
+    "revision": "59c539286e7487b267bc7808b16833f9e3ad6793"
   },
   "vrl": {
     "revision": "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba"
@@ -879,7 +879,7 @@
     "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
   },
   "xresources": {
-    "revision": "702e1e64ae14635346ffeb945d16f42d009c147a"
+    "revision": "630af80f563ede09a652a808277950c36306e3a3"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 22 Oct 2024 08:34:05 +0300
Subject: [PATCH 1898/2704] fix(xml,dtd): adapt to parser changes

---
 lockfile.json              |  4 +-
 queries/dtd/highlights.scm | 17 +++----
 queries/xml/highlights.scm | 92 ++++++++++++++++----------------------
 3 files changed, 47 insertions(+), 66 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 89dee9353..07d77054e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -132,7 +132,7 @@
     "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
-    "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
+    "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "earthfile": {
     "revision": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce"
@@ -876,7 +876,7 @@
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
-    "revision": "809266ed1694d64dedc168a18893cc254e3edf7e"
+    "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "xresources": {
     "revision": "630af80f563ede09a652a808277950c36306e3a3"
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index e573ca387..9afd6e38b 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -1,17 +1,17 @@
-; XML declaration
-(XMLDecl
+; Text declaration
+(TextDecl
   "xml" @keyword.directive)
 
-(XMLDecl
+(TextDecl
   [
     "version"
     "encoding"
   ] @tag.attribute)
 
-(XMLDecl
+(TextDecl
   (EncName) @string.special)
 
-(XMLDecl
+(TextDecl
   (VersionNum) @number)
 
 ; Processing instructions
@@ -65,12 +65,6 @@
   "NOTATION" @keyword.directive
   (Name) @label)
 
-(NotationDecl
-  (ExternalID
-    (SystemLiteral
-      (URI) @string.special.url))
-  (#set! priority 105))
-
 ; Attlist declaration
 (AttlistDecl
   "ATTLIST" @keyword.directive.define
@@ -124,6 +118,7 @@
   "?>"
   "<!"
   ">"
+  "<!["
   "]]>"
 ] @tag.delimiter
 
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index c6362c5c7..85e6e9bb4 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -6,6 +6,7 @@
   [
     "version"
     "encoding"
+    "standalone"
   ] @tag.attribute)
 
 (XMLDecl
@@ -14,6 +15,12 @@
 (XMLDecl
   (VersionNum) @number)
 
+(XMLDecl
+  [
+    "yes"
+    "no"
+  ] @boolean)
+
 ; Processing instructions
 (PI) @keyword.directive
 
@@ -65,12 +72,6 @@
   "NOTATION" @keyword.directive
   (Name) @label)
 
-(NotationDecl
-  (ExternalID
-    (SystemLiteral
-      (URI) @string.special.url))
-  (#set! priority 105))
-
 ; Attlist declaration
 (AttlistDecl
   "ATTLIST" @keyword.directive.define
@@ -118,45 +119,6 @@
 (SystemLiteral
   (URI) @string.special.url)
 
-; Delimiters & punctuation
-[
-  "<?"
-  "?>"
-  "<!"
-  ">"
-  "]]>"
-] @tag.delimiter
-
-[
-  "("
-  ")"
-  "["
-] @punctuation.bracket
-
-[
-  "\""
-  "'"
-] @punctuation.delimiter
-
-[
-  ","
-  "|"
-  "="
-] @operator
-
-; Misc
-(Comment) @comment @spell
-
-; XML declaration
-(XMLDecl
-  "standalone" @tag.attribute)
-
-(XMLDecl
-  [
-    "yes"
-    "no"
-  ] @boolean)
-
 ; Processing instructions
 (XmlModelPI
   "xml-model" @keyword.directive)
@@ -194,6 +156,36 @@
 (Attribute
   (AttValue) @string)
 
+; Delimiters & punctuation
+[
+  "<?"
+  "?>"
+  "<"
+  ">"
+  "</"
+  "/>"
+  "<!"
+  "]]>"
+] @tag.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  "\""
+  "'"
+] @punctuation.delimiter
+
+[
+  ","
+  "|"
+  "="
+] @operator
+
 ; Text
 (CharData) @none @spell
 
@@ -203,11 +195,5 @@
   "]]>" @module)
   (#set! priority 105))
 
-; Delimiters & punctuation
-[
-  "<"
-  "</"
-  "/>"
-] @tag.delimiter
-
-"]" @punctuation.bracket
+; Misc
+(Comment) @comment @spell

From bab7b0f20bd3e805b77231a77f516c7d69382693 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 06:58:43 +0000
Subject: [PATCH 1899/2704] bot(lockfile): update erlang, gitcommit, lua,
 markdown, markdown_inline

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 07d77054e..7ae93c1f1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -165,7 +165,7 @@
     "revision": "7e319b065c5864bac2fb68f7e14a338b919e8bb3"
   },
   "erlang": {
-    "revision": "f1919a34af3a9c79402c4a3d6c52986e9c2ea949"
+    "revision": "b4ddbbd277532b2df50d4c87242d650789a5e124"
   },
   "facility": {
     "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
@@ -228,7 +228,7 @@
     "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
   },
   "gitcommit": {
-    "revision": "67ab180883ba5ce3f5b0a5f4288cc6d9f9d83a5d"
+    "revision": "db0e0c4fb9095fdc42a7af34019c0616c071e9eb"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -426,7 +426,7 @@
     "revision": "c14cb839003348692158b845db9edda201374548"
   },
   "lua": {
-    "revision": "99fc677e6971c425e8d407f59c77ab897e585c92"
+    "revision": "34e60e7f45fc313463c68090d88d742a55d1bd7a"
   },
   "luadoc": {
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
@@ -444,10 +444,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "be81c59efc552bd875650fe078bf6b78d57330ca"
+    "revision": "5cdc549ab8f461aff876c5be9741027189299cec"
   },
   "markdown_inline": {
-    "revision": "be81c59efc552bd875650fe078bf6b78d57330ca"
+    "revision": "5cdc549ab8f461aff876c5be9741027189299cec"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"

From cfc6f2c117aaaa82f19bcce44deec2c194d900ab Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 06:44:33 +0000
Subject: [PATCH 1900/2704] bot(lockfile): update editorconfig, erlang, sql

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7ae93c1f1..627e8e6bf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "f5b5ac3f718523fe9d5ee926f64eb177306afdb6"
+    "revision": "777f774d6381f1bb84adffa02a4e476fb61486ae"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -165,7 +165,7 @@
     "revision": "7e319b065c5864bac2fb68f7e14a338b919e8bb3"
   },
   "erlang": {
-    "revision": "b4ddbbd277532b2df50d4c87242d650789a5e124"
+    "revision": "4095e9993acc89cb311ab1be8614c21b1cf768a4"
   },
   "facility": {
     "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
@@ -711,7 +711,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "a8b10c76759a372d0f92bb070b4f5c993e0ce5f9"
+    "revision": "f551a8fa69dc9aea479b93fae34c3ea7be15f931"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"

From 9210b9a4fa106247333495e19c843710f4d62102 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 22 Oct 2024 19:26:04 +0200
Subject: [PATCH 1901/2704] fix(predicates): remove upstreamed predicates and
 directives

Problem: Overriding upstreamed predicates replaces optimized versions on
Nvim 0.11.

Solution: Now that nvim-treesitter requires Nvim 0.10, simply remove the
upstreamed predicates and directives.
---
 lua/nvim-treesitter/query_predicates.lua | 74 ------------------------
 1 file changed, 74 deletions(-)

diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
index 5caaaa8b8..7539170dc 100644
--- a/lua/nvim-treesitter/query_predicates.lua
+++ b/lua/nvim-treesitter/query_predicates.lua
@@ -62,42 +62,6 @@ query.add_predicate("nth?", function(match, _pattern, _bufnr, pred)
   return false
 end, opts)
 
----@param match (TSNode|nil)[]
----@param _pattern string
----@param _bufnr integer
----@param pred string[]
----@return boolean|nil
-local function has_ancestor(match, _pattern, _bufnr, pred)
-  if not valid_args(pred[1], pred, 2) then
-    return
-  end
-
-  local node = match[pred[2]]
-  local ancestor_types = { unpack(pred, 3) }
-  if not node then
-    return true
-  end
-
-  local just_direct_parent = pred[1]:find("has-parent", 1, true)
-
-  node = node:parent()
-  while node do
-    if vim.tbl_contains(ancestor_types, node:type()) then
-      return true
-    end
-    if just_direct_parent then
-      node = nil
-    else
-      node = node:parent()
-    end
-  end
-  return false
-end
-
-query.add_predicate("has-ancestor?", has_ancestor, opts)
-
-query.add_predicate("has-parent?", has_ancestor, opts)
-
 ---@param match (TSNode|nil)[]
 ---@param _pattern string
 ---@param bufnr integer
@@ -201,41 +165,3 @@ query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
   end
   metadata[id].text = string.lower(text)
 end, opts)
-
--- Trim blank lines from end of the region
--- Arguments are the captures to trim.
----@param match (TSNode|nil)[]
----@param _ string
----@param bufnr integer
----@param pred string[]
----@param metadata table
-query.add_directive("trim!", function(match, _, bufnr, pred, metadata)
-  for _, id in ipairs { select(2, unpack(pred)) } do
-    local node = match[id]
-    local start_row, start_col, end_row, end_col = node:range()
-
-    -- Don't trim if region ends in middle of a line
-    if end_col ~= 0 then
-      return
-    end
-
-    while true do
-      -- As we only care when end_col == 0, always inspect one line above end_row.
-      local end_line = vim.api.nvim_buf_get_lines(bufnr, end_row - 1, end_row, true)[1]
-
-      if end_line ~= "" then
-        break
-      end
-
-      end_row = end_row - 1
-    end
-
-    -- If this produces an invalid range, we just skip it.
-    if start_row < end_row or (start_row == end_row and start_col <= end_col) then
-      if not metadata[id] then
-        metadata[id] = {}
-      end
-      metadata[id].range = { start_row, start_col, end_row, end_col }
-    end
-  end
-end, opts)

From 649f6a1636d352b68527ace70973eda6da50fa6b Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 23 Oct 2024 22:16:55 -0700
Subject: [PATCH 1902/2704] fix(rust): separate import folds from others
 (#7279)

---
 queries/rust/folds.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index 542904192..9237b6f7b 100644
--- a/queries/rust/folds.scm
+++ b/queries/rust/folds.scm
@@ -9,7 +9,6 @@
   (type_item)
   (union_item)
   (const_item)
-  (use_declaration)+
   (let_declaration)
   (loop_expression)
   (for_expression)
@@ -22,4 +21,5 @@
   (macro_invocation)
   (attribute_item)
   (block)
+  (use_declaration)+
 ] @fold

From 377039daa260b71f304c881d1b21d643c501a261 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 06:44:56 +0000
Subject: [PATCH 1903/2704] bot(lockfile): update elixir, fortran, koto, vimdoc

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 627e8e6bf..46357c77a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -150,7 +150,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "2ac7a0f81f0731d83068b2872c4a8fee39263a85"
+    "revision": "53458546e3bb717beee1d15df30724c81eb41d1c"
   },
   "elm": {
     "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
@@ -192,7 +192,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "4a593dda9cbc050a6686187249f8350ceea292ce"
+    "revision": "cb4cb11ca2dced205fb54005684a44e2ceb813c1"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -396,7 +396,7 @@
     "revision": "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"
   },
   "koto": {
-    "revision": "cbf637e5163065934c827d254b293f4d2f08f523"
+    "revision": "adf8fabfffc13a51a105be38c9776744291c9eeb"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -852,7 +852,7 @@
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"
   },
   "vimdoc": {
-    "revision": "59c539286e7487b267bc7808b16833f9e3ad6793"
+    "revision": "d2e4b5c172a109966c2ce0378f73df6cede39400"
   },
   "vrl": {
     "revision": "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba"

From d740b0ad9244265358ea28211a84e6093025adee Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 25 Oct 2024 08:48:16 +0200
Subject: [PATCH 1904/2704] docs(readme): mark Nvim 0.10 as required

---
 README.md                      | 2 +-
 lua/nvim-treesitter/health.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1205209cd..bae5c5356 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ For more detailed information on setting these up, see ["Advanced setup"](#advan
 
 ## Requirements
 
-- **Neovim 0.9.2** or later  ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
+- **Neovim 0.10** or later  ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
 - `tar` and `curl` in your path (or alternatively `git`)
 - A C compiler in your path and libstdc++ installed ([Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support)).
 
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index be265f7d0..32741b136 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -23,8 +23,8 @@ local NVIM_TREESITTER_MINIMUM_ABI = 13
 local function install_health()
   _start "Installation"
 
-  if fn.has "nvim-0.9.2" ~= 1 then
-    _error "Nvim-treesitter requires Nvim 0.9.2 or newer"
+  if fn.has "nvim-0.10" ~= 1 then
+    _error "Nvim-treesitter requires Nvim 0.10 or newer"
   end
 
   if fn.executable "tree-sitter" == 0 then

From f6c5a58e3bbbedd2a31d04e5aa6f9997df20e3df Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 06:44:40 +0000
Subject: [PATCH 1905/2704] bot(lockfile): update koto, t32

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 46357c77a..81fa620af 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -396,7 +396,7 @@
     "revision": "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"
   },
   "koto": {
-    "revision": "adf8fabfffc13a51a105be38c9776744291c9eeb"
+    "revision": "9e5ab09710b9f035efdcef1eecaadbf261af7ec3"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -750,7 +750,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "0f6a5b1e031c97ebf58d3c76eadb2c6bf1e4f780"
+    "revision": "e455373021812abf4a0b5170caa0d882a9578bab"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"

From 48fc5d1dfe3dded8028826dfee7526e26212c73b Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Thu, 24 Oct 2024 02:30:32 -0700
Subject: [PATCH 1906/2704] feat(bash): highlight special shell variables

---
 queries/bash/highlights.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 0e192bbcd..ef806eeab 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -225,6 +225,25 @@
 ((variable_name) @constant
   (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
 
+((variable_name) @variable.builtin
+  (#any-of? @variable.builtin
+    ; https://www.gnu.org/software/bash/manual/html_node/Bourne-Shell-Variables.html
+    "CDPATH" "HOME" "IFS" "MAIL" "MAILPATH" "OPTARG" "OPTIND" "PATH" "PS1" "PS2"
+    ; https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html
+    "_" "BASH" "BASHOPTS" "BASHPID" "BASH_ALIASES" "BASH_ARGC" "BASH_ARGV" "BASH_ARGV0" "BASH_CMDS"
+    "BASH_COMMAND" "BASH_COMPAT" "BASH_ENV" "BASH_EXECUTION_STRING" "BASH_LINENO"
+    "BASH_LOADABLES_PATH" "BASH_REMATCH" "BASH_SOURCE" "BASH_SUBSHELL" "BASH_VERSINFO"
+    "BASH_VERSION" "BASH_XTRACEFD" "CHILD_MAX" "COLUMNS" "COMP_CWORD" "COMP_LINE" "COMP_POINT"
+    "COMP_TYPE" "COMP_KEY" "COMP_WORDBREAKS" "COMP_WORDS" "COMPREPLY" "COPROC" "DIRSTACK" "EMACS"
+    "ENV" "EPOCHREALTIME" "EPOCHSECONDS" "EUID" "EXECIGNORE" "FCEDIT" "FIGNORE" "FUNCNAME"
+    "FUNCNEST" "GLOBIGNORE" "GROUPS" "histchars" "HISTCMD" "HISTCONTROL" "HISTFILE" "HISTFILESIZE"
+    "HISTIGNORE" "HISTSIZE" "HISTTIMEFORMAT" "HOSTFILE" "HOSTNAME" "HOSTTYPE" "IGNOREEOF" "INPUTRC"
+    "INSIDE_EMACS" "LANG" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_NUMERIC" "LC_TIME"
+    "LINENO" "LINES" "MACHTYPE" "MAILCHECK" "MAPFILE" "OLDPWD" "OPTERR" "OSTYPE" "PIPESTATUS"
+    "POSIXLY_CORRECT" "PPID" "PROMPT_COMMAND" "PROMPT_DIRTRIM" "PS0" "PS3" "PS4" "PWD" "RANDOM"
+    "READLINE_ARGUMENT" "READLINE_LINE" "READLINE_MARK" "READLINE_POINT" "REPLY" "SECONDS" "SHELL"
+    "SHELLOPTS" "SHLVL" "SRANDOM" "TIMEFORMAT" "TMOUT" "TMPDIR" "UID"))
+
 (case_item
   value: (word) @variable.parameter)
 

From 1d7c55f0bd1f532af8522bb999515c6e8c01c30a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 26 Oct 2024 06:43:19 +0000
Subject: [PATCH 1907/2704] bot(lockfile): update superhtml

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 81fa620af..b09de6b4a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -732,7 +732,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "3325bbb2dda260131a8db0cae1f1f557d17ebced"
+    "revision": "e561df3b5ce94e598a4c3d0ee4abd9635bad63b3"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From 0a9108a7e4df6e5a42469bd2eb3ad049cc426679 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 26 Oct 2024 01:06:22 -0700
Subject: [PATCH 1908/2704] feat(desktop): desktop parser and queries (#7282)

---
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++
 queries/desktop/folds.scm       |  1 +
 queries/desktop/highlights.scm  | 94 +++++++++++++++++++++++++++++++++
 queries/desktop/injections.scm  |  8 +++
 5 files changed, 114 insertions(+)
 create mode 100644 queries/desktop/folds.scm
 create mode 100644 queries/desktop/highlights.scm
 create mode 100644 queries/desktop/injections.scm

diff --git a/lockfile.json b/lockfile.json
index b09de6b4a..cedb9df95 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -107,6 +107,9 @@
   "dart": {
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
   },
+  "desktop": {
+    "revision": "0d8b8cf7c9311fe3f1730df8e193d836f6dd9d1b"
+  },
   "devicetree": {
     "revision": "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f6731303d..fd79f8af7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -365,6 +365,14 @@ list.dart = {
   maintainers = { "@akinsho" },
 }
 
+list.desktop = {
+  install_info = {
+    url = "https://github.com/ValdezFOmar/tree-sitter-desktop",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ValdezFOmar" },
+}
+
 list.devicetree = {
   install_info = {
     url = "https://github.com/joelspadin/tree-sitter-devicetree",
diff --git a/queries/desktop/folds.scm b/queries/desktop/folds.scm
new file mode 100644
index 000000000..624ca8a86
--- /dev/null
+++ b/queries/desktop/folds.scm
@@ -0,0 +1 @@
+(group) @fold
diff --git a/queries/desktop/highlights.scm b/queries/desktop/highlights.scm
new file mode 100644
index 000000000..7a5ebf241
--- /dev/null
+++ b/queries/desktop/highlights.scm
@@ -0,0 +1,94 @@
+(comment) @comment @spell
+
+(group_name) @markup.heading
+
+(entry
+  key: (identifier) @property)
+
+(localized_key
+  name: (identifier) @property)
+
+[
+  (language)
+  (country)
+  (encoding)
+  (modifier)
+] @string.special
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+(field_code) @character.special
+
+[
+  (true)
+  (false)
+] @boolean
+
+"=" @operator
+
+[
+  ";"
+  "_"
+  "."
+  "@"
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+] @punctuation.bracket
+
+; Especial entries
+((entry
+  key: (identifier) @_key
+  value: (string) @type)
+  (#eq? @_key "Type")
+  (#any-of? @type "Application" "Link" "Directory"))
+
+((entry
+  key: (identifier) @_key
+  value: (string) @number)
+  (#eq? @_key "Version"))
+
+((entry
+  key: (identifier) @_key
+  value: (string) @string.special.path)
+  (#any-of? @_key "TryExec" "Path"))
+
+((entry
+  key: (identifier) @_key
+  value: (string) @string.special.url)
+  (#eq? @_key "URL"))
+
+; https://specifications.freedesktop.org/menu-spec/latest/category-registry.html
+((entry
+  key: (identifier) @_key
+  value: (list
+    (string) @constant.builtin))
+  (#eq? @_key "Categories")
+  (#any-of? @constant.builtin
+    ; Main categories
+    "AudioVideo" "Audio" "Video" "Development" "Education" "Game" "Graphics" "Network" "Office"
+    "Science" "Settings" "System" "Utility"
+    ; Additional Categories
+    "Building" "Debugger" "IDE" "GUIDesigner" "Profiling" "RevisionControl" "Translation" "Calendar"
+    "ContactManagement" "Database" "Dictionary" "Chart" "Email" "Finance" "FlowChart" "PDA"
+    "ProjectManagement" "Presentation" "Spreadsheet" "WordProcessor" "2DGraphics" "VectorGraphics"
+    "RasterGraphics" "3DGraphics" "Scanning" "OCR" "Photography" "Publishing" "Viewer" "TextTools"
+    "DesktopSettings" "HardwareSettings" "Printing" "PackageManager" "Dialup" "InstantMessaging"
+    "Chat" "IRCClient" "Feed" "FileTransfer" "HamRadio" "News" "P2P" "RemoteAccess" "Telephony"
+    "TelephonyTools" "VideoConference" "WebBrowser" "WebDevelopment" "Midi" "Mixer" "Sequencer"
+    "Tuner" "TV" "AudioVideoEditing" "Player" "Recorder" "DiscBurning" "ActionGame" "AdventureGame"
+    "ArcadeGame" "BoardGame" "BlocksGame" "CardGame" "KidsGame" "LogicGame" "RolePlaying" "Shooter"
+    "Simulation" "SportsGame" "StrategyGame" "Art" "Construction" "Music" "Languages"
+    "ArtificialIntelligence" "Astronomy" "Biology" "Chemistry" "ComputerScience" "DataVisualization"
+    "Economy" "Electricity" "Geography" "Geology" "Geoscience" "History" "Humanities"
+    "ImageProcessing" "Literature" "Maps" "Math" "NumericalAnalysis" "MedicalSoftware" "Physics"
+    "Robotics" "Spirituality" "Sports" "ParallelComputing" "Amusement" "Archiving" "Compression"
+    "Electronics" "Emulator" "Engineering" "FileTools" "FileManager" "TerminalEmulator" "Filesystem"
+    "Monitor" "Security" "Accessibility" "Calculator" "Clock" "TextEditor" "Documentation" "Adult"
+    "Core" "KDE" "COSMIC" "GNOME" "XFCE" "DDE" "GTK" "Qt" "Motif" "Java" "ConsoleOnly"
+    ; Reserved
+    "Screensaver" "TrayIcon" "Applet" "Shell"))
diff --git a/queries/desktop/injections.scm b/queries/desktop/injections.scm
new file mode 100644
index 000000000..1666a0430
--- /dev/null
+++ b/queries/desktop/injections.scm
@@ -0,0 +1,8 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((entry
+  key: (identifier) @_exec
+  value: (string) @injection.content)
+  (#eq? @_exec "Exec")
+  (#set! injection.language "bash"))

From 674100c1fc31d660e2bfb41c19313a72c32ca008 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 25 Oct 2024 13:34:22 -0700
Subject: [PATCH 1909/2704] fix(formatter): simplify code, remove odd line
 break

---
 queries/gdscript/highlights.scm   |  3 +-
 queries/helm/highlights.scm       |  3 +-
 queries/ispc/highlights.scm       |  3 +-
 queries/nix/highlights.scm        |  3 +-
 queries/powershell/highlights.scm |  3 +-
 scripts/format-queries.lua        | 74 +++++++++++--------------------
 6 files changed, 31 insertions(+), 58 deletions(-)

diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index bc62bc2f5..b7670f73b 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -302,8 +302,7 @@
     "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
     ; from modules/gdscript/doc_classes/@GDScript.xml
     "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict" "is_instance_of"
-    "len" "load" "preload" "print_debug" "print_stack" "range" "type_exists")
-  )
+    "len" "load" "preload" "print_debug" "print_stack" "range" "type_exists"))
 
 ; Builtin Constants
 ((identifier) @constant.builtin
diff --git a/queries/helm/highlights.scm b/queries/helm/highlights.scm
index f9af8a596..e9d221bee 100644
--- a/queries/helm/highlights.scm
+++ b/queries/helm/highlights.scm
@@ -29,8 +29,7 @@
     "mod" "mul" "max" "min" "len" "addf" "add1f" "subf" "divf" "mulf" "maxf" "minf" "floor" "ceil"
     "round" "getHostByName" "base" "dir" "clean" "ext" "isAbs" "kindOf" "kindIs" "typeOf" "typeIs"
     "typeIsLike" "deepequal" "semver" "semverCompare" "urlParse" "urlJoin" "urlquery" "lookup"
-    "include")
-  )
+    "include"))
 
 ; {{ .Values.test }}
 (selector_expression
diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm
index 14e614260..fd9c7262e 100644
--- a/queries/ispc/highlights.scm
+++ b/queries/ispc/highlights.scm
@@ -107,5 +107,4 @@
     "reduce_max" "reduce_min" "rotate" "round" "rsqrt" "rsqrt_fast" "saturating_add"
     "saturating_div" "saturating_mul" "saturating_sub" "seed_rng" "select" "shift" "shuffle"
     "signbits" "sign_extend" "sin" "sincos" "soa_to_aos2" "soa_to_aos3" "soa_to_aos4" "sqrt"
-    "streaming_load" "streaming_load_uniform" "streaming_store" "tan" "trunc")
-  )
+    "streaming_load" "streaming_load_uniform" "streaming_store" "tan" "trunc"))
diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 0a0d9ac6f..7cdcc3e1d 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -129,8 +129,7 @@
     "__currentSystem" "__hashFile" "__path" "__unsafeDiscardOutputDependency" "__currentTime"
     "__hashString" "__pathExists" "__unsafeDiscardStringContext" "__deepSeq" "__head" "__readDir"
     "__unsafeGetAttrPos" "__div" "__intersectAttrs" "__readFile" "__zipAttrsWith" "__elem"
-    "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort")
-  )
+    "__isAttrs" "__replaceStrings" "__elemAt" "__isBool" "__seq" "__fetchurl" "__isFloat" "__sort"))
 
 ; constants
 (variable_expression
diff --git a/queries/powershell/highlights.scm b/queries/powershell/highlights.scm
index 3885ba833..6081e8f1b 100644
--- a/queries/powershell/highlights.scm
+++ b/queries/powershell/highlights.scm
@@ -239,8 +239,7 @@
     "System.Management.Automation.PSScriptCmdlet" "Management.Automation.ErrorRecord"
     "System.Management.Automation.ErrorRecord" "Management.Automation.PSCredential"
     "System.Management.Automation.PSCredential" "Management.Automation.PSMethod"
-    "System.Management.Automation.PSMethod")
-  )
+    "System.Management.Automation.PSMethod"))
 
 ; Function definitions
 ;---------------------
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 9deccdc07..3e264e78b 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -36,6 +36,7 @@ end)
 
 --- Control the indent here. Change to \t if uses tab instead
 local indent_str = "  "
+local indent_width_plus_one = 3
 local textwidth = 100
 
 -- Query to control the formatter
@@ -201,9 +202,6 @@ local format_queries = [[
 ;; All captures should be separated with a space
 (capture) @format.prepend-space
 
-;; Workaround to just use the string's content
-(anonymous_node (string) @format.keep)
-
 ; ( (_) ) handler
 (grouping
   "("
@@ -283,8 +281,6 @@ local format_queries = [[
     . (_) @format.prepend-space)
   (#set! lookahead-newline)
   (#set! conditional-newline))
-;; Workaround to keep the string's content
-(string) @format.keep
 
 ;; Comment related handlers
 (comment) @format.append-newline
@@ -325,25 +321,21 @@ end
 ---@param bufnr integer
 ---@param node TSNode
 ---@param lines string[]
----@param q table<string, TSMetadata>
+---@param q table<string, vim.treesitter.query.TSMetadata>
 ---@param level integer
 local function iter(bufnr, node, lines, q, level)
   --- Sometimes 2 queries apply append twice. This is to prevent the case from happening
   local apply_newline = false
   for child, _ in node:iter_children() do
     local id = child:id()
-    repeat
-      if apply_newline then
-        apply_newline = false
-        lines[#lines + 1] = string.rep(indent_str, level)
-      end
-      if q["format.ignore"][id] then
-        local text = vim.split(get_node_text(child, bufnr):gsub("\r\n?", "\n"), "\n", { trimempty = true })
-        append_lines(lines, text)
-        break
-      elseif q["format.remove"][id] then
-        break
-      end
+    if apply_newline then
+      apply_newline = false
+      lines[#lines + 1] = string.rep(indent_str, level)
+    end
+    if q["format.ignore"][id] then
+      local text = vim.split(get_node_text(child, bufnr):gsub("\r\n?", "\n"), "\n", { trimempty = true })
+      append_lines(lines, text)
+    elseif not q["format.remove"][id] then
       if not q["format.cancel-prepend"][id] then
         if q["format.prepend-newline"][id] then
           lines[#lines + 1] = string.rep(indent_str, level)
@@ -359,7 +351,7 @@ local function iter(bufnr, node, lines, q, level)
             local _, _, byte_end = node:end_()
             if
               q["format.prepend-space"][id]["lookahead-newline"]
-              and textwidth - (byte_end - byte_start) - #lines[#lines] < 0
+              and (byte_end - byte_start) + #lines[#lines] > textwidth
             then
               lines[#lines + 1] = string.rep(indent_str, level)
             else
@@ -370,7 +362,11 @@ local function iter(bufnr, node, lines, q, level)
       end
       if q["format.replace"][id] then
         append_lines(lines, vim.split(q["format.replace"][id].text, "\n", { trimempty = true }))
-      elseif child:named_child_count() == 0 or q["format.keep"][id] then
+      elseif
+        child:named_child_count() == 0
+        -- Workaround to preserve string content
+        or child:type() == "string"
+      then
         append_lines(
           lines,
           vim.split(string.gsub(get_node_text(child, bufnr), "\r\n?", "\n"), "\n+", { trimempty = true })
@@ -381,33 +377,17 @@ local function iter(bufnr, node, lines, q, level)
       if q["format.indent.begin"][id] then
         level = level + 1
         apply_newline = true
-        break
+      elseif q["format.indent.dedent"][id] then
+        lines[#lines] = string.sub(lines[#lines], indent_width_plus_one)
       end
-      if q["format.indent.dedent"][id] then
-        if string.match(lines[#lines], "^%s*" .. get_node_text(child, bufnr)) then
-          lines[#lines] = string.sub(lines[#lines], 1 + #string.rep(indent_str, 1))
-        end
-      end
-      if q["format.indent.end"][id] then
-        level = math.max(level - 1, 0)
-        if string.match(lines[#lines], "^%s*" .. get_node_text(child, bufnr)) then
-          lines[#lines] = string.sub(lines[#lines], 1 + #string.rep(indent_str, 1))
-        end
-        break
-      end
-    until true
-    repeat
-      if q["format.cancel-append"][id] then
-        apply_newline = false
-      end
-      if not q["format.cancel-append"][id] then
-        if q["format.append-newline"][id] then
-          apply_newline = true
-        elseif q["format.append-space"][id] then
-          lines[#lines] = lines[#lines] .. " "
-        end
-      end
-    until true
+    end
+    if q["format.cancel-append"][id] then
+      apply_newline = false
+    elseif q["format.append-newline"][id] then
+      apply_newline = true
+    elseif q["format.append-space"][id] then
+      lines[#lines] = lines[#lines] .. " "
+    end
   end
 end
 
@@ -419,7 +399,6 @@ local function format(bufnr, queries)
   local map = {
     ['format.ignore'] = {},           -- Ignore the node and its children
     ['format.indent.begin'] = {},     -- +1 shiftwidth for all nodes after this
-    ['format.indent.end'] = {},       -- -1 shiftwidth for all nodes after this
     ['format.indent.dedent'] = {},    -- -1 shiftwidth for this line only
     ['format.prepend-space'] = {},    -- Prepend a space before inserting the node
     ['format.prepend-newline'] = {},  -- Prepend a \n before inserting the node
@@ -427,7 +406,6 @@ local function format(bufnr, queries)
     ['format.append-newline'] = {},   -- Append a newline after inserting the node
     ['format.cancel-append'] = {},    -- Cancel any `@format.append-*` applied to the node
     ['format.cancel-prepend'] = {},   -- Cancel any `@format.prepend-*` applied to the node
-    ['format.keep'] = {},             -- String content is not exposed as a syntax node. This is a workaround for it
     ['format.replace'] = {},          -- Dedicated capture used to store results of `(#gsub!)`
     ['format.remove'] = {},           -- Do not add the syntax node to the result, i.e. brackets [], parens ()
   }

From 46a6587a23eb842411e27f325280e8d7f71bd00a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 26 Oct 2024 08:07:45 +0000
Subject: [PATCH 1910/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bae5c5356..e1a7b6325 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [cue](https://github.com/eonpatapon/tree-sitter-cue) (maintained by @amaanq)
 - [x] [d](https://github.com/gdamore/tree-sitter-d) (maintained by @amaanq)
 - [x] [dart](https://github.com/UserNobody14/tree-sitter-dart) (maintained by @akinsho)
+- [x] [desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) (maintained by @ValdezFOmar)
 - [x] [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) (maintained by @jedrzejboczar)
 - [x] [dhall](https://github.com/jbellerb/tree-sitter-dhall) (maintained by @amaanq)
 - [x] [diff](https://github.com/the-mikedavis/tree-sitter-diff) (maintained by @gbprod)

From a8b7da35e59f29de5824df664aeba165d580676b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 27 Oct 2024 06:42:48 +0000
Subject: [PATCH 1911/2704] bot(lockfile): update javascript, mlir, templ,
 tlaplus

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cedb9df95..35f3b9e17 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -363,7 +363,7 @@
     "revision": "b864ed97b9675e86de7c15a70c12e4c1ca85fbf9"
   },
   "javascript": {
-    "revision": "c4ce9dc8e7e98ea25757ea26bfe9a022043ccd77"
+    "revision": "a2ef0796e8b9db9107c9ad210b3121b8ad918d5e"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -465,7 +465,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc"
+    "revision": "8cde51ac0484fdf59a90641fefb92a0e846dcc7c"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -768,7 +768,7 @@
     "revision": "485fbdc00d811b01b2090dff4d0469fd1d0350f5"
   },
   "templ": {
-    "revision": "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88"
+    "revision": "1dcd7db19c047bc0327907a544df3207ba814ea4"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -783,7 +783,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "8a8413f1d08e7ee40b347206d26eac4324db9fd9"
+    "revision": "ffb6c4b91862a03af767d6b0e627d3d20539b79a"
   },
   "tmux": {
     "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"

From 00d219068385a4aa80859d4606ad6e03af6faa83 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 23 Oct 2024 21:18:39 -0700
Subject: [PATCH 1912/2704] fix(rust): regex injections, highlights

**Problem:** Rust's regex injections were not applied since the string
content is behind a `(string_content)` node, and the injections were
applied to the parent node without the `include-children` directive.

**Solution:** Apply the injections to the string content. Also highlight
them accordingly.
---
 queries/rust/highlights.scm | 44 +++++++++++++++++++++++++++++++++++++
 queries/rust/injections.scm | 12 ++++++----
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index c202206ca..f4d058efa 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -475,3 +475,47 @@
 
 (block_comment
   (doc_comment)) @comment.documentation
+
+(call_expression
+  function: (scoped_identifier
+    path: (identifier) @_regex
+    (#any-of? @_regex "Regex" "ByteRegexBuilder")
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (raw_string_literal
+      (string_content) @string.regexp)))
+
+(call_expression
+  function: (scoped_identifier
+    path: (scoped_identifier
+      (identifier) @_regex
+      (#any-of? @_regex "Regex" "ByteRegexBuilder") .)
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (raw_string_literal
+      (string_content) @string.regexp)))
+
+(call_expression
+  function: (scoped_identifier
+    path: (identifier) @_regex
+    (#any-of? @_regex "RegexSet" "RegexSetBuilder")
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (array_expression
+      (raw_string_literal
+        (string_content) @string.regexp))))
+
+(call_expression
+  function: (scoped_identifier
+    path: (scoped_identifier
+      (identifier) @_regex
+      (#any-of? @_regex "RegexSet" "RegexSetBuilder") .)
+    name: (identifier) @_new
+    (#eq? @_new "new"))
+  arguments: (arguments
+    (array_expression
+      (raw_string_literal
+        (string_content) @string.regexp))))
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index c8c360199..d8aa98245 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -49,7 +49,8 @@
     name: (identifier) @_new
     (#eq? @_new "new"))
   arguments: (arguments
-    (raw_string_literal) @injection.content)
+    (raw_string_literal
+      (string_content) @injection.content))
   (#set! injection.language "regex"))
 
 (call_expression
@@ -60,7 +61,8 @@
     name: (identifier) @_new
     (#eq? @_new "new"))
   arguments: (arguments
-    (raw_string_literal) @injection.content)
+    (raw_string_literal
+      (string_content) @injection.content))
   (#set! injection.language "regex"))
 
 (call_expression
@@ -71,7 +73,8 @@
     (#eq? @_new "new"))
   arguments: (arguments
     (array_expression
-      (raw_string_literal) @injection.content))
+      (raw_string_literal
+        (string_content) @injection.content)))
   (#set! injection.language "regex"))
 
 (call_expression
@@ -83,7 +86,8 @@
     (#eq? @_new "new"))
   arguments: (arguments
     (array_expression
-      (raw_string_literal) @injection.content))
+      (raw_string_literal
+        (string_content) @injection.content)))
   (#set! injection.language "regex"))
 
 ((block_comment) @injection.content

From de70388626b398e9cfbec0ec02a0fab8d0f26648 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 06:45:35 +0000
Subject: [PATCH 1913/2704] bot(lockfile): update editorconfig, just, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 35f3b9e17..076f26677 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -144,7 +144,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "777f774d6381f1bb84adffa02a4e476fb61486ae"
+    "revision": "38cf8d0af6049025de0e5486a40881dac06285b4"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -387,7 +387,7 @@
     "revision": "19f62656dc7f2ff3756a8ef3dcf9ab1c01a9eb58"
   },
   "just": {
-    "revision": "6aee3d2f5b3a47286bae0916daaa6c7a217f6fa4"
+    "revision": "1014d2fd6396856c312054d6c30df4d78b62966c"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -744,7 +744,7 @@
     "revision": "ae5199db47757f785e43a14b332118a5474de1a2"
   },
   "swift": {
-    "revision": "d351cb321c28f0a3e66242ef2f61b1f890ec4b44"
+    "revision": "5098007f58f4663a5613b2fecb6b866e3d41e37b"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 278dd927e4e7b8a197460883ede3a878401fa97a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 29 Oct 2024 06:46:43 +0000
Subject: [PATCH 1914/2704] bot(lockfile): update c, fortran, koto

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 076f26677..e726524fb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "79284a14a0d7e4495b095b38acdd8a27acbe870e"
+    "revision": "6c7f459ddc0bcf78b615d3a3f4e8fed87b8b3b1b"
   },
   "c_sharp": {
     "revision": "3a85187e0a9e8db01dec6b3eb2f4e7cdfecc9d88"
@@ -195,7 +195,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "cb4cb11ca2dced205fb54005684a44e2ceb813c1"
+    "revision": "e9fbb3acbfc62b051616e53b17ab97b9823e8617"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -399,7 +399,7 @@
     "revision": "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"
   },
   "koto": {
-    "revision": "9e5ab09710b9f035efdcef1eecaadbf261af7ec3"
+    "revision": "0017388765b8b9d89febfe08b5f82805b4e173a5"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"

From 39016abc99853c3e9d70f1bec7e2fa661b9a81bf Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 29 Oct 2024 09:08:39 +0100
Subject: [PATCH 1915/2704] ci(update): skip gnuplot, unskip djot

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 70d628742..353cc7475 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "djot"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 0e65a9f272510de71d1fda0615d69ac7f0c4d2a0 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 26 Oct 2024 19:23:20 -0700
Subject: [PATCH 1916/2704] feat(bash): highlight more builtin commands

Commands:
- `.`
- `:`
- `true`
- `false`
---
 queries/bash/highlights.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index ef806eeab..5f6b00825 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -169,11 +169,11 @@
 (command_name
   (word) @function.builtin
   (#any-of? @function.builtin
-    "alias" "bg" "bind" "break" "builtin" "caller" "cd" "command" "compgen" "complete" "compopt"
-    "continue" "coproc" "dirs" "disown" "echo" "enable" "eval" "exec" "exit" "fc" "fg" "getopts"
-    "hash" "help" "history" "jobs" "kill" "let" "logout" "mapfile" "popd" "printf" "pushd" "pwd"
-    "read" "readarray" "return" "set" "shift" "shopt" "source" "suspend" "test" "time" "times"
-    "trap" "type" "typeset" "ulimit" "umask" "unalias" "wait"))
+    "." ":" "alias" "bg" "bind" "break" "builtin" "caller" "cd" "command" "compgen" "complete"
+    "compopt" "continue" "coproc" "dirs" "disown" "echo" "enable" "eval" "exec" "exit" "false" "fc"
+    "fg" "getopts" "hash" "help" "history" "jobs" "kill" "let" "logout" "mapfile" "popd" "printf"
+    "pushd" "pwd" "read" "readarray" "return" "set" "shift" "shopt" "source" "suspend" "test" "time"
+    "times" "trap" "true" "type" "typeset" "ulimit" "umask" "unalias" "wait"))
 
 (command
   argument: [

From f26b5fb2edcf3700ea36637935566cab6f845f10 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 28 Oct 2024 18:40:29 -0700
Subject: [PATCH 1917/2704] feat(thrift): small improvements

Less capture duplication by separating queries, include folds, move
`@variable.member` to `@property`
---
 queries/thrift/folds.scm      |  1 +
 queries/thrift/highlights.scm | 30 +++++++++++-------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/queries/thrift/folds.scm b/queries/thrift/folds.scm
index 3beec3567..62880f98c 100644
--- a/queries/thrift/folds.scm
+++ b/queries/thrift/folds.scm
@@ -8,4 +8,5 @@
   (struct_definition)
   (union_definition)
   (comment)
+  (include_statement)+
 ] @fold
diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm
index 6d81291b3..96136d7b5 100644
--- a/queries/thrift/highlights.scm
+++ b/queries/thrift/highlights.scm
@@ -14,7 +14,7 @@
 
 ; Fields
 (field
-  (identifier) @variable.member)
+  (identifier) @property)
 
 ; Parameters
 (function_definition
@@ -67,17 +67,15 @@
   (#lua-match? @constant "^[_A-Z][A-Z0-9_]*$"))
 
 (enum_definition
-  "enum"
-  .
-  (identifier) @type
+  type: (identifier) @type)
+
+(enum_definition
   "{"
-  (identifier) @constant
-  "}")
+  (identifier) @constant)
 
 ; Builtin Types
-(primitive) @type.builtin
-
 [
+  (primitive)
   "list"
   "map"
   "set"
@@ -88,9 +86,12 @@
 
 ; Namespace
 (namespace_declaration
-  (namespace_scope) @string.special
+  (namespace_scope) @string.special)
+
+(namespace_declaration
+  (namespace_scope)
   [
-    (namespace) @module
+    type: (namespace) @module
     (_
       (identifier) @module)
   ])
@@ -205,19 +206,10 @@
 [
   "{"
   "}"
-] @punctuation.bracket
-
-[
   "("
   ")"
-] @punctuation.bracket
-
-[
   "["
   "]"
-] @punctuation.bracket
-
-[
   "<"
   ">"
 ] @punctuation.bracket

From 1c111e3e8f42c85b16cb4bf30e4254fcb5607817 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 06:46:02 +0000
Subject: [PATCH 1918/2704] bot(lockfile): update beancount, desktop, tlaplus,
 vala

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e726524fb..d1f91ac0a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -33,7 +33,7 @@
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
   },
   "beancount": {
-    "revision": "01c0da29e0fc7130420a09d939ecc524e09b6ba6"
+    "revision": "9bc460a05b5f096d69568b5fb36105032ff4ff97"
   },
   "bibtex": {
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
@@ -108,7 +108,7 @@
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
   },
   "desktop": {
-    "revision": "0d8b8cf7c9311fe3f1730df8e193d836f6dd9d1b"
+    "revision": "f3985c2695998ec98c1df50d5567ccdecaa97755"
   },
   "devicetree": {
     "revision": "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"
@@ -783,7 +783,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "ffb6c4b91862a03af767d6b0e627d3d20539b79a"
+    "revision": "d711f24c93221cdfc9a9b4dbb0998f528fc982ac"
   },
   "tmux": {
     "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"
@@ -837,7 +837,7 @@
     "revision": "ea538758a1273b59774dc9179cde460d9c73fd89"
   },
   "vala": {
-    "revision": "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"
+    "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
   },
   "vento": {
     "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"

From f9e9370a6f710148f4a3f3f4f23d5349c85c2888 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 06:44:29 +0000
Subject: [PATCH 1919/2704] bot(lockfile): update editorconfig, gleam, heex,
 superhtml

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d1f91ac0a..ef2fb39e8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -144,7 +144,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "38cf8d0af6049025de0e5486a40881dac06285b4"
+    "revision": "5eca41a689dc03534e9c459b066d116f8befb4ef"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -237,7 +237,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "57c9951b290c8084d7c60b0aee7a2b30986ea031"
+    "revision": "2702fe84b986e4403a071bcb112d48e3dcde0ca4"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
@@ -309,7 +309,7 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "heex": {
-    "revision": "6dd0303acf7138dd2b9b432a229e16539581c701"
+    "revision": "9359017bd0dc6b023044713aa215544885663637"
   },
   "helm": {
     "revision": "ca52fbfc98366c585b84f4cb3745df49f33cd140"
@@ -735,7 +735,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "e561df3b5ce94e598a4c3d0ee4abd9635bad63b3"
+    "revision": "6db4b3359d01fc9feead856953e76be6f5e61a1e"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From 92d2501d698e0fe855bd222540f9648890fab6c7 Mon Sep 17 00:00:00 2001
From: Elliot Fontaine <92150839+elliotfontaine@users.noreply.github.com>
Date: Thu, 31 Oct 2024 17:56:58 +0100
Subject: [PATCH 1920/2704] feat(cylc): add parser and queries (#7225)

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++
 queries/cylc/folds.scm          | 10 +++++
 queries/cylc/highlights.scm     | 72 +++++++++++++++++++++++++++++++++
 queries/cylc/indents.scm        | 16 ++++++++
 queries/cylc/injections.scm     | 11 +++++
 7 files changed, 121 insertions(+)
 create mode 100644 queries/cylc/folds.scm
 create mode 100644 queries/cylc/highlights.scm
 create mode 100644 queries/cylc/indents.scm
 create mode 100644 queries/cylc/injections.scm

diff --git a/README.md b/README.md
index e1a7b6325..167753300 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [csv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
 - [x] [cuda](https://github.com/theHamsta/tree-sitter-cuda) (maintained by @theHamsta)
 - [x] [cue](https://github.com/eonpatapon/tree-sitter-cue) (maintained by @amaanq)
+- [x] [cylc](https://github.com/elliotfontaine/tree-sitter-cylc) (maintained by @elliotfontaine)
 - [x] [d](https://github.com/gdamore/tree-sitter-d) (maintained by @amaanq)
 - [x] [dart](https://github.com/UserNobody14/tree-sitter-dart) (maintained by @akinsho)
 - [x] [desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) (maintained by @ValdezFOmar)
diff --git a/lockfile.json b/lockfile.json
index ef2fb39e8..29e80ffdf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -101,6 +101,9 @@
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
+  "cylc": {
+    "revision": "30dd40d9bf23912e4aefa93eeb4c7090bda3d0f6"
+  },
   "d": {
     "revision": "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fd79f8af7..8e3ce2cf4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -349,6 +349,14 @@ list.cue = {
   maintainers = { "@amaanq" },
 }
 
+list.cylc = {
+  install_info = {
+    url = "https://github.com/elliotfontaine/tree-sitter-cylc",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@elliotfontaine" },
+}
+
 list.d = {
   install_info = {
     url = "https://github.com/gdamore/tree-sitter-d",
diff --git a/queries/cylc/folds.scm b/queries/cylc/folds.scm
new file mode 100644
index 000000000..c8bd40703
--- /dev/null
+++ b/queries/cylc/folds.scm
@@ -0,0 +1,10 @@
+[
+  (multiline_string)
+  (multiline_graph_string)
+  (top_section)
+  (sub_section_1)
+  (sub_section_2)
+  (runtime_section)
+  (task_section)
+  (graph_section)
+] @fold
diff --git a/queries/cylc/highlights.scm b/queries/cylc/highlights.scm
new file mode 100644
index 000000000..a744caa52
--- /dev/null
+++ b/queries/cylc/highlights.scm
@@ -0,0 +1,72 @@
+(comment) @comment @spell
+
+(key) @property
+
+(boolean) @boolean
+
+(datetime) @string.special
+
+(task_name) @function
+
+(include_directive) @keyword.import
+
+[
+  (section_name)
+  (namespace)
+] @markup.heading
+
+[
+  (integer)
+  (recurrence)
+] @number
+
+[
+  "["
+  "]"
+  "[["
+  "]]"
+  "[[["
+  "]]]"
+  "<"
+  ">"
+  (graph_parenthesis)
+] @punctuation.bracket
+
+[
+  "\""
+  "\"\"\""
+  (unquoted_string)
+  (quoted_string)
+  (multiline_string)
+] @string
+
+[
+  (xtrigger_annotation)
+  (suicide_annotation)
+] @attribute
+
+[
+  "="
+  (assignment_operator)
+  (graph_logical)
+  (graph_arrow)
+] @operator
+
+(include_statement
+  path: (_)? @string.special.path)
+
+(task_parameter
+  name: (_)? @variable.parameter
+  selection: (_)? @variable.parameter)
+
+(task_output
+  ":" @tag
+  (nametag) @variable.builtin
+  "?"? @tag)
+
+[
+  (jinja2_expression)
+  (jinja2_statement)
+  (jinja2_comment)
+  (jinja2_shebang)
+] @keyword.directive
diff --git a/queries/cylc/indents.scm b/queries/cylc/indents.scm
new file mode 100644
index 000000000..0457e4580
--- /dev/null
+++ b/queries/cylc/indents.scm
@@ -0,0 +1,16 @@
+[
+  (top_section)
+  (sub_section_1)
+  (sub_section_2)
+  (graph_section)
+  (runtime_section)
+  (task_section)
+] @indent.begin
+
+(multiline_string
+  quotes_close: _ @indent.end) @indent.begin
+
+(multiline_graph_string
+  quotes_close: _ @indent.end) @indent.begin
+
+(line_continuation) @indent.zero
diff --git a/queries/cylc/injections.scm b/queries/cylc/injections.scm
new file mode 100644
index 000000000..41becd699
--- /dev/null
+++ b/queries/cylc/injections.scm
@@ -0,0 +1,11 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+; https://cylc.github.io/cylc-doc/latest/html/user-guide/task-implementation/job-scripts.html#jobscripts
+((setting
+  key: (key) @_key
+  (#any-of? @_key
+    "script" "init-script" "env-script" "pre-script" "post-script" "err-script" "exit-script")
+  value: (_
+    (string_content) @injection.content))
+  (#set! injection.language "bash"))

From fb2d41ec599b68af041f3071ada883718928e279 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 06:46:47 +0000
Subject: [PATCH 1921/2704] bot(lockfile): update cylc, superhtml

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 29e80ffdf..5c37f69bf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
   },
   "cylc": {
-    "revision": "30dd40d9bf23912e4aefa93eeb4c7090bda3d0f6"
+    "revision": "8b895c278f98d05e67997f5e3a43fb5531933023"
   },
   "d": {
     "revision": "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"
@@ -738,7 +738,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "6db4b3359d01fc9feead856953e76be6f5e61a1e"
+    "revision": "7d61cccdb865b2028301a0597b55ac8b225af6cf"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From b065b59196edb10a7c29bfbed88cc225b7e3de37 Mon Sep 17 00:00:00 2001
From: Shengyu Zhang <reg@silverrainz.me>
Date: Fri, 1 Nov 2024 16:51:17 +0800
Subject: [PATCH 1922/2704] fix(rst): capture (adornment) node as
 @markup.heading (#7302)

Node alias "adornment" is used as title's overline and underline:
https://github.com/stsewd/tree-sitter-rst/blob/5120f6e59284cb8b85b450bd2db0bd352635ba9f/grammar.js#L112
---
 queries/rst/highlights.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index 2d1b33eff..21e3825c0 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -9,10 +9,7 @@
   (transition)
 ] @punctuation.special
 
-[
-  "bullet"
-  "adornment"
-] @markup.list
+"bullet" @markup.list
 
 ; Resets for injection
 (doctest_block) @none
@@ -133,7 +130,10 @@
 ] @markup.link @nospell
 
 ; Others
-(title) @markup.heading
+[
+  (title)
+  "adornment"
+] @markup.heading
 
 (comment) @comment @spell
 

From 38c12cb9ac8e1c547a8472c87df9e9d7c8b1af0d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 2 Nov 2024 06:43:54 +0000
Subject: [PATCH 1923/2704] bot(lockfile): update awk, desktop, groovy, nix,
 ruby, xresources

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5c37f69bf..16086eaf3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -24,7 +24,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "553fdc4afb3b603332c3f4baf50c711506f4e797"
+    "revision": "d99440affd7f5e1d433b1753fe02a58cd0e7f635"
   },
   "bash": {
     "revision": "597a5ed6ed4d932fd44697feec988f977081ae59"
@@ -111,7 +111,7 @@
     "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
   },
   "desktop": {
-    "revision": "f3985c2695998ec98c1df50d5567ccdecaa97755"
+    "revision": "de93cdbd1cba965c102ce8b659d79f5759b933bd"
   },
   "devicetree": {
     "revision": "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"
@@ -291,7 +291,7 @@
     "revision": "c06e272341363c5d8e19ac34bc7c56258a37e71b"
   },
   "groovy": {
-    "revision": "0d8884514fe10c4fa47527d9a0284d207f38ddea"
+    "revision": "b53a8cc1075e056b8223b86f3bb392e0d57ae101"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3"
+    "revision": "ae2e097040ce36864b70aeb0a7c924ba696c3848"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -666,7 +666,7 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "83aec5f7d1659aaa79e6f24b406a9cd49b87e8e8"
+    "revision": "557ec01403bd1fcfea50f1805641ca773cbaaa42"
   },
   "rust": {
     "revision": "2ace7a922a755960f44d73a7bb1efffeb4cc5501"
@@ -885,7 +885,7 @@
     "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "xresources": {
-    "revision": "630af80f563ede09a652a808277950c36306e3a3"
+    "revision": "37751efa38512535e6dbc840dccf35c6779f69b7"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 9565149634ec5e0fc9e740f4edb6cab26bf7fb6f Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 2 Nov 2024 11:23:37 -0700
Subject: [PATCH 1924/2704] chore: recognize busted functions

Now writing indent tests is easier because the language server
recognizes the necessary functions
---
 .luarc.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.luarc.json b/.luarc.json
index 8dc060501..5b5aa24b2 100644
--- a/.luarc.json
+++ b/.luarc.json
@@ -1,13 +1,14 @@
 {
   "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
   "runtime": {
-      "version": "LuaJIT"
+    "version": "LuaJIT"
   },
   "workspace": {
     "library": [
       "lua",
       "$VIMRUNTIME",
-      "${3rd}/luv/library"
+      "${3rd}/luv/library",
+      "${3rd}/busted/library"
     ],
     "checkThirdParty": false
   },

From 3abe66556f02c9cfeeed61d33f7e18fe86c3261a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 3 Nov 2024 06:44:08 +0000
Subject: [PATCH 1925/2704] bot(lockfile): update awk, nix, styled, vhdl

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 16086eaf3..abb68524e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -24,7 +24,7 @@
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
   },
   "awk": {
-    "revision": "d99440affd7f5e1d433b1753fe02a58cd0e7f635"
+    "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
   },
   "bash": {
     "revision": "597a5ed6ed4d932fd44697feec988f977081ae59"
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "ae2e097040ce36864b70aeb0a7c924ba696c3848"
+    "revision": "1b26cb63284287344bc3820804cea18419b3edec"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -732,7 +732,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "764af55fc6b8e5ae177eb272f5c5de6238db23e6"
+    "revision": "2e0e6231348d8cb0a82406490771825b8ac80422"
   },
   "supercollider": {
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
@@ -849,7 +849,7 @@
     "revision": "0dacb911daa9614a7c7e79a594d4cb9f478e6554"
   },
   "vhdl": {
-    "revision": "d6e8301999336b47d663052d43f983c3edeb01dd"
+    "revision": "606cc728e7d55bbcecfa37b20d7313a609af1361"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"

From 98b46a647e3c4db3ecfb83a982d14695c9895f07 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 2 Nov 2024 19:49:22 -0700
Subject: [PATCH 1926/2704] feat(regex): highlights for lazy quantifiers, \k

Highlights the "?" following .* and the \k backreference operator in a
pattern like the following: title=(?<quote>["'])(.*?)\k<quote>
---
 queries/regex/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index e529a98a0..2cfdf4b01 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -39,6 +39,8 @@
   "="
   "!"
   "-"
+  (backreference_escape)
+  (lazy)
 ] @operator
 
 [

From 01a92da4389b5346b4049c5b42256c9d84526f04 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 2 Nov 2024 13:59:12 -0700
Subject: [PATCH 1927/2704] fix(rust): highlight parameters with ref in
 definition

---
 queries/rust/highlights.scm               | 8 ++++++++
 tests/query/highlights/rust/parameters.rs | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 tests/query/highlights/rust/parameters.rs

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index f4d058efa..fa25ad6cf 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -54,6 +54,14 @@
     "_"
   ] @variable.parameter)
 
+(parameter
+  (ref_pattern
+    [
+      (mut_pattern
+        (identifier) @variable.parameter)
+      (identifier) @variable.parameter
+    ]))
+
 (closure_parameters
   (_) @variable.parameter)
 
diff --git a/tests/query/highlights/rust/parameters.rs b/tests/query/highlights/rust/parameters.rs
new file mode 100644
index 000000000..171cc5c5d
--- /dev/null
+++ b/tests/query/highlights/rust/parameters.rs
@@ -0,0 +1,8 @@
+pub fn func(ref root: &mut Element, ref mut param2: u32) {
+    //      ^^^ @keyword.modifier
+    //          ^^^^ @variable.parameter
+    //                              ^^^ @keyword.modifier
+    //                                  ^^^ @keyword.modifier
+    //                                      ^^^^^^ @variable.parameter
+    return;
+}

From dbf90fbfa67b979191c696c570d75e3a20a5b909 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 06:46:16 +0000
Subject: [PATCH 1928/2704] bot(lockfile): update dart, devicetree, dhall, idl,
 ssh_config, xresources

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index abb68524e..35bc2ec8e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,16 +108,16 @@
     "revision": "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"
   },
   "dart": {
-    "revision": "9ac03bb2154316624fb4c41fe0f372a5f1597b43"
+    "revision": "a7496b9d562be91e6588eecd5d7045832f575cd0"
   },
   "desktop": {
     "revision": "de93cdbd1cba965c102ce8b659d79f5759b933bd"
   },
   "devicetree": {
-    "revision": "16c9cb959675bc9bc4f4e5bebe473d511a12a06d"
+    "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
   },
   "dhall": {
-    "revision": "affb6ee38d629c9296749767ab832d69bb0d9ea8"
+    "revision": "ffd37395cbb5d576b1df51b28b38f5ab6575a20c"
   },
   "diff": {
     "revision": "63439b5e6e35750aff1e53d9eecc663d369c54bc"
@@ -348,7 +348,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "5573b295410201ed22771776b34d636900eba368"
+    "revision": "9ac6fdd7840b5c0f271fe11b4ab656634dc2074a"
   },
   "ini": {
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
@@ -723,7 +723,7 @@
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
   },
   "ssh_config": {
-    "revision": "77450e8bce8853921512348f83c73c168c71fdfb"
+    "revision": "dd32616275c6e9d7800c58f40c16a09ad1c7c238"
   },
   "starlark": {
     "revision": "018d0e09d9d0f0dd6740a37682b8ee4512e8b2ac"
@@ -885,7 +885,7 @@
     "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "xresources": {
-    "revision": "37751efa38512535e6dbc840dccf35c6779f69b7"
+    "revision": "d36d356624af4b46d3fc815d0701ebf72654473c"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From d3d4c1411c8363fb186ae8c689d85d7fed5191c3 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 3 Nov 2024 20:38:14 -0800
Subject: [PATCH 1929/2704] fix(cooklang): apply correct filetype

`Cooklang` files are recognized as `cook` in vim. This prevents the parser
from attaching since it is looking for `cooklang` files, so we have to
specify the `filetype` here.
---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8e3ce2cf4..8fc5e555e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -288,6 +288,7 @@ list.cooklang = {
     files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@addcninblue" },
+  filetype = "cook",
 }
 
 list.corn = {

From 8fadb18430df7025cad37f2b6b5138fe00eea545 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 1 Nov 2024 13:34:02 -0700
Subject: [PATCH 1930/2704] feat: sway programming language

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/sway/folds.scm          |  20 ++
 queries/sway/highlights.scm     | 336 +++++++++++++++++++++++++++++++
 queries/sway/indents.scm        |  95 +++++++++
 queries/sway/injections.scm     |   5 +
 queries/sway/locals.scm         |  16 ++
 tests/indent/sway/main.sw       | 345 ++++++++++++++++++++++++++++++++
 tests/indent/sway_spec.lua      |  20 ++
 9 files changed, 848 insertions(+)
 create mode 100644 queries/sway/folds.scm
 create mode 100644 queries/sway/highlights.scm
 create mode 100644 queries/sway/indents.scm
 create mode 100644 queries/sway/injections.scm
 create mode 100644 queries/sway/locals.scm
 create mode 100644 tests/indent/sway/main.sw
 create mode 100644 tests/indent/sway_spec.lua

diff --git a/lockfile.json b/lockfile.json
index 35bc2ec8e..689451739 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -746,6 +746,9 @@
   "svelte": {
     "revision": "ae5199db47757f785e43a14b332118a5474de1a2"
   },
+  "sway": {
+    "revision": "03d97aad336ecc6b302f23bdd9b695ddc937160b"
+  },
   "swift": {
     "revision": "5098007f58f4663a5613b2fecb6b866e3d41e37b"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8fc5e555e..cd9b42cc9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2164,6 +2164,14 @@ list.svelte = {
   maintainers = { "@amaanq" },
 }
 
+list.sway = {
+  install_info = {
+    url = "https://github.com/FuelLabs/tree-sitter-sway.git",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@ribru17" },
+}
+
 list.swift = {
   install_info = {
     url = "https://github.com/alex-pinkus/tree-sitter-swift",
diff --git a/queries/sway/folds.scm b/queries/sway/folds.scm
new file mode 100644
index 000000000..ba8474aa2
--- /dev/null
+++ b/queries/sway/folds.scm
@@ -0,0 +1,20 @@
+[
+  (mod_item)
+  (function_item)
+  (struct_item)
+  (trait_item)
+  (enum_item)
+  (impl_item)
+  (type_item)
+  (const_item)
+  (let_declaration)
+  (for_expression)
+  (while_expression)
+  (if_expression)
+  (match_expression)
+  (call_expression)
+  (array_expression)
+  (attribute_item)
+  (block)
+  (use_declaration)+
+] @fold
diff --git a/queries/sway/highlights.scm b/queries/sway/highlights.scm
new file mode 100644
index 000000000..e408464fe
--- /dev/null
+++ b/queries/sway/highlights.scm
@@ -0,0 +1,336 @@
+(type_identifier) @type
+
+(identifier) @variable
+
+(field_identifier) @variable.member
+
+(escape_sequence) @string.escape
+
+(primitive_type) @type.builtin
+
+(boolean_literal) @boolean
+
+(integer_literal) @number
+
+(float_literal) @number.float
+
+(char_literal) @character
+
+; -------
+; Paths
+; -------
+(use_declaration
+  argument: (identifier) @module)
+
+(use_wildcard
+  (identifier) @module)
+
+(mod_item
+  name: (identifier) @module)
+
+(scoped_use_list
+  path: (identifier)? @module)
+
+(use_list
+  (identifier) @module)
+
+(use_as_clause
+  path: (identifier)? @module
+  alias: (identifier) @module)
+
+; ---
+; Remaining Paths
+; ---
+(scoped_identifier
+  path: (identifier)? @module
+  name: (identifier) @module)
+
+(scoped_type_identifier
+  path: (identifier) @module)
+
+[
+  "*"
+  "'"
+  "->"
+  "=>"
+  "<="
+  "="
+  "=="
+  "!"
+  "!="
+  "%"
+  "%="
+  "&"
+  "&="
+  "&&"
+  "|"
+  "|="
+  "||"
+  "^"
+  "^="
+  "*"
+  "*="
+  "-"
+  "-="
+  "+"
+  "+="
+  "/"
+  "/="
+  ">"
+  "<"
+  ">="
+  ">>"
+  "<<"
+  ">>="
+  "<<="
+  "@"
+  ".."
+  "..="
+  "'"
+  "?"
+] @operator
+
+(use_wildcard
+  "*" @character.special)
+
+[
+  (string_literal)
+  (raw_string_literal)
+] @string
+
+[
+  (line_comment)
+  (block_comment)
+] @comment
+
+; ---
+; Extraneous
+; ---
+(self) @variable.builtin
+
+(enum_variant
+  (identifier) @constant)
+
+(field_initializer
+  (field_identifier) @variable.member)
+
+(shorthand_field_initializer
+  (identifier) @variable.member)
+
+(shorthand_field_identifier) @variable.member
+
+(loop_label
+  "'" @label
+  (identifier) @label)
+
+; ---
+; Punctuation
+; ---
+[
+  "::"
+  ":"
+  "."
+  ";"
+  ","
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "#"
+] @punctuation.bracket
+
+(type_arguments
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(type_parameters
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(closure_parameters
+  "|" @punctuation.bracket)
+
+(let_declaration
+  pattern: [
+    (identifier) @variable
+    (tuple_pattern
+      (identifier) @variable)
+  ])
+
+; It needs to be anonymous to not conflict with `call_expression` further below.
+(_
+  value: (field_expression
+    value: (identifier)? @variable
+    field: (field_identifier) @variable.member))
+
+(parameter
+  pattern: (identifier) @variable.parameter)
+
+(parameter
+  pattern: (ref_pattern
+    [
+      (mut_pattern
+        (identifier) @variable.parameter)
+      (identifier) @variable.parameter
+    ]))
+
+(closure_parameters
+  (identifier) @variable.parameter)
+
+(for_expression
+  "for" @keyword.repeat)
+
+"in" @keyword.repeat
+
+[
+  "match"
+  "if"
+  "else"
+] @keyword.conditional
+
+"while" @keyword.repeat
+
+[
+  "break"
+  "continue"
+  "return"
+  "yield"
+] @keyword.return
+
+"use" @keyword.import
+
+(mod_item
+  "mod" @keyword.import
+  !body)
+
+(use_as_clause
+  "as" @keyword.import)
+
+(type_cast_expression
+  "as" @keyword.operator)
+
+[
+  "as"
+  "mod"
+  "abi"
+  "impl"
+  "where"
+  "trait"
+  "for"
+  "let"
+  "contract"
+  "script"
+  "predicate"
+  "library"
+] @keyword
+
+[
+  "struct"
+  "enum"
+  "storage"
+  "configurable"
+  "type"
+] @keyword.type
+
+[
+  "fn"
+  "abi"
+] @keyword.function
+
+[
+  (mutable_specifier)
+  "const"
+  "ref"
+  "deref"
+  "move"
+  "pub"
+] @keyword.modifier
+
+(reference_type
+  "&" @keyword.modifier)
+
+(self_parameter
+  "&" @keyword.modifier)
+
+; -------
+; Guess Other Types
+; -------
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+
+; ---
+; PascalCase identifiers in call_expressions (e.g. `Ok()`)
+; are assumed to be enum constructors.
+; ---
+(call_expression
+  function: [
+    ((identifier) @constant
+      (#lua-match? @constant "^[A-Z]"))
+    (scoped_identifier
+      name: ((identifier) @constant
+        (#lua-match? @constant "^[A-Z]")))
+  ])
+
+; ---
+; Assume that types in match arms are enums and not
+; tuple structs. Same for `if let` expressions.
+; ---
+(match_pattern
+  (scoped_identifier
+    name: (identifier) @constructor))
+
+(tuple_struct_pattern
+  type: [
+    (identifier) @constructor
+    (scoped_identifier
+      name: (identifier) @constructor)
+  ])
+
+(struct_pattern
+  type: [
+    (type_identifier) @constructor
+    (scoped_type_identifier
+      name: (type_identifier) @constructor)
+  ])
+
+; ---
+; Other PascalCase identifiers are assumed to be structs.
+; ---
+((identifier) @type
+  (#lua-match? @type "^[A-Z]"))
+
+; -------
+; Functions
+; -------
+(call_expression
+  function: [
+    (identifier) @function.call
+    (scoped_identifier
+      name: (identifier) @function.call)
+    (field_expression
+      field: (field_identifier) @function.method.call)
+  ])
+
+(generic_function
+  function: [
+    (identifier) @function.call
+    (scoped_identifier
+      name: (identifier) @function.call)
+    (field_expression
+      field: (field_identifier) @function.method.call)
+  ])
+
+(function_item
+  name: (identifier) @function)
+
+(function_signature_item
+  name: (identifier) @function)
diff --git a/queries/sway/indents.scm b/queries/sway/indents.scm
new file mode 100644
index 000000000..151d8b20b
--- /dev/null
+++ b/queries/sway/indents.scm
@@ -0,0 +1,95 @@
+[
+  (mod_item)
+  (struct_item)
+  (enum_item)
+  (impl_item)
+  (struct_expression)
+  (struct_pattern)
+  (tuple_struct_pattern)
+  (tuple_expression)
+  (tuple_type)
+  (tuple_pattern)
+  (match_block)
+  (call_expression)
+  (asm_block)
+  (asm_parameters)
+  (assignment_expression)
+  (arguments)
+  (block)
+  (where_clause)
+  (use_list)
+  (array_expression)
+  (ordered_field_declaration_list)
+  (field_declaration_list)
+  (enum_variant_list)
+  (parameters)
+  (token_tree)
+] @indent.begin
+
+(trait_item
+  body: (_) @indent.begin)
+
+(string_literal
+  (escape_sequence)) @indent.begin
+
+(block
+  "}" @indent.end)
+
+(asm_block
+  "}" @indent.end)
+
+(enum_item
+  body: (enum_variant_list
+    "}" @indent.end))
+
+(impl_item
+  body: (declaration_list
+    "}" @indent.end))
+
+(match_expression
+  body: (match_block
+    "}" @indent.end))
+
+(struct_item
+  body: (field_declaration_list
+    "}" @indent.end))
+
+(struct_expression
+  body: (field_initializer_list
+    "}" @indent.end))
+
+(struct_pattern
+  "}" @indent.end)
+
+(tuple_struct_pattern
+  ")" @indent.end)
+
+(tuple_type
+  ")" @indent.end)
+
+(tuple_pattern
+  ")" @indent.end)
+
+(trait_item
+  body: (declaration_list
+    "}" @indent.end))
+
+(impl_item
+  (where_clause) @indent.dedent)
+
+[
+  "where"
+  ")"
+  "]"
+  "}"
+] @indent.branch
+
+(impl_item
+  (declaration_list) @indent.branch)
+
+[
+  (line_comment)
+  (string_literal)
+] @indent.ignore
+
+(raw_string_literal) @indent.auto
diff --git a/queries/sway/injections.scm b/queries/sway/injections.scm
new file mode 100644
index 000000000..3cd6aac8e
--- /dev/null
+++ b/queries/sway/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/sway/locals.scm b/queries/sway/locals.scm
new file mode 100644
index 000000000..5c2ade83a
--- /dev/null
+++ b/queries/sway/locals.scm
@@ -0,0 +1,16 @@
+; Scopes
+[
+  (function_item)
+  (closure_expression)
+  (block)
+] @local.scope
+
+; Definitions
+(parameter
+  (identifier) @local.definition)
+
+(closure_parameters
+  (identifier) @local.definition)
+
+; References
+(identifier) @local.reference
diff --git a/tests/indent/sway/main.sw b/tests/indent/sway/main.sw
new file mode 100644
index 000000000..d917895c3
--- /dev/null
+++ b/tests/indent/sway/main.sw
@@ -0,0 +1,345 @@
+library;
+
+use ::alloc::{alloc, realloc};
+use ::assert::assert;
+use ::option::Option::{self, *};
+use ::convert::From;
+use ::iterator::*;
+
+struct RawVec<T> {
+    ptr: raw_ptr,
+    cap: u64,
+}
+
+pub fn tx_witness_data<T>(index: u64) -> Option<T> {
+    if index >= tx_witnesses_count() {
+        return None
+    }
+
+    let length = match tx_witness_data_length(index) {
+        Some(len) => len,
+        None => return None,
+    };
+
+    if __is_reference_type::<T>() {
+        let witness_data_ptr = __gtf::<raw_ptr>(index, GTF_WITNESS_DATA);
+        let new_ptr = alloc_bytes(length);
+        witness_data_ptr.copy_bytes_to(new_ptr, length);
+
+        Some(asm(ptr: new_ptr) {
+            ptr: T
+        })
+    } else {
+        // u8 is the only value type that is less than 8 bytes and should be handled separately
+        if __size_of::<T>() == 1 {
+            Some(__gtf::<raw_ptr>(index, GTF_WITNESS_DATA).add::<u8>(7).read::<T>())
+        } else {
+            Some(__gtf::<raw_ptr>(index, GTF_WITNESS_DATA).read::<T>())
+        }
+    }
+}
+
+impl<T> RawVec<T> {
+    pub fn new() -> Self {
+        Self {
+            ptr: alloc::<T>(0),
+            cap: 0,
+        }
+    }
+
+    pub fn with_capacity(capacity: u64) -> Self {
+        Self {
+            ptr: alloc::<T>(capacity),
+            cap: capacity,
+        }
+    }
+
+    pub fn ptr(self) -> raw_ptr {
+        self.ptr
+    }
+
+    pub fn capacity(self) -> u64 {
+        self::cap()
+    }
+
+    pub fn grow(ref mut self) {
+        let new_cap = if self.cap == 0 { 1 } else { 2 * self.cap };
+
+        self.ptr = realloc::<T>(self.ptr, self.cap, new_cap);
+        self.cap = new_cap;
+    }
+}
+
+impl<T> From<raw_slice> for RawVec<T> {
+    fn from(slice: raw_slice) -> Self {
+        let cap = slice.len::<T>();
+        let ptr = alloc::<T>(cap);
+        if cap > 0 {
+            slice.ptr().copy_to::<T>(ptr, cap);
+        }
+        Self { ptr, cap }
+    }
+}
+
+pub struct Vec<T> {
+    buf: RawVec<T>,
+    len: u64,
+}
+
+impl<T> Vec<T> {
+    pub fn new() -> Self {
+        'hey: while true {
+
+        }
+        Self {
+            buf: RawVec::new(),
+            len: 0,
+        }
+    }
+
+    pub fn with_capacity(capacity: u64) -> Self {
+        Self {
+            buf: RawVec::with_capacity(capacity),
+            len: 0,
+        }
+    }
+
+    pub fn push(ref mut self, value: T) {
+        // If there is insufficient capacity, grow the buffer.
+        if self.len == self.buf.capacity() {
+            self.buf.grow();
+        };
+
+        // Get a pointer to the end of the buffer, where the new element will
+        // be inserted.
+        let end = self.buf.ptr().add::<T>(self.len);
+
+        // Write `value` at pointer `end`
+        end.write::<T>(value);
+
+        // Increment length.
+        self.len += 1;
+    }
+
+    pub fn capacity(self) -> u64 {
+        self.buf.capacity()
+    }
+
+    pub fn clear(ref mut self) {
+        self.len = 0;
+    }
+
+    pub fn get(self, index: u64) -> Option<T> {
+        // First check that index is within bounds.
+        if self.len <= index {
+            return None;
+        };
+
+        // Get a pointer to the desired element using `index`
+        let ptr = self.buf.ptr().add::<T>(index);
+
+        // Read from `ptr`
+        Some(ptr.read::<T>())
+    }
+
+    pub fn len(self) -> u64 {
+        self.len
+    }
+
+    pub fn is_empty(self) -> bool {
+        self.len == 0
+    }
+
+    pub fn remove(ref mut self, index: u64) -> T {
+        assert(index < self.len);
+
+        let buf_start = self.buf.ptr();
+
+        // Read the value at `index`
+        let ptr = buf_start.add::<T>(index);
+        let ret = ptr.read::<T>();
+
+        // Shift everything down to fill in that spot.
+        let mut i = index;
+        if self.len > 1 {
+            while i < self.len - 1 {
+                let ptr = buf_start.add::<T>(i);
+                ptr.add::<T>(1).copy_to::<T>(ptr, 1);
+                i += 1;
+            }
+        }
+
+        // Decrease length.
+        self.len -= 1;
+        ret
+    }
+
+    pub fn insert(ref mut self, index: u64, element: T) {
+        assert(index <= self.len);
+
+        // If there is insufficient capacity, grow the buffer.
+        if self.len == self.buf.capacity() {
+            self.buf.grow();
+        }
+
+        let buf_start = self.buf.ptr();
+
+        // The spot to put the new value
+        let index_ptr = buf_start.add::<T>(index);
+
+        // Shift everything over to make space.
+        let mut i = self.len;
+        while i > index {
+            let ptr = buf_start.add::<T>(i);
+            ptr.sub::<T>(1).copy_to::<T>(ptr, 1);
+            i -= 1;
+        }
+
+        // Write `element` at pointer `index`
+        index_ptr.write::<T>(element);
+
+        // Increment length.
+        self.len += 1;
+    }
+
+    pub fn pop(ref mut self) -> Option<T> {
+        if self.len == 0 {
+            return None;
+        }
+        self.len -= 1;
+        Some(self.buf.ptr().add::<T>(self.len).read::<T>())
+    }
+
+    pub fn swap(ref mut self, element1_index: u64, element2_index: u64) {
+        assert(element1_index < self.len);
+        assert(element2_index < self.len);
+
+        if element1_index == element2_index {
+            return;
+        }
+
+        let element1_ptr = self.buf.ptr().add::<T>(element1_index);
+        let element2_ptr = self.buf.ptr().add::<T>(element2_index);
+
+        let element1_val: T = element1_ptr.read::<T>();
+        element2_ptr.copy_to::<T>(element1_ptr, 1);
+        element2_ptr.write::<T>(element1_val);
+    }
+
+    pub fn set(ref mut self, index: u64, value: T) {
+        assert(index < self.len);
+
+        let index_ptr = self.buf.ptr().add::<T>(index);
+
+        index_ptr.write::<T>(value);
+    }
+
+    pub fn iter(self) -> VecIter<T> {
+        VecIter {
+            values: self,
+            index: 0,
+        }
+    }
+
+    pub fn ptr(self) -> raw_ptr {
+        self.buf.ptr()
+    }
+}
+
+impl<T> AsRawSlice for Vec<T> {
+    fn as_raw_slice(self) -> raw_slice {
+        raw_slice::from_parts::<T>(self.buf.ptr(), self.len)
+    }
+}
+
+impl<T> From<raw_slice> for Vec<T> {
+    fn from(slice: raw_slice) -> Self {
+        Self {
+            buf: RawVec::from(slice),
+            len: slice.len::<T>(),
+        }
+    }
+}
+
+impl<T> From<Vec<T>> for raw_slice {
+    fn from(vec: Vec<T>) -> Self {
+        asm(ptr: (vec.ptr(), vec.len())) {
+            ptr: raw_slice
+        }
+    }
+
+    pub fn sha256(self) -> b256 {
+        let mut result_buffer = b256::min();
+        asm(
+            hash: result_buffer,
+            ptr: p,
+            bytes: p,
+        ) {
+            s256 hash ptr bytes;
+            hash: b256
+        }
+    }
+}
+
+impl<T> AbiEncode for Vec<T>
+where
+    T: AbiEncode,
+{
+    fn abi_encode(self, buffer: Buffer) -> Buffer {
+        let len = self.len();
+        let mut buffer = len.abi_encode(buffer);
+
+        let mut i = 0;
+        while i < len {
+            let item = self.get(i).unwrap();
+            buffer = item.abi_encode(buffer);
+            i += 1;
+        }
+
+        buffer
+    }
+}
+
+impl<T> AbiDecode for Vec<T>
+where
+    T: AbiDecode,
+{
+    fn abi_decode(ref buffer: BufferReader) -> Vec<T> {
+        let len = u64::abi_decode(buffer);
+
+        let mut v = Vec::with_capacity(len);
+
+        let mut i = 0;
+        while i < len {
+            let item = T::abi_decode(buffer);
+            v.push(item);
+            i += 1;
+        }
+
+        yield 5;
+
+        v
+    }
+}
+
+pub struct VecIter<T> {
+    values: Vec<T>,
+    index: u64,
+}
+
+impl<T> Iterator for VecIter<T> {
+    type Item = T;
+    fn next(ref mut self) -> Option<Self::Item> {
+        if self.index >= self.values.len()? {
+            return None
+        }
+
+        self.index += 1;
+        self.values.get(self.index - 1)
+    }
+}
+
+fn hello<T>(hi: T) {
+    println("{}", hi);
+}
+// vim: ft=sway
diff --git a/tests/indent/sway_spec.lua b/tests/indent/sway_spec.lua
new file mode 100644
index 000000000..d37573ae9
--- /dev/null
+++ b/tests/indent/sway_spec.lua
@@ -0,0 +1,20 @@
+local Runner = require("tests.indent.common").Runner
+
+local run = Runner:new(it, "tests/indent/sway", {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 4,
+  expandtab = true,
+})
+
+describe("indent Sway:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {})
+  end)
+  describe("new line:", function()
+    run:new_line("main.sw", { on_line = 12, text = "const CONST: u32 = 2;", indent = 0 })
+    run:new_line("main.sw", { on_line = 14, text = "let hi = 5;", indent = 4 })
+    run:new_line("main.sw", { on_line = 15, text = "let hi = 5;", indent = 8 })
+    run:new_line("main.sw", { on_line = 92, text = "let hi = 5;", indent = 12 })
+  end)
+end)

From dfd3207ed43a0c572c13acc02bf9d7dc270f4030 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 07:36:55 +0000
Subject: [PATCH 1931/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 167753300..824425cd2 100644
--- a/README.md
+++ b/README.md
@@ -422,6 +422,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [superhtml](https://github.com/kristoff-it/superhtml) (maintained by @rockorager)
 - [x] [surface](https://github.com/connorlay/tree-sitter-surface) (maintained by @connorlay)
 - [x] [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) (maintained by @amaanq)
+- [x] [sway](https://github.com/FuelLabs/tree-sitter-sway.git) (maintained by @ribru17)
 - [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
 - [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
 - [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)

From 509d38fee865eefd38eacf17c8920b68cf67b0fd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 06:43:49 +0000
Subject: [PATCH 1932/2704] bot(lockfile): update dhall, printf, regex, ziggy,
 ziggy_schema

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 689451739..02376dad1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -117,7 +117,7 @@
     "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
   },
   "dhall": {
-    "revision": "ffd37395cbb5d576b1df51b28b38f5ab6575a20c"
+    "revision": "4a6c08abfb54827db4e722d6cdca81b093898988"
   },
   "diff": {
     "revision": "63439b5e6e35750aff1e53d9eecc663d369c54bc"
@@ -561,7 +561,7 @@
     "revision": "ebe2ab2f642eda2072c68c8de02e83973c26f33c"
   },
   "printf": {
-    "revision": "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"
+    "revision": "94b84fbc4768a7cbdeadfe5e489a45a6a8af400e"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -636,7 +636,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "58f4caf9db12db3b38b81c77d274aa73c9e85aca"
+    "revision": "b518ad4bbee3ad59672b1826ca4dc62825983533"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -906,9 +906,9 @@
     "revision": "eb7d58c2dc4fbeea4745019dee8df013034ae66b"
   },
   "ziggy": {
-    "revision": "42b6f5d7320340bc5903c4c29d34065e8517a549"
+    "revision": "fe73beef9f52f04048d8b19016fc4fbc66b4596f"
   },
   "ziggy_schema": {
-    "revision": "42b6f5d7320340bc5903c4c29d34065e8517a549"
+    "revision": "fe73beef9f52f04048d8b19016fc4fbc66b4596f"
   }
 }

From 604aa5a7c8cf1fd0c4ad667a0cc7fb8aaf0be33e Mon Sep 17 00:00:00 2001
From: Abhishek Singh <abhisheksingh0x558@icloud.com>
Date: Tue, 5 Nov 2024 19:55:42 +0530
Subject: [PATCH 1933/2704] feat(nu): add parser and queries (#7267)

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 +
 queries/nu/highlights.scm       | 356 ++++++++++++++++++++++++++++++++
 queries/nu/indents.scm          |  26 +++
 queries/nu/injections.scm       |   5 +
 tests/indent/nu/closure.nu      |   6 +
 tests/indent/nu/for.nu          |   3 +
 tests/indent/nu/if_else.nu      |   5 +
 tests/indent/nu/list.nu         |   7 +
 tests/indent/nu/record.nu       |   4 +
 tests/indent/nu/table.nu        |   9 +
 tests/indent/nu_spec.lua        |  17 ++
 12 files changed, 449 insertions(+)
 create mode 100644 queries/nu/highlights.scm
 create mode 100644 queries/nu/indents.scm
 create mode 100644 queries/nu/injections.scm
 create mode 100644 tests/indent/nu/closure.nu
 create mode 100644 tests/indent/nu/for.nu
 create mode 100644 tests/indent/nu/if_else.nu
 create mode 100644 tests/indent/nu/list.nu
 create mode 100644 tests/indent/nu/record.nu
 create mode 100644 tests/indent/nu/table.nu
 create mode 100644 tests/indent/nu_spec.lua

diff --git a/lockfile.json b/lockfile.json
index 02376dad1..73a36e945 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -500,6 +500,9 @@
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
+  "nu": {
+    "revision": "082a7c7df7db460da6b280c9f902bf2b19a2f423"
+  },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index cd9b42cc9..a0ed0b427 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1469,6 +1469,14 @@ list.nqc = {
   maintainers = { "@amaanq" },
 }
 
+list.nu = {
+  install_info = {
+    url = "https://github.com/nushell/tree-sitter-nu",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@abhisheksingh0x558" },
+}
+
 list.objc = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-objc",
diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
new file mode 100644
index 000000000..3d30d4c29
--- /dev/null
+++ b/queries/nu/highlights.scm
@@ -0,0 +1,356 @@
+; ---
+; keywords
+[
+  "let"
+  "let-env"
+  "mut"
+  "const"
+  "hide-env"
+  "source"
+  "source-env"
+  "overlay"
+  "register"
+] @keyword
+
+[
+  "if"
+  "else"
+  "match"
+] @keyword.conditional
+
+[
+  "loop"
+  "while"
+  "break"
+  "continue"
+] @keyword.repeat
+
+[
+  "def"
+  "do"
+] @keyword.function
+
+"return" @keyword.return
+
+[
+  "try"
+  "catch"
+  "error"
+] @keyword.exception
+
+"module" @keyword.import
+
+[
+  "alias"
+  "export-env"
+  "export"
+  "extern"
+] @keyword.modifier
+
+(hide_mod
+  "hide" @keyword)
+
+(decl_use
+  module: (unquoted) @module)
+
+(ctrl_for
+  "for" @keyword
+  "in" @keyword)
+
+(overlay_list
+  "list" @keyword.import)
+
+(overlay_hide
+  "hide" @keyword.import)
+
+(overlay_new
+  "new" @keyword.import)
+
+(overlay_use
+  "use" @keyword.import
+  "as" @keyword)
+
+(ctrl_error
+  "make" @keyword.import)
+
+; ---
+; literals
+(val_number) @number
+
+(val_duration
+  unit: _ @variable.parameter)
+
+(val_filesize
+  unit: _ @variable.parameter)
+
+(val_binary
+  [
+    "0b"
+    "0o"
+    "0x"
+  ] @number
+  digit: [
+    "," @punctuation.delimiter
+    (hex_digit) @number
+  ]) @number
+
+(val_bool) @constant.builtin
+
+(val_nothing) @constant.builtin
+
+(val_string) @string
+
+arg_str: (val_string) @variable.parameter
+
+file_path: (val_string) @variable.parameter
+
+(val_date) @number
+
+(inter_escape_sequence) @string.escape
+
+(escape_sequence) @string.escape
+
+(val_interpolated
+  [
+    "$\""
+    "$'"
+    "\""
+    "'"
+  ] @string)
+
+(unescaped_interpolated_content) @string
+
+(escaped_interpolated_content) @string
+
+(expr_interpolated
+  [
+    "("
+    ")"
+  ] @variable.parameter)
+
+; ---
+; operators
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "//"
+  "++"
+  "**"
+  "=="
+  "!="
+  "<"
+  "<="
+  ">"
+  ">="
+  "=~"
+  "!~"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "++="
+  "-"
+  ".."
+  "..="
+  "..<"
+  "=>"
+  "="
+  "|"
+  "o>"
+  "out>"
+  "e>"
+  "err>"
+  "e+o>"
+  "err+out>"
+  "o+e>"
+  "out+err>"
+] @operator
+
+[
+  "mod"
+  "and"
+  "or"
+  "xor"
+  "bit-or"
+  "bit-xor"
+  "bit-and"
+  "bit-shl"
+  "bit-shr"
+  "in"
+  "not-in"
+  "starts-with"
+  "ends-with"
+  "not"
+] @keyword.operator
+
+; ---
+; punctuation
+[
+  ","
+  ";"
+  ":"
+] @punctuation.delimiter
+
+(param_long_flag
+  "--" @punctuation.delimiter)
+
+(long_flag
+  "--" @punctuation.delimiter)
+
+(long_flag_equals_value
+  "--" @punctuation.delimiter)
+
+(short_flag
+  "-" @punctuation.delimiter)
+
+(long_flag_equals_value
+  "=" @punctuation.delimiter)
+
+(param_short_flag
+  "-" @punctuation.delimiter)
+
+(param_rest
+  "..." @punctuation.delimiter)
+
+(param_value
+  "=" @punctuation.delimiter)
+
+(param_cmd
+  "@" @punctuation.delimiter)
+
+(param_opt
+  "?" @punctuation.delimiter)
+
+(returns
+  "->" @punctuation.delimiter)
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+(parameter_pipes
+  "|" @punctuation.bracket)
+
+key: (identifier) @property
+
+; ---
+; identifiers
+(param_rest
+  name: (_) @variable.parameter)
+
+(param_opt
+  name: (_) @variable.parameter)
+
+(parameter
+  param_name: (_) @variable.parameter)
+
+(param_cmd
+  (cmd_identifier) @string)
+
+(param_long_flag
+  (long_flag_identifier) @attribute)
+
+(param_short_flag
+  (param_short_flag_identifier) @attribute)
+
+(short_flag
+  (short_flag_identifier) @attribute)
+
+(long_flag_identifier) @attribute
+
+(scope_pattern
+  (wild_card) @function)
+
+(cmd_identifier) @function
+
+; generated with Nu 0.93.0
+; > help commands
+;   | filter { $in.command_type == builtin and $in.category != core }
+;   | each {$'"($in.name | split row " " | $in.0)"'}
+;   | uniq
+;   | str join ' '
+(command
+  head: [
+    (cmd_identifier) @function.builtin
+    (#any-of? @function.builtin
+      "all" "ansi" "any" "append" "ast" "bits" "bytes" "cal" "cd" "char" "clear" "collect" "columns"
+      "compact" "complete" "config" "cp" "date" "debug" "decode" "default" "detect" "dfr" "drop"
+      "du" "each" "encode" "enumerate" "every" "exec" "exit" "explain" "explore" "export-env" "fill"
+      "filter" "find" "first" "flatten" "fmt" "format" "from" "generate" "get" "glob" "grid" "group"
+      "group-by" "hash" "headers" "histogram" "history" "http" "input" "insert" "inspect"
+      "interleave" "into" "is-empty" "is-not-empty" "is-terminal" "items" "join" "keybindings"
+      "kill" "last" "length" "let-env" "lines" "load-env" "ls" "math" "merge" "metadata" "mkdir"
+      "mktemp" "move" "mv" "nu-check" "nu-highlight" "open" "panic" "par-each" "parse" "path"
+      "plugin" "port" "prepend" "print" "ps" "query" "random" "range" "reduce" "reject" "rename"
+      "reverse" "rm" "roll" "rotate" "run-external" "save" "schema" "select" "seq" "shuffle" "skip"
+      "sleep" "sort" "sort-by" "split" "split-by" "start" "stor" "str" "sys" "table" "take" "tee"
+      "term" "timeit" "to" "touch" "transpose" "tutor" "ulimit" "uname" "uniq" "uniq-by" "update"
+      "upsert" "url" "values" "view" "watch" "where" "which" "whoami" "window" "with-env" "wrap"
+      "zip")
+  ])
+
+(command
+  "^" @punctuation.delimiter
+  head: (_) @function)
+
+"where" @function.builtin
+
+(path
+  [
+    "."
+    "?"
+  ] @punctuation.delimiter) @variable.parameter
+
+(stmt_let
+  (identifier) @variable)
+
+(val_variable
+  "$" @punctuation.special
+  [
+    (identifier) @variable
+    "in" @variable.parameter.builtin
+    "nu" @module
+    "env" @constant
+  ]) @none
+
+; ---
+; types
+(flat_type) @type
+
+(list_type
+  "list" @type.builtin
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(collection_type
+  [
+    "record"
+    "table"
+  ] @type.builtin
+  "<" @punctuation.bracket
+  key: (_) @variable.parameter
+  [
+    ","
+    ":"
+  ] @punctuation.delimiter
+  ">" @punctuation.bracket)
+
+(shebang) @keyword.directive
+
+(comment) @comment @spell
+
+((comment) @comment.documentation @spell
+  (decl_def))
+
+((parameter)
+  (comment) @comment.documentation @spell)
diff --git a/queries/nu/indents.scm b/queries/nu/indents.scm
new file mode 100644
index 000000000..c344d4abd
--- /dev/null
+++ b/queries/nu/indents.scm
@@ -0,0 +1,26 @@
+; Forked from https://github.com/nushell/tree-sitter-nu
+; Copyright (c) 2019 - 2022 The Nushell Project Developers
+; Licensed under the MIT license.
+[
+  (expr_parenthesized)
+  (parameter_bracks)
+  (val_record)
+  (val_list)
+  (val_closure)
+  (val_table)
+  (block)
+] @indent.begin
+
+[
+  "}"
+  "]"
+  ")"
+] @indent.end
+
+[
+  "}"
+  "]"
+  ")"
+] @indent.branch
+
+(comment) @indent.auto
diff --git a/queries/nu/injections.scm b/queries/nu/injections.scm
new file mode 100644
index 000000000..d5e70acb5
--- /dev/null
+++ b/queries/nu/injections.scm
@@ -0,0 +1,5 @@
+; Forked from https://github.com/nushell/tree-sitter-nu
+; Copyright (c) 2019 - 2022 The Nushell Project Developers
+; Licensed under the MIT license.
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/tests/indent/nu/closure.nu b/tests/indent/nu/closure.nu
new file mode 100644
index 000000000..ef6301e4a
--- /dev/null
+++ b/tests/indent/nu/closure.nu
@@ -0,0 +1,6 @@
+do { |x, y|
+  print ($x + $y);
+  print ($x - $y);
+  print ($x * $y);
+  print ($x / $y);
+}
diff --git a/tests/indent/nu/for.nu b/tests/indent/nu/for.nu
new file mode 100644
index 000000000..87dfd5f3d
--- /dev/null
+++ b/tests/indent/nu/for.nu
@@ -0,0 +1,3 @@
+for x in 1..3 {
+  print ($x * $x)
+}
diff --git a/tests/indent/nu/if_else.nu b/tests/indent/nu/if_else.nu
new file mode 100644
index 000000000..92b105737
--- /dev/null
+++ b/tests/indent/nu/if_else.nu
@@ -0,0 +1,5 @@
+if true {
+  true
+} else {
+  false
+}
diff --git a/tests/indent/nu/list.nu b/tests/indent/nu/list.nu
new file mode 100644
index 000000000..47b6b913c
--- /dev/null
+++ b/tests/indent/nu/list.nu
@@ -0,0 +1,7 @@
+let my_list = [
+  foo
+  bar
+  baz
+  qux
+  quux
+]
diff --git a/tests/indent/nu/record.nu b/tests/indent/nu/record.nu
new file mode 100644
index 000000000..cf119c6e9
--- /dev/null
+++ b/tests/indent/nu/record.nu
@@ -0,0 +1,4 @@
+let my_record = {
+  foo: "bar"
+  bar: 1
+}
diff --git a/tests/indent/nu/table.nu b/tests/indent/nu/table.nu
new file mode 100644
index 000000000..ffdf30cac
--- /dev/null
+++ b/tests/indent/nu/table.nu
@@ -0,0 +1,9 @@
+let my_table = [
+  [a b];
+  [1 2]
+  [3 4]
+  [5 6]
+  [7 8]
+  [9 10]
+  [11 12]
+]
diff --git a/tests/indent/nu_spec.lua b/tests/indent/nu_spec.lua
new file mode 100644
index 000000000..37c02ebea
--- /dev/null
+++ b/tests/indent/nu_spec.lua
@@ -0,0 +1,17 @@
+local Runner = require("tests.indent.common").Runner
+--local XFAIL = require("tests.indent.common").XFAIL
+
+local run = Runner:new(it, "tests/indent/nu", {
+  tabstop = 2,
+  shiftwidth = 2,
+  softtabstop = -1,
+  expandtab = true,
+})
+
+describe("indent Nu:", function()
+  describe("whole file:", function()
+    run:whole_file(".", {
+      expected_failures = {},
+    })
+  end)
+end)

From 7dc8aabe86db8c2f23520e8334f7584f83e84342 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 14:26:01 +0000
Subject: [PATCH 1934/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 824425cd2..bd3b030d2 100644
--- a/README.md
+++ b/README.md
@@ -340,6 +340,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [nix](https://github.com/cstrahan/tree-sitter-nix) (maintained by @leo60228)
 - [x] [norg](https://github.com/nvim-neorg/tree-sitter-norg) (maintained by @JoeyGrajciar, @vhyrro)
 - [x] [nqc](https://github.com/amaanq/tree-sitter-nqc) (maintained by @amaanq)
+- [x] [nu](https://github.com/nushell/tree-sitter-nu) (maintained by @abhisheksingh0x558)
 - [x] [objc](https://github.com/amaanq/tree-sitter-objc) (maintained by @amaanq)
 - [x] [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) (maintained by @ColinKennedy)
 - [x] [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)

From 0d3426a2e88709175f545b4caf74eb2c54bee79a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 3 Nov 2024 21:13:52 -0800
Subject: [PATCH 1935/2704] fix(wgsl): indent first parameter of function
 definition

---
 queries/wgsl/indents.scm     | 15 ++++++++++++++-
 tests/indent/wgsl/basic.wgsl | 17 +++++++++++++++++
 tests/indent/wgsl_spec.lua   |  7 ++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/queries/wgsl/indents.scm b/queries/wgsl/indents.scm
index b74e56e34..a866bd62f 100644
--- a/queries/wgsl/indents.scm
+++ b/queries/wgsl/indents.scm
@@ -1,10 +1,23 @@
 [
-  (parameter_list)
   (compound_statement)
   (loop_statement)
   (struct_declaration)
 ] @indent.begin
 
+((parameter_list) @indent.begin
+  (#set! indent.immediate)
+  (#set! indent.start_at_same_line))
+
+(function_declaration
+  "(" @indent.begin
+  (#set! indent.immediate))
+
+(ERROR
+  "fn"
+  (identifier)
+  "(" @indent.begin
+  (#set! indent.immediate))
+
 (compound_statement
   "}" @indent.end)
 
diff --git a/tests/indent/wgsl/basic.wgsl b/tests/indent/wgsl/basic.wgsl
index 7dd50f87e..ccf29a360 100644
--- a/tests/indent/wgsl/basic.wgsl
+++ b/tests/indent/wgsl/basic.wgsl
@@ -41,3 +41,20 @@ fn vertex(vertex: Vertex,
   out.b = 2;
   return out;
 }
+
+fn foo(
+  a: u32,
+  b: u32,
+) {
+  return a;
+}
+
+fn bar(
+) {}
+
+fn baz(
+  a: u32,
+) {}
+
+fn qux(
+)
diff --git a/tests/indent/wgsl_spec.lua b/tests/indent/wgsl_spec.lua
index 55d59acbd..e70215a7b 100644
--- a/tests/indent/wgsl_spec.lua
+++ b/tests/indent/wgsl_spec.lua
@@ -15,5 +15,10 @@ describe("indent WGSL:", function()
     })
   end)
 
-  describe("new line:", function() end)
+  describe("new line:", function()
+    run:new_line("basic.wgsl", { on_line = 47, text = "c: u32,", indent = 2 })
+    run:new_line("basic.wgsl", { on_line = 52, text = "c: u32,", indent = 2 })
+    run:new_line("basic.wgsl", { on_line = 56, text = "c: u32,", indent = 2 })
+    run:new_line("basic.wgsl", { on_line = 59, text = "c: u32,", indent = 2 })
+  end)
 end)

From f284ca27b5183599e5a3f7ec05f80b1d6c615c4d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 6 Nov 2024 09:47:57 +0100
Subject: [PATCH 1936/2704] ci(update): skip julia

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 353cc7475..6c8895652 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot julia"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 8b15ce58e4d607ee954df57c5d6053240e4b1279 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 6 Nov 2024 10:00:29 +0100
Subject: [PATCH 1937/2704] ci(update): skip julia but for real

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 6c8895652..d81427567 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot julia"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot,julia"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 4b9a83f6017ee5edea85722cbfda1b3058a82e69 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 09:02:11 +0000
Subject: [PATCH 1938/2704] bot(lockfile): update gitattributes, nix, nu,
 printf, properties, tcl

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 73a36e945..ea119fc2b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -231,7 +231,7 @@
     "revision": "bff4b66b44b020d918d67e2828eada1974a966aa"
   },
   "gitattributes": {
-    "revision": "41940e199ba5763abea1d21b4f717014b45f01ea"
+    "revision": "5425944fd61bf2b3bad2c17c2dc9f53172b0f01d"
   },
   "gitcommit": {
     "revision": "db0e0c4fb9095fdc42a7af34019c0616c071e9eb"
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "1b26cb63284287344bc3820804cea18419b3edec"
+    "revision": "4cb8ccf74f44cf9d648d02298de6e9ba515d7c56"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "082a7c7df7db460da6b280c9f902bf2b19a2f423"
+    "revision": "2142e883c5edfd7fc99b6d933a3d80ea84ac278f"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -564,7 +564,7 @@
     "revision": "ebe2ab2f642eda2072c68c8de02e83973c26f33c"
   },
   "printf": {
-    "revision": "94b84fbc4768a7cbdeadfe5e489a45a6a8af400e"
+    "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"
   },
   "prisma": {
     "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
@@ -579,7 +579,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "9d09f5f200c356c50c4103d36441309fd61b48d1"
+    "revision": "f93f673990deffbfa548826eebade93af81887b4"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
@@ -771,7 +771,7 @@
     "revision": "83e264928fa194b7283428527259e88e54205264"
   },
   "tcl": {
-    "revision": "cdba4ab96a9896492d0d5219b70300c8783ca4e7"
+    "revision": "98015ebe182d94e5a4439e32ffd91beaac32fcb9"
   },
   "teal": {
     "revision": "485fbdc00d811b01b2090dff4d0469fd1d0350f5"

From 7c5a4632c4cfcb513e9ff20815a7781c464fb9d0 Mon Sep 17 00:00:00 2001
From: David Lysenko <InfiniteRain@users.noreply.github.com>
Date: Wed, 6 Nov 2024 18:09:38 +0100
Subject: [PATCH 1939/2704] feat(runescript): add parser and queries (#7305)

---
 lockfile.json                     |   3 +
 lua/nvim-treesitter/parsers.lua   |   9 +++
 queries/runescript/highlights.scm | 119 ++++++++++++++++++++++++++++++
 queries/runescript/injections.scm |   2 +
 4 files changed, 133 insertions(+)
 create mode 100644 queries/runescript/highlights.scm
 create mode 100644 queries/runescript/injections.scm

diff --git a/lockfile.json b/lockfile.json
index ea119fc2b..b65793c5c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -671,6 +671,9 @@
   "ruby": {
     "revision": "557ec01403bd1fcfea50f1805641ca773cbaaa42"
   },
+  "runescript": {
+    "revision": "e0568a271a1901b8ef87367bbf282b5c639cd742"
+  },
   "rust": {
     "revision": "2ace7a922a755960f44d73a7bb1efffeb4cc5501"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a0ed0b427..871cd4458 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -21,6 +21,7 @@ for ft, lang in pairs {
   mysql = "sql",
   sbt = "scala",
   neomuttrc = "muttrc",
+  clientscript = "runescript",
   --- short-hand list from https://github.com/helix-editor/helix/blob/master/languages.toml
   rs = "rust",
   ex = "elixir",
@@ -1948,6 +1949,14 @@ list.ruby = {
   maintainers = { "@TravonteD" },
 }
 
+list.runescript = {
+  install_info = {
+    url = "https://github.com/2004Scape/tree-sitter-runescript",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@2004Scape" },
+}
+
 list.rust = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-rust",
diff --git a/queries/runescript/highlights.scm b/queries/runescript/highlights.scm
new file mode 100644
index 000000000..d0c9432bd
--- /dev/null
+++ b/queries/runescript/highlights.scm
@@ -0,0 +1,119 @@
+; Variables
+(identifier) @variable
+
+(local_variable
+  "$" @attribute.builtin)
+
+(game_variable
+  [
+    "%"
+    ".%"
+  ] @attribute.builtin)
+
+(constant_variable
+  "^" @attribute.builtin)
+
+(parameter
+  (local_variable
+    name: (identifier) @variable.parameter))
+
+; Scripts
+(script
+  trigger: (identifier) @keyword.directive
+  subject: (identifier) @function)
+
+; Calls
+(call
+  [
+    "~"
+    "@"
+  ]? @attribute.builtin
+  callee: (identifier) @function.call)
+
+; Literals
+((literal) @boolean
+  (#any-of? @boolean "true" "false"))
+
+(literal
+  "null" @constant.builtin)
+
+(integer_literal) @number
+
+(coord_literal) @string.special
+
+(comment) @comment @spell
+
+[
+  (string_fragment)
+  "\""
+] @string
+
+(escape_sequence) @string.escape
+
+(string_interpolation
+  [
+    "<"
+    ">"
+  ] @punctuation.special)
+
+(string_tag) @punctuation.special
+
+; Types
+(type) @type
+
+(parameter_type) @type
+
+; Tokens
+[
+  ";"
+  ":"
+  ","
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "["
+  "]"
+] @punctuation.special
+
+[
+  "*"
+  "/"
+  "+"
+  "-"
+  "&"
+  "|"
+  ">"
+  ">="
+  "<"
+  "<="
+  "="
+  "!"
+] @operator
+
+(arithmetic
+  "%" @operator)
+
+[
+  (def_type_keyword)
+  (switch_type_keyword)
+] @keyword.modifier
+
+"return" @keyword.return
+
+"while" @keyword.repeat
+
+[
+  "default"
+  "if"
+  "else"
+  "case"
+] @keyword.conditional
+
+"calc" @keyword
diff --git a/queries/runescript/injections.scm b/queries/runescript/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/runescript/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From b5cda6d731c949ce67812d80114f93253537faaf Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 17:09:57 +0000
Subject: [PATCH 1940/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bd3b030d2..8719b2c74 100644
--- a/README.md
+++ b/README.md
@@ -397,6 +397,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
 - [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
 - [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
+- [x] [runescript](https://github.com/2004Scape/tree-sitter-runescript) (maintained by @2004Scape)
 - [x] [rust](https://github.com/tree-sitter/tree-sitter-rust) (maintained by @amaanq)
 - [x] [scala](https://github.com/tree-sitter/tree-sitter-scala) (maintained by @stevanmilic)
 - [x] [scfg](https://github.com/rockorager/tree-sitter-scfg) (maintained by @WhyNotHugo)

From ea3a37a9758d873feec3feac37a358e4225a5871 Mon Sep 17 00:00:00 2001
From: ganhaque <ganhaque.main@gmail.com>
Date: Wed, 6 Nov 2024 12:09:14 -0600
Subject: [PATCH 1941/2704] fix(wgsl): indent call expression params (#7309)

---
 queries/wgsl/indents.scm                      |  1 +
 ...nstructor_or_function_call_expression.wgsl | 11 ++++++++++
 tests/indent/wgsl_spec.lua                    | 20 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 tests/indent/wgsl/type_constructor_or_function_call_expression.wgsl

diff --git a/queries/wgsl/indents.scm b/queries/wgsl/indents.scm
index a866bd62f..579c665bc 100644
--- a/queries/wgsl/indents.scm
+++ b/queries/wgsl/indents.scm
@@ -2,6 +2,7 @@
   (compound_statement)
   (loop_statement)
   (struct_declaration)
+  (type_constructor_or_function_call_expression)
 ] @indent.begin
 
 ((parameter_list) @indent.begin
diff --git a/tests/indent/wgsl/type_constructor_or_function_call_expression.wgsl b/tests/indent/wgsl/type_constructor_or_function_call_expression.wgsl
new file mode 100644
index 000000000..dff667e77
--- /dev/null
+++ b/tests/indent/wgsl/type_constructor_or_function_call_expression.wgsl
@@ -0,0 +1,11 @@
+fn f() {
+  let a = foo(
+    b,
+    c,
+  );
+
+  let a = Foo(
+    b,
+    c,
+  );
+}
diff --git a/tests/indent/wgsl_spec.lua b/tests/indent/wgsl_spec.lua
index e70215a7b..e1bf618f8 100644
--- a/tests/indent/wgsl_spec.lua
+++ b/tests/indent/wgsl_spec.lua
@@ -20,5 +20,25 @@ describe("indent WGSL:", function()
     run:new_line("basic.wgsl", { on_line = 52, text = "c: u32,", indent = 2 })
     run:new_line("basic.wgsl", { on_line = 56, text = "c: u32,", indent = 2 })
     run:new_line("basic.wgsl", { on_line = 59, text = "c: u32,", indent = 2 })
+    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+      on_line = 3,
+      text = "b",
+      indent = 4,
+    })
+    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+      on_line = 4,
+      text = "c",
+      indent = 4,
+    })
+    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+      on_line = 8,
+      text = "b",
+      indent = 4,
+    })
+    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+      on_line = 9,
+      text = "c",
+      indent = 4,
+    })
   end)
 end)

From 98b3825999746b4b74cd3c962e608f53b47064af Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 6 Nov 2024 23:05:20 +0100
Subject: [PATCH 1942/2704] docs(parser): mark julia as unmaintained

---
 lua/nvim-treesitter/parsers.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 871cd4458..dcc3bbba5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1149,7 +1149,6 @@ list.julia = {
     url = "https://github.com/tree-sitter/tree-sitter-julia",
     files = { "src/parser.c", "src/scanner.c" },
   },
-  maintainers = { "@theHamsta" },
 }
 
 list.just = {

From 0722f23886d7de2c702ca54a72d94d6171715cb7 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 22:05:37 +0000
Subject: [PATCH 1943/2704] bot(readme): update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8719b2c74..e67d7d6c9 100644
--- a/README.md
+++ b/README.md
@@ -302,7 +302,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [json5](https://github.com/Joakker/tree-sitter-json5) (maintained by @Joakker)
 - [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) (maintained by @WhyNotHugo)
 - [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
-- [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @theHamsta)
+- [ ] [julia](https://github.com/tree-sitter/tree-sitter-julia)
 - [x] [just](https://github.com/IndianBoy42/tree-sitter-just) (maintained by @Hubro)
 - [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
 - [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)

From c91122d2012682301df68307cfc049a57c3fd286 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 7 Nov 2024 06:44:14 +0000
Subject: [PATCH 1944/2704] bot(lockfile): update nu, runescript, superhtml,
 swift

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b65793c5c..90163b592 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "2142e883c5edfd7fc99b6d933a3d80ea84ac278f"
+    "revision": "d8b33566737f849353d08a9f8fdc86ce78d411c2"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -672,7 +672,7 @@
     "revision": "557ec01403bd1fcfea50f1805641ca773cbaaa42"
   },
   "runescript": {
-    "revision": "e0568a271a1901b8ef87367bbf282b5c639cd742"
+    "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
     "revision": "2ace7a922a755960f44d73a7bb1efffeb4cc5501"
@@ -744,7 +744,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "7d61cccdb865b2028301a0597b55ac8b225af6cf"
+    "revision": "dbb0d1fc54f8525f41289a413ea6c0722e92bf9c"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -756,7 +756,7 @@
     "revision": "03d97aad336ecc6b302f23bdd9b695ddc937160b"
   },
   "swift": {
-    "revision": "5098007f58f4663a5613b2fecb6b866e3d41e37b"
+    "revision": "042041d0ff8986f0e58818eb35770349b50e949f"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From eab2005cb5a839abb4af9961a76bbf819650a1a9 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 7 Nov 2024 11:57:45 -0800
Subject: [PATCH 1945/2704] fix(regex): more accurate highlights for named
 backreferences

Highlight both surrounding angle brackets, and only apply the operator
highlight to the actual \k operator.
---
 queries/regex/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/queries/regex/highlights.scm b/queries/regex/highlights.scm
index 2cfdf4b01..350d1d0f3 100644
--- a/queries/regex/highlights.scm
+++ b/queries/regex/highlights.scm
@@ -6,6 +6,7 @@
   "(?"
   "(?:"
   "(?<"
+  "<"
   ">"
   "["
   "]"
@@ -39,7 +40,7 @@
   "="
   "!"
   "-"
-  (backreference_escape)
+  "\\k"
   (lazy)
 ] @operator
 

From 425b58968340bd5b4621c2a0d626c73556516d3d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 06:44:55 +0000
Subject: [PATCH 1946/2704] bot(lockfile): update inko, nu, udev

---
 .github/workflows/update-lockfile.yml | 2 +-
 lockfile.json                         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index d81427567..a443ee16d 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot,julia"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot,julia,unison"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua
diff --git a/lockfile.json b/lockfile.json
index 90163b592..2685f61fc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -354,7 +354,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "6f9c072d023c3886aabcd8012274461b35d2d0a9"
+    "revision": "aecabede39b0db05678e2d4686258d4f71b00a51"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "d8b33566737f849353d08a9f8fdc86ce78d411c2"
+    "revision": "24f9e4103dd70c2a3a27b20bba9255065353f782"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -831,7 +831,7 @@
     "revision": "8b8b16ef1b40cbecbe3f754b1c1c966b5a0904fe"
   },
   "udev": {
-    "revision": "8f58696e79092b4ad6bf197415bbd0970acf15cd"
+    "revision": "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc"
   },
   "ungrammar": {
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"

From 0603b3e3d21ebe2fa82dc5361a3d500e0d3ad3a8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2024 06:42:27 +0000
Subject: [PATCH 1947/2704] bot(lockfile): update desktop, earthfile, mlir,
 nix, nu, v, xresources

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2685f61fc..4ac008388 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -111,7 +111,7 @@
     "revision": "a7496b9d562be91e6588eecd5d7045832f575cd0"
   },
   "desktop": {
-    "revision": "de93cdbd1cba965c102ce8b659d79f5759b933bd"
+    "revision": "d52964c67d98eaedabca6ed1ec21ae54a522e8f8"
   },
   "devicetree": {
     "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
@@ -141,7 +141,7 @@
     "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "earthfile": {
-    "revision": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce"
+    "revision": "91d55b1d50a6ab58a019098c060c26260425a224"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -468,7 +468,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "8cde51ac0484fdf59a90641fefb92a0e846dcc7c"
+    "revision": "bee151bcbf8bb58b5a73febd98a4625ca623e807"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "4cb8ccf74f44cf9d648d02298de6e9ba515d7c56"
+    "revision": "aa9ab8bbe68fc30c830f423d25638ff943cb89d0"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "24f9e4103dd70c2a3a27b20bba9255065353f782"
+    "revision": "caf8baffd56274db2e70077a37b8d3ccfaa46e58"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -846,7 +846,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "ea538758a1273b59774dc9179cde460d9c73fd89"
+    "revision": "6d9c64ee6527bb35650300809bfebac37693e99f"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
@@ -894,7 +894,7 @@
     "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "xresources": {
-    "revision": "d36d356624af4b46d3fc815d0701ebf72654473c"
+    "revision": "e64706be80390ebe56f743f3c091629be66d3cc5"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 8e40904e49bbad5812798eb54be8c00d77cdd301 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 10 Nov 2024 06:42:39 +0000
Subject: [PATCH 1948/2704] bot(lockfile): update bash, c_sharp, cpp,
 earthfile, editorconfig, embedded_template, go, html, java, javascript,
 jsdoc, json, nix, nu, python, regex, rust, t32

---
 lockfile.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4ac008388..df2f3f62d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
   },
   "bash": {
-    "revision": "597a5ed6ed4d932fd44697feec988f977081ae59"
+    "revision": "c7c7b38e8834d1dcb09135e01ae79825f4c77789"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -54,7 +54,7 @@
     "revision": "6c7f459ddc0bcf78b615d3a3f4e8fed87b8b3b1b"
   },
   "c_sharp": {
-    "revision": "3a85187e0a9e8db01dec6b3eb2f4e7cdfecc9d88"
+    "revision": "bb22f5b78ba9a814b9e3bce3b8374e9a7fcfbda4"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "16bf9d2c451957aee976c982c2c668b1c0d12014"
+    "revision": "ca14f24ad00af1c3d3e2e563f02b08ae967da1c8"
   },
   "css": {
     "revision": "ccc4e2c4b30ddabc4b41c577ad0550b3cac4a74a"
@@ -141,13 +141,13 @@
     "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "earthfile": {
-    "revision": "91d55b1d50a6ab58a019098c060c26260425a224"
+    "revision": "059fb087247bef8789e938629388c3e7af32c986"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "5eca41a689dc03534e9c459b066d116f8befb4ef"
+    "revision": "5e6f8e3268fc23cd6d79334c5246766e02dbd79a"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -168,7 +168,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "7e319b065c5864bac2fb68f7e14a338b919e8bb3"
+    "revision": "8719f8606e6f2ecdaa564801383caeff19084cf6"
   },
   "erlang": {
     "revision": "4095e9993acc89cb311ab1be8614c21b1cf768a4"
@@ -261,7 +261,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "df2ce2e206d2810bf010d73055055bfcff1b55aa"
+    "revision": "3e0062a534859b0c2f0ef7dc4fb6d11f8a0903c3"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -333,7 +333,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "c30792dee70aaa1910e66a39557a841b6e4386d5"
+    "revision": "c1fa688e0e215c134928cb481e21c2e9b78b8ed1"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -363,19 +363,19 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "b864ed97b9675e86de7c15a70c12e4c1ca85fbf9"
+    "revision": "bbaecd50bad60a062fef5829fcbc4dc2ac7991fd"
   },
   "javascript": {
-    "revision": "a2ef0796e8b9db9107c9ad210b3121b8ad918d5e"
+    "revision": "3a837b6f3658ca3618f2022f8707e29739c91364"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "b2237872e528b8372ed008068f717db66c16a725"
+    "revision": "64ba0cd3bcab20dcb9d798de9d8b50445159d81a"
   },
   "json": {
-    "revision": "f2503f1c437fe24560876557868ac94c9cfd3216"
+    "revision": "2f22d4a64883ba2a9cdf37988893723a98d31833"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "aa9ab8bbe68fc30c830f423d25638ff943cb89d0"
+    "revision": "715fdc7dd721f36fc301426cd49e1968c445306e"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "caf8baffd56274db2e70077a37b8d3ccfaa46e58"
+    "revision": "7e0f16f608a9e804fae61430ade734f9f849fb80"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -603,7 +603,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "7f4b9c2d8039701b0579b7c060a918f8548aa7cd"
+    "revision": "d5e1c9b8a2963cb9da3495678388343bb2f0ef3e"
   },
   "ql": {
     "revision": "1d3e2ff34f1113fadc0ff174c8a01cd4227af7fd"
@@ -639,7 +639,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "b518ad4bbee3ad59672b1826ca4dc62825983533"
+    "revision": "9b46e66cd6ad44b4fc2016b8b514c7480988fbe0"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -675,7 +675,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "2ace7a922a755960f44d73a7bb1efffeb4cc5501"
+    "revision": "48eef06e8d806413d9a617f4a3f4d3168c4e5918"
   },
   "scala": {
     "revision": "a9af6356f8e31f04e870587bca79bc2b15808ff5"
@@ -765,7 +765,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "e455373021812abf4a0b5170caa0d882a9578bab"
+    "revision": "39710952cece7f6d78ee7f99a9a1721f3bb0bbad"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"

From a069bb62a86caaa15ea68af9e6a3bcd8cbc3608d Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 10 Nov 2024 18:59:21 -0800
Subject: [PATCH 1949/2704] fix: formatter idempotency for nested groupings
 (#7345)

Currently, for something like `(((((node))))) @cap`, the formatter will
produce `((node)) @cap`, and then after another pass it will produce
`(node) @cap`. This commit makes it so that all extraneous parentheses
are removed on the first pass.
---
 scripts/format-queries.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 3e264e78b..17e445369 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -248,6 +248,7 @@ local format_queries = [[
   "(" @format.remove
   .
   [
+    (grouping)
     (anonymous_node
       name: (string) .)
     (named_node

From d105f2cb7bdd1a920dce959da45035dc121bce2d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 11 Nov 2024 08:39:00 +0100
Subject: [PATCH 1950/2704] feat(julia): update parser and queries

---
 .github/workflows/update-lockfile.yml |   2 +-
 lockfile.json                         |   2 +-
 queries/julia/highlights.scm          | 291 ++++++++++++--------------
 queries/julia/locals.scm              |  39 ++--
 4 files changed, 157 insertions(+), 177 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index a443ee16d..455269f6f 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot,julia,unison"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot,unison"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua
diff --git a/lockfile.json b/lockfile.json
index df2f3f62d..c1d4a46d7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -387,7 +387,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "19f62656dc7f2ff3756a8ef3dcf9ab1c01a9eb58"
+    "revision": "3f51e8e4d9b0c7b10d663d72064c45a883c2c998"
   },
   "just": {
     "revision": "1014d2fd6396856c312054d6c30df4d78b62966c"
diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index d67c69c3e..344431fd4 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -1,9 +1,10 @@
 ; Identifiers
 (identifier) @variable
 
-; ;; If you want type highlighting based on Julia naming conventions (this might collide with mathematical notation)
-; ((identifier) @type
-;   (match? @type "^[A-Z][^_]"))  ; exception: Highlight `A_foo` sort of identifiers as variables
+(field_expression
+  (identifier) @variable.member .)
+
+; Symbols
 (quote_expression
   ":" @string.special.symbol
   [
@@ -11,10 +12,7 @@
     (operator)
   ] @string.special.symbol)
 
-(field_expression
-  (identifier) @variable.member .)
-
-; calls
+; Function calls
 (call_expression
   (identifier) @function.call)
 
@@ -35,113 +33,66 @@
   (identifier) @function.call
   (#any-of? @_pipe "|>" ".|>"))
 
+; Macros
 (macro_identifier) @function.macro
 
-(macro_identifier
-  (identifier) @function.macro) ; for any one using the variable highlight
-
 (macro_definition
   (signature
     (call_expression
       .
       (identifier) @function.macro)))
 
-; Builtins
+; Built-in functions
+; filter(name -> Base.eval(Core, name) isa Core.Builtin, names(Core))
 ((identifier) @function.builtin
   (#any-of? @function.builtin
-    "_abstracttype" "_apply_iterate" "_apply_pure" "_call_in_world" "_call_in_world_total"
-    "_call_latest" "_equiv_typedef" "_expr" "_primitivetype" "_setsuper!" "_structtype" "_typebody!"
-    "_typevar" "applicable" "apply_type" "arrayref" "arrayset" "arraysize" "const_arrayref"
-    "donotdelete" "fieldtype" "get_binding_type" "getfield" "ifelse" "invoke" "isa" "isdefined"
-    "modifyfield!" "nfields" "replacefield!" "set_binding_type!" "setfield!" "sizeof" "svec"
-    "swapfield!" "throw" "tuple" "typeassert" "typeof"))
+    "applicable" "fieldtype" "getfield" "getglobal" "invoke" "isa" "isdefined" "modifyfield!"
+    "modifyglobal!" "nfields" "replacefield!" "replaceglobal!" "setfield!" "setfieldonce!"
+    "setglobal!" "setglobalonce!" "swapfield!" "swapglobal!" "throw" "tuple" "typeassert" "typeof"))
 
-; Types
-; Definitions
-(abstract_definition
-  name: (identifier) @type.definition) @keyword
+; Type definitions
+(type_head
+  (_) @type.definition)
 
-(primitive_definition
-  name: (identifier) @type.definition) @keyword
-
-(struct_definition
-  name: (identifier) @type)
-
-(type_clause
+; Type annotations
+(parametrized_type_expression
   [
     (identifier) @type
     (field_expression
       (identifier) @type .)
-  ])
-
-; Annotations
-(parametrized_type_expression
-  (_) @type
+  ]
   (curly_expression
     (_) @type))
 
-(type_parameter_list
-  (identifier) @type)
-
 (typed_expression
   (identifier) @type .)
 
 (unary_typed_expression
   (identifier) @type .)
 
-(where_clause
-  (identifier) @type)
+(where_expression
+  (_) @type .)
 
-(where_clause
-  (curly_expression
-    (_) @type))
+(binary_expression
+  (_) @type
+  (operator) @operator
+  (_) @type
+  (#any-of? @operator "<:" ">:"))
 
-; Builtins
-; This list was generated with:
-;
-;  istype(x) = typeof(x) === DataType || typeof(x) === UnionAll
-;  get_types(m) = filter(x -> istype(Base.eval(m, x)), names(m))
-;  type_names = sort(union(get_types(Core), get_types(Base)))
-;
+; Built-in types
+; filter(name -> typeof(Base.eval(Core, name)) in [DataType, UnionAll], names(Core))
 ((identifier) @type.builtin
   (#any-of? @type.builtin
-    "AbstractArray" "AbstractChannel" "AbstractChar" "AbstractDict" "AbstractDisplay"
-    "AbstractFloat" "AbstractIrrational" "AbstractLock" "AbstractMatch" "AbstractMatrix"
-    "AbstractPattern" "AbstractRange" "AbstractSet" "AbstractSlices" "AbstractString"
-    "AbstractUnitRange" "AbstractVecOrMat" "AbstractVector" "Any" "ArgumentError" "Array"
-    "AssertionError" "Atomic" "BigFloat" "BigInt" "BitArray" "BitMatrix" "BitSet" "BitVector" "Bool"
-    "BoundsError" "By" "CanonicalIndexError" "CapturedException" "CartesianIndex" "CartesianIndices"
-    "Cchar" "Cdouble" "Cfloat" "Channel" "Char" "Cint" "Cintmax_t" "Clong" "Clonglong" "Cmd" "Colon"
-    "ColumnSlices" "Complex" "ComplexF16" "ComplexF32" "ComplexF64" "ComposedFunction"
-    "CompositeException" "ConcurrencyViolationError" "Condition" "Cptrdiff_t" "Cshort" "Csize_t"
-    "Cssize_t" "Cstring" "Cuchar" "Cuint" "Cuintmax_t" "Culong" "Culonglong" "Cushort" "Cvoid"
-    "Cwchar_t" "Cwstring" "DataType" "DenseArray" "DenseMatrix" "DenseVecOrMat" "DenseVector" "Dict"
-    "DimensionMismatch" "Dims" "DivideError" "DomainError" "EOFError" "Enum" "ErrorException"
-    "Exception" "ExponentialBackOff" "Expr" "Float16" "Float32" "Float64" "Function" "GlobalRef"
-    "HTML" "IO" "IOBuffer" "IOContext" "IOStream" "IdDict" "IndexCartesian" "IndexLinear"
-    "IndexStyle" "InexactError" "InitError" "Int" "Int128" "Int16" "Int32" "Int64" "Int8" "Integer"
-    "InterruptException" "InvalidStateException" "Irrational" "KeyError" "LazyString" "LinRange"
-    "LineNumberNode" "LinearIndices" "LoadError" "Lt" "MIME" "Matrix" "Method" "MethodError"
-    "Missing" "MissingException" "Module" "NTuple" "NamedTuple" "Nothing" "Number" "Ordering"
-    "OrdinalRange" "OutOfMemoryError" "OverflowError" "Pair" "ParseError" "PartialQuickSort" "Perm"
-    "PermutedDimsArray" "Pipe" "ProcessFailedException" "Ptr" "QuoteNode" "Rational" "RawFD"
-    "ReadOnlyMemoryError" "Real" "ReentrantLock" "Ref" "Regex" "RegexMatch" "Returns"
-    "ReverseOrdering" "RoundingMode" "RowSlices" "SegmentationFault" "Set" "Signed" "Slices" "Some"
-    "SpinLock" "StackFrame" "StackOverflowError" "StackTrace" "Stateful" "StepRange" "StepRangeLen"
-    "StridedArray" "StridedMatrix" "StridedVecOrMat" "StridedVector" "String" "StringIndexError"
-    "SubArray" "SubString" "SubstitutionString" "Symbol" "SystemError" "Task" "TaskFailedException"
-    "Text" "TextDisplay" "Timer" "Tmstruct" "Tuple" "Type" "TypeError" "TypeVar" "UInt" "UInt128"
-    "UInt16" "UInt32" "UInt64" "UInt8" "UndefInitializer" "UndefKeywordError" "UndefRefError"
-    "UndefVarError" "Union" "UnionAll" "UnitRange" "Unsigned" "Val" "VecElement" "VecOrMat" "Vector"
-    "VersionNumber" "WeakKeyDict" "WeakRef"))
-
-((identifier) @variable.builtin
-  (#any-of? @variable.builtin "begin" "end")
-  (#has-ancestor? @variable.builtin index_expression))
-
-((identifier) @variable.builtin
-  (#any-of? @variable.builtin "begin" "end")
-  (#has-ancestor? @variable.builtin range_expression))
+    "AbstractArray" "AbstractChar" "AbstractFloat" "AbstractString" "Any" "ArgumentError" "Array"
+    "AssertionError" "Bool" "BoundsError" "Char" "ConcurrencyViolationError" "Cvoid" "DataType"
+    "DenseArray" "DivideError" "DomainError" "ErrorException" "Exception" "Expr" "Float16" "Float32"
+    "Float64" "Function" "GlobalRef" "IO" "InexactError" "InitError" "Int" "Int128" "Int16" "Int32"
+    "Int64" "Int8" "Integer" "InterruptException" "LineNumberNode" "LoadError" "Method"
+    "MethodError" "Module" "NTuple" "NamedTuple" "Nothing" "Number" "OutOfMemoryError"
+    "OverflowError" "Pair" "Ptr" "QuoteNode" "ReadOnlyMemoryError" "Real" "Ref" "SegmentationFault"
+    "Signed" "StackOverflowError" "String" "Symbol" "Task" "Tuple" "Type" "TypeError" "TypeVar"
+    "UInt" "UInt128" "UInt16" "UInt32" "UInt64" "UInt8" "UndefInitializer" "UndefKeywordError"
+    "UndefRefError" "UndefVarError" "Union" "UnionAll" "Unsigned" "VecElement" "WeakRef"))
 
 ; Keywords
 [
@@ -179,9 +130,6 @@
 (else_clause
   "else" @keyword.conditional)
 
-(if_clause
-  "if" @keyword.conditional) ; `if` clause in comprehensions
-
 (ternary_expression
   [
     "?"
@@ -194,68 +142,43 @@
     "end"
   ] @keyword.exception)
 
-(finally_clause
-  "finally" @keyword.exception)
-
 (catch_clause
   "catch" @keyword.exception)
 
+(finally_clause
+  "finally" @keyword.exception)
+
 (for_statement
   [
     "for"
     "end"
   ] @keyword.repeat)
 
+(for_binding
+  "outer" @keyword.repeat)
+
+; comprehensions
+(for_clause
+  "for" @keyword.repeat)
+
+(if_clause
+  "if" @keyword.conditional)
+
 (while_statement
   [
     "while"
     "end"
   ] @keyword.repeat)
 
-(for_clause
-  "for" @keyword.repeat)
-
-(for_binding
-  "outer" @keyword.repeat)
-
 [
   (break_statement)
   (continue_statement)
 ] @keyword.repeat
 
-(module_definition
-  [
-    "module"
-    "baremodule"
-    "end"
-  ] @keyword.import)
-
-(import_statement
-  [
-    "import"
-    "using"
-  ] @keyword.import)
-
-(import_alias
-  "as" @keyword.import)
-
-(export_statement
-  "export" @keyword.import)
-
-(selected_import
-  ":" @punctuation.delimiter)
-
-(struct_definition
-  [
-    "struct"
-    "end"
-  ] @keyword.type)
-
-(macro_definition
-  [
-    "macro"
-    "end"
-  ] @keyword)
+[
+  "const"
+  "mutable"
+] @keyword.modifier
 
 (function_definition
   [
@@ -269,20 +192,63 @@
     "end"
   ] @keyword.function)
 
+(macro_definition
+  [
+    "macro"
+    "end"
+  ] @keyword)
+
 (return_statement
   "return" @keyword.return)
 
-[
-  "const"
-  "mutable"
-] @keyword.modifier
+(module_definition
+  [
+    "module"
+    "baremodule"
+    "end"
+  ] @keyword.import)
+
+(export_statement
+  "export" @keyword.import)
+
+(public_statement
+  "public" @keyword.import)
+
+(import_statement
+  "import" @keyword.import)
+
+(using_statement
+  "using" @keyword.import)
+
+(import_alias
+  "as" @keyword.import)
+
+(selected_import
+  ":" @punctuation.delimiter)
+
+(struct_definition
+  [
+    "mutable"
+    "struct"
+    "end"
+  ] @keyword.type)
+
+(abstract_definition
+  [
+    "abstract"
+    "type"
+    "end"
+  ] @keyword.type)
+
+(primitive_definition
+  [
+    "primitive"
+    "type"
+    "end"
+  ] @keyword.type)
 
 ; Operators & Punctuation
-[
-  "="
-  "∈"
-  (operator)
-] @operator
+(operator) @operator
 
 (adjoint_expression
   "'" @operator)
@@ -290,28 +256,20 @@
 (range_expression
   ":" @operator)
 
-((operator) @keyword.operator
-  (#any-of? @keyword.operator "in" "isa"))
+(arrow_function_expression
+  "->" @operator)
 
-(for_binding
-  "in" @keyword.operator)
-
-(where_clause
-  "where" @keyword.operator)
-
-(where_expression
-  "where" @keyword.operator)
+[
+  "."
+  "..."
+] @punctuation.special
 
 [
   ","
-  "."
   ";"
   "::"
-  "->"
 ] @punctuation.delimiter
 
-"..." @punctuation.special
-
 [
   "("
   ")"
@@ -321,6 +279,21 @@
   "}"
 ] @punctuation.bracket
 
+; Keyword operators
+((operator) @keyword.operator
+  (#any-of? @keyword.operator "in" "isa"))
+
+(where_expression
+  "where" @keyword.operator)
+
+; Built-in constants
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin "nothing" "missing"))
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "begin" "end")
+  (#has-ancestor? @variable.builtin index_expression))
+
 ; Literals
 (boolean_literal) @boolean
 
@@ -331,9 +304,6 @@
 ((identifier) @number.float
   (#any-of? @number.float "NaN" "NaN16" "NaN32" "Inf" "Inf16" "Inf32"))
 
-((identifier) @constant.builtin
-  (#any-of? @constant.builtin "nothing" "missing"))
-
 (character_literal) @character
 
 (escape_sequence) @string.escape
@@ -348,15 +318,16 @@
 (prefixed_command_literal
   prefix: (identifier) @function.macro) @string.special
 
-((string_literal) @string.documentation @spell
+((string_literal) @string.documentation
   .
   [
-    (module_definition)
     (abstract_definition)
-    (struct_definition)
-    (function_definition)
     (assignment)
     (const_statement)
+    (function_definition)
+    (macro_definition)
+    (module_definition)
+    (struct_definition)
   ])
 
 [
diff --git a/queries/julia/locals.scm b/queries/julia/locals.scm
index 767239f15..500b7fe58 100644
--- a/queries/julia/locals.scm
+++ b/queries/julia/locals.scm
@@ -1,3 +1,6 @@
+; References
+(identifier) @local.reference
+
 ; Variables
 (assignment
   (identifier) @local.definition.var)
@@ -23,23 +26,31 @@
     (identifier) @local.definition.var))
 
 ; Types
-(struct_definition
-  name: (identifier) @local.definition.type)
-
-(abstract_definition
-  name: (identifier) @local.definition.type)
-
-(abstract_definition
-  name: (identifier) @local.definition.type)
-
-(type_parameter_list
+(module_definition
   (identifier) @local.definition.type)
 
+(struct_definition
+  (identifier) @local.definition.type)
+
+(type_head
+  (identifier) @local.definition.type)
+
+(type_head
+  (binary_expression
+    .
+    (identifier) @local.definition.type))
+
 ; Module imports
 (import_statement
   (identifier) @local.definition.import)
 
-; Function/macro definitions
+(using_statement
+  (identifier) @local.definition.import)
+
+(selected_import
+  (identifier) @local.definition.import)
+
+; Scopes
 (function_definition
   (signature
     (call_expression
@@ -52,15 +63,13 @@
       .
       (identifier) @local.definition.function))) @local.scope
 
-(identifier) @local.reference
-
 [
+  (quote_statement)
+  (let_statement)
   (for_statement)
   (while_statement)
   (try_statement)
   (catch_clause)
   (finally_clause)
-  (let_statement)
-  (quote_statement)
   (do_clause)
 ] @local.scope

From bb06afa3f1111780932b3c5493ad65473ce85f9d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 07:42:46 +0000
Subject: [PATCH 1951/2704] bot(lockfile): update agda, bash, c, c_sharp, cpp,
 css, editorconfig, embedded_template, foam, go, haskell, html, java,
 javascript, jsdoc, json, julia, mlir, ocaml, ocaml_interface, php, php_only,
 python, ql, query, regex, ruby, rust, scala, t32, templ, tsx, typescript,
 xresources

---
 lockfile.json | 68 +++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c1d4a46d7..b14852a74 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -3,7 +3,7 @@
     "revision": "e8e2515465cc2d7c444498e68bdb9f1d86767f95"
   },
   "agda": {
-    "revision": "6516cfec35479d62c0ad3c8e7e546a9774b489fd"
+    "revision": "b9b32fa042c2952a7bfca86847ea325e44ccc897"
   },
   "angular": {
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
@@ -27,7 +27,7 @@
     "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
   },
   "bash": {
-    "revision": "c7c7b38e8834d1dcb09135e01ae79825f4c77789"
+    "revision": "487734f87fd87118028a65a4599352fa99c9cde8"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -51,10 +51,10 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "6c7f459ddc0bcf78b615d3a3f4e8fed87b8b3b1b"
+    "revision": "e8841a6a9431b7365ac9055688429e1deb8db90f"
   },
   "c_sharp": {
-    "revision": "bb22f5b78ba9a814b9e3bce3b8374e9a7fcfbda4"
+    "revision": "362a8a41b265056592a0c3771664a21d23a71392"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -87,10 +87,10 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "ca14f24ad00af1c3d3e2e563f02b08ae967da1c8"
+    "revision": "f41e1a044c8a84ea9fa8577fdd2eab92ec96de02"
   },
   "css": {
-    "revision": "ccc4e2c4b30ddabc4b41c577ad0550b3cac4a74a"
+    "revision": "6a442a3cf461b0ce275339e5afa178693484c927"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -147,7 +147,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "5e6f8e3268fc23cd6d79334c5246766e02dbd79a"
+    "revision": "cfdc59ccdc13c324962a02e104743e0e23ca1010"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -168,7 +168,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "8719f8606e6f2ecdaa564801383caeff19084cf6"
+    "revision": "332262529bc51abf5746317b2255ccc2fff778f8"
   },
   "erlang": {
     "revision": "4095e9993acc89cb311ab1be8614c21b1cf768a4"
@@ -192,7 +192,7 @@
     "revision": "a78aef9abc395c600c38a037ac779afc7e3cc9e0"
   },
   "foam": {
-    "revision": "04664b40c0dadb7ef37028acf3422c63271d377b"
+    "revision": "f08bb76892b93e5b23c45ac3bd6b1eea5df323cc"
   },
   "forth": {
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
@@ -261,7 +261,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "3e0062a534859b0c2f0ef7dc4fb6d11f8a0903c3"
+    "revision": "5f564e3d6c85c1caa311227448a9839532013840"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -303,7 +303,7 @@
     "revision": "4af5d82cf9ec39f67cb1db5b7a9269d337406592"
   },
   "haskell": {
-    "revision": "70ea0757986ea58a0d39ddfcd9d791beadeb0f43"
+    "revision": "2c2fcb22e3b939ed59ae8d6f10500c3213c68670"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -333,7 +333,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "c1fa688e0e215c134928cb481e21c2e9b78b8ed1"
+    "revision": "5a5ca8551a179998360b4a4ca2c0f366a35acc03"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -363,19 +363,19 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "bbaecd50bad60a062fef5829fcbc4dc2ac7991fd"
+    "revision": "a1bbe92a6370bb4c15386735fbda12f2b812a923"
   },
   "javascript": {
-    "revision": "3a837b6f3658ca3618f2022f8707e29739c91364"
+    "revision": "108b2d4d17a04356a340aea809e4dd5b801eb40d"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "64ba0cd3bcab20dcb9d798de9d8b50445159d81a"
+    "revision": "b253abf68a73217b7a52c0ec254f4b6a7bb86665"
   },
   "json": {
-    "revision": "2f22d4a64883ba2a9cdf37988893723a98d31833"
+    "revision": "ee35a6ebefcef0c5c416c0d1ccec7370cfca5a24"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -387,7 +387,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "3f51e8e4d9b0c7b10d663d72064c45a883c2c998"
+    "revision": "a8e1262997d5a45520a06cbe1b86c0737d507054"
   },
   "just": {
     "revision": "1014d2fd6396856c312054d6c30df4d78b62966c"
@@ -468,7 +468,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "bee151bcbf8bb58b5a73febd98a4625ca623e807"
+    "revision": "fb9eafe8c193d71ab7fc00b8c4fb944476f5e466"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -510,10 +510,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e"
+    "revision": "26bc61c206e7820f9f804b206f7765ffc55cd039"
   },
   "ocaml_interface": {
-    "revision": "5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e"
+    "revision": "26bc61c206e7820f9f804b206f7765ffc55cd039"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -537,10 +537,10 @@
     "revision": "76ab9a52b9dd2a1758aae3da8286519d995037e9"
   },
   "php": {
-    "revision": "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b"
+    "revision": "6918e6908d78780ddd996b9fcbaa835b42782d5b"
   },
   "php_only": {
-    "revision": "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b"
+    "revision": "6918e6908d78780ddd996b9fcbaa835b42782d5b"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -603,10 +603,10 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "d5e1c9b8a2963cb9da3495678388343bb2f0ef3e"
+    "revision": "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91"
   },
   "ql": {
-    "revision": "1d3e2ff34f1113fadc0ff174c8a01cd4227af7fd"
+    "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
   },
   "qmldir": {
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
@@ -615,7 +615,7 @@
     "revision": "6d4db242185721e1f5ef21fde613ca90c743ec47"
   },
   "query": {
-    "revision": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0"
+    "revision": "a6674e279b14958625d7a530cabe06119c7a1532"
   },
   "r": {
     "revision": "2097fa502efa21349d26af0ffee55d773015e481"
@@ -639,7 +639,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "9b46e66cd6ad44b4fc2016b8b514c7480988fbe0"
+    "revision": "4470c59041416e8a2a9fa343595ca28ed91f38b8"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -669,16 +669,16 @@
     "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
   },
   "ruby": {
-    "revision": "557ec01403bd1fcfea50f1805641ca773cbaaa42"
+    "revision": "71bd32fb7607035768799732addba884a37a6210"
   },
   "runescript": {
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "48eef06e8d806413d9a617f4a3f4d3168c4e5918"
+    "revision": "32c17ce5463818032a9c252a849b910315b6e485"
   },
   "scala": {
-    "revision": "a9af6356f8e31f04e870587bca79bc2b15808ff5"
+    "revision": "28c3be045afe1e293b5ba1a74e759601e74050c3"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -765,7 +765,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "39710952cece7f6d78ee7f99a9a1721f3bb0bbad"
+    "revision": "2e2d7bbc244800def373f9424b1eb430d95c7ad7"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
@@ -780,7 +780,7 @@
     "revision": "485fbdc00d811b01b2090dff4d0469fd1d0350f5"
   },
   "templ": {
-    "revision": "1dcd7db19c047bc0327907a544df3207ba814ea4"
+    "revision": "85196e73091639eb37cb24270c48cedc8a41e32f"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -810,7 +810,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "73c4447796b251295b498227bad028d88dc1918b"
+    "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -819,7 +819,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "73c4447796b251295b498227bad028d88dc1918b"
+    "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
   },
   "typespec": {
     "revision": "0ee05546d73d8eb64635ed8125de6f35c77759fe"
@@ -894,7 +894,7 @@
     "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
   },
   "xresources": {
-    "revision": "e64706be80390ebe56f743f3c091629be66d3cc5"
+    "revision": "a75056c2e1bed83c338ff394dbb7c653db210432"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 7646c1c12a3121562aa87fd79aace48c728ac096 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 12 Nov 2024 06:44:04 +0000
Subject: [PATCH 1952/2704] bot(lockfile): update bash, cpp, go, html, idl,
 latex, sway, swift, t32, templ

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b14852a74..e42596fe0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
   },
   "bash": {
-    "revision": "487734f87fd87118028a65a4599352fa99c9cde8"
+    "revision": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -87,7 +87,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "f41e1a044c8a84ea9fa8577fdd2eab92ec96de02"
+    "revision": "f41b4f66a42100be405f96bdc4ebc4a61095d3e8"
   },
   "css": {
     "revision": "6a442a3cf461b0ce275339e5afa178693484c927"
@@ -261,7 +261,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "5f564e3d6c85c1caa311227448a9839532013840"
+    "revision": "0942d76fc517739b5d29a0e420b5e602d19c724d"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -333,7 +333,7 @@
     "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
   },
   "html": {
-    "revision": "5a5ca8551a179998360b4a4ca2c0f366a35acc03"
+    "revision": "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -348,7 +348,7 @@
     "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
   },
   "idl": {
-    "revision": "9ac6fdd7840b5c0f271fe11b4ab656634dc2074a"
+    "revision": "86ff7f19747a761dc8ba72f4045fd64aed94ba4c"
   },
   "ini": {
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
@@ -411,7 +411,7 @@
     "revision": "194c25539f435de415ee0551a5f07058833da915"
   },
   "latex": {
-    "revision": "87e4059f01bed363230dc349f794ce4cc580e862"
+    "revision": "7b06f6ed394308e7407a1703d2724128c45fc9d7"
   },
   "ledger": {
     "revision": "a2eff7fee59ee6adfc4a3646e2f41ba3b340a97d"
@@ -753,10 +753,10 @@
     "revision": "ae5199db47757f785e43a14b332118a5474de1a2"
   },
   "sway": {
-    "revision": "03d97aad336ecc6b302f23bdd9b695ddc937160b"
+    "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "042041d0ff8986f0e58818eb35770349b50e949f"
+    "revision": "6accc2f720c7ff8573f6956a34ea22f50c44d839"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -765,7 +765,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "2e2d7bbc244800def373f9424b1eb430d95c7ad7"
+    "revision": "476f0d8ab4b012d3b6f9598890217ada70f1a8ba"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
@@ -780,7 +780,7 @@
     "revision": "485fbdc00d811b01b2090dff4d0469fd1d0350f5"
   },
   "templ": {
-    "revision": "85196e73091639eb37cb24270c48cedc8a41e32f"
+    "revision": "73a558744fff7c4560f4801e14a467811f608556"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From fba111f707c2c7ad1395946f5c3b1221ebc0a35c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 06:44:03 +0000
Subject: [PATCH 1953/2704] bot(lockfile): update dtd, mlir, nix, v, vhdl, xml

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e42596fe0..e32609f29 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -138,7 +138,7 @@
     "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
-    "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
+    "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
   },
   "earthfile": {
     "revision": "059fb087247bef8789e938629388c3e7af32c986"
@@ -468,7 +468,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "fb9eafe8c193d71ab7fc00b8c4fb944476f5e466"
+    "revision": "5b8867f59954c9cae76f2aa1ac88ae513de412bd"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "715fdc7dd721f36fc301426cd49e1968c445306e"
+    "revision": "0240bbfce72d155823c3b7edec622dedd580bf02"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -846,7 +846,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "6d9c64ee6527bb35650300809bfebac37693e99f"
+    "revision": "8f1a06b488e65aeeb340d5e2ae3e703a104bd5c4"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
@@ -858,7 +858,7 @@
     "revision": "0dacb911daa9614a7c7e79a594d4cb9f478e6554"
   },
   "vhdl": {
-    "revision": "606cc728e7d55bbcecfa37b20d7313a609af1361"
+    "revision": "b4e73e0c0a09af83e10145953cfbd3652c2833dc"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"
@@ -891,7 +891,7 @@
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
-    "revision": "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"
+    "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
   },
   "xresources": {
     "revision": "a75056c2e1bed83c338ff394dbb7c653db210432"

From c5be87ad3efb69a025d06a91fd48ed2fba9b8ba1 Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Mon, 11 Nov 2024 20:01:13 +0100
Subject: [PATCH 1954/2704] refactor(unison): update to latest treesitter
 grammar

---
 .github/workflows/update-lockfile.yml |  2 +-
 lockfile.json                         |  2 +-
 queries/unison/highlights.scm         | 52 ++++++++++++++++-----------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 455269f6f..353cc7475 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot,unison"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua
diff --git a/lockfile.json b/lockfile.json
index e32609f29..811e5afc7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -837,7 +837,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "bc06e1eb100e1c0fab9bd89a9ca55d646ac80fc4"
+    "revision": "3c97db76d3cdbd002dfba493620c2d5df2fd6fa9"
   },
   "usd": {
     "revision": "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"
diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm
index 39c2393c2..5fa721046 100644
--- a/queries/unison/highlights.scm
+++ b/queries/unison/highlights.scm
@@ -12,33 +12,32 @@
 (literal_boolean) @boolean
 
 ; Keywords
+(type_kw) @keyword.type
+
 [
   (kw_forall)
-  (unique)
-  (type_kw)
   (do)
   (kw_let)
   (ability)
   (where)
 ] @keyword
 
-(kw_equals) @keyword.operator
-
 (structural) @keyword.modifier
 
 (unique) @keyword.modifier
 
 (type_constructor) @constructor
 
-(doc_block) @comment.documentation
+((doc_block) @comment.documentation @spell
+  (#set! priority 90))
 
 [
   (operator)
   (pipe)
   (arrow_symbol)
-  ">"
   (or)
-] @keyword.operator
+  (kw_equals)
+] @operator
 
 [
   "if"
@@ -53,23 +52,34 @@
 
 (pattern) @variable
 
-(constructor_or_variable_pattern) @type
-
 (use_clause) @keyword.import
 
 ; Types
 (record_field
-  name: (wordy_id) @variable
-  type: (wordy_id) @type)
+  (field_name) @variable.member
+  type: (regular_identifier) @type)
 
 (type_name) @type
 
+(type_declaration
+  (regular_identifier) @type)
+
+(ability_name
+  (path)? @module
+  (regular_identifier) @type)
+
 (ability_declaration
   (ability_name) @type
   (type_argument) @variable.parameter)
 
+(constructor
+  (constructor_name) @constructor)
+
+(constructor
+  type: (regular_identifier) @type)
+
 (effect
-  (wordy_id) @attribute) ; NOTE: an effect is a special type
+  (regular_identifier) @attribute) ; NOTE: an effect is a special type
 
 ; Namespaces
 (path) @module
@@ -79,22 +89,21 @@
 ; Terms
 (type_signature
   term_name: (path) @module
-  term_name: (wordy_id) @variable)
+  term_name: (regular_identifier) @variable)
 
 (type_signature
-  term_name: (wordy_id) @variable)
+  term_name: (regular_identifier) @variable)
 
 (term_type) @type
 
-(function_application
-  function_name: (path)
-  function_name: (wordy_id) @function)
+(term_definition
+  name: (path) @module)
 
 (term_definition
-  name: (wordy_id) @variable)
+  name: (regular_identifier) @variable)
 
 (term_definition
-  param: (wordy_id) @variable.parameter)
+  param: (regular_identifier) @variable.parameter)
 
 ; Punctuation
 [
@@ -111,5 +120,6 @@
   "]"
 ] @punctuation.bracket
 
-(test_watch_expression
-  (wordy_id) @keyword.directive)
+(watch_expression) @keyword.directive
+
+(test_watch_expression) @keyword.directive

From 88ed26a7e6c22f1c3069f45673cfb4e06691a261 Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Mon, 11 Nov 2024 20:01:27 +0100
Subject: [PATCH 1955/2704] feat(unison): add fold queries

---
 queries/unison/folds.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 queries/unison/folds.scm

diff --git a/queries/unison/folds.scm b/queries/unison/folds.scm
new file mode 100644
index 000000000..3bfc585c3
--- /dev/null
+++ b/queries/unison/folds.scm
@@ -0,0 +1,10 @@
+[
+  (fold)
+  (type_declaration)
+  (term_declaration)
+  (literal_list)
+  (exp_if)
+  (pattern)
+  (parenthesized_or_tuple_pattern)
+  (delay_block)
+] @fold

From e1e3108cd23d7f967842261bd66126b6734d8907 Mon Sep 17 00:00:00 2001
From: zetashift <rskaraya@gmail.com>
Date: Mon, 11 Nov 2024 20:01:45 +0100
Subject: [PATCH 1956/2704] feat(unison): inject markdown for doc blocks

---
 queries/unison/injections.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/unison/injections.scm b/queries/unison/injections.scm
index 2f0e58eb6..f9754504e 100644
--- a/queries/unison/injections.scm
+++ b/queries/unison/injections.scm
@@ -1,2 +1,5 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((doc_block) @injection.content
+  (#set! injection.language "markdown"))

From 6389ceb1758b8f62a15194e3b790e33268304cb8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 06:46:27 +0000
Subject: [PATCH 1957/2704] bot(lockfile): update gren, typst, v

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 811e5afc7..f7c12dd9c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -288,7 +288,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "gren": {
-    "revision": "c06e272341363c5d8e19ac34bc7c56258a37e71b"
+    "revision": "df7992dbc1e57e055ba1cbfdbe9f961750940553"
   },
   "groovy": {
     "revision": "b53a8cc1075e056b8223b86f3bb392e0d57ae101"
@@ -828,7 +828,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "8b8b16ef1b40cbecbe3f754b1c1c966b5a0904fe"
+    "revision": "26dfb4b94a99cc9d6044342b7ad0ba761da77d60"
   },
   "udev": {
     "revision": "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc"
@@ -846,7 +846,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "8f1a06b488e65aeeb340d5e2ae3e703a104bd5c4"
+    "revision": "bb0a1bd4c2a56f6b191b7d051ea3f2976c3bcb11"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From 06611c75fec573420838369fe76ac5f8bd740240 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 06:48:47 +0000
Subject: [PATCH 1958/2704] bot(lockfile): update nix, nu, r, teal

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f7c12dd9c..8b8caed37 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "0240bbfce72d155823c3b7edec622dedd580bf02"
+    "revision": "0eca4c5cb06196cca6d9e81a64cb4b73bdab1c87"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "7e0f16f608a9e804fae61430ade734f9f849fb80"
+    "revision": "86aabeeaf4d3fc544d132904ef9981a888314ec0"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -618,7 +618,7 @@
     "revision": "a6674e279b14958625d7a530cabe06119c7a1532"
   },
   "r": {
-    "revision": "2097fa502efa21349d26af0ffee55d773015e481"
+    "revision": "c094bd57652f8a08edc31d79a31222268fe798ee"
   },
   "racket": {
     "revision": "5b211bf93021d1c45f39aa96898be9f794f087e4"
@@ -777,7 +777,7 @@
     "revision": "98015ebe182d94e5a4439e32ffd91beaac32fcb9"
   },
   "teal": {
-    "revision": "485fbdc00d811b01b2090dff4d0469fd1d0350f5"
+    "revision": "a8901ac8a60a11784e73542ed7a7887e206764e5"
   },
   "templ": {
     "revision": "73a558744fff7c4560f4801e14a467811f608556"

From 13c7caf8a602488b37cdefe8543c4cfdd5947d9d Mon Sep 17 00:00:00 2001
From: Yi Ming <ofseed@foxmail.com>
Date: Fri, 15 Nov 2024 16:44:26 +0800
Subject: [PATCH 1959/2704] fix(zig): begin indent at `struct_declaration`

---
 queries/zig/indents.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/zig/indents.scm b/queries/zig/indents.scm
index 431aed5b6..751bfd7ea 100644
--- a/queries/zig/indents.scm
+++ b/queries/zig/indents.scm
@@ -1,5 +1,6 @@
 [
   (block)
+  (struct_declaration)
   (switch_expression)
   (initializer_list)
 ] @indent.begin

From 20e10ca6914f65cf1410232433fb58de70ab6b39 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 16 Nov 2024 06:43:31 +0000
Subject: [PATCH 1960/2704] bot(lockfile): update julia, sql

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8b8caed37..4e4354789 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -387,7 +387,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "a8e1262997d5a45520a06cbe1b86c0737d507054"
+    "revision": "fe553797479a8f58abc713330b640af0f569f915"
   },
   "just": {
     "revision": "1014d2fd6396856c312054d6c30df4d78b62966c"
@@ -723,7 +723,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "f551a8fa69dc9aea479b93fae34c3ea7be15f931"
+    "revision": "8048c5095fea3f585488c8315d5755f9bb54ca73"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"

From 1c0cbdef44a2cc35c6436e0866a2a5282b339ffd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 17 Nov 2024 06:44:23 +0000
Subject: [PATCH 1961/2704] bot(lockfile): update dart, julia, nu, ocaml,
 ocaml_interface, perl, sql, xresources

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4e4354789..8d7f36a38 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -108,7 +108,7 @@
     "revision": "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"
   },
   "dart": {
-    "revision": "a7496b9d562be91e6588eecd5d7045832f575cd0"
+    "revision": "e81af6ab94a728ed99c30083be72d88e6d56cf9e"
   },
   "desktop": {
     "revision": "d52964c67d98eaedabca6ed1ec21ae54a522e8f8"
@@ -387,7 +387,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "fe553797479a8f58abc713330b640af0f569f915"
+    "revision": "e01c928d11375513138a175a68485c4d53e55ea9"
   },
   "just": {
     "revision": "1014d2fd6396856c312054d6c30df4d78b62966c"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "86aabeeaf4d3fc544d132904ef9981a888314ec0"
+    "revision": "59baf26c9d19a21b18e3a4d83a3c2ced41ac0a8f"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -510,10 +510,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "26bc61c206e7820f9f804b206f7765ffc55cd039"
+    "revision": "98c2130c59ca7553b47086f91c5d22180151ad55"
   },
   "ocaml_interface": {
-    "revision": "26bc61c206e7820f9f804b206f7765ffc55cd039"
+    "revision": "98c2130c59ca7553b47086f91c5d22180151ad55"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -534,7 +534,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "76ab9a52b9dd2a1758aae3da8286519d995037e9"
+    "revision": "089c124d3c0c406cc01e0936c0b3941618a1f45d"
   },
   "php": {
     "revision": "6918e6908d78780ddd996b9fcbaa835b42782d5b"
@@ -723,7 +723,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "8048c5095fea3f585488c8315d5755f9bb54ca73"
+    "revision": "cf6e016eef607e909761d2c5170cc58b4da2bc6a"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -894,7 +894,7 @@
     "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
   },
   "xresources": {
-    "revision": "a75056c2e1bed83c338ff394dbb7c653db210432"
+    "revision": "a068b33304a122bf9bd8d5d11916ec61cde64d36"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 20b86032f005a71c0492644cc0c80347060b0f1d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 06:48:45 +0000
Subject: [PATCH 1962/2704] bot(lockfile): update editorconfig, gdscript, json,
 just, nu, pug, templ, vhdl, xresources

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8d7f36a38..5a68db46e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "cfdc59ccdc13c324962a02e104743e0e23ca1010"
+    "revision": "e47638f125a4d8256f4c45f0570c8918d3a1b237"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -219,7 +219,7 @@
     "revision": "e0723dc6136309b3d5904dad2c73ef71267428c1"
   },
   "gdscript": {
-    "revision": "1f1e782fe2600f50ae57b53876505b8282388d77"
+    "revision": "bf39f1b38a234d79940fd8866abb0b132ab51b1e"
   },
   "gdshader": {
     "revision": "ffd9f958df13cae04593781d7d2562295a872455"
@@ -375,7 +375,7 @@
     "revision": "b253abf68a73217b7a52c0ec254f4b6a7bb86665"
   },
   "json": {
-    "revision": "ee35a6ebefcef0c5c416c0d1ccec7370cfca5a24"
+    "revision": "4d770d31f732d50d3ec373865822fbe659e47c75"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -390,7 +390,7 @@
     "revision": "e01c928d11375513138a175a68485c4d53e55ea9"
   },
   "just": {
-    "revision": "1014d2fd6396856c312054d6c30df4d78b62966c"
+    "revision": "11b8c436bfcadaa22aa6299d9635685045ad97f3"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "59baf26c9d19a21b18e3a4d83a3c2ced41ac0a8f"
+    "revision": "45f9e51e5ee296dc0965a80f3d00178d985dffbd"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -591,7 +591,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "pug": {
-    "revision": "a7ff31a38908df9b9f34828d21d6ca5e12413e18"
+    "revision": "13e9195370172c86a8b88184cc358b23b677cc46"
   },
   "puppet": {
     "revision": "584522f32495d648b18a53ccb52d988e60de127d"
@@ -780,7 +780,7 @@
     "revision": "a8901ac8a60a11784e73542ed7a7887e206764e5"
   },
   "templ": {
-    "revision": "73a558744fff7c4560f4801e14a467811f608556"
+    "revision": "c926ed73e101bbdef3f54eaa05b8fa30d2676dfe"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -858,7 +858,7 @@
     "revision": "0dacb911daa9614a7c7e79a594d4cb9f478e6554"
   },
   "vhdl": {
-    "revision": "b4e73e0c0a09af83e10145953cfbd3652c2833dc"
+    "revision": "0703da905ba3b7331f4431790951bd347539e6f1"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"
@@ -894,7 +894,7 @@
     "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
   },
   "xresources": {
-    "revision": "a068b33304a122bf9bd8d5d11916ec61cde64d36"
+    "revision": "0e315b84aaf018533bbf3fb15360cf74eaa0305b"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 37427012d1c77c544356bfff0c9acc88fd3256bc Mon Sep 17 00:00:00 2001
From: PrestonKnopp <prestonknopp@gmail.com>
Date: Sun, 17 Nov 2024 15:23:02 -0800
Subject: [PATCH 1963/2704] feat(gdscript): add new export annotations

---
 queries/gdscript/highlights.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index b7670f73b..cea9093c0 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -254,12 +254,13 @@
   (identifier) @attribute)
   (#any-of? @attribute
     ; from modules/gdscript/doc_classes/@GDScript.xml
-    "export" "export_category" "export_color_no_alpha" "export_dir" "export_enum"
+    "export" "export_category" "export_color_no_alpha" "export_custom" "export_dir" "export_enum"
     "export_exp_easing" "export_file" "export_flags" "export_flags_2d_navigation"
     "export_flags_2d_physics" "export_flags_2d_render" "export_flags_3d_navigation"
     "export_flags_3d_physics" "export_flags_3d_render" "export_flags_avoidance" "export_global_dir"
     "export_global_file" "export_group" "export_multiline" "export_node_path" "export_placeholder"
-    "export_range" "export_subgroup" "icon" "onready" "rpc" "static_unload" "tool" "warning_ignore"))
+    "export_range" "export_storage" "export_subgroup" "icon" "onready" "rpc" "static_unload" "tool"
+    "warning_ignore"))
 
 ; Builtin Types
 ((identifier) @type.builtin

From c50981479e4271ec87c5a15ec991472bdec4f1b8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 06:45:59 +0000
Subject: [PATCH 1964/2704] bot(lockfile): update desktop, editorconfig, just,
 nu, v, xresources

---
 lockfile.json             | 12 ++++++------
 queries/nu/highlights.scm | 12 ++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5a68db46e..990d56893 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -111,7 +111,7 @@
     "revision": "e81af6ab94a728ed99c30083be72d88e6d56cf9e"
   },
   "desktop": {
-    "revision": "d52964c67d98eaedabca6ed1ec21ae54a522e8f8"
+    "revision": "54133af61b2a9a75fd42c49ce0c771115f81f50b"
   },
   "devicetree": {
     "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
@@ -147,7 +147,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "e47638f125a4d8256f4c45f0570c8918d3a1b237"
+    "revision": "511d5f387426ba555d7fb33e726ab6770f477a49"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -390,7 +390,7 @@
     "revision": "e01c928d11375513138a175a68485c4d53e55ea9"
   },
   "just": {
-    "revision": "11b8c436bfcadaa22aa6299d9635685045ad97f3"
+    "revision": "ca17d4fdd920254219c769c5ecbde1118956dcc7"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "45f9e51e5ee296dc0965a80f3d00178d985dffbd"
+    "revision": "e8bdcb9d4d57d999ad6d7c797f9f1808623df1b9"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -846,7 +846,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "bb0a1bd4c2a56f6b191b7d051ea3f2976c3bcb11"
+    "revision": "bbba20d654a764c2d2de272fd5f45a2433870640"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
@@ -894,7 +894,7 @@
     "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
   },
   "xresources": {
-    "revision": "0e315b84aaf018533bbf3fb15360cf74eaa0305b"
+    "revision": "2fb18b8ca7d3717a0475f35c5c7e8142a82f3200"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"
diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
index 3d30d4c29..62ab3bd0a 100644
--- a/queries/nu/highlights.scm
+++ b/queries/nu/highlights.scm
@@ -200,13 +200,13 @@ file_path: (val_string) @variable.parameter
 (long_flag
   "--" @punctuation.delimiter)
 
-(long_flag_equals_value
-  "--" @punctuation.delimiter)
+(long_flag
+  "=" @punctuation.delimiter)
 
 (short_flag
   "-" @punctuation.delimiter)
 
-(long_flag_equals_value
+(short_flag
   "=" @punctuation.delimiter)
 
 (param_short_flag
@@ -234,6 +234,9 @@ file_path: (val_string) @variable.parameter
   "}"
   "["
   "]"
+  "...["
+  "...("
+  "...{"
 ] @punctuation.bracket
 
 (parameter_pipes
@@ -313,7 +316,8 @@ key: (identifier) @property
   (identifier) @variable)
 
 (val_variable
-  "$" @punctuation.special
+  "$"? @punctuation.special
+  "...$"? @punctuation.special
   [
     (identifier) @variable
     "in" @variable.parameter.builtin

From a3a732107f8b529f97bf4921b3e1af5dcc756bb6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 06:45:50 +0000
Subject: [PATCH 1965/2704] bot(lockfile): update arduino, just, ledger, mlir,
 nu, php, php_only, r, sql

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 990d56893..079ca8339 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -12,7 +12,7 @@
     "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
   },
   "arduino": {
-    "revision": "415ebc8f75eb02a748faa03f5af199f08ced120f"
+    "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
   },
   "asm": {
     "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
@@ -390,7 +390,7 @@
     "revision": "e01c928d11375513138a175a68485c4d53e55ea9"
   },
   "just": {
-    "revision": "ca17d4fdd920254219c769c5ecbde1118956dcc7"
+    "revision": "f6d29300f9fee15dcd8c2b25ab762001d38da731"
   },
   "kconfig": {
     "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
@@ -414,7 +414,7 @@
     "revision": "7b06f6ed394308e7407a1703d2724128c45fc9d7"
   },
   "ledger": {
-    "revision": "a2eff7fee59ee6adfc4a3646e2f41ba3b340a97d"
+    "revision": "f00dcc4039082d1c253c81f23f9242bb143d41e6"
   },
   "leo": {
     "revision": "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"
@@ -468,7 +468,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "5b8867f59954c9cae76f2aa1ac88ae513de412bd"
+    "revision": "3362ba5caab4de11f42b4a736a0e2bcdc9343480"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "e8bdcb9d4d57d999ad6d7c797f9f1808623df1b9"
+    "revision": "f7b3d2870da1c04e796aa8116f7ce3f83c52b54c"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -537,10 +537,10 @@
     "revision": "089c124d3c0c406cc01e0936c0b3941618a1f45d"
   },
   "php": {
-    "revision": "6918e6908d78780ddd996b9fcbaa835b42782d5b"
+    "revision": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"
   },
   "php_only": {
-    "revision": "6918e6908d78780ddd996b9fcbaa835b42782d5b"
+    "revision": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -618,7 +618,7 @@
     "revision": "a6674e279b14958625d7a530cabe06119c7a1532"
   },
   "r": {
-    "revision": "c094bd57652f8a08edc31d79a31222268fe798ee"
+    "revision": "4a89de35a9e81af0a33a4a02d17554e42ad3c609"
   },
   "racket": {
     "revision": "5b211bf93021d1c45f39aa96898be9f794f087e4"
@@ -723,7 +723,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "cf6e016eef607e909761d2c5170cc58b4da2bc6a"
+    "revision": "5c2329e593fbb74ddb481597837a358e68492ba0"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"

From 14f5b15ef9caca6f3487ae35c4690bc81f02073b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 06:47:34 +0000
Subject: [PATCH 1966/2704] bot(lockfile): update ledger, nu, robot

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 079ca8339..e50995032 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -414,7 +414,7 @@
     "revision": "7b06f6ed394308e7407a1703d2724128c45fc9d7"
   },
   "ledger": {
-    "revision": "f00dcc4039082d1c253c81f23f9242bb143d41e6"
+    "revision": "19699bd9fe0bacf90d464747aab9b6179fc7b1c0"
   },
   "leo": {
     "revision": "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "f7b3d2870da1c04e796aa8116f7ce3f83c52b54c"
+    "revision": "28eba5e41f57e621d63c2d74c90f942190cb5e4d"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -654,7 +654,7 @@
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
   },
   "robot": {
-    "revision": "322e4cc65754d2b3fdef4f2f8a71e0762e3d13af"
+    "revision": "db697cee6ea87ddaf5aa940b0688d8c7f93cd425"
   },
   "robots": {
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"

From cd2acc803b9e2f9377fb31fbeb993f6e363466f5 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Wed, 20 Nov 2024 19:21:57 -0800
Subject: [PATCH 1967/2704] feat(vim): highlight prepend operator

---
 queries/vim/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/vim/highlights.scm b/queries/vim/highlights.scm
index 14e5a8128..df7b3cf48 100644
--- a/queries/vim/highlights.scm
+++ b/queries/vim/highlights.scm
@@ -287,6 +287,7 @@
   "=~"
   "!~"
   "="
+  "^="
   "+="
   "-="
   "*="

From fb12c7f8a385b1b695bdb17dcd5832ccb416d4c3 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Wed, 20 Nov 2024 17:40:25 -0800
Subject: [PATCH 1968/2704] feat(bash): highlight redirections

---
 queries/bash/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 5f6b00825..58d57d9e5 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -194,7 +194,10 @@
   (#lua-match? @number "^[0-9]+$"))
 
 (file_redirect
-  destination: (word) @variable.parameter)
+  (word) @string.special.path)
+
+(herestring_redirect
+  (word) @string)
 
 (file_descriptor) @operator
 

From 8a74ac9aead72ef7a870908f1517b48f2bb25ac7 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 28 Oct 2024 23:45:33 -0700
Subject: [PATCH 1969/2704] feat(python): highlight modules

---
 queries/python/highlights.scm                 | 21 ++++++++++++++++++-
 .../query/highlights/python/future_import.py  |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 2363dc323..77edc7960 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -310,7 +310,7 @@
 
 (future_import_statement
   "from" @keyword.import
-  "__future__" @constant.builtin)
+  "__future__" @module.builtin)
 
 (import_from_statement
   "from" @keyword.import)
@@ -323,6 +323,25 @@
 (wildcard_import
   "*" @character.special)
 
+(import_statement
+  name: (dotted_name
+    (identifier) @module))
+
+(import_statement
+  name: (aliased_import
+    name: (dotted_name
+      (identifier) @module)
+    alias: (identifier) @module))
+
+(import_from_statement
+  module_name: (dotted_name
+    (identifier) @module))
+
+(import_from_statement
+  module_name: (relative_import
+    (dotted_name
+      (identifier) @module)))
+
 [
   "if"
   "elif"
diff --git a/tests/query/highlights/python/future_import.py b/tests/query/highlights/python/future_import.py
index 6790b9b6b..065eabfe4 100644
--- a/tests/query/highlights/python/future_import.py
+++ b/tests/query/highlights/python/future_import.py
@@ -1,4 +1,4 @@
 from __future__ import print_function
 # ^ @keyword.import
-#     ^ @constant.builtin
+#     ^ @module.builtin
 #                  ^ @keyword.import

From 1249b4cfce166f26fe52e46ed36bda907d6bb577 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 21 Nov 2024 17:00:11 -0800
Subject: [PATCH 1970/2704] fix(jsdoc): only highlight slashes in paths (#7387)

Otherwise the final slash in a doc comment `*/` will also be
highlighted.
---
 queries/jsdoc/highlights.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/queries/jsdoc/highlights.scm b/queries/jsdoc/highlights.scm
index 08953a062..6df73318d 100644
--- a/queries/jsdoc/highlights.scm
+++ b/queries/jsdoc/highlights.scm
@@ -11,12 +11,14 @@
 
 [
   ":"
-  "/"
   "."
   "#"
   "~"
 ] @punctuation.delimiter
 
+(path_expression
+  "/" @punctuation.delimiter)
+
 (identifier) @variable @nospell
 
 (tag

From eff88f4e8b71d92bdcaeca6e4f7e1e146b263614 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 06:46:42 +0000
Subject: [PATCH 1971/2704] bot(lockfile): update nu, perl, robot, scala, sql,
 teal

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e50995032..795e602d5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "28eba5e41f57e621d63c2d74c90f942190cb5e4d"
+    "revision": "fa2f2d0ce15998e70bed3546e55cefa5ac4fb4df"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -534,7 +534,7 @@
     "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
   },
   "perl": {
-    "revision": "089c124d3c0c406cc01e0936c0b3941618a1f45d"
+    "revision": "71206326a8bcbdc2032f852bab8698e315bf5910"
   },
   "php": {
     "revision": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"
@@ -654,7 +654,7 @@
     "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
   },
   "robot": {
-    "revision": "db697cee6ea87ddaf5aa940b0688d8c7f93cd425"
+    "revision": "17c2300e91fc9da4ba14c16558bf4292941dc074"
   },
   "robots": {
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
@@ -678,7 +678,7 @@
     "revision": "32c17ce5463818032a9c252a849b910315b6e485"
   },
   "scala": {
-    "revision": "28c3be045afe1e293b5ba1a74e759601e74050c3"
+    "revision": "c33925aa8aabaa5b61f1db860b2628c41ce84684"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -723,7 +723,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "5c2329e593fbb74ddb481597837a358e68492ba0"
+    "revision": "3d516e6ae778bd41f9d5178823798ff6af96da60"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -777,7 +777,7 @@
     "revision": "98015ebe182d94e5a4439e32ffd91beaac32fcb9"
   },
   "teal": {
-    "revision": "a8901ac8a60a11784e73542ed7a7887e206764e5"
+    "revision": "635e61625949a0711f63b52cfaaac1c75769885c"
   },
   "templ": {
     "revision": "c926ed73e101bbdef3f54eaa05b8fa30d2676dfe"

From 2d5c122af9c3c842d74a137446dae8ff349206ac Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 2 Nov 2024 19:55:35 -0700
Subject: [PATCH 1972/2704] feat(http): more comprehensive highlights

---
 queries/http/highlights.scm                 | 16 ++++++++--
 tests/query/highlights/http/test.http       | 33 +++++++++++++++++++++
 tests/query/injections/http/injections.http | 21 +++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 tests/query/highlights/http/test.http
 create mode 100644 tests/query/injections/http/injections.http

diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
index 76d62778c..1ac243729 100644
--- a/queries/http/highlights.scm
+++ b/queries/http/highlights.scm
@@ -5,9 +5,17 @@
 (header
   name: (_) @constant)
 
+(header
+  value: (_) @string)
+
 ; Variables
+(identifier) @variable
+
 (variable_declaration
-  name: (identifier) @variable)
+  "@" @character.special)
+
+(variable_declaration
+  (value) @string)
 
 ; Operators
 (comment
@@ -25,7 +33,7 @@
 (request
   url: (_) @string.special.url)
 
-(http_version) @constant
+(http_version) @string.special
 
 ; Response
 (status_code) @number
@@ -36,8 +44,12 @@
 [
   "{{"
   "}}"
+  "{%"
+  "%}"
 ] @punctuation.bracket
 
+">" @punctuation.special
+
 (header
   ":" @punctuation.delimiter)
 
diff --git a/tests/query/highlights/http/test.http b/tests/query/highlights/http/test.http
new file mode 100644
index 000000000..00fca50ab
--- /dev/null
+++ b/tests/query/highlights/http/test.http
@@ -0,0 +1,33 @@
+@ENDPOINT=http://localhost:8080/api
+# <- @character.special
+# ^^^^^^^ @variable
+#        ^ @operator
+#         ^^^^^^^^^^^^^^^^^^^^^^^^^ @string
+
+### GET USERS
+GET {{ENDPOINT}}/users HTTP/1.1
+#   ^^ @punctuation.bracket
+#     ^^^^^^^^ @variable
+#             ^^ @punctuation.bracket
+#               ^^^^^^ @string.special.url
+#                      ^^^^^^^^ @string.special
+
+### GET USERS by Offset
+GET {{ENDPOINT}}/users?offset=30 HTTP/1.1
+# <- @function.method
+
+### POST login
+POST {{ENDPOINT}}/auth/login HTTP/1.1
+Content-Type: application/json
+
+{
+  "username": "admin",
+  "password": "password"
+}
+
+### Log Out
+POST {{ENDPOINT}}/auth/logout HTTP/1.1
+Content-Type: application/json
+# ^^^^^^^^^^ @constant
+#           ^ @punctuation.delimiter
+# vim: ft=http
diff --git a/tests/query/injections/http/injections.http b/tests/query/injections/http/injections.http
new file mode 100644
index 000000000..0f339cb6f
--- /dev/null
+++ b/tests/query/injections/http/injections.http
@@ -0,0 +1,21 @@
+### post-request script
+GET https://jsonplaceholder.typicode.com/posts/3
+
+# @lang=lua
+> {%
+local body = vim.json.decode(response.body)
+client.global.set("postId", body.id)
+-- ^ @lua
+%}
+
+
+### run request with variable
+
+GET https://jsonplaceholder.typicode.com/posts/{{postId}}
+
+> {%
+  client.global.set("auth_token", response.body.jwt);
+  // ^ @javascript
+%}
+
+### vim: ft=http

From 2d816bb49e3c9c919b5113f6fb3cfe13e589652d Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Fri, 22 Nov 2024 13:09:12 +0100
Subject: [PATCH 1973/2704] fix(julia): fix injection queries

This patch fixes the julia `(string_literal)` injection queries after
the breaking changes in
https://github.com/tree-sitter/tree-sitter-julia/pull/153. The queries
are simplified by the fact that string content is now directly available
as a separate `(content)` child node.
---
 queries/julia/injections.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 2ed0eb4c9..3a1188380 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -1,5 +1,6 @@
 ; Inject markdown in docstrings
-((string_literal) @injection.content
+((string_literal
+  (content) @injection.content)
   .
   [
     (module_definition)
@@ -10,9 +11,7 @@
     (assignment)
     (const_statement)
   ]
-  (#lua-match? @injection.content "^\"\"\"")
-  (#set! injection.language "markdown")
-  (#offset! @injection.content 0 3 0 -3))
+  (#set! injection.language "markdown"))
 
 ; Inject comments
 ([
@@ -21,20 +20,21 @@
 ] @injection.content
   (#set! injection.language "comment"))
 
-; Inject regex in r"hello\bworld"
-((prefixed_string_literal
-  prefix: (identifier) @_prefix) @injection.content
+; Inject regex in r"..." and r"""...""" (e.g. r"hello\bworld")
+(prefixed_string_literal
+  prefix: (identifier) @_prefix
+  (content) @injection.content
   (#eq? @_prefix "r")
-  (#set! injection.language "regex")
-  (#offset! @injection.content 0 2 0 -1))
+  (#set! injection.language "regex"))
 
-; Inject markdown in md"**Bold** and _Italics_"
-((prefixed_string_literal
-  prefix: (identifier) @_prefix) @injection.content
+; Inject markdown in md"..." and md"""...""" (e.g. md"**Bold** and _Italics_")
+(prefixed_string_literal
+  prefix: (identifier) @_prefix
+  (content) @injection.content
   (#eq? @_prefix "md")
-  (#set! injection.language "markdown")
-  (#offset! @injection.content 0 3 0 -1))
+  (#set! injection.language "markdown"))
 
-; Inject bash in `git add --help`
-((command_literal) @injection.content
+; Inject bash in `...` and ```...``` (e.g. `git add --help`)
+(command_literal
+  (content) @injection.content
   (#set! injection.language "bash"))

From fcd2a5fea91deac818f26a6412a624798af45033 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Fri, 22 Nov 2024 13:54:32 +0100
Subject: [PATCH 1974/2704] fix(julia): capture docstrings in more cases

This patch enables `@string.documentation` capturing, and markdown
injection, for strings attached to `(call_expression)` and
`(identifier)` nodes. For example

```julia
"docs"
foo(::Int, ::Float64)

"docs"
bar
```
---
 queries/julia/highlights.scm | 2 ++
 queries/julia/injections.scm | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 344431fd4..9c9367f00 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -328,6 +328,8 @@
     (macro_definition)
     (module_definition)
     (struct_definition)
+    (call_expression)
+    (identifier)
   ])
 
 [
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 3a1188380..72d181066 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -10,6 +10,8 @@
     (macro_definition)
     (assignment)
     (const_statement)
+    (call_expression)
+    (identifier)
   ]
   (#set! injection.language "markdown"))
 

From 731fbe9ac3c05c8c29598f98c76fc057fdd54c47 Mon Sep 17 00:00:00 2001
From: Tomas Sandven <tomas@sandven.email>
Date: Thu, 21 Nov 2024 10:44:40 +0100
Subject: [PATCH 1975/2704] feat(robot): highlight query improvements

- Highlight "ELSE" in inline_if_statement
- Use @string.documentation for "Documentation" settings
- Add `@spell` capture to "Documentation" settings
---
 queries/robot/highlights.scm | 50 ++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/queries/robot/highlights.scm b/queries/robot/highlights.scm
index b9db02468..a9c545b8a 100644
--- a/queries/robot/highlights.scm
+++ b/queries/robot/highlights.scm
@@ -65,6 +65,10 @@
   (else_statement
     "ELSE" @keyword.conditional))
 
+(inline_if_statement
+  (inline_else_statement
+    "ELSE" @keyword.conditional))
+
 [
   "TRY"
   "EXCEPT"
@@ -77,3 +81,49 @@
 (try_statement
   (else_statement
     "ELSE" @keyword.exception))
+
+; Extra captures for "Documentation" settings
+(setting_statement
+  name: (setting_name) @_name
+  (arguments
+    (argument
+      (text_chunk) @spell @string.documentation))
+  (#any-of? @_name "Documentation" "documentation" "DOCUMENTATION"))
+
+(setting_statement
+  name: (setting_name) @_name
+  (arguments
+    (continuation
+      (argument
+        (text_chunk) @spell @string.documentation)))
+  (#any-of? @_name "Documentation" "documentation" "DOCUMENTATION"))
+
+(keyword_setting
+  name: (keyword_setting_name) @_name
+  (arguments
+    (argument
+      (text_chunk) @spell @string.documentation))
+  (#any-of? @_name "Documentation" "documentation" "DOCUMENTATION"))
+
+(keyword_setting
+  name: (keyword_setting_name) @_name
+  (arguments
+    (continuation
+      (argument
+        (text_chunk) @spell @string.documentation)))
+  (#any-of? @_name "Documentation" "documentation" "DOCUMENTATION"))
+
+(test_case_setting
+  name: (test_case_setting_name) @_name
+  (arguments
+    (argument
+      (text_chunk) @spell @string.documentation))
+  (#any-of? @_name "Documentation" "documentation" "DOCUMENTATION"))
+
+(test_case_setting
+  name: (test_case_setting_name) @_name
+  (arguments
+    (continuation
+      (argument
+        (text_chunk) @spell @string.documentation)))
+  (#any-of? @_name "Documentation" "documentation" "DOCUMENTATION"))

From 28a5dc06a842459964203c41a7aac91a77feff20 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Fri, 22 Nov 2024 23:34:33 +0100
Subject: [PATCH 1976/2704] fix(julia): fix macro identifier highlight query

This fixes the macro identifier highlight query after the breaking
changes in https://github.com/tree-sitter/tree-sitter-julia/pull/153.
See also
https://github.com/tree-sitter/tree-sitter-julia/pull/158/commits/9f2fb3b9a8c73ef0d2ec005c97f91274b492d48d.
---
 queries/julia/highlights.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 9c9367f00..1b096c05d 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -34,7 +34,9 @@
   (#any-of? @_pipe "|>" ".|>"))
 
 ; Macros
-(macro_identifier) @function.macro
+(macro_identifier
+  "@" @function.macro
+  (identifier) @function.macro)
 
 (macro_definition
   (signature

From e05c280659b539d4cfeed11c5f9f45f784a8d4f5 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Fri, 22 Nov 2024 16:51:33 +0100
Subject: [PATCH 1977/2704] fix(julia): misc fixes to type highlighting

This patch fixes two issues related to `@type` capturing (split out from
https://github.com/nvim-treesitter/nvim-treesitter/pull/7392):

 - Capture the RHS of `<:` and `>:` as `@type` in `(unary_expression)`s
   similarly to what is already done for `(binary_expression)`s with
   these operators.
 - Capture children of `(curly_expression)`s inside of
   `(where_expression)`s as `@type` similarly how they are handled in
   `(parametrized_type_expression)`.
---
 queries/julia/highlights.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 1b096c05d..6988e69f5 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -73,7 +73,16 @@
   (identifier) @type .)
 
 (where_expression
-  (_) @type .)
+  [
+    (curly_expression
+      (_) @type)
+    (_) @type
+  ] .)
+
+(unary_expression
+  (operator) @operator
+  (_) @type
+  (#any-of? @operator "<:" ">:"))
 
 (binary_expression
   (_) @type

From 305c265bdb585dca92a1b5fd4179b4e1d47bdb23 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 23 Nov 2024 06:43:24 +0000
Subject: [PATCH 1978/2704] bot(lockfile): update fortran, nu, r

---
 lockfile.json                   | 6 +++---
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 795e602d5..79de8ea7b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "e9fbb3acbfc62b051616e53b17ab97b9823e8617"
+    "revision": "4c96c4d00b5c17b109028e8627407971085034ce"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "fa2f2d0ce15998e70bed3546e55cefa5ac4fb4df"
+    "revision": "9eedcb303de0b4e046477161fb3d2932a0146d2a"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -618,7 +618,7 @@
     "revision": "a6674e279b14958625d7a530cabe06119c7a1532"
   },
   "r": {
-    "revision": "4a89de35a9e81af0a33a4a02d17554e42ad3c609"
+    "revision": "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a"
   },
   "racket": {
     "revision": "5b211bf93021d1c45f39aa96898be9f794f087e4"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index dcc3bbba5..20f902d66 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1472,7 +1472,7 @@ list.nqc = {
 list.nu = {
   install_info = {
     url = "https://github.com/nushell/tree-sitter-nu",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@abhisheksingh0x558" },
 }

From 94853ae9327f2a19f9db161879b1cf7929e5bc42 Mon Sep 17 00:00:00 2001
From: net-solution <highconcept@pm.me>
Date: Fri, 22 Nov 2024 16:00:15 +0000
Subject: [PATCH 1979/2704] fix(astro): highlight self-closing component tags

---
 queries/astro/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/astro/highlights.scm b/queries/astro/highlights.scm
index e4baf5380..e2917ad4d 100644
--- a/queries/astro/highlights.scm
+++ b/queries/astro/highlights.scm
@@ -20,6 +20,10 @@
   (tag_name) @type)
   (#lua-match? @type "^[A-Z]"))
 
+((self_closing_tag
+  (tag_name) @type)
+  (#lua-match? @type "^[A-Z]"))
+
 ((erroneous_end_tag
   (erroneous_end_tag_name) @type)
   (#lua-match? @type "^[A-Z]"))

From 3f377c07390cd2a79de237ff00946a51d4d8c2a8 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Fri, 22 Nov 2024 16:51:33 +0100
Subject: [PATCH 1980/2704] fix(julia): treat :: as operator in type contexts

This patch captures `::` as `@operator` within
`(unary_typed_expression)` and `(typed_expression)`. These should be the
only two cases that the parser can emit when encountering `::` in the
source, but as a fallback it is still captured as `@punctuation` in all
other cases.

The reasons for capturing `::` as an operator are i) the close relation
with the other type-operators `<:` and `>:` and ii) the fact that it is
treated as an operator by the Julia parser, just like `<:` and `>:`.
---
 queries/julia/highlights.scm         | 8 ++++++++
 tests/query/highlights/julia/test.jl | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 6988e69f5..789f8190c 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -281,6 +281,14 @@
   "::"
 ] @punctuation.delimiter
 
+; Treat `::` as operator in type contexts, see
+; https://github.com/nvim-treesitter/nvim-treesitter/pull/7392
+(typed_expression
+  "::" @operator)
+
+(unary_typed_expression
+  "::" @operator)
+
 [
   "("
   ")"
diff --git a/tests/query/highlights/julia/test.jl b/tests/query/highlights/julia/test.jl
index 445efaa1f..338b7f8a1 100644
--- a/tests/query/highlights/julia/test.jl
+++ b/tests/query/highlights/julia/test.jl
@@ -2,13 +2,13 @@ function load_data(::Symbol; ::Int) :: Tuple
 # <- @keyword.function
 #        ^ @function.call
 #                 ^ @punctuation.bracket
-#                  ^^ @punctuation.delimiter
+#                  ^^ @operator
 #                    ^ @type.builtin
 #                          ^ @punctuation.delimiter
-#                            ^^ @punctuation.delimiter
+#                            ^^ @operator
 #                              ^^^ @type.builtin
 #                                 ^ @punctuation.bracket
-#                                   ^^ @punctuation.delimiter
+#                                   ^^ @operator
 #                                      ^ @type.builtin
     dataset = CIFAR10(; Tx = Float32, split = split)
 #   ^^^^^^^ @variable

From efb2e9c607cab1e4f7171493b7c6f63bd39073fc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 23 Nov 2024 11:24:39 +0100
Subject: [PATCH 1981/2704] docs(parser): add maintainer for julia

---
 README.md                       | 2 +-
 lua/nvim-treesitter/parsers.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e67d7d6c9..b13cd3f64 100644
--- a/README.md
+++ b/README.md
@@ -302,7 +302,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [json5](https://github.com/Joakker/tree-sitter-json5) (maintained by @Joakker)
 - [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) (maintained by @WhyNotHugo)
 - [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
-- [ ] [julia](https://github.com/tree-sitter/tree-sitter-julia)
+- [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @fredrikekre)
 - [x] [just](https://github.com/IndianBoy42/tree-sitter-just) (maintained by @Hubro)
 - [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
 - [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 20f902d66..24642824e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1149,6 +1149,7 @@ list.julia = {
     url = "https://github.com/tree-sitter/tree-sitter-julia",
     files = { "src/parser.c", "src/scanner.c" },
   },
+  maintainers = { "@fredrikekre" },
 }
 
 list.just = {

From b3752a311a8e0978b8d6ce486e2d681aa66e460d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 24 Nov 2024 06:43:52 +0000
Subject: [PATCH 1982/2704] bot(lockfile): update c_sharp, chatito, gpg, hoon,
 nasm, pem, poe_filter

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 79de8ea7b..678583db2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "e8841a6a9431b7365ac9055688429e1deb8db90f"
   },
   "c_sharp": {
-    "revision": "362a8a41b265056592a0c3771664a21d23a71392"
+    "revision": "ec73575c09f16b0ece864c6e036e9f424ec8e26f"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -63,7 +63,7 @@
     "revision": "7b0883c03e5edd34ef7bcf703194204299d7099f"
   },
   "chatito": {
-    "revision": "a461f20dedb43905febb12c1635bc7d2e43e96f0"
+    "revision": "b4cbe9ab7672d5106e9550d8413835395a1be362"
   },
   "clojure": {
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
@@ -282,7 +282,7 @@
     "revision": "949a8a470559543857a62102c84700d291fc984c"
   },
   "gpg": {
-    "revision": "f99323fb8f3f10b6c69db0c2f6d0a14bd7330675"
+    "revision": "63e80cfe1302da9f9c7ee8d9df295f47d7d181bf"
   },
   "graphql": {
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
@@ -330,7 +330,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"
+    "revision": "2ac017d168aca1e75b3df94dbbb6b3083f79cdfe"
   },
   "html": {
     "revision": "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468"
@@ -474,7 +474,7 @@
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
   },
   "nasm": {
-    "revision": "570f3d7be01fffc751237f4cfcf52d04e20532d1"
+    "revision": "d1b3638d017f2a8585e26dcfc66fe1df94185e30"
   },
   "nginx": {
     "revision": "281d184b8240b2b22670b8907b57b6d6842db6f3"
@@ -531,7 +531,7 @@
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
   "pem": {
-    "revision": "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"
+    "revision": "1d16b8e063fdf4385e389096c4bc4999eaaef05f"
   },
   "perl": {
     "revision": "71206326a8bcbdc2032f852bab8698e315bf5910"
@@ -555,7 +555,7 @@
     "revision": "0bf8387987c21bf2f8ed41d2575a8f22b139687f"
   },
   "poe_filter": {
-    "revision": "592476d81f95d2451f2ca107dc872224c76fecdf"
+    "revision": "908ba6accbd9cd3fdf0a208fdc186b9ca3db123c"
   },
   "pony": {
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"

From 7930b5f983c37bb07c9af27274334a7adcb3e5af Mon Sep 17 00:00:00 2001
From: zhangwwpeng <133727312+zhangwwpeng@users.noreply.github.com>
Date: Sun, 24 Nov 2024 17:44:23 +0800
Subject: [PATCH 1983/2704] fix(verilog): update queries (#7400)

1. Add "string" as a keyword
2. Fix issue where non-type.builtin fields are captured when using (data_type) as type.builtin
3. Add generate label
---
 queries/verilog/highlights.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index c8cff453f..71eb06a16 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -75,6 +75,7 @@
   "global"
   "ref"
   "initial"
+  "string"
   (unique_priority)
   (bins_keyword)
   (always_keyword)
@@ -259,10 +260,14 @@
 
 [
   (net_type)
-  (data_type)
+  (integer_vector_type)
   (time_unit)
+  (integer_atom_type)
 ] @type.builtin
 
+(data_type
+  (simple_identifier) @type.builtin)
+
 ; variable
 (list_of_variable_decl_assignments
   (variable_decl_assignment
@@ -439,6 +444,9 @@ port_name: (simple_identifier) @variable
   ]
   (simple_identifier)? @label)
 
+(generate_block
+  name: (simple_identifier) @label)
+
 ; function.call
 (method_call_body
   name: (simple_identifier) @function.call)

From d14bc4bd15a7b9b5a9e7977c6a28f2cab6c4ad4a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 06:46:48 +0000
Subject: [PATCH 1984/2704] bot(lockfile): update c_sharp, editorconfig, go,
 nu, rust, templ, xresources

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 678583db2..49f443a5a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "e8841a6a9431b7365ac9055688429e1deb8db90f"
   },
   "c_sharp": {
-    "revision": "ec73575c09f16b0ece864c6e036e9f424ec8e26f"
+    "revision": "285c993f01d9955932b45a6192055003aa70a570"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -147,7 +147,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "511d5f387426ba555d7fb33e726ab6770f477a49"
+    "revision": "5f4f84f0e79049e4526c0a1db669378092ecb256"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -261,7 +261,7 @@
     "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
   },
   "go": {
-    "revision": "0942d76fc517739b5d29a0e420b5e602d19c724d"
+    "revision": "12fe553fdaaa7449f764bc876fd777704d4fb752"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "9eedcb303de0b4e046477161fb3d2932a0146d2a"
+    "revision": "74e6037383ce3a77ed6fdb8281bbd69316c723a4"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -675,7 +675,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "32c17ce5463818032a9c252a849b910315b6e485"
+    "revision": "cad8a206f2e4194676b9699f26f6560d07130d3f"
   },
   "scala": {
     "revision": "c33925aa8aabaa5b61f1db860b2628c41ce84684"
@@ -780,7 +780,7 @@
     "revision": "635e61625949a0711f63b52cfaaac1c75769885c"
   },
   "templ": {
-    "revision": "c926ed73e101bbdef3f54eaa05b8fa30d2676dfe"
+    "revision": "dc41c080783c6305d66471672a9c9147561126e4"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -894,7 +894,7 @@
     "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
   },
   "xresources": {
-    "revision": "2fb18b8ca7d3717a0475f35c5c7e8142a82f3200"
+    "revision": "ce8129b03f03413f18f8cd989f88c05c59151bb5"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"

From 28591731d84c2fc18ddda60e1d53da24c31c4987 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 06:45:59 +0000
Subject: [PATCH 1985/2704] bot(lockfile): update gleam, scala

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 49f443a5a..e37bf134c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -240,7 +240,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "2702fe84b986e4403a071bcb112d48e3dcde0ca4"
+    "revision": "066704e4826699e754d351e3bbe12bf2e51de9d8"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
@@ -678,7 +678,7 @@
     "revision": "cad8a206f2e4194676b9699f26f6560d07130d3f"
   },
   "scala": {
-    "revision": "c33925aa8aabaa5b61f1db860b2628c41ce84684"
+    "revision": "5f44942205c2364ce2ced14a40687d1e09685034"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"

From cc292c869ff7d54cf4426b2fa5bbfb319cab20ee Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 06:46:49 +0000
Subject: [PATCH 1986/2704] bot(lockfile): update t32

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index e37bf134c..e6943d787 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -765,7 +765,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "476f0d8ab4b012d3b6f9598890217ada70f1a8ba"
+    "revision": "6f8509f7d310386544fa8855f3486759f6e04c08"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"

From 8d4fdc5e47e2a4e00179e43f56221250ce365973 Mon Sep 17 00:00:00 2001
From: JoranHonig <JoranHonig@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:04:28 +0100
Subject: [PATCH 1987/2704] fix(solidity): remove spurious operators in
 highlight queries (#7412)

---
 queries/solidity/highlights.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 1f1d2fe96..453d7f710 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -267,7 +267,6 @@
   "&&"
   "||"
   ">>"
-  ">>>"
   "<<"
   "&"
   "^"
@@ -283,7 +282,6 @@
   "<="
   "=="
   "!="
-  "!=="
   ">="
   ">"
   "!"

From afa0d2a9d06fabd0e09ec7b45ee75a9ebadf7822 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 06:48:11 +0000
Subject: [PATCH 1988/2704] bot(lockfile): update solidity, sql

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e6943d787..d1275337e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -708,7 +708,7 @@
     "revision": "e909815acdbe37e69440261ebb1091ed52e1dec6"
   },
   "solidity": {
-    "revision": "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"
+    "revision": "bf268722bc6406429776f71f012e6d1a88801931"
   },
   "soql": {
     "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
@@ -723,7 +723,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "3d516e6ae778bd41f9d5178823798ff6af96da60"
+    "revision": "f58f33955ea0a3e6a0aa2ef4b90a133ebee02173"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"

From 02f8777252fe089c9ea19aa8e19745b505512655 Mon Sep 17 00:00:00 2001
From: AtomToast <reg-2@t-online.de>
Date: Thu, 28 Nov 2024 08:28:51 +0100
Subject: [PATCH 1989/2704] feat(zig): add locals queries (#7401)

---
 queries/zig/locals.scm | 95 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/queries/zig/locals.scm b/queries/zig/locals.scm
index 8b1378917..b9e63441d 100644
--- a/queries/zig/locals.scm
+++ b/queries/zig/locals.scm
@@ -1 +1,96 @@
+; Definitions
+(function_declaration
+  name: (identifier) @local.definition.function)
 
+(parameter
+  name: (identifier) @local.definition.parameter)
+
+(variable_declaration
+  (identifier) @local.definition.var)
+
+(variable_declaration
+  (identifier) @local.definition.type
+  (enum_declaration))
+
+(container_field
+  type: (identifier) @local.definition.field)
+
+(enum_declaration
+  (function_declaration
+    name: (identifier) @local.definition.method))
+
+(variable_declaration
+  (identifier) @local.definition.type
+  (struct_declaration))
+
+(struct_declaration
+  (function_declaration
+    name: (identifier) @local.definition.method))
+
+(container_field
+  name: (identifier) @local.definition.field)
+
+(variable_declaration
+  (identifier) @local.definition.type
+  (union_declaration))
+
+(union_declaration
+  (function_declaration
+    name: (identifier) @local.definition.method))
+
+(payload
+  (identifier) @local.definition.var)
+
+(block_label
+  (identifier) @local.definition)
+
+; References
+(identifier) @local.reference
+
+(parameter
+  type: (identifier) @local.reference
+  (#set! reference.kind "type"))
+
+(pointer_type
+  (identifier) @local.reference
+  (#set! reference.kind "type"))
+
+(nullable_type
+  (identifier) @local.reference
+  (#set! reference.kind "type"))
+
+(struct_initializer
+  (identifier) @local.reference
+  (#set! reference.kind "type"))
+
+(array_type
+  (_)
+  (identifier) @local.reference
+  (#set! reference.kind "type"))
+
+(slice_type
+  (identifier) @local.reference
+  (#set! reference.kind "type"))
+
+(field_expression
+  member: (identifier) @local.reference
+  (#set! reference.kind "field"))
+
+(call_expression
+  function: (field_expression
+    member: (identifier) @local.reference
+    (#set! reference.kind "function")))
+
+(break_label
+  (identifier) @local.reference)
+
+[
+  (for_statement)
+  (if_statement)
+  (while_statement)
+  (function_declaration)
+  (block)
+  (source_file)
+  (enum_declaration)
+  (struct_declaration)
+] @local.scope

From 4d035005d338e4b1eb71a175bd44974e2f64740f Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Thu, 28 Nov 2024 17:40:28 +0100
Subject: [PATCH 1990/2704] feat(inko): highlight "inline" keyword

The parser added support for the "inline" keyword in a few places. This
ensures a highlight is present for the keyword.
---
 lockfile.json               | 2 +-
 queries/inko/highlights.scm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d1275337e..763beda10 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -354,7 +354,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "aecabede39b0db05678e2d4686258d4f71b00a51"
+    "revision": "a6fb0b0bfee5dede688968fd91282da799e5aa8e"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
index 589d746ce..44db3f049 100644
--- a/queries/inko/highlights.scm
+++ b/queries/inko/highlights.scm
@@ -55,12 +55,13 @@
   "as"
   "for"
   "impl"
+  "inline"
   "let"
+  "move"
   "mut"
+  "recover"
   "ref"
   "uni"
-  "move"
-  "recover"
 ] @keyword
 
 "fn" @keyword.function

From a0a1d7bb50a8e6dc4f07485b1f01b2a888fb415d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 29 Nov 2024 06:46:56 +0000
Subject: [PATCH 1991/2704] bot(lockfile): update nu, sql, typespec

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 763beda10..93485ae4e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "74e6037383ce3a77ed6fdb8281bbd69316c723a4"
+    "revision": "7c0628f578904d918afefe62dd639b3ac457ce51"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -723,7 +723,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "f58f33955ea0a3e6a0aa2ef4b90a133ebee02173"
+    "revision": "035354ea51c835cfe8fc9abf81bb081965a42b4c"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -822,7 +822,7 @@
     "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
   },
   "typespec": {
-    "revision": "0ee05546d73d8eb64635ed8125de6f35c77759fe"
+    "revision": "0acb668f04cf12ff5a96a09ce915e0b2d6797e9b"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"

From 60b4c15e7c055295241868e2cc30d71581083ed7 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Thu, 28 Nov 2024 21:24:32 +0100
Subject: [PATCH 1992/2704] feat(julia): highlight interpolation operator

This patch adds `$` to the `@punctuation.special` capture group within
`(string_interpolation)` (e.g. `"hello $name"`) and
`(interpolation_expression)` (e.g. `:(hello $name)`) nodes.
---
 queries/julia/highlights.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 789f8190c..1d1191862 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -298,6 +298,15 @@
   "}"
 ] @punctuation.bracket
 
+; Interpolation
+(string_interpolation
+  .
+  "$" @punctuation.special)
+
+(interpolation_expression
+  .
+  "$" @punctuation.special)
+
 ; Keyword operators
 ((operator) @keyword.operator
   (#any-of? @keyword.operator "in" "isa"))

From 427a90ae70f66c2fdf2d9ad16a0f08e9697d90d9 Mon Sep 17 00:00:00 2001
From: flippette <me@flippo.cc>
Date: Fri, 29 Nov 2024 20:38:12 +0200
Subject: [PATCH 1993/2704] feat(rust): highlight "gen" and "raw" keywords
 (#7419)

---
 queries/rust/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index fa25ad6cf..bdd44a1d0 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -265,6 +265,7 @@
 [
   "async"
   "await"
+  "gen"
 ] @keyword.coroutine
 
 "try" @keyword.exception
@@ -272,6 +273,7 @@
 [
   "ref"
   "pub"
+  "raw"
   (mutable_specifier)
   "const"
   "static"

From f6f159a293876792dbd72db33c36c6fcf8d40e42 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 30 Nov 2024 06:44:09 +0000
Subject: [PATCH 1994/2704] bot(lockfile): update fortran, mlir, nix, nu,
 typespec

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 93485ae4e..7e9fa42cc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -198,7 +198,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "4c96c4d00b5c17b109028e8627407971085034ce"
+    "revision": "6f16bab7455cd2906a86679a1be83dd4f378db81"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -468,7 +468,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "3362ba5caab4de11f42b4a736a0e2bcdc9343480"
+    "revision": "72929ac13d7e1c46010114202262b7102a821293"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -492,7 +492,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "0eca4c5cb06196cca6d9e81a64cb4b73bdab1c87"
+    "revision": "21897cc3dcd15325303e46b85295b743742af6ab"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -501,7 +501,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "7c0628f578904d918afefe62dd639b3ac457ce51"
+    "revision": "41a1c570b57987386ed9a928fc214928f8ddc669"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -822,7 +822,7 @@
     "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
   },
   "typespec": {
-    "revision": "0acb668f04cf12ff5a96a09ce915e0b2d6797e9b"
+    "revision": "53d892fd975da3f81374f7732af3cd3abb6b85d9"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"

From 454354e5998edb448111574e58d5f5f2d6a940bd Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 29 Nov 2024 22:17:18 -0800
Subject: [PATCH 1995/2704] fix(nu): highlight all occurrences of "use"

---
 queries/nu/highlights.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
index 62ab3bd0a..3c663da24 100644
--- a/queries/nu/highlights.scm
+++ b/queries/nu/highlights.scm
@@ -38,7 +38,10 @@
   "error"
 ] @keyword.exception
 
-"module" @keyword.import
+[
+  "module"
+  "use"
+] @keyword.import
 
 [
   "alias"
@@ -67,7 +70,6 @@
   "new" @keyword.import)
 
 (overlay_use
-  "use" @keyword.import
   "as" @keyword)
 
 (ctrl_error

From 70d44dad700512460aa76e9299ed00e0f53f3164 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 1 Dec 2024 06:46:50 +0000
Subject: [PATCH 1996/2704] bot(lockfile): update editorconfig, swift, t32

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7e9fa42cc..6c5706b5d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -147,7 +147,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "5f4f84f0e79049e4526c0a1db669378092ecb256"
+    "revision": "a84ab6361d3df04bd1566d3b0657a4f6dc5aade4"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -756,7 +756,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "6accc2f720c7ff8573f6956a34ea22f50c44d839"
+    "revision": "ba1b982fc45a049f0e40a8c7a796d1c802be349c"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -765,7 +765,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "6f8509f7d310386544fa8855f3486759f6e04c08"
+    "revision": "f82ee0035b6553f6771d5bb51b0798602c7b54ab"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"

From 2444c8052f2edbaaa92c0131cec77a63658ccc47 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 1 Dec 2024 14:29:42 -0800
Subject: [PATCH 1997/2704] feat(gomod): punctuation, toolchain highlights

Reference file:

```gomod
module github.com/klauspost/reedsolomon

go 1.21

require github.com/klauspost/cpuid/v2 v2.2.8

require golang.org/x/sys v0.24.0 // indirect

retract (
	v1.12.2 // https://github.com/klauspost/reedsolomon/pull/283
	v1.11.6 // https://github.com/klauspost/reedsolomon/issues/240
	[v1.11.3, v1.11.5] // https://github.com/klauspost/reedsolomon/pull/238
	v1.11.2 // https://github.com/klauspost/reedsolomon/pull/229
)
```
---
 queries/gomod/highlights.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
index 29cbe6574..ff33df3ab 100644
--- a/queries/gomod/highlights.scm
+++ b/queries/gomod/highlights.scm
@@ -17,4 +17,14 @@
 [
   (version)
   (go_version)
-] @string
+  (toolchain_name)
+] @string.special
+
+[
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
+
+"," @punctuation.delimiter

From 69170c93149ddb71a22bd954514806395c430c02 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 06:48:55 +0000
Subject: [PATCH 1998/2704] bot(lockfile): update apex, editorconfig, elixir,
 ledger, markdown, markdown_inline, sflog, soql, sosl, styled, swift,
 xresources

---
 lockfile.json               | 24 ++++++++++++------------
 queries/apex/locals.scm     |  3 ---
 queries/java/highlights.scm |  3 ---
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6c5706b5d..45964dd4b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
+    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -147,7 +147,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "a84ab6361d3df04bd1566d3b0657a4f6dc5aade4"
+    "revision": "3288aa46e30e1295133bd6f303c00ac71b4f61ad"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -156,7 +156,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "53458546e3bb717beee1d15df30724c81eb41d1c"
+    "revision": "d30189581a8b2802f237884287fdb7c40f32a041"
   },
   "elm": {
     "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
@@ -414,7 +414,7 @@
     "revision": "7b06f6ed394308e7407a1703d2724128c45fc9d7"
   },
   "ledger": {
-    "revision": "19699bd9fe0bacf90d464747aab9b6179fc7b1c0"
+    "revision": "d313153eef68c557ba4538b20de2d0e92f3ef6f8"
   },
   "leo": {
     "revision": "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"
@@ -450,10 +450,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "5cdc549ab8f461aff876c5be9741027189299cec"
+    "revision": "c89a30ce556a5ea5552e816e5dc2f2c0de96237d"
   },
   "markdown_inline": {
-    "revision": "5cdc549ab8f461aff876c5be9741027189299cec"
+    "revision": "c89a30ce556a5ea5552e816e5dc2f2c0de96237d"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
@@ -690,7 +690,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
+    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -711,10 +711,10 @@
     "revision": "bf268722bc6406429776f71f012e6d1a88801931"
   },
   "soql": {
-    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
+    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
   },
   "sosl": {
-    "revision": "46d4a12e4e90b10a575b7b16ea3b6ead50322074"
+    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -738,7 +738,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "2e0e6231348d8cb0a82406490771825b8ac80422"
+    "revision": "75d3ad20818c30c49b445ca2cb35999c278b3453"
   },
   "supercollider": {
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
@@ -756,7 +756,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "ba1b982fc45a049f0e40a8c7a796d1c802be349c"
+    "revision": "247d159ea87d2653ad0e669f69b638cd476fe699"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -894,7 +894,7 @@
     "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
   },
   "xresources": {
-    "revision": "ce8129b03f03413f18f8cd989f88c05c59151bb5"
+    "revision": "1fffefe05bb7f37016f2ada74b50a29e9820b52f"
   },
   "yaml": {
     "revision": "7b03feefd36b5f155465ca736c6304aca983b267"
diff --git a/queries/apex/locals.scm b/queries/apex/locals.scm
index 2457752fa..d758f14cf 100644
--- a/queries/apex/locals.scm
+++ b/queries/apex/locals.scm
@@ -57,9 +57,6 @@
 (formal_parameter
   name: (identifier) @local.definition.parameter)
 
-(catch_formal_parameter
-  name: (identifier) @local.definition.parameter)
-
 (field_declaration
   declarator: (variable_declarator
     name: (identifier) @local.definition.field))
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index d29d12632..df9ca14d4 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -17,9 +17,6 @@
 (formal_parameter
   name: (identifier) @variable.parameter)
 
-(catch_formal_parameter
-  name: (identifier) @variable.parameter)
-
 (spread_parameter
   (variable_declarator
     name: (identifier) @variable.parameter)) ; int... foo

From b31188671d8a060022dbbeb6905019e69e310108 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2024 06:48:59 +0000
Subject: [PATCH 1999/2704] bot(lockfile): update apex, sflog, soql, sosl,
 superhtml, swift, t32, toml, vhdl

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 45964dd4b..4173e0670 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
+    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -690,7 +690,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
+    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -711,10 +711,10 @@
     "revision": "bf268722bc6406429776f71f012e6d1a88801931"
   },
   "soql": {
-    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
+    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
   },
   "sosl": {
-    "revision": "0dc9e80dfeee2330a4793eb379515dac1607b4a9"
+    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -744,7 +744,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "dbb0d1fc54f8525f41289a413ea6c0722e92bf9c"
+    "revision": "1fda813bd9dc108e962e018e6a327434767ad616"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -756,7 +756,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "247d159ea87d2653ad0e669f69b638cd476fe699"
+    "revision": "77fbac9b574105a12d08dde1ed8d6273331e7d13"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -765,7 +765,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "f82ee0035b6553f6771d5bb51b0798602c7b54ab"
+    "revision": "7c8579685e34116c61971240780b316c54be698b"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
@@ -804,7 +804,7 @@
     "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
   },
   "toml": {
-    "revision": "16a30c83ce427385b8d14939c45c137fcfca6c42"
+    "revision": "64b56832c2cffe41758f28e05c756a3a98d16f41"
   },
   "tsv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -858,7 +858,7 @@
     "revision": "0dacb911daa9614a7c7e79a594d4cb9f478e6554"
   },
   "vhdl": {
-    "revision": "0703da905ba3b7331f4431790951bd347539e6f1"
+    "revision": "c438173a3cbb92b349c994f2acf822a0f3b961a0"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"

From 3edea87978b2ee93b197513e5cdf86012d33b7fa Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 06:47:19 +0000
Subject: [PATCH 2000/2704] bot(lockfile): update dtd, inko, powershell, xml,
 yaml

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4173e0670..87462a922 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -138,7 +138,7 @@
     "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
-    "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
+    "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "earthfile": {
     "revision": "059fb087247bef8789e938629388c3e7af32c986"
@@ -354,7 +354,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "a6fb0b0bfee5dede688968fd91282da799e5aa8e"
+    "revision": "1419efb8e7e140c30632cb0a2bef84e0d48a6fc5"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
@@ -561,7 +561,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "ebe2ab2f642eda2072c68c8de02e83973c26f33c"
+    "revision": "efbefa2fcf61ddbecb0af48df4a8bde1d2cab446"
   },
   "printf": {
     "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"
@@ -891,13 +891,13 @@
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
-    "revision": "4b64dd3a03ec002258d6268d712fd93716d6ab57"
+    "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
     "revision": "1fffefe05bb7f37016f2ada74b50a29e9820b52f"
   },
   "yaml": {
-    "revision": "7b03feefd36b5f155465ca736c6304aca983b267"
+    "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"

From b0fc560c758eeaa53b099c0843f82bcd762a9235 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Wed, 4 Dec 2024 11:50:49 +0100
Subject: [PATCH 2001/2704] fix(julia): fix incorrect documentation query

This patch fixes an inprecise `@string.documentation` query introduced
in https://github.com/nvim-treesitter/nvim-treesitter/pull/7391.
Specifically, the pattern `(string_literal) . (identifier)` matches also
for example `"hello"` in

```julia
foo("hello", world)
@info "hello" world
```

To fix this, this patch limits the pattern to top-level statements.
---
 queries/julia/highlights.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 1d1191862..876fa72af 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -357,9 +357,13 @@
     (module_definition)
     (struct_definition)
     (call_expression)
-    (identifier)
   ])
 
+(source_file
+  (string_literal) @string.documentation
+  .
+  (identifier))
+
 [
   (line_comment)
   (block_comment)

From 0aaf146590f3edd1dfa64fbfa2ad1cdca65afa6f Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Tue, 3 Dec 2024 17:39:47 +0100
Subject: [PATCH 2002/2704] feat(inko): highlight the "copy" keyword

This keyword is added as part of the upcoming 0.18.0 release.
---
 queries/inko/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
index 44db3f049..a332ecebc 100644
--- a/queries/inko/highlights.scm
+++ b/queries/inko/highlights.scm
@@ -53,6 +53,7 @@
 ; Keywords
 [
   "as"
+  "copy"
   "for"
   "impl"
   "inline"

From 046b8e936142ca7d0285c807201965ae4916bf01 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2024 06:47:05 +0000
Subject: [PATCH 2003/2704] bot(lockfile): update python, starlark, teal

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 87462a922..7d480c318 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -603,7 +603,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91"
+    "revision": "1ee3e775477f913ae3a46cde7a6a512deb06052c"
   },
   "ql": {
     "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
@@ -732,7 +732,7 @@
     "revision": "dd32616275c6e9d7800c58f40c16a09ad1c7c238"
   },
   "starlark": {
-    "revision": "018d0e09d9d0f0dd6740a37682b8ee4512e8b2ac"
+    "revision": "a453dbf3ba433db0e5ec621a38a7e59d72e4dc69"
   },
   "strace": {
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
@@ -777,7 +777,7 @@
     "revision": "98015ebe182d94e5a4439e32ffd91beaac32fcb9"
   },
   "teal": {
-    "revision": "635e61625949a0711f63b52cfaaac1c75769885c"
+    "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
     "revision": "dc41c080783c6305d66471672a9c9147561126e4"

From acada1a685f5decd0f10e1672963bf3425eafa45 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Thu, 5 Dec 2024 14:47:34 +0100
Subject: [PATCH 2004/2704] fix(julia): fix incorrect documentation query

This patch fixes an inprecise `@string.documentation` query introduced
in https://github.com/nvim-treesitter/nvim-treesitter/pull/7391. The
pattern `(string_literal) . (call_expression)` matches also for example
`"hello"` in `foo("hello", bar())`. Similarly to
https://github.com/nvim-treesitter/nvim-treesitter/pull/7436, this patch
limits the pattern to top-level statements.
---
 queries/julia/highlights.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm
index 876fa72af..9a82c5d41 100644
--- a/queries/julia/highlights.scm
+++ b/queries/julia/highlights.scm
@@ -356,13 +356,15 @@
     (macro_definition)
     (module_definition)
     (struct_definition)
-    (call_expression)
   ])
 
 (source_file
   (string_literal) @string.documentation
   .
-  (identifier))
+  [
+    (identifier)
+    (call_expression)
+  ])
 
 [
   (line_comment)

From c56507f6a16d6a9bd73ab8827a49fa5533aa8fc3 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 06:47:34 +0000
Subject: [PATCH 2005/2704] bot(lockfile): update c_sharp, powershell, t32

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7d480c318..4931e3b4f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "e8841a6a9431b7365ac9055688429e1deb8db90f"
   },
   "c_sharp": {
-    "revision": "285c993f01d9955932b45a6192055003aa70a570"
+    "revision": "4bf615f8d688f50d69fc5677187dc35f22e03ad6"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -561,7 +561,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "efbefa2fcf61ddbecb0af48df4a8bde1d2cab446"
+    "revision": "7e6ccf19774a098bb3c996690c65cc1a6f439dc0"
   },
   "printf": {
     "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"
@@ -765,7 +765,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "7c8579685e34116c61971240780b316c54be698b"
+    "revision": "8b367f7ce2b2e4cbc0adea033edd94a8e2282969"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"

From be17791f867f7a8b73f8c42e17971ff664d8038d Mon Sep 17 00:00:00 2001
From: Alexandr Martirosyan
 <66405062+alexandr-martirosyan@users.noreply.github.com>
Date: Fri, 6 Dec 2024 21:41:37 +0400
Subject: [PATCH 2006/2704] feat(circom): add parser and queries

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/circom/folds.scm        |  13 +++
 queries/circom/highlights.scm   | 137 ++++++++++++++++++++++++++++++++
 queries/circom/injections.scm   |   2 +
 queries/circom/locals.scm       |  12 +++
 6 files changed, 175 insertions(+)
 create mode 100644 queries/circom/folds.scm
 create mode 100644 queries/circom/highlights.scm
 create mode 100644 queries/circom/injections.scm
 create mode 100644 queries/circom/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 4931e3b4f..05f673feb 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -65,6 +65,9 @@
   "chatito": {
     "revision": "b4cbe9ab7672d5106e9550d8413835395a1be362"
   },
+  "circom": {
+    "revision": "02150524228b1e6afef96949f2d6b7cc0aaf999e"
+  },
   "clojure": {
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 24642824e..1fe72bc89 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -249,6 +249,14 @@ list.chatito = {
   maintainers = { "@ObserverOfTime" },
 }
 
+list.circom = {
+  install_info = {
+    url = "https://github.com/Decurity/tree-sitter-circom",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@alexandr-martirosyan" },
+}
+
 list.clojure = {
   install_info = {
     url = "https://github.com/sogaiu/tree-sitter-clojure",
diff --git a/queries/circom/folds.scm b/queries/circom/folds.scm
new file mode 100644
index 000000000..47525b174
--- /dev/null
+++ b/queries/circom/folds.scm
@@ -0,0 +1,13 @@
+[
+  (template_body)
+  (block_statement)
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (function_body)
+  (call_expression)
+  (array_expression)
+  (tuple_expression)
+  (comment)
+  (include_directive)+
+] @fold
diff --git a/queries/circom/highlights.scm b/queries/circom/highlights.scm
new file mode 100644
index 000000000..c61925e7a
--- /dev/null
+++ b/queries/circom/highlights.scm
@@ -0,0 +1,137 @@
+; identifiers
+; -----------
+(identifier) @variable
+
+; Pragma
+; -----------
+[
+  "pragma"
+  "circom"
+] @keyword.directive
+
+(circom_version) @string.special
+
+; Include
+; -----------
+[
+  "public"
+  "signal"
+  "var"
+  "include"
+] @keyword.import
+
+; Literals
+; --------
+(string) @string
+
+(int_literal) @number
+
+; Definitions
+; -----------
+(function_definition
+  name: (identifier) @function)
+
+(template_definition
+  name: (identifier) @function)
+
+; Use constructor coloring for special functions
+"main" @constructor
+
+; Invocations
+(call_expression
+  .
+  (identifier) @function.call)
+
+; Function parameters
+(parameter
+  name: (identifier) @variable.parameter)
+
+; Members
+(member_expression
+  property: (property_identifier) @property)
+
+; Tokens
+; -------
+; Keywords
+[
+  "input"
+  "output"
+  "public"
+  "component"
+] @keyword
+
+[
+  "for"
+  "while"
+] @keyword.repeat
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+"return" @keyword.return
+
+[
+  "function"
+  "template"
+] @keyword.function
+
+; Punctuation
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "."
+  ","
+  ";"
+] @punctuation.delimiter
+
+; Operators
+[
+  "&&"
+  "||"
+  ">>"
+  "<<"
+  "&"
+  "^"
+  "|"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "**"
+  "<"
+  "<="
+  "="
+  "=="
+  "!="
+  "+="
+  "-="
+  ">="
+  ">"
+  "!"
+  "~"
+  "-"
+  "+"
+  "++"
+  "--"
+  "<=="
+  "==>"
+  "<--"
+  "-->"
+  "==="
+] @operator
+
+; Comments
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
diff --git a/queries/circom/injections.scm b/queries/circom/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/circom/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/circom/locals.scm b/queries/circom/locals.scm
new file mode 100644
index 000000000..4c3a75152
--- /dev/null
+++ b/queries/circom/locals.scm
@@ -0,0 +1,12 @@
+(function_definition) @local.scope
+
+(template_definition) @local.scope
+
+(main_component_definition) @local.scope
+
+(block_statement) @local.scope
+
+(parameter
+  name: (identifier) @local.definition) @local.definition
+
+(identifier) @local.reference

From 53e20aa728713af5cb4a3e0e2dcfea18975d49fc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 17:41:56 +0000
Subject: [PATCH 2007/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b13cd3f64..bc218ac75 100644
--- a/README.md
+++ b/README.md
@@ -195,6 +195,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
 - [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
+- [x] [circom](https://github.com/Decurity/tree-sitter-circom) (maintained by @alexandr-martirosyan)
 - [x] [clojure](https://github.com/sogaiu/tree-sitter-clojure) (maintained by @NoahTheDuke)
 - [x] [cmake](https://github.com/uyha/tree-sitter-cmake) (maintained by @uyha)
 - [x] [comment](https://github.com/stsewd/tree-sitter-comment) (maintained by @stsewd)

From 894cb3cebbad0535fb4e319ada5d875dbc48d8b9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 7 Dec 2024 06:45:51 +0000
Subject: [PATCH 2008/2704] bot(lockfile): update nu, t32, typespec

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 05f673feb..93440675c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "41a1c570b57987386ed9a928fc214928f8ddc669"
+    "revision": "a94fdf1df5deba1aa1a3fff23e1276333b5ab666"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -768,7 +768,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "8b367f7ce2b2e4cbc0adea033edd94a8e2282969"
+    "revision": "e9e334539a07ca044128592c41946daa68d626dd"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
@@ -825,7 +825,7 @@
     "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
   },
   "typespec": {
-    "revision": "53d892fd975da3f81374f7732af3cd3abb6b85d9"
+    "revision": "8455e6601de80c9641b6e6f54c7320573eec0300"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"

From 3b8dee4293567b0b9a87360842af14669f60dd13 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 8 Dec 2024 06:44:57 +0000
Subject: [PATCH 2009/2704] bot(lockfile): update godot_resource, templ

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 93440675c..8e2032cf2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -270,7 +270,7 @@
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
   },
   "godot_resource": {
-    "revision": "2ffb90de47417018651fc3b970e5f6b67214dc9d"
+    "revision": "74105cc46a09850ebe626b894ecc6c61a12fb999"
   },
   "gomod": {
     "revision": "3b01edce2b9ea6766ca19328d1850e456fde3103"
@@ -783,7 +783,7 @@
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
-    "revision": "dc41c080783c6305d66471672a9c9147561126e4"
+    "revision": "ebcb4f7a6abde0156f7f2bf7744592afd0ec38b0"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From 0c26a5c4bc407fdbca545ab25cf6084fd069444b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 06:48:11 +0000
Subject: [PATCH 2010/2704] bot(lockfile): update astro, swift, xresources

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8e2032cf2..2332147e2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
   },
   "astro": {
-    "revision": "4be180759ec13651f72bacee65fa477c64222a1a"
+    "revision": "6e3bad36a8c12d579e73ed4f05676141a4ccf68d"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
@@ -759,7 +759,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "77fbac9b574105a12d08dde1ed8d6273331e7d13"
+    "revision": "7ca0504e6d1a3e1e2f5fa725dafecf5e5bd2b202"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -897,7 +897,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
-    "revision": "1fffefe05bb7f37016f2ada74b50a29e9820b52f"
+    "revision": "724ce1e841f2b9097625756a67f5847ff00178db"
   },
   "yaml": {
     "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"

From c5c9f234b39b4a9ca4e82afba70d539616f7b430 Mon Sep 17 00:00:00 2001
From: phanium <91544758+phanen@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:08:02 +0800
Subject: [PATCH 2011/2704] feat(sxhkd): add bash injection for `(command)`
 (#7456)

---
 queries/sxhkdrc/injections.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/sxhkdrc/injections.scm b/queries/sxhkdrc/injections.scm
index 2f0e58eb6..d962c7a84 100644
--- a/queries/sxhkdrc/injections.scm
+++ b/queries/sxhkdrc/injections.scm
@@ -1,2 +1,5 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((command) @injection.content
+  (#set! injection.language "bash"))

From 337b503688eccb3046547661e4c738e674548fcf Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 06:47:43 +0000
Subject: [PATCH 2012/2704] bot(lockfile): update elixir, powershell

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2332147e2..81be5261c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -159,7 +159,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "d30189581a8b2802f237884287fdb7c40f32a041"
+    "revision": "02a6f7fd4be28dd94ee4dd2ca19cb777053ea74e"
   },
   "elm": {
     "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
@@ -564,7 +564,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "7e6ccf19774a098bb3c996690c65cc1a6f439dc0"
+    "revision": "b3fe65637fca35e426dc8c889d86c8724aaa73d5"
   },
   "printf": {
     "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"

From 5874cac1b76c97ebb3fc03225bd7215d4e671cd2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 06:48:36 +0000
Subject: [PATCH 2013/2704] bot(lockfile): update hoon, markdown,
 markdown_inline, nu, roc, typespec

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 81be5261c..8fc168361 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -333,7 +333,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "2ac017d168aca1e75b3df94dbbb6b3083f79cdfe"
+    "revision": "16d4a5fd4a52069fcc6491f0ec6a5bad21f1d705"
   },
   "html": {
     "revision": "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468"
@@ -453,10 +453,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "c89a30ce556a5ea5552e816e5dc2f2c0de96237d"
+    "revision": "192407ab5a24bfc24f13332979b5e7967518754a"
   },
   "markdown_inline": {
-    "revision": "c89a30ce556a5ea5552e816e5dc2f2c0de96237d"
+    "revision": "192407ab5a24bfc24f13332979b5e7967518754a"
   },
   "matlab": {
     "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "a94fdf1df5deba1aa1a3fff23e1276333b5ab666"
+    "revision": "ac878320cd624b3402a50fa875ad5f90bf6dd6d7"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -663,7 +663,7 @@
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
   },
   "roc": {
-    "revision": "ef46edd0c03ea30a22f7e92bc68628fb7231dc8a"
+    "revision": "7d29fc24b36119494b4dc3f3d967075e261706c1"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
@@ -825,7 +825,7 @@
     "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
   },
   "typespec": {
-    "revision": "8455e6601de80c9641b6e6f54c7320573eec0300"
+    "revision": "42fb163442ef2691b9b720fb4e4e846809415d18"
   },
   "typoscript": {
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"

From c97f14eed1301cf8dbe8ec8e4c283b213253deec Mon Sep 17 00:00:00 2001
From: Heber <Anthony.Heber@gmail.com>
Date: Thu, 12 Dec 2024 00:31:38 -0700
Subject: [PATCH 2014/2704] feat(soql): update parser and queries (#7461)

---
 lockfile.json               | 8 ++++----
 queries/soql/highlights.scm | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8fc168361..c6c081df2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
+    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -693,7 +693,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
+    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -714,10 +714,10 @@
     "revision": "bf268722bc6406429776f71f012e6d1a88801931"
   },
   "soql": {
-    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
+    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
   },
   "sosl": {
-    "revision": "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5"
+    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index e61a81141..11e9d582a 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -121,7 +121,10 @@
   "TRACKING"
   "TYPEOF"
   "UPDATE"
-  "USING_SCOPE"
+  "USING"
+  "SCOPE"
+  "LOOKUP"
+  "BIND"
   "VIEW"
   "VIEWSTAT"
   "WITH"

From 2a496fa4e89034014dd054f04c061ba7d6023a0c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 07:33:07 +0000
Subject: [PATCH 2015/2704] bot(lockfile): update elm, liquidsoap, scala,
 slint, sql, templ

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c6c081df2..f0bae184b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -162,7 +162,7 @@
     "revision": "02a6f7fd4be28dd94ee4dd2ca19cb777053ea74e"
   },
   "elm": {
-    "revision": "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"
+    "revision": "e34bdc5c512918628b05b48e633f711123204e45"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -429,7 +429,7 @@
     "revision": "23ac814111e2b4b4b083e2c92219af2d5b74d13d"
   },
   "liquidsoap": {
-    "revision": "14feafa91630afb1ab9988cf9b738b7ea29f3f89"
+    "revision": "8e51fa63ddb93ac179d4e34a311d3d3f03780b42"
   },
   "llvm": {
     "revision": "c14cb839003348692158b845db9edda201374548"
@@ -681,7 +681,7 @@
     "revision": "cad8a206f2e4194676b9699f26f6560d07130d3f"
   },
   "scala": {
-    "revision": "5f44942205c2364ce2ced14a40687d1e09685034"
+    "revision": "14058535212e3d01a4c4b34b06c524fae289ec18"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -699,7 +699,7 @@
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
   },
   "slint": {
-    "revision": "4e2765d4cac1f03ada6f635eeb6008d1d0aff5a3"
+    "revision": "baf0eea12535caaab5e2b0e532299bb239409bad"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
@@ -726,7 +726,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "035354ea51c835cfe8fc9abf81bb081965a42b4c"
+    "revision": "f2a6b6f86cd4322c346faa312ddf2b839bf5e989"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -783,7 +783,7 @@
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
-    "revision": "ebcb4f7a6abde0156f7f2bf7744592afd0ec38b0"
+    "revision": "80944bb7413a6d06845c33537805d0ee0419a13d"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From 33d27173876499a0f037cb9edff90d583711b6ae Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 06:49:45 +0000
Subject: [PATCH 2016/2704] bot(lockfile): update http, nu, scala

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f0bae184b..e856996e7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -342,7 +342,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94"
+    "revision": "d2e4e4c7d03f70e0465d436f2b5f67497cd544ca"
   },
   "hurl": {
     "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "ac878320cd624b3402a50fa875ad5f90bf6dd6d7"
+    "revision": "f85d2481616537d1d54894bc278d64b24581ea5c"
   },
   "objc": {
     "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
@@ -681,7 +681,7 @@
     "revision": "cad8a206f2e4194676b9699f26f6560d07130d3f"
   },
   "scala": {
-    "revision": "14058535212e3d01a4c4b34b06c524fae289ec18"
+    "revision": "68773dfed7fee05b3549aaf52ebf8be7c7fe7d5f"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"

From cfbbdd5effbde3d47d2d662e67cfcd62a93b783f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 14 Dec 2024 06:45:29 +0000
Subject: [PATCH 2017/2704] bot(lockfile): update solidity, v

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e856996e7..eca583e01 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -711,7 +711,7 @@
     "revision": "e909815acdbe37e69440261ebb1091ed52e1dec6"
   },
   "solidity": {
-    "revision": "bf268722bc6406429776f71f012e6d1a88801931"
+    "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
   },
   "soql": {
     "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
@@ -849,7 +849,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "bbba20d654a764c2d2de272fd5f45a2433870640"
+    "revision": "bc2aa2993851ed5ad10caf4571aa2aaee3c80a7f"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From 7fee2c55e0ba1a6307a80eee7fab84533e5721e9 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 15 Dec 2024 06:45:47 +0000
Subject: [PATCH 2018/2704] bot(lockfile): update apex, sflog, soql, sosl

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index eca583e01..e4370ab64 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
+    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -693,7 +693,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
+    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -714,10 +714,10 @@
     "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
   },
   "soql": {
-    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
+    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
   },
   "sosl": {
-    "revision": "2a7b3f3b4a4d4c308bbfc47b3d614536eb386bb3"
+    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"

From 89ecadd2b1f8228a369789cb97cf1f0747ce02ab Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 14 Dec 2024 19:50:37 -0800
Subject: [PATCH 2019/2704] fix(go): properly apply injections in strings

---
 queries/go/injections.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 38ba3e110..4e914a3ec 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -9,10 +9,11 @@
   (argument_list
     .
     [
-      (raw_string_literal)
-      (interpreted_string_literal)
-    ] @injection.content
-    (#offset! @injection.content 0 1 0 -1)
+      (raw_string_literal
+        (raw_string_literal_content) @injection.content)
+      (interpreted_string_literal
+        (interpreted_string_literal_content) @injection.content)
+    ]
     (#set! injection.language "regex")))
 
 ((comment) @injection.content
@@ -24,7 +25,8 @@
     field: (field_identifier) @_method)
   arguments: (argument_list
     .
-    (interpreted_string_literal) @injection.content))
+    (interpreted_string_literal
+      (interpreted_string_literal_content) @injection.content)))
   (#any-of? @_method "Printf" "Sprintf" "Fatalf" "Scanf" "Errorf" "Skipf" "Logf")
   (#set! injection.language "printf"))
 
@@ -34,6 +36,7 @@
   arguments: (argument_list
     (_)
     .
-    (interpreted_string_literal) @injection.content))
+    (interpreted_string_literal
+      (interpreted_string_literal_content) @injection.content)))
   (#any-of? @_method "Fprintf" "Fscanf" "Appendf" "Sscanf")
   (#set! injection.language "printf"))

From 5cf3434c694a94fccfca79588654e57053a68572 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 14 Dec 2024 19:51:37 -0800
Subject: [PATCH 2020/2704] feat(go): string regex highlights

---
 queries/go/highlights.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 62497b0c9..7675cb790 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -237,3 +237,18 @@
 ; Spell
 ((interpreted_string_literal) @spell
   (#not-has-parent? @spell import_spec))
+
+; Regex
+(call_expression
+  (selector_expression) @_function
+  (#any-of? @_function
+    "regexp.Match" "regexp.MatchReader" "regexp.MatchString" "regexp.Compile" "regexp.CompilePOSIX"
+    "regexp.MustCompile" "regexp.MustCompilePOSIX")
+  (argument_list
+    .
+    [
+      (raw_string_literal
+        (raw_string_literal_content) @string.regexp)
+      (interpreted_string_literal
+        (interpreted_string_literal_content) @string.regexp)
+    ]))

From 54a29bf99d5ccb2de512906279686457d699f8e5 Mon Sep 17 00:00:00 2001
From: Vincent Rischmann <vincent@rischmann.fr>
Date: Sun, 15 Dec 2024 22:29:54 +0100
Subject: [PATCH 2021/2704] feat(zig): improve indents (#7471)

---
 queries/zig/indents.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/zig/indents.scm b/queries/zig/indents.scm
index 751bfd7ea..11ff9ca16 100644
--- a/queries/zig/indents.scm
+++ b/queries/zig/indents.scm
@@ -1,7 +1,12 @@
 [
   (block)
   (struct_declaration)
+  (enum_declaration)
+  (union_declaration)
   (switch_expression)
+  (if_expression)
+  (while_expression)
+  (for_expression)
   (initializer_list)
 ] @indent.begin
 

From ad5ea0bbeddcc375d4a398ce842c478e7e15c27d Mon Sep 17 00:00:00 2001
From: Mae Brooks <138945353+MaeBrooks@users.noreply.github.com>
Date: Mon, 16 Dec 2024 01:37:35 -0800
Subject: [PATCH 2022/2704] fix(gren): adapt queries to parser changes (#7472)

`case of` -> `when is`
---
 lockfile.json               | 2 +-
 queries/gren/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e4370ab64..ff8799880 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -291,7 +291,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "gren": {
-    "revision": "df7992dbc1e57e055ba1cbfdbe9f961750940553"
+    "revision": "76554f4f2339f5a24eed19c58f2079b51c694152"
   },
   "groovy": {
     "revision": "b53a8cc1075e056b8223b86f3bb392e0d57ae101"
diff --git a/queries/gren/highlights.scm b/queries/gren/highlights.scm
index 5cc6fff54..030cf7fad 100644
--- a/queries/gren/highlights.scm
+++ b/queries/gren/highlights.scm
@@ -14,8 +14,8 @@
   "else"
   "let"
   "in"
-  (case)
-  (of)
+  (when)
+  (is)
 ] @keyword.conditional
 
 ; Keywords - Imports

From 1d0a8b91d02511a7f4d7aa74b2db0e19d6e780be Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 09:43:43 +0000
Subject: [PATCH 2023/2704] bot(lockfile): update c, editorconfig, objc,
 powershell, scala, snakemake, t32, templ, vhdl, xresources

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ff8799880..3b6119f2e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
   },
   "c": {
-    "revision": "e8841a6a9431b7365ac9055688429e1deb8db90f"
+    "revision": "3efee11f784605d44623d7dadd6cd12a0f73ea92"
   },
   "c_sharp": {
     "revision": "4bf615f8d688f50d69fc5677187dc35f22e03ad6"
@@ -150,7 +150,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "3288aa46e30e1295133bd6f303c00ac71b4f61ad"
+    "revision": "efcd7c2852c69822d625786324538b7457fafddb"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -507,7 +507,7 @@
     "revision": "f85d2481616537d1d54894bc278d64b24581ea5c"
   },
   "objc": {
-    "revision": "62e61b6f5c0289c376d61a8c91faf6435cde9012"
+    "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"
   },
   "objdump": {
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
@@ -564,7 +564,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "b3fe65637fca35e426dc8c889d86c8724aaa73d5"
+    "revision": "ff0ac42e742f3c4be3b55fd14f910d5dc204e323"
   },
   "printf": {
     "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"
@@ -681,7 +681,7 @@
     "revision": "cad8a206f2e4194676b9699f26f6560d07130d3f"
   },
   "scala": {
-    "revision": "68773dfed7fee05b3549aaf52ebf8be7c7fe7d5f"
+    "revision": "fb9aa828ddf6284234de8e62f2d3312fdb98f68e"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -708,7 +708,7 @@
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
-    "revision": "e909815acdbe37e69440261ebb1091ed52e1dec6"
+    "revision": "29a82ddde86c0d428acf971b04794c13525c4bc5"
   },
   "solidity": {
     "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
@@ -768,7 +768,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "e9e334539a07ca044128592c41946daa68d626dd"
+    "revision": "ad23ed0325658adbb1dfb397d4dfbea8872585c6"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
@@ -783,7 +783,7 @@
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
-    "revision": "80944bb7413a6d06845c33537805d0ee0419a13d"
+    "revision": "940de168186ba782b9fab22971055bfb5fc1967d"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -861,7 +861,7 @@
     "revision": "0dacb911daa9614a7c7e79a594d4cb9f478e6554"
   },
   "vhdl": {
-    "revision": "c438173a3cbb92b349c994f2acf822a0f3b961a0"
+    "revision": "eb1532861767a46fc336102bd4ebc938da8773f5"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"
@@ -897,7 +897,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
-    "revision": "724ce1e841f2b9097625756a67f5847ff00178db"
+    "revision": "3b9f6a8ecaeae71f4419f31d4975234242eaf867"
   },
   "yaml": {
     "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"

From d20db847aaa5c023a040e8453b4dd82b00f8dcfd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 06:47:42 +0000
Subject: [PATCH 2024/2704] bot(lockfile): update apex, fortran, nu, scala,
 sflog, soql, sosl, templ

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3b6119f2e..d5d7069a9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
+    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -201,7 +201,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "6f16bab7455cd2906a86679a1be83dd4f378db81"
+    "revision": "c979a86414d3c5bfabee72356bb22bd5f87d0942"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "f85d2481616537d1d54894bc278d64b24581ea5c"
+    "revision": "e36dde8d98549da7c9ef9e8f8698a3e77d4015ac"
   },
   "objc": {
     "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"
@@ -681,7 +681,7 @@
     "revision": "cad8a206f2e4194676b9699f26f6560d07130d3f"
   },
   "scala": {
-    "revision": "fb9aa828ddf6284234de8e62f2d3312fdb98f68e"
+    "revision": "fb999c77139f6bd972f014b728e2f0bd32b4d602"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
@@ -693,7 +693,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
+    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -714,10 +714,10 @@
     "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
   },
   "soql": {
-    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
+    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
   },
   "sosl": {
-    "revision": "9635826416aea11e214b65abd73686d4e9b262dc"
+    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -783,7 +783,7 @@
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
-    "revision": "940de168186ba782b9fab22971055bfb5fc1967d"
+    "revision": "9269b5a65e79be8fb6b6669935823263343b7ba0"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From c47d8d27d047634d00a07ca80a1b694624743b38 Mon Sep 17 00:00:00 2001
From: phanium <91544758+phanen@users.noreply.github.com>
Date: Tue, 17 Dec 2024 18:32:17 +0800
Subject: [PATCH 2025/2704] fix(lua): remove duplicate `nvim_command` (#7477)

---
 queries/lua/injections.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 7b46f0243..e76745f4f 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -17,8 +17,7 @@
     (string
       content: _ @injection.content)))
   (#set! injection.language "vim")
-  (#any-of? @_vimcmd_identifier
-    "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_command" "vim.api.nvim_exec2"))
+  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec2"))
 
 ((function_call
   name: (_) @_vimcmd_identifier

From 981ca7e353da6ea69eaafe4348fda5e800f9e1d8 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Wed, 18 Dec 2024 08:50:36 +0800
Subject: [PATCH 2026/2704] fix(nu): perf issue of highlight.scm (#7475)

---
 queries/nu/highlights.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
index 3c663da24..ecf7280c9 100644
--- a/queries/nu/highlights.scm
+++ b/queries/nu/highlights.scm
@@ -355,8 +355,9 @@ key: (identifier) @property
 
 (comment) @comment @spell
 
-((comment) @comment.documentation @spell
+((comment)+ @comment.documentation @spell
+  .
   (decl_def))
 
-((parameter)
+(parameter
   (comment) @comment.documentation @spell)

From 102bc74e093ef54aab57a368db15befeb9ba9d58 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 06:45:12 +0000
Subject: [PATCH 2027/2704] bot(lockfile): update hoon, nu

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d5d7069a9..7a36a48fd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -333,7 +333,7 @@
     "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
   },
   "hoon": {
-    "revision": "16d4a5fd4a52069fcc6491f0ec6a5bad21f1d705"
+    "revision": "1545137aadcc63660c47db9ad98d02fa602655d0"
   },
   "html": {
     "revision": "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468"
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "e36dde8d98549da7c9ef9e8f8698a3e77d4015ac"
+    "revision": "dc22e2577eb09d1d0de50802c59da2eca98a0e7b"
   },
   "objc": {
     "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"

From fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2024 06:45:43 +0000
Subject: [PATCH 2028/2704] bot(lockfile): update kotlin, poe_filter, rust,
 slint

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7a36a48fd..0b70bc4fc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -402,7 +402,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"
+    "revision": "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"
   },
   "koto": {
     "revision": "0017388765b8b9d89febfe08b5f82805b4e173a5"
@@ -558,7 +558,7 @@
     "revision": "0bf8387987c21bf2f8ed41d2575a8f22b139687f"
   },
   "poe_filter": {
-    "revision": "908ba6accbd9cd3fdf0a208fdc186b9ca3db123c"
+    "revision": "2902dc45439125b9386812c1089a8e9b5f71c4ab"
   },
   "pony": {
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
@@ -678,7 +678,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "cad8a206f2e4194676b9699f26f6560d07130d3f"
+    "revision": "1f63b33efee17e833e0ea29266dd3d713e27e321"
   },
   "scala": {
     "revision": "fb999c77139f6bd972f014b728e2f0bd32b4d602"
@@ -699,7 +699,7 @@
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
   },
   "slint": {
-    "revision": "baf0eea12535caaab5e2b0e532299bb239409bad"
+    "revision": "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd"
   },
   "smali": {
     "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"

From 2405274937718d520a40e03df92030dca6b4f0fd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 06:44:17 +0000
Subject: [PATCH 2029/2704] bot(lockfile): update java

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 0b70bc4fc..1f1c4ad4f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -366,7 +366,7 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "a1bbe92a6370bb4c15386735fbda12f2b812a923"
+    "revision": "04a649d1a0c40e53f946677463d7d8c4e8d6d0db"
   },
   "javascript": {
     "revision": "108b2d4d17a04356a340aea809e4dd5b801eb40d"

From 2a75d8065cff33216e106b651eb0f58b90375717 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 21 Dec 2024 06:41:23 +0000
Subject: [PATCH 2030/2704] bot(lockfile): update koto, nu, powershell

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1f1c4ad4f..a59769d3b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -405,7 +405,7 @@
     "revision": "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"
   },
   "koto": {
-    "revision": "0017388765b8b9d89febfe08b5f82805b4e173a5"
+    "revision": "b420f7922d0d74905fd0d771e5b83be9ee8a8a9a"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "dc22e2577eb09d1d0de50802c59da2eca98a0e7b"
+    "revision": "755efd545d39e23418ce6f96f2a8600ff1a7e74d"
   },
   "objc": {
     "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"
@@ -564,7 +564,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "ff0ac42e742f3c4be3b55fd14f910d5dc204e323"
+    "revision": "32fe49cc5d4a2d5a976dacafc0da16d98787866b"
   },
   "printf": {
     "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"

From 4d5a8e7006db5ad78b8af87ffff988727999745d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 21 Dec 2024 21:01:19 -0500
Subject: [PATCH 2031/2704] feat(kconfig): adapt queries to parser changes

---
 lockfile.json                  |  2 +-
 queries/kconfig/highlights.scm | 19 +++++++++++--------
 queries/kconfig/locals.scm     |  8 ++++----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a59769d3b..a599e6e6f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -396,7 +396,7 @@
     "revision": "f6d29300f9fee15dcd8c2b25ab762001d38da731"
   },
   "kconfig": {
-    "revision": "486fea71f61ad9f3fd4072a118402e97fe88d26c"
+    "revision": "9934ff456d867d0d0f98ef365a0de410ff4e6705"
   },
   "kdl": {
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
diff --git a/queries/kconfig/highlights.scm b/queries/kconfig/highlights.scm
index 307ce1a13..deb88bc00 100644
--- a/queries/kconfig/highlights.scm
+++ b/queries/kconfig/highlights.scm
@@ -70,33 +70,36 @@
 (symbol) @variable
 
 [
-  (prompt)
+  (string)
   (macro_content)
   (text)
 ] @string
 
 (config
-  name: (symbol) @constant)
+  name: (name
+    (symbol) @constant))
 
 (menuconfig
-  name: (symbol) @constant)
+  name: (name
+    (symbol) @constant))
 
 (choice
-  name: (symbol) @constant)
+  name: (name
+    (symbol) @constant))
 
 ((symbol) @constant
   (#lua-match? @constant "[A-Z0-9]+"))
 
 (mainmenu
-  name: (prompt) @markup.heading)
+  name: (string) @markup.heading)
 
 (comment_entry
-  name: (prompt) @markup.heading)
+  name: (string) @markup.heading)
 
 (menu
-  name: (prompt) @markup.heading)
+  name: (string) @markup.heading)
 
 (source
-  (prompt) @string.special.url)
+  (string) @string.special.url)
 
 (comment) @comment @spell
diff --git a/queries/kconfig/locals.scm b/queries/kconfig/locals.scm
index 1fc1b30a7..09a50fecb 100644
--- a/queries/kconfig/locals.scm
+++ b/queries/kconfig/locals.scm
@@ -1,6 +1,6 @@
 [
   (symbol)
-  (prompt)
+  (string)
 ] @local.reference
 
 [
@@ -13,12 +13,12 @@
 ] @local.scope
 
 (type_definition
-  (prompt) @local.definition.var)
+  (string) @local.definition.var)
 
 (type_definition
   (input_prompt
-    (prompt) @local.definition.var))
+    (string) @local.definition.var))
 
 (type_definition_default
   (expression
-    (prompt) @local.definition.var))
+    (string) @local.definition.var))

From caba7ef3556079dec03407bcbb290ddc688ea06e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 22 Dec 2024 10:08:17 +0000
Subject: [PATCH 2032/2704] bot(lockfile): update bicep, java, puppet, python,
 verilog, zig

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a599e6e6f..8adbbd770 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -39,7 +39,7 @@
     "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
   },
   "bicep": {
-    "revision": "0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0"
+    "revision": "bff59884307c0ab009bd5e81afd9324b46a6c0f9"
   },
   "bitbake": {
     "revision": "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"
@@ -366,7 +366,7 @@
     "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
   },
   "java": {
-    "revision": "04a649d1a0c40e53f946677463d7d8c4e8d6d0db"
+    "revision": "94703d5a6bed02b98e438d7cad1136c01a60ba2c"
   },
   "javascript": {
     "revision": "108b2d4d17a04356a340aea809e4dd5b801eb40d"
@@ -597,7 +597,7 @@
     "revision": "13e9195370172c86a8b88184cc358b23b677cc46"
   },
   "puppet": {
-    "revision": "584522f32495d648b18a53ccb52d988e60de127d"
+    "revision": "15f192929b7d317f5914de2b4accd37b349182a6"
   },
   "purescript": {
     "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
@@ -606,7 +606,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "1ee3e775477f913ae3a46cde7a6a512deb06052c"
+    "revision": "65ca0d5a8a9badca68513a44cf8a802e6af61322"
   },
   "ql": {
     "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
@@ -858,7 +858,7 @@
     "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"
   },
   "verilog": {
-    "revision": "0dacb911daa9614a7c7e79a594d4cb9f478e6554"
+    "revision": "4344f7e6c7fd8a9ccaf4cb93da17a37a544b492c"
   },
   "vhdl": {
     "revision": "eb1532861767a46fc336102bd4ebc938da8773f5"
@@ -912,7 +912,7 @@
     "revision": "0554b4a5d313244b7fc000cbb41c04afae4f4e31"
   },
   "zig": {
-    "revision": "eb7d58c2dc4fbeea4745019dee8df013034ae66b"
+    "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
     "revision": "fe73beef9f52f04048d8b19016fc4fbc66b4596f"

From 8119950998196021648eb140d58060038ae67afd Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 06:44:39 +0000
Subject: [PATCH 2033/2704] bot(lockfile): update kconfig, luau, odin, python,
 regex, v

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8adbbd770..416440c16 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -396,7 +396,7 @@
     "revision": "f6d29300f9fee15dcd8c2b25ab762001d38da731"
   },
   "kconfig": {
-    "revision": "9934ff456d867d0d0f98ef365a0de410ff4e6705"
+    "revision": "9ac99fe4c0c27a35dc6f757cef534c646e944881"
   },
   "kdl": {
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
@@ -444,7 +444,7 @@
     "revision": "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a"
   },
   "luau": {
-    "revision": "fbadc96272f718dba267628ba7b0e694c368cef3"
+    "revision": "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f"
   },
   "m68k": {
     "revision": "e128454c2210c0e0c10b68fe45ddb8fee80182a3"
@@ -522,7 +522,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "3fee7964bbfb2554deef12c224344f3870d15375"
+    "revision": "e8adc739b78409a99f8c31313f0bb54cc538cf73"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
@@ -606,7 +606,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "65ca0d5a8a9badca68513a44cf8a802e6af61322"
+    "revision": "bffb65a8cfe4e46290331dfef0dbf0ef3679de11"
   },
   "ql": {
     "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
@@ -642,7 +642,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "4470c59041416e8a2a9fa343595ca28ed91f38b8"
+    "revision": "d329907611abe46d26ab5908e5922e7400212cb9"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -849,7 +849,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "bc2aa2993851ed5ad10caf4571aa2aaee3c80a7f"
+    "revision": "b9644a24bf0be5bf41de61bda681b28492dd3112"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From b4897f5a8453e7efeafb21ff5b2bbdc2e3faf1bd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Dec 2024 16:10:41 +0100
Subject: [PATCH 2034/2704] ci(update): unblock gnuplot

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 353cc7475..38aab1cfc 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "gnuplot"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 50947387c20ec3fb8c30b8c1c1a1c39f68deb970 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 24 Dec 2024 06:43:45 +0000
Subject: [PATCH 2035/2704] bot(lockfile): update bp, gnuplot, just, xresources

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 416440c16..527c1bd70 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -48,7 +48,7 @@
     "revision": "60ba73739c6083c693d86a1a7cf039c07eb4ed59"
   },
   "bp": {
-    "revision": "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"
+    "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
   "c": {
     "revision": "3efee11f784605d44623d7dadd6cd12a0f73ea92"
@@ -261,7 +261,7 @@
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
   },
   "gnuplot": {
-    "revision": "3c895f5d9c0b3a3c7e02383766b462c21913c000"
+    "revision": "8923c1e38b9634a688a6c0dce7c18c8ffb823e79"
   },
   "go": {
     "revision": "12fe553fdaaa7449f764bc876fd777704d4fb752"
@@ -393,7 +393,7 @@
     "revision": "e01c928d11375513138a175a68485c4d53e55ea9"
   },
   "just": {
-    "revision": "f6d29300f9fee15dcd8c2b25ab762001d38da731"
+    "revision": "4f4e566fe47c30b14cfe388a28f70b79009609e5"
   },
   "kconfig": {
     "revision": "9ac99fe4c0c27a35dc6f757cef534c646e944881"
@@ -897,7 +897,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
-    "revision": "3b9f6a8ecaeae71f4419f31d4975234242eaf867"
+    "revision": "5fd347f0b950b2d2563d41176373c610a0a5468c"
   },
   "yaml": {
     "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"

From 096babebf6daef2a046650883082ed2b3dcc5b67 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Tue, 24 Dec 2024 17:02:53 +0100
Subject: [PATCH 2036/2704] feat(inko): highlight the "type" keyword

This keyword will be released in 0.18.0 and deprecate the "class"
keyword, which in turn will be removed in 0.19.0.
---
 lockfile.json               | 2 +-
 queries/inko/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 527c1bd70..81966f0c7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -357,7 +357,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "1419efb8e7e140c30632cb0a2bef84e0d48a6fc5"
+    "revision": "0b08a8f976456a9271f70d4682143328d7224115"
   },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
index a332ecebc..880e42cae 100644
--- a/queries/inko/highlights.scm
+++ b/queries/inko/highlights.scm
@@ -77,6 +77,7 @@
 [
   "class"
   "trait"
+  "type"
 ] @keyword.type
 
 [

From ac6a72a6f83218216948e898362f09029b8035dc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 25 Dec 2024 06:43:49 +0000
Subject: [PATCH 2037/2704] bot(lockfile): update heex, verilog

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 81966f0c7..adccc896f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -315,7 +315,7 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "heex": {
-    "revision": "9359017bd0dc6b023044713aa215544885663637"
+    "revision": "f6b83f305a755cd49cf5f6a66b2b789be93dc7b9"
   },
   "helm": {
     "revision": "ca52fbfc98366c585b84f4cb3745df49f33cd140"
@@ -858,7 +858,7 @@
     "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"
   },
   "verilog": {
-    "revision": "4344f7e6c7fd8a9ccaf4cb93da17a37a544b492c"
+    "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
     "revision": "eb1532861767a46fc336102bd4ebc938da8773f5"

From 17678b00fa5c2712890a0ec2e269d0a4de1207df Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 26 Dec 2024 06:44:02 +0000
Subject: [PATCH 2038/2704] bot(lockfile): update astro

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index adccc896f..1708d14be 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -18,7 +18,7 @@
     "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
   },
   "astro": {
-    "revision": "6e3bad36a8c12d579e73ed4f05676141a4ccf68d"
+    "revision": "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"
   },
   "authzed": {
     "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"

From eb3e850acff4d9f2f2dd8dacd75353043c899753 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 06:43:54 +0000
Subject: [PATCH 2039/2704] bot(lockfile): update gap, gaptst, scala

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1708d14be..1a977c2e9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -216,10 +216,10 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gap": {
-    "revision": "141b063335e85299bde3f61b4888d02d674a1abc"
+    "revision": "ea70c228dd1d3875aeb264bf99903dc9a696894f"
   },
   "gaptst": {
-    "revision": "e0723dc6136309b3d5904dad2c73ef71267428c1"
+    "revision": "69086d7627c03e1f4baf766bcef14c60d9e92331"
   },
   "gdscript": {
     "revision": "bf39f1b38a234d79940fd8866abb0b132ab51b1e"
@@ -681,7 +681,7 @@
     "revision": "1f63b33efee17e833e0ea29266dd3d713e27e321"
   },
   "scala": {
-    "revision": "fb999c77139f6bd972f014b728e2f0bd32b4d602"
+    "revision": "d3b9553b47d7ab413a146c4b6498e527265b966e"
   },
   "scfg": {
     "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"

From 5d18ef22dc63624e90aa7b6dbc17f2c3856ae716 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 28 Dec 2024 06:43:00 +0000
Subject: [PATCH 2040/2704] bot(lockfile): update tsx, typescript

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1a977c2e9..dd34aa779 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -813,7 +813,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
+    "revision": "8e13e1db35b941fc57f2bd2dd4628180448c17d5"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -822,7 +822,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "45af49560396d67a710b21a3ce315fcaa09006ff"
+    "revision": "8e13e1db35b941fc57f2bd2dd4628180448c17d5"
   },
   "typespec": {
     "revision": "42fb163442ef2691b9b720fb4e4e846809415d18"

From 22c86af7c8f08f19997ca70eb17bf93266b05a0b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 29 Dec 2024 06:43:18 +0000
Subject: [PATCH 2041/2704] bot(lockfile): update c, leo, nu, ssh_config

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dd34aa779..7d7200d86 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
   "c": {
-    "revision": "3efee11f784605d44623d7dadd6cd12a0f73ea92"
+    "revision": "3aa2995549d5d8b26928e8d3fa2770fd4327414e"
   },
   "c_sharp": {
     "revision": "4bf615f8d688f50d69fc5677187dc35f22e03ad6"
@@ -420,7 +420,7 @@
     "revision": "d313153eef68c557ba4538b20de2d0e92f3ef6f8"
   },
   "leo": {
-    "revision": "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"
+    "revision": "44a061bac4d9443d75f2700c62a71cd4dcf16f05"
   },
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "755efd545d39e23418ce6f96f2a8600ff1a7e74d"
+    "revision": "249c39d315bd4bbe04b7b1be8d7004587b5032bd"
   },
   "objc": {
     "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"
@@ -732,7 +732,7 @@
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
   },
   "ssh_config": {
-    "revision": "dd32616275c6e9d7800c58f40c16a09ad1c7c238"
+    "revision": "0dd3c7e9f301758f6c69a6efde43d3048deb4d8a"
   },
   "starlark": {
     "revision": "a453dbf3ba433db0e5ec621a38a7e59d72e4dc69"

From 7e0fcf0d456fc5818da1af35b1a3f5c784fce457 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sun, 29 Dec 2024 11:58:56 +0200
Subject: [PATCH 2042/2704] fix(ssh_config): highlight `"always"` (#7507)

---
 queries/ssh_config/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/ssh_config/highlights.scm b/queries/ssh_config/highlights.scm
index 9338eeedc..b58360b69 100644
--- a/queries/ssh_config/highlights.scm
+++ b/queries/ssh_config/highlights.scm
@@ -26,6 +26,8 @@
   "auto"
   "none"
   "any"
+  ; CanonicalizeHostname
+  "always"
   ; ControlMaster
   "autoask"
   ; FingerprintHash

From 34d78baa86a37e86fe64b642860144c28ab9f0c8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 06:45:39 +0000
Subject: [PATCH 2043/2704] bot(lockfile): update editorconfig, nu, sql, templ,
 vento, vhdl, xresources

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7d7200d86..6e83933f5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -150,7 +150,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "efcd7c2852c69822d625786324538b7457fafddb"
+    "revision": "ad9d7b84453426c40717c2b2c6b13d0a955d0662"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -504,7 +504,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "249c39d315bd4bbe04b7b1be8d7004587b5032bd"
+    "revision": "9822fc63a62ff87939c88ead9f381f951f092dee"
   },
   "objc": {
     "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"
@@ -726,7 +726,7 @@
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
   },
   "sql": {
-    "revision": "f2a6b6f86cd4322c346faa312ddf2b839bf5e989"
+    "revision": "b9d109588d5b5ed986c857464830c2f0bef53f18"
   },
   "squirrel": {
     "revision": "072c969749e66f000dba35a33c387650e203e96e"
@@ -783,7 +783,7 @@
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
-    "revision": "9269b5a65e79be8fb6b6669935823263343b7ba0"
+    "revision": "60310af0d788a0160d719d4aff8f146b6e6c55bd"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -855,13 +855,13 @@
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
   },
   "vento": {
-    "revision": "3321077d7446c1b3b017c294fd56ce028ed817fe"
+    "revision": "3b32474bc29584ea214e4e84b47102408263fe0e"
   },
   "verilog": {
     "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
-    "revision": "eb1532861767a46fc336102bd4ebc938da8773f5"
+    "revision": "63d0360d42c43b4902b8470c7ddcf323432e2dde"
   },
   "vhs": {
     "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"
@@ -897,7 +897,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
-    "revision": "5fd347f0b950b2d2563d41176373c610a0a5468c"
+    "revision": "7c7b03e69710a31031e02bc18a7c3c6542a010e2"
   },
   "yaml": {
     "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"

From a295ba13d27684e8904e8e51876b84ee85135cf1 Mon Sep 17 00:00:00 2001
From: Derek Stride <derek.stride@shopify.com>
Date: Mon, 30 Dec 2024 05:14:03 -0500
Subject: [PATCH 2044/2704] feat(ruby): add injection for debugger command
 strings (#7480)

---
 queries/ruby/injections.scm                       | 12 ++++++++++++
 tests/query/injections/ruby/test-ruby-debugger.rb | 11 +++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 tests/query/injections/ruby/test-ruby-debugger.rb

diff --git a/queries/ruby/injections.scm b/queries/ruby/injections.scm
index 7d8be5b23..12b2c32a5 100644
--- a/queries/ruby/injections.scm
+++ b/queries/ruby/injections.scm
@@ -9,3 +9,15 @@
 (regex
   (string_content) @injection.content
   (#set! injection.language "regex"))
+
+((call
+  receiver: (identifier) @_receiver
+  method: (identifier) @_method
+  arguments: (argument_list
+    (pair
+      key: (hash_key_symbol)
+      value: (string
+        (string_content) @injection.content))))
+  (#eq? @_receiver "binding")
+  (#any-of? @_method "b" "break")
+  (#set! injection.self))
diff --git a/tests/query/injections/ruby/test-ruby-debugger.rb b/tests/query/injections/ruby/test-ruby-debugger.rb
new file mode 100644
index 000000000..1dd8632c3
--- /dev/null
+++ b/tests/query/injections/ruby/test-ruby-debugger.rb
@@ -0,0 +1,11 @@
+binding.b(do: "puts 'Hello, world!'")
+#              ^ @ruby
+
+binding.b(pre: "pp [1, 2, 3]")
+#               ^ @ruby
+
+binding.break(do: "puts 'Hello, world!'")
+#                  ^ @ruby
+
+binding.break(pre: "pp [1, 2, 3]")
+#                   ^ @ruby

From f87c8956aee2bb0a2406f70751d100a843abb2e4 Mon Sep 17 00:00:00 2001
From: Serhii Khoma <srghma@gmail.com>
Date: Mon, 30 Dec 2024 23:48:20 +0700
Subject: [PATCH 2045/2704] feat(ipkg): add parser and queries (#7277)

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/ipkg/folds.scm          | 13 ++++++++
 queries/ipkg/highlights.scm     | 56 +++++++++++++++++++++++++++++++++
 queries/ipkg/indents.scm        | 33 +++++++++++++++++++
 queries/ipkg/injections.scm     |  5 +++
 queries/ipkg/locals.scm         | 24 ++++++++++++++
 8 files changed, 143 insertions(+)
 create mode 100644 queries/ipkg/folds.scm
 create mode 100644 queries/ipkg/highlights.scm
 create mode 100644 queries/ipkg/indents.scm
 create mode 100644 queries/ipkg/injections.scm
 create mode 100644 queries/ipkg/locals.scm

diff --git a/README.md b/README.md
index bc218ac75..0c14f42b4 100644
--- a/README.md
+++ b/README.md
@@ -293,6 +293,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [idl](https://github.com/cathaysia/tree-sitter-idl) (maintained by @cathaysia)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
 - [x] [inko](https://github.com/inko-lang/tree-sitter-inko) (maintained by @yorickpeterse)
+- [x] [ipkg](https://github.com/srghma/tree-sitter-ipkg) (maintained by @srghma)
 - [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
diff --git a/lockfile.json b/lockfile.json
index 6e83933f5..3f72f18cf 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -359,6 +359,9 @@
   "inko": {
     "revision": "0b08a8f976456a9271f70d4682143328d7224115"
   },
+  "ipkg": {
+    "revision": "8d3e9782f2d091d0cd39c13bfb3068db0c675960"
+  },
   "ispc": {
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1fe72bc89..d2259c9bb 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1068,6 +1068,14 @@ list.inko = {
   maintainers = { "@yorickpeterse" },
 }
 
+list.ipkg = {
+  install_info = {
+    url = "https://github.com/srghma/tree-sitter-ipkg",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@srghma" },
+}
+
 list.ispc = {
   install_info = {
     url = "https://github.com/fab4100/tree-sitter-ispc",
diff --git a/queries/ipkg/folds.scm b/queries/ipkg/folds.scm
new file mode 100644
index 000000000..271654f9a
--- /dev/null
+++ b/queries/ipkg/folds.scm
@@ -0,0 +1,13 @@
+[
+  (source_file)
+  (dependency_list)
+  (module_list)
+  (dependency_declaration)
+  (module_declaration)
+  (module_declaration)
+  (package_declaration)
+  (main_declaration)
+  (executable_declaration)
+  (version_declaration)
+  (langversion_declaration)
+] @fold
diff --git a/queries/ipkg/highlights.scm b/queries/ipkg/highlights.scm
new file mode 100644
index 000000000..13c102018
--- /dev/null
+++ b/queries/ipkg/highlights.scm
@@ -0,0 +1,56 @@
+; Keywords
+"package" @keyword.import
+
+[
+  "authors"
+  "maintainers"
+  "license"
+  "brief"
+  "readme"
+  "homepage"
+  "sourceloc"
+  "bugtracker"
+  "opts"
+  "sourcedir"
+  "builddir"
+  "outputdir"
+  "prebuild"
+  "postbuild"
+  "preinstall"
+  "postinstall"
+  "preclean"
+  "postclean"
+  "version"
+  "langversion"
+  "modules"
+  "main"
+  "executable"
+  "depends"
+] @keyword
+
+[
+  "="
+  (version_range_op)
+] @operator
+
+"," @punctuation.delimiter
+
+; Field values
+(string_value) @string
+
+(boolean_value) @boolean
+
+; Version numbers and ranges
+(version_number) @string.special
+
+[
+  (dependency_item)
+  (package_name)
+  (module_name)
+] @module
+
+; Comments
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
diff --git a/queries/ipkg/indents.scm b/queries/ipkg/indents.scm
new file mode 100644
index 000000000..a596e9ebe
--- /dev/null
+++ b/queries/ipkg/indents.scm
@@ -0,0 +1,33 @@
+; Indentation rules for Idris .ipkg files
+[
+  (package_declaration)
+  (field_declaration)
+  (main_declaration)
+  (executable_declaration)
+  (version_declaration)
+  (langversion_declaration)
+] @indent.begin
+
+(dependency_declaration
+  "=" @indent.begin
+  (dependency_list
+    "," @indent.begin))
+
+(module_declaration
+  "=" @indent.begin
+  (module_list
+    "," @indent.begin))
+
+(field_declaration
+  "=" @indent.begin)
+
+"=" @indent.branch
+
+(string_value) @indent.begin
+
+[
+  (line_comment)
+  (block_comment)
+] @indent.ignore
+
+(ERROR) @indent.auto
diff --git a/queries/ipkg/injections.scm b/queries/ipkg/injections.scm
new file mode 100644
index 000000000..3cd6aac8e
--- /dev/null
+++ b/queries/ipkg/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/ipkg/locals.scm b/queries/ipkg/locals.scm
new file mode 100644
index 000000000..c1970fcdf
--- /dev/null
+++ b/queries/ipkg/locals.scm
@@ -0,0 +1,24 @@
+; Scopes
+(source_file) @local.scope
+
+; Definitions
+(package_declaration
+  (package_name) @local.definition.import)
+
+(module_declaration
+  (module_list
+    (module_name) @local.definition.namespace))
+
+(main_declaration
+  (module_name) @local.definition.import)
+
+(executable_declaration
+  (package_name) @local.definition.import)
+
+; References
+(dependency_declaration
+  (dependency_list
+    (dependency_item
+      (package_name) @local.reference)))
+
+(module_name) @local.reference

From f0f48e02903bd5ae079ca19d92ad1be7b4c88179 Mon Sep 17 00:00:00 2001
From: Robert Horvath <rob@nyar.eu>
Date: Sun, 29 Dec 2024 12:16:38 -0300
Subject: [PATCH 2046/2704] feat(leo): highlights casting and record
 expressions added

---
 queries/leo/highlights.scm | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm
index 4e10de013..3d4dadd3c 100644
--- a/queries/leo/highlights.scm
+++ b/queries/leo/highlights.scm
@@ -17,7 +17,10 @@
   "struct"
 ] @keyword.type
 
-"in" @keyword.operator
+[
+  "in"
+  "as"
+] @keyword.operator
 
 [
   "constant"
@@ -133,7 +136,23 @@
 (struct_component_declaration
   (identifier) @variable.member)
 
-(type) @type
+(struct_expression
+  (identifier) @type.definition)
+
+(struct_component_initializer
+  (identifier) @variable.member)
+
+[
+  (type)
+  (boolean_type)
+  (integer_type)
+  (field_type)
+  (group_type)
+  (scalar_type)
+  (address_type)
+  (signature_type)
+  (string_type)
+] @type
 
 [
   (block_height)

From 1087b183a7c61218084300d09b1bb979930a71fe Mon Sep 17 00:00:00 2001
From: Robert Horvath <rob@nyar.eu>
Date: Sun, 29 Dec 2024 12:17:08 -0300
Subject: [PATCH 2047/2704] fix(leo): indent } now properly dedents

---
 queries/leo/indents.scm | 56 +++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/queries/leo/indents.scm b/queries/leo/indents.scm
index 473091fb1..97a456c87 100644
--- a/queries/leo/indents.scm
+++ b/queries/leo/indents.scm
@@ -1,33 +1,47 @@
 [
-  (record_declaration)
-  (struct_declaration)
-  (mapping_declaration)
-  (constant_declaration)
-  (return_statement)
-  (expression_statement)
-  (variable_declaration)
-  (loop_statement)
-  (assignment_statement)
-  (assert_statement)
-  (struct_expression)
   (array_expression)
-  (tuple_expression)
-  (parenthesized_expression)
-  (items_block)
+  (assert_statement)
+  (assignment_statement)
   (block)
+  (constant_declaration)
+  (expression_statement)
+  (items_block)
+  (loop_statement)
+  (mapping_declaration)
+  (parenthesized_expression)
+  (record_declaration)
+  (return_statement)
+  (struct_declaration)
+  (struct_expression)
+  (tuple_expression)
+  (variable_declaration)
 ] @indent.begin
 
-; if "if" statement and conditional statement are in separate lines
-; conditional should be indented and when the conditional block
-; starts dedented
-(branch
-  (block
-    "{" @indent.end)) @indent.begin
-
 ((function_parameters) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
+(record_declaration
+  "}" @indent.branch)
+
+(struct_declaration
+  "}" @indent.branch)
+
+(struct_expression
+  "}" @indent.branch)
+
+(array_expression
+  "}" @indent.branch)
+
+(tuple_expression
+  "}" @indent.branch)
+
+(items_block
+  "}" @indent.branch)
+
+(block
+  "}" @indent.branch)
+
 [
   (comment)
   (ERROR)

From 4b222913486ec0a5983efa82b0649a2ab87cf1f0 Mon Sep 17 00:00:00 2001
From: "Shaun Attfield (shaun@xomen)" <heurist+git@gmail.com>
Date: Fri, 27 Dec 2024 09:54:04 +0200
Subject: [PATCH 2048/2704] fix(xml): properly indent closing tags

Confusing as it is,
https://github.com/heurist/nvim-treesitter/blob/master/CONTRIBUTING.md?plain=1#L394
says:

```query
@indent.dedent      ; dedent children when matching this node
@indent.branch      ; dedent itself when matching this node
```

@indent.branch is therefore the approriate choice for de-indenting.
---
 queries/xml/indents.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/xml/indents.scm b/queries/xml/indents.scm
index 24cd75cfa..803c6e8a1 100644
--- a/queries/xml/indents.scm
+++ b/queries/xml/indents.scm
@@ -6,7 +6,7 @@
   (contentspec)
 ] @indent.align
 
-(ETag) @indent.dedent
+(ETag) @indent.branch
 
 (doctypedecl) @indent.ignore
 

From 0a0e2e354b770d709a327bc51f7b4ddeae927ba7 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 31 Dec 2024 06:43:54 +0000
Subject: [PATCH 2049/2704] bot(lockfile): update fsharp

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 3f72f18cf..ce5aeabfd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -207,7 +207,7 @@
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
   "fsharp": {
-    "revision": "971da5ff0266bfe4a6ecfb94616548032d6d1ba0"
+    "revision": "207f1c988f4649e12fe207e4a7e4f83b9da037d1"
   },
   "func": {
     "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"

From 5f78e989243f9fb0fb55e0cf54820920d86dfd30 Mon Sep 17 00:00:00 2001
From: vanaigr <vanaigranov@gmail.com>
Date: Tue, 31 Dec 2024 00:32:34 -0600
Subject: [PATCH 2050/2704] fix(bash): offset injection content

---
 queries/bash/injections.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 328630808..9b86e351a 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -14,16 +14,16 @@
   name: (command_name) @_command
   .
   argument: [
-    (string
-      (string_content) @injection.content)
+    (string) @injection.content
     (concatenation
-      (string
-        (string_content) @injection.content))
+      (string) @injection.content)
     (raw_string) @injection.content
     (concatenation
       (raw_string) @injection.content)
   ])
   (#eq? @_command "printf")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
   (#set! injection.language "printf"))
 
 ; printf -v var 'format'
@@ -34,17 +34,17 @@
   (_)
   .
   argument: [
-    (string
-      (string_content) @injection.content)
+    (string) @injection.content
     (concatenation
-      (string
-        (string_content) @injection.content))
+      (string) @injection.content)
     (raw_string) @injection.content
     (concatenation
       (raw_string) @injection.content)
   ])
   (#eq? @_command "printf")
   (#eq? @_arg "-v")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
   (#set! injection.language "printf"))
 
 ; printf -- 'format'
@@ -53,17 +53,17 @@
   argument: (word) @_arg
   .
   argument: [
-    (string
-      (string_content) @injection.content)
+    (string) @injection.content
     (concatenation
-      (string
-        (string_content) @injection.content))
+      (string) @injection.content)
     (raw_string) @injection.content
     (concatenation
       (raw_string) @injection.content)
   ])
   (#eq? @_command "printf")
   (#eq? @_arg "--")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
   (#set! injection.language "printf"))
 
 ((command

From e947d35bbf919ea88a24c21cb8afa4621e3cf547 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2025 06:44:29 +0000
Subject: [PATCH 2051/2704] bot(lockfile): update gdscript, swift

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ce5aeabfd..eff9470dc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -222,7 +222,7 @@
     "revision": "69086d7627c03e1f4baf766bcef14c60d9e92331"
   },
   "gdscript": {
-    "revision": "bf39f1b38a234d79940fd8866abb0b132ab51b1e"
+    "revision": "75ce61d196717b8c183fa6066676540c81e24dca"
   },
   "gdshader": {
     "revision": "ffd9f958df13cae04593781d7d2562295a872455"
@@ -762,7 +762,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "7ca0504e6d1a3e1e2f5fa725dafecf5e5bd2b202"
+    "revision": "742723056556ec80ca4da09a6411fff86b330911"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From fc687f38d4ea9a7399707a5a2d57297c2ac17323 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 2 Jan 2025 06:43:45 +0000
Subject: [PATCH 2052/2704] bot(lockfile): update gdscript, qmljs

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index eff9470dc..078a5ad7f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -222,7 +222,7 @@
     "revision": "69086d7627c03e1f4baf766bcef14c60d9e92331"
   },
   "gdscript": {
-    "revision": "75ce61d196717b8c183fa6066676540c81e24dca"
+    "revision": "48b49330888a4669b48619b211cc8da573827725"
   },
   "gdshader": {
     "revision": "ffd9f958df13cae04593781d7d2562295a872455"
@@ -618,7 +618,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "6d4db242185721e1f5ef21fde613ca90c743ec47"
+    "revision": "8fef30e231d74b65c713bcbac21956156d8963da"
   },
   "query": {
     "revision": "a6674e279b14958625d7a530cabe06119c7a1532"

From 6cb4098d51479f644f967c17d4482bab1ba2640f Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Thu, 2 Jan 2025 11:27:28 -0600
Subject: [PATCH 2053/2704] fix(php): properly highlight grouped imported
 functions and constants

---
 queries/php_only/highlights.scm         | 22 ++++++++++++++++++++++
 tests/query/highlights/php/keywords.php | 12 ++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 790bd088f..6d51154df 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -233,6 +233,17 @@
     alias: (name) @function
   ])
 
+(namespace_use_declaration
+  type: "function"
+  body: (namespace_use_group
+    (namespace_use_clause
+      [
+        (name) @function
+        (qualified_name
+          (name) @function)
+        alias: (name) @function
+      ])))
+
 (namespace_use_clause
   type: "const"
   [
@@ -242,6 +253,17 @@
     alias: (name) @constant
   ])
 
+(namespace_use_declaration
+  type: "const"
+  body: (namespace_use_group
+    (namespace_use_clause
+      [
+        (name) @constant
+        (qualified_name
+          (name) @constant)
+        alias: (name) @constant
+      ])))
+
 (class_interface_clause
   [
     (name) @type
diff --git a/tests/query/highlights/php/keywords.php b/tests/query/highlights/php/keywords.php
index 6b938c43f..5504cab19 100644
--- a/tests/query/highlights/php/keywords.php
+++ b/tests/query/highlights/php/keywords.php
@@ -12,16 +12,28 @@ use Foo\Baz as Baaz;
 //          ^^ @keyword.operator
 //             ^^^^ @type.definition
 
+use Foo\Baz\{Foo, Bar};
+//           ^^^ @type
+//                ^^^ @type
+
 use function Foo\foo as fooo;
 //  ^^^^^^^^ @keyword.function
 //               ^^^ @function
 //                      ^^^^ @function
 
+use function Foo\{bar, baz};
+//                ^^^ @function
+//                     ^^^ @function
+
 use const Foo\FOO as FOOO;
 //  ^^^^^ @keyword.modifier
 //            ^^^ @constant
 //                   ^^^^ @constant
 
+use const Foo\{FOO, BAR};
+//             ^^^ @constant
+//                  ^^^ @constant
+
 use Foo\Baz\{
 //  ^^^ @module
 //      ^^^ @module

From cfbc1c0e0ff63e5b5e37b465b915b95fc2e98cef Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 3 Jan 2025 06:43:59 +0000
Subject: [PATCH 2054/2704] bot(lockfile): update godot_resource, properties

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 078a5ad7f..82b42fd0b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -270,7 +270,7 @@
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
   },
   "godot_resource": {
-    "revision": "74105cc46a09850ebe626b894ecc6c61a12fb999"
+    "revision": "941955d027f1d8530501e77ce5e1d6035f5f99c1"
   },
   "gomod": {
     "revision": "3b01edce2b9ea6766ca19328d1850e456fde3103"
@@ -585,7 +585,7 @@
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
   },
   "properties": {
-    "revision": "f93f673990deffbfa548826eebade93af81887b4"
+    "revision": "579b62f5ad8d96c2bb331f07d1408c92767531d9"
   },
   "proto": {
     "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"

From 6935286b4ee3d938954e446d657eebee71b4d07a Mon Sep 17 00:00:00 2001
From: Robert Horvath <rob@nyar.eu>
Date: Fri, 3 Jan 2025 15:07:57 -0300
Subject: [PATCH 2055/2704] fix(leo): intentation fix of parenthesis

---
 queries/leo/indents.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/queries/leo/indents.scm b/queries/leo/indents.scm
index 97a456c87..b2d33a59b 100644
--- a/queries/leo/indents.scm
+++ b/queries/leo/indents.scm
@@ -21,6 +21,19 @@
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
 
+((function_arguments) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+(parenthesized_expression
+  ")" @indent.branch)
+
+(function_parameters
+  ")" @indent.branch)
+
+(function_arguments
+  ")" @indent.branch)
+
 (record_declaration
   "}" @indent.branch)
 
@@ -31,10 +44,10 @@
   "}" @indent.branch)
 
 (array_expression
-  "}" @indent.branch)
+  "]" @indent.branch)
 
 (tuple_expression
-  "}" @indent.branch)
+  ")" @indent.branch)
 
 (items_block
   "}" @indent.branch)

From fae21737be2846a04ae06a41d70b7fc8ad4bf9eb Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 4 Jan 2025 06:42:00 +0000
Subject: [PATCH 2056/2704] bot(lockfile): update julia, koto, v

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 82b42fd0b..2856e1280 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -393,7 +393,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "e01c928d11375513138a175a68485c4d53e55ea9"
+    "revision": "ffdd9fe4dccdc26d62ce1654fceac52c394f0cf3"
   },
   "just": {
     "revision": "4f4e566fe47c30b14cfe388a28f70b79009609e5"
@@ -408,7 +408,7 @@
     "revision": "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"
   },
   "koto": {
-    "revision": "b420f7922d0d74905fd0d771e5b83be9ee8a8a9a"
+    "revision": "7258681498ac92f24b2d7ebb844b5e79dc3cf9ac"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -852,7 +852,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "b9644a24bf0be5bf41de61bda681b28492dd3112"
+    "revision": "535103910159887a41d019635c1cdbec910d1a31"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From 57713d079c3c2afcc31f3e0650bf8594a2a296ba Mon Sep 17 00:00:00 2001
From: joker1007 <kakyoin.hierophant@gmail.com>
Date: Sat, 4 Jan 2025 22:28:44 +0900
Subject: [PATCH 2057/2704] fix(rbs): fix highlight queries of rbs that is
 missing some definitions

---
 queries/rbs/highlights.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm
index 1000e3bed..9de9c427d 100644
--- a/queries/rbs/highlights.scm
+++ b/queries/rbs/highlights.scm
@@ -54,9 +54,24 @@
   (method_name
     [
       (identifier)
+      (identifier_suffix)
       (constant)
+      (constant_suffix)
       (operator)
       (setter)
+      (constant_setter)
+    ] @function.method))
+
+(attribute_member
+  (method_name
+    [
+      (identifier)
+      (identifier_suffix)
+      (constant)
+      (constant_suffix)
+      (operator)
+      (setter)
+      (constant_setter)
     ] @function.method))
 
 [
@@ -115,6 +130,10 @@
 (type
   (integer_literal) @number)
 
+(type
+  (record_type
+    key: (record_key) @string.special.symbol))
+
 ; Operators
 [
   "="

From 556ac68cd33973a38d3f2abac47f361432593fe2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 5 Jan 2025 06:42:07 +0000
Subject: [PATCH 2058/2704] bot(lockfile): update mlir, rbs, snakemake

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2856e1280..783b5c7ed 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -474,7 +474,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "72929ac13d7e1c46010114202262b7102a821293"
+    "revision": "01065decfd6877fe3c4bae05782b8892544cb73e"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -636,7 +636,7 @@
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
   "rbs": {
-    "revision": "8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99"
+    "revision": "de893b166476205b09e79cd3689f95831269579a"
   },
   "re2c": {
     "revision": "c18a3c2f4b6665e35b7e50d6048ea3cff770c572"
@@ -711,7 +711,7 @@
     "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
   },
   "snakemake": {
-    "revision": "29a82ddde86c0d428acf971b04794c13525c4bc5"
+    "revision": "f36c1587624d6d84376c82a357c20fc319cbf02c"
   },
   "solidity": {
     "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"

From 958af94dd8d74071c72c9d6840b41d06ea436b2f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 06:45:06 +0000
Subject: [PATCH 2059/2704] bot(lockfile): update diff, just, ocaml,
 ocaml_interface, swift, xresources

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 783b5c7ed..3e49d194f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -123,7 +123,7 @@
     "revision": "4a6c08abfb54827db4e722d6cdca81b093898988"
   },
   "diff": {
-    "revision": "63439b5e6e35750aff1e53d9eecc663d369c54bc"
+    "revision": "e42b8def4f75633568f1aecfe01817bf15164928"
   },
   "disassembly": {
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
@@ -396,7 +396,7 @@
     "revision": "ffdd9fe4dccdc26d62ce1654fceac52c394f0cf3"
   },
   "just": {
-    "revision": "4f4e566fe47c30b14cfe388a28f70b79009609e5"
+    "revision": "bb0c898a80644de438e6efe5d88d30bf092935cd"
   },
   "kconfig": {
     "revision": "9ac99fe4c0c27a35dc6f757cef534c646e944881"
@@ -516,10 +516,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "98c2130c59ca7553b47086f91c5d22180151ad55"
+    "revision": "781514ec0b786e516e4da3edc64fdfcf76400e4e"
   },
   "ocaml_interface": {
-    "revision": "98c2130c59ca7553b47086f91c5d22180151ad55"
+    "revision": "781514ec0b786e516e4da3edc64fdfcf76400e4e"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -762,7 +762,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "742723056556ec80ca4da09a6411fff86b330911"
+    "revision": "f4be8072f18fb9704fd35d4b8154ae2b19e314c0"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -900,7 +900,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
-    "revision": "7c7b03e69710a31031e02bc18a7c3c6542a010e2"
+    "revision": "8117b0ab58df8afb902c0862b7f6eb3bbb06c7ab"
   },
   "yaml": {
     "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"

From 622a4a6ba76d1de52b72a965159213ae655b4ac7 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 06:44:31 +0000
Subject: [PATCH 2060/2704] bot(lockfile): update c_sharp, nickel

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3e49d194f..f66d7a8be 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "3aa2995549d5d8b26928e8d3fa2770fd4327414e"
   },
   "c_sharp": {
-    "revision": "4bf615f8d688f50d69fc5677187dc35f22e03ad6"
+    "revision": "acff8cbb53a1d7b9cd07b209c9933a0e2da9ef35"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -486,7 +486,7 @@
     "revision": "281d184b8240b2b22670b8907b57b6d6842db6f3"
   },
   "nickel": {
-    "revision": "ddaa2bc22355effd97c0d6b09ff5962705c6368d"
+    "revision": "25464b33522c3f609fa512aa9651707c0b66d48b"
   },
   "nim": {
     "revision": "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7"

From 10a9464a82fb540cca912a1d25810f242cb97b5f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 8 Jan 2025 06:43:45 +0000
Subject: [PATCH 2061/2704] bot(lockfile): update groovy, python

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f66d7a8be..de520cc15 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -294,7 +294,7 @@
     "revision": "76554f4f2339f5a24eed19c58f2079b51c694152"
   },
   "groovy": {
-    "revision": "b53a8cc1075e056b8223b86f3bb392e0d57ae101"
+    "revision": "1f30c3398495dfeba24c7aa3b12a2bc68c0bd419"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -609,7 +609,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "bffb65a8cfe4e46290331dfef0dbf0ef3679de11"
+    "revision": "409b5d671eb0ea4972eeacaaca24bbec1acf79b1"
   },
   "ql": {
     "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"

From 8ca76960ae75e0a3bb231402558eb50e79433161 Mon Sep 17 00:00:00 2001
From: Ian Hobson <ian.r.hobson@gmail.com>
Date: Tue, 7 Jan 2025 23:26:48 +0100
Subject: [PATCH 2062/2704] feat(koto): Update highlighting for 0.15

---
 queries/koto/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/koto/highlights.scm b/queries/koto/highlights.scm
index 021e504cf..bd6ce8d0e 100644
--- a/queries/koto/highlights.scm
+++ b/queries/koto/highlights.scm
@@ -18,8 +18,12 @@
   ">="
   ".."
   "..="
+  "->"
+  (null_check)
 ] @operator
 
+"let" @keyword
+
 [
   "and"
   "not"
@@ -129,3 +133,6 @@
   (identifier) @variable.parameter)
 
 (ellipsis) @variable.parameter
+
+(type
+  _ @type)

From 6df6e80417b58abe377c90f5e3f7fe94cf7dfc55 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 9 Jan 2025 06:43:21 +0000
Subject: [PATCH 2063/2704] bot(lockfile): update ocaml, ocaml_interface

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index de520cc15..44ac05e29 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -516,10 +516,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "781514ec0b786e516e4da3edc64fdfcf76400e4e"
+    "revision": "57644edfbba0edb38ac17dba2add4c243fa3539b"
   },
   "ocaml_interface": {
-    "revision": "781514ec0b786e516e4da3edc64fdfcf76400e4e"
+    "revision": "57644edfbba0edb38ac17dba2add4c243fa3539b"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"

From 057990eb245d90e6085dcc4d57705a20b34a03ea Mon Sep 17 00:00:00 2001
From: Igor <igorlfs@ufmg.br>
Date: Fri, 10 Jan 2025 00:04:06 -0300
Subject: [PATCH 2064/2704] feat(http): fold queries

---
 queries/http/folds.scm | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 queries/http/folds.scm

diff --git a/queries/http/folds.scm b/queries/http/folds.scm
new file mode 100644
index 000000000..f7108a551
--- /dev/null
+++ b/queries/http/folds.scm
@@ -0,0 +1,5 @@
+[
+  (section)
+  (json_body)
+  (variable_declaration)+
+] @fold

From 306dd6e9dc806db1d79568d26e1c9b6c98b95fbc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 06:44:23 +0000
Subject: [PATCH 2065/2704] bot(lockfile): update koto

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 44ac05e29..b241a7617 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -408,7 +408,7 @@
     "revision": "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"
   },
   "koto": {
-    "revision": "7258681498ac92f24b2d7ebb844b5e79dc3cf9ac"
+    "revision": "329b0e84ef6cc6950665de4accd0bdda1601a2f1"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"

From 5780226a4f8dcc4adb4202a6d521ed118a992c34 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 11 Jan 2025 06:43:02 +0000
Subject: [PATCH 2066/2704] bot(lockfile): update apex, mlir, sflog, soql, sosl

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b241a7617..168cddcf0 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
+    "revision": "440a718101bc7207c936bc1284b388347e97b045"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -474,7 +474,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "01065decfd6877fe3c4bae05782b8892544cb73e"
+    "revision": "fb24a74b4e1c675b91e34fbacaf08673dd4263a0"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -696,7 +696,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
+    "revision": "440a718101bc7207c936bc1284b388347e97b045"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -717,10 +717,10 @@
     "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
   },
   "soql": {
-    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
+    "revision": "440a718101bc7207c936bc1284b388347e97b045"
   },
   "sosl": {
-    "revision": "bb2faa992f6915079c2731632fba74874b85d188"
+    "revision": "440a718101bc7207c936bc1284b388347e97b045"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"

From e1e2ad1448f67a2ffc4bf8f6a315cf08a179d71e Mon Sep 17 00:00:00 2001
From: Brian Cardarella <bcardarella@gmail.com>
Date: Sat, 11 Jan 2025 04:44:04 -0500
Subject: [PATCH 2067/2704] feat(elixir): add highlight for LVN sigils

---
 queries/elixir/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/elixir/injections.scm b/queries/elixir/injections.scm
index cc74f792a..f70fd984c 100644
--- a/queries/elixir/injections.scm
+++ b/queries/elixir/injections.scm
@@ -21,7 +21,7 @@
 (sigil
   (sigil_name) @_sigil_name
   (quoted_content) @injection.content
-  (#eq? @_sigil_name "H")
+  (#any-of? @_sigil_name "H" "LVN")
   (#set! injection.language "heex"))
 
 ; Surface

From 9ef2e37e1b3200004f872a536f0c8ed968b742e6 Mon Sep 17 00:00:00 2001
From: JSaugsburg <joseph.benedikt.stout@gmail.com>
Date: Sat, 11 Jan 2025 14:31:24 +0100
Subject: [PATCH 2068/2704] feat(awk): highlight more builtin functions

---
 queries/awk/highlights.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
index 904cf2a9a..51ec9c08e 100644
--- a/queries/awk/highlights.scm
+++ b/queries/awk/highlights.scm
@@ -53,6 +53,40 @@
     (identifier) @variable.parameter))
 
 [
+  "asort"
+  "asorti"
+  "bindtextdomain"
+  "compl"
+  "cos"
+  "dcgettext"
+  "dcngettext"
+  "exp"
+  "gensub"
+  "gsub"
+  "index"
+  "int"
+  "isarray"
+  "length"
+  "log"
+  "lshift"
+  "match"
+  "mktime"
+  "patsplit"
+  "rand"
+  "rshift"
+  "sin"
+  "split"
+  "sprintf"
+  "sqrt"
+  "srand"
+  "strftime"
+  "strtonum"
+  "sub"
+  "substr"
+  "systime"
+  "tolower"
+  "toupper"
+  "typeof"
   "print"
   "printf"
   "getline"

From 29f96aafe1ec99f464732b4586af53d2953345bb Mon Sep 17 00:00:00 2001
From: someone13574 <81528246+someone13574@users.noreply.github.com>
Date: Sat, 11 Jan 2025 17:12:54 -0500
Subject: [PATCH 2069/2704] fix(verilog): add ifndef highlight (#7548)

---
 queries/verilog/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 71eb06a16..c5b21d8bc 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -576,6 +576,7 @@ c_name: (c_identifier) @function
   "directive_undef"
   "directive_undefineall"
   "directive_ifdef"
+  "directive_ifndef"
   "directive_elsif"
   "directive_endif"
   "directive_else"

From 097fb77312c731347180e8907424f6c967323f05 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 12 Jan 2025 06:42:48 +0000
Subject: [PATCH 2070/2704] bot(lockfile): update css, fortran, gomod, ocaml,
 ocaml_interface, roc

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 168cddcf0..1485661f6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -93,7 +93,7 @@
     "revision": "f41b4f66a42100be405f96bdc4ebc4a61095d3e8"
   },
   "css": {
-    "revision": "6a442a3cf461b0ce275339e5afa178693484c927"
+    "revision": "5c89b88a37a2e1e36c031469462d6ee85ff2c13c"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -201,7 +201,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "c979a86414d3c5bfabee72356bb22bd5f87d0942"
+    "revision": "7ee481d7061563cac880bcde7e6b55128c3babd1"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -273,7 +273,7 @@
     "revision": "941955d027f1d8530501e77ce5e1d6035f5f99c1"
   },
   "gomod": {
-    "revision": "3b01edce2b9ea6766ca19328d1850e456fde3103"
+    "revision": "bcac24601006160cdb16775967e380e685bf0481"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -516,10 +516,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "57644edfbba0edb38ac17dba2add4c243fa3539b"
+    "revision": "103dec4e70c1041c56a3f8ed91435084244a00cd"
   },
   "ocaml_interface": {
-    "revision": "57644edfbba0edb38ac17dba2add4c243fa3539b"
+    "revision": "103dec4e70c1041c56a3f8ed91435084244a00cd"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
@@ -666,7 +666,7 @@
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
   },
   "roc": {
-    "revision": "7d29fc24b36119494b4dc3f3d967075e261706c1"
+    "revision": "de0839d6c7db2405e827435cf3ac62d22f4bd5e9"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"

From dc9bf52c1f8b9abae0c10e0192baea2e720472ef Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 06:46:25 +0000
Subject: [PATCH 2071/2704] bot(lockfile): update apex, dockerfile,
 editorconfig, gomod, mlir, odin, sflog, soql, sosl, xresources

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 1485661f6..a1c1212de 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "440a718101bc7207c936bc1284b388347e97b045"
+    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -132,7 +132,7 @@
     "revision": "886601b67d1f4690173a4925c214343c30704d32"
   },
   "dockerfile": {
-    "revision": "087daa20438a6cc01fa5e6fe6906d77c869d19fe"
+    "revision": "971acdd908568b4531b0ba28a445bf0bb720aba5"
   },
   "dot": {
     "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
@@ -150,7 +150,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "ad9d7b84453426c40717c2b2c6b13d0a955d0662"
+    "revision": "02f562e71dc28d573187809eecdffaee7c82321c"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -273,7 +273,7 @@
     "revision": "941955d027f1d8530501e77ce5e1d6035f5f99c1"
   },
   "gomod": {
-    "revision": "bcac24601006160cdb16775967e380e685bf0481"
+    "revision": "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c"
   },
   "gosum": {
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
@@ -474,7 +474,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "fb24a74b4e1c675b91e34fbacaf08673dd4263a0"
+    "revision": "b5d5f238b371b7c9b764f6a053b045dda92bc836"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -525,7 +525,7 @@
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
   },
   "odin": {
-    "revision": "e8adc739b78409a99f8c31313f0bb54cc538cf73"
+    "revision": "d2ca8efb4487e156a60d5bd6db2598b872629403"
   },
   "org": {
     "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
@@ -696,7 +696,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "440a718101bc7207c936bc1284b388347e97b045"
+    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -717,10 +717,10 @@
     "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
   },
   "soql": {
-    "revision": "440a718101bc7207c936bc1284b388347e97b045"
+    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
   },
   "sosl": {
-    "revision": "440a718101bc7207c936bc1284b388347e97b045"
+    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
@@ -900,7 +900,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
-    "revision": "8117b0ab58df8afb902c0862b7f6eb3bbb06c7ab"
+    "revision": "983f13acef542aef431a845fef084ddda8d9d666"
   },
   "yaml": {
     "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"

From c7dc251cddf2cdef1fa279fa797799728a5bfd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lan=20e=20Sousa?= <alan.esousa@vitibot.fr>
Date: Mon, 13 Jan 2025 09:05:36 +0100
Subject: [PATCH 2072/2704] fix(matlab): indentation of arguments statement

---
 queries/matlab/indents.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/matlab/indents.scm b/queries/matlab/indents.scm
index c217879d3..d446f45df 100644
--- a/queries/matlab/indents.scm
+++ b/queries/matlab/indents.scm
@@ -1,6 +1,7 @@
 "end" @indent.end @indent.branch
 
 [
+  (arguments_statement)
   (if_statement)
   (for_statement)
   (while_statement)

From e122b11d8380bfd8269bfc69d35d597d710aa444 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 06:42:28 +0000
Subject: [PATCH 2073/2704] bot(lockfile): update apex, gap, groovy, matlab,
 nix, sflog, soql, sosl

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a1c1212de..74e3e7b64 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
+    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -216,7 +216,7 @@
     "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
   },
   "gap": {
-    "revision": "ea70c228dd1d3875aeb264bf99903dc9a696894f"
+    "revision": "7db79590d2f8b0e0246008ecfd569b4bfca587a9"
   },
   "gaptst": {
     "revision": "69086d7627c03e1f4baf766bcef14c60d9e92331"
@@ -294,7 +294,7 @@
     "revision": "76554f4f2339f5a24eed19c58f2079b51c694152"
   },
   "groovy": {
-    "revision": "1f30c3398495dfeba24c7aa3b12a2bc68c0bd419"
+    "revision": "d1556e77d49df1a28cd564af5766fdaea8ab7063"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -462,7 +462,7 @@
     "revision": "192407ab5a24bfc24f13332979b5e7967518754a"
   },
   "matlab": {
-    "revision": "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"
+    "revision": "b0a0198b182574cd3ca0447264c83331901b9338"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -498,7 +498,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "21897cc3dcd15325303e46b85295b743742af6ab"
+    "revision": "4b952d99ce6fc795ff3cfa48b05637f2b1751d3b"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -696,7 +696,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
+    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -717,10 +717,10 @@
     "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
   },
   "soql": {
-    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
+    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
   },
   "sosl": {
-    "revision": "129eaf01a15437110846b28cb8d8bb6df29968d9"
+    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
   },
   "sourcepawn": {
     "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"

From 984214ef8e4ca18d77639663319aabdfba89632f Mon Sep 17 00:00:00 2001
From: Guilherme Soares <48023091+guilhas07@users.noreply.github.com>
Date: Tue, 14 Jan 2025 07:20:51 +0000
Subject: [PATCH 2074/2704] feat(gotmpl): highlight "=" operator (#7553)

---
 queries/gotmpl/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/gotmpl/highlights.scm b/queries/gotmpl/highlights.scm
index fd8189453..4ee768c28 100644
--- a/queries/gotmpl/highlights.scm
+++ b/queries/gotmpl/highlights.scm
@@ -32,6 +32,7 @@
 ; Operators
 ([
   "|"
+  "="
   ":="
 ] @operator
   (#set! priority 110))

From f0c928dbe93533b7e35894a8f957f40150d1f663 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 06:42:23 +0000
Subject: [PATCH 2075/2704] bot(lockfile): update facility, fortran, gotmpl,
 helm, ocaml, ocaml_interface

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 74e3e7b64..286543cbc 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -177,7 +177,7 @@
     "revision": "4095e9993acc89cb311ab1be8614c21b1cf768a4"
   },
   "facility": {
-    "revision": "2d037f2f2bf668737f72e6be6eda4b7918b68d86"
+    "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
   },
   "faust": {
     "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
@@ -201,7 +201,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "7ee481d7061563cac880bcde7e6b55128c3babd1"
+    "revision": "5fc069e4f05810ec6f8e399cd522e4eba864181c"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -279,7 +279,7 @@
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gotmpl": {
-    "revision": "ca52fbfc98366c585b84f4cb3745df49f33cd140"
+    "revision": "161e38cf9ec47109edefe99aa127e5b111e2e189"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -318,7 +318,7 @@
     "revision": "f6b83f305a755cd49cf5f6a66b2b789be93dc7b9"
   },
   "helm": {
-    "revision": "ca52fbfc98366c585b84f4cb3745df49f33cd140"
+    "revision": "161e38cf9ec47109edefe99aa127e5b111e2e189"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -516,10 +516,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "103dec4e70c1041c56a3f8ed91435084244a00cd"
+    "revision": "37ad9efe601316248b22173d2ff19a6b4c992016"
   },
   "ocaml_interface": {
-    "revision": "103dec4e70c1041c56a3f8ed91435084244a00cd"
+    "revision": "37ad9efe601316248b22173d2ff19a6b4c992016"
   },
   "ocamllex": {
     "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"

From a67a312e7b08cbf2895d8f29a4b1f38f18d9a8e8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 09:33:47 +0100
Subject: [PATCH 2076/2704] bot(lockfile): update earthfile, gotmpl, heex,
 helm, vhs (#7557)

Co-authored-by: nvim-treesitter-bot[bot] <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 286543cbc..16ea9c486 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -144,7 +144,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "earthfile": {
-    "revision": "059fb087247bef8789e938629388c3e7af32c986"
+    "revision": "a44f6f6d22ea4fe16fa37ababd90240ab87a9e0d"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -279,7 +279,7 @@
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gotmpl": {
-    "revision": "161e38cf9ec47109edefe99aa127e5b111e2e189"
+    "revision": "ab4a8c4a51f271f320f2bad6a5d499415bf541b1"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -315,10 +315,10 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "heex": {
-    "revision": "f6b83f305a755cd49cf5f6a66b2b789be93dc7b9"
+    "revision": "76d4b3e42f6b363245ba4df566c29fc4150154d1"
   },
   "helm": {
-    "revision": "161e38cf9ec47109edefe99aa127e5b111e2e189"
+    "revision": "ab4a8c4a51f271f320f2bad6a5d499415bf541b1"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -867,7 +867,7 @@
     "revision": "63d0360d42c43b4902b8470c7ddcf323432e2dde"
   },
   "vhs": {
-    "revision": "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"
+    "revision": "037e675d547b18bbf3fdeb222e242ae5dccc39d7"
   },
   "vim": {
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"

From 8758abeb4d7c0fb501226d584cd45a1c6836f535 Mon Sep 17 00:00:00 2001
From: Serhii Khoma <srghma@gmail.com>
Date: Thu, 16 Jan 2025 23:34:37 +0700
Subject: [PATCH 2077/2704] feat(idris): add parser and queries (#7274)

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   9 ++
 queries/idris/folds.scm         |   1 +
 queries/idris/highlights.scm    | 224 ++++++++++++++++++++++++++++++++
 queries/idris/injections.scm    |   2 +
 queries/idris/locals.scm        |  33 +++++
 7 files changed, 273 insertions(+)
 create mode 100644 queries/idris/folds.scm
 create mode 100644 queries/idris/highlights.scm
 create mode 100644 queries/idris/injections.scm
 create mode 100644 queries/idris/locals.scm

diff --git a/README.md b/README.md
index 0c14f42b4..2232d1b23 100644
--- a/README.md
+++ b/README.md
@@ -291,6 +291,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [hurl](https://github.com/pfeiferj/tree-sitter-hurl) (maintained by @pfeiferj)
 - [x] [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) (maintained by @luckasRanarison)
 - [x] [idl](https://github.com/cathaysia/tree-sitter-idl) (maintained by @cathaysia)
+- [x] [idris](https://github.com/kayhide/tree-sitter-idris) (maintained by @srghma)
 - [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
 - [x] [inko](https://github.com/inko-lang/tree-sitter-inko) (maintained by @yorickpeterse)
 - [x] [ipkg](https://github.com/srghma/tree-sitter-ipkg) (maintained by @srghma)
diff --git a/lockfile.json b/lockfile.json
index 16ea9c486..327783fd7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -353,6 +353,9 @@
   "idl": {
     "revision": "86ff7f19747a761dc8ba72f4045fd64aed94ba4c"
   },
+  "idris": {
+    "revision": "c56a25cf57c68ff929356db25505c1cc4c7820f6"
+  },
   "ini": {
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d2259c9bb..61c0505b7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1051,6 +1051,15 @@ list.idl = {
   maintainers = { "@cathaysia" },
 }
 
+list.idris = {
+  install_info = {
+    url = "https://github.com/kayhide/tree-sitter-idris",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  filetype = "idris2",
+  maintainers = { "@srghma" },
+}
+
 list.ini = {
   install_info = {
     url = "https://github.com/justinmk/tree-sitter-ini",
diff --git a/queries/idris/folds.scm b/queries/idris/folds.scm
new file mode 100644
index 000000000..2f4885165
--- /dev/null
+++ b/queries/idris/folds.scm
@@ -0,0 +1 @@
+(function) @fold
diff --git a/queries/idris/highlights.scm b/queries/idris/highlights.scm
new file mode 100644
index 000000000..f39deaec6
--- /dev/null
+++ b/queries/idris/highlights.scm
@@ -0,0 +1,224 @@
+; ------------------------------------------------------------------------------
+; Literals and comments
+[
+  (integer)
+  (quantity)
+] @number
+
+(literal
+  (number)) @number.float
+
+(char) @character
+
+[
+  (string)
+  (pat_string)
+  (triple_quote_string)
+] @string
+
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^|||"))
+
+(unit) @constant
+
+; more general captures are moved to the top
+; before overwritten later by more specific captures
+[
+  (loname)
+  (caname)
+] @variable
+
+; ------------------------------------------------------------------------------
+; Punctuation
+[
+  "("
+  ")"
+  "{"
+  "@{"
+  "}"
+  "["
+  "[<"
+  "]"
+] @punctuation.bracket
+
+[
+  (comma)
+  (colon)
+  (pat_op)
+  (tuple_operator)
+] @punctuation.delimiter
+
+(pat_name
+  (loname) @variable.parameter)
+
+; ------------------------------------------------------------------------------
+; Types
+(signature
+  (loname) @type)
+
+; ------------------------------------------------------------------------------
+; Keywords, operators, imports
+[
+  "if"
+  "then"
+  "else"
+  "case"
+  "of"
+] @keyword.conditional
+
+[
+  "import"
+  "module"
+  "namespace"
+  "parameters"
+] @keyword.import
+
+[
+  (operator)
+  (equal)
+  (wildcard)
+  "."
+  "|"
+  "=>"
+  "⇒"
+  "<="
+  "⇐"
+  "->"
+  "→"
+  "<-"
+  "←"
+  "\\"
+  "`"
+] @operator
+
+(qualified_loname
+  (caname) @module)
+
+(qualified_caname
+  (caname) @constructor)
+
+(qualified_operator
+  (caname) @module)
+
+(import
+  (caname) @module)
+
+(module
+  (caname) @module)
+
+[
+  (where)
+  "rewrite"
+  "interface"
+  "implementation"
+  "using"
+  "record"
+  "as"
+  "do"
+  (forall)
+  (fixity)
+  (impossible)
+  (with)
+  (proof)
+] @keyword.operator
+
+[
+  "data"
+  "let"
+  "in"
+  (visibility)
+  (totality)
+] @keyword.modifier
+
+[
+  "="
+  "$="
+  ":="
+] @operator
+
+(hole) @label
+
+[
+  (pragma_language)
+  (pragma_default)
+  (pragma_builtin)
+  (pragma_name)
+  (pragma_ambiguity_depth)
+  (pragma_auto_implicit_depth)
+  (pragma_logging)
+  (pragma_prefix_record_projections)
+  (pragma_transform)
+  (pragma_unbound_implicits)
+  (pragma_auto_lazy)
+  (pragma_search_timeout)
+  (pragma_nf_metavar_threshold)
+  (pragma_cg)
+  (pragma_allow_overloads)
+  (pragma_deprecate)
+  (pragma_inline)
+  (pragma_noinline)
+  (pragma_tcinline)
+  (pragma_hide)
+  (pragma_unhide)
+  (pragma_unsafe)
+  (pragma_spec)
+  (pragma_foreign)
+  (pragma_foreign_impl)
+  (pragma_export)
+  (pragma_nomangle)
+  (pragma_hint)
+  (pragma_defaulthint)
+  (pragma_globalhint)
+  (pragma_extern)
+  (pragma_macro)
+  (pragma_start)
+  (pragma_rewrite)
+  (pragma_pair)
+  (pragma_integerLit)
+  (pragma_stringLit)
+  (pragma_charLit)
+  (pragma_doubleLit)
+  (pragma_TTImpLit)
+  (pragma_declsLit)
+  (pragma_nameLit)
+  (pragma_runElab)
+  (pragma_search)
+  (pragma_World)
+  (pragma_MkWorld)
+  (pragma_syntactic)
+] @label
+
+; ------------------------------------------------------------------------------
+; Functions and variables
+(exp_name
+  (loname) @function.call)
+
+(constructor
+  "constructor" @keyword.function
+  .
+  (caname) @constructor)
+
+(exp_record_access
+  field: (_) @variable.member)
+
+(signature
+  name: (loname) @function)
+
+(function
+  (lhs
+    (funvar
+      subject: [
+        (loname)
+        (caname)
+      ] @function)))
+
+(data
+  name: (data_name) @type)
+
+(interface_head
+  name: (interface_name) @type)
+
+(implementation_head
+  (interface_name) @type)
diff --git a/queries/idris/injections.scm b/queries/idris/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/idris/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/idris/locals.scm b/queries/idris/locals.scm
new file mode 100644
index 000000000..c46f831f7
--- /dev/null
+++ b/queries/idris/locals.scm
@@ -0,0 +1,33 @@
+(signature
+  name: (loname)) @local.definition.var
+
+(signature
+  name: (caname)) @local.definition.type
+
+(function
+  (lhs
+    (funvar
+      subject: (loname)))) @local.definition.function
+
+(function
+  (lhs
+    (funvar
+      subject: (caname)))) @local.definition.function
+
+(type_var
+  (loname)) @local.definition.type
+
+(pat_name
+  (loname)) @local.definition.var
+
+(pat_name
+  (caname)) @local.definition.var
+
+(exp_name
+  (loname)) @local.reference
+
+(exp_name
+  (caname)) @local.reference
+
+(function
+  (rhs) @local.scope)

From fd59f984416f696d85119fd4d15ce0965b179944 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 16 Jan 2025 17:36:44 +0100
Subject: [PATCH 2078/2704] fix(idris): correct keyword captures

Fixup for #7274
---
 queries/idris/highlights.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/queries/idris/highlights.scm b/queries/idris/highlights.scm
index f39deaec6..d3dfa7a9f 100644
--- a/queries/idris/highlights.scm
+++ b/queries/idris/highlights.scm
@@ -108,6 +108,11 @@
 (module
   (caname) @module)
 
+[
+  "let"
+  "in"
+] @keyword
+
 [
   (where)
   "rewrite"
@@ -125,13 +130,12 @@
 ] @keyword.operator
 
 [
-  "data"
-  "let"
-  "in"
   (visibility)
   (totality)
 ] @keyword.modifier
 
+"data" @keyword.type
+
 [
   "="
   "$="

From b952a0ab6caabd7839af6b562023bbdf149feb90 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 06:43:52 +0000
Subject: [PATCH 2079/2704] bot(lockfile): update erlang, heex, janet_simple,
 lalrpop

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 327783fd7..75e0ffae5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "332262529bc51abf5746317b2255ccc2fff778f8"
   },
   "erlang": {
-    "revision": "4095e9993acc89cb311ab1be8614c21b1cf768a4"
+    "revision": "d2281ab060093290045941a865a3834eec862a3f"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -315,7 +315,7 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "heex": {
-    "revision": "76d4b3e42f6b363245ba4df566c29fc4150154d1"
+    "revision": "a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45"
   },
   "helm": {
     "revision": "ab4a8c4a51f271f320f2bad6a5d499415bf541b1"
@@ -369,7 +369,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "12bfab7db8a5f5b1d774ef84b5831acd34936071"
+    "revision": "b4aa56fd0a2ea2708fc93062683ae5eaa4e973e6"
   },
   "java": {
     "revision": "94703d5a6bed02b98e438d7cad1136c01a60ba2c"
@@ -417,7 +417,7 @@
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
   },
   "lalrpop": {
-    "revision": "194c25539f435de415ee0551a5f07058833da915"
+    "revision": "a7f5ea297bd621d072ed4cb2cc8ba5ae64ae3c4b"
   },
   "latex": {
     "revision": "7b06f6ed394308e7407a1703d2724128c45fc9d7"

From 5da195ac3dfafd08d8b10756d975f0e01e1d563a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 Jan 2025 10:44:37 +0100
Subject: [PATCH 2080/2704] ci: use new issue types

---
 .github/ISSUE_TEMPLATE/bug_report.yml         | 2 +-
 .github/ISSUE_TEMPLATE/feature_request.md     | 2 +-
 .github/ISSUE_TEMPLATE/highlighting_issue.yml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f68dd2486..78ce29cd6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug report
 description: Create a report to help us improve
-labels: [bug]
+type: 'bug'
 
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index d883b8f2d..1f87c07b4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ""
-labels: enhancement
+type: enhancement
 assignees: ""
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/highlighting_issue.yml b/.github/ISSUE_TEMPLATE/highlighting_issue.yml
index a429b5eb8..4b9b0a4a7 100644
--- a/.github/ISSUE_TEMPLATE/highlighting_issue.yml
+++ b/.github/ISSUE_TEMPLATE/highlighting_issue.yml
@@ -1,5 +1,6 @@
 name: Highlighting issue
 description: Missing or incorrect highlights or you want to change the way something is highlighted
+type: 'bug'
 labels: [highlights]
 
 body:

From 4423f3053964461656c7432fd33f205ef88a6168 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 19 Jan 2025 06:40:45 +0000
Subject: [PATCH 2081/2704] bot(lockfile): update fish

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 75e0ffae5..b3c3b7ed7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -192,7 +192,7 @@
     "revision": "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5"
   },
   "fish": {
-    "revision": "a78aef9abc395c600c38a037ac779afc7e3cc9e0"
+    "revision": "70640c0696abde32622afc43291a385681afbd32"
   },
   "foam": {
     "revision": "f08bb76892b93e5b23c45ac3bd6b1eea5df323cc"

From 645d14f40f6c83da255591e16de1c0dfe5bf8ed4 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 19 Jan 2025 01:57:38 -0800
Subject: [PATCH 2082/2704] feat(hyprlang): bash injections for exec
 keybindings

---
 queries/hyprlang/injections.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/queries/hyprlang/injections.scm b/queries/hyprlang/injections.scm
index d38d499b2..e7c552eb2 100644
--- a/queries/hyprlang/injections.scm
+++ b/queries/hyprlang/injections.scm
@@ -4,3 +4,18 @@
 (exec
   (string) @injection.content
   (#set! injection.language "bash"))
+
+((keyword
+  (name) @_bind
+  (params
+    .
+    (_)
+    .
+    (_)
+    .
+    (string) @_exec
+    .
+    (string) @injection.content))
+  (#lua-match? @_bind "^bind")
+  (#lua-match? @_exec "^%s*exec%s*$")
+  (#set! injection.language "bash"))

From 87b1f250980d288f37bfacae8bcafc0d843c2751 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 18 Jan 2025 12:57:44 -0800
Subject: [PATCH 2083/2704] feat(hyprlang): add missing highlights

---
 queries/hyprlang/highlights.scm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/queries/hyprlang/highlights.scm b/queries/hyprlang/highlights.scm
index 597edcbf4..5e3514125 100644
--- a/queries/hyprlang/highlights.scm
+++ b/queries/hyprlang/highlights.scm
@@ -16,7 +16,7 @@
   (name) @module)
 
 (section
-  device: (device_name) @type)
+  device: (device_name) @string.special)
 
 (variable) @variable
 
@@ -24,7 +24,13 @@
 
 (boolean) @boolean
 
-(mod) @constant
+[
+  "deg"
+  (string)
+  (string_literal)
+] @string
+
+(mod) @constant.builtin
 
 [
   "rgb"
@@ -36,13 +42,14 @@
   (legacy_hex)
   (angle)
   (hex)
-  (display)
-  (position)
 ] @number
 
-"deg" @type
-
-"," @punctuation.delimiter
+[
+  ","
+  ":"
+  "x"
+  "@"
+] @punctuation.delimiter
 
 [
   "("

From 1c77042243187a819e7e4e3e34b98705b3e71366 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 19 Jan 2025 18:07:07 -0800
Subject: [PATCH 2084/2704] feat(hyprlang): bash injection for hypridle
 variables

---
 queries/hyprlang/injections.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/queries/hyprlang/injections.scm b/queries/hyprlang/injections.scm
index e7c552eb2..3b91ad0e0 100644
--- a/queries/hyprlang/injections.scm
+++ b/queries/hyprlang/injections.scm
@@ -19,3 +19,11 @@
   (#lua-match? @_bind "^bind")
   (#lua-match? @_exec "^%s*exec%s*$")
   (#set! injection.language "bash"))
+
+((assignment
+  (name) @_name
+  (string) @injection.content)
+  (#any-of? @_name
+    "lock_cmd" "unlock_cmd" "before_sleep_cmd" "after_sleep_cmd" "on-timeout" "on-resume"
+    "reload_cmd")
+  (#set! injection.language "bash"))

From 4d93fae5a3764451dacd94796d0de16a752ae3eb Mon Sep 17 00:00:00 2001
From: Baraa Homsi <49784526+bodby@users.noreply.github.com>
Date: Mon, 20 Jan 2025 03:03:13 +0000
Subject: [PATCH 2085/2704] fix(nix): highlight functions when part of a set
 (#7547)

* feat(nix): Fix function highlights when part of a set

* fix(nix): Highlight only the last identifier node in functions

* fix(nix): Higher precedence for builtins compared to functions and member vars
---
 queries/nix/highlights.scm | 64 ++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 7cdcc3e1d..785d249b9 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -90,6 +90,44 @@
   name: (identifier) @boolean
   (#any-of? @boolean "true" "false"))
 
+; string interpolation (this was very annoying to get working properly)
+(interpolation
+  "${" @punctuation.special
+  (_)
+  "}" @punctuation.special) @none
+
+(select_expression
+  expression: (_) @_expr
+  attrpath: (attrpath
+    attr: (identifier) @variable.member)
+  (#not-eq? @_expr "builtins"))
+
+(attrset_expression
+  (binding_set
+    (binding
+      .
+      (attrpath
+        (identifier) @variable.member))))
+
+(rec_attrset_expression
+  (binding_set
+    (binding
+      .
+      (attrpath
+        (identifier) @variable.member))))
+
+(apply_expression
+  function: [
+    (select_expression
+      attrpath: (attrpath
+        .
+        attr: (identifier) @function.call .))
+    (select_expression
+      attrpath: (attrpath
+        (_)
+        attr: (identifier) @function.call .))
+  ])
+
 ; builtin functions (with builtins prefix)
 (select_expression
   expression: (variable_expression
@@ -138,32 +176,6 @@
     ; nix eval --impure --expr 'with builtins; filter (x: !(isFunction builtins.${x} || isBool builtins.${x})) (attrNames builtins)'
     "builtins" "currentSystem" "currentTime" "langVersion" "nixPath" "nixVersion" "null" "storeDir"))
 
-; string interpolation (this was very annoying to get working properly)
-(interpolation
-  "${" @punctuation.special
-  (_)
-  "}" @punctuation.special) @none
-
-(select_expression
-  expression: (_) @_expr
-  attrpath: (attrpath
-    attr: (identifier) @variable.member)
-  (#not-eq? @_expr "builtins"))
-
-(attrset_expression
-  (binding_set
-    (binding
-      .
-      (attrpath
-        (identifier) @variable.member))))
-
-(rec_attrset_expression
-  (binding_set
-    (binding
-      .
-      (attrpath
-        (identifier) @variable.member))))
-
 ; function definition
 (binding
   attrpath: (attrpath

From 7edaaf98874c9a556c648815e21b53a662de68de Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 19 Jan 2025 19:29:24 -0800
Subject: [PATCH 2086/2704] feat(css): highlight `@keyframes` name (#7569)

---
 queries/css/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index acc2b638d..49471fdb2 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -72,6 +72,8 @@
 
 (namespace_name) @module
 
+(keyframes_name) @variable
+
 ((property_name) @variable
   (#lua-match? @variable "^[-][-]"))
 

From 47b333e63df78e09faec6e1f69914ef6aa0a2743 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 06:44:02 +0000
Subject: [PATCH 2087/2704] bot(lockfile): update hyprlang, query, sourcepawn,
 templ, vhdl, xresources

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b3c3b7ed7..d5e3c5a24 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -348,7 +348,7 @@
     "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
   },
   "hyprlang": {
-    "revision": "6858695eba0e63b9e0fceef081d291eb352abce8"
+    "revision": "af796443b66d7ab00184992daa3bdaede0955c87"
   },
   "idl": {
     "revision": "86ff7f19747a761dc8ba72f4045fd64aed94ba4c"
@@ -624,7 +624,7 @@
     "revision": "8fef30e231d74b65c713bcbac21956156d8963da"
   },
   "query": {
-    "revision": "a6674e279b14958625d7a530cabe06119c7a1532"
+    "revision": "5c2d02747250bc326bc33687b3319b7db8554e24"
   },
   "r": {
     "revision": "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a"
@@ -726,7 +726,7 @@
     "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
   },
   "sourcepawn": {
-    "revision": "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"
+    "revision": "f2af8d0dc14c6790130cceb2a20027eb41a8297c"
   },
   "sparql": {
     "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
@@ -789,7 +789,7 @@
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
-    "revision": "60310af0d788a0160d719d4aff8f146b6e6c55bd"
+    "revision": "a9178bfc9cc8040c08f39b47bae5400a2bf06e50"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -867,7 +867,7 @@
     "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
-    "revision": "63d0360d42c43b4902b8470c7ddcf323432e2dde"
+    "revision": "da8ea8afa7899a99e43a7d61afef9f77b7a675eb"
   },
   "vhs": {
     "revision": "037e675d547b18bbf3fdeb222e242ae5dccc39d7"
@@ -903,7 +903,7 @@
     "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
   },
   "xresources": {
-    "revision": "983f13acef542aef431a845fef084ddda8d9d666"
+    "revision": "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"
   },
   "yaml": {
     "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"

From e8c5242f5323ee8b11983f955cab21bbef7e2df0 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sun, 19 Jan 2025 17:58:09 +0900
Subject: [PATCH 2088/2704] fix(inc-selection): handle injections

* Parse injections before starting selection.
* Make node_incremental climb up the LanaguageTree step by step.
  Previously it only considered the root parser and the bottommost
  parser. Now it works well with document with deeper injections, e.g.,
  ```lua
  vim.cmd[=[
  echo 'hello' 'world!'
  lua << EOF
  vim.cmd[[echo 'hello' 'world!']]
  EOF
  ]=]
  ```
---
 lua/nvim-treesitter/incremental_selection.lua | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lua/nvim-treesitter/incremental_selection.lua b/lua/nvim-treesitter/incremental_selection.lua
index 78f0915c8..570f9eed9 100644
--- a/lua/nvim-treesitter/incremental_selection.lua
+++ b/lua/nvim-treesitter/incremental_selection.lua
@@ -14,6 +14,7 @@ local selections = {}
 
 function M.init_selection()
   local buf = api.nvim_get_current_buf()
+  parsers.get_parser():parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
   local node = ts_utils.get_node_at_cursor()
   selections[buf] = { [1] = node }
   ts_utils.update_selection(buf, node)
@@ -62,8 +63,12 @@ local function select_incremental(get_parent)
     local csrow, cscol, cerow, cecol = visual_selection_range()
     -- Initialize incremental selection with current selection
     if not nodes or #nodes == 0 or not range_matches(nodes[#nodes]) then
-      local root = parsers.get_parser():parse()[1]:root()
-      local node = root:named_descendant_for_range(csrow - 1, cscol - 1, cerow - 1, cecol)
+      local parser = parsers.get_parser()
+      parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
+      local node = parser:named_node_for_range(
+        { csrow - 1, cscol - 1, cerow - 1, cecol },
+        { ignore_injections = false }
+      )
       ts_utils.update_selection(buf, node)
       if nodes and #nodes > 0 then
         table.insert(selections[buf], node)
@@ -78,14 +83,18 @@ local function select_incremental(get_parent)
     while true do
       local parent = get_parent(node)
       if not parent or parent == node then
-        -- Keep searching in the main tree
-        -- TODO: we should search on the parent tree of the current node.
-        local root = parsers.get_parser():parse()[1]:root()
-        parent = root:named_descendant_for_range(csrow - 1, cscol - 1, cerow - 1, cecol)
-        if not parent or root == node or parent == node then
+        -- Keep searching in the parent tree
+        local root_parser = parsers.get_parser()
+        root_parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
+        local current_parser = root_parser:language_for_range { csrow - 1, cscol - 1, cerow - 1, cecol }
+        if root_parser == current_parser then
+          node = root_parser:named_node_for_range { csrow - 1, cscol - 1, cerow - 1, cecol }
           ts_utils.update_selection(buf, node)
           return
         end
+        -- NOTE: parent() method is private
+        local parent_parser = current_parser:parent()
+        parent = parent_parser:named_node_for_range { csrow - 1, cscol - 1, cerow - 1, cecol }
       end
       node = parent
       local srow, scol, erow, ecol = ts_utils.get_vim_range { node:range() }

From 8acafab2bc25d270be88cf405cdf51bad12da33a Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Mon, 20 Jan 2025 03:50:10 +0900
Subject: [PATCH 2089/2704] fix: node selection at line start that ends
 injected region

---
 lua/nvim-treesitter/ts_utils.lua | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
index f2ee7f524..ce103790c 100644
--- a/lua/nvim-treesitter/ts_utils.lua
+++ b/lua/nvim-treesitter/ts_utils.lua
@@ -202,12 +202,26 @@ function M.get_root_for_position(line, col, root_lang_tree)
 
   local lang_tree = root_lang_tree:language_for_range { line, col, line, col }
 
-  for _, tree in pairs(lang_tree:trees()) do
-    local root = tree:root()
+  while true do
+    for _, tree in pairs(lang_tree:trees()) do
+      local root = tree:root()
 
-    if root and ts.is_in_node_range(root, line, col) then
-      return root, tree, lang_tree
+      if root and ts.is_in_node_range(root, line, col) then
+        return root, tree, lang_tree
+      end
     end
+
+    if lang_tree == root_lang_tree then
+      break
+    end
+
+    -- This case can happen when the cursor is at the start of a line that ends a injected region,
+    -- e.g., the first `]` in the following lua code:
+    -- ```
+    -- vim.cmd[[
+    -- ]]
+    -- ```
+    lang_tree = lang_tree:parent() -- NOTE: parent() method is private
   end
 
   -- This isn't a likely scenario, since the position must belong to a tree somewhere.

From 82939d5941cc939c0291699c1f7ee7046221aa17 Mon Sep 17 00:00:00 2001
From: Gabriel Holodak <gthepiper@gmail.com>
Date: Tue, 24 Dec 2024 00:27:01 -0500
Subject: [PATCH 2090/2704] fix(install): preserve command return code on
 Windows

`:TSInstallSync` relies on the `:system()` command to set
`v:shell_error` when an error code is returned during installation. On
Windows, the error code was always overwritten by `popd`'s return code.
---
 lua/nvim-treesitter/shell_command_selectors.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 48f610169..79bdb763f 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -353,9 +353,9 @@ end
 function M.make_directory_change_for_command(dir, command)
   if fn.has "win32" == 1 then
     if string.find(vim.o.shell, "cmd") ~= nil then
-      return string.format("pushd %s & %s & popd", cmdpath(dir), command)
+      return string.format("pushd %s & %s", cmdpath(dir), command)
     else
-      return string.format("pushd %s ; %s ; popd", cmdpath(dir), command)
+      return string.format("pushd %s ; %s", cmdpath(dir), command)
     end
   else
     return string.format("cd %s;\n%s", dir, command)

From 0fb02ac5c39423b5c863eb7c8dd7b093879f1488 Mon Sep 17 00:00:00 2001
From: Gabriel Holodak <gthepiper@gmail.com>
Date: Tue, 24 Dec 2024 01:07:19 -0500
Subject: [PATCH 2091/2704] fix(install): use std=c11

---
 lua/nvim-treesitter/shell_command_selectors.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
index 79bdb763f..ee1d64745 100644
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ b/lua/nvim-treesitter/shell_command_selectors.lua
@@ -92,6 +92,7 @@ function M.select_compiler_args(repo, compiler)
       "/Isrc",
       repo.files,
       "-Os",
+      "/std:c11",
       "/utf-8",
       "/LD",
     }
@@ -105,6 +106,7 @@ function M.select_compiler_args(repo, compiler)
       "-Isrc",
       "-shared",
       "-Os",
+      "-std=c11",
     }
   else
     local args = {
@@ -113,6 +115,7 @@ function M.select_compiler_args(repo, compiler)
       "-I./src",
       repo.files,
       "-Os",
+      "-std=c11",
     }
     if fn.has "mac" == 1 then
       table.insert(args, "-bundle")

From 65c466178ea760e75b9ccf3969b1310a1ef843e2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2025 06:43:00 +0000
Subject: [PATCH 2092/2704] bot(lockfile): update erlang, hyprlang, solidity,
 t32

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d5e3c5a24..12cabd059 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "332262529bc51abf5746317b2255ccc2fff778f8"
   },
   "erlang": {
-    "revision": "d2281ab060093290045941a865a3834eec862a3f"
+    "revision": "5fc0a536009391b01a90df9e59833c847c8cf72b"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -348,7 +348,7 @@
     "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
   },
   "hyprlang": {
-    "revision": "af796443b66d7ab00184992daa3bdaede0955c87"
+    "revision": "d719158abe537b1916daaea6fa03287089f0b601"
   },
   "idl": {
     "revision": "86ff7f19747a761dc8ba72f4045fd64aed94ba4c"
@@ -717,7 +717,7 @@
     "revision": "f36c1587624d6d84376c82a357c20fc319cbf02c"
   },
   "solidity": {
-    "revision": "f7f5251a3f5b1d04f0799b3571b12918af177fc8"
+    "revision": "727087514eff57d92e273a24303142308bce3381"
   },
   "soql": {
     "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
@@ -774,7 +774,7 @@
     "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
   },
   "t32": {
-    "revision": "ad23ed0325658adbb1dfb397d4dfbea8872585c6"
+    "revision": "e5a12f798f056049642aa03fbb83786e3a5b95d4"
   },
   "tablegen": {
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"

From 1c67567464b0b01d2f8ccd4237d9ecbb3eb2dff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Reichel?=
 <390145+theoo@users.noreply.github.com>
Date: Tue, 21 Jan 2025 09:25:08 +0100
Subject: [PATCH 2093/2704] feat(slim): add parser and queries (#7425)

---
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 ++++
 queries/slim/folds.scm          |  1 +
 queries/slim/highlights.scm     | 82 +++++++++++++++++++++++++++++++++
 queries/slim/indents.scm        |  4 ++
 queries/slim/injections.scm     | 39 ++++++++++++++++
 queries/slim/locals.scm         |  7 +++
 7 files changed, 144 insertions(+)
 create mode 100644 queries/slim/folds.scm
 create mode 100644 queries/slim/highlights.scm
 create mode 100644 queries/slim/indents.scm
 create mode 100644 queries/slim/injections.scm
 create mode 100644 queries/slim/locals.scm

diff --git a/lockfile.json b/lockfile.json
index 12cabd059..ed79c1585 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -704,6 +704,9 @@
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
   },
+  "slim": {
+    "revision": "23c9917c649659ae8ddf6d88fb9e9c6cfd80b8e0"
+  },
   "slint": {
     "revision": "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 61c0505b7..ca2fb11b0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2042,6 +2042,14 @@ list.slang = {
   experimental = true,
 }
 
+list.slim = {
+  install_info = {
+    url = "https://github.com/theoo/tree-sitter-slim",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@theoo" },
+}
+
 list.slint = {
   install_info = {
     url = "https://github.com/slint-ui/tree-sitter-slint",
diff --git a/queries/slim/folds.scm b/queries/slim/folds.scm
new file mode 100644
index 000000000..aabc67617
--- /dev/null
+++ b/queries/slim/folds.scm
@@ -0,0 +1 @@
+(child) @fold
diff --git a/queries/slim/highlights.scm b/queries/slim/highlights.scm
new file mode 100644
index 000000000..e219932f6
--- /dev/null
+++ b/queries/slim/highlights.scm
@@ -0,0 +1,82 @@
+(comment) @comment @spell
+
+(tag_id) @keyword.function
+
+(tag_class) @keyword.type
+
+(injector) @keyword.import
+
+(directive_sign) @keyword.directive
+
+[
+  (string_start)
+  (string_content)
+  (string_end)
+] @string
+
+(bracket) @punctuation.bracket
+
+[
+  "#{"
+  "}"
+] @punctuation.special
+
+(delimiter) @tag.delimiter
+
+(parameter_name) @variable.parameter
+
+(parameter_value) @tag.attribute
+
+[
+  (text_inline)
+  (text_block)
+] @markup.raw.block
+
+; Markup tags
+; https://developer.mozilla.org/en-US/docs/Web/HTML/Element
+(tag_name) @tag
+
+((tag_name) @tag.builtin
+  (#any-of? @tag.builtin
+    "doctype" "html" "head" "title" "base" "link" "meta" "style" "body" "article" "section" "nav"
+    "aside" "hgroup" "footer" "address" "p" "hr" "pre" "blockquote" "menu" "figure" "figcaption"
+    "main" "div" "small" "s" "cite" "q" "dfn" "abbr" "rt" "rp" "data" "time" "code" "var" "samp"
+    "kbd" "sub" "sup" "u" "mark" "bdi" "bdo" "span" "br" "wbr" "ins" "del" "picture" "source" "img"
+    "iframe" "embed" "object" "param" "video" "audio" "track" "map" "area" "table" "caption"
+    "colgroup" "col" "tbody" "thead" "tfoot" "tr" "td" "th" "form" "label" "input" "button" "select"
+    "datalist" "optgroup" "option" "textarea" "output" "progress" "meter" "fieldset" "legend"
+    "details" "summary" "dialog" "script" "noscript" "template" "slot" "canvas"))
+
+((tag_name) @markup.strong
+  (#any-of? @markup.strong "b" "strong"))
+
+((tag_name) @markup.italic
+  (#any-of? @markup.italic "i" "em"))
+
+((tag_name) @markup.link
+  (#any-of? @markup.link "a"))
+
+; Headings
+((tag_name) @markup.heading
+  (#any-of? @markup.heading "header"))
+
+((tag_name) @markup.heading.1
+  (#any-of? @markup.heading.1 "h1"))
+
+((tag_name) @markup.heading.2
+  (#any-of? @markup.heading.2 "h2"))
+
+((tag_name) @markup.heading.3
+  (#any-of? @markup.heading.3 "h3"))
+
+((tag_name) @markup.heading.4
+  (#any-of? @markup.heading.4 "h4"))
+
+((tag_name) @markup.heading.5
+  (#any-of? @markup.heading.5 "h5"))
+
+((tag_name) @markup.heading.6
+  (#any-of? @markup.heading.6 "h6"))
+
+((tag_name) @markup.list
+  (#any-of? @markup.list "ul" "ol" "li" "dl" "dt" "dd"))
diff --git a/queries/slim/indents.scm b/queries/slim/indents.scm
new file mode 100644
index 000000000..a06a75867
--- /dev/null
+++ b/queries/slim/indents.scm
@@ -0,0 +1,4 @@
+(tag) @indent.begin
+
+((tag) @indent.zero
+  (#any-of? @indent.zero "doctype" "html"))
diff --git a/queries/slim/injections.scm b/queries/slim/injections.scm
new file mode 100644
index 000000000..3bee13931
--- /dev/null
+++ b/queries/slim/injections.scm
@@ -0,0 +1,39 @@
+((ruby_inline) @injection.content
+  (#set! injection.language "ruby"))
+
+((ruby_lang) @injection.content
+  (#set! injection.language "ruby")
+  (#set! injection.combined))
+
+((javascript_lang) @injection.content
+  (#set! injection.language "javascript")
+  (#set! injection.combined))
+
+((css_lang) @injection.content
+  (#set! injection.language "css")
+  (#set! injection.combined))
+
+((sass_lang) @injection.content
+  (#set! injection.language "sass")
+  (#set! injection.combined))
+
+((scss_lang) @injection.content
+  (#set! injection.language "scss")
+  (#set! injection.combined))
+
+((less_lang) @injection.content
+  (#set! injection.language "less")
+  (#set! injection.combined))
+
+((scss_lang) @injection.content
+  (#set! injection.language "scss")
+  (#set! injection.combined))
+
+((markdown_lang) @injection.content
+  (#set! injection.language "markdown"))
+
+((rdoc_lang) @injection.content
+  (#set! injection.language "rdoc"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/slim/locals.scm b/queries/slim/locals.scm
new file mode 100644
index 000000000..e9f0b0079
--- /dev/null
+++ b/queries/slim/locals.scm
@@ -0,0 +1,7 @@
+(child) @local.scope
+
+(tag_name) @local.definition.function
+
+(tag_class) @local.definition.parameter
+
+(tag_id) @local.definition.constant

From 07bd1b53bf465e42d53253b48b7437892d6c45e8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2025 08:25:23 +0000
Subject: [PATCH 2094/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2232d1b23..cb9c1e5dc 100644
--- a/README.md
+++ b/README.md
@@ -408,6 +408,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
 - [x] [sflog](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
 - [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
+- [x] [slim](https://github.com/theoo/tree-sitter-slim) (maintained by @theoo)
 - [x] [slint](https://github.com/slint-ui/tree-sitter-slint) (maintained by @hunger)
 - [x] [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) (maintained by @amaanq)
 - [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)

From 0c94de7e9792cf89c14a865ab819ad5c6e6a7f77 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 06:43:27 +0000
Subject: [PATCH 2095/2704] bot(lockfile): update erlang, groovy, janet_simple,
 kotlin, rst, slim

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ed79c1585..758ccbdb9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "332262529bc51abf5746317b2255ccc2fff778f8"
   },
   "erlang": {
-    "revision": "5fc0a536009391b01a90df9e59833c847c8cf72b"
+    "revision": "981fda038d2eb182a88a9374ccb1c14b840cba0b"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -294,7 +294,7 @@
     "revision": "76554f4f2339f5a24eed19c58f2079b51c694152"
   },
   "groovy": {
-    "revision": "d1556e77d49df1a28cd564af5766fdaea8ab7063"
+    "revision": "86911590a8e46d71301c66468e5620d9faa5b6af"
   },
   "gstlaunch": {
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
@@ -369,7 +369,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "b4aa56fd0a2ea2708fc93062683ae5eaa4e973e6"
+    "revision": "81f17db9a8ab0a97ff20986ef9065eb628db7408"
   },
   "java": {
     "revision": "94703d5a6bed02b98e438d7cad1136c01a60ba2c"
@@ -408,7 +408,7 @@
     "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
   },
   "kotlin": {
-    "revision": "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"
+    "revision": "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"
   },
   "koto": {
     "revision": "329b0e84ef6cc6950665de4accd0bdda1601a2f1"
@@ -675,7 +675,7 @@
     "revision": "78938553b93075e638035f624973083451b29055"
   },
   "rst": {
-    "revision": "5120f6e59284cb8b85b450bd2db0bd352635ba9f"
+    "revision": "dd5971ef7759583aadd5aa5e3a3a0905eb5734d5"
   },
   "ruby": {
     "revision": "71bd32fb7607035768799732addba884a37a6210"
@@ -705,7 +705,7 @@
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
   },
   "slim": {
-    "revision": "23c9917c649659ae8ddf6d88fb9e9c6cfd80b8e0"
+    "revision": "a0f08e85b787248219ea645423c5916c8d620ef6"
   },
   "slint": {
     "revision": "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd"

From 4862ab0aca21e92771b72e2d7e70424b250f0dd4 Mon Sep 17 00:00:00 2001
From: Baraa Homsi <49784526+bodby@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:58:01 +0000
Subject: [PATCH 2096/2704] fix(nix): shorter sub-attribute function highlight
 query (#7579)

---
 queries/nix/highlights.scm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/queries/nix/highlights.scm b/queries/nix/highlights.scm
index 785d249b9..24e685a32 100644
--- a/queries/nix/highlights.scm
+++ b/queries/nix/highlights.scm
@@ -116,17 +116,9 @@
       (attrpath
         (identifier) @variable.member))))
 
-(apply_expression
-  function: [
-    (select_expression
-      attrpath: (attrpath
-        .
-        attr: (identifier) @function.call .))
-    (select_expression
-      attrpath: (attrpath
-        (_)
-        attr: (identifier) @function.call .))
-  ])
+function: (select_expression
+  attrpath: (attrpath
+    attr: (identifier) @function.call .))
 
 ; builtin functions (with builtins prefix)
 (select_expression

From 6587a5886873cce8698a47477224c30578b33a24 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 06:43:13 +0000
Subject: [PATCH 2097/2704] bot(lockfile): update fortran, hack, superhtml,
 yaml, ziggy, ziggy_schema

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 758ccbdb9..ff0f05dd8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -201,7 +201,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "5fc069e4f05810ec6f8e399cd522e4eba864181c"
+    "revision": "a86dce3eb653d375aa36350072717265648657ad"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -300,7 +300,7 @@
     "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
   },
   "hack": {
-    "revision": "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"
+    "revision": "bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0"
   },
   "hare": {
     "revision": "4af5d82cf9ec39f67cb1db5b7a9269d337406592"
@@ -756,7 +756,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "1fda813bd9dc108e962e018e6a327434767ad616"
+    "revision": "e6eba40bf54dd94d842154be0389c53a37be8dc8"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -909,7 +909,7 @@
     "revision": "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"
   },
   "yaml": {
-    "revision": "b733d3f5f5005890f324333dd57e1f0badec5c87"
+    "revision": "1805917414a9a8ba2473717fd69447277a175fae"
   },
   "yang": {
     "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
@@ -924,9 +924,9 @@
     "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
-    "revision": "fe73beef9f52f04048d8b19016fc4fbc66b4596f"
+    "revision": "3518133e9ebea7c372eff4def368eda8488fad18"
   },
   "ziggy_schema": {
-    "revision": "fe73beef9f52f04048d8b19016fc4fbc66b4596f"
+    "revision": "3518133e9ebea7c372eff4def368eda8488fad18"
   }
 }

From 51562d44fc6280f92bb9a3d87e7b3cb327377ca5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 06:43:52 +0000
Subject: [PATCH 2098/2704] bot(lockfile): update bash, c, c_sharp, cpp, css,
 embedded_template, fortran, go, html, java, javascript, jsdoc, json, php,
 php_only, python, regex, rust, tsx, typescript

---
 lockfile.json | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ff0f05dd8..aac472816 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
   },
   "bash": {
-    "revision": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e"
+    "revision": "03f4927065b3c0d71a962be87130aa7e79b35448"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -51,10 +51,10 @@
     "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
   "c": {
-    "revision": "3aa2995549d5d8b26928e8d3fa2770fd4327414e"
+    "revision": "1d9cf2159b09e27e45e4bcd95a88b986af646b62"
   },
   "c_sharp": {
-    "revision": "acff8cbb53a1d7b9cd07b209c9933a0e2da9ef35"
+    "revision": "df819dbf50717afee1a0f6ebd6b7a9a8667db72c"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -90,10 +90,10 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "f41b4f66a42100be405f96bdc4ebc4a61095d3e8"
+    "revision": "b70136fc6b36a5b85f2da3af2ccafc9e8020b3ed"
   },
   "css": {
-    "revision": "5c89b88a37a2e1e36c031469462d6ee85ff2c13c"
+    "revision": "44c226527406dbb138e433b17d684674b7739091"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -171,7 +171,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "332262529bc51abf5746317b2255ccc2fff778f8"
+    "revision": "6e68c2a339cdf4ebc2b452852138e9cc1b5537ea"
   },
   "erlang": {
     "revision": "981fda038d2eb182a88a9374ccb1c14b840cba0b"
@@ -201,7 +201,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "a86dce3eb653d375aa36350072717265648657ad"
+    "revision": "022b032d31299c5d8336cdfd0ece97de20a609c0"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -264,7 +264,7 @@
     "revision": "8923c1e38b9634a688a6c0dce7c18c8ffb823e79"
   },
   "go": {
-    "revision": "12fe553fdaaa7449f764bc876fd777704d4fb752"
+    "revision": "615083bd751d900ec637a3ff68c80e1c829e6da9"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -336,7 +336,7 @@
     "revision": "1545137aadcc63660c47db9ad98d02fa602655d0"
   },
   "html": {
-    "revision": "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468"
+    "revision": "3dfeb9b25a6633774b10883595d47334385eb353"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -372,19 +372,19 @@
     "revision": "81f17db9a8ab0a97ff20986ef9065eb628db7408"
   },
   "java": {
-    "revision": "94703d5a6bed02b98e438d7cad1136c01a60ba2c"
+    "revision": "b33faa4de1bee66fce29854c3d50d7acdff4e7bf"
   },
   "javascript": {
-    "revision": "108b2d4d17a04356a340aea809e4dd5b801eb40d"
+    "revision": "ce39491d64178fd533ac7dce67671c0b3d85c5f8"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "b253abf68a73217b7a52c0ec254f4b6a7bb86665"
+    "revision": "b47607d3ad07fe23dde4830079eda2fb8908bb60"
   },
   "json": {
-    "revision": "4d770d31f732d50d3ec373865822fbe659e47c75"
+    "revision": "fbb75c2b558e19d77ebe0ac5a6e72111c2f1e1f2"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -546,10 +546,10 @@
     "revision": "71206326a8bcbdc2032f852bab8698e315bf5910"
   },
   "php": {
-    "revision": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"
+    "revision": "7780d05ba0b2d78882cbbda03fcadba41d1ee17f"
   },
   "php_only": {
-    "revision": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"
+    "revision": "7780d05ba0b2d78882cbbda03fcadba41d1ee17f"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -612,7 +612,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "409b5d671eb0ea4972eeacaaca24bbec1acf79b1"
+    "revision": "ab2ba8be034368fa009f62f371c068b8728f9db7"
   },
   "ql": {
     "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
@@ -648,7 +648,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "d329907611abe46d26ab5908e5922e7400212cb9"
+    "revision": "14e8b652612f9371a68e304b84861b55225ceae0"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -684,7 +684,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "1f63b33efee17e833e0ea29266dd3d713e27e321"
+    "revision": "fdde775e1ff0e5f30c7160a7c5da47c51360a6a0"
   },
   "scala": {
     "revision": "d3b9553b47d7ab413a146c4b6498e527265b966e"
@@ -822,7 +822,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "8e13e1db35b941fc57f2bd2dd4628180448c17d5"
+    "revision": "64a5d69dbcb131fff72152cad4aa28fa4c5ff0a3"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -831,7 +831,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "8e13e1db35b941fc57f2bd2dd4628180448c17d5"
+    "revision": "64a5d69dbcb131fff72152cad4aa28fa4c5ff0a3"
   },
   "typespec": {
     "revision": "42fb163442ef2691b9b720fb4e4e846809415d18"

From dce72085933bdf2edde3dfabdfd6c915e03542e8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jan 2025 06:41:15 +0000
Subject: [PATCH 2099/2704] bot(lockfile): update bash, c, c_sharp, cpp, css,
 elixir, embedded_template, go, html, java, javascript, jsdoc, json, nginx,
 php, php_only, prisma, python, regex, rust, scfg, tsx, typescript, v

---
 lockfile.json | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index aac472816..ac8022c4d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
   },
   "bash": {
-    "revision": "03f4927065b3c0d71a962be87130aa7e79b35448"
+    "revision": "a985bd2d14d249b8f583343ad21aeb13c50c85e8"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -51,10 +51,10 @@
     "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
   "c": {
-    "revision": "1d9cf2159b09e27e45e4bcd95a88b986af646b62"
+    "revision": "492f7aaa37560204856a2b3f775398b66ba09f31"
   },
   "c_sharp": {
-    "revision": "df819dbf50717afee1a0f6ebd6b7a9a8667db72c"
+    "revision": "2c31cc87640ab6ad74fb408c0cf1262ce54da5bb"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -90,10 +90,10 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "b70136fc6b36a5b85f2da3af2ccafc9e8020b3ed"
+    "revision": "a352ed85f733f9c6cc458fe5a82bcd4c00f70eab"
   },
   "css": {
-    "revision": "44c226527406dbb138e433b17d684674b7739091"
+    "revision": "6731f030693d3698ad94865ed0228fe45df07e30"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -159,7 +159,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "02a6f7fd4be28dd94ee4dd2ca19cb777053ea74e"
+    "revision": "0e8eb7fc1dfb3d855398870827a9866a1529a5e4"
   },
   "elm": {
     "revision": "e34bdc5c512918628b05b48e633f711123204e45"
@@ -171,7 +171,7 @@
     "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
   },
   "embedded_template": {
-    "revision": "6e68c2a339cdf4ebc2b452852138e9cc1b5537ea"
+    "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "erlang": {
     "revision": "981fda038d2eb182a88a9374ccb1c14b840cba0b"
@@ -264,7 +264,7 @@
     "revision": "8923c1e38b9634a688a6c0dce7c18c8ffb823e79"
   },
   "go": {
-    "revision": "615083bd751d900ec637a3ff68c80e1c829e6da9"
+    "revision": "7cb21a65af6cc8e5c6742b9dba42881ea1158475"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -336,7 +336,7 @@
     "revision": "1545137aadcc63660c47db9ad98d02fa602655d0"
   },
   "html": {
-    "revision": "3dfeb9b25a6633774b10883595d47334385eb353"
+    "revision": "d18f83f8bed0be99796c4eacafe9b295ab2ee144"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -372,19 +372,19 @@
     "revision": "81f17db9a8ab0a97ff20986ef9065eb628db7408"
   },
   "java": {
-    "revision": "b33faa4de1bee66fce29854c3d50d7acdff4e7bf"
+    "revision": "677da92875756e31b3a42505d822cc8be7c5ab5e"
   },
   "javascript": {
-    "revision": "ce39491d64178fd533ac7dce67671c0b3d85c5f8"
+    "revision": "3f1c835d05165050834da0e3cbc23a75e94aaa64"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
   "jsdoc": {
-    "revision": "b47607d3ad07fe23dde4830079eda2fb8908bb60"
+    "revision": "a417db5dbdd869fccb6a8b75ec04459e1d4ccd2c"
   },
   "json": {
-    "revision": "fbb75c2b558e19d77ebe0ac5a6e72111c2f1e1f2"
+    "revision": "54ccd9485e0122a5e9faf5d8aaed7294c308e894"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -486,7 +486,7 @@
     "revision": "d1b3638d017f2a8585e26dcfc66fe1df94185e30"
   },
   "nginx": {
-    "revision": "281d184b8240b2b22670b8907b57b6d6842db6f3"
+    "revision": "989da760be05a3334af3ec88705cbf57e6a9c41d"
   },
   "nickel": {
     "revision": "25464b33522c3f609fa512aa9651707c0b66d48b"
@@ -546,10 +546,10 @@
     "revision": "71206326a8bcbdc2032f852bab8698e315bf5910"
   },
   "php": {
-    "revision": "7780d05ba0b2d78882cbbda03fcadba41d1ee17f"
+    "revision": "5021edde6d0ea75aedc313e75cca2ac5aa064d41"
   },
   "php_only": {
-    "revision": "7780d05ba0b2d78882cbbda03fcadba41d1ee17f"
+    "revision": "5021edde6d0ea75aedc313e75cca2ac5aa064d41"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -576,7 +576,7 @@
     "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"
   },
   "prisma": {
-    "revision": "eca2596a355b1a9952b4f80f8f9caed300a272b5"
+    "revision": "73f39a6d5401cfdcd143951e499336cf5ab2ffaa"
   },
   "problog": {
     "revision": "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"
@@ -612,7 +612,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "ab2ba8be034368fa009f62f371c068b8728f9db7"
+    "revision": "44c2f7aebce0efac5867cdc5f2ea03c1d43a0305"
   },
   "ql": {
     "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
@@ -648,7 +648,7 @@
     "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
   },
   "regex": {
-    "revision": "14e8b652612f9371a68e304b84861b55225ceae0"
+    "revision": "b638d29335ef41215b86732dd51be34c701ef683"
   },
   "rego": {
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
@@ -684,13 +684,13 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "fdde775e1ff0e5f30c7160a7c5da47c51360a6a0"
+    "revision": "2eaf126458a4d6a69401089b6ba78c5e5d6c1ced"
   },
   "scala": {
     "revision": "d3b9553b47d7ab413a146c4b6498e527265b966e"
   },
   "scfg": {
-    "revision": "a5512800ea0220da4abbae61b8aea8423d1549aa"
+    "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"
   },
   "scheme": {
     "revision": "63e25a4a84142ae7ee0ee01fe3a32c985ca16745"
@@ -822,7 +822,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "64a5d69dbcb131fff72152cad4aa28fa4c5ff0a3"
+    "revision": "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -831,7 +831,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "64a5d69dbcb131fff72152cad4aa28fa4c5ff0a3"
+    "revision": "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"
   },
   "typespec": {
     "revision": "42fb163442ef2691b9b720fb4e4e846809415d18"
@@ -858,7 +858,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "535103910159887a41d019635c1cdbec910d1a31"
+    "revision": "0461bf8addccb4df566827f1601f415d07b1ffbc"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From f3d7c0dafcbc86c4d63f765649c884a03bc1360a Mon Sep 17 00:00:00 2001
From: Minh Tran <trankhaiminh0911@gmail.com>
Date: Sat, 25 Jan 2025 15:52:24 +0700
Subject: [PATCH 2100/2704] fix(verilog): capture `(non_integer_type)` as
 `@type.builtin`

---
 queries/verilog/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index c5b21d8bc..1e004ef76 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -263,6 +263,7 @@
   (integer_vector_type)
   (time_unit)
   (integer_atom_type)
+  (non_integer_type)
 ] @type.builtin
 
 (data_type

From d34e62afd3e483fe0fa2f24b6323f3bb1d35ddcc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 26 Jan 2025 06:40:37 +0000
Subject: [PATCH 2101/2704] bot(lockfile): update cuda, janet_simple

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ac8022c4d..4dd54a069 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -99,7 +99,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "635e8aa3747823a0c4e9660c07cef76fe8d3ef93"
+    "revision": "757e0a61f9d38b3d9eaa299e8d866e8283ffc284"
   },
   "cue": {
     "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
@@ -369,7 +369,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "81f17db9a8ab0a97ff20986ef9065eb628db7408"
+    "revision": "ca4785b47a4ff15653f0408a49c764dec533e0d3"
   },
   "java": {
     "revision": "677da92875756e31b3a42505d822cc8be7c5ab5e"

From 61a385d74f822dcd1d223f42f1267d1317aaa2d0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 06:43:37 +0000
Subject: [PATCH 2102/2704] bot(lockfile): update perl

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 4dd54a069..af265f6b8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -543,7 +543,7 @@
     "revision": "1d16b8e063fdf4385e389096c4bc4999eaaef05f"
   },
   "perl": {
-    "revision": "71206326a8bcbdc2032f852bab8698e315bf5910"
+    "revision": "6f280c52662dc254eb7a5abc0889f7a9e1154ffd"
   },
   "php": {
     "revision": "5021edde6d0ea75aedc313e75cca2ac5aa064d41"

From 2206739829518c9ea59dbdb9003e0147fdaf2d1c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 27 Jan 2025 17:06:36 +0100
Subject: [PATCH 2103/2704] ci(install): adapt to new Neovim release artefact
 names

Old name can be removed after 0.10.4 release
---
 scripts/ci-install.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
index 4677bb92e..7e99a8de4 100755
--- a/scripts/ci-install.sh
+++ b/scripts/ci-install.sh
@@ -3,7 +3,14 @@
 set -e
 
 os=$(uname -s)
-if [[ $os == Linux ]]; then
+if [[ $os == Linux ]] && [[ ${NVIM_TAG} == nightly ]]; then
+  wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux-x86_64.tar.gz
+  tar -zxf nvim-linux-x86_64.tar.gz
+  sudo ln -s "$PWD"/nvim-linux-x86_64/bin/nvim /usr/local/bin
+  rm -rf "$PWD"/nvim-linux-x86_64/lib/nvim/parser
+  mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
+  ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
+elif [[ $os == Linux ]]; then
   wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux64.tar.gz
   tar -zxf nvim-linux64.tar.gz
   sudo ln -s "$PWD"/nvim-linux64/bin/nvim /usr/local/bin

From 043d5fb1505ca4bc0f48b42666ae7ebc4bb1a671 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 06:42:38 +0000
Subject: [PATCH 2104/2704] bot(lockfile): update gotmpl, gren, helm, nu

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index af265f6b8..7da50d144 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -279,7 +279,7 @@
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gotmpl": {
-    "revision": "ab4a8c4a51f271f320f2bad6a5d499415bf541b1"
+    "revision": "845c471f153c83c6106e1179e38094b2f16a0d20"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -291,7 +291,7 @@
     "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
   },
   "gren": {
-    "revision": "76554f4f2339f5a24eed19c58f2079b51c694152"
+    "revision": "06389ece5bc7344ed3931dc516bb609d8864dd2a"
   },
   "groovy": {
     "revision": "86911590a8e46d71301c66468e5620d9faa5b6af"
@@ -318,7 +318,7 @@
     "revision": "a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45"
   },
   "helm": {
-    "revision": "ab4a8c4a51f271f320f2bad6a5d499415bf541b1"
+    "revision": "845c471f153c83c6106e1179e38094b2f16a0d20"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -510,7 +510,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "9822fc63a62ff87939c88ead9f381f951f092dee"
+    "revision": "b51db01e154fac33eda5b289a6c7751c09568f6d"
   },
   "objc": {
     "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"

From 80c7af6d0408411ff1f502fbac8ca94b738b8762 Mon Sep 17 00:00:00 2001
From: Jonas Hietala <mail@jonashietala.se>
Date: Tue, 28 Jan 2025 21:58:52 +0100
Subject: [PATCH 2105/2704] feat(djot)!: update to breaking parser changes 
 (#7594)

---
 lockfile.json               |  2 +-
 queries/djot/highlights.scm | 96 ++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7da50d144..8458eed13 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -129,7 +129,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "886601b67d1f4690173a4925c214343c30704d32"
+    "revision": "639c2dd7f53ee7755c9bdb560598c56ad128ef30"
   },
   "dockerfile": {
     "revision": "971acdd908568b4531b0ba28a445bf0bb720aba5"
diff --git a/queries/djot/highlights.scm b/queries/djot/highlights.scm
index 8df7c9269..73dd66057 100644
--- a/queries/djot/highlights.scm
+++ b/queries/djot/highlights.scm
@@ -1,14 +1,28 @@
-(heading1) @markup.heading.1
+(heading) @markup.heading
 
-(heading2) @markup.heading.2
+((heading
+  (marker) @_heading.marker) @markup.heading.1
+  (#eq? @_heading.marker "# "))
 
-(heading3) @markup.heading.3
+((heading
+  (marker) @_heading.marker) @markup.heading.2
+  (#eq? @_heading.marker "## "))
 
-(heading4) @markup.heading.4
+((heading
+  (marker) @_heading.marker) @markup.heading.3
+  (#eq? @_heading.marker "### "))
 
-(heading5) @markup.heading.5
+((heading
+  (marker) @_heading.marker) @markup.heading.4
+  (#eq? @_heading.marker "##### "))
 
-(heading6) @markup.heading.6
+((heading
+  (marker) @_heading.marker) @markup.heading.5
+  (#eq? @_heading.marker "###### "))
+
+((heading
+  (marker) @_heading.marker) @markup.heading.6
+  (#eq? @_heading.marker "####### "))
 
 (thematic_break) @string.special
 
@@ -148,50 +162,21 @@
   (subscript)
 ] @string.special
 
-; We need to target tokens specifically because `{=` etc can exist as fallback symbols in
-; regular text, which we don't want to highlight or conceal.
-(highlighted
-  [
-    "{="
-    "=}"
-  ] @punctuation.delimiter
-  (#set! conceal ""))
-
-(insert
-  [
-    "{+"
-    "+}"
-  ] @punctuation.delimiter
-  (#set! conceal ""))
-
-(delete
-  [
-    "{-"
-    "-}"
-  ] @punctuation.delimiter
-  (#set! conceal ""))
-
-(superscript
-  [
-    "^"
-    "{^"
-    "^}"
-  ] @punctuation.delimiter
-  (#set! conceal ""))
-
-(subscript
-  [
-    "~"
-    "{~"
-    "~}"
-  ] @punctuation.delimiter
-  (#set! conceal ""))
-
 ([
   (emphasis_begin)
   (emphasis_end)
   (strong_begin)
   (strong_end)
+  (superscript_begin)
+  (superscript_end)
+  (subscript_begin)
+  (subscript_end)
+  (highlighted_begin)
+  (highlighted_end)
+  (insert_begin)
+  (insert_end)
+  (delete_begin)
+  (delete_end)
   (verbatim_marker_begin)
   (verbatim_marker_end)
   (math_marker)
@@ -211,9 +196,10 @@
 ((raw_inline) @markup.raw
   (#set! priority 90))
 
-(comment
-  "%" @comment
-  (#set! conceal ""))
+[
+  (comment)
+  (inline_comment)
+] @comment
 
 (span
   [
@@ -302,18 +288,14 @@
 
 (full_reference_image
   [
-    "!["
     "["
     "]"
   ] @punctuation.bracket)
 
 (collapsed_reference_image
-  [
-    "!["
-    "]"
-  ] @punctuation.bracket)
+  "[]" @punctuation.bracket)
 
-(inline_image
+(image_description
   [
     "!["
     "]"
@@ -321,12 +303,6 @@
 
 (image_description) @markup.italic
 
-(image_description
-  [
-    "["
-    "]"
-  ] @punctuation.bracket)
-
 (link_reference_definition
   [
     "["

From 13f4346876f394973ff676670304a2b734174538 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 06:42:32 +0000
Subject: [PATCH 2106/2704] bot(lockfile): update cpp, godot_resource, leo

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8458eed13..060af9211 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -90,7 +90,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "a352ed85f733f9c6cc458fe5a82bcd4c00f70eab"
+    "revision": "950b4fc9b3a7a59d351853acddde65a422481bc5"
   },
   "css": {
     "revision": "6731f030693d3698ad94865ed0228fe45df07e30"
@@ -270,7 +270,7 @@
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
   },
   "godot_resource": {
-    "revision": "941955d027f1d8530501e77ce5e1d6035f5f99c1"
+    "revision": "91c55fdf325a832659e59cdf4a02bfe8a423f14c"
   },
   "gomod": {
     "revision": "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c"
@@ -426,7 +426,7 @@
     "revision": "d313153eef68c557ba4538b20de2d0e92f3ef6f8"
   },
   "leo": {
-    "revision": "44a061bac4d9443d75f2700c62a71cd4dcf16f05"
+    "revision": "6bc5564917edacd070afc4d33cf5e2e677831ea9"
   },
   "linkerscript": {
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"

From 7d28f8afc4a0f94a08f478400c657d29a448c984 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 30 Jan 2025 08:53:22 +0100
Subject: [PATCH 2107/2704] fix(ci): update to changed neovim release name

---
 scripts/ci-install.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
index 7e99a8de4..cd33354d1 100755
--- a/scripts/ci-install.sh
+++ b/scripts/ci-install.sh
@@ -3,20 +3,13 @@
 set -e
 
 os=$(uname -s)
-if [[ $os == Linux ]] && [[ ${NVIM_TAG} == nightly ]]; then
+if [[ $os == Linux ]] then
   wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux-x86_64.tar.gz
   tar -zxf nvim-linux-x86_64.tar.gz
   sudo ln -s "$PWD"/nvim-linux-x86_64/bin/nvim /usr/local/bin
   rm -rf "$PWD"/nvim-linux-x86_64/lib/nvim/parser
   mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
   ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
-elif [[ $os == Linux ]]; then
-  wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux64.tar.gz
-  tar -zxf nvim-linux64.tar.gz
-  sudo ln -s "$PWD"/nvim-linux64/bin/nvim /usr/local/bin
-  rm -rf "$PWD"/nvim-linux64/lib/nvim/parser
-  mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-  ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
 elif [[ $os == Darwin ]]; then
   RELEASE_NAME="nvim-macos-$(uname -m)"
   curl -L "https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/$RELEASE_NAME.tar.gz" | tar -xz

From aeaac6a20894478a6f74cddeb5f1b8f3ac4a042b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 30 Jan 2025 09:10:34 +0100
Subject: [PATCH 2108/2704] fix(ci): fixup

---
 scripts/ci-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
index cd33354d1..5ab8887de 100755
--- a/scripts/ci-install.sh
+++ b/scripts/ci-install.sh
@@ -3,7 +3,7 @@
 set -e
 
 os=$(uname -s)
-if [[ $os == Linux ]] then
+if [[ $os == Linux ]]; then
   wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux-x86_64.tar.gz
   tar -zxf nvim-linux-x86_64.tar.gz
   sudo ln -s "$PWD"/nvim-linux-x86_64/bin/nvim /usr/local/bin

From 10f7a506ef48211b99e8b67723a28dcf97a935b7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 30 Jan 2025 09:16:25 +0100
Subject: [PATCH 2109/2704] fix(ci): fixup (ignore new artifact name)

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0ac164cd9..cd7f125bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@ doc/tags
 .luacheckcache
 /tags
 nvim.appimage
-nvim-linux64*
+nvim-linux-x86_64*
 nvim-macos*
 nvim-win64*

From 019e8cb7b39f40dc26745344e7fa9ea43fe60d1d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 08:18:43 +0000
Subject: [PATCH 2110/2704] bot(lockfile): update cpp, djot, gotmpl, heex,
 helm, solidity

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 060af9211..b806415e9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -90,7 +90,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "950b4fc9b3a7a59d351853acddde65a422481bc5"
+    "revision": "0a4623a93fc7ca072903eb68cd2ca26fc5f41d2e"
   },
   "css": {
     "revision": "6731f030693d3698ad94865ed0228fe45df07e30"
@@ -129,7 +129,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "639c2dd7f53ee7755c9bdb560598c56ad128ef30"
+    "revision": "ac748d11ce2ede8b1b0a82a280d1f5af7a98bf82"
   },
   "dockerfile": {
     "revision": "971acdd908568b4531b0ba28a445bf0bb720aba5"
@@ -279,7 +279,7 @@
     "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
   },
   "gotmpl": {
-    "revision": "845c471f153c83c6106e1179e38094b2f16a0d20"
+    "revision": "5f19a36bb1eebb30454e277b222b278ceafed0dd"
   },
   "gowork": {
     "revision": "949a8a470559543857a62102c84700d291fc984c"
@@ -315,10 +315,10 @@
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
   "heex": {
-    "revision": "a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45"
+    "revision": "008626a3fad379d17c81d5ed576edd9bd7a4fbf7"
   },
   "helm": {
-    "revision": "845c471f153c83c6106e1179e38094b2f16a0d20"
+    "revision": "5f19a36bb1eebb30454e277b222b278ceafed0dd"
   },
   "hjson": {
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
@@ -720,7 +720,7 @@
     "revision": "f36c1587624d6d84376c82a357c20fc319cbf02c"
   },
   "solidity": {
-    "revision": "727087514eff57d92e273a24303142308bce3381"
+    "revision": "d38dcd0b58b223c43e3f9265914fb3167dc624c6"
   },
   "soql": {
     "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"

From ffa526e5aa38056482225d6cd9d5bd2d868a4be3 Mon Sep 17 00:00:00 2001
From: Jonas Hietala <mail@jonashietala.se>
Date: Thu, 30 Jan 2025 12:22:43 +0100
Subject: [PATCH 2111/2704] feat(djot): add latex injection (#7603)

---
 queries/djot/injections.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/djot/injections.scm b/queries/djot/injections.scm
index 078b40366..0e4141046 100644
--- a/queries/djot/injections.scm
+++ b/queries/djot/injections.scm
@@ -1,6 +1,10 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
+(math
+  (content) @injection.content
+  (#set! injection.language "latex"))
+
 (code_block
   (language) @injection.language
   (code) @injection.content)

From 110bdf91e3fcbc019efbac13026ae4ad9e4ededf Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Thu, 30 Jan 2025 09:32:50 -0800
Subject: [PATCH 2112/2704] fix(typescript): don't highlight default values as
 parameters (#7599)

---
 queries/typescript/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 663c4a4a6..6d0d0f12e 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -145,10 +145,10 @@
 
 ; Parameters
 (required_parameter
-  (identifier) @variable.parameter)
+  pattern: (identifier) @variable.parameter)
 
 (optional_parameter
-  (identifier) @variable.parameter)
+  pattern: (identifier) @variable.parameter)
 
 (required_parameter
   (rest_pattern

From 7e3942ceca9e0c28760f77ac33bc16399146d879 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 31 Jan 2025 06:43:03 +0000
Subject: [PATCH 2113/2704] bot(lockfile): update c, c_sharp, cpp, css, djot,
 dtd, earthfile, go, html, java, javascript, json, lua, nix, ocaml,
 ocaml_interface, ocamllex, php, php_only, python, ruby, scala, tsx,
 typescript, xml

---
 lockfile.json | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b806415e9..4ea93d5b7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,10 +51,10 @@
     "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
   "c": {
-    "revision": "492f7aaa37560204856a2b3f775398b66ba09f31"
+    "revision": "f10e84f382a4e53144af0c958be3017064478262"
   },
   "c_sharp": {
-    "revision": "2c31cc87640ab6ad74fb408c0cf1262ce54da5bb"
+    "revision": "b27b091bfdc5f16d0ef76421ea5609c82a57dff0"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -90,10 +90,10 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "0a4623a93fc7ca072903eb68cd2ca26fc5f41d2e"
+    "revision": "1e75b69fc8e7a2d9bfc67c2ea6b024affcb5b97c"
   },
   "css": {
-    "revision": "6731f030693d3698ad94865ed0228fe45df07e30"
+    "revision": "6e327db434fec0ee90f006697782e43ec855adf5"
   },
   "csv": {
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
@@ -129,7 +129,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "ac748d11ce2ede8b1b0a82a280d1f5af7a98bf82"
+    "revision": "67e6e23ba7be81a4373e0f49e21207bdc32d12a5"
   },
   "dockerfile": {
     "revision": "971acdd908568b4531b0ba28a445bf0bb720aba5"
@@ -141,10 +141,10 @@
     "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
-    "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
+    "revision": "26e95de449d772bc2dd4f0382580f84e2a0754d6"
   },
   "earthfile": {
-    "revision": "a44f6f6d22ea4fe16fa37ababd90240ab87a9e0d"
+    "revision": "6695a2dfea5f8d9076b11f9bebcac8184e405e67"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
@@ -264,7 +264,7 @@
     "revision": "8923c1e38b9634a688a6c0dce7c18c8ffb823e79"
   },
   "go": {
-    "revision": "7cb21a65af6cc8e5c6742b9dba42881ea1158475"
+    "revision": "5e73f476efafe5c768eda19bbe877f188ded6144"
   },
   "goctl": {
     "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
@@ -336,7 +336,7 @@
     "revision": "1545137aadcc63660c47db9ad98d02fa602655d0"
   },
   "html": {
-    "revision": "d18f83f8bed0be99796c4eacafe9b295ab2ee144"
+    "revision": "cbb91a0ff3621245e890d1c50cc811bffb77a26b"
   },
   "htmldjango": {
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
@@ -372,10 +372,10 @@
     "revision": "ca4785b47a4ff15653f0408a49c764dec533e0d3"
   },
   "java": {
-    "revision": "677da92875756e31b3a42505d822cc8be7c5ab5e"
+    "revision": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a"
   },
   "javascript": {
-    "revision": "3f1c835d05165050834da0e3cbc23a75e94aaa64"
+    "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -384,7 +384,7 @@
     "revision": "a417db5dbdd869fccb6a8b75ec04459e1d4ccd2c"
   },
   "json": {
-    "revision": "54ccd9485e0122a5e9faf5d8aaed7294c308e894"
+    "revision": "46aa487b3ade14b7b05ef92507fdaa3915a662a3"
   },
   "json5": {
     "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
@@ -441,7 +441,7 @@
     "revision": "c14cb839003348692158b845db9edda201374548"
   },
   "lua": {
-    "revision": "34e60e7f45fc313463c68090d88d742a55d1bd7a"
+    "revision": "68d29aa745b68ae22cbbdb5dcb68c20232521ff6"
   },
   "luadoc": {
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
@@ -501,7 +501,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "4b952d99ce6fc795ff3cfa48b05637f2b1751d3b"
+    "revision": "0f561100bfe7a185ce191ac5fdc9fc9dacc3b69e"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -519,13 +519,13 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "37ad9efe601316248b22173d2ff19a6b4c992016"
+    "revision": "91e4d9106f5da8199ab5158ba65e02da3e664597"
   },
   "ocaml_interface": {
-    "revision": "37ad9efe601316248b22173d2ff19a6b4c992016"
+    "revision": "91e4d9106f5da8199ab5158ba65e02da3e664597"
   },
   "ocamllex": {
-    "revision": "4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2"
+    "revision": "5da5bb7508ac9fd3317561670ef18c126a0fe2aa"
   },
   "odin": {
     "revision": "d2ca8efb4487e156a60d5bd6db2598b872629403"
@@ -546,10 +546,10 @@
     "revision": "6f280c52662dc254eb7a5abc0889f7a9e1154ffd"
   },
   "php": {
-    "revision": "5021edde6d0ea75aedc313e75cca2ac5aa064d41"
+    "revision": "f3a19ab3217a6e838870fc7142fa492d1fd7a7c9"
   },
   "php_only": {
-    "revision": "5021edde6d0ea75aedc313e75cca2ac5aa064d41"
+    "revision": "f3a19ab3217a6e838870fc7142fa492d1fd7a7c9"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -612,7 +612,7 @@
     "revision": "be062582956165019d3253794b4d712f66dfeaaa"
   },
   "python": {
-    "revision": "44c2f7aebce0efac5867cdc5f2ea03c1d43a0305"
+    "revision": "710796b8b877a970297106e5bbc8e2afa47f86ec"
   },
   "ql": {
     "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
@@ -678,7 +678,7 @@
     "revision": "dd5971ef7759583aadd5aa5e3a3a0905eb5734d5"
   },
   "ruby": {
-    "revision": "71bd32fb7607035768799732addba884a37a6210"
+    "revision": "89bd7a8e5450cb6a942418a619d30469f259e5d6"
   },
   "runescript": {
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
@@ -687,7 +687,7 @@
     "revision": "2eaf126458a4d6a69401089b6ba78c5e5d6c1ced"
   },
   "scala": {
-    "revision": "d3b9553b47d7ab413a146c4b6498e527265b966e"
+    "revision": "851f6a6856363dd03e911290105c5cc878bcc9c6"
   },
   "scfg": {
     "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"
@@ -822,7 +822,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "tsx": {
-    "revision": "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"
+    "revision": "75b3874edb2dc714fb1fd77a32013d0f8699989f"
   },
   "turtle": {
     "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
@@ -831,7 +831,7 @@
     "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
   },
   "typescript": {
-    "revision": "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"
+    "revision": "75b3874edb2dc714fb1fd77a32013d0f8699989f"
   },
   "typespec": {
     "revision": "42fb163442ef2691b9b720fb4e4e846809415d18"
@@ -903,7 +903,7 @@
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
-    "revision": "ce150c5be7f617e18ffa2064213e5d9c4cb5d69e"
+    "revision": "26e95de449d772bc2dd4f0382580f84e2a0754d6"
   },
   "xresources": {
     "revision": "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"

From bcd0b26607c1a4336c392285a9f13e31f514ccf2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 06:41:11 +0000
Subject: [PATCH 2114/2704] bot(lockfile): update bash, desktop, haskell,
 julia, nix, objc, typst

---
 .github/workflows/update-lockfile.yml |  2 +-
 lockfile.json                         | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 38aab1cfc..588868a56 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: ""
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua
diff --git a/lockfile.json b/lockfile.json
index 4ea93d5b7..f95804e77 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -27,7 +27,7 @@
     "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
   },
   "bash": {
-    "revision": "a985bd2d14d249b8f583343ad21aeb13c50c85e8"
+    "revision": "0c46d792d54c536be5ff7eb18eb95c70fccdb232"
   },
   "bass": {
     "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
@@ -114,7 +114,7 @@
     "revision": "e81af6ab94a728ed99c30083be72d88e6d56cf9e"
   },
   "desktop": {
-    "revision": "54133af61b2a9a75fd42c49ce0c771115f81f50b"
+    "revision": "5d5e8659cc0d511e8f2860483c3c1d7ebb7b893e"
   },
   "devicetree": {
     "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
@@ -306,7 +306,7 @@
     "revision": "4af5d82cf9ec39f67cb1db5b7a9269d337406592"
   },
   "haskell": {
-    "revision": "2c2fcb22e3b939ed59ae8d6f10500c3213c68670"
+    "revision": "0975ef72fc3c47b530309ca93937d7d143523628"
   },
   "haskell_persistent": {
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
@@ -396,7 +396,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "ffdd9fe4dccdc26d62ce1654fceac52c394f0cf3"
+    "revision": "3f9870ca1f419e480f39fc181fcfb6dad480969a"
   },
   "just": {
     "revision": "bb0c898a80644de438e6efe5d88d30bf092935cd"
@@ -501,7 +501,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "0f561100bfe7a185ce191ac5fdc9fc9dacc3b69e"
+    "revision": "b3a88cf3e597d48c33657deca4fda7a75c0069c1"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -513,7 +513,7 @@
     "revision": "b51db01e154fac33eda5b289a6c7751c09568f6d"
   },
   "objc": {
-    "revision": "18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed"
+    "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
   },
   "objdump": {
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
@@ -840,7 +840,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "26dfb4b94a99cc9d6044342b7ad0ba761da77d60"
+    "revision": "cb0ffe14259f7f63ee6f05b57ceb24a35bedef75"
   },
   "udev": {
     "revision": "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc"

From 39bf51ff68800a78156258fd3beca81a87895103 Mon Sep 17 00:00:00 2001
From: Tristan Knight <tris203@gmail.com>
Date: Sat, 1 Feb 2025 19:06:26 +0000
Subject: [PATCH 2115/2704] feat(razor): add parser and queries (#7545)

---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/razor/folds.scm         | 14 ++++++++
 queries/razor/highlights.scm    | 58 +++++++++++++++++++++++++++++++++
 queries/razor/injections.scm    | 11 +++++++
 6 files changed, 95 insertions(+)
 create mode 100644 queries/razor/folds.scm
 create mode 100644 queries/razor/highlights.scm
 create mode 100644 queries/razor/injections.scm

diff --git a/README.md b/README.md
index cb9c1e5dc..e8a9d3404 100644
--- a/README.md
+++ b/README.md
@@ -386,6 +386,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
 - [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
 - [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
+- [x] [razor](https://github.com/tris203/tree-sitter-razor) (maintained by @tris203)
 - [x] [rbs](https://github.com/joker1007/tree-sitter-rbs) (maintained by @joker1007)
 - [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
 - [x] [readline](https://github.com/ribru17/tree-sitter-readline) (maintained by @ribru17)
diff --git a/lockfile.json b/lockfile.json
index f95804e77..abad98ee1 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -638,6 +638,9 @@
   "rasi": {
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
+  "razor": {
+    "revision": "a47cd8ca148685629739a4ab69f58864800fbdab"
+  },
   "rbs": {
     "revision": "de893b166476205b09e79cd3689f95831269579a"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ca2fb11b0..986f2a972 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1861,6 +1861,14 @@ list.rasi = {
   maintainers = { "@Fymyte" },
 }
 
+list.razor = {
+  install_info = {
+    url = "https://github.com/tris203/tree-sitter-razor",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@tris203" },
+}
+
 list.rbs = {
   install_info = {
     url = "https://github.com/joker1007/tree-sitter-rbs",
diff --git a/queries/razor/folds.scm b/queries/razor/folds.scm
new file mode 100644
index 000000000..f026cb8ec
--- /dev/null
+++ b/queries/razor/folds.scm
@@ -0,0 +1,14 @@
+[
+  (razor_if)
+  (razor_switch)
+  (razor_for)
+  (razor_foreach)
+  (razor_while)
+  (razor_do_while)
+  (razor_try)
+  (razor_catch)
+  (razor_finally)
+  (razor_compound_using)
+  (razor_section)
+  (razor_block)
+] @fold
diff --git a/queries/razor/highlights.scm b/queries/razor/highlights.scm
new file mode 100644
index 000000000..2050bde9c
--- /dev/null
+++ b/queries/razor/highlights.scm
@@ -0,0 +1,58 @@
+; inherits: c_sharp
+
+[
+  (razor_comment)
+  (html_comment)
+] @comment @spell
+
+[
+  "at_page"
+  "at_using"
+  "at_model"
+  "at_rendermode"
+  "at_inject"
+  "at_implements"
+  "at_layout"
+  "at_inherits"
+  "at_attribute"
+  "at_typeparam"
+  "at_namespace"
+  "at_preservewhitespace"
+  "at_block"
+  "at_at_escape"
+  "at_colon_transition"
+] @constant.macro
+
+[
+  "at_lock"
+  "at_section"
+] @keyword
+
+[
+  "at_if"
+  "at_switch"
+] @keyword.conditional
+
+[
+  "at_for"
+  "at_foreach"
+  "at_while"
+  "at_do"
+] @keyword.repeat
+
+[
+  "at_try"
+  "catch"
+  "finally"
+] @keyword.exception
+
+[
+  "at_implicit"
+  "at_explicit"
+] @variable
+
+"at_await" @keyword.coroutine
+
+(razor_rendermode) @property
+
+(razor_attribute_name) @function
diff --git a/queries/razor/injections.scm b/queries/razor/injections.scm
new file mode 100644
index 000000000..fe28d8611
--- /dev/null
+++ b/queries/razor/injections.scm
@@ -0,0 +1,11 @@
+; inherits: c_sharp
+
+([
+  (html_comment)
+  (razor_comment)
+] @comment
+  (#set! injection.language "comment"))
+
+((element) @injection.content
+  (#set! injection.language "html")
+  (#set! injection.combined))

From 4988b7068001b3a772c7cc738708341e612e3c26 Mon Sep 17 00:00:00 2001
From: Dimitris Dimitropoulos <dimitris.dimitropoulos00@gmail.com>
Date: Sat, 1 Feb 2025 21:45:10 +0200
Subject: [PATCH 2116/2704] feat(typst): capture multilevel headings (#7595)

---
 queries/typst/highlights.scm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index e36105413..e23588421 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -84,8 +84,23 @@
 ; text
 (text) @spell
 
-; TODO: use multi level headings
-(heading) @markup.heading
+(heading
+  "=" @markup.heading.1) @markup.heading.1
+
+(heading
+  "==" @markup.heading.2) @markup.heading.2
+
+(heading
+  "===" @markup.heading.3) @markup.heading.3
+
+(heading
+  "====" @markup.heading.4) @markup.heading.4
+
+(heading
+  "=====" @markup.heading.5) @markup.heading.5
+
+(heading
+  "======" @markup.heading.6) @markup.heading.6
 
 (strong) @markup.strong
 

From 2497d9558d12023e058de2782fc25bc4f405f870 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 2 Feb 2025 06:42:13 +0000
Subject: [PATCH 2117/2704] bot(lockfile): update desktop, matlab, perl, query,
 scala

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index abad98ee1..328e7294c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -114,7 +114,7 @@
     "revision": "e81af6ab94a728ed99c30083be72d88e6d56cf9e"
   },
   "desktop": {
-    "revision": "5d5e8659cc0d511e8f2860483c3c1d7ebb7b893e"
+    "revision": "6d66eea37afa1d6bc1e25ef457113743df42416d"
   },
   "devicetree": {
     "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
@@ -465,7 +465,7 @@
     "revision": "192407ab5a24bfc24f13332979b5e7967518754a"
   },
   "matlab": {
-    "revision": "b0a0198b182574cd3ca0447264c83331901b9338"
+    "revision": "bbf1b3f0bd7417c1efb8958fe95be3d0d540207a"
   },
   "menhir": {
     "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
@@ -543,7 +543,7 @@
     "revision": "1d16b8e063fdf4385e389096c4bc4999eaaef05f"
   },
   "perl": {
-    "revision": "6f280c52662dc254eb7a5abc0889f7a9e1154ffd"
+    "revision": "db79ba96ba13e2e89ce9da07c1cc1dfbe6e2e0f6"
   },
   "php": {
     "revision": "f3a19ab3217a6e838870fc7142fa492d1fd7a7c9"
@@ -624,7 +624,7 @@
     "revision": "8fef30e231d74b65c713bcbac21956156d8963da"
   },
   "query": {
-    "revision": "5c2d02747250bc326bc33687b3319b7db8554e24"
+    "revision": "9bf4d5cad5ecf51d9102cd50765e8d6119616a9a"
   },
   "r": {
     "revision": "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a"
@@ -690,7 +690,7 @@
     "revision": "2eaf126458a4d6a69401089b6ba78c5e5d6c1ced"
   },
   "scala": {
-    "revision": "851f6a6856363dd03e911290105c5cc878bcc9c6"
+    "revision": "d67fe3ba3879bd7ba74bd7f56c9a38fed241ba25"
   },
   "scfg": {
     "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"

From 1545e964e299176375efd84867dcf82fbff52ee2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 2 Feb 2025 15:00:38 +0100
Subject: [PATCH 2118/2704] ci(update): block vhdl (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 588868a56..5294ab8ce 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint,vhdl"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 16a51977dcaab1e1adc3152471ac862202f9be83 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 2 Feb 2025 15:17:50 +0100
Subject: [PATCH 2119/2704] Revert "ci(update): block vhdl (ABI 15)"

This reverts commit 1545e964e299176375efd84867dcf82fbff52ee2.
---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 5294ab8ce..588868a56 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint,vhdl"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From ca0e04ac31b633ded99279ab2e38b215d4e2e50a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 2 Feb 2025 08:44:54 -0800
Subject: [PATCH 2120/2704] feat(query): highlights for missing nodes

---
 queries/query/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index f839ec985..928159cbd 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -11,6 +11,9 @@
 (named_node
   name: (identifier) @variable)
 
+(missing_node
+  name: (identifier) @variable)
+
 (field_definition
   name: (identifier) @variable.member)
 
@@ -45,6 +48,8 @@
 
 "_" @character.special
 
+"MISSING" @keyword
+
 ((parameters
   (identifier) @number)
   (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))

From 73b68cb943cd6718bdee318a70874620070255d4 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 2 Feb 2025 08:51:04 -0800
Subject: [PATCH 2121/2704] feat(query): highlights for dot-prefixed predicates

---
 queries/query/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 928159cbd..cbd192a8f 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -46,6 +46,9 @@
   "#"
 ] @punctuation.special
 
+(predicate
+  "." @punctuation.special)
+
 "_" @character.special
 
 "MISSING" @keyword

From 4e701776f8824fc188a6254f57d080971ce28c92 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 06:44:03 +0000
Subject: [PATCH 2122/2704] bot(lockfile): update c, query, rst, swift, vhdl

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 328e7294c..b04db6829 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
   "c": {
-    "revision": "f10e84f382a4e53144af0c958be3017064478262"
+    "revision": "cf36b0354a2d75a42f87191cbd3166ad8af348e4"
   },
   "c_sharp": {
     "revision": "b27b091bfdc5f16d0ef76421ea5609c82a57dff0"
@@ -624,7 +624,7 @@
     "revision": "8fef30e231d74b65c713bcbac21956156d8963da"
   },
   "query": {
-    "revision": "9bf4d5cad5ecf51d9102cd50765e8d6119616a9a"
+    "revision": "0555ac0da902abff06076e40501102cee3ba68bd"
   },
   "r": {
     "revision": "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a"
@@ -678,7 +678,7 @@
     "revision": "78938553b93075e638035f624973083451b29055"
   },
   "rst": {
-    "revision": "dd5971ef7759583aadd5aa5e3a3a0905eb5734d5"
+    "revision": "899e073a10012b8028b643d676c30bbf9c64a45d"
   },
   "ruby": {
     "revision": "89bd7a8e5450cb6a942418a619d30469f259e5d6"
@@ -771,7 +771,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "f4be8072f18fb9704fd35d4b8154ae2b19e314c0"
+    "revision": "1ebc09c38f41d6aab7dd65ca0f8ea032ced0364f"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -873,7 +873,7 @@
     "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
-    "revision": "da8ea8afa7899a99e43a7d61afef9f77b7a675eb"
+    "revision": "cfc522af3e49c1a00ae74e01aa14e19818dab8f2"
   },
   "vhs": {
     "revision": "037e675d547b18bbf3fdeb222e242ae5dccc39d7"

From 285ec451234898cc91a7223f224150106c89bad6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 4 Feb 2025 06:44:59 +0000
Subject: [PATCH 2123/2704] bot(lockfile): update cue, erlang, janet_simple

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index b04db6829..df1e144ed 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -102,7 +102,7 @@
     "revision": "757e0a61f9d38b3d9eaa299e8d866e8283ffc284"
   },
   "cue": {
-    "revision": "8a5f273bfa281c66354da562f2307c2d394b6c81"
+    "revision": "770737bcff2c4aa3f624d439e32b07dbb07102d3"
   },
   "cylc": {
     "revision": "8b895c278f98d05e67997f5e3a43fb5531933023"
@@ -174,7 +174,7 @@
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "erlang": {
-    "revision": "981fda038d2eb182a88a9374ccb1c14b840cba0b"
+    "revision": "cd1679d6e0ab03159001a39dc599523ed4fc5971"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -369,7 +369,7 @@
     "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
   },
   "janet_simple": {
-    "revision": "ca4785b47a4ff15653f0408a49c764dec533e0d3"
+    "revision": "b08b402207fba0037d5152ce7c521351147f4388"
   },
   "java": {
     "revision": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a"

From 7194ff9511c811d5af0767eb6f77cf53f85ffc03 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 2 Feb 2025 08:58:26 -0800
Subject: [PATCH 2124/2704] fix(formatter): prefer #-prefixed predicates

This prevents the formatter for appending a space after the "." in a
predicate prefix, and changes it to a "#" to match all other occurrences
in the codebase.
---
 scripts/format-queries.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 17e445369..fb1d78f49 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -114,6 +114,9 @@ local format_queries = [[
   ":"
   "."
 ] @format.append-space
+(predicate
+  "." @format.cancel-append @format.replace
+  (#gsub! @format.replace "%." "#"))
 (
   "." @format.prepend-space @format.cancel-append
   .

From 53a6b3993f5803378d4d031bf114c0b125a52ba8 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 2 Feb 2025 09:07:38 -0800
Subject: [PATCH 2125/2704] feat(formatter): support formatting missing nodes

This commit makes missing nodes take formatting identical to that of
regular named nodes, with the only exception being that a newline will
not be prepended to a node name. E.g. this pattern:

```query
(MISSING identifier)
```

will *not* be changed to:

```query
(MISSING
  (identifier))
```
---
 scripts/format-queries.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index fb1d78f49..0839760d2 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -90,6 +90,7 @@ local format_queries = [[
     (grouping)
     (named_node)
     (anonymous_node)
+    (missing_node)
     (field_definition)
   ] @format.prepend-newline)
 
@@ -101,6 +102,7 @@ local format_queries = [[
     (grouping)
     (named_node)
     (anonymous_node)
+    (missing_node)
     (field_definition)
     (comment)
   ] @format.cancel-prepend
@@ -156,6 +158,7 @@ local format_queries = [[
     (named_node)        ; (foo (bar))
     (predicate)         ; (named_node (#set!))
     (anonymous_node)
+    (missing_node)
     "."
   ])
 ;; Honoring comment's position within a node
@@ -188,6 +191,7 @@ local format_queries = [[
     (named_node)
     (predicate)
     (anonymous_node)
+    (missing_node)
     "."
   ] @format.append-newline)
 
@@ -213,6 +217,7 @@ local format_queries = [[
     (named_node)                  ; ((foo))
     (list)                        ; ([foo] (...))
     (anonymous_node)              ; ("foo")
+    (missing_node)
     (grouping . (_))
   ] @format.indent.begin
   .
@@ -226,6 +231,7 @@ local format_queries = [[
   "("
   [
     (anonymous_node)
+    (missing_node)
     (named_node)
     (list)
     (predicate)
@@ -240,6 +246,8 @@ local format_queries = [[
   (#not-kind-eq? @format.cancel-append "comment"))
 (grouping
   (capture) @format.prepend-space)
+(missing_node
+  name: (_) @format.prepend-space)
 ;; Remove unnecessary parens
 (grouping
   "(" @format.remove
@@ -254,6 +262,8 @@ local format_queries = [[
     (grouping)
     (anonymous_node
       name: (string) .)
+    (missing_node
+      name: (_) .)
     (named_node
       [
         "_"
@@ -300,6 +310,7 @@ local format_queries = [[
     (grouping)
     (named_node)
     (anonymous_node)
+    (missing_node)
     (negated_field)
   ] @format.cancel-append
   .

From 55ae57419504432ba9c229ea9b03bad621ab9ef7 Mon Sep 17 00:00:00 2001
From: Kieran Siek <git@siek.dev>
Date: Tue, 4 Feb 2025 14:58:43 -0500
Subject: [PATCH 2126/2704] Fix panic!, assert*!, and dbg! macro queries.

---
 queries/rust/highlights.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index bdd44a1d0..de9d09684 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -458,19 +458,19 @@
   "!" @type.builtin)
 
 (macro_invocation
-  macro: (identifier) @keyword.exception
+  macro: (identifier) @_identifier @keyword.exception
   "!" @keyword.exception
-  (#eq? @keyword.exception "panic"))
+  (#eq? @_identifier "panic"))
 
 (macro_invocation
-  macro: (identifier) @keyword.exception
+  macro: (identifier) @_identifier @keyword.exception
   "!" @keyword.exception
-  (#contains? @keyword.exception "assert"))
+  (#contains? @_identifier "assert"))
 
 (macro_invocation
-  macro: (identifier) @keyword.debug
+  macro: (identifier) @_identifier @keyword.debug
   "!" @keyword.debug
-  (#eq? @keyword.debug "dbg"))
+  (#eq? @_identifier "dbg"))
 
 ; Comments
 [

From cced713b4993ddbfba8f82e9e60fcab7cbee8101 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 06:44:09 +0000
Subject: [PATCH 2127/2704] bot(lockfile): update erlang, fsharp

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index df1e144ed..fbae30f63 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "erlang": {
-    "revision": "cd1679d6e0ab03159001a39dc599523ed4fc5971"
+    "revision": "54d95b5e7750140c42ec2c8fda4d67fe11a045c3"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -207,7 +207,7 @@
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
   "fsharp": {
-    "revision": "207f1c988f4649e12fe207e4a7e4f83b9da037d1"
+    "revision": "ad824dea984734406b50699c5f388a7412e85946"
   },
   "func": {
     "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"

From 9e0b5e7f0d148963d6ec71c48cec1a3f8607d619 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Wed, 5 Feb 2025 20:58:55 +0800
Subject: [PATCH 2128/2704] feat(nu)!: added some new operators, removed
 deprecated keyword `register` (#7620)

---
 lockfile.json             |  2 +-
 queries/nu/highlights.scm | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fbae30f63..2e7d30e3a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -510,7 +510,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "b51db01e154fac33eda5b289a6c7751c09568f6d"
+    "revision": "d0b26e45525016ef8e6f2ced05852437c06a00ca"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
index ecf7280c9..90a434eff 100644
--- a/queries/nu/highlights.scm
+++ b/queries/nu/highlights.scm
@@ -9,7 +9,6 @@
   "source"
   "source-env"
   "overlay"
-  "register"
 ] @keyword
 
 [
@@ -169,6 +168,20 @@ file_path: (val_string) @variable.parameter
   "err+out>"
   "o+e>"
   "out+err>"
+  "o>>"
+  "out>>"
+  "e>>"
+  "err>>"
+  "e+o>>"
+  "err+out>>"
+  "o+e>>"
+  "out+err>>"
+  "e>|"
+  "err>|"
+  "e+o>|"
+  "err+out>|"
+  "o+e>|"
+  "out+err>|"
 ] @operator
 
 [
@@ -183,6 +196,8 @@ file_path: (val_string) @variable.parameter
   "bit-shr"
   "in"
   "not-in"
+  "has"
+  "not-has"
   "starts-with"
   "ends-with"
   "not"

From 824bf8455fd670186986fb3eb46fcaa4c5460949 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 06:44:30 +0000
Subject: [PATCH 2129/2704] bot(lockfile): update erlang, vhs

lock sql parser (ABI 15)
---
 .github/workflows/update-lockfile.yml | 2 +-
 lockfile.json                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 588868a56..018d3997b 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint,sql"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua
diff --git a/lockfile.json b/lockfile.json
index 2e7d30e3a..d1f25616a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "erlang": {
-    "revision": "54d95b5e7750140c42ec2c8fda4d67fe11a045c3"
+    "revision": "90f1fcb7a9c9fff2442c00d087368d5bc2c94407"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -876,7 +876,7 @@
     "revision": "cfc522af3e49c1a00ae74e01aa14e19818dab8f2"
   },
   "vhs": {
-    "revision": "037e675d547b18bbf3fdeb222e242ae5dccc39d7"
+    "revision": "966067fe81d78071805d8e55ec836b3926c4ece4"
   },
   "vim": {
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"

From 62911c78a868bac24c8a86f2c1c412d0b799f885 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2025 06:43:36 +0000
Subject: [PATCH 2130/2704] bot(lockfile): update asm, cpp, elixir, templ

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d1f25616a..8c1de4e28 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
   },
   "asm": {
-    "revision": "55b2b913f1e71136027d6fce8212e760c64f3532"
+    "revision": "5bb5b03e3c1ce5853b5282b9fba060f7c7bbf11e"
   },
   "astro": {
     "revision": "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"
@@ -90,7 +90,7 @@
     "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
   },
   "cpp": {
-    "revision": "1e75b69fc8e7a2d9bfc67c2ea6b024affcb5b97c"
+    "revision": "e5cea0ec884c5c3d2d1e41a741a66ce13da4d945"
   },
   "css": {
     "revision": "6e327db434fec0ee90f006697782e43ec855adf5"
@@ -159,7 +159,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "0e8eb7fc1dfb3d855398870827a9866a1529a5e4"
+    "revision": "86ec2ed45d6d9433b4e0b88cd3d96796bd45625f"
   },
   "elm": {
     "revision": "e34bdc5c512918628b05b48e633f711123204e45"
@@ -795,7 +795,7 @@
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
   },
   "templ": {
-    "revision": "a9178bfc9cc8040c08f39b47bae5400a2bf06e50"
+    "revision": "def9849184de71a797c4e2b2837df85abeccf92c"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"

From 6bc2c0fde8c8f633b2f78177d5def298a7824c40 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sat, 1 Feb 2025 19:46:36 -0800
Subject: [PATCH 2131/2704] feat(hyprlang): bash injection for bindings with
 descriptions

---
 queries/hyprlang/injections.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/queries/hyprlang/injections.scm b/queries/hyprlang/injections.scm
index 3b91ad0e0..c7929e24d 100644
--- a/queries/hyprlang/injections.scm
+++ b/queries/hyprlang/injections.scm
@@ -13,6 +13,8 @@
     .
     (_)
     .
+    (_)?
+    .
     (string) @_exec
     .
     (string) @injection.content))

From e8ccc339a318ffa88bd40a134410b06fdf584a54 Mon Sep 17 00:00:00 2001
From: simonvic <simonvic.dev@gmail.com>
Date: Sat, 8 Feb 2025 10:38:13 +0100
Subject: [PATCH 2132/2704] feat(enforce): add parser and queries (#7626)

---
 README.md                       |   1 +
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/enforce/folds.scm       |  10 ++
 queries/enforce/highlights.scm  | 190 ++++++++++++++++++++++++++++++++
 queries/enforce/indents.scm     |  30 +++++
 queries/enforce/injections.scm  |  13 +++
 queries/enforce/locals.scm      |  40 +++++++
 8 files changed, 295 insertions(+)
 create mode 100644 queries/enforce/folds.scm
 create mode 100644 queries/enforce/highlights.scm
 create mode 100644 queries/enforce/indents.scm
 create mode 100644 queries/enforce/injections.scm
 create mode 100644 queries/enforce/locals.scm

diff --git a/README.md b/README.md
index e8a9d3404..d50451596 100644
--- a/README.md
+++ b/README.md
@@ -231,6 +231,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) (maintained by @glapa-grossklag, @amaanq)
 - [x] [elvish](https://github.com/elves/tree-sitter-elvish) (maintained by @elves)
 - [ ] [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template)
+- [x] [enforce](https://github.com/simonvic/tree-sitter-enforce) (maintained by @simonvic)
 - [x] [erlang](https://github.com/WhatsApp/tree-sitter-erlang) (maintained by @filmor)
 - [x] [facility](https://github.com/FacilityApi/tree-sitter-facility) (maintained by @bryankenote)
 - [x] [faust](https://github.com/khiner/tree-sitter-faust) (maintained by @khiner)
diff --git a/lockfile.json b/lockfile.json
index 8c1de4e28..cb2729700 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -173,6 +173,9 @@
   "embedded_template": {
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
+  "enforce": {
+    "revision": "9db7a49f3d73222c05b75dcfa8892f5e93542d1e"
+  },
   "erlang": {
     "revision": "90f1fcb7a9c9fff2442c00d087368d5bc2c94407"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 986f2a972..2af97904b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -549,6 +549,14 @@ list.embedded_template = {
   filetype = "eruby",
 }
 
+list.enforce = {
+  install_info = {
+    url = "https://github.com/simonvic/tree-sitter-enforce",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@simonvic" },
+}
+
 list.erlang = {
   install_info = {
     url = "https://github.com/WhatsApp/tree-sitter-erlang",
diff --git a/queries/enforce/folds.scm b/queries/enforce/folds.scm
new file mode 100644
index 000000000..dd2b8622a
--- /dev/null
+++ b/queries/enforce/folds.scm
@@ -0,0 +1,10 @@
+[
+  (block)
+  (switch)
+  (formal_parameters)
+  (actual_parameters)
+  (decl_class)
+  (decl_enum)
+  (comment_block)
+  (doc_block)
+] @fold
diff --git a/queries/enforce/highlights.scm b/queries/enforce/highlights.scm
new file mode 100644
index 000000000..aa8fb9b3e
--- /dev/null
+++ b/queries/enforce/highlights.scm
@@ -0,0 +1,190 @@
+[
+  (comment_line)
+  (comment_block)
+] @comment @spell
+
+[
+  (doc_line)
+  (doc_block)
+] @comment.documentation @spell
+
+(literal_bool) @boolean
+
+(literal_int) @number
+
+(literal_float) @number.float
+
+(literal_string) @string
+
+(escape_sequence) @string.escape
+
+(identifier) @variable
+
+(formal_parameter
+  name: (identifier) @variable.parameter)
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z_][A-Z%d_]+$"))
+
+; Preprocessor directives
+[
+  (include)
+  (define)
+  (ifdef)
+  (ifndef)
+  (else)
+  (endif)
+] @keyword.directive
+
+(preproc_const) @constant.macro
+
+; Constant fields
+(decl_field
+  ((field_modifier) @_modifier
+    (#eq? @_modifier "const"))
+  type: (_)
+  name: (identifier) @constant)
+
+(enum_member
+  name: (identifier) @constant)
+
+[
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "^"
+  "++"
+  "--"
+  "="
+  "+="
+  "-="
+  "*="
+  "/="
+  "&="
+  "^="
+  "|="
+  "<<="
+  ">>="
+  "<"
+  "<="
+  ">="
+  ">"
+  "=="
+  "!="
+  "!"
+  "&&"
+  "||"
+  ">>"
+  "<<"
+  "&"
+  "|"
+  "^"
+  "~"
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+; TODO: <> in decl_class
+(types
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+[
+  ","
+  "."
+  ":"
+  ";"
+] @punctuation.delimiter
+
+[
+  "default"
+  "extends"
+] @keyword
+
+[
+  "new"
+  "delete"
+] @keyword.operator
+
+"return" @keyword.return
+
+[
+  "if"
+  "else"
+  "switch"
+  "case"
+] @keyword.conditional
+
+[
+  "while"
+  "for"
+  "foreach"
+  "continue"
+  "break"
+] @keyword.repeat
+
+[
+  "enum"
+  "class"
+  "typedef"
+] @keyword.type
+
+[
+  (variable_modifier)
+  (method_modifier)
+  (class_modifier)
+  (field_modifier)
+  (formal_parameter_modifier)
+] @keyword.modifier
+
+"ref" @type
+
+(decl_class
+  typename: (identifier) @type)
+
+(decl_class
+  superclass: (superclass
+    typename: (identifier) @type))
+
+(decl_enum
+  typename: (identifier) @type)
+
+(type_identifier
+  (identifier) @type)
+
+[
+  "auto"
+  (type_primitive)
+] @type.builtin
+
+[
+  (super)
+  (this)
+] @variable.builtin
+
+(literal_null) @constant.builtin
+
+(decl_method
+  name: (identifier) @function.method)
+
+(invokation
+  invoked: (identifier) @function.method.call)
+
+; Constructor and deconstructor (function with same name of the class)
+(decl_class
+  typename: (identifier) @_classname
+  body: (class_body
+    (decl_method
+      name: (identifier) @constructor
+      (#eq? @constructor @_classname))))
diff --git a/queries/enforce/indents.scm b/queries/enforce/indents.scm
new file mode 100644
index 000000000..b1dc79b2e
--- /dev/null
+++ b/queries/enforce/indents.scm
@@ -0,0 +1,30 @@
+[
+  (block)
+  (class_body)
+  (enum_body)
+  (switch_body)
+  (array_creation)
+  (formal_parameters)
+  (actual_parameters)
+] @indent.begin
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "}"
+] @indent.branch
+
+[
+  ")"
+  "]"
+  "}"
+] @indent.end
+
+(comment_line) @indent.ignore
+
+[
+  (ERROR)
+  (comment_block)
+] @indent.auto
diff --git a/queries/enforce/injections.scm b/queries/enforce/injections.scm
new file mode 100644
index 000000000..9231a4429
--- /dev/null
+++ b/queries/enforce/injections.scm
@@ -0,0 +1,13 @@
+([
+  (comment_block)
+  (comment_line)
+] @injection.content
+  (#set! injection.language "comment"))
+
+([
+  (doc_block)
+  (doc_line)
+] @injection.content
+  (#set! injection.language "doxygen"))
+
+; TODO: string and print (numbered) format injection
diff --git a/queries/enforce/locals.scm b/queries/enforce/locals.scm
new file mode 100644
index 000000000..9f62f9d96
--- /dev/null
+++ b/queries/enforce/locals.scm
@@ -0,0 +1,40 @@
+; Scopes
+(compilation_unit) @local.scope
+
+(decl_class
+  body: (_) @local.scope)
+
+(decl_enum
+  body: (_) @local.scope)
+
+(decl_method) @local.scope
+
+(block) @local.scope
+
+(if) @local.scope
+
+(for) @local.scope
+
+(foreach) @local.scope
+
+(while) @local.scope
+
+; Definitions
+(decl_class
+  typename: (identifier) @local.definition.type)
+
+(decl_enum
+  typename: (identifier) @local.definition.enum)
+
+(decl_method
+  name: (identifier) @local.definition.method)
+
+(decl_variable
+  (_)*
+  (identifier) @local.definition.var)
+
+; References
+(identifier) @local.reference
+
+(type_identifier
+  (identifier) @local.reference)

From cbd48fac13d2286dd10d08e1d6d83e6de7f13600 Mon Sep 17 00:00:00 2001
From: "loongtao.zhang" <loongtao.zhang@outlook.com>
Date: Sat, 8 Feb 2025 17:38:50 +0800
Subject: [PATCH 2133/2704] feat(jinja): add parser and queries (#7573)

Signed-off-by: loongtao.zhang <loongtao.zhang@outlook.com>
Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 lockfile.json                       |   3 +
 lua/nvim-treesitter/parsers.lua     |  18 ++++
 queries/jinja/highlights.scm        |  19 ++++
 queries/jinja/injections.scm        |   5 +
 queries/jinja_inline/highlights.scm | 157 ++++++++++++++++++++++++++++
 queries/jinja_inline/injections.scm |   2 +
 6 files changed, 204 insertions(+)
 create mode 100644 queries/jinja/highlights.scm
 create mode 100644 queries/jinja/injections.scm
 create mode 100644 queries/jinja_inline/highlights.scm
 create mode 100644 queries/jinja_inline/injections.scm

diff --git a/lockfile.json b/lockfile.json
index cb2729700..7ae51320e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -380,6 +380,9 @@
   "javascript": {
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
+  "jinja": {
+    "revision": "cea7dd379d343e84a6e42793d9055a807957f40f"
+  },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2af97904b..fb8b7e575 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1127,6 +1127,24 @@ list.javascript = {
   maintainers = { "@steelsojka" },
 }
 
+list.jinja = {
+  install_info = {
+    url = "https://github.com/cathaysia/tree-sitter-jinja",
+    location = "tree-sitter-jinja",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@cathaysia" },
+}
+
+list.jinja_inline = {
+  install_info = {
+    url = "https://github.com/cathaysia/tree-sitter-jinja",
+    location = "tree-sitter-jinja_inline",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@cathaysia" },
+}
+
 list.jq = {
   install_info = {
     url = "https://github.com/flurie/tree-sitter-jq",
diff --git a/queries/jinja/highlights.scm b/queries/jinja/highlights.scm
new file mode 100644
index 000000000..cb6f9ff41
--- /dev/null
+++ b/queries/jinja/highlights.scm
@@ -0,0 +1,19 @@
+; inherits: jinja_inline
+
+[
+  "{{"
+  "{{-"
+  "{{+"
+  "+}}"
+  "-}}"
+  "}}"
+  "{%"
+  "{%-"
+  "{%+"
+  "+%}"
+  "-%}"
+  "%}"
+] @keyword.directive
+
+; TODO: only match raw
+(raw_start) @keyword
diff --git a/queries/jinja/injections.scm b/queries/jinja/injections.scm
new file mode 100644
index 000000000..162db3aee
--- /dev/null
+++ b/queries/jinja/injections.scm
@@ -0,0 +1,5 @@
+((inline) @injection.content
+  (#set! injection.language "jinja_inline"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/jinja_inline/highlights.scm b/queries/jinja_inline/highlights.scm
new file mode 100644
index 000000000..69dba77b3
--- /dev/null
+++ b/queries/jinja_inline/highlights.scm
@@ -0,0 +1,157 @@
+"#" @keyword.directive
+
+(string_literal) @string
+
+(number_literal) @number
+
+(float_literal) @number.float
+
+(boolean_literal) @boolean
+
+(null_literal) @constant
+
+"defined" @constant
+
+(comment) @comment @spell
+
+[
+  ","
+  "."
+  ":"
+] @punctuation.delimiter
+
+[
+  (attribute_ignore)
+  (attribute_context)
+  "recursive"
+] @attribute.builtin
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "<"
+  ">"
+] @punctuation.bracket
+
+(binary_operator) @operator
+
+[
+  "block"
+  "with"
+  "filter"
+  "macro"
+  "set"
+  "trans"
+  "pluralize"
+  "autoescape"
+] @keyword
+
+[
+  "endtrans"
+  "endblock"
+  "endwith"
+  "endfilter"
+  "endmacro"
+  "endcall"
+  "endset"
+  "endtrans"
+  "endautoescape"
+] @keyword
+
+(do_statement
+  "do" @keyword)
+
+[
+  "include"
+  "import"
+  "from"
+  "extends"
+  "as"
+] @keyword.import
+
+(import_statement
+  (identifier) @variable)
+
+(import_as
+  (identifier) @variable)
+
+[
+  "if"
+  "else"
+  "endif"
+  "elif"
+] @keyword.conditional
+
+[
+  "for"
+  "in"
+  "continue"
+  "break"
+  "endfor"
+] @keyword.repeat
+
+"call" @function.call
+
+(function_call
+  (identifier) @function.call)
+
+(arg
+  (identifier) @variable.parameter)
+
+(arg
+  (expression
+    (binary_expression
+      (unary_expression
+        (primary_expression
+          (identifier) @variable.parameter)))))
+
+(expression
+  "."
+  (expression)+ @variable.member)
+
+(assignment_expression
+  "."
+  (identifier)+ @variable.member)
+
+(inline_trans
+  "_" @function.builtin)
+
+"debug" @function.builtin
+
+(raw_end) @keyword
+
+(raw_body) @markup.raw.block @nospell
+
+(builtin_test
+  [
+    "boolean"
+    "even"
+    "in"
+    "mapping"
+    "sequence"
+    "callable"
+    "integer"
+    "ne"
+    "string"
+    "defined"
+    "filter"
+    "iterable"
+    "none"
+    "test"
+    "divisibleby"
+    "float"
+    "le"
+    "number"
+    "eq"
+    "ge"
+    "lower"
+    "odd"
+    "undefined"
+    "escaped"
+    "gt"
+    "lt"
+    "sameas"
+    "upper"
+  ] @keyword.operator)
diff --git a/queries/jinja_inline/injections.scm b/queries/jinja_inline/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/jinja_inline/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 1f36863a4e39b0677c7d64c7bf6bf0cd1125c498 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2025 09:39:05 +0000
Subject: [PATCH 2134/2704] bot(readme): update

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d50451596..c1e65aa51 100644
--- a/README.md
+++ b/README.md
@@ -300,6 +300,8 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
 - [x] [javascript](https://github.com/tree-sitter/tree-sitter-javascript) (maintained by @steelsojka)
+- [x] [jinja](https://github.com/cathaysia/tree-sitter-jinja) (maintained by @cathaysia)
+- [x] [jinja_inline](https://github.com/cathaysia/tree-sitter-jinja) (maintained by @cathaysia)
 - [x] [jq](https://github.com/flurie/tree-sitter-jq) (maintained by @ObserverOfTime)
 - [x] [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) (maintained by @steelsojka)
 - [x] [json](https://github.com/tree-sitter/tree-sitter-json) (maintained by @steelsojka)

From 48f7ce34ef274af10a3b2aa24932a310b1bd055d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 8 Feb 2025 09:43:08 +0000
Subject: [PATCH 2135/2704] bot(lockfile): update erlang, gleam, jinja,
 jinja_inline, ziggy, ziggy_schema

---
 lockfile.json            | 13 ++++++++-----
 queries/gleam/locals.scm |  3 ---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7ae51320e..ef6f59bd8 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -177,7 +177,7 @@
     "revision": "9db7a49f3d73222c05b75dcfa8892f5e93542d1e"
   },
   "erlang": {
-    "revision": "90f1fcb7a9c9fff2442c00d087368d5bc2c94407"
+    "revision": "9cea919877741b2ed87cf215c0a06feb9a1930bf"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -246,7 +246,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "066704e4826699e754d351e3bbe12bf2e51de9d8"
+    "revision": "af6043419f5aa0f8b6c2a26db0187aefa46c7f5f"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
@@ -381,7 +381,10 @@
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
   "jinja": {
-    "revision": "cea7dd379d343e84a6e42793d9055a807957f40f"
+    "revision": "41b17a33f335130ce9861fd21bffeb88fd768ef4"
+  },
+  "jinja_inline": {
+    "revision": "41b17a33f335130ce9861fd21bffeb88fd768ef4"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -933,9 +936,9 @@
     "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
-    "revision": "3518133e9ebea7c372eff4def368eda8488fad18"
+    "revision": "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831"
   },
   "ziggy_schema": {
-    "revision": "3518133e9ebea7c372eff4def368eda8488fad18"
+    "revision": "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831"
   }
 }
diff --git a/queries/gleam/locals.scm b/queries/gleam/locals.scm
index 39909a4aa..0058b660e 100644
--- a/queries/gleam/locals.scm
+++ b/queries/gleam/locals.scm
@@ -27,8 +27,5 @@
 ; Block Scope
 (block) @local.scope
 
-; Function Body Scope
-(function_body) @local.scope
-
 ; Case Scope
 (case_clause) @local.scope

From 3973f53d7a8c4b87151dc3fd0e3d654aaa036c31 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 8 Feb 2025 13:30:54 -0500
Subject: [PATCH 2136/2704] fix(razor): mark `npm` as required for generating
 from source

---
 lua/nvim-treesitter/parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fb8b7e575..be4d99b62 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1891,6 +1891,7 @@ list.razor = {
   install_info = {
     url = "https://github.com/tris203/tree-sitter-razor",
     files = { "src/parser.c", "src/scanner.c" },
+    generate_requires_npm = true,
   },
   maintainers = { "@tris203" },
 }

From 119a6f9e253c3e14b404f1b6ce01fa4a1a26871e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 9 Feb 2025 06:41:34 +0000
Subject: [PATCH 2137/2704] bot(lockfile): update c, mlir, printf

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ef6f59bd8..db701ca71 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -51,7 +51,7 @@
     "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
   "c": {
-    "revision": "cf36b0354a2d75a42f87191cbd3166ad8af348e4"
+    "revision": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c"
   },
   "c_sharp": {
     "revision": "b27b091bfdc5f16d0ef76421ea5609c82a57dff0"
@@ -486,7 +486,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "b5d5f238b371b7c9b764f6a053b045dda92bc836"
+    "revision": "65bca19232744b920859ce682cd830b5006b8ccd"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -582,7 +582,7 @@
     "revision": "32fe49cc5d4a2d5a976dacafc0da16d98787866b"
   },
   "printf": {
-    "revision": "60d50a2247b0c1fb72b967562c64711d65c6a060"
+    "revision": "df6b69967db7d74ab338a86a9ab45c0966c5ee3c"
   },
   "prisma": {
     "revision": "73f39a6d5401cfdcd143951e499336cf5ab2ffaa"

From da89532f036da9855f3105955696df36f583b919 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 9 Feb 2025 12:15:07 +0100
Subject: [PATCH 2138/2704] ci(update): block t32 (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 018d3997b..c433c8373 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint,sql"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint,sql,t32"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From b39070f94db04d5bb2e455f8dc4f71b4299ed587 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 06:44:56 +0000
Subject: [PATCH 2139/2704] bot(lockfile): update c_sharp, http, idl, perl

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index db701ca71..89c883b8c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c"
   },
   "c_sharp": {
-    "revision": "b27b091bfdc5f16d0ef76421ea5609c82a57dff0"
+    "revision": "71011c87dc75ab996063eec72644bba7c3edbef5"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -345,7 +345,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "d2e4e4c7d03f70e0465d436f2b5f67497cd544ca"
+    "revision": "77ecf6385f1b5d422e0bbd12204374d287d61ad2"
   },
   "hurl": {
     "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
@@ -354,7 +354,7 @@
     "revision": "d719158abe537b1916daaea6fa03287089f0b601"
   },
   "idl": {
-    "revision": "86ff7f19747a761dc8ba72f4045fd64aed94ba4c"
+    "revision": "b14e7971cfbd64fa0ebcdeaa4dfbb3cb0bfabd7c"
   },
   "idris": {
     "revision": "c56a25cf57c68ff929356db25505c1cc4c7820f6"
@@ -552,7 +552,7 @@
     "revision": "1d16b8e063fdf4385e389096c4bc4999eaaef05f"
   },
   "perl": {
-    "revision": "db79ba96ba13e2e89ce9da07c1cc1dfbe6e2e0f6"
+    "revision": "4a6272ad32b8d9d41996644190b2b2874cbe7882"
   },
   "php": {
     "revision": "f3a19ab3217a6e838870fc7142fa492d1fd7a7c9"

From 6402fcb1e0ec7f1e8cc2b17ebf5af26691278242 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 9 Feb 2025 01:03:36 -0800
Subject: [PATCH 2140/2704] feat(typescript): highlight awaited functions with
 type parameters

---
 queries/ecma/highlights.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 038df5619..cec2f4e3e 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -113,6 +113,18 @@
       (private_property_identifier)
     ] @function.method.call))
 
+(call_expression
+  function: (await_expression
+    (identifier) @function.call))
+
+(call_expression
+  function: (await_expression
+    (member_expression
+      property: [
+        (property_identifier)
+        (private_property_identifier)
+      ] @function.method.call)))
+
 ; Builtins
 ;---------
 ((identifier) @module.builtin

From a840137349fcc35b5ad2c718a9b034b93012fa43 Mon Sep 17 00:00:00 2001
From: ginnyTheCat <ginnythecat@lelux.net>
Date: Mon, 10 Feb 2025 03:35:57 +0100
Subject: [PATCH 2141/2704] feat(sparql): add regex injection

---
 queries/sparql/injections.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/sparql/injections.scm b/queries/sparql/injections.scm
index 2f0e58eb6..bce9a19ee 100644
--- a/queries/sparql/injections.scm
+++ b/queries/sparql/injections.scm
@@ -1,2 +1,8 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+(regex_expression
+  pattern: (rdf_literal
+    value: (string) @injection.content)
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "regex"))

From 6108ba7a135ed37e32276ccb877a348af17fe411 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 11 Feb 2025 06:43:33 +0000
Subject: [PATCH 2142/2704] bot(lockfile): update typst, v

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 89c883b8c..bd433f8f3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -852,7 +852,7 @@
     "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
   },
   "typst": {
-    "revision": "cb0ffe14259f7f63ee6f05b57ceb24a35bedef75"
+    "revision": "46cf4ded12ee974a70bf8457263b67ad7ee0379d"
   },
   "udev": {
     "revision": "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc"
@@ -870,7 +870,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "0461bf8addccb4df566827f1601f415d07b1ffbc"
+    "revision": "92cb593652173dbb1ffb34ce48874d779850aabc"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From e411cf2c8adea87acda6c3d634a375addbfff88e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 06:43:20 +0000
Subject: [PATCH 2143/2704] bot(lockfile): update apex, perl, sflog, soql, sosl

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bd433f8f3..4207f6b89 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
+    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -552,7 +552,7 @@
     "revision": "1d16b8e063fdf4385e389096c4bc4999eaaef05f"
   },
   "perl": {
-    "revision": "4a6272ad32b8d9d41996644190b2b2874cbe7882"
+    "revision": "bb53f204aa3e7507960014642965c9f9a9e84b1d"
   },
   "php": {
     "revision": "f3a19ab3217a6e838870fc7142fa492d1fd7a7c9"
@@ -711,7 +711,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
+    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -735,10 +735,10 @@
     "revision": "d38dcd0b58b223c43e3f9265914fb3167dc624c6"
   },
   "soql": {
-    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
+    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
   },
   "sosl": {
-    "revision": "eade4054efc897f4bb18a5b7bf4b5a824dbffa74"
+    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
   },
   "sourcepawn": {
     "revision": "f2af8d0dc14c6790130cceb2a20027eb41a8297c"

From 6d957c22cb48a734b009a69d03c18d20042c4754 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2025 06:43:23 +0000
Subject: [PATCH 2144/2704] bot(lockfile): update apex, sflog, soql, sosl,
 superhtml

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 4207f6b89..12eecb616 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -9,7 +9,7 @@
     "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
   },
   "apex": {
-    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
+    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
   },
   "arduino": {
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
@@ -711,7 +711,7 @@
     "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
   },
   "sflog": {
-    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
+    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
   },
   "slang": {
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
@@ -735,10 +735,10 @@
     "revision": "d38dcd0b58b223c43e3f9265914fb3167dc624c6"
   },
   "soql": {
-    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
+    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
   },
   "sosl": {
-    "revision": "85418f744a318d345db259831a75f92930e3b9f0"
+    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
   },
   "sourcepawn": {
     "revision": "f2af8d0dc14c6790130cceb2a20027eb41a8297c"
@@ -768,7 +768,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "e6eba40bf54dd94d842154be0389c53a37be8dc8"
+    "revision": "9266b3131bbcc0705b3b752bcb7478871a143740"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From 80e6de9d24eec68d82d5f4e6feae94c9c753ebd6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2025 06:42:56 +0000
Subject: [PATCH 2145/2704] bot(lockfile): update julia, vhs

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 12eecb616..3f9912891 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -405,7 +405,7 @@
     "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
   },
   "julia": {
-    "revision": "3f9870ca1f419e480f39fc181fcfb6dad480969a"
+    "revision": "12a3aede757bc7fbdfb1909507c7a6fddd31df37"
   },
   "just": {
     "revision": "bb0c898a80644de438e6efe5d88d30bf092935cd"
@@ -885,7 +885,7 @@
     "revision": "cfc522af3e49c1a00ae74e01aa14e19818dab8f2"
   },
   "vhs": {
-    "revision": "966067fe81d78071805d8e55ec836b3926c4ece4"
+    "revision": "3f202326c06f1c4d47aa82b9013a6b71aea70611"
   },
   "vim": {
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"

From 00a513f87ee3c339c2024b08db3eb63ba7736ed6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 15 Feb 2025 06:42:58 +0000
Subject: [PATCH 2146/2704] bot(lockfile): update c_sharp, enforce, erlang,
 mlir, nu

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3f9912891..b8f07fa3d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -54,7 +54,7 @@
     "revision": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c"
   },
   "c_sharp": {
-    "revision": "71011c87dc75ab996063eec72644bba7c3edbef5"
+    "revision": "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
@@ -174,10 +174,10 @@
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "enforce": {
-    "revision": "9db7a49f3d73222c05b75dcfa8892f5e93542d1e"
+    "revision": "cf853e5f56f1babe5ec573e356f6fbb4784bf5c1"
   },
   "erlang": {
-    "revision": "9cea919877741b2ed87cf215c0a06feb9a1930bf"
+    "revision": "370cea629eb62a8686504b9fb3252a5e1ae55313"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -486,7 +486,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "65bca19232744b920859ce682cd830b5006b8ccd"
+    "revision": "9d83ca263fa7ec8ac7a5fd8ad14891b2dc583a32"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -519,7 +519,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "d0b26e45525016ef8e6f2ced05852437c06a00ca"
+    "revision": "2a153c88d5d44d96653057c7cc14292f4e641bef"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"

From 38e46a6d7ade5c8718f77b2b9fd98a0f7ab32c1e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 16 Feb 2025 06:41:02 +0000
Subject: [PATCH 2147/2704] bot(lockfile): update v

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index b8f07fa3d..49ce87f63 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -870,7 +870,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "92cb593652173dbb1ffb34ce48874d779850aabc"
+    "revision": "1047c9d876451c3fcf78343fff26cdfff3855b8c"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From b08ae25c473b0c63f5ef99f04b03fe66dfbd8f8d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 9 Feb 2025 12:26:31 +0100
Subject: [PATCH 2148/2704] feat(parsers)!: drop org

The parser has neither queries nor a listed maintainer here and hasn't
seen updates in two years.
---
 README.md                       | 1 -
 lockfile.json                   | 3 ---
 lua/nvim-treesitter/parsers.lua | 7 -------
 3 files changed, 11 deletions(-)

diff --git a/README.md b/README.md
index c1e65aa51..925623753 100644
--- a/README.md
+++ b/README.md
@@ -353,7 +353,6 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
 - [x] [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) (maintained by @undu)
 - [x] [odin](https://github.com/amaanq/tree-sitter-odin) (maintained by @amaanq)
-- [ ] [org](https://github.com/milisims/tree-sitter-org)
 - [x] [pascal](https://github.com/Isopod/tree-sitter-pascal) (maintained by @Isopod)
 - [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
 - [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index 49ce87f63..339d933ba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -539,9 +539,6 @@
   "odin": {
     "revision": "d2ca8efb4487e156a60d5bd6db2598b872629403"
   },
-  "org": {
-    "revision": "64cfbc213f5a83da17632c95382a5a0a2f3357c1"
-  },
   "pascal": {
     "revision": "d0ebabefaea9ac3f6fc3004cf08cd121b66da9e4"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index be4d99b62..60ba67f5b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1581,13 +1581,6 @@ list.odin = {
   maintainers = { "@amaanq" },
 }
 
-list.org = {
-  install_info = {
-    url = "https://github.com/milisims/tree-sitter-org",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-}
-
 list.pascal = {
   install_info = {
     url = "https://github.com/Isopod/tree-sitter-pascal",

From 2cade9e3d105732b794bc37e7cb2dc53b1cf99dc Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sun, 16 Feb 2025 23:47:42 +0800
Subject: [PATCH 2149/2704] feat(nu): new attribute syntax and add folds.scm
 (#7650)

---
 queries/nu/folds.scm      | 10 ++++++++++
 queries/nu/highlights.scm | 17 ++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 queries/nu/folds.scm

diff --git a/queries/nu/folds.scm b/queries/nu/folds.scm
new file mode 100644
index 000000000..53607745a
--- /dev/null
+++ b/queries/nu/folds.scm
@@ -0,0 +1,10 @@
+[
+  (attribute_list)
+  (block)
+  (command_list)
+  (parameter_bracks)
+  (record_body)
+  (val_list)
+  (val_table)
+  (val_closure)
+] @fold
diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
index 90a434eff..f8342fab4 100644
--- a/queries/nu/highlights.scm
+++ b/queries/nu/highlights.scm
@@ -275,16 +275,15 @@ key: (identifier) @property
 (param_cmd
   (cmd_identifier) @string)
 
-(param_long_flag
-  (long_flag_identifier) @attribute)
+(attribute
+  "@" @attribute)
 
-(param_short_flag
-  (param_short_flag_identifier) @attribute)
-
-(short_flag
-  (short_flag_identifier) @attribute)
-
-(long_flag_identifier) @attribute
+[
+  (attribute_identifier)
+  (long_flag_identifier)
+  (param_short_flag_identifier)
+  (short_flag_identifier)
+] @attribute
 
 (scope_pattern
   (wild_card) @function)

From 95648f915424131ba0304989bfd618dce651e1cf Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Mon, 17 Feb 2025 23:54:32 +0100
Subject: [PATCH 2150/2704] feat(inko)!: remove the "class" keyword (#7663)

This keyword is deprecated as of 0.18.1 (released on February 12, 2025)
and is being removed as part of the upcoming 0.19.0 release.

BREAKING CHANGE: replace with `type`.
---
 lockfile.json               | 2 +-
 queries/inko/highlights.scm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 339d933ba..56a6aed96 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -363,7 +363,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "0b08a8f976456a9271f70d4682143328d7224115"
+    "revision": "4d057a5c24d715b211c3c82de2526f041b4af66f"
   },
   "ipkg": {
     "revision": "8d3e9782f2d091d0cd39c13bfb3068db0c675960"
diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
index 880e42cae..8f25cd798 100644
--- a/queries/inko/highlights.scm
+++ b/queries/inko/highlights.scm
@@ -75,7 +75,6 @@
 ] @keyword.operator
 
 [
-  "class"
   "trait"
   "type"
 ] @keyword.type

From 8c41b8b3665bc421882494e8d5cb98c7027fed62 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 18 Feb 2025 06:43:40 +0000
Subject: [PATCH 2151/2704] bot(lockfile): update fsharp, razor

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 56a6aed96..84bdf4dbe 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -210,7 +210,7 @@
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
   "fsharp": {
-    "revision": "ad824dea984734406b50699c5f388a7412e85946"
+    "revision": "9308e58bec0394232a8d4abdd92eeaa387aefc89"
   },
   "func": {
     "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"
@@ -645,7 +645,7 @@
     "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
   },
   "razor": {
-    "revision": "a47cd8ca148685629739a4ab69f58864800fbdab"
+    "revision": "fe46ce5ea7d844e53d59bc96f2175d33691c61c5"
   },
   "rbs": {
     "revision": "de893b166476205b09e79cd3689f95831269579a"

From 1a6e42bb8c5c23d8e2c0acb842dcacac5ee06761 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 18 Feb 2025 10:06:31 +0100
Subject: [PATCH 2152/2704] ci(update): block nickel (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index c433c8373..9dfb0c062 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "slint,sql,t32"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "nickel,slint,sql,t32"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 2c4c8c10ed440ddf8df5ac8811d5c8ee5fc23d11 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 06:44:07 +0000
Subject: [PATCH 2153/2704] bot(lockfile): update mlir, swift

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 84bdf4dbe..9429be475 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -486,7 +486,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "9d83ca263fa7ec8ac7a5fd8ad14891b2dc583a32"
+    "revision": "2a8476371ff4f8b9e451d702033fdf9410fc1a16"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -777,7 +777,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "1ebc09c38f41d6aab7dd65ca0f8ea032ced0364f"
+    "revision": "48fcda87af1bed7d7a328dcd257fe8ee75933b04"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From b9a3588ee87ad68aeedcefd5275c3e13d225a381 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 19 Feb 2025 14:48:26 +0100
Subject: [PATCH 2154/2704] fix(earthfile): adapt to new default branch (with
 external scanner)

---
 lockfile.json                   | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9429be475..7d647cbed 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -144,7 +144,7 @@
     "revision": "26e95de449d772bc2dd4f0382580f84e2a0754d6"
   },
   "earthfile": {
-    "revision": "6695a2dfea5f8d9076b11f9bebcac8184e405e67"
+    "revision": "ae378d9d1306e9a967698516041f6f8803db5592"
   },
   "ebnf": {
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 60ba67f5b..f1b03f473 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -469,7 +469,7 @@ list.dtd = {
 list.earthfile = {
   install_info = {
     url = "https://github.com/glehmann/tree-sitter-earthfile",
-    files = { "src/parser.c" },
+    files = { "src/parser.c", "src/scanner.c" },
   },
   maintainers = { "@glehmann" },
 }

From e5588abcfa4d7fc28ce615b4334338bbd25a386b Mon Sep 17 00:00:00 2001
From: Yuki Ito <mrno110y@gmail.com>
Date: Thu, 20 Feb 2025 01:28:07 +0900
Subject: [PATCH 2155/2704] feat(gomod): support `tool` directive (#7649)

---
 queries/gomod/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
index ff33df3ab..b30be0944 100644
--- a/queries/gomod/highlights.scm
+++ b/queries/gomod/highlights.scm
@@ -14,6 +14,10 @@
 
 (module_path) @string.special.url
 
+(tool_directive) @keyword.directive
+
+(tool) @string.special.url
+
 [
   (version)
   (go_version)

From c32b59a8fde33ced5b30ea97750336a6fcff402f Mon Sep 17 00:00:00 2001
From: Michael Parque <michael.t.parque@outlook.com>
Date: Wed, 19 Feb 2025 18:12:46 +0100
Subject: [PATCH 2156/2704] fix(css): do not fold top-level blocks (#7562)

Using (block) makes the fold behavior only work on the line that the
block starts not the start line of the statement, which is unideal when
the preceding statement spans multiple lines. instead, use all top-level
statements explicitly from https://github.com/tree-sitter/tree-sitter-css/blob/master/grammar.js
---
 queries/css/folds.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/css/folds.scm b/queries/css/folds.scm
index dc3c14df9..60d69a917 100644
--- a/queries/css/folds.scm
+++ b/queries/css/folds.scm
@@ -1,4 +1,10 @@
 [
+  ; top-level block statements from https://github.com/tree-sitter/tree-sitter-css/blob/master/grammar.js
+  ; note: (block) is not used due to unideal behavior when node before block node spans multiple lines
   (rule_set)
+  (at_rule)
+  (supports_statement)
+  (media_statement)
+  (keyframe_block)
   (import_statement)+
 ] @fold

From 36bbf518420918e965d11dad3d3f194803c47731 Mon Sep 17 00:00:00 2001
From: Chris Grieser <73286100+chrisgrieser@users.noreply.github.com>
Date: Wed, 19 Feb 2025 18:37:18 +0100
Subject: [PATCH 2157/2704] feat(yaml): capture "boolean strings" (#7512)

See for example: https://www.bram.us/2022/01/11/yaml-the-norway-problem/
values based on: https://yamllint.readthedocs.io/en/stable/rules.html#module-yamllint.rules.truthy

Parser targets YAML 1.2, which has stricter promotions.
---
 queries/yaml/highlights.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index d41068359..9aed59ce4 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -80,3 +80,20 @@
   "---"
   "..."
 ] @punctuation.special
+
+; help deal with for yaml's norway problem https://www.bram.us/2022/01/11/yaml-the-norway-problem/
+; only using `true` and `false`, since Treesitter parser targets YAML spec 1.2 https://github.com/nvim-treesitter/nvim-treesitter/pull/7512#issuecomment-2565397302
+(block_mapping_pair
+  value: (block_node
+    (block_sequence
+      (block_sequence_item
+        (flow_node
+          (plain_scalar
+            (string_scalar) @boolean
+            (#any-of? @boolean "TRUE" "FALSE" "True" "False")))))))
+
+(block_mapping_pair
+  value: (flow_node
+    (plain_scalar
+      (string_scalar) @boolean
+      (#any-of? @boolean "TRUE" "FALSE" "True" "False"))))

From cb8e810a1ea3f562e95a259df3065c7c23decf7a Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 8 Feb 2025 23:50:26 -0500
Subject: [PATCH 2158/2704] feat(java): add injections for markdown
 documentation comments

Since Java 23, java documentation supports markdown.
It is supported by a '///' line comment followed by mandatory
white space: https://openjdk.org/jeps/467
---
 queries/java/injections.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 2ad7e5fe1..61d792fcf 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -8,6 +8,18 @@
   (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
   (#set! injection.language "doxygen"))
 
+; markdown-style javadocs: https://openjdk.org/jeps/467
+((line_comment) @injection.content
+  (#lua-match? @injection.content "^///%s")
+  (#offset! @injection.content 0 4 0 0)
+  (#set! injection.language "markdown_inline"))
+
+; markdown-style javadocs: https://openjdk.org/jeps/467
+((line_comment) @injection.content
+  (#lua-match? @injection.content "^///%s+[@]")
+  (#offset! @injection.content 0 4 0 0)
+  (#set! injection.language "doxygen"))
+
 ((method_invocation
   name: (identifier) @_method
   arguments: (argument_list

From a15dd9280f369fef4640e64de794f69456ecdf7a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 20 Feb 2025 06:44:02 +0000
Subject: [PATCH 2159/2704] bot(lockfile): update pascal, v

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7d647cbed..5627b6c96 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -540,7 +540,7 @@
     "revision": "d2ca8efb4487e156a60d5bd6db2598b872629403"
   },
   "pascal": {
-    "revision": "d0ebabefaea9ac3f6fc3004cf08cd121b66da9e4"
+    "revision": "78426d96bde7114af979e314283e45d087603428"
   },
   "passwd": {
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
@@ -867,7 +867,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "1047c9d876451c3fcf78343fff26cdfff3855b8c"
+    "revision": "154017bdd3a0eb0130a989823f5c1da263b239f3"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"

From d2ff4006418750aa8b91f280e66bdb623c891c95 Mon Sep 17 00:00:00 2001
From: Daniil Leontev <d@leontiev.xyz>
Date: Thu, 20 Feb 2025 12:17:32 +0100
Subject: [PATCH 2160/2704] feat(promql): do not use regex for string labels
 (#7669)

In Prometheus, label values are treated as strings when used with the
`=` and `!=` operators, and as regular expressions when used with the
`=~` and `!~` operators.

Injecting and then highlighting all label values as regex leads to a
situation where entirely valid **string** label values containing regex
special characters are mistakenly parsed and highlighted as regex. This
results in syntax errors, causing labels to be highlighted incorrectly.

For example, in `foo{bar=~"[a-z]{1,3}"}`, `{` and `}` are regex special
characters, so regex highlighting is expected. However, in
`foo{path="/foo/{id}"}`, `{` and `}` are just part of the string and
have no special meaning, so the whole value should be highlighted as a
string.
---
 queries/promql/highlights.scm                 | 14 +++++++-
 queries/promql/injections.scm                 |  7 +++-
 tests/query/highlights/promql/regex.promql    | 10 ++++++
 .../yaml/promql-on-prometheus-rules.yaml      | 33 +++++++++++++++++++
 tests/query/injections/promql/regex.promql    | 10 ++++++
 .../yaml/promql-on-prometheus-rules.yaml      | 14 ++++++++
 6 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 tests/query/highlights/promql/regex.promql
 create mode 100644 tests/query/highlights/yaml/promql-on-prometheus-rules.yaml
 create mode 100644 tests/query/injections/promql/regex.promql

diff --git a/queries/promql/highlights.scm b/queries/promql/highlights.scm
index 0f58f1578..a99fcdd05 100644
--- a/queries/promql/highlights.scm
+++ b/queries/promql/highlights.scm
@@ -36,7 +36,19 @@
 
 (label_name) @variable.member
 
-(label_value) @string.regexp
+((label_name)
+  [
+    "=~"
+    "!~"
+  ]
+  (label_value) @string.regexp)
+
+((label_name)
+  [
+    "="
+    "!="
+  ]
+  (label_value) @string)
 
 (function_name) @function.call
 
diff --git a/queries/promql/injections.scm b/queries/promql/injections.scm
index 4e7c1b261..791aba3d8 100644
--- a/queries/promql/injections.scm
+++ b/queries/promql/injections.scm
@@ -1,6 +1,11 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-((label_value) @injection.content
+((label_name)
+  [
+    "=~"
+    "!~"
+  ]
+  (label_value) @injection.content
   (#set! injection.language "regex")
   (#offset! @injection.content 0 1 0 -1))
diff --git a/tests/query/highlights/promql/regex.promql b/tests/query/highlights/promql/regex.promql
new file mode 100644
index 000000000..fa61094a3
--- /dev/null
+++ b/tests/query/highlights/promql/regex.promql
@@ -0,0 +1,10 @@
+foo{path=~"^foo$"}[5m] or
+#          ^ @string.regexp
+foo{path!~"[a-zA-Z0-9]{1,3}"}[5m] or
+#          ^ @string.regexp
+foo{path="/api/users/{userId}"}[5m] or
+#         ^ @string
+foo{path!="/api/users/{userId}"}[5m]
+#          ^ @string
+
+# vim: ft=promql
diff --git a/tests/query/highlights/yaml/promql-on-prometheus-rules.yaml b/tests/query/highlights/yaml/promql-on-prometheus-rules.yaml
new file mode 100644
index 000000000..910405418
--- /dev/null
+++ b/tests/query/highlights/yaml/promql-on-prometheus-rules.yaml
@@ -0,0 +1,33 @@
+groups:
+- name: Hardware alerts
+  rules:
+  - alert: Node down
+    expr: up{job="node_exporter"} == 0
+    #     ^ @type
+    for: 3m
+    labels:
+      severity: warning
+    annotations:
+      title: Node {{ $labels.instance }} is down
+      description: Failed to scrape {{ $labels.job }} on {{ $labels.instance }} for more than 3 minutes. Node seems down.
+  - alert: Node down
+    expr: |
+      up{job="node_exporter"} == 0
+    # ^ @type
+    for: 3m
+    labels:
+      severity: warning
+  - alert: Regex and String matching
+    expr: |
+      foo{path=~"^foo$"}[5m] or foo{path!~"[a-zA-Z0-9]{1,3}"}[5m] or foo{path="/api/users/{userId}"}[5m] or foo{path!="/api/users/{userId}"}[5m]
+    # ^ @type
+    #            ^ @string.regexp
+    #                                      ^ @string.regexp
+    #                                                                          ^ @string
+    #                                                                                                                  ^ @string
+    for: 3m
+    labels:
+      severity: warning
+    annotations:
+      title: Foo
+      description: Bar
diff --git a/tests/query/injections/promql/regex.promql b/tests/query/injections/promql/regex.promql
new file mode 100644
index 000000000..08ed74640
--- /dev/null
+++ b/tests/query/injections/promql/regex.promql
@@ -0,0 +1,10 @@
+foo{path=~"^foo$"}[5m] or
+#          ^ @regex
+foo{path!~"[a-zA-Z0-9]{1,3}"}[5m] or
+#          ^ @regex
+foo{path="/api/users/{userId}"}[5m] or
+#         ^ @!regex
+foo{path!="/api/users/{userId}"}[5m]
+#          ^ @!regex
+
+# vim: ft=promql
diff --git a/tests/query/injections/yaml/promql-on-prometheus-rules.yaml b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
index f064da375..942fb1369 100644
--- a/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
+++ b/tests/query/injections/yaml/promql-on-prometheus-rules.yaml
@@ -17,3 +17,17 @@ groups:
     for: 3m
     labels:
       severity: warning
+  - alert: Regex and String matching
+    expr: |
+      foo{path=~"^foo$"}[5m] or foo{path!~"[a-zA-Z0-9]{1,3}"}[5m] or foo{path="/api/users/{userId}"}[5m] or foo{path!="/api/users/{userId}"}[5m]
+    # ^ @promql
+    #            ^ @regex
+    #                                      ^ @regex
+    #                                                                          ^ @!regex
+    #                                                                                                                  ^ @!regex
+    for: 3m
+    labels:
+      severity: warning
+    annotations:
+      title: Foo
+      description: Bar

From bf18d4dc8d9a7a61e855190bc154df12d6536741 Mon Sep 17 00:00:00 2001
From: Philip Zander <philip.zander@gmail.com>
Date: Thu, 20 Feb 2025 18:00:06 +0100
Subject: [PATCH 2161/2704] feat(pascal): Add asm language injection for Pascal

---
 queries/pascal/injections.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/queries/pascal/injections.scm b/queries/pascal/injections.scm
index f46e4b335..1f6e475c8 100644
--- a/queries/pascal/injections.scm
+++ b/queries/pascal/injections.scm
@@ -1,7 +1,5 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-; There is no parser for assembly language yet. Add an injection here when we
-; have a parser.
-; ((asmBody) @injection.content
-;  (#set! injection.language "asm"))
+((asmBody) @injection.content
+  (#set! injection.language "asm"))

From 0cfe75d2a22c29e9a171d524524742efc7b3a043 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 06:43:36 +0000
Subject: [PATCH 2162/2704] bot(lockfile): update liquid, swift

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 5627b6c96..8ea144155 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -441,7 +441,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "23ac814111e2b4b4b083e2c92219af2d5b74d13d"
+    "revision": "d68a255c393cfefa9d3185023e2f1684a52907ed"
   },
   "liquidsoap": {
     "revision": "8e51fa63ddb93ac179d4e34a311d3d3f03780b42"
@@ -777,7 +777,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "48fcda87af1bed7d7a328dcd257fe8ee75933b04"
+    "revision": "d56d844952f7317ca87c3ff9012b868def80d9ba"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 4cf2da5c3a2dfd22e72713c66203d21883b149fd Mon Sep 17 00:00:00 2001
From: Hank Jackson <hjackson277@gmail.com>
Date: Fri, 21 Feb 2025 03:29:03 -0500
Subject: [PATCH 2163/2704] feat(liquid): capture `(front_matter)` and inject
 `yaml`  (#7672)

---
 queries/liquid/highlights.scm | 2 ++
 queries/liquid/injections.scm | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/queries/liquid/highlights.scm b/queries/liquid/highlights.scm
index 17b3d6fe9..38750db41 100644
--- a/queries/liquid/highlights.scm
+++ b/queries/liquid/highlights.scm
@@ -130,3 +130,5 @@
   ","
   "."
 ] @punctuation.delimiter
+
+(front_matter) @keyword.directive
diff --git a/queries/liquid/injections.scm b/queries/liquid/injections.scm
index fa7457659..ab0ced6ae 100644
--- a/queries/liquid/injections.scm
+++ b/queries/liquid/injections.scm
@@ -18,5 +18,10 @@
   (#set! injection.language "css")
   (#set! injection.combined))
 
+((front_matter) @injection.content
+  (#set! injection.language "yaml")
+  (#offset! @injection.content 1 0 -1 0)
+  (#set! injection.include-children))
+
 ((comment) @injection.content
   (#set! injection.language "comment"))

From d0ba96c3dc5b8c040412ee366cf7c596ae430416 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Fri, 21 Feb 2025 21:21:06 +0100
Subject: [PATCH 2164/2704] feat(inko): add support for "for" loops

These will be introduced as part of the 0.19.0 release. This commit
updates the lockfile as well as the relevant queries to accommodate the
new expression and "in" now being a keyword.
---
 lockfile.json               | 2 +-
 queries/inko/folds.scm      | 1 +
 queries/inko/highlights.scm | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 8ea144155..109e82861 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -363,7 +363,7 @@
     "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
   },
   "inko": {
-    "revision": "4d057a5c24d715b211c3c82de2526f041b4af66f"
+    "revision": "f58a87ac4dc6a7955c64c9e4408fbd693e804686"
   },
   "ipkg": {
     "revision": "8d3e9782f2d091d0cd39c13bfb3068db0c675960"
diff --git a/queries/inko/folds.scm b/queries/inko/folds.scm
index b0fbc064e..6ec1f5ba4 100644
--- a/queries/inko/folds.scm
+++ b/queries/inko/folds.scm
@@ -7,6 +7,7 @@
   (define_field)
   (define_variable)
   (external_function)
+  (for)
   (if)
   (import)+
   (loop)
diff --git a/queries/inko/highlights.scm b/queries/inko/highlights.scm
index 8f25cd798..989bdb9e8 100644
--- a/queries/inko/highlights.scm
+++ b/queries/inko/highlights.scm
@@ -56,6 +56,7 @@
   "copy"
   "for"
   "impl"
+  "in"
   "inline"
   "let"
   "move"

From 5774e7d3da4f681296a87fcd85d17779ad362a4f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 22 Feb 2025 06:44:14 +0000
Subject: [PATCH 2165/2704] bot(lockfile): update enforce, liquid, mlir, nix,
 nu

---
 lockfile.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 109e82861..3fc0f4dba 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -174,7 +174,7 @@
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "enforce": {
-    "revision": "cf853e5f56f1babe5ec573e356f6fbb4784bf5c1"
+    "revision": "8201c3c354c34b96d5a531c8e63d262209ee06cb"
   },
   "erlang": {
     "revision": "370cea629eb62a8686504b9fb3252a5e1ae55313"
@@ -441,7 +441,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "d68a255c393cfefa9d3185023e2f1684a52907ed"
+    "revision": "6e03a054a71cd419d9702725243137641e97ba51"
   },
   "liquidsoap": {
     "revision": "8e51fa63ddb93ac179d4e34a311d3d3f03780b42"
@@ -486,7 +486,7 @@
     "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
   },
   "mlir": {
-    "revision": "2a8476371ff4f8b9e451d702033fdf9410fc1a16"
+    "revision": "ad381783044e107ce144af3c36342cc34183d5b4"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -510,7 +510,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "b3a88cf3e597d48c33657deca4fda7a75c0069c1"
+    "revision": "97263793aff88c824d15dc3595d61a63ca6ccc21"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -519,7 +519,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "2a153c88d5d44d96653057c7cc14292f4e641bef"
+    "revision": "ba6db53a20f6e8d5394d316cc8fe8a44690db82a"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"

From c08aa2fe3f5d99deff82087233a4dac6cd1e202a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 23 Feb 2025 12:01:29 +0100
Subject: [PATCH 2166/2704] ci(update): block devicetree (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 9dfb0c062..ee33c3dcc 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "nickel,slint,sql,t32"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,nickel,slint,sql,t32"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From f2bd62c6568de54ca1b8fb0a8de04a41442934cb Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 23 Feb 2025 11:02:45 +0000
Subject: [PATCH 2167/2704] bot(lockfile): update nu, vhdl

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3fc0f4dba..71c87a7df 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -519,7 +519,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "ba6db53a20f6e8d5394d316cc8fe8a44690db82a"
+    "revision": "3673f18a834a75c655d14ed529bda5cb059e884e"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
@@ -879,7 +879,7 @@
     "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
-    "revision": "cfc522af3e49c1a00ae74e01aa14e19818dab8f2"
+    "revision": "f3a8d69a96656bb81d803f7e6ec24fbe1aa2c313"
   },
   "vhs": {
     "revision": "3f202326c06f1c4d47aa82b9013a6b71aea70611"

From e6d02ec9efd396d294a7793f2066e2527b07b03a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 06:45:11 +0000
Subject: [PATCH 2168/2704] bot(lockfile): update nu, rst, swift

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 71c87a7df..588cf1603 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -519,7 +519,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "3673f18a834a75c655d14ed529bda5cb059e884e"
+    "revision": "a073ba8cd854318ca5d56e97279fc330f194be8a"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
@@ -684,7 +684,7 @@
     "revision": "78938553b93075e638035f624973083451b29055"
   },
   "rst": {
-    "revision": "899e073a10012b8028b643d676c30bbf9c64a45d"
+    "revision": "4e562e1598b95b93db4f3f64fe40ddefbc677a15"
   },
   "ruby": {
     "revision": "89bd7a8e5450cb6a942418a619d30469f259e5d6"
@@ -777,7 +777,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "d56d844952f7317ca87c3ff9012b868def80d9ba"
+    "revision": "42ad8f6b4dc9b46285893cc37b460323b54932d4"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 225419160b337d585eb41fc496ea49201f00a6db Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 25 Feb 2025 09:46:10 +0100
Subject: [PATCH 2169/2704] ci(update): block git_config (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index ee33c3dcc..18f1448eb 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,nickel,slint,sql,t32"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 36c78ee5729602e2deedc35935823af89631052d Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 25 Feb 2025 08:47:27 +0000
Subject: [PATCH 2170/2704] bot(lockfile): update styled

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 588cf1603..095615b8f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -759,7 +759,7 @@
     "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
   },
   "styled": {
-    "revision": "75d3ad20818c30c49b445ca2cb35999c278b3453"
+    "revision": "319cdcaa0346ba6db668a222d938e5c3569e2a51"
   },
   "supercollider": {
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"

From 9fcb3f7aa2504307eaaebcc600ed2063d681f80e Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Tue, 25 Feb 2025 01:31:50 -0800
Subject: [PATCH 2171/2704] feat(just): improve attribute highlights

- Default attribute highlight
- Highlight more builtin attributes
- Highlight special attribute arguments
---
 queries/just/highlights.scm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/queries/just/highlights.scm b/queries/just/highlights.scm
index b15a8574a..fbbf4eece 100644
--- a/queries/just/highlights.scm
+++ b/queries/just/highlights.scm
@@ -111,13 +111,29 @@
     "allow-duplicate-recipes" "dotenv-filename" "dotenv-load" "dotenv-path" "export" "fallback"
     "ignore-comments" "positional-arguments" "tempdir" "windows-powershell" "windows-shell"))
 
-; Ref: https://just.systems/man/en/chapter_32.html
-;(recipe (attribute (identifier) @error))
 (recipe
   (attribute
-    (identifier) @attribute)
-  (#any-of? @attribute
-    "confirm" "linux" "macos" "no-cd" "no-exit-message" "no-quiet" "private" "unix" "windows"))
+    (identifier) @attribute))
+
+; https://just.systems/man/en/attributes.html
+((recipe
+  (attribute
+    (identifier) @attribute.builtin))
+  (#any-of? @attribute.builtin
+    "confirm" "doc" "extension" "group" "linux" "macos" "no-cd" "no-exit-message" "no-quiet"
+    "openbsd" "positional-arguments" "private" "script" "unix" "windows" "working-directory"))
+
+((recipe
+  (attribute
+    (identifier) @_doc
+    argument: (string) @string.documentation))
+  (#eq? @_doc "doc"))
+
+((recipe
+  (attribute
+    (identifier) @_dir
+    argument: (string) @string.special.path))
+  (#eq? @_dir "working-directory"))
 
 ; Ref: https://just.systems/man/en/chapter_31.html
 ;(function_call (identifier) @error)

From 3b013b9ed42fcb15dc8b4416854ceaaab69f6c87 Mon Sep 17 00:00:00 2001
From: Andreas Hartmann <hartan@7x.de>
Date: Sun, 16 Feb 2025 08:31:40 +0100
Subject: [PATCH 2172/2704] feat(typst): add more folds

for the following language constructs:

- 'for' blocks
- 'if/else' expressions
- raw markup blocks (```)
- `content`
---
 queries/typst/folds.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/queries/typst/folds.scm b/queries/typst/folds.scm
index f2c13cc2c..ef0ec7956 100644
--- a/queries/typst/folds.scm
+++ b/queries/typst/folds.scm
@@ -4,4 +4,8 @@
   (show)
   (call)
   (section)
+  (for)
+  (branch)
+  (content)
+  (raw_blck)
 ] @fold

From f0ff9f0e5dab10123d3192b12556aa8f88859790 Mon Sep 17 00:00:00 2001
From: Alex Manning <alex41290@gmail.com>
Date: Sun, 2 Feb 2025 19:06:35 -0500
Subject: [PATCH 2173/2704] fix(gleam): indent on unqualified import rather
 than import

---
 queries/gleam/indents.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
index c79854508..3a44ea4c0 100644
--- a/queries/gleam/indents.scm
+++ b/queries/gleam/indents.scm
@@ -7,7 +7,6 @@
   (constant)
   (external_function)
   (function)
-  (import)
   (let)
   (list)
   (constant)
@@ -16,6 +15,7 @@
   (type_alias)
   (todo)
   (tuple)
+  (unqualified_imports)
 ] @indent.begin
 
 [

From 93ce9feb4fabbb37b3e7f47d80f27be778f4d956 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 25 Feb 2025 13:51:59 +0100
Subject: [PATCH 2174/2704] feat(markdown): completely conceal codeblock fences
 on nightly

Required to make https://github.com/neovim/neovim/pull/31324 work with
nvim-treesitter.
---
 queries/markdown/highlights.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index a12669ca2..2a6ad1968 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -49,12 +49,14 @@
 
 (fenced_code_block
   (fenced_code_block_delimiter) @markup.raw.block
-  (#set! conceal ""))
+  (#set! conceal "")
+  (#set! conceal_lines ""))
 
 (fenced_code_block
   (info_string
     (language) @label
-    (#set! conceal "")))
+    (#set! conceal "")
+    (#set! conceal_lines "")))
 
 (link_destination) @markup.link.url
 

From 081a99b3bed1f5050610d08870c71409b878c3c3 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Wed, 26 Feb 2025 08:36:24 -0600
Subject: [PATCH 2175/2704] feat(php): add support for new relative_name node

---
 lockfile.json                             |   4 +-
 queries/php_only/highlights.scm           |  31 ++++-
 tests/query/highlights/php/keywords.php   |  27 ----
 tests/query/highlights/php/namespaces.php | 147 ++++++++++++++++++++++
 4 files changed, 175 insertions(+), 34 deletions(-)
 create mode 100644 tests/query/highlights/php/namespaces.php

diff --git a/lockfile.json b/lockfile.json
index 095615b8f..e3dd2cc4a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -552,10 +552,10 @@
     "revision": "bb53f204aa3e7507960014642965c9f9a9e84b1d"
   },
   "php": {
-    "revision": "f3a19ab3217a6e838870fc7142fa492d1fd7a7c9"
+    "revision": "b22484c92180e6e30c14477f00e1c7f9d2e39304"
   },
   "php_only": {
-    "revision": "f3a19ab3217a6e838870fc7142fa492d1fd7a7c9"
+    "revision": "b22484c92180e6e30c14477f00e1c7f9d2e39304"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm
index 6d51154df..2d473dd0c 100644
--- a/queries/php_only/highlights.scm
+++ b/queries/php_only/highlights.scm
@@ -194,6 +194,8 @@
     (name) @type
     (qualified_name
       (name) @type)
+    (relative_name
+      (name) @type)
   ])
 
 (named_type
@@ -208,6 +210,8 @@
     (name) @type
     (qualified_name
       (name) @type)
+    (relative_name
+      (name) @type)
   ])
 
 (enum_declaration
@@ -269,6 +273,8 @@
     (name) @type
     (qualified_name
       (name) @type)
+    (relative_name
+      (name) @type)
   ])
 
 (scoped_call_expression
@@ -276,6 +282,8 @@
     (name) @type
     (qualified_name
       (name) @type)
+    (relative_name
+      (name) @type)
   ])
 
 (class_constant_access_expression
@@ -284,6 +292,8 @@
     (name) @type
     (qualified_name
       (name) @type)
+    (relative_name
+      (name) @type)
   ]
   (name) @constant)
 
@@ -292,6 +302,8 @@
     (name) @type
     (qualified_name
       (name) @type)
+    (relative_name
+      (name) @type)
   ])
 
 (scoped_property_access_expression
@@ -309,6 +321,8 @@
     (name) @type
     (qualified_name
       (name) @type)
+    (relative_name
+      (name) @type)
   ])
 
 ; Functions, methods, constructors
@@ -326,11 +340,13 @@
   name: (name) @function.method)
 
 (function_call_expression
-  function: (qualified_name
-    (name) @function.call))
-
-(function_call_expression
-  (name) @function.call)
+  function: [
+    (name) @function.call
+    (qualified_name
+      (name) @function.call)
+    (relative_name
+      (name) @function.call)
+  ])
 
 (scoped_call_expression
   name: (name) @function.call)
@@ -365,6 +381,8 @@
     (name) @constructor
     (qualified_name
       (name) @constructor)
+    (relative_name
+      (name) @constructor)
   ])
 
 ; Parameters
@@ -410,6 +428,9 @@
 (namespace_name
   (name) @module)
 
+(relative_name
+  "namespace" @module.builtin)
+
 ; Attributes
 (attribute_list) @attribute
 
diff --git a/tests/query/highlights/php/keywords.php b/tests/query/highlights/php/keywords.php
index 5504cab19..21d248e69 100644
--- a/tests/query/highlights/php/keywords.php
+++ b/tests/query/highlights/php/keywords.php
@@ -2,49 +2,22 @@
 
 namespace Foo\Bar;
 //^^^^^^^ @keyword.type
-//        ^^^ @module
-//            ^^^ @module
 
 use Foo\Baz as Baaz;
 //^ @keyword.import
-//  ^^^ @module
-//      ^^^ @type
 //          ^^ @keyword.operator
-//             ^^^^ @type.definition
-
-use Foo\Baz\{Foo, Bar};
-//           ^^^ @type
-//                ^^^ @type
 
 use function Foo\foo as fooo;
 //  ^^^^^^^^ @keyword.function
-//               ^^^ @function
-//                      ^^^^ @function
-
-use function Foo\{bar, baz};
-//                ^^^ @function
-//                     ^^^ @function
 
 use const Foo\FOO as FOOO;
 //  ^^^^^ @keyword.modifier
-//            ^^^ @constant
-//                   ^^^^ @constant
-
-use const Foo\{FOO, BAR};
-//             ^^^ @constant
-//                  ^^^ @constant
 
 use Foo\Baz\{
-//  ^^^ @module
-//      ^^^ @module
-  Bar,
-//^^^ @type
   function foo,
 //^^^^^^^^ @keyword.function
-//         ^^^ @function
   const FOO,
 //^^^^^ @keyword.modifier
-//      ^^^ @constant
 };
 
 abstract class A
diff --git a/tests/query/highlights/php/namespaces.php b/tests/query/highlights/php/namespaces.php
new file mode 100644
index 000000000..1c96a95b2
--- /dev/null
+++ b/tests/query/highlights/php/namespaces.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace Foo\Bar;
+//        ^^^ @module
+//            ^^^ @module
+
+use Baz as Baaz;
+//  ^^^ @type
+//         ^^^^ @type
+use Foo\Baz as Baaz;
+//  ^^^ @module
+//      ^^^ @type
+//             ^^^^ @type
+
+use Foo\{Bar, Baz as Baaz};
+//       ^^^ @type
+//            ^^^ @type
+//                   ^^^^ @type
+
+use function foo as fooo;
+//           ^^^ @function
+//                  ^^^^ @function
+//
+use function Foo\foo as fooo;
+//           ^^^ @module
+//               ^^^ @function
+//                      ^^^^ @function
+use function Foo\{bar, foo as fooo};
+//                ^^^ @function
+//                     ^^^ @function
+//                            ^^^^ @function
+use const FOO as FOOO;
+//        ^^^ @constant
+//               ^^^^ @constant
+use const Foo\FOO as FOOO;
+//        ^^^ @module
+//            ^^^ @constant
+//                   ^^^^ @constant
+use const Foo\{FOO as FOOO, BAR};
+//             ^^^ @constant
+//                    ^^^^ @constant
+//                          ^^^ @constant
+
+use Foo\Baz\{
+//  ^^^ @module
+//      ^^^ @module
+  Bar as Barr,
+//^^^ @type
+//       ^^^^ @type
+  Foo\Bar as Barr,
+//^^^ @module
+//    ^^^ @type
+//           ^^^^ @type
+  function foo as fooo,
+//         ^^^ @function
+//                ^^^^ @function
+  function Foo\foo as fooo,
+//         ^^^ @module
+//             ^^^ @function
+//                    ^^^^ @function
+  const FOO as FOOO,
+//      ^^^ @constant
+//             ^^^^ @constant
+  const Foo\FOO as FOOO,
+//      ^^^ @module
+//          ^^^ @constant
+//                 ^^^^ @constant
+};
+
+class Foo {
+    public function foo() {
+        Bar::foo();
+//      ^^^ @type
+//           ^^^ @function.call
+        \Bar::foo();
+//       ^^^ @type
+//            ^^^ @function.call
+        Foo\Bar::foo();
+//      ^^^ @module
+//          ^^^ @type
+//               ^^^ @function.call
+        \Foo\Bar::foo();
+//       ^^^ @module
+//           ^^^ @type
+//                ^^^ @function.call
+        namespace\Bar::foo();
+//      ^^^^^^^^^ @module.builtin
+//                ^^^ @type
+//                     ^^^ @function.call
+        namespace\Foo\Bar::foo();
+//      ^^^^^^^^^ @module.builtin
+//                ^^^ @module
+//                    ^^^ @type
+//                         ^^^ @function.call
+        new Bar();
+//          ^^^ @constructor
+        new \Bar();
+//           ^^^ @constructor
+        new Foo\Bar();
+//          ^^^ @module
+//              ^^^ @constructor
+        new \Foo\Bar();
+//           ^^^ @module
+//               ^^^ @constructor
+        new namespace\Bar();
+//          ^^^^^^^^^ @module.builtin
+//                    ^^^ @constructor
+        new namespace\Foo\Bar();
+//          ^^^^^^^^^ @module.builtin
+//                    ^^^ @module
+//                        ^^^ @constructor
+        BAZ;
+//      ^^^ @constant
+        \BAZ;
+//       ^^^ @constant
+        Foo\BAZ;
+//      ^^^ @module
+//          ^^^ @constant
+        \Foo\BAZ;
+//       ^^^ @module
+//           ^^^ @constant
+        namespace\BAZ;
+//      ^^^^^^^^^ @module.builtin
+//                ^^^ @constant
+        namespace\Foo\BAZ;
+//      ^^^^^^^^^ @module.builtin
+//                ^^^ @module
+//                    ^^^ @constant
+        foo();
+//      ^^^ @function.call
+        \foo();
+//       ^^^ @function.call
+        Foo\foo();
+//      ^^^ @module
+//          ^^^ @function.call
+        \Foo\foo();
+//       ^^^ @module
+//           ^^^ @function.call
+        namespace\foo();
+//      ^^^^^^^^^ @module.builtin
+//                ^^^ @function.call
+        namespace\Foo\foo();
+//      ^^^^^^^^^ @module.builtin
+//                ^^^ @module
+//                    ^^^ @function.call
+  }
+}

From 8f87d28442f7f91347e993661c319135f47729c7 Mon Sep 17 00:00:00 2001
From: Raafat Turki <raafat.turki@proton.me>
Date: Wed, 26 Feb 2025 19:36:48 +0300
Subject: [PATCH 2176/2704] feat(sql): add folds (#7686)

---
 queries/sql/folds.scm | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 queries/sql/folds.scm

diff --git a/queries/sql/folds.scm b/queries/sql/folds.scm
new file mode 100644
index 000000000..07f2282d0
--- /dev/null
+++ b/queries/sql/folds.scm
@@ -0,0 +1 @@
+(statement) @fold

From 89eed3572d041c423d14f9ac94086723b338b853 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2025 06:45:42 +0000
Subject: [PATCH 2177/2704] bot(lockfile): update fortran, nix, tlaplus

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e3dd2cc4a..47f14be90 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -204,7 +204,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "022b032d31299c5d8336cdfd0ece97de20a609c0"
+    "revision": "765d82ad913e75abfffdd57837217e96f4774fba"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -510,7 +510,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "97263793aff88c824d15dc3595d61a63ca6ccc21"
+    "revision": "48057cf966641e7a49b09700550751195c34bcb5"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -816,7 +816,7 @@
     "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
   },
   "tlaplus": {
-    "revision": "d711f24c93221cdfc9a9b4dbb0998f528fc982ac"
+    "revision": "4ba91b07b97741a67f61221d0d50e6d962e4987e"
   },
   "tmux": {
     "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"

From a83032cee117b2df9848c6d65b67e5db1de89f34 Mon Sep 17 00:00:00 2001
From: Andreas Hartmann <hartan@7x.de>
Date: Thu, 27 Feb 2025 08:56:45 +0100
Subject: [PATCH 2178/2704] feat(make): fold `define` statements.

---
 queries/make/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/make/folds.scm b/queries/make/folds.scm
index 961f4ec7d..c7f87ac16 100644
--- a/queries/make/folds.scm
+++ b/queries/make/folds.scm
@@ -1,5 +1,6 @@
 ([
   (conditional)
   (rule)
+  (define_directive)
 ] @fold
   (#trim! @fold))

From 00e797ea25ca6a3bce30528a148a3619ec7dcd60 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Wed, 26 Feb 2025 23:06:19 -0800
Subject: [PATCH 2179/2704] feat(typescript): highlight abstract methods

---
 queries/typescript/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 6d0d0f12e..2fb13d800 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -193,6 +193,9 @@
 (method_signature
   name: (_) @function.method)
 
+(abstract_method_signature
+  name: (property_identifier) @function.method)
+
 ; property signatures
 (property_signature
   name: (property_identifier) @function.method

From 28f76678cae8d474cdaec0738e8ff733b14fdeb8 Mon Sep 17 00:00:00 2001
From: Paul Hansen <mail@paul.rs>
Date: Thu, 27 Feb 2025 02:53:58 -0600
Subject: [PATCH 2180/2704] fix(kdl): highlight query order (#7688)

This just fixes the highlighting queries so everything
isn't highlighted as a variable due to the order of the queries
meaning several queries were ignored.

I also changed the node names to be highlighted as `@tag` since KDL is an
xml-like format so `@tag` seemed more appropriate than type and it differentiates it
from the type annotations.

This does NOT update to the latest KDL version 2, that would need
grammar changes. It does "mostly" work with
KDL 2 though (notably unquoted strings seem to throw the grammar off.).
---
 queries/kdl/highlights.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/queries/kdl/highlights.scm b/queries/kdl/highlights.scm
index e61361f96..7d200c85e 100644
--- a/queries/kdl/highlights.scm
+++ b/queries/kdl/highlights.scm
@@ -1,18 +1,19 @@
 ; Types
+; Variables
+(identifier) @variable
+
+; Nodes
 (node
+  (identifier) @tag)
+
+; Type annotation
+(type
   (identifier) @type)
 
-(type) @type
-
-(annotation_type) @type.builtin
-
 ; Properties
 (prop
   (identifier) @property)
 
-; Variables
-(identifier) @variable
-
 ; Operators
 [
   "="

From 376a46ccecb8d839ca0cede51b03ae5da052490f Mon Sep 17 00:00:00 2001
From: Bert Baron <bertusbaron@gmail.com>
Date: Thu, 27 Feb 2025 09:54:26 +0100
Subject: [PATCH 2181/2704] feat(kdl): parser and queries (#7657)

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/kcl/folds.scm           |  10 ++
 queries/kcl/highlights.scm      | 201 ++++++++++++++++++++++++++++++++
 queries/kcl/injections.scm      |  26 +++++
 5 files changed, 248 insertions(+)
 create mode 100644 queries/kcl/folds.scm
 create mode 100644 queries/kcl/highlights.scm
 create mode 100644 queries/kcl/injections.scm

diff --git a/lockfile.json b/lockfile.json
index 47f14be90..ce2f67e84 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -410,6 +410,9 @@
   "just": {
     "revision": "bb0c898a80644de438e6efe5d88d30bf092935cd"
   },
+  "kcl": {
+    "revision": "b0b2eb38009e04035a6e266c7e11e541f3caab7c"
+  },
   "kconfig": {
     "revision": "9ac99fe4c0c27a35dc6f757cef534c646e944881"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f1b03f473..8a3acf2c6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1211,6 +1211,14 @@ list.just = {
   maintainers = { "@Hubro" },
 }
 
+list.kcl = {
+  install_info = {
+    url = "https://github.com/kcl-lang/tree-sitter-kcl",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@bertbaron" },
+}
+
 list.kconfig = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-kconfig",
diff --git a/queries/kcl/folds.scm b/queries/kcl/folds.scm
new file mode 100644
index 000000000..64e9e95d1
--- /dev/null
+++ b/queries/kcl/folds.scm
@@ -0,0 +1,10 @@
+[
+  (protocol_stmt)
+  (rule_stmt)
+  (schema_stmt)
+  (check_stmt)
+  (if_stmt)
+  (lambda_expr)
+  (config_expr)
+  (string)
+] @fold
diff --git a/queries/kcl/highlights.scm b/queries/kcl/highlights.scm
new file mode 100644
index 000000000..81b699ac2
--- /dev/null
+++ b/queries/kcl/highlights.scm
@@ -0,0 +1,201 @@
+(identifier) @variable
+
+(import_stmt
+  (dotted_name
+    (identifier) @module))
+
+(import_stmt
+  (dotted_name
+    (identifier) @module)
+  (identifier) @module)
+
+(basic_type) @type.builtin
+
+(schema_type
+  (dotted_name
+    (identifier) @type))
+
+(schema_type
+  (dotted_name
+    (identifier) @module
+    (identifier) @type))
+
+(schema_expr
+  (identifier) @type)
+
+(protocol_stmt
+  (identifier) @type)
+
+(rule_stmt
+  (identifier) @type)
+
+(schema_stmt
+  (identifier) @type)
+
+(lambda_expr
+  (typed_parameter
+    (identifier) @variable.parameter))
+
+(lambda_expr
+  (identifier) @variable.parameter)
+
+(selector_expr
+  (select_suffix
+    (identifier) @property))
+
+(comment) @comment @spell
+
+(string) @string
+
+(escape_sequence) @string.escape
+
+(schema_stmt
+  body: (block
+    .
+    (string
+      (string_content) @string.documentation)))
+
+(decorator
+  (identifier) @attribute)
+
+(call_expr
+  function: (identifier) @function)
+
+(call_expr
+  function: (selector_expr
+    (select_suffix
+      (identifier) @function)))
+
+(integer) @number
+
+(float) @number.float
+
+[
+  (true)
+  (false)
+] @boolean
+
+[
+  (none)
+  (undefined)
+] @constant.builtin
+
+"for" @keyword.repeat
+
+[
+  "elif"
+  "else"
+  "if"
+] @keyword.conditional
+
+"lambda" @keyword.function
+
+(quant_op) @keyword.operator
+
+[
+  "protocol"
+  "rule"
+  "schema"
+  "type"
+  "mixin"
+] @keyword.type
+
+"assert" @keyword.debug
+
+[
+  "as"
+  "import"
+] @keyword.import
+
+"check" @keyword
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  ","
+  ":"
+  "."
+  "?."
+  "?:"
+  "?"
+] @punctuation.delimiter
+
+(interpolation
+  "${" @punctuation.special
+  "}" @punctuation.special)
+
+[
+  "+"
+  "-"
+  "*"
+  "**"
+  "/"
+  "//"
+  "%"
+  "<<"
+  ">>"
+  "&"
+  "|"
+  "^"
+  "<"
+  ">"
+  "~"
+  "<="
+  ">="
+  "=="
+  "!="
+  "="
+  "+="
+  "-="
+  "*="
+  "**="
+  "/="
+  "//="
+  "%="
+  "<<="
+  ">>="
+  "&="
+  "^="
+  "->"
+] @operator
+
+"@" @attribute
+
+[
+  "and"
+  "or"
+  "not"
+  "in"
+  "is"
+] @keyword.operator
+
+; second argument is a regex in all regex functions with at least two arguments
+(call_expr
+  function: (selector_expr
+    (identifier) @_regex)
+  arguments: (argument_list
+    (_)
+    .
+    (string
+      (string_content) @string.regexp))
+  (#eq? @_regex "regex"))
+
+; first argument is a regex in 'regex.compile' function
+(call_expr
+  function: (selector_expr
+    (identifier) @_regex
+    (select_suffix
+      (identifier) @_fn
+      (#eq? @_fn "compile")))
+  arguments: (argument_list
+    .
+    (string
+      (string_content) @string.regexp))
+  (#eq? @_regex "regex"))
diff --git a/queries/kcl/injections.scm b/queries/kcl/injections.scm
new file mode 100644
index 000000000..4e04e54d3
--- /dev/null
+++ b/queries/kcl/injections.scm
@@ -0,0 +1,26 @@
+(call_expr
+  function: (selector_expr
+    (identifier) @_regex)
+  arguments: (argument_list
+    (_)
+    .
+    (string
+      (string_content) @injection.content))
+  (#eq? @_regex "regex")
+  (#set! injection.language "regex"))
+
+(call_expr
+  function: (selector_expr
+    (identifier) @_regex
+    (select_suffix
+      (identifier) @_fn
+      (#eq? @_fn "compile")))
+  arguments: (argument_list
+    .
+    (string
+      (string_content) @injection.content))
+  (#eq? @_regex "regex")
+  (#set! injection.language "regex"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 8bc635a25f581d42b0a0e5ba8870bd73244dcdea Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2025 08:54:40 +0000
Subject: [PATCH 2182/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 925623753..250d3d3bd 100644
--- a/README.md
+++ b/README.md
@@ -310,6 +310,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
 - [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @fredrikekre)
 - [x] [just](https://github.com/IndianBoy42/tree-sitter-just) (maintained by @Hubro)
+- [x] [kcl](https://github.com/kcl-lang/tree-sitter-kcl) (maintained by @bertbaron)
 - [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
 - [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)
 - [x] [kotlin](https://github.com/fwcd/tree-sitter-kotlin) (maintained by @SalBakraa)

From 99487eb34a397befce8182ff63347a21c5f4b881 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 28 Feb 2025 06:44:30 +0000
Subject: [PATCH 2183/2704] bot(lockfile): update php, php_only, rust, v

---
 lockfile.json           | 8 ++++----
 queries/rust/locals.scm | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ce2f67e84..d6eb4e34e 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -555,10 +555,10 @@
     "revision": "bb53f204aa3e7507960014642965c9f9a9e84b1d"
   },
   "php": {
-    "revision": "b22484c92180e6e30c14477f00e1c7f9d2e39304"
+    "revision": "f7cf7348737d8cff1b13407a0bfedce02ee7b046"
   },
   "php_only": {
-    "revision": "b22484c92180e6e30c14477f00e1c7f9d2e39304"
+    "revision": "f7cf7348737d8cff1b13407a0bfedce02ee7b046"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -696,7 +696,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "2eaf126458a4d6a69401089b6ba78c5e5d6c1ced"
+    "revision": "6e883a2adea9414799300699e78c0d2f032b5c46"
   },
   "scala": {
     "revision": "d67fe3ba3879bd7ba74bd7f56c9a38fed241ba25"
@@ -870,7 +870,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "154017bdd3a0eb0130a989823f5c1da263b239f3"
+    "revision": "532bebd50742ef15949bdd67c36d46697c847628"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
diff --git a/queries/rust/locals.scm b/queries/rust/locals.scm
index 2b1469bf6..718d5f24a 100644
--- a/queries/rust/locals.scm
+++ b/queries/rust/locals.scm
@@ -54,9 +54,6 @@
 (struct_item
   name: (type_identifier) @local.definition.type)
 
-(constrained_type_parameter
-  left: (type_identifier) @local.definition.type) ; the P in  remove_file<P: AsRef<Path>>(path: P)
-
 (enum_item
   name: (type_identifier) @local.definition.type)
 

From f37b1668a63b0d1c3ec165f6ba202367604df1a2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Mar 2025 11:15:34 +0100
Subject: [PATCH 2184/2704] ci(update): block verilog (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 18f1448eb..fa973001e 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32,verilog"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From f56d2f6765292f513005e886f0218df8f4a98397 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Mar 2025 11:55:29 +0100
Subject: [PATCH 2185/2704] ci(update): block typespec (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index fa973001e..c39c94df3 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32,verilog"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32,typespec,verilog"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From c1efc9a9058bb54cfcb6f0a4fc14a4ac8a66bdaa Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 1 Mar 2025 10:57:42 +0000
Subject: [PATCH 2186/2704] bot(lockfile): update dart, djot, meson, mlir

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d6eb4e34e..baccabc46 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -111,7 +111,7 @@
     "revision": "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"
   },
   "dart": {
-    "revision": "e81af6ab94a728ed99c30083be72d88e6d56cf9e"
+    "revision": "80e23c07b64494f7e21090bb3450223ef0b192f4"
   },
   "desktop": {
     "revision": "6d66eea37afa1d6bc1e25ef457113743df42416d"
@@ -129,7 +129,7 @@
     "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
   },
   "djot": {
-    "revision": "67e6e23ba7be81a4373e0f49e21207bdc32d12a5"
+    "revision": "eb31845d59b9ee8c1b2098e78e9ca72004bd1579"
   },
   "dockerfile": {
     "revision": "971acdd908568b4531b0ba28a445bf0bb720aba5"
@@ -486,10 +486,10 @@
     "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
   },
   "meson": {
-    "revision": "c5fffb8edd39f22644084ab3f73a924a75721ee3"
+    "revision": "12edaf0dfef0a43bc74336a4432b2db1c65788d6"
   },
   "mlir": {
-    "revision": "ad381783044e107ce144af3c36342cc34183d5b4"
+    "revision": "855130574db8f33521be163368973c4e2e6dda55"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"

From 8bf733ccce7202e11ffc446639d5d0401b392960 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 2 Mar 2025 11:16:59 +0100
Subject: [PATCH 2187/2704] ci(update): block templ (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index c39c94df3..d0bb6817f 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32,typespec,verilog"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32,templ,typespec,verilog"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 186f35e1684c241baf13a3e6092eee00ac48631e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 2 Mar 2025 10:19:18 +0000
Subject: [PATCH 2188/2704] bot(lockfile): update cmake, jinja, jinja_inline,
 nu

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index baccabc46..f76428988 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "e409ae33f00e04cde30f2bcffb979caf1a33562a"
+    "revision": "def189b2d9395d8ebfe946ff7b1765dc8899a971"
   },
   "comment": {
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
@@ -381,10 +381,10 @@
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
   "jinja": {
-    "revision": "41b17a33f335130ce9861fd21bffeb88fd768ef4"
+    "revision": "07a62adf99c0f41e0cab7ab523541309a8d73dc4"
   },
   "jinja_inline": {
-    "revision": "41b17a33f335130ce9861fd21bffeb88fd768ef4"
+    "revision": "07a62adf99c0f41e0cab7ab523541309a8d73dc4"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -522,7 +522,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "a073ba8cd854318ca5d56e97279fc330f194be8a"
+    "revision": "b99dc3b7b26337d84f95c0de4dda81077b03e5c7"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"

From bf6028e00c52c89d9e0792c56a41e965a2e54873 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 3 Mar 2025 06:47:24 +0000
Subject: [PATCH 2189/2704] bot(lockfile): update cmake, elixir, fortran,
 fsharp, rust, vhdl

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f76428988..ebfe302b9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "def189b2d9395d8ebfe946ff7b1765dc8899a971"
+    "revision": "e5d2133f2a750238c8a64d55e461d4a0ce01f861"
   },
   "comment": {
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
@@ -159,7 +159,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "86ec2ed45d6d9433b4e0b88cd3d96796bd45625f"
+    "revision": "c35154687de847d977858f9fad1049a1e9420f44"
   },
   "elm": {
     "revision": "e34bdc5c512918628b05b48e633f711123204e45"
@@ -204,13 +204,13 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "765d82ad913e75abfffdd57837217e96f4774fba"
+    "revision": "21b740801794b6570a0380f8aef22bb67214ea65"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
   },
   "fsharp": {
-    "revision": "9308e58bec0394232a8d4abdd92eeaa387aefc89"
+    "revision": "02929f084726db969e5b916d144436f248146824"
   },
   "func": {
     "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"
@@ -696,7 +696,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "6e883a2adea9414799300699e78c0d2f032b5c46"
+    "revision": "02da1b25f6dfc7341ddb80f37f708cdd9301be2d"
   },
   "scala": {
     "revision": "d67fe3ba3879bd7ba74bd7f56c9a38fed241ba25"
@@ -882,7 +882,7 @@
     "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
-    "revision": "f3a8d69a96656bb81d803f7e6ec24fbe1aa2c313"
+    "revision": "db1d7446bd07d811981734cd501fe1994cbad99d"
   },
   "vhs": {
     "revision": "3f202326c06f1c4d47aa82b9013a6b71aea70611"

From 1adcd5711929e44d1bc9e59fbf7d94656cf6d389 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 2 Mar 2025 14:30:13 -0800
Subject: [PATCH 2190/2704] feat(markdown): fold sublists

---
 queries/markdown/folds.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/queries/markdown/folds.scm b/queries/markdown/folds.scm
index a682e20e0..2bcfd442d 100644
--- a/queries/markdown/folds.scm
+++ b/queries/markdown/folds.scm
@@ -1,7 +1,12 @@
 ([
   (fenced_code_block)
   (indented_code_block)
-  (list)
+  (list_item
+    (list))
   (section)
 ] @fold
   (#trim! @fold))
+
+(section
+  (list) @fold
+  (#trim! @fold))

From c641ca8e052750812f76b3e0a1ae22d0b8cd538f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 4 Mar 2025 09:25:23 +0100
Subject: [PATCH 2191/2704] ci(update): block rescript (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index d0bb6817f..44b8aaeb4 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,slint,sql,t32,templ,typespec,verilog"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,rescript,slint,sql,t32,templ,typespec,verilog"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From a5a2845a869d3190eec26b0d24a05f6640924ece Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 08:26:56 +0000
Subject: [PATCH 2192/2704] bot(lockfile): update cmake, elixir, ocaml,
 ocaml_interface, powershell, requirements, superhtml, ziggy, ziggy_schema

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ebfe302b9..9cfe21a36 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "e5d2133f2a750238c8a64d55e461d4a0ce01f861"
+    "revision": "cd00bbcb77fe31283ca79b0038387ec7411759ae"
   },
   "comment": {
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
@@ -159,7 +159,7 @@
     "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
   },
   "elixir": {
-    "revision": "c35154687de847d977858f9fad1049a1e9420f44"
+    "revision": "450a8194f5a66561135962cfc8d7545a27b61c4c"
   },
   "elm": {
     "revision": "e34bdc5c512918628b05b48e633f711123204e45"
@@ -531,10 +531,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "91e4d9106f5da8199ab5158ba65e02da3e664597"
+    "revision": "db52ba3f7f33c9949bba115a813d7c30a359cd87"
   },
   "ocaml_interface": {
-    "revision": "91e4d9106f5da8199ab5158ba65e02da3e664597"
+    "revision": "db52ba3f7f33c9949bba115a813d7c30a359cd87"
   },
   "ocamllex": {
     "revision": "5da5bb7508ac9fd3317561670ef18c126a0fe2aa"
@@ -579,7 +579,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "32fe49cc5d4a2d5a976dacafc0da16d98787866b"
+    "revision": "e904962e25858b7e8e19c653e737ad3b7d1c55bd"
   },
   "printf": {
     "revision": "df6b69967db7d74ab338a86a9ab45c0966c5ee3c"
@@ -666,7 +666,7 @@
     "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
   },
   "requirements": {
-    "revision": "5ad9b7581b3334f6ad492847d007f2fac6e6e5f2"
+    "revision": "728910099ddea7f1f94ea95a35a70d1ea76a1639"
   },
   "rescript": {
     "revision": "4606cd81c4c31d1d02390fee530858323410a74c"
@@ -768,7 +768,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "9266b3131bbcc0705b3b752bcb7478871a143740"
+    "revision": "15ff939100f9d52342445407973f3ce125a8437e"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -936,9 +936,9 @@
     "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
-    "revision": "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831"
+    "revision": "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596"
   },
   "ziggy_schema": {
-    "revision": "acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831"
+    "revision": "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596"
   }
 }

From 2b0760dca2354fecf48ea35fdf1d753a232e3de2 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 3 Mar 2025 08:56:31 -0800
Subject: [PATCH 2193/2704] feat(jsx): commentstring query

---
 queries/jsx/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
index a53b95339..0615d253a 100644
--- a/queries/jsx/highlights.scm
+++ b/queries/jsx/highlights.scm
@@ -149,3 +149,9 @@
   (string
     (string_fragment) @string.special.url))
   (#any-of? @_attr "href" "src"))
+
+((jsx_element) @_jsx_element
+  (#set! @_jsx_element bo.commentstring "{/* %s */}"))
+
+((jsx_attribute) @_jsx_attribute
+  (#set! @_jsx_attribute bo.commentstring "// %s"))

From 55c5c762fee2e813b4e43bbfaf5b91d182bd2875 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 5 Mar 2025 06:45:02 +0000
Subject: [PATCH 2194/2704] bot(lockfile): update dtd, mlir, slim, xml

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9cfe21a36..87802b789 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -141,7 +141,7 @@
     "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
-    "revision": "26e95de449d772bc2dd4f0382580f84e2a0754d6"
+    "revision": "2128a0b249263e238d88cb894dad00c3168fea37"
   },
   "earthfile": {
     "revision": "ae378d9d1306e9a967698516041f6f8803db5592"
@@ -489,7 +489,7 @@
     "revision": "12edaf0dfef0a43bc74336a4432b2db1c65788d6"
   },
   "mlir": {
-    "revision": "855130574db8f33521be163368973c4e2e6dda55"
+    "revision": "af14b427119a7428b461277bfc43abe5864d995d"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -717,7 +717,7 @@
     "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
   },
   "slim": {
-    "revision": "a0f08e85b787248219ea645423c5916c8d620ef6"
+    "revision": "546e3aa1af8a3b355c7734efccd9a759ffc0b43a"
   },
   "slint": {
     "revision": "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd"
@@ -915,7 +915,7 @@
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
-    "revision": "26e95de449d772bc2dd4f0382580f84e2a0754d6"
+    "revision": "2128a0b249263e238d88cb894dad00c3168fea37"
   },
   "xresources": {
     "revision": "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"

From 794cf2f6309691d4e9d3945ae33943a3d90ddd84 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 06:45:08 +0000
Subject: [PATCH 2195/2704] bot(lockfile): update angular, meson, mlir, rust,
 scala, unison

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 87802b789..e8ea3bbf9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "b9b32fa042c2952a7bfca86847ea325e44ccc897"
   },
   "angular": {
-    "revision": "745d3c65c2294aca1110b6b6ad6805124be605c9"
+    "revision": "cba288924f4832abb619c627539f111004ff22e5"
   },
   "apex": {
     "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
@@ -486,10 +486,10 @@
     "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
   },
   "meson": {
-    "revision": "12edaf0dfef0a43bc74336a4432b2db1c65788d6"
+    "revision": "742a21e11e914096e0172dad2f0b85e7554c95ff"
   },
   "mlir": {
-    "revision": "af14b427119a7428b461277bfc43abe5864d995d"
+    "revision": "c7c62f37a8612a897d25906d93363fec36c1591c"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
@@ -696,10 +696,10 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "02da1b25f6dfc7341ddb80f37f708cdd9301be2d"
+    "revision": "5edb201282b79aba611c763d11a84dcde15fcae6"
   },
   "scala": {
-    "revision": "d67fe3ba3879bd7ba74bd7f56c9a38fed241ba25"
+    "revision": "ed939ed550ebff7d4ad8aafb4d5aad44de69965d"
   },
   "scfg": {
     "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"
@@ -861,7 +861,7 @@
     "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
   },
   "unison": {
-    "revision": "3c97db76d3cdbd002dfba493620c2d5df2fd6fa9"
+    "revision": "169e7f748a540ec360c0cb086b448faad012caa4"
   },
   "usd": {
     "revision": "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"

From 16e8e197717cc6a89d7bea46d5e3cde954f1500e Mon Sep 17 00:00:00 2001
From: patricorgi <patricorgi@gmail.com>
Date: Thu, 6 Mar 2025 12:47:57 -0500
Subject: [PATCH 2196/2704] feat(snakemake): add rules to locals (#7698)

---
 queries/python/locals.scm    | 6 +++---
 queries/snakemake/locals.scm | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/queries/python/locals.scm b/queries/python/locals.scm
index 6a9dffe23..b012e9eee 100644
--- a/queries/python/locals.scm
+++ b/queries/python/locals.scm
@@ -16,15 +16,15 @@
 
 ; Imports
 (aliased_import
-  alias: (identifier) @local.definition.import)
+  alias: (identifier) @local.definition.import) @local.scope
 
 (import_statement
   name: (dotted_name
-    (identifier) @local.definition.import))
+    (identifier) @local.definition.import)) @local.scope
 
 (import_from_statement
   name: (dotted_name
-    (identifier) @local.definition.import))
+    (identifier) @local.definition.import)) @local.scope
 
 ; Function with parameters, defines parameters
 (parameters
diff --git a/queries/snakemake/locals.scm b/queries/snakemake/locals.scm
index 0b920cbf9..219f23347 100644
--- a/queries/snakemake/locals.scm
+++ b/queries/snakemake/locals.scm
@@ -1 +1,4 @@
 ; inherits: python
+
+(rule_definition
+  name: (identifier) @local.definition.type) @local.scope

From f22181a62c47bf591fbfd6ada7d9a1156278d6e0 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 6 Mar 2025 18:27:20 +0000
Subject: [PATCH 2197/2704] feat(gleam):  "echo" keyword (#7710)

---
 queries/gleam/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
index 5238c601b..f80bda240 100644
--- a/queries/gleam/highlights.scm
+++ b/queries/gleam/highlights.scm
@@ -5,6 +5,7 @@
   "panic"
   "todo"
   "use"
+  "echo"
 ] @keyword
 
 "type" @keyword.type

From 71ac531a6301b6d5f4dc4d7157ffd8bd8d6d769e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 7 Mar 2025 06:45:59 +0000
Subject: [PATCH 2198/2704] bot(lockfile): update gleam, rust

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index e8ea3bbf9..3b4ca0099 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -246,7 +246,7 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "af6043419f5aa0f8b6c2a26db0187aefa46c7f5f"
+    "revision": "e01c88449b53e2ee5dad222d4020cc7006c5b700"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
@@ -696,7 +696,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "5edb201282b79aba611c763d11a84dcde15fcae6"
+    "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
   },
   "scala": {
     "revision": "ed939ed550ebff7d4ad8aafb4d5aad44de69965d"

From ee8e149a4ff75ebd5f1b065831746ddaf0e480ec Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 8 Mar 2025 06:40:01 +0000
Subject: [PATCH 2199/2704] bot(lockfile): update ocaml, ocaml_interface

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 3b4ca0099..456f2fc77 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -531,10 +531,10 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "db52ba3f7f33c9949bba115a813d7c30a359cd87"
+    "revision": "6921a831d79d515d64400a9e022cf30e68a2a3dd"
   },
   "ocaml_interface": {
-    "revision": "db52ba3f7f33c9949bba115a813d7c30a359cd87"
+    "revision": "6921a831d79d515d64400a9e022cf30e68a2a3dd"
   },
   "ocamllex": {
     "revision": "5da5bb7508ac9fd3317561670ef18c126a0fe2aa"

From f0c17dc8597eceb859aa77ab4247a11242b3a6a2 Mon Sep 17 00:00:00 2001
From: ginnyTheCat <ginnythecat@lelux.net>
Date: Sat, 8 Mar 2025 18:49:06 +0100
Subject: [PATCH 2200/2704] fix(rust): inject html and json in macro
 invocations (#7715)

---
 queries/rust/injections.scm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index d8aa98245..d6d8d46ab 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -5,20 +5,19 @@
     (identifier) @_macro_name
   ]
   (token_tree) @injection.content
-  (#not-eq? @_macro_name "slint")
+  (#not-any-of? @_macro_name "slint" "html" "json")
   (#set! injection.language "rust")
   (#set! injection.include-children))
 
 (macro_invocation
   macro: [
     (scoped_identifier
-      name: (_) @_macro_name)
-    (identifier) @_macro_name
+      name: (_) @injection.language)
+    (identifier) @injection.language
   ]
   (token_tree) @injection.content
-  (#eq? @_macro_name "slint")
+  (#any-of? @injection.language "slint" "html" "json")
   (#offset! @injection.content 0 1 0 -1)
-  (#set! injection.language "slint")
   (#set! injection.include-children))
 
 (macro_definition
@@ -37,11 +36,6 @@
 ] @injection.content
   (#set! injection.language "comment"))
 
-((macro_invocation
-  macro: (identifier) @injection.language
-  (token_tree) @injection.content)
-  (#any-of? @injection.language "html" "json"))
-
 (call_expression
   function: (scoped_identifier
     path: (identifier) @_regex

From ffd284c4706d91c0d94916995f584b22ce89afcb Mon Sep 17 00:00:00 2001
From: may <m4rch3n1ng@gmail.com>
Date: Sat, 8 Mar 2025 20:06:05 +0100
Subject: [PATCH 2201/2704] fix(rust): inject regex into RegexBuilder instead
 of ByteRegexBuilder

---
 queries/rust/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index d6d8d46ab..7bffd1fc9 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -39,7 +39,7 @@
 (call_expression
   function: (scoped_identifier
     path: (identifier) @_regex
-    (#any-of? @_regex "Regex" "ByteRegexBuilder")
+    (#any-of? @_regex "Regex" "RegexBuilder")
     name: (identifier) @_new
     (#eq? @_new "new"))
   arguments: (arguments
@@ -51,7 +51,7 @@
   function: (scoped_identifier
     path: (scoped_identifier
       (identifier) @_regex
-      (#any-of? @_regex "Regex" "ByteRegexBuilder") .)
+      (#any-of? @_regex "Regex" "RegexBuilder") .)
     name: (identifier) @_new
     (#eq? @_new "new"))
   arguments: (arguments

From 59573f96164ab3725a2358fe8ffe69e8291d9549 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 9 Mar 2025 06:36:47 +0000
Subject: [PATCH 2202/2704] bot(lockfile): update ocaml, ocaml_interface,
 ocamllex

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 456f2fc77..c00af3791 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -531,13 +531,13 @@
     "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
   },
   "ocaml": {
-    "revision": "6921a831d79d515d64400a9e022cf30e68a2a3dd"
+    "revision": "91708deb10cb4fe68ab3c50891426b9967dbf35a"
   },
   "ocaml_interface": {
-    "revision": "6921a831d79d515d64400a9e022cf30e68a2a3dd"
+    "revision": "91708deb10cb4fe68ab3c50891426b9967dbf35a"
   },
   "ocamllex": {
-    "revision": "5da5bb7508ac9fd3317561670ef18c126a0fe2aa"
+    "revision": "c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f"
   },
   "odin": {
     "revision": "d2ca8efb4487e156a60d5bd6db2598b872629403"

From f840ab9f72f8bce3489e731b34a123cb5c25ca87 Mon Sep 17 00:00:00 2001
From: uncenter <uncenter@uncenter.dev>
Date: Sun, 9 Mar 2025 13:44:59 -0400
Subject: [PATCH 2203/2704] feat(tera): add parser and queries

---
 lockfile.json                   |   3 +
 lua/nvim-treesitter/parsers.lua |   8 ++
 queries/tera/highlights.scm     | 153 ++++++++++++++++++++++++++++++++
 queries/tera/injections.scm     |   7 ++
 4 files changed, 171 insertions(+)
 create mode 100644 queries/tera/highlights.scm
 create mode 100644 queries/tera/injections.scm

diff --git a/lockfile.json b/lockfile.json
index c00af3791..a907a0087 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -806,6 +806,9 @@
   "templ": {
     "revision": "def9849184de71a797c4e2b2837df85abeccf92c"
   },
+  "tera": {
+    "revision": "ae37c8f0e55b3b969caf5433940553374c87430c"
+  },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8a3acf2c6..9eeb40019 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2325,6 +2325,14 @@ list.tcl = {
   maintainers = { "@lewis6991" },
 }
 
+list.tera = {
+  install_info = {
+    url = "https://github.com/uncenter/tree-sitter-tera",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@uncenter" },
+}
+
 list.terraform = {
   install_info = {
     url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
diff --git a/queries/tera/highlights.scm b/queries/tera/highlights.scm
new file mode 100644
index 000000000..f41ad826f
--- /dev/null
+++ b/queries/tera/highlights.scm
@@ -0,0 +1,153 @@
+; Variables
+;----------
+(identifier) @variable
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "loop" "__tera_context"))
+
+; Properties
+;-----------
+(member_expression
+  property: (identifier)? @variable.member)
+
+; Literals
+;-----------
+(string) @string
+
+(bool) @boolean
+
+(number) @number
+
+; Tokens
+;-----------
+[
+  "."
+  ","
+  "::"
+  (frontmatter_delimiter)
+] @punctuation.delimiter
+
+[
+  "*"
+  "/"
+  "%"
+  "|"
+  "+"
+  "-"
+  "~"
+  "="
+  "=="
+  "!="
+  "<"
+  ">"
+  "<="
+  ">="
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{%"
+  "%}"
+  "-%}"
+  "{%-"
+  "}}"
+  "{{"
+  "-}}"
+  "{{-"
+] @punctuation.bracket
+
+; Tags
+;-----------
+(comment_tag) @comment @spell
+
+; Keywords
+;-----------
+[
+  "if"
+  "elif"
+  "else"
+  "endif"
+] @keyword.conditional
+
+[
+  "for"
+  "endfor"
+] @keyword.repeat
+
+[
+  "include"
+  "import"
+  "extends"
+] @keyword.import
+
+[
+  "in"
+  "and"
+  "or"
+  "not"
+  "is"
+] @keyword.operator
+
+[
+  "break"
+  "continue"
+] @keyword.return
+
+[
+  "set"
+  "set_global"
+  "filter"
+  "endfilter"
+  "block"
+  "endblock"
+  "macro"
+  "endmacro"
+  "raw"
+  "endraw"
+  "as"
+] @keyword
+
+; Functions
+;-----------
+(macro_statement
+  name: (identifier) @function
+  (parameter_list
+    parameter: (identifier) @variable.parameter
+    (optional_parameter
+      name: (identifier) @variable.parameter)))
+
+(call_expression
+  scope: (identifier)? @module
+  name: (identifier) @function.call)
+
+(call_expression
+  scope: (identifier) @module.builtin
+  name: (identifier) @function.call
+  (#eq? @module.builtin "self"))
+
+(call_expression
+  name: (identifier) @function.builtin
+  (#any-of? @function.builtin
+    ; Functions - https://keats.github.io/tera/docs/#built-in-functions
+    "range" "now" "throw" "get_random" "get_env"))
+
+(test_expression
+  test: (identifier) @function.call)
+
+(test_expression
+  test: (identifier) @function.builtin
+  (#any-of? @function.builtin
+    ; Tests - https://keats.github.io/tera/docs/#built-in-tests
+    "defined" "undefined" "odd" "even" "string" "number" "divisibleby" "iterable" "object"
+    "starting_with" "ending_with" "containing" "matching"))
+
+(filter_expression
+  filter: (identifier) @function.method.call)
+
+; Namespaces
+;-----------
+(import_statement
+  scope: (identifier) @module)
diff --git a/queries/tera/injections.scm b/queries/tera/injections.scm
new file mode 100644
index 000000000..394142081
--- /dev/null
+++ b/queries/tera/injections.scm
@@ -0,0 +1,7 @@
+(frontmatter
+  (content) @injection.content
+  (#set! injection.language "yaml")
+  (#set! injection.combined))
+
+((comment_tag) @injection.content
+  (#set! injection.language "comment"))

From f06adcf5721b5ae161dd673a3b9bbce3b7bbc879 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 9 Mar 2025 17:45:13 +0000
Subject: [PATCH 2204/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 250d3d3bd..115ed31c0 100644
--- a/README.md
+++ b/README.md
@@ -442,6 +442,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) (maintained by @lewis6991)
 - [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
 - [x] [templ](https://github.com/vrischmann/tree-sitter-templ) (maintained by @vrischmann)
+- [x] [tera](https://github.com/uncenter/tree-sitter-tera) (maintained by @uncenter)
 - [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
 - [x] [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) (maintained by @Porter)
 - [x] [thrift](https://github.com/duskmoon314/tree-sitter-thrift) (maintained by @amaanq, @duskmoon314)

From afe977dadd8bccbd3919b29a8b5beb5b8bfc6cdb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 9 Mar 2025 12:06:59 +0100
Subject: [PATCH 2205/2704] feat(roc)!: bump parser and queries

Adapt to https://github.com/faldor20/tree-sitter-roc/pull/30

Also synchronize queries with upstream and add indents
---
 lockfile.json              |  2 +-
 queries/roc/highlights.scm | 23 ++++++++-------
 queries/roc/indents.scm    | 60 ++++++++++++++++++++++++++++++++++++++
 queries/roc/injections.scm | 25 ++++++++++++++++
 queries/roc/locals.scm     |  8 +++++
 5 files changed, 107 insertions(+), 11 deletions(-)
 create mode 100644 queries/roc/indents.scm

diff --git a/lockfile.json b/lockfile.json
index a907a0087..2d83990bd 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -681,7 +681,7 @@
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
   },
   "roc": {
-    "revision": "de0839d6c7db2405e827435cf3ac62d22f4bd5e9"
+    "revision": "54c9a725fc7a419ccec8ad1a7761631f857b553a"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
diff --git a/queries/roc/highlights.scm b/queries/roc/highlights.scm
index 1f950cbc0..3fcc935ed 100644
--- a/queries/roc/highlights.scm
+++ b/queries/roc/highlights.scm
@@ -32,6 +32,12 @@
 (field_access_expr
   (identifier) @variable.member)
 
+;highlight module members as records instead of free variables
+; avoids highlighting them as out-of-scope vars
+(variable_expr
+  (module)
+  (identifier) @variable.member)
+
 ;----comments----
 (line_comment) @comment @spell
 
@@ -41,8 +47,8 @@
 [
   "?"
   (arrow)
-  (back_arrow)
-  (backslash)
+  (fat_arrow)
+  "|"
   ","
   ":"
 ] @punctuation.delimiter
@@ -59,6 +65,8 @@
 [
   "|"
   "&"
+  "<-"
+  ".."
   (operator)
 ] @operator
 
@@ -92,10 +100,6 @@
   "imports"
 ] @keyword.import
 
-(backpassing_expr
-  assignee: (identifier_pattern
-    (identifier) @variable.parameter))
-
 (value_declaration
   (decl_left
     (identifier_pattern
@@ -105,8 +109,7 @@
 
 ;----tags----
 (tags_type
-  (apply_type
-    (concrete_type) @constructor))
+  (tag_type) @constructor)
 
 [
   (tag)
@@ -123,11 +126,11 @@
 "dbg" @keyword.debug
 
 ;----function invocations ----
-(function_call_expr
+(function_call_pnc_expr
   caller: (variable_expr
     (identifier) @function.call))
 
-(function_call_expr
+(function_call_pnc_expr
   caller: (field_access_expr
     (identifier) @function.call .))
 
diff --git a/queries/roc/indents.scm b/queries/roc/indents.scm
new file mode 100644
index 000000000..764e0e29e
--- /dev/null
+++ b/queries/roc/indents.scm
@@ -0,0 +1,60 @@
+; (value_declaration(expr_body(anon_fun_expr)))@indent.ignore
+[
+  (when_is_expr)
+  (when_is_branch)
+  (record_expr)
+  (anon_fun_expr)
+  (list_expr)
+  (parenthesized_expr)
+  (function_call_pnc_expr)
+  (tuple_expr)
+  (imports)
+  (exposes)
+  (exposes_list)
+  (exposing)
+  ;patterns
+  (record_pattern)
+  (tuple_pattern)
+  (list_pattern)
+  ;ability stuff
+  (ability_implementation)
+  (opaque_type_def)
+  ;types
+  (record_type)
+  (tags_type)
+  (record_expr)
+  (implements_implementation)
+  "{"
+  "("
+  "["
+] @indent.begin
+
+;  ((record_type)
+;   @indent.align
+;   (#set! indent.open_delimiter "{")
+;   (#set! indent.close_delimiter "}"))
+;  ((record_expr)
+;   @indent.align
+;   (#set! indent.open_delimiter "{")
+;   (#set! indent.close_delimiter "}"))
+; ((tags_type) @indent.align
+;   (#set! indent.open_delimiter "[")
+;   (#set! indent.close_delimiter "]"))
+; ((implements_implementation) @indent.align
+;   (#set! indent.open_delimiter "[")
+;   (#set! indent.close_delimiter "]"))
+(expr_body) @indent.begin
+
+(ERROR
+  "=") @indent.begin
+
+(then) @indent.begin
+
+(else) @indent.begin
+
+[
+  ; result:(_)
+  "]"
+  "}"
+  ")"
+] @indent.branch
diff --git a/queries/roc/injections.scm b/queries/roc/injections.scm
index 326478351..509805b17 100644
--- a/queries/roc/injections.scm
+++ b/queries/roc/injections.scm
@@ -1,3 +1,28 @@
+;injection from function calls
+(function_call_pnc_expr
+  (variable_expr
+    (identifier) @injection.language)
+  (const
+    [
+      (multiline_string)
+      (string)
+    ] @injection.content)
+  (#any-eq? @injection.language
+    "json" "toml" "yaml" "xml" "sql" "lua" "js" "html" "css" "http" "jq" "latex" "md" "nix" "regex"))
+
+;injection from piping function calls
+(bin_op_expr
+  part: (const
+    [
+      (multiline_string)
+      (string)
+    ] @injection.content)
+  part: (operator)
+  part: (variable_expr
+    (identifier) @injection.language)
+  (#any-eq? @injection.language
+    "json" "toml" "yaml" "xml" "sql" "lua" "js" "html" "css" "http" "jq" "latex" "md" "nix" "regex"))
+
 ([
   (line_comment)
   (doc_comment)
diff --git a/queries/roc/locals.scm b/queries/roc/locals.scm
index 134fe0119..29f04e990 100644
--- a/queries/roc/locals.scm
+++ b/queries/roc/locals.scm
@@ -35,6 +35,14 @@
 (identifier_pattern
   (identifier) @local.definition)
 
+(when_is_branch
+  pattern: (_
+    (identifier_pattern
+      (identifier) @local.definition)))
+
+(spread_pattern
+  (identifier) @local.definition)
+
 (identifier) @local.reference
 
 (tag_expr

From feab1f19f889fd6da9f80ced4717ae60d56f6519 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 06:39:07 +0000
Subject: [PATCH 2206/2704] bot(lockfile): update asm, jinja, jinja_inline,
 vhdl

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2d83990bd..28e94e92b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -15,7 +15,7 @@
     "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
   },
   "asm": {
-    "revision": "5bb5b03e3c1ce5853b5282b9fba060f7c7bbf11e"
+    "revision": "04962e15f6b464cf1d75eada59506dc25090e186"
   },
   "astro": {
     "revision": "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"
@@ -381,10 +381,10 @@
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
   "jinja": {
-    "revision": "07a62adf99c0f41e0cab7ab523541309a8d73dc4"
+    "revision": "9ccf02886dbabcda36ba2e419aa1cd993428ff03"
   },
   "jinja_inline": {
-    "revision": "07a62adf99c0f41e0cab7ab523541309a8d73dc4"
+    "revision": "9ccf02886dbabcda36ba2e419aa1cd993428ff03"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -885,7 +885,7 @@
     "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
-    "revision": "db1d7446bd07d811981734cd501fe1994cbad99d"
+    "revision": "32d3e3daa745bf9f1665676f323be968444619e1"
   },
   "vhs": {
     "revision": "3f202326c06f1c4d47aa82b9013a6b71aea70611"

From 38959800c2439c890e3238af559f0dc3be45e393 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 10 Mar 2025 01:40:32 -0700
Subject: [PATCH 2207/2704] fix(bibtex): use more appropriate captures (#7721)

---
 queries/bibtex/highlights.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/bibtex/highlights.scm b/queries/bibtex/highlights.scm
index a82b371ae..4cbddc1d0 100644
--- a/queries/bibtex/highlights.scm
+++ b/queries/bibtex/highlights.scm
@@ -22,7 +22,7 @@
 (number) @number
 
 (field
-  name: (identifier) @variable.member)
+  name: (identifier) @property)
 
 (token
   (identifier) @variable.parameter)
@@ -35,7 +35,7 @@
 [
   (key_brace)
   (key_paren)
-] @string.special.symbol
+] @markup.link.label
 
 (string
   name: (identifier) @constant)

From 108302da0e5c1c8d1b60fa28959c69c966d95247 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 11 Mar 2025 06:45:44 +0000
Subject: [PATCH 2208/2704] bot(lockfile): update erlang, jinja, jinja_inline,
 nix, nu, roc, superhtml, tera, ziggy, ziggy_schema

---
 lockfile.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 28e94e92b..52ca97e9a 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -177,7 +177,7 @@
     "revision": "8201c3c354c34b96d5a531c8e63d262209ee06cb"
   },
   "erlang": {
-    "revision": "370cea629eb62a8686504b9fb3252a5e1ae55313"
+    "revision": "e772975f9af564e65ccc4ffcb3891eb1b9abd897"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -381,10 +381,10 @@
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
   "jinja": {
-    "revision": "9ccf02886dbabcda36ba2e419aa1cd993428ff03"
+    "revision": "dd2c42ea360b7e4b6c6fb809494203ae251e1c87"
   },
   "jinja_inline": {
-    "revision": "9ccf02886dbabcda36ba2e419aa1cd993428ff03"
+    "revision": "dd2c42ea360b7e4b6c6fb809494203ae251e1c87"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -513,7 +513,7 @@
     "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
   },
   "nix": {
-    "revision": "48057cf966641e7a49b09700550751195c34bcb5"
+    "revision": "cfc53fd287d23ab7281440a8526c73542984669b"
   },
   "norg": {
     "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
@@ -522,7 +522,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "b99dc3b7b26337d84f95c0de4dda81077b03e5c7"
+    "revision": "c9f04276e6b5bbbcdba7aa1810ea621ced5bed97"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
@@ -681,7 +681,7 @@
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
   },
   "roc": {
-    "revision": "54c9a725fc7a419ccec8ad1a7761631f857b553a"
+    "revision": "32e20cb1133a5a189f986c3b5df47ac730fbee3d"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
@@ -768,7 +768,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "15ff939100f9d52342445407973f3ce125a8437e"
+    "revision": "91d92846e8baaafc8854d2b9d0ac436bc16234db"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -807,7 +807,7 @@
     "revision": "def9849184de71a797c4e2b2837df85abeccf92c"
   },
   "tera": {
-    "revision": "ae37c8f0e55b3b969caf5433940553374c87430c"
+    "revision": "588f14ce363904bebd926492bbd1d2c53f8d5f14"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -939,9 +939,9 @@
     "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
-    "revision": "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596"
+    "revision": "cefc572046d16f071d6d01f73af215c9dd2a5927"
   },
   "ziggy_schema": {
-    "revision": "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596"
+    "revision": "cefc572046d16f071d6d01f73af215c9dd2a5927"
   }
 }

From 833405d5a99ae4ba5f7062ea414bcfe2441dacab Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Tue, 11 Mar 2025 00:48:09 -0700
Subject: [PATCH 2209/2704] feat(bibtex): highlight URLs and DOIs (#7725)

---
 queries/bibtex/highlights.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/queries/bibtex/highlights.scm b/queries/bibtex/highlights.scm
index 4cbddc1d0..2231a17db 100644
--- a/queries/bibtex/highlights.scm
+++ b/queries/bibtex/highlights.scm
@@ -32,6 +32,13 @@
   (quote_word)
 ] @string
 
+((field
+  name: (identifier) @_url
+  value: (value
+    (token
+      (brace_word) @string.special.url)))
+  (#any-of? @_url "url" "doi"))
+
 [
   (key_brace)
   (key_paren)

From cf0eabc16cf32d69f7612d0e023ef210d84cdde6 Mon Sep 17 00:00:00 2001
From: Salomon Popp <hi@salomonpopp.me>
Date: Tue, 11 Mar 2025 08:48:33 +0100
Subject: [PATCH 2210/2704] fix(python): don't highlight attribute name as
 builtin (#7712)

* fix(python): don't highlight attribute name as builtin

* fix(python): highlight `@variable.member` correctly for member access context

* test: add test

* test: expand test

* docs: update comment

* refactor: change order, remove priority override

* style: remove extra newline
---
 queries/python/highlights.scm           | 49 +++++++++++++------------
 tests/query/highlights/python/fields.py |  5 +++
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 77edc7960..d0759e26b 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -23,10 +23,6 @@
 
 "_" @character.special ; match wildcard
 
-((attribute
-  attribute: (identifier) @variable.member)
-  (#lua-match? @variable.member "^[%l_].*$"))
-
 ((assignment
   left: (identifier) @type.definition
   (type
@@ -395,6 +391,31 @@
   (ellipsis)
 ] @punctuation.delimiter
 
+((identifier) @type.builtin
+  (#any-of? @type.builtin
+    ; https://docs.python.org/3/library/exceptions.html
+    "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError"
+    "AttributeError" "EOFError" "FloatingPointError" "GeneratorExit" "ImportError"
+    "ModuleNotFoundError" "IndexError" "KeyError" "KeyboardInterrupt" "MemoryError" "NameError"
+    "NotImplementedError" "OSError" "OverflowError" "RecursionError" "ReferenceError" "RuntimeError"
+    "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError" "SystemError"
+    "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError"
+    "UnicodeDecodeError" "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError"
+    "IOError" "WindowsError" "BlockingIOError" "ChildProcessError" "ConnectionError"
+    "BrokenPipeError" "ConnectionAbortedError" "ConnectionRefusedError" "ConnectionResetError"
+    "FileExistsError" "FileNotFoundError" "InterruptedError" "IsADirectoryError"
+    "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+    "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+    ; https://docs.python.org/3/library/stdtypes.html
+    "bool" "int" "float" "complex" "list" "tuple" "range" "str" "bytes" "bytearray" "memoryview"
+    "set" "frozenset" "dict" "type" "object"))
+
+; After @type.builtin bacause builtins (such as `type`) are valid as attribute name
+((attribute
+  attribute: (identifier) @variable.member)
+  (#lua-match? @variable.member "^[%l_].*$"))
+
 ; Class definitions
 (class_definition
   name: (identifier) @type)
@@ -429,26 +450,6 @@
       name: (identifier) @constructor)))
   (#any-of? @constructor "__new__" "__init__"))
 
-((identifier) @type.builtin
-  (#any-of? @type.builtin
-    ; https://docs.python.org/3/library/exceptions.html
-    "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError"
-    "AttributeError" "EOFError" "FloatingPointError" "GeneratorExit" "ImportError"
-    "ModuleNotFoundError" "IndexError" "KeyError" "KeyboardInterrupt" "MemoryError" "NameError"
-    "NotImplementedError" "OSError" "OverflowError" "RecursionError" "ReferenceError" "RuntimeError"
-    "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError" "SystemError"
-    "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError"
-    "UnicodeDecodeError" "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError"
-    "IOError" "WindowsError" "BlockingIOError" "ChildProcessError" "ConnectionError"
-    "BrokenPipeError" "ConnectionAbortedError" "ConnectionRefusedError" "ConnectionResetError"
-    "FileExistsError" "FileNotFoundError" "InterruptedError" "IsADirectoryError"
-    "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
-    "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
-    "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
-    ; https://docs.python.org/3/library/stdtypes.html
-    "bool" "int" "float" "complex" "list" "tuple" "range" "str" "bytes" "bytearray" "memoryview"
-    "set" "frozenset" "dict" "type" "object"))
-
 ; Regex from the `re` module
 (call
   function: (attribute
diff --git a/tests/query/highlights/python/fields.py b/tests/query/highlights/python/fields.py
index deb280622..cea9eccb7 100644
--- a/tests/query/highlights/python/fields.py
+++ b/tests/query/highlights/python/fields.py
@@ -1,9 +1,14 @@
 class Fields:
+    type: str
+#   ^^^^ @variable.member
+
     def __init__(self, fields: list[int]) -> None:
 #                                   ^^^ @type.builtin
 #                                            ^^^^ @constant.builtin
         self.fields = fields
 #            ^^^^^^ @variable.member
+        self.type = "foo"
+#            ^^^^ @variable.member
         self.__dunderfield__ = None
 #            ^^^^^^^^^^^^^^^ @variable.member
         self._FunKyFielD = 0

From db8689da4a2b56388d07b3c20935dde648efbf90 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 12 Mar 2025 06:47:48 +0000
Subject: [PATCH 2211/2704] bot(lockfile): update cmake, erlang, ini, jinja,
 jinja_inline, nu, swift, ziggy, ziggy_schema

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 52ca97e9a..6c7bace9b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -72,7 +72,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "cd00bbcb77fe31283ca79b0038387ec7411759ae"
+    "revision": "c70336e8db6d3842721d9be40610580908ff45ba"
   },
   "comment": {
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
@@ -177,7 +177,7 @@
     "revision": "8201c3c354c34b96d5a531c8e63d262209ee06cb"
   },
   "erlang": {
-    "revision": "e772975f9af564e65ccc4ffcb3891eb1b9abd897"
+    "revision": "364e323b32d098ad0e7b29e7adb4005c2bb5cf34"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -360,7 +360,7 @@
     "revision": "c56a25cf57c68ff929356db25505c1cc4c7820f6"
   },
   "ini": {
-    "revision": "962568c9efa71d25720ab42c5d36e222626ef3a6"
+    "revision": "32b31863f222bf22eb43b07d4e9be8017e36fb31"
   },
   "inko": {
     "revision": "f58a87ac4dc6a7955c64c9e4408fbd693e804686"
@@ -381,10 +381,10 @@
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
   "jinja": {
-    "revision": "dd2c42ea360b7e4b6c6fb809494203ae251e1c87"
+    "revision": "9af6ce9380fabd3d5b19d0254b8c8936e879c471"
   },
   "jinja_inline": {
-    "revision": "dd2c42ea360b7e4b6c6fb809494203ae251e1c87"
+    "revision": "9af6ce9380fabd3d5b19d0254b8c8936e879c471"
   },
   "jq": {
     "revision": "13990f530e8e6709b7978503da9bc8701d366791"
@@ -522,7 +522,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "c9f04276e6b5bbbcdba7aa1810ea621ced5bed97"
+    "revision": "c10340b5bb3789f69182acf8f34c3d4fc24d2fe1"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
@@ -780,7 +780,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "42ad8f6b4dc9b46285893cc37b460323b54932d4"
+    "revision": "02db52e14bc303322d22019fff7823d72904dfe5"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
@@ -939,9 +939,9 @@
     "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
-    "revision": "cefc572046d16f071d6d01f73af215c9dd2a5927"
+    "revision": "00958faeaeb97d9b7beb76f128a5401441182204"
   },
   "ziggy_schema": {
-    "revision": "cefc572046d16f071d6d01f73af215c9dd2a5927"
+    "revision": "00958faeaeb97d9b7beb76f128a5401441182204"
   }
 }

From 1a314a58d6d7695d226b56f6b61b1596993d5ac7 Mon Sep 17 00:00:00 2001
From: Salomon Popp <hi@salomonpopp.me>
Date: Wed, 12 Mar 2025 09:22:33 +0100
Subject: [PATCH 2212/2704] fix(python): highlight function calls correctly
 (#7728)

---
 queries/python/highlights.scm               | 84 ++++++++++-----------
 tests/query/highlights/python/decorators.py | 22 ++++++
 tests/query/highlights/python/functions.py  | 13 ++++
 3 files changed, 77 insertions(+), 42 deletions(-)
 create mode 100644 tests/query/highlights/python/decorators.py
 create mode 100644 tests/query/highlights/python/functions.py

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index d0759e26b..60f3e14c0 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -35,48 +35,6 @@
     function: (identifier) @_func))
   (#any-of? @_func "TypeVar" "NewType"))
 
-; Function calls
-(call
-  function: (identifier) @function.call)
-
-(call
-  function: (attribute
-    attribute: (identifier) @function.method.call))
-
-((call
-  function: (identifier) @constructor)
-  (#lua-match? @constructor "^%u"))
-
-((call
-  function: (attribute
-    attribute: (identifier) @constructor))
-  (#lua-match? @constructor "^%u"))
-
-; Decorators
-((decorator
-  "@" @attribute)
-  (#set! priority 101))
-
-(decorator
-  (identifier) @attribute)
-
-(decorator
-  (attribute
-    attribute: (identifier) @attribute))
-
-(decorator
-  (call
-    (identifier) @attribute))
-
-(decorator
-  (call
-    (attribute
-      attribute: (identifier) @attribute)))
-
-((decorator
-  (identifier) @attribute.builtin)
-  (#any-of? @attribute.builtin "classmethod" "property" "staticmethod"))
-
 ; Builtin functions
 ((call
   function: (identifier) @function.builtin)
@@ -450,6 +408,23 @@
       name: (identifier) @constructor)))
   (#any-of? @constructor "__new__" "__init__"))
 
+; Function calls
+(call
+  function: (identifier) @function.call)
+
+(call
+  function: (attribute
+    attribute: (identifier) @function.method.call))
+
+((call
+  function: (identifier) @constructor)
+  (#lua-match? @constructor "^%u"))
+
+((call
+  function: (attribute
+    attribute: (identifier) @constructor))
+  (#lua-match? @constructor "^%u"))
+
 ; Regex from the `re` module
 (call
   function: (attribute
@@ -459,3 +434,28 @@
     (string
       (string_content) @string.regexp))
   (#eq? @_re "re"))
+
+; Decorators
+((decorator
+  "@" @attribute)
+  (#set! priority 101))
+
+(decorator
+  (identifier) @attribute)
+
+(decorator
+  (attribute
+    attribute: (identifier) @attribute))
+
+(decorator
+  (call
+    (identifier) @attribute))
+
+(decorator
+  (call
+    (attribute
+      attribute: (identifier) @attribute)))
+
+((decorator
+  (identifier) @attribute.builtin)
+  (#any-of? @attribute.builtin "classmethod" "property" "staticmethod"))
diff --git a/tests/query/highlights/python/decorators.py b/tests/query/highlights/python/decorators.py
new file mode 100644
index 000000000..278e4e311
--- /dev/null
+++ b/tests/query/highlights/python/decorators.py
@@ -0,0 +1,22 @@
+from dataclasses import dataclass
+
+
+@dataclass
+#^^^^^^^^^ @attribute
+class Data:
+    _foo: str
+
+    @property
+#   ^ @attribute
+#    ^^^^^^^^ @attribute.builtin
+    def foo(self) -> str:
+        return self._foo
+
+
+@pytest.mark.filterwarnings("ignore::DeprecationWarning")
+#^^^^^^ @variable
+#       ^^^^ @variable.member
+#            ^^^^^^^^^^^^^^ @attribute
+def test_func():
+    pass
+
diff --git a/tests/query/highlights/python/functions.py b/tests/query/highlights/python/functions.py
new file mode 100644
index 000000000..6d3028433
--- /dev/null
+++ b/tests/query/highlights/python/functions.py
@@ -0,0 +1,13 @@
+def func() -> None: ...
+
+_ = func()
+#   ^^^^ @function.call
+
+"{}".format(1)
+#    ^^^^^^ @function.method.call
+
+class Foo:
+    def method(self) -> None: ...
+
+Foo().method()
+#     ^^^^^^ @function.method.call

From 6d1a8e6fdb562aab59e0f67e7aef23cc5b23e283 Mon Sep 17 00:00:00 2001
From: Novus Nota <68142933+novusnota@users.noreply.github.com>
Date: Wed, 12 Mar 2025 18:26:07 +0100
Subject: [PATCH 2213/2704] feat(tact): update parser and queries (#7731)

---
 lockfile.json               |  2 +-
 queries/tact/folds.scm      |  4 ++-
 queries/tact/highlights.scm | 62 +++++++++++++++++++++++++++++++++----
 queries/tact/indents.scm    |  2 +-
 queries/tact/locals.scm     |  2 +-
 5 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 6c7bace9b..6d404d243 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -795,7 +795,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "83e264928fa194b7283428527259e88e54205264"
+    "revision": "a19be2d4c1956e12facfc717e28f13a6ad0860e0"
   },
   "tcl": {
     "revision": "98015ebe182d94e5a4439e32ffd91beaac32fcb9"
diff --git a/queries/tact/folds.scm b/queries/tact/folds.scm
index 66e7bdaa9..adade3f1c 100644
--- a/queries/tact/folds.scm
+++ b/queries/tact/folds.scm
@@ -6,6 +6,7 @@
   (argument_list)
   ; {…, …}
   (instance_argument_list)
+  (destruct_bind_list)
   ; {…; …}
   (message_body)
   (struct_body)
@@ -14,5 +15,6 @@
   (function_body)
   (block_statement)
   (asm_function_body)
-  (asm_list)
+  ; <{ … }>
+  (asm_sequence)
 ] @fold
diff --git a/queries/tact/highlights.scm b/queries/tact/highlights.scm
index d65b501cf..345ca299c 100644
--- a/queries/tact/highlights.scm
+++ b/queries/tact/highlights.scm
@@ -2,6 +2,10 @@
 ; --------
 (identifier) @variable
 
+(destruct_bind
+  name: (identifier) @variable.member
+  bind: (identifier) @variable)
+
 ; variable.builtin
 ; ----------------
 (self) @variable.builtin
@@ -51,15 +55,23 @@
   "<"
   "<="
   "<<"
+  "<<="
   ">"
   ">="
   ">>"
+  ">>="
   "&"
+  "&="
   "|"
+  "|="
   "^"
+  "^="
   "&&"
+  "&&="
   "||"
+  "||="
   "->"
+  ".."
 ] @operator
 
 ; constructor
@@ -70,6 +82,9 @@
 (initOf
   name: (identifier) @constructor)
 
+(codeOf
+  name: (identifier) @constructor)
+
 ; type
 ; ----
 (type_identifier) @type
@@ -79,6 +94,10 @@
 ((identifier) @type.builtin
   (#any-of? @type.builtin "Context" "SendParameters" "StateInit" "StdAddress" "VarAddress"))
 
+(generic_parameter_list
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
 (bounced_type
   "bounced" @type.builtin
   "<" @punctuation.bracket
@@ -94,7 +113,7 @@
 
 (tlb_serialization
   "as" @keyword
-  type: (identifier) @type.builtin)
+  type: (identifier) @type)
 
 ; string
 ; ------
@@ -107,7 +126,7 @@
 ; string.special.path
 ; -------------------
 (import
-  library: (string) @string.special.path)
+  name: (string) @string.special.path)
 
 ; boolean
 ; -------
@@ -127,10 +146,10 @@
 
 ((identifier) @constant.builtin
   (#any-of? @constant.builtin
-    "SendBounceIfActionFail" "SendPayGasSeparately" "SendIgnoreErrors" "SendDestroyIfZero"
-    "SendRemainingValue" "SendRemainingBalance" "SendOnlyEstimateFee" "ReserveExact"
-    "ReserveAllExcept" "ReserveAtMost" "ReserveAddOriginalBalance" "ReserveInvertSign"
-    "ReserveBounceIfActionFail"))
+    "SendDefaultMode" "SendBounceIfActionFail" "SendPayGasSeparately" "SendIgnoreErrors"
+    "SendDestroyIfZero" "SendRemainingValue" "SendRemainingBalance" "SendOnlyEstimateFee"
+    "ReserveExact" "ReserveAllExcept" "ReserveAtMost" "ReserveAddOriginalBalance"
+    "ReserveInvertSign" "ReserveBounceIfActionFail"))
 
 ; property
 ; --------
@@ -181,6 +200,8 @@
 ; ----------------
 "initOf" @keyword.operator
 
+"codeOf" @keyword.operator
+
 ; keyword.import
 ; --------------
 "import" @keyword.import
@@ -277,6 +298,35 @@
 (method_call_expression
   name: (identifier) @function.method.call)
 
+; asm-specific
+; ------------
+(tvm_instruction) @function.call
+
+(asm_integer) @number
+
+(asm_string) @string
+
+(asm_control_register) @string.special.symbol
+
+(asm_stack_register) @string.special.symbol
+
+(asm_hex_bitstring) @function.macro
+
+(asm_bin_bitstring) @function.macro
+
+(asm_boc_hex) @function.macro
+
+(asm_cont_name) @variable
+
+; within asm_sequence
+[
+  "<{"
+  "}>"
+  "}>c"
+  "}>s"
+  "}>CONT"
+] @punctuation.bracket
+
 ; attribute
 ; ---------
 [
diff --git a/queries/tact/indents.scm b/queries/tact/indents.scm
index b26ce1460..1d05d4d82 100644
--- a/queries/tact/indents.scm
+++ b/queries/tact/indents.scm
@@ -6,6 +6,7 @@
   (argument_list)
   ; {..., ...}
   (instance_argument_list)
+  (destruct_bind_list)
   ; {...; ...}
   (message_body)
   (struct_body)
@@ -14,7 +15,6 @@
   (function_body)
   (block_statement)
   (asm_function_body)
-  (asm_list)
   ; misc.
   (binary_expression)
   (ternary_expression)
diff --git a/queries/tact/locals.scm b/queries/tact/locals.scm
index 042afb941..547ee42c8 100644
--- a/queries/tact/locals.scm
+++ b/queries/tact/locals.scm
@@ -70,7 +70,7 @@
 
 ; imports
 (import
-  (string) @local.definition.import)
+  name: (string) @local.definition.import)
 
 ; References   @local.reference
 ; -----------------------------

From 548ed98f8a0af738d095ef1be5961f41061ed743 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Wed, 12 Mar 2025 12:47:19 -0500
Subject: [PATCH 2214/2704] feat(blade): add laravel blade parser and queries
 (#7693)

---
 README.md                       |  1 +
 lockfile.json                   |  3 +++
 lua/nvim-treesitter/parsers.lua |  8 ++++++++
 queries/blade/folds.scm         | 14 ++++++++++++++
 queries/blade/highlights.scm    | 15 +++++++++++++++
 queries/blade/indents.scm       |  3 +++
 queries/blade/injections.scm    | 15 +++++++++++++++
 7 files changed, 59 insertions(+)
 create mode 100644 queries/blade/folds.scm
 create mode 100644 queries/blade/highlights.scm
 create mode 100644 queries/blade/indents.scm
 create mode 100644 queries/blade/injections.scm

diff --git a/README.md b/README.md
index 115ed31c0..dc7ccd198 100644
--- a/README.md
+++ b/README.md
@@ -188,6 +188,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
 - [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
 - [x] [bitbake](https://github.com/amaanq/tree-sitter-bitbake) (maintained by @amaanq)
+- [x] [blade](https://github.com/EmranMR/tree-sitter-blade) (maintained by @calebdw)
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
diff --git a/lockfile.json b/lockfile.json
index 6d404d243..9ae24ea03 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -44,6 +44,9 @@
   "bitbake": {
     "revision": "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"
   },
+  "blade": {
+    "revision": "bcdc4b01827cac21205f7453e9be02f906943128"
+  },
   "blueprint": {
     "revision": "60ba73739c6083c693d86a1a7cf039c07eb4ed59"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9eeb40019..c73225f9d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -191,6 +191,14 @@ list.bitbake = {
   maintainers = { "@amaanq" },
 }
 
+list.blade = {
+  install_info = {
+    url = "https://github.com/EmranMR/tree-sitter-blade",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@calebdw" },
+}
+
 list.blueprint = {
   install_info = {
     url = "https://gitlab.com/gabmus/tree-sitter-blueprint.git",
diff --git a/queries/blade/folds.scm b/queries/blade/folds.scm
new file mode 100644
index 000000000..cc081a754
--- /dev/null
+++ b/queries/blade/folds.scm
@@ -0,0 +1,14 @@
+[
+  (authorization)
+  (conditional)
+  (envoy)
+  (fragment)
+  (livewire)
+  (loop)
+  (once)
+  (php_statement)
+  (section)
+  (stack)
+  (switch)
+  (verbatim)
+] @fold
diff --git a/queries/blade/highlights.scm b/queries/blade/highlights.scm
new file mode 100644
index 000000000..c05d2845f
--- /dev/null
+++ b/queries/blade/highlights.scm
@@ -0,0 +1,15 @@
+([
+  (directive)
+  (directive_start)
+  (directive_end)
+] @tag
+  (#set! priority 101))
+
+([
+  (bracket_start)
+  (bracket_end)
+] @tag.delimiter
+  (#set! priority 101))
+
+((comment) @comment @spell
+  (#set! priority 101))
diff --git a/queries/blade/indents.scm b/queries/blade/indents.scm
new file mode 100644
index 000000000..bd3e84d16
--- /dev/null
+++ b/queries/blade/indents.scm
@@ -0,0 +1,3 @@
+(directive_start) @indent.begin
+
+(directive_end) @indent.end
diff --git a/queries/blade/injections.scm b/queries/blade/injections.scm
new file mode 100644
index 000000000..4f5234e31
--- /dev/null
+++ b/queries/blade/injections.scm
@@ -0,0 +1,15 @@
+((text) @injection.content
+  (#set! injection.combined)
+  (#set! injection.language php))
+
+((text) @injection.content
+  (#has-ancestor? @injection.content "envoy")
+  (#set! injection.combined)
+  (#set! injection.language bash))
+
+((php_only) @injection.content
+  (#set! injection.combined)
+  (#set! injection.language php_only))
+
+((parameter) @injection.content
+  (#set! injection.language php_only))

From d96c52565cae0347435f96f9b5913054b2972234 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 13 Mar 2025 08:59:53 +0100
Subject: [PATCH 2215/2704] ci(update): block bp (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 44b8aaeb4..8d4e9cab5 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "devicetree,git_config,nickel,rescript,slint,sql,t32,templ,typespec,verilog"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,git_config,nickel,rescript,slint,sql,t32,templ,typespec,verilog"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 178a68b7ff95595311ead913d40de8c365d5a224 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 13 Mar 2025 08:01:29 +0000
Subject: [PATCH 2216/2704] bot(lockfile): update cmake, liquid, meson, tera,
 v, vhdl

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9ae24ea03..7f862805c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -75,7 +75,7 @@
     "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
   },
   "cmake": {
-    "revision": "c70336e8db6d3842721d9be40610580908ff45ba"
+    "revision": "fe48221d4d9842d916d66b5e71ab3c6307ec28b3"
   },
   "comment": {
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
@@ -447,7 +447,7 @@
     "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
   },
   "liquid": {
-    "revision": "6e03a054a71cd419d9702725243137641e97ba51"
+    "revision": "d269f4d52cd08f6cbc6636ee23cc30a9f6c32e42"
   },
   "liquidsoap": {
     "revision": "8e51fa63ddb93ac179d4e34a311d3d3f03780b42"
@@ -489,7 +489,7 @@
     "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
   },
   "meson": {
-    "revision": "742a21e11e914096e0172dad2f0b85e7554c95ff"
+    "revision": "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e"
   },
   "mlir": {
     "revision": "c7c62f37a8612a897d25906d93363fec36c1591c"
@@ -810,7 +810,7 @@
     "revision": "def9849184de71a797c4e2b2837df85abeccf92c"
   },
   "tera": {
-    "revision": "588f14ce363904bebd926492bbd1d2c53f8d5f14"
+    "revision": "482b475b32e6bae67f9d57abc60545399fd9b0a3"
   },
   "terraform": {
     "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
@@ -876,7 +876,7 @@
     "revision": "ad9b638b914095320de85d59c49ab271603af048"
   },
   "v": {
-    "revision": "532bebd50742ef15949bdd67c36d46697c847628"
+    "revision": "26c2c4c2b3fb4f7a07ae78d298b36998b7ffa956"
   },
   "vala": {
     "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
@@ -888,7 +888,7 @@
     "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
   },
   "vhdl": {
-    "revision": "32d3e3daa745bf9f1665676f323be968444619e1"
+    "revision": "35ed277d3e98836796bc764010dc3fb800d14ee4"
   },
   "vhs": {
     "revision": "3f202326c06f1c4d47aa82b9013a6b71aea70611"

From 683816f14718b257666b29f792a8d330936cf5c1 Mon Sep 17 00:00:00 2001
From: Salomon Popp <hi@salomonpopp.me>
Date: Thu, 13 Mar 2025 09:21:55 +0100
Subject: [PATCH 2217/2704] fix(python): don't highlight parameter name as
 builtin (#7732)

---
 queries/python/highlights.scm              | 122 ++++++++++-----------
 tests/query/highlights/python/fields.py    |  15 ++-
 tests/query/highlights/python/functions.py |   5 +
 3 files changed, 77 insertions(+), 65 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 60f3e14c0..855c96dfc 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -65,61 +65,6 @@
     (identifier) @type))
   (#eq? @_isinstance "isinstance"))
 
-; Normal parameters
-(parameters
-  (identifier) @variable.parameter)
-
-; Lambda parameters
-(lambda_parameters
-  (identifier) @variable.parameter)
-
-(lambda_parameters
-  (tuple_pattern
-    (identifier) @variable.parameter))
-
-; Default parameters
-(keyword_argument
-  name: (identifier) @variable.parameter)
-
-; Naming parameters on call-site
-(default_parameter
-  name: (identifier) @variable.parameter)
-
-(typed_parameter
-  (identifier) @variable.parameter)
-
-(typed_default_parameter
-  name: (identifier) @variable.parameter)
-
-; Variadic parameters *args, **kwargs
-(parameters
-  (list_splat_pattern ; *args
-    (identifier) @variable.parameter))
-
-(parameters
-  (dictionary_splat_pattern ; **kwargs
-    (identifier) @variable.parameter))
-
-; Typed variadic parameters
-(parameters
-  (typed_parameter
-    (list_splat_pattern ; *args: type
-      (identifier) @variable.parameter)))
-
-(parameters
-  (typed_parameter
-    (dictionary_splat_pattern ; *kwargs: type
-      (identifier) @variable.parameter)))
-
-; Lambda parameters
-(lambda_parameters
-  (list_splat_pattern
-    (identifier) @variable.parameter))
-
-(lambda_parameters
-  (dictionary_splat_pattern
-    (identifier) @variable.parameter))
-
 ; Literals
 (none) @constant.builtin
 
@@ -128,12 +73,6 @@
   (false)
 ] @boolean
 
-((identifier) @variable.builtin
-  (#eq? @variable.builtin "self"))
-
-((identifier) @variable.builtin
-  (#eq? @variable.builtin "cls"))
-
 (integer) @number
 
 (float) @number.float
@@ -369,6 +308,67 @@
     "bool" "int" "float" "complex" "list" "tuple" "range" "str" "bytes" "bytearray" "memoryview"
     "set" "frozenset" "dict" "type" "object"))
 
+; Normal parameters
+(parameters
+  (identifier) @variable.parameter)
+
+; Lambda parameters
+(lambda_parameters
+  (identifier) @variable.parameter)
+
+(lambda_parameters
+  (tuple_pattern
+    (identifier) @variable.parameter))
+
+; Default parameters
+(keyword_argument
+  name: (identifier) @variable.parameter)
+
+; Naming parameters on call-site
+(default_parameter
+  name: (identifier) @variable.parameter)
+
+(typed_parameter
+  (identifier) @variable.parameter)
+
+(typed_default_parameter
+  name: (identifier) @variable.parameter)
+
+; Variadic parameters *args, **kwargs
+(parameters
+  (list_splat_pattern ; *args
+    (identifier) @variable.parameter))
+
+(parameters
+  (dictionary_splat_pattern ; **kwargs
+    (identifier) @variable.parameter))
+
+; Typed variadic parameters
+(parameters
+  (typed_parameter
+    (list_splat_pattern ; *args: type
+      (identifier) @variable.parameter)))
+
+(parameters
+  (typed_parameter
+    (dictionary_splat_pattern ; *kwargs: type
+      (identifier) @variable.parameter)))
+
+; Lambda parameters
+(lambda_parameters
+  (list_splat_pattern
+    (identifier) @variable.parameter))
+
+(lambda_parameters
+  (dictionary_splat_pattern
+    (identifier) @variable.parameter))
+
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "self"))
+
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "cls"))
+
 ; After @type.builtin bacause builtins (such as `type`) are valid as attribute name
 ((attribute
   attribute: (identifier) @variable.member)
diff --git a/tests/query/highlights/python/fields.py b/tests/query/highlights/python/fields.py
index cea9eccb7..cbe80cdc2 100644
--- a/tests/query/highlights/python/fields.py
+++ b/tests/query/highlights/python/fields.py
@@ -2,12 +2,15 @@ class Fields:
     type: str
 #   ^^^^ @variable.member
 
-    def __init__(self, fields: list[int]) -> None:
-#                                   ^^^ @type.builtin
-#                                            ^^^^ @constant.builtin
+    def __init__(self, type: str, fields: list[int]) -> None:
+#                ^^^^ @variable.builtin
+#                      ^^^^ @variable.parameter
+#                                 ^^^^^^ @variable.parameter
+#                                              ^^^ @type.builtin
+#                                                       ^^^^ @constant.builtin
         self.fields = fields
 #            ^^^^^^ @variable.member
-        self.type = "foo"
+        self.type = type  # this cannot be highlighted correctly by Treesitter
 #            ^^^^ @variable.member
         self.__dunderfield__ = None
 #            ^^^^^^^^^^^^^^^ @variable.member
@@ -15,3 +18,7 @@ class Fields:
 #            ^^^^^^^^^^^ @variable.member
         self.NOT_A_FIELD = "IM NOT A FIELD"
 #            ^^^^^^^^^^^ @constant
+
+Fields(type="schema", fields=[0, 1])
+#      ^^^^ @variable.parameter
+#                     ^^^^^^ @variable.parameter
diff --git a/tests/query/highlights/python/functions.py b/tests/query/highlights/python/functions.py
index 6d3028433..7284d3fcc 100644
--- a/tests/query/highlights/python/functions.py
+++ b/tests/query/highlights/python/functions.py
@@ -8,6 +8,11 @@ _ = func()
 
 class Foo:
     def method(self) -> None: ...
+#              ^^^^ @variable.builtin
+
+    @classmethod
+    def clsmethod(cls) -> None: ...
+#                 ^^^ @variable.builtin
 
 Foo().method()
 #     ^^^^^^ @function.method.call

From 8b79cddc708cb8549562f0101f7f509ad7cebf97 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 06:44:59 +0000
Subject: [PATCH 2218/2704] bot(lockfile): update gitcommit, tiger, typoscript

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 7f862805c..416bc37b3 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -243,7 +243,7 @@
     "revision": "5425944fd61bf2b3bad2c17c2dc9f53172b0f01d"
   },
   "gitcommit": {
-    "revision": "db0e0c4fb9095fdc42a7af34019c0616c071e9eb"
+    "revision": "a716678c0f00645fed1e6f1d0eb221481dbd6f6d"
   },
   "gitignore": {
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
@@ -822,7 +822,7 @@
     "revision": "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"
   },
   "tiger": {
-    "revision": "a7f11d946b44244f71df41d2a78af0665d618dae"
+    "revision": "4a77b2d7a004587646bddc4e854779044b6db459"
   },
   "tlaplus": {
     "revision": "4ba91b07b97741a67f61221d0d50e6d962e4987e"
@@ -855,7 +855,7 @@
     "revision": "42fb163442ef2691b9b720fb4e4e846809415d18"
   },
   "typoscript": {
-    "revision": "43b221c0b76e77244efdaa9963e402a17c930fbc"
+    "revision": "5d8fde870b0ded1f429ba5bb249a9d9f8589ff5f"
   },
   "typst": {
     "revision": "46cf4ded12ee974a70bf8457263b67ad7ee0379d"

From 2586ea65faf45dcf1caf8d34510d50bb545c215a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 15 Mar 2025 06:43:11 +0000
Subject: [PATCH 2219/2704] bot(lockfile): update swift

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 416bc37b3..d6910b614 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -783,7 +783,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "02db52e14bc303322d22019fff7823d72904dfe5"
+    "revision": "6b1ebb86c97fca00835e7fce4a95c5069172145e"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 99ea6c5d4389a3278769eb6abb7b3ebefb7d9f2a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 14 Mar 2025 16:10:53 -0700
Subject: [PATCH 2220/2704] feat(typst): highlight language name as @label

---
 queries/typst/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/queries/typst/highlights.scm b/queries/typst/highlights.scm
index e23588421..a0dcc1b89 100644
--- a/queries/typst/highlights.scm
+++ b/queries/typst/highlights.scm
@@ -113,6 +113,9 @@
 
 (raw_blck) @markup.raw
 
+(raw_blck
+  lang: (ident) @label)
+
 (raw_blck
   (blob) @markup.raw.block)
 

From 845356a256ed6ff5868da582cb62a31d762e1804 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 16 Mar 2025 06:42:37 +0000
Subject: [PATCH 2221/2704] bot(lockfile): update dtd, xml, ziggy, ziggy_schema

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index d6910b614..bbf613b3c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -144,7 +144,7 @@
     "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
   },
   "dtd": {
-    "revision": "2128a0b249263e238d88cb894dad00c3168fea37"
+    "revision": "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"
   },
   "earthfile": {
     "revision": "ae378d9d1306e9a967698516041f6f8803db5592"
@@ -921,7 +921,7 @@
     "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
   },
   "xml": {
-    "revision": "2128a0b249263e238d88cb894dad00c3168fea37"
+    "revision": "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"
   },
   "xresources": {
     "revision": "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"
@@ -942,9 +942,9 @@
     "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
-    "revision": "00958faeaeb97d9b7beb76f128a5401441182204"
+    "revision": "cfc661821e387f7b48b1db0408fe8219d1ca611d"
   },
   "ziggy_schema": {
-    "revision": "00958faeaeb97d9b7beb76f128a5401441182204"
+    "revision": "cfc661821e387f7b48b1db0408fe8219d1ca611d"
   }
 }

From da88ea477c67c7f7ebab6d1e662d0cdebfcb57f0 Mon Sep 17 00:00:00 2001
From: John-Philip Taylor <41227383+jpt13653903@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:38:03 +0200
Subject: [PATCH 2222/2704] fix(vhdl): capture "|" as `@operator` (#7744)

---
 queries/vhdl/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/vhdl/highlights.scm b/queries/vhdl/highlights.scm
index 36cd56207..681dc2664 100644
--- a/queries/vhdl/highlights.scm
+++ b/queries/vhdl/highlights.scm
@@ -257,6 +257,7 @@
   "*"
   "/"
   ":"
+  "|"
   "=>"
 ] @operator
 

From d76a8b6e1b67fd3bcffec4a5d45fd9dee4dbbee8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 06:47:13 +0000
Subject: [PATCH 2223/2704] bot(lockfile): update commonlisp, cuda, glsl,
 superhtml, ziggy, ziggy_schema

---
 lockfile.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index bbf613b3c..2922ba399 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -81,7 +81,7 @@
     "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
   },
   "commonlisp": {
-    "revision": "bf2a65b1c119898a1a17389e07f2a399c05cdc0c"
+    "revision": "32323509b3d9fe96607d151c2da2c9009eb13a2f"
   },
   "cooklang": {
     "revision": "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"
@@ -102,7 +102,7 @@
     "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
   },
   "cuda": {
-    "revision": "757e0a61f9d38b3d9eaa299e8d866e8283ffc284"
+    "revision": "014628ae8d2df391b88ddb9fa0260fd97f770829"
   },
   "cue": {
     "revision": "770737bcff2c4aa3f624d439e32b07dbb07102d3"
@@ -261,7 +261,7 @@
     "revision": "4006128790efb58ca82a4492d8ef0983b260fc6a"
   },
   "glsl": {
-    "revision": "66aec57f7119c7e8e40665b723cd7af5594f15ee"
+    "revision": "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"
   },
   "gn": {
     "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
@@ -771,7 +771,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "91d92846e8baaafc8854d2b9d0ac436bc16234db"
+    "revision": "240cc44b5fcd8e9e01180f1cbdcdd0f909a27275"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -942,9 +942,9 @@
     "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
   },
   "ziggy": {
-    "revision": "cfc661821e387f7b48b1db0408fe8219d1ca611d"
+    "revision": "8a29017169f43dc2c3526817e98142eb9a335087"
   },
   "ziggy_schema": {
-    "revision": "cfc661821e387f7b48b1db0408fe8219d1ca611d"
+    "revision": "8a29017169f43dc2c3526817e98142eb9a335087"
   }
 }

From f8aaf5ce4e27cd20de917946b2ae5c968a2c2858 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 18 Mar 2025 06:46:23 +0000
Subject: [PATCH 2224/2704] bot(lockfile): update fortran, glimmer_javascript,
 glimmer_typescript, powershell

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 2922ba399..9fd0caf83 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -207,7 +207,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "21b740801794b6570a0380f8aef22bb67214ea65"
+    "revision": "64e11001d7ef3e8ac18e55a3a2d811fe36430923"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -255,10 +255,10 @@
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
   },
   "glimmer_javascript": {
-    "revision": "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3"
+    "revision": "4801ac4d0a611502001035f45d1cba5cb57d272f"
   },
   "glimmer_typescript": {
-    "revision": "4006128790efb58ca82a4492d8ef0983b260fc6a"
+    "revision": "c011b053626f27a0fe5cc99eeae4185399a572f9"
   },
   "glsl": {
     "revision": "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"
@@ -582,7 +582,7 @@
     "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
   },
   "powershell": {
-    "revision": "e904962e25858b7e8e19c653e737ad3b7d1c55bd"
+    "revision": "66d5e61126989c0aca57ff77d19b2064919b51e1"
   },
   "printf": {
     "revision": "df6b69967db7d74ab338a86a9ab45c0966c5ee3c"

From 835f5c11b8d4e1ded3576c69a019f717d3754c5a Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 18 Mar 2025 10:01:20 -0700
Subject: [PATCH 2225/2704] fix(c): highlight `"."` as `@punctuation.delimiter`

Aligns C with the other language highlights
---
 queries/c/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index bd6857fd1..ea65075f2 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -65,6 +65,7 @@
   ";"
   ":"
   ","
+  "."
   "::"
 ] @punctuation.delimiter
 
@@ -93,7 +94,6 @@
   "<<"
   ">>"
   "->"
-  "."
   "<"
   "<="
   ">="

From 98a3fdd5d9807948be6f27a916a5b88a92383670 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 19 Mar 2025 06:46:54 +0000
Subject: [PATCH 2226/2704] bot(lockfile): update query, vimdoc

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 9fd0caf83..ab6a39cc6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -636,7 +636,7 @@
     "revision": "8fef30e231d74b65c713bcbac21956156d8963da"
   },
   "query": {
-    "revision": "0555ac0da902abff06076e40501102cee3ba68bd"
+    "revision": "930202c2a80965a7a9ca018b5b2a08b25dfa7f12"
   },
   "r": {
     "revision": "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a"
@@ -897,7 +897,7 @@
     "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"
   },
   "vimdoc": {
-    "revision": "d2e4b5c172a109966c2ce0378f73df6cede39400"
+    "revision": "2694c3d27e2ca98a0ccde72f33887394300d524e"
   },
   "vrl": {
     "revision": "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba"

From f09a2215b8fed4c2e86f2dd1912e14166958c06a Mon Sep 17 00:00:00 2001
From: Veesh Goldman <rabbiveesh@gmail.com>
Date: Wed, 19 Mar 2025 10:48:48 +0200
Subject: [PATCH 2227/2704] * feat(perl): highlight hash keys as
 `@variable.member` in various contexts

also, injections for s///e should fully re-parse
---
 queries/perl/highlights.scm | 79 ++++++++++++++++++++++---------------
 queries/perl/injections.scm |  3 +-
 2 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index 554743b32..d52baab44 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -243,50 +243,65 @@
   ; highlights punc vars and also numeric only like $11
   (#lua-match? @variable.builtin "^%A+$"))
 
-(scalar) @variable
-
-(scalar_deref_expression
-  [
-    "$"
-    "*"
-  ] @variable)
-
 [
+  (scalar)
   (array)
-  (arraylen)
+  (hash)
+  (glob)
+  ; arraylen's sigil is kinda special b/c it's not a data type
+  (arraylen
+    "$#" @operator)
 ] @variable
 
-(array_deref_expression
+; all post deref sigils highlighted as operators, and the unrolly star is a special char
+(postfix_deref
   [
+    "$"
     "@"
-    "*"
-  ] @variable)
-
-(hash) @variable
-
-(hash_deref_expression
-  [
     "%"
     "*"
-  ] @variable)
+    "$#"
+  ] @operator
+  "*" @character.special)
 
-(array_element_expression
-  array: (_) @variable)
+(slices
+  [
+    arrayref: _
+    hashref: _
+  ]
+  [
+    "@"
+    "%"
+  ] @operator)
 
-(slice_expression
-  array: (_) @variable)
+; except for subref deref, b/c that's actually a function call
+(amper_deref_expression
+  [
+    "&"
+    "*"
+  ] @function.call)
 
-(keyval_expression
-  array: (_) @variable)
+; mark hash or glob keys that are any form of string in any form of access
+(_
+  "{"
+  [
+    (autoquoted_bareword)
+    (_
+      (string_content))
+  ] @variable.member
+  "}")
 
-(hash_element_expression
-  hash: (_) @variable)
-
-(slice_expression
-  hash: (_) @variable)
-
-(keyval_expression
-  hash: (_) @variable)
+; mark stringies on the LHS of a fat comma as a hash key, b/c that's usually what it
+; denotes somewhat
+(_
+  [
+    (autoquoted_bareword)
+    (_
+      (string_content))
+  ] @variable.member
+  .
+  "=>"
+  (_))
 
 (comment) @comment @spell
 
diff --git a/queries/perl/injections.scm b/queries/perl/injections.scm
index 48e6363b9..ec11e9013 100644
--- a/queries/perl/injections.scm
+++ b/queries/perl/injections.scm
@@ -11,4 +11,5 @@
   ; match if there's a single `e` in the modifiers list
   (#lua-match? @_modifiers "e")
   (#not-lua-match? @_modifiers "e.*e")
-  (#set! injection.language "perl"))
+  (#set! injection.language "perl")
+  (#set! injection.include-children))

From ff553df2f4c5641be2b282e1a0a072c46cf03591 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 06:46:37 +0000
Subject: [PATCH 2228/2704] bot(lockfile): update meson, scala, superhtml

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index ab6a39cc6..c562bd9ff 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -489,7 +489,7 @@
     "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
   },
   "meson": {
-    "revision": "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e"
+    "revision": "9c74e8e8917b83d90e38ac040949079437ec0043"
   },
   "mlir": {
     "revision": "c7c62f37a8612a897d25906d93363fec36c1591c"
@@ -702,7 +702,7 @@
     "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
   },
   "scala": {
-    "revision": "ed939ed550ebff7d4ad8aafb4d5aad44de69965d"
+    "revision": "041dea1ca8b25f20fa564854922ac6a99c050ec6"
   },
   "scfg": {
     "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"
@@ -771,7 +771,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "240cc44b5fcd8e9e01180f1cbdcdd0f909a27275"
+    "revision": "fc7c594f52528e4a4a08671137850143d55a5bf2"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From c8c7924cc34d285e578c2bd301773756cadf6124 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 21 Mar 2025 08:29:36 +0100
Subject: [PATCH 2229/2704] ci(update): block wit (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 8d4e9cab5..44bd884da 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,git_config,nickel,rescript,slint,sql,t32,templ,typespec,verilog"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,git_config,nickel,rescript,slint,sql,t32,templ,typespec,verilog,wit"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From d0a56e367712a6c055103adeffdff0b80c937e7c Mon Sep 17 00:00:00 2001
From: dcho <dcho.null@gmail.com>
Date: Wed, 19 Mar 2025 18:22:30 -0400
Subject: [PATCH 2230/2704] fix(python): prioritize builtin functions

---
 queries/python/highlights.scm              | 3 ++-
 tests/query/highlights/python/functions.py | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 855c96dfc..21bbbf4ec 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -45,7 +45,8 @@
     "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview"
     "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed"
     "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type"
-    "vars" "zip" "__import__"))
+    "vars" "zip" "__import__")
+  (#set! priority 102))
 
 ; Function definitions
 (function_definition
diff --git a/tests/query/highlights/python/functions.py b/tests/query/highlights/python/functions.py
index 7284d3fcc..81dedfbae 100644
--- a/tests/query/highlights/python/functions.py
+++ b/tests/query/highlights/python/functions.py
@@ -16,3 +16,6 @@ class Foo:
 
 Foo().method()
 #     ^^^^^^ @function.method.call
+
+print()
+# ^ @function.builtin

From bc728ecf253d7cbf1aef9eacac2f5341827856c5 Mon Sep 17 00:00:00 2001
From: dcho <dcho.null@gmail.com>
Date: Wed, 19 Mar 2025 18:39:43 -0400
Subject: [PATCH 2231/2704] Use order instead of priority

---
 queries/python/highlights.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 21bbbf4ec..84b29412a 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -35,19 +35,6 @@
     function: (identifier) @_func))
   (#any-of? @_func "TypeVar" "NewType"))
 
-; Builtin functions
-((call
-  function: (identifier) @function.builtin)
-  (#any-of? @function.builtin
-    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr"
-    "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec"
-    "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id"
-    "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview"
-    "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed"
-    "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type"
-    "vars" "zip" "__import__")
-  (#set! priority 102))
-
 ; Function definitions
 (function_definition
   name: (identifier) @function)
@@ -426,6 +413,18 @@
     attribute: (identifier) @constructor))
   (#lua-match? @constructor "^%u"))
 
+; Builtin functions
+((call
+  function: (identifier) @function.builtin)
+  (#any-of? @function.builtin
+    "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr"
+    "classmethod" "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec"
+    "filter" "float" "format" "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id"
+    "input" "int" "isinstance" "issubclass" "iter" "len" "list" "locals" "map" "max" "memoryview"
+    "min" "next" "object" "oct" "open" "ord" "pow" "print" "property" "range" "repr" "reversed"
+    "round" "set" "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super" "tuple" "type"
+    "vars" "zip" "__import__"))
+
 ; Regex from the `re` module
 (call
   function: (attribute

From b10436b9fb29d3c3c406c07ce813f70245f9bc7b Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 07:30:48 +0000
Subject: [PATCH 2232/2704] bot(lockfile): update gleam, glimmer_javascript,
 glimmer_typescript, lalrpop, problog, prolog, roc

---
 lockfile.json              | 14 +++++++-------
 queries/roc/highlights.scm |  7 ++-----
 queries/roc/indents.scm    |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c562bd9ff..42f9b648f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -249,16 +249,16 @@
     "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
   },
   "gleam": {
-    "revision": "e01c88449b53e2ee5dad222d4020cc7006c5b700"
+    "revision": "99ec4101504452c488b7c835fb65cfef75b090b7"
   },
   "glimmer": {
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
   },
   "glimmer_javascript": {
-    "revision": "4801ac4d0a611502001035f45d1cba5cb57d272f"
+    "revision": "babba3fc0c822a633261ce9e96a4d7986050eb0c"
   },
   "glimmer_typescript": {
-    "revision": "c011b053626f27a0fe5cc99eeae4185399a572f9"
+    "revision": "48c60295f1ee34ea4ed6e5177102be6d24bfc9d0"
   },
   "glsl": {
     "revision": "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"
@@ -432,7 +432,7 @@
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
   },
   "lalrpop": {
-    "revision": "a7f5ea297bd621d072ed4cb2cc8ba5ae64ae3c4b"
+    "revision": "8d38e9755c05d37df8a24dadb0fc64f6588ac188"
   },
   "latex": {
     "revision": "7b06f6ed394308e7407a1703d2724128c45fc9d7"
@@ -591,10 +591,10 @@
     "revision": "73f39a6d5401cfdcd143951e499336cf5ab2ffaa"
   },
   "problog": {
-    "revision": "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"
+    "revision": "986a50d27e1bbf4fabce7e650c26e1e0da5535fc"
   },
   "prolog": {
-    "revision": "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"
+    "revision": "986a50d27e1bbf4fabce7e650c26e1e0da5535fc"
   },
   "promql": {
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
@@ -684,7 +684,7 @@
     "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
   },
   "roc": {
-    "revision": "32e20cb1133a5a189f986c3b5df47ac730fbee3d"
+    "revision": "0b1afe88161cbd81f5ddea1bb4fa786314ed49a7"
   },
   "ron": {
     "revision": "78938553b93075e638035f624973083451b29055"
diff --git a/queries/roc/highlights.scm b/queries/roc/highlights.scm
index 3fcc935ed..4993017dc 100644
--- a/queries/roc/highlights.scm
+++ b/queries/roc/highlights.scm
@@ -82,6 +82,7 @@
   (implements)
   (when)
   (is)
+  (as)
   "as"
   (to)
 ] @keyword
@@ -92,13 +93,9 @@
   "expect"
   "module"
   "package"
-  "import"
 ] @keyword
 
-[
-  (import_as)
-  "imports"
-] @keyword.import
+"import" @keyword.import
 
 (value_declaration
   (decl_left
diff --git a/queries/roc/indents.scm b/queries/roc/indents.scm
index 764e0e29e..9a08f2074 100644
--- a/queries/roc/indents.scm
+++ b/queries/roc/indents.scm
@@ -8,7 +8,7 @@
   (parenthesized_expr)
   (function_call_pnc_expr)
   (tuple_expr)
-  (imports)
+  "import"
   (exposes)
   (exposes_list)
   (exposing)

From 5f38dffb6a07669a678f073bfe0f62b1a020dffc Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 16:21:46 +0000
Subject: [PATCH 2233/2704] bot(lockfile): update lua, markdown,
 markdown_inline, vim

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 42f9b648f..8e008dc38 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -456,7 +456,7 @@
     "revision": "c14cb839003348692158b845db9edda201374548"
   },
   "lua": {
-    "revision": "68d29aa745b68ae22cbbdb5dcb68c20232521ff6"
+    "revision": "db16e76558122e834ee214c8dc755b4a3edc82a9"
   },
   "luadoc": {
     "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
@@ -474,10 +474,10 @@
     "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
   },
   "markdown": {
-    "revision": "192407ab5a24bfc24f13332979b5e7967518754a"
+    "revision": "413285231ce8fa8b11e7074bbe265b48aa7277f9"
   },
   "markdown_inline": {
-    "revision": "192407ab5a24bfc24f13332979b5e7967518754a"
+    "revision": "413285231ce8fa8b11e7074bbe265b48aa7277f9"
   },
   "matlab": {
     "revision": "bbf1b3f0bd7417c1efb8958fe95be3d0d540207a"
@@ -894,7 +894,7 @@
     "revision": "3f202326c06f1c4d47aa82b9013a6b71aea70611"
   },
   "vim": {
-    "revision": "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"
+    "revision": "11b688a1f0e97c0c4e3dbabf4a38016335f4d237"
   },
   "vimdoc": {
     "revision": "2694c3d27e2ca98a0ccde72f33887394300d524e"

From e70cb73e943db7483b0ea86a55e80d471bcb995c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 22 Mar 2025 06:44:10 +0000
Subject: [PATCH 2234/2704] bot(lockfile): update mlir

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 8e008dc38..9647caa97 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -492,7 +492,7 @@
     "revision": "9c74e8e8917b83d90e38ac040949079437ec0043"
   },
   "mlir": {
-    "revision": "c7c62f37a8612a897d25906d93363fec36c1591c"
+    "revision": "922cbb97f3d20044e6b4362b3d7af5e530ed8f34"
   },
   "muttrc": {
     "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"

From 20a7e40203dab3454686e057adecd805f3d6d334 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 23 Mar 2025 06:43:18 +0000
Subject: [PATCH 2235/2704] bot(lockfile): update swift

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index 9647caa97..b77954836 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -783,7 +783,7 @@
     "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
   },
   "swift": {
-    "revision": "6b1ebb86c97fca00835e7fce4a95c5069172145e"
+    "revision": "aca5a52aa3cab858944d3c02701ccf5b2d8fd0f9"
   },
   "sxhkdrc": {
     "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"

From 652da0b40f556c1772904a82ee5800f41a1ba9f8 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sun, 23 Mar 2025 11:44:12 -0400
Subject: [PATCH 2236/2704] feat(javadoc): add parser and queries (#7749)

Previously java was configured to use doxygen parser for documentation
comments, but javadocs are not doxygen. Inline tags have a different
syntax, block tags are not recognized, and doxygen creates a lot of
errors during highlighting.

Add parser for javadoc comments, with queries for highlights and
injections.
---
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++
 queries/java/injections.scm     | 15 ++----
 queries/javadoc/highlights.scm  | 86 +++++++++++++++++++++++++++++++++
 queries/javadoc/indents.scm     |  1 +
 queries/javadoc/injections.scm  | 30 ++++++++++++
 6 files changed, 132 insertions(+), 11 deletions(-)
 create mode 100644 queries/javadoc/highlights.scm
 create mode 100644 queries/javadoc/indents.scm
 create mode 100644 queries/javadoc/injections.scm

diff --git a/lockfile.json b/lockfile.json
index b77954836..46dca3835 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -380,6 +380,9 @@
   "java": {
     "revision": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a"
   },
+  "javadoc": {
+    "revision": "8089a905454cbb7eac4ba6ec5495338169c60a56"
+  },
   "javascript": {
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c73225f9d..b4bbf751d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1127,6 +1127,14 @@ list.java = {
   maintainers = { "@p00f" },
 }
 
+list.javadoc = {
+  install_info = {
+    url = "https://github.com/rmuir/tree-sitter-javadoc",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@rmuir" },
+}
+
 list.javascript = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-javascript",
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 61d792fcf..7728a0956 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -5,20 +5,13 @@
   (#set! injection.language "comment"))
 
 ((block_comment) @injection.content
-  (#lua-match? @injection.content "/[*][!<*][^a-zA-Z]")
-  (#set! injection.language "doxygen"))
+  (#lua-match? @injection.content "/[*][*][%s]")
+  (#set! injection.language "javadoc"))
 
-; markdown-style javadocs: https://openjdk.org/jeps/467
+; markdown-style javadocs https://openjdk.org/jeps/467
 ((line_comment) @injection.content
   (#lua-match? @injection.content "^///%s")
-  (#offset! @injection.content 0 4 0 0)
-  (#set! injection.language "markdown_inline"))
-
-; markdown-style javadocs: https://openjdk.org/jeps/467
-((line_comment) @injection.content
-  (#lua-match? @injection.content "^///%s+[@]")
-  (#offset! @injection.content 0 4 0 0)
-  (#set! injection.language "doxygen"))
+  (#set! injection.language "javadoc"))
 
 ((method_invocation
   name: (identifier) @_method
diff --git a/queries/javadoc/highlights.scm b/queries/javadoc/highlights.scm
new file mode 100644
index 000000000..832899cb5
--- /dev/null
+++ b/queries/javadoc/highlights.scm
@@ -0,0 +1,86 @@
+[
+  (tag_name)
+  "include"
+  "exclude"
+] @nospell @keyword
+
+(identifier) @nospell @variable
+
+(fragment) @nospell @variable.member
+
+(parameter
+  name: (identifier) @variable.parameter)
+
+(param_tag
+  parameter_name: (identifier) @variable.parameter)
+
+[
+  (boolean_type)
+  (integral_type)
+  (floating_point_type)
+] @nospell @type.builtin
+
+(module
+  (identifier) @module)
+
+(type
+  (identifier) @type)
+
+(type_parameter
+  (identifier) @type)
+
+(method
+  (identifier) @function)
+
+(member
+  (identifier) @variable.member)
+
+[
+  (string_literal)
+  (indexword)
+] @nospell @string
+
+[
+  (bare_format_string)
+  (literal_format_string)
+] @nospell @string.special
+
+(url) @nospell @markup.link.url
+
+(attribute
+  name: (identifier) @nospell @property)
+
+(system_property) @nospell @property
+
+(unsigned_integer) @number
+
+(code) @nospell @markup.raw
+
+[
+  "="
+  ":"
+] @operator
+
+[
+  "/"
+  "."
+  ","
+  "..."
+  "#"
+  "##"
+] @punctuation.delimiter
+
+[
+  "{"
+  "}"
+  "("
+  ")"
+  "["
+  "]"
+] @punctuation.bracket
+
+(param_tag
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
diff --git a/queries/javadoc/indents.scm b/queries/javadoc/indents.scm
new file mode 100644
index 000000000..ef30f1e76
--- /dev/null
+++ b/queries/javadoc/indents.scm
@@ -0,0 +1 @@
+(document) @indent.auto
diff --git a/queries/javadoc/injections.scm b/queries/javadoc/injections.scm
new file mode 100644
index 000000000..7668f21bc
--- /dev/null
+++ b/queries/javadoc/injections.scm
@@ -0,0 +1,30 @@
+; @value tags without double-quotes
+((bare_format_string) @injection.content
+  (#set! injection.language "printf"))
+
+; @value tags with double quotes
+((literal_format_string) @injection.content
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.language "printf"))
+
+; injected code snippets
+((snippet_tag
+  (attributes
+    (attribute
+      name: (identifier) @_attribute_key
+      value: (attribute_value
+        [
+          (identifier) @injection.language
+          (string_literal
+            (quoted_value) @injection.language)
+        ])))
+  body: (description) @injection.content)
+  (#eq? @_attribute_key "lang"))
+
+; html content
+((description) @injection.content
+  (#set! injection.language "html"))
+
+; markdown content
+((markdown_description) @injection.content
+  (#set! injection.language "markdown_inline"))

From b454febfd98b114d43dd5a991093ab724a54b8ab Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 23 Mar 2025 15:44:30 +0000
Subject: [PATCH 2237/2704] bot(readme): update

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index dc7ccd198..5e8aa8943 100644
--- a/README.md
+++ b/README.md
@@ -300,6 +300,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
 - [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
 - [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
+- [x] [javadoc](https://github.com/rmuir/tree-sitter-javadoc) (maintained by @rmuir)
 - [x] [javascript](https://github.com/tree-sitter/tree-sitter-javascript) (maintained by @steelsojka)
 - [x] [jinja](https://github.com/cathaysia/tree-sitter-jinja) (maintained by @cathaysia)
 - [x] [jinja_inline](https://github.com/cathaysia/tree-sitter-jinja) (maintained by @cathaysia)

From 9399bfd816f7193b6fa801169f6a907afdd66e5c Mon Sep 17 00:00:00 2001
From: Vladimir Levin <34550675+opa-oz@users.noreply.github.com>
Date: Mon, 24 Mar 2025 01:04:41 +0900
Subject: [PATCH 2238/2704] feat(caddy): add parser and queries (#7588)

---------

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 README.md                       |  1 +
 lockfile.json                   |  3 ++
 lua/nvim-treesitter/parsers.lua |  8 +++++
 queries/caddy/folds.scm         |  1 +
 queries/caddy/highlights.scm    | 55 +++++++++++++++++++++++++++++++++
 queries/caddy/indents.scm       |  8 +++++
 queries/caddy/injections.scm    |  2 ++
 7 files changed, 78 insertions(+)
 create mode 100644 queries/caddy/folds.scm
 create mode 100644 queries/caddy/highlights.scm
 create mode 100644 queries/caddy/indents.scm
 create mode 100644 queries/caddy/injections.scm

diff --git a/README.md b/README.md
index 5e8aa8943..9447e0f65 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
+- [x] [caddy](https://github.com/opa-oz/tree-sitter-caddy) (maintained by @opa-oz)
 - [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
 - [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index 46dca3835..a230a95e5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -59,6 +59,9 @@
   "c_sharp": {
     "revision": "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7"
   },
+  "caddy": {
+    "revision": "2686186edb61be47960431c93a204fb249681360"
+  },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b4bbf751d..edbc003d5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -233,6 +233,14 @@ list.c_sharp = {
   maintainers = { "@amaanq" },
 }
 
+list.caddy = {
+  install_info = {
+    url = "https://github.com/opa-oz/tree-sitter-caddy",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@opa-oz" },
+}
+
 list.cairo = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-cairo",
diff --git a/queries/caddy/folds.scm b/queries/caddy/folds.scm
new file mode 100644
index 000000000..fd7d23999
--- /dev/null
+++ b/queries/caddy/folds.scm
@@ -0,0 +1 @@
+(block) @fold
diff --git a/queries/caddy/highlights.scm b/queries/caddy/highlights.scm
new file mode 100644
index 000000000..47a170f76
--- /dev/null
+++ b/queries/caddy/highlights.scm
@@ -0,0 +1,55 @@
+(comment) @comment @spell
+
+[
+  (env)
+  (argv)
+  (block_variable)
+  (placeholder)
+] @constant
+
+(value) @variable
+
+(directive
+  (keyword) @attribute)
+
+(global_options
+  (option
+    (keyword) @attribute))
+
+(keyword) @keyword
+
+(boolean) @boolean
+
+(placeholder
+  [
+    "{"
+    "}"
+  ] @punctuation.special)
+
+(auto) @variable.builtin
+
+[
+  (string_literal)
+  (quoted_string_literal)
+  (address)
+] @string
+
+[
+  (matcher)
+  (route)
+  (snippet_name)
+] @string.special
+
+[
+  (numeric_literal)
+  (time)
+  (size)
+  (ip_literal)
+] @number
+
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
+"," @punctuation.delimiter
diff --git a/queries/caddy/indents.scm b/queries/caddy/indents.scm
new file mode 100644
index 000000000..b746788ab
--- /dev/null
+++ b/queries/caddy/indents.scm
@@ -0,0 +1,8 @@
+(block) @indent.begin
+
+(block
+  "}" @indent.branch)
+
+(comment) @indent.auto
+
+(ERROR) @indent.auto
diff --git a/queries/caddy/injections.scm b/queries/caddy/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/caddy/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From d26ce0126694283cf32bf1f4192ef37ef404c037 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 23 Mar 2025 16:06:51 +0000
Subject: [PATCH 2239/2704] bot(lockfile): update hlsl, javadoc

---
 lockfile.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index a230a95e5..797524d93 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -333,7 +333,7 @@
     "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
   },
   "hlsl": {
-    "revision": "b309425a7ab4456605cfe78774b80f7e275ca87d"
+    "revision": "bab9111922d53d43668fabb61869bec51bbcb915"
   },
   "hlsplaylist": {
     "revision": "3bfda9271e3adb08d35f47a2102fe957009e1c55"
@@ -384,7 +384,7 @@
     "revision": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a"
   },
   "javadoc": {
-    "revision": "8089a905454cbb7eac4ba6ec5495338169c60a56"
+    "revision": "f741f4bc29a415adad6e1d47092cfa7f22ec9907"
   },
   "javascript": {
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"

From e329e94a6a0a5ccf6ec8bfec1d10faf5eaae665f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 06:47:16 +0000
Subject: [PATCH 2240/2704] bot(lockfile): update javadoc, problog, prolog

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 797524d93..fff8a8b4f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -384,7 +384,7 @@
     "revision": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a"
   },
   "javadoc": {
-    "revision": "f741f4bc29a415adad6e1d47092cfa7f22ec9907"
+    "revision": "db9589e9c61cff7d7fcc207744c711b10b60a7a3"
   },
   "javascript": {
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
@@ -597,10 +597,10 @@
     "revision": "73f39a6d5401cfdcd143951e499336cf5ab2ffaa"
   },
   "problog": {
-    "revision": "986a50d27e1bbf4fabce7e650c26e1e0da5535fc"
+    "revision": "d8d415f6a1cf80ca138524bcc395810b176d40fa"
   },
   "prolog": {
-    "revision": "986a50d27e1bbf4fabce7e650c26e1e0da5535fc"
+    "revision": "d8d415f6a1cf80ca138524bcc395810b176d40fa"
   },
   "promql": {
     "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"

From 85168f15808d89b0222313652b9d2777eda3cb08 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 26 Mar 2025 06:46:12 +0000
Subject: [PATCH 2241/2704] bot(lockfile): update angular, koto, scala

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index fff8a8b4f..8447743e7 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "b9b32fa042c2952a7bfca86847ea325e44ccc897"
   },
   "angular": {
-    "revision": "cba288924f4832abb619c627539f111004ff22e5"
+    "revision": "be53f2597dded40c90b5f53ed9f4521422f6b6b3"
   },
   "apex": {
     "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
@@ -432,7 +432,7 @@
     "revision": "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"
   },
   "koto": {
-    "revision": "329b0e84ef6cc6950665de4accd0bdda1601a2f1"
+    "revision": "673511402dfef07b25cfa43991693b8442695fc7"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -708,7 +708,7 @@
     "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
   },
   "scala": {
-    "revision": "041dea1ca8b25f20fa564854922ac6a99c050ec6"
+    "revision": "42a1542248ff611ba2091fe76c6dbf42551ebef8"
   },
   "scfg": {
     "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"

From da5825bf70cc2ea7eacd1e60c32c07baf19adeba Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 27 Mar 2025 06:47:58 +0000
Subject: [PATCH 2242/2704] bot(lockfile): update angular, hcl, koto, meson,
 perl, superhtml, tact, terraform, vhs

---
 lockfile.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index 8447743e7..dc8643236 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "b9b32fa042c2952a7bfca86847ea325e44ccc897"
   },
   "angular": {
-    "revision": "be53f2597dded40c90b5f53ed9f4521422f6b6b3"
+    "revision": "634cfc54f802dd4fb54caa2d42dd38b7f9d39df3"
   },
   "apex": {
     "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
@@ -321,7 +321,7 @@
     "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
   },
   "hcl": {
-    "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
+    "revision": "de10d494dbd6b71cdf07a678fecbf404dbfe4398"
   },
   "heex": {
     "revision": "008626a3fad379d17c81d5ed576edd9bd7a4fbf7"
@@ -432,7 +432,7 @@
     "revision": "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"
   },
   "koto": {
-    "revision": "673511402dfef07b25cfa43991693b8442695fc7"
+    "revision": "25e4eed7ecd8a071798529de966fa72f7ea7bda5"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -495,7 +495,7 @@
     "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
   },
   "meson": {
-    "revision": "9c74e8e8917b83d90e38ac040949079437ec0043"
+    "revision": "a56af662e8540412fed5e40cc20435b2b9a20502"
   },
   "mlir": {
     "revision": "922cbb97f3d20044e6b4362b3d7af5e530ed8f34"
@@ -561,7 +561,7 @@
     "revision": "1d16b8e063fdf4385e389096c4bc4999eaaef05f"
   },
   "perl": {
-    "revision": "bb53f204aa3e7507960014642965c9f9a9e84b1d"
+    "revision": "ecd90bd8b381bcc7219fed4fe351903630e761c6"
   },
   "php": {
     "revision": "f7cf7348737d8cff1b13407a0bfedce02ee7b046"
@@ -777,7 +777,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "fc7c594f52528e4a4a08671137850143d55a5bf2"
+    "revision": "f8cfcf64d01c17516ad1cfd7b17ecd05b68a4d6b"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -804,7 +804,7 @@
     "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
   },
   "tact": {
-    "revision": "a19be2d4c1956e12facfc717e28f13a6ad0860e0"
+    "revision": "47af20264abbd24ea282ded0f8ee9cad3cf3bf2f"
   },
   "tcl": {
     "revision": "98015ebe182d94e5a4439e32ffd91beaac32fcb9"
@@ -819,7 +819,7 @@
     "revision": "482b475b32e6bae67f9d57abc60545399fd9b0a3"
   },
   "terraform": {
-    "revision": "9e3ec9848f28d26845ba300fd73c740459b83e9b"
+    "revision": "de10d494dbd6b71cdf07a678fecbf404dbfe4398"
   },
   "textproto": {
     "revision": "568471b80fd8793d37ed01865d8c2208a9fefd1b"
@@ -897,7 +897,7 @@
     "revision": "35ed277d3e98836796bc764010dc3fb800d14ee4"
   },
   "vhs": {
-    "revision": "3f202326c06f1c4d47aa82b9013a6b71aea70611"
+    "revision": "0c6fae9d2cfc5b217bfd1fe84a7678f5917116db"
   },
   "vim": {
     "revision": "11b688a1f0e97c0c4e3dbabf4a38016335f4d237"

From a3315b8c7f0f1ddaa30b24bcc0af0d31024dfb6a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Fri, 28 Mar 2025 06:47:15 +0000
Subject: [PATCH 2243/2704] bot(lockfile): update angular, koto, superhtml

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index dc8643236..cbbaebae4 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -6,7 +6,7 @@
     "revision": "b9b32fa042c2952a7bfca86847ea325e44ccc897"
   },
   "angular": {
-    "revision": "634cfc54f802dd4fb54caa2d42dd38b7f9d39df3"
+    "revision": "843525141575e397541e119698f0532755e959f6"
   },
   "apex": {
     "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
@@ -432,7 +432,7 @@
     "revision": "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"
   },
   "koto": {
-    "revision": "25e4eed7ecd8a071798529de966fa72f7ea7bda5"
+    "revision": "46770abba021e2ddd2c51d9fa3087fd1ab6b2aea"
   },
   "kusto": {
     "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
@@ -777,7 +777,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "f8cfcf64d01c17516ad1cfd7b17ecd05b68a4d6b"
+    "revision": "28dcf0edf98d491d47bacb65dc49b6fb979b444c"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"

From a70d883976025d269d9e101c7ef059f4ef0aab08 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 29 Mar 2025 06:44:26 +0000
Subject: [PATCH 2244/2704] bot(lockfile): update scala

---
 lockfile.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lockfile.json b/lockfile.json
index cbbaebae4..cda9a2d06 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -708,7 +708,7 @@
     "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
   },
   "scala": {
-    "revision": "42a1542248ff611ba2091fe76c6dbf42551ebef8"
+    "revision": "160e35520577d91576b08fb677aaee840c591dc2"
   },
   "scfg": {
     "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"

From aece1062335a9e856636f5da12d8a06c7615ce8a Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Thu, 27 Mar 2025 15:22:35 +0100
Subject: [PATCH 2245/2704] feat(angular): update highlights for template
 literals

---
 queries/angular/highlights.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/queries/angular/highlights.scm b/queries/angular/highlights.scm
index 3783933f8..271e352e5 100644
--- a/queries/angular/highlights.scm
+++ b/queries/angular/highlights.scm
@@ -108,6 +108,14 @@
   "}}"
 ] @punctuation.special
 
+(template_substitution
+  [
+    "${"
+    "}"
+  ] @punctuation.special)
+
+(template_chars) @string
+
 [
   ";"
   "."

From 86768fdd002c75833414010052a1e95a4760ee32 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 30 Mar 2025 06:44:46 +0000
Subject: [PATCH 2246/2704] bot(lockfile): update dhall, enforce, http,
 javadoc, nu, superhtml, tcl, tera

---
 lockfile.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cda9a2d06..f3dabd423 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -126,7 +126,7 @@
     "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
   },
   "dhall": {
-    "revision": "4a6c08abfb54827db4e722d6cdca81b093898988"
+    "revision": "0d4fdd401b22d3f2f23ad2128a5307a4d927434f"
   },
   "diff": {
     "revision": "e42b8def4f75633568f1aecfe01817bf15164928"
@@ -180,7 +180,7 @@
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "enforce": {
-    "revision": "8201c3c354c34b96d5a531c8e63d262209ee06cb"
+    "revision": "36064bd71ce22e9a8c73b64b1a3448cc600a4312"
   },
   "erlang": {
     "revision": "364e323b32d098ad0e7b29e7adb4005c2bb5cf34"
@@ -351,7 +351,7 @@
     "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
   },
   "http": {
-    "revision": "77ecf6385f1b5d422e0bbd12204374d287d61ad2"
+    "revision": "db8b4398de90b6d0b6c780aba96aaa2cd8e9202c"
   },
   "hurl": {
     "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
@@ -384,7 +384,7 @@
     "revision": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a"
   },
   "javadoc": {
-    "revision": "db9589e9c61cff7d7fcc207744c711b10b60a7a3"
+    "revision": "330cc9cb4f33545f7bfce6c3b6aa77fe6db1b537"
   },
   "javascript": {
     "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
@@ -531,7 +531,7 @@
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
   "nu": {
-    "revision": "c10340b5bb3789f69182acf8f34c3d4fc24d2fe1"
+    "revision": "d5c71a10b4d1b02e38967b05f8de70e847448dd1"
   },
   "objc": {
     "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
@@ -777,7 +777,7 @@
     "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
   },
   "superhtml": {
-    "revision": "28dcf0edf98d491d47bacb65dc49b6fb979b444c"
+    "revision": "16887e9fa3122c36a3d4942470e33c1c282fe859"
   },
   "surface": {
     "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
@@ -807,7 +807,7 @@
     "revision": "47af20264abbd24ea282ded0f8ee9cad3cf3bf2f"
   },
   "tcl": {
-    "revision": "98015ebe182d94e5a4439e32ffd91beaac32fcb9"
+    "revision": "3755c8c18c039ca4125797fd0212f7e59974e58e"
   },
   "teal": {
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
@@ -816,7 +816,7 @@
     "revision": "def9849184de71a797c4e2b2837df85abeccf92c"
   },
   "tera": {
-    "revision": "482b475b32e6bae67f9d57abc60545399fd9b0a3"
+    "revision": "25a7c617192253bddfa65e378975d8c476419010"
   },
   "terraform": {
     "revision": "de10d494dbd6b71cdf07a678fecbf404dbfe4398"

From 9df671fda41bc4af91b9f7ea3fa1628ba988a77b Mon Sep 17 00:00:00 2001
From: savanto <savanto@users.noreply.github.com>
Date: Sat, 29 Mar 2025 17:30:28 -0500
Subject: [PATCH 2247/2704] dhall: recognize several missing builtins

- recognize builtin type `Bool`
- recognize import `... as Bytes`
- recognize builtin functions `Date/show`, `Time/show`, `TimeZone/show`
- recognize a bytes literal (ie. `0x"deadbeef"`)
---
 queries/dhall/highlights.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/queries/dhall/highlights.scm b/queries/dhall/highlights.scm
index efd7fedf2..d7a5d0006 100644
--- a/queries/dhall/highlights.scm
+++ b/queries/dhall/highlights.scm
@@ -1,4 +1,3 @@
-; Text
 ; Imports
 (missing_import) @keyword.import
 
@@ -12,6 +11,7 @@
 ] @string.special
 
 [
+  (import_as_bytes)
   (import_as_location)
   (import_as_text)
 ] @type
@@ -92,6 +92,7 @@
 
 (builtin
   [
+    "Bool"
     "Natural"
     "Natural/build"
     "Natural/fold"
@@ -121,8 +122,11 @@
     "Text/replace"
     "Optional"
     "Date"
+    "Date/show"
     "Time"
+    "Time/show"
     "TimeZone"
+    "TimeZone/show"
     "Type"
     "Kind"
     "Sort"
@@ -164,7 +168,10 @@
 ] @keyword.conditional
 
 ; Literals
-(text_literal) @string
+[
+  (text_literal)
+  (bytes_literal)
+] @string
 
 (interpolation
   "}" @string)

From 9be6836ebeb88a536055bf1ce0961eef68da4bc6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 31 Mar 2025 06:48:31 +0000
Subject: [PATCH 2248/2704] bot(lockfile): update editorconfig, elm, tcl

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index f3dabd423..c6e131379 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -156,7 +156,7 @@
     "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
   },
   "editorconfig": {
-    "revision": "02f562e71dc28d573187809eecdffaee7c82321c"
+    "revision": "3f2b371537355f6e53cc3af37f79ba450efb5132"
   },
   "eds": {
     "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
@@ -168,7 +168,7 @@
     "revision": "450a8194f5a66561135962cfc8d7545a27b61c4c"
   },
   "elm": {
-    "revision": "e34bdc5c512918628b05b48e633f711123204e45"
+    "revision": "3b373a3ccb48f31aa4b7ddc9092e2f5e24ab7aed"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -807,7 +807,7 @@
     "revision": "47af20264abbd24ea282ded0f8ee9cad3cf3bf2f"
   },
   "tcl": {
-    "revision": "3755c8c18c039ca4125797fd0212f7e59974e58e"
+    "revision": "9d6ac0661686e0da8b622571d06d1c1471a437fc"
   },
   "teal": {
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"

From 4b390e1e46ca2e6220f14641cb840bbf9ad5446f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 06:48:54 +0000
Subject: [PATCH 2249/2704] bot(lockfile): update fortran, scala, tcl

---
 lockfile.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index c6e131379..da2481f7f 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -210,7 +210,7 @@
     "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
   },
   "fortran": {
-    "revision": "64e11001d7ef3e8ac18e55a3a2d811fe36430923"
+    "revision": "d738334e4a21866a1ab81fb3f27f9b0b2ad2e515"
   },
   "fsh": {
     "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
@@ -708,7 +708,7 @@
     "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
   },
   "scala": {
-    "revision": "160e35520577d91576b08fb677aaee840c591dc2"
+    "revision": "c1189954df854977c3a52003ca8a247c5f4729ba"
   },
   "scfg": {
     "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"
@@ -807,7 +807,7 @@
     "revision": "47af20264abbd24ea282ded0f8ee9cad3cf3bf2f"
   },
   "tcl": {
-    "revision": "9d6ac0661686e0da8b622571d06d1c1471a437fc"
+    "revision": "f15e711167661d1ba541d4f62b9dbfc4ce61ec56"
   },
   "teal": {
     "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"

From 288b4fb4d7d4203063923c35823c828eb8a35869 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 06:46:41 +0000
Subject: [PATCH 2250/2704] bot(lockfile): update erlang, glimmer_javascript,
 glimmer_typescript, php, php_only, qmljs, rust

---
 lockfile.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index da2481f7f..cf86dbd7b 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -183,7 +183,7 @@
     "revision": "36064bd71ce22e9a8c73b64b1a3448cc600a4312"
   },
   "erlang": {
-    "revision": "364e323b32d098ad0e7b29e7adb4005c2bb5cf34"
+    "revision": "416ca60d7d2a824c0d346163541153e230710780"
   },
   "facility": {
     "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
@@ -258,10 +258,10 @@
     "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
   },
   "glimmer_javascript": {
-    "revision": "babba3fc0c822a633261ce9e96a4d7986050eb0c"
+    "revision": "5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87"
   },
   "glimmer_typescript": {
-    "revision": "48c60295f1ee34ea4ed6e5177102be6d24bfc9d0"
+    "revision": "12d98944c1d5077b957cbdb90d663a7c4d50118c"
   },
   "glsl": {
     "revision": "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"
@@ -564,10 +564,10 @@
     "revision": "ecd90bd8b381bcc7219fed4fe351903630e761c6"
   },
   "php": {
-    "revision": "f7cf7348737d8cff1b13407a0bfedce02ee7b046"
+    "revision": "576a56fa7f8b68c91524cdd211eb2ffc43e7bb11"
   },
   "php_only": {
-    "revision": "f7cf7348737d8cff1b13407a0bfedce02ee7b046"
+    "revision": "576a56fa7f8b68c91524cdd211eb2ffc43e7bb11"
   },
   "phpdoc": {
     "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
@@ -639,7 +639,7 @@
     "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
   },
   "qmljs": {
-    "revision": "8fef30e231d74b65c713bcbac21956156d8963da"
+    "revision": "0889da4632bba3ec6f39ef4102625654890c15c1"
   },
   "query": {
     "revision": "930202c2a80965a7a9ca018b5b2a08b25dfa7f12"
@@ -705,7 +705,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
+    "revision": "3691201b01cacb2f96ffca4c632c4e938bfacd88"
   },
   "scala": {
     "revision": "c1189954df854977c3a52003ca8a247c5f4729ba"

From cfbbea187b899b6f75503d3d635ee9374a44818d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 2 Apr 2025 10:46:07 +0200
Subject: [PATCH 2251/2704] ci(tests): check queries on 0.10.4

---
 .github/workflows/test-queries.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index bc4a18d52..8fe1f082a 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -24,19 +24,19 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
         cc: [gcc, clang]
-        nvim_tag: [stable]
+        nvim_tag: [v0.10.4]
         exclude:
           - os: ubuntu-latest
             cc: clang
-            nvim_tag: stable
+            nvim_tag: v0.10.4
 
           - os: macos-14
             cc: gcc
-            nvim_tag: stable
+            nvim_tag: v0.10.4
 
           - os: windows-latest
             cc: clang
-            nvim_tag: stable
+            nvim_tag: v0.10.4
 
         include:
           - os: windows-latest

From 69cb3aafb6a32c4cc3c0b800ef1b6b52d84d1c17 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 2 Apr 2025 10:46:29 +0200
Subject: [PATCH 2252/2704] fix(rust,dhall,elm,enforce): revert to ABI 14
 parser

---
 lockfile.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lockfile.json b/lockfile.json
index cf86dbd7b..17d4a9628 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -126,7 +126,7 @@
     "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
   },
   "dhall": {
-    "revision": "0d4fdd401b22d3f2f23ad2128a5307a4d927434f"
+    "revision": "4a6c08abfb54827db4e722d6cdca81b093898988"
   },
   "diff": {
     "revision": "e42b8def4f75633568f1aecfe01817bf15164928"
@@ -168,7 +168,7 @@
     "revision": "450a8194f5a66561135962cfc8d7545a27b61c4c"
   },
   "elm": {
-    "revision": "3b373a3ccb48f31aa4b7ddc9092e2f5e24ab7aed"
+    "revision": "e34bdc5c512918628b05b48e633f711123204e45"
   },
   "elsa": {
     "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
@@ -180,7 +180,7 @@
     "revision": "8495d106154741e6d35d37064f864758ece75de6"
   },
   "enforce": {
-    "revision": "36064bd71ce22e9a8c73b64b1a3448cc600a4312"
+    "revision": "aedd0bbab9dcc9caec9cc4e32bd303e86509522b"
   },
   "erlang": {
     "revision": "416ca60d7d2a824c0d346163541153e230710780"
@@ -705,7 +705,7 @@
     "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
   },
   "rust": {
-    "revision": "3691201b01cacb2f96ffca4c632c4e938bfacd88"
+    "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
   },
   "scala": {
     "revision": "c1189954df854977c3a52003ca8a247c5f4729ba"

From 79a6192d4782e6d398e0b2ce588cdf9f27c5b9f5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 2 Apr 2025 10:48:19 +0200
Subject: [PATCH 2253/2704] ci(update): block dhall,elm,enforce,rust (ABI 15)

---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 44bd884da..303d09c09 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Update parsers
         env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,git_config,nickel,rescript,slint,sql,t32,templ,typespec,verilog,wit"
+          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,dhall,elm,enforce,git_config,nickel,rescript,rust,slint,sql,t32,templ,typespec,verilog,wit"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
           nvim -l scripts/write-lockfile.lua

From 36a7d010bb3eb7f3e74d091e4584040a00dd50de Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 2 Apr 2025 11:01:15 +0200
Subject: [PATCH 2254/2704] ci(update): only check once a week (sat)

I need a break...
---
 .github/workflows/update-lockfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 303d09c09..2290f56aa 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -2,7 +2,7 @@ name: Update lockfile
 
 on:
   schedule:
-    - cron: "30 6 * * *"
+    - cron: "30 6 * * 6"
   workflow_dispatch:
 
 jobs:

From 30654ee72a69e7c76a54b66d748dae088429e863 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 2 Apr 2025 11:28:10 +0200
Subject: [PATCH 2255/2704] ci(tests): run tests on v0.10.4

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5c775eda4..e09a5f295 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Install and prepare Neovim
         env:
-          NVIM_TAG: stable
+          NVIM_TAG: v0.10.4
         run: |
           bash ./scripts/ci-install.sh
 

From 997288c55253e27f782d991099490f80205d65bf Mon Sep 17 00:00:00 2001
From: Jakob Zahn <jakob.zahn@mailbox.org>
Date: Thu, 3 Apr 2025 09:35:41 +0200
Subject: [PATCH 2256/2704] fix(python): highlight all types of docstrings
 (#7788)

---
 queries/python/highlights.scm               |  24 +---
 tests/query/highlights/python/docstrings.py | 121 ++++++++++++++++++++
 2 files changed, 124 insertions(+), 21 deletions(-)
 create mode 100644 tests/query/highlights/python/docstrings.py

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 84b29412a..00250de1b 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -80,27 +80,9 @@
 ] @string.escape
 
 ; doc-strings
-(module
-  .
-  (comment)*
-  .
-  (expression_statement
-    (string
-      (string_content) @spell) @string.documentation))
-
-(class_definition
-  body: (block
-    .
-    (expression_statement
-      (string
-        (string_content) @spell) @string.documentation)))
-
-(function_definition
-  body: (block
-    .
-    (expression_statement
-      (string
-        (string_content) @spell) @string.documentation)))
+(expression_statement
+  (string
+    (string_content) @spell) @string.documentation)
 
 ; Tokens
 [
diff --git a/tests/query/highlights/python/docstrings.py b/tests/query/highlights/python/docstrings.py
new file mode 100644
index 000000000..02c0a2cc6
--- /dev/null
+++ b/tests/query/highlights/python/docstrings.py
@@ -0,0 +1,121 @@
+# Docstrings according to PEP 257 (https://peps.python.org/pep-0257/)
+# <- @comment
+
+"""Module docstring assigned to `__doc__`..."""
+# <- @string.documentation
+"""
+... with an addtional docstring, not part of `__doc__`.
+"""
+# <- @string.documentation
+
+"""
+Some random docstring in the middle if nowhere...
+"""
+# <- @string.documentation
+"""
+... also with not one ...
+"""
+# <- @string.documentation
+"""
+... but two addtional docstrings.
+"""
+# <- @string.documentation
+
+oneline_string_assignment = "not detected as docstring"
+#                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @string
+#                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ !@string.documentation
+"""Module attribute docstring."""
+# <- @string.documentation
+
+multiline_string_assignment = """
+                              also not detected as docstring
+                              """
+#                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @string
+#                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ !@string.documentation
+
+looks_like_implicit_string_concatenation = "abc"
+#                                          ^^^^^ @string 
+"def"
+# <- @string.documentation
+
+single_line_implicit_string_concatenation = "abc" "def"
+#                                           ^^^^^ @string 
+#                                                 ^^^^^ @string 
+#                                                 ^^^^^ !@string.documentation 
+
+multiline_implicit_string_concatenation = (
+    "not "
+    # <- @string
+    # <- !@string.documentation
+    "detected "
+    # <- @string
+    # <- !@string.documentation
+    "as docstring, "
+    # <- @string
+    # <- !@string.documentation
+    "either."
+    # <- @string
+    # <- !@string.documentation
+)
+
+
+class A:
+    """
+    Class docstring, assigned to `__doc__`.
+    """
+    # <- @string.documentation
+
+    """
+    Some random docstring again, ...
+    """
+    # <- @string.documentation
+    """
+    ... with an "additional" docstring. Again.
+    """
+    # <- @string.documentation
+
+    foo = "class attribute"
+    #     ^^^^^^^^^^^^^^^^^ @string
+    #     ^^^^^^^^^^^^^^^^^ !@string.documentation
+    """
+    Class attribute docstring, but an attribute 
+    does not have a `__doc__` attribute itself.
+    """
+    # <- @string.documentation
+
+    bar: int
+    """Class attribute docstring, type annotation only."""
+    # <- @string.documentation
+
+    baz: str = "type annotated class attribute"
+    #          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @string
+    #          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ !@string.documentation
+    """Class attribute docstring, type annotation and assignment."""
+    # <- @string.documentation
+
+    def __init__(self):
+        """Method docstring."""
+        # <- @string.documentation
+
+        self.quux = "instance attribute"
+        #           ^^^^^^^^^^^^^^^^^^^^ @string
+        #           ^^^^^^^^^^^^^^^^^^^^ !@string.documentation
+        """Instance attribute docstring."""
+        # <- @string.documentation
+
+
+def f(x):
+    """Function docstring."""
+    # <- @string.documentation
+    """Addtional function docstring."""
+    # <- @string.documentation
+    return x**2
+
+
+f.a = 1
+"""Function attribute docstring."""
+# <- @string.documentation
+
+
+"Random docstring with single quotes - legal, but far off standard and confusing."
+# <- @string.documentation

From 523a9e148919f58eb5a013f76787e57696e00c93 Mon Sep 17 00:00:00 2001
From: Maksim Terpilovskii <maximtrp@gmail.com>
Date: Fri, 4 Apr 2025 14:08:02 +0200
Subject: [PATCH 2257/2704] fix(svelte): `else if` highlight (#7797)

---
 queries/svelte/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm
index 600eb9986..dc98290dd 100644
--- a/queries/svelte/highlights.scm
+++ b/queries/svelte/highlights.scm
@@ -14,6 +14,7 @@
 
 [
   "if"
+  "else if"
   "else"
   "then"
 ] @keyword.conditional

From e5c8398e4492815a7e2adce46fcb08eccf2fa392 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 6 Apr 2025 11:21:52 +0200
Subject: [PATCH 2258/2704] ci(bot): bump create-github-app-token to v2

---
 .github/workflows/update-lockfile.yml | 2 +-
 .github/workflows/update-readme.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 2290f56aa..df0f61347 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           ref: master
 
-      - uses: actions/create-github-app-token@v1
+      - uses: actions/create-github-app-token@v2
         id: app-token
         with:
           app-id: ${{ vars.TOKEN_ID }}
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index a3fa018e5..de416a873 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/create-github-app-token@v1
+      - uses: actions/create-github-app-token@v2
         id: app-token
         with:
           app-id: ${{ vars.TOKEN_ID }}

From 205faba1768a6e4c854f156bc6a21a41b242599c Mon Sep 17 00:00:00 2001
From: Anthony Fiddes <11233666+Anthony-Fiddes@users.noreply.github.com>
Date: Sun, 6 Apr 2025 17:09:27 +0000
Subject: [PATCH 2259/2704] feat(yaml): inject bash for taskfiles (#7804)

---
 queries/yaml/injections.scm                       |  9 +++++----
 tests/query/injections/yaml/bash-on-taskfiles.yml | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 tests/query/injections/yaml/bash-on-taskfiles.yml

diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index b05c332fe..d0a3c930f 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -2,9 +2,10 @@
   (#set! injection.language "comment"))
 
 ; Github actions ("run") / Gitlab CI ("scripts")
+; Taskfile scripts ("cmds", "sh")
 (block_mapping_pair
   key: (flow_node) @_run
-  (#any-of? @_run "run" "script" "before_script" "after_script")
+  (#any-of? @_run "run" "script" "before_script" "after_script" "cmds" "sh")
   value: (flow_node
     (plain_scalar
       (string_scalar) @injection.content)
@@ -12,7 +13,7 @@
 
 (block_mapping_pair
   key: (flow_node) @_run
-  (#any-of? @_run "run" "script" "before_script" "after_script")
+  (#any-of? @_run "run" "script" "before_script" "after_script" "cmds" "sh")
   value: (block_node
     (block_scalar) @injection.content
     (#set! injection.language "bash")
@@ -20,7 +21,7 @@
 
 (block_mapping_pair
   key: (flow_node) @_run
-  (#any-of? @_run "run" "script" "before_script" "after_script")
+  (#any-of? @_run "run" "script" "before_script" "after_script" "cmds" "sh")
   value: (block_node
     (block_sequence
       (block_sequence_item
@@ -31,7 +32,7 @@
 
 (block_mapping_pair
   key: (flow_node) @_run
-  (#any-of? @_run "script" "before_script" "after_script")
+  (#any-of? @_run "script" "before_script" "after_script" "cmds" "sh")
   value: (block_node
     (block_sequence
       (block_sequence_item
diff --git a/tests/query/injections/yaml/bash-on-taskfiles.yml b/tests/query/injections/yaml/bash-on-taskfiles.yml
new file mode 100644
index 000000000..87a699cc3
--- /dev/null
+++ b/tests/query/injections/yaml/bash-on-taskfiles.yml
@@ -0,0 +1,15 @@
+# https://taskfile.dev
+
+version: '3'
+
+vars:
+  GREETING:
+    sh: echo "Hello, World!"
+    #   ^ @bash
+
+tasks:
+  default:
+    cmds:
+      - echo "{{.GREETING}}"
+    #   ^ @bash
+    silent: true

From 0e21ee8df6235511c02bab4a5b391d18e165a58d Mon Sep 17 00:00:00 2001
From: Mikkel Mondrup Kristensen <monrad@github.com>
Date: Mon, 7 Apr 2025 21:08:22 +0200
Subject: [PATCH 2260/2704] More bash injection support for Taskfile (#7805)

---
 queries/yaml/injections.scm                       | 6 +++---
 tests/query/injections/yaml/bash-on-taskfiles.yml | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index d0a3c930f..143af1924 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -2,10 +2,10 @@
   (#set! injection.language "comment"))
 
 ; Github actions ("run") / Gitlab CI ("scripts")
-; Taskfile scripts ("cmds", "sh")
+; Taskfile scripts ("cmds", "cmd", "sh")
 (block_mapping_pair
   key: (flow_node) @_run
-  (#any-of? @_run "run" "script" "before_script" "after_script" "cmds" "sh")
+  (#any-of? @_run "run" "script" "before_script" "after_script" "cmds" "cmd" "sh")
   value: (flow_node
     (plain_scalar
       (string_scalar) @injection.content)
@@ -13,7 +13,7 @@
 
 (block_mapping_pair
   key: (flow_node) @_run
-  (#any-of? @_run "run" "script" "before_script" "after_script" "cmds" "sh")
+  (#any-of? @_run "run" "script" "before_script" "after_script" "cmds" "cmd" "sh")
   value: (block_node
     (block_scalar) @injection.content
     (#set! injection.language "bash")
diff --git a/tests/query/injections/yaml/bash-on-taskfiles.yml b/tests/query/injections/yaml/bash-on-taskfiles.yml
index 87a699cc3..c99dc4667 100644
--- a/tests/query/injections/yaml/bash-on-taskfiles.yml
+++ b/tests/query/injections/yaml/bash-on-taskfiles.yml
@@ -13,3 +13,12 @@ tasks:
       - echo "{{.GREETING}}"
     #   ^ @bash
     silent: true
+  cmd:
+    cmd: echo "{{.GREETING}}"
+    #    ^ @bash
+    silent: true
+  cmd-block:
+    cmd: |
+      echo "{{.GREETING}}"
+    # ^ @bash
+    silent: true

From 7bbed4b548d9a81c14351bda93d16336edefd067 Mon Sep 17 00:00:00 2001
From: AJ Delcimmuto <ajdelco22@gmail.com>
Date: Sun, 13 Apr 2025 15:20:09 -0500
Subject: [PATCH 2261/2704] feat(brightscript): brightscript parser and queries
 (#7780)

---
 README.md                           |   1 +
 lockfile.json                       |   3 +
 lua/nvim-treesitter/parsers.lua     |   8 ++
 queries/brightscript/folds.scm      |   8 ++
 queries/brightscript/highlights.scm | 177 ++++++++++++++++++++++++++++
 queries/brightscript/indents.scm    |  39 ++++++
 queries/brightscript/injections.scm |   2 +
 7 files changed, 238 insertions(+)
 create mode 100644 queries/brightscript/folds.scm
 create mode 100644 queries/brightscript/highlights.scm
 create mode 100644 queries/brightscript/indents.scm
 create mode 100644 queries/brightscript/injections.scm

diff --git a/README.md b/README.md
index 9447e0f65..2cb5f033b 100644
--- a/README.md
+++ b/README.md
@@ -191,6 +191,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [blade](https://github.com/EmranMR/tree-sitter-blade) (maintained by @calebdw)
 - [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
 - [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
+- [x] [brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) (maintained by @ajdelcimmuto)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
 - [x] [caddy](https://github.com/opa-oz/tree-sitter-caddy) (maintained by @opa-oz)
diff --git a/lockfile.json b/lockfile.json
index 17d4a9628..3f87966c6 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -53,6 +53,9 @@
   "bp": {
     "revision": "16c43068ec30828c5aed11e87262c56f36782595"
   },
+  "brightscript": {
+    "revision": "48ce1687125c6dfefcc7a1bef19fa0f0f00426cc"
+  },
   "c": {
     "revision": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index edbc003d5..31b691209 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -216,6 +216,14 @@ list.bp = {
   maintainers = { "@ambroisie" },
 }
 
+list.brightscript = {
+  install_info = {
+    url = "https://github.com/ajdelcimmuto/tree-sitter-brightscript",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ajdelcimmuto" },
+}
+
 list.c = {
   install_info = {
     url = "https://github.com/tree-sitter/tree-sitter-c",
diff --git a/queries/brightscript/folds.scm b/queries/brightscript/folds.scm
new file mode 100644
index 000000000..56b7d575b
--- /dev/null
+++ b/queries/brightscript/folds.scm
@@ -0,0 +1,8 @@
+[
+  (function_statement)
+  (sub_statement)
+  (while_statement)
+  (for_statement)
+  (if_statement)
+  (try_statement)
+] @fold
diff --git a/queries/brightscript/highlights.scm b/queries/brightscript/highlights.scm
new file mode 100644
index 000000000..5758f565b
--- /dev/null
+++ b/queries/brightscript/highlights.scm
@@ -0,0 +1,177 @@
+; Identifiers
+(identifier) @variable
+
+; Function declaration
+(function_statement
+  name: (identifier) @function)
+
+; Sub declaration
+(sub_statement
+  name: (identifier) @function)
+
+[
+  (sub_start)
+  (function_start)
+  (end_sub)
+  (end_function)
+] @keyword.function
+
+; Parameters
+(parameter
+  name: (identifier) @variable.parameter)
+
+; Types
+(type_specifier) @type
+
+; Variables
+; Base variable in variable declarator (immediate child of prefix_exp)
+(variable_declarator
+  (prefix_exp
+    (identifier) @variable
+    (#not-has-ancestor? @variable prefix_exp)))
+
+; Properties in variable declarator
+(variable_declarator
+  (prefix_exp)
+  (identifier) @property)
+
+(multiplicative_expression
+  operator: (_) @keyword.operator)
+
+(logical_not_expression
+  operator: (_) @keyword.operator)
+
+(logical_expression
+  operator: (_) @keyword.operator)
+
+; Property access
+; First identifier in a chain (base variable)
+(prefix_exp
+  .
+  (identifier) @variable
+  (#not-has-ancestor? @variable prefix_exp))
+
+; All other identifiers in a chain (properties)
+(prefix_exp
+  (prefix_exp)
+  (identifier) @property)
+
+; Function calls
+(function_call
+  function: (prefix_exp
+    (identifier) @function.call))
+
+; Statements
+[
+  (if_start)
+  (else)
+  (else_if)
+  (end_if)
+  (then)
+  (conditional_compl_end_if)
+] @keyword.conditional
+
+[
+  (for_start)
+  (while_start)
+  (for_each)
+  (for_in)
+  (for_to)
+  (for_step)
+  (end_for)
+  (end_while)
+  (exit_while_statement)
+  (exit_for_statement)
+] @keyword.repeat
+
+; Statements
+[
+  (try_start)
+  (try_catch)
+  (throw)
+  (end_try)
+] @keyword.exception
+
+(return) @keyword.return
+
+(print) @function.builtin
+
+(constant) @constant
+
+; Operators
+[
+  "="
+  "<>"
+  "<"
+  "<="
+  ">"
+  ">="
+  "+"
+  "-"
+  "*"
+  "/"
+] @operator
+
+; Literals
+(boolean) @boolean
+
+(number) @number
+
+(string) @string
+
+(invalid) @constant.builtin
+
+; Comments
+(comment) @comment @spell
+
+; Punctuation
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "?["
+] @punctuation.bracket
+
+[
+  "."
+  ","
+  "?."
+] @punctuation.delimiter
+
+; Special highlights for library statements
+(library_statement) @keyword.import
+
+(library_statement
+  path: (string) @module)
+
+; Array and associative array literals
+(array) @constructor
+
+(assoc_array) @constructor
+
+(assoc_array_element
+  key: (identifier) @property)
+
+; Increment/decrement operators
+[
+  (prefix_increment_expression)
+  (prefix_decrement_expression)
+  (postfix_increment_expression)
+  (postfix_decrement_expression)
+] @operator
+
+; Comparison operators
+(comparison_expression
+  [
+    "="
+    "<>"
+    "<"
+    "<="
+    ">"
+    ">="
+  ] @operator)
+
+(as) @keyword.operator
diff --git a/queries/brightscript/indents.scm b/queries/brightscript/indents.scm
new file mode 100644
index 000000000..e54bf52c1
--- /dev/null
+++ b/queries/brightscript/indents.scm
@@ -0,0 +1,39 @@
+; Start indentation for block-level constructs
+[
+  (sub_statement)
+  (function_statement)
+  (annonymous_sub)
+  (annonymous_function)
+  (conditional_compl)
+  (multi_line_if)
+  (for_statement)
+  (while_statement)
+  (try_statement)
+  (array)
+  (assoc_array)
+] @indent.begin
+
+; End indentation for all end statements
+[
+  (end_sub)
+  (end_function)
+  (end_if)
+  (end_for)
+  (end_while)
+  (end_try)
+  (conditional_compl_end_if)
+  "]"
+  "}"
+] @indent.branch @indent.end
+
+; Handle branching constructs
+[
+  (else_if_clause)
+  (else_clause)
+  (conditional_compl_else_if_clause)
+  (conditional_compl_else_clause)
+  (catch_clause)
+] @indent.branch
+
+; Ignore comments for indentation
+(comment) @indent.ignore
diff --git a/queries/brightscript/injections.scm b/queries/brightscript/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/queries/brightscript/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 54fc8e311c8453bcf5ef968e0375892634bbebd0 Mon Sep 17 00:00:00 2001
From: Peter Cardenas <16930781+PeterCardenas@users.noreply.github.com>
Date: Tue, 15 Apr 2025 04:35:40 -0700
Subject: [PATCH 2262/2704] feat(fish): add variable.builtin highlights

---
 queries/fish/highlights.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 10ed533d3..8d97d9a61 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -157,6 +157,31 @@
 
 (variable_expansion) @constant
 
+; Reference: https://fishshell.com/docs/current/language.html#special-variables
+((variable_name) @variable.builtin
+  (#any-of? @variable.builtin
+    "PATH" "CDPATH" "LANG" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_MONETARY" "LC_NUMERIC"
+    "LC_TIME" "fish_color_normal" "fish_color_command" "fish_color_keyword" "fish_color_keyword"
+    "fish_color_redirection" "fish_color_end" "fish_color_error" "fish_color_param"
+    "fish_color_valid_path" "fish_color_option" "fish_color_comment" "fish_color_selection"
+    "fish_color_operator" "fish_color_escape" "fish_color_autosuggestion" "fish_color_cwd"
+    "fish_color_cwd_root" "fish_color_user" "fish_color_host" "fish_color_host_remote"
+    "fish_color_status" "fish_color_cancel" "fish_color_search_match" "fish_color_history_current"
+    "fish_pager_color_progress" "fish_pager_color_background" "fish_pager_color_prefix"
+    "fish_pager_color_completion" "fish_pager_color_description"
+    "fish_pager_color_selected_background" "fish_pager_color_selected_prefix"
+    "fish_pager_color_selected_completion" "fish_pager_color_selected_description"
+    "fish_pager_color_secondary_background" "fish_pager_color_secondary_prefix"
+    "fish_pager_color_secondary_completion" "fish_pager_color_secondary_description"
+    "fish_term24bit" "fish_term256" "fish_ambiguous_width" "fish_emoji_width"
+    "fish_autosuggestion_enabled" "fish_handle_reflow" "fish_key_bindings" "fish_escape_delay_ms"
+    "fish_sequence_key_delay_ms" "fish_complete_path" "fish_cursor_selection_mode"
+    "fish_function_path" "fish_greeting" "fish_history" "fish_trace" "FISH_DEBUG"
+    "FISH_DEBUG_OUTPUT" "fish_user_paths" "umask" "BROWSER" "_" "argv" "CMD_DURATION" "COLUMNS"
+    "LINES" "fish_kill_signal" "fish_killring" "fish_read_limit" "fish_pid" "history" "HOME"
+    "hostname" "IFS" "last_pid" "PWD" "pipestatus" "SHLVL" "status" "status_generation" "TERM"
+    "USER" "EUID" "version" "FISH_VERSION"))
+
 ; Nodes
 [
   (integer)

From 684eeac91ed8e297685a97ef70031d19ac1de25a Mon Sep 17 00:00:00 2001
From: Peter Cardenas <16930781+PeterCardenas@users.noreply.github.com>
Date: Tue, 15 Apr 2025 04:36:13 -0700
Subject: [PATCH 2263/2704] feat(fish): highlight $ punctuation.special

---
 queries/fish/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
index 8d97d9a61..a7c451175 100644
--- a/queries/fish/highlights.scm
+++ b/queries/fish/highlights.scm
@@ -106,7 +106,7 @@
   ])
 
 (command_substitution
-  "$" @punctuation.bracket)
+  "$" @punctuation.special)
 
 ; non-builtin command names
 (command
@@ -157,6 +157,9 @@
 
 (variable_expansion) @constant
 
+(variable_expansion
+  "$" @punctuation.special) @none
+
 ; Reference: https://fishshell.com/docs/current/language.html#special-variables
 ((variable_name) @variable.builtin
   (#any-of? @variable.builtin

From 58dd1496291fa19c3c4990df28c2773a4bc9b257 Mon Sep 17 00:00:00 2001
From: blindfs <blindfs19@gmail.com>
Date: Sat, 26 Apr 2025 12:04:49 +0800
Subject: [PATCH 2264/2704] fix(nu): add missing `ctrl_match` to query files

---
 queries/nu/folds.scm   | 1 +
 queries/nu/indents.scm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/queries/nu/folds.scm b/queries/nu/folds.scm
index 53607745a..abb538050 100644
--- a/queries/nu/folds.scm
+++ b/queries/nu/folds.scm
@@ -2,6 +2,7 @@
   (attribute_list)
   (block)
   (command_list)
+  (ctrl_match)
   (parameter_bracks)
   (record_body)
   (val_list)
diff --git a/queries/nu/indents.scm b/queries/nu/indents.scm
index c344d4abd..94b3fa72e 100644
--- a/queries/nu/indents.scm
+++ b/queries/nu/indents.scm
@@ -2,6 +2,7 @@
 ; Copyright (c) 2019 - 2022 The Nushell Project Developers
 ; Licensed under the MIT license.
 [
+  (ctrl_match)
   (expr_parenthesized)
   (parameter_bracks)
   (val_record)

From 4c7509e7b06cea99065e8d4a20d30e6a2e5cd924 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 26 Apr 2025 22:12:46 +0200
Subject: [PATCH 2265/2704] fix(roc): use correct predicate in injections

---
 queries/roc/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/queries/roc/injections.scm b/queries/roc/injections.scm
index 509805b17..5bc7576f8 100644
--- a/queries/roc/injections.scm
+++ b/queries/roc/injections.scm
@@ -7,7 +7,7 @@
       (multiline_string)
       (string)
     ] @injection.content)
-  (#any-eq? @injection.language
+  (#any-of? @injection.language
     "json" "toml" "yaml" "xml" "sql" "lua" "js" "html" "css" "http" "jq" "latex" "md" "nix" "regex"))
 
 ;injection from piping function calls
@@ -20,7 +20,7 @@
   part: (operator)
   part: (variable_expr
     (identifier) @injection.language)
-  (#any-eq? @injection.language
+  (#any-of? @injection.language
     "json" "toml" "yaml" "xml" "sql" "lua" "js" "html" "css" "http" "jq" "latex" "md" "nix" "regex"))
 
 ([

From 3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 27 Apr 2025 11:04:54 +0200
Subject: [PATCH 2266/2704] fix(injections): dtd, glimmer.*, razor, tablegen,
 teal

---
 queries/dtd/injections.scm                | 3 ++-
 queries/glimmer_javascript/injections.scm | 8 --------
 queries/glimmer_typescript/injections.scm | 8 --------
 queries/razor/injections.scm              | 2 +-
 queries/tablegen/injections.scm           | 2 +-
 queries/teal/injections.scm               | 2 +-
 6 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/queries/dtd/injections.scm b/queries/dtd/injections.scm
index ed5557a05..57fae5832 100644
--- a/queries/dtd/injections.scm
+++ b/queries/dtd/injections.scm
@@ -1 +1,2 @@
-(Comment) @comment
+((Comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/queries/glimmer_javascript/injections.scm b/queries/glimmer_javascript/injections.scm
index 38cf529b7..174372a48 100644
--- a/queries/glimmer_javascript/injections.scm
+++ b/queries/glimmer_javascript/injections.scm
@@ -1,13 +1,5 @@
 ; inherits: ecma
 
-; Parse Ember/Glimmer/Handlebars/HTMLBars/etc. template literals
-; e.g.: await render(hbs`<SomeComponent />`)
-(call_expression
-  function: ((identifier) @_name
-    (#eq? @_name "hbs"))
-  arguments: ((template_string) @glimmer
-    (#offset! @glimmer 0 1 0 -1)))
-
 ; Ember Unified <template> syntax
 ; e.g.: <template><SomeComponent @arg={{double @value}} /></template>
 ((glimmer_template) @injection.content
diff --git a/queries/glimmer_typescript/injections.scm b/queries/glimmer_typescript/injections.scm
index 487d69734..4c79d635a 100644
--- a/queries/glimmer_typescript/injections.scm
+++ b/queries/glimmer_typescript/injections.scm
@@ -1,13 +1,5 @@
 ; inherits: typescript
 
-; Parse Ember/Glimmer/Handlebars/HTMLBars/etc. template literals
-; e.g.: await render(hbs`<SomeComponent />`)
-(call_expression
-  function: ((identifier) @_name
-    (#eq? @_name "hbs"))
-  arguments: ((template_string) @glimmer
-    (#offset! @glimmer 0 1 0 -1)))
-
 ; Ember Unified <template> syntax
 ; e.g.: <template><SomeComponent @arg={{double @value}} /></template>
 ((glimmer_template) @injection.content
diff --git a/queries/razor/injections.scm b/queries/razor/injections.scm
index fe28d8611..f73839bd6 100644
--- a/queries/razor/injections.scm
+++ b/queries/razor/injections.scm
@@ -3,7 +3,7 @@
 ([
   (html_comment)
   (razor_comment)
-] @comment
+] @injection.content
   (#set! injection.language "comment"))
 
 ((element) @injection.content
diff --git a/queries/tablegen/injections.scm b/queries/tablegen/injections.scm
index 08390aaa1..99f7919b6 100644
--- a/queries/tablegen/injections.scm
+++ b/queries/tablegen/injections.scm
@@ -6,4 +6,4 @@
   (comment) @injection.content)
   (#lua-match? @injection.content "^.*RUN")
   (#set! injection.language "bash")
-  (#offset! @injection.content 0 8))
+  (#offset! @injection.content 0 8 0 0))
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index 830b745ba..decb4831c 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -34,7 +34,7 @@
 ((function_call
   (method_index
     (parenthesized_expression
-      (string) @printf)
+      (string) @injection.content)
     key: (identifier) @_func))
   (#eq? @_func "format")
   (#set! injection.language "printf"))

From 94ea4f436d2b59c80f02e293466c374584f03b8c Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Wed, 30 Apr 2025 10:46:14 +0200
Subject: [PATCH 2267/2704] feat(haskell): injections for inline-python
 quasiquotes

---
 queries/haskell/injections.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/queries/haskell/injections.scm b/queries/haskell/injections.scm
index 59fe73357..a82addbce 100644
--- a/queries/haskell/injections.scm
+++ b/queries/haskell/injections.scm
@@ -74,3 +74,11 @@
   (#any-of? @_name "persistUpperCase" "persistLowerCase" "persistWith")
   (quasiquote_body) @injection.content
   (#set! injection.language "haskell_persistent"))
+
+; -----------------------------------------------------------------------------
+; Python
+; inline-python
+(quasiquote
+  (quoter) @injection.language
+  (#any-of? @injection.language "pymain" "pye" "py_" "pyf")
+  (quasiquote_body) @injection.content)

From 28d480e0624b259095e56f353ec911f9f2a0f404 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Mon, 5 May 2025 22:05:53 -0500
Subject: [PATCH 2268/2704] fix: blade injection highlighting (#7846)

Injecting php was broken upstream so this is a temporary fix until
upstream fixes it.

See https://github.com/nvim-treesitter/nvim-treesitter/issues/7842
---
 queries/blade/injections.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queries/blade/injections.scm b/queries/blade/injections.scm
index 4f5234e31..12fa9f953 100644
--- a/queries/blade/injections.scm
+++ b/queries/blade/injections.scm
@@ -1,6 +1,6 @@
 ((text) @injection.content
   (#set! injection.combined)
-  (#set! injection.language php))
+  (#set! injection.language html))
 
 ((text) @injection.content
   (#has-ancestor? @injection.content "envoy")

From 0484f881c66fcac9ac517a5e62d99093e2e3702b Mon Sep 17 00:00:00 2001
From: Leo <leonard.paturel@openzeppelin.com>
Date: Mon, 12 May 2025 17:43:10 +0100
Subject: [PATCH 2269/2704] feat(solidity): add `abstract` keyword

---
 queries/solidity/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 453d7f710..ca6988edb 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -141,6 +141,7 @@
 
 ; Keywords
 [
+  "abstract"
   "library"
   "is"
   "event"

From 066fd6505377e3fd4aa219e61ce94c2b8bdb0b79 Mon Sep 17 00:00:00 2001
From: Leo <leonard.paturel@openzeppelin.com>
Date: Mon, 12 May 2025 17:43:30 +0100
Subject: [PATCH 2270/2704] feat(solidity): add doxygen injections (#7853)

---
 queries/solidity/injections.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/queries/solidity/injections.scm b/queries/solidity/injections.scm
index 2f0e58eb6..a772e0bd9 100644
--- a/queries/solidity/injections.scm
+++ b/queries/solidity/injections.scm
@@ -1,2 +1,14 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^///[^/]")
+  (#set! injection.language "doxygen"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^///$")
+  (#set! injection.language "doxygen"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^/[*][*][^*].*[*]/$")
+  (#set! injection.language "doxygen"))

From b171f948da98d157f7143776e691e92e83b777d2 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sun, 21 Jan 2024 12:57:34 +0200
Subject: [PATCH 2271/2704] feat(yuck): add missing injections

And builtin variable highlights
---
 queries/bass/injections.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/queries/bass/injections.scm b/queries/bass/injections.scm
index 2f0e58eb6..298a8d070 100644
--- a/queries/bass/injections.scm
+++ b/queries/bass/injections.scm
@@ -1,2 +1,26 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((function_call
+  name: (ident) @_name
+  .
+  (simplexpr)
+  .
+  (simplexpr
+    (string
+      (string_fragment) @injection.content)+))
+  (#any-of? @_name "replace" "search" "matches" "captures")
+  (#set! injection.language "regex")
+  (#set! injection.combined))
+
+((function_call
+  name: (ident) @_name
+  .
+  (simplexpr)
+  .
+  (simplexpr
+    (string
+      (string_fragment) @injection.content)+))
+  (#eq? @_name "jq")
+  (#set! injection.language "jq")
+  (#set! injection.combined))

From 628d5e442c7c572f4d83bb551154a102eaeeafb3 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Wed, 28 Jun 2023 16:34:13 +0200
Subject: [PATCH 2272/2704] injections(nix): add nixosTest.testScript +
 home-manager nvim config

(+ add Check to mkDerivation bash matches)

(+ add Check to mkDerivation bash matches)
---
 queries/nix/injections.scm                    | 29 ++++++++
 .../injections/nix/test-nix-injections.nix    | 70 +++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 tests/query/injections/nix/test-nix-injections.nix

diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index d5e8483f4..26ba6e2da 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -188,3 +188,32 @@
   ])
   (#match? @_func "(^|\\.)writeRust(Bin)?$")
   (#set! injection.combined))
+
+; (nixosTest) testScript
+((binding
+  attrpath: (attrpath) @_attr_name
+  (#eq? @_attr_name "nodes"))
+  (binding
+    attrpath: (attrpath) @_func_name
+    (#eq? @_func_name "testScript")
+    (_
+      (string_fragment) @injection.content
+      (#set! injection.language "python")))
+  (#set! injection.combined))
+
+; home-manager Neovim plugin config
+(attrset_expression
+  (binding_set
+    (binding
+      attrpath: (attrpath) @_ty_attr
+      (_
+        (string_fragment) @_ty)
+      (#eq? @_ty_attr "type")
+      (#eq? @_ty "lua"))
+    (binding
+      attrpath: (attrpath) @_cfg_attr
+      (_
+        (string_fragment) @injection.content
+        (#set! injection.language "lua"))
+      (#eq? @_cfg_attr "config")))
+  (#set! injection.combined))
diff --git a/tests/query/injections/nix/test-nix-injections.nix b/tests/query/injections/nix/test-nix-injections.nix
new file mode 100644
index 000000000..86e9f975d
--- /dev/null
+++ b/tests/query/injections/nix/test-nix-injections.nix
@@ -0,0 +1,70 @@
+{ pkgs, stdenv }:
+# NOTE: This file is for testing queries. If evaluated with nix, this will probably error.
+{ 
+  regex = builtins.match "^.*[{](.+)[}].*$" "blahblah {something} blahblah" [ "something" ];
+
+  drv1 = stdenv.mkDerivation {
+    buildPhase = "mkdir $out";
+    installPhase = ''
+      echo "bar" > $out/foo.txt
+    '';
+  };
+  
+  drv2 = pkgs.writeShellApplication {
+    name = "shellApp";
+    buildInputs = [];
+    text = ''
+      echo "Hello world!"
+    '';
+  };
+
+  drv3 = pkgs.runCommand "foo-bar" {} ''
+    mkir $out
+    echo "bar" > $out/foo.txt
+  '';
+
+  drv4 = pkgs.writeShellScriptBin "hello" ''
+    echo "Hello world!"
+  '';
+
+  drv5 = pkgs.writeFishBin "hello" ''
+    echo "Hello world!"
+  '';
+
+  drv6 = pkgs.writeHaskellBin "hello" ''
+    main :: IO ()
+    main = putStrLn "Hello world!"
+  '';
+
+  drv7 = pkgs.writeJSBin "hello" ''
+    console.log('Hello world!');
+  '';
+
+  drv8 = pkgs.writePerlBin "hello" ''
+    print("Hello world!\n");
+  '';
+
+  drv9 = pkgs.writePythonBin "hello" ''
+    print("Hello world!");
+  '';
+
+  drv10 = pkgs.writeRustBin "hello" ''
+    fn main() {
+      println!("Hello world!");
+    }
+  '';
+
+  drv11 = {
+    nodes = null;
+    testScript = ''
+      print("Hello world!");
+    '';
+  };
+
+  mod1 = {
+    type = "lua";
+    config = ''
+      require('nvim-treesitter.configs').setup()
+    '';
+  };
+}

From 310f0925ec64c7e54f3ee952679d285b13e5a735 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sat, 19 Aug 2023 19:48:32 +0300
Subject: [PATCH 2273/2704] feat(c-family): inherit injections

---
 queries/arduino/injections.scm |  6 +-----
 queries/c/injections.scm       |  2 +-
 queries/cpp/injections.scm     |  4 +---
 queries/cuda/injections.scm    |  6 +-----
 queries/glsl/injections.scm    |  6 +-----
 queries/hlsl/injections.scm    |  6 +-----
 queries/rust/indents.scm       | 15 +++++++++++++++
 7 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm
index b637d9b2b..b617fdc56 100644
--- a/queries/arduino/injections.scm
+++ b/queries/arduino/injections.scm
@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "arduino"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: cpp
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 77b4d7a86..24634864e 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,5 +1,5 @@
 ((preproc_arg) @injection.content
-  (#set! injection.language "c"))
+  (#set! injection.self))
 
 ((comment) @injection.content
   (#set! injection.language "comment"))
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 6e1657229..07f21dd14 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,6 +1,4 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "cpp"))
-
+; inherits: c
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm
index 0259958c5..b617fdc56 100644
--- a/queries/cuda/injections.scm
+++ b/queries/cuda/injections.scm
@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "cuda"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: cpp
diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm
index 90ca7b5d4..a5a5208ca 100644
--- a/queries/glsl/injections.scm
+++ b/queries/glsl/injections.scm
@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "glsl"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: c
diff --git a/queries/hlsl/injections.scm b/queries/hlsl/injections.scm
index c2fca7121..b617fdc56 100644
--- a/queries/hlsl/injections.scm
+++ b/queries/hlsl/injections.scm
@@ -1,5 +1 @@
-((preproc_arg) @injection.content
-  (#set! injection.language "hlsl"))
-
-((comment) @injection.content
-  (#set! injection.language "comment"))
+; inherits: cpp
diff --git a/queries/rust/indents.scm b/queries/rust/indents.scm
index dfe0a3805..9fe337d5c 100644
--- a/queries/rust/indents.scm
+++ b/queries/rust/indents.scm
@@ -26,6 +26,12 @@
   (macro_definition)
 ] @indent.begin
 
+(trait_item
+  body: (_) @indent.begin)
+
+(string_literal
+  (escape_sequence)) @indent.begin
+
 ; Typing in "(" inside macro definitions breaks the tree entirely
 ; Making macro_definition becoming errors
 ; Offset this by adding back one indent for start of macro rules
@@ -85,6 +91,15 @@
 
 (tuple_struct_pattern
   ")" @indent.end)
+; Typing in "(" inside macro definitions breaks the tree entirely
+; Making macro_definition becoming errors
+; Offset this by adding back one indent for start of macro rules
+(ERROR
+  .
+  "macro_rules!"
+  "(" @indent.begin
+  (#set! indent.immediate)
+  (#set! indent.start_at_same_line))
 
 (tuple_type
   ")" @indent.end)

From 692b051b09935653befdb8f7ba8afdb640adf17b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 12 Jun 2023 09:54:30 -0600
Subject: [PATCH 2274/2704] feat!: drop modules, general refactor and cleanup

---
 .github/workflows/lint.yml                    |    4 +-
 .github/workflows/test-queries.yml            |    2 +-
 .stylua.toml                                  |    6 +-
 CONTRIBUTING.md                               |   27 +-
 Makefile                                      |    7 -
 README.md                                     |  754 +--
 SUPPORTED_LANGUAGES.md                        |  305 +
 TODO.md                                       |   34 +
 assets/logo.png                               |  Bin 26664 -> 0 bytes
 autoload/nvim_treesitter.vim                  |   27 -
 doc/nvim-treesitter.txt                       |  492 +-
 lua/nvim-treesitter.lua                       |   22 -
 lua/nvim-treesitter/caching.lua               |   71 -
 lua/nvim-treesitter/compat.lua                |   39 -
 lua/nvim-treesitter/config.lua                |  144 +
 lua/nvim-treesitter/configs.lua               |  616 --
 lua/nvim-treesitter/fold.lua                  |  123 -
 lua/nvim-treesitter/health.lua                |  201 +-
 lua/nvim-treesitter/highlight.lua             |   49 -
 lua/nvim-treesitter/incremental_selection.lua |  176 -
 lua/nvim-treesitter/indent.lua                |  121 +-
 lua/nvim-treesitter/info.lua                  |  190 -
 lua/nvim-treesitter/init.lua                  |   11 +
 lua/nvim-treesitter/install.lua               |  902 ++-
 lua/nvim-treesitter/locals.lua                |  125 +-
 lua/nvim-treesitter/parsers.lua               | 5398 ++++++++---------
 lua/nvim-treesitter/query.lua                 |  304 +-
 lua/nvim-treesitter/query_predicates.lua      |  167 -
 lua/nvim-treesitter/shell_cmds.lua            |  255 +
 .../shell_command_selectors.lua               |  368 --
 lua/nvim-treesitter/statusline.lua            |   53 -
 lua/nvim-treesitter/ts_utils.lua              |  482 --
 lua/nvim-treesitter/tsrange.lua               |  154 -
 lua/nvim-treesitter/utils.lua                 |  235 +-
 parser-info/.gitignore                        |    2 -
 parser/.gitignore                             |    2 -
 plugin/filetypes.lua                          |   66 +
 plugin/nvim-treesitter.lua                    |  102 +-
 plugin/query_predicates.lua                   |  141 +
 {queries => runtime/queries}/ada/folds.scm    |    0
 .../queries}/ada/highlights.scm               |    0
 .../queries/ada}/injections.scm               |    0
 {queries => runtime/queries}/ada/locals.scm   |    0
 {queries => runtime/queries}/agda/folds.scm   |    0
 .../queries}/agda/highlights.scm              |    0
 .../queries/agda}/injections.scm              |    0
 .../queries}/angular/folds.scm                |    0
 .../queries}/angular/highlights.scm           |    0
 .../queries}/angular/indents.scm              |    0
 .../queries}/angular/injections.scm           |    0
 .../queries}/angular/locals.scm               |    0
 {queries => runtime/queries}/apex/folds.scm   |    0
 .../queries}/apex/highlights.scm              |    0
 .../queries}/apex/injections.scm              |    0
 {queries => runtime/queries}/apex/locals.scm  |    0
 .../queries}/arduino/folds.scm                |    0
 .../queries}/arduino/highlights.scm           |    0
 .../queries}/arduino/indents.scm              |    0
 .../queries}/arduino/injections.scm           |    0
 .../queries}/arduino/locals.scm               |    0
 .../queries}/asm/highlights.scm               |    0
 .../queries}/asm/injections.scm               |    0
 {queries => runtime/queries}/astro/folds.scm  |    0
 .../queries}/astro/highlights.scm             |    0
 .../queries}/astro/indents.scm                |    0
 .../queries}/astro/injections.scm             |    0
 {queries => runtime/queries}/astro/locals.scm |    0
 .../queries}/authzed/highlights.scm           |    0
 .../queries/authzed}/injections.scm           |    0
 .../queries}/awk/highlights.scm               |    0
 .../queries}/awk/injections.scm               |    0
 {queries => runtime/queries}/bash/folds.scm   |    0
 .../queries}/bash/highlights.scm              |    0
 .../queries}/bash/injections.scm              |    0
 {queries => runtime/queries}/bash/locals.scm  |    0
 {queries => runtime/queries}/bass/folds.scm   |    0
 .../queries}/bass/highlights.scm              |    0
 {queries => runtime/queries}/bass/indents.scm |    0
 .../queries/bass}/injections.scm              |    0
 {queries => runtime/queries}/bass/locals.scm  |    0
 .../queries}/beancount/folds.scm              |    0
 .../queries}/beancount/highlights.scm         |    0
 .../queries/beancount}/injections.scm         |    0
 {queries => runtime/queries}/bibtex/folds.scm |    0
 .../queries}/bibtex/highlights.scm            |    0
 .../queries}/bibtex/indents.scm               |    0
 .../queries}/bibtex/injections.scm            |    0
 {queries => runtime/queries}/bicep/folds.scm  |    0
 .../queries}/bicep/highlights.scm             |    0
 .../queries}/bicep/indents.scm                |    0
 .../queries}/bicep/injections.scm             |    0
 {queries => runtime/queries}/bicep/locals.scm |    0
 .../queries}/bitbake/folds.scm                |    0
 .../queries}/bitbake/highlights.scm           |    0
 .../queries}/bitbake/indents.scm              |    0
 .../queries}/bitbake/injections.scm           |    0
 .../queries}/bitbake/locals.scm               |    0
 {queries => runtime/queries}/blade/folds.scm  |    0
 .../queries}/blade/highlights.scm             |    0
 .../queries}/blade/indents.scm                |    0
 .../queries}/blade/injections.scm             |    0
 .../queries}/blueprint/highlights.scm         |    0
 .../queries/blueprint}/injections.scm         |    0
 {queries => runtime/queries}/bp/folds.scm     |    0
 .../queries}/bp/highlights.scm                |    0
 {queries => runtime/queries}/bp/indents.scm   |    0
 .../queries/bp}/injections.scm                |    0
 {queries => runtime/queries}/bp/locals.scm    |    0
 .../queries}/brightscript/folds.scm           |    0
 .../queries}/brightscript/highlights.scm      |    0
 .../queries}/brightscript/indents.scm         |    0
 .../queries/brightscript}/injections.scm      |    0
 {queries => runtime/queries}/c/folds.scm      |    0
 {queries => runtime/queries}/c/highlights.scm |    0
 {queries => runtime/queries}/c/indents.scm    |    0
 {queries => runtime/queries}/c/injections.scm |    0
 {queries => runtime/queries}/c/locals.scm     |    0
 .../queries}/c_sharp/folds.scm                |    0
 .../queries}/c_sharp/highlights.scm           |    0
 .../queries/c_sharp}/injections.scm           |    0
 .../queries}/c_sharp/locals.scm               |    0
 {queries => runtime/queries}/caddy/folds.scm  |    0
 .../queries}/caddy/highlights.scm             |    0
 .../queries}/caddy/indents.scm                |    0
 .../queries/caddy}/injections.scm             |    0
 {queries => runtime/queries}/cairo/folds.scm  |    0
 .../queries}/cairo/highlights.scm             |    0
 .../queries}/cairo/indents.scm                |    0
 .../queries}/cairo/injections.scm             |    0
 {queries => runtime/queries}/cairo/locals.scm |    0
 {queries => runtime/queries}/capnp/folds.scm  |    0
 .../queries}/capnp/highlights.scm             |    0
 .../queries}/capnp/indents.scm                |    0
 .../queries/capnp}/injections.scm             |    0
 {queries => runtime/queries}/capnp/locals.scm |    0
 .../queries}/chatito/folds.scm                |    0
 .../queries}/chatito/highlights.scm           |    0
 .../queries}/chatito/indents.scm              |    0
 .../queries/chatito}/injections.scm           |    0
 .../queries}/chatito/locals.scm               |    0
 {queries => runtime/queries}/circom/folds.scm |    0
 .../queries}/circom/highlights.scm            |    0
 .../queries/circom}/injections.scm            |    0
 .../queries}/circom/locals.scm                |    0
 .../queries}/clojure/folds.scm                |    0
 .../queries}/clojure/highlights.scm           |    0
 .../queries/clojure}/injections.scm           |    0
 .../queries}/clojure/locals.scm               |    0
 {queries => runtime/queries}/cmake/folds.scm  |    0
 .../queries}/cmake/highlights.scm             |    0
 .../queries}/cmake/indents.scm                |    0
 .../queries}/cmake/injections.scm             |    0
 .../queries}/comment/highlights.scm           |    0
 .../queries}/commonlisp/folds.scm             |    0
 .../queries}/commonlisp/highlights.scm        |    0
 .../queries}/commonlisp/injections.scm        |    0
 .../queries}/commonlisp/locals.scm            |    0
 .../queries}/cooklang/highlights.scm          |    0
 .../queries/cooklang}/injections.scm          |    0
 {queries => runtime/queries}/corn/folds.scm   |    0
 .../queries}/corn/highlights.scm              |    0
 {queries => runtime/queries}/corn/indents.scm |    0
 .../queries/corn}/injections.scm              |    0
 {queries => runtime/queries}/corn/locals.scm  |    0
 {queries => runtime/queries}/cpon/folds.scm   |    0
 .../queries}/cpon/highlights.scm              |    0
 {queries => runtime/queries}/cpon/indents.scm |    0
 .../queries/cpon}/injections.scm              |    0
 {queries => runtime/queries}/cpon/locals.scm  |    0
 {queries => runtime/queries}/cpp/folds.scm    |    0
 .../queries}/cpp/highlights.scm               |    0
 {queries => runtime/queries}/cpp/indents.scm  |    0
 .../queries}/cpp/injections.scm               |    2 -
 {queries => runtime/queries}/cpp/locals.scm   |    0
 {queries => runtime/queries}/css/folds.scm    |    0
 .../queries}/css/highlights.scm               |    0
 {queries => runtime/queries}/css/indents.scm  |    0
 .../queries/css}/injections.scm               |    0
 .../queries}/csv/highlights.scm               |    0
 {queries => runtime/queries}/cuda/folds.scm   |    0
 .../queries}/cuda/highlights.scm              |    0
 {queries => runtime/queries}/cuda/indents.scm |    0
 .../queries}/cuda/injections.scm              |    0
 {queries => runtime/queries}/cuda/locals.scm  |    0
 {queries => runtime/queries}/cue/folds.scm    |    0
 .../queries}/cue/highlights.scm               |    0
 {queries => runtime/queries}/cue/indents.scm  |    0
 .../queries/cue}/injections.scm               |    0
 {queries => runtime/queries}/cue/locals.scm   |    0
 {queries => runtime/queries}/cylc/folds.scm   |    0
 .../queries}/cylc/highlights.scm              |    0
 {queries => runtime/queries}/cylc/indents.scm |    0
 .../queries}/cylc/injections.scm              |    0
 {queries => runtime/queries}/d/folds.scm      |    0
 {queries => runtime/queries}/d/highlights.scm |    0
 {queries => runtime/queries}/d/indents.scm    |    0
 {queries => runtime/queries}/d/injections.scm |    0
 {queries => runtime/queries}/d/locals.scm     |    0
 {queries => runtime/queries}/dart/folds.scm   |    0
 .../queries}/dart/highlights.scm              |    0
 {queries => runtime/queries}/dart/indents.scm |    0
 .../queries/dart}/injections.scm              |    0
 {queries => runtime/queries}/dart/locals.scm  |    0
 .../queries}/desktop/folds.scm                |    0
 .../queries}/desktop/highlights.scm           |    0
 .../queries}/desktop/injections.scm           |    0
 .../queries}/devicetree/folds.scm             |    0
 .../queries}/devicetree/highlights.scm        |    0
 .../queries}/devicetree/indents.scm           |    0
 .../queries/devicetree}/injections.scm        |    0
 .../queries}/devicetree/locals.scm            |    0
 {queries => runtime/queries}/dhall/folds.scm  |    0
 .../queries}/dhall/highlights.scm             |    0
 .../queries}/dhall/injections.scm             |    0
 {queries => runtime/queries}/diff/folds.scm   |    0
 .../queries}/diff/highlights.scm              |    0
 .../queries/diff}/injections.scm              |    0
 .../queries}/disassembly/highlights.scm       |    0
 .../queries}/disassembly/injections.scm       |    0
 {queries => runtime/queries}/djot/folds.scm   |    0
 .../queries}/djot/highlights.scm              |    0
 {queries => runtime/queries}/djot/indents.scm |    0
 .../queries}/djot/injections.scm              |    0
 {queries => runtime/queries}/djot/locals.scm  |    0
 .../queries}/dockerfile/highlights.scm        |    0
 .../queries}/dockerfile/injections.scm        |    0
 .../queries}/dot/highlights.scm               |    0
 {queries => runtime/queries}/dot/indents.scm  |    0
 .../queries}/dot/injections.scm               |    0
 .../queries}/doxygen/highlights.scm           |    0
 .../queries}/doxygen/indents.scm              |    0
 .../queries}/doxygen/injections.scm           |    0
 {queries => runtime/queries}/dtd/folds.scm    |    0
 .../queries}/dtd/highlights.scm               |    0
 .../queries}/dtd/injections.scm               |    0
 {queries => runtime/queries}/dtd/locals.scm   |    0
 .../queries}/earthfile/highlights.scm         |    0
 .../queries}/earthfile/injections.scm         |    0
 .../queries}/ebnf/highlights.scm              |    0
 .../queries/ebnf}/injections.scm              |    0
 {queries => runtime/queries}/ecma/folds.scm   |    0
 .../queries}/ecma/highlights.scm              |    0
 {queries => runtime/queries}/ecma/indents.scm |    0
 .../queries}/ecma/injections.scm              |    0
 {queries => runtime/queries}/ecma/locals.scm  |    0
 .../queries}/editorconfig/folds.scm           |    0
 .../queries}/editorconfig/highlights.scm      |    0
 .../queries/editorconfig}/injections.scm      |    0
 {queries => runtime/queries}/eds/folds.scm    |    0
 .../queries}/eds/highlights.scm               |    0
 .../queries}/eex/highlights.scm               |    0
 .../queries}/eex/injections.scm               |    0
 {queries => runtime/queries}/elixir/folds.scm |    0
 .../queries}/elixir/highlights.scm            |    0
 .../queries}/elixir/indents.scm               |    0
 .../queries}/elixir/injections.scm            |    0
 .../queries}/elixir/locals.scm                |    0
 {queries => runtime/queries}/elm/folds.scm    |    0
 .../queries}/elm/highlights.scm               |    0
 .../queries}/elm/injections.scm               |    0
 {queries => runtime/queries}/elsa/folds.scm   |    0
 .../queries}/elsa/highlights.scm              |    0
 {queries => runtime/queries}/elsa/indents.scm |    0
 .../queries/elsa}/injections.scm              |    0
 {queries => runtime/queries}/elsa/locals.scm  |    0
 .../queries}/elvish/highlights.scm            |    0
 .../queries/elvish}/injections.scm            |    0
 .../queries}/embedded_template/highlights.scm |    0
 .../queries}/embedded_template/injections.scm |    0
 .../queries}/enforce/folds.scm                |    0
 .../queries}/enforce/highlights.scm           |    0
 .../queries}/enforce/indents.scm              |    0
 .../queries}/enforce/injections.scm           |    0
 .../queries}/enforce/locals.scm               |    0
 {queries => runtime/queries}/erlang/folds.scm |    0
 .../queries}/erlang/highlights.scm            |    0
 .../queries/erlang}/injections.scm            |    0
 .../queries}/facility/folds.scm               |    0
 .../queries}/facility/highlights.scm          |    0
 .../queries}/facility/indents.scm             |    0
 .../queries}/facility/injections.scm          |    0
 .../queries}/faust/highlights.scm             |    0
 .../queries/faust}/injections.scm             |    0
 {queries => runtime/queries}/fennel/folds.scm |    0
 .../queries}/fennel/highlights.scm            |    0
 .../queries}/fennel/injections.scm            |    0
 .../queries}/fennel/locals.scm                |    0
 {queries => runtime/queries}/fidl/folds.scm   |    0
 .../queries}/fidl/highlights.scm              |    0
 .../queries/fidl}/injections.scm              |    0
 {queries => runtime/queries}/firrtl/folds.scm |    0
 .../queries}/firrtl/highlights.scm            |    0
 .../queries}/firrtl/indents.scm               |    0
 .../queries/firrtl}/injections.scm            |    0
 .../queries}/firrtl/locals.scm                |    0
 {queries => runtime/queries}/fish/folds.scm   |    0
 .../queries}/fish/highlights.scm              |    0
 {queries => runtime/queries}/fish/indents.scm |    0
 .../queries/fish}/injections.scm              |    0
 {queries => runtime/queries}/fish/locals.scm  |    0
 {queries => runtime/queries}/foam/folds.scm   |    0
 .../queries}/foam/highlights.scm              |    0
 {queries => runtime/queries}/foam/indents.scm |    0
 .../queries}/foam/injections.scm              |    0
 {queries => runtime/queries}/foam/locals.scm  |    0
 {queries => runtime/queries}/forth/folds.scm  |    0
 .../queries}/forth/highlights.scm             |    0
 .../queries}/forth/indents.scm                |    0
 .../queries/forth}/injections.scm             |    0
 {queries => runtime/queries}/forth/locals.scm |    0
 .../queries}/fortran/folds.scm                |    0
 .../queries}/fortran/highlights.scm           |    0
 .../queries}/fortran/indents.scm              |    0
 .../queries/fortran}/injections.scm           |    0
 .../queries}/fsh/highlights.scm               |    0
 .../queries}/fsh/injections.scm               |    0
 .../queries}/fsharp/highlights.scm            |    0
 .../queries}/fsharp/injections.scm            |    0
 .../queries}/func/highlights.scm              |    0
 .../queries/func}/injections.scm              |    0
 {queries => runtime/queries}/fusion/folds.scm |    0
 .../queries}/fusion/highlights.scm            |    0
 .../queries}/fusion/indents.scm               |    0
 .../queries}/fusion/injections.scm            |    0
 .../queries}/fusion/locals.scm                |    0
 {queries => runtime/queries}/gap/folds.scm    |    0
 .../queries}/gap/highlights.scm               |    0
 .../queries/gap}/injections.scm               |    0
 {queries => runtime/queries}/gap/locals.scm   |    0
 {queries => runtime/queries}/gaptst/folds.scm |    0
 .../queries}/gaptst/highlights.scm            |    0
 .../queries}/gaptst/injections.scm            |    0
 .../queries}/gdscript/folds.scm               |    0
 .../queries}/gdscript/highlights.scm          |    0
 .../queries}/gdscript/indents.scm             |    0
 .../queries/gdscript}/injections.scm          |    0
 .../queries}/gdscript/locals.scm              |    0
 .../queries}/gdshader/highlights.scm          |    0
 .../queries/gdshader}/injections.scm          |    0
 .../queries}/git_config/folds.scm             |    0
 .../queries}/git_config/highlights.scm        |    0
 .../queries}/git_config/injections.scm        |    0
 .../queries}/git_rebase/highlights.scm        |    0
 .../queries}/git_rebase/injections.scm        |    0
 .../queries}/gitattributes/highlights.scm     |    0
 .../queries/gitattributes}/injections.scm     |    0
 .../queries}/gitattributes/locals.scm         |    0
 .../queries}/gitcommit/highlights.scm         |    0
 .../queries}/gitcommit/injections.scm         |    0
 .../queries}/gitignore/highlights.scm         |    0
 .../queries/gitignore}/injections.scm         |    0
 {queries => runtime/queries}/gleam/folds.scm  |    0
 .../queries}/gleam/highlights.scm             |    0
 .../queries}/gleam/indents.scm                |    0
 .../queries}/gleam/injections.scm             |    0
 {queries => runtime/queries}/gleam/locals.scm |    0
 .../queries}/glimmer/folds.scm                |    0
 .../queries}/glimmer/highlights.scm           |    0
 .../queries}/glimmer/indents.scm              |    0
 .../queries}/glimmer/injections.scm           |    0
 .../queries}/glimmer/locals.scm               |    0
 .../glimmer_javascript/highlights.scm         |    0
 .../queries}/glimmer_javascript/indents.scm   |    0
 .../glimmer_javascript/injections.scm         |    0
 .../queries}/glimmer_javascript/locals.scm    |    0
 .../glimmer_typescript/highlights.scm         |    0
 .../queries}/glimmer_typescript/indents.scm   |    0
 .../glimmer_typescript/injections.scm         |    0
 {queries => runtime/queries}/glsl/folds.scm   |    0
 .../queries}/glsl/highlights.scm              |    0
 {queries => runtime/queries}/glsl/indents.scm |    0
 .../queries}/glsl/injections.scm              |    0
 {queries => runtime/queries}/glsl/locals.scm  |    0
 {queries => runtime/queries}/gn/folds.scm     |    0
 .../queries}/gn/highlights.scm                |    0
 {queries => runtime/queries}/gn/indents.scm   |    0
 .../queries/gn}/injections.scm                |    0
 {queries => runtime/queries}/gn/locals.scm    |    0
 .../queries}/gnuplot/highlights.scm           |    0
 .../queries/gnuplot}/injections.scm           |    0
 {queries => runtime/queries}/go/folds.scm     |    0
 .../queries}/go/highlights.scm                |    0
 {queries => runtime/queries}/go/indents.scm   |    0
 .../queries}/go/injections.scm                |    0
 {queries => runtime/queries}/go/locals.scm    |    0
 {queries => runtime/queries}/goctl/folds.scm  |    0
 .../queries}/goctl/highlights.scm             |    0
 .../queries}/goctl/indents.scm                |    0
 .../queries}/goctl/injections.scm             |    0
 .../queries}/godot_resource/folds.scm         |    0
 .../queries}/godot_resource/highlights.scm    |    0
 .../queries/godot_resource}/injections.scm    |    0
 .../queries}/godot_resource/locals.scm        |    0
 .../queries}/gomod/highlights.scm             |    0
 .../queries/gomod}/injections.scm             |    0
 .../queries}/gosum/highlights.scm             |    0
 {queries => runtime/queries}/gotmpl/folds.scm |    0
 .../queries}/gotmpl/highlights.scm            |    0
 .../queries}/gotmpl/injections.scm            |    0
 .../queries}/gotmpl/locals.scm                |    0
 .../queries}/gowork/highlights.scm            |    0
 .../queries/gowork}/injections.scm            |    0
 .../queries}/gpg/highlights.scm               |    0
 .../queries/gpg}/injections.scm               |    0
 .../queries}/graphql/highlights.scm           |    0
 .../queries}/graphql/indents.scm              |    0
 .../queries/graphql}/injections.scm           |    0
 .../queries}/gren/highlights.scm              |    0
 .../queries}/gren/injections.scm              |    0
 {queries => runtime/queries}/groovy/folds.scm |    0
 .../queries}/groovy/highlights.scm            |    0
 .../queries}/groovy/indents.scm               |    0
 .../queries}/groovy/injections.scm            |    0
 .../queries}/groovy/locals.scm                |    0
 .../queries}/gstlaunch/highlights.scm         |    0
 .../queries}/hack/highlights.scm              |    0
 .../queries}/hack/injections.scm              |    0
 {queries => runtime/queries}/hare/folds.scm   |    0
 .../queries}/hare/highlights.scm              |    0
 {queries => runtime/queries}/hare/indents.scm |    0
 .../queries}/hare/injections.scm              |    0
 {queries => runtime/queries}/hare/locals.scm  |    0
 .../queries}/haskell/folds.scm                |    0
 .../queries}/haskell/highlights.scm           |    0
 .../queries}/haskell/injections.scm           |    0
 .../queries}/haskell/locals.scm               |    0
 .../queries}/haskell_persistent/folds.scm     |    0
 .../haskell_persistent/highlights.scm         |    0
 {queries => runtime/queries}/hcl/folds.scm    |    0
 .../queries}/hcl/highlights.scm               |    0
 {queries => runtime/queries}/hcl/indents.scm  |    0
 .../queries}/hcl/injections.scm               |    0
 {queries => runtime/queries}/heex/folds.scm   |    0
 .../queries}/heex/highlights.scm              |    0
 {queries => runtime/queries}/heex/indents.scm |    0
 .../queries}/heex/injections.scm              |    0
 {queries => runtime/queries}/heex/locals.scm  |    0
 {queries => runtime/queries}/helm/folds.scm   |    0
 .../queries}/helm/highlights.scm              |    0
 .../queries}/helm/injections.scm              |    0
 {queries => runtime/queries}/helm/locals.scm  |    0
 {queries => runtime/queries}/hjson/folds.scm  |    0
 .../queries}/hjson/highlights.scm             |    0
 .../queries}/hjson/indents.scm                |    0
 .../queries/hjson}/injections.scm             |    0
 {queries => runtime/queries}/hjson/locals.scm |    0
 {queries => runtime/queries}/hlsl/folds.scm   |    0
 .../queries}/hlsl/highlights.scm              |    0
 {queries => runtime/queries}/hlsl/indents.scm |    0
 .../queries}/hlsl/injections.scm              |    0
 {queries => runtime/queries}/hlsl/locals.scm  |    0
 .../queries}/hlsplaylist/highlights.scm       |    0
 .../queries/hlsplaylist}/injections.scm       |    0
 {queries => runtime/queries}/hocon/folds.scm  |    0
 .../queries}/hocon/highlights.scm             |    0
 .../queries/hocon}/injections.scm             |    0
 {queries => runtime/queries}/hoon/folds.scm   |    0
 .../queries}/hoon/highlights.scm              |    0
 .../queries}/hoon/injections.scm              |    0
 {queries => runtime/queries}/hoon/locals.scm  |    0
 {queries => runtime/queries}/html/folds.scm   |    0
 .../queries}/html/highlights.scm              |    0
 {queries => runtime/queries}/html/indents.scm |    0
 .../queries}/html/injections.scm              |    0
 {queries => runtime/queries}/html/locals.scm  |    0
 .../queries}/html_tags/highlights.scm         |    0
 .../queries}/html_tags/indents.scm            |    0
 .../queries}/html_tags/injections.scm         |    0
 .../queries}/htmldjango/folds.scm             |    0
 .../queries}/htmldjango/highlights.scm        |    0
 .../queries}/htmldjango/indents.scm           |    0
 .../queries}/htmldjango/injections.scm        |    0
 {queries => runtime/queries}/http/folds.scm   |    0
 .../queries}/http/highlights.scm              |    0
 .../queries}/http/injections.scm              |    0
 {queries => runtime/queries}/hurl/folds.scm   |    0
 .../queries}/hurl/highlights.scm              |    0
 {queries => runtime/queries}/hurl/indents.scm |    0
 .../queries}/hurl/injections.scm              |    0
 .../queries}/hyprlang/folds.scm               |    0
 .../queries}/hyprlang/highlights.scm          |    0
 .../queries}/hyprlang/indents.scm             |    0
 .../queries}/hyprlang/injections.scm          |    0
 .../queries}/idl/highlights.scm               |    0
 {queries => runtime/queries}/idl/indents.scm  |    0
 .../queries}/idl/injections.scm               |    0
 {queries => runtime/queries}/idris/folds.scm  |    0
 .../queries}/idris/highlights.scm             |    0
 .../queries/idris}/injections.scm             |    0
 {queries => runtime/queries}/idris/locals.scm |    0
 {queries => runtime/queries}/ini/folds.scm    |    0
 .../queries}/ini/highlights.scm               |    0
 .../queries}/ini/injections.scm               |    0
 {queries => runtime/queries}/inko/folds.scm   |    0
 .../queries}/inko/highlights.scm              |    0
 {queries => runtime/queries}/inko/indents.scm |    0
 .../queries}/inko/injections.scm              |    0
 {queries => runtime/queries}/inko/locals.scm  |    0
 {queries => runtime/queries}/ipkg/folds.scm   |    0
 .../queries}/ipkg/highlights.scm              |    0
 {queries => runtime/queries}/ipkg/indents.scm |    0
 .../queries}/ipkg/injections.scm              |    0
 {queries => runtime/queries}/ipkg/locals.scm  |    0
 {queries => runtime/queries}/ispc/folds.scm   |    0
 .../queries}/ispc/highlights.scm              |    0
 {queries => runtime/queries}/ispc/indents.scm |    0
 .../queries}/ispc/injections.scm              |    0
 {queries => runtime/queries}/ispc/locals.scm  |    0
 .../queries}/janet_simple/folds.scm           |    0
 .../queries}/janet_simple/highlights.scm      |    0
 .../queries/janet_simple}/injections.scm      |    0
 .../queries}/janet_simple/locals.scm          |    0
 {queries => runtime/queries}/java/folds.scm   |    0
 .../queries}/java/highlights.scm              |    0
 {queries => runtime/queries}/java/indents.scm |    0
 .../queries}/java/injections.scm              |    0
 {queries => runtime/queries}/java/locals.scm  |    0
 .../queries}/javadoc/highlights.scm           |    0
 .../queries}/javadoc/indents.scm              |    0
 .../queries}/javadoc/injections.scm           |    0
 .../queries}/javascript/folds.scm             |    0
 .../queries}/javascript/highlights.scm        |    0
 .../queries}/javascript/indents.scm           |    0
 .../queries}/javascript/injections.scm        |    0
 .../queries}/javascript/locals.scm            |    0
 .../queries}/jinja/highlights.scm             |    0
 .../queries}/jinja/injections.scm             |    0
 .../queries}/jinja_inline/highlights.scm      |    0
 .../queries/jinja_inline}/injections.scm      |    0
 .../queries}/jq/highlights.scm                |    0
 .../queries}/jq/injections.scm                |    0
 {queries => runtime/queries}/jq/locals.scm    |    0
 .../queries}/jsdoc/highlights.scm             |    0
 {queries => runtime/queries}/json/folds.scm   |    0
 .../queries}/json/highlights.scm              |    0
 {queries => runtime/queries}/json/indents.scm |    0
 {queries => runtime/queries}/json/locals.scm  |    0
 .../queries}/json5/highlights.scm             |    0
 .../queries/json5}/injections.scm             |    0
 {queries => runtime/queries}/jsonc/folds.scm  |    0
 .../queries}/jsonc/highlights.scm             |    0
 .../queries}/jsonc/indents.scm                |    0
 .../queries/jsonc}/injections.scm             |    0
 {queries => runtime/queries}/jsonc/locals.scm |    0
 .../queries}/jsonnet/folds.scm                |    0
 .../queries}/jsonnet/highlights.scm           |    0
 .../queries/jsonnet}/injections.scm           |    0
 .../queries}/jsonnet/locals.scm               |    0
 {queries => runtime/queries}/jsx/folds.scm    |    0
 .../queries}/jsx/highlights.scm               |    0
 {queries => runtime/queries}/jsx/indents.scm  |    0
 .../queries}/jsx/injections.scm               |    0
 {queries => runtime/queries}/julia/folds.scm  |    0
 .../queries}/julia/highlights.scm             |    0
 .../queries}/julia/indents.scm                |    0
 .../queries}/julia/injections.scm             |    0
 {queries => runtime/queries}/julia/locals.scm |    0
 {queries => runtime/queries}/just/folds.scm   |    0
 .../queries}/just/highlights.scm              |    0
 {queries => runtime/queries}/just/indents.scm |    0
 .../queries}/just/injections.scm              |    0
 {queries => runtime/queries}/just/locals.scm  |    0
 {queries => runtime/queries}/kcl/folds.scm    |    0
 .../queries}/kcl/highlights.scm               |    0
 .../queries}/kcl/injections.scm               |    0
 .../queries}/kconfig/folds.scm                |    0
 .../queries}/kconfig/highlights.scm           |    0
 .../queries}/kconfig/indents.scm              |    0
 .../queries/kconfig}/injections.scm           |    0
 .../queries}/kconfig/locals.scm               |    0
 {queries => runtime/queries}/kdl/folds.scm    |    0
 .../queries}/kdl/highlights.scm               |    0
 {queries => runtime/queries}/kdl/indents.scm  |    0
 .../queries}/kdl/injections.scm               |    0
 {queries => runtime/queries}/kdl/locals.scm   |    0
 {queries => runtime/queries}/kotlin/folds.scm |    0
 .../queries}/kotlin/highlights.scm            |    0
 .../queries}/kotlin/injections.scm            |    0
 .../queries}/kotlin/locals.scm                |    0
 {queries => runtime/queries}/koto/folds.scm   |    0
 .../queries}/koto/highlights.scm              |    0
 .../queries/koto}/injections.scm              |    0
 {queries => runtime/queries}/koto/locals.scm  |    0
 .../queries}/kusto/highlights.scm             |    0
 .../queries/kusto}/injections.scm             |    0
 .../queries}/lalrpop/folds.scm                |    0
 .../queries}/lalrpop/highlights.scm           |    0
 .../queries}/lalrpop/injections.scm           |    0
 .../queries}/lalrpop/locals.scm               |    0
 {queries => runtime/queries}/latex/folds.scm  |    0
 .../queries}/latex/highlights.scm             |    0
 .../queries}/latex/injections.scm             |    0
 {queries => runtime/queries}/ledger/folds.scm |    0
 .../queries}/ledger/highlights.scm            |    0
 .../queries}/ledger/indents.scm               |    0
 .../queries}/ledger/injections.scm            |    0
 .../queries}/leo/highlights.scm               |    0
 {queries => runtime/queries}/leo/indents.scm  |    0
 .../queries/leo}/injections.scm               |    0
 .../queries}/linkerscript/folds.scm           |    0
 .../queries}/linkerscript/highlights.scm      |    0
 .../queries}/linkerscript/indents.scm         |    0
 .../queries}/linkerscript/injections.scm      |    0
 .../queries}/linkerscript/locals.scm          |    0
 .../queries}/liquid/highlights.scm            |    0
 .../queries}/liquid/injections.scm            |    0
 .../queries}/liquidsoap/folds.scm             |    0
 .../queries}/liquidsoap/highlights.scm        |    0
 .../queries}/liquidsoap/indents.scm           |    0
 .../queries/liquidsoap}/injections.scm        |    0
 .../queries}/liquidsoap/locals.scm            |    0
 .../queries}/llvm/highlights.scm              |    0
 .../queries/llvm}/injections.scm              |    0
 {queries => runtime/queries}/lua/folds.scm    |    0
 .../queries}/lua/highlights.scm               |    0
 {queries => runtime/queries}/lua/indents.scm  |    0
 .../queries}/lua/injections.scm               |    0
 {queries => runtime/queries}/lua/locals.scm   |    0
 .../queries}/luadoc/highlights.scm            |    0
 .../queries}/luap/highlights.scm              |    0
 {queries => runtime/queries}/luau/folds.scm   |    0
 .../queries}/luau/highlights.scm              |    0
 {queries => runtime/queries}/luau/indents.scm |    0
 .../queries}/luau/injections.scm              |    0
 {queries => runtime/queries}/luau/locals.scm  |    0
 {queries => runtime/queries}/m68k/folds.scm   |    0
 .../queries}/m68k/highlights.scm              |    0
 .../queries/m68k}/injections.scm              |    0
 {queries => runtime/queries}/m68k/locals.scm  |    0
 {queries => runtime/queries}/make/folds.scm   |    0
 .../queries}/make/highlights.scm              |    0
 .../queries}/make/injections.scm              |    0
 .../queries}/markdown/folds.scm               |    0
 .../queries}/markdown/highlights.scm          |    0
 .../queries}/markdown/indents.scm             |    0
 .../queries}/markdown/injections.scm          |    0
 .../queries}/markdown_inline/highlights.scm   |    0
 .../queries}/markdown_inline/injections.scm   |    0
 {queries => runtime/queries}/matlab/folds.scm |    0
 .../queries}/matlab/highlights.scm            |    0
 .../queries}/matlab/indents.scm               |    0
 .../queries/matlab}/injections.scm            |    0
 .../queries}/matlab/locals.scm                |    0
 .../queries}/menhir/highlights.scm            |    0
 .../queries}/menhir/injections.scm            |    0
 .../queries}/mermaid/folds.scm                |    0
 .../queries}/mermaid/highlights.scm           |    0
 .../queries}/mermaid/indents.scm              |    0
 .../queries/mermaid}/injections.scm           |    0
 {queries => runtime/queries}/meson/folds.scm  |    0
 .../queries}/meson/highlights.scm             |    0
 .../queries}/meson/indents.scm                |    0
 .../queries/meson}/injections.scm             |    0
 .../queries}/mlir/highlights.scm              |    0
 .../queries/mlir}/injections.scm              |    0
 {queries => runtime/queries}/mlir/locals.scm  |    0
 .../queries}/muttrc/highlights.scm            |    0
 .../queries}/muttrc/injections.scm            |    0
 .../queries}/nasm/highlights.scm              |    0
 .../queries/nasm}/injections.scm              |    0
 {queries => runtime/queries}/nginx/folds.scm  |    0
 .../queries}/nginx/highlights.scm             |    0
 .../queries/nginx}/injections.scm             |    0
 .../queries}/nickel/highlights.scm            |    0
 .../queries}/nickel/indents.scm               |    0
 .../queries/nickel}/injections.scm            |    0
 {queries => runtime/queries}/nim/folds.scm    |    0
 .../queries}/nim/highlights.scm               |    0
 .../queries}/nim/injections.scm               |    0
 {queries => runtime/queries}/nim/locals.scm   |    0
 .../queries}/nim_format_string/highlights.scm |    0
 .../queries}/nim_format_string/injections.scm |    0
 {queries => runtime/queries}/ninja/folds.scm  |    0
 .../queries}/ninja/highlights.scm             |    0
 .../queries}/ninja/indents.scm                |    0
 .../queries/ninja}/injections.scm             |    0
 {queries => runtime/queries}/nix/folds.scm    |    0
 .../queries}/nix/highlights.scm               |    0
 {queries => runtime/queries}/nix/indents.scm  |    0
 .../queries}/nix/injections.scm               |    0
 {queries => runtime/queries}/nix/locals.scm   |    0
 {queries => runtime/queries}/nqc/folds.scm    |    0
 .../queries}/nqc/highlights.scm               |    0
 {queries => runtime/queries}/nqc/indents.scm  |    0
 .../queries}/nqc/injections.scm               |    0
 {queries => runtime/queries}/nqc/locals.scm   |    0
 {queries => runtime/queries}/nu/folds.scm     |    0
 .../queries}/nu/highlights.scm                |    0
 {queries => runtime/queries}/nu/indents.scm   |    0
 .../queries}/nu/injections.scm                |    0
 {queries => runtime/queries}/objc/folds.scm   |    0
 .../queries}/objc/highlights.scm              |    0
 {queries => runtime/queries}/objc/indents.scm |    0
 .../queries}/objc/injections.scm              |    0
 {queries => runtime/queries}/objc/locals.scm  |    0
 .../queries}/objdump/highlights.scm           |    0
 .../queries}/objdump/injections.scm           |    0
 {queries => runtime/queries}/ocaml/folds.scm  |    0
 .../queries}/ocaml/highlights.scm             |    0
 .../queries}/ocaml/indents.scm                |    0
 .../queries/ocaml}/injections.scm             |    0
 {queries => runtime/queries}/ocaml/locals.scm |    0
 .../queries}/ocaml_interface/folds.scm        |    0
 .../queries}/ocaml_interface/highlights.scm   |    0
 .../queries}/ocaml_interface/indents.scm      |    0
 .../queries}/ocaml_interface/injections.scm   |    0
 .../queries}/ocaml_interface/locals.scm       |    0
 .../queries}/ocamllex/highlights.scm          |    0
 .../queries}/ocamllex/injections.scm          |    0
 {queries => runtime/queries}/odin/folds.scm   |    0
 .../queries}/odin/highlights.scm              |    0
 {queries => runtime/queries}/odin/indents.scm |    0
 .../queries/odin}/injections.scm              |    0
 {queries => runtime/queries}/odin/locals.scm  |    0
 {queries => runtime/queries}/pascal/folds.scm |    0
 .../queries}/pascal/highlights.scm            |    0
 .../queries}/pascal/indents.scm               |    0
 .../queries}/pascal/injections.scm            |    0
 .../queries}/pascal/locals.scm                |    0
 .../queries}/passwd/highlights.scm            |    0
 {queries => runtime/queries}/pem/folds.scm    |    0
 .../queries}/pem/highlights.scm               |    0
 .../queries/pem}/injections.scm               |    0
 {queries => runtime/queries}/perl/folds.scm   |    0
 .../queries}/perl/highlights.scm              |    0
 .../queries}/perl/injections.scm              |    0
 {queries => runtime/queries}/php/folds.scm    |    0
 .../queries}/php/highlights.scm               |    0
 {queries => runtime/queries}/php/indents.scm  |    0
 .../queries}/php/injections.scm               |    0
 {queries => runtime/queries}/php/locals.scm   |    0
 .../queries}/php_only/folds.scm               |    0
 .../queries}/php_only/highlights.scm          |    0
 .../queries}/php_only/indents.scm             |    0
 .../queries}/php_only/injections.scm          |    0
 .../queries}/php_only/locals.scm              |    0
 .../queries}/phpdoc/highlights.scm            |    0
 .../queries}/pioasm/highlights.scm            |    0
 .../queries}/pioasm/injections.scm            |    0
 {queries => runtime/queries}/po/folds.scm     |    0
 .../queries}/po/highlights.scm                |    0
 .../queries/po}/injections.scm                |    0
 .../queries}/pod/highlights.scm               |    0
 .../queries}/poe_filter/folds.scm             |    0
 .../queries}/poe_filter/highlights.scm        |    0
 .../queries}/poe_filter/indents.scm           |    0
 .../queries/poe_filter}/injections.scm        |    0
 {queries => runtime/queries}/pony/folds.scm   |    0
 .../queries}/pony/highlights.scm              |    0
 {queries => runtime/queries}/pony/indents.scm |    0
 .../queries}/pony/injections.scm              |    0
 {queries => runtime/queries}/pony/locals.scm  |    0
 .../queries}/powershell/folds.scm             |    0
 .../queries}/powershell/highlights.scm        |    0
 .../queries}/powershell/indents.scm           |    0
 .../queries}/powershell/injections.scm        |    0
 .../queries}/powershell/locals.scm            |    0
 .../queries}/printf/highlights.scm            |    0
 {queries => runtime/queries}/prisma/folds.scm |    0
 .../queries}/prisma/highlights.scm            |    0
 .../queries}/prisma/injections.scm            |    0
 .../queries}/problog/folds.scm                |    0
 .../queries}/problog/highlights.scm           |    0
 .../queries}/problog/indents.scm              |    0
 .../queries}/problog/injections.scm           |    0
 {queries => runtime/queries}/prolog/folds.scm |    0
 .../queries}/prolog/highlights.scm            |    0
 .../queries}/prolog/indents.scm               |    0
 .../queries/prolog}/injections.scm            |    0
 .../queries}/promql/highlights.scm            |    0
 .../queries}/promql/injections.scm            |    0
 .../queries}/properties/highlights.scm        |    0
 .../queries/properties}/injections.scm        |    0
 .../queries}/properties/locals.scm            |    0
 {queries => runtime/queries}/proto/folds.scm  |    0
 .../queries}/proto/highlights.scm             |    0
 .../queries}/proto/indents.scm                |    0
 .../queries/proto}/injections.scm             |    0
 .../queries}/prql/highlights.scm              |    0
 .../queries}/prql/injections.scm              |    0
 .../queries}/psv/highlights.scm               |    0
 .../queries}/pug/highlights.scm               |    0
 .../queries}/pug/injections.scm               |    0
 {queries => runtime/queries}/puppet/folds.scm |    0
 .../queries}/puppet/highlights.scm            |    0
 .../queries}/puppet/indents.scm               |    0
 .../queries}/puppet/injections.scm            |    0
 .../queries}/puppet/locals.scm                |    0
 .../queries}/purescript/highlights.scm        |    0
 .../queries/purescript}/injections.scm        |    0
 .../queries}/purescript/locals.scm            |    0
 .../queries}/pymanifest/highlights.scm        |    0
 .../queries/pymanifest}/injections.scm        |    0
 {queries => runtime/queries}/python/folds.scm |    0
 .../queries}/python/highlights.scm            |    0
 .../queries}/python/indents.scm               |    0
 .../queries}/python/injections.scm            |    0
 .../queries}/python/locals.scm                |    0
 {queries => runtime/queries}/ql/folds.scm     |    0
 .../queries}/ql/highlights.scm                |    0
 {queries => runtime/queries}/ql/indents.scm   |    0
 .../queries}/ql/injections.scm                |    0
 {queries => runtime/queries}/ql/locals.scm    |    0
 .../queries}/qmldir/highlights.scm            |    0
 .../queries/qmldir}/injections.scm            |    0
 {queries => runtime/queries}/qmljs/folds.scm  |    0
 .../queries}/qmljs/highlights.scm             |    0
 .../queries}/qmljs/injections.scm             |    0
 {queries => runtime/queries}/query/folds.scm  |    0
 .../queries}/query/highlights.scm             |    0
 .../queries}/query/indents.scm                |    0
 .../queries}/query/injections.scm             |    0
 {queries => runtime/queries}/query/locals.scm |    0
 {queries => runtime/queries}/r/highlights.scm |    0
 {queries => runtime/queries}/r/indents.scm    |    0
 .../queries/r}/injections.scm                 |    0
 {queries => runtime/queries}/r/locals.scm     |    0
 {queries => runtime/queries}/racket/folds.scm |    0
 .../queries}/racket/highlights.scm            |    0
 .../queries}/racket/injections.scm            |    0
 .../queries}/ralph/highlights.scm             |    0
 .../queries}/ralph/injections.scm             |    0
 {queries => runtime/queries}/rasi/folds.scm   |    0
 .../queries}/rasi/highlights.scm              |    0
 {queries => runtime/queries}/rasi/indents.scm |    0
 .../queries/rasi}/injections.scm              |    0
 {queries => runtime/queries}/rasi/locals.scm  |    0
 {queries => runtime/queries}/razor/folds.scm  |    0
 .../queries}/razor/highlights.scm             |    0
 .../queries}/razor/injections.scm             |    0
 {queries => runtime/queries}/rbs/folds.scm    |    0
 .../queries}/rbs/highlights.scm               |    0
 {queries => runtime/queries}/rbs/indents.scm  |    0
 .../queries/rbs}/injections.scm               |    0
 {queries => runtime/queries}/re2c/folds.scm   |    0
 .../queries}/re2c/highlights.scm              |    0
 {queries => runtime/queries}/re2c/indents.scm |    0
 .../queries}/re2c/injections.scm              |    0
 {queries => runtime/queries}/re2c/locals.scm  |    0
 .../queries}/readline/folds.scm               |    0
 .../queries}/readline/highlights.scm          |    0
 .../queries}/readline/indents.scm             |    0
 .../queries/readline}/injections.scm          |    0
 .../queries}/regex/highlights.scm             |    0
 .../queries}/rego/highlights.scm              |    0
 .../r => runtime/queries/rego}/injections.scm |    0
 .../queries}/requirements/highlights.scm      |    0
 .../queries/requirements}/injections.scm      |    0
 .../queries}/rescript/folds.scm               |    0
 .../queries}/rescript/highlights.scm          |    0
 .../queries}/rescript/indents.scm             |    0
 .../queries}/rescript/injections.scm          |    0
 .../queries}/rescript/locals.scm              |    0
 {queries => runtime/queries}/rnoweb/folds.scm |    0
 .../queries}/rnoweb/highlights.scm            |    0
 .../queries}/rnoweb/injections.scm            |    0
 {queries => runtime/queries}/robot/folds.scm  |    0
 .../queries}/robot/highlights.scm             |    0
 .../queries}/robot/indents.scm                |    0
 .../queries}/robot/injections.scm             |    0
 .../queries}/robots/highlights.scm            |    0
 .../queries/robots}/injections.scm            |    0
 .../queries}/roc/highlights.scm               |    0
 {queries => runtime/queries}/roc/indents.scm  |    0
 .../queries}/roc/injections.scm               |    0
 {queries => runtime/queries}/roc/locals.scm   |    0
 {queries => runtime/queries}/ron/folds.scm    |    0
 .../queries}/ron/highlights.scm               |    0
 {queries => runtime/queries}/ron/indents.scm  |    0
 .../queries}/ron/injections.scm               |    0
 {queries => runtime/queries}/ron/locals.scm   |    0
 .../queries}/rst/highlights.scm               |    0
 .../queries}/rst/injections.scm               |    0
 {queries => runtime/queries}/rst/locals.scm   |    0
 {queries => runtime/queries}/ruby/folds.scm   |    0
 .../queries}/ruby/highlights.scm              |    3 -
 {queries => runtime/queries}/ruby/indents.scm |    0
 .../queries}/ruby/injections.scm              |    0
 {queries => runtime/queries}/ruby/locals.scm  |    0
 .../queries}/runescript/highlights.scm        |    0
 .../queries/runescript}/injections.scm        |    0
 {queries => runtime/queries}/rust/folds.scm   |    0
 .../queries}/rust/highlights.scm              |    0
 {queries => runtime/queries}/rust/indents.scm |    0
 .../queries}/rust/injections.scm              |    0
 {queries => runtime/queries}/rust/locals.scm  |    0
 {queries => runtime/queries}/scala/folds.scm  |    0
 .../queries}/scala/highlights.scm             |    0
 .../queries/scala}/injections.scm             |    0
 {queries => runtime/queries}/scala/locals.scm |    0
 .../queries}/scfg/highlights.scm              |    0
 .../queries/scfg}/injections.scm              |    0
 {queries => runtime/queries}/scheme/folds.scm |    0
 .../queries}/scheme/highlights.scm            |    0
 .../queries/scheme}/injections.scm            |    0
 {queries => runtime/queries}/scss/folds.scm   |    0
 .../queries}/scss/highlights.scm              |    0
 {queries => runtime/queries}/scss/indents.scm |    0
 .../queries}/scss/injections.scm              |    0
 .../queries}/sflog/highlights.scm             |    0
 {queries => runtime/queries}/slang/folds.scm  |    0
 .../queries}/slang/highlights.scm             |    0
 .../queries}/slang/indents.scm                |    0
 .../queries}/slang/injections.scm             |    0
 {queries => runtime/queries}/slang/locals.scm |    0
 {queries => runtime/queries}/slim/folds.scm   |    0
 .../queries}/slim/highlights.scm              |    0
 {queries => runtime/queries}/slim/indents.scm |    0
 .../queries}/slim/injections.scm              |    0
 {queries => runtime/queries}/slim/locals.scm  |    0
 {queries => runtime/queries}/slint/folds.scm  |    0
 .../queries}/slint/highlights.scm             |    0
 .../queries}/slint/indents.scm                |    0
 .../queries/slint}/injections.scm             |    0
 {queries => runtime/queries}/slint/locals.scm |    0
 {queries => runtime/queries}/smali/folds.scm  |    0
 .../queries}/smali/highlights.scm             |    0
 .../queries}/smali/indents.scm                |    0
 .../queries/smali}/injections.scm             |    0
 {queries => runtime/queries}/smali/locals.scm |    0
 .../queries}/smithy/highlights.scm            |    0
 .../queries}/smithy/injections.scm            |    0
 .../queries}/snakemake/folds.scm              |    0
 .../queries}/snakemake/highlights.scm         |    0
 .../queries}/snakemake/indents.scm            |    0
 .../queries}/snakemake/injections.scm         |    0
 .../queries}/snakemake/locals.scm             |    0
 .../queries}/solidity/folds.scm               |    0
 .../queries}/solidity/highlights.scm          |    0
 .../queries/solidity}/injections.scm          |    0
 .../queries}/soql/highlights.scm              |    0
 .../queries}/sosl/highlights.scm              |    0
 .../queries}/sourcepawn/highlights.scm        |    0
 .../queries}/sourcepawn/injections.scm        |    0
 .../queries}/sourcepawn/locals.scm            |    0
 {queries => runtime/queries}/sparql/folds.scm |    0
 .../queries}/sparql/highlights.scm            |    0
 .../queries}/sparql/indents.scm               |    0
 .../queries}/sparql/injections.scm            |    0
 .../queries}/sparql/locals.scm                |    0
 {queries => runtime/queries}/sql/folds.scm    |    0
 .../queries}/sql/highlights.scm               |    0
 {queries => runtime/queries}/sql/indents.scm  |    0
 .../queries}/sql/injections.scm               |    0
 .../queries}/squirrel/folds.scm               |    0
 .../queries}/squirrel/highlights.scm          |    0
 .../queries}/squirrel/indents.scm             |    0
 .../queries}/squirrel/injections.scm          |    0
 .../queries}/squirrel/locals.scm              |    0
 .../queries}/ssh_config/folds.scm             |    0
 .../queries}/ssh_config/highlights.scm        |    0
 .../queries}/ssh_config/indents.scm           |    0
 .../queries}/ssh_config/injections.scm        |    0
 .../queries}/ssh_config/locals.scm            |    0
 .../queries}/starlark/folds.scm               |    0
 .../queries}/starlark/highlights.scm          |    0
 .../queries}/starlark/indents.scm             |    0
 .../queries}/starlark/injections.scm          |    0
 .../queries}/starlark/locals.scm              |    0
 .../queries}/strace/highlights.scm            |    0
 .../queries/strace}/injections.scm            |    0
 {queries => runtime/queries}/styled/folds.scm |    0
 .../queries}/styled/highlights.scm            |    0
 .../queries}/styled/indents.scm               |    0
 .../queries}/styled/injections.scm            |    0
 .../queries}/supercollider/folds.scm          |    0
 .../queries}/supercollider/highlights.scm     |    0
 .../queries}/supercollider/indents.scm        |    0
 .../queries}/supercollider/injections.scm     |    0
 .../queries}/supercollider/locals.scm         |    0
 .../queries}/superhtml/highlights.scm         |    0
 .../queries}/superhtml/injections.scm         |    0
 .../queries}/surface/folds.scm                |    0
 .../queries}/surface/highlights.scm           |    0
 .../queries}/surface/indents.scm              |    0
 .../queries}/surface/injections.scm           |    0
 {queries => runtime/queries}/svelte/folds.scm |    0
 .../queries}/svelte/highlights.scm            |    0
 .../queries}/svelte/indents.scm               |    0
 .../queries}/svelte/injections.scm            |    0
 .../queries}/svelte/locals.scm                |    0
 {queries => runtime/queries}/sway/folds.scm   |    0
 .../queries}/sway/highlights.scm              |    0
 {queries => runtime/queries}/sway/indents.scm |    0
 .../queries}/sway/injections.scm              |    0
 {queries => runtime/queries}/sway/locals.scm  |    0
 {queries => runtime/queries}/swift/folds.scm  |    0
 .../queries}/swift/highlights.scm             |    0
 .../queries}/swift/indents.scm                |    0
 .../queries}/swift/injections.scm             |    0
 {queries => runtime/queries}/swift/locals.scm |    0
 .../queries}/sxhkdrc/folds.scm                |    0
 .../queries}/sxhkdrc/highlights.scm           |    0
 .../queries}/sxhkdrc/injections.scm           |    0
 .../queries}/systemtap/folds.scm              |    0
 .../queries}/systemtap/highlights.scm         |    0
 .../queries}/systemtap/injections.scm         |    0
 .../queries}/systemtap/locals.scm             |    0
 {queries => runtime/queries}/t32/folds.scm    |    0
 .../queries}/t32/highlights.scm               |    0
 {queries => runtime/queries}/t32/indents.scm  |    0
 .../queries/t32}/injections.scm               |    0
 {queries => runtime/queries}/t32/locals.scm   |    0
 .../queries}/tablegen/folds.scm               |    0
 .../queries}/tablegen/highlights.scm          |    0
 .../queries}/tablegen/indents.scm             |    0
 .../queries}/tablegen/injections.scm          |    0
 .../queries}/tablegen/locals.scm              |    0
 {queries => runtime/queries}/tact/folds.scm   |    0
 .../queries}/tact/highlights.scm              |    0
 {queries => runtime/queries}/tact/indents.scm |    0
 .../queries/tact}/injections.scm              |    0
 {queries => runtime/queries}/tact/locals.scm  |    0
 {queries => runtime/queries}/tcl/folds.scm    |    0
 .../queries}/tcl/highlights.scm               |    0
 {queries => runtime/queries}/tcl/indents.scm  |    0
 .../queries/tcl}/injections.scm               |    0
 {queries => runtime/queries}/teal/folds.scm   |    0
 .../queries}/teal/highlights.scm              |    0
 {queries => runtime/queries}/teal/indents.scm |    0
 .../queries}/teal/injections.scm              |    0
 {queries => runtime/queries}/teal/locals.scm  |    0
 {queries => runtime/queries}/templ/folds.scm  |    0
 .../queries}/templ/highlights.scm             |    0
 .../queries}/templ/injections.scm             |    0
 .../queries}/tera/highlights.scm              |    0
 .../queries}/tera/injections.scm              |    0
 .../queries}/terraform/folds.scm              |    0
 .../queries}/terraform/highlights.scm         |    0
 .../queries}/terraform/indents.scm            |    0
 .../queries}/terraform/injections.scm         |    0
 .../queries}/textproto/folds.scm              |    0
 .../queries}/textproto/highlights.scm         |    0
 .../queries}/textproto/indents.scm            |    0
 .../queries/textproto}/injections.scm         |    0
 {queries => runtime/queries}/thrift/folds.scm |    0
 .../queries}/thrift/highlights.scm            |    0
 .../queries}/thrift/indents.scm               |    0
 .../queries/thrift}/injections.scm            |    0
 .../queries}/thrift/locals.scm                |    0
 {queries => runtime/queries}/tiger/folds.scm  |    0
 .../queries}/tiger/highlights.scm             |    0
 .../queries}/tiger/indents.scm                |    0
 .../queries}/tiger/injections.scm             |    0
 {queries => runtime/queries}/tiger/locals.scm |    0
 .../queries}/tlaplus/folds.scm                |    0
 .../queries}/tlaplus/highlights.scm           |    0
 .../queries}/tlaplus/injections.scm           |    0
 .../queries}/tlaplus/locals.scm               |    0
 .../queries}/tmux/highlights.scm              |    0
 .../queries}/tmux/injections.scm              |    0
 .../queries}/todotxt/highlights.scm           |    0
 {queries => runtime/queries}/toml/folds.scm   |    0
 .../queries}/toml/highlights.scm              |    0
 {queries => runtime/queries}/toml/indents.scm |    0
 .../queries/toml}/injections.scm              |    0
 {queries => runtime/queries}/toml/locals.scm  |    0
 .../queries}/tsv/highlights.scm               |    0
 {queries => runtime/queries}/tsx/folds.scm    |    0
 .../queries}/tsx/highlights.scm               |    0
 {queries => runtime/queries}/tsx/indents.scm  |    0
 .../queries}/tsx/injections.scm               |    0
 {queries => runtime/queries}/tsx/locals.scm   |    0
 {queries => runtime/queries}/turtle/folds.scm |    0
 .../queries}/turtle/highlights.scm            |    0
 .../queries}/turtle/indents.scm               |    0
 .../queries/turtle}/injections.scm            |    0
 .../queries}/turtle/locals.scm                |    0
 .../queries}/twig/highlights.scm              |    0
 .../queries}/twig/injections.scm              |    0
 .../queries}/typescript/folds.scm             |    0
 .../queries}/typescript/highlights.scm        |    0
 .../queries}/typescript/indents.scm           |    0
 .../queries}/typescript/injections.scm        |    0
 .../queries}/typescript/locals.scm            |    0
 .../queries}/typespec/highlights.scm          |    0
 .../queries}/typespec/indents.scm             |    0
 .../queries}/typespec/injections.scm          |    0
 .../queries}/typoscript/folds.scm             |    0
 .../queries}/typoscript/highlights.scm        |    0
 .../queries}/typoscript/indents.scm           |    0
 .../queries/typoscript}/injections.scm        |    0
 {queries => runtime/queries}/typst/folds.scm  |    0
 .../queries}/typst/highlights.scm             |    0
 .../queries}/typst/indents.scm                |    0
 .../queries/typst}/injections.scm             |    0
 .../queries}/udev/highlights.scm              |    0
 .../queries}/udev/injections.scm              |    0
 {queries => runtime/queries}/udev/locals.scm  |    0
 .../queries}/ungrammar/folds.scm              |    0
 .../queries}/ungrammar/highlights.scm         |    0
 .../queries}/ungrammar/indents.scm            |    0
 .../queries/ungrammar}/injections.scm         |    0
 .../queries}/ungrammar/locals.scm             |    0
 {queries => runtime/queries}/unison/folds.scm |    0
 .../queries}/unison/highlights.scm            |    0
 .../queries/unison}/injections.scm            |    0
 {queries => runtime/queries}/usd/folds.scm    |    0
 .../queries}/usd/highlights.scm               |    0
 {queries => runtime/queries}/usd/indents.scm  |    0
 .../queries}/usd/injections.scm               |    0
 {queries => runtime/queries}/usd/locals.scm   |    0
 {queries => runtime/queries}/uxntal/folds.scm |    0
 .../queries}/uxntal/highlights.scm            |    0
 .../queries}/uxntal/indents.scm               |    0
 .../queries}/uxntal/injections.scm            |    0
 .../queries}/uxntal/locals.scm                |    0
 {queries => runtime/queries}/v/folds.scm      |    0
 {queries => runtime/queries}/v/highlights.scm |    0
 {queries => runtime/queries}/v/indents.scm    |    0
 {queries => runtime/queries}/v/injections.scm |    0
 {queries => runtime/queries}/v/locals.scm     |    0
 {queries => runtime/queries}/vala/folds.scm   |    0
 .../queries}/vala/highlights.scm              |    0
 .../queries}/vala/injections.scm              |    0
 .../queries}/vento/highlights.scm             |    0
 .../queries}/vento/injections.scm             |    0
 .../queries}/verilog/folds.scm                |    0
 .../queries}/verilog/highlights.scm           |    0
 .../queries/verilog}/injections.scm           |    0
 {queries => runtime/queries}/vhdl/folds.scm   |    0
 .../queries}/vhdl/highlights.scm              |    0
 .../queries}/vhdl/injections.scm              |    0
 .../queries}/vhs/highlights.scm               |    0
 .../queries/vhs}/injections.scm               |    0
 {queries => runtime/queries}/vim/folds.scm    |    0
 .../queries}/vim/highlights.scm               |    0
 .../queries}/vim/injections.scm               |    0
 {queries => runtime/queries}/vim/locals.scm   |    0
 .../queries}/vimdoc/highlights.scm            |    0
 .../queries}/vimdoc/injections.scm            |    0
 {queries => runtime/queries}/vrl/folds.scm    |    0
 .../queries}/vrl/highlights.scm               |    0
 {queries => runtime/queries}/vrl/indents.scm  |    0
 .../queries}/vrl/injections.scm               |    0
 {queries => runtime/queries}/vrl/locals.scm   |    0
 {queries => runtime/queries}/vue/folds.scm    |    0
 .../queries}/vue/highlights.scm               |    0
 {queries => runtime/queries}/vue/indents.scm  |    0
 .../queries}/vue/injections.scm               |    0
 {queries => runtime/queries}/wgsl/folds.scm   |    0
 .../queries}/wgsl/highlights.scm              |    0
 {queries => runtime/queries}/wgsl/indents.scm |    0
 .../queries}/wgsl/injections.scm              |    0
 .../queries}/wgsl_bevy/folds.scm              |    0
 .../queries}/wgsl_bevy/highlights.scm         |    0
 .../queries}/wgsl_bevy/indents.scm            |    0
 {queries => runtime/queries}/wing/folds.scm   |    0
 .../queries}/wing/highlights.scm              |    0
 .../queries}/wing/injections.scm              |    0
 {queries => runtime/queries}/wing/locals.scm  |    0
 {queries => runtime/queries}/wit/folds.scm    |    0
 .../queries}/wit/highlights.scm               |    0
 .../queries/wit}/injections.scm               |    0
 .../queries}/xcompose/highlights.scm          |    0
 .../queries/xcompose}/injections.scm          |    4 -
 .../queries}/xcompose/locals.scm              |    0
 {queries => runtime/queries}/xml/folds.scm    |    0
 .../queries}/xml/highlights.scm               |    0
 {queries => runtime/queries}/xml/indents.scm  |    0
 .../queries}/xml/injections.scm               |    0
 {queries => runtime/queries}/xml/locals.scm   |    0
 .../queries}/xresources/folds.scm             |    0
 .../queries}/xresources/highlights.scm        |    0
 .../queries}/xresources/injections.scm        |    0
 .../queries}/xresources/locals.scm            |    0
 {queries => runtime/queries}/yaml/folds.scm   |    0
 .../queries}/yaml/highlights.scm              |    0
 {queries => runtime/queries}/yaml/indents.scm |    0
 .../queries}/yaml/injections.scm              |    0
 {queries => runtime/queries}/yaml/locals.scm  |    0
 {queries => runtime/queries}/yang/folds.scm   |    0
 .../queries}/yang/highlights.scm              |    0
 {queries => runtime/queries}/yang/indents.scm |    0
 .../queries}/yang/injections.scm              |    0
 {queries => runtime/queries}/yuck/folds.scm   |    0
 .../queries}/yuck/highlights.scm              |    0
 {queries => runtime/queries}/yuck/indents.scm |    0
 .../queries}/yuck/injections.scm              |    0
 {queries => runtime/queries}/yuck/locals.scm  |    0
 .../queries}/zathurarc/highlights.scm         |    0
 .../queries}/zathurarc/injections.scm         |    0
 {queries => runtime/queries}/zig/folds.scm    |    0
 .../queries}/zig/highlights.scm               |    0
 {queries => runtime/queries}/zig/indents.scm  |    0
 .../queries}/zig/injections.scm               |    0
 {queries => runtime/queries}/zig/locals.scm   |    0
 .../queries}/ziggy/highlights.scm             |    0
 .../queries}/ziggy/indents.scm                |    0
 .../queries}/ziggy_schema/highlights.scm      |    0
 .../queries}/ziggy_schema/indents.scm         |    0
 scripts/check-queries.lua                     |   80 +-
 scripts/ci-install.sh                         |    4 +-
 scripts/format-queries.lua                    |   76 +-
 scripts/minimal_init.lua                      |   36 +-
 scripts/update-lockfile.sh                    |   16 +-
 scripts/update-readme.lua                     |   90 +-
 scripts/write-lockfile.lua                    |   56 +-
 tests/indent/algorithm_spec.lua               |   32 +-
 tests/indent/angular_spec.lua                 |   38 +-
 tests/indent/c_spec.lua                       |   97 +-
 tests/indent/capnp_spec.lua                   |   28 +-
 tests/indent/common.lua                       |   79 +-
 tests/indent/cpp_spec.lua                     |   69 +-
 tests/indent/css_spec.lua                     |   18 +-
 tests/indent/dart_spec.lua                    |   63 +-
 tests/indent/dot_spec.lua                     |   24 +-
 tests/indent/gdscript_spec.lua                |   14 +-
 tests/indent/gleam_spec.lua                   |  210 +-
 tests/indent/go_spec.lua                      |   20 +-
 tests/indent/graphql_spec.lua                 |   12 +-
 tests/indent/html_spec.lua                    |   38 +-
 tests/indent/java_spec.lua                    |   52 +-
 tests/indent/javascript_spec.lua              |  126 +-
 tests/indent/jsx_spec.lua                     |   38 +-
 tests/indent/julia_spec.lua                   |   10 +-
 tests/indent/lua_spec.lua                     |   70 +-
 tests/indent/meson_spec.lua                   |   30 +-
 tests/indent/nickel_spec.lua                  |   28 +-
 tests/indent/nix_spec.lua                     |   24 +-
 tests/indent/nu_spec.lua                      |   10 +-
 tests/indent/php_spec.lua                     |  121 +-
 tests/indent/python_spec.lua                  |  160 +-
 tests/indent/ql_spec.lua                      |   18 +-
 tests/indent/query_spec.lua                   |   36 +-
 tests/indent/r_spec.lua                       |   48 +-
 tests/indent/rescript_spec.lua                |   40 +-
 tests/indent/ruby_spec.lua                    |   24 +-
 tests/indent/rust_spec.lua                    |  110 +-
 tests/indent/smali_spec.lua                   |   29 +-
 tests/indent/sql_spec.lua                     |   12 +-
 tests/indent/sway_spec.lua                    |   20 +-
 tests/indent/swift_spec.lua                   |   39 +-
 tests/indent/t32_spec.lua                     |  144 +-
 tests/indent/terraform_spec.lua               |   65 +-
 tests/indent/tiger_spec.lua                   |  284 +-
 tests/indent/usd_spec.lua                     |   16 +-
 tests/indent/vue_spec.lua                     |   23 +-
 tests/indent/wgsl_spec.lua                    |   36 +-
 tests/indent/yaml_spec.lua                    |   16 +-
 tests/indent/yang_spec.lua                    |   20 +-
 tests/indent/yuck_spec.lua                    |   16 +-
 tests/indent/zig_spec.lua                     |   16 +-
 tests/query/highlights/lua/test.lua           |    4 +-
 tests/query/highlights_spec.lua               |   47 +-
 tests/query/injection_spec.lua                |   38 +-
 tests/unit/ts_utils_spec.lua                  |  114 -
 1247 files changed, 6096 insertions(+), 9074 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 SUPPORTED_LANGUAGES.md
 create mode 100644 TODO.md
 delete mode 100644 assets/logo.png
 delete mode 100644 autoload/nvim_treesitter.vim
 delete mode 100644 lua/nvim-treesitter.lua
 delete mode 100644 lua/nvim-treesitter/caching.lua
 delete mode 100644 lua/nvim-treesitter/compat.lua
 create mode 100644 lua/nvim-treesitter/config.lua
 delete mode 100644 lua/nvim-treesitter/configs.lua
 delete mode 100644 lua/nvim-treesitter/fold.lua
 delete mode 100644 lua/nvim-treesitter/highlight.lua
 delete mode 100644 lua/nvim-treesitter/incremental_selection.lua
 delete mode 100644 lua/nvim-treesitter/info.lua
 create mode 100644 lua/nvim-treesitter/init.lua
 delete mode 100644 lua/nvim-treesitter/query_predicates.lua
 create mode 100644 lua/nvim-treesitter/shell_cmds.lua
 delete mode 100644 lua/nvim-treesitter/shell_command_selectors.lua
 delete mode 100644 lua/nvim-treesitter/statusline.lua
 delete mode 100644 lua/nvim-treesitter/ts_utils.lua
 delete mode 100644 lua/nvim-treesitter/tsrange.lua
 delete mode 100644 parser-info/.gitignore
 delete mode 100644 parser/.gitignore
 create mode 100644 plugin/filetypes.lua
 create mode 100644 plugin/query_predicates.lua
 rename {queries => runtime/queries}/ada/folds.scm (100%)
 rename {queries => runtime/queries}/ada/highlights.scm (100%)
 rename {queries/unison => runtime/queries/ada}/injections.scm (100%)
 rename {queries => runtime/queries}/ada/locals.scm (100%)
 rename {queries => runtime/queries}/agda/folds.scm (100%)
 rename {queries => runtime/queries}/agda/highlights.scm (100%)
 rename {queries/solidity => runtime/queries/agda}/injections.scm (100%)
 rename {queries => runtime/queries}/angular/folds.scm (100%)
 rename {queries => runtime/queries}/angular/highlights.scm (100%)
 rename {queries => runtime/queries}/angular/indents.scm (100%)
 rename {queries => runtime/queries}/angular/injections.scm (100%)
 rename {queries => runtime/queries}/angular/locals.scm (100%)
 rename {queries => runtime/queries}/apex/folds.scm (100%)
 rename {queries => runtime/queries}/apex/highlights.scm (100%)
 rename {queries => runtime/queries}/apex/injections.scm (100%)
 rename {queries => runtime/queries}/apex/locals.scm (100%)
 rename {queries => runtime/queries}/arduino/folds.scm (100%)
 rename {queries => runtime/queries}/arduino/highlights.scm (100%)
 rename {queries => runtime/queries}/arduino/indents.scm (100%)
 rename {queries => runtime/queries}/arduino/injections.scm (100%)
 rename {queries => runtime/queries}/arduino/locals.scm (100%)
 rename {queries => runtime/queries}/asm/highlights.scm (100%)
 rename {queries => runtime/queries}/asm/injections.scm (100%)
 rename {queries => runtime/queries}/astro/folds.scm (100%)
 rename {queries => runtime/queries}/astro/highlights.scm (100%)
 rename {queries => runtime/queries}/astro/indents.scm (100%)
 rename {queries => runtime/queries}/astro/injections.scm (100%)
 rename {queries => runtime/queries}/astro/locals.scm (100%)
 rename {queries => runtime/queries}/authzed/highlights.scm (100%)
 rename {queries/bass => runtime/queries/authzed}/injections.scm (100%)
 rename {queries => runtime/queries}/awk/highlights.scm (100%)
 rename {queries => runtime/queries}/awk/injections.scm (100%)
 rename {queries => runtime/queries}/bash/folds.scm (100%)
 rename {queries => runtime/queries}/bash/highlights.scm (100%)
 rename {queries => runtime/queries}/bash/injections.scm (100%)
 rename {queries => runtime/queries}/bash/locals.scm (100%)
 rename {queries => runtime/queries}/bass/folds.scm (100%)
 rename {queries => runtime/queries}/bass/highlights.scm (100%)
 rename {queries => runtime/queries}/bass/indents.scm (100%)
 rename {queries/scala => runtime/queries/bass}/injections.scm (100%)
 rename {queries => runtime/queries}/bass/locals.scm (100%)
 rename {queries => runtime/queries}/beancount/folds.scm (100%)
 rename {queries => runtime/queries}/beancount/highlights.scm (100%)
 rename {queries/verilog => runtime/queries/beancount}/injections.scm (100%)
 rename {queries => runtime/queries}/bibtex/folds.scm (100%)
 rename {queries => runtime/queries}/bibtex/highlights.scm (100%)
 rename {queries => runtime/queries}/bibtex/indents.scm (100%)
 rename {queries => runtime/queries}/bibtex/injections.scm (100%)
 rename {queries => runtime/queries}/bicep/folds.scm (100%)
 rename {queries => runtime/queries}/bicep/highlights.scm (100%)
 rename {queries => runtime/queries}/bicep/indents.scm (100%)
 rename {queries => runtime/queries}/bicep/injections.scm (100%)
 rename {queries => runtime/queries}/bicep/locals.scm (100%)
 rename {queries => runtime/queries}/bitbake/folds.scm (100%)
 rename {queries => runtime/queries}/bitbake/highlights.scm (100%)
 rename {queries => runtime/queries}/bitbake/indents.scm (100%)
 rename {queries => runtime/queries}/bitbake/injections.scm (100%)
 rename {queries => runtime/queries}/bitbake/locals.scm (100%)
 rename {queries => runtime/queries}/blade/folds.scm (100%)
 rename {queries => runtime/queries}/blade/highlights.scm (100%)
 rename {queries => runtime/queries}/blade/indents.scm (100%)
 rename {queries => runtime/queries}/blade/injections.scm (100%)
 rename {queries => runtime/queries}/blueprint/highlights.scm (100%)
 rename {queries/ada => runtime/queries/blueprint}/injections.scm (100%)
 rename {queries => runtime/queries}/bp/folds.scm (100%)
 rename {queries => runtime/queries}/bp/highlights.scm (100%)
 rename {queries => runtime/queries}/bp/indents.scm (100%)
 rename {queries/agda => runtime/queries/bp}/injections.scm (100%)
 rename {queries => runtime/queries}/bp/locals.scm (100%)
 rename {queries => runtime/queries}/brightscript/folds.scm (100%)
 rename {queries => runtime/queries}/brightscript/highlights.scm (100%)
 rename {queries => runtime/queries}/brightscript/indents.scm (100%)
 rename {queries/authzed => runtime/queries/brightscript}/injections.scm (100%)
 rename {queries => runtime/queries}/c/folds.scm (100%)
 rename {queries => runtime/queries}/c/highlights.scm (100%)
 rename {queries => runtime/queries}/c/indents.scm (100%)
 rename {queries => runtime/queries}/c/injections.scm (100%)
 rename {queries => runtime/queries}/c/locals.scm (100%)
 rename {queries => runtime/queries}/c_sharp/folds.scm (100%)
 rename {queries => runtime/queries}/c_sharp/highlights.scm (100%)
 rename {queries/beancount => runtime/queries/c_sharp}/injections.scm (100%)
 rename {queries => runtime/queries}/c_sharp/locals.scm (100%)
 rename {queries => runtime/queries}/caddy/folds.scm (100%)
 rename {queries => runtime/queries}/caddy/highlights.scm (100%)
 rename {queries => runtime/queries}/caddy/indents.scm (100%)
 rename {queries/blueprint => runtime/queries/caddy}/injections.scm (100%)
 rename {queries => runtime/queries}/cairo/folds.scm (100%)
 rename {queries => runtime/queries}/cairo/highlights.scm (100%)
 rename {queries => runtime/queries}/cairo/indents.scm (100%)
 rename {queries => runtime/queries}/cairo/injections.scm (100%)
 rename {queries => runtime/queries}/cairo/locals.scm (100%)
 rename {queries => runtime/queries}/capnp/folds.scm (100%)
 rename {queries => runtime/queries}/capnp/highlights.scm (100%)
 rename {queries => runtime/queries}/capnp/indents.scm (100%)
 rename {queries/bp => runtime/queries/capnp}/injections.scm (100%)
 rename {queries => runtime/queries}/capnp/locals.scm (100%)
 rename {queries => runtime/queries}/chatito/folds.scm (100%)
 rename {queries => runtime/queries}/chatito/highlights.scm (100%)
 rename {queries => runtime/queries}/chatito/indents.scm (100%)
 rename {queries/brightscript => runtime/queries/chatito}/injections.scm (100%)
 rename {queries => runtime/queries}/chatito/locals.scm (100%)
 rename {queries => runtime/queries}/circom/folds.scm (100%)
 rename {queries => runtime/queries}/circom/highlights.scm (100%)
 rename {queries/c_sharp => runtime/queries/circom}/injections.scm (100%)
 rename {queries => runtime/queries}/circom/locals.scm (100%)
 rename {queries => runtime/queries}/clojure/folds.scm (100%)
 rename {queries => runtime/queries}/clojure/highlights.scm (100%)
 rename {queries/caddy => runtime/queries/clojure}/injections.scm (100%)
 rename {queries => runtime/queries}/clojure/locals.scm (100%)
 rename {queries => runtime/queries}/cmake/folds.scm (100%)
 rename {queries => runtime/queries}/cmake/highlights.scm (100%)
 rename {queries => runtime/queries}/cmake/indents.scm (100%)
 rename {queries => runtime/queries}/cmake/injections.scm (100%)
 rename {queries => runtime/queries}/comment/highlights.scm (100%)
 rename {queries => runtime/queries}/commonlisp/folds.scm (100%)
 rename {queries => runtime/queries}/commonlisp/highlights.scm (100%)
 rename {queries => runtime/queries}/commonlisp/injections.scm (100%)
 rename {queries => runtime/queries}/commonlisp/locals.scm (100%)
 rename {queries => runtime/queries}/cooklang/highlights.scm (100%)
 rename {queries/capnp => runtime/queries/cooklang}/injections.scm (100%)
 rename {queries => runtime/queries}/corn/folds.scm (100%)
 rename {queries => runtime/queries}/corn/highlights.scm (100%)
 rename {queries => runtime/queries}/corn/indents.scm (100%)
 rename {queries/chatito => runtime/queries/corn}/injections.scm (100%)
 rename {queries => runtime/queries}/corn/locals.scm (100%)
 rename {queries => runtime/queries}/cpon/folds.scm (100%)
 rename {queries => runtime/queries}/cpon/highlights.scm (100%)
 rename {queries => runtime/queries}/cpon/indents.scm (100%)
 rename {queries/circom => runtime/queries/cpon}/injections.scm (100%)
 rename {queries => runtime/queries}/cpon/locals.scm (100%)
 rename {queries => runtime/queries}/cpp/folds.scm (100%)
 rename {queries => runtime/queries}/cpp/highlights.scm (100%)
 rename {queries => runtime/queries}/cpp/indents.scm (100%)
 rename {queries => runtime/queries}/cpp/injections.scm (79%)
 rename {queries => runtime/queries}/cpp/locals.scm (100%)
 rename {queries => runtime/queries}/css/folds.scm (100%)
 rename {queries => runtime/queries}/css/highlights.scm (100%)
 rename {queries => runtime/queries}/css/indents.scm (100%)
 rename {queries/clojure => runtime/queries/css}/injections.scm (100%)
 rename {queries => runtime/queries}/csv/highlights.scm (100%)
 rename {queries => runtime/queries}/cuda/folds.scm (100%)
 rename {queries => runtime/queries}/cuda/highlights.scm (100%)
 rename {queries => runtime/queries}/cuda/indents.scm (100%)
 rename {queries => runtime/queries}/cuda/injections.scm (100%)
 rename {queries => runtime/queries}/cuda/locals.scm (100%)
 rename {queries => runtime/queries}/cue/folds.scm (100%)
 rename {queries => runtime/queries}/cue/highlights.scm (100%)
 rename {queries => runtime/queries}/cue/indents.scm (100%)
 rename {queries/cooklang => runtime/queries/cue}/injections.scm (100%)
 rename {queries => runtime/queries}/cue/locals.scm (100%)
 rename {queries => runtime/queries}/cylc/folds.scm (100%)
 rename {queries => runtime/queries}/cylc/highlights.scm (100%)
 rename {queries => runtime/queries}/cylc/indents.scm (100%)
 rename {queries => runtime/queries}/cylc/injections.scm (100%)
 rename {queries => runtime/queries}/d/folds.scm (100%)
 rename {queries => runtime/queries}/d/highlights.scm (100%)
 rename {queries => runtime/queries}/d/indents.scm (100%)
 rename {queries => runtime/queries}/d/injections.scm (100%)
 rename {queries => runtime/queries}/d/locals.scm (100%)
 rename {queries => runtime/queries}/dart/folds.scm (100%)
 rename {queries => runtime/queries}/dart/highlights.scm (100%)
 rename {queries => runtime/queries}/dart/indents.scm (100%)
 rename {queries/corn => runtime/queries/dart}/injections.scm (100%)
 rename {queries => runtime/queries}/dart/locals.scm (100%)
 rename {queries => runtime/queries}/desktop/folds.scm (100%)
 rename {queries => runtime/queries}/desktop/highlights.scm (100%)
 rename {queries => runtime/queries}/desktop/injections.scm (100%)
 rename {queries => runtime/queries}/devicetree/folds.scm (100%)
 rename {queries => runtime/queries}/devicetree/highlights.scm (100%)
 rename {queries => runtime/queries}/devicetree/indents.scm (100%)
 rename {queries/cpon => runtime/queries/devicetree}/injections.scm (100%)
 rename {queries => runtime/queries}/devicetree/locals.scm (100%)
 rename {queries => runtime/queries}/dhall/folds.scm (100%)
 rename {queries => runtime/queries}/dhall/highlights.scm (100%)
 rename {queries => runtime/queries}/dhall/injections.scm (100%)
 rename {queries => runtime/queries}/diff/folds.scm (100%)
 rename {queries => runtime/queries}/diff/highlights.scm (100%)
 rename {queries/css => runtime/queries/diff}/injections.scm (100%)
 rename {queries => runtime/queries}/disassembly/highlights.scm (100%)
 rename {queries => runtime/queries}/disassembly/injections.scm (100%)
 rename {queries => runtime/queries}/djot/folds.scm (100%)
 rename {queries => runtime/queries}/djot/highlights.scm (100%)
 rename {queries => runtime/queries}/djot/indents.scm (100%)
 rename {queries => runtime/queries}/djot/injections.scm (100%)
 rename {queries => runtime/queries}/djot/locals.scm (100%)
 rename {queries => runtime/queries}/dockerfile/highlights.scm (100%)
 rename {queries => runtime/queries}/dockerfile/injections.scm (100%)
 rename {queries => runtime/queries}/dot/highlights.scm (100%)
 rename {queries => runtime/queries}/dot/indents.scm (100%)
 rename {queries => runtime/queries}/dot/injections.scm (100%)
 rename {queries => runtime/queries}/doxygen/highlights.scm (100%)
 rename {queries => runtime/queries}/doxygen/indents.scm (100%)
 rename {queries => runtime/queries}/doxygen/injections.scm (100%)
 rename {queries => runtime/queries}/dtd/folds.scm (100%)
 rename {queries => runtime/queries}/dtd/highlights.scm (100%)
 rename {queries => runtime/queries}/dtd/injections.scm (100%)
 rename {queries => runtime/queries}/dtd/locals.scm (100%)
 rename {queries => runtime/queries}/earthfile/highlights.scm (100%)
 rename {queries => runtime/queries}/earthfile/injections.scm (100%)
 rename {queries => runtime/queries}/ebnf/highlights.scm (100%)
 rename {queries/cue => runtime/queries/ebnf}/injections.scm (100%)
 rename {queries => runtime/queries}/ecma/folds.scm (100%)
 rename {queries => runtime/queries}/ecma/highlights.scm (100%)
 rename {queries => runtime/queries}/ecma/indents.scm (100%)
 rename {queries => runtime/queries}/ecma/injections.scm (100%)
 rename {queries => runtime/queries}/ecma/locals.scm (100%)
 rename {queries => runtime/queries}/editorconfig/folds.scm (100%)
 rename {queries => runtime/queries}/editorconfig/highlights.scm (100%)
 rename {queries/dart => runtime/queries/editorconfig}/injections.scm (100%)
 rename {queries => runtime/queries}/eds/folds.scm (100%)
 rename {queries => runtime/queries}/eds/highlights.scm (100%)
 rename {queries => runtime/queries}/eex/highlights.scm (100%)
 rename {queries => runtime/queries}/eex/injections.scm (100%)
 rename {queries => runtime/queries}/elixir/folds.scm (100%)
 rename {queries => runtime/queries}/elixir/highlights.scm (100%)
 rename {queries => runtime/queries}/elixir/indents.scm (100%)
 rename {queries => runtime/queries}/elixir/injections.scm (100%)
 rename {queries => runtime/queries}/elixir/locals.scm (100%)
 rename {queries => runtime/queries}/elm/folds.scm (100%)
 rename {queries => runtime/queries}/elm/highlights.scm (100%)
 rename {queries => runtime/queries}/elm/injections.scm (100%)
 rename {queries => runtime/queries}/elsa/folds.scm (100%)
 rename {queries => runtime/queries}/elsa/highlights.scm (100%)
 rename {queries => runtime/queries}/elsa/indents.scm (100%)
 rename {queries/devicetree => runtime/queries/elsa}/injections.scm (100%)
 rename {queries => runtime/queries}/elsa/locals.scm (100%)
 rename {queries => runtime/queries}/elvish/highlights.scm (100%)
 rename {queries/diff => runtime/queries/elvish}/injections.scm (100%)
 rename {queries => runtime/queries}/embedded_template/highlights.scm (100%)
 rename {queries => runtime/queries}/embedded_template/injections.scm (100%)
 rename {queries => runtime/queries}/enforce/folds.scm (100%)
 rename {queries => runtime/queries}/enforce/highlights.scm (100%)
 rename {queries => runtime/queries}/enforce/indents.scm (100%)
 rename {queries => runtime/queries}/enforce/injections.scm (100%)
 rename {queries => runtime/queries}/enforce/locals.scm (100%)
 rename {queries => runtime/queries}/erlang/folds.scm (100%)
 rename {queries => runtime/queries}/erlang/highlights.scm (100%)
 rename {queries/ebnf => runtime/queries/erlang}/injections.scm (100%)
 rename {queries => runtime/queries}/facility/folds.scm (100%)
 rename {queries => runtime/queries}/facility/highlights.scm (100%)
 rename {queries => runtime/queries}/facility/indents.scm (100%)
 rename {queries => runtime/queries}/facility/injections.scm (100%)
 rename {queries => runtime/queries}/faust/highlights.scm (100%)
 rename {queries/editorconfig => runtime/queries/faust}/injections.scm (100%)
 rename {queries => runtime/queries}/fennel/folds.scm (100%)
 rename {queries => runtime/queries}/fennel/highlights.scm (100%)
 rename {queries => runtime/queries}/fennel/injections.scm (100%)
 rename {queries => runtime/queries}/fennel/locals.scm (100%)
 rename {queries => runtime/queries}/fidl/folds.scm (100%)
 rename {queries => runtime/queries}/fidl/highlights.scm (100%)
 rename {queries/elsa => runtime/queries/fidl}/injections.scm (100%)
 rename {queries => runtime/queries}/firrtl/folds.scm (100%)
 rename {queries => runtime/queries}/firrtl/highlights.scm (100%)
 rename {queries => runtime/queries}/firrtl/indents.scm (100%)
 rename {queries/elvish => runtime/queries/firrtl}/injections.scm (100%)
 rename {queries => runtime/queries}/firrtl/locals.scm (100%)
 rename {queries => runtime/queries}/fish/folds.scm (100%)
 rename {queries => runtime/queries}/fish/highlights.scm (100%)
 rename {queries => runtime/queries}/fish/indents.scm (100%)
 rename {queries/erlang => runtime/queries/fish}/injections.scm (100%)
 rename {queries => runtime/queries}/fish/locals.scm (100%)
 rename {queries => runtime/queries}/foam/folds.scm (100%)
 rename {queries => runtime/queries}/foam/highlights.scm (100%)
 rename {queries => runtime/queries}/foam/indents.scm (100%)
 rename {queries => runtime/queries}/foam/injections.scm (100%)
 rename {queries => runtime/queries}/foam/locals.scm (100%)
 rename {queries => runtime/queries}/forth/folds.scm (100%)
 rename {queries => runtime/queries}/forth/highlights.scm (100%)
 rename {queries => runtime/queries}/forth/indents.scm (100%)
 rename {queries/faust => runtime/queries/forth}/injections.scm (100%)
 rename {queries => runtime/queries}/forth/locals.scm (100%)
 rename {queries => runtime/queries}/fortran/folds.scm (100%)
 rename {queries => runtime/queries}/fortran/highlights.scm (100%)
 rename {queries => runtime/queries}/fortran/indents.scm (100%)
 rename {queries/fidl => runtime/queries/fortran}/injections.scm (100%)
 rename {queries => runtime/queries}/fsh/highlights.scm (100%)
 rename {queries => runtime/queries}/fsh/injections.scm (100%)
 rename {queries => runtime/queries}/fsharp/highlights.scm (100%)
 rename {queries => runtime/queries}/fsharp/injections.scm (100%)
 rename {queries => runtime/queries}/func/highlights.scm (100%)
 rename {queries/firrtl => runtime/queries/func}/injections.scm (100%)
 rename {queries => runtime/queries}/fusion/folds.scm (100%)
 rename {queries => runtime/queries}/fusion/highlights.scm (100%)
 rename {queries => runtime/queries}/fusion/indents.scm (100%)
 rename {queries => runtime/queries}/fusion/injections.scm (100%)
 rename {queries => runtime/queries}/fusion/locals.scm (100%)
 rename {queries => runtime/queries}/gap/folds.scm (100%)
 rename {queries => runtime/queries}/gap/highlights.scm (100%)
 rename {queries/fish => runtime/queries/gap}/injections.scm (100%)
 rename {queries => runtime/queries}/gap/locals.scm (100%)
 rename {queries => runtime/queries}/gaptst/folds.scm (100%)
 rename {queries => runtime/queries}/gaptst/highlights.scm (100%)
 rename {queries => runtime/queries}/gaptst/injections.scm (100%)
 rename {queries => runtime/queries}/gdscript/folds.scm (100%)
 rename {queries => runtime/queries}/gdscript/highlights.scm (100%)
 rename {queries => runtime/queries}/gdscript/indents.scm (100%)
 rename {queries/forth => runtime/queries/gdscript}/injections.scm (100%)
 rename {queries => runtime/queries}/gdscript/locals.scm (100%)
 rename {queries => runtime/queries}/gdshader/highlights.scm (100%)
 rename {queries/fortran => runtime/queries/gdshader}/injections.scm (100%)
 rename {queries => runtime/queries}/git_config/folds.scm (100%)
 rename {queries => runtime/queries}/git_config/highlights.scm (100%)
 rename {queries => runtime/queries}/git_config/injections.scm (100%)
 rename {queries => runtime/queries}/git_rebase/highlights.scm (100%)
 rename {queries => runtime/queries}/git_rebase/injections.scm (100%)
 rename {queries => runtime/queries}/gitattributes/highlights.scm (100%)
 rename {queries/func => runtime/queries/gitattributes}/injections.scm (100%)
 rename {queries => runtime/queries}/gitattributes/locals.scm (100%)
 rename {queries => runtime/queries}/gitcommit/highlights.scm (100%)
 rename {queries => runtime/queries}/gitcommit/injections.scm (100%)
 rename {queries => runtime/queries}/gitignore/highlights.scm (100%)
 rename {queries/gap => runtime/queries/gitignore}/injections.scm (100%)
 rename {queries => runtime/queries}/gleam/folds.scm (100%)
 rename {queries => runtime/queries}/gleam/highlights.scm (100%)
 rename {queries => runtime/queries}/gleam/indents.scm (100%)
 rename {queries => runtime/queries}/gleam/injections.scm (100%)
 rename {queries => runtime/queries}/gleam/locals.scm (100%)
 rename {queries => runtime/queries}/glimmer/folds.scm (100%)
 rename {queries => runtime/queries}/glimmer/highlights.scm (100%)
 rename {queries => runtime/queries}/glimmer/indents.scm (100%)
 rename {queries => runtime/queries}/glimmer/injections.scm (100%)
 rename {queries => runtime/queries}/glimmer/locals.scm (100%)
 rename {queries => runtime/queries}/glimmer_javascript/highlights.scm (100%)
 rename {queries => runtime/queries}/glimmer_javascript/indents.scm (100%)
 rename {queries => runtime/queries}/glimmer_javascript/injections.scm (100%)
 rename {queries => runtime/queries}/glimmer_javascript/locals.scm (100%)
 rename {queries => runtime/queries}/glimmer_typescript/highlights.scm (100%)
 rename {queries => runtime/queries}/glimmer_typescript/indents.scm (100%)
 rename {queries => runtime/queries}/glimmer_typescript/injections.scm (100%)
 rename {queries => runtime/queries}/glsl/folds.scm (100%)
 rename {queries => runtime/queries}/glsl/highlights.scm (100%)
 rename {queries => runtime/queries}/glsl/indents.scm (100%)
 rename {queries => runtime/queries}/glsl/injections.scm (100%)
 rename {queries => runtime/queries}/glsl/locals.scm (100%)
 rename {queries => runtime/queries}/gn/folds.scm (100%)
 rename {queries => runtime/queries}/gn/highlights.scm (100%)
 rename {queries => runtime/queries}/gn/indents.scm (100%)
 rename {queries/gdscript => runtime/queries/gn}/injections.scm (100%)
 rename {queries => runtime/queries}/gn/locals.scm (100%)
 rename {queries => runtime/queries}/gnuplot/highlights.scm (100%)
 rename {queries/gdshader => runtime/queries/gnuplot}/injections.scm (100%)
 rename {queries => runtime/queries}/go/folds.scm (100%)
 rename {queries => runtime/queries}/go/highlights.scm (100%)
 rename {queries => runtime/queries}/go/indents.scm (100%)
 rename {queries => runtime/queries}/go/injections.scm (100%)
 rename {queries => runtime/queries}/go/locals.scm (100%)
 rename {queries => runtime/queries}/goctl/folds.scm (100%)
 rename {queries => runtime/queries}/goctl/highlights.scm (100%)
 rename {queries => runtime/queries}/goctl/indents.scm (100%)
 rename {queries => runtime/queries}/goctl/injections.scm (100%)
 rename {queries => runtime/queries}/godot_resource/folds.scm (100%)
 rename {queries => runtime/queries}/godot_resource/highlights.scm (100%)
 rename {queries/gitattributes => runtime/queries/godot_resource}/injections.scm (100%)
 rename {queries => runtime/queries}/godot_resource/locals.scm (100%)
 rename {queries => runtime/queries}/gomod/highlights.scm (100%)
 rename {queries/gitignore => runtime/queries/gomod}/injections.scm (100%)
 rename {queries => runtime/queries}/gosum/highlights.scm (100%)
 rename {queries => runtime/queries}/gotmpl/folds.scm (100%)
 rename {queries => runtime/queries}/gotmpl/highlights.scm (100%)
 rename {queries => runtime/queries}/gotmpl/injections.scm (100%)
 rename {queries => runtime/queries}/gotmpl/locals.scm (100%)
 rename {queries => runtime/queries}/gowork/highlights.scm (100%)
 rename {queries/gn => runtime/queries/gowork}/injections.scm (100%)
 rename {queries => runtime/queries}/gpg/highlights.scm (100%)
 rename {queries/gnuplot => runtime/queries/gpg}/injections.scm (100%)
 rename {queries => runtime/queries}/graphql/highlights.scm (100%)
 rename {queries => runtime/queries}/graphql/indents.scm (100%)
 rename {queries/godot_resource => runtime/queries/graphql}/injections.scm (100%)
 rename {queries => runtime/queries}/gren/highlights.scm (100%)
 rename {queries => runtime/queries}/gren/injections.scm (100%)
 rename {queries => runtime/queries}/groovy/folds.scm (100%)
 rename {queries => runtime/queries}/groovy/highlights.scm (100%)
 rename {queries => runtime/queries}/groovy/indents.scm (100%)
 rename {queries => runtime/queries}/groovy/injections.scm (100%)
 rename {queries => runtime/queries}/groovy/locals.scm (100%)
 rename {queries => runtime/queries}/gstlaunch/highlights.scm (100%)
 rename {queries => runtime/queries}/hack/highlights.scm (100%)
 rename {queries => runtime/queries}/hack/injections.scm (100%)
 rename {queries => runtime/queries}/hare/folds.scm (100%)
 rename {queries => runtime/queries}/hare/highlights.scm (100%)
 rename {queries => runtime/queries}/hare/indents.scm (100%)
 rename {queries => runtime/queries}/hare/injections.scm (100%)
 rename {queries => runtime/queries}/hare/locals.scm (100%)
 rename {queries => runtime/queries}/haskell/folds.scm (100%)
 rename {queries => runtime/queries}/haskell/highlights.scm (100%)
 rename {queries => runtime/queries}/haskell/injections.scm (100%)
 rename {queries => runtime/queries}/haskell/locals.scm (100%)
 rename {queries => runtime/queries}/haskell_persistent/folds.scm (100%)
 rename {queries => runtime/queries}/haskell_persistent/highlights.scm (100%)
 rename {queries => runtime/queries}/hcl/folds.scm (100%)
 rename {queries => runtime/queries}/hcl/highlights.scm (100%)
 rename {queries => runtime/queries}/hcl/indents.scm (100%)
 rename {queries => runtime/queries}/hcl/injections.scm (100%)
 rename {queries => runtime/queries}/heex/folds.scm (100%)
 rename {queries => runtime/queries}/heex/highlights.scm (100%)
 rename {queries => runtime/queries}/heex/indents.scm (100%)
 rename {queries => runtime/queries}/heex/injections.scm (100%)
 rename {queries => runtime/queries}/heex/locals.scm (100%)
 rename {queries => runtime/queries}/helm/folds.scm (100%)
 rename {queries => runtime/queries}/helm/highlights.scm (100%)
 rename {queries => runtime/queries}/helm/injections.scm (100%)
 rename {queries => runtime/queries}/helm/locals.scm (100%)
 rename {queries => runtime/queries}/hjson/folds.scm (100%)
 rename {queries => runtime/queries}/hjson/highlights.scm (100%)
 rename {queries => runtime/queries}/hjson/indents.scm (100%)
 rename {queries/gomod => runtime/queries/hjson}/injections.scm (100%)
 rename {queries => runtime/queries}/hjson/locals.scm (100%)
 rename {queries => runtime/queries}/hlsl/folds.scm (100%)
 rename {queries => runtime/queries}/hlsl/highlights.scm (100%)
 rename {queries => runtime/queries}/hlsl/indents.scm (100%)
 rename {queries => runtime/queries}/hlsl/injections.scm (100%)
 rename {queries => runtime/queries}/hlsl/locals.scm (100%)
 rename {queries => runtime/queries}/hlsplaylist/highlights.scm (100%)
 rename {queries/gowork => runtime/queries/hlsplaylist}/injections.scm (100%)
 rename {queries => runtime/queries}/hocon/folds.scm (100%)
 rename {queries => runtime/queries}/hocon/highlights.scm (100%)
 rename {queries/gpg => runtime/queries/hocon}/injections.scm (100%)
 rename {queries => runtime/queries}/hoon/folds.scm (100%)
 rename {queries => runtime/queries}/hoon/highlights.scm (100%)
 rename {queries => runtime/queries}/hoon/injections.scm (100%)
 rename {queries => runtime/queries}/hoon/locals.scm (100%)
 rename {queries => runtime/queries}/html/folds.scm (100%)
 rename {queries => runtime/queries}/html/highlights.scm (100%)
 rename {queries => runtime/queries}/html/indents.scm (100%)
 rename {queries => runtime/queries}/html/injections.scm (100%)
 rename {queries => runtime/queries}/html/locals.scm (100%)
 rename {queries => runtime/queries}/html_tags/highlights.scm (100%)
 rename {queries => runtime/queries}/html_tags/indents.scm (100%)
 rename {queries => runtime/queries}/html_tags/injections.scm (100%)
 rename {queries => runtime/queries}/htmldjango/folds.scm (100%)
 rename {queries => runtime/queries}/htmldjango/highlights.scm (100%)
 rename {queries => runtime/queries}/htmldjango/indents.scm (100%)
 rename {queries => runtime/queries}/htmldjango/injections.scm (100%)
 rename {queries => runtime/queries}/http/folds.scm (100%)
 rename {queries => runtime/queries}/http/highlights.scm (100%)
 rename {queries => runtime/queries}/http/injections.scm (100%)
 rename {queries => runtime/queries}/hurl/folds.scm (100%)
 rename {queries => runtime/queries}/hurl/highlights.scm (100%)
 rename {queries => runtime/queries}/hurl/indents.scm (100%)
 rename {queries => runtime/queries}/hurl/injections.scm (100%)
 rename {queries => runtime/queries}/hyprlang/folds.scm (100%)
 rename {queries => runtime/queries}/hyprlang/highlights.scm (100%)
 rename {queries => runtime/queries}/hyprlang/indents.scm (100%)
 rename {queries => runtime/queries}/hyprlang/injections.scm (100%)
 rename {queries => runtime/queries}/idl/highlights.scm (100%)
 rename {queries => runtime/queries}/idl/indents.scm (100%)
 rename {queries => runtime/queries}/idl/injections.scm (100%)
 rename {queries => runtime/queries}/idris/folds.scm (100%)
 rename {queries => runtime/queries}/idris/highlights.scm (100%)
 rename {queries/graphql => runtime/queries/idris}/injections.scm (100%)
 rename {queries => runtime/queries}/idris/locals.scm (100%)
 rename {queries => runtime/queries}/ini/folds.scm (100%)
 rename {queries => runtime/queries}/ini/highlights.scm (100%)
 rename {queries => runtime/queries}/ini/injections.scm (100%)
 rename {queries => runtime/queries}/inko/folds.scm (100%)
 rename {queries => runtime/queries}/inko/highlights.scm (100%)
 rename {queries => runtime/queries}/inko/indents.scm (100%)
 rename {queries => runtime/queries}/inko/injections.scm (100%)
 rename {queries => runtime/queries}/inko/locals.scm (100%)
 rename {queries => runtime/queries}/ipkg/folds.scm (100%)
 rename {queries => runtime/queries}/ipkg/highlights.scm (100%)
 rename {queries => runtime/queries}/ipkg/indents.scm (100%)
 rename {queries => runtime/queries}/ipkg/injections.scm (100%)
 rename {queries => runtime/queries}/ipkg/locals.scm (100%)
 rename {queries => runtime/queries}/ispc/folds.scm (100%)
 rename {queries => runtime/queries}/ispc/highlights.scm (100%)
 rename {queries => runtime/queries}/ispc/indents.scm (100%)
 rename {queries => runtime/queries}/ispc/injections.scm (100%)
 rename {queries => runtime/queries}/ispc/locals.scm (100%)
 rename {queries => runtime/queries}/janet_simple/folds.scm (100%)
 rename {queries => runtime/queries}/janet_simple/highlights.scm (100%)
 rename {queries/hjson => runtime/queries/janet_simple}/injections.scm (100%)
 rename {queries => runtime/queries}/janet_simple/locals.scm (100%)
 rename {queries => runtime/queries}/java/folds.scm (100%)
 rename {queries => runtime/queries}/java/highlights.scm (100%)
 rename {queries => runtime/queries}/java/indents.scm (100%)
 rename {queries => runtime/queries}/java/injections.scm (100%)
 rename {queries => runtime/queries}/java/locals.scm (100%)
 rename {queries => runtime/queries}/javadoc/highlights.scm (100%)
 rename {queries => runtime/queries}/javadoc/indents.scm (100%)
 rename {queries => runtime/queries}/javadoc/injections.scm (100%)
 rename {queries => runtime/queries}/javascript/folds.scm (100%)
 rename {queries => runtime/queries}/javascript/highlights.scm (100%)
 rename {queries => runtime/queries}/javascript/indents.scm (100%)
 rename {queries => runtime/queries}/javascript/injections.scm (100%)
 rename {queries => runtime/queries}/javascript/locals.scm (100%)
 rename {queries => runtime/queries}/jinja/highlights.scm (100%)
 rename {queries => runtime/queries}/jinja/injections.scm (100%)
 rename {queries => runtime/queries}/jinja_inline/highlights.scm (100%)
 rename {queries/hlsplaylist => runtime/queries/jinja_inline}/injections.scm (100%)
 rename {queries => runtime/queries}/jq/highlights.scm (100%)
 rename {queries => runtime/queries}/jq/injections.scm (100%)
 rename {queries => runtime/queries}/jq/locals.scm (100%)
 rename {queries => runtime/queries}/jsdoc/highlights.scm (100%)
 rename {queries => runtime/queries}/json/folds.scm (100%)
 rename {queries => runtime/queries}/json/highlights.scm (100%)
 rename {queries => runtime/queries}/json/indents.scm (100%)
 rename {queries => runtime/queries}/json/locals.scm (100%)
 rename {queries => runtime/queries}/json5/highlights.scm (100%)
 rename {queries/hocon => runtime/queries/json5}/injections.scm (100%)
 rename {queries => runtime/queries}/jsonc/folds.scm (100%)
 rename {queries => runtime/queries}/jsonc/highlights.scm (100%)
 rename {queries => runtime/queries}/jsonc/indents.scm (100%)
 rename {queries/idris => runtime/queries/jsonc}/injections.scm (100%)
 rename {queries => runtime/queries}/jsonc/locals.scm (100%)
 rename {queries => runtime/queries}/jsonnet/folds.scm (100%)
 rename {queries => runtime/queries}/jsonnet/highlights.scm (100%)
 rename {queries/janet_simple => runtime/queries/jsonnet}/injections.scm (100%)
 rename {queries => runtime/queries}/jsonnet/locals.scm (100%)
 rename {queries => runtime/queries}/jsx/folds.scm (100%)
 rename {queries => runtime/queries}/jsx/highlights.scm (100%)
 rename {queries => runtime/queries}/jsx/indents.scm (100%)
 rename {queries => runtime/queries}/jsx/injections.scm (100%)
 rename {queries => runtime/queries}/julia/folds.scm (100%)
 rename {queries => runtime/queries}/julia/highlights.scm (100%)
 rename {queries => runtime/queries}/julia/indents.scm (100%)
 rename {queries => runtime/queries}/julia/injections.scm (100%)
 rename {queries => runtime/queries}/julia/locals.scm (100%)
 rename {queries => runtime/queries}/just/folds.scm (100%)
 rename {queries => runtime/queries}/just/highlights.scm (100%)
 rename {queries => runtime/queries}/just/indents.scm (100%)
 rename {queries => runtime/queries}/just/injections.scm (100%)
 rename {queries => runtime/queries}/just/locals.scm (100%)
 rename {queries => runtime/queries}/kcl/folds.scm (100%)
 rename {queries => runtime/queries}/kcl/highlights.scm (100%)
 rename {queries => runtime/queries}/kcl/injections.scm (100%)
 rename {queries => runtime/queries}/kconfig/folds.scm (100%)
 rename {queries => runtime/queries}/kconfig/highlights.scm (100%)
 rename {queries => runtime/queries}/kconfig/indents.scm (100%)
 rename {queries/jinja_inline => runtime/queries/kconfig}/injections.scm (100%)
 rename {queries => runtime/queries}/kconfig/locals.scm (100%)
 rename {queries => runtime/queries}/kdl/folds.scm (100%)
 rename {queries => runtime/queries}/kdl/highlights.scm (100%)
 rename {queries => runtime/queries}/kdl/indents.scm (100%)
 rename {queries => runtime/queries}/kdl/injections.scm (100%)
 rename {queries => runtime/queries}/kdl/locals.scm (100%)
 rename {queries => runtime/queries}/kotlin/folds.scm (100%)
 rename {queries => runtime/queries}/kotlin/highlights.scm (100%)
 rename {queries => runtime/queries}/kotlin/injections.scm (100%)
 rename {queries => runtime/queries}/kotlin/locals.scm (100%)
 rename {queries => runtime/queries}/koto/folds.scm (100%)
 rename {queries => runtime/queries}/koto/highlights.scm (100%)
 rename {queries/json5 => runtime/queries/koto}/injections.scm (100%)
 rename {queries => runtime/queries}/koto/locals.scm (100%)
 rename {queries => runtime/queries}/kusto/highlights.scm (100%)
 rename {queries/jsonc => runtime/queries/kusto}/injections.scm (100%)
 rename {queries => runtime/queries}/lalrpop/folds.scm (100%)
 rename {queries => runtime/queries}/lalrpop/highlights.scm (100%)
 rename {queries => runtime/queries}/lalrpop/injections.scm (100%)
 rename {queries => runtime/queries}/lalrpop/locals.scm (100%)
 rename {queries => runtime/queries}/latex/folds.scm (100%)
 rename {queries => runtime/queries}/latex/highlights.scm (100%)
 rename {queries => runtime/queries}/latex/injections.scm (100%)
 rename {queries => runtime/queries}/ledger/folds.scm (100%)
 rename {queries => runtime/queries}/ledger/highlights.scm (100%)
 rename {queries => runtime/queries}/ledger/indents.scm (100%)
 rename {queries => runtime/queries}/ledger/injections.scm (100%)
 rename {queries => runtime/queries}/leo/highlights.scm (100%)
 rename {queries => runtime/queries}/leo/indents.scm (100%)
 rename {queries/jsonnet => runtime/queries/leo}/injections.scm (100%)
 rename {queries => runtime/queries}/linkerscript/folds.scm (100%)
 rename {queries => runtime/queries}/linkerscript/highlights.scm (100%)
 rename {queries => runtime/queries}/linkerscript/indents.scm (100%)
 rename {queries => runtime/queries}/linkerscript/injections.scm (100%)
 rename {queries => runtime/queries}/linkerscript/locals.scm (100%)
 rename {queries => runtime/queries}/liquid/highlights.scm (100%)
 rename {queries => runtime/queries}/liquid/injections.scm (100%)
 rename {queries => runtime/queries}/liquidsoap/folds.scm (100%)
 rename {queries => runtime/queries}/liquidsoap/highlights.scm (100%)
 rename {queries => runtime/queries}/liquidsoap/indents.scm (100%)
 rename {queries/kconfig => runtime/queries/liquidsoap}/injections.scm (100%)
 rename {queries => runtime/queries}/liquidsoap/locals.scm (100%)
 rename {queries => runtime/queries}/llvm/highlights.scm (100%)
 rename {queries/koto => runtime/queries/llvm}/injections.scm (100%)
 rename {queries => runtime/queries}/lua/folds.scm (100%)
 rename {queries => runtime/queries}/lua/highlights.scm (100%)
 rename {queries => runtime/queries}/lua/indents.scm (100%)
 rename {queries => runtime/queries}/lua/injections.scm (100%)
 rename {queries => runtime/queries}/lua/locals.scm (100%)
 rename {queries => runtime/queries}/luadoc/highlights.scm (100%)
 rename {queries => runtime/queries}/luap/highlights.scm (100%)
 rename {queries => runtime/queries}/luau/folds.scm (100%)
 rename {queries => runtime/queries}/luau/highlights.scm (100%)
 rename {queries => runtime/queries}/luau/indents.scm (100%)
 rename {queries => runtime/queries}/luau/injections.scm (100%)
 rename {queries => runtime/queries}/luau/locals.scm (100%)
 rename {queries => runtime/queries}/m68k/folds.scm (100%)
 rename {queries => runtime/queries}/m68k/highlights.scm (100%)
 rename {queries/kusto => runtime/queries/m68k}/injections.scm (100%)
 rename {queries => runtime/queries}/m68k/locals.scm (100%)
 rename {queries => runtime/queries}/make/folds.scm (100%)
 rename {queries => runtime/queries}/make/highlights.scm (100%)
 rename {queries => runtime/queries}/make/injections.scm (100%)
 rename {queries => runtime/queries}/markdown/folds.scm (100%)
 rename {queries => runtime/queries}/markdown/highlights.scm (100%)
 rename {queries => runtime/queries}/markdown/indents.scm (100%)
 rename {queries => runtime/queries}/markdown/injections.scm (100%)
 rename {queries => runtime/queries}/markdown_inline/highlights.scm (100%)
 rename {queries => runtime/queries}/markdown_inline/injections.scm (100%)
 rename {queries => runtime/queries}/matlab/folds.scm (100%)
 rename {queries => runtime/queries}/matlab/highlights.scm (100%)
 rename {queries => runtime/queries}/matlab/indents.scm (100%)
 rename {queries/leo => runtime/queries/matlab}/injections.scm (100%)
 rename {queries => runtime/queries}/matlab/locals.scm (100%)
 rename {queries => runtime/queries}/menhir/highlights.scm (100%)
 rename {queries => runtime/queries}/menhir/injections.scm (100%)
 rename {queries => runtime/queries}/mermaid/folds.scm (100%)
 rename {queries => runtime/queries}/mermaid/highlights.scm (100%)
 rename {queries => runtime/queries}/mermaid/indents.scm (100%)
 rename {queries/liquidsoap => runtime/queries/mermaid}/injections.scm (100%)
 rename {queries => runtime/queries}/meson/folds.scm (100%)
 rename {queries => runtime/queries}/meson/highlights.scm (100%)
 rename {queries => runtime/queries}/meson/indents.scm (100%)
 rename {queries/llvm => runtime/queries/meson}/injections.scm (100%)
 rename {queries => runtime/queries}/mlir/highlights.scm (100%)
 rename {queries/m68k => runtime/queries/mlir}/injections.scm (100%)
 rename {queries => runtime/queries}/mlir/locals.scm (100%)
 rename {queries => runtime/queries}/muttrc/highlights.scm (100%)
 rename {queries => runtime/queries}/muttrc/injections.scm (100%)
 rename {queries => runtime/queries}/nasm/highlights.scm (100%)
 rename {queries/matlab => runtime/queries/nasm}/injections.scm (100%)
 rename {queries => runtime/queries}/nginx/folds.scm (100%)
 rename {queries => runtime/queries}/nginx/highlights.scm (100%)
 rename {queries/mermaid => runtime/queries/nginx}/injections.scm (100%)
 rename {queries => runtime/queries}/nickel/highlights.scm (100%)
 rename {queries => runtime/queries}/nickel/indents.scm (100%)
 rename {queries/meson => runtime/queries/nickel}/injections.scm (100%)
 rename {queries => runtime/queries}/nim/folds.scm (100%)
 rename {queries => runtime/queries}/nim/highlights.scm (100%)
 rename {queries => runtime/queries}/nim/injections.scm (100%)
 rename {queries => runtime/queries}/nim/locals.scm (100%)
 rename {queries => runtime/queries}/nim_format_string/highlights.scm (100%)
 rename {queries => runtime/queries}/nim_format_string/injections.scm (100%)
 rename {queries => runtime/queries}/ninja/folds.scm (100%)
 rename {queries => runtime/queries}/ninja/highlights.scm (100%)
 rename {queries => runtime/queries}/ninja/indents.scm (100%)
 rename {queries/mlir => runtime/queries/ninja}/injections.scm (100%)
 rename {queries => runtime/queries}/nix/folds.scm (100%)
 rename {queries => runtime/queries}/nix/highlights.scm (100%)
 rename {queries => runtime/queries}/nix/indents.scm (100%)
 rename {queries => runtime/queries}/nix/injections.scm (100%)
 rename {queries => runtime/queries}/nix/locals.scm (100%)
 rename {queries => runtime/queries}/nqc/folds.scm (100%)
 rename {queries => runtime/queries}/nqc/highlights.scm (100%)
 rename {queries => runtime/queries}/nqc/indents.scm (100%)
 rename {queries => runtime/queries}/nqc/injections.scm (100%)
 rename {queries => runtime/queries}/nqc/locals.scm (100%)
 rename {queries => runtime/queries}/nu/folds.scm (100%)
 rename {queries => runtime/queries}/nu/highlights.scm (100%)
 rename {queries => runtime/queries}/nu/indents.scm (100%)
 rename {queries => runtime/queries}/nu/injections.scm (100%)
 rename {queries => runtime/queries}/objc/folds.scm (100%)
 rename {queries => runtime/queries}/objc/highlights.scm (100%)
 rename {queries => runtime/queries}/objc/indents.scm (100%)
 rename {queries => runtime/queries}/objc/injections.scm (100%)
 rename {queries => runtime/queries}/objc/locals.scm (100%)
 rename {queries => runtime/queries}/objdump/highlights.scm (100%)
 rename {queries => runtime/queries}/objdump/injections.scm (100%)
 rename {queries => runtime/queries}/ocaml/folds.scm (100%)
 rename {queries => runtime/queries}/ocaml/highlights.scm (100%)
 rename {queries => runtime/queries}/ocaml/indents.scm (100%)
 rename {queries/nasm => runtime/queries/ocaml}/injections.scm (100%)
 rename {queries => runtime/queries}/ocaml/locals.scm (100%)
 rename {queries => runtime/queries}/ocaml_interface/folds.scm (100%)
 rename {queries => runtime/queries}/ocaml_interface/highlights.scm (100%)
 rename {queries => runtime/queries}/ocaml_interface/indents.scm (100%)
 rename {queries => runtime/queries}/ocaml_interface/injections.scm (100%)
 rename {queries => runtime/queries}/ocaml_interface/locals.scm (100%)
 rename {queries => runtime/queries}/ocamllex/highlights.scm (100%)
 rename {queries => runtime/queries}/ocamllex/injections.scm (100%)
 rename {queries => runtime/queries}/odin/folds.scm (100%)
 rename {queries => runtime/queries}/odin/highlights.scm (100%)
 rename {queries => runtime/queries}/odin/indents.scm (100%)
 rename {queries/nginx => runtime/queries/odin}/injections.scm (100%)
 rename {queries => runtime/queries}/odin/locals.scm (100%)
 rename {queries => runtime/queries}/pascal/folds.scm (100%)
 rename {queries => runtime/queries}/pascal/highlights.scm (100%)
 rename {queries => runtime/queries}/pascal/indents.scm (100%)
 rename {queries => runtime/queries}/pascal/injections.scm (100%)
 rename {queries => runtime/queries}/pascal/locals.scm (100%)
 rename {queries => runtime/queries}/passwd/highlights.scm (100%)
 rename {queries => runtime/queries}/pem/folds.scm (100%)
 rename {queries => runtime/queries}/pem/highlights.scm (100%)
 rename {queries/nickel => runtime/queries/pem}/injections.scm (100%)
 rename {queries => runtime/queries}/perl/folds.scm (100%)
 rename {queries => runtime/queries}/perl/highlights.scm (100%)
 rename {queries => runtime/queries}/perl/injections.scm (100%)
 rename {queries => runtime/queries}/php/folds.scm (100%)
 rename {queries => runtime/queries}/php/highlights.scm (100%)
 rename {queries => runtime/queries}/php/indents.scm (100%)
 rename {queries => runtime/queries}/php/injections.scm (100%)
 rename {queries => runtime/queries}/php/locals.scm (100%)
 rename {queries => runtime/queries}/php_only/folds.scm (100%)
 rename {queries => runtime/queries}/php_only/highlights.scm (100%)
 rename {queries => runtime/queries}/php_only/indents.scm (100%)
 rename {queries => runtime/queries}/php_only/injections.scm (100%)
 rename {queries => runtime/queries}/php_only/locals.scm (100%)
 rename {queries => runtime/queries}/phpdoc/highlights.scm (100%)
 rename {queries => runtime/queries}/pioasm/highlights.scm (100%)
 rename {queries => runtime/queries}/pioasm/injections.scm (100%)
 rename {queries => runtime/queries}/po/folds.scm (100%)
 rename {queries => runtime/queries}/po/highlights.scm (100%)
 rename {queries/ninja => runtime/queries/po}/injections.scm (100%)
 rename {queries => runtime/queries}/pod/highlights.scm (100%)
 rename {queries => runtime/queries}/poe_filter/folds.scm (100%)
 rename {queries => runtime/queries}/poe_filter/highlights.scm (100%)
 rename {queries => runtime/queries}/poe_filter/indents.scm (100%)
 rename {queries/ocaml => runtime/queries/poe_filter}/injections.scm (100%)
 rename {queries => runtime/queries}/pony/folds.scm (100%)
 rename {queries => runtime/queries}/pony/highlights.scm (100%)
 rename {queries => runtime/queries}/pony/indents.scm (100%)
 rename {queries => runtime/queries}/pony/injections.scm (100%)
 rename {queries => runtime/queries}/pony/locals.scm (100%)
 rename {queries => runtime/queries}/powershell/folds.scm (100%)
 rename {queries => runtime/queries}/powershell/highlights.scm (100%)
 rename {queries => runtime/queries}/powershell/indents.scm (100%)
 rename {queries => runtime/queries}/powershell/injections.scm (100%)
 rename {queries => runtime/queries}/powershell/locals.scm (100%)
 rename {queries => runtime/queries}/printf/highlights.scm (100%)
 rename {queries => runtime/queries}/prisma/folds.scm (100%)
 rename {queries => runtime/queries}/prisma/highlights.scm (100%)
 rename {queries => runtime/queries}/prisma/injections.scm (100%)
 rename {queries => runtime/queries}/problog/folds.scm (100%)
 rename {queries => runtime/queries}/problog/highlights.scm (100%)
 rename {queries => runtime/queries}/problog/indents.scm (100%)
 rename {queries => runtime/queries}/problog/injections.scm (100%)
 rename {queries => runtime/queries}/prolog/folds.scm (100%)
 rename {queries => runtime/queries}/prolog/highlights.scm (100%)
 rename {queries => runtime/queries}/prolog/indents.scm (100%)
 rename {queries/odin => runtime/queries/prolog}/injections.scm (100%)
 rename {queries => runtime/queries}/promql/highlights.scm (100%)
 rename {queries => runtime/queries}/promql/injections.scm (100%)
 rename {queries => runtime/queries}/properties/highlights.scm (100%)
 rename {queries/pem => runtime/queries/properties}/injections.scm (100%)
 rename {queries => runtime/queries}/properties/locals.scm (100%)
 rename {queries => runtime/queries}/proto/folds.scm (100%)
 rename {queries => runtime/queries}/proto/highlights.scm (100%)
 rename {queries => runtime/queries}/proto/indents.scm (100%)
 rename {queries/po => runtime/queries/proto}/injections.scm (100%)
 rename {queries => runtime/queries}/prql/highlights.scm (100%)
 rename {queries => runtime/queries}/prql/injections.scm (100%)
 rename {queries => runtime/queries}/psv/highlights.scm (100%)
 rename {queries => runtime/queries}/pug/highlights.scm (100%)
 rename {queries => runtime/queries}/pug/injections.scm (100%)
 rename {queries => runtime/queries}/puppet/folds.scm (100%)
 rename {queries => runtime/queries}/puppet/highlights.scm (100%)
 rename {queries => runtime/queries}/puppet/indents.scm (100%)
 rename {queries => runtime/queries}/puppet/injections.scm (100%)
 rename {queries => runtime/queries}/puppet/locals.scm (100%)
 rename {queries => runtime/queries}/purescript/highlights.scm (100%)
 rename {queries/poe_filter => runtime/queries/purescript}/injections.scm (100%)
 rename {queries => runtime/queries}/purescript/locals.scm (100%)
 rename {queries => runtime/queries}/pymanifest/highlights.scm (100%)
 rename {queries/prolog => runtime/queries/pymanifest}/injections.scm (100%)
 rename {queries => runtime/queries}/python/folds.scm (100%)
 rename {queries => runtime/queries}/python/highlights.scm (100%)
 rename {queries => runtime/queries}/python/indents.scm (100%)
 rename {queries => runtime/queries}/python/injections.scm (100%)
 rename {queries => runtime/queries}/python/locals.scm (100%)
 rename {queries => runtime/queries}/ql/folds.scm (100%)
 rename {queries => runtime/queries}/ql/highlights.scm (100%)
 rename {queries => runtime/queries}/ql/indents.scm (100%)
 rename {queries => runtime/queries}/ql/injections.scm (100%)
 rename {queries => runtime/queries}/ql/locals.scm (100%)
 rename {queries => runtime/queries}/qmldir/highlights.scm (100%)
 rename {queries/properties => runtime/queries/qmldir}/injections.scm (100%)
 rename {queries => runtime/queries}/qmljs/folds.scm (100%)
 rename {queries => runtime/queries}/qmljs/highlights.scm (100%)
 rename {queries => runtime/queries}/qmljs/injections.scm (100%)
 rename {queries => runtime/queries}/query/folds.scm (100%)
 rename {queries => runtime/queries}/query/highlights.scm (100%)
 rename {queries => runtime/queries}/query/indents.scm (100%)
 rename {queries => runtime/queries}/query/injections.scm (100%)
 rename {queries => runtime/queries}/query/locals.scm (100%)
 rename {queries => runtime/queries}/r/highlights.scm (100%)
 rename {queries => runtime/queries}/r/indents.scm (100%)
 rename {queries/proto => runtime/queries/r}/injections.scm (100%)
 rename {queries => runtime/queries}/r/locals.scm (100%)
 rename {queries => runtime/queries}/racket/folds.scm (100%)
 rename {queries => runtime/queries}/racket/highlights.scm (100%)
 rename {queries => runtime/queries}/racket/injections.scm (100%)
 rename {queries => runtime/queries}/ralph/highlights.scm (100%)
 rename {queries => runtime/queries}/ralph/injections.scm (100%)
 rename {queries => runtime/queries}/rasi/folds.scm (100%)
 rename {queries => runtime/queries}/rasi/highlights.scm (100%)
 rename {queries => runtime/queries}/rasi/indents.scm (100%)
 rename {queries/purescript => runtime/queries/rasi}/injections.scm (100%)
 rename {queries => runtime/queries}/rasi/locals.scm (100%)
 rename {queries => runtime/queries}/razor/folds.scm (100%)
 rename {queries => runtime/queries}/razor/highlights.scm (100%)
 rename {queries => runtime/queries}/razor/injections.scm (100%)
 rename {queries => runtime/queries}/rbs/folds.scm (100%)
 rename {queries => runtime/queries}/rbs/highlights.scm (100%)
 rename {queries => runtime/queries}/rbs/indents.scm (100%)
 rename {queries/pymanifest => runtime/queries/rbs}/injections.scm (100%)
 rename {queries => runtime/queries}/re2c/folds.scm (100%)
 rename {queries => runtime/queries}/re2c/highlights.scm (100%)
 rename {queries => runtime/queries}/re2c/indents.scm (100%)
 rename {queries => runtime/queries}/re2c/injections.scm (100%)
 rename {queries => runtime/queries}/re2c/locals.scm (100%)
 rename {queries => runtime/queries}/readline/folds.scm (100%)
 rename {queries => runtime/queries}/readline/highlights.scm (100%)
 rename {queries => runtime/queries}/readline/indents.scm (100%)
 rename {queries/qmldir => runtime/queries/readline}/injections.scm (100%)
 rename {queries => runtime/queries}/regex/highlights.scm (100%)
 rename {queries => runtime/queries}/rego/highlights.scm (100%)
 rename {queries/r => runtime/queries/rego}/injections.scm (100%)
 rename {queries => runtime/queries}/requirements/highlights.scm (100%)
 rename {queries/rasi => runtime/queries/requirements}/injections.scm (100%)
 rename {queries => runtime/queries}/rescript/folds.scm (100%)
 rename {queries => runtime/queries}/rescript/highlights.scm (100%)
 rename {queries => runtime/queries}/rescript/indents.scm (100%)
 rename {queries => runtime/queries}/rescript/injections.scm (100%)
 rename {queries => runtime/queries}/rescript/locals.scm (100%)
 rename {queries => runtime/queries}/rnoweb/folds.scm (100%)
 rename {queries => runtime/queries}/rnoweb/highlights.scm (100%)
 rename {queries => runtime/queries}/rnoweb/injections.scm (100%)
 rename {queries => runtime/queries}/robot/folds.scm (100%)
 rename {queries => runtime/queries}/robot/highlights.scm (100%)
 rename {queries => runtime/queries}/robot/indents.scm (100%)
 rename {queries => runtime/queries}/robot/injections.scm (100%)
 rename {queries => runtime/queries}/robots/highlights.scm (100%)
 rename {queries/rbs => runtime/queries/robots}/injections.scm (100%)
 rename {queries => runtime/queries}/roc/highlights.scm (100%)
 rename {queries => runtime/queries}/roc/indents.scm (100%)
 rename {queries => runtime/queries}/roc/injections.scm (100%)
 rename {queries => runtime/queries}/roc/locals.scm (100%)
 rename {queries => runtime/queries}/ron/folds.scm (100%)
 rename {queries => runtime/queries}/ron/highlights.scm (100%)
 rename {queries => runtime/queries}/ron/indents.scm (100%)
 rename {queries => runtime/queries}/ron/injections.scm (100%)
 rename {queries => runtime/queries}/ron/locals.scm (100%)
 rename {queries => runtime/queries}/rst/highlights.scm (100%)
 rename {queries => runtime/queries}/rst/injections.scm (100%)
 rename {queries => runtime/queries}/rst/locals.scm (100%)
 rename {queries => runtime/queries}/ruby/folds.scm (100%)
 rename {queries => runtime/queries}/ruby/highlights.scm (97%)
 rename {queries => runtime/queries}/ruby/indents.scm (100%)
 rename {queries => runtime/queries}/ruby/injections.scm (100%)
 rename {queries => runtime/queries}/ruby/locals.scm (100%)
 rename {queries => runtime/queries}/runescript/highlights.scm (100%)
 rename {queries/readline => runtime/queries/runescript}/injections.scm (100%)
 rename {queries => runtime/queries}/rust/folds.scm (100%)
 rename {queries => runtime/queries}/rust/highlights.scm (100%)
 rename {queries => runtime/queries}/rust/indents.scm (100%)
 rename {queries => runtime/queries}/rust/injections.scm (100%)
 rename {queries => runtime/queries}/rust/locals.scm (100%)
 rename {queries => runtime/queries}/scala/folds.scm (100%)
 rename {queries => runtime/queries}/scala/highlights.scm (100%)
 rename {queries/rego => runtime/queries/scala}/injections.scm (100%)
 rename {queries => runtime/queries}/scala/locals.scm (100%)
 rename {queries => runtime/queries}/scfg/highlights.scm (100%)
 rename {queries/requirements => runtime/queries/scfg}/injections.scm (100%)
 rename {queries => runtime/queries}/scheme/folds.scm (100%)
 rename {queries => runtime/queries}/scheme/highlights.scm (100%)
 rename {queries/robots => runtime/queries/scheme}/injections.scm (100%)
 rename {queries => runtime/queries}/scss/folds.scm (100%)
 rename {queries => runtime/queries}/scss/highlights.scm (100%)
 rename {queries => runtime/queries}/scss/indents.scm (100%)
 rename {queries => runtime/queries}/scss/injections.scm (100%)
 rename {queries => runtime/queries}/sflog/highlights.scm (100%)
 rename {queries => runtime/queries}/slang/folds.scm (100%)
 rename {queries => runtime/queries}/slang/highlights.scm (100%)
 rename {queries => runtime/queries}/slang/indents.scm (100%)
 rename {queries => runtime/queries}/slang/injections.scm (100%)
 rename {queries => runtime/queries}/slang/locals.scm (100%)
 rename {queries => runtime/queries}/slim/folds.scm (100%)
 rename {queries => runtime/queries}/slim/highlights.scm (100%)
 rename {queries => runtime/queries}/slim/indents.scm (100%)
 rename {queries => runtime/queries}/slim/injections.scm (100%)
 rename {queries => runtime/queries}/slim/locals.scm (100%)
 rename {queries => runtime/queries}/slint/folds.scm (100%)
 rename {queries => runtime/queries}/slint/highlights.scm (100%)
 rename {queries => runtime/queries}/slint/indents.scm (100%)
 rename {queries/runescript => runtime/queries/slint}/injections.scm (100%)
 rename {queries => runtime/queries}/slint/locals.scm (100%)
 rename {queries => runtime/queries}/smali/folds.scm (100%)
 rename {queries => runtime/queries}/smali/highlights.scm (100%)
 rename {queries => runtime/queries}/smali/indents.scm (100%)
 rename {queries/scfg => runtime/queries/smali}/injections.scm (100%)
 rename {queries => runtime/queries}/smali/locals.scm (100%)
 rename {queries => runtime/queries}/smithy/highlights.scm (100%)
 rename {queries => runtime/queries}/smithy/injections.scm (100%)
 rename {queries => runtime/queries}/snakemake/folds.scm (100%)
 rename {queries => runtime/queries}/snakemake/highlights.scm (100%)
 rename {queries => runtime/queries}/snakemake/indents.scm (100%)
 rename {queries => runtime/queries}/snakemake/injections.scm (100%)
 rename {queries => runtime/queries}/snakemake/locals.scm (100%)
 rename {queries => runtime/queries}/solidity/folds.scm (100%)
 rename {queries => runtime/queries}/solidity/highlights.scm (100%)
 rename {queries/scheme => runtime/queries/solidity}/injections.scm (100%)
 rename {queries => runtime/queries}/soql/highlights.scm (100%)
 rename {queries => runtime/queries}/sosl/highlights.scm (100%)
 rename {queries => runtime/queries}/sourcepawn/highlights.scm (100%)
 rename {queries => runtime/queries}/sourcepawn/injections.scm (100%)
 rename {queries => runtime/queries}/sourcepawn/locals.scm (100%)
 rename {queries => runtime/queries}/sparql/folds.scm (100%)
 rename {queries => runtime/queries}/sparql/highlights.scm (100%)
 rename {queries => runtime/queries}/sparql/indents.scm (100%)
 rename {queries => runtime/queries}/sparql/injections.scm (100%)
 rename {queries => runtime/queries}/sparql/locals.scm (100%)
 rename {queries => runtime/queries}/sql/folds.scm (100%)
 rename {queries => runtime/queries}/sql/highlights.scm (100%)
 rename {queries => runtime/queries}/sql/indents.scm (100%)
 rename {queries => runtime/queries}/sql/injections.scm (100%)
 rename {queries => runtime/queries}/squirrel/folds.scm (100%)
 rename {queries => runtime/queries}/squirrel/highlights.scm (100%)
 rename {queries => runtime/queries}/squirrel/indents.scm (100%)
 rename {queries => runtime/queries}/squirrel/injections.scm (100%)
 rename {queries => runtime/queries}/squirrel/locals.scm (100%)
 rename {queries => runtime/queries}/ssh_config/folds.scm (100%)
 rename {queries => runtime/queries}/ssh_config/highlights.scm (100%)
 rename {queries => runtime/queries}/ssh_config/indents.scm (100%)
 rename {queries => runtime/queries}/ssh_config/injections.scm (100%)
 rename {queries => runtime/queries}/ssh_config/locals.scm (100%)
 rename {queries => runtime/queries}/starlark/folds.scm (100%)
 rename {queries => runtime/queries}/starlark/highlights.scm (100%)
 rename {queries => runtime/queries}/starlark/indents.scm (100%)
 rename {queries => runtime/queries}/starlark/injections.scm (100%)
 rename {queries => runtime/queries}/starlark/locals.scm (100%)
 rename {queries => runtime/queries}/strace/highlights.scm (100%)
 rename {queries/slint => runtime/queries/strace}/injections.scm (100%)
 rename {queries => runtime/queries}/styled/folds.scm (100%)
 rename {queries => runtime/queries}/styled/highlights.scm (100%)
 rename {queries => runtime/queries}/styled/indents.scm (100%)
 rename {queries => runtime/queries}/styled/injections.scm (100%)
 rename {queries => runtime/queries}/supercollider/folds.scm (100%)
 rename {queries => runtime/queries}/supercollider/highlights.scm (100%)
 rename {queries => runtime/queries}/supercollider/indents.scm (100%)
 rename {queries => runtime/queries}/supercollider/injections.scm (100%)
 rename {queries => runtime/queries}/supercollider/locals.scm (100%)
 rename {queries => runtime/queries}/superhtml/highlights.scm (100%)
 rename {queries => runtime/queries}/superhtml/injections.scm (100%)
 rename {queries => runtime/queries}/surface/folds.scm (100%)
 rename {queries => runtime/queries}/surface/highlights.scm (100%)
 rename {queries => runtime/queries}/surface/indents.scm (100%)
 rename {queries => runtime/queries}/surface/injections.scm (100%)
 rename {queries => runtime/queries}/svelte/folds.scm (100%)
 rename {queries => runtime/queries}/svelte/highlights.scm (100%)
 rename {queries => runtime/queries}/svelte/indents.scm (100%)
 rename {queries => runtime/queries}/svelte/injections.scm (100%)
 rename {queries => runtime/queries}/svelte/locals.scm (100%)
 rename {queries => runtime/queries}/sway/folds.scm (100%)
 rename {queries => runtime/queries}/sway/highlights.scm (100%)
 rename {queries => runtime/queries}/sway/indents.scm (100%)
 rename {queries => runtime/queries}/sway/injections.scm (100%)
 rename {queries => runtime/queries}/sway/locals.scm (100%)
 rename {queries => runtime/queries}/swift/folds.scm (100%)
 rename {queries => runtime/queries}/swift/highlights.scm (100%)
 rename {queries => runtime/queries}/swift/indents.scm (100%)
 rename {queries => runtime/queries}/swift/injections.scm (100%)
 rename {queries => runtime/queries}/swift/locals.scm (100%)
 rename {queries => runtime/queries}/sxhkdrc/folds.scm (100%)
 rename {queries => runtime/queries}/sxhkdrc/highlights.scm (100%)
 rename {queries => runtime/queries}/sxhkdrc/injections.scm (100%)
 rename {queries => runtime/queries}/systemtap/folds.scm (100%)
 rename {queries => runtime/queries}/systemtap/highlights.scm (100%)
 rename {queries => runtime/queries}/systemtap/injections.scm (100%)
 rename {queries => runtime/queries}/systemtap/locals.scm (100%)
 rename {queries => runtime/queries}/t32/folds.scm (100%)
 rename {queries => runtime/queries}/t32/highlights.scm (100%)
 rename {queries => runtime/queries}/t32/indents.scm (100%)
 rename {queries/smali => runtime/queries/t32}/injections.scm (100%)
 rename {queries => runtime/queries}/t32/locals.scm (100%)
 rename {queries => runtime/queries}/tablegen/folds.scm (100%)
 rename {queries => runtime/queries}/tablegen/highlights.scm (100%)
 rename {queries => runtime/queries}/tablegen/indents.scm (100%)
 rename {queries => runtime/queries}/tablegen/injections.scm (100%)
 rename {queries => runtime/queries}/tablegen/locals.scm (100%)
 rename {queries => runtime/queries}/tact/folds.scm (100%)
 rename {queries => runtime/queries}/tact/highlights.scm (100%)
 rename {queries => runtime/queries}/tact/indents.scm (100%)
 rename {queries/strace => runtime/queries/tact}/injections.scm (100%)
 rename {queries => runtime/queries}/tact/locals.scm (100%)
 rename {queries => runtime/queries}/tcl/folds.scm (100%)
 rename {queries => runtime/queries}/tcl/highlights.scm (100%)
 rename {queries => runtime/queries}/tcl/indents.scm (100%)
 rename {queries/t32 => runtime/queries/tcl}/injections.scm (100%)
 rename {queries => runtime/queries}/teal/folds.scm (100%)
 rename {queries => runtime/queries}/teal/highlights.scm (100%)
 rename {queries => runtime/queries}/teal/indents.scm (100%)
 rename {queries => runtime/queries}/teal/injections.scm (100%)
 rename {queries => runtime/queries}/teal/locals.scm (100%)
 rename {queries => runtime/queries}/templ/folds.scm (100%)
 rename {queries => runtime/queries}/templ/highlights.scm (100%)
 rename {queries => runtime/queries}/templ/injections.scm (100%)
 rename {queries => runtime/queries}/tera/highlights.scm (100%)
 rename {queries => runtime/queries}/tera/injections.scm (100%)
 rename {queries => runtime/queries}/terraform/folds.scm (100%)
 rename {queries => runtime/queries}/terraform/highlights.scm (100%)
 rename {queries => runtime/queries}/terraform/indents.scm (100%)
 rename {queries => runtime/queries}/terraform/injections.scm (100%)
 rename {queries => runtime/queries}/textproto/folds.scm (100%)
 rename {queries => runtime/queries}/textproto/highlights.scm (100%)
 rename {queries => runtime/queries}/textproto/indents.scm (100%)
 rename {queries/tact => runtime/queries/textproto}/injections.scm (100%)
 rename {queries => runtime/queries}/thrift/folds.scm (100%)
 rename {queries => runtime/queries}/thrift/highlights.scm (100%)
 rename {queries => runtime/queries}/thrift/indents.scm (100%)
 rename {queries/tcl => runtime/queries/thrift}/injections.scm (100%)
 rename {queries => runtime/queries}/thrift/locals.scm (100%)
 rename {queries => runtime/queries}/tiger/folds.scm (100%)
 rename {queries => runtime/queries}/tiger/highlights.scm (100%)
 rename {queries => runtime/queries}/tiger/indents.scm (100%)
 rename {queries => runtime/queries}/tiger/injections.scm (100%)
 rename {queries => runtime/queries}/tiger/locals.scm (100%)
 rename {queries => runtime/queries}/tlaplus/folds.scm (100%)
 rename {queries => runtime/queries}/tlaplus/highlights.scm (100%)
 rename {queries => runtime/queries}/tlaplus/injections.scm (100%)
 rename {queries => runtime/queries}/tlaplus/locals.scm (100%)
 rename {queries => runtime/queries}/tmux/highlights.scm (100%)
 rename {queries => runtime/queries}/tmux/injections.scm (100%)
 rename {queries => runtime/queries}/todotxt/highlights.scm (100%)
 rename {queries => runtime/queries}/toml/folds.scm (100%)
 rename {queries => runtime/queries}/toml/highlights.scm (100%)
 rename {queries => runtime/queries}/toml/indents.scm (100%)
 rename {queries/textproto => runtime/queries/toml}/injections.scm (100%)
 rename {queries => runtime/queries}/toml/locals.scm (100%)
 rename {queries => runtime/queries}/tsv/highlights.scm (100%)
 rename {queries => runtime/queries}/tsx/folds.scm (100%)
 rename {queries => runtime/queries}/tsx/highlights.scm (100%)
 rename {queries => runtime/queries}/tsx/indents.scm (100%)
 rename {queries => runtime/queries}/tsx/injections.scm (100%)
 rename {queries => runtime/queries}/tsx/locals.scm (100%)
 rename {queries => runtime/queries}/turtle/folds.scm (100%)
 rename {queries => runtime/queries}/turtle/highlights.scm (100%)
 rename {queries => runtime/queries}/turtle/indents.scm (100%)
 rename {queries/thrift => runtime/queries/turtle}/injections.scm (100%)
 rename {queries => runtime/queries}/turtle/locals.scm (100%)
 rename {queries => runtime/queries}/twig/highlights.scm (100%)
 rename {queries => runtime/queries}/twig/injections.scm (100%)
 rename {queries => runtime/queries}/typescript/folds.scm (100%)
 rename {queries => runtime/queries}/typescript/highlights.scm (100%)
 rename {queries => runtime/queries}/typescript/indents.scm (100%)
 rename {queries => runtime/queries}/typescript/injections.scm (100%)
 rename {queries => runtime/queries}/typescript/locals.scm (100%)
 rename {queries => runtime/queries}/typespec/highlights.scm (100%)
 rename {queries => runtime/queries}/typespec/indents.scm (100%)
 rename {queries => runtime/queries}/typespec/injections.scm (100%)
 rename {queries => runtime/queries}/typoscript/folds.scm (100%)
 rename {queries => runtime/queries}/typoscript/highlights.scm (100%)
 rename {queries => runtime/queries}/typoscript/indents.scm (100%)
 rename {queries/toml => runtime/queries/typoscript}/injections.scm (100%)
 rename {queries => runtime/queries}/typst/folds.scm (100%)
 rename {queries => runtime/queries}/typst/highlights.scm (100%)
 rename {queries => runtime/queries}/typst/indents.scm (100%)
 rename {queries/turtle => runtime/queries/typst}/injections.scm (100%)
 rename {queries => runtime/queries}/udev/highlights.scm (100%)
 rename {queries => runtime/queries}/udev/injections.scm (100%)
 rename {queries => runtime/queries}/udev/locals.scm (100%)
 rename {queries => runtime/queries}/ungrammar/folds.scm (100%)
 rename {queries => runtime/queries}/ungrammar/highlights.scm (100%)
 rename {queries => runtime/queries}/ungrammar/indents.scm (100%)
 rename {queries/typoscript => runtime/queries/ungrammar}/injections.scm (100%)
 rename {queries => runtime/queries}/ungrammar/locals.scm (100%)
 rename {queries => runtime/queries}/unison/folds.scm (100%)
 rename {queries => runtime/queries}/unison/highlights.scm (100%)
 rename {queries/ungrammar => runtime/queries/unison}/injections.scm (100%)
 rename {queries => runtime/queries}/usd/folds.scm (100%)
 rename {queries => runtime/queries}/usd/highlights.scm (100%)
 rename {queries => runtime/queries}/usd/indents.scm (100%)
 rename {queries => runtime/queries}/usd/injections.scm (100%)
 rename {queries => runtime/queries}/usd/locals.scm (100%)
 rename {queries => runtime/queries}/uxntal/folds.scm (100%)
 rename {queries => runtime/queries}/uxntal/highlights.scm (100%)
 rename {queries => runtime/queries}/uxntal/indents.scm (100%)
 rename {queries => runtime/queries}/uxntal/injections.scm (100%)
 rename {queries => runtime/queries}/uxntal/locals.scm (100%)
 rename {queries => runtime/queries}/v/folds.scm (100%)
 rename {queries => runtime/queries}/v/highlights.scm (100%)
 rename {queries => runtime/queries}/v/indents.scm (100%)
 rename {queries => runtime/queries}/v/injections.scm (100%)
 rename {queries => runtime/queries}/v/locals.scm (100%)
 rename {queries => runtime/queries}/vala/folds.scm (100%)
 rename {queries => runtime/queries}/vala/highlights.scm (100%)
 rename {queries => runtime/queries}/vala/injections.scm (100%)
 rename {queries => runtime/queries}/vento/highlights.scm (100%)
 rename {queries => runtime/queries}/vento/injections.scm (100%)
 rename {queries => runtime/queries}/verilog/folds.scm (100%)
 rename {queries => runtime/queries}/verilog/highlights.scm (100%)
 rename {queries/vhs => runtime/queries/verilog}/injections.scm (100%)
 rename {queries => runtime/queries}/vhdl/folds.scm (100%)
 rename {queries => runtime/queries}/vhdl/highlights.scm (100%)
 rename {queries => runtime/queries}/vhdl/injections.scm (100%)
 rename {queries => runtime/queries}/vhs/highlights.scm (100%)
 rename {queries/wit => runtime/queries/vhs}/injections.scm (100%)
 rename {queries => runtime/queries}/vim/folds.scm (100%)
 rename {queries => runtime/queries}/vim/highlights.scm (100%)
 rename {queries => runtime/queries}/vim/injections.scm (100%)
 rename {queries => runtime/queries}/vim/locals.scm (100%)
 rename {queries => runtime/queries}/vimdoc/highlights.scm (100%)
 rename {queries => runtime/queries}/vimdoc/injections.scm (100%)
 rename {queries => runtime/queries}/vrl/folds.scm (100%)
 rename {queries => runtime/queries}/vrl/highlights.scm (100%)
 rename {queries => runtime/queries}/vrl/indents.scm (100%)
 rename {queries => runtime/queries}/vrl/injections.scm (100%)
 rename {queries => runtime/queries}/vrl/locals.scm (100%)
 rename {queries => runtime/queries}/vue/folds.scm (100%)
 rename {queries => runtime/queries}/vue/highlights.scm (100%)
 rename {queries => runtime/queries}/vue/indents.scm (100%)
 rename {queries => runtime/queries}/vue/injections.scm (100%)
 rename {queries => runtime/queries}/wgsl/folds.scm (100%)
 rename {queries => runtime/queries}/wgsl/highlights.scm (100%)
 rename {queries => runtime/queries}/wgsl/indents.scm (100%)
 rename {queries => runtime/queries}/wgsl/injections.scm (100%)
 rename {queries => runtime/queries}/wgsl_bevy/folds.scm (100%)
 rename {queries => runtime/queries}/wgsl_bevy/highlights.scm (100%)
 rename {queries => runtime/queries}/wgsl_bevy/indents.scm (100%)
 rename {queries => runtime/queries}/wing/folds.scm (100%)
 rename {queries => runtime/queries}/wing/highlights.scm (100%)
 rename {queries => runtime/queries}/wing/injections.scm (100%)
 rename {queries => runtime/queries}/wing/locals.scm (100%)
 rename {queries => runtime/queries}/wit/folds.scm (100%)
 rename {queries => runtime/queries}/wit/highlights.scm (100%)
 rename {queries/xcompose => runtime/queries/wit}/injections.scm (100%)
 rename {queries => runtime/queries}/xcompose/highlights.scm (100%)
 rename {queries/typst => runtime/queries/xcompose}/injections.scm (50%)
 rename {queries => runtime/queries}/xcompose/locals.scm (100%)
 rename {queries => runtime/queries}/xml/folds.scm (100%)
 rename {queries => runtime/queries}/xml/highlights.scm (100%)
 rename {queries => runtime/queries}/xml/indents.scm (100%)
 rename {queries => runtime/queries}/xml/injections.scm (100%)
 rename {queries => runtime/queries}/xml/locals.scm (100%)
 rename {queries => runtime/queries}/xresources/folds.scm (100%)
 rename {queries => runtime/queries}/xresources/highlights.scm (100%)
 rename {queries => runtime/queries}/xresources/injections.scm (100%)
 rename {queries => runtime/queries}/xresources/locals.scm (100%)
 rename {queries => runtime/queries}/yaml/folds.scm (100%)
 rename {queries => runtime/queries}/yaml/highlights.scm (100%)
 rename {queries => runtime/queries}/yaml/indents.scm (100%)
 rename {queries => runtime/queries}/yaml/injections.scm (100%)
 rename {queries => runtime/queries}/yaml/locals.scm (100%)
 rename {queries => runtime/queries}/yang/folds.scm (100%)
 rename {queries => runtime/queries}/yang/highlights.scm (100%)
 rename {queries => runtime/queries}/yang/indents.scm (100%)
 rename {queries => runtime/queries}/yang/injections.scm (100%)
 rename {queries => runtime/queries}/yuck/folds.scm (100%)
 rename {queries => runtime/queries}/yuck/highlights.scm (100%)
 rename {queries => runtime/queries}/yuck/indents.scm (100%)
 rename {queries => runtime/queries}/yuck/injections.scm (100%)
 rename {queries => runtime/queries}/yuck/locals.scm (100%)
 rename {queries => runtime/queries}/zathurarc/highlights.scm (100%)
 rename {queries => runtime/queries}/zathurarc/injections.scm (100%)
 rename {queries => runtime/queries}/zig/folds.scm (100%)
 rename {queries => runtime/queries}/zig/highlights.scm (100%)
 rename {queries => runtime/queries}/zig/indents.scm (100%)
 rename {queries => runtime/queries}/zig/injections.scm (100%)
 rename {queries => runtime/queries}/zig/locals.scm (100%)
 rename {queries => runtime/queries}/ziggy/highlights.scm (100%)
 rename {queries => runtime/queries}/ziggy/indents.scm (100%)
 rename {queries => runtime/queries}/ziggy_schema/highlights.scm (100%)
 rename {queries => runtime/queries}/ziggy_schema/indents.scm (100%)
 delete mode 100644 tests/unit/ts_utils_spec.lua

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cd0e51982..e51833814 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,7 +3,7 @@ name: Linting and style checking
 on:
   pull_request:
     branches:
-      - "master"
+      - "main"
 
 jobs:
   luacheck:
@@ -37,7 +37,7 @@ jobs:
     name: Lint queries
     runs-on: ubuntu-latest
     env:
-      NVIM_TAG: stable
+      NVIM_TAG: nightly
     steps:
       - uses: actions/checkout@v4
       - name: Prepare
diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 8fe1f082a..5e9be1e38 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -85,4 +85,4 @@ jobs:
         run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser
 
       - name: Check query files
-        run: $NVIM -l scripts/check-queries.lua
+        run: $NVIM -l ./scripts/check-queries.lua
diff --git a/.stylua.toml b/.stylua.toml
index ecb6dca5a..a2b344750 100644
--- a/.stylua.toml
+++ b/.stylua.toml
@@ -1,6 +1,6 @@
-column_width = 120
+column_width = 100
 line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
-quote_style = "AutoPreferDouble"
-call_parentheses = "None"
+quote_style = "AutoPreferSingle"
+call_parentheses = "Always"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 23321f0f7..473a26cb5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,10 +5,7 @@ First of all, thank you very much for contributing to `nvim-treesitter`.
 If you haven't already, you should really come and reach out to us on our
 [Matrix channel], so we can help you with any question you might have!
 
-As you know, `nvim-treesitter` is roughly split in two parts:
-
-- Parser configurations : for various things like `locals`, `highlights`
-- What we like to call _modules_ : tiny Lua modules that provide a given feature, based on parser configurations
+The main goal of `nvim-treesitter` is to provide a framework to easily install parsers and queries.
 
 Depending on which part of the plugin you want to contribute to, please read the appropriate section.
 
@@ -25,25 +22,9 @@ cargo install stylua
 ln -s ../../scripts/pre-push .git/hooks/pre-push
 ```
 
-## Adding new modules
-
-If you want to see a new functionality added to `nvim-treesitter` feel free to first open an issue
-to that we can track our solution!
-Thus far, there is basically two types of modules:
-
-- Little modules (like `incremental selection`) that are built in `nvim-treesitter`, we call them
-  `builtin modules`.
-- Bigger modules (like `completion-treesitter`, or `nvim-tree-docs`), or modules that integrate
-  with other plugins, that we call `remote modules`.
-
-In any case, you can build your own module! To help you started in the process, we have a template
-repository designed to build new modules [here](https://github.com/nvim-treesitter/module-template).
-Feel free to use it, and contact us over on our
-on the "Neovim tree-sitter" [Matrix channel].
-
 ## Parser configurations
 
-Contributing to parser configurations is basically modifying one of the `queries/*/*.scm`.
+Contributing to parser configurations is basically modifying one of the `runtime/queries/*/*.scm`.
 Each of these `scheme` files contains a _tree-sitter query_ for a given purpose.
 Before going any further, we highly suggest that you [read more about tree-sitter queries](https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries).
 
@@ -59,14 +40,12 @@ For now these are the types of queries used by `nvim-treesitter`:
 For these types there is a _norm_ you will have to follow so that features work fine.
 Here are some global advices:
 
-- If your language is listed [here](https://github.com/nvim-treesitter/nvim-treesitter#supported-languages),
-  you can install the [playground plugin](https://github.com/nvim-treesitter/playground).
 - If your language is listed [here](https://github.com/nvim-treesitter/nvim-treesitter#supported-languages),
   you can debug and experiment with your queries there.
 - If not, you should consider installing the [tree-sitter CLI](https://github.com/tree-sitter/tree-sitter/tree/master/cli),
   you should then be able to open a local playground using `tree-sitter build-wasm && tree-sitter web-ui` within the
   parsers repo.
-- Examples of queries can be found in [queries/](queries/)
+- Examples of queries can be found in [runtime/queries/](runtime/queries/)
 - Matches in the bottom will override queries that are above of them.
 
 #### Inheriting languages
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 338c75463..000000000
--- a/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# https://github.com/luarocks/luarocks/wiki/Creating-a-Makefile-that-plays-nice-with-LuaRocks
-build: 
-	echo "Do nothing"
-
-install:
-	mkdir -p $(INST_LUADIR)
-	cp -r lua/* $(INST_LUADIR)
diff --git a/README.md b/README.md
index 2cb5f033b..715ec50ed 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
+<h1 align="center">
+  <img src="https://github.com/nvim-treesitter/nvim-treesitter/assets/2361214/0513b223-c902-4f12-92ee-8ac4d8d6f41f" alt="nvim-treesitter">
+</h1>
 <div align="center">
-  <h1>nvim-treesitter</h1>
   <p>
     <a href="https://matrix.to/#/#nvim-treesitter:matrix.org">
       <img alt="Matrix Chat" src="https://img.shields.io/matrix/nvim-treesitter:matrix.org" />
@@ -13,608 +15,111 @@
   </p>
 </div>
 
-<div align="center">
-  <p>
-    <img src="assets/logo.png" align="center" alt="Logo" />
-  </p>
-  <p>
-    <a href="https://github.com/tree-sitter/tree-sitter">Treesitter</a>
-    configurations and abstraction layer for
-    <a href="https://github.com/neovim/neovim/">Neovim</a>.
-  </p>
-  <p>
-    <i>
-      Logo by <a href="https://github.com/steelsojka">@steelsojka</a>
-    </i>
-  </p>
-</div>
+# WARNING
 
-The goal of `nvim-treesitter` is both to provide a simple and easy way to use the interface for [tree-sitter](https://github.com/tree-sitter/tree-sitter) in Neovim and to provide some basic functionality such as highlighting based on it:
+**This branch is a [full, incompatible, rewrite of `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767) and [work in progress](TODO.md). This branch REQUIRES (the latest commit on) Neovim `master`.**
 
-![example-cpp](https://user-images.githubusercontent.com/2361214/202753610-e923bf4e-e88f-494b-bb1e-d22a7688446f.png)
-
-Traditional highlighting (left) vs Treesitter-based highlighting (right).
-More examples can be found in [our gallery](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Gallery).
-
-**Warning: Treesitter and nvim-treesitter highlighting are an experimental feature of Neovim.
-Please consider the experience with this plug-in as experimental until Tree-Sitter support in Neovim is stable!
-We recommend using the nightly builds of Neovim if possible.
-You can find the current roadmap [here](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767).
-The roadmap and all features of this plugin are open to change, and any suggestion will be highly appreciated!**
-
-Nvim-treesitter is based on three interlocking features: [**language parsers**](#language-parsers), [**queries**](#adding-queries), and [**modules**](#available-modules), where _modules_ provide features – e.g., highlighting – based on _queries_ for syntax objects extracted from a given buffer by _language parsers_.
-Users will generally only need to interact with parsers and modules as explained in the next section.
-For more detailed information on setting these up, see ["Advanced setup"](#advanced-setup).
-
----
-
-### Table of contents
-
-- [Quickstart](#quickstart)
-- [Supported languages](#supported-languages)
-- [Available modules](#available-modules)
-- [Advanced setup](#advanced-setup)
-- [Extra features](#extra-features)
-- [Troubleshooting](#troubleshooting)
-
----
+The `nvim-treesitter` plugin provides
+1. functions for installing, updating, and removing [**tree-sitter parsers**](SUPPORTED_LANGUAGES.md);
+2. a collection of **queries** for enabling tree-sitter features built into Neovim for these languages.
 
 # Quickstart
 
 ## Requirements
 
-- **Neovim 0.10** or later  ([nightly](https://github.com/neovim/neovim#install-from-source) recommended)
+- Neovim 0.10.0 or later (nightly)
 - `tar` and `curl` in your path (or alternatively `git`)
-- A C compiler in your path and libstdc++ installed ([Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support)).
+- a C compiler in your path and libstdc++ installed ([Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support))
+- optional: `tree-sitter` CLI and `node`
 
 ## Installation
 
 You can install `nvim-treesitter` with your favorite package manager (or using the native `package` feature of vim, see `:h packages`).
 
 **NOTE: This plugin is only guaranteed to work with specific versions of language parsers** (as specified in the `lockfile.json`). **When upgrading the plugin, you must make sure that all installed parsers are updated to the latest version** via `:TSUpdate`.
-It is strongly recommended to automate this; e.g., if you are using [vim-plug](https://github.com/junegunn/vim-plug), put this in your `init.vim` file:
-
-```vim
-Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-```
-
-For other plugin managers such as `packer.nvim`, see this [Installation page from the wiki](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Installation) (Note that this page is community maintained).
-
-## Language parsers
-
-Treesitter uses a different _parser_ for every language, which needs to be generated via `tree-sitter-cli` from a `grammar.js` file, then compiled to a `.so` library that needs to be placed in neovim's `runtimepath` (typically under `parser/{language}.so`).
-To simplify this, `nvim-treesitter` provides commands to automate this process.
-If the language is already [supported by `nvim-treesitter`](#supported-languages), you can install it with
-
-```vim
-:TSInstall <language_to_install>
-```
-
-This command supports tab expansion.
-You can also get a list of all available languages and their installation status with `:TSInstallInfo`.
-Parsers not on this list can be added manually by following the steps described under ["Adding parsers"](#adding-parsers) below.
-
-To make sure a parser is at the latest compatible version (as specified in `nvim-treesitter`'s `lockfile.json`), use `:TSUpdate {language}`. To update all parsers unconditionally, use `:TSUpdate all` or just `:TSUpdate`.
-
-## Modules
-
-Each module provides a distinct tree-sitter-based feature such as [highlighting](#highlight), [indentation](#indentation), or [folding](#folding); see [`:h nvim-treesitter-modules`](doc/nvim-treesitter.txt) or ["Available modules"](#available-modules) below for a list of modules and their options.
-
-Following examples assume that you are configuring neovim with lua. If you are using vimscript, see `:h lua-heredoc`.
-All modules are disabled by default and need to be activated explicitly in your `init.lua`, e.g., via
+It is strongly recommended to automate this; e.g., using [lazy.nvim](https://github.com/folke/lazy.nvim)
 
 ```lua
-require'nvim-treesitter.configs'.setup {
-  -- A list of parser names, or "all" (the listed parsers MUST always be installed)
-  ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline" },
+require('lazy').setup(
+  { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', lazy = false }
+)
+```
 
-  -- Install parsers synchronously (only applied to `ensure_installed`)
+**NOTE: This plugin does not support lazy-loading.**
+
+## Setup
+
+`nvim-treesitter` can be configured by calling `setup`. The following snippet lists the available options and their default values. **You do not need to call `setup` for `nvim-treesitter` to work using default values.**
+
+```lua
+require'nvim-treesitter'.setup {
+  -- A list of parser names or tiers ('core', 'stable', 'community', 'unstable')
+  ensure_install = { },
+
+  -- List of parsers to ignore installing
+  ignore_install = { },
+
+  -- Install parsers synchronously (only applied to `ensure_install`)
   sync_install = false,
 
   -- Automatically install missing parsers when entering buffer
-  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-  auto_install = true,
+  auto_install = false,
 
-  -- List of parsers to ignore installing (or "all")
-  ignore_install = { "javascript" },
-
-  ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-  -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
-
-  highlight = {
-    enable = true,
-
-    -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
-    -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
-    -- the name of the parser)
-    -- list of language that will be disabled
-    disable = { "c", "rust" },
-    -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
-    disable = function(lang, buf)
-        local max_filesize = 100 * 1024 -- 100 KB
-        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
-        if ok and stats and stats.size > max_filesize then
-            return true
-        end
-    end,
-
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
-  },
+  -- Directory to install parsers and queries to
+  install_dir = vim.fn.stdpath('data') .. '/site'
 }
 ```
 
-Each module can also be enabled or disabled interactively through the following commands:
-
-```vim
-:TSBufEnable {module} " enable module on current buffer
-:TSBufDisable {module} " disable module on current buffer
-:TSEnable {module} [{ft}] " enable module on every buffer. If filetype is specified, enable only for this filetype.
-:TSDisable {module} [{ft}] " disable module on every buffer. If filetype is specified, disable only for this filetype.
-:TSModuleInfo [{module}] " list information about modules state for each filetype
-```
-
 Check [`:h nvim-treesitter-commands`](doc/nvim-treesitter.txt) for a list of all available commands.
-It may be necessary to reload the buffer (e.g., via `:e`) after enabling a module interactively.
 
 # Supported languages
 
 For `nvim-treesitter` to support a specific feature for a specific language requires both a parser for that language and an appropriate language-specific query file for that feature.
 
-The following is a list of languages for which a parser can be installed through `:TSInstall`; a checked box means that `nvim-treesitter` also contains queries at least for the `highlight` module.
-
-Experimental parsers are parsers that have a maintainer but are not stable enough for
-daily use yet.
+A list of the currently supported languages can be found [on this page](SUPPORTED_LANGUAGES.md).
 
 We are looking for maintainers to add more parsers and to write query files for their languages. Check our [tracking issue](https://github.com/nvim-treesitter/nvim-treesitter/issues/2282) for open language requests.
 
-<!--This section of the README is automatically updated by a CI job-->
-<!--parserinfo-->
-- [x] [ada](https://github.com/briot/tree-sitter-ada) (maintained by @briot)
-- [x] [agda](https://github.com/tree-sitter/tree-sitter-agda) (maintained by @Decodetalkers)
-- [x] [angular](https://github.com/dlvandenberg/tree-sitter-angular) (experimental, maintained by @dlvandenberg)
-- [x] [apex](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
-- [x] [arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) (maintained by @ObserverOfTime)
-- [x] [asm](https://github.com/RubixDev/tree-sitter-asm) (maintained by @RubixDev)
-- [x] [astro](https://github.com/virchau13/tree-sitter-astro) (maintained by @virchau13)
-- [x] [authzed](https://github.com/mleonidas/tree-sitter-authzed) (maintained by @mattpolzin)
-- [ ] [awk](https://github.com/Beaglefoot/tree-sitter-awk)
-- [x] [bash](https://github.com/tree-sitter/tree-sitter-bash) (maintained by @TravonteD)
-- [x] [bass](https://github.com/vito/tree-sitter-bass) (maintained by @amaanq)
-- [x] [beancount](https://github.com/polarmutex/tree-sitter-beancount) (maintained by @polarmutex)
-- [x] [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) (maintained by @theHamsta, @clason)
-- [x] [bicep](https://github.com/amaanq/tree-sitter-bicep) (maintained by @amaanq)
-- [x] [bitbake](https://github.com/amaanq/tree-sitter-bitbake) (maintained by @amaanq)
-- [x] [blade](https://github.com/EmranMR/tree-sitter-blade) (maintained by @calebdw)
-- [x] [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) (experimental, maintained by @gabmus)
-- [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
-- [x] [brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) (maintained by @ajdelcimmuto)
-- [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
-- [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
-- [x] [caddy](https://github.com/opa-oz/tree-sitter-caddy) (maintained by @opa-oz)
-- [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
-- [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
-- [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
-- [x] [circom](https://github.com/Decurity/tree-sitter-circom) (maintained by @alexandr-martirosyan)
-- [x] [clojure](https://github.com/sogaiu/tree-sitter-clojure) (maintained by @NoahTheDuke)
-- [x] [cmake](https://github.com/uyha/tree-sitter-cmake) (maintained by @uyha)
-- [x] [comment](https://github.com/stsewd/tree-sitter-comment) (maintained by @stsewd)
-- [x] [commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) (maintained by @theHamsta)
-- [x] [cooklang](https://github.com/addcninblue/tree-sitter-cooklang) (maintained by @addcninblue)
-- [x] [corn](https://github.com/jakestanger/tree-sitter-corn) (maintained by @jakestanger)
-- [x] [cpon](https://github.com/amaanq/tree-sitter-cpon) (maintained by @amaanq)
-- [x] [cpp](https://github.com/tree-sitter/tree-sitter-cpp) (maintained by @theHamsta)
-- [x] [css](https://github.com/tree-sitter/tree-sitter-css) (maintained by @TravonteD)
-- [x] [csv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
-- [x] [cuda](https://github.com/theHamsta/tree-sitter-cuda) (maintained by @theHamsta)
-- [x] [cue](https://github.com/eonpatapon/tree-sitter-cue) (maintained by @amaanq)
-- [x] [cylc](https://github.com/elliotfontaine/tree-sitter-cylc) (maintained by @elliotfontaine)
-- [x] [d](https://github.com/gdamore/tree-sitter-d) (maintained by @amaanq)
-- [x] [dart](https://github.com/UserNobody14/tree-sitter-dart) (maintained by @akinsho)
-- [x] [desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) (maintained by @ValdezFOmar)
-- [x] [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) (maintained by @jedrzejboczar)
-- [x] [dhall](https://github.com/jbellerb/tree-sitter-dhall) (maintained by @amaanq)
-- [x] [diff](https://github.com/the-mikedavis/tree-sitter-diff) (maintained by @gbprod)
-- [x] [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) (maintained by @ColinKennedy)
-- [x] [djot](https://github.com/treeman/tree-sitter-djot) (maintained by @NoahTheDuke)
-- [x] [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) (maintained by @camdencheek)
-- [x] [dot](https://github.com/rydesun/tree-sitter-dot) (maintained by @rydesun)
-- [x] [doxygen](https://github.com/amaanq/tree-sitter-doxygen) (maintained by @amaanq)
-- [x] [dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
-- [x] [earthfile](https://github.com/glehmann/tree-sitter-earthfile) (maintained by @glehmann)
-- [x] [ebnf](https://github.com/RubixDev/ebnf) (experimental, maintained by @RubixDev)
-- [x] [editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) (maintained by @ValdezFOmar)
-- [x] [eds](https://github.com/uyha/tree-sitter-eds) (maintained by @uyha)
-- [x] [eex](https://github.com/connorlay/tree-sitter-eex) (maintained by @connorlay)
-- [x] [elixir](https://github.com/elixir-lang/tree-sitter-elixir) (maintained by @connorlay)
-- [x] [elm](https://github.com/elm-tooling/tree-sitter-elm) (maintained by @zweimach)
-- [x] [elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) (maintained by @glapa-grossklag, @amaanq)
-- [x] [elvish](https://github.com/elves/tree-sitter-elvish) (maintained by @elves)
-- [ ] [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template)
-- [x] [enforce](https://github.com/simonvic/tree-sitter-enforce) (maintained by @simonvic)
-- [x] [erlang](https://github.com/WhatsApp/tree-sitter-erlang) (maintained by @filmor)
-- [x] [facility](https://github.com/FacilityApi/tree-sitter-facility) (maintained by @bryankenote)
-- [x] [faust](https://github.com/khiner/tree-sitter-faust) (maintained by @khiner)
-- [x] [fennel](https://github.com/alexmozaidze/tree-sitter-fennel) (maintained by @alexmozaidze)
-- [x] [fidl](https://github.com/google/tree-sitter-fidl) (maintained by @chaopeng)
-- [x] [firrtl](https://github.com/amaanq/tree-sitter-firrtl) (maintained by @amaanq)
-- [x] [fish](https://github.com/ram02z/tree-sitter-fish) (maintained by @ram02z)
-- [x] [foam](https://github.com/FoamScience/tree-sitter-foam) (experimental, maintained by @FoamScience)
-- [x] [forth](https://github.com/AlexanderBrevig/tree-sitter-forth) (maintained by @amaanq)
-- [x] [fortran](https://github.com/stadelmanma/tree-sitter-fortran) (maintained by @amaanq)
-- [x] [fsh](https://github.com/mgramigna/tree-sitter-fsh) (maintained by @mgramigna)
-- [x] [fsharp](https://github.com/ionide/tree-sitter-fsharp) (maintained by @nsidorenco)
-- [x] [func](https://github.com/amaanq/tree-sitter-func) (maintained by @amaanq)
-- [x] [fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) (maintained by @jirgn)
-- [x] [GAP system](https://github.com/gap-system/tree-sitter-gap) (maintained by @reiniscirpons)
-- [x] [GAP system test files](https://github.com/gap-system/tree-sitter-gaptst) (maintained by @reiniscirpons)
-- [x] [Godot (gdscript)](https://github.com/PrestonKnopp/tree-sitter-gdscript) (maintained by @PrestonKnopp)
-- [x] [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) (maintained by @godofavacyn)
-- [x] [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) (maintained by @amaanq)
-- [x] [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) (maintained by @gbprod)
-- [x] [gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) (maintained by @ObserverOfTime)
-- [x] [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) (maintained by @gbprod)
-- [x] [gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) (maintained by @theHamsta)
-- [x] [gleam](https://github.com/gleam-lang/tree-sitter-gleam) (maintained by @amaanq)
-- [x] [Glimmer and Ember](https://github.com/ember-tooling/tree-sitter-glimmer) (maintained by @NullVoxPopuli)
-- [x] [glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) (maintained by @NullVoxPopuli)
-- [x] [glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) (maintained by @NullVoxPopuli)
-- [x] [glsl](https://github.com/theHamsta/tree-sitter-glsl) (maintained by @theHamsta)
-- [x] [GN (Generate Ninja)](https://github.com/amaanq/tree-sitter-gn) (maintained by @amaanq)
-- [x] [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) (maintained by @dpezto)
-- [x] [go](https://github.com/tree-sitter/tree-sitter-go) (maintained by @theHamsta, @WinWisely268)
-- [x] [goctl](https://github.com/chaozwn/tree-sitter-goctl) (maintained by @chaozwn)
-- [x] [Godot Resources (gdresource)](https://github.com/PrestonKnopp/tree-sitter-godot-resource) (maintained by @pierpo)
-- [x] [gomod](https://github.com/camdencheek/tree-sitter-go-mod) (maintained by @camdencheek)
-- [x] [gosum](https://github.com/amaanq/tree-sitter-go-sum) (maintained by @amaanq)
-- [x] [gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) (maintained by @qvalentin)
-- [x] [gowork](https://github.com/omertuc/tree-sitter-go-work) (maintained by @omertuc)
-- [x] [gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) (maintained by @ObserverOfTime)
-- [x] [graphql](https://github.com/bkegley/tree-sitter-graphql) (maintained by @bkegley)
-- [x] [gren](https://github.com/MaeBrooks/tree-sitter-gren) (maintained by @MaeBrooks)
-- [x] [groovy](https://github.com/murtaza64/tree-sitter-groovy) (maintained by @murtaza64)
-- [x] [gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) (maintained by @theHamsta)
-- [ ] [hack](https://github.com/slackhq/tree-sitter-hack)
-- [x] [hare](https://github.com/amaanq/tree-sitter-hare) (maintained by @amaanq)
-- [x] [haskell](https://github.com/tree-sitter/tree-sitter-haskell) (maintained by @mrcjkb)
-- [x] [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) (maintained by @lykahb)
-- [x] [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
-- [x] [heex](https://github.com/connorlay/tree-sitter-heex) (maintained by @connorlay)
-- [x] [helm](https://github.com/ngalaiko/tree-sitter-go-template) (maintained by @qvalentin)
-- [x] [hjson](https://github.com/winston0410/tree-sitter-hjson) (maintained by @winston0410)
-- [x] [hlsl](https://github.com/theHamsta/tree-sitter-hlsl) (maintained by @theHamsta)
-- [x] [hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) (maintained by @Freed-Wu)
-- [x] [hocon](https://github.com/antosha417/tree-sitter-hocon) (maintained by @antosha417)
-- [x] [hoon](https://github.com/urbit-pilled/tree-sitter-hoon) (experimental, maintained by @urbit-pilled)
-- [x] [html](https://github.com/tree-sitter/tree-sitter-html) (maintained by @TravonteD)
-- [x] [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) (experimental, maintained by @ObserverOfTime)
-- [x] [http](https://github.com/rest-nvim/tree-sitter-http) (maintained by @amaanq, @NTBBloodbath)
-- [x] [hurl](https://github.com/pfeiferj/tree-sitter-hurl) (maintained by @pfeiferj)
-- [x] [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) (maintained by @luckasRanarison)
-- [x] [idl](https://github.com/cathaysia/tree-sitter-idl) (maintained by @cathaysia)
-- [x] [idris](https://github.com/kayhide/tree-sitter-idris) (maintained by @srghma)
-- [x] [ini](https://github.com/justinmk/tree-sitter-ini) (experimental, maintained by @theHamsta)
-- [x] [inko](https://github.com/inko-lang/tree-sitter-inko) (maintained by @yorickpeterse)
-- [x] [ipkg](https://github.com/srghma/tree-sitter-ipkg) (maintained by @srghma)
-- [x] [ispc](https://github.com/fab4100/tree-sitter-ispc) (maintained by @fab4100)
-- [x] [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) (maintained by @sogaiu)
-- [x] [java](https://github.com/tree-sitter/tree-sitter-java) (maintained by @p00f)
-- [x] [javadoc](https://github.com/rmuir/tree-sitter-javadoc) (maintained by @rmuir)
-- [x] [javascript](https://github.com/tree-sitter/tree-sitter-javascript) (maintained by @steelsojka)
-- [x] [jinja](https://github.com/cathaysia/tree-sitter-jinja) (maintained by @cathaysia)
-- [x] [jinja_inline](https://github.com/cathaysia/tree-sitter-jinja) (maintained by @cathaysia)
-- [x] [jq](https://github.com/flurie/tree-sitter-jq) (maintained by @ObserverOfTime)
-- [x] [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) (maintained by @steelsojka)
-- [x] [json](https://github.com/tree-sitter/tree-sitter-json) (maintained by @steelsojka)
-- [x] [json5](https://github.com/Joakker/tree-sitter-json5) (maintained by @Joakker)
-- [x] [JSON with comments](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) (maintained by @WhyNotHugo)
-- [x] [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) (maintained by @nawordar)
-- [x] [julia](https://github.com/tree-sitter/tree-sitter-julia) (maintained by @fredrikekre)
-- [x] [just](https://github.com/IndianBoy42/tree-sitter-just) (maintained by @Hubro)
-- [x] [kcl](https://github.com/kcl-lang/tree-sitter-kcl) (maintained by @bertbaron)
-- [x] [kconfig](https://github.com/amaanq/tree-sitter-kconfig) (maintained by @amaanq)
-- [x] [kdl](https://github.com/amaanq/tree-sitter-kdl) (maintained by @amaanq)
-- [x] [kotlin](https://github.com/fwcd/tree-sitter-kotlin) (maintained by @SalBakraa)
-- [x] [koto](https://github.com/koto-lang/tree-sitter-koto) (maintained by @irh)
-- [x] [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) (maintained by @Willem-J-an)
-- [x] [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) (maintained by @traxys)
-- [x] [latex](https://github.com/latex-lsp/tree-sitter-latex) (maintained by @theHamsta, @clason)
-- [x] [ledger](https://github.com/cbarrete/tree-sitter-ledger) (maintained by @cbarrete)
-- [x] [leo](https://github.com/r001/tree-sitter-leo) (maintained by @r001)
-- [x] [linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) (maintained by @amaanq)
-- [x] [liquid](https://github.com/hankthetank27/tree-sitter-liquid) (maintained by @hankthetank27)
-- [x] [liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) (maintained by @toots)
-- [x] [llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) (maintained by @benwilliamgraham)
-- [x] [lua](https://github.com/MunifTanjim/tree-sitter-lua) (maintained by @muniftanjim)
-- [x] [luadoc](https://github.com/amaanq/tree-sitter-luadoc) (maintained by @amaanq)
-- [x] [lua patterns](https://github.com/amaanq/tree-sitter-luap) (maintained by @amaanq)
-- [x] [luau](https://github.com/amaanq/tree-sitter-luau) (maintained by @amaanq)
-- [x] [m68k](https://github.com/grahambates/tree-sitter-m68k) (maintained by @grahambates)
-- [x] [make](https://github.com/alemuller/tree-sitter-make) (maintained by @lewis6991)
-- [x] [markdown (basic highlighting)](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
-- [x] [markdown_inline (needed for full highlighting)](https://github.com/MDeiml/tree-sitter-markdown) (experimental, maintained by @MDeiml)
-- [x] [matlab](https://github.com/acristoffers/tree-sitter-matlab) (maintained by @acristoffers)
-- [x] [menhir](https://github.com/Kerl13/tree-sitter-menhir) (maintained by @Kerl13)
-- [ ] [mermaid](https://github.com/monaqa/tree-sitter-mermaid) (experimental)
-- [x] [meson](https://github.com/Decodetalkers/tree-sitter-meson) (maintained by @Decodetalkers)
-- [x] [mlir](https://github.com/artagnon/tree-sitter-mlir) (experimental, maintained by @artagnon)
-- [x] [muttrc](https://github.com/neomutt/tree-sitter-muttrc) (maintained by @Freed-Wu)
-- [x] [nasm](https://github.com/naclsn/tree-sitter-nasm) (maintained by @ObserverOfTime)
-- [x] [nginx](https://github.com/opa-oz/tree-sitter-nginx) (maintained by @opa-oz)
-- [ ] [nickel](https://github.com/nickel-lang/tree-sitter-nickel)
-- [x] [nim](https://github.com/alaviss/tree-sitter-nim) (maintained by @aMOPel)
-- [x] [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) (maintained by @aMOPel)
-- [x] [ninja](https://github.com/alemuller/tree-sitter-ninja) (maintained by @alemuller)
-- [x] [nix](https://github.com/cstrahan/tree-sitter-nix) (maintained by @leo60228)
-- [x] [norg](https://github.com/nvim-neorg/tree-sitter-norg) (maintained by @JoeyGrajciar, @vhyrro)
-- [x] [nqc](https://github.com/amaanq/tree-sitter-nqc) (maintained by @amaanq)
-- [x] [nu](https://github.com/nushell/tree-sitter-nu) (maintained by @abhisheksingh0x558)
-- [x] [objc](https://github.com/amaanq/tree-sitter-objc) (maintained by @amaanq)
-- [x] [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) (maintained by @ColinKennedy)
-- [x] [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
-- [x] [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) (maintained by @undu)
-- [x] [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) (maintained by @undu)
-- [x] [odin](https://github.com/amaanq/tree-sitter-odin) (maintained by @amaanq)
-- [x] [pascal](https://github.com/Isopod/tree-sitter-pascal) (maintained by @Isopod)
-- [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
-- [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
-- [x] [perl](https://github.com/tree-sitter-perl/tree-sitter-perl) (maintained by @RabbiVeesh, @LeoNerd)
-- [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka, @calebdw)
-- [x] [php_only](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka, @calebdw)
-- [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
-- [x] [pioasm](https://github.com/leo60228/tree-sitter-pioasm) (maintained by @leo60228)
-- [x] [po](https://github.com/erasin/tree-sitter-po) (maintained by @amaanq)
-- [x] [pod](https://github.com/tree-sitter-perl/tree-sitter-pod) (maintained by @RabbiVeesh, @LeoNerd)
-- [x] [Path of Exile item filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter) (experimental, maintained by @ObserverOfTime)
-- [x] [pony](https://github.com/amaanq/tree-sitter-pony) (maintained by @amaanq, @mfelsche)
-- [x] [powershell](https://github.com/airbus-cert/tree-sitter-powershell) (maintained by @L2jLiga)
-- [x] [printf](https://github.com/ObserverOfTime/tree-sitter-printf) (maintained by @ObserverOfTime)
-- [x] [prisma](https://github.com/victorhqc/tree-sitter-prisma) (maintained by @elianiva)
-- [x] [problog](https://github.com/foxyseta/tree-sitter-prolog) (maintained by @foxyseta)
-- [x] [prolog](https://github.com/foxyseta/tree-sitter-prolog) (maintained by @foxyseta)
-- [x] [promql](https://github.com/MichaHoffmann/tree-sitter-promql) (maintained by @MichaHoffmann)
-- [x] [properties](https://github.com/tree-sitter-grammars/tree-sitter-properties) (maintained by @ObserverOfTime)
-- [x] [proto](https://github.com/treywood/tree-sitter-proto) (maintained by @treywood)
-- [x] [prql](https://github.com/PRQL/tree-sitter-prql) (maintained by @matthias-Q)
-- [x] [psv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
-- [x] [pug](https://github.com/zealot128/tree-sitter-pug) (experimental, maintained by @zealot128)
-- [x] [puppet](https://github.com/amaanq/tree-sitter-puppet) (maintained by @amaanq)
-- [x] [purescript](https://github.com/postsolar/tree-sitter-purescript) (maintained by @postsolar)
-- [x] [PyPA manifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) (maintained by @ObserverOfTime)
-- [x] [python](https://github.com/tree-sitter/tree-sitter-python) (maintained by @stsewd, @theHamsta)
-- [x] [ql](https://github.com/tree-sitter/tree-sitter-ql) (maintained by @pwntester)
-- [x] [qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) (maintained by @amaanq)
-- [x] [qmljs](https://github.com/yuja/tree-sitter-qmljs) (maintained by @Decodetalkers)
-- [x] [Tree-Sitter query language](https://github.com/nvim-treesitter/tree-sitter-query) (maintained by @steelsojka)
-- [x] [r](https://github.com/r-lib/tree-sitter-r) (maintained by @ribru17)
-- [ ] [racket](https://github.com/6cdh/tree-sitter-racket)
-- [x] [ralph](https://github.com/alephium/tree-sitter-ralph) (maintained by @tdroxler)
-- [x] [rasi](https://github.com/Fymyte/tree-sitter-rasi) (maintained by @Fymyte)
-- [x] [razor](https://github.com/tris203/tree-sitter-razor) (maintained by @tris203)
-- [x] [rbs](https://github.com/joker1007/tree-sitter-rbs) (maintained by @joker1007)
-- [x] [re2c](https://github.com/amaanq/tree-sitter-re2c) (maintained by @amaanq)
-- [x] [readline](https://github.com/ribru17/tree-sitter-readline) (maintained by @ribru17)
-- [x] [regex](https://github.com/tree-sitter/tree-sitter-regex) (maintained by @theHamsta)
-- [x] [rego](https://github.com/FallenAngel97/tree-sitter-rego) (maintained by @FallenAngel97)
-- [x] [pip requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) (maintained by @ObserverOfTime)
-- [x] [rescript](https://github.com/rescript-lang/tree-sitter-rescript) (maintained by @ribru17)
-- [x] [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) (maintained by @bamonroe)
-- [x] [robot](https://github.com/Hubro/tree-sitter-robot) (maintained by @Hubro)
-- [x] [robots](https://github.com/opa-oz/tree-sitter-robots-txt) (maintained by @opa-oz)
-- [x] [roc](https://github.com/faldor20/tree-sitter-roc) (maintained by @nat-418)
-- [x] [ron](https://github.com/amaanq/tree-sitter-ron) (maintained by @amaanq)
-- [x] [rst](https://github.com/stsewd/tree-sitter-rst) (maintained by @stsewd)
-- [x] [ruby](https://github.com/tree-sitter/tree-sitter-ruby) (maintained by @TravonteD)
-- [x] [runescript](https://github.com/2004Scape/tree-sitter-runescript) (maintained by @2004Scape)
-- [x] [rust](https://github.com/tree-sitter/tree-sitter-rust) (maintained by @amaanq)
-- [x] [scala](https://github.com/tree-sitter/tree-sitter-scala) (maintained by @stevanmilic)
-- [x] [scfg](https://github.com/rockorager/tree-sitter-scfg) (maintained by @WhyNotHugo)
-- [ ] [scheme](https://github.com/6cdh/tree-sitter-scheme)
-- [x] [scss](https://github.com/serenadeai/tree-sitter-scss) (maintained by @elianiva)
-- [x] [sflog](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
-- [x] [slang](https://github.com/theHamsta/tree-sitter-slang) (experimental, maintained by @theHamsta)
-- [x] [slim](https://github.com/theoo/tree-sitter-slim) (maintained by @theoo)
-- [x] [slint](https://github.com/slint-ui/tree-sitter-slint) (maintained by @hunger)
-- [x] [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) (maintained by @amaanq)
-- [x] [smithy](https://github.com/indoorvivants/tree-sitter-smithy) (maintained by @amaanq, @keynmol)
-- [ ] [snakemake](https://github.com/osthomas/tree-sitter-snakemake) (experimental)
-- [x] [solidity](https://github.com/JoranHonig/tree-sitter-solidity) (maintained by @amaanq)
-- [x] [soql](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
-- [x] [sosl](https://github.com/aheber/tree-sitter-sfapex) (maintained by @aheber, @xixiaofinland)
-- [x] [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) (maintained by @Sarrus1)
-- [x] [sparql](https://github.com/GordianDziwis/tree-sitter-sparql) (maintained by @GordianDziwis)
-- [x] [sql](https://github.com/derekstride/tree-sitter-sql) (maintained by @derekstride)
-- [x] [squirrel](https://github.com/amaanq/tree-sitter-squirrel) (maintained by @amaanq)
-- [x] [ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) (maintained by @ObserverOfTime)
-- [x] [starlark](https://github.com/amaanq/tree-sitter-starlark) (maintained by @amaanq)
-- [x] [strace](https://github.com/sigmaSd/tree-sitter-strace) (maintained by @amaanq)
-- [x] [styled](https://github.com/mskelton/tree-sitter-styled) (maintained by @mskelton)
-- [x] [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) (maintained by @madskjeldgaard)
-- [x] [superhtml](https://github.com/kristoff-it/superhtml) (maintained by @rockorager)
-- [x] [surface](https://github.com/connorlay/tree-sitter-surface) (maintained by @connorlay)
-- [x] [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) (maintained by @amaanq)
-- [x] [sway](https://github.com/FuelLabs/tree-sitter-sway.git) (maintained by @ribru17)
-- [x] [swift](https://github.com/alex-pinkus/tree-sitter-swift) (maintained by @alex-pinkus)
-- [x] [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) (maintained by @RaafatTurki)
-- [x] [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) (maintained by @ok-ryoko)
-- [x] [t32](https://gitlab.com/xasc/tree-sitter-t32.git) (maintained by @xasc)
-- [x] [tablegen](https://github.com/amaanq/tree-sitter-tablegen) (maintained by @amaanq)
-- [x] [tact](https://github.com/tact-lang/tree-sitter-tact) (maintained by @novusnota)
-- [x] [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) (maintained by @lewis6991)
-- [x] [teal](https://github.com/euclidianAce/tree-sitter-teal) (maintained by @euclidianAce)
-- [x] [templ](https://github.com/vrischmann/tree-sitter-templ) (maintained by @vrischmann)
-- [x] [tera](https://github.com/uncenter/tree-sitter-tera) (maintained by @uncenter)
-- [x] [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) (maintained by @MichaHoffmann)
-- [x] [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) (maintained by @Porter)
-- [x] [thrift](https://github.com/duskmoon314/tree-sitter-thrift) (maintained by @amaanq, @duskmoon314)
-- [x] [tiger](https://github.com/ambroisie/tree-sitter-tiger) (maintained by @ambroisie)
-- [x] [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) (maintained by @ahelwer, @susliko)
-- [x] [tmux](https://github.com/Freed-Wu/tree-sitter-tmux) (maintained by @Freed-Wu)
-- [x] [todotxt](https://github.com/arnarg/tree-sitter-todotxt) (experimental, maintained by @arnarg)
-- [x] [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) (maintained by @tk-shirasaka)
-- [x] [tsv](https://github.com/amaanq/tree-sitter-csv) (maintained by @amaanq)
-- [x] [tsx](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
-- [x] [turtle](https://github.com/GordianDziwis/tree-sitter-turtle) (maintained by @GordianDziwis)
-- [x] [twig](https://github.com/gbprod/tree-sitter-twig) (maintained by @gbprod)
-- [x] [typescript](https://github.com/tree-sitter/tree-sitter-typescript) (maintained by @steelsojka)
-- [x] [typespec](https://github.com/happenslol/tree-sitter-typespec) (maintained by @happenslol)
-- [x] [typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) (maintained by @Teddytrombone)
-- [x] [typst](https://github.com/uben0/tree-sitter-typst) (maintained by @uben0, @RaafatTurki)
-- [x] [udev](https://github.com/ObserverOfTime/tree-sitter-udev) (maintained by @ObserverOfTime)
-- [x] [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) (maintained by @Philipp-M, @amaanq)
-- [x] [unison](https://github.com/kylegoetz/tree-sitter-unison) (maintained by @tapegram)
-- [x] [usd](https://github.com/ColinKennedy/tree-sitter-usd) (maintained by @ColinKennedy)
-- [x] [uxn tal](https://github.com/amaanq/tree-sitter-uxntal) (maintained by @amaanq)
-- [x] [v](https://github.com/vlang/v-analyzer) (maintained by @kkharji, @amaanq)
-- [x] [vala](https://github.com/vala-lang/tree-sitter-vala) (maintained by @Prince781)
-- [x] [vento](https://github.com/ventojs/tree-sitter-vento) (maintained by @wrapperup, @oscarotero)
-- [x] [verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) (maintained by @zhangwwpeng)
-- [x] [vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) (maintained by @jpt13653903)
-- [x] [vhs](https://github.com/charmbracelet/tree-sitter-vhs) (maintained by @caarlos0)
-- [x] [vim](https://github.com/neovim/tree-sitter-vim) (maintained by @clason)
-- [x] [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) (maintained by @clason)
-- [x] [vrl](https://github.com/belltoy/tree-sitter-vrl) (maintained by @belltoy)
-- [x] [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) (maintained by @WhyNotHugo, @lucario387)
-- [x] [wgsl](https://github.com/szebniok/tree-sitter-wgsl) (maintained by @szebniok)
-- [x] [wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) (maintained by @theHamsta)
-- [x] [wing](https://github.com/winglang/tree-sitter-wing) (maintained by @gshpychka, @MarkMcCulloh)
-- [x] [wit](https://github.com/liamwh/tree-sitter-wit) (maintained by @liamwh)
-- [x] [xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) (maintained by @ObserverOfTime)
-- [x] [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) (maintained by @ObserverOfTime)
-- [x] [xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) (maintained by @ValdezFOmar)
-- [x] [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) (maintained by @amaanq)
-- [x] [yang](https://github.com/Hubro/tree-sitter-yang) (maintained by @Hubro)
-- [x] [yuck](https://github.com/Philipp-M/tree-sitter-yuck) (maintained by @Philipp-M, @amaanq)
-- [x] [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) (maintained by @Freed-Wu)
-- [x] [zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) (maintained by @amaanq)
-- [x] [ziggy](https://github.com/kristoff-it/ziggy) (maintained by @rockorager)
-- [x] [ziggy_schema](https://github.com/kristoff-it/ziggy) (maintained by @rockorager)
-<!--parserinfo-->
-
 For related information on the supported languages, including related plugins, see [this wiki page](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Supported-Languages-Information).
 
-# Available modules
+# Supported features
 
-Modules provide the top-level features of `nvim-treesitter`.
-The following is a list of modules included in `nvim-treesitter` and their configuration via `init.lua` (where multiple modules can be combined in a single call to `setup`).
-Note that not all modules work for all languages (depending on the queries available for them).
-Additional modules can be provided as [external plugins](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Extra-modules-and-plugins).
+`nvim-treesitter` provides queries for the following features. **These are not automatically enabled.**
 
-#### Highlight
+## Highlighting
 
-Consistent syntax highlighting.
+Treesitter highlighting is provided by Neovim, see `:h treesitter-highlight`. To enable it for a filetype, put `vim.treesitter.start()` in a `ftplugin/<filetype>.lua` in your config directory, or place the following in your `init.lua`:
 
 ```lua
-require'nvim-treesitter.configs'.setup {
-  highlight = {
-    enable = true,
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
-  },
-}
+vim.api.nvim_create_autocmd('FileType', {
+  pattern = { '<filetype>' },
+  callback = function() vim.treesitter.start() end,
+})
 ```
 
-To customize the syntax highlighting of a capture, simply define or link a highlight group of the same name:
+## Folds
+
+Treesitter-based folding is provided by Neovim. To enable it, put the following in your `ftplugin` or `FileType` autocommand:
 
 ```lua
--- Highlight the @foo.bar capture group with the "Identifier" highlight group
-vim.api.nvim_set_hl(0, "@foo.bar", { link = "Identifier" })
-```
-
-For a language-specific highlight, append the name of the language:
-
-```lua
--- Highlight @foo.bar as "Identifier" only in Lua files
-vim.api.nvim_set_hl(0, "@foo.bar.lua", { link = "Identifier" })
-```
-
-See `:h treesitter-highlight-groups` for details.
-
-#### Incremental selection
-
-Incremental selection based on the named nodes from the grammar.
-
-```lua
-require'nvim-treesitter.configs'.setup {
-  incremental_selection = {
-    enable = true,
-    keymaps = {
-      init_selection = "gnn", -- set to `false` to disable one of the mappings
-      node_incremental = "grn",
-      scope_incremental = "grc",
-      node_decremental = "grm",
-    },
-  },
-}
-```
-
-#### Indentation
-
-Indentation based on treesitter for the `=` operator.
-**NOTE: This is an experimental feature**.
-
-```lua
-require'nvim-treesitter.configs'.setup {
-  indent = {
-    enable = true
-  }
-}
-```
-
-#### Folding
-
-Tree-sitter based folding (implemented in Neovim itself, see `:h vim.treesitter.foldexpr()`). To enable it for the current window, set
-
-```lua
-vim.wo.foldmethod = 'expr'
 vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
 ```
 
-This will respect your `foldminlines` and `foldnestmax` settings.
+## Indentation
 
-# Advanced setup
-
-## Changing the parser install directory
-
-If you want to install the parsers to a custom directory you can specify this
-directory with `parser_install_dir` option in that is passed to `setup`.
-`nvim-treesitter` will then install the parser files into this directory.
-
-This directory must be writeable and must be explicitly prepended to the
-`runtimepath`. For example:
+Treesitter-based indentation is provided by this plugin but considered **experimental**. To enable it, put the following in your `ftplugin` or `FileType` autocommand:
 
 ```lua
-  -- It MUST be at the beginning of runtimepath. Otherwise the parsers from Neovim itself
-  -- is loaded that may not be compatible with the queries from the 'nvim-treesitter' plugin.
-  vim.opt.runtimepath:prepend("/some/path/to/store/parsers")
-
-  require'nvim-treesitter.configs'.setup {
-    parser_install_dir = "/some/path/to/store/parsers",
-
-    ...
-
-  }
+vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
 ```
 
-If this option is not included in the setup options, or is explicitly set to
-`nil` then the default install directories will be used. If this value is set
-the default directories will be ignored.
+(Note the specific quotes used.)
 
-Bear in mind that any parser installed into a parser folder on the runtime path
-will still be considered installed. (For example if
-"~/.local/share/nvim/site/parser/c.so" exists then the "c" parser will be
-considered installed, even though it is not in `parser_install_dir`)
+## Injections
 
-The default paths are:
+Injections are used for multi-language documents, see `:h treesitter-language-injections`. No setup is needed.
 
-1. first the package folder. Where `nvim-treesitter` is installed.
-2. second the site directory. This is the "site" subdirectory of `stdpath("data")`.
+# Advanced setup
 
 ## Adding parsers
 
@@ -625,139 +130,56 @@ If you have a parser that is not on the list of supported languages (either as a
 3. Add the following snippet to your `init.lua`:
 
 ```lua
-local parser_config = require "nvim-treesitter.parsers".get_parser_configs()
+local parser_config = require "nvim-treesitter.parsers".configs
 parser_config.zimbu = {
   install_info = {
     url = "~/projects/tree-sitter-zimbu", -- local path or git repo
     files = {"src/parser.c"}, -- note that some parsers also require src/scanner.c or src/scanner.cc
     -- optional entries:
-    branch = "main", -- default branch in case of git repo if different from master
+    branch = "develop", -- only needed if different from default branch
     generate_requires_npm = false, -- if stand-alone parser without npm dependencies
     requires_generate_from_grammar = false, -- if folder contains pre-generated src/parser.c
   },
-  filetype = "zu", -- if filetype does not match the parser name
 }
 ```
+If you use a git repository for your parser and want to use a specific version, you can set the `revision` key
+in the `install_info` table for you parser config.
 
-If you wish to set a specific parser for a filetype, you should use `vim.treesitter.language.register()`:
+4. If the parser name differs from the filetype(s) used by Neovim, you need to register the parser via
 
 ```lua
-vim.treesitter.language.register('python', 'someft')  -- the someft filetype will use the python parser and queries.
+vim.treesitter.language.register('zimbu', { 'zu' })
 ```
 
-Note this requires Nvim v0.9.
+If Neovim does not detect your language's filetype by default, you can use [Neovim's `vim.filetype.add()`](<https://neovim.io/doc/user/lua.html#vim.filetype.add()>) to add a custom detection rule.
 
-4. Start `nvim` and `:TSInstall zimbu`.
+5. Start `nvim` and `:TSInstall zimbu`.
 
 You can also skip step 2 and use `:TSInstallFromGrammar zimbu` to install directly from a `grammar.js` in the top-level directory specified by `url`.
 Once the parser is installed, you can update it (from the latest revision of the `main` branch if `url` is a Github repository) with `:TSUpdate zimbu`.
 
-Note that neither `:TSInstall` nor `:TSInstallFromGrammar` copy query files from the grammar repository.
-If you want your installed grammar to be useful, you must manually [add query files](#adding-queries) to your local nvim-treesitter installation.
-Note also that module functionality is only triggered if your language's filetype is correctly identified.
-If Neovim does not detect your language's filetype by default, you can use [Neovim's `vim.filetype.add()`](<https://neovim.io/doc/user/lua.html#vim.filetype.add()>) to add a custom detection rule.
-
-If you use a git repository for your parser and want to use a specific version, you can set the `revision` key
-in the `install_info` table for you parser config.
 
 ## Adding queries
 
-Queries are what `nvim-treesitter` uses to extract information from the syntax tree;
-they are located in the `queries/{language}/*` runtime directories (see `:h rtp`),
-like the `queries` folder of this plugin, e.g. `queries/{language}/{locals,highlights,textobjects}.scm`.
-Other modules may require additional queries such as `folding.scm`. You can find a
-list of all supported capture names in [CONTRIBUTING.md](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md#parser-configurations).
-
-The first query file on `runtimepath` will be used (see `:h treesitter-query`).
-If you want to make a query on the user config extend other queries instead of
-replacing them, see `:h treesitter-query-modeline-extends`.
-
-If you want to completely override a query, you can use `:h vim.treesitter.query.set()`.
-For example, to override the `injections` queries from `c` with your own:
+Queries can be placed anywhere in your `runtimepath` under `queries/<language>`, with earlier directories taking precedence unless the queries are marked with `; extends`; see `:h treesitter-query`.
 
+E.g., to add queries for `zimbu`, put `highlights.scm` etc. under
 ```lua
-vim.treesitter.query.set("c", "injections", "(comment) @comment")
+vim.fn.stdpath('data') .. 'site/queries/zimbu'
 ```
 
-Note: when using `query.set()`, all queries in the runtime directories will be ignored.
-
-## Adding modules
-
-If you wish you write your own module, you need to support
-
-- tree-sitter language detection support;
-- attaching and detaching to buffers;
-- all nvim-treesitter commands.
-
-At the top level, you can use the `define_modules` function to define one or more modules or module groups:
-
-```lua
-require'nvim-treesitter'.define_modules {
-  my_cool_plugin = {
-    attach = function(bufnr, lang)
-      -- Do cool stuff here
-    end,
-    detach = function(bufnr)
-      -- Undo cool stuff here
-    end,
-    is_supported = function(lang)
-      -- Check if the language is supported
-    end
-  }
-}
-```
-
-with the following properties:
-
-- `module_path` specifies a require path (string) that exports a module with an `attach` and `detach` function. This is not required if the functions are on this definition.
-- `enable` determines if the module is enabled by default. This is usually overridden by the user.
-- `disable` takes a list of languages that this module is disabled for. This is usually overridden by the user.
-- `is_supported` takes a function that takes a language and determines if this module supports that language.
-- `attach` takes a function that attaches to a buffer. This is required if `module_path` is not provided.
-- `detach` takes a function that detaches from a buffer. This is required if `module_path` is not provided.
-
-# Extra features
-
-### Statusline indicator
-
-```vim
-echo nvim_treesitter#statusline(90)  " 90 can be any length
-module->expression_statement->call->identifier
-```
-
-### Utilities
-
-You can get some utility functions with
-
-```lua
-local ts_utils = require 'nvim-treesitter.ts_utils'
-```
-
-Check [`:h nvim-treesitter-utils`](doc/nvim-treesitter.txt) for more information.
-
 # Troubleshooting
 
 Before doing anything, make sure you have the latest version of this plugin and run `:checkhealth nvim-treesitter`.
 It can also help to update the parsers via `:TSUpdate`.
 
-#### Feature `X` does not work for `{language}`...
+#### Feature `{X}` does not work for `{language}`...
 
-First, check the `health#nvim_treesitter#check` and the `health#treesitter#check` sections of `:checkhealth` for any warning.
-If there is one, it's highly likely that this is the cause of the problem.
+1. Check the `nvim-treesitter` section of `:checkhealth` for any warning, and make sure that the query for `{X}` is listed for `{language}`.
 
-Next check the `## Parser/Features` subsection of the `health#nvim_treesitter#check` section of `:checkhealth` to ensure the desired module is enabled for your language.
-If not, you might be missing query files; see [Adding queries](#adding-queries).
+2. Ensure that the feature is enabled as explained above.
 
-Finally, ensure Neovim is correctly identifying your language's filetype using the `:echo &filetype` command while one of your language's files is open in Neovim.
-If not, add a short Vimscript file to nvim-treesitter's `ftdetect` runtime directory following [Neovim's documentation](https://neovim.io/doc/user/filetype.html#new-filetype) on filetype detection.
-You can also quickly & temporarily set the filetype for a single buffer with the `:set filetype=langname` command to test whether it fixes the problem.
-
-If everything is okay, then it might be an actual error.
-In that case, feel free to [open an issue here](https://github.com/nvim-treesitter/nvim-treesitter/issues/new/choose).
-
-#### I get `module 'vim.treesitter.query' not found`
-
-Make sure you have the latest version of Neovim.
+3. Ensure Neovim is correctly identifying your language's filetype using the `:echo &filetype` command while one of your language's files is open in Neovim.
 
 #### I get `Error detected while processing .../plugin/nvim-treesitter.vim` every time I open Neovim
 
@@ -773,32 +195,10 @@ or due to an outdated parser.
 
 - Make sure you have the parsers up to date with `:TSUpdate`
 - Make sure you don't have more than one `parser` runtime directory.
-  You can execute this command `:echo nvim_get_runtime_file('parser', v:true)` to find all runtime directories.
+  You can execute this command `:= vim.api.nvim_get_runtime_file('parser', true)` to find all runtime directories.
   If you get more than one path, remove the ones that are outside this plugin (`nvim-treesitter` directory),
   so the correct version of the parser is used.
 
-#### I experience weird highlighting issues similar to [#78](https://github.com/nvim-treesitter/nvim-treesitter/issues/78)
-
-This is a well known issue, which arises when the tree and the buffer have gotten out of sync.
-As this is an upstream issue, we don't have any definite fix.
-To get around this, you can force reparsing the buffer with
-
-```vim
-:write | edit | TSBufEnable highlight
-```
-
-This will save, restore and enable highlighting for the current buffer.
-
-#### I experience bugs when using `nvim-treesitter`'s `foldexpr` similar to [#194](https://github.com/nvim-treesitter/nvim-treesitter/issues/194)
-
-This might happen, and is known to happen, with `vim-clap`.
-To avoid these kind of errors, please use `setlocal` instead of `set` for the respective filetypes.
-
-#### I run into errors like `module 'nvim-treesitter.configs' not found` at startup
-
-This is because of `rtp` management in `nvim`, adding `packadd
-nvim-treesitter` should fix the issue.
-
 #### I want to use Git instead of curl for downloading the parsers
 
 In your Lua config:
@@ -828,24 +228,12 @@ require("nvim-treesitter.install").prefer_git = true
 In your Lua config:
 
 ```lua
-for _, config in pairs(require("nvim-treesitter.parsers").get_parser_configs()) do
+for _, config in pairs(require("nvim-treesitter.parsers").configs) do
   config.install_info.url = config.install_info.url:gsub("https://github.com/", "something else")
 end
 
-require'nvim-treesitter.configs'.setup {
+require'nvim-treesitter'.setup {
     --
     --
 }
 ```
-
-#### Using an existing parser for another filetype
-
-For example, to use the `bash` tree-sitter to highlight file with
-`filetype=apkbuild`, use:
-
-```lua
-vim.treesitter.language.register("bash", "apkbuild")
-```
-
-The `bash` tree-sitter must be installed following the usual procedure [as
-described above](#language-parsers).
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
new file mode 100644
index 000000000..a388c9c9a
--- /dev/null
+++ b/SUPPORTED_LANGUAGES.md
@@ -0,0 +1,305 @@
+# Supported languages
+
+The following is a list of languages for which a parser can be installed through `:TSInstall`.
+
+Legend:
+- **Tier:** _core_, _stable_, _community_, or _unstable_
+- **CLI:** `:TSInstall` requires `tree-sitter` CLI installed
+- **NPM:** `:TSInstallFromGrammar` requires `node` installed
+- **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections
+
+<!--This section of the README is automatically updated by a CI job-->
+<!--parserinfo-->
+Language | Tier | Queries | CLI | NPM | Maintainer
+-------- |:----:|:-------:|:---:|:---:| ----------
+[ada](https://github.com/briot/tree-sitter-ada) |  | `HF  ` |  |  | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) |  | `HF  ` |  |  | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJ` |  | ✓ | @dlvandenberg
+[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF  ` |  |  | @aheber
+[arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) |  | `HFIJ` |  |  | @ObserverOfTime
+[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J` |  |  | @RubixDev
+[astro](https://github.com/virchau13/tree-sitter-astro) |  | `HFIJ` |  |  | @virchau13
+[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J` |  |  | @mattpolzin
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) |  | `H  J` |  |  | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) |  | `HF J` |  |  | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) |  | `HFIJ` |  |  | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) |  | `HF J` |  |  | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFI ` |  |  | @theHamsta, @clason
+[bicep](https://github.com/amaanq/tree-sitter-bicep) |  | `HFIJ` |  |  | @amaanq
+[bitbake](https://github.com/amaanq/tree-sitter-bitbake) | stable | `HFIJ` |  |  | @amaanq
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unstable | `H   ` |  |  | @gabmus
+[c](https://github.com/tree-sitter/tree-sitter-c) | core | `HFIJ` |  |  | @amaanq
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) |  | `HF J` |  |  | @Luxed
+[cairo](https://github.com/amaanq/tree-sitter-cairo) | stable | `HFIJ` |  |  | @amaanq
+[capnp](https://github.com/amaanq/tree-sitter-capnp) |  | `HFIJ` |  |  | @amaanq
+[chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) |  | `HFIJ` |  |  | @ObserverOfTime
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) |  | `HF J` |  |  | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) |  | `HFI ` |  |  | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | stable | `H   ` |  |  | @stsewd
+[commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) |  | `HF  ` |  | ✓ | @theHamsta
+[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H   ` |  |  | @addcninblue
+[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFI ` |  |  | @jakestanger
+[cpon](https://github.com/amaanq/tree-sitter-cpon) |  | `HFIJ` |  |  | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) |  | `HFIJ` |  | ✓ | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) |  | `HFIJ` |  |  | @TravonteD
+[csv](https://github.com/amaanq/tree-sitter-csv) | stable | `H   ` |  |  | @amaanq
+[cuda](https://github.com/theHamsta/tree-sitter-cuda) |  | `HFIJ` |  | ✓ | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) |  | `HFIJ` |  |  | @amaanq
+[d](https://github.com/gdamore/tree-sitter-d) | stable | `HFIJ` |  |  | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) |  | `HFIJ` |  |  | @akinsho
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) |  | `HFIJ` |  |  | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) |  | `HF J` |  |  | @amaanq
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) |  | `H   ` |  |  | @gbprod
+[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J` |  |  | @ColinKennedy
+[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJ` |  |  | @NoahTheDuke
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) |  | `H  J` |  |  | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) |  | `H IJ` |  |  | @rydesun
+[doxygen](https://github.com/amaanq/tree-sitter-doxygen) | stable | `H IJ` |  |  | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HF J` |  |  | @ObserverOfTime
+[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J` |  |  | @glehmann
+[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H   ` |  |  | @RubixDev
+[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF  ` |  |  | @uyha
+[eex](https://github.com/connorlay/tree-sitter-eex) |  | `H  J` |  |  | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) |  | `HFIJ` |  |  | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) |  | `H  J` |  |  | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) |  | `HFIJ` |  |  | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) |  | `H  J` |  |  | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) |  | `H  J` |  |  | 
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) |  | `HF  ` |  |  | @filmor
+[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ` |  |  | @bryankenote
+[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J` |  |  | @khiner
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) |  | `HF J` |  | ✓ | @alexmozaidze
+[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J` |  |  | @chaopeng
+[firrtl](https://github.com/amaanq/tree-sitter-firrtl) |  | `HFIJ` |  |  | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) |  | `HFIJ` |  |  | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJ` |  |  | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | stable | `HFIJ` |  |  | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) |  | `HFI ` |  |  | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) |  | `H   ` |  |  | @mgramigna
+[func](https://github.com/amaanq/tree-sitter-func) |  | `H   ` |  |  | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) |  | `HFI ` |  |  | @jirgn
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] |  | `HFIJ` |  |  | @PrestonKnopp
+[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J` |  |  | @godofavacyn
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config)[^git_config] |  | `HF J` |  |  | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) |  | `H  J` |  |  | @gbprod
+[gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) |  | `H  J` |  |  | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) |  | `H  J` |  |  | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) |  | `H   ` |  |  | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) |  | `HFIJ` |  |  | @amaanq
+[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] |  | `HFI ` |  |  | @NullVoxPopuli
+[glsl](https://github.com/theHamsta/tree-sitter-glsl) |  | `HFIJ` |  | ✓ | @theHamsta
+[gn](https://github.com/amaanq/tree-sitter-gn) | stable | `HFIJ` |  |  | @amaanq
+[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J` |  |  | @dpezto
+[go](https://github.com/tree-sitter/tree-sitter-go) |  | `HFIJ` |  |  | @theHamsta, @WinWisely268
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] |  | `HF J` |  |  | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) |  | `H  J` |  |  | @camdencheek
+[gosum](https://github.com/amaanq/tree-sitter-go-sum) |  | `H   ` |  |  | @amaanq
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J` |  |  | @qvalentin
+[gowork](https://github.com/omertuc/tree-sitter-go-work) |  | `H  J` |  |  | @omertuc
+[gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) | stable | `H  J` |  |  | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) |  | `H IJ` |  |  | @bkegley
+[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJ` |  |  | @murtaza64
+[gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) | stable | `H   ` |  |  | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) |  | `H   ` |  |  | 
+[hare](https://github.com/amaanq/tree-sitter-hare) |  | `HFIJ` |  |  | @amaanq
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) |  | `HF J` |  |  | @mrcjkb
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) |  | `HF  ` |  |  | @lykahb
+[hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ` |  |  | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) |  | `HFIJ` |  |  | @connorlay
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J` |  |  | @qvalentin
+[hjson](https://github.com/winston0410/tree-sitter-hjson) |  | `HFIJ` |  | ✓ | @winston0410
+[hlsl](https://github.com/theHamsta/tree-sitter-hlsl) |  | `HFIJ` |  | ✓ | @theHamsta
+[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J` |  |  | @Freed-Wu
+[hocon](https://github.com/antosha417/tree-sitter-hocon) |  | `HF J` |  | ✓ | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF  ` |  |  | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) |  | `HFIJ` |  |  | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ` |  |  | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) |  | `H  J` |  |  | @amaanq, @NTBBloodbath
+[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ` |  |  | @pfeiferj
+[hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) | community | `HFIJ` |  |  | @luckasRanarison
+[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J` |  |  | @cathaysa
+[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF  ` |  |  | @theHamsta
+[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJ` |  |  | @yorickpeterse
+[ispc](https://github.com/fab4100/tree-sitter-ispc) |  | `HFIJ` |  | ✓ | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) |  | `HF J` |  |  | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) |  | `HFIJ` |  |  | @p00f
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) |  | `HFIJ` |  |  | @steelsojka
+[jq](https://github.com/flurie/tree-sitter-jq) |  | `H  J` |  |  | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) |  | `H   ` |  |  | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) |  | `HFI ` |  |  | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) |  | `H  J` |  |  | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git)[^jsonc] |  | `HFIJ` |  | ✓ | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) |  | `HF  ` |  |  | @nawordar
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | community | `HFIJ` |  |  | @theHamsta
+[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJ` |  |  | @Hubro
+[kconfig](https://github.com/amaanq/tree-sitter-kconfig) | stable | `HFIJ` |  |  | @amaanq
+[kdl](https://github.com/amaanq/tree-sitter-kdl) |  | `HFIJ` |  |  | @amaanq
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) |  | `HF J` |  |  | @SalBakraa
+[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF J` |  |  | @irh
+[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J` |  |  | @Willem-J-an
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) |  | `H  J` |  |  | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J` | ✓ |  | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) |  | `HFIJ` |  |  | @cbarrete
+[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ` |  |  | @r001
+[linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) | stable | `HFIJ` |  |  | @amaanq
+[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J` |  |  | @hankthetank27
+[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFI ` |  |  | @toots
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) |  | `H   ` |  |  | @benwilliamgraham
+[lua](https://github.com/MunifTanjim/tree-sitter-lua) | core | `HFIJ` |  |  | @muniftanjim
+[luadoc](https://github.com/amaanq/tree-sitter-luadoc) |  | `H   ` |  |  | @amaanq
+[luap](https://github.com/amaanq/tree-sitter-luap)[^luap] |  | `H   ` |  |  | @amaanq
+[luau](https://github.com/amaanq/tree-sitter-luau) |  | `HFIJ` |  |  | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) |  | `HF J` |  |  | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) |  | `HF J` |  |  | @lewis6991
+[markdown](https://github.com/MDeiml/tree-sitter-markdown)[^markdown] | core | `HFIJ` |  |  | @MDeiml
+[markdown_inline](https://github.com/MDeiml/tree-sitter-markdown)[^markdown_inline] | core | `H  J` |  |  | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) |  | `HFIJ` |  |  | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) |  | `H  J` |  |  | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `H   ` |  |  | 
+[meson](https://github.com/Decodetalkers/tree-sitter-meson) |  | `HFIJ` |  |  | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H   ` | ✓ |  | @artagnon
+[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J` |  |  | @Freed-Wu
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | stable | `H  J` |  |  | @ObserverOfTime
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) |  | `H I ` |  |  | 
+[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF J` |  |  | @aMOPel
+[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J` |  |  | @aMOPel
+[ninja](https://github.com/alemuller/tree-sitter-ninja) |  | `HFI ` |  |  | @alemuller
+[nix](https://github.com/cstrahan/tree-sitter-nix) |  | `HF J` |  |  | @leo60228
+[norg](https://github.com/nvim-neorg/tree-sitter-norg) | unstable | `    ` |  |  | @JoeyGrajciar, @vhyrro
+[nqc](https://github.com/amaanq/tree-sitter-nqc) | stable | `HFIJ` |  |  | @amaanq
+[objc](https://github.com/amaanq/tree-sitter-objc) |  | `HFIJ` |  |  | @amaanq
+[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J` |  |  | @ColinKennedy
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJ` |  |  | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJ` |  |  | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) |  | `H  J` | ✓ |  | @undu
+[odin](https://github.com/amaanq/tree-sitter-odin) |  | `HFIJ` |  |  | @amaanq
+[org](https://github.com/milisims/tree-sitter-org) |  | `    ` |  |  | 
+[pascal](https://github.com/Isopod/tree-sitter-pascal.git) |  | `HFIJ` |  |  | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) |  | `H   ` |  |  | @amaanq
+[pem](https://github.com/ObserverOfTime/tree-sitter-pem) | stable | `HF J` |  |  | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) |  | `HF J` |  |  | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] |  | `HFIJ` |  |  | @tk-shirasaka
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] |  | `HFIJ` |  |  | @tk-shirasaka
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H   ` |  | ✓ | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) |  | `H  J` |  |  | @leo60228
+[po](https://github.com/erasin/tree-sitter-po) |  | `HF J` |  |  | @amaanq
+[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H   ` |  |  | @RabbiVeesh, @LeoNerd
+[poe_filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ` |  |  | @ObserverOfTime
+[pony](https://github.com/amaanq/tree-sitter-pony) |  | `HFIJ` |  |  | @amaanq, @mfelsche
+[printf](https://github.com/ObserverOfTime/tree-sitter-printf) | stable | `H   ` |  |  | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) |  | `HF  ` |  |  | @elianiva
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J` |  |  | @MichaHoffmann
+[properties](https://github.com/ObserverOfTime/tree-sitter-properties)[^properties] | stable | `H  J` |  |  | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) |  | `HF  ` |  |  | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) |  | `H  J` |  |  | @matthias-Q
+[psv](https://github.com/amaanq/tree-sitter-csv) | stable | `H   ` |  |  | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J` |  |  | @zealot128
+[puppet](https://github.com/amaanq/tree-sitter-puppet) |  | `HFIJ` |  |  | @amaanq
+[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  J` |  |  | @postsolar
+[pymanifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) | stable | `H  J` |  |  | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) |  | `HFIJ` |  |  | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) |  | `HFIJ` |  |  | @pwntester
+[qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) |  | `H  J` |  |  | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) |  | `HF J` |  |  | @Decodetalkers
+[query](https://github.com/nvim-treesitter/tree-sitter-query)[^query] | core | `HFIJ` |  |  | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) |  | `H IJ` |  |  | @echasnovski
+[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J` |  |  | 
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) |  | `HFIJ` |  |  | @Fymyte
+[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ` |  |  | @joker1007
+[re2c](https://github.com/amaanq/tree-sitter-re2c) | stable | `HFIJ` |  |  | @amaanq
+[readline](https://github.com/ribru17/tree-sitter-readline) | community | `HFIJ` |  |  | @ribru17
+[regex](https://github.com/tree-sitter/tree-sitter-regex) |  | `H   ` |  |  | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) |  | `H  J` |  |  | @FallenAngel97
+[requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) | stable | `H  J` |  |  | @ObserverOfTime
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) |  | `HF J` |  |  | @bamonroe
+[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFI ` |  |  | @Hubro
+[roc](https://github.com/nat-418/tree-sitter-roc) | community | `H  J` |  |  | @nat-418
+[ron](https://github.com/amaanq/tree-sitter-ron) |  | `HFIJ` |  |  | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) |  | `H  J` |  |  | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) |  | `HFIJ` |  |  | @TravonteD
+[rust](https://github.com/tree-sitter/tree-sitter-rust) |  | `HFIJ` |  |  | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) |  | `HF J` |  |  | @stevanmilic
+[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J` | ✓ |  | @WhyNotHugo
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J` |  |  | 
+[scss](https://github.com/serenadeai/tree-sitter-scss) |  | `HFI ` |  |  | @elianiva
+[slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unstable | `HFIJ` |  | ✓ | @theHamsta
+[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJ` |  |  | @hunger
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | community | `HFIJ` |  |  | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) |  | `H   ` |  |  | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJ` |  |  | 
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) |  | `HF  ` |  |  | @amaanq
+[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H   ` |  |  | @aheber
+[sosl](https://github.com/aheber/tree-sitter-sfapex) |  | `H   ` |  |  | @aheber
+[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  J` |  |  | @Sarrus1
+[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) |  | `HFIJ` |  |  | @BonaBeavis
+[sql](https://github.com/derekstride/tree-sitter-sql) |  | `H IJ` |  |  | @derekstride
+[squirrel](https://github.com/amaanq/tree-sitter-squirrel) |  | `HFIJ` |  |  | @amaanq
+[ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) | stable | `HFIJ` |  |  | @ObserverOfTime
+[starlark](https://github.com/amaanq/tree-sitter-starlark) |  | `HFIJ` |  |  | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | stable | `H  J` |  |  | @amaanq
+[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ` |  |  | @mskelton
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) |  | `HFIJ` |  |  | @madskjeldgaard
+[surface](https://github.com/connorlay/tree-sitter-surface) |  | `HFIJ` |  |  | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | stable | `HFIJ` |  |  | @amaanq
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) |  | `H I ` | ✓ |  | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) |  | `HF J` |  |  | @RaafatTurki
+[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF J` |  |  | @ok-ryoko
+[t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJ` |  |  | @xasc
+[tablegen](https://github.com/amaanq/tree-sitter-tablegen) |  | `HFIJ` |  |  | @amaanq
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | stable | `HFI ` |  |  | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) |  | `HFIJ` | ✓ |  | @euclidianAce
+[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J` |  |  | @vrischmann
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ` |  |  | @MichaHoffmann
+[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI ` |  |  | @Porter
+[thrift](https://github.com/duskmoon314/tree-sitter-thrift) |  | `HFIJ` |  |  | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) |  | `HFIJ` |  |  | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) |  | `HF J` |  |  | @ahelwer, @susliko
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J` |  |  | @Freed-Wu
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | unstable | `H   ` |  |  | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) |  | `HFIJ` |  | ✓ | @tk-shirasaka
+[tsv](https://github.com/amaanq/tree-sitter-csv) | stable | `H   ` |  |  | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJ` |  | ✓ | @steelsojka
+[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) |  | `HFIJ` |  |  | @BonaBeavis
+[twig](https://github.com/gbprod/tree-sitter-twig) |  | `H  J` |  |  | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJ` |  | ✓ | @steelsojka
+[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ` |  |  | @Teddytrombone
+[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ` |  |  | @uben0, @RaafatTurki
+[udev](https://github.com/ObserverOfTime/tree-sitter-udev) | stable | `H  J` |  |  | @ObserverOfTime
+[ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) |  | `HFIJ` |  |  | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `H  J` | ✓ |  | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) |  | `HFI ` |  |  | @ColinKennedy
+[uxntal](https://github.com/amaanq/tree-sitter-uxntal) |  | `HFIJ` |  |  | @amaanq
+[v](https://github.com/vlang/v-analyzer) |  | `HFIJ` |  |  | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) |  | `HF  ` |  |  | @Prince781
+[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J` |  |  | @wrapperup, @oscarotero
+[verilog](https://github.com/tree-sitter/tree-sitter-verilog) |  | `HF J` |  |  | @zegervdv
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) |  | `H   ` |  |  | @caarlos0
+[vim](https://github.com/neovim/tree-sitter-vim) | core | `HF J` |  |  | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | core | `H  J` |  |  | @clason
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | stable | `HFIJ` |  |  | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) |  | `HFI ` |  |  | @szebniok
+[wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) |  | `HFI ` |  | ✓ | @theHamsta
+[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF  ` |  |  | @gshpychka, @MarkMcCulloh
+[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J` |  |  | @liamwh
+[xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) | stable | `H  J` |  |  | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HFIJ` |  |  | @ObserverOfTime
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | stable | `HFIJ` |  |  | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) |  | `HFIJ` |  |  | @Hubro
+[yuck](https://github.com/Philipp-M/tree-sitter-yuck) |  | `HFIJ` |  |  | @Philipp-M, @amaanq
+[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J` |  |  | @Freed-Wu
+[zig](https://github.com/maxxnino/tree-sitter-zig) |  | `HFIJ` |  |  | @maxxnino
+[^gdscript]: Godot
+[^git_config]: git_config
+[^glimmer]: Glimmer and Ember
+[^godot_resource]: Godot Resources
+[^jsonc]: JSON with comments
+[^luap]: Lua patterns
+[^markdown]: basic highlighting
+[^markdown_inline]: needed for full highlighting
+[^php]: PHP with embedded HTML
+[^php_only]: PHP without embedded HTML
+[^poe_filter]: Path of Exile item filter
+[^properties]: Java properties files
+[^query]: Tree-sitter query language
+[^slang]: Shader Slang
+<!--parserinfo-->
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 000000000..5b5dba199
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,34 @@
+# Roadmap
+
+This document lists the planned and finished changes in this rewrite towards [Nvim-treesitter 1.0](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767).
+
+## TODO
+
+- [ ] **`query_predicates.lua`:** upstream/remove
+- [ ] **`parsers.lua`:** modularize?
+- [ ] **`parsers.lua`:** assign tiers
+- [ ] **`install.lua`:** fix messages, add sync support (@lewis6991)
+- [ ] **`install.lua`:** simplify compilation:
+  - hardcode one compiler + args per platform
+  - provide `install.compile_command` for overriding (function that takes files, ...?)
+  - allow using repo makefile (norg!)?
+  - ...or switch to makefile completely?
+- [ ] **`locals.lua`:** refactor, move to `nvim-treesitter-refactor`
+- [ ] **update-lockfile:** allow specifying version in addition to commit hash (for Tier 1)
+- [ ] **update-lockfile:** one commit per parser/tier?
+- [ ] **documentation:** consolidate, autogenerate?
+- [ ] **documentation:** migration guide
+- [ ] **textobjects:** include simple(!) function, queries? (check Helix)
+- [ ] **downstream:** adapt to breaking changes (`nvim-treesitter-textobjects`, `nvim-treesitter-refactor`)
+
+## DONE
+
+- [X] remove module framework
+- [X] remove extra utilities
+- [X] refactor `indent.lua` into standalone
+- [X] refactor commands, predicates, filetypes registration to plugin/
+- [X] support installing tiers of parsers
+- [X] install parsers to standard directory by default
+- [X] remove bundled queries from runtimepath; copy on parser install
+- [X] general refactor and cleanup
+- [X] remove locals from highlighting (cf. https://github.com/nvim-treesitter/nvim-treesitter/issues/3944#issuecomment-1458782497)
diff --git a/assets/logo.png b/assets/logo.png
deleted file mode 100644
index a60e536bcaf45d9612175d50ce817678bb23fb6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26664
zcmeAS@N?(olHy`uVBq!ia0y~yU^oH79Bd2>3~M9S&0}ClfA8ty7*a9k&0h97D&eL2
zHSgA5*r|R#XU0vLC3mN8(Qag6QW5yXe7dP!UgMy#AIoivgv91vLywm9+23;vZb&4n
z7&xXFJlxzfk>!+Arl{HTyEo_ZPOe^7e0A^r_j8I@?@Heq<@?HjJH3AE<%O@pO0U{}
zfAW9h!jmWWzF8IS8drSx^_qG6-hKSO|7+~73Fo)gK6B@1X!y$1K8^7JbHk*YMGO<Z
zmf6oe|L?c`oi%=PXRp0f|Kk*po?nx@=cupzO}lR{i`S>xt<01>5?6om)s^}G4~xIq
zIy+8L=UMBIulu)e-t+tA@ws2cW3BEMhHPXo65_pY{aU~2&-ed-jbA;vxIDekH+${V
z*J9PX=ihoQf3Lb`+41?OQ{2~n@s+>%=YIL0uh&-p-rk>|`{nBy@sn=x2WDy%eU+}?
z`uB6W{p&g97q!0}k@(@P{-U`0Y}@slul0Am$~m5OfA%j&MfO|T^Y`8E5oi0}6<_Uo
zJGb2a_NRmOJGVbx&Cg%*C*%9M7q9RC+MjN9Zl{mmk*xa9?c4t>$xlA*+PiPs&qd3U
zC%kxF|M=CF-*z8u89Ex-1YVkb=zqf;tJj$Gdf$!6y$`eg$e6$VEwG2r%+$!@>0Xa*
z4N~%Re?{7u8nbmCarw2k{(tI1MWLR=ttE4&|NC73qv-bY_rK=7h?=wNCU0cI6PLAp
z=Jge)V{4_O^)tR~J;QD)+H4`d@5!bs^0ja5Q%vMI?S!40W}Rrzt3ILA_w8?Y^ZSfP
z^W6^h`qt{}GUTrcnK-xm+Sw<&lGfM1-ksw8{F8BQ`ucl6+OGZoywp9_KmWeZF&lBu
z?0auIu2x=dH@|;%`^MDd#p^TInXKngQZf|W`%U+Hd0qAE!y8}U`^j!>wQZ^G%zv-X
z*YMu)V49w>_D{jd=`Y0?*0U&0o1vul<wwEOQbYbI?a$rIx<mzgKib80-d}!O$oQx4
zyVLQXf1ei&Jy^L}IAQ(X2Yas7|2oL8Ak=;S*}l2mPh8f#lg__e^xY|Z`?FrhJK=wB
zt-ihg&x316ZvXovy=nJ%)r;BpKOGn7w7hI<_tRbeZ}jTr`AhXgdsmg5I^)Q@samtc
zMXKd3!vYtB&zJ2h*DNyI85ppf&EZJU`I*O0*nHU@!nD@pM(yfwzwf)&OntsLYFk;}
zgTk)!lF=$bDofwY+jmx1{_mmbX|>GfIcHTB-&yfy=gVtn|APXfcJcb0Z6@h#8>g*(
zoBi_(|NiO!y8Z7homxNf>OJTAxA(5T?jBcomiMyc;e8)e#og+k?%IBt)ivpeh>7G!
zv*}$4U%xa8G{tpiq<*~KDzoBF%GKXC96#^OZ|QMNJ}$IC{kY?n(sG~g-z}%deDvF$
z&$}Xr?aGf6lHUZr?6)`Kc-OtICizYM{@-UW%l@9D6dSm4mAQ42?yis5&VK)rn-O{Y
zh4&oZvz?BM%=dgYzinTCz3)Wp^u3Ha+<R(oAF^&<UHis2|NnxHBXI?Dp4`4yznbA~
zTlv&=KA$Z7SV~qV#O+qNymkSX<!1R+k;<X|E)xywe+3Io)TrL{q11-++oOG-mw*24
zvTLvLr%%`8ly#)9JSf~?C2m`uqj~m5mx|}3we`QwFIsAAJN<Xnx{1OYr`@S|{cQfX
z+>FS}FS2K9p6zmU@vdI<^l|+E?_cC=o^&e-d0$GOXc2W}f!eV{f8X2-&AzK$|5i3#
z`gGK`w7tzdYypXUOR~yyS7xlc#&q)%V^xyPAFibyKa!)Y9C>BgV|9G~PFy>8L7V@l
zt=`-&-p9A(2&A8W`hG+BJn`_KIw!WR`%pYpQZ-X7&bf?f&9^+eaFuJbDsKP&UuE@p
zes)QkcCWd0mhRrhnJJ}<*B7gqB(qJl_1=BU?r-yaSH0b@)?S_e*egpvp8eiKTa(6&
z`ytv#?tieZ=ggJ8xS40>cXqyu+(oz9mV~4V{j&3|n&P(N^KbRvXMf}_P&@7@eaz|b
zJ$XCU2W@@^Qj^0fw>b0M?5;BJoc3+=?kZXFr0f5Vy<Zfi*1|F~@A2tFtPUOmc`YjJ
z^Q?dLt#@qPutrqBM*X~_m2`W?B$d4<RQ5_oEz4y#o0WD%VN><XP22qcK5(qQxl7#k
zxWG4?O`;)bJO_$A)R$K{-k&8p@pRqO^7;8b|4-~w{@1zKJ%cBxzrrSF<JBJ;FN$V<
zsWCcayjW+Y506Wk-lET(0t=40z0hBkcp~Ouspt)d=_||3{;3;TtkiveX!@R4Is321
zm0x`Q=IQG&M};d*AJx<y)S?eq@9AH6_V(v9Q+_{?y}|kO{oQ}z%lo(gdupqH_s_AV
zmp7d}ms+G0cE5LfOiBLxwrQ*zJI-`CM%fqr-XCqdH+%UG%hRr9bECvKjx$yttqMp!
z?6&lxLa?sD-dDW!x>2|0UzgCdul(<vl0Kz-VRiVi$qaRpCTnjv%wM@sSYZjn>SVzm
z%<V7NpG$jTJw;1H)n(Pxz0slX;&<77I*=uBQRBrKja6mS=fB;4?B0jj@0}0Fh;Mqp
z&-dYHv9N-W=Y=}SD?bcwnti*)eW-Y$iMH*R$LFi6=ihZs-eR$K|EF`j_5YUNue^Hg
z|JQ@vbpdi;&!;?{Z~TRcX^Gd}O~3PYlo}hIluY(M>vB0wp!#m>>^G&e<2_dwlr4Jn
zY)foV{hx!v59YpLU%i;Uq)zBUhWh)7Y#YMo-haIBN2s~|{Tp%r|FH-5i+7s%-V5j|
z(O-H+aLyMMPo3H4JKKJ}&<tumVRoSQqM4)f%`yl75chM1N$DqVEKk;DR}f<TzG-z`
z{E<oNJq@>|^>+Gg)32I&bt}uM-`gf1S+Fr6wtM*j>mAZ-R8L1HDSn?-JaxOhUD%KJ
z`S*qL3xmS{-}}YC_xbMdx4Yi_+PA-B>6?8EAHEU3{oeB9<ePRYSRF4v6$sfLlYR5+
z_MCm|%ae<ZPi~PsV!h{k!?g*{&otiGWSx4?8d87E{lKdzuB@avF&j4(b5^MLU;4gj
zFZ-R-aet?8T3-Hf=CNzZ%ExO=_Oz<FaU6HOsyUrCVAlP`x{dRXO<K^cn#_HqBQf>5
zke9Jz+SPgTeTvc6KR&;DKKX3Z-kjS0>Ze<`&#BW@y1UKdTigAgB1Wo4%!aH+@dfva
zIIpC%)dd^Ov!A)}=)xZ_Z0AQ^wcht|?fgA&HhSOR@#ZeWt*@uN8bls_d@uL!QH<P`
zogR5dqRQ^Fo8P~^ePd<pfy?0=yMD%e+$VpxQERG{v{JH3NHUjY)YQVQ)8ED_i0eN-
zIp@5TA@hTrT_z9X{@L4AEnE0^vir7|Ckw-Zo06L}DvWrwjGcr!PuASK#rN-oXG6rC
z5NVtCoZRIVtUL4!d0o%7GUy(iVpu4D^Ag)f>Hi;|z1X_{qvg&O{c;nwe%dqrX#MB&
z@5K9ddmIsdF#iSn&CB6G=Q=gizmiy${wGe`Yl+L%OV&GzD?V>hFTTDn{c`;ht2?et
zEdgHKx2GyBZTS10@2;```8ArEY=@FhJ#$<8^!on)N9|wkFxa`~;{Jy|CX1KsJrsNY
z->%I+KW*on(~#Vpu(kAZ%e5Vgwv`Dj=Gfip%ckk57PMf~<P`q}`{Z_iGp}3x=f>Xu
zZ{+X(Px-pzmCOIQx%0m`G_O70&QKM;F)Q`v6VBk}Y#yym2fS5OZq#Nk*z>q>L-;)Y
ze<v3wl<Koi%we5)ezJ+;?W3<!rgF_(cdFTEXXJ`sy3x#?<uwo9PSmb@`}Wn7z<+$_
zZ(inp@KeERcgMj)$*cjpxL3uf+-!Q-_omr<`rA2s5@LTbS9JPaVOzUp8lN1Gk#(5W
zwvSi6*X6$KTg!04(dyKX3lrZ={8RDrM?n3zif1Wx<#xe(XJ2WWalgDNo2Gu{)9ZgP
znts2l_&+&3g{|BD+3!uyoQ#tuTw*T2xAxzI!`3Bs+a2dx`SCoGzsG#-Q>n;8x4E_|
z>P(w<i~m{t+d(hhpGW!9TfZl!*K4)PZ{Oed=gY>cor|rve$wZ#2@x^vzbUg<>_AV)
zWVx%l`u=+HbIv@;J6miLdnA%|(n*tw!|Dzqn^bN(MCHuqP&PO{Rf5g0?7QoF7fyzI
z=hPj)>9CeQ;)u{b_xOFXjFIB=#`l+<9?0L~y>{xe<6J8*vkANZD{fu*xYJK)+8pj@
z9NrNbA19<uE31zGY5n@&H1!FEp5c41=sfr%Tzy>rWqsL~kGA~te*L?cyZCncF9UI-
zttCgN?f;o9e!u*9ys7x)GZuV7dtO_|EBgDHC0{ygy7r6J{Mk~8$BqVbZF1KLn~<g4
zKk4_Q@V#g1E^4p0u8o;0sT+95S@Tm*XU3f4T4EWG*bh1>s;>55s&r$uSwsCFj)u-j
z&MS`uX`6daj_l<v)(g*8UvY8asjm|g*J>_%*v}VqZ@R}4N4;3jyp*D+i$2Qtc<*=L
z#H?U_kn!S1#iTu-)-8Xq=xDVqx0l6PS#_<)mnI4(a$28pz8D}Dy8r5Tk^K+&S?|f;
z4-Y#(>&t1qy1$$3EC2r1|8?nE_U}0J+wHeBE*1Zo{;p4N|I1|Y`_tcbne^^5O=de;
z|GRkp<hR`xQE#Vve*MVzh9%%%vC<8boifueI~J(92rm(GjsInDr+6uMZg82d=qahI
z(=z6SY)f#O=;E<;W7HFuvlfN3R!oV0TD{=-@eF$}O+`1&4ZbPs*m>V6O!7+>v;6f=
z{+4r`aT1&6&65S6G)}0Vc6_epVdcB`n9`5GzkhyxVsSK0X)*iNUsu){F}OG=G~ZB4
zVN;f5U~zSrdg;MbQH}WKPaoDZt$)%SAEKbk80X3R_s!?(ynlD{@0Xtpwtw~iq0fBZ
z!<pOKJg#25bT!7uD4Ffz%!v;_8S~eRcU2zX>^-Kl%Fg0sN8o`SjlR0=K1&XBSgx|u
zP@JQyA1$@>Q+?g4s+fnz`d**mVExskQCh+CaTb$Cp~)Nx<@06?x0F=QYRDam+`Gl!
z#+65SQqVC*2A#JJ-761$b{7`un6h`ZM{V%q#R5+zRvzcO^ff@_ZlR?=56hJDyjETB
z?@waq>T_N=)f=s2smOCz!T8BU%~P(z_a`#V>0rGyO+lA)TlU4@d->=6dX;{!@P4=4
z|9cPDSGk&AK7L8Wg#V9Y^sJdr?tNSOvCaKX`qb{w9j|xCFA=q#wxqLFOJJ43lOS1h
zx#bFeP1`tD+0G2?n%VHS!DCxv^+)ZzP5Kol|MReKePVIc@d8KrVingL+qE>k{NG)3
z@qVfoWVBea{^Y3*Spt%w3zi%#UikK5<r$kNrN(UAJ!guqoM!OKk4MyhQ*y%<ZL=p6
zZ~m>ledFFn*>7Eya+0qvK3WiUzivZHUdp{*uaFsM_?5&yI&>_0>ygIQJyYqAnCHnm
z{{Kp^-`@BA;qpAaIT}x&|FAhP=~eC;zUQU0_}$5`x=gkR<c9G)dSCsm-O9M=h<#}f
zPfAzVZ8P>?T$af^;XAWVPB?c-%O~^oPM#aD^;=$KulsMlF@yEEn@L0c9|PAXe}(^w
zY*kx3ZBI(FiD7fb4ttY?CCvT$yQfQR?Nt7COF#I?T$Kg^m7@WyA&1o~>L+;}E1M<5
zf8KR^piaR*F{wXMfjiebv>iM@Nq0f<WQE(iGxvYBb?@%exj519ik7$HCnbYDTlF$@
zkFB;?c1Yye)gLGS{9FI$=izYsk9QAq`_HwS`^>v0WOel1i=yVWUmjHl&+Sc~6uEr&
z^m3b@>$3_PWK2aqo=ZDXFjcnugz}MNx&d<-mNM1(dA6l}b>DjCRm`2K6_;=CW6m>K
z_j$5xRn81y2JW2(?Ol&`SZDocyrLk=8M@NJ>t^F*h8t{()kl|}?~L5ZH+OGBu!@Ja
z<QEmmfG8fm4OONl4nY%&_O$s=Fg|emGf&0t?Lk_+aowu5H*W0O%i%RSoi|kV!h~=;
zp6vLZ3{|y{ua3MlKUY)m<mScQ`+ux!UvIZ7H|PGGc?rUSycH~}C%qQunI2J_Y1%wR
z?*Gl{Uw(A-Yis=#O1&bT*|;@Db;@@e=id*HeCd~eXi|K7;evTr?{aI+XRdzRx<YBM
z$+y@0f7f;#4PW$d?QwTTNmd^(>#H*!d-YF_E7%~Q+GNritg$y`S9AZt@2rnCG^&ID
zehLb*Y5iunjl-~iy#+68{h^b|EJ6#_)jLjJ`C(9bAb|JqeZ}2Xj%v}GlEtmJqI`C+
zS~YKJ-In8J#du}WvO6oD7jPWdw!8oD>G1oXU-<s?`8oYY%w>g?N#=DQ7R_H~rM&m6
z-S;(;F8)2Tx^_PwgqLXg@AUun>a(XQSBON++`Y=x4#yrn5p+74@KtB&0=abu%HC^f
z)lE8mt!Zz{&#Ps>7x_M@4msZ_JlQs2R?N{QLO<np#|D~aW%6H_h&|EN;qpQzD@lYQ
zR5xU8%yizYgmS%=^&zVlo#f-1q!bwHEZS|vJjGwgrA&|M=GGZDVb>;!s$6`Ny87U&
z7te~HsXeIqk*Qdabvw|Tb$#Fqj)hCFS*@y>8|Jk=%QreITek8=Uv2%*!~3hhIe-2w
zF}o#8(MjvowN=vgRUgm4I;&E=O5@A7_dDi(p5LXgg!kH`)CaSpimERfMSb0SxccPf
zC$jf^=SSc5mVAEd=@ZB5uWS=)vlWY;zCO6~30GfzMQTv)p1;-+qD70}6dHYf<=9*K
zRV_)gOyGvz)VGt^b*DY~ds>yjs_m-X%)IA|w9if~Y~pe{_AcT`X!qK=Z@l=j0+KpE
z*i^jLJudfUSJGm;ZuW(qdmmk&GfUs&a`(c_BmsqwcFOM4^!8_7{lD{J^7K2~GID?I
z`B~j_*3tAyzr)?A+Q;ttZk|QQ=Io2QFh}CZ{jWD_|7~pczq~|Vb_wUnlg)36O2g*)
zPo7yc>rrOZNloK0j|(#mXSpf~vEMvc`o_ZX?&)~$cc<&7s%gkQm%ZbAKk&fC5XrVI
zk&stsHC0_a+I}89A9(A5&sSTcHJ+}M#dcPmWH^4lR^Ml$<IAM{9W8GJSGh`B@m<@r
zbxJjBXlsl{sM%H<*|>(MTt#=oCJQ*-7W2utkkRhLa6p5Br86_>YPa?Jzi-d)`SR}i
z-uF%ZOLi~5TU^PuKV!<fu5~*n@_t|X)#CmfM`^GAdw=y!1T}-sz6*+R)jYJ8agM3@
zCl+1NidJ*&9Xan67st+6VYbr3qVu%sgibLpp%Sxrzc{rhy9t&(hPo-LN9V-sIQC(A
zXuNiEf&6pP`5{)bo7-1}iE^j7voP>&T07hBaJI_&>1KwL&q#O+PtiINaFogQS?uaH
z(^UDUH-(<<i}>ZUdhUcn)15?k^)}cYUc1>mcJGt3?{~a?${+VJI{O~ubEbrVwXPjE
zFU`HU)x7S>qw1i!6KCn`6{k)3WNiPxtv=<xh1B-0qD4DyaNb|c+w^|!*V&#+9Un`C
zr)aI)r1R<DgYRMf`nCN+${G!urma=%RJk4b{<-J5qmd%F4J5(?p6wUveVxOWG9~t4
zM)HK;*Nl5qa~o2+H6LG9H0HRScA(WmW>53(3ZJDbB)T72?&HsTks`4tX8X2)lH6c@
zeTUn9HTT#vPp(w6^72``{8N|k)=T=;r(gB&`5UaiJN@tJsyLJD&o64M63%alUZuV3
zU0eSIm6a>Yvybsi`u9P6zvSPm+xMtetXFqC?&WX)!?$$PeTjo@U6q@pZG!XP<?Lt)
z%Tic;vtq>}!?MkjZijB1GBf2XkGj>)c5CsEl`mp!?2MV+U;i!q7T1}Q9dUS_+VPvQ
z)@ElaV^-Ad6g;<-Ytc)KNah5NlX@v#-3zkZ$~;0ZT<&eKFPU>?<J70^PA?O0HeKEE
zyt3m*>;aVuyQjf@v+O3PuP&}Edi;M^>SzAA@B6sz<gyDV8Q1FdF0b0$(N+@vWRJ96
z(Z~9wR?3&#3TJ7ajcL-5_56GCe(ln?#rAve#}yw;`?KQ94gdcWKNJ_Hy8m{NRuSA{
zd#l=_Qh@i<XZ>YG5nH^k+~9~<8=IKJG_!dXQ?c+8v4`pR?xjaMWw`NiJ{G^UF2q#o
z@Z3+!PNj-5JXV(JoiFjUq<ratcQ1`kwm<u~h&Sn&!|%4BXVcfFYBrq_?lCQy)KfS2
zyrayqKYpbOCLRHMs}|lq`f7pLzU3YMAM>}0T=Z&==WE|$7Q6R}`Teg`wddD<eZRKe
zf0y+w%g4_zd#tkWci3fI^p98mX49mUK;61aJ(5T4xBZXYV^n=}*7WUv_P@88^y~5d
zpEIPaF0L<{%pd$FAxEHOr^Dm}am9>3+RJ86DLnU~^xSQq%t!w^4?o~H&a%E<XAvT^
zRNeSZsnNTTP=j}IbM727^<Mc}uuWL>*i>)PhAA;CEN{*A*j$zBnZy#Z)8o*OrCq1g
zEM`yO{mGeRko~bp>$&P}RjK8Mr+3e1%D!k6G56>Bq^pN7Zu|S^)m4$u(?SW>Q?eE<
z)jgoE{h`b5uj|UD>y15+r`G(sQ<U=O=>C0w_DaWZ{o%W{;>FfQY#-P`^?mR4`ij&3
zL31b0`}xn;IBmkG&Hev$b{Ne)>!K9C_v7EU|I5x_R+=eyaVJmZq=KTKe}8)}J;?cd
zz7$72uMv~fgKw{V8?t7e>S?;azki>YQxVJFm=ykS8_ui;2~YhrWW9t19VW0%EL!z@
z!qoE<78&YI))lqT=+Fw=n4l77cxL;gP8D_&e;Gzos}t*@G#z{Aq?B(FdD0j?seXyb
z5$h$&CLV=q1_z(#D75hDaf)-^-Wu?0Limj$l?b!^A3L93>U-M0ukM4s+`nT7&!7AJ
z*)Co4uISy8zwO)qe6NvyXPh?S(zW03dE=tr+CGrA=P|mw@sQ>JN%6|o3t|@O#Lty{
zdc;{ht3i0j3eLC8Gjo=T-ig}OHBngo_(?m?H~g#9C679|Y|4FgvNvl{&)tLhJylBD
zPsKGtJ+yp!idpVonKaodOmB9r(wo@euKuM}KZI_0hZi!XDV<&Ur+OY+_01{|`CZ3f
z`=tF*xRYoZ6y9nVSD+leVaBS7iotXIW(K$Jz5nNc@cP~FxvTdZTu#57G3#1Z;9=dX
zl6ybws!W?S^R~j#nw!>zPgW*GZjZ9kZ1QCdyvZZ^eAk4fPh6|=Zzq)MGn!WPyzNPm
z`t!Jb$GOEzdvjUmJlS?O!2Xo7XqQdmI&Wc7pIobV&d*KfY21og$EcWlvh0U(%-@Rv
z)909Uy4kv3_MN1(IyBYms=GAf`tDcuJ}t4wgk#d*SF`av68TcrH)UDExm`ua_yf2K
z**?!%8S}xtuI%@`@AdD><tv^ZJl-yz)V^%liHrW_Zu-04UDLJqD|LIeH2w6NJA0NM
zud7NouusiqUm0Ms(@6PE>7n<hR6q2~rktN}DM2@u_1?m}e|GJjF7*GxisO$@PSBga
zbK2pun{6*%u07C|#Vpx%CW+^bg0HN-`fo>Pj`Pj0g!-RKh@Mi>nw6}<ebYlbR;TIe
z&KZwY`j{Q_X6C$Rx_OE3T-Rp}&f>`1AGub|Wzf|%EY6L*u<+{kAb#0%b|u&Mzxj2!
zzV7ti>9&8iHgB(VeR}qIb1uWr-hB-XmtrrTy?)oL?f0CyGMirozIa>l$8*QFCYvn%
zc>a6;auuSiD&;H$10Fla%<2kakz6o=d3CwzkM{ClUTeR&|0nD=gwH#ELXj;i#7#IS
zWbv$KAHnq%HY?}3WDDCH&S%xs_$XrR5z!fFwlg~5q(sP`6M+E+SC2`AGqZPcPH3FC
zFx6ZAdi8=Wn|^#dqJLwNRq_0_73=3b7iH1+aN^qd{<*XLt-9|A%74$7-D_XG%E0dR
z!CBpZ#7kaYofs5*Q8#~A>FN5~*Ur)LmX;xN=DfAoJW1hcdi}r4n%s-G9EhwIO#J*v
z#rg0Yo=kJDe;b{js4bns8`8R{P;1>LG2P`YPFeXE(n8!qw(_jnEoJ8@)WXzyu=2vR
z1AkX>Z<@4r%Cn$a+l&{dH|*&8D&5t=zE*e%uaVI52MZX=xKCfxJAC8tgUMDAD$n$6
zzbcgU+Xt)*n|k5jf`-33+n<VW*|+Ea&5P{k6rUZaUMuzNSXG>O!Iw#|^KO3H9Fm@L
zGN=C98VMI(dHHXB@9Lj@(N?;?GB>zL{-)Sdp_f1Z{Sffv%6~4bU@bPeoI{ma>hZz5
zs@4pujw(`%wr7Xz)+jwX=Wt>u&#K-2s+SkI`?cQO$?_&`fs^xMyZKLp;*Kw!RUY#H
z#5Ip45?}J3h+J<uBE;i;>#}#&)b07!m3ynMywi+z(9QlP#G+A^w>|D}^=o^Z<&LxZ
zXSp3+wX7uk%Ovx=o1WTFnmaMGTy*ua$mO#tes8~DzwG?mdsiQPeXo2&hRLi$)$+me
znhn?U8$X>>KM+?qZ==7ClYt_C_(li4uq2)JN1m?FYmt7{qW;yvw{N1XbDVm}%z~uF
zbCVanIaKJdrM%eX&I*qeO@(_}Y-1R01YBQD)Z}^4vbRLk{g(Hcl&l8|Hx+H~eVgF;
zVT<F<H!&~vgzM}oJiN90{H=}UiWB*S+h^r_m%7IPSr%<}fAXuIEoZ-!pZ(=2F2DQv
zxh}5YrFlCIyYd5Kw|_clzeCt$-Ldv>0W5Qa?(@H6y18>kl<0|wu8$SIYt3h{xG2sw
zP@QXc_;!AAr;ev+rnF4F?<+ycFKO|sm!D_wQt`bkb9owXM6WVu`|h-3s~%~@%<JCP
zS)QVA$^E8xx|2;%(AtY@{JC0~awCmAR?hldcGlYbU$V~IJq7IxTOI2TTRvR#D(uZA
z^V*Ehb5E{&(R0ZuUEgt=?I)9!Ci~7W$a@-8Vft;?*(Xb#teayFtk{&&cF=y)^c;Z{
zxpRj?_gwPs4$D*I{U)+>nfEH=>yFnoLiT&9`nju@9G;?i_N-xm+0)ROyB&W-*%`|=
z#zjwkACScoSZ=}*v+nzccK=PeO>O())il+ktrbkaEKzScxlDXYz3Ji~$8VacXO-^%
zc31je+P3oxPOi|rvnPFVNcfvg@%vLh+g_Y<*XnL^+F6CHf(IE7AIjT1{|ub6Vfg`R
zOIEpC;w!@@oW9oh$!p4Cm!090C1)*q`fu-)BtLE|zcXhz99FfeZ9L`M;8dzUJ+Ve7
zvr+3wWN(r3f(w3~M>v(Ivxwi~KQZTkYe<*WEryIKCO^c#E8li$&=S4L*ybZTL!G5l
zYT+wKQ_E8YE9Z7+#H8H0w3*+z{7=ZvD#J;AbFLrF{i`i@cgv@)KJE11GP64V>|{EA
z^>KW*`;$!}=_R*f*F9U}BmVB^yYHN=OClH&-A`06>2}>_8E`dn&n1?(Mm(>=P6#$g
zPrYBJm$+g<iuO&hEtjkX%Z_TjE7S<iowH9);`YqIvcGDTj0(Xsjapb&hGc!PsGPUr
zTWwB<^}ShDpBKE_v#V69Ud@7U@nQd;Qgb-29xq?+w)d5!@3-SN-T$xueb`zrpB?#O
zRao%qh~RCK7v@N~%(eNo<W$dwhi`s|_;JV04DkE&Z||J$tyz;hYq&2gZf=QtA$!L$
z-0R+=j}r|(PGBn2nsCLcr$;+j+36em*4SqXvR+zIUxRabP7152%-Zcxs?OLn`=-2V
zZ+QiO<H6ATrfkQr-H|w6cF=xPd(WSgB?49HOH|V;s+YTe4BP(x>U*2_d$&sL?z^(Z
z?U&4t<UZByf2->k`N?WeGLf+KblWUt#rJO`bBaZEdzs)1Mv3==EMFf!-Lx`!`-+Er
zJKJsRUtMiK>Ju8;ylisL2k+L*SCSQbJcMR`sq8$H_Uc~q*;moddU1li7fsnRe+Za7
z(44Muct(_-Pmhz!lMtg>%F|SDSU&%mZU1an?w+cX@@w`idAw<-O+Q<3@UF_|Ud5lo
zr+G)dKk&_+NjciLr*ZSgpbfvT1)e$l>Yb{A#Wy2S52Y0ogA>-@WO@3w-%qx?Xl2f^
zhg*5o)=4K%$T*)8U-5@$MZ8DB3~ANJa_3!Ng)l^VZJg0{t?82M0ugPI6+8JKR`AZ7
zQN+0`B&pQfz$MUK$vAZHq@e3XnY+K$iq|ADu8#5**O<dEX!L#3?YaJcwx9F8#G+br
zTQILTZSBs6taF@^M+$wTP0mK{o9FJp`=piY@_ETqQ+l$FUzs<1+ofCIPed%gmOV32
z!?w!2Htyd3yI(Zcd(2_jH|3)1syD40HmYxT+#t4|BYNw{(kGH7O7mFe%Ci4|QJ3NU
zbomok&g^yNuiuE|cdn^Bn!mQzKlgl)@h559_t^*Ji_-=2uTL)jwfxu3)YsEbs(tX6
zVNAcuR&Xtr<!NqzgH_>-^0J%BONxaPbYp#AsyEg;e&p2K$;^@9&K<e#sRP?=nZ-Zc
zDvv+j;{S4?^}+k!d2R}ysQ7on(@TG0-j2n~m)#KxJ+V<LeO9HCa8&nn<5MS}NU&<G
zl)5C6RJe3uQ%K3B^?b1&(dWWBo>Xo>d;QD5#P`dtbwB$RBjvC^WaBxPtPeNBVo%Kf
zz|OaE*5j#?9}aBMEYPo9%2;4rDs^-YqfbBzH_O?a6?M$&nJW{#vQ3$dMT$g^OiGel
z!8}z!A<8mv^2`+R{$8F5dE5)@omL%cQRBE|W6bdP>(4nXrwlBQtzTT2^sFLil|qi9
zYI)J@<pL)nw`bq4KDhjC$DB~5%)=`<i#N`4I?Ci#zyJCF#Sw>BCa?L<&Q`h6L02%v
zTitz4VbboxZJIsS)1{wHvCOrdz3{Q?Ca$BhZ@F%##;pCAD6lq`g)wXWEtmVZv-MO8
z*k<Oan(H6rxcP31v{SF6Z?3hfPL*Byn`PEbuhjFtzH!-kk<XO9*U2c5>ndC3^>YsP
zwcg*4T#NmB?rXi3{P|^lU%W+MSH3^9aIU@3TG^H_atj(+R&UyS&ga24ziC{IZ~ERA
ze2I?W(b%3LSw5{xeWoKzi`I07(2O~o>gIlpwg^2^rcrw@u5usayvxh-+viDHs<-^`
zT=#j!tLc4{It9cuH{D}<b%Sw2-jy#ZDbi|d`@^raJzrnCiZgfLviEoQ&W<|2{<Y_G
zhgtczEZsjJQh1tc|9_%YWeJCp;X9jXy|xbvG+fv0GmTMOEfW5L^{5}q=3pjUL#KHf
zT2l^*-b<gpUTc<@y~!T+<Bm&i`<Acdxh;75+N8b0CbxKEP99R&pKZ*yGH~8R1xA^b
z;mc-polCV)zTqGgxGBYsJ5YQ5k}$>jfjmq0ot{&Ac7E=!Crm+G#rzf&uqCC$Nw9da
zuK)9;`TMJlie3y$%q}ifT7T|jSa9Z!7US}Z3g>!0oxHtEa;B`h(W*4In+`MIbNYwh
zT2nXkWS4McnQrPGU2`|h&tc}<`vnBgIbU9uW}9(v+2+YCqAmf8U-Gf7b~}8xv!%!7
zgG)tR$j_q56FMq`L)a3p`XA-mHqG^8cU;lqRrlvlPY+4f@|{vAsbTY)_tw7;xlf+S
zN;9P&UK&!~H;F}E){y%af5soJ`AwBAhdL%3TKknTU+tHE9CJ*Fh0U=_Y~8=sn23<p
z)z+n#dA+g@mdrl1SNP64-=~}BEDk-<q?KY>Xn1H+d&usXX;&;#tJE(&-^g+_{6kel
zmalH6ooxN~xG$GxhwWXT?z<~f`YrnuNj>v}SLWA?%`|8G$oFQ~aqC_6CtgK!KTVfY
z@wxZuo%+goN*=Aeq4Fs`orXcPHD+!MNl_8J94rv3dF!H#^Uk;>zkGxkn776*7AbSp
znrqOZa!X-HbZ+beei;tOm6}iQZtI=3RI*3$E??G%j0&FXi(U&X(987yA<%L`w87<N
z*w=l1vun>*oBf?EYkAl7ddrm;mGR7iM)^EU!i$f7y3AiAslKse`NA)6ltp^9-&alg
zv_9ji+u!(EZqvPHn|w7|@$hkuJ<Ef@zSEA@Q!JL1D@guZwpoWoutd@Mq?6$HNr5Xb
z9Mcrp(RTNXFi(KU--nZrZ21wFdMv_gVU>92#;#{BFV;)1KD0+@^SX6&r?0K8{B-Da
zUc}ev&)?Q$x%AHazV*SxpUDCy*S6pLU-<um9#gAw%a@0fbKD<v-QPQ9_mNwA-U9cN
z^Fw!r?A+bLV1H&sN8Xg(=Vq00uK4%kcz-~Gp~0unJfTy+EsAHTO#C@#6_f7iEddrz
zj-FO}=AMo&H!q!BP|)?T^~%Y*BomuHh2Z1u2O68W4A<%`oVZeY=iV3B!~dk7pY`R_
z&ziXXOT?E|rV5yv6dbz!{Z0K(X7+=7KNLAdEZN4$l4E=B-pZtND)L!jjh`af=IM#=
z?5tmT!Xm7hIi_j0$L99c5e(^%yKl}rIcwSMxS260zTDcxtF>s^p;ZcXPPOc^(`A`M
zHm>kJFzNi_)2ZtwE{}Vq9?|u*Sm3&Hor2Se&({(HOstbs<37*hw!3#GS4gV1f7$M{
zEzhPpHe_Ahe)pa19mm26C%WTO)!u3PIXhm}nwMnIF7aK}{dV&s!4n!Q!~7E6XE(jF
z$_bmC@jz(5`o%=4mp|loi0_*cv&~5C`M2yPNtJBNvuAKExbkEN<GOFoDsH>WMXPsq
zsRjARmI$XjZ;)oxj=Gw>_nhH`=Zn`pJ*lm?yX@(ElV4VK6Ep5fF4^<?qrB6~ic8iz
zCWr4!&9?lzBwcc6^~uLmjBo79m~&j{j`iIeVwZX+dQVHNN}A&=TCmqlve|8-%5Jt$
zvnd{-nIBr-YqO|3Z2M}^e8l(T6yc@6%0f1Kuu9vUE3j{salNKFdwYn2OveYct1I|Y
z%t~(duD*Bw-t3Hw_aEX_W|gxw7Of1pxA*JkjDX+AzfHcC{B<4U{}Xv;m%8VOyUyI*
zs$<M{OJ&DGSwWLmF3UPq4==NsVkcC@@c-(R<fXpdCUH+ab5Hvk1vGzZ^m)5!Wvc%c
zgDo#r%s-c0i#yR8bkX9b_tk{LK-*<aM!r_zXD^E^-@b6w*IVCXKGZ+|yYnowX;f*H
zfR<R$&zHadN2VL!vftFc$N%30!@ef<pod=mt9p)3u$^O-BplJi<?uks@LSQ$MQUDZ
zOU!ceB3`)s2v1q#-%=~s?6Hp{No%bvkHd7IU`3JC-;e%PUf!JYv{EK}VOajGtSgSU
z5?<$A_UOHwd2!d5sng^3f7<01e_WsGYK!BQ2L}q@Kj_oHc*^gn-z4e3i$C_bZAfLk
zrvJ7-OX#N5zVkiIcYM8Egy!6pPI)NCJ+-b`t;lb3?F*HwWhcJLO;d4PbJXPeLb;Y@
z!up08ivGPde-=It@%ArRED~{M^Tqy4t6zQZuw*)VwMlPx;?=cp_jc|w+4RSC*(?K&
zpqHKV>tuYh1s|)KD9uY-xnRo4t(QWK-_5r;H2MCHI_FT%-m*LUW1dapRP#FbQgP3Y
z+qKz}EK2sCQ@cfyCr)CXpdskR+P6ad^AlC(%evw+;%|<gUb$*wLNkZliX*m8zrGjt
zMNCa&Ua`V7ZuhKBHw9OJz4|^|@5BPP)qdP=N14_M-+cJ>{cov--2!u7a2z#hDr38%
zv3a%mm(Po19XeD64>SCzG&%O?QT3dU(h0AnB7%!9i%EouTs5AeG-ao>&W|gW+mGno
zaXiMhEy`N6ptDEq5vPXyjdKUxK23^D{K$UX!H2D3jkDkhoo)9*bHnqi-d?(X{gvdu
zNm(Zp9A0$)ujRJjV^mlW>rkq=)aHb%wnb6zB-LY+<$8;?*7FMU7(aYE@uA!o5BFoQ
z;<9*h!}b;ko$hm86SR<P+H8*Ftid}(=ebMsB+Bf~))Y-x*s_qz`3cMAc-d8p)`_rZ
zHobU1bDQ@4x_ieLb<g=0Wq15#@Z$H!YK~vbKBG`o@Swq}^v&*;*rzUsrtmwtxnwTT
z)_hr2bHt$WWuu>2XZixi(unG~d*2Ff@N)4;ajNPD{ob~!PKoi_)SdEE7}xmb3x3{t
zbtg;8Z>1)wtyR~H)*LH4S77h@c>c@JIetf8RlI#~-X6aC;;PGALf1%s@bHynS^48d
z?0p6QP?ckmJH5kN*TsCY5xo)WeNR1PYSSY1tXnH@-1R<dviR9`PNrrBk?&_X!X<-d
zZxxA{>us5o?^V?t*}}HJXLFW2L+P_(N&ktyPAlK@d_FL5>&o(iG;crVjH9Y^_wRbS
zb?<ePUsmT_S6Mc%Sp2(=$7w^Ih=?9*Z|<KWi~l!7Zy)Mu>1izEmby0W@Cl85{@ON-
z!Q!7qYQMAdHP{zS2(d7&m=dCYh{<o8!Dr5cC;FECbu8dLrEoBqZA1LC75h9Z7wSCJ
z5<07Gvn(fkPwrp$MVaZhW^CTN!0mqX%$&<hXBl_sr5wL{<i_O|g-4Y!@=7WibLO}`
z`8hK%P42!!-6Gpb=QoC*-gMwNr>u9-T?@Y&Q>%<ck27Coxi;`yh;ejvoK{`^LNDX=
zLc_pQ6Q=iQaS4~`%q=fycv#=XdX8<HSg&VOSJt!MkjyWa=Nx<HvgYXeoj;rSul}l>
z_cu|0LM~fKF`MJ3<9>Np4?SX=f91yIhd(%OiEmV?XfH38>c|fAE{MOJ*|jXg#`T`o
z`wM!nY@38-uIl^`v1gZ5F8tINYJTcsXvLl@`i3uhq_?ylt`5~R@^G;^$r>RtxzNLQ
z@`JM<!p!D{#aycV`)Yd0d}CYpS&gp_E3}u{GdOM(T6bb8ld`N@kcr~TxVf{QvMk`V
zJFeXnRXoLRar2czG4=gD$2cEN@v0QoRoGo^=`>IBSp~OW-4rh|<5?MRxs;!731kSI
z{6s-id*ZSq#}4fE*~b5)cbjT@YJJ?-cIkh5v&y1geT?y6?#A6F#WCTRL5EdYg7i&c
zLpPnk43Fw#$xCaD?xfxjjxEq!W1za@s`%|oo@GtDpL%t~)bZYUy{+MtU%~y-IZt+a
zdSxn_u8T3br|$U8XNIT`^T!=iUQd-|UY%Tc<GBh)idXE_$(t_vm#{_ayw%(JDpuMq
zp#S+VnXIP!_V;Ci#Mv0vep^`Oda)p+afPVUG^Uo6jPLIkE;Dm!+&yj9%MjnJ;A!5r
zH+)?eZp~nIJu*>H<rd#eLE*;&%NFv_-BT1J;N~jIqdLRUW8udMiiab*`-PS~JYTr&
z_N(dN?reFbdbgM1klphOqOX-5+x&aFL!!lc^Su-gc6#bwHc9_6jqAx?rP~K?$Q?Rj
z#`Kg?mA!IBlIA3Xxc~Q7W=)>5X4S&8kK8P-r5~HV_U@aPMqghV-E^wGba>mPgO*JE
z)802WY|8r+GXJaEx~l6x=WkIqit2wZJ%Men!hy$WPG2V~#2D|J9ikBPa4J{$j|F@!
z4y#vwofWux$<e=dE3&6N^0YNOA^0O=&P;dBfQ%o%W6J${p3PXGcuUg4Ew3qBd5U*i
z<Boo%M$>?^9)>pa4e}BfCz<~9JeSzL^ls|<U(KKYuZlZAecnPbZs#}W8eSb!cu>up
zRdb?Y_e+6?EUN7pFQ0rn7u6cMWr~+mTS=eb<6gu3((gt5Wm7DEdY(IUHuc0h!A`L@
z5!W_>Nr6EZ9+WK(;c0!|zTke9;d!COM;OWlMABwDEHu0%{ZHrlrnU7?C*6;$&HR1z
zYt@k?#xI(4G_U$M&9SgqaM+5+uk^dSe_+j_$lAt<Vsgvp3B+VfYiisvE4WP8$f;~j
z%&rQV)L)BAPNq3n1p1ZrsGgjr;5Jjj^rf1W&cm&{rUlJunZcMl=fc!8TGNa!*n21^
ze{6qMnxEzIC^i572mh}@TkBRPoo!vj*()5g%z8&|RJ8cQ)swlV<ShK7bLxa?>C-2R
zzS`!!=)9zCd}brx6eh-;jEg>HS?A5z4wbId=(1CvzESgx(_(9(r_UDt<Wcuo^w#<M
zQ4NkIvwo@uFXbq>uP(pqrvA#B!}FiXY%dAV`Keu(es}llPdzJD3xzFq$6t`Nt6e4E
zd?RoFx#uSmo|%+f{=uf&vW558?$i+76oKh#_BXYf0)10vanJT}opr|GnW)rfwmVXD
zR%os{#r%UU{CaXq`OS?pRJa_O9#*J%PRhDfd*9^l#5*D(%qe{Q@^#P7{i|PbVtVWD
z+zQ|K*1xxHxh}&I{kpaBgPriI`CX+Y?-kbmDU92x`OEh}-ZIn14Hj{N>s|=5l}k%2
zt!&g1@+-2nJeToCIC<GNmzLU#nLe*7tR?5QANyvz;a1fTr!Acu+Vc|p)-G>xEs~fZ
z>hka2@_&y%*!Rkvw!8LXSO3oZLzP$MbAGImow)Vvy?;x2jjDw%{!mz(eyrL>!0w{N
zN)r{<JwnL|GrJrGy#wyJMBMp5VUN#8mKBFo%D0^LH|PsfJbm-vQ=!$dPnFaa)7)-&
zyME;VdZ#qh%Wn?P6KBJ8At}vSc2Y6l|89T#EBL~O2cc_2!gIc+=0^r!{+5@dsJO>}
z@~dMC_YNGas|#G0_4UjJ8<&0Qw_Im)b0-Nog;iC%2q`3IP7(?W*O$Ka(WLogpq$ut
zJ%%mTD%DF*ES;UcTkXWbM~S*^yp#BzH?pR7ROCAGu>a<LJKyHRjqQ9ji!Poow%gVn
zxBt&~>+t1SY%O~OLe@xraF@-U5Y(8qpD*Zcqj$RVVop_;2?iOV1)Dr_i<DDBgx}?_
zn%W?<LSE5`qi?3Hd0tfLN&j%Wz1zd%GgOX-B+YgXPLECMTJ@v5ev^Il-uH{+@BW|J
z8T>OntGxJ?+q<jp?|t##7A?KvSNy7oVughd4OZHuuoN#^P_p=qt&xw@QJ-5rw-k2u
zX7T$y;MktGxb9i2%+zz2R{1ACi(p#V+w5kpxNUQk>pjD>r)Mi&UoUyv__>pqGn>+}
zOQPG~XO?_d-*$J6Y3p_AeZS78X215%+w)`B)cTOg>3cwa3-}wd=CHNV7O&qnhRhc7
z293^(7%G=oc}`S%wy*KmMFr($y99cFA5uB^uVJO{a*MXq&9TC3*Lj++J$})^{AVoV
zDNli`>Ta!G>nC2$On81{o%+7g2lCQam=fc*d*9pf>F(UsLD|oK3SO4F@?xj`TwS60
z|F*23-{rb$a_qC!AvTQ{!~9Ac4xRLW(Y4I(?)oK_0bHGlLWd5V@-52hd|RZhJ%!7u
zDd%<KvXj0=b<+!ZFIzaCHW!Xra^A_@xZm}xyQzd`(X-NLC*RBb`En$oF5UKhWUj}K
z@c$>5{kOiqYFeDa$*z^_er%~PkCkLuQpyv-*K$H>%cFF4jV`%w?3&>>H7}*5IW4v_
zKDJUbQ25E>C2rHd8<r~Un16L=%YMCQnnix1%|FD?3-2iJUEHwf`;=$v4jUd8dU*MS
zw$}f5{&~A2oAt~YO|H$^c5UC0ZoM6eH{YLo{rM`l^U<IvbM@vQ>iqn{T9&RGe`Z}h
z;n}xhag>YfGLyyKA=*7^jRDh(-h9(d`)S?Y+?laCVs5v@KlO=8o{36t7T5&MS6LPL
z!>VJ?;wy`$#JdLm5_r;>eSLoRRcWhz#cysdudjHr*;nAsjL&5sO;`WhQ<_<G?}DVM
z4v%QI+UI@icouoP1}y(2`PU$zkmn3v<vN}s>#J!jT45J<U+8UF7cFVnw*BM{(P`d#
zae@^a0-k!6f7rKC<X|`3{MDU;b(2=iVtrnweC)+@g+&6J3bx(<cq9D#-~FAzKW)G6
zF5arBo^&++_r0_K4f>t+I7GEO*!<gHtxjre{I}!=TXoRdd8tP@x4dE(Su%s+adM!w
zSqfk2t-t1fotsuvs-AcIP?1(Idn9%aN3-#Rbm7Hk3U-t)Vq$Z8zVYpyn|00MLI2L%
zZGL>-M5ktbn0Nf6PrCUrAEk?{R)|Jv?2I_8>3E_#b=9|kr3;UlzbuP;IeG1$z2Qnz
zJ$rdK^$PYDH;S%GxU}e3|A+QpsoOk#zQjtOiRV&qTa?&*?!Z&+N1E@PC1m<}(r)tD
zg@2X2k@vH;?$pL~w{7o!e7snn|AS|Kd+urJ@V}v_FIAksBme%;iDySw8r;1flFzv)
z;OWEguHDzdb|!b4tbgPfrn}Nc&s$t;?pfckZ&UfcTjal;XT&1)@ecpR9eIIUwVvI$
zeRbyy`^EEK&3a|eQK5HZ`rR{^gGA+aC*MD=&i0u-y-<Eu*PM>26<_D){Q41dTv9UY
z-Za6hEz4e&d|$hMcKC@od`(S?r#SZ}uUWO|<Y}R%OAk2RuRDCd5HI{#p<n!Yd11+2
z)87*3C2s2OGyi%cXyQ3ZgC$q*9iDk)o242<uR?Nd)vl7nMRV#OY`a^3aNa_-2+8Lg
zO4sG>e6?rw^nbtR$Q7*nc<b^OlQn5m6{0!{^@5rNs?<AH{dQ*NQI~4a{$Y2UbK$GQ
z+Ix;n-Opv*o#ob4yDIC9=3Cnr6X$spm)}iF^qO03`c2<Zdf)RIC$|Kv_1T#HxX}0C
zuB`fS`VX5N{l9O&)=z%ZQ+B<G&xHBqvaOCS61+WyMsuc~7j3gJ?Cx3O!4u%R@GR4!
zL;svY7Px9&o%_6a>nxU#xi47Vg{Fn6dS06FK0J07!~Y)(7c44tW88B5{f+PC!p%Pq
z_s)M*e0xrZX#G?9{9iZD$h~S>@@$I2tB`uZRT2!jT&u*FPpw~7J>6_6$AVdL%`fdU
zxK;(IF4nOA`bA*jEm0ZowPFvxXf9Z`hyT~A_V*WGY}Yt@bk@oDPNA=#m%piv7j7|o
zwnz8ojc>C)uZ#QDcGKp*+iJhd<w>TiSsJx00v?2v6s;C|lM$Mh?{H<(*#`-h@1}%Q
zX6<P{R-@?u@_k5PgsNh|+9dI!){>uFe#~E$^>3wV#N53tLg$zE8ZT!4KELL}gTw0k
z?^ReDe1H4te%$|qDd}5smwiuQ3@r8%P@3~%oAcf?e>*1{yzQ)NXZbH7Fwuw6WKE{L
z`l0)p_unWp1~lz>R%~)_^*`1V?}F_PZw$D_@;_kF4Y9ppJAEp68LGm*KmAvK_vgkt
z6)X31eiD4X<z&azpR4R`{>OxEofXo=GBL~i)Q%l2a^_#F4N4zP+2Zi>&9eVHACw4N
zh0Wa2_H>4Xhr)gTXx_%qZ3bEVQ;!@iFuqthW7R#&%|9z!J3sw!-v0jIgFSavvjv}D
zb}sw+o}`P}X+=JZLzfpjA1z8|o3ro;1Lq&jQ0}%TZmYkUuh-0*l$sxs*OYD1u=sJo
ztj2Xd%kM1UShef(m12z#eXJVldoHg@EaJ1Nc=XP>f6kw{#aEa7yb<>)`t^VRCC5F_
zev30PG+o`bl(Vn>fMh`uyQ|lVZyM_#Ejn7yXtX;!X8V-Ms+Jc8b0-@e4|K{|z2LWQ
z-of&V6)%j`%8hQxxc%CYu~J69=lGw6&s&tgeh~j&qhTK>lUH-@-JNY7r(Rb5{BQSu
zT4nX0v(9I=9X)&xoy-ZVk@fjk^KFav=88+*UYa^z|2n*U;HKpos`f#A+3s+`t8=AG
z-0Zd=-*)QdIfh9_!RPGN*-r9_9@|!z{eS-X)Sk43qSL>|Z2xm<o%XWL`HLm1ennsQ
zn&7o{LE-XQ-%fv<S+>SQ(m*fD$zHQ~4GVA9QVH9O6<g1FXh^P@JvCFeH@Pa^W9y||
zyW;-wh?^MS`uI4xT(&mr1$%GU<Y&p%KdsOGuTXia^1RA_R>!O<jwT_C?#<$!#c@@o
zfx|Sq!%iuMwbAxPTXw)hPC?dO!QH=Z7)Nv+{QgwQd**_(jtf$!YHR9GQCRt9X71F;
z3(WIxm#z-~)c!F@{F9jP?(X=1eV^ktJoga(@M+7oXJH#xExvi>|DG66K~4>yp8?B0
zbaomQGC$rE^5pSyg=sSkR~@_5crefUOb+8BYcH8YcV?}bGr6hn^AXuKS-f`Nw*GzI
z!ngm?rg^ic#osFZHcz>C-p|X=C#X$TIIvRLD&nAT<K#72+mA^vU)U00lXi~n#D{|$
zcZG2LUK+lHeSexl7Dx2XmrnDlw+6r6xlAFsp}^_bZUKehw{A^m<g3p1{kQq__p!Bm
z{iTfS&uVg}|9!S=|K=FU+1qDdw#Z82oHTz)+%u6S#jA1>gZH@jA6j84qA0)G<bDgs
z_G~q+>AW?Wsz(21Ub3jw9^Eljvq-*V?V>{((?iWCX&8k(c5#2-qx>>`akc&4zsye;
z+24B6TD&fLk@2=qpSI8czdZf-+TMM~GV{)AIbPT&vHXQ;;>%+~!B66TM6o;MNiCSN
zcz;hylJr!rqkQH2pZ;K%U*5c{h%q?dJz##`$y4Rqa%1*r<!oE*=HDb`-Fhe`ZgxUi
zJD2*ly5|qvpBJBTyEsc*Y=7}d*SFJc-t+ky{9b-g_N=yJNt%d@PVCFOjL#1B>Mmqf
zj_g`lGg;RB?SkePyI1U}YL=Hjz<My#oMooRN-te&QO}cIx=cNNPAfi6xv=7yEq~_i
z@BFpZFC3ojQ=1`Qd{3|b_s{y|onLd`o2|ccCNFNzgse9z*E4>ImdMsWX{k(2+cDwI
zX1(bWGJZw>zZiIj&t;ssT&iH*t~%Q_@|<mEf@N8g4;*wZ`oE|vOt0zNsq?(6&M@Eo
z{xbKy=)U>cKX~Rpp7y3^ZT-jS>wiDK+`pbvFLzh;WG{iUlbrhbH=oPDbVqT8%$4BR
z_9bO=ti65v1Pz$8-H#=iwE8^}GMg{>c>?cZpMRlKy>G5}d9}K*La{~b>XkL^Ia8dr
zseMnaQ7HfOF<<Uaf$p(&=5xzS-@n(}x#4e<ro7p~GxM)q+hf+@DO2L}-XXSBF?O$w
zr@HYPyGD))*DSm8ineM*PE@m${+c*1bZW|jxaXpr&XzH8mMk09rk*ac+|lukvo8Ee
zT<fOV!lQ`+%vIm)`D$}tI6Ql(HbbrWuF~{<Q};w&U3JZgaeZD8r_;Jy8qNA5#S2bN
zEn}ZL?*-2@floU+SG1q(V0&sC!F8a)+NOP#B+FIZ``m>!nGxnmyB@3g>V*lqWSe`7
z{@GJoc(&xt@Bf*%t6Sdd|Cpz|)_bzF-oCo8?_0nBoPMCNSbbtvvdAPO^9MY^7hj%Y
z^%kAP(j;Btmh@-d6_v?RkAAc5dtUj@VS<u;&OysVGdiEuim1D>Z4_ZT##gkvB_d>X
zwSnCP>u*2I`Tx~EUViG%_TK9{zxVb{)y#Xp&0&H2?5LxQ_Q@T)>NR<P%q%X`tec|W
z*N4s7oND8{%i`qm0C@q+r{Te7A3om|oFDCDTva2wspdoN11q-4cTYdhTl=*3M&a{`
zx83_wx0~&<$T~N>;l=6uTR$dm^UnL(dMRd~rD{jU>uraamUB3N3n)!|u*=l;%*@lx
zCw8r1`Ea7_qvmHbhj#u;cUE>!k#v5pzN*i>tUL3p+x_WWiSx@icq>-8Je~Q>G@`=l
zr|Qyo|DV6DXOTM9J72%}cGNT#y?rl!U40*=p%r$SjjQ!(TPD|&Lak>v)i~ewYlW|^
zc(+tgs9KRfA$;j>Z|)Gq^MaonCM@*f6PJ3Xly++iD_iY^B6&WZHJ4cLy9<5(xq1F{
zH$Fd^+Go}5|MFw~!jf-&SiQG?%8MSotS@KgKf5+ZsD*o?Pl6vu*xCYarMp*Wr`mom
z-RZ#bzHyaE4|Cka-9fDvOI9q{@py^&oa0A*7HYEwhYFUP-HN<wo&2k|_r=Zk^8fza
z*!bq$vGX%`<|??DY}MGe=Hhk3wb{90oJ>*fr4x5wDtg;$u=4p-6=$JKPDZyp4f=ie
zv?$$wT6FZqHMWYVnQP*6V|FPV`Yw`OD7k++*SZ>epB@p%l(_*Cv3dVi^6IR7dWJ(f
zdt1w@Yv=#-hU)Hp5UP86<AJ_wA;xp{v!d8K7gV)Oj_Bn#PS`p_>S@~oO~2AvyEVHO
ziCvm@Ht+VUMDL?rU9FRCSN!Ja<9{O;vUo+L--C7L-%qChkk67|D>65JTUq(lS7vkk
z)W7?@xm}t5KV91X=<^+!7xFGy-mSk>6Mfl;BO|<*pD}l_`i)TSC7B6_SMl$x)BJlU
zCThm|rP`UV97Xm{U^XpUbZNrnH{Lu&Y#Q86GDewSDs)z6-BK|Q%FL6y@<T!T!>RQ%
zXMgwE@^$uadqcAccduqV*s(LG#a)wShvxQ&HU(w>X4qY|zIvolDV#;<-8#oep78po
z!3-1CG^8F*;R<rpR{Xw3WX|%|$=1^!-f)}hvT(`aS8j7c8J#~h1tv~8J8#_rpX+b@
z75JZ6C@|NBU9jJ*8nRXH|D}1e#kYiW|9H<7v^8$RD_zH&6o#2us-BJk)?LZoCYimz
z!vem{S^d8yQHiNXTb%du4U^8TFAa-!onlS1;g}b@ASiHR=sfN%Tsygz1Sll><hx`E
zPtPfRUFg2*<&VwE*5&t$-`tn7J)ge!<%PeDd51Xv7@pmJw&9hoBg@jw+|ud_{$-cd
zS#0z+i*7Xe&vE)`M!A5i`_zsc)|0=pI5y|IhCZ?BNaZj;xBheFx>)mLRu%s;-D*TD
z=DaOv4w#}e@yDiJ_oSWuYbwt#S8My!E^XWX%;vqyswlt1>oeEc1pN;Y{uST8_Qr|?
zP3v>heIxcZN=vNxnRerYamZ8?Z`mnQM>Mjs8b$h+i}pJEsIJ{0$-h2BOGeqkZH9;K
z%505Li?4gtG~esH)Om`^|NXPhe%{Zh>oqCvIUAI|u3s_3e^tHN`qYhgd&*oGW<RW!
zVfk`8I5)fNbXV70-P9L?Zp!i6{l^4XemiBiqUx#o*=kmS-r{BJ49|qFJaAu7WP&Bz
zRqH>}orYy$I~fGJ&3!uU{=GS2%>K^)<NDrpj`NSEy*jHkdv?j};H$ILOndga1_X7#
z>dg<jxOb&%z|=XK4{Di{<<zUwuK45~SJ)(7v`DdQx0<!`F|!U&U(Q#)Czf$82@(i3
zk1Z(O$zycymVl`C0{8s;KTkR>D_Jt}x`BMlCCRsfcU}IcIene3kdfcAk>~Ps8Ff2V
zo>ePz^q7t~pZ#ke@Ybl;qSW&Is~Jb9wm;csx=K=6Q>vx>_|tu_GKw|Mr@YSEWLi?!
zbjy+5L;FZZ$cd*4>|3w@z850AGHUz#s`JJ9UdH)X1@E6qb6?B4I_s*ug`T;m+$x5o
zcBMO=*H)d{@8z_@r!+*N=|Z1_^1J{qmG8`)QgxGdZx48=J(){ir=6$7<i<)iRr|~Z
zbw17)oTlx59`xu5OS+))<D$iLcez|T@8&KqU-Re0;^q6Uy~woB{bq6c`jRZi!=VQz
zv@ZANP0Y@UcF+rB-lO2MH1<}p(t|(67N^!~uL?9gze;$kS3q#{;>O$89^HEtk`sEh
zT-L`RFx@y|tA3j4ni=VBTGJ23y*lf_UtjjyolAIWa__#rokCvK>Y>*!T-p=xH~Uhv
zjmD{kMwgnb+$A$EYH6<ZtuL;UzrnYY(=X7`^YPTmBKDWB9Q&rNc*Wi1BjH<Qx^SJ=
zJf#B`??jujq)QK)etqTSH6gaP_?@(!yvwR<xx4>mW!d>%z7)CsV&|=do!s76SJnS!
zHriwA&A0xD-pz<zL7oe0US;w*s^t~PtO^$qHVkFg5WSGsabyK!#s>eVl9~TvejW*U
z;^F9~#JT9^wvVS4Y|URXjj>we*$Hj7xJ=L5_h&y}zNpUj-ul~@6XsKYzC63j*L`nc
zaBuk5v_;8R=g&P{#eZ3vrT24IgxnM<#(V36LOt7$Eht~Sz&r9)wx4j^t*Ifxi&I<U
zbZx>Xe39_o^hLwSNLkeP=wuyBk?;Hq7btrP^lk9&I5s<NXZ4TGxBnm0u3`p<+RCVt
zt&6j+)-wg1%sFth>B3#t13I%V-(9(bQ`Jo+Y^4l~pY_43a=f)-oIF>V%Z@zBlVrBh
zShPqix5mzj-D@txzA3A?ZnCb~yrwR2$=x!?Bhej(se4jO@4i3(IUsY>oXS_)yU%ed
z<fx}Lm&{6gYpH!T_Nb8Cv6ruQ6(tFTeiV76^?quFsW{W0ga5dk7u<C`cz`o#<Dbdw
zCm$?Zx83pWF0-SdE9`F0S?T@Usrhc_ryFXMXS|saF)7+mpe}#PRsFKBW-7D()ogix
zZ*n=Wjq#tmZPks>61$h&Js`4Xf0rrqDtqa6%Yd$3H`<O>-q_q+Sh0M;Hf?<$Z_Z7H
zjOrUjOg28v<WLv+?$GJ<^38z>cGG-?T#pGYFmmSM6Eu18@$?n3J_GiGjyDqF3fuHw
zuKE49lCkQ^=G*qqrvEv3%)0da4&T`xSG`R3uL{j)yQs)8XM;qj?Ut3=$4XTVFIFsi
zvtlFfBQ~`w40;V~Zb*k_er);U_nR$Q>hY1H8=*a~!c8Q-RFaNmOiD61)EB@W*QO9u
zTe?%*c)_KV$}cO|zuD7TbahtFY|Wj8AzP*7@~pJ4&UUony72Q}NdDz1tSh|k8r@U7
zdF!Z<3kS2x^S0xsD!NxPty!>Vvde}a%R{R~W~m%Mq~gg{wcx4His1I2Yb@$^x?EDv
z;lF+$WX|S``>Or#S$;Tkp<h~8?^$woNa59zmFI*Vo_N{{T{@!5<G0R8yOP0_E4bb>
zz_H`i)E?;w1?CTIjc*sOUi887eDSO=N4@qO-4Z`p_wJv2g+D5GsU7SQxpHLj!F$&v
zSHAx{)6Vu^>s|Q|pZ*0rZrr$PTjZILOwR(LvddD6UsDA#dxN(~mDZSNJ(A!o+bmX`
zQ_;SWum9KF$yzN-M60Lw>^joGeI{X5#-*Fhhcr%o4VrT^TB}8M>lBg5GltC{H0FFt
zazFHL=PmtapKXD!_OevR#=bw#qhTH+ar4{Tz0do?Pfznzw_R|LXOZ_$!LE?wK?+NP
zPp;)+Si4p2cFUbT^U^Q)`WQ~xuwssxPKVLoOEVw(#EE^CVSHz`^pC*?jbzOvvotYt
znP8XTErClHg(-YA^%A`OP-dftP2Bn4#=*D#PEIbLcgObEW;gCWOAdi~8=M*@ud8N!
zzGcNeo=KA5v>Y9urB0pCaPtytSa|%?X_8wz-moSlykwB>{w1W<w?KHa#MaKsUS~eG
zT+3is*SqojJ^gmAfGr2F3I(+}+&W^hExGN2%0m~Ot^4MEPdEE=M7+HAf_BAZ-tV{1
z6>ipXoV4WT5s$yU0kK!-D+?|DRWPe3&vb^>ZE43xN{vTnW>}`b(wg_9uG3U6WM$Xn
zsf)YSTw9siyLd_`W+aw!eP8R;qP|QcrBX-A{@6yrJ?pN$3z2<yVot`Rig!2O$-l8z
zzqNazu9D70pFe@=Y=w(0XZ>I^pU(3zizhZP(orKKJw&Z&H(ReQ?<eb(!7W!;Yab|b
zR8nGP5`Ob)>7!MOR?A(akC{mxx>|m^%-N+P<o}BPMNgZ2%FXt&Fuqz+{Uy4&+U<Sr
z9+?@BmxwamQ48Mss`qSlPpI6tsE13|?5OcwCn}*YbhSg`Y*>iEy_XRtD^?y}d-{?_
z$EL{}*Bus$PP{#*Mk9qoTdPxZxt)|(t$Eh;o~0`%F7G)O_{ha&RkEw?`-?d*S6YAj
zw>AEgx-@66>w$>kJ36;l?OkQcyh^+I2XnR2o-52ZIjrUz7IGFpG?}>fLLEnS!<5fc
zA1v4?Sdum)cFT%c4+}FIiWdqqn@Sv>yQEooVbHA)&wM)XFrQfPBy6_S6e02Wlh^Vl
zyzJZhb&vbzr5g`VK3?`W<^S>5OAlQyDi-qd4P84kpf*(JwyJ<mu9Y{Zx#3m)SiOxU
z6U=rdUESarSDKtSx6-5TW(bGX8m~Y#z4Ui&nI8`*Tr--K@M6B!qo8{YEYhzJ8fpac
zuuOdOX73)c?Tf^=JZEQ)m$sZzxh7D!`reApkhQyvI;5<>_GtNh%IZtuT2vAsn9)=2
z<#yyR2j7VWs=I=%7qLq0N?gFdfXl%zghBqy5`NzA1r1z6HWS0uI^EpWZ`}x(E*4>{
z9Usyh9Vq<C+sppv(b)QzqJK}ebvIh(t;o8$HDv2D&#zMzo+fpM$ge+PC~*4OF|$_A
zWMhjz<`<K0i4{oM9JR?||MOAN&EC+K_2g6O5ZPUZ$$z99b}*ES&ycjpy?4Vdq&P_J
z#exHSc(Sf&<_Y;<s^mDausG29qHmg4a=SYJ+yCpG=jSz9+CA^RAo=vq>L}xdzm7Rh
zu{sf06suXJlylcBOn;SUST_Ie$mSBE`_DV9yjV>hD02p%);k<kyzO$Y%L>03o<#Sb
z%U7KYT&3<f)mP2>(A^V<pU$pT=ImQ5@>wDI?QD*mGRBMN{=eB@`z7GnOt<*sb38e`
zy7N`8S_W9mShy+d)$@l1??NtImXTN&G^4{R^iQLTr_+qRCzw`LNfxjsNhF47iZHPq
zn-V9!`qsvoQ_2Oetn}}jWp?rD1zVYS>~9<<beaX++_)gm<<z!$+^;L=Kl56VW&3&S
zUi0R*pxW~`|BH?ksWK;?-)&q~6;dCg6RH;4_3DCetreqZ@XMUgiy=357$5&AaO%xm
zlef1_rrt4n)%oa;rdPGO{XC`DcV-yB(MtVSWEcL_Et5If>#<UCP`hUL`m<##ueqq*
z78hw&;C(M^zvcP6zxDC{E@rt|SD#fE3%%R3I_mP$U&kDytd$d1eRJuU%w2PGi5O>q
zh{BdbaxE$KA)?YOe=ijZ2}^M{yll(%|Jc#0`H@9?)#1l$rmd_k)F=!JySkS-oi+Qi
zX!w!I8m?KlK5h%!^7;1P?dfcrZoeu&cFQHAWsd#&FwJN?yQ+*w^IpD-k7pD7=G7I+
zvMM0dWp-2bMV6f@nhg<;l++U452?6ldjv19aP1MiW6R%?s`PSMtCXB_bk&bim6H>e
zF*4PJKAG3&D0<H2<-&|BrdrQU9rzq>?4SLra{jaKfUCEDEscGD)%fV`9H&jOvkz=|
zuGHx@`Dvs2|Jv`Xi=A6*FWcttjozSI5W39IZ`peGlc`%&eV(h^Pk*>G`c&~HMM>64
z|94&NvT<K_&@(@B!5*R7WopN@erxu}b0_byzNq<P&8#=&@*$1IJGKOF7g-f1IC)Xi
zDyb-^+;06<uWM(yOWm{HSAM_Q-R|xSnJJZlTPLk^{6F9F>G7_1`Q5qCrwSi0woWgK
zsg+a_>Tl65pJ1@!tXHmrv-5k=rHj?iuW*>eqV?R;lvR><DT86$woUh^{F9#~!4|(-
zAt8gOeC8{T`;QH^><<cc?|QzeH~Z_FhypVY)3-lfHJ(px|5TmL&lP*y*JHsvWn<O-
zPxy2HUV67WUCEMZm3H%qh%Dx>{2_Hq#aL2iZ1TIea>L=ZN$003)<3C8U9f4T_(GwZ
zOw0Ez?h4b}?4q>nWcZ?&m)LAA-Aomqh?)6125xHMVVYyJviZRhY4z>;uCEub?C998
z<6+IhWA#{g``aCrVu=lsfo~&O4s_i}*m-TsQop(_6+b@SE{ijie%7$d*yHx1uS$14
z|C(zEu&db>&T8~6k>YY-IJcmedq$t)?IS6lm4X+tNXYZ>7KP6BdsN-iCzSAS)_JF`
zTt0l^_dFy{b7enJoW^wX*4_lASLur$?tQ%bo9%`AycJOy8~l@>P22Reac%s)+OIxW
zS7ohQKXKlx2zQ|)+RO{y^#`e(stifd4)A$=rrecn;)j?v_3Dcr9a<r7Uhak$3$~ro
zdK_5ey3yO>z~e<(NB*d&Yd^A^$Z}FA^h{&NR)d1Mj*F(RwbftweD5mOw|gERc-}R6
zDWoO*RmOAP-PNsUK3<ugzC0{6xK`5T)KU{qZ%eIG*Gp-Og0-7g)vSEAXj#^xTA%6B
z2iIQu!L6y;?j^oC^mo|aWm!jTRxDh+uzKd5{S#+c#y8&Gt1+`kSm9%_Q%=eR&YQO`
zZ~6N2vTD#)yZxV;O|LY(ax1&S_S0rnSm7p{4@ce_o1ZxE@-=nBH`mjip_^jf{hcVg
z_`GG8?lPAHhtCD<S|#8$+rwh%&f^E<U-2tHt@@(!v><TNLbF$se)gH&Pv5;LgyW+B
zico1ojTXVmq=bD@6E3Q-DwHNNt=Y%BpXqGuB0F8FJ9eLLEd0%8=Rfao<-J$24Ud+|
zTI}uS_UcpLZ%{q^amgy_=8lS8z7Z48Es*G9ynW-TcLLANLbd>nXE(lf@ie^>S?N@E
zbaLXGzJyeEVZ-CKsW!Q*M0QSd@n8=zXgfV&v4x)LW5d(D^QPZ9u<Ws@>(i43*PmQm
zl>AoX#JPR0VW%&xeqFjh%k%cWjo;<FXI?tE%rSSyQ?;c$7at{R6~CFkzB<&NE%RlJ
z@*>Y`uLEVBlqJH8Hrek8oz=5E;_tz$ceF#5p0=HM(YM^uzi+}@r%NhtEHkbwTX2o#
z_>o$!oD${F51zQQE$R!3n|Rzo(~UuJP2a+`N<GaDZ<OWc#GK!heiUN;iY(ioKV{`-
zy)Tqb+^~3+s*GpW)ywe<6&~y{WWO@mamnl(F2a+ejEn#07;WfH*Yq$^IT?5&Xx%hD
z(dBC-VicY>eY?pjW5BGurN78!j!kfyPS)*Zy<DLzGhaQ?I=brLt62`4-U{?{pFb_&
z=xW#Q=sdAAtRO7!=h>>e>!U6|=$q*NOWyL|Q!D*nrZ<%`&HtZ~-MxO6#k||5_rI^K
z6I!x$we%f}7iR=^Ca!F46q9*)F5Op1k^OzZ*-JYMIYiGKVC~@%YzSg**!)Xq)`6^=
z360M$aLku^I7RqD7?)$cz@eR+VvEElGb^mH>oG8py``sRe(?TtBb&U92V~d!oa&C*
zlC?2r)2BaGcQ;2}{+9plclG`Uyk<3R=W{=At4)3%t;SZgJG-#|)p3QWH6kBPR-91~
zceTv$HVCSoF=0jE`|}gBL!Yak_}i5=(dp%b;)TLDg|6tw239loK3<rcXnlu?vG;S*
zwTfdrW?@@>+?F|WCfzyQ^J<;ruE3z}DLS5)I&N*)8E9ob@mfOZdWO~6S9!ngO5eKd
zQi|pGC*oy)A{Vbu=9^OgEqnKR`%ecxzQ6j4<?ELuPFuq>o-HA9uN&scu<x!`{r+cz
za!T?GCG%hW7w>+K+<fb^;Sq+VOx~O!&6D0P5nI^kpP};BTl?=dO|ASz&)i;pkPg+{
z;<PeMZ&Uhd2d;~(0ZdCe=QFe@lwO-u%59ZUVKw)L)t3(kCNJN2wZhTh@!EjwXAQfI
zJXGWsmrRP7#XWbA(89I}PZoT-X|vjIsm+Uxlcy9&2&{CwWb~p-ZB?Ie*sU1R6*U4Y
z`P%q<m-}|@Hd=RY<<^%6cRGKtI=%ABdiME&_AbY|T(6#&mw!^YM<_zJR)6hn+ttFh
zpReAP|J;3VW#z2hUl$zOw*GD1=ZWln|5sd7UnSif@zy)u^}_s#8pkc%*cx(#Og8v_
zne8BK((DtR+x>Ivr$bXF8ECyb=Cff#Lcq<<DGlt8TjrK17qT5+Ca26N{lszau9cSR
z`ZMC6DI^N;J6_HDBN88+*1`KLW74To*G+3<T^^midnKtYWS-9RZTI#iFJwqu{A9<<
zYm<~0>@w)^*tTA%b6VW0f7)UeYikquYuk_QFi5zlSY*A*SI>RNP41-!<ZTb;#ojuo
zw7a$EZ^ESLFjb*=tqHbD!Lo`H%+mi^FTZjqN)WngqIfuOm(n?f>r3AC&P%yqnH9eF
z#@Fs`lU)x8dA}~a|H@N+p46__SGFybzqXN~(Cq&N%XP2oAN;7l@_OHuR>zc8$-M?Y
z{hlmz@=R<H{BuxwYMq?h{poAFwV0xfG-OsKWb9C0Jb`QK>;)kLPHqR^Uo3NEGjf`@
zn!}g3dV*d4ft8xixg^y$cyD<rAEXtO?|kU!DgOyyCR`Lbu}v;O`0$w{m)KV4KVE<B
z@xH6Gx78&+XaBp%{@RPz6>?fRzi-W({p<AtPz@llWa(_7zXg{9by|Whb1(3dWjSzu
zk>@sLpS_kh@*;xeR>Uk}Q@wrTZ}b_V$%T=6+b3PyX{dM8^zp{k(-(i3Rj@;A?y?(f
z8&5{N9{(-(JzHJH{j6Z^q4!dcI`+RW_GZiC4QHx;`Rn?1kRt-F-uifUul%gZtU<Hy
zakb`_zo{&?RdsjxnmFNHs{SIAqRVc*x8}Ge{gG0)xusIanR4ie(;SVr&O1U_{wil&
z;$}8ltLEm=%NN46q~WU8mhh6qChM!uj`OyOm9M?ja_hu_0*AmaEUr&Z#%+uZTIk`W
z66NU2x4FyRRBM`}d8grGF2=C$I|T#ng=H%r{HULM%g*NZx4d0!_g4Mcw*LLjb^j0k
zx*@YXxHd=Nc&w7p+XVgFE?V4ICuqy6aZGxZ^y=JBkNZZ#vy`9DSu}~`xbw0_O`7ME
z*|=BnERD@Prku0QcEZg9owbK%l@=uFI2OfJpS!!Np=(tKXJJm}#8vH&m7IgRGgf&{
zWXQ8ooAg%ub>Vv{N9+B2|A*~=;cxQGszCGhx39MOFY7n#%L+BU+UWR5K{!`D=#_^d
z`@ai<+Y}29xdxle)U@|1*0L^bcQTq-XmGLgmkjT#m^O7ozpCc*(o6atc&%^ywNpqi
zbXx{j$V!f|-$DYX4$R34+ufnbDWey@((>h-r4d|)J)dqeDyYcE#~LT?PSA}j_I>+4
zHaX){MOnr1?ceGa96Z^jVY$x!mcmKFfU}Y=WhFTbr;Ap^DGRZiR?P{o?N>K>^+n|4
zHl2W*g0l{+I&#J_@biJa(q`X76mE+#uP|B>+<xQgYMUzl#=>4R&%#Nnf~%rVt=`dg
z@!f&*o}XSAbcav<)U#qyZP@Y&o$hQueogo}VP;YCl*z68UDa;uul%|<TjlHGRa=vP
zq#K`<JyQQ!l;zI9UR!gMS(Xd*cqV1+bvY94xb6EUuPKsh$>C*skEdni%~{fLs;8mg
z(Utkm{ym>su1zgqmOMQ(adVgY&W~!V0tDZc>qUzh)@Ypj`7wBb`VGnE`>QujwsG5e
zLa^}uVg}`<cPFpDo@Bnk=~=YbJkvdP>*Bun^44@_Us+ia-njQolXiCPdnsS*{d?ax
z*PWa{Bd@kijD^Ygx)py)pZRzDia+hW|NaK>vkB_To?h9(DZ>6`S9nuS^pOkm7^dEP
z{&C97Mmf&l8w)S3pQC1ZwQNC&!^`GZ5qnyBi$2Z!u}r{AvUFvCVyl|_iEAGMi&EWh
zZrHxVe0xqjlN9ggj7^hXw@x}&=Gf1_DLf}h;>rob4N+A-zhCiqI^EoxG}YtVx|Lu5
zW~-$7Kk<9F`}2kSe&sixt63Fy9TeYIUweM`Y{w#&kZMk$_+Lpzn|vSmFS9;qzi+;v
zuTPln)-<yV3!m&fRJ$_o@Rfy&_Zk}d^tketskv+PIq_C}uw4~sF^yBC$Yt*5wHjMn
zJqki<i>6FgRBuzvnCx&*`!wh8u86nZj)7)|<*St<6wj|{s_RspbS*(Y`m6QUef7P|
znC<O8&E0rdxZfwc@3rN@W~E}2JI^fUW}R2iUFmDF@ahZBSt<7xF3)`GZr#*Vba}af
z$+@YEdg8RNN_q+X{}H!|bH)ChpBxr)J#(>KC=e<?=gE#oixcI%FSn?-A2?w+jpszk
zM-xM3&-Obk%a1-TKc$>`&~OIV&06W7MQ#0;;@`i}J9qVyjo#f*yBpfu<`~c1o4z=G
z-;T$%btmnOJr0Oi$<9i<6>{Sv?<5)Dg<+w=xsocM{%<aSyD@ie=$|{kW39{HSd`@)
z&%D0HQ+iX_+gq#VTJ7R1&9Q0I>TN&5mdfEPJ=wwM&p~+(MMkNlOUt}Gv=wfcbRJr;
zWvS2>g)19<L)KpEE14Ts+Bx}3?j@5xS@n&NpV!vO|2kLxHgaixQc|?-|0SF5R<B?8
zZs+sw*8TT0OTG79$htX=XQ~QQ-&TIbpGQUX%P!p7uu5i`=)`NT6~QMG9`-+bcC<ja
z-TYnIMf0Z_j5p;4S)w+|whCu^F>-Og$k?>qIph7O7cGysN=`98x_?gbjj83c=B`}Q
zW!bVQi}6XAy+`9yrd>}jA28yat-aJGe)_tmJ7O`q?bUKCUfQl<)>i30dBgr#{Jx+1
z?^n3`%C0hw2+cJu6<B$6H(yuehG)wb%z5^7qDvNc*s9xqa&>+m+QzctgV4W%N6r3k
zW0juv#q==fmW5jD_br^-vUuUXY0OU^ba@@?PD>BWpUx8A!IyZ>P$p0CY|&>W$pdrU
z!w=5tPZoLf;mj<VLubTazWKZ2%TZ-9_17~c7Z?kdT?}Fqin}=_S3Ugp(d6mh^?RPP
z<<B{lwB6b$TI$h;tOa&+ng8(%cpus(`0rWy)~<u<ej6l3HDfn?uhQU~SgEzUBakWT
zOu}=0^=m~HQyU_39T&{ZWbE!zs*S$(a4J)55=WOcd)bGq6QL{8@|72hsL1RreY`+)
z)ydsaM~g!L+!N_!`ZqV_G<PJMhmBX`1c5`JciQ|AU+?@VAm{MsN!u5{oF%?KRsNm)
zPfmj}<`t@U`HmR1^YzrdJ>~HC;Hs?Emh2Dt0<IlB%5g~1r_w#K^53FOQoes?7X|fv
zex$~re$$IPVkXNA`8}LH`*+R_jS7>qpHO{`@#QOF0nOP??M|NZbus7ME#?$gI({nW
z{Gq0u<k9_Eq1r~g|L9`xM8+o`@?43@&P#14b!VpTRe9!T;bY9JnCdl!@A<V@cIjO1
zt8*jDjKsTTXa6|Ln|x?(3tz(0hs=xPXRUgCB5>O+tB%c~V!Jtx>aZ<~EquFqZyoRD
zRY{jaBKbt*t)joLikWhFc9h_x$t}$S?AwkebMMkE(*14an&P;T&HGECWen4!j~qwl
z@?N)gcc~X$=OU1$F{kJ99UV8x5c^DSE~ok4otvwee@rh~$0iiTS+s-QLA+Wd)&GIx
z@n`4vhFq?WR4;q@V(InIms^dmuM@c!wJqz#fftj%%2}QY3ud3Vx6v*pMcFgq*trh&
z$kmhBp1Mfp_-a+F$<Aeqe#mREe34T0(-l%Pv{D;Cvfq3v%I6}}WD+c#vR?l8@)vhf
zT;ET(mhwH;kS4S!Q*e85sRE1elRI|n7B*G>v=NiGR6HIjoKu@GKJmyE$CuR(TUKt_
z!o*qHeLgp7)t$@#Z8sGieiwD`eAUL{-);3(vMWlBJC^dv%iOj#oshxtykVAghyEVn
z=k_I`9^GMG&EGONYUQR+&zUN?Vd@Rb{D*svc*VIG^|IJ*keTxD?TzHtbH@^e$~c54
z%w5aT?{WQjOY==r-Zk5*|D14N^Fu?Z;N#v;7cFxipK}N-Ud_w7&(vCTQ<{Q^tZSLC
z4ioF{&P_2ho?L%W^<-xF(gUBCozHrz_Ia^*zwe&1+5gX$_5ErOy}Inmrw5zNH#p{O
z*c#3!A$4M+Y14;K?PunxY!MP~(0MIx(0zE`HM5!xo;%$4JpFn2T?S)n<o*YYi%xFL
z=;4uBIP-{giQ-Q??bO9<W`sTs_+BLx`Pm?{@_sqP6}ywK-P;dm9@|u8{oF7s?!d}b
zuTyV|L@bqwYnO=%UAZygze_j!iyE0H-wY(4|NFT}RH{=Wdt2?@Q)ewtp6b03tyXPq
z^Dg$jZHU#M&2QICnY-%g-q@_&6>mPho;&++f5k4Fsc)m-{8Du3m6NGXTIHA!y7lUm
z2&-%FY8)r2=%jk@6A-8ue^j2MccpvLgS0G;%qIcnUNuT5pXJxQxs`ixC;uV&u&oVu
zx5-?3aaeuddbzuwS+gJAahxS(e|pnO3+>cW1JhHRRxS~hue>hv`+NS0P5<;R?X1$i
z7WKn9@BHk?&HcMwxfU5jdhlOrow<3Feu+Mx_tR%CuPh54d6G`LIB0n$-FoSK{$+aK
zJHzB=_nzYXy-e%E?q1xz)W7U^jf8K<;=32O=Pob&H`lx%Idihq;xniGo}SnJ|6|j6
zZ-#9pJUbd1zpt9V>Y}rR<-c7j;=k;p&dRuO-PwHY;@*GkOs@hI4(7=jCjFYJY=4dY
z|0m^TqMudn?3KMP`r(97jG~8Ozd!^>$>R^gr_V8Ut`XaF_%`FKkN54;=luJ8uj|^2
zuRT%IDnIUBY$99lU9`*e_^)>JjZSSI3eA^x-)t+&Y;kw{awPoB#K!3j7VUFq+kf`l
zWpKI6iPtaicR<)(_9eE9Rv-Uvn>y$3@AulzH<a|M>HYDp|Ni0p*B1xkir;)m%>MIt
za*pCp#>-uqVW-Yref95Jb7p3)U!ma9`?vS;+W*LBcZ?9VzZ$V&)vc^$=N!Y<)L+~A
z@$&kMciv=9n{S<P<lLL*`QJZ%FRHluSJ%3Xe_H3xO<BT1DcS$HvZ6P>;n`Mx;_ciS
z+qSCNn|%44Z=dVt|L>vSI`^XAHRpcI*SqnR)nBZ9-{=3~{2HI6FzbEqS(U4j@}HLP
z+pz!X!sXvi$^B1Oxg@=4rpv)ud;e&^{qa67WogddbJ_YcPx9UT`G9}>-;<&xYm=w^
zluV8N7QS?1bF#nR+$<YVB~~nO^6oXwowxs%{5$pHYu)3jFSC;;tzO$NoPAUNAV<<M
zcgM(k{mr4*t{9Y?)UDa^>)Y!4W^H}?UNffEB=*1g*1GoR$&Z^F?riP(l5_Wn*s{ka
zvi`cqDraA{y2fgj`}5kezuTI1m>G<#GTwB$^~t2JmSs2mdg!bIo9+u?uk*Xsf6`Fg
zxp$HE_6cH#gI97UWYxvhzdy10)y8-`-(cbH<$G6&@`ib&AK7r_Yj5hZ$v$UA#ozAn
z%~~31>KSw7;=R|m8F{9>Sh!LDxWB2|^BuRcW*yx%)38*{ZPzbXZqKS+i$3)IXY0sZ
z&S!J#)634Kdyefc%NF~6due>Td0ScU{>q<IE1D0l%8CwRXH1ynBI5J;l8?|y3k|;w
z%iQ%c)&K99ymIF<zo}-E1DjVhSD&-X6X}W0=+2jkzV%OWt%b8ywcY6}HRcA~mv@_#
zzT8vxsMp`LT6Upiuhi32{qo$8XRdBLwDq&}^Sk}F^NaItel^l)JQmMVaedaYf5Hq5
b|NmcDshn-HnR^uj0|SGntDnm{r-UW|=oR#v

diff --git a/autoload/nvim_treesitter.vim b/autoload/nvim_treesitter.vim
deleted file mode 100644
index 90953985e..000000000
--- a/autoload/nvim_treesitter.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-function! nvim_treesitter#statusline(...) abort
-  return luaeval("require'nvim-treesitter.statusline'.statusline(_A)", get(a:, 1, {}))
-endfunction
-
-function! nvim_treesitter#foldexpr() abort
-	return luaeval(printf('require"nvim-treesitter.fold".get_fold_indic(%d)', v:lnum))
-endfunction
-
-function! nvim_treesitter#installable_parsers(arglead, cmdline, cursorpos) abort
-  return join(luaeval("require'nvim-treesitter.parsers'.available_parsers()") + ['all'], "\n")
-endfunction
-
-function! nvim_treesitter#installed_parsers(arglead, cmdline, cursorpos) abort
-  return join(luaeval("require'nvim-treesitter.info'.installed_parsers()") + ['all'], "\n")
-endfunction
-
-function! nvim_treesitter#available_modules(arglead, cmdline, cursorpos) abort
-  return join(luaeval("require'nvim-treesitter.configs'.available_modules()"), "\n")
-endfunction
-
-function! nvim_treesitter#available_query_groups(arglead, cmdline, cursorpos) abort
-  return join(luaeval("require'nvim-treesitter.query'.available_query_groups()"), "\n")
-endfunction
-
-function! nvim_treesitter#indent() abort
-	return luaeval(printf('require"nvim-treesitter.indent".get_indent(%d)', v:lnum))
-endfunction
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index f7a91b849..7054121b5 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -1,6 +1,4 @@
-*nvim-treesitter*  Treesitter configurations and abstraction layer for Neovim.
-
-Minimum version of neovim: nightly
+*nvim-treesitter.txt*         Treesitter parser and query installer for Neovim
 
 Authors:
   Kiyan Yazdani <yazdani.kiyan@protonmail.com>
@@ -15,38 +13,37 @@ Authors:
 ==============================================================================
 INTRODUCTION                                           *nvim-treesitter-intro*
 
-nvim-treesitter wraps the Neovim treesitter API to provide functionalities
-such as highlighting and incremental selection, and a command to easily
-install parsers.
+Nvim-treesitter provides functionalities for managing treesitter parsers and
+compatible queries for core features (highlighting, injections, fold, indent).
+
+WARNING: This is work in progress and requires the latest commit on Neovim
+`master`.
 
 ==============================================================================
 QUICK START                                       *nvim-treesitter-quickstart*
 
 Install the parser for your language
 
->
+>vim
   :TSInstall {language}
 <
 
 To get a list of supported languages
 
->
+>vim
   :TSInstallInfo
 <
 
-By default, everything is disabled.
-To enable supported features, put this in your `init.lua` file:
+To install supported parsers and queries, put this in your `init.lua` file:
 
->
+>lua
   require'nvim-treesitter.configs'.setup {
     -- A directory to install the parsers into.
-    -- If this is excluded or nil parsers are installed
-    -- to either the package dir, or the "site" dir.
-    -- If a custom path is used (not nil) it must be added to the runtimepath.
-    parser_install_dir = "/some/path/to/store/parsers",
+    -- Defaults to the `stdpath('data')/site` dir.
+    install_dir = "/some/path/to/store/parsers",
 
-    -- A list of parser names, or "all"
-    ensure_installed = { "c", "lua", "rust" },
+    -- A list of parser names, or "core", "stable", "community", "unstable"
+    ensure_install = { "core", "rust" },
 
     -- Install parsers synchronously (only applied to `ensure_installed`)
     sync_install = false,
@@ -54,174 +51,66 @@ To enable supported features, put this in your `init.lua` file:
     -- Automatically install missing parsers when entering buffer
     auto_install = false,
 
-    -- List of parsers to ignore installing (for "all")
+    -- List of parsers to ignore installing (for "core" etc.)
     ignore_install = { "javascript" },
 
-    highlight = {
-      -- `false` will disable the whole extension
-      enable = true,
-
-      -- list of language that will be disabled
-      disable = { "c", "rust" },
-
-      -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-      -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-      -- Using this option may slow down your editor, and you may see some duplicate highlights.
-      -- Instead of true it can also be a list of languages
-      additional_vim_regex_highlighting = false,
-    },
-  }
-  vim.opt.runtimepath:append("/some/path/to/store/parsers")
 <
-
-See |nvim-treesitter-modules| for a list of all available modules and its options.
+See |nvim-treesitter-commands| for a list of all available commands.
 
 ==============================================================================
-MODULES                                              *nvim-treesitter-modules*
+COMMANDS                                            *nvim-treesitter-commands*
 
-|nvim-treesitter| provides several functionalities via modules (and submodules),
-each module makes use of the query files defined for each language,
+								  *:TSInstall*
+:TSInstall {language} ... ~
 
-All modules are disabled by default, and some provide default keymaps.
-Each module corresponds to an entry in the dictionary passed to the
-`nvim-treesitter.configs.setup` function, this should be in your `init.lua` file.
+Install one or more treesitter parsers.
+You can use |:TSInstall| `all` to install all parsers. Use |:TSInstall!| to
+force the reinstallation of already installed parsers.
+							      *:TSInstallSync*
+:TSInstallSync {language} ... ~
 
->
-  require'nvim-treesitter.configs'.setup {
-    -- Modules and its options go here
-    highlight = { enable = true },
-    incremental_selection = { enable = true },
-    textobjects = { enable = true },
-  }
-<
+Perform the |:TSInstall| operation synchronously.
 
-All modules share some common options, like `enable` and `disable`.
-When `enable` is `true` this will enable the module for all supported languages,
-if you want to disable the module for some languages you can pass a list to the `disable` option.
+							      *:TSInstallInfo*
+:TSInstallInfo ~
 
->
-  require'nvim-treesitter.configs'.setup {
-    highlight = {
-      enable = true,
-      disable = { "cpp", "lua" },
-    },
-  }
-<
+List information about currently installed parsers
 
-For more fine-grained control, `disable` can also take a function and
-whenever it returns `true`, the module is disabled for that buffer.
-The function is called once when a module starts in a buffer and receives the
-language and buffer number as arguments:
+								   *:TSUpdate*
+:TSUpdate {language} ... ~
 
->
-  require'nvim-treesitter.configs'.setup {
-    highlight = {
-      enable = true,
-      disable = function(lang, bufnr) -- Disable in large C++ buffers
-        return lang == "cpp" and vim.api.nvim_buf_line_count(bufnr) > 50000
-      end,
-    },
-  }
-<
+Update the installed parser for one more {language} or all installed parsers
+if {language} is omitted. The specified parser is installed if it is not already
+installed.
 
-Options that define or accept a keymap use the same format you use to define
-keymaps in Neovim, so you can write keymaps as  `gd`, `<space>a`, `<leader>a`
-`<C-a>` (control + a), `<A-n>` (alt + n), `<CR>` (enter), etc.
+							       *:TSUpdateSync*
+:TSUpdateSync {language} ... ~
 
-External plugins can provide their own modules with their own options,
-those can also be configured using the `nvim-treesitter.configs.setup`
-function.
+Perform the |:TSUpdate| operation synchronously.
 
-------------------------------------------------------------------------------
-HIGHLIGHT                                      *nvim-treesitter-highlight-mod*
+								*:TSUninstall*
+:TSUninstall {language} ... ~
 
-Consistent syntax highlighting.
+Deletes the parser for one or more {language}. You can use 'all' for language
+to uninstall all parsers.
 
-Query files: `highlights.scm`.
-Supported options:
-
-- enable: `true` or `false`.
-- disable: list of languages.
-- additional_vim_regex_highlighting: `true` or `false`, or a list of languages.
-  Set this to `true` if you depend on 'syntax' being enabled
-  (like for indentation). Using this option may slow down your editor,
-  and you may see some duplicate highlights.
-  Defaults to `false`.
-
->
-  require'nvim-treesitter.configs'.setup {
-    highlight = {
-      enable = true,
-      custom_captures = {
-        -- Highlight the @foo.bar capture group with the "Identifier" highlight group.
-        ["foo.bar"] = "Identifier",
-      },
-      -- Setting this to true or a list of languages will run `:h syntax` and tree-sitter at the same time.
-      additional_vim_regex_highlighting = false,
-    },
-  }
-<
-
-You can also set custom highlight captures
->
-  lua <<EOF
-    require"nvim-treesitter.highlight".set_custom_captures {
-      -- Highlight the @foo.bar capture group with the "Identifier" highlight group.
-      ["foo.bar"] = "Identifier",
-    }
-  EOF
-<
-Note: The api is not stable yet.
-
-------------------------------------------------------------------------------
-INCREMENTAL SELECTION              *nvim-treesitter-incremental-selection-mod*
-
-Incremental selection based on the named nodes from the grammar.
-
-Query files: `locals.scm`.
-Supported options:
-- enable: `true` or `false`.
-- disable: list of languages.
-- keymaps:
-  - init_selection: in normal mode, start incremental selection.
-    Defaults to `gnn`.
-  - node_incremental: in visual mode, increment to the upper named parent.
-    Defaults to `grn`.
-  - scope_incremental: in visual mode, increment to the upper scope
-    (as defined in `locals.scm`). Defaults to `grc`.
-  - node_decremental: in visual mode, decrement to the previous named node.
-    Defaults to `grm`.
-
->
-  require'nvim-treesitter.configs'.setup {
-    incremental_selection = {
-      enable = true,
-      keymaps = {
-        init_selection = "gnn",
-        node_incremental = "grn",
-        scope_incremental = "grc",
-        node_decremental = "grm",
-      },
-    },
-  }
-<
-
-------------------------------------------------------------------------------
-INDENTATION                                  *nvim-treesitter-indentation-mod*
+==============================================================================
+INDENTATION                                        *nvim-treesitter-indentation*
 
 Indentation based on treesitter for the |=| operator.
-NOTE: this is an experimental feature.
+NOTE: this is an experimental feature and will be upstreamed to Neovim when
+stable.
+
+To enable it for a supported parser, add the following to a corresponding
+`FileType` autocommand or `ftplugin/<lang>.lua`:  >lua
+
+  vim.bo.indentexpr = 'v.lua:require'nvim-treesitter'.indentexpr()'
+
+<
+
+Indentation for a language is controlled by `indents.scm` queries. The
+following captures are supported:
 
-Query files: `indents.scm`.
-Supported options:
-- enable: `true` or `false`.
-- disable: list of languages.
->
-  require'nvim-treesitter.configs'.setup {
-    indent = {
-      enable = true
-    },
-  }
 
 `@indent`				    *nvim-treesitter-indentation-queries*
 Queries can use the following captures: `@indent.begin` and `@indent.dedent`,
@@ -233,7 +122,7 @@ the indentation to 0.
 The `@indent.begin` specifies that the next line should be indented.  Multiple
 indents on the same line get collapsed. Eg.
 
->
+>query
   (
    (if_statement)
    (ERROR "else") @indent.begin
@@ -244,13 +133,13 @@ permits the next line to indent even when the block intended to be indented
 has no content yet, improving interactive typing.
 
 eg for python:
->
+>query
  ((if_statement) @indent.begin
    (#set! indent.immediate 1))
 <
 
 Will allow:
->
+>python
   if True:<CR>
       # Auto indent to here
 
@@ -291,7 +180,7 @@ and finally
 <
 To specify the delimiters to use `indent.open_delimiter` and
 `indent.close_delimiter` should be used.  Eg.
->
+>query
  ((argument_list) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")"))
@@ -302,13 +191,13 @@ the same indent as the natural next line.
 
 For example in python:
 
->
+>python
   if (a > b and
       c < d):
       pass
 
 Is not correct, whereas
->
+>python
   if (a > b and
 	c < d):
       pass
@@ -316,7 +205,7 @@ Is not correct, whereas
 Would be correctly indented.  This behavior may be chosen using
 `indent.avoid_last_matching_next`.  Eg.
 
->
+>query
  (if_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
@@ -328,263 +217,4 @@ Could be used to specify that the last line of an `@indent.align` capture
 should be additionally indented to avoid clashing with the indent of the first
 line of the block inside an if.
 
-==============================================================================
-COMMANDS                                            *nvim-treesitter-commands*
-
-								  *:TSInstall*
-:TSInstall {language} ...~
-
-Install one or more treesitter parsers.
-You can use |:TSInstall| `all` to install all parsers. Use |:TSInstall!| to
-force the reinstallation of already installed parsers.
-							      *:TSInstallSync*
-:TSInstallSync {language} ...~
-
-Perform the |:TSInstall| operation synchronously.
-
-							      *:TSInstallInfo*
-:TSInstallInfo~
-
-List information about currently installed parsers
-
-								   *:TSUpdate*
-:TSUpdate {language} ...~
-
-Update the installed parser for one more {language} or all installed parsers
-if {language} is omitted. The specified parser is installed if it is not already
-installed.
-
-							       *:TSUpdateSync*
-:TSUpdateSync {language} ...~
-
-Perform the |:TSUpdate| operation synchronously.
-
-								*:TSUninstall*
-:TSUninstall {language} ...~
-
-Deletes the parser for one or more {language}. You can use 'all' for language
-to uninstall all parsers.
-
-								*:TSBufEnable*
-:TSBufEnable {module}~
-
-Enable {module} on the current buffer.
-A list of modules can be found at |:TSModuleInfo|
-
-							       *:TSBufDisable*
-:TSBufDisable {module}~
-
-Disable {module} on the current buffer.
-A list of modules can be found at |:TSModuleInfo|
-
-								*:TSBufToggle*
-:TSBufToggle {module}~
-
-Toggle (enable if disabled, disable if enabled) {module} on the current
-buffer.
-A list of modules can be found at |:TSModuleInfo|
-
-								*:TSEnable*
-:TSEnable {module} [{language}]~
-
-Enable {module} for the session.
-If {language} is specified, enable module for the session only for this
-particular language.
-A list of modules can be found at |:TSModuleInfo|
-A list of languages can be found at |:TSInstallInfo|
-
-							       *:TSDisable*
-:TSDisable {module} [{language}]~
-
-Disable {module} for the session.
-If {language} is specified, disable module for the session only for this
-particular language.
-A list of modules can be found at |:TSModuleInfo|
-A list of languages can be found at |:TSInstallInfo|
-
-								*:TSToggle*
-:TSToggle {module} [{language}]~
-
-Toggle (enable if disabled, disable if enabled) {module} for the session.
-If {language} is specified, toggle module for the session only for this
-particular language.
-A list of modules can be found at |:TSModuleInfo|
-A list of languages can be found at |:TSInstallInfo|
-
-							       *:TSModuleInfo*
-:TSModuleInfo [{module}]~
-
-List the state for the given module or all modules for the current session in
-a new buffer.
-
-These highlight groups are used by default:
->
-    highlight default TSModuleInfoGood guifg=LightGreen gui=bold
-    highlight default TSModuleInfoBad  guifg=Crimson
-    highlight default link TSModuleInfoHeader    Type
-    highlight default link TSModuleInfoNamespace Statement
-    highlight default link TSModuleInfoParser    Identifier
-<
-
-								*:TSEditQuery*
-:TSEditQuery {query-group} [{lang}]~
-
-Edit the query file for a {query-group} (e.g. highlights, locals) for given
-{lang}. If there are multiple files, the user is prompted to select one of them.
-If no such file exists, a buffer for a new file in the user's config directory
-is created. If {lang} is not specified, the language of the current buffer
-is used.
-
-						       *:TSEditQueryUserAfter*
-:TSEditQueryUserAfter {query-group} [{lang}]~
-
-Same as |:TSEditQuery| but edits a file in the `after` directory of the
-user's config directory. Useful to add custom extensions for the queries
-provided by a plugin.
-
-==============================================================================
-UTILS                                                  *nvim-treesitter-utils*
-
-Nvim treesitter has some wrapper functions that you can retrieve with:
->
-    local ts_utils = require 'nvim-treesitter.ts_utils'
-<
-Methods
-						 *ts_utils.get_node_at_cursor*
-get_node_at_cursor(winnr)~
-
-`winnr` will be 0 if nil.
-Returns the node under the cursor.
-
-							  *ts_utils.is_parent*
-is_parent(dest, source)~
-
-Determines whether `dest` is a parent of `source`.
-Returns a boolean.
-
-						 *ts_utils.get_named_children*
-get_named_children(node)~
-
-Returns a table of named children of `node`.
-
-						      *ts_utils.get_next_node*
-get_next_node(node, allow_switch_parent, allow_next_parent)~
-
-Returns the next node within the same parent.
-If no node is found, returns `nil`.
-If `allow_switch_parent` is true, it will allow switching parent
-when the node is the last node.
-If `allow_next_parent` is true, it will allow next parent if
-the node is the last node and the next parent doesn't have children.
-
-						  *ts_utils.get_previous_node*
-get_previous_node(node, allow_switch_parents, allow_prev_parent)~
-
-Returns the previous node within the same parent.
-`allow_switch_parent` and `allow_prev_parent` follow the same rule
-as |ts_utils.get_next_node| but if the node is the first node.
-
-							  *ts_utils.goto_node*
-goto_node(node, goto_end, avoid_set_jump)~
-
-Sets cursor to the position of `node` in the current windows.
-If `goto_end` is truthy, the cursor is set to the end the node range.
-Setting `avoid_set_jump` to `true`, avoids setting the current cursor position
-to the jump list.
-
-							 *ts_utils.swap_nodes*
-swap_nodes(node_or_range1, node_or_range2, bufnr, cursor_to_second)~
-
-Swaps the nodes or ranges.
-set `cursor_to_second`  to true to move the cursor to the second node
-
-						*ts_utils.memoize_by_buf_tick*
-memoize_by_buf_tick(fn, options)~
-
-Caches the return value for a function and returns the cache value if the tick
-of the buffer has not changed from the previous.
-
-		`fn`: a function that takes any arguments
-		and returns a value to store.
-		`options?`: <table>
-                 - `bufnr`: a function/value that extracts the bufnr from the given arguments.
-                 - `key`: a function/value that extracts the cache key from the given arguments.
-		`returns`: a function to call with bufnr as argument to
-		retrieve the value from the cache
-
-						  *ts_utils.node_to_lsp_range*
-node_to_lsp_range(node)~
-
-Get an lsp formatted range from a node range
-
-							*ts_utils.node_length*
-node_length(node)~
-
-Get the byte length of node range
-
-						   *ts_utils.update_selection*
-update_selection(buf, node)~
-
-Set the selection to the node range
-
-						    *ts_utils.highlight_range*
-highlight_range(range, buf, hl_namespace, hl_group)~
-
-Set a highlight that spans the given range
-
-						     *ts_utils.highlight_node*
-highlight_node(node, buf, hl_namespace, hl_group)~
-
-Set a highlight that spans the given node's range
-
-==============================================================================
-FUNCTIONS                                          *nvim-treesitter-functions*
-
-						*nvim_treesitter#statusline()*
-nvim_treesitter#statusline(opts)~
-
-Returns a string describing the current position in the file. This
-could be used as a statusline indicator.
-Default options (lua syntax):
->
-  {
-    indicator_size = 100,
-    type_patterns = {'class', 'function', 'method'},
-    transform_fn = function(line, _node) return line:gsub('%s*[%[%(%{]*%s*$', '') end,
-    separator = ' -> ',
-    allow_duplicates = false
-  }
-<
-- `indicator_size` - How long should the string be. If longer, it is cut from
-  the beginning.
-- `type_patterns` - Which node type patterns to match.
-- `transform_fn` - Function used to transform the single item in line. By
-  default it removes opening brackets and spaces from end. Takes two arguments:
-  the text of the line in question, and the corresponding treesitter node.
-- `separator` - Separator between nodes.
-- `allow_duplicates` - Whether or not to remove duplicate components.
-
-						  *nvim_treesitter#foldexpr()*
-nvim_treesitter#foldexpr()~
-
-Functions to be used to determine the fold level at a given line number.
-To use it: >
-  set foldmethod=expr
-  set foldexpr=nvim_treesitter#foldexpr()
-<
-
-This will respect your 'foldminlines' and 'foldnestmax' settings.
-
-Note: This is highly experimental, and folding can break on some types of
-      edits. If you encounter such breakage, hitting `zx` should fix folding.
-      In any case, feel free to open an issue with the reproducing steps.
-
-==============================================================================
-PERFORMANCE                                      *nvim-treesitter-performance*
-
-`nvim-treesitter` checks the 'runtimepath' on startup in order to discover
-available parsers and queries and index them. As a consequence, a very long
-'runtimepath' might result in delayed startup times.
-
-
 vim:tw=78:ts=8:expandtab:noet:ft=help:norl:
diff --git a/lua/nvim-treesitter.lua b/lua/nvim-treesitter.lua
deleted file mode 100644
index 963fe7309..000000000
--- a/lua/nvim-treesitter.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-local install = require "nvim-treesitter.install"
-local utils = require "nvim-treesitter.utils"
-local info = require "nvim-treesitter.info"
-local configs = require "nvim-treesitter.configs"
-local statusline = require "nvim-treesitter.statusline"
-
--- Registers all query predicates
-require "nvim-treesitter.query_predicates"
-
-local M = {}
-
-function M.setup()
-  utils.setup_commands("install", install.commands)
-  utils.setup_commands("info", info.commands)
-  utils.setup_commands("configs", configs.commands)
-  configs.init()
-end
-
-M.define_modules = configs.define_modules
-M.statusline = statusline.statusline
-
-return M
diff --git a/lua/nvim-treesitter/caching.lua b/lua/nvim-treesitter/caching.lua
deleted file mode 100644
index 7733202ed..000000000
--- a/lua/nvim-treesitter/caching.lua
+++ /dev/null
@@ -1,71 +0,0 @@
-local api = vim.api
-
-local M = {}
-
--- Creates a cache table for buffers keyed by a type name.
--- Cache entries attach to the buffer and cleanup entries
--- as buffers are detached.
-function M.create_buffer_cache()
-  local cache = {}
-
-  ---@type table<integer, table<string, any>>
-  local items = setmetatable({}, {
-    __index = function(tbl, key)
-      rawset(tbl, key, {})
-      return rawget(tbl, key)
-    end,
-  })
-
-  ---@type table<integer, boolean>
-  local loaded_buffers = {}
-
-  ---@param type_name string
-  ---@param bufnr integer
-  ---@param value any
-  function cache.set(type_name, bufnr, value)
-    if not loaded_buffers[bufnr] then
-      loaded_buffers[bufnr] = true
-      -- Clean up the cache if the buffer is detached
-      -- to avoid memory leaks
-      api.nvim_buf_attach(bufnr, false, {
-        on_detach = function()
-          cache.clear_buffer(bufnr)
-          loaded_buffers[bufnr] = nil
-          return true
-        end,
-        on_reload = function() end, -- this is needed to prevent on_detach being called on buffer reload
-      })
-    end
-
-    items[bufnr][type_name] = value
-  end
-
-  ---@param type_name string
-  ---@param bufnr integer
-  ---@return any
-  function cache.get(type_name, bufnr)
-    return items[bufnr][type_name]
-  end
-
-  ---@param type_name string
-  ---@param bufnr integer
-  ---@return boolean
-  function cache.has(type_name, bufnr)
-    return cache.get(type_name, bufnr) ~= nil
-  end
-
-  ---@param type_name string
-  ---@param bufnr integer
-  function cache.remove(type_name, bufnr)
-    items[bufnr][type_name] = nil
-  end
-
-  ---@param bufnr integer
-  function cache.clear_buffer(bufnr)
-    items[bufnr] = nil
-  end
-
-  return cache
-end
-
-return M
diff --git a/lua/nvim-treesitter/compat.lua b/lua/nvim-treesitter/compat.lua
deleted file mode 100644
index 0ad010030..000000000
--- a/lua/nvim-treesitter/compat.lua
+++ /dev/null
@@ -1,39 +0,0 @@
--- Shim module to address deprecations across nvim versions
-local ts = vim.treesitter
-local tsq = ts.query
-
-local M = {}
-
-function M.get_query_files(lang, query_group, is_included)
-  return (tsq.get_files or tsq.get_query_files)(lang, query_group, is_included)
-end
-
-function M.get_query(lang, query_name)
-  return (tsq.get or tsq.get_query)(lang, query_name)
-end
-
-function M.parse_query(lang, query)
-  return (tsq.parse or tsq.parse_query)(lang, query)
-end
-
-function M.get_range(node, source, metadata)
-  return (ts.get_range or tsq.get_range)(node, source, metadata)
-end
-
-function M.get_node_text(node, bufnr)
-  return (ts.get_node_text or tsq.get_node_text)(node, bufnr)
-end
-
-function M.require_language(lang, opts)
-  return (ts.language.add or ts.language.require_language)(lang, opts)
-end
-
-function M.flatten(t)
-  if vim.fn.has "nvim-0.11" == 1 then
-    return vim.iter(t):flatten():totable()
-  else
-    return vim.tbl_flatten(t)
-  end
-end
-
-return M
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
new file mode 100644
index 000000000..e43ad13c2
--- /dev/null
+++ b/lua/nvim-treesitter/config.lua
@@ -0,0 +1,144 @@
+local utils = require('nvim-treesitter.utils')
+
+local M = {}
+
+---@class TSConfig
+---@field sync_install boolean
+---@field auto_install boolean
+---@field ensure_install string[]
+---@field ignore_install string[]
+---@field install_dir string
+
+---@type TSConfig
+local config = {
+  sync_install = false,
+  auto_install = false,
+  ensure_install = {},
+  ignore_install = {},
+  install_dir = utils.join_path(vim.fn.stdpath('data'), 'site'),
+}
+
+---Setup call for users to override configuration configurations.
+---@param user_data TSConfig|nil user configuration table
+function M.setup(user_data)
+  if user_data then
+    if user_data.install_dir then
+      user_data.install_dir = vim.fs.normalize(user_data.install_dir)
+      --TODO(clason): insert after/before site, or leave to user?
+      vim.opt.runtimepath:append(user_data.install_dir)
+    end
+    config = vim.tbl_deep_extend('force', config, user_data)
+  end
+
+  if config.auto_install then
+    vim.api.nvim_create_autocmd('FileType', {
+      callback = function(args)
+        local ft = vim.bo[args.buf].filetype
+        local lang = vim.treesitter.language.get_lang(ft) or ft
+        if
+          require('nvim-treesitter.parsers').configs[lang]
+          and not vim.list_contains(M.installed_parsers(), lang)
+          and not vim.list_contains(config.ignore_install, lang)
+        then
+          require('nvim-treesitter.install').install(lang)
+        end
+      end,
+    })
+  end
+
+  if #config.ensure_install > 0 then
+    local to_install = M.norm_languages(config.ensure_install, { ignored = true, installed = true })
+
+    if #to_install > 0 then
+      require('nvim-treesitter.install').install(to_install, {
+        with_sync = config.sync_install,
+      })
+    end
+  end
+end
+
+-- Returns the install path for parsers, parser info, and queries.
+-- If the specified directory does not exist, it is created.
+---@param dir_name string
+---@return string
+function M.get_install_dir(dir_name)
+  local dir = utils.join_path(config.install_dir, dir_name)
+
+  if not vim.loop.fs_stat(dir) then
+    local ok, error = pcall(vim.fn.mkdir, dir, 'p', '0755')
+    if not ok then
+      vim.notify(error, vim.log.levels.ERROR)
+    end
+  end
+  return dir
+end
+
+---@return string[]
+function M.installed_parsers()
+  local install_dir = M.get_install_dir('parser')
+
+  local installed = {} --- @type string[]
+  for f in vim.fs.dir(install_dir) do
+    local lang = assert(f:match('(.*)%..*'))
+    installed[#installed + 1] = lang
+  end
+
+  return installed
+end
+
+---Normalize languages
+---@param languages? string[]|string
+---@param skip? table
+---@return string[]
+function M.norm_languages(languages, skip)
+  if not languages then
+    return {}
+  end
+  local parsers = require('nvim-treesitter.parsers')
+
+  -- Turn into table
+  if type(languages) == 'string' then
+    languages = { languages }
+  end
+
+  if vim.list_contains(languages, 'all') then
+    if skip and skip.missing then
+      return M.installed_parsers()
+    end
+    languages = parsers.get_available()
+  end
+
+  for i, tier in ipairs(parsers.tiers) do
+    if vim.list_contains(languages, tier) then
+      languages = vim.iter.filter(function(l)
+        return l ~= tier
+      end, languages)
+      vim.list_extend(languages, parsers.get_available(i))
+    end
+  end
+
+  if skip and skip.ignored then
+    local ignored = config.ignore_install
+    languages = vim.iter.filter(function(v)
+      return not vim.list_contains(ignored, v)
+    end, languages)
+  end
+
+  if skip and skip.installed then
+    local installed = M.installed_parsers()
+    languages = vim.iter.filter(function(v)
+      return not vim.list_contains(installed, v)
+    end, languages)
+  end
+
+  if skip and skip.missing then
+    local installed = M.installed_parsers()
+    languages = vim.iter.filter(function(v)
+      return vim.list_contains(installed, v)
+    end, languages)
+  end
+
+  return languages
+end
+
+return M
diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
deleted file mode 100644
index a3ec30fb2..000000000
--- a/lua/nvim-treesitter/configs.lua
+++ /dev/null
@@ -1,616 +0,0 @@
-local api = vim.api
-
-local queries = require "nvim-treesitter.query"
-local ts = require "nvim-treesitter.compat"
-local parsers = require "nvim-treesitter.parsers"
-local utils = require "nvim-treesitter.utils"
-local caching = require "nvim-treesitter.caching"
-
-local M = {}
-
----@class TSConfig
----@field modules {[string]:TSModule}
----@field sync_install boolean
----@field ensure_installed string[]|string
----@field ignore_install string[]
----@field auto_install boolean
----@field parser_install_dir string|nil
-
----@type TSConfig
-local config = {
-  modules = {},
-  sync_install = false,
-  ensure_installed = {},
-  auto_install = false,
-  ignore_install = {},
-  parser_install_dir = nil,
-}
-
--- List of modules that need to be setup on initialization.
----@type TSModule[][]
-local queued_modules_defs = {}
--- Whether we've initialized the plugin yet.
-local is_initialized = false
-
----@class TSModule
----@field module_path string
----@field enable boolean|string[]|function(string): boolean
----@field disable boolean|string[]|function(string): boolean
----@field keymaps table<string, string>
----@field is_supported function(string): boolean
----@field attach function(string)
----@field detach function(string)
----@field enabled_buffers table<integer, boolean>
----@field additional_vim_regex_highlighting boolean|string[]
-
----@type {[string]: TSModule}
-local builtin_modules = {
-  highlight = {
-    module_path = "nvim-treesitter.highlight",
-    -- @deprecated: use `highlight.set_custom_captures` instead
-    custom_captures = {},
-    enable = false,
-    is_supported = function(lang)
-      return queries.has_highlights(lang)
-    end,
-    additional_vim_regex_highlighting = false,
-  },
-  incremental_selection = {
-    module_path = "nvim-treesitter.incremental_selection",
-    enable = false,
-    keymaps = {
-      init_selection = "gnn", -- set to `false` to disable one of the mappings
-      node_incremental = "grn",
-      scope_incremental = "grc",
-      node_decremental = "grm",
-    },
-    is_supported = function()
-      return true
-    end,
-  },
-  indent = {
-    module_path = "nvim-treesitter.indent",
-    enable = false,
-    is_supported = queries.has_indents,
-  },
-}
-
-local attached_buffers_by_module = caching.create_buffer_cache()
-
----Resolves a module by requiring the `module_path` or using the module definition.
----@param mod_name string
----@return TSModule|nil
-local function resolve_module(mod_name)
-  local config_mod = M.get_module(mod_name)
-
-  if not config_mod then
-    return
-  end
-
-  if type(config_mod.attach) == "function" and type(config_mod.detach) == "function" then
-    return config_mod
-  elseif type(config_mod.module_path) == "string" then
-    return require(config_mod.module_path)
-  end
-end
-
----Enables and attaches the module to a buffer for lang.
----@param mod string path to module
----@param bufnr integer|nil buffer number, defaults to current buffer
----@param lang string|nil language, defaults to current language
-local function enable_module(mod, bufnr, lang)
-  local module = M.get_module(mod)
-  if not module then
-    return
-  end
-
-  bufnr = bufnr or api.nvim_get_current_buf()
-  lang = lang or parsers.get_buf_lang(bufnr)
-
-  if not module.enable then
-    if module.enabled_buffers then
-      module.enabled_buffers[bufnr] = true
-    else
-      module.enabled_buffers = { [bufnr] = true }
-    end
-  end
-
-  M.attach_module(mod, bufnr, lang)
-end
-
----Enables autocomands for the module.
----After the module is loaded `loaded` will be set to true for the module.
----@param mod string path to module
-local function enable_mod_conf_autocmd(mod)
-  local config_mod = M.get_module(mod)
-  if not config_mod or config_mod.loaded then
-    return
-  end
-
-  api.nvim_create_autocmd("FileType", {
-    group = api.nvim_create_augroup("NvimTreesitter-" .. mod, {}),
-    callback = function(args)
-      require("nvim-treesitter.configs").reattach_module(mod, args.buf)
-    end,
-    desc = "Reattach module",
-  })
-
-  config_mod.loaded = true
-end
-
----Enables the module globally and for all current buffers.
----After enabled, `enable` will be set to true for the module.
----@param mod string path to module
-local function enable_all(mod)
-  local config_mod = M.get_module(mod)
-  if not config_mod then
-    return
-  end
-
-  enable_mod_conf_autocmd(mod)
-  config_mod.enable = true
-  config_mod.enabled_buffers = nil
-
-  for _, bufnr in pairs(api.nvim_list_bufs()) do
-    enable_module(mod, bufnr)
-  end
-end
-
----Disables and detaches the module for a buffer.
----@param mod string path to module
----@param bufnr integer buffer number, defaults to current buffer
-local function disable_module(mod, bufnr)
-  local module = M.get_module(mod)
-  if not module then
-    return
-  end
-
-  bufnr = bufnr or api.nvim_get_current_buf()
-  if module.enabled_buffers then
-    module.enabled_buffers[bufnr] = false
-  end
-  M.detach_module(mod, bufnr)
-end
-
----Disables autocomands for the module.
----After the module is unloaded `loaded` will be set to false for the module.
----@param mod string path to module
-local function disable_mod_conf_autocmd(mod)
-  local config_mod = M.get_module(mod)
-  if not config_mod or not config_mod.loaded then
-    return
-  end
-  api.nvim_clear_autocmds { event = "FileType", group = "NvimTreesitter-" .. mod }
-  config_mod.loaded = false
-end
-
----Disables the module globally and for all current buffers.
----After disabled, `enable` will be set to false for the module.
----@param mod string path to module
-local function disable_all(mod)
-  local config_mod = M.get_module(mod)
-  if not config_mod then
-    return
-  end
-
-  config_mod.enabled_buffers = nil
-  disable_mod_conf_autocmd(mod)
-  config_mod.enable = false
-
-  for _, bufnr in pairs(api.nvim_list_bufs()) do
-    disable_module(mod, bufnr)
-  end
-end
-
----Toggles a module for a buffer
----@param mod string path to module
----@param bufnr integer buffer number, defaults to current buffer
----@param lang string language, defaults to current language
-local function toggle_module(mod, bufnr, lang)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  lang = lang or parsers.get_buf_lang(bufnr)
-
-  if attached_buffers_by_module.has(mod, bufnr) then
-    disable_module(mod, bufnr)
-  else
-    enable_module(mod, bufnr, lang)
-  end
-end
-
--- Toggles the module globally and for all current buffers.
--- @param mod path to module
-local function toggle_all(mod)
-  local config_mod = M.get_module(mod)
-  if not config_mod then
-    return
-  end
-
-  if config_mod.enable then
-    disable_all(mod)
-  else
-    enable_all(mod)
-  end
-end
-
----Recurses through all modules including submodules
----@param accumulator function called for each module
----@param root {[string]: TSModule}|nil root configuration table to start at
----@param path string|nil prefix path
-local function recurse_modules(accumulator, root, path)
-  root = root or config.modules
-
-  for name, module in pairs(root) do
-    local new_path = path and (path .. "." .. name) or name
-
-    if M.is_module(module) then
-      accumulator(name, module, new_path, root)
-    elseif type(module) == "table" then
-      recurse_modules(accumulator, module, new_path)
-    end
-  end
-end
-
--- Shows current configuration of all nvim-treesitter modules
----@param process_function function used as the `process` parameter
----       for vim.inspect (https://github.com/kikito/inspect.lua#optionsprocess)
-local function config_info(process_function)
-  process_function = process_function
-    or function(item, path)
-      if path[#path] == vim.inspect.METATABLE then
-        return
-      end
-      if path[#path] == "is_supported" then
-        return
-      end
-      return item
-    end
-  print(vim.inspect(config, { process = process_function }))
-end
-
----@param query_group string
----@param lang string
-function M.edit_query_file(query_group, lang)
-  lang = lang or parsers.get_buf_lang()
-  local files = ts.get_query_files(lang, query_group, true)
-  if #files == 0 then
-    utils.notify "No query file found! Creating a new one!"
-    M.edit_query_file_user_after(query_group, lang)
-  elseif #files == 1 then
-    vim.cmd(":edit " .. files[1])
-  else
-    vim.ui.select(files, { prompt = "Select a file:" }, function(file)
-      if file then
-        vim.cmd(":edit " .. file)
-      end
-    end)
-  end
-end
-
----@param query_group string
----@param lang string
-function M.edit_query_file_user_after(query_group, lang)
-  lang = lang or parsers.get_buf_lang()
-  local folder = utils.join_path(vim.fn.stdpath "config", "after", "queries", lang)
-  local file = utils.join_path(folder, query_group .. ".scm")
-  if vim.fn.isdirectory(folder) ~= 1 then
-    vim.ui.select({ "Yes", "No" }, { prompt = '"' .. folder .. '" does not exist. Create it?' }, function(choice)
-      if choice == "Yes" then
-        vim.fn.mkdir(folder, "p", "0755")
-        vim.cmd(":edit " .. file)
-      end
-    end)
-  else
-    vim.cmd(":edit " .. file)
-  end
-end
-
-M.commands = {
-  TSBufEnable = {
-    run = enable_module,
-    args = {
-      "-nargs=1",
-      "-complete=custom,nvim_treesitter#available_modules",
-    },
-  },
-  TSBufDisable = {
-    run = disable_module,
-    args = {
-      "-nargs=1",
-      "-complete=custom,nvim_treesitter#available_modules",
-    },
-  },
-  TSBufToggle = {
-    run = toggle_module,
-    args = {
-      "-nargs=1",
-      "-complete=custom,nvim_treesitter#available_modules",
-    },
-  },
-  TSEnable = {
-    run = enable_all,
-    args = {
-      "-nargs=+",
-      "-complete=custom,nvim_treesitter#available_modules",
-    },
-  },
-  TSDisable = {
-    run = disable_all,
-    args = {
-      "-nargs=+",
-      "-complete=custom,nvim_treesitter#available_modules",
-    },
-  },
-  TSToggle = {
-    run = toggle_all,
-    args = {
-      "-nargs=+",
-      "-complete=custom,nvim_treesitter#available_modules",
-    },
-  },
-  TSConfigInfo = {
-    run = config_info,
-    args = {
-      "-nargs=0",
-    },
-  },
-  TSEditQuery = {
-    run = M.edit_query_file,
-    args = {
-      "-nargs=+",
-      "-complete=custom,nvim_treesitter#available_query_groups",
-    },
-  },
-  TSEditQueryUserAfter = {
-    run = M.edit_query_file_user_after,
-    args = {
-      "-nargs=+",
-      "-complete=custom,nvim_treesitter#available_query_groups",
-    },
-  },
-}
-
----@param mod string module
----@param lang string the language of the buffer
----@param bufnr integer the buffer
-function M.is_enabled(mod, lang, bufnr)
-  if not parsers.has_parser(lang) then
-    return false
-  end
-
-  local module_config = M.get_module(mod)
-  if not module_config then
-    return false
-  end
-
-  local buffer_enabled = module_config.enabled_buffers and module_config.enabled_buffers[bufnr]
-  local config_enabled = module_config.enable or buffer_enabled
-  if not config_enabled or not module_config.is_supported(lang) then
-    return false
-  end
-
-  local disable = module_config.disable
-  if type(disable) == "function" then
-    if disable(lang, bufnr) then
-      return false
-    end
-  elseif type(disable) == "table" then
-    -- Otherwise it's a list of languages
-    for _, parser in pairs(disable) do
-      if lang == parser then
-        return false
-      end
-    end
-  end
-
-  return true
-end
-
----Setup call for users to override module configurations.
----@param user_data TSConfig module overrides
-function M.setup(user_data)
-  config.modules = vim.tbl_deep_extend("force", config.modules, user_data)
-  config.ignore_install = user_data.ignore_install or {}
-  config.parser_install_dir = user_data.parser_install_dir or nil
-  if config.parser_install_dir then
-    config.parser_install_dir = vim.fn.expand(config.parser_install_dir, ":p")
-  end
-
-  config.auto_install = user_data.auto_install or false
-  if config.auto_install then
-    require("nvim-treesitter.install").setup_auto_install()
-  end
-
-  local ensure_installed = user_data.ensure_installed or {}
-  if #ensure_installed > 0 then
-    if user_data.sync_install then
-      require("nvim-treesitter.install").ensure_installed_sync(ensure_installed)
-    else
-      require("nvim-treesitter.install").ensure_installed(ensure_installed)
-    end
-  end
-
-  config.modules.ensure_installed = nil
-  config.ensure_installed = ensure_installed
-
-  recurse_modules(function(_, _, new_path)
-    local data = utils.get_at_path(config.modules, new_path)
-    if data.enable then
-      enable_all(new_path)
-    end
-  end, config.modules)
-end
-
--- Defines a table of modules that can be attached/detached to buffers
--- based on language support. A module consist of the following properties:
----* @enable Whether the modules is enabled. Can be true or false.
----* @disable A list of languages to disable the module for. Only relevant if enable is true.
----* @keymaps A list of user mappings for a given module if relevant.
----* @is_supported A function which, given a ft, will return true if the ft works on the module.
----* @module_path A string path to a module file using `require`. The exported module must contain
----               an `attach` and `detach` function. This path is not required if `attach` and `detach`
----               functions are provided directly on the module definition.
----* @attach An attach function that is called for each buffer that the module is enabled for. This is required
----          if a `module_path` is not specified.
----* @detach A detach function that is called for each buffer that the module is enabled for. This is required
----          if a `module_path` is not specified.
---
--- Modules are not setup until `init` is invoked by the plugin. This allows modules to be defined in any order
--- and can be loaded lazily.
---
----* @example
----require"nvim-treesitter".define_modules {
----  my_cool_module = {
----    attach = function()
----      do_some_cool_setup()
----    end,
----    detach = function()
----      do_some_cool_teardown()
----    end
----  }
----}
----@param mod_defs TSModule[]
-function M.define_modules(mod_defs)
-  if not is_initialized then
-    table.insert(queued_modules_defs, mod_defs)
-    return
-  end
-
-  recurse_modules(function(key, mod, _, group)
-    group[key] = vim.tbl_extend("keep", mod, {
-      enable = false,
-      disable = {},
-      is_supported = function()
-        return true
-      end,
-    })
-  end, mod_defs)
-
-  config.modules = vim.tbl_deep_extend("keep", config.modules, mod_defs)
-
-  for _, mod in ipairs(M.available_modules(mod_defs)) do
-    local module_config = M.get_module(mod)
-    if module_config and module_config.enable then
-      enable_mod_conf_autocmd(mod)
-    end
-  end
-end
-
----Attaches a module to a buffer
----@param mod_name string the module name
----@param bufnr integer the buffer
----@param lang string the language of the buffer
-function M.attach_module(mod_name, bufnr, lang)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  lang = lang or parsers.get_buf_lang(bufnr)
-  local resolved_mod = resolve_module(mod_name)
-
-  if resolved_mod and not attached_buffers_by_module.has(mod_name, bufnr) and M.is_enabled(mod_name, lang, bufnr) then
-    attached_buffers_by_module.set(mod_name, bufnr, true)
-    resolved_mod.attach(bufnr, lang)
-  end
-end
-
--- Detaches a module to a buffer
----@param mod_name string the module name
----@param bufnr integer the buffer
-function M.detach_module(mod_name, bufnr)
-  local resolved_mod = resolve_module(mod_name)
-  bufnr = bufnr or api.nvim_get_current_buf()
-
-  if resolved_mod and attached_buffers_by_module.has(mod_name, bufnr) then
-    attached_buffers_by_module.remove(mod_name, bufnr)
-    resolved_mod.detach(bufnr)
-  end
-end
-
--- Same as attach_module, but if the module is already attached, detach it first.
----@param mod_name string the module name
----@param bufnr integer the buffer
----@param lang string the language of the buffer
-function M.reattach_module(mod_name, bufnr, lang)
-  M.detach_module(mod_name, bufnr)
-  M.attach_module(mod_name, bufnr, lang)
-end
-
--- Gets available modules
----@param root {[string]:TSModule}|nil table to find modules
----@return string[] modules list of module paths
-function M.available_modules(root)
-  local modules = {}
-
-  recurse_modules(function(_, _, path)
-    table.insert(modules, path)
-  end, root)
-
-  return modules
-end
-
----Gets a module config by path
----@param mod_path string path to the module
----@return TSModule|nil: the module or nil
-function M.get_module(mod_path)
-  local mod = utils.get_at_path(config.modules, mod_path)
-
-  return M.is_module(mod) and mod or nil
-end
-
--- Determines whether the provided table is a module.
--- A module should contain an attach and detach function.
----@param mod table|nil the module table
----@return boolean
-function M.is_module(mod)
-  return type(mod) == "table"
-    and ((type(mod.attach) == "function" and type(mod.detach) == "function") or type(mod.module_path) == "string")
-end
-
--- Initializes built-in modules and any queued modules
--- registered by plugins or the user.
-function M.init()
-  is_initialized = true
-  M.define_modules(builtin_modules)
-
-  for _, mod_def in ipairs(queued_modules_defs) do
-    M.define_modules(mod_def)
-  end
-end
-
--- If parser_install_dir is not nil is used or created.
--- If parser_install_dir is nil try the package dir of the nvim-treesitter
--- plugin first, followed by the "site" dir from "runtimepath". "site" dir will
--- be created if it doesn't exist. Using only the package dir won't work when
--- the plugin is installed with Nix, since the "/nix/store" is read-only.
----@param folder_name string|nil
----@return string|nil, string|nil
-function M.get_parser_install_dir(folder_name)
-  folder_name = folder_name or "parser"
-
-  local install_dir = config.parser_install_dir or utils.get_package_path()
-  local parser_dir = utils.join_path(install_dir, folder_name)
-
-  return utils.create_or_reuse_writable_dir(
-    parser_dir,
-    utils.join_space("Could not create parser dir '", parser_dir, "': "),
-    utils.join_space(
-      "Parser dir '",
-      parser_dir,
-      "' should be read/write (see README on how to configure an alternative install location)"
-    )
-  )
-end
-
-function M.get_parser_info_dir()
-  return M.get_parser_install_dir "parser-info"
-end
-
-function M.get_ignored_parser_installs()
-  return config.ignore_install or {}
-end
-
-function M.get_ensure_installed_parsers()
-  if type(config.ensure_installed) == "string" then
-    return { config.ensure_installed }
-  end
-  return config.ensure_installed or {}
-end
-
-return M
diff --git a/lua/nvim-treesitter/fold.lua b/lua/nvim-treesitter/fold.lua
deleted file mode 100644
index 759599876..000000000
--- a/lua/nvim-treesitter/fold.lua
+++ /dev/null
@@ -1,123 +0,0 @@
-local api = vim.api
-local tsutils = require "nvim-treesitter.ts_utils"
-local query = require "nvim-treesitter.query"
-local parsers = require "nvim-treesitter.parsers"
-
-local M = {}
-
--- This is cached on buf tick to avoid computing that multiple times
--- Especially not for every line in the file when `zx` is hit
-local folds_levels = tsutils.memoize_by_buf_tick(function(bufnr)
-  local max_fold_level = api.nvim_win_get_option(0, "foldnestmax")
-  local trim_level = function(level)
-    if level > max_fold_level then
-      return max_fold_level
-    end
-    return level
-  end
-
-  local parser = parsers.get_parser(bufnr)
-
-  if not parser then
-    return {}
-  end
-
-  local matches = query.get_capture_matches_recursively(bufnr, function(lang)
-    if query.has_folds(lang) then
-      return "@fold", "folds"
-    elseif query.has_locals(lang) then
-      return "@scope", "locals"
-    end
-  end)
-
-  -- start..stop is an inclusive range
-
-  ---@type table<number, number>
-  local start_counts = {}
-  ---@type table<number, number>
-  local stop_counts = {}
-
-  local prev_start = -1
-  local prev_stop = -1
-
-  local min_fold_lines = api.nvim_win_get_option(0, "foldminlines")
-
-  for _, match in ipairs(matches) do
-    local start, stop, stop_col ---@type integer, integer, integer
-    if match.metadata and match.metadata.range then
-      start, _, stop, stop_col = unpack(match.metadata.range) ---@type integer, integer, integer, integer
-    else
-      start, _, stop, stop_col = match.node:range() ---@type integer, integer, integer, integer
-    end
-
-    if stop_col == 0 then
-      stop = stop - 1
-    end
-
-    local fold_length = stop - start + 1
-    local should_fold = fold_length > min_fold_lines
-
-    -- Fold only multiline nodes that are not exactly the same as previously met folds
-    -- Checking against just the previously found fold is sufficient if nodes
-    -- are returned in preorder or postorder when traversing tree
-    if should_fold and not (start == prev_start and stop == prev_stop) then
-      start_counts[start] = (start_counts[start] or 0) + 1
-      stop_counts[stop] = (stop_counts[stop] or 0) + 1
-      prev_start = start
-      prev_stop = stop
-    end
-  end
-
-  ---@type string[]
-  local levels = {}
-  local current_level = 0
-
-  -- We now have the list of fold opening and closing, fill the gaps and mark where fold start
-  for lnum = 0, api.nvim_buf_line_count(bufnr) do
-    local prefix = ""
-
-    local last_trimmed_level = trim_level(current_level)
-    current_level = current_level + (start_counts[lnum] or 0)
-    local trimmed_level = trim_level(current_level)
-    current_level = current_level - (stop_counts[lnum] or 0)
-    local next_trimmed_level = trim_level(current_level)
-
-    -- Determine if it's the start/end of a fold
-    -- NB: vim's fold-expr interface does not have a mechanism to indicate that
-    -- two (or more) folds start at this line, so it cannot distinguish between
-    --  ( \n ( \n )) \n (( \n ) \n )
-    -- versus
-    --  ( \n ( \n ) \n ( \n ) \n )
-    -- If it did have such a mechanism, (trimmed_level - last_trimmed_level)
-    -- would be the correct number of starts to pass on.
-    if trimmed_level - last_trimmed_level > 0 then
-      prefix = ">"
-    elseif trimmed_level - next_trimmed_level > 0 then
-      -- Ending marks tend to confuse vim more than it helps, particularly when
-      -- the fold level changes by at least 2; we can uncomment this if
-      -- vim's behavior gets fixed.
-      -- prefix = "<"
-      prefix = ""
-    end
-
-    levels[lnum + 1] = prefix .. tostring(trimmed_level)
-  end
-
-  return levels
-end)
-
----@param lnum integer
----@return string
-function M.get_fold_indic(lnum)
-  if not parsers.has_parser() or not lnum then
-    return "0"
-  end
-
-  local buf = api.nvim_get_current_buf()
-
-  local levels = folds_levels(buf) or {}
-
-  return levels[lnum] or "0"
-end
-
-return M
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 32741b136..e8c945f6c 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -1,116 +1,119 @@
-local api = vim.api
-local fn = vim.fn
-
-local queries = require "nvim-treesitter.query"
-local info = require "nvim-treesitter.info"
-local shell = require "nvim-treesitter.shell_command_selectors"
-local install = require "nvim-treesitter.install"
-local utils = require "nvim-treesitter.utils"
-local ts = require "nvim-treesitter.compat"
-
-local health = vim.health or require "health"
-
--- "report_" prefix has been deprecated, use the recommended replacements if they exist.
-local _start = health.start or health.report_start
-local _ok = health.ok or health.report_ok
-local _warn = health.warn or health.report_warn
-local _error = health.error or health.report_error
+local shell = require('nvim-treesitter.shell_cmds')
+local install = require('nvim-treesitter.install')
+local config = require('nvim-treesitter.config')
+local tsq = vim.treesitter.query
 
 local M = {}
 
 local NVIM_TREESITTER_MINIMUM_ABI = 13
 
-local function install_health()
-  _start "Installation"
-
-  if fn.has "nvim-0.10" ~= 1 then
-    _error "Nvim-treesitter requires Nvim 0.10 or newer"
-  end
-
-  if fn.executable "tree-sitter" == 0 then
-    _warn(
-      "`tree-sitter` executable not found (parser generator, only needed for :TSInstallFromGrammar,"
-        .. " not required for :TSInstall)"
-    )
-  else
-    _ok(
-      "`tree-sitter` found "
-        .. (utils.ts_cli_version() or "(unknown version)")
-        .. " (parser generator, only needed for :TSInstallFromGrammar)"
-    )
-  end
-
-  if fn.executable "node" == 0 then
-    _warn("`node` executable not found (only needed for :TSInstallFromGrammar," .. " not required for :TSInstall)")
-  else
-    local handle = io.popen "node --version"
-    local result = handle:read "*a"
+---@return string|nil
+local function ts_cli_version()
+  if vim.fn.executable('tree-sitter') == 1 then
+    local handle = io.popen('tree-sitter -V')
+    if not handle then
+      return
+    end
+    local result = handle:read('*a')
     handle:close()
-    local version = vim.split(result, "\n")[1]
-    _ok("`node` found " .. version .. " (only needed for :TSInstallFromGrammar)")
+    return vim.split(result, '\n')[1]:match('[^tree%psitter ].*')
+  end
+end
+
+local function install_health()
+  vim.health.start('Installation')
+
+  if vim.fn.has('nvim-0.10') ~= 1 then
+    vim.health.error('Nvim-treesitter requires Neovim Nightly')
   end
 
-  if fn.executable "git" == 0 then
-    _error("`git` executable not found.", {
-      "Install it with your package manager.",
-      "Check that your `$PATH` is set correctly.",
+  if vim.fn.executable('tree-sitter') == 0 then
+    vim.health.warn(
+      '`tree-sitter` executable not found (parser generator, only needed for :TSInstallFromGrammar,'
+        .. ' not required for :TSInstall)'
+    )
+  else
+    vim.health.ok(
+      '`tree-sitter` found '
+        .. (ts_cli_version() or '(unknown version)')
+        .. ' (parser generator, only needed for :TSInstallFromGrammar)'
+    )
+  end
+
+  if vim.fn.executable('node') == 0 then
+    vim.health.warn(
+      '`node` executable not found (only needed for :TSInstallFromGrammar,'
+        .. ' not required for :TSInstall)'
+    )
+  else
+    local handle = assert(io.popen('node --version'))
+    local result = handle:read('*a')
+    handle:close()
+    local version = vim.split(result, '\n')[1]
+    vim.health.ok('`node` found ' .. version .. ' (only needed for :TSInstallFromGrammar)')
+  end
+
+  if vim.fn.executable('git') == 0 then
+    vim.health.error('`git` executable not found.', {
+      'Install it with your package manager.',
+      'Check that your `$PATH` is set correctly.',
     })
   else
-    _ok "`git` executable found."
+    vim.health.ok('`git` executable found.')
   end
 
   local cc = shell.select_executable(install.compilers)
   if not cc then
-    _error("`cc` executable not found.", {
-      "Check that any of "
+    vim.health.error('`cc` executable not found.', {
+      'Check that any of '
         .. vim.inspect(install.compilers)
-        .. " is in your $PATH"
+        .. ' is in your $PATH'
         .. ' or set the environment variable CC or `require"nvim-treesitter.install".compilers` explicitly!',
     })
   else
-    local version = vim.fn.systemlist(cc .. (cc == "cl" and "" or " --version"))[1]
-    _ok(
-      "`"
+    local version = vim.fn.systemlist(cc .. (cc == 'cl' and '' or ' --version'))[1]
+    vim.health.ok(
+      '`'
         .. cc
-        .. "` executable found. Selected from "
+        .. '` executable found. Selected from '
         .. vim.inspect(install.compilers)
-        .. (version and ("\nVersion: " .. version) or "")
+        .. (version and ('\nVersion: ' .. version) or '')
     )
   end
   if vim.treesitter.language_version then
     if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then
-      _ok(
-        "Neovim was compiled with tree-sitter runtime ABI version "
+      vim.health.ok(
+        'Neovim was compiled with tree-sitter runtime ABI version '
           .. vim.treesitter.language_version
-          .. " (required >="
+          .. ' (required >='
           .. NVIM_TREESITTER_MINIMUM_ABI
-          .. "). Parsers must be compatible with runtime ABI."
+          .. '). Parsers must be compatible with runtime ABI.'
       )
     else
-      _error(
-        "Neovim was compiled with tree-sitter runtime ABI version "
+      vim.health.error(
+        'Neovim was compiled with tree-sitter runtime ABI version '
           .. vim.treesitter.language_version
-          .. ".\n"
-          .. "nvim-treesitter expects at least ABI version "
+          .. '.\n'
+          .. 'nvim-treesitter expects at least ABI version '
           .. NVIM_TREESITTER_MINIMUM_ABI
-          .. "\n"
-          .. "Please make sure that Neovim is linked against are recent tree-sitter runtime when building"
-          .. " or raise an issue at your Neovim packager. Parsers must be compatible with runtime ABI."
+          .. '\n'
+          .. 'Please make sure that Neovim is linked against are recent tree-sitter runtime when building'
+          .. ' or raise an issue at your Neovim packager. Parsers must be compatible with runtime ABI.'
       )
     end
   end
 
-  _start("OS Info:\n" .. vim.inspect(vim.loop.os_uname()))
+  vim.health.start('OS Info:\n' .. vim.inspect(vim.loop.os_uname()))
 end
 
 local function query_status(lang, query_group)
-  local ok, err = pcall(queries.get_query, lang, query_group)
+  local ok, err = pcall(tsq.get, lang, query_group)
   if not ok then
-    return "x", err
+    return 'x', err
   elseif not err then
-    return "."
+    return '.'
   else
-    return "✓"
+    return '✓'
   end
 end
 
@@ -118,59 +121,53 @@ function M.check()
   local error_collection = {}
   -- Installation dependency checks
   install_health()
-  queries.invalidate_query_cache()
   -- Parser installation checks
-  local parser_installation = { "Parser/Features" .. string.rep(" ", 9) .. "H L F I J" }
-  for _, parser_name in pairs(info.installed_parsers()) do
-    local installed = #api.nvim_get_runtime_file("parser/" .. parser_name .. ".so", false)
-
-    -- Only append information about installed parsers
-    if installed >= 1 then
-      local multiple_parsers = installed > 1 and "+" or ""
-      local out = "  - " .. parser_name .. multiple_parsers .. string.rep(" ", 20 - (#parser_name + #multiple_parsers))
-      for _, query_group in pairs(queries.built_in_query_groups) do
-        local status, err = query_status(parser_name, query_group)
-        out = out .. status .. " "
-        if err then
-          table.insert(error_collection, { parser_name, query_group, err })
-        end
+  local parser_installation = { 'Parser/Features' .. string.rep(' ', 9) .. 'H L F I J' }
+  for _, parser_name in pairs(config.installed_parsers()) do
+    local out = '  - ' .. parser_name .. string.rep(' ', 20 - #parser_name)
+    for _, query_group in pairs(M.bundled_queries) do
+      local status, err = query_status(parser_name, query_group)
+      out = out .. status .. ' '
+      if err then
+        table.insert(error_collection, { parser_name, query_group, err })
       end
-      table.insert(parser_installation, vim.fn.trim(out, " ", 2))
     end
+    table.insert(parser_installation, vim.fn.trim(out, ' ', 2))
   end
   local legend = [[
 
-  Legend: H[ighlight], L[ocals], F[olds], I[ndents], In[j]ections
-         +) multiple parsers found, only one will be used
-         x) errors found in the query, try to run :TSUpdate {lang}]]
+  Legend: H[ighlight], L[ocals], F[olds], I[ndents], In[J]ections
+          x) errors found in the query, try to run :TSUpdate {lang}]]
   table.insert(parser_installation, legend)
   -- Finally call the report function
-  _start(table.concat(parser_installation, "\n"))
+  vim.health.start(table.concat(parser_installation, '\n'))
   if #error_collection > 0 then
-    _start "The following errors have been detected:"
+    vim.health.start('The following errors have been detected:')
     for _, p in ipairs(error_collection) do
       local lang, type, err = unpack(p)
       local lines = {}
-      table.insert(lines, lang .. "(" .. type .. "): " .. err)
-      local files = ts.get_query_files(lang, type)
+      table.insert(lines, lang .. '(' .. type .. '): ' .. err)
+      local files = tsq.get_files(lang, type)
       if #files > 0 then
-        table.insert(lines, lang .. "(" .. type .. ") is concatenated from the following files:")
+        table.insert(lines, lang .. '(' .. type .. ') is concatenated from the following files:')
         for _, file in ipairs(files) do
-          local fd = io.open(file, "r")
+          local fd = io.open(file, 'r')
           if fd then
-            local ok, file_err = pcall(ts.parse_query, lang, fd:read "*a")
+            local ok, file_err = pcall(tsq.parse, lang, fd:read('*a'))
             if ok then
-              table.insert(lines, '|    [OK]:"' .. file .. '"')
+              table.insert(lines, '|  [OK]:"' .. file .. '"')
             else
-              table.insert(lines, '| [ERROR]:"' .. file .. '", failed to load: ' .. file_err)
+              table.insert(lines, '| [ERR]:"' .. file .. '", failed to load: ' .. file_err)
             end
             fd:close()
           end
         end
       end
-      _error(table.concat(lines, "\n"))
+      vim.health.error(table.concat(lines, '\n'))
     end
   end
 end
 
+M.bundled_queries = { 'highlights', 'locals', 'folds', 'indents', 'injections' }
+
 return M
diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua
deleted file mode 100644
index 5a3cc2e86..000000000
--- a/lua/nvim-treesitter/highlight.lua
+++ /dev/null
@@ -1,49 +0,0 @@
-local configs = require "nvim-treesitter.configs"
-
-local M = {}
-
----@param config TSModule
----@param lang string
----@return boolean
-local function should_enable_vim_regex(config, lang)
-  local additional_hl = config.additional_vim_regex_highlighting
-  local is_table = type(additional_hl) == "table"
-
-  ---@diagnostic disable-next-line: param-type-mismatch
-  return additional_hl and (not is_table or vim.tbl_contains(additional_hl, lang))
-end
-
----@param bufnr integer
----@param lang string
-function M.attach(bufnr, lang)
-  local config = configs.get_module "highlight"
-  vim.treesitter.start(bufnr, lang)
-  if config and should_enable_vim_regex(config, lang) then
-    vim.bo[bufnr].syntax = "ON"
-  end
-end
-
----@param bufnr integer
-function M.detach(bufnr)
-  vim.treesitter.stop(bufnr)
-end
-
----@deprecated
-function M.start(...)
-  vim.notify(
-    "`nvim-treesitter.highlight.start` is deprecated: use `nvim-treesitter.highlight.attach` or `vim.treesitter.start`",
-    vim.log.levels.WARN
-  )
-  M.attach(...)
-end
-
----@deprecated
-function M.stop(...)
-  vim.notify(
-    "`nvim-treesitter.highlight.stop` is deprecated: use `nvim-treesitter.highlight.detach` or `vim.treesitter.stop`",
-    vim.log.levels.WARN
-  )
-  M.detach(...)
-end
-
-return M
diff --git a/lua/nvim-treesitter/incremental_selection.lua b/lua/nvim-treesitter/incremental_selection.lua
deleted file mode 100644
index 570f9eed9..000000000
--- a/lua/nvim-treesitter/incremental_selection.lua
+++ /dev/null
@@ -1,176 +0,0 @@
-local api = vim.api
-
-local configs = require "nvim-treesitter.configs"
-local ts_utils = require "nvim-treesitter.ts_utils"
-local locals = require "nvim-treesitter.locals"
-local parsers = require "nvim-treesitter.parsers"
-local queries = require "nvim-treesitter.query"
-local utils = require "nvim-treesitter.utils"
-
-local M = {}
-
----@type table<integer, table<TSNode|nil>>
-local selections = {}
-
-function M.init_selection()
-  local buf = api.nvim_get_current_buf()
-  parsers.get_parser():parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
-  local node = ts_utils.get_node_at_cursor()
-  selections[buf] = { [1] = node }
-  ts_utils.update_selection(buf, node)
-end
-
--- Get the range of the current visual selection.
---
--- The range starts with 1 and the ending is inclusive.
----@return integer, integer, integer, integer
-local function visual_selection_range()
-  local _, csrow, cscol, _ = unpack(vim.fn.getpos "v") ---@type integer, integer, integer, integer
-  local _, cerow, cecol, _ = unpack(vim.fn.getpos ".") ---@type integer, integer, integer, integer
-
-  local start_row, start_col, end_row, end_col ---@type integer, integer, integer, integer
-
-  if csrow < cerow or (csrow == cerow and cscol <= cecol) then
-    start_row = csrow
-    start_col = cscol
-    end_row = cerow
-    end_col = cecol
-  else
-    start_row = cerow
-    start_col = cecol
-    end_row = csrow
-    end_col = cscol
-  end
-
-  return start_row, start_col, end_row, end_col
-end
-
----@param node TSNode
----@return boolean
-local function range_matches(node)
-  local csrow, cscol, cerow, cecol = visual_selection_range()
-  local srow, scol, erow, ecol = ts_utils.get_vim_range { node:range() }
-  return srow == csrow and scol == cscol and erow == cerow and ecol == cecol
-end
-
----@param get_parent fun(node: TSNode): TSNode|nil
----@return fun():nil
-local function select_incremental(get_parent)
-  return function()
-    local buf = api.nvim_get_current_buf()
-    local nodes = selections[buf]
-
-    local csrow, cscol, cerow, cecol = visual_selection_range()
-    -- Initialize incremental selection with current selection
-    if not nodes or #nodes == 0 or not range_matches(nodes[#nodes]) then
-      local parser = parsers.get_parser()
-      parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
-      local node = parser:named_node_for_range(
-        { csrow - 1, cscol - 1, cerow - 1, cecol },
-        { ignore_injections = false }
-      )
-      ts_utils.update_selection(buf, node)
-      if nodes and #nodes > 0 then
-        table.insert(selections[buf], node)
-      else
-        selections[buf] = { [1] = node }
-      end
-      return
-    end
-
-    -- Find a node that changes the current selection.
-    local node = nodes[#nodes] ---@type TSNode
-    while true do
-      local parent = get_parent(node)
-      if not parent or parent == node then
-        -- Keep searching in the parent tree
-        local root_parser = parsers.get_parser()
-        root_parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
-        local current_parser = root_parser:language_for_range { csrow - 1, cscol - 1, cerow - 1, cecol }
-        if root_parser == current_parser then
-          node = root_parser:named_node_for_range { csrow - 1, cscol - 1, cerow - 1, cecol }
-          ts_utils.update_selection(buf, node)
-          return
-        end
-        -- NOTE: parent() method is private
-        local parent_parser = current_parser:parent()
-        parent = parent_parser:named_node_for_range { csrow - 1, cscol - 1, cerow - 1, cecol }
-      end
-      node = parent
-      local srow, scol, erow, ecol = ts_utils.get_vim_range { node:range() }
-      local same_range = (srow == csrow and scol == cscol and erow == cerow and ecol == cecol)
-      if not same_range then
-        table.insert(selections[buf], node)
-        if node ~= nodes[#nodes] then
-          table.insert(nodes, node)
-        end
-        ts_utils.update_selection(buf, node)
-        return
-      end
-    end
-  end
-end
-
-M.node_incremental = select_incremental(function(node)
-  return node:parent() or node
-end)
-
-M.scope_incremental = select_incremental(function(node)
-  local lang = parsers.get_buf_lang()
-  if queries.has_locals(lang) then
-    return locals.containing_scope(node:parent() or node)
-  else
-    return node
-  end
-end)
-
-function M.node_decremental()
-  local buf = api.nvim_get_current_buf()
-  local nodes = selections[buf]
-  if not nodes or #nodes < 2 then
-    return
-  end
-
-  table.remove(selections[buf])
-  local node = nodes[#nodes] ---@type TSNode
-  ts_utils.update_selection(buf, node)
-end
-
-local FUNCTION_DESCRIPTIONS = {
-  init_selection = "Start selecting nodes with nvim-treesitter",
-  node_incremental = "Increment selection to named node",
-  scope_incremental = "Increment selection to surrounding scope",
-  node_decremental = "Shrink selection to previous named node",
-}
-
----@param bufnr integer
-function M.attach(bufnr)
-  local config = configs.get_module "incremental_selection"
-  for funcname, mapping in pairs(config.keymaps) do
-    if mapping then
-      local mode = funcname == "init_selection" and "n" or "x"
-      local rhs = M[funcname] ---@type function
-
-      if not rhs then
-        utils.notify("Unknown keybinding: " .. funcname .. debug.traceback(), vim.log.levels.ERROR)
-      else
-        vim.keymap.set(mode, mapping, rhs, { buffer = bufnr, silent = true, desc = FUNCTION_DESCRIPTIONS[funcname] })
-      end
-    end
-  end
-end
-
-function M.detach(bufnr)
-  local config = configs.get_module "incremental_selection"
-  for f, mapping in pairs(config.keymaps) do
-    if mapping then
-      local mode = f == "init_selection" and "n" or "x"
-      local ok, err = pcall(vim.keymap.del, mode, mapping, { buffer = bufnr })
-      if not ok then
-        utils.notify(string.format('%s "%s" for mode %s', err, mapping, mode), vim.log.levels.ERROR)
-      end
-    end
-  end
-end
-
-return M
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 19e7ef1ee..6b674dc63 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -1,5 +1,4 @@
 local ts = vim.treesitter
-local parsers = require "nvim-treesitter.parsers"
 
 local M = {}
 
@@ -14,13 +13,13 @@ M.comment_parsers = {
 }
 
 local function getline(lnum)
-  return vim.api.nvim_buf_get_lines(0, lnum - 1, lnum, false)[1] or ""
+  return vim.api.nvim_buf_get_lines(0, lnum - 1, lnum, false)[1] or ''
 end
 
 ---@param lnum integer
 ---@return integer
 local function get_indentcols_at_line(lnum)
-  local _, indentcols = getline(lnum):find "^%s*"
+  local _, indentcols = getline(lnum):find('^%s*')
   return indentcols or 0
 end
 
@@ -62,8 +61,8 @@ local function find_delimiter(bufnr, node, delimiter)
       local line = vim.api.nvim_buf_get_lines(bufnr, linenr, linenr + 1, false)[1]
       local end_char = { child:end_() }
       local trimmed_after_delim
-      local escaped_delimiter = delimiter:gsub("[%-%.%+%[%]%(%)%$%^%%%?%*]", "%%%1")
-      trimmed_after_delim, _ = line:sub(end_char[2] + 1):gsub("[%s" .. escaped_delimiter .. "]*", "")
+      local escaped_delimiter = delimiter:gsub('[%-%.%+%[%]%(%)%$%^%%%?%*]', '%%%1')
+      trimmed_after_delim = line:sub(end_char[2] + 1):gsub('[%s' .. escaped_delimiter .. ']*', '')
       return child, #trimmed_after_delim == 0
     end
   end
@@ -75,7 +74,7 @@ end
 ---@param hash_fn fun(...): any
 ---@return F
 local function memoize(fn, hash_fn)
-  local cache = setmetatable({}, { __mode = "kv" }) ---@type table<any,any>
+  local cache = setmetatable({}, { __mode = 'kv' }) ---@type table<any,any>
 
   return function(...)
     local key = hash_fn(...)
@@ -91,47 +90,47 @@ end
 
 local get_indents = memoize(function(bufnr, root, lang)
   local map = {
-    ["indent.auto"] = {},
-    ["indent.begin"] = {},
-    ["indent.end"] = {},
-    ["indent.dedent"] = {},
-    ["indent.branch"] = {},
-    ["indent.ignore"] = {},
-    ["indent.align"] = {},
-    ["indent.zero"] = {},
+    ['indent.auto'] = {},
+    ['indent.begin'] = {},
+    ['indent.end'] = {},
+    ['indent.dedent'] = {},
+    ['indent.branch'] = {},
+    ['indent.ignore'] = {},
+    ['indent.align'] = {},
+    ['indent.zero'] = {},
   }
 
-  --TODO(clason): remove when dropping Nvim 0.8 compat
-  local query = (ts.query.get or ts.get_query)(lang, "indents")
+  local query = ts.query.get(lang, 'indents')
   if not query then
     return map
   end
   for id, node, metadata in query:iter_captures(root, bufnr) do
-    if query.captures[id]:sub(1, 1) ~= "_" then
+    if query.captures[id]:sub(1, 1) ~= '_' then
       map[query.captures[id]][node:id()] = metadata or {}
     end
   end
 
   return map
 end, function(bufnr, root, lang)
-  return tostring(bufnr) .. root:id() .. "_" .. lang
+  return tostring(bufnr) .. root:id() .. '_' .. lang
 end)
 
 ---@param lnum number (1-indexed)
+---@return integer
 function M.get_indent(lnum)
   local bufnr = vim.api.nvim_get_current_buf()
-  local parser = parsers.get_parser(bufnr)
+  local parser = ts.get_parser(bufnr)
   if not parser or not lnum then
     return -1
   end
 
-  --TODO(clason): replace when dropping Nvim 0.8 compat
-  local root_lang = parsers.get_buf_lang(bufnr)
+  local ft = vim.bo[bufnr].filetype
+  local root_lang = vim.treesitter.language.get_lang(ft) or ft
 
   -- some languages like Python will actually have worse results when re-parsing at opened new line
   if not M.avoid_force_reparsing[root_lang] then
     -- Reparse in case we got triggered by ":h indentkeys"
-    parser:parse { vim.fn.line "w0" - 1, vim.fn.line "w$" }
+    parser:parse({ vim.fn.line('w0') - 1, vim.fn.line('w$') })
   end
 
   -- Get language tree with smallest range around node that's not a comment parser
@@ -155,15 +154,14 @@ function M.get_indent(lnum)
   end
 
   local q = get_indents(vim.api.nvim_get_current_buf(), root, lang_tree:lang())
-  local is_empty_line = string.match(getline(lnum), "^%s*$") ~= nil
   local node ---@type TSNode
-  if is_empty_line then
+  if getline(lnum):find('^%s*$') then
     local prevlnum = vim.fn.prevnonblank(lnum)
     local indentcols = get_indentcols_at_line(prevlnum)
     local prevline = vim.trim(getline(prevlnum))
     -- The final position can be trailing spaces, which should not affect indentation
     node = get_last_node_at_line(root, prevlnum, indentcols + #prevline - 1)
-    if node:type():match "comment" then
+    if node:type():match('comment') then
       -- The final node we capture of the previous line can be a comment node, which should also be ignored
       -- Unless the last line is an entire line of comment, ignore the comment range and find the last node again
       local first_node = get_first_node_at_line(root, prevlnum, indentcols)
@@ -176,7 +174,7 @@ function M.get_indent(lnum)
         node = get_last_node_at_line(root, prevlnum, col)
       end
     end
-    if q["indent.end"][node:id()] then
+    if q['indent.end'][node:id()] then
       node = get_first_node_at_line(root, lnum)
     end
   else
@@ -192,18 +190,18 @@ function M.get_indent(lnum)
   end
 
   -- tracks to ensure multiple indent levels are not applied for same line
-  local is_processed_by_row = {}
+  local is_processed_by_row = {} --- @type table<integer,boolean>
 
-  if q["indent.zero"][node:id()] then
+  if q['indent.zero'][node:id()] then
     return 0
   end
 
   while node do
     -- do 'autoindent' if not marked as @indent
     if
-      not q["indent.begin"][node:id()]
-      and not q["indent.align"][node:id()]
-      and q["indent.auto"][node:id()]
+      not q['indent.begin'][node:id()]
+      and not q['indent.align'][node:id()]
+      and q['indent.auto'][node:id()]
       and node:start() < lnum - 1
       and lnum - 1 <= node:end_()
     then
@@ -214,8 +212,8 @@ function M.get_indent(lnum)
     -- If a node spans from L1,C1 to L2,C2, we know that lines where L1 < line <= L2 would
     -- have their indentations contained by the node.
     if
-      not q["indent.begin"][node:id()]
-      and q["indent.ignore"][node:id()]
+      not q['indent.begin'][node:id()]
+      and q['indent.ignore'][node:id()]
       and node:start() < lnum - 1
       and lnum - 1 <= node:end_()
     then
@@ -228,7 +226,10 @@ function M.get_indent(lnum)
 
     if
       not is_processed_by_row[srow]
-      and ((q["indent.branch"][node:id()] and srow == lnum - 1) or (q["indent.dedent"][node:id()] and srow ~= lnum - 1))
+      and (
+        (q['indent.branch'][node:id()] and srow == lnum - 1)
+        or (q['indent.dedent'][node:id()] and srow ~= lnum - 1)
+      )
     then
       indent = indent - indent_size
       is_processed = true
@@ -244,16 +245,16 @@ function M.get_indent(lnum)
     if
       should_process
       and (
-        q["indent.begin"][node:id()]
-        and (srow ~= erow or is_in_err or q["indent.begin"][node:id()]["indent.immediate"])
-        and (srow ~= lnum - 1 or q["indent.begin"][node:id()]["indent.start_at_same_line"])
+        q['indent.begin'][node:id()]
+        and (srow ~= erow or is_in_err or q['indent.begin'][node:id()]['indent.immediate'])
+        and (srow ~= lnum - 1 or q['indent.begin'][node:id()]['indent.start_at_same_line'])
       )
     then
       indent = indent + indent_size
       is_processed = true
     end
 
-    if is_in_err and not q["indent.align"][node:id()] then
+    if is_in_err and not q['indent.align'][node:id()] then
       -- only when the node is in error, promote the
       -- first child's aligned indent to the error node
       -- to work around ((ERROR "X" . (_)) @aligned_indent (#set! "delimiter" "AB"))
@@ -261,34 +262,41 @@ function M.get_indent(lnum)
       -- (ERROR "X" @aligned_indent (#set! "delimiter" "AB") . (_))
       -- and we will fish it out here.
       for c in node:iter_children() do
-        if q["indent.align"][c:id()] then
-          q["indent.align"][node:id()] = q["indent.align"][c:id()]
+        if q['indent.align'][c:id()] then
+          q['indent.align'][node:id()] = q['indent.align'][c:id()]
           break
         end
       end
     end
     -- do not indent for nodes that starts-and-ends on same line and starts on target line (lnum)
-    if should_process and q["indent.align"][node:id()] and (srow ~= erow or is_in_err) and (srow ~= lnum - 1) then
-      local metadata = q["indent.align"][node:id()]
+    if
+      should_process
+      and q['indent.align'][node:id()]
+      and (srow ~= erow or is_in_err)
+      and (srow ~= lnum - 1)
+    then
+      local metadata = q['indent.align'][node:id()]
       local o_delim_node, o_is_last_in_line ---@type TSNode|nil, boolean|nil
       local c_delim_node, c_is_last_in_line ---@type TSNode|nil, boolean|nil, boolean|nil
       local indent_is_absolute = false
-      if metadata["indent.open_delimiter"] then
-        o_delim_node, o_is_last_in_line = find_delimiter(bufnr, node, metadata["indent.open_delimiter"])
+      if metadata['indent.open_delimiter'] then
+        o_delim_node, o_is_last_in_line =
+          find_delimiter(bufnr, node, metadata['indent.open_delimiter'])
       else
         o_delim_node = node
       end
-      if metadata["indent.close_delimiter"] then
-        c_delim_node, c_is_last_in_line = find_delimiter(bufnr, node, metadata["indent.close_delimiter"])
+      if metadata['indent.close_delimiter'] then
+        c_delim_node, c_is_last_in_line =
+          find_delimiter(bufnr, node, metadata['indent.close_delimiter'])
       else
         c_delim_node = node
       end
 
       if o_delim_node then
         local o_srow, o_scol = o_delim_node:start()
-        local c_srow = nil
+        local c_srow = nil --- @type integer?
         if c_delim_node then
-          c_srow, _ = c_delim_node:start()
+          c_srow = c_delim_node:start()
         end
         if o_is_last_in_line then
           -- hanging indent (previous line ended with starting delimiter)
@@ -310,7 +318,7 @@ function M.get_indent(lnum)
             -- Then its indent level shouldn't be affected by `@aligned_indent` node
             indent = math.max(indent - indent_size, 0)
           else
-            indent = o_scol + (metadata["indent.increment"] or 1)
+            indent = o_scol + (metadata['indent.increment'] or 1)
             indent_is_absolute = true
           end
         end
@@ -321,7 +329,7 @@ function M.get_indent(lnum)
           -- then this last line may need additional indent to avoid clashes
           -- with the next. `indent.avoid_last_matching_next` controls this behavior,
           -- for example this is needed for function parameters.
-          avoid_last_matching_next = metadata["indent.avoid_last_matching_next"] or false
+          avoid_last_matching_next = metadata['indent.avoid_last_matching_next'] or false
         end
         if avoid_last_matching_next then
           -- last line must be indented more in cases where
@@ -350,17 +358,4 @@ function M.get_indent(lnum)
   return indent
 end
 
----@type table<integer, string>
-local indent_funcs = {}
-
----@param bufnr integer
-function M.attach(bufnr)
-  indent_funcs[bufnr] = vim.bo.indentexpr
-  vim.bo.indentexpr = "nvim_treesitter#indent()"
-end
-
-function M.detach(bufnr)
-  vim.bo.indentexpr = indent_funcs[bufnr]
-end
-
 return M
diff --git a/lua/nvim-treesitter/info.lua b/lua/nvim-treesitter/info.lua
deleted file mode 100644
index 6e94b357d..000000000
--- a/lua/nvim-treesitter/info.lua
+++ /dev/null
@@ -1,190 +0,0 @@
-local api = vim.api
-local configs = require "nvim-treesitter.configs"
-local parsers = require "nvim-treesitter.parsers"
-
-local M = {}
-
-local function install_info()
-  local max_len = 0
-  for _, ft in pairs(parsers.available_parsers()) do
-    if #ft > max_len then
-      max_len = #ft
-    end
-  end
-
-  local parser_list = parsers.available_parsers()
-  table.sort(parser_list)
-  for _, lang in pairs(parser_list) do
-    local is_installed = #api.nvim_get_runtime_file("parser/" .. lang .. ".so", false) > 0
-    api.nvim_out_write(lang .. string.rep(" ", max_len - #lang + 1))
-    if is_installed then
-      api.nvim_out_write "[✓] installed\n"
-    elseif pcall(vim.treesitter.inspect_lang, lang) then
-      api.nvim_out_write "[✗] not installed (but still loaded. Restart Neovim!)\n"
-    else
-      api.nvim_out_write "[✗] not installed\n"
-    end
-  end
-end
-
--- Sort a list of modules into namespaces.
--- {'mod1', 'mod2.sub1', 'mod2.sub2', 'mod3'}
--- ->
--- { default = {'mod1', 'mod3'}, mod2 = {'sub1', 'sub2'}}
----@param modulelist string[]
----@return table
-local function namespace_modules(modulelist)
-  local modules = {}
-  for _, module in ipairs(modulelist) do
-    if module:find "%." then
-      local namespace, submodule = module:match "^(.*)%.(.*)$"
-      if not modules[namespace] then
-        modules[namespace] = {}
-      end
-      table.insert(modules[namespace], submodule)
-    else
-      if not modules.default then
-        modules.default = {}
-      end
-      table.insert(modules.default, module)
-    end
-  end
-  return modules
-end
-
----@param list string[]
----@return integer length
-local function longest_string_length(list)
-  local length = 0
-  for _, value in ipairs(list) do
-    if #value > length then
-      length = #value
-    end
-  end
-  return length
-end
-
----@param curbuf integer
----@param origbuf integer
----@param parserlist string[]
----@param namespace string
----@param modulelist string[]
-local function append_module_table(curbuf, origbuf, parserlist, namespace, modulelist)
-  local maxlen_parser = longest_string_length(parserlist)
-  table.sort(modulelist)
-
-  -- header
-  local header = ">> " .. namespace .. string.rep(" ", maxlen_parser - #namespace - 1)
-  for _, module in pairs(modulelist) do
-    header = header .. module .. "  "
-  end
-  api.nvim_buf_set_lines(curbuf, -1, -1, true, { header })
-
-  -- actual table
-  for _, parser in ipairs(parserlist) do
-    local padding = string.rep(" ", maxlen_parser - #parser + 2)
-    local line = parser .. padding
-    local namespace_prefix = (namespace == "default") and "" or namespace .. "."
-    for _, module in pairs(modulelist) do
-      local modlen = #module
-      module = namespace_prefix .. module
-      if configs.is_enabled(module, parser, origbuf) then
-        line = line .. "✓"
-      else
-        line = line .. "✗"
-      end
-      line = line .. string.rep(" ", modlen + 1)
-    end
-    api.nvim_buf_set_lines(curbuf, -1, -1, true, { line })
-  end
-
-  api.nvim_buf_set_lines(curbuf, -1, -1, true, { "" })
-end
-
-local function print_info_modules(parserlist, module)
-  local origbuf = api.nvim_get_current_buf()
-  api.nvim_command "enew"
-  local curbuf = api.nvim_get_current_buf()
-
-  local modules
-  if module then
-    modules = namespace_modules { module }
-  else
-    modules = namespace_modules(configs.available_modules())
-  end
-
-  ---@type string[]
-  local namespaces = {}
-  for k, _ in pairs(modules) do
-    table.insert(namespaces, k)
-  end
-  table.sort(namespaces)
-
-  table.sort(parserlist)
-  for _, namespace in ipairs(namespaces) do
-    append_module_table(curbuf, origbuf, parserlist, namespace, modules[namespace])
-  end
-
-  api.nvim_buf_set_option(curbuf, "modified", false)
-  api.nvim_buf_set_option(curbuf, "buftype", "nofile")
-  vim.cmd [[
-  syntax match TSModuleInfoGood      /✓/
-  syntax match TSModuleInfoBad       /✗/
-  syntax match TSModuleInfoHeader    /^>>.*$/ contains=TSModuleInfoNamespace
-  syntax match TSModuleInfoNamespace /^>> \w*/ contained
-  syntax match TSModuleInfoParser    /^[^> ]*\ze /
-  ]]
-
-  local highlights = {
-    TSModuleInfoGood = { fg = "LightGreen", bold = true, default = true },
-    TSModuleInfoBad = { fg = "Crimson", default = true },
-    TSModuleInfoHeader = { link = "Type", default = true },
-    TSModuleInfoNamespace = { link = "Statement", default = true },
-    TSModuleInfoParser = { link = "Identifier", default = true },
-  }
-  for k, v in pairs(highlights) do
-    api.nvim_set_hl(0, k, v)
-  end
-end
-
-local function module_info(module)
-  if module and not configs.get_module(module) then
-    return
-  end
-
-  local parserlist = parsers.available_parsers()
-  if module then
-    print_info_modules(parserlist, module)
-  else
-    print_info_modules(parserlist)
-  end
-end
-
----@return string[]
-function M.installed_parsers()
-  local installed = {}
-  for _, p in pairs(parsers.available_parsers()) do
-    if parsers.has_parser(p) then
-      table.insert(installed, p)
-    end
-  end
-  return installed
-end
-
-M.commands = {
-  TSInstallInfo = {
-    run = install_info,
-    args = {
-      "-nargs=0",
-    },
-  },
-  TSModuleInfo = {
-    run = module_info,
-    args = {
-      "-nargs=?",
-      "-complete=custom,nvim_treesitter#available_modules",
-    },
-  },
-}
-
-return M
diff --git a/lua/nvim-treesitter/init.lua b/lua/nvim-treesitter/init.lua
new file mode 100644
index 000000000..aac1c6ba6
--- /dev/null
+++ b/lua/nvim-treesitter/init.lua
@@ -0,0 +1,11 @@
+local M = {}
+
+function M.setup(...)
+  require('nvim-treesitter.config').setup(...)
+end
+
+function M.indentexpr()
+  return require('nvim-treesitter.indent').get_indent(vim.v.lnum)
+end
+
+return M
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index cd12dbb81..745c2dd1f 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -1,13 +1,10 @@
 local api = vim.api
-local fn = vim.fn
-local luv = vim.loop
+local uv = vim.loop
 
-local utils = require "nvim-treesitter.utils"
-local parsers = require "nvim-treesitter.parsers"
-local info = require "nvim-treesitter.info"
-local configs = require "nvim-treesitter.configs"
-local shell = require "nvim-treesitter.shell_command_selectors"
-local compat = require "nvim-treesitter.compat"
+local utils = require('nvim-treesitter.utils')
+local parsers = require('nvim-treesitter.parsers')
+local config = require('nvim-treesitter.config')
+local shell = require('nvim-treesitter.shell_cmds')
 
 local M = {}
 
@@ -17,16 +14,20 @@ local M = {}
 ---@type table<string, LockfileInfo>
 local lockfile = {}
 
-M.compilers = { vim.fn.getenv "CC", "cc", "gcc", "clang", "cl", "zig" }
-M.prefer_git = fn.has "win32" == 1
+M.compilers = { uv.os_getenv('CC'), 'cc', 'gcc', 'clang', 'cl', 'zig' }
+M.prefer_git = uv.os_uname().sysname == 'Windows_NT'
 M.command_extra_args = {}
 M.ts_generate_args = nil
 
 local started_commands = 0
 local finished_commands = 0
 local failed_commands = 0
-local complete_std_output = {}
-local complete_error_output = {}
+local stdout_output = {}
+local stderr_output = {}
+
+---
+--- JOB API functions
+---
 
 local function reset_progress_counter()
   if started_commands ~= finished_commands then
@@ -35,53 +36,157 @@ local function reset_progress_counter()
   started_commands = 0
   finished_commands = 0
   failed_commands = 0
-  complete_std_output = {}
-  complete_error_output = {}
+  stdout_output = {}
+  stderr_output = {}
 end
 
 local function get_job_status()
-  return "[nvim-treesitter] ["
+  return '[nvim-treesitter] ['
     .. finished_commands
-    .. "/"
+    .. '/'
     .. started_commands
-    .. (failed_commands > 0 and ", failed: " .. failed_commands or "")
-    .. "]"
+    .. (failed_commands > 0 and ', failed: ' .. failed_commands or '')
+    .. ']'
 end
 
----@param lang string
----@return function
-local function reattach_if_possible_fn(lang, error_on_fail)
-  return function()
-    for _, buf in ipairs(vim.api.nvim_list_bufs()) do
-      if parsers.get_buf_lang(buf) == lang then
-        vim._ts_remove_language(lang)
-        local ok, err
-        if vim.treesitter.language.add then
-          local ft = vim.bo[buf].filetype
-          ok, err = pcall(vim.treesitter.language.add, lang, { filetype = ft })
-        else
-          ok, err = pcall(compat.require_language, lang)
-        end
-        if not ok and error_on_fail then
-          vim.notify("Could not load parser for " .. lang .. ": " .. vim.inspect(err))
-        end
-        for _, mod in ipairs(require("nvim-treesitter.configs").available_modules()) do
-          if ok then
-            require("nvim-treesitter.configs").reattach_module(mod, buf, lang)
-          else
-            require("nvim-treesitter.configs").detach_module(mod, buf)
-          end
-        end
+---@param cmd Command
+---@return string command
+local function get_command(cmd)
+  local options = ''
+  if cmd.opts and cmd.opts.args then
+    if M.command_extra_args[cmd.cmd] then
+      vim.list_extend(cmd.opts.args, M.command_extra_args[cmd.cmd])
+    end
+    for _, opt in ipairs(cmd.opts.args) do
+      options = string.format('%s %s', options, opt)
+    end
+  end
+
+  local command = string.format('%s %s', cmd.cmd, options)
+  if cmd.opts and cmd.opts.cwd then
+    command = shell.make_directory_change_for_command(cmd.opts.cwd, command)
+  end
+  return command
+end
+
+---@param cmd_list Command[]
+---@return boolean
+local function iter_cmd_sync(cmd_list)
+  for _, cmd in ipairs(cmd_list) do
+    if cmd.info then
+      vim.notify(cmd.info)
+    end
+
+    if type(cmd.cmd) == 'function' then
+      cmd.cmd()
+    else
+      local ret = vim.fn.system(get_command(cmd))
+      if vim.v.shell_error ~= 0 then
+        vim.notify(ret)
+        api.nvim_err_writeln(
+          (cmd.err and cmd.err .. '\n' or '')
+            .. 'Failed to execute the following command:\n'
+            .. vim.inspect(cmd)
+        )
+        return false
       end
     end
   end
+
+  return true
 end
 
+local function iter_cmd(cmd_list, i, lang, success_message)
+  if i == 1 then
+    started_commands = started_commands + 1
+  end
+  if i == #cmd_list + 1 then
+    finished_commands = finished_commands + 1
+    return vim.notify(get_job_status() .. ' ' .. success_message)
+  end
+
+  local attr = cmd_list[i]
+  if attr.info then
+    vim.notify(get_job_status() .. ' ' .. attr.info)
+  end
+
+  if attr.opts and attr.opts.args and M.command_extra_args[attr.cmd] then
+    vim.list_extend(attr.opts.args, M.command_extra_args[attr.cmd])
+  end
+
+  if type(attr.cmd) == 'function' then
+    local ok, err = pcall(attr.cmd)
+    if ok then
+      iter_cmd(cmd_list, i + 1, lang, success_message)
+    else
+      failed_commands = failed_commands + 1
+      finished_commands = finished_commands + 1
+      return api.nvim_err_writeln(
+        (attr.err or ('Failed to execute the following command:\n' .. vim.inspect(attr)))
+          .. '\n'
+          .. vim.inspect(err)
+      )
+    end
+  else
+    local handle
+    local stdout = uv.new_pipe(false)
+    local stderr = uv.new_pipe(false)
+    attr.opts.stdio = { nil, stdout, stderr }
+    ---@type userdata
+    handle = uv.spawn(
+      attr.cmd,
+      attr.opts,
+      vim.schedule_wrap(function(code)
+        if code ~= 0 then
+          stdout:read_stop()
+          stderr:read_stop()
+        end
+        stdout:close()
+        stderr:close()
+        handle:close()
+        if code ~= 0 then
+          failed_commands = failed_commands + 1
+          finished_commands = finished_commands + 1
+          if stdout_output[handle] and stdout_output[handle] ~= '' then
+            vim.notify(stdout_output[handle])
+          end
+
+          local err_msg = stderr_output[handle] or ''
+          api.nvim_err_writeln(
+            'nvim-treesitter['
+              .. lang
+              .. ']: '
+              .. (attr.err or ('Failed to execute the following command:\n' .. vim.inspect(attr)))
+              .. '\n'
+              .. err_msg
+          )
+          return
+        end
+        iter_cmd(cmd_list, i + 1, lang, success_message)
+      end)
+    )
+    uv.read_start(stdout, function(_, data)
+      if data then
+        stdout_output[handle] = (stdout_output[handle] or '') .. data
+      end
+    end)
+    uv.read_start(stderr, function(_, data)
+      if data then
+        stderr_output[handle] = (stderr_output[handle] or '') .. data
+      end
+    end)
+  end
+end
+
+---
+--- PARSER INFO
+---
+
 ---@param lang string
 ---@param validate boolean|nil
 ---@return InstallInfo
 local function get_parser_install_info(lang, validate)
-  local parser_config = parsers.get_parser_configs()[lang]
+  local parser_config = parsers.configs[lang]
 
   if not parser_config then
     error('Parser not available for language "' .. lang .. '"')
@@ -90,29 +195,23 @@ local function get_parser_install_info(lang, validate)
   local install_info = parser_config.install_info
 
   if validate then
-    vim.validate {
-      url = { install_info.url, "string" },
-      files = { install_info.files, "table" },
-    }
+    vim.validate({
+      url = { install_info.url, 'string' },
+      files = { install_info.files, 'table' },
+    })
   end
 
   return install_info
 end
 
-local function load_lockfile()
-  local filename = utils.join_path(utils.get_package_path(), "lockfile.json")
-  lockfile = vim.fn.filereadable(filename) == 1 and vim.fn.json_decode(vim.fn.readfile(filename)) or {}
-end
-
-local function is_ignored_parser(lang)
-  return vim.tbl_contains(configs.get_ignored_parser_installs(), lang)
-end
-
 ---@param lang string
 ---@return string|nil
 local function get_revision(lang)
   if #lockfile == 0 then
-    load_lockfile()
+    local filename = utils.get_package_path('lockfile.json')
+    local file = assert(io.open(filename, 'r'))
+    lockfile = vim.json.decode(file:read('*all'))
+    file:close()
   end
 
   local install_info = get_parser_install_info(lang)
@@ -128,40 +227,11 @@ end
 ---@param lang string
 ---@return string|nil
 local function get_installed_revision(lang)
-  local lang_file = utils.join_path(configs.get_parser_info_dir(), lang .. ".revision")
-  if vim.fn.filereadable(lang_file) == 1 then
-    return vim.fn.readfile(lang_file)[1]
-  end
-end
-
--- Clean path for use in a prefix comparison
----@param input string
----@return string
-local function clean_path(input)
-  local pth = vim.fn.fnamemodify(input, ":p")
-  if fn.has "win32" == 1 then
-    pth = pth:gsub("/", "\\")
-  end
-  return pth
-end
-
--- Checks if parser is installed with nvim-treesitter
----@param lang string
----@return boolean
-local function is_installed(lang)
-  local matched_parsers = vim.api.nvim_get_runtime_file("parser/" .. lang .. ".so", true) or {}
-  local install_dir = configs.get_parser_install_dir()
-  if not install_dir then
-    return false
-  end
-  install_dir = clean_path(install_dir)
-  for _, path in ipairs(matched_parsers) do
-    local abspath = clean_path(path)
-    if vim.startswith(abspath, install_dir) then
-      return true
-    end
-  end
-  return false
+  local lang_file = utils.join_path(config.get_install_dir('parser-info'), lang .. '.revision')
+  local file = assert(io.open(lang_file, 'r'))
+  local revision = file:read('*a')
+  file:close()
+  return revision
 end
 
 ---@param lang string
@@ -171,157 +241,57 @@ local function needs_update(lang)
   return not revision or revision ~= get_installed_revision(lang)
 end
 
----@return string[]
-local function outdated_parsers()
-  return vim.tbl_filter(function(lang) ---@param lang string
-    return is_installed(lang) and needs_update(lang)
-  end, info.installed_parsers())
-end
+function M.info()
+  local installed = config.installed_parsers()
+  local parser_list = parsers.get_available()
 
----@param handle userdata
----@param is_stderr boolean
-local function onread(handle, is_stderr)
-  return function(_, data)
-    if data then
-      if is_stderr then
-        complete_error_output[handle] = (complete_error_output[handle] or "") .. data
-      else
-        complete_std_output[handle] = (complete_std_output[handle] or "") .. data
-      end
+  local max_len = 0
+  for _, lang in pairs(parser_list) do
+    if #lang > max_len then
+      max_len = #lang
     end
   end
-end
 
-function M.iter_cmd(cmd_list, i, lang, success_message)
-  if i == 1 then
-    started_commands = started_commands + 1
-  end
-  if i == #cmd_list + 1 then
-    finished_commands = finished_commands + 1
-    return print(get_job_status() .. " " .. success_message)
-  end
-
-  local attr = cmd_list[i]
-  if attr.info then
-    print(get_job_status() .. " " .. attr.info)
-  end
-
-  if attr.opts and attr.opts.args and M.command_extra_args[attr.cmd] then
-    vim.list_extend(attr.opts.args, M.command_extra_args[attr.cmd])
-  end
-
-  if type(attr.cmd) == "function" then
-    local ok, err = pcall(attr.cmd)
-    if ok then
-      M.iter_cmd(cmd_list, i + 1, lang, success_message)
+  for _, lang in pairs(parser_list) do
+    local parser = (lang .. string.rep(' ', max_len - #lang + 1))
+    local output
+    if vim.list_contains(installed, lang) then
+      output = { parser .. '[✓] installed', 'DiagnosticOk' }
+    elseif #api.nvim_get_runtime_file('parser/' .. lang .. '.*', true) > 0 then
+      output = { parser .. '[·] not installed (but available from runtimepath)', 'DiagnosticInfo' }
     else
-      failed_commands = failed_commands + 1
-      finished_commands = finished_commands + 1
-      return api.nvim_err_writeln(
-        (attr.err or ("Failed to execute the following command:\n" .. vim.inspect(attr))) .. "\n" .. vim.inspect(err)
-      )
+      output = { parser .. '[✗] not installed' }
     end
-  else
-    local handle
-    local stdout = luv.new_pipe(false)
-    local stderr = luv.new_pipe(false)
-    attr.opts.stdio = { nil, stdout, stderr }
-    ---@type userdata
-    handle = luv.spawn(
-      attr.cmd,
-      attr.opts,
-      vim.schedule_wrap(function(code)
-        if code ~= 0 then
-          stdout:read_stop()
-          stderr:read_stop()
-        end
-        stdout:close()
-        stderr:close()
-        handle:close()
-        if code ~= 0 then
-          failed_commands = failed_commands + 1
-          finished_commands = finished_commands + 1
-          if complete_std_output[handle] and complete_std_output[handle] ~= "" then
-            print(complete_std_output[handle])
-          end
-
-          local err_msg = complete_error_output[handle] or ""
-          api.nvim_err_writeln(
-            "nvim-treesitter["
-              .. lang
-              .. "]: "
-              .. (attr.err or ("Failed to execute the following command:\n" .. vim.inspect(attr)))
-              .. "\n"
-              .. err_msg
-          )
-          return
-        end
-        M.iter_cmd(cmd_list, i + 1, lang, success_message)
-      end)
-    )
-    luv.read_start(stdout, onread(handle, false))
-    luv.read_start(stderr, onread(handle, true))
+    api.nvim_echo({ output }, false, {})
   end
 end
 
----@param cmd Command
----@return string command
-local function get_command(cmd)
-  local options = ""
-  if cmd.opts and cmd.opts.args then
-    if M.command_extra_args[cmd.cmd] then
-      vim.list_extend(cmd.opts.args, M.command_extra_args[cmd.cmd])
-    end
-    for _, opt in ipairs(cmd.opts.args) do
-      options = string.format("%s %s", options, opt)
-    end
-  end
+---
+--- PARSER MANAGEMENT FUNCTIONS
+---
 
-  local command = string.format("%s %s", cmd.cmd, options)
-  if cmd.opts and cmd.opts.cwd then
-    command = shell.make_directory_change_for_command(cmd.opts.cwd, command)
-  end
-  return command
-end
-
----@param cmd_list Command[]
----@return boolean
-local function iter_cmd_sync(cmd_list)
-  for _, cmd in ipairs(cmd_list) do
-    if cmd.info then
-      print(cmd.info)
-    end
-
-    if type(cmd.cmd) == "function" then
-      cmd.cmd()
-    else
-      local ret = vim.fn.system(get_command(cmd))
-      if vim.v.shell_error ~= 0 then
-        print(ret)
-        api.nvim_err_writeln(
-          (cmd.err and cmd.err .. "\n" or "") .. "Failed to execute the following command:\n" .. vim.inspect(cmd)
-        )
-        return false
-      end
-    end
-  end
-
-  return true
-end
-
----@param cache_folder string
----@param install_folder string
 ---@param lang string
----@param repo InstallInfo
+---@param cache_dir string
+---@param install_dir string
+---@param force boolean
 ---@param with_sync boolean
 ---@param generate_from_grammar boolean
-local function run_install(cache_folder, install_folder, lang, repo, with_sync, generate_from_grammar)
-  parsers.reset_cache()
+local function install_lang(lang, cache_dir, install_dir, force, with_sync, generate_from_grammar)
+  if vim.list_contains(config.installed_parsers(), lang) then
+    if not force then
+      local yesno =
+        vim.fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
+      print('\n ')
+      if yesno:sub(1, 1) ~= 'y' then
+        return
+      end
+    end
+  end
 
-  local path_sep = utils.get_path_sep()
+  local repo = get_parser_install_info(lang)
 
-  local project_name = "tree-sitter-" .. lang
-  local maybe_local_path = vim.fn.expand(repo.url)
+  local project_name = 'tree-sitter-' .. lang
+  local maybe_local_path = vim.fs.normalize(repo.url)
   local from_local_path = vim.fn.isdirectory(maybe_local_path) == 1
   if from_local_path then
     repo.url = maybe_local_path
@@ -337,48 +307,45 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
   else
     local repo_location = project_name
     if repo.location then
-      repo_location = repo_location .. "/" .. repo.location
+      repo_location = utils.join_path(repo_location, repo.location)
     end
-    repo_location = repo_location:gsub("/", path_sep)
-    compile_location = utils.join_path(cache_folder, repo_location)
+    compile_location = utils.join_path(cache_dir, repo_location)
   end
-  local parser_lib_name = utils.join_path(install_folder, lang) .. ".so"
+  local parser_lib_name = utils.join_path(install_dir, lang) .. '.so'
 
   generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
 
-  if generate_from_grammar and vim.fn.executable "tree-sitter" ~= 1 then
-    api.nvim_err_writeln "tree-sitter CLI not found: `tree-sitter` is not executable!"
+  if generate_from_grammar and vim.fn.executable('tree-sitter') ~= 1 then
+    api.nvim_err_writeln('tree-sitter CLI not found: `tree-sitter` is not executable')
     if repo.requires_generate_from_grammar then
       api.nvim_err_writeln(
-        "tree-sitter CLI is needed because `"
+        'tree-sitter CLI is needed because the parser for `'
           .. lang
-          .. "` is marked that it needs "
-          .. "to be generated from the grammar definitions to be compatible with nvim!"
+          .. '` needs to be generated from grammar'
       )
     end
     return
   else
     if not M.ts_generate_args then
-      local ts_cli_version = utils.ts_cli_version()
-      if ts_cli_version and vim.split(ts_cli_version, " ")[1] > "0.20.2" then
-        M.ts_generate_args = { "generate", "--no-bindings", "--abi", vim.treesitter.language_version }
-      else
-        M.ts_generate_args = { "generate", "--no-bindings" }
-      end
+      M.ts_generate_args = { 'generate', '--no-bindings', '--abi', vim.treesitter.language_version }
     end
   end
-  if generate_from_grammar and vim.fn.executable "node" ~= 1 then
-    api.nvim_err_writeln "Node JS not found: `node` is not executable!"
+  if generate_from_grammar and vim.fn.executable('node') ~= 1 then
+    api.nvim_err_writeln('Node JS not found: `node` is not executable')
     return
   end
   local cc = shell.select_executable(M.compilers)
   if not cc then
-    api.nvim_err_writeln('No C compiler found! "' .. table.concat(
-      vim.tbl_filter(function(c) ---@param c string
-        return type(c) == "string"
-      end, M.compilers),
-      '", "'
-    ) .. '" are not executable.')
+    api.nvim_err_writeln(
+      'No C compiler found! "'
+        .. table.concat(
+          vim.tbl_filter(function(c) ---@param c string
+            return type(c) == 'string'
+          end, M.compilers),
+          '", "'
+        )
+        .. '" are not executable.'
+    )
     return
   end
 
@@ -400,25 +367,33 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
   ---@type Command[]
   local command_list = {}
   if not from_local_path then
-    vim.list_extend(command_list, { shell.select_install_rm_cmd(cache_folder, project_name) })
+    vim.list_extend(command_list, {
+      {
+        cmd = function()
+          vim.fn.delete(utils.join_path(cache_dir, project_name), 'rf')
+        end,
+      },
+    })
     vim.list_extend(
       command_list,
-      shell.select_download_commands(repo, project_name, cache_folder, revision, M.prefer_git)
+      shell.select_download_commands(repo, project_name, cache_dir, revision, M.prefer_git)
     )
   end
   if generate_from_grammar then
     if repo.generate_requires_npm then
-      if vim.fn.executable "npm" ~= 1 then
-        api.nvim_err_writeln("`" .. lang .. "` requires NPM to be installed from grammar.js")
+      if vim.fn.executable('npm') ~= 1 then
+        api.nvim_err_writeln('`' .. lang .. '` requires NPM to be installed from grammar.js')
         return
       end
       vim.list_extend(command_list, {
         {
-          cmd = "npm",
-          info = "Installing NPM dependencies of " .. lang .. " parser",
-          err = "Error during `npm install` (required for parser generation of " .. lang .. " with npm dependencies)",
+          cmd = 'npm',
+          info = 'Installing NPM dependencies of ' .. lang .. ' parser',
+          err = 'Error during `npm install` (required for parser generation of '
+            .. lang
+            .. ' with npm dependencies)',
           opts = {
-            args = { "install" },
+            args = { 'install' },
             cwd = compile_location,
           },
         },
@@ -426,8 +401,8 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
     end
     vim.list_extend(command_list, {
       {
-        cmd = vim.fn.exepath "tree-sitter",
-        info = "Generating source files from grammar.js...",
+        cmd = vim.fn.exepath('tree-sitter'),
+        info = 'Generating source files from grammar.js...',
         err = 'Error during "tree-sitter generate"',
         opts = {
           args = M.ts_generate_args,
@@ -438,344 +413,153 @@ local function run_install(cache_folder, install_folder, lang, repo, with_sync,
   end
   vim.list_extend(command_list, {
     shell.select_compile_command(repo, cc, compile_location),
-    shell.select_mv_cmd("parser.so", parser_lib_name, compile_location),
     {
       cmd = function()
-        vim.fn.writefile({ revision or "" }, utils.join_path(configs.get_parser_info_dir() or "", lang .. ".revision"))
+        uv.fs_copyfile(utils.join_path(compile_location, 'parser.so'), parser_lib_name)
       end,
     },
-    { -- auto-attach modules after installation
-      cmd = reattach_if_possible_fn(lang, true),
+    {
+      cmd = function()
+        local file = assert(
+          io.open(
+            utils.join_path(config.get_install_dir('parser-info') or '', lang .. '.revision'),
+            'w'
+          )
+        )
+        file:write(revision or '')
+        file:close()
+      end,
     },
   })
   if not from_local_path then
-    vim.list_extend(command_list, { shell.select_install_rm_cmd(cache_folder, project_name) })
+    vim.list_extend(command_list, {
+      {
+        cmd = function()
+          vim.fn.delete(utils.join_path(cache_dir, project_name), 'rf')
+        end,
+      },
+    })
   end
 
   if with_sync then
     if iter_cmd_sync(command_list) == true then
-      print("Treesitter parser for " .. lang .. " has been installed")
+      vim.notify('Parser for ' .. lang .. ' has been installed')
     end
   else
-    M.iter_cmd(command_list, 1, lang, "Treesitter parser for " .. lang .. " has been installed")
+    iter_cmd(command_list, 1, lang, 'Parser for ' .. lang .. ' has been installed')
   end
 end
 
----@param lang string
----@param ask_reinstall boolean|string
----@param cache_folder string
----@param install_folder string
----@param with_sync boolean
----@param generate_from_grammar boolean
-local function install_lang(lang, ask_reinstall, cache_folder, install_folder, with_sync, generate_from_grammar)
-  if is_installed(lang) and ask_reinstall ~= "force" then
-    if not ask_reinstall then
-      return
-    end
-
-    local yesno = fn.input(lang .. " parser already available: would you like to reinstall ? y/n: ")
-    print "\n "
-    if not string.match(yesno, "^y.*") then
-      return
-    end
-  end
-
-  local ok, install_info = pcall(get_parser_install_info, lang, true)
-  if not ok then
-    vim.notify("Installation not possible: " .. install_info, vim.log.levels.ERROR)
-    if not parsers.get_parser_configs()[lang] then
-      vim.notify(
-        "See https://github.com/nvim-treesitter/nvim-treesitter/#adding-parsers on how to add a new parser!",
-        vim.log.levels.INFO
-      )
-    end
-    return
-  end
-
-  run_install(cache_folder, install_folder, lang, install_info, with_sync, generate_from_grammar)
-end
-
 ---@class InstallOptions
 ---@field with_sync boolean
----@field ask_reinstall boolean|string
+---@field force boolean
 ---@field generate_from_grammar boolean
----@field exclude_configured_parsers boolean
+---@field skip table
 
 -- Install a parser
+---@param languages? string[]|string
 ---@param options? InstallOptions
----@return function
-local function install(options)
+function M.install(languages, options)
   options = options or {}
   local with_sync = options.with_sync
-  local ask_reinstall = options.ask_reinstall
+  local force = options.force
   local generate_from_grammar = options.generate_from_grammar
-  local exclude_configured_parsers = options.exclude_configured_parsers
+  local skip = options.skip
 
-  return function(...)
-    if fn.executable "git" == 0 then
-      return api.nvim_err_writeln "Git is required on your system to run this command"
-    end
+  reset_progress_counter()
 
-    local cache_folder, err = utils.get_cache_dir()
-    if err then
-      return api.nvim_err_writeln(err)
-    end
-    assert(cache_folder)
+  if vim.fn.executable('git') == 0 then
+    api.nvim_err_writeln('Git is required on your system to run this command')
+    return
+  end
 
-    local install_folder
-    install_folder, err = configs.get_parser_install_dir()
-    if err then
-      return api.nvim_err_writeln(err)
-    end
-    install_folder = install_folder and clean_path(install_folder)
-    assert(install_folder)
+  local cache_dir = vim.fn.stdpath('cache')
+  local install_dir = config.get_install_dir('parser')
 
-    local languages ---@type string[]
-    local ask ---@type boolean|string
-    if ... == "all" then
-      languages = parsers.available_parsers()
-      ask = false
-    else
-      languages = compat.flatten { ... }
-      ask = ask_reinstall
-    end
+  if languages == 'all' then
+    force = true
+  end
 
-    if exclude_configured_parsers then
-      languages = utils.difference(languages, configs.get_ignored_parser_installs())
-    end
+  languages = config.norm_languages(languages, skip)
 
-    if #languages > 1 then
-      reset_progress_counter()
-    end
-
-    for _, lang in ipairs(languages) do
-      install_lang(lang, ask, cache_folder, install_folder, with_sync, generate_from_grammar)
-    end
+  for _, lang in ipairs(languages) do
+    install_lang(lang, cache_dir, install_dir, force, with_sync, generate_from_grammar)
+    uv.fs_symlink(
+      utils.get_package_path('runtime', 'queries', lang),
+      utils.join_path(config.get_install_dir('queries'), lang),
+      { dir = true, junction = true } -- needed on Windows (non-junction links require admin)
+    )
   end
 end
 
-function M.setup_auto_install()
-  local function try_install_curr_lang()
-    local lang = parsers.get_buf_lang()
-    if parsers.get_parser_configs()[lang] and not is_installed(lang) and not is_ignored_parser(lang) then
-      install() { lang }
-    end
-  end
+---@class UpdateOptions
+---@field with_sync boolean
 
-  try_install_curr_lang()
-
-  vim.api.nvim_create_autocmd("FileType", {
-    pattern = { "*" },
-    group = vim.api.nvim_create_augroup("NvimTreesitter-auto_install", { clear = true }),
-    callback = try_install_curr_lang,
-  })
-end
-
-function M.update(options)
+---@param languages? string[]|string
+---@param options? UpdateOptions
+function M.update(languages, options)
   options = options or {}
-  return function(...)
-    M.lockfile = {}
-    reset_progress_counter()
-    if ... and ... ~= "all" then
-      ---@type string[]
-      local languages = compat.flatten { ... }
-      local installed = 0
-      for _, lang in ipairs(languages) do
-        if (not is_installed(lang)) or (needs_update(lang)) then
-          installed = installed + 1
-          install {
-            ask_reinstall = "force",
-            with_sync = options.with_sync,
-          }(lang)
-        end
-      end
-      if installed == 0 then
-        utils.notify "Parsers are up-to-date!"
-      end
+
+  reset_progress_counter()
+  M.lockfile = {}
+
+  languages = config.norm_languages(languages or 'all', { ignored = true, missing = true })
+  languages = vim.iter.filter(needs_update, languages) --- @type string[]
+
+  if #languages > 0 then
+    M.install(languages, {
+      force = true,
+      with_sync = options.with_sync,
+    })
+  else
+    vim.notify('All parsers are up-to-date')
+  end
+end
+
+--- @param lang string
+--- @param parser string
+--- @param queries string
+local function uninstall(lang, parser, queries)
+  if vim.fn.filereadable(parser) ~= 1 then
+    return
+  end
+
+  iter_cmd({
+    {
+      cmd = function()
+        uv.fs_unlink(parser)
+      end,
+    },
+    {
+      cmd = function()
+        uv.fs_unlink(queries)
+      end,
+    },
+  }, 1, lang, 'Parser for ' .. lang .. ' has been uninstalled')
+end
+
+--- @param languages string[]|string
+function M.uninstall(languages)
+  reset_progress_counter()
+
+  languages = config.norm_languages(languages or 'all', { missing = true })
+
+  local parser_dir = config.get_install_dir('parser')
+  local query_dir = config.get_install_dir('queries')
+  local installed = config.installed_parsers()
+
+  for _, lang in ipairs(languages) do
+    if not vim.list_contains(installed, lang) then
+      vim.notify(
+        'Parser for ' .. lang .. ' is is not managed by nvim-treesitter',
+        vim.log.levels.ERROR
+      )
     else
-      local parsers_to_update = outdated_parsers() or info.installed_parsers()
-      if #parsers_to_update == 0 then
-        utils.notify "All parsers are up-to-date!"
-      end
-      for _, lang in pairs(parsers_to_update) do
-        install {
-          ask_reinstall = "force",
-          exclude_configured_parsers = true,
-          with_sync = options.with_sync,
-        }(lang)
-      end
+      local parser = utils.join_path(parser_dir, lang) .. '.so'
+      local queries = utils.join_path(query_dir, lang)
+      uninstall(lang, parser, queries)
     end
   end
 end
 
-function M.uninstall(...)
-  if vim.tbl_contains({ "all" }, ...) then
-    reset_progress_counter()
-    local installed = info.installed_parsers()
-    M.uninstall(installed)
-  elseif ... then
-    local ensure_installed_parsers = configs.get_ensure_installed_parsers()
-    if ensure_installed_parsers == "all" then
-      ensure_installed_parsers = parsers.available_parsers()
-    end
-    ensure_installed_parsers = utils.difference(ensure_installed_parsers, configs.get_ignored_parser_installs())
-
-    ---@type string[]
-    local languages = compat.flatten { ... }
-    for _, lang in ipairs(languages) do
-      local install_dir, err = configs.get_parser_install_dir()
-      if err then
-        return api.nvim_err_writeln(err)
-      end
-      install_dir = install_dir and clean_path(install_dir)
-
-      if vim.tbl_contains(ensure_installed_parsers, lang) then
-        vim.notify(
-          "Uninstalling "
-            .. lang
-            .. '. But the parser is still configured in "ensure_installed" setting of nvim-treesitter.'
-            .. " Please consider updating your config!",
-          vim.log.levels.ERROR
-        )
-      end
-
-      local parser_lib = utils.join_path(install_dir, lang) .. ".so"
-      local all_parsers = vim.api.nvim_get_runtime_file("parser/" .. lang .. ".so", true)
-      if vim.fn.filereadable(parser_lib) == 1 then
-        local command_list = {
-          shell.select_rm_file_cmd(parser_lib, "Uninstalling parser for " .. lang),
-          {
-            cmd = function()
-              local all_parsers_after_deletion = vim.api.nvim_get_runtime_file("parser/" .. lang .. ".so", true)
-              if #all_parsers_after_deletion > 0 then
-                vim.notify(
-                  "Tried to uninstall parser for "
-                    .. lang
-                    .. "! But the parser is still installed (not by nvim-treesitter):"
-                    .. table.concat(all_parsers_after_deletion, ", "),
-                  vim.log.levels.ERROR
-                )
-              end
-            end,
-          },
-          { -- auto-reattach or detach modules after uninstallation
-            cmd = reattach_if_possible_fn(lang, false),
-          },
-        }
-        M.iter_cmd(command_list, 1, lang, "Treesitter parser for " .. lang .. " has been uninstalled")
-      elseif #all_parsers > 0 then
-        vim.notify(
-          "Parser for "
-            .. lang
-            .. " is installed! But not by nvim-treesitter! Please manually remove the following files: "
-            .. table.concat(all_parsers, ", "),
-          vim.log.levels.ERROR
-        )
-      end
-    end
-  end
-end
-
-function M.write_lockfile(verbose, skip_langs)
-  local sorted_parsers = {} ---@type Parser[]
-  -- Load previous lockfile
-  load_lockfile()
-  skip_langs = skip_langs or {}
-
-  for k, v in pairs(parsers.get_parser_configs()) do
-    table.insert(sorted_parsers, { name = k, parser = v })
-  end
-
-  ---@param a Parser
-  ---@param b Parser
-  table.sort(sorted_parsers, function(a, b)
-    return a.name < b.name
-  end)
-
-  for _, v in ipairs(sorted_parsers) do
-    if not vim.tbl_contains(skip_langs, v.name) then
-      -- I'm sure this can be done in aync way with iter_cmd
-      local sha ---@type string
-      if v.parser.install_info.branch then
-        sha = vim.split(
-          vim.fn.systemlist(
-            "git ls-remote " .. v.parser.install_info.url .. " | grep refs/heads/" .. v.parser.install_info.branch
-          )[1],
-          "\t"
-        )[1]
-      else
-        sha = vim.split(vim.fn.systemlist("git ls-remote " .. v.parser.install_info.url)[1], "\t")[1]
-      end
-      lockfile[v.name] = { revision = sha }
-      if verbose then
-        print(v.name .. ": " .. sha)
-      end
-    else
-      print("Skipping " .. v.name)
-    end
-  end
-
-  if verbose then
-    print(vim.inspect(lockfile))
-  end
-  vim.fn.writefile(
-    vim.fn.split(vim.fn.json_encode(lockfile), "\n"),
-    utils.join_path(utils.get_package_path(), "lockfile.json")
-  )
-end
-
-M.ensure_installed = install { exclude_configured_parsers = true }
-M.ensure_installed_sync = install { with_sync = true, exclude_configured_parsers = true }
-
-M.commands = {
-  TSInstall = {
-    run = install { ask_reinstall = true },
-    ["run!"] = install { ask_reinstall = "force" },
-    args = {
-      "-nargs=+",
-      "-bang",
-      "-complete=custom,nvim_treesitter#installable_parsers",
-    },
-  },
-  TSInstallFromGrammar = {
-    run = install { generate_from_grammar = true, ask_reinstall = true },
-    ["run!"] = install { generate_from_grammar = true, ask_reinstall = "force" },
-    args = {
-      "-nargs=+",
-      "-bang",
-      "-complete=custom,nvim_treesitter#installable_parsers",
-    },
-  },
-  TSInstallSync = {
-    run = install { with_sync = true, ask_reinstall = true },
-    ["run!"] = install { with_sync = true, ask_reinstall = "force" },
-    args = {
-      "-nargs=+",
-      "-bang",
-      "-complete=custom,nvim_treesitter#installable_parsers",
-    },
-  },
-  TSUpdate = {
-    run = M.update {},
-    args = {
-      "-nargs=*",
-      "-complete=custom,nvim_treesitter#installed_parsers",
-    },
-  },
-  TSUpdateSync = {
-    run = M.update { with_sync = true },
-    args = {
-      "-nargs=*",
-      "-complete=custom,nvim_treesitter#installed_parsers",
-    },
-  },
-  TSUninstall = {
-    run = M.uninstall,
-    args = {
-      "-nargs=+",
-      "-complete=custom,nvim_treesitter#installed_parsers",
-    },
-  },
-}
-
 return M
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index fed835bbd..fa8496469 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -1,29 +1,46 @@
 -- Functions to handle locals
 -- Locals are a generalization of definition and scopes
--- its the way nvim-treesitter uses to "understand" the code
+-- it's the way nvim-treesitter uses to "understand" the code
 
-local queries = require "nvim-treesitter.query"
-local ts_utils = require "nvim-treesitter.ts_utils"
-local ts = vim.treesitter
+local query = require('nvim-treesitter.query')
 local api = vim.api
+local ts = vim.treesitter
 
 local M = {}
 
-function M.collect_locals(bufnr)
-  return queries.collect_group_results(bufnr, "locals")
+local function get_named_children(node)
+  local nodes = {} ---@type TSNode[]
+  for i = 0, node:named_child_count() - 1, 1 do
+    nodes[i + 1] = node:named_child(i)
+  end
+  return nodes
+end
+
+---@param node TSNode
+---@return TSNode result
+local function get_root_for_node(node)
+  local parent = node
+  local result = node
+
+  while parent ~= nil do
+    result = parent
+    parent = result:parent()
+  end
+
+  return result
 end
 
 -- Iterates matches from a locals query file.
 -- @param bufnr the buffer
 -- @param root the root node
 function M.iter_locals(bufnr, root)
-  return queries.iter_group_results(bufnr, "locals", root)
+  return query.iter_group_results(bufnr, 'locals', root)
 end
 
 ---@param bufnr integer
 ---@return any
-function M.get_locals(bufnr)
-  return queries.get_matches(bufnr, "locals")
+function M.collect_locals(bufnr)
+  return query.collect_group_results(bufnr, 'locals')
 end
 
 -- Creates unique id for a node based on text and range
@@ -32,17 +49,17 @@ end
 ---@return string: a string id
 function M.get_definition_id(scope, node_text)
   -- Add a valid starting character in case node text doesn't start with a valid one.
-  return table.concat({ "k", node_text or "", scope:range() }, "_")
+  return table.concat({ 'k', node_text or '', scope:range() }, '_')
 end
 
 function M.get_definitions(bufnr)
-  local locals = M.get_locals(bufnr)
+  local locals = M.collect_locals(bufnr)
 
   local defs = {}
 
   for _, loc in ipairs(locals) do
-    if loc["local"]["definition"] then
-      table.insert(defs, loc["local"]["definition"])
+    if loc['local.definition'] then
+      table.insert(defs, loc['local.definition'])
     end
   end
 
@@ -50,13 +67,13 @@ function M.get_definitions(bufnr)
 end
 
 function M.get_scopes(bufnr)
-  local locals = M.get_locals(bufnr)
+  local locals = M.collect_locals(bufnr)
 
   local scopes = {}
 
   for _, loc in ipairs(locals) do
-    if loc["local"]["scope"] and loc["local"]["scope"].node then
-      table.insert(scopes, loc["local"]["scope"].node)
+    if loc['local.scope'] and loc['local.scope'].node then
+      table.insert(scopes, loc['local.scope'].node)
     end
   end
 
@@ -64,13 +81,13 @@ function M.get_scopes(bufnr)
 end
 
 function M.get_references(bufnr)
-  local locals = M.get_locals(bufnr)
+  local locals = M.collect_locals(bufnr)
 
   local refs = {}
 
   for _, loc in ipairs(locals) do
-    if loc["local"]["reference"] and loc["local"]["reference"].node then
-      table.insert(refs, loc["local"]["reference"].node)
+    if loc['local.reference'] and loc['local.reference'].node then
+      table.insert(refs, loc['local.reference'].node)
     end
   end
 
@@ -103,7 +120,7 @@ function M.iter_scope_tree(node, bufnr)
       return
     end
 
-    local scope = M.containing_scope(last_node, bufnr, false) or ts_utils.get_root_for_node(node)
+    local scope = M.containing_scope(last_node, bufnr, false) or get_root_for_node(node)
 
     last_node = scope:parent()
 
@@ -117,8 +134,8 @@ end
 function M.get_local_nodes(local_def)
   local result = {}
 
-  M.recurse_local_nodes(local_def, function(def, _node, kind)
-    table.insert(result, vim.tbl_extend("keep", { kind = kind }, def))
+  M.recurse_local_nodes(local_def, function(def, _, kind)
+    table.insert(result, vim.tbl_extend('keep', { kind = kind }, def))
   end)
 
   return result
@@ -135,7 +152,7 @@ end
 ---@param full_match? string The full match path to append to
 ---@param last_match? string The last match
 function M.recurse_local_nodes(local_def, accumulator, full_match, last_match)
-  if type(local_def) ~= "table" then
+  if type(local_def) ~= 'table' then
     return
   end
 
@@ -143,11 +160,36 @@ function M.recurse_local_nodes(local_def, accumulator, full_match, last_match)
     accumulator(local_def, local_def.node, full_match, last_match)
   else
     for match_key, def in pairs(local_def) do
-      M.recurse_local_nodes(def, accumulator, full_match and (full_match .. "." .. match_key) or match_key, match_key)
+      M.recurse_local_nodes(
+        def,
+        accumulator,
+        full_match and (full_match .. '.' .. match_key) or match_key,
+        match_key
+      )
     end
   end
 end
 
+---Memoize a function using hash_fn to hash the arguments.
+---@generic F: function
+---@param fn F
+---@param hash_fn fun(...): any
+---@return F
+local function memoize(fn, hash_fn)
+  local cache = setmetatable({}, { __mode = 'kv' }) ---@type table<any,any>
+
+  return function(...)
+    local key = hash_fn(...)
+    if cache[key] == nil then
+      local v = fn(...) ---@type any
+      cache[key] = v ~= nil and v or vim.NIL
+    end
+
+    local v = cache[key]
+    return v ~= vim.NIL and v or nil
+  end
+end
+
 -- Get a single dimension table to look definition nodes.
 -- Keys are generated by using the range of the containing scope and the text of the definition node.
 -- This makes looking up a definition for a given scope a simple key lookup.
@@ -161,7 +203,7 @@ end
 --
 ---@param bufnr integer: the buffer
 ---@return table result: a table for looking up definitions
-M.get_definitions_lookup_table = ts_utils.memoize_by_buf_tick(function(bufnr)
+M.get_definitions_lookup_table = memoize(function(bufnr)
   local definitions = M.get_definitions(bufnr)
   local result = {}
 
@@ -178,6 +220,8 @@ M.get_definitions_lookup_table = ts_utils.memoize_by_buf_tick(function(bufnr)
   end
 
   return result
+end, function(bufnr)
+  return tostring(bufnr)
 end)
 
 -- Gets all the scopes of a definition based on the scope type
@@ -196,10 +240,10 @@ function M.get_definition_scopes(node, bufnr, scope_type)
 
   -- Definition is valid for the containing scope
   -- and the containing scope of that scope
-  if scope_type == "parent" then
+  if scope_type == 'parent' then
     scope_count = 2
     -- Definition is valid in all parent scopes
-  elseif scope_type == "global" then
+  elseif scope_type == 'global' then
     scope_count = nil
   end
 
@@ -235,7 +279,7 @@ function M.find_definition(node, bufnr)
     end
   end
 
-  return node, ts_utils.get_root_for_node(node), nil
+  return node, get_root_for_node(node), nil
 end
 
 -- Finds usages of a node in a given scope.
@@ -250,12 +294,15 @@ function M.find_usages(node, scope_node, bufnr)
     return {}
   end
 
-  local scope_node = scope_node or ts_utils.get_root_for_node(node)
+  scope_node = scope_node or get_root_for_node(node)
   local usages = {}
 
   for match in M.iter_locals(bufnr, scope_node) do
-    match = match["local"]
-    if match.reference and match.reference.node and ts.get_node_text(match.reference.node, bufnr) == node_text then
+    if
+      match.reference
+      and match.reference.node
+      and ts.get_node_text(match.reference.node, bufnr) == node_text
+    then
       local def_node, _, kind = M.find_definition(match.reference.node, bufnr)
 
       if kind == nil or def_node == node then
@@ -272,8 +319,8 @@ end
 ---@param allow_scope? boolean
 ---@return TSNode|nil
 function M.containing_scope(node, bufnr, allow_scope)
-  local bufnr = bufnr or api.nvim_get_current_buf()
-  local allow_scope = allow_scope == nil or allow_scope == true
+  bufnr = bufnr or api.nvim_get_current_buf()
+  allow_scope = allow_scope == nil or allow_scope == true
 
   local scopes = M.get_scopes(bufnr)
   if not node or not scopes then
@@ -301,7 +348,7 @@ function M.nested_scope(node, cursor_pos)
   local col = cursor_pos.col ---@type integer
   local scope = M.containing_scope(node)
 
-  for _, child in ipairs(ts_utils.get_named_children(scope)) do
+  for _, child in ipairs(get_named_children(scope)) do
     local row_, col_ = child:start()
     if vim.tbl_contains(scopes, child) and ((row_ + 1 == row and col_ > col) or row_ + 1 > row) then
       return child
@@ -318,6 +365,9 @@ function M.next_scope(node)
   end
 
   local scope = M.containing_scope(node)
+  if not scope then
+    return
+  end
 
   local parent = scope:parent()
   if not parent then
@@ -325,7 +375,7 @@ function M.next_scope(node)
   end
 
   local is_prev = true
-  for _, child in ipairs(ts_utils.get_named_children(parent)) do
+  for _, child in ipairs(get_named_children(parent)) do
     if child == scope then
       is_prev = false
     elseif not is_prev and vim.tbl_contains(scopes, child) then
@@ -345,6 +395,9 @@ function M.previous_scope(node)
   end
 
   local scope = M.containing_scope(node)
+  if not scope then
+    return
+  end
 
   local parent = scope:parent()
   if not parent then
@@ -352,7 +405,7 @@ function M.previous_scope(node)
   end
 
   local is_prev = true
-  local children = ts_utils.get_named_children(parent)
+  local children = get_named_children(parent)
   for i = #children, 1, -1 do
     if children[i] == scope then
       is_prev = false
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 31b691209..69e9500fe 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1,43 +1,3 @@
-local api = vim.api
-local ts = vim.treesitter
-
-for ft, lang in pairs {
-  automake = "make",
-  javascriptreact = "javascript",
-  ecma = "javascript",
-  jsx = "javascript",
-  gyp = "python",
-  html_tags = "html",
-  ["typescript.tsx"] = "tsx",
-  ["terraform-vars"] = "terraform",
-  ["html.handlebars"] = "glimmer",
-  systemverilog = "verilog",
-  dosini = "ini",
-  confini = "ini",
-  svg = "xml",
-  xsd = "xml",
-  xslt = "xml",
-  expect = "tcl",
-  mysql = "sql",
-  sbt = "scala",
-  neomuttrc = "muttrc",
-  clientscript = "runescript",
-  --- short-hand list from https://github.com/helix-editor/helix/blob/master/languages.toml
-  rs = "rust",
-  ex = "elixir",
-  js = "javascript",
-  ts = "typescript",
-  ["c-sharp"] = "csharp",
-  hs = "haskell",
-  py = "python",
-  erl = "erlang",
-  typ = "typst",
-  pl = "perl",
-  uxn = "uxntal",
-} do
-  ts.language.register(lang, ft)
-end
-
 ---@class InstallInfo
 ---@field url string
 ---@field branch string|nil
@@ -47,2798 +7,2830 @@ end
 ---@field requires_generate_from_grammar boolean|nil
 ---@field location string|nil
 ---@field use_makefile boolean|nil
----@field cxx_standard string|nil
 
 ---@class ParserInfo
 ---@field install_info InstallInfo
----@field filetype string
+---@field filetype string[]
 ---@field maintainers string[]
----@field experimental boolean|nil
----@field readme_name string|nil
+---@field tier integer|nil
+---@field readme_note string|nil
+
+local M = {}
+
+M.tiers = { 'core', 'stable', 'community', 'unstable' }
 
 ---@type ParserInfo[]
-local list = setmetatable({}, {
-  __newindex = function(table, parsername, parserconfig)
-    rawset(table, parsername, parserconfig)
-    if parserconfig.filetype or vim.fn.has "nvim-0.11" == 0 then
-      ts.language.register(parsername, parserconfig.filetype or parsername)
-    end
-  end,
-})
-
-list.ada = {
-  install_info = {
-    url = "https://github.com/briot/tree-sitter-ada",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@briot" },
-}
-
-list.agda = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-agda",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@Decodetalkers" },
-}
-
-list.angular = {
-  install_info = {
-    url = "https://github.com/dlvandenberg/tree-sitter-angular",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  filetype = "htmlangular",
-  maintainers = { "@dlvandenberg" },
-  experimental = true,
-}
-
-list.apex = {
-  install_info = {
-    url = "https://github.com/aheber/tree-sitter-sfapex",
-    files = { "src/parser.c" },
-    location = "apex",
-  },
-  maintainers = { "@aheber", "@xixiaofinland" },
-}
-
-list.arduino = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-arduino",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.asm = {
-  install_info = {
-    url = "https://github.com/RubixDev/tree-sitter-asm",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@RubixDev" },
-}
-
-list.astro = {
-  install_info = {
-    url = "https://github.com/virchau13/tree-sitter-astro",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@virchau13" },
-}
-
-list.authzed = {
-  install_info = {
-    url = "https://github.com/mleonidas/tree-sitter-authzed",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@mattpolzin" },
-}
-
-list.awk = {
-  install_info = {
-    url = "https://github.com/Beaglefoot/tree-sitter-awk",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-}
-
-list.bash = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-bash",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "sh",
-  maintainers = { "@TravonteD" },
-}
-
-list.bass = {
-  install_info = {
-    url = "https://github.com/vito/tree-sitter-bass",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.beancount = {
-  install_info = {
-    url = "https://github.com/polarmutex/tree-sitter-beancount",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@polarmutex" },
-}
-
-list.bibtex = {
-  install_info = {
-    url = "https://github.com/latex-lsp/tree-sitter-bibtex",
-    files = { "src/parser.c" },
-  },
-  filetype = "bib",
-  maintainers = { "@theHamsta", "@clason" },
-}
-
-list.bicep = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-bicep",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.bitbake = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-bitbake",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.blade = {
-  install_info = {
-    url = "https://github.com/EmranMR/tree-sitter-blade",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@calebdw" },
-}
-
-list.blueprint = {
-  install_info = {
-    url = "https://gitlab.com/gabmus/tree-sitter-blueprint.git",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@gabmus" },
-  experimental = true,
-}
-
-list.bp = {
-  install_info = {
-    url = "https://github.com/ambroisie/tree-sitter-bp",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ambroisie" },
-}
-
-list.brightscript = {
-  install_info = {
-    url = "https://github.com/ajdelcimmuto/tree-sitter-brightscript",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ajdelcimmuto" },
-}
-
-list.c = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-c",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.c_sharp = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-c-sharp",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "cs",
-  maintainers = { "@amaanq" },
-}
-
-list.caddy = {
-  install_info = {
-    url = "https://github.com/opa-oz/tree-sitter-caddy",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@opa-oz" },
-}
-
-list.cairo = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-cairo",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.capnp = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-capnp",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.chatito = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-chatito",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.circom = {
-  install_info = {
-    url = "https://github.com/Decurity/tree-sitter-circom",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@alexandr-martirosyan" },
-}
-
-list.clojure = {
-  install_info = {
-    url = "https://github.com/sogaiu/tree-sitter-clojure",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@NoahTheDuke" },
-}
-
-list.cmake = {
-  install_info = {
-    url = "https://github.com/uyha/tree-sitter-cmake",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@uyha" },
-}
-
-list.comment = {
-  install_info = {
-    url = "https://github.com/stsewd/tree-sitter-comment",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@stsewd" },
-}
-
-list.commonlisp = {
-  install_info = {
-    url = "https://github.com/theHamsta/tree-sitter-commonlisp",
-    files = { "src/parser.c" },
-    generate_requires_npm = true,
-  },
-  filetype = "lisp",
-  maintainers = { "@theHamsta" },
-}
-
-list.cooklang = {
-  install_info = {
-    url = "https://github.com/addcninblue/tree-sitter-cooklang",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@addcninblue" },
-  filetype = "cook",
-}
-
-list.corn = {
-  install_info = {
-    url = "https://github.com/jakestanger/tree-sitter-corn",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@jakestanger" },
-}
-
-list.cpon = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-cpon",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.cpp = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-cpp",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@theHamsta" },
-}
-
-list.css = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-css",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@TravonteD" },
-}
-
-list.csv = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-csv",
-    files = { "src/parser.c" },
-    location = "csv",
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.cuda = {
-  install_info = {
-    url = "https://github.com/theHamsta/tree-sitter-cuda",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@theHamsta" },
-}
-
-list.cue = {
-  install_info = {
-    url = "https://github.com/eonpatapon/tree-sitter-cue",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.cylc = {
-  install_info = {
-    url = "https://github.com/elliotfontaine/tree-sitter-cylc",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@elliotfontaine" },
-}
-
-list.d = {
-  install_info = {
-    url = "https://github.com/gdamore/tree-sitter-d",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.dart = {
-  install_info = {
-    url = "https://github.com/UserNobody14/tree-sitter-dart",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@akinsho" },
-}
-
-list.desktop = {
-  install_info = {
-    url = "https://github.com/ValdezFOmar/tree-sitter-desktop",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ValdezFOmar" },
-}
-
-list.devicetree = {
-  install_info = {
-    url = "https://github.com/joelspadin/tree-sitter-devicetree",
-    files = { "src/parser.c" },
-  },
-  filetype = "dts",
-  maintainers = { "@jedrzejboczar" },
-}
-
-list.dhall = {
-  install_info = {
-    url = "https://github.com/jbellerb/tree-sitter-dhall",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.diff = {
-  install_info = {
-    url = "https://github.com/the-mikedavis/tree-sitter-diff",
-    files = { "src/parser.c" },
-  },
-  filetype = "gitdiff",
-  maintainers = { "@gbprod" },
-}
-
-list.disassembly = {
-  install_info = {
-    url = "https://github.com/ColinKennedy/tree-sitter-disassembly",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@ColinKennedy" },
-}
-
-list.djot = {
-  install_info = {
-    url = "https://github.com/treeman/tree-sitter-djot",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@NoahTheDuke" },
-}
-
-list.dockerfile = {
-  install_info = {
-    url = "https://github.com/camdencheek/tree-sitter-dockerfile",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@camdencheek" },
-}
-
-list.dot = {
-  install_info = {
-    url = "https://github.com/rydesun/tree-sitter-dot",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@rydesun" },
-}
-
-list.doxygen = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-doxygen",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.dtd = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-xml",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "dtd",
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.earthfile = {
-  install_info = {
-    url = "https://github.com/glehmann/tree-sitter-earthfile",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@glehmann" },
-}
-
-list.ebnf = {
-  install_info = {
-    url = "https://github.com/RubixDev/ebnf",
-    files = { "src/parser.c" },
-    location = "crates/tree-sitter-ebnf",
-  },
-  maintainers = { "@RubixDev" },
-  experimental = true,
-}
-
-list.editorconfig = {
-  install_info = {
-    url = "https://github.com/ValdezFOmar/tree-sitter-editorconfig",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@ValdezFOmar" },
-}
-
-list.eds = {
-  install_info = {
-    url = "https://github.com/uyha/tree-sitter-eds",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@uyha" },
-}
-
-list.eex = {
-  install_info = {
-    url = "https://github.com/connorlay/tree-sitter-eex",
-    files = { "src/parser.c" },
-  },
-  filetype = "eelixir",
-  maintainers = { "@connorlay" },
-}
-
-list.elixir = {
-  install_info = {
-    url = "https://github.com/elixir-lang/tree-sitter-elixir",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@connorlay" },
-}
-
-list.elm = {
-  install_info = {
-    url = "https://github.com/elm-tooling/tree-sitter-elm",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@zweimach" },
-}
-
-list.elsa = {
-  install_info = {
-    url = "https://github.com/glapa-grossklag/tree-sitter-elsa",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@glapa-grossklag", "@amaanq" },
-}
-
-list.elvish = {
-  install_info = {
-    url = "https://github.com/elves/tree-sitter-elvish",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@elves" },
-}
-
-list.embedded_template = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-embedded-template",
-    files = { "src/parser.c" },
-  },
-  filetype = "eruby",
-}
-
-list.enforce = {
-  install_info = {
-    url = "https://github.com/simonvic/tree-sitter-enforce",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@simonvic" },
-}
-
-list.erlang = {
-  install_info = {
-    url = "https://github.com/WhatsApp/tree-sitter-erlang",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@filmor" },
-}
-
-list.facility = {
-  install_info = {
-    url = "https://github.com/FacilityApi/tree-sitter-facility",
-    files = { "src/parser.c" },
-  },
-  filetype = "fsd",
-  maintainers = { "@bryankenote" },
-}
-
-list.faust = {
-  install_info = {
-    url = "https://github.com/khiner/tree-sitter-faust",
-    files = { "src/parser.c" },
-  },
-  filetype = "dsp",
-  maintainers = { "@khiner" },
-}
-
-list.fennel = {
-  install_info = {
-    url = "https://github.com/alexmozaidze/tree-sitter-fennel",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@alexmozaidze" },
-}
-
-list.fidl = {
-  install_info = {
-    url = "https://github.com/google/tree-sitter-fidl",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@chaopeng" },
-}
-
-list.firrtl = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-firrtl",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.fish = {
-  install_info = {
-    url = "https://github.com/ram02z/tree-sitter-fish",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@ram02z" },
-}
-
-list.foam = {
-  install_info = {
-    url = "https://github.com/FoamScience/tree-sitter-foam",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@FoamScience" },
-  -- Queries might change over time on the grammar's side
-  -- Otherwise everything runs fine
-  experimental = true,
-}
-
-list.forth = {
-  install_info = {
-    url = "https://github.com/AlexanderBrevig/tree-sitter-forth",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.fortran = {
-  install_info = {
-    url = "https://github.com/stadelmanma/tree-sitter-fortran",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.fsh = {
-  install_info = {
-    url = "https://github.com/mgramigna/tree-sitter-fsh",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@mgramigna" },
-}
-
-list.fsharp = {
-  install_info = {
-    url = "https://github.com/ionide/tree-sitter-fsharp",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "fsharp",
-  },
-  maintainers = { "@nsidorenco" },
-}
-
-list.func = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-func",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.fusion = {
-  install_info = {
-    url = "https://gitlab.com/jirgn/tree-sitter-fusion.git",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@jirgn" },
-}
-
-list.gap = {
-  install_info = {
-    url = "https://github.com/gap-system/tree-sitter-gap",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@reiniscirpons" },
-  readme_name = "GAP system",
-}
-
-list.gaptst = {
-  install_info = {
-    url = "https://github.com/gap-system/tree-sitter-gaptst",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@reiniscirpons" },
-  readme_name = "GAP system test files",
-}
-
-list.gdscript = {
-  install_info = {
-    url = "https://github.com/PrestonKnopp/tree-sitter-gdscript",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@PrestonKnopp" },
-  readme_name = "Godot (gdscript)",
-}
-
-list.gdshader = {
-  install_info = {
-    url = "https://github.com/GodOfAvacyn/tree-sitter-gdshader",
-    files = { "src/parser.c" },
-  },
-  filetype = "gdshaderinc",
-  maintainers = { "@godofavacyn" },
-}
-
-list.git_rebase = {
-  install_info = {
-    url = "https://github.com/the-mikedavis/tree-sitter-git-rebase",
-    files = { "src/parser.c" },
-  },
-  filetype = "gitrebase",
-  maintainers = { "@gbprod" },
-}
-
-list.gitattributes = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-gitattributes",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.gitcommit = {
-  install_info = {
-    url = "https://github.com/gbprod/tree-sitter-gitcommit",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@gbprod" },
-}
-
-list.git_config = {
-  install_info = {
-    url = "https://github.com/the-mikedavis/tree-sitter-git-config",
-    files = { "src/parser.c" },
-  },
-  filetype = "gitconfig",
-  maintainers = { "@amaanq" },
-  readme_name = "git_config",
-}
-
-list.gitignore = {
-  install_info = {
-    url = "https://github.com/shunsambongi/tree-sitter-gitignore",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@theHamsta" },
-}
-
-list.gleam = {
-  install_info = {
-    url = "https://github.com/gleam-lang/tree-sitter-gleam",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.glimmer = {
-  install_info = {
-    url = "https://github.com/ember-tooling/tree-sitter-glimmer",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "handlebars",
-  maintainers = { "@NullVoxPopuli" },
-  readme_name = "Glimmer and Ember",
-}
-
-list.glimmer_javascript = {
-  install_info = {
-    url = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  filetype = "javascript.glimmer",
-  maintainers = { "@NullVoxPopuli" },
-}
-
-list.glimmer_typescript = {
-  install_info = {
-    url = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  filetype = "typescript.glimmer",
-  maintainers = { "@NullVoxPopuli" },
-}
-
-list.glsl = {
-  install_info = {
-    url = "https://github.com/theHamsta/tree-sitter-glsl",
-    files = { "src/parser.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@theHamsta" },
-}
-
-list.gn = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-gn",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-  readme_name = "GN (Generate Ninja)",
-}
-
-list.gnuplot = {
-  install_info = {
-    url = "https://github.com/dpezto/tree-sitter-gnuplot",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@dpezto" },
-}
-
-list.go = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-go",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@theHamsta", "@WinWisely268" },
-}
-
-list.goctl = {
-  install_info = {
-    url = "https://github.com/chaozwn/tree-sitter-goctl",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@chaozwn" },
-}
-
-list.godot_resource = {
-  install_info = {
-    url = "https://github.com/PrestonKnopp/tree-sitter-godot-resource",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "gdresource",
-  maintainers = { "@pierpo" },
-  readme_name = "Godot Resources (gdresource)",
-}
-
-list.gomod = {
-  install_info = {
-    url = "https://github.com/camdencheek/tree-sitter-go-mod",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@camdencheek" },
-}
-
-list.gosum = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-go-sum",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.gowork = {
-  install_info = {
-    url = "https://github.com/omertuc/tree-sitter-go-work",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@omertuc" },
-}
-
-list.gotmpl = {
-  install_info = {
-    url = "https://github.com/ngalaiko/tree-sitter-go-template",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@qvalentin" },
-}
-
-list.gpg = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-gpg-config",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.gren = {
-  install_info = {
-    files = { "src/parser.c", "src/scanner.c" },
-    url = "https://github.com/MaeBrooks/tree-sitter-gren",
-  },
-  maintainers = { "@MaeBrooks" },
-}
-
-list.groovy = {
-  install_info = {
-    url = "https://github.com/murtaza64/tree-sitter-groovy",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@murtaza64" },
-}
-
-list.graphql = {
-  install_info = {
-    url = "https://github.com/bkegley/tree-sitter-graphql",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@bkegley" },
-}
-
-list.gstlaunch = {
-  install_info = {
-    url = "https://github.com/theHamsta/tree-sitter-gstlaunch",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@theHamsta" },
-}
-
-list.hack = {
-  install_info = {
-    url = "https://github.com/slackhq/tree-sitter-hack",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-}
-
-list.hare = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-hare",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.haskell = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-haskell",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@mrcjkb" },
-}
-
-list.haskell_persistent = {
-  install_info = {
-    url = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "haskellpersistent",
-  maintainers = { "@lykahb" },
-}
-
-list.hcl = {
-  install_info = {
-    url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@MichaHoffmann" },
-}
-
-list.heex = {
-  install_info = {
-    url = "https://github.com/connorlay/tree-sitter-heex",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@connorlay" },
-}
-
-list.helm = {
-  install_info = {
-    url = "https://github.com/ngalaiko/tree-sitter-go-template",
-    location = "dialects/helm",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@qvalentin" },
-}
-
-list.hjson = {
-  install_info = {
-    url = "https://github.com/winston0410/tree-sitter-hjson",
-    files = { "src/parser.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@winston0410" },
-}
-
-list.hlsl = {
-  install_info = {
-    url = "https://github.com/theHamsta/tree-sitter-hlsl",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@theHamsta" },
-}
-
-list.hocon = {
-  install_info = {
-    url = "https://github.com/antosha417/tree-sitter-hocon",
-    files = { "src/parser.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@antosha417" },
-}
-
-list.hoon = {
-  install_info = {
-    url = "https://github.com/urbit-pilled/tree-sitter-hoon",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@urbit-pilled" },
-  experimental = true,
-}
-
-list.html = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-html",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@TravonteD" },
-}
-
-list.htmldjango = {
-  install_info = {
-    url = "https://github.com/interdependence/tree-sitter-htmldjango",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-  experimental = true,
-}
-
-list.http = {
-  install_info = {
-    url = "https://github.com/rest-nvim/tree-sitter-http",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq", "@NTBBloodbath" },
-}
-
-list.hurl = {
-  install_info = {
-    url = "https://github.com/pfeiferj/tree-sitter-hurl",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@pfeiferj" },
-}
-
-list.hyprlang = {
-  install_info = {
-    url = "https://github.com/luckasRanarison/tree-sitter-hyprlang",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@luckasRanarison" },
-}
-
-list.idl = {
-  install_info = {
-    url = "https://github.com/cathaysia/tree-sitter-idl",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@cathaysia" },
-}
-
-list.idris = {
-  install_info = {
-    url = "https://github.com/kayhide/tree-sitter-idris",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "idris2",
-  maintainers = { "@srghma" },
-}
-
-list.ini = {
-  install_info = {
-    url = "https://github.com/justinmk/tree-sitter-ini",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@theHamsta" },
-  experimental = true,
-}
-
-list.inko = {
-  install_info = {
-    url = "https://github.com/inko-lang/tree-sitter-inko",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@yorickpeterse" },
-}
-
-list.ipkg = {
-  install_info = {
-    url = "https://github.com/srghma/tree-sitter-ipkg",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@srghma" },
-}
-
-list.ispc = {
-  install_info = {
-    url = "https://github.com/fab4100/tree-sitter-ispc",
-    files = { "src/parser.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@fab4100" },
-}
-
-list.janet_simple = {
-  install_info = {
-    url = "https://github.com/sogaiu/tree-sitter-janet-simple",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "janet",
-  maintainers = { "@sogaiu" },
-}
-
-list.java = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-java",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@p00f" },
-}
-
-list.javadoc = {
-  install_info = {
-    url = "https://github.com/rmuir/tree-sitter-javadoc",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@rmuir" },
-}
-
-list.javascript = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-javascript",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@steelsojka" },
-}
-
-list.jinja = {
-  install_info = {
-    url = "https://github.com/cathaysia/tree-sitter-jinja",
-    location = "tree-sitter-jinja",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@cathaysia" },
-}
-
-list.jinja_inline = {
-  install_info = {
-    url = "https://github.com/cathaysia/tree-sitter-jinja",
-    location = "tree-sitter-jinja_inline",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@cathaysia" },
-}
-
-list.jq = {
-  install_info = {
-    url = "https://github.com/flurie/tree-sitter-jq",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.jsdoc = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-jsdoc",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@steelsojka" },
-}
-
-list.json = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-json",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@steelsojka" },
-}
-
-list.json5 = {
-  install_info = {
-    url = "https://github.com/Joakker/tree-sitter-json5",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Joakker" },
-}
-
-list.jsonc = {
-  install_info = {
-    url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git",
-    files = { "src/parser.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@WhyNotHugo" },
-  readme_name = "JSON with comments",
-}
-
-list.jsonnet = {
-  install_info = {
-    url = "https://github.com/sourcegraph/tree-sitter-jsonnet",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@nawordar" },
-}
-
-list.julia = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-julia",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@fredrikekre" },
-}
-
-list.just = {
-  install_info = {
-    url = "https://github.com/IndianBoy42/tree-sitter-just",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@Hubro" },
-}
-
-list.kcl = {
-  install_info = {
-    url = "https://github.com/kcl-lang/tree-sitter-kcl",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@bertbaron" },
-}
-
-list.kconfig = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-kconfig",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.kdl = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-kdl",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.kotlin = {
-  install_info = {
-    url = "https://github.com/fwcd/tree-sitter-kotlin",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@SalBakraa" },
-}
-
-list.koto = {
-  install_info = {
-    url = "https://github.com/koto-lang/tree-sitter-koto",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@irh" },
-}
-
-list.kusto = {
-  install_info = {
-    url = "https://github.com/Willem-J-an/tree-sitter-kusto",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Willem-J-an" },
-}
-
-list.lalrpop = {
-  install_info = {
-    url = "https://github.com/traxys/tree-sitter-lalrpop",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@traxys" },
-}
-
-list.latex = {
-  install_info = {
-    url = "https://github.com/latex-lsp/tree-sitter-latex",
-    files = { "src/parser.c", "src/scanner.c" },
-    requires_generate_from_grammar = true,
-  },
-  filetype = "tex",
-  maintainers = { "@theHamsta", "@clason" },
-}
-
-list.ledger = {
-  install_info = {
-    url = "https://github.com/cbarrete/tree-sitter-ledger",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@cbarrete" },
-}
-
-list.leo = {
-  install_info = {
-    url = "https://github.com/r001/tree-sitter-leo",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@r001" },
-}
-
-list.llvm = {
-  install_info = {
-    url = "https://github.com/benwilliamgraham/tree-sitter-llvm",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@benwilliamgraham" },
-}
-
-list.linkerscript = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-linkerscript",
-    files = { "src/parser.c" },
-  },
-  filetype = "ld",
-  maintainers = { "@amaanq" },
-}
-
-list.liquid = {
-  install_info = {
-    url = "https://github.com/hankthetank27/tree-sitter-liquid",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@hankthetank27" },
-}
-
-list.liquidsoap = {
-  install_info = {
-    url = "https://github.com/savonet/tree-sitter-liquidsoap",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@toots" },
-}
-
-list.lua = {
-  install_info = {
-    url = "https://github.com/MunifTanjim/tree-sitter-lua",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@muniftanjim" },
-}
-
-list.luadoc = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-luadoc",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.luap = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-luap",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-  readme_name = "lua patterns",
-}
-
-list.luau = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-luau",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.hlsplaylist = {
-  install_info = {
-    url = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Freed-Wu" },
-}
-
-list.m68k = {
-  install_info = {
-    url = "https://github.com/grahambates/tree-sitter-m68k",
-    files = { "src/parser.c" },
-  },
-  filetype = "asm68k",
-  maintainers = { "@grahambates" },
-}
-
-list.make = {
-  install_info = {
-    url = "https://github.com/alemuller/tree-sitter-make",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@lewis6991" },
-}
-
-list.markdown = {
-  install_info = {
-    url = "https://github.com/MDeiml/tree-sitter-markdown",
-    location = "tree-sitter-markdown",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@MDeiml" },
-  readme_name = "markdown (basic highlighting)",
-  experimental = true,
-}
-
-list.markdown_inline = {
-  install_info = {
-    url = "https://github.com/MDeiml/tree-sitter-markdown",
-    location = "tree-sitter-markdown-inline",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@MDeiml" },
-  readme_name = "markdown_inline (needed for full highlighting)",
-  experimental = true,
-}
-
-list.matlab = {
-  install_info = {
-    url = "https://github.com/acristoffers/tree-sitter-matlab",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@acristoffers" },
-}
-
-list.menhir = {
-  install_info = {
-    url = "https://github.com/Kerl13/tree-sitter-menhir",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@Kerl13" },
-}
-
-list.mermaid = {
-  install_info = {
-    url = "https://github.com/monaqa/tree-sitter-mermaid",
-    files = { "src/parser.c" },
-  },
-  experimental = true,
-}
-
-list.meson = {
-  install_info = {
-    url = "https://github.com/Decodetalkers/tree-sitter-meson",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Decodetalkers" },
-}
-
-list.mlir = {
-  install_info = {
-    url = "https://github.com/artagnon/tree-sitter-mlir",
-    files = { "src/parser.c" },
-    requires_generate_from_grammar = true,
-  },
-  experimental = true,
-  maintainers = { "@artagnon" },
-}
-
-list.muttrc = {
-  install_info = {
-    url = "https://github.com/neomutt/tree-sitter-muttrc",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Freed-Wu" },
-}
-
-list.nasm = {
-  install_info = {
-    url = "https://github.com/naclsn/tree-sitter-nasm",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.nginx = {
-  install_info = {
-    url = "https://github.com/opa-oz/tree-sitter-nginx",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@opa-oz" },
-}
-
-list.nickel = {
-  install_info = {
-    url = "https://github.com/nickel-lang/tree-sitter-nickel",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-}
-
-list.nim = {
-  install_info = {
-    url = "https://github.com/alaviss/tree-sitter-nim",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@aMOPel" },
-}
-
-list.nim_format_string = {
-  install_info = {
-    url = "https://github.com/aMOPel/tree-sitter-nim-format-string",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@aMOPel" },
-}
-
-list.ninja = {
-  install_info = {
-    url = "https://github.com/alemuller/tree-sitter-ninja",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@alemuller" },
-}
-
-list.nix = {
-  install_info = {
-    url = "https://github.com/cstrahan/tree-sitter-nix",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@leo60228" },
-}
-
-list.norg = {
-  install_info = {
-    url = "https://github.com/nvim-neorg/tree-sitter-norg",
-    files = { "src/parser.c", "src/scanner.cc" },
-    cxx_standard = "c++14",
-    use_makefile = true,
-  },
-  maintainers = { "@JoeyGrajciar", "@vhyrro" },
-}
-
-list.nqc = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-nqc",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.nu = {
-  install_info = {
-    url = "https://github.com/nushell/tree-sitter-nu",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@abhisheksingh0x558" },
-}
-
-list.objc = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-objc",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.objdump = {
-  install_info = {
-    url = "https://github.com/ColinKennedy/tree-sitter-objdump",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@ColinKennedy" },
-}
-
-list.ocaml = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-ocaml",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "grammars/ocaml",
-  },
-  maintainers = { "@undu" },
-}
-
-list.ocaml_interface = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-ocaml",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "grammars/interface",
-  },
-  filetype = "ocamlinterface",
-  maintainers = { "@undu" },
-}
-
-list.ocamllex = {
-  install_info = {
-    url = "https://github.com/atom-ocaml/tree-sitter-ocamllex",
-    files = { "src/parser.c", "src/scanner.c" },
-    requires_generate_from_grammar = true,
-  },
-  maintainers = { "@undu" },
-}
-
-list.odin = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-odin",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.pascal = {
-  install_info = {
-    url = "https://github.com/Isopod/tree-sitter-pascal",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Isopod" },
-}
-
-list.passwd = {
-  install_info = {
-    url = "https://github.com/ath3/tree-sitter-passwd",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.pem = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-pem",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.perl = {
-  install_info = {
-    url = "https://github.com/tree-sitter-perl/tree-sitter-perl",
-    files = { "src/parser.c", "src/scanner.c" },
-    branch = "release",
-  },
-  maintainers = { "@RabbiVeesh", "@LeoNerd" },
-}
-
-list.php = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-php",
-    location = "php",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@tk-shirasaka", "@calebdw" },
-}
-
-list.php_only = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-php",
-    location = "php_only",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@tk-shirasaka", "@calebdw" },
-}
-
--- Parsers for injections
-list.phpdoc = {
-  install_info = {
-    url = "https://github.com/claytonrcarter/tree-sitter-phpdoc",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@mikehaertl" },
-  experimental = true,
-}
-
-list.pioasm = {
-  install_info = {
-    url = "https://github.com/leo60228/tree-sitter-pioasm",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@leo60228" },
-}
-
-list.po = {
-  install_info = {
-    url = "https://github.com/erasin/tree-sitter-po",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.pod = {
-  install_info = {
-    url = "https://github.com/tree-sitter-perl/tree-sitter-pod",
-    files = { "src/parser.c", "src/scanner.c" },
-    branch = "release",
-  },
-  maintainers = { "@RabbiVeesh", "@LeoNerd" },
-}
-
-list.poe_filter = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-poe-filter",
-    files = { "src/parser.c" },
-  },
-  filetype = "poefilter",
-  maintainers = { "@ObserverOfTime" },
-  readme_name = "Path of Exile item filter",
-  experimental = true,
-}
-
-list.pony = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-pony",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq", "@mfelsche" },
-}
-
-list.powershell = {
-  install_info = {
-    url = "https://github.com/airbus-cert/tree-sitter-powershell",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "ps1",
-  maintainers = { "@L2jLiga" },
-}
-
-list.printf = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-printf",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.prisma = {
-  install_info = {
-    url = "https://github.com/victorhqc/tree-sitter-prisma",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@elianiva" },
-}
-
-list.problog = {
-  install_info = {
-    url = "https://github.com/foxyseta/tree-sitter-prolog",
-    files = { "src/parser.c" },
-    location = "grammars/problog",
-  },
-  maintainers = { "@foxyseta" },
-}
-
-list.prolog = {
-  install_info = {
-    url = "https://github.com/foxyseta/tree-sitter-prolog",
-    files = { "src/parser.c" },
-    location = "grammars/prolog",
-  },
-  maintainers = { "@foxyseta" },
-}
-
-list.promql = {
-  install_info = {
-    url = "https://github.com/MichaHoffmann/tree-sitter-promql",
-    files = { "src/parser.c" },
-    experimental = true,
-  },
-  maintainers = { "@MichaHoffmann" },
-}
-
-list.properties = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-properties",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "jproperties",
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.proto = {
-  install_info = {
-    url = "https://github.com/treywood/tree-sitter-proto",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@treywood" },
-}
-
-list.prql = {
-  install_info = {
-    url = "https://github.com/PRQL/tree-sitter-prql",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@matthias-Q" },
-}
-
-list.psv = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-csv",
-    files = { "src/parser.c" },
-    location = "psv",
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.pug = {
-  install_info = {
-    url = "https://github.com/zealot128/tree-sitter-pug",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@zealot128" },
-  experimental = true,
-}
-
-list.puppet = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-puppet",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.purescript = {
-  install_info = {
-    url = "https://github.com/postsolar/tree-sitter-purescript",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@postsolar" },
-}
-
-list.pymanifest = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-pymanifest",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-  readme_name = "PyPA manifest",
-}
-
-list.python = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-python",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@stsewd", "@theHamsta" },
-}
-
-list.ql = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-ql",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@pwntester" },
-}
-
-list.qmldir = {
-  install_info = {
-    url = "https://github.com/Decodetalkers/tree-sitter-qmldir",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.qmljs = {
-  install_info = {
-    url = "https://github.com/yuja/tree-sitter-qmljs",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "qml",
-  maintainers = { "@Decodetalkers" },
-}
-
-list.query = {
-  install_info = {
-    url = "https://github.com/nvim-treesitter/tree-sitter-query",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@steelsojka" },
-  readme_name = "Tree-Sitter query language",
-}
-
-list.r = {
-  install_info = {
-    url = "https://github.com/r-lib/tree-sitter-r",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@ribru17" },
-}
-
-list.racket = {
-  install_info = {
-    url = "https://github.com/6cdh/tree-sitter-racket",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-}
-
-list.ralph = {
-  install_info = {
-    url = "https://github.com/alephium/tree-sitter-ralph",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@tdroxler" },
-}
-
-list.rasi = {
-  install_info = {
-    url = "https://github.com/Fymyte/tree-sitter-rasi",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Fymyte" },
-}
-
-list.razor = {
-  install_info = {
-    url = "https://github.com/tris203/tree-sitter-razor",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  maintainers = { "@tris203" },
-}
-
-list.rbs = {
-  install_info = {
-    url = "https://github.com/joker1007/tree-sitter-rbs",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@joker1007" },
-}
-
-list.re2c = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-re2c",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.readline = {
-  install_info = {
-    url = "https://github.com/ribru17/tree-sitter-readline",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ribru17" },
-}
-
-list.regex = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-regex",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@theHamsta" },
-}
-
-list.rego = {
-  install_info = {
-    url = "https://github.com/FallenAngel97/tree-sitter-rego",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@FallenAngel97" },
-}
-
-list.requirements = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-requirements",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@ObserverOfTime" },
-  readme_name = "pip requirements",
-}
-
-list.rescript = {
-  install_info = {
-    url = "https://github.com/rescript-lang/tree-sitter-rescript",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@ribru17" },
-}
-
-list.rnoweb = {
-  install_info = {
-    url = "https://github.com/bamonroe/tree-sitter-rnoweb",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@bamonroe" },
-}
-
-list.robot = {
-  install_info = {
-    url = "https://github.com/Hubro/tree-sitter-robot",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@Hubro" },
-}
-
-list.robots = {
-  install_info = {
-    url = "https://github.com/opa-oz/tree-sitter-robots-txt",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@opa-oz" },
-}
-
-list.roc = {
-  install_info = {
-    url = "https://github.com/faldor20/tree-sitter-roc",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@nat-418" },
-}
-
-list.ron = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-ron",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.rst = {
-  install_info = {
-    url = "https://github.com/stsewd/tree-sitter-rst",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@stsewd" },
-}
-
-list.ruby = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-ruby",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@TravonteD" },
-}
-
-list.runescript = {
-  install_info = {
-    url = "https://github.com/2004Scape/tree-sitter-runescript",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@2004Scape" },
-}
-
-list.rust = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-rust",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.scala = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-scala",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@stevanmilic" },
-}
-
-list.scfg = {
-  install_info = {
-    url = "https://github.com/rockorager/tree-sitter-scfg",
-    files = { "src/parser.c" },
-    requires_generate_from_grammar = true,
-  },
-  maintainers = { "@WhyNotHugo" },
-}
-
-list.scheme = {
-  install_info = {
-    url = "https://github.com/6cdh/tree-sitter-scheme",
-    files = { "src/parser.c" },
-  },
-}
-
-list.scss = {
-  install_info = {
-    url = "https://github.com/serenadeai/tree-sitter-scss",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@elianiva" },
-}
-
-list.sflog = {
-  install_info = {
-    url = "https://github.com/aheber/tree-sitter-sfapex",
-    files = { "src/parser.c" },
-    location = "sflog",
-  },
-  maintainers = { "@aheber", "@xixiaofinland" },
-}
-
-list.slang = {
-  install_info = {
-    url = "https://github.com/theHamsta/tree-sitter-slang",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
-  },
-  filetype = "shaderslang",
-  maintainers = { "@theHamsta" },
-  experimental = true,
-}
-
-list.slim = {
-  install_info = {
-    url = "https://github.com/theoo/tree-sitter-slim",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@theoo" },
-}
-
-list.slint = {
-  install_info = {
-    url = "https://github.com/slint-ui/tree-sitter-slint",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@hunger" },
-}
-
-list.smali = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-smali",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.snakemake = {
-  install_info = {
-    url = "https://github.com/osthomas/tree-sitter-snakemake",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainer = { "@osthomas" },
-  experimental = true,
-}
-
-list.smithy = {
-  install_info = {
-    url = "https://github.com/indoorvivants/tree-sitter-smithy",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq", "@keynmol" },
-}
-
-list.solidity = {
-  install_info = {
-    url = "https://github.com/JoranHonig/tree-sitter-solidity",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.soql = {
-  install_info = {
-    url = "https://github.com/aheber/tree-sitter-sfapex",
-    files = { "src/parser.c" },
-    location = "soql",
-  },
-  maintainers = { "@aheber", "@xixiaofinland" },
-}
-
-list.sosl = {
-  install_info = {
-    url = "https://github.com/aheber/tree-sitter-sfapex",
-    files = { "src/parser.c" },
-    location = "sosl",
-  },
-  maintainers = { "@aheber", "@xixiaofinland" },
-}
-
-list.sourcepawn = {
-  install_info = {
-    url = "https://github.com/nilshelmig/tree-sitter-sourcepawn",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@Sarrus1" },
-  tier = 3,
-}
-
-list.sparql = {
-  install_info = {
-    url = "https://github.com/GordianDziwis/tree-sitter-sparql",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@GordianDziwis" },
-}
-
-list.sql = {
-  install_info = {
-    url = "https://github.com/derekstride/tree-sitter-sql",
-    files = { "src/parser.c", "src/scanner.c" },
-    branch = "gh-pages",
-  },
-  maintainers = { "@derekstride" },
-}
-
-list.squirrel = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-squirrel",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.ssh_config = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-ssh-config",
-    files = { "src/parser.c" },
-  },
-  filetype = "sshconfig",
-  maintainers = { "@ObserverOfTime" },
-}
-
-list.starlark = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-starlark",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  filetype = "bzl",
-  maintainers = { "@amaanq" },
-}
-
-list.strace = {
-  install_info = {
-    url = "https://github.com/sigmaSd/tree-sitter-strace",
-    files = { "src/parser.c" },
-  },
-  maintainers = { "@amaanq" },
-}
-
-list.styled = {
-  install_info = {
-    url = "https://github.com/mskelton/tree-sitter-styled",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@mskelton" },
-}
-
-list.supercollider = {
-  install_info = {
-    url = "https://github.com/madskjeldgaard/tree-sitter-supercollider",
-    files = { "src/parser.c", "src/scanner.c" },
-  },
-  maintainers = { "@madskjeldgaard" },
-}
-
-list.superhtml = {
-  install_info = {
-    url = "https://github.com/kristoff-it/superhtml",
-    files = {
-      "src/parser.c",
-      "src/scanner.c",
+M.configs = {
+  ada = {
+    install_info = {
+      url = 'https://github.com/briot/tree-sitter-ada',
+      files = { 'src/parser.c' },
     },
-    location = "tree-sitter-superhtml",
+    maintainers = { '@briot' },
   },
-  maintainers = { "@rockorager" },
-}
 
-list.surface = {
-  install_info = {
-    url = "https://github.com/connorlay/tree-sitter-surface",
-    files = { "src/parser.c" },
+  agda = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-agda',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@Decodetalkers' },
   },
-  filetype = "sface",
-  maintainers = { "@connorlay" },
-}
 
-list.svelte = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-svelte",
-    files = { "src/parser.c", "src/scanner.c" },
+  angular = {
+    install_info = {
+      url = 'https://github.com/dlvandenberg/tree-sitter-angular',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@dlvandenberg' },
+    tier = 4,
   },
-  maintainers = { "@amaanq" },
-}
 
-list.sway = {
-  install_info = {
-    url = "https://github.com/FuelLabs/tree-sitter-sway.git",
-    files = { "src/parser.c", "src/scanner.c" },
+  apex = {
+    install_info = {
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
+      files = { 'src/parser.c' },
+      location = 'apex',
+    },
+    maintainers = { '@aheber', '@xixiafinland' },
+    tier = 3,
   },
-  maintainers = { "@ribru17" },
-}
 
-list.swift = {
-  install_info = {
-    url = "https://github.com/alex-pinkus/tree-sitter-swift",
-    files = { "src/parser.c", "src/scanner.c" },
-    requires_generate_from_grammar = true,
+  arduino = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-arduino',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
   },
-  maintainers = { "@alex-pinkus" },
-}
 
-list.sxhkdrc = {
-  install_info = {
-    url = "https://github.com/RaafatTurki/tree-sitter-sxhkdrc",
-    files = { "src/parser.c" },
+  asm = {
+    install_info = {
+      url = 'https://github.com/RubixDev/tree-sitter-asm',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@RubixDev' },
+    tier = 3,
   },
-  maintainers = { "@RaafatTurki" },
-}
 
-list.systemtap = {
-  install_info = {
-    url = "https://github.com/ok-ryoko/tree-sitter-systemtap",
-    files = { "src/parser.c" },
+  astro = {
+    install_info = {
+      url = 'https://github.com/virchau13/tree-sitter-astro',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@virchau13' },
   },
-  maintainers = { "@ok-ryoko" },
-}
 
-list.t32 = {
-  install_info = {
-    url = "https://gitlab.com/xasc/tree-sitter-t32.git",
-    files = { "src/parser.c", "src/scanner.c" },
+  authzed = {
+    install_info = {
+      url = 'https://github.com/mleonidas/tree-sitter-authzed',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@mattpolzin' },
+    tier = 3,
   },
-  filetype = "trace32",
-  maintainers = { "@xasc" },
-}
 
-list.tablegen = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-tablegen",
-    files = { "src/parser.c", "src/scanner.c" },
+  awk = {
+    install_info = {
+      url = 'https://github.com/Beaglefoot/tree-sitter-awk',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
   },
-  maintainers = { "@amaanq" },
-}
 
-list.tact = {
-  install_info = {
-    url = "https://github.com/tact-lang/tree-sitter-tact",
-    files = { "src/parser.c" },
+  bash = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-bash',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@TravonteD' },
   },
-  maintainers = { "@novusnota" },
-}
 
-list.teal = {
-  install_info = {
-    url = "https://github.com/euclidianAce/tree-sitter-teal",
-    files = { "src/parser.c", "src/scanner.c" },
-    requires_generate_from_grammar = true,
+  bass = {
+    install_info = {
+      url = 'https://github.com/vito/tree-sitter-bass',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
   },
-  maintainers = { "@euclidianAce" },
-}
 
-list.tcl = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-tcl",
-    files = { "src/parser.c", "src/scanner.c" },
+  beancount = {
+    install_info = {
+      url = 'https://github.com/polarmutex/tree-sitter-beancount',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@polarmutex' },
   },
-  maintainers = { "@lewis6991" },
-}
 
-list.tera = {
-  install_info = {
-    url = "https://github.com/uncenter/tree-sitter-tera",
-    files = { "src/parser.c", "src/scanner.c" },
+  bibtex = {
+    install_info = {
+      url = 'https://github.com/latex-lsp/tree-sitter-bibtex',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@theHamsta', '@clason' },
+    tier = 3,
   },
-  maintainers = { "@uncenter" },
-}
 
-list.terraform = {
-  install_info = {
-    url = "https://github.com/MichaHoffmann/tree-sitter-hcl",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "dialects/terraform",
+  bicep = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-bicep',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
   },
-  maintainers = { "@MichaHoffmann" },
-}
 
-list.textproto = {
-  install_info = {
-    url = "https://github.com/PorterAtGoogle/tree-sitter-textproto",
-    files = { "src/parser.c" },
+  bitbake = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-bitbake',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
   },
-  filetype = "pbtxt",
-  maintainers = { "@Porter" },
-}
 
-list.thrift = {
-  install_info = {
-    url = "https://github.com/duskmoon314/tree-sitter-thrift",
-    files = { "src/parser.c" },
+  blade = {
+    install_info = {
+      url = 'https://github.com/EmranMR/tree-sitter-blade',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@calebdw' },
+    tier = 2,
   },
-  maintainers = { "@amaanq", "@duskmoon314" },
-}
-
-list.tiger = {
-  install_info = {
-    url = "https://github.com/ambroisie/tree-sitter-tiger",
-    files = { "src/parser.c", "src/scanner.c" },
+  blueprint = {
+    install_info = {
+      url = 'https://gitlab.com/gabmus/tree-sitter-blueprint.git',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@gabmus' },
+    tier = 4,
   },
-  maintainers = { "@ambroisie" },
-}
 
-list.tlaplus = {
-  install_info = {
-    url = "https://github.com/tlaplus-community/tree-sitter-tlaplus",
-    files = { "src/parser.c", "src/scanner.c" },
+  bp = {
+    install_info = {
+      url = 'https://github.com/ambroisie/tree-sitter-bp',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ambroisie' },
+    tier = 3,
+    readme_note = 'Android Blueprint',
   },
-  filetype = "tla",
-  maintainers = { "@ahelwer", "@susliko" },
-}
-
-list.tmux = {
-  install_info = {
-    url = "https://github.com/Freed-Wu/tree-sitter-tmux",
-    files = { "src/parser.c" },
+  brightscript = {
+    install_info = {
+      url = 'https://github.com/ajdelcimmuto/tree-sitter-brightscript',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ajdelcimmuto' },
+    tier = 2,
   },
-  maintainers = { "@Freed-Wu" },
-}
-
-list.todotxt = {
-  install_info = {
-    url = "https://github.com/arnarg/tree-sitter-todotxt",
-    files = { "src/parser.c" },
+  c = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-c',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 1,
   },
-  maintainers = { "@arnarg" },
-  experimental = true,
-}
 
-list.toml = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-toml",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
+  c_sharp = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
   },
-  maintainers = { "@tk-shirasaka" },
-}
 
-list.tsv = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-csv",
-    files = { "src/parser.c" },
-    location = "tsv",
+  cairo = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-cairo',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
   },
-  maintainers = { "@amaanq" },
-}
 
-list.tsx = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-typescript",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "tsx",
-    generate_requires_npm = true,
+  caddy = {
+    install_info = {
+      url = 'https://github.com/opa-oz/tree-sitter-caddy',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@opa-oz' },
+    tier = 3,
   },
-  filetype = "typescriptreact",
-  maintainers = { "@steelsojka" },
-}
 
-list.turtle = {
-  install_info = {
-    url = "https://github.com/GordianDziwis/tree-sitter-turtle",
-    files = { "src/parser.c" },
+  capnp = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-capnp',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
   },
-  maintainers = { "@GordianDziwis" },
-}
 
-list.twig = {
-  install_info = {
-    url = "https://github.com/gbprod/tree-sitter-twig",
-    files = { "src/parser.c" },
+  chatito = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-chatito',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
   },
-  maintainers = { "@gbprod" },
-}
 
-list.typescript = {
-  install_info = {
-    url = "https://github.com/tree-sitter/tree-sitter-typescript",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "typescript",
-    generate_requires_npm = true,
+  circom = {
+    install_info = {
+      url = 'https://github.com/Decurity/tree-sitter-circom',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@alexandr-martirosyan' },
+    tier = 3,
   },
-  maintainers = { "@steelsojka" },
-}
 
-list.typespec = {
-  install_info = {
-    url = "https://github.com/happenslol/tree-sitter-typespec",
-    files = { "src/parser.c" },
+  clojure = {
+    install_info = {
+      url = 'https://github.com/sogaiu/tree-sitter-clojure',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@NoahTheDuke' },
   },
-  maintainers = { "@happenslol" },
-}
 
-list.typoscript = {
-  install_info = {
-    url = "https://github.com/Teddytrombone/tree-sitter-typoscript",
-    files = { "src/parser.c" },
+  cmake = {
+    install_info = {
+      url = 'https://github.com/uyha/tree-sitter-cmake',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@uyha' },
   },
-  maintainers = { "@Teddytrombone" },
-}
 
-list.typst = {
-  install_info = {
-    url = "https://github.com/uben0/tree-sitter-typst",
-    files = { "src/parser.c", "src/scanner.c" },
+  comment = {
+    install_info = {
+      url = 'https://github.com/stsewd/tree-sitter-comment',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@stsewd' },
+    tier = 2,
   },
-  maintainers = { "@uben0", "@RaafatTurki" },
-}
 
-list.udev = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-udev",
-    files = { "src/parser.c" },
+  commonlisp = {
+    install_info = {
+      url = 'https://github.com/theHamsta/tree-sitter-commonlisp',
+      files = { 'src/parser.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@theHamsta' },
   },
-  filetype = "udevrules",
-  maintainers = { "@ObserverOfTime" },
-}
 
-list.ungrammar = {
-  install_info = {
-    url = "https://github.com/Philipp-M/tree-sitter-ungrammar",
-    files = { "src/parser.c" },
+  cooklang = {
+    install_info = {
+      url = 'https://github.com/addcninblue/tree-sitter-cooklang',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@addcninblue' },
+    tier = 3,
   },
-  maintainers = { "@Philipp-M", "@amaanq" },
-}
 
-list.unison = {
-  install_info = {
-    url = "https://github.com/kylegoetz/tree-sitter-unison",
-    files = { "src/parser.c", "src/scanner.c" },
-    requires_generate_from_grammar = true,
+  corn = {
+    install_info = {
+      url = 'https://github.com/jakestanger/tree-sitter-corn',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@jakestanger' },
+    tier = 3,
   },
-  maintainers = { "@tapegram" },
-}
 
-list.usd = {
-  install_info = {
-    url = "https://github.com/ColinKennedy/tree-sitter-usd",
-    files = { "src/parser.c" },
+  cpon = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-cpon',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
   },
-  maintainers = { "@ColinKennedy" },
-}
 
-list.uxntal = {
-  install_info = {
-    url = "https://github.com/amaanq/tree-sitter-uxntal",
-    files = { "src/parser.c", "src/scanner.c" },
+  cpp = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-cpp',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@theHamsta' },
   },
-  filetype = "tal",
-  maintainers = { "@amaanq" },
-  readme_name = "uxn tal",
-}
 
-list.v = {
-  install_info = {
-    url = "https://github.com/vlang/v-analyzer",
-    files = { "src/parser.c" },
-    location = "tree_sitter_v",
+  css = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-css',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@TravonteD' },
   },
-  filetype = "vlang",
-  maintainers = { "@kkharji", "@amaanq" },
-}
 
-list.vala = {
-  install_info = {
-    url = "https://github.com/vala-lang/tree-sitter-vala",
-    files = { "src/parser.c" },
+  csv = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-csv',
+      files = { 'src/parser.c' },
+      location = 'csv',
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
   },
-  maintainers = { "@Prince781" },
-}
 
-list.vento = {
-  install_info = {
-    url = "https://github.com/ventojs/tree-sitter-vento",
-    files = { "src/parser.c", "src/scanner.c" },
+  cuda = {
+    install_info = {
+      url = 'https://github.com/theHamsta/tree-sitter-cuda',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@theHamsta' },
   },
-  filetype = "vto",
-  maintainers = { "@wrapperup", "@oscarotero" },
-}
 
-list.verilog = {
-  install_info = {
-    url = "https://github.com/gmlarumbe/tree-sitter-systemverilog",
-    files = { "src/parser.c" },
+  cue = {
+    install_info = {
+      url = 'https://github.com/eonpatapon/tree-sitter-cue',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
   },
-  maintainers = { "@zhangwwpeng" },
-}
 
-list.vhdl = {
-  install_info = {
-    url = "https://github.com/jpt13653903/tree-sitter-vhdl",
-    files = { "src/parser.c", "src/scanner.c" },
+  cylc = {
+    install_info = {
+      url = 'https://github.com/elliotfontaine/tree-sitter-cylc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@elliotfontaine' },
+    tier = 3,
   },
-  maintainers = { "@jpt13653903" },
-}
 
-list.vhs = {
-  install_info = {
-    url = "https://github.com/charmbracelet/tree-sitter-vhs",
-    files = { "src/parser.c" },
+  d = {
+    install_info = {
+      url = 'https://github.com/gdamore/tree-sitter-d',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    tier = 2,
+    maintainers = { '@amaanq' },
   },
-  filetype = "tape",
-  maintainers = { "@caarlos0" },
-}
 
-list.vim = {
-  install_info = {
-    url = "https://github.com/neovim/tree-sitter-vim",
-    files = { "src/parser.c", "src/scanner.c" },
+  dart = {
+    install_info = {
+      url = 'https://github.com/UserNobody14/tree-sitter-dart',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@akinsho' },
   },
-  maintainers = { "@clason" },
-}
 
-list.vimdoc = {
-  install_info = {
-    url = "https://github.com/neovim/tree-sitter-vimdoc",
-    files = { "src/parser.c" },
+  desktop = {
+    install_info = {
+      url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ValdezFOmar' },
+    tier = 3,
   },
-  filetype = "help",
-  maintainers = { "@clason" },
-}
 
-list.vrl = {
-  install_info = {
-    url = "https://github.com/belltoy/tree-sitter-vrl",
-    files = { "src/parser.c" },
+  devicetree = {
+    install_info = {
+      url = 'https://github.com/joelspadin/tree-sitter-devicetree',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@jedrzejboczar' },
   },
-  maintainers = { "@belltoy" },
-}
 
-list.vue = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-vue",
-    files = { "src/parser.c", "src/scanner.c" },
-    branch = "main",
+  dhall = {
+    install_info = {
+      url = 'https://github.com/jbellerb/tree-sitter-dhall',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
   },
-  maintainers = { "@WhyNotHugo", "@lucario387" },
-}
 
-list.wgsl = {
-  install_info = {
-    url = "https://github.com/szebniok/tree-sitter-wgsl",
-    files = { "src/parser.c", "src/scanner.c" },
+  diff = {
+    install_info = {
+      url = 'https://github.com/the-mikedavis/tree-sitter-diff',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@gbprod' },
   },
-  maintainers = { "@szebniok" },
-}
 
-list.wgsl_bevy = {
-  install_info = {
-    url = "https://github.com/theHamsta/tree-sitter-wgsl-bevy",
-    files = { "src/parser.c", "src/scanner.c" },
-    generate_requires_npm = true,
+  disassembly = {
+    install_info = {
+      url = 'https://github.com/ColinKennedy/tree-sitter-disassembly',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ColinKennedy' },
+    tier = 3,
   },
-  maintainers = { "@theHamsta" },
-}
 
-list.wing = {
-  install_info = {
-    url = "https://github.com/winglang/tree-sitter-wing",
-    files = { "src/parser.c", "src/scanner.c" },
+  djot = {
+    install_info = {
+      url = 'https://github.com/treeman/tree-sitter-djot',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@NoahTheDuke' },
+    tier = 3,
   },
-  maintainers = { "@gshpychka", "@MarkMcCulloh" },
-}
 
-list.wit = {
-  install_info = {
-    url = "https://github.com/liamwh/tree-sitter-wit",
-    files = { "src/parser.c" },
+  dockerfile = {
+    install_info = {
+      url = 'https://github.com/camdencheek/tree-sitter-dockerfile',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@camdencheek' },
   },
-  maintainers = { "@liamwh" },
-}
 
-list.xcompose = {
-  install_info = {
-    url = "https://github.com/ObserverOfTime/tree-sitter-xcompose",
-    files = { "src/parser.c" },
+  dot = {
+    install_info = {
+      url = 'https://github.com/rydesun/tree-sitter-dot',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@rydesun' },
   },
-  maintainers = { "@ObserverOfTime" },
-}
 
-list.xml = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-xml",
-    files = { "src/parser.c", "src/scanner.c" },
-    location = "xml",
+  doxygen = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-doxygen',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
   },
-  maintainers = { "@ObserverOfTime" },
-}
 
-list.xresources = {
-  install_info = {
-    url = "https://github.com/ValdezFOmar/tree-sitter-xresources",
-    files = { "src/parser.c" },
+  dtd = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'dtd',
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
   },
-  filetype = "xdefaults",
-  maintainers = { "@ValdezFOmar" },
-}
 
-list.yaml = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-yaml",
-    files = { "src/parser.c", "src/scanner.c" },
+  earthfile = {
+    install_info = {
+      url = 'https://github.com/glehmann/tree-sitter-earthfile',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@glehmann' },
+    tier = 3,
   },
-  maintainers = { "@amaanq" },
-}
-
-list.yang = {
-  install_info = {
-    url = "https://github.com/Hubro/tree-sitter-yang",
-    files = { "src/parser.c" },
+  ebnf = {
+    install_info = {
+      url = 'https://github.com/RubixDev/ebnf',
+      files = { 'src/parser.c' },
+      location = 'crates/tree-sitter-ebnf',
+    },
+    maintainers = { '@RubixDev' },
+    tier = 4,
   },
-  maintainers = { "@Hubro" },
-}
 
-list.yuck = {
-  install_info = {
-    url = "https://github.com/Philipp-M/tree-sitter-yuck",
-    files = { "src/parser.c", "src/scanner.c" },
+  editorconfig = {
+    install_info = {
+      url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ValdezFOmar' },
+    tier = 3,
   },
-  maintainers = { "@Philipp-M", "@amaanq" },
-}
 
-list.zathurarc = {
-  install_info = {
-    url = "https://github.com/Freed-Wu/tree-sitter-zathurarc",
-    files = { "src/parser.c" },
+  eds = {
+    install_info = {
+      url = 'https://github.com/uyha/tree-sitter-eds',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@uyha' },
+    tier = 3,
   },
-  maintainers = { "@Freed-Wu" },
-}
 
-list.zig = {
-  install_info = {
-    url = "https://github.com/tree-sitter-grammars/tree-sitter-zig",
-    files = { "src/parser.c" },
+  eex = {
+    install_info = {
+      url = 'https://github.com/connorlay/tree-sitter-eex',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@connorlay' },
   },
-  maintainers = { "@amaanq" },
-}
 
-list.ziggy = {
-  install_info = {
-    url = "https://github.com/kristoff-it/ziggy",
-    files = { "src/parser.c" },
-    location = "tree-sitter-ziggy",
+  elixir = {
+    install_info = {
+      url = 'https://github.com/elixir-lang/tree-sitter-elixir',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@connorlay' },
   },
-  maintainers = { "@rockorager" },
-}
 
-list.ziggy_schema = {
-  install_info = {
-    url = "https://github.com/kristoff-it/ziggy",
-    files = { "src/parser.c" },
-    location = "tree-sitter-ziggy-schema",
+  elm = {
+    install_info = {
+      url = 'https://github.com/elm-tooling/tree-sitter-elm',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@zweimach' },
   },
-  maintainers = { "@rockorager" },
-}
 
-list.templ = {
-  install_info = {
-    url = "https://github.com/vrischmann/tree-sitter-templ",
-    files = { "src/parser.c", "src/scanner.c" },
+  elsa = {
+    install_info = {
+      url = 'https://github.com/glapa-grossklag/tree-sitter-elsa',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@glapa-grossklag', '@amaanq' },
   },
-  maintainers = { "@vrischmann" },
-}
 
-local M = {
-  list = list,
-}
+  elvish = {
+    install_info = {
+      url = 'https://github.com/elves/tree-sitter-elvish',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@elves' },
+  },
 
-function M.ft_to_lang(ft)
-  local result = ts.language.get_lang(ft)
-  if result then
-    return result
-  else
-    ft = vim.split(ft, ".", { plain = true })[1]
-    return ts.language.get_lang(ft) or ft
-  end
-end
+  embedded_template = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
+      files = { 'src/parser.c' },
+    },
+  },
+
+  enforce = {
+    install_info = {
+      url = 'https://github.com/simonvic/tree-sitter-enforce',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@simonvic' },
+    tier = 3,
+  },
+
+  erlang = {
+    install_info = {
+      url = 'https://github.com/WhatsApp/tree-sitter-erlang',
+      files = { 'src/parser.c', 'src/parser.c' },
+    },
+    maintainers = { '@filmor' },
+  },
+
+  facility = {
+    install_info = {
+      url = 'https://github.com/FacilityApi/tree-sitter-facility',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@bryankenote' },
+    tier = 3,
+  },
+
+  faust = {
+    install_info = {
+      url = 'https://github.com/khiner/tree-sitter-faust',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@khiner' },
+    tier = 3,
+  },
+
+  fennel = {
+    install_info = {
+      url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@alexmozaidze' },
+  },
+
+  fidl = {
+    install_info = {
+      url = 'https://github.com/google/tree-sitter-fidl',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@chaopeng' },
+    tier = 3,
+  },
+
+  firrtl = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-firrtl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  fish = {
+    install_info = {
+      url = 'https://github.com/ram02z/tree-sitter-fish',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ram02z' },
+  },
+
+  foam = {
+    install_info = {
+      url = 'https://github.com/FoamScience/tree-sitter-foam',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@FoamScience' },
+    tier = 4,
+  },
+
+  forth = {
+    install_info = {
+      url = 'https://github.com/AlexanderBrevig/tree-sitter-forth',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  fortran = {
+    install_info = {
+      url = 'https://github.com/stadelmanma/tree-sitter-fortran',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  fsh = {
+    install_info = {
+      url = 'https://github.com/mgramigna/tree-sitter-fsh',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@mgramigna' },
+  },
+
+  fsharp = {
+    install_info = {
+      url = 'https://github.com/ionide/tree-sitter-fsharp',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'fsharp',
+    },
+    maintainers = { '@nsidorenco' },
+    tier = 3,
+  },
+
+  func = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-func',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  fusion = {
+    install_info = {
+      url = 'https://gitlab.com/jirgn/tree-sitter-fusion.git',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@jirgn' },
+  },
+
+  gap = {
+    install_info = {
+      url = 'https://github.com/gap-system/tree-sitter-gap',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@reiniscirpons' },
+    readme_name = 'GAP system',
+    tier = 3,
+  },
+
+  gaptst = {
+    install_info = {
+      url = 'https://github.com/gap-system/tree-sitter-gaptst',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@reiniscirpons' },
+    readme_name = 'GAP system test files',
+    requires = { 'gap' },
+    tier = 3,
+  },
+
+  gdscript = {
+    install_info = {
+      url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@PrestonKnopp' },
+    readme_note = 'Godot',
+  },
+
+  gdshader = {
+    install_info = {
+      url = 'https://github.com/GodOfAvacyn/tree-sitter-gdshader',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@godofavacyn' },
+    tier = 3,
+  },
+
+  git_rebase = {
+    install_info = {
+      url = 'https://github.com/the-mikedavis/tree-sitter-git-rebase',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@gbprod' },
+  },
+
+  gitattributes = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-gitattributes',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+  },
+
+  gitcommit = {
+    install_info = {
+      url = 'https://github.com/gbprod/tree-sitter-gitcommit',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@gbprod' },
+  },
+
+  git_config = {
+    install_info = {
+      url = 'https://github.com/the-mikedavis/tree-sitter-git-config',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    readme_note = 'git_config',
+  },
+
+  gitignore = {
+    install_info = {
+      url = 'https://github.com/shunsambongi/tree-sitter-gitignore',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@theHamsta' },
+  },
+
+  gleam = {
+    install_info = {
+      url = 'https://github.com/gleam-lang/tree-sitter-gleam',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  glimmer = {
+    install_info = {
+      url = 'https://github.com/ember-tooling/tree-sitter-glimmer',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@NullVoxPopuli' },
+    readme_note = 'Glimmer and Ember',
+  },
+
+  glimmer_javascript = {
+    install_info = {
+      url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@NullVoxPopuli' },
+    requires = { 'javascript' },
+    tier = 3,
+  },
+
+  glimmer_typescript = {
+    install_info = {
+      url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@NullVoxPopuli' },
+    requires = { 'typescript' },
+    tier = 3,
+  },
+
+  glsl = {
+    install_info = {
+      url = 'https://github.com/theHamsta/tree-sitter-glsl',
+      files = { 'src/parser.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@theHamsta' },
+  },
+
+  gn = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-gn',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    readme_name = 'GN (Generate Ninja)',
+    tier = 2,
+  },
+
+  gnuplot = {
+    install_info = {
+      url = 'https://github.com/dpezto/tree-sitter-gnuplot',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@dpezto' },
+    tier = 3,
+  },
+
+  go = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-go',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@theHamsta', '@WinWisely268' },
+  },
+
+  goctl = {
+    install_info = {
+      url = 'https://github.com/chaozwn/tree-sitter-goctl',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@chaozwn' },
+    tier = 3,
+  },
+
+  godot_resource = {
+    install_info = {
+      url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@pierpo' },
+    readme_note = 'Godot Resources',
+  },
+
+  gomod = {
+    install_info = {
+      url = 'https://github.com/camdencheek/tree-sitter-go-mod',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@camdencheek' },
+  },
+
+  gosum = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-go-sum',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  gowork = {
+    install_info = {
+      url = 'https://github.com/omertuc/tree-sitter-go-work',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@omertuc' },
+  },
+
+  graphql = {
+    install_info = {
+      url = 'https://github.com/bkegley/tree-sitter-graphql',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@bkegley' },
+  },
+
+  gotmpl = {
+    install_info = {
+      url = 'https://github.com/ngalaiko/tree-sitter-go-template',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@qvalentin' },
+    tier = 3,
+  },
+
+  gpg = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-gpg-config',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  gren = {
+    install_info = {
+      files = { 'src/parser.c', 'src/scanner.c' },
+      url = 'https://github.com/MaeBrooks/tree-sitter-gren',
+    },
+    maintainers = { '@MaeBrooks' },
+    tier = 3,
+  },
+
+  groovy = {
+    install_info = {
+      url = 'https://github.com/murtaza64/tree-sitter-groovy',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@murtaza64' },
+    tier = 3,
+  },
+
+  gstlaunch = {
+    install_info = {
+      url = 'https://github.com/theHamsta/tree-sitter-gstlaunch',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@theHamsta' },
+    tier = 2,
+  },
+
+  hack = {
+    install_info = {
+      url = 'https://github.com/slackhq/tree-sitter-hack',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+  },
+
+  hare = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-hare',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  haskell = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-haskell',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@mrcjkb' },
+  },
+
+  haskell_persistent = {
+    install_info = {
+      url = 'https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    filetype = 'haskell.persistent',
+    maintainers = { '@lykahb' },
+  },
+
+  hcl = {
+    install_info = {
+      url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@MichaHoffmann' },
+  },
+
+  heex = {
+    install_info = {
+      url = 'https://github.com/connorlay/tree-sitter-heex',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@connorlay' },
+  },
+
+  helm = {
+    install_info = {
+      url = 'https://github.com/ngalaiko/tree-sitter-go-template',
+      location = 'dialects/helm',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@qvalentin' },
+    tier = 3,
+  },
+
+  hjson = {
+    install_info = {
+      url = 'https://github.com/winston0410/tree-sitter-hjson',
+      files = { 'src/parser.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@winston0410' },
+  },
+
+  hlsl = {
+    install_info = {
+      url = 'https://github.com/theHamsta/tree-sitter-hlsl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@theHamsta' },
+  },
+
+  hlsplaylist = {
+    install_info = {
+      url = 'https://github.com/Freed-Wu/tree-sitter-hlsplaylist',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Freed-Wu' },
+    tier = 3,
+  },
+
+  hocon = {
+    install_info = {
+      url = 'https://github.com/antosha417/tree-sitter-hocon',
+      files = { 'src/parser.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@antosha417' },
+  },
+
+  hoon = {
+    install_info = {
+      url = 'https://github.com/urbit-pilled/tree-sitter-hoon',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@urbit-pilled' },
+    tier = 4,
+  },
+
+  html = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-html',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@TravonteD' },
+  },
+
+  htmldjango = {
+    install_info = {
+      url = 'https://github.com/interdependence/tree-sitter-htmldjango',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 4,
+  },
+
+  http = {
+    install_info = {
+      url = 'https://github.com/rest-nvim/tree-sitter-http',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq', '@NTBBloodbath' },
+  },
+
+  hurl = {
+    install_info = {
+      url = 'https://github.com/pfeiferj/tree-sitter-hurl',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@pfeiferj' },
+    tier = 3,
+  },
+
+  hyprlang = {
+    install_info = {
+      url = 'https://github.com/luckasRanarison/tree-sitter-hyprlang',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@luckasRanarison' },
+    tier = 3,
+  },
+
+  idl = {
+    install_info = {
+      url = 'https://github.com/cathaysia/tree-sitter-idl',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@cathaysia' },
+    tier = 3,
+  },
+
+  idris = {
+    install_info = {
+      url = 'https://github.com/kayhide/tree-sitter-idris',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@srghma' },
+    tier = 3,
+  },
+
+  ini = {
+    install_info = {
+      url = 'https://github.com/justinmk/tree-sitter-ini',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@theHamsta' },
+    tier = 4,
+  },
+
+  inko = {
+    install_info = {
+      url = 'https://github.com/inko-lang/tree-sitter-inko',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@yorickpeterse' },
+    tier = 3,
+  },
+
+  ipkg = {
+    install_info = {
+      url = 'https://github.com/srghma/tree-sitter-ipkg',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@srghma' },
+    tier = 3,
+  },
+
+  ispc = {
+    install_info = {
+      url = 'https://github.com/fab4100/tree-sitter-ispc',
+      files = { 'src/parser.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@fab4100' },
+  },
+
+  janet_simple = {
+    install_info = {
+      url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@sogaiu' },
+  },
+
+  java = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-java',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@p00f' },
+  },
+
+  javadoc = {
+    install_info = {
+      url = 'https://github.com/rmuir/tree-sitter-javadoc',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@rmuir' },
+    tier = 2,
+  },
+
+  javascript = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-javascript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@steelsojka' },
+  },
+
+  jinja = {
+    install_info = {
+      url = 'https://github.com/cathaysia/tree-sitter-jinja',
+      location = 'tree-sitter-jinja',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@cathaysia' },
+    readme_note = 'basic highlighting',
+    tier = 3,
+  },
+
+  jinja_inline = {
+    install_info = {
+      url = 'https://github.com/cathaysia/tree-sitter-jinja',
+      location = 'tree-sitter-jinja_inline',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@cathaysia' },
+    readme_note = 'needed for full highlighting',
+    tier = 3,
+  },
+
+  jq = {
+    install_info = {
+      url = 'https://github.com/flurie/tree-sitter-jq',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+  },
+
+  jsdoc = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-jsdoc',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@steelsojka' },
+  },
+
+  json = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-json',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@steelsojka' },
+  },
+
+  json5 = {
+    install_info = {
+      url = 'https://github.com/Joakker/tree-sitter-json5',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Joakker' },
+  },
+
+  jsonc = {
+    install_info = {
+      url = 'https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git',
+      files = { 'src/parser.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@WhyNotHugo' },
+    readme_note = 'JSON with comments',
+  },
+
+  jsonnet = {
+    install_info = {
+      url = 'https://github.com/sourcegraph/tree-sitter-jsonnet',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@nawordar' },
+  },
+
+  julia = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-julia',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@fredrikekre' },
+    tier = 3,
+  },
+
+  just = {
+    install_info = {
+      url = 'https://github.com/IndianBoy42/tree-sitter-just',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@Hubro' },
+    tier = 3,
+  },
+
+  kcl = {
+    install_info = {
+      url = 'https://github.com/kcl-lang/tree-sitter-kcl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@bertbaron' },
+    tier = 2,
+  },
+
+  kconfig = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-kconfig',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  kdl = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-kdl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  kotlin = {
+    install_info = {
+      url = 'https://github.com/fwcd/tree-sitter-kotlin',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@SalBakraa' },
+  },
+
+  koto = {
+    install_info = {
+      url = 'https://github.com/koto-lang/tree-sitter-koto',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@irh' },
+    tier = 3,
+  },
+
+  kusto = {
+    install_info = {
+      url = 'https://github.com/Willem-J-an/tree-sitter-kusto',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Willem-J-an' },
+    tier = 3,
+  },
+
+  lalrpop = {
+    install_info = {
+      url = 'https://github.com/traxys/tree-sitter-lalrpop',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@traxys' },
+  },
+
+  latex = {
+    install_info = {
+      url = 'https://github.com/latex-lsp/tree-sitter-latex',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      requires_generate_from_grammar = true,
+    },
+    maintainers = { '@theHamsta', '@clason' },
+    tier = 3,
+  },
+
+  ledger = {
+    install_info = {
+      url = 'https://github.com/cbarrete/tree-sitter-ledger',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@cbarrete' },
+  },
+
+  leo = {
+    install_info = {
+      url = 'https://github.com/r001/tree-sitter-leo',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@r001' },
+    tier = 3,
+  },
+
+  llvm = {
+    install_info = {
+      url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@benwilliamgraham' },
+  },
+
+  linkerscript = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-linkerscript',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  liquid = {
+    install_info = {
+      url = 'https://github.com/hankthetank27/tree-sitter-liquid',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@hankthetank27' },
+    tier = 3,
+  },
+
+  liquidsoap = {
+    install_info = {
+      url = 'https://github.com/savonet/tree-sitter-liquidsoap',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@toots' },
+    tier = 3,
+  },
+
+  lua = {
+    install_info = {
+      url = 'https://github.com/MunifTanjim/tree-sitter-lua',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    tier = 1,
+    maintainers = { '@muniftanjim' },
+  },
+
+  luadoc = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-luadoc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  luap = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-luap',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    readme_note = 'Lua patterns',
+  },
+
+  luau = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-luau',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  m68k = {
+    install_info = {
+      url = 'https://github.com/grahambates/tree-sitter-m68k',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@grahambates' },
+  },
+
+  make = {
+    install_info = {
+      url = 'https://github.com/alemuller/tree-sitter-make',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@lewis6991' },
+  },
+
+  markdown = {
+    install_info = {
+      url = 'https://github.com/MDeiml/tree-sitter-markdown',
+      location = 'tree-sitter-markdown',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@MDeiml' },
+    readme_note = 'basic highlighting',
+    tier = 1,
+  },
+
+  markdown_inline = {
+    install_info = {
+      url = 'https://github.com/MDeiml/tree-sitter-markdown',
+      location = 'tree-sitter-markdown-inline',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@MDeiml' },
+    readme_note = 'needed for full highlighting',
+    tier = 1,
+  },
+
+  matlab = {
+    install_info = {
+      url = 'https://github.com/acristoffers/tree-sitter-matlab',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@acristoffers' },
+  },
+
+  menhir = {
+    install_info = {
+      url = 'https://github.com/Kerl13/tree-sitter-menhir',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@Kerl13' },
+  },
+
+  mermaid = {
+    install_info = {
+      url = 'https://github.com/monaqa/tree-sitter-mermaid',
+      files = { 'src/parser.c' },
+    },
+    tier = 4,
+  },
+
+  meson = {
+    install_info = {
+      url = 'https://github.com/Decodetalkers/tree-sitter-meson',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Decodetalkers' },
+  },
+
+  mlir = {
+    install_info = {
+      url = 'https://github.com/artagnon/tree-sitter-mlir',
+      files = { 'src/parser.c' },
+      requires_generate_from_grammar = true,
+    },
+    tier = 4,
+    maintainers = { '@artagnon' },
+  },
+
+  muttrc = {
+    install_info = {
+      url = 'https://github.com/neomutt/tree-sitter-muttrc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Freed-Wu' },
+    tier = 3,
+  },
+
+  nasm = {
+    install_info = {
+      url = 'https://github.com/naclsn/tree-sitter-nasm',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  nginx = {
+    install_info = {
+      url = 'https://github.com/opa-oz/tree-sitter-nginx',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@opa-oz' },
+    tier = 3,
+  },
+
+  nickel = {
+    install_info = {
+      url = 'https://github.com/nickel-lang/tree-sitter-nickel',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+  },
+
+  nim = {
+    install_info = {
+      url = 'https://github.com/alaviss/tree-sitter-nim',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@aMOPel' },
+    tier = 3,
+  },
+
+  nim_format_string = {
+    install_info = {
+      url = 'https://github.com/aMOPel/tree-sitter-nim-format-string',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@aMOPel' },
+    tier = 3,
+  },
+
+  ninja = {
+    install_info = {
+      url = 'https://github.com/alemuller/tree-sitter-ninja',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@alemuller' },
+  },
+
+  nix = {
+    install_info = {
+      url = 'https://github.com/cstrahan/tree-sitter-nix',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@leo60228' },
+  },
+
+  norg = {
+    install_info = {
+      url = 'https://github.com/nvim-neorg/tree-sitter-norg',
+      files = { 'src/parser.c', 'src/scanner.cc' },
+      use_makefile = true,
+    },
+    tier = 4,
+    maintainers = { '@JoeyGrajciar', '@vhyrro' },
+  },
+
+  nqc = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-nqc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  nu = {
+    install_info = {
+      url = 'https://github.com/nushell/tree-sitter-nu',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@abhisheksingh0x558' },
+    tier = 3,
+  },
+
+  objc = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-objc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  objdump = {
+    install_info = {
+      url = 'https://github.com/ColinKennedy/tree-sitter-objdump',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ColinKennedy' },
+    tier = 3,
+  },
+
+  ocaml = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'grammars/ocaml',
+    },
+    maintainers = { '@undu' },
+  },
+
+  ocaml_interface = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'grammars/interface',
+    },
+    maintainers = { '@undu' },
+  },
+
+  ocamllex = {
+    install_info = {
+      url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      requires_generate_from_grammar = true,
+    },
+    maintainers = { '@undu' },
+  },
+
+  odin = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-odin',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  pascal = {
+    install_info = {
+      url = 'https://github.com/Isopod/tree-sitter-pascal',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Isopod' },
+  },
+
+  passwd = {
+    install_info = {
+      url = 'https://github.com/ath3/tree-sitter-passwd',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  pem = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-pem',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  perl = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
+      branch = 'release',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@RabbiVeesh', '@LeoNerd' },
+  },
+
+  php = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-php',
+      location = 'php',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@tk-shirasaka', '@calebdw' },
+    requires = { 'php_only' },
+    readme_note = 'PHP with embedded HTML',
+  },
+
+  php_only = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-php',
+      location = 'php_only',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@tk-shirasaka', '@calebdw' },
+    readme_note = 'PHP without embedded HTML',
+  },
+
+  phpdoc = {
+    install_info = {
+      url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@mikehaertl' },
+    tier = 4,
+  },
+
+  pioasm = {
+    install_info = {
+      url = 'https://github.com/leo60228/tree-sitter-pioasm',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@leo60228' },
+  },
+
+  po = {
+    install_info = {
+      url = 'https://github.com/erasin/tree-sitter-po',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  pod = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      branch = 'release',
+    },
+    maintainers = { '@RabbiVeesh', '@LeoNerd' },
+    tier = 3,
+  },
+
+  poe_filter = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-poe-filter',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    readme_note = 'Path of Exile item filter',
+    tier = 4,
+  },
+
+  pony = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-pony',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq', '@mfelsche' },
+  },
+
+  powershell = {
+    install_info = {
+      url = 'https://github.com/airbus-cert/tree-sitter-powershell',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    filetype = 'ps1',
+    maintainers = { '@L2jLiga' },
+    tier = 3,
+  },
+
+  printf = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-printf',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  prisma = {
+    install_info = {
+      url = 'https://github.com/victorhqc/tree-sitter-prisma',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@elianiva' },
+  },
+
+  problog = {
+    install_info = {
+      url = 'https://github.com/foxyseta/tree-sitter-prolog',
+      files = { 'src/parser.c' },
+      location = 'grammars/problog',
+    },
+    maintainers = { '@foxyseta' },
+    requires = { 'prolog' },
+    tier = 3,
+  },
+
+  prolog = {
+    install_info = {
+      url = 'https://github.com/foxyseta/tree-sitter-prolog',
+      files = { 'src/parser.c' },
+      location = 'grammars/prolog',
+    },
+    maintainers = { '@foxyseta' },
+    tier = 3,
+  },
+
+  properties = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-properties',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+    readme_note = 'Java properties files',
+  },
+
+  proto = {
+    install_info = {
+      url = 'https://github.com/treywood/tree-sitter-proto',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@treywood' },
+  },
+
+  promql = {
+    install_info = {
+      url = 'https://github.com/MichaHoffmann/tree-sitter-promql',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@MichaHoffmann' },
+    tier = 4,
+  },
+
+  prql = {
+    install_info = {
+      url = 'https://github.com/PRQL/tree-sitter-prql',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@matthias-Q' },
+  },
+
+  psv = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-csv',
+      files = { 'src/parser.c' },
+      location = 'psv',
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  pug = {
+    install_info = {
+      url = 'https://github.com/zealot128/tree-sitter-pug',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@zealot128' },
+    tier = 4,
+  },
+
+  puppet = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-puppet',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  purescript = {
+    install_info = {
+      url = 'https://github.com/postsolar/tree-sitter-purescript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@postsolar' },
+    tier = 3,
+  },
+
+  pymanifest = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-pymanifest',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    readme_name = 'PyPA manifest',
+    tier = 2,
+  },
+
+  python = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-python',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@stsewd', '@theHamsta' },
+  },
+
+  ql = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-ql',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@pwntester' },
+  },
+
+  qmldir = {
+    install_info = {
+      url = 'https://github.com/Decodetalkers/tree-sitter-qmldir',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  qmljs = {
+    install_info = {
+      url = 'https://github.com/yuja/tree-sitter-qmljs',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@Decodetalkers' },
+  },
+
+  query = {
+    install_info = {
+      url = 'https://github.com/nvim-treesitter/tree-sitter-query',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@steelsojka' },
+    readme_note = 'Tree-sitter query language',
+    tier = 1,
+  },
+
+  r = {
+    install_info = {
+      url = 'https://github.com/r-lib/tree-sitter-r',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ribru17' },
+    tier = 3,
+  },
+
+  racket = {
+    install_info = {
+      url = 'https://github.com/6cdh/tree-sitter-racket',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    tier = 4,
+  },
+
+  ralph = {
+    install_info = {
+      url = 'https://github.com/alephium/tree-sitter-ralph',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@tdroxler' },
+    tier = 3,
+  },
+
+  rasi = {
+    install_info = {
+      url = 'https://github.com/Fymyte/tree-sitter-rasi',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Fymyte' },
+  },
+
+  razor = {
+    install_info = {
+      url = 'https://github.com/tris203/tree-sitter-razor',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@tris203' },
+    tier = 3,
+  },
+
+  rbs = {
+    install_info = {
+      url = 'https://github.com/joker1007/tree-sitter-rbs',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@joker1007' },
+    tier = 3,
+  },
+
+  re2c = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-re2c',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  readline = {
+    install_info = {
+      url = 'https://github.com/ribru17/tree-sitter-readline',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ribru17' },
+    tier = 3,
+  },
+
+  regex = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-regex',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@theHamsta' },
+  },
+
+  rego = {
+    install_info = {
+      url = 'https://github.com/FallenAngel97/tree-sitter-rego',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@FallenAngel97' },
+  },
+
+  requirements = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-requirements',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    readme_name = 'pip requirements',
+    tier = 2,
+  },
+
+  rescript = {
+    install_info = {
+      url = 'https://github.com/rescript-lang/tree-sitter-rescript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ribru17' },
+    tier = 2,
+  },
+
+  rnoweb = {
+    install_info = {
+      url = 'https://github.com/bamonroe/tree-sitter-rnoweb',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@bamonroe' },
+  },
+
+  robot = {
+    install_info = {
+      url = 'https://github.com/Hubro/tree-sitter-robot',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Hubro' },
+    tier = 3,
+  },
+
+  robots = {
+    install_info = {
+      url = 'https://github.com/opa-oz/tree-sitter-robots-txt',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@opa-oz' },
+    tier = 3,
+  },
+
+  roc = {
+    install_info = {
+      url = 'https://github.com/faldor20/tree-sitter-roc',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@nat-418' },
+    tier = 3,
+  },
+
+  ron = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-ron',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  rst = {
+    install_info = {
+      url = 'https://github.com/stsewd/tree-sitter-rst',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@stsewd' },
+  },
+
+  ruby = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-ruby',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@TravonteD' },
+  },
+
+  runescript = {
+    install_info = {
+      url = 'https://github.com/2004Scape/tree-sitter-runescript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@2004Scape' },
+    tier = 3,
+  },
+
+  rust = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-rust',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  scala = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-scala',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@stevanmilic' },
+  },
+
+  scfg = {
+    install_info = {
+      url = 'https://github.com/rockorager/tree-sitter-scfg',
+      files = { 'src/parser.c' },
+      requires_generate_from_grammar = true,
+    },
+    maintainers = { '@WhyNotHugo' },
+    tier = 3,
+  },
+
+  scheme = {
+    install_info = {
+      url = 'https://github.com/6cdh/tree-sitter-scheme',
+      files = { 'src/parser.c' },
+    },
+    tier = 4,
+  },
+
+  scss = {
+    install_info = {
+      url = 'https://github.com/serenadeai/tree-sitter-scss',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@elianiva' },
+  },
+
+  sflog = {
+    install_info = {
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
+      files = { 'src/parser.c' },
+      location = 'sflog',
+    },
+    maintainers = { '@aheber', '@xixiaofinland' },
+    readme_note = 'Salesforce debug log',
+    tier = 3,
+  },
+  slang = {
+    install_info = {
+      url = 'https://github.com/theHamsta/tree-sitter-slang',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    readme_note = 'Shader Slang',
+    maintainers = { '@theHamsta' },
+    tier = 4,
+  },
+
+  slim = {
+    install_info = {
+      url = 'https://github.com/theoo/tree-sitter-slim',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@theoo' },
+    tier = 3,
+  },
+
+  slint = {
+    install_info = {
+      url = 'https://github.com/slint-ui/tree-sitter-slint',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@hunger' },
+    tier = 3,
+  },
+
+  smali = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-smali',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 3,
+  },
+
+  snakemake = {
+    install_info = {
+      url = 'https://github.com/osthomas/tree-sitter-snakemake',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainer = { '@osthomas' },
+    tier = 4,
+  },
+
+  smithy = {
+    install_info = {
+      url = 'https://github.com/indoorvivants/tree-sitter-smithy',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq', '@keynmol' },
+  },
+
+  solidity = {
+    install_info = {
+      url = 'https://github.com/JoranHonig/tree-sitter-solidity',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+  soql = {
+    install_info = {
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
+      files = { 'src/parser.c' },
+      location = 'soql',
+    },
+    maintainers = { '@aheber', '@xixiafinland' },
+    tier = 3,
+  },
+
+  sosl = {
+    install_info = {
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
+      files = { 'src/parser.c' },
+      location = 'sosl',
+    },
+    maintainers = { '@aheber', '@xixiafinland' },
+  },
+
+  sourcepawn = {
+    install_info = {
+      url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@Sarrus1' },
+    tier = 3,
+  },
+
+  sparql = {
+    install_info = {
+      url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@GordianDziwis' },
+  },
+
+  sql = {
+    install_info = {
+      url = 'https://github.com/derekstride/tree-sitter-sql',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      branch = 'gh-pages',
+    },
+    maintainers = { '@derekstride' },
+  },
+
+  squirrel = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-squirrel',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  ssh_config = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-ssh-config',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  starlark = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-starlark',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  strace = {
+    install_info = {
+      url = 'https://github.com/sigmaSd/tree-sitter-strace',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  styled = {
+    install_info = {
+      url = 'https://github.com/mskelton/tree-sitter-styled',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@mskelton' },
+    tier = 3,
+  },
+
+  supercollider = {
+    install_info = {
+      url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@madskjeldgaard' },
+  },
+
+  superhtml = {
+    install_info = {
+      url = 'https://github.com/kristoff-it/superhtml',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'tree-sitter-superhtml',
+    },
+    maintainers = { '@rockorager' },
+    tier = 3,
+  },
+
+  surface = {
+    install_info = {
+      url = 'https://github.com/connorlay/tree-sitter-surface',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@connorlay' },
+  },
+
+  svelte = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  sway = {
+    install_info = {
+      url = 'https://github.com/FuelLabs/tree-sitter-sway.git',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ribru17' },
+    tier = 2,
+  },
+
+  swift = {
+    install_info = {
+      url = 'https://github.com/alex-pinkus/tree-sitter-swift',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      requires_generate_from_grammar = true,
+    },
+    maintainers = { '@alex-pinkus' },
+  },
+
+  sxhkdrc = {
+    install_info = {
+      url = 'https://github.com/RaafatTurki/tree-sitter-sxhkdrc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@RaafatTurki' },
+  },
+
+  systemtap = {
+    install_info = {
+      url = 'https://github.com/ok-ryoko/tree-sitter-systemtap',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ok-ryoko' },
+    tier = 3,
+  },
+
+  t32 = {
+    install_info = {
+      url = 'https://gitlab.com/xasc/tree-sitter-t32.git',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@xasc' },
+    tier = 3,
+  },
+
+  tablegen = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-tablegen',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  tact = {
+    install_info = {
+      url = 'https://github.com/tact-lang/tree-sitter-tact',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@novusnota' },
+    tier = 3,
+  },
+
+  teal = {
+    install_info = {
+      url = 'https://github.com/euclidianAce/tree-sitter-teal',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      requires_generate_from_grammar = true,
+    },
+    maintainers = { '@euclidianAce' },
+  },
+
+  templ = {
+    install_info = {
+      url = 'https://github.com/vrischmann/tree-sitter-templ',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@vrischmann' },
+    tier = 3,
+  },
+
+  tcl = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@lewis6991' },
+    tier = 2,
+  },
+
+  tera = {
+    install_info = {
+      url = 'https://github.com/uncenter/tree-sitter-tera',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@uncenter' },
+    tier = 2,
+  },
+
+  terraform = {
+    install_info = {
+      url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'dialects/terraform',
+    },
+    maintainers = { '@MichaHoffmann' },
+  },
+
+  textproto = {
+    install_info = {
+      url = 'https://github.com/PorterAtGoogle/tree-sitter-textproto',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Porter' },
+    tier = 3,
+  },
+
+  thrift = {
+    install_info = {
+      url = 'https://github.com/duskmoon314/tree-sitter-thrift',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq', '@duskmoon314' },
+  },
+
+  tiger = {
+    install_info = {
+      url = 'https://github.com/ambroisie/tree-sitter-tiger',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ambroisie' },
+  },
+
+  tlaplus = {
+    install_info = {
+      url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@ahelwer', '@susliko' },
+  },
+
+  tmux = {
+    install_info = {
+      url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Freed-Wu' },
+    tier = 3,
+  },
+
+  todotxt = {
+    install_info = {
+      url = 'https://github.com/arnarg/tree-sitter-todotxt',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@arnarg' },
+    tier = 4,
+  },
+
+  toml = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-toml',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@tk-shirasaka' },
+  },
+
+  tsv = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-csv',
+      files = { 'src/parser.c' },
+      location = 'tsv',
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  tsx = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-typescript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'tsx',
+      generate_requires_npm = true,
+    },
+    maintainers = { '@steelsojka' },
+  },
+
+  turtle = {
+    install_info = {
+      url = 'https://github.com/GordianDziwis/tree-sitter-turtle',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@GordianDziwis' },
+  },
+
+  twig = {
+    install_info = {
+      url = 'https://github.com/gbprod/tree-sitter-twig',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@gbprod' },
+  },
+
+  typescript = {
+    install_info = {
+      url = 'https://github.com/tree-sitter/tree-sitter-typescript',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'typescript',
+      generate_requires_npm = true,
+    },
+    maintainers = { '@steelsojka' },
+  },
+
+  typespec = {
+    install_info = {
+      url = 'https://github.com/happenslol/tree-sitter-typespec',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@happenslol' },
+    tier = 3,
+  },
+
+  typoscript = {
+    install_info = {
+      url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Teddytrombone' },
+    tier = 3,
+  },
+
+  typst = {
+    install_info = {
+      url = 'https://github.com/uben0/tree-sitter-typst',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@uben0', '@RaafatTurki' },
+    tier = 3,
+  },
+
+  udev = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-udev',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  ungrammar = {
+    install_info = {
+      url = 'https://github.com/Philipp-M/tree-sitter-ungrammar',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Philipp-M', '@amaanq' },
+  },
+
+  unison = {
+    install_info = {
+      url = 'https://github.com/kylegoetz/tree-sitter-unison',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      requires_generate_from_grammar = true,
+    },
+    maintainers = { '@tapegram' },
+    tier = 4,
+  },
+
+  usd = {
+    install_info = {
+      url = 'https://github.com/ColinKennedy/tree-sitter-usd',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ColinKennedy' },
+  },
+
+  uxntal = {
+    install_info = {
+      url = 'https://github.com/amaanq/tree-sitter-uxntal',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+  },
+
+  v = {
+    install_info = {
+      url = 'https://github.com/vlang/v-analyzer',
+      files = { 'src/parser.c' },
+      location = 'tree_sitter_v',
+    },
+    maintainers = { '@kkharji', '@amaanq' },
+  },
+
+  vala = {
+    install_info = {
+      url = 'https://github.com/vala-lang/tree-sitter-vala',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Prince781' },
+  },
+
+  vento = {
+    install_info = {
+      url = 'https://github.com/ventojs/tree-sitter-vento',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@wrapperup', '@oscarotero' },
+    tier = 3,
+  },
+
+  verilog = {
+    install_info = {
+      url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@zhangwwpeng' },
+  },
+
+  vhdl = {
+    install_info = {
+      url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@jpt13653903' },
+    tier = 3,
+  },
+
+  vhs = {
+    install_info = {
+      url = 'https://github.com/charmbracelet/tree-sitter-vhs',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@caarlos0' },
+  },
+
+  vim = {
+    install_info = {
+      url = 'https://github.com/neovim/tree-sitter-vim',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@clason' },
+    tier = 1,
+  },
+
+  vimdoc = {
+    install_info = {
+      url = 'https://github.com/neovim/tree-sitter-vimdoc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@clason' },
+    tier = 1,
+  },
+
+  vrl = {
+    install_info = {
+      url = 'https://github.com/belltoy/tree-sitter-vrl',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@belltoy' },
+    tier = 3,
+  },
+
+  vue = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      branch = 'main',
+    },
+    maintainers = { '@WhyNotHugo', '@lucario387' },
+    tier = 2,
+  },
+
+  wing = {
+    install_info = {
+      url = 'https://github.com/winglang/tree-sitter-wing',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@gshpychka', '@MarkMcCulloh' },
+    tier = 3,
+  },
+
+  wgsl = {
+    install_info = {
+      url = 'https://github.com/szebniok/tree-sitter-wgsl',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@szebniok' },
+  },
+
+  wgsl_bevy = {
+    install_info = {
+      url = 'https://github.com/theHamsta/tree-sitter-wgsl-bevy',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_requires_npm = true,
+    },
+    maintainers = { '@theHamsta' },
+  },
+
+  wit = {
+    install_info = {
+      url = 'https://github.com/liamwh/tree-sitter-wit',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@liamwh' },
+    tier = 3,
+  },
+  xcompose = {
+    install_info = {
+      url = 'https://github.com/ObserverOfTime/tree-sitter-xcompose',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  xml = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
+      files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'xml',
+    },
+    maintainers = { '@ObserverOfTime' },
+    tier = 2,
+  },
+
+  xresources = {
+    install_info = {
+      url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
+      files = { 'src/parser.c' },
+    },
+    filetype = 'xdefaults',
+    maintainers = { '@ValdezFOmar' },
+    tier = 3,
+  },
+
+  yaml = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 2,
+  },
+
+  yang = {
+    install_info = {
+      url = 'https://github.com/Hubro/tree-sitter-yang',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Hubro' },
+  },
+
+  yuck = {
+    install_info = {
+      url = 'https://github.com/Philipp-M/tree-sitter-yuck',
+      files = { 'src/parser.c', 'src/scanner.c' },
+    },
+    maintainers = { '@Philipp-M', '@amaanq' },
+  },
+
+  zathurarc = {
+    install_info = {
+      url = 'https://github.com/Freed-Wu/tree-sitter-zathurarc',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@Freed-Wu' },
+    tier = 3,
+  },
+
+  zig = {
+    install_info = {
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
+      files = { 'src/parser.c' },
+    },
+    maintainers = { '@amaanq' },
+    tier = 1,
+  },
+
+  ziggy = {
+    install_info = {
+      url = 'https://github.com/kristoff-it/ziggy',
+      files = { 'src/parser.c' },
+      location = 'tree-sitter-ziggy',
+    },
+    maintainers = { '@rockorager' },
+    tier = 3,
+  },
+
+  ziggy_schema = {
+    install_info = {
+      url = 'https://github.com/kristoff-it/ziggy',
+      files = { 'src/parser.c' },
+      location = 'tree-sitter-ziggy-schema',
+    },
+    maintainers = { '@rockorager' },
+    tier = 3,
+  },
+}
 
 -- Get a list of all available parsers
+---@param tier integer? only get parsers of specified tier
 ---@return string[]
-function M.available_parsers()
-  local parsers = vim.tbl_keys(M.list)
+function M.get_available(tier)
+  local parsers = vim.tbl_keys(M.configs)
   table.sort(parsers)
-  if vim.fn.executable "tree-sitter" == 1 and vim.fn.executable "node" == 1 then
-    return parsers
-  else
-    return vim.tbl_filter(function(p) ---@param p string
-      return not M.list[p].install_info.requires_generate_from_grammar
+  if tier then
+    parsers = vim.iter.filter(function(p)
+      return M.configs[p].tier == tier
     end, parsers)
   end
-end
-
-function M.get_parser_configs()
-  return M.list
-end
-
-local parser_files
-
-function M.reset_cache()
-  parser_files = setmetatable({}, {
-    __index = function(tbl, key)
-      rawset(tbl, key, api.nvim_get_runtime_file("parser/" .. key .. ".*", false))
-      return rawget(tbl, key)
-    end,
-  })
-end
-
-M.reset_cache()
-
-function M.has_parser(lang)
-  lang = lang or M.get_buf_lang(api.nvim_get_current_buf())
-
-  if not lang or #lang == 0 then
-    return false
+  if vim.fn.executable('tree-sitter') == 0 or vim.fn.executable('node') == 0 then
+    parsers = vim.iter.filter(function(p)
+      return not M.configs[p].install_info.requires_generate_from_grammar
+    end, parsers)
   end
-  -- HACK: nvim internal API
-  if vim._ts_has_language(lang) then
-    return true
-  end
-  return #parser_files[lang] > 0
-end
-
-function M.get_parser(bufnr, lang)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  lang = lang or M.get_buf_lang(bufnr)
-
-  if M.has_parser(lang) then
-    return ts.get_parser(bufnr, lang)
-  end
-end
-
--- @deprecated This is only kept for legacy purposes.
---             All root nodes should be accounted for.
-function M.get_tree_root(bufnr)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  return M.get_parser(bufnr):parse()[1]:root()
-end
-
--- Gets the language of a given buffer
----@param bufnr number? or current buffer
----@return string
-function M.get_buf_lang(bufnr)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  return M.ft_to_lang(api.nvim_buf_get_option(bufnr, "ft"))
+  return parsers
 end
 
 return M
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index 4aba9f2fd..f7e5205f7 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -1,154 +1,7 @@
-local api = vim.api
-local ts = require "nvim-treesitter.compat"
-local tsrange = require "nvim-treesitter.tsrange"
-local utils = require "nvim-treesitter.utils"
-local parsers = require "nvim-treesitter.parsers"
-local caching = require "nvim-treesitter.caching"
-
 local M = {}
 
 local EMPTY_ITER = function() end
 
-M.built_in_query_groups = { "highlights", "locals", "folds", "indents", "injections" }
-
--- Creates a function that checks whether a given query exists
--- for a specific language.
----@param query string
----@return fun(string): boolean
-local function get_query_guard(query)
-  return function(lang)
-    return M.has_query_files(lang, query)
-  end
-end
-
-for _, query in ipairs(M.built_in_query_groups) do
-  M["has_" .. query] = get_query_guard(query)
-end
-
----@return string[]
-function M.available_query_groups()
-  local query_files = api.nvim_get_runtime_file("queries/*/*.scm", true)
-  local groups = {}
-  for _, f in ipairs(query_files) do
-    groups[vim.fn.fnamemodify(f, ":t:r")] = true
-  end
-  local list = {}
-  for k, _ in pairs(groups) do
-    table.insert(list, k)
-  end
-  return list
-end
-
-do
-  local query_cache = caching.create_buffer_cache()
-
-  local function update_cached_matches(bufnr, changed_tick, query_group)
-    query_cache.set(query_group, bufnr, {
-      tick = changed_tick,
-      cache = M.collect_group_results(bufnr, query_group) or {},
-    })
-  end
-
-  ---@param bufnr integer
-  ---@param query_group string
-  ---@return any
-  function M.get_matches(bufnr, query_group)
-    bufnr = bufnr or api.nvim_get_current_buf()
-    local cached_local = query_cache.get(query_group, bufnr)
-    if not cached_local or api.nvim_buf_get_changedtick(bufnr) > cached_local.tick then
-      update_cached_matches(bufnr, api.nvim_buf_get_changedtick(bufnr), query_group)
-    end
-
-    return query_cache.get(query_group, bufnr).cache
-  end
-end
-
----@param lang string
----@param query_name string
----@return string[]
-local function runtime_queries(lang, query_name)
-  return api.nvim_get_runtime_file(string.format("queries/%s/%s.scm", lang, query_name), true) or {}
-end
-
----@type table<string, table<string, boolean>>
-local query_files_cache = {}
-
----@param lang string
----@param query_name string
----@return boolean
-function M.has_query_files(lang, query_name)
-  if not query_files_cache[lang] then
-    query_files_cache[lang] = {}
-  end
-  if query_files_cache[lang][query_name] == nil then
-    local files = runtime_queries(lang, query_name)
-    query_files_cache[lang][query_name] = files and #files > 0
-  end
-  return query_files_cache[lang][query_name]
-end
-
-do
-  local mt = {}
-  mt.__index = function(tbl, key)
-    if rawget(tbl, key) == nil then
-      rawset(tbl, key, {})
-    end
-    return rawget(tbl, key)
-  end
-
-  -- cache will auto set the table for each lang if it is nil
-  ---@type table<string, table<string, Query>>
-  local cache = setmetatable({}, mt)
-
-  -- Same as `vim.treesitter.query` except will return cached values
-  ---@param lang string
-  ---@param query_name string
-  function M.get_query(lang, query_name)
-    if cache[lang][query_name] == nil then
-      cache[lang][query_name] = ts.get_query(lang, query_name)
-    end
-
-    return cache[lang][query_name]
-  end
-
-  -- Invalidates the query file cache.
-  --
-  -- If lang and query_name is both present, will reload for only the lang and query_name.
-  -- If only lang is present, will reload all query_names for that lang
-  -- If none are present, will reload everything
-  ---@param lang? string
-  ---@param query_name? string
-  function M.invalidate_query_cache(lang, query_name)
-    if lang and query_name then
-      cache[lang][query_name] = nil
-      if query_files_cache[lang] then
-        query_files_cache[lang][query_name] = nil
-      end
-    elseif lang and not query_name then
-      query_files_cache[lang] = nil
-      for query_name0, _ in pairs(cache[lang]) do
-        M.invalidate_query_cache(lang, query_name0)
-      end
-    elseif not lang and not query_name then
-      query_files_cache = {}
-      for lang0, _ in pairs(cache) do
-        for query_name0, _ in pairs(cache[lang0]) do
-          M.invalidate_query_cache(lang0, query_name0)
-        end
-      end
-    else
-      error "Cannot have query_name by itself!"
-    end
-  end
-end
-
--- This function is meant for an autocommand and not to be used. Only use if file is a query file.
----@param fname string
-function M.invalidate_query_file(fname)
-  local fnamemodify = vim.fn.fnamemodify
-  M.invalidate_query_cache(fnamemodify(fname, ":p:h:t"), fnamemodify(fname, ":t:r"))
-end
-
 ---@class QueryInfo
 ---@field root TSNode
 ---@field source integer
@@ -161,13 +14,13 @@ end
 ---@param root_lang string|nil
 ---@return Query|nil, QueryInfo|nil
 local function prepare_query(bufnr, query_name, root, root_lang)
-  local buf_lang = parsers.get_buf_lang(bufnr)
-
+  local ft = vim.bo[bufnr].filetype
+  local buf_lang = vim.treesitter.language.get_lang(ft) or ft
   if not buf_lang then
     return
   end
 
-  local parser = parsers.get_parser(bufnr, buf_lang)
+  local parser = vim.treesitter.get_parser(bufnr, buf_lang)
   if not parser then
     return
   end
@@ -198,7 +51,7 @@ local function prepare_query(bufnr, query_name, root, root_lang)
     return
   end
 
-  local query = M.get_query(root_lang, query_name)
+  local query = vim.treesitter.query.get(root_lang, query_name)
   if not query then
     return
   end
@@ -241,7 +94,7 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
   ---@return string[]
   local function split(to_split)
     local t = {}
-    for str in string.gmatch(to_split, "([^.]+)") do
+    for str in string.gmatch(to_split, '([^.]+)') do
       table.insert(t, str)
     end
 
@@ -259,9 +112,9 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
       for id, node in pairs(match) do
         local name = query.captures[id] -- name of the capture in the query
         if name ~= nil then
-          local path = split(name .. ".node")
+          local path = split(name .. '.node')
           M.insert_to_path(prepared_match, path, node)
-          local metadata_path = split(name .. ".metadata")
+          local metadata_path = split(name .. '.metadata')
           M.insert_to_path(prepared_match, metadata_path, metadata[id])
         end
       end
@@ -272,16 +125,9 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
       if preds then
         for _, pred in pairs(preds) do
           -- functions
-          if pred[1] == "set!" and type(pred[2]) == "string" then
+          if pred[1] == 'set!' and type(pred[2]) == 'string' then
             M.insert_to_path(prepared_match, split(pred[2]), pred[3])
           end
-          if pred[1] == "make-range!" and type(pred[2]) == "string" and #pred == 4 then
-            M.insert_to_path(
-              prepared_match,
-              split(pred[2] .. ".node"),
-              tsrange.TSRange.from_nodes(bufnr, match[pred[3]], match[pred[4]])
-            )
-          end
         end
       end
 
@@ -291,103 +137,6 @@ function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
   return iterator
 end
 
--- Return all nodes corresponding to a specific capture path (like @definition.var, @reference.type)
--- Works like M.get_references or M.get_scopes except you can choose the capture
--- Can also be a nested capture like @definition.function to get all nodes defining a function.
---
----@param bufnr integer the buffer
----@param captures string|string[]
----@param query_group string the name of query group (highlights or injections for example)
----@param root TSNode|nil node from where to start the search
----@param lang string|nil the language from where to get the captures.
----              Root nodes can have several languages.
----@return table|nil
-function M.get_capture_matches(bufnr, captures, query_group, root, lang)
-  if type(captures) == "string" then
-    captures = { captures }
-  end
-  local strip_captures = {} ---@type string[]
-  for i, capture in ipairs(captures) do
-    if capture:sub(1, 1) ~= "@" then
-      error 'Captures must start with "@"'
-      return
-    end
-    -- Remove leading "@".
-    strip_captures[i] = capture:sub(2)
-  end
-
-  local matches = {}
-  for match in M.iter_group_results(bufnr, query_group, root, lang) do
-    for _, capture in ipairs(strip_captures) do
-      local insert = utils.get_at_path(match, capture)
-      if insert then
-        table.insert(matches, insert)
-      end
-    end
-  end
-  return matches
-end
-
-function M.iter_captures(bufnr, query_name, root, lang)
-  local query, params = prepare_query(bufnr, query_name, root, lang)
-  if not query then
-    return EMPTY_ITER
-  end
-  assert(params)
-
-  local iter = query:iter_captures(params.root, params.source, params.start, params.stop)
-
-  local function wrapped_iter()
-    local id, node, metadata = iter()
-    if not id then
-      return
-    end
-
-    local name = query.captures[id]
-    if string.sub(name, 1, 1) == "_" then
-      return wrapped_iter()
-    end
-
-    return name, node, metadata
-  end
-
-  return wrapped_iter
-end
-
----@param bufnr integer
----@param capture_string string
----@param query_group string
----@param filter_predicate fun(match: table): boolean
----@param scoring_function fun(match: table): number
----@param root TSNode
----@return table|unknown
-function M.find_best_match(bufnr, capture_string, query_group, filter_predicate, scoring_function, root)
-  if string.sub(capture_string, 1, 1) == "@" then
-    --remove leading "@"
-    capture_string = string.sub(capture_string, 2)
-  end
-
-  local best ---@type table|nil
-  local best_score ---@type number
-
-  for maybe_match in M.iter_group_results(bufnr, query_group, root) do
-    local match = utils.get_at_path(maybe_match, capture_string)
-
-    if match and filter_predicate(match) then
-      local current_score = scoring_function(match)
-      if not best then
-        best = match
-        best_score = current_score
-      end
-      if current_score > best_score then
-        best = match
-        best_score = current_score
-      end
-    end
-  end
-  return best
-end
-
 ---Iterates matches from a query file.
 ---@param bufnr integer the buffer
 ---@param query_group string the query file to use
@@ -413,41 +162,4 @@ function M.collect_group_results(bufnr, query_group, root, lang)
   return matches
 end
 
----@alias CaptureResFn function(string, LanguageTree, LanguageTree): string, string
-
--- Same as get_capture_matches except this will recursively get matches for every language in the tree.
----@param bufnr integer The buffer
----@param capture_or_fn string|CaptureResFn The capture to get. If a function is provided then that
----                       function will be used to resolve both the capture and query argument.
----                       The function can return `nil` to ignore that tree.
----@param query_type string? The query to get the capture from. This is ignored if a function is provided
----                    for the capture argument.
----@return table[]
-function M.get_capture_matches_recursively(bufnr, capture_or_fn, query_type)
-  ---@type CaptureResFn
-  local type_fn
-  if type(capture_or_fn) == "function" then
-    type_fn = capture_or_fn
-  else
-    type_fn = function(_, _, _)
-      return capture_or_fn, query_type
-    end
-  end
-  local parser = parsers.get_parser(bufnr)
-  local matches = {}
-
-  if parser then
-    parser:for_each_tree(function(tree, lang_tree)
-      local lang = lang_tree:lang()
-      local capture, type_ = type_fn(lang, tree, lang_tree)
-
-      if capture then
-        vim.list_extend(matches, M.get_capture_matches(bufnr, capture, type_, tree:root(), lang) or {})
-      end
-    end)
-  end
-
-  return matches
-end
-
 return M
diff --git a/lua/nvim-treesitter/query_predicates.lua b/lua/nvim-treesitter/query_predicates.lua
deleted file mode 100644
index 7539170dc..000000000
--- a/lua/nvim-treesitter/query_predicates.lua
+++ /dev/null
@@ -1,167 +0,0 @@
-local query = require "vim.treesitter.query"
-
-local html_script_type_languages = {
-  ["importmap"] = "json",
-  ["module"] = "javascript",
-  ["application/ecmascript"] = "javascript",
-  ["text/ecmascript"] = "javascript",
-}
-
-local non_filetype_match_injection_language_aliases = {
-  ex = "elixir",
-  pl = "perl",
-  sh = "bash",
-  uxn = "uxntal",
-  ts = "typescript",
-}
-
--- compatibility shim for breaking change on nightly/0.11
-local opts = vim.fn.has "nvim-0.10" == 1 and { force = true, all = false } or true
-
-local function get_parser_from_markdown_info_string(injection_alias)
-  local match = vim.filetype.match { filename = "a." .. injection_alias }
-  return match or non_filetype_match_injection_language_aliases[injection_alias] or injection_alias
-end
-
-local function error(str)
-  vim.api.nvim_err_writeln(str)
-end
-
-local function valid_args(name, pred, count, strict_count)
-  local arg_count = #pred - 1
-
-  if strict_count then
-    if arg_count ~= count then
-      error(string.format("%s must have exactly %d arguments", name, count))
-      return false
-    end
-  elseif arg_count < count then
-    error(string.format("%s must have at least %d arguments", name, count))
-    return false
-  end
-
-  return true
-end
-
----@param match (TSNode|nil)[]
----@param _pattern string
----@param _bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_predicate("nth?", function(match, _pattern, _bufnr, pred)
-  if not valid_args("nth?", pred, 2, true) then
-    return
-  end
-
-  local node = match[pred[2]] ---@type TSNode
-  local n = tonumber(pred[3])
-  if node and node:parent() and node:parent():named_child_count() > n then
-    return node:parent():named_child(n) == node
-  end
-
-  return false
-end, opts)
-
----@param match (TSNode|nil)[]
----@param _pattern string
----@param bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_predicate("is?", function(match, _pattern, bufnr, pred)
-  if not valid_args("is?", pred, 2) then
-    return
-  end
-
-  -- Avoid circular dependencies
-  local locals = require "nvim-treesitter.locals"
-  local node = match[pred[2]]
-  local types = { unpack(pred, 3) }
-
-  if not node then
-    return true
-  end
-
-  local _, _, kind = locals.find_definition(node, bufnr)
-
-  return vim.tbl_contains(types, kind)
-end, opts)
-
----@param match (TSNode|nil)[]
----@param _pattern string
----@param _bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_predicate("kind-eq?", function(match, _pattern, _bufnr, pred)
-  if not valid_args(pred[1], pred, 2) then
-    return
-  end
-
-  local node = match[pred[2]]
-  local types = { unpack(pred, 3) }
-
-  if not node then
-    return true
-  end
-
-  return vim.tbl_contains(types, node:type())
-end, opts)
-
----@param match (TSNode|nil)[]
----@param _ string
----@param bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_directive("set-lang-from-mimetype!", function(match, _, bufnr, pred, metadata)
-  local capture_id = pred[2]
-  local node = match[capture_id]
-  if not node then
-    return
-  end
-  local type_attr_value = vim.treesitter.get_node_text(node, bufnr)
-  local configured = html_script_type_languages[type_attr_value]
-  if configured then
-    metadata["injection.language"] = configured
-  else
-    local parts = vim.split(type_attr_value, "/", {})
-    metadata["injection.language"] = parts[#parts]
-  end
-end, opts)
-
----@param match (TSNode|nil)[]
----@param _ string
----@param bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_directive("set-lang-from-info-string!", function(match, _, bufnr, pred, metadata)
-  local capture_id = pred[2]
-  local node = match[capture_id]
-  if not node then
-    return
-  end
-  local injection_alias = vim.treesitter.get_node_text(node, bufnr):lower()
-  metadata["injection.language"] = get_parser_from_markdown_info_string(injection_alias)
-end, opts)
-
--- Just avoid some annoying warnings for this directive
-query.add_directive("make-range!", function() end, opts)
-
---- transform node text to lower case (e.g., to make @injection.language case insensitive)
----
----@param match (TSNode|nil)[]
----@param _ string
----@param bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_directive("downcase!", function(match, _, bufnr, pred, metadata)
-  local id = pred[2]
-  local node = match[id]
-  if not node then
-    return
-  end
-
-  local text = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] }) or ""
-  if not metadata[id] then
-    metadata[id] = {}
-  end
-  metadata[id].text = string.lower(text)
-end, opts)
diff --git a/lua/nvim-treesitter/shell_cmds.lua b/lua/nvim-treesitter/shell_cmds.lua
new file mode 100644
index 000000000..2dc7f8748
--- /dev/null
+++ b/lua/nvim-treesitter/shell_cmds.lua
@@ -0,0 +1,255 @@
+local uv = vim.loop
+local utils = require('nvim-treesitter.utils')
+
+local iswin = uv.os_uname().sysname == 'Windows_NT'
+
+local M = {}
+
+---@param executables string[]
+---@return string|nil
+function M.select_executable(executables)
+  return vim.tbl_filter(function(c) ---@param c string
+    return c ~= vim.NIL and vim.fn.executable(c) == 1
+  end, executables)[1]
+end
+
+-- Returns the compiler arguments based on the compiler and OS
+---@param repo InstallInfo
+---@param compiler string
+---@return string[]
+function M.select_compiler_args(repo, compiler)
+  if compiler:find('cl$') or compiler:find('cl.exe$') then
+    return {
+      '/Fe:',
+      'parser.so',
+      '/Isrc',
+      repo.files,
+      '-Os',
+      '/utf-8',
+      '/LD',
+    }
+  elseif compiler:find('zig$') or compiler:find('zig.exe$') then
+    return {
+      'c++',
+      '-o',
+      'parser.so',
+      repo.files,
+      '-lc',
+      '-Isrc',
+      '-shared',
+      '-Os',
+    }
+  else
+    local args = {
+      '-o',
+      'parser.so',
+      '-I./src',
+      repo.files,
+      '-Os',
+    }
+    if uv.os_uname().sysname == 'Darwin' then
+      table.insert(args, '-bundle')
+    else
+      table.insert(args, '-shared')
+    end
+    if
+      #vim.tbl_filter(function(file) ---@param file string
+        local ext = vim.fn.fnamemodify(file, ':e')
+        return ext == 'cc' or ext == 'cpp' or ext == 'cxx'
+      end, repo.files) > 0
+    then
+      table.insert(args, '-lstdc++')
+    end
+    if not iswin then
+      table.insert(args, '-fPIC')
+    end
+    return args
+  end
+end
+
+-- Returns the compile command based on the OS and user options
+---@param repo InstallInfo
+---@param cc string
+---@param compile_location string
+---@return Command
+function M.select_compile_command(repo, cc, compile_location)
+  local make = M.select_executable({ 'gmake', 'make' })
+  if cc:find('cl$') or cc:find('cl.exe$') or not repo.use_makefile or iswin or not make then
+    return {
+      cmd = cc,
+      info = 'Compiling...',
+      err = 'Error during compilation',
+      opts = {
+        args = vim.tbl_flatten(M.select_compiler_args(repo, cc)),
+        cwd = compile_location,
+      },
+    }
+  else
+    return {
+      cmd = make,
+      info = 'Compiling...',
+      err = 'Error during compilation',
+      opts = {
+        args = {
+          '--makefile=' .. utils.get_package_path('scripts', 'compile_parsers.makefile'),
+          'CC=' .. cc,
+        },
+        cwd = compile_location,
+      },
+    }
+  end
+end
+
+---@param repo InstallInfo
+---@param project_name string
+---@param cache_dir string
+---@param revision string|nil
+---@param prefer_git boolean
+---@return table
+function M.select_download_commands(repo, project_name, cache_dir, revision, prefer_git)
+  local can_use_tar = vim.fn.executable('tar') == 1 and vim.fn.executable('curl') == 1
+  local is_github = repo.url:find('github.com', 1, true)
+  local is_gitlab = repo.url:find('gitlab.com', 1, true)
+  local project_dir = utils.join_path(cache_dir, project_name)
+
+  revision = revision or repo.branch or 'master'
+
+  if can_use_tar and (is_github or is_gitlab) and not prefer_git then
+    local url = repo.url:gsub('.git$', '')
+
+    local dir_rev = revision
+    if is_github and revision:find('^v%d') then
+      dir_rev = revision:sub(2)
+    end
+
+    local temp_dir = project_dir .. '-tmp'
+
+    return {
+      {
+        cmd = function()
+          vim.fn.delete(temp_dir, 'rf')
+        end,
+      },
+      {
+        cmd = 'curl',
+        info = 'Downloading ' .. project_name .. '...',
+        err = 'Error during download, please verify your internet connection',
+        opts = {
+          args = {
+            '--silent',
+            '-L', -- follow redirects
+            is_github and url .. '/archive/' .. revision .. '.tar.gz'
+              or url
+                .. '/-/archive/'
+                .. revision
+                .. '/'
+                .. project_name
+                .. '-'
+                .. revision
+                .. '.tar.gz',
+            '--output',
+            project_name .. '.tar.gz',
+          },
+          cwd = cache_dir,
+        },
+      },
+      {
+        cmd = function()
+          --TODO(clason): use vim.fn.mkdir(temp_dir, 'p') in case stdpath('cache') is not created
+          uv.fs_mkdir(temp_dir, 493)
+        end,
+        info = 'Creating temporary directory',
+        err = 'Could not create ' .. project_name .. '-tmp',
+      },
+      {
+        cmd = 'tar',
+        info = 'Extracting ' .. project_name .. '...',
+        err = 'Error during tarball extraction.',
+        opts = {
+          args = {
+            '-xvzf',
+            project_name .. '.tar.gz',
+            '-C',
+            project_name .. '-tmp',
+          },
+          cwd = cache_dir,
+        },
+      },
+      {
+        cmd = function()
+          uv.fs_unlink(project_dir .. '.tar.gz')
+        end,
+      },
+      {
+        cmd = function()
+          uv.fs_rename(
+            utils.join_path(temp_dir, url:match('[^/]-$') .. '-' .. dir_rev),
+            project_dir
+          )
+        end,
+      },
+      {
+        cmd = function()
+          vim.fn.delete(temp_dir, 'rf')
+        end,
+      },
+    }
+  else
+    local git_dir = project_dir
+    local clone_error = 'Error during download, please verify your internet connection'
+
+    return {
+      {
+        cmd = 'git',
+        info = 'Downloading ' .. project_name .. '...',
+        err = clone_error,
+        opts = {
+          args = {
+            'clone',
+            repo.url,
+            project_name,
+          },
+          cwd = cache_dir,
+        },
+      },
+      {
+        cmd = 'git',
+        info = 'Checking out locked revision',
+        err = 'Error while checking out revision',
+        opts = {
+          args = {
+            'checkout',
+            revision,
+          },
+          cwd = git_dir,
+        },
+      },
+    }
+  end
+end
+
+--TODO(clason): only needed for iter_cmd_sync -> replace with uv.spawn?
+
+-- Convert path for cmd.exe on Windows (needed when shellslash is set)
+---@param p string
+---@return string
+local function cmdpath(p)
+  return vim.o.shellslash and p:gsub('/', '\\') or p
+end
+
+---@param dir string
+---@param command string
+---@return string command
+function M.make_directory_change_for_command(dir, command)
+  if iswin then
+    if string.find(vim.o.shell, 'cmd') ~= nil then
+      return string.format('pushd %s & %s & popd', cmdpath(dir), command)
+    else
+      return string.format('pushd %s ; %s ; popd', cmdpath(dir), command)
+    end
+  else
+    return string.format('cd %s;\n %s', dir, command)
+  end
+end
+
+return M
diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua
deleted file mode 100644
index ee1d64745..000000000
--- a/lua/nvim-treesitter/shell_command_selectors.lua
+++ /dev/null
@@ -1,368 +0,0 @@
-local fn = vim.fn
-local utils = require "nvim-treesitter.utils"
-local uv = vim.uv or vim.loop
-
--- Convert path for cmd.exe on Windows.
--- This is needed when vim.opt.shellslash is in use.
----@param p string
----@return string
-local function cmdpath(p)
-  if vim.opt.shellslash:get() then
-    local r = p:gsub("/", "\\")
-    return r
-  else
-    return p
-  end
-end
-
-local M = {}
-
--- Returns the mkdir command based on the OS
----@param directory string
----@param cwd string
----@param info_msg string
----@return table
-function M.select_mkdir_cmd(directory, cwd, info_msg)
-  if fn.has "win32" == 1 then
-    return {
-      cmd = "cmd",
-      opts = {
-        args = { "/C", "mkdir", cmdpath(directory) },
-        cwd = cwd,
-      },
-      info = info_msg,
-      err = "Could not create " .. directory,
-    }
-  else
-    return {
-      cmd = "mkdir",
-      opts = {
-        args = { directory },
-        cwd = cwd,
-      },
-      info = info_msg,
-      err = "Could not create " .. directory,
-    }
-  end
-end
-
--- Returns the remove command based on the OS
----@param file string
----@param info_msg string
----@return table
-function M.select_rm_file_cmd(file, info_msg)
-  if fn.has "win32" == 1 then
-    return {
-      cmd = "cmd",
-      opts = {
-        args = { "/C", "if", "exist", cmdpath(file), "del", cmdpath(file) },
-      },
-      info = info_msg,
-      err = "Could not delete " .. file,
-    }
-  else
-    return {
-      cmd = "rm",
-      opts = {
-        args = { file },
-      },
-      info = info_msg,
-      err = "Could not delete " .. file,
-    }
-  end
-end
-
----@param executables string[]
----@return string|nil
-function M.select_executable(executables)
-  return vim.tbl_filter(function(c) ---@param c string
-    return c ~= vim.NIL and fn.executable(c) == 1
-  end, executables)[1]
-end
-
--- Returns the compiler arguments based on the compiler and OS
----@param repo InstallInfo
----@param compiler string
----@return string[]
-function M.select_compiler_args(repo, compiler)
-  if string.match(compiler, "cl$") or string.match(compiler, "cl.exe$") then
-    return {
-      "/Fe:",
-      "parser.so",
-      "/Isrc",
-      repo.files,
-      "-Os",
-      "/std:c11",
-      "/utf-8",
-      "/LD",
-    }
-  elseif string.match(compiler, "zig$") or string.match(compiler, "zig.exe$") then
-    return {
-      "c++",
-      "-o",
-      "parser.so",
-      repo.files,
-      "-lc",
-      "-Isrc",
-      "-shared",
-      "-Os",
-      "-std=c11",
-    }
-  else
-    local args = {
-      "-o",
-      "parser.so",
-      "-I./src",
-      repo.files,
-      "-Os",
-      "-std=c11",
-    }
-    if fn.has "mac" == 1 then
-      table.insert(args, "-bundle")
-    else
-      table.insert(args, "-shared")
-    end
-    if
-      #vim.tbl_filter(function(file) ---@param file string
-        local ext = vim.fn.fnamemodify(file, ":e")
-        return ext == "cc" or ext == "cpp" or ext == "cxx"
-      end, repo.files) > 0
-    then
-      table.insert(args, "-lstdc++")
-    end
-    if fn.has "win32" == 0 then
-      table.insert(args, "-fPIC")
-    end
-    return args
-  end
-end
-
--- Returns the compile command based on the OS and user options
----@param repo InstallInfo
----@param cc string
----@param compile_location string
----@return Command
-function M.select_compile_command(repo, cc, compile_location)
-  local make = M.select_executable { "gmake", "make" }
-  if
-    string.match(cc, "cl$")
-    or string.match(cc, "cl.exe$")
-    or not repo.use_makefile
-    or fn.has "win32" == 1
-    or not make
-  then
-    return {
-      cmd = cc,
-      info = "Compiling...",
-      err = "Error during compilation",
-      opts = {
-        args = require("nvim-treesitter.compat").flatten(M.select_compiler_args(repo, cc)),
-        cwd = compile_location,
-      },
-    }
-  else
-    return {
-      cmd = make,
-      info = "Compiling...",
-      err = "Error during compilation",
-      opts = {
-        args = {
-          "--makefile=" .. utils.join_path(utils.get_package_path(), "scripts", "compile_parsers.makefile"),
-          "CC=" .. cc,
-          "CXX_STANDARD=" .. (repo.cxx_standard or "c++14"),
-        },
-        cwd = compile_location,
-      },
-    }
-  end
-end
-
--- Returns the remove command based on the OS
----@param cache_folder string
----@param project_name string
----@return Command
-function M.select_install_rm_cmd(cache_folder, project_name)
-  if fn.has "win32" == 1 then
-    local dir = cache_folder .. "\\" .. project_name
-    return {
-      cmd = "cmd",
-      opts = {
-        args = { "/C", "if", "exist", cmdpath(dir), "rmdir", "/s", "/q", cmdpath(dir) },
-      },
-    }
-  else
-    return {
-      cmd = "rm",
-      opts = {
-        args = { "-rf", cache_folder .. "/" .. project_name },
-      },
-    }
-  end
-end
-
--- Returns the move command based on the OS
----@param from string
----@param to string
----@param cwd string
----@return Command
-function M.select_mv_cmd(from, to, cwd)
-  if fn.has "win32" == 1 then
-    return {
-      cmd = "cmd",
-      opts = {
-        args = { "/C", "move", "/Y", cmdpath(from), cmdpath(to) },
-        cwd = cwd,
-      },
-    }
-  else
-    return {
-      cmd = "mv",
-      opts = {
-        args = { "-f", from, to },
-        cwd = cwd,
-      },
-    }
-  end
-end
-
----@param repo InstallInfo
----@param project_name string
----@param cache_folder string
----@param revision string|nil
----@param prefer_git boolean
----@return table
-function M.select_download_commands(repo, project_name, cache_folder, revision, prefer_git)
-  local can_use_tar = vim.fn.executable "tar" == 1 and vim.fn.executable "curl" == 1
-  local is_github = repo.url:find("github.com", 1, true)
-  local is_gitlab = repo.url:find("gitlab.com", 1, true)
-
-  revision = revision or repo.branch or "master"
-
-  if can_use_tar and (is_github or is_gitlab) and not prefer_git then
-    local path_sep = utils.get_path_sep()
-    local url = repo.url:gsub(".git$", "")
-
-    local folder_rev = revision
-    if is_github and revision:match "^v%d" then
-      folder_rev = revision:sub(2)
-    end
-
-    return {
-      M.select_install_rm_cmd(cache_folder, project_name .. "-tmp"),
-      {
-        cmd = "curl",
-        info = "Downloading " .. project_name .. "...",
-        err = "Error during download, please verify your internet connection",
-        opts = {
-          args = {
-            "--silent",
-            "--show-error",
-            "-L", -- follow redirects
-            is_github and url .. "/archive/" .. revision .. ".tar.gz"
-              or url .. "/-/archive/" .. revision .. "/" .. project_name .. "-" .. revision .. ".tar.gz",
-            "--output",
-            project_name .. ".tar.gz",
-          },
-          cwd = cache_folder,
-        },
-      },
-      M.select_mkdir_cmd(project_name .. "-tmp", cache_folder, "Creating temporary directory"),
-      {
-        cmd = "tar",
-        info = "Extracting " .. project_name .. "...",
-        err = "Error during tarball extraction.",
-        opts = {
-          args = {
-            "-xvzf",
-            project_name .. ".tar.gz",
-            "-C",
-            project_name .. "-tmp",
-          },
-          cwd = cache_folder,
-        },
-      },
-      M.select_rm_file_cmd(cache_folder .. path_sep .. project_name .. ".tar.gz"),
-      M.select_mv_cmd(
-        utils.join_path(project_name .. "-tmp", url:match "[^/]-$" .. "-" .. folder_rev),
-        project_name,
-        cache_folder
-      ),
-      M.select_install_rm_cmd(cache_folder, project_name .. "-tmp"),
-    }
-  else
-    local git_folder = utils.join_path(cache_folder, project_name)
-    local clone_error = "Error during download, please verify your internet connection"
-
-    -- Running `git clone` or `git checkout` while running under Git (such as
-    -- editing a `git commit` message) will likely fail to install parsers
-    -- (such as 'gitcommit') and can also corrupt the index file of the current
-    -- Git repository. Check for typical git environment variables and abort if found.
-    for _, k in pairs {
-      "GIT_ALTERNATE_OBJECT_DIRECTORIES",
-      "GIT_CEILING_DIRECTORIES",
-      "GIT_DIR",
-      "GIT_INDEX",
-      "GIT_INDEX_FILE",
-      "GIT_OBJECT_DIRECTORY",
-      "GIT_PREFIX",
-      "GIT_WORK_TREE",
-    } do
-      if uv.os_getenv(k) then
-        vim.api.nvim_err_writeln(
-          string.format(
-            "Cannot install %s with git in an active git session. Exit the session and run ':TSInstall %s' manually",
-            project_name,
-            project_name
-          )
-        )
-        return {}
-      end
-    end
-
-    return {
-      {
-        cmd = "git",
-        info = "Downloading " .. project_name .. "...",
-        err = clone_error,
-        opts = {
-          args = {
-            "clone",
-            repo.url,
-            project_name,
-            "--filter=blob:none",
-          },
-          cwd = cache_folder,
-        },
-      },
-      {
-        cmd = "git",
-        info = "Checking out locked revision",
-        err = "Error while checking out revision",
-        opts = {
-          args = {
-            "checkout",
-            revision,
-          },
-          cwd = git_folder,
-        },
-      },
-    }
-  end
-end
-
----@param dir string
----@param command string
----@return string command
-function M.make_directory_change_for_command(dir, command)
-  if fn.has "win32" == 1 then
-    if string.find(vim.o.shell, "cmd") ~= nil then
-      return string.format("pushd %s & %s", cmdpath(dir), command)
-    else
-      return string.format("pushd %s ; %s", cmdpath(dir), command)
-    end
-  else
-    return string.format("cd %s;\n%s", dir, command)
-  end
-end
-
-return M
diff --git a/lua/nvim-treesitter/statusline.lua b/lua/nvim-treesitter/statusline.lua
deleted file mode 100644
index 68ba41aca..000000000
--- a/lua/nvim-treesitter/statusline.lua
+++ /dev/null
@@ -1,53 +0,0 @@
-local parsers = require "nvim-treesitter.parsers"
-local ts_utils = require "nvim-treesitter.ts_utils"
-
-local M = {}
-
--- Trim spaces and opening brackets from end
-local transform_line = function(line)
-  return line:gsub("%s*[%[%(%{]*%s*$", "")
-end
-
-function M.statusline(opts)
-  if not parsers.has_parser() then
-    return
-  end
-  local options = opts or {}
-  if type(opts) == "number" then
-    options = { indicator_size = opts }
-  end
-  local bufnr = options.bufnr or 0
-  local indicator_size = options.indicator_size or 100
-  local type_patterns = options.type_patterns or { "class", "function", "method" }
-  local transform_fn = options.transform_fn or transform_line
-  local separator = options.separator or " -> "
-  local allow_duplicates = options.allow_duplicates or false
-
-  local current_node = ts_utils.get_node_at_cursor()
-  if not current_node then
-    return ""
-  end
-
-  local lines = {}
-  local expr = current_node
-
-  while expr do
-    local line = ts_utils._get_line_for_node(expr, type_patterns, transform_fn, bufnr)
-    if line ~= "" then
-      if allow_duplicates or not vim.tbl_contains(lines, line) then
-        table.insert(lines, 1, line)
-      end
-    end
-    expr = expr:parent()
-  end
-
-  local text = table.concat(lines, separator)
-  local text_len = #text
-  if text_len > indicator_size then
-    return "..." .. text:sub(text_len - indicator_size, text_len)
-  end
-
-  return text
-end
-
-return M
diff --git a/lua/nvim-treesitter/ts_utils.lua b/lua/nvim-treesitter/ts_utils.lua
deleted file mode 100644
index ce103790c..000000000
--- a/lua/nvim-treesitter/ts_utils.lua
+++ /dev/null
@@ -1,482 +0,0 @@
-local api = vim.api
-
-local parsers = require "nvim-treesitter.parsers"
-local utils = require "nvim-treesitter.utils"
-local ts = vim.treesitter
-
-local M = {}
-
-local function get_node_text(node, bufnr)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  if not node then
-    return {}
-  end
-
-  -- We have to remember that end_col is end-exclusive
-  local start_row, start_col, end_row, end_col = ts.get_node_range(node)
-
-  if start_row ~= end_row then
-    local lines = api.nvim_buf_get_lines(bufnr, start_row, end_row + 1, false)
-    if next(lines) == nil then
-      return {}
-    end
-    lines[1] = string.sub(lines[1], start_col + 1)
-    -- end_row might be just after the last line. In this case the last line is not truncated.
-    if #lines == end_row - start_row + 1 then
-      lines[#lines] = string.sub(lines[#lines], 1, end_col)
-    end
-    return lines
-  else
-    local line = api.nvim_buf_get_lines(bufnr, start_row, start_row + 1, false)[1]
-    -- If line is nil then the line is empty
-    return line and { string.sub(line, start_col + 1, end_col) } or {}
-  end
-end
-
----@private
----@param node TSNode
----@param type_patterns string[]
----@param transform_fn fun(line: string): string
----@param bufnr integer
----@return string
-function M._get_line_for_node(node, type_patterns, transform_fn, bufnr)
-  local node_type = node:type()
-  local is_valid = false
-  for _, rgx in ipairs(type_patterns) do
-    if node_type:find(rgx) then
-      is_valid = true
-      break
-    end
-  end
-  if not is_valid then
-    return ""
-  end
-  local line = transform_fn(vim.trim(get_node_text(node, bufnr)[1] or ""), node)
-  -- Escape % to avoid statusline to evaluate content as expression
-  return line:gsub("%%", "%%%%")
-end
-
--- Gets the actual text content of a node
--- @deprecated Use vim.treesitter.get_node_text
--- @param node the node to get the text from
--- @param bufnr the buffer containing the node
--- @return list of lines of text of the node
-function M.get_node_text(node, bufnr)
-  vim.notify_once(
-    "nvim-treesitter.ts_utils.get_node_text is deprecated: use vim.treesitter.get_node_text",
-    vim.log.levels.WARN
-  )
-  return get_node_text(node, bufnr)
-end
-
--- Determines whether a node is the parent of another
--- @param dest the possible parent
--- @param source the possible child node
-function M.is_parent(dest, source)
-  if not (dest and source) then
-    return false
-  end
-
-  local current = source
-  while current ~= nil do
-    if current == dest then
-      return true
-    end
-
-    current = current:parent()
-  end
-
-  return false
-end
-
--- Get next node with same parent
----@param node                  TSNode
----@param allow_switch_parents? boolean allow switching parents if last node
----@param allow_next_parent?    boolean allow next parent if last node and next parent without children
-function M.get_next_node(node, allow_switch_parents, allow_next_parent)
-  local destination_node ---@type TSNode
-  local parent = node:parent()
-
-  if not parent then
-    return
-  end
-  local found_pos = 0
-  for i = 0, parent:named_child_count() - 1, 1 do
-    if parent:named_child(i) == node then
-      found_pos = i
-      break
-    end
-  end
-  if parent:named_child_count() > found_pos + 1 then
-    destination_node = parent:named_child(found_pos + 1)
-  elseif allow_switch_parents then
-    local next_node = M.get_next_node(node:parent())
-    if next_node and next_node:named_child_count() > 0 then
-      destination_node = next_node:named_child(0)
-    elseif next_node and allow_next_parent then
-      destination_node = next_node
-    end
-  end
-
-  return destination_node
-end
-
--- Get previous node with same parent
----@param node                   TSNode
----@param allow_switch_parents?  boolean allow switching parents if first node
----@param allow_previous_parent? boolean allow previous parent if first node and previous parent without children
-function M.get_previous_node(node, allow_switch_parents, allow_previous_parent)
-  local destination_node ---@type TSNode
-  local parent = node:parent()
-  if not parent then
-    return
-  end
-
-  local found_pos = 0
-  for i = 0, parent:named_child_count() - 1, 1 do
-    if parent:named_child(i) == node then
-      found_pos = i
-      break
-    end
-  end
-  if 0 < found_pos then
-    destination_node = parent:named_child(found_pos - 1)
-  elseif allow_switch_parents then
-    local previous_node = M.get_previous_node(node:parent())
-    if previous_node and previous_node:named_child_count() > 0 then
-      destination_node = previous_node:named_child(previous_node:named_child_count() - 1)
-    elseif previous_node and allow_previous_parent then
-      destination_node = previous_node
-    end
-  end
-  return destination_node
-end
-
-function M.get_named_children(node)
-  local nodes = {} ---@type TSNode[]
-  for i = 0, node:named_child_count() - 1, 1 do
-    nodes[i + 1] = node:named_child(i)
-  end
-  return nodes
-end
-
-function M.get_node_at_cursor(winnr, ignore_injected_langs)
-  winnr = winnr or 0
-  local cursor = api.nvim_win_get_cursor(winnr)
-  local cursor_range = { cursor[1] - 1, cursor[2] }
-
-  local buf = vim.api.nvim_win_get_buf(winnr)
-  local root_lang_tree = parsers.get_parser(buf)
-  if not root_lang_tree then
-    return
-  end
-
-  local root ---@type TSNode|nil
-  if ignore_injected_langs then
-    for _, tree in pairs(root_lang_tree:trees()) do
-      local tree_root = tree:root()
-      if tree_root and ts.is_in_node_range(tree_root, cursor_range[1], cursor_range[2]) then
-        root = tree_root
-        break
-      end
-    end
-  else
-    root = M.get_root_for_position(cursor_range[1], cursor_range[2], root_lang_tree)
-  end
-
-  if not root then
-    return
-  end
-
-  return root:named_descendant_for_range(cursor_range[1], cursor_range[2], cursor_range[1], cursor_range[2])
-end
-
-function M.get_root_for_position(line, col, root_lang_tree)
-  if not root_lang_tree then
-    if not parsers.has_parser() then
-      return
-    end
-
-    root_lang_tree = parsers.get_parser()
-  end
-
-  local lang_tree = root_lang_tree:language_for_range { line, col, line, col }
-
-  while true do
-    for _, tree in pairs(lang_tree:trees()) do
-      local root = tree:root()
-
-      if root and ts.is_in_node_range(root, line, col) then
-        return root, tree, lang_tree
-      end
-    end
-
-    if lang_tree == root_lang_tree then
-      break
-    end
-
-    -- This case can happen when the cursor is at the start of a line that ends a injected region,
-    -- e.g., the first `]` in the following lua code:
-    -- ```
-    -- vim.cmd[[
-    -- ]]
-    -- ```
-    lang_tree = lang_tree:parent() -- NOTE: parent() method is private
-  end
-
-  -- This isn't a likely scenario, since the position must belong to a tree somewhere.
-  return nil, nil, lang_tree
-end
-
----comment
----@param node TSNode
----@return TSNode result
-function M.get_root_for_node(node)
-  local parent = node
-  local result = node
-
-  while parent ~= nil do
-    result = parent
-    parent = result:parent()
-  end
-
-  return result
-end
-
-function M.highlight_node(node, buf, hl_namespace, hl_group)
-  if not node then
-    return
-  end
-  M.highlight_range({ node:range() }, buf, hl_namespace, hl_group)
-end
-
--- Get a compatible vim range (1 index based) from a TS node range.
---
--- TS nodes start with 0 and the end col is ending exclusive.
--- They also treat a EOF/EOL char as a char ending in the first
--- col of the next row.
----comment
----@param range integer[]
----@param buf integer|nil
----@return integer, integer, integer, integer
-function M.get_vim_range(range, buf)
-  ---@type integer, integer, integer, integer
-  local srow, scol, erow, ecol = unpack(range)
-  srow = srow + 1
-  scol = scol + 1
-  erow = erow + 1
-
-  if ecol == 0 then
-    -- Use the value of the last col of the previous row instead.
-    erow = erow - 1
-    if not buf or buf == 0 then
-      ecol = vim.fn.col { erow, "$" } - 1
-    else
-      ecol = #api.nvim_buf_get_lines(buf, erow - 1, erow, false)[1]
-    end
-    ecol = math.max(ecol, 1)
-  end
-  return srow, scol, erow, ecol
-end
-
-function M.highlight_range(range, buf, hl_namespace, hl_group)
-  ---@type integer, integer, integer, integer
-  local start_row, start_col, end_row, end_col = unpack(range)
-  ---@diagnostic disable-next-line: missing-parameter
-  vim.highlight.range(buf, hl_namespace, hl_group, { start_row, start_col }, { end_row, end_col })
-end
-
--- Set visual selection to node
--- @param selection_mode One of "charwise" (default) or "v", "linewise" or "V",
---   "blockwise" or "<C-v>" (as a string with 5 characters or a single character)
-function M.update_selection(buf, node, selection_mode)
-  local start_row, start_col, end_row, end_col = M.get_vim_range({ ts.get_node_range(node) }, buf)
-
-  local v_table = { charwise = "v", linewise = "V", blockwise = "<C-v>" }
-  selection_mode = selection_mode or "charwise"
-
-  -- Normalise selection_mode
-  if vim.tbl_contains(vim.tbl_keys(v_table), selection_mode) then
-    selection_mode = v_table[selection_mode]
-  end
-
-  -- enter visual mode if normal or operator-pending (no) mode
-  -- Why? According to https://learnvimscriptthehardway.stevelosh.com/chapters/15.html
-  --   If your operator-pending mapping ends with some text visually selected, Vim will operate on that text.
-  --   Otherwise, Vim will operate on the text between the original cursor position and the new position.
-  local mode = api.nvim_get_mode()
-  if mode.mode ~= selection_mode then
-    -- Call to `nvim_replace_termcodes()` is needed for sending appropriate command to enter blockwise mode
-    selection_mode = vim.api.nvim_replace_termcodes(selection_mode, true, true, true)
-    api.nvim_cmd({ cmd = "normal", bang = true, args = { selection_mode } }, {})
-  end
-
-  api.nvim_win_set_cursor(0, { start_row, start_col - 1 })
-  vim.cmd "normal! o"
-  api.nvim_win_set_cursor(0, { end_row, end_col - 1 })
-end
-
--- Byte length of node range
----@param node TSNode
----@return number
-function M.node_length(node)
-  local _, _, start_byte = node:start()
-  local _, _, end_byte = node:end_()
-  return end_byte - start_byte
-end
-
----@deprecated Use `vim.treesitter.is_in_node_range()` instead
-function M.is_in_node_range(node, line, col)
-  vim.notify_once(
-    "nvim-treesitter.ts_utils.is_in_node_range is deprecated: use vim.treesitter.is_in_node_range",
-    vim.log.levels.WARN
-  )
-  return ts.is_in_node_range(node, line, col)
-end
-
----@deprecated Use `vim.treesitter.get_node_range()` instead
-function M.get_node_range(node_or_range)
-  vim.notify_once(
-    "nvim-treesitter.ts_utils.get_node_range is deprecated: use vim.treesitter.get_node_range",
-    vim.log.levels.WARN
-  )
-  return ts.get_node_range(node_or_range)
-end
-
----@param node TSNode
----@return table
-function M.node_to_lsp_range(node)
-  local start_line, start_col, end_line, end_col = ts.get_node_range(node)
-  local rtn = {}
-  rtn.start = { line = start_line, character = start_col }
-  rtn["end"] = { line = end_line, character = end_col }
-  return rtn
-end
-
--- Memoizes a function based on the buffer tick of the provided bufnr.
--- The cache entry is cleared when the buffer is detached to avoid memory leaks.
--- The options argument is a table with two optional values:
---  - bufnr: extracts a bufnr from the given arguments.
---  - key: extracts the cache key from the given arguments.
----@param fn function the fn to memoize, taking the buffer as first argument
----@param options? {bufnr: integer?, key: string|fun(...): string?} the memoization options
----@return function: a memoized function
-function M.memoize_by_buf_tick(fn, options)
-  options = options or {}
-
-  ---@type table<string, {result: any, last_tick: integer}>
-  local cache = setmetatable({}, { __mode = "kv" })
-  local bufnr_fn = utils.to_func(options.bufnr or utils.identity)
-  local key_fn = utils.to_func(options.key or utils.identity)
-
-  return function(...)
-    local bufnr = bufnr_fn(...)
-    local key = key_fn(...)
-    local tick = api.nvim_buf_get_changedtick(bufnr)
-
-    if cache[key] then
-      if cache[key].last_tick == tick then
-        return cache[key].result
-      end
-    else
-      local function detach_handler()
-        cache[key] = nil
-      end
-
-      -- Clean up logic only!
-      api.nvim_buf_attach(bufnr, false, {
-        on_detach = detach_handler,
-        on_reload = detach_handler,
-      })
-    end
-
-    cache[key] = {
-      result = fn(...),
-      last_tick = tick,
-    }
-
-    return cache[key].result
-  end
-end
-
-function M.swap_nodes(node_or_range1, node_or_range2, bufnr, cursor_to_second)
-  if not node_or_range1 or not node_or_range2 then
-    return
-  end
-  local range1 = M.node_to_lsp_range(node_or_range1)
-  local range2 = M.node_to_lsp_range(node_or_range2)
-
-  local text1 = get_node_text(node_or_range1, bufnr)
-  local text2 = get_node_text(node_or_range2, bufnr)
-
-  local edit1 = { range = range1, newText = table.concat(text2, "\n") }
-  local edit2 = { range = range2, newText = table.concat(text1, "\n") }
-  bufnr = bufnr == 0 and vim.api.nvim_get_current_buf() or bufnr
-  vim.lsp.util.apply_text_edits({ edit1, edit2 }, bufnr, "utf-8")
-
-  if cursor_to_second then
-    utils.set_jump()
-
-    local char_delta = 0
-    local line_delta = 0
-    if
-      range1["end"].line < range2.start.line
-      or (range1["end"].line == range2.start.line and range1["end"].character <= range2.start.character)
-    then
-      line_delta = #text2 - #text1
-    end
-
-    if range1["end"].line == range2.start.line and range1["end"].character <= range2.start.character then
-      if line_delta ~= 0 then
-        --- why?
-        --correction_after_line_change =  -range2.start.character
-        --text_now_before_range2 = #(text2[#text2])
-        --space_between_ranges = range2.start.character - range1["end"].character
-        --char_delta = correction_after_line_change + text_now_before_range2 + space_between_ranges
-        --- Equivalent to:
-        char_delta = #text2[#text2] - range1["end"].character
-
-        -- add range1.start.character if last line of range1 (now text2) does not start at 0
-        if range1.start.line == range2.start.line + line_delta then
-          char_delta = char_delta + range1.start.character
-        end
-      else
-        char_delta = #text2[#text2] - #text1[#text1]
-      end
-    end
-
-    api.nvim_win_set_cursor(
-      api.nvim_get_current_win(),
-      { range2.start.line + 1 + line_delta, range2.start.character + char_delta }
-    )
-  end
-end
-
-function M.goto_node(node, goto_end, avoid_set_jump)
-  if not node then
-    return
-  end
-  if not avoid_set_jump then
-    utils.set_jump()
-  end
-  local range = { M.get_vim_range { node:range() } }
-  ---@type table<number>
-  local position
-  if not goto_end then
-    position = { range[1], range[2] }
-  else
-    position = { range[3], range[4] }
-  end
-
-  -- Enter visual mode if we are in operator pending mode
-  -- If we don't do this, it will miss the last character.
-  local mode = vim.api.nvim_get_mode()
-  if mode.mode == "no" then
-    vim.cmd "normal! v"
-  end
-
-  -- Position is 1, 0 indexed.
-  api.nvim_win_set_cursor(0, { position[1], position[2] - 1 })
-end
-
-return M
diff --git a/lua/nvim-treesitter/tsrange.lua b/lua/nvim-treesitter/tsrange.lua
deleted file mode 100644
index d41585c60..000000000
--- a/lua/nvim-treesitter/tsrange.lua
+++ /dev/null
@@ -1,154 +0,0 @@
-local M = {}
-local TSRange = {}
-TSRange.__index = TSRange
-
-local api = vim.api
-local ts_utils = require "nvim-treesitter.ts_utils"
-local parsers = require "nvim-treesitter.parsers"
-
-local function get_byte_offset(buf, row, col)
-  return api.nvim_buf_get_offset(buf, row) + vim.fn.byteidx(api.nvim_buf_get_lines(buf, row, row + 1, false)[1], col)
-end
-
-function TSRange.new(buf, start_row, start_col, end_row, end_col)
-  return setmetatable({
-    start_pos = { start_row, start_col, get_byte_offset(buf, start_row, start_col) },
-    end_pos = { end_row, end_col, get_byte_offset(buf, end_row, end_col) },
-    buf = buf,
-    [1] = start_row,
-    [2] = start_col,
-    [3] = end_row,
-    [4] = end_col,
-  }, TSRange)
-end
-
-function TSRange.from_nodes(buf, start_node, end_node)
-  TSRange.__index = TSRange
-  local start_pos = start_node and { start_node:start() } or { end_node:start() }
-  local end_pos = end_node and { end_node:end_() } or { start_node:end_() }
-  return setmetatable({
-    start_pos = { start_pos[1], start_pos[2], start_pos[3] },
-    end_pos = { end_pos[1], end_pos[2], end_pos[3] },
-    buf = buf,
-    [1] = start_pos[1],
-    [2] = start_pos[2],
-    [3] = end_pos[1],
-    [4] = end_pos[2],
-  }, TSRange)
-end
-
-function TSRange.from_table(buf, range)
-  return setmetatable({
-    start_pos = { range[1], range[2], get_byte_offset(buf, range[1], range[2]) },
-    end_pos = { range[3], range[4], get_byte_offset(buf, range[3], range[4]) },
-    buf = buf,
-    [1] = range[1],
-    [2] = range[2],
-    [3] = range[3],
-    [4] = range[4],
-  }, TSRange)
-end
-
-function TSRange:parent()
-  local root_lang_tree = parsers.get_parser(self.buf)
-  local root = ts_utils.get_root_for_position(self[1], self[2], root_lang_tree)
-
-  return root
-      and root:named_descendant_for_range(self.start_pos[1], self.start_pos[2], self.end_pos[1], self.end_pos[2])
-    or nil
-end
-
-function TSRange:field() end
-
-function TSRange:child_count()
-  return #self:collect_children()
-end
-
-function TSRange:named_child_count()
-  return #self:collect_children(function(c)
-    return c:named()
-  end)
-end
-
-function TSRange:iter_children()
-  local raw_iterator = self:parent().iter_children()
-  return function()
-    while true do
-      local node = raw_iterator()
-      if not node then
-        return
-      end
-      local _, _, start_byte = node:start()
-      local _, _, end_byte = node:end_()
-      if start_byte >= self.start_pos[3] and end_byte <= self.end_pos[3] then
-        return node
-      end
-    end
-  end
-end
-
-function TSRange:collect_children(filter_fun)
-  local children = {}
-  for _, c in self:iter_children() do
-    if not filter_fun or filter_fun(c) then
-      table.insert(children, c)
-    end
-  end
-  return children
-end
-
-function TSRange:child(index)
-  return self:collect_children()[index + 1]
-end
-
-function TSRange:named_child(index)
-  return self:collect_children(function(c)
-    return c.named()
-  end)[index + 1]
-end
-
-function TSRange:start()
-  return unpack(self.start_pos)
-end
-
-function TSRange:end_()
-  return unpack(self.end_pos)
-end
-
-function TSRange:range()
-  return self.start_pos[1], self.start_pos[2], self.end_pos[1], self.end_pos[2]
-end
-
-function TSRange:type()
-  return "nvim-treesitter-range"
-end
-
-function TSRange:symbol()
-  return -1
-end
-
-function TSRange:named()
-  return false
-end
-
-function TSRange:missing()
-  return false
-end
-
-function TSRange:has_error()
-  return #self:collect_children(function(c)
-    return c:has_error()
-  end) > 0 and true or false
-end
-
-function TSRange:sexpr()
-  return table.concat(
-    vim.tbl_map(function(c)
-      return c:sexpr()
-    end, self:collect_children()),
-    " "
-  )
-end
-
-M.TSRange = TSRange
-return M
diff --git a/lua/nvim-treesitter/utils.lua b/lua/nvim-treesitter/utils.lua
index d920f4a61..f9e5a2b86 100644
--- a/lua/nvim-treesitter/utils.lua
+++ b/lua/nvim-treesitter/utils.lua
@@ -1,237 +1,12 @@
-local api = vim.api
-local fn = vim.fn
-local luv = vim.loop
-
 local M = {}
 
--- Wrapper around vim.notify with common options set.
----@param msg string
----@param log_level number|nil
----@param opts table|nil
-function M.notify(msg, log_level, opts)
-  local default_opts = { title = "nvim-treesitter" }
-  vim.notify(msg, log_level, vim.tbl_extend("force", default_opts, opts or {}))
+--TODO(clason): replace by vim.fs._join_paths
+function M.join_path(...)
+  return (table.concat({ ... }, '/'):gsub('//+', '/'))
 end
 
--- Returns the system-specific path separator.
----@return string
-function M.get_path_sep()
-  return (fn.has "win32" == 1 and not vim.opt.shellslash:get()) and "\\" or "/"
-end
-
--- Returns a function that joins the given arguments with separator. Arguments
--- can't be nil. Example:
---
---[[
-  print(M.generate_join(" ")("foo", "bar"))
---]]
---prints "foo bar"
----@param separator string
----@return fun(...: string): string
-function M.generate_join(separator)
-  return function(...)
-    return table.concat({ ... }, separator)
-  end
-end
-
-M.join_path = M.generate_join(M.get_path_sep())
-
-M.join_space = M.generate_join " "
-
----@class Command
----@field run function
----@field f_args string
----@field args string
-
--- Define user defined vim command which calls nvim-treesitter module function
---     - If module name is 'mod', it should be defined in hierarchy 'nvim-treesitter.mod'
---     - A table with name 'commands' should be defined in 'mod' which needs to be passed as
---       the commands param of this function
---
----@param mod string  Name of the module that resides in the hierarchy - nvim-treesitter.module
----@param commands table<string, Command>  Command list for the module
----         - {command_name} Name of the vim user defined command, Keys:
----             - {run}: (function) callback function that needs to be executed
----             - {f_args}: (string, default <f-args>)
----                 - 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
----  <pre>
----  M.commands = {
----      custom_command = {
----          run = M.module_function,
----          f_args = "<f-args>",
----          args = {
----              "-range"
----          }
----      }
----  }
----
----  utils.setup_commands("custom_mod", require("nvim-treesitter.custom_mod").commands)
----  </pre>
----
----  Will generate command :
----  <pre>
----  command! -range custom_command \
----      lua require'nvim-treesitter.custom_mod'.commands.custom_command['run<bang>'](<f-args>)
----  </pre>
-function M.setup_commands(mod, commands)
-  for command_name, def in pairs(commands) do
-    local f_args = def.f_args or "<f-args>"
-    local call_fn =
-      string.format("lua require'nvim-treesitter.%s'.commands.%s['run<bang>'](%s)", mod, command_name, f_args)
-    local parts = require("nvim-treesitter.compat").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 table the table to access
----@param path string the '.' separated path
----@return table|nil result 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)
-  ---@type table[]|table
-  local result = tbl
-
-  for _, segment in ipairs(segments) do
-    if type(result) == "table" then
-      ---@type table
-      -- TODO: figure out the actual type of tbl
-      result = result[segment]
-    end
-  end
-
-  return result
-end
-
-function M.set_jump()
-  vim.cmd "normal! m'"
-end
-
--- Filters a list based on the given predicate
----@param tbl any[] The list to filter
----@param predicate fun(v:any, i:number):boolean 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.
----@param tbl1 any[] The first table
----@param tbl2 any[] The second table
----@return 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
-
--- Returns a function returning the given value
----@param a any
----@return fun():any
-function M.constant(a)
-  return function()
-    return a
-  end
-end
-
--- Returns a function that returns the given value if it is a function,
--- otherwise returns a function that returns the given value.
----@param a any
----@return fun(...):any
-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"
-    if not handle then
-      return
-    end
-    local result = handle:read "*a"
-    handle:close()
-    return vim.split(result, "\n")[1]:match "[^tree%psitter ].*"
-  end
+function M.get_package_path(...)
+  return M.join_path(vim.fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
 end
 
 return M
diff --git a/parser-info/.gitignore b/parser-info/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/parser-info/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/parser/.gitignore b/parser/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/parser/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
new file mode 100644
index 000000000..a4c236ec3
--- /dev/null
+++ b/plugin/filetypes.lua
@@ -0,0 +1,66 @@
+local filetypes = {
+  angular = { 'htmlangular' },
+  bash = { 'sh' },
+  bibtex = { 'bib' },
+  c_sharp = { 'cs', 'csharp', 'c-sharp' },
+  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' },
+  janet_simple = { 'janet' },
+  javascript = { 'javascriptreact', 'ecma', 'jsx', 'js' },
+  javascript_glimmer = { 'javascript.glimmer' },
+  linkerscript = { 'ld' },
+  latex = { 'tex' },
+  m68k = { 'asm68k' },
+  make = { 'automake' },
+  markdown = { 'pandoc', 'quarto', 'rmd' },
+  muttrc = { 'neomuttrc' },
+  ocaml_interface = { 'ocamlinterface' },
+  perl = { 'pl' },
+  poe_filter = { 'poefilter' },
+  properties = { 'jproperties' },
+  python = { 'py', 'gyp' },
+  qmljs = { 'qml' },
+  runescript = { 'clientscript' },
+  scala = { 'sbt' },
+  slang = { 'shaderslang' },
+  sqp = { 'mysqp' },
+  ssh_config = { 'sshconfig' },
+  starlark = { 'bzl' },
+  surface = { 'sface' },
+  t32 = { 'trace32' },
+  tcl = { 'expect' },
+  terraform = { 'terraform-vars' },
+  textproto = { 'pbtxt' },
+  tlaplus = { 'tla' },
+  tsx = { 'typescriptreact', 'typescript.tsx' },
+  typescript = { 'ts' },
+  typescript_glimmer = { 'typescript.glimmer' },
+  typst = { 'typ' },
+  udev = { 'udevrules' },
+  uxntal = { 'tal', 'uxn' },
+  v = { 'vlang' },
+  verilog = { 'systemverilog' },
+  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 4ea3925fd..3ab264d41 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -1,34 +1,86 @@
--- 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
 
--- define autocommands
-local augroup = api.nvim_create_augroup("NvimTreesitter", {})
+local function complete_available_parsers(arglead)
+  return vim.iter.filter(function(v)
+    return v:find(arglead)
+  end, require('nvim-treesitter.parsers').get_available())
+end
 
-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",
+local function complete_installed_parsers(arglead)
+  return vim.iter.filter(function(v)
+    return v:find(arglead)
+  end, require('nvim-treesitter.config').installed_parsers())
+end
+
+-- create user commands
+api.nvim_create_user_command('TSInstallInfo', function()
+  require('nvim-treesitter.install').info()
+end, { nargs = 0, desc = 'List available treesitter parsers' })
+
+api.nvim_create_user_command('TSInstall', function(args)
+  require('nvim-treesitter.install').install(args.fargs, { force = args.bang })
+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_from_grammar = 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('TSInstallSync', function(args)
+  require('nvim-treesitter.install').install(args.fargs, {
+    with_sync = true,
+    force = args.bang,
+  })
+end, {
+  nargs = '+',
+  bang = true,
+  bar = true,
+  complete = complete_available_parsers,
+  desc = 'Install treesitter parsers synchronously',
+})
+
+api.nvim_create_user_command('TSUpdate', function(args)
+  require('nvim-treesitter.install').update(args.fargs)
+end, {
+  nargs = '*',
+  bar = true,
+  complete = complete_installed_parsers,
+  desc = 'Update installed treesitter parsers',
+})
+
+api.nvim_create_user_command('TSUpdateSync', function(args)
+  require('nvim-treesitter.install').update(args.fargs, { with_sync = true })
+end, {
+  nargs = '*',
+  bar = true,
+  complete = complete_installed_parsers,
+  desc = 'Update installed treesitter parsers synchronously',
+})
+
+api.nvim_create_user_command('TSUninstall', function(args)
+  require('nvim-treesitter.install').uninstall(args.fargs)
+end, {
+  nargs = '+',
+  bar = true,
+  complete = complete_installed_parsers,
+  desc = 'Uninstall treesitter parsers',
 })
diff --git a/plugin/query_predicates.lua b/plugin/query_predicates.lua
new file mode 100644
index 000000000..abffea2f0
--- /dev/null
+++ b/plugin/query_predicates.lua
@@ -0,0 +1,141 @@
+local query = vim.treesitter.query
+
+-- register custom predicates
+
+---@param match (TSNode|nil)[]
+---@param pred string[]
+---@return boolean|nil
+query.add_predicate('kind-eq?', function(match, _, _, pred)
+  local node = match[pred[2]]
+  if not node then
+    return true
+  end
+
+  local types = { unpack(pred, 3) }
+  return vim.list_contains(types, node:type())
+end)
+
+-- register custom directives
+
+local mimetype_aliases = {
+  ['importmap'] = 'json',
+  ['module'] = 'javascript',
+  ['application/ecmascript'] = 'javascript',
+  ['text/ecmascript'] = 'javascript',
+}
+
+---@param match (TSNode|nil)[]
+---@param _ string
+---@param bufnr integer
+---@param pred string[]
+---@return boolean|nil
+query.add_directive('set-lang-from-mimetype!', function(match, _, bufnr, pred, metadata)
+  local capture_id = pred[2]
+  local node = match[capture_id]
+  if not node then
+    return
+  end
+  local type_attr_value = vim.treesitter.get_node_text(node, bufnr)
+  local configured = mimetype_aliases[type_attr_value]
+  if configured then
+    metadata['injection.language'] = configured
+  else
+    local parts = vim.split(type_attr_value, '/', {})
+    metadata['injection.language'] = parts[#parts]
+  end
+end)
+
+local injection_aliases = {
+  ex = 'elixir',
+  pl = 'perl',
+  sh = 'bash',
+  uxn = 'uxntal',
+  ts = 'typescript',
+}
+
+---@param match (TSNode|nil)[]
+---@param _ string
+---@param bufnr integer
+---@param pred string[]
+---@return boolean|nil
+query.add_directive('set-lang-from-info-string!', function(match, _, bufnr, pred, metadata)
+  local capture_id = pred[2]
+  local node = match[capture_id]
+  if not node then
+    return
+  end
+
+  local injection_alias = vim.treesitter.get_node_text(node, bufnr)
+  local filetype = vim.filetype.match({ filename = 'a.' .. injection_alias })
+  metadata['injection.language'] = filetype or injection_aliases[injection_alias] or injection_alias
+end)
+
+query.add_directive('downcase!', function(match, _, bufnr, pred, metadata)
+  local text, key, value ---@type string|string[], string, string|integer
+
+  if #pred == 3 then
+    -- (#downcase! @capture "key")
+    key = pred[3]
+    value = metadata[pred[2]][key]
+  else
+    -- (#downcase! "key")
+    key = pred[2]
+    value = metadata[key]
+  end
+
+  if type(value) == 'string' then
+    text = value
+  else
+    local node = match[value]
+    text = vim.treesitter.get_node_text(node, bufnr) or ''
+  end
+
+  if #pred == 3 then
+    metadata[pred[2]][key] = string.lower(text)
+  else
+    metadata[key] = string.lower(text)
+  end
+end)
+
+-- Trim blank lines from end of the region
+-- Arguments are the captures to trim.
+---@param match (TSNode|nil)[]
+---@param _ string
+---@param bufnr integer
+---@param pred string[]
+---@param metadata table
+---TODO(clason): upstream
+query.add_directive('trim!', function(match, _, bufnr, pred, metadata)
+  for _, id in ipairs({ select(2, unpack(pred)) }) do
+    local node = match[id]
+    if not node then
+      return
+    end
+
+    local start_row, start_col, end_row, end_col = node:range()
+
+    -- Don't trim if region ends in middle of a line
+    if end_col ~= 0 then
+      return
+    end
+
+    while true do
+      -- As we only care when end_col == 0, always inspect one line above end_row.
+      local end_line = vim.api.nvim_buf_get_lines(bufnr, end_row - 1, end_row, true)[1]
+
+      if end_line ~= '' then
+        break
+      end
+
+      end_row = end_row - 1
+    end
+
+    -- If this produces an invalid range, we just skip it.
+    if start_row < end_row or (start_row == end_row and start_col <= end_col) then
+      if not metadata[id] then
+        metadata[id] = {}
+      end
+      metadata[id].range = { start_row, start_col, end_row, end_col }
+    end
+  end
+end)
diff --git a/queries/ada/folds.scm b/runtime/queries/ada/folds.scm
similarity index 100%
rename from queries/ada/folds.scm
rename to runtime/queries/ada/folds.scm
diff --git a/queries/ada/highlights.scm b/runtime/queries/ada/highlights.scm
similarity index 100%
rename from queries/ada/highlights.scm
rename to runtime/queries/ada/highlights.scm
diff --git a/queries/unison/injections.scm b/runtime/queries/ada/injections.scm
similarity index 100%
rename from queries/unison/injections.scm
rename to runtime/queries/ada/injections.scm
diff --git a/queries/ada/locals.scm b/runtime/queries/ada/locals.scm
similarity index 100%
rename from queries/ada/locals.scm
rename to runtime/queries/ada/locals.scm
diff --git a/queries/agda/folds.scm b/runtime/queries/agda/folds.scm
similarity index 100%
rename from queries/agda/folds.scm
rename to runtime/queries/agda/folds.scm
diff --git a/queries/agda/highlights.scm b/runtime/queries/agda/highlights.scm
similarity index 100%
rename from queries/agda/highlights.scm
rename to runtime/queries/agda/highlights.scm
diff --git a/queries/solidity/injections.scm b/runtime/queries/agda/injections.scm
similarity index 100%
rename from queries/solidity/injections.scm
rename to runtime/queries/agda/injections.scm
diff --git a/queries/angular/folds.scm b/runtime/queries/angular/folds.scm
similarity index 100%
rename from queries/angular/folds.scm
rename to runtime/queries/angular/folds.scm
diff --git a/queries/angular/highlights.scm b/runtime/queries/angular/highlights.scm
similarity index 100%
rename from queries/angular/highlights.scm
rename to runtime/queries/angular/highlights.scm
diff --git a/queries/angular/indents.scm b/runtime/queries/angular/indents.scm
similarity index 100%
rename from queries/angular/indents.scm
rename to runtime/queries/angular/indents.scm
diff --git a/queries/angular/injections.scm b/runtime/queries/angular/injections.scm
similarity index 100%
rename from queries/angular/injections.scm
rename to runtime/queries/angular/injections.scm
diff --git a/queries/angular/locals.scm b/runtime/queries/angular/locals.scm
similarity index 100%
rename from queries/angular/locals.scm
rename to runtime/queries/angular/locals.scm
diff --git a/queries/apex/folds.scm b/runtime/queries/apex/folds.scm
similarity index 100%
rename from queries/apex/folds.scm
rename to runtime/queries/apex/folds.scm
diff --git a/queries/apex/highlights.scm b/runtime/queries/apex/highlights.scm
similarity index 100%
rename from queries/apex/highlights.scm
rename to runtime/queries/apex/highlights.scm
diff --git a/queries/apex/injections.scm b/runtime/queries/apex/injections.scm
similarity index 100%
rename from queries/apex/injections.scm
rename to runtime/queries/apex/injections.scm
diff --git a/queries/apex/locals.scm b/runtime/queries/apex/locals.scm
similarity index 100%
rename from queries/apex/locals.scm
rename to runtime/queries/apex/locals.scm
diff --git a/queries/arduino/folds.scm b/runtime/queries/arduino/folds.scm
similarity index 100%
rename from queries/arduino/folds.scm
rename to runtime/queries/arduino/folds.scm
diff --git a/queries/arduino/highlights.scm b/runtime/queries/arduino/highlights.scm
similarity index 100%
rename from queries/arduino/highlights.scm
rename to runtime/queries/arduino/highlights.scm
diff --git a/queries/arduino/indents.scm b/runtime/queries/arduino/indents.scm
similarity index 100%
rename from queries/arduino/indents.scm
rename to runtime/queries/arduino/indents.scm
diff --git a/queries/arduino/injections.scm b/runtime/queries/arduino/injections.scm
similarity index 100%
rename from queries/arduino/injections.scm
rename to runtime/queries/arduino/injections.scm
diff --git a/queries/arduino/locals.scm b/runtime/queries/arduino/locals.scm
similarity index 100%
rename from queries/arduino/locals.scm
rename to runtime/queries/arduino/locals.scm
diff --git a/queries/asm/highlights.scm b/runtime/queries/asm/highlights.scm
similarity index 100%
rename from queries/asm/highlights.scm
rename to runtime/queries/asm/highlights.scm
diff --git a/queries/asm/injections.scm b/runtime/queries/asm/injections.scm
similarity index 100%
rename from queries/asm/injections.scm
rename to runtime/queries/asm/injections.scm
diff --git a/queries/astro/folds.scm b/runtime/queries/astro/folds.scm
similarity index 100%
rename from queries/astro/folds.scm
rename to runtime/queries/astro/folds.scm
diff --git a/queries/astro/highlights.scm b/runtime/queries/astro/highlights.scm
similarity index 100%
rename from queries/astro/highlights.scm
rename to runtime/queries/astro/highlights.scm
diff --git a/queries/astro/indents.scm b/runtime/queries/astro/indents.scm
similarity index 100%
rename from queries/astro/indents.scm
rename to runtime/queries/astro/indents.scm
diff --git a/queries/astro/injections.scm b/runtime/queries/astro/injections.scm
similarity index 100%
rename from queries/astro/injections.scm
rename to runtime/queries/astro/injections.scm
diff --git a/queries/astro/locals.scm b/runtime/queries/astro/locals.scm
similarity index 100%
rename from queries/astro/locals.scm
rename to runtime/queries/astro/locals.scm
diff --git a/queries/authzed/highlights.scm b/runtime/queries/authzed/highlights.scm
similarity index 100%
rename from queries/authzed/highlights.scm
rename to runtime/queries/authzed/highlights.scm
diff --git a/queries/bass/injections.scm b/runtime/queries/authzed/injections.scm
similarity index 100%
rename from queries/bass/injections.scm
rename to runtime/queries/authzed/injections.scm
diff --git a/queries/awk/highlights.scm b/runtime/queries/awk/highlights.scm
similarity index 100%
rename from queries/awk/highlights.scm
rename to runtime/queries/awk/highlights.scm
diff --git a/queries/awk/injections.scm b/runtime/queries/awk/injections.scm
similarity index 100%
rename from queries/awk/injections.scm
rename to runtime/queries/awk/injections.scm
diff --git a/queries/bash/folds.scm b/runtime/queries/bash/folds.scm
similarity index 100%
rename from queries/bash/folds.scm
rename to runtime/queries/bash/folds.scm
diff --git a/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
similarity index 100%
rename from queries/bash/highlights.scm
rename to runtime/queries/bash/highlights.scm
diff --git a/queries/bash/injections.scm b/runtime/queries/bash/injections.scm
similarity index 100%
rename from queries/bash/injections.scm
rename to runtime/queries/bash/injections.scm
diff --git a/queries/bash/locals.scm b/runtime/queries/bash/locals.scm
similarity index 100%
rename from queries/bash/locals.scm
rename to runtime/queries/bash/locals.scm
diff --git a/queries/bass/folds.scm b/runtime/queries/bass/folds.scm
similarity index 100%
rename from queries/bass/folds.scm
rename to runtime/queries/bass/folds.scm
diff --git a/queries/bass/highlights.scm b/runtime/queries/bass/highlights.scm
similarity index 100%
rename from queries/bass/highlights.scm
rename to runtime/queries/bass/highlights.scm
diff --git a/queries/bass/indents.scm b/runtime/queries/bass/indents.scm
similarity index 100%
rename from queries/bass/indents.scm
rename to runtime/queries/bass/indents.scm
diff --git a/queries/scala/injections.scm b/runtime/queries/bass/injections.scm
similarity index 100%
rename from queries/scala/injections.scm
rename to runtime/queries/bass/injections.scm
diff --git a/queries/bass/locals.scm b/runtime/queries/bass/locals.scm
similarity index 100%
rename from queries/bass/locals.scm
rename to runtime/queries/bass/locals.scm
diff --git a/queries/beancount/folds.scm b/runtime/queries/beancount/folds.scm
similarity index 100%
rename from queries/beancount/folds.scm
rename to runtime/queries/beancount/folds.scm
diff --git a/queries/beancount/highlights.scm b/runtime/queries/beancount/highlights.scm
similarity index 100%
rename from queries/beancount/highlights.scm
rename to runtime/queries/beancount/highlights.scm
diff --git a/queries/verilog/injections.scm b/runtime/queries/beancount/injections.scm
similarity index 100%
rename from queries/verilog/injections.scm
rename to runtime/queries/beancount/injections.scm
diff --git a/queries/bibtex/folds.scm b/runtime/queries/bibtex/folds.scm
similarity index 100%
rename from queries/bibtex/folds.scm
rename to runtime/queries/bibtex/folds.scm
diff --git a/queries/bibtex/highlights.scm b/runtime/queries/bibtex/highlights.scm
similarity index 100%
rename from queries/bibtex/highlights.scm
rename to runtime/queries/bibtex/highlights.scm
diff --git a/queries/bibtex/indents.scm b/runtime/queries/bibtex/indents.scm
similarity index 100%
rename from queries/bibtex/indents.scm
rename to runtime/queries/bibtex/indents.scm
diff --git a/queries/bibtex/injections.scm b/runtime/queries/bibtex/injections.scm
similarity index 100%
rename from queries/bibtex/injections.scm
rename to runtime/queries/bibtex/injections.scm
diff --git a/queries/bicep/folds.scm b/runtime/queries/bicep/folds.scm
similarity index 100%
rename from queries/bicep/folds.scm
rename to runtime/queries/bicep/folds.scm
diff --git a/queries/bicep/highlights.scm b/runtime/queries/bicep/highlights.scm
similarity index 100%
rename from queries/bicep/highlights.scm
rename to runtime/queries/bicep/highlights.scm
diff --git a/queries/bicep/indents.scm b/runtime/queries/bicep/indents.scm
similarity index 100%
rename from queries/bicep/indents.scm
rename to runtime/queries/bicep/indents.scm
diff --git a/queries/bicep/injections.scm b/runtime/queries/bicep/injections.scm
similarity index 100%
rename from queries/bicep/injections.scm
rename to runtime/queries/bicep/injections.scm
diff --git a/queries/bicep/locals.scm b/runtime/queries/bicep/locals.scm
similarity index 100%
rename from queries/bicep/locals.scm
rename to runtime/queries/bicep/locals.scm
diff --git a/queries/bitbake/folds.scm b/runtime/queries/bitbake/folds.scm
similarity index 100%
rename from queries/bitbake/folds.scm
rename to runtime/queries/bitbake/folds.scm
diff --git a/queries/bitbake/highlights.scm b/runtime/queries/bitbake/highlights.scm
similarity index 100%
rename from queries/bitbake/highlights.scm
rename to runtime/queries/bitbake/highlights.scm
diff --git a/queries/bitbake/indents.scm b/runtime/queries/bitbake/indents.scm
similarity index 100%
rename from queries/bitbake/indents.scm
rename to runtime/queries/bitbake/indents.scm
diff --git a/queries/bitbake/injections.scm b/runtime/queries/bitbake/injections.scm
similarity index 100%
rename from queries/bitbake/injections.scm
rename to runtime/queries/bitbake/injections.scm
diff --git a/queries/bitbake/locals.scm b/runtime/queries/bitbake/locals.scm
similarity index 100%
rename from queries/bitbake/locals.scm
rename to runtime/queries/bitbake/locals.scm
diff --git a/queries/blade/folds.scm b/runtime/queries/blade/folds.scm
similarity index 100%
rename from queries/blade/folds.scm
rename to runtime/queries/blade/folds.scm
diff --git a/queries/blade/highlights.scm b/runtime/queries/blade/highlights.scm
similarity index 100%
rename from queries/blade/highlights.scm
rename to runtime/queries/blade/highlights.scm
diff --git a/queries/blade/indents.scm b/runtime/queries/blade/indents.scm
similarity index 100%
rename from queries/blade/indents.scm
rename to runtime/queries/blade/indents.scm
diff --git a/queries/blade/injections.scm b/runtime/queries/blade/injections.scm
similarity index 100%
rename from queries/blade/injections.scm
rename to runtime/queries/blade/injections.scm
diff --git a/queries/blueprint/highlights.scm b/runtime/queries/blueprint/highlights.scm
similarity index 100%
rename from queries/blueprint/highlights.scm
rename to runtime/queries/blueprint/highlights.scm
diff --git a/queries/ada/injections.scm b/runtime/queries/blueprint/injections.scm
similarity index 100%
rename from queries/ada/injections.scm
rename to runtime/queries/blueprint/injections.scm
diff --git a/queries/bp/folds.scm b/runtime/queries/bp/folds.scm
similarity index 100%
rename from queries/bp/folds.scm
rename to runtime/queries/bp/folds.scm
diff --git a/queries/bp/highlights.scm b/runtime/queries/bp/highlights.scm
similarity index 100%
rename from queries/bp/highlights.scm
rename to runtime/queries/bp/highlights.scm
diff --git a/queries/bp/indents.scm b/runtime/queries/bp/indents.scm
similarity index 100%
rename from queries/bp/indents.scm
rename to runtime/queries/bp/indents.scm
diff --git a/queries/agda/injections.scm b/runtime/queries/bp/injections.scm
similarity index 100%
rename from queries/agda/injections.scm
rename to runtime/queries/bp/injections.scm
diff --git a/queries/bp/locals.scm b/runtime/queries/bp/locals.scm
similarity index 100%
rename from queries/bp/locals.scm
rename to runtime/queries/bp/locals.scm
diff --git a/queries/brightscript/folds.scm b/runtime/queries/brightscript/folds.scm
similarity index 100%
rename from queries/brightscript/folds.scm
rename to runtime/queries/brightscript/folds.scm
diff --git a/queries/brightscript/highlights.scm b/runtime/queries/brightscript/highlights.scm
similarity index 100%
rename from queries/brightscript/highlights.scm
rename to runtime/queries/brightscript/highlights.scm
diff --git a/queries/brightscript/indents.scm b/runtime/queries/brightscript/indents.scm
similarity index 100%
rename from queries/brightscript/indents.scm
rename to runtime/queries/brightscript/indents.scm
diff --git a/queries/authzed/injections.scm b/runtime/queries/brightscript/injections.scm
similarity index 100%
rename from queries/authzed/injections.scm
rename to runtime/queries/brightscript/injections.scm
diff --git a/queries/c/folds.scm b/runtime/queries/c/folds.scm
similarity index 100%
rename from queries/c/folds.scm
rename to runtime/queries/c/folds.scm
diff --git a/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
similarity index 100%
rename from queries/c/highlights.scm
rename to runtime/queries/c/highlights.scm
diff --git a/queries/c/indents.scm b/runtime/queries/c/indents.scm
similarity index 100%
rename from queries/c/indents.scm
rename to runtime/queries/c/indents.scm
diff --git a/queries/c/injections.scm b/runtime/queries/c/injections.scm
similarity index 100%
rename from queries/c/injections.scm
rename to runtime/queries/c/injections.scm
diff --git a/queries/c/locals.scm b/runtime/queries/c/locals.scm
similarity index 100%
rename from queries/c/locals.scm
rename to runtime/queries/c/locals.scm
diff --git a/queries/c_sharp/folds.scm b/runtime/queries/c_sharp/folds.scm
similarity index 100%
rename from queries/c_sharp/folds.scm
rename to runtime/queries/c_sharp/folds.scm
diff --git a/queries/c_sharp/highlights.scm b/runtime/queries/c_sharp/highlights.scm
similarity index 100%
rename from queries/c_sharp/highlights.scm
rename to runtime/queries/c_sharp/highlights.scm
diff --git a/queries/beancount/injections.scm b/runtime/queries/c_sharp/injections.scm
similarity index 100%
rename from queries/beancount/injections.scm
rename to runtime/queries/c_sharp/injections.scm
diff --git a/queries/c_sharp/locals.scm b/runtime/queries/c_sharp/locals.scm
similarity index 100%
rename from queries/c_sharp/locals.scm
rename to runtime/queries/c_sharp/locals.scm
diff --git a/queries/caddy/folds.scm b/runtime/queries/caddy/folds.scm
similarity index 100%
rename from queries/caddy/folds.scm
rename to runtime/queries/caddy/folds.scm
diff --git a/queries/caddy/highlights.scm b/runtime/queries/caddy/highlights.scm
similarity index 100%
rename from queries/caddy/highlights.scm
rename to runtime/queries/caddy/highlights.scm
diff --git a/queries/caddy/indents.scm b/runtime/queries/caddy/indents.scm
similarity index 100%
rename from queries/caddy/indents.scm
rename to runtime/queries/caddy/indents.scm
diff --git a/queries/blueprint/injections.scm b/runtime/queries/caddy/injections.scm
similarity index 100%
rename from queries/blueprint/injections.scm
rename to runtime/queries/caddy/injections.scm
diff --git a/queries/cairo/folds.scm b/runtime/queries/cairo/folds.scm
similarity index 100%
rename from queries/cairo/folds.scm
rename to runtime/queries/cairo/folds.scm
diff --git a/queries/cairo/highlights.scm b/runtime/queries/cairo/highlights.scm
similarity index 100%
rename from queries/cairo/highlights.scm
rename to runtime/queries/cairo/highlights.scm
diff --git a/queries/cairo/indents.scm b/runtime/queries/cairo/indents.scm
similarity index 100%
rename from queries/cairo/indents.scm
rename to runtime/queries/cairo/indents.scm
diff --git a/queries/cairo/injections.scm b/runtime/queries/cairo/injections.scm
similarity index 100%
rename from queries/cairo/injections.scm
rename to runtime/queries/cairo/injections.scm
diff --git a/queries/cairo/locals.scm b/runtime/queries/cairo/locals.scm
similarity index 100%
rename from queries/cairo/locals.scm
rename to runtime/queries/cairo/locals.scm
diff --git a/queries/capnp/folds.scm b/runtime/queries/capnp/folds.scm
similarity index 100%
rename from queries/capnp/folds.scm
rename to runtime/queries/capnp/folds.scm
diff --git a/queries/capnp/highlights.scm b/runtime/queries/capnp/highlights.scm
similarity index 100%
rename from queries/capnp/highlights.scm
rename to runtime/queries/capnp/highlights.scm
diff --git a/queries/capnp/indents.scm b/runtime/queries/capnp/indents.scm
similarity index 100%
rename from queries/capnp/indents.scm
rename to runtime/queries/capnp/indents.scm
diff --git a/queries/bp/injections.scm b/runtime/queries/capnp/injections.scm
similarity index 100%
rename from queries/bp/injections.scm
rename to runtime/queries/capnp/injections.scm
diff --git a/queries/capnp/locals.scm b/runtime/queries/capnp/locals.scm
similarity index 100%
rename from queries/capnp/locals.scm
rename to runtime/queries/capnp/locals.scm
diff --git a/queries/chatito/folds.scm b/runtime/queries/chatito/folds.scm
similarity index 100%
rename from queries/chatito/folds.scm
rename to runtime/queries/chatito/folds.scm
diff --git a/queries/chatito/highlights.scm b/runtime/queries/chatito/highlights.scm
similarity index 100%
rename from queries/chatito/highlights.scm
rename to runtime/queries/chatito/highlights.scm
diff --git a/queries/chatito/indents.scm b/runtime/queries/chatito/indents.scm
similarity index 100%
rename from queries/chatito/indents.scm
rename to runtime/queries/chatito/indents.scm
diff --git a/queries/brightscript/injections.scm b/runtime/queries/chatito/injections.scm
similarity index 100%
rename from queries/brightscript/injections.scm
rename to runtime/queries/chatito/injections.scm
diff --git a/queries/chatito/locals.scm b/runtime/queries/chatito/locals.scm
similarity index 100%
rename from queries/chatito/locals.scm
rename to runtime/queries/chatito/locals.scm
diff --git a/queries/circom/folds.scm b/runtime/queries/circom/folds.scm
similarity index 100%
rename from queries/circom/folds.scm
rename to runtime/queries/circom/folds.scm
diff --git a/queries/circom/highlights.scm b/runtime/queries/circom/highlights.scm
similarity index 100%
rename from queries/circom/highlights.scm
rename to runtime/queries/circom/highlights.scm
diff --git a/queries/c_sharp/injections.scm b/runtime/queries/circom/injections.scm
similarity index 100%
rename from queries/c_sharp/injections.scm
rename to runtime/queries/circom/injections.scm
diff --git a/queries/circom/locals.scm b/runtime/queries/circom/locals.scm
similarity index 100%
rename from queries/circom/locals.scm
rename to runtime/queries/circom/locals.scm
diff --git a/queries/clojure/folds.scm b/runtime/queries/clojure/folds.scm
similarity index 100%
rename from queries/clojure/folds.scm
rename to runtime/queries/clojure/folds.scm
diff --git a/queries/clojure/highlights.scm b/runtime/queries/clojure/highlights.scm
similarity index 100%
rename from queries/clojure/highlights.scm
rename to runtime/queries/clojure/highlights.scm
diff --git a/queries/caddy/injections.scm b/runtime/queries/clojure/injections.scm
similarity index 100%
rename from queries/caddy/injections.scm
rename to runtime/queries/clojure/injections.scm
diff --git a/queries/clojure/locals.scm b/runtime/queries/clojure/locals.scm
similarity index 100%
rename from queries/clojure/locals.scm
rename to runtime/queries/clojure/locals.scm
diff --git a/queries/cmake/folds.scm b/runtime/queries/cmake/folds.scm
similarity index 100%
rename from queries/cmake/folds.scm
rename to runtime/queries/cmake/folds.scm
diff --git a/queries/cmake/highlights.scm b/runtime/queries/cmake/highlights.scm
similarity index 100%
rename from queries/cmake/highlights.scm
rename to runtime/queries/cmake/highlights.scm
diff --git a/queries/cmake/indents.scm b/runtime/queries/cmake/indents.scm
similarity index 100%
rename from queries/cmake/indents.scm
rename to runtime/queries/cmake/indents.scm
diff --git a/queries/cmake/injections.scm b/runtime/queries/cmake/injections.scm
similarity index 100%
rename from queries/cmake/injections.scm
rename to runtime/queries/cmake/injections.scm
diff --git a/queries/comment/highlights.scm b/runtime/queries/comment/highlights.scm
similarity index 100%
rename from queries/comment/highlights.scm
rename to runtime/queries/comment/highlights.scm
diff --git a/queries/commonlisp/folds.scm b/runtime/queries/commonlisp/folds.scm
similarity index 100%
rename from queries/commonlisp/folds.scm
rename to runtime/queries/commonlisp/folds.scm
diff --git a/queries/commonlisp/highlights.scm b/runtime/queries/commonlisp/highlights.scm
similarity index 100%
rename from queries/commonlisp/highlights.scm
rename to runtime/queries/commonlisp/highlights.scm
diff --git a/queries/commonlisp/injections.scm b/runtime/queries/commonlisp/injections.scm
similarity index 100%
rename from queries/commonlisp/injections.scm
rename to runtime/queries/commonlisp/injections.scm
diff --git a/queries/commonlisp/locals.scm b/runtime/queries/commonlisp/locals.scm
similarity index 100%
rename from queries/commonlisp/locals.scm
rename to runtime/queries/commonlisp/locals.scm
diff --git a/queries/cooklang/highlights.scm b/runtime/queries/cooklang/highlights.scm
similarity index 100%
rename from queries/cooklang/highlights.scm
rename to runtime/queries/cooklang/highlights.scm
diff --git a/queries/capnp/injections.scm b/runtime/queries/cooklang/injections.scm
similarity index 100%
rename from queries/capnp/injections.scm
rename to runtime/queries/cooklang/injections.scm
diff --git a/queries/corn/folds.scm b/runtime/queries/corn/folds.scm
similarity index 100%
rename from queries/corn/folds.scm
rename to runtime/queries/corn/folds.scm
diff --git a/queries/corn/highlights.scm b/runtime/queries/corn/highlights.scm
similarity index 100%
rename from queries/corn/highlights.scm
rename to runtime/queries/corn/highlights.scm
diff --git a/queries/corn/indents.scm b/runtime/queries/corn/indents.scm
similarity index 100%
rename from queries/corn/indents.scm
rename to runtime/queries/corn/indents.scm
diff --git a/queries/chatito/injections.scm b/runtime/queries/corn/injections.scm
similarity index 100%
rename from queries/chatito/injections.scm
rename to runtime/queries/corn/injections.scm
diff --git a/queries/corn/locals.scm b/runtime/queries/corn/locals.scm
similarity index 100%
rename from queries/corn/locals.scm
rename to runtime/queries/corn/locals.scm
diff --git a/queries/cpon/folds.scm b/runtime/queries/cpon/folds.scm
similarity index 100%
rename from queries/cpon/folds.scm
rename to runtime/queries/cpon/folds.scm
diff --git a/queries/cpon/highlights.scm b/runtime/queries/cpon/highlights.scm
similarity index 100%
rename from queries/cpon/highlights.scm
rename to runtime/queries/cpon/highlights.scm
diff --git a/queries/cpon/indents.scm b/runtime/queries/cpon/indents.scm
similarity index 100%
rename from queries/cpon/indents.scm
rename to runtime/queries/cpon/indents.scm
diff --git a/queries/circom/injections.scm b/runtime/queries/cpon/injections.scm
similarity index 100%
rename from queries/circom/injections.scm
rename to runtime/queries/cpon/injections.scm
diff --git a/queries/cpon/locals.scm b/runtime/queries/cpon/locals.scm
similarity index 100%
rename from queries/cpon/locals.scm
rename to runtime/queries/cpon/locals.scm
diff --git a/queries/cpp/folds.scm b/runtime/queries/cpp/folds.scm
similarity index 100%
rename from queries/cpp/folds.scm
rename to runtime/queries/cpp/folds.scm
diff --git a/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
similarity index 100%
rename from queries/cpp/highlights.scm
rename to runtime/queries/cpp/highlights.scm
diff --git a/queries/cpp/indents.scm b/runtime/queries/cpp/indents.scm
similarity index 100%
rename from queries/cpp/indents.scm
rename to runtime/queries/cpp/indents.scm
diff --git a/queries/cpp/injections.scm b/runtime/queries/cpp/injections.scm
similarity index 79%
rename from queries/cpp/injections.scm
rename to runtime/queries/cpp/injections.scm
index 07f21dd14..1fbc8e131 100644
--- a/queries/cpp/injections.scm
+++ b/runtime/queries/cpp/injections.scm
@@ -1,6 +1,4 @@
 ; inherits: c
-((comment) @injection.content
-  (#set! injection.language "comment"))
 
 ((comment) @injection.content
   (#lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
diff --git a/queries/cpp/locals.scm b/runtime/queries/cpp/locals.scm
similarity index 100%
rename from queries/cpp/locals.scm
rename to runtime/queries/cpp/locals.scm
diff --git a/queries/css/folds.scm b/runtime/queries/css/folds.scm
similarity index 100%
rename from queries/css/folds.scm
rename to runtime/queries/css/folds.scm
diff --git a/queries/css/highlights.scm b/runtime/queries/css/highlights.scm
similarity index 100%
rename from queries/css/highlights.scm
rename to runtime/queries/css/highlights.scm
diff --git a/queries/css/indents.scm b/runtime/queries/css/indents.scm
similarity index 100%
rename from queries/css/indents.scm
rename to runtime/queries/css/indents.scm
diff --git a/queries/clojure/injections.scm b/runtime/queries/css/injections.scm
similarity index 100%
rename from queries/clojure/injections.scm
rename to runtime/queries/css/injections.scm
diff --git a/queries/csv/highlights.scm b/runtime/queries/csv/highlights.scm
similarity index 100%
rename from queries/csv/highlights.scm
rename to runtime/queries/csv/highlights.scm
diff --git a/queries/cuda/folds.scm b/runtime/queries/cuda/folds.scm
similarity index 100%
rename from queries/cuda/folds.scm
rename to runtime/queries/cuda/folds.scm
diff --git a/queries/cuda/highlights.scm b/runtime/queries/cuda/highlights.scm
similarity index 100%
rename from queries/cuda/highlights.scm
rename to runtime/queries/cuda/highlights.scm
diff --git a/queries/cuda/indents.scm b/runtime/queries/cuda/indents.scm
similarity index 100%
rename from queries/cuda/indents.scm
rename to runtime/queries/cuda/indents.scm
diff --git a/queries/cuda/injections.scm b/runtime/queries/cuda/injections.scm
similarity index 100%
rename from queries/cuda/injections.scm
rename to runtime/queries/cuda/injections.scm
diff --git a/queries/cuda/locals.scm b/runtime/queries/cuda/locals.scm
similarity index 100%
rename from queries/cuda/locals.scm
rename to runtime/queries/cuda/locals.scm
diff --git a/queries/cue/folds.scm b/runtime/queries/cue/folds.scm
similarity index 100%
rename from queries/cue/folds.scm
rename to runtime/queries/cue/folds.scm
diff --git a/queries/cue/highlights.scm b/runtime/queries/cue/highlights.scm
similarity index 100%
rename from queries/cue/highlights.scm
rename to runtime/queries/cue/highlights.scm
diff --git a/queries/cue/indents.scm b/runtime/queries/cue/indents.scm
similarity index 100%
rename from queries/cue/indents.scm
rename to runtime/queries/cue/indents.scm
diff --git a/queries/cooklang/injections.scm b/runtime/queries/cue/injections.scm
similarity index 100%
rename from queries/cooklang/injections.scm
rename to runtime/queries/cue/injections.scm
diff --git a/queries/cue/locals.scm b/runtime/queries/cue/locals.scm
similarity index 100%
rename from queries/cue/locals.scm
rename to runtime/queries/cue/locals.scm
diff --git a/queries/cylc/folds.scm b/runtime/queries/cylc/folds.scm
similarity index 100%
rename from queries/cylc/folds.scm
rename to runtime/queries/cylc/folds.scm
diff --git a/queries/cylc/highlights.scm b/runtime/queries/cylc/highlights.scm
similarity index 100%
rename from queries/cylc/highlights.scm
rename to runtime/queries/cylc/highlights.scm
diff --git a/queries/cylc/indents.scm b/runtime/queries/cylc/indents.scm
similarity index 100%
rename from queries/cylc/indents.scm
rename to runtime/queries/cylc/indents.scm
diff --git a/queries/cylc/injections.scm b/runtime/queries/cylc/injections.scm
similarity index 100%
rename from queries/cylc/injections.scm
rename to runtime/queries/cylc/injections.scm
diff --git a/queries/d/folds.scm b/runtime/queries/d/folds.scm
similarity index 100%
rename from queries/d/folds.scm
rename to runtime/queries/d/folds.scm
diff --git a/queries/d/highlights.scm b/runtime/queries/d/highlights.scm
similarity index 100%
rename from queries/d/highlights.scm
rename to runtime/queries/d/highlights.scm
diff --git a/queries/d/indents.scm b/runtime/queries/d/indents.scm
similarity index 100%
rename from queries/d/indents.scm
rename to runtime/queries/d/indents.scm
diff --git a/queries/d/injections.scm b/runtime/queries/d/injections.scm
similarity index 100%
rename from queries/d/injections.scm
rename to runtime/queries/d/injections.scm
diff --git a/queries/d/locals.scm b/runtime/queries/d/locals.scm
similarity index 100%
rename from queries/d/locals.scm
rename to runtime/queries/d/locals.scm
diff --git a/queries/dart/folds.scm b/runtime/queries/dart/folds.scm
similarity index 100%
rename from queries/dart/folds.scm
rename to runtime/queries/dart/folds.scm
diff --git a/queries/dart/highlights.scm b/runtime/queries/dart/highlights.scm
similarity index 100%
rename from queries/dart/highlights.scm
rename to runtime/queries/dart/highlights.scm
diff --git a/queries/dart/indents.scm b/runtime/queries/dart/indents.scm
similarity index 100%
rename from queries/dart/indents.scm
rename to runtime/queries/dart/indents.scm
diff --git a/queries/corn/injections.scm b/runtime/queries/dart/injections.scm
similarity index 100%
rename from queries/corn/injections.scm
rename to runtime/queries/dart/injections.scm
diff --git a/queries/dart/locals.scm b/runtime/queries/dart/locals.scm
similarity index 100%
rename from queries/dart/locals.scm
rename to runtime/queries/dart/locals.scm
diff --git a/queries/desktop/folds.scm b/runtime/queries/desktop/folds.scm
similarity index 100%
rename from queries/desktop/folds.scm
rename to runtime/queries/desktop/folds.scm
diff --git a/queries/desktop/highlights.scm b/runtime/queries/desktop/highlights.scm
similarity index 100%
rename from queries/desktop/highlights.scm
rename to runtime/queries/desktop/highlights.scm
diff --git a/queries/desktop/injections.scm b/runtime/queries/desktop/injections.scm
similarity index 100%
rename from queries/desktop/injections.scm
rename to runtime/queries/desktop/injections.scm
diff --git a/queries/devicetree/folds.scm b/runtime/queries/devicetree/folds.scm
similarity index 100%
rename from queries/devicetree/folds.scm
rename to runtime/queries/devicetree/folds.scm
diff --git a/queries/devicetree/highlights.scm b/runtime/queries/devicetree/highlights.scm
similarity index 100%
rename from queries/devicetree/highlights.scm
rename to runtime/queries/devicetree/highlights.scm
diff --git a/queries/devicetree/indents.scm b/runtime/queries/devicetree/indents.scm
similarity index 100%
rename from queries/devicetree/indents.scm
rename to runtime/queries/devicetree/indents.scm
diff --git a/queries/cpon/injections.scm b/runtime/queries/devicetree/injections.scm
similarity index 100%
rename from queries/cpon/injections.scm
rename to runtime/queries/devicetree/injections.scm
diff --git a/queries/devicetree/locals.scm b/runtime/queries/devicetree/locals.scm
similarity index 100%
rename from queries/devicetree/locals.scm
rename to runtime/queries/devicetree/locals.scm
diff --git a/queries/dhall/folds.scm b/runtime/queries/dhall/folds.scm
similarity index 100%
rename from queries/dhall/folds.scm
rename to runtime/queries/dhall/folds.scm
diff --git a/queries/dhall/highlights.scm b/runtime/queries/dhall/highlights.scm
similarity index 100%
rename from queries/dhall/highlights.scm
rename to runtime/queries/dhall/highlights.scm
diff --git a/queries/dhall/injections.scm b/runtime/queries/dhall/injections.scm
similarity index 100%
rename from queries/dhall/injections.scm
rename to runtime/queries/dhall/injections.scm
diff --git a/queries/diff/folds.scm b/runtime/queries/diff/folds.scm
similarity index 100%
rename from queries/diff/folds.scm
rename to runtime/queries/diff/folds.scm
diff --git a/queries/diff/highlights.scm b/runtime/queries/diff/highlights.scm
similarity index 100%
rename from queries/diff/highlights.scm
rename to runtime/queries/diff/highlights.scm
diff --git a/queries/css/injections.scm b/runtime/queries/diff/injections.scm
similarity index 100%
rename from queries/css/injections.scm
rename to runtime/queries/diff/injections.scm
diff --git a/queries/disassembly/highlights.scm b/runtime/queries/disassembly/highlights.scm
similarity index 100%
rename from queries/disassembly/highlights.scm
rename to runtime/queries/disassembly/highlights.scm
diff --git a/queries/disassembly/injections.scm b/runtime/queries/disassembly/injections.scm
similarity index 100%
rename from queries/disassembly/injections.scm
rename to runtime/queries/disassembly/injections.scm
diff --git a/queries/djot/folds.scm b/runtime/queries/djot/folds.scm
similarity index 100%
rename from queries/djot/folds.scm
rename to runtime/queries/djot/folds.scm
diff --git a/queries/djot/highlights.scm b/runtime/queries/djot/highlights.scm
similarity index 100%
rename from queries/djot/highlights.scm
rename to runtime/queries/djot/highlights.scm
diff --git a/queries/djot/indents.scm b/runtime/queries/djot/indents.scm
similarity index 100%
rename from queries/djot/indents.scm
rename to runtime/queries/djot/indents.scm
diff --git a/queries/djot/injections.scm b/runtime/queries/djot/injections.scm
similarity index 100%
rename from queries/djot/injections.scm
rename to runtime/queries/djot/injections.scm
diff --git a/queries/djot/locals.scm b/runtime/queries/djot/locals.scm
similarity index 100%
rename from queries/djot/locals.scm
rename to runtime/queries/djot/locals.scm
diff --git a/queries/dockerfile/highlights.scm b/runtime/queries/dockerfile/highlights.scm
similarity index 100%
rename from queries/dockerfile/highlights.scm
rename to runtime/queries/dockerfile/highlights.scm
diff --git a/queries/dockerfile/injections.scm b/runtime/queries/dockerfile/injections.scm
similarity index 100%
rename from queries/dockerfile/injections.scm
rename to runtime/queries/dockerfile/injections.scm
diff --git a/queries/dot/highlights.scm b/runtime/queries/dot/highlights.scm
similarity index 100%
rename from queries/dot/highlights.scm
rename to runtime/queries/dot/highlights.scm
diff --git a/queries/dot/indents.scm b/runtime/queries/dot/indents.scm
similarity index 100%
rename from queries/dot/indents.scm
rename to runtime/queries/dot/indents.scm
diff --git a/queries/dot/injections.scm b/runtime/queries/dot/injections.scm
similarity index 100%
rename from queries/dot/injections.scm
rename to runtime/queries/dot/injections.scm
diff --git a/queries/doxygen/highlights.scm b/runtime/queries/doxygen/highlights.scm
similarity index 100%
rename from queries/doxygen/highlights.scm
rename to runtime/queries/doxygen/highlights.scm
diff --git a/queries/doxygen/indents.scm b/runtime/queries/doxygen/indents.scm
similarity index 100%
rename from queries/doxygen/indents.scm
rename to runtime/queries/doxygen/indents.scm
diff --git a/queries/doxygen/injections.scm b/runtime/queries/doxygen/injections.scm
similarity index 100%
rename from queries/doxygen/injections.scm
rename to runtime/queries/doxygen/injections.scm
diff --git a/queries/dtd/folds.scm b/runtime/queries/dtd/folds.scm
similarity index 100%
rename from queries/dtd/folds.scm
rename to runtime/queries/dtd/folds.scm
diff --git a/queries/dtd/highlights.scm b/runtime/queries/dtd/highlights.scm
similarity index 100%
rename from queries/dtd/highlights.scm
rename to runtime/queries/dtd/highlights.scm
diff --git a/queries/dtd/injections.scm b/runtime/queries/dtd/injections.scm
similarity index 100%
rename from queries/dtd/injections.scm
rename to runtime/queries/dtd/injections.scm
diff --git a/queries/dtd/locals.scm b/runtime/queries/dtd/locals.scm
similarity index 100%
rename from queries/dtd/locals.scm
rename to runtime/queries/dtd/locals.scm
diff --git a/queries/earthfile/highlights.scm b/runtime/queries/earthfile/highlights.scm
similarity index 100%
rename from queries/earthfile/highlights.scm
rename to runtime/queries/earthfile/highlights.scm
diff --git a/queries/earthfile/injections.scm b/runtime/queries/earthfile/injections.scm
similarity index 100%
rename from queries/earthfile/injections.scm
rename to runtime/queries/earthfile/injections.scm
diff --git a/queries/ebnf/highlights.scm b/runtime/queries/ebnf/highlights.scm
similarity index 100%
rename from queries/ebnf/highlights.scm
rename to runtime/queries/ebnf/highlights.scm
diff --git a/queries/cue/injections.scm b/runtime/queries/ebnf/injections.scm
similarity index 100%
rename from queries/cue/injections.scm
rename to runtime/queries/ebnf/injections.scm
diff --git a/queries/ecma/folds.scm b/runtime/queries/ecma/folds.scm
similarity index 100%
rename from queries/ecma/folds.scm
rename to runtime/queries/ecma/folds.scm
diff --git a/queries/ecma/highlights.scm b/runtime/queries/ecma/highlights.scm
similarity index 100%
rename from queries/ecma/highlights.scm
rename to runtime/queries/ecma/highlights.scm
diff --git a/queries/ecma/indents.scm b/runtime/queries/ecma/indents.scm
similarity index 100%
rename from queries/ecma/indents.scm
rename to runtime/queries/ecma/indents.scm
diff --git a/queries/ecma/injections.scm b/runtime/queries/ecma/injections.scm
similarity index 100%
rename from queries/ecma/injections.scm
rename to runtime/queries/ecma/injections.scm
diff --git a/queries/ecma/locals.scm b/runtime/queries/ecma/locals.scm
similarity index 100%
rename from queries/ecma/locals.scm
rename to runtime/queries/ecma/locals.scm
diff --git a/queries/editorconfig/folds.scm b/runtime/queries/editorconfig/folds.scm
similarity index 100%
rename from queries/editorconfig/folds.scm
rename to runtime/queries/editorconfig/folds.scm
diff --git a/queries/editorconfig/highlights.scm b/runtime/queries/editorconfig/highlights.scm
similarity index 100%
rename from queries/editorconfig/highlights.scm
rename to runtime/queries/editorconfig/highlights.scm
diff --git a/queries/dart/injections.scm b/runtime/queries/editorconfig/injections.scm
similarity index 100%
rename from queries/dart/injections.scm
rename to runtime/queries/editorconfig/injections.scm
diff --git a/queries/eds/folds.scm b/runtime/queries/eds/folds.scm
similarity index 100%
rename from queries/eds/folds.scm
rename to runtime/queries/eds/folds.scm
diff --git a/queries/eds/highlights.scm b/runtime/queries/eds/highlights.scm
similarity index 100%
rename from queries/eds/highlights.scm
rename to runtime/queries/eds/highlights.scm
diff --git a/queries/eex/highlights.scm b/runtime/queries/eex/highlights.scm
similarity index 100%
rename from queries/eex/highlights.scm
rename to runtime/queries/eex/highlights.scm
diff --git a/queries/eex/injections.scm b/runtime/queries/eex/injections.scm
similarity index 100%
rename from queries/eex/injections.scm
rename to runtime/queries/eex/injections.scm
diff --git a/queries/elixir/folds.scm b/runtime/queries/elixir/folds.scm
similarity index 100%
rename from queries/elixir/folds.scm
rename to runtime/queries/elixir/folds.scm
diff --git a/queries/elixir/highlights.scm b/runtime/queries/elixir/highlights.scm
similarity index 100%
rename from queries/elixir/highlights.scm
rename to runtime/queries/elixir/highlights.scm
diff --git a/queries/elixir/indents.scm b/runtime/queries/elixir/indents.scm
similarity index 100%
rename from queries/elixir/indents.scm
rename to runtime/queries/elixir/indents.scm
diff --git a/queries/elixir/injections.scm b/runtime/queries/elixir/injections.scm
similarity index 100%
rename from queries/elixir/injections.scm
rename to runtime/queries/elixir/injections.scm
diff --git a/queries/elixir/locals.scm b/runtime/queries/elixir/locals.scm
similarity index 100%
rename from queries/elixir/locals.scm
rename to runtime/queries/elixir/locals.scm
diff --git a/queries/elm/folds.scm b/runtime/queries/elm/folds.scm
similarity index 100%
rename from queries/elm/folds.scm
rename to runtime/queries/elm/folds.scm
diff --git a/queries/elm/highlights.scm b/runtime/queries/elm/highlights.scm
similarity index 100%
rename from queries/elm/highlights.scm
rename to runtime/queries/elm/highlights.scm
diff --git a/queries/elm/injections.scm b/runtime/queries/elm/injections.scm
similarity index 100%
rename from queries/elm/injections.scm
rename to runtime/queries/elm/injections.scm
diff --git a/queries/elsa/folds.scm b/runtime/queries/elsa/folds.scm
similarity index 100%
rename from queries/elsa/folds.scm
rename to runtime/queries/elsa/folds.scm
diff --git a/queries/elsa/highlights.scm b/runtime/queries/elsa/highlights.scm
similarity index 100%
rename from queries/elsa/highlights.scm
rename to runtime/queries/elsa/highlights.scm
diff --git a/queries/elsa/indents.scm b/runtime/queries/elsa/indents.scm
similarity index 100%
rename from queries/elsa/indents.scm
rename to runtime/queries/elsa/indents.scm
diff --git a/queries/devicetree/injections.scm b/runtime/queries/elsa/injections.scm
similarity index 100%
rename from queries/devicetree/injections.scm
rename to runtime/queries/elsa/injections.scm
diff --git a/queries/elsa/locals.scm b/runtime/queries/elsa/locals.scm
similarity index 100%
rename from queries/elsa/locals.scm
rename to runtime/queries/elsa/locals.scm
diff --git a/queries/elvish/highlights.scm b/runtime/queries/elvish/highlights.scm
similarity index 100%
rename from queries/elvish/highlights.scm
rename to runtime/queries/elvish/highlights.scm
diff --git a/queries/diff/injections.scm b/runtime/queries/elvish/injections.scm
similarity index 100%
rename from queries/diff/injections.scm
rename to runtime/queries/elvish/injections.scm
diff --git a/queries/embedded_template/highlights.scm b/runtime/queries/embedded_template/highlights.scm
similarity index 100%
rename from queries/embedded_template/highlights.scm
rename to runtime/queries/embedded_template/highlights.scm
diff --git a/queries/embedded_template/injections.scm b/runtime/queries/embedded_template/injections.scm
similarity index 100%
rename from queries/embedded_template/injections.scm
rename to runtime/queries/embedded_template/injections.scm
diff --git a/queries/enforce/folds.scm b/runtime/queries/enforce/folds.scm
similarity index 100%
rename from queries/enforce/folds.scm
rename to runtime/queries/enforce/folds.scm
diff --git a/queries/enforce/highlights.scm b/runtime/queries/enforce/highlights.scm
similarity index 100%
rename from queries/enforce/highlights.scm
rename to runtime/queries/enforce/highlights.scm
diff --git a/queries/enforce/indents.scm b/runtime/queries/enforce/indents.scm
similarity index 100%
rename from queries/enforce/indents.scm
rename to runtime/queries/enforce/indents.scm
diff --git a/queries/enforce/injections.scm b/runtime/queries/enforce/injections.scm
similarity index 100%
rename from queries/enforce/injections.scm
rename to runtime/queries/enforce/injections.scm
diff --git a/queries/enforce/locals.scm b/runtime/queries/enforce/locals.scm
similarity index 100%
rename from queries/enforce/locals.scm
rename to runtime/queries/enforce/locals.scm
diff --git a/queries/erlang/folds.scm b/runtime/queries/erlang/folds.scm
similarity index 100%
rename from queries/erlang/folds.scm
rename to runtime/queries/erlang/folds.scm
diff --git a/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
similarity index 100%
rename from queries/erlang/highlights.scm
rename to runtime/queries/erlang/highlights.scm
diff --git a/queries/ebnf/injections.scm b/runtime/queries/erlang/injections.scm
similarity index 100%
rename from queries/ebnf/injections.scm
rename to runtime/queries/erlang/injections.scm
diff --git a/queries/facility/folds.scm b/runtime/queries/facility/folds.scm
similarity index 100%
rename from queries/facility/folds.scm
rename to runtime/queries/facility/folds.scm
diff --git a/queries/facility/highlights.scm b/runtime/queries/facility/highlights.scm
similarity index 100%
rename from queries/facility/highlights.scm
rename to runtime/queries/facility/highlights.scm
diff --git a/queries/facility/indents.scm b/runtime/queries/facility/indents.scm
similarity index 100%
rename from queries/facility/indents.scm
rename to runtime/queries/facility/indents.scm
diff --git a/queries/facility/injections.scm b/runtime/queries/facility/injections.scm
similarity index 100%
rename from queries/facility/injections.scm
rename to runtime/queries/facility/injections.scm
diff --git a/queries/faust/highlights.scm b/runtime/queries/faust/highlights.scm
similarity index 100%
rename from queries/faust/highlights.scm
rename to runtime/queries/faust/highlights.scm
diff --git a/queries/editorconfig/injections.scm b/runtime/queries/faust/injections.scm
similarity index 100%
rename from queries/editorconfig/injections.scm
rename to runtime/queries/faust/injections.scm
diff --git a/queries/fennel/folds.scm b/runtime/queries/fennel/folds.scm
similarity index 100%
rename from queries/fennel/folds.scm
rename to runtime/queries/fennel/folds.scm
diff --git a/queries/fennel/highlights.scm b/runtime/queries/fennel/highlights.scm
similarity index 100%
rename from queries/fennel/highlights.scm
rename to runtime/queries/fennel/highlights.scm
diff --git a/queries/fennel/injections.scm b/runtime/queries/fennel/injections.scm
similarity index 100%
rename from queries/fennel/injections.scm
rename to runtime/queries/fennel/injections.scm
diff --git a/queries/fennel/locals.scm b/runtime/queries/fennel/locals.scm
similarity index 100%
rename from queries/fennel/locals.scm
rename to runtime/queries/fennel/locals.scm
diff --git a/queries/fidl/folds.scm b/runtime/queries/fidl/folds.scm
similarity index 100%
rename from queries/fidl/folds.scm
rename to runtime/queries/fidl/folds.scm
diff --git a/queries/fidl/highlights.scm b/runtime/queries/fidl/highlights.scm
similarity index 100%
rename from queries/fidl/highlights.scm
rename to runtime/queries/fidl/highlights.scm
diff --git a/queries/elsa/injections.scm b/runtime/queries/fidl/injections.scm
similarity index 100%
rename from queries/elsa/injections.scm
rename to runtime/queries/fidl/injections.scm
diff --git a/queries/firrtl/folds.scm b/runtime/queries/firrtl/folds.scm
similarity index 100%
rename from queries/firrtl/folds.scm
rename to runtime/queries/firrtl/folds.scm
diff --git a/queries/firrtl/highlights.scm b/runtime/queries/firrtl/highlights.scm
similarity index 100%
rename from queries/firrtl/highlights.scm
rename to runtime/queries/firrtl/highlights.scm
diff --git a/queries/firrtl/indents.scm b/runtime/queries/firrtl/indents.scm
similarity index 100%
rename from queries/firrtl/indents.scm
rename to runtime/queries/firrtl/indents.scm
diff --git a/queries/elvish/injections.scm b/runtime/queries/firrtl/injections.scm
similarity index 100%
rename from queries/elvish/injections.scm
rename to runtime/queries/firrtl/injections.scm
diff --git a/queries/firrtl/locals.scm b/runtime/queries/firrtl/locals.scm
similarity index 100%
rename from queries/firrtl/locals.scm
rename to runtime/queries/firrtl/locals.scm
diff --git a/queries/fish/folds.scm b/runtime/queries/fish/folds.scm
similarity index 100%
rename from queries/fish/folds.scm
rename to runtime/queries/fish/folds.scm
diff --git a/queries/fish/highlights.scm b/runtime/queries/fish/highlights.scm
similarity index 100%
rename from queries/fish/highlights.scm
rename to runtime/queries/fish/highlights.scm
diff --git a/queries/fish/indents.scm b/runtime/queries/fish/indents.scm
similarity index 100%
rename from queries/fish/indents.scm
rename to runtime/queries/fish/indents.scm
diff --git a/queries/erlang/injections.scm b/runtime/queries/fish/injections.scm
similarity index 100%
rename from queries/erlang/injections.scm
rename to runtime/queries/fish/injections.scm
diff --git a/queries/fish/locals.scm b/runtime/queries/fish/locals.scm
similarity index 100%
rename from queries/fish/locals.scm
rename to runtime/queries/fish/locals.scm
diff --git a/queries/foam/folds.scm b/runtime/queries/foam/folds.scm
similarity index 100%
rename from queries/foam/folds.scm
rename to runtime/queries/foam/folds.scm
diff --git a/queries/foam/highlights.scm b/runtime/queries/foam/highlights.scm
similarity index 100%
rename from queries/foam/highlights.scm
rename to runtime/queries/foam/highlights.scm
diff --git a/queries/foam/indents.scm b/runtime/queries/foam/indents.scm
similarity index 100%
rename from queries/foam/indents.scm
rename to runtime/queries/foam/indents.scm
diff --git a/queries/foam/injections.scm b/runtime/queries/foam/injections.scm
similarity index 100%
rename from queries/foam/injections.scm
rename to runtime/queries/foam/injections.scm
diff --git a/queries/foam/locals.scm b/runtime/queries/foam/locals.scm
similarity index 100%
rename from queries/foam/locals.scm
rename to runtime/queries/foam/locals.scm
diff --git a/queries/forth/folds.scm b/runtime/queries/forth/folds.scm
similarity index 100%
rename from queries/forth/folds.scm
rename to runtime/queries/forth/folds.scm
diff --git a/queries/forth/highlights.scm b/runtime/queries/forth/highlights.scm
similarity index 100%
rename from queries/forth/highlights.scm
rename to runtime/queries/forth/highlights.scm
diff --git a/queries/forth/indents.scm b/runtime/queries/forth/indents.scm
similarity index 100%
rename from queries/forth/indents.scm
rename to runtime/queries/forth/indents.scm
diff --git a/queries/faust/injections.scm b/runtime/queries/forth/injections.scm
similarity index 100%
rename from queries/faust/injections.scm
rename to runtime/queries/forth/injections.scm
diff --git a/queries/forth/locals.scm b/runtime/queries/forth/locals.scm
similarity index 100%
rename from queries/forth/locals.scm
rename to runtime/queries/forth/locals.scm
diff --git a/queries/fortran/folds.scm b/runtime/queries/fortran/folds.scm
similarity index 100%
rename from queries/fortran/folds.scm
rename to runtime/queries/fortran/folds.scm
diff --git a/queries/fortran/highlights.scm b/runtime/queries/fortran/highlights.scm
similarity index 100%
rename from queries/fortran/highlights.scm
rename to runtime/queries/fortran/highlights.scm
diff --git a/queries/fortran/indents.scm b/runtime/queries/fortran/indents.scm
similarity index 100%
rename from queries/fortran/indents.scm
rename to runtime/queries/fortran/indents.scm
diff --git a/queries/fidl/injections.scm b/runtime/queries/fortran/injections.scm
similarity index 100%
rename from queries/fidl/injections.scm
rename to runtime/queries/fortran/injections.scm
diff --git a/queries/fsh/highlights.scm b/runtime/queries/fsh/highlights.scm
similarity index 100%
rename from queries/fsh/highlights.scm
rename to runtime/queries/fsh/highlights.scm
diff --git a/queries/fsh/injections.scm b/runtime/queries/fsh/injections.scm
similarity index 100%
rename from queries/fsh/injections.scm
rename to runtime/queries/fsh/injections.scm
diff --git a/queries/fsharp/highlights.scm b/runtime/queries/fsharp/highlights.scm
similarity index 100%
rename from queries/fsharp/highlights.scm
rename to runtime/queries/fsharp/highlights.scm
diff --git a/queries/fsharp/injections.scm b/runtime/queries/fsharp/injections.scm
similarity index 100%
rename from queries/fsharp/injections.scm
rename to runtime/queries/fsharp/injections.scm
diff --git a/queries/func/highlights.scm b/runtime/queries/func/highlights.scm
similarity index 100%
rename from queries/func/highlights.scm
rename to runtime/queries/func/highlights.scm
diff --git a/queries/firrtl/injections.scm b/runtime/queries/func/injections.scm
similarity index 100%
rename from queries/firrtl/injections.scm
rename to runtime/queries/func/injections.scm
diff --git a/queries/fusion/folds.scm b/runtime/queries/fusion/folds.scm
similarity index 100%
rename from queries/fusion/folds.scm
rename to runtime/queries/fusion/folds.scm
diff --git a/queries/fusion/highlights.scm b/runtime/queries/fusion/highlights.scm
similarity index 100%
rename from queries/fusion/highlights.scm
rename to runtime/queries/fusion/highlights.scm
diff --git a/queries/fusion/indents.scm b/runtime/queries/fusion/indents.scm
similarity index 100%
rename from queries/fusion/indents.scm
rename to runtime/queries/fusion/indents.scm
diff --git a/queries/fusion/injections.scm b/runtime/queries/fusion/injections.scm
similarity index 100%
rename from queries/fusion/injections.scm
rename to runtime/queries/fusion/injections.scm
diff --git a/queries/fusion/locals.scm b/runtime/queries/fusion/locals.scm
similarity index 100%
rename from queries/fusion/locals.scm
rename to runtime/queries/fusion/locals.scm
diff --git a/queries/gap/folds.scm b/runtime/queries/gap/folds.scm
similarity index 100%
rename from queries/gap/folds.scm
rename to runtime/queries/gap/folds.scm
diff --git a/queries/gap/highlights.scm b/runtime/queries/gap/highlights.scm
similarity index 100%
rename from queries/gap/highlights.scm
rename to runtime/queries/gap/highlights.scm
diff --git a/queries/fish/injections.scm b/runtime/queries/gap/injections.scm
similarity index 100%
rename from queries/fish/injections.scm
rename to runtime/queries/gap/injections.scm
diff --git a/queries/gap/locals.scm b/runtime/queries/gap/locals.scm
similarity index 100%
rename from queries/gap/locals.scm
rename to runtime/queries/gap/locals.scm
diff --git a/queries/gaptst/folds.scm b/runtime/queries/gaptst/folds.scm
similarity index 100%
rename from queries/gaptst/folds.scm
rename to runtime/queries/gaptst/folds.scm
diff --git a/queries/gaptst/highlights.scm b/runtime/queries/gaptst/highlights.scm
similarity index 100%
rename from queries/gaptst/highlights.scm
rename to runtime/queries/gaptst/highlights.scm
diff --git a/queries/gaptst/injections.scm b/runtime/queries/gaptst/injections.scm
similarity index 100%
rename from queries/gaptst/injections.scm
rename to runtime/queries/gaptst/injections.scm
diff --git a/queries/gdscript/folds.scm b/runtime/queries/gdscript/folds.scm
similarity index 100%
rename from queries/gdscript/folds.scm
rename to runtime/queries/gdscript/folds.scm
diff --git a/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
similarity index 100%
rename from queries/gdscript/highlights.scm
rename to runtime/queries/gdscript/highlights.scm
diff --git a/queries/gdscript/indents.scm b/runtime/queries/gdscript/indents.scm
similarity index 100%
rename from queries/gdscript/indents.scm
rename to runtime/queries/gdscript/indents.scm
diff --git a/queries/forth/injections.scm b/runtime/queries/gdscript/injections.scm
similarity index 100%
rename from queries/forth/injections.scm
rename to runtime/queries/gdscript/injections.scm
diff --git a/queries/gdscript/locals.scm b/runtime/queries/gdscript/locals.scm
similarity index 100%
rename from queries/gdscript/locals.scm
rename to runtime/queries/gdscript/locals.scm
diff --git a/queries/gdshader/highlights.scm b/runtime/queries/gdshader/highlights.scm
similarity index 100%
rename from queries/gdshader/highlights.scm
rename to runtime/queries/gdshader/highlights.scm
diff --git a/queries/fortran/injections.scm b/runtime/queries/gdshader/injections.scm
similarity index 100%
rename from queries/fortran/injections.scm
rename to runtime/queries/gdshader/injections.scm
diff --git a/queries/git_config/folds.scm b/runtime/queries/git_config/folds.scm
similarity index 100%
rename from queries/git_config/folds.scm
rename to runtime/queries/git_config/folds.scm
diff --git a/queries/git_config/highlights.scm b/runtime/queries/git_config/highlights.scm
similarity index 100%
rename from queries/git_config/highlights.scm
rename to runtime/queries/git_config/highlights.scm
diff --git a/queries/git_config/injections.scm b/runtime/queries/git_config/injections.scm
similarity index 100%
rename from queries/git_config/injections.scm
rename to runtime/queries/git_config/injections.scm
diff --git a/queries/git_rebase/highlights.scm b/runtime/queries/git_rebase/highlights.scm
similarity index 100%
rename from queries/git_rebase/highlights.scm
rename to runtime/queries/git_rebase/highlights.scm
diff --git a/queries/git_rebase/injections.scm b/runtime/queries/git_rebase/injections.scm
similarity index 100%
rename from queries/git_rebase/injections.scm
rename to runtime/queries/git_rebase/injections.scm
diff --git a/queries/gitattributes/highlights.scm b/runtime/queries/gitattributes/highlights.scm
similarity index 100%
rename from queries/gitattributes/highlights.scm
rename to runtime/queries/gitattributes/highlights.scm
diff --git a/queries/func/injections.scm b/runtime/queries/gitattributes/injections.scm
similarity index 100%
rename from queries/func/injections.scm
rename to runtime/queries/gitattributes/injections.scm
diff --git a/queries/gitattributes/locals.scm b/runtime/queries/gitattributes/locals.scm
similarity index 100%
rename from queries/gitattributes/locals.scm
rename to runtime/queries/gitattributes/locals.scm
diff --git a/queries/gitcommit/highlights.scm b/runtime/queries/gitcommit/highlights.scm
similarity index 100%
rename from queries/gitcommit/highlights.scm
rename to runtime/queries/gitcommit/highlights.scm
diff --git a/queries/gitcommit/injections.scm b/runtime/queries/gitcommit/injections.scm
similarity index 100%
rename from queries/gitcommit/injections.scm
rename to runtime/queries/gitcommit/injections.scm
diff --git a/queries/gitignore/highlights.scm b/runtime/queries/gitignore/highlights.scm
similarity index 100%
rename from queries/gitignore/highlights.scm
rename to runtime/queries/gitignore/highlights.scm
diff --git a/queries/gap/injections.scm b/runtime/queries/gitignore/injections.scm
similarity index 100%
rename from queries/gap/injections.scm
rename to runtime/queries/gitignore/injections.scm
diff --git a/queries/gleam/folds.scm b/runtime/queries/gleam/folds.scm
similarity index 100%
rename from queries/gleam/folds.scm
rename to runtime/queries/gleam/folds.scm
diff --git a/queries/gleam/highlights.scm b/runtime/queries/gleam/highlights.scm
similarity index 100%
rename from queries/gleam/highlights.scm
rename to runtime/queries/gleam/highlights.scm
diff --git a/queries/gleam/indents.scm b/runtime/queries/gleam/indents.scm
similarity index 100%
rename from queries/gleam/indents.scm
rename to runtime/queries/gleam/indents.scm
diff --git a/queries/gleam/injections.scm b/runtime/queries/gleam/injections.scm
similarity index 100%
rename from queries/gleam/injections.scm
rename to runtime/queries/gleam/injections.scm
diff --git a/queries/gleam/locals.scm b/runtime/queries/gleam/locals.scm
similarity index 100%
rename from queries/gleam/locals.scm
rename to runtime/queries/gleam/locals.scm
diff --git a/queries/glimmer/folds.scm b/runtime/queries/glimmer/folds.scm
similarity index 100%
rename from queries/glimmer/folds.scm
rename to runtime/queries/glimmer/folds.scm
diff --git a/queries/glimmer/highlights.scm b/runtime/queries/glimmer/highlights.scm
similarity index 100%
rename from queries/glimmer/highlights.scm
rename to runtime/queries/glimmer/highlights.scm
diff --git a/queries/glimmer/indents.scm b/runtime/queries/glimmer/indents.scm
similarity index 100%
rename from queries/glimmer/indents.scm
rename to runtime/queries/glimmer/indents.scm
diff --git a/queries/glimmer/injections.scm b/runtime/queries/glimmer/injections.scm
similarity index 100%
rename from queries/glimmer/injections.scm
rename to runtime/queries/glimmer/injections.scm
diff --git a/queries/glimmer/locals.scm b/runtime/queries/glimmer/locals.scm
similarity index 100%
rename from queries/glimmer/locals.scm
rename to runtime/queries/glimmer/locals.scm
diff --git a/queries/glimmer_javascript/highlights.scm b/runtime/queries/glimmer_javascript/highlights.scm
similarity index 100%
rename from queries/glimmer_javascript/highlights.scm
rename to runtime/queries/glimmer_javascript/highlights.scm
diff --git a/queries/glimmer_javascript/indents.scm b/runtime/queries/glimmer_javascript/indents.scm
similarity index 100%
rename from queries/glimmer_javascript/indents.scm
rename to runtime/queries/glimmer_javascript/indents.scm
diff --git a/queries/glimmer_javascript/injections.scm b/runtime/queries/glimmer_javascript/injections.scm
similarity index 100%
rename from queries/glimmer_javascript/injections.scm
rename to runtime/queries/glimmer_javascript/injections.scm
diff --git a/queries/glimmer_javascript/locals.scm b/runtime/queries/glimmer_javascript/locals.scm
similarity index 100%
rename from queries/glimmer_javascript/locals.scm
rename to runtime/queries/glimmer_javascript/locals.scm
diff --git a/queries/glimmer_typescript/highlights.scm b/runtime/queries/glimmer_typescript/highlights.scm
similarity index 100%
rename from queries/glimmer_typescript/highlights.scm
rename to runtime/queries/glimmer_typescript/highlights.scm
diff --git a/queries/glimmer_typescript/indents.scm b/runtime/queries/glimmer_typescript/indents.scm
similarity index 100%
rename from queries/glimmer_typescript/indents.scm
rename to runtime/queries/glimmer_typescript/indents.scm
diff --git a/queries/glimmer_typescript/injections.scm b/runtime/queries/glimmer_typescript/injections.scm
similarity index 100%
rename from queries/glimmer_typescript/injections.scm
rename to runtime/queries/glimmer_typescript/injections.scm
diff --git a/queries/glsl/folds.scm b/runtime/queries/glsl/folds.scm
similarity index 100%
rename from queries/glsl/folds.scm
rename to runtime/queries/glsl/folds.scm
diff --git a/queries/glsl/highlights.scm b/runtime/queries/glsl/highlights.scm
similarity index 100%
rename from queries/glsl/highlights.scm
rename to runtime/queries/glsl/highlights.scm
diff --git a/queries/glsl/indents.scm b/runtime/queries/glsl/indents.scm
similarity index 100%
rename from queries/glsl/indents.scm
rename to runtime/queries/glsl/indents.scm
diff --git a/queries/glsl/injections.scm b/runtime/queries/glsl/injections.scm
similarity index 100%
rename from queries/glsl/injections.scm
rename to runtime/queries/glsl/injections.scm
diff --git a/queries/glsl/locals.scm b/runtime/queries/glsl/locals.scm
similarity index 100%
rename from queries/glsl/locals.scm
rename to runtime/queries/glsl/locals.scm
diff --git a/queries/gn/folds.scm b/runtime/queries/gn/folds.scm
similarity index 100%
rename from queries/gn/folds.scm
rename to runtime/queries/gn/folds.scm
diff --git a/queries/gn/highlights.scm b/runtime/queries/gn/highlights.scm
similarity index 100%
rename from queries/gn/highlights.scm
rename to runtime/queries/gn/highlights.scm
diff --git a/queries/gn/indents.scm b/runtime/queries/gn/indents.scm
similarity index 100%
rename from queries/gn/indents.scm
rename to runtime/queries/gn/indents.scm
diff --git a/queries/gdscript/injections.scm b/runtime/queries/gn/injections.scm
similarity index 100%
rename from queries/gdscript/injections.scm
rename to runtime/queries/gn/injections.scm
diff --git a/queries/gn/locals.scm b/runtime/queries/gn/locals.scm
similarity index 100%
rename from queries/gn/locals.scm
rename to runtime/queries/gn/locals.scm
diff --git a/queries/gnuplot/highlights.scm b/runtime/queries/gnuplot/highlights.scm
similarity index 100%
rename from queries/gnuplot/highlights.scm
rename to runtime/queries/gnuplot/highlights.scm
diff --git a/queries/gdshader/injections.scm b/runtime/queries/gnuplot/injections.scm
similarity index 100%
rename from queries/gdshader/injections.scm
rename to runtime/queries/gnuplot/injections.scm
diff --git a/queries/go/folds.scm b/runtime/queries/go/folds.scm
similarity index 100%
rename from queries/go/folds.scm
rename to runtime/queries/go/folds.scm
diff --git a/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
similarity index 100%
rename from queries/go/highlights.scm
rename to runtime/queries/go/highlights.scm
diff --git a/queries/go/indents.scm b/runtime/queries/go/indents.scm
similarity index 100%
rename from queries/go/indents.scm
rename to runtime/queries/go/indents.scm
diff --git a/queries/go/injections.scm b/runtime/queries/go/injections.scm
similarity index 100%
rename from queries/go/injections.scm
rename to runtime/queries/go/injections.scm
diff --git a/queries/go/locals.scm b/runtime/queries/go/locals.scm
similarity index 100%
rename from queries/go/locals.scm
rename to runtime/queries/go/locals.scm
diff --git a/queries/goctl/folds.scm b/runtime/queries/goctl/folds.scm
similarity index 100%
rename from queries/goctl/folds.scm
rename to runtime/queries/goctl/folds.scm
diff --git a/queries/goctl/highlights.scm b/runtime/queries/goctl/highlights.scm
similarity index 100%
rename from queries/goctl/highlights.scm
rename to runtime/queries/goctl/highlights.scm
diff --git a/queries/goctl/indents.scm b/runtime/queries/goctl/indents.scm
similarity index 100%
rename from queries/goctl/indents.scm
rename to runtime/queries/goctl/indents.scm
diff --git a/queries/goctl/injections.scm b/runtime/queries/goctl/injections.scm
similarity index 100%
rename from queries/goctl/injections.scm
rename to runtime/queries/goctl/injections.scm
diff --git a/queries/godot_resource/folds.scm b/runtime/queries/godot_resource/folds.scm
similarity index 100%
rename from queries/godot_resource/folds.scm
rename to runtime/queries/godot_resource/folds.scm
diff --git a/queries/godot_resource/highlights.scm b/runtime/queries/godot_resource/highlights.scm
similarity index 100%
rename from queries/godot_resource/highlights.scm
rename to runtime/queries/godot_resource/highlights.scm
diff --git a/queries/gitattributes/injections.scm b/runtime/queries/godot_resource/injections.scm
similarity index 100%
rename from queries/gitattributes/injections.scm
rename to runtime/queries/godot_resource/injections.scm
diff --git a/queries/godot_resource/locals.scm b/runtime/queries/godot_resource/locals.scm
similarity index 100%
rename from queries/godot_resource/locals.scm
rename to runtime/queries/godot_resource/locals.scm
diff --git a/queries/gomod/highlights.scm b/runtime/queries/gomod/highlights.scm
similarity index 100%
rename from queries/gomod/highlights.scm
rename to runtime/queries/gomod/highlights.scm
diff --git a/queries/gitignore/injections.scm b/runtime/queries/gomod/injections.scm
similarity index 100%
rename from queries/gitignore/injections.scm
rename to runtime/queries/gomod/injections.scm
diff --git a/queries/gosum/highlights.scm b/runtime/queries/gosum/highlights.scm
similarity index 100%
rename from queries/gosum/highlights.scm
rename to runtime/queries/gosum/highlights.scm
diff --git a/queries/gotmpl/folds.scm b/runtime/queries/gotmpl/folds.scm
similarity index 100%
rename from queries/gotmpl/folds.scm
rename to runtime/queries/gotmpl/folds.scm
diff --git a/queries/gotmpl/highlights.scm b/runtime/queries/gotmpl/highlights.scm
similarity index 100%
rename from queries/gotmpl/highlights.scm
rename to runtime/queries/gotmpl/highlights.scm
diff --git a/queries/gotmpl/injections.scm b/runtime/queries/gotmpl/injections.scm
similarity index 100%
rename from queries/gotmpl/injections.scm
rename to runtime/queries/gotmpl/injections.scm
diff --git a/queries/gotmpl/locals.scm b/runtime/queries/gotmpl/locals.scm
similarity index 100%
rename from queries/gotmpl/locals.scm
rename to runtime/queries/gotmpl/locals.scm
diff --git a/queries/gowork/highlights.scm b/runtime/queries/gowork/highlights.scm
similarity index 100%
rename from queries/gowork/highlights.scm
rename to runtime/queries/gowork/highlights.scm
diff --git a/queries/gn/injections.scm b/runtime/queries/gowork/injections.scm
similarity index 100%
rename from queries/gn/injections.scm
rename to runtime/queries/gowork/injections.scm
diff --git a/queries/gpg/highlights.scm b/runtime/queries/gpg/highlights.scm
similarity index 100%
rename from queries/gpg/highlights.scm
rename to runtime/queries/gpg/highlights.scm
diff --git a/queries/gnuplot/injections.scm b/runtime/queries/gpg/injections.scm
similarity index 100%
rename from queries/gnuplot/injections.scm
rename to runtime/queries/gpg/injections.scm
diff --git a/queries/graphql/highlights.scm b/runtime/queries/graphql/highlights.scm
similarity index 100%
rename from queries/graphql/highlights.scm
rename to runtime/queries/graphql/highlights.scm
diff --git a/queries/graphql/indents.scm b/runtime/queries/graphql/indents.scm
similarity index 100%
rename from queries/graphql/indents.scm
rename to runtime/queries/graphql/indents.scm
diff --git a/queries/godot_resource/injections.scm b/runtime/queries/graphql/injections.scm
similarity index 100%
rename from queries/godot_resource/injections.scm
rename to runtime/queries/graphql/injections.scm
diff --git a/queries/gren/highlights.scm b/runtime/queries/gren/highlights.scm
similarity index 100%
rename from queries/gren/highlights.scm
rename to runtime/queries/gren/highlights.scm
diff --git a/queries/gren/injections.scm b/runtime/queries/gren/injections.scm
similarity index 100%
rename from queries/gren/injections.scm
rename to runtime/queries/gren/injections.scm
diff --git a/queries/groovy/folds.scm b/runtime/queries/groovy/folds.scm
similarity index 100%
rename from queries/groovy/folds.scm
rename to runtime/queries/groovy/folds.scm
diff --git a/queries/groovy/highlights.scm b/runtime/queries/groovy/highlights.scm
similarity index 100%
rename from queries/groovy/highlights.scm
rename to runtime/queries/groovy/highlights.scm
diff --git a/queries/groovy/indents.scm b/runtime/queries/groovy/indents.scm
similarity index 100%
rename from queries/groovy/indents.scm
rename to runtime/queries/groovy/indents.scm
diff --git a/queries/groovy/injections.scm b/runtime/queries/groovy/injections.scm
similarity index 100%
rename from queries/groovy/injections.scm
rename to runtime/queries/groovy/injections.scm
diff --git a/queries/groovy/locals.scm b/runtime/queries/groovy/locals.scm
similarity index 100%
rename from queries/groovy/locals.scm
rename to runtime/queries/groovy/locals.scm
diff --git a/queries/gstlaunch/highlights.scm b/runtime/queries/gstlaunch/highlights.scm
similarity index 100%
rename from queries/gstlaunch/highlights.scm
rename to runtime/queries/gstlaunch/highlights.scm
diff --git a/queries/hack/highlights.scm b/runtime/queries/hack/highlights.scm
similarity index 100%
rename from queries/hack/highlights.scm
rename to runtime/queries/hack/highlights.scm
diff --git a/queries/hack/injections.scm b/runtime/queries/hack/injections.scm
similarity index 100%
rename from queries/hack/injections.scm
rename to runtime/queries/hack/injections.scm
diff --git a/queries/hare/folds.scm b/runtime/queries/hare/folds.scm
similarity index 100%
rename from queries/hare/folds.scm
rename to runtime/queries/hare/folds.scm
diff --git a/queries/hare/highlights.scm b/runtime/queries/hare/highlights.scm
similarity index 100%
rename from queries/hare/highlights.scm
rename to runtime/queries/hare/highlights.scm
diff --git a/queries/hare/indents.scm b/runtime/queries/hare/indents.scm
similarity index 100%
rename from queries/hare/indents.scm
rename to runtime/queries/hare/indents.scm
diff --git a/queries/hare/injections.scm b/runtime/queries/hare/injections.scm
similarity index 100%
rename from queries/hare/injections.scm
rename to runtime/queries/hare/injections.scm
diff --git a/queries/hare/locals.scm b/runtime/queries/hare/locals.scm
similarity index 100%
rename from queries/hare/locals.scm
rename to runtime/queries/hare/locals.scm
diff --git a/queries/haskell/folds.scm b/runtime/queries/haskell/folds.scm
similarity index 100%
rename from queries/haskell/folds.scm
rename to runtime/queries/haskell/folds.scm
diff --git a/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
similarity index 100%
rename from queries/haskell/highlights.scm
rename to runtime/queries/haskell/highlights.scm
diff --git a/queries/haskell/injections.scm b/runtime/queries/haskell/injections.scm
similarity index 100%
rename from queries/haskell/injections.scm
rename to runtime/queries/haskell/injections.scm
diff --git a/queries/haskell/locals.scm b/runtime/queries/haskell/locals.scm
similarity index 100%
rename from queries/haskell/locals.scm
rename to runtime/queries/haskell/locals.scm
diff --git a/queries/haskell_persistent/folds.scm b/runtime/queries/haskell_persistent/folds.scm
similarity index 100%
rename from queries/haskell_persistent/folds.scm
rename to runtime/queries/haskell_persistent/folds.scm
diff --git a/queries/haskell_persistent/highlights.scm b/runtime/queries/haskell_persistent/highlights.scm
similarity index 100%
rename from queries/haskell_persistent/highlights.scm
rename to runtime/queries/haskell_persistent/highlights.scm
diff --git a/queries/hcl/folds.scm b/runtime/queries/hcl/folds.scm
similarity index 100%
rename from queries/hcl/folds.scm
rename to runtime/queries/hcl/folds.scm
diff --git a/queries/hcl/highlights.scm b/runtime/queries/hcl/highlights.scm
similarity index 100%
rename from queries/hcl/highlights.scm
rename to runtime/queries/hcl/highlights.scm
diff --git a/queries/hcl/indents.scm b/runtime/queries/hcl/indents.scm
similarity index 100%
rename from queries/hcl/indents.scm
rename to runtime/queries/hcl/indents.scm
diff --git a/queries/hcl/injections.scm b/runtime/queries/hcl/injections.scm
similarity index 100%
rename from queries/hcl/injections.scm
rename to runtime/queries/hcl/injections.scm
diff --git a/queries/heex/folds.scm b/runtime/queries/heex/folds.scm
similarity index 100%
rename from queries/heex/folds.scm
rename to runtime/queries/heex/folds.scm
diff --git a/queries/heex/highlights.scm b/runtime/queries/heex/highlights.scm
similarity index 100%
rename from queries/heex/highlights.scm
rename to runtime/queries/heex/highlights.scm
diff --git a/queries/heex/indents.scm b/runtime/queries/heex/indents.scm
similarity index 100%
rename from queries/heex/indents.scm
rename to runtime/queries/heex/indents.scm
diff --git a/queries/heex/injections.scm b/runtime/queries/heex/injections.scm
similarity index 100%
rename from queries/heex/injections.scm
rename to runtime/queries/heex/injections.scm
diff --git a/queries/heex/locals.scm b/runtime/queries/heex/locals.scm
similarity index 100%
rename from queries/heex/locals.scm
rename to runtime/queries/heex/locals.scm
diff --git a/queries/helm/folds.scm b/runtime/queries/helm/folds.scm
similarity index 100%
rename from queries/helm/folds.scm
rename to runtime/queries/helm/folds.scm
diff --git a/queries/helm/highlights.scm b/runtime/queries/helm/highlights.scm
similarity index 100%
rename from queries/helm/highlights.scm
rename to runtime/queries/helm/highlights.scm
diff --git a/queries/helm/injections.scm b/runtime/queries/helm/injections.scm
similarity index 100%
rename from queries/helm/injections.scm
rename to runtime/queries/helm/injections.scm
diff --git a/queries/helm/locals.scm b/runtime/queries/helm/locals.scm
similarity index 100%
rename from queries/helm/locals.scm
rename to runtime/queries/helm/locals.scm
diff --git a/queries/hjson/folds.scm b/runtime/queries/hjson/folds.scm
similarity index 100%
rename from queries/hjson/folds.scm
rename to runtime/queries/hjson/folds.scm
diff --git a/queries/hjson/highlights.scm b/runtime/queries/hjson/highlights.scm
similarity index 100%
rename from queries/hjson/highlights.scm
rename to runtime/queries/hjson/highlights.scm
diff --git a/queries/hjson/indents.scm b/runtime/queries/hjson/indents.scm
similarity index 100%
rename from queries/hjson/indents.scm
rename to runtime/queries/hjson/indents.scm
diff --git a/queries/gomod/injections.scm b/runtime/queries/hjson/injections.scm
similarity index 100%
rename from queries/gomod/injections.scm
rename to runtime/queries/hjson/injections.scm
diff --git a/queries/hjson/locals.scm b/runtime/queries/hjson/locals.scm
similarity index 100%
rename from queries/hjson/locals.scm
rename to runtime/queries/hjson/locals.scm
diff --git a/queries/hlsl/folds.scm b/runtime/queries/hlsl/folds.scm
similarity index 100%
rename from queries/hlsl/folds.scm
rename to runtime/queries/hlsl/folds.scm
diff --git a/queries/hlsl/highlights.scm b/runtime/queries/hlsl/highlights.scm
similarity index 100%
rename from queries/hlsl/highlights.scm
rename to runtime/queries/hlsl/highlights.scm
diff --git a/queries/hlsl/indents.scm b/runtime/queries/hlsl/indents.scm
similarity index 100%
rename from queries/hlsl/indents.scm
rename to runtime/queries/hlsl/indents.scm
diff --git a/queries/hlsl/injections.scm b/runtime/queries/hlsl/injections.scm
similarity index 100%
rename from queries/hlsl/injections.scm
rename to runtime/queries/hlsl/injections.scm
diff --git a/queries/hlsl/locals.scm b/runtime/queries/hlsl/locals.scm
similarity index 100%
rename from queries/hlsl/locals.scm
rename to runtime/queries/hlsl/locals.scm
diff --git a/queries/hlsplaylist/highlights.scm b/runtime/queries/hlsplaylist/highlights.scm
similarity index 100%
rename from queries/hlsplaylist/highlights.scm
rename to runtime/queries/hlsplaylist/highlights.scm
diff --git a/queries/gowork/injections.scm b/runtime/queries/hlsplaylist/injections.scm
similarity index 100%
rename from queries/gowork/injections.scm
rename to runtime/queries/hlsplaylist/injections.scm
diff --git a/queries/hocon/folds.scm b/runtime/queries/hocon/folds.scm
similarity index 100%
rename from queries/hocon/folds.scm
rename to runtime/queries/hocon/folds.scm
diff --git a/queries/hocon/highlights.scm b/runtime/queries/hocon/highlights.scm
similarity index 100%
rename from queries/hocon/highlights.scm
rename to runtime/queries/hocon/highlights.scm
diff --git a/queries/gpg/injections.scm b/runtime/queries/hocon/injections.scm
similarity index 100%
rename from queries/gpg/injections.scm
rename to runtime/queries/hocon/injections.scm
diff --git a/queries/hoon/folds.scm b/runtime/queries/hoon/folds.scm
similarity index 100%
rename from queries/hoon/folds.scm
rename to runtime/queries/hoon/folds.scm
diff --git a/queries/hoon/highlights.scm b/runtime/queries/hoon/highlights.scm
similarity index 100%
rename from queries/hoon/highlights.scm
rename to runtime/queries/hoon/highlights.scm
diff --git a/queries/hoon/injections.scm b/runtime/queries/hoon/injections.scm
similarity index 100%
rename from queries/hoon/injections.scm
rename to runtime/queries/hoon/injections.scm
diff --git a/queries/hoon/locals.scm b/runtime/queries/hoon/locals.scm
similarity index 100%
rename from queries/hoon/locals.scm
rename to runtime/queries/hoon/locals.scm
diff --git a/queries/html/folds.scm b/runtime/queries/html/folds.scm
similarity index 100%
rename from queries/html/folds.scm
rename to runtime/queries/html/folds.scm
diff --git a/queries/html/highlights.scm b/runtime/queries/html/highlights.scm
similarity index 100%
rename from queries/html/highlights.scm
rename to runtime/queries/html/highlights.scm
diff --git a/queries/html/indents.scm b/runtime/queries/html/indents.scm
similarity index 100%
rename from queries/html/indents.scm
rename to runtime/queries/html/indents.scm
diff --git a/queries/html/injections.scm b/runtime/queries/html/injections.scm
similarity index 100%
rename from queries/html/injections.scm
rename to runtime/queries/html/injections.scm
diff --git a/queries/html/locals.scm b/runtime/queries/html/locals.scm
similarity index 100%
rename from queries/html/locals.scm
rename to runtime/queries/html/locals.scm
diff --git a/queries/html_tags/highlights.scm b/runtime/queries/html_tags/highlights.scm
similarity index 100%
rename from queries/html_tags/highlights.scm
rename to runtime/queries/html_tags/highlights.scm
diff --git a/queries/html_tags/indents.scm b/runtime/queries/html_tags/indents.scm
similarity index 100%
rename from queries/html_tags/indents.scm
rename to runtime/queries/html_tags/indents.scm
diff --git a/queries/html_tags/injections.scm b/runtime/queries/html_tags/injections.scm
similarity index 100%
rename from queries/html_tags/injections.scm
rename to runtime/queries/html_tags/injections.scm
diff --git a/queries/htmldjango/folds.scm b/runtime/queries/htmldjango/folds.scm
similarity index 100%
rename from queries/htmldjango/folds.scm
rename to runtime/queries/htmldjango/folds.scm
diff --git a/queries/htmldjango/highlights.scm b/runtime/queries/htmldjango/highlights.scm
similarity index 100%
rename from queries/htmldjango/highlights.scm
rename to runtime/queries/htmldjango/highlights.scm
diff --git a/queries/htmldjango/indents.scm b/runtime/queries/htmldjango/indents.scm
similarity index 100%
rename from queries/htmldjango/indents.scm
rename to runtime/queries/htmldjango/indents.scm
diff --git a/queries/htmldjango/injections.scm b/runtime/queries/htmldjango/injections.scm
similarity index 100%
rename from queries/htmldjango/injections.scm
rename to runtime/queries/htmldjango/injections.scm
diff --git a/queries/http/folds.scm b/runtime/queries/http/folds.scm
similarity index 100%
rename from queries/http/folds.scm
rename to runtime/queries/http/folds.scm
diff --git a/queries/http/highlights.scm b/runtime/queries/http/highlights.scm
similarity index 100%
rename from queries/http/highlights.scm
rename to runtime/queries/http/highlights.scm
diff --git a/queries/http/injections.scm b/runtime/queries/http/injections.scm
similarity index 100%
rename from queries/http/injections.scm
rename to runtime/queries/http/injections.scm
diff --git a/queries/hurl/folds.scm b/runtime/queries/hurl/folds.scm
similarity index 100%
rename from queries/hurl/folds.scm
rename to runtime/queries/hurl/folds.scm
diff --git a/queries/hurl/highlights.scm b/runtime/queries/hurl/highlights.scm
similarity index 100%
rename from queries/hurl/highlights.scm
rename to runtime/queries/hurl/highlights.scm
diff --git a/queries/hurl/indents.scm b/runtime/queries/hurl/indents.scm
similarity index 100%
rename from queries/hurl/indents.scm
rename to runtime/queries/hurl/indents.scm
diff --git a/queries/hurl/injections.scm b/runtime/queries/hurl/injections.scm
similarity index 100%
rename from queries/hurl/injections.scm
rename to runtime/queries/hurl/injections.scm
diff --git a/queries/hyprlang/folds.scm b/runtime/queries/hyprlang/folds.scm
similarity index 100%
rename from queries/hyprlang/folds.scm
rename to runtime/queries/hyprlang/folds.scm
diff --git a/queries/hyprlang/highlights.scm b/runtime/queries/hyprlang/highlights.scm
similarity index 100%
rename from queries/hyprlang/highlights.scm
rename to runtime/queries/hyprlang/highlights.scm
diff --git a/queries/hyprlang/indents.scm b/runtime/queries/hyprlang/indents.scm
similarity index 100%
rename from queries/hyprlang/indents.scm
rename to runtime/queries/hyprlang/indents.scm
diff --git a/queries/hyprlang/injections.scm b/runtime/queries/hyprlang/injections.scm
similarity index 100%
rename from queries/hyprlang/injections.scm
rename to runtime/queries/hyprlang/injections.scm
diff --git a/queries/idl/highlights.scm b/runtime/queries/idl/highlights.scm
similarity index 100%
rename from queries/idl/highlights.scm
rename to runtime/queries/idl/highlights.scm
diff --git a/queries/idl/indents.scm b/runtime/queries/idl/indents.scm
similarity index 100%
rename from queries/idl/indents.scm
rename to runtime/queries/idl/indents.scm
diff --git a/queries/idl/injections.scm b/runtime/queries/idl/injections.scm
similarity index 100%
rename from queries/idl/injections.scm
rename to runtime/queries/idl/injections.scm
diff --git a/queries/idris/folds.scm b/runtime/queries/idris/folds.scm
similarity index 100%
rename from queries/idris/folds.scm
rename to runtime/queries/idris/folds.scm
diff --git a/queries/idris/highlights.scm b/runtime/queries/idris/highlights.scm
similarity index 100%
rename from queries/idris/highlights.scm
rename to runtime/queries/idris/highlights.scm
diff --git a/queries/graphql/injections.scm b/runtime/queries/idris/injections.scm
similarity index 100%
rename from queries/graphql/injections.scm
rename to runtime/queries/idris/injections.scm
diff --git a/queries/idris/locals.scm b/runtime/queries/idris/locals.scm
similarity index 100%
rename from queries/idris/locals.scm
rename to runtime/queries/idris/locals.scm
diff --git a/queries/ini/folds.scm b/runtime/queries/ini/folds.scm
similarity index 100%
rename from queries/ini/folds.scm
rename to runtime/queries/ini/folds.scm
diff --git a/queries/ini/highlights.scm b/runtime/queries/ini/highlights.scm
similarity index 100%
rename from queries/ini/highlights.scm
rename to runtime/queries/ini/highlights.scm
diff --git a/queries/ini/injections.scm b/runtime/queries/ini/injections.scm
similarity index 100%
rename from queries/ini/injections.scm
rename to runtime/queries/ini/injections.scm
diff --git a/queries/inko/folds.scm b/runtime/queries/inko/folds.scm
similarity index 100%
rename from queries/inko/folds.scm
rename to runtime/queries/inko/folds.scm
diff --git a/queries/inko/highlights.scm b/runtime/queries/inko/highlights.scm
similarity index 100%
rename from queries/inko/highlights.scm
rename to runtime/queries/inko/highlights.scm
diff --git a/queries/inko/indents.scm b/runtime/queries/inko/indents.scm
similarity index 100%
rename from queries/inko/indents.scm
rename to runtime/queries/inko/indents.scm
diff --git a/queries/inko/injections.scm b/runtime/queries/inko/injections.scm
similarity index 100%
rename from queries/inko/injections.scm
rename to runtime/queries/inko/injections.scm
diff --git a/queries/inko/locals.scm b/runtime/queries/inko/locals.scm
similarity index 100%
rename from queries/inko/locals.scm
rename to runtime/queries/inko/locals.scm
diff --git a/queries/ipkg/folds.scm b/runtime/queries/ipkg/folds.scm
similarity index 100%
rename from queries/ipkg/folds.scm
rename to runtime/queries/ipkg/folds.scm
diff --git a/queries/ipkg/highlights.scm b/runtime/queries/ipkg/highlights.scm
similarity index 100%
rename from queries/ipkg/highlights.scm
rename to runtime/queries/ipkg/highlights.scm
diff --git a/queries/ipkg/indents.scm b/runtime/queries/ipkg/indents.scm
similarity index 100%
rename from queries/ipkg/indents.scm
rename to runtime/queries/ipkg/indents.scm
diff --git a/queries/ipkg/injections.scm b/runtime/queries/ipkg/injections.scm
similarity index 100%
rename from queries/ipkg/injections.scm
rename to runtime/queries/ipkg/injections.scm
diff --git a/queries/ipkg/locals.scm b/runtime/queries/ipkg/locals.scm
similarity index 100%
rename from queries/ipkg/locals.scm
rename to runtime/queries/ipkg/locals.scm
diff --git a/queries/ispc/folds.scm b/runtime/queries/ispc/folds.scm
similarity index 100%
rename from queries/ispc/folds.scm
rename to runtime/queries/ispc/folds.scm
diff --git a/queries/ispc/highlights.scm b/runtime/queries/ispc/highlights.scm
similarity index 100%
rename from queries/ispc/highlights.scm
rename to runtime/queries/ispc/highlights.scm
diff --git a/queries/ispc/indents.scm b/runtime/queries/ispc/indents.scm
similarity index 100%
rename from queries/ispc/indents.scm
rename to runtime/queries/ispc/indents.scm
diff --git a/queries/ispc/injections.scm b/runtime/queries/ispc/injections.scm
similarity index 100%
rename from queries/ispc/injections.scm
rename to runtime/queries/ispc/injections.scm
diff --git a/queries/ispc/locals.scm b/runtime/queries/ispc/locals.scm
similarity index 100%
rename from queries/ispc/locals.scm
rename to runtime/queries/ispc/locals.scm
diff --git a/queries/janet_simple/folds.scm b/runtime/queries/janet_simple/folds.scm
similarity index 100%
rename from queries/janet_simple/folds.scm
rename to runtime/queries/janet_simple/folds.scm
diff --git a/queries/janet_simple/highlights.scm b/runtime/queries/janet_simple/highlights.scm
similarity index 100%
rename from queries/janet_simple/highlights.scm
rename to runtime/queries/janet_simple/highlights.scm
diff --git a/queries/hjson/injections.scm b/runtime/queries/janet_simple/injections.scm
similarity index 100%
rename from queries/hjson/injections.scm
rename to runtime/queries/janet_simple/injections.scm
diff --git a/queries/janet_simple/locals.scm b/runtime/queries/janet_simple/locals.scm
similarity index 100%
rename from queries/janet_simple/locals.scm
rename to runtime/queries/janet_simple/locals.scm
diff --git a/queries/java/folds.scm b/runtime/queries/java/folds.scm
similarity index 100%
rename from queries/java/folds.scm
rename to runtime/queries/java/folds.scm
diff --git a/queries/java/highlights.scm b/runtime/queries/java/highlights.scm
similarity index 100%
rename from queries/java/highlights.scm
rename to runtime/queries/java/highlights.scm
diff --git a/queries/java/indents.scm b/runtime/queries/java/indents.scm
similarity index 100%
rename from queries/java/indents.scm
rename to runtime/queries/java/indents.scm
diff --git a/queries/java/injections.scm b/runtime/queries/java/injections.scm
similarity index 100%
rename from queries/java/injections.scm
rename to runtime/queries/java/injections.scm
diff --git a/queries/java/locals.scm b/runtime/queries/java/locals.scm
similarity index 100%
rename from queries/java/locals.scm
rename to runtime/queries/java/locals.scm
diff --git a/queries/javadoc/highlights.scm b/runtime/queries/javadoc/highlights.scm
similarity index 100%
rename from queries/javadoc/highlights.scm
rename to runtime/queries/javadoc/highlights.scm
diff --git a/queries/javadoc/indents.scm b/runtime/queries/javadoc/indents.scm
similarity index 100%
rename from queries/javadoc/indents.scm
rename to runtime/queries/javadoc/indents.scm
diff --git a/queries/javadoc/injections.scm b/runtime/queries/javadoc/injections.scm
similarity index 100%
rename from queries/javadoc/injections.scm
rename to runtime/queries/javadoc/injections.scm
diff --git a/queries/javascript/folds.scm b/runtime/queries/javascript/folds.scm
similarity index 100%
rename from queries/javascript/folds.scm
rename to runtime/queries/javascript/folds.scm
diff --git a/queries/javascript/highlights.scm b/runtime/queries/javascript/highlights.scm
similarity index 100%
rename from queries/javascript/highlights.scm
rename to runtime/queries/javascript/highlights.scm
diff --git a/queries/javascript/indents.scm b/runtime/queries/javascript/indents.scm
similarity index 100%
rename from queries/javascript/indents.scm
rename to runtime/queries/javascript/indents.scm
diff --git a/queries/javascript/injections.scm b/runtime/queries/javascript/injections.scm
similarity index 100%
rename from queries/javascript/injections.scm
rename to runtime/queries/javascript/injections.scm
diff --git a/queries/javascript/locals.scm b/runtime/queries/javascript/locals.scm
similarity index 100%
rename from queries/javascript/locals.scm
rename to runtime/queries/javascript/locals.scm
diff --git a/queries/jinja/highlights.scm b/runtime/queries/jinja/highlights.scm
similarity index 100%
rename from queries/jinja/highlights.scm
rename to runtime/queries/jinja/highlights.scm
diff --git a/queries/jinja/injections.scm b/runtime/queries/jinja/injections.scm
similarity index 100%
rename from queries/jinja/injections.scm
rename to runtime/queries/jinja/injections.scm
diff --git a/queries/jinja_inline/highlights.scm b/runtime/queries/jinja_inline/highlights.scm
similarity index 100%
rename from queries/jinja_inline/highlights.scm
rename to runtime/queries/jinja_inline/highlights.scm
diff --git a/queries/hlsplaylist/injections.scm b/runtime/queries/jinja_inline/injections.scm
similarity index 100%
rename from queries/hlsplaylist/injections.scm
rename to runtime/queries/jinja_inline/injections.scm
diff --git a/queries/jq/highlights.scm b/runtime/queries/jq/highlights.scm
similarity index 100%
rename from queries/jq/highlights.scm
rename to runtime/queries/jq/highlights.scm
diff --git a/queries/jq/injections.scm b/runtime/queries/jq/injections.scm
similarity index 100%
rename from queries/jq/injections.scm
rename to runtime/queries/jq/injections.scm
diff --git a/queries/jq/locals.scm b/runtime/queries/jq/locals.scm
similarity index 100%
rename from queries/jq/locals.scm
rename to runtime/queries/jq/locals.scm
diff --git a/queries/jsdoc/highlights.scm b/runtime/queries/jsdoc/highlights.scm
similarity index 100%
rename from queries/jsdoc/highlights.scm
rename to runtime/queries/jsdoc/highlights.scm
diff --git a/queries/json/folds.scm b/runtime/queries/json/folds.scm
similarity index 100%
rename from queries/json/folds.scm
rename to runtime/queries/json/folds.scm
diff --git a/queries/json/highlights.scm b/runtime/queries/json/highlights.scm
similarity index 100%
rename from queries/json/highlights.scm
rename to runtime/queries/json/highlights.scm
diff --git a/queries/json/indents.scm b/runtime/queries/json/indents.scm
similarity index 100%
rename from queries/json/indents.scm
rename to runtime/queries/json/indents.scm
diff --git a/queries/json/locals.scm b/runtime/queries/json/locals.scm
similarity index 100%
rename from queries/json/locals.scm
rename to runtime/queries/json/locals.scm
diff --git a/queries/json5/highlights.scm b/runtime/queries/json5/highlights.scm
similarity index 100%
rename from queries/json5/highlights.scm
rename to runtime/queries/json5/highlights.scm
diff --git a/queries/hocon/injections.scm b/runtime/queries/json5/injections.scm
similarity index 100%
rename from queries/hocon/injections.scm
rename to runtime/queries/json5/injections.scm
diff --git a/queries/jsonc/folds.scm b/runtime/queries/jsonc/folds.scm
similarity index 100%
rename from queries/jsonc/folds.scm
rename to runtime/queries/jsonc/folds.scm
diff --git a/queries/jsonc/highlights.scm b/runtime/queries/jsonc/highlights.scm
similarity index 100%
rename from queries/jsonc/highlights.scm
rename to runtime/queries/jsonc/highlights.scm
diff --git a/queries/jsonc/indents.scm b/runtime/queries/jsonc/indents.scm
similarity index 100%
rename from queries/jsonc/indents.scm
rename to runtime/queries/jsonc/indents.scm
diff --git a/queries/idris/injections.scm b/runtime/queries/jsonc/injections.scm
similarity index 100%
rename from queries/idris/injections.scm
rename to runtime/queries/jsonc/injections.scm
diff --git a/queries/jsonc/locals.scm b/runtime/queries/jsonc/locals.scm
similarity index 100%
rename from queries/jsonc/locals.scm
rename to runtime/queries/jsonc/locals.scm
diff --git a/queries/jsonnet/folds.scm b/runtime/queries/jsonnet/folds.scm
similarity index 100%
rename from queries/jsonnet/folds.scm
rename to runtime/queries/jsonnet/folds.scm
diff --git a/queries/jsonnet/highlights.scm b/runtime/queries/jsonnet/highlights.scm
similarity index 100%
rename from queries/jsonnet/highlights.scm
rename to runtime/queries/jsonnet/highlights.scm
diff --git a/queries/janet_simple/injections.scm b/runtime/queries/jsonnet/injections.scm
similarity index 100%
rename from queries/janet_simple/injections.scm
rename to runtime/queries/jsonnet/injections.scm
diff --git a/queries/jsonnet/locals.scm b/runtime/queries/jsonnet/locals.scm
similarity index 100%
rename from queries/jsonnet/locals.scm
rename to runtime/queries/jsonnet/locals.scm
diff --git a/queries/jsx/folds.scm b/runtime/queries/jsx/folds.scm
similarity index 100%
rename from queries/jsx/folds.scm
rename to runtime/queries/jsx/folds.scm
diff --git a/queries/jsx/highlights.scm b/runtime/queries/jsx/highlights.scm
similarity index 100%
rename from queries/jsx/highlights.scm
rename to runtime/queries/jsx/highlights.scm
diff --git a/queries/jsx/indents.scm b/runtime/queries/jsx/indents.scm
similarity index 100%
rename from queries/jsx/indents.scm
rename to runtime/queries/jsx/indents.scm
diff --git a/queries/jsx/injections.scm b/runtime/queries/jsx/injections.scm
similarity index 100%
rename from queries/jsx/injections.scm
rename to runtime/queries/jsx/injections.scm
diff --git a/queries/julia/folds.scm b/runtime/queries/julia/folds.scm
similarity index 100%
rename from queries/julia/folds.scm
rename to runtime/queries/julia/folds.scm
diff --git a/queries/julia/highlights.scm b/runtime/queries/julia/highlights.scm
similarity index 100%
rename from queries/julia/highlights.scm
rename to runtime/queries/julia/highlights.scm
diff --git a/queries/julia/indents.scm b/runtime/queries/julia/indents.scm
similarity index 100%
rename from queries/julia/indents.scm
rename to runtime/queries/julia/indents.scm
diff --git a/queries/julia/injections.scm b/runtime/queries/julia/injections.scm
similarity index 100%
rename from queries/julia/injections.scm
rename to runtime/queries/julia/injections.scm
diff --git a/queries/julia/locals.scm b/runtime/queries/julia/locals.scm
similarity index 100%
rename from queries/julia/locals.scm
rename to runtime/queries/julia/locals.scm
diff --git a/queries/just/folds.scm b/runtime/queries/just/folds.scm
similarity index 100%
rename from queries/just/folds.scm
rename to runtime/queries/just/folds.scm
diff --git a/queries/just/highlights.scm b/runtime/queries/just/highlights.scm
similarity index 100%
rename from queries/just/highlights.scm
rename to runtime/queries/just/highlights.scm
diff --git a/queries/just/indents.scm b/runtime/queries/just/indents.scm
similarity index 100%
rename from queries/just/indents.scm
rename to runtime/queries/just/indents.scm
diff --git a/queries/just/injections.scm b/runtime/queries/just/injections.scm
similarity index 100%
rename from queries/just/injections.scm
rename to runtime/queries/just/injections.scm
diff --git a/queries/just/locals.scm b/runtime/queries/just/locals.scm
similarity index 100%
rename from queries/just/locals.scm
rename to runtime/queries/just/locals.scm
diff --git a/queries/kcl/folds.scm b/runtime/queries/kcl/folds.scm
similarity index 100%
rename from queries/kcl/folds.scm
rename to runtime/queries/kcl/folds.scm
diff --git a/queries/kcl/highlights.scm b/runtime/queries/kcl/highlights.scm
similarity index 100%
rename from queries/kcl/highlights.scm
rename to runtime/queries/kcl/highlights.scm
diff --git a/queries/kcl/injections.scm b/runtime/queries/kcl/injections.scm
similarity index 100%
rename from queries/kcl/injections.scm
rename to runtime/queries/kcl/injections.scm
diff --git a/queries/kconfig/folds.scm b/runtime/queries/kconfig/folds.scm
similarity index 100%
rename from queries/kconfig/folds.scm
rename to runtime/queries/kconfig/folds.scm
diff --git a/queries/kconfig/highlights.scm b/runtime/queries/kconfig/highlights.scm
similarity index 100%
rename from queries/kconfig/highlights.scm
rename to runtime/queries/kconfig/highlights.scm
diff --git a/queries/kconfig/indents.scm b/runtime/queries/kconfig/indents.scm
similarity index 100%
rename from queries/kconfig/indents.scm
rename to runtime/queries/kconfig/indents.scm
diff --git a/queries/jinja_inline/injections.scm b/runtime/queries/kconfig/injections.scm
similarity index 100%
rename from queries/jinja_inline/injections.scm
rename to runtime/queries/kconfig/injections.scm
diff --git a/queries/kconfig/locals.scm b/runtime/queries/kconfig/locals.scm
similarity index 100%
rename from queries/kconfig/locals.scm
rename to runtime/queries/kconfig/locals.scm
diff --git a/queries/kdl/folds.scm b/runtime/queries/kdl/folds.scm
similarity index 100%
rename from queries/kdl/folds.scm
rename to runtime/queries/kdl/folds.scm
diff --git a/queries/kdl/highlights.scm b/runtime/queries/kdl/highlights.scm
similarity index 100%
rename from queries/kdl/highlights.scm
rename to runtime/queries/kdl/highlights.scm
diff --git a/queries/kdl/indents.scm b/runtime/queries/kdl/indents.scm
similarity index 100%
rename from queries/kdl/indents.scm
rename to runtime/queries/kdl/indents.scm
diff --git a/queries/kdl/injections.scm b/runtime/queries/kdl/injections.scm
similarity index 100%
rename from queries/kdl/injections.scm
rename to runtime/queries/kdl/injections.scm
diff --git a/queries/kdl/locals.scm b/runtime/queries/kdl/locals.scm
similarity index 100%
rename from queries/kdl/locals.scm
rename to runtime/queries/kdl/locals.scm
diff --git a/queries/kotlin/folds.scm b/runtime/queries/kotlin/folds.scm
similarity index 100%
rename from queries/kotlin/folds.scm
rename to runtime/queries/kotlin/folds.scm
diff --git a/queries/kotlin/highlights.scm b/runtime/queries/kotlin/highlights.scm
similarity index 100%
rename from queries/kotlin/highlights.scm
rename to runtime/queries/kotlin/highlights.scm
diff --git a/queries/kotlin/injections.scm b/runtime/queries/kotlin/injections.scm
similarity index 100%
rename from queries/kotlin/injections.scm
rename to runtime/queries/kotlin/injections.scm
diff --git a/queries/kotlin/locals.scm b/runtime/queries/kotlin/locals.scm
similarity index 100%
rename from queries/kotlin/locals.scm
rename to runtime/queries/kotlin/locals.scm
diff --git a/queries/koto/folds.scm b/runtime/queries/koto/folds.scm
similarity index 100%
rename from queries/koto/folds.scm
rename to runtime/queries/koto/folds.scm
diff --git a/queries/koto/highlights.scm b/runtime/queries/koto/highlights.scm
similarity index 100%
rename from queries/koto/highlights.scm
rename to runtime/queries/koto/highlights.scm
diff --git a/queries/json5/injections.scm b/runtime/queries/koto/injections.scm
similarity index 100%
rename from queries/json5/injections.scm
rename to runtime/queries/koto/injections.scm
diff --git a/queries/koto/locals.scm b/runtime/queries/koto/locals.scm
similarity index 100%
rename from queries/koto/locals.scm
rename to runtime/queries/koto/locals.scm
diff --git a/queries/kusto/highlights.scm b/runtime/queries/kusto/highlights.scm
similarity index 100%
rename from queries/kusto/highlights.scm
rename to runtime/queries/kusto/highlights.scm
diff --git a/queries/jsonc/injections.scm b/runtime/queries/kusto/injections.scm
similarity index 100%
rename from queries/jsonc/injections.scm
rename to runtime/queries/kusto/injections.scm
diff --git a/queries/lalrpop/folds.scm b/runtime/queries/lalrpop/folds.scm
similarity index 100%
rename from queries/lalrpop/folds.scm
rename to runtime/queries/lalrpop/folds.scm
diff --git a/queries/lalrpop/highlights.scm b/runtime/queries/lalrpop/highlights.scm
similarity index 100%
rename from queries/lalrpop/highlights.scm
rename to runtime/queries/lalrpop/highlights.scm
diff --git a/queries/lalrpop/injections.scm b/runtime/queries/lalrpop/injections.scm
similarity index 100%
rename from queries/lalrpop/injections.scm
rename to runtime/queries/lalrpop/injections.scm
diff --git a/queries/lalrpop/locals.scm b/runtime/queries/lalrpop/locals.scm
similarity index 100%
rename from queries/lalrpop/locals.scm
rename to runtime/queries/lalrpop/locals.scm
diff --git a/queries/latex/folds.scm b/runtime/queries/latex/folds.scm
similarity index 100%
rename from queries/latex/folds.scm
rename to runtime/queries/latex/folds.scm
diff --git a/queries/latex/highlights.scm b/runtime/queries/latex/highlights.scm
similarity index 100%
rename from queries/latex/highlights.scm
rename to runtime/queries/latex/highlights.scm
diff --git a/queries/latex/injections.scm b/runtime/queries/latex/injections.scm
similarity index 100%
rename from queries/latex/injections.scm
rename to runtime/queries/latex/injections.scm
diff --git a/queries/ledger/folds.scm b/runtime/queries/ledger/folds.scm
similarity index 100%
rename from queries/ledger/folds.scm
rename to runtime/queries/ledger/folds.scm
diff --git a/queries/ledger/highlights.scm b/runtime/queries/ledger/highlights.scm
similarity index 100%
rename from queries/ledger/highlights.scm
rename to runtime/queries/ledger/highlights.scm
diff --git a/queries/ledger/indents.scm b/runtime/queries/ledger/indents.scm
similarity index 100%
rename from queries/ledger/indents.scm
rename to runtime/queries/ledger/indents.scm
diff --git a/queries/ledger/injections.scm b/runtime/queries/ledger/injections.scm
similarity index 100%
rename from queries/ledger/injections.scm
rename to runtime/queries/ledger/injections.scm
diff --git a/queries/leo/highlights.scm b/runtime/queries/leo/highlights.scm
similarity index 100%
rename from queries/leo/highlights.scm
rename to runtime/queries/leo/highlights.scm
diff --git a/queries/leo/indents.scm b/runtime/queries/leo/indents.scm
similarity index 100%
rename from queries/leo/indents.scm
rename to runtime/queries/leo/indents.scm
diff --git a/queries/jsonnet/injections.scm b/runtime/queries/leo/injections.scm
similarity index 100%
rename from queries/jsonnet/injections.scm
rename to runtime/queries/leo/injections.scm
diff --git a/queries/linkerscript/folds.scm b/runtime/queries/linkerscript/folds.scm
similarity index 100%
rename from queries/linkerscript/folds.scm
rename to runtime/queries/linkerscript/folds.scm
diff --git a/queries/linkerscript/highlights.scm b/runtime/queries/linkerscript/highlights.scm
similarity index 100%
rename from queries/linkerscript/highlights.scm
rename to runtime/queries/linkerscript/highlights.scm
diff --git a/queries/linkerscript/indents.scm b/runtime/queries/linkerscript/indents.scm
similarity index 100%
rename from queries/linkerscript/indents.scm
rename to runtime/queries/linkerscript/indents.scm
diff --git a/queries/linkerscript/injections.scm b/runtime/queries/linkerscript/injections.scm
similarity index 100%
rename from queries/linkerscript/injections.scm
rename to runtime/queries/linkerscript/injections.scm
diff --git a/queries/linkerscript/locals.scm b/runtime/queries/linkerscript/locals.scm
similarity index 100%
rename from queries/linkerscript/locals.scm
rename to runtime/queries/linkerscript/locals.scm
diff --git a/queries/liquid/highlights.scm b/runtime/queries/liquid/highlights.scm
similarity index 100%
rename from queries/liquid/highlights.scm
rename to runtime/queries/liquid/highlights.scm
diff --git a/queries/liquid/injections.scm b/runtime/queries/liquid/injections.scm
similarity index 100%
rename from queries/liquid/injections.scm
rename to runtime/queries/liquid/injections.scm
diff --git a/queries/liquidsoap/folds.scm b/runtime/queries/liquidsoap/folds.scm
similarity index 100%
rename from queries/liquidsoap/folds.scm
rename to runtime/queries/liquidsoap/folds.scm
diff --git a/queries/liquidsoap/highlights.scm b/runtime/queries/liquidsoap/highlights.scm
similarity index 100%
rename from queries/liquidsoap/highlights.scm
rename to runtime/queries/liquidsoap/highlights.scm
diff --git a/queries/liquidsoap/indents.scm b/runtime/queries/liquidsoap/indents.scm
similarity index 100%
rename from queries/liquidsoap/indents.scm
rename to runtime/queries/liquidsoap/indents.scm
diff --git a/queries/kconfig/injections.scm b/runtime/queries/liquidsoap/injections.scm
similarity index 100%
rename from queries/kconfig/injections.scm
rename to runtime/queries/liquidsoap/injections.scm
diff --git a/queries/liquidsoap/locals.scm b/runtime/queries/liquidsoap/locals.scm
similarity index 100%
rename from queries/liquidsoap/locals.scm
rename to runtime/queries/liquidsoap/locals.scm
diff --git a/queries/llvm/highlights.scm b/runtime/queries/llvm/highlights.scm
similarity index 100%
rename from queries/llvm/highlights.scm
rename to runtime/queries/llvm/highlights.scm
diff --git a/queries/koto/injections.scm b/runtime/queries/llvm/injections.scm
similarity index 100%
rename from queries/koto/injections.scm
rename to runtime/queries/llvm/injections.scm
diff --git a/queries/lua/folds.scm b/runtime/queries/lua/folds.scm
similarity index 100%
rename from queries/lua/folds.scm
rename to runtime/queries/lua/folds.scm
diff --git a/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
similarity index 100%
rename from queries/lua/highlights.scm
rename to runtime/queries/lua/highlights.scm
diff --git a/queries/lua/indents.scm b/runtime/queries/lua/indents.scm
similarity index 100%
rename from queries/lua/indents.scm
rename to runtime/queries/lua/indents.scm
diff --git a/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
similarity index 100%
rename from queries/lua/injections.scm
rename to runtime/queries/lua/injections.scm
diff --git a/queries/lua/locals.scm b/runtime/queries/lua/locals.scm
similarity index 100%
rename from queries/lua/locals.scm
rename to runtime/queries/lua/locals.scm
diff --git a/queries/luadoc/highlights.scm b/runtime/queries/luadoc/highlights.scm
similarity index 100%
rename from queries/luadoc/highlights.scm
rename to runtime/queries/luadoc/highlights.scm
diff --git a/queries/luap/highlights.scm b/runtime/queries/luap/highlights.scm
similarity index 100%
rename from queries/luap/highlights.scm
rename to runtime/queries/luap/highlights.scm
diff --git a/queries/luau/folds.scm b/runtime/queries/luau/folds.scm
similarity index 100%
rename from queries/luau/folds.scm
rename to runtime/queries/luau/folds.scm
diff --git a/queries/luau/highlights.scm b/runtime/queries/luau/highlights.scm
similarity index 100%
rename from queries/luau/highlights.scm
rename to runtime/queries/luau/highlights.scm
diff --git a/queries/luau/indents.scm b/runtime/queries/luau/indents.scm
similarity index 100%
rename from queries/luau/indents.scm
rename to runtime/queries/luau/indents.scm
diff --git a/queries/luau/injections.scm b/runtime/queries/luau/injections.scm
similarity index 100%
rename from queries/luau/injections.scm
rename to runtime/queries/luau/injections.scm
diff --git a/queries/luau/locals.scm b/runtime/queries/luau/locals.scm
similarity index 100%
rename from queries/luau/locals.scm
rename to runtime/queries/luau/locals.scm
diff --git a/queries/m68k/folds.scm b/runtime/queries/m68k/folds.scm
similarity index 100%
rename from queries/m68k/folds.scm
rename to runtime/queries/m68k/folds.scm
diff --git a/queries/m68k/highlights.scm b/runtime/queries/m68k/highlights.scm
similarity index 100%
rename from queries/m68k/highlights.scm
rename to runtime/queries/m68k/highlights.scm
diff --git a/queries/kusto/injections.scm b/runtime/queries/m68k/injections.scm
similarity index 100%
rename from queries/kusto/injections.scm
rename to runtime/queries/m68k/injections.scm
diff --git a/queries/m68k/locals.scm b/runtime/queries/m68k/locals.scm
similarity index 100%
rename from queries/m68k/locals.scm
rename to runtime/queries/m68k/locals.scm
diff --git a/queries/make/folds.scm b/runtime/queries/make/folds.scm
similarity index 100%
rename from queries/make/folds.scm
rename to runtime/queries/make/folds.scm
diff --git a/queries/make/highlights.scm b/runtime/queries/make/highlights.scm
similarity index 100%
rename from queries/make/highlights.scm
rename to runtime/queries/make/highlights.scm
diff --git a/queries/make/injections.scm b/runtime/queries/make/injections.scm
similarity index 100%
rename from queries/make/injections.scm
rename to runtime/queries/make/injections.scm
diff --git a/queries/markdown/folds.scm b/runtime/queries/markdown/folds.scm
similarity index 100%
rename from queries/markdown/folds.scm
rename to runtime/queries/markdown/folds.scm
diff --git a/queries/markdown/highlights.scm b/runtime/queries/markdown/highlights.scm
similarity index 100%
rename from queries/markdown/highlights.scm
rename to runtime/queries/markdown/highlights.scm
diff --git a/queries/markdown/indents.scm b/runtime/queries/markdown/indents.scm
similarity index 100%
rename from queries/markdown/indents.scm
rename to runtime/queries/markdown/indents.scm
diff --git a/queries/markdown/injections.scm b/runtime/queries/markdown/injections.scm
similarity index 100%
rename from queries/markdown/injections.scm
rename to runtime/queries/markdown/injections.scm
diff --git a/queries/markdown_inline/highlights.scm b/runtime/queries/markdown_inline/highlights.scm
similarity index 100%
rename from queries/markdown_inline/highlights.scm
rename to runtime/queries/markdown_inline/highlights.scm
diff --git a/queries/markdown_inline/injections.scm b/runtime/queries/markdown_inline/injections.scm
similarity index 100%
rename from queries/markdown_inline/injections.scm
rename to runtime/queries/markdown_inline/injections.scm
diff --git a/queries/matlab/folds.scm b/runtime/queries/matlab/folds.scm
similarity index 100%
rename from queries/matlab/folds.scm
rename to runtime/queries/matlab/folds.scm
diff --git a/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
similarity index 100%
rename from queries/matlab/highlights.scm
rename to runtime/queries/matlab/highlights.scm
diff --git a/queries/matlab/indents.scm b/runtime/queries/matlab/indents.scm
similarity index 100%
rename from queries/matlab/indents.scm
rename to runtime/queries/matlab/indents.scm
diff --git a/queries/leo/injections.scm b/runtime/queries/matlab/injections.scm
similarity index 100%
rename from queries/leo/injections.scm
rename to runtime/queries/matlab/injections.scm
diff --git a/queries/matlab/locals.scm b/runtime/queries/matlab/locals.scm
similarity index 100%
rename from queries/matlab/locals.scm
rename to runtime/queries/matlab/locals.scm
diff --git a/queries/menhir/highlights.scm b/runtime/queries/menhir/highlights.scm
similarity index 100%
rename from queries/menhir/highlights.scm
rename to runtime/queries/menhir/highlights.scm
diff --git a/queries/menhir/injections.scm b/runtime/queries/menhir/injections.scm
similarity index 100%
rename from queries/menhir/injections.scm
rename to runtime/queries/menhir/injections.scm
diff --git a/queries/mermaid/folds.scm b/runtime/queries/mermaid/folds.scm
similarity index 100%
rename from queries/mermaid/folds.scm
rename to runtime/queries/mermaid/folds.scm
diff --git a/queries/mermaid/highlights.scm b/runtime/queries/mermaid/highlights.scm
similarity index 100%
rename from queries/mermaid/highlights.scm
rename to runtime/queries/mermaid/highlights.scm
diff --git a/queries/mermaid/indents.scm b/runtime/queries/mermaid/indents.scm
similarity index 100%
rename from queries/mermaid/indents.scm
rename to runtime/queries/mermaid/indents.scm
diff --git a/queries/liquidsoap/injections.scm b/runtime/queries/mermaid/injections.scm
similarity index 100%
rename from queries/liquidsoap/injections.scm
rename to runtime/queries/mermaid/injections.scm
diff --git a/queries/meson/folds.scm b/runtime/queries/meson/folds.scm
similarity index 100%
rename from queries/meson/folds.scm
rename to runtime/queries/meson/folds.scm
diff --git a/queries/meson/highlights.scm b/runtime/queries/meson/highlights.scm
similarity index 100%
rename from queries/meson/highlights.scm
rename to runtime/queries/meson/highlights.scm
diff --git a/queries/meson/indents.scm b/runtime/queries/meson/indents.scm
similarity index 100%
rename from queries/meson/indents.scm
rename to runtime/queries/meson/indents.scm
diff --git a/queries/llvm/injections.scm b/runtime/queries/meson/injections.scm
similarity index 100%
rename from queries/llvm/injections.scm
rename to runtime/queries/meson/injections.scm
diff --git a/queries/mlir/highlights.scm b/runtime/queries/mlir/highlights.scm
similarity index 100%
rename from queries/mlir/highlights.scm
rename to runtime/queries/mlir/highlights.scm
diff --git a/queries/m68k/injections.scm b/runtime/queries/mlir/injections.scm
similarity index 100%
rename from queries/m68k/injections.scm
rename to runtime/queries/mlir/injections.scm
diff --git a/queries/mlir/locals.scm b/runtime/queries/mlir/locals.scm
similarity index 100%
rename from queries/mlir/locals.scm
rename to runtime/queries/mlir/locals.scm
diff --git a/queries/muttrc/highlights.scm b/runtime/queries/muttrc/highlights.scm
similarity index 100%
rename from queries/muttrc/highlights.scm
rename to runtime/queries/muttrc/highlights.scm
diff --git a/queries/muttrc/injections.scm b/runtime/queries/muttrc/injections.scm
similarity index 100%
rename from queries/muttrc/injections.scm
rename to runtime/queries/muttrc/injections.scm
diff --git a/queries/nasm/highlights.scm b/runtime/queries/nasm/highlights.scm
similarity index 100%
rename from queries/nasm/highlights.scm
rename to runtime/queries/nasm/highlights.scm
diff --git a/queries/matlab/injections.scm b/runtime/queries/nasm/injections.scm
similarity index 100%
rename from queries/matlab/injections.scm
rename to runtime/queries/nasm/injections.scm
diff --git a/queries/nginx/folds.scm b/runtime/queries/nginx/folds.scm
similarity index 100%
rename from queries/nginx/folds.scm
rename to runtime/queries/nginx/folds.scm
diff --git a/queries/nginx/highlights.scm b/runtime/queries/nginx/highlights.scm
similarity index 100%
rename from queries/nginx/highlights.scm
rename to runtime/queries/nginx/highlights.scm
diff --git a/queries/mermaid/injections.scm b/runtime/queries/nginx/injections.scm
similarity index 100%
rename from queries/mermaid/injections.scm
rename to runtime/queries/nginx/injections.scm
diff --git a/queries/nickel/highlights.scm b/runtime/queries/nickel/highlights.scm
similarity index 100%
rename from queries/nickel/highlights.scm
rename to runtime/queries/nickel/highlights.scm
diff --git a/queries/nickel/indents.scm b/runtime/queries/nickel/indents.scm
similarity index 100%
rename from queries/nickel/indents.scm
rename to runtime/queries/nickel/indents.scm
diff --git a/queries/meson/injections.scm b/runtime/queries/nickel/injections.scm
similarity index 100%
rename from queries/meson/injections.scm
rename to runtime/queries/nickel/injections.scm
diff --git a/queries/nim/folds.scm b/runtime/queries/nim/folds.scm
similarity index 100%
rename from queries/nim/folds.scm
rename to runtime/queries/nim/folds.scm
diff --git a/queries/nim/highlights.scm b/runtime/queries/nim/highlights.scm
similarity index 100%
rename from queries/nim/highlights.scm
rename to runtime/queries/nim/highlights.scm
diff --git a/queries/nim/injections.scm b/runtime/queries/nim/injections.scm
similarity index 100%
rename from queries/nim/injections.scm
rename to runtime/queries/nim/injections.scm
diff --git a/queries/nim/locals.scm b/runtime/queries/nim/locals.scm
similarity index 100%
rename from queries/nim/locals.scm
rename to runtime/queries/nim/locals.scm
diff --git a/queries/nim_format_string/highlights.scm b/runtime/queries/nim_format_string/highlights.scm
similarity index 100%
rename from queries/nim_format_string/highlights.scm
rename to runtime/queries/nim_format_string/highlights.scm
diff --git a/queries/nim_format_string/injections.scm b/runtime/queries/nim_format_string/injections.scm
similarity index 100%
rename from queries/nim_format_string/injections.scm
rename to runtime/queries/nim_format_string/injections.scm
diff --git a/queries/ninja/folds.scm b/runtime/queries/ninja/folds.scm
similarity index 100%
rename from queries/ninja/folds.scm
rename to runtime/queries/ninja/folds.scm
diff --git a/queries/ninja/highlights.scm b/runtime/queries/ninja/highlights.scm
similarity index 100%
rename from queries/ninja/highlights.scm
rename to runtime/queries/ninja/highlights.scm
diff --git a/queries/ninja/indents.scm b/runtime/queries/ninja/indents.scm
similarity index 100%
rename from queries/ninja/indents.scm
rename to runtime/queries/ninja/indents.scm
diff --git a/queries/mlir/injections.scm b/runtime/queries/ninja/injections.scm
similarity index 100%
rename from queries/mlir/injections.scm
rename to runtime/queries/ninja/injections.scm
diff --git a/queries/nix/folds.scm b/runtime/queries/nix/folds.scm
similarity index 100%
rename from queries/nix/folds.scm
rename to runtime/queries/nix/folds.scm
diff --git a/queries/nix/highlights.scm b/runtime/queries/nix/highlights.scm
similarity index 100%
rename from queries/nix/highlights.scm
rename to runtime/queries/nix/highlights.scm
diff --git a/queries/nix/indents.scm b/runtime/queries/nix/indents.scm
similarity index 100%
rename from queries/nix/indents.scm
rename to runtime/queries/nix/indents.scm
diff --git a/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
similarity index 100%
rename from queries/nix/injections.scm
rename to runtime/queries/nix/injections.scm
diff --git a/queries/nix/locals.scm b/runtime/queries/nix/locals.scm
similarity index 100%
rename from queries/nix/locals.scm
rename to runtime/queries/nix/locals.scm
diff --git a/queries/nqc/folds.scm b/runtime/queries/nqc/folds.scm
similarity index 100%
rename from queries/nqc/folds.scm
rename to runtime/queries/nqc/folds.scm
diff --git a/queries/nqc/highlights.scm b/runtime/queries/nqc/highlights.scm
similarity index 100%
rename from queries/nqc/highlights.scm
rename to runtime/queries/nqc/highlights.scm
diff --git a/queries/nqc/indents.scm b/runtime/queries/nqc/indents.scm
similarity index 100%
rename from queries/nqc/indents.scm
rename to runtime/queries/nqc/indents.scm
diff --git a/queries/nqc/injections.scm b/runtime/queries/nqc/injections.scm
similarity index 100%
rename from queries/nqc/injections.scm
rename to runtime/queries/nqc/injections.scm
diff --git a/queries/nqc/locals.scm b/runtime/queries/nqc/locals.scm
similarity index 100%
rename from queries/nqc/locals.scm
rename to runtime/queries/nqc/locals.scm
diff --git a/queries/nu/folds.scm b/runtime/queries/nu/folds.scm
similarity index 100%
rename from queries/nu/folds.scm
rename to runtime/queries/nu/folds.scm
diff --git a/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
similarity index 100%
rename from queries/nu/highlights.scm
rename to runtime/queries/nu/highlights.scm
diff --git a/queries/nu/indents.scm b/runtime/queries/nu/indents.scm
similarity index 100%
rename from queries/nu/indents.scm
rename to runtime/queries/nu/indents.scm
diff --git a/queries/nu/injections.scm b/runtime/queries/nu/injections.scm
similarity index 100%
rename from queries/nu/injections.scm
rename to runtime/queries/nu/injections.scm
diff --git a/queries/objc/folds.scm b/runtime/queries/objc/folds.scm
similarity index 100%
rename from queries/objc/folds.scm
rename to runtime/queries/objc/folds.scm
diff --git a/queries/objc/highlights.scm b/runtime/queries/objc/highlights.scm
similarity index 100%
rename from queries/objc/highlights.scm
rename to runtime/queries/objc/highlights.scm
diff --git a/queries/objc/indents.scm b/runtime/queries/objc/indents.scm
similarity index 100%
rename from queries/objc/indents.scm
rename to runtime/queries/objc/indents.scm
diff --git a/queries/objc/injections.scm b/runtime/queries/objc/injections.scm
similarity index 100%
rename from queries/objc/injections.scm
rename to runtime/queries/objc/injections.scm
diff --git a/queries/objc/locals.scm b/runtime/queries/objc/locals.scm
similarity index 100%
rename from queries/objc/locals.scm
rename to runtime/queries/objc/locals.scm
diff --git a/queries/objdump/highlights.scm b/runtime/queries/objdump/highlights.scm
similarity index 100%
rename from queries/objdump/highlights.scm
rename to runtime/queries/objdump/highlights.scm
diff --git a/queries/objdump/injections.scm b/runtime/queries/objdump/injections.scm
similarity index 100%
rename from queries/objdump/injections.scm
rename to runtime/queries/objdump/injections.scm
diff --git a/queries/ocaml/folds.scm b/runtime/queries/ocaml/folds.scm
similarity index 100%
rename from queries/ocaml/folds.scm
rename to runtime/queries/ocaml/folds.scm
diff --git a/queries/ocaml/highlights.scm b/runtime/queries/ocaml/highlights.scm
similarity index 100%
rename from queries/ocaml/highlights.scm
rename to runtime/queries/ocaml/highlights.scm
diff --git a/queries/ocaml/indents.scm b/runtime/queries/ocaml/indents.scm
similarity index 100%
rename from queries/ocaml/indents.scm
rename to runtime/queries/ocaml/indents.scm
diff --git a/queries/nasm/injections.scm b/runtime/queries/ocaml/injections.scm
similarity index 100%
rename from queries/nasm/injections.scm
rename to runtime/queries/ocaml/injections.scm
diff --git a/queries/ocaml/locals.scm b/runtime/queries/ocaml/locals.scm
similarity index 100%
rename from queries/ocaml/locals.scm
rename to runtime/queries/ocaml/locals.scm
diff --git a/queries/ocaml_interface/folds.scm b/runtime/queries/ocaml_interface/folds.scm
similarity index 100%
rename from queries/ocaml_interface/folds.scm
rename to runtime/queries/ocaml_interface/folds.scm
diff --git a/queries/ocaml_interface/highlights.scm b/runtime/queries/ocaml_interface/highlights.scm
similarity index 100%
rename from queries/ocaml_interface/highlights.scm
rename to runtime/queries/ocaml_interface/highlights.scm
diff --git a/queries/ocaml_interface/indents.scm b/runtime/queries/ocaml_interface/indents.scm
similarity index 100%
rename from queries/ocaml_interface/indents.scm
rename to runtime/queries/ocaml_interface/indents.scm
diff --git a/queries/ocaml_interface/injections.scm b/runtime/queries/ocaml_interface/injections.scm
similarity index 100%
rename from queries/ocaml_interface/injections.scm
rename to runtime/queries/ocaml_interface/injections.scm
diff --git a/queries/ocaml_interface/locals.scm b/runtime/queries/ocaml_interface/locals.scm
similarity index 100%
rename from queries/ocaml_interface/locals.scm
rename to runtime/queries/ocaml_interface/locals.scm
diff --git a/queries/ocamllex/highlights.scm b/runtime/queries/ocamllex/highlights.scm
similarity index 100%
rename from queries/ocamllex/highlights.scm
rename to runtime/queries/ocamllex/highlights.scm
diff --git a/queries/ocamllex/injections.scm b/runtime/queries/ocamllex/injections.scm
similarity index 100%
rename from queries/ocamllex/injections.scm
rename to runtime/queries/ocamllex/injections.scm
diff --git a/queries/odin/folds.scm b/runtime/queries/odin/folds.scm
similarity index 100%
rename from queries/odin/folds.scm
rename to runtime/queries/odin/folds.scm
diff --git a/queries/odin/highlights.scm b/runtime/queries/odin/highlights.scm
similarity index 100%
rename from queries/odin/highlights.scm
rename to runtime/queries/odin/highlights.scm
diff --git a/queries/odin/indents.scm b/runtime/queries/odin/indents.scm
similarity index 100%
rename from queries/odin/indents.scm
rename to runtime/queries/odin/indents.scm
diff --git a/queries/nginx/injections.scm b/runtime/queries/odin/injections.scm
similarity index 100%
rename from queries/nginx/injections.scm
rename to runtime/queries/odin/injections.scm
diff --git a/queries/odin/locals.scm b/runtime/queries/odin/locals.scm
similarity index 100%
rename from queries/odin/locals.scm
rename to runtime/queries/odin/locals.scm
diff --git a/queries/pascal/folds.scm b/runtime/queries/pascal/folds.scm
similarity index 100%
rename from queries/pascal/folds.scm
rename to runtime/queries/pascal/folds.scm
diff --git a/queries/pascal/highlights.scm b/runtime/queries/pascal/highlights.scm
similarity index 100%
rename from queries/pascal/highlights.scm
rename to runtime/queries/pascal/highlights.scm
diff --git a/queries/pascal/indents.scm b/runtime/queries/pascal/indents.scm
similarity index 100%
rename from queries/pascal/indents.scm
rename to runtime/queries/pascal/indents.scm
diff --git a/queries/pascal/injections.scm b/runtime/queries/pascal/injections.scm
similarity index 100%
rename from queries/pascal/injections.scm
rename to runtime/queries/pascal/injections.scm
diff --git a/queries/pascal/locals.scm b/runtime/queries/pascal/locals.scm
similarity index 100%
rename from queries/pascal/locals.scm
rename to runtime/queries/pascal/locals.scm
diff --git a/queries/passwd/highlights.scm b/runtime/queries/passwd/highlights.scm
similarity index 100%
rename from queries/passwd/highlights.scm
rename to runtime/queries/passwd/highlights.scm
diff --git a/queries/pem/folds.scm b/runtime/queries/pem/folds.scm
similarity index 100%
rename from queries/pem/folds.scm
rename to runtime/queries/pem/folds.scm
diff --git a/queries/pem/highlights.scm b/runtime/queries/pem/highlights.scm
similarity index 100%
rename from queries/pem/highlights.scm
rename to runtime/queries/pem/highlights.scm
diff --git a/queries/nickel/injections.scm b/runtime/queries/pem/injections.scm
similarity index 100%
rename from queries/nickel/injections.scm
rename to runtime/queries/pem/injections.scm
diff --git a/queries/perl/folds.scm b/runtime/queries/perl/folds.scm
similarity index 100%
rename from queries/perl/folds.scm
rename to runtime/queries/perl/folds.scm
diff --git a/queries/perl/highlights.scm b/runtime/queries/perl/highlights.scm
similarity index 100%
rename from queries/perl/highlights.scm
rename to runtime/queries/perl/highlights.scm
diff --git a/queries/perl/injections.scm b/runtime/queries/perl/injections.scm
similarity index 100%
rename from queries/perl/injections.scm
rename to runtime/queries/perl/injections.scm
diff --git a/queries/php/folds.scm b/runtime/queries/php/folds.scm
similarity index 100%
rename from queries/php/folds.scm
rename to runtime/queries/php/folds.scm
diff --git a/queries/php/highlights.scm b/runtime/queries/php/highlights.scm
similarity index 100%
rename from queries/php/highlights.scm
rename to runtime/queries/php/highlights.scm
diff --git a/queries/php/indents.scm b/runtime/queries/php/indents.scm
similarity index 100%
rename from queries/php/indents.scm
rename to runtime/queries/php/indents.scm
diff --git a/queries/php/injections.scm b/runtime/queries/php/injections.scm
similarity index 100%
rename from queries/php/injections.scm
rename to runtime/queries/php/injections.scm
diff --git a/queries/php/locals.scm b/runtime/queries/php/locals.scm
similarity index 100%
rename from queries/php/locals.scm
rename to runtime/queries/php/locals.scm
diff --git a/queries/php_only/folds.scm b/runtime/queries/php_only/folds.scm
similarity index 100%
rename from queries/php_only/folds.scm
rename to runtime/queries/php_only/folds.scm
diff --git a/queries/php_only/highlights.scm b/runtime/queries/php_only/highlights.scm
similarity index 100%
rename from queries/php_only/highlights.scm
rename to runtime/queries/php_only/highlights.scm
diff --git a/queries/php_only/indents.scm b/runtime/queries/php_only/indents.scm
similarity index 100%
rename from queries/php_only/indents.scm
rename to runtime/queries/php_only/indents.scm
diff --git a/queries/php_only/injections.scm b/runtime/queries/php_only/injections.scm
similarity index 100%
rename from queries/php_only/injections.scm
rename to runtime/queries/php_only/injections.scm
diff --git a/queries/php_only/locals.scm b/runtime/queries/php_only/locals.scm
similarity index 100%
rename from queries/php_only/locals.scm
rename to runtime/queries/php_only/locals.scm
diff --git a/queries/phpdoc/highlights.scm b/runtime/queries/phpdoc/highlights.scm
similarity index 100%
rename from queries/phpdoc/highlights.scm
rename to runtime/queries/phpdoc/highlights.scm
diff --git a/queries/pioasm/highlights.scm b/runtime/queries/pioasm/highlights.scm
similarity index 100%
rename from queries/pioasm/highlights.scm
rename to runtime/queries/pioasm/highlights.scm
diff --git a/queries/pioasm/injections.scm b/runtime/queries/pioasm/injections.scm
similarity index 100%
rename from queries/pioasm/injections.scm
rename to runtime/queries/pioasm/injections.scm
diff --git a/queries/po/folds.scm b/runtime/queries/po/folds.scm
similarity index 100%
rename from queries/po/folds.scm
rename to runtime/queries/po/folds.scm
diff --git a/queries/po/highlights.scm b/runtime/queries/po/highlights.scm
similarity index 100%
rename from queries/po/highlights.scm
rename to runtime/queries/po/highlights.scm
diff --git a/queries/ninja/injections.scm b/runtime/queries/po/injections.scm
similarity index 100%
rename from queries/ninja/injections.scm
rename to runtime/queries/po/injections.scm
diff --git a/queries/pod/highlights.scm b/runtime/queries/pod/highlights.scm
similarity index 100%
rename from queries/pod/highlights.scm
rename to runtime/queries/pod/highlights.scm
diff --git a/queries/poe_filter/folds.scm b/runtime/queries/poe_filter/folds.scm
similarity index 100%
rename from queries/poe_filter/folds.scm
rename to runtime/queries/poe_filter/folds.scm
diff --git a/queries/poe_filter/highlights.scm b/runtime/queries/poe_filter/highlights.scm
similarity index 100%
rename from queries/poe_filter/highlights.scm
rename to runtime/queries/poe_filter/highlights.scm
diff --git a/queries/poe_filter/indents.scm b/runtime/queries/poe_filter/indents.scm
similarity index 100%
rename from queries/poe_filter/indents.scm
rename to runtime/queries/poe_filter/indents.scm
diff --git a/queries/ocaml/injections.scm b/runtime/queries/poe_filter/injections.scm
similarity index 100%
rename from queries/ocaml/injections.scm
rename to runtime/queries/poe_filter/injections.scm
diff --git a/queries/pony/folds.scm b/runtime/queries/pony/folds.scm
similarity index 100%
rename from queries/pony/folds.scm
rename to runtime/queries/pony/folds.scm
diff --git a/queries/pony/highlights.scm b/runtime/queries/pony/highlights.scm
similarity index 100%
rename from queries/pony/highlights.scm
rename to runtime/queries/pony/highlights.scm
diff --git a/queries/pony/indents.scm b/runtime/queries/pony/indents.scm
similarity index 100%
rename from queries/pony/indents.scm
rename to runtime/queries/pony/indents.scm
diff --git a/queries/pony/injections.scm b/runtime/queries/pony/injections.scm
similarity index 100%
rename from queries/pony/injections.scm
rename to runtime/queries/pony/injections.scm
diff --git a/queries/pony/locals.scm b/runtime/queries/pony/locals.scm
similarity index 100%
rename from queries/pony/locals.scm
rename to runtime/queries/pony/locals.scm
diff --git a/queries/powershell/folds.scm b/runtime/queries/powershell/folds.scm
similarity index 100%
rename from queries/powershell/folds.scm
rename to runtime/queries/powershell/folds.scm
diff --git a/queries/powershell/highlights.scm b/runtime/queries/powershell/highlights.scm
similarity index 100%
rename from queries/powershell/highlights.scm
rename to runtime/queries/powershell/highlights.scm
diff --git a/queries/powershell/indents.scm b/runtime/queries/powershell/indents.scm
similarity index 100%
rename from queries/powershell/indents.scm
rename to runtime/queries/powershell/indents.scm
diff --git a/queries/powershell/injections.scm b/runtime/queries/powershell/injections.scm
similarity index 100%
rename from queries/powershell/injections.scm
rename to runtime/queries/powershell/injections.scm
diff --git a/queries/powershell/locals.scm b/runtime/queries/powershell/locals.scm
similarity index 100%
rename from queries/powershell/locals.scm
rename to runtime/queries/powershell/locals.scm
diff --git a/queries/printf/highlights.scm b/runtime/queries/printf/highlights.scm
similarity index 100%
rename from queries/printf/highlights.scm
rename to runtime/queries/printf/highlights.scm
diff --git a/queries/prisma/folds.scm b/runtime/queries/prisma/folds.scm
similarity index 100%
rename from queries/prisma/folds.scm
rename to runtime/queries/prisma/folds.scm
diff --git a/queries/prisma/highlights.scm b/runtime/queries/prisma/highlights.scm
similarity index 100%
rename from queries/prisma/highlights.scm
rename to runtime/queries/prisma/highlights.scm
diff --git a/queries/prisma/injections.scm b/runtime/queries/prisma/injections.scm
similarity index 100%
rename from queries/prisma/injections.scm
rename to runtime/queries/prisma/injections.scm
diff --git a/queries/problog/folds.scm b/runtime/queries/problog/folds.scm
similarity index 100%
rename from queries/problog/folds.scm
rename to runtime/queries/problog/folds.scm
diff --git a/queries/problog/highlights.scm b/runtime/queries/problog/highlights.scm
similarity index 100%
rename from queries/problog/highlights.scm
rename to runtime/queries/problog/highlights.scm
diff --git a/queries/problog/indents.scm b/runtime/queries/problog/indents.scm
similarity index 100%
rename from queries/problog/indents.scm
rename to runtime/queries/problog/indents.scm
diff --git a/queries/problog/injections.scm b/runtime/queries/problog/injections.scm
similarity index 100%
rename from queries/problog/injections.scm
rename to runtime/queries/problog/injections.scm
diff --git a/queries/prolog/folds.scm b/runtime/queries/prolog/folds.scm
similarity index 100%
rename from queries/prolog/folds.scm
rename to runtime/queries/prolog/folds.scm
diff --git a/queries/prolog/highlights.scm b/runtime/queries/prolog/highlights.scm
similarity index 100%
rename from queries/prolog/highlights.scm
rename to runtime/queries/prolog/highlights.scm
diff --git a/queries/prolog/indents.scm b/runtime/queries/prolog/indents.scm
similarity index 100%
rename from queries/prolog/indents.scm
rename to runtime/queries/prolog/indents.scm
diff --git a/queries/odin/injections.scm b/runtime/queries/prolog/injections.scm
similarity index 100%
rename from queries/odin/injections.scm
rename to runtime/queries/prolog/injections.scm
diff --git a/queries/promql/highlights.scm b/runtime/queries/promql/highlights.scm
similarity index 100%
rename from queries/promql/highlights.scm
rename to runtime/queries/promql/highlights.scm
diff --git a/queries/promql/injections.scm b/runtime/queries/promql/injections.scm
similarity index 100%
rename from queries/promql/injections.scm
rename to runtime/queries/promql/injections.scm
diff --git a/queries/properties/highlights.scm b/runtime/queries/properties/highlights.scm
similarity index 100%
rename from queries/properties/highlights.scm
rename to runtime/queries/properties/highlights.scm
diff --git a/queries/pem/injections.scm b/runtime/queries/properties/injections.scm
similarity index 100%
rename from queries/pem/injections.scm
rename to runtime/queries/properties/injections.scm
diff --git a/queries/properties/locals.scm b/runtime/queries/properties/locals.scm
similarity index 100%
rename from queries/properties/locals.scm
rename to runtime/queries/properties/locals.scm
diff --git a/queries/proto/folds.scm b/runtime/queries/proto/folds.scm
similarity index 100%
rename from queries/proto/folds.scm
rename to runtime/queries/proto/folds.scm
diff --git a/queries/proto/highlights.scm b/runtime/queries/proto/highlights.scm
similarity index 100%
rename from queries/proto/highlights.scm
rename to runtime/queries/proto/highlights.scm
diff --git a/queries/proto/indents.scm b/runtime/queries/proto/indents.scm
similarity index 100%
rename from queries/proto/indents.scm
rename to runtime/queries/proto/indents.scm
diff --git a/queries/po/injections.scm b/runtime/queries/proto/injections.scm
similarity index 100%
rename from queries/po/injections.scm
rename to runtime/queries/proto/injections.scm
diff --git a/queries/prql/highlights.scm b/runtime/queries/prql/highlights.scm
similarity index 100%
rename from queries/prql/highlights.scm
rename to runtime/queries/prql/highlights.scm
diff --git a/queries/prql/injections.scm b/runtime/queries/prql/injections.scm
similarity index 100%
rename from queries/prql/injections.scm
rename to runtime/queries/prql/injections.scm
diff --git a/queries/psv/highlights.scm b/runtime/queries/psv/highlights.scm
similarity index 100%
rename from queries/psv/highlights.scm
rename to runtime/queries/psv/highlights.scm
diff --git a/queries/pug/highlights.scm b/runtime/queries/pug/highlights.scm
similarity index 100%
rename from queries/pug/highlights.scm
rename to runtime/queries/pug/highlights.scm
diff --git a/queries/pug/injections.scm b/runtime/queries/pug/injections.scm
similarity index 100%
rename from queries/pug/injections.scm
rename to runtime/queries/pug/injections.scm
diff --git a/queries/puppet/folds.scm b/runtime/queries/puppet/folds.scm
similarity index 100%
rename from queries/puppet/folds.scm
rename to runtime/queries/puppet/folds.scm
diff --git a/queries/puppet/highlights.scm b/runtime/queries/puppet/highlights.scm
similarity index 100%
rename from queries/puppet/highlights.scm
rename to runtime/queries/puppet/highlights.scm
diff --git a/queries/puppet/indents.scm b/runtime/queries/puppet/indents.scm
similarity index 100%
rename from queries/puppet/indents.scm
rename to runtime/queries/puppet/indents.scm
diff --git a/queries/puppet/injections.scm b/runtime/queries/puppet/injections.scm
similarity index 100%
rename from queries/puppet/injections.scm
rename to runtime/queries/puppet/injections.scm
diff --git a/queries/puppet/locals.scm b/runtime/queries/puppet/locals.scm
similarity index 100%
rename from queries/puppet/locals.scm
rename to runtime/queries/puppet/locals.scm
diff --git a/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
similarity index 100%
rename from queries/purescript/highlights.scm
rename to runtime/queries/purescript/highlights.scm
diff --git a/queries/poe_filter/injections.scm b/runtime/queries/purescript/injections.scm
similarity index 100%
rename from queries/poe_filter/injections.scm
rename to runtime/queries/purescript/injections.scm
diff --git a/queries/purescript/locals.scm b/runtime/queries/purescript/locals.scm
similarity index 100%
rename from queries/purescript/locals.scm
rename to runtime/queries/purescript/locals.scm
diff --git a/queries/pymanifest/highlights.scm b/runtime/queries/pymanifest/highlights.scm
similarity index 100%
rename from queries/pymanifest/highlights.scm
rename to runtime/queries/pymanifest/highlights.scm
diff --git a/queries/prolog/injections.scm b/runtime/queries/pymanifest/injections.scm
similarity index 100%
rename from queries/prolog/injections.scm
rename to runtime/queries/pymanifest/injections.scm
diff --git a/queries/python/folds.scm b/runtime/queries/python/folds.scm
similarity index 100%
rename from queries/python/folds.scm
rename to runtime/queries/python/folds.scm
diff --git a/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
similarity index 100%
rename from queries/python/highlights.scm
rename to runtime/queries/python/highlights.scm
diff --git a/queries/python/indents.scm b/runtime/queries/python/indents.scm
similarity index 100%
rename from queries/python/indents.scm
rename to runtime/queries/python/indents.scm
diff --git a/queries/python/injections.scm b/runtime/queries/python/injections.scm
similarity index 100%
rename from queries/python/injections.scm
rename to runtime/queries/python/injections.scm
diff --git a/queries/python/locals.scm b/runtime/queries/python/locals.scm
similarity index 100%
rename from queries/python/locals.scm
rename to runtime/queries/python/locals.scm
diff --git a/queries/ql/folds.scm b/runtime/queries/ql/folds.scm
similarity index 100%
rename from queries/ql/folds.scm
rename to runtime/queries/ql/folds.scm
diff --git a/queries/ql/highlights.scm b/runtime/queries/ql/highlights.scm
similarity index 100%
rename from queries/ql/highlights.scm
rename to runtime/queries/ql/highlights.scm
diff --git a/queries/ql/indents.scm b/runtime/queries/ql/indents.scm
similarity index 100%
rename from queries/ql/indents.scm
rename to runtime/queries/ql/indents.scm
diff --git a/queries/ql/injections.scm b/runtime/queries/ql/injections.scm
similarity index 100%
rename from queries/ql/injections.scm
rename to runtime/queries/ql/injections.scm
diff --git a/queries/ql/locals.scm b/runtime/queries/ql/locals.scm
similarity index 100%
rename from queries/ql/locals.scm
rename to runtime/queries/ql/locals.scm
diff --git a/queries/qmldir/highlights.scm b/runtime/queries/qmldir/highlights.scm
similarity index 100%
rename from queries/qmldir/highlights.scm
rename to runtime/queries/qmldir/highlights.scm
diff --git a/queries/properties/injections.scm b/runtime/queries/qmldir/injections.scm
similarity index 100%
rename from queries/properties/injections.scm
rename to runtime/queries/qmldir/injections.scm
diff --git a/queries/qmljs/folds.scm b/runtime/queries/qmljs/folds.scm
similarity index 100%
rename from queries/qmljs/folds.scm
rename to runtime/queries/qmljs/folds.scm
diff --git a/queries/qmljs/highlights.scm b/runtime/queries/qmljs/highlights.scm
similarity index 100%
rename from queries/qmljs/highlights.scm
rename to runtime/queries/qmljs/highlights.scm
diff --git a/queries/qmljs/injections.scm b/runtime/queries/qmljs/injections.scm
similarity index 100%
rename from queries/qmljs/injections.scm
rename to runtime/queries/qmljs/injections.scm
diff --git a/queries/query/folds.scm b/runtime/queries/query/folds.scm
similarity index 100%
rename from queries/query/folds.scm
rename to runtime/queries/query/folds.scm
diff --git a/queries/query/highlights.scm b/runtime/queries/query/highlights.scm
similarity index 100%
rename from queries/query/highlights.scm
rename to runtime/queries/query/highlights.scm
diff --git a/queries/query/indents.scm b/runtime/queries/query/indents.scm
similarity index 100%
rename from queries/query/indents.scm
rename to runtime/queries/query/indents.scm
diff --git a/queries/query/injections.scm b/runtime/queries/query/injections.scm
similarity index 100%
rename from queries/query/injections.scm
rename to runtime/queries/query/injections.scm
diff --git a/queries/query/locals.scm b/runtime/queries/query/locals.scm
similarity index 100%
rename from queries/query/locals.scm
rename to runtime/queries/query/locals.scm
diff --git a/queries/r/highlights.scm b/runtime/queries/r/highlights.scm
similarity index 100%
rename from queries/r/highlights.scm
rename to runtime/queries/r/highlights.scm
diff --git a/queries/r/indents.scm b/runtime/queries/r/indents.scm
similarity index 100%
rename from queries/r/indents.scm
rename to runtime/queries/r/indents.scm
diff --git a/queries/proto/injections.scm b/runtime/queries/r/injections.scm
similarity index 100%
rename from queries/proto/injections.scm
rename to runtime/queries/r/injections.scm
diff --git a/queries/r/locals.scm b/runtime/queries/r/locals.scm
similarity index 100%
rename from queries/r/locals.scm
rename to runtime/queries/r/locals.scm
diff --git a/queries/racket/folds.scm b/runtime/queries/racket/folds.scm
similarity index 100%
rename from queries/racket/folds.scm
rename to runtime/queries/racket/folds.scm
diff --git a/queries/racket/highlights.scm b/runtime/queries/racket/highlights.scm
similarity index 100%
rename from queries/racket/highlights.scm
rename to runtime/queries/racket/highlights.scm
diff --git a/queries/racket/injections.scm b/runtime/queries/racket/injections.scm
similarity index 100%
rename from queries/racket/injections.scm
rename to runtime/queries/racket/injections.scm
diff --git a/queries/ralph/highlights.scm b/runtime/queries/ralph/highlights.scm
similarity index 100%
rename from queries/ralph/highlights.scm
rename to runtime/queries/ralph/highlights.scm
diff --git a/queries/ralph/injections.scm b/runtime/queries/ralph/injections.scm
similarity index 100%
rename from queries/ralph/injections.scm
rename to runtime/queries/ralph/injections.scm
diff --git a/queries/rasi/folds.scm b/runtime/queries/rasi/folds.scm
similarity index 100%
rename from queries/rasi/folds.scm
rename to runtime/queries/rasi/folds.scm
diff --git a/queries/rasi/highlights.scm b/runtime/queries/rasi/highlights.scm
similarity index 100%
rename from queries/rasi/highlights.scm
rename to runtime/queries/rasi/highlights.scm
diff --git a/queries/rasi/indents.scm b/runtime/queries/rasi/indents.scm
similarity index 100%
rename from queries/rasi/indents.scm
rename to runtime/queries/rasi/indents.scm
diff --git a/queries/purescript/injections.scm b/runtime/queries/rasi/injections.scm
similarity index 100%
rename from queries/purescript/injections.scm
rename to runtime/queries/rasi/injections.scm
diff --git a/queries/rasi/locals.scm b/runtime/queries/rasi/locals.scm
similarity index 100%
rename from queries/rasi/locals.scm
rename to runtime/queries/rasi/locals.scm
diff --git a/queries/razor/folds.scm b/runtime/queries/razor/folds.scm
similarity index 100%
rename from queries/razor/folds.scm
rename to runtime/queries/razor/folds.scm
diff --git a/queries/razor/highlights.scm b/runtime/queries/razor/highlights.scm
similarity index 100%
rename from queries/razor/highlights.scm
rename to runtime/queries/razor/highlights.scm
diff --git a/queries/razor/injections.scm b/runtime/queries/razor/injections.scm
similarity index 100%
rename from queries/razor/injections.scm
rename to runtime/queries/razor/injections.scm
diff --git a/queries/rbs/folds.scm b/runtime/queries/rbs/folds.scm
similarity index 100%
rename from queries/rbs/folds.scm
rename to runtime/queries/rbs/folds.scm
diff --git a/queries/rbs/highlights.scm b/runtime/queries/rbs/highlights.scm
similarity index 100%
rename from queries/rbs/highlights.scm
rename to runtime/queries/rbs/highlights.scm
diff --git a/queries/rbs/indents.scm b/runtime/queries/rbs/indents.scm
similarity index 100%
rename from queries/rbs/indents.scm
rename to runtime/queries/rbs/indents.scm
diff --git a/queries/pymanifest/injections.scm b/runtime/queries/rbs/injections.scm
similarity index 100%
rename from queries/pymanifest/injections.scm
rename to runtime/queries/rbs/injections.scm
diff --git a/queries/re2c/folds.scm b/runtime/queries/re2c/folds.scm
similarity index 100%
rename from queries/re2c/folds.scm
rename to runtime/queries/re2c/folds.scm
diff --git a/queries/re2c/highlights.scm b/runtime/queries/re2c/highlights.scm
similarity index 100%
rename from queries/re2c/highlights.scm
rename to runtime/queries/re2c/highlights.scm
diff --git a/queries/re2c/indents.scm b/runtime/queries/re2c/indents.scm
similarity index 100%
rename from queries/re2c/indents.scm
rename to runtime/queries/re2c/indents.scm
diff --git a/queries/re2c/injections.scm b/runtime/queries/re2c/injections.scm
similarity index 100%
rename from queries/re2c/injections.scm
rename to runtime/queries/re2c/injections.scm
diff --git a/queries/re2c/locals.scm b/runtime/queries/re2c/locals.scm
similarity index 100%
rename from queries/re2c/locals.scm
rename to runtime/queries/re2c/locals.scm
diff --git a/queries/readline/folds.scm b/runtime/queries/readline/folds.scm
similarity index 100%
rename from queries/readline/folds.scm
rename to runtime/queries/readline/folds.scm
diff --git a/queries/readline/highlights.scm b/runtime/queries/readline/highlights.scm
similarity index 100%
rename from queries/readline/highlights.scm
rename to runtime/queries/readline/highlights.scm
diff --git a/queries/readline/indents.scm b/runtime/queries/readline/indents.scm
similarity index 100%
rename from queries/readline/indents.scm
rename to runtime/queries/readline/indents.scm
diff --git a/queries/qmldir/injections.scm b/runtime/queries/readline/injections.scm
similarity index 100%
rename from queries/qmldir/injections.scm
rename to runtime/queries/readline/injections.scm
diff --git a/queries/regex/highlights.scm b/runtime/queries/regex/highlights.scm
similarity index 100%
rename from queries/regex/highlights.scm
rename to runtime/queries/regex/highlights.scm
diff --git a/queries/rego/highlights.scm b/runtime/queries/rego/highlights.scm
similarity index 100%
rename from queries/rego/highlights.scm
rename to runtime/queries/rego/highlights.scm
diff --git a/queries/r/injections.scm b/runtime/queries/rego/injections.scm
similarity index 100%
rename from queries/r/injections.scm
rename to runtime/queries/rego/injections.scm
diff --git a/queries/requirements/highlights.scm b/runtime/queries/requirements/highlights.scm
similarity index 100%
rename from queries/requirements/highlights.scm
rename to runtime/queries/requirements/highlights.scm
diff --git a/queries/rasi/injections.scm b/runtime/queries/requirements/injections.scm
similarity index 100%
rename from queries/rasi/injections.scm
rename to runtime/queries/requirements/injections.scm
diff --git a/queries/rescript/folds.scm b/runtime/queries/rescript/folds.scm
similarity index 100%
rename from queries/rescript/folds.scm
rename to runtime/queries/rescript/folds.scm
diff --git a/queries/rescript/highlights.scm b/runtime/queries/rescript/highlights.scm
similarity index 100%
rename from queries/rescript/highlights.scm
rename to runtime/queries/rescript/highlights.scm
diff --git a/queries/rescript/indents.scm b/runtime/queries/rescript/indents.scm
similarity index 100%
rename from queries/rescript/indents.scm
rename to runtime/queries/rescript/indents.scm
diff --git a/queries/rescript/injections.scm b/runtime/queries/rescript/injections.scm
similarity index 100%
rename from queries/rescript/injections.scm
rename to runtime/queries/rescript/injections.scm
diff --git a/queries/rescript/locals.scm b/runtime/queries/rescript/locals.scm
similarity index 100%
rename from queries/rescript/locals.scm
rename to runtime/queries/rescript/locals.scm
diff --git a/queries/rnoweb/folds.scm b/runtime/queries/rnoweb/folds.scm
similarity index 100%
rename from queries/rnoweb/folds.scm
rename to runtime/queries/rnoweb/folds.scm
diff --git a/queries/rnoweb/highlights.scm b/runtime/queries/rnoweb/highlights.scm
similarity index 100%
rename from queries/rnoweb/highlights.scm
rename to runtime/queries/rnoweb/highlights.scm
diff --git a/queries/rnoweb/injections.scm b/runtime/queries/rnoweb/injections.scm
similarity index 100%
rename from queries/rnoweb/injections.scm
rename to runtime/queries/rnoweb/injections.scm
diff --git a/queries/robot/folds.scm b/runtime/queries/robot/folds.scm
similarity index 100%
rename from queries/robot/folds.scm
rename to runtime/queries/robot/folds.scm
diff --git a/queries/robot/highlights.scm b/runtime/queries/robot/highlights.scm
similarity index 100%
rename from queries/robot/highlights.scm
rename to runtime/queries/robot/highlights.scm
diff --git a/queries/robot/indents.scm b/runtime/queries/robot/indents.scm
similarity index 100%
rename from queries/robot/indents.scm
rename to runtime/queries/robot/indents.scm
diff --git a/queries/robot/injections.scm b/runtime/queries/robot/injections.scm
similarity index 100%
rename from queries/robot/injections.scm
rename to runtime/queries/robot/injections.scm
diff --git a/queries/robots/highlights.scm b/runtime/queries/robots/highlights.scm
similarity index 100%
rename from queries/robots/highlights.scm
rename to runtime/queries/robots/highlights.scm
diff --git a/queries/rbs/injections.scm b/runtime/queries/robots/injections.scm
similarity index 100%
rename from queries/rbs/injections.scm
rename to runtime/queries/robots/injections.scm
diff --git a/queries/roc/highlights.scm b/runtime/queries/roc/highlights.scm
similarity index 100%
rename from queries/roc/highlights.scm
rename to runtime/queries/roc/highlights.scm
diff --git a/queries/roc/indents.scm b/runtime/queries/roc/indents.scm
similarity index 100%
rename from queries/roc/indents.scm
rename to runtime/queries/roc/indents.scm
diff --git a/queries/roc/injections.scm b/runtime/queries/roc/injections.scm
similarity index 100%
rename from queries/roc/injections.scm
rename to runtime/queries/roc/injections.scm
diff --git a/queries/roc/locals.scm b/runtime/queries/roc/locals.scm
similarity index 100%
rename from queries/roc/locals.scm
rename to runtime/queries/roc/locals.scm
diff --git a/queries/ron/folds.scm b/runtime/queries/ron/folds.scm
similarity index 100%
rename from queries/ron/folds.scm
rename to runtime/queries/ron/folds.scm
diff --git a/queries/ron/highlights.scm b/runtime/queries/ron/highlights.scm
similarity index 100%
rename from queries/ron/highlights.scm
rename to runtime/queries/ron/highlights.scm
diff --git a/queries/ron/indents.scm b/runtime/queries/ron/indents.scm
similarity index 100%
rename from queries/ron/indents.scm
rename to runtime/queries/ron/indents.scm
diff --git a/queries/ron/injections.scm b/runtime/queries/ron/injections.scm
similarity index 100%
rename from queries/ron/injections.scm
rename to runtime/queries/ron/injections.scm
diff --git a/queries/ron/locals.scm b/runtime/queries/ron/locals.scm
similarity index 100%
rename from queries/ron/locals.scm
rename to runtime/queries/ron/locals.scm
diff --git a/queries/rst/highlights.scm b/runtime/queries/rst/highlights.scm
similarity index 100%
rename from queries/rst/highlights.scm
rename to runtime/queries/rst/highlights.scm
diff --git a/queries/rst/injections.scm b/runtime/queries/rst/injections.scm
similarity index 100%
rename from queries/rst/injections.scm
rename to runtime/queries/rst/injections.scm
diff --git a/queries/rst/locals.scm b/runtime/queries/rst/locals.scm
similarity index 100%
rename from queries/rst/locals.scm
rename to runtime/queries/rst/locals.scm
diff --git a/queries/ruby/folds.scm b/runtime/queries/ruby/folds.scm
similarity index 100%
rename from queries/ruby/folds.scm
rename to runtime/queries/ruby/folds.scm
diff --git a/queries/ruby/highlights.scm b/runtime/queries/ruby/highlights.scm
similarity index 97%
rename from queries/ruby/highlights.scm
rename to runtime/queries/ruby/highlights.scm
index 8de0251b1..a1a2c250d 100644
--- a/queries/ruby/highlights.scm
+++ b/runtime/queries/ruby/highlights.scm
@@ -170,9 +170,6 @@
 (keyword_parameter
   (identifier) @variable.parameter)
 
-; TODO: Re-enable this once it is supported
-; ((identifier) @function
-;  (#is-not? local))
 ; Literals
 [
   (string_content)
diff --git a/queries/ruby/indents.scm b/runtime/queries/ruby/indents.scm
similarity index 100%
rename from queries/ruby/indents.scm
rename to runtime/queries/ruby/indents.scm
diff --git a/queries/ruby/injections.scm b/runtime/queries/ruby/injections.scm
similarity index 100%
rename from queries/ruby/injections.scm
rename to runtime/queries/ruby/injections.scm
diff --git a/queries/ruby/locals.scm b/runtime/queries/ruby/locals.scm
similarity index 100%
rename from queries/ruby/locals.scm
rename to runtime/queries/ruby/locals.scm
diff --git a/queries/runescript/highlights.scm b/runtime/queries/runescript/highlights.scm
similarity index 100%
rename from queries/runescript/highlights.scm
rename to runtime/queries/runescript/highlights.scm
diff --git a/queries/readline/injections.scm b/runtime/queries/runescript/injections.scm
similarity index 100%
rename from queries/readline/injections.scm
rename to runtime/queries/runescript/injections.scm
diff --git a/queries/rust/folds.scm b/runtime/queries/rust/folds.scm
similarity index 100%
rename from queries/rust/folds.scm
rename to runtime/queries/rust/folds.scm
diff --git a/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
similarity index 100%
rename from queries/rust/highlights.scm
rename to runtime/queries/rust/highlights.scm
diff --git a/queries/rust/indents.scm b/runtime/queries/rust/indents.scm
similarity index 100%
rename from queries/rust/indents.scm
rename to runtime/queries/rust/indents.scm
diff --git a/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
similarity index 100%
rename from queries/rust/injections.scm
rename to runtime/queries/rust/injections.scm
diff --git a/queries/rust/locals.scm b/runtime/queries/rust/locals.scm
similarity index 100%
rename from queries/rust/locals.scm
rename to runtime/queries/rust/locals.scm
diff --git a/queries/scala/folds.scm b/runtime/queries/scala/folds.scm
similarity index 100%
rename from queries/scala/folds.scm
rename to runtime/queries/scala/folds.scm
diff --git a/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
similarity index 100%
rename from queries/scala/highlights.scm
rename to runtime/queries/scala/highlights.scm
diff --git a/queries/rego/injections.scm b/runtime/queries/scala/injections.scm
similarity index 100%
rename from queries/rego/injections.scm
rename to runtime/queries/scala/injections.scm
diff --git a/queries/scala/locals.scm b/runtime/queries/scala/locals.scm
similarity index 100%
rename from queries/scala/locals.scm
rename to runtime/queries/scala/locals.scm
diff --git a/queries/scfg/highlights.scm b/runtime/queries/scfg/highlights.scm
similarity index 100%
rename from queries/scfg/highlights.scm
rename to runtime/queries/scfg/highlights.scm
diff --git a/queries/requirements/injections.scm b/runtime/queries/scfg/injections.scm
similarity index 100%
rename from queries/requirements/injections.scm
rename to runtime/queries/scfg/injections.scm
diff --git a/queries/scheme/folds.scm b/runtime/queries/scheme/folds.scm
similarity index 100%
rename from queries/scheme/folds.scm
rename to runtime/queries/scheme/folds.scm
diff --git a/queries/scheme/highlights.scm b/runtime/queries/scheme/highlights.scm
similarity index 100%
rename from queries/scheme/highlights.scm
rename to runtime/queries/scheme/highlights.scm
diff --git a/queries/robots/injections.scm b/runtime/queries/scheme/injections.scm
similarity index 100%
rename from queries/robots/injections.scm
rename to runtime/queries/scheme/injections.scm
diff --git a/queries/scss/folds.scm b/runtime/queries/scss/folds.scm
similarity index 100%
rename from queries/scss/folds.scm
rename to runtime/queries/scss/folds.scm
diff --git a/queries/scss/highlights.scm b/runtime/queries/scss/highlights.scm
similarity index 100%
rename from queries/scss/highlights.scm
rename to runtime/queries/scss/highlights.scm
diff --git a/queries/scss/indents.scm b/runtime/queries/scss/indents.scm
similarity index 100%
rename from queries/scss/indents.scm
rename to runtime/queries/scss/indents.scm
diff --git a/queries/scss/injections.scm b/runtime/queries/scss/injections.scm
similarity index 100%
rename from queries/scss/injections.scm
rename to runtime/queries/scss/injections.scm
diff --git a/queries/sflog/highlights.scm b/runtime/queries/sflog/highlights.scm
similarity index 100%
rename from queries/sflog/highlights.scm
rename to runtime/queries/sflog/highlights.scm
diff --git a/queries/slang/folds.scm b/runtime/queries/slang/folds.scm
similarity index 100%
rename from queries/slang/folds.scm
rename to runtime/queries/slang/folds.scm
diff --git a/queries/slang/highlights.scm b/runtime/queries/slang/highlights.scm
similarity index 100%
rename from queries/slang/highlights.scm
rename to runtime/queries/slang/highlights.scm
diff --git a/queries/slang/indents.scm b/runtime/queries/slang/indents.scm
similarity index 100%
rename from queries/slang/indents.scm
rename to runtime/queries/slang/indents.scm
diff --git a/queries/slang/injections.scm b/runtime/queries/slang/injections.scm
similarity index 100%
rename from queries/slang/injections.scm
rename to runtime/queries/slang/injections.scm
diff --git a/queries/slang/locals.scm b/runtime/queries/slang/locals.scm
similarity index 100%
rename from queries/slang/locals.scm
rename to runtime/queries/slang/locals.scm
diff --git a/queries/slim/folds.scm b/runtime/queries/slim/folds.scm
similarity index 100%
rename from queries/slim/folds.scm
rename to runtime/queries/slim/folds.scm
diff --git a/queries/slim/highlights.scm b/runtime/queries/slim/highlights.scm
similarity index 100%
rename from queries/slim/highlights.scm
rename to runtime/queries/slim/highlights.scm
diff --git a/queries/slim/indents.scm b/runtime/queries/slim/indents.scm
similarity index 100%
rename from queries/slim/indents.scm
rename to runtime/queries/slim/indents.scm
diff --git a/queries/slim/injections.scm b/runtime/queries/slim/injections.scm
similarity index 100%
rename from queries/slim/injections.scm
rename to runtime/queries/slim/injections.scm
diff --git a/queries/slim/locals.scm b/runtime/queries/slim/locals.scm
similarity index 100%
rename from queries/slim/locals.scm
rename to runtime/queries/slim/locals.scm
diff --git a/queries/slint/folds.scm b/runtime/queries/slint/folds.scm
similarity index 100%
rename from queries/slint/folds.scm
rename to runtime/queries/slint/folds.scm
diff --git a/queries/slint/highlights.scm b/runtime/queries/slint/highlights.scm
similarity index 100%
rename from queries/slint/highlights.scm
rename to runtime/queries/slint/highlights.scm
diff --git a/queries/slint/indents.scm b/runtime/queries/slint/indents.scm
similarity index 100%
rename from queries/slint/indents.scm
rename to runtime/queries/slint/indents.scm
diff --git a/queries/runescript/injections.scm b/runtime/queries/slint/injections.scm
similarity index 100%
rename from queries/runescript/injections.scm
rename to runtime/queries/slint/injections.scm
diff --git a/queries/slint/locals.scm b/runtime/queries/slint/locals.scm
similarity index 100%
rename from queries/slint/locals.scm
rename to runtime/queries/slint/locals.scm
diff --git a/queries/smali/folds.scm b/runtime/queries/smali/folds.scm
similarity index 100%
rename from queries/smali/folds.scm
rename to runtime/queries/smali/folds.scm
diff --git a/queries/smali/highlights.scm b/runtime/queries/smali/highlights.scm
similarity index 100%
rename from queries/smali/highlights.scm
rename to runtime/queries/smali/highlights.scm
diff --git a/queries/smali/indents.scm b/runtime/queries/smali/indents.scm
similarity index 100%
rename from queries/smali/indents.scm
rename to runtime/queries/smali/indents.scm
diff --git a/queries/scfg/injections.scm b/runtime/queries/smali/injections.scm
similarity index 100%
rename from queries/scfg/injections.scm
rename to runtime/queries/smali/injections.scm
diff --git a/queries/smali/locals.scm b/runtime/queries/smali/locals.scm
similarity index 100%
rename from queries/smali/locals.scm
rename to runtime/queries/smali/locals.scm
diff --git a/queries/smithy/highlights.scm b/runtime/queries/smithy/highlights.scm
similarity index 100%
rename from queries/smithy/highlights.scm
rename to runtime/queries/smithy/highlights.scm
diff --git a/queries/smithy/injections.scm b/runtime/queries/smithy/injections.scm
similarity index 100%
rename from queries/smithy/injections.scm
rename to runtime/queries/smithy/injections.scm
diff --git a/queries/snakemake/folds.scm b/runtime/queries/snakemake/folds.scm
similarity index 100%
rename from queries/snakemake/folds.scm
rename to runtime/queries/snakemake/folds.scm
diff --git a/queries/snakemake/highlights.scm b/runtime/queries/snakemake/highlights.scm
similarity index 100%
rename from queries/snakemake/highlights.scm
rename to runtime/queries/snakemake/highlights.scm
diff --git a/queries/snakemake/indents.scm b/runtime/queries/snakemake/indents.scm
similarity index 100%
rename from queries/snakemake/indents.scm
rename to runtime/queries/snakemake/indents.scm
diff --git a/queries/snakemake/injections.scm b/runtime/queries/snakemake/injections.scm
similarity index 100%
rename from queries/snakemake/injections.scm
rename to runtime/queries/snakemake/injections.scm
diff --git a/queries/snakemake/locals.scm b/runtime/queries/snakemake/locals.scm
similarity index 100%
rename from queries/snakemake/locals.scm
rename to runtime/queries/snakemake/locals.scm
diff --git a/queries/solidity/folds.scm b/runtime/queries/solidity/folds.scm
similarity index 100%
rename from queries/solidity/folds.scm
rename to runtime/queries/solidity/folds.scm
diff --git a/queries/solidity/highlights.scm b/runtime/queries/solidity/highlights.scm
similarity index 100%
rename from queries/solidity/highlights.scm
rename to runtime/queries/solidity/highlights.scm
diff --git a/queries/scheme/injections.scm b/runtime/queries/solidity/injections.scm
similarity index 100%
rename from queries/scheme/injections.scm
rename to runtime/queries/solidity/injections.scm
diff --git a/queries/soql/highlights.scm b/runtime/queries/soql/highlights.scm
similarity index 100%
rename from queries/soql/highlights.scm
rename to runtime/queries/soql/highlights.scm
diff --git a/queries/sosl/highlights.scm b/runtime/queries/sosl/highlights.scm
similarity index 100%
rename from queries/sosl/highlights.scm
rename to runtime/queries/sosl/highlights.scm
diff --git a/queries/sourcepawn/highlights.scm b/runtime/queries/sourcepawn/highlights.scm
similarity index 100%
rename from queries/sourcepawn/highlights.scm
rename to runtime/queries/sourcepawn/highlights.scm
diff --git a/queries/sourcepawn/injections.scm b/runtime/queries/sourcepawn/injections.scm
similarity index 100%
rename from queries/sourcepawn/injections.scm
rename to runtime/queries/sourcepawn/injections.scm
diff --git a/queries/sourcepawn/locals.scm b/runtime/queries/sourcepawn/locals.scm
similarity index 100%
rename from queries/sourcepawn/locals.scm
rename to runtime/queries/sourcepawn/locals.scm
diff --git a/queries/sparql/folds.scm b/runtime/queries/sparql/folds.scm
similarity index 100%
rename from queries/sparql/folds.scm
rename to runtime/queries/sparql/folds.scm
diff --git a/queries/sparql/highlights.scm b/runtime/queries/sparql/highlights.scm
similarity index 100%
rename from queries/sparql/highlights.scm
rename to runtime/queries/sparql/highlights.scm
diff --git a/queries/sparql/indents.scm b/runtime/queries/sparql/indents.scm
similarity index 100%
rename from queries/sparql/indents.scm
rename to runtime/queries/sparql/indents.scm
diff --git a/queries/sparql/injections.scm b/runtime/queries/sparql/injections.scm
similarity index 100%
rename from queries/sparql/injections.scm
rename to runtime/queries/sparql/injections.scm
diff --git a/queries/sparql/locals.scm b/runtime/queries/sparql/locals.scm
similarity index 100%
rename from queries/sparql/locals.scm
rename to runtime/queries/sparql/locals.scm
diff --git a/queries/sql/folds.scm b/runtime/queries/sql/folds.scm
similarity index 100%
rename from queries/sql/folds.scm
rename to runtime/queries/sql/folds.scm
diff --git a/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
similarity index 100%
rename from queries/sql/highlights.scm
rename to runtime/queries/sql/highlights.scm
diff --git a/queries/sql/indents.scm b/runtime/queries/sql/indents.scm
similarity index 100%
rename from queries/sql/indents.scm
rename to runtime/queries/sql/indents.scm
diff --git a/queries/sql/injections.scm b/runtime/queries/sql/injections.scm
similarity index 100%
rename from queries/sql/injections.scm
rename to runtime/queries/sql/injections.scm
diff --git a/queries/squirrel/folds.scm b/runtime/queries/squirrel/folds.scm
similarity index 100%
rename from queries/squirrel/folds.scm
rename to runtime/queries/squirrel/folds.scm
diff --git a/queries/squirrel/highlights.scm b/runtime/queries/squirrel/highlights.scm
similarity index 100%
rename from queries/squirrel/highlights.scm
rename to runtime/queries/squirrel/highlights.scm
diff --git a/queries/squirrel/indents.scm b/runtime/queries/squirrel/indents.scm
similarity index 100%
rename from queries/squirrel/indents.scm
rename to runtime/queries/squirrel/indents.scm
diff --git a/queries/squirrel/injections.scm b/runtime/queries/squirrel/injections.scm
similarity index 100%
rename from queries/squirrel/injections.scm
rename to runtime/queries/squirrel/injections.scm
diff --git a/queries/squirrel/locals.scm b/runtime/queries/squirrel/locals.scm
similarity index 100%
rename from queries/squirrel/locals.scm
rename to runtime/queries/squirrel/locals.scm
diff --git a/queries/ssh_config/folds.scm b/runtime/queries/ssh_config/folds.scm
similarity index 100%
rename from queries/ssh_config/folds.scm
rename to runtime/queries/ssh_config/folds.scm
diff --git a/queries/ssh_config/highlights.scm b/runtime/queries/ssh_config/highlights.scm
similarity index 100%
rename from queries/ssh_config/highlights.scm
rename to runtime/queries/ssh_config/highlights.scm
diff --git a/queries/ssh_config/indents.scm b/runtime/queries/ssh_config/indents.scm
similarity index 100%
rename from queries/ssh_config/indents.scm
rename to runtime/queries/ssh_config/indents.scm
diff --git a/queries/ssh_config/injections.scm b/runtime/queries/ssh_config/injections.scm
similarity index 100%
rename from queries/ssh_config/injections.scm
rename to runtime/queries/ssh_config/injections.scm
diff --git a/queries/ssh_config/locals.scm b/runtime/queries/ssh_config/locals.scm
similarity index 100%
rename from queries/ssh_config/locals.scm
rename to runtime/queries/ssh_config/locals.scm
diff --git a/queries/starlark/folds.scm b/runtime/queries/starlark/folds.scm
similarity index 100%
rename from queries/starlark/folds.scm
rename to runtime/queries/starlark/folds.scm
diff --git a/queries/starlark/highlights.scm b/runtime/queries/starlark/highlights.scm
similarity index 100%
rename from queries/starlark/highlights.scm
rename to runtime/queries/starlark/highlights.scm
diff --git a/queries/starlark/indents.scm b/runtime/queries/starlark/indents.scm
similarity index 100%
rename from queries/starlark/indents.scm
rename to runtime/queries/starlark/indents.scm
diff --git a/queries/starlark/injections.scm b/runtime/queries/starlark/injections.scm
similarity index 100%
rename from queries/starlark/injections.scm
rename to runtime/queries/starlark/injections.scm
diff --git a/queries/starlark/locals.scm b/runtime/queries/starlark/locals.scm
similarity index 100%
rename from queries/starlark/locals.scm
rename to runtime/queries/starlark/locals.scm
diff --git a/queries/strace/highlights.scm b/runtime/queries/strace/highlights.scm
similarity index 100%
rename from queries/strace/highlights.scm
rename to runtime/queries/strace/highlights.scm
diff --git a/queries/slint/injections.scm b/runtime/queries/strace/injections.scm
similarity index 100%
rename from queries/slint/injections.scm
rename to runtime/queries/strace/injections.scm
diff --git a/queries/styled/folds.scm b/runtime/queries/styled/folds.scm
similarity index 100%
rename from queries/styled/folds.scm
rename to runtime/queries/styled/folds.scm
diff --git a/queries/styled/highlights.scm b/runtime/queries/styled/highlights.scm
similarity index 100%
rename from queries/styled/highlights.scm
rename to runtime/queries/styled/highlights.scm
diff --git a/queries/styled/indents.scm b/runtime/queries/styled/indents.scm
similarity index 100%
rename from queries/styled/indents.scm
rename to runtime/queries/styled/indents.scm
diff --git a/queries/styled/injections.scm b/runtime/queries/styled/injections.scm
similarity index 100%
rename from queries/styled/injections.scm
rename to runtime/queries/styled/injections.scm
diff --git a/queries/supercollider/folds.scm b/runtime/queries/supercollider/folds.scm
similarity index 100%
rename from queries/supercollider/folds.scm
rename to runtime/queries/supercollider/folds.scm
diff --git a/queries/supercollider/highlights.scm b/runtime/queries/supercollider/highlights.scm
similarity index 100%
rename from queries/supercollider/highlights.scm
rename to runtime/queries/supercollider/highlights.scm
diff --git a/queries/supercollider/indents.scm b/runtime/queries/supercollider/indents.scm
similarity index 100%
rename from queries/supercollider/indents.scm
rename to runtime/queries/supercollider/indents.scm
diff --git a/queries/supercollider/injections.scm b/runtime/queries/supercollider/injections.scm
similarity index 100%
rename from queries/supercollider/injections.scm
rename to runtime/queries/supercollider/injections.scm
diff --git a/queries/supercollider/locals.scm b/runtime/queries/supercollider/locals.scm
similarity index 100%
rename from queries/supercollider/locals.scm
rename to runtime/queries/supercollider/locals.scm
diff --git a/queries/superhtml/highlights.scm b/runtime/queries/superhtml/highlights.scm
similarity index 100%
rename from queries/superhtml/highlights.scm
rename to runtime/queries/superhtml/highlights.scm
diff --git a/queries/superhtml/injections.scm b/runtime/queries/superhtml/injections.scm
similarity index 100%
rename from queries/superhtml/injections.scm
rename to runtime/queries/superhtml/injections.scm
diff --git a/queries/surface/folds.scm b/runtime/queries/surface/folds.scm
similarity index 100%
rename from queries/surface/folds.scm
rename to runtime/queries/surface/folds.scm
diff --git a/queries/surface/highlights.scm b/runtime/queries/surface/highlights.scm
similarity index 100%
rename from queries/surface/highlights.scm
rename to runtime/queries/surface/highlights.scm
diff --git a/queries/surface/indents.scm b/runtime/queries/surface/indents.scm
similarity index 100%
rename from queries/surface/indents.scm
rename to runtime/queries/surface/indents.scm
diff --git a/queries/surface/injections.scm b/runtime/queries/surface/injections.scm
similarity index 100%
rename from queries/surface/injections.scm
rename to runtime/queries/surface/injections.scm
diff --git a/queries/svelte/folds.scm b/runtime/queries/svelte/folds.scm
similarity index 100%
rename from queries/svelte/folds.scm
rename to runtime/queries/svelte/folds.scm
diff --git a/queries/svelte/highlights.scm b/runtime/queries/svelte/highlights.scm
similarity index 100%
rename from queries/svelte/highlights.scm
rename to runtime/queries/svelte/highlights.scm
diff --git a/queries/svelte/indents.scm b/runtime/queries/svelte/indents.scm
similarity index 100%
rename from queries/svelte/indents.scm
rename to runtime/queries/svelte/indents.scm
diff --git a/queries/svelte/injections.scm b/runtime/queries/svelte/injections.scm
similarity index 100%
rename from queries/svelte/injections.scm
rename to runtime/queries/svelte/injections.scm
diff --git a/queries/svelte/locals.scm b/runtime/queries/svelte/locals.scm
similarity index 100%
rename from queries/svelte/locals.scm
rename to runtime/queries/svelte/locals.scm
diff --git a/queries/sway/folds.scm b/runtime/queries/sway/folds.scm
similarity index 100%
rename from queries/sway/folds.scm
rename to runtime/queries/sway/folds.scm
diff --git a/queries/sway/highlights.scm b/runtime/queries/sway/highlights.scm
similarity index 100%
rename from queries/sway/highlights.scm
rename to runtime/queries/sway/highlights.scm
diff --git a/queries/sway/indents.scm b/runtime/queries/sway/indents.scm
similarity index 100%
rename from queries/sway/indents.scm
rename to runtime/queries/sway/indents.scm
diff --git a/queries/sway/injections.scm b/runtime/queries/sway/injections.scm
similarity index 100%
rename from queries/sway/injections.scm
rename to runtime/queries/sway/injections.scm
diff --git a/queries/sway/locals.scm b/runtime/queries/sway/locals.scm
similarity index 100%
rename from queries/sway/locals.scm
rename to runtime/queries/sway/locals.scm
diff --git a/queries/swift/folds.scm b/runtime/queries/swift/folds.scm
similarity index 100%
rename from queries/swift/folds.scm
rename to runtime/queries/swift/folds.scm
diff --git a/queries/swift/highlights.scm b/runtime/queries/swift/highlights.scm
similarity index 100%
rename from queries/swift/highlights.scm
rename to runtime/queries/swift/highlights.scm
diff --git a/queries/swift/indents.scm b/runtime/queries/swift/indents.scm
similarity index 100%
rename from queries/swift/indents.scm
rename to runtime/queries/swift/indents.scm
diff --git a/queries/swift/injections.scm b/runtime/queries/swift/injections.scm
similarity index 100%
rename from queries/swift/injections.scm
rename to runtime/queries/swift/injections.scm
diff --git a/queries/swift/locals.scm b/runtime/queries/swift/locals.scm
similarity index 100%
rename from queries/swift/locals.scm
rename to runtime/queries/swift/locals.scm
diff --git a/queries/sxhkdrc/folds.scm b/runtime/queries/sxhkdrc/folds.scm
similarity index 100%
rename from queries/sxhkdrc/folds.scm
rename to runtime/queries/sxhkdrc/folds.scm
diff --git a/queries/sxhkdrc/highlights.scm b/runtime/queries/sxhkdrc/highlights.scm
similarity index 100%
rename from queries/sxhkdrc/highlights.scm
rename to runtime/queries/sxhkdrc/highlights.scm
diff --git a/queries/sxhkdrc/injections.scm b/runtime/queries/sxhkdrc/injections.scm
similarity index 100%
rename from queries/sxhkdrc/injections.scm
rename to runtime/queries/sxhkdrc/injections.scm
diff --git a/queries/systemtap/folds.scm b/runtime/queries/systemtap/folds.scm
similarity index 100%
rename from queries/systemtap/folds.scm
rename to runtime/queries/systemtap/folds.scm
diff --git a/queries/systemtap/highlights.scm b/runtime/queries/systemtap/highlights.scm
similarity index 100%
rename from queries/systemtap/highlights.scm
rename to runtime/queries/systemtap/highlights.scm
diff --git a/queries/systemtap/injections.scm b/runtime/queries/systemtap/injections.scm
similarity index 100%
rename from queries/systemtap/injections.scm
rename to runtime/queries/systemtap/injections.scm
diff --git a/queries/systemtap/locals.scm b/runtime/queries/systemtap/locals.scm
similarity index 100%
rename from queries/systemtap/locals.scm
rename to runtime/queries/systemtap/locals.scm
diff --git a/queries/t32/folds.scm b/runtime/queries/t32/folds.scm
similarity index 100%
rename from queries/t32/folds.scm
rename to runtime/queries/t32/folds.scm
diff --git a/queries/t32/highlights.scm b/runtime/queries/t32/highlights.scm
similarity index 100%
rename from queries/t32/highlights.scm
rename to runtime/queries/t32/highlights.scm
diff --git a/queries/t32/indents.scm b/runtime/queries/t32/indents.scm
similarity index 100%
rename from queries/t32/indents.scm
rename to runtime/queries/t32/indents.scm
diff --git a/queries/smali/injections.scm b/runtime/queries/t32/injections.scm
similarity index 100%
rename from queries/smali/injections.scm
rename to runtime/queries/t32/injections.scm
diff --git a/queries/t32/locals.scm b/runtime/queries/t32/locals.scm
similarity index 100%
rename from queries/t32/locals.scm
rename to runtime/queries/t32/locals.scm
diff --git a/queries/tablegen/folds.scm b/runtime/queries/tablegen/folds.scm
similarity index 100%
rename from queries/tablegen/folds.scm
rename to runtime/queries/tablegen/folds.scm
diff --git a/queries/tablegen/highlights.scm b/runtime/queries/tablegen/highlights.scm
similarity index 100%
rename from queries/tablegen/highlights.scm
rename to runtime/queries/tablegen/highlights.scm
diff --git a/queries/tablegen/indents.scm b/runtime/queries/tablegen/indents.scm
similarity index 100%
rename from queries/tablegen/indents.scm
rename to runtime/queries/tablegen/indents.scm
diff --git a/queries/tablegen/injections.scm b/runtime/queries/tablegen/injections.scm
similarity index 100%
rename from queries/tablegen/injections.scm
rename to runtime/queries/tablegen/injections.scm
diff --git a/queries/tablegen/locals.scm b/runtime/queries/tablegen/locals.scm
similarity index 100%
rename from queries/tablegen/locals.scm
rename to runtime/queries/tablegen/locals.scm
diff --git a/queries/tact/folds.scm b/runtime/queries/tact/folds.scm
similarity index 100%
rename from queries/tact/folds.scm
rename to runtime/queries/tact/folds.scm
diff --git a/queries/tact/highlights.scm b/runtime/queries/tact/highlights.scm
similarity index 100%
rename from queries/tact/highlights.scm
rename to runtime/queries/tact/highlights.scm
diff --git a/queries/tact/indents.scm b/runtime/queries/tact/indents.scm
similarity index 100%
rename from queries/tact/indents.scm
rename to runtime/queries/tact/indents.scm
diff --git a/queries/strace/injections.scm b/runtime/queries/tact/injections.scm
similarity index 100%
rename from queries/strace/injections.scm
rename to runtime/queries/tact/injections.scm
diff --git a/queries/tact/locals.scm b/runtime/queries/tact/locals.scm
similarity index 100%
rename from queries/tact/locals.scm
rename to runtime/queries/tact/locals.scm
diff --git a/queries/tcl/folds.scm b/runtime/queries/tcl/folds.scm
similarity index 100%
rename from queries/tcl/folds.scm
rename to runtime/queries/tcl/folds.scm
diff --git a/queries/tcl/highlights.scm b/runtime/queries/tcl/highlights.scm
similarity index 100%
rename from queries/tcl/highlights.scm
rename to runtime/queries/tcl/highlights.scm
diff --git a/queries/tcl/indents.scm b/runtime/queries/tcl/indents.scm
similarity index 100%
rename from queries/tcl/indents.scm
rename to runtime/queries/tcl/indents.scm
diff --git a/queries/t32/injections.scm b/runtime/queries/tcl/injections.scm
similarity index 100%
rename from queries/t32/injections.scm
rename to runtime/queries/tcl/injections.scm
diff --git a/queries/teal/folds.scm b/runtime/queries/teal/folds.scm
similarity index 100%
rename from queries/teal/folds.scm
rename to runtime/queries/teal/folds.scm
diff --git a/queries/teal/highlights.scm b/runtime/queries/teal/highlights.scm
similarity index 100%
rename from queries/teal/highlights.scm
rename to runtime/queries/teal/highlights.scm
diff --git a/queries/teal/indents.scm b/runtime/queries/teal/indents.scm
similarity index 100%
rename from queries/teal/indents.scm
rename to runtime/queries/teal/indents.scm
diff --git a/queries/teal/injections.scm b/runtime/queries/teal/injections.scm
similarity index 100%
rename from queries/teal/injections.scm
rename to runtime/queries/teal/injections.scm
diff --git a/queries/teal/locals.scm b/runtime/queries/teal/locals.scm
similarity index 100%
rename from queries/teal/locals.scm
rename to runtime/queries/teal/locals.scm
diff --git a/queries/templ/folds.scm b/runtime/queries/templ/folds.scm
similarity index 100%
rename from queries/templ/folds.scm
rename to runtime/queries/templ/folds.scm
diff --git a/queries/templ/highlights.scm b/runtime/queries/templ/highlights.scm
similarity index 100%
rename from queries/templ/highlights.scm
rename to runtime/queries/templ/highlights.scm
diff --git a/queries/templ/injections.scm b/runtime/queries/templ/injections.scm
similarity index 100%
rename from queries/templ/injections.scm
rename to runtime/queries/templ/injections.scm
diff --git a/queries/tera/highlights.scm b/runtime/queries/tera/highlights.scm
similarity index 100%
rename from queries/tera/highlights.scm
rename to runtime/queries/tera/highlights.scm
diff --git a/queries/tera/injections.scm b/runtime/queries/tera/injections.scm
similarity index 100%
rename from queries/tera/injections.scm
rename to runtime/queries/tera/injections.scm
diff --git a/queries/terraform/folds.scm b/runtime/queries/terraform/folds.scm
similarity index 100%
rename from queries/terraform/folds.scm
rename to runtime/queries/terraform/folds.scm
diff --git a/queries/terraform/highlights.scm b/runtime/queries/terraform/highlights.scm
similarity index 100%
rename from queries/terraform/highlights.scm
rename to runtime/queries/terraform/highlights.scm
diff --git a/queries/terraform/indents.scm b/runtime/queries/terraform/indents.scm
similarity index 100%
rename from queries/terraform/indents.scm
rename to runtime/queries/terraform/indents.scm
diff --git a/queries/terraform/injections.scm b/runtime/queries/terraform/injections.scm
similarity index 100%
rename from queries/terraform/injections.scm
rename to runtime/queries/terraform/injections.scm
diff --git a/queries/textproto/folds.scm b/runtime/queries/textproto/folds.scm
similarity index 100%
rename from queries/textproto/folds.scm
rename to runtime/queries/textproto/folds.scm
diff --git a/queries/textproto/highlights.scm b/runtime/queries/textproto/highlights.scm
similarity index 100%
rename from queries/textproto/highlights.scm
rename to runtime/queries/textproto/highlights.scm
diff --git a/queries/textproto/indents.scm b/runtime/queries/textproto/indents.scm
similarity index 100%
rename from queries/textproto/indents.scm
rename to runtime/queries/textproto/indents.scm
diff --git a/queries/tact/injections.scm b/runtime/queries/textproto/injections.scm
similarity index 100%
rename from queries/tact/injections.scm
rename to runtime/queries/textproto/injections.scm
diff --git a/queries/thrift/folds.scm b/runtime/queries/thrift/folds.scm
similarity index 100%
rename from queries/thrift/folds.scm
rename to runtime/queries/thrift/folds.scm
diff --git a/queries/thrift/highlights.scm b/runtime/queries/thrift/highlights.scm
similarity index 100%
rename from queries/thrift/highlights.scm
rename to runtime/queries/thrift/highlights.scm
diff --git a/queries/thrift/indents.scm b/runtime/queries/thrift/indents.scm
similarity index 100%
rename from queries/thrift/indents.scm
rename to runtime/queries/thrift/indents.scm
diff --git a/queries/tcl/injections.scm b/runtime/queries/thrift/injections.scm
similarity index 100%
rename from queries/tcl/injections.scm
rename to runtime/queries/thrift/injections.scm
diff --git a/queries/thrift/locals.scm b/runtime/queries/thrift/locals.scm
similarity index 100%
rename from queries/thrift/locals.scm
rename to runtime/queries/thrift/locals.scm
diff --git a/queries/tiger/folds.scm b/runtime/queries/tiger/folds.scm
similarity index 100%
rename from queries/tiger/folds.scm
rename to runtime/queries/tiger/folds.scm
diff --git a/queries/tiger/highlights.scm b/runtime/queries/tiger/highlights.scm
similarity index 100%
rename from queries/tiger/highlights.scm
rename to runtime/queries/tiger/highlights.scm
diff --git a/queries/tiger/indents.scm b/runtime/queries/tiger/indents.scm
similarity index 100%
rename from queries/tiger/indents.scm
rename to runtime/queries/tiger/indents.scm
diff --git a/queries/tiger/injections.scm b/runtime/queries/tiger/injections.scm
similarity index 100%
rename from queries/tiger/injections.scm
rename to runtime/queries/tiger/injections.scm
diff --git a/queries/tiger/locals.scm b/runtime/queries/tiger/locals.scm
similarity index 100%
rename from queries/tiger/locals.scm
rename to runtime/queries/tiger/locals.scm
diff --git a/queries/tlaplus/folds.scm b/runtime/queries/tlaplus/folds.scm
similarity index 100%
rename from queries/tlaplus/folds.scm
rename to runtime/queries/tlaplus/folds.scm
diff --git a/queries/tlaplus/highlights.scm b/runtime/queries/tlaplus/highlights.scm
similarity index 100%
rename from queries/tlaplus/highlights.scm
rename to runtime/queries/tlaplus/highlights.scm
diff --git a/queries/tlaplus/injections.scm b/runtime/queries/tlaplus/injections.scm
similarity index 100%
rename from queries/tlaplus/injections.scm
rename to runtime/queries/tlaplus/injections.scm
diff --git a/queries/tlaplus/locals.scm b/runtime/queries/tlaplus/locals.scm
similarity index 100%
rename from queries/tlaplus/locals.scm
rename to runtime/queries/tlaplus/locals.scm
diff --git a/queries/tmux/highlights.scm b/runtime/queries/tmux/highlights.scm
similarity index 100%
rename from queries/tmux/highlights.scm
rename to runtime/queries/tmux/highlights.scm
diff --git a/queries/tmux/injections.scm b/runtime/queries/tmux/injections.scm
similarity index 100%
rename from queries/tmux/injections.scm
rename to runtime/queries/tmux/injections.scm
diff --git a/queries/todotxt/highlights.scm b/runtime/queries/todotxt/highlights.scm
similarity index 100%
rename from queries/todotxt/highlights.scm
rename to runtime/queries/todotxt/highlights.scm
diff --git a/queries/toml/folds.scm b/runtime/queries/toml/folds.scm
similarity index 100%
rename from queries/toml/folds.scm
rename to runtime/queries/toml/folds.scm
diff --git a/queries/toml/highlights.scm b/runtime/queries/toml/highlights.scm
similarity index 100%
rename from queries/toml/highlights.scm
rename to runtime/queries/toml/highlights.scm
diff --git a/queries/toml/indents.scm b/runtime/queries/toml/indents.scm
similarity index 100%
rename from queries/toml/indents.scm
rename to runtime/queries/toml/indents.scm
diff --git a/queries/textproto/injections.scm b/runtime/queries/toml/injections.scm
similarity index 100%
rename from queries/textproto/injections.scm
rename to runtime/queries/toml/injections.scm
diff --git a/queries/toml/locals.scm b/runtime/queries/toml/locals.scm
similarity index 100%
rename from queries/toml/locals.scm
rename to runtime/queries/toml/locals.scm
diff --git a/queries/tsv/highlights.scm b/runtime/queries/tsv/highlights.scm
similarity index 100%
rename from queries/tsv/highlights.scm
rename to runtime/queries/tsv/highlights.scm
diff --git a/queries/tsx/folds.scm b/runtime/queries/tsx/folds.scm
similarity index 100%
rename from queries/tsx/folds.scm
rename to runtime/queries/tsx/folds.scm
diff --git a/queries/tsx/highlights.scm b/runtime/queries/tsx/highlights.scm
similarity index 100%
rename from queries/tsx/highlights.scm
rename to runtime/queries/tsx/highlights.scm
diff --git a/queries/tsx/indents.scm b/runtime/queries/tsx/indents.scm
similarity index 100%
rename from queries/tsx/indents.scm
rename to runtime/queries/tsx/indents.scm
diff --git a/queries/tsx/injections.scm b/runtime/queries/tsx/injections.scm
similarity index 100%
rename from queries/tsx/injections.scm
rename to runtime/queries/tsx/injections.scm
diff --git a/queries/tsx/locals.scm b/runtime/queries/tsx/locals.scm
similarity index 100%
rename from queries/tsx/locals.scm
rename to runtime/queries/tsx/locals.scm
diff --git a/queries/turtle/folds.scm b/runtime/queries/turtle/folds.scm
similarity index 100%
rename from queries/turtle/folds.scm
rename to runtime/queries/turtle/folds.scm
diff --git a/queries/turtle/highlights.scm b/runtime/queries/turtle/highlights.scm
similarity index 100%
rename from queries/turtle/highlights.scm
rename to runtime/queries/turtle/highlights.scm
diff --git a/queries/turtle/indents.scm b/runtime/queries/turtle/indents.scm
similarity index 100%
rename from queries/turtle/indents.scm
rename to runtime/queries/turtle/indents.scm
diff --git a/queries/thrift/injections.scm b/runtime/queries/turtle/injections.scm
similarity index 100%
rename from queries/thrift/injections.scm
rename to runtime/queries/turtle/injections.scm
diff --git a/queries/turtle/locals.scm b/runtime/queries/turtle/locals.scm
similarity index 100%
rename from queries/turtle/locals.scm
rename to runtime/queries/turtle/locals.scm
diff --git a/queries/twig/highlights.scm b/runtime/queries/twig/highlights.scm
similarity index 100%
rename from queries/twig/highlights.scm
rename to runtime/queries/twig/highlights.scm
diff --git a/queries/twig/injections.scm b/runtime/queries/twig/injections.scm
similarity index 100%
rename from queries/twig/injections.scm
rename to runtime/queries/twig/injections.scm
diff --git a/queries/typescript/folds.scm b/runtime/queries/typescript/folds.scm
similarity index 100%
rename from queries/typescript/folds.scm
rename to runtime/queries/typescript/folds.scm
diff --git a/queries/typescript/highlights.scm b/runtime/queries/typescript/highlights.scm
similarity index 100%
rename from queries/typescript/highlights.scm
rename to runtime/queries/typescript/highlights.scm
diff --git a/queries/typescript/indents.scm b/runtime/queries/typescript/indents.scm
similarity index 100%
rename from queries/typescript/indents.scm
rename to runtime/queries/typescript/indents.scm
diff --git a/queries/typescript/injections.scm b/runtime/queries/typescript/injections.scm
similarity index 100%
rename from queries/typescript/injections.scm
rename to runtime/queries/typescript/injections.scm
diff --git a/queries/typescript/locals.scm b/runtime/queries/typescript/locals.scm
similarity index 100%
rename from queries/typescript/locals.scm
rename to runtime/queries/typescript/locals.scm
diff --git a/queries/typespec/highlights.scm b/runtime/queries/typespec/highlights.scm
similarity index 100%
rename from queries/typespec/highlights.scm
rename to runtime/queries/typespec/highlights.scm
diff --git a/queries/typespec/indents.scm b/runtime/queries/typespec/indents.scm
similarity index 100%
rename from queries/typespec/indents.scm
rename to runtime/queries/typespec/indents.scm
diff --git a/queries/typespec/injections.scm b/runtime/queries/typespec/injections.scm
similarity index 100%
rename from queries/typespec/injections.scm
rename to runtime/queries/typespec/injections.scm
diff --git a/queries/typoscript/folds.scm b/runtime/queries/typoscript/folds.scm
similarity index 100%
rename from queries/typoscript/folds.scm
rename to runtime/queries/typoscript/folds.scm
diff --git a/queries/typoscript/highlights.scm b/runtime/queries/typoscript/highlights.scm
similarity index 100%
rename from queries/typoscript/highlights.scm
rename to runtime/queries/typoscript/highlights.scm
diff --git a/queries/typoscript/indents.scm b/runtime/queries/typoscript/indents.scm
similarity index 100%
rename from queries/typoscript/indents.scm
rename to runtime/queries/typoscript/indents.scm
diff --git a/queries/toml/injections.scm b/runtime/queries/typoscript/injections.scm
similarity index 100%
rename from queries/toml/injections.scm
rename to runtime/queries/typoscript/injections.scm
diff --git a/queries/typst/folds.scm b/runtime/queries/typst/folds.scm
similarity index 100%
rename from queries/typst/folds.scm
rename to runtime/queries/typst/folds.scm
diff --git a/queries/typst/highlights.scm b/runtime/queries/typst/highlights.scm
similarity index 100%
rename from queries/typst/highlights.scm
rename to runtime/queries/typst/highlights.scm
diff --git a/queries/typst/indents.scm b/runtime/queries/typst/indents.scm
similarity index 100%
rename from queries/typst/indents.scm
rename to runtime/queries/typst/indents.scm
diff --git a/queries/turtle/injections.scm b/runtime/queries/typst/injections.scm
similarity index 100%
rename from queries/turtle/injections.scm
rename to runtime/queries/typst/injections.scm
diff --git a/queries/udev/highlights.scm b/runtime/queries/udev/highlights.scm
similarity index 100%
rename from queries/udev/highlights.scm
rename to runtime/queries/udev/highlights.scm
diff --git a/queries/udev/injections.scm b/runtime/queries/udev/injections.scm
similarity index 100%
rename from queries/udev/injections.scm
rename to runtime/queries/udev/injections.scm
diff --git a/queries/udev/locals.scm b/runtime/queries/udev/locals.scm
similarity index 100%
rename from queries/udev/locals.scm
rename to runtime/queries/udev/locals.scm
diff --git a/queries/ungrammar/folds.scm b/runtime/queries/ungrammar/folds.scm
similarity index 100%
rename from queries/ungrammar/folds.scm
rename to runtime/queries/ungrammar/folds.scm
diff --git a/queries/ungrammar/highlights.scm b/runtime/queries/ungrammar/highlights.scm
similarity index 100%
rename from queries/ungrammar/highlights.scm
rename to runtime/queries/ungrammar/highlights.scm
diff --git a/queries/ungrammar/indents.scm b/runtime/queries/ungrammar/indents.scm
similarity index 100%
rename from queries/ungrammar/indents.scm
rename to runtime/queries/ungrammar/indents.scm
diff --git a/queries/typoscript/injections.scm b/runtime/queries/ungrammar/injections.scm
similarity index 100%
rename from queries/typoscript/injections.scm
rename to runtime/queries/ungrammar/injections.scm
diff --git a/queries/ungrammar/locals.scm b/runtime/queries/ungrammar/locals.scm
similarity index 100%
rename from queries/ungrammar/locals.scm
rename to runtime/queries/ungrammar/locals.scm
diff --git a/queries/unison/folds.scm b/runtime/queries/unison/folds.scm
similarity index 100%
rename from queries/unison/folds.scm
rename to runtime/queries/unison/folds.scm
diff --git a/queries/unison/highlights.scm b/runtime/queries/unison/highlights.scm
similarity index 100%
rename from queries/unison/highlights.scm
rename to runtime/queries/unison/highlights.scm
diff --git a/queries/ungrammar/injections.scm b/runtime/queries/unison/injections.scm
similarity index 100%
rename from queries/ungrammar/injections.scm
rename to runtime/queries/unison/injections.scm
diff --git a/queries/usd/folds.scm b/runtime/queries/usd/folds.scm
similarity index 100%
rename from queries/usd/folds.scm
rename to runtime/queries/usd/folds.scm
diff --git a/queries/usd/highlights.scm b/runtime/queries/usd/highlights.scm
similarity index 100%
rename from queries/usd/highlights.scm
rename to runtime/queries/usd/highlights.scm
diff --git a/queries/usd/indents.scm b/runtime/queries/usd/indents.scm
similarity index 100%
rename from queries/usd/indents.scm
rename to runtime/queries/usd/indents.scm
diff --git a/queries/usd/injections.scm b/runtime/queries/usd/injections.scm
similarity index 100%
rename from queries/usd/injections.scm
rename to runtime/queries/usd/injections.scm
diff --git a/queries/usd/locals.scm b/runtime/queries/usd/locals.scm
similarity index 100%
rename from queries/usd/locals.scm
rename to runtime/queries/usd/locals.scm
diff --git a/queries/uxntal/folds.scm b/runtime/queries/uxntal/folds.scm
similarity index 100%
rename from queries/uxntal/folds.scm
rename to runtime/queries/uxntal/folds.scm
diff --git a/queries/uxntal/highlights.scm b/runtime/queries/uxntal/highlights.scm
similarity index 100%
rename from queries/uxntal/highlights.scm
rename to runtime/queries/uxntal/highlights.scm
diff --git a/queries/uxntal/indents.scm b/runtime/queries/uxntal/indents.scm
similarity index 100%
rename from queries/uxntal/indents.scm
rename to runtime/queries/uxntal/indents.scm
diff --git a/queries/uxntal/injections.scm b/runtime/queries/uxntal/injections.scm
similarity index 100%
rename from queries/uxntal/injections.scm
rename to runtime/queries/uxntal/injections.scm
diff --git a/queries/uxntal/locals.scm b/runtime/queries/uxntal/locals.scm
similarity index 100%
rename from queries/uxntal/locals.scm
rename to runtime/queries/uxntal/locals.scm
diff --git a/queries/v/folds.scm b/runtime/queries/v/folds.scm
similarity index 100%
rename from queries/v/folds.scm
rename to runtime/queries/v/folds.scm
diff --git a/queries/v/highlights.scm b/runtime/queries/v/highlights.scm
similarity index 100%
rename from queries/v/highlights.scm
rename to runtime/queries/v/highlights.scm
diff --git a/queries/v/indents.scm b/runtime/queries/v/indents.scm
similarity index 100%
rename from queries/v/indents.scm
rename to runtime/queries/v/indents.scm
diff --git a/queries/v/injections.scm b/runtime/queries/v/injections.scm
similarity index 100%
rename from queries/v/injections.scm
rename to runtime/queries/v/injections.scm
diff --git a/queries/v/locals.scm b/runtime/queries/v/locals.scm
similarity index 100%
rename from queries/v/locals.scm
rename to runtime/queries/v/locals.scm
diff --git a/queries/vala/folds.scm b/runtime/queries/vala/folds.scm
similarity index 100%
rename from queries/vala/folds.scm
rename to runtime/queries/vala/folds.scm
diff --git a/queries/vala/highlights.scm b/runtime/queries/vala/highlights.scm
similarity index 100%
rename from queries/vala/highlights.scm
rename to runtime/queries/vala/highlights.scm
diff --git a/queries/vala/injections.scm b/runtime/queries/vala/injections.scm
similarity index 100%
rename from queries/vala/injections.scm
rename to runtime/queries/vala/injections.scm
diff --git a/queries/vento/highlights.scm b/runtime/queries/vento/highlights.scm
similarity index 100%
rename from queries/vento/highlights.scm
rename to runtime/queries/vento/highlights.scm
diff --git a/queries/vento/injections.scm b/runtime/queries/vento/injections.scm
similarity index 100%
rename from queries/vento/injections.scm
rename to runtime/queries/vento/injections.scm
diff --git a/queries/verilog/folds.scm b/runtime/queries/verilog/folds.scm
similarity index 100%
rename from queries/verilog/folds.scm
rename to runtime/queries/verilog/folds.scm
diff --git a/queries/verilog/highlights.scm b/runtime/queries/verilog/highlights.scm
similarity index 100%
rename from queries/verilog/highlights.scm
rename to runtime/queries/verilog/highlights.scm
diff --git a/queries/vhs/injections.scm b/runtime/queries/verilog/injections.scm
similarity index 100%
rename from queries/vhs/injections.scm
rename to runtime/queries/verilog/injections.scm
diff --git a/queries/vhdl/folds.scm b/runtime/queries/vhdl/folds.scm
similarity index 100%
rename from queries/vhdl/folds.scm
rename to runtime/queries/vhdl/folds.scm
diff --git a/queries/vhdl/highlights.scm b/runtime/queries/vhdl/highlights.scm
similarity index 100%
rename from queries/vhdl/highlights.scm
rename to runtime/queries/vhdl/highlights.scm
diff --git a/queries/vhdl/injections.scm b/runtime/queries/vhdl/injections.scm
similarity index 100%
rename from queries/vhdl/injections.scm
rename to runtime/queries/vhdl/injections.scm
diff --git a/queries/vhs/highlights.scm b/runtime/queries/vhs/highlights.scm
similarity index 100%
rename from queries/vhs/highlights.scm
rename to runtime/queries/vhs/highlights.scm
diff --git a/queries/wit/injections.scm b/runtime/queries/vhs/injections.scm
similarity index 100%
rename from queries/wit/injections.scm
rename to runtime/queries/vhs/injections.scm
diff --git a/queries/vim/folds.scm b/runtime/queries/vim/folds.scm
similarity index 100%
rename from queries/vim/folds.scm
rename to runtime/queries/vim/folds.scm
diff --git a/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
similarity index 100%
rename from queries/vim/highlights.scm
rename to runtime/queries/vim/highlights.scm
diff --git a/queries/vim/injections.scm b/runtime/queries/vim/injections.scm
similarity index 100%
rename from queries/vim/injections.scm
rename to runtime/queries/vim/injections.scm
diff --git a/queries/vim/locals.scm b/runtime/queries/vim/locals.scm
similarity index 100%
rename from queries/vim/locals.scm
rename to runtime/queries/vim/locals.scm
diff --git a/queries/vimdoc/highlights.scm b/runtime/queries/vimdoc/highlights.scm
similarity index 100%
rename from queries/vimdoc/highlights.scm
rename to runtime/queries/vimdoc/highlights.scm
diff --git a/queries/vimdoc/injections.scm b/runtime/queries/vimdoc/injections.scm
similarity index 100%
rename from queries/vimdoc/injections.scm
rename to runtime/queries/vimdoc/injections.scm
diff --git a/queries/vrl/folds.scm b/runtime/queries/vrl/folds.scm
similarity index 100%
rename from queries/vrl/folds.scm
rename to runtime/queries/vrl/folds.scm
diff --git a/queries/vrl/highlights.scm b/runtime/queries/vrl/highlights.scm
similarity index 100%
rename from queries/vrl/highlights.scm
rename to runtime/queries/vrl/highlights.scm
diff --git a/queries/vrl/indents.scm b/runtime/queries/vrl/indents.scm
similarity index 100%
rename from queries/vrl/indents.scm
rename to runtime/queries/vrl/indents.scm
diff --git a/queries/vrl/injections.scm b/runtime/queries/vrl/injections.scm
similarity index 100%
rename from queries/vrl/injections.scm
rename to runtime/queries/vrl/injections.scm
diff --git a/queries/vrl/locals.scm b/runtime/queries/vrl/locals.scm
similarity index 100%
rename from queries/vrl/locals.scm
rename to runtime/queries/vrl/locals.scm
diff --git a/queries/vue/folds.scm b/runtime/queries/vue/folds.scm
similarity index 100%
rename from queries/vue/folds.scm
rename to runtime/queries/vue/folds.scm
diff --git a/queries/vue/highlights.scm b/runtime/queries/vue/highlights.scm
similarity index 100%
rename from queries/vue/highlights.scm
rename to runtime/queries/vue/highlights.scm
diff --git a/queries/vue/indents.scm b/runtime/queries/vue/indents.scm
similarity index 100%
rename from queries/vue/indents.scm
rename to runtime/queries/vue/indents.scm
diff --git a/queries/vue/injections.scm b/runtime/queries/vue/injections.scm
similarity index 100%
rename from queries/vue/injections.scm
rename to runtime/queries/vue/injections.scm
diff --git a/queries/wgsl/folds.scm b/runtime/queries/wgsl/folds.scm
similarity index 100%
rename from queries/wgsl/folds.scm
rename to runtime/queries/wgsl/folds.scm
diff --git a/queries/wgsl/highlights.scm b/runtime/queries/wgsl/highlights.scm
similarity index 100%
rename from queries/wgsl/highlights.scm
rename to runtime/queries/wgsl/highlights.scm
diff --git a/queries/wgsl/indents.scm b/runtime/queries/wgsl/indents.scm
similarity index 100%
rename from queries/wgsl/indents.scm
rename to runtime/queries/wgsl/indents.scm
diff --git a/queries/wgsl/injections.scm b/runtime/queries/wgsl/injections.scm
similarity index 100%
rename from queries/wgsl/injections.scm
rename to runtime/queries/wgsl/injections.scm
diff --git a/queries/wgsl_bevy/folds.scm b/runtime/queries/wgsl_bevy/folds.scm
similarity index 100%
rename from queries/wgsl_bevy/folds.scm
rename to runtime/queries/wgsl_bevy/folds.scm
diff --git a/queries/wgsl_bevy/highlights.scm b/runtime/queries/wgsl_bevy/highlights.scm
similarity index 100%
rename from queries/wgsl_bevy/highlights.scm
rename to runtime/queries/wgsl_bevy/highlights.scm
diff --git a/queries/wgsl_bevy/indents.scm b/runtime/queries/wgsl_bevy/indents.scm
similarity index 100%
rename from queries/wgsl_bevy/indents.scm
rename to runtime/queries/wgsl_bevy/indents.scm
diff --git a/queries/wing/folds.scm b/runtime/queries/wing/folds.scm
similarity index 100%
rename from queries/wing/folds.scm
rename to runtime/queries/wing/folds.scm
diff --git a/queries/wing/highlights.scm b/runtime/queries/wing/highlights.scm
similarity index 100%
rename from queries/wing/highlights.scm
rename to runtime/queries/wing/highlights.scm
diff --git a/queries/wing/injections.scm b/runtime/queries/wing/injections.scm
similarity index 100%
rename from queries/wing/injections.scm
rename to runtime/queries/wing/injections.scm
diff --git a/queries/wing/locals.scm b/runtime/queries/wing/locals.scm
similarity index 100%
rename from queries/wing/locals.scm
rename to runtime/queries/wing/locals.scm
diff --git a/queries/wit/folds.scm b/runtime/queries/wit/folds.scm
similarity index 100%
rename from queries/wit/folds.scm
rename to runtime/queries/wit/folds.scm
diff --git a/queries/wit/highlights.scm b/runtime/queries/wit/highlights.scm
similarity index 100%
rename from queries/wit/highlights.scm
rename to runtime/queries/wit/highlights.scm
diff --git a/queries/xcompose/injections.scm b/runtime/queries/wit/injections.scm
similarity index 100%
rename from queries/xcompose/injections.scm
rename to runtime/queries/wit/injections.scm
diff --git a/queries/xcompose/highlights.scm b/runtime/queries/xcompose/highlights.scm
similarity index 100%
rename from queries/xcompose/highlights.scm
rename to runtime/queries/xcompose/highlights.scm
diff --git a/queries/typst/injections.scm b/runtime/queries/xcompose/injections.scm
similarity index 50%
rename from queries/typst/injections.scm
rename to runtime/queries/xcompose/injections.scm
index 344c6a308..2f0e58eb6 100644
--- a/queries/typst/injections.scm
+++ b/runtime/queries/xcompose/injections.scm
@@ -1,6 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-
-(raw_blck
-  (ident) @injection.language
-  (blob) @injection.content)
diff --git a/queries/xcompose/locals.scm b/runtime/queries/xcompose/locals.scm
similarity index 100%
rename from queries/xcompose/locals.scm
rename to runtime/queries/xcompose/locals.scm
diff --git a/queries/xml/folds.scm b/runtime/queries/xml/folds.scm
similarity index 100%
rename from queries/xml/folds.scm
rename to runtime/queries/xml/folds.scm
diff --git a/queries/xml/highlights.scm b/runtime/queries/xml/highlights.scm
similarity index 100%
rename from queries/xml/highlights.scm
rename to runtime/queries/xml/highlights.scm
diff --git a/queries/xml/indents.scm b/runtime/queries/xml/indents.scm
similarity index 100%
rename from queries/xml/indents.scm
rename to runtime/queries/xml/indents.scm
diff --git a/queries/xml/injections.scm b/runtime/queries/xml/injections.scm
similarity index 100%
rename from queries/xml/injections.scm
rename to runtime/queries/xml/injections.scm
diff --git a/queries/xml/locals.scm b/runtime/queries/xml/locals.scm
similarity index 100%
rename from queries/xml/locals.scm
rename to runtime/queries/xml/locals.scm
diff --git a/queries/xresources/folds.scm b/runtime/queries/xresources/folds.scm
similarity index 100%
rename from queries/xresources/folds.scm
rename to runtime/queries/xresources/folds.scm
diff --git a/queries/xresources/highlights.scm b/runtime/queries/xresources/highlights.scm
similarity index 100%
rename from queries/xresources/highlights.scm
rename to runtime/queries/xresources/highlights.scm
diff --git a/queries/xresources/injections.scm b/runtime/queries/xresources/injections.scm
similarity index 100%
rename from queries/xresources/injections.scm
rename to runtime/queries/xresources/injections.scm
diff --git a/queries/xresources/locals.scm b/runtime/queries/xresources/locals.scm
similarity index 100%
rename from queries/xresources/locals.scm
rename to runtime/queries/xresources/locals.scm
diff --git a/queries/yaml/folds.scm b/runtime/queries/yaml/folds.scm
similarity index 100%
rename from queries/yaml/folds.scm
rename to runtime/queries/yaml/folds.scm
diff --git a/queries/yaml/highlights.scm b/runtime/queries/yaml/highlights.scm
similarity index 100%
rename from queries/yaml/highlights.scm
rename to runtime/queries/yaml/highlights.scm
diff --git a/queries/yaml/indents.scm b/runtime/queries/yaml/indents.scm
similarity index 100%
rename from queries/yaml/indents.scm
rename to runtime/queries/yaml/indents.scm
diff --git a/queries/yaml/injections.scm b/runtime/queries/yaml/injections.scm
similarity index 100%
rename from queries/yaml/injections.scm
rename to runtime/queries/yaml/injections.scm
diff --git a/queries/yaml/locals.scm b/runtime/queries/yaml/locals.scm
similarity index 100%
rename from queries/yaml/locals.scm
rename to runtime/queries/yaml/locals.scm
diff --git a/queries/yang/folds.scm b/runtime/queries/yang/folds.scm
similarity index 100%
rename from queries/yang/folds.scm
rename to runtime/queries/yang/folds.scm
diff --git a/queries/yang/highlights.scm b/runtime/queries/yang/highlights.scm
similarity index 100%
rename from queries/yang/highlights.scm
rename to runtime/queries/yang/highlights.scm
diff --git a/queries/yang/indents.scm b/runtime/queries/yang/indents.scm
similarity index 100%
rename from queries/yang/indents.scm
rename to runtime/queries/yang/indents.scm
diff --git a/queries/yang/injections.scm b/runtime/queries/yang/injections.scm
similarity index 100%
rename from queries/yang/injections.scm
rename to runtime/queries/yang/injections.scm
diff --git a/queries/yuck/folds.scm b/runtime/queries/yuck/folds.scm
similarity index 100%
rename from queries/yuck/folds.scm
rename to runtime/queries/yuck/folds.scm
diff --git a/queries/yuck/highlights.scm b/runtime/queries/yuck/highlights.scm
similarity index 100%
rename from queries/yuck/highlights.scm
rename to runtime/queries/yuck/highlights.scm
diff --git a/queries/yuck/indents.scm b/runtime/queries/yuck/indents.scm
similarity index 100%
rename from queries/yuck/indents.scm
rename to runtime/queries/yuck/indents.scm
diff --git a/queries/yuck/injections.scm b/runtime/queries/yuck/injections.scm
similarity index 100%
rename from queries/yuck/injections.scm
rename to runtime/queries/yuck/injections.scm
diff --git a/queries/yuck/locals.scm b/runtime/queries/yuck/locals.scm
similarity index 100%
rename from queries/yuck/locals.scm
rename to runtime/queries/yuck/locals.scm
diff --git a/queries/zathurarc/highlights.scm b/runtime/queries/zathurarc/highlights.scm
similarity index 100%
rename from queries/zathurarc/highlights.scm
rename to runtime/queries/zathurarc/highlights.scm
diff --git a/queries/zathurarc/injections.scm b/runtime/queries/zathurarc/injections.scm
similarity index 100%
rename from queries/zathurarc/injections.scm
rename to runtime/queries/zathurarc/injections.scm
diff --git a/queries/zig/folds.scm b/runtime/queries/zig/folds.scm
similarity index 100%
rename from queries/zig/folds.scm
rename to runtime/queries/zig/folds.scm
diff --git a/queries/zig/highlights.scm b/runtime/queries/zig/highlights.scm
similarity index 100%
rename from queries/zig/highlights.scm
rename to runtime/queries/zig/highlights.scm
diff --git a/queries/zig/indents.scm b/runtime/queries/zig/indents.scm
similarity index 100%
rename from queries/zig/indents.scm
rename to runtime/queries/zig/indents.scm
diff --git a/queries/zig/injections.scm b/runtime/queries/zig/injections.scm
similarity index 100%
rename from queries/zig/injections.scm
rename to runtime/queries/zig/injections.scm
diff --git a/queries/zig/locals.scm b/runtime/queries/zig/locals.scm
similarity index 100%
rename from queries/zig/locals.scm
rename to runtime/queries/zig/locals.scm
diff --git a/queries/ziggy/highlights.scm b/runtime/queries/ziggy/highlights.scm
similarity index 100%
rename from queries/ziggy/highlights.scm
rename to runtime/queries/ziggy/highlights.scm
diff --git a/queries/ziggy/indents.scm b/runtime/queries/ziggy/indents.scm
similarity index 100%
rename from queries/ziggy/indents.scm
rename to runtime/queries/ziggy/indents.scm
diff --git a/queries/ziggy_schema/highlights.scm b/runtime/queries/ziggy_schema/highlights.scm
similarity index 100%
rename from queries/ziggy_schema/highlights.scm
rename to runtime/queries/ziggy_schema/highlights.scm
diff --git a/queries/ziggy_schema/indents.scm b/runtime/queries/ziggy_schema/indents.scm
similarity index 100%
rename from queries/ziggy_schema/indents.scm
rename to runtime/queries/ziggy_schema/indents.scm
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index f3b45ea1a..f5d6d463b 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -1,36 +1,35 @@
 #!/usr/bin/env -S nvim -l
-vim.opt.rtp:prepend "./"
+vim.opt.runtimepath:append('.')
 
 -- Equivalent to print(), but this will ensure consistent output regardless of
 -- operating system.
 local function io_print(text)
   if not text then
-    text = ""
+    text = ''
   end
-  io.write(text, "\n")
+  io.write(text, '\n')
 end
 
 local function extract_captures()
-  local lines = vim.fn.readfile "CONTRIBUTING.md"
   local captures = {}
   local current_query
 
-  for _, line in ipairs(lines) do
-    if vim.startswith(line, "### ") then
-      current_query = vim.fn.tolower(line:sub(5))
-    elseif vim.startswith(line, "@") and current_query then
+  for line in io.lines('CONTRIBUTING.md') do
+    if vim.startswith(line, '### ') then
+      current_query = line:sub(5):lower()
+    elseif vim.startswith(line, '@') and current_query then
       if not captures[current_query] then
         captures[current_query] = {}
       end
 
-      table.insert(captures[current_query], vim.split(line:sub(2), " ", true)[1])
+      table.insert(captures[current_query], vim.split(line:sub(2), ' ', true)[1])
     end
   end
 
   -- Complete captures for injections.
-  local parsers = vim.tbl_keys(require("nvim-treesitter.parsers").list)
+  local parsers = vim.tbl_keys(require('nvim-treesitter.parsers').configs)
   for _, lang in pairs(parsers) do
-    table.insert(captures["injections"], lang)
+    table.insert(captures['injections'], lang)
   end
 
   return captures
@@ -38,36 +37,38 @@ end
 
 local function do_check()
   local timings = {}
-  local queries = require "nvim-treesitter.query"
-  local parsers = #_G.arg > 0 and { unpack(_G.arg) } or require("nvim-treesitter.info").installed_parsers()
-  local query_types = queries.built_in_query_groups
+  local parsers = require('nvim-treesitter.config').installed_parsers()
+  local query_types = require('nvim-treesitter.health').bundled_queries
 
   local captures = extract_captures()
   local errors = {}
 
-  io_print "::group::Check parsers"
+  io_print('::group::Check parsers')
 
   for _, lang in pairs(parsers) do
     timings[lang] = {}
     for _, query_type in pairs(query_types) do
       local before = vim.loop.hrtime()
-      local ok, query = pcall(queries.get_query, lang, query_type)
+      local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
       local after = vim.loop.hrtime()
       local duration = after - before
       table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
-      io_print("Checking " .. lang .. " " .. query_type .. string.format(" (%.02fms)", duration * 1e-6))
+      io_print(
+        'Checking ' .. lang .. ' ' .. query_type .. string.format(' (%.02fms)', duration * 1e-6)
+      )
       if not ok then
-        local err_msg = lang .. " (" .. query_type .. "): " .. query
+        local err_msg = lang .. ' (' .. query_type .. '): ' .. query
         errors[#errors + 1] = err_msg
       else
         if query then
           for _, capture in ipairs(query.captures) do
             local is_valid = (
-              vim.startswith(capture, "_") -- Helpers.
-              or vim.tbl_contains(captures[query_type], capture)
+              vim.startswith(capture, '_') -- Helpers.
+              or vim.list_contains(captures[query_type], capture)
             )
             if not is_valid then
-              local error = string.format("(x) Invalid capture @%s in %s for %s.", capture, query_type, lang)
+              local error =
+                string.format('(x) Invalid capture @%s in %s for %s.', capture, query_type, lang)
               errors[#errors + 1] = error
             end
           end
@@ -76,10 +77,10 @@ local function do_check()
     end
   end
 
-  io_print "::endgroup::"
+  io_print('::endgroup::')
 
   if #errors > 0 then
-    io_print "\nCheck failed!\nErrors:"
+    io_print('\nCheck failed!\nErrors:')
     for _, err in ipairs(errors) do
       print(err)
     end
@@ -89,35 +90,42 @@ local function do_check()
 end
 
 local ok, result = pcall(do_check)
-local allowed_to_fail = vim.split(vim.env.ALLOWED_INSTALLATION_FAILURES or "", ",", true)
+local allowed_to_fail = vim.split(vim.env.ALLOWED_INSTALLATION_FAILURES or '', ',', true)
 
-for k, v in pairs(require("nvim-treesitter.parsers").get_parser_configs()) do
-  if not require("nvim-treesitter.parsers").has_parser(k) then
+for k, v in pairs(require('nvim-treesitter.parsers').configs) do
+  if #vim.api.nvim_get_runtime_file('parser/' .. k .. '.*', false) == 0 then
     -- On CI all parsers that can be installed from C files should be installed
     if
       vim.env.CI
       and not v.install_info.requires_generate_from_grammar
-      and not vim.tbl_contains(allowed_to_fail, k)
+      and not vim.list_contains(allowed_to_fail, k)
     then
-      io_print("Error: parser for " .. k .. " is not installed")
-      vim.cmd "cq"
+      io_print('Error: parser for ' .. k .. ' is not installed')
+      vim.cmd('cq')
     else
-      io_print("Warning: parser for " .. k .. " is not installed")
+      io_print('Warning: parser for ' .. k .. ' is not installed')
     end
   end
 end
 
 if ok then
-  io_print "::group::Timings"
+  io_print('::group::Timings')
   table.sort(result, function(a, b)
     return a.duration < b.duration
   end)
   for i, val in ipairs(result) do
-    io_print(string.format("%i. %.02fms %s %s", #result - i + 1, val.duration * 1e-6, val.lang, val.query_type))
+    io_print(
+      string.format(
+        '%i. %.02fms %s %s',
+        #result - i + 1,
+        val.duration * 1e-6,
+        val.lang,
+        val.query_type
+      )
+    )
   end
-  io_print "::endgroup::"
-  io_print "Check successful!"
-  vim.cmd "q"
+  io_print('::endgroup::')
+  io_print('Check successful!')
 else
-  vim.cmd "cq"
+  vim.cmd('cq')
 end
diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
index 5ab8887de..100cfde27 100755
--- a/scripts/ci-install.sh
+++ b/scripts/ci-install.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+NVIM_TAG=${NVIM_TAG-nightly}
+
 os=$(uname -s)
 if [[ $os == Linux ]]; then
   wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux-x86_64.tar.gz
@@ -18,7 +20,7 @@ elif [[ $os == Darwin ]]; then
   mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
   ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
 else
-  curl -L https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip -o nvim-win64.zip
+  curl -L "https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip" -o nvim-win64.zip
   unzip nvim-win64
   mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start
   mkdir -p ~/AppData/Local/nvim-data
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 0839760d2..8639daf2b 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -6,16 +6,16 @@ local get_node_text = ts.get_node_text
 ---@type string[]
 local files
 
-local arg = _G.arg[1] or "."
-if arg:match ".*%.scm$" then
+local arg = _G.arg[1] or '.'
+if arg:match('.*%.scm$') then
   files = { arg }
 else
-  files = vim.fn.split(vim.fn.glob(arg .. "/**/*.scm"))
+  files = vim.fn.split(vim.fn.glob(arg .. '/**/*.scm'))
 end
 
-ts.query.add_predicate("kind-eq?", function(match, _, _, pred)
+ts.query.add_predicate('kind-eq?', function(match, _, _, pred)
   local cap = match[pred[2]]
-  local node = type(cap) == "table" and cap[1] or cap
+  local node = type(cap) == 'table' and cap[1] or cap
   if not node then
     return true
   end
@@ -24,9 +24,9 @@ ts.query.add_predicate("kind-eq?", function(match, _, _, pred)
   return vim.tbl_contains(types, node:type())
 end, true)
 
-ts.query.add_predicate("is-start-of-line?", function(match, _, _, pred)
+ts.query.add_predicate('is-start-of-line?', function(match, _, _, pred)
   local cap = match[pred[2]]
-  local node = type(cap) == "table" and cap[1] or cap
+  local node = type(cap) == 'table' and cap[1] or cap
   if not node then
     return true
   end
@@ -35,7 +35,7 @@ ts.query.add_predicate("is-start-of-line?", function(match, _, _, pred)
 end)
 
 --- Control the indent here. Change to \t if uses tab instead
-local indent_str = "  "
+local indent_str = '  '
 local indent_width_plus_one = 3
 local textwidth = 100
 
@@ -328,7 +328,7 @@ local function append_lines(lines, lines_to_append)
   for i = 1, #lines_to_append, 1 do
     lines[#lines] = lines[#lines] .. lines_to_append[i]
     if i ~= #lines_to_append then
-      lines[#lines + 1] = ""
+      lines[#lines + 1] = ''
     end
   end
 end
@@ -347,16 +347,17 @@ local function iter(bufnr, node, lines, q, level)
       apply_newline = false
       lines[#lines + 1] = string.rep(indent_str, level)
     end
-    if q["format.ignore"][id] then
-      local text = vim.split(get_node_text(child, bufnr):gsub("\r\n?", "\n"), "\n", { trimempty = true })
+    if q['format.ignore'][id] then
+      local text =
+        vim.split(get_node_text(child, bufnr):gsub('\r\n?', '\n'), '\n', { trimempty = true })
       append_lines(lines, text)
-    elseif not q["format.remove"][id] then
-      if not q["format.cancel-prepend"][id] then
-        if q["format.prepend-newline"][id] then
+    elseif not q['format.remove'][id] then
+      if not q['format.cancel-prepend'][id] then
+        if q['format.prepend-newline'][id] then
           lines[#lines + 1] = string.rep(indent_str, level)
-        elseif q["format.prepend-space"][id] then
-          if not q["format.prepend-space"][id]["conditional-newline"] then
-            lines[#lines] = lines[#lines] .. " "
+        elseif q['format.prepend-space'][id] then
+          if not q['format.prepend-space'][id]['conditional-newline'] then
+            lines[#lines] = lines[#lines] .. ' '
           elseif child:byte_length() + 1 + #lines[#lines] > textwidth then
             lines[#lines + 1] = string.rep(indent_str, level)
           else
@@ -365,43 +366,47 @@ local function iter(bufnr, node, lines, q, level)
             local _, _, byte_start = child:start()
             local _, _, byte_end = node:end_()
             if
-              q["format.prepend-space"][id]["lookahead-newline"]
+              q['format.prepend-space'][id]['lookahead-newline']
               and (byte_end - byte_start) + #lines[#lines] > textwidth
             then
               lines[#lines + 1] = string.rep(indent_str, level)
             else
-              lines[#lines] = lines[#lines] .. " "
+              lines[#lines] = lines[#lines] .. ' '
             end
           end
         end
       end
-      if q["format.replace"][id] then
-        append_lines(lines, vim.split(q["format.replace"][id].text, "\n", { trimempty = true }))
+      if q['format.replace'][id] then
+        append_lines(lines, vim.split(q['format.replace'][id].text, '\n', { trimempty = true }))
       elseif
         child:named_child_count() == 0
         -- Workaround to preserve string content
-        or child:type() == "string"
+        or child:type() == 'string'
       then
         append_lines(
           lines,
-          vim.split(string.gsub(get_node_text(child, bufnr), "\r\n?", "\n"), "\n+", { trimempty = true })
+          vim.split(
+            string.gsub(get_node_text(child, bufnr), '\r\n?', '\n'),
+            '\n+',
+            { trimempty = true }
+          )
         )
       else
         iter(bufnr, child, lines, q, level)
       end
-      if q["format.indent.begin"][id] then
+      if q['format.indent.begin'][id] then
         level = level + 1
         apply_newline = true
-      elseif q["format.indent.dedent"][id] then
+      elseif q['format.indent.dedent'][id] then
         lines[#lines] = string.sub(lines[#lines], indent_width_plus_one)
       end
     end
-    if q["format.cancel-append"][id] then
+    if q['format.cancel-append'][id] then
       apply_newline = false
-    elseif q["format.append-newline"][id] then
+    elseif q['format.append-newline'][id] then
       apply_newline = true
-    elseif q["format.append-space"][id] then
-      lines[#lines] = lines[#lines] .. " "
+    elseif q['format.append-space'][id] then
+      lines[#lines] = lines[#lines] .. ' '
     end
   end
 end
@@ -409,7 +414,7 @@ end
 ---@param bufnr integer
 ---@param queries string
 local function format(bufnr, queries)
-  local lines = { "" }
+  local lines = { '' }
   -- stylua: ignore
   local map = {
     ['format.ignore'] = {},           -- Ignore the node and its children
@@ -424,11 +429,12 @@ local function format(bufnr, queries)
     ['format.replace'] = {},          -- Dedicated capture used to store results of `(#gsub!)`
     ['format.remove'] = {},           -- Do not add the syntax node to the result, i.e. brackets [], parens ()
   }
-  local root = ts.get_parser(bufnr, "query"):parse(true)[1]:root()
-  local query = ts.query.parse("query", queries)
+  local root = ts.get_parser(bufnr, 'query'):parse(true)[1]:root()
+  local query = ts.query.parse('query', queries)
   for id, node, metadata in query:iter_captures(root, bufnr) do
-    if query.captures[id]:sub(1, 1) ~= "_" then
-      map[query.captures[id]][node:id()] = metadata and (metadata[id] and metadata[id] or metadata) or {}
+    if query.captures[id]:sub(1, 1) ~= '_' then
+      map[query.captures[id]][node:id()] = metadata and (metadata[id] and metadata[id] or metadata)
+        or {}
     end
   end
 
@@ -443,4 +449,4 @@ for _, file in ipairs(files) do
   format(buf, format_queries)
 end
 
-vim.cmd "silent wa!"
+vim.cmd('silent wa!')
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index f7a7ee590..c826ddbf2 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -1,25 +1,25 @@
-vim.opt.runtimepath:append "."
-vim.cmd.runtime { "plugin/plenary.vim", bang = true }
-vim.cmd.runtime { "plugin/nvim-treesitter.lua", bang = true }
+vim.opt.runtimepath:append('.')
+vim.cmd.runtime({ 'plugin/plenary.vim', bang = true })
+vim.cmd.runtime({ 'plugin/nvim-treesitter.lua', bang = true })
+vim.cmd.runtime({ 'plugin/query_predicates.lua', bang = true })
 
-vim.filetype.add {
+vim.filetype.add({
   extension = {
-    conf = "hocon",
-    cmm = "t32",
-    hurl = "hurl",
-    ncl = "nickel",
-    tig = "tiger",
-    usd = "usd",
-    usda = "usd",
-    wgsl = "wgsl",
-    w = "wing",
+    conf = 'hocon',
+    cmm = 't32',
+    ncl = 'nickel',
+    tig = 'tiger',
+    w = 'wing',
   },
-}
+})
 
 vim.o.swapfile = false
 vim.bo.swapfile = false
 
-require("nvim-treesitter.configs").setup {
-  indent = { enable = true },
-  highlight = { enable = true },
-}
+require('nvim-treesitter').setup()
+vim.api.nvim_create_autocmd('FileType', {
+  callback = function(args)
+    pcall(vim.treesitter.start)
+    vim.bo[args.buffer].indentexpr = 'v:lua.require"nvim-treesitter".indentexpr()'
+  end,
+})
diff --git a/scripts/update-lockfile.sh b/scripts/update-lockfile.sh
index 22460d14b..d950b321a 100755
--- a/scripts/update-lockfile.sh
+++ b/scripts/update-lockfile.sh
@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
 
 make_ignored() {
-  if [[ -n $1 ]]; then
+  if [ -n "$1" ]
+  then
     while read -r lang; do
-      if [[ $lang != "$1" ]]; then
-        printf '%s,' "$lang"
+      if [ "$lang" != "$1" ]
+      then
+        printf "%s," "$lang"
       fi
-    done < <(jq -r 'keys[]' lockfile.json)
+    done < <(jq 'keys|@sh' -c lockfile.json)
   fi
 }
 
-SKIP_LOCKFILE_UPDATE_FOR_LANGS="$(make_ignored "$1")" \
-  nvim --headless -c 'luafile ./scripts/write-lockfile.lua' +q
+TO_IGNORE=$(make_ignored $1)
 
+SKIP_LOCKFILE_UPDATE_FOR_LANGS="$TO_IGNORE" nvim -l ./scripts/write-lockfile.lua
 # Pretty print
 cp lockfile.json /tmp/lockfile.json
-jq --sort-keys > lockfile.json < /tmp/lockfile.json
+cat /tmp/lockfile.json | jq --sort-keys > lockfile.json
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 251a64af4..825d84037 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -1,59 +1,85 @@
 #!/usr/bin/env -S nvim -l
+vim.opt.runtimepath:append('.')
 
 ---@class Parser
 ---@field name string
 ---@field parser ParserInfo
 
-local parsers = require("nvim-treesitter.parsers").get_parser_configs()
+local parsers = require('nvim-treesitter.parsers').configs
 local sorted_parsers = {}
-
 for k, v in pairs(parsers) do
   table.insert(sorted_parsers, { name = k, parser = v })
 end
-
----@param a Parser
----@param b Parser
 table.sort(sorted_parsers, function(a, b)
   return a.name < b.name
 end)
 
-local generated_text = ""
+local tiers = require('nvim-treesitter.parsers').tiers
+
+local generated_text = [[
+Language | Tier | Queries | CLI | NPM | Maintainer
+-------- |:----:|:-------:|:---:|:---:| ----------
+]]
+local footnotes = ''
 
----@param v Parser
 for _, v in ipairs(sorted_parsers) do
-  local link = "[" .. (v.parser.readme_name or v.name) .. "](" .. v.parser.install_info.url .. ")"
-
-  if v.parser.maintainers then
-    generated_text = generated_text
-      .. "- [x] "
-      .. link
-      .. " ("
-      .. (v.parser.experimental and "experimental, " or "")
-      .. "maintained by "
-      .. table.concat(v.parser.maintainers, ", ")
-      .. ")\n"
-  else
-    generated_text = generated_text .. "- [ ] " .. link .. (v.parser.experimental and " (experimental)" or "") .. "\n"
+  local p = v.parser
+  -- language
+  generated_text = generated_text
+    .. '['
+    .. v.name
+    .. ']('
+    .. p.install_info.url
+    .. ')'
+    .. (p.readme_note and '[^' .. v.name .. ']' or '')
+    .. ' | '
+  if p.readme_note then
+    footnotes = footnotes .. '[^' .. v.name .. ']: ' .. p.readme_note .. '\n'
   end
+
+  -- tier
+  generated_text = generated_text .. (p.tier and tiers[p.tier] or '') .. ' | '
+
+  -- queries
+  generated_text = generated_text
+    .. '`'
+    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/highlights.scm') and 'H' or ' ')
+    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/folds.scm') and 'F' or ' ')
+    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/indents.scm') and 'I' or ' ')
+    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/injections.scm') and 'J' or ' ')
+    .. '` | '
+
+  -- CLI
+  generated_text = generated_text
+    .. (p.install_info.requires_generate_from_grammar and '✓' or '')
+    .. ' | '
+
+  -- NPM
+  generated_text = generated_text .. (p.install_info.generate_requires_npm and '✓' or '') .. ' | '
+
+  -- Maintainer
+  generated_text = generated_text
+    .. (p.maintainers and table.concat(p.maintainers, ', ') or '')
+    .. '\n'
 end
+generated_text = generated_text .. footnotes
 
-print(generated_text)
-print "\n"
-
-local readme_text = table.concat(vim.fn.readfile "README.md", "\n")
+local readme = assert(io.open('SUPPORTED_LANGUAGES.md', 'r'))
+local readme_text = readme:read('*a')
+readme:close()
 
 local new_readme_text = string.gsub(
   readme_text,
-  "<!%-%-parserinfo%-%->.*<!%-%-parserinfo%-%->",
-  "<!--parserinfo-->\n" .. generated_text .. "<!--parserinfo-->"
+  '<!%-%-parserinfo%-%->.*<!%-%-parserinfo%-%->',
+  '<!--parserinfo-->\n' .. generated_text .. '<!--parserinfo-->'
 )
-vim.fn.writefile(vim.fn.split(new_readme_text, "\n"), "README.md")
+
+readme = assert(io.open('SUPPORTED_LANGUAGES.md', 'w'))
+readme:write(new_readme_text)
+readme:close()
 
 if string.find(readme_text, generated_text, 1, true) then
-  print "README.md is up-to-date!"
-  vim.cmd "q"
+  print('README.md is up-to-date\n')
 else
-  print "New README.md was written. Please commit that change! Old text was: "
-  print(string.sub(readme_text, string.find(readme_text, "<!%-%-parserinfo%-%->.*<!%-%-parserinfo%-%->")))
-  vim.cmd "cq"
+  print('New README.md was written\n')
 end
diff --git a/scripts/write-lockfile.lua b/scripts/write-lockfile.lua
index 7a7606c51..a264af83c 100755
--- a/scripts/write-lockfile.lua
+++ b/scripts/write-lockfile.lua
@@ -1,14 +1,52 @@
 #!/usr/bin/env -S nvim -l
+vim.opt.runtimepath:append('.')
 
----@type string|any[]
-local skip_langs = vim.fn.getenv "SKIP_LOCKFILE_UPDATE_FOR_LANGS"
+-- Load previous lockfile
+local filename = require('nvim-treesitter.utils').get_package_path('lockfile.json')
+local file = assert(io.open(filename, 'r'))
+local lockfile = vim.json.decode(file:read('*a'))
+file:close()
 
-if skip_langs == vim.NIL then
-  skip_langs = {}
-else
-  ---@diagnostic disable-next-line: param-type-mismatch
-  skip_langs = vim.fn.split(skip_langs, ",")
+---@type string?
+local skip_lang_string = os.getenv('SKIP_LOCKFILE_UPDATE_FOR_LANGS')
+local skip_langs = skip_lang_string and vim.split(skip_lang_string, ',') or {}
+vim.print('Skipping languages: ', skip_langs)
+
+local sorted_parsers = {}
+local configs = require('nvim-treesitter.parsers').configs
+for k, v in pairs(configs) do
+  table.insert(sorted_parsers, { name = k, parser = v })
 end
+table.sort(sorted_parsers, function(a, b)
+  return a.name < b.name
+end)
 
-require("nvim-treesitter.install").write_lockfile("verbose", skip_langs)
-vim.cmd "q"
+-- check for new revisions
+for _, v in ipairs(sorted_parsers) do
+  if skip_langs and not vim.list_contains(skip_langs, v.name) then
+    local sha ---@type string
+    if v.parser.install_info.branch then
+      sha = vim.split(
+        vim.fn.systemlist(
+          'git ls-remote '
+            .. v.parser.install_info.url
+            .. ' | grep refs/heads/'
+            .. v.parser.install_info.branch
+        )[1],
+        '\t'
+      )[1]
+    else
+      sha = vim.split(vim.fn.systemlist('git ls-remote ' .. v.parser.install_info.url)[1], '\t')[1]
+    end
+    lockfile[v.name] = { revision = sha }
+    print(v.name .. ': ' .. sha)
+  else
+    print('Skipping ' .. v.name)
+  end
+end
+vim.print(lockfile)
+
+-- write new lockfile
+file = assert(io.open(filename, 'w'))
+file:write(vim.json.encode(lockfile))
+file:close()
diff --git a/tests/indent/algorithm_spec.lua b/tests/indent/algorithm_spec.lua
index faf7998ec..d93521040 100644
--- a/tests/indent/algorithm_spec.lua
+++ b/tests/indent/algorithm_spec.lua
@@ -1,18 +1,34 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 -- local XFAIL = require("tests.indent.common").XFAIL
 
-local runner = Runner:new(it, "tests/indent/algorithm", {
+local runner = Runner:new(it, 'tests/indent/algorithm', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 4,
   expandtab = true,
 })
 
-describe("test indent algorithm: ", function()
-  describe("new line:", function()
-    runner:new_line("trailing.py", { on_line = 1, text = "x: str", indent = 4 }, "indent next line, ignore comment")
-    runner:new_line("trailing.py", { on_line = 4, text = "pass", indent = 8 }, "indent next line, ignore comment")
-    runner:new_line("trailing.py", { on_line = 6, text = "pass", indent = 4 }, "indent next line, ignore whitespace")
-    runner:new_line("trailing_whitespace.html", { on_line = 9, text = "x", indent = 8 }, "not ignore @indent.end")
+describe('test indent algorithm: ', function()
+  describe('new line:', function()
+    runner:new_line(
+      'trailing.py',
+      { on_line = 1, text = 'x: str', indent = 4 },
+      'indent next line, ignore comment'
+    )
+    runner:new_line(
+      'trailing.py',
+      { on_line = 4, text = 'pass', indent = 8 },
+      'indent next line, ignore comment'
+    )
+    runner:new_line(
+      'trailing.py',
+      { on_line = 6, text = 'pass', indent = 4 },
+      'indent next line, ignore whitespace'
+    )
+    runner:new_line(
+      'trailing_whitespace.html',
+      { on_line = 9, text = 'x', indent = 8 },
+      'not ignore @indent.end'
+    )
   end)
 end)
diff --git a/tests/indent/angular_spec.lua b/tests/indent/angular_spec.lua
index 2090420ce..3ead248b7 100644
--- a/tests/indent/angular_spec.lua
+++ b/tests/indent/angular_spec.lua
@@ -1,18 +1,18 @@
-local Runner = require("tests.indent.common").Runner
-local runner = Runner:new(it, "tests/indent/angular", {
+local Runner = require('tests.indent.common').Runner
+local runner = Runner:new(it, 'tests/indent/angular', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
-  filetype = "htmlangular",
+  filetype = 'htmlangular',
 })
 
-describe("indent HTML Angular:", function()
-  describe("whole file:", function()
-    runner:whole_file "."
+describe('indent HTML Angular:', function()
+  describe('whole file:', function()
+    runner:whole_file('.')
   end)
 
-  describe("new line:", function()
-    for _, info in ipairs {
+  describe('new line:', function()
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 2 },
       { 3, 2 },
@@ -25,11 +25,11 @@ describe("indent HTML Angular:", function()
       { 12, 6 },
       { 13, 4 },
       { 14, 2 },
-    } do
-      runner:new_line("if-else.html", { on_line = info[1], text = "//", indent = info[2] })
+    }) do
+      runner:new_line('if-else.html', { on_line = info[1], text = '//', indent = info[2] })
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 4 },
       { 3, 6 },
@@ -39,21 +39,21 @@ describe("indent HTML Angular:", function()
       { 9, 6 },
       { 10, 6 },
       { 12, 2 },
-    } do
-      runner:new_line("switch-case.html", { on_line = info[1], text = "//", indent = info[2] })
+    }) do
+      runner:new_line('switch-case.html', { on_line = info[1], text = '//', indent = info[2] })
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 2 },
       { 3, 2 },
       { 4, 2 },
       { 5, 0 },
-    } do
-      runner:new_line("for.html", { on_line = info[1], text = "//", indent = info[2] })
+    }) do
+      runner:new_line('for.html', { on_line = info[1], text = '//', indent = info[2] })
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 2 },
       { 3, 2 },
@@ -63,8 +63,8 @@ describe("indent HTML Angular:", function()
       { 7, 2 },
       { 8, 2 },
       { 9, 0 },
-    } do
-      runner:new_line("defer.html", { on_line = info[1], text = "//", indent = info[2] })
+    }) do
+      runner:new_line('defer.html', { on_line = info[1], text = '//', indent = info[2] })
     end
   end)
 end)
diff --git a/tests/indent/c_spec.lua b/tests/indent/c_spec.lua
index 4e2826a54..528933599 100644
--- a/tests/indent/c_spec.lua
+++ b/tests/indent/c_spec.lua
@@ -1,58 +1,63 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
 
-local runner = Runner:new(it, "tests/indent/c", {
+local runner = Runner:new(it, 'tests/indent/c', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent C:", function()
-  describe("whole file:", function()
-    runner:whole_file(".", {
+describe('indent C:', function()
+  describe('whole file:', function()
+    runner:whole_file('.', {
       expected_failures = {
-        "./preproc_func.c",
-        "./unfinished_comment.c",
+        './preproc_func.c',
+        './unfinished_comment.c',
       },
     })
   end)
 
-  describe("new line:", function()
-    runner:new_line("array.c", { on_line = 2, text = "0,", indent = 4 })
-    runner:new_line("compound_lit.c", { on_line = 7, text = ".z = 5,", indent = 8 })
-    runner:new_line("cond.c", { on_line = 3, text = "x++;", indent = 8 })
-    runner:new_line("cond.c", { on_line = 6, text = "x++;", indent = 8 })
-    runner:new_line("cond.c", { on_line = 8, text = "x++;", indent = 8 })
-    runner:new_line("cond.c", { on_line = 9, text = "x++;", indent = 4 })
-    runner:new_line("expr.c", { on_line = 10, text = "2 *", indent = 8 })
-    runner:new_line("func.c", { on_line = 17, text = "int z,", indent = 4 })
-    runner:new_line("label.c", { on_line = 3, text = "normal:", indent = 0 })
-    runner:new_line("loop.c", { on_line = 3, text = "x++;", indent = 8 })
-    runner:new_line("preproc_cond.c", { on_line = 5, text = "x++;", indent = 4 })
-    runner:new_line("preproc_func.c", { on_line = 3, text = "x++; \\", indent = 8 }, "expected failure", XFAIL)
-    runner:new_line("string.c", { on_line = 1, text = "brave new \\", indent = 0 })
-    runner:new_line("string.c", { on_line = 4, text = '"brave new "', indent = 4 })
-    runner:new_line("struct.c", { on_line = 4, text = "int y;", indent = 8 })
-    runner:new_line("switch.c", { on_line = 3, text = "x++;", indent = 12 })
-    runner:new_line("ternary.c", { on_line = 4, text = ": (x == 0) : 0", indent = 8 })
-    runner:new_line("issue-1568.c", { on_line = 4, text = "x++;", indent = 8 })
-    runner:new_line("issue-2086.c", { on_line = 3, text = "}", indent = 0 })
-    runner:new_line("issue-4079.c", { on_line = 2, text = "return;", indent = 8 })
-    runner:new_line("issue-4079.c", { on_line = 2, text = "{", indent = 4 })
-    runner:new_line("issue-4079.c", { on_line = 6, text = "{", indent = 4 })
-    runner:new_line("issue-4117.c", { on_line = 3, text = "else", indent = 4 })
+  describe('new line:', function()
+    runner:new_line('array.c', { on_line = 2, text = '0,', indent = 4 })
+    runner:new_line('compound_lit.c', { on_line = 7, text = '.z = 5,', indent = 8 })
+    runner:new_line('cond.c', { on_line = 3, text = 'x++;', indent = 8 })
+    runner:new_line('cond.c', { on_line = 6, text = 'x++;', indent = 8 })
+    runner:new_line('cond.c', { on_line = 8, text = 'x++;', indent = 8 })
+    runner:new_line('cond.c', { on_line = 9, text = 'x++;', indent = 4 })
+    runner:new_line('expr.c', { on_line = 10, text = '2 *', indent = 8 })
+    runner:new_line('func.c', { on_line = 17, text = 'int z,', indent = 4 })
+    runner:new_line('label.c', { on_line = 3, text = 'normal:', indent = 0 })
+    runner:new_line('loop.c', { on_line = 3, text = 'x++;', indent = 8 })
+    runner:new_line('preproc_cond.c', { on_line = 5, text = 'x++;', indent = 4 })
+    runner:new_line(
+      'preproc_func.c',
+      { on_line = 3, text = 'x++; \\', indent = 8 },
+      'expected failure',
+      XFAIL
+    )
+    runner:new_line('string.c', { on_line = 1, text = 'brave new \\', indent = 0 })
+    runner:new_line('string.c', { on_line = 4, text = '"brave new "', indent = 4 })
+    runner:new_line('struct.c', { on_line = 4, text = 'int y;', indent = 8 })
+    runner:new_line('switch.c', { on_line = 3, text = 'x++;', indent = 12 })
+    runner:new_line('ternary.c', { on_line = 4, text = ': (x == 0) : 0', indent = 8 })
+    runner:new_line('issue-1568.c', { on_line = 4, text = 'x++;', indent = 8 })
+    runner:new_line('issue-2086.c', { on_line = 3, text = '}', indent = 0 })
+    runner:new_line('issue-4079.c', { on_line = 2, text = 'return;', indent = 8 })
+    runner:new_line('issue-4079.c', { on_line = 2, text = '{', indent = 4 })
+    runner:new_line('issue-4079.c', { on_line = 6, text = '{', indent = 4 })
+    runner:new_line('issue-4117.c', { on_line = 3, text = 'else', indent = 4 })
     -- the line after inserted one will be left with wrong indent but we only care about the inserted one
-    for _, line in ipairs { 2, 4, 7, 10 } do
-      runner:new_line("no_braces.c", { on_line = line, text = "x++;", indent = 8 })
+    for _, line in ipairs({ 2, 4, 7, 10 }) do
+      runner:new_line('no_braces.c', { on_line = line, text = 'x++;', indent = 8 })
     end
-    for _, line in ipairs { 2, 5, 7, 10, 12, 14, 20, 22, 25, 27, 28, 33 } do
-      runner:new_line("if_else.c", { on_line = line, text = "x++;", indent = 8 })
+    for _, line in ipairs({ 2, 5, 7, 10, 12, 14, 20, 22, 25, 27, 28, 33 }) do
+      runner:new_line('if_else.c', { on_line = line, text = 'x++;', indent = 8 })
     end
-    for _, line in ipairs { 3, 6, 8, 13, 15, 20, 23 } do
-      runner:new_line("if_else.c", { on_line = line, text = "else", indent = 4 })
+    for _, line in ipairs({ 3, 6, 8, 13, 15, 20, 23 }) do
+      runner:new_line('if_else.c', { on_line = line, text = 'else', indent = 4 })
     end
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 36, 12 },
       { 37, 16 },
       { 38, 12 },
@@ -66,15 +71,15 @@ describe("indent C:", function()
       { 52, 8 },
       { 53, 12 },
       { 54, 12 },
-    } do
-      runner:new_line("if_else.c", { on_line = info[1], text = "x++;", indent = info[2] })
+    }) do
+      runner:new_line('if_else.c', { on_line = info[1], text = 'x++;', indent = info[2] })
     end
     -- dedent braces on new line
-    for _, line in ipairs { 10, 12, 14 } do
-      runner:new_line("if_else.c", { on_line = line, text = "{}", indent = 4 })
+    for _, line in ipairs({ 10, 12, 14 }) do
+      runner:new_line('if_else.c', { on_line = line, text = '{}', indent = 4 })
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 8, 0 },
       { 10, 0 },
       { 13, 4 },
@@ -86,8 +91,8 @@ describe("indent C:", function()
       { 20, 8 },
       { 21, 8 },
       { 22, 4 },
-    } do
-      runner:new_line("issue-4525.c", { on_line = info[1], text = "x++;", indent = info[2] })
+    }) do
+      runner:new_line('issue-4525.c', { on_line = info[1], text = 'x++;', indent = info[2] })
     end
   end)
 end)
diff --git a/tests/indent/capnp_spec.lua b/tests/indent/capnp_spec.lua
index 7c8418b06..d5dd8c5fd 100644
--- a/tests/indent/capnp_spec.lua
+++ b/tests/indent/capnp_spec.lua
@@ -1,30 +1,30 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/capnp", {
+local run = Runner:new(it, 'tests/indent/capnp', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
 })
 
 describe("indent Cap'n Proto:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("test.capnp", { on_line = 31, text = "foo @0;", indent = 2 })
-    run:new_line("test.capnp", { on_line = 96, text = "boolField      = true,", indent = 4 })
-    run:new_line("test.capnp", { on_line = 340, text = "grault @7 :UInt64;", indent = 8 })
-    run:new_line("test.capnp", {
+  describe('new line:', function()
+    run:new_line('test.capnp', { on_line = 31, text = 'foo @0;', indent = 2 })
+    run:new_line('test.capnp', { on_line = 96, text = 'boolField      = true,', indent = 4 })
+    run:new_line('test.capnp', { on_line = 340, text = 'grault @7 :UInt64;', indent = 8 })
+    run:new_line('test.capnp', {
       on_line = 573,
-      text = "call @0 Inner2(Text) -> (qux :Qux, gen :TestGenerics(TestAllTypes, TestAnyPointer));",
+      text = 'call @0 Inner2(Text) -> (qux :Qux, gen :TestGenerics(TestAllTypes, TestAnyPointer));',
       indent = 4,
     })
-    run:new_line("test.capnp", { on_line = 617, text = "foo @0 :Foo;", indent = 4 })
-    run:new_line("test.capnp", { on_line = 654, text = "foo = (int16Field = 123),", indent = 4 })
-    run:new_line("test.capnp", { on_line = 695, text = 'textField = "nested",', indent = 6 })
-    run:new_line("test.capnp", { on_line = 970, text = "testTailCaller @4;", indent = 4 })
+    run:new_line('test.capnp', { on_line = 617, text = 'foo @0 :Foo;', indent = 4 })
+    run:new_line('test.capnp', { on_line = 654, text = 'foo = (int16Field = 123),', indent = 4 })
+    run:new_line('test.capnp', { on_line = 695, text = 'textField = "nested",', indent = 6 })
+    run:new_line('test.capnp', { on_line = 970, text = 'testTailCaller @4;', indent = 4 })
   end)
 end)
diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index 6cfedafff..5c291070e 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -1,11 +1,11 @@
 local M = {}
 
-local assert = require "luassert"
-local say = require "say"
-local scan_dir = require("plenary.scandir").scan_dir
-local Path = require "plenary.path"
+local assert = require('luassert')
+local say = require('say')
+local scan_dir = require('plenary.scandir').scan_dir
+local Path = require('plenary.path')
 
-M.XFAIL = "xfail"
+M.XFAIL = 'xfail'
 
 local function same_indent(state, arguments)
   local before = arguments[1]
@@ -14,11 +14,11 @@ local function same_indent(state, arguments)
   local ok = true
   local errors = { before = {}, after = {} }
   for line = 1, #before do
-    if #string.match(before[line], "^%s*") ~= #string.match(after[line], "^%s*") then
+    if #string.match(before[line], '^%s*') ~= #string.match(after[line], '^%s*') then
       if before[line] and after[line] then
         -- store the actual indentation length for each line
-        errors.before[line] = #string.match(before[line], "^%s*")
-        errors.after[line] = #string.match(after[line], "^%s*")
+        errors.before[line] = #string.match(before[line], '^%s*')
+        errors.after[line] = #string.match(after[line], '^%s*')
       end
       ok = false
     end
@@ -42,39 +42,39 @@ local function format_indent(arg, fmtargs)
   end
 
   width = width + 3
-  local header_fmt = "%8s %2s%-" .. tostring(width + 1) .. "s %s"
-  local fmt = "%8s %2s |%-" .. tostring(width) .. "s |%s"
+  local header_fmt = '%8s %2s%-' .. tostring(width + 1) .. 's %s'
+  local fmt = '%8s %2s |%-' .. tostring(width) .. 's |%s'
 
-  local output = { header_fmt:format("", "", "Found:", "Expected:") }
+  local output = { header_fmt:format('', '', 'Found:', 'Expected:') }
 
   for i, line in ipairs(arg) do
     if fmtargs.errors.before[i] then
-      local indents = string.format("%d vs %d", fmtargs.errors.after[i], fmtargs.errors.before[i])
-      table.insert(output, fmt:format(indents, "=>", fmtargs.other[i], line))
+      local indents = string.format('%d vs %d', fmtargs.errors.after[i], fmtargs.errors.before[i])
+      table.insert(output, fmt:format(indents, '=>', fmtargs.other[i], line))
     else
-      table.insert(output, fmt:format("", "", fmtargs.other[i], line))
+      table.insert(output, fmt:format('', '', fmtargs.other[i], line))
     end
   end
 
-  return table.concat(output, "\n")
+  return table.concat(output, '\n')
 end
 
-say:set_namespace "en"
-say:set("assertion.same_indent.positive", "Incorrect indentation\n%s")
-say:set("assertion.same_indent.negative", "Incorrect indentation\n%s")
+say:set_namespace('en')
+say:set('assertion.same_indent.positive', 'Incorrect indentation\n%s')
+say:set('assertion.same_indent.negative', 'Incorrect indentation\n%s')
 assert:register(
-  "assertion",
-  "same_indent",
+  'assertion',
+  'same_indent',
   same_indent,
-  "assertion.same_indent.positive",
-  "assert.same_indent.negative"
+  'assertion.same_indent.positive',
+  'assert.same_indent.negative'
 )
 
 -- Custom assertion better suited for indentation diffs
 local function compare_indent(before, after, xfail)
   assert:add_formatter(format_indent)
   if xfail then
-    io.stdout:write "Warning! Known failure of this test! Please help to fix it! "
+    io.stdout:write('Warning! Known failure of this test! Please help to fix it! ')
     assert.is_not.same_indent(before, after)
   else
     assert.is.same_indent(before, after)
@@ -83,7 +83,8 @@ local function compare_indent(before, after, xfail)
 end
 
 local function set_buf_indent_opts(opts)
-  local optnames = { "tabstop", "shiftwidth", "softtabstop", "expandtab", "filetype", "lispoptions" }
+  local optnames =
+    { 'tabstop', 'shiftwidth', 'softtabstop', 'expandtab', 'filetype', 'lispoptions' }
   for _, opt in ipairs(optnames) do
     if opts[opt] ~= nil then
       vim.bo[opt] = opts[opt]
@@ -95,11 +96,11 @@ function M.run_indent_test(file, runner, opts)
   assert.are.same(1, vim.fn.filereadable(file), string.format('File "%s" not readable', file))
 
   -- load reference file
-  vim.cmd(string.format("edit %s", file))
-  vim.bo.indentexpr = "nvim_treesitter#indent()"
+  vim.cmd(string.format('edit %s', file))
+  vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
   local before = vim.api.nvim_buf_get_lines(0, 0, -1, true)
 
-  assert.are.same("nvim_treesitter#indent()", vim.bo.indentexpr)
+  assert.are.same("v:lua.require'nvim-treesitter'.indentexpr()", vim.bo.indentexpr)
   set_buf_indent_opts(opts)
 
   -- perform the test
@@ -109,14 +110,14 @@ function M.run_indent_test(file, runner, opts)
   local after = vim.api.nvim_buf_get_lines(0, 0, -1, true)
 
   -- clear any changes to avoid 'No write since last change (add ! to override)'
-  vim.cmd "edit!"
+  vim.cmd('edit!')
 
   return before, after
 end
 
 function M.indent_whole_file(file, opts, xfail)
   local before, after = M.run_indent_test(file, function()
-    vim.cmd "silent normal gg=G"
+    vim.cmd('silent normal gg=G')
   end, opts)
 
   compare_indent(before, after, xfail)
@@ -132,22 +133,24 @@ end
 function M.indent_new_line(file, spec, opts, xfail)
   local before, after = M.run_indent_test(file, function()
     -- move to the line and input the new one
-    vim.cmd(string.format("normal! %dG", spec.on_line))
-    vim.cmd(string.format("normal! o%s", spec.text))
+    vim.cmd(string.format('normal! %dG', spec.on_line))
+    vim.cmd(string.format('normal! o%s', spec.text))
   end, opts)
 
-  local indent = type(spec.indent) == "string" and spec.indent or string.rep(" ", spec.indent)
+  local indent = type(spec.indent) == 'string' and spec.indent or string.rep(' ', spec.indent)
   table.insert(before, spec.on_line + 1, indent .. spec.text)
 
   compare_indent(before, after, xfail)
 
   before, after = M.run_indent_test(file, function()
     -- move to the line and input the new one
-    vim.cmd(string.format("normal! %dG$", spec.on_line))
-    vim.cmd(string.format(vim.api.nvim_replace_termcodes("normal! a<cr>%s", true, true, true), spec.text))
+    vim.cmd(string.format('normal! %dG$', spec.on_line))
+    vim.cmd(
+      string.format(vim.api.nvim_replace_termcodes('normal! a<cr>%s', true, true, true), spec.text)
+    )
   end, opts)
 
-  indent = type(spec.indent) == "string" and spec.indent or string.rep(" ", spec.indent)
+  indent = type(spec.indent) == 'string' and spec.indent or string.rep(' ', spec.indent)
   table.insert(before, spec.on_line + 1, indent .. spec.text)
 
   compare_indent(before, after, xfail)
@@ -174,13 +177,13 @@ function Runner:whole_file(dirs, opts)
   expected_failures = vim.tbl_map(function(f)
     return Path:new(f):make_relative(self.base_dir.filename)
   end, expected_failures)
-  dirs = type(dirs) == "table" and dirs or { dirs }
+  dirs = type(dirs) == 'table' and dirs or { dirs }
   dirs = vim.tbl_map(function(dir)
     dir = self.base_dir / Path:new(dir)
     assert.is.same(1, vim.fn.isdirectory(dir.filename))
     return dir.filename
   end, dirs)
-  local files = require("nvim-treesitter.compat").flatten(vim.tbl_map(scan_dir, dirs))
+  local files = require('nvim-treesitter.compat').flatten(vim.tbl_map(scan_dir, dirs))
   for _, file in ipairs(files) do
     local relpath = Path:new(file):make_relative(self.base_dir.filename)
     self.it(relpath, function()
@@ -191,7 +194,7 @@ end
 
 function Runner:new_line(file, spec, title, xfail)
   title = title and title or tostring(spec.on_line)
-  self.it(string.format("%s[%s]", file, title), function()
+  self.it(string.format('%s[%s]', file, title), function()
     local path = self.base_dir / file
     M.indent_new_line(path.filename, spec, self.buf_opts, xfail)
   end)
diff --git a/tests/indent/cpp_spec.lua b/tests/indent/cpp_spec.lua
index 7ac69e2a6..8e97c805e 100644
--- a/tests/indent/cpp_spec.lua
+++ b/tests/indent/cpp_spec.lua
@@ -1,51 +1,56 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
 
 -- will use both c/ and cpp/
-local run = Runner:new(it, "tests/indent", {
+local run = Runner:new(it, 'tests/indent', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = true,
-  filetype = "cpp",
+  filetype = 'cpp',
 })
 
-describe("indent C++:", function()
-  describe("whole file:", function()
-    run:whole_file({ "c/", "cpp/" }, {
+describe('indent C++:', function()
+  describe('whole file:', function()
+    run:whole_file({ 'c/', 'cpp/' }, {
       expected_failures = {
         -- C
-        "c/preproc_func.c",
-        "c/unfinished_comment.c",
+        'c/preproc_func.c',
+        'c/unfinished_comment.c',
       },
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("cpp/access.cpp", { on_line = 3, text = "protected:", indent = 0 })
-    run:new_line("cpp/class.cpp", { on_line = 2, text = "using T = int;", indent = 4 })
-    run:new_line("cpp/stream.cpp", { on_line = 5, text = "<< x + 3", indent = 8 })
+  describe('new line:', function()
+    run:new_line('cpp/access.cpp', { on_line = 3, text = 'protected:', indent = 0 })
+    run:new_line('cpp/class.cpp', { on_line = 2, text = 'using T = int;', indent = 4 })
+    run:new_line('cpp/stream.cpp', { on_line = 5, text = '<< x + 3', indent = 8 })
 
     -- TODO: find a clean way to import these from c_spec.lua
-    run:new_line("c/array.c", { on_line = 2, text = "0,", indent = 4 })
-    run:new_line("c/cond.c", { on_line = 3, text = "x++;", indent = 8 })
-    run:new_line("c/cond.c", { on_line = 6, text = "x++;", indent = 8 })
-    run:new_line("c/cond.c", { on_line = 8, text = "x++;", indent = 8 })
-    run:new_line("c/cond.c", { on_line = 9, text = "x++;", indent = 4 })
-    run:new_line("c/expr.c", { on_line = 10, text = "2 *", indent = 8 })
-    run:new_line("c/func.c", { on_line = 17, text = "int z,", indent = 4 })
-    run:new_line("c/label.c", { on_line = 3, text = "normal:", indent = 0 })
-    run:new_line("c/loop.c", { on_line = 3, text = "x++;", indent = 8 })
-    run:new_line("c/preproc_cond.c", { on_line = 5, text = "x++;", indent = 4 })
-    run:new_line("c/preproc_func.c", { on_line = 3, text = "x++; \\", indent = 8 }, "expected failure", XFAIL)
-    run:new_line("c/string.c", { on_line = 1, text = "brave new \\", indent = 0 })
-    run:new_line("c/string.c", { on_line = 4, text = '"brave new "', indent = 4 })
-    run:new_line("c/struct.c", { on_line = 4, text = "int y;", indent = 8 })
-    run:new_line("c/switch.c", { on_line = 3, text = "x++;", indent = 12 })
-    run:new_line("c/ternary.c", { on_line = 4, text = ": (x == 0) : 0", indent = 8 })
+    run:new_line('c/array.c', { on_line = 2, text = '0,', indent = 4 })
+    run:new_line('c/cond.c', { on_line = 3, text = 'x++;', indent = 8 })
+    run:new_line('c/cond.c', { on_line = 6, text = 'x++;', indent = 8 })
+    run:new_line('c/cond.c', { on_line = 8, text = 'x++;', indent = 8 })
+    run:new_line('c/cond.c', { on_line = 9, text = 'x++;', indent = 4 })
+    run:new_line('c/expr.c', { on_line = 10, text = '2 *', indent = 8 })
+    run:new_line('c/func.c', { on_line = 17, text = 'int z,', indent = 4 })
+    run:new_line('c/label.c', { on_line = 3, text = 'normal:', indent = 0 })
+    run:new_line('c/loop.c', { on_line = 3, text = 'x++;', indent = 8 })
+    run:new_line('c/preproc_cond.c', { on_line = 5, text = 'x++;', indent = 4 })
+    run:new_line(
+      'c/preproc_func.c',
+      { on_line = 3, text = 'x++; \\', indent = 8 },
+      'expected failure',
+      XFAIL
+    )
+    run:new_line('c/string.c', { on_line = 1, text = 'brave new \\', indent = 0 })
+    run:new_line('c/string.c', { on_line = 4, text = '"brave new "', indent = 4 })
+    run:new_line('c/struct.c', { on_line = 4, text = 'int y;', indent = 8 })
+    run:new_line('c/switch.c', { on_line = 3, text = 'x++;', indent = 12 })
+    run:new_line('c/ternary.c', { on_line = 4, text = ': (x == 0) : 0', indent = 8 })
     -- the line after inserted one will be left with wrong indent but we only care about the inserted one
-    run:new_line("c/no_braces.c", { on_line = 4, text = "x++;", indent = 8 })
-    run:new_line("c/no_braces.c", { on_line = 7, text = "x++;", indent = 8 })
-    run:new_line("c/no_braces.c", { on_line = 10, text = "x++;", indent = 8 })
+    run:new_line('c/no_braces.c', { on_line = 4, text = 'x++;', indent = 8 })
+    run:new_line('c/no_braces.c', { on_line = 7, text = 'x++;', indent = 8 })
+    run:new_line('c/no_braces.c', { on_line = 10, text = 'x++;', indent = 8 })
   end)
 end)
diff --git a/tests/indent/css_spec.lua b/tests/indent/css_spec.lua
index 46c7e1afb..69de62e92 100644
--- a/tests/indent/css_spec.lua
+++ b/tests/indent/css_spec.lua
@@ -1,22 +1,22 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/css", {
+local run = Runner:new(it, 'tests/indent/css', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent CSS:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent CSS:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("open_block.css", { on_line = 1, text = "}", indent = 0 })
-    run:new_line("open_block.css", { on_line = 1, text = "color: green;", indent = 2 })
-    run:new_line("next_rule.css", { on_line = 3, text = ".next {", indent = 0 })
+  describe('new line:', function()
+    run:new_line('open_block.css', { on_line = 1, text = '}', indent = 0 })
+    run:new_line('open_block.css', { on_line = 1, text = 'color: green;', indent = 2 })
+    run:new_line('next_rule.css', { on_line = 3, text = '.next {', indent = 0 })
   end)
 end)
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index c1d018738..4817c2ab2 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -1,46 +1,51 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
 
-local run = Runner:new(it, "tests/indent/dart", {
+local run = Runner:new(it, 'tests/indent/dart', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 2,
   expandtab = true,
 })
 
-describe("indent Lua:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Lua:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {
-        "./multiple_arguments.dart",
-        "./class.dart",
-        "./class_function_argument.dart",
+        './multiple_arguments.dart',
+        './class.dart',
+        './class_function_argument.dart',
       },
     })
   end)
 end)
 
-describe("new line:", function()
-  run:new_line("class.dart", { on_line = 4, text = "int five;", indent = 2 })
-  run:new_line("class.dart", { on_line = 6, text = "'100'", indent = 8 }, "expected failure", XFAIL)
-  run:new_line("class.dart", { on_line = 7, text = "int five = 5", indent = 2 }, "expected failure", XFAIL)
-  run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
-  for _, content in ipairs { "var x;", "var x" } do
-    run:new_line("try.dart", { on_line = 10, text = content, indent = 6 })
-  end
-  run:new_line("switch.dart", { on_line = 3, text = "x = 1;", indent = 6 })
-  run:new_line("switch.dart", { on_line = 9, text = "x = 1;", indent = 6 })
-  run:new_line("switch.dart", { on_line = 3, text = "case 2:", indent = 4 })
-  run:new_line("switch.dart", { on_line = 16, text = "abc;", indent = 4 })
-  run:new_line("switch.dart", { on_line = 20, text = "abc;", indent = 4 })
-  run:new_line("switch.dart", { on_line = 28, text = "y++;", indent = 6 })
-
-  run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
+describe('new line:', function()
+  run:new_line('class.dart', { on_line = 4, text = 'int five;', indent = 2 })
+  run:new_line('class.dart', { on_line = 6, text = "'100'", indent = 8 }, 'expected failure', XFAIL)
   run:new_line(
-    "multiple_arguments.dart",
-    { on_line = 11, text = "var x;", indent = 4 },
-    "expected failure issue #4637",
+    'class.dart',
+    { on_line = 7, text = 'int five = 5', indent = 2 },
+    'expected failure',
     XFAIL
   )
-  run:new_line("class_function_argument.dart", { on_line = 11, text = "}", indent = 4 })
+  run:new_line('try.dart', { on_line = 2, text = 'var x;', indent = 4 })
+  for _, content in ipairs({ 'var x;', 'var x' }) do
+    run:new_line('try.dart', { on_line = 10, text = content, indent = 6 })
+  end
+  run:new_line('switch.dart', { on_line = 3, text = 'x = 1;', indent = 6 })
+  run:new_line('switch.dart', { on_line = 9, text = 'x = 1;', indent = 6 })
+  run:new_line('switch.dart', { on_line = 3, text = 'case 2:', indent = 4 })
+  run:new_line('switch.dart', { on_line = 16, text = 'abc;', indent = 4 })
+  run:new_line('switch.dart', { on_line = 20, text = 'abc;', indent = 4 })
+  run:new_line('switch.dart', { on_line = 28, text = 'y++;', indent = 6 })
+
+  run:new_line('multiple_arguments.dart', { on_line = 10, text = 'var x;', indent = 4 })
+  run:new_line(
+    'multiple_arguments.dart',
+    { on_line = 11, text = 'var x;', indent = 4 },
+    'expected failure issue #4637',
+    XFAIL
+  )
+  run:new_line('class_function_argument.dart', { on_line = 11, text = '}', indent = 4 })
 end)
diff --git a/tests/indent/dot_spec.lua b/tests/indent/dot_spec.lua
index ac78f8d92..135321da2 100644
--- a/tests/indent/dot_spec.lua
+++ b/tests/indent/dot_spec.lua
@@ -1,25 +1,25 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/dot", {
+local run = Runner:new(it, 'tests/indent/dot', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent dot:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent dot:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("test.dot", { on_line = 1, text = "node [", indent = 2 })
-    run:new_line("test.dot", { on_line = 2, text = "shape=ellipse,", indent = 4 })
-    run:new_line("test.dot", { on_line = 4, text = "subgraph sub {", indent = 2 })
-    run:new_line("test.dot", { on_line = 5, text = "a1 -> a2 -> a3;", indent = 4 })
-    run:new_line("test.dot", { on_line = 6, text = "}", indent = 2 })
-    run:new_line("test.dot", { on_line = 7, text = "}", indent = 0 })
+  describe('new line:', function()
+    run:new_line('test.dot', { on_line = 1, text = 'node [', indent = 2 })
+    run:new_line('test.dot', { on_line = 2, text = 'shape=ellipse,', indent = 4 })
+    run:new_line('test.dot', { on_line = 4, text = 'subgraph sub {', indent = 2 })
+    run:new_line('test.dot', { on_line = 5, text = 'a1 -> a2 -> a3;', indent = 4 })
+    run:new_line('test.dot', { on_line = 6, text = '}', indent = 2 })
+    run:new_line('test.dot', { on_line = 7, text = '}', indent = 0 })
   end)
 end)
diff --git a/tests/indent/gdscript_spec.lua b/tests/indent/gdscript_spec.lua
index c1770f41a..ee6f58a4b 100644
--- a/tests/indent/gdscript_spec.lua
+++ b/tests/indent/gdscript_spec.lua
@@ -1,20 +1,20 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/gdscript", {
+local run = Runner:new(it, 'tests/indent/gdscript', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = false,
 })
 
-describe("indent GDScript:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent GDScript:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("basic_blocks.gd", { on_line = 1, text = "var member := 0", indent = 0 })
+  describe('new line:', function()
+    run:new_line('basic_blocks.gd', { on_line = 1, text = 'var member := 0', indent = 0 })
   end)
 end)
diff --git a/tests/indent/gleam_spec.lua b/tests/indent/gleam_spec.lua
index 8de57fd50..1d77e52a1 100644
--- a/tests/indent/gleam_spec.lua
+++ b/tests/indent/gleam_spec.lua
@@ -1,127 +1,127 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/gleam", {
+local run = Runner:new(it, 'tests/indent/gleam', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 2,
   expandtab = true,
 })
 
-describe("indent Gleam:", function()
-  describe("whole file:", function()
-    run:whole_file "."
+describe('indent Gleam:', function()
+  describe('whole file:', function()
+    run:whole_file('.')
   end)
-  describe("new line:", function()
-    run:new_line("type.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 2, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 3, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 4, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 5, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 6, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 7, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 8, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 9, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 10, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 11, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 12, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 13, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 14, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 15, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 16, text = "//", indent = 0 })
-    run:new_line("type.gleam", { on_line = 17, text = "//", indent = 2 })
-    run:new_line("type.gleam", { on_line = 18, text = "//", indent = 0 })
+  describe('new line:', function()
+    run:new_line('type.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 2, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 3, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 4, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 5, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 6, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 7, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 8, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 9, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 10, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 11, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 12, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 13, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 14, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 15, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 16, text = '//', indent = 0 })
+    run:new_line('type.gleam', { on_line = 17, text = '//', indent = 2 })
+    run:new_line('type.gleam', { on_line = 18, text = '//', indent = 0 })
 
-    run:new_line("function.gleam", { on_line = 1, text = "//", indent = 0 })
-    run:new_line("function.gleam", { on_line = 2, text = "//", indent = 0 })
-    run:new_line("function.gleam", { on_line = 3, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 4, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 5, text = "//", indent = 0 })
-    run:new_line("function.gleam", { on_line = 6, text = "//", indent = 0 })
-    run:new_line("function.gleam", { on_line = 7, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 8, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 9, text = "//", indent = 0 })
-    run:new_line("function.gleam", { on_line = 10, text = "//", indent = 0 })
-    run:new_line("function.gleam", { on_line = 11, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 12, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 13, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 14, text = "//", indent = 2 })
-    run:new_line("function.gleam", { on_line = 15, text = "//", indent = 2 })
+    run:new_line('function.gleam', { on_line = 1, text = '//', indent = 0 })
+    run:new_line('function.gleam', { on_line = 2, text = '//', indent = 0 })
+    run:new_line('function.gleam', { on_line = 3, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 4, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 5, text = '//', indent = 0 })
+    run:new_line('function.gleam', { on_line = 6, text = '//', indent = 0 })
+    run:new_line('function.gleam', { on_line = 7, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 8, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 9, text = '//', indent = 0 })
+    run:new_line('function.gleam', { on_line = 10, text = '//', indent = 0 })
+    run:new_line('function.gleam', { on_line = 11, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 12, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 13, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 14, text = '//', indent = 2 })
+    run:new_line('function.gleam', { on_line = 15, text = '//', indent = 2 })
 
-    run:new_line("list.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("list.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("list.gleam", { on_line = 3, text = "//", indent = 4 })
-    run:new_line("list.gleam", { on_line = 4, text = "//", indent = 6 })
-    run:new_line("list.gleam", { on_line = 5, text = "//", indent = 6 })
-    run:new_line("list.gleam", { on_line = 6, text = "//", indent = 8 })
-    run:new_line("list.gleam", { on_line = 7, text = "//", indent = 8 })
-    run:new_line("list.gleam", { on_line = 8, text = "//", indent = 6 })
-    run:new_line("list.gleam", { on_line = 9, text = "//", indent = 4 })
-    run:new_line("list.gleam", { on_line = 10, text = "//", indent = 2 })
-    run:new_line("list.gleam", { on_line = 11, text = "//", indent = 0 })
+    run:new_line('list.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('list.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('list.gleam', { on_line = 3, text = '//', indent = 4 })
+    run:new_line('list.gleam', { on_line = 4, text = '//', indent = 6 })
+    run:new_line('list.gleam', { on_line = 5, text = '//', indent = 6 })
+    run:new_line('list.gleam', { on_line = 6, text = '//', indent = 8 })
+    run:new_line('list.gleam', { on_line = 7, text = '//', indent = 8 })
+    run:new_line('list.gleam', { on_line = 8, text = '//', indent = 6 })
+    run:new_line('list.gleam', { on_line = 9, text = '//', indent = 4 })
+    run:new_line('list.gleam', { on_line = 10, text = '//', indent = 2 })
+    run:new_line('list.gleam', { on_line = 11, text = '//', indent = 0 })
 
-    run:new_line("tuple.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("tuple.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("tuple.gleam", { on_line = 3, text = "//", indent = 4 })
-    run:new_line("tuple.gleam", { on_line = 4, text = "//", indent = 6 })
-    run:new_line("tuple.gleam", { on_line = 5, text = "//", indent = 6 })
-    run:new_line("tuple.gleam", { on_line = 6, text = "//", indent = 8 })
-    run:new_line("tuple.gleam", { on_line = 7, text = "//", indent = 8 })
-    run:new_line("tuple.gleam", { on_line = 8, text = "//", indent = 6 })
-    run:new_line("tuple.gleam", { on_line = 9, text = "//", indent = 4 })
-    run:new_line("tuple.gleam", { on_line = 10, text = "//", indent = 2 })
-    run:new_line("tuple.gleam", { on_line = 11, text = "//", indent = 0 })
+    run:new_line('tuple.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('tuple.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('tuple.gleam', { on_line = 3, text = '//', indent = 4 })
+    run:new_line('tuple.gleam', { on_line = 4, text = '//', indent = 6 })
+    run:new_line('tuple.gleam', { on_line = 5, text = '//', indent = 6 })
+    run:new_line('tuple.gleam', { on_line = 6, text = '//', indent = 8 })
+    run:new_line('tuple.gleam', { on_line = 7, text = '//', indent = 8 })
+    run:new_line('tuple.gleam', { on_line = 8, text = '//', indent = 6 })
+    run:new_line('tuple.gleam', { on_line = 9, text = '//', indent = 4 })
+    run:new_line('tuple.gleam', { on_line = 10, text = '//', indent = 2 })
+    run:new_line('tuple.gleam', { on_line = 11, text = '//', indent = 0 })
 
-    run:new_line("case.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("case.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("case.gleam", { on_line = 3, text = "//", indent = 4 })
-    run:new_line("case.gleam", { on_line = 4, text = "//", indent = 6 })
-    run:new_line("case.gleam", { on_line = 5, text = "//", indent = 8 })
-    run:new_line("case.gleam", { on_line = 6, text = "//", indent = 8 })
-    run:new_line("case.gleam", { on_line = 7, text = "//", indent = 6 })
-    run:new_line("case.gleam", { on_line = 8, text = "//", indent = 4 })
-    run:new_line("case.gleam", { on_line = 9, text = "//", indent = 2 })
-    run:new_line("case.gleam", { on_line = 10, text = "//", indent = 0 })
+    run:new_line('case.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('case.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('case.gleam', { on_line = 3, text = '//', indent = 4 })
+    run:new_line('case.gleam', { on_line = 4, text = '//', indent = 6 })
+    run:new_line('case.gleam', { on_line = 5, text = '//', indent = 8 })
+    run:new_line('case.gleam', { on_line = 6, text = '//', indent = 8 })
+    run:new_line('case.gleam', { on_line = 7, text = '//', indent = 6 })
+    run:new_line('case.gleam', { on_line = 8, text = '//', indent = 4 })
+    run:new_line('case.gleam', { on_line = 9, text = '//', indent = 2 })
+    run:new_line('case.gleam', { on_line = 10, text = '//', indent = 0 })
 
-    run:new_line("let.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("let.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("let.gleam", { on_line = 3, text = "//", indent = 4 })
-    run:new_line("let.gleam", { on_line = 4, text = "//", indent = 0 })
+    run:new_line('let.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('let.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('let.gleam', { on_line = 3, text = '//', indent = 4 })
+    run:new_line('let.gleam', { on_line = 4, text = '//', indent = 0 })
 
-    run:new_line("pipe.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("pipe.gleam", { on_line = 2, text = "//", indent = 2 })
-    run:new_line("pipe.gleam", { on_line = 3, text = "//", indent = 2 })
-    run:new_line("pipe.gleam", { on_line = 4, text = "//", indent = 0 })
+    run:new_line('pipe.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('pipe.gleam', { on_line = 2, text = '//', indent = 2 })
+    run:new_line('pipe.gleam', { on_line = 3, text = '//', indent = 2 })
+    run:new_line('pipe.gleam', { on_line = 4, text = '//', indent = 0 })
 
-    run:new_line("binary_expression.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("binary_expression.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("binary_expression.gleam", { on_line = 3, text = "//", indent = 4 })
-    run:new_line("binary_expression.gleam", { on_line = 4, text = "//", indent = 0 })
+    run:new_line('binary_expression.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('binary_expression.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('binary_expression.gleam', { on_line = 3, text = '//', indent = 4 })
+    run:new_line('binary_expression.gleam', { on_line = 4, text = '//', indent = 0 })
 
-    run:new_line("import.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("import.gleam", { on_line = 2, text = "//", indent = 2 })
-    run:new_line("import.gleam", { on_line = 3, text = "//", indent = 2 })
-    run:new_line("import.gleam", { on_line = 4, text = "//", indent = 0 })
+    run:new_line('import.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('import.gleam', { on_line = 2, text = '//', indent = 2 })
+    run:new_line('import.gleam', { on_line = 3, text = '//', indent = 2 })
+    run:new_line('import.gleam', { on_line = 4, text = '//', indent = 0 })
 
-    run:new_line("constant.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("constant.gleam", { on_line = 2, text = "//", indent = 2 })
+    run:new_line('constant.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('constant.gleam', { on_line = 2, text = '//', indent = 2 })
 
-    run:new_line("assert.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("assert.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("assert.gleam", { on_line = 3, text = "//", indent = 2 })
-    run:new_line("assert.gleam", { on_line = 4, text = "//", indent = 0 })
+    run:new_line('assert.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('assert.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('assert.gleam', { on_line = 3, text = '//', indent = 2 })
+    run:new_line('assert.gleam', { on_line = 4, text = '//', indent = 0 })
 
-    run:new_line("todo.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("todo.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("todo.gleam", { on_line = 3, text = "//", indent = 4 })
-    run:new_line("todo.gleam", { on_line = 4, text = "//", indent = 2 })
-    run:new_line("todo.gleam", { on_line = 5, text = "//", indent = 0 })
+    run:new_line('todo.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('todo.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('todo.gleam', { on_line = 3, text = '//', indent = 4 })
+    run:new_line('todo.gleam', { on_line = 4, text = '//', indent = 2 })
+    run:new_line('todo.gleam', { on_line = 5, text = '//', indent = 0 })
 
-    run:new_line("anonymous_function.gleam", { on_line = 1, text = "//", indent = 2 })
-    run:new_line("anonymous_function.gleam", { on_line = 2, text = "//", indent = 4 })
-    run:new_line("anonymous_function.gleam", { on_line = 3, text = "//", indent = 6 })
-    run:new_line("anonymous_function.gleam", { on_line = 4, text = "//", indent = 6 })
-    run:new_line("anonymous_function.gleam", { on_line = 5, text = "//", indent = 4 })
-    run:new_line("anonymous_function.gleam", { on_line = 6, text = "//", indent = 2 })
-    run:new_line("anonymous_function.gleam", { on_line = 7, text = "//", indent = 0 })
+    run:new_line('anonymous_function.gleam', { on_line = 1, text = '//', indent = 2 })
+    run:new_line('anonymous_function.gleam', { on_line = 2, text = '//', indent = 4 })
+    run:new_line('anonymous_function.gleam', { on_line = 3, text = '//', indent = 6 })
+    run:new_line('anonymous_function.gleam', { on_line = 4, text = '//', indent = 6 })
+    run:new_line('anonymous_function.gleam', { on_line = 5, text = '//', indent = 4 })
+    run:new_line('anonymous_function.gleam', { on_line = 6, text = '//', indent = 2 })
+    run:new_line('anonymous_function.gleam', { on_line = 7, text = '//', indent = 0 })
   end)
 end)
diff --git a/tests/indent/go_spec.lua b/tests/indent/go_spec.lua
index 4d604f3ef..f29379139 100644
--- a/tests/indent/go_spec.lua
+++ b/tests/indent/go_spec.lua
@@ -1,24 +1,24 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/go", {
+local run = Runner:new(it, 'tests/indent/go', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 4,
   expandtab = false,
 })
 
-describe("indent Go:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Go:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new lines:", function()
-    run:new_line("issue-2369.go", { on_line = 13, text = "// some comment", indent = 1 })
-    run:new_line("issue-2369-newline.go", { on_line = 8, text = "// comment", indent = 0 })
-    run:new_line("const_declaration.go", { on_line = 3, text = "Constant", indent = 1 })
-    run:new_line("const_declaration.go", { on_line = 7, text = "func main() {", indent = 0 })
+  describe('new lines:', function()
+    run:new_line('issue-2369.go', { on_line = 13, text = '// some comment', indent = 1 })
+    run:new_line('issue-2369-newline.go', { on_line = 8, text = '// comment', indent = 0 })
+    run:new_line('const_declaration.go', { on_line = 3, text = 'Constant', indent = 1 })
+    run:new_line('const_declaration.go', { on_line = 7, text = 'func main() {', indent = 0 })
   end)
 end)
diff --git a/tests/indent/graphql_spec.lua b/tests/indent/graphql_spec.lua
index 9fc9896a7..d54cf60c5 100644
--- a/tests/indent/graphql_spec.lua
+++ b/tests/indent/graphql_spec.lua
@@ -1,19 +1,19 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/graphql", {
+local run = Runner:new(it, 'tests/indent/graphql', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent GraphQL:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent GraphQL:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function() end)
+  describe('new line:', function() end)
 end)
diff --git a/tests/indent/html_spec.lua b/tests/indent/html_spec.lua
index b94653613..b240b7150 100644
--- a/tests/indent/html_spec.lua
+++ b/tests/indent/html_spec.lua
@@ -1,28 +1,28 @@
-local Runner = require("tests.indent.common").Runner
-local runner = Runner:new(it, "tests/indent/html", {
+local Runner = require('tests.indent.common').Runner
+local runner = Runner:new(it, 'tests/indent/html', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
 })
 
-describe("indent HTML:", function()
-  describe("whole file:", function()
-    runner:whole_file "."
+describe('indent HTML:', function()
+  describe('whole file:', function()
+    runner:whole_file('.')
   end)
 
-  describe("new line:", function()
-    runner:new_line("start_tag.html", { on_line = 1, text = "anything", indent = 0 })
-    runner:new_line("start_tag.html", { on_line = 4, text = "anything", indent = 4 })
-    runner:new_line("start_tag.html", { on_line = 6, text = "charset = utf-8", indent = 6 })
-    runner:new_line("start_tag.html", { on_line = 6, text = ">", indent = 4 })
-    runner:new_line("start_tag.html", { on_line = 6, text = "/>", indent = 4 })
-    runner:new_line("issue-3986.html", { on_line = 3, text = "indent once", indent = 2 })
-    runner:new_line("self_closing_tag.html", { on_line = 10, text = "Something", indent = 4 })
-    runner:new_line("self_closing_tag.html", { on_line = 12, text = "disabled", indent = 6 })
-    runner:new_line("self_closing_tag.html", { on_line = 12, text = "/>", indent = 4 })
-    runner:new_line("script_style.html", { on_line = 5, text = "body", indent = 2 })
-    runner:new_line("script_style.html", { on_line = 6, text = "<div></div>", indent = 2 })
-    runner:new_line("script_style.html", { on_line = 9, text = "const x = 1", indent = 2 })
-    runner:new_line("script_style.html", { on_line = 11, text = "Text", indent = 2 })
+  describe('new line:', function()
+    runner:new_line('start_tag.html', { on_line = 1, text = 'anything', indent = 0 })
+    runner:new_line('start_tag.html', { on_line = 4, text = 'anything', indent = 4 })
+    runner:new_line('start_tag.html', { on_line = 6, text = 'charset = utf-8', indent = 6 })
+    runner:new_line('start_tag.html', { on_line = 6, text = '>', indent = 4 })
+    runner:new_line('start_tag.html', { on_line = 6, text = '/>', indent = 4 })
+    runner:new_line('issue-3986.html', { on_line = 3, text = 'indent once', indent = 2 })
+    runner:new_line('self_closing_tag.html', { on_line = 10, text = 'Something', indent = 4 })
+    runner:new_line('self_closing_tag.html', { on_line = 12, text = 'disabled', indent = 6 })
+    runner:new_line('self_closing_tag.html', { on_line = 12, text = '/>', indent = 4 })
+    runner:new_line('script_style.html', { on_line = 5, text = 'body', indent = 2 })
+    runner:new_line('script_style.html', { on_line = 6, text = '<div></div>', indent = 2 })
+    runner:new_line('script_style.html', { on_line = 9, text = 'const x = 1', indent = 2 })
+    runner:new_line('script_style.html', { on_line = 11, text = 'Text', indent = 2 })
   end)
 end)
diff --git a/tests/indent/java_spec.lua b/tests/indent/java_spec.lua
index 1d10046bb..97354dbc7 100644
--- a/tests/indent/java_spec.lua
+++ b/tests/indent/java_spec.lua
@@ -1,39 +1,45 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
 
-local run = Runner:new(it, "tests/indent/java", {
+local run = Runner:new(it, 'tests/indent/java', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Java:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Java:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("method.java", { on_line = 1, text = "void foo() {}", indent = 2 })
-    run:new_line("issue_2571.java", { on_line = 5, text = "void bar() {}", indent = 2 })
-    run:new_line("enum.java", { on_line = 2, text = "THING_B,", indent = 2 })
-    run:new_line("class_with_annotation.java", { on_line = 2, text = "void foo() {}", indent = 2 })
-    run:new_line("enum_with_annotation.java", { on_line = 2, text = "THING;", indent = 2 })
-    run:new_line("interface.java", { on_line = 1, text = "void foo();", indent = 2 })
-    run:new_line("javadoc.java", { on_line = 2, text = "* Sample javadoc line", indent = 3 })
+  describe('new line:', function()
+    run:new_line('method.java', { on_line = 1, text = 'void foo() {}', indent = 2 })
+    run:new_line('issue_2571.java', { on_line = 5, text = 'void bar() {}', indent = 2 })
+    run:new_line('enum.java', { on_line = 2, text = 'THING_B,', indent = 2 })
+    run:new_line('class_with_annotation.java', { on_line = 2, text = 'void foo() {}', indent = 2 })
+    run:new_line('enum_with_annotation.java', { on_line = 2, text = 'THING;', indent = 2 })
+    run:new_line('interface.java', { on_line = 1, text = 'void foo();', indent = 2 })
+    run:new_line('javadoc.java', { on_line = 2, text = '* Sample javadoc line', indent = 3 })
     run:new_line(
-      "issue_2583.java",
-      { on_line = 3, text = "int x = 1;", indent = 4 },
-      "fails because tree is in a broken state",
+      'issue_2583.java',
+      { on_line = 3, text = 'int x = 1;', indent = 4 },
+      'fails because tree is in a broken state',
       XFAIL
     )
-    run:new_line("issue_2583.java", { on_line = 4, text = "int x = 1;", indent = 4 })
-    run:new_line("method_chaining.java", { on_line = 4, text = '.append("b");', indent = 6 })
-    run:new_line("constructor_with_arguments_on_multiple_lines.java", { on_line = 4, text = "}", indent = 2 })
-    run:new_line("method_with_arguments_on_multiple_lines.java", { on_line = 4, text = "}", indent = 2 })
-    run:new_line("annotation.java", { on_line = 1, text = "abstract public Foo(){}", indent = 2 })
-    run:new_line("annotation_2.java", { on_line = 2, text = "Bar.class", indent = 4 })
+    run:new_line('issue_2583.java', { on_line = 4, text = 'int x = 1;', indent = 4 })
+    run:new_line('method_chaining.java', { on_line = 4, text = '.append("b");', indent = 6 })
+    run:new_line(
+      'constructor_with_arguments_on_multiple_lines.java',
+      { on_line = 4, text = '}', indent = 2 }
+    )
+    run:new_line(
+      'method_with_arguments_on_multiple_lines.java',
+      { on_line = 4, text = '}', indent = 2 }
+    )
+    run:new_line('annotation.java', { on_line = 1, text = 'abstract public Foo(){}', indent = 2 })
+    run:new_line('annotation_2.java', { on_line = 2, text = 'Bar.class', indent = 4 })
   end)
 end)
diff --git a/tests/indent/javascript_spec.lua b/tests/indent/javascript_spec.lua
index 5659b22a1..4a7c3bcc3 100644
--- a/tests/indent/javascript_spec.lua
+++ b/tests/indent/javascript_spec.lua
@@ -1,40 +1,50 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 -- local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent", {
+local run = Runner:new(it, 'tests/indent', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
-  filetype = "javascript",
+  filetype = 'javascript',
 })
 
-describe("indent JavaScript:", function()
-  describe("whole file:", function()
-    run:whole_file({ "ecma/" }, {
+describe('indent JavaScript:', function()
+  describe('whole file:', function()
+    run:whole_file({ 'ecma/' }, {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    for _, info in ipairs {
+  describe('new line:', function()
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 4 },
       { 3, 4 },
-    } do
-      run:new_line("ecma/binary_expression.js", { on_line = info[1], text = "//", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/binary_expression.js',
+        { on_line = info[1], text = '//', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    run:new_line("ecma/new-line-after-class.js", { on_line = 2, text = "", indent = 0 })
+    run:new_line('ecma/new-line-after-class.js', { on_line = 2, text = '', indent = 0 })
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 4, 2 },
       { 6, 0 },
-    } do
-      run:new_line("ecma/callback.js", { on_line = info[1], text = "//", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/callback.js',
+        { on_line = info[1], text = '//', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 4 },
       { 3, 6 },
@@ -42,11 +52,16 @@ describe("indent JavaScript:", function()
       { 8, 2 },
       { 11, 4 },
       { 13, 4 },
-    } do
-      run:new_line("ecma/class.js", { on_line = info[1], text = "//", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/class.js',
+        { on_line = info[1], text = '//', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 2, 2 },
       { 5, 2 },
       { 7, 0 },
@@ -61,11 +76,16 @@ describe("indent JavaScript:", function()
       { 48, 4 },
       { 49, 4 },
       { 50, 2 },
-    } do
-      run:new_line("ecma/func.js", { on_line = info[1], text = "//", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/func.js',
+        { on_line = info[1], text = '//', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 2 },
       { 3, 2 },
@@ -77,25 +97,40 @@ describe("indent JavaScript:", function()
       { 13, 0 },
       { 16, 0 },
       { 19, 2 },
-    } do
-      run:new_line("ecma/if_else.js", { on_line = info[1], text = "hello()", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/if_else.js',
+        { on_line = info[1], text = 'hello()', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 2, 2 },
       { 5, 0 },
-    } do
-      run:new_line("ecma/object.js", { on_line = info[1], text = "//", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/object.js',
+        { on_line = info[1], text = '//', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 3, 6 },
       { 4, 6 },
-    } do
-      run:new_line("ecma/ternary.js", { on_line = info[1], text = "//", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/ternary.js',
+        { on_line = info[1], text = '//', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 2 },
       { 3, 2 },
@@ -103,23 +138,36 @@ describe("indent JavaScript:", function()
       { 5, 2 },
       { 6, 2 },
       { 7, 0 },
-    } do
-      run:new_line("ecma/try_catch.js", { on_line = info[1], text = "hello()", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/try_catch.js',
+        { on_line = info[1], text = 'hello()', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 1, 2 },
       { 2, 0 },
-    } do
-      run:new_line("ecma/variable.js", { on_line = info[1], text = "hello()", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'ecma/variable.js',
+        { on_line = info[1], text = 'hello()', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
 
-    for _, line in ipairs { 2, 6 } do
-      run:new_line("ecma/issue-2515.js", { on_line = line, text = "{}", indent = 4 })
+    for _, line in ipairs({ 2, 6 }) do
+      run:new_line('ecma/issue-2515.js', { on_line = line, text = '{}', indent = 4 })
     end
 
-    for _, info in ipairs { { line = 2, indent = 0 } } do
-      run:new_line("ecma/array-issue3382.js", { on_line = info.line, text = "foo();", indent = info.indent })
+    for _, info in ipairs({ { line = 2, indent = 0 } }) do
+      run:new_line(
+        'ecma/array-issue3382.js',
+        { on_line = info.line, text = 'foo();', indent = info.indent }
+      )
     end
   end)
 end)
diff --git a/tests/indent/jsx_spec.lua b/tests/indent/jsx_spec.lua
index e75b21f4f..7a32dbcc4 100644
--- a/tests/indent/jsx_spec.lua
+++ b/tests/indent/jsx_spec.lua
@@ -1,43 +1,49 @@
-local Runner = require("tests.indent.common").Runner
-local runner = Runner:new(it, "tests/indent/jsx", {
+local Runner = require('tests.indent.common').Runner
+local runner = Runner:new(it, 'tests/indent/jsx', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
-  filetype = "jsx",
+  filetype = 'jsx',
 })
 
-describe("indent JSX Elements:", function()
-  describe("whole file:", function()
-    runner:whole_file(".", {
+describe('indent JSX Elements:', function()
+  describe('whole file:', function()
+    runner:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    for _, info in ipairs {
+  describe('new line:', function()
+    for _, info in ipairs({
       { 5, 8 },
       { 6, 6 },
       { 7, 6 },
       { 8, 4 },
       { 9, 2 },
-    } do
-      runner:new_line("issue-3986.jsx", { on_line = info[1], text = "text", indent = info[2] })
+    }) do
+      runner:new_line('issue-3986.jsx', { on_line = info[1], text = 'text', indent = info[2] })
     end
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 4, 8 },
       { 6, 10 },
       { 9, 8 },
       { 11, 8 },
-    } do
-      runner:new_line("element_attributes.jsx", { on_line = info[1], text = "disabled", indent = info[2] })
+    }) do
+      runner:new_line(
+        'element_attributes.jsx',
+        { on_line = info[1], text = 'disabled', indent = info[2] }
+      )
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 5, 10 },
       { 7, 8 },
       { 11, 10 },
-    } do
-      runner:new_line("jsx_expression.jsx", { on_line = info[1], text = "{disabled}", indent = info[2] })
+    }) do
+      runner:new_line(
+        'jsx_expression.jsx',
+        { on_line = info[1], text = '{disabled}', indent = info[2] }
+      )
     end
   end)
 end)
diff --git a/tests/indent/julia_spec.lua b/tests/indent/julia_spec.lua
index 538685307..b7605a55d 100644
--- a/tests/indent/julia_spec.lua
+++ b/tests/indent/julia_spec.lua
@@ -1,16 +1,16 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 -- local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/julia", {
+local run = Runner:new(it, 'tests/indent/julia', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 4,
   expandtab = true,
 })
 
-describe("indent Julia:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Julia:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
diff --git a/tests/indent/lua_spec.lua b/tests/indent/lua_spec.lua
index 6d99a0fff..ecafc7008 100644
--- a/tests/indent/lua_spec.lua
+++ b/tests/indent/lua_spec.lua
@@ -1,49 +1,49 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/lua", {
+local run = Runner:new(it, 'tests/indent/lua', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Lua:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Lua:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("comment.lua", { on_line = 1, text = "line", indent = "-- " })
-    run:new_line("comment.lua", { on_line = 5, text = "multiline", indent = "  " })
-    run:new_line("func.lua", { on_line = 1, text = "x = x + 1", indent = 2 })
-    run:new_line("func.lua", { on_line = 2, text = "y = y + 1", indent = 4 })
-    run:new_line("func.lua", { on_line = 4, text = "y = y + 1", indent = 2 })
-    run:new_line("func.lua", { on_line = 5, text = "3,", indent = 4 })
-    run:new_line("func.lua", { on_line = 9, text = "x = x + 1", indent = 0 })
-    run:new_line("func.lua", { on_line = 11, text = "x = x + 1", indent = 2 })
-    run:new_line("string.lua", { on_line = 1, text = "x", indent = 0 })
-    run:new_line("string.lua", { on_line = 2, text = "x", indent = 0 })
-    run:new_line("string.lua", { on_line = 3, text = "x", indent = 2 })
-    run:new_line("string.lua", { on_line = 4, text = "x", indent = 4 })
-    run:new_line("string.lua", { on_line = 9, text = "x", indent = 0 })
-    run:new_line("table.lua", { on_line = 1, text = "b = 0,", indent = 2 })
-    run:new_line("table.lua", { on_line = 5, text = "4,", indent = 4 })
-    run:new_line("table.lua", { on_line = 7, text = "4,", indent = 4 })
-    run:new_line("loop.lua", { on_line = 4, text = "x = x + 1", indent = 2 })
-    run:new_line("cond.lua", { on_line = 5, text = "x = x + 1", indent = 2 })
-    run:new_line("cond.lua", { on_line = 7, text = "x = x + 1", indent = 2 })
-    run:new_line("cond.lua", { on_line = 8, text = "x = x + 1", indent = 4 })
-    run:new_line("cond.lua", { on_line = 10, text = "x = x + 1", indent = 2 })
-    run:new_line("cond.lua", { on_line = 12, text = "x = x + 1", indent = 0 })
-    run:new_line("cond.lua", { on_line = 14, text = "x = x + 1", indent = 2 })
-    run:new_line("cond.lua", { on_line = 14, text = "end", indent = 0 })
-    run:new_line("no-indent-after-paren-pairs.lua", { on_line = 3, text = "x = x + 1", indent = 0 })
-    run:new_line("no-indent-after-paren-pairs.lua", { on_line = 6, text = "x = x + 1", indent = 0 })
-    run:new_line("nested-table.lua", { on_line = 5, text = "{}", indent = 4 })
-    run:new_line("method_index_expr.lua", { on_line = 1, text = ":test()", indent = 2 })
-    run:new_line("method_index_expr.lua", { on_line = 3, text = "local a = 1", indent = 0 })
+  describe('new line:', function()
+    run:new_line('comment.lua', { on_line = 1, text = 'line', indent = '-- ' })
+    run:new_line('comment.lua', { on_line = 5, text = 'multiline', indent = '  ' })
+    run:new_line('func.lua', { on_line = 1, text = 'x = x + 1', indent = 2 })
+    run:new_line('func.lua', { on_line = 2, text = 'y = y + 1', indent = 4 })
+    run:new_line('func.lua', { on_line = 4, text = 'y = y + 1', indent = 2 })
+    run:new_line('func.lua', { on_line = 5, text = '3,', indent = 4 })
+    run:new_line('func.lua', { on_line = 9, text = 'x = x + 1', indent = 0 })
+    run:new_line('func.lua', { on_line = 11, text = 'x = x + 1', indent = 2 })
+    run:new_line('string.lua', { on_line = 1, text = 'x', indent = 0 })
+    run:new_line('string.lua', { on_line = 2, text = 'x', indent = 0 })
+    run:new_line('string.lua', { on_line = 3, text = 'x', indent = 2 })
+    run:new_line('string.lua', { on_line = 4, text = 'x', indent = 4 })
+    run:new_line('string.lua', { on_line = 9, text = 'x', indent = 0 })
+    run:new_line('table.lua', { on_line = 1, text = 'b = 0,', indent = 2 })
+    run:new_line('table.lua', { on_line = 5, text = '4,', indent = 4 })
+    run:new_line('table.lua', { on_line = 7, text = '4,', indent = 4 })
+    run:new_line('loop.lua', { on_line = 4, text = 'x = x + 1', indent = 2 })
+    run:new_line('cond.lua', { on_line = 5, text = 'x = x + 1', indent = 2 })
+    run:new_line('cond.lua', { on_line = 7, text = 'x = x + 1', indent = 2 })
+    run:new_line('cond.lua', { on_line = 8, text = 'x = x + 1', indent = 4 })
+    run:new_line('cond.lua', { on_line = 10, text = 'x = x + 1', indent = 2 })
+    run:new_line('cond.lua', { on_line = 12, text = 'x = x + 1', indent = 0 })
+    run:new_line('cond.lua', { on_line = 14, text = 'x = x + 1', indent = 2 })
+    run:new_line('cond.lua', { on_line = 14, text = 'end', indent = 0 })
+    run:new_line('no-indent-after-paren-pairs.lua', { on_line = 3, text = 'x = x + 1', indent = 0 })
+    run:new_line('no-indent-after-paren-pairs.lua', { on_line = 6, text = 'x = x + 1', indent = 0 })
+    run:new_line('nested-table.lua', { on_line = 5, text = '{}', indent = 4 })
+    run:new_line('method_index_expr.lua', { on_line = 1, text = ':test()', indent = 2 })
+    run:new_line('method_index_expr.lua', { on_line = 3, text = 'local a = 1', indent = 0 })
   end)
 end)
diff --git a/tests/indent/meson_spec.lua b/tests/indent/meson_spec.lua
index bc2372ee0..ba23965a6 100644
--- a/tests/indent/meson_spec.lua
+++ b/tests/indent/meson_spec.lua
@@ -1,28 +1,28 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/meson", {
+local run = Runner:new(it, 'tests/indent/meson', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Meson:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Meson:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("cond.meson", { on_line = 3, text = "foo()", indent = 2 })
-    run:new_line("cond.meson", { on_line = 6, text = "foo()", indent = 2 })
-    run:new_line("cond.meson", { on_line = 7, text = "foo()", indent = 2 })
-    run:new_line("cond.meson", { on_line = 12, text = "foo()", indent = 2 })
-    run:new_line("cond.meson", { on_line = 14, text = "foo()", indent = 2 })
-    run:new_line("dict.meson", { on_line = 13, text = ",'x':1,", indent = 2 })
-    run:new_line("loop.meson", { on_line = 3, text = "foo()", indent = 2 })
-    run:new_line("loop.meson", { on_line = 7, text = "foo()", indent = 2 })
-    run:new_line("ternary.meson", { on_line = 11, text = "x : y", indent = 2 })
+  describe('new line:', function()
+    run:new_line('cond.meson', { on_line = 3, text = 'foo()', indent = 2 })
+    run:new_line('cond.meson', { on_line = 6, text = 'foo()', indent = 2 })
+    run:new_line('cond.meson', { on_line = 7, text = 'foo()', indent = 2 })
+    run:new_line('cond.meson', { on_line = 12, text = 'foo()', indent = 2 })
+    run:new_line('cond.meson', { on_line = 14, text = 'foo()', indent = 2 })
+    run:new_line('dict.meson', { on_line = 13, text = ",'x':1,", indent = 2 })
+    run:new_line('loop.meson', { on_line = 3, text = 'foo()', indent = 2 })
+    run:new_line('loop.meson', { on_line = 7, text = 'foo()', indent = 2 })
+    run:new_line('ternary.meson', { on_line = 11, text = 'x : y', indent = 2 })
   end)
 end)
diff --git a/tests/indent/nickel_spec.lua b/tests/indent/nickel_spec.lua
index d178dab52..0c2458a5b 100644
--- a/tests/indent/nickel_spec.lua
+++ b/tests/indent/nickel_spec.lua
@@ -1,25 +1,25 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/nickel", {
+local run = Runner:new(it, 'tests/indent/nickel', {
   shiftwidth = 2,
   expandtab = true,
 })
 
-describe("indent Nickel:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Nickel:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("indent-newline.ncl", { on_line = 1, text = "stmt", indent = 2 })
-    run:new_line("indent-newline.ncl", { on_line = 2, text = "stmt", indent = 2 })
-    run:new_line("indent-newline.ncl", { on_line = 3, text = "stmt", indent = 4 })
-    run:new_line("indent-newline.ncl", { on_line = 4, text = "]", indent = 2 })
-    run:new_line("indent-newline.ncl", { on_line = 5, text = "stmt", indent = 2 })
-    run:new_line("indent-newline.ncl", { on_line = 6, text = "stmt", indent = 4 })
-    run:new_line("indent-newline.ncl", { on_line = 7, text = "}", indent = 2 })
-    run:new_line("indent-newline.ncl", { on_line = 11, text = "stmt", indent = 0 })
+  describe('new line:', function()
+    run:new_line('indent-newline.ncl', { on_line = 1, text = 'stmt', indent = 2 })
+    run:new_line('indent-newline.ncl', { on_line = 2, text = 'stmt', indent = 2 })
+    run:new_line('indent-newline.ncl', { on_line = 3, text = 'stmt', indent = 4 })
+    run:new_line('indent-newline.ncl', { on_line = 4, text = ']', indent = 2 })
+    run:new_line('indent-newline.ncl', { on_line = 5, text = 'stmt', indent = 2 })
+    run:new_line('indent-newline.ncl', { on_line = 6, text = 'stmt', indent = 4 })
+    run:new_line('indent-newline.ncl', { on_line = 7, text = '}', indent = 2 })
+    run:new_line('indent-newline.ncl', { on_line = 11, text = 'stmt', indent = 0 })
   end)
 end)
diff --git a/tests/indent/nix_spec.lua b/tests/indent/nix_spec.lua
index 709a0a109..bad8b53f7 100644
--- a/tests/indent/nix_spec.lua
+++ b/tests/indent/nix_spec.lua
@@ -1,30 +1,30 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local runner = Runner:new(it, "tests/indent/nix", {
+local runner = Runner:new(it, 'tests/indent/nix', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 2,
   expandtab = true,
 })
 
-describe("indent Nix:", function()
-  describe("whole file:", function()
-    runner:whole_file(".", {
+describe('indent Nix:', function()
+  describe('whole file:', function()
+    runner:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    for _, info in ipairs {
+  describe('new line:', function()
+    for _, info in ipairs({
       { 14, 2 },
       { 16, 2 },
       { 48, 4 },
       { 112, 6 },
-    } do
-      runner:new_line("general.nix", { on_line = info[1], text = "x = 1;", indent = info[2] })
+    }) do
+      runner:new_line('general.nix', { on_line = info[1], text = 'x = 1;', indent = info[2] })
     end
 
-    for _, info in ipairs {
+    for _, info in ipairs({
       { 115, 6 },
       { 113, 10 },
       { 6, 4 },
@@ -33,8 +33,8 @@ describe("indent Nix:", function()
       { 35, 6 },
       { 23, 2 },
       { 21, 6 },
-    } do
-      runner:new_line("conds.nix", { on_line = info[1], text = "x = 1;", indent = info[2] })
+    }) do
+      runner:new_line('conds.nix', { on_line = info[1], text = 'x = 1;', indent = info[2] })
     end
   end)
 end)
diff --git a/tests/indent/nu_spec.lua b/tests/indent/nu_spec.lua
index 37c02ebea..5dfdb5128 100644
--- a/tests/indent/nu_spec.lua
+++ b/tests/indent/nu_spec.lua
@@ -1,16 +1,16 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/nu", {
+local run = Runner:new(it, 'tests/indent/nu', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = -1,
   expandtab = true,
 })
 
-describe("indent Nu:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Nu:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
diff --git a/tests/indent/php_spec.lua b/tests/indent/php_spec.lua
index c3f84e6e2..49983caa2 100644
--- a/tests/indent/php_spec.lua
+++ b/tests/indent/php_spec.lua
@@ -1,76 +1,75 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/php", {
+local run = Runner:new(it, 'tests/indent/php', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent PHP:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent PHP:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("example.php", { on_line = 11, text = "// new line starts 1 indentation to far", indent = 4 })
+  describe('new line:', function()
     run:new_line(
-      "example2.php",
-      { on_line = 5, text = "indentation with `enter` in insert mode is not correct", indent = 4 }
+      'example.php',
+      { on_line = 11, text = '// new line starts 1 indentation to far', indent = 4 }
     )
-    run:new_line("issue-2497.php", { on_line = 5, text = "$a =", indent = 4 })
-    run:new_line("unfinished-call.php", { on_line = 6, text = "$a =", indent = 4 })
-    run:new_line("issue-3591.php", { on_line = 4, text = "$a =", indent = 8 })
-    run:new_line("enum-indent.php", { on_line = 4, text = "case", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 3, text = "true", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 4, text = "return;", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 7, text = "true", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 10, text = "|| false", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 11, text = "$a = 0;", indent = 0 })
-    run:new_line("issue-4848.php", { on_line = 13, text = "true", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 16, text = "$a,", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 17, text = "true", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 20, text = "$a,", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 21, text = "return $a;", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 24, text = "return;", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 27, text = "true", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 28, text = "true => null,", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 31, text = "true => null,", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 35, text = "function a() {}", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 37, text = "return;", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 40, text = "$a,", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 41, text = "return $a;", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 45, text = "->foo()", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 46, text = "$a,", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 47, text = "->foo()", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 48, text = "$a;", indent = 0 })
-    run:new_line("issue-4848.php", { on_line = 50, text = "->foo()", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 51, text = "return $a;", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 52, text = "->foo()", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 53, text = "$a,", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 54, text = "$a,", indent = 12 })
-    run:new_line("issue-4848.php", { on_line = 55, text = "return $a;", indent = 12 })
-    run:new_line("issue-4848.php", { on_line = 56, text = "$a,", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 57, text = "$a;", indent = 0 })
-    run:new_line("issue-4848.php", { on_line = 59, text = "->foo()", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 60, text = "return $a;", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 61, text = "->foo()", indent = 4 })
-    run:new_line("issue-4848.php", { on_line = 62, text = "$a,", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 63, text = "$a,", indent = 12 })
-    run:new_line("issue-4848.php", { on_line = 64, text = "return $a;", indent = 12 })
-    run:new_line("issue-4848.php", { on_line = 65, text = "$a,", indent = 8 })
-    run:new_line("issue-4848.php", { on_line = 66, text = "$a;", indent = 0 })
-    run:new_line("issue-6888.php", { on_line = 2, text = "$a;", indent = 0 })
-    run:new_line("issue-6888.php", { on_line = 3, text = "case Funday = 2;", indent = 4 })
-    run:new_line("issue-6888.php", { on_line = 6, text = "$a;", indent = 0 })
-    run:new_line("issue-6888.php", { on_line = 8, text = "$a;", indent = 4 })
-    run:new_line("issue-6888.php", { on_line = 11, text = "$a;", indent = 0 })
-    run:new_line("property-hooks.php", { on_line = 7, text = "get;", indent = 8 })
-    run:new_line("property-hooks.php", { on_line = 8, text = "set;", indent = 8 })
-    run:new_line("property-hooks.php", { on_line = 9, text = "$a;", indent = 12 })
-    run:new_line("property-hooks.php", { on_line = 11, text = "get;", indent = 8 })
-    run:new_line("property-hooks.php", { on_line = 12, text = "get;", indent = 4 })
+    run:new_line('issue-2497.php', { on_line = 5, text = '$a =', indent = 4 })
+    run:new_line('unfinished-call.php', { on_line = 6, text = '$a =', indent = 4 })
+    run:new_line('issue-3591.php', { on_line = 4, text = '$a =', indent = 8 })
+    run:new_line('enum-indent.php', { on_line = 4, text = 'case', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 3, text = 'true', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 4, text = 'return;', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 7, text = 'true', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 10, text = '|| false', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 11, text = '$a = 0;', indent = 0 })
+    run:new_line('issue-4848.php', { on_line = 13, text = 'true', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 16, text = '$a,', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 17, text = 'true', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 20, text = '$a,', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 21, text = 'return $a;', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 24, text = 'return;', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 27, text = 'true', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 28, text = 'true => null,', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 31, text = 'true => null,', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 35, text = 'function a() {}', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 37, text = 'return;', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 40, text = '$a,', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 41, text = 'return $a;', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 45, text = '->foo()', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 46, text = '$a,', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 47, text = '->foo()', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 48, text = '$a;', indent = 0 })
+    run:new_line('issue-4848.php', { on_line = 50, text = '->foo()', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 51, text = 'return $a;', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 52, text = '->foo()', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 53, text = '$a,', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 54, text = '$a,', indent = 12 })
+    run:new_line('issue-4848.php', { on_line = 55, text = 'return $a;', indent = 12 })
+    run:new_line('issue-4848.php', { on_line = 56, text = '$a,', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 57, text = '$a;', indent = 0 })
+    run:new_line('issue-4848.php', { on_line = 59, text = '->foo()', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 60, text = 'return $a;', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 61, text = '->foo()', indent = 4 })
+    run:new_line('issue-4848.php', { on_line = 62, text = '$a,', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 63, text = '$a,', indent = 12 })
+    run:new_line('issue-4848.php', { on_line = 64, text = 'return $a;', indent = 12 })
+    run:new_line('issue-4848.php', { on_line = 65, text = '$a,', indent = 8 })
+    run:new_line('issue-4848.php', { on_line = 66, text = '$a;', indent = 0 })
+    run:new_line('issue-6888.php', { on_line = 2, text = '$a;', indent = 0 })
+    run:new_line('issue-6888.php', { on_line = 3, text = 'case Funday = 2;', indent = 4 })
+    run:new_line('issue-6888.php', { on_line = 6, text = '$a;', indent = 0 })
+    run:new_line('issue-6888.php', { on_line = 8, text = '$a;', indent = 4 })
+    run:new_line('issue-6888.php', { on_line = 11, text = '$a;', indent = 0 })
+    run:new_line('property-hooks.php', { on_line = 7, text = 'get;', indent = 8 })
+    run:new_line('property-hooks.php', { on_line = 8, text = 'set;', indent = 8 })
+    run:new_line('property-hooks.php', { on_line = 9, text = '$a;', indent = 12 })
+    run:new_line('property-hooks.php', { on_line = 11, text = 'get;', indent = 8 })
+    run:new_line('property-hooks.php', { on_line = 12, text = 'get;', indent = 4 })
   end)
 end)
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index 193b9901e..65be126fa 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -1,101 +1,101 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
 
-local run = Runner:new(it, "tests/indent/python", {
+local run = Runner:new(it, 'tests/indent/python', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Python:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Python:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("aligned_indent.py", { on_line = 1, text = "arg3,", indent = 19 })
-    run:new_line("aligned_indent_2.py", { on_line = 2, text = "x", indent = 4 })
-    run:new_line("aligned_indent_2.py", { on_line = 9, text = "x", indent = 4 })
-    run:new_line("aligned_indent_2.py", { on_line = 12, text = "x", indent = 4 })
-    run:new_line("basic_blocks.py", { on_line = 1, text = "wait,", indent = 4 })
-    run:new_line("basic_blocks.py", { on_line = 6, text = "x += 1", indent = 4 })
-    run:new_line("basic_blocks.py", { on_line = 7, text = "x += 1", indent = 4 })
-    run:new_line("basic_blocks.py", { on_line = 10, text = "x += 1", indent = 8 })
-    run:new_line("basic_blocks.py", { on_line = 14, text = "x += 1", indent = 8 })
-    run:new_line("basic_collections.py", { on_line = 3, text = "4,", indent = 4 })
-    run:new_line("comprehensions.py", { on_line = 8, text = "if x != 2", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 2, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 4, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 6, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 9, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 12, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 15, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 18, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 20, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 22, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 24, text = "c < 6 and", indent = 7 })
-    run:new_line("control_flow.py", { on_line = 26, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 28, text = "x = 4", indent = 4 })
-    run:new_line("control_flow.py", { on_line = 31, text = "try:", indent = 4 })
-    run:new_line("branches.py", { on_line = 25, text = "x > 9 and", indent = 4 })
-    run:new_line("branches.py", { on_line = 29, text = "and x > 9", indent = 4 })
-    run:new_line("hanging_indent.py", { on_line = 1, text = "arg0,", indent = 4 })
-    run:new_line("hanging_indent.py", { on_line = 5, text = "0,", indent = 4 })
-    run:new_line("error_state_def.py", { on_line = 6, text = "b,", indent = 11 })
-    run:new_line("error_state_tuple.py", { on_line = 7, text = "b,", indent = 1 })
-    run:new_line("error_state_tuple_align.py", { on_line = 7, text = "b,", indent = 1 })
-    run:new_line("error_state_list.py", { on_line = 5, text = "3,", indent = 6 })
-    run:new_line("error_state_dict.py", { on_line = 6, text = "9:10,", indent = 6 })
-    run:new_line("error_state_set.py", { on_line = 5, text = "9,", indent = 6 })
-    run:new_line("error_state_funcall.py", { on_line = 5, text = "6,", indent = 2 })
-    run:new_line("if_else.py", { on_line = 5, text = "else:", indent = 4 })
-    run:new_line("if_else.py", { on_line = 5, text = "elif False:", indent = 4 })
+  describe('new line:', function()
+    run:new_line('aligned_indent.py', { on_line = 1, text = 'arg3,', indent = 19 })
+    run:new_line('aligned_indent_2.py', { on_line = 2, text = 'x', indent = 4 })
+    run:new_line('aligned_indent_2.py', { on_line = 9, text = 'x', indent = 4 })
+    run:new_line('aligned_indent_2.py', { on_line = 12, text = 'x', indent = 4 })
+    run:new_line('basic_blocks.py', { on_line = 1, text = 'wait,', indent = 4 })
+    run:new_line('basic_blocks.py', { on_line = 6, text = 'x += 1', indent = 4 })
+    run:new_line('basic_blocks.py', { on_line = 7, text = 'x += 1', indent = 4 })
+    run:new_line('basic_blocks.py', { on_line = 10, text = 'x += 1', indent = 8 })
+    run:new_line('basic_blocks.py', { on_line = 14, text = 'x += 1', indent = 8 })
+    run:new_line('basic_collections.py', { on_line = 3, text = '4,', indent = 4 })
+    run:new_line('comprehensions.py', { on_line = 8, text = 'if x != 2', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 2, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 4, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 6, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 9, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 12, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 15, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 18, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 20, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 22, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 24, text = 'c < 6 and', indent = 7 })
+    run:new_line('control_flow.py', { on_line = 26, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 28, text = 'x = 4', indent = 4 })
+    run:new_line('control_flow.py', { on_line = 31, text = 'try:', indent = 4 })
+    run:new_line('branches.py', { on_line = 25, text = 'x > 9 and', indent = 4 })
+    run:new_line('branches.py', { on_line = 29, text = 'and x > 9', indent = 4 })
+    run:new_line('hanging_indent.py', { on_line = 1, text = 'arg0,', indent = 4 })
+    run:new_line('hanging_indent.py', { on_line = 5, text = '0,', indent = 4 })
+    run:new_line('error_state_def.py', { on_line = 6, text = 'b,', indent = 11 })
+    run:new_line('error_state_tuple.py', { on_line = 7, text = 'b,', indent = 1 })
+    run:new_line('error_state_tuple_align.py', { on_line = 7, text = 'b,', indent = 1 })
+    run:new_line('error_state_list.py', { on_line = 5, text = '3,', indent = 6 })
+    run:new_line('error_state_dict.py', { on_line = 6, text = '9:10,', indent = 6 })
+    run:new_line('error_state_set.py', { on_line = 5, text = '9,', indent = 6 })
+    run:new_line('error_state_funcall.py', { on_line = 5, text = '6,', indent = 2 })
+    run:new_line('if_else.py', { on_line = 5, text = 'else:', indent = 4 })
+    run:new_line('if_else.py', { on_line = 5, text = 'elif False:', indent = 4 })
     run:new_line(
-      "join_lines.py",
-      { on_line = 1, text = "+ 1 \\", indent = 4 },
-      "fails due two not working query at python/indent.scm:30",
+      'join_lines.py',
+      { on_line = 1, text = '+ 1 \\', indent = 4 },
+      'fails due two not working query at python/indent.scm:30',
       XFAIL
     )
     run:new_line(
-      "join_lines.py",
-      { on_line = 4, text = "+ 1 \\", indent = 4 },
-      "fails due two not working query at python/indent.scm:30",
+      'join_lines.py',
+      { on_line = 4, text = '+ 1 \\', indent = 4 },
+      'fails due two not working query at python/indent.scm:30',
       XFAIL
     )
-    run:new_line("join_lines.py", { on_line = 7, text = "+ 1 \\", indent = 4 })
-    run:new_line("nested_collections.py", { on_line = 5, text = "0,", indent = 12 })
-    run:new_line("nested_collections.py", { on_line = 6, text = ",0", indent = 12 })
-    run:new_line("nested_collections.py", { on_line = 29, text = "[1, 2],", indent = 12 })
-    run:new_line("nested_collections.py", { on_line = 39, text = "0,", indent = 5 })
-    run:new_line("strings.py", { on_line = 14, text = "x", indent = 4 })
-    run:new_line("strings.py", { on_line = 15, text = "x", indent = 0 })
-    run:new_line("strings.py", { on_line = 16, text = "x", indent = 8 })
-    run:new_line("line_after_indent.py", { on_line = 4, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 8, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 4, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 14, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 20, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 26, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 30, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 34, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 38, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 42, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 46, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 49, text = "x", indent = 0 })
-    run:new_line("line_after_indent.py", { on_line = 55, text = "x", indent = 4 })
-    run:new_line("line_after_indent.py", { on_line = 63, text = "x", indent = 4 })
-    run:new_line("match_case.py", { on_line = 4, text = "pass", indent = 8 })
-    run:new_line("match_case.py", { on_line = 5, text = "pass", indent = 12 })
-    run:new_line("match_case.py", { on_line = 10, text = "pass", indent = 8 })
-    run:new_line("match_case.py", { on_line = 15, text = "pass", indent = 12 })
-    run:new_line("break_continue.py", { on_line = 4, text = "pass", indent = 8 })
-    run:new_line("break_continue.py", { on_line = 9, text = "pass", indent = 8 })
+    run:new_line('join_lines.py', { on_line = 7, text = '+ 1 \\', indent = 4 })
+    run:new_line('nested_collections.py', { on_line = 5, text = '0,', indent = 12 })
+    run:new_line('nested_collections.py', { on_line = 6, text = ',0', indent = 12 })
+    run:new_line('nested_collections.py', { on_line = 29, text = '[1, 2],', indent = 12 })
+    run:new_line('nested_collections.py', { on_line = 39, text = '0,', indent = 5 })
+    run:new_line('strings.py', { on_line = 14, text = 'x', indent = 4 })
+    run:new_line('strings.py', { on_line = 15, text = 'x', indent = 0 })
+    run:new_line('strings.py', { on_line = 16, text = 'x', indent = 8 })
+    run:new_line('line_after_indent.py', { on_line = 4, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 8, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 4, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 14, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 20, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 26, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 30, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 34, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 38, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 42, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 46, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 49, text = 'x', indent = 0 })
+    run:new_line('line_after_indent.py', { on_line = 55, text = 'x', indent = 4 })
+    run:new_line('line_after_indent.py', { on_line = 63, text = 'x', indent = 4 })
+    run:new_line('match_case.py', { on_line = 4, text = 'pass', indent = 8 })
+    run:new_line('match_case.py', { on_line = 5, text = 'pass', indent = 12 })
+    run:new_line('match_case.py', { on_line = 10, text = 'pass', indent = 8 })
+    run:new_line('match_case.py', { on_line = 15, text = 'pass', indent = 12 })
+    run:new_line('break_continue.py', { on_line = 4, text = 'pass', indent = 8 })
+    run:new_line('break_continue.py', { on_line = 9, text = 'pass', indent = 8 })
 
-    for _, line in ipairs { 2, 5, 8, 11, 16, 21, 24, 27, 34, 39 } do
-      run:new_line("return_dedent.py", { on_line = line, text = "x", indent = 0 })
+    for _, line in ipairs({ 2, 5, 8, 11, 16, 21, 24, 27, 34, 39 }) do
+      run:new_line('return_dedent.py', { on_line = line, text = 'x', indent = 0 })
     end
   end)
 end)
diff --git a/tests/indent/ql_spec.lua b/tests/indent/ql_spec.lua
index cfdce9077..605aa2365 100644
--- a/tests/indent/ql_spec.lua
+++ b/tests/indent/ql_spec.lua
@@ -1,24 +1,24 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/ql", {
+local run = Runner:new(it, 'tests/indent/ql', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Lua:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Lua:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 end)
 
-describe("new line:", function()
-  run:new_line("module.ql", { on_line = 1, text = "predicate foo() {}", indent = 2 })
+describe('new line:', function()
+  run:new_line('module.ql', { on_line = 1, text = 'predicate foo() {}', indent = 2 })
 end)
 
-describe("new line:", function()
-  run:new_line("module.ql", { on_line = 2, text = "predicate foo() {}", indent = 2 })
+describe('new line:', function()
+  run:new_line('module.ql', { on_line = 2, text = 'predicate foo() {}', indent = 2 })
 end)
diff --git a/tests/indent/query_spec.lua b/tests/indent/query_spec.lua
index ca2ccdef5..f884009a0 100644
--- a/tests/indent/query_spec.lua
+++ b/tests/indent/query_spec.lua
@@ -1,28 +1,28 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/query", {
+local run = Runner:new(it, 'tests/indent/query', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 2,
   expandtab = true,
-  lispoptions = "expr:1",
+  lispoptions = 'expr:1',
 })
 
-describe("indent Query:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {})
+describe('indent Query:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {})
   end)
-  describe("new line:", function()
-    run:new_line("test.scm", { on_line = 3, text = "(node)", indent = 2 })
-    run:new_line("test.scm", { on_line = 5, text = "(node)", indent = 2 })
-    run:new_line("test.scm", { on_line = 12, text = "(node)", indent = 2 })
-    run:new_line("test.scm", { on_line = 25, text = "(#my-directive!)", indent = 10 })
-    run:new_line("test.scm", { on_line = 34, text = '"more"', indent = 2 })
-    run:new_line("test.scm", { on_line = 35, text = "(node)", indent = 0 })
-    run:new_line("test.scm", { on_line = 40, text = "(node)", indent = 0 })
-    run:new_line("test.scm", { on_line = 44, text = "(node)", indent = 2 })
-    run:new_line("test.scm", { on_line = 46, text = "(node)", indent = 2 })
-    run:new_line("test.scm", { on_line = 48, text = "(node)", indent = 2 })
-    run:new_line("test.scm", { on_line = 50, text = "node_name", indent = 2 })
+  describe('new line:', function()
+    run:new_line('test.scm', { on_line = 3, text = '(node)', indent = 2 })
+    run:new_line('test.scm', { on_line = 5, text = '(node)', indent = 2 })
+    run:new_line('test.scm', { on_line = 12, text = '(node)', indent = 2 })
+    run:new_line('test.scm', { on_line = 25, text = '(#my-directive!)', indent = 10 })
+    run:new_line('test.scm', { on_line = 34, text = '"more"', indent = 2 })
+    run:new_line('test.scm', { on_line = 35, text = '(node)', indent = 0 })
+    run:new_line('test.scm', { on_line = 40, text = '(node)', indent = 0 })
+    run:new_line('test.scm', { on_line = 44, text = '(node)', indent = 2 })
+    run:new_line('test.scm', { on_line = 46, text = '(node)', indent = 2 })
+    run:new_line('test.scm', { on_line = 48, text = '(node)', indent = 2 })
+    run:new_line('test.scm', { on_line = 50, text = 'node_name', indent = 2 })
   end)
 end)
diff --git a/tests/indent/r_spec.lua b/tests/indent/r_spec.lua
index 08df5e11b..b6e814068 100644
--- a/tests/indent/r_spec.lua
+++ b/tests/indent/r_spec.lua
@@ -1,42 +1,42 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/r", {
+local run = Runner:new(it, 'tests/indent/r', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent R:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {})
+describe('indent R:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {})
   end)
 
-  describe("new line:", function()
-    run:new_line("comment.R", { on_line = 1, text = "# new comment", indent = 0 })
+  describe('new line:', function()
+    run:new_line('comment.R', { on_line = 1, text = '# new comment', indent = 0 })
 
-    run:new_line("cond.R", { on_line = 1, text = "x <- x + 1", indent = 0 })
-    run:new_line("cond.R", { on_line = 4, text = "x <- x + 1", indent = 2 })
-    run:new_line("cond.R", { on_line = 5, text = "x <- x + 1", indent = 2 })
-    run:new_line("cond.R", { on_line = 8, text = "x <- x + 1", indent = 4 })
+    run:new_line('cond.R', { on_line = 1, text = 'x <- x + 1', indent = 0 })
+    run:new_line('cond.R', { on_line = 4, text = 'x <- x + 1', indent = 2 })
+    run:new_line('cond.R', { on_line = 5, text = 'x <- x + 1', indent = 2 })
+    run:new_line('cond.R', { on_line = 8, text = 'x <- x + 1', indent = 4 })
 
-    run:new_line("func.R", { on_line = 1, text = "x <- x + 1", indent = 2 })
-    run:new_line("func.R", { on_line = 2, text = "a <- a + 1", indent = 4 })
-    run:new_line("func.R", { on_line = 6, text = "0,", indent = 6 })
-    run:new_line("func.R", { on_line = 6, text = "0,", indent = 6 })
-    run:new_line("func.R", { on_line = 16, text = "x <- x + 1", indent = 4 })
+    run:new_line('func.R', { on_line = 1, text = 'x <- x + 1', indent = 2 })
+    run:new_line('func.R', { on_line = 2, text = 'a <- a + 1', indent = 4 })
+    run:new_line('func.R', { on_line = 6, text = '0,', indent = 6 })
+    run:new_line('func.R', { on_line = 6, text = '0,', indent = 6 })
+    run:new_line('func.R', { on_line = 16, text = 'x <- x + 1', indent = 4 })
 
-    run:new_line("loop.R", { on_line = 1, text = "x <- x + 1", indent = 0 })
-    run:new_line("loop.R", { on_line = 3, text = "x <- x + 1", indent = 2 })
-    run:new_line("loop.R", { on_line = 8, text = "x <- x + 1", indent = 2 })
-    run:new_line("loop.R", { on_line = 14, text = "print('lol')", indent = 4 })
+    run:new_line('loop.R', { on_line = 1, text = 'x <- x + 1', indent = 0 })
+    run:new_line('loop.R', { on_line = 3, text = 'x <- x + 1', indent = 2 })
+    run:new_line('loop.R', { on_line = 8, text = 'x <- x + 1', indent = 2 })
+    run:new_line('loop.R', { on_line = 14, text = "print('lol')", indent = 4 })
 
-    run:new_line("pipe.R", { on_line = 1, text = "head(n = 10L) |>", indent = 2 })
-    run:new_line("pipe.R", { on_line = 9, text = "head()", indent = 2 })
+    run:new_line('pipe.R', { on_line = 1, text = 'head(n = 10L) |>', indent = 2 })
+    run:new_line('pipe.R', { on_line = 9, text = 'head()', indent = 2 })
 
-    run:new_line("incomplete_pipe.R", { on_line = 2, text = "head %>%", indent = 2 })
+    run:new_line('incomplete_pipe.R', { on_line = 2, text = 'head %>%', indent = 2 })
 
-    run:new_line("aligned_indent.R", { on_line = 1, text = "z,", indent = 17 })
+    run:new_line('aligned_indent.R', { on_line = 1, text = 'z,', indent = 17 })
   end)
 end)
diff --git a/tests/indent/rescript_spec.lua b/tests/indent/rescript_spec.lua
index 5b1f06abd..e97cd1e8b 100644
--- a/tests/indent/rescript_spec.lua
+++ b/tests/indent/rescript_spec.lua
@@ -1,33 +1,33 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/rescript", {
+local run = Runner:new(it, 'tests/indent/rescript', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent ReScript:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {})
+describe('indent ReScript:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {})
   end)
 
-  describe("new line:", function()
-    run:new_line("basic.res", { on_line = 5, text = "x", indent = 0 })
-    run:new_line("basic.res", { on_line = 9, text = '"another": here,', indent = 2 })
-    run:new_line("basic.res", { on_line = 10, text = "}", indent = 0 })
-    run:new_line("basic.res", { on_line = 14, text = "~test: test,", indent = 2 })
-    run:new_line("basic.res", { on_line = 18, text = "x", indent = 0 })
+  describe('new line:', function()
+    run:new_line('basic.res', { on_line = 5, text = 'x', indent = 0 })
+    run:new_line('basic.res', { on_line = 9, text = '"another": here,', indent = 2 })
+    run:new_line('basic.res', { on_line = 10, text = '}', indent = 0 })
+    run:new_line('basic.res', { on_line = 14, text = '~test: test,', indent = 2 })
+    run:new_line('basic.res', { on_line = 18, text = 'x', indent = 0 })
 
-    run:new_line("complex.res", { on_line = 3, text = "x", indent = 2 })
-    run:new_line("complex.res", { on_line = 5, text = "x", indent = 4 })
-    run:new_line("complex.res", { on_line = 17, text = "|", indent = 10 })
-    run:new_line("complex.res", { on_line = 25, text = "x", indent = 2 })
-    run:new_line("complex.res", { on_line = 60, text = "x", indent = 6 })
-    run:new_line("complex.res", { on_line = 120, text = "x", indent = 14 })
-    run:new_line("complex.res", { on_line = 136, text = "x", indent = 2 })
+    run:new_line('complex.res', { on_line = 3, text = 'x', indent = 2 })
+    run:new_line('complex.res', { on_line = 5, text = 'x', indent = 4 })
+    run:new_line('complex.res', { on_line = 17, text = '|', indent = 10 })
+    run:new_line('complex.res', { on_line = 25, text = 'x', indent = 2 })
+    run:new_line('complex.res', { on_line = 60, text = 'x', indent = 6 })
+    run:new_line('complex.res', { on_line = 120, text = 'x', indent = 14 })
+    run:new_line('complex.res', { on_line = 136, text = 'x', indent = 2 })
 
-    run:new_line("conditional.res", { on_line = 6, text = "test: bool,", indent = 2 })
-    run:new_line("conditional.res", { on_line = 95, text = "x", indent = 10 })
+    run:new_line('conditional.res', { on_line = 6, text = 'test: bool,', indent = 2 })
+    run:new_line('conditional.res', { on_line = 95, text = 'x', indent = 10 })
   end)
 end)
diff --git a/tests/indent/ruby_spec.lua b/tests/indent/ruby_spec.lua
index b669b8938..4dcd4d0fa 100644
--- a/tests/indent/ruby_spec.lua
+++ b/tests/indent/ruby_spec.lua
@@ -1,22 +1,22 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/ruby", {
+local run = Runner:new(it, 'tests/indent/ruby', {
   shiftwidth = 2,
   expandtab = true,
 })
 
-describe("indent Ruby:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
-      expected_failures = { "./period-issue-3364.rb" },
+describe('indent Ruby:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
+      expected_failures = { './period-issue-3364.rb' },
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("indent-unless.rb", { on_line = 1, text = "stmt", indent = 2 })
-    run:new_line("indent-assignment.rb", { on_line = 1, text = "1 +", indent = 2 })
-    run:new_line("indent-parenthesized-statements.rb", { on_line = 1, text = "stmt", indent = 2 })
-    run:new_line("indent-rescue.rb", { on_line = 1, text = "rescue", indent = 0 })
-    run:new_line("indent-ensure.rb", { on_line = 1, text = "ensure", indent = 0 })
+  describe('new line:', function()
+    run:new_line('indent-unless.rb', { on_line = 1, text = 'stmt', indent = 2 })
+    run:new_line('indent-assignment.rb', { on_line = 1, text = '1 +', indent = 2 })
+    run:new_line('indent-parenthesized-statements.rb', { on_line = 1, text = 'stmt', indent = 2 })
+    run:new_line('indent-rescue.rb', { on_line = 1, text = 'rescue', indent = 0 })
+    run:new_line('indent-ensure.rb', { on_line = 1, text = 'ensure', indent = 0 })
   end)
 end)
diff --git a/tests/indent/rust_spec.lua b/tests/indent/rust_spec.lua
index 795765ba5..3671e9ee7 100644
--- a/tests/indent/rust_spec.lua
+++ b/tests/indent/rust_spec.lua
@@ -1,66 +1,66 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/rust", {
+local run = Runner:new(it, 'tests/indent/rust', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Rust:", function()
-  describe("whole file:", function()
-    run:whole_file "."
+describe('indent Rust:', function()
+  describe('whole file:', function()
+    run:whole_file('.')
   end)
 
-  describe("new line:", function()
-    run:new_line("array.rs", { on_line = 2, text = "0,", indent = 4 })
-    run:new_line("array.rs", { on_line = 8, text = "0,", indent = 8 })
-    run:new_line("comment.rs", { on_line = 3, text = "a", indent = "/// " })
-    run:new_line("comment.rs", { on_line = 10, text = "a", indent = "    /// " })
-    run:new_line("cond.rs", { on_line = 11, text = "x += 1;", indent = 12 })
-    run:new_line("cond.rs", { on_line = 2, text = "x += 1;", indent = 8 })
-    run:new_line("cond.rs", { on_line = 4, text = "x += 1;", indent = 8 })
-    run:new_line("cond.rs", { on_line = 6, text = "x += 1;", indent = 8 })
-    run:new_line("cond.rs", { on_line = 8, text = "x += 1;", indent = 4 })
-    run:new_line("if_let_cond.rs", { on_line = 2, text = "let a = 1;", indent = 8 })
-    run:new_line("if_let_cond.rs", { on_line = 4, text = "let a = 1;", indent = 8 })
-    run:new_line("if_let_cond.rs", { on_line = 6, text = "let a = 1;", indent = 4 })
-    run:new_line("enum.rs", { on_line = 2, text = "Q,", indent = 4 })
-    run:new_line("enum.rs", { on_line = 4, text = "i32,", indent = 8 })
-    run:new_line("enum.rs", { on_line = 8, text = "z: u32,", indent = 8 })
-    run:new_line("enum.rs", { on_line = 11, text = "let _x = 1;", indent = 0 })
-    run:new_line("func.rs", { on_line = 1, text = "let _x = 1;", indent = 4 })
-    run:new_line("func.rs", { on_line = 3, text = "let _x = 1;", indent = 0 })
-    run:new_line("func.rs", { on_line = 6, text = "z: i32,", indent = 4 })
-    run:new_line("impl.rs", { on_line = 3, text = "const FOO: u32 = 1;", indent = 4 })
-    run:new_line("impl.rs", { on_line = 4, text = "let _x = 1;", indent = 8 })
-    run:new_line("impl.rs", { on_line = 6, text = "let _x = 1;", indent = 4 })
-    run:new_line("impl.rs", { on_line = 7, text = "let _x = 1;", indent = 0 })
-    run:new_line("loop.rs", { on_line = 10, text = "x += 1;", indent = 8 })
-    run:new_line("loop.rs", { on_line = 2, text = "x += 1;", indent = 8 })
-    run:new_line("loop.rs", { on_line = 6, text = "x += 1;", indent = 8 })
-    run:new_line("macro.rs", { on_line = 1, text = "() => {},", indent = 4 })
-    run:new_line("macro.rs", { on_line = 12, text = "B C", indent = 4 })
-    run:new_line("macro.rs", { on_line = 2, text = "struct $c;", indent = 8 })
-    run:new_line("match.rs", { on_line = 2, text = "-1 => -1,", indent = 8 })
-    run:new_line("match.rs", { on_line = 7, text = "let y = 1;", indent = 12 })
-    run:new_line("match.rs", { on_line = 10, text = "let y = 1;", indent = 4 })
-    run:new_line("mod.rs", { on_line = 1, text = "const Z: i32 = 1;", indent = 4 })
-    run:new_line("mod.rs", { on_line = 2, text = "const Z: i32 = 1;", indent = 4 })
-    run:new_line("mod.rs", { on_line = 6, text = "const Z: i32 = 1;", indent = 8 })
-    run:new_line("mod.rs", { on_line = 7, text = "const Z: i32 = 1;", indent = 4 })
-    run:new_line("string.rs", { on_line = 2, text = "brave new", indent = 0 })
-    run:new_line("string.rs", { on_line = 5, text = "brave new \\", indent = 8 })
-    run:new_line("string.rs", { on_line = 9, text = "brave new \\", indent = 8 })
-    run:new_line("struct.rs", { on_line = 1, text = "z: i32,", indent = 4 })
-    run:new_line("struct.rs", { on_line = 2, text = "z: i32,", indent = 4 })
-    run:new_line("struct.rs", { on_line = 4, text = "let y = 1;", indent = 0 })
-    run:new_line("trait.rs", { on_line = 4, text = "fn baz();", indent = 4 })
-    run:new_line("trait.rs", { on_line = 5, text = "let y = 1;", indent = 0 })
-    run:new_line("trait.rs", { on_line = 7, text = "fn baz();", indent = 4 })
-    run:new_line("trait.rs", { on_line = 8, text = "()", indent = 8 })
-    run:new_line("where.rs", { on_line = 17, text = "T: Debug,", indent = 4 })
-    run:new_line("where.rs", { on_line = 2, text = "T: Debug,", indent = 4 })
-    run:new_line("where.rs", { on_line = 9, text = "T: Debug,", indent = 4 })
+  describe('new line:', function()
+    run:new_line('array.rs', { on_line = 2, text = '0,', indent = 4 })
+    run:new_line('array.rs', { on_line = 8, text = '0,', indent = 8 })
+    run:new_line('comment.rs', { on_line = 3, text = 'a', indent = '/// ' })
+    run:new_line('comment.rs', { on_line = 10, text = 'a', indent = '    /// ' })
+    run:new_line('cond.rs', { on_line = 11, text = 'x += 1;', indent = 12 })
+    run:new_line('cond.rs', { on_line = 2, text = 'x += 1;', indent = 8 })
+    run:new_line('cond.rs', { on_line = 4, text = 'x += 1;', indent = 8 })
+    run:new_line('cond.rs', { on_line = 6, text = 'x += 1;', indent = 8 })
+    run:new_line('cond.rs', { on_line = 8, text = 'x += 1;', indent = 4 })
+    run:new_line('if_let_cond.rs', { on_line = 2, text = 'let a = 1;', indent = 8 })
+    run:new_line('if_let_cond.rs', { on_line = 4, text = 'let a = 1;', indent = 8 })
+    run:new_line('if_let_cond.rs', { on_line = 6, text = 'let a = 1;', indent = 4 })
+    run:new_line('enum.rs', { on_line = 2, text = 'Q,', indent = 4 })
+    run:new_line('enum.rs', { on_line = 4, text = 'i32,', indent = 8 })
+    run:new_line('enum.rs', { on_line = 8, text = 'z: u32,', indent = 8 })
+    run:new_line('enum.rs', { on_line = 11, text = 'let _x = 1;', indent = 0 })
+    run:new_line('func.rs', { on_line = 1, text = 'let _x = 1;', indent = 4 })
+    run:new_line('func.rs', { on_line = 3, text = 'let _x = 1;', indent = 0 })
+    run:new_line('func.rs', { on_line = 6, text = 'z: i32,', indent = 4 })
+    run:new_line('impl.rs', { on_line = 3, text = 'const FOO: u32 = 1;', indent = 4 })
+    run:new_line('impl.rs', { on_line = 4, text = 'let _x = 1;', indent = 8 })
+    run:new_line('impl.rs', { on_line = 6, text = 'let _x = 1;', indent = 4 })
+    run:new_line('impl.rs', { on_line = 7, text = 'let _x = 1;', indent = 0 })
+    run:new_line('loop.rs', { on_line = 10, text = 'x += 1;', indent = 8 })
+    run:new_line('loop.rs', { on_line = 2, text = 'x += 1;', indent = 8 })
+    run:new_line('loop.rs', { on_line = 6, text = 'x += 1;', indent = 8 })
+    run:new_line('macro.rs', { on_line = 1, text = '() => {},', indent = 4 })
+    run:new_line('macro.rs', { on_line = 12, text = 'B C', indent = 4 })
+    run:new_line('macro.rs', { on_line = 2, text = 'struct $c;', indent = 8 })
+    run:new_line('match.rs', { on_line = 2, text = '-1 => -1,', indent = 8 })
+    run:new_line('match.rs', { on_line = 7, text = 'let y = 1;', indent = 12 })
+    run:new_line('match.rs', { on_line = 10, text = 'let y = 1;', indent = 4 })
+    run:new_line('mod.rs', { on_line = 1, text = 'const Z: i32 = 1;', indent = 4 })
+    run:new_line('mod.rs', { on_line = 2, text = 'const Z: i32 = 1;', indent = 4 })
+    run:new_line('mod.rs', { on_line = 6, text = 'const Z: i32 = 1;', indent = 8 })
+    run:new_line('mod.rs', { on_line = 7, text = 'const Z: i32 = 1;', indent = 4 })
+    run:new_line('string.rs', { on_line = 2, text = 'brave new', indent = 0 })
+    run:new_line('string.rs', { on_line = 5, text = 'brave new \\', indent = 8 })
+    run:new_line('string.rs', { on_line = 9, text = 'brave new \\', indent = 8 })
+    run:new_line('struct.rs', { on_line = 1, text = 'z: i32,', indent = 4 })
+    run:new_line('struct.rs', { on_line = 2, text = 'z: i32,', indent = 4 })
+    run:new_line('struct.rs', { on_line = 4, text = 'let y = 1;', indent = 0 })
+    run:new_line('trait.rs', { on_line = 4, text = 'fn baz();', indent = 4 })
+    run:new_line('trait.rs', { on_line = 5, text = 'let y = 1;', indent = 0 })
+    run:new_line('trait.rs', { on_line = 7, text = 'fn baz();', indent = 4 })
+    run:new_line('trait.rs', { on_line = 8, text = '()', indent = 8 })
+    run:new_line('where.rs', { on_line = 17, text = 'T: Debug,', indent = 4 })
+    run:new_line('where.rs', { on_line = 2, text = 'T: Debug,', indent = 4 })
+    run:new_line('where.rs', { on_line = 9, text = 'T: Debug,', indent = 4 })
   end)
 end)
diff --git a/tests/indent/smali_spec.lua b/tests/indent/smali_spec.lua
index cddc4f9d2..44e4a9881 100644
--- a/tests/indent/smali_spec.lua
+++ b/tests/indent/smali_spec.lua
@@ -1,25 +1,28 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/smali", {
+local run = Runner:new(it, 'tests/indent/smali', {
   tabstop = 4,
   shiftwidth = 4,
   expandtab = false,
 })
 
-describe("indent Smali:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Smali:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("field.smali", { on_line = 7, text = 'value1 = "test"', indent = 1 })
-    run:new_line("field.smali", { on_line = 10, text = "value2 = Lsome/enum;", indent = 2 })
-    run:new_line("array_and_switch.smali", { on_line = 43, text = "1 2 3 4 5 6 200", indent = 2 })
-    run:new_line("array_and_switch.smali", { on_line = 48, text = "Label10:", indent = 2 })
-    run:new_line("method.smali", { on_line = 7, text = ".registers 10", indent = 1 })
-    run:new_line("parameter.smali", { on_line = 20, text = ".annotation runtime Lsome/annotation;", indent = 3 })
-    run:new_line("parameter.smali", { on_line = 21, text = 'something = "some value"', indent = 3 })
+  describe('new line:', function()
+    run:new_line('field.smali', { on_line = 7, text = 'value1 = "test"', indent = 1 })
+    run:new_line('field.smali', { on_line = 10, text = 'value2 = Lsome/enum;', indent = 2 })
+    run:new_line('array_and_switch.smali', { on_line = 43, text = '1 2 3 4 5 6 200', indent = 2 })
+    run:new_line('array_and_switch.smali', { on_line = 48, text = 'Label10:', indent = 2 })
+    run:new_line('method.smali', { on_line = 7, text = '.registers 10', indent = 1 })
+    run:new_line(
+      'parameter.smali',
+      { on_line = 20, text = '.annotation runtime Lsome/annotation;', indent = 3 }
+    )
+    run:new_line('parameter.smali', { on_line = 21, text = 'something = "some value"', indent = 3 })
   end)
 end)
diff --git a/tests/indent/sql_spec.lua b/tests/indent/sql_spec.lua
index 2fdfc9b1b..9d3a3a8e6 100644
--- a/tests/indent/sql_spec.lua
+++ b/tests/indent/sql_spec.lua
@@ -1,19 +1,19 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/sql", {
+local run = Runner:new(it, 'tests/indent/sql', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent SQL:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent SQL:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function() end)
+  describe('new line:', function() end)
 end)
diff --git a/tests/indent/sway_spec.lua b/tests/indent/sway_spec.lua
index d37573ae9..d6f4506ef 100644
--- a/tests/indent/sway_spec.lua
+++ b/tests/indent/sway_spec.lua
@@ -1,20 +1,20 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/sway", {
+local run = Runner:new(it, 'tests/indent/sway', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 4,
   expandtab = true,
 })
 
-describe("indent Sway:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {})
+describe('indent Sway:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {})
   end)
-  describe("new line:", function()
-    run:new_line("main.sw", { on_line = 12, text = "const CONST: u32 = 2;", indent = 0 })
-    run:new_line("main.sw", { on_line = 14, text = "let hi = 5;", indent = 4 })
-    run:new_line("main.sw", { on_line = 15, text = "let hi = 5;", indent = 8 })
-    run:new_line("main.sw", { on_line = 92, text = "let hi = 5;", indent = 12 })
+  describe('new line:', function()
+    run:new_line('main.sw', { on_line = 12, text = 'const CONST: u32 = 2;', indent = 0 })
+    run:new_line('main.sw', { on_line = 14, text = 'let hi = 5;', indent = 4 })
+    run:new_line('main.sw', { on_line = 15, text = 'let hi = 5;', indent = 8 })
+    run:new_line('main.sw', { on_line = 92, text = 'let hi = 5;', indent = 12 })
   end)
 end)
diff --git a/tests/indent/swift_spec.lua b/tests/indent/swift_spec.lua
index 501cbfa81..8c9b2d063 100644
--- a/tests/indent/swift_spec.lua
+++ b/tests/indent/swift_spec.lua
@@ -1,22 +1,37 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/swift", {
+local run = Runner:new(it, 'tests/indent/swift', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 2,
   expandtab = true,
 })
 
-describe("indent Swift:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {})
+describe('indent Swift:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {})
   end)
-  describe("new line:", function()
-    run:new_line("declarations.swift", { on_line = 6, text = "var x = 1", indent = 2 })
-    run:new_line("declarations.swift", { on_line = 12, text = "var textInsideInit = true", indent = 4 })
-    run:new_line("declarations.swift", { on_line = 19, text = "var textInsideWillSet = 1", indent = 6 })
-    run:new_line("declarations.swift", { on_line = 22, text = "var textInsideDidSet = 1", indent = 6 })
-    run:new_line("declarations.swift", { on_line = 27, text = "var textInsideOverrideFunc", indent = 4 })
-    run:new_line("declarations.swift", { on_line = 33, text = "var InsideProtocol: String { get }", indent = 2 })
+  describe('new line:', function()
+    run:new_line('declarations.swift', { on_line = 6, text = 'var x = 1', indent = 2 })
+    run:new_line(
+      'declarations.swift',
+      { on_line = 12, text = 'var textInsideInit = true', indent = 4 }
+    )
+    run:new_line(
+      'declarations.swift',
+      { on_line = 19, text = 'var textInsideWillSet = 1', indent = 6 }
+    )
+    run:new_line(
+      'declarations.swift',
+      { on_line = 22, text = 'var textInsideDidSet = 1', indent = 6 }
+    )
+    run:new_line(
+      'declarations.swift',
+      { on_line = 27, text = 'var textInsideOverrideFunc', indent = 4 }
+    )
+    run:new_line(
+      'declarations.swift',
+      { on_line = 33, text = 'var InsideProtocol: String { get }', indent = 2 }
+    )
   end)
 end)
diff --git a/tests/indent/t32_spec.lua b/tests/indent/t32_spec.lua
index 88d26612b..30c6542e0 100644
--- a/tests/indent/t32_spec.lua
+++ b/tests/indent/t32_spec.lua
@@ -1,137 +1,171 @@
-local Runner = require("tests.indent.common").Runner
-local XFAIL = require("tests.indent.common").XFAIL
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
 
-local runner = Runner:new(it, "tests/indent/t32", {
+local runner = Runner:new(it, 'tests/indent/t32', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent t32:", function()
-  describe("whole file:", function()
-    runner:whole_file "."
+describe('indent t32:', function()
+  describe('whole file:', function()
+    runner:whole_file('.')
   end)
 
-  describe("new line:", function()
-    runner:new_line("if_block.cmm", { on_line = 2, text = "GOTO start", indent = 0 }, "command after IF", XFAIL)
+  describe('new line:', function()
+    runner:new_line(
+      'if_block.cmm',
+      { on_line = 2, text = 'GOTO start', indent = 0 },
+      'command after IF',
+      XFAIL
+    )
 
-    runner:new_line("if_block.cmm", { on_line = 5, text = "GOTO start", indent = 2 }, "command in IF then block")
+    runner:new_line(
+      'if_block.cmm',
+      { on_line = 5, text = 'GOTO start', indent = 2 },
+      'command in IF then block'
+    )
 
-    runner:new_line("if_block.cmm", { on_line = 4, text = "(", indent = 0 }, "block after IF")
+    runner:new_line('if_block.cmm', { on_line = 4, text = '(', indent = 0 }, 'block after IF')
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 1, 2 },
       { 14, 2 },
       { 19, 2 },
       { 21, 2 },
       { 41, 2 },
       { 42, 4 },
-    } do
+    }) do
       runner:new_line(
-        "if_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in IF then[" .. ii .. "]"
+        'if_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in IF then[' .. ii .. ']'
       )
     end
 
     -- Insertion of a command right before the existing block results in
     -- incorrect syntax. The parse either detect an error or incorrectly
     -- assumes "ELSE IF" is a command.
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 26, 2 },
       { 30, 2 },
-    } do
+    }) do
       runner:new_line(
-        "if_block.cmm",
+        'if_block.cmm',
         { on_line = test[1], text = 'PRINT ""', indent = test[2] },
-        "displace block in IF then[" .. ii .. "]",
+        'displace block in IF then[' .. ii .. ']',
         XFAIL
       )
     end
 
-    runner:new_line("if_block.cmm", { on_line = 45, text = "&x=1.", indent = 6 }, "command in IF then", XFAIL)
+    runner:new_line(
+      'if_block.cmm',
+      { on_line = 45, text = '&x=1.', indent = 6 },
+      'command in IF then',
+      XFAIL
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 16, 2 },
       { 21, 2 },
       { 23, 2 },
       { 44, 4 },
-    } do
+    }) do
       runner:new_line(
-        "if_block.cmm",
-        { on_line = test[1], text = "CONTinue\n", indent = test[2] },
-        "command in IF else[" .. ii .. "]"
+        'if_block.cmm',
+        { on_line = test[1], text = 'CONTinue\n', indent = test[2] },
+        'command in IF else[' .. ii .. ']'
       )
     end
 
-    runner:new_line("while_block.cmm", { on_line = 2, text = "&x=1.", indent = 2 }, "command after WHILE")
+    runner:new_line(
+      'while_block.cmm',
+      { on_line = 2, text = '&x=1.', indent = 2 },
+      'command after WHILE'
+    )
 
-    runner:new_line("while_block.cmm", { on_line = 4, text = "&x=1.", indent = 0 }, "command after WHILE")
+    runner:new_line(
+      'while_block.cmm',
+      { on_line = 4, text = '&x=1.', indent = 0 },
+      'command after WHILE'
+    )
 
-    runner:new_line("while_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block in WHILE then")
+    runner:new_line(
+      'while_block.cmm',
+      { on_line = 1, text = '(\n', indent = 0 },
+      'block in WHILE then'
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 5, 2 },
       { 12, 2 },
-    } do
+    }) do
       runner:new_line(
-        "while_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in WHILE then block[" .. ii .. "]"
+        'while_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in WHILE then block[' .. ii .. ']'
       )
     end
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 1, 0 },
       { 4, 2 },
-    } do
+    }) do
       runner:new_line(
-        "repeat_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after RePeaT[" .. ii .. "]"
+        'repeat_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command after RePeaT[' .. ii .. ']'
       )
     end
 
-    runner:new_line("repeat_block.cmm", { on_line = 3, text = "(\n", indent = 0 }, "block in RePeaT then")
+    runner:new_line(
+      'repeat_block.cmm',
+      { on_line = 3, text = '(\n', indent = 0 },
+      'block in RePeaT then'
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 7, 2 },
       { 18, 2 },
       { 24, 2 },
-    } do
+    }) do
       runner:new_line(
-        "repeat_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in RePeaT then block [" .. ii .. "]"
+        'repeat_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in RePeaT then block [' .. ii .. ']'
       )
     end
 
-    runner:new_line("subroutine_block.cmm", { on_line = 1, text = "(\n", indent = 0 }, "block after call label")
+    runner:new_line(
+      'subroutine_block.cmm',
+      { on_line = 1, text = '(\n', indent = 0 },
+      'block after call label'
+    )
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 2, 2 },
       { 3, 2 },
       { 8, 2 },
       { 12, 2 },
       { 19, 2 },
-    } do
+    }) do
       runner:new_line(
-        "subroutine_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command in subroutine block[" .. ii .. "]"
+        'subroutine_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command in subroutine block[' .. ii .. ']'
       )
     end
 
-    for ii, test in ipairs {
+    for ii, test in ipairs({
       { 5, 2 },
       { 13, 2 },
       { 23, 2 },
-    } do
+    }) do
       runner:new_line(
-        "subroutine_block.cmm",
-        { on_line = test[1], text = "&x=1.", indent = test[2] },
-        "command after subroutine block[" .. ii .. "]"
+        'subroutine_block.cmm',
+        { on_line = test[1], text = '&x=1.', indent = test[2] },
+        'command after subroutine block[' .. ii .. ']'
       )
     end
   end)
diff --git a/tests/indent/terraform_spec.lua b/tests/indent/terraform_spec.lua
index 49fa22c20..3cfcb937b 100644
--- a/tests/indent/terraform_spec.lua
+++ b/tests/indent/terraform_spec.lua
@@ -1,35 +1,56 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/terraform", {
+local run = Runner:new(it, 'tests/indent/terraform', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
 })
 
-describe("indent Terraform:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Terraform:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("no-indent-after-brace.tf", { on_line = 4, text = "# Wow, no indent here please", indent = 0 })
-    run:new_line("indent-in-multiline-tuples.tf", { on_line = 4, text = "3,", indent = 4 })
-    run:new_line("indent-in-multiline-tuples.tf", { on_line = 3, text = "# as elements", indent = 4 })
-    run:new_line("indent-in-multiline-tuples.tf", { on_line = 5, text = "# as outer block", indent = 2 })
-    run:new_line("indent-in-multiline-tuples.tf", { on_line = 1, text = "# as outer block", indent = 2 })
-    run:new_line("indent-in-multiline-objects.tf", { on_line = 4, text = '3: "baz",', indent = 4 })
-    run:new_line("indent-in-multiline-objects.tf", { on_line = 3, text = "# as elements", indent = 4 })
-    run:new_line("indent-in-multiline-objects.tf", { on_line = 5, text = "# as outer block", indent = 2 })
-    run:new_line("indent-in-multiline-objects.tf", { on_line = 1, text = "# as outer block", indent = 2 })
-    run:new_line("multiple-attributes.tf", { on_line = 2, text = "a = 1", indent = 2 })
-    run:new_line("multiple-attributes.tf", { on_line = 3, text = "a = 1", indent = 2 })
-    run:new_line("multiple-attributes.tf", { on_line = 4, text = "a = 1", indent = 0 })
-    run:new_line("nested_blocks.tf", { on_line = 3, text = "a = 1", indent = 4 })
-    run:new_line("nested_blocks.tf", { on_line = 4, text = "a = 1", indent = 2 })
-    run:new_line("function_call.tf", { on_line = 4, text = "c,", indent = 4 })
-    run:new_line("function_call.tf", { on_line = 5, text = "a = 1", indent = 2 })
+  describe('new line:', function()
+    run:new_line(
+      'no-indent-after-brace.tf',
+      { on_line = 4, text = '# Wow, no indent here please', indent = 0 }
+    )
+    run:new_line('indent-in-multiline-tuples.tf', { on_line = 4, text = '3,', indent = 4 })
+    run:new_line(
+      'indent-in-multiline-tuples.tf',
+      { on_line = 3, text = '# as elements', indent = 4 }
+    )
+    run:new_line(
+      'indent-in-multiline-tuples.tf',
+      { on_line = 5, text = '# as outer block', indent = 2 }
+    )
+    run:new_line(
+      'indent-in-multiline-tuples.tf',
+      { on_line = 1, text = '# as outer block', indent = 2 }
+    )
+    run:new_line('indent-in-multiline-objects.tf', { on_line = 4, text = '3: "baz",', indent = 4 })
+    run:new_line(
+      'indent-in-multiline-objects.tf',
+      { on_line = 3, text = '# as elements', indent = 4 }
+    )
+    run:new_line(
+      'indent-in-multiline-objects.tf',
+      { on_line = 5, text = '# as outer block', indent = 2 }
+    )
+    run:new_line(
+      'indent-in-multiline-objects.tf',
+      { on_line = 1, text = '# as outer block', indent = 2 }
+    )
+    run:new_line('multiple-attributes.tf', { on_line = 2, text = 'a = 1', indent = 2 })
+    run:new_line('multiple-attributes.tf', { on_line = 3, text = 'a = 1', indent = 2 })
+    run:new_line('multiple-attributes.tf', { on_line = 4, text = 'a = 1', indent = 0 })
+    run:new_line('nested_blocks.tf', { on_line = 3, text = 'a = 1', indent = 4 })
+    run:new_line('nested_blocks.tf', { on_line = 4, text = 'a = 1', indent = 2 })
+    run:new_line('function_call.tf', { on_line = 4, text = 'c,', indent = 4 })
+    run:new_line('function_call.tf', { on_line = 5, text = 'a = 1', indent = 2 })
   end)
 end)
diff --git a/tests/indent/tiger_spec.lua b/tests/indent/tiger_spec.lua
index c1f252fd8..b41019c12 100644
--- a/tests/indent/tiger_spec.lua
+++ b/tests/indent/tiger_spec.lua
@@ -1,113 +1,233 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local runner = Runner:new(it, "tests/indent/tiger", {
+local runner = Runner:new(it, 'tests/indent/tiger', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Tiger:", function()
-  describe("whole file:", function()
-    runner:whole_file "."
+describe('indent Tiger:', function()
+  describe('whole file:', function()
+    runner:whole_file('.')
   end)
 
-  describe("new line:", function()
-    runner:new_line("classes.tig", { on_line = 1, text = "var a := 0", indent = 2 }, "class declaration beginning")
-    runner:new_line("classes.tig", { on_line = 2, text = "var a := 0", indent = 2 }, "class declaration after field")
-    runner:new_line("classes.tig", { on_line = 4, text = "var a := 0", indent = 2 }, "class declaration after method")
-    runner:new_line("classes.tig", { on_line = 5, text = "var a := 0", indent = 0 }, "after class declaration")
-    runner:new_line("classes.tig", { on_line = 7, text = "var a := 0", indent = 2 }, "class type beginning")
-    runner:new_line("classes.tig", { on_line = 8, text = "var a := 0", indent = 2 }, "class type after field")
-    runner:new_line("classes.tig", { on_line = 10, text = "self.a := 0", indent = 4 }, "inside method")
-    runner:new_line("classes.tig", { on_line = 13, text = "var a := 0", indent = 2 }, "class type after method")
-    runner:new_line("classes.tig", { on_line = 14, text = "var a := 0", indent = 0 }, "after class type")
+  describe('new line:', function()
+    runner:new_line(
+      'classes.tig',
+      { on_line = 1, text = 'var a := 0', indent = 2 },
+      'class declaration beginning'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 2, text = 'var a := 0', indent = 2 },
+      'class declaration after field'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 4, text = 'var a := 0', indent = 2 },
+      'class declaration after method'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 5, text = 'var a := 0', indent = 0 },
+      'after class declaration'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 7, text = 'var a := 0', indent = 2 },
+      'class type beginning'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 8, text = 'var a := 0', indent = 2 },
+      'class type after field'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 10, text = 'self.a := 0', indent = 4 },
+      'inside method'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 13, text = 'var a := 0', indent = 2 },
+      'class type after method'
+    )
+    runner:new_line(
+      'classes.tig',
+      { on_line = 14, text = 'var a := 0', indent = 0 },
+      'after class type'
+    )
 
-    runner:new_line("control-flow.tig", { on_line = 2, text = "true", indent = 4 }, "if condition")
-    runner:new_line("control-flow.tig", { on_line = 4, text = "true", indent = 4 }, "if consequence")
-    runner:new_line("control-flow.tig", { on_line = 4, text = "true", indent = 4 }, "if alternative")
-    runner:new_line("control-flow.tig", { on_line = 10, text = "start := 0", indent = 4 }, "for index start")
-    runner:new_line("control-flow.tig", { on_line = 12, text = "the_end", indent = 4 }, "for index end")
-    runner:new_line("control-flow.tig", { on_line = 14, text = "break", indent = 4 }, "for body")
-    runner:new_line("control-flow.tig", { on_line = 18, text = "true", indent = 4 }, "while condition")
-    runner:new_line("control-flow.tig", { on_line = 20, text = "break", indent = 4 }, "while body")
-
-    runner:new_line("functions.tig", { on_line = 1, text = "parameter: int,", indent = 2 }, "parameter list beginning")
-    runner:new_line("functions.tig", { on_line = 2, text = "parameter: int,", indent = 2 }, "parameter list middle")
-    runner:new_line("functions.tig", { on_line = 4, text = ",parameter: int", indent = 2 }, "parameter list end")
-    runner:new_line("functions.tig", { on_line = 5, text = "var a := 0", indent = 0 }, "after parameter list")
-    runner:new_line("functions.tig", { on_line = 7, text = "print(a)", indent = 2 }, "function body")
-    runner:new_line("functions.tig", { on_line = 9, text = "a,", indent = 6 }, "function call beginning")
-    runner:new_line("functions.tig", { on_line = 10, text = "a,", indent = 6 }, "function call middle")
-    runner:new_line("functions.tig", { on_line = 12, text = ",a", indent = 6 }, "function call end")
-    runner:new_line("functions.tig", { on_line = 13, text = "; print(a)", indent = 4 }, "after function call")
-    runner:new_line("functions.tig", { on_line = 14, text = "var a := 12", indent = 0 }, "after function declaration")
-
-    runner:new_line("groupings.tig", { on_line = 2, text = "var b := 0", indent = 2 }, "let declarations")
-    runner:new_line("groupings.tig", { on_line = 3, text = "a := a + 1", indent = 2 }, "after 'in'")
-    runner:new_line("groupings.tig", { on_line = 4, text = "a := a + 1;", indent = 4 }, "sequence")
-    runner:new_line("groupings.tig", { on_line = 8, text = "a := a + 1;", indent = 2 }, "after sequence")
-    runner:new_line("groupings.tig", { on_line = 10, text = "+ 1", indent = 0 }, "after 'end'")
+    runner:new_line('control-flow.tig', { on_line = 2, text = 'true', indent = 4 }, 'if condition')
+    runner:new_line(
+      'control-flow.tig',
+      { on_line = 4, text = 'true', indent = 4 },
+      'if consequence'
+    )
+    runner:new_line(
+      'control-flow.tig',
+      { on_line = 4, text = 'true', indent = 4 },
+      'if alternative'
+    )
+    runner:new_line(
+      'control-flow.tig',
+      { on_line = 10, text = 'start := 0', indent = 4 },
+      'for index start'
+    )
+    runner:new_line(
+      'control-flow.tig',
+      { on_line = 12, text = 'the_end', indent = 4 },
+      'for index end'
+    )
+    runner:new_line('control-flow.tig', { on_line = 14, text = 'break', indent = 4 }, 'for body')
+    runner:new_line(
+      'control-flow.tig',
+      { on_line = 18, text = 'true', indent = 4 },
+      'while condition'
+    )
+    runner:new_line('control-flow.tig', { on_line = 20, text = 'break', indent = 4 }, 'while body')
 
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 4, text = "field: record,", indent = 4 },
-      "record type beginning"
+      'functions.tig',
+      { on_line = 1, text = 'parameter: int,', indent = 2 },
+      'parameter list beginning'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 5, text = "field: record,", indent = 4 },
-      "record type middle"
+      'functions.tig',
+      { on_line = 2, text = 'parameter: int,', indent = 2 },
+      'parameter list middle'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 7, text = ",field: record", indent = 4 },
-      "record type end"
-    )
-    runner:new_line("values-and-expressions.tig", { on_line = 8, text = "var a := 0", indent = 2 }, "after record type")
-    runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 10, text = "0", indent = 4 },
-      "variable declaration init value"
+      'functions.tig',
+      { on_line = 4, text = ',parameter: int', indent = 2 },
+      'parameter list end'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 11, text = "+ a", indent = 4 },
-      "variable declaration init follow-up"
-    )
-    runner:new_line("values-and-expressions.tig", { on_line = 13, text = "a", indent = 4 }, "array index")
-    runner:new_line("values-and-expressions.tig", { on_line = 14, text = "+ a", indent = 4 }, "array index follow-up")
-    runner:new_line("values-and-expressions.tig", { on_line = 15, text = "+ a", indent = 2 }, "after array value")
-    runner:new_line("values-and-expressions.tig", { on_line = 18, text = "a", indent = 4 }, "array expression size")
-    runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 20, text = "of", indent = 4 },
-      "array expression after size"
+      'functions.tig',
+      { on_line = 5, text = 'var a := 0', indent = 0 },
+      'after parameter list'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 21, text = "a", indent = 4 },
-      "array expression init value"
+      'functions.tig',
+      { on_line = 7, text = 'print(a)', indent = 2 },
+      'function body'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 25, text = "field = 0,", indent = 4 },
-      "record expression beginning"
+      'functions.tig',
+      { on_line = 9, text = 'a,', indent = 6 },
+      'function call beginning'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 26, text = "field = 0,", indent = 4 },
-      "record expression middle"
+      'functions.tig',
+      { on_line = 10, text = 'a,', indent = 6 },
+      'function call middle'
+    )
+    runner:new_line('functions.tig', { on_line = 12, text = ',a', indent = 6 }, 'function call end')
+    runner:new_line(
+      'functions.tig',
+      { on_line = 13, text = '; print(a)', indent = 4 },
+      'after function call'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 28, text = ",field = 0", indent = 4 },
-      "record expression end"
+      'functions.tig',
+      { on_line = 14, text = 'var a := 12', indent = 0 },
+      'after function declaration'
+    )
+
+    runner:new_line(
+      'groupings.tig',
+      { on_line = 2, text = 'var b := 0', indent = 2 },
+      'let declarations'
+    )
+    runner:new_line('groupings.tig', { on_line = 3, text = 'a := a + 1', indent = 2 }, "after 'in'")
+    runner:new_line('groupings.tig', { on_line = 4, text = 'a := a + 1;', indent = 4 }, 'sequence')
+    runner:new_line(
+      'groupings.tig',
+      { on_line = 8, text = 'a := a + 1;', indent = 2 },
+      'after sequence'
+    )
+    runner:new_line('groupings.tig', { on_line = 10, text = '+ 1', indent = 0 }, "after 'end'")
+
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 4, text = 'field: record,', indent = 4 },
+      'record type beginning'
     )
     runner:new_line(
-      "values-and-expressions.tig",
-      { on_line = 29, text = "a := 0", indent = 2 },
-      "after record expression"
+      'values-and-expressions.tig',
+      { on_line = 5, text = 'field: record,', indent = 4 },
+      'record type middle'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 7, text = ',field: record', indent = 4 },
+      'record type end'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 8, text = 'var a := 0', indent = 2 },
+      'after record type'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 10, text = '0', indent = 4 },
+      'variable declaration init value'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 11, text = '+ a', indent = 4 },
+      'variable declaration init follow-up'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 13, text = 'a', indent = 4 },
+      'array index'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 14, text = '+ a', indent = 4 },
+      'array index follow-up'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 15, text = '+ a', indent = 2 },
+      'after array value'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 18, text = 'a', indent = 4 },
+      'array expression size'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 20, text = 'of', indent = 4 },
+      'array expression after size'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 21, text = 'a', indent = 4 },
+      'array expression init value'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 25, text = 'field = 0,', indent = 4 },
+      'record expression beginning'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 26, text = 'field = 0,', indent = 4 },
+      'record expression middle'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 28, text = ',field = 0', indent = 4 },
+      'record expression end'
+    )
+    runner:new_line(
+      'values-and-expressions.tig',
+      { on_line = 29, text = 'a := 0', indent = 2 },
+      'after record expression'
     )
   end)
 end)
diff --git a/tests/indent/usd_spec.lua b/tests/indent/usd_spec.lua
index c4e8198aa..85e9b9f78 100644
--- a/tests/indent/usd_spec.lua
+++ b/tests/indent/usd_spec.lua
@@ -1,21 +1,21 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/usd", {
+local run = Runner:new(it, 'tests/indent/usd', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 4,
   expandtab = true,
 })
 
-describe("indent USD:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent USD:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("prim.usd", { on_line = 3, text = "active = false", indent = 4 })
-    run:new_line("prim.usd", { on_line = 5, text = "custom int foo = 10", indent = 4 })
+  describe('new line:', function()
+    run:new_line('prim.usd', { on_line = 3, text = 'active = false', indent = 4 })
+    run:new_line('prim.usd', { on_line = 5, text = 'custom int foo = 10', indent = 4 })
   end)
 end)
diff --git a/tests/indent/vue_spec.lua b/tests/indent/vue_spec.lua
index 09527e4b0..ec9466d5e 100644
--- a/tests/indent/vue_spec.lua
+++ b/tests/indent/vue_spec.lua
@@ -1,24 +1,29 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 -- local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent", {
+local run = Runner:new(it, 'tests/indent', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent Vue:", function()
-  describe("whole file:", function()
-    run:whole_file({ "vue/" }, {})
+describe('indent Vue:', function()
+  describe('whole file:', function()
+    run:whole_file({ 'vue/' }, {})
   end)
 
-  describe("new line:", function()
-    for _, info in ipairs {
+  describe('new line:', function()
+    for _, info in ipairs({
       { 1, 2 },
       { 3, 0 },
-    } do
-      run:new_line("vue/template_indent.vue", { on_line = info[1], text = "Foo", indent = info[2] }, info[3], info[4])
+    }) do
+      run:new_line(
+        'vue/template_indent.vue',
+        { on_line = info[1], text = 'Foo', indent = info[2] },
+        info[3],
+        info[4]
+      )
     end
   end)
 end)
diff --git a/tests/indent/wgsl_spec.lua b/tests/indent/wgsl_spec.lua
index e1bf618f8..9a30cff4b 100644
--- a/tests/indent/wgsl_spec.lua
+++ b/tests/indent/wgsl_spec.lua
@@ -1,43 +1,43 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/wgsl", {
+local run = Runner:new(it, 'tests/indent/wgsl', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent WGSL:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent WGSL:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("basic.wgsl", { on_line = 47, text = "c: u32,", indent = 2 })
-    run:new_line("basic.wgsl", { on_line = 52, text = "c: u32,", indent = 2 })
-    run:new_line("basic.wgsl", { on_line = 56, text = "c: u32,", indent = 2 })
-    run:new_line("basic.wgsl", { on_line = 59, text = "c: u32,", indent = 2 })
-    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+  describe('new line:', function()
+    run:new_line('basic.wgsl', { on_line = 47, text = 'c: u32,', indent = 2 })
+    run:new_line('basic.wgsl', { on_line = 52, text = 'c: u32,', indent = 2 })
+    run:new_line('basic.wgsl', { on_line = 56, text = 'c: u32,', indent = 2 })
+    run:new_line('basic.wgsl', { on_line = 59, text = 'c: u32,', indent = 2 })
+    run:new_line('type_constructor_or_function_call_expression.wgsl', {
       on_line = 3,
-      text = "b",
+      text = 'b',
       indent = 4,
     })
-    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+    run:new_line('type_constructor_or_function_call_expression.wgsl', {
       on_line = 4,
-      text = "c",
+      text = 'c',
       indent = 4,
     })
-    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+    run:new_line('type_constructor_or_function_call_expression.wgsl', {
       on_line = 8,
-      text = "b",
+      text = 'b',
       indent = 4,
     })
-    run:new_line("type_constructor_or_function_call_expression.wgsl", {
+    run:new_line('type_constructor_or_function_call_expression.wgsl', {
       on_line = 9,
-      text = "c",
+      text = 'c',
       indent = 4,
     })
   end)
diff --git a/tests/indent/yaml_spec.lua b/tests/indent/yaml_spec.lua
index 91c60c227..001bc01f1 100644
--- a/tests/indent/yaml_spec.lua
+++ b/tests/indent/yaml_spec.lua
@@ -1,20 +1,20 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/yaml", {
+local run = Runner:new(it, 'tests/indent/yaml', {
   shiftwidth = 2,
   expandtab = true,
 })
 
-describe("indent YAML:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent YAML:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("indent-sequence-items.yaml", { on_line = 2, text = "key3: value3", indent = 2 })
-    run:new_line("autoindent-mapping-pair.yaml", { on_line = 1, text = "key3: value3", indent = 2 })
+  describe('new line:', function()
+    run:new_line('indent-sequence-items.yaml', { on_line = 2, text = 'key3: value3', indent = 2 })
+    run:new_line('autoindent-mapping-pair.yaml', { on_line = 1, text = 'key3: value3', indent = 2 })
   end)
 end)
diff --git a/tests/indent/yang_spec.lua b/tests/indent/yang_spec.lua
index 618d260c6..44e1dbce5 100644
--- a/tests/indent/yang_spec.lua
+++ b/tests/indent/yang_spec.lua
@@ -1,23 +1,23 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 
-local run = Runner:new(it, "tests/indent/yang", {
+local run = Runner:new(it, 'tests/indent/yang', {
   tabstop = 2,
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
 })
 
-describe("indent YANG:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent YANG:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("module.yang", { on_line = 12, text = "// Aligned indentation ended", indent = 2 })
-    run:new_line("module.yang", { on_line = 37, text = "// Test", indent = 4 })
-    run:new_line("module.yang", { on_line = 40, text = "// Test", indent = 4 })
-    run:new_line("module.yang", { on_line = 52, text = "Aligned string!", indent = 11 })
+  describe('new line:', function()
+    run:new_line('module.yang', { on_line = 12, text = '// Aligned indentation ended', indent = 2 })
+    run:new_line('module.yang', { on_line = 37, text = '// Test', indent = 4 })
+    run:new_line('module.yang', { on_line = 40, text = '// Test', indent = 4 })
+    run:new_line('module.yang', { on_line = 52, text = 'Aligned string!', indent = 11 })
   end)
 end)
diff --git a/tests/indent/yuck_spec.lua b/tests/indent/yuck_spec.lua
index 6ce15de6f..b20ac8dac 100644
--- a/tests/indent/yuck_spec.lua
+++ b/tests/indent/yuck_spec.lua
@@ -1,19 +1,19 @@
-local Runner = require("tests.indent.common").Runner
-local run = Runner:new(it, "tests/indent/yuck", {
+local Runner = require('tests.indent.common').Runner
+local run = Runner:new(it, 'tests/indent/yuck', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
 })
 
-describe("indent yuck", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent yuck', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new line:", function()
-    run:new_line("indent.yuck", { on_line = 13, text = ":box1 parameter", indent = 4 })
-    run:new_line("indent.yuck", { on_line = 17, text = ")", indent = 0 })
+  describe('new line:', function()
+    run:new_line('indent.yuck', { on_line = 13, text = ':box1 parameter', indent = 4 })
+    run:new_line('indent.yuck', { on_line = 17, text = ')', indent = 0 })
   end)
 end)
diff --git a/tests/indent/zig_spec.lua b/tests/indent/zig_spec.lua
index c064d9ab9..4ad17446f 100644
--- a/tests/indent/zig_spec.lua
+++ b/tests/indent/zig_spec.lua
@@ -1,22 +1,22 @@
-local Runner = require("tests.indent.common").Runner
+local Runner = require('tests.indent.common').Runner
 --local XFAIL = require("tests.indent.common").XFAIL
 
-local run = Runner:new(it, "tests/indent/zig", {
+local run = Runner:new(it, 'tests/indent/zig', {
   tabstop = 4,
   shiftwidth = 4,
   softtabstop = 4,
   expandtab = true,
 })
 
-describe("indent Zig:", function()
-  describe("whole file:", function()
-    run:whole_file(".", {
+describe('indent Zig:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
       expected_failures = {},
     })
   end)
 
-  describe("new lines:", function()
-    run:new_line("pr-3269.zig", { on_line = 5, text = "return;", indent = 4 })
-    run:new_line("pr-3269.zig", { on_line = 6, text = "", indent = 0 })
+  describe('new lines:', function()
+    run:new_line('pr-3269.zig', { on_line = 5, text = 'return;', indent = 4 })
+    run:new_line('pr-3269.zig', { on_line = 6, text = '', indent = 0 })
   end)
 end)
diff --git a/tests/query/highlights/lua/test.lua b/tests/query/highlights/lua/test.lua
index 55818bb74..2261d2e4e 100644
--- a/tests/query/highlights/lua/test.lua
+++ b/tests/query/highlights/lua/test.lua
@@ -14,5 +14,5 @@ next(a)
 -- ^ @function.builtin
 
 -- Checking for incorrect hlgroup of injected luap
-string.match(s, "\0%d[^\n]+")
---                       ^ @!constant
+string.match(s, '\0%d[^\n]+')
+--                       ^ !constant
diff --git a/tests/query/highlights_spec.lua b/tests/query/highlights_spec.lua
index 3bb03d49d..b6a52124a 100644
--- a/tests/query/highlights_spec.lua
+++ b/tests/query/highlights_spec.lua
@@ -1,39 +1,39 @@
-local highlighter = require "vim.treesitter.highlighter"
-local parsers = require "nvim-treesitter.parsers"
+local highlighter = require('vim.treesitter.highlighter')
 local ts = vim.treesitter
 
 local COMMENT_NODES = {
-  markdown = "html_block",
-  haskell = "haddock",
+  markdown = 'html_block',
+  haskell = 'haddock',
 }
 
 local function check_assertions(file)
   local buf = vim.fn.bufadd(file)
   vim.fn.bufload(file)
-  local lang = parsers.get_buf_lang(buf)
+  local ft = vim.bo[buf].filetype
+  local lang = vim.treesitter.language.get_lang(ft) or ft
   assert.same(
     1,
-    vim.fn.executable "highlight-assertions",
+    vim.fn.executable('highlight-assertions'),
     '"highlight-assertions" not executable!'
       .. ' Get it via "cargo install --git https://github.com/theHamsta/highlight-assertions"'
   )
-  local comment_node = COMMENT_NODES[lang] or "comment"
+  local comment_node = COMMENT_NODES[lang] or 'comment'
   local assertions = vim.fn.json_decode(
     vim.fn.system(
       "highlight-assertions -p '"
-        .. vim.api.nvim_get_runtime_file("parser/" .. lang .. ".so", false)[1]
+        .. vim.api.nvim_get_runtime_file('parser/' .. lang .. '.so', false)[1]
         .. "' -s '"
         .. file
         .. "' -c "
         .. comment_node
     )
   )
-  local parser = parsers.get_parser(buf, lang)
+  local parser = ts.get_parser(buf, lang)
   parser:parse(true)
 
   local self = highlighter.new(parser, {})
 
-  assert.True(#assertions > 0, "No assertions detected!")
+  assert.True(#assertions > 0, 'No assertions detected!')
   for _, assertion in ipairs(assertions) do
     local row = assertion.position.row
     local col = assertion.position.column
@@ -46,7 +46,7 @@ local function check_assertions(file)
         return
       end
 
-      local root = state.tstree:root()
+      local root = tstree:root()
       local root_start_row, _, root_end_row, _ = root:range()
 
       -- Only worry about trees within the line range
@@ -72,21 +72,22 @@ local function check_assertions(file)
         assert.is.number(col)
         if hl and ts.is_in_node_range(node, row, col) then
           local c = query._query.captures[capture] -- name of the capture in the query
-          if c ~= nil and c ~= "spell" and c ~= "conceal" then
+          if c ~= nil and c ~= 'spell' and c ~= 'conceal' then
             captures[c] = true
             highlights[c] = true
           end
         end
       end
-    end, true)
-    if assertion.expected_capture_name:match "^!" then
+    end)
+    if assertion.expected_capture_name:match('^!') then
       assert.Falsy(
-        captures[assertion.expected_capture_name:sub(2)] or highlights[assertion.expected_capture_name:sub(2)],
-        "Error in at "
+        captures[assertion.expected_capture_name:sub(2)]
+          or highlights[assertion.expected_capture_name:sub(2)],
+        'Error in at '
           .. file
-          .. ":"
+          .. ':'
           .. (row + 1)
-          .. ":"
+          .. ':'
           .. (col + 1)
           .. ': expected "'
           .. assertion.expected_capture_name
@@ -98,11 +99,11 @@ local function check_assertions(file)
     else
       assert.True(
         captures[assertion.expected_capture_name] or highlights[assertion.expected_capture_name],
-        "Error in at "
+        'Error in at '
           .. file
-          .. ":"
+          .. ':'
           .. (row + 1)
-          .. ":"
+          .. ':'
           .. (col + 1)
           .. ': expected "'
           .. assertion.expected_capture_name
@@ -115,8 +116,8 @@ local function check_assertions(file)
   end
 end
 
-describe("highlight queries", function()
-  local files = vim.fn.split(vim.fn.glob "tests/query/highlights/**/*.*")
+describe('highlight queries', function()
+  local files = vim.fn.split(vim.fn.glob('tests/query/highlights/**/*.*'))
   for _, file in ipairs(files) do
     it(file, function()
       check_assertions(file)
diff --git a/tests/query/injection_spec.lua b/tests/query/injection_spec.lua
index 95ad12eec..91096fee4 100644
--- a/tests/query/injection_spec.lua
+++ b/tests/query/injection_spec.lua
@@ -1,24 +1,30 @@
-require "nvim-treesitter.highlight" -- yes, this is necessary to set the hlmap
-local configs = require "nvim-treesitter.configs"
-local parsers = require "nvim-treesitter.parsers"
+local config = require('nvim-treesitter.config')
 local ts = vim.treesitter
 
 local function check_assertions(file)
   local buf = vim.fn.bufadd(file)
   vim.fn.bufload(file)
-  local lang = parsers.get_buf_lang(buf)
+  local ft = vim.bo[buf].filetype
+  local lang = vim.treesitter.language.get_lang(ft) or ft
   assert.same(
     1,
-    vim.fn.executable "highlight-assertions",
+    vim.fn.executable('highlight-assertions'),
     '"highlight-assertions" not executable!'
       .. ' Get it via "cargo install --git https://github.com/theHamsta/highlight-assertions"'
   )
   local assertions = vim.fn.json_decode(
     vim.fn.system(
-      "highlight-assertions -p '" .. configs.get_parser_install_dir() .. "/" .. lang .. ".so'" .. " -s '" .. file .. "'"
+      "highlight-assertions -p '"
+        .. config.get_install_dir('parser')
+        .. '/'
+        .. lang
+        .. ".so'"
+        .. " -s '"
+        .. file
+        .. "'"
     )
   )
-  local parser = parsers.get_parser(buf, lang)
+  local parser = ts.get_parser(buf, lang)
 
   local self = parser
   local top_level_root = parser:parse(true)[1]:root()
@@ -27,7 +33,7 @@ local function check_assertions(file)
     local row = assertion.position.row
     local col = assertion.position.column
 
-    local neg_assert = assertion.expected_capture_name:match "^!"
+    local neg_assert = assertion.expected_capture_name:match('^!')
     assertion.expected_capture_name = neg_assert and assertion.expected_capture_name:sub(2)
       or assertion.expected_capture_name
     local found = false
@@ -48,11 +54,11 @@ local function check_assertions(file)
     if neg_assert then
       assert.False(
         found,
-        "Error in at "
+        'Error in at '
           .. file
-          .. ":"
+          .. ':'
           .. (row + 1)
-          .. ":"
+          .. ':'
           .. (col + 1)
           .. ': expected "'
           .. assertion.expected_capture_name
@@ -61,11 +67,11 @@ local function check_assertions(file)
     else
       assert.True(
         found,
-        "Error in at "
+        'Error in at '
           .. file
-          .. ":"
+          .. ':'
           .. (row + 1)
-          .. ":"
+          .. ':'
           .. (col + 1)
           .. ': expected "'
           .. assertion.expected_capture_name
@@ -75,8 +81,8 @@ local function check_assertions(file)
   end
 end
 
-describe("injections", function()
-  local files = vim.fn.split(vim.fn.glob "tests/query/injections/**/*.*")
+describe('injections', function()
+  local files = vim.fn.split(vim.fn.glob('tests/query/injections/**/*.*'))
   for _, file in ipairs(files) do
     it(file, function()
       check_assertions(file)
diff --git a/tests/unit/ts_utils_spec.lua b/tests/unit/ts_utils_spec.lua
deleted file mode 100644
index 397fa7eaf..000000000
--- a/tests/unit/ts_utils_spec.lua
+++ /dev/null
@@ -1,114 +0,0 @@
-local tsutils = require "nvim-treesitter.ts_utils"
-
-describe("update_selection", function()
-  local function get_updated_selection(case)
-    vim.api.nvim_buf_set_lines(0, 0, -1, false, case.lines)
-    tsutils.update_selection(0, case.node, case.selection_mode)
-    vim.cmd "normal! y"
-    return vim.fn.getreg '"'
-  end
-
-  it("charwise1", function()
-    assert.equal(
-      get_updated_selection {
-        lines = { "foo", "", "bar" },
-        node = { 0, 0, 2, 1 },
-        selection_mode = "v",
-      },
-      "foo\n\nb"
-    )
-    it("charwise2", function() end)
-    assert.equal(
-      get_updated_selection {
-        lines = { "foo", "", "bar" },
-        node = { 0, 1, 2, 1 },
-        selection_mode = "v",
-      },
-      "oo\n\nb"
-    )
-    it("charwise3", function() end)
-    assert.equal(
-      get_updated_selection {
-        lines = { "foo", "", "bar" },
-        node = { 0, 2, 2, 1 },
-        selection_mode = "v",
-      },
-      "o\n\nb"
-    )
-    it("charwise4", function() end)
-    assert.equal(
-      get_updated_selection {
-        lines = { "foo", "", "bar" },
-        node = { 0, 3, 2, 1 },
-        selection_mode = "v",
-      },
-      "\n\nb"
-    )
-  end)
-  it("linewise", function()
-    assert.equal(
-      get_updated_selection {
-        lines = { "foo", "", "bar" },
-        node = { 0, 3, 2, 1 },
-        selection_mode = "V",
-      },
-      "foo\n\nbar\n"
-    )
-  end)
-  it("blockwise", function()
-    assert.equal(
-      get_updated_selection {
-        lines = { "foo", "", "bar" },
-        node = { 0, 3, 2, 1 },
-        selection_mode = "<C-v>",
-      },
-      "foo\n\nbar"
-    )
-  end)
-end)
-
-describe("swap_nodes", function()
-  local function swap(case)
-    vim.api.nvim_buf_set_lines(0, 0, -1, false, case.lines)
-    vim.opt.filetype = case.filetype
-    local a = vim.treesitter.get_node {
-      bufnr = 0,
-      pos = { case.a[1], case.a[2] },
-    }
-    local b = vim.treesitter.get_node {
-      bufnr = 0,
-      pos = { case.b[1], case.b[2] },
-    }
-    tsutils.swap_nodes(a, b, 0, true)
-  end
-
-  it("works on adjacent nodes", function()
-    swap {
-      filetype = "python",
-      lines = { "print(1)" },
-      a = { 0, 0 },
-      b = { 0, 5 },
-    }
-
-    it("swaps text", function() end)
-    assert.same(vim.api.nvim_buf_get_lines(0, 0, -1, false), { "(1)print" })
-
-    it("moves the cursor", function() end)
-    assert.same(vim.api.nvim_win_get_cursor(0), { 1, 3 })
-  end)
-
-  it("works with multiline nodes", function()
-    swap {
-      filetype = "lua",
-      lines = { "x = { [[", "]], [[", ".....]]}" },
-      a = { 0, 6 },
-      b = { 1, 4 },
-    }
-
-    it("swaps text", function() end)
-    assert.same(vim.api.nvim_buf_get_lines(0, 0, -1, false), { "x = { [[", ".....]], [[", "]]}" })
-
-    it("moves the cursor", function() end)
-    assert.same(vim.api.nvim_win_get_cursor(0), { 2, 9 })
-  end)
-end)

From 5817ff01b523a0dce5e7a42374ac137cb6490577 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 20 May 2023 17:29:03 +0200
Subject: [PATCH 2275/2704] feat(locals)!: refactor `locals.lua` into
 standalone

Co-authored-by: TheLeoP <eugenio2305@hotmail.com>
---
 README.md                      |   4 +
 SUPPORTED_LANGUAGES.md         | 554 ++++++++++++++++-----------------
 TODO.md                        |   4 +-
 lua/nvim-treesitter/locals.lua | 220 ++++++++-----
 lua/nvim-treesitter/query.lua  | 165 ----------
 scripts/update-readme.lua      |   1 +
 6 files changed, 419 insertions(+), 529 deletions(-)
 delete mode 100644 lua/nvim-treesitter/query.lua

diff --git a/README.md b/README.md
index 715ec50ed..635b1ed15 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,10 @@ vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
 
 Injections are used for multi-language documents, see `:h treesitter-language-injections`. No setup is needed.
 
+## Locals
+
+These queries can be used to look up definitions and references to identifiers in a given scope. They are used, e.g., by the `nvim-treesitter-refactor` plugin.
+
 # Advanced setup
 
 ## Adding parsers
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index a388c9c9a..aef22b34d 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -6,288 +6,288 @@ Legend:
 - **Tier:** _core_, _stable_, _community_, or _unstable_
 - **CLI:** `:TSInstall` requires `tree-sitter` CLI installed
 - **NPM:** `:TSInstallFromGrammar` requires `node` installed
-- **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections
+- **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
 
 <!--This section of the README is automatically updated by a CI job-->
 <!--parserinfo-->
 Language | Tier | Queries | CLI | NPM | Maintainer
 -------- |:----:|:-------:|:---:|:---:| ----------
-[ada](https://github.com/briot/tree-sitter-ada) |  | `HF  ` |  |  | @briot
-[agda](https://github.com/tree-sitter/tree-sitter-agda) |  | `HF  ` |  |  | @Decodetalkers
-[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJ` |  | ✓ | @dlvandenberg
-[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF  ` |  |  | @aheber
-[arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) |  | `HFIJ` |  |  | @ObserverOfTime
-[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J` |  |  | @RubixDev
-[astro](https://github.com/virchau13/tree-sitter-astro) |  | `HFIJ` |  |  | @virchau13
-[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J` |  |  | @mattpolzin
-[awk](https://github.com/Beaglefoot/tree-sitter-awk) |  | `H  J` |  |  | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) |  | `HF J` |  |  | @TravonteD
-[bass](https://github.com/vito/tree-sitter-bass) |  | `HFIJ` |  |  | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) |  | `HF J` |  |  | @polarmutex
-[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFI ` |  |  | @theHamsta, @clason
-[bicep](https://github.com/amaanq/tree-sitter-bicep) |  | `HFIJ` |  |  | @amaanq
-[bitbake](https://github.com/amaanq/tree-sitter-bitbake) | stable | `HFIJ` |  |  | @amaanq
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unstable | `H   ` |  |  | @gabmus
-[c](https://github.com/tree-sitter/tree-sitter-c) | core | `HFIJ` |  |  | @amaanq
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) |  | `HF J` |  |  | @Luxed
-[cairo](https://github.com/amaanq/tree-sitter-cairo) | stable | `HFIJ` |  |  | @amaanq
-[capnp](https://github.com/amaanq/tree-sitter-capnp) |  | `HFIJ` |  |  | @amaanq
-[chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) |  | `HFIJ` |  |  | @ObserverOfTime
-[clojure](https://github.com/sogaiu/tree-sitter-clojure) |  | `HF J` |  |  | @NoahTheDuke
-[cmake](https://github.com/uyha/tree-sitter-cmake) |  | `HFI ` |  |  | @uyha
-[comment](https://github.com/stsewd/tree-sitter-comment) | stable | `H   ` |  |  | @stsewd
-[commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) |  | `HF  ` |  | ✓ | @theHamsta
-[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H   ` |  |  | @addcninblue
-[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFI ` |  |  | @jakestanger
-[cpon](https://github.com/amaanq/tree-sitter-cpon) |  | `HFIJ` |  |  | @amaanq
-[cpp](https://github.com/tree-sitter/tree-sitter-cpp) |  | `HFIJ` |  | ✓ | @theHamsta
-[css](https://github.com/tree-sitter/tree-sitter-css) |  | `HFIJ` |  |  | @TravonteD
-[csv](https://github.com/amaanq/tree-sitter-csv) | stable | `H   ` |  |  | @amaanq
-[cuda](https://github.com/theHamsta/tree-sitter-cuda) |  | `HFIJ` |  | ✓ | @theHamsta
-[cue](https://github.com/eonpatapon/tree-sitter-cue) |  | `HFIJ` |  |  | @amaanq
-[d](https://github.com/gdamore/tree-sitter-d) | stable | `HFIJ` |  |  | @amaanq
-[dart](https://github.com/UserNobody14/tree-sitter-dart) |  | `HFIJ` |  |  | @akinsho
-[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) |  | `HFIJ` |  |  | @jedrzejboczar
-[dhall](https://github.com/jbellerb/tree-sitter-dhall) |  | `HF J` |  |  | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) |  | `H   ` |  |  | @gbprod
-[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J` |  |  | @ColinKennedy
-[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJ` |  |  | @NoahTheDuke
-[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) |  | `H  J` |  |  | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) |  | `H IJ` |  |  | @rydesun
-[doxygen](https://github.com/amaanq/tree-sitter-doxygen) | stable | `H IJ` |  |  | @amaanq
-[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HF J` |  |  | @ObserverOfTime
-[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J` |  |  | @glehmann
-[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H   ` |  |  | @RubixDev
-[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF  ` |  |  | @uyha
-[eex](https://github.com/connorlay/tree-sitter-eex) |  | `H  J` |  |  | @connorlay
-[elixir](https://github.com/elixir-lang/tree-sitter-elixir) |  | `HFIJ` |  |  | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) |  | `H  J` |  |  | @zweimach
-[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) |  | `HFIJ` |  |  | @glapa-grossklag, @amaanq
-[elvish](https://github.com/elves/tree-sitter-elvish) |  | `H  J` |  |  | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) |  | `H  J` |  |  | 
-[erlang](https://github.com/WhatsApp/tree-sitter-erlang) |  | `HF  ` |  |  | @filmor
-[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ` |  |  | @bryankenote
-[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J` |  |  | @khiner
-[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) |  | `HF J` |  | ✓ | @alexmozaidze
-[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J` |  |  | @chaopeng
-[firrtl](https://github.com/amaanq/tree-sitter-firrtl) |  | `HFIJ` |  |  | @amaanq
-[fish](https://github.com/ram02z/tree-sitter-fish) |  | `HFIJ` |  |  | @ram02z
-[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJ` |  |  | @FoamScience
-[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | stable | `HFIJ` |  |  | @amaanq
-[fortran](https://github.com/stadelmanma/tree-sitter-fortran) |  | `HFI ` |  |  | @amaanq
-[fsh](https://github.com/mgramigna/tree-sitter-fsh) |  | `H   ` |  |  | @mgramigna
-[func](https://github.com/amaanq/tree-sitter-func) |  | `H   ` |  |  | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) |  | `HFI ` |  |  | @jirgn
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] |  | `HFIJ` |  |  | @PrestonKnopp
-[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J` |  |  | @godofavacyn
-[git_config](https://github.com/the-mikedavis/tree-sitter-git-config)[^git_config] |  | `HF J` |  |  | @amaanq
-[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) |  | `H  J` |  |  | @gbprod
-[gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) |  | `H  J` |  |  | @ObserverOfTime
-[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) |  | `H  J` |  |  | @gbprod
-[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) |  | `H   ` |  |  | @theHamsta
-[gleam](https://github.com/gleam-lang/tree-sitter-gleam) |  | `HFIJ` |  |  | @amaanq
-[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] |  | `HFI ` |  |  | @NullVoxPopuli
-[glsl](https://github.com/theHamsta/tree-sitter-glsl) |  | `HFIJ` |  | ✓ | @theHamsta
-[gn](https://github.com/amaanq/tree-sitter-gn) | stable | `HFIJ` |  |  | @amaanq
-[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J` |  |  | @dpezto
-[go](https://github.com/tree-sitter/tree-sitter-go) |  | `HFIJ` |  |  | @theHamsta, @WinWisely268
-[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] |  | `HF J` |  |  | @pierpo
-[gomod](https://github.com/camdencheek/tree-sitter-go-mod) |  | `H  J` |  |  | @camdencheek
-[gosum](https://github.com/amaanq/tree-sitter-go-sum) |  | `H   ` |  |  | @amaanq
-[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J` |  |  | @qvalentin
-[gowork](https://github.com/omertuc/tree-sitter-go-work) |  | `H  J` |  |  | @omertuc
-[gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) | stable | `H  J` |  |  | @ObserverOfTime
-[graphql](https://github.com/bkegley/tree-sitter-graphql) |  | `H IJ` |  |  | @bkegley
-[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJ` |  |  | @murtaza64
-[gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) | stable | `H   ` |  |  | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) |  | `H   ` |  |  | 
-[hare](https://github.com/amaanq/tree-sitter-hare) |  | `HFIJ` |  |  | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) |  | `HF J` |  |  | @mrcjkb
-[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) |  | `HF  ` |  |  | @lykahb
-[hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ` |  |  | @MichaHoffmann
-[heex](https://github.com/connorlay/tree-sitter-heex) |  | `HFIJ` |  |  | @connorlay
-[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J` |  |  | @qvalentin
-[hjson](https://github.com/winston0410/tree-sitter-hjson) |  | `HFIJ` |  | ✓ | @winston0410
-[hlsl](https://github.com/theHamsta/tree-sitter-hlsl) |  | `HFIJ` |  | ✓ | @theHamsta
-[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J` |  |  | @Freed-Wu
-[hocon](https://github.com/antosha417/tree-sitter-hocon) |  | `HF J` |  | ✓ | @antosha417
-[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF  ` |  |  | @urbit-pilled
-[html](https://github.com/tree-sitter/tree-sitter-html) |  | `HFIJ` |  |  | @TravonteD
-[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ` |  |  | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) |  | `H  J` |  |  | @amaanq, @NTBBloodbath
-[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ` |  |  | @pfeiferj
-[hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) | community | `HFIJ` |  |  | @luckasRanarison
-[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J` |  |  | @cathaysa
-[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF  ` |  |  | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJ` |  |  | @yorickpeterse
-[ispc](https://github.com/fab4100/tree-sitter-ispc) |  | `HFIJ` |  | ✓ | @fab4100
-[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) |  | `HF J` |  |  | @sogaiu
-[java](https://github.com/tree-sitter/tree-sitter-java) |  | `HFIJ` |  |  | @p00f
-[javascript](https://github.com/tree-sitter/tree-sitter-javascript) |  | `HFIJ` |  |  | @steelsojka
-[jq](https://github.com/flurie/tree-sitter-jq) |  | `H  J` |  |  | @ObserverOfTime
-[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) |  | `H   ` |  |  | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) |  | `HFI ` |  |  | @steelsojka
-[json5](https://github.com/Joakker/tree-sitter-json5) |  | `H  J` |  |  | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git)[^jsonc] |  | `HFIJ` |  | ✓ | @WhyNotHugo
-[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) |  | `HF  ` |  |  | @nawordar
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | community | `HFIJ` |  |  | @theHamsta
-[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJ` |  |  | @Hubro
-[kconfig](https://github.com/amaanq/tree-sitter-kconfig) | stable | `HFIJ` |  |  | @amaanq
-[kdl](https://github.com/amaanq/tree-sitter-kdl) |  | `HFIJ` |  |  | @amaanq
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) |  | `HF J` |  |  | @SalBakraa
-[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF J` |  |  | @irh
-[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J` |  |  | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) |  | `H  J` |  |  | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J` | ✓ |  | @theHamsta, @clason
-[ledger](https://github.com/cbarrete/tree-sitter-ledger) |  | `HFIJ` |  |  | @cbarrete
-[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ` |  |  | @r001
-[linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) | stable | `HFIJ` |  |  | @amaanq
-[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J` |  |  | @hankthetank27
-[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFI ` |  |  | @toots
-[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) |  | `H   ` |  |  | @benwilliamgraham
-[lua](https://github.com/MunifTanjim/tree-sitter-lua) | core | `HFIJ` |  |  | @muniftanjim
-[luadoc](https://github.com/amaanq/tree-sitter-luadoc) |  | `H   ` |  |  | @amaanq
-[luap](https://github.com/amaanq/tree-sitter-luap)[^luap] |  | `H   ` |  |  | @amaanq
-[luau](https://github.com/amaanq/tree-sitter-luau) |  | `HFIJ` |  |  | @amaanq
-[m68k](https://github.com/grahambates/tree-sitter-m68k) |  | `HF J` |  |  | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) |  | `HF J` |  |  | @lewis6991
-[markdown](https://github.com/MDeiml/tree-sitter-markdown)[^markdown] | core | `HFIJ` |  |  | @MDeiml
-[markdown_inline](https://github.com/MDeiml/tree-sitter-markdown)[^markdown_inline] | core | `H  J` |  |  | @MDeiml
-[matlab](https://github.com/acristoffers/tree-sitter-matlab) |  | `HFIJ` |  |  | @acristoffers
-[menhir](https://github.com/Kerl13/tree-sitter-menhir) |  | `H  J` |  |  | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `H   ` |  |  | 
-[meson](https://github.com/Decodetalkers/tree-sitter-meson) |  | `HFIJ` |  |  | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H   ` | ✓ |  | @artagnon
-[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J` |  |  | @Freed-Wu
-[nasm](https://github.com/naclsn/tree-sitter-nasm) | stable | `H  J` |  |  | @ObserverOfTime
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) |  | `H I ` |  |  | 
-[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF J` |  |  | @aMOPel
-[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J` |  |  | @aMOPel
-[ninja](https://github.com/alemuller/tree-sitter-ninja) |  | `HFI ` |  |  | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) |  | `HF J` |  |  | @leo60228
-[norg](https://github.com/nvim-neorg/tree-sitter-norg) | unstable | `    ` |  |  | @JoeyGrajciar, @vhyrro
-[nqc](https://github.com/amaanq/tree-sitter-nqc) | stable | `HFIJ` |  |  | @amaanq
-[objc](https://github.com/amaanq/tree-sitter-objc) |  | `HFIJ` |  |  | @amaanq
-[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J` |  |  | @ColinKennedy
-[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJ` |  |  | @undu
-[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJ` |  |  | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) |  | `H  J` | ✓ |  | @undu
-[odin](https://github.com/amaanq/tree-sitter-odin) |  | `HFIJ` |  |  | @amaanq
-[org](https://github.com/milisims/tree-sitter-org) |  | `    ` |  |  | 
-[pascal](https://github.com/Isopod/tree-sitter-pascal.git) |  | `HFIJ` |  |  | @Isopod
-[passwd](https://github.com/ath3/tree-sitter-passwd) |  | `H   ` |  |  | @amaanq
-[pem](https://github.com/ObserverOfTime/tree-sitter-pem) | stable | `HF J` |  |  | @ObserverOfTime
-[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) |  | `HF J` |  |  | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] |  | `HFIJ` |  |  | @tk-shirasaka
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] |  | `HFIJ` |  |  | @tk-shirasaka
-[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H   ` |  | ✓ | @mikehaertl
-[pioasm](https://github.com/leo60228/tree-sitter-pioasm) |  | `H  J` |  |  | @leo60228
-[po](https://github.com/erasin/tree-sitter-po) |  | `HF J` |  |  | @amaanq
-[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H   ` |  |  | @RabbiVeesh, @LeoNerd
-[poe_filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ` |  |  | @ObserverOfTime
-[pony](https://github.com/amaanq/tree-sitter-pony) |  | `HFIJ` |  |  | @amaanq, @mfelsche
-[printf](https://github.com/ObserverOfTime/tree-sitter-printf) | stable | `H   ` |  |  | @ObserverOfTime
-[prisma](https://github.com/victorhqc/tree-sitter-prisma) |  | `HF  ` |  |  | @elianiva
-[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J` |  |  | @MichaHoffmann
-[properties](https://github.com/ObserverOfTime/tree-sitter-properties)[^properties] | stable | `H  J` |  |  | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) |  | `HF  ` |  |  | @treywood
-[prql](https://github.com/PRQL/tree-sitter-prql) |  | `H  J` |  |  | @matthias-Q
-[psv](https://github.com/amaanq/tree-sitter-csv) | stable | `H   ` |  |  | @amaanq
-[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J` |  |  | @zealot128
-[puppet](https://github.com/amaanq/tree-sitter-puppet) |  | `HFIJ` |  |  | @amaanq
-[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  J` |  |  | @postsolar
-[pymanifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) | stable | `H  J` |  |  | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) |  | `HFIJ` |  |  | @stsewd, @theHamsta
-[ql](https://github.com/tree-sitter/tree-sitter-ql) |  | `HFIJ` |  |  | @pwntester
-[qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) |  | `H  J` |  |  | @amaanq
-[qmljs](https://github.com/yuja/tree-sitter-qmljs) |  | `HF J` |  |  | @Decodetalkers
-[query](https://github.com/nvim-treesitter/tree-sitter-query)[^query] | core | `HFIJ` |  |  | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) |  | `H IJ` |  |  | @echasnovski
-[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J` |  |  | 
-[rasi](https://github.com/Fymyte/tree-sitter-rasi) |  | `HFIJ` |  |  | @Fymyte
-[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ` |  |  | @joker1007
-[re2c](https://github.com/amaanq/tree-sitter-re2c) | stable | `HFIJ` |  |  | @amaanq
-[readline](https://github.com/ribru17/tree-sitter-readline) | community | `HFIJ` |  |  | @ribru17
-[regex](https://github.com/tree-sitter/tree-sitter-regex) |  | `H   ` |  |  | @theHamsta
-[rego](https://github.com/FallenAngel97/tree-sitter-rego) |  | `H  J` |  |  | @FallenAngel97
-[requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) | stable | `H  J` |  |  | @ObserverOfTime
-[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) |  | `HF J` |  |  | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFI ` |  |  | @Hubro
-[roc](https://github.com/nat-418/tree-sitter-roc) | community | `H  J` |  |  | @nat-418
-[ron](https://github.com/amaanq/tree-sitter-ron) |  | `HFIJ` |  |  | @amaanq
-[rst](https://github.com/stsewd/tree-sitter-rst) |  | `H  J` |  |  | @stsewd
-[ruby](https://github.com/tree-sitter/tree-sitter-ruby) |  | `HFIJ` |  |  | @TravonteD
-[rust](https://github.com/tree-sitter/tree-sitter-rust) |  | `HFIJ` |  |  | @amaanq
-[scala](https://github.com/tree-sitter/tree-sitter-scala) |  | `HF J` |  |  | @stevanmilic
-[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J` | ✓ |  | @WhyNotHugo
-[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J` |  |  | 
-[scss](https://github.com/serenadeai/tree-sitter-scss) |  | `HFI ` |  |  | @elianiva
-[slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unstable | `HFIJ` |  | ✓ | @theHamsta
-[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJ` |  |  | @hunger
-[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | community | `HFIJ` |  |  | @amaanq
-[smithy](https://github.com/indoorvivants/tree-sitter-smithy) |  | `H   ` |  |  | @amaanq, @keynmol
-[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJ` |  |  | 
-[solidity](https://github.com/JoranHonig/tree-sitter-solidity) |  | `HF  ` |  |  | @amaanq
-[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H   ` |  |  | @aheber
-[sosl](https://github.com/aheber/tree-sitter-sfapex) |  | `H   ` |  |  | @aheber
-[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  J` |  |  | @Sarrus1
-[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) |  | `HFIJ` |  |  | @BonaBeavis
-[sql](https://github.com/derekstride/tree-sitter-sql) |  | `H IJ` |  |  | @derekstride
-[squirrel](https://github.com/amaanq/tree-sitter-squirrel) |  | `HFIJ` |  |  | @amaanq
-[ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) | stable | `HFIJ` |  |  | @ObserverOfTime
-[starlark](https://github.com/amaanq/tree-sitter-starlark) |  | `HFIJ` |  |  | @amaanq
-[strace](https://github.com/sigmaSd/tree-sitter-strace) | stable | `H  J` |  |  | @amaanq
-[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ` |  |  | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) |  | `HFIJ` |  |  | @madskjeldgaard
-[surface](https://github.com/connorlay/tree-sitter-surface) |  | `HFIJ` |  |  | @connorlay
-[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | stable | `HFIJ` |  |  | @amaanq
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) |  | `H I ` | ✓ |  | @alex-pinkus
-[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) |  | `HF J` |  |  | @RaafatTurki
-[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF J` |  |  | @ok-ryoko
-[t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJ` |  |  | @xasc
-[tablegen](https://github.com/amaanq/tree-sitter-tablegen) |  | `HFIJ` |  |  | @amaanq
-[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | stable | `HFI ` |  |  | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) |  | `HFIJ` | ✓ |  | @euclidianAce
-[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J` |  |  | @vrischmann
-[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ` |  |  | @MichaHoffmann
-[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI ` |  |  | @Porter
-[thrift](https://github.com/duskmoon314/tree-sitter-thrift) |  | `HFIJ` |  |  | @amaanq, @duskmoon314
-[tiger](https://github.com/ambroisie/tree-sitter-tiger) |  | `HFIJ` |  |  | @ambroisie
-[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) |  | `HF J` |  |  | @ahelwer, @susliko
-[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J` |  |  | @Freed-Wu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | unstable | `H   ` |  |  | @arnarg
-[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) |  | `HFIJ` |  | ✓ | @tk-shirasaka
-[tsv](https://github.com/amaanq/tree-sitter-csv) | stable | `H   ` |  |  | @amaanq
-[tsx](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJ` |  | ✓ | @steelsojka
-[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) |  | `HFIJ` |  |  | @BonaBeavis
-[twig](https://github.com/gbprod/tree-sitter-twig) |  | `H  J` |  |  | @gbprod
-[typescript](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJ` |  | ✓ | @steelsojka
-[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ` |  |  | @Teddytrombone
-[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ` |  |  | @uben0, @RaafatTurki
-[udev](https://github.com/ObserverOfTime/tree-sitter-udev) | stable | `H  J` |  |  | @ObserverOfTime
-[ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) |  | `HFIJ` |  |  | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `H  J` | ✓ |  | @tapegram
-[usd](https://github.com/ColinKennedy/tree-sitter-usd) |  | `HFI ` |  |  | @ColinKennedy
-[uxntal](https://github.com/amaanq/tree-sitter-uxntal) |  | `HFIJ` |  |  | @amaanq
-[v](https://github.com/vlang/v-analyzer) |  | `HFIJ` |  |  | @kkharji, @amaanq
-[vala](https://github.com/vala-lang/tree-sitter-vala) |  | `HF  ` |  |  | @Prince781
-[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J` |  |  | @wrapperup, @oscarotero
-[verilog](https://github.com/tree-sitter/tree-sitter-verilog) |  | `HF J` |  |  | @zegervdv
-[vhs](https://github.com/charmbracelet/tree-sitter-vhs) |  | `H   ` |  |  | @caarlos0
-[vim](https://github.com/neovim/tree-sitter-vim) | core | `HF J` |  |  | @clason
-[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | core | `H  J` |  |  | @clason
-[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | stable | `HFIJ` |  |  | @WhyNotHugo, @lucario387
-[wgsl](https://github.com/szebniok/tree-sitter-wgsl) |  | `HFI ` |  |  | @szebniok
-[wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) |  | `HFI ` |  | ✓ | @theHamsta
-[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF  ` |  |  | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J` |  |  | @liamwh
-[xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) | stable | `H  J` |  |  | @ObserverOfTime
-[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HFIJ` |  |  | @ObserverOfTime
-[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | stable | `HFIJ` |  |  | @amaanq
-[yang](https://github.com/Hubro/tree-sitter-yang) |  | `HFIJ` |  |  | @Hubro
-[yuck](https://github.com/Philipp-M/tree-sitter-yuck) |  | `HFIJ` |  |  | @Philipp-M, @amaanq
-[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J` |  |  | @Freed-Wu
-[zig](https://github.com/maxxnino/tree-sitter-zig) |  | `HFIJ` |  |  | @maxxnino
+[ada](https://github.com/briot/tree-sitter-ada) |  | `HF  L` |  |  | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) |  | `HF   ` |  |  | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJL` |  | ✓ | @dlvandenberg
+[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF  L` |  |  | @aheber
+[arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) |  | `HFIJL` |  |  | @ObserverOfTime
+[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` |  |  | @RubixDev
+[astro](https://github.com/virchau13/tree-sitter-astro) |  | `HFIJL` |  |  | @virchau13
+[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J ` |  |  | @mattpolzin
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) |  | `H  J ` |  |  | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) |  | `HF JL` |  |  | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) |  | `HFIJL` |  |  | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) |  | `HF J ` |  |  | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFI  ` |  |  | @theHamsta, @clason
+[bicep](https://github.com/amaanq/tree-sitter-bicep) |  | `HFIJL` |  |  | @amaanq
+[bitbake](https://github.com/amaanq/tree-sitter-bitbake) | stable | `HFIJL` |  |  | @amaanq
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unstable | `H    ` |  |  | @gabmus
+[c](https://github.com/tree-sitter/tree-sitter-c) | core | `HFIJL` |  |  | @amaanq
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) |  | `HF JL` |  |  | @Luxed
+[cairo](https://github.com/amaanq/tree-sitter-cairo) | stable | `HFIJL` |  |  | @amaanq
+[capnp](https://github.com/amaanq/tree-sitter-capnp) |  | `HFIJL` |  |  | @amaanq
+[chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) |  | `HFIJL` |  |  | @ObserverOfTime
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) |  | `HF JL` |  |  | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) |  | `HFI  ` |  |  | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | stable | `H    ` |  |  | @stsewd
+[commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) |  | `HF  L` |  | ✓ | @theHamsta
+[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H    ` |  |  | @addcninblue
+[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFI L` |  |  | @jakestanger
+[cpon](https://github.com/amaanq/tree-sitter-cpon) |  | `HFIJL` |  |  | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) |  | `HFIJL` |  | ✓ | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) |  | `HFIJ ` |  |  | @TravonteD
+[csv](https://github.com/amaanq/tree-sitter-csv) | stable | `H    ` |  |  | @amaanq
+[cuda](https://github.com/theHamsta/tree-sitter-cuda) |  | `HFIJL` |  | ✓ | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) |  | `HFIJL` |  |  | @amaanq
+[d](https://github.com/gdamore/tree-sitter-d) | stable | `HFIJL` |  |  | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) |  | `HFIJL` |  |  | @akinsho
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) |  | `HFIJL` |  |  | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) |  | `HF J ` |  |  | @amaanq
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) |  | `H    ` |  |  | @gbprod
+[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` |  |  | @ColinKennedy
+[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` |  |  | @NoahTheDuke
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) |  | `H  J ` |  |  | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) |  | `H IJ ` |  |  | @rydesun
+[doxygen](https://github.com/amaanq/tree-sitter-doxygen) | stable | `H IJ ` |  |  | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HF JL` |  |  | @ObserverOfTime
+[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` |  |  | @glehmann
+[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H    ` |  |  | @RubixDev
+[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` |  |  | @uyha
+[eex](https://github.com/connorlay/tree-sitter-eex) |  | `H  J ` |  |  | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) |  | `HFIJL` |  |  | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) |  | `H  J ` |  |  | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) |  | `HFIJL` |  |  | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) |  | `H  J ` |  |  | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) |  | `H  J ` |  |  | 
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) |  | `HF   ` |  |  | @filmor
+[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` |  |  | @bryankenote
+[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` |  |  | @khiner
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) |  | `HF JL` |  | ✓ | @alexmozaidze
+[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J ` |  |  | @chaopeng
+[firrtl](https://github.com/amaanq/tree-sitter-firrtl) |  | `HFIJL` |  |  | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) |  | `HFIJL` |  |  | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJL` |  |  | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | stable | `HFIJL` |  |  | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) |  | `HFI  ` |  |  | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) |  | `H    ` |  |  | @mgramigna
+[func](https://github.com/amaanq/tree-sitter-func) |  | `H    ` |  |  | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) |  | `HFI L` |  |  | @jirgn
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] |  | `HFIJL` |  |  | @PrestonKnopp
+[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` |  |  | @godofavacyn
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config)[^git_config] |  | `HF J ` |  |  | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) |  | `H  J ` |  |  | @gbprod
+[gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) |  | `H  JL` |  |  | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) |  | `H  J ` |  |  | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) |  | `H    ` |  |  | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) |  | `HFIJL` |  |  | @amaanq
+[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] |  | `HFI L` |  |  | @NullVoxPopuli
+[glsl](https://github.com/theHamsta/tree-sitter-glsl) |  | `HFIJL` |  | ✓ | @theHamsta
+[gn](https://github.com/amaanq/tree-sitter-gn) | stable | `HFIJL` |  |  | @amaanq
+[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` |  |  | @dpezto
+[go](https://github.com/tree-sitter/tree-sitter-go) |  | `HFIJL` |  |  | @theHamsta, @WinWisely268
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] |  | `HF JL` |  |  | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) |  | `H  J ` |  |  | @camdencheek
+[gosum](https://github.com/amaanq/tree-sitter-go-sum) |  | `H    ` |  |  | @amaanq
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  |  | @qvalentin
+[gowork](https://github.com/omertuc/tree-sitter-go-work) |  | `H  J ` |  |  | @omertuc
+[gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) | stable | `H  J ` |  |  | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) |  | `H IJ ` |  |  | @bkegley
+[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` |  |  | @murtaza64
+[gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) | stable | `H    ` |  |  | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) |  | `H    ` |  |  | 
+[hare](https://github.com/amaanq/tree-sitter-hare) |  | `HFIJL` |  |  | @amaanq
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) |  | `HF J ` |  |  | @mrcjkb
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) |  | `HF   ` |  |  | @lykahb
+[hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ ` |  |  | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) |  | `HFIJL` |  |  | @connorlay
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  |  | @qvalentin
+[hjson](https://github.com/winston0410/tree-sitter-hjson) |  | `HFIJL` |  | ✓ | @winston0410
+[hlsl](https://github.com/theHamsta/tree-sitter-hlsl) |  | `HFIJL` |  | ✓ | @theHamsta
+[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` |  |  | @Freed-Wu
+[hocon](https://github.com/antosha417/tree-sitter-hocon) |  | `HF J ` |  | ✓ | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF  L` |  |  | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) |  | `HFIJL` |  |  | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` |  |  | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) |  | `H  J ` |  |  | @amaanq, @NTBBloodbath
+[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` |  |  | @pfeiferj
+[hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) | community | `HFIJ ` |  |  | @luckasRanarison
+[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J ` |  |  | @cathaysa
+[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF   ` |  |  | @theHamsta
+[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` |  |  | @yorickpeterse
+[ispc](https://github.com/fab4100/tree-sitter-ispc) |  | `HFIJL` |  | ✓ | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) |  | `HF JL` |  |  | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) |  | `HFIJL` |  |  | @p00f
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) |  | `HFIJL` |  |  | @steelsojka
+[jq](https://github.com/flurie/tree-sitter-jq) |  | `H  JL` |  |  | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) |  | `H    ` |  |  | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) |  | `HFI L` |  |  | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) |  | `H  J ` |  |  | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git)[^jsonc] |  | `HFIJL` |  | ✓ | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) |  | `HF  L` |  |  | @nawordar
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | community | `HFIJL` |  |  | @theHamsta
+[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` |  |  | @Hubro
+[kconfig](https://github.com/amaanq/tree-sitter-kconfig) | stable | `HFIJL` |  |  | @amaanq
+[kdl](https://github.com/amaanq/tree-sitter-kdl) |  | `HFIJL` |  |  | @amaanq
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) |  | `HF JL` |  |  | @SalBakraa
+[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` |  |  | @irh
+[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` |  |  | @Willem-J-an
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) |  | `H  JL` |  |  | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J ` | ✓ |  | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) |  | `HFIJ ` |  |  | @cbarrete
+[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` |  |  | @r001
+[linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) | stable | `HFIJL` |  |  | @amaanq
+[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J ` |  |  | @hankthetank27
+[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFI L` |  |  | @toots
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) |  | `H    ` |  |  | @benwilliamgraham
+[lua](https://github.com/MunifTanjim/tree-sitter-lua) | core | `HFIJL` |  |  | @muniftanjim
+[luadoc](https://github.com/amaanq/tree-sitter-luadoc) |  | `H    ` |  |  | @amaanq
+[luap](https://github.com/amaanq/tree-sitter-luap)[^luap] |  | `H    ` |  |  | @amaanq
+[luau](https://github.com/amaanq/tree-sitter-luau) |  | `HFIJL` |  |  | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) |  | `HF JL` |  |  | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) |  | `HF J ` |  |  | @lewis6991
+[markdown](https://github.com/MDeiml/tree-sitter-markdown)[^markdown] | core | `HFIJ ` |  |  | @MDeiml
+[markdown_inline](https://github.com/MDeiml/tree-sitter-markdown)[^markdown_inline] | core | `H  J ` |  |  | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) |  | `HFIJL` |  |  | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) |  | `H  J ` |  |  | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `H    ` |  |  | 
+[meson](https://github.com/Decodetalkers/tree-sitter-meson) |  | `HFIJ ` |  |  | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H   L` | ✓ |  | @artagnon
+[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` |  |  | @Freed-Wu
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | stable | `H  J ` |  |  | @ObserverOfTime
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) |  | `H I  ` |  |  | 
+[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` |  |  | @aMOPel
+[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` |  |  | @aMOPel
+[ninja](https://github.com/alemuller/tree-sitter-ninja) |  | `HFI  ` |  |  | @alemuller
+[nix](https://github.com/cstrahan/tree-sitter-nix) |  | `HF JL` |  |  | @leo60228
+[norg](https://github.com/nvim-neorg/tree-sitter-norg) | unstable | `     ` |  |  | @JoeyGrajciar, @vhyrro
+[nqc](https://github.com/amaanq/tree-sitter-nqc) | stable | `HFIJL` |  |  | @amaanq
+[objc](https://github.com/amaanq/tree-sitter-objc) |  | `HFIJL` |  |  | @amaanq
+[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` |  |  | @ColinKennedy
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJL` |  |  | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJL` |  |  | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) |  | `H  J ` | ✓ |  | @undu
+[odin](https://github.com/amaanq/tree-sitter-odin) |  | `HFIJL` |  |  | @amaanq
+[org](https://github.com/milisims/tree-sitter-org) |  | `     ` |  |  | 
+[pascal](https://github.com/Isopod/tree-sitter-pascal.git) |  | `HFIJL` |  |  | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) |  | `H    ` |  |  | @amaanq
+[pem](https://github.com/ObserverOfTime/tree-sitter-pem) | stable | `HF J ` |  |  | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) |  | `HF J ` |  |  | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] |  | `HFIJL` |  |  | @tk-shirasaka
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] |  | `HFIJL` |  |  | @tk-shirasaka
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` |  | ✓ | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) |  | `H  J ` |  |  | @leo60228
+[po](https://github.com/erasin/tree-sitter-po) |  | `HF J ` |  |  | @amaanq
+[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` |  |  | @RabbiVeesh, @LeoNerd
+[poe_filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` |  |  | @ObserverOfTime
+[pony](https://github.com/amaanq/tree-sitter-pony) |  | `HFIJL` |  |  | @amaanq, @mfelsche
+[printf](https://github.com/ObserverOfTime/tree-sitter-printf) | stable | `H    ` |  |  | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) |  | `HF   ` |  |  | @elianiva
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` |  |  | @MichaHoffmann
+[properties](https://github.com/ObserverOfTime/tree-sitter-properties)[^properties] | stable | `H  JL` |  |  | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) |  | `HF   ` |  |  | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) |  | `H  J ` |  |  | @matthias-Q
+[psv](https://github.com/amaanq/tree-sitter-csv) | stable | `H    ` |  |  | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` |  |  | @zealot128
+[puppet](https://github.com/amaanq/tree-sitter-puppet) |  | `HFIJL` |  |  | @amaanq
+[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  JL` |  |  | @postsolar
+[pymanifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) | stable | `H  J ` |  |  | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) |  | `HFIJL` |  |  | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) |  | `HFIJL` |  |  | @pwntester
+[qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) |  | `H  J ` |  |  | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) |  | `HF J ` |  |  | @Decodetalkers
+[query](https://github.com/nvim-treesitter/tree-sitter-query)[^query] | core | `HFIJL` |  |  | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) |  | `H IJL` |  |  | @echasnovski
+[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J ` |  |  | 
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) |  | `HFIJL` |  |  | @Fymyte
+[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` |  |  | @joker1007
+[re2c](https://github.com/amaanq/tree-sitter-re2c) | stable | `HFIJL` |  |  | @amaanq
+[readline](https://github.com/ribru17/tree-sitter-readline) | community | `HFIJ ` |  |  | @ribru17
+[regex](https://github.com/tree-sitter/tree-sitter-regex) |  | `H    ` |  |  | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) |  | `H  J ` |  |  | @FallenAngel97
+[requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) | stable | `H  J ` |  |  | @ObserverOfTime
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) |  | `HF J ` |  |  | @bamonroe
+[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFI  ` |  |  | @Hubro
+[roc](https://github.com/nat-418/tree-sitter-roc) | community | `H  JL` |  |  | @nat-418
+[ron](https://github.com/amaanq/tree-sitter-ron) |  | `HFIJL` |  |  | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) |  | `H  JL` |  |  | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) |  | `HFIJL` |  |  | @TravonteD
+[rust](https://github.com/tree-sitter/tree-sitter-rust) |  | `HFIJL` |  |  | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) |  | `HF JL` |  |  | @stevanmilic
+[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` | ✓ |  | @WhyNotHugo
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` |  |  | 
+[scss](https://github.com/serenadeai/tree-sitter-scss) |  | `HFI  ` |  |  | @elianiva
+[slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unstable | `HFIJL` |  | ✓ | @theHamsta
+[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` |  |  | @hunger
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | community | `HFIJL` |  |  | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) |  | `H    ` |  |  | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` |  |  | 
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) |  | `HF   ` |  |  | @amaanq
+[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  |  | @aheber
+[sosl](https://github.com/aheber/tree-sitter-sfapex) |  | `H    ` |  |  | @aheber
+[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` |  |  | @Sarrus1
+[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) |  | `HFIJL` |  |  | @BonaBeavis
+[sql](https://github.com/derekstride/tree-sitter-sql) |  | `H IJ ` |  |  | @derekstride
+[squirrel](https://github.com/amaanq/tree-sitter-squirrel) |  | `HFIJL` |  |  | @amaanq
+[ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) | stable | `HFIJL` |  |  | @ObserverOfTime
+[starlark](https://github.com/amaanq/tree-sitter-starlark) |  | `HFIJL` |  |  | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | stable | `H  J ` |  |  | @amaanq
+[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` |  |  | @mskelton
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) |  | `HFIJL` |  |  | @madskjeldgaard
+[surface](https://github.com/connorlay/tree-sitter-surface) |  | `HFIJ ` |  |  | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | stable | `HFIJL` |  |  | @amaanq
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) |  | `H I L` | ✓ |  | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) |  | `HF J ` |  |  | @RaafatTurki
+[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` |  |  | @ok-ryoko
+[t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJL` |  |  | @xasc
+[tablegen](https://github.com/amaanq/tree-sitter-tablegen) |  | `HFIJL` |  |  | @amaanq
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | stable | `HFI  ` |  |  | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) |  | `HFIJL` | ✓ |  | @euclidianAce
+[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  |  | @vrischmann
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ ` |  |  | @MichaHoffmann
+[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI  ` |  |  | @Porter
+[thrift](https://github.com/duskmoon314/tree-sitter-thrift) |  | `HFIJL` |  |  | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) |  | `HFIJL` |  |  | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) |  | `HF JL` |  |  | @ahelwer, @susliko
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` |  |  | @Freed-Wu
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | unstable | `H    ` |  |  | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) |  | `HFIJL` |  | ✓ | @tk-shirasaka
+[tsv](https://github.com/amaanq/tree-sitter-csv) | stable | `H    ` |  |  | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJL` |  | ✓ | @steelsojka
+[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) |  | `HFIJL` |  |  | @BonaBeavis
+[twig](https://github.com/gbprod/tree-sitter-twig) |  | `H  J ` |  |  | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJL` |  | ✓ | @steelsojka
+[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` |  |  | @Teddytrombone
+[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` |  |  | @uben0, @RaafatTurki
+[udev](https://github.com/ObserverOfTime/tree-sitter-udev) | stable | `H  JL` |  |  | @ObserverOfTime
+[ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) |  | `HFIJL` |  |  | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `H  J ` | ✓ |  | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) |  | `HFI L` |  |  | @ColinKennedy
+[uxntal](https://github.com/amaanq/tree-sitter-uxntal) |  | `HFIJL` |  |  | @amaanq
+[v](https://github.com/vlang/v-analyzer) |  | `HFIJL` |  |  | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) |  | `HF   ` |  |  | @Prince781
+[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` |  |  | @wrapperup, @oscarotero
+[verilog](https://github.com/tree-sitter/tree-sitter-verilog) |  | `HF JL` |  |  | @zegervdv
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) |  | `H    ` |  |  | @caarlos0
+[vim](https://github.com/neovim/tree-sitter-vim) | core | `HF JL` |  |  | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | core | `H  J ` |  |  | @clason
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | stable | `HFIJ ` |  |  | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) |  | `HFI  ` |  |  | @szebniok
+[wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) |  | `HFI  ` |  | ✓ | @theHamsta
+[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF  L` |  |  | @gshpychka, @MarkMcCulloh
+[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J ` |  |  | @liamwh
+[xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) | stable | `H  JL` |  |  | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HFIJL` |  |  | @ObserverOfTime
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | stable | `HFIJL` |  |  | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) |  | `HFIJ ` |  |  | @Hubro
+[yuck](https://github.com/Philipp-M/tree-sitter-yuck) |  | `HFIJL` |  |  | @Philipp-M, @amaanq
+[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` |  |  | @Freed-Wu
+[zig](https://github.com/maxxnino/tree-sitter-zig) |  | `HFIJL` |  |  | @maxxnino
 [^gdscript]: Godot
 [^git_config]: git_config
 [^glimmer]: Glimmer and Ember
diff --git a/TODO.md b/TODO.md
index 5b5dba199..9c2300eb1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -13,7 +13,7 @@ This document lists the planned and finished changes in this rewrite towards [Nv
   - provide `install.compile_command` for overriding (function that takes files, ...?)
   - allow using repo makefile (norg!)?
   - ...or switch to makefile completely?
-- [ ] **`locals.lua`:** refactor, move to `nvim-treesitter-refactor`
+- [ ] **`locals.lua`:** move to `nvim-treesitter-refactor`?
 - [ ] **update-lockfile:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **update-lockfile:** one commit per parser/tier?
 - [ ] **documentation:** consolidate, autogenerate?
@@ -26,9 +26,11 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [X] remove module framework
 - [X] remove extra utilities
 - [X] refactor `indent.lua` into standalone
+- [X] refactor `locals.lua` into standalone
 - [X] refactor commands, predicates, filetypes registration to plugin/
 - [X] support installing tiers of parsers
 - [X] install parsers to standard directory by default
 - [X] remove bundled queries from runtimepath; copy on parser install
 - [X] general refactor and cleanup
+- [X] switch to upstream injection format
 - [X] remove locals from highlighting (cf. https://github.com/nvim-treesitter/nvim-treesitter/issues/3944#issuecomment-1458782497)
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index fa8496469..c8ebe0b0d 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -2,7 +2,6 @@
 -- Locals are a generalization of definition and scopes
 -- it's the way nvim-treesitter uses to "understand" the code
 
-local query = require('nvim-treesitter.query')
 local api = vim.api
 local ts = vim.treesitter
 
@@ -30,19 +29,6 @@ local function get_root_for_node(node)
   return result
 end
 
--- Iterates matches from a locals query file.
--- @param bufnr the buffer
--- @param root the root node
-function M.iter_locals(bufnr, root)
-  return query.iter_group_results(bufnr, 'locals', root)
-end
-
----@param bufnr integer
----@return any
-function M.collect_locals(bufnr)
-  return query.collect_group_results(bufnr, 'locals')
-end
-
 -- Creates unique id for a node based on text and range
 ---@param scope TSNode: the scope node of the definition
 ---@param node_text string: the node text to use
@@ -52,48 +38,6 @@ function M.get_definition_id(scope, node_text)
   return table.concat({ 'k', node_text or '', scope:range() }, '_')
 end
 
-function M.get_definitions(bufnr)
-  local locals = M.collect_locals(bufnr)
-
-  local defs = {}
-
-  for _, loc in ipairs(locals) do
-    if loc['local.definition'] then
-      table.insert(defs, loc['local.definition'])
-    end
-  end
-
-  return defs
-end
-
-function M.get_scopes(bufnr)
-  local locals = M.collect_locals(bufnr)
-
-  local scopes = {}
-
-  for _, loc in ipairs(locals) do
-    if loc['local.scope'] and loc['local.scope'].node then
-      table.insert(scopes, loc['local.scope'].node)
-    end
-  end
-
-  return scopes
-end
-
-function M.get_references(bufnr)
-  local locals = M.collect_locals(bufnr)
-
-  local refs = {}
-
-  for _, loc in ipairs(locals) do
-    if loc['local.reference'] and loc['local.reference'].node then
-      table.insert(refs, loc['local.reference'].node)
-    end
-  end
-
-  return refs
-end
-
 -- Gets a table with all the scopes containing a node
 -- The order is from most specific to least (bottom up)
 ---@param node TSNode
@@ -129,8 +73,8 @@ function M.iter_scope_tree(node, bufnr)
 end
 
 -- Gets a table of all nodes and their 'kinds' from a locals list
----@param local_def any: the local list result
----@return table: a list of node entries
+---@param local_def TSLocal[] the local list result
+---@return TSLocal[] a list of node entries
 function M.get_local_nodes(local_def)
   local result = {}
 
@@ -145,9 +89,9 @@ end
 -- The accumulator function is given
 -- * The table of the node
 -- * The node
--- * The full definition match `@definition.var.something` -> 'var.something'
--- * The last definition match `@definition.var.something` -> 'something'
----@param local_def any The locals result
+-- * The full definition match `@local.definition.var.something` -> 'var.something'
+-- * The last definition match `@local.definition.var.something` -> 'something'
+---@param local_def TSLocal The locals result
 ---@param accumulator function The accumulator function
 ---@param full_match? string The full match path to append to
 ---@param last_match? string The last match
@@ -181,14 +125,108 @@ local function memoize(fn, hash_fn)
   return function(...)
     local key = hash_fn(...)
     if cache[key] == nil then
-      local v = fn(...) ---@type any
-      cache[key] = v ~= nil and v or vim.NIL
+      local v = { fn(...) } ---@type any
+
+      for k, value in pairs(v) do
+        if value == nil then
+          value[k] = vim.NIL
+        end
+      end
+
+      cache[key] = v
     end
 
     local v = cache[key]
-    return v ~= vim.NIL and v or nil
+
+    for k, value in pairs(v) do
+      if value == vim.NIL then
+        value[k] = nil
+      end
+    end
+
+    return unpack(v)
   end
 end
+---@param bufnr integer: the buffer
+---@return TSNode|nil root: root node of the buffer
+local function get_root(bufnr)
+  local parser = ts.get_parser(bufnr)
+  if not parser then
+    return
+  end
+  parser:parse()
+  return parser:trees()[1]:root()
+end
+
+---@param bufnr integer: the buffer
+---@return Query|nil query: `locals` query
+---@return TSNode|nil root: root node of the bufferocal function get_query(bufnr)
+local function get_query(bufnr)
+  local root = get_root(bufnr)
+
+  local ft = vim.bo[bufnr].filetype
+  local lang = ts.language.get_lang(ft) or ft
+
+  local query = (ts.query.get(lang, 'locals'))
+
+  return query, root
+end
+
+---@alias TSScope "parent"|"local"|"global"
+
+---@class TSLocal
+---@field kind string
+---@field node TSNode
+---@field scope TSScope
+
+-- Return all locals for the buffer
+--
+-- memoized by buffer tick
+--
+---@param bufnr integer buffer
+---@return TSLocal[] definitions
+---@return TSLocal[] references
+---@return TSNode[] scopes
+M.get = memoize(function(bufnr)
+  local query, root = get_query(bufnr)
+  if not query or not root then
+    return {}, {}, {}
+  end
+
+  local definitions = {}
+  local scopes = {}
+  local references = {}
+  for id, node, metadata in query:iter_captures(root, bufnr) do
+    local kind = query.captures[id]
+
+    local scope = 'local' ---@type string
+    for k, v in pairs(metadata) do
+      if type(k) == 'string' and vim.endswith(k, 'local.scope') then
+        scope = v
+      end
+    end
+
+    if node and vim.startswith(kind, 'local.definition') then
+      table.insert(definitions, { kind = kind, node = node, scope = scope })
+    end
+
+    if node and kind == 'local.scope' then
+      table.insert(scopes, node)
+    end
+
+    if node and kind == 'local.reference' then
+      table.insert(references, { kind = kind, node = node, scope = scope })
+    end
+  end
+
+  return definitions, references, scopes
+end, function(bufnr)
+  local root = get_root(bufnr)
+  if not root then
+    return tostring(bufnr)
+  end
+  return tostring(root:id())
+end)
 
 -- Get a single dimension table to look definition nodes.
 -- Keys are generated by using the range of the containing scope and the text of the definition node.
@@ -202,11 +240,14 @@ end
 -- is called very frequently, which is why this lookup must be fast as possible.
 --
 ---@param bufnr integer: the buffer
----@return table result: a table for looking up definitions
+---@return TSLocal[] result: a table for looking up definitions
 M.get_definitions_lookup_table = memoize(function(bufnr)
-  local definitions = M.get_definitions(bufnr)
-  local result = {}
+  local definitions, _, _ = M.get(bufnr)
+  if not definitions then
+    return {}
+  end
 
+  local result = {}
   for _, definition in ipairs(definitions) do
     for _, node_entry in ipairs(M.get_local_nodes(definition)) do
       local scopes = M.get_definition_scopes(node_entry.node, bufnr, node_entry.scope)
@@ -221,7 +262,11 @@ M.get_definitions_lookup_table = memoize(function(bufnr)
 
   return result
 end, function(bufnr)
-  return tostring(bufnr)
+  local root = get_root(bufnr)
+  if not root then
+    return tostring(bufnr)
+  end
+  return tostring(root:id())
 end)
 
 -- Gets all the scopes of a definition based on the scope type
@@ -233,7 +278,7 @@ end)
 --
 ---@param node TSNode: the definition node
 ---@param bufnr integer: the buffer
----@param scope_type string: the scope type
+---@param scope_type TSScope: the scope type
 function M.get_definition_scopes(node, bufnr, scope_type)
   local scopes = {}
   local scope_count = 1 ---@type integer|nil
@@ -248,8 +293,8 @@ function M.get_definition_scopes(node, bufnr, scope_type)
   end
 
   local i = 0
-  for scope in M.iter_scope_tree(node, bufnr) do
-    table.insert(scopes, scope)
+  for scope_node in M.iter_scope_tree(node, bufnr) do
+    table.insert(scopes, scope_node)
     i = i + 1
 
     if scope_count and i >= scope_count then
@@ -284,7 +329,8 @@ end
 
 -- Finds usages of a node in a given scope.
 ---@param node TSNode the node to find usages for
----@param scope_node TSNode the node to look within
+---@param scope_node TSNode|nil the node to look within
+---@param bufnr integer|nil the bufnr to look into
 ---@return TSNode[]: a list of nodes
 function M.find_usages(node, scope_node, bufnr)
   bufnr = bufnr or api.nvim_get_current_buf()
@@ -297,17 +343,19 @@ function M.find_usages(node, scope_node, bufnr)
   scope_node = scope_node or get_root_for_node(node)
   local usages = {}
 
-  for match in M.iter_locals(bufnr, scope_node) do
-    if
-      match.reference
-      and match.reference.node
-      and ts.get_node_text(match.reference.node, bufnr) == node_text
-    then
-      local def_node, _, kind = M.find_definition(match.reference.node, bufnr)
+  local query, _ = get_query(bufnr)
+  if not query then
+    return {}
+  end
 
-      if kind == nil or def_node == node then
-        table.insert(usages, match.reference.node)
-      end
+  for id, node_capture in query:iter_captures(scope_node, bufnr) do
+    local kind = query.captures[id]
+    if
+      node_capture
+      and kind == 'local.reference'
+      and ts.get_node_text(node_capture, bufnr) == node_text
+    then
+      table.insert(usages, node_capture)
     end
   end
 
@@ -322,7 +370,7 @@ function M.containing_scope(node, bufnr, allow_scope)
   bufnr = bufnr or api.nvim_get_current_buf()
   allow_scope = allow_scope == nil or allow_scope == true
 
-  local scopes = M.get_scopes(bufnr)
+  local _, _, scopes = M.get(bufnr)
   if not node or not scopes then
     return
   end
@@ -339,7 +387,7 @@ end
 function M.nested_scope(node, cursor_pos)
   local bufnr = api.nvim_get_current_buf()
 
-  local scopes = M.get_scopes(bufnr)
+  local _, _, scopes = M.get(bufnr)
   if not node or not scopes then
     return
   end
@@ -359,7 +407,7 @@ end
 function M.next_scope(node)
   local bufnr = api.nvim_get_current_buf()
 
-  local scopes = M.get_scopes(bufnr)
+  local _, _, scopes = M.get(bufnr)
   if not node or not scopes then
     return
   end
@@ -389,7 +437,7 @@ end
 function M.previous_scope(node)
   local bufnr = api.nvim_get_current_buf()
 
-  local scopes = M.get_scopes(bufnr)
+  local _, _, scopes = M.get(bufnr)
   if not node or not scopes then
     return
   end
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
deleted file mode 100644
index f7e5205f7..000000000
--- a/lua/nvim-treesitter/query.lua
+++ /dev/null
@@ -1,165 +0,0 @@
-local M = {}
-
-local EMPTY_ITER = function() end
-
----@class QueryInfo
----@field root TSNode
----@field source integer
----@field start integer
----@field stop integer
-
----@param bufnr integer
----@param query_name string
----@param root TSNode
----@param root_lang string|nil
----@return Query|nil, QueryInfo|nil
-local function prepare_query(bufnr, query_name, root, root_lang)
-  local ft = vim.bo[bufnr].filetype
-  local buf_lang = vim.treesitter.language.get_lang(ft) or ft
-  if not buf_lang then
-    return
-  end
-
-  local parser = vim.treesitter.get_parser(bufnr, buf_lang)
-  if not parser then
-    return
-  end
-
-  if not root then
-    local first_tree = parser:trees()[1]
-
-    if first_tree then
-      root = first_tree:root()
-    end
-  end
-
-  if not root then
-    return
-  end
-
-  local range = { root:range() }
-
-  if not root_lang then
-    local lang_tree = parser:language_for_range(range)
-
-    if lang_tree then
-      root_lang = lang_tree:lang()
-    end
-  end
-
-  if not root_lang then
-    return
-  end
-
-  local query = vim.treesitter.query.get(root_lang, query_name)
-  if not query then
-    return
-  end
-
-  return query,
-    {
-      root = root,
-      source = bufnr,
-      start = range[1],
-      -- The end row is exclusive so we need to add 1 to it.
-      stop = range[3] + 1,
-    }
-end
-
--- Given a path (i.e. a List(String)) this functions inserts value at path
----@param object any
----@param path string[]
----@param value any
-function M.insert_to_path(object, path, value)
-  local curr_obj = object
-
-  for index = 1, (#path - 1) do
-    if curr_obj[path[index]] == nil then
-      curr_obj[path[index]] = {}
-    end
-
-    curr_obj = curr_obj[path[index]]
-  end
-
-  curr_obj[path[#path]] = value
-end
-
----@param query Query
----@param bufnr integer
----@param start_row integer
----@param end_row integer
-function M.iter_prepared_matches(query, qnode, bufnr, start_row, end_row)
-  -- A function that splits  a string on '.'
-  ---@param to_split string
-  ---@return string[]
-  local function split(to_split)
-    local t = {}
-    for str in string.gmatch(to_split, '([^.]+)') do
-      table.insert(t, str)
-    end
-
-    return t
-  end
-
-  local matches = query:iter_matches(qnode, bufnr, start_row, end_row, { all = false })
-
-  local function iterator()
-    local pattern, match, metadata = matches()
-    if pattern ~= nil then
-      local prepared_match = {}
-
-      -- Extract capture names from each match
-      for id, node in pairs(match) do
-        local name = query.captures[id] -- name of the capture in the query
-        if name ~= nil then
-          local path = split(name .. '.node')
-          M.insert_to_path(prepared_match, path, node)
-          local metadata_path = split(name .. '.metadata')
-          M.insert_to_path(prepared_match, metadata_path, metadata[id])
-        end
-      end
-
-      -- Add some predicates for testing
-      ---@type string[][] ( TODO: make pred type so this can be pred[])
-      local preds = query.info.patterns[pattern]
-      if preds then
-        for _, pred in pairs(preds) do
-          -- functions
-          if pred[1] == 'set!' and type(pred[2]) == 'string' then
-            M.insert_to_path(prepared_match, split(pred[2]), pred[3])
-          end
-        end
-      end
-
-      return prepared_match
-    end
-  end
-  return iterator
-end
-
----Iterates matches from a query file.
----@param bufnr integer the buffer
----@param query_group string the query file to use
----@param root TSNode the root node
----@param root_lang? string the root node lang, if known
-function M.iter_group_results(bufnr, query_group, root, root_lang)
-  local query, params = prepare_query(bufnr, query_group, root, root_lang)
-  if not query then
-    return EMPTY_ITER
-  end
-  assert(params)
-
-  return M.iter_prepared_matches(query, params.root, params.source, params.start, params.stop)
-end
-
-function M.collect_group_results(bufnr, query_group, root, lang)
-  local matches = {}
-
-  for prepared_match in M.iter_group_results(bufnr, query_group, root, lang) do
-    table.insert(matches, prepared_match)
-  end
-
-  return matches
-end
-
-return M
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 825d84037..6c23c1af6 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -47,6 +47,7 @@ for _, v in ipairs(sorted_parsers) do
     .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/folds.scm') and 'F' or ' ')
     .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/indents.scm') and 'I' or ' ')
     .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/injections.scm') and 'J' or ' ')
+    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
     .. '` | '
 
   -- CLI

From eb1b6ec542ecc0d62d54f7b6889e2958a543499b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 23 Feb 2024 13:36:52 +0100
Subject: [PATCH 2276/2704] feat!: drop luarocks release

---
 .github/workflows/release.yml             | 24 -------------
 contrib/nvim-treesitter-luarocks.template | 41 -----------------------
 contrib/nvim-treesitter-scm-1.rockspec    | 36 --------------------
 3 files changed, 101 deletions(-)
 delete mode 100644 .github/workflows/release.yml
 delete mode 100644 contrib/nvim-treesitter-luarocks.template
 delete mode 100644 contrib/nvim-treesitter-scm-1.rockspec

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 11f3ffc14..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: "release"
-on:
-  push:
-    tags: # Will upload to luarocks.org
-      - "*"
-  pull_request: # Will test a local install without uploading to luarocks.org
-   paths:
-    - 'contrib/*.rockspec'
-    - .github/workflows/release.yml
-  
-jobs:
-  luarocks-upload:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: nvim-neorocks/luarocks-tag-release@v5
-        env:
-          LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }}
-        with:
-          name: nvim-treesitter
-          detailed_description: |
-            The goal of nvim-treesitter is both to provide a simple and easy way to use the interface for tree-sitter in Neovim
-            and to provide some basic functionality such as highlighting based on it.
-          template: contrib/nvim-treesitter-luarocks.template
diff --git a/contrib/nvim-treesitter-luarocks.template b/contrib/nvim-treesitter-luarocks.template
deleted file mode 100644
index 8109f5f2b..000000000
--- a/contrib/nvim-treesitter-luarocks.template
+++ /dev/null
@@ -1,41 +0,0 @@
-local git_ref = '$git_ref'
-local modrev = '$modrev'
-local specrev = '-1'
-
-local repo_url = '$repo_url'
-
-rockspec_format = '3.0'
-package = '$package'
-version = modrev .. specrev
-
-description = {
-  summary = 'Nvim Treesitter configurations and abstraction layer',
-  detailed = $detailed_description,
-  labels = { 'neovim' },
-  homepage = 'https://github.com/nvim-treesitter/nvim-treesitter',
-  license = 'Apache-2.0',
-}
-
-dependencies = {
-  'lua >= 5.1',
-}
-
--- source = file:///.
-
-source = {
-  url = repo_url .. '/archive/' .. git_ref .. '.zip',
-  dir = '$repo_name-' .. '$archive_dir_suffix',
-}
-
-build = {
-  type = 'make',
-  build_pass = false,
-  install_variables = {
-    INST_PREFIX='$(PREFIX)',
-    INST_BINDIR='$(BINDIR)',
-    INST_LIBDIR='$(LIBDIR)',
-    INST_LUADIR='$(LUADIR)',
-    INST_CONFDIR='$(CONFDIR)',
-  },
-  copy_directories = $copy_directories,
-}
diff --git a/contrib/nvim-treesitter-scm-1.rockspec b/contrib/nvim-treesitter-scm-1.rockspec
deleted file mode 100644
index a901c5b12..000000000
--- a/contrib/nvim-treesitter-scm-1.rockspec
+++ /dev/null
@@ -1,36 +0,0 @@
-local MODREV, SPECREV = 'scm', '-1'
-rockspec_format = '3.0'
-package = 'nvim-treesitter'
-version = MODREV .. SPECREV
-
-description = {
-  summary = 'Nvim Treesitter configurations and abstraction layer',
-  labels = { 'neovim' },
-  homepage = 'https://github.com/nvim-treesitter/nvim-treesitter',
-  license = 'Apache-2.0',
-}
-
-dependencies = {
-  'lua >= 5.1',
-}
-
-source = {
-  url = 'git://github.com/nvim-treesitter/nvim-treesitter',
-}
-
-build = {
-  type = 'make',
-  install_variables = {
-    INST_PREFIX='$(PREFIX)',
-    INST_BINDIR='$(BINDIR)',
-    INST_LIBDIR='$(LIBDIR)',
-    INST_LUADIR='$(LUADIR)',
-    INST_CONFDIR='$(CONFDIR)',
-  },
-  copy_directories = {
-    'autoload',
-    'doc',
-    'plugin',
-    'queries'
-  }
-}

From 5aa2984a028731bf60d53a7f9773997dfc84e4f7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 20 May 2023 17:38:33 +0200
Subject: [PATCH 2277/2704] refactor: use vim.fs.joinpath

---
 .github/workflows/update-lockfile.yml |  2 +-
 .github/workflows/update-readme.yml   |  2 +-
 lua/nvim-treesitter/config.lua        |  6 ++---
 lua/nvim-treesitter/install.lua       | 32 +++++++++++++--------------
 lua/nvim-treesitter/shell_cmds.lua    | 11 +++++----
 lua/nvim-treesitter/utils.lua         | 12 ----------
 scripts/write-lockfile.lua            |  2 +-
 7 files changed, 28 insertions(+), 39 deletions(-)
 delete mode 100644 lua/nvim-treesitter/utils.lua

diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index df0f61347..992e1c0d2 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Prepare
         env:
-          NVIM_TAG: stable
+          NVIM_TAG: nightly
         run: |
           wget https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux
           mv jd-amd64-linux /tmp/jd
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index de416a873..557a3f3c6 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Prepare
         env:
-          NVIM_TAG: stable
+          NVIM_TAG: nightly
         run: |
           bash ./scripts/ci-install.sh
 
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index e43ad13c2..01880a8bc 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -1,5 +1,3 @@
-local utils = require('nvim-treesitter.utils')
-
 local M = {}
 
 ---@class TSConfig
@@ -15,7 +13,7 @@ local config = {
   auto_install = false,
   ensure_install = {},
   ignore_install = {},
-  install_dir = utils.join_path(vim.fn.stdpath('data'), 'site'),
+  install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
 }
 
 ---Setup call for users to override configuration configurations.
@@ -62,7 +60,7 @@ end
 ---@param dir_name string
 ---@return string
 function M.get_install_dir(dir_name)
-  local dir = utils.join_path(config.install_dir, dir_name)
+  local dir = vim.fs.joinpath(config.install_dir, dir_name)
 
   if not vim.loop.fs_stat(dir) then
     local ok, error = pcall(vim.fn.mkdir, dir, 'p', '0755')
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 745c2dd1f..0db61137c 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -1,7 +1,7 @@
 local api = vim.api
+local fs = vim.fs
 local uv = vim.loop
 
-local utils = require('nvim-treesitter.utils')
 local parsers = require('nvim-treesitter.parsers')
 local config = require('nvim-treesitter.config')
 local shell = require('nvim-treesitter.shell_cmds')
@@ -208,7 +208,7 @@ end
 ---@return string|nil
 local function get_revision(lang)
   if #lockfile == 0 then
-    local filename = utils.get_package_path('lockfile.json')
+    local filename = shell.get_package_path('lockfile.json')
     local file = assert(io.open(filename, 'r'))
     lockfile = vim.json.decode(file:read('*all'))
     file:close()
@@ -227,7 +227,7 @@ end
 ---@param lang string
 ---@return string|nil
 local function get_installed_revision(lang)
-  local lang_file = utils.join_path(config.get_install_dir('parser-info'), lang .. '.revision')
+  local lang_file = fs.joinpath(config.get_install_dir('parser-info'), lang .. '.revision')
   local file = assert(io.open(lang_file, 'r'))
   local revision = file:read('*a')
   file:close()
@@ -291,7 +291,7 @@ local function install_lang(lang, cache_dir, install_dir, force, with_sync, gene
   local repo = get_parser_install_info(lang)
 
   local project_name = 'tree-sitter-' .. lang
-  local maybe_local_path = vim.fs.normalize(repo.url)
+  local maybe_local_path = fs.normalize(repo.url)
   local from_local_path = vim.fn.isdirectory(maybe_local_path) == 1
   if from_local_path then
     repo.url = maybe_local_path
@@ -302,16 +302,16 @@ local function install_lang(lang, cache_dir, install_dir, force, with_sync, gene
   if from_local_path then
     compile_location = repo.url
     if repo.location then
-      compile_location = utils.join_path(compile_location, repo.location)
+      compile_location = fs.joinpath(compile_location, repo.location)
     end
   else
     local repo_location = project_name
     if repo.location then
-      repo_location = utils.join_path(repo_location, repo.location)
+      repo_location = fs.joinpath(repo_location, repo.location)
     end
-    compile_location = utils.join_path(cache_dir, repo_location)
+    compile_location = fs.joinpath(cache_dir, repo_location)
   end
-  local parser_lib_name = utils.join_path(install_dir, lang) .. '.so'
+  local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
 
   generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
 
@@ -370,7 +370,7 @@ local function install_lang(lang, cache_dir, install_dir, force, with_sync, gene
     vim.list_extend(command_list, {
       {
         cmd = function()
-          vim.fn.delete(utils.join_path(cache_dir, project_name), 'rf')
+          vim.fn.delete(fs.joinpath(cache_dir, project_name), 'rf')
         end,
       },
     })
@@ -415,14 +415,14 @@ local function install_lang(lang, cache_dir, install_dir, force, with_sync, gene
     shell.select_compile_command(repo, cc, compile_location),
     {
       cmd = function()
-        uv.fs_copyfile(utils.join_path(compile_location, 'parser.so'), parser_lib_name)
+        uv.fs_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
       end,
     },
     {
       cmd = function()
         local file = assert(
           io.open(
-            utils.join_path(config.get_install_dir('parser-info') or '', lang .. '.revision'),
+            fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision'),
             'w'
           )
         )
@@ -435,7 +435,7 @@ local function install_lang(lang, cache_dir, install_dir, force, with_sync, gene
     vim.list_extend(command_list, {
       {
         cmd = function()
-          vim.fn.delete(utils.join_path(cache_dir, project_name), 'rf')
+          vim.fn.delete(fs.joinpath(cache_dir, project_name), 'rf')
         end,
       },
     })
@@ -485,8 +485,8 @@ function M.install(languages, options)
   for _, lang in ipairs(languages) do
     install_lang(lang, cache_dir, install_dir, force, with_sync, generate_from_grammar)
     uv.fs_symlink(
-      utils.get_package_path('runtime', 'queries', lang),
-      utils.join_path(config.get_install_dir('queries'), lang),
+      shell.get_package_path('runtime', 'queries', lang),
+      fs.joinpath(config.get_install_dir('queries'), lang),
       { dir = true, junction = true } -- needed on Windows (non-junction links require admin)
     )
   end
@@ -555,8 +555,8 @@ function M.uninstall(languages)
         vim.log.levels.ERROR
       )
     else
-      local parser = utils.join_path(parser_dir, lang) .. '.so'
-      local queries = utils.join_path(query_dir, lang)
+      local parser = fs.joinpath(parser_dir, lang) .. '.so'
+      local queries = fs.joinpath(query_dir, lang)
       uninstall(lang, parser, queries)
     end
   end
diff --git a/lua/nvim-treesitter/shell_cmds.lua b/lua/nvim-treesitter/shell_cmds.lua
index 2dc7f8748..4c631512d 100644
--- a/lua/nvim-treesitter/shell_cmds.lua
+++ b/lua/nvim-treesitter/shell_cmds.lua
@@ -1,5 +1,4 @@
 local uv = vim.loop
-local utils = require('nvim-treesitter.utils')
 
 local iswin = uv.os_uname().sysname == 'Windows_NT'
 
@@ -91,7 +90,7 @@ function M.select_compile_command(repo, cc, compile_location)
       err = 'Error during compilation',
       opts = {
         args = {
-          '--makefile=' .. utils.get_package_path('scripts', 'compile_parsers.makefile'),
+          '--makefile=' .. M.get_package_path('scripts', 'compile_parsers.makefile'),
           'CC=' .. cc,
         },
         cwd = compile_location,
@@ -110,7 +109,7 @@ function M.select_download_commands(repo, project_name, cache_dir, revision, pre
   local can_use_tar = vim.fn.executable('tar') == 1 and vim.fn.executable('curl') == 1
   local is_github = repo.url:find('github.com', 1, true)
   local is_gitlab = repo.url:find('gitlab.com', 1, true)
-  local project_dir = utils.join_path(cache_dir, project_name)
+  local project_dir = vim.fs.joinpath(cache_dir, project_name)
 
   revision = revision or repo.branch or 'master'
 
@@ -183,7 +182,7 @@ function M.select_download_commands(repo, project_name, cache_dir, revision, pre
       {
         cmd = function()
           uv.fs_rename(
-            utils.join_path(temp_dir, url:match('[^/]-$') .. '-' .. dir_rev),
+            vim.fs.joinpath(temp_dir, url:match('[^/]-$') .. '-' .. dir_rev),
             project_dir
           )
         end,
@@ -228,6 +227,10 @@ function M.select_download_commands(repo, project_name, cache_dir, revision, pre
   end
 end
 
+function M.get_package_path(...)
+  return vim.fs.joinpath(vim.fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
+end
+
 --TODO(clason): only needed for iter_cmd_sync -> replace with uv.spawn?
 
 -- Convert path for cmd.exe on Windows (needed when shellslash is set)
diff --git a/lua/nvim-treesitter/utils.lua b/lua/nvim-treesitter/utils.lua
deleted file mode 100644
index f9e5a2b86..000000000
--- a/lua/nvim-treesitter/utils.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local M = {}
-
---TODO(clason): replace by vim.fs._join_paths
-function M.join_path(...)
-  return (table.concat({ ... }, '/'):gsub('//+', '/'))
-end
-
-function M.get_package_path(...)
-  return M.join_path(vim.fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
-end
-
-return M
diff --git a/scripts/write-lockfile.lua b/scripts/write-lockfile.lua
index a264af83c..5dac838d6 100755
--- a/scripts/write-lockfile.lua
+++ b/scripts/write-lockfile.lua
@@ -2,7 +2,7 @@
 vim.opt.runtimepath:append('.')
 
 -- Load previous lockfile
-local filename = require('nvim-treesitter.utils').get_package_path('lockfile.json')
+local filename = require('nvim-treesitter.shell_cmds').get_package_path('lockfile.json')
 local file = assert(io.open(filename, 'r'))
 local lockfile = vim.json.decode(file:read('*a'))
 file:close()

From cde679e435ade757733772236abf299fc06da231 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 22 May 2023 14:35:25 +0100
Subject: [PATCH 2278/2704] refactor: rewrite installation using jobs and async

Replace sync variants with callback support
---
 README.md                          |   3 -
 TODO.md                            |   2 +-
 doc/nvim-treesitter.txt            |  14 +-
 lua/nvim-treesitter/async.lua      | 110 ++++
 lua/nvim-treesitter/config.lua     |  27 +-
 lua/nvim-treesitter/health.lua     |  22 +-
 lua/nvim-treesitter/install.lua    | 885 +++++++++++++++++------------
 lua/nvim-treesitter/job.lua        | 122 ++++
 lua/nvim-treesitter/log.lua        | 133 +++++
 lua/nvim-treesitter/parsers.lua    |   5 +-
 lua/nvim-treesitter/shell_cmds.lua | 258 ---------
 lua/nvim-treesitter/util.lua       |  28 +
 plugin/nvim-treesitter.lua         |  28 +-
 scripts/update-readme.lua          |  13 +-
 scripts/write-lockfile.lua         |  10 +-
 15 files changed, 951 insertions(+), 709 deletions(-)
 create mode 100644 lua/nvim-treesitter/async.lua
 create mode 100644 lua/nvim-treesitter/job.lua
 create mode 100644 lua/nvim-treesitter/log.lua
 delete mode 100644 lua/nvim-treesitter/shell_cmds.lua
 create mode 100644 lua/nvim-treesitter/util.lua

diff --git a/README.md b/README.md
index 635b1ed15..523940b63 100644
--- a/README.md
+++ b/README.md
@@ -59,9 +59,6 @@ require'nvim-treesitter'.setup {
   -- List of parsers to ignore installing
   ignore_install = { },
 
-  -- Install parsers synchronously (only applied to `ensure_install`)
-  sync_install = false,
-
   -- Automatically install missing parsers when entering buffer
   auto_install = false,
 
diff --git a/TODO.md b/TODO.md
index 9c2300eb1..d61d179d6 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,6 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [ ] **`query_predicates.lua`:** upstream/remove
 - [ ] **`parsers.lua`:** modularize?
 - [ ] **`parsers.lua`:** assign tiers
-- [ ] **`install.lua`:** fix messages, add sync support (@lewis6991)
 - [ ] **`install.lua`:** simplify compilation:
   - hardcode one compiler + args per platform
   - provide `install.compile_command` for overriding (function that takes files, ...?)
@@ -32,5 +31,6 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [X] install parsers to standard directory by default
 - [X] remove bundled queries from runtimepath; copy on parser install
 - [X] general refactor and cleanup
+- [X] rewrite installation using async module (drop support for sync; use callback instead)
 - [X] switch to upstream injection format
 - [X] remove locals from highlighting (cf. https://github.com/nvim-treesitter/nvim-treesitter/issues/3944#issuecomment-1458782497)
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 7054121b5..a7c6bfa69 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -38,16 +38,13 @@ To install supported parsers and queries, put this in your `init.lua` file:
 
 >lua
   require'nvim-treesitter.configs'.setup {
-    -- A directory to install the parsers into.
+    -- A directory to install the parsers and queries to.
     -- Defaults to the `stdpath('data')/site` dir.
     install_dir = "/some/path/to/store/parsers",
 
     -- A list of parser names, or "core", "stable", "community", "unstable"
     ensure_install = { "core", "rust" },
 
-    -- Install parsers synchronously (only applied to `ensure_installed`)
-    sync_install = false,
-
     -- Automatically install missing parsers when entering buffer
     auto_install = false,
 
@@ -66,10 +63,6 @@ COMMANDS                                            *nvim-treesitter-commands*
 Install one or more treesitter parsers.
 You can use |:TSInstall| `all` to install all parsers. Use |:TSInstall!| to
 force the reinstallation of already installed parsers.
-							      *:TSInstallSync*
-:TSInstallSync {language} ... ~
-
-Perform the |:TSInstall| operation synchronously.
 
 							      *:TSInstallInfo*
 :TSInstallInfo ~
@@ -83,11 +76,6 @@ Update the installed parser for one more {language} or all installed parsers
 if {language} is omitted. The specified parser is installed if it is not already
 installed.
 
-							       *:TSUpdateSync*
-:TSUpdateSync {language} ... ~
-
-Perform the |:TSUpdate| operation synchronously.
-
 								*:TSUninstall*
 :TSUninstall {language} ... ~
 
diff --git a/lua/nvim-treesitter/async.lua b/lua/nvim-treesitter/async.lua
new file mode 100644
index 000000000..57a670ef6
--- /dev/null
+++ b/lua/nvim-treesitter/async.lua
@@ -0,0 +1,110 @@
+local co = coroutine
+
+local M = {}
+
+---Executes a future with a callback when it is done
+--- @param func function
+--- @param callback function
+--- @param ... unknown
+local function execute(func, callback, ...)
+  local thread = co.create(func)
+
+  local function step(...)
+    local ret = { co.resume(thread, ...) }
+    --- @type boolean, any
+    local stat, nargs_or_err = unpack(ret)
+
+    if not stat then
+      error(
+        string.format(
+          'The coroutine failed with this message: %s\n%s',
+          nargs_or_err,
+          debug.traceback(thread)
+        )
+      )
+    end
+
+    if co.status(thread) == 'dead' then
+      if callback then
+        callback(unpack(ret, 3, table.maxn(ret)))
+      end
+      return
+    end
+
+    --- @type function, any[]
+    local fn, args = ret[3], { unpack(ret, 4, table.maxn(ret)) }
+    args[nargs_or_err] = step
+    fn(unpack(args, 1, nargs_or_err))
+  end
+
+  step(...)
+end
+
+--- Creates an async function with a callback style function.
+--- @generic F: function
+--- @param func F
+--- @param argc integer
+--- @return F
+function M.wrap(func, argc)
+  --- @param ... unknown
+  --- @return unknown
+  return function(...)
+    return co.yield(argc, func, ...)
+  end
+end
+
+---Use this to create a function which executes in an async context but
+---called from a non-async context. Inherently this cannot return anything
+---since it is non-blocking
+--- @generic F: function
+--- @param func async F
+--- @param nargs? integer
+--- @return F
+function M.sync(func, nargs)
+  nargs = nargs or 0
+  return function(...)
+    local callback = select(nargs + 1, ...)
+    execute(func, callback, unpack({ ... }, 1, nargs))
+  end
+end
+
+--- @param n integer max number of concurrent jobs
+--- @param interrupt_check? function
+--- @param thunks function[]
+--- @return any
+function M.join(n, interrupt_check, thunks)
+  return co.yield(1, function(finish)
+    if #thunks == 0 then
+      return finish()
+    end
+
+    local remaining = { select(n + 1, unpack(thunks)) }
+    local to_go = #thunks
+
+    local ret = {} --- @type any[]
+
+    local function cb(...)
+      ret[#ret + 1] = { ... }
+      to_go = to_go - 1
+      if to_go == 0 then
+        finish(ret)
+      elseif not interrupt_check or not interrupt_check() then
+        if #remaining > 0 then
+          local next_task = table.remove(remaining)
+          next_task(cb)
+        end
+      end
+    end
+
+    for i = 1, math.min(n, #thunks) do
+      thunks[i](cb)
+    end
+  end, 1)
+end
+
+---An async function that when called will yield to the Neovim scheduler to be
+---able to call the API.
+--- @type fun()
+M.main = M.wrap(vim.schedule, 1)
+
+return M
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 01880a8bc..b8a9f6e91 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -1,7 +1,6 @@
 local M = {}
 
 ---@class TSConfig
----@field sync_install boolean
 ---@field auto_install boolean
 ---@field ensure_install string[]
 ---@field ignore_install string[]
@@ -9,7 +8,6 @@ local M = {}
 
 ---@type TSConfig
 local config = {
-  sync_install = false,
   auto_install = false,
   ensure_install = {},
   ignore_install = {},
@@ -38,7 +36,11 @@ function M.setup(user_data)
           and not vim.list_contains(M.installed_parsers(), lang)
           and not vim.list_contains(config.ignore_install, lang)
         then
-          require('nvim-treesitter.install').install(lang)
+          require('nvim-treesitter.install').install(lang, nil, function()
+            -- Need to pcall since 'FileType' can be triggered multiple times
+            -- per buffer
+            pcall(vim.treesitter.start, args.buf, lang)
+          end)
         end
       end,
     })
@@ -48,9 +50,7 @@ function M.setup(user_data)
     local to_install = M.norm_languages(config.ensure_install, { ignored = true, installed = true })
 
     if #to_install > 0 then
-      require('nvim-treesitter.install').install(to_install, {
-        with_sync = config.sync_install,
-      })
+      require('nvim-treesitter.install').install(to_install)
     end
   end
 end
@@ -63,9 +63,10 @@ function M.get_install_dir(dir_name)
   local dir = vim.fs.joinpath(config.install_dir, dir_name)
 
   if not vim.loop.fs_stat(dir) then
-    local ok, error = pcall(vim.fn.mkdir, dir, 'p', '0755')
+    local ok, err = pcall(vim.fn.mkdir, dir, 'p', '0755')
     if not ok then
-      vim.notify(error, vim.log.levels.ERROR)
+      local log = require('nvim-treesitter.log')
+      log.error(err --[[@as string]])
     end
   end
   return dir
@@ -105,35 +106,37 @@ function M.norm_languages(languages, skip)
     end
     languages = parsers.get_available()
   end
+  --TODO(clason): skip and warn on unavailable parser
 
   for i, tier in ipairs(parsers.tiers) do
     if vim.list_contains(languages, tier) then
       languages = vim.iter.filter(function(l)
         return l ~= tier
-      end, languages)
+      end, languages) --[[@as string[] ]]
       vim.list_extend(languages, parsers.get_available(i))
     end
   end
 
+  --TODO(clason): support skipping tiers
   if skip and skip.ignored then
     local ignored = config.ignore_install
     languages = vim.iter.filter(function(v)
       return not vim.list_contains(ignored, v)
-    end, languages)
+    end, languages) --[[@as string[] ]]
   end
 
   if skip and skip.installed then
     local installed = M.installed_parsers()
     languages = vim.iter.filter(function(v)
       return not vim.list_contains(installed, v)
-    end, languages)
+    end, languages) --[[@as string[] ]]
   end
 
   if skip and skip.missing then
     local installed = M.installed_parsers()
     languages = vim.iter.filter(function(v)
       return vim.list_contains(installed, v)
-    end, languages)
+    end, languages) --[[@as string[] ]]
   end
 
   return languages
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index e8c945f6c..1e17bb00b 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -1,6 +1,6 @@
-local shell = require('nvim-treesitter.shell_cmds')
 local install = require('nvim-treesitter.install')
 local config = require('nvim-treesitter.config')
+local util = require('nvim-treesitter.util')
 local tsq = vim.treesitter.query
 
 local M = {}
@@ -62,7 +62,7 @@ local function install_health()
     vim.health.ok('`git` executable found.')
   end
 
-  local cc = shell.select_executable(install.compilers)
+  local cc = install.select_executable(install.compilers)
   if not cc then
     vim.health.error('`cc` executable not found.', {
       'Check that any of '
@@ -118,6 +118,7 @@ local function query_status(lang, query_group)
 end
 
 function M.check()
+  --- @type {[1]: string, [2]: string, [3]: string}[]
   local error_collection = {}
   -- Installation dependency checks
   install_health()
@@ -144,22 +145,19 @@ function M.check()
   if #error_collection > 0 then
     vim.health.start('The following errors have been detected:')
     for _, p in ipairs(error_collection) do
-      local lang, type, err = unpack(p)
+      local lang, type, err = p[1], p[2], p[3]
       local lines = {}
       table.insert(lines, lang .. '(' .. type .. '): ' .. err)
       local files = tsq.get_files(lang, type)
       if #files > 0 then
         table.insert(lines, lang .. '(' .. type .. ') is concatenated from the following files:')
         for _, file in ipairs(files) do
-          local fd = io.open(file, 'r')
-          if fd then
-            local ok, file_err = pcall(tsq.parse, lang, fd:read('*a'))
-            if ok then
-              table.insert(lines, '|  [OK]:"' .. file .. '"')
-            else
-              table.insert(lines, '| [ERR]:"' .. file .. '", failed to load: ' .. file_err)
-            end
-            fd:close()
+          local query = util.read_file(file)
+          local ok, file_err = pcall(tsq.parse, lang, query)
+          if ok then
+            table.insert(lines, '|  [OK]:"' .. file .. '"')
+          else
+            table.insert(lines, '| [ERR]:"' .. file .. '", failed to load: ' .. file_err)
           end
         end
       end
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 0db61137c..ab9543673 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -2,9 +2,27 @@ local api = vim.api
 local fs = vim.fs
 local uv = vim.loop
 
-local parsers = require('nvim-treesitter.parsers')
+local a = require('nvim-treesitter.async')
 local config = require('nvim-treesitter.config')
-local shell = require('nvim-treesitter.shell_cmds')
+local job = require('nvim-treesitter.job')
+local log = require('nvim-treesitter.log')
+local parsers = require('nvim-treesitter.parsers')
+local util = require('nvim-treesitter.util')
+
+--- @type fun(path: string, new_path: string, flags?: table): string?
+local uv_copyfile = a.wrap(uv.fs_copyfile, 4)
+
+--- @type fun(path: string, mode: integer): string?
+local uv_mkdir = a.wrap(uv.fs_mkdir, 3)
+
+--- @type fun(path: string, new_path: string): string?
+local uv_rename = a.wrap(uv.fs_rename, 3)
+
+--- @type fun(path: string, new_path: string, flags?: table): string?
+local uv_symlink = a.wrap(uv.fs_symlink, 4)
+
+--- @type fun(path: string): string?
+local uv_unlink = a.wrap(uv.fs_unlink, 2)
 
 local M = {}
 
@@ -14,182 +32,26 @@ local M = {}
 ---@type table<string, LockfileInfo>
 local lockfile = {}
 
+local max_jobs = 50
+
+local iswin = uv.os_uname().sysname == 'Windows_NT'
+local ismac = uv.os_uname().sysname == 'Darwin'
+
+--- @diagnostic disable-next-line:missing-parameter
 M.compilers = { uv.os_getenv('CC'), 'cc', 'gcc', 'clang', 'cl', 'zig' }
-M.prefer_git = uv.os_uname().sysname == 'Windows_NT'
-M.command_extra_args = {}
-M.ts_generate_args = nil
-
-local started_commands = 0
-local finished_commands = 0
-local failed_commands = 0
-local stdout_output = {}
-local stderr_output = {}
-
----
---- JOB API functions
----
-
-local function reset_progress_counter()
-  if started_commands ~= finished_commands then
-    return
-  end
-  started_commands = 0
-  finished_commands = 0
-  failed_commands = 0
-  stdout_output = {}
-  stderr_output = {}
-end
-
-local function get_job_status()
-  return '[nvim-treesitter] ['
-    .. finished_commands
-    .. '/'
-    .. started_commands
-    .. (failed_commands > 0 and ', failed: ' .. failed_commands or '')
-    .. ']'
-end
-
----@param cmd Command
----@return string command
-local function get_command(cmd)
-  local options = ''
-  if cmd.opts and cmd.opts.args then
-    if M.command_extra_args[cmd.cmd] then
-      vim.list_extend(cmd.opts.args, M.command_extra_args[cmd.cmd])
-    end
-    for _, opt in ipairs(cmd.opts.args) do
-      options = string.format('%s %s', options, opt)
-    end
-  end
-
-  local command = string.format('%s %s', cmd.cmd, options)
-  if cmd.opts and cmd.opts.cwd then
-    command = shell.make_directory_change_for_command(cmd.opts.cwd, command)
-  end
-  return command
-end
-
----@param cmd_list Command[]
----@return boolean
-local function iter_cmd_sync(cmd_list)
-  for _, cmd in ipairs(cmd_list) do
-    if cmd.info then
-      vim.notify(cmd.info)
-    end
-
-    if type(cmd.cmd) == 'function' then
-      cmd.cmd()
-    else
-      local ret = vim.fn.system(get_command(cmd))
-      if vim.v.shell_error ~= 0 then
-        vim.notify(ret)
-        api.nvim_err_writeln(
-          (cmd.err and cmd.err .. '\n' or '')
-            .. 'Failed to execute the following command:\n'
-            .. vim.inspect(cmd)
-        )
-        return false
-      end
-    end
-  end
-
-  return true
-end
-
-local function iter_cmd(cmd_list, i, lang, success_message)
-  if i == 1 then
-    started_commands = started_commands + 1
-  end
-  if i == #cmd_list + 1 then
-    finished_commands = finished_commands + 1
-    return vim.notify(get_job_status() .. ' ' .. success_message)
-  end
-
-  local attr = cmd_list[i]
-  if attr.info then
-    vim.notify(get_job_status() .. ' ' .. attr.info)
-  end
-
-  if attr.opts and attr.opts.args and M.command_extra_args[attr.cmd] then
-    vim.list_extend(attr.opts.args, M.command_extra_args[attr.cmd])
-  end
-
-  if type(attr.cmd) == 'function' then
-    local ok, err = pcall(attr.cmd)
-    if ok then
-      iter_cmd(cmd_list, i + 1, lang, success_message)
-    else
-      failed_commands = failed_commands + 1
-      finished_commands = finished_commands + 1
-      return api.nvim_err_writeln(
-        (attr.err or ('Failed to execute the following command:\n' .. vim.inspect(attr)))
-          .. '\n'
-          .. vim.inspect(err)
-      )
-    end
-  else
-    local handle
-    local stdout = uv.new_pipe(false)
-    local stderr = uv.new_pipe(false)
-    attr.opts.stdio = { nil, stdout, stderr }
-    ---@type userdata
-    handle = uv.spawn(
-      attr.cmd,
-      attr.opts,
-      vim.schedule_wrap(function(code)
-        if code ~= 0 then
-          stdout:read_stop()
-          stderr:read_stop()
-        end
-        stdout:close()
-        stderr:close()
-        handle:close()
-        if code ~= 0 then
-          failed_commands = failed_commands + 1
-          finished_commands = finished_commands + 1
-          if stdout_output[handle] and stdout_output[handle] ~= '' then
-            vim.notify(stdout_output[handle])
-          end
-
-          local err_msg = stderr_output[handle] or ''
-          api.nvim_err_writeln(
-            'nvim-treesitter['
-              .. lang
-              .. ']: '
-              .. (attr.err or ('Failed to execute the following command:\n' .. vim.inspect(attr)))
-              .. '\n'
-              .. err_msg
-          )
-          return
-        end
-        iter_cmd(cmd_list, i + 1, lang, success_message)
-      end)
-    )
-    uv.read_start(stdout, function(_, data)
-      if data then
-        stdout_output[handle] = (stdout_output[handle] or '') .. data
-      end
-    end)
-    uv.read_start(stderr, function(_, data)
-      if data then
-        stderr_output[handle] = (stderr_output[handle] or '') .. data
-      end
-    end)
-  end
-end
 
 ---
 --- PARSER INFO
 ---
 
 ---@param lang string
----@param validate boolean|nil
+---@param validate? boolean
 ---@return InstallInfo
 local function get_parser_install_info(lang, validate)
   local parser_config = parsers.configs[lang]
 
   if not parser_config then
-    error('Parser not available for language "' .. lang .. '"')
+    log.error('Parser not available for language "' .. lang .. '"')
   end
 
   local install_info = parser_config.install_info
@@ -204,14 +66,18 @@ local function get_parser_install_info(lang, validate)
   return install_info
 end
 
+--- @param ... string
+--- @return string
+function M.get_package_path(...)
+  return fs.joinpath(vim.fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
+end
+
 ---@param lang string
----@return string|nil
-local function get_revision(lang)
+---@return string?
+local function get_target_revision(lang)
   if #lockfile == 0 then
-    local filename = shell.get_package_path('lockfile.json')
-    local file = assert(io.open(filename, 'r'))
-    lockfile = vim.json.decode(file:read('*all'))
-    file:close()
+    local filename = M.get_package_path('lockfile.json')
+    lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string, LockfileInfo>]]
   end
 
   local install_info = get_parser_install_info(lang)
@@ -225,19 +91,16 @@ local function get_revision(lang)
 end
 
 ---@param lang string
----@return string|nil
+---@return string?
 local function get_installed_revision(lang)
   local lang_file = fs.joinpath(config.get_install_dir('parser-info'), lang .. '.revision')
-  local file = assert(io.open(lang_file, 'r'))
-  local revision = file:read('*a')
-  file:close()
-  return revision
+  return util.read_file(lang_file)
 end
 
 ---@param lang string
 ---@return boolean
 local function needs_update(lang)
-  local revision = get_revision(lang)
+  local revision = get_target_revision(lang)
   return not revision or revision ~= get_installed_revision(lang)
 end
 
@@ -254,7 +117,7 @@ function M.info()
 
   for _, lang in pairs(parser_list) do
     local parser = (lang .. string.rep(' ', max_len - #lang + 1))
-    local output
+    local output --- @type string[]
     if vim.list_contains(installed, lang) then
       output = { parser .. '[✓] installed', 'DiagnosticOk' }
     elseif #api.nvim_get_runtime_file('parser/' .. lang .. '.*', true) > 0 then
@@ -270,13 +133,311 @@ end
 --- PARSER MANAGEMENT FUNCTIONS
 ---
 
+--- @param repo InstallInfo
+--- @param project_name string
+--- @param cache_dir string
+--- @param from_local_path boolean
+--- @return string
+local function get_compile_location(repo, cache_dir, project_name, from_local_path)
+  ---@type string compile_location only needed for typescript installs.
+  if from_local_path then
+    local compile_location = repo.url
+    if repo.location then
+      compile_location = fs.joinpath(compile_location, repo.location)
+    end
+    return compile_location
+  end
+
+  local repo_location = project_name
+  if repo.location then
+    repo_location = fs.joinpath(repo_location, repo.location)
+  end
+  return fs.joinpath(cache_dir, repo_location)
+end
+
+local function cc_err()
+  log.error('No C compiler found! "' .. table.concat(
+    vim.tbl_filter(
+      ---@param c string
+      ---@return boolean
+      function(c)
+        return type(c) == 'string'
+      end,
+      M.compilers
+    ),
+    '", "'
+  ) .. '" are not executable.')
+end
+
+--- @param logger Logger
+--- @param repo InstallInfo
+--- @param compile_location string
+local function do_generate_from_grammar(logger, repo, compile_location)
+  if repo.generate_requires_npm then
+    if vim.fn.executable('npm') ~= 1 then
+      logger:error('NPM requires to be installed from grammar.js')
+    end
+
+    logger:info('Installing NPM dependencies')
+    local r = job.run({ 'npm', 'install' }, { cwd = compile_location })
+    a.main()
+    if r.exit_code > 0 then
+      logger:error('Error during `npm install`')
+    end
+  end
+
+  logger:info('Generating source files from grammar.js...')
+
+  local r = job.run({
+    vim.fn.exepath('tree-sitter'),
+    'generate',
+    '--no-bindings',
+    '--abi',
+    tostring(vim.treesitter.language_version),
+  }, { cwd = compile_location })
+  a.main()
+  if r.exit_code > 0 then
+    logger:error('Error during "tree-sitter generate"')
+  end
+end
+
+---@param logger Logger
+---@param repo InstallInfo
+---@param project_name string
+---@param cache_dir string
+---@param revision string
+---@param project_dir string
+local function do_download_tar(logger, repo, project_name, cache_dir, revision, project_dir)
+  local is_github = repo.url:find('github.com', 1, true)
+  local url = repo.url:gsub('.git$', '')
+
+  local dir_rev = revision
+  if is_github and revision:find('^v%d') then
+    dir_rev = revision:sub(2)
+  end
+
+  local temp_dir = project_dir .. '-tmp'
+
+  util.delete(temp_dir)
+
+  logger:info('Downloading ' .. project_name .. '...')
+  local target = is_github and url .. '/archive/' .. revision .. '.tar.gz'
+    or url .. '/-/archive/' .. revision .. '/' .. project_name .. '-' .. revision .. '.tar.gz'
+
+  local r = job.run({
+    'curl',
+    '--silent',
+    '--show-error',
+    '-L', -- follow redirects
+    target,
+    '--output',
+    project_name .. '.tar.gz',
+  }, {
+    cwd = cache_dir,
+  })
+  a.main()
+  if r.exit_code > 0 then
+    logger:error(
+      'Error during download, please verify your internet connection: ' .. vim.inspect(r.stderr)
+    )
+  end
+
+  logger:debug('Creating temporary directory: ' .. temp_dir)
+  --TODO(clason): use vim.fn.mkdir(temp_dir, 'p') in case stdpath('cache') is not created
+  local err = uv_mkdir(temp_dir, 493)
+  a.main()
+  if err then
+    logger:error('Could not create %s-tmp: %s', project_name, err)
+  end
+
+  logger:info('Extracting ' .. project_name .. '...')
+  r = job.run({
+    'tar',
+    '-xzf',
+    project_name .. '.tar.gz',
+    '-C',
+    project_name .. '-tmp',
+  }, {
+    cwd = cache_dir,
+  })
+
+  a.main()
+  if r.exit_code > 0 then
+    logger:error('Error during tarball extraction: ' .. vim.inspect(r.stderr))
+  end
+
+  err = uv_unlink(project_dir .. '.tar.gz')
+  if err then
+    logger:error('Could not remove tarball: ' .. err)
+  end
+  a.main()
+
+  err = uv_rename(fs.joinpath(temp_dir, url:match('[^/]-$') .. '-' .. dir_rev), project_dir)
+  a.main()
+
+  if err then
+    logger:error('Could not rename temp: ' .. err)
+  end
+
+  util.delete(temp_dir)
+end
+
+---@param logger Logger
+---@param repo InstallInfo
+---@param project_name string
+---@param cache_dir string
+---@param revision string
+---@param project_dir string
+local function do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
+  logger:info('Downloading ' .. project_name .. '...')
+
+  local r = job.run({
+    'git',
+    'clone',
+    '--filter=blob:none',
+    repo.url,
+    project_name,
+  }, {
+    cwd = cache_dir,
+  })
+
+  a.main()
+
+  if r.exit_code > 0 then
+    logger:error(
+      'Error during download, please verify your internet connection: ' .. vim.inspect(r.stderr)
+    )
+  end
+
+  logger:info('Checking out locked revision')
+  r = job.run({
+    'git',
+    'checkout',
+    revision,
+  }, {
+    cwd = project_dir,
+  })
+
+  a.main()
+
+  if r.exit_code > 0 then
+    logger:error('Error while checking out revision: ' .. vim.inspect(r.stderr))
+  end
+end
+
+---@param executables string[]
+---@return string?
+function M.select_executable(executables)
+  return vim.tbl_filter(
+    ---@param c string
+    ---@return boolean
+    function(c)
+      return c ~= vim.NIL and vim.fn.executable(c) == 1
+    end,
+    executables
+  )[1]
+end
+
+-- Returns the compiler arguments based on the compiler and OS
+---@param repo InstallInfo
+---@param compiler string
+---@return string[]
+local function select_compiler_args(repo, compiler)
+  if compiler:find('cl$') or compiler:find('cl.exe$') then
+    return {
+      '/Fe:',
+      'parser.so',
+      '/Isrc',
+      repo.files,
+      '-Os',
+      '/utf-8',
+      '/LD',
+    }
+  end
+
+  if compiler:find('zig$') or compiler:find('zig.exe$') then
+    return {
+      'c++',
+      '-o',
+      'parser.so',
+      repo.files,
+      '-lc',
+      '-Isrc',
+      '-shared',
+      '-Os',
+    }
+  end
+
+  local args = {
+    '-o',
+    'parser.so',
+    '-I./src',
+    repo.files,
+    '-Os',
+    ismac and '-bundle' or '-shared',
+  }
+
+  if
+    #vim.tbl_filter(
+      --- @param file string
+      --- @return boolean
+      function(file)
+        local ext = vim.fn.fnamemodify(file, ':e')
+        return ext == 'cc' or ext == 'cpp' or ext == 'cxx'
+      end,
+      repo.files
+    ) > 0
+  then
+    table.insert(args, '-lstdc++')
+  end
+
+  if not iswin then
+    table.insert(args, '-fPIC')
+  end
+
+  return args
+end
+
+---@param repo InstallInfo
+---@return boolean
+local function can_download_tar(repo)
+  local can_use_tar = vim.fn.executable('tar') == 1 and vim.fn.executable('curl') == 1
+  local is_github = repo.url:find('github.com', 1, true)
+  local is_gitlab = repo.url:find('gitlab.com', 1, true)
+  return can_use_tar and (is_github or is_gitlab) and not iswin
+end
+
+-- Returns the compile command based on the OS and user options
+---@param repo InstallInfo
+---@param cc string
+---@param compile_location string
+---@return JobResult
+local function do_compile(repo, cc, compile_location)
+  local make = M.select_executable({ 'gmake', 'make' })
+
+  local cmd --- @type string[]
+  if cc:find('cl$') or cc:find('cl.exe$') or not repo.use_makefile or iswin or not make then
+    local args = vim.tbl_flatten(select_compiler_args(repo, cc))
+    cmd = vim.list_extend({ cc }, args)
+  else
+    cmd = {
+      make,
+      '--makefile=' .. M.get_package_path('scripts', 'compile_parsers.makefile'),
+      'CC=' .. cc,
+    }
+  end
+
+  local r = job.run(cmd, { cwd = compile_location })
+  a.main()
+  return r
+end
+
 ---@param lang string
 ---@param cache_dir string
 ---@param install_dir string
 ---@param force boolean
----@param with_sync boolean
 ---@param generate_from_grammar boolean
-local function install_lang(lang, cache_dir, install_dir, force, with_sync, generate_from_grammar)
+local function install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
   if vim.list_contains(config.installed_parsers(), lang) then
     if not force then
       local yesno =
@@ -288,278 +449,260 @@ local function install_lang(lang, cache_dir, install_dir, force, with_sync, gene
     end
   end
 
+  local cc = M.select_executable(M.compilers)
+  if not cc then
+    cc_err()
+    return
+  end
+
   local repo = get_parser_install_info(lang)
 
   local project_name = 'tree-sitter-' .. lang
+
+  local logger = log.new('install/' .. lang)
+
+  generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
+
+  if generate_from_grammar and vim.fn.executable('tree-sitter') ~= 1 then
+    logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
+  end
+
+  if generate_from_grammar and vim.fn.executable('node') ~= 1 then
+    logger:error('Node JS not found: `node` is not executable')
+  end
+
+  local revision = repo.revision or get_target_revision(lang)
+
   local maybe_local_path = fs.normalize(repo.url)
   local from_local_path = vim.fn.isdirectory(maybe_local_path) == 1
   if from_local_path then
     repo.url = maybe_local_path
   end
 
-  ---@type string compile_location only needed for typescript installs.
-  local compile_location
-  if from_local_path then
-    compile_location = repo.url
-    if repo.location then
-      compile_location = fs.joinpath(compile_location, repo.location)
+  if not from_local_path then
+    util.delete(fs.joinpath(cache_dir, project_name))
+    local project_dir = fs.joinpath(cache_dir, project_name)
+
+    revision = revision or repo.branch or 'master'
+
+    if can_download_tar(repo) then
+      do_download_tar(logger, repo, project_name, cache_dir, revision, project_dir)
+    else
+      do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
     end
-  else
-    local repo_location = project_name
-    if repo.location then
-      repo_location = fs.joinpath(repo_location, repo.location)
-    end
-    compile_location = fs.joinpath(cache_dir, repo_location)
   end
+
+  local compile_location = get_compile_location(repo, cache_dir, project_name, from_local_path)
+
+  if generate_from_grammar then
+    do_generate_from_grammar(logger, repo, compile_location)
+  end
+
+  logger:info('Compiling parser')
+  local r = do_compile(repo, cc, compile_location)
+  if r.exit_code > 0 then
+    logger:error('Error during compilation: ' .. vim.inspect(r.stderr))
+  end
+
   local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
 
-  generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
-
-  if generate_from_grammar and vim.fn.executable('tree-sitter') ~= 1 then
-    api.nvim_err_writeln('tree-sitter CLI not found: `tree-sitter` is not executable')
-    if repo.requires_generate_from_grammar then
-      api.nvim_err_writeln(
-        'tree-sitter CLI is needed because the parser for `'
-          .. lang
-          .. '` needs to be generated from grammar'
-      )
-    end
-    return
-  else
-    if not M.ts_generate_args then
-      M.ts_generate_args = { 'generate', '--no-bindings', '--abi', vim.treesitter.language_version }
-    end
-  end
-  if generate_from_grammar and vim.fn.executable('node') ~= 1 then
-    api.nvim_err_writeln('Node JS not found: `node` is not executable')
-    return
-  end
-  local cc = shell.select_executable(M.compilers)
-  if not cc then
-    api.nvim_err_writeln(
-      'No C compiler found! "'
-        .. table.concat(
-          vim.tbl_filter(function(c) ---@param c string
-            return type(c) == 'string'
-          end, M.compilers),
-          '", "'
-        )
-        .. '" are not executable.'
-    )
-    return
+  local err = uv_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
+  a.main()
+  if err then
+    logger:error(err)
   end
 
-  local revision = repo.revision
-  if not revision then
-    revision = get_revision(lang)
-  end
+  local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
+  util.write_file(revfile, revision or '')
 
-  ---@class Command
-  ---@field cmd string
-  ---@field info string
-  ---@field err string
-  ---@field opts CmdOpts
-
-  ---@class CmdOpts
-  ---@field args string[]
-  ---@field cwd string
-
-  ---@type Command[]
-  local command_list = {}
   if not from_local_path then
-    vim.list_extend(command_list, {
-      {
-        cmd = function()
-          vim.fn.delete(fs.joinpath(cache_dir, project_name), 'rf')
-        end,
-      },
-    })
-    vim.list_extend(
-      command_list,
-      shell.select_download_commands(repo, project_name, cache_dir, revision, M.prefer_git)
-    )
-  end
-  if generate_from_grammar then
-    if repo.generate_requires_npm then
-      if vim.fn.executable('npm') ~= 1 then
-        api.nvim_err_writeln('`' .. lang .. '` requires NPM to be installed from grammar.js')
-        return
-      end
-      vim.list_extend(command_list, {
-        {
-          cmd = 'npm',
-          info = 'Installing NPM dependencies of ' .. lang .. ' parser',
-          err = 'Error during `npm install` (required for parser generation of '
-            .. lang
-            .. ' with npm dependencies)',
-          opts = {
-            args = { 'install' },
-            cwd = compile_location,
-          },
-        },
-      })
-    end
-    vim.list_extend(command_list, {
-      {
-        cmd = vim.fn.exepath('tree-sitter'),
-        info = 'Generating source files from grammar.js...',
-        err = 'Error during "tree-sitter generate"',
-        opts = {
-          args = M.ts_generate_args,
-          cwd = compile_location,
-        },
-      },
-    })
-  end
-  vim.list_extend(command_list, {
-    shell.select_compile_command(repo, cc, compile_location),
-    {
-      cmd = function()
-        uv.fs_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
-      end,
-    },
-    {
-      cmd = function()
-        local file = assert(
-          io.open(
-            fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision'),
-            'w'
-          )
-        )
-        file:write(revision or '')
-        file:close()
-      end,
-    },
-  })
-  if not from_local_path then
-    vim.list_extend(command_list, {
-      {
-        cmd = function()
-          vim.fn.delete(fs.joinpath(cache_dir, project_name), 'rf')
-        end,
-      },
-    })
+    util.delete(fs.joinpath(cache_dir, project_name))
   end
 
-  if with_sync then
-    if iter_cmd_sync(command_list) == true then
-      vim.notify('Parser for ' .. lang .. ' has been installed')
+  local queries = fs.joinpath(config.get_install_dir('queries'), lang)
+  local queries_src = M.get_package_path('runtime', 'queries', lang)
+  uv_unlink(queries)
+  err = uv_symlink(queries_src, queries, { dir = true, junction = true })
+  a.main()
+  if err then
+    logger:error(err)
+  end
+  logger:info('Parser installed')
+end
+
+--- Throttles a function using the first argument as an ID
+---
+--- If function is already running then the function will be scheduled to run
+--- again once the running call has finished.
+---
+---   fn#1        _/‾\__/‾\_/‾\_____________________________
+---   throttled#1 _/‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾\/‾‾‾‾‾‾‾‾‾‾\____________
+--
+---   fn#2        ______/‾\___________/‾\___________________
+---   throttled#2 ______/‾‾‾‾‾‾‾‾‾‾\__/‾‾‾‾‾‾‾‾‾‾\__________
+---
+---
+--- @generic F: function
+--- @param fn F Function to throttle
+--- @return F throttled function.
+local function throttle_by_id(fn)
+  local scheduled = {} --- @type table<any,boolean>
+  local running = {} --- @type table<any,boolean>
+  return function(id, ...)
+    if scheduled[id] then
+      -- If fn is already scheduled, then drop
+      return
+    end
+    if not running[id] then
+      scheduled[id] = true
+    end
+    if running[id] then
+      return
+    end
+    while scheduled[id] do
+      scheduled[id] = nil
+      running[id] = true
+      fn(id, ...)
+      running[id] = nil
     end
-  else
-    iter_cmd(command_list, 1, lang, 'Parser for ' .. lang .. ' has been installed')
   end
 end
 
+-- Async functions must not be interleaved
+local install_lang_throttled = throttle_by_id(install_lang)
+
 ---@class InstallOptions
----@field with_sync boolean
 ---@field force boolean
 ---@field generate_from_grammar boolean
 ---@field skip table
 
--- Install a parser
----@param languages? string[]|string
----@param options? InstallOptions
-function M.install(languages, options)
+--- Install a parser
+--- @param languages? string[]|string
+--- @param options? InstallOptions
+--- @param _callback? fun()
+local function install(languages, options, _callback)
   options = options or {}
-  local with_sync = options.with_sync
   local force = options.force
   local generate_from_grammar = options.generate_from_grammar
   local skip = options.skip
 
-  reset_progress_counter()
-
   if vim.fn.executable('git') == 0 then
-    api.nvim_err_writeln('Git is required on your system to run this command')
+    log.error('Git is required on your system to run this command')
     return
   end
 
   local cache_dir = vim.fn.stdpath('cache')
   local install_dir = config.get_install_dir('parser')
 
-  if languages == 'all' then
+  if not languages or type(languages) == 'string' then
+    languages = { languages }
+  end
+
+  if languages[1] == 'all' then
     force = true
   end
 
   languages = config.norm_languages(languages, skip)
 
+  local tasks = {} --- @type fun()[]
+  local done = 0
   for _, lang in ipairs(languages) do
-    install_lang(lang, cache_dir, install_dir, force, with_sync, generate_from_grammar)
-    uv.fs_symlink(
-      shell.get_package_path('runtime', 'queries', lang),
-      fs.joinpath(config.get_install_dir('queries'), lang),
-      { dir = true, junction = true } -- needed on Windows (non-junction links require admin)
-    )
+    tasks[#tasks + 1] = a.sync(function()
+      a.main()
+      install_lang_throttled(lang, cache_dir, install_dir, force, generate_from_grammar)
+      done = done + 1
+    end)
+  end
+
+  a.join(max_jobs, nil, tasks)
+  if #tasks > 1 then
+    a.main()
+    log.info('Installed %d/%d parsers', done, #tasks)
   end
 end
 
+M.install = a.sync(install, 2)
+
 ---@class UpdateOptions
----@field with_sync boolean
 
 ---@param languages? string[]|string
----@param options? UpdateOptions
-function M.update(languages, options)
-  options = options or {}
-
-  reset_progress_counter()
+---@param _options? UpdateOptions
+---@param _callback function
+M.update = a.sync(function(languages, _options, _callback)
   M.lockfile = {}
 
-  languages = config.norm_languages(languages or 'all', { ignored = true, missing = true })
+  if not languages or #languages == 0 then
+    languages = 'all'
+  end
+  languages = config.norm_languages(languages, { ignored = true, missing = true })
   languages = vim.iter.filter(needs_update, languages) --- @type string[]
 
   if #languages > 0 then
-    M.install(languages, {
-      force = true,
-      with_sync = options.with_sync,
-    })
+    install(languages, { force = true })
   else
-    vim.notify('All parsers are up-to-date')
+    log.info('All parsers are up-to-date')
   end
-end
+end, 2)
 
 --- @param lang string
 --- @param parser string
 --- @param queries string
-local function uninstall(lang, parser, queries)
+local function uninstall_lang(lang, parser, queries)
+  local logger = log.new('uninstall/' .. lang)
+  logger:debug('Uninstalling ' .. lang)
   if vim.fn.filereadable(parser) ~= 1 then
     return
   end
 
-  iter_cmd({
-    {
-      cmd = function()
-        uv.fs_unlink(parser)
-      end,
-    },
-    {
-      cmd = function()
-        uv.fs_unlink(queries)
-      end,
-    },
-  }, 1, lang, 'Parser for ' .. lang .. ' has been uninstalled')
+  logger:debug('Unlinking ' .. parser)
+  local perr = uv_unlink(parser)
+  a.main()
+
+  if perr then
+    log.error(perr)
+  end
+
+  logger:debug('Unlinking ' .. queries)
+  local qerr = uv_unlink(queries)
+  a.main()
+
+  if qerr then
+    logger:error(qerr)
+  end
+
+  logger:info('Parser uninstalled')
 end
 
 --- @param languages string[]|string
-function M.uninstall(languages)
-  reset_progress_counter()
-
+--- @param _options? UpdateOptions
+--- @param _callback fun()
+M.uninstall = a.sync(function(languages, _options, _callback)
   languages = config.norm_languages(languages or 'all', { missing = true })
 
   local parser_dir = config.get_install_dir('parser')
   local query_dir = config.get_install_dir('queries')
   local installed = config.installed_parsers()
 
+  local tasks = {} --- @type fun()[]
+  local done = 0
   for _, lang in ipairs(languages) do
     if not vim.list_contains(installed, lang) then
-      vim.notify(
-        'Parser for ' .. lang .. ' is is not managed by nvim-treesitter',
-        vim.log.levels.ERROR
-      )
+      log.warn('Parser for ' .. lang .. ' is is not managed by nvim-treesitter')
     else
       local parser = fs.joinpath(parser_dir, lang) .. '.so'
       local queries = fs.joinpath(query_dir, lang)
-      uninstall(lang, parser, queries)
+      tasks[#tasks + 1] = a.sync(function()
+        uninstall_lang(lang, parser, queries)
+        done = done + 1
+      end)
     end
   end
-end
+
+  a.join(max_jobs, nil, tasks)
+  if #tasks > 1 then
+    a.main()
+    log.info('Uninstalled %d/%d parsers', done, #tasks)
+  end
+end, 2)
 
 return M
diff --git a/lua/nvim-treesitter/job.lua b/lua/nvim-treesitter/job.lua
new file mode 100644
index 000000000..9c2788cb0
--- /dev/null
+++ b/lua/nvim-treesitter/job.lua
@@ -0,0 +1,122 @@
+-- Interface with Neovim job control and provide a simple job sequencing structure
+local uv = vim.loop
+local a = require('nvim-treesitter.async')
+local log = require('nvim-treesitter.log')
+
+local M = { JobResult = {}, Opts = {} }
+
+--- @class JobResult
+--- @field exit_code integer
+--- @field signal integer | string
+--- @field stdout string[]
+--- @field stderr string[]
+
+--- @class JobOpts
+--- @field cwd  string
+--- @field timeout  integer
+--- @field env  string[]
+--- @field on_stderr  fun(_: string)
+--- @field on_stdout  fun(_: string)
+
+--- Wrapper for vim.loop.spawn. Takes a command, options, and callback just like
+--- vim.loop.spawn, but ensures that all output from the command has been
+--- flushed before calling the callback.
+--- @param cmd string
+--- @param options uv.aliases.spawn_options
+--- @param callback fun(exit_code: integer, signal: integer|string)
+local function spawn(cmd, options, callback)
+  local handle --- @type uv_process_t?
+  local timer --- @type uv_timer_t
+  log.trace('running job: (cwd=%s) %s %s', options.cwd, cmd, table.concat(options.args, ' '))
+  handle = uv.spawn(cmd, options, function(exit_code, signal)
+    ---@cast handle -nil
+
+    handle:close()
+    if timer then
+      timer:stop()
+      timer:close()
+    end
+
+    callback(exit_code, signal)
+  end)
+
+  --- @type integer?
+  --- @diagnostic disable-next-line:undefined-field
+  local timeout = options.timeout
+
+  if timeout then
+    timer = assert(uv.new_timer())
+    timer:start(timeout, 0, function()
+      timer:stop()
+      timer:close()
+      if handle and handle:is_active() then
+        log.warn('Killing %s due to timeout!', cmd)
+        handle:kill('sigint')
+        handle:close()
+        for _, pipe in
+          pairs(options.stdio --[[@as uv_pipe_t[] ]])
+        do
+          pipe:close()
+        end
+        callback(-9999, 'sigint')
+      end
+    end)
+  end
+end
+
+--- Main exposed function for the jobs module. Takes a task and options and
+--- returns an async function that will run the task with the given opts via
+--- vim.loop.spawn
+--- @param task string[]
+--- @param opts JobOpts
+--- @param callback fun(_: JobResult)
+--- @type fun(task: string|string[], opts: JobOpts): JobResult
+M.run = a.wrap(function(task, opts, callback)
+  local stdout_data = {}
+  local stderr_data = {}
+
+  local stdout = assert(uv.new_pipe(false))
+  local stderr = assert(uv.new_pipe(false))
+
+  spawn(task[1], {
+    args = { unpack(task, 2) },
+    stdio = { nil, stdout, stderr },
+    cwd = opts.cwd,
+    timeout = opts.timeout and 1000 * opts.timeout or nil,
+    env = opts.env,
+    hide = true,
+  }, function(exit_code, signal)
+    callback({
+      exit_code = exit_code,
+      signal = signal,
+      stdout = stdout_data,
+      stderr = stderr_data,
+    })
+  end)
+
+  for kind, pipe in pairs({ stdout = stdout, stderr = stderr }) do
+    pipe:read_start(function(err, data)
+      if kind == 'stderr' and opts.on_stderr and data then
+        opts.on_stderr(data)
+      end
+      if kind == 'stdout' and opts.on_stdout and data then
+        opts.on_stdout(data)
+      end
+      if data then
+        log.trace('%s -> %s', kind, data)
+      end
+      if err then
+        log.error(err)
+      end
+      if data ~= nil then
+        local output = kind == 'stdout' and stdout_data or stderr_data
+        table.insert(output, vim.trim(data))
+      else
+        pipe:read_stop()
+        pipe:close()
+      end
+    end)
+  end
+end, 3)
+
+return M
diff --git a/lua/nvim-treesitter/log.lua b/lua/nvim-treesitter/log.lua
new file mode 100644
index 000000000..83f0b41c2
--- /dev/null
+++ b/lua/nvim-treesitter/log.lua
@@ -0,0 +1,133 @@
+local api = vim.api
+
+-- TODO(lewis6991): write these out to a file
+local messages = {} --- @type {[1]: string, [2]: string?, [3]: string}[]
+
+local sev_to_hl = {
+  trace = 'DiagnosticHint',
+  debug = 'Normal',
+  info = 'MoreMsg',
+  warn = 'WarningMsg',
+  error = 'ErrorMsg',
+}
+
+---@param ctx string?
+---@param m string
+---@param ... any
+local function trace(ctx, m, ...)
+  messages[#messages + 1] = { 'trace', ctx, string.format(m, ...) }
+end
+
+---@param ctx string?
+---@param m string
+---@param ... any
+local function debug(ctx, m, ...)
+  messages[#messages + 1] = { 'debug', ctx, string.format(m, ...) }
+end
+
+---@param ctx string?
+---@return string
+local function mkpfx(ctx)
+  return ctx and string.format('[nvim-treesitter/%s]', ctx) or '[nvim-treesitter]'
+end
+
+---@param ctx string?
+---@param m string
+---@param ... any
+local function info(ctx, m, ...)
+  local m1 = string.format(m, ...)
+  messages[#messages + 1] = { 'info', ctx, m1 }
+  api.nvim_echo({ { mkpfx(ctx) .. ': ' .. m1, sev_to_hl.info } }, true, {})
+end
+
+---@param ctx string?
+---@param m string
+---@param ... any
+local function warn(ctx, m, ...)
+  local m1 = string.format(m, ...)
+  messages[#messages + 1] = { 'warn', ctx, m1 }
+  api.nvim_echo({ { mkpfx(ctx) .. ' warning: ' .. m1, sev_to_hl.warn } }, true, {})
+end
+
+---@param ctx string?
+---@param m string
+---@param ... any
+local function lerror(ctx, m, ...)
+  local m1 = string.format(m, ...)
+  messages[#messages + 1] = { 'error', ctx, m1 }
+  error(mkpfx(ctx) .. ' error: ' .. m1)
+end
+
+--- @class NTSLogModule
+--- @field trace fun(fmt: string, ...: any)
+--- @field debug fun(fmt: string, ...: any)
+--- @field info fun(fmt: string, ...: any)
+--- @field warn fun(fmt: string, ...: any)
+--- @field error fun(fmt: string, ...: any)
+local M = {}
+
+--- @class Logger
+--- @field ctx? string
+local Logger = {}
+
+M.Logger = Logger
+
+--- @param ctx? string
+--- @return Logger
+function M.new(ctx)
+  return setmetatable({ ctx = ctx }, { __index = Logger })
+end
+
+---@param m string
+---@param ... any
+function Logger:trace(m, ...)
+  trace(self.ctx, m, ...)
+end
+
+---@param m string
+---@param ... any
+function Logger:debug(m, ...)
+  debug(self.ctx, m, ...)
+end
+
+---@param m string
+---@param ... any
+function Logger:info(m, ...)
+  info(self.ctx, m, ...)
+end
+
+---@param m string
+---@param ... any
+function Logger:warn(m, ...)
+  warn(self.ctx, m, ...)
+end
+
+---@param m string
+---@param ... any
+function Logger:error(m, ...)
+  lerror(self.ctx, m, ...)
+end
+
+local noctx_logger = M.new()
+
+setmetatable(M, {
+  __index = function(t, k)
+    --- @diagnostic disable-next-line:no-unknown
+    t[k] = function(...)
+      return noctx_logger[k](noctx_logger, ...)
+    end
+    return t[k]
+  end,
+})
+
+function M.show()
+  for _, l in ipairs(messages) do
+    local sev, ctx, msg = l[1], l[2], l[3]
+    local hl = sev_to_hl[sev]
+    local text = ctx and string.format('%s(%s): %s', sev, ctx, msg)
+      or string.format('%s: %s', sev, msg)
+    api.nvim_echo({ { text, hl } }, false, {})
+  end
+end
+
+return M
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 69e9500fe..114ab40c6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2818,17 +2818,18 @@ M.configs = {
 ---@param tier integer? only get parsers of specified tier
 ---@return string[]
 function M.get_available(tier)
+  --- @type string[]
   local parsers = vim.tbl_keys(M.configs)
   table.sort(parsers)
   if tier then
     parsers = vim.iter.filter(function(p)
       return M.configs[p].tier == tier
-    end, parsers)
+    end, parsers) --[[@as string[] ]]
   end
   if vim.fn.executable('tree-sitter') == 0 or vim.fn.executable('node') == 0 then
     parsers = vim.iter.filter(function(p)
       return not M.configs[p].install_info.requires_generate_from_grammar
-    end, parsers)
+    end, parsers) --[[@as string[] ]]
   end
   return parsers
 end
diff --git a/lua/nvim-treesitter/shell_cmds.lua b/lua/nvim-treesitter/shell_cmds.lua
deleted file mode 100644
index 4c631512d..000000000
--- a/lua/nvim-treesitter/shell_cmds.lua
+++ /dev/null
@@ -1,258 +0,0 @@
-local uv = vim.loop
-
-local iswin = uv.os_uname().sysname == 'Windows_NT'
-
-local M = {}
-
----@param executables string[]
----@return string|nil
-function M.select_executable(executables)
-  return vim.tbl_filter(function(c) ---@param c string
-    return c ~= vim.NIL and vim.fn.executable(c) == 1
-  end, executables)[1]
-end
-
--- Returns the compiler arguments based on the compiler and OS
----@param repo InstallInfo
----@param compiler string
----@return string[]
-function M.select_compiler_args(repo, compiler)
-  if compiler:find('cl$') or compiler:find('cl.exe$') then
-    return {
-      '/Fe:',
-      'parser.so',
-      '/Isrc',
-      repo.files,
-      '-Os',
-      '/utf-8',
-      '/LD',
-    }
-  elseif compiler:find('zig$') or compiler:find('zig.exe$') then
-    return {
-      'c++',
-      '-o',
-      'parser.so',
-      repo.files,
-      '-lc',
-      '-Isrc',
-      '-shared',
-      '-Os',
-    }
-  else
-    local args = {
-      '-o',
-      'parser.so',
-      '-I./src',
-      repo.files,
-      '-Os',
-    }
-    if uv.os_uname().sysname == 'Darwin' then
-      table.insert(args, '-bundle')
-    else
-      table.insert(args, '-shared')
-    end
-    if
-      #vim.tbl_filter(function(file) ---@param file string
-        local ext = vim.fn.fnamemodify(file, ':e')
-        return ext == 'cc' or ext == 'cpp' or ext == 'cxx'
-      end, repo.files) > 0
-    then
-      table.insert(args, '-lstdc++')
-    end
-    if not iswin then
-      table.insert(args, '-fPIC')
-    end
-    return args
-  end
-end
-
--- Returns the compile command based on the OS and user options
----@param repo InstallInfo
----@param cc string
----@param compile_location string
----@return Command
-function M.select_compile_command(repo, cc, compile_location)
-  local make = M.select_executable({ 'gmake', 'make' })
-  if cc:find('cl$') or cc:find('cl.exe$') or not repo.use_makefile or iswin or not make then
-    return {
-      cmd = cc,
-      info = 'Compiling...',
-      err = 'Error during compilation',
-      opts = {
-        args = vim.tbl_flatten(M.select_compiler_args(repo, cc)),
-        cwd = compile_location,
-      },
-    }
-  else
-    return {
-      cmd = make,
-      info = 'Compiling...',
-      err = 'Error during compilation',
-      opts = {
-        args = {
-          '--makefile=' .. M.get_package_path('scripts', 'compile_parsers.makefile'),
-          'CC=' .. cc,
-        },
-        cwd = compile_location,
-      },
-    }
-  end
-end
-
----@param repo InstallInfo
----@param project_name string
----@param cache_dir string
----@param revision string|nil
----@param prefer_git boolean
----@return table
-function M.select_download_commands(repo, project_name, cache_dir, revision, prefer_git)
-  local can_use_tar = vim.fn.executable('tar') == 1 and vim.fn.executable('curl') == 1
-  local is_github = repo.url:find('github.com', 1, true)
-  local is_gitlab = repo.url:find('gitlab.com', 1, true)
-  local project_dir = vim.fs.joinpath(cache_dir, project_name)
-
-  revision = revision or repo.branch or 'master'
-
-  if can_use_tar and (is_github or is_gitlab) and not prefer_git then
-    local url = repo.url:gsub('.git$', '')
-
-    local dir_rev = revision
-    if is_github and revision:find('^v%d') then
-      dir_rev = revision:sub(2)
-    end
-
-    local temp_dir = project_dir .. '-tmp'
-
-    return {
-      {
-        cmd = function()
-          vim.fn.delete(temp_dir, 'rf')
-        end,
-      },
-      {
-        cmd = 'curl',
-        info = 'Downloading ' .. project_name .. '...',
-        err = 'Error during download, please verify your internet connection',
-        opts = {
-          args = {
-            '--silent',
-            '-L', -- follow redirects
-            is_github and url .. '/archive/' .. revision .. '.tar.gz'
-              or url
-                .. '/-/archive/'
-                .. revision
-                .. '/'
-                .. project_name
-                .. '-'
-                .. revision
-                .. '.tar.gz',
-            '--output',
-            project_name .. '.tar.gz',
-          },
-          cwd = cache_dir,
-        },
-      },
-      {
-        cmd = function()
-          --TODO(clason): use vim.fn.mkdir(temp_dir, 'p') in case stdpath('cache') is not created
-          uv.fs_mkdir(temp_dir, 493)
-        end,
-        info = 'Creating temporary directory',
-        err = 'Could not create ' .. project_name .. '-tmp',
-      },
-      {
-        cmd = 'tar',
-        info = 'Extracting ' .. project_name .. '...',
-        err = 'Error during tarball extraction.',
-        opts = {
-          args = {
-            '-xvzf',
-            project_name .. '.tar.gz',
-            '-C',
-            project_name .. '-tmp',
-          },
-          cwd = cache_dir,
-        },
-      },
-      {
-        cmd = function()
-          uv.fs_unlink(project_dir .. '.tar.gz')
-        end,
-      },
-      {
-        cmd = function()
-          uv.fs_rename(
-            vim.fs.joinpath(temp_dir, url:match('[^/]-$') .. '-' .. dir_rev),
-            project_dir
-          )
-        end,
-      },
-      {
-        cmd = function()
-          vim.fn.delete(temp_dir, 'rf')
-        end,
-      },
-    }
-  else
-    local git_dir = project_dir
-    local clone_error = 'Error during download, please verify your internet connection'
-
-    return {
-      {
-        cmd = 'git',
-        info = 'Downloading ' .. project_name .. '...',
-        err = clone_error,
-        opts = {
-          args = {
-            'clone',
-            repo.url,
-            project_name,
-          },
-          cwd = cache_dir,
-        },
-      },
-      {
-        cmd = 'git',
-        info = 'Checking out locked revision',
-        err = 'Error while checking out revision',
-        opts = {
-          args = {
-            'checkout',
-            revision,
-          },
-          cwd = git_dir,
-        },
-      },
-    }
-  end
-end
-
-function M.get_package_path(...)
-  return vim.fs.joinpath(vim.fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
-end
-
---TODO(clason): only needed for iter_cmd_sync -> replace with uv.spawn?
-
--- Convert path for cmd.exe on Windows (needed when shellslash is set)
----@param p string
----@return string
-local function cmdpath(p)
-  return vim.o.shellslash and p:gsub('/', '\\') or p
-end
-
----@param dir string
----@param command string
----@return string command
-function M.make_directory_change_for_command(dir, command)
-  if iswin then
-    if string.find(vim.o.shell, 'cmd') ~= nil then
-      return string.format('pushd %s & %s & popd', cmdpath(dir), command)
-    else
-      return string.format('pushd %s ; %s ; popd', cmdpath(dir), command)
-    end
-  else
-    return string.format('cd %s;\n %s', dir, command)
-  end
-end
-
-return M
diff --git a/lua/nvim-treesitter/util.lua b/lua/nvim-treesitter/util.lua
new file mode 100644
index 000000000..276eafdd7
--- /dev/null
+++ b/lua/nvim-treesitter/util.lua
@@ -0,0 +1,28 @@
+local uv = vim.loop
+
+local M = {}
+
+--- @param filename string
+--- @return string
+function M.read_file(filename)
+  local file = assert(io.open(filename, 'r'))
+  local r = file:read('*a')
+  file:close()
+  return r
+end
+
+--- @param filename string
+--- @param content string
+function M.write_file(filename, content)
+  local file = assert(io.open(filename, 'w'))
+  file:write(content)
+  file:close()
+end
+
+--- Recursively delete a directory
+--- @param name string
+function M.delete(name)
+  vim.fs.rm(name, { recursive = true, force = true })
+end
+
+return M
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index 3ab264d41..fcf44d537 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -45,19 +45,6 @@ end, {
   desc = 'Install treesitter parsers from grammar',
 })
 
-api.nvim_create_user_command('TSInstallSync', function(args)
-  require('nvim-treesitter.install').install(args.fargs, {
-    with_sync = true,
-    force = args.bang,
-  })
-end, {
-  nargs = '+',
-  bang = true,
-  bar = true,
-  complete = complete_available_parsers,
-  desc = 'Install treesitter parsers synchronously',
-})
-
 api.nvim_create_user_command('TSUpdate', function(args)
   require('nvim-treesitter.install').update(args.fargs)
 end, {
@@ -67,15 +54,6 @@ end, {
   desc = 'Update installed treesitter parsers',
 })
 
-api.nvim_create_user_command('TSUpdateSync', function(args)
-  require('nvim-treesitter.install').update(args.fargs, { with_sync = true })
-end, {
-  nargs = '*',
-  bar = true,
-  complete = complete_installed_parsers,
-  desc = 'Update installed treesitter parsers synchronously',
-})
-
 api.nvim_create_user_command('TSUninstall', function(args)
   require('nvim-treesitter.install').uninstall(args.fargs)
 end, {
@@ -84,3 +62,9 @@ end, {
   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',
+})
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 6c23c1af6..9dd9f9183 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -65,9 +65,8 @@ for _, v in ipairs(sorted_parsers) do
 end
 generated_text = generated_text .. footnotes
 
-local readme = assert(io.open('SUPPORTED_LANGUAGES.md', 'r'))
-local readme_text = readme:read('*a')
-readme:close()
+local readme = 'SUPPORTED_LANGUAGES.md'
+local readme_text = require('nvim-treesitter.util').read_file(readme)
 
 local new_readme_text = string.gsub(
   readme_text,
@@ -75,12 +74,10 @@ local new_readme_text = string.gsub(
   '<!--parserinfo-->\n' .. generated_text .. '<!--parserinfo-->'
 )
 
-readme = assert(io.open('SUPPORTED_LANGUAGES.md', 'w'))
-readme:write(new_readme_text)
-readme:close()
+require('nvim-treesitter.util').write_file(readme, new_readme_text)
 
 if string.find(readme_text, generated_text, 1, true) then
-  print('README.md is up-to-date\n')
+  print(readme .. ' is up-to-date\n')
 else
-  print('New README.md was written\n')
+  print('New ' .. readme .. ' was written\n')
 end
diff --git a/scripts/write-lockfile.lua b/scripts/write-lockfile.lua
index 5dac838d6..0b1d0504e 100755
--- a/scripts/write-lockfile.lua
+++ b/scripts/write-lockfile.lua
@@ -2,10 +2,8 @@
 vim.opt.runtimepath:append('.')
 
 -- Load previous lockfile
-local filename = require('nvim-treesitter.shell_cmds').get_package_path('lockfile.json')
-local file = assert(io.open(filename, 'r'))
-local lockfile = vim.json.decode(file:read('*a'))
-file:close()
+local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
+local lockfile = vim.json.decode(require('nvim-treesitter.util').read_file(filename))
 
 ---@type string?
 local skip_lang_string = os.getenv('SKIP_LOCKFILE_UPDATE_FOR_LANGS')
@@ -47,6 +45,4 @@ end
 vim.print(lockfile)
 
 -- write new lockfile
-file = assert(io.open(filename, 'w'))
-file:write(vim.json.encode(lockfile))
-file:close()
+require('nvim-treesitter.util').write_file(filename, vim.json.encode(lockfile))

From 9c0a99819c99d70d28334dc6ea1c3ac773e4fed1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 29 May 2023 16:52:20 +0200
Subject: [PATCH 2279/2704] ci: remove update-lockfile shell script

---
 .github/workflows/test-queries.yml            | 42 +++++++++----------
 .github/workflows/tests.yml                   | 15 +++----
 .github/workflows/update-lockfile.yml         |  7 +---
 .github/workflows/update-readme.yml           |  2 +-
 TODO.md                                       |  3 +-
 plugin/query_predicates.lua                   | 12 +++---
 scripts/check-queries.lua                     | 25 ++++++-----
 scripts/install-parsers.lua                   | 15 +++++++
 scripts/minimal_init.lua                      |  5 ++-
 scripts/pre-push                              | 10 -----
 scripts/run_tests.sh                          |  2 +-
 ...write-lockfile.lua => update-lockfile.lua} | 13 +++---
 scripts/update-lockfile.sh                    | 20 ---------
 scripts/update-readme.lua                     | 14 +++----
 tests/indent/common.lua                       |  2 +-
 15 files changed, 84 insertions(+), 103 deletions(-)
 create mode 100755 scripts/install-parsers.lua
 delete mode 100755 scripts/pre-push
 rename scripts/{write-lockfile.lua => update-lockfile.lua} (75%)
 delete mode 100755 scripts/update-lockfile.sh

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 5e9be1e38..bb11db3dc 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -1,12 +1,12 @@
 name: Test queries
 
 on:
-  push:
-    branches:
-      - "master"
+  # push:
+  #   branches:
+  #     - "main"
   pull_request:
     branches:
-      - "master"
+      - "main"
 
 # Cancel any in-progress CI runs for a PR if it is updated
 concurrency:
@@ -24,29 +24,29 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
         cc: [gcc, clang]
-        nvim_tag: [v0.10.4]
+        nvim_tag: [nightly]
         exclude:
           - os: ubuntu-latest
             cc: clang
-            nvim_tag: v0.10.4
+            nvim_tag: nightly
 
           - os: macos-14
             cc: gcc
-            nvim_tag: v0.10.4
-
-          - os: windows-latest
-            cc: clang
-            nvim_tag: v0.10.4
-
-        include:
-          - os: windows-latest
-            cc: cl
             nvim_tag: nightly
 
-          - os: ubuntu-latest
+          - os: windows-latest
             cc: gcc
             nvim_tag: nightly
 
+        # include:
+          # - os: windows-latest
+          #   cc: cl
+          #   nvim_tag: nightly
+
+          # - os: ubuntu-latest
+          #   cc: gcc
+          #   nvim_tag: nightly
+
     name: Parser compilation
     runs-on: ${{ matrix.os }}
     env:
@@ -69,8 +69,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ./parser/
-            ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/
+            ~/.local/share/nvim/site/parser/
+            ~/AppData/Local/nvim-data/site/parser/
           key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
             './lockfile.json',
             './lua/nvim-treesitter/install.lua',
@@ -78,11 +78,7 @@ jobs:
             './lua/nvim-treesitter/shell_command_selectors.lua') }}
 
       - name: Compile parsers
-        run: $NVIM --headless -c "lua require'nvim-treesitter.install'.prefer_git=false" -c "TSInstallSync all" -c "q"
-
-      - name: Post compile Windows
-        if: runner.os == 'Windows'
-        run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser
+        run: $NVIM -l ./scripts/install-parsers.lua
 
       - name: Check query files
         run: $NVIM -l ./scripts/check-queries.lua
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e09a5f295..86c7ad630 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,12 +1,12 @@
 name: Tests
 
 on:
-  push:
-    branches:
-      - "master"
+  # push:
+  #   branches:
+  #     - "main"
   pull_request:
     branches:
-      - "master"
+      - "main"
 
 # Cancel any in-progress CI runs for a PR if it is updated
 concurrency:
@@ -39,7 +39,8 @@ jobs:
 
       - name: Install and prepare Neovim
         env:
-          NVIM_TAG: v0.10.4
+          NVIM_TAG: nightly
+          TREE_SITTER_CLI_TAG: v0.20.8
         run: |
           bash ./scripts/ci-install.sh
 
@@ -57,8 +58,8 @@ jobs:
             './lua/nvim-treesitter/shell_selectors.lua') }}
 
       - name: Compile parsers Unix like
-        run: |
-          nvim --headless -c "TSInstallSync all" -c "q"
+        if: ${{ runner.os != 'Windows' && steps.parsers-cache.outputs.cache-hit != 'true' }}
+        run: nvim -l ./scripts/install-parsers.lua
 
       - name: Tests
         run: PATH=/usr/local/bin:$PATH ./scripts/run_tests.sh
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
index 992e1c0d2..70d2c0c0a 100644
--- a/.github/workflows/update-lockfile.yml
+++ b/.github/workflows/update-lockfile.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: master
+          ref: main
 
       - uses: actions/create-github-app-token@v2
         id: app-token
@@ -34,10 +34,7 @@ jobs:
           SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,dhall,elm,enforce,git_config,nickel,rescript,rust,slint,sql,t32,templ,typespec,verilog,wit"
         run: |
           cp lockfile.json /tmp/old_lockfile.json
-          nvim -l scripts/write-lockfile.lua
-          # Pretty print
-          cp lockfile.json /tmp/lockfile.json
-          cat /tmp/lockfile.json | jq --sort-keys > lockfile.json
+          nvim -l ./scripts/update-lockfile.lua
           UPDATED_PARSERS=$(/tmp/jd -f merge /tmp/old_lockfile.json lockfile.json | jq -r 'keys | join(", ")')
           echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
 
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 557a3f3c6..849bb9814 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -3,7 +3,7 @@ name: Update README
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 jobs:
diff --git a/TODO.md b/TODO.md
index d61d179d6..e5d9448a2 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,8 +5,9 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 ## TODO
 
 - [ ] **`query_predicates.lua`:** upstream/remove
-- [ ] **`parsers.lua`:** modularize?
+- [ ] **`parsers.lua`:** add dependencies (and "query-only" langs like ecma, jsx, html_tags, ...)
 - [ ] **`parsers.lua`:** assign tiers
+- [ ] **`parsers.lua`:** modularize?
 - [ ] **`install.lua`:** simplify compilation:
   - hardcode one compiler + args per platform
   - provide `install.compile_command` for overriding (function that takes files, ...?)
diff --git a/plugin/query_predicates.lua b/plugin/query_predicates.lua
index abffea2f0..8c7685faf 100644
--- a/plugin/query_predicates.lua
+++ b/plugin/query_predicates.lua
@@ -1,6 +1,6 @@
 local query = vim.treesitter.query
 
--- register custom predicates
+-- register custom predicates (overwrite existing; needed for CI)
 
 ---@param match (TSNode|nil)[]
 ---@param pred string[]
@@ -13,7 +13,7 @@ query.add_predicate('kind-eq?', function(match, _, _, pred)
 
   local types = { unpack(pred, 3) }
   return vim.list_contains(types, node:type())
-end)
+end, true)
 
 -- register custom directives
 
@@ -43,7 +43,7 @@ query.add_directive('set-lang-from-mimetype!', function(match, _, bufnr, pred, m
     local parts = vim.split(type_attr_value, '/', {})
     metadata['injection.language'] = parts[#parts]
   end
-end)
+end, true)
 
 local injection_aliases = {
   ex = 'elixir',
@@ -68,7 +68,7 @@ query.add_directive('set-lang-from-info-string!', function(match, _, bufnr, pred
   local injection_alias = vim.treesitter.get_node_text(node, bufnr)
   local filetype = vim.filetype.match({ filename = 'a.' .. injection_alias })
   metadata['injection.language'] = filetype or injection_aliases[injection_alias] or injection_alias
-end)
+end, true)
 
 query.add_directive('downcase!', function(match, _, bufnr, pred, metadata)
   local text, key, value ---@type string|string[], string, string|integer
@@ -95,7 +95,7 @@ query.add_directive('downcase!', function(match, _, bufnr, pred, metadata)
   else
     metadata[key] = string.lower(text)
   end
-end)
+end, true)
 
 -- Trim blank lines from end of the region
 -- Arguments are the captures to trim.
@@ -138,4 +138,4 @@ query.add_directive('trim!', function(match, _, bufnr, pred, metadata)
       metadata[id].range = { start_row, start_col, end_row, end_col }
     end
   end
-end)
+end, true)
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index f5d6d463b..fd9d538ac 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -93,17 +93,20 @@ local ok, result = pcall(do_check)
 local allowed_to_fail = vim.split(vim.env.ALLOWED_INSTALLATION_FAILURES or '', ',', true)
 
 for k, v in pairs(require('nvim-treesitter.parsers').configs) do
-  if #vim.api.nvim_get_runtime_file('parser/' .. k .. '.*', false) == 0 then
-    -- On CI all parsers that can be installed from C files should be installed
-    if
-      vim.env.CI
-      and not v.install_info.requires_generate_from_grammar
-      and not vim.list_contains(allowed_to_fail, k)
-    then
-      io_print('Error: parser for ' .. k .. ' is not installed')
-      vim.cmd('cq')
-    else
-      io_print('Warning: parser for ' .. k .. ' is not installed')
+  if v.install_info then
+    -- skip "query only" languages
+    if #vim.api.nvim_get_runtime_file('parser/' .. k .. '.*', false) == 0 then
+      -- On CI all parsers that can be installed from C files should be installed
+      if
+        vim.env.CI
+        and not v.install_info.requires_generate_from_grammar
+        and not vim.list_contains(allowed_to_fail, k)
+      then
+        io_print('Error: parser for ' .. k .. ' is not installed')
+        vim.cmd('cq')
+      else
+        io_print('Warning: parser for ' .. k .. ' is not installed')
+      end
     end
   end
 end
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
new file mode 100755
index 000000000..ab06e538f
--- /dev/null
+++ b/scripts/install-parsers.lua
@@ -0,0 +1,15 @@
+#!/usr/bin/env -S nvim -l
+
+vim.opt.runtimepath:append('.')
+
+-- needed on CI
+vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
+
+local done = false
+require('nvim-treesitter.install').install('all', {}, function()
+  done = true
+end)
+
+vim.wait(6000000, function()
+  return done
+end)
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index c826ddbf2..2af5f8ecb 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -2,11 +2,12 @@ vim.opt.runtimepath:append('.')
 vim.cmd.runtime({ 'plugin/plenary.vim', bang = true })
 vim.cmd.runtime({ 'plugin/nvim-treesitter.lua', bang = true })
 vim.cmd.runtime({ 'plugin/query_predicates.lua', bang = true })
+vim.cmd.runtime({ 'plugin/filetypes.lua', bang = true })
 
 vim.filetype.add({
   extension = {
     conf = 'hocon',
-    cmm = 't32',
+    hurl = 'hurl',
     ncl = 'nickel',
     tig = 'tiger',
     w = 'wing',
@@ -20,6 +21,6 @@ require('nvim-treesitter').setup()
 vim.api.nvim_create_autocmd('FileType', {
   callback = function(args)
     pcall(vim.treesitter.start)
-    vim.bo[args.buffer].indentexpr = 'v:lua.require"nvim-treesitter".indentexpr()'
+    vim.bo[args.buf].indentexpr = 'v:lua.require"nvim-treesitter".indentexpr()'
   end,
 })
diff --git a/scripts/pre-push b/scripts/pre-push
deleted file mode 100755
index 8d425b3b6..000000000
--- a/scripts/pre-push
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Can be used as a pre-push hook
-# Just symlink this file to .git/hooks/pre-push
-
-echo "Running linter..."
-luacheck .
-
-echo "Checking formatting..."
-stylua --check .
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index c6660a7f6..7ae6b22c5 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -4,7 +4,7 @@ HERE="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 cd $HERE/..
 
 run() {
-    nvim --headless --noplugin -u scripts/minimal_init.lua \
+    nvim --headless --noplugin  -u scripts/minimal_init.lua \
         -c "PlenaryBustedDirectory $1 { minimal_init = './scripts/minimal_init.lua' }"
 }
 
diff --git a/scripts/write-lockfile.lua b/scripts/update-lockfile.lua
similarity index 75%
rename from scripts/write-lockfile.lua
rename to scripts/update-lockfile.lua
index 0b1d0504e..dfd3e933f 100755
--- a/scripts/write-lockfile.lua
+++ b/scripts/update-lockfile.lua
@@ -1,18 +1,18 @@
 #!/usr/bin/env -S nvim -l
 vim.opt.runtimepath:append('.')
+local util = require('nvim-treesitter.util')
 
 -- Load previous lockfile
 local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
-local lockfile = vim.json.decode(require('nvim-treesitter.util').read_file(filename))
+local lockfile = vim.json.decode(util.read_file(filename))
 
 ---@type string?
-local skip_lang_string = os.getenv('SKIP_LOCKFILE_UPDATE_FOR_LANGS')
+local skip_lang_string = os.getenv('LOCKFILE_SKIP')
 local skip_langs = skip_lang_string and vim.split(skip_lang_string, ',') or {}
 vim.print('Skipping languages: ', skip_langs)
 
 local sorted_parsers = {}
-local configs = require('nvim-treesitter.parsers').configs
-for k, v in pairs(configs) do
+for k, v in pairs(require('nvim-treesitter.parsers').configs) do
   table.insert(sorted_parsers, { name = k, parser = v })
 end
 table.sort(sorted_parsers, function(a, b)
@@ -42,7 +42,6 @@ for _, v in ipairs(sorted_parsers) do
     print('Skipping ' .. v.name)
   end
 end
-vim.print(lockfile)
 
--- write new lockfile
-require('nvim-treesitter.util').write_file(filename, vim.json.encode(lockfile))
+lockfile = vim.fn.system('jq --sort-keys', vim.json.encode(lockfile))
+util.write_file(filename, lockfile)
diff --git a/scripts/update-lockfile.sh b/scripts/update-lockfile.sh
deleted file mode 100755
index d950b321a..000000000
--- a/scripts/update-lockfile.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-make_ignored() {
-  if [ -n "$1" ]
-  then
-    while read -r lang; do
-      if [ "$lang" != "$1" ]
-      then
-        printf "%s," "$lang"
-      fi
-    done < <(jq 'keys|@sh' -c lockfile.json)
-  fi
-}
-
-TO_IGNORE=$(make_ignored $1)
-
-SKIP_LOCKFILE_UPDATE_FOR_LANGS="$TO_IGNORE" nvim -l ./scripts/write-lockfile.lua
-# Pretty print
-cp lockfile.json /tmp/lockfile.json
-cat /tmp/lockfile.json | jq --sort-keys > lockfile.json
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 9dd9f9183..ded0d6bcb 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -1,21 +1,19 @@
 #!/usr/bin/env -S nvim -l
 vim.opt.runtimepath:append('.')
-
+local util = require('nvim-treesitter.util')
+local parsers = require('nvim-treesitter.parsers')
 ---@class Parser
 ---@field name string
 ---@field parser ParserInfo
 
-local parsers = require('nvim-treesitter.parsers').configs
 local sorted_parsers = {}
-for k, v in pairs(parsers) do
+for k, v in pairs(parsers.configs) do
   table.insert(sorted_parsers, { name = k, parser = v })
 end
 table.sort(sorted_parsers, function(a, b)
   return a.name < b.name
 end)
 
-local tiers = require('nvim-treesitter.parsers').tiers
-
 local generated_text = [[
 Language | Tier | Queries | CLI | NPM | Maintainer
 -------- |:----:|:-------:|:---:|:---:| ----------
@@ -38,7 +36,7 @@ for _, v in ipairs(sorted_parsers) do
   end
 
   -- tier
-  generated_text = generated_text .. (p.tier and tiers[p.tier] or '') .. ' | '
+  generated_text = generated_text .. (p.tier and parsers.tiers[p.tier] or '') .. ' | '
 
   -- queries
   generated_text = generated_text
@@ -66,7 +64,7 @@ end
 generated_text = generated_text .. footnotes
 
 local readme = 'SUPPORTED_LANGUAGES.md'
-local readme_text = require('nvim-treesitter.util').read_file(readme)
+local readme_text = util.read_file(readme)
 
 local new_readme_text = string.gsub(
   readme_text,
@@ -74,7 +72,7 @@ local new_readme_text = string.gsub(
   '<!--parserinfo-->\n' .. generated_text .. '<!--parserinfo-->'
 )
 
-require('nvim-treesitter.util').write_file(readme, new_readme_text)
+util.write_file(readme, new_readme_text)
 
 if string.find(readme_text, generated_text, 1, true) then
   print(readme .. ' is up-to-date\n')
diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index 5c291070e..f33a5908b 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -74,7 +74,7 @@ assert:register(
 local function compare_indent(before, after, xfail)
   assert:add_formatter(format_indent)
   if xfail then
-    io.stdout:write('Warning! Known failure of this test! Please help to fix it! ')
+    -- io.stdout:write('Warning! Known failure of this test! Please help to fix it! ')
     assert.is_not.same_indent(before, after)
   else
     assert.is.same_indent(before, after)

From cd2c826972f7bd6fd8f0c076fb9bfabe3f82209e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 31 May 2023 09:19:16 +0200
Subject: [PATCH 2280/2704] fix: install dependencies

---
 SUPPORTED_LANGUAGES.md          |  23 +++--
 TODO.md                         |   7 +-
 lua/nvim-treesitter/config.lua  |  13 ++-
 lua/nvim-treesitter/health.lua  |  26 ++++--
 lua/nvim-treesitter/install.lua | 159 ++++++++++++++++----------------
 lua/nvim-treesitter/parsers.lua |  57 +++++++++++-
 scripts/update-lockfile.lua     |  22 ++---
 scripts/update-readme.lua       |  31 +++++--
 8 files changed, 207 insertions(+), 131 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index aef22b34d..18780fd6f 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -58,13 +58,14 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HF JL` |  |  | @ObserverOfTime
 [earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` |  |  | @glehmann
 [ebnf](https://github.com/RubixDev/ebnf) | unstable | `H    ` |  |  | @RubixDev
+ecma (queries only)[^ecma] |  | `HFIJL` |  |  | @steelsojka
 [eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` |  |  | @uyha
 [eex](https://github.com/connorlay/tree-sitter-eex) |  | `H  J ` |  |  | @connorlay
 [elixir](https://github.com/elixir-lang/tree-sitter-elixir) |  | `HFIJL` |  |  | @connorlay
 [elm](https://github.com/elm-tooling/tree-sitter-elm) |  | `H  J ` |  |  | @zweimach
 [elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) |  | `HFIJL` |  |  | @glapa-grossklag, @amaanq
 [elvish](https://github.com/elves/tree-sitter-elvish) |  | `H  J ` |  |  | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) |  | `H  J ` |  |  | 
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unstable | `H  J ` |  |  | 
 [erlang](https://github.com/WhatsApp/tree-sitter-erlang) |  | `HF   ` |  |  | @filmor
 [facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` |  |  | @bryankenote
 [faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` |  |  | @khiner
@@ -100,9 +101,9 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [graphql](https://github.com/bkegley/tree-sitter-graphql) |  | `H IJ ` |  |  | @bkegley
 [groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` |  |  | @murtaza64
 [gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) | stable | `H    ` |  |  | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) |  | `H    ` |  |  | 
+[hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H    ` |  |  | 
 [hare](https://github.com/amaanq/tree-sitter-hare) |  | `HFIJL` |  |  | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) |  | `HF J ` |  |  | @mrcjkb
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | community | `HF J ` |  |  | @mrcjkb
 [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) |  | `HF   ` |  |  | @lykahb
 [hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ ` |  |  | @MichaHoffmann
 [heex](https://github.com/connorlay/tree-sitter-heex) |  | `HFIJL` |  |  | @connorlay
@@ -113,6 +114,7 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [hocon](https://github.com/antosha417/tree-sitter-hocon) |  | `HF J ` |  | ✓ | @antosha417
 [hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF  L` |  |  | @urbit-pilled
 [html](https://github.com/tree-sitter/tree-sitter-html) |  | `HFIJL` |  |  | @TravonteD
+html_tags (queries only)[^html_tags] |  | `H IJ ` |  |  | @TravonteD
 [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` |  |  | @ObserverOfTime
 [http](https://github.com/rest-nvim/tree-sitter-http) |  | `H  J ` |  |  | @amaanq, @NTBBloodbath
 [hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` |  |  | @pfeiferj
@@ -128,8 +130,9 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) |  | `H    ` |  |  | @steelsojka
 [json](https://github.com/tree-sitter/tree-sitter-json) |  | `HFI L` |  |  | @steelsojka
 [json5](https://github.com/Joakker/tree-sitter-json5) |  | `H  J ` |  |  | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git)[^jsonc] |  | `HFIJL` |  | ✓ | @WhyNotHugo
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) |  | `HFIJL` |  | ✓ | @WhyNotHugo
 [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) |  | `HF  L` |  |  | @nawordar
+jsx (queries only)[^jsx] |  | `HFIJ ` |  |  | @steelsojka
 [julia](https://github.com/tree-sitter/tree-sitter-julia) | community | `HFIJL` |  |  | @theHamsta
 [just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` |  |  | @Hubro
 [kconfig](https://github.com/amaanq/tree-sitter-kconfig) | stable | `HFIJL` |  |  | @amaanq
@@ -160,7 +163,7 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H   L` | ✓ |  | @artagnon
 [muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` |  |  | @Freed-Wu
 [nasm](https://github.com/naclsn/tree-sitter-nasm) | stable | `H  J ` |  |  | @ObserverOfTime
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) |  | `H I  ` |  |  | 
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unstable | `H I  ` |  |  | 
 [nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` |  |  | @aMOPel
 [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` |  |  | @aMOPel
 [ninja](https://github.com/alemuller/tree-sitter-ninja) |  | `HFI  ` |  |  | @alemuller
@@ -173,7 +176,7 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJL` |  |  | @undu
 [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) |  | `H  J ` | ✓ |  | @undu
 [odin](https://github.com/amaanq/tree-sitter-odin) |  | `HFIJL` |  |  | @amaanq
-[org](https://github.com/milisims/tree-sitter-org) |  | `     ` |  |  | 
+[org](https://github.com/milisims/tree-sitter-org) | unstable | `     ` |  |  | 
 [pascal](https://github.com/Isopod/tree-sitter-pascal.git) |  | `HFIJL` |  |  | @Isopod
 [passwd](https://github.com/ath3/tree-sitter-passwd) |  | `H    ` |  |  | @amaanq
 [pem](https://github.com/ObserverOfTime/tree-sitter-pem) | stable | `HF J ` |  |  | @ObserverOfTime
@@ -221,7 +224,7 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [scala](https://github.com/tree-sitter/tree-sitter-scala) |  | `HF JL` |  |  | @stevanmilic
 [scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` | ✓ |  | @WhyNotHugo
 [scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` |  |  | 
-[scss](https://github.com/serenadeai/tree-sitter-scss) |  | `HFI  ` |  |  | @elianiva
+[scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFI  ` |  |  | @elianiva
 [slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unstable | `HFIJL` |  | ✓ | @theHamsta
 [slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` |  |  | @hunger
 [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | community | `HFIJL` |  |  | @amaanq
@@ -249,7 +252,7 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | stable | `HFI  ` |  |  | @lewis6991
 [teal](https://github.com/euclidianAce/tree-sitter-teal) |  | `HFIJL` | ✓ |  | @euclidianAce
 [templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  |  | @vrischmann
-[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ ` |  |  | @MichaHoffmann
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  |  | @MichaHoffmann
 [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI  ` |  |  | @Porter
 [thrift](https://github.com/duskmoon314/tree-sitter-thrift) |  | `HFIJL` |  |  | @amaanq, @duskmoon314
 [tiger](https://github.com/ambroisie/tree-sitter-tiger) |  | `HFIJL` |  |  | @ambroisie
@@ -288,11 +291,13 @@ Language | Tier | Queries | CLI | NPM | Maintainer
 [yuck](https://github.com/Philipp-M/tree-sitter-yuck) |  | `HFIJL` |  |  | @Philipp-M, @amaanq
 [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` |  |  | @Freed-Wu
 [zig](https://github.com/maxxnino/tree-sitter-zig) |  | `HFIJL` |  |  | @maxxnino
+[^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gdscript]: Godot
 [^git_config]: git_config
 [^glimmer]: Glimmer and Ember
 [^godot_resource]: Godot Resources
-[^jsonc]: JSON with comments
+[^html_tags]: queries required by html, astro, vue, svelte
+[^jsx]: queries required by javascript, tsx
 [^luap]: Lua patterns
 [^markdown]: basic highlighting
 [^markdown_inline]: needed for full highlighting
diff --git a/TODO.md b/TODO.md
index e5d9448a2..fbca7f499 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,14 +5,9 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 ## TODO
 
 - [ ] **`query_predicates.lua`:** upstream/remove
-- [ ] **`parsers.lua`:** add dependencies (and "query-only" langs like ecma, jsx, html_tags, ...)
 - [ ] **`parsers.lua`:** assign tiers
 - [ ] **`parsers.lua`:** modularize?
-- [ ] **`install.lua`:** simplify compilation:
-  - hardcode one compiler + args per platform
-  - provide `install.compile_command` for overriding (function that takes files, ...?)
-  - allow using repo makefile (norg!)?
-  - ...or switch to makefile completely?
+- [ ] **`install.lua`:** drop norg (and makefile); document c++11 requirement
 - [ ] **`locals.lua`:** move to `nvim-treesitter-refactor`?
 - [ ] **update-lockfile:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **update-lockfile:** one commit per parser/tier?
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index b8a9f6e91..c77ee1358 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -74,12 +74,11 @@ end
 
 ---@return string[]
 function M.installed_parsers()
-  local install_dir = M.get_install_dir('parser')
+  local install_dir = M.get_install_dir('queries')
 
   local installed = {} --- @type string[]
   for f in vim.fs.dir(install_dir) do
-    local lang = assert(f:match('(.*)%..*'))
-    installed[#installed + 1] = lang
+    installed[#installed + 1] = f
   end
 
   return installed
@@ -139,6 +138,14 @@ function M.norm_languages(languages, skip)
     end, languages) --[[@as string[] ]]
   end
 
+  if not (skip and skip.dependencies) then
+    for _, lang in pairs(languages) do
+      if parsers.configs[lang].requires then
+        vim.list_extend(languages, parsers.configs[lang].requires)
+      end
+    end
+  end
+
   return languages
 end
 
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 1e17bb00b..037887c59 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -1,4 +1,5 @@
 local install = require('nvim-treesitter.install')
+local parsers = require('nvim-treesitter.parsers')
 local config = require('nvim-treesitter.config')
 local util = require('nvim-treesitter.util')
 local tsq = vim.treesitter.query
@@ -123,14 +124,25 @@ function M.check()
   -- Installation dependency checks
   install_health()
   -- Parser installation checks
+  local languages = config.installed_parsers()
   local parser_installation = { 'Parser/Features' .. string.rep(' ', 9) .. 'H L F I J' }
-  for _, parser_name in pairs(config.installed_parsers()) do
-    local out = '  - ' .. parser_name .. string.rep(' ', 20 - #parser_name)
-    for _, query_group in pairs(M.bundled_queries) do
-      local status, err = query_status(parser_name, query_group)
-      out = out .. status .. ' '
-      if err then
-        table.insert(error_collection, { parser_name, query_group, err })
+  for _, lang in pairs(languages) do
+    local parser = parsers.configs[lang]
+    local out = '  - ' .. lang .. string.rep(' ', 20 - #lang)
+    if parser.install_info then
+      for _, query_group in pairs(M.bundled_queries) do
+        local status, err = query_status(lang, query_group)
+        out = out .. status .. ' '
+        if err then
+          table.insert(error_collection, { lang, query_group, err })
+        end
+      end
+    end
+    if parser.requires then
+      for _, p in pairs(parser.requires) do
+        if not vim.list_contains(languages, p) then
+          table.insert(error_collection, { lang, 'queries', 'dependency ' .. p .. ' missing' })
+        end
       end
     end
     table.insert(parser_installation, vim.fn.trim(out, ' ', 2))
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index ab9543673..3fba73db4 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -449,74 +449,76 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
     end
   end
 
-  local cc = M.select_executable(M.compilers)
-  if not cc then
-    cc_err()
-    return
-  end
+  local logger = log.new('install/' .. lang)
+  local err
 
   local repo = get_parser_install_info(lang)
-
-  local project_name = 'tree-sitter-' .. lang
-
-  local logger = log.new('install/' .. lang)
-
-  generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
-
-  if generate_from_grammar and vim.fn.executable('tree-sitter') ~= 1 then
-    logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
-  end
-
-  if generate_from_grammar and vim.fn.executable('node') ~= 1 then
-    logger:error('Node JS not found: `node` is not executable')
-  end
-
-  local revision = repo.revision or get_target_revision(lang)
-
-  local maybe_local_path = fs.normalize(repo.url)
-  local from_local_path = vim.fn.isdirectory(maybe_local_path) == 1
-  if from_local_path then
-    repo.url = maybe_local_path
-  end
-
-  if not from_local_path then
-    util.delete(fs.joinpath(cache_dir, project_name))
-    local project_dir = fs.joinpath(cache_dir, project_name)
-
-    revision = revision or repo.branch or 'master'
-
-    if can_download_tar(repo) then
-      do_download_tar(logger, repo, project_name, cache_dir, revision, project_dir)
-    else
-      do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
+  if repo then
+    local cc = M.select_executable(M.compilers)
+    if not cc then
+      cc_err()
+      return
     end
-  end
 
-  local compile_location = get_compile_location(repo, cache_dir, project_name, from_local_path)
+    local project_name = 'tree-sitter-' .. lang
 
-  if generate_from_grammar then
-    do_generate_from_grammar(logger, repo, compile_location)
-  end
+    generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
 
-  logger:info('Compiling parser')
-  local r = do_compile(repo, cc, compile_location)
-  if r.exit_code > 0 then
-    logger:error('Error during compilation: ' .. vim.inspect(r.stderr))
-  end
+    if generate_from_grammar and vim.fn.executable('tree-sitter') ~= 1 then
+      logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
+    end
 
-  local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
+    if generate_from_grammar and vim.fn.executable('node') ~= 1 then
+      logger:error('Node JS not found: `node` is not executable')
+    end
 
-  local err = uv_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
-  a.main()
-  if err then
-    logger:error(err)
-  end
+    local revision = repo.revision or get_target_revision(lang)
 
-  local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
-  util.write_file(revfile, revision or '')
+    local maybe_local_path = fs.normalize(repo.url)
+    local from_local_path = vim.fn.isdirectory(maybe_local_path) == 1
+    if from_local_path then
+      repo.url = maybe_local_path
+    end
 
-  if not from_local_path then
-    util.delete(fs.joinpath(cache_dir, project_name))
+    if not from_local_path then
+      util.delete(fs.joinpath(cache_dir, project_name))
+      local project_dir = fs.joinpath(cache_dir, project_name)
+
+      revision = revision or repo.branch or 'master'
+
+      if can_download_tar(repo) then
+        do_download_tar(logger, repo, project_name, cache_dir, revision, project_dir)
+      else
+        do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
+      end
+    end
+
+    local compile_location = get_compile_location(repo, cache_dir, project_name, from_local_path)
+
+    if generate_from_grammar then
+      do_generate_from_grammar(logger, repo, compile_location)
+    end
+
+    logger:info('Compiling parser')
+    local r = do_compile(repo, cc, compile_location)
+    if r.exit_code > 0 then
+      logger:error('Error during compilation: ' .. vim.inspect(r.stderr))
+    end
+
+    local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
+
+    err = uv_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
+    a.main()
+    if err then
+      logger:error(err)
+    end
+
+    local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
+    util.write_file(revfile, revision or '')
+
+    if not from_local_path then
+      util.delete(fs.joinpath(cache_dir, project_name))
+    end
   end
 
   local queries = fs.joinpath(config.get_install_dir('queries'), lang)
@@ -527,7 +529,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
   if err then
     logger:error(err)
   end
-  logger:info('Parser installed')
+  logger:info('Language installed')
 end
 
 --- Throttles a function using the first argument as an ID
@@ -617,7 +619,7 @@ local function install(languages, options, _callback)
   a.join(max_jobs, nil, tasks)
   if #tasks > 1 then
     a.main()
-    log.info('Installed %d/%d parsers', done, #tasks)
+    log.info('Installed %d/%d languages', done, #tasks)
   end
 end
 
@@ -650,34 +652,35 @@ end, 2)
 local function uninstall_lang(lang, parser, queries)
   local logger = log.new('uninstall/' .. lang)
   logger:debug('Uninstalling ' .. lang)
-  if vim.fn.filereadable(parser) ~= 1 then
-    return
+
+  if vim.fn.filereadable(parser) == 1 then
+    logger:debug('Unlinking ' .. parser)
+    local perr = uv_unlink(parser)
+    a.main()
+
+    if perr then
+      log.error(perr)
+    end
   end
 
-  logger:debug('Unlinking ' .. parser)
-  local perr = uv_unlink(parser)
-  a.main()
+  if vim.fn.isdirectory(queries) == 1 then
+    logger:debug('Unlinking ' .. queries)
+    local qerr = uv_unlink(queries)
+    a.main()
 
-  if perr then
-    log.error(perr)
+    if qerr then
+      logger:error(qerr)
+    end
   end
 
-  logger:debug('Unlinking ' .. queries)
-  local qerr = uv_unlink(queries)
-  a.main()
-
-  if qerr then
-    logger:error(qerr)
-  end
-
-  logger:info('Parser uninstalled')
+  logger:info('Language uninstalled')
 end
 
 --- @param languages string[]|string
 --- @param _options? UpdateOptions
 --- @param _callback fun()
 M.uninstall = a.sync(function(languages, _options, _callback)
-  languages = config.norm_languages(languages or 'all', { missing = true })
+  languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
 
   local parser_dir = config.get_install_dir('parser')
   local query_dir = config.get_install_dir('queries')
@@ -701,7 +704,7 @@ M.uninstall = a.sync(function(languages, _options, _callback)
   a.join(max_jobs, nil, tasks)
   if #tasks > 1 then
     a.main()
-    log.info('Uninstalled %d/%d parsers', done, #tasks)
+    log.info('Uninstalled %d/%d languages', done, #tasks)
   end
 end, 2)
 
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 114ab40c6..3a9a36aaf 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -12,6 +12,7 @@
 ---@field install_info InstallInfo
 ---@field filetype string[]
 ---@field maintainers string[]
+---@field requires string[]
 ---@field tier integer|nil
 ---@field readme_note string|nil
 
@@ -44,6 +45,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@dlvandenberg' },
+    requires = { 'html', 'html_tags' },
     tier = 4,
   },
 
@@ -63,6 +65,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@ObserverOfTime' },
+    requires = { 'cpp' },
   },
 
   asm = {
@@ -80,6 +83,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@virchau13' },
+    requires = { 'html', 'html_tags' },
   },
 
   authzed = {
@@ -309,6 +313,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@theHamsta' },
+    requires = { 'c' },
   },
 
   css = {
@@ -326,6 +331,7 @@ M.configs = {
       location = 'csv',
     },
     maintainers = { '@amaanq' },
+    requires = { 'tsv' },
     tier = 2,
   },
 
@@ -336,6 +342,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@theHamsta' },
+    requires = { 'cpp' },
   },
 
   cue = {
@@ -476,6 +483,12 @@ M.configs = {
     tier = 4,
   },
 
+  ecma = {
+    maintainers = { '@steelsojka' },
+    readme_note = 'queries required by javascript, typescript, tsx, qmljs',
+    tier = 3,
+  },
+
   editorconfig = {
     install_info = {
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
@@ -539,6 +552,7 @@ M.configs = {
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
       files = { 'src/parser.c' },
     },
+    tier = 4,
   },
 
   enforce = {
@@ -796,6 +810,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@theHamsta' },
+    requires = { 'c' },
   },
 
   gn = {
@@ -925,6 +940,7 @@ M.configs = {
       url = 'https://github.com/slackhq/tree-sitter-hack',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
+    tier = 4,
   },
 
   hare = {
@@ -941,6 +957,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@mrcjkb' },
+    tier = 3,
   },
 
   haskell_persistent = {
@@ -985,6 +1002,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@winston0410' },
+    requires = { 'json' },
   },
 
   hlsl = {
@@ -994,6 +1012,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@theHamsta' },
+    requires = { 'cpp' },
   },
 
   hlsplaylist = {
@@ -1023,12 +1042,18 @@ M.configs = {
     tier = 4,
   },
 
+  html_tags = {
+    maintainers = { '@TravonteD' },
+    readme_note = 'queries required by html, astro, vue, svelte',
+  },
+
   html = {
     install_info = {
       url = 'https://github.com/tree-sitter/tree-sitter-html',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@TravonteD' },
+    requires = { 'html_tags' },
   },
 
   htmldjango = {
@@ -1118,6 +1143,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@fab4100' },
+    requires = { 'c' },
   },
 
   janet_simple = {
@@ -1151,6 +1177,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@steelsojka' },
+    requires = { 'ecma', 'jsx' },
   },
 
   jinja = {
@@ -1214,7 +1241,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@WhyNotHugo' },
-    readme_note = 'JSON with comments',
+    requires = { 'json' },
   },
 
   jsonnet = {
@@ -1225,6 +1252,11 @@ M.configs = {
     maintainers = { '@nawordar' },
   },
 
+  jsx = {
+    maintainers = { '@steelsojka' },
+    readme_note = 'queries required by javascript, tsx',
+  },
+
   julia = {
     install_info = {
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
@@ -1370,8 +1402,8 @@ M.configs = {
       url = 'https://github.com/MunifTanjim/tree-sitter-lua',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
-    tier = 1,
     maintainers = { '@muniftanjim' },
+    tier = 1,
   },
 
   luadoc = {
@@ -1397,6 +1429,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    requires = { 'lua' },
   },
 
   m68k = {
@@ -1423,6 +1456,7 @@ M.configs = {
     },
     maintainers = { '@MDeiml' },
     readme_note = 'basic highlighting',
+    requires = { 'markdown_inline' },
     tier = 1,
   },
 
@@ -1475,8 +1509,8 @@ M.configs = {
       files = { 'src/parser.c' },
       requires_generate_from_grammar = true,
     },
-    tier = 4,
     maintainers = { '@artagnon' },
+    tier = 4,
   },
 
   muttrc = {
@@ -1511,6 +1545,7 @@ M.configs = {
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
+    tier = 4,
   },
 
   nim = {
@@ -1519,6 +1554,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@aMOPel' },
+    requires = { 'nim_format_string' },
     tier = 3,
   },
 
@@ -1553,8 +1589,8 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.cc' },
       use_makefile = true,
     },
-    tier = 4,
     maintainers = { '@JoeyGrajciar', '@vhyrro' },
+    tier = 4,
   },
 
   nqc = {
@@ -1581,6 +1617,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    requires = { 'c' },
   },
 
   objdump = {
@@ -1608,6 +1645,7 @@ M.configs = {
       location = 'grammars/interface',
     },
     maintainers = { '@undu' },
+    requires = { 'ocaml' },
   },
 
   ocamllex = {
@@ -1826,6 +1864,7 @@ M.configs = {
       location = 'psv',
     },
     maintainers = { '@amaanq' },
+    requires = { 'tsv' },
     tier = 2,
   },
 
@@ -1895,6 +1934,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@Decodetalkers' },
+    requires = { 'ecma' },
   },
 
   query = {
@@ -2120,6 +2160,8 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@elianiva' },
+    requires = { 'css' },
+    tier = 3,
   },
 
   sflog = {
@@ -2314,6 +2356,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    requires = { 'html_tags' },
     tier = 2,
   },
 
@@ -2421,6 +2464,8 @@ M.configs = {
       location = 'dialects/terraform',
     },
     maintainers = { '@MichaHoffmann' },
+    requires = { 'hcl' },
+    tier = 3,
   },
 
   textproto = {
@@ -2501,6 +2546,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@steelsojka' },
+    requires = { 'ecma', 'jsx', 'typescript' },
   },
 
   turtle = {
@@ -2527,6 +2573,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@steelsojka' },
+    requires = { 'ecma' },
   },
 
   typespec = {
@@ -2684,6 +2731,7 @@ M.configs = {
       branch = 'main',
     },
     maintainers = { '@WhyNotHugo', '@lucario387' },
+    requires = { 'html_tags' },
     tier = 2,
   },
 
@@ -2737,6 +2785,7 @@ M.configs = {
       location = 'xml',
     },
     maintainers = { '@ObserverOfTime' },
+    requires = { 'dtd' },
     tier = 2,
   },
 
diff --git a/scripts/update-lockfile.lua b/scripts/update-lockfile.lua
index dfd3e933f..497f1bc0f 100755
--- a/scripts/update-lockfile.lua
+++ b/scripts/update-lockfile.lua
@@ -21,21 +21,12 @@ end)
 
 -- check for new revisions
 for _, v in ipairs(sorted_parsers) do
-  if skip_langs and not vim.list_contains(skip_langs, v.name) then
-    local sha ---@type string
+  if not vim.list_contains(skip_langs, v.name) and v.parser.install_info then
+    local cmd = 'git ls-remote ' .. v.parser.install_info.url
     if v.parser.install_info.branch then
-      sha = vim.split(
-        vim.fn.systemlist(
-          'git ls-remote '
-            .. v.parser.install_info.url
-            .. ' | grep refs/heads/'
-            .. v.parser.install_info.branch
-        )[1],
-        '\t'
-      )[1]
-    else
-      sha = vim.split(vim.fn.systemlist('git ls-remote ' .. v.parser.install_info.url)[1], '\t')[1]
+      cmd = cmd .. ' | grep refs/heads/' .. v.parser.install_info.branch
     end
+    local sha = vim.split(vim.fn.systemlist(cmd)[1], '\t')[1]
     lockfile[v.name] = { revision = sha }
     print(v.name .. ': ' .. sha)
   else
@@ -43,5 +34,8 @@ for _, v in ipairs(sorted_parsers) do
   end
 end
 
-lockfile = vim.fn.system('jq --sort-keys', vim.json.encode(lockfile))
+lockfile = vim.json.encode(lockfile)
+if vim.fn.executable('jq') == 1 then
+  lockfile = vim.fn.system('jq --sort-keys', lockfile)
+end
 util.write_file(filename, lockfile)
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index ded0d6bcb..2133ad0c6 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -23,14 +23,23 @@ local footnotes = ''
 for _, v in ipairs(sorted_parsers) do
   local p = v.parser
   -- language
-  generated_text = generated_text
-    .. '['
-    .. v.name
-    .. ']('
-    .. p.install_info.url
-    .. ')'
-    .. (p.readme_note and '[^' .. v.name .. ']' or '')
-    .. ' | '
+  if p.install_info then
+    generated_text = generated_text
+      .. '['
+      .. v.name
+      .. ']('
+      .. p.install_info.url
+      .. ')'
+      .. (p.readme_note and '[^' .. v.name .. ']' or '')
+      .. ' | '
+  else
+    generated_text = generated_text
+      .. v.name
+      .. ' (queries only)'
+      .. (p.readme_note and '[^' .. v.name .. ']' or '')
+      .. ' | '
+  end
+
   if p.readme_note then
     footnotes = footnotes .. '[^' .. v.name .. ']: ' .. p.readme_note .. '\n'
   end
@@ -50,11 +59,13 @@ for _, v in ipairs(sorted_parsers) do
 
   -- CLI
   generated_text = generated_text
-    .. (p.install_info.requires_generate_from_grammar and '✓' or '')
+    .. (p.install_info and p.install_info.requires_generate_from_grammar and '✓' or '')
     .. ' | '
 
   -- NPM
-  generated_text = generated_text .. (p.install_info.generate_requires_npm and '✓' or '') .. ' | '
+  generated_text = generated_text
+    .. (p.install_info and p.install_info.generate_requires_npm and '✓' or '')
+    .. ' | '
 
   -- Maintainer
   generated_text = generated_text

From 37957d6bcf88999d41240f81610d29d48364c452 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 3 Jun 2023 12:08:14 +0200
Subject: [PATCH 2281/2704] refactor: use `vim.uv`

---
 .github/workflows/test-queries.yml  |  1 -
 lua/nvim-treesitter/config.lua      |  2 +-
 lua/nvim-treesitter/health.lua      |  2 +-
 lua/nvim-treesitter/install.lua     |  2 +-
 lua/nvim-treesitter/job.lua         |  8 ++--
 lua/nvim-treesitter/util.lua        |  2 +-
 runtime/queries/bass/injections.scm |  3 --
 scripts/check-queries.lua           | 72 +++++++++++------------------
 scripts/update-readme.lua           | 10 ++--
 9 files changed, 40 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index bb11db3dc..3b1717791 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -52,7 +52,6 @@ jobs:
     env:
       CC: ${{ matrix.cc }}
       NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
-      ALLOWED_INSTALLATION_FAILURES: ${{ matrix.os == 'windows-latest' && 'rnoweb' }}
     steps:
       - uses: actions/checkout@v4
       - uses: tree-sitter/setup-action/cli@v1
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index c77ee1358..9d9e1d3af 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -62,7 +62,7 @@ end
 function M.get_install_dir(dir_name)
   local dir = vim.fs.joinpath(config.install_dir, dir_name)
 
-  if not vim.loop.fs_stat(dir) then
+  if not vim.uv.fs_stat(dir) then
     local ok, err = pcall(vim.fn.mkdir, dir, 'p', '0755')
     if not ok then
       local log = require('nvim-treesitter.log')
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 037887c59..3573e7f5a 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -104,7 +104,7 @@ local function install_health()
     end
   end
 
-  vim.health.start('OS Info:\n' .. vim.inspect(vim.loop.os_uname()))
+  vim.health.start('OS Info:\n' .. vim.inspect(vim.uv.os_uname()))
 end
 
 local function query_status(lang, query_group)
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 3fba73db4..84bc99024 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -1,6 +1,6 @@
 local api = vim.api
 local fs = vim.fs
-local uv = vim.loop
+local uv = vim.uv
 
 local a = require('nvim-treesitter.async')
 local config = require('nvim-treesitter.config')
diff --git a/lua/nvim-treesitter/job.lua b/lua/nvim-treesitter/job.lua
index 9c2788cb0..460a543bf 100644
--- a/lua/nvim-treesitter/job.lua
+++ b/lua/nvim-treesitter/job.lua
@@ -1,5 +1,5 @@
 -- Interface with Neovim job control and provide a simple job sequencing structure
-local uv = vim.loop
+local uv = vim.uv
 local a = require('nvim-treesitter.async')
 local log = require('nvim-treesitter.log')
 
@@ -18,8 +18,8 @@ local M = { JobResult = {}, Opts = {} }
 --- @field on_stderr  fun(_: string)
 --- @field on_stdout  fun(_: string)
 
---- Wrapper for vim.loop.spawn. Takes a command, options, and callback just like
---- vim.loop.spawn, but ensures that all output from the command has been
+--- Wrapper for vim.uv.spawn. Takes a command, options, and callback just like
+--- vim.uv.spawn, but ensures that all output from the command has been
 --- flushed before calling the callback.
 --- @param cmd string
 --- @param options uv.aliases.spawn_options
@@ -66,7 +66,7 @@ end
 
 --- Main exposed function for the jobs module. Takes a task and options and
 --- returns an async function that will run the task with the given opts via
---- vim.loop.spawn
+--- vim.uv.spawn
 --- @param task string[]
 --- @param opts JobOpts
 --- @param callback fun(_: JobResult)
diff --git a/lua/nvim-treesitter/util.lua b/lua/nvim-treesitter/util.lua
index 276eafdd7..3087e9422 100644
--- a/lua/nvim-treesitter/util.lua
+++ b/lua/nvim-treesitter/util.lua
@@ -1,4 +1,4 @@
-local uv = vim.loop
+local uv = vim.uv
 
 local M = {}
 
diff --git a/runtime/queries/bass/injections.scm b/runtime/queries/bass/injections.scm
index 1c2fe3cc9..2f0e58eb6 100644
--- a/runtime/queries/bass/injections.scm
+++ b/runtime/queries/bass/injections.scm
@@ -1,5 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-
-((block_comment) @injection.content
-  (#set! injection.language "comment"))
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index fd9d538ac..3f5a9aa70 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -39,6 +39,7 @@ local function do_check()
   local timings = {}
   local parsers = require('nvim-treesitter.config').installed_parsers()
   local query_types = require('nvim-treesitter.health').bundled_queries
+  local configs = require('nvim-treesitter.parsers').configs
 
   local captures = extract_captures()
   local errors = {}
@@ -46,30 +47,32 @@ local function do_check()
   io_print('::group::Check parsers')
 
   for _, lang in pairs(parsers) do
-    timings[lang] = {}
-    for _, query_type in pairs(query_types) do
-      local before = vim.loop.hrtime()
-      local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
-      local after = vim.loop.hrtime()
-      local duration = after - before
-      table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
-      io_print(
-        'Checking ' .. lang .. ' ' .. query_type .. string.format(' (%.02fms)', duration * 1e-6)
-      )
-      if not ok then
-        local err_msg = lang .. ' (' .. query_type .. '): ' .. query
-        errors[#errors + 1] = err_msg
-      else
-        if query then
-          for _, capture in ipairs(query.captures) do
-            local is_valid = (
-              vim.startswith(capture, '_') -- Helpers.
-              or vim.list_contains(captures[query_type], capture)
-            )
-            if not is_valid then
-              local error =
-                string.format('(x) Invalid capture @%s in %s for %s.', capture, query_type, lang)
-              errors[#errors + 1] = error
+    if configs[lang].install_info then
+      timings[lang] = {}
+      for _, query_type in pairs(query_types) do
+        local before = vim.uv.hrtime()
+        local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
+        local after = vim.uv.hrtime()
+        local duration = after - before
+        table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
+        io_print(
+          'Checking ' .. lang .. ' ' .. query_type .. string.format(' (%.02fms)', duration * 1e-6)
+        )
+        if not ok then
+          local err_msg = lang .. ' (' .. query_type .. '): ' .. query
+          errors[#errors + 1] = err_msg
+        else
+          if query then
+            for _, capture in ipairs(query.captures) do
+              local is_valid = (
+                vim.startswith(capture, '_') -- Helpers.
+                or vim.list_contains(captures[query_type], capture)
+              )
+              if not is_valid then
+                local error =
+                  string.format('(x) Invalid capture @%s in %s for %s.', capture, query_type, lang)
+                errors[#errors + 1] = error
+              end
             end
           end
         end
@@ -90,27 +93,6 @@ local function do_check()
 end
 
 local ok, result = pcall(do_check)
-local allowed_to_fail = vim.split(vim.env.ALLOWED_INSTALLATION_FAILURES or '', ',', true)
-
-for k, v in pairs(require('nvim-treesitter.parsers').configs) do
-  if v.install_info then
-    -- skip "query only" languages
-    if #vim.api.nvim_get_runtime_file('parser/' .. k .. '.*', false) == 0 then
-      -- On CI all parsers that can be installed from C files should be installed
-      if
-        vim.env.CI
-        and not v.install_info.requires_generate_from_grammar
-        and not vim.list_contains(allowed_to_fail, k)
-      then
-        io_print('Error: parser for ' .. k .. ' is not installed')
-        vim.cmd('cq')
-      else
-        io_print('Warning: parser for ' .. k .. ' is not installed')
-      end
-    end
-  end
-end
-
 if ok then
   io_print('::group::Timings')
   table.sort(result, function(a, b)
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 2133ad0c6..fb9a9b32c 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -50,11 +50,11 @@ for _, v in ipairs(sorted_parsers) do
   -- queries
   generated_text = generated_text
     .. '`'
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/highlights.scm') and 'H' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/folds.scm') and 'F' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/indents.scm') and 'I' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/injections.scm') and 'J' or ' ')
-    .. (vim.loop.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/highlights.scm') and 'H' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/folds.scm') and 'F' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/indents.scm') and 'I' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/injections.scm') and 'J' or ' ')
+    .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
     .. '` | '
 
   -- CLI

From 5a70048116f8fb7489aa68e347d9dfe57dc39498 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 6 Jun 2023 11:02:28 +0200
Subject: [PATCH 2282/2704] feat: drop `TSInstallInfo` in favor of better
 `checkhealth`

also fixes the hole in install.compilers
---
 doc/nvim-treesitter.txt         |  10 +--
 lua/nvim-treesitter/health.lua  | 104 ++++++++++++++++++--------------
 lua/nvim-treesitter/install.lua |  39 +++---------
 plugin/nvim-treesitter.lua      |   4 --
 4 files changed, 70 insertions(+), 87 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index a7c6bfa69..8b530550c 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -31,7 +31,7 @@ Install the parser for your language
 To get a list of supported languages
 
 >vim
-  :TSInstallInfo
+  :TSInstall <tab>
 <
 
 To install supported parsers and queries, put this in your `init.lua` file:
@@ -50,9 +50,10 @@ To install supported parsers and queries, put this in your `init.lua` file:
 
     -- List of parsers to ignore installing (for "core" etc.)
     ignore_install = { "javascript" },
+  }
 
 <
-See |nvim-treesitter-commands| for a list of all available commands.
+To check installed parsers and queries, use `:checkhealth nvim-treesitter`.
 
 ==============================================================================
 COMMANDS                                            *nvim-treesitter-commands*
@@ -64,11 +65,6 @@ Install one or more treesitter parsers.
 You can use |:TSInstall| `all` to install all parsers. Use |:TSInstall!| to
 force the reinstallation of already installed parsers.
 
-							      *:TSInstallInfo*
-:TSInstallInfo ~
-
-List information about currently installed parsers
-
 								   *:TSUpdate*
 :TSUpdate {language} ... ~
 
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 3573e7f5a..4d5e39c43 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -3,6 +3,7 @@ local parsers = require('nvim-treesitter.parsers')
 local config = require('nvim-treesitter.config')
 local util = require('nvim-treesitter.util')
 local tsq = vim.treesitter.query
+local health = vim.health
 
 local M = {}
 
@@ -22,89 +23,109 @@ local function ts_cli_version()
 end
 
 local function install_health()
-  vim.health.start('Installation')
+  health.start('Requirements')
 
   if vim.fn.has('nvim-0.10') ~= 1 then
-    vim.health.error('Nvim-treesitter requires Neovim Nightly')
+    health.error('Nvim-treesitter requires Neovim Nightly')
   end
 
   if vim.fn.executable('tree-sitter') == 0 then
-    vim.health.warn(
+    health.warn(
       '`tree-sitter` executable not found (parser generator, only needed for :TSInstallFromGrammar,'
         .. ' not required for :TSInstall)'
     )
   else
-    vim.health.ok(
+    health.ok(
       '`tree-sitter` found '
         .. (ts_cli_version() or '(unknown version)')
-        .. ' (parser generator, only needed for :TSInstallFromGrammar)'
+        .. ' (only needed for `:TSInstallFromGrammar`)'
     )
   end
 
   if vim.fn.executable('node') == 0 then
-    vim.health.warn(
-      '`node` executable not found (only needed for :TSInstallFromGrammar,'
-        .. ' not required for :TSInstall)'
-    )
+    health.warn('`node` executable not found (only needed for `:TSInstallFromGrammar`.')
   else
     local handle = assert(io.popen('node --version'))
     local result = handle:read('*a')
     handle:close()
     local version = vim.split(result, '\n')[1]
-    vim.health.ok('`node` found ' .. version .. ' (only needed for :TSInstallFromGrammar)')
+    health.ok('`node` found ' .. version .. ' (only needed for `:TSInstallFromGrammar`)')
   end
 
   if vim.fn.executable('git') == 0 then
-    vim.health.error('`git` executable not found.', {
-      'Install it with your package manager.',
-      'Check that your `$PATH` is set correctly.',
-    })
+    health.error(
+      '`git` executable not found.',
+      'Install it with your package manager and check that your `$PATH` is set correctly.'
+    )
   else
-    vim.health.ok('`git` executable found.')
+    health.ok('`git` executable found.')
   end
 
   local cc = install.select_executable(install.compilers)
   if not cc then
-    vim.health.error('`cc` executable not found.', {
+    health.error('`cc` executable not found.', {
       'Check that any of '
-        .. vim.inspect(install.compilers)
+        .. table.concat(install.compilers, ', ')
         .. ' is in your $PATH'
-        .. ' or set the environment variable CC or `require"nvim-treesitter.install".compilers` explicitly!',
+        .. ' or set `$CC` or `require"nvim-treesitter.install".compilers` explicitly.',
     })
   else
     local version = vim.fn.systemlist(cc .. (cc == 'cl' and '' or ' --version'))[1]
-    vim.health.ok(
+    health.ok(
       '`'
         .. cc
-        .. '` executable found. Selected from '
-        .. vim.inspect(install.compilers)
+        .. '` executable found, selected from:  '
+        .. table.concat(install.compilers, ', ')
         .. (version and ('\nVersion: ' .. version) or '')
     )
   end
   if vim.treesitter.language_version then
     if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then
-      vim.health.ok(
+      health.ok(
         'Neovim was compiled with tree-sitter runtime ABI version '
           .. vim.treesitter.language_version
           .. ' (required >='
           .. NVIM_TREESITTER_MINIMUM_ABI
-          .. '). Parsers must be compatible with runtime ABI.'
+          .. ').'
       )
     else
-      vim.health.error(
+      health.error(
         'Neovim was compiled with tree-sitter runtime ABI version '
           .. vim.treesitter.language_version
           .. '.\n'
           .. 'nvim-treesitter expects at least ABI version '
           .. NVIM_TREESITTER_MINIMUM_ABI
           .. '\n'
-          .. 'Please make sure that Neovim is linked against are recent tree-sitter runtime when building'
+          .. 'Please make sure that Neovim is linked against a recent tree-sitter library when building'
           .. ' or raise an issue at your Neovim packager. Parsers must be compatible with runtime ABI.'
       )
     end
   end
 
-  vim.health.start('OS Info:\n' .. vim.inspect(vim.uv.os_uname()))
+  health.start('OS Info')
+  for k, v in pairs(vim.uv.os_uname()) do
+    health.info(k .. ': ' .. v)
+  end
+
+  local installdir = config.get_install_dir('')
+  health.start('Install directory for parsers and queries')
+  health.info(installdir)
+  if vim.uv.fs_access(installdir, 'w') then
+    health.ok('is writable.')
+  else
+    health.error('is not writable.')
+  end
+  if
+    vim.iter(vim.api.nvim_list_runtime_paths()):any(function(p)
+      if installdir == p .. '/' then
+        return true
+      end
+    end)
+  then
+    health.ok('is in runtimepath.')
+  else
+    health.error('is not in runtimepath.')
+  end
 end
 
 local function query_status(lang, query_group)
@@ -123,12 +144,13 @@ function M.check()
   local error_collection = {}
   -- Installation dependency checks
   install_health()
+
   -- Parser installation checks
+  health.start('Installed languages' .. string.rep(' ', 5) .. 'H L F I J')
   local languages = config.installed_parsers()
-  local parser_installation = { 'Parser/Features' .. string.rep(' ', 9) .. 'H L F I J' }
   for _, lang in pairs(languages) do
     local parser = parsers.configs[lang]
-    local out = '  - ' .. lang .. string.rep(' ', 20 - #lang)
+    local out = lang .. string.rep(' ', 22 - #lang)
     if parser.install_info then
       for _, query_group in pairs(M.bundled_queries) do
         local status, err = query_status(lang, query_group)
@@ -145,35 +167,27 @@ function M.check()
         end
       end
     end
-    table.insert(parser_installation, vim.fn.trim(out, ' ', 2))
+    health.info(vim.fn.trim(out, ' ', 2))
   end
-  local legend = [[
+  health.start('  Legend: H[ighlight], L[ocals], F[olds], I[ndents], In[J]ections')
 
-  Legend: H[ighlight], L[ocals], F[olds], I[ndents], In[J]ections
-          x) errors found in the query, try to run :TSUpdate {lang}]]
-  table.insert(parser_installation, legend)
-  -- Finally call the report function
-  vim.health.start(table.concat(parser_installation, '\n'))
   if #error_collection > 0 then
-    vim.health.start('The following errors have been detected:')
+    health.start('The following errors have been detected in query files:')
     for _, p in ipairs(error_collection) do
-      local lang, type, err = p[1], p[2], p[3]
+      local lang, type = p[1], p[2]
       local lines = {}
-      table.insert(lines, lang .. '(' .. type .. '): ' .. err)
+      table.insert(lines, lang .. '(' .. type .. '): ')
       local files = tsq.get_files(lang, type)
       if #files > 0 then
-        table.insert(lines, lang .. '(' .. type .. ') is concatenated from the following files:')
         for _, file in ipairs(files) do
           local query = util.read_file(file)
-          local ok, file_err = pcall(tsq.parse, lang, query)
-          if ok then
-            table.insert(lines, '|  [OK]:"' .. file .. '"')
-          else
-            table.insert(lines, '| [ERR]:"' .. file .. '", failed to load: ' .. file_err)
+          local _, file_err = pcall(tsq.parse, lang, query)
+          if file_err then
+            table.insert(lines, file)
           end
         end
       end
-      vim.health.error(table.concat(lines, '\n'))
+      health.error(table.concat(lines, ''))
     end
   end
 end
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 84bc99024..77242d730 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -1,4 +1,3 @@
-local api = vim.api
 local fs = vim.fs
 local uv = vim.uv
 
@@ -38,7 +37,10 @@ local iswin = uv.os_uname().sysname == 'Windows_NT'
 local ismac = uv.os_uname().sysname == 'Darwin'
 
 --- @diagnostic disable-next-line:missing-parameter
-M.compilers = { uv.os_getenv('CC'), 'cc', 'gcc', 'clang', 'cl', 'zig' }
+M.compilers = { 'cc', 'gcc', 'clang', 'cl', 'zig' }
+if uv.os_getenv('CC') then
+  table.insert(M.compilers, 1, uv.os_getenv('CC'))
+end
 
 ---
 --- PARSER INFO
@@ -104,31 +106,6 @@ local function needs_update(lang)
   return not revision or revision ~= get_installed_revision(lang)
 end
 
-function M.info()
-  local installed = config.installed_parsers()
-  local parser_list = parsers.get_available()
-
-  local max_len = 0
-  for _, lang in pairs(parser_list) do
-    if #lang > max_len then
-      max_len = #lang
-    end
-  end
-
-  for _, lang in pairs(parser_list) do
-    local parser = (lang .. string.rep(' ', max_len - #lang + 1))
-    local output --- @type string[]
-    if vim.list_contains(installed, lang) then
-      output = { parser .. '[✓] installed', 'DiagnosticOk' }
-    elseif #api.nvim_get_runtime_file('parser/' .. lang .. '.*', true) > 0 then
-      output = { parser .. '[·] not installed (but available from runtimepath)', 'DiagnosticInfo' }
-    else
-      output = { parser .. '[✗] not installed' }
-    end
-    api.nvim_echo({ output }, false, {})
-  end
-end
-
 ---
 --- PARSER MANAGEMENT FUNCTIONS
 ---
@@ -157,7 +134,7 @@ end
 
 local function cc_err()
   log.error('No C compiler found! "' .. table.concat(
-    vim.tbl_filter(
+    vim.iter.filter(
       ---@param c string
       ---@return boolean
       function(c)
@@ -328,11 +305,11 @@ end
 ---@param executables string[]
 ---@return string?
 function M.select_executable(executables)
-  return vim.tbl_filter(
+  return vim.iter.filter(
     ---@param c string
     ---@return boolean
     function(c)
-      return c ~= vim.NIL and vim.fn.executable(c) == 1
+      return vim.fn.executable(c) == 1
     end,
     executables
   )[1]
@@ -378,7 +355,7 @@ local function select_compiler_args(repo, compiler)
   }
 
   if
-    #vim.tbl_filter(
+    #vim.iter.filter(
       --- @param file string
       --- @return boolean
       function(file)
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index fcf44d537..0bcbe07c3 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -18,10 +18,6 @@ local function complete_installed_parsers(arglead)
 end
 
 -- create user commands
-api.nvim_create_user_command('TSInstallInfo', function()
-  require('nvim-treesitter.install').info()
-end, { nargs = 0, desc = 'List available treesitter parsers' })
-
 api.nvim_create_user_command('TSInstall', function(args)
   require('nvim-treesitter.install').install(args.fargs, { force = args.bang })
 end, {

From 68508631deac327167874d9792a7e8ec03a498f1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 6 Jun 2023 20:20:42 +0200
Subject: [PATCH 2283/2704] fix: expand tiers in ignore_install

---
 lua/nvim-treesitter/config.lua | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 9d9e1d3af..5a7c8e8ec 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -91,14 +91,12 @@ end
 function M.norm_languages(languages, skip)
   if not languages then
     return {}
-  end
-  local parsers = require('nvim-treesitter.parsers')
-
-  -- Turn into table
-  if type(languages) == 'string' then
+  elseif type(languages) == 'string' then
     languages = { languages }
   end
 
+  local parsers = require('nvim-treesitter.parsers')
+
   if vim.list_contains(languages, 'all') then
     if skip and skip.missing then
       return M.installed_parsers()
@@ -107,18 +105,24 @@ function M.norm_languages(languages, skip)
   end
   --TODO(clason): skip and warn on unavailable parser
 
-  for i, tier in ipairs(parsers.tiers) do
-    if vim.list_contains(languages, tier) then
-      languages = vim.iter.filter(function(l)
-        return l ~= tier
-      end, languages) --[[@as string[] ]]
-      vim.list_extend(languages, parsers.get_available(i))
+  -- keep local to avoid leaking parsers module
+  local function expand_tiers(list)
+    for i, tier in ipairs(parsers.tiers) do
+      if vim.list_contains(list, tier) then
+        list = vim.iter.filter(function(l)
+          return l ~= tier
+        end, list) --[[@as string[] ]]
+        vim.list_extend(list, parsers.get_available(i))
+      end
     end
+
+    return list
   end
 
-  --TODO(clason): support skipping tiers
+  languages = expand_tiers(languages)
+
   if skip and skip.ignored then
-    local ignored = config.ignore_install
+    local ignored = expand_tiers(config.ignore_install)
     languages = vim.iter.filter(function(v)
       return not vim.list_contains(ignored, v)
     end, languages) --[[@as string[] ]]

From c5152f3e8303d5cb241fc3eb3f339755719c45ad Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 7 Jun 2023 22:30:26 +0100
Subject: [PATCH 2284/2704] refactor: use vim.system (#4923)

---
 lua/nvim-treesitter/async.lua   |  44 ++++++------
 lua/nvim-treesitter/health.lua  |  13 +---
 lua/nvim-treesitter/install.lua |  73 ++++++++++---------
 lua/nvim-treesitter/job.lua     | 122 --------------------------------
 lua/nvim-treesitter/parsers.lua |   2 +-
 scripts/update-lockfile.lua     |  65 ++++++++++-------
 6 files changed, 103 insertions(+), 216 deletions(-)
 delete mode 100644 lua/nvim-treesitter/job.lua

diff --git a/lua/nvim-treesitter/async.lua b/lua/nvim-treesitter/async.lua
index 57a670ef6..8a5e7c8af 100644
--- a/lua/nvim-treesitter/async.lua
+++ b/lua/nvim-treesitter/async.lua
@@ -3,15 +3,15 @@ local co = coroutine
 local M = {}
 
 ---Executes a future with a callback when it is done
---- @param func function
---- @param callback function
---- @param ... unknown
+---@param func function
+---@param callback function
+---@param ... unknown
 local function execute(func, callback, ...)
   local thread = co.create(func)
 
   local function step(...)
     local ret = { co.resume(thread, ...) }
-    --- @type boolean, any
+    ---@type boolean, any
     local stat, nargs_or_err = unpack(ret)
 
     if not stat then
@@ -31,7 +31,7 @@ local function execute(func, callback, ...)
       return
     end
 
-    --- @type function, any[]
+    ---@type function, any[]
     local fn, args = ret[3], { unpack(ret, 4, table.maxn(ret)) }
     args[nargs_or_err] = step
     fn(unpack(args, 1, nargs_or_err))
@@ -41,13 +41,15 @@ local function execute(func, callback, ...)
 end
 
 --- Creates an async function with a callback style function.
---- @generic F: function
---- @param func F
---- @param argc integer
---- @return F
+---@generic F: function
+---@param func F
+---@param argc integer
+---@return F
 function M.wrap(func, argc)
-  --- @param ... unknown
-  --- @return unknown
+  vim.validate('func', func, 'function')
+  vim.validate('argc', argc, 'number')
+  ---@param ... unknown
+  ---@return unknown
   return function(...)
     return co.yield(argc, func, ...)
   end
@@ -56,10 +58,10 @@ end
 ---Use this to create a function which executes in an async context but
 ---called from a non-async context. Inherently this cannot return anything
 ---since it is non-blocking
---- @generic F: function
---- @param func async F
---- @param nargs? integer
---- @return F
+---@generic F: function
+---@param func async F
+---@param nargs? integer
+---@return F
 function M.sync(func, nargs)
   nargs = nargs or 0
   return function(...)
@@ -68,10 +70,10 @@ function M.sync(func, nargs)
   end
 end
 
---- @param n integer max number of concurrent jobs
---- @param interrupt_check? function
---- @param thunks function[]
---- @return any
+---@param n integer max number of concurrent jobs
+---@param interrupt_check? function
+---@param thunks function[]
+---@return any
 function M.join(n, interrupt_check, thunks)
   return co.yield(1, function(finish)
     if #thunks == 0 then
@@ -81,7 +83,7 @@ function M.join(n, interrupt_check, thunks)
     local remaining = { select(n + 1, unpack(thunks)) }
     local to_go = #thunks
 
-    local ret = {} --- @type any[]
+    local ret = {} ---@type any[]
 
     local function cb(...)
       ret[#ret + 1] = { ... }
@@ -104,7 +106,7 @@ end
 
 ---An async function that when called will yield to the Neovim scheduler to be
 ---able to call the API.
---- @type fun()
+---@type fun()
 M.main = M.wrap(vim.schedule, 1)
 
 return M
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 4d5e39c43..099e766da 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -12,12 +12,7 @@ local NVIM_TREESITTER_MINIMUM_ABI = 13
 ---@return string|nil
 local function ts_cli_version()
   if vim.fn.executable('tree-sitter') == 1 then
-    local handle = io.popen('tree-sitter -V')
-    if not handle then
-      return
-    end
-    local result = handle:read('*a')
-    handle:close()
+    local result = assert(vim.system({ 'tree-sitter', '-V' }):wait().stdout)
     return vim.split(result, '\n')[1]:match('[^tree%psitter ].*')
   end
 end
@@ -45,9 +40,7 @@ local function install_health()
   if vim.fn.executable('node') == 0 then
     health.warn('`node` executable not found (only needed for `:TSInstallFromGrammar`.')
   else
-    local handle = assert(io.popen('node --version'))
-    local result = handle:read('*a')
-    handle:close()
+    local result = assert(vim.system({ 'node', '--version' }):wait().stdout)
     local version = vim.split(result, '\n')[1]
     health.ok('`node` found ' .. version .. ' (only needed for `:TSInstallFromGrammar`)')
   end
@@ -70,7 +63,7 @@ local function install_health()
         .. ' or set `$CC` or `require"nvim-treesitter.install".compilers` explicitly.',
     })
   else
-    local version = vim.fn.systemlist(cc .. (cc == 'cl' and '' or ' --version'))[1]
+    local version = assert(vim.system({ cc, cc == 'cl' and '' or '--version' }):wait().stdout)
     health.ok(
       '`'
         .. cc
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 77242d730..097a5ab0e 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -3,7 +3,6 @@ local uv = vim.uv
 
 local a = require('nvim-treesitter.async')
 local config = require('nvim-treesitter.config')
-local job = require('nvim-treesitter.job')
 local log = require('nvim-treesitter.log')
 local parsers = require('nvim-treesitter.parsers')
 local util = require('nvim-treesitter.util')
@@ -42,6 +41,20 @@ if uv.os_getenv('CC') then
   table.insert(M.compilers, 1, uv.os_getenv('CC'))
 end
 
+local function system(cmd, opts)
+  log.trace('running job: (cwd=%s) %s', opts.cwd, table.concat(cmd, ' '))
+  local r = a.wrap(vim.system, 3)(cmd, opts) --[[@as SystemCompleted]]
+  a.main()
+  if r.stdout and r.stdout ~= '' then
+    log.trace('stdout -> %s', r.stdout)
+  end
+  if r.stderr and r.stderr ~= '' then
+    log.trace('stderr -> %s', r.stderr)
+  end
+
+  return r
+end
+
 ---
 --- PARSER INFO
 ---
@@ -156,24 +169,22 @@ local function do_generate_from_grammar(logger, repo, compile_location)
     end
 
     logger:info('Installing NPM dependencies')
-    local r = job.run({ 'npm', 'install' }, { cwd = compile_location })
-    a.main()
-    if r.exit_code > 0 then
+    local r = system({ 'npm', 'install' }, { cwd = compile_location })
+    if r.code > 0 then
       logger:error('Error during `npm install`')
     end
   end
 
   logger:info('Generating source files from grammar.js...')
 
-  local r = job.run({
+  local r = system({
     vim.fn.exepath('tree-sitter'),
     'generate',
     '--no-bindings',
     '--abi',
     tostring(vim.treesitter.language_version),
   }, { cwd = compile_location })
-  a.main()
-  if r.exit_code > 0 then
+  if r.code > 0 then
     logger:error('Error during "tree-sitter generate"')
   end
 end
@@ -201,7 +212,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   local target = is_github and url .. '/archive/' .. revision .. '.tar.gz'
     or url .. '/-/archive/' .. revision .. '/' .. project_name .. '-' .. revision .. '.tar.gz'
 
-  local r = job.run({
+  local r = system({
     'curl',
     '--silent',
     '--show-error',
@@ -212,11 +223,8 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   }, {
     cwd = cache_dir,
   })
-  a.main()
-  if r.exit_code > 0 then
-    logger:error(
-      'Error during download, please verify your internet connection: ' .. vim.inspect(r.stderr)
-    )
+  if r.code > 0 then
+    logger:error('Error during download, please verify your internet connection: %s', r.stderr)
   end
 
   logger:debug('Creating temporary directory: ' .. temp_dir)
@@ -228,7 +236,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   end
 
   logger:info('Extracting ' .. project_name .. '...')
-  r = job.run({
+  r = system({
     'tar',
     '-xzf',
     project_name .. '.tar.gz',
@@ -238,14 +246,13 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
     cwd = cache_dir,
   })
 
-  a.main()
-  if r.exit_code > 0 then
-    logger:error('Error during tarball extraction: ' .. vim.inspect(r.stderr))
+  if r.code > 0 then
+    logger:error('Error during tarball extraction: %s', r.stderr)
   end
 
   err = uv_unlink(project_dir .. '.tar.gz')
   if err then
-    logger:error('Could not remove tarball: ' .. err)
+    logger:error('Could not remove tarball: %s', err)
   end
   a.main()
 
@@ -253,7 +260,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   a.main()
 
   if err then
-    logger:error('Could not rename temp: ' .. err)
+    logger:error('Could not rename temp: %s', err)
   end
 
   util.delete(temp_dir)
@@ -268,7 +275,7 @@ end
 local function do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
   logger:info('Downloading ' .. project_name .. '...')
 
-  local r = job.run({
+  local r = system({
     'git',
     'clone',
     '--filter=blob:none',
@@ -278,16 +285,12 @@ local function do_download_git(logger, repo, project_name, cache_dir, revision,
     cwd = cache_dir,
   })
 
-  a.main()
-
-  if r.exit_code > 0 then
-    logger:error(
-      'Error during download, please verify your internet connection: ' .. vim.inspect(r.stderr)
-    )
+  if r.code > 0 then
+    logger:error('Error during download, please verify your internet connection: ' .. r.stderr)
   end
 
   logger:info('Checking out locked revision')
-  r = job.run({
+  r = system({
     'git',
     'checkout',
     revision,
@@ -295,10 +298,8 @@ local function do_download_git(logger, repo, project_name, cache_dir, revision,
     cwd = project_dir,
   })
 
-  a.main()
-
-  if r.exit_code > 0 then
-    logger:error('Error while checking out revision: ' .. vim.inspect(r.stderr))
+  if r.code > 0 then
+    logger:error('Error while checking out revision: %s', r.stderr)
   end
 end
 
@@ -388,7 +389,7 @@ end
 ---@param repo InstallInfo
 ---@param cc string
 ---@param compile_location string
----@return JobResult
+---@return SystemCompleted
 local function do_compile(repo, cc, compile_location)
   local make = M.select_executable({ 'gmake', 'make' })
 
@@ -404,9 +405,7 @@ local function do_compile(repo, cc, compile_location)
     }
   end
 
-  local r = job.run(cmd, { cwd = compile_location })
-  a.main()
-  return r
+  return system(cmd, { cwd = compile_location })
 end
 
 ---@param lang string
@@ -478,8 +477,8 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
 
     logger:info('Compiling parser')
     local r = do_compile(repo, cc, compile_location)
-    if r.exit_code > 0 then
-      logger:error('Error during compilation: ' .. vim.inspect(r.stderr))
+    if r.code > 0 then
+      logger:error('Error during compilation: %s', r.stderr)
     end
 
     local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
diff --git a/lua/nvim-treesitter/job.lua b/lua/nvim-treesitter/job.lua
deleted file mode 100644
index 460a543bf..000000000
--- a/lua/nvim-treesitter/job.lua
+++ /dev/null
@@ -1,122 +0,0 @@
--- Interface with Neovim job control and provide a simple job sequencing structure
-local uv = vim.uv
-local a = require('nvim-treesitter.async')
-local log = require('nvim-treesitter.log')
-
-local M = { JobResult = {}, Opts = {} }
-
---- @class JobResult
---- @field exit_code integer
---- @field signal integer | string
---- @field stdout string[]
---- @field stderr string[]
-
---- @class JobOpts
---- @field cwd  string
---- @field timeout  integer
---- @field env  string[]
---- @field on_stderr  fun(_: string)
---- @field on_stdout  fun(_: string)
-
---- Wrapper for vim.uv.spawn. Takes a command, options, and callback just like
---- vim.uv.spawn, but ensures that all output from the command has been
---- flushed before calling the callback.
---- @param cmd string
---- @param options uv.aliases.spawn_options
---- @param callback fun(exit_code: integer, signal: integer|string)
-local function spawn(cmd, options, callback)
-  local handle --- @type uv_process_t?
-  local timer --- @type uv_timer_t
-  log.trace('running job: (cwd=%s) %s %s', options.cwd, cmd, table.concat(options.args, ' '))
-  handle = uv.spawn(cmd, options, function(exit_code, signal)
-    ---@cast handle -nil
-
-    handle:close()
-    if timer then
-      timer:stop()
-      timer:close()
-    end
-
-    callback(exit_code, signal)
-  end)
-
-  --- @type integer?
-  --- @diagnostic disable-next-line:undefined-field
-  local timeout = options.timeout
-
-  if timeout then
-    timer = assert(uv.new_timer())
-    timer:start(timeout, 0, function()
-      timer:stop()
-      timer:close()
-      if handle and handle:is_active() then
-        log.warn('Killing %s due to timeout!', cmd)
-        handle:kill('sigint')
-        handle:close()
-        for _, pipe in
-          pairs(options.stdio --[[@as uv_pipe_t[] ]])
-        do
-          pipe:close()
-        end
-        callback(-9999, 'sigint')
-      end
-    end)
-  end
-end
-
---- Main exposed function for the jobs module. Takes a task and options and
---- returns an async function that will run the task with the given opts via
---- vim.uv.spawn
---- @param task string[]
---- @param opts JobOpts
---- @param callback fun(_: JobResult)
---- @type fun(task: string|string[], opts: JobOpts): JobResult
-M.run = a.wrap(function(task, opts, callback)
-  local stdout_data = {}
-  local stderr_data = {}
-
-  local stdout = assert(uv.new_pipe(false))
-  local stderr = assert(uv.new_pipe(false))
-
-  spawn(task[1], {
-    args = { unpack(task, 2) },
-    stdio = { nil, stdout, stderr },
-    cwd = opts.cwd,
-    timeout = opts.timeout and 1000 * opts.timeout or nil,
-    env = opts.env,
-    hide = true,
-  }, function(exit_code, signal)
-    callback({
-      exit_code = exit_code,
-      signal = signal,
-      stdout = stdout_data,
-      stderr = stderr_data,
-    })
-  end)
-
-  for kind, pipe in pairs({ stdout = stdout, stderr = stderr }) do
-    pipe:read_start(function(err, data)
-      if kind == 'stderr' and opts.on_stderr and data then
-        opts.on_stderr(data)
-      end
-      if kind == 'stdout' and opts.on_stdout and data then
-        opts.on_stdout(data)
-      end
-      if data then
-        log.trace('%s -> %s', kind, data)
-      end
-      if err then
-        log.error(err)
-      end
-      if data ~= nil then
-        local output = kind == 'stdout' and stdout_data or stderr_data
-        table.insert(output, vim.trim(data))
-      else
-        pipe:read_stop()
-        pipe:close()
-      end
-    end)
-  end
-end, 3)
-
-return M
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3a9a36aaf..357d11650 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -20,7 +20,7 @@ local M = {}
 
 M.tiers = { 'core', 'stable', 'community', 'unstable' }
 
----@type ParserInfo[]
+---@type table<string,ParserInfo>
 M.configs = {
   ada = {
     install_info = {
diff --git a/scripts/update-lockfile.lua b/scripts/update-lockfile.lua
index 497f1bc0f..e07cf416f 100755
--- a/scripts/update-lockfile.lua
+++ b/scripts/update-lockfile.lua
@@ -4,38 +4,53 @@ local util = require('nvim-treesitter.util')
 
 -- Load previous lockfile
 local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
-local lockfile = vim.json.decode(util.read_file(filename))
+-- local old_lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,{revision:string}>]]
 
----@type string?
-local skip_lang_string = os.getenv('LOCKFILE_SKIP')
-local skip_langs = skip_lang_string and vim.split(skip_lang_string, ',') or {}
-vim.print('Skipping languages: ', skip_langs)
+---@type table<string,{revision:string}>
+local new_lockfile = {}
 
-local sorted_parsers = {}
-for k, v in pairs(require('nvim-treesitter.parsers').configs) do
-  table.insert(sorted_parsers, { name = k, parser = v })
-end
-table.sort(sorted_parsers, function(a, b)
-  return a.name < b.name
-end)
+local parsers = require('nvim-treesitter.parsers').configs
+
+local jobs = {} --- @type table<string,SystemObj>
 
 -- check for new revisions
-for _, v in ipairs(sorted_parsers) do
-  if not vim.list_contains(skip_langs, v.name) and v.parser.install_info then
-    local cmd = 'git ls-remote ' .. v.parser.install_info.url
-    if v.parser.install_info.branch then
-      cmd = cmd .. ' | grep refs/heads/' .. v.parser.install_info.branch
-    end
-    local sha = vim.split(vim.fn.systemlist(cmd)[1], '\t')[1]
-    lockfile[v.name] = { revision = sha }
-    print(v.name .. ': ' .. sha)
+for k, p in pairs(parsers) do
+  if not p.install_info then
+    print('Skipping ' .. k)
   else
-    print('Skipping ' .. v.name)
+    jobs[k] = vim.system({ 'git', 'ls-remote', p.install_info.url })
+  end
+
+  if #vim.tbl_keys(jobs) % 100 == 0 or next(parsers, k) == nil then
+    for name, job in pairs(jobs) do
+      local stdout = vim.split(job:wait().stdout, '\n')
+      jobs[name] = nil
+
+      local branch = parsers[name].install_info.branch
+
+      local line = 1
+      if branch then
+        for j, l in ipairs(stdout) do
+          if l:find(vim.pesc(branch)) then
+            line = j
+            break
+          end
+        end
+      end
+
+      local sha = vim.split(stdout[line], '\t')[1]
+      new_lockfile[name] = { revision = sha }
+      print(name .. ': ' .. sha)
+    end
   end
 end
 
-lockfile = vim.json.encode(lockfile)
+assert(#vim.tbl_keys(jobs) == 0)
+
+local lockfile_json = vim.json.encode(new_lockfile) --[[@as string]]
 if vim.fn.executable('jq') == 1 then
-  lockfile = vim.fn.system('jq --sort-keys', lockfile)
+  lockfile_json =
+    assert(vim.system({ 'jq', '--sort-keys' }, { stdin = lockfile_json }):wait().stdout)
 end
-util.write_file(filename, lockfile)
+
+util.write_file(filename, lockfile_json)

From f0a984347c0e9c1e6efc493bbfb9b062041a9855 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 8 Jun 2023 13:25:31 +0200
Subject: [PATCH 2285/2704] feat!: drop makefile support, norg parser

Norg install_info and queries are maintained by neorg.

All other parsers are compatible with C++11, so fix that as standard.
(Can be bumped if all supported platforms support C++14.)

Remove Makefile support, as it's no longer needed.
---
 README.md                        |  1 +
 SUPPORTED_LANGUAGES.md           |  1 -
 TODO.md                          |  1 -
 lockfile.json                    |  3 --
 lua/nvim-treesitter/install.lua  | 15 ++-------
 lua/nvim-treesitter/parsers.lua  | 11 -------
 scripts/compile_parsers.makefile | 52 --------------------------------
 7 files changed, 3 insertions(+), 81 deletions(-)
 delete mode 100644 scripts/compile_parsers.makefile

diff --git a/README.md b/README.md
index 523940b63..4f2970883 100644
--- a/README.md
+++ b/README.md
@@ -159,6 +159,7 @@ If Neovim does not detect your language's filetype by default, you can use [Neov
 You can also skip step 2 and use `:TSInstallFromGrammar zimbu` to install directly from a `grammar.js` in the top-level directory specified by `url`.
 Once the parser is installed, you can update it (from the latest revision of the `main` branch if `url` is a Github repository) with `:TSUpdate zimbu`.
 
+**Note:** Parsers using external scanner need to be written in C. C++ scanners are no longer supported.
 
 ## Adding queries
 
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 18780fd6f..0dd2c1e9f 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -168,7 +168,6 @@ jsx (queries only)[^jsx] |  | `HFIJ ` |  |  | @steelsojka
 [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` |  |  | @aMOPel
 [ninja](https://github.com/alemuller/tree-sitter-ninja) |  | `HFI  ` |  |  | @alemuller
 [nix](https://github.com/cstrahan/tree-sitter-nix) |  | `HF JL` |  |  | @leo60228
-[norg](https://github.com/nvim-neorg/tree-sitter-norg) | unstable | `     ` |  |  | @JoeyGrajciar, @vhyrro
 [nqc](https://github.com/amaanq/tree-sitter-nqc) | stable | `HFIJL` |  |  | @amaanq
 [objc](https://github.com/amaanq/tree-sitter-objc) |  | `HFIJL` |  |  | @amaanq
 [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` |  |  | @ColinKennedy
diff --git a/TODO.md b/TODO.md
index fbca7f499..bf817fc4b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,6 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [ ] **`query_predicates.lua`:** upstream/remove
 - [ ] **`parsers.lua`:** assign tiers
 - [ ] **`parsers.lua`:** modularize?
-- [ ] **`install.lua`:** drop norg (and makefile); document c++11 requirement
 - [ ] **`locals.lua`:** move to `nvim-treesitter-refactor`?
 - [ ] **update-lockfile:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **update-lockfile:** one commit per parser/tier?
diff --git a/lockfile.json b/lockfile.json
index 3f87966c6..4967a911c 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -527,9 +527,6 @@
   "nix": {
     "revision": "cfc53fd287d23ab7281440a8526c73542984669b"
   },
-  "norg": {
-    "revision": "d89d95af13d409f30a6c7676387bde311ec4a2c8"
-  },
   "nqc": {
     "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
   },
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 097a5ab0e..9f99f0cfe 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -391,19 +391,8 @@ end
 ---@param compile_location string
 ---@return SystemCompleted
 local function do_compile(repo, cc, compile_location)
-  local make = M.select_executable({ 'gmake', 'make' })
-
-  local cmd --- @type string[]
-  if cc:find('cl$') or cc:find('cl.exe$') or not repo.use_makefile or iswin or not make then
-    local args = vim.tbl_flatten(select_compiler_args(repo, cc))
-    cmd = vim.list_extend({ cc }, args)
-  else
-    cmd = {
-      make,
-      '--makefile=' .. M.get_package_path('scripts', 'compile_parsers.makefile'),
-      'CC=' .. cc,
-    }
-  end
+  local args = vim.tbl_flatten(select_compiler_args(repo, cc))
+  local cmd = vim.list_extend({ cc }, args)
 
   return system(cmd, { cwd = compile_location })
 end
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 357d11650..7f0041e36 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -6,7 +6,6 @@
 ---@field generate_requires_npm boolean|nil
 ---@field requires_generate_from_grammar boolean|nil
 ---@field location string|nil
----@field use_makefile boolean|nil
 
 ---@class ParserInfo
 ---@field install_info InstallInfo
@@ -1583,16 +1582,6 @@ M.configs = {
     maintainers = { '@leo60228' },
   },
 
-  norg = {
-    install_info = {
-      url = 'https://github.com/nvim-neorg/tree-sitter-norg',
-      files = { 'src/parser.c', 'src/scanner.cc' },
-      use_makefile = true,
-    },
-    maintainers = { '@JoeyGrajciar', '@vhyrro' },
-    tier = 4,
-  },
-
   nqc = {
     install_info = {
       url = 'https://github.com/amaanq/tree-sitter-nqc',
diff --git a/scripts/compile_parsers.makefile b/scripts/compile_parsers.makefile
deleted file mode 100644
index 020b45285..000000000
--- a/scripts/compile_parsers.makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-CFLAGS       ?= -Os -std=c99 -fPIC
-CXX_STANDARD ?= c++14
-CXXFLAGS     ?= -Os -std=$(CXX_STANDARD) -fPIC
-LDFLAGS      ?= 
-SRC_DIR      ?= ./src
-DEST_DIR     ?= ./dest
-
-ifeq ($(OS),Windows_NT)
-   SHELL       := powershell.exe
-   .SHELLFLAGS := -NoProfile -command
-   CP          := Copy-Item -Recurse -ErrorAction SilentlyContinue
-   MKDIR       := New-Item -ItemType directory -ErrorAction SilentlyContinue
-   TARGET      := parser.dll
-   rmf         = Write-Output $(1) | foreach { if (Test-Path $$_) { Remove-Item -Force } }
-else
-   CP          := cp
-   MKDIR       := mkdir -p
-   TARGET      := parser.so
-   rmf         = rm -rf $(1)
-endif
-
-ifneq ($(wildcard $(SRC_DIR)/*.cc),)
-   LDFLAGS += -lstdc++
-endif
-
-OBJECTS := parser.o
-
-ifneq ($(wildcard $(SRC_DIR)/scanner.*),)
-   OBJECTS += scanner.o
-endif
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECTS)
-	$(CC) $(OBJECTS) -o $(TARGET) -shared $(LDFLAGS)
-
-%.o: $(SRC_DIR)/%.c
-	$(CC) -c $(CFLAGS) -I$(SRC_DIR) -o $@ $<
-
-%.o: $(SRC_DIR)/%.cc
-	$(CC) -c $(CXXFLAGS) -I$(SRC_DIR) -o $@ $<
-
-clean:
-	$(call rmf,$(TARGET) $(OBJECTS))
-
-$(DEST_DIR):
-	@$(MKDIR) $(DEST_DIR)
-
-install: $(TARGET) $(DEST_DIR)
-	$(CP) $(TARGET) $(DEST_DIR)/
-
-.PHONY: clean

From bae77b87b1262ff101b06f9a8de0b2049edcefa1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 10 Jun 2023 17:12:35 +0200
Subject: [PATCH 2286/2704] feat: add parser tiers

Tier 1: Stable
Tier 2: Core (maintained by org members)
Tier 3: Community (maintained by external contributors, to varying
degree)
Tier 4: Unsupported (lacking active maintainer or declared
experimental); skipped in lockfile update and ignored for automatic
install by default
---
 README.md                       |   4 +-
 SUPPORTED_LANGUAGES.md          | 445 ++++++++++++++++----------------
 TODO.md                         |   7 +-
 lua/nvim-treesitter/config.lua  |   2 +-
 lua/nvim-treesitter/install.lua |   7 +-
 lua/nvim-treesitter/parsers.lua | 179 +++++++++++--
 scripts/update-lockfile.lua     |   7 +-
 7 files changed, 397 insertions(+), 254 deletions(-)

diff --git a/README.md b/README.md
index 4f2970883..48857e877 100644
--- a/README.md
+++ b/README.md
@@ -53,11 +53,11 @@ require('lazy').setup(
 
 ```lua
 require'nvim-treesitter'.setup {
-  -- A list of parser names or tiers ('core', 'stable', 'community', 'unstable')
+  -- A list of parser names or tiers ('stable', 'core', 'community', 'unsupported')
   ensure_install = { },
 
   -- List of parsers to ignore installing
-  ignore_install = { },
+  ignore_install = { 'unsupported' },
 
   -- Automatically install missing parsers when entering buffer
   auto_install = false,
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 0dd2c1e9f..dea60f0b4 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -3,7 +3,7 @@
 The following is a list of languages for which a parser can be installed through `:TSInstall`.
 
 Legend:
-- **Tier:** _core_, _stable_, _community_, or _unstable_
+- **Tier:** _stable_, _core_, _community_, or _unsupported_
 - **CLI:** `:TSInstall` requires `tree-sitter` CLI installed
 - **NPM:** `:TSInstallFromGrammar` requires `node` installed
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
@@ -12,287 +12,286 @@ Legend:
 <!--parserinfo-->
 Language | Tier | Queries | CLI | NPM | Maintainer
 -------- |:----:|:-------:|:---:|:---:| ----------
-[ada](https://github.com/briot/tree-sitter-ada) |  | `HF  L` |  |  | @briot
-[agda](https://github.com/tree-sitter/tree-sitter-agda) |  | `HF   ` |  |  | @Decodetalkers
-[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJL` |  | ✓ | @dlvandenberg
+[ada](https://github.com/briot/tree-sitter-ada) | community | `HF  L` |  |  | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) | community | `HF   ` |  |  | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unsupported | `HFIJL` |  | ✓ | @dlvandenberg
 [apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF  L` |  |  | @aheber
-[arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) |  | `HFIJL` |  |  | @ObserverOfTime
+[arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) | core | `HFIJL` |  |  | @ObserverOfTime
 [asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` |  |  | @RubixDev
-[astro](https://github.com/virchau13/tree-sitter-astro) |  | `HFIJL` |  |  | @virchau13
+[astro](https://github.com/virchau13/tree-sitter-astro) | community | `HFIJL` |  |  | @virchau13
 [authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J ` |  |  | @mattpolzin
-[awk](https://github.com/Beaglefoot/tree-sitter-awk) |  | `H  J ` |  |  | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) |  | `HF JL` |  |  | @TravonteD
-[bass](https://github.com/vito/tree-sitter-bass) |  | `HFIJL` |  |  | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) |  | `HF J ` |  |  | @polarmutex
-[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFI  ` |  |  | @theHamsta, @clason
-[bicep](https://github.com/amaanq/tree-sitter-bicep) |  | `HFIJL` |  |  | @amaanq
-[bitbake](https://github.com/amaanq/tree-sitter-bitbake) | stable | `HFIJL` |  |  | @amaanq
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unstable | `H    ` |  |  | @gabmus
-[c](https://github.com/tree-sitter/tree-sitter-c) | core | `HFIJL` |  |  | @amaanq
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) |  | `HF JL` |  |  | @Luxed
-[cairo](https://github.com/amaanq/tree-sitter-cairo) | stable | `HFIJL` |  |  | @amaanq
-[capnp](https://github.com/amaanq/tree-sitter-capnp) |  | `HFIJL` |  |  | @amaanq
-[chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) |  | `HFIJL` |  |  | @ObserverOfTime
-[clojure](https://github.com/sogaiu/tree-sitter-clojure) |  | `HF JL` |  |  | @NoahTheDuke
-[cmake](https://github.com/uyha/tree-sitter-cmake) |  | `HFI  ` |  |  | @uyha
-[comment](https://github.com/stsewd/tree-sitter-comment) | stable | `H    ` |  |  | @stsewd
-[commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) |  | `HF  L` |  | ✓ | @theHamsta
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unsupported | `H  J ` |  |  | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) | community | `HF JL` |  |  | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) | core | `HFIJL` |  |  | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | community | `HF J ` |  |  | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | core | `HFI  ` |  |  | @theHamsta, @clason
+[bicep](https://github.com/amaanq/tree-sitter-bicep) | core | `HFIJL` |  |  | @amaanq
+[bitbake](https://github.com/amaanq/tree-sitter-bitbake) | core | `HFIJL` |  |  | @amaanq
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unsupported | `H    ` |  |  | @gabmus
+[c](https://github.com/tree-sitter/tree-sitter-c) | stable | `HFIJL` |  |  | @amaanq
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | community | `HF JL` |  |  | @Luxed
+[cairo](https://github.com/amaanq/tree-sitter-cairo) | core | `HFIJL` |  |  | @amaanq
+[capnp](https://github.com/amaanq/tree-sitter-capnp) | core | `HFIJL` |  |  | @amaanq
+[chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) | core | `HFIJL` |  |  | @ObserverOfTime
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) | community | `HF JL` |  |  | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) | unsupported | `HFI  ` |  |  | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | core | `H    ` |  |  | @stsewd
+[commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) | core | `HF  L` |  | ✓ | @theHamsta
 [cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H    ` |  |  | @addcninblue
 [corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFI L` |  |  | @jakestanger
-[cpon](https://github.com/amaanq/tree-sitter-cpon) |  | `HFIJL` |  |  | @amaanq
-[cpp](https://github.com/tree-sitter/tree-sitter-cpp) |  | `HFIJL` |  | ✓ | @theHamsta
-[css](https://github.com/tree-sitter/tree-sitter-css) |  | `HFIJ ` |  |  | @TravonteD
-[csv](https://github.com/amaanq/tree-sitter-csv) | stable | `H    ` |  |  | @amaanq
-[cuda](https://github.com/theHamsta/tree-sitter-cuda) |  | `HFIJL` |  | ✓ | @theHamsta
-[cue](https://github.com/eonpatapon/tree-sitter-cue) |  | `HFIJL` |  |  | @amaanq
-[d](https://github.com/gdamore/tree-sitter-d) | stable | `HFIJL` |  |  | @amaanq
-[dart](https://github.com/UserNobody14/tree-sitter-dart) |  | `HFIJL` |  |  | @akinsho
-[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) |  | `HFIJL` |  |  | @jedrzejboczar
-[dhall](https://github.com/jbellerb/tree-sitter-dhall) |  | `HF J ` |  |  | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) |  | `H    ` |  |  | @gbprod
+[cpon](https://github.com/amaanq/tree-sitter-cpon) | core | `HFIJL` |  |  | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | stable | `HFIJL` |  | ✓ | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) | community | `HFIJ ` |  |  | @TravonteD
+[csv](https://github.com/amaanq/tree-sitter-csv) | core | `H    ` |  |  | @amaanq
+[cuda](https://github.com/theHamsta/tree-sitter-cuda) | core | `HFIJL` |  | ✓ | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) | core | `HFIJL` |  |  | @amaanq
+[d](https://github.com/gdamore/tree-sitter-d) | core | `HFIJL` |  |  | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) | unsupported | `HFIJL` |  |  | @akinsho
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` |  |  | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) | core | `HF J ` |  |  | @amaanq
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H    ` |  |  | @gbprod
 [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` |  |  | @ColinKennedy
 [djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` |  |  | @NoahTheDuke
-[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) |  | `H  J ` |  |  | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) |  | `H IJ ` |  |  | @rydesun
-[doxygen](https://github.com/amaanq/tree-sitter-doxygen) | stable | `H IJ ` |  |  | @amaanq
-[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HF JL` |  |  | @ObserverOfTime
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` |  |  | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) | community | `H IJ ` |  |  | @rydesun
+[doxygen](https://github.com/amaanq/tree-sitter-doxygen) | core | `H IJ ` |  |  | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HF JL` |  |  | @ObserverOfTime
 [earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` |  |  | @glehmann
-[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H    ` |  |  | @RubixDev
-ecma (queries only)[^ecma] |  | `HFIJL` |  |  | @steelsojka
+[ebnf](https://github.com/RubixDev/ebnf) | unsupported | `H    ` |  |  | @RubixDev
+ecma (queries only)[^ecma] | core | `HFIJL` |  |  | @steelsojka
 [eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` |  |  | @uyha
-[eex](https://github.com/connorlay/tree-sitter-eex) |  | `H  J ` |  |  | @connorlay
-[elixir](https://github.com/elixir-lang/tree-sitter-elixir) |  | `HFIJL` |  |  | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) |  | `H  J ` |  |  | @zweimach
-[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) |  | `HFIJL` |  |  | @glapa-grossklag, @amaanq
-[elvish](https://github.com/elves/tree-sitter-elvish) |  | `H  J ` |  |  | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unstable | `H  J ` |  |  | 
-[erlang](https://github.com/WhatsApp/tree-sitter-erlang) |  | `HF   ` |  |  | @filmor
+[eex](https://github.com/connorlay/tree-sitter-eex) | community | `H  J ` |  |  | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | community | `HFIJL` |  |  | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) | unsupported | `H  J ` |  |  | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | core | `HFIJL` |  |  | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` |  |  | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` |  |  | 
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | community | `HF   ` |  |  | @filmor
 [facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` |  |  | @bryankenote
 [faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` |  |  | @khiner
-[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) |  | `HF JL` |  | ✓ | @alexmozaidze
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | community | `HF JL` |  | ✓ | @alexmozaidze
 [fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J ` |  |  | @chaopeng
-[firrtl](https://github.com/amaanq/tree-sitter-firrtl) |  | `HFIJL` |  |  | @amaanq
-[fish](https://github.com/ram02z/tree-sitter-fish) |  | `HFIJL` |  |  | @ram02z
-[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJL` |  |  | @FoamScience
-[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | stable | `HFIJL` |  |  | @amaanq
-[fortran](https://github.com/stadelmanma/tree-sitter-fortran) |  | `HFI  ` |  |  | @amaanq
-[fsh](https://github.com/mgramigna/tree-sitter-fsh) |  | `H    ` |  |  | @mgramigna
-[func](https://github.com/amaanq/tree-sitter-func) |  | `H    ` |  |  | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) |  | `HFI L` |  |  | @jirgn
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] |  | `HFIJL` |  |  | @PrestonKnopp
+[firrtl](https://github.com/amaanq/tree-sitter-firrtl) | core | `HFIJL` |  |  | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) | community | `HFIJL` |  |  | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | community | `HFIJL` |  |  | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | core | `HFIJL` |  |  | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | core | `HFI  ` |  |  | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H    ` |  |  | @mgramigna
+[func](https://github.com/amaanq/tree-sitter-func) | core | `H    ` |  |  | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) | community | `HFI L` |  |  | @jirgn
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` |  |  | @PrestonKnopp
 [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` |  |  | @godofavacyn
-[git_config](https://github.com/the-mikedavis/tree-sitter-git-config)[^git_config] |  | `HF J ` |  |  | @amaanq
-[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) |  | `H  J ` |  |  | @gbprod
-[gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) |  | `H  JL` |  |  | @ObserverOfTime
-[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) |  | `H  J ` |  |  | @gbprod
-[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) |  | `H    ` |  |  | @theHamsta
-[gleam](https://github.com/gleam-lang/tree-sitter-gleam) |  | `HFIJL` |  |  | @amaanq
-[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] |  | `HFI L` |  |  | @NullVoxPopuli
-[glsl](https://github.com/theHamsta/tree-sitter-glsl) |  | `HFIJL` |  | ✓ | @theHamsta
-[gn](https://github.com/amaanq/tree-sitter-gn) | stable | `HFIJL` |  |  | @amaanq
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | core | `HF J ` |  |  | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | community | `H  J ` |  |  | @gbprod
+[gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) | core | `H  JL` |  |  | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | community | `H  J ` |  |  | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | core | `H    ` |  |  | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | core | `HFIJL` |  |  | @amaanq
+[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] | community | `HFI L` |  |  | @NullVoxPopuli
+[glsl](https://github.com/theHamsta/tree-sitter-glsl) | core | `HFIJL` |  | ✓ | @theHamsta
+[gn](https://github.com/amaanq/tree-sitter-gn) | core | `HFIJL` |  |  | @amaanq
 [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` |  |  | @dpezto
-[go](https://github.com/tree-sitter/tree-sitter-go) |  | `HFIJL` |  |  | @theHamsta, @WinWisely268
-[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] |  | `HF JL` |  |  | @pierpo
-[gomod](https://github.com/camdencheek/tree-sitter-go-mod) |  | `H  J ` |  |  | @camdencheek
-[gosum](https://github.com/amaanq/tree-sitter-go-sum) |  | `H    ` |  |  | @amaanq
+[go](https://github.com/tree-sitter/tree-sitter-go) | stable | `HFIJL` |  |  | @theHamsta, @WinWisely268
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | community | `HF JL` |  |  | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | community | `H  J ` |  |  | @camdencheek
+[gosum](https://github.com/amaanq/tree-sitter-go-sum) | core | `H    ` |  |  | @amaanq
 [gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  |  | @qvalentin
-[gowork](https://github.com/omertuc/tree-sitter-go-work) |  | `H  J ` |  |  | @omertuc
-[gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) | stable | `H  J ` |  |  | @ObserverOfTime
-[graphql](https://github.com/bkegley/tree-sitter-graphql) |  | `H IJ ` |  |  | @bkegley
+[gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` |  |  | @omertuc
+[gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) | core | `H  J ` |  |  | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` |  |  | @bkegley
 [groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` |  |  | @murtaza64
-[gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) | stable | `H    ` |  |  | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H    ` |  |  | 
-[hare](https://github.com/amaanq/tree-sitter-hare) |  | `HFIJL` |  |  | @amaanq
+[gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) | core | `H    ` |  |  | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H    ` |  |  | 
+[hare](https://github.com/amaanq/tree-sitter-hare) | core | `HFIJL` |  |  | @amaanq
 [haskell](https://github.com/tree-sitter/tree-sitter-haskell) | community | `HF J ` |  |  | @mrcjkb
-[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) |  | `HF   ` |  |  | @lykahb
-[hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) |  | `HFIJ ` |  |  | @MichaHoffmann
-[heex](https://github.com/connorlay/tree-sitter-heex) |  | `HFIJL` |  |  | @connorlay
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` |  |  | @lykahb
+[hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  |  | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` |  |  | @connorlay
 [helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  |  | @qvalentin
-[hjson](https://github.com/winston0410/tree-sitter-hjson) |  | `HFIJL` |  | ✓ | @winston0410
-[hlsl](https://github.com/theHamsta/tree-sitter-hlsl) |  | `HFIJL` |  | ✓ | @theHamsta
+[hjson](https://github.com/winston0410/tree-sitter-hjson) | community | `HFIJL` |  | ✓ | @winston0410
+[hlsl](https://github.com/theHamsta/tree-sitter-hlsl) | core | `HFIJL` |  | ✓ | @theHamsta
 [hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` |  |  | @Freed-Wu
-[hocon](https://github.com/antosha417/tree-sitter-hocon) |  | `HF J ` |  | ✓ | @antosha417
-[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF  L` |  |  | @urbit-pilled
-[html](https://github.com/tree-sitter/tree-sitter-html) |  | `HFIJL` |  |  | @TravonteD
-html_tags (queries only)[^html_tags] |  | `H IJ ` |  |  | @TravonteD
-[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` |  |  | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) |  | `H  J ` |  |  | @amaanq, @NTBBloodbath
+[hocon](https://github.com/antosha417/tree-sitter-hocon) | unsupported | `HF J ` |  | ✓ | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unsupported | `HF  L` |  |  | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) | community | `HFIJL` |  |  | @TravonteD
+html_tags (queries only)[^html_tags] | community | `H IJ ` |  |  | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unsupported | `HFIJ ` |  |  | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) | core | `H  J ` |  |  | @amaanq, @NTBBloodbath
 [hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` |  |  | @pfeiferj
 [hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) | community | `HFIJ ` |  |  | @luckasRanarison
 [idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J ` |  |  | @cathaysa
-[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF   ` |  |  | @theHamsta
+[ini](https://github.com/justinmk/tree-sitter-ini) | unsupported | `HF   ` |  |  | @theHamsta
 [inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` |  |  | @yorickpeterse
-[ispc](https://github.com/fab4100/tree-sitter-ispc) |  | `HFIJL` |  | ✓ | @fab4100
-[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) |  | `HF JL` |  |  | @sogaiu
-[java](https://github.com/tree-sitter/tree-sitter-java) |  | `HFIJL` |  |  | @p00f
-[javascript](https://github.com/tree-sitter/tree-sitter-javascript) |  | `HFIJL` |  |  | @steelsojka
-[jq](https://github.com/flurie/tree-sitter-jq) |  | `H  JL` |  |  | @ObserverOfTime
-[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) |  | `H    ` |  |  | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) |  | `HFI L` |  |  | @steelsojka
-[json5](https://github.com/Joakker/tree-sitter-json5) |  | `H  J ` |  |  | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) |  | `HFIJL` |  | ✓ | @WhyNotHugo
-[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) |  | `HF  L` |  |  | @nawordar
-jsx (queries only)[^jsx] |  | `HFIJ ` |  |  | @steelsojka
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | community | `HFIJL` |  |  | @theHamsta
+[ispc](https://github.com/fab4100/tree-sitter-ispc) | community | `HFIJL` |  | ✓ | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` |  |  | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) | community | `HFIJL` |  |  | @p00f
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | core | `HFIJL` |  |  | @steelsojka
+[jq](https://github.com/flurie/tree-sitter-jq) | core | `H  JL` |  |  | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` |  |  | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` |  |  | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) | community | `H  J ` |  |  | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) | community | `HFIJL` |  | ✓ | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF  L` |  |  | @nawordar
+jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | core | `HFIJL` |  |  | @theHamsta
 [just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` |  |  | @Hubro
-[kconfig](https://github.com/amaanq/tree-sitter-kconfig) | stable | `HFIJL` |  |  | @amaanq
-[kdl](https://github.com/amaanq/tree-sitter-kdl) |  | `HFIJL` |  |  | @amaanq
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) |  | `HF JL` |  |  | @SalBakraa
+[kconfig](https://github.com/amaanq/tree-sitter-kconfig) | core | `HFIJL` |  |  | @amaanq
+[kdl](https://github.com/amaanq/tree-sitter-kdl) | core | `HFIJL` |  |  | @amaanq
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | community | `HF JL` |  |  | @SalBakraa
 [koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` |  |  | @irh
 [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` |  |  | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) |  | `H  JL` |  |  | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J ` | ✓ |  | @theHamsta, @clason
-[ledger](https://github.com/cbarrete/tree-sitter-ledger) |  | `HFIJ ` |  |  | @cbarrete
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `H  JL` |  |  | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | core | `HF J ` | ✓ |  | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` |  |  | @cbarrete
 [leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` |  |  | @r001
-[linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) | stable | `HFIJL` |  |  | @amaanq
+[linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) | core | `HFIJL` |  |  | @amaanq
 [liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J ` |  |  | @hankthetank27
 [liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFI L` |  |  | @toots
-[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) |  | `H    ` |  |  | @benwilliamgraham
-[lua](https://github.com/MunifTanjim/tree-sitter-lua) | core | `HFIJL` |  |  | @muniftanjim
-[luadoc](https://github.com/amaanq/tree-sitter-luadoc) |  | `H    ` |  |  | @amaanq
-[luap](https://github.com/amaanq/tree-sitter-luap)[^luap] |  | `H    ` |  |  | @amaanq
-[luau](https://github.com/amaanq/tree-sitter-luau) |  | `HFIJL` |  |  | @amaanq
-[m68k](https://github.com/grahambates/tree-sitter-m68k) |  | `HF JL` |  |  | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) |  | `HF J ` |  |  | @lewis6991
-[markdown](https://github.com/MDeiml/tree-sitter-markdown)[^markdown] | core | `HFIJ ` |  |  | @MDeiml
-[markdown_inline](https://github.com/MDeiml/tree-sitter-markdown)[^markdown_inline] | core | `H  J ` |  |  | @MDeiml
-[matlab](https://github.com/acristoffers/tree-sitter-matlab) |  | `HFIJL` |  |  | @acristoffers
-[menhir](https://github.com/Kerl13/tree-sitter-menhir) |  | `H  J ` |  |  | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `H    ` |  |  | 
-[meson](https://github.com/Decodetalkers/tree-sitter-meson) |  | `HFIJ ` |  |  | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H   L` | ✓ |  | @artagnon
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | community | `H    ` |  |  | @benwilliamgraham
+[lua](https://github.com/MunifTanjim/tree-sitter-lua) | stable | `HFIJL` |  |  | @muniftanjim
+[luadoc](https://github.com/amaanq/tree-sitter-luadoc) | core | `H    ` |  |  | @amaanq
+[luap](https://github.com/amaanq/tree-sitter-luap)[^luap] | core | `H    ` |  |  | @amaanq
+[luau](https://github.com/amaanq/tree-sitter-luau) | core | `HFIJL` |  |  | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) | community | `HF JL` |  |  | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) | core | `HF J ` |  |  | @lewis6991
+[markdown](https://github.com/MDeiml/tree-sitter-markdown)[^markdown] | stable | `HFIJ ` |  |  | @MDeiml
+[markdown_inline](https://github.com/MDeiml/tree-sitter-markdown)[^markdown_inline] | stable | `H  J ` |  |  | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) | community | `HFIJL` |  |  | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` |  |  | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `H    ` |  |  | 
+[meson](https://github.com/Decodetalkers/tree-sitter-meson) | community | `HFIJ ` |  |  | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | unsupported | `H   L` | ✓ |  | @artagnon
 [muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` |  |  | @Freed-Wu
-[nasm](https://github.com/naclsn/tree-sitter-nasm) | stable | `H  J ` |  |  | @ObserverOfTime
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unstable | `H I  ` |  |  | 
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | core | `H  J ` |  |  | @ObserverOfTime
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H I  ` |  |  | 
 [nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` |  |  | @aMOPel
 [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` |  |  | @aMOPel
-[ninja](https://github.com/alemuller/tree-sitter-ninja) |  | `HFI  ` |  |  | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) |  | `HF JL` |  |  | @leo60228
-[nqc](https://github.com/amaanq/tree-sitter-nqc) | stable | `HFIJL` |  |  | @amaanq
-[objc](https://github.com/amaanq/tree-sitter-objc) |  | `HFIJL` |  |  | @amaanq
+[ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFI  ` |  |  | @alemuller
+[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HF JL` |  |  | @leo60228
+[nqc](https://github.com/amaanq/tree-sitter-nqc) | core | `HFIJL` |  |  | @amaanq
+[objc](https://github.com/amaanq/tree-sitter-objc) | core | `HFIJL` |  |  | @amaanq
 [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` |  |  | @ColinKennedy
-[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJL` |  |  | @undu
-[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) |  | `HFIJL` |  |  | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) |  | `H  J ` | ✓ |  | @undu
-[odin](https://github.com/amaanq/tree-sitter-odin) |  | `HFIJL` |  |  | @amaanq
-[org](https://github.com/milisims/tree-sitter-org) | unstable | `     ` |  |  | 
-[pascal](https://github.com/Isopod/tree-sitter-pascal.git) |  | `HFIJL` |  |  | @Isopod
-[passwd](https://github.com/ath3/tree-sitter-passwd) |  | `H    ` |  |  | @amaanq
-[pem](https://github.com/ObserverOfTime/tree-sitter-pem) | stable | `HF J ` |  |  | @ObserverOfTime
-[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) |  | `HF J ` |  |  | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] |  | `HFIJL` |  |  | @tk-shirasaka
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] |  | `HFIJL` |  |  | @tk-shirasaka
-[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` |  | ✓ | @mikehaertl
-[pioasm](https://github.com/leo60228/tree-sitter-pioasm) |  | `H  J ` |  |  | @leo60228
-[po](https://github.com/erasin/tree-sitter-po) |  | `HF J ` |  |  | @amaanq
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | community | `HFIJL` |  |  | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | community | `HFIJL` |  |  | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` | ✓ |  | @undu
+[odin](https://github.com/amaanq/tree-sitter-odin) | core | `HFIJL` |  |  | @amaanq
+[org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` |  |  | 
+[pascal](https://github.com/Isopod/tree-sitter-pascal.git) | community | `HFIJL` |  |  | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` |  |  | @amaanq
+[pem](https://github.com/ObserverOfTime/tree-sitter-pem) | core | `HF J ` |  |  | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` |  |  | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | community | `HFIJL` |  |  | @tk-shirasaka
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | community | `HFIJL` |  |  | @tk-shirasaka
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unsupported | `H    ` |  | ✓ | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | community | `H  J ` |  |  | @leo60228
+[po](https://github.com/erasin/tree-sitter-po) | core | `HF J ` |  |  | @amaanq
 [pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` |  |  | @RabbiVeesh, @LeoNerd
-[poe_filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` |  |  | @ObserverOfTime
-[pony](https://github.com/amaanq/tree-sitter-pony) |  | `HFIJL` |  |  | @amaanq, @mfelsche
-[printf](https://github.com/ObserverOfTime/tree-sitter-printf) | stable | `H    ` |  |  | @ObserverOfTime
-[prisma](https://github.com/victorhqc/tree-sitter-prisma) |  | `HF   ` |  |  | @elianiva
-[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` |  |  | @MichaHoffmann
-[properties](https://github.com/ObserverOfTime/tree-sitter-properties)[^properties] | stable | `H  JL` |  |  | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) |  | `HF   ` |  |  | @treywood
-[prql](https://github.com/PRQL/tree-sitter-prql) |  | `H  J ` |  |  | @matthias-Q
-[psv](https://github.com/amaanq/tree-sitter-csv) | stable | `H    ` |  |  | @amaanq
-[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` |  |  | @zealot128
-[puppet](https://github.com/amaanq/tree-sitter-puppet) |  | `HFIJL` |  |  | @amaanq
+[poe_filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter)[^poe_filter] | unsupported | `HFIJ ` |  |  | @ObserverOfTime
+[pony](https://github.com/amaanq/tree-sitter-pony) | core | `HFIJL` |  |  | @amaanq, @mfelsche
+[printf](https://github.com/ObserverOfTime/tree-sitter-printf) | core | `H    ` |  |  | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `HF   ` |  |  | @elianiva
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unsupported | `H  J ` |  |  | @MichaHoffmann
+[properties](https://github.com/ObserverOfTime/tree-sitter-properties)[^properties] | core | `H  JL` |  |  | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) | community | `HF   ` |  |  | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) | core | `H  J ` |  |  | @matthias-Q
+[psv](https://github.com/amaanq/tree-sitter-csv) | core | `H    ` |  |  | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | unsupported | `H  J ` |  |  | @zealot128
+[puppet](https://github.com/amaanq/tree-sitter-puppet) | core | `HFIJL` |  |  | @amaanq
 [purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  JL` |  |  | @postsolar
-[pymanifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) | stable | `H  J ` |  |  | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) |  | `HFIJL` |  |  | @stsewd, @theHamsta
-[ql](https://github.com/tree-sitter/tree-sitter-ql) |  | `HFIJL` |  |  | @pwntester
-[qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) |  | `H  J ` |  |  | @amaanq
-[qmljs](https://github.com/yuja/tree-sitter-qmljs) |  | `HF J ` |  |  | @Decodetalkers
-[query](https://github.com/nvim-treesitter/tree-sitter-query)[^query] | core | `HFIJL` |  |  | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) |  | `H IJL` |  |  | @echasnovski
-[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J ` |  |  | 
-[rasi](https://github.com/Fymyte/tree-sitter-rasi) |  | `HFIJL` |  |  | @Fymyte
+[pymanifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) | core | `H  J ` |  |  | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` |  |  | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) | community | `HFIJL` |  |  | @pwntester
+[qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) | core | `H  J ` |  |  | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) | community | `HF J ` |  |  | @Decodetalkers
+[query](https://github.com/nvim-treesitter/tree-sitter-query)[^query] | stable | `HFIJL` |  |  | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` |  |  | @echasnovski
+[racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` |  |  | 
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` |  |  | @Fymyte
 [rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` |  |  | @joker1007
-[re2c](https://github.com/amaanq/tree-sitter-re2c) | stable | `HFIJL` |  |  | @amaanq
+[re2c](https://github.com/amaanq/tree-sitter-re2c) | core | `HFIJL` |  |  | @amaanq
 [readline](https://github.com/ribru17/tree-sitter-readline) | community | `HFIJ ` |  |  | @ribru17
-[regex](https://github.com/tree-sitter/tree-sitter-regex) |  | `H    ` |  |  | @theHamsta
-[rego](https://github.com/FallenAngel97/tree-sitter-rego) |  | `H  J ` |  |  | @FallenAngel97
-[requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) | stable | `H  J ` |  |  | @ObserverOfTime
-[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) |  | `HF J ` |  |  | @bamonroe
+[regex](https://github.com/tree-sitter/tree-sitter-regex) | stable | `H    ` |  |  | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) | community | `H  J ` |  |  | @FallenAngel97
+[requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) | core | `H  J ` |  |  | @ObserverOfTime
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | community | `HF J ` |  |  | @bamonroe
 [robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFI  ` |  |  | @Hubro
 [roc](https://github.com/nat-418/tree-sitter-roc) | community | `H  JL` |  |  | @nat-418
-[ron](https://github.com/amaanq/tree-sitter-ron) |  | `HFIJL` |  |  | @amaanq
-[rst](https://github.com/stsewd/tree-sitter-rst) |  | `H  JL` |  |  | @stsewd
-[ruby](https://github.com/tree-sitter/tree-sitter-ruby) |  | `HFIJL` |  |  | @TravonteD
-[rust](https://github.com/tree-sitter/tree-sitter-rust) |  | `HFIJL` |  |  | @amaanq
-[scala](https://github.com/tree-sitter/tree-sitter-scala) |  | `HF JL` |  |  | @stevanmilic
+[ron](https://github.com/amaanq/tree-sitter-ron) | core | `HFIJL` |  |  | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) | core | `H  JL` |  |  | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | community | `HFIJL` |  |  | @TravonteD
+[rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` |  |  | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) | community | `HF JL` |  |  | @stevanmilic
 [scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` | ✓ |  | @WhyNotHugo
-[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` |  |  | 
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` |  |  | 
 [scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFI  ` |  |  | @elianiva
-[slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unstable | `HFIJL` |  | ✓ | @theHamsta
+[slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unsupported | `HFIJL` |  | ✓ | @theHamsta
 [slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` |  |  | @hunger
-[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | community | `HFIJL` |  |  | @amaanq
-[smithy](https://github.com/indoorvivants/tree-sitter-smithy) |  | `H    ` |  |  | @amaanq, @keynmol
-[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` |  |  | 
-[solidity](https://github.com/JoranHonig/tree-sitter-solidity) |  | `HF   ` |  |  | @amaanq
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` |  |  | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | core | `H    ` |  |  | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unsupported | `HFIJL` |  |  | 
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | core | `HF   ` |  |  | @amaanq
 [soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  |  | @aheber
-[sosl](https://github.com/aheber/tree-sitter-sfapex) |  | `H    ` |  |  | @aheber
+[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  |  | @aheber
 [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` |  |  | @Sarrus1
-[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) |  | `HFIJL` |  |  | @BonaBeavis
-[sql](https://github.com/derekstride/tree-sitter-sql) |  | `H IJ ` |  |  | @derekstride
-[squirrel](https://github.com/amaanq/tree-sitter-squirrel) |  | `HFIJL` |  |  | @amaanq
-[ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) | stable | `HFIJL` |  |  | @ObserverOfTime
-[starlark](https://github.com/amaanq/tree-sitter-starlark) |  | `HFIJL` |  |  | @amaanq
-[strace](https://github.com/sigmaSd/tree-sitter-strace) | stable | `H  J ` |  |  | @amaanq
+[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) | community | `HFIJL` |  |  | @BonaBeavis
+[sql](https://github.com/derekstride/tree-sitter-sql) | community | `H IJ ` |  |  | @derekstride
+[squirrel](https://github.com/amaanq/tree-sitter-squirrel) | core | `HFIJL` |  |  | @amaanq
+[ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) | core | `HFIJL` |  |  | @ObserverOfTime
+[starlark](https://github.com/amaanq/tree-sitter-starlark) | core | `HFIJL` |  |  | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | core | `H  J ` |  |  | @amaanq
 [styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` |  |  | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) |  | `HFIJL` |  |  | @madskjeldgaard
-[surface](https://github.com/connorlay/tree-sitter-surface) |  | `HFIJ ` |  |  | @connorlay
-[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | stable | `HFIJL` |  |  | @amaanq
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) |  | `H I L` | ✓ |  | @alex-pinkus
-[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) |  | `HF J ` |  |  | @RaafatTurki
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` |  |  | @madskjeldgaard
+[surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` |  |  | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` |  |  | @amaanq
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H I L` | ✓ |  | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` |  |  | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` |  |  | @ok-ryoko
 [t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJL` |  |  | @xasc
-[tablegen](https://github.com/amaanq/tree-sitter-tablegen) |  | `HFIJL` |  |  | @amaanq
-[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | stable | `HFI  ` |  |  | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) |  | `HFIJL` | ✓ |  | @euclidianAce
+[tablegen](https://github.com/amaanq/tree-sitter-tablegen) | core | `HFIJL` |  |  | @amaanq
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFI  ` |  |  | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | ✓ |  | @euclidianAce
 [templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  |  | @vrischmann
 [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  |  | @MichaHoffmann
 [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI  ` |  |  | @Porter
-[thrift](https://github.com/duskmoon314/tree-sitter-thrift) |  | `HFIJL` |  |  | @amaanq, @duskmoon314
-[tiger](https://github.com/ambroisie/tree-sitter-tiger) |  | `HFIJL` |  |  | @ambroisie
-[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) |  | `HF JL` |  |  | @ahelwer, @susliko
+[thrift](https://github.com/duskmoon314/tree-sitter-thrift) | core | `HFIJL` |  |  | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) | community | `HFIJL` |  |  | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | community | `HF JL` |  |  | @ahelwer, @susliko
 [tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` |  |  | @Freed-Wu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | unstable | `H    ` |  |  | @arnarg
-[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) |  | `HFIJL` |  | ✓ | @tk-shirasaka
-[tsv](https://github.com/amaanq/tree-sitter-csv) | stable | `H    ` |  |  | @amaanq
-[tsx](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJL` |  | ✓ | @steelsojka
-[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) |  | `HFIJL` |  |  | @BonaBeavis
-[twig](https://github.com/gbprod/tree-sitter-twig) |  | `H  J ` |  |  | @gbprod
-[typescript](https://github.com/tree-sitter/tree-sitter-typescript) |  | `HFIJL` |  | ✓ | @steelsojka
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | unsupported | `H    ` |  |  | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | community | `HFIJL` |  | ✓ | @tk-shirasaka
+[tsv](https://github.com/amaanq/tree-sitter-csv) | core | `H    ` |  |  | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | ✓ | @steelsojka
+[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) | community | `HFIJL` |  |  | @BonaBeavis
+[twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` |  |  | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | ✓ | @steelsojka
 [typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` |  |  | @Teddytrombone
 [typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` |  |  | @uben0, @RaafatTurki
-[udev](https://github.com/ObserverOfTime/tree-sitter-udev) | stable | `H  JL` |  |  | @ObserverOfTime
-[ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) |  | `HFIJL` |  |  | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `H  J ` | ✓ |  | @tapegram
-[usd](https://github.com/ColinKennedy/tree-sitter-usd) |  | `HFI L` |  |  | @ColinKennedy
-[uxntal](https://github.com/amaanq/tree-sitter-uxntal) |  | `HFIJL` |  |  | @amaanq
-[v](https://github.com/vlang/v-analyzer) |  | `HFIJL` |  |  | @kkharji, @amaanq
-[vala](https://github.com/vala-lang/tree-sitter-vala) |  | `HF   ` |  |  | @Prince781
+[udev](https://github.com/ObserverOfTime/tree-sitter-udev) | core | `H  JL` |  |  | @ObserverOfTime
+[ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) | community | `HFIJL` |  |  | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | unsupported | `H  J ` | ✓ |  | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFI L` |  |  | @ColinKennedy
+[uxntal](https://github.com/amaanq/tree-sitter-uxntal) | core | `HFIJL` |  |  | @amaanq
+[v](https://github.com/vlang/v-analyzer) | community | `HFIJL` |  |  | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF   ` |  |  | @Prince781
 [vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` |  |  | @wrapperup, @oscarotero
-[verilog](https://github.com/tree-sitter/tree-sitter-verilog) |  | `HF JL` |  |  | @zegervdv
-[vhs](https://github.com/charmbracelet/tree-sitter-vhs) |  | `H    ` |  |  | @caarlos0
-[vim](https://github.com/neovim/tree-sitter-vim) | core | `HF JL` |  |  | @clason
-[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | core | `H  J ` |  |  | @clason
-[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | stable | `HFIJ ` |  |  | @WhyNotHugo, @lucario387
-[wgsl](https://github.com/szebniok/tree-sitter-wgsl) |  | `HFI  ` |  |  | @szebniok
-[wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) |  | `HFI  ` |  | ✓ | @theHamsta
+[verilog](https://github.com/tree-sitter/tree-sitter-verilog) | community | `HF JL` |  |  | @zegervdv
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H    ` |  |  | @caarlos0
+[vim](https://github.com/neovim/tree-sitter-vim) | stable | `HF JL` |  |  | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | stable | `H  J ` |  |  | @clason
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | core | `HFIJ ` |  |  | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | community | `HFI  ` |  |  | @szebniok
+[wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) | core | `HFI  ` |  | ✓ | @theHamsta
 [wing](https://github.com/winglang/tree-sitter-wing) | community | `HF  L` |  |  | @gshpychka, @MarkMcCulloh
 [wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J ` |  |  | @liamwh
-[xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) | stable | `H  JL` |  |  | @ObserverOfTime
-[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | stable | `HFIJL` |  |  | @ObserverOfTime
-[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | stable | `HFIJL` |  |  | @amaanq
-[yang](https://github.com/Hubro/tree-sitter-yang) |  | `HFIJ ` |  |  | @Hubro
-[yuck](https://github.com/Philipp-M/tree-sitter-yuck) |  | `HFIJL` |  |  | @Philipp-M, @amaanq
+[xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) | core | `H  JL` |  |  | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` |  |  | @ObserverOfTime
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` |  |  | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` |  |  | @Hubro
+[yuck](https://github.com/Philipp-M/tree-sitter-yuck) | community | `HFIJL` |  |  | @Philipp-M, @amaanq
 [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` |  |  | @Freed-Wu
-[zig](https://github.com/maxxnino/tree-sitter-zig) |  | `HFIJL` |  |  | @maxxnino
+[zig](https://github.com/maxxnino/tree-sitter-zig) | community | `HFIJL` |  |  | @maxxnino
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gdscript]: Godot
-[^git_config]: git_config
 [^glimmer]: Glimmer and Ember
 [^godot_resource]: Godot Resources
 [^html_tags]: queries required by html, astro, vue, svelte
diff --git a/TODO.md b/TODO.md
index bf817fc4b..ff2b05001 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,16 +4,15 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
-- [ ] **`query_predicates.lua`:** upstream/remove
-- [ ] **`parsers.lua`:** assign tiers
-- [ ] **`parsers.lua`:** modularize?
 - [ ] **`locals.lua`:** move to `nvim-treesitter-refactor`?
+- [ ] **`parsers.lua`:** include revision? (<https://stackoverflow.com/questions/64260981>)
 - [ ] **update-lockfile:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **update-lockfile:** one commit per parser/tier?
+- [ ] **tests:** fix, update, extend (cover all Tier 1 languages)
 - [ ] **documentation:** consolidate, autogenerate?
 - [ ] **documentation:** migration guide
 - [ ] **textobjects:** include simple(!) function, queries? (check Helix)
-- [ ] **downstream:** adapt to breaking changes (`nvim-treesitter-textobjects`, `nvim-treesitter-refactor`)
+- [ ] **downstream:** adapt to breaking changes (`nvim-treesitter-refactor`)
 
 ## DONE
 
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 5a7c8e8ec..7ffb23a46 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -10,7 +10,7 @@ local M = {}
 local config = {
   auto_install = false,
   ensure_install = {},
-  ignore_install = {},
+  ignore_install = { 'unsupported' },
   install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
 }
 
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 9f99f0cfe..11dfe1a90 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -95,11 +95,6 @@ local function get_target_revision(lang)
     lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string, LockfileInfo>]]
   end
 
-  local install_info = get_parser_install_info(lang)
-  if install_info.revision then
-    return install_info.revision
-  end
-
   if lockfile[lang] then
     return lockfile[lang].revision
   end
@@ -437,7 +432,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
       logger:error('Node JS not found: `node` is not executable')
     end
 
-    local revision = repo.revision or get_target_revision(lang)
+    local revision = get_target_revision(lang)
 
     local maybe_local_path = fs.normalize(repo.url)
     local from_local_path = vim.fn.isdirectory(maybe_local_path) == 1
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7f0041e36..a057498f4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1,23 +1,21 @@
 ---@class InstallInfo
 ---@field url string
 ---@field branch string|nil
----@field revision string|nil
 ---@field files string[]
 ---@field generate_requires_npm boolean|nil
 ---@field requires_generate_from_grammar boolean|nil
 ---@field location string|nil
 
 ---@class ParserInfo
----@field install_info InstallInfo
----@field filetype string[]
----@field maintainers string[]
----@field requires string[]
----@field tier integer|nil
----@field readme_note string|nil
+---@field install_info InstallInfo?
+---@field maintainers string[]?
+---@field requires string[]?
+---@field tier integer
+---@field readme_note string|nil?
 
 local M = {}
 
-M.tiers = { 'core', 'stable', 'community', 'unstable' }
+M.tiers = { 'stable', 'core', 'community', 'unsupported' }
 
 ---@type table<string,ParserInfo>
 M.configs = {
@@ -27,6 +25,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@briot' },
+    tier = 3,
   },
 
   agda = {
@@ -35,6 +34,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@Decodetalkers' },
+    tier = 3,
   },
 
   angular = {
@@ -65,6 +65,7 @@ M.configs = {
     },
     maintainers = { '@ObserverOfTime' },
     requires = { 'cpp' },
+    tier = 2,
   },
 
   asm = {
@@ -83,6 +84,7 @@ M.configs = {
     },
     maintainers = { '@virchau13' },
     requires = { 'html', 'html_tags' },
+    tier = 3,
   },
 
   authzed = {
@@ -99,6 +101,7 @@ M.configs = {
       url = 'https://github.com/Beaglefoot/tree-sitter-awk',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
+    tier = 4,
   },
 
   bash = {
@@ -107,6 +110,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@TravonteD' },
+    tier = 3,
   },
 
   bass = {
@@ -115,6 +119,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   beancount = {
@@ -123,6 +128,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@polarmutex' },
+    tier = 3,
   },
 
   bibtex = {
@@ -131,7 +137,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta', '@clason' },
-    tier = 3,
+    tier = 2,
   },
 
   bicep = {
@@ -140,6 +146,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   bitbake = {
@@ -200,6 +207,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 3,
   },
 
   cairo = {
@@ -226,6 +234,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   chatito = {
@@ -234,6 +243,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
+    tier = 2,
   },
 
   circom = {
@@ -251,6 +261,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@NoahTheDuke' },
+    tier = 3,
   },
 
   cmake = {
@@ -259,6 +270,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@uyha' },
+    tier = 4,
   },
 
   comment = {
@@ -277,6 +289,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@theHamsta' },
+    tier = 2,
   },
 
   cooklang = {
@@ -303,6 +316,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   cpp = {
@@ -313,6 +327,7 @@ M.configs = {
     },
     maintainers = { '@theHamsta' },
     requires = { 'c' },
+    tier = 1,
   },
 
   css = {
@@ -321,6 +336,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@TravonteD' },
+    tier = 3,
   },
 
   csv = {
@@ -342,6 +358,7 @@ M.configs = {
     },
     maintainers = { '@theHamsta' },
     requires = { 'cpp' },
+    tier = 2,
   },
 
   cue = {
@@ -350,6 +367,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   cylc = {
@@ -376,6 +394,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@akinsho' },
+    tier = 4,
   },
 
   desktop = {
@@ -393,6 +412,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@jedrzejboczar' },
+    tier = 3,
   },
 
   dhall = {
@@ -401,6 +421,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   diff = {
@@ -409,6 +430,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@gbprod' },
+    tier = 3,
   },
 
   disassembly = {
@@ -435,6 +457,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@camdencheek' },
+    tier = 3,
   },
 
   dot = {
@@ -443,6 +466,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@rydesun' },
+    tier = 3,
   },
 
   doxygen = {
@@ -485,7 +509,7 @@ M.configs = {
   ecma = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, typescript, tsx, qmljs',
-    tier = 3,
+    tier = 2,
   },
 
   editorconfig = {
@@ -512,6 +536,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@connorlay' },
+    tier = 3,
   },
 
   elixir = {
@@ -520,6 +545,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@connorlay' },
+    tier = 3,
   },
 
   elm = {
@@ -528,6 +554,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@zweimach' },
+    tier = 4,
   },
 
   elsa = {
@@ -536,6 +563,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@glapa-grossklag', '@amaanq' },
+    tier = 2,
   },
 
   elvish = {
@@ -544,6 +572,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@elves' },
+    tier = 3,
   },
 
   embedded_template = {
@@ -569,6 +598,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/parser.c' },
     },
     maintainers = { '@filmor' },
+    tier = 3,
   },
 
   facility = {
@@ -596,6 +626,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@alexmozaidze' },
+    tier = 3,
   },
 
   fidl = {
@@ -613,6 +644,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   fish = {
@@ -621,6 +653,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@ram02z' },
+    tier = 3,
   },
 
   foam = {
@@ -629,7 +662,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@FoamScience' },
-    tier = 4,
+    tier = 3,
   },
 
   forth = {
@@ -647,6 +680,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   fsh = {
@@ -655,6 +689,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@mgramigna' },
+    tier = 3,
   },
 
   fsharp = {
@@ -673,6 +708,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   fusion = {
@@ -681,6 +717,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@jirgn' },
+    tier = 3,
   },
 
   gap = {
@@ -711,6 +748,7 @@ M.configs = {
     },
     maintainers = { '@PrestonKnopp' },
     readme_note = 'Godot',
+    tier = 3,
   },
 
   gdshader = {
@@ -728,6 +766,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@gbprod' },
+    tier = 3,
   },
 
   gitattributes = {
@@ -736,6 +775,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
+    tier = 2,
   },
 
   gitcommit = {
@@ -744,6 +784,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@gbprod' },
+    tier = 3,
   },
 
   git_config = {
@@ -752,7 +793,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
-    readme_note = 'git_config',
+    tier = 2,
   },
 
   gitignore = {
@@ -761,6 +802,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta' },
+    tier = 2,
   },
 
   gleam = {
@@ -769,6 +811,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   glimmer = {
@@ -778,6 +821,7 @@ M.configs = {
     },
     maintainers = { '@NullVoxPopuli' },
     readme_note = 'Glimmer and Ember',
+    tier = 3,
   },
 
   glimmer_javascript = {
@@ -810,6 +854,7 @@ M.configs = {
     },
     maintainers = { '@theHamsta' },
     requires = { 'c' },
+    tier = 2,
   },
 
   gn = {
@@ -837,6 +882,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
+    tier = 1,
   },
 
   goctl = {
@@ -855,6 +901,7 @@ M.configs = {
     },
     maintainers = { '@pierpo' },
     readme_note = 'Godot Resources',
+    tier = 3,
   },
 
   gomod = {
@@ -863,6 +910,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@camdencheek' },
+    tier = 3,
   },
 
   gosum = {
@@ -871,6 +919,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   gowork = {
@@ -879,6 +928,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@omertuc' },
+    tier = 3,
   },
 
   graphql = {
@@ -887,6 +937,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@bkegley' },
+    tier = 3,
   },
 
   gotmpl = {
@@ -948,6 +999,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   haskell = {
@@ -964,8 +1016,8 @@ M.configs = {
       url = 'https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
-    filetype = 'haskell.persistent',
     maintainers = { '@lykahb' },
+    tier = 3,
   },
 
   hcl = {
@@ -974,6 +1026,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@MichaHoffmann' },
+    tier = 3,
   },
 
   heex = {
@@ -982,6 +1035,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@connorlay' },
+    tier = 3,
   },
 
   helm = {
@@ -1002,6 +1056,7 @@ M.configs = {
     },
     maintainers = { '@winston0410' },
     requires = { 'json' },
+    tier = 3,
   },
 
   hlsl = {
@@ -1012,6 +1067,7 @@ M.configs = {
     },
     maintainers = { '@theHamsta' },
     requires = { 'cpp' },
+    tier = 2,
   },
 
   hlsplaylist = {
@@ -1030,6 +1086,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@antosha417' },
+    tier = 4,
   },
 
   hoon = {
@@ -1044,6 +1101,7 @@ M.configs = {
   html_tags = {
     maintainers = { '@TravonteD' },
     readme_note = 'queries required by html, astro, vue, svelte',
+    tier = 3,
   },
 
   html = {
@@ -1053,6 +1111,7 @@ M.configs = {
     },
     maintainers = { '@TravonteD' },
     requires = { 'html_tags' },
+    tier = 3,
   },
 
   htmldjango = {
@@ -1070,6 +1129,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
+    tier = 2,
   },
 
   hurl = {
@@ -1143,6 +1203,7 @@ M.configs = {
     },
     maintainers = { '@fab4100' },
     requires = { 'c' },
+    tier = 3,
   },
 
   janet_simple = {
@@ -1151,6 +1212,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@sogaiu' },
+    tier = 3,
   },
 
   java = {
@@ -1159,6 +1221,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@p00f' },
+    tier = 3,
   },
 
   javadoc = {
@@ -1177,6 +1240,7 @@ M.configs = {
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma', 'jsx' },
+    tier = 2,
   },
 
   jinja = {
@@ -1207,6 +1271,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
+    tier = 2,
   },
 
   jsdoc = {
@@ -1215,6 +1280,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@steelsojka' },
+    tier = 2,
   },
 
   json = {
@@ -1223,6 +1289,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@steelsojka' },
+    tier = 2,
   },
 
   json5 = {
@@ -1231,6 +1298,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@Joakker' },
+    tier = 3,
   },
 
   jsonc = {
@@ -1241,6 +1309,7 @@ M.configs = {
     },
     maintainers = { '@WhyNotHugo' },
     requires = { 'json' },
+    tier = 3,
   },
 
   jsonnet = {
@@ -1249,11 +1318,13 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@nawordar' },
+    tier = 3,
   },
 
   jsx = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, tsx',
+    tier = 2,
   },
 
   julia = {
@@ -1298,6 +1369,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   kotlin = {
@@ -1306,6 +1378,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@SalBakraa' },
+    tier = 3,
   },
 
   koto = {
@@ -1332,6 +1405,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@traxys' },
+    tier = 3,
   },
 
   latex = {
@@ -1341,7 +1415,7 @@ M.configs = {
       requires_generate_from_grammar = true,
     },
     maintainers = { '@theHamsta', '@clason' },
-    tier = 3,
+    tier = 2,
   },
 
   ledger = {
@@ -1350,6 +1424,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@cbarrete' },
+    tier = 3,
   },
 
   leo = {
@@ -1367,6 +1442,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@benwilliamgraham' },
+    tier = 3,
   },
 
   linkerscript = {
@@ -1411,6 +1487,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   luap = {
@@ -1420,6 +1497,7 @@ M.configs = {
     },
     maintainers = { '@amaanq' },
     readme_note = 'Lua patterns',
+    tier = 2,
   },
 
   luau = {
@@ -1429,6 +1507,7 @@ M.configs = {
     },
     maintainers = { '@amaanq' },
     requires = { 'lua' },
+    tier = 2,
   },
 
   m68k = {
@@ -1437,6 +1516,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@grahambates' },
+    tier = 3,
   },
 
   make = {
@@ -1445,6 +1525,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@lewis6991' },
+    tier = 2,
   },
 
   markdown = {
@@ -1476,6 +1557,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@acristoffers' },
+    tier = 3,
   },
 
   menhir = {
@@ -1484,6 +1566,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@Kerl13' },
+    tier = 3,
   },
 
   mermaid = {
@@ -1500,6 +1583,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@Decodetalkers' },
+    tier = 3,
   },
 
   mlir = {
@@ -1572,6 +1656,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@alemuller' },
+    tier = 3,
   },
 
   nix = {
@@ -1580,6 +1665,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@leo60228' },
+    tier = 3,
   },
 
   nqc = {
@@ -1607,6 +1693,7 @@ M.configs = {
     },
     maintainers = { '@amaanq' },
     requires = { 'c' },
+    tier = 2,
   },
 
   objdump = {
@@ -1625,6 +1712,7 @@ M.configs = {
       location = 'grammars/ocaml',
     },
     maintainers = { '@undu' },
+    tier = 3,
   },
 
   ocaml_interface = {
@@ -1635,6 +1723,7 @@ M.configs = {
     },
     maintainers = { '@undu' },
     requires = { 'ocaml' },
+    tier = 3,
   },
 
   ocamllex = {
@@ -1644,6 +1733,7 @@ M.configs = {
       requires_generate_from_grammar = true,
     },
     maintainers = { '@undu' },
+    tier = 3,
   },
 
   odin = {
@@ -1652,6 +1742,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   pascal = {
@@ -1660,6 +1751,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@Isopod' },
+    tier = 3,
   },
 
   passwd = {
@@ -1668,6 +1760,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 3,
   },
 
   pem = {
@@ -1686,6 +1779,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
+    tier = 3,
   },
 
   php = {
@@ -1697,6 +1791,7 @@ M.configs = {
     maintainers = { '@tk-shirasaka', '@calebdw' },
     requires = { 'php_only' },
     readme_note = 'PHP with embedded HTML',
+    tier = 3,
   },
 
   php_only = {
@@ -1707,6 +1802,7 @@ M.configs = {
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
     readme_note = 'PHP without embedded HTML',
+    tier = 3,
   },
 
   phpdoc = {
@@ -1725,6 +1821,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@leo60228' },
+    tier = 3,
   },
 
   po = {
@@ -1733,6 +1830,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   pod = {
@@ -1761,6 +1859,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq', '@mfelsche' },
+    tier = 2,
   },
 
   powershell = {
@@ -1788,6 +1887,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@elianiva' },
+    tier = 3,
   },
 
   problog = {
@@ -1827,6 +1927,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@treywood' },
+    tier = 3,
   },
 
   promql = {
@@ -1844,6 +1945,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@matthias-Q' },
+    tier = 2,
   },
 
   psv = {
@@ -1872,6 +1974,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   purescript = {
@@ -1899,6 +2002,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@stsewd', '@theHamsta' },
+    tier = 1,
   },
 
   ql = {
@@ -1907,6 +2011,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@pwntester' },
+    tier = 3,
   },
 
   qmldir = {
@@ -1915,6 +2020,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   qmljs = {
@@ -1924,6 +2030,7 @@ M.configs = {
     },
     maintainers = { '@Decodetalkers' },
     requires = { 'ecma' },
+    tier = 3,
   },
 
   query = {
@@ -1968,6 +2075,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@Fymyte' },
+    tier = 3,
   },
 
   razor = {
@@ -2012,6 +2120,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta' },
+    tier = 1,
   },
 
   rego = {
@@ -2020,6 +2129,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@FallenAngel97' },
+    tier = 3,
   },
 
   requirements = {
@@ -2047,6 +2157,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@bamonroe' },
+    tier = 3,
   },
 
   robot = {
@@ -2082,6 +2193,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   rst = {
@@ -2090,6 +2202,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@stsewd' },
+    tier = 2,
   },
 
   ruby = {
@@ -2098,6 +2211,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@TravonteD' },
+    tier = 3,
   },
 
   runescript = {
@@ -2115,6 +2229,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   scala = {
@@ -2123,6 +2238,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@stevanmilic' },
+    tier = 3,
   },
 
   scfg = {
@@ -2198,7 +2314,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
 
   snakemake = {
@@ -2216,6 +2332,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq', '@keynmol' },
+    tier = 2,
   },
 
   solidity = {
@@ -2224,7 +2341,9 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
+
   soql = {
     install_info = {
       url = 'https://github.com/aheber/tree-sitter-sfapex',
@@ -2242,6 +2361,7 @@ M.configs = {
       location = 'sosl',
     },
     maintainers = { '@aheber', '@xixiafinland' },
+    tier = 3,
   },
 
   sourcepawn = {
@@ -2259,6 +2379,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@GordianDziwis' },
+    tier = 3,
   },
 
   sql = {
@@ -2268,6 +2389,7 @@ M.configs = {
       branch = 'gh-pages',
     },
     maintainers = { '@derekstride' },
+    tier = 3,
   },
 
   squirrel = {
@@ -2276,6 +2398,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   ssh_config = {
@@ -2293,6 +2416,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   strace = {
@@ -2319,6 +2443,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@madskjeldgaard' },
+    tier = 3,
   },
 
   superhtml = {
@@ -2337,6 +2462,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@connorlay' },
+    tier = 3,
   },
 
   svelte = {
@@ -2365,6 +2491,7 @@ M.configs = {
       requires_generate_from_grammar = true,
     },
     maintainers = { '@alex-pinkus' },
+    tier = 3,
   },
 
   sxhkdrc = {
@@ -2373,6 +2500,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@RaafatTurki' },
+    tier = 3,
   },
 
   systemtap = {
@@ -2399,6 +2527,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   tact = {
@@ -2417,6 +2546,7 @@ M.configs = {
       requires_generate_from_grammar = true,
     },
     maintainers = { '@euclidianAce' },
+    tier = 3,
   },
 
   templ = {
@@ -2472,6 +2602,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq', '@duskmoon314' },
+    tier = 2,
   },
 
   tiger = {
@@ -2480,6 +2611,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@ambroisie' },
+    tier = 3,
   },
 
   tlaplus = {
@@ -2488,6 +2620,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@ahelwer', '@susliko' },
+    tier = 3,
   },
 
   tmux = {
@@ -2515,6 +2648,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@tk-shirasaka' },
+    tier = 3,
   },
 
   tsv = {
@@ -2536,6 +2670,7 @@ M.configs = {
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma', 'jsx', 'typescript' },
+    tier = 2,
   },
 
   turtle = {
@@ -2544,6 +2679,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@GordianDziwis' },
+    tier = 3,
   },
 
   twig = {
@@ -2552,6 +2688,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@gbprod' },
+    tier = 3,
   },
 
   typescript = {
@@ -2563,6 +2700,7 @@ M.configs = {
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma' },
+    tier = 2,
   },
 
   typespec = {
@@ -2607,6 +2745,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@Philipp-M', '@amaanq' },
+    tier = 3,
   },
 
   unison = {
@@ -2625,6 +2764,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@ColinKennedy' },
+    tier = 3,
   },
 
   uxntal = {
@@ -2633,6 +2773,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
+    tier = 2,
   },
 
   v = {
@@ -2642,6 +2783,7 @@ M.configs = {
       location = 'tree_sitter_v',
     },
     maintainers = { '@kkharji', '@amaanq' },
+    tier = 3,
   },
 
   vala = {
@@ -2650,6 +2792,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@Prince781' },
+    tier = 3,
   },
 
   vento = {
@@ -2667,6 +2810,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@zhangwwpeng' },
+    tier = 3,
   },
 
   vhdl = {
@@ -2684,6 +2828,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@caarlos0' },
+    tier = 3,
   },
 
   vim = {
@@ -2739,6 +2884,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@szebniok' },
+    tier = 3,
   },
 
   wgsl_bevy = {
@@ -2748,6 +2894,7 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@theHamsta' },
+    tier = 2,
   },
 
   wit = {
@@ -2803,6 +2950,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@Hubro' },
+    tier = 3,
   },
 
   yuck = {
@@ -2811,6 +2959,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@Philipp-M', '@amaanq' },
+    tier = 3,
   },
 
   zathurarc = {
diff --git a/scripts/update-lockfile.lua b/scripts/update-lockfile.lua
index e07cf416f..0c9288b6a 100755
--- a/scripts/update-lockfile.lua
+++ b/scripts/update-lockfile.lua
@@ -4,7 +4,7 @@ local util = require('nvim-treesitter.util')
 
 -- Load previous lockfile
 local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
--- local old_lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,{revision:string}>]]
+local old_lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,{revision:string}>]]
 
 ---@type table<string,{revision:string}>
 local new_lockfile = {}
@@ -15,9 +15,10 @@ local jobs = {} --- @type table<string,SystemObj>
 
 -- check for new revisions
 for k, p in pairs(parsers) do
-  if not p.install_info then
+  if p.tier == 4 then
+    new_lockfile[k] = old_lockfile[k]
     print('Skipping ' .. k)
-  else
+  elseif p.install_info then
     jobs[k] = vim.system({ 'git', 'ls-remote', p.install_info.url })
   end
 

From 041f117fb182acb56831a204c286622fb43574c1 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 12 Jun 2023 15:58:43 +0100
Subject: [PATCH 2287/2704] fix: filter languages through parser.configs

---
 lua/nvim-treesitter/config.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 7ffb23a46..c216a0b15 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -86,7 +86,7 @@ end
 
 ---Normalize languages
 ---@param languages? string[]|string
----@param skip? table
+---@param skip? { ignored: boolean, missing: boolean, installed: boolean, dependencies: boolean }
 ---@return string[]
 function M.norm_languages(languages, skip)
   if not languages then
@@ -103,7 +103,6 @@ function M.norm_languages(languages, skip)
     end
     languages = parsers.get_available()
   end
-  --TODO(clason): skip and warn on unavailable parser
 
   -- keep local to avoid leaking parsers module
   local function expand_tiers(list)
@@ -142,6 +141,11 @@ function M.norm_languages(languages, skip)
     end, languages) --[[@as string[] ]]
   end
 
+  languages = vim.iter.filter(function(v)
+    -- TODO(lewis6991): warn of any unknown parsers?
+    return parsers.configs[v] ~= nil
+  end, languages) --[[@as string[] ]]
+
   if not (skip and skip.dependencies) then
     for _, lang in pairs(languages) do
       if parsers.configs[lang].requires then

From 934b751f9d1075ef31cdbcd5e1342fe96396c74d Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 12 Jun 2023 16:18:25 +0100
Subject: [PATCH 2288/2704] fix: check queries in needs_update()

---
 lua/nvim-treesitter/install.lua | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 11dfe1a90..af95fdeed 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -111,7 +111,16 @@ end
 ---@return boolean
 local function needs_update(lang)
   local revision = get_target_revision(lang)
-  return not revision or revision ~= get_installed_revision(lang)
+  if revision then
+    return revision ~= get_installed_revision(lang)
+  end
+
+  -- No revision. Check the queries link to the same place
+
+  local queries = fs.joinpath(config.get_install_dir('queries'), lang)
+  local queries_src = M.get_package_path('runtime', 'queries', lang)
+
+  return uv.fs_realpath(queries) ~= uv.fs_realpath(queries_src)
 end
 
 ---

From b4c9c81a80818dd6499e0777278b1c318d1aac9a Mon Sep 17 00:00:00 2001
From: TheLeoP <eugenio2305@hotmail.com>
Date: Thu, 15 Jun 2023 06:43:05 -0500
Subject: [PATCH 2289/2704] fix: check if config has install_info in filter

---
 lua/nvim-treesitter/parsers.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a057498f4..026c8d1d6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -3015,7 +3015,8 @@ function M.get_available(tier)
   end
   if vim.fn.executable('tree-sitter') == 0 or vim.fn.executable('node') == 0 then
     parsers = vim.iter.filter(function(p)
-      return not M.configs[p].install_info.requires_generate_from_grammar
+      return M.configs[p].install_info
+        and not M.configs[p].install_info.requires_generate_from_grammar
     end, parsers) --[[@as string[] ]]
   end
   return parsers

From dd6ec132684fccb32de3713ad94b8aa4f8795fe6 Mon Sep 17 00:00:00 2001
From: TheLeoP <eugenio2305@hotmail.com>
Date: Thu, 15 Jun 2023 07:40:39 -0500
Subject: [PATCH 2290/2704] fix: always normalize paths

Not doing this results in paths with a mix of '\\' and '/' for Windows.
This isn't a problem when dealing with Neovim/luv APIs, but it is a
problem when comparing strings.
---
 lua/nvim-treesitter/health.lua  | 2 +-
 lua/nvim-treesitter/install.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 099e766da..1d6400977 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -110,7 +110,7 @@ local function install_health()
   end
   if
     vim.iter(vim.api.nvim_list_runtime_paths()):any(function(p)
-      if installdir == p .. '/' then
+      if installdir == vim.fs.normalize(p) .. '/' then
         return true
       end
     end)
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index af95fdeed..ff5cff036 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -562,7 +562,7 @@ local function install(languages, options, _callback)
     return
   end
 
-  local cache_dir = vim.fn.stdpath('cache')
+  local cache_dir = vim.fs.normalize(vim.fn.stdpath('cache'))
   local install_dir = config.get_install_dir('parser')
 
   if not languages or type(languages) == 'string' then

From f13420ccff1dfca4a2e42c43f56f66b240dd1d2e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 24 Jun 2023 14:33:45 +0200
Subject: [PATCH 2291/2704] fix: remove upstreamed directives

`#inject-lang!` and `#trim!`; fix `set-lang-from-mimetype`
---
 plugin/query_predicates.lua             | 102 +-----------------------
 runtime/queries/authzed/injections.scm  |  24 ------
 runtime/queries/hcl/injections.scm      |   3 +-
 runtime/queries/hurl/injections.scm     |   3 +-
 runtime/queries/markdown/injections.scm |   5 +-
 runtime/queries/php_only/injections.scm |   6 +-
 runtime/queries/ruby/injections.scm     |   3 +-
 7 files changed, 11 insertions(+), 135 deletions(-)

diff --git a/plugin/query_predicates.lua b/plugin/query_predicates.lua
index 8c7685faf..7cd8fb618 100644
--- a/plugin/query_predicates.lua
+++ b/plugin/query_predicates.lua
@@ -30,12 +30,13 @@ local mimetype_aliases = {
 ---@param pred string[]
 ---@return boolean|nil
 query.add_directive('set-lang-from-mimetype!', function(match, _, bufnr, pred, metadata)
-  local capture_id = pred[2]
-  local node = match[capture_id]
+  local id = pred[2]
+  local node = match[id]
   if not node then
     return
   end
-  local type_attr_value = vim.treesitter.get_node_text(node, bufnr)
+
+  local type_attr_value = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] })
   local configured = mimetype_aliases[type_attr_value]
   if configured then
     metadata['injection.language'] = configured
@@ -44,98 +45,3 @@ query.add_directive('set-lang-from-mimetype!', function(match, _, bufnr, pred, m
     metadata['injection.language'] = parts[#parts]
   end
 end, true)
-
-local injection_aliases = {
-  ex = 'elixir',
-  pl = 'perl',
-  sh = 'bash',
-  uxn = 'uxntal',
-  ts = 'typescript',
-}
-
----@param match (TSNode|nil)[]
----@param _ string
----@param bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_directive('set-lang-from-info-string!', function(match, _, bufnr, pred, metadata)
-  local capture_id = pred[2]
-  local node = match[capture_id]
-  if not node then
-    return
-  end
-
-  local injection_alias = vim.treesitter.get_node_text(node, bufnr)
-  local filetype = vim.filetype.match({ filename = 'a.' .. injection_alias })
-  metadata['injection.language'] = filetype or injection_aliases[injection_alias] or injection_alias
-end, true)
-
-query.add_directive('downcase!', function(match, _, bufnr, pred, metadata)
-  local text, key, value ---@type string|string[], string, string|integer
-
-  if #pred == 3 then
-    -- (#downcase! @capture "key")
-    key = pred[3]
-    value = metadata[pred[2]][key]
-  else
-    -- (#downcase! "key")
-    key = pred[2]
-    value = metadata[key]
-  end
-
-  if type(value) == 'string' then
-    text = value
-  else
-    local node = match[value]
-    text = vim.treesitter.get_node_text(node, bufnr) or ''
-  end
-
-  if #pred == 3 then
-    metadata[pred[2]][key] = string.lower(text)
-  else
-    metadata[key] = string.lower(text)
-  end
-end, true)
-
--- Trim blank lines from end of the region
--- Arguments are the captures to trim.
----@param match (TSNode|nil)[]
----@param _ string
----@param bufnr integer
----@param pred string[]
----@param metadata table
----TODO(clason): upstream
-query.add_directive('trim!', function(match, _, bufnr, pred, metadata)
-  for _, id in ipairs({ select(2, unpack(pred)) }) do
-    local node = match[id]
-    if not node then
-      return
-    end
-
-    local start_row, start_col, end_row, end_col = node:range()
-
-    -- Don't trim if region ends in middle of a line
-    if end_col ~= 0 then
-      return
-    end
-
-    while true do
-      -- As we only care when end_col == 0, always inspect one line above end_row.
-      local end_line = vim.api.nvim_buf_get_lines(bufnr, end_row - 1, end_row, true)[1]
-
-      if end_line ~= '' then
-        break
-      end
-
-      end_row = end_row - 1
-    end
-
-    -- If this produces an invalid range, we just skip it.
-    if start_row < end_row or (start_row == end_row and start_col <= end_col) then
-      if not metadata[id] then
-        metadata[id] = {}
-      end
-      metadata[id].range = { start_row, start_col, end_row, end_col }
-    end
-  end
-end, true)
diff --git a/runtime/queries/authzed/injections.scm b/runtime/queries/authzed/injections.scm
index 298a8d070..2f0e58eb6 100644
--- a/runtime/queries/authzed/injections.scm
+++ b/runtime/queries/authzed/injections.scm
@@ -1,26 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-
-((function_call
-  name: (ident) @_name
-  .
-  (simplexpr)
-  .
-  (simplexpr
-    (string
-      (string_fragment) @injection.content)+))
-  (#any-of? @_name "replace" "search" "matches" "captures")
-  (#set! injection.language "regex")
-  (#set! injection.combined))
-
-((function_call
-  name: (ident) @_name
-  .
-  (simplexpr)
-  .
-  (simplexpr
-    (string
-      (string_fragment) @injection.content)+))
-  (#eq? @_name "jq")
-  (#set! injection.language "jq")
-  (#set! injection.combined))
diff --git a/runtime/queries/hcl/injections.scm b/runtime/queries/hcl/injections.scm
index b68f4caea..5cb940c87 100644
--- a/runtime/queries/hcl/injections.scm
+++ b/runtime/queries/hcl/injections.scm
@@ -3,5 +3,4 @@
 
 (heredoc_template
   (template_literal) @injection.content
-  (heredoc_identifier) @injection.language
-  (#downcase! @injection.language))
+  (heredoc_identifier) @injection.language)
diff --git a/runtime/queries/hurl/injections.scm b/runtime/queries/hurl/injections.scm
index 41abb387b..bd5385663 100644
--- a/runtime/queries/hurl/injections.scm
+++ b/runtime/queries/hurl/injections.scm
@@ -9,7 +9,6 @@
   (#set! injection.language "xml"))
 
 (multiline_string
-  (multiline_string_type) @_lang
+  (multiline_string_type) @injection.language
   (multiline_string_content) @injection.content
-  (#set-lang-from-info-string! @_lang)
   (#set! injection.combined))
diff --git a/runtime/queries/markdown/injections.scm b/runtime/queries/markdown/injections.scm
index 8ed205296..1f33c30b6 100644
--- a/runtime/queries/markdown/injections.scm
+++ b/runtime/queries/markdown/injections.scm
@@ -1,8 +1,7 @@
 (fenced_code_block
   (info_string
-    (language) @_lang)
-  (code_fence_content) @injection.content
-  (#set-lang-from-info-string! @_lang))
+    (language) @injection.language)
+  (code_fence_content) @injection.content)
 
 ((html_block) @injection.content
   (#set! injection.language "html")
diff --git a/runtime/queries/php_only/injections.scm b/runtime/queries/php_only/injections.scm
index 368177643..42ee2d67d 100644
--- a/runtime/queries/php_only/injections.scm
+++ b/runtime/queries/php_only/injections.scm
@@ -4,14 +4,12 @@
 (heredoc
   (heredoc_body) @injection.content
   (heredoc_end) @injection.language
-  (#set! injection.include-children)
-  (#downcase! @injection.language))
+  (#set! injection.include-children))
 
 (nowdoc
   (nowdoc_body) @injection.content
   (heredoc_end) @injection.language
-  (#set! injection.include-children)
-  (#downcase! @injection.language))
+  (#set! injection.include-children))
 
 ; regex
 ((function_call_expression
diff --git a/runtime/queries/ruby/injections.scm b/runtime/queries/ruby/injections.scm
index 12b2c32a5..e998e2bd7 100644
--- a/runtime/queries/ruby/injections.scm
+++ b/runtime/queries/ruby/injections.scm
@@ -3,8 +3,7 @@
 
 (heredoc_body
   (heredoc_content) @injection.content
-  (heredoc_end) @injection.language
-  (#downcase! @injection.language))
+  (heredoc_end) @injection.language)
 
 (regex
   (string_content) @injection.content

From 26302f412f6fe1ff968802888a8b8419accd6462 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 4 Jul 2023 22:42:25 +0100
Subject: [PATCH 2292/2704] fix: add stricter cc options (#5063)

---
 lua/nvim-treesitter/install.lua | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index ff5cff036..f4112d880 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -307,6 +307,21 @@ local function do_download_git(logger, repo, project_name, cache_dir, revision,
   end
 end
 
+--- @type table<string,table<string,boolean>>
+local cc_args_cache = vim.defaulttable()
+
+--- @param cc string
+--- @param arg string
+--- @return boolean
+local function test_cc_arg(cc, arg)
+  if cc_args_cache[cc][arg] == nil then
+    cc_args_cache[cc][arg] = system({ cc, '-xc', '-', arg }, {
+      stdin = 'int main(void) { return 0; }',
+    }).code == 0
+  end
+  return cc_args_cache[cc][arg]
+end
+
 ---@param executables string[]
 ---@return string?
 function M.select_executable(executables)
@@ -359,6 +374,13 @@ local function select_compiler_args(repo, compiler)
     ismac and '-bundle' or '-shared',
   }
 
+  --- @param arg string
+  local function add_cc_arg(arg)
+    if test_cc_arg(compiler, arg) then
+      args[#args + 1] = arg
+    end
+  end
+
   if
     #vim.iter.filter(
       --- @param file string
@@ -370,11 +392,17 @@ local function select_compiler_args(repo, compiler)
       repo.files
     ) > 0
   then
-    table.insert(args, '-lstdc++')
+    add_cc_arg('-lstdc++')
   end
 
   if not iswin then
-    table.insert(args, '-fPIC')
+    add_cc_arg('-Wall')
+    add_cc_arg('-Wextra')
+    add_cc_arg('-fPIC')
+
+    -- Make sure we don't compile in any unresolved symbols, otherwise nvim will
+    -- just exit (not even crash)
+    add_cc_arg('-Werror=implicit-function-declaration')
   end
 
   return args

From b5a3f5c2860e08200a491ac902d6612abc0ddafe Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 7 Aug 2023 11:03:02 +0100
Subject: [PATCH 2293/2704] fix: cleanup diagnostics

---
 lua/nvim-treesitter/config.lua  |  5 +-
 lua/nvim-treesitter/install.lua | 83 ++++++++++++++-------------------
 2 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index c216a0b15..cd4a3a178 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -29,7 +29,8 @@ function M.setup(user_data)
   if config.auto_install then
     vim.api.nvim_create_autocmd('FileType', {
       callback = function(args)
-        local ft = vim.bo[args.buf].filetype
+        local buf = args.buf --- @type integer
+        local ft = vim.bo[buf].filetype
         local lang = vim.treesitter.language.get_lang(ft) or ft
         if
           require('nvim-treesitter.parsers').configs[lang]
@@ -39,7 +40,7 @@ function M.setup(user_data)
           require('nvim-treesitter.install').install(lang, nil, function()
             -- Need to pcall since 'FileType' can be triggered multiple times
             -- per buffer
-            pcall(vim.treesitter.start, args.buf, lang)
+            pcall(vim.treesitter.start, buf, lang)
           end)
         end
       end,
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index f4112d880..54ef4cd39 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -1,3 +1,4 @@
+local fn = vim.fn
 local fs = vim.fs
 local uv = vim.uv
 
@@ -60,31 +61,21 @@ end
 ---
 
 ---@param lang string
----@param validate? boolean
----@return InstallInfo
-local function get_parser_install_info(lang, validate)
+---@return InstallInfo?
+local function get_parser_install_info(lang)
   local parser_config = parsers.configs[lang]
 
   if not parser_config then
     log.error('Parser not available for language "' .. lang .. '"')
   end
 
-  local install_info = parser_config.install_info
-
-  if validate then
-    vim.validate({
-      url = { install_info.url, 'string' },
-      files = { install_info.files, 'table' },
-    })
-  end
-
-  return install_info
+  return parser_config.install_info
 end
 
 --- @param ... string
 --- @return string
 function M.get_package_path(...)
-  return fs.joinpath(vim.fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
+  return fs.joinpath(fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
 end
 
 ---@param lang string
@@ -163,12 +154,18 @@ local function cc_err()
   ) .. '" are not executable.')
 end
 
+--- @param x string
+--- @return boolean
+local function executable(x)
+  return fn.executable(x) == 1
+end
+
 --- @param logger Logger
 --- @param repo InstallInfo
 --- @param compile_location string
 local function do_generate_from_grammar(logger, repo, compile_location)
   if repo.generate_requires_npm then
-    if vim.fn.executable('npm') ~= 1 then
+    if not executable('npm') then
       logger:error('NPM requires to be installed from grammar.js')
     end
 
@@ -182,7 +179,7 @@ local function do_generate_from_grammar(logger, repo, compile_location)
   logger:info('Generating source files from grammar.js...')
 
   local r = system({
-    vim.fn.exepath('tree-sitter'),
+    fn.exepath('tree-sitter'),
     'generate',
     '--no-bindings',
     '--abi',
@@ -232,7 +229,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   end
 
   logger:debug('Creating temporary directory: ' .. temp_dir)
-  --TODO(clason): use vim.fn.mkdir(temp_dir, 'p') in case stdpath('cache') is not created
+  --TODO(clason): use fn.mkdir(temp_dir, 'p') in case stdpath('cache') is not created
   local err = uv_mkdir(temp_dir, 493)
   a.main()
   if err then
@@ -325,14 +322,7 @@ end
 ---@param executables string[]
 ---@return string?
 function M.select_executable(executables)
-  return vim.iter.filter(
-    ---@param c string
-    ---@return boolean
-    function(c)
-      return vim.fn.executable(c) == 1
-    end,
-    executables
-  )[1]
+  return vim.iter.filter(executable, executables)[1]
 end
 
 -- Returns the compiler arguments based on the compiler and OS
@@ -386,7 +376,7 @@ local function select_compiler_args(repo, compiler)
       --- @param file string
       --- @return boolean
       function(file)
-        local ext = vim.fn.fnamemodify(file, ':e')
+        local ext = fn.fnamemodify(file, ':e')
         return ext == 'cc' or ext == 'cpp' or ext == 'cxx'
       end,
       repo.files
@@ -411,9 +401,9 @@ end
 ---@param repo InstallInfo
 ---@return boolean
 local function can_download_tar(repo)
-  local can_use_tar = vim.fn.executable('tar') == 1 and vim.fn.executable('curl') == 1
-  local is_github = repo.url:find('github.com', 1, true)
-  local is_gitlab = repo.url:find('gitlab.com', 1, true)
+  local can_use_tar = executable('tar') and executable('curl')
+  local is_github = repo.url:find('github.com', 1, true) ~= nil
+  local is_gitlab = repo.url:find('gitlab.com', 1, true) ~= nil
   return can_use_tar and (is_github or is_gitlab) and not iswin
 end
 
@@ -432,13 +422,13 @@ end
 ---@param lang string
 ---@param cache_dir string
 ---@param install_dir string
----@param force boolean
----@param generate_from_grammar boolean
+---@param force? boolean
+---@param generate_from_grammar? boolean
 local function install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
   if vim.list_contains(config.installed_parsers(), lang) then
     if not force then
       local yesno =
-        vim.fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
+        fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
       print('\n ')
       if yesno:sub(1, 1) ~= 'y' then
         return
@@ -447,7 +437,6 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
   end
 
   local logger = log.new('install/' .. lang)
-  local err
 
   local repo = get_parser_install_info(lang)
   if repo then
@@ -461,18 +450,18 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
 
     generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
 
-    if generate_from_grammar and vim.fn.executable('tree-sitter') ~= 1 then
+    if generate_from_grammar and not executable('tree-sitter') then
       logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
     end
 
-    if generate_from_grammar and vim.fn.executable('node') ~= 1 then
+    if generate_from_grammar and not executable('node') then
       logger:error('Node JS not found: `node` is not executable')
     end
 
     local revision = get_target_revision(lang)
 
     local maybe_local_path = fs.normalize(repo.url)
-    local from_local_path = vim.fn.isdirectory(maybe_local_path) == 1
+    local from_local_path = fn.isdirectory(maybe_local_path) == 1
     if from_local_path then
       repo.url = maybe_local_path
     end
@@ -504,7 +493,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
 
     local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
 
-    err = uv_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
+    local err = uv_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
     a.main()
     if err then
       logger:error(err)
@@ -521,7 +510,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
   local queries = fs.joinpath(config.get_install_dir('queries'), lang)
   local queries_src = M.get_package_path('runtime', 'queries', lang)
   uv_unlink(queries)
-  err = uv_symlink(queries_src, queries, { dir = true, junction = true })
+  local err = uv_symlink(queries_src, queries, { dir = true, junction = true })
   a.main()
   if err then
     logger:error(err)
@@ -542,14 +531,14 @@ end
 ---
 ---
 --- @generic F: function
---- @param fn F Function to throttle
+--- @param f F Function to throttle
 --- @return F throttled function.
-local function throttle_by_id(fn)
+local function throttle_by_id(f)
   local scheduled = {} --- @type table<any,boolean>
   local running = {} --- @type table<any,boolean>
   return function(id, ...)
     if scheduled[id] then
-      -- If fn is already scheduled, then drop
+      -- If f is already scheduled, then drop
       return
     end
     if not running[id] then
@@ -561,7 +550,7 @@ local function throttle_by_id(fn)
     while scheduled[id] do
       scheduled[id] = nil
       running[id] = true
-      fn(id, ...)
+      f(id, ...)
       running[id] = nil
     end
   end
@@ -571,9 +560,9 @@ end
 local install_lang_throttled = throttle_by_id(install_lang)
 
 ---@class InstallOptions
----@field force boolean
----@field generate_from_grammar boolean
----@field skip table
+---@field force? boolean
+---@field generate_from_grammar? boolean
+---@field skip? table
 
 --- Install a parser
 --- @param languages? string[]|string
@@ -585,12 +574,12 @@ local function install(languages, options, _callback)
   local generate_from_grammar = options.generate_from_grammar
   local skip = options.skip
 
-  if vim.fn.executable('git') == 0 then
+  if not executable('git') then
     log.error('Git is required on your system to run this command')
     return
   end
 
-  local cache_dir = vim.fs.normalize(vim.fn.stdpath('cache'))
+  local cache_dir = vim.fs.normalize(fn.stdpath('cache'))
   local install_dir = config.get_install_dir('parser')
 
   if not languages or type(languages) == 'string' then

From 673fdccd212098818a64ab47a62b89993ccc77cf Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 11 Aug 2023 22:38:31 +0900
Subject: [PATCH 2294/2704] tests: remove set ft

---
 tests/indent/cpp_spec.lua        | 1 -
 tests/indent/javascript_spec.lua | 1 -
 tests/indent/jsx_spec.lua        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/tests/indent/cpp_spec.lua b/tests/indent/cpp_spec.lua
index 8e97c805e..fe26a81b3 100644
--- a/tests/indent/cpp_spec.lua
+++ b/tests/indent/cpp_spec.lua
@@ -7,7 +7,6 @@ local run = Runner:new(it, 'tests/indent', {
   shiftwidth = 4,
   softtabstop = 0,
   expandtab = true,
-  filetype = 'cpp',
 })
 
 describe('indent C++:', function()
diff --git a/tests/indent/javascript_spec.lua b/tests/indent/javascript_spec.lua
index 4a7c3bcc3..0536c1a0b 100644
--- a/tests/indent/javascript_spec.lua
+++ b/tests/indent/javascript_spec.lua
@@ -6,7 +6,6 @@ local run = Runner:new(it, 'tests/indent', {
   shiftwidth = 2,
   softtabstop = 0,
   expandtab = true,
-  filetype = 'javascript',
 })
 
 describe('indent JavaScript:', function()
diff --git a/tests/indent/jsx_spec.lua b/tests/indent/jsx_spec.lua
index 7a32dbcc4..8dcecfe5b 100644
--- a/tests/indent/jsx_spec.lua
+++ b/tests/indent/jsx_spec.lua
@@ -3,7 +3,6 @@ local runner = Runner:new(it, 'tests/indent/jsx', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
-  filetype = 'jsx',
 })
 
 describe('indent JSX Elements:', function()

From abcbe65b6e76b66af2f76ddf03502a5b0af1cf5f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 13 Aug 2023 12:56:11 +0200
Subject: [PATCH 2295/2704] docs(readme): document 'location' key

---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 48857e877..4e98772b1 100644
--- a/README.md
+++ b/README.md
@@ -131,15 +131,16 @@ If you have a parser that is not on the list of supported languages (either as a
 3. Add the following snippet to your `init.lua`:
 
 ```lua
-local parser_config = require "nvim-treesitter.parsers".configs
+local parser_config = require('nvim-treesitter.parsers').configs
 parser_config.zimbu = {
   install_info = {
-    url = "~/projects/tree-sitter-zimbu", -- local path or git repo
-    files = {"src/parser.c"}, -- note that some parsers also require src/scanner.c or src/scanner.cc
+    url = '~/projects/tree-sitter-zimbu', -- local path or git repo
+    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c or src/scanner.cc
     -- optional entries:
-    branch = "develop", -- only needed if different from default branch
-    generate_requires_npm = false, -- if stand-alone parser without npm dependencies
-    requires_generate_from_grammar = false, -- if folder contains pre-generated src/parser.c
+    branch = 'develop', -- only needed if different from default branch
+    location= 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
+    requires_generate_from_grammar = true, -- only needed if repo does not contain pre-generated src/parser.c
+    generate_requires_npm = true, -- only needed if parser has npm dependencies
   },
 }
 ```

From 3966b8808b36ce263111c7e177b4364d32e67a2d Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Mon, 4 Sep 2023 16:19:33 +0900
Subject: [PATCH 2296/2704] fix!: indents now rely on treesitter highlight

- Apply suggestions from Lewis to only parse visible lines
- Fix failed tests
---
 tests/query/highlights_spec.lua | 63 ++++++++++++---------------------
 tests/query/injection_spec.lua  |  9 +++--
 2 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/tests/query/highlights_spec.lua b/tests/query/highlights_spec.lua
index b6a52124a..0529af4a4 100644
--- a/tests/query/highlights_spec.lua
+++ b/tests/query/highlights_spec.lua
@@ -1,4 +1,3 @@
-local highlighter = require('vim.treesitter.highlighter')
 local ts = vim.treesitter
 
 local COMMENT_NODES = {
@@ -7,16 +6,16 @@ local COMMENT_NODES = {
 }
 
 local function check_assertions(file)
-  local buf = vim.fn.bufadd(file)
-  vim.fn.bufload(file)
-  local ft = vim.bo[buf].filetype
-  local lang = vim.treesitter.language.get_lang(ft) or ft
   assert.same(
     1,
     vim.fn.executable('highlight-assertions'),
     '"highlight-assertions" not executable!'
       .. ' Get it via "cargo install --git https://github.com/theHamsta/highlight-assertions"'
   )
+  local buf = vim.fn.bufadd(file)
+  vim.fn.bufload(file)
+  local ft = vim.bo[buf].filetype
+  local lang = vim.treesitter.language.get_lang(ft) or ft
   local comment_node = COMMENT_NODES[lang] or 'comment'
   local assertions = vim.fn.json_decode(
     vim.fn.system(
@@ -28,21 +27,21 @@ local function check_assertions(file)
         .. comment_node
     )
   )
-  local parser = ts.get_parser(buf, lang)
+  assert.True(#assertions > 0, 'No assertions detected!')
+
+  local parser = ts.get_parser(buf)
+
   parser:parse(true)
 
-  local self = highlighter.new(parser, {})
-
-  assert.True(#assertions > 0, 'No assertions detected!')
   for _, assertion in ipairs(assertions) do
     local row = assertion.position.row
     local col = assertion.position.column
+    assert.is.number(row)
+    assert.is.number(col)
 
     local captures = {}
-    local highlights = {}
-    self:prepare_highlight_states(row, row + 1)
-    self:for_each_highlight_state(function(state)
-      if not state.tstree then
+    parser:for_each_tree(function(tstree, tree)
+      if not tstree then
         return
       end
 
@@ -54,36 +53,24 @@ local function check_assertions(file)
         return
       end
 
-      local query = state.highlighter_query
-
-      -- Some injected languages may not have highlight queries.
-      if not query:query() then
+      local query = ts.query.get(tree:lang(), 'highlights')
+      if not query then
         return
       end
 
-      local iter = query:query():iter_captures(root, self.bufnr, row, row + 1)
-
-      for capture, node, _ in iter do
-        local hl = query:get_hl_from_capture(capture)
-        assert.is.truthy(hl)
-
-        assert.Truthy(node)
-        assert.is.number(row)
-        assert.is.number(col)
-        if hl and ts.is_in_node_range(node, row, col) then
-          local c = query._query.captures[capture] -- name of the capture in the query
-          if c ~= nil and c ~= 'spell' and c ~= 'conceal' then
-            captures[c] = true
-            highlights[c] = true
+      for id, node, _ in query:iter_captures(root, buf, row, row + 1) do
+        if ts.is_in_node_range(node, row, col) then
+          local capture = query.captures[id]
+          if capture ~= nil and capture ~= 'conceal' and capture ~= 'spell' then
+            captures[capture] = true
           end
         end
       end
     end)
     if assertion.expected_capture_name:match('^!') then
       assert.Falsy(
-        captures[assertion.expected_capture_name:sub(2)]
-          or highlights[assertion.expected_capture_name:sub(2)],
-        'Error in at '
+        captures[assertion.expected_capture_name:sub(2)],
+        'Error in '
           .. file
           .. ':'
           .. (row + 1)
@@ -93,13 +80,11 @@ local function check_assertions(file)
           .. assertion.expected_capture_name
           .. '", captures: '
           .. vim.inspect(vim.tbl_keys(captures))
-          .. '", highlights: '
-          .. vim.inspect(vim.tbl_keys(highlights))
       )
     else
       assert.True(
-        captures[assertion.expected_capture_name] or highlights[assertion.expected_capture_name],
-        'Error in at '
+        captures[assertion.expected_capture_name],
+        'Error in '
           .. file
           .. ':'
           .. (row + 1)
@@ -109,8 +94,6 @@ local function check_assertions(file)
           .. assertion.expected_capture_name
           .. '", captures: '
           .. vim.inspect(vim.tbl_keys(captures))
-          .. '", highlights: '
-          .. vim.inspect(vim.tbl_keys(highlights))
       )
     end
   end
diff --git a/tests/query/injection_spec.lua b/tests/query/injection_spec.lua
index 91096fee4..e90925e20 100644
--- a/tests/query/injection_spec.lua
+++ b/tests/query/injection_spec.lua
@@ -26,7 +26,6 @@ local function check_assertions(file)
   )
   local parser = ts.get_parser(buf, lang)
 
-  local self = parser
   local top_level_root = parser:parse(true)[1]:root()
 
   for _, assertion in ipairs(assertions) do
@@ -37,7 +36,7 @@ local function check_assertions(file)
     assertion.expected_capture_name = neg_assert and assertion.expected_capture_name:sub(2)
       or assertion.expected_capture_name
     local found = false
-    self:for_each_tree(function(tstree, tree)
+    parser:for_each_tree(function(tstree, tree)
       if not tstree then
         return
       end
@@ -50,11 +49,11 @@ local function check_assertions(file)
       if assertion.expected_capture_name == tree:lang() then
         found = true
       end
-    end, true)
+    end)
     if neg_assert then
       assert.False(
         found,
-        'Error in at '
+        'Error in '
           .. file
           .. ':'
           .. (row + 1)
@@ -67,7 +66,7 @@ local function check_assertions(file)
     else
       assert.True(
         found,
-        'Error in at '
+        'Error in '
           .. file
           .. ':'
           .. (row + 1)

From 1bec16362f642a2f86d122ae34131be6b0dbfbc6 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 11 Sep 2023 11:20:09 +0100
Subject: [PATCH 2297/2704] feat: allow a custom revision in install_info

---
 lua/nvim-treesitter/install.lua | 5 +++++
 lua/nvim-treesitter/parsers.lua | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 54ef4cd39..aaa921f07 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -81,6 +81,11 @@ end
 ---@param lang string
 ---@return string?
 local function get_target_revision(lang)
+  local info = get_parser_install_info(lang)
+  if info and info.revision then
+    return info.revision
+  end
+
   if #lockfile == 0 then
     local filename = M.get_package_path('lockfile.json')
     lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string, LockfileInfo>]]
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 026c8d1d6..25efd5d9d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1,6 +1,7 @@
 ---@class InstallInfo
 ---@field url string
 ---@field branch string|nil
+---@field revision string|nil Used to override lockfile revision
 ---@field files string[]
 ---@field generate_requires_npm boolean|nil
 ---@field requires_generate_from_grammar boolean|nil

From efbc2a4b72a83da8c21c41b905daa58e4d7f4e81 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 13 Sep 2023 10:43:36 +0100
Subject: [PATCH 2298/2704] fix: remove downcase! directive use

---
 runtime/queries/bash/injections.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/runtime/queries/bash/injections.scm b/runtime/queries/bash/injections.scm
index 9b86e351a..e1095773b 100644
--- a/runtime/queries/bash/injections.scm
+++ b/runtime/queries/bash/injections.scm
@@ -4,10 +4,9 @@
 ((regex) @injection.content
   (#set! injection.language "regex"))
 
-((heredoc_redirect
+(heredoc_redirect
   (heredoc_body) @injection.content
   (heredoc_end) @injection.language)
-  (#downcase! @injection.language))
 
 ; printf 'format'
 ((command

From 59f5d64a613f45faa036d9456cf7351c024f1be8 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 13 Sep 2023 10:46:02 +0100
Subject: [PATCH 2299/2704] fix: update vim.system types

---
 lua/nvim-treesitter/install.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index aaa921f07..44e7e048f 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -44,7 +44,7 @@ end
 
 local function system(cmd, opts)
   log.trace('running job: (cwd=%s) %s', opts.cwd, table.concat(cmd, ' '))
-  local r = a.wrap(vim.system, 3)(cmd, opts) --[[@as SystemCompleted]]
+  local r = a.wrap(vim.system, 3)(cmd, opts) --[[@as vim.SystemCompleted]]
   a.main()
   if r.stdout and r.stdout ~= '' then
     log.trace('stdout -> %s', r.stdout)
@@ -416,7 +416,7 @@ end
 ---@param repo InstallInfo
 ---@param cc string
 ---@param compile_location string
----@return SystemCompleted
+---@return vim.SystemCompleted
 local function do_compile(repo, cc, compile_location)
   local args = vim.tbl_flatten(select_compiler_args(repo, cc))
   local cmd = vim.list_extend({ cc }, args)

From 5f2c6c0c833734914080ae061e2a7d44bc606180 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 13 Sep 2023 10:53:03 +0100
Subject: [PATCH 2300/2704] refactor: pull out predicate function

---
 lua/nvim-treesitter/install.lua | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 44e7e048f..b6e3c3de3 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -145,18 +145,16 @@ local function get_compile_location(repo, cache_dir, project_name, from_local_pa
   return fs.joinpath(cache_dir, repo_location)
 end
 
+local function istring(c)
+  return type(c) == 'string'
+end
+
 local function cc_err()
-  log.error('No C compiler found! "' .. table.concat(
-    vim.iter.filter(
-      ---@param c string
-      ---@return boolean
-      function(c)
-        return type(c) == 'string'
-      end,
-      M.compilers
-    ),
-    '", "'
-  ) .. '" are not executable.')
+  log.error(
+    'No C compiler found! "'
+      .. table.concat(vim.iter.filter(istring, M.compilers), '", "')
+      .. '" are not executable.'
+  )
 end
 
 --- @param x string

From 178c6a84c17e182caf12f3b65e281a31f9a3b9da Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 24 Sep 2023 11:44:00 +0200
Subject: [PATCH 2301/2704] docs: update CONTRIBUTING.md

---
 CONTRIBUTING.md | 65 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 473a26cb5..b7ecb5690 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,22 +9,53 @@ The main goal of `nvim-treesitter` is to provide a framework to easily install p
 
 Depending on which part of the plugin you want to contribute to, please read the appropriate section.
 
-## Style Checks and Tests
+## Parsers
 
-We haven't implemented any functional tests yet. Feel free to contribute.
-However, we check code style with `luacheck` and `stylua`!
-Please install luacheck and activate our `pre-push` hook to automatically check style before
-every push:
+To add a new parser, edit the following files:
 
-```bash
-luarocks install luacheck
-cargo install stylua
-ln -s ../../scripts/pre-push .git/hooks/pre-push
+1. In `lua/parsers.lua`, add an entry to the `M.configs` table of the following form:
+
+```lua
+zimbu = {
+  install_info = {
+    url = 'https://github.com/zimbulang/tree-sitter-zimbu', -- local path or git repo
+    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c or src/scanner.cc
+    -- optional entries:
+    branch = 'develop', -- only needed if different from default branch
+    location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
+    revision = 'v2.1', -- tag or commit hash; bypasses automated updates
+    requires_generate_from_grammar = true, -- only needed if repo does not contain pre-generated src/parser.c
+    generate_requires_npm = true, -- only needed if parser has npm dependencies
+  },
+  maintainers = { '@me' }, -- the _query_ maintainers
+  tier = 3, -- community-contributed parser
+  -- optional entries:
+  requires = { 'vim' }, -- if the queries inherit from another language
+  readme_note = "an example language", -- if the 
+}
 ```
 
-## Parser configurations
+**Note:** The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
 
-Contributing to parser configurations is basically modifying one of the `runtime/queries/*/*.scm`.
+2. In `lockfile.json`, add an entry for the current commit your queries are compatible with:
+
+```json
+  "zimbu": {
+    "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
+  },
+```
+
+3. If the parser name is not the same as the Vim filetype, add an entry to the `filetypes` table in `plugin/filetypes.lua`:
+
+```lua
+  zimbu = { 'zu' },
+```
+
+**Note: We only support external scanners written in C (preferably) and C++03 for portability reasons.**
+
+## Queries
+
+Contributing to queries for an existing parser is basically modifying one of the `runtime/queries/*/*.scm`.
 Each of these `scheme` files contains a _tree-sitter query_ for a given purpose.
 Before going any further, we highly suggest that you [read more about tree-sitter queries](https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries).
 
@@ -40,19 +71,15 @@ For now these are the types of queries used by `nvim-treesitter`:
 For these types there is a _norm_ you will have to follow so that features work fine.
 Here are some global advices:
 
-- If your language is listed [here](https://github.com/nvim-treesitter/nvim-treesitter#supported-languages),
-  you can debug and experiment with your queries there.
-- If not, you should consider installing the [tree-sitter CLI](https://github.com/tree-sitter/tree-sitter/tree/master/cli),
-  you should then be able to open a local playground using `tree-sitter build-wasm && tree-sitter web-ui` within the
-  parsers repo.
 - Examples of queries can be found in [runtime/queries/](runtime/queries/)
-- Matches in the bottom will override queries that are above of them.
+- Note that (unlike tree-sitter) all matching patterns are applied, with the last one determining the visible highlight.
+- If the [parser is included in `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/SUPPORTED_LANGUAGES.md`) and installed with `:TSInstall`, you can use Neovim's developer tools (`:checkhealth`, `:InspectTree`, `:EditQuery`, `:Inspect`) to test your queries.
 
 #### Inheriting languages
 
 If your language is an extension of a language (TypeScript is an extension of JavaScript for
 example), you can include the queries from your base language by adding the following _as the first
-line of your file_.
+line of your file_:
 
 ```query
 ; inherits: lang1,(optionallang)
@@ -298,7 +325,7 @@ Note that nvim-treesitter uses more specific subcaptures for definitions and
 @local.reference             ; identifier reference
 ```
 
-#### Definition Scope
+#### Definition scope
 
 You can set the scope of a definition by setting the `scope` property on the definition.
 

From e77506bde3e6198dbf2ccc0e2e148e73aede2589 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 26 Jan 2024 13:09:44 +0100
Subject: [PATCH 2302/2704] feat: improve check-queries

---
 scripts/check-queries.lua | 97 ++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 58 deletions(-)

diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 3f5a9aa70..bfde0f8a3 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -1,18 +1,15 @@
 #!/usr/bin/env -S nvim -l
 vim.opt.runtimepath:append('.')
 
--- Equivalent to print(), but this will ensure consistent output regardless of
--- operating system.
-local function io_print(text)
-  if not text then
-    text = ''
-  end
-  io.write(text, '\n')
-end
+local query_types = require('nvim-treesitter.health').bundled_queries
+local configs = require('nvim-treesitter.parsers').configs
+local parsers = #_G.arg > 0 and { unpack(_G.arg) }
+  or require('nvim-treesitter.config').installed_parsers()
 
-local function extract_captures()
-  local captures = {}
-  local current_query
+-- Extract captures from documentation for validation
+local captures = {}
+do
+  local current_query ---@type string
 
   for line in io.lines('CONTRIBUTING.md') do
     if vim.startswith(line, '### ') then
@@ -22,45 +19,33 @@ local function extract_captures()
         captures[current_query] = {}
       end
 
-      table.insert(captures[current_query], vim.split(line:sub(2), ' ', true)[1])
+      table.insert(captures[current_query], vim.split(line:sub(2), ' ')[1])
     end
   end
 
   -- Complete captures for injections.
-  local parsers = vim.tbl_keys(require('nvim-treesitter.parsers').configs)
-  for _, lang in pairs(parsers) do
+  for _, lang in pairs(vim.tbl_keys(configs)) do
     table.insert(captures['injections'], lang)
   end
-
-  return captures
 end
 
-local function do_check()
-  local timings = {}
-  local parsers = require('nvim-treesitter.config').installed_parsers()
-  local query_types = require('nvim-treesitter.health').bundled_queries
-  local configs = require('nvim-treesitter.parsers').configs
-
-  local captures = extract_captures()
-  local errors = {}
-
-  io_print('::group::Check parsers')
+-- Check queries for each installed parser in parsers
+local errors = {} ---@type string[]
+local timings = {} ---@type number[][]
+do
+  print('::group::Check parsers')
 
   for _, lang in pairs(parsers) do
-    if configs[lang].install_info then
+    if configs[lang] and configs[lang].install_info then
       timings[lang] = {}
       for _, query_type in pairs(query_types) do
         local before = vim.uv.hrtime()
         local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
-        local after = vim.uv.hrtime()
-        local duration = after - before
+        local duration = vim.uv.hrtime() - before
         table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
-        io_print(
-          'Checking ' .. lang .. ' ' .. query_type .. string.format(' (%.02fms)', duration * 1e-6)
-        )
+        print(string.format('Checking %s %s (%.02fms)', lang, query_type, duration * 1e-6))
         if not ok then
-          local err_msg = lang .. ' (' .. query_type .. '): ' .. query
-          errors[#errors + 1] = err_msg
+          errors[#errors + 1] = string.format('%s (%s): %s', lang, query_type, query)
         else
           if query then
             for _, capture in ipairs(query.captures) do
@@ -69,9 +54,8 @@ local function do_check()
                 or vim.list_contains(captures[query_type], capture)
               )
               if not is_valid then
-                local error =
-                  string.format('(x) Invalid capture @%s in %s for %s.', capture, query_type, lang)
-                errors[#errors + 1] = error
+                errors[#errors + 1] =
+                  string.format('%s (%s): invalid capture "@%s"', lang, query_type, capture)
               end
             end
           end
@@ -80,37 +64,34 @@ local function do_check()
     end
   end
 
-  io_print('::endgroup::')
-
-  if #errors > 0 then
-    io_print('\nCheck failed!\nErrors:')
-    for _, err in ipairs(errors) do
-      print(err)
-    end
-    error()
-  end
-  return timings
+  print('::endgroup::')
 end
 
-local ok, result = pcall(do_check)
-if ok then
-  io_print('::group::Timings')
-  table.sort(result, function(a, b)
+-- Output
+if #errors > 0 then
+  print('::group::Errors')
+  for _, err in ipairs(errors) do
+    print(err)
+  end
+  print('::endgroup::')
+  print('Check failed!\n')
+  vim.cmd.cq()
+else
+  print('::group::Timings')
+  table.sort(timings, function(a, b)
     return a.duration < b.duration
   end)
-  for i, val in ipairs(result) do
-    io_print(
+  for i, val in ipairs(timings) do
+    print(
       string.format(
         '%i. %.02fms %s %s',
-        #result - i + 1,
+        #timings - i + 1,
         val.duration * 1e-6,
         val.lang,
         val.query_type
       )
     )
   end
-  io_print('::endgroup::')
-  io_print('Check successful!')
-else
-  vim.cmd('cq')
+  print('::endgroup::')
+  print('Check successful!')
 end

From 885c2960ef4be1c75b1391c1a458a811912f44a9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 28 Jan 2024 10:50:38 +0100
Subject: [PATCH 2303/2704] fix: better output for update-lockfile

---
 scripts/update-lockfile.lua | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/scripts/update-lockfile.lua b/scripts/update-lockfile.lua
index 0c9288b6a..d77baed61 100755
--- a/scripts/update-lockfile.lua
+++ b/scripts/update-lockfile.lua
@@ -1,17 +1,15 @@
 #!/usr/bin/env -S nvim -l
 vim.opt.runtimepath:append('.')
 local util = require('nvim-treesitter.util')
+local parsers = require('nvim-treesitter.parsers').configs
 
 -- Load previous lockfile
 local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
 local old_lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,{revision:string}>]]
 
----@type table<string,{revision:string}>
-local new_lockfile = {}
-
-local parsers = require('nvim-treesitter.parsers').configs
-
-local jobs = {} --- @type table<string,SystemObj>
+local jobs = {} ---@type table<string,vim.SystemObj>
+local new_lockfile = {} ---@type table<string,{revision:string}>
+local updates = {} ---@type string[]
 
 -- check for new revisions
 for k, p in pairs(parsers) do
@@ -19,6 +17,7 @@ for k, p in pairs(parsers) do
     new_lockfile[k] = old_lockfile[k]
     print('Skipping ' .. k)
   elseif p.install_info then
+    print('Updating ' .. k)
     jobs[k] = vim.system({ 'git', 'ls-remote', p.install_info.url })
   end
 
@@ -41,17 +40,25 @@ for k, p in pairs(parsers) do
 
       local sha = vim.split(stdout[line], '\t')[1]
       new_lockfile[name] = { revision = sha }
-      print(name .. ': ' .. sha)
+      if new_lockfile[name].revision ~= old_lockfile[name].revision then
+        updates[#updates + 1] = name
+      end
     end
   end
 end
 
 assert(#vim.tbl_keys(jobs) == 0)
 
-local lockfile_json = vim.json.encode(new_lockfile) --[[@as string]]
-if vim.fn.executable('jq') == 1 then
-  lockfile_json =
-    assert(vim.system({ 'jq', '--sort-keys' }, { stdin = lockfile_json }):wait().stdout)
-end
+if #updates > 0 then
+  -- write new lockfile
+  local lockfile_json = vim.json.encode(new_lockfile) --[[@as string]]
+  if vim.fn.executable('jq') == 1 then
+    lockfile_json =
+      assert(vim.system({ 'jq', '--sort-keys' }, { stdin = lockfile_json }):wait().stdout)
+  end
+  util.write_file(filename, lockfile_json)
 
-util.write_file(filename, lockfile_json)
+  print(string.format('\nUpdated parsers: %s', table.concat(updates, ', ')))
+else
+  print('\nAll parsers up to date!')
+end

From be5f9b0eaa522d99323b4bd8153dac1ee887f2f2 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Fri, 16 Feb 2024 01:55:07 -0600
Subject: [PATCH 2304/2704] fix: update add_predicate and add_directive calls
 for upstream (#6106)

Update custom predicates and directives to handle multiple nodes per
capture ID per changes upstream.
---
 plugin/query_predicates.lua | 49 ++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/plugin/query_predicates.lua b/plugin/query_predicates.lua
index 7cd8fb618..06bf957f8 100644
--- a/plugin/query_predicates.lua
+++ b/plugin/query_predicates.lua
@@ -1,19 +1,44 @@
 local query = vim.treesitter.query
 
+local predicates = {
+  ---@param match TSQueryMatch
+  ---@param pred string[]
+  ---@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 (TSNode|nil)[]
+---@param match TSQueryMatch
 ---@param pred string[]
 ---@return boolean|nil
 query.add_predicate('kind-eq?', function(match, _, _, pred)
-  local node = match[pred[2]]
-  if not node then
-    return true
-  end
+  return predicates['kind-eq'](match, pred, false)
+end, { force = true })
 
-  local types = { unpack(pred, 3) }
-  return vim.list_contains(types, node:type())
-end, true)
+---@param match TSQueryMatch
+---@param pred string[]
+---@return boolean|nil
+query.add_predicate('any-kind-eq?', function(match, _, _, pred)
+  return predicates['kind-eq'](match, pred, true)
+end, { force = true })
 
 -- register custom directives
 
@@ -24,7 +49,7 @@ local mimetype_aliases = {
   ['text/ecmascript'] = 'javascript',
 }
 
----@param match (TSNode|nil)[]
+---@param match TSQueryMatch
 ---@param _ string
 ---@param bufnr integer
 ---@param pred string[]
@@ -32,10 +57,6 @@ local mimetype_aliases = {
 query.add_directive('set-lang-from-mimetype!', function(match, _, bufnr, pred, metadata)
   local id = pred[2]
   local node = match[id]
-  if not node then
-    return
-  end
-
   local type_attr_value = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] })
   local configured = mimetype_aliases[type_attr_value]
   if configured then
@@ -44,4 +65,4 @@ query.add_directive('set-lang-from-mimetype!', function(match, _, bufnr, pred, m
     local parts = vim.split(type_attr_value, '/', {})
     metadata['injection.language'] = parts[#parts]
   end
-end, true)
+end, { force = true })

From 039fe9095d07910e71ec41ef38e0bffa378293e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Sun, 18 Feb 2024 20:56:53 +0900
Subject: [PATCH 2305/2704] fix(format): update scripts to support nightly
 (#6126)

No need for assert as the use is contained within the script only
---
 scripts/format-queries.lua | 39 ++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index 8639daf2b..f924b8064 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -14,25 +14,40 @@ else
 end
 
 ts.query.add_predicate('kind-eq?', function(match, _, _, pred)
-  local cap = match[pred[2]]
-  local node = type(cap) == 'table' and cap[1] or cap
-  if not node then
+  local nodes = match[pred[2]]
+  local types = { unpack(pred, 3) }
+
+  if not nodes or #nodes == 0 then
     return true
   end
 
-  local types = { unpack(pred, 3) }
-  return vim.tbl_contains(types, node:type())
-end, true)
+  for _, node in pairs(nodes) do
+    if not vim.tbl_contains(types, node:type()) then
+      return false
+    end
+  end
+  return true
+end, {
+  force = true,
+  all = true,
+})
 
 ts.query.add_predicate('is-start-of-line?', function(match, _, _, pred)
-  local cap = match[pred[2]]
-  local node = type(cap) == 'table' and cap[1] or cap
-  if not node then
+  local nodes = match[pred[2]]
+  if not nodes or #nodes == 0 then
     return true
   end
-  local start_row, start_col = node:start()
-  return vim.fn.indent(start_row + 1) == start_col
-end)
+  for _, node in pairs(nodes) do
+    local start_row, start_col = node:start()
+    if vim.fn.indent(start_row + 1) ~= start_col then
+      return false
+    end
+  end
+  return true
+end, {
+  force = true,
+  all = true,
+})
 
 --- Control the indent here. Change to \t if uses tab instead
 local indent_str = '  '

From 429e6f446b7f2e3201fa940b897414db73047634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Huy=20Ho=C3=A0ng?= <hoangtun0810@gmail.com>
Date: Tue, 27 Feb 2024 01:00:55 +0900
Subject: [PATCH 2306/2704] doc: better clarification of highlights/injections

---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b7ecb5690..55c0bc284 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -72,7 +72,8 @@ For these types there is a _norm_ you will have to follow so that features work
 Here are some global advices:
 
 - Examples of queries can be found in [runtime/queries/](runtime/queries/)
-- Note that (unlike tree-sitter) all matching patterns are applied, with the last one determining the visible highlight.
+- For highlights, all matching patterns are applied, with the last one determining the visible capture & highlight.
+- For injections, try your best to ensure that each captured node is only matched by a single pattern.
 - If the [parser is included in `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/SUPPORTED_LANGUAGES.md`) and installed with `:TSInstall`, you can use Neovim's developer tools (`:checkhealth`, `:InspectTree`, `:EditQuery`, `:Inspect`) to test your queries.
 
 #### Inheriting languages

From a8f5641ab3c8fbdfd1e454821ab34fc7db2c2651 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 24 Mar 2024 10:30:37 +0100
Subject: [PATCH 2307/2704] feat(install)!: remove support for C++ scanners

---
 CONTRIBUTING.md                 |  4 ++--
 README.md                       |  2 +-
 lua/nvim-treesitter/install.lua | 16 +---------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 55c0bc284..c989b585c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ To add a new parser, edit the following files:
 zimbu = {
   install_info = {
     url = 'https://github.com/zimbulang/tree-sitter-zimbu', -- local path or git repo
-    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c or src/scanner.cc
+    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
     -- optional entries:
     branch = 'develop', -- only needed if different from default branch
     location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
@@ -51,7 +51,7 @@ zimbu = {
   zimbu = { 'zu' },
 ```
 
-**Note: We only support external scanners written in C (preferably) and C++03 for portability reasons.**
+**Note: We only support external scanners written in C for portability reasons.**
 
 ## Queries
 
diff --git a/README.md b/README.md
index 4e98772b1..08794576c 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ local parser_config = require('nvim-treesitter.parsers').configs
 parser_config.zimbu = {
   install_info = {
     url = '~/projects/tree-sitter-zimbu', -- local path or git repo
-    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c or src/scanner.cc
+    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
     -- optional entries:
     branch = 'develop', -- only needed if different from default branch
     location= 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index b6e3c3de3..d9d2a16a2 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -347,7 +347,7 @@ local function select_compiler_args(repo, compiler)
 
   if compiler:find('zig$') or compiler:find('zig.exe$') then
     return {
-      'c++',
+      'cc',
       '-o',
       'parser.so',
       repo.files,
@@ -374,20 +374,6 @@ local function select_compiler_args(repo, compiler)
     end
   end
 
-  if
-    #vim.iter.filter(
-      --- @param file string
-      --- @return boolean
-      function(file)
-        local ext = fn.fnamemodify(file, ':e')
-        return ext == 'cc' or ext == 'cpp' or ext == 'cxx'
-      end,
-      repo.files
-    ) > 0
-  then
-    add_cc_arg('-lstdc++')
-  end
-
   if not iswin then
     add_cc_arg('-Wall')
     add_cc_arg('-Wextra')

From 421e2fb7b254ea4878e3faeb86506fa87cd2548f Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 19 Apr 2024 10:11:06 +0100
Subject: [PATCH 2308/2704] feat: improve logging of failed installs

---
 lua/nvim-treesitter/install.lua | 162 +++++++++++++++++---------------
 lua/nvim-treesitter/log.lua     |  83 +++++-----------
 2 files changed, 109 insertions(+), 136 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index d9d2a16a2..5927619d3 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -166,16 +166,17 @@ end
 --- @param logger Logger
 --- @param repo InstallInfo
 --- @param compile_location string
+--- @return string? err
 local function do_generate_from_grammar(logger, repo, compile_location)
   if repo.generate_requires_npm then
     if not executable('npm') then
-      logger:error('NPM requires to be installed from grammar.js')
+      return logger:error('NPM requires to be installed from grammar.js')
     end
 
     logger:info('Installing NPM dependencies')
     local r = system({ 'npm', 'install' }, { cwd = compile_location })
     if r.code > 0 then
-      logger:error('Error during `npm install`')
+      return logger:error('Error during `npm install`: %s', r.stderr)
     end
   end
 
@@ -189,7 +190,7 @@ local function do_generate_from_grammar(logger, repo, compile_location)
     tostring(vim.treesitter.language_version),
   }, { cwd = compile_location })
   if r.code > 0 then
-    logger:error('Error during "tree-sitter generate"')
+    return logger:error('Error during "tree-sitter generate": %s', r.stderr)
   end
 end
 
@@ -199,6 +200,7 @@ end
 ---@param cache_dir string
 ---@param revision string
 ---@param project_dir string
+---@return string? err
 local function do_download_tar(logger, repo, project_name, cache_dir, revision, project_dir)
   local is_github = repo.url:find('github.com', 1, true)
   local url = repo.url:gsub('.git$', '')
@@ -228,7 +230,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
     cwd = cache_dir,
   })
   if r.code > 0 then
-    logger:error('Error during download, please verify your internet connection: %s', r.stderr)
+    return logger:error('Error during download, please verify your internet connection: %s', r.stderr)
   end
 
   logger:debug('Creating temporary directory: ' .. temp_dir)
@@ -236,7 +238,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   local err = uv_mkdir(temp_dir, 493)
   a.main()
   if err then
-    logger:error('Could not create %s-tmp: %s', project_name, err)
+    return logger:error('Could not create %s-tmp: %s', project_name, err)
   end
 
   logger:info('Extracting ' .. project_name .. '...')
@@ -251,12 +253,12 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   })
 
   if r.code > 0 then
-    logger:error('Error during tarball extraction: %s', r.stderr)
+    return logger:error('Error during tarball extraction: %s', r.stderr)
   end
 
   err = uv_unlink(project_dir .. '.tar.gz')
   if err then
-    logger:error('Could not remove tarball: %s', err)
+    return logger:error('Could not remove tarball: %s', err)
   end
   a.main()
 
@@ -264,7 +266,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
   a.main()
 
   if err then
-    logger:error('Could not rename temp: %s', err)
+    return logger:error('Could not rename temp: %s', err)
   end
 
   util.delete(temp_dir)
@@ -276,6 +278,7 @@ end
 ---@param cache_dir string
 ---@param revision string
 ---@param project_dir string
+---@return string? err
 local function do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
   logger:info('Downloading ' .. project_name .. '...')
 
@@ -290,7 +293,7 @@ local function do_download_git(logger, repo, project_name, cache_dir, revision,
   })
 
   if r.code > 0 then
-    logger:error('Error during download, please verify your internet connection: ' .. r.stderr)
+    return logger:error('Error during download, please verify your internet connection: ', r.stderr)
   end
 
   logger:info('Checking out locked revision')
@@ -303,7 +306,7 @@ local function do_download_git(logger, repo, project_name, cache_dir, revision,
   })
 
   if r.code > 0 then
-    logger:error('Error while checking out revision: %s', r.stderr)
+    return logger:error('Error while checking out revision: %s', r.stderr)
   end
 end
 
@@ -411,20 +414,9 @@ end
 ---@param lang string
 ---@param cache_dir string
 ---@param install_dir string
----@param force? boolean
 ---@param generate_from_grammar? boolean
-local function install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
-  if vim.list_contains(config.installed_parsers(), lang) then
-    if not force then
-      local yesno =
-        fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
-      print('\n ')
-      if yesno:sub(1, 1) ~= 'y' then
-        return
-      end
-    end
-  end
-
+---@return string? err
+local function install_lang0(lang, cache_dir, install_dir, generate_from_grammar)
   local logger = log.new('install/' .. lang)
 
   local repo = get_parser_install_info(lang)
@@ -440,11 +432,11 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
     generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
 
     if generate_from_grammar and not executable('tree-sitter') then
-      logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
+      return logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
     end
 
     if generate_from_grammar and not executable('node') then
-      logger:error('Node JS not found: `node` is not executable')
+      return logger:error('Node JS not found: `node` is not executable')
     end
 
     local revision = get_target_revision(lang)
@@ -461,23 +453,26 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
 
       revision = revision or repo.branch or 'master'
 
-      if can_download_tar(repo) then
-        do_download_tar(logger, repo, project_name, cache_dir, revision, project_dir)
-      else
-        do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
+      local do_download = can_download_tar(repo) and do_download_tar or do_download_git
+      local err = do_download(logger, repo, project_name, cache_dir, revision, project_dir)
+      if err then
+        return err
       end
     end
 
     local compile_location = get_compile_location(repo, cache_dir, project_name, from_local_path)
 
     if generate_from_grammar then
-      do_generate_from_grammar(logger, repo, compile_location)
+      local err = do_generate_from_grammar(logger, repo, compile_location)
+      if err then
+        return err
+      end
     end
 
     logger:info('Compiling parser')
     local r = do_compile(repo, cc, compile_location)
     if r.code > 0 then
-      logger:error('Error during compilation: %s', r.stderr)
+      return logger:error('Error during compilation: %s', r.stderr)
     end
 
     local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
@@ -485,7 +480,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
     local err = uv_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
     a.main()
     if err then
-      logger:error(err)
+      return logger:error(err)
     end
 
     local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
@@ -502,51 +497,55 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
   local err = uv_symlink(queries_src, queries, { dir = true, junction = true })
   a.main()
   if err then
-    logger:error(err)
+    return logger:error(err)
   end
   logger:info('Language installed')
 end
 
---- Throttles a function using the first argument as an ID
----
---- If function is already running then the function will be scheduled to run
---- again once the running call has finished.
----
----   fn#1        _/‾\__/‾\_/‾\_____________________________
----   throttled#1 _/‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾\/‾‾‾‾‾‾‾‾‾‾\____________
---
----   fn#2        ______/‾\___________/‾\___________________
----   throttled#2 ______/‾‾‾‾‾‾‾‾‾‾\__/‾‾‾‾‾‾‾‾‾‾\__________
----
----
---- @generic F: function
---- @param f F Function to throttle
---- @return F throttled function.
-local function throttle_by_id(f)
-  local scheduled = {} --- @type table<any,boolean>
-  local running = {} --- @type table<any,boolean>
-  return function(id, ...)
-    if scheduled[id] then
-      -- If f is already scheduled, then drop
-      return
-    end
-    if not running[id] then
-      scheduled[id] = true
-    end
-    if running[id] then
-      return
-    end
-    while scheduled[id] do
-      scheduled[id] = nil
-      running[id] = true
-      f(id, ...)
-      running[id] = nil
+--- @alias InstallStatus
+--- | 'installing'
+--- | 'installed'
+--- | 'failed'
+--- | 'timeout'
+
+local install_status = {} --- @type table<string,InstallStatus?>
+
+local INSTALL_TIMEOUT = 60000
+
+---@param lang string
+---@param cache_dir string
+---@param install_dir string
+---@param force? boolean
+---@param generate_from_grammar? boolean
+---@return InstallStatus status
+local function install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
+  if not force and vim.list_contains(config.installed_parsers(), lang) then
+    local yesno =
+      fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
+    print('\n ')
+    if yesno:sub(1, 1) ~= 'y' then
+      install_status[lang] = 'installed'
+      return 'installed'
     end
   end
-end
 
--- Async functions must not be interleaved
-local install_lang_throttled = throttle_by_id(install_lang)
+  if install_status[lang] then
+    if install_status[lang] == 'installing' then
+      vim.wait(INSTALL_TIMEOUT, function()
+        return install_status[lang] ~= 'installing'
+      end)
+      install_status[lang] = 'timeout'
+    end
+  else
+    install_status[lang] = 'installing'
+    local err = install_lang0(lang, cache_dir, install_dir, generate_from_grammar)
+    install_status[lang] = err and 'failed' or 'installed'
+  end
+
+  local status = install_status[lang]
+  assert(status and status ~= 'installing')
+  return status
+end
 
 ---@class InstallOptions
 ---@field force? boolean
@@ -586,8 +585,10 @@ local function install(languages, options, _callback)
   for _, lang in ipairs(languages) do
     tasks[#tasks + 1] = a.sync(function()
       a.main()
-      install_lang_throttled(lang, cache_dir, install_dir, force, generate_from_grammar)
-      done = done + 1
+      local status = install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
+      if status ~= 'failed' then
+        done = done + 1
+      end
     end)
   end
 
@@ -621,12 +622,14 @@ M.update = a.sync(function(languages, _options, _callback)
   end
 end, 2)
 
+--- @param logger Logger
 --- @param lang string
 --- @param parser string
 --- @param queries string
-local function uninstall_lang(lang, parser, queries)
-  local logger = log.new('uninstall/' .. lang)
+--- @return string? err
+local function uninstall_lang(logger, lang, parser, queries)
   logger:debug('Uninstalling ' .. lang)
+  install_status[lang] = nil
 
   if vim.fn.filereadable(parser) == 1 then
     logger:debug('Unlinking ' .. parser)
@@ -634,7 +637,7 @@ local function uninstall_lang(lang, parser, queries)
     a.main()
 
     if perr then
-      log.error(perr)
+      return logger:error(perr)
     end
   end
 
@@ -644,7 +647,7 @@ local function uninstall_lang(lang, parser, queries)
     a.main()
 
     if qerr then
-      logger:error(qerr)
+      return logger:error(qerr)
     end
   end
 
@@ -664,14 +667,17 @@ M.uninstall = a.sync(function(languages, _options, _callback)
   local tasks = {} --- @type fun()[]
   local done = 0
   for _, lang in ipairs(languages) do
+    local logger = log.new('uninstall/' .. lang)
     if not vim.list_contains(installed, lang) then
       log.warn('Parser for ' .. lang .. ' is is not managed by nvim-treesitter')
     else
       local parser = fs.joinpath(parser_dir, lang) .. '.so'
       local queries = fs.joinpath(query_dir, lang)
       tasks[#tasks + 1] = a.sync(function()
-        uninstall_lang(lang, parser, queries)
-        done = done + 1
+        local err = uninstall_lang(logger, lang, parser, queries)
+        if not err then
+          done = done + 1
+        end
       end)
     end
   end
diff --git a/lua/nvim-treesitter/log.lua b/lua/nvim-treesitter/log.lua
index 83f0b41c2..faf131094 100644
--- a/lua/nvim-treesitter/log.lua
+++ b/lua/nvim-treesitter/log.lua
@@ -1,4 +1,4 @@
-local api = vim.api
+local echo = vim.api.nvim_echo
 
 -- TODO(lewis6991): write these out to a file
 local messages = {} --- @type {[1]: string, [2]: string?, [3]: string}[]
@@ -11,69 +11,28 @@ local sev_to_hl = {
   error = 'ErrorMsg',
 }
 
----@param ctx string?
----@param m string
----@param ... any
-local function trace(ctx, m, ...)
-  messages[#messages + 1] = { 'trace', ctx, string.format(m, ...) }
-end
-
----@param ctx string?
----@param m string
----@param ... any
-local function debug(ctx, m, ...)
-  messages[#messages + 1] = { 'debug', ctx, string.format(m, ...) }
-end
-
 ---@param ctx string?
 ---@return string
 local function mkpfx(ctx)
   return ctx and string.format('[nvim-treesitter/%s]', ctx) or '[nvim-treesitter]'
 end
 
----@param ctx string?
----@param m string
----@param ... any
-local function info(ctx, m, ...)
-  local m1 = string.format(m, ...)
-  messages[#messages + 1] = { 'info', ctx, m1 }
-  api.nvim_echo({ { mkpfx(ctx) .. ': ' .. m1, sev_to_hl.info } }, true, {})
-end
-
----@param ctx string?
----@param m string
----@param ... any
-local function warn(ctx, m, ...)
-  local m1 = string.format(m, ...)
-  messages[#messages + 1] = { 'warn', ctx, m1 }
-  api.nvim_echo({ { mkpfx(ctx) .. ' warning: ' .. m1, sev_to_hl.warn } }, true, {})
-end
-
----@param ctx string?
----@param m string
----@param ... any
-local function lerror(ctx, m, ...)
-  local m1 = string.format(m, ...)
-  messages[#messages + 1] = { 'error', ctx, m1 }
-  error(mkpfx(ctx) .. ' error: ' .. m1)
-end
-
---- @class NTSLogModule
---- @field trace fun(fmt: string, ...: any)
---- @field debug fun(fmt: string, ...: any)
---- @field info fun(fmt: string, ...: any)
---- @field warn fun(fmt: string, ...: any)
---- @field error fun(fmt: string, ...: any)
+---@class TSLogModule
+---@field trace fun(fmt: string, ...: any)
+---@field debug fun(fmt: string, ...: any)
+---@field info fun(fmt: string, ...: any)
+---@field warn fun(fmt: string, ...: any)
+---@field error fun(fmt: string, ...: any)
 local M = {}
 
---- @class Logger
---- @field ctx? string
+---@class Logger
+---@field ctx? string
 local Logger = {}
 
 M.Logger = Logger
 
---- @param ctx? string
---- @return Logger
+---@param ctx? string
+---@return Logger
 function M.new(ctx)
   return setmetatable({ ctx = ctx }, { __index = Logger })
 end
@@ -81,31 +40,39 @@ end
 ---@param m string
 ---@param ... any
 function Logger:trace(m, ...)
-  trace(self.ctx, m, ...)
+  messages[#messages + 1] = { 'trace', self.ctx, m:format(...) }
 end
 
 ---@param m string
 ---@param ... any
 function Logger:debug(m, ...)
-  debug(self.ctx, m, ...)
+  messages[#messages + 1] = { 'debug', self.ctx, m:format(...) }
 end
 
 ---@param m string
 ---@param ... any
 function Logger:info(m, ...)
-  info(self.ctx, m, ...)
+  local m1 = m:format(...)
+  messages[#messages + 1] = { 'info', self.ctx, m1 }
+  echo({ { mkpfx(self.ctx) .. ': ' .. m1, sev_to_hl.info } }, true, {})
 end
 
 ---@param m string
 ---@param ... any
 function Logger:warn(m, ...)
-  warn(self.ctx, m, ...)
+  local m1 = m:format(...)
+  messages[#messages + 1] = { 'warn', self.ctx, m1 }
+  echo({ { mkpfx(self.ctx) .. ' warning: ' .. m1, sev_to_hl.warn } }, true, {})
 end
 
 ---@param m string
 ---@param ... any
+---@return string
 function Logger:error(m, ...)
-  lerror(self.ctx, m, ...)
+  local m1 = m:format(...)
+  messages[#messages + 1] = { 'error', self.ctx, m1 }
+  echo({ { mkpfx(self.ctx) .. ' error: ' .. m1, sev_to_hl.error } }, true, {})
+  return m1
 end
 
 local noctx_logger = M.new()
@@ -126,7 +93,7 @@ function M.show()
     local hl = sev_to_hl[sev]
     local text = ctx and string.format('%s(%s): %s', sev, ctx, msg)
       or string.format('%s: %s', sev, msg)
-    api.nvim_echo({ { text, hl } }, false, {})
+    echo({ { text, hl } }, false, {})
   end
 end
 

From 0bb981c87604200df6c8fb81e5a411101bdf93af Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 19 Apr 2024 18:12:54 +0100
Subject: [PATCH 2309/2704] fix: do not use vim.iter (#6469)

---
 lua/nvim-treesitter/config.lua  | 53 +++++++++++++++++++++++----------
 lua/nvim-treesitter/install.lua | 11 ++++---
 lua/nvim-treesitter/parsers.lua | 22 +++++++++-----
 plugin/nvim-treesitter.lua      | 20 +++++++++----
 4 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index cd4a3a178..a52c6a10e 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -106,12 +106,17 @@ function M.norm_languages(languages, skip)
   end
 
   -- keep local to avoid leaking parsers module
+  --- @param list string[]
   local function expand_tiers(list)
     for i, tier in ipairs(parsers.tiers) do
       if vim.list_contains(list, tier) then
-        list = vim.iter.filter(function(l)
-          return l ~= tier
-        end, list) --[[@as string[] ]]
+        list = vim.tbl_filter(
+          --- @param l string
+          function(l)
+            return l ~= tier
+          end,
+          list
+        )
         vim.list_extend(list, parsers.get_available(i))
       end
     end
@@ -123,29 +128,45 @@ function M.norm_languages(languages, skip)
 
   if skip and skip.ignored then
     local ignored = expand_tiers(config.ignore_install)
-    languages = vim.iter.filter(function(v)
-      return not vim.list_contains(ignored, v)
-    end, languages) --[[@as string[] ]]
+    languages = vim.tbl_filter(
+      --- @param v string
+      function(v)
+        return not vim.list_contains(ignored, v)
+      end,
+      languages
+    )
   end
 
   if skip and skip.installed then
     local installed = M.installed_parsers()
-    languages = vim.iter.filter(function(v)
-      return not vim.list_contains(installed, v)
-    end, languages) --[[@as string[] ]]
+    languages = vim.tbl_filter(
+      --- @param v string
+      function(v)
+        return not vim.list_contains(installed, v)
+      end,
+      languages
+    )
   end
 
   if skip and skip.missing then
     local installed = M.installed_parsers()
-    languages = vim.iter.filter(function(v)
-      return vim.list_contains(installed, v)
-    end, languages) --[[@as string[] ]]
+    languages = vim.tbl_filter(
+      --- @param v string
+      function(v)
+        return vim.list_contains(installed, v)
+      end,
+      languages
+    )
   end
 
-  languages = vim.iter.filter(function(v)
-    -- TODO(lewis6991): warn of any unknown parsers?
-    return parsers.configs[v] ~= nil
-  end, languages) --[[@as string[] ]]
+  languages = vim.tbl_filter(
+    --- @param v string
+    function(v)
+      -- TODO(lewis6991): warn of any unknown parsers?
+      return parsers.configs[v] ~= nil
+    end,
+    languages
+  )
 
   if not (skip and skip.dependencies) then
     for _, lang in pairs(languages) do
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 5927619d3..1bb7d6fea 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -152,7 +152,7 @@ end
 local function cc_err()
   log.error(
     'No C compiler found! "'
-      .. table.concat(vim.iter.filter(istring, M.compilers), '", "')
+      .. table.concat(vim.tbl_filter(istring, M.compilers), '", "')
       .. '" are not executable.'
   )
 end
@@ -230,7 +230,7 @@ local function do_download_tar(logger, repo, project_name, cache_dir, revision,
     cwd = cache_dir,
   })
   if r.code > 0 then
-    return logger:error('Error during download, please verify your internet connection: %s', r.stderr)
+    return logger:error('Error during download: %s', r.stderr)
   end
 
   logger:debug('Creating temporary directory: ' .. temp_dir)
@@ -328,7 +328,7 @@ end
 ---@param executables string[]
 ---@return string?
 function M.select_executable(executables)
-  return vim.iter.filter(executable, executables)[1]
+  return vim.tbl_filter(executable, executables)[1]
 end
 
 -- Returns the compiler arguments based on the compiler and OS
@@ -520,8 +520,7 @@ local INSTALL_TIMEOUT = 60000
 ---@return InstallStatus status
 local function install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
   if not force and vim.list_contains(config.installed_parsers(), lang) then
-    local yesno =
-      fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
+    local yesno = fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
     print('\n ')
     if yesno:sub(1, 1) ~= 'y' then
       install_status[lang] = 'installed'
@@ -613,7 +612,7 @@ M.update = a.sync(function(languages, _options, _callback)
     languages = 'all'
   end
   languages = config.norm_languages(languages, { ignored = true, missing = true })
-  languages = vim.iter.filter(needs_update, languages) --- @type string[]
+  languages = vim.tbl_filter(needs_update, languages) --- @type string[]
 
   if #languages > 0 then
     install(languages, { force = true })
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 25efd5d9d..538f2336c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -3010,15 +3010,23 @@ function M.get_available(tier)
   local parsers = vim.tbl_keys(M.configs)
   table.sort(parsers)
   if tier then
-    parsers = vim.iter.filter(function(p)
-      return M.configs[p].tier == tier
-    end, parsers) --[[@as string[] ]]
+    parsers = vim.tbl_filter(
+      --- @param p string
+      function(p)
+        return M.configs[p].tier == tier
+      end,
+      parsers
+    )
   end
   if vim.fn.executable('tree-sitter') == 0 or vim.fn.executable('node') == 0 then
-    parsers = vim.iter.filter(function(p)
-      return M.configs[p].install_info
-        and not M.configs[p].install_info.requires_generate_from_grammar
-    end, parsers) --[[@as string[] ]]
+    parsers = vim.tbl_filter(
+      --- @param p string
+      function(p)
+        return M.configs[p].install_info ~= nil
+          and not M.configs[p].install_info.requires_generate_from_grammar
+      end,
+      parsers
+    )
   end
   return parsers
 end
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index 0bcbe07c3..751e8aad1 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -6,15 +6,23 @@ vim.g.loaded_nvim_treesitter = true
 local api = vim.api
 
 local function complete_available_parsers(arglead)
-  return vim.iter.filter(function(v)
-    return v:find(arglead)
-  end, require('nvim-treesitter.parsers').get_available())
+  return vim.tbl_filter(
+    --- @param v string
+    function(v)
+      return v:find(arglead) ~= nil
+    end,
+    require('nvim-treesitter.parsers').get_available()
+  )
 end
 
 local function complete_installed_parsers(arglead)
-  return vim.iter.filter(function(v)
-    return v:find(arglead)
-  end, require('nvim-treesitter.config').installed_parsers())
+  return vim.tbl_filter(
+    --- @param v string
+    function(v)
+      return v:find(arglead) ~= nil
+    end,
+    require('nvim-treesitter.config').installed_parsers()
+  )
 end
 
 -- create user commands

From c70daa36dcc2fdae113637fba76350daaf62dba5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 21 Apr 2024 00:14:12 +0200
Subject: [PATCH 2310/2704] feat(install)!: add explicit path field to parser
 info (#6476)

Problem: Using `url` for both remote repo and local path complicates the
code.

Solution: Add `path` field that overrides `url` and bypasses
git-specific manipulations, i.e., the contents of the `path` are used
as-is (no git repo needed).

This means `:TSUpdate` will skip such parsers; use `:TSInstall!` instead
after making local changes.

---------

Co-authored-by: Lewis Russell <lewis6991@gmail.com>
---
 lua/nvim-treesitter/install.lua  | 98 ++++++++++++--------------------
 lua/nvim-treesitter/parsers.lua  | 33 +++++------
 runtime/queries/rust/indents.scm |  1 +
 3 files changed, 55 insertions(+), 77 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 1bb7d6fea..57671d7d3 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -123,28 +123,6 @@ end
 --- PARSER MANAGEMENT FUNCTIONS
 ---
 
---- @param repo InstallInfo
---- @param project_name string
---- @param cache_dir string
---- @param from_local_path boolean
---- @return string
-local function get_compile_location(repo, cache_dir, project_name, from_local_path)
-  ---@type string compile_location only needed for typescript installs.
-  if from_local_path then
-    local compile_location = repo.url
-    if repo.location then
-      compile_location = fs.joinpath(compile_location, repo.location)
-    end
-    return compile_location
-  end
-
-  local repo_location = project_name
-  if repo.location then
-    repo_location = fs.joinpath(repo_location, repo.location)
-  end
-  return fs.joinpath(cache_dir, repo_location)
-end
-
 local function istring(c)
   return type(c) == 'string'
 end
@@ -168,6 +146,10 @@ end
 --- @param compile_location string
 --- @return string? err
 local function do_generate_from_grammar(logger, repo, compile_location)
+  if not executable('tree-sitter') then
+    return logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
+  end
+
   if repo.generate_requires_npm then
     if not executable('npm') then
       return logger:error('NPM requires to be installed from grammar.js')
@@ -400,23 +382,29 @@ local function can_download_tar(repo)
 end
 
 -- Returns the compile command based on the OS and user options
+---@param logger Logger
 ---@param repo InstallInfo
 ---@param cc string
 ---@param compile_location string
----@return vim.SystemCompleted
-local function do_compile(repo, cc, compile_location)
+--- @return string? err
+local function do_compile(logger, repo, cc, compile_location)
   local args = vim.tbl_flatten(select_compiler_args(repo, cc))
   local cmd = vim.list_extend({ cc }, args)
 
-  return system(cmd, { cwd = compile_location })
+  logger:info('Compiling parser')
+
+  local r = system(cmd, { cwd = compile_location })
+  if r.code > 0 then
+    return logger:error('Error during compilation: %s', r.stderr)
+  end
 end
 
 ---@param lang string
 ---@param cache_dir string
 ---@param install_dir string
----@param generate_from_grammar? boolean
+---@param generate? boolean
 ---@return string? err
-local function install_lang0(lang, cache_dir, install_dir, generate_from_grammar)
+local function install_lang0(lang, cache_dir, install_dir, generate)
   local logger = log.new('install/' .. lang)
 
   local repo = get_parser_install_info(lang)
@@ -429,50 +417,43 @@ local function install_lang0(lang, cache_dir, install_dir, generate_from_grammar
 
     local project_name = 'tree-sitter-' .. lang
 
-    generate_from_grammar = repo.requires_generate_from_grammar or generate_from_grammar
-
-    if generate_from_grammar and not executable('tree-sitter') then
-      return logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
-    end
-
-    if generate_from_grammar and not executable('node') then
-      return logger:error('Node JS not found: `node` is not executable')
-    end
-
     local revision = get_target_revision(lang)
 
-    local maybe_local_path = fs.normalize(repo.url)
-    local from_local_path = fn.isdirectory(maybe_local_path) == 1
-    if from_local_path then
-      repo.url = maybe_local_path
-    end
-
-    if not from_local_path then
-      util.delete(fs.joinpath(cache_dir, project_name))
+    local compile_location ---@type string
+    if repo.path then
+      compile_location = fs.normalize(repo.path)
+    else
       local project_dir = fs.joinpath(cache_dir, project_name)
+      util.delete(project_dir)
 
-      revision = revision or repo.branch or 'master'
+      revision = revision or repo.branch or 'main'
 
       local do_download = can_download_tar(repo) and do_download_tar or do_download_git
       local err = do_download(logger, repo, project_name, cache_dir, revision, project_dir)
       if err then
         return err
       end
+      compile_location = fs.joinpath(cache_dir, project_name)
     end
 
-    local compile_location = get_compile_location(repo, cache_dir, project_name, from_local_path)
+    if repo.location then
+      compile_location = fs.joinpath(compile_location, repo.location)
+    end
 
-    if generate_from_grammar then
-      local err = do_generate_from_grammar(logger, repo, compile_location)
-      if err then
-        return err
+    do
+      if repo.generate or generate then
+        local err = do_generate_from_grammar(logger, repo, compile_location)
+        if err then
+          return err
+        end
       end
     end
 
-    logger:info('Compiling parser')
-    local r = do_compile(repo, cc, compile_location)
-    if r.code > 0 then
-      return logger:error('Error during compilation: %s', r.stderr)
+    do
+      local err = do_compile(logger, repo, cc, compile_location)
+      if err then
+        return err
+      end
     end
 
     local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
@@ -486,7 +467,7 @@ local function install_lang0(lang, cache_dir, install_dir, generate_from_grammar
     local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
     util.write_file(revfile, revision or '')
 
-    if not from_local_path then
+    if not repo.path then
       util.delete(fs.joinpath(cache_dir, project_name))
     end
   end
@@ -561,11 +542,6 @@ local function install(languages, options, _callback)
   local generate_from_grammar = options.generate_from_grammar
   local skip = options.skip
 
-  if not executable('git') then
-    log.error('Git is required on your system to run this command')
-    return
-  end
-
   local cache_dir = vim.fs.normalize(fn.stdpath('cache'))
   local install_dir = config.get_install_dir('parser')
 
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 538f2336c..6f5915da1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1,18 +1,19 @@
 ---@class InstallInfo
+---@field path? string
 ---@field url string
----@field branch string|nil
----@field revision string|nil Used to override lockfile revision
+---@field branch? string
+---@field revision? string
 ---@field files string[]
----@field generate_requires_npm boolean|nil
----@field requires_generate_from_grammar boolean|nil
----@field location string|nil
+---@field generate_requires_npm? boolean
+---@field generate? boolean
+---@field location? string
 
 ---@class ParserInfo
----@field install_info InstallInfo?
----@field maintainers string[]?
----@field requires string[]?
+---@field install_info? InstallInfo
+---@field maintainers? string[]
+---@field requires? string[]
 ---@field tier integer
----@field readme_note string|nil?
+---@field readme_note? string
 
 local M = {}
 
@@ -1413,7 +1414,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
       files = { 'src/parser.c', 'src/scanner.c' },
-      requires_generate_from_grammar = true,
+      generate = true,
     },
     maintainers = { '@theHamsta', '@clason' },
     tier = 2,
@@ -1591,7 +1592,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/artagnon/tree-sitter-mlir',
       files = { 'src/parser.c' },
-      requires_generate_from_grammar = true,
+      generate = true,
     },
     maintainers = { '@artagnon' },
     tier = 4,
@@ -1731,7 +1732,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
       files = { 'src/parser.c', 'src/scanner.c' },
-      requires_generate_from_grammar = true,
+      generate = true,
     },
     maintainers = { '@undu' },
     tier = 3,
@@ -2246,7 +2247,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/rockorager/tree-sitter-scfg',
       files = { 'src/parser.c' },
-      requires_generate_from_grammar = true,
+      generate = true,
     },
     maintainers = { '@WhyNotHugo' },
     tier = 3,
@@ -2489,7 +2490,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
       files = { 'src/parser.c', 'src/scanner.c' },
-      requires_generate_from_grammar = true,
+      generate = true,
     },
     maintainers = { '@alex-pinkus' },
     tier = 3,
@@ -2544,7 +2545,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/euclidianAce/tree-sitter-teal',
       files = { 'src/parser.c', 'src/scanner.c' },
-      requires_generate_from_grammar = true,
+      generate = true,
     },
     maintainers = { '@euclidianAce' },
     tier = 3,
@@ -2753,7 +2754,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
       files = { 'src/parser.c', 'src/scanner.c' },
-      requires_generate_from_grammar = true,
+      generate = true,
     },
     maintainers = { '@tapegram' },
     tier = 4,
diff --git a/runtime/queries/rust/indents.scm b/runtime/queries/rust/indents.scm
index 9fe337d5c..934d1c169 100644
--- a/runtime/queries/rust/indents.scm
+++ b/runtime/queries/rust/indents.scm
@@ -91,6 +91,7 @@
 
 (tuple_struct_pattern
   ")" @indent.end)
+
 ; Typing in "(" inside macro definitions breaks the tree entirely
 ; Making macro_definition becoming errors
 ; Offset this by adding back one indent for start of macro rules

From 8f8cf7144d2cd6bfb66d27031cf49b28d1037559 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 09:59:42 +0000
Subject: [PATCH 2311/2704] bot(readme): update

---
 SUPPORTED_LANGUAGES.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index dea60f0b4..3d559ab5e 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -141,7 +141,7 @@ jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
 [koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` |  |  | @irh
 [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` |  |  | @Willem-J-an
 [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `H  JL` |  |  | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | core | `HF J ` | ✓ |  | @theHamsta, @clason
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | core | `HF J ` |  |  | @theHamsta, @clason
 [ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` |  |  | @cbarrete
 [leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` |  |  | @r001
 [linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) | core | `HFIJL` |  |  | @amaanq
@@ -160,7 +160,7 @@ jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
 [menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` |  |  | @Kerl13
 [mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `H    ` |  |  | 
 [meson](https://github.com/Decodetalkers/tree-sitter-meson) | community | `HFIJ ` |  |  | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | unsupported | `H   L` | ✓ |  | @artagnon
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | unsupported | `H   L` |  |  | @artagnon
 [muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` |  |  | @Freed-Wu
 [nasm](https://github.com/naclsn/tree-sitter-nasm) | core | `H  J ` |  |  | @ObserverOfTime
 [nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H I  ` |  |  | 
@@ -173,7 +173,7 @@ jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
 [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` |  |  | @ColinKennedy
 [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | community | `HFIJL` |  |  | @undu
 [ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | community | `HFIJL` |  |  | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` | ✓ |  | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` |  |  | @undu
 [odin](https://github.com/amaanq/tree-sitter-odin) | core | `HFIJL` |  |  | @amaanq
 [org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` |  |  | 
 [pascal](https://github.com/Isopod/tree-sitter-pascal.git) | community | `HFIJL` |  |  | @Isopod
@@ -221,7 +221,7 @@ jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
 [ruby](https://github.com/tree-sitter/tree-sitter-ruby) | community | `HFIJL` |  |  | @TravonteD
 [rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` |  |  | @amaanq
 [scala](https://github.com/tree-sitter/tree-sitter-scala) | community | `HF JL` |  |  | @stevanmilic
-[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` | ✓ |  | @WhyNotHugo
+[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` |  |  | @WhyNotHugo
 [scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` |  |  | 
 [scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFI  ` |  |  | @elianiva
 [slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unsupported | `HFIJL` |  | ✓ | @theHamsta
@@ -243,13 +243,13 @@ jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
 [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` |  |  | @madskjeldgaard
 [surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` |  |  | @connorlay
 [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` |  |  | @amaanq
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H I L` | ✓ |  | @alex-pinkus
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H I L` |  |  | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` |  |  | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` |  |  | @ok-ryoko
 [t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJL` |  |  | @xasc
 [tablegen](https://github.com/amaanq/tree-sitter-tablegen) | core | `HFIJL` |  |  | @amaanq
 [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFI  ` |  |  | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | ✓ |  | @euclidianAce
+[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` |  |  | @euclidianAce
 [templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  |  | @vrischmann
 [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  |  | @MichaHoffmann
 [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI  ` |  |  | @Porter
@@ -268,7 +268,7 @@ jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
 [typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` |  |  | @uben0, @RaafatTurki
 [udev](https://github.com/ObserverOfTime/tree-sitter-udev) | core | `H  JL` |  |  | @ObserverOfTime
 [ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) | community | `HFIJL` |  |  | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | unsupported | `H  J ` | ✓ |  | @tapegram
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | unsupported | `H  J ` |  |  | @tapegram
 [usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFI L` |  |  | @ColinKennedy
 [uxntal](https://github.com/amaanq/tree-sitter-uxntal) | core | `HFIJL` |  |  | @amaanq
 [v](https://github.com/vlang/v-analyzer) | community | `HFIJL` |  |  | @kkharji, @amaanq

From 5a38df5627fd0658223bdf32c9d6a87e32eb9504 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 18 Apr 2024 09:44:38 +0200
Subject: [PATCH 2312/2704] feat(install)!: generate from json instead of
 requiring node

Problem: Many parsers require node/npm to evaluate the `grammar.js`
before being able to generate a parser from it.

Solution: Generate from `grammar.json` instead, which is fully resolved.
Drops `node` and `npm` as (optional) requirements for nvim-treesitter.

Note that this requires parsers to commit the generated json iff the
grammar requires evaluation (which is currently the case for all tracked
languages).
---
 .github/workflows/lint.yml      |   3 +-
 CONTRIBUTING.md                 |   4 +-
 README.md                       |   4 +-
 SUPPORTED_LANGUAGES.md          | 561 ++++++++++++++++----------------
 lua/nvim-treesitter/health.lua  |  10 +-
 lua/nvim-treesitter/install.lua |  44 ++-
 lua/nvim-treesitter/parsers.lua | 327 ++++++++++---------
 plugin/nvim-treesitter.lua      |   2 +-
 scripts/install-parsers.lua     |  20 +-
 scripts/update-readme.lua       |  11 +-
 10 files changed, 502 insertions(+), 484 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e51833814..cd97cda06 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -40,12 +40,13 @@ jobs:
       NVIM_TAG: nightly
     steps:
       - uses: actions/checkout@v4
+      - uses: tree-sitter/setup-action/cli@v1
       - name: Prepare
         run: |
           bash ./scripts/ci-install.sh
 
       - name: Lint
         run: |
-          nvim --headless -c "TSInstallSync query" -c "q"
+          nvim -l scripts/install-parsers.lua query
           nvim -l scripts/format-queries.lua
           git diff --exit-code
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c989b585c..d043e6b08 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,8 +24,8 @@ zimbu = {
     branch = 'develop', -- only needed if different from default branch
     location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
     revision = 'v2.1', -- tag or commit hash; bypasses automated updates
-    requires_generate_from_grammar = true, -- only needed if repo does not contain pre-generated src/parser.c
-    generate_requires_npm = true, -- only needed if parser has npm dependencies
+    generate = true, -- only needed if repo does not contain pre-generated src/parser.c
+    generate_from_json = true, -- only needed if grammar.js has npm-installed dependencies
   },
   maintainers = { '@me' }, -- the _query_ maintainers
   tier = 3, -- community-contributed parser
diff --git a/README.md b/README.md
index 08794576c..6e3a52845 100644
--- a/README.md
+++ b/README.md
@@ -139,8 +139,8 @@ parser_config.zimbu = {
     -- optional entries:
     branch = 'develop', -- only needed if different from default branch
     location= 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
-    requires_generate_from_grammar = true, -- only needed if repo does not contain pre-generated src/parser.c
-    generate_requires_npm = true, -- only needed if parser has npm dependencies
+    generate = true, -- only needed if repo does not contain pre-generated src/parser.c
+    generate_from_json = true, -- only needed if parser has npm dependencies
   },
 }
 ```
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 3d559ab5e..a63f603e7 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -5,291 +5,290 @@ The following is a list of languages for which a parser can be installed through
 Legend:
 - **Tier:** _stable_, _core_, _community_, or _unsupported_
 - **CLI:** `:TSInstall` requires `tree-sitter` CLI installed
-- **NPM:** `:TSInstallFromGrammar` requires `node` installed
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
 
 <!--This section of the README is automatically updated by a CI job-->
 <!--parserinfo-->
-Language | Tier | Queries | CLI | NPM | Maintainer
--------- |:----:|:-------:|:---:|:---:| ----------
-[ada](https://github.com/briot/tree-sitter-ada) | community | `HF  L` |  |  | @briot
-[agda](https://github.com/tree-sitter/tree-sitter-agda) | community | `HF   ` |  |  | @Decodetalkers
-[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unsupported | `HFIJL` |  | ✓ | @dlvandenberg
-[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF  L` |  |  | @aheber
-[arduino](https://github.com/ObserverOfTime/tree-sitter-arduino) | core | `HFIJL` |  |  | @ObserverOfTime
-[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` |  |  | @RubixDev
-[astro](https://github.com/virchau13/tree-sitter-astro) | community | `HFIJL` |  |  | @virchau13
-[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J ` |  |  | @mattpolzin
-[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unsupported | `H  J ` |  |  | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) | community | `HF JL` |  |  | @TravonteD
-[bass](https://github.com/vito/tree-sitter-bass) | core | `HFIJL` |  |  | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) | community | `HF J ` |  |  | @polarmutex
-[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | core | `HFI  ` |  |  | @theHamsta, @clason
-[bicep](https://github.com/amaanq/tree-sitter-bicep) | core | `HFIJL` |  |  | @amaanq
-[bitbake](https://github.com/amaanq/tree-sitter-bitbake) | core | `HFIJL` |  |  | @amaanq
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unsupported | `H    ` |  |  | @gabmus
-[c](https://github.com/tree-sitter/tree-sitter-c) | stable | `HFIJL` |  |  | @amaanq
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | community | `HF JL` |  |  | @Luxed
-[cairo](https://github.com/amaanq/tree-sitter-cairo) | core | `HFIJL` |  |  | @amaanq
-[capnp](https://github.com/amaanq/tree-sitter-capnp) | core | `HFIJL` |  |  | @amaanq
-[chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) | core | `HFIJL` |  |  | @ObserverOfTime
-[clojure](https://github.com/sogaiu/tree-sitter-clojure) | community | `HF JL` |  |  | @NoahTheDuke
-[cmake](https://github.com/uyha/tree-sitter-cmake) | unsupported | `HFI  ` |  |  | @uyha
-[comment](https://github.com/stsewd/tree-sitter-comment) | core | `H    ` |  |  | @stsewd
-[commonlisp](https://github.com/theHamsta/tree-sitter-commonlisp) | core | `HF  L` |  | ✓ | @theHamsta
-[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H    ` |  |  | @addcninblue
-[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFI L` |  |  | @jakestanger
-[cpon](https://github.com/amaanq/tree-sitter-cpon) | core | `HFIJL` |  |  | @amaanq
-[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | stable | `HFIJL` |  | ✓ | @theHamsta
-[css](https://github.com/tree-sitter/tree-sitter-css) | community | `HFIJ ` |  |  | @TravonteD
-[csv](https://github.com/amaanq/tree-sitter-csv) | core | `H    ` |  |  | @amaanq
-[cuda](https://github.com/theHamsta/tree-sitter-cuda) | core | `HFIJL` |  | ✓ | @theHamsta
-[cue](https://github.com/eonpatapon/tree-sitter-cue) | core | `HFIJL` |  |  | @amaanq
-[d](https://github.com/gdamore/tree-sitter-d) | core | `HFIJL` |  |  | @amaanq
-[dart](https://github.com/UserNobody14/tree-sitter-dart) | unsupported | `HFIJL` |  |  | @akinsho
-[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` |  |  | @jedrzejboczar
-[dhall](https://github.com/jbellerb/tree-sitter-dhall) | core | `HF J ` |  |  | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H    ` |  |  | @gbprod
-[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` |  |  | @ColinKennedy
-[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` |  |  | @NoahTheDuke
-[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` |  |  | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) | community | `H IJ ` |  |  | @rydesun
-[doxygen](https://github.com/amaanq/tree-sitter-doxygen) | core | `H IJ ` |  |  | @amaanq
-[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HF JL` |  |  | @ObserverOfTime
-[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` |  |  | @glehmann
-[ebnf](https://github.com/RubixDev/ebnf) | unsupported | `H    ` |  |  | @RubixDev
-ecma (queries only)[^ecma] | core | `HFIJL` |  |  | @steelsojka
-[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` |  |  | @uyha
-[eex](https://github.com/connorlay/tree-sitter-eex) | community | `H  J ` |  |  | @connorlay
-[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | community | `HFIJL` |  |  | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) | unsupported | `H  J ` |  |  | @zweimach
-[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | core | `HFIJL` |  |  | @glapa-grossklag, @amaanq
-[elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` |  |  | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` |  |  | 
-[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | community | `HF   ` |  |  | @filmor
-[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` |  |  | @bryankenote
-[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` |  |  | @khiner
-[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | community | `HF JL` |  | ✓ | @alexmozaidze
-[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J ` |  |  | @chaopeng
-[firrtl](https://github.com/amaanq/tree-sitter-firrtl) | core | `HFIJL` |  |  | @amaanq
-[fish](https://github.com/ram02z/tree-sitter-fish) | community | `HFIJL` |  |  | @ram02z
-[foam](https://github.com/FoamScience/tree-sitter-foam) | community | `HFIJL` |  |  | @FoamScience
-[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | core | `HFIJL` |  |  | @amaanq
-[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | core | `HFI  ` |  |  | @amaanq
-[fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H    ` |  |  | @mgramigna
-[func](https://github.com/amaanq/tree-sitter-func) | core | `H    ` |  |  | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) | community | `HFI L` |  |  | @jirgn
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` |  |  | @PrestonKnopp
-[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` |  |  | @godofavacyn
-[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | core | `HF J ` |  |  | @amaanq
-[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | community | `H  J ` |  |  | @gbprod
-[gitattributes](https://github.com/ObserverOfTime/tree-sitter-gitattributes) | core | `H  JL` |  |  | @ObserverOfTime
-[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | community | `H  J ` |  |  | @gbprod
-[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | core | `H    ` |  |  | @theHamsta
-[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | core | `HFIJL` |  |  | @amaanq
-[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] | community | `HFI L` |  |  | @NullVoxPopuli
-[glsl](https://github.com/theHamsta/tree-sitter-glsl) | core | `HFIJL` |  | ✓ | @theHamsta
-[gn](https://github.com/amaanq/tree-sitter-gn) | core | `HFIJL` |  |  | @amaanq
-[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` |  |  | @dpezto
-[go](https://github.com/tree-sitter/tree-sitter-go) | stable | `HFIJL` |  |  | @theHamsta, @WinWisely268
-[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | community | `HF JL` |  |  | @pierpo
-[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | community | `H  J ` |  |  | @camdencheek
-[gosum](https://github.com/amaanq/tree-sitter-go-sum) | core | `H    ` |  |  | @amaanq
-[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  |  | @qvalentin
-[gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` |  |  | @omertuc
-[gpg](https://github.com/ObserverOfTime/tree-sitter-gpg-config) | core | `H  J ` |  |  | @ObserverOfTime
-[graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` |  |  | @bkegley
-[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` |  |  | @murtaza64
-[gstlaunch](https://github.com/theHamsta/tree-sitter-gstlaunch) | core | `H    ` |  |  | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H    ` |  |  | 
-[hare](https://github.com/amaanq/tree-sitter-hare) | core | `HFIJL` |  |  | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | community | `HF J ` |  |  | @mrcjkb
-[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` |  |  | @lykahb
-[hcl](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  |  | @MichaHoffmann
-[heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` |  |  | @connorlay
-[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  |  | @qvalentin
-[hjson](https://github.com/winston0410/tree-sitter-hjson) | community | `HFIJL` |  | ✓ | @winston0410
-[hlsl](https://github.com/theHamsta/tree-sitter-hlsl) | core | `HFIJL` |  | ✓ | @theHamsta
-[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` |  |  | @Freed-Wu
-[hocon](https://github.com/antosha417/tree-sitter-hocon) | unsupported | `HF J ` |  | ✓ | @antosha417
-[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unsupported | `HF  L` |  |  | @urbit-pilled
-[html](https://github.com/tree-sitter/tree-sitter-html) | community | `HFIJL` |  |  | @TravonteD
-html_tags (queries only)[^html_tags] | community | `H IJ ` |  |  | @TravonteD
-[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unsupported | `HFIJ ` |  |  | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) | core | `H  J ` |  |  | @amaanq, @NTBBloodbath
-[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` |  |  | @pfeiferj
-[hyprlang](https://github.com/luckasRanarison/tree-sitter-hyprlang) | community | `HFIJ ` |  |  | @luckasRanarison
-[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J ` |  |  | @cathaysa
-[ini](https://github.com/justinmk/tree-sitter-ini) | unsupported | `HF   ` |  |  | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` |  |  | @yorickpeterse
-[ispc](https://github.com/fab4100/tree-sitter-ispc) | community | `HFIJL` |  | ✓ | @fab4100
-[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` |  |  | @sogaiu
-[java](https://github.com/tree-sitter/tree-sitter-java) | community | `HFIJL` |  |  | @p00f
-[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | core | `HFIJL` |  |  | @steelsojka
-[jq](https://github.com/flurie/tree-sitter-jq) | core | `H  JL` |  |  | @ObserverOfTime
-[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` |  |  | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` |  |  | @steelsojka
-[json5](https://github.com/Joakker/tree-sitter-json5) | community | `H  J ` |  |  | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) | community | `HFIJL` |  | ✓ | @WhyNotHugo
-[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF  L` |  |  | @nawordar
-jsx (queries only)[^jsx] | core | `HFIJ ` |  |  | @steelsojka
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | core | `HFIJL` |  |  | @theHamsta
-[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` |  |  | @Hubro
-[kconfig](https://github.com/amaanq/tree-sitter-kconfig) | core | `HFIJL` |  |  | @amaanq
-[kdl](https://github.com/amaanq/tree-sitter-kdl) | core | `HFIJL` |  |  | @amaanq
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | community | `HF JL` |  |  | @SalBakraa
-[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` |  |  | @irh
-[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` |  |  | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `H  JL` |  |  | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | core | `HF J ` |  |  | @theHamsta, @clason
-[ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` |  |  | @cbarrete
-[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` |  |  | @r001
-[linkerscript](https://github.com/amaanq/tree-sitter-linkerscript) | core | `HFIJL` |  |  | @amaanq
-[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J ` |  |  | @hankthetank27
-[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFI L` |  |  | @toots
-[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | community | `H    ` |  |  | @benwilliamgraham
-[lua](https://github.com/MunifTanjim/tree-sitter-lua) | stable | `HFIJL` |  |  | @muniftanjim
-[luadoc](https://github.com/amaanq/tree-sitter-luadoc) | core | `H    ` |  |  | @amaanq
-[luap](https://github.com/amaanq/tree-sitter-luap)[^luap] | core | `H    ` |  |  | @amaanq
-[luau](https://github.com/amaanq/tree-sitter-luau) | core | `HFIJL` |  |  | @amaanq
-[m68k](https://github.com/grahambates/tree-sitter-m68k) | community | `HF JL` |  |  | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) | core | `HF J ` |  |  | @lewis6991
-[markdown](https://github.com/MDeiml/tree-sitter-markdown)[^markdown] | stable | `HFIJ ` |  |  | @MDeiml
-[markdown_inline](https://github.com/MDeiml/tree-sitter-markdown)[^markdown_inline] | stable | `H  J ` |  |  | @MDeiml
-[matlab](https://github.com/acristoffers/tree-sitter-matlab) | community | `HFIJL` |  |  | @acristoffers
-[menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` |  |  | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `H    ` |  |  | 
-[meson](https://github.com/Decodetalkers/tree-sitter-meson) | community | `HFIJ ` |  |  | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | unsupported | `H   L` |  |  | @artagnon
-[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` |  |  | @Freed-Wu
-[nasm](https://github.com/naclsn/tree-sitter-nasm) | core | `H  J ` |  |  | @ObserverOfTime
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H I  ` |  |  | 
-[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` |  |  | @aMOPel
-[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` |  |  | @aMOPel
-[ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFI  ` |  |  | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HF JL` |  |  | @leo60228
-[nqc](https://github.com/amaanq/tree-sitter-nqc) | core | `HFIJL` |  |  | @amaanq
-[objc](https://github.com/amaanq/tree-sitter-objc) | core | `HFIJL` |  |  | @amaanq
-[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` |  |  | @ColinKennedy
-[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | community | `HFIJL` |  |  | @undu
-[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | community | `HFIJL` |  |  | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` |  |  | @undu
-[odin](https://github.com/amaanq/tree-sitter-odin) | core | `HFIJL` |  |  | @amaanq
-[org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` |  |  | 
-[pascal](https://github.com/Isopod/tree-sitter-pascal.git) | community | `HFIJL` |  |  | @Isopod
-[passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` |  |  | @amaanq
-[pem](https://github.com/ObserverOfTime/tree-sitter-pem) | core | `HF J ` |  |  | @ObserverOfTime
-[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` |  |  | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | community | `HFIJL` |  |  | @tk-shirasaka
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | community | `HFIJL` |  |  | @tk-shirasaka
-[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unsupported | `H    ` |  | ✓ | @mikehaertl
-[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | community | `H  J ` |  |  | @leo60228
-[po](https://github.com/erasin/tree-sitter-po) | core | `HF J ` |  |  | @amaanq
-[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` |  |  | @RabbiVeesh, @LeoNerd
-[poe_filter](https://github.com/ObserverOfTime/tree-sitter-poe-filter)[^poe_filter] | unsupported | `HFIJ ` |  |  | @ObserverOfTime
-[pony](https://github.com/amaanq/tree-sitter-pony) | core | `HFIJL` |  |  | @amaanq, @mfelsche
-[printf](https://github.com/ObserverOfTime/tree-sitter-printf) | core | `H    ` |  |  | @ObserverOfTime
-[prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `HF   ` |  |  | @elianiva
-[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unsupported | `H  J ` |  |  | @MichaHoffmann
-[properties](https://github.com/ObserverOfTime/tree-sitter-properties)[^properties] | core | `H  JL` |  |  | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) | community | `HF   ` |  |  | @treywood
-[prql](https://github.com/PRQL/tree-sitter-prql) | core | `H  J ` |  |  | @matthias-Q
-[psv](https://github.com/amaanq/tree-sitter-csv) | core | `H    ` |  |  | @amaanq
-[pug](https://github.com/zealot128/tree-sitter-pug) | unsupported | `H  J ` |  |  | @zealot128
-[puppet](https://github.com/amaanq/tree-sitter-puppet) | core | `HFIJL` |  |  | @amaanq
-[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  JL` |  |  | @postsolar
-[pymanifest](https://github.com/ObserverOfTime/tree-sitter-pymanifest) | core | `H  J ` |  |  | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` |  |  | @stsewd, @theHamsta
-[ql](https://github.com/tree-sitter/tree-sitter-ql) | community | `HFIJL` |  |  | @pwntester
-[qmldir](https://github.com/Decodetalkers/tree-sitter-qmldir) | core | `H  J ` |  |  | @amaanq
-[qmljs](https://github.com/yuja/tree-sitter-qmljs) | community | `HF J ` |  |  | @Decodetalkers
-[query](https://github.com/nvim-treesitter/tree-sitter-query)[^query] | stable | `HFIJL` |  |  | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` |  |  | @echasnovski
-[racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` |  |  | 
-[rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` |  |  | @Fymyte
-[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` |  |  | @joker1007
-[re2c](https://github.com/amaanq/tree-sitter-re2c) | core | `HFIJL` |  |  | @amaanq
-[readline](https://github.com/ribru17/tree-sitter-readline) | community | `HFIJ ` |  |  | @ribru17
-[regex](https://github.com/tree-sitter/tree-sitter-regex) | stable | `H    ` |  |  | @theHamsta
-[rego](https://github.com/FallenAngel97/tree-sitter-rego) | community | `H  J ` |  |  | @FallenAngel97
-[requirements](https://github.com/ObserverOfTime/tree-sitter-requirements) | core | `H  J ` |  |  | @ObserverOfTime
-[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | community | `HF J ` |  |  | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFI  ` |  |  | @Hubro
-[roc](https://github.com/nat-418/tree-sitter-roc) | community | `H  JL` |  |  | @nat-418
-[ron](https://github.com/amaanq/tree-sitter-ron) | core | `HFIJL` |  |  | @amaanq
-[rst](https://github.com/stsewd/tree-sitter-rst) | core | `H  JL` |  |  | @stsewd
-[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | community | `HFIJL` |  |  | @TravonteD
-[rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` |  |  | @amaanq
-[scala](https://github.com/tree-sitter/tree-sitter-scala) | community | `HF JL` |  |  | @stevanmilic
-[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` |  |  | @WhyNotHugo
-[scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` |  |  | 
-[scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFI  ` |  |  | @elianiva
-[slang](https://github.com/theHamsta/tree-sitter-slang)[^slang] | unsupported | `HFIJL` |  | ✓ | @theHamsta
-[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` |  |  | @hunger
-[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` |  |  | @amaanq
-[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | core | `H    ` |  |  | @amaanq, @keynmol
-[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unsupported | `HFIJL` |  |  | 
-[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | core | `HF   ` |  |  | @amaanq
-[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  |  | @aheber
-[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  |  | @aheber
-[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` |  |  | @Sarrus1
-[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) | community | `HFIJL` |  |  | @BonaBeavis
-[sql](https://github.com/derekstride/tree-sitter-sql) | community | `H IJ ` |  |  | @derekstride
-[squirrel](https://github.com/amaanq/tree-sitter-squirrel) | core | `HFIJL` |  |  | @amaanq
-[ssh_config](https://github.com/ObserverOfTime/tree-sitter-ssh-config) | core | `HFIJL` |  |  | @ObserverOfTime
-[starlark](https://github.com/amaanq/tree-sitter-starlark) | core | `HFIJL` |  |  | @amaanq
-[strace](https://github.com/sigmaSd/tree-sitter-strace) | core | `H  J ` |  |  | @amaanq
-[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` |  |  | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` |  |  | @madskjeldgaard
-[surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` |  |  | @connorlay
-[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` |  |  | @amaanq
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H I L` |  |  | @alex-pinkus
-[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` |  |  | @RaafatTurki
-[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` |  |  | @ok-ryoko
-[t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJL` |  |  | @xasc
-[tablegen](https://github.com/amaanq/tree-sitter-tablegen) | core | `HFIJL` |  |  | @amaanq
-[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFI  ` |  |  | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` |  |  | @euclidianAce
-[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  |  | @vrischmann
-[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  |  | @MichaHoffmann
-[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI  ` |  |  | @Porter
-[thrift](https://github.com/duskmoon314/tree-sitter-thrift) | core | `HFIJL` |  |  | @amaanq, @duskmoon314
-[tiger](https://github.com/ambroisie/tree-sitter-tiger) | community | `HFIJL` |  |  | @ambroisie
-[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | community | `HF JL` |  |  | @ahelwer, @susliko
-[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` |  |  | @Freed-Wu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | unsupported | `H    ` |  |  | @arnarg
-[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | community | `HFIJL` |  | ✓ | @tk-shirasaka
-[tsv](https://github.com/amaanq/tree-sitter-csv) | core | `H    ` |  |  | @amaanq
-[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | ✓ | @steelsojka
-[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) | community | `HFIJL` |  |  | @BonaBeavis
-[twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` |  |  | @gbprod
-[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | ✓ | @steelsojka
-[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` |  |  | @Teddytrombone
-[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` |  |  | @uben0, @RaafatTurki
-[udev](https://github.com/ObserverOfTime/tree-sitter-udev) | core | `H  JL` |  |  | @ObserverOfTime
-[ungrammar](https://github.com/Philipp-M/tree-sitter-ungrammar) | community | `HFIJL` |  |  | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | unsupported | `H  J ` |  |  | @tapegram
-[usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFI L` |  |  | @ColinKennedy
-[uxntal](https://github.com/amaanq/tree-sitter-uxntal) | core | `HFIJL` |  |  | @amaanq
-[v](https://github.com/vlang/v-analyzer) | community | `HFIJL` |  |  | @kkharji, @amaanq
-[vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF   ` |  |  | @Prince781
-[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` |  |  | @wrapperup, @oscarotero
-[verilog](https://github.com/tree-sitter/tree-sitter-verilog) | community | `HF JL` |  |  | @zegervdv
-[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H    ` |  |  | @caarlos0
-[vim](https://github.com/neovim/tree-sitter-vim) | stable | `HF JL` |  |  | @clason
-[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | stable | `H  J ` |  |  | @clason
-[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | core | `HFIJ ` |  |  | @WhyNotHugo, @lucario387
-[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | community | `HFI  ` |  |  | @szebniok
-[wgsl_bevy](https://github.com/theHamsta/tree-sitter-wgsl-bevy) | core | `HFI  ` |  | ✓ | @theHamsta
-[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF  L` |  |  | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J ` |  |  | @liamwh
-[xcompose](https://github.com/ObserverOfTime/tree-sitter-xcompose) | core | `H  JL` |  |  | @ObserverOfTime
-[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` |  |  | @ObserverOfTime
-[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` |  |  | @amaanq
-[yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` |  |  | @Hubro
-[yuck](https://github.com/Philipp-M/tree-sitter-yuck) | community | `HFIJL` |  |  | @Philipp-M, @amaanq
-[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` |  |  | @Freed-Wu
-[zig](https://github.com/maxxnino/tree-sitter-zig) | community | `HFIJL` |  |  | @maxxnino
+Language | Tier | Queries | CLI | Maintainer
+-------- |:----:|:-------:|:---:| ----------
+[ada](https://github.com/briot/tree-sitter-ada) | community | `HF  L` |  | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) | core | `HF   ` |  | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | community | `HFIJL` |  | @dlvandenberg
+[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF  L` |  | @aheber
+[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | core | `HFIJL` |  | @ObserverOfTime
+[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` |  | @RubixDev
+[astro](https://github.com/virchau13/tree-sitter-astro) | community | `HFIJL` |  | @virchau13
+[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J ` |  | @mattpolzin
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unsupported | `H  J ` |  | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) | stable | `HF JL` |  | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) | community | `HFIJL` |  | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | community | `HF J ` |  | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFI  ` |  | @theHamsta, @clason
+[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | core | `HFIJL` |  | @amaanq
+[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | core | `HFIJL` |  | @amaanq
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unsupported | `H    ` |  | @gabmus
+[c](https://github.com/tree-sitter/tree-sitter-c) | stable | `HFIJL` |  | @amaanq
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | core | `HF JL` |  | @Luxed
+[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | core | `HFIJL` |  | @amaanq
+[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | core | `HFIJL` |  | @amaanq
+[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | core | `HFIJL` |  | @ObserverOfTime
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) | community | `HF JL` |  | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) | community | `HFI  ` |  | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | community | `H    ` |  | @stsewd
+[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | core | `HF  L` |  | @theHamsta
+[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H    ` |  | @addcninblue
+[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFI L` |  | @jakestanger
+[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | core | `HFIJL` |  | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | core | `HFIJL` |  | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) | core | `HFIJ ` |  | @TravonteD
+[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` |  | @amaanq
+[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | core | `HFIJL` |  | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) | community | `HFIJL` |  | @amaanq
+[d](https://github.com/gdamore/tree-sitter-d) | community | `HFIJL` |  | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) | community | `HFIJL` |  | @akinsho
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` |  | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) | community | `HF J ` |  | @amaanq
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H    ` |  | @gbprod
+[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` |  | @ColinKennedy
+[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` |  | @NoahTheDuke
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` |  | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) | community | `H IJ ` |  | @rydesun
+[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | core | `H IJ ` |  | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HF JL` |  | @ObserverOfTime
+[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` |  | @glehmann
+[ebnf](https://github.com/RubixDev/ebnf) | community | `H    ` |  | @RubixDev
+ecma (queries only)[^ecma] | community | `HFIJL` |  | @steelsojka
+[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` |  | @uyha
+[eex](https://github.com/connorlay/tree-sitter-eex) | community | `H  J ` |  | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | community | `HFIJL` |  | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) | community | `H  J ` |  | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | community | `HFIJL` |  | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` |  | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` |  | 
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | community | `HF   ` |  | @filmor
+[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` |  | @bryankenote
+[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` |  | @khiner
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | community | `HF JL` |  | @alexmozaidze
+[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J ` |  | @chaopeng
+[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | core | `HFIJL` |  | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) | community | `HFIJL` |  | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | community | `HFIJL` |  | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | community | `HFIJL` |  | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | community | `HFI  ` |  | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H    ` |  | @mgramigna
+[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | core | `H    ` |  | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) | community | `HFI L` |  | @jirgn
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` |  | @PrestonKnopp
+[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` |  | @godofavacyn
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | community | `HF J ` |  | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | community | `H  J ` |  | @gbprod
+[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | core | `H  JL` |  | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | community | `H  J ` |  | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | community | `H    ` |  | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | community | `HFIJL` |  | @amaanq
+[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] | community | `HFI L` |  | @NullVoxPopuli
+[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | core | `HFIJL` |  | @theHamsta
+[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | core | `HFIJL` |  | @amaanq
+[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` |  | @dpezto
+[go](https://github.com/tree-sitter/tree-sitter-go) | core | `HFIJL` |  | @theHamsta, @WinWisely268
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | community | `HF JL` |  | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | community | `H  J ` |  | @camdencheek
+[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | core | `H    ` |  | @amaanq
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  | @qvalentin
+[gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` |  | @omertuc
+[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | core | `H  J ` |  | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` |  | @bkegley
+[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` |  | @murtaza64
+[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | core | `H    ` |  | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H    ` |  | 
+[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | core | `HFIJL` |  | @amaanq
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | core | `HF J ` |  | @mrcjkb
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` |  | @lykahb
+[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | core | `HFIJ ` |  | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` |  | @connorlay
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  | @qvalentin
+[hjson](https://github.com/winston0410/tree-sitter-hjson) | community | `HFIJL` |  | @winston0410
+[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | core | `HFIJL` |  | @theHamsta
+[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` |  | @Freed-Wu
+[hocon](https://github.com/antosha417/tree-sitter-hocon) | unsupported | `HF J ` |  | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | community | `HF  L` |  | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) | core | `HFIJL` |  | @TravonteD
+html_tags (queries only)[^html_tags] | community | `H IJ ` |  | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | community | `HFIJ ` |  | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) | community | `H  J ` |  | @amaanq, @NTBBloodbath
+[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` |  | @pfeiferj
+[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | core | `HFIJ ` |  | @luckasRanarison
+[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J ` |  | @cathaysa
+[ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF   ` |  | @theHamsta
+[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` |  | @yorickpeterse
+[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | core | `HFIJL` |  | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` |  | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) | core | `HFIJL` |  | @p00f
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | core | `HFIJL` |  | @steelsojka
+[jq](https://github.com/flurie/tree-sitter-jq) | community | `H  JL` |  | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` |  | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` |  | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) | community | `H  J ` |  | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) | community | `HFIJL` |  | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF  L` |  | @nawordar
+jsx (queries only)[^jsx] | community | `HFIJ ` |  | @steelsojka
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | core | `HFIJL` |  | @theHamsta
+[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` |  | @Hubro
+[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | core | `HFIJL` |  | @amaanq
+[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | core | `HFIJL` |  | @amaanq
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | community | `HF JL` |  | @SalBakraa
+[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` |  | @irh
+[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` |  | @Willem-J-an
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `H  JL` |  | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J ` | ✓ | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` |  | @cbarrete
+[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` |  | @r001
+[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | core | `HFIJL` |  | @amaanq
+[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J ` |  | @hankthetank27
+[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFI L` |  | @toots
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | community | `H    ` |  | @benwilliamgraham
+[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | stable | `HFIJL` |  | @muniftanjim
+[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | core | `H    ` |  | @amaanq
+[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | core | `H    ` |  | @amaanq
+[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | core | `HFIJL` |  | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) | community | `HF JL` |  | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) | community | `HF J ` |  | @lewis6991
+[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | stable | `HFIJ ` |  | @MDeiml
+[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | stable | `H  J ` |  | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) | community | `HFIJL` |  | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` |  | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `H    ` |  | 
+[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | core | `HFIJ ` |  | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | community | `H   L` | ✓ | @artagnon
+[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` |  | @Freed-Wu
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | community | `H  J ` |  | @ObserverOfTime
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H I  ` |  | 
+[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` |  | @aMOPel
+[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` |  | @aMOPel
+[ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFI  ` |  | @alemuller
+[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HF JL` |  | @leo60228
+[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | core | `HFIJL` |  | @amaanq
+[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | core | `HFIJL` |  | @amaanq
+[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` |  | @ColinKennedy
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` |  | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` |  | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` | ✓ | @undu
+[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | core | `HFIJL` |  | @amaanq
+[org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` |  | 
+[pascal](https://github.com/Isopod/tree-sitter-pascal.git) | community | `HFIJL` |  | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` |  | @amaanq
+[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | core | `HF J ` |  | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` |  | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | core | `HFIJL` |  | @tk-shirasaka
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | core | `HFIJL` |  | @tk-shirasaka
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | community | `H    ` |  | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | community | `H  J ` |  | @leo60228
+[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | core | `HF J ` |  | @amaanq
+[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` |  | @RabbiVeesh, @LeoNerd
+[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | core | `HFIJ ` |  | @ObserverOfTime
+[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | core | `HFIJL` |  | @amaanq, @mfelsche
+[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | core | `H    ` |  | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `HF   ` |  | @elianiva
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | community | `H  J ` |  | @MichaHoffmann
+[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | core | `H  JL` |  | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) | community | `HF   ` |  | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) | community | `H  J ` |  | @matthias-Q
+[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` |  | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | community | `H  J ` |  | @zealot128
+[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | core | `HFIJL` |  | @amaanq
+[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  JL` |  | @postsolar
+[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | core | `H  J ` |  | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` |  | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) | core | `HFIJL` |  | @pwntester
+[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | core | `H  J ` |  | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) | community | `HF J ` |  | @Decodetalkers
+[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | stable | `HFIJL` |  | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` |  | @echasnovski
+[racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` |  | 
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` |  | @Fymyte
+[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` |  | @joker1007
+[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | core | `HFIJL` |  | @amaanq
+[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | core | `HFIJ ` |  | @ribru17
+[regex](https://github.com/tree-sitter/tree-sitter-regex) | core | `H    ` |  | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) | community | `H  J ` |  | @FallenAngel97
+[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | core | `H  J ` |  | @ObserverOfTime
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | community | `HF J ` |  | @bamonroe
+[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFI  ` |  | @Hubro
+[roc](https://github.com/nat-418/tree-sitter-roc) | community | `H  JL` |  | @nat-418
+[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | core | `HFIJL` |  | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) | community | `H  JL` |  | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | core | `HFIJL` |  | @TravonteD
+[rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` |  | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) | core | `HF JL` |  | @stevanmilic
+[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` | ✓ | @WhyNotHugo
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` |  | 
+[scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFI  ` |  | @elianiva
+[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | core | `HFIJL` |  | @theHamsta
+[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` |  | @hunger
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` |  | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | community | `H    ` |  | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | community | `HFIJL` |  | @osthomas
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | community | `HF   ` |  | @amaanq
+[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  | @aheber
+[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  | @aheber
+[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` |  | @Sarrus1
+[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) | community | `HFIJL` |  | @BonaBeavis
+[sql](https://github.com/derekstride/tree-sitter-sql) | community | `H IJ ` |  | @derekstride
+[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | core | `HFIJL` |  | @amaanq
+[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | core | `HFIJL` |  | @ObserverOfTime
+[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | core | `HFIJL` |  | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | community | `H  J ` |  | @amaanq
+[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` |  | @mskelton
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` |  | @madskjeldgaard
+[surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` |  | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` |  | @amaanq
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H I L` | ✓ | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` |  | @RaafatTurki
+[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` |  | @ok-ryoko
+[t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJL` |  | @xasc
+[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | core | `HFIJL` |  | @amaanq
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFI  ` |  | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | ✓ | @euclidianAce
+[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  | @vrischmann
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  | @MichaHoffmann
+[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI  ` |  | @Porter
+[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | core | `HFIJL` |  | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) | community | `HFIJL` |  | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | community | `HF JL` |  | @ahelwer, @susliko
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` |  | @Freed-Wu
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | community | `H    ` |  | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | core | `HFIJL` |  | @tk-shirasaka
+[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` |  | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | @steelsojka
+[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) | community | `HFIJL` |  | @BonaBeavis
+[twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` |  | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | @steelsojka
+[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` |  | @Teddytrombone
+[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` |  | @uben0, @RaafatTurki
+[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | core | `H  JL` |  | @ObserverOfTime
+[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | core | `HFIJL` |  | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | community | `H  J ` | ✓ | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFI L` |  | @ColinKennedy
+[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | core | `HFIJL` |  | @amaanq
+[v](https://github.com/vlang/v-analyzer) | community | `HFIJL` |  | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF   ` |  | @Prince781
+[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` |  | @wrapperup, @oscarotero
+[verilog](https://github.com/tree-sitter/tree-sitter-verilog) | core | `HF JL` |  | @zegervdv
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H    ` |  | @caarlos0
+[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | stable | `HF JL` |  | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | stable | `H  J ` |  | @clason
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | core | `HFIJ ` |  | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | community | `HFI  ` |  | @szebniok
+[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | core | `HFI  ` |  | @theHamsta
+[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF  L` |  | @gshpychka, @MarkMcCulloh
+[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J ` |  | @liamwh
+[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | core | `H  JL` |  | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` |  | @ObserverOfTime
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` |  | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` |  | @Hubro
+[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | core | `HFIJL` |  | @Philipp-M, @amaanq
+[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` |  | @Freed-Wu
+[zig](https://github.com/maxxnino/tree-sitter-zig) | community | `HFIJL` |  | @maxxnino
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gdscript]: Godot
 [^glimmer]: Glimmer and Ember
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 1d6400977..5d3a23300 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -37,16 +37,8 @@ local function install_health()
     )
   end
 
-  if vim.fn.executable('node') == 0 then
-    health.warn('`node` executable not found (only needed for `:TSInstallFromGrammar`.')
-  else
-    local result = assert(vim.system({ 'node', '--version' }):wait().stdout)
-    local version = vim.split(result, '\n')[1]
-    health.ok('`node` found ' .. version .. ' (only needed for `:TSInstallFromGrammar`)')
-  end
-
   if vim.fn.executable('git') == 0 then
-    health.error(
+    health.warn(
       '`git` executable not found.',
       'Install it with your package manager and check that your `$PATH` is set correctly.'
     )
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 57671d7d3..c501b0fa0 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -31,7 +31,7 @@ local M = {}
 ---@type table<string, LockfileInfo>
 local lockfile = {}
 
-local max_jobs = 50
+local max_jobs = 10
 
 local iswin = uv.os_uname().sysname == 'Windows_NT'
 local ismac = uv.os_uname().sysname == 'Darwin'
@@ -145,24 +145,17 @@ end
 --- @param repo InstallInfo
 --- @param compile_location string
 --- @return string? err
-local function do_generate_from_grammar(logger, repo, compile_location)
+local function do_generate(logger, repo, compile_location)
   if not executable('tree-sitter') then
     return logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
   end
 
-  if repo.generate_requires_npm then
-    if not executable('npm') then
-      return logger:error('NPM requires to be installed from grammar.js')
-    end
-
-    logger:info('Installing NPM dependencies')
-    local r = system({ 'npm', 'install' }, { cwd = compile_location })
-    if r.code > 0 then
-      return logger:error('Error during `npm install`: %s', r.stderr)
-    end
-  end
-
-  logger:info('Generating source files from grammar.js...')
+  logger:info(
+    string.format(
+      'Generating parser.c from %s...',
+      repo.generate_from_json and 'grammar.json' or 'grammar.js'
+    )
+  )
 
   local r = system({
     fn.exepath('tree-sitter'),
@@ -170,6 +163,7 @@ local function do_generate_from_grammar(logger, repo, compile_location)
     '--no-bindings',
     '--abi',
     tostring(vim.treesitter.language_version),
+    repo.generate_from_json and 'src/grammar.json',
   }, { cwd = compile_location })
   if r.code > 0 then
     return logger:error('Error during "tree-sitter generate": %s', r.stderr)
@@ -262,6 +256,10 @@ end
 ---@param project_dir string
 ---@return string? err
 local function do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
+  if not executable('git') then
+    return logger:error('git not found!')
+  end
+
   logger:info('Downloading ' .. project_name .. '...')
 
   local r = system({
@@ -386,7 +384,7 @@ end
 ---@param repo InstallInfo
 ---@param cc string
 ---@param compile_location string
---- @return string? err
+---@return string? err
 local function do_compile(logger, repo, cc, compile_location)
   local args = vim.tbl_flatten(select_compiler_args(repo, cc))
   local cmd = vim.list_extend({ cc }, args)
@@ -442,7 +440,7 @@ local function install_lang0(lang, cache_dir, install_dir, generate)
 
     do
       if repo.generate or generate then
-        local err = do_generate_from_grammar(logger, repo, compile_location)
+        local err = do_generate(logger, repo, compile_location)
         if err then
           return err
         end
@@ -497,9 +495,9 @@ local INSTALL_TIMEOUT = 60000
 ---@param cache_dir string
 ---@param install_dir string
 ---@param force? boolean
----@param generate_from_grammar? boolean
+---@param generate? boolean
 ---@return InstallStatus status
-local function install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
+local function install_lang(lang, cache_dir, install_dir, force, generate)
   if not force and vim.list_contains(config.installed_parsers(), lang) then
     local yesno = fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
     print('\n ')
@@ -518,7 +516,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate_from_g
     end
   else
     install_status[lang] = 'installing'
-    local err = install_lang0(lang, cache_dir, install_dir, generate_from_grammar)
+    local err = install_lang0(lang, cache_dir, install_dir, generate)
     install_status[lang] = err and 'failed' or 'installed'
   end
 
@@ -529,7 +527,7 @@ end
 
 ---@class InstallOptions
 ---@field force? boolean
----@field generate_from_grammar? boolean
+---@field generate? boolean
 ---@field skip? table
 
 --- Install a parser
@@ -539,7 +537,7 @@ end
 local function install(languages, options, _callback)
   options = options or {}
   local force = options.force
-  local generate_from_grammar = options.generate_from_grammar
+  local generate = options.generate
   local skip = options.skip
 
   local cache_dir = vim.fs.normalize(fn.stdpath('cache'))
@@ -560,7 +558,7 @@ local function install(languages, options, _callback)
   for _, lang in ipairs(languages) do
     tasks[#tasks + 1] = a.sync(function()
       a.main()
-      local status = install_lang(lang, cache_dir, install_dir, force, generate_from_grammar)
+      local status = install_lang(lang, cache_dir, install_dir, force, generate)
       if status ~= 'failed' then
         done = done + 1
       end
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6f5915da1..4e3222563 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -4,8 +4,8 @@
 ---@field branch? string
 ---@field revision? string
 ---@field files string[]
----@field generate_requires_npm? boolean
 ---@field generate? boolean
+---@field generate_from_json? boolean
 ---@field location? string
 
 ---@class ParserInfo
@@ -36,18 +36,18 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@Decodetalkers' },
-    tier = 3,
+    tier = 2,
   },
 
   angular = {
     install_info = {
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@dlvandenberg' },
     requires = { 'html', 'html_tags' },
-    tier = 4,
+    tier = 3,
   },
 
   apex = {
@@ -62,8 +62,9 @@ M.configs = {
 
   arduino = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-arduino',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@ObserverOfTime' },
     requires = { 'cpp' },
@@ -83,6 +84,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/virchau13/tree-sitter-astro',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@virchau13' },
     requires = { 'html', 'html_tags' },
@@ -112,7 +114,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@TravonteD' },
-    tier = 3,
+    tier = 1,
   },
 
   bass = {
@@ -121,7 +123,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   beancount = {
@@ -139,12 +141,12 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta', '@clason' },
-    tier = 2,
+    tier = 3,
   },
 
   bicep = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-bicep',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-bicep',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -153,7 +155,7 @@ M.configs = {
 
   bitbake = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-bitbake',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-bitbake',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -209,12 +211,12 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
 
   cairo = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-cairo',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cairo',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -232,7 +234,7 @@ M.configs = {
 
   capnp = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-capnp',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-capnp',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -241,7 +243,7 @@ M.configs = {
 
   chatito = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-chatito',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-chatito',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -272,7 +274,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@uyha' },
-    tier = 4,
+    tier = 3,
   },
 
   comment = {
@@ -281,14 +283,14 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@stsewd' },
-    tier = 2,
+    tier = 3,
   },
 
   commonlisp = {
     install_info = {
-      url = 'https://github.com/theHamsta/tree-sitter-commonlisp',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-commonlisp',
       files = { 'src/parser.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@theHamsta' },
     tier = 2,
@@ -314,7 +316,7 @@ M.configs = {
 
   cpon = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-cpon',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cpon',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -325,11 +327,11 @@ M.configs = {
     install_info = {
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@theHamsta' },
     requires = { 'c' },
-    tier = 1,
+    tier = 2,
   },
 
   css = {
@@ -338,12 +340,12 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@TravonteD' },
-    tier = 3,
+    tier = 2,
   },
 
   csv = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-csv',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
       files = { 'src/parser.c' },
       location = 'csv',
     },
@@ -354,9 +356,9 @@ M.configs = {
 
   cuda = {
     install_info = {
-      url = 'https://github.com/theHamsta/tree-sitter-cuda',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@theHamsta' },
     requires = { 'cpp' },
@@ -369,7 +371,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   cylc = {
@@ -386,7 +388,7 @@ M.configs = {
       url = 'https://github.com/gdamore/tree-sitter-d',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
-    tier = 2,
+    tier = 3,
     maintainers = { '@amaanq' },
   },
 
@@ -396,7 +398,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@akinsho' },
-    tier = 4,
+    tier = 3,
   },
 
   desktop = {
@@ -423,7 +425,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   diff = {
@@ -473,7 +475,7 @@ M.configs = {
 
   doxygen = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-doxygen',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-doxygen',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -498,6 +500,7 @@ M.configs = {
     maintainers = { '@glehmann' },
     tier = 3,
   },
+
   ebnf = {
     install_info = {
       url = 'https://github.com/RubixDev/ebnf',
@@ -505,13 +508,13 @@ M.configs = {
       location = 'crates/tree-sitter-ebnf',
     },
     maintainers = { '@RubixDev' },
-    tier = 4,
+    tier = 3,
   },
 
   ecma = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, typescript, tsx, qmljs',
-    tier = 2,
+    tier = 3,
   },
 
   editorconfig = {
@@ -556,7 +559,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@zweimach' },
-    tier = 4,
+    tier = 3,
   },
 
   elsa = {
@@ -565,7 +568,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@glapa-grossklag', '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   elvish = {
@@ -625,7 +628,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@alexmozaidze' },
     tier = 3,
@@ -642,7 +645,7 @@ M.configs = {
 
   firrtl = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-firrtl',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-firrtl',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -673,7 +676,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   fortran = {
@@ -682,7 +685,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   fsh = {
@@ -706,7 +709,7 @@ M.configs = {
 
   func = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-func',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-func',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -773,7 +776,7 @@ M.configs = {
 
   gitattributes = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-gitattributes',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gitattributes',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -795,7 +798,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   gitignore = {
@@ -804,7 +807,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta' },
-    tier = 2,
+    tier = 3,
   },
 
   gleam = {
@@ -813,7 +816,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   glimmer = {
@@ -850,9 +853,9 @@ M.configs = {
 
   glsl = {
     install_info = {
-      url = 'https://github.com/theHamsta/tree-sitter-glsl',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
       files = { 'src/parser.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@theHamsta' },
     requires = { 'c' },
@@ -861,7 +864,7 @@ M.configs = {
 
   gn = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-gn',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gn',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -884,7 +887,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
-    tier = 1,
+    tier = 2,
   },
 
   goctl = {
@@ -917,7 +920,7 @@ M.configs = {
 
   gosum = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-go-sum',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-go-sum',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -953,7 +956,7 @@ M.configs = {
 
   gpg = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-gpg-config',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gpg-config',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -980,7 +983,7 @@ M.configs = {
 
   gstlaunch = {
     install_info = {
-      url = 'https://github.com/theHamsta/tree-sitter-gstlaunch',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch',
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta' },
@@ -997,7 +1000,7 @@ M.configs = {
 
   hare = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-hare',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hare',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -1010,7 +1013,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@mrcjkb' },
-    tier = 3,
+    tier = 2,
   },
 
   haskell_persistent = {
@@ -1024,11 +1027,11 @@ M.configs = {
 
   hcl = {
     install_info = {
-      url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@MichaHoffmann' },
-    tier = 3,
+    tier = 2,
   },
 
   heex = {
@@ -1054,7 +1057,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/winston0410/tree-sitter-hjson',
       files = { 'src/parser.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@winston0410' },
     requires = { 'json' },
@@ -1063,9 +1066,9 @@ M.configs = {
 
   hlsl = {
     install_info = {
-      url = 'https://github.com/theHamsta/tree-sitter-hlsl',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@theHamsta' },
     requires = { 'cpp' },
@@ -1085,7 +1088,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/antosha417/tree-sitter-hocon',
       files = { 'src/parser.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@antosha417' },
     tier = 4,
@@ -1097,7 +1100,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@urbit-pilled' },
-    tier = 4,
+    tier = 3,
   },
 
   html_tags = {
@@ -1113,7 +1116,7 @@ M.configs = {
     },
     maintainers = { '@TravonteD' },
     requires = { 'html_tags' },
-    tier = 3,
+    tier = 2,
   },
 
   htmldjango = {
@@ -1122,7 +1125,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
-    tier = 4,
+    tier = 3,
   },
 
   http = {
@@ -1131,7 +1134,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
-    tier = 2,
+    tier = 3,
   },
 
   hurl = {
@@ -1145,11 +1148,11 @@ M.configs = {
 
   hyprlang = {
     install_info = {
-      url = 'https://github.com/luckasRanarison/tree-sitter-hyprlang',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
       files = { 'src/parser.c' },
     },
     maintainers = { '@luckasRanarison' },
-    tier = 3,
+    tier = 2,
   },
 
   idl = {
@@ -1176,7 +1179,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta' },
-    tier = 4,
+    tier = 3,
   },
 
   inko = {
@@ -1199,13 +1202,13 @@ M.configs = {
 
   ispc = {
     install_info = {
-      url = 'https://github.com/fab4100/tree-sitter-ispc',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ispc',
       files = { 'src/parser.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@fab4100' },
     requires = { 'c' },
-    tier = 3,
+    tier = 2,
   },
 
   janet_simple = {
@@ -1223,7 +1226,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@p00f' },
-    tier = 3,
+    tier = 2,
   },
 
   javadoc = {
@@ -1273,7 +1276,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
-    tier = 2,
+    tier = 3,
   },
 
   jsdoc = {
@@ -1307,7 +1310,7 @@ M.configs = {
     install_info = {
       url = 'https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git',
       files = { 'src/parser.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@WhyNotHugo' },
     requires = { 'json' },
@@ -1326,7 +1329,7 @@ M.configs = {
   jsx = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, tsx',
-    tier = 2,
+    tier = 3,
   },
 
   julia = {
@@ -1358,7 +1361,7 @@ M.configs = {
 
   kconfig = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-kconfig',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-kconfig',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -1367,7 +1370,7 @@ M.configs = {
 
   kdl = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-kdl',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-kdl',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -1417,7 +1420,7 @@ M.configs = {
       generate = true,
     },
     maintainers = { '@theHamsta', '@clason' },
-    tier = 2,
+    tier = 3,
   },
 
   ledger = {
@@ -1449,7 +1452,7 @@ M.configs = {
 
   linkerscript = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-linkerscript',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-linkerscript',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -1476,7 +1479,7 @@ M.configs = {
 
   lua = {
     install_info = {
-      url = 'https://github.com/MunifTanjim/tree-sitter-lua',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@muniftanjim' },
@@ -1485,7 +1488,7 @@ M.configs = {
 
   luadoc = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-luadoc',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luadoc',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -1494,7 +1497,7 @@ M.configs = {
 
   luap = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-luap',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luap',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -1504,8 +1507,9 @@ M.configs = {
 
   luau = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-luau',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luau',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@amaanq' },
     requires = { 'lua' },
@@ -1527,12 +1531,12 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@lewis6991' },
-    tier = 2,
+    tier = 3,
   },
 
   markdown = {
     install_info = {
-      url = 'https://github.com/MDeiml/tree-sitter-markdown',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
       location = 'tree-sitter-markdown',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
@@ -1544,7 +1548,7 @@ M.configs = {
 
   markdown_inline = {
     install_info = {
-      url = 'https://github.com/MDeiml/tree-sitter-markdown',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
       location = 'tree-sitter-markdown-inline',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
@@ -1581,11 +1585,11 @@ M.configs = {
 
   meson = {
     install_info = {
-      url = 'https://github.com/Decodetalkers/tree-sitter-meson',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
       files = { 'src/parser.c' },
     },
     maintainers = { '@Decodetalkers' },
-    tier = 3,
+    tier = 2,
   },
 
   mlir = {
@@ -1595,7 +1599,7 @@ M.configs = {
       generate = true,
     },
     maintainers = { '@artagnon' },
-    tier = 4,
+    tier = 3,
   },
 
   muttrc = {
@@ -1613,7 +1617,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
-    tier = 2,
+    tier = 3,
   },
 
   nginx = {
@@ -1672,8 +1676,9 @@ M.configs = {
 
   nqc = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-nqc',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-nqc',
       files = { 'src/parser.c' },
+      generate_from_json = true,
     },
     maintainers = { '@amaanq' },
     tier = 2,
@@ -1690,8 +1695,9 @@ M.configs = {
 
   objc = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-objc',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-objc',
       files = { 'src/parser.c' },
+      generate_from_json = true,
     },
     maintainers = { '@amaanq' },
     requires = { 'c' },
@@ -1714,7 +1720,7 @@ M.configs = {
       location = 'grammars/ocaml',
     },
     maintainers = { '@undu' },
-    tier = 3,
+    tier = 2,
   },
 
   ocaml_interface = {
@@ -1725,7 +1731,7 @@ M.configs = {
     },
     maintainers = { '@undu' },
     requires = { 'ocaml' },
-    tier = 3,
+    tier = 2,
   },
 
   ocamllex = {
@@ -1740,7 +1746,7 @@ M.configs = {
 
   odin = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-odin',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-odin',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -1767,7 +1773,7 @@ M.configs = {
 
   pem = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-pem',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pem',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -1779,6 +1785,7 @@ M.configs = {
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
       branch = 'release',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
     tier = 3,
@@ -1793,7 +1800,7 @@ M.configs = {
     maintainers = { '@tk-shirasaka', '@calebdw' },
     requires = { 'php_only' },
     readme_note = 'PHP with embedded HTML',
-    tier = 3,
+    tier = 2,
   },
 
   php_only = {
@@ -1804,17 +1811,17 @@ M.configs = {
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
     readme_note = 'PHP without embedded HTML',
-    tier = 3,
+    tier = 2,
   },
 
   phpdoc = {
     install_info = {
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@mikehaertl' },
-    tier = 4,
+    tier = 3,
   },
 
   pioasm = {
@@ -1828,7 +1835,7 @@ M.configs = {
 
   po = {
     install_info = {
-      url = 'https://github.com/erasin/tree-sitter-po',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-po',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -1840,6 +1847,7 @@ M.configs = {
       url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
       files = { 'src/parser.c', 'src/scanner.c' },
       branch = 'release',
+      generate_from_json = true,
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
     tier = 3,
@@ -1847,17 +1855,17 @@ M.configs = {
 
   poe_filter = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-poe-filter',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-poe-filter',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
     readme_note = 'Path of Exile item filter',
-    tier = 4,
+    tier = 2,
   },
 
   pony = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-pony',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pony',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq', '@mfelsche' },
@@ -1876,7 +1884,7 @@ M.configs = {
 
   printf = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-printf',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-printf',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -1915,7 +1923,7 @@ M.configs = {
 
   properties = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-properties',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-properties',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -1938,7 +1946,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@MichaHoffmann' },
-    tier = 4,
+    tier = 3,
   },
 
   prql = {
@@ -1947,12 +1955,12 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@matthias-Q' },
-    tier = 2,
+    tier = 3,
   },
 
   psv = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-csv',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
       files = { 'src/parser.c' },
       location = 'psv',
     },
@@ -1967,12 +1975,12 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@zealot128' },
-    tier = 4,
+    tier = 3,
   },
 
   puppet = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-puppet',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-puppet',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -1990,7 +1998,7 @@ M.configs = {
 
   pymanifest = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-pymanifest',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pymanifest',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -2013,12 +2021,12 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@pwntester' },
-    tier = 3,
+    tier = 2,
   },
 
   qmldir = {
     install_info = {
-      url = 'https://github.com/Decodetalkers/tree-sitter-qmldir',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-qmldir',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -2029,6 +2037,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/yuja/tree-sitter-qmljs',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@Decodetalkers' },
     requires = { 'ecma' },
@@ -2037,7 +2046,7 @@ M.configs = {
 
   query = {
     install_info = {
-      url = 'https://github.com/nvim-treesitter/tree-sitter-query',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
       files = { 'src/parser.c' },
     },
     maintainers = { '@steelsojka' },
@@ -2082,6 +2091,8 @@ M.configs = {
 
   razor = {
     install_info = {
+      generate_from_json = true,
+      revision = 'a47cd8ca148685629739a4ab69f58864800fbdab',
       url = 'https://github.com/tris203/tree-sitter-razor',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
@@ -2100,7 +2111,7 @@ M.configs = {
 
   re2c = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-re2c',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-re2c',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
@@ -2109,11 +2120,11 @@ M.configs = {
 
   readline = {
     install_info = {
-      url = 'https://github.com/ribru17/tree-sitter-readline',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-readline',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ribru17' },
-    tier = 3,
+    tier = 2,
   },
 
   regex = {
@@ -2122,7 +2133,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@theHamsta' },
-    tier = 1,
+    tier = 2,
   },
 
   rego = {
@@ -2136,7 +2147,7 @@ M.configs = {
 
   requirements = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-requirements',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-requirements',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -2191,7 +2202,7 @@ M.configs = {
 
   ron = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-ron',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ron',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -2204,7 +2215,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@stsewd' },
-    tier = 2,
+    tier = 3,
   },
 
   ruby = {
@@ -2213,7 +2224,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@TravonteD' },
-    tier = 3,
+    tier = 2,
   },
 
   runescript = {
@@ -2240,7 +2251,7 @@ M.configs = {
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@stevanmilic' },
-    tier = 3,
+    tier = 2,
   },
 
   scfg = {
@@ -2283,13 +2294,13 @@ M.configs = {
   },
   slang = {
     install_info = {
-      url = 'https://github.com/theHamsta/tree-sitter-slang',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     readme_note = 'Shader Slang',
     maintainers = { '@theHamsta' },
-    tier = 4,
+    tier = 2,
   },
 
   slim = {
@@ -2323,9 +2334,10 @@ M.configs = {
     install_info = {
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
-    maintainer = { '@osthomas' },
-    tier = 4,
+    maintainers = { '@osthomas' },
+    tier = 3,
   },
 
   smithy = {
@@ -2334,7 +2346,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq', '@keynmol' },
-    tier = 2,
+    tier = 3,
   },
 
   solidity = {
@@ -2343,7 +2355,7 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   soql = {
@@ -2379,6 +2391,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
       files = { 'src/parser.c' },
+      generate_from_json = true,
     },
     maintainers = { '@GordianDziwis' },
     tier = 3,
@@ -2389,6 +2402,7 @@ M.configs = {
       url = 'https://github.com/derekstride/tree-sitter-sql',
       files = { 'src/parser.c', 'src/scanner.c' },
       branch = 'gh-pages',
+      generate_from_json = true,
     },
     maintainers = { '@derekstride' },
     tier = 3,
@@ -2396,7 +2410,7 @@ M.configs = {
 
   squirrel = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-squirrel',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-squirrel',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -2405,7 +2419,7 @@ M.configs = {
 
   ssh_config = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-ssh-config',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ssh-config',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -2414,8 +2428,9 @@ M.configs = {
 
   starlark = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-starlark',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-starlark',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@amaanq' },
     tier = 2,
@@ -2427,13 +2442,14 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq' },
-    tier = 2,
+    tier = 3,
   },
 
   styled = {
     install_info = {
       url = 'https://github.com/mskelton/tree-sitter-styled',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@mskelton' },
     tier = 3,
@@ -2471,6 +2487,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@amaanq' },
     requires = { 'html_tags' },
@@ -2525,7 +2542,7 @@ M.configs = {
 
   tablegen = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-tablegen',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-tablegen',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -2555,6 +2572,7 @@ M.configs = {
     install_info = {
       url = 'https://github.com/vrischmann/tree-sitter-templ',
       files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
     },
     maintainers = { '@vrischmann' },
     tier = 3,
@@ -2600,7 +2618,7 @@ M.configs = {
 
   thrift = {
     install_info = {
-      url = 'https://github.com/duskmoon314/tree-sitter-thrift',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-thrift',
       files = { 'src/parser.c' },
     },
     maintainers = { '@amaanq', '@duskmoon314' },
@@ -2640,22 +2658,22 @@ M.configs = {
       files = { 'src/parser.c' },
     },
     maintainers = { '@arnarg' },
-    tier = 4,
+    tier = 3,
   },
 
   toml = {
     install_info = {
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-toml',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@tk-shirasaka' },
-    tier = 3,
+    tier = 2,
   },
 
   tsv = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-csv',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
       files = { 'src/parser.c' },
       location = 'tsv',
     },
@@ -2668,7 +2686,7 @@ M.configs = {
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'tsx',
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma', 'jsx', 'typescript' },
@@ -2698,7 +2716,7 @@ M.configs = {
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'typescript',
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma' },
@@ -2734,7 +2752,7 @@ M.configs = {
 
   udev = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-udev',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-udev',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -2743,11 +2761,11 @@ M.configs = {
 
   ungrammar = {
     install_info = {
-      url = 'https://github.com/Philipp-M/tree-sitter-ungrammar',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ungrammar',
       files = { 'src/parser.c' },
     },
     maintainers = { '@Philipp-M', '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
 
   unison = {
@@ -2757,7 +2775,7 @@ M.configs = {
       generate = true,
     },
     maintainers = { '@tapegram' },
-    tier = 4,
+    tier = 3,
   },
 
   usd = {
@@ -2771,7 +2789,7 @@ M.configs = {
 
   uxntal = {
     install_info = {
-      url = 'https://github.com/amaanq/tree-sitter-uxntal',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-uxntal',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@amaanq' },
@@ -2835,7 +2853,7 @@ M.configs = {
 
   vim = {
     install_info = {
-      url = 'https://github.com/neovim/tree-sitter-vim',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@clason' },
@@ -2865,6 +2883,7 @@ M.configs = {
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
       files = { 'src/parser.c', 'src/scanner.c' },
       branch = 'main',
+      generate_from_json = true,
     },
     maintainers = { '@WhyNotHugo', '@lucario387' },
     requires = { 'html_tags' },
@@ -2891,9 +2910,9 @@ M.configs = {
 
   wgsl_bevy = {
     install_info = {
-      url = 'https://github.com/theHamsta/tree-sitter-wgsl-bevy',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@theHamsta' },
     tier = 2,
@@ -2907,9 +2926,10 @@ M.configs = {
     maintainers = { '@liamwh' },
     tier = 3,
   },
+
   xcompose = {
     install_info = {
-      url = 'https://github.com/ObserverOfTime/tree-sitter-xcompose',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xcompose',
       files = { 'src/parser.c' },
     },
     maintainers = { '@ObserverOfTime' },
@@ -2957,11 +2977,11 @@ M.configs = {
 
   yuck = {
     install_info = {
-      url = 'https://github.com/Philipp-M/tree-sitter-yuck',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-yuck',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@Philipp-M', '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
 
   zathurarc = {
@@ -3019,12 +3039,11 @@ function M.get_available(tier)
       parsers
     )
   end
-  if vim.fn.executable('tree-sitter') == 0 or vim.fn.executable('node') == 0 then
+  if vim.fn.executable('tree-sitter') == 0 then
     parsers = vim.tbl_filter(
       --- @param p string
       function(p)
-        return M.configs[p].install_info ~= nil
-          and not M.configs[p].install_info.requires_generate_from_grammar
+        return M.configs[p].install_info ~= nil and not M.configs[p].install_info.generate
       end,
       parsers
     )
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index 751e8aad1..32f3db311 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -38,7 +38,7 @@ end, {
 
 api.nvim_create_user_command('TSInstallFromGrammar', function(args)
   require('nvim-treesitter.install').install(args.fargs, {
-    generate_from_grammar = true,
+    generate = true,
     force = args.bang,
   })
 end, {
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index ab06e538f..c607e51f4 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -1,14 +1,28 @@
 #!/usr/bin/env -S nvim -l
 
+local generate = false
+local parsers = {}
+for i = 1, #_G.arg do
+  if _G.arg[i] == '--generate' then
+    generate = true
+  else
+    parsers[#parsers + 1] = _G.arg[i]
+  end
+end
+
 vim.opt.runtimepath:append('.')
 
 -- needed on CI
 vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
 
 local done = false
-require('nvim-treesitter.install').install('all', {}, function()
-  done = true
-end)
+require('nvim-treesitter.install').install(
+  #parsers > 0 and parsers or 'all',
+  { force = true, generate = generate },
+  function()
+    done = true
+  end
+)
 
 vim.wait(6000000, function()
   return done
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index fb9a9b32c..f8346bf4d 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -15,8 +15,8 @@ table.sort(sorted_parsers, function(a, b)
 end)
 
 local generated_text = [[
-Language | Tier | Queries | CLI | NPM | Maintainer
--------- |:----:|:-------:|:---:|:---:| ----------
+Language | Tier | Queries | CLI | Maintainer
+-------- |:----:|:-------:|:---:| ----------
 ]]
 local footnotes = ''
 
@@ -59,12 +59,7 @@ for _, v in ipairs(sorted_parsers) do
 
   -- CLI
   generated_text = generated_text
-    .. (p.install_info and p.install_info.requires_generate_from_grammar and '✓' or '')
-    .. ' | '
-
-  -- NPM
-  generated_text = generated_text
-    .. (p.install_info and p.install_info.generate_requires_npm and '✓' or '')
+    .. (p.install_info and p.install_info.generate and '✓' or '')
     .. ' | '
 
   -- Maintainer

From 054080bf5986b39128cc64fba6ab144e961d4e2d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 22 Apr 2024 19:27:12 +0200
Subject: [PATCH 2313/2704] fix: vim.tbl_flatten is deprecated

---
 lua/nvim-treesitter/install.lua | 2 +-
 tests/indent/common.lua         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c501b0fa0..6918a1820 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -386,7 +386,7 @@ end
 ---@param compile_location string
 ---@return string? err
 local function do_compile(logger, repo, cc, compile_location)
-  local args = vim.tbl_flatten(select_compiler_args(repo, cc))
+  local args = vim.iter(select_compiler_args(repo, cc)):flatten():totable()
   local cmd = vim.list_extend({ cc }, args)
 
   logger:info('Compiling parser')
diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index f33a5908b..6add58c7f 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -183,7 +183,7 @@ function Runner:whole_file(dirs, opts)
     assert.is.same(1, vim.fn.isdirectory(dir.filename))
     return dir.filename
   end, dirs)
-  local files = require('nvim-treesitter.compat').flatten(vim.tbl_map(scan_dir, dirs))
+  local files = vim.iter(vim.tbl_map(scan_dir, dirs)):flatten():totable()
   for _, file in ipairs(files) do
     local relpath = Path:new(file):make_relative(self.base_dir.filename)
     self.it(relpath, function()

From c17de5689045f75c6244462182ae3b4b62df02d9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 14 Apr 2024 16:25:28 +0200
Subject: [PATCH 2314/2704] feat!: track parser revision in Lua

Problem: Tracking parser revision in lockfile and allowing override
through the parsers module complicates the code. In addition, only
revision changes are handled robustly, not changes to other installation
info.

Solution: Track parser revision in the parsers module directly. Reload
parser table on every install or update call. Support modifying parser
table in a `User TSUpdate` autocommand.
---
 .github/workflows/tests.yml                   |    1 +
 .github/workflows/update-lockfile.yml         |   55 -
 .github/workflows/update-parsers.yml          |   55 +
 .github/workflows/update-readme.yml           |    3 +-
 CONTRIBUTING.md                               |   18 +-
 README.md                                     |   65 +-
 SUPPORTED_LANGUAGES.md                        |   20 +-
 TODO.md                                       |    9 +-
 doc/nvim-treesitter.txt                       |    2 +-
 lua/nvim-treesitter/_meta/parsers.lua         |   47 +
 lua/nvim-treesitter/config.lua                |   82 +-
 lua/nvim-treesitter/health.lua                |    2 +-
 lua/nvim-treesitter/install.lua               |   77 +-
 lua/nvim-treesitter/parsers.lua               | 1405 ++++++++---------
 plugin/nvim-treesitter.lua                    |    2 +-
 scripts/check-queries.lua                     |    2 +-
 scripts/convert-lockfile.lua                  |   21 +
 scripts/update-lockfile.lua                   |   64 -
 scripts/update-parsers.lua                    |   65 +
 scripts/update-readme.lua                     |    5 +-
 .../injections/nix/test-nix-injections.nix    |    2 +-
 21 files changed, 1007 insertions(+), 995 deletions(-)
 delete mode 100644 .github/workflows/update-lockfile.yml
 create mode 100644 .github/workflows/update-parsers.yml
 create mode 100644 lua/nvim-treesitter/_meta/parsers.lua
 create mode 100755 scripts/convert-lockfile.lua
 delete mode 100755 scripts/update-lockfile.lua
 create mode 100755 scripts/update-parsers.lua

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 86c7ad630..f78afe711 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - "main"
+  workflow_dispatch:
 
 # Cancel any in-progress CI runs for a PR if it is updated
 concurrency:
diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml
deleted file mode 100644
index 70d2c0c0a..000000000
--- a/.github/workflows/update-lockfile.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Update lockfile
-
-on:
-  schedule:
-    - cron: "30 6 * * 6"
-  workflow_dispatch:
-
-jobs:
-  update-lockfile:
-    name: Update lockfile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: main
-
-      - uses: actions/create-github-app-token@v2
-        id: app-token
-        with:
-          app-id: ${{ vars.TOKEN_ID }}
-          private-key: ${{ secrets.TOKEN_PRIVATE_KEY }}
-
-      - name: Prepare
-        env:
-          NVIM_TAG: nightly
-        run: |
-          wget https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux
-          mv jd-amd64-linux /tmp/jd
-          chmod +x /tmp/jd
-          bash scripts/ci-install.sh
-
-      - name: Update parsers
-        env:
-          SKIP_LOCKFILE_UPDATE_FOR_LANGS: "bp,devicetree,dhall,elm,enforce,git_config,nickel,rescript,rust,slint,sql,t32,templ,typespec,verilog,wit"
-        run: |
-          cp lockfile.json /tmp/old_lockfile.json
-          nvim -l ./scripts/update-lockfile.lua
-          UPDATED_PARSERS=$(/tmp/jd -f merge /tmp/old_lockfile.json lockfile.json | jq -r 'keys | join(", ")')
-          echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-          sign-commits: true
-          commit-message: "bot(lockfile): update ${{ env.UPDATED_PARSERS }}"
-          title: "Update lockfile.json: ${{ env.UPDATED_PARSERS }}"
-          body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
-          branch: update-lockfile-pr
-          base: ${{ github.head_ref }}
-
-      - name: Enable Pull Request Automerge
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh pr merge --rebase --auto update-lockfile-pr
diff --git a/.github/workflows/update-parsers.yml b/.github/workflows/update-parsers.yml
new file mode 100644
index 000000000..683c732c6
--- /dev/null
+++ b/.github/workflows/update-parsers.yml
@@ -0,0 +1,55 @@
+name: Update parsers
+
+on:
+  schedule:
+    - cron: "30 6 * * *"
+  workflow_dispatch:
+
+env:
+  BIN_DIR: ${{ github.workspace }}/bin
+
+jobs:
+  update-parsers:
+    name: Update parsers
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: main
+
+      - uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ vars.TOKEN_ID }}
+          private-key: ${{ secrets.TOKEN_PRIVATE_KEY }}
+
+      - name: Add $BIN_DIR to PATH
+        run: echo "$BIN_DIR" >> $GITHUB_PATH
+
+      - name: Prepare
+        env:
+          NVIM_TAG: nightly
+        run: |
+          bash scripts/ci-install.sh
+          wget --directory-prefix="$BIN_DIR" https://github.com/JohnnyMorganz/StyLua/releases/latest/download/stylua-linux-x86_64.zip
+          (cd "$BIN_DIR"; unzip stylua*.zip)
+
+      - name: Update parsers
+        run: ./scripts/update-parsers.lua
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          add-paths: lua/nvim-treesitter/parsers.lua
+          token: ${{ steps.app-token.outputs.token }}
+          sign-commits: true
+          commit-message: "bot(parsers): update ${{ env.UPDATED_PARSERS }}"
+          title: "Update parsers: ${{ env.UPDATED_PARSERS }}"
+          body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
+          branch: update-parsers-pr
+          base: ${{ github.head_ref }}
+
+      - name: Enable Pull Request Automerge
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: gh pr merge --rebase --auto update-parsers-pr
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 849bb9814..335756619 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -32,10 +32,11 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
         with:
+          add-paths: SUPPORTED_LANGUAGES.md
           token: ${{ steps.app-token.outputs.token }}
           sign-commits: true
           commit-message: "bot(readme): update"
-          title: Update README
+          title: Update SUPPORTED_LANGUAGES.md
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
           branch: update-readme-pr
           base: ${{ github.head_ref }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d043e6b08..0ea7dcdbf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,17 +13,17 @@ Depending on which part of the plugin you want to contribute to, please read the
 
 To add a new parser, edit the following files:
 
-1. In `lua/parsers.lua`, add an entry to the `M.configs` table of the following form:
+1. In `lua/parsers.lua`, add an entry to the returned table of the following form:
 
 ```lua
 zimbu = {
   install_info = {
-    url = 'https://github.com/zimbulang/tree-sitter-zimbu', -- local path or git repo
+    url = 'https://github.com/zimbulang/tree-sitter-zimbu', -- git repo; use `path` for local path
     files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
     -- optional entries:
     branch = 'develop', -- only needed if different from default branch
     location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
-    revision = 'v2.1', -- tag or commit hash; bypasses automated updates
+    revision = 'v2.1', -- tag or commit hash, will be updated automatically
     generate = true, -- only needed if repo does not contain pre-generated src/parser.c
     generate_from_json = true, -- only needed if grammar.js has npm-installed dependencies
   },
@@ -31,21 +31,13 @@ zimbu = {
   tier = 3, -- community-contributed parser
   -- optional entries:
   requires = { 'vim' }, -- if the queries inherit from another language
-  readme_note = "an example language", -- if the 
+  readme_note = "an example language",
 }
 ```
 
 **Note:** The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
 
-2. In `lockfile.json`, add an entry for the current commit your queries are compatible with:
-
-```json
-  "zimbu": {
-    "revision": "0d08703e4c3f426ec61695d7617415fff97029bd"
-  },
-```
-
-3. If the parser name is not the same as the Vim filetype, add an entry to the `filetypes` table in `plugin/filetypes.lua`:
+2. If the parser name is not the same as the Vim filetype, add an entry to the `filetypes` table in `plugin/filetypes.lua`:
 
 ```lua
   zimbu = { 'zu' },
diff --git a/README.md b/README.md
index 6e3a52845..07a6c930e 100644
--- a/README.md
+++ b/README.md
@@ -126,28 +126,40 @@ These queries can be used to look up definitions and references to identifiers i
 
 If you have a parser that is not on the list of supported languages (either as a repository on Github or in a local directory), you can add it manually for use by `nvim-treesitter` as follows:
 
-1. Clone the repository or [create a new project](https://tree-sitter.github.io/tree-sitter/creating-parsers#project-setup) in, say, `~/projects/tree-sitter-zimbu`. Make sure that the `tree-sitter-cli` executable is installed and in your path; see <https://tree-sitter.github.io/tree-sitter/creating-parsers#installation> for installation instructions.
-2. Run `tree-sitter generate` in this directory (followed by `tree-sitter test` for good measure).
-3. Add the following snippet to your `init.lua`:
+1. Add the following snippet in a `User TSUpdate` autocommand:
 
 ```lua
-local parser_config = require('nvim-treesitter.parsers').configs
-parser_config.zimbu = {
-  install_info = {
-    url = '~/projects/tree-sitter-zimbu', -- local path or git repo
-    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
-    -- optional entries:
-    branch = 'develop', -- only needed if different from default branch
-    location= 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
-    generate = true, -- only needed if repo does not contain pre-generated src/parser.c
-    generate_from_json = true, -- only needed if parser has npm dependencies
-  },
-}
+vim.api.nvim_create_autocmd('User', { pattern = 'TSUpdate',
+callback = function()
+  require('nvim-treesitter.parsers').zimbu = {
+    install_info = {
+      url = 'https://github.com/zimbulang/tree-sitter-zimbu',
+      files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
+      revision = <sha>, -- commit hash for revision to check out; HEAD if missing
+      -- optional entries:
+      branch = 'develop', -- only needed if different from default branch
+      location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
+      generate = true, -- only needed if repo does not contain pre-generated src/parser.c
+      generate_from_json = true, -- only needed if parser has npm dependencies
+    },
+  }
+end})
 ```
-If you use a git repository for your parser and want to use a specific version, you can set the `revision` key
-in the `install_info` table for you parser config.
 
-4. If the parser name differs from the filetype(s) used by Neovim, you need to register the parser via
+Alternatively, if you have a local checkout, you can instead use
+```lua
+    install_info = {
+      path = '~/parsers/tree-sitter-zimbu',
+      files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
+      -- optional entries
+      location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
+      generate = true, -- only needed if repo does not contain pre-generated src/parser.c
+      generate_from_json = true, -- only needed if parser has npm dependencies
+    },
+```
+This will always use the state of the directory as-is (i.e., `branch` and `revision` will be ignored).
+
+2. If the parser name differs from the filetype(s) used by Neovim, you need to register the parser via
 
 ```lua
 vim.treesitter.language.register('zimbu', { 'zu' })
@@ -155,13 +167,20 @@ vim.treesitter.language.register('zimbu', { 'zu' })
 
 If Neovim does not detect your language's filetype by default, you can use [Neovim's `vim.filetype.add()`](<https://neovim.io/doc/user/lua.html#vim.filetype.add()>) to add a custom detection rule.
 
-5. Start `nvim` and `:TSInstall zimbu`.
-
-You can also skip step 2 and use `:TSInstallFromGrammar zimbu` to install directly from a `grammar.js` in the top-level directory specified by `url`.
-Once the parser is installed, you can update it (from the latest revision of the `main` branch if `url` is a Github repository) with `:TSUpdate zimbu`.
+3. Start `nvim` and `:TSInstall zimbu`.
 
 **Note:** Parsers using external scanner need to be written in C. C++ scanners are no longer supported.
 
+### Modifying parsers
+
+You can use the same approach for overriding parser information. E.g., if you always want to generate the `lua` parser from grammar, add
+```lua
+vim.api.nvim_create_autocmd('User', { pattern = 'TSUpdate',
+callback = function()
+  require('nvim-treesitter.parsers').lua.install_info.generate = true
+end})
+```
+
 ## Adding queries
 
 Queries can be placed anywhere in your `runtimepath` under `queries/<language>`, with earlier directories taking precedence unless the queries are marked with `; extends`; see `:h treesitter-query`.
@@ -231,7 +250,7 @@ require("nvim-treesitter.install").prefer_git = true
 In your Lua config:
 
 ```lua
-for _, config in pairs(require("nvim-treesitter.parsers").configs) do
+for _, config in pairs(require("nvim-treesitter.parsers")) do
   config.install_info.url = config.install_info.url:gsub("https://github.com/", "something else")
 end
 
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index a63f603e7..d2ba24468 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -26,9 +26,9 @@ Language | Tier | Queries | CLI | Maintainer
 [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFI  ` |  | @theHamsta, @clason
 [bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | core | `HFIJL` |  | @amaanq
 [bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | core | `HFIJL` |  | @amaanq
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint.git) | unsupported | `H    ` |  | @gabmus
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unsupported | `H    ` |  | @gabmus
 [c](https://github.com/tree-sitter/tree-sitter-c) | stable | `HFIJL` |  | @amaanq
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | core | `HF JL` |  | @Luxed
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | core | `HF JL` |  | @amaanq
 [cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | core | `HFIJL` |  | @amaanq
 [capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | core | `HFIJL` |  | @amaanq
 [chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | core | `HFIJL` |  | @ObserverOfTime
@@ -77,7 +77,7 @@ ecma (queries only)[^ecma] | community | `HFIJL` |  | @steelsojka
 [fortran](https://github.com/stadelmanma/tree-sitter-fortran) | community | `HFI  ` |  | @amaanq
 [fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H    ` |  | @mgramigna
 [func](https://github.com/tree-sitter-grammars/tree-sitter-func) | core | `H    ` |  | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion.git) | community | `HFI L` |  | @jirgn
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | community | `HFI L` |  | @jirgn
 [gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` |  | @PrestonKnopp
 [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` |  | @godofavacyn
 [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | community | `HF J ` |  | @amaanq
@@ -102,7 +102,7 @@ ecma (queries only)[^ecma] | community | `HFIJL` |  | @steelsojka
 [gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | core | `H    ` |  | @theHamsta
 [hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H    ` |  | 
 [hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | core | `HFIJL` |  | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | core | `HF J ` |  | @mrcjkb
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | core | `HF JL` |  | @mrcjkb
 [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` |  | @lykahb
 [hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | core | `HFIJ ` |  | @MichaHoffmann
 [heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` |  | @connorlay
@@ -129,7 +129,7 @@ html_tags (queries only)[^html_tags] | community | `H IJ ` |  | @TravonteD
 [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` |  | @steelsojka
 [json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` |  | @steelsojka
 [json5](https://github.com/Joakker/tree-sitter-json5) | community | `H  J ` |  | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git) | community | `HFIJL` |  | @WhyNotHugo
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | community | `HFIJL` |  | @WhyNotHugo
 [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF  L` |  | @nawordar
 jsx (queries only)[^jsx] | community | `HFIJ ` |  | @steelsojka
 [julia](https://github.com/tree-sitter/tree-sitter-julia) | core | `HFIJL` |  | @theHamsta
@@ -139,7 +139,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` |  | @steelsojka
 [kotlin](https://github.com/fwcd/tree-sitter-kotlin) | community | `HF JL` |  | @SalBakraa
 [koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` |  | @irh
 [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` |  | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `H  JL` |  | @traxys
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `HF JL` |  | @traxys
 [latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J ` | ✓ | @theHamsta, @clason
 [ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` |  | @cbarrete
 [leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` |  | @r001
@@ -175,7 +175,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` |  | @steelsojka
 [ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` | ✓ | @undu
 [odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | core | `HFIJL` |  | @amaanq
 [org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` |  | 
-[pascal](https://github.com/Isopod/tree-sitter-pascal.git) | community | `HFIJL` |  | @Isopod
+[pascal](https://github.com/Isopod/tree-sitter-pascal) | community | `HFIJL` |  | @Isopod
 [passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` |  | @amaanq
 [pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | core | `HF J ` |  | @ObserverOfTime
 [perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` |  | @RabbiVeesh, @LeoNerd
@@ -245,8 +245,9 @@ jsx (queries only)[^jsx] | community | `HFIJ ` |  | @steelsojka
 [swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H I L` | ✓ | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` |  | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` |  | @ok-ryoko
-[t32](https://gitlab.com/xasc/tree-sitter-t32.git) | community | `HFIJL` |  | @xasc
+[t32](https://gitlab.com/xasc/tree-sitter-t32) | community | `HFIJL` |  | @xasc
 [tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | core | `HFIJL` |  | @amaanq
+[tact](https://github.com/tact-lang/tree-sitter-tact) | community | `HFIJL` |  | @novusnota
 [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFI  ` |  | @lewis6991
 [teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | ✓ | @euclidianAce
 [templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  | @vrischmann
@@ -256,13 +257,14 @@ jsx (queries only)[^jsx] | community | `HFIJ ` |  | @steelsojka
 [tiger](https://github.com/ambroisie/tree-sitter-tiger) | community | `HFIJL` |  | @ambroisie
 [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | community | `HF JL` |  | @ahelwer, @susliko
 [tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` |  | @Freed-Wu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt.git) | community | `H    ` |  | @arnarg
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | community | `H    ` |  | @arnarg
 [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | core | `HFIJL` |  | @tk-shirasaka
 [tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` |  | @amaanq
 [tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | @steelsojka
 [turtle](https://github.com/BonaBeavis/tree-sitter-turtle) | community | `HFIJL` |  | @BonaBeavis
 [twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` |  | @gbprod
 [typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | @steelsojka
+[typespec](https://github.com/happenslol/tree-sitter-typespec) | community | `H IJ ` |  | @happenslol
 [typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` |  | @Teddytrombone
 [typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` |  | @uben0, @RaafatTurki
 [udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | core | `H  JL` |  | @ObserverOfTime
diff --git a/TODO.md b/TODO.md
index ff2b05001..56d8c88cf 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,13 +4,16 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
-- [ ] **`locals.lua`:** move to `nvim-treesitter-refactor`?
-- [ ] **`parsers.lua`:** include revision? (<https://stackoverflow.com/questions/64260981>)
-- [ ] **update-lockfile:** allow specifying version in addition to commit hash (for Tier 1)
+- [ ] **`parsers.lua`:** include revision (serialization at home: `vim.inspect`)
+  - rename `parsers` to `languages`
+  - rename `install_info` to `parser`
+
+- [ ] **`parsers.lua`:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **update-lockfile:** one commit per parser/tier?
 - [ ] **tests:** fix, update, extend (cover all Tier 1 languages)
 - [ ] **documentation:** consolidate, autogenerate?
 - [ ] **documentation:** migration guide
+- [ ] **`locals.lua`:** move to `nvim-treesitter-refactor`?
 - [ ] **textobjects:** include simple(!) function, queries? (check Helix)
 - [ ] **downstream:** adapt to breaking changes (`nvim-treesitter-refactor`)
 
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 8b530550c..ef55eb2d8 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -37,7 +37,7 @@ To get a list of supported languages
 To install supported parsers and queries, put this in your `init.lua` file:
 
 >lua
-  require'nvim-treesitter.configs'.setup {
+  require'nvim-treesitter.config'.setup {
     -- A directory to install the parsers and queries to.
     -- Defaults to the `stdpath('data')/site` dir.
     install_dir = "/some/path/to/store/parsers",
diff --git a/lua/nvim-treesitter/_meta/parsers.lua b/lua/nvim-treesitter/_meta/parsers.lua
new file mode 100644
index 000000000..09e4d1846
--- /dev/null
+++ b/lua/nvim-treesitter/_meta/parsers.lua
@@ -0,0 +1,47 @@
+---@meta
+error('Cannot require a meta file')
+
+---@class InstallInfo
+---
+---URL of parser repo (Github/Gitlab)
+---@field url string
+---
+---Commit hash of parser to download (compatible with queries)
+---@field revision string
+---
+---Files to include when compiling (`src/parser.c` and optionally `src/scanner.c')
+---@field files string[]
+---
+---Branch of parser repo to download (if not default branch)
+---@field branch? string
+---
+---Location of `grammar.js` in repo (if not at root, e.g., in a monorepo)
+---@field location? string
+---
+---Repo does not contain a `parser.c`; must be generated from grammar first
+---@field generate? boolean
+---
+---Parser needs to be generated from `grammar.json` (generating from `grammar.js` requires npm)
+---@field generate_from_json? boolean
+---
+---Parser repo is a local directory; overrides `url`, `revision`, and `branch`
+---@field path? string
+
+---@class ParserInfo
+---
+---Information necessary to build and install the parser (empty for query-only language)
+---@field install_info? InstallInfo
+---
+---List of Github users maintaining the queries for Neovim
+---@field maintainers? string[]
+---
+---List of other languages to install (e.g., if queries inherit from them)
+---@field requires? string[]
+---
+---Language support tier, maps to "core", "stable", "community", "unmaintained"
+---@field tier integer
+---
+---Explanatory footnote text to add in SUPPORTED_LANGUAGES.md
+---@field readme_note? string
+
+---@alias nvim-ts.parsers table<string,ParserInfo>
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index a52c6a10e..4c662bab6 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -1,5 +1,7 @@
 local M = {}
 
+M.tiers = { 'stable', 'core', 'community', 'unsupported' }
+
 ---@class TSConfig
 ---@field auto_install boolean
 ---@field ensure_install string[]
@@ -33,7 +35,7 @@ function M.setup(user_data)
         local ft = vim.bo[buf].filetype
         local lang = vim.treesitter.language.get_lang(ft) or ft
         if
-          require('nvim-treesitter.parsers').configs[lang]
+          require('nvim-treesitter.parsers')[lang]
           and not vim.list_contains(M.installed_parsers(), lang)
           and not vim.list_contains(config.ignore_install, lang)
         then
@@ -51,7 +53,7 @@ function M.setup(user_data)
     local to_install = M.norm_languages(config.ensure_install, { ignored = true, installed = true })
 
     if #to_install > 0 then
-      require('nvim-treesitter.install').install(to_install)
+      require('nvim-treesitter.install').install(to_install, { force = true })
     end
   end
 end
@@ -85,6 +87,52 @@ function M.installed_parsers()
   return installed
 end
 
+-- Get a list of all available parsers
+---@param tier integer? only get parsers of specified tier
+---@return string[]
+function M.get_available(tier)
+  local parsers = require('nvim-treesitter.parsers')
+  --- @type string[]
+  local languages = vim.tbl_keys(parsers)
+  table.sort(languages)
+  if tier then
+    languages = vim.tbl_filter(
+      --- @param p string
+      function(p)
+        return parsers[p].tier == tier
+      end,
+      languages
+    )
+  end
+  if vim.fn.executable('tree-sitter') == 0 then
+    languages = vim.tbl_filter(
+      --- @param p string
+      function(p)
+        return parsers[p].install_info ~= nil and not parsers[p].install_info.generate
+      end,
+      languages
+    )
+  end
+  return languages
+end
+
+local function expand_tiers(list)
+  for i, tier in ipairs(M.tiers) do
+    if vim.list_contains(list, tier) then
+      list = vim.tbl_filter(
+        --- @param l string
+        function(l)
+          return l ~= tier
+        end,
+        list
+      )
+      vim.list_extend(list, M.get_available(i))
+    end
+  end
+
+  return list
+end
+
 ---Normalize languages
 ---@param languages? string[]|string
 ---@param skip? { ignored: boolean, missing: boolean, installed: boolean, dependencies: boolean }
@@ -96,32 +144,11 @@ function M.norm_languages(languages, skip)
     languages = { languages }
   end
 
-  local parsers = require('nvim-treesitter.parsers')
-
   if vim.list_contains(languages, 'all') then
     if skip and skip.missing then
       return M.installed_parsers()
     end
-    languages = parsers.get_available()
-  end
-
-  -- keep local to avoid leaking parsers module
-  --- @param list string[]
-  local function expand_tiers(list)
-    for i, tier in ipairs(parsers.tiers) do
-      if vim.list_contains(list, tier) then
-        list = vim.tbl_filter(
-          --- @param l string
-          function(l)
-            return l ~= tier
-          end,
-          list
-        )
-        vim.list_extend(list, parsers.get_available(i))
-      end
-    end
-
-    return list
+    languages = M.get_available()
   end
 
   languages = expand_tiers(languages)
@@ -159,19 +186,20 @@ function M.norm_languages(languages, skip)
     )
   end
 
+  local parsers = require('nvim-treesitter.parsers')
   languages = vim.tbl_filter(
     --- @param v string
     function(v)
       -- TODO(lewis6991): warn of any unknown parsers?
-      return parsers.configs[v] ~= nil
+      return parsers[v] ~= nil
     end,
     languages
   )
 
   if not (skip and skip.dependencies) then
     for _, lang in pairs(languages) do
-      if parsers.configs[lang].requires then
-        vim.list_extend(languages, parsers.configs[lang].requires)
+      if parsers[lang].requires then
+        vim.list_extend(languages, parsers[lang].requires)
       end
     end
   end
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 5d3a23300..58ede835a 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -134,7 +134,7 @@ function M.check()
   health.start('Installed languages' .. string.rep(' ', 5) .. 'H L F I J')
   local languages = config.installed_parsers()
   for _, lang in pairs(languages) do
-    local parser = parsers.configs[lang]
+    local parser = parsers[lang]
     local out = lang .. string.rep(' ', 22 - #lang)
     if parser.install_info then
       for _, query_group in pairs(M.bundled_queries) do
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 6918a1820..8b3dc82fc 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -25,12 +25,6 @@ local uv_unlink = a.wrap(uv.fs_unlink, 2)
 
 local M = {}
 
----@class LockfileInfo
----@field revision string
-
----@type table<string, LockfileInfo>
-local lockfile = {}
-
 local max_jobs = 10
 
 local iswin = uv.os_uname().sysname == 'Windows_NT'
@@ -63,7 +57,7 @@ end
 ---@param lang string
 ---@return InstallInfo?
 local function get_parser_install_info(lang)
-  local parser_config = parsers.configs[lang]
+  local parser_config = parsers[lang]
 
   if not parser_config then
     log.error('Parser not available for language "' .. lang .. '"')
@@ -78,24 +72,6 @@ function M.get_package_path(...)
   return fs.joinpath(fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
 end
 
----@param lang string
----@return string?
-local function get_target_revision(lang)
-  local info = get_parser_install_info(lang)
-  if info and info.revision then
-    return info.revision
-  end
-
-  if #lockfile == 0 then
-    local filename = M.get_package_path('lockfile.json')
-    lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string, LockfileInfo>]]
-  end
-
-  if lockfile[lang] then
-    return lockfile[lang].revision
-  end
-end
-
 ---@param lang string
 ---@return string?
 local function get_installed_revision(lang)
@@ -106,9 +82,9 @@ end
 ---@param lang string
 ---@return boolean
 local function needs_update(lang)
-  local revision = get_target_revision(lang)
-  if revision then
-    return revision ~= get_installed_revision(lang)
+  local info = get_parser_install_info(lang)
+  if info and info.revision then
+    return info.revision ~= get_installed_revision(lang)
   end
 
   -- No revision. Check the queries link to the same place
@@ -415,7 +391,7 @@ local function install_lang0(lang, cache_dir, install_dir, generate)
 
     local project_name = 'tree-sitter-' .. lang
 
-    local revision = get_target_revision(lang)
+    local revision = repo.revision
 
     local compile_location ---@type string
     if repo.path then
@@ -525,40 +501,33 @@ local function install_lang(lang, cache_dir, install_dir, force, generate)
   return status
 end
 
+--- Reload the parser table and user modifications in case of update
+local function reload_parsers()
+  package.loaded['nvim-treesitter.parsers'] = nil
+  parsers = require('nvim-treesitter.parsers')
+  vim.api.nvim_exec_autocmds('User', { pattern = 'TSUpdate' })
+end
+
 ---@class InstallOptions
 ---@field force? boolean
 ---@field generate? boolean
----@field skip? table
 
 --- Install a parser
---- @param languages? string[]|string
+--- @param languages string[]
 --- @param options? InstallOptions
 --- @param _callback? fun()
 local function install(languages, options, _callback)
   options = options or {}
-  local force = options.force
-  local generate = options.generate
-  local skip = options.skip
 
   local cache_dir = vim.fs.normalize(fn.stdpath('cache'))
   local install_dir = config.get_install_dir('parser')
 
-  if not languages or type(languages) == 'string' then
-    languages = { languages }
-  end
-
-  if languages[1] == 'all' then
-    force = true
-  end
-
-  languages = config.norm_languages(languages, skip)
-
   local tasks = {} --- @type fun()[]
   local done = 0
   for _, lang in ipairs(languages) do
     tasks[#tasks + 1] = a.sync(function()
       a.main()
-      local status = install_lang(lang, cache_dir, install_dir, force, generate)
+      local status = install_lang(lang, cache_dir, install_dir, options.force, options.generate)
       if status ~= 'failed' then
         done = done + 1
       end
@@ -572,7 +541,20 @@ local function install(languages, options, _callback)
   end
 end
 
-M.install = a.sync(install, 2)
+M.install = a.sync(function(languages, options, _callback)
+  reload_parsers()
+  if not languages or #languages == 0 then
+    languages = 'all'
+  end
+
+  languages = config.norm_languages(languages, options and options.skip)
+
+  if languages[1] == 'all' then
+    options.force = true
+  end
+
+  install(languages, options)
+end, 2)
 
 ---@class UpdateOptions
 
@@ -580,8 +562,7 @@ M.install = a.sync(install, 2)
 ---@param _options? UpdateOptions
 ---@param _callback function
 M.update = a.sync(function(languages, _options, _callback)
-  M.lockfile = {}
-
+  reload_parsers()
   if not languages or #languages == 0 then
     languages = 'all'
   end
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4e3222563..83011c7cb 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1,167 +1,146 @@
----@class InstallInfo
----@field path? string
----@field url string
----@field branch? string
----@field revision? string
----@field files string[]
----@field generate? boolean
----@field generate_from_json? boolean
----@field location? string
-
----@class ParserInfo
----@field install_info? InstallInfo
----@field maintainers? string[]
----@field requires? string[]
----@field tier integer
----@field readme_note? string
-
-local M = {}
-
-M.tiers = { 'stable', 'core', 'community', 'unsupported' }
-
----@type table<string,ParserInfo>
-M.configs = {
+---@type nvim-ts.parsers
+return {
   ada = {
     install_info = {
-      url = 'https://github.com/briot/tree-sitter-ada',
       files = { 'src/parser.c' },
+      revision = 'e8e2515465cc2d7c444498e68bdb9f1d86767f95',
+      url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
     tier = 3,
   },
-
   agda = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-agda',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'd3dc807692e6bca671d4491b3bf5c67eeca8c016',
+      url = 'https://github.com/tree-sitter/tree-sitter-agda',
     },
     maintainers = { '@Decodetalkers' },
     tier = 2,
   },
-
   angular = {
     install_info = {
-      url = 'https://github.com/dlvandenberg/tree-sitter-angular',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '10f21f3f1b10584e62ecc113ab3cda1196d0ceb8',
+      url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
     requires = { 'html', 'html_tags' },
     tier = 3,
   },
-
   apex = {
     install_info = {
-      url = 'https://github.com/aheber/tree-sitter-sfapex',
       files = { 'src/parser.c' },
       location = 'apex',
+      revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
     tier = 3,
   },
-
   arduino = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = 'afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
     requires = { 'cpp' },
     tier = 2,
   },
-
   asm = {
     install_info = {
-      url = 'https://github.com/RubixDev/tree-sitter-asm',
       files = { 'src/parser.c' },
+      revision = 'b0306e9bb2ebe01c6562f1aef265cc42ccc53070',
+      url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
     tier = 3,
   },
-
   astro = {
     install_info = {
-      url = 'https://github.com/virchau13/tree-sitter-astro',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '4be180759ec13651f72bacee65fa477c64222a1a',
+      url = 'https://github.com/virchau13/tree-sitter-astro',
     },
     maintainers = { '@virchau13' },
     requires = { 'html', 'html_tags' },
     tier = 3,
   },
-
   authzed = {
     install_info = {
-      url = 'https://github.com/mleonidas/tree-sitter-authzed',
       files = { 'src/parser.c' },
+      revision = '1dec7e1af96c56924e3322cd85fdce15d0a31d00',
+      url = 'https://github.com/mleonidas/tree-sitter-authzed',
     },
     maintainers = { '@mattpolzin' },
     tier = 3,
   },
-
   awk = {
     install_info = {
-      url = 'https://github.com/Beaglefoot/tree-sitter-awk',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'ba7472152d79a8c916550c80fdbfd5724d07a0c9',
+      url = 'https://github.com/Beaglefoot/tree-sitter-awk',
     },
     tier = 4,
   },
-
   bash = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-bash',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '2fbd860f802802ca76a6661ce025b3a3bca2d3ed',
+      url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
     tier = 1,
   },
-
   bass = {
     install_info = {
-      url = 'https://github.com/vito/tree-sitter-bass',
       files = { 'src/parser.c' },
+      revision = '28dc7059722be090d04cd751aed915b2fee2f89a',
+      url = 'https://github.com/vito/tree-sitter-bass',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   beancount = {
     install_info = {
-      url = 'https://github.com/polarmutex/tree-sitter-beancount',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'c25f8034c977681653a8acd541c8b4877a58f474',
+      url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
     tier = 3,
   },
-
   bibtex = {
     install_info = {
-      url = 'https://github.com/latex-lsp/tree-sitter-bibtex',
       files = { 'src/parser.c' },
+      revision = 'ccfd77db0ed799b6c22c214fe9d2937f47bc8b34',
+      url = 'https://github.com/latex-lsp/tree-sitter-bibtex',
     },
     maintainers = { '@theHamsta', '@clason' },
     tier = 3,
   },
-
   bicep = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-bicep',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-bicep',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   bitbake = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-bitbake',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-bitbake',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   blade = {
     install_info = {
       url = 'https://github.com/EmranMR/tree-sitter-blade',
@@ -172,21 +151,22 @@ M.configs = {
   },
   blueprint = {
     install_info = {
-      url = 'https://gitlab.com/gabmus/tree-sitter-blueprint.git',
       files = { 'src/parser.c' },
+      revision = '60ba73739c6083c693d86a1a7cf039c07eb4ed59',
+      url = 'https://gitlab.com/gabmus/tree-sitter-blueprint',
     },
     maintainers = { '@gabmus' },
     tier = 4,
   },
-
   bp = {
     install_info = {
-      url = 'https://github.com/ambroisie/tree-sitter-bp',
       files = { 'src/parser.c' },
+      revision = '2326d709fb9cf73cf124fdbc803c267f851721a4',
+      url = 'https://github.com/ambroisie/tree-sitter-bp',
     },
     maintainers = { '@ambroisie' },
-    tier = 3,
     readme_note = 'Android Blueprint',
+    tier = 3,
   },
   brightscript = {
     install_info = {
@@ -198,31 +178,31 @@ M.configs = {
   },
   c = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-c',
       files = { 'src/parser.c' },
+      revision = 'deca017a554045b4c203e7ddff39ae64ff05e071',
+      url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
     tier = 1,
   },
-
   c_sharp = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '82fa8f05f41a33e9bc830f85d74a9548f0291738',
+      url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   cairo = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cairo',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '6238f609bea233040fe927858156dee5515a0745',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cairo',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   caddy = {
     install_info = {
       url = 'https://github.com/opa-oz/tree-sitter-caddy',
@@ -231,25 +211,24 @@ M.configs = {
     maintainers = { '@opa-oz' },
     tier = 3,
   },
-
   capnp = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-capnp',
       files = { 'src/parser.c' },
+      revision = '7b0883c03e5edd34ef7bcf703194204299d7099f',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-capnp',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   chatito = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-chatito',
       files = { 'src/parser.c' },
+      revision = 'a461f20dedb43905febb12c1635bc7d2e43e96f0',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-chatito',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   circom = {
     install_info = {
       url = 'https://github.com/Decurity/tree-sitter-circom',
@@ -258,122 +237,121 @@ M.configs = {
     maintainers = { '@alexandr-martirosyan' },
     tier = 3,
   },
-
   clojure = {
     install_info = {
-      url = 'https://github.com/sogaiu/tree-sitter-clojure',
       files = { 'src/parser.c' },
+      revision = 'f4236d4da8aa92bc105d9c118746474c608e6af7',
+      url = 'https://github.com/sogaiu/tree-sitter-clojure',
     },
     maintainers = { '@NoahTheDuke' },
     tier = 3,
   },
-
   cmake = {
     install_info = {
-      url = 'https://github.com/uyha/tree-sitter-cmake',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3',
+      url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
     tier = 3,
   },
-
   comment = {
     install_info = {
-      url = 'https://github.com/stsewd/tree-sitter-comment',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd',
+      url = 'https://github.com/stsewd/tree-sitter-comment',
     },
     maintainers = { '@stsewd' },
     tier = 3,
   },
-
   commonlisp = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-commonlisp',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = 'bf2a65b1c119898a1a17389e07f2a399c05cdc0c',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-commonlisp',
     },
     maintainers = { '@theHamsta' },
     tier = 2,
   },
-
   cooklang = {
     install_info = {
-      url = 'https://github.com/addcninblue/tree-sitter-cooklang',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '4ebe237c1cf64cf3826fc249e9ec0988fe07e58e',
+      url = 'https://github.com/addcninblue/tree-sitter-cooklang',
     },
     maintainers = { '@addcninblue' },
     tier = 3,
   },
-
   corn = {
     install_info = {
-      url = 'https://github.com/jakestanger/tree-sitter-corn',
       files = { 'src/parser.c' },
+      revision = '604d73c38d4c28ca68e9e441ffd405d68cb63051',
+      url = 'https://github.com/jakestanger/tree-sitter-corn',
     },
     maintainers = { '@jakestanger' },
     tier = 3,
   },
-
   cpon = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cpon',
       files = { 'src/parser.c' },
+      revision = '594289eadfec719198e560f9d7fd243c4db678d5',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cpon',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   cpp = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-cpp',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = 'd29fbff09a8c9ff4f3074de2595dfca12cb33da9',
+      url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
     requires = { 'c' },
     tier = 2,
   },
-
   css = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-css',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af',
+      url = 'https://github.com/tree-sitter/tree-sitter-css',
     },
     maintainers = { '@TravonteD' },
     tier = 2,
   },
-
   csv = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
       files = { 'src/parser.c' },
       location = 'csv',
+      revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
     },
     maintainers = { '@amaanq' },
     requires = { 'tsv' },
     tier = 2,
   },
-
   cuda = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '1f188eff83b562ffae36d13e1b804ec6f3b9f1d9',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
     maintainers = { '@theHamsta' },
     requires = { 'cpp' },
     tier = 2,
   },
-
   cue = {
     install_info = {
-      url = 'https://github.com/eonpatapon/tree-sitter-cue',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '8a5f273bfa281c66354da562f2307c2d394b6c81',
+      url = 'https://github.com/eonpatapon/tree-sitter-cue',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   cylc = {
     install_info = {
       url = 'https://github.com/elliotfontaine/tree-sitter-cylc',
@@ -382,141 +360,138 @@ M.configs = {
     maintainers = { '@elliotfontaine' },
     tier = 3,
   },
-
   d = {
     install_info = {
-      url = 'https://github.com/gdamore/tree-sitter-d',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '750dde90ed9cdbd82493bc28478d8ab1976b0e9f',
+      url = 'https://github.com/gdamore/tree-sitter-d',
     },
-    tier = 3,
     maintainers = { '@amaanq' },
+    tier = 3,
   },
-
   dart = {
     install_info = {
-      url = 'https://github.com/UserNobody14/tree-sitter-dart',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'ac0bb849ccd1a923963af47573b5e396736ff582',
+      url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
     tier = 3,
   },
-
   desktop = {
     install_info = {
-      url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
       files = { 'src/parser.c' },
+      url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
     tier = 3,
   },
-
   devicetree = {
     install_info = {
-      url = 'https://github.com/joelspadin/tree-sitter-devicetree',
       files = { 'src/parser.c' },
+      revision = 'fb07e6044ffd36932c57a5be01ba5d6b8a9337bb',
+      url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
     maintainers = { '@jedrzejboczar' },
     tier = 3,
   },
-
   dhall = {
     install_info = {
-      url = 'https://github.com/jbellerb/tree-sitter-dhall',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'affb6ee38d629c9296749767ab832d69bb0d9ea8',
+      url = 'https://github.com/jbellerb/tree-sitter-dhall',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   diff = {
     install_info = {
-      url = 'https://github.com/the-mikedavis/tree-sitter-diff',
       files = { 'src/parser.c' },
+      revision = '629676fc3919606964231b2c7b9677d6998a2cb4',
+      url = 'https://github.com/the-mikedavis/tree-sitter-diff',
     },
     maintainers = { '@gbprod' },
     tier = 3,
   },
-
   disassembly = {
     install_info = {
-      url = 'https://github.com/ColinKennedy/tree-sitter-disassembly',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '0229c0211dba909c5d45129ac784a3f4d49c243a',
+      url = 'https://github.com/ColinKennedy/tree-sitter-disassembly',
     },
     maintainers = { '@ColinKennedy' },
     tier = 3,
   },
-
   djot = {
     install_info = {
-      url = 'https://github.com/treeman/tree-sitter-djot',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '0e9a836ec47612ade15645fb1680adb549894a6c',
+      url = 'https://github.com/treeman/tree-sitter-djot',
     },
     maintainers = { '@NoahTheDuke' },
     tier = 3,
   },
-
   dockerfile = {
     install_info = {
-      url = 'https://github.com/camdencheek/tree-sitter-dockerfile',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '087daa20438a6cc01fa5e6fe6906d77c869d19fe',
+      url = 'https://github.com/camdencheek/tree-sitter-dockerfile',
     },
     maintainers = { '@camdencheek' },
     tier = 3,
   },
-
   dot = {
     install_info = {
-      url = 'https://github.com/rydesun/tree-sitter-dot',
       files = { 'src/parser.c' },
+      revision = '9ab85550c896d8b294d9b9ca1e30698736f08cea',
+      url = 'https://github.com/rydesun/tree-sitter-dot',
     },
     maintainers = { '@rydesun' },
     tier = 3,
   },
-
   doxygen = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-doxygen',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '4a30eba5d047d6a8c5b005202b4848c0b33d76ca',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-doxygen',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   dtd = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'dtd',
+      revision = '648183d86f6f8ffb240ea11b4c6873f6f45d8b67',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   earthfile = {
     install_info = {
-      url = 'https://github.com/glehmann/tree-sitter-earthfile',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '6de809419cdfb23e3a8383b6575fa3634900f276',
+      url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
     tier = 3,
   },
-
   ebnf = {
     install_info = {
-      url = 'https://github.com/RubixDev/ebnf',
       files = { 'src/parser.c' },
       location = 'crates/tree-sitter-ebnf',
+      revision = '8e635b0b723c620774dfb8abf382a7f531894b40',
+      url = 'https://github.com/RubixDev/ebnf',
     },
     maintainers = { '@RubixDev' },
     tier = 3,
   },
-
   ecma = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, typescript, tsx, qmljs',
     tier = 3,
   },
-
   editorconfig = {
     install_info = {
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
@@ -525,69 +500,68 @@ M.configs = {
     maintainers = { '@ValdezFOmar' },
     tier = 3,
   },
-
   eds = {
     install_info = {
-      url = 'https://github.com/uyha/tree-sitter-eds',
       files = { 'src/parser.c' },
+      revision = '5517bdb90c90703df49579a4b04689a614780be2',
+      url = 'https://github.com/uyha/tree-sitter-eds',
     },
     maintainers = { '@uyha' },
     tier = 3,
   },
-
   eex = {
     install_info = {
-      url = 'https://github.com/connorlay/tree-sitter-eex',
       files = { 'src/parser.c' },
+      revision = 'f742f2fe327463335e8671a87c0b9b396905d1d1',
+      url = 'https://github.com/connorlay/tree-sitter-eex',
     },
     maintainers = { '@connorlay' },
     tier = 3,
   },
-
   elixir = {
     install_info = {
-      url = 'https://github.com/elixir-lang/tree-sitter-elixir',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'de690fa8a028f122af46d9d2685679fe5f2d7d60',
+      url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
     tier = 3,
   },
-
   elm = {
     install_info = {
-      url = 'https://github.com/elm-tooling/tree-sitter-elm',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '09dbf221d7491dc8d8839616b27c21b9c025c457',
+      url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
     tier = 3,
   },
-
   elsa = {
     install_info = {
-      url = 'https://github.com/glapa-grossklag/tree-sitter-elsa',
       files = { 'src/parser.c' },
+      revision = '0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7',
+      url = 'https://github.com/glapa-grossklag/tree-sitter-elsa',
     },
     maintainers = { '@glapa-grossklag', '@amaanq' },
     tier = 3,
   },
-
   elvish = {
     install_info = {
-      url = 'https://github.com/elves/tree-sitter-elvish',
       files = { 'src/parser.c' },
+      revision = '5e7210d945425b77f82cbaebc5af4dd3e1ad40f5',
+      url = 'https://github.com/elves/tree-sitter-elvish',
     },
     maintainers = { '@elves' },
     tier = 3,
   },
-
   embedded_template = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
       files = { 'src/parser.c' },
+      revision = '38d5004a797298dc42c85e7706c5ceac46a3f29f',
+      url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
     tier = 4,
   },
-
   enforce = {
     install_info = {
       url = 'https://github.com/simonvic/tree-sitter-enforce',
@@ -596,239 +570,235 @@ M.configs = {
     maintainers = { '@simonvic' },
     tier = 3,
   },
-
   erlang = {
     install_info = {
-      url = 'https://github.com/WhatsApp/tree-sitter-erlang',
       files = { 'src/parser.c', 'src/parser.c' },
+      revision = '98ea1f9c957b2ad520415eecb5a5b406e931101e',
+      url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
     tier = 3,
   },
-
   facility = {
     install_info = {
-      url = 'https://github.com/FacilityApi/tree-sitter-facility',
       files = { 'src/parser.c' },
+      revision = 'a52579670e2b14ec03d410c3c980fafaf6d659c4',
+      url = 'https://github.com/FacilityApi/tree-sitter-facility',
     },
     maintainers = { '@bryankenote' },
     tier = 3,
   },
-
   faust = {
     install_info = {
-      url = 'https://github.com/khiner/tree-sitter-faust',
       files = { 'src/parser.c' },
+      revision = 'f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4',
+      url = 'https://github.com/khiner/tree-sitter-faust',
     },
     maintainers = { '@khiner' },
     tier = 3,
   },
-
   fennel = {
     install_info = {
-      url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = 'cfbfa478dc2dbef267ee94ae4323d9c886f45e94',
+      url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
     maintainers = { '@alexmozaidze' },
     tier = 3,
   },
-
   fidl = {
     install_info = {
-      url = 'https://github.com/google/tree-sitter-fidl',
       files = { 'src/parser.c' },
+      revision = '0a8910f293268e27ff554357c229ba172b0eaed2',
+      url = 'https://github.com/google/tree-sitter-fidl',
     },
     maintainers = { '@chaopeng' },
     tier = 3,
   },
-
   firrtl = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-firrtl',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '8503d3a0fe0f9e427863cb0055699ff2d29ae5f5',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-firrtl',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   fish = {
     install_info = {
-      url = 'https://github.com/ram02z/tree-sitter-fish',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'a78aef9abc395c600c38a037ac779afc7e3cc9e0',
+      url = 'https://github.com/ram02z/tree-sitter-fish',
     },
     maintainers = { '@ram02z' },
     tier = 3,
   },
-
   foam = {
     install_info = {
-      url = 'https://github.com/FoamScience/tree-sitter-foam',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '04664b40c0dadb7ef37028acf3422c63271d377b',
+      url = 'https://github.com/FoamScience/tree-sitter-foam',
     },
     maintainers = { '@FoamScience' },
     tier = 3,
   },
-
   forth = {
     install_info = {
-      url = 'https://github.com/AlexanderBrevig/tree-sitter-forth',
       files = { 'src/parser.c' },
+      revision = '90189238385cf636b9ee99ce548b9e5b5e569d48',
+      url = 'https://github.com/AlexanderBrevig/tree-sitter-forth',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   fortran = {
     install_info = {
-      url = 'https://github.com/stadelmanma/tree-sitter-fortran',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'f73d473e3530862dee7cbb38520f28824e7804f6',
+      url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   fsh = {
     install_info = {
-      url = 'https://github.com/mgramigna/tree-sitter-fsh',
       files = { 'src/parser.c' },
+      revision = 'fad2e175099a45efbc98f000cc196d3674cc45e0',
+      url = 'https://github.com/mgramigna/tree-sitter-fsh',
     },
     maintainers = { '@mgramigna' },
     tier = 3,
   },
-
   fsharp = {
     install_info = {
-      url = 'https://github.com/ionide/tree-sitter-fsharp',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'fsharp',
+      url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
     tier = 3,
   },
-
   func = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-func',
       files = { 'src/parser.c' },
+      revision = 'f780ca55e65e7d7360d0229331763e16c452fc98',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-func',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   fusion = {
     install_info = {
-      url = 'https://gitlab.com/jirgn/tree-sitter-fusion.git',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6',
+      url = 'https://gitlab.com/jirgn/tree-sitter-fusion',
     },
     maintainers = { '@jirgn' },
     tier = 3,
   },
-
   gap = {
     install_info = {
       url = 'https://github.com/gap-system/tree-sitter-gap',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@reiniscirpons' },
-    readme_name = 'GAP system',
+    readme_note = 'GAP system',
     tier = 3,
   },
-
   gaptst = {
     install_info = {
       url = 'https://github.com/gap-system/tree-sitter-gaptst',
       files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@reiniscirpons' },
-    readme_name = 'GAP system test files',
+    readme_note = 'GAP system test files',
     requires = { 'gap' },
     tier = 3,
   },
-
   gdscript = {
     install_info = {
-      url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '1f1e782fe2600f50ae57b53876505b8282388d77',
+      url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
     readme_note = 'Godot',
     tier = 3,
   },
-
   gdshader = {
     install_info = {
-      url = 'https://github.com/GodOfAvacyn/tree-sitter-gdshader',
       files = { 'src/parser.c' },
+      revision = 'ffd9f958df13cae04593781d7d2562295a872455',
+      url = 'https://github.com/GodOfAvacyn/tree-sitter-gdshader',
     },
     maintainers = { '@godofavacyn' },
     tier = 3,
   },
-
+  git_config = {
+    install_info = {
+      files = { 'src/parser.c' },
+      revision = '9c2a1b7894e6d9eedfe99805b829b4ecd871375e',
+      url = 'https://github.com/the-mikedavis/tree-sitter-git-config',
+    },
+    maintainers = { '@amaanq' },
+    tier = 3,
+  },
   git_rebase = {
     install_info = {
-      url = 'https://github.com/the-mikedavis/tree-sitter-git-rebase',
       files = { 'src/parser.c' },
+      revision = 'd8a4207ebbc47bd78bacdf48f883db58283f9fd8',
+      url = 'https://github.com/the-mikedavis/tree-sitter-git-rebase',
     },
     maintainers = { '@gbprod' },
     tier = 3,
   },
-
   gitattributes = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gitattributes',
       files = { 'src/parser.c' },
+      revision = '41940e199ba5763abea1d21b4f717014b45f01ea',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gitattributes',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   gitcommit = {
     install_info = {
-      url = 'https://github.com/gbprod/tree-sitter-gitcommit',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'edd817e0532f179b7f7f371dc180629070945f0c',
+      url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
     maintainers = { '@gbprod' },
     tier = 3,
   },
-
-  git_config = {
-    install_info = {
-      url = 'https://github.com/the-mikedavis/tree-sitter-git-config',
-      files = { 'src/parser.c' },
-    },
-    maintainers = { '@amaanq' },
-    tier = 3,
-  },
-
   gitignore = {
     install_info = {
-      url = 'https://github.com/shunsambongi/tree-sitter-gitignore',
       files = { 'src/parser.c' },
+      revision = 'f4685bf11ac466dd278449bcfe5fd014e94aa504',
+      url = 'https://github.com/shunsambongi/tree-sitter-gitignore',
     },
     maintainers = { '@theHamsta' },
     tier = 3,
   },
-
   gleam = {
     install_info = {
-      url = 'https://github.com/gleam-lang/tree-sitter-gleam',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '02a17bf9d0553406268cdbf466d57808ae712bf3',
+      url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   glimmer = {
     install_info = {
-      url = 'https://github.com/ember-tooling/tree-sitter-glimmer',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '6b25d265c990139353e1f7f97baf84987ebb7bf0',
+      url = 'https://github.com/ember-tooling/tree-sitter-glimmer',
     },
     maintainers = { '@NullVoxPopuli' },
     readme_note = 'Glimmer and Ember',
     tier = 3,
   },
-
   glimmer_javascript = {
     install_info = {
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
@@ -836,10 +806,9 @@ M.configs = {
       generate_requires_npm = true,
     },
     maintainers = { '@NullVoxPopuli' },
-    requires = { 'javascript' },
+    requires = { 'ecma' },
     tier = 3,
   },
-
   glimmer_typescript = {
     install_info = {
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
@@ -850,46 +819,45 @@ M.configs = {
     requires = { 'typescript' },
     tier = 3,
   },
-
   glsl = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = '7f91bf34cadc06a96efc475df501ffca4dda9410',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
     },
     maintainers = { '@theHamsta' },
     requires = { 'c' },
     tier = 2,
   },
-
   gn = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gn',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gn',
     },
     maintainers = { '@amaanq' },
     readme_name = 'GN (Generate Ninja)',
     tier = 2,
   },
-
   gnuplot = {
     install_info = {
-      url = 'https://github.com/dpezto/tree-sitter-gnuplot',
       files = { 'src/parser.c' },
+      revision = '3c895f5d9c0b3a3c7e02383766b462c21913c000',
+      url = 'https://github.com/dpezto/tree-sitter-gnuplot',
     },
     maintainers = { '@dpezto' },
     tier = 3,
   },
-
   go = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-go',
       files = { 'src/parser.c' },
+      revision = '7ee8d928db5202f6831a78f8112fd693bf69f98b',
+      url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
     tier = 2,
   },
-
   goctl = {
     install_info = {
       url = 'https://github.com/chaozwn/tree-sitter-goctl',
@@ -898,71 +866,70 @@ M.configs = {
     maintainers = { '@chaozwn' },
     tier = 3,
   },
-
   godot_resource = {
     install_info = {
-      url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '2ffb90de47417018651fc3b970e5f6b67214dc9d',
+      url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
     maintainers = { '@pierpo' },
     readme_note = 'Godot Resources',
     tier = 3,
   },
-
   gomod = {
     install_info = {
-      url = 'https://github.com/camdencheek/tree-sitter-go-mod',
       files = { 'src/parser.c' },
+      revision = 'bbe2fe3be4b87e06a613e685250f473d2267f430',
+      url = 'https://github.com/camdencheek/tree-sitter-go-mod',
     },
     maintainers = { '@camdencheek' },
     tier = 3,
   },
-
   gosum = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-go-sum',
       files = { 'src/parser.c' },
+      revision = 'e2ac513b2240c7ff1069ae33b2df29ce90777c11',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-go-sum',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
-  gowork = {
-    install_info = {
-      url = 'https://github.com/omertuc/tree-sitter-go-work',
-      files = { 'src/parser.c' },
-    },
-    maintainers = { '@omertuc' },
-    tier = 3,
-  },
-
-  graphql = {
-    install_info = {
-      url = 'https://github.com/bkegley/tree-sitter-graphql',
-      files = { 'src/parser.c' },
-    },
-    maintainers = { '@bkegley' },
-    tier = 3,
-  },
-
   gotmpl = {
     install_info = {
-      url = 'https://github.com/ngalaiko/tree-sitter-go-template',
       files = { 'src/parser.c' },
+      revision = '9d3f6e526dd074b9edae9070b7bb778f00e87a5b',
+      url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
     tier = 3,
   },
-
+  gowork = {
+    install_info = {
+      files = { 'src/parser.c' },
+      revision = '949a8a470559543857a62102c84700d291fc984c',
+      url = 'https://github.com/omertuc/tree-sitter-go-work',
+    },
+    maintainers = { '@omertuc' },
+    tier = 3,
+  },
   gpg = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gpg-config',
       files = { 'src/parser.c' },
+      revision = 'f99323fb8f3f10b6c69db0c2f6d0a14bd7330675',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gpg-config',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
+  graphql = {
+    install_info = {
+      files = { 'src/parser.c' },
+      revision = '5e66e961eee421786bdda8495ed1db045e06b5fe',
+      url = 'https://github.com/bkegley/tree-sitter-graphql',
+    },
+    maintainers = { '@bkegley' },
+    tier = 3,
+  },
   gren = {
     install_info = {
       files = { 'src/parser.c', 'src/scanner.c' },
@@ -971,199 +938,197 @@ M.configs = {
     maintainers = { '@MaeBrooks' },
     tier = 3,
   },
-
   groovy = {
     install_info = {
-      url = 'https://github.com/murtaza64/tree-sitter-groovy',
       files = { 'src/parser.c' },
+      revision = '6c5c8813233fe326e24c5ef032858d13f8006a8d',
+      url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
     tier = 3,
   },
-
   gstlaunch = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch',
       files = { 'src/parser.c' },
+      revision = '549aef253fd38a53995cda1bf55c501174372bf7',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch',
     },
     maintainers = { '@theHamsta' },
     tier = 2,
   },
-
   hack = {
     install_info = {
-      url = 'https://github.com/slackhq/tree-sitter-hack',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2',
+      url = 'https://github.com/slackhq/tree-sitter-hack',
     },
     tier = 4,
   },
-
   hare = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hare',
       files = { 'src/parser.c' },
+      revision = '070524937539eb8bb4f10debd9c83b66c434f3a2',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hare',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   haskell = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-haskell',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19',
+      url = 'https://github.com/tree-sitter/tree-sitter-haskell',
     },
     maintainers = { '@mrcjkb' },
     tier = 2,
   },
-
   haskell_persistent = {
     install_info = {
-      url = 'https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '577259b4068b2c281c9ebf94c109bd50a74d5857',
+      url = 'https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent',
     },
     maintainers = { '@lykahb' },
     tier = 3,
   },
-
   hcl = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'e936d3fef8bac884661472dce71ad82284761eb1',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
     tier = 2,
   },
-
   heex = {
     install_info = {
-      url = 'https://github.com/connorlay/tree-sitter-heex',
       files = { 'src/parser.c' },
+      revision = 'b5ad6e34eea18a15bbd1466ca707a17f9bff7b93',
+      url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
     tier = 3,
   },
-
   helm = {
     install_info = {
-      url = 'https://github.com/ngalaiko/tree-sitter-go-template',
-      location = 'dialects/helm',
       files = { 'src/parser.c' },
+      location = 'dialects/helm',
+      revision = '9d3f6e526dd074b9edae9070b7bb778f00e87a5b',
+      url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
     tier = 3,
   },
-
   hjson = {
     install_info = {
-      url = 'https://github.com/winston0410/tree-sitter-hjson',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = '02fa3b79b3ff9a296066da6277adfc3f26cbc9e0',
+      url = 'https://github.com/winston0410/tree-sitter-hjson',
     },
     maintainers = { '@winston0410' },
     requires = { 'json' },
     tier = 3,
   },
-
   hlsl = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '5e1225a30712ca0a9040509806c7ba274a1bbcde',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
     },
     maintainers = { '@theHamsta' },
     requires = { 'cpp' },
     tier = 2,
   },
-
   hlsplaylist = {
     install_info = {
-      url = 'https://github.com/Freed-Wu/tree-sitter-hlsplaylist',
       files = { 'src/parser.c' },
+      revision = '64f19029339e75d6762feae39e7878595860c980',
+      url = 'https://github.com/Freed-Wu/tree-sitter-hlsplaylist',
     },
     maintainers = { '@Freed-Wu' },
     tier = 3,
   },
-
   hocon = {
     install_info = {
-      url = 'https://github.com/antosha417/tree-sitter-hocon',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = 'c390f10519ae69fdb03b3e5764f5592fb6924bcc',
+      url = 'https://github.com/antosha417/tree-sitter-hocon',
     },
     maintainers = { '@antosha417' },
     tier = 4,
   },
-
   hoon = {
     install_info = {
-      url = 'https://github.com/urbit-pilled/tree-sitter-hoon',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8',
+      url = 'https://github.com/urbit-pilled/tree-sitter-hoon',
     },
     maintainers = { '@urbit-pilled' },
     tier = 3,
   },
-
-  html_tags = {
-    maintainers = { '@TravonteD' },
-    readme_note = 'queries required by html, astro, vue, svelte',
-    tier = 3,
-  },
-
   html = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-html',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'e4d834eb4918df01dcad5c27d1b15d56e3bd94cd',
+      url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
     requires = { 'html_tags' },
     tier = 2,
   },
-
+  html_tags = {
+    maintainers = { '@TravonteD' },
+    readme_note = 'queries required by html, astro, vue, svelte',
+    tier = 3,
+  },
   htmldjango = {
     install_info = {
-      url = 'https://github.com/interdependence/tree-sitter-htmldjango',
       files = { 'src/parser.c' },
+      revision = 'ea71012d3fe14dd0b69f36be4f96bdfe9155ebae',
+      url = 'https://github.com/interdependence/tree-sitter-htmldjango',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 3,
   },
-
   http = {
     install_info = {
-      url = 'https://github.com/rest-nvim/tree-sitter-http',
       files = { 'src/parser.c' },
+      revision = '8d22f33faa5aa95c6526606fb656ada342e59e40',
+      url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
     tier = 3,
   },
-
   hurl = {
     install_info = {
-      url = 'https://github.com/pfeiferj/tree-sitter-hurl',
       files = { 'src/parser.c' },
+      revision = 'ad705af8c44c737bdb965fc081329c50716d2d03',
+      url = 'https://github.com/pfeiferj/tree-sitter-hurl',
     },
     maintainers = { '@pfeiferj' },
     tier = 3,
   },
-
   hyprlang = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
       files = { 'src/parser.c' },
+      revision = 'e5da7d0aa44403153e0394d87d9edea4e5bd6609',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
     tier = 2,
   },
-
   idl = {
     install_info = {
-      url = 'https://github.com/cathaysia/tree-sitter-idl',
       files = { 'src/parser.c' },
+      revision = '9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa',
+      url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
     tier = 3,
   },
-
   idris = {
     install_info = {
       url = 'https://github.com/kayhide/tree-sitter-idris',
@@ -1172,25 +1137,24 @@ M.configs = {
     maintainers = { '@srghma' },
     tier = 3,
   },
-
   ini = {
     install_info = {
-      url = 'https://github.com/justinmk/tree-sitter-ini',
       files = { 'src/parser.c' },
+      revision = '87176e524f0a98f5be75fa44f4f0ff5c6eac069c',
+      url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
     tier = 3,
   },
-
   inko = {
     install_info = {
-      url = 'https://github.com/inko-lang/tree-sitter-inko',
       files = { 'src/parser.c' },
+      revision = '234c87be1dac20f766ddf6f486a7bde2a4bc5594',
+      url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
     tier = 3,
   },
-
   ipkg = {
     install_info = {
       url = 'https://github.com/srghma/tree-sitter-ipkg',
@@ -1199,36 +1163,35 @@ M.configs = {
     maintainers = { '@srghma' },
     tier = 3,
   },
-
   ispc = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ispc',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = '9b2f9aec2106b94b4e099fe75e73ebd8ae707c04',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ispc',
     },
     maintainers = { '@fab4100' },
     requires = { 'c' },
     tier = 2,
   },
-
   janet_simple = {
     install_info = {
-      url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '6bfbaadac2ba0da21087041eff85d26129c4c920',
+      url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
     tier = 3,
   },
-
   java = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-java',
       files = { 'src/parser.c' },
+      revision = '953abfc8bb3eb2f578e1f461edba4a9885f974b8',
+      url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
     tier = 2,
   },
-
   javadoc = {
     install_info = {
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
@@ -1237,17 +1200,16 @@ M.configs = {
     maintainers = { '@rmuir' },
     tier = 2,
   },
-
   javascript = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-javascript',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '391a8fcc48a11f63bf18ec9885f6f069e760949a',
+      url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma', 'jsx' },
     tier = 2,
   },
-
   jinja = {
     install_info = {
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
@@ -1256,9 +1218,9 @@ M.configs = {
     },
     maintainers = { '@cathaysia' },
     readme_note = 'basic highlighting',
+    requires = { 'jinja_inline' },
     tier = 3,
   },
-
   jinja_inline = {
     install_info = {
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
@@ -1269,87 +1231,85 @@ M.configs = {
     readme_note = 'needed for full highlighting',
     tier = 3,
   },
-
   jq = {
     install_info = {
-      url = 'https://github.com/flurie/tree-sitter-jq',
       files = { 'src/parser.c' },
+      revision = '13990f530e8e6709b7978503da9bc8701d366791',
+      url = 'https://github.com/flurie/tree-sitter-jq',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 3,
   },
-
   jsdoc = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-jsdoc',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '49fde205b59a1d9792efc21ee0b6d50bbd35ff14',
+      url = 'https://github.com/tree-sitter/tree-sitter-jsdoc',
     },
     maintainers = { '@steelsojka' },
     tier = 2,
   },
-
   json = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-json',
       files = { 'src/parser.c' },
+      revision = '94f5c527b2965465956c2000ed6134dd24daf2a7',
+      url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
     tier = 2,
   },
-
   json5 = {
     install_info = {
-      url = 'https://github.com/Joakker/tree-sitter-json5',
       files = { 'src/parser.c' },
+      revision = 'ab0ba8229d639ec4f3fa5f674c9133477f4b77bd',
+      url = 'https://github.com/Joakker/tree-sitter-json5',
     },
     maintainers = { '@Joakker' },
     tier = 3,
   },
-
   jsonc = {
     install_info = {
-      url = 'https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = '02b01653c8a1c198ae7287d566efa86a135b30d5',
+      url = 'https://gitlab.com/WhyNotHugo/tree-sitter-jsonc',
     },
     maintainers = { '@WhyNotHugo' },
     requires = { 'json' },
     tier = 3,
   },
-
   jsonnet = {
     install_info = {
-      url = 'https://github.com/sourcegraph/tree-sitter-jsonnet',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'd34615fa12cc1d1cfc1f1f1a80acc9db80ee4596',
+      url = 'https://github.com/sourcegraph/tree-sitter-jsonnet',
     },
     maintainers = { '@nawordar' },
     tier = 3,
   },
-
   jsx = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, tsx',
     tier = 3,
   },
-
   julia = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-julia',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'f1baa5f8e271109d01cc8ff7473c11df2d8a9aee',
+      url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
     tier = 3,
   },
-
   just = {
     install_info = {
-      url = 'https://github.com/IndianBoy42/tree-sitter-just',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'fd814fc6c579f68c2a642f5e0268cf69daae92d7',
+      url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
     tier = 3,
   },
-
   kcl = {
     install_info = {
       url = 'https://github.com/kcl-lang/tree-sitter-kcl',
@@ -1358,268 +1318,267 @@ M.configs = {
     maintainers = { '@bertbaron' },
     tier = 2,
   },
-
   kconfig = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-kconfig',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '486fea71f61ad9f3fd4072a118402e97fe88d26c',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-kconfig',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   kdl = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-kdl',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '49fb89a854d93b58a65a19724ac307195ca11941',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-kdl',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   kotlin = {
     install_info = {
-      url = 'https://github.com/fwcd/tree-sitter-kotlin',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'c9cb8504b81684375e7beb8907517dbd6947a1be',
+      url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
     tier = 3,
   },
-
   koto = {
     install_info = {
-      url = 'https://github.com/koto-lang/tree-sitter-koto',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'eb8d866cff5751c0a7650623d244280618b0a378',
+      url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
     tier = 3,
   },
-
   kusto = {
     install_info = {
-      url = 'https://github.com/Willem-J-an/tree-sitter-kusto',
       files = { 'src/parser.c' },
+      revision = '8353a1296607d6ba33db7c7e312226e5fc83e8ce',
+      url = 'https://github.com/Willem-J-an/tree-sitter-kusto',
     },
     maintainers = { '@Willem-J-an' },
     tier = 3,
   },
-
   lalrpop = {
     install_info = {
-      url = 'https://github.com/traxys/tree-sitter-lalrpop',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '854a40e99f7c70258e522bdb8ab584ede6196e2e',
+      url = 'https://github.com/traxys/tree-sitter-lalrpop',
     },
     maintainers = { '@traxys' },
     tier = 3,
   },
-
   latex = {
     install_info = {
-      url = 'https://github.com/latex-lsp/tree-sitter-latex',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
+      revision = 'cd82eb40d31bdfe65f846f4e06292d6c804b5e0e',
+      url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
     tier = 3,
   },
-
   ledger = {
     install_info = {
-      url = 'https://github.com/cbarrete/tree-sitter-ledger',
       files = { 'src/parser.c' },
+      revision = '8a841fb20ce683bfbb3469e6ba67f2851cfdf94a',
+      url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
     maintainers = { '@cbarrete' },
     tier = 3,
   },
-
   leo = {
     install_info = {
-      url = 'https://github.com/r001/tree-sitter-leo',
       files = { 'src/parser.c' },
+      revision = '304611b5eaf53aca07459a0a03803b83b6dfd3b3',
+      url = 'https://github.com/r001/tree-sitter-leo',
     },
     maintainers = { '@r001' },
     tier = 3,
   },
-
-  llvm = {
-    install_info = {
-      url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
-      files = { 'src/parser.c' },
-    },
-    maintainers = { '@benwilliamgraham' },
-    tier = 3,
-  },
-
   linkerscript = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-linkerscript',
       files = { 'src/parser.c' },
+      revision = 'f99011a3554213b654985a4b0a65b3b032ec4621',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-linkerscript',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   liquid = {
     install_info = {
-      url = 'https://github.com/hankthetank27/tree-sitter-liquid',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '293369818da219d97327908aab33707b04b63fd9',
+      url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
     tier = 3,
   },
-
   liquidsoap = {
     install_info = {
-      url = 'https://github.com/savonet/tree-sitter-liquidsoap',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '14feafa91630afb1ab9988cf9b738b7ea29f3f89',
+      url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
     tier = 3,
   },
-
+  llvm = {
+    install_info = {
+      files = { 'src/parser.c' },
+      revision = '1b96e58faf558ce057d4dc664b904528aee743cb',
+      url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
+    },
+    maintainers = { '@benwilliamgraham' },
+    tier = 3,
+  },
   lua = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'a24dab177e58c9c6832f96b9a73102a0cfbced4a',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
     tier = 1,
   },
-
   luadoc = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luadoc',
       files = { 'src/parser.c' },
+      revision = '873612aadd3f684dd4e631bdf42ea8990c57634e',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luadoc',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   luap = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luap',
       files = { 'src/parser.c' },
+      revision = '31461ae9bd0866cb5117cfe5de71189854fd0f3e',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luap',
     },
     maintainers = { '@amaanq' },
     readme_note = 'Lua patterns',
     tier = 2,
   },
-
   luau = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luau',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '5aa9b88a8e3327276ec6e72de997f04ac80b1ae4',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-luau',
     },
     maintainers = { '@amaanq' },
     requires = { 'lua' },
     tier = 2,
   },
-
   m68k = {
     install_info = {
-      url = 'https://github.com/grahambates/tree-sitter-m68k',
       files = { 'src/parser.c' },
+      revision = 'd097b123f19c6eaba2bf181c05420d88b9fc489d',
+      url = 'https://github.com/grahambates/tree-sitter-m68k',
     },
     maintainers = { '@grahambates' },
     tier = 3,
   },
-
   make = {
     install_info = {
-      url = 'https://github.com/alemuller/tree-sitter-make',
       files = { 'src/parser.c' },
+      revision = 'a4b9187417d6be349ee5fd4b6e77b4172c6827dd',
+      url = 'https://github.com/alemuller/tree-sitter-make',
     },
     maintainers = { '@lewis6991' },
     tier = 3,
   },
-
   markdown = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
-      location = 'tree-sitter-markdown',
       files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'tree-sitter-markdown',
+      revision = '7fe453beacecf02c86f7736439f238f5bb8b5c9b',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
     readme_note = 'basic highlighting',
     requires = { 'markdown_inline' },
     tier = 1,
   },
-
   markdown_inline = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
-      location = 'tree-sitter-markdown-inline',
       files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'tree-sitter-markdown-inline',
+      revision = '7fe453beacecf02c86f7736439f238f5bb8b5c9b',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
     readme_note = 'needed for full highlighting',
     tier = 1,
   },
-
   matlab = {
     install_info = {
-      url = 'https://github.com/acristoffers/tree-sitter-matlab',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '79d8b25f57b48f83ae1333aff6723b83c9532e37',
+      url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
     tier = 3,
   },
-
   menhir = {
     install_info = {
-      url = 'https://github.com/Kerl13/tree-sitter-menhir',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'be8866a6bcc2b563ab0de895af69daeffa88fe70',
+      url = 'https://github.com/Kerl13/tree-sitter-menhir',
     },
     maintainers = { '@Kerl13' },
     tier = 3,
   },
-
   mermaid = {
     install_info = {
-      url = 'https://github.com/monaqa/tree-sitter-mermaid',
       files = { 'src/parser.c' },
+      revision = '90ae195b31933ceb9d079abfa8a3ad0a36fee4cc',
+      url = 'https://github.com/monaqa/tree-sitter-mermaid',
     },
     tier = 4,
   },
-
   meson = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
       files = { 'src/parser.c' },
+      revision = 'bd17c824196ce70800f64ad39cfddd1b17acc13f',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
     tier = 2,
   },
-
   mlir = {
     install_info = {
-      url = 'https://github.com/artagnon/tree-sitter-mlir',
       files = { 'src/parser.c' },
       generate = true,
+      revision = '00c32d8562dc957b187da110a3443307962b8da8',
+      url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
     tier = 3,
   },
-
   muttrc = {
     install_info = {
-      url = 'https://github.com/neomutt/tree-sitter-muttrc',
       files = { 'src/parser.c' },
+      revision = '90ef60852c410bd964cd3b954366e4c403c17314',
+      url = 'https://github.com/neomutt/tree-sitter-muttrc',
     },
     maintainers = { '@Freed-Wu' },
     tier = 3,
   },
-
   nasm = {
     install_info = {
-      url = 'https://github.com/naclsn/tree-sitter-nasm',
       files = { 'src/parser.c' },
+      revision = '570f3d7be01fffc751237f4cfcf52d04e20532d1',
+      url = 'https://github.com/naclsn/tree-sitter-nasm',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 3,
   },
-
   nginx = {
     install_info = {
       url = 'https://github.com/opa-oz/tree-sitter-nginx',
@@ -1628,62 +1587,61 @@ M.configs = {
     maintainers = { '@opa-oz' },
     tier = 3,
   },
-
   nickel = {
     install_info = {
-      url = 'https://github.com/nickel-lang/tree-sitter-nickel',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '0a796f3a312917724c1d9f486a201f7402a8acfd',
+      url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 4,
   },
-
   nim = {
     install_info = {
-      url = 'https://github.com/alaviss/tree-sitter-nim',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '961c2798cec9250c44f7d7225ddb33d47d25856a',
+      url = 'https://github.com/alaviss/tree-sitter-nim',
     },
     maintainers = { '@aMOPel' },
     requires = { 'nim_format_string' },
     tier = 3,
   },
-
   nim_format_string = {
     install_info = {
-      url = 'https://github.com/aMOPel/tree-sitter-nim-format-string',
       files = { 'src/parser.c' },
+      revision = 'd45f75022d147cda056e98bfba68222c9c8eca3a',
+      url = 'https://github.com/aMOPel/tree-sitter-nim-format-string',
     },
     maintainers = { '@aMOPel' },
     tier = 3,
   },
-
   ninja = {
     install_info = {
-      url = 'https://github.com/alemuller/tree-sitter-ninja',
       files = { 'src/parser.c' },
+      revision = '0a95cfdc0745b6ae82f60d3a339b37f19b7b9267',
+      url = 'https://github.com/alemuller/tree-sitter-ninja',
     },
     maintainers = { '@alemuller' },
     tier = 3,
   },
-
   nix = {
     install_info = {
-      url = 'https://github.com/cstrahan/tree-sitter-nix',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'b3cda619248e7dd0f216088bd152f59ce0bbe488',
+      url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
     tier = 3,
   },
-
   nqc = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-nqc',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = '14e6da1627aaef21d2b2aa0c37d04269766dcc1d',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-nqc',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   nu = {
     install_info = {
       url = 'https://github.com/nushell/tree-sitter-nu',
@@ -1692,186 +1650,185 @@ M.configs = {
     maintainers = { '@abhisheksingh0x558' },
     tier = 3,
   },
-
   objc = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-objc',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = '62e61b6f5c0289c376d61a8c91faf6435cde9012',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-objc',
     },
     maintainers = { '@amaanq' },
     requires = { 'c' },
     tier = 2,
   },
-
   objdump = {
     install_info = {
-      url = 'https://github.com/ColinKennedy/tree-sitter-objdump',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '28d3b2e25a0b1881d1b47ed1924ca276c7003d45',
+      url = 'https://github.com/ColinKennedy/tree-sitter-objdump',
     },
     maintainers = { '@ColinKennedy' },
     tier = 3,
   },
-
   ocaml = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'grammars/ocaml',
+      revision = '0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e',
+      url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
     tier = 2,
   },
-
   ocaml_interface = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'grammars/interface',
+      revision = '0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e',
+      url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
     requires = { 'ocaml' },
     tier = 2,
   },
-
   ocamllex = {
     install_info = {
-      url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
+      revision = '4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2',
+      url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
     },
     maintainers = { '@undu' },
     tier = 3,
   },
-
   odin = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-odin',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'd37b8f24f653378b268ec18404e9c14ad355b128',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-odin',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   pascal = {
     install_info = {
-      url = 'https://github.com/Isopod/tree-sitter-pascal',
       files = { 'src/parser.c' },
+      revision = 'a9ee969dec5b2e3b2ccccc5954fec04100c7619e',
+      url = 'https://github.com/Isopod/tree-sitter-pascal',
     },
     maintainers = { '@Isopod' },
     tier = 3,
   },
-
   passwd = {
     install_info = {
-      url = 'https://github.com/ath3/tree-sitter-passwd',
       files = { 'src/parser.c' },
+      revision = '20239395eacdc2e0923a7e5683ad3605aee7b716',
+      url = 'https://github.com/ath3/tree-sitter-passwd',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   pem = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pem',
       files = { 'src/parser.c' },
+      revision = '217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pem',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   perl = {
     install_info = {
-      url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
       branch = 'release',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '309cb8d33bcfd0a81050b21be08f9eb3f2fe2138',
+      url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
     tier = 3,
   },
-
   php = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-php',
-      location = 'php',
       files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'php',
+      revision = 'b38c53537769df05871643c9688c264074fb6076',
+      url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
-    requires = { 'php_only' },
     readme_note = 'PHP with embedded HTML',
+    requires = { 'php_only' },
     tier = 2,
   },
-
   php_only = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-php',
-      location = 'php_only',
       files = { 'src/parser.c', 'src/scanner.c' },
+      location = 'php_only',
+      revision = 'b38c53537769df05871643c9688c264074fb6076',
+      url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
     readme_note = 'PHP without embedded HTML',
     tier = 2,
   },
-
   phpdoc = {
     install_info = {
-      url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc',
+      url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
     maintainers = { '@mikehaertl' },
     tier = 3,
   },
-
   pioasm = {
     install_info = {
-      url = 'https://github.com/leo60228/tree-sitter-pioasm',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '924aadaf5dea2a6074d72027b064f939acf32e20',
+      url = 'https://github.com/leo60228/tree-sitter-pioasm',
     },
     maintainers = { '@leo60228' },
     tier = 3,
   },
-
   po = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-po',
       files = { 'src/parser.c' },
+      revision = 'bd860a0f57f697162bf28e576674be9c1500db5e',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-po',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   pod = {
     install_info = {
-      url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
-      files = { 'src/parser.c', 'src/scanner.c' },
       branch = 'release',
+      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '39da859947b94abdee43e431368e1ae975c0a424',
+      url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
     tier = 3,
   },
-
   poe_filter = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-poe-filter',
       files = { 'src/parser.c' },
+      revision = '592476d81f95d2451f2ca107dc872224c76fecdf',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-poe-filter',
     },
     maintainers = { '@ObserverOfTime' },
     readme_note = 'Path of Exile item filter',
     tier = 2,
   },
-
   pony = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pony',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '73ff874ae4c9e9b45462673cbc0a1e350e2522a7',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pony',
     },
     maintainers = { '@amaanq', '@mfelsche' },
     tier = 2,
   },
-
   powershell = {
     install_info = {
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
@@ -1881,20 +1838,20 @@ M.configs = {
     maintainers = { '@L2jLiga' },
     tier = 3,
   },
-
   printf = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-printf',
       files = { 'src/parser.c' },
+      revision = '0e0aceabbf607ea09e03562f5d8a56f048ddea3d',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-printf',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   prisma = {
     install_info = {
-      url = 'https://github.com/victorhqc/tree-sitter-prisma',
       files = { 'src/parser.c' },
+      revision = 'eca2596a355b1a9952b4f80f8f9caed300a272b5',
+      url = 'https://github.com/victorhqc/tree-sitter-prisma',
     },
     maintainers = { '@elianiva' },
     tier = 3,
@@ -1920,175 +1877,174 @@ M.configs = {
     maintainers = { '@foxyseta' },
     tier = 3,
   },
-
-  properties = {
-    install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-properties',
-      files = { 'src/parser.c', 'src/scanner.c' },
-    },
-    maintainers = { '@ObserverOfTime' },
-    tier = 2,
-    readme_note = 'Java properties files',
-  },
-
-  proto = {
-    install_info = {
-      url = 'https://github.com/treywood/tree-sitter-proto',
-      files = { 'src/parser.c' },
-    },
-    maintainers = { '@treywood' },
-    tier = 3,
-  },
-
   promql = {
     install_info = {
-      url = 'https://github.com/MichaHoffmann/tree-sitter-promql',
       files = { 'src/parser.c' },
+      revision = '77625d78eebc3ffc44d114a07b2f348dff3061b0',
+      url = 'https://github.com/MichaHoffmann/tree-sitter-promql',
     },
     maintainers = { '@MichaHoffmann' },
     tier = 3,
   },
-
+  properties = {
+    install_info = {
+      files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '9d09f5f200c356c50c4103d36441309fd61b48d1',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-properties',
+    },
+    maintainers = { '@ObserverOfTime' },
+    readme_note = 'Java properties files',
+    tier = 2,
+  },
+  proto = {
+    install_info = {
+      files = { 'src/parser.c' },
+      revision = 'e9f6b43f6844bd2189b50a422d4e2094313f6aa3',
+      url = 'https://github.com/treywood/tree-sitter-proto',
+    },
+    maintainers = { '@treywood' },
+    tier = 3,
+  },
   prql = {
     install_info = {
-      url = 'https://github.com/PRQL/tree-sitter-prql',
       files = { 'src/parser.c' },
+      revision = '09e158cd3650581c0af4c49c2e5b10c4834c8646',
+      url = 'https://github.com/PRQL/tree-sitter-prql',
     },
     maintainers = { '@matthias-Q' },
     tier = 3,
   },
-
   psv = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
       files = { 'src/parser.c' },
       location = 'psv',
+      revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
     },
     maintainers = { '@amaanq' },
     requires = { 'tsv' },
     tier = 2,
   },
-
   pug = {
     install_info = {
-      url = 'https://github.com/zealot128/tree-sitter-pug',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'a7ff31a38908df9b9f34828d21d6ca5e12413e18',
+      url = 'https://github.com/zealot128/tree-sitter-pug',
     },
     maintainers = { '@zealot128' },
     tier = 3,
   },
-
   puppet = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-puppet',
       files = { 'src/parser.c' },
+      revision = '584522f32495d648b18a53ccb52d988e60de127d',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-puppet',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   purescript = {
     install_info = {
-      url = 'https://github.com/postsolar/tree-sitter-purescript',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'daf9b3e2be18b0b2996a1281f7783e0d041d8b80',
+      url = 'https://github.com/postsolar/tree-sitter-purescript',
     },
     maintainers = { '@postsolar' },
     tier = 3,
   },
-
   pymanifest = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pymanifest',
       files = { 'src/parser.c' },
+      revision = 'e3b82b78721aee07f676dac8473ae69db51debcf',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-pymanifest',
     },
     maintainers = { '@ObserverOfTime' },
     readme_name = 'PyPA manifest',
     tier = 2,
   },
-
   python = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-python',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '71778c2a472ed00a64abf4219544edbf8e4b86d7',
+      url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
     tier = 1,
   },
-
   ql = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-ql',
       files = { 'src/parser.c' },
+      revision = '42becd6f8f7bae82c818fa3abb1b6ff34b552310',
+      url = 'https://github.com/tree-sitter/tree-sitter-ql',
     },
     maintainers = { '@pwntester' },
     tier = 2,
   },
-
   qmldir = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-qmldir',
       files = { 'src/parser.c' },
+      revision = '6b2b5e41734bd6f07ea4c36ac20fb6f14061c841',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-qmldir',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   qmljs = {
     install_info = {
-      url = 'https://github.com/yuja/tree-sitter-qmljs',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '2c57cac27e207425f8df15327884434cb12365a3',
+      url = 'https://github.com/yuja/tree-sitter-qmljs',
     },
     maintainers = { '@Decodetalkers' },
     requires = { 'ecma' },
     tier = 3,
   },
-
   query = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
       files = { 'src/parser.c' },
+      revision = 'f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
     readme_note = 'Tree-sitter query language',
     tier = 1,
   },
-
   r = {
     install_info = {
-      url = 'https://github.com/r-lib/tree-sitter-r',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '391400572538ff9854341a175ed8ab4b1e45f44b',
+      url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
     tier = 3,
   },
-
   racket = {
     install_info = {
-      url = 'https://github.com/6cdh/tree-sitter-racket',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '171f52a8c0ed635b85cd42d1e36d82f1066a03b4',
+      url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 4,
   },
-
   ralph = {
     install_info = {
-      url = 'https://github.com/alephium/tree-sitter-ralph',
       files = { 'src/parser.c' },
+      revision = '48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0',
+      url = 'https://github.com/alephium/tree-sitter-ralph',
     },
     maintainers = { '@tdroxler' },
     tier = 3,
   },
-
   rasi = {
     install_info = {
-      url = 'https://github.com/Fymyte/tree-sitter-rasi',
       files = { 'src/parser.c' },
+      revision = '6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa',
+      url = 'https://github.com/Fymyte/tree-sitter-rasi',
     },
     maintainers = { '@Fymyte' },
     tier = 3,
   },
-
   razor = {
     install_info = {
       generate_from_json = true,
@@ -2099,62 +2055,61 @@ M.configs = {
     maintainers = { '@tris203' },
     tier = 3,
   },
-
   rbs = {
     install_info = {
-      url = 'https://github.com/joker1007/tree-sitter-rbs',
       files = { 'src/parser.c' },
+      revision = 'e5e807a50fcd104a2d740d354632fc671700a0bf',
+      url = 'https://github.com/joker1007/tree-sitter-rbs',
     },
     maintainers = { '@joker1007' },
     tier = 3,
   },
-
   re2c = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-re2c',
       files = { 'src/parser.c' },
+      revision = '47aa19cf5f7aba2ed30e2b377f7172df76e819a6',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-re2c',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   readline = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-readline',
       files = { 'src/parser.c' },
+      revision = '3d4768b04d7cfaf40533e12b28672603428b8f31',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-readline',
     },
     maintainers = { '@ribru17' },
     tier = 2,
   },
-
   regex = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-regex',
       files = { 'src/parser.c' },
+      revision = '47007f195752d8e57bda80b0b6cdb2d173a9f7d7',
+      url = 'https://github.com/tree-sitter/tree-sitter-regex',
     },
     maintainers = { '@theHamsta' },
     tier = 2,
   },
-
   rego = {
     install_info = {
-      url = 'https://github.com/FallenAngel97/tree-sitter-rego',
       files = { 'src/parser.c' },
+      revision = '23b1da8de9766d766c4f01531e8be14b5c00c493',
+      url = 'https://github.com/FallenAngel97/tree-sitter-rego',
     },
     maintainers = { '@FallenAngel97' },
     tier = 3,
   },
-
   requirements = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-requirements',
       files = { 'src/parser.c' },
+      revision = '360c6a6b31076a482663806f7a8241de9cad6b4e',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-requirements',
     },
     maintainers = { '@ObserverOfTime' },
     readme_name = 'pip requirements',
     tier = 2,
   },
-
   rescript = {
     install_info = {
       url = 'https://github.com/rescript-lang/tree-sitter-rescript',
@@ -2163,25 +2118,24 @@ M.configs = {
     maintainers = { '@ribru17' },
     tier = 2,
   },
-
   rnoweb = {
     install_info = {
-      url = 'https://github.com/bamonroe/tree-sitter-rnoweb',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '1a74dc0ed731ad07db39f063e2c5a6fe528cae7f',
+      url = 'https://github.com/bamonroe/tree-sitter-rnoweb',
     },
     maintainers = { '@bamonroe' },
     tier = 3,
   },
-
   robot = {
     install_info = {
-      url = 'https://github.com/Hubro/tree-sitter-robot',
       files = { 'src/parser.c' },
+      revision = '322e4cc65754d2b3fdef4f2f8a71e0762e3d13af',
+      url = 'https://github.com/Hubro/tree-sitter-robot',
     },
     maintainers = { '@Hubro' },
     tier = 3,
   },
-
   robots = {
     install_info = {
       url = 'https://github.com/opa-oz/tree-sitter-robots-txt',
@@ -2190,98 +2144,96 @@ M.configs = {
     maintainers = { '@opa-oz' },
     tier = 3,
   },
-
   roc = {
     install_info = {
-      url = 'https://github.com/faldor20/tree-sitter-roc',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '7df2c0892e62efb81a7504d9799d4e0d0443d241',
+      url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
     tier = 3,
   },
-
   ron = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ron',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '78938553b93075e638035f624973083451b29055',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ron',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   rst = {
     install_info = {
-      url = 'https://github.com/stsewd/tree-sitter-rst',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '5120f6e59284cb8b85b450bd2db0bd352635ba9f',
+      url = 'https://github.com/stsewd/tree-sitter-rst',
     },
     maintainers = { '@stsewd' },
     tier = 3,
   },
-
   ruby = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-ruby',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b',
+      url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
     tier = 2,
   },
-
   runescript = {
     install_info = {
-      url = 'https://github.com/2004Scape/tree-sitter-runescript',
       files = { 'src/parser.c', 'src/scanner.c' },
+      url = 'https://github.com/2004Scape/tree-sitter-runescript',
     },
     maintainers = { '@2004Scape' },
     tier = 3,
   },
-
   rust = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-rust',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '9c84af007b0f144954adb26b3f336495cbb320a7',
+      url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   scala = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-scala',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'b76db435a7f876cf1ede837d66054c534783c72f',
+      url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
     tier = 2,
   },
-
   scfg = {
     install_info = {
-      url = 'https://github.com/rockorager/tree-sitter-scfg',
       files = { 'src/parser.c' },
       generate = true,
+      revision = '6deae0cbb458c849a4d1e2985093e9c9c32d7fd0',
+      url = 'https://github.com/rockorager/tree-sitter-scfg',
     },
     maintainers = { '@WhyNotHugo' },
     tier = 3,
   },
-
   scheme = {
     install_info = {
-      url = 'https://github.com/6cdh/tree-sitter-scheme',
       files = { 'src/parser.c' },
+      revision = '8f9dff3d038f09934db5ea113cebc59c74447743',
+      url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 4,
   },
-
   scss = {
     install_info = {
-      url = 'https://github.com/serenadeai/tree-sitter-scss',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'c478c6868648eff49eb04a4df90d703dc45b312a',
+      url = 'https://github.com/serenadeai/tree-sitter-scss',
     },
     maintainers = { '@elianiva' },
     requires = { 'css' },
     tier = 3,
   },
-
   sflog = {
     install_info = {
       url = 'https://github.com/aheber/tree-sitter-sfapex',
@@ -2294,15 +2246,15 @@ M.configs = {
   },
   slang = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '865d79e236c7f0e04276c969453d021d1da4b15f',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
-    readme_note = 'Shader Slang',
     maintainers = { '@theHamsta' },
+    readme_note = 'Shader Slang',
     tier = 2,
   },
-
   slim = {
     install_info = {
       url = 'https://github.com/theoo/tree-sitter-slim',
@@ -2311,282 +2263,259 @@ M.configs = {
     maintainers = { '@theoo' },
     tier = 3,
   },
-
   slint = {
     install_info = {
-      url = 'https://github.com/slint-ui/tree-sitter-slint',
       files = { 'src/parser.c' },
+      revision = 'd82ab8c19ea1b60ff570256eaef7d137cc5ecb63',
+      url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
     tier = 3,
   },
-
   smali = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-smali',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'fdfa6a1febc43c7467aa7e937b87b607956f2346',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-smali',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
-  snakemake = {
-    install_info = {
-      url = 'https://github.com/osthomas/tree-sitter-snakemake',
-      files = { 'src/parser.c', 'src/scanner.c' },
-      generate_from_json = true,
-    },
-    maintainers = { '@osthomas' },
-    tier = 3,
-  },
-
   smithy = {
     install_info = {
-      url = 'https://github.com/indoorvivants/tree-sitter-smithy',
       files = { 'src/parser.c' },
+      revision = 'fa898ac0885d1da9a253695c3e0e91f5efc587cd',
+      url = 'https://github.com/indoorvivants/tree-sitter-smithy',
     },
     maintainers = { '@amaanq', '@keynmol' },
     tier = 3,
   },
-
+  snakemake = {
+    install_info = {
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
+      revision = 'ba1b3868eaa960b945593404af9a7c2f296d3643',
+      url = 'https://github.com/osthomas/tree-sitter-snakemake',
+    },
+    maintainers = { '@osthomas' },
+    tier = 3,
+  },
   solidity = {
     install_info = {
-      url = 'https://github.com/JoranHonig/tree-sitter-solidity',
       files = { 'src/parser.c' },
+      revision = '1c94fe3d5351dfcff3551ec1f49614cbf758e444',
+      url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   soql = {
     install_info = {
-      url = 'https://github.com/aheber/tree-sitter-sfapex',
       files = { 'src/parser.c' },
       location = 'soql',
+      revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
     tier = 3,
   },
-
   sosl = {
     install_info = {
-      url = 'https://github.com/aheber/tree-sitter-sfapex',
       files = { 'src/parser.c' },
       location = 'sosl',
+      revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
     tier = 3,
   },
-
   sourcepawn = {
     install_info = {
-      url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '64ad670dd59e88c5d32bc3d759ae8562b522cad9',
+      url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
     },
     maintainers = { '@Sarrus1' },
     tier = 3,
   },
-
   sparql = {
     install_info = {
-      url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
       files = { 'src/parser.c' },
       generate_from_json = true,
+      revision = '05f949d3c1c15e3261473a244d3ce87777374dec',
+      url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
     },
     maintainers = { '@GordianDziwis' },
     tier = 3,
   },
-
   sql = {
     install_info = {
-      url = 'https://github.com/derekstride/tree-sitter-sql',
-      files = { 'src/parser.c', 'src/scanner.c' },
       branch = 'gh-pages',
+      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '6a99f4aff780f98bc119c7f034406e41d7e0b80d',
+      url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
     tier = 3,
   },
-
   squirrel = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-squirrel',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '0a50d31098e83c668d34d1160a0f6c7d23b571cc',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-squirrel',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   ssh_config = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ssh-config',
       files = { 'src/parser.c' },
+      revision = '77450e8bce8853921512348f83c73c168c71fdfb',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ssh-config',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   starlark = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-starlark',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '018d0e09d9d0f0dd6740a37682b8ee4512e8b2ac',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-starlark',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   strace = {
     install_info = {
-      url = 'https://github.com/sigmaSd/tree-sitter-strace',
       files = { 'src/parser.c' },
+      revision = 'd819cdd5dbe455bd3c859193633c8d91c0df7c36',
+      url = 'https://github.com/sigmaSd/tree-sitter-strace',
     },
     maintainers = { '@amaanq' },
     tier = 3,
   },
-
   styled = {
     install_info = {
-      url = 'https://github.com/mskelton/tree-sitter-styled',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '65835cca33a5f033bcde580ed66cde01c1fabbbe',
+      url = 'https://github.com/mskelton/tree-sitter-styled',
     },
     maintainers = { '@mskelton' },
     tier = 3,
   },
-
   supercollider = {
     install_info = {
-      url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'affa4389186b6939d89673e1e9d2b28364f5ca6f',
+      url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
     tier = 3,
   },
-
   superhtml = {
     install_info = {
-      url = 'https://github.com/kristoff-it/superhtml',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'tree-sitter-superhtml',
+      url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
     tier = 3,
   },
-
   surface = {
     install_info = {
-      url = 'https://github.com/connorlay/tree-sitter-surface',
       files = { 'src/parser.c' },
+      revision = 'f4586b35ac8548667a9aaa4eae44456c1f43d032',
+      url = 'https://github.com/connorlay/tree-sitter-surface',
     },
     maintainers = { '@connorlay' },
     tier = 3,
   },
-
   svelte = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '2c97326cd96b7c3016c3d249e8dc244c89b4abeb',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
     },
     maintainers = { '@amaanq' },
     requires = { 'html_tags' },
     tier = 2,
   },
-
   sway = {
     install_info = {
-      url = 'https://github.com/FuelLabs/tree-sitter-sway.git',
       files = { 'src/parser.c', 'src/scanner.c' },
+      url = 'https://github.com/FuelLabs/tree-sitter-sway.git',
     },
     maintainers = { '@ribru17' },
     tier = 2,
   },
-
   swift = {
     install_info = {
-      url = 'https://github.com/alex-pinkus/tree-sitter-swift',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
+      revision = '26354ddec08c7efde4fa16bd29429f3310d2e2c5',
+      url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
     tier = 3,
   },
-
   sxhkdrc = {
     install_info = {
-      url = 'https://github.com/RaafatTurki/tree-sitter-sxhkdrc',
       files = { 'src/parser.c' },
+      revision = '440d5f913d9465c9c776a1bd92334d32febcf065',
+      url = 'https://github.com/RaafatTurki/tree-sitter-sxhkdrc',
     },
     maintainers = { '@RaafatTurki' },
     tier = 3,
   },
-
   systemtap = {
     install_info = {
-      url = 'https://github.com/ok-ryoko/tree-sitter-systemtap',
       files = { 'src/parser.c' },
+      revision = '1af543a96d060b1f808982037bfc54cc02218edd',
+      url = 'https://github.com/ok-ryoko/tree-sitter-systemtap',
     },
     maintainers = { '@ok-ryoko' },
     tier = 3,
   },
-
   t32 = {
     install_info = {
-      url = 'https://gitlab.com/xasc/tree-sitter-t32.git',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '6182836f4128725f1e74ce986840d7317021a015',
+      url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
     tier = 3,
   },
-
   tablegen = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-tablegen',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'b1170880c61355aaf38fc06f4af7d3c55abdabc4',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-tablegen',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   tact = {
     install_info = {
-      url = 'https://github.com/tact-lang/tree-sitter-tact',
       files = { 'src/parser.c' },
+      revision = '034df2162ed7b654efd999942e266be713c7cde0',
+      url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
     tier = 3,
   },
-
-  teal = {
-    install_info = {
-      url = 'https://github.com/euclidianAce/tree-sitter-teal',
-      files = { 'src/parser.c', 'src/scanner.c' },
-      generate = true,
-    },
-    maintainers = { '@euclidianAce' },
-    tier = 3,
-  },
-
-  templ = {
-    install_info = {
-      url = 'https://github.com/vrischmann/tree-sitter-templ',
-      files = { 'src/parser.c', 'src/scanner.c' },
-      generate_from_json = true,
-    },
-    maintainers = { '@vrischmann' },
-    tier = 3,
-  },
-
   tcl = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '8784024358c233efd0f3a6fd9e7a3c5852e628bc',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
     tier = 2,
   },
-
   tera = {
     install_info = {
       url = 'https://github.com/uncenter/tree-sitter-tera',
@@ -2595,244 +2524,263 @@ M.configs = {
     maintainers = { '@uncenter' },
     tier = 2,
   },
-
+  teal = {
+    install_info = {
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate = true,
+      revision = '19b02da829d1721a521bf7b802eb80a50bd53aab',
+      url = 'https://github.com/euclidianAce/tree-sitter-teal',
+    },
+    maintainers = { '@euclidianAce' },
+    tier = 3,
+  },
+  templ = {
+    install_info = {
+      files = { 'src/parser.c', 'src/scanner.c' },
+      generate_from_json = true,
+      revision = 'cf84ea53e2e2531f23009d676ac206090c1e2392',
+      url = 'https://github.com/vrischmann/tree-sitter-templ',
+    },
+    maintainers = { '@vrischmann' },
+    tier = 3,
+  },
   terraform = {
     install_info = {
-      url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'dialects/terraform',
+      revision = 'e936d3fef8bac884661472dce71ad82284761eb1',
+      url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
     requires = { 'hcl' },
     tier = 3,
   },
-
   textproto = {
     install_info = {
-      url = 'https://github.com/PorterAtGoogle/tree-sitter-textproto',
       files = { 'src/parser.c' },
+      revision = '8dacf02aa402892c91079f8577998ed5148c0496',
+      url = 'https://github.com/PorterAtGoogle/tree-sitter-textproto',
     },
     maintainers = { '@Porter' },
     tier = 3,
   },
-
   thrift = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-thrift',
       files = { 'src/parser.c' },
+      revision = '68fd0d80943a828d9e6f49c58a74be1e9ca142cf',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-thrift',
     },
     maintainers = { '@amaanq', '@duskmoon314' },
     tier = 2,
   },
-
   tiger = {
     install_info = {
-      url = 'https://github.com/ambroisie/tree-sitter-tiger',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'a7f11d946b44244f71df41d2a78af0665d618dae',
+      url = 'https://github.com/ambroisie/tree-sitter-tiger',
     },
     maintainers = { '@ambroisie' },
     tier = 3,
   },
-
   tlaplus = {
     install_info = {
-      url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '200f9dab6b23f3b9bb8f67fc811221517f56c373',
+      url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
     tier = 3,
   },
-
   tmux = {
     install_info = {
-      url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
       files = { 'src/parser.c' },
+      revision = '9138ea508410e0f34da2666609f600f65e944f22',
+      url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
     maintainers = { '@Freed-Wu' },
     tier = 3,
   },
-
   todotxt = {
     install_info = {
-      url = 'https://github.com/arnarg/tree-sitter-todotxt',
       files = { 'src/parser.c' },
+      revision = '3937c5cd105ec4127448651a21aef45f52d19609',
+      url = 'https://github.com/arnarg/tree-sitter-todotxt',
     },
     maintainers = { '@arnarg' },
     tier = 3,
   },
-
   toml = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-toml',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '16a30c83ce427385b8d14939c45c137fcfca6c42',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-toml',
     },
     maintainers = { '@tk-shirasaka' },
     tier = 2,
   },
-
   tsv = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
       files = { 'src/parser.c' },
       location = 'tsv',
+      revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   tsx = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-typescript',
       files = { 'src/parser.c', 'src/scanner.c' },
-      location = 'tsx',
       generate_from_json = true,
+      location = 'tsx',
+      revision = '4ad3010c91d700026d036b5230e2d99ba94ae8a4',
+      url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma', 'jsx', 'typescript' },
     tier = 2,
   },
-
   turtle = {
     install_info = {
-      url = 'https://github.com/GordianDziwis/tree-sitter-turtle',
       files = { 'src/parser.c' },
+      revision = '085437f5cb117703b7f520dd92161140a684f092',
+      url = 'https://github.com/GordianDziwis/tree-sitter-turtle',
     },
     maintainers = { '@GordianDziwis' },
     tier = 3,
   },
-
   twig = {
     install_info = {
-      url = 'https://github.com/gbprod/tree-sitter-twig',
       files = { 'src/parser.c' },
+      revision = 'eaf80e6af969e25993576477a9dbdba3e48c1305',
+      url = 'https://github.com/gbprod/tree-sitter-twig',
     },
     maintainers = { '@gbprod' },
     tier = 3,
   },
-
   typescript = {
     install_info = {
-      url = 'https://github.com/tree-sitter/tree-sitter-typescript',
       files = { 'src/parser.c', 'src/scanner.c' },
-      location = 'typescript',
       generate_from_json = true,
+      location = 'typescript',
+      revision = '4ad3010c91d700026d036b5230e2d99ba94ae8a4',
+      url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
     requires = { 'ecma' },
     tier = 2,
   },
-
   typespec = {
     install_info = {
-      url = 'https://github.com/happenslol/tree-sitter-typespec',
       files = { 'src/parser.c' },
+      revision = '28821d0d6da5f0a6b5eb02b9bad953fecafd7248',
+      url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
     maintainers = { '@happenslol' },
     tier = 3,
   },
-
   typoscript = {
     install_info = {
-      url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
       files = { 'src/parser.c' },
+      revision = '43b221c0b76e77244efdaa9963e402a17c930fbc',
+      url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
     },
     maintainers = { '@Teddytrombone' },
     tier = 3,
   },
-
   typst = {
     install_info = {
-      url = 'https://github.com/uben0/tree-sitter-typst',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '3924cb9ed9e0e62ce7df9c4fe0faa4c234795999',
+      url = 'https://github.com/uben0/tree-sitter-typst',
     },
     maintainers = { '@uben0', '@RaafatTurki' },
     tier = 3,
   },
-
   udev = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-udev',
       files = { 'src/parser.c' },
+      revision = '8f58696e79092b4ad6bf197415bbd0970acf15cd',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-udev',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   ungrammar = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ungrammar',
       files = { 'src/parser.c' },
+      revision = 'debd26fed283d80456ebafa33a06957b0c52e451',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-ungrammar',
     },
     maintainers = { '@Philipp-M', '@amaanq' },
     tier = 2,
   },
-
   unison = {
     install_info = {
-      url = 'https://github.com/kylegoetz/tree-sitter-unison',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
+      revision = '59d36a09282be7e4d3374854126590f3dcebee6e',
+      url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },
     tier = 3,
   },
-
   usd = {
     install_info = {
-      url = 'https://github.com/ColinKennedy/tree-sitter-usd',
       files = { 'src/parser.c' },
+      revision = '4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216',
+      url = 'https://github.com/ColinKennedy/tree-sitter-usd',
     },
     maintainers = { '@ColinKennedy' },
     tier = 3,
   },
-
   uxntal = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-uxntal',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'ad9b638b914095320de85d59c49ab271603af048',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-uxntal',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   v = {
     install_info = {
-      url = 'https://github.com/vlang/v-analyzer',
       files = { 'src/parser.c' },
       location = 'tree_sitter_v',
+      revision = '7e11a6f8f369df935664fadd2f0c99d90fe3226f',
+      url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
     tier = 3,
   },
-
   vala = {
     install_info = {
-      url = 'https://github.com/vala-lang/tree-sitter-vala',
       files = { 'src/parser.c' },
+      revision = '8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b',
+      url = 'https://github.com/vala-lang/tree-sitter-vala',
     },
     maintainers = { '@Prince781' },
     tier = 3,
   },
-
   vento = {
     install_info = {
-      url = 'https://github.com/ventojs/tree-sitter-vento',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '3321077d7446c1b3b017c294fd56ce028ed817fe',
+      url = 'https://github.com/ventojs/tree-sitter-vento',
     },
     maintainers = { '@wrapperup', '@oscarotero' },
     tier = 3,
   },
-
   verilog = {
     install_info = {
-      url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
       files = { 'src/parser.c' },
+      revision = '075ebfc84543675f12e79a955f79d717772dcef3',
+      url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
     tier = 3,
   },
-
   vhdl = {
     install_info = {
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
@@ -2841,34 +2789,33 @@ M.configs = {
     maintainers = { '@jpt13653903' },
     tier = 3,
   },
-
   vhs = {
     install_info = {
-      url = 'https://github.com/charmbracelet/tree-sitter-vhs',
       files = { 'src/parser.c' },
+      revision = '90028bbadb267ead5b87830380f6a825147f0c0f',
+      url = 'https://github.com/charmbracelet/tree-sitter-vhs',
     },
     maintainers = { '@caarlos0' },
     tier = 3,
   },
-
   vim = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'b448ca63f972ade12c373c808acdd2bf972937db',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
     tier = 1,
   },
-
   vimdoc = {
     install_info = {
-      url = 'https://github.com/neovim/tree-sitter-vimdoc',
       files = { 'src/parser.c' },
+      revision = 'b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4',
+      url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
     tier = 1,
   },
-
   vrl = {
     install_info = {
       url = 'https://github.com/belltoy/tree-sitter-vrl',
@@ -2877,126 +2824,124 @@ M.configs = {
     maintainers = { '@belltoy' },
     tier = 3,
   },
-
   vue = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
-      files = { 'src/parser.c', 'src/scanner.c' },
       branch = 'main',
+      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
     },
     maintainers = { '@WhyNotHugo', '@lucario387' },
     requires = { 'html_tags' },
     tier = 2,
   },
-
-  wing = {
-    install_info = {
-      url = 'https://github.com/winglang/tree-sitter-wing',
-      files = { 'src/parser.c', 'src/scanner.c' },
-    },
-    maintainers = { '@gshpychka', '@MarkMcCulloh' },
-    tier = 3,
-  },
-
   wgsl = {
     install_info = {
-      url = 'https://github.com/szebniok/tree-sitter-wgsl',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '40259f3c77ea856841a4e0c4c807705f3e4a2b65',
+      url = 'https://github.com/szebniok/tree-sitter-wgsl',
     },
     maintainers = { '@szebniok' },
     tier = 3,
   },
-
   wgsl_bevy = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
       files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '1e12c7925c41bb09818d86e30cd78644fde7d31a',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
     },
     maintainers = { '@theHamsta' },
     tier = 2,
   },
-
+  wing = {
+    install_info = {
+      files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7',
+      url = 'https://github.com/winglang/tree-sitter-wing',
+    },
+    maintainers = { '@gshpychka', '@MarkMcCulloh' },
+    tier = 3,
+  },
   wit = {
     install_info = {
-      url = 'https://github.com/liamwh/tree-sitter-wit',
       files = { 'src/parser.c' },
+      revision = 'cab94791450524a542324d8cbe8017d69c516d8e',
+      url = 'https://github.com/liamwh/tree-sitter-wit',
     },
     maintainers = { '@liamwh' },
     tier = 3,
   },
-
   xcompose = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xcompose',
       files = { 'src/parser.c' },
+      revision = '2383cc69a2c42cfade41c7cb971fb3862bec6df1',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xcompose',
     },
     maintainers = { '@ObserverOfTime' },
     tier = 2,
   },
-
   xml = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
       files = { 'src/parser.c', 'src/scanner.c' },
       location = 'xml',
+      revision = '648183d86f6f8ffb240ea11b4c6873f6f45d8b67',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
     requires = { 'dtd' },
     tier = 2,
   },
-
   xresources = {
     install_info = {
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
       files = { 'src/parser.c' },
     },
-    filetype = 'xdefaults',
     maintainers = { '@ValdezFOmar' },
     tier = 3,
   },
-
   yaml = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '7b03feefd36b5f155465ca736c6304aca983b267',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
     },
     maintainers = { '@amaanq' },
     tier = 2,
   },
-
   yang = {
     install_info = {
-      url = 'https://github.com/Hubro/tree-sitter-yang',
       files = { 'src/parser.c' },
+      revision = '2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502',
+      url = 'https://github.com/Hubro/tree-sitter-yang',
     },
     maintainers = { '@Hubro' },
     tier = 3,
   },
-
   yuck = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-yuck',
       files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'e877f6ade4b77d5ef8787075141053631ba12318',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-yuck',
     },
     maintainers = { '@Philipp-M', '@amaanq' },
     tier = 2,
   },
-
   zathurarc = {
     install_info = {
-      url = 'https://github.com/Freed-Wu/tree-sitter-zathurarc',
       files = { 'src/parser.c' },
+      revision = '6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068',
+      url = 'https://github.com/Freed-Wu/tree-sitter-zathurarc',
     },
     maintainers = { '@Freed-Wu' },
     tier = 3,
   },
-
   zig = {
     install_info = {
-      url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
       files = { 'src/parser.c' },
+      revision = '0d08703e4c3f426ec61695d7617415fff97029bd',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
     },
     maintainers = { '@amaanq' },
     tier = 1,
@@ -3022,33 +2967,3 @@ M.configs = {
     tier = 3,
   },
 }
-
--- Get a list of all available parsers
----@param tier integer? only get parsers of specified tier
----@return string[]
-function M.get_available(tier)
-  --- @type string[]
-  local parsers = vim.tbl_keys(M.configs)
-  table.sort(parsers)
-  if tier then
-    parsers = vim.tbl_filter(
-      --- @param p string
-      function(p)
-        return M.configs[p].tier == tier
-      end,
-      parsers
-    )
-  end
-  if vim.fn.executable('tree-sitter') == 0 then
-    parsers = vim.tbl_filter(
-      --- @param p string
-      function(p)
-        return M.configs[p].install_info ~= nil and not M.configs[p].install_info.generate
-      end,
-      parsers
-    )
-  end
-  return parsers
-end
-
-return M
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index 32f3db311..b007ca29b 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -11,7 +11,7 @@ local function complete_available_parsers(arglead)
     function(v)
       return v:find(arglead) ~= nil
     end,
-    require('nvim-treesitter.parsers').get_available()
+    require('nvim-treesitter.config').get_available()
   )
 end
 
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index bfde0f8a3..dddaf80d7 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -2,7 +2,7 @@
 vim.opt.runtimepath:append('.')
 
 local query_types = require('nvim-treesitter.health').bundled_queries
-local configs = require('nvim-treesitter.parsers').configs
+local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
   or require('nvim-treesitter.config').installed_parsers()
 
diff --git a/scripts/convert-lockfile.lua b/scripts/convert-lockfile.lua
new file mode 100755
index 000000000..e0a694897
--- /dev/null
+++ b/scripts/convert-lockfile.lua
@@ -0,0 +1,21 @@
+#!/usr/bin/env -S nvim -l
+vim.opt.runtimepath:append('.')
+local util = require('nvim-treesitter.util')
+local parsers = require('nvim-treesitter.parsers')
+
+local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
+local lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,{revision:string}>]]
+
+for k, p in pairs(parsers) do
+  if p.install_info then
+    p.install_info.revision = lockfile[k].revision
+  end
+end
+
+-- write new parser file
+local header = '---@type nvim-ts.parsers\nreturn '
+local parser_file = header .. vim.inspect(parsers)
+if vim.fn.executable('stylua') == 1 then
+  parser_file = vim.system({ 'stylua', '-' }, { stdin = parser_file }):wait().stdout --[[@as string]]
+end
+util.write_file('lua/nvim-treesitter/parsers.lua', parser_file)
diff --git a/scripts/update-lockfile.lua b/scripts/update-lockfile.lua
deleted file mode 100755
index d77baed61..000000000
--- a/scripts/update-lockfile.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
-local util = require('nvim-treesitter.util')
-local parsers = require('nvim-treesitter.parsers').configs
-
--- Load previous lockfile
-local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
-local old_lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,{revision:string}>]]
-
-local jobs = {} ---@type table<string,vim.SystemObj>
-local new_lockfile = {} ---@type table<string,{revision:string}>
-local updates = {} ---@type string[]
-
--- check for new revisions
-for k, p in pairs(parsers) do
-  if p.tier == 4 then
-    new_lockfile[k] = old_lockfile[k]
-    print('Skipping ' .. k)
-  elseif p.install_info then
-    print('Updating ' .. k)
-    jobs[k] = vim.system({ 'git', 'ls-remote', p.install_info.url })
-  end
-
-  if #vim.tbl_keys(jobs) % 100 == 0 or next(parsers, k) == nil then
-    for name, job in pairs(jobs) do
-      local stdout = vim.split(job:wait().stdout, '\n')
-      jobs[name] = nil
-
-      local branch = parsers[name].install_info.branch
-
-      local line = 1
-      if branch then
-        for j, l in ipairs(stdout) do
-          if l:find(vim.pesc(branch)) then
-            line = j
-            break
-          end
-        end
-      end
-
-      local sha = vim.split(stdout[line], '\t')[1]
-      new_lockfile[name] = { revision = sha }
-      if new_lockfile[name].revision ~= old_lockfile[name].revision then
-        updates[#updates + 1] = name
-      end
-    end
-  end
-end
-
-assert(#vim.tbl_keys(jobs) == 0)
-
-if #updates > 0 then
-  -- write new lockfile
-  local lockfile_json = vim.json.encode(new_lockfile) --[[@as string]]
-  if vim.fn.executable('jq') == 1 then
-    lockfile_json =
-      assert(vim.system({ 'jq', '--sort-keys' }, { stdin = lockfile_json }):wait().stdout)
-  end
-  util.write_file(filename, lockfile_json)
-
-  print(string.format('\nUpdated parsers: %s', table.concat(updates, ', ')))
-else
-  print('\nAll parsers up to date!')
-end
diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
new file mode 100755
index 000000000..ec1308d77
--- /dev/null
+++ b/scripts/update-parsers.lua
@@ -0,0 +1,65 @@
+#!/usr/bin/env -S nvim -l
+vim.opt.runtimepath:append('.')
+local util = require('nvim-treesitter.util')
+local parsers = require('nvim-treesitter.parsers')
+
+local jobs = {} ---@type table<string,vim.SystemObj>
+local updates = {} ---@type string[]
+
+-- check for new revisions
+for k, p in pairs(parsers) do
+  if p.tier < 5 and p.install_info then
+    print('Updating ' .. k)
+    jobs[k] = vim.system({ 'git', 'ls-remote', p.install_info.url })
+  end
+
+  if #vim.tbl_keys(jobs) % 100 == 0 or next(parsers, k) == nil then
+    for name, job in pairs(jobs) do
+      local stdout = vim.split(job:wait().stdout, '\n')
+      jobs[name] = nil
+
+      local info = parsers[name].install_info
+      assert(info)
+
+      local branch = info.branch
+      local line = 1
+      if branch then
+        for j, l in ipairs(stdout) do
+          if l:find(vim.pesc(branch)) then
+            line = j
+            break
+          end
+        end
+      end
+
+      local sha = vim.split(stdout[line], '\t')[1]
+      if info.revision ~= sha then
+        info.revision = sha
+        updates[#updates + 1] = name
+      end
+    end
+  end
+end
+
+assert(#vim.tbl_keys(jobs) == 0)
+
+if #updates > 0 then
+  -- write new parser file
+  local header = '---@type nvim-ts.parsers\nreturn '
+  local parser_file = header .. vim.inspect(parsers)
+  if vim.fn.executable('stylua') == 1 then
+    parser_file = vim.system({ 'stylua', '-' }, { stdin = parser_file }):wait().stdout --[[@as string]]
+  end
+  util.write_file('lua/nvim-treesitter/parsers.lua', parser_file)
+
+  local update_list = table.concat(updates, ', ')
+  print(string.format('\nUpdated parsers: %s', update_list))
+  -- pass list to workflow
+  if os.getenv('GITHUB_ENV') then
+    local env = io.open(os.getenv('GITHUB_ENV'), 'a')
+    env:write(string.format('UPDATED_PARSERS=%s\n', update_list))
+    env:close()
+  end
+else
+  print('\nAll parsers up to date!')
+end
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index f8346bf4d..9f6f9a3de 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -2,12 +2,13 @@
 vim.opt.runtimepath:append('.')
 local util = require('nvim-treesitter.util')
 local parsers = require('nvim-treesitter.parsers')
+local tiers = require('nvim-treesitter.config').tiers
 ---@class Parser
 ---@field name string
 ---@field parser ParserInfo
 
 local sorted_parsers = {}
-for k, v in pairs(parsers.configs) do
+for k, v in pairs(parsers) do
   table.insert(sorted_parsers, { name = k, parser = v })
 end
 table.sort(sorted_parsers, function(a, b)
@@ -45,7 +46,7 @@ for _, v in ipairs(sorted_parsers) do
   end
 
   -- tier
-  generated_text = generated_text .. (p.tier and parsers.tiers[p.tier] or '') .. ' | '
+  generated_text = generated_text .. (p.tier and tiers[p.tier] or '') .. ' | '
 
   -- queries
   generated_text = generated_text
diff --git a/tests/query/injections/nix/test-nix-injections.nix b/tests/query/injections/nix/test-nix-injections.nix
index 86e9f975d..477ca4abb 100644
--- a/tests/query/injections/nix/test-nix-injections.nix
+++ b/tests/query/injections/nix/test-nix-injections.nix
@@ -64,7 +64,7 @@
   mod1 = {
     type = "lua";
     config = ''
-      require('nvim-treesitter.configs').setup()
+      require('nvim-treesitter.config').setup()
     '';
   };
 }

From 214cfcf851d95a4c4f2dc7526b95ce9d31c88a76 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 22 Apr 2024 19:56:30 +0200
Subject: [PATCH 2315/2704] feat!: use tree-sitter build

---
 .github/workflows/test-queries.yml    |  27 +-
 .github/workflows/tests.yml           |  14 +-
 README.md                             |  40 +-
 SUPPORTED_LANGUAGES.md                | 569 +++++++++++++-------------
 TODO.md                               |   5 -
 lua/nvim-treesitter/_meta/parsers.lua |   3 -
 lua/nvim-treesitter/config.lua        |   9 -
 lua/nvim-treesitter/health.lua        | 131 +++---
 lua/nvim-treesitter/install.lua       | 185 +++------
 lua/nvim-treesitter/parsers.lua       | 346 ++--------------
 plugin/filetypes.lua                  |   2 +-
 scripts/convert-lockfile.lua          |   1 +
 scripts/update-readme.lua             |   9 +-
 13 files changed, 443 insertions(+), 898 deletions(-)

diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 3b1717791..819924c43 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -23,34 +23,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
-        cc: [gcc, clang]
         nvim_tag: [nightly]
-        exclude:
-          - os: ubuntu-latest
-            cc: clang
-            nvim_tag: nightly
-
-          - os: macos-14
-            cc: gcc
-            nvim_tag: nightly
-
-          - os: windows-latest
-            cc: gcc
-            nvim_tag: nightly
-
-        # include:
-          # - os: windows-latest
-          #   cc: cl
-          #   nvim_tag: nightly
-
-          # - os: ubuntu-latest
-          #   cc: gcc
-          #   nvim_tag: nightly
 
     name: Parser compilation
     runs-on: ${{ matrix.os }}
     env:
-      CC: ${{ matrix.cc }}
       NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
     steps:
       - uses: actions/checkout@v4
@@ -71,10 +48,8 @@ jobs:
             ~/.local/share/nvim/site/parser/
             ~/AppData/Local/nvim-data/site/parser/
           key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
-            './lockfile.json',
             './lua/nvim-treesitter/install.lua',
-            './lua/nvim-treesitter/parsers.lua',
-            './lua/nvim-treesitter/shell_command_selectors.lua') }}
+            './lua/nvim-treesitter/parsers.lua') }}
 
       - name: Compile parsers
         run: $NVIM -l ./scripts/install-parsers.lua
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f78afe711..7a946377c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,12 +20,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        cc: [gcc]
 
     name: Run tests
     runs-on: ${{ matrix.os }}
-    env:
-      CC: ${{ matrix.cc }}
     steps:
       - uses: actions/checkout@v4
       - uses: tree-sitter/setup-action/cli@v1
@@ -50,16 +47,13 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ./parser/
-            ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/
+            ~/.local/share/nvim/site/parser/
+            ~/AppData/Local/nvim-data/site/parser/
           key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
-            './lockfile.json',
             './lua/nvim-treesitter/install.lua',
-            './lua/nvim-treesitter/parsers.lua',
-            './lua/nvim-treesitter/shell_selectors.lua') }}
+            './lua/nvim-treesitter/parsers.lua') }}
 
-      - name: Compile parsers Unix like
-        if: ${{ runner.os != 'Windows' && steps.parsers-cache.outputs.cache-hit != 'true' }}
+      - name: Compile parsers
         run: nvim -l ./scripts/install-parsers.lua
 
       - name: Tests
diff --git a/README.md b/README.md
index 07a6c930e..5e487233f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
 
 # WARNING
 
-**This branch is a [full, incompatible, rewrite of `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767) and [work in progress](TODO.md). This branch REQUIRES (the latest commit on) Neovim `master`.**
+**This branch is a [full, incompatible, rewrite of `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767) and [work in progress](TODO.md).** The **stable** branch is [`master`](https://github.com/nvim-treesitter/nvim-treesitter/tree/master).
 
 The `nvim-treesitter` plugin provides
 1. functions for installing, updating, and removing [**tree-sitter parsers**](SUPPORTED_LANGUAGES.md);
@@ -29,14 +29,14 @@ The `nvim-treesitter` plugin provides
 
 - Neovim 0.10.0 or later (nightly)
 - `tar` and `curl` in your path (or alternatively `git`)
-- a C compiler in your path and libstdc++ installed ([Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support))
-- optional: `tree-sitter` CLI and `node`
+- [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) CLI (0.22.6 or later)
+- a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
 
 ## Installation
 
 You can install `nvim-treesitter` with your favorite package manager (or using the native `package` feature of vim, see `:h packages`).
 
-**NOTE: This plugin is only guaranteed to work with specific versions of language parsers** (as specified in the `lockfile.json`). **When upgrading the plugin, you must make sure that all installed parsers are updated to the latest version** via `:TSUpdate`.
+**NOTE: This plugin is only guaranteed to work with specific versions of language parsers** (as specified in the `parser.lua` table). **When upgrading the plugin, you must make sure that all installed parsers are updated to the latest version** via `:TSUpdate`.
 It is strongly recommended to automate this; e.g., using [lazy.nvim](https://github.com/folke/lazy.nvim)
 
 ```lua
@@ -195,14 +195,6 @@ vim.fn.stdpath('data') .. 'site/queries/zimbu'
 Before doing anything, make sure you have the latest version of this plugin and run `:checkhealth nvim-treesitter`.
 It can also help to update the parsers via `:TSUpdate`.
 
-#### Feature `{X}` does not work for `{language}`...
-
-1. Check the `nvim-treesitter` section of `:checkhealth` for any warning, and make sure that the query for `{X}` is listed for `{language}`.
-
-2. Ensure that the feature is enabled as explained above.
-
-3. Ensure Neovim is correctly identifying your language's filetype using the `:echo &filetype` command while one of your language's files is open in Neovim.
-
 #### I get `Error detected while processing .../plugin/nvim-treesitter.vim` every time I open Neovim
 
 This is probably due to a change in a parser's grammar or its queries.
@@ -221,30 +213,6 @@ or due to an outdated parser.
   If you get more than one path, remove the ones that are outside this plugin (`nvim-treesitter` directory),
   so the correct version of the parser is used.
 
-#### I want to use Git instead of curl for downloading the parsers
-
-In your Lua config:
-
-```lua
-require("nvim-treesitter.install").prefer_git = true
-```
-
-#### I want to use a HTTP proxy for downloading the parsers
-
-You can either configure curl to use additional CLI arguments in your Lua config:
-
-```lua
-require("nvim-treesitter.install").command_extra_args = {
-    curl = { "--proxy", "<proxy url>" },
-}
-```
-
-or you can configure git via `.gitconfig` and use git instead of curl
-
-```lua
-require("nvim-treesitter.install").prefer_git = true
-```
-
 #### I want to use a mirror instead of "https://github.com/"
 
 In your Lua config:
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index d2ba24468..1c72c9ba9 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -4,293 +4,296 @@ The following is a list of languages for which a parser can be installed through
 
 Legend:
 - **Tier:** _stable_, _core_, _community_, or _unsupported_
-- **CLI:** `:TSInstall` requires `tree-sitter` CLI installed
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
+- **Maintainer** of queries in nvim-treesitter (may be different from parser maintainer!)
 
 <!--This section of the README is automatically updated by a CI job-->
 <!--parserinfo-->
-Language | Tier | Queries | CLI | Maintainer
--------- |:----:|:-------:|:---:| ----------
-[ada](https://github.com/briot/tree-sitter-ada) | community | `HF  L` |  | @briot
-[agda](https://github.com/tree-sitter/tree-sitter-agda) | core | `HF   ` |  | @Decodetalkers
-[angular](https://github.com/dlvandenberg/tree-sitter-angular) | community | `HFIJL` |  | @dlvandenberg
-[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF  L` |  | @aheber
-[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | core | `HFIJL` |  | @ObserverOfTime
-[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` |  | @RubixDev
-[astro](https://github.com/virchau13/tree-sitter-astro) | community | `HFIJL` |  | @virchau13
-[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J ` |  | @mattpolzin
-[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unsupported | `H  J ` |  | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) | stable | `HF JL` |  | @TravonteD
-[bass](https://github.com/vito/tree-sitter-bass) | community | `HFIJL` |  | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) | community | `HF J ` |  | @polarmutex
-[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFI  ` |  | @theHamsta, @clason
-[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | core | `HFIJL` |  | @amaanq
-[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | core | `HFIJL` |  | @amaanq
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unsupported | `H    ` |  | @gabmus
-[c](https://github.com/tree-sitter/tree-sitter-c) | stable | `HFIJL` |  | @amaanq
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | core | `HF JL` |  | @amaanq
-[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | core | `HFIJL` |  | @amaanq
-[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | core | `HFIJL` |  | @amaanq
-[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | core | `HFIJL` |  | @ObserverOfTime
-[clojure](https://github.com/sogaiu/tree-sitter-clojure) | community | `HF JL` |  | @NoahTheDuke
-[cmake](https://github.com/uyha/tree-sitter-cmake) | community | `HFI  ` |  | @uyha
-[comment](https://github.com/stsewd/tree-sitter-comment) | community | `H    ` |  | @stsewd
-[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | core | `HF  L` |  | @theHamsta
-[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H    ` |  | @addcninblue
-[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFI L` |  | @jakestanger
-[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | core | `HFIJL` |  | @amaanq
-[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | core | `HFIJL` |  | @theHamsta
-[css](https://github.com/tree-sitter/tree-sitter-css) | core | `HFIJ ` |  | @TravonteD
-[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` |  | @amaanq
-[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | core | `HFIJL` |  | @theHamsta
-[cue](https://github.com/eonpatapon/tree-sitter-cue) | community | `HFIJL` |  | @amaanq
-[d](https://github.com/gdamore/tree-sitter-d) | community | `HFIJL` |  | @amaanq
-[dart](https://github.com/UserNobody14/tree-sitter-dart) | community | `HFIJL` |  | @akinsho
-[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` |  | @jedrzejboczar
-[dhall](https://github.com/jbellerb/tree-sitter-dhall) | community | `HF J ` |  | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H    ` |  | @gbprod
-[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` |  | @ColinKennedy
-[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` |  | @NoahTheDuke
-[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` |  | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) | community | `H IJ ` |  | @rydesun
-[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | core | `H IJ ` |  | @amaanq
-[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HF JL` |  | @ObserverOfTime
-[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` |  | @glehmann
-[ebnf](https://github.com/RubixDev/ebnf) | community | `H    ` |  | @RubixDev
-ecma (queries only)[^ecma] | community | `HFIJL` |  | @steelsojka
-[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` |  | @uyha
-[eex](https://github.com/connorlay/tree-sitter-eex) | community | `H  J ` |  | @connorlay
-[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | community | `HFIJL` |  | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) | community | `H  J ` |  | @zweimach
-[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | community | `HFIJL` |  | @glapa-grossklag, @amaanq
-[elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` |  | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` |  | 
-[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | community | `HF   ` |  | @filmor
-[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` |  | @bryankenote
-[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` |  | @khiner
-[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | community | `HF JL` |  | @alexmozaidze
-[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J ` |  | @chaopeng
-[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | core | `HFIJL` |  | @amaanq
-[fish](https://github.com/ram02z/tree-sitter-fish) | community | `HFIJL` |  | @ram02z
-[foam](https://github.com/FoamScience/tree-sitter-foam) | community | `HFIJL` |  | @FoamScience
-[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | community | `HFIJL` |  | @amaanq
-[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | community | `HFI  ` |  | @amaanq
-[fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H    ` |  | @mgramigna
-[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | core | `H    ` |  | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | community | `HFI L` |  | @jirgn
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` |  | @PrestonKnopp
-[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` |  | @godofavacyn
-[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | community | `HF J ` |  | @amaanq
-[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | community | `H  J ` |  | @gbprod
-[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | core | `H  JL` |  | @ObserverOfTime
-[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | community | `H  J ` |  | @gbprod
-[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | community | `H    ` |  | @theHamsta
-[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | community | `HFIJL` |  | @amaanq
-[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] | community | `HFI L` |  | @NullVoxPopuli
-[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | core | `HFIJL` |  | @theHamsta
-[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | core | `HFIJL` |  | @amaanq
-[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` |  | @dpezto
-[go](https://github.com/tree-sitter/tree-sitter-go) | core | `HFIJL` |  | @theHamsta, @WinWisely268
-[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | community | `HF JL` |  | @pierpo
-[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | community | `H  J ` |  | @camdencheek
-[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | core | `H    ` |  | @amaanq
-[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  | @qvalentin
-[gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` |  | @omertuc
-[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | core | `H  J ` |  | @ObserverOfTime
-[graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` |  | @bkegley
-[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` |  | @murtaza64
-[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | core | `H    ` |  | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H    ` |  | 
-[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | core | `HFIJL` |  | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | core | `HF JL` |  | @mrcjkb
-[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` |  | @lykahb
-[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | core | `HFIJ ` |  | @MichaHoffmann
-[heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` |  | @connorlay
-[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` |  | @qvalentin
-[hjson](https://github.com/winston0410/tree-sitter-hjson) | community | `HFIJL` |  | @winston0410
-[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | core | `HFIJL` |  | @theHamsta
-[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` |  | @Freed-Wu
-[hocon](https://github.com/antosha417/tree-sitter-hocon) | unsupported | `HF J ` |  | @antosha417
-[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | community | `HF  L` |  | @urbit-pilled
-[html](https://github.com/tree-sitter/tree-sitter-html) | core | `HFIJL` |  | @TravonteD
-html_tags (queries only)[^html_tags] | community | `H IJ ` |  | @TravonteD
-[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | community | `HFIJ ` |  | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) | community | `H  J ` |  | @amaanq, @NTBBloodbath
-[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` |  | @pfeiferj
-[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | core | `HFIJ ` |  | @luckasRanarison
-[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J ` |  | @cathaysa
-[ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF   ` |  | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` |  | @yorickpeterse
-[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | core | `HFIJL` |  | @fab4100
-[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` |  | @sogaiu
-[java](https://github.com/tree-sitter/tree-sitter-java) | core | `HFIJL` |  | @p00f
-[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | core | `HFIJL` |  | @steelsojka
-[jq](https://github.com/flurie/tree-sitter-jq) | community | `H  JL` |  | @ObserverOfTime
-[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` |  | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` |  | @steelsojka
-[json5](https://github.com/Joakker/tree-sitter-json5) | community | `H  J ` |  | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | community | `HFIJL` |  | @WhyNotHugo
-[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF  L` |  | @nawordar
-jsx (queries only)[^jsx] | community | `HFIJ ` |  | @steelsojka
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | core | `HFIJL` |  | @theHamsta
-[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` |  | @Hubro
-[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | core | `HFIJL` |  | @amaanq
-[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | core | `HFIJL` |  | @amaanq
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | community | `HF JL` |  | @SalBakraa
-[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` |  | @irh
-[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` |  | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `HF JL` |  | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J ` | ✓ | @theHamsta, @clason
-[ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` |  | @cbarrete
-[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` |  | @r001
-[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | core | `HFIJL` |  | @amaanq
-[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J ` |  | @hankthetank27
-[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFI L` |  | @toots
-[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | community | `H    ` |  | @benwilliamgraham
-[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | stable | `HFIJL` |  | @muniftanjim
-[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | core | `H    ` |  | @amaanq
-[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | core | `H    ` |  | @amaanq
-[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | core | `HFIJL` |  | @amaanq
-[m68k](https://github.com/grahambates/tree-sitter-m68k) | community | `HF JL` |  | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) | community | `HF J ` |  | @lewis6991
-[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | stable | `HFIJ ` |  | @MDeiml
-[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | stable | `H  J ` |  | @MDeiml
-[matlab](https://github.com/acristoffers/tree-sitter-matlab) | community | `HFIJL` |  | @acristoffers
-[menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` |  | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `H    ` |  | 
-[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | core | `HFIJ ` |  | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | community | `H   L` | ✓ | @artagnon
-[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` |  | @Freed-Wu
-[nasm](https://github.com/naclsn/tree-sitter-nasm) | community | `H  J ` |  | @ObserverOfTime
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H I  ` |  | 
-[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` |  | @aMOPel
-[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` |  | @aMOPel
-[ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFI  ` |  | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HF JL` |  | @leo60228
-[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | core | `HFIJL` |  | @amaanq
-[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | core | `HFIJL` |  | @amaanq
-[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` |  | @ColinKennedy
-[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` |  | @undu
-[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` |  | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` | ✓ | @undu
-[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | core | `HFIJL` |  | @amaanq
-[org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` |  | 
-[pascal](https://github.com/Isopod/tree-sitter-pascal) | community | `HFIJL` |  | @Isopod
-[passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` |  | @amaanq
-[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | core | `HF J ` |  | @ObserverOfTime
-[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` |  | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | core | `HFIJL` |  | @tk-shirasaka
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | core | `HFIJL` |  | @tk-shirasaka
-[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | community | `H    ` |  | @mikehaertl
-[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | community | `H  J ` |  | @leo60228
-[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | core | `HF J ` |  | @amaanq
-[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` |  | @RabbiVeesh, @LeoNerd
-[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | core | `HFIJ ` |  | @ObserverOfTime
-[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | core | `HFIJL` |  | @amaanq, @mfelsche
-[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | core | `H    ` |  | @ObserverOfTime
-[prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `HF   ` |  | @elianiva
-[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | community | `H  J ` |  | @MichaHoffmann
-[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | core | `H  JL` |  | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) | community | `HF   ` |  | @treywood
-[prql](https://github.com/PRQL/tree-sitter-prql) | community | `H  J ` |  | @matthias-Q
-[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` |  | @amaanq
-[pug](https://github.com/zealot128/tree-sitter-pug) | community | `H  J ` |  | @zealot128
-[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | core | `HFIJL` |  | @amaanq
-[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  JL` |  | @postsolar
-[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | core | `H  J ` |  | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` |  | @stsewd, @theHamsta
-[ql](https://github.com/tree-sitter/tree-sitter-ql) | core | `HFIJL` |  | @pwntester
-[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | core | `H  J ` |  | @amaanq
-[qmljs](https://github.com/yuja/tree-sitter-qmljs) | community | `HF J ` |  | @Decodetalkers
-[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | stable | `HFIJL` |  | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` |  | @echasnovski
-[racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` |  | 
-[rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` |  | @Fymyte
-[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` |  | @joker1007
-[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | core | `HFIJL` |  | @amaanq
-[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | core | `HFIJ ` |  | @ribru17
-[regex](https://github.com/tree-sitter/tree-sitter-regex) | core | `H    ` |  | @theHamsta
-[rego](https://github.com/FallenAngel97/tree-sitter-rego) | community | `H  J ` |  | @FallenAngel97
-[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | core | `H  J ` |  | @ObserverOfTime
-[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | community | `HF J ` |  | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFI  ` |  | @Hubro
-[roc](https://github.com/nat-418/tree-sitter-roc) | community | `H  JL` |  | @nat-418
-[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | core | `HFIJL` |  | @amaanq
-[rst](https://github.com/stsewd/tree-sitter-rst) | community | `H  JL` |  | @stsewd
-[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | core | `HFIJL` |  | @TravonteD
-[rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` |  | @amaanq
-[scala](https://github.com/tree-sitter/tree-sitter-scala) | core | `HF JL` |  | @stevanmilic
-[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | community | `H  J ` | ✓ | @WhyNotHugo
-[scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` |  | 
-[scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFI  ` |  | @elianiva
-[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | core | `HFIJL` |  | @theHamsta
-[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` |  | @hunger
-[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` |  | @amaanq
-[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | community | `H    ` |  | @amaanq, @keynmol
-[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | community | `HFIJL` |  | @osthomas
-[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | community | `HF   ` |  | @amaanq
-[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  | @aheber
-[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` |  | @aheber
-[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` |  | @Sarrus1
-[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) | community | `HFIJL` |  | @BonaBeavis
-[sql](https://github.com/derekstride/tree-sitter-sql) | community | `H IJ ` |  | @derekstride
-[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | core | `HFIJL` |  | @amaanq
-[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | core | `HFIJL` |  | @ObserverOfTime
-[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | core | `HFIJL` |  | @amaanq
-[strace](https://github.com/sigmaSd/tree-sitter-strace) | community | `H  J ` |  | @amaanq
-[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` |  | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` |  | @madskjeldgaard
-[surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` |  | @connorlay
-[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` |  | @amaanq
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H I L` | ✓ | @alex-pinkus
-[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` |  | @RaafatTurki
-[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` |  | @ok-ryoko
-[t32](https://gitlab.com/xasc/tree-sitter-t32) | community | `HFIJL` |  | @xasc
-[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | core | `HFIJL` |  | @amaanq
-[tact](https://github.com/tact-lang/tree-sitter-tact) | community | `HFIJL` |  | @novusnota
-[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFI  ` |  | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | ✓ | @euclidianAce
-[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` |  | @vrischmann
-[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` |  | @MichaHoffmann
-[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFI  ` |  | @Porter
-[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | core | `HFIJL` |  | @amaanq, @duskmoon314
-[tiger](https://github.com/ambroisie/tree-sitter-tiger) | community | `HFIJL` |  | @ambroisie
-[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | community | `HF JL` |  | @ahelwer, @susliko
-[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` |  | @Freed-Wu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | community | `H    ` |  | @arnarg
-[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | core | `HFIJL` |  | @tk-shirasaka
-[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` |  | @amaanq
-[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | @steelsojka
-[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) | community | `HFIJL` |  | @BonaBeavis
-[twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` |  | @gbprod
-[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` |  | @steelsojka
-[typespec](https://github.com/happenslol/tree-sitter-typespec) | community | `H IJ ` |  | @happenslol
-[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` |  | @Teddytrombone
-[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` |  | @uben0, @RaafatTurki
-[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | core | `H  JL` |  | @ObserverOfTime
-[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | core | `HFIJL` |  | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | community | `H  J ` | ✓ | @tapegram
-[usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFI L` |  | @ColinKennedy
-[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | core | `HFIJL` |  | @amaanq
-[v](https://github.com/vlang/v-analyzer) | community | `HFIJL` |  | @kkharji, @amaanq
-[vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF   ` |  | @Prince781
-[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` |  | @wrapperup, @oscarotero
-[verilog](https://github.com/tree-sitter/tree-sitter-verilog) | core | `HF JL` |  | @zegervdv
-[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H    ` |  | @caarlos0
-[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | stable | `HF JL` |  | @clason
-[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | stable | `H  J ` |  | @clason
-[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | core | `HFIJ ` |  | @WhyNotHugo, @lucario387
-[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | community | `HFI  ` |  | @szebniok
-[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | core | `HFI  ` |  | @theHamsta
-[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF  L` |  | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J ` |  | @liamwh
-[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | core | `H  JL` |  | @ObserverOfTime
-[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` |  | @ObserverOfTime
-[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` |  | @amaanq
-[yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` |  | @Hubro
-[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | core | `HFIJL` |  | @Philipp-M, @amaanq
-[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` |  | @Freed-Wu
-[zig](https://github.com/maxxnino/tree-sitter-zig) | community | `HFIJL` |  | @maxxnino
+Language | Tier | Queries | Maintainer
+-------- |:----:|:-------:| ----------
+[ada](https://github.com/briot/tree-sitter-ada) | community | `HF JL` | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) | core | `HF J ` | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | community | `HFIJL` | @dlvandenberg
+[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF JL` | @aheber
+[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | core | `HFIJL` | @ObserverOfTime
+[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` | @RubixDev
+[astro](https://github.com/virchau13/tree-sitter-astro) | community | `HFIJL` | @virchau13
+[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J ` | @mattpolzin
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unsupported | `H  J ` | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) | stable | `HF JL` | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) | community | `HFIJL` | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | community | `HF J ` | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFIJ ` | @theHamsta, @clason
+[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | core | `HFIJL` | @amaanq
+[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | core | `HFIJL` | @amaanq
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unsupported | `H  J ` | @gabmus
+[bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | community | `HFIJL` | @ambroisie
+[c](https://github.com/tree-sitter/tree-sitter-c) | stable | `HFIJL` | @amaanq
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | core | `HF JL` | @amaanq
+[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | core | `HFIJL` | @amaanq
+[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | core | `HFIJL` | @amaanq
+[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | core | `HFIJL` | @ObserverOfTime
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) | community | `HF JL` | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) | community | `HFIJ ` | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | community | `H    ` | @stsewd
+[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | core | `HF JL` | @theHamsta
+[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H  J ` | @addcninblue
+[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFIJL` | @jakestanger
+[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | core | `HFIJL` | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | core | `HFIJL` | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) | core | `HFIJ ` | @TravonteD
+[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
+[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | core | `HFIJL` | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) | community | `HFIJL` | @amaanq
+[d](https://github.com/gdamore/tree-sitter-d) | community | `HFIJL` | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) | community | `HFIJL` | @akinsho
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) | community | `HF J ` | @amaanq
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H    ` | @gbprod
+[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` | @ColinKennedy
+[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` | @NoahTheDuke
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) | community | `H IJ ` | @rydesun
+[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | core | `H IJ ` | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HF JL` | @ObserverOfTime
+[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` | @glehmann
+[ebnf](https://github.com/RubixDev/ebnf) | community | `H  J ` | @RubixDev
+ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
+[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` | @uyha
+[eex](https://github.com/connorlay/tree-sitter-eex) | community | `H  J ` | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | community | `HFIJL` | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) | community | `H  J ` | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | community | `HFIJL` | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` | 
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | community | `HF J ` | @filmor
+[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` | @bryankenote
+[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` | @khiner
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | community | `HF JL` | @alexmozaidze
+[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J ` | @chaopeng
+[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | core | `HFIJL` | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) | community | `HFIJL` | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | community | `HFIJL` | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | community | `HFIJL` | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | community | `HFIJ ` | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H  J ` | @mgramigna
+[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | core | `H  J ` | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | community | `HFIJL` | @jirgn
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` | @PrestonKnopp
+[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` | @godofavacyn
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | community | `HF J ` | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | community | `H  J ` | @gbprod
+[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | core | `H  JL` | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | community | `H  J ` | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | community | `H  J ` | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | community | `HFIJL` | @amaanq
+[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] | community | `HFIJL` | @NullVoxPopuli
+[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | core | `HFIJL` | @theHamsta
+[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | core | `HFIJL` | @amaanq
+[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` | @dpezto
+[go](https://github.com/tree-sitter/tree-sitter-go) | core | `HFIJL` | @theHamsta, @WinWisely268
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | community | `HF JL` | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | community | `H  J ` | @camdencheek
+[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | core | `H    ` | @amaanq
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` | @qvalentin
+[gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` | @omertuc
+[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | core | `H  J ` | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` | @bkegley
+[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` | @murtaza64
+[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | core | `H    ` | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H  J ` | 
+[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | core | `HFIJL` | @amaanq
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | core | `HF JL` | @mrcjkb
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` | @lykahb
+[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | core | `HFIJ ` | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` | @connorlay
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` | @qvalentin
+[hjson](https://github.com/winston0410/tree-sitter-hjson) | community | `HFIJL` | @winston0410
+[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | core | `HFIJL` | @theHamsta
+[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` | @Freed-Wu
+[hocon](https://github.com/antosha417/tree-sitter-hocon) | unsupported | `HF J ` | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | community | `HF JL` | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) | core | `HFIJL` | @TravonteD
+html_tags (queries only)[^html_tags] | community | `H IJ ` | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | community | `HFIJ ` | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) | community | `H  J ` | @amaanq, @NTBBloodbath
+[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` | @pfeiferj
+[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | core | `HFIJ ` | @luckasRanarison
+[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J ` | @cathaysa
+[ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF   ` | @theHamsta
+[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` | @yorickpeterse
+[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | core | `HFIJL` | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) | core | `HFIJL` | @p00f
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | core | `HFIJL` | @steelsojka
+[jq](https://github.com/flurie/tree-sitter-jq) | community | `H  JL` | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) | community | `H  J ` | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | community | `HFIJL` | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF JL` | @nawordar
+jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | core | `HFIJL` | @theHamsta
+[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` | @Hubro
+[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | core | `HFIJL` | @amaanq
+[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | core | `HFIJL` | @amaanq
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | community | `HF JL` | @SalBakraa
+[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` | @irh
+[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` | @Willem-J-an
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `HF JL` | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J ` | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` | @cbarrete
+[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` | @r001
+[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | core | `HFIJL` | @amaanq
+[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J ` | @hankthetank27
+[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFIJL` | @toots
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | community | `H  J ` | @benwilliamgraham
+[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | stable | `HFIJL` | @muniftanjim
+[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | core | `H    ` | @amaanq
+[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | core | `H    ` | @amaanq
+[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | core | `HFIJL` | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) | community | `HF JL` | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) | community | `HF J ` | @lewis6991
+[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | stable | `HFIJ ` | @MDeiml
+[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | stable | `H  J ` | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) | community | `HFIJL` | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `H  J ` | 
+[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | core | `HFIJ ` | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | community | `H  JL` | @artagnon
+[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` | @Freed-Wu
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | community | `H  J ` | @ObserverOfTime
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H IJ ` | 
+[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` | @aMOPel
+[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` | @aMOPel
+[ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFIJ ` | @alemuller
+[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HF JL` | @leo60228
+[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | core | `HFIJL` | @amaanq
+[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | core | `HFIJL` | @amaanq
+[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` | @ColinKennedy
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` | @undu
+[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | core | `HFIJL` | @amaanq
+[org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` | 
+[pascal](https://github.com/Isopod/tree-sitter-pascal) | community | `HFIJL` | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` | @amaanq
+[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | core | `HF J ` | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | core | `HFIJL` | @tk-shirasaka
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | core | `HFIJL` | @tk-shirasaka
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | community | `H    ` | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | community | `H  J ` | @leo60228
+[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | core | `HF J ` | @amaanq
+[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` | @RabbiVeesh, @LeoNerd
+[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | core | `HFIJ ` | @ObserverOfTime
+[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | core | `HFIJL` | @amaanq, @mfelsche
+[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | core | `H    ` | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `HF J ` | @elianiva
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | community | `H  J ` | @MichaHoffmann
+[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | core | `H  JL` | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) | community | `HF J ` | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) | community | `H  J ` | @matthias-Q
+[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | community | `H  J ` | @zealot128
+[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | core | `HFIJL` | @amaanq
+[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  JL` | @postsolar
+[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | core | `H  J ` | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) | core | `HFIJL` | @pwntester
+[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | core | `H  J ` | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) | community | `HF J ` | @Decodetalkers
+[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | stable | `HFIJL` | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` | @echasnovski
+[racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` | 
+[ralph](https://github.com/alephium/tree-sitter-ralph) | community | `H  J ` | @tdroxler
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` | @Fymyte
+[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` | @joker1007
+[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | core | `HFIJL` | @amaanq
+[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | core | `HFIJ ` | @ribru17
+[regex](https://github.com/tree-sitter/tree-sitter-regex) | core | `H    ` | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) | community | `H  J ` | @FallenAngel97
+[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | core | `H  J ` | @ObserverOfTime
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | community | `HF J ` | @bamonroe
+[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFIJ ` | @Hubro
+[roc](https://github.com/faldor20/tree-sitter-roc) | community | `H  JL` | @nat-418
+[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | core | `HFIJL` | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) | community | `H  JL` | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | core | `HFIJL` | @TravonteD
+[rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) | core | `HF JL` | @stevanmilic
+[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | unsupported | `H  J ` | @WhyNotHugo
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` | 
+[scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFIJ ` | @elianiva
+[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | core | `HFIJL` | @theHamsta
+[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` | @hunger
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | community | `H  J ` | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | community | `HFIJL` | @osthomas
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | community | `HF J ` | @amaanq
+[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber
+[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber
+[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` | @Sarrus1
+[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) | community | `HFIJL` | @BonaBeavis
+[sql](https://github.com/derekstride/tree-sitter-sql) | community | `H IJ ` | @derekstride
+[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | core | `HFIJL` | @amaanq
+[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | core | `HFIJL` | @ObserverOfTime
+[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | core | `HFIJL` | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | community | `H  J ` | @amaanq
+[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` | @mskelton
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` | @madskjeldgaard
+[surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` | @amaanq
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H IJL` | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` | @RaafatTurki
+[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` | @ok-ryoko
+[t32](https://gitlab.com/xasc/tree-sitter-t32) | community | `HFIJL` | @xasc
+[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | core | `HFIJL` | @amaanq
+[tact](https://github.com/tact-lang/tree-sitter-tact) | community | `HFIJL` | @novusnota
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFIJ ` | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | @euclidianAce
+[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` | @vrischmann
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` | @MichaHoffmann
+[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFIJ ` | @Porter
+[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | core | `HFIJL` | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) | community | `HFIJL` | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | community | `HF JL` | @ahelwer, @susliko
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` | @Freed-Wu
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | community | `H    ` | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | core | `HFIJL` | @tk-shirasaka
+[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` | @steelsojka
+[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) | community | `HFIJL` | @BonaBeavis
+[twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` | @steelsojka
+[typespec](https://github.com/happenslol/tree-sitter-typespec) | community | `H IJ ` | @happenslol
+[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` | @Teddytrombone
+[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` | @uben0, @RaafatTurki
+[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | core | `H  JL` | @ObserverOfTime
+[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | core | `HFIJL` | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | community | `H  J ` | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFIJL` | @ColinKennedy
+[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | core | `HFIJL` | @amaanq
+[v](https://github.com/vlang/v-analyzer) | community | `HFIJL` | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF J ` | @Prince781
+[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` | @wrapperup, @oscarotero
+[verilog](https://github.com/tree-sitter/tree-sitter-verilog) | core | `HF JL` | @zegervdv
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H  J ` | @caarlos0
+[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | stable | `HF JL` | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | stable | `H  J ` | @clason
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | core | `HFIJ ` | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | community | `HFIJ ` | @szebniok
+[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | core | `HFI  ` | @theHamsta
+[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF JL` | @gshpychka, @MarkMcCulloh
+[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J ` | @liamwh
+[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | core | `H  JL` | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` | @ObserverOfTime
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` | @Hubro
+[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | core | `HFIJL` | @Philipp-M, @amaanq
+[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` | @Freed-Wu
+[zig](https://github.com/maxxnino/tree-sitter-zig) | community | `HFIJL` | @maxxnino
+[^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gdscript]: Godot
 [^glimmer]: Glimmer and Ember
diff --git a/TODO.md b/TODO.md
index 56d8c88cf..fb0032c96 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,12 +4,7 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
-- [ ] **`parsers.lua`:** include revision (serialization at home: `vim.inspect`)
-  - rename `parsers` to `languages`
-  - rename `install_info` to `parser`
-
 - [ ] **`parsers.lua`:** allow specifying version in addition to commit hash (for Tier 1)
-- [ ] **update-lockfile:** one commit per parser/tier?
 - [ ] **tests:** fix, update, extend (cover all Tier 1 languages)
 - [ ] **documentation:** consolidate, autogenerate?
 - [ ] **documentation:** migration guide
diff --git a/lua/nvim-treesitter/_meta/parsers.lua b/lua/nvim-treesitter/_meta/parsers.lua
index 09e4d1846..e265bf611 100644
--- a/lua/nvim-treesitter/_meta/parsers.lua
+++ b/lua/nvim-treesitter/_meta/parsers.lua
@@ -9,9 +9,6 @@ error('Cannot require a meta file')
 ---Commit hash of parser to download (compatible with queries)
 ---@field revision string
 ---
----Files to include when compiling (`src/parser.c` and optionally `src/scanner.c')
----@field files string[]
----
 ---Branch of parser repo to download (if not default branch)
 ---@field branch? string
 ---
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 4c662bab6..704c8e87e 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -104,15 +104,6 @@ function M.get_available(tier)
       languages
     )
   end
-  if vim.fn.executable('tree-sitter') == 0 then
-    languages = vim.tbl_filter(
-      --- @param p string
-      function(p)
-        return parsers[p].install_info ~= nil and not parsers[p].install_info.generate
-      end,
-      languages
-    )
-  end
   return languages
 end
 
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 58ede835a..dc7078bdf 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -1,4 +1,3 @@
-local install = require('nvim-treesitter.install')
 local parsers = require('nvim-treesitter.parsers')
 local config = require('nvim-treesitter.config')
 local util = require('nvim-treesitter.util')
@@ -8,82 +7,80 @@ local health = vim.health
 local M = {}
 
 local NVIM_TREESITTER_MINIMUM_ABI = 13
+local TREE_SITTER_MIN_VER = { 0, 22, 6 }
 
----@return string|nil
-local function ts_cli_version()
-  if vim.fn.executable('tree-sitter') == 1 then
-    local result = assert(vim.system({ 'tree-sitter', '-V' }):wait().stdout)
-    return vim.split(result, '\n')[1]:match('[^tree%psitter ].*')
+---@param name string
+---@return table?
+local function check_exe(name)
+  if vim.fn.executable(name) == 1 then
+    local path = vim.fn.exepath(name)
+    local out = vim.trim(vim.fn.system({ name, '--version' }))
+    local version = vim.version.parse(out)
+    return { path = path, version = version, out = out }
   end
 end
 
 local function install_health()
   health.start('Requirements')
 
-  if vim.fn.has('nvim-0.10') ~= 1 then
-    health.error('Nvim-treesitter requires Neovim Nightly')
+  do -- nvim check
+    if vim.fn.has('nvim-0.10') ~= 1 then
+      health.error('Nvim-treesitter requires the latest Neovim nightly')
+    end
+
+    if vim.treesitter.language_version then
+      if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then
+        health.ok(
+          'Neovim was compiled with tree-sitter runtime ABI version '
+            .. vim.treesitter.language_version
+            .. ' (required >='
+            .. NVIM_TREESITTER_MINIMUM_ABI
+            .. ').'
+        )
+      else
+        health.error(
+          'Neovim was compiled with tree-sitter runtime ABI version '
+            .. vim.treesitter.language_version
+            .. '.\n'
+            .. 'nvim-treesitter expects at least ABI version '
+            .. NVIM_TREESITTER_MINIMUM_ABI
+            .. '\n'
+            .. 'Please make sure that Neovim is linked against a recent tree-sitter library when building'
+            .. ' or raise an issue at your Neovim packager. Parsers must be compatible with runtime ABI.'
+        )
+      end
+    end
   end
 
-  if vim.fn.executable('tree-sitter') == 0 then
-    health.warn(
-      '`tree-sitter` executable not found (parser generator, only needed for :TSInstallFromGrammar,'
-        .. ' not required for :TSInstall)'
-    )
-  else
-    health.ok(
-      '`tree-sitter` found '
-        .. (ts_cli_version() or '(unknown version)')
-        .. ' (only needed for `:TSInstallFromGrammar`)'
-    )
-  end
-
-  if vim.fn.executable('git') == 0 then
-    health.warn(
-      '`git` executable not found.',
-      'Install it with your package manager and check that your `$PATH` is set correctly.'
-    )
-  else
-    health.ok('`git` executable found.')
-  end
-
-  local cc = install.select_executable(install.compilers)
-  if not cc then
-    health.error('`cc` executable not found.', {
-      'Check that any of '
-        .. table.concat(install.compilers, ', ')
-        .. ' is in your $PATH'
-        .. ' or set `$CC` or `require"nvim-treesitter.install".compilers` explicitly.',
-    })
-  else
-    local version = assert(vim.system({ cc, cc == 'cl' and '' or '--version' }):wait().stdout)
-    health.ok(
-      '`'
-        .. cc
-        .. '` executable found, selected from:  '
-        .. table.concat(install.compilers, ', ')
-        .. (version and ('\nVersion: ' .. version) or '')
-    )
-  end
-  if vim.treesitter.language_version then
-    if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then
-      health.ok(
-        'Neovim was compiled with tree-sitter runtime ABI version '
-          .. vim.treesitter.language_version
-          .. ' (required >='
-          .. NVIM_TREESITTER_MINIMUM_ABI
-          .. ').'
-      )
+  do -- treesitter check
+    local ts = check_exe('tree-sitter')
+    if ts then
+      if vim.version.ge(ts.version, TREE_SITTER_MIN_VER) then
+        health.ok(string.format('tree-sitter %s (%s)', ts.version, ts.path))
+      else
+        health.error(
+          string.format('tree-sitter CLI v%d.%d.%d is required', unpack(TREE_SITTER_MIN_VER))
+        )
+      end
     else
-      health.error(
-        'Neovim was compiled with tree-sitter runtime ABI version '
-          .. vim.treesitter.language_version
-          .. '.\n'
-          .. 'nvim-treesitter expects at least ABI version '
-          .. NVIM_TREESITTER_MINIMUM_ABI
-          .. '\n'
-          .. 'Please make sure that Neovim is linked against a recent tree-sitter library when building'
-          .. ' or raise an issue at your Neovim packager. Parsers must be compatible with runtime ABI.'
-      )
+      health.error('tree-sitter CLI not found')
+    end
+  end
+
+  do -- curl+tar or git check
+    local curl = check_exe('curl')
+    local tar = check_exe('tar')
+
+    if curl and tar and vim.uv.os_uname().sysname ~= 'Windows_NT' then
+      health.ok(string.format('tar %s (%s)', tar.version, tar.path))
+      health.ok(string.format('curl %s (%s)\n%s', curl.version, curl.path, curl.out))
+    else
+      local git = check_exe('git')
+      if git then
+        health.ok(string.format('git %s (%s)', git.version, git.path))
+      else
+        health.error('Either curl and tar or git must be installed and on `$PATH`')
+      end
     end
   end
 
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 8b3dc82fc..ac37c7af0 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -23,19 +23,8 @@ local uv_symlink = a.wrap(uv.fs_symlink, 4)
 --- @type fun(path: string): string?
 local uv_unlink = a.wrap(uv.fs_unlink, 2)
 
-local M = {}
-
 local max_jobs = 10
 
-local iswin = uv.os_uname().sysname == 'Windows_NT'
-local ismac = uv.os_uname().sysname == 'Darwin'
-
---- @diagnostic disable-next-line:missing-parameter
-M.compilers = { 'cc', 'gcc', 'clang', 'cl', 'zig' }
-if uv.os_getenv('CC') then
-  table.insert(M.compilers, 1, uv.os_getenv('CC'))
-end
-
 local function system(cmd, opts)
   log.trace('running job: (cwd=%s) %s', opts.cwd, table.concat(cmd, ' '))
   local r = a.wrap(vim.system, 3)(cmd, opts) --[[@as vim.SystemCompleted]]
@@ -50,6 +39,10 @@ local function system(cmd, opts)
   return r
 end
 
+local iswin = uv.os_uname().sysname == 'Windows_NT'
+
+local M = {}
+
 ---
 --- PARSER INFO
 ---
@@ -99,18 +92,6 @@ end
 --- PARSER MANAGEMENT FUNCTIONS
 ---
 
-local function istring(c)
-  return type(c) == 'string'
-end
-
-local function cc_err()
-  log.error(
-    'No C compiler found! "'
-      .. table.concat(vim.tbl_filter(istring, M.compilers), '", "')
-      .. '" are not executable.'
-  )
-end
-
 --- @param x string
 --- @return boolean
 local function executable(x)
@@ -122,10 +103,6 @@ end
 --- @param compile_location string
 --- @return string? err
 local function do_generate(logger, repo, compile_location)
-  if not executable('tree-sitter') then
-    return logger:error('tree-sitter CLI not found: `tree-sitter` is not executable')
-  end
-
   logger:info(
     string.format(
       'Generating parser.c from %s...',
@@ -134,7 +111,7 @@ local function do_generate(logger, repo, compile_location)
   )
 
   local r = system({
-    fn.exepath('tree-sitter'),
+    'tree-sitter',
     'generate',
     '--no-bindings',
     '--abi',
@@ -232,10 +209,6 @@ end
 ---@param project_dir string
 ---@return string? err
 local function do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
-  if not executable('git') then
-    return logger:error('git not found!')
-  end
-
   logger:info('Downloading ' .. project_name .. '...')
 
   local r = system({
@@ -266,86 +239,6 @@ local function do_download_git(logger, repo, project_name, cache_dir, revision,
   end
 end
 
---- @type table<string,table<string,boolean>>
-local cc_args_cache = vim.defaulttable()
-
---- @param cc string
---- @param arg string
---- @return boolean
-local function test_cc_arg(cc, arg)
-  if cc_args_cache[cc][arg] == nil then
-    cc_args_cache[cc][arg] = system({ cc, '-xc', '-', arg }, {
-      stdin = 'int main(void) { return 0; }',
-    }).code == 0
-  end
-  return cc_args_cache[cc][arg]
-end
-
----@param executables string[]
----@return string?
-function M.select_executable(executables)
-  return vim.tbl_filter(executable, executables)[1]
-end
-
--- Returns the compiler arguments based on the compiler and OS
----@param repo InstallInfo
----@param compiler string
----@return string[]
-local function select_compiler_args(repo, compiler)
-  if compiler:find('cl$') or compiler:find('cl.exe$') then
-    return {
-      '/Fe:',
-      'parser.so',
-      '/Isrc',
-      repo.files,
-      '-Os',
-      '/utf-8',
-      '/LD',
-    }
-  end
-
-  if compiler:find('zig$') or compiler:find('zig.exe$') then
-    return {
-      'cc',
-      '-o',
-      'parser.so',
-      repo.files,
-      '-lc',
-      '-Isrc',
-      '-shared',
-      '-Os',
-    }
-  end
-
-  local args = {
-    '-o',
-    'parser.so',
-    '-I./src',
-    repo.files,
-    '-Os',
-    ismac and '-bundle' or '-shared',
-  }
-
-  --- @param arg string
-  local function add_cc_arg(arg)
-    if test_cc_arg(compiler, arg) then
-      args[#args + 1] = arg
-    end
-  end
-
-  if not iswin then
-    add_cc_arg('-Wall')
-    add_cc_arg('-Wextra')
-    add_cc_arg('-fPIC')
-
-    -- Make sure we don't compile in any unresolved symbols, otherwise nvim will
-    -- just exit (not even crash)
-    add_cc_arg('-Werror=implicit-function-declaration')
-  end
-
-  return args
-end
-
 ---@param repo InstallInfo
 ---@return boolean
 local function can_download_tar(repo)
@@ -355,21 +248,40 @@ local function can_download_tar(repo)
   return can_use_tar and (is_github or is_gitlab) and not iswin
 end
 
--- Returns the compile command based on the OS and user options
 ---@param logger Logger
----@param repo InstallInfo
----@param cc string
 ---@param compile_location string
 ---@return string? err
-local function do_compile(logger, repo, cc, compile_location)
-  local args = vim.iter(select_compiler_args(repo, cc)):flatten():totable()
-  local cmd = vim.list_extend({ cc }, args)
+local function do_compile(logger, compile_location)
+  logger:info(string.format('Compiling parser'))
 
-  logger:info('Compiling parser')
-
-  local r = system(cmd, { cwd = compile_location })
+  local r = system({
+    'tree-sitter',
+    'build',
+    '-o',
+    'parser.so',
+  }, { cwd = compile_location })
   if r.code > 0 then
-    return logger:error('Error during compilation: %s', r.stderr)
+    return logger:error('Error during "tree-sitter build": %s', r.stderr)
+  end
+end
+
+---@param logger Logger
+---@param compile_location string
+---@param target_location string
+---@return string? err
+local function do_install(logger, compile_location, target_location)
+  logger:info(string.format('Installing parser'))
+
+  if iswin then -- why can't you just be normal?!
+    local tempfile = target_location .. tostring(uv.hrtime())
+    uv_rename(target_location, tempfile) -- parser may be in use: rename...
+    uv_unlink(tempfile) -- ...and mark for garbage collection
+  end
+
+  local err = uv_copyfile(compile_location, target_location)
+  a.main()
+  if err then
+    return logger:error('Error during parser installation: %s', err)
   end
 end
 
@@ -383,12 +295,6 @@ local function install_lang0(lang, cache_dir, install_dir, generate)
 
   local repo = get_parser_install_info(lang)
   if repo then
-    local cc = M.select_executable(M.compilers)
-    if not cc then
-      cc_err()
-      return
-    end
-
     local project_name = 'tree-sitter-' .. lang
 
     local revision = repo.revision
@@ -414,7 +320,7 @@ local function install_lang0(lang, cache_dir, install_dir, generate)
       compile_location = fs.joinpath(compile_location, repo.location)
     end
 
-    do
+    do -- generate parser from grammar
       if repo.generate or generate then
         local err = do_generate(logger, repo, compile_location)
         if err then
@@ -423,24 +329,25 @@ local function install_lang0(lang, cache_dir, install_dir, generate)
       end
     end
 
-    do
-      local err = do_compile(logger, repo, cc, compile_location)
+    do -- compile parser
+      local err = do_compile(logger, compile_location)
       if err then
         return err
       end
     end
 
-    local parser_lib_name = fs.joinpath(install_dir, lang) .. '.so'
+    do -- install parser
+      local parser_lib_name = fs.joinpath(compile_location, 'parser.so')
+      local install_location = fs.joinpath(install_dir, lang) .. '.so'
+      local err = do_install(logger, parser_lib_name, install_location)
+      if err then
+        return err
+      end
 
-    local err = uv_copyfile(fs.joinpath(compile_location, 'parser.so'), parser_lib_name)
-    a.main()
-    if err then
-      return logger:error(err)
+      local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
+      util.write_file(revfile, revision or '')
     end
 
-    local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
-    util.write_file(revfile, revision or '')
-
     if not repo.path then
       util.delete(fs.joinpath(cache_dir, project_name))
     end
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 83011c7cb..b31224d26 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2,7 +2,6 @@
 return {
   ada = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'e8e2515465cc2d7c444498e68bdb9f1d86767f95',
       url = 'https://github.com/briot/tree-sitter-ada',
     },
@@ -11,7 +10,6 @@ return {
   },
   agda = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'd3dc807692e6bca671d4491b3bf5c67eeca8c016',
       url = 'https://github.com/tree-sitter/tree-sitter-agda',
     },
@@ -20,7 +18,6 @@ return {
   },
   angular = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '10f21f3f1b10584e62ecc113ab3cda1196d0ceb8',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
@@ -31,7 +28,6 @@ return {
   },
   apex = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'apex',
       revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
@@ -41,7 +37,6 @@ return {
   },
   arduino = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = 'afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
@@ -52,7 +47,6 @@ return {
   },
   asm = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'b0306e9bb2ebe01c6562f1aef265cc42ccc53070',
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
@@ -61,7 +55,6 @@ return {
   },
   astro = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '4be180759ec13651f72bacee65fa477c64222a1a',
       url = 'https://github.com/virchau13/tree-sitter-astro',
@@ -72,7 +65,6 @@ return {
   },
   authzed = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '1dec7e1af96c56924e3322cd85fdce15d0a31d00',
       url = 'https://github.com/mleonidas/tree-sitter-authzed',
     },
@@ -81,7 +73,6 @@ return {
   },
   awk = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'ba7472152d79a8c916550c80fdbfd5724d07a0c9',
       url = 'https://github.com/Beaglefoot/tree-sitter-awk',
     },
@@ -89,7 +80,6 @@ return {
   },
   bash = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '2fbd860f802802ca76a6661ce025b3a3bca2d3ed',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
@@ -98,7 +88,6 @@ return {
   },
   bass = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '28dc7059722be090d04cd751aed915b2fee2f89a',
       url = 'https://github.com/vito/tree-sitter-bass',
     },
@@ -107,7 +96,6 @@ return {
   },
   beancount = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'c25f8034c977681653a8acd541c8b4877a58f474',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
@@ -116,7 +104,6 @@ return {
   },
   bibtex = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'ccfd77db0ed799b6c22c214fe9d2937f47bc8b34',
       url = 'https://github.com/latex-lsp/tree-sitter-bibtex',
     },
@@ -125,7 +112,6 @@ return {
   },
   bicep = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-bicep',
     },
@@ -134,7 +120,6 @@ return {
   },
   bitbake = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-bitbake',
     },
@@ -151,7 +136,6 @@ return {
   },
   blueprint = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '60ba73739c6083c693d86a1a7cf039c07eb4ed59',
       url = 'https://gitlab.com/gabmus/tree-sitter-blueprint',
     },
@@ -160,7 +144,6 @@ return {
   },
   bp = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '2326d709fb9cf73cf124fdbc803c267f851721a4',
       url = 'https://github.com/ambroisie/tree-sitter-bp',
     },
@@ -178,7 +161,6 @@ return {
   },
   c = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'deca017a554045b4c203e7ddff39ae64ff05e071',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
@@ -187,7 +169,6 @@ return {
   },
   c_sharp = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '82fa8f05f41a33e9bc830f85d74a9548f0291738',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
@@ -196,7 +177,6 @@ return {
   },
   cairo = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '6238f609bea233040fe927858156dee5515a0745',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cairo',
     },
@@ -213,7 +193,6 @@ return {
   },
   capnp = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '7b0883c03e5edd34ef7bcf703194204299d7099f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-capnp',
     },
@@ -222,7 +201,6 @@ return {
   },
   chatito = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'a461f20dedb43905febb12c1635bc7d2e43e96f0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-chatito',
     },
@@ -239,7 +217,6 @@ return {
   },
   clojure = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f4236d4da8aa92bc105d9c118746474c608e6af7',
       url = 'https://github.com/sogaiu/tree-sitter-clojure',
     },
@@ -248,8 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3',
+      revision = '4864abb95a1f6e54d6b362677beef9fb674b41e9',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -257,7 +233,6 @@ return {
   },
   comment = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd',
       url = 'https://github.com/stsewd/tree-sitter-comment',
     },
@@ -266,7 +241,6 @@ return {
   },
   commonlisp = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = 'bf2a65b1c119898a1a17389e07f2a399c05cdc0c',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-commonlisp',
@@ -276,7 +250,6 @@ return {
   },
   cooklang = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '4ebe237c1cf64cf3826fc249e9ec0988fe07e58e',
       url = 'https://github.com/addcninblue/tree-sitter-cooklang',
     },
@@ -285,8 +258,7 @@ return {
   },
   corn = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = '604d73c38d4c28ca68e9e441ffd405d68cb63051',
+      revision = '464654742cbfd3a3de560aba120998f1d5dfa844',
       url = 'https://github.com/jakestanger/tree-sitter-corn',
     },
     maintainers = { '@jakestanger' },
@@ -294,7 +266,6 @@ return {
   },
   cpon = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '594289eadfec719198e560f9d7fd243c4db678d5',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cpon',
     },
@@ -303,9 +274,8 @@ return {
   },
   cpp = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
-      revision = 'd29fbff09a8c9ff4f3074de2595dfca12cb33da9',
+      revision = '9d412ba7e597fe158f209da33e60f31b1f0df967',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -314,7 +284,6 @@ return {
   },
   css = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af',
       url = 'https://github.com/tree-sitter/tree-sitter-css',
     },
@@ -323,7 +292,6 @@ return {
   },
   csv = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'csv',
       revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
@@ -334,7 +302,6 @@ return {
   },
   cuda = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '1f188eff83b562ffae36d13e1b804ec6f3b9f1d9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
@@ -345,7 +312,6 @@ return {
   },
   cue = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '8a5f273bfa281c66354da562f2307c2d394b6c81',
       url = 'https://github.com/eonpatapon/tree-sitter-cue',
     },
@@ -362,7 +328,6 @@ return {
   },
   d = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '750dde90ed9cdbd82493bc28478d8ab1976b0e9f',
       url = 'https://github.com/gdamore/tree-sitter-d',
     },
@@ -371,7 +336,6 @@ return {
   },
   dart = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'ac0bb849ccd1a923963af47573b5e396736ff582',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
@@ -388,7 +352,6 @@ return {
   },
   devicetree = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'fb07e6044ffd36932c57a5be01ba5d6b8a9337bb',
       url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
@@ -397,7 +360,6 @@ return {
   },
   dhall = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'affb6ee38d629c9296749767ab832d69bb0d9ea8',
       url = 'https://github.com/jbellerb/tree-sitter-dhall',
     },
@@ -406,7 +368,6 @@ return {
   },
   diff = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '629676fc3919606964231b2c7b9677d6998a2cb4',
       url = 'https://github.com/the-mikedavis/tree-sitter-diff',
     },
@@ -415,7 +376,6 @@ return {
   },
   disassembly = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '0229c0211dba909c5d45129ac784a3f4d49c243a',
       url = 'https://github.com/ColinKennedy/tree-sitter-disassembly',
     },
@@ -424,8 +384,7 @@ return {
   },
   djot = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '0e9a836ec47612ade15645fb1680adb549894a6c',
+      revision = 'ea851b9cf1a71e475f4e2ac4dc03609a1b9ca56d',
       url = 'https://github.com/treeman/tree-sitter-djot',
     },
     maintainers = { '@NoahTheDuke' },
@@ -433,7 +392,6 @@ return {
   },
   dockerfile = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '087daa20438a6cc01fa5e6fe6906d77c869d19fe',
       url = 'https://github.com/camdencheek/tree-sitter-dockerfile',
     },
@@ -442,7 +400,6 @@ return {
   },
   dot = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '9ab85550c896d8b294d9b9ca1e30698736f08cea',
       url = 'https://github.com/rydesun/tree-sitter-dot',
     },
@@ -451,8 +408,7 @@ return {
   },
   doxygen = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '4a30eba5d047d6a8c5b005202b4848c0b33d76ca',
+      revision = 'ccd998f378c3f9345ea4eeb223f56d7b84d16687',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-doxygen',
     },
     maintainers = { '@amaanq' },
@@ -460,7 +416,6 @@ return {
   },
   dtd = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'dtd',
       revision = '648183d86f6f8ffb240ea11b4c6873f6f45d8b67',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
@@ -470,8 +425,7 @@ return {
   },
   earthfile = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '6de809419cdfb23e3a8383b6575fa3634900f276',
+      revision = 'b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -479,7 +433,6 @@ return {
   },
   ebnf = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'crates/tree-sitter-ebnf',
       revision = '8e635b0b723c620774dfb8abf382a7f531894b40',
       url = 'https://github.com/RubixDev/ebnf',
@@ -502,8 +455,7 @@ return {
   },
   eds = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = '5517bdb90c90703df49579a4b04689a614780be2',
+      revision = '0ad62cb635c2f4353359a88dec9e3a57bbf9f66d',
       url = 'https://github.com/uyha/tree-sitter-eds',
     },
     maintainers = { '@uyha' },
@@ -511,7 +463,6 @@ return {
   },
   eex = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f742f2fe327463335e8671a87c0b9b396905d1d1',
       url = 'https://github.com/connorlay/tree-sitter-eex',
     },
@@ -520,8 +471,7 @@ return {
   },
   elixir = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = 'de690fa8a028f122af46d9d2685679fe5f2d7d60',
+      revision = 'c7ae8b77e2749826dcf23df6514f08fdd68c66a3',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -529,7 +479,6 @@ return {
   },
   elm = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '09dbf221d7491dc8d8839616b27c21b9c025c457',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
@@ -538,7 +487,6 @@ return {
   },
   elsa = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7',
       url = 'https://github.com/glapa-grossklag/tree-sitter-elsa',
     },
@@ -547,7 +495,6 @@ return {
   },
   elvish = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '5e7210d945425b77f82cbaebc5af4dd3e1ad40f5',
       url = 'https://github.com/elves/tree-sitter-elvish',
     },
@@ -556,7 +503,6 @@ return {
   },
   embedded_template = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '38d5004a797298dc42c85e7706c5ceac46a3f29f',
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
@@ -572,7 +518,6 @@ return {
   },
   erlang = {
     install_info = {
-      files = { 'src/parser.c', 'src/parser.c' },
       revision = '98ea1f9c957b2ad520415eecb5a5b406e931101e',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
@@ -581,7 +526,6 @@ return {
   },
   facility = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'a52579670e2b14ec03d410c3c980fafaf6d659c4',
       url = 'https://github.com/FacilityApi/tree-sitter-facility',
     },
@@ -590,7 +534,6 @@ return {
   },
   faust = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4',
       url = 'https://github.com/khiner/tree-sitter-faust',
     },
@@ -599,7 +542,6 @@ return {
   },
   fennel = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = 'cfbfa478dc2dbef267ee94ae4323d9c886f45e94',
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
@@ -609,7 +551,6 @@ return {
   },
   fidl = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '0a8910f293268e27ff554357c229ba172b0eaed2',
       url = 'https://github.com/google/tree-sitter-fidl',
     },
@@ -618,7 +559,6 @@ return {
   },
   firrtl = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '8503d3a0fe0f9e427863cb0055699ff2d29ae5f5',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-firrtl',
     },
@@ -627,7 +567,6 @@ return {
   },
   fish = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'a78aef9abc395c600c38a037ac779afc7e3cc9e0',
       url = 'https://github.com/ram02z/tree-sitter-fish',
     },
@@ -636,7 +575,6 @@ return {
   },
   foam = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '04664b40c0dadb7ef37028acf3422c63271d377b',
       url = 'https://github.com/FoamScience/tree-sitter-foam',
     },
@@ -645,7 +583,6 @@ return {
   },
   forth = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '90189238385cf636b9ee99ce548b9e5b5e569d48',
       url = 'https://github.com/AlexanderBrevig/tree-sitter-forth',
     },
@@ -654,7 +591,6 @@ return {
   },
   fortran = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'f73d473e3530862dee7cbb38520f28824e7804f6',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
@@ -663,7 +599,6 @@ return {
   },
   fsh = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'fad2e175099a45efbc98f000cc196d3674cc45e0',
       url = 'https://github.com/mgramigna/tree-sitter-fsh',
     },
@@ -681,7 +616,6 @@ return {
   },
   func = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f780ca55e65e7d7360d0229331763e16c452fc98',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-func',
     },
@@ -690,7 +624,6 @@ return {
   },
   fusion = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6',
       url = 'https://gitlab.com/jirgn/tree-sitter-fusion',
     },
@@ -718,7 +651,6 @@ return {
   },
   gdscript = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '1f1e782fe2600f50ae57b53876505b8282388d77',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
@@ -728,7 +660,6 @@ return {
   },
   gdshader = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'ffd9f958df13cae04593781d7d2562295a872455',
       url = 'https://github.com/GodOfAvacyn/tree-sitter-gdshader',
     },
@@ -737,7 +668,6 @@ return {
   },
   git_config = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '9c2a1b7894e6d9eedfe99805b829b4ecd871375e',
       url = 'https://github.com/the-mikedavis/tree-sitter-git-config',
     },
@@ -746,7 +676,6 @@ return {
   },
   git_rebase = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'd8a4207ebbc47bd78bacdf48f883db58283f9fd8',
       url = 'https://github.com/the-mikedavis/tree-sitter-git-rebase',
     },
@@ -755,7 +684,6 @@ return {
   },
   gitattributes = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '41940e199ba5763abea1d21b4f717014b45f01ea',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gitattributes',
     },
@@ -764,7 +692,6 @@ return {
   },
   gitcommit = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'edd817e0532f179b7f7f371dc180629070945f0c',
       url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
@@ -773,7 +700,6 @@ return {
   },
   gitignore = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f4685bf11ac466dd278449bcfe5fd014e94aa504',
       url = 'https://github.com/shunsambongi/tree-sitter-gitignore',
     },
@@ -782,7 +708,6 @@ return {
   },
   gleam = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '02a17bf9d0553406268cdbf466d57808ae712bf3',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
@@ -791,7 +716,6 @@ return {
   },
   glimmer = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '6b25d265c990139353e1f7f97baf84987ebb7bf0',
       url = 'https://github.com/ember-tooling/tree-sitter-glimmer',
     },
@@ -821,7 +745,6 @@ return {
   },
   glsl = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = '7f91bf34cadc06a96efc475df501ffca4dda9410',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
@@ -832,7 +755,6 @@ return {
   },
   gn = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gn',
     },
@@ -842,7 +764,6 @@ return {
   },
   gnuplot = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '3c895f5d9c0b3a3c7e02383766b462c21913c000',
       url = 'https://github.com/dpezto/tree-sitter-gnuplot',
     },
@@ -851,7 +772,6 @@ return {
   },
   go = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '7ee8d928db5202f6831a78f8112fd693bf69f98b',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
@@ -868,7 +788,6 @@ return {
   },
   godot_resource = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '2ffb90de47417018651fc3b970e5f6b67214dc9d',
       url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
@@ -878,7 +797,6 @@ return {
   },
   gomod = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'bbe2fe3be4b87e06a613e685250f473d2267f430',
       url = 'https://github.com/camdencheek/tree-sitter-go-mod',
     },
@@ -887,7 +805,6 @@ return {
   },
   gosum = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'e2ac513b2240c7ff1069ae33b2df29ce90777c11',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-go-sum',
     },
@@ -896,7 +813,6 @@ return {
   },
   gotmpl = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '9d3f6e526dd074b9edae9070b7bb778f00e87a5b',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
@@ -905,7 +821,6 @@ return {
   },
   gowork = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '949a8a470559543857a62102c84700d291fc984c',
       url = 'https://github.com/omertuc/tree-sitter-go-work',
     },
@@ -914,7 +829,6 @@ return {
   },
   gpg = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f99323fb8f3f10b6c69db0c2f6d0a14bd7330675',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gpg-config',
     },
@@ -923,7 +837,6 @@ return {
   },
   graphql = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '5e66e961eee421786bdda8495ed1db045e06b5fe',
       url = 'https://github.com/bkegley/tree-sitter-graphql',
     },
@@ -940,7 +853,6 @@ return {
   },
   groovy = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '6c5c8813233fe326e24c5ef032858d13f8006a8d',
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
@@ -949,7 +861,6 @@ return {
   },
   gstlaunch = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '549aef253fd38a53995cda1bf55c501174372bf7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch',
     },
@@ -958,7 +869,6 @@ return {
   },
   hack = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2',
       url = 'https://github.com/slackhq/tree-sitter-hack',
     },
@@ -966,7 +876,6 @@ return {
   },
   hare = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '070524937539eb8bb4f10debd9c83b66c434f3a2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hare',
     },
@@ -975,7 +884,6 @@ return {
   },
   haskell = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19',
       url = 'https://github.com/tree-sitter/tree-sitter-haskell',
     },
@@ -984,7 +892,6 @@ return {
   },
   haskell_persistent = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '577259b4068b2c281c9ebf94c109bd50a74d5857',
       url = 'https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent',
     },
@@ -993,8 +900,7 @@ return {
   },
   hcl = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = 'e936d3fef8bac884661472dce71ad82284761eb1',
+      revision = 'e2d416afeba80e8cf711ed6792e089ed5c8e184e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -1002,7 +908,6 @@ return {
   },
   heex = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'b5ad6e34eea18a15bbd1466ca707a17f9bff7b93',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
@@ -1011,7 +916,6 @@ return {
   },
   helm = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'dialects/helm',
       revision = '9d3f6e526dd074b9edae9070b7bb778f00e87a5b',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
@@ -1021,7 +925,6 @@ return {
   },
   hjson = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = '02fa3b79b3ff9a296066da6277adfc3f26cbc9e0',
       url = 'https://github.com/winston0410/tree-sitter-hjson',
@@ -1032,7 +935,6 @@ return {
   },
   hlsl = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '5e1225a30712ca0a9040509806c7ba274a1bbcde',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
@@ -1043,7 +945,6 @@ return {
   },
   hlsplaylist = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '64f19029339e75d6762feae39e7878595860c980',
       url = 'https://github.com/Freed-Wu/tree-sitter-hlsplaylist',
     },
@@ -1052,7 +953,6 @@ return {
   },
   hocon = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = 'c390f10519ae69fdb03b3e5764f5592fb6924bcc',
       url = 'https://github.com/antosha417/tree-sitter-hocon',
@@ -1062,7 +962,6 @@ return {
   },
   hoon = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8',
       url = 'https://github.com/urbit-pilled/tree-sitter-hoon',
     },
@@ -1071,7 +970,6 @@ return {
   },
   html = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'e4d834eb4918df01dcad5c27d1b15d56e3bd94cd',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
@@ -1086,7 +984,6 @@ return {
   },
   htmldjango = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'ea71012d3fe14dd0b69f36be4f96bdfe9155ebae',
       url = 'https://github.com/interdependence/tree-sitter-htmldjango',
     },
@@ -1095,7 +992,6 @@ return {
   },
   http = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '8d22f33faa5aa95c6526606fb656ada342e59e40',
       url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
@@ -1104,7 +1000,6 @@ return {
   },
   hurl = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'ad705af8c44c737bdb965fc081329c50716d2d03',
       url = 'https://github.com/pfeiferj/tree-sitter-hurl',
     },
@@ -1113,8 +1008,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = 'e5da7d0aa44403153e0394d87d9edea4e5bd6609',
+      revision = 'c9012d6dcaaa939f17c21e1fdb17b013d139e6b9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
@@ -1122,7 +1016,6 @@ return {
   },
   idl = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
@@ -1139,7 +1032,6 @@ return {
   },
   ini = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '87176e524f0a98f5be75fa44f4f0ff5c6eac069c',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
@@ -1148,7 +1040,6 @@ return {
   },
   inko = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '234c87be1dac20f766ddf6f486a7bde2a4bc5594',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
@@ -1165,7 +1056,6 @@ return {
   },
   ispc = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = '9b2f9aec2106b94b4e099fe75e73ebd8ae707c04',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ispc',
@@ -1176,8 +1066,7 @@ return {
   },
   janet_simple = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '6bfbaadac2ba0da21087041eff85d26129c4c920',
+      revision = '2a05cab838dfec52daa76f10920917d2e69a85bc',
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
@@ -1185,7 +1074,6 @@ return {
   },
   java = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '953abfc8bb3eb2f578e1f461edba4a9885f974b8',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
@@ -1202,7 +1090,6 @@ return {
   },
   javascript = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '391a8fcc48a11f63bf18ec9885f6f069e760949a',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
@@ -1233,7 +1120,6 @@ return {
   },
   jq = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '13990f530e8e6709b7978503da9bc8701d366791',
       url = 'https://github.com/flurie/tree-sitter-jq',
     },
@@ -1242,7 +1128,6 @@ return {
   },
   jsdoc = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '49fde205b59a1d9792efc21ee0b6d50bbd35ff14',
       url = 'https://github.com/tree-sitter/tree-sitter-jsdoc',
     },
@@ -1251,7 +1136,6 @@ return {
   },
   json = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '94f5c527b2965465956c2000ed6134dd24daf2a7',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
@@ -1260,7 +1144,6 @@ return {
   },
   json5 = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'ab0ba8229d639ec4f3fa5f674c9133477f4b77bd',
       url = 'https://github.com/Joakker/tree-sitter-json5',
     },
@@ -1269,7 +1152,6 @@ return {
   },
   jsonc = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = '02b01653c8a1c198ae7287d566efa86a135b30d5',
       url = 'https://gitlab.com/WhyNotHugo/tree-sitter-jsonc',
@@ -1280,7 +1162,6 @@ return {
   },
   jsonnet = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'd34615fa12cc1d1cfc1f1f1a80acc9db80ee4596',
       url = 'https://github.com/sourcegraph/tree-sitter-jsonnet',
     },
@@ -1294,7 +1175,6 @@ return {
   },
   julia = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'f1baa5f8e271109d01cc8ff7473c11df2d8a9aee',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
@@ -1303,7 +1183,6 @@ return {
   },
   just = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'fd814fc6c579f68c2a642f5e0268cf69daae92d7',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
@@ -1320,7 +1199,6 @@ return {
   },
   kconfig = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '486fea71f61ad9f3fd4072a118402e97fe88d26c',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-kconfig',
     },
@@ -1329,8 +1207,7 @@ return {
   },
   kdl = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '49fb89a854d93b58a65a19724ac307195ca11941',
+      revision = 'b37e3d58e5c5cf8d739b315d6114e02d42e66664',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-kdl',
     },
     maintainers = { '@amaanq' },
@@ -1338,7 +1215,6 @@ return {
   },
   kotlin = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'c9cb8504b81684375e7beb8907517dbd6947a1be',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
@@ -1347,8 +1223,7 @@ return {
   },
   koto = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = 'eb8d866cff5751c0a7650623d244280618b0a378',
+      revision = 'd4109879ba1387d19095269a7473bd7d274ab848',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1356,7 +1231,6 @@ return {
   },
   kusto = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '8353a1296607d6ba33db7c7e312226e5fc83e8ce',
       url = 'https://github.com/Willem-J-an/tree-sitter-kusto',
     },
@@ -1365,7 +1239,6 @@ return {
   },
   lalrpop = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '854a40e99f7c70258e522bdb8ab584ede6196e2e',
       url = 'https://github.com/traxys/tree-sitter-lalrpop',
     },
@@ -1374,7 +1247,6 @@ return {
   },
   latex = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
       revision = 'cd82eb40d31bdfe65f846f4e06292d6c804b5e0e',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
@@ -1384,7 +1256,6 @@ return {
   },
   ledger = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '8a841fb20ce683bfbb3469e6ba67f2851cfdf94a',
       url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
@@ -1393,7 +1264,6 @@ return {
   },
   leo = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '304611b5eaf53aca07459a0a03803b83b6dfd3b3',
       url = 'https://github.com/r001/tree-sitter-leo',
     },
@@ -1402,7 +1272,6 @@ return {
   },
   linkerscript = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f99011a3554213b654985a4b0a65b3b032ec4621',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-linkerscript',
     },
@@ -1411,8 +1280,7 @@ return {
   },
   liquid = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '293369818da219d97327908aab33707b04b63fd9',
+      revision = '0419ac4868585320eee8615c90b864a1b04ef433',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1420,7 +1288,6 @@ return {
   },
   liquidsoap = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '14feafa91630afb1ab9988cf9b738b7ea29f3f89',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
@@ -1429,7 +1296,6 @@ return {
   },
   llvm = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '1b96e58faf558ce057d4dc664b904528aee743cb',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
@@ -1438,7 +1304,6 @@ return {
   },
   lua = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'a24dab177e58c9c6832f96b9a73102a0cfbced4a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
@@ -1447,7 +1312,6 @@ return {
   },
   luadoc = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '873612aadd3f684dd4e631bdf42ea8990c57634e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-luadoc',
     },
@@ -1456,8 +1320,7 @@ return {
   },
   luap = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = '31461ae9bd0866cb5117cfe5de71189854fd0f3e',
+      revision = 'c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-luap',
     },
     maintainers = { '@amaanq' },
@@ -1466,7 +1329,6 @@ return {
   },
   luau = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '5aa9b88a8e3327276ec6e72de997f04ac80b1ae4',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-luau',
@@ -1477,7 +1339,6 @@ return {
   },
   m68k = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'd097b123f19c6eaba2bf181c05420d88b9fc489d',
       url = 'https://github.com/grahambates/tree-sitter-m68k',
     },
@@ -1486,7 +1347,6 @@ return {
   },
   make = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'a4b9187417d6be349ee5fd4b6e77b4172c6827dd',
       url = 'https://github.com/alemuller/tree-sitter-make',
     },
@@ -1495,7 +1355,6 @@ return {
   },
   markdown = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'tree-sitter-markdown',
       revision = '7fe453beacecf02c86f7736439f238f5bb8b5c9b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
@@ -1507,7 +1366,6 @@ return {
   },
   markdown_inline = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'tree-sitter-markdown-inline',
       revision = '7fe453beacecf02c86f7736439f238f5bb8b5c9b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
@@ -1518,7 +1376,6 @@ return {
   },
   matlab = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '79d8b25f57b48f83ae1333aff6723b83c9532e37',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
@@ -1527,7 +1384,6 @@ return {
   },
   menhir = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'be8866a6bcc2b563ab0de895af69daeffa88fe70',
       url = 'https://github.com/Kerl13/tree-sitter-menhir',
     },
@@ -1536,7 +1392,6 @@ return {
   },
   mermaid = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '90ae195b31933ceb9d079abfa8a3ad0a36fee4cc',
       url = 'https://github.com/monaqa/tree-sitter-mermaid',
     },
@@ -1544,7 +1399,6 @@ return {
   },
   meson = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'bd17c824196ce70800f64ad39cfddd1b17acc13f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
@@ -1553,7 +1407,6 @@ return {
   },
   mlir = {
     install_info = {
-      files = { 'src/parser.c' },
       generate = true,
       revision = '00c32d8562dc957b187da110a3443307962b8da8',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
@@ -1563,7 +1416,6 @@ return {
   },
   muttrc = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '90ef60852c410bd964cd3b954366e4c403c17314',
       url = 'https://github.com/neomutt/tree-sitter-muttrc',
     },
@@ -1572,7 +1424,6 @@ return {
   },
   nasm = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '570f3d7be01fffc751237f4cfcf52d04e20532d1',
       url = 'https://github.com/naclsn/tree-sitter-nasm',
     },
@@ -1589,15 +1440,13 @@ return {
   },
   nickel = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '0a796f3a312917724c1d9f486a201f7402a8acfd',
+      revision = '43433d8477b24cd13acaac20a66deda49b7e2547',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 4,
   },
   nim = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '961c2798cec9250c44f7d7225ddb33d47d25856a',
       url = 'https://github.com/alaviss/tree-sitter-nim',
     },
@@ -1607,7 +1456,6 @@ return {
   },
   nim_format_string = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'd45f75022d147cda056e98bfba68222c9c8eca3a',
       url = 'https://github.com/aMOPel/tree-sitter-nim-format-string',
     },
@@ -1616,7 +1464,6 @@ return {
   },
   ninja = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '0a95cfdc0745b6ae82f60d3a339b37f19b7b9267',
       url = 'https://github.com/alemuller/tree-sitter-ninja',
     },
@@ -1625,7 +1472,6 @@ return {
   },
   nix = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'b3cda619248e7dd0f216088bd152f59ce0bbe488',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
@@ -1634,7 +1480,6 @@ return {
   },
   nqc = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = '14e6da1627aaef21d2b2aa0c37d04269766dcc1d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-nqc',
@@ -1652,7 +1497,6 @@ return {
   },
   objc = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = '62e61b6f5c0289c376d61a8c91faf6435cde9012',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-objc',
@@ -1663,7 +1507,6 @@ return {
   },
   objdump = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '28d3b2e25a0b1881d1b47ed1924ca276c7003d45',
       url = 'https://github.com/ColinKennedy/tree-sitter-objdump',
     },
@@ -1672,7 +1515,6 @@ return {
   },
   ocaml = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'grammars/ocaml',
       revision = '0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
@@ -1682,7 +1524,6 @@ return {
   },
   ocaml_interface = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'grammars/interface',
       revision = '0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
@@ -1693,7 +1534,6 @@ return {
   },
   ocamllex = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
       revision = '4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2',
       url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
@@ -1703,7 +1543,6 @@ return {
   },
   odin = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'd37b8f24f653378b268ec18404e9c14ad355b128',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-odin',
     },
@@ -1712,7 +1551,6 @@ return {
   },
   pascal = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'a9ee969dec5b2e3b2ccccc5954fec04100c7619e',
       url = 'https://github.com/Isopod/tree-sitter-pascal',
     },
@@ -1721,7 +1559,6 @@ return {
   },
   passwd = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '20239395eacdc2e0923a7e5683ad3605aee7b716',
       url = 'https://github.com/ath3/tree-sitter-passwd',
     },
@@ -1730,7 +1567,6 @@ return {
   },
   pem = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-pem',
     },
@@ -1740,7 +1576,6 @@ return {
   perl = {
     install_info = {
       branch = 'release',
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '309cb8d33bcfd0a81050b21be08f9eb3f2fe2138',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
@@ -1750,9 +1585,8 @@ return {
   },
   php = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'php',
-      revision = 'b38c53537769df05871643c9688c264074fb6076',
+      revision = '4f124bc6075e1c3333e80190c1c170933ed72c95',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1762,9 +1596,8 @@ return {
   },
   php_only = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'php_only',
-      revision = 'b38c53537769df05871643c9688c264074fb6076',
+      revision = '4f124bc6075e1c3333e80190c1c170933ed72c95',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1773,7 +1606,6 @@ return {
   },
   phpdoc = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc',
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
@@ -1783,7 +1615,6 @@ return {
   },
   pioasm = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '924aadaf5dea2a6074d72027b064f939acf32e20',
       url = 'https://github.com/leo60228/tree-sitter-pioasm',
     },
@@ -1792,7 +1623,6 @@ return {
   },
   po = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'bd860a0f57f697162bf28e576674be9c1500db5e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-po',
     },
@@ -1802,7 +1632,6 @@ return {
   pod = {
     install_info = {
       branch = 'release',
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '39da859947b94abdee43e431368e1ae975c0a424',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
@@ -1812,7 +1641,6 @@ return {
   },
   poe_filter = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '592476d81f95d2451f2ca107dc872224c76fecdf',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-poe-filter',
     },
@@ -1822,7 +1650,6 @@ return {
   },
   pony = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '73ff874ae4c9e9b45462673cbc0a1e350e2522a7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-pony',
     },
@@ -1840,7 +1667,6 @@ return {
   },
   printf = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '0e0aceabbf607ea09e03562f5d8a56f048ddea3d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-printf',
     },
@@ -1849,7 +1675,6 @@ return {
   },
   prisma = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'eca2596a355b1a9952b4f80f8f9caed300a272b5',
       url = 'https://github.com/victorhqc/tree-sitter-prisma',
     },
@@ -1879,7 +1704,6 @@ return {
   },
   promql = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '77625d78eebc3ffc44d114a07b2f348dff3061b0',
       url = 'https://github.com/MichaHoffmann/tree-sitter-promql',
     },
@@ -1888,7 +1712,6 @@ return {
   },
   properties = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '9d09f5f200c356c50c4103d36441309fd61b48d1',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-properties',
     },
@@ -1898,7 +1721,6 @@ return {
   },
   proto = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'e9f6b43f6844bd2189b50a422d4e2094313f6aa3',
       url = 'https://github.com/treywood/tree-sitter-proto',
     },
@@ -1907,7 +1729,6 @@ return {
   },
   prql = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '09e158cd3650581c0af4c49c2e5b10c4834c8646',
       url = 'https://github.com/PRQL/tree-sitter-prql',
     },
@@ -1916,7 +1737,6 @@ return {
   },
   psv = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'psv',
       revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
@@ -1927,7 +1747,6 @@ return {
   },
   pug = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'a7ff31a38908df9b9f34828d21d6ca5e12413e18',
       url = 'https://github.com/zealot128/tree-sitter-pug',
     },
@@ -1936,7 +1755,6 @@ return {
   },
   puppet = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '584522f32495d648b18a53ccb52d988e60de127d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-puppet',
     },
@@ -1945,7 +1763,6 @@ return {
   },
   purescript = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'daf9b3e2be18b0b2996a1281f7783e0d041d8b80',
       url = 'https://github.com/postsolar/tree-sitter-purescript',
     },
@@ -1954,8 +1771,7 @@ return {
   },
   pymanifest = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = 'e3b82b78721aee07f676dac8473ae69db51debcf',
+      revision = 'be062582956165019d3253794b4d712f66dfeaaa',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-pymanifest',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1964,7 +1780,6 @@ return {
   },
   python = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '71778c2a472ed00a64abf4219544edbf8e4b86d7',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
@@ -1973,7 +1788,6 @@ return {
   },
   ql = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '42becd6f8f7bae82c818fa3abb1b6ff34b552310',
       url = 'https://github.com/tree-sitter/tree-sitter-ql',
     },
@@ -1982,7 +1796,6 @@ return {
   },
   qmldir = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '6b2b5e41734bd6f07ea4c36ac20fb6f14061c841',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-qmldir',
     },
@@ -1991,9 +1804,8 @@ return {
   },
   qmljs = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
-      revision = '2c57cac27e207425f8df15327884434cb12365a3',
+      revision = 'febf48a5b6928600cd8fb2a01254743af550780d',
       url = 'https://github.com/yuja/tree-sitter-qmljs',
     },
     maintainers = { '@Decodetalkers' },
@@ -2002,7 +1814,6 @@ return {
   },
   query = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
@@ -2012,7 +1823,6 @@ return {
   },
   r = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '391400572538ff9854341a175ed8ab4b1e45f44b',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
@@ -2021,7 +1831,6 @@ return {
   },
   racket = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '171f52a8c0ed635b85cd42d1e36d82f1066a03b4',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
@@ -2029,7 +1838,6 @@ return {
   },
   ralph = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0',
       url = 'https://github.com/alephium/tree-sitter-ralph',
     },
@@ -2038,7 +1846,6 @@ return {
   },
   rasi = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa',
       url = 'https://github.com/Fymyte/tree-sitter-rasi',
     },
@@ -2057,8 +1864,7 @@ return {
   },
   rbs = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = 'e5e807a50fcd104a2d740d354632fc671700a0bf',
+      revision = '88d8ed487b5449ddda2fc0c4fe23b71cba29ca24',
       url = 'https://github.com/joker1007/tree-sitter-rbs',
     },
     maintainers = { '@joker1007' },
@@ -2066,7 +1872,6 @@ return {
   },
   re2c = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '47aa19cf5f7aba2ed30e2b377f7172df76e819a6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-re2c',
     },
@@ -2075,7 +1880,6 @@ return {
   },
   readline = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '3d4768b04d7cfaf40533e12b28672603428b8f31',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-readline',
     },
@@ -2084,7 +1888,6 @@ return {
   },
   regex = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '47007f195752d8e57bda80b0b6cdb2d173a9f7d7',
       url = 'https://github.com/tree-sitter/tree-sitter-regex',
     },
@@ -2093,8 +1896,7 @@ return {
   },
   rego = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = '23b1da8de9766d766c4f01531e8be14b5c00c493',
+      revision = '20b5a5958c837bc9f74b231022a68a594a313f6d',
       url = 'https://github.com/FallenAngel97/tree-sitter-rego',
     },
     maintainers = { '@FallenAngel97' },
@@ -2102,8 +1904,7 @@ return {
   },
   requirements = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = '360c6a6b31076a482663806f7a8241de9cad6b4e',
+      revision = '5ad9b7581b3334f6ad492847d007f2fac6e6e5f2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-requirements',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2120,7 +1921,6 @@ return {
   },
   rnoweb = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '1a74dc0ed731ad07db39f063e2c5a6fe528cae7f',
       url = 'https://github.com/bamonroe/tree-sitter-rnoweb',
     },
@@ -2129,7 +1929,6 @@ return {
   },
   robot = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '322e4cc65754d2b3fdef4f2f8a71e0762e3d13af',
       url = 'https://github.com/Hubro/tree-sitter-robot',
     },
@@ -2146,8 +1945,7 @@ return {
   },
   roc = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '7df2c0892e62efb81a7504d9799d4e0d0443d241',
+      revision = 'df46a85abda9f948d38f5d4e3684cec49c42fef2',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
@@ -2155,7 +1953,6 @@ return {
   },
   ron = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '78938553b93075e638035f624973083451b29055',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ron',
     },
@@ -2164,7 +1961,6 @@ return {
   },
   rst = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '5120f6e59284cb8b85b450bd2db0bd352635ba9f',
       url = 'https://github.com/stsewd/tree-sitter-rst',
     },
@@ -2173,7 +1969,6 @@ return {
   },
   ruby = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
@@ -2190,7 +1985,6 @@ return {
   },
   rust = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '9c84af007b0f144954adb26b3f336495cbb320a7',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
@@ -2199,7 +1993,6 @@ return {
   },
   scala = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'b76db435a7f876cf1ede837d66054c534783c72f',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
@@ -2208,17 +2001,15 @@ return {
   },
   scfg = {
     install_info = {
-      files = { 'src/parser.c' },
       generate = true,
       revision = '6deae0cbb458c849a4d1e2985093e9c9c32d7fd0',
       url = 'https://github.com/rockorager/tree-sitter-scfg',
     },
     maintainers = { '@WhyNotHugo' },
-    tier = 3,
+    tier = 4,
   },
   scheme = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '8f9dff3d038f09934db5ea113cebc59c74447743',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
@@ -2226,7 +2017,6 @@ return {
   },
   scss = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'c478c6868648eff49eb04a4df90d703dc45b312a',
       url = 'https://github.com/serenadeai/tree-sitter-scss',
     },
@@ -2246,7 +2036,6 @@ return {
   },
   slang = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '865d79e236c7f0e04276c969453d021d1da4b15f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
@@ -2265,7 +2054,6 @@ return {
   },
   slint = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'd82ab8c19ea1b60ff570256eaef7d137cc5ecb63',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
@@ -2274,7 +2062,6 @@ return {
   },
   smali = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'fdfa6a1febc43c7467aa7e937b87b607956f2346',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-smali',
     },
@@ -2283,7 +2070,6 @@ return {
   },
   smithy = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'fa898ac0885d1da9a253695c3e0e91f5efc587cd',
       url = 'https://github.com/indoorvivants/tree-sitter-smithy',
     },
@@ -2292,9 +2078,8 @@ return {
   },
   snakemake = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
-      revision = 'ba1b3868eaa960b945593404af9a7c2f296d3643',
+      revision = '5a7b14074bca95b25935e865ca8f1efad32317e4',
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
     },
     maintainers = { '@osthomas' },
@@ -2302,8 +2087,7 @@ return {
   },
   solidity = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = '1c94fe3d5351dfcff3551ec1f49614cbf758e444',
+      revision = 'ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c',
       url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
@@ -2311,7 +2095,6 @@ return {
   },
   soql = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'soql',
       revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
@@ -2321,7 +2104,6 @@ return {
   },
   sosl = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'sosl',
       revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
@@ -2331,8 +2113,7 @@ return {
   },
   sourcepawn = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
-      revision = '64ad670dd59e88c5d32bc3d759ae8562b522cad9',
+      revision = '645d093763bcaaf7535edbdf6575a5c978b16491',
       url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
     },
     maintainers = { '@Sarrus1' },
@@ -2340,7 +2121,6 @@ return {
   },
   sparql = {
     install_info = {
-      files = { 'src/parser.c' },
       generate_from_json = true,
       revision = '05f949d3c1c15e3261473a244d3ce87777374dec',
       url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
@@ -2351,9 +2131,8 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
-      revision = '6a99f4aff780f98bc119c7f034406e41d7e0b80d',
+      revision = '89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2361,7 +2140,6 @@ return {
   },
   squirrel = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '0a50d31098e83c668d34d1160a0f6c7d23b571cc',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-squirrel',
     },
@@ -2370,7 +2148,6 @@ return {
   },
   ssh_config = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '77450e8bce8853921512348f83c73c168c71fdfb',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ssh-config',
     },
@@ -2379,7 +2156,6 @@ return {
   },
   starlark = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '018d0e09d9d0f0dd6740a37682b8ee4512e8b2ac',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-starlark',
@@ -2389,7 +2165,6 @@ return {
   },
   strace = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'd819cdd5dbe455bd3c859193633c8d91c0df7c36',
       url = 'https://github.com/sigmaSd/tree-sitter-strace',
     },
@@ -2398,7 +2173,6 @@ return {
   },
   styled = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '65835cca33a5f033bcde580ed66cde01c1fabbbe',
       url = 'https://github.com/mskelton/tree-sitter-styled',
@@ -2408,7 +2182,6 @@ return {
   },
   supercollider = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'affa4389186b6939d89673e1e9d2b28364f5ca6f',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
@@ -2426,7 +2199,6 @@ return {
   },
   surface = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'f4586b35ac8548667a9aaa4eae44456c1f43d032',
       url = 'https://github.com/connorlay/tree-sitter-surface',
     },
@@ -2435,9 +2207,8 @@ return {
   },
   svelte = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
-      revision = '2c97326cd96b7c3016c3d249e8dc244c89b4abeb',
+      revision = '7218cf622b057ae9c530e1f0a7a3ce49806ca55e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
     },
     maintainers = { '@amaanq' },
@@ -2454,9 +2225,8 @@ return {
   },
   swift = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
-      revision = '26354ddec08c7efde4fa16bd29429f3310d2e2c5',
+      revision = '13ffaec4068facfff608e3afbdb7a581c185f6a6',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2464,7 +2234,6 @@ return {
   },
   sxhkdrc = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '440d5f913d9465c9c776a1bd92334d32febcf065',
       url = 'https://github.com/RaafatTurki/tree-sitter-sxhkdrc',
     },
@@ -2473,7 +2242,6 @@ return {
   },
   systemtap = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '1af543a96d060b1f808982037bfc54cc02218edd',
       url = 'https://github.com/ok-ryoko/tree-sitter-systemtap',
     },
@@ -2482,7 +2250,6 @@ return {
   },
   t32 = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '6182836f4128725f1e74ce986840d7317021a015',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
@@ -2491,7 +2258,6 @@ return {
   },
   tablegen = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'b1170880c61355aaf38fc06f4af7d3c55abdabc4',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tablegen',
     },
@@ -2500,7 +2266,6 @@ return {
   },
   tact = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '034df2162ed7b654efd999942e266be713c7cde0',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
@@ -2509,7 +2274,6 @@ return {
   },
   tcl = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '8784024358c233efd0f3a6fd9e7a3c5852e628bc',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
@@ -2526,7 +2290,6 @@ return {
   },
   teal = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
       revision = '19b02da829d1721a521bf7b802eb80a50bd53aab',
       url = 'https://github.com/euclidianAce/tree-sitter-teal',
@@ -2536,7 +2299,6 @@ return {
   },
   templ = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = 'cf84ea53e2e2531f23009d676ac206090c1e2392',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
@@ -2546,7 +2308,6 @@ return {
   },
   terraform = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'dialects/terraform',
       revision = 'e936d3fef8bac884661472dce71ad82284761eb1',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
@@ -2557,7 +2318,6 @@ return {
   },
   textproto = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '8dacf02aa402892c91079f8577998ed5148c0496',
       url = 'https://github.com/PorterAtGoogle/tree-sitter-textproto',
     },
@@ -2566,7 +2326,6 @@ return {
   },
   thrift = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '68fd0d80943a828d9e6f49c58a74be1e9ca142cf',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-thrift',
     },
@@ -2575,7 +2334,6 @@ return {
   },
   tiger = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'a7f11d946b44244f71df41d2a78af0665d618dae',
       url = 'https://github.com/ambroisie/tree-sitter-tiger',
     },
@@ -2584,7 +2342,6 @@ return {
   },
   tlaplus = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '200f9dab6b23f3b9bb8f67fc811221517f56c373',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
@@ -2593,7 +2350,6 @@ return {
   },
   tmux = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '9138ea508410e0f34da2666609f600f65e944f22',
       url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
@@ -2602,7 +2358,6 @@ return {
   },
   todotxt = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '3937c5cd105ec4127448651a21aef45f52d19609',
       url = 'https://github.com/arnarg/tree-sitter-todotxt',
     },
@@ -2611,7 +2366,6 @@ return {
   },
   toml = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '16a30c83ce427385b8d14939c45c137fcfca6c42',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-toml',
@@ -2621,7 +2375,6 @@ return {
   },
   tsv = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'tsv',
       revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
@@ -2631,7 +2384,6 @@ return {
   },
   tsx = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       location = 'tsx',
       revision = '4ad3010c91d700026d036b5230e2d99ba94ae8a4',
@@ -2643,7 +2395,6 @@ return {
   },
   turtle = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '085437f5cb117703b7f520dd92161140a684f092',
       url = 'https://github.com/GordianDziwis/tree-sitter-turtle',
     },
@@ -2652,8 +2403,7 @@ return {
   },
   twig = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = 'eaf80e6af969e25993576477a9dbdba3e48c1305',
+      revision = '085648e01d1422163a1702a44e72303b4e2a0bd1',
       url = 'https://github.com/gbprod/tree-sitter-twig',
     },
     maintainers = { '@gbprod' },
@@ -2661,7 +2411,6 @@ return {
   },
   typescript = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       location = 'typescript',
       revision = '4ad3010c91d700026d036b5230e2d99ba94ae8a4',
@@ -2673,7 +2422,6 @@ return {
   },
   typespec = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '28821d0d6da5f0a6b5eb02b9bad953fecafd7248',
       url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
@@ -2682,7 +2430,6 @@ return {
   },
   typoscript = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '43b221c0b76e77244efdaa9963e402a17c930fbc',
       url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
     },
@@ -2691,7 +2438,6 @@ return {
   },
   typst = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '3924cb9ed9e0e62ce7df9c4fe0faa4c234795999',
       url = 'https://github.com/uben0/tree-sitter-typst',
     },
@@ -2700,7 +2446,6 @@ return {
   },
   udev = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '8f58696e79092b4ad6bf197415bbd0970acf15cd',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-udev',
     },
@@ -2709,7 +2454,6 @@ return {
   },
   ungrammar = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'debd26fed283d80456ebafa33a06957b0c52e451',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ungrammar',
     },
@@ -2718,7 +2462,6 @@ return {
   },
   unison = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate = true,
       revision = '59d36a09282be7e4d3374854126590f3dcebee6e',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
@@ -2728,7 +2471,6 @@ return {
   },
   usd = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216',
       url = 'https://github.com/ColinKennedy/tree-sitter-usd',
     },
@@ -2737,7 +2479,6 @@ return {
   },
   uxntal = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'ad9b638b914095320de85d59c49ab271603af048',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-uxntal',
     },
@@ -2746,9 +2487,8 @@ return {
   },
   v = {
     install_info = {
-      files = { 'src/parser.c' },
       location = 'tree_sitter_v',
-      revision = '7e11a6f8f369df935664fadd2f0c99d90fe3226f',
+      revision = 'e91f8a42de7842f24f4ce600754f2b6651985fd4',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2756,7 +2496,6 @@ return {
   },
   vala = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b',
       url = 'https://github.com/vala-lang/tree-sitter-vala',
     },
@@ -2765,7 +2504,6 @@ return {
   },
   vento = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '3321077d7446c1b3b017c294fd56ce028ed817fe',
       url = 'https://github.com/ventojs/tree-sitter-vento',
     },
@@ -2774,7 +2512,6 @@ return {
   },
   verilog = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '075ebfc84543675f12e79a955f79d717772dcef3',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
@@ -2791,7 +2528,6 @@ return {
   },
   vhs = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '90028bbadb267ead5b87830380f6a825147f0c0f',
       url = 'https://github.com/charmbracelet/tree-sitter-vhs',
     },
@@ -2800,7 +2536,6 @@ return {
   },
   vim = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'b448ca63f972ade12c373c808acdd2bf972937db',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
@@ -2809,8 +2544,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      files = { 'src/parser.c' },
-      revision = 'b711df784dd43d0a8ed8ddbfca0ddcc3239d94b4',
+      revision = '2249c44ecd3f5cf22da3dcccfb74f816ddb29245',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2827,7 +2561,6 @@ return {
   vue = {
     install_info = {
       branch = 'main',
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
@@ -2838,7 +2571,6 @@ return {
   },
   wgsl = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '40259f3c77ea856841a4e0c4c807705f3e4a2b65',
       url = 'https://github.com/szebniok/tree-sitter-wgsl',
     },
@@ -2847,7 +2579,6 @@ return {
   },
   wgsl_bevy = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
       revision = '1e12c7925c41bb09818d86e30cd78644fde7d31a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
@@ -2857,7 +2588,6 @@ return {
   },
   wing = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7',
       url = 'https://github.com/winglang/tree-sitter-wing',
     },
@@ -2866,7 +2596,6 @@ return {
   },
   wit = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = 'cab94791450524a542324d8cbe8017d69c516d8e',
       url = 'https://github.com/liamwh/tree-sitter-wit',
     },
@@ -2875,7 +2604,6 @@ return {
   },
   xcompose = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '2383cc69a2c42cfade41c7cb971fb3862bec6df1',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xcompose',
     },
@@ -2884,7 +2612,6 @@ return {
   },
   xml = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'xml',
       revision = '648183d86f6f8ffb240ea11b4c6873f6f45d8b67',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
@@ -2903,7 +2630,6 @@ return {
   },
   yaml = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = '7b03feefd36b5f155465ca736c6304aca983b267',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
     },
@@ -2912,7 +2638,6 @@ return {
   },
   yang = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502',
       url = 'https://github.com/Hubro/tree-sitter-yang',
     },
@@ -2921,7 +2646,6 @@ return {
   },
   yuck = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       revision = 'e877f6ade4b77d5ef8787075141053631ba12318',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yuck',
     },
@@ -2930,7 +2654,6 @@ return {
   },
   zathurarc = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068',
       url = 'https://github.com/Freed-Wu/tree-sitter-zathurarc',
     },
@@ -2939,7 +2662,6 @@ return {
   },
   zig = {
     install_info = {
-      files = { 'src/parser.c' },
       revision = '0d08703e4c3f426ec61695d7617415fff97029bd',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
     },
diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index a4c236ec3..82b2900ac 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -28,7 +28,7 @@ local filetypes = {
   latex = { 'tex' },
   m68k = { 'asm68k' },
   make = { 'automake' },
-  markdown = { 'pandoc', 'quarto', 'rmd' },
+  markdown = { 'pandoc' },
   muttrc = { 'neomuttrc' },
   ocaml_interface = { 'ocamlinterface' },
   perl = { 'pl' },
diff --git a/scripts/convert-lockfile.lua b/scripts/convert-lockfile.lua
index e0a694897..5759c0426 100755
--- a/scripts/convert-lockfile.lua
+++ b/scripts/convert-lockfile.lua
@@ -9,6 +9,7 @@ local lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,
 for k, p in pairs(parsers) do
   if p.install_info then
     p.install_info.revision = lockfile[k].revision
+    p.install_info.files = nil
   end
 end
 
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 9f6f9a3de..5a8b1c17b 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -16,8 +16,8 @@ table.sort(sorted_parsers, function(a, b)
 end)
 
 local generated_text = [[
-Language | Tier | Queries | CLI | Maintainer
--------- |:----:|:-------:|:---:| ----------
+Language | Tier | Queries | Maintainer
+-------- |:----:|:-------:| ----------
 ]]
 local footnotes = ''
 
@@ -58,11 +58,6 @@ for _, v in ipairs(sorted_parsers) do
     .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
     .. '` | '
 
-  -- CLI
-  generated_text = generated_text
-    .. (p.install_info and p.install_info.generate and '✓' or '')
-    .. ' | '
-
   -- Maintainer
   generated_text = generated_text
     .. (p.maintainers and table.concat(p.maintainers, ', ') or '')

From a8677385b77b9dd567cdb8b09e5f972a25c7c84d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 13 Jun 2024 12:30:57 +0200
Subject: [PATCH 2316/2704] feat(install)!: drop support for git

Problem: Using git for installing parsers can lead to data loss if in a
git commit buffer.

Solution: Only support downloading via curl+tar, which are installed on
all supported platforms (since Windows 10). Curl will also be required
for WASM parsers (and for `vim.net.download()`).
---
 SUPPORTED_LANGUAGES.md          |  45 +++--
 TODO.md                         |   8 +-
 lua/nvim-treesitter/health.lua  |  28 +--
 lua/nvim-treesitter/install.lua | 295 +++++++++++++++-----------------
 lua/nvim-treesitter/parsers.lua | 220 ++++++++++++------------
 5 files changed, 301 insertions(+), 295 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 1c72c9ba9..028caeaff 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -14,7 +14,7 @@ Language | Tier | Queries | Maintainer
 [ada](https://github.com/briot/tree-sitter-ada) | community | `HF JL` | @briot
 [agda](https://github.com/tree-sitter/tree-sitter-agda) | core | `HF J ` | @Decodetalkers
 [angular](https://github.com/dlvandenberg/tree-sitter-angular) | community | `HFIJL` | @dlvandenberg
-[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF JL` | @aheber
+[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF JL` | @aheber, @xixiafinland
 [arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | core | `HFIJL` | @ObserverOfTime
 [asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` | @RubixDev
 [astro](https://github.com/virchau13/tree-sitter-astro) | community | `HFIJL` | @virchau13
@@ -49,7 +49,7 @@ Language | Tier | Queries | Maintainer
 [dart](https://github.com/UserNobody14/tree-sitter-dart) | community | `HFIJL` | @akinsho
 [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` | @jedrzejboczar
 [dhall](https://github.com/jbellerb/tree-sitter-dhall) | community | `HF J ` | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H    ` | @gbprod
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H  J ` | @gbprod
 [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` | @ColinKennedy
 [djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` | @NoahTheDuke
 [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` | @camdencheek
@@ -59,10 +59,11 @@ Language | Tier | Queries | Maintainer
 [earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` | @glehmann
 [ebnf](https://github.com/RubixDev/ebnf) | community | `H  J ` | @RubixDev
 ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
+[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | community | `HF J ` | @ValdezFOmar
 [eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` | @uyha
 [eex](https://github.com/connorlay/tree-sitter-eex) | community | `H  J ` | @connorlay
 [elixir](https://github.com/elixir-lang/tree-sitter-elixir) | community | `HFIJL` | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) | community | `H  J ` | @zweimach
+[elm](https://github.com/elm-tooling/tree-sitter-elm) | community | `HF J ` | @zweimach
 [elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | community | `HFIJL` | @glapa-grossklag, @amaanq
 [elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` | @elves
 [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` | 
@@ -92,10 +93,11 @@ ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
 [gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | core | `HFIJL` | @amaanq
 [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` | @dpezto
 [go](https://github.com/tree-sitter/tree-sitter-go) | core | `HFIJL` | @theHamsta, @WinWisely268
+[goctl](https://github.com/chaozwn/tree-sitter-goctl) | community | `HFIJ ` | @chaozwn
 [godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | community | `HF JL` | @pierpo
 [gomod](https://github.com/camdencheek/tree-sitter-go-mod) | community | `H  J ` | @camdencheek
 [gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | core | `H    ` | @amaanq
-[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` | @qvalentin
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `HF JL` | @qvalentin
 [gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` | @omertuc
 [gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | core | `H  J ` | @ObserverOfTime
 [graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` | @bkegley
@@ -107,7 +109,7 @@ ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
 [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` | @lykahb
 [hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | core | `HFIJ ` | @MichaHoffmann
 [heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` | @connorlay
-[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `H  J ` | @qvalentin
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `HF JL` | @qvalentin
 [hjson](https://github.com/winston0410/tree-sitter-hjson) | community | `HFIJL` | @winston0410
 [hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | core | `HFIJL` | @theHamsta
 [hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` | @Freed-Wu
@@ -119,8 +121,8 @@ html_tags (queries only)[^html_tags] | community | `H IJ ` | @TravonteD
 [http](https://github.com/rest-nvim/tree-sitter-http) | community | `H  J ` | @amaanq, @NTBBloodbath
 [hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` | @pfeiferj
 [hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | core | `HFIJ ` | @luckasRanarison
-[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H  J ` | @cathaysa
-[ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF   ` | @theHamsta
+[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H IJ ` | @cathaysia
+[ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF J ` | @theHamsta
 [inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` | @yorickpeterse
 [ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | core | `HFIJL` | @fab4100
 [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` | @sogaiu
@@ -163,11 +165,12 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [mlir](https://github.com/artagnon/tree-sitter-mlir) | community | `H  JL` | @artagnon
 [muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` | @Freed-Wu
 [nasm](https://github.com/naclsn/tree-sitter-nasm) | community | `H  J ` | @ObserverOfTime
+[nginx](https://github.com/opa-oz/tree-sitter-nginx) | community | `HF J ` | @opa-oz
 [nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H IJ ` | 
 [nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` | @aMOPel
 [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` | @aMOPel
 [ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFIJ ` | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HF JL` | @leo60228
+[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HFIJL` | @leo60228
 [nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | core | `HFIJL` | @amaanq
 [objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | core | `HFIJL` | @amaanq
 [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` | @ColinKennedy
@@ -188,8 +191,11 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` | @RabbiVeesh, @LeoNerd
 [poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | core | `HFIJ ` | @ObserverOfTime
 [pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | core | `HFIJL` | @amaanq, @mfelsche
+[powershell](https://github.com/airbus-cert/tree-sitter-powershell) | community | `HFIJL` | @L2jLiga
 [printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | core | `H    ` | @ObserverOfTime
 [prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `HF J ` | @elianiva
+[problog](https://github.com/foxyseta/tree-sitter-prolog) | community | `HFIJ ` | @foxyseta
+[prolog](https://github.com/foxyseta/tree-sitter-prolog) | community | `HFIJ ` | @foxyseta
 [promql](https://github.com/MichaHoffmann/tree-sitter-promql) | community | `H  J ` | @MichaHoffmann
 [properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | core | `H  JL` | @ObserverOfTime
 [proto](https://github.com/treywood/tree-sitter-proto) | community | `HF J ` | @treywood
@@ -204,7 +210,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | core | `H  J ` | @amaanq
 [qmljs](https://github.com/yuja/tree-sitter-qmljs) | community | `HF J ` | @Decodetalkers
 [query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | stable | `HFIJL` | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` | @echasnovski
+[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` | @ribru17
 [racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` | 
 [ralph](https://github.com/alephium/tree-sitter-ralph) | community | `H  J ` | @tdroxler
 [rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` | @Fymyte
@@ -214,27 +220,30 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [regex](https://github.com/tree-sitter/tree-sitter-regex) | core | `H    ` | @theHamsta
 [rego](https://github.com/FallenAngel97/tree-sitter-rego) | community | `H  J ` | @FallenAngel97
 [requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | core | `H  J ` | @ObserverOfTime
+[rescript](https://github.com/rescript-lang/tree-sitter-rescript) | core | `HFIJL` | @ribru17
 [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | community | `HF J ` | @bamonroe
 [robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFIJ ` | @Hubro
+[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | community | `H  J ` | @opa-oz
 [roc](https://github.com/faldor20/tree-sitter-roc) | community | `H  JL` | @nat-418
 [ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | core | `HFIJL` | @amaanq
 [rst](https://github.com/stsewd/tree-sitter-rst) | community | `H  JL` | @stsewd
 [ruby](https://github.com/tree-sitter/tree-sitter-ruby) | core | `HFIJL` | @TravonteD
 [rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` | @amaanq
 [scala](https://github.com/tree-sitter/tree-sitter-scala) | core | `HF JL` | @stevanmilic
-[scfg](https://git.sr.ht/~rockorager/tree-sitter-scfg) | unsupported | `H  J ` | @WhyNotHugo
+[scfg](https://github.com/rockorager/tree-sitter-scfg) | unsupported | `H  J ` | @WhyNotHugo
 [scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` | 
 [scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFIJ ` | @elianiva
+[sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | community | `H    ` | @aheber, @xixiaofinland
 [slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | core | `HFIJL` | @theHamsta
 [slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` | @hunger
 [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` | @amaanq
 [smithy](https://github.com/indoorvivants/tree-sitter-smithy) | community | `H  J ` | @amaanq, @keynmol
 [snakemake](https://github.com/osthomas/tree-sitter-snakemake) | community | `HFIJL` | @osthomas
 [solidity](https://github.com/JoranHonig/tree-sitter-solidity) | community | `HF J ` | @amaanq
-[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber
-[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber
+[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber, @xixiafinland
+[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber, @xixiafinland
 [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` | @Sarrus1
-[sparql](https://github.com/BonaBeavis/tree-sitter-sparql) | community | `HFIJL` | @BonaBeavis
+[sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | community | `HFIJL` | @GordianDziwis
 [sql](https://github.com/derekstride/tree-sitter-sql) | community | `H IJ ` | @derekstride
 [squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | core | `HFIJL` | @amaanq
 [ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | core | `HFIJL` | @ObserverOfTime
@@ -247,12 +256,13 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H IJL` | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` | @ok-ryoko
+[systemverilog](https://github.com/zhangwwpeng/tree-sitter-systemverilog) | community | `HF J ` | @zhangwwpeng
 [t32](https://gitlab.com/xasc/tree-sitter-t32) | community | `HFIJL` | @xasc
 [tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | core | `HFIJL` | @amaanq
 [tact](https://github.com/tact-lang/tree-sitter-tact) | community | `HFIJL` | @novusnota
 [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFIJ ` | @lewis6991
 [teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | @euclidianAce
-[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `H  J ` | @vrischmann
+[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `HF J ` | @vrischmann
 [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` | @MichaHoffmann
 [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFIJ ` | @Porter
 [thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | core | `HFIJL` | @amaanq, @duskmoon314
@@ -263,7 +273,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | core | `HFIJL` | @tk-shirasaka
 [tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
 [tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` | @steelsojka
-[turtle](https://github.com/BonaBeavis/tree-sitter-turtle) | community | `HFIJL` | @BonaBeavis
+[turtle](https://github.com/GordianDziwis/tree-sitter-turtle) | community | `HFIJL` | @GordianDziwis
 [twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` | @gbprod
 [typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` | @steelsojka
 [typespec](https://github.com/happenslol/tree-sitter-typespec) | community | `H IJ ` | @happenslol
@@ -278,14 +288,16 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF J ` | @Prince781
 [vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` | @wrapperup, @oscarotero
 [verilog](https://github.com/tree-sitter/tree-sitter-verilog) | core | `HF JL` | @zegervdv
+[vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | community | `HF J ` | @jpt13653903
 [vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H  J ` | @caarlos0
 [vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | stable | `HF JL` | @clason
 [vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | stable | `H  J ` | @clason
+[vrl](https://github.com/belltoy/tree-sitter-vrl) | community | `HFIJL` | @belltoy
 [vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | core | `HFIJ ` | @WhyNotHugo, @lucario387
 [wgsl](https://github.com/szebniok/tree-sitter-wgsl) | community | `HFIJ ` | @szebniok
 [wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | core | `HFI  ` | @theHamsta
 [wing](https://github.com/winglang/tree-sitter-wing) | community | `HF JL` | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | community | `H  J ` | @liamwh
+[wit](https://github.com/liamwh/tree-sitter-wit) | community | `HF J ` | @liamwh
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | core | `H  JL` | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` | @ObserverOfTime
 [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` | @amaanq
@@ -308,5 +320,6 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [^poe_filter]: Path of Exile item filter
 [^properties]: Java properties files
 [^query]: Tree-sitter query language
+[^sflog]: Salesforce debug log
 [^slang]: Shader Slang
 <!--parserinfo-->
diff --git a/TODO.md b/TODO.md
index fb0032c96..5aef3991c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,11 +5,13 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 ## TODO
 
 - [ ] **`parsers.lua`:** allow specifying version in addition to commit hash (for Tier 1)
-- [ ] **tests:** fix, update, extend (cover all Tier 1 languages)
+- [ ] **`parsers.lua`:** add WASM support (tier 1)
+- [ ] **`parsers.lua`:** update tiers (stable, dev, unmaintained, broken)
+- [ ] **tests:** fix, update (remove custom crate, plenary dependency)
 - [ ] **documentation:** consolidate, autogenerate?
 - [ ] **documentation:** migration guide
-- [ ] **`locals.lua`:** move to `nvim-treesitter-refactor`?
-- [ ] **textobjects:** include simple(!) function, queries? (check Helix)
+- [ ] **indents:** rewrite (Helix compatible)
+- [ ] **textobjects:** include simple(!) `node`, `scope` (using `locals`) objects
 - [ ] **downstream:** adapt to breaking changes (`nvim-treesitter-refactor`)
 
 ## DONE
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index dc7078bdf..30c3345d3 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -67,20 +67,28 @@ local function install_health()
     end
   end
 
-  do -- curl+tar or git check
-    local curl = check_exe('curl')
-    local tar = check_exe('tar')
+  do -- node check
+    local node = check_exe('node')
+    if node then
+      health.ok(string.format('node %s (%s)', node.version, node.path))
+    else
+      health.error('node not found')
+    end
+  end
 
-    if curl and tar and vim.uv.os_uname().sysname ~= 'Windows_NT' then
+  do -- curl+tar check
+    local tar = check_exe('tar')
+    if tar then
       health.ok(string.format('tar %s (%s)', tar.version, tar.path))
+    else
+      health.error('tar not found')
+    end
+
+    local curl = check_exe('curl')
+    if curl then
       health.ok(string.format('curl %s (%s)\n%s', curl.version, curl.path, curl.out))
     else
-      local git = check_exe('git')
-      if git then
-        health.ok(string.format('git %s (%s)', git.version, git.path))
-      else
-        health.error('Either curl and tar or git must be installed and on `$PATH`')
-      end
+      health.error('curl not found')
     end
   end
 
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index ac37c7af0..f9a52461c 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -8,25 +8,31 @@ local log = require('nvim-treesitter.log')
 local parsers = require('nvim-treesitter.parsers')
 local util = require('nvim-treesitter.util')
 
---- @type fun(path: string, new_path: string, flags?: table): string?
+---@type fun(path: string, new_path: string, flags?: table): string?
 local uv_copyfile = a.wrap(uv.fs_copyfile, 4)
 
---- @type fun(path: string, mode: integer): string?
+---@type fun(path: string, mode: integer): string?
 local uv_mkdir = a.wrap(uv.fs_mkdir, 3)
 
---- @type fun(path: string, new_path: string): string?
+---@type fun(path: string, new_path: string): string?
 local uv_rename = a.wrap(uv.fs_rename, 3)
 
---- @type fun(path: string, new_path: string, flags?: table): string?
+---@type fun(path: string, new_path: string, flags?: table): string?
 local uv_symlink = a.wrap(uv.fs_symlink, 4)
 
---- @type fun(path: string): string?
+---@type fun(path: string): string?
 local uv_unlink = a.wrap(uv.fs_unlink, 2)
 
-local max_jobs = 10
+local MAX_JOBS = 10
+local INSTALL_TIMEOUT = 60000
 
+---@async
+---@param cmd string[]
+---@param opts? vim.SystemOpts
+---@return vim.SystemCompleted
 local function system(cmd, opts)
-  log.trace('running job: (cwd=%s) %s', opts.cwd, table.concat(cmd, ' '))
+  local cwd = opts and opts.cwd or uv.cwd()
+  log.trace('running job: (cwd=%s) %s', cwd, table.concat(cmd, ' '))
   local r = a.wrap(vim.system, 3)(cmd, opts) --[[@as vim.SystemCompleted]]
   a.main()
   if r.stdout and r.stdout ~= '' then
@@ -39,7 +45,38 @@ local function system(cmd, opts)
   return r
 end
 
-local iswin = uv.os_uname().sysname == 'Windows_NT'
+---@async
+---@param url string
+---@param output string
+---@return string? err
+local function download_file(url, output)
+  local r = system({
+    'curl',
+    '--silent',
+    '--fail',
+    '--show-error',
+    '-L', -- follow redirects
+    url,
+    '--output',
+    output,
+  })
+  if r.code > 0 then
+    return r.stderr
+  end
+end
+
+---@async
+---@param path string
+---@param mode? string
+---@return string? err
+local function mkpath(path, mode)
+  local parent = fs.dirname(path)
+  if not parent:match('^[./]$') and not uv.fs_stat(parent) then
+    mkpath(parent, mode)
+  end
+
+  return uv_mkdir(path, tonumber(mode or '755', 8))
+end
 
 local M = {}
 
@@ -59,8 +96,8 @@ local function get_parser_install_info(lang)
   return parser_config.install_info
 end
 
---- @param ... string
---- @return string
+---@param ... string
+---@return string
 function M.get_package_path(...)
   return fs.joinpath(fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
 end
@@ -92,16 +129,11 @@ end
 --- PARSER MANAGEMENT FUNCTIONS
 ---
 
---- @param x string
---- @return boolean
-local function executable(x)
-  return fn.executable(x) == 1
-end
-
---- @param logger Logger
---- @param repo InstallInfo
---- @param compile_location string
---- @return string? err
+---@async
+---@param logger Logger
+---@param repo InstallInfo
+---@param compile_location string
+---@return string? err
 local function do_generate(logger, repo, compile_location)
   logger:info(
     string.format(
@@ -123,131 +155,82 @@ local function do_generate(logger, repo, compile_location)
   end
 end
 
+---@async
 ---@param logger Logger
----@param repo InstallInfo
+---@param url string
 ---@param project_name string
 ---@param cache_dir string
 ---@param revision string
----@param project_dir string
+---@param output_dir string
 ---@return string? err
-local function do_download_tar(logger, repo, project_name, cache_dir, revision, project_dir)
-  local is_github = repo.url:find('github.com', 1, true)
-  local url = repo.url:gsub('.git$', '')
+local function do_download(logger, url, project_name, cache_dir, revision, output_dir)
+  local is_gitlab = url:find('gitlab.com', 1, true)
 
-  local dir_rev = revision
-  if is_github and revision:find('^v%d') then
-    dir_rev = revision:sub(2)
+  local tmp = output_dir .. '-tmp'
+
+  util.delete(tmp)
+
+  url = url:gsub('.git$', '')
+  local target = is_gitlab
+      and string.format('%s/-/archive/%s/%s-%s.tar.gz', url, revision, project_name, revision)
+    or string.format('%s/archive/%s.tar.gz', url, revision)
+
+  local tarball_path = fs.joinpath(cache_dir, project_name .. '.tar.gz')
+
+  do -- Download tarball
+    logger:info('Downloading %s...', project_name)
+    local err = download_file(target, tarball_path)
+    if err then
+      return logger:error('Error during download: %s', err)
+    end
   end
 
-  local temp_dir = project_dir .. '-tmp'
-
-  util.delete(temp_dir)
-
-  logger:info('Downloading ' .. project_name .. '...')
-  local target = is_github and url .. '/archive/' .. revision .. '.tar.gz'
-    or url .. '/-/archive/' .. revision .. '/' .. project_name .. '-' .. revision .. '.tar.gz'
-
-  local r = system({
-    'curl',
-    '--silent',
-    '--show-error',
-    '-L', -- follow redirects
-    target,
-    '--output',
-    project_name .. '.tar.gz',
-  }, {
-    cwd = cache_dir,
-  })
-  if r.code > 0 then
-    return logger:error('Error during download: %s', r.stderr)
+  do -- Create tmp dir
+    logger:debug('Creating temporary directory: %s', tmp)
+    local err = mkpath(tmp)
+    a.main()
+    if err then
+      return logger:error('Could not create %s-tmp: %s', project_name, err)
+    end
   end
 
-  logger:debug('Creating temporary directory: ' .. temp_dir)
-  --TODO(clason): use fn.mkdir(temp_dir, 'p') in case stdpath('cache') is not created
-  local err = uv_mkdir(temp_dir, 493)
-  a.main()
-  if err then
-    return logger:error('Could not create %s-tmp: %s', project_name, err)
+  do -- Extract tarball
+    logger:debug('Extracting %s into %s...', tarball_path, project_name)
+    -- Windows tar can't handle drive letters
+    local r = system(
+      { 'tar', '-xzf', project_name .. '.tar.gz', '-C', project_name .. '-tmp' },
+      { cwd = cache_dir }
+    )
+    if r.code > 0 then
+      return logger:error('Error during tarball extraction: %s', r.stderr)
+    end
   end
 
-  logger:info('Extracting ' .. project_name .. '...')
-  r = system({
-    'tar',
-    '-xzf',
-    project_name .. '.tar.gz',
-    '-C',
-    project_name .. '-tmp',
-  }, {
-    cwd = cache_dir,
-  })
-
-  if r.code > 0 then
-    return logger:error('Error during tarball extraction: %s', r.stderr)
+  do -- Remove tarball
+    logger:debug('Removing %s...', tarball_path)
+    local err = uv_unlink(tarball_path)
+    a.main()
+    if err then
+      return logger:error('Could not remove tarball: %s', err)
+    end
   end
 
-  err = uv_unlink(project_dir .. '.tar.gz')
-  if err then
-    return logger:error('Could not remove tarball: %s', err)
-  end
-  a.main()
-
-  err = uv_rename(fs.joinpath(temp_dir, url:match('[^/]-$') .. '-' .. dir_rev), project_dir)
-  a.main()
-
-  if err then
-    return logger:error('Could not rename temp: %s', err)
+  do -- Move tmp dir to output dir
+    local dir_rev = revision:find('^v%d') and revision:sub(2) or revision
+    local repo_project_name = url:match('[^/]-$')
+    local extracted = fs.joinpath(tmp, repo_project_name .. '-' .. dir_rev)
+    logger:debug('Moving %s to %s/...', extracted, output_dir)
+    local err = uv_rename(extracted, output_dir)
+    a.main()
+    if err then
+      return logger:error('Could not rename temp: %s', err)
+    end
   end
 
-  util.delete(temp_dir)
-end
-
----@param logger Logger
----@param repo InstallInfo
----@param project_name string
----@param cache_dir string
----@param revision string
----@param project_dir string
----@return string? err
-local function do_download_git(logger, repo, project_name, cache_dir, revision, project_dir)
-  logger:info('Downloading ' .. project_name .. '...')
-
-  local r = system({
-    'git',
-    'clone',
-    '--filter=blob:none',
-    repo.url,
-    project_name,
-  }, {
-    cwd = cache_dir,
-  })
-
-  if r.code > 0 then
-    return logger:error('Error during download, please verify your internet connection: ', r.stderr)
-  end
-
-  logger:info('Checking out locked revision')
-  r = system({
-    'git',
-    'checkout',
-    revision,
-  }, {
-    cwd = project_dir,
-  })
-
-  if r.code > 0 then
-    return logger:error('Error while checking out revision: %s', r.stderr)
-  end
-end
-
----@param repo InstallInfo
----@return boolean
-local function can_download_tar(repo)
-  local can_use_tar = executable('tar') and executable('curl')
-  local is_github = repo.url:find('github.com', 1, true) ~= nil
-  local is_gitlab = repo.url:find('gitlab.com', 1, true) ~= nil
-  return can_use_tar and (is_github or is_gitlab) and not iswin
+  util.delete(tmp)
 end
 
+---@async
 ---@param logger Logger
 ---@param compile_location string
 ---@return string? err
@@ -265,6 +248,7 @@ local function do_compile(logger, compile_location)
   end
 end
 
+---@async
 ---@param logger Logger
 ---@param compile_location string
 ---@param target_location string
@@ -272,7 +256,7 @@ end
 local function do_install(logger, compile_location, target_location)
   logger:info(string.format('Installing parser'))
 
-  if iswin then -- why can't you just be normal?!
+  if uv.os_uname().sysname == 'Windows_NT' then -- why can't you just be normal?!
     local tempfile = target_location .. tostring(uv.hrtime())
     uv_rename(target_location, tempfile) -- parser may be in use: rename...
     uv_unlink(tempfile) -- ...and mark for garbage collection
@@ -285,12 +269,13 @@ local function do_install(logger, compile_location, target_location)
   end
 end
 
+---@async
 ---@param lang string
 ---@param cache_dir string
 ---@param install_dir string
 ---@param generate? boolean
 ---@return string? err
-local function install_lang0(lang, cache_dir, install_dir, generate)
+local function try_install_lang(lang, cache_dir, install_dir, generate)
   local logger = log.new('install/' .. lang)
 
   local repo = get_parser_install_info(lang)
@@ -308,8 +293,7 @@ local function install_lang0(lang, cache_dir, install_dir, generate)
 
       revision = revision or repo.branch or 'main'
 
-      local do_download = can_download_tar(repo) and do_download_tar or do_download_git
-      local err = do_download(logger, repo, project_name, cache_dir, revision, project_dir)
+      local err = do_download(logger, repo.url, project_name, cache_dir, revision, project_dir)
       if err then
         return err
       end
@@ -364,16 +348,15 @@ local function install_lang0(lang, cache_dir, install_dir, generate)
   logger:info('Language installed')
 end
 
---- @alias InstallStatus
+---@alias InstallStatus
 --- | 'installing'
 --- | 'installed'
 --- | 'failed'
 --- | 'timeout'
 
-local install_status = {} --- @type table<string,InstallStatus?>
-
-local INSTALL_TIMEOUT = 60000
+local install_status = {} ---@type table<string,InstallStatus?>
 
+---@async
 ---@param lang string
 ---@param cache_dir string
 ---@param install_dir string
@@ -399,7 +382,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate)
     end
   else
     install_status[lang] = 'installing'
-    local err = install_lang0(lang, cache_dir, install_dir, generate)
+    local err = try_install_lang(lang, cache_dir, install_dir, generate)
     install_status[lang] = err and 'failed' or 'installed'
   end
 
@@ -410,6 +393,7 @@ end
 
 --- Reload the parser table and user modifications in case of update
 local function reload_parsers()
+  ---@diagnostic disable-next-line:no-unknown
   package.loaded['nvim-treesitter.parsers'] = nil
   parsers = require('nvim-treesitter.parsers')
   vim.api.nvim_exec_autocmds('User', { pattern = 'TSUpdate' })
@@ -420,16 +404,16 @@ end
 ---@field generate? boolean
 
 --- Install a parser
---- @param languages string[]
---- @param options? InstallOptions
---- @param _callback? fun()
+---@param languages string[]
+---@param options? InstallOptions
+---@param _callback? fun()
 local function install(languages, options, _callback)
   options = options or {}
 
-  local cache_dir = vim.fs.normalize(fn.stdpath('cache'))
+  local cache_dir = fs.normalize(fn.stdpath('cache'))
   local install_dir = config.get_install_dir('parser')
 
-  local tasks = {} --- @type fun()[]
+  local tasks = {} ---@type fun()[]
   local done = 0
   for _, lang in ipairs(languages) do
     tasks[#tasks + 1] = a.sync(function()
@@ -441,7 +425,7 @@ local function install(languages, options, _callback)
     end)
   end
 
-  a.join(max_jobs, nil, tasks)
+  a.join(MAX_JOBS, nil, tasks)
   if #tasks > 1 then
     a.main()
     log.info('Installed %d/%d languages', done, #tasks)
@@ -474,7 +458,7 @@ M.update = a.sync(function(languages, _options, _callback)
     languages = 'all'
   end
   languages = config.norm_languages(languages, { ignored = true, missing = true })
-  languages = vim.tbl_filter(needs_update, languages) --- @type string[]
+  languages = vim.tbl_filter(needs_update, languages) ---@type string[]
 
   if #languages > 0 then
     install(languages, { force = true })
@@ -483,16 +467,17 @@ M.update = a.sync(function(languages, _options, _callback)
   end
 end, 2)
 
---- @param logger Logger
---- @param lang string
---- @param parser string
---- @param queries string
---- @return string? err
+---@async
+---@param logger Logger
+---@param lang string
+---@param parser string
+---@param queries string
+---@return string? err
 local function uninstall_lang(logger, lang, parser, queries)
   logger:debug('Uninstalling ' .. lang)
   install_status[lang] = nil
 
-  if vim.fn.filereadable(parser) == 1 then
+  if fn.filereadable(parser) == 1 then
     logger:debug('Unlinking ' .. parser)
     local perr = uv_unlink(parser)
     a.main()
@@ -502,7 +487,7 @@ local function uninstall_lang(logger, lang, parser, queries)
     end
   end
 
-  if vim.fn.isdirectory(queries) == 1 then
+  if fn.isdirectory(queries) == 1 then
     logger:debug('Unlinking ' .. queries)
     local qerr = uv_unlink(queries)
     a.main()
@@ -515,9 +500,9 @@ local function uninstall_lang(logger, lang, parser, queries)
   logger:info('Language uninstalled')
 end
 
---- @param languages string[]|string
---- @param _options? UpdateOptions
---- @param _callback fun()
+---@param languages string[]|string
+---@param _options? UpdateOptions
+---@param _callback fun()
 M.uninstall = a.sync(function(languages, _options, _callback)
   languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
 
@@ -525,7 +510,7 @@ M.uninstall = a.sync(function(languages, _options, _callback)
   local query_dir = config.get_install_dir('queries')
   local installed = config.installed_parsers()
 
-  local tasks = {} --- @type fun()[]
+  local tasks = {} ---@type fun()[]
   local done = 0
   for _, lang in ipairs(languages) do
     local logger = log.new('uninstall/' .. lang)
@@ -543,7 +528,7 @@ M.uninstall = a.sync(function(languages, _options, _callback)
     end
   end
 
-  a.join(max_jobs, nil, tasks)
+  a.join(MAX_JOBS, nil, tasks)
   if #tasks > 1 then
     a.main()
     log.info('Uninstalled %d/%d languages', done, #tasks)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b31224d26..5d01f968b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -19,7 +19,7 @@ return {
   angular = {
     install_info = {
       generate_from_json = true,
-      revision = '10f21f3f1b10584e62ecc113ab3cda1196d0ceb8',
+      revision = '31182d43b062a350d4bd2449f2fc0d5654972be9',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -29,7 +29,7 @@ return {
   apex = {
     install_info = {
       location = 'apex',
-      revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
+      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -47,7 +47,7 @@ return {
   },
   asm = {
     install_info = {
-      revision = 'b0306e9bb2ebe01c6562f1aef265cc42ccc53070',
+      revision = '2a35fccebcc08aa8b6c7bb3cff1f07cf0f8cff83',
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
@@ -96,7 +96,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = 'c25f8034c977681653a8acd541c8b4877a58f474',
+      revision = '01c0da29e0fc7130420a09d939ecc524e09b6ba6',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -144,7 +144,7 @@ return {
   },
   bp = {
     install_info = {
-      revision = '2326d709fb9cf73cf124fdbc803c267f851721a4',
+      revision = '4e60cf3c2e613625c06f6f85540b3631e2d06cd3',
       url = 'https://github.com/ambroisie/tree-sitter-bp',
     },
     maintainers = { '@ambroisie' },
@@ -161,7 +161,7 @@ return {
   },
   c = {
     install_info = {
-      revision = 'deca017a554045b4c203e7ddff39ae64ff05e071',
+      revision = 'be23d2c9d8e5b550e713ef0f86126a248462ca6e',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -169,7 +169,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = '82fa8f05f41a33e9bc830f85d74a9548f0291738',
+      revision = '31a64b28292aac6adf44071e449fa03fb80eaf4e',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -225,7 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = '4864abb95a1f6e54d6b362677beef9fb674b41e9',
+      revision = '69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -275,7 +275,7 @@ return {
   cpp = {
     install_info = {
       generate_from_json = true,
-      revision = '9d412ba7e597fe158f209da33e60f31b1f0df967',
+      revision = '0b4aa47f07d958a49260aadc87e8474b03897c23',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -303,7 +303,7 @@ return {
   cuda = {
     install_info = {
       generate_from_json = true,
-      revision = '1f188eff83b562ffae36d13e1b804ec6f3b9f1d9',
+      revision = '7c97acb8398734d790c86210c53c320df61ff66b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
     maintainers = { '@theHamsta' },
@@ -328,7 +328,7 @@ return {
   },
   d = {
     install_info = {
-      revision = '750dde90ed9cdbd82493bc28478d8ab1976b0e9f',
+      revision = 'ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e',
       url = 'https://github.com/gdamore/tree-sitter-d',
     },
     maintainers = { '@amaanq' },
@@ -352,7 +352,7 @@ return {
   },
   devicetree = {
     install_info = {
-      revision = 'fb07e6044ffd36932c57a5be01ba5d6b8a9337bb',
+      revision = '296b3c294a8bcfca6673296d99f9cd37049b8026',
       url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
     maintainers = { '@jedrzejboczar' },
@@ -368,7 +368,7 @@ return {
   },
   diff = {
     install_info = {
-      revision = '629676fc3919606964231b2c7b9677d6998a2cb4',
+      revision = '19dd5aa52fe339a1d974768a09ee2537303e8ca5',
       url = 'https://github.com/the-mikedavis/tree-sitter-diff',
     },
     maintainers = { '@gbprod' },
@@ -384,7 +384,7 @@ return {
   },
   djot = {
     install_info = {
-      revision = 'ea851b9cf1a71e475f4e2ac4dc03609a1b9ca56d',
+      revision = '886601b67d1f4690173a4925c214343c30704d32',
       url = 'https://github.com/treeman/tree-sitter-djot',
     },
     maintainers = { '@NoahTheDuke' },
@@ -417,7 +417,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '648183d86f6f8ffb240ea11b4c6873f6f45d8b67',
+      revision = '809266ed1694d64dedc168a18893cc254e3edf7e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -425,7 +425,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = 'b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e',
+      revision = 'b0a9bc5737340a9b80b489fe9ae93d7b2fe78cd7',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -447,8 +447,8 @@ return {
   },
   editorconfig = {
     install_info = {
+      revision = 'fd0d64d2fc91eab903bed4c11ce280b62e46f16e',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@ValdezFOmar' },
     tier = 3,
@@ -518,7 +518,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '98ea1f9c957b2ad520415eecb5a5b406e931101e',
+      revision = '8f41b588fe38b981156651ef56b192ed3d158efd',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -526,7 +526,7 @@ return {
   },
   facility = {
     install_info = {
-      revision = 'a52579670e2b14ec03d410c3c980fafaf6d659c4',
+      revision = '2d037f2f2bf668737f72e6be6eda4b7918b68d86',
       url = 'https://github.com/FacilityApi/tree-sitter-facility',
     },
     maintainers = { '@bryankenote' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = 'f73d473e3530862dee7cbb38520f28824e7804f6',
+      revision = '6b633433fb3f132f21250cf8e8be76d5a6389b7e',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -676,7 +676,7 @@ return {
   },
   git_rebase = {
     install_info = {
-      revision = 'd8a4207ebbc47bd78bacdf48f883db58283f9fd8',
+      revision = 'bff4b66b44b020d918d67e2828eada1974a966aa',
       url = 'https://github.com/the-mikedavis/tree-sitter-git-rebase',
     },
     maintainers = { '@gbprod' },
@@ -692,7 +692,7 @@ return {
   },
   gitcommit = {
     install_info = {
-      revision = 'edd817e0532f179b7f7f371dc180629070945f0c',
+      revision = 'aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7',
       url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
     maintainers = { '@gbprod' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '02a17bf9d0553406268cdbf466d57808ae712bf3',
+      revision = '426e67087fd62be5f4533581b5916b2cf010fb5b',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -746,7 +746,7 @@ return {
   glsl = {
     install_info = {
       generate_from_json = true,
-      revision = '7f91bf34cadc06a96efc475df501ffca4dda9410',
+      revision = 'ddc3137a2d775aca93084ff997fa13cc1691058a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
     },
     maintainers = { '@theHamsta' },
@@ -780,8 +780,8 @@ return {
   },
   goctl = {
     install_info = {
+      revision = 'f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3',
       url = 'https://github.com/chaozwn/tree-sitter-goctl',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@chaozwn' },
     tier = 3,
@@ -797,7 +797,7 @@ return {
   },
   gomod = {
     install_info = {
-      revision = 'bbe2fe3be4b87e06a613e685250f473d2267f430',
+      revision = '1f55029bacd0a6a11f6eb894c4312d429dcf735c',
       url = 'https://github.com/camdencheek/tree-sitter-go-mod',
     },
     maintainers = { '@camdencheek' },
@@ -853,7 +853,7 @@ return {
   },
   groovy = {
     install_info = {
-      revision = '6c5c8813233fe326e24c5ef032858d13f8006a8d',
+      revision = '105ee343682b7eee86b38ec6858a269e16474a72',
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
@@ -876,7 +876,7 @@ return {
   },
   hare = {
     install_info = {
-      revision = '070524937539eb8bb4f10debd9c83b66c434f3a2',
+      revision = '4af5d82cf9ec39f67cb1db5b7a9269d337406592',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hare',
     },
     maintainers = { '@amaanq' },
@@ -900,7 +900,7 @@ return {
   },
   hcl = {
     install_info = {
-      revision = 'e2d416afeba80e8cf711ed6792e089ed5c8e184e',
+      revision = '9e3ec9848f28d26845ba300fd73c740459b83e9b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -908,7 +908,7 @@ return {
   },
   heex = {
     install_info = {
-      revision = 'b5ad6e34eea18a15bbd1466ca707a17f9bff7b93',
+      revision = '6dd0303acf7138dd2b9b432a229e16539581c701',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
@@ -936,7 +936,7 @@ return {
   hlsl = {
     install_info = {
       generate_from_json = true,
-      revision = '5e1225a30712ca0a9040509806c7ba274a1bbcde',
+      revision = '5d788a46727c8199a7c63a3c849092e0364375b6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
     },
     maintainers = { '@theHamsta' },
@@ -945,7 +945,7 @@ return {
   },
   hlsplaylist = {
     install_info = {
-      revision = '64f19029339e75d6762feae39e7878595860c980',
+      revision = '3bfda9271e3adb08d35f47a2102fe957009e1c55',
       url = 'https://github.com/Freed-Wu/tree-sitter-hlsplaylist',
     },
     maintainers = { '@Freed-Wu' },
@@ -992,7 +992,7 @@ return {
   },
   http = {
     install_info = {
-      revision = '8d22f33faa5aa95c6526606fb656ada342e59e40',
+      revision = '5ae6c7cfa62a7d7325c26171a1de4f6b866702b5',
       url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
@@ -1000,7 +1000,7 @@ return {
   },
   hurl = {
     install_info = {
-      revision = 'ad705af8c44c737bdb965fc081329c50716d2d03',
+      revision = 'fba6ed8db3a009b9e7d656511931b181a3ee5b08',
       url = 'https://github.com/pfeiferj/tree-sitter-hurl',
     },
     maintainers = { '@pfeiferj' },
@@ -1008,7 +1008,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      revision = 'c9012d6dcaaa939f17c21e1fdb17b013d139e6b9',
+      revision = '6858695eba0e63b9e0fceef081d291eb352abce8',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
@@ -1016,7 +1016,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa',
+      revision = '7412851348d9d8ba93dc6abd5e60aba9b50a4811',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1066,7 +1066,7 @@ return {
   },
   janet_simple = {
     install_info = {
-      revision = '2a05cab838dfec52daa76f10920917d2e69a85bc',
+      revision = 'ea842cb57a90865c8f50bcb4499de1a94860f3a4',
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
@@ -1090,7 +1090,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = '391a8fcc48a11f63bf18ec9885f6f069e760949a',
+      revision = '12e45374422f6051648717be62f0ffc40a279ee2',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1175,7 +1175,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = 'f1baa5f8e271109d01cc8ff7473c11df2d8a9aee',
+      revision = 'a528de39923448e6b809a6b9f686f3472728f202',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
@@ -1183,7 +1183,7 @@ return {
   },
   just = {
     install_info = {
-      revision = 'fd814fc6c579f68c2a642f5e0268cf69daae92d7',
+      revision = '6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
@@ -1215,7 +1215,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'c9cb8504b81684375e7beb8907517dbd6947a1be',
+      revision = '8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1248,7 +1248,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = 'cd82eb40d31bdfe65f846f4e06292d6c804b5e0e',
+      revision = 'efe5afdbb59b70214e6d70db5197dc945d5b213e',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -1280,7 +1280,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = '0419ac4868585320eee8615c90b864a1b04ef433',
+      revision = '7862a3424832c3a9d45eb21143b375837bd6573b',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1330,7 +1330,7 @@ return {
   luau = {
     install_info = {
       generate_from_json = true,
-      revision = '5aa9b88a8e3327276ec6e72de997f04ac80b1ae4',
+      revision = 'fbadc96272f718dba267628ba7b0e694c368cef3',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-luau',
     },
     maintainers = { '@amaanq' },
@@ -1339,7 +1339,7 @@ return {
   },
   m68k = {
     install_info = {
-      revision = 'd097b123f19c6eaba2bf181c05420d88b9fc489d',
+      revision = 'e128454c2210c0e0c10b68fe45ddb8fee80182a3',
       url = 'https://github.com/grahambates/tree-sitter-m68k',
     },
     maintainers = { '@grahambates' },
@@ -1376,7 +1376,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '79d8b25f57b48f83ae1333aff6723b83c9532e37',
+      revision = '0d5a05e543af2de60cdb5e71f0f5888c95ab936f',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '00c32d8562dc957b187da110a3443307962b8da8',
+      revision = 'affbd6f3b08155826a22cfa8373147acbf60f1f1',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1416,7 +1416,7 @@ return {
   },
   muttrc = {
     install_info = {
-      revision = '90ef60852c410bd964cd3b954366e4c403c17314',
+      revision = '173b0ab53a9c07962c9777189c4c70e90f1c1837',
       url = 'https://github.com/neomutt/tree-sitter-muttrc',
     },
     maintainers = { '@Freed-Wu' },
@@ -1432,22 +1432,22 @@ return {
   },
   nginx = {
     install_info = {
+      revision = '281d184b8240b2b22670b8907b57b6d6842db6f3',
       url = 'https://github.com/opa-oz/tree-sitter-nginx',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@opa-oz' },
     tier = 3,
   },
   nickel = {
     install_info = {
-      revision = '43433d8477b24cd13acaac20a66deda49b7e2547',
+      revision = '3039ad9e9af3c1ffe049a04ee83a2b489915b0b9',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 4,
   },
   nim = {
     install_info = {
-      revision = '961c2798cec9250c44f7d7225ddb33d47d25856a',
+      revision = '897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7',
       url = 'https://github.com/alaviss/tree-sitter-nim',
     },
     maintainers = { '@aMOPel' },
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'b3cda619248e7dd0f216088bd152f59ce0bbe488',
+      revision = '486bb0337ee94575f53367b53bffeaea99063f2c',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1516,7 +1516,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e',
+      revision = '036226e5edb410aec004cc7ac0f4b2014dd04a0e',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1525,7 +1525,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e',
+      revision = '036226e5edb410aec004cc7ac0f4b2014dd04a0e',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1551,7 +1551,7 @@ return {
   },
   pascal = {
     install_info = {
-      revision = 'a9ee969dec5b2e3b2ccccc5954fec04100c7619e',
+      revision = 'd0ebabefaea9ac3f6fc3004cf08cd121b66da9e4',
       url = 'https://github.com/Isopod/tree-sitter-pascal',
     },
     maintainers = { '@Isopod' },
@@ -1577,7 +1577,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = '309cb8d33bcfd0a81050b21be08f9eb3f2fe2138',
+      revision = '3a21d9cb2a20a062c17f8f53d5983fd473c4673c',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '4f124bc6075e1c3333e80190c1c170933ed72c95',
+      revision = 'c07d69739ba71b5a449bdbb7735991f8aabf8546',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '4f124bc6075e1c3333e80190c1c170933ed72c95',
+      revision = 'c07d69739ba71b5a449bdbb7735991f8aabf8546',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1657,11 +1657,11 @@ return {
     tier = 2,
   },
   powershell = {
-    install_info = {
-      url = 'https://github.com/airbus-cert/tree-sitter-powershell',
-      files = { 'src/parser.c', 'src/scanner.c' },
-    },
     filetype = 'ps1',
+    install_info = {
+      revision = 'fc15514b2f1dbba9c58528d15a3708f89eda6a01',
+      url = 'https://github.com/airbus-cert/tree-sitter-powershell',
+    },
     maintainers = { '@L2jLiga' },
     tier = 3,
   },
@@ -1681,23 +1681,21 @@ return {
     maintainers = { '@elianiva' },
     tier = 3,
   },
-
   problog = {
     install_info = {
-      url = 'https://github.com/foxyseta/tree-sitter-prolog',
-      files = { 'src/parser.c' },
       location = 'grammars/problog',
+      revision = '93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8',
+      url = 'https://github.com/foxyseta/tree-sitter-prolog',
     },
     maintainers = { '@foxyseta' },
     requires = { 'prolog' },
     tier = 3,
   },
-
   prolog = {
     install_info = {
-      url = 'https://github.com/foxyseta/tree-sitter-prolog',
-      files = { 'src/parser.c' },
       location = 'grammars/prolog',
+      revision = '93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8',
+      url = 'https://github.com/foxyseta/tree-sitter-prolog',
     },
     maintainers = { '@foxyseta' },
     tier = 3,
@@ -1780,7 +1778,7 @@ return {
   },
   python = {
     install_info = {
-      revision = '71778c2a472ed00a64abf4219544edbf8e4b86d7',
+      revision = '0dee05ef958ba2eae88d1e65f24b33cad70d4367',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
@@ -1823,7 +1821,7 @@ return {
   },
   r = {
     install_info = {
-      revision = '391400572538ff9854341a175ed8ab4b1e45f44b',
+      revision = 'b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -1838,7 +1836,7 @@ return {
   },
   ralph = {
     install_info = {
-      revision = '48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0',
+      revision = 'f6d81bf7a4599c77388035439cf5801cd461ff77',
       url = 'https://github.com/alephium/tree-sitter-ralph',
     },
     maintainers = { '@tdroxler' },
@@ -1864,7 +1862,7 @@ return {
   },
   rbs = {
     install_info = {
-      revision = '88d8ed487b5449ddda2fc0c4fe23b71cba29ca24',
+      revision = '8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99',
       url = 'https://github.com/joker1007/tree-sitter-rbs',
     },
     maintainers = { '@joker1007' },
@@ -1913,8 +1911,8 @@ return {
   },
   rescript = {
     install_info = {
+      revision = '4606cd81c4c31d1d02390fee530858323410a74c',
       url = 'https://github.com/rescript-lang/tree-sitter-rescript',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@ribru17' },
     tier = 2,
@@ -1937,15 +1935,15 @@ return {
   },
   robots = {
     install_info = {
+      revision = '8e3a4205b76236bb6dbebdbee5afc262ce38bb62',
       url = 'https://github.com/opa-oz/tree-sitter-robots-txt',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@opa-oz' },
     tier = 3,
   },
   roc = {
     install_info = {
-      revision = 'df46a85abda9f948d38f5d4e3684cec49c42fef2',
+      revision = 'ef46edd0c03ea30a22f7e92bc68628fb7231dc8a',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
@@ -1969,7 +1967,7 @@ return {
   },
   ruby = {
     install_info = {
-      revision = 'dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b',
+      revision = '0ffe457fb6aabf064f173fd30ea356845cef2513',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
@@ -1993,7 +1991,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'b76db435a7f876cf1ede837d66054c534783c72f',
+      revision = 'be7184df70dd3b5790becfb2c93ba796b2797781',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2002,7 +2000,7 @@ return {
   scfg = {
     install_info = {
       generate = true,
-      revision = '6deae0cbb458c849a4d1e2985093e9c9c32d7fd0',
+      revision = 'a5512800ea0220da4abbae61b8aea8423d1549aa',
       url = 'https://github.com/rockorager/tree-sitter-scfg',
     },
     maintainers = { '@WhyNotHugo' },
@@ -2026,9 +2024,9 @@ return {
   },
   sflog = {
     install_info = {
-      url = 'https://github.com/aheber/tree-sitter-sfapex',
-      files = { 'src/parser.c' },
       location = 'sflog',
+      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
+      url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiaofinland' },
     readme_note = 'Salesforce debug log',
@@ -2037,7 +2035,7 @@ return {
   slang = {
     install_info = {
       generate_from_json = true,
-      revision = '865d79e236c7f0e04276c969453d021d1da4b15f',
+      revision = 'd84b43d75d65bbc4ba57166ce17555f32c0b8983',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
     maintainers = { '@theHamsta' },
@@ -2054,7 +2052,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = 'd82ab8c19ea1b60ff570256eaef7d137cc5ecb63',
+      revision = '4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2079,7 +2077,7 @@ return {
   snakemake = {
     install_info = {
       generate_from_json = true,
-      revision = '5a7b14074bca95b25935e865ca8f1efad32317e4',
+      revision = 'e909815acdbe37e69440261ebb1091ed52e1dec6',
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
     },
     maintainers = { '@osthomas' },
@@ -2096,7 +2094,7 @@ return {
   soql = {
     install_info = {
       location = 'soql',
-      revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
+      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2105,7 +2103,7 @@ return {
   sosl = {
     install_info = {
       location = 'sosl',
-      revision = 'c99ad4b16d112fea91745e3f1b769754239fdaba',
+      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2113,7 +2111,7 @@ return {
   },
   sourcepawn = {
     install_info = {
-      revision = '645d093763bcaaf7535edbdf6575a5c978b16491',
+      revision = '6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf',
       url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
     },
     maintainers = { '@Sarrus1' },
@@ -2122,7 +2120,7 @@ return {
   sparql = {
     install_info = {
       generate_from_json = true,
-      revision = '05f949d3c1c15e3261473a244d3ce87777374dec',
+      revision = 'd853661ca680d8ff7f8d800182d5782b61d0dd58',
       url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
     },
     maintainers = { '@GordianDziwis' },
@@ -2132,7 +2130,7 @@ return {
     install_info = {
       branch = 'gh-pages',
       generate_from_json = true,
-      revision = '89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d',
+      revision = 'c67ecbd37d8d12f22e4cc7138afd14bc20253e10',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2140,7 +2138,7 @@ return {
   },
   squirrel = {
     install_info = {
-      revision = '0a50d31098e83c668d34d1160a0f6c7d23b571cc',
+      revision = '072c969749e66f000dba35a33c387650e203e96e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-squirrel',
     },
     maintainers = { '@amaanq' },
@@ -2208,7 +2206,7 @@ return {
   svelte = {
     install_info = {
       generate_from_json = true,
-      revision = '7218cf622b057ae9c530e1f0a7a3ce49806ca55e',
+      revision = '7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
     },
     maintainers = { '@amaanq' },
@@ -2226,7 +2224,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '13ffaec4068facfff608e3afbdb7a581c185f6a6',
+      revision = '769bb834feb2947f2c706d82830b0a05958727de',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2242,7 +2240,7 @@ return {
   },
   systemtap = {
     install_info = {
-      revision = '1af543a96d060b1f808982037bfc54cc02218edd',
+      revision = 'f2b378a9af0b7e1192cff67a5fb45508c927205d',
       url = 'https://github.com/ok-ryoko/tree-sitter-systemtap',
     },
     maintainers = { '@ok-ryoko' },
@@ -2266,7 +2264,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = '034df2162ed7b654efd999942e266be713c7cde0',
+      revision = '91cc49a83f4f0b3a756bf7d0e65403a9cf757003',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2300,7 +2298,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = 'cf84ea53e2e2531f23009d676ac206090c1e2392',
+      revision = 'de0d0ee129cf643872e8e0d5c4a6589b5a3aae23',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2309,7 +2307,7 @@ return {
   terraform = {
     install_info = {
       location = 'dialects/terraform',
-      revision = 'e936d3fef8bac884661472dce71ad82284761eb1',
+      revision = '9e3ec9848f28d26845ba300fd73c740459b83e9b',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -2342,7 +2340,7 @@ return {
   },
   tlaplus = {
     install_info = {
-      revision = '200f9dab6b23f3b9bb8f67fc811221517f56c373',
+      revision = 'bba02e79f85e335f310fc95e21c677e49f2c4439',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
@@ -2350,7 +2348,7 @@ return {
   },
   tmux = {
     install_info = {
-      revision = '9138ea508410e0f34da2666609f600f65e944f22',
+      revision = '0252ecd080016e45e6305ef1a943388f5ae2f4b4',
       url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
     maintainers = { '@Freed-Wu' },
@@ -2386,7 +2384,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'tsx',
-      revision = '4ad3010c91d700026d036b5230e2d99ba94ae8a4',
+      revision = '198d03553f43a45b92ac5d0ee167db3fec6a6fd6',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2395,7 +2393,7 @@ return {
   },
   turtle = {
     install_info = {
-      revision = '085437f5cb117703b7f520dd92161140a684f092',
+      revision = '7f789ea7ef765080f71a298fc96b7c957fa24422',
       url = 'https://github.com/GordianDziwis/tree-sitter-turtle',
     },
     maintainers = { '@GordianDziwis' },
@@ -2413,7 +2411,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'typescript',
-      revision = '4ad3010c91d700026d036b5230e2d99ba94ae8a4',
+      revision = '198d03553f43a45b92ac5d0ee167db3fec6a6fd6',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2422,7 +2420,7 @@ return {
   },
   typespec = {
     install_info = {
-      revision = '28821d0d6da5f0a6b5eb02b9bad953fecafd7248',
+      revision = '0ee05546d73d8eb64635ed8125de6f35c77759fe',
       url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
     maintainers = { '@happenslol' },
@@ -2438,7 +2436,7 @@ return {
   },
   typst = {
     install_info = {
-      revision = '3924cb9ed9e0e62ce7df9c4fe0faa4c234795999',
+      revision = 'abe60cbed7986ee475d93f816c1be287f220c5d8',
       url = 'https://github.com/uben0/tree-sitter-typst',
     },
     maintainers = { '@uben0', '@RaafatTurki' },
@@ -2488,7 +2486,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = 'e91f8a42de7842f24f4ce600754f2b6651985fd4',
+      revision = '7f80a0441ff2ca6aa8ced8e1ee87cead9dd26515',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2520,8 +2518,8 @@ return {
   },
   vhdl = {
     install_info = {
+      revision = '4ab3e251eae8890a020d083d00acd1b8c2653c07',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@jpt13653903' },
     tier = 3,
@@ -2536,7 +2534,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = 'b448ca63f972ade12c373c808acdd2bf972937db',
+      revision = 'f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2552,8 +2550,8 @@ return {
   },
   vrl = {
     install_info = {
+      revision = '274b3ce63f72aa8ffea18e7fc280d3062d28f0ba',
       url = 'https://github.com/belltoy/tree-sitter-vrl',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@belltoy' },
     tier = 3,
@@ -2580,7 +2578,7 @@ return {
   wgsl_bevy = {
     install_info = {
       generate_from_json = true,
-      revision = '1e12c7925c41bb09818d86e30cd78644fde7d31a',
+      revision = '0f06f24e259ac725045956436b9025dab008ff9f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
     },
     maintainers = { '@theHamsta' },
@@ -2596,7 +2594,7 @@ return {
   },
   wit = {
     install_info = {
-      revision = 'cab94791450524a542324d8cbe8017d69c516d8e',
+      revision = 'c52f0b07786603df17ad0197f6cef680f312eb2c',
       url = 'https://github.com/liamwh/tree-sitter-wit',
     },
     maintainers = { '@liamwh' },
@@ -2604,7 +2602,7 @@ return {
   },
   xcompose = {
     install_info = {
-      revision = '2383cc69a2c42cfade41c7cb971fb3862bec6df1',
+      revision = 'fff3e72242aa110ebba6441946ea4d12d200fa68',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xcompose',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2613,7 +2611,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '648183d86f6f8ffb240ea11b4c6873f6f45d8b67',
+      revision = '809266ed1694d64dedc168a18893cc254e3edf7e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2654,7 +2652,7 @@ return {
   },
   zathurarc = {
     install_info = {
-      revision = '6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068',
+      revision = '0554b4a5d313244b7fc000cbb41c04afae4f4e31',
       url = 'https://github.com/Freed-Wu/tree-sitter-zathurarc',
     },
     maintainers = { '@Freed-Wu' },

From ab230eadd4a96baec86fb17bd625893649f2612f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 10 Aug 2024 12:58:04 +0200
Subject: [PATCH 2317/2704] feat(config)!: remove auto_install

use https://github.com/lewis6991/ts-install.nvim instead
---
 README.md                       |   3 -
 SUPPORTED_LANGUAGES.md          |   6 +-
 doc/nvim-treesitter.txt         |   3 -
 lua/nvim-treesitter/config.lua  |  23 -------
 lua/nvim-treesitter/parsers.lua | 110 ++++++++++++++++----------------
 5 files changed, 58 insertions(+), 87 deletions(-)

diff --git a/README.md b/README.md
index 5e487233f..ac2794af5 100644
--- a/README.md
+++ b/README.md
@@ -59,9 +59,6 @@ require'nvim-treesitter'.setup {
   -- List of parsers to ignore installing
   ignore_install = { 'unsupported' },
 
-  -- Automatically install missing parsers when entering buffer
-  auto_install = false,
-
   -- Directory to install parsers and queries to
   install_dir = vim.fn.stdpath('data') .. '/site'
 }
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 028caeaff..fe389b55a 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -183,8 +183,8 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` | @amaanq
 [pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | core | `HF J ` | @ObserverOfTime
 [perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | core | `HFIJL` | @tk-shirasaka
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | core | `HFIJL` | @tk-shirasaka
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | core | `HFIJL` | @tk-shirasaka, @calebdw
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | core | `HFIJL` | @tk-shirasaka, @calebdw
 [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | community | `H    ` | @mikehaertl
 [pioasm](https://github.com/leo60228/tree-sitter-pioasm) | community | `H  J ` | @leo60228
 [po](https://github.com/tree-sitter-grammars/tree-sitter-po) | core | `HF J ` | @amaanq
@@ -198,7 +198,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [prolog](https://github.com/foxyseta/tree-sitter-prolog) | community | `HFIJ ` | @foxyseta
 [promql](https://github.com/MichaHoffmann/tree-sitter-promql) | community | `H  J ` | @MichaHoffmann
 [properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | core | `H  JL` | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) | community | `HF J ` | @treywood
+[proto](https://github.com/treywood/tree-sitter-proto) | community | `HFIJ ` | @treywood
 [prql](https://github.com/PRQL/tree-sitter-prql) | community | `H  J ` | @matthias-Q
 [psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
 [pug](https://github.com/zealot128/tree-sitter-pug) | community | `H  J ` | @zealot128
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index ef55eb2d8..9ba76be2a 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -45,9 +45,6 @@ To install supported parsers and queries, put this in your `init.lua` file:
     -- A list of parser names, or "core", "stable", "community", "unstable"
     ensure_install = { "core", "rust" },
 
-    -- Automatically install missing parsers when entering buffer
-    auto_install = false,
-
     -- List of parsers to ignore installing (for "core" etc.)
     ignore_install = { "javascript" },
   }
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 704c8e87e..4781d5a21 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -3,14 +3,12 @@ local M = {}
 M.tiers = { 'stable', 'core', 'community', 'unsupported' }
 
 ---@class TSConfig
----@field auto_install boolean
 ---@field ensure_install string[]
 ---@field ignore_install string[]
 ---@field install_dir string
 
 ---@type TSConfig
 local config = {
-  auto_install = false,
   ensure_install = {},
   ignore_install = { 'unsupported' },
   install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
@@ -28,27 +26,6 @@ function M.setup(user_data)
     config = vim.tbl_deep_extend('force', config, user_data)
   end
 
-  if config.auto_install then
-    vim.api.nvim_create_autocmd('FileType', {
-      callback = function(args)
-        local buf = args.buf --- @type integer
-        local ft = vim.bo[buf].filetype
-        local lang = vim.treesitter.language.get_lang(ft) or ft
-        if
-          require('nvim-treesitter.parsers')[lang]
-          and not vim.list_contains(M.installed_parsers(), lang)
-          and not vim.list_contains(config.ignore_install, lang)
-        then
-          require('nvim-treesitter.install').install(lang, nil, function()
-            -- Need to pcall since 'FileType' can be triggered multiple times
-            -- per buffer
-            pcall(vim.treesitter.start, buf, lang)
-          end)
-        end
-      end,
-    })
-  end
-
   if #config.ensure_install > 0 then
     local to_install = M.norm_languages(config.ensure_install, { ignored = true, installed = true })
 
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5d01f968b..685e2dffe 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -19,7 +19,7 @@ return {
   angular = {
     install_info = {
       generate_from_json = true,
-      revision = '31182d43b062a350d4bd2449f2fc0d5654972be9',
+      revision = 'c2d1f6d4c5f1993afce7f984ca2675af8d67457c',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -29,7 +29,7 @@ return {
   apex = {
     install_info = {
       location = 'apex',
-      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
+      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -47,7 +47,7 @@ return {
   },
   asm = {
     install_info = {
-      revision = '2a35fccebcc08aa8b6c7bb3cff1f07cf0f8cff83',
+      revision = '55b2b913f1e71136027d6fce8212e760c64f3532',
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
@@ -161,7 +161,7 @@ return {
   },
   c = {
     install_info = {
-      revision = 'be23d2c9d8e5b550e713ef0f86126a248462ca6e',
+      revision = '927da1f210ebb24b7f109230a61a55b428875985',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -233,7 +233,7 @@ return {
   },
   comment = {
     install_info = {
-      revision = '5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd',
+      revision = '3555706cef8b98d3e4c7379d7260548ff03ad363',
       url = 'https://github.com/stsewd/tree-sitter-comment',
     },
     maintainers = { '@stsewd' },
@@ -275,7 +275,7 @@ return {
   cpp = {
     install_info = {
       generate_from_json = true,
-      revision = '0b4aa47f07d958a49260aadc87e8474b03897c23',
+      revision = 'b1a4e2b25148f3cfcb5f241cbc4c49f001a6fb35',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -284,7 +284,7 @@ return {
   },
   css = {
     install_info = {
-      revision = 'f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af',
+      revision = '9af0bdd9d225edee12f489cfa8284e248321959b',
       url = 'https://github.com/tree-sitter/tree-sitter-css',
     },
     maintainers = { '@TravonteD' },
@@ -303,7 +303,7 @@ return {
   cuda = {
     install_info = {
       generate_from_json = true,
-      revision = '7c97acb8398734d790c86210c53c320df61ff66b',
+      revision = '8812343a1f8496fc219f3d07a270f9c1d6ba3391',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
     maintainers = { '@theHamsta' },
@@ -336,7 +336,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = 'ac0bb849ccd1a923963af47573b5e396736ff582',
+      revision = 'cf72df5d4a623ca705e81bf9e9d264e1fe9d5da0',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -503,7 +503,7 @@ return {
   },
   embedded_template = {
     install_info = {
-      revision = '38d5004a797298dc42c85e7706c5ceac46a3f29f',
+      revision = 'ffbf64942c334933ee7982e144557b6efb76d0b9',
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
     tier = 4,
@@ -518,7 +518,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '8f41b588fe38b981156651ef56b192ed3d158efd',
+      revision = '0b5a0dcfcedd9b397252cb5568cc55ab1905b1a9',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -716,7 +716,7 @@ return {
   },
   glimmer = {
     install_info = {
-      revision = '6b25d265c990139353e1f7f97baf84987ebb7bf0',
+      revision = 'da605af8c5999b43e6839b575eae5e6cafabb06f',
       url = 'https://github.com/ember-tooling/tree-sitter-glimmer',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -727,7 +727,7 @@ return {
     install_info = {
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@NullVoxPopuli' },
     requires = { 'ecma' },
@@ -737,7 +737,7 @@ return {
     install_info = {
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
       files = { 'src/parser.c', 'src/scanner.c' },
-      generate_requires_npm = true,
+      generate_from_json = true,
     },
     maintainers = { '@NullVoxPopuli' },
     requires = { 'typescript' },
@@ -772,7 +772,7 @@ return {
   },
   go = {
     install_info = {
-      revision = '7ee8d928db5202f6831a78f8112fd693bf69f98b',
+      revision = '6204b7308a32e991a8daed2e9895a90be55a510a',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
@@ -780,7 +780,7 @@ return {
   },
   goctl = {
     install_info = {
-      revision = 'f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3',
+      revision = '49c43532689fe1f53e8b9e009d0521cab02c432b',
       url = 'https://github.com/chaozwn/tree-sitter-goctl',
     },
     maintainers = { '@chaozwn' },
@@ -813,7 +813,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = '9d3f6e526dd074b9edae9070b7bb778f00e87a5b',
+      revision = 'fd9e1c6647e5e9b23918d00d1e48710d0f703e19',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -853,7 +853,7 @@ return {
   },
   groovy = {
     install_info = {
-      revision = '105ee343682b7eee86b38ec6858a269e16474a72',
+      revision = '171b3b7412bc93284fc0dad0a7a7bbbbd1b51289',
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
@@ -917,7 +917,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = '9d3f6e526dd074b9edae9070b7bb778f00e87a5b',
+      revision = 'fd9e1c6647e5e9b23918d00d1e48710d0f703e19',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -970,7 +970,7 @@ return {
   },
   html = {
     install_info = {
-      revision = 'e4d834eb4918df01dcad5c27d1b15d56e3bd94cd',
+      revision = 'd11201a263d02169d303db903ba0bb13dc59e068',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
@@ -992,7 +992,7 @@ return {
   },
   http = {
     install_info = {
-      revision = '5ae6c7cfa62a7d7325c26171a1de4f6b866702b5',
+      revision = 'bbcd67642e5749b90277c353b72e762f3be16993',
       url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
@@ -1016,7 +1016,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '7412851348d9d8ba93dc6abd5e60aba9b50a4811',
+      revision = '5573b295410201ed22771776b34d636900eba368',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1066,7 +1066,7 @@ return {
   },
   janet_simple = {
     install_info = {
-      revision = 'ea842cb57a90865c8f50bcb4499de1a94860f3a4',
+      revision = '12bfab7db8a5f5b1d774ef84b5831acd34936071',
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
@@ -1074,7 +1074,7 @@ return {
   },
   java = {
     install_info = {
-      revision = '953abfc8bb3eb2f578e1f461edba4a9885f974b8',
+      revision = '576d8097e495b411f31daaee28cb34c1752ac702',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
@@ -1090,7 +1090,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = '12e45374422f6051648717be62f0ffc40a279ee2',
+      revision = '15887341e5b57ffdb423aff840aef142b8f53d6d',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1136,7 +1136,7 @@ return {
   },
   json = {
     install_info = {
-      revision = '94f5c527b2965465956c2000ed6134dd24daf2a7',
+      revision = 'bdd69eb8c8a58a9f54df03de0488d9990179be46',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
@@ -1162,7 +1162,7 @@ return {
   },
   jsonnet = {
     install_info = {
-      revision = 'd34615fa12cc1d1cfc1f1f1a80acc9db80ee4596',
+      revision = 'ddd075f1939aed8147b7aa67f042eda3fce22790',
       url = 'https://github.com/sourcegraph/tree-sitter-jsonnet',
     },
     maintainers = { '@nawordar' },
@@ -1215,7 +1215,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = '8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5',
+      revision = 'dc5e8a14cb1f45582a8c221a270a199a5f8bdb63',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1248,7 +1248,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = 'efe5afdbb59b70214e6d70db5197dc945d5b213e',
+      revision = '90fd9894bebddce79f5b8041e7f82523364a619b',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -1264,7 +1264,7 @@ return {
   },
   leo = {
     install_info = {
-      revision = '304611b5eaf53aca07459a0a03803b83b6dfd3b3',
+      revision = 'f5ecaaa869a845e689399092cb9a61feca66cf12',
       url = 'https://github.com/r001/tree-sitter-leo',
     },
     maintainers = { '@r001' },
@@ -1280,7 +1280,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = '7862a3424832c3a9d45eb21143b375837bd6573b',
+      revision = '4c19cc5b2b408de590f83497a90cc941ed59ea06',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1376,7 +1376,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '0d5a05e543af2de60cdb5e71f0f5888c95ab936f',
+      revision = '306c43ab28b7b8a4976e40ff0a7c26b019ad52df',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'affbd6f3b08155826a22cfa8373147acbf60f1f1',
+      revision = 'fd8cbd544bdff4acdfe1da63b403b5c591059aeb',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1440,7 +1440,7 @@ return {
   },
   nickel = {
     install_info = {
-      revision = '3039ad9e9af3c1ffe049a04ee83a2b489915b0b9',
+      revision = '88d836a24b3b11c8720874a1a9286b8ae838d30a',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 4,
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = '486bb0337ee94575f53367b53bffeaea99063f2c',
+      revision = '537095ddc80cf610fa75a2a0149fe9799b011014',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1577,7 +1577,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = '3a21d9cb2a20a062c17f8f53d5983fd473c4673c',
+      revision = '55fb764e6a94512ceeaa1b9e4d53f6103e0610b2',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'c07d69739ba71b5a449bdbb7735991f8aabf8546',
+      revision = 'a552625b56c19006932cff1f207ebc07b55ed12d',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'c07d69739ba71b5a449bdbb7735991f8aabf8546',
+      revision = 'a552625b56c19006932cff1f207ebc07b55ed12d',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1633,7 +1633,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = '39da859947b94abdee43e431368e1ae975c0a424',
+      revision = '0bf8387987c21bf2f8ed41d2575a8f22b139687f',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1778,7 +1778,7 @@ return {
   },
   python = {
     install_info = {
-      revision = '0dee05ef958ba2eae88d1e65f24b33cad70d4367',
+      revision = '346fa42dc2990d2a2736cc60891369d0d3d8e65c',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
@@ -1803,7 +1803,7 @@ return {
   qmljs = {
     install_info = {
       generate_from_json = true,
-      revision = 'febf48a5b6928600cd8fb2a01254743af550780d',
+      revision = 'cc4186f15e2829385be33440561fdd17b1c40cf7',
       url = 'https://github.com/yuja/tree-sitter-qmljs',
     },
     maintainers = { '@Decodetalkers' },
@@ -1967,7 +1967,7 @@ return {
   },
   ruby = {
     install_info = {
-      revision = '0ffe457fb6aabf064f173fd30ea356845cef2513',
+      revision = '7dbc1e2d0e2d752577655881f73b4573f3fe85d4',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
@@ -1983,7 +1983,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '9c84af007b0f144954adb26b3f336495cbb320a7',
+      revision = '2b43eafe64470846cdaa0eaae1e287c120ee5f03',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -1991,7 +1991,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'be7184df70dd3b5790becfb2c93ba796b2797781',
+      revision = 'dd7fe4d7838ca751f5259718658dd309d999855b',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2025,7 +2025,7 @@ return {
   sflog = {
     install_info = {
       location = 'sflog',
-      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
+      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiaofinland' },
@@ -2052,7 +2052,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74',
+      revision = '34ccfd58d3baee7636f62d9326f32092264e8407',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2094,7 +2094,7 @@ return {
   soql = {
     install_info = {
       location = 'soql',
-      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
+      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2103,7 +2103,7 @@ return {
   sosl = {
     install_info = {
       location = 'sosl',
-      revision = 'c47a639e1a0e5407ee39a8761ec1accebe6dacfc',
+      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2130,7 +2130,7 @@ return {
     install_info = {
       branch = 'gh-pages',
       generate_from_json = true,
-      revision = 'c67ecbd37d8d12f22e4cc7138afd14bc20253e10',
+      revision = 'a8b10c76759a372d0f92bb070b4f5c993e0ce5f9',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2172,7 +2172,7 @@ return {
   styled = {
     install_info = {
       generate_from_json = true,
-      revision = '65835cca33a5f033bcde580ed66cde01c1fabbbe',
+      revision = 'e8bf912db4996b32515639d42fe2b258517f135e',
       url = 'https://github.com/mskelton/tree-sitter-styled',
     },
     maintainers = { '@mskelton' },
@@ -2224,7 +2224,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '769bb834feb2947f2c706d82830b0a05958727de',
+      revision = 'd627a54d7266f0a8ee61b447b34d0ad07dadf1d6',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2264,7 +2264,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = '91cc49a83f4f0b3a756bf7d0e65403a9cf757003',
+      revision = 'b3710fe2723bd9b285de7f3d0c0717bebf3f17bd',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2298,7 +2298,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = 'de0d0ee129cf643872e8e0d5c4a6589b5a3aae23',
+      revision = '58aed18580c476d7bc211f187e7b07a6cd12bb1f',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2486,7 +2486,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '7f80a0441ff2ca6aa8ced8e1ee87cead9dd26515',
+      revision = 'a18d695ec105f0cda1903d1974f493207e122b35',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2526,7 +2526,7 @@ return {
   },
   vhs = {
     install_info = {
-      revision = '90028bbadb267ead5b87830380f6a825147f0c0f',
+      revision = '09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6',
       url = 'https://github.com/charmbracelet/tree-sitter-vhs',
     },
     maintainers = { '@caarlos0' },

From 83dae49a10d6eaedb77f0a26df921825341242d9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 27 Aug 2024 11:02:34 +0200
Subject: [PATCH 2318/2704] feat(install): allow specifying max jobs

---
 lua/nvim-treesitter/install.lua | 5 +++--
 scripts/install-parsers.lua     | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index f9a52461c..07be39d6d 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -23,7 +23,7 @@ local uv_symlink = a.wrap(uv.fs_symlink, 4)
 ---@type fun(path: string): string?
 local uv_unlink = a.wrap(uv.fs_unlink, 2)
 
-local MAX_JOBS = 10
+local MAX_JOBS = 100
 local INSTALL_TIMEOUT = 60000
 
 ---@async
@@ -402,6 +402,7 @@ end
 ---@class InstallOptions
 ---@field force? boolean
 ---@field generate? boolean
+---@field max_jobs? integer
 
 --- Install a parser
 ---@param languages string[]
@@ -425,7 +426,7 @@ local function install(languages, options, _callback)
     end)
   end
 
-  a.join(MAX_JOBS, nil, tasks)
+  a.join(options and options.max_jobs or MAX_JOBS, nil, tasks)
   if #tasks > 1 then
     a.main()
     log.info('Installed %d/%d languages', done, #tasks)
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index c607e51f4..756d34561 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -1,10 +1,13 @@
 #!/usr/bin/env -S nvim -l
 
 local generate = false
+local max_jobs = nil ---@as integer
 local parsers = {}
 for i = 1, #_G.arg do
   if _G.arg[i] == '--generate' then
     generate = true
+  elseif _G.arg[i]:find('^%-%-max%-jobs') then
+    max_jobs = _G.arg[i]:match('=(%d+)')
   else
     parsers[#parsers + 1] = _G.arg[i]
   end
@@ -18,7 +21,7 @@ vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
 local done = false
 require('nvim-treesitter.install').install(
   #parsers > 0 and parsers or 'all',
-  { force = true, generate = generate },
+  { force = true, generate = generate, max_jobs = max_jobs },
   function()
     done = true
   end

From c5a8c9d01a12efbdee501d67dba7423b790fe500 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 18 Aug 2024 13:01:29 +0200
Subject: [PATCH 2319/2704] ci(tests): add optional workflow for generating
 grammars

run on PR by adding label `ci:generate` or manually
---
 .github/workflows/lint.yml          |   4 +-
 .github/workflows/test-core.yml     |  55 ++++++++
 .github/workflows/test-generate.yml |  20 +++
 .github/workflows/test-queries.yml  |  55 +-------
 SUPPORTED_LANGUAGES.md              |  20 ++-
 lua/nvim-treesitter/parsers.lua     | 206 ++++++++++++++--------------
 6 files changed, 201 insertions(+), 159 deletions(-)
 create mode 100644 .github/workflows/test-core.yml
 create mode 100644 .github/workflows/test-generate.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cd97cda06..5c29559d0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,4 +1,4 @@
-name: Linting and style checking
+name: Lint
 
 on:
   pull_request:
@@ -34,7 +34,7 @@ jobs:
           args: --check .
 
   format-queries:
-    name: Lint queries
+    name: Format queries
     runs-on: ubuntu-latest
     env:
       NVIM_TAG: nightly
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
new file mode 100644
index 000000000..313084dab
--- /dev/null
+++ b/.github/workflows/test-core.yml
@@ -0,0 +1,55 @@
+on:
+  workflow_call:
+    inputs:
+      type:
+        type: string
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  check_compilation:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        nvim_tag: [nightly]
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: tree-sitter/setup-action/cli@v1
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Install and prepare Neovim
+        env:
+          NVIM_TAG: ${{ matrix.nvim_tag }}
+        run: |
+          bash ./scripts/ci-install.sh
+
+      - if: inputs.type == 'generate'
+        name: Generate and compile parsers
+        run: $NVIM -l ./scripts/install-parsers.lua --generate --max-jobs=2
+
+      - if: inputs.type == 'queries'
+        name: Setup Parsers Cache
+        id: parsers-cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.local/share/nvim/site/parser/
+            ~/AppData/Local/nvim-data/site/parser/
+          key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
+            './lua/nvim-treesitter/install.lua',
+            './lua/nvim-treesitter/parsers.lua') }}
+
+      - if: inputs.type == 'queries'
+        name: Compile parsers
+        run: $NVIM -l ./scripts/install-parsers.lua
+
+      - name: Check query files
+        run: $NVIM -l ./scripts/check-queries.lua
diff --git a/.github/workflows/test-generate.yml b/.github/workflows/test-generate.yml
new file mode 100644
index 000000000..ae2f7bd1f
--- /dev/null
+++ b/.github/workflows/test-generate.yml
@@ -0,0 +1,20 @@
+name: Generate from grammar
+
+on:
+  pull_request:
+    types: [unlabeled, labeled, opened, synchronize, reopened]
+    branches:
+      - "main"
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  check_compilation:
+    name: Build
+    if: contains(github.event.pull_request.labels.*.name, 'ci:generate') || github.event_name == 'workflow_dispatch'
+    uses: ./.github/workflows/test-core.yml
+    with:
+      type: "generate"
diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index 819924c43..a7d4ae79c 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -1,58 +1,17 @@
-name: Test queries
+name: Check queries
 
 on:
-  # push:
-  #   branches:
-  #     - "main"
   pull_request:
     branches:
       - "main"
 
-# Cancel any in-progress CI runs for a PR if it is updated
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: bash
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   check_compilation:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-14]
-        nvim_tag: [nightly]
-
-    name: Parser compilation
-    runs-on: ${{ matrix.os }}
-    env:
-      NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: tree-sitter/setup-action/cli@v1
-      - uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Install and prepare Neovim
-        env:
-          NVIM_TAG: ${{ matrix.nvim_tag }}
-        run: |
-          bash ./scripts/ci-install.sh
-
-      - name: Setup Parsers Cache
-        id: parsers-cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.local/share/nvim/site/parser/
-            ~/AppData/Local/nvim-data/site/parser/
-          key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
-            './lua/nvim-treesitter/install.lua',
-            './lua/nvim-treesitter/parsers.lua') }}
-
-      - name: Compile parsers
-        run: $NVIM -l ./scripts/install-parsers.lua
-
-      - name: Check query files
-        run: $NVIM -l ./scripts/check-queries.lua
+    name: Build
+    uses: ./.github/workflows/test-core.yml
+    with:
+      type: "queries"
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index fe389b55a..5f3832ddc 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -49,7 +49,7 @@ Language | Tier | Queries | Maintainer
 [dart](https://github.com/UserNobody14/tree-sitter-dart) | community | `HFIJL` | @akinsho
 [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` | @jedrzejboczar
 [dhall](https://github.com/jbellerb/tree-sitter-dhall) | community | `HF J ` | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `H  J ` | @gbprod
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `HF J ` | @gbprod
 [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` | @ColinKennedy
 [djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` | @NoahTheDuke
 [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` | @camdencheek
@@ -78,8 +78,11 @@ ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
 [forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | community | `HFIJL` | @amaanq
 [fortran](https://github.com/stadelmanma/tree-sitter-fortran) | community | `HFIJ ` | @amaanq
 [fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H  J ` | @mgramigna
+[fsharp](https://github.com/ionide/tree-sitter-fsharp) | community | `H  J ` | @nsidorenco
 [func](https://github.com/tree-sitter-grammars/tree-sitter-func) | core | `H  J ` | @amaanq
 [fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | community | `HFIJL` | @jirgn
+[gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | community | `HF JL` | @reiniscirpons
+[gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | community | `HF J ` | @reiniscirpons
 [gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` | @PrestonKnopp
 [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` | @godofavacyn
 [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | community | `HF J ` | @amaanq
@@ -88,7 +91,9 @@ ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
 [gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | community | `H  J ` | @gbprod
 [gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | community | `H  J ` | @theHamsta
 [gleam](https://github.com/gleam-lang/tree-sitter-gleam) | community | `HFIJL` | @amaanq
-[glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)[^glimmer] | community | `HFIJL` | @NullVoxPopuli
+[glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | community | `HFIJL` | @NullVoxPopuli
+[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | community | `H IJL` | @NullVoxPopuli
+[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | community | `H IJ ` | @NullVoxPopuli
 [glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | core | `HFIJL` | @theHamsta
 [gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | core | `HFIJL` | @amaanq
 [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` | @dpezto
@@ -160,7 +165,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | stable | `H  J ` | @MDeiml
 [matlab](https://github.com/acristoffers/tree-sitter-matlab) | community | `HFIJL` | @acristoffers
 [menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `H  J ` | 
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `HFIJ ` | 
 [meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | core | `HFIJ ` | @Decodetalkers
 [mlir](https://github.com/artagnon/tree-sitter-mlir) | community | `H  JL` | @artagnon
 [muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` | @Freed-Wu
@@ -251,9 +256,10 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [strace](https://github.com/sigmaSd/tree-sitter-strace) | community | `H  J ` | @amaanq
 [styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` | @mskelton
 [supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` | @madskjeldgaard
+[superhtml](https://github.com/kristoff-it/superhtml) | community | `H  J ` | @rockorager
 [surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` | @connorlay
 [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` | @amaanq
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `H IJL` | @alex-pinkus
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `HFIJL` | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` | @ok-ryoko
 [systemverilog](https://github.com/zhangwwpeng/tree-sitter-systemverilog) | community | `HF J ` | @zhangwwpeng
@@ -304,9 +310,13 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` | @Hubro
 [yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | core | `HFIJL` | @Philipp-M, @amaanq
 [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` | @Freed-Wu
-[zig](https://github.com/maxxnino/tree-sitter-zig) | community | `HFIJL` | @maxxnino
+[zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | stable | `HFIJL` | @amaanq
+[ziggy](https://github.com/kristoff-it/ziggy) | community | `H I  ` | @rockorager
+[ziggy_schema](https://github.com/kristoff-it/ziggy) | community | `H I  ` | @rockorager
 [^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
+[^gap]: GAP system
+[^gaptst]: GAP system test files
 [^gdscript]: Godot
 [^glimmer]: Glimmer and Ember
 [^godot_resource]: Godot Resources
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 685e2dffe..48f86b11a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -19,7 +19,7 @@ return {
   angular = {
     install_info = {
       generate_from_json = true,
-      revision = 'c2d1f6d4c5f1993afce7f984ca2675af8d67457c',
+      revision = '745d3c65c2294aca1110b6b6ad6805124be605c9',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -29,7 +29,7 @@ return {
   apex = {
     install_info = {
       location = 'apex',
-      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
+      revision = '779684231107cef4d86ac16f74320e9324680da3',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -38,7 +38,7 @@ return {
   arduino = {
     install_info = {
       generate_from_json = true,
-      revision = 'afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f',
+      revision = '415ebc8f75eb02a748faa03f5af199f08ced120f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
@@ -73,14 +73,14 @@ return {
   },
   awk = {
     install_info = {
-      revision = 'ba7472152d79a8c916550c80fdbfd5724d07a0c9',
+      revision = '553fdc4afb3b603332c3f4baf50c711506f4e797',
       url = 'https://github.com/Beaglefoot/tree-sitter-awk',
     },
     tier = 4,
   },
   bash = {
     install_info = {
-      revision = '2fbd860f802802ca76a6661ce025b3a3bca2d3ed',
+      revision = 'c8713e50f0bd77d080832fc61ad128bc8f2934e9',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -161,7 +161,7 @@ return {
   },
   c = {
     install_info = {
-      revision = '927da1f210ebb24b7f109230a61a55b428875985',
+      revision = 'f4c21152f1952a99f4744e8c41d3ffb8038ae78c',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -169,7 +169,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = '31a64b28292aac6adf44071e449fa03fb80eaf4e',
+      revision = 'fd7f7402db6e66afd70b402fb2e367b2d71c10d6',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -275,7 +275,7 @@ return {
   cpp = {
     install_info = {
       generate_from_json = true,
-      revision = 'b1a4e2b25148f3cfcb5f241cbc4c49f001a6fb35',
+      revision = '30d2fa385735378388a55917e2910965fce19748',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -284,7 +284,7 @@ return {
   },
   css = {
     install_info = {
-      revision = '9af0bdd9d225edee12f489cfa8284e248321959b',
+      revision = 'a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7',
       url = 'https://github.com/tree-sitter/tree-sitter-css',
     },
     maintainers = { '@TravonteD' },
@@ -303,7 +303,7 @@ return {
   cuda = {
     install_info = {
       generate_from_json = true,
-      revision = '8812343a1f8496fc219f3d07a270f9c1d6ba3391',
+      revision = '635e8aa3747823a0c4e9660c07cef76fe8d3ef93',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
     maintainers = { '@theHamsta' },
@@ -328,7 +328,7 @@ return {
   },
   d = {
     install_info = {
-      revision = 'ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e',
+      revision = '45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a',
       url = 'https://github.com/gdamore/tree-sitter-d',
     },
     maintainers = { '@amaanq' },
@@ -336,7 +336,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = 'cf72df5d4a623ca705e81bf9e9d264e1fe9d5da0',
+      revision = '9ac03bb2154316624fb4c41fe0f372a5f1597b43',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -352,7 +352,7 @@ return {
   },
   devicetree = {
     install_info = {
-      revision = '296b3c294a8bcfca6673296d99f9cd37049b8026',
+      revision = '07a647c8fb70e6b06379a60526721e3141aa2fd2',
       url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
     maintainers = { '@jedrzejboczar' },
@@ -425,7 +425,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = 'b0a9bc5737340a9b80b489fe9ae93d7b2fe78cd7',
+      revision = '1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -447,7 +447,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'fd0d64d2fc91eab903bed4c11ce280b62e46f16e',
+      revision = 'a761198025448c77ea11bcf22505b395a77fc0d0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -471,7 +471,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = 'c7ae8b77e2749826dcf23df6514f08fdd68c66a3',
+      revision = 'ef124b83a3f3572b0af23db4efae3f8de06a15e1',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -479,7 +479,7 @@ return {
   },
   elm = {
     install_info = {
-      revision = '09dbf221d7491dc8d8839616b27c21b9c025c457',
+      revision = '27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
@@ -503,7 +503,7 @@ return {
   },
   embedded_template = {
     install_info = {
-      revision = 'ffbf64942c334933ee7982e144557b6efb76d0b9',
+      revision = '62b0a6e45900a7dff7c37da95fec20a09968ba52',
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
     tier = 4,
@@ -518,7 +518,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '0b5a0dcfcedd9b397252cb5568cc55ab1905b1a9',
+      revision = 'f1919a34af3a9c79402c4a3d6c52986e9c2ea949',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '6b633433fb3f132f21250cf8e8be76d5a6389b7e',
+      revision = '4a593dda9cbc050a6686187249f8350ceea292ce',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -607,8 +607,8 @@ return {
   },
   fsharp = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'fsharp',
+      revision = '5202637c203fcf8876affbd18b04ff43256d4c4a',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -632,8 +632,8 @@ return {
   },
   gap = {
     install_info = {
+      revision = '141b063335e85299bde3f61b4888d02d674a1abc',
       url = 'https://github.com/gap-system/tree-sitter-gap',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@reiniscirpons' },
     readme_note = 'GAP system',
@@ -641,8 +641,8 @@ return {
   },
   gaptst = {
     install_info = {
+      revision = 'e0723dc6136309b3d5904dad2c73ef71267428c1',
       url = 'https://github.com/gap-system/tree-sitter-gaptst',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@reiniscirpons' },
     readme_note = 'GAP system test files',
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '426e67087fd62be5f4533581b5916b2cf010fb5b',
+      revision = '57c9951b290c8084d7c60b0aee7a2b30986ea031',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -725,9 +725,9 @@ return {
   },
   glimmer_javascript = {
     install_info = {
-      url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = 'a260911201684f80cf815418b3771e6c39309f81',
+      url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
     },
     maintainers = { '@NullVoxPopuli' },
     requires = { 'ecma' },
@@ -735,9 +735,9 @@ return {
   },
   glimmer_typescript = {
     install_info = {
-      url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
-      files = { 'src/parser.c', 'src/scanner.c' },
       generate_from_json = true,
+      revision = '9d018a0f93417e6951264a26093b89ee63df7315',
+      url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
     },
     maintainers = { '@NullVoxPopuli' },
     requires = { 'typescript' },
@@ -746,7 +746,7 @@ return {
   glsl = {
     install_info = {
       generate_from_json = true,
-      revision = 'ddc3137a2d775aca93084ff997fa13cc1691058a',
+      revision = '66aec57f7119c7e8e40665b723cd7af5594f15ee',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
     },
     maintainers = { '@theHamsta' },
@@ -772,7 +772,7 @@ return {
   },
   go = {
     install_info = {
-      revision = '6204b7308a32e991a8daed2e9895a90be55a510a',
+      revision = 'ecc20866d1bd4d80f3aef06456ed3014d4d598e6',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
@@ -797,7 +797,7 @@ return {
   },
   gomod = {
     install_info = {
-      revision = '1f55029bacd0a6a11f6eb894c4312d429dcf735c',
+      revision = '3b01edce2b9ea6766ca19328d1850e456fde3103',
       url = 'https://github.com/camdencheek/tree-sitter-go-mod',
     },
     maintainers = { '@camdencheek' },
@@ -853,7 +853,7 @@ return {
   },
   groovy = {
     install_info = {
-      revision = '171b3b7412bc93284fc0dad0a7a7bbbbd1b51289',
+      revision = '0d8884514fe10c4fa47527d9a0284d207f38ddea',
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
@@ -884,7 +884,7 @@ return {
   },
   haskell = {
     install_info = {
-      revision = 'a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19',
+      revision = '558b997049fddcb07fc513528189c57d6129a260',
       url = 'https://github.com/tree-sitter/tree-sitter-haskell',
     },
     maintainers = { '@mrcjkb' },
@@ -936,7 +936,7 @@ return {
   hlsl = {
     install_info = {
       generate_from_json = true,
-      revision = '5d788a46727c8199a7c63a3c849092e0364375b6',
+      revision = '543930235970a04c2f0d549c9e88815847c7a74a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
     },
     maintainers = { '@theHamsta' },
@@ -970,7 +970,7 @@ return {
   },
   html = {
     install_info = {
-      revision = 'd11201a263d02169d303db903ba0bb13dc59e068',
+      revision = '14bdaf0da9e26e2de9b30178c2242539d2b0b285',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
@@ -992,7 +992,7 @@ return {
   },
   http = {
     install_info = {
-      revision = 'bbcd67642e5749b90277c353b72e762f3be16993',
+      revision = '231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94',
       url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
@@ -1000,7 +1000,7 @@ return {
   },
   hurl = {
     install_info = {
-      revision = 'fba6ed8db3a009b9e7d656511931b181a3ee5b08',
+      revision = 'ff07a42d9ec95443b5c1b57ed793414bf7b79be5',
       url = 'https://github.com/pfeiferj/tree-sitter-hurl',
     },
     maintainers = { '@pfeiferj' },
@@ -1032,7 +1032,7 @@ return {
   },
   ini = {
     install_info = {
-      revision = '87176e524f0a98f5be75fa44f4f0ff5c6eac069c',
+      revision = '962568c9efa71d25720ab42c5d36e222626ef3a6',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
@@ -1040,7 +1040,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = '234c87be1dac20f766ddf6f486a7bde2a4bc5594',
+      revision = '6f9c072d023c3886aabcd8012274461b35d2d0a9',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
@@ -1074,7 +1074,7 @@ return {
   },
   java = {
     install_info = {
-      revision = '576d8097e495b411f31daaee28cb34c1752ac702',
+      revision = '490d878cf33b0ad5ae7a7253ff30597a5bdc348e',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
@@ -1090,7 +1090,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = '15887341e5b57ffdb423aff840aef142b8f53d6d',
+      revision = 'b6f0624c1447bc209830b195999b78a56b10a579',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1128,7 +1128,7 @@ return {
   },
   jsdoc = {
     install_info = {
-      revision = '49fde205b59a1d9792efc21ee0b6d50bbd35ff14',
+      revision = 'bc09606fc786ead131a301e4b7524888f2d5c517',
       url = 'https://github.com/tree-sitter/tree-sitter-jsdoc',
     },
     maintainers = { '@steelsojka' },
@@ -1136,7 +1136,7 @@ return {
   },
   json = {
     install_info = {
-      revision = 'bdd69eb8c8a58a9f54df03de0488d9990179be46',
+      revision = '8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
@@ -1175,7 +1175,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = 'a528de39923448e6b809a6b9f686f3472728f202',
+      revision = '3520b57e418f734f582215181ecd926a6178c90f',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
@@ -1215,7 +1215,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'dc5e8a14cb1f45582a8c221a270a199a5f8bdb63',
+      revision = 'ec985672ff21f7fd7f835869d8021e8f87304bb4',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1223,7 +1223,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = 'd4109879ba1387d19095269a7473bd7d274ab848',
+      revision = 'cbf637e5163065934c827d254b293f4d2f08f523',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1239,7 +1239,7 @@ return {
   },
   lalrpop = {
     install_info = {
-      revision = '854a40e99f7c70258e522bdb8ab584ede6196e2e',
+      revision = '194c25539f435de415ee0551a5f07058833da915',
       url = 'https://github.com/traxys/tree-sitter-lalrpop',
     },
     maintainers = { '@traxys' },
@@ -1248,7 +1248,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = '90fd9894bebddce79f5b8041e7f82523364a619b',
+      revision = '87e4059f01bed363230dc349f794ce4cc580e862',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -1264,7 +1264,7 @@ return {
   },
   leo = {
     install_info = {
-      revision = 'f5ecaaa869a845e689399092cb9a61feca66cf12',
+      revision = '6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb',
       url = 'https://github.com/r001/tree-sitter-leo',
     },
     maintainers = { '@r001' },
@@ -1280,7 +1280,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = '4c19cc5b2b408de590f83497a90cc941ed59ea06',
+      revision = '23ac814111e2b4b4b083e2c92219af2d5b74d13d',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1304,7 +1304,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = 'a24dab177e58c9c6832f96b9a73102a0cfbced4a',
+      revision = '99fc677e6971c425e8d407f59c77ab897e585c92',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1356,7 +1356,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '7fe453beacecf02c86f7736439f238f5bb8b5c9b',
+      revision = 'b7eba93e6a3e588e259e831416ac11abdaa8616a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1367,7 +1367,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '7fe453beacecf02c86f7736439f238f5bb8b5c9b',
+      revision = 'b7eba93e6a3e588e259e831416ac11abdaa8616a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'fd8cbd544bdff4acdfe1da63b403b5c591059aeb',
+      revision = '5da32586f41659cc566d6f8145f9aaff3b842c96',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1440,7 +1440,7 @@ return {
   },
   nickel = {
     install_info = {
-      revision = '88d836a24b3b11c8720874a1a9286b8ae838d30a',
+      revision = 'ddaa2bc22355effd97c0d6b09ff5962705c6368d',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 4,
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = '537095ddc80cf610fa75a2a0149fe9799b011014',
+      revision = '8be0e516904650a868639aa8d3923ebe84f62627',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1516,7 +1516,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '036226e5edb410aec004cc7ac0f4b2014dd04a0e',
+      revision = '5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1525,7 +1525,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '036226e5edb410aec004cc7ac0f4b2014dd04a0e',
+      revision = '5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1543,7 +1543,7 @@ return {
   },
   odin = {
     install_info = {
-      revision = 'd37b8f24f653378b268ec18404e9c14ad355b128',
+      revision = '3fee7964bbfb2554deef12c224344f3870d15375',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-odin',
     },
     maintainers = { '@amaanq' },
@@ -1577,7 +1577,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = '55fb764e6a94512ceeaa1b9e4d53f6103e0610b2',
+      revision = '81c57e274c541c30d6c204c8dbceb90ec647ed8d',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'a552625b56c19006932cff1f207ebc07b55ed12d',
+      revision = '07a04599ed9ac97f82c6383a24ae139a807930f3',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'a552625b56c19006932cff1f207ebc07b55ed12d',
+      revision = '07a04599ed9ac97f82c6383a24ae139a807930f3',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1607,7 +1607,7 @@ return {
   phpdoc = {
     install_info = {
       generate_from_json = true,
-      revision = '1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc',
+      revision = 'df5e7da4b83da072f99135079ac3436550b8d67d',
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
     maintainers = { '@mikehaertl' },
@@ -1659,7 +1659,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = 'fc15514b2f1dbba9c58528d15a3708f89eda6a01',
+      revision = 'ebe2ab2f642eda2072c68c8de02e83973c26f33c',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1778,7 +1778,7 @@ return {
   },
   python = {
     install_info = {
-      revision = '346fa42dc2990d2a2736cc60891369d0d3d8e65c',
+      revision = '8c65e256f971812276ff2a69a2f515c218ed7f82',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
@@ -1786,7 +1786,7 @@ return {
   },
   ql = {
     install_info = {
-      revision = '42becd6f8f7bae82c818fa3abb1b6ff34b552310',
+      revision = 'c73c31c89cb0019ef56fe8bc1723e7c36e0be607',
       url = 'https://github.com/tree-sitter/tree-sitter-ql',
     },
     maintainers = { '@pwntester' },
@@ -1821,7 +1821,7 @@ return {
   },
   r = {
     install_info = {
-      revision = 'b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d',
+      revision = '2097fa502efa21349d26af0ffee55d773015e481',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -1829,7 +1829,7 @@ return {
   },
   racket = {
     install_info = {
-      revision = '171f52a8c0ed635b85cd42d1e36d82f1066a03b4',
+      revision = '5b211bf93021d1c45f39aa96898be9f794f087e4',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 4,
@@ -1870,7 +1870,7 @@ return {
   },
   re2c = {
     install_info = {
-      revision = '47aa19cf5f7aba2ed30e2b377f7172df76e819a6',
+      revision = 'c18a3c2f4b6665e35b7e50d6048ea3cff770c572',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-re2c',
     },
     maintainers = { '@amaanq' },
@@ -1878,7 +1878,7 @@ return {
   },
   readline = {
     install_info = {
-      revision = '3d4768b04d7cfaf40533e12b28672603428b8f31',
+      revision = '74addc90fc539d31d413c0c7cf7581997a7fa46e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-readline',
     },
     maintainers = { '@ribru17' },
@@ -1886,7 +1886,7 @@ return {
   },
   regex = {
     install_info = {
-      revision = '47007f195752d8e57bda80b0b6cdb2d173a9f7d7',
+      revision = 'f70251e1f1d72bd6dc1f897f956f9112f8668441',
       url = 'https://github.com/tree-sitter/tree-sitter-regex',
     },
     maintainers = { '@theHamsta' },
@@ -1967,7 +1967,7 @@ return {
   },
   ruby = {
     install_info = {
-      revision = '7dbc1e2d0e2d752577655881f73b4573f3fe85d4',
+      revision = '0b4729672f9aec4810c01a0f971541dcb433fef5',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
@@ -1983,7 +1983,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '2b43eafe64470846cdaa0eaae1e287c120ee5f03',
+      revision = '6b7d1fc73ded57f73b1619bcf4371618212208b1',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -1991,7 +1991,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'dd7fe4d7838ca751f5259718658dd309d999855b',
+      revision = '2cfbb6e3fcdfd51e0d477a43cc37ae8c6f87dc2e',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2008,7 +2008,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = '8f9dff3d038f09934db5ea113cebc59c74447743',
+      revision = '63e25a4a84142ae7ee0ee01fe3a32c985ca16745',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 4,
@@ -2025,7 +2025,7 @@ return {
   sflog = {
     install_info = {
       location = 'sflog',
-      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
+      revision = '779684231107cef4d86ac16f74320e9324680da3',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiaofinland' },
@@ -2035,7 +2035,7 @@ return {
   slang = {
     install_info = {
       generate_from_json = true,
-      revision = 'd84b43d75d65bbc4ba57166ce17555f32c0b8983',
+      revision = 'dd991eb3b6957a33d9044e0f5914588f7f449a78',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
     maintainers = { '@theHamsta' },
@@ -2052,7 +2052,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '34ccfd58d3baee7636f62d9326f32092264e8407',
+      revision = '4e2765d4cac1f03ada6f635eeb6008d1d0aff5a3',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2094,7 +2094,7 @@ return {
   soql = {
     install_info = {
       location = 'soql',
-      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
+      revision = '779684231107cef4d86ac16f74320e9324680da3',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2103,7 +2103,7 @@ return {
   sosl = {
     install_info = {
       location = 'sosl',
-      revision = '602cc4b050ef1e14a69acc2ea094968bf928fa59',
+      revision = '779684231107cef4d86ac16f74320e9324680da3',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2172,7 +2172,7 @@ return {
   styled = {
     install_info = {
       generate_from_json = true,
-      revision = 'e8bf912db4996b32515639d42fe2b258517f135e',
+      revision = '764af55fc6b8e5ae177eb272f5c5de6238db23e6',
       url = 'https://github.com/mskelton/tree-sitter-styled',
     },
     maintainers = { '@mskelton' },
@@ -2180,7 +2180,7 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = 'affa4389186b6939d89673e1e9d2b28364f5ca6f',
+      revision = '1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
@@ -2188,8 +2188,8 @@ return {
   },
   superhtml = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
       location = 'tree-sitter-superhtml',
+      revision = '3edb67236291d45ba97a79cdac3b91692487a352',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2206,7 +2206,7 @@ return {
   svelte = {
     install_info = {
       generate_from_json = true,
-      revision = '7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8',
+      revision = '774a65aea563accc35f5d45fafa4d96ec5761f57',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
     },
     maintainers = { '@amaanq' },
@@ -2224,7 +2224,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'd627a54d7266f0a8ee61b447b34d0ad07dadf1d6',
+      revision = '4bff50b78b4d3c0517e4d0f0a344aca165f00146',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2264,7 +2264,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = 'b3710fe2723bd9b285de7f3d0c0717bebf3f17bd',
+      revision = '09c57b6b9759560b4d067e0546c9953ee0e065da',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2272,7 +2272,7 @@ return {
   },
   tcl = {
     install_info = {
-      revision = '8784024358c233efd0f3a6fd9e7a3c5852e628bc',
+      revision = 'cdba4ab96a9896492d0d5219b70300c8783ca4e7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
@@ -2298,7 +2298,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = '58aed18580c476d7bc211f187e7b07a6cd12bb1f',
+      revision = '80d1a04e6bf3ced1c924bcb05527aa2eaf3f6239',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2316,7 +2316,7 @@ return {
   },
   textproto = {
     install_info = {
-      revision = '8dacf02aa402892c91079f8577998ed5148c0496',
+      revision = 'd900077aef9f5dcb0d47c86be33585013ed5db9a',
       url = 'https://github.com/PorterAtGoogle/tree-sitter-textproto',
     },
     maintainers = { '@Porter' },
@@ -2340,7 +2340,7 @@ return {
   },
   tlaplus = {
     install_info = {
-      revision = 'bba02e79f85e335f310fc95e21c677e49f2c4439',
+      revision = 'da9cf9793686e236327aadfbad449414c895bf84',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
@@ -2384,7 +2384,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'tsx',
-      revision = '198d03553f43a45b92ac5d0ee167db3fec6a6fd6',
+      revision = '9951831c5f05be434514dce38b30eef213667601',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2411,7 +2411,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'typescript',
-      revision = '198d03553f43a45b92ac5d0ee167db3fec6a6fd6',
+      revision = '9951831c5f05be434514dce38b30eef213667601',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2461,7 +2461,7 @@ return {
   unison = {
     install_info = {
       generate = true,
-      revision = '59d36a09282be7e4d3374854126590f3dcebee6e',
+      revision = 'bc06e1eb100e1c0fab9bd89a9ca55d646ac80fc4',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },
@@ -2486,7 +2486,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = 'a18d695ec105f0cda1903d1974f493207e122b35',
+      revision = 'bc5b3caa85f7a8d4597f51aeaf92b83162ed6b33',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2518,7 +2518,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '4ab3e251eae8890a020d083d00acd1b8c2653c07',
+      revision = '3f13cd14952b39ccf6817f58880834b84565ca54',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2586,7 +2586,7 @@ return {
   },
   wing = {
     install_info = {
-      revision = 'bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7',
+      revision = '76e0c25844a66ebc6e866d690fcc5f4e90698947',
       url = 'https://github.com/winglang/tree-sitter-wing',
     },
     maintainers = { '@gshpychka', '@MarkMcCulloh' },
@@ -2594,7 +2594,7 @@ return {
   },
   wit = {
     install_info = {
-      revision = 'c52f0b07786603df17ad0197f6cef680f312eb2c',
+      revision = '81490b4e74c792369e005f72b0d46fe082d3fed2',
       url = 'https://github.com/liamwh/tree-sitter-wit',
     },
     maintainers = { '@liamwh' },
@@ -2660,28 +2660,26 @@ return {
   },
   zig = {
     install_info = {
-      revision = '0d08703e4c3f426ec61695d7617415fff97029bd',
+      revision = 'eb7d58c2dc4fbeea4745019dee8df013034ae66b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
     },
     maintainers = { '@amaanq' },
     tier = 1,
   },
-
   ziggy = {
     install_info = {
-      url = 'https://github.com/kristoff-it/ziggy',
-      files = { 'src/parser.c' },
       location = 'tree-sitter-ziggy',
+      revision = '42b6f5d7320340bc5903c4c29d34065e8517a549',
+      url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
     tier = 3,
   },
-
   ziggy_schema = {
     install_info = {
-      url = 'https://github.com/kristoff-it/ziggy',
-      files = { 'src/parser.c' },
       location = 'tree-sitter-ziggy-schema',
+      revision = '42b6f5d7320340bc5903c4c29d34065e8517a549',
+      url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
     tier = 3,

From a2841d29d73db53e4d9767e012ddd5da39898a42 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 6 Oct 2024 12:02:32 +0200
Subject: [PATCH 2320/2704] feat(install)!: bump minimum tree-sitter version to
 0.24

---
 README.md                       |  4 +--
 lua/nvim-treesitter/health.lua  |  4 +--
 lua/nvim-treesitter/install.lua |  1 -
 lua/nvim-treesitter/parsers.lua | 44 ++++++++++++++++-----------------
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index ac2794af5..8523a75e1 100644
--- a/README.md
+++ b/README.md
@@ -27,9 +27,9 @@ The `nvim-treesitter` plugin provides
 
 ## Requirements
 
-- Neovim 0.10.0 or later (nightly)
+- Neovim 0.11.0 or later (nightly)
 - `tar` and `curl` in your path (or alternatively `git`)
-- [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) CLI (0.22.6 or later)
+- [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) CLI (0.24.0 or later)
 - a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
 
 ## Installation
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 30c3345d3..1776cffe7 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -7,7 +7,7 @@ local health = vim.health
 local M = {}
 
 local NVIM_TREESITTER_MINIMUM_ABI = 13
-local TREE_SITTER_MIN_VER = { 0, 22, 6 }
+local TREE_SITTER_MIN_VER = { 0, 25, 1 }
 
 ---@param name string
 ---@return table?
@@ -24,7 +24,7 @@ local function install_health()
   health.start('Requirements')
 
   do -- nvim check
-    if vim.fn.has('nvim-0.10') ~= 1 then
+    if vim.fn.has('nvim-0.11') ~= 1 then
       health.error('Nvim-treesitter requires the latest Neovim nightly')
     end
 
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 07be39d6d..4e0c4485f 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -145,7 +145,6 @@ local function do_generate(logger, repo, compile_location)
   local r = system({
     'tree-sitter',
     'generate',
-    '--no-bindings',
     '--abi',
     tostring(vim.treesitter.language_version),
     repo.generate_from_json and 'src/grammar.json',
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 48f86b11a..002469356 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -29,7 +29,7 @@ return {
   apex = {
     install_info = {
       location = 'apex',
-      revision = '779684231107cef4d86ac16f74320e9324680da3',
+      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -225,7 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = '69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71',
+      revision = 'f2569dd1fce0f252097a25bcbcb9ed8898840310',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -447,7 +447,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'a761198025448c77ea11bcf22505b395a77fc0d0',
+      revision = 'efbe0b2f2eaa248e8c657a80a8c2305056bda477',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -1215,7 +1215,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'ec985672ff21f7fd7f835869d8021e8f87304bb4',
+      revision = '76f53c48d29e8588934fb55b0240d7bdfe00bfe5',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1296,7 +1296,7 @@ return {
   },
   llvm = {
     install_info = {
-      revision = '1b96e58faf558ce057d4dc664b904528aee743cb',
+      revision = 'c14cb839003348692158b845db9edda201374548',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
@@ -1399,7 +1399,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = 'bd17c824196ce70800f64ad39cfddd1b17acc13f',
+      revision = 'c5fffb8edd39f22644084ab3f73a924a75721ee3',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '5da32586f41659cc566d6f8145f9aaff3b842c96',
+      revision = '0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = '8be0e516904650a868639aa8d3923ebe84f62627',
+      revision = '456b14a2fa6315abc7e02fcffaf4a1f35d4955d3',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1577,7 +1577,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = '81c57e274c541c30d6c204c8dbceb90ec647ed8d',
+      revision = '76ab9a52b9dd2a1758aae3da8286519d995037e9',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1607,7 +1607,7 @@ return {
   phpdoc = {
     install_info = {
       generate_from_json = true,
-      revision = 'df5e7da4b83da072f99135079ac3436550b8d67d',
+      revision = 'fe3202e468bc17332bec8969f2b50ff1f1da3a46',
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
     maintainers = { '@mikehaertl' },
@@ -1615,7 +1615,7 @@ return {
   },
   pioasm = {
     install_info = {
-      revision = '924aadaf5dea2a6074d72027b064f939acf32e20',
+      revision = 'afece58efdb30440bddd151ef1347fa8d6f744a9',
       url = 'https://github.com/leo60228/tree-sitter-pioasm',
     },
     maintainers = { '@leo60228' },
@@ -2025,7 +2025,7 @@ return {
   sflog = {
     install_info = {
       location = 'sflog',
-      revision = '779684231107cef4d86ac16f74320e9324680da3',
+      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiaofinland' },
@@ -2094,7 +2094,7 @@ return {
   soql = {
     install_info = {
       location = 'soql',
-      revision = '779684231107cef4d86ac16f74320e9324680da3',
+      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2103,7 +2103,7 @@ return {
   sosl = {
     install_info = {
       location = 'sosl',
-      revision = '779684231107cef4d86ac16f74320e9324680da3',
+      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2189,7 +2189,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '3edb67236291d45ba97a79cdac3b91692487a352',
+      revision = '36f37aa5aa440805f27d4a9f5203e616a303c6a1',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2224,7 +2224,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '4bff50b78b4d3c0517e4d0f0a344aca165f00146',
+      revision = 'a6ec57ad4d12c68d952ba1f869bd373a7ac95832',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2264,7 +2264,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = '09c57b6b9759560b4d067e0546c9953ee0e065da',
+      revision = '83e264928fa194b7283428527259e88e54205264',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2289,7 +2289,7 @@ return {
   teal = {
     install_info = {
       generate = true,
-      revision = '19b02da829d1721a521bf7b802eb80a50bd53aab',
+      revision = '485fbdc00d811b01b2090dff4d0469fd1d0350f5',
       url = 'https://github.com/euclidianAce/tree-sitter-teal',
     },
     maintainers = { '@euclidianAce' },
@@ -2298,7 +2298,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = '80d1a04e6bf3ced1c924bcb05527aa2eaf3f6239',
+      revision = 'e3e894ef9e490c3d36d94a51458ec55480991730',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2436,7 +2436,7 @@ return {
   },
   typst = {
     install_info = {
-      revision = 'abe60cbed7986ee475d93f816c1be287f220c5d8',
+      revision = '8b8b16ef1b40cbecbe3f754b1c1c966b5a0904fe',
       url = 'https://github.com/uben0/tree-sitter-typst',
     },
     maintainers = { '@uben0', '@RaafatTurki' },
@@ -2486,7 +2486,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = 'bc5b3caa85f7a8d4597f51aeaf92b83162ed6b33',
+      revision = 'ea538758a1273b59774dc9179cde460d9c73fd89',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2518,7 +2518,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '3f13cd14952b39ccf6817f58880834b84565ca54',
+      revision = 'd6e8301999336b47d663052d43f983c3edeb01dd',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },

From aaf5b7fdf7664581601063f7804cff02e849525e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 12 Oct 2024 20:14:21 +0200
Subject: [PATCH 2321/2704] fix(install): return error code in callback

---
 SUPPORTED_LANGUAGES.md                   |  20 +-
 lua/nvim-treesitter/install.lua          |  13 +-
 lua/nvim-treesitter/parsers.lua          | 332 +++++++++++------------
 lua/nvim-treesitter/util.lua             |   2 -
 runtime/queries/ada/injections.scm       |   3 -
 runtime/queries/beancount/injections.scm |   3 -
 runtime/queries/unison/injections.scm    |   3 +
 runtime/queries/verilog/injections.scm   |   3 +
 scripts/install-parsers.lua              |  11 +-
 9 files changed, 202 insertions(+), 188 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 5f3832ddc..61cebafa2 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -33,6 +33,7 @@ Language | Tier | Queries | Maintainer
 [cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | core | `HFIJL` | @amaanq
 [capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | core | `HFIJL` | @amaanq
 [chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | core | `HFIJL` | @ObserverOfTime
+[circom](https://github.com/Decurity/tree-sitter-circom) | community | `HF JL` | @alexandr-martirosyan
 [clojure](https://github.com/sogaiu/tree-sitter-clojure) | community | `HF JL` | @NoahTheDuke
 [cmake](https://github.com/uyha/tree-sitter-cmake) | community | `HFIJ ` | @uyha
 [comment](https://github.com/stsewd/tree-sitter-comment) | community | `H    ` | @stsewd
@@ -45,8 +46,10 @@ Language | Tier | Queries | Maintainer
 [csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
 [cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | core | `HFIJL` | @theHamsta
 [cue](https://github.com/eonpatapon/tree-sitter-cue) | community | `HFIJL` | @amaanq
+[cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | community | `HFIJ ` | @elliotfontaine
 [d](https://github.com/gdamore/tree-sitter-d) | community | `HFIJL` | @amaanq
 [dart](https://github.com/UserNobody14/tree-sitter-dart) | community | `HFIJL` | @akinsho
+[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | community | `HF J ` | @ValdezFOmar
 [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` | @jedrzejboczar
 [dhall](https://github.com/jbellerb/tree-sitter-dhall) | community | `HF J ` | @amaanq
 [diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `HF J ` | @gbprod
@@ -106,6 +109,7 @@ ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
 [gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` | @omertuc
 [gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | core | `H  J ` | @ObserverOfTime
 [graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` | @bkegley
+[gren](https://github.com/MaeBrooks/tree-sitter-gren) | community | `H  J ` | @MaeBrooks
 [groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` | @murtaza64
 [gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | core | `H    ` | @theHamsta
 [hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H  J ` | 
@@ -123,12 +127,14 @@ ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
 [html](https://github.com/tree-sitter/tree-sitter-html) | core | `HFIJL` | @TravonteD
 html_tags (queries only)[^html_tags] | community | `H IJ ` | @TravonteD
 [htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | community | `HFIJ ` | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) | community | `H  J ` | @amaanq, @NTBBloodbath
+[http](https://github.com/rest-nvim/tree-sitter-http) | community | `HF J ` | @amaanq, @NTBBloodbath
 [hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` | @pfeiferj
 [hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | core | `HFIJ ` | @luckasRanarison
 [idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H IJ ` | @cathaysia
+[idris](https://github.com/kayhide/tree-sitter-idris) | community | `     ` | @srghma
 [ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF J ` | @theHamsta
 [inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` | @yorickpeterse
+[ipkg](https://github.com/srghma/tree-sitter-ipkg) | community | `HFIJL` | @srghma
 [ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | core | `HFIJL` | @fab4100
 [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` | @sogaiu
 [java](https://github.com/tree-sitter/tree-sitter-java) | core | `HFIJL` | @p00f
@@ -140,7 +146,7 @@ html_tags (queries only)[^html_tags] | community | `H IJ ` | @TravonteD
 [jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | community | `HFIJL` | @WhyNotHugo
 [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF JL` | @nawordar
 jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | core | `HFIJL` | @theHamsta
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | community | `HFIJL` | @fredrikekre
 [just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` | @Hubro
 [kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | core | `HFIJL` | @amaanq
 [kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | core | `HFIJL` | @amaanq
@@ -177,6 +183,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFIJ ` | @alemuller
 [nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HFIJL` | @leo60228
 [nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | core | `HFIJL` | @amaanq
+[nu](https://github.com/nushell/tree-sitter-nu) | community | `H IJ ` | @abhisheksingh0x558
 [objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | core | `HFIJL` | @amaanq
 [objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` | @ColinKennedy
 [ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` | @undu
@@ -233,6 +240,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | core | `HFIJL` | @amaanq
 [rst](https://github.com/stsewd/tree-sitter-rst) | community | `H  JL` | @stsewd
 [ruby](https://github.com/tree-sitter/tree-sitter-ruby) | core | `HFIJL` | @TravonteD
+[runescript](https://github.com/2004Scape/tree-sitter-runescript) | community | `H  J ` | @2004Scape
 [rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` | @amaanq
 [scala](https://github.com/tree-sitter/tree-sitter-scala) | core | `HF JL` | @stevanmilic
 [scfg](https://github.com/rockorager/tree-sitter-scfg) | unsupported | `H  J ` | @WhyNotHugo
@@ -240,6 +248,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFIJ ` | @elianiva
 [sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | community | `H    ` | @aheber, @xixiaofinland
 [slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | core | `HFIJL` | @theHamsta
+[slim](https://github.com/theoo/tree-sitter-slim) | community | `     ` | @theoo
 [slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` | @hunger
 [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` | @amaanq
 [smithy](https://github.com/indoorvivants/tree-sitter-smithy) | community | `H  J ` | @amaanq, @keynmol
@@ -259,10 +268,10 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [superhtml](https://github.com/kristoff-it/superhtml) | community | `H  J ` | @rockorager
 [surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` | @connorlay
 [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` | @amaanq
+[sway](https://github.com/FuelLabs/tree-sitter-sway.git) | core | `HFIJL` | @ribru17
 [swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `HFIJL` | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` | @ok-ryoko
-[systemverilog](https://github.com/zhangwwpeng/tree-sitter-systemverilog) | community | `HF J ` | @zhangwwpeng
 [t32](https://gitlab.com/xasc/tree-sitter-t32) | community | `HFIJL` | @xasc
 [tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | core | `HFIJL` | @amaanq
 [tact](https://github.com/tact-lang/tree-sitter-tact) | community | `HFIJL` | @novusnota
@@ -287,13 +296,13 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` | @uben0, @RaafatTurki
 [udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | core | `H  JL` | @ObserverOfTime
 [ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | core | `HFIJL` | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | community | `H  J ` | @tapegram
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | community | `HF J ` | @tapegram
 [usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFIJL` | @ColinKennedy
 [uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | core | `HFIJL` | @amaanq
 [v](https://github.com/vlang/v-analyzer) | community | `HFIJL` | @kkharji, @amaanq
 [vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF J ` | @Prince781
 [vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` | @wrapperup, @oscarotero
-[verilog](https://github.com/tree-sitter/tree-sitter-verilog) | core | `HF JL` | @zegervdv
+[verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | community | `HF J ` | @zhangwwpeng
 [vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | community | `HF J ` | @jpt13653903
 [vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H  J ` | @caarlos0
 [vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | stable | `HF JL` | @clason
@@ -306,6 +315,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [wit](https://github.com/liamwh/tree-sitter-wit) | community | `HF J ` | @liamwh
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | core | `H  JL` | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` | @ObserverOfTime
+[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | community | `HF JL` | @ValdezFOmar
 [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` | @amaanq
 [yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` | @Hubro
 [yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | core | `HFIJL` | @Philipp-M, @amaanq
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 4e0c4485f..930a8f8f6 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -406,8 +406,8 @@ end
 --- Install a parser
 ---@param languages string[]
 ---@param options? InstallOptions
----@param _callback? fun()
-local function install(languages, options, _callback)
+---@param callback? fun(boolean)
+local function install(languages, options, callback)
   options = options or {}
 
   local cache_dir = fs.normalize(fn.stdpath('cache'))
@@ -430,9 +430,12 @@ local function install(languages, options, _callback)
     a.main()
     log.info('Installed %d/%d languages', done, #tasks)
   end
+  if callback then
+    callback(done == #tasks)
+  end
 end
 
-M.install = a.sync(function(languages, options, _callback)
+M.install = a.sync(function(languages, options, callback)
   reload_parsers()
   if not languages or #languages == 0 then
     languages = 'all'
@@ -444,8 +447,8 @@ M.install = a.sync(function(languages, options, _callback)
     options.force = true
   end
 
-  install(languages, options)
-end, 2)
+  install(languages, options, callback)
+end, 3)
 
 ---@class UpdateOptions
 
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 002469356..d06f184ae 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -10,7 +10,7 @@ return {
   },
   agda = {
     install_info = {
-      revision = 'd3dc807692e6bca671d4491b3bf5c67eeca8c016',
+      revision = 'b9b32fa042c2952a7bfca86847ea325e44ccc897',
       url = 'https://github.com/tree-sitter/tree-sitter-agda',
     },
     maintainers = { '@Decodetalkers' },
@@ -29,7 +29,7 @@ return {
   apex = {
     install_info = {
       location = 'apex',
-      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
+      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -38,7 +38,7 @@ return {
   arduino = {
     install_info = {
       generate_from_json = true,
-      revision = '415ebc8f75eb02a748faa03f5af199f08ced120f',
+      revision = '017696bdf47ca2b10948c5a511f9ab387722d0f3',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
@@ -56,7 +56,7 @@ return {
   astro = {
     install_info = {
       generate_from_json = true,
-      revision = '4be180759ec13651f72bacee65fa477c64222a1a',
+      revision = '0ad33e32ae9726e151d16ca20ba3e507ff65e01f',
       url = 'https://github.com/virchau13/tree-sitter-astro',
     },
     maintainers = { '@virchau13' },
@@ -73,14 +73,14 @@ return {
   },
   awk = {
     install_info = {
-      revision = '553fdc4afb3b603332c3f4baf50c711506f4e797',
+      revision = '34bbdc7cce8e803096f47b625979e34c1be38127',
       url = 'https://github.com/Beaglefoot/tree-sitter-awk',
     },
     tier = 4,
   },
   bash = {
     install_info = {
-      revision = 'c8713e50f0bd77d080832fc61ad128bc8f2934e9',
+      revision = 'a985bd2d14d249b8f583343ad21aeb13c50c85e8',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -96,7 +96,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = '01c0da29e0fc7130420a09d939ecc524e09b6ba6',
+      revision = '9bc460a05b5f096d69568b5fb36105032ff4ff97',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -112,7 +112,7 @@ return {
   },
   bicep = {
     install_info = {
-      revision = '0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0',
+      revision = 'bff59884307c0ab009bd5e81afd9324b46a6c0f9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-bicep',
     },
     maintainers = { '@amaanq' },
@@ -144,7 +144,7 @@ return {
   },
   bp = {
     install_info = {
-      revision = '4e60cf3c2e613625c06f6f85540b3631e2d06cd3',
+      revision = '16c43068ec30828c5aed11e87262c56f36782595',
       url = 'https://github.com/ambroisie/tree-sitter-bp',
     },
     maintainers = { '@ambroisie' },
@@ -161,7 +161,7 @@ return {
   },
   c = {
     install_info = {
-      revision = 'f4c21152f1952a99f4744e8c41d3ffb8038ae78c',
+      revision = '492f7aaa37560204856a2b3f775398b66ba09f31',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -169,7 +169,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = 'fd7f7402db6e66afd70b402fb2e367b2d71c10d6',
+      revision = '2c31cc87640ab6ad74fb408c0cf1262ce54da5bb',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -201,7 +201,7 @@ return {
   },
   chatito = {
     install_info = {
-      revision = 'a461f20dedb43905febb12c1635bc7d2e43e96f0',
+      revision = 'b4cbe9ab7672d5106e9550d8413835395a1be362',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-chatito',
     },
     maintainers = { '@ObserverOfTime' },
@@ -209,8 +209,8 @@ return {
   },
   circom = {
     install_info = {
+      revision = '02150524228b1e6afef96949f2d6b7cc0aaf999e',
       url = 'https://github.com/Decurity/tree-sitter-circom',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@alexandr-martirosyan' },
     tier = 3,
@@ -225,7 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = 'f2569dd1fce0f252097a25bcbcb9ed8898840310',
+      revision = 'e409ae33f00e04cde30f2bcffb979caf1a33562a',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -275,7 +275,7 @@ return {
   cpp = {
     install_info = {
       generate_from_json = true,
-      revision = '30d2fa385735378388a55917e2910965fce19748',
+      revision = 'a352ed85f733f9c6cc458fe5a82bcd4c00f70eab',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -284,7 +284,7 @@ return {
   },
   css = {
     install_info = {
-      revision = 'a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7',
+      revision = '6731f030693d3698ad94865ed0228fe45df07e30',
       url = 'https://github.com/tree-sitter/tree-sitter-css',
     },
     maintainers = { '@TravonteD' },
@@ -303,7 +303,7 @@ return {
   cuda = {
     install_info = {
       generate_from_json = true,
-      revision = '635e8aa3747823a0c4e9660c07cef76fe8d3ef93',
+      revision = '757e0a61f9d38b3d9eaa299e8d866e8283ffc284',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
     maintainers = { '@theHamsta' },
@@ -320,8 +320,8 @@ return {
   },
   cylc = {
     install_info = {
+      revision = '8b895c278f98d05e67997f5e3a43fb5531933023',
       url = 'https://github.com/elliotfontaine/tree-sitter-cylc',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@elliotfontaine' },
     tier = 3,
@@ -336,7 +336,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = '9ac03bb2154316624fb4c41fe0f372a5f1597b43',
+      revision = 'e81af6ab94a728ed99c30083be72d88e6d56cf9e',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -344,7 +344,7 @@ return {
   },
   desktop = {
     install_info = {
-      files = { 'src/parser.c' },
+      revision = '54133af61b2a9a75fd42c49ce0c771115f81f50b',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -352,7 +352,7 @@ return {
   },
   devicetree = {
     install_info = {
-      revision = '07a647c8fb70e6b06379a60526721e3141aa2fd2',
+      revision = '16f640f3c59117c9e749d581634afdb00e004f4c',
       url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
     maintainers = { '@jedrzejboczar' },
@@ -360,7 +360,7 @@ return {
   },
   dhall = {
     install_info = {
-      revision = 'affb6ee38d629c9296749767ab832d69bb0d9ea8',
+      revision = '4a6c08abfb54827db4e722d6cdca81b093898988',
       url = 'https://github.com/jbellerb/tree-sitter-dhall',
     },
     maintainers = { '@amaanq' },
@@ -368,7 +368,7 @@ return {
   },
   diff = {
     install_info = {
-      revision = '19dd5aa52fe339a1d974768a09ee2537303e8ca5',
+      revision = 'e42b8def4f75633568f1aecfe01817bf15164928',
       url = 'https://github.com/the-mikedavis/tree-sitter-diff',
     },
     maintainers = { '@gbprod' },
@@ -392,7 +392,7 @@ return {
   },
   dockerfile = {
     install_info = {
-      revision = '087daa20438a6cc01fa5e6fe6906d77c869d19fe',
+      revision = '971acdd908568b4531b0ba28a445bf0bb720aba5',
       url = 'https://github.com/camdencheek/tree-sitter-dockerfile',
     },
     maintainers = { '@camdencheek' },
@@ -417,7 +417,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '809266ed1694d64dedc168a18893cc254e3edf7e',
+      revision = 'ce150c5be7f617e18ffa2064213e5d9c4cb5d69e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -425,7 +425,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = '1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce',
+      revision = 'a44f6f6d22ea4fe16fa37ababd90240ab87a9e0d',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -447,7 +447,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'efbe0b2f2eaa248e8c657a80a8c2305056bda477',
+      revision = '02f562e71dc28d573187809eecdffaee7c82321c',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -455,7 +455,7 @@ return {
   },
   eds = {
     install_info = {
-      revision = '0ad62cb635c2f4353359a88dec9e3a57bbf9f66d',
+      revision = '26d529e6cfecde391a03c21d1474eb51e0285805',
       url = 'https://github.com/uyha/tree-sitter-eds',
     },
     maintainers = { '@uyha' },
@@ -471,7 +471,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = 'ef124b83a3f3572b0af23db4efae3f8de06a15e1',
+      revision = '0e8eb7fc1dfb3d855398870827a9866a1529a5e4',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -479,7 +479,7 @@ return {
   },
   elm = {
     install_info = {
-      revision = '27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc',
+      revision = 'e34bdc5c512918628b05b48e633f711123204e45',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
@@ -503,7 +503,7 @@ return {
   },
   embedded_template = {
     install_info = {
-      revision = '62b0a6e45900a7dff7c37da95fec20a09968ba52',
+      revision = '8495d106154741e6d35d37064f864758ece75de6',
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
     tier = 4,
@@ -518,7 +518,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = 'f1919a34af3a9c79402c4a3d6c52986e9c2ea949',
+      revision = '981fda038d2eb182a88a9374ccb1c14b840cba0b',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -526,7 +526,7 @@ return {
   },
   facility = {
     install_info = {
-      revision = '2d037f2f2bf668737f72e6be6eda4b7918b68d86',
+      revision = 'e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb',
       url = 'https://github.com/FacilityApi/tree-sitter-facility',
     },
     maintainers = { '@bryankenote' },
@@ -567,7 +567,7 @@ return {
   },
   fish = {
     install_info = {
-      revision = 'a78aef9abc395c600c38a037ac779afc7e3cc9e0',
+      revision = '70640c0696abde32622afc43291a385681afbd32',
       url = 'https://github.com/ram02z/tree-sitter-fish',
     },
     maintainers = { '@ram02z' },
@@ -575,7 +575,7 @@ return {
   },
   foam = {
     install_info = {
-      revision = '04664b40c0dadb7ef37028acf3422c63271d377b',
+      revision = 'f08bb76892b93e5b23c45ac3bd6b1eea5df323cc',
       url = 'https://github.com/FoamScience/tree-sitter-foam',
     },
     maintainers = { '@FoamScience' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '4a593dda9cbc050a6686187249f8350ceea292ce',
+      revision = '022b032d31299c5d8336cdfd0ece97de20a609c0',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -608,7 +608,7 @@ return {
   fsharp = {
     install_info = {
       location = 'fsharp',
-      revision = '5202637c203fcf8876affbd18b04ff43256d4c4a',
+      revision = '207f1c988f4649e12fe207e4a7e4f83b9da037d1',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -632,7 +632,7 @@ return {
   },
   gap = {
     install_info = {
-      revision = '141b063335e85299bde3f61b4888d02d674a1abc',
+      revision = '7db79590d2f8b0e0246008ecfd569b4bfca587a9',
       url = 'https://github.com/gap-system/tree-sitter-gap',
     },
     maintainers = { '@reiniscirpons' },
@@ -641,7 +641,7 @@ return {
   },
   gaptst = {
     install_info = {
-      revision = 'e0723dc6136309b3d5904dad2c73ef71267428c1',
+      revision = '69086d7627c03e1f4baf766bcef14c60d9e92331',
       url = 'https://github.com/gap-system/tree-sitter-gaptst',
     },
     maintainers = { '@reiniscirpons' },
@@ -651,7 +651,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = '1f1e782fe2600f50ae57b53876505b8282388d77',
+      revision = '48b49330888a4669b48619b211cc8da573827725',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -684,7 +684,7 @@ return {
   },
   gitattributes = {
     install_info = {
-      revision = '41940e199ba5763abea1d21b4f717014b45f01ea',
+      revision = '5425944fd61bf2b3bad2c17c2dc9f53172b0f01d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gitattributes',
     },
     maintainers = { '@ObserverOfTime' },
@@ -692,7 +692,7 @@ return {
   },
   gitcommit = {
     install_info = {
-      revision = 'aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7',
+      revision = 'db0e0c4fb9095fdc42a7af34019c0616c071e9eb',
       url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
     maintainers = { '@gbprod' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '57c9951b290c8084d7c60b0aee7a2b30986ea031',
+      revision = '066704e4826699e754d351e3bbe12bf2e51de9d8',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -726,7 +726,7 @@ return {
   glimmer_javascript = {
     install_info = {
       generate_from_json = true,
-      revision = 'a260911201684f80cf815418b3771e6c39309f81',
+      revision = '7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -736,7 +736,7 @@ return {
   glimmer_typescript = {
     install_info = {
       generate_from_json = true,
-      revision = '9d018a0f93417e6951264a26093b89ee63df7315',
+      revision = '4006128790efb58ca82a4492d8ef0983b260fc6a',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -764,7 +764,7 @@ return {
   },
   gnuplot = {
     install_info = {
-      revision = '3c895f5d9c0b3a3c7e02383766b462c21913c000',
+      revision = '8923c1e38b9634a688a6c0dce7c18c8ffb823e79',
       url = 'https://github.com/dpezto/tree-sitter-gnuplot',
     },
     maintainers = { '@dpezto' },
@@ -772,7 +772,7 @@ return {
   },
   go = {
     install_info = {
-      revision = 'ecc20866d1bd4d80f3aef06456ed3014d4d598e6',
+      revision = '7cb21a65af6cc8e5c6742b9dba42881ea1158475',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
@@ -788,7 +788,7 @@ return {
   },
   godot_resource = {
     install_info = {
-      revision = '2ffb90de47417018651fc3b970e5f6b67214dc9d',
+      revision = '941955d027f1d8530501e77ce5e1d6035f5f99c1',
       url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
     maintainers = { '@pierpo' },
@@ -797,7 +797,7 @@ return {
   },
   gomod = {
     install_info = {
-      revision = '3b01edce2b9ea6766ca19328d1850e456fde3103',
+      revision = '6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c',
       url = 'https://github.com/camdencheek/tree-sitter-go-mod',
     },
     maintainers = { '@camdencheek' },
@@ -813,7 +813,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = 'fd9e1c6647e5e9b23918d00d1e48710d0f703e19',
+      revision = 'ab4a8c4a51f271f320f2bad6a5d499415bf541b1',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -829,7 +829,7 @@ return {
   },
   gpg = {
     install_info = {
-      revision = 'f99323fb8f3f10b6c69db0c2f6d0a14bd7330675',
+      revision = '63e80cfe1302da9f9c7ee8d9df295f47d7d181bf',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gpg-config',
     },
     maintainers = { '@ObserverOfTime' },
@@ -845,7 +845,7 @@ return {
   },
   gren = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '76554f4f2339f5a24eed19c58f2079b51c694152',
       url = 'https://github.com/MaeBrooks/tree-sitter-gren',
     },
     maintainers = { '@MaeBrooks' },
@@ -853,7 +853,7 @@ return {
   },
   groovy = {
     install_info = {
-      revision = '0d8884514fe10c4fa47527d9a0284d207f38ddea',
+      revision = '86911590a8e46d71301c66468e5620d9faa5b6af',
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
@@ -869,7 +869,7 @@ return {
   },
   hack = {
     install_info = {
-      revision = 'fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2',
+      revision = 'bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0',
       url = 'https://github.com/slackhq/tree-sitter-hack',
     },
     tier = 4,
@@ -884,7 +884,7 @@ return {
   },
   haskell = {
     install_info = {
-      revision = '558b997049fddcb07fc513528189c57d6129a260',
+      revision = '2c2fcb22e3b939ed59ae8d6f10500c3213c68670',
       url = 'https://github.com/tree-sitter/tree-sitter-haskell',
     },
     maintainers = { '@mrcjkb' },
@@ -908,7 +908,7 @@ return {
   },
   heex = {
     install_info = {
-      revision = '6dd0303acf7138dd2b9b432a229e16539581c701',
+      revision = 'a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
@@ -917,7 +917,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = 'fd9e1c6647e5e9b23918d00d1e48710d0f703e19',
+      revision = 'ab4a8c4a51f271f320f2bad6a5d499415bf541b1',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -936,7 +936,7 @@ return {
   hlsl = {
     install_info = {
       generate_from_json = true,
-      revision = '543930235970a04c2f0d549c9e88815847c7a74a',
+      revision = 'b309425a7ab4456605cfe78774b80f7e275ca87d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
     },
     maintainers = { '@theHamsta' },
@@ -962,7 +962,7 @@ return {
   },
   hoon = {
     install_info = {
-      revision = 'a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8',
+      revision = '1545137aadcc63660c47db9ad98d02fa602655d0',
       url = 'https://github.com/urbit-pilled/tree-sitter-hoon',
     },
     maintainers = { '@urbit-pilled' },
@@ -970,7 +970,7 @@ return {
   },
   html = {
     install_info = {
-      revision = '14bdaf0da9e26e2de9b30178c2242539d2b0b285',
+      revision = 'd18f83f8bed0be99796c4eacafe9b295ab2ee144',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
@@ -992,7 +992,7 @@ return {
   },
   http = {
     install_info = {
-      revision = '231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94',
+      revision = 'd2e4e4c7d03f70e0465d436f2b5f67497cd544ca',
       url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
@@ -1008,7 +1008,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      revision = '6858695eba0e63b9e0fceef081d291eb352abce8',
+      revision = 'd719158abe537b1916daaea6fa03287089f0b601',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
@@ -1016,7 +1016,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '5573b295410201ed22771776b34d636900eba368',
+      revision = '86ff7f19747a761dc8ba72f4045fd64aed94ba4c',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1024,8 +1024,8 @@ return {
   },
   idris = {
     install_info = {
+      revision = 'c56a25cf57c68ff929356db25505c1cc4c7820f6',
       url = 'https://github.com/kayhide/tree-sitter-idris',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@srghma' },
     tier = 3,
@@ -1040,7 +1040,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = '6f9c072d023c3886aabcd8012274461b35d2d0a9',
+      revision = '0b08a8f976456a9271f70d4682143328d7224115',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
@@ -1048,8 +1048,8 @@ return {
   },
   ipkg = {
     install_info = {
+      revision = '8d3e9782f2d091d0cd39c13bfb3068db0c675960',
       url = 'https://github.com/srghma/tree-sitter-ipkg',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@srghma' },
     tier = 3,
@@ -1066,7 +1066,7 @@ return {
   },
   janet_simple = {
     install_info = {
-      revision = '12bfab7db8a5f5b1d774ef84b5831acd34936071',
+      revision = 'ca4785b47a4ff15653f0408a49c764dec533e0d3',
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
@@ -1074,7 +1074,7 @@ return {
   },
   java = {
     install_info = {
-      revision = '490d878cf33b0ad5ae7a7253ff30597a5bdc348e',
+      revision = '677da92875756e31b3a42505d822cc8be7c5ab5e',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
@@ -1090,7 +1090,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = 'b6f0624c1447bc209830b195999b78a56b10a579',
+      revision = '3f1c835d05165050834da0e3cbc23a75e94aaa64',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1128,7 +1128,7 @@ return {
   },
   jsdoc = {
     install_info = {
-      revision = 'bc09606fc786ead131a301e4b7524888f2d5c517',
+      revision = 'a417db5dbdd869fccb6a8b75ec04459e1d4ccd2c',
       url = 'https://github.com/tree-sitter/tree-sitter-jsdoc',
     },
     maintainers = { '@steelsojka' },
@@ -1136,7 +1136,7 @@ return {
   },
   json = {
     install_info = {
-      revision = '8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571',
+      revision = '54ccd9485e0122a5e9faf5d8aaed7294c308e894',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
@@ -1175,7 +1175,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = '3520b57e418f734f582215181ecd926a6178c90f',
+      revision = 'ffdd9fe4dccdc26d62ce1654fceac52c394f0cf3',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
@@ -1183,7 +1183,7 @@ return {
   },
   just = {
     install_info = {
-      revision = '6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21',
+      revision = 'bb0c898a80644de438e6efe5d88d30bf092935cd',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
@@ -1199,7 +1199,7 @@ return {
   },
   kconfig = {
     install_info = {
-      revision = '486fea71f61ad9f3fd4072a118402e97fe88d26c',
+      revision = '9ac99fe4c0c27a35dc6f757cef534c646e944881',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-kconfig',
     },
     maintainers = { '@amaanq' },
@@ -1215,7 +1215,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = '76f53c48d29e8588934fb55b0240d7bdfe00bfe5',
+      revision = 'c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1223,7 +1223,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = 'cbf637e5163065934c827d254b293f4d2f08f523',
+      revision = '329b0e84ef6cc6950665de4accd0bdda1601a2f1',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1239,7 +1239,7 @@ return {
   },
   lalrpop = {
     install_info = {
-      revision = '194c25539f435de415ee0551a5f07058833da915',
+      revision = 'a7f5ea297bd621d072ed4cb2cc8ba5ae64ae3c4b',
       url = 'https://github.com/traxys/tree-sitter-lalrpop',
     },
     maintainers = { '@traxys' },
@@ -1248,7 +1248,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = '87e4059f01bed363230dc349f794ce4cc580e862',
+      revision = '7b06f6ed394308e7407a1703d2724128c45fc9d7',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -1256,7 +1256,7 @@ return {
   },
   ledger = {
     install_info = {
-      revision = '8a841fb20ce683bfbb3469e6ba67f2851cfdf94a',
+      revision = 'd313153eef68c557ba4538b20de2d0e92f3ef6f8',
       url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
     maintainers = { '@cbarrete' },
@@ -1264,7 +1264,7 @@ return {
   },
   leo = {
     install_info = {
-      revision = '6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb',
+      revision = '44a061bac4d9443d75f2700c62a71cd4dcf16f05',
       url = 'https://github.com/r001/tree-sitter-leo',
     },
     maintainers = { '@r001' },
@@ -1288,7 +1288,7 @@ return {
   },
   liquidsoap = {
     install_info = {
-      revision = '14feafa91630afb1ab9988cf9b738b7ea29f3f89',
+      revision = '8e51fa63ddb93ac179d4e34a311d3d3f03780b42',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
@@ -1304,7 +1304,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = '99fc677e6971c425e8d407f59c77ab897e585c92',
+      revision = '34e60e7f45fc313463c68090d88d742a55d1bd7a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1330,7 +1330,7 @@ return {
   luau = {
     install_info = {
       generate_from_json = true,
-      revision = 'fbadc96272f718dba267628ba7b0e694c368cef3',
+      revision = 'a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-luau',
     },
     maintainers = { '@amaanq' },
@@ -1356,7 +1356,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = 'b7eba93e6a3e588e259e831416ac11abdaa8616a',
+      revision = '192407ab5a24bfc24f13332979b5e7967518754a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1367,7 +1367,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = 'b7eba93e6a3e588e259e831416ac11abdaa8616a',
+      revision = '192407ab5a24bfc24f13332979b5e7967518754a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1376,7 +1376,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '306c43ab28b7b8a4976e40ff0a7c26b019ad52df',
+      revision = 'b0a0198b182574cd3ca0447264c83331901b9338',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc',
+      revision = 'b5d5f238b371b7c9b764f6a053b045dda92bc836',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1424,7 +1424,7 @@ return {
   },
   nasm = {
     install_info = {
-      revision = '570f3d7be01fffc751237f4cfcf52d04e20532d1',
+      revision = 'd1b3638d017f2a8585e26dcfc66fe1df94185e30',
       url = 'https://github.com/naclsn/tree-sitter-nasm',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1432,7 +1432,7 @@ return {
   },
   nginx = {
     install_info = {
-      revision = '281d184b8240b2b22670b8907b57b6d6842db6f3',
+      revision = '989da760be05a3334af3ec88705cbf57e6a9c41d',
       url = 'https://github.com/opa-oz/tree-sitter-nginx',
     },
     maintainers = { '@opa-oz' },
@@ -1440,7 +1440,7 @@ return {
   },
   nickel = {
     install_info = {
-      revision = 'ddaa2bc22355effd97c0d6b09ff5962705c6368d',
+      revision = '25464b33522c3f609fa512aa9651707c0b66d48b',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 4,
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = '456b14a2fa6315abc7e02fcffaf4a1f35d4955d3',
+      revision = '4b952d99ce6fc795ff3cfa48b05637f2b1751d3b',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1489,8 +1489,8 @@ return {
   },
   nu = {
     install_info = {
+      revision = '9822fc63a62ff87939c88ead9f381f951f092dee',
       url = 'https://github.com/nushell/tree-sitter-nu',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@abhisheksingh0x558' },
     tier = 3,
@@ -1498,7 +1498,7 @@ return {
   objc = {
     install_info = {
       generate_from_json = true,
-      revision = '62e61b6f5c0289c376d61a8c91faf6435cde9012',
+      revision = '18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-objc',
     },
     maintainers = { '@amaanq' },
@@ -1516,7 +1516,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e',
+      revision = '37ad9efe601316248b22173d2ff19a6b4c992016',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1525,7 +1525,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '5f7a97e9757d8afe6c0b0b5dd8734cf59f35456e',
+      revision = '37ad9efe601316248b22173d2ff19a6b4c992016',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1543,7 +1543,7 @@ return {
   },
   odin = {
     install_info = {
-      revision = '3fee7964bbfb2554deef12c224344f3870d15375',
+      revision = 'd2ca8efb4487e156a60d5bd6db2598b872629403',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-odin',
     },
     maintainers = { '@amaanq' },
@@ -1567,7 +1567,7 @@ return {
   },
   pem = {
     install_info = {
-      revision = '217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a',
+      revision = '1d16b8e063fdf4385e389096c4bc4999eaaef05f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-pem',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1577,7 +1577,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = '76ab9a52b9dd2a1758aae3da8286519d995037e9',
+      revision = '6f280c52662dc254eb7a5abc0889f7a9e1154ffd',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '07a04599ed9ac97f82c6383a24ae139a807930f3',
+      revision = '5021edde6d0ea75aedc313e75cca2ac5aa064d41',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '07a04599ed9ac97f82c6383a24ae139a807930f3',
+      revision = '5021edde6d0ea75aedc313e75cca2ac5aa064d41',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1641,7 +1641,7 @@ return {
   },
   poe_filter = {
     install_info = {
-      revision = '592476d81f95d2451f2ca107dc872224c76fecdf',
+      revision = '2902dc45439125b9386812c1089a8e9b5f71c4ab',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-poe-filter',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1659,7 +1659,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = 'ebe2ab2f642eda2072c68c8de02e83973c26f33c',
+      revision = '32fe49cc5d4a2d5a976dacafc0da16d98787866b',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1667,7 +1667,7 @@ return {
   },
   printf = {
     install_info = {
-      revision = '0e0aceabbf607ea09e03562f5d8a56f048ddea3d',
+      revision = '60d50a2247b0c1fb72b967562c64711d65c6a060',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-printf',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1675,7 +1675,7 @@ return {
   },
   prisma = {
     install_info = {
-      revision = 'eca2596a355b1a9952b4f80f8f9caed300a272b5',
+      revision = '73f39a6d5401cfdcd143951e499336cf5ab2ffaa',
       url = 'https://github.com/victorhqc/tree-sitter-prisma',
     },
     maintainers = { '@elianiva' },
@@ -1710,7 +1710,7 @@ return {
   },
   properties = {
     install_info = {
-      revision = '9d09f5f200c356c50c4103d36441309fd61b48d1',
+      revision = '579b62f5ad8d96c2bb331f07d1408c92767531d9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-properties',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1745,7 +1745,7 @@ return {
   },
   pug = {
     install_info = {
-      revision = 'a7ff31a38908df9b9f34828d21d6ca5e12413e18',
+      revision = '13e9195370172c86a8b88184cc358b23b677cc46',
       url = 'https://github.com/zealot128/tree-sitter-pug',
     },
     maintainers = { '@zealot128' },
@@ -1753,7 +1753,7 @@ return {
   },
   puppet = {
     install_info = {
-      revision = '584522f32495d648b18a53ccb52d988e60de127d',
+      revision = '15f192929b7d317f5914de2b4accd37b349182a6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-puppet',
     },
     maintainers = { '@amaanq' },
@@ -1778,7 +1778,7 @@ return {
   },
   python = {
     install_info = {
-      revision = '8c65e256f971812276ff2a69a2f515c218ed7f82',
+      revision = '44c2f7aebce0efac5867cdc5f2ea03c1d43a0305',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
@@ -1786,7 +1786,7 @@ return {
   },
   ql = {
     install_info = {
-      revision = 'c73c31c89cb0019ef56fe8bc1723e7c36e0be607',
+      revision = '1fd627a4e8bff8c24c11987474bd33112bead857',
       url = 'https://github.com/tree-sitter/tree-sitter-ql',
     },
     maintainers = { '@pwntester' },
@@ -1803,7 +1803,7 @@ return {
   qmljs = {
     install_info = {
       generate_from_json = true,
-      revision = 'cc4186f15e2829385be33440561fdd17b1c40cf7',
+      revision = '8fef30e231d74b65c713bcbac21956156d8963da',
       url = 'https://github.com/yuja/tree-sitter-qmljs',
     },
     maintainers = { '@Decodetalkers' },
@@ -1812,7 +1812,7 @@ return {
   },
   query = {
     install_info = {
-      revision = 'f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0',
+      revision = '5c2d02747250bc326bc33687b3319b7db8554e24',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1821,7 +1821,7 @@ return {
   },
   r = {
     install_info = {
-      revision = '2097fa502efa21349d26af0ffee55d773015e481',
+      revision = 'a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -1862,7 +1862,7 @@ return {
   },
   rbs = {
     install_info = {
-      revision = '8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99',
+      revision = 'de893b166476205b09e79cd3689f95831269579a',
       url = 'https://github.com/joker1007/tree-sitter-rbs',
     },
     maintainers = { '@joker1007' },
@@ -1886,7 +1886,7 @@ return {
   },
   regex = {
     install_info = {
-      revision = 'f70251e1f1d72bd6dc1f897f956f9112f8668441',
+      revision = 'b638d29335ef41215b86732dd51be34c701ef683',
       url = 'https://github.com/tree-sitter/tree-sitter-regex',
     },
     maintainers = { '@theHamsta' },
@@ -1927,7 +1927,7 @@ return {
   },
   robot = {
     install_info = {
-      revision = '322e4cc65754d2b3fdef4f2f8a71e0762e3d13af',
+      revision = '17c2300e91fc9da4ba14c16558bf4292941dc074',
       url = 'https://github.com/Hubro/tree-sitter-robot',
     },
     maintainers = { '@Hubro' },
@@ -1943,7 +1943,7 @@ return {
   },
   roc = {
     install_info = {
-      revision = 'ef46edd0c03ea30a22f7e92bc68628fb7231dc8a',
+      revision = 'de0839d6c7db2405e827435cf3ac62d22f4bd5e9',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
@@ -1959,7 +1959,7 @@ return {
   },
   rst = {
     install_info = {
-      revision = '5120f6e59284cb8b85b450bd2db0bd352635ba9f',
+      revision = 'dd5971ef7759583aadd5aa5e3a3a0905eb5734d5',
       url = 'https://github.com/stsewd/tree-sitter-rst',
     },
     maintainers = { '@stsewd' },
@@ -1967,7 +1967,7 @@ return {
   },
   ruby = {
     install_info = {
-      revision = '0b4729672f9aec4810c01a0f971541dcb433fef5',
+      revision = '71bd32fb7607035768799732addba884a37a6210',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
@@ -1975,7 +1975,7 @@ return {
   },
   runescript = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
+      revision = 'cf85bbd5da0c5ad243301d889c7f84d790a4cae4',
       url = 'https://github.com/2004Scape/tree-sitter-runescript',
     },
     maintainers = { '@2004Scape' },
@@ -1983,7 +1983,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '6b7d1fc73ded57f73b1619bcf4371618212208b1',
+      revision = '2eaf126458a4d6a69401089b6ba78c5e5d6c1ced',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -1991,7 +1991,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = '2cfbb6e3fcdfd51e0d477a43cc37ae8c6f87dc2e',
+      revision = 'd3b9553b47d7ab413a146c4b6498e527265b966e',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2000,7 +2000,7 @@ return {
   scfg = {
     install_info = {
       generate = true,
-      revision = 'a5512800ea0220da4abbae61b8aea8423d1549aa',
+      revision = '2f3709e7656fa2c443f92041c91a9f843f8cd625',
       url = 'https://github.com/rockorager/tree-sitter-scfg',
     },
     maintainers = { '@WhyNotHugo' },
@@ -2025,7 +2025,7 @@ return {
   sflog = {
     install_info = {
       location = 'sflog',
-      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
+      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiaofinland' },
@@ -2035,7 +2035,7 @@ return {
   slang = {
     install_info = {
       generate_from_json = true,
-      revision = 'dd991eb3b6957a33d9044e0f5914588f7f449a78',
+      revision = '3ed23c04a412a0559162d9cadf96dfff7cb36079',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
     maintainers = { '@theHamsta' },
@@ -2044,15 +2044,15 @@ return {
   },
   slim = {
     install_info = {
+      revision = 'a0f08e85b787248219ea645423c5916c8d620ef6',
       url = 'https://github.com/theoo/tree-sitter-slim',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@theoo' },
     tier = 3,
   },
   slint = {
     install_info = {
-      revision = '4e2765d4cac1f03ada6f635eeb6008d1d0aff5a3',
+      revision = 'f11da7e62051ba8b9d4faa299c26de8aeedfc1cd',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2077,7 +2077,7 @@ return {
   snakemake = {
     install_info = {
       generate_from_json = true,
-      revision = 'e909815acdbe37e69440261ebb1091ed52e1dec6',
+      revision = 'f36c1587624d6d84376c82a357c20fc319cbf02c',
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
     },
     maintainers = { '@osthomas' },
@@ -2085,7 +2085,7 @@ return {
   },
   solidity = {
     install_info = {
-      revision = 'ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c',
+      revision = '727087514eff57d92e273a24303142308bce3381',
       url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
@@ -2094,7 +2094,7 @@ return {
   soql = {
     install_info = {
       location = 'soql',
-      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
+      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2103,7 +2103,7 @@ return {
   sosl = {
     install_info = {
       location = 'sosl',
-      revision = '46d4a12e4e90b10a575b7b16ea3b6ead50322074',
+      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
@@ -2111,7 +2111,7 @@ return {
   },
   sourcepawn = {
     install_info = {
-      revision = '6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf',
+      revision = 'f2af8d0dc14c6790130cceb2a20027eb41a8297c',
       url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
     },
     maintainers = { '@Sarrus1' },
@@ -2130,7 +2130,7 @@ return {
     install_info = {
       branch = 'gh-pages',
       generate_from_json = true,
-      revision = 'a8b10c76759a372d0f92bb070b4f5c993e0ce5f9',
+      revision = 'b9d109588d5b5ed986c857464830c2f0bef53f18',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2146,7 +2146,7 @@ return {
   },
   ssh_config = {
     install_info = {
-      revision = '77450e8bce8853921512348f83c73c168c71fdfb',
+      revision = '0dd3c7e9f301758f6c69a6efde43d3048deb4d8a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ssh-config',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2155,7 +2155,7 @@ return {
   starlark = {
     install_info = {
       generate_from_json = true,
-      revision = '018d0e09d9d0f0dd6740a37682b8ee4512e8b2ac',
+      revision = 'a453dbf3ba433db0e5ec621a38a7e59d72e4dc69',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-starlark',
     },
     maintainers = { '@amaanq' },
@@ -2172,7 +2172,7 @@ return {
   styled = {
     install_info = {
       generate_from_json = true,
-      revision = '764af55fc6b8e5ae177eb272f5c5de6238db23e6',
+      revision = '75d3ad20818c30c49b445ca2cb35999c278b3453',
       url = 'https://github.com/mskelton/tree-sitter-styled',
     },
     maintainers = { '@mskelton' },
@@ -2189,7 +2189,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '36f37aa5aa440805f27d4a9f5203e616a303c6a1',
+      revision = 'e6eba40bf54dd94d842154be0389c53a37be8dc8',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2206,7 +2206,7 @@ return {
   svelte = {
     install_info = {
       generate_from_json = true,
-      revision = '774a65aea563accc35f5d45fafa4d96ec5761f57',
+      revision = 'ae5199db47757f785e43a14b332118a5474de1a2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
     },
     maintainers = { '@amaanq' },
@@ -2215,7 +2215,7 @@ return {
   },
   sway = {
     install_info = {
-      files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '395006713db3bbb90d267ebdfcbf1881b399b05c',
       url = 'https://github.com/FuelLabs/tree-sitter-sway.git',
     },
     maintainers = { '@ribru17' },
@@ -2224,7 +2224,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'a6ec57ad4d12c68d952ba1f869bd373a7ac95832',
+      revision = 'f4be8072f18fb9704fd35d4b8154ae2b19e314c0',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2248,7 +2248,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '6182836f4128725f1e74ce986840d7317021a015',
+      revision = 'e5a12f798f056049642aa03fbb83786e3a5b95d4',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2272,7 +2272,7 @@ return {
   },
   tcl = {
     install_info = {
-      revision = 'cdba4ab96a9896492d0d5219b70300c8783ca4e7',
+      revision = '98015ebe182d94e5a4439e32ffd91beaac32fcb9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
@@ -2289,7 +2289,7 @@ return {
   teal = {
     install_info = {
       generate = true,
-      revision = '485fbdc00d811b01b2090dff4d0469fd1d0350f5',
+      revision = '3db655924b2ff1c54fdf6371b5425ea6b5dccefe',
       url = 'https://github.com/euclidianAce/tree-sitter-teal',
     },
     maintainers = { '@euclidianAce' },
@@ -2298,7 +2298,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = 'e3e894ef9e490c3d36d94a51458ec55480991730',
+      revision = 'a9178bfc9cc8040c08f39b47bae5400a2bf06e50',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2316,7 +2316,7 @@ return {
   },
   textproto = {
     install_info = {
-      revision = 'd900077aef9f5dcb0d47c86be33585013ed5db9a',
+      revision = '568471b80fd8793d37ed01865d8c2208a9fefd1b',
       url = 'https://github.com/PorterAtGoogle/tree-sitter-textproto',
     },
     maintainers = { '@Porter' },
@@ -2340,7 +2340,7 @@ return {
   },
   tlaplus = {
     install_info = {
-      revision = 'da9cf9793686e236327aadfbad449414c895bf84',
+      revision = 'd711f24c93221cdfc9a9b4dbb0998f528fc982ac',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
@@ -2365,7 +2365,7 @@ return {
   toml = {
     install_info = {
       generate_from_json = true,
-      revision = '16a30c83ce427385b8d14939c45c137fcfca6c42',
+      revision = '64b56832c2cffe41758f28e05c756a3a98d16f41',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-toml',
     },
     maintainers = { '@tk-shirasaka' },
@@ -2384,7 +2384,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'tsx',
-      revision = '9951831c5f05be434514dce38b30eef213667601',
+      revision = '410947e9d2ca8e032cd2419bf1241406c7e6f9bb',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2411,7 +2411,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'typescript',
-      revision = '9951831c5f05be434514dce38b30eef213667601',
+      revision = '410947e9d2ca8e032cd2419bf1241406c7e6f9bb',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2420,7 +2420,7 @@ return {
   },
   typespec = {
     install_info = {
-      revision = '0ee05546d73d8eb64635ed8125de6f35c77759fe',
+      revision = '42fb163442ef2691b9b720fb4e4e846809415d18',
       url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
     maintainers = { '@happenslol' },
@@ -2436,7 +2436,7 @@ return {
   },
   typst = {
     install_info = {
-      revision = '8b8b16ef1b40cbecbe3f754b1c1c966b5a0904fe',
+      revision = '26dfb4b94a99cc9d6044342b7ad0ba761da77d60',
       url = 'https://github.com/uben0/tree-sitter-typst',
     },
     maintainers = { '@uben0', '@RaafatTurki' },
@@ -2444,7 +2444,7 @@ return {
   },
   udev = {
     install_info = {
-      revision = '8f58696e79092b4ad6bf197415bbd0970acf15cd',
+      revision = '18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-udev',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2461,7 +2461,7 @@ return {
   unison = {
     install_info = {
       generate = true,
-      revision = 'bc06e1eb100e1c0fab9bd89a9ca55d646ac80fc4',
+      revision = '3c97db76d3cdbd002dfba493620c2d5df2fd6fa9',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },
@@ -2486,7 +2486,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = 'ea538758a1273b59774dc9179cde460d9c73fd89',
+      revision = '0461bf8addccb4df566827f1601f415d07b1ffbc',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2494,7 +2494,7 @@ return {
   },
   vala = {
     install_info = {
-      revision = '8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b',
+      revision = '97e6db3c8c73b15a9541a458d8e797a07f588ef4',
       url = 'https://github.com/vala-lang/tree-sitter-vala',
     },
     maintainers = { '@Prince781' },
@@ -2502,7 +2502,7 @@ return {
   },
   vento = {
     install_info = {
-      revision = '3321077d7446c1b3b017c294fd56ce028ed817fe',
+      revision = '3b32474bc29584ea214e4e84b47102408263fe0e',
       url = 'https://github.com/ventojs/tree-sitter-vento',
     },
     maintainers = { '@wrapperup', '@oscarotero' },
@@ -2510,7 +2510,7 @@ return {
   },
   verilog = {
     install_info = {
-      revision = '075ebfc84543675f12e79a955f79d717772dcef3',
+      revision = '15fbf73dafaffc89050d247857beb27500ea30e8',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2518,7 +2518,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = 'd6e8301999336b47d663052d43f983c3edeb01dd',
+      revision = 'da8ea8afa7899a99e43a7d61afef9f77b7a675eb',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2526,7 +2526,7 @@ return {
   },
   vhs = {
     install_info = {
-      revision = '09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6',
+      revision = '037e675d547b18bbf3fdeb222e242ae5dccc39d7',
       url = 'https://github.com/charmbracelet/tree-sitter-vhs',
     },
     maintainers = { '@caarlos0' },
@@ -2542,7 +2542,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = '2249c44ecd3f5cf22da3dcccfb74f816ddb29245',
+      revision = 'd2e4b5c172a109966c2ce0378f73df6cede39400',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2578,7 +2578,7 @@ return {
   wgsl_bevy = {
     install_info = {
       generate_from_json = true,
-      revision = '0f06f24e259ac725045956436b9025dab008ff9f',
+      revision = '47c1818d245a6156a488c4c4d06e9336714bae9b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
     },
     maintainers = { '@theHamsta' },
@@ -2611,7 +2611,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '809266ed1694d64dedc168a18893cc254e3edf7e',
+      revision = 'ce150c5be7f617e18ffa2064213e5d9c4cb5d69e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2620,15 +2620,15 @@ return {
   },
   xresources = {
     install_info = {
+      revision = 'd0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@ValdezFOmar' },
     tier = 3,
   },
   yaml = {
     install_info = {
-      revision = '7b03feefd36b5f155465ca736c6304aca983b267',
+      revision = '1805917414a9a8ba2473717fd69447277a175fae',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
     },
     maintainers = { '@amaanq' },
@@ -2660,7 +2660,7 @@ return {
   },
   zig = {
     install_info = {
-      revision = 'eb7d58c2dc4fbeea4745019dee8df013034ae66b',
+      revision = 'b670c8df85a1568f498aa5c8cae42f51a90473c0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
     },
     maintainers = { '@amaanq' },
@@ -2669,7 +2669,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = '42b6f5d7320340bc5903c4c29d34065e8517a549',
+      revision = '3518133e9ebea7c372eff4def368eda8488fad18',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2678,7 +2678,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = '42b6f5d7320340bc5903c4c29d34065e8517a549',
+      revision = '3518133e9ebea7c372eff4def368eda8488fad18',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
diff --git a/lua/nvim-treesitter/util.lua b/lua/nvim-treesitter/util.lua
index 3087e9422..8a9779617 100644
--- a/lua/nvim-treesitter/util.lua
+++ b/lua/nvim-treesitter/util.lua
@@ -1,5 +1,3 @@
-local uv = vim.uv
-
 local M = {}
 
 --- @param filename string
diff --git a/runtime/queries/ada/injections.scm b/runtime/queries/ada/injections.scm
index f9754504e..2f0e58eb6 100644
--- a/runtime/queries/ada/injections.scm
+++ b/runtime/queries/ada/injections.scm
@@ -1,5 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-
-((doc_block) @injection.content
-  (#set! injection.language "markdown"))
diff --git a/runtime/queries/beancount/injections.scm b/runtime/queries/beancount/injections.scm
index 05aa24d8f..2f0e58eb6 100644
--- a/runtime/queries/beancount/injections.scm
+++ b/runtime/queries/beancount/injections.scm
@@ -1,5 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-
-((macro_text) @injection.content
-  (#set! injection.language "verilog"))
diff --git a/runtime/queries/unison/injections.scm b/runtime/queries/unison/injections.scm
index 2f0e58eb6..f9754504e 100644
--- a/runtime/queries/unison/injections.scm
+++ b/runtime/queries/unison/injections.scm
@@ -1,2 +1,5 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((doc_block) @injection.content
+  (#set! injection.language "markdown"))
diff --git a/runtime/queries/verilog/injections.scm b/runtime/queries/verilog/injections.scm
index 2f0e58eb6..05aa24d8f 100644
--- a/runtime/queries/verilog/injections.scm
+++ b/runtime/queries/verilog/injections.scm
@@ -1,2 +1,5 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((macro_text) @injection.content
+  (#set! injection.language "verilog"))
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index 756d34561..36be0b9c4 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -18,15 +18,18 @@ vim.opt.runtimepath:append('.')
 -- needed on CI
 vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
 
-local done = false
+local ok = nil
 require('nvim-treesitter.install').install(
   #parsers > 0 and parsers or 'all',
   { force = true, generate = generate, max_jobs = max_jobs },
-  function()
-    done = true
+  function(success)
+    ok = success
   end
 )
 
 vim.wait(6000000, function()
-  return done
+  return ok ~= nil
 end)
+if not ok then
+  vim.cmd.cq()
+end

From 188bbf7a098915511b899cdb7324450b35ab3ce7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 27 Jan 2025 16:53:58 +0100
Subject: [PATCH 2322/2704] fix(ci): update to changed neovim release name

---
 SUPPORTED_LANGUAGES.md          |  10 ++-
 lua/nvim-treesitter/parsers.lua | 127 ++++++++++++++++----------------
 scripts/ci-install.sh           |   4 +-
 3 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 61cebafa2..1d15c5328 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -70,6 +70,7 @@ ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
 [elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | community | `HFIJL` | @glapa-grossklag, @amaanq
 [elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` | @elves
 [embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` | 
+[enforce](https://github.com/simonvic/tree-sitter-enforce) | community | `HFIJL` | @simonvic
 [erlang](https://github.com/WhatsApp/tree-sitter-erlang) | community | `HF J ` | @filmor
 [facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` | @bryankenote
 [faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` | @khiner
@@ -131,7 +132,7 @@ html_tags (queries only)[^html_tags] | community | `H IJ ` | @TravonteD
 [hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` | @pfeiferj
 [hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | core | `HFIJ ` | @luckasRanarison
 [idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H IJ ` | @cathaysia
-[idris](https://github.com/kayhide/tree-sitter-idris) | community | `     ` | @srghma
+[idris](https://github.com/kayhide/tree-sitter-idris) | community | `HF JL` | @srghma
 [ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF J ` | @theHamsta
 [inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` | @yorickpeterse
 [ipkg](https://github.com/srghma/tree-sitter-ipkg) | community | `HFIJL` | @srghma
@@ -139,6 +140,8 @@ html_tags (queries only)[^html_tags] | community | `H IJ ` | @TravonteD
 [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` | @sogaiu
 [java](https://github.com/tree-sitter/tree-sitter-java) | core | `HFIJL` | @p00f
 [javascript](https://github.com/tree-sitter/tree-sitter-javascript) | core | `HFIJL` | @steelsojka
+[jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | community | `H  J ` | @cathaysia
+[jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | community | `H  J ` | @cathaysia
 [jq](https://github.com/flurie/tree-sitter-jq) | community | `H  JL` | @ObserverOfTime
 [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` | @steelsojka
 [json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` | @steelsojka
@@ -226,6 +229,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` | 
 [ralph](https://github.com/alephium/tree-sitter-ralph) | community | `H  J ` | @tdroxler
 [rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` | @Fymyte
+[razor](https://github.com/tris203/tree-sitter-razor) | community | `HF J ` | @tris203
 [rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` | @joker1007
 [re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | core | `HFIJL` | @amaanq
 [readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | core | `HFIJ ` | @ribru17
@@ -248,7 +252,7 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFIJ ` | @elianiva
 [sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | community | `H    ` | @aheber, @xixiaofinland
 [slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | core | `HFIJL` | @theHamsta
-[slim](https://github.com/theoo/tree-sitter-slim) | community | `     ` | @theoo
+[slim](https://github.com/theoo/tree-sitter-slim) | community | `HFIJL` | @theoo
 [slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` | @hunger
 [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` | @amaanq
 [smithy](https://github.com/indoorvivants/tree-sitter-smithy) | community | `H  J ` | @amaanq, @keynmol
@@ -331,6 +335,8 @@ jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
 [^glimmer]: Glimmer and Ember
 [^godot_resource]: Godot Resources
 [^html_tags]: queries required by html, astro, vue, svelte
+[^jinja]: basic highlighting
+[^jinja_inline]: needed for full highlighting
 [^jsx]: queries required by javascript, tsx
 [^luap]: Lua patterns
 [^markdown]: basic highlighting
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d06f184ae..75f202e60 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -47,7 +47,7 @@ return {
   },
   asm = {
     install_info = {
-      revision = '55b2b913f1e71136027d6fce8212e760c64f3532',
+      revision = '5bb5b03e3c1ce5853b5282b9fba060f7c7bbf11e',
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
@@ -80,7 +80,7 @@ return {
   },
   bash = {
     install_info = {
-      revision = 'a985bd2d14d249b8f583343ad21aeb13c50c85e8',
+      revision = '0c46d792d54c536be5ff7eb18eb95c70fccdb232',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -161,7 +161,7 @@ return {
   },
   c = {
     install_info = {
-      revision = '492f7aaa37560204856a2b3f775398b66ba09f31',
+      revision = '2a265d69a4caf57108a73ad2ed1e6922dd2f998c',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -169,7 +169,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = '2c31cc87640ab6ad74fb408c0cf1262ce54da5bb',
+      revision = 'b27b091bfdc5f16d0ef76421ea5609c82a57dff0',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -275,7 +275,7 @@ return {
   cpp = {
     install_info = {
       generate_from_json = true,
-      revision = 'a352ed85f733f9c6cc458fe5a82bcd4c00f70eab',
+      revision = 'e5cea0ec884c5c3d2d1e41a741a66ce13da4d945',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -284,7 +284,7 @@ return {
   },
   css = {
     install_info = {
-      revision = '6731f030693d3698ad94865ed0228fe45df07e30',
+      revision = '6e327db434fec0ee90f006697782e43ec855adf5',
       url = 'https://github.com/tree-sitter/tree-sitter-css',
     },
     maintainers = { '@TravonteD' },
@@ -312,7 +312,7 @@ return {
   },
   cue = {
     install_info = {
-      revision = '8a5f273bfa281c66354da562f2307c2d394b6c81',
+      revision = '770737bcff2c4aa3f624d439e32b07dbb07102d3',
       url = 'https://github.com/eonpatapon/tree-sitter-cue',
     },
     maintainers = { '@amaanq' },
@@ -344,7 +344,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '54133af61b2a9a75fd42c49ce0c771115f81f50b',
+      revision = '6d66eea37afa1d6bc1e25ef457113743df42416d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -384,7 +384,7 @@ return {
   },
   djot = {
     install_info = {
-      revision = '886601b67d1f4690173a4925c214343c30704d32',
+      revision = '67e6e23ba7be81a4373e0f49e21207bdc32d12a5',
       url = 'https://github.com/treeman/tree-sitter-djot',
     },
     maintainers = { '@NoahTheDuke' },
@@ -417,7 +417,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = 'ce150c5be7f617e18ffa2064213e5d9c4cb5d69e',
+      revision = '26e95de449d772bc2dd4f0382580f84e2a0754d6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -425,7 +425,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = 'a44f6f6d22ea4fe16fa37ababd90240ab87a9e0d',
+      revision = '6695a2dfea5f8d9076b11f9bebcac8184e405e67',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -471,7 +471,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = '0e8eb7fc1dfb3d855398870827a9866a1529a5e4',
+      revision = '86ec2ed45d6d9433b4e0b88cd3d96796bd45625f',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -510,15 +510,15 @@ return {
   },
   enforce = {
     install_info = {
+      revision = '9db7a49f3d73222c05b75dcfa8892f5e93542d1e',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@simonvic' },
     tier = 3,
   },
   erlang = {
     install_info = {
-      revision = '981fda038d2eb182a88a9374ccb1c14b840cba0b',
+      revision = '9cea919877741b2ed87cf215c0a06feb9a1930bf',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -608,7 +608,7 @@ return {
   fsharp = {
     install_info = {
       location = 'fsharp',
-      revision = '207f1c988f4649e12fe207e4a7e4f83b9da037d1',
+      revision = 'ad824dea984734406b50699c5f388a7412e85946',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '066704e4826699e754d351e3bbe12bf2e51de9d8',
+      revision = 'af6043419f5aa0f8b6c2a26db0187aefa46c7f5f',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -772,7 +772,7 @@ return {
   },
   go = {
     install_info = {
-      revision = '7cb21a65af6cc8e5c6742b9dba42881ea1158475',
+      revision = '5e73f476efafe5c768eda19bbe877f188ded6144',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
@@ -788,7 +788,7 @@ return {
   },
   godot_resource = {
     install_info = {
-      revision = '941955d027f1d8530501e77ce5e1d6035f5f99c1',
+      revision = '91c55fdf325a832659e59cdf4a02bfe8a423f14c',
       url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
     maintainers = { '@pierpo' },
@@ -813,7 +813,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = 'ab4a8c4a51f271f320f2bad6a5d499415bf541b1',
+      revision = '5f19a36bb1eebb30454e277b222b278ceafed0dd',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -845,7 +845,7 @@ return {
   },
   gren = {
     install_info = {
-      revision = '76554f4f2339f5a24eed19c58f2079b51c694152',
+      revision = '06389ece5bc7344ed3931dc516bb609d8864dd2a',
       url = 'https://github.com/MaeBrooks/tree-sitter-gren',
     },
     maintainers = { '@MaeBrooks' },
@@ -884,7 +884,7 @@ return {
   },
   haskell = {
     install_info = {
-      revision = '2c2fcb22e3b939ed59ae8d6f10500c3213c68670',
+      revision = '0975ef72fc3c47b530309ca93937d7d143523628',
       url = 'https://github.com/tree-sitter/tree-sitter-haskell',
     },
     maintainers = { '@mrcjkb' },
@@ -908,7 +908,7 @@ return {
   },
   heex = {
     install_info = {
-      revision = 'a63c69c20fd88d1e5614a02b4a6b48cfb7e54a45',
+      revision = '008626a3fad379d17c81d5ed576edd9bd7a4fbf7',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
@@ -917,7 +917,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = 'ab4a8c4a51f271f320f2bad6a5d499415bf541b1',
+      revision = '5f19a36bb1eebb30454e277b222b278ceafed0dd',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -970,7 +970,7 @@ return {
   },
   html = {
     install_info = {
-      revision = 'd18f83f8bed0be99796c4eacafe9b295ab2ee144',
+      revision = 'cbb91a0ff3621245e890d1c50cc811bffb77a26b',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
@@ -1066,7 +1066,7 @@ return {
   },
   janet_simple = {
     install_info = {
-      revision = 'ca4785b47a4ff15653f0408a49c764dec533e0d3',
+      revision = 'b08b402207fba0037d5152ce7c521351147f4388',
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
@@ -1074,7 +1074,7 @@ return {
   },
   java = {
     install_info = {
-      revision = '677da92875756e31b3a42505d822cc8be7c5ab5e',
+      revision = 'a7db5227ec40fcfe94489559d8c9bc7c8181e25a',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
@@ -1090,7 +1090,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = '3f1c835d05165050834da0e3cbc23a75e94aaa64',
+      revision = '6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1099,9 +1099,9 @@ return {
   },
   jinja = {
     install_info = {
-      url = 'https://github.com/cathaysia/tree-sitter-jinja',
       location = 'tree-sitter-jinja',
-      files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '41b17a33f335130ce9861fd21bffeb88fd768ef4',
+      url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
     readme_note = 'basic highlighting',
@@ -1110,9 +1110,9 @@ return {
   },
   jinja_inline = {
     install_info = {
-      url = 'https://github.com/cathaysia/tree-sitter-jinja',
       location = 'tree-sitter-jinja_inline',
-      files = { 'src/parser.c', 'src/scanner.c' },
+      revision = '41b17a33f335130ce9861fd21bffeb88fd768ef4',
+      url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
     readme_note = 'needed for full highlighting',
@@ -1136,7 +1136,7 @@ return {
   },
   json = {
     install_info = {
-      revision = '54ccd9485e0122a5e9faf5d8aaed7294c308e894',
+      revision = '46aa487b3ade14b7b05ef92507fdaa3915a662a3',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
@@ -1175,7 +1175,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = 'ffdd9fe4dccdc26d62ce1654fceac52c394f0cf3',
+      revision = '3f9870ca1f419e480f39fc181fcfb6dad480969a',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
@@ -1264,7 +1264,7 @@ return {
   },
   leo = {
     install_info = {
-      revision = '44a061bac4d9443d75f2700c62a71cd4dcf16f05',
+      revision = '6bc5564917edacd070afc4d33cf5e2e677831ea9',
       url = 'https://github.com/r001/tree-sitter-leo',
     },
     maintainers = { '@r001' },
@@ -1304,7 +1304,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = '34e60e7f45fc313463c68090d88d742a55d1bd7a',
+      revision = '68d29aa745b68ae22cbbdb5dcb68c20232521ff6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1376,7 +1376,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'b0a0198b182574cd3ca0447264c83331901b9338',
+      revision = 'bbf1b3f0bd7417c1efb8958fe95be3d0d540207a',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'b5d5f238b371b7c9b764f6a053b045dda92bc836',
+      revision = '65bca19232744b920859ce682cd830b5006b8ccd',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = '4b952d99ce6fc795ff3cfa48b05637f2b1751d3b',
+      revision = 'b3a88cf3e597d48c33657deca4fda7a75c0069c1',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1489,7 +1489,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '9822fc63a62ff87939c88ead9f381f951f092dee',
+      revision = 'd0b26e45525016ef8e6f2ced05852437c06a00ca',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1498,7 +1498,7 @@ return {
   objc = {
     install_info = {
       generate_from_json = true,
-      revision = '18802acf31d0b5c1c1d50bdbc9eb0e1636cab9ed',
+      revision = '181a81b8f23a2d593e7ab4259981f50122909fda',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-objc',
     },
     maintainers = { '@amaanq' },
@@ -1516,7 +1516,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '37ad9efe601316248b22173d2ff19a6b4c992016',
+      revision = '91e4d9106f5da8199ab5158ba65e02da3e664597',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1525,7 +1525,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '37ad9efe601316248b22173d2ff19a6b4c992016',
+      revision = '91e4d9106f5da8199ab5158ba65e02da3e664597',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1535,7 +1535,7 @@ return {
   ocamllex = {
     install_info = {
       generate = true,
-      revision = '4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2',
+      revision = '5da5bb7508ac9fd3317561670ef18c126a0fe2aa',
       url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
     },
     maintainers = { '@undu' },
@@ -1577,7 +1577,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = '6f280c52662dc254eb7a5abc0889f7a9e1154ffd',
+      revision = 'db79ba96ba13e2e89ce9da07c1cc1dfbe6e2e0f6',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '5021edde6d0ea75aedc313e75cca2ac5aa064d41',
+      revision = 'f3a19ab3217a6e838870fc7142fa492d1fd7a7c9',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '5021edde6d0ea75aedc313e75cca2ac5aa064d41',
+      revision = 'f3a19ab3217a6e838870fc7142fa492d1fd7a7c9',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1667,7 +1667,7 @@ return {
   },
   printf = {
     install_info = {
-      revision = '60d50a2247b0c1fb72b967562c64711d65c6a060',
+      revision = 'df6b69967db7d74ab338a86a9ab45c0966c5ee3c',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-printf',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1778,7 +1778,7 @@ return {
   },
   python = {
     install_info = {
-      revision = '44c2f7aebce0efac5867cdc5f2ea03c1d43a0305',
+      revision = '710796b8b877a970297106e5bbc8e2afa47f86ec',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
@@ -1812,7 +1812,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '5c2d02747250bc326bc33687b3319b7db8554e24',
+      revision = '0555ac0da902abff06076e40501102cee3ba68bd',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1855,7 +1855,6 @@ return {
       generate_from_json = true,
       revision = 'a47cd8ca148685629739a4ab69f58864800fbdab',
       url = 'https://github.com/tris203/tree-sitter-razor',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@tris203' },
     tier = 3,
@@ -1959,7 +1958,7 @@ return {
   },
   rst = {
     install_info = {
-      revision = 'dd5971ef7759583aadd5aa5e3a3a0905eb5734d5',
+      revision = '899e073a10012b8028b643d676c30bbf9c64a45d',
       url = 'https://github.com/stsewd/tree-sitter-rst',
     },
     maintainers = { '@stsewd' },
@@ -1967,7 +1966,7 @@ return {
   },
   ruby = {
     install_info = {
-      revision = '71bd32fb7607035768799732addba884a37a6210',
+      revision = '89bd7a8e5450cb6a942418a619d30469f259e5d6',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
@@ -1991,7 +1990,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'd3b9553b47d7ab413a146c4b6498e527265b966e',
+      revision = 'd67fe3ba3879bd7ba74bd7f56c9a38fed241ba25',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2085,7 +2084,7 @@ return {
   },
   solidity = {
     install_info = {
-      revision = '727087514eff57d92e273a24303142308bce3381',
+      revision = 'd38dcd0b58b223c43e3f9265914fb3167dc624c6',
       url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
@@ -2224,7 +2223,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'f4be8072f18fb9704fd35d4b8154ae2b19e314c0',
+      revision = '1ebc09c38f41d6aab7dd65ca0f8ea032ced0364f',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2298,7 +2297,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = 'a9178bfc9cc8040c08f39b47bae5400a2bf06e50',
+      revision = 'def9849184de71a797c4e2b2837df85abeccf92c',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2384,7 +2383,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'tsx',
-      revision = '410947e9d2ca8e032cd2419bf1241406c7e6f9bb',
+      revision = '75b3874edb2dc714fb1fd77a32013d0f8699989f',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2411,7 +2410,7 @@ return {
     install_info = {
       generate_from_json = true,
       location = 'typescript',
-      revision = '410947e9d2ca8e032cd2419bf1241406c7e6f9bb',
+      revision = '75b3874edb2dc714fb1fd77a32013d0f8699989f',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
     },
     maintainers = { '@steelsojka' },
@@ -2436,7 +2435,7 @@ return {
   },
   typst = {
     install_info = {
-      revision = '26dfb4b94a99cc9d6044342b7ad0ba761da77d60',
+      revision = 'cb0ffe14259f7f63ee6f05b57ceb24a35bedef75',
       url = 'https://github.com/uben0/tree-sitter-typst',
     },
     maintainers = { '@uben0', '@RaafatTurki' },
@@ -2518,7 +2517,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = 'da8ea8afa7899a99e43a7d61afef9f77b7a675eb',
+      revision = 'cfc522af3e49c1a00ae74e01aa14e19818dab8f2',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2526,7 +2525,7 @@ return {
   },
   vhs = {
     install_info = {
-      revision = '037e675d547b18bbf3fdeb222e242ae5dccc39d7',
+      revision = '966067fe81d78071805d8e55ec836b3926c4ece4',
       url = 'https://github.com/charmbracelet/tree-sitter-vhs',
     },
     maintainers = { '@caarlos0' },
@@ -2611,7 +2610,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = 'ce150c5be7f617e18ffa2064213e5d9c4cb5d69e',
+      revision = '26e95de449d772bc2dd4f0382580f84e2a0754d6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2669,7 +2668,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = '3518133e9ebea7c372eff4def368eda8488fad18',
+      revision = 'acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2678,7 +2677,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = '3518133e9ebea7c372eff4def368eda8488fad18',
+      revision = 'acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
index 100cfde27..43f3c4ade 100755
--- a/scripts/ci-install.sh
+++ b/scripts/ci-install.sh
@@ -6,10 +6,10 @@ NVIM_TAG=${NVIM_TAG-nightly}
 
 os=$(uname -s)
 if [[ $os == Linux ]]; then
-  wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux-x86_64.tar.gz
+  wget "https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-linux-x86_64.tar.gz"
   tar -zxf nvim-linux-x86_64.tar.gz
   sudo ln -s "$PWD"/nvim-linux-x86_64/bin/nvim /usr/local/bin
-  rm -rf "$PWD"/nvim-linux-x86_64/lib/nvim/parser
+  rm -rf "$PWD"/nvim-linu-x86_x64/lib/nvim/parser
   mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
   ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
 elif [[ $os == Darwin ]]; then

From a9f34d5a768b2afcece98ba31345602a71f42fcb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 9 Feb 2025 13:19:34 +0100
Subject: [PATCH 2323/2704] feat(parsers): rework tiers

* stable: updates follow semver releases (todo)
* unstable: updates follow HEAD (default)
* unmaintained: no automatic updates
* unsupported: no updates, cannot be installed
---
 CONTRIBUTING.md                       |   5 +-
 README.md                             |   8 +-
 SUPPORTED_LANGUAGES.md                | 633 +++++++++++++-------------
 TODO.md                               |   2 +-
 doc/nvim-treesitter.txt               |   6 +-
 lua/nvim-treesitter/_meta/parsers.lua |   2 +-
 lua/nvim-treesitter/config.lua        |   4 +-
 lua/nvim-treesitter/parsers.lua       | 478 +++++++++----------
 scripts/update-parsers.lua            |   2 +-
 9 files changed, 569 insertions(+), 571 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ea7dcdbf..d82c9cd7b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,16 +19,15 @@ To add a new parser, edit the following files:
 zimbu = {
   install_info = {
     url = 'https://github.com/zimbulang/tree-sitter-zimbu', -- git repo; use `path` for local path
-    files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
+    revision = 'v2.1', -- tag or commit hash, will be updated automatically
     -- optional entries:
     branch = 'develop', -- only needed if different from default branch
     location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
-    revision = 'v2.1', -- tag or commit hash, will be updated automatically
     generate = true, -- only needed if repo does not contain pre-generated src/parser.c
     generate_from_json = true, -- only needed if grammar.js has npm-installed dependencies
   },
   maintainers = { '@me' }, -- the _query_ maintainers
-  tier = 3, -- community-contributed parser
+  tier = 1, -- stable: track versioned releases
   -- optional entries:
   requires = { 'vim' }, -- if the queries inherit from another language
   readme_note = "an example language",
diff --git a/README.md b/README.md
index 8523a75e1..7ea64b76d 100644
--- a/README.md
+++ b/README.md
@@ -53,11 +53,11 @@ require('lazy').setup(
 
 ```lua
 require'nvim-treesitter'.setup {
-  -- A list of parser names or tiers ('stable', 'core', 'community', 'unsupported')
-  ensure_install = { },
+  -- A list of parser names or tiers ('stable', 'unstable')
+  ensure_install = { 'stable' },
 
-  -- List of parsers to ignore installing
-  ignore_install = { 'unsupported' },
+  -- List of parsers to ignore when installing tiers
+  ignore_install = { 'rust' },
 
   -- Directory to install parsers and queries to
   install_dir = vim.fn.stdpath('data') .. '/site'
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 1d15c5328..648c0d445 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -3,7 +3,7 @@
 The following is a list of languages for which a parser can be installed through `:TSInstall`.
 
 Legend:
-- **Tier:** _stable_, _core_, _community_, or _unsupported_
+- **Tier:** _stable_ (updates follow semver releases), _unstable_ (updates follow HEAD), _unmaintained_ (no automatic updates), or _unsupported_ (known to be broken, cannot be installed)
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
 - **Maintainer** of queries in nvim-treesitter (may be different from parser maintainer!)
 
@@ -11,322 +11,321 @@ Legend:
 <!--parserinfo-->
 Language | Tier | Queries | Maintainer
 -------- |:----:|:-------:| ----------
-[ada](https://github.com/briot/tree-sitter-ada) | community | `HF JL` | @briot
-[agda](https://github.com/tree-sitter/tree-sitter-agda) | core | `HF J ` | @Decodetalkers
-[angular](https://github.com/dlvandenberg/tree-sitter-angular) | community | `HFIJL` | @dlvandenberg
-[apex](https://github.com/aheber/tree-sitter-sfapex) | community | `HF JL` | @aheber, @xixiafinland
-[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | core | `HFIJL` | @ObserverOfTime
-[asm](https://github.com/RubixDev/tree-sitter-asm) | community | `H  J ` | @RubixDev
-[astro](https://github.com/virchau13/tree-sitter-astro) | community | `HFIJL` | @virchau13
-[authzed](https://github.com/mleonidas/tree-sitter-authzed) | community | `H  J ` | @mattpolzin
-[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unsupported | `H  J ` | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) | stable | `HF JL` | @TravonteD
-[bass](https://github.com/vito/tree-sitter-bass) | community | `HFIJL` | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) | community | `HF J ` | @polarmutex
-[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | community | `HFIJ ` | @theHamsta, @clason
-[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | core | `HFIJL` | @amaanq
-[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | core | `HFIJL` | @amaanq
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unsupported | `H  J ` | @gabmus
-[bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | community | `HFIJL` | @ambroisie
-[c](https://github.com/tree-sitter/tree-sitter-c) | stable | `HFIJL` | @amaanq
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | core | `HF JL` | @amaanq
-[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | core | `HFIJL` | @amaanq
-[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | core | `HFIJL` | @amaanq
-[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | core | `HFIJL` | @ObserverOfTime
-[circom](https://github.com/Decurity/tree-sitter-circom) | community | `HF JL` | @alexandr-martirosyan
-[clojure](https://github.com/sogaiu/tree-sitter-clojure) | community | `HF JL` | @NoahTheDuke
-[cmake](https://github.com/uyha/tree-sitter-cmake) | community | `HFIJ ` | @uyha
-[comment](https://github.com/stsewd/tree-sitter-comment) | community | `H    ` | @stsewd
-[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | core | `HF JL` | @theHamsta
-[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | community | `H  J ` | @addcninblue
-[corn](https://github.com/jakestanger/tree-sitter-corn) | community | `HFIJL` | @jakestanger
-[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | core | `HFIJL` | @amaanq
-[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | core | `HFIJL` | @theHamsta
-[css](https://github.com/tree-sitter/tree-sitter-css) | core | `HFIJ ` | @TravonteD
-[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
-[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | core | `HFIJL` | @theHamsta
-[cue](https://github.com/eonpatapon/tree-sitter-cue) | community | `HFIJL` | @amaanq
-[cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | community | `HFIJ ` | @elliotfontaine
-[d](https://github.com/gdamore/tree-sitter-d) | community | `HFIJL` | @amaanq
-[dart](https://github.com/UserNobody14/tree-sitter-dart) | community | `HFIJL` | @akinsho
-[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | community | `HF J ` | @ValdezFOmar
-[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | community | `HFIJL` | @jedrzejboczar
-[dhall](https://github.com/jbellerb/tree-sitter-dhall) | community | `HF J ` | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) | community | `HF J ` | @gbprod
-[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | community | `H  J ` | @ColinKennedy
-[djot](https://github.com/treeman/tree-sitter-djot) | community | `HFIJL` | @NoahTheDuke
-[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | community | `H  J ` | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) | community | `H IJ ` | @rydesun
-[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | core | `H IJ ` | @amaanq
-[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HF JL` | @ObserverOfTime
-[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | community | `H  J ` | @glehmann
-[ebnf](https://github.com/RubixDev/ebnf) | community | `H  J ` | @RubixDev
-ecma (queries only)[^ecma] | community | `HFIJL` | @steelsojka
-[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | community | `HF J ` | @ValdezFOmar
-[eds](https://github.com/uyha/tree-sitter-eds) | community | `HF   ` | @uyha
-[eex](https://github.com/connorlay/tree-sitter-eex) | community | `H  J ` | @connorlay
-[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | community | `HFIJL` | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) | community | `HF J ` | @zweimach
-[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | community | `HFIJL` | @glapa-grossklag, @amaanq
-[elvish](https://github.com/elves/tree-sitter-elvish) | community | `H  J ` | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unsupported | `H  J ` | 
-[enforce](https://github.com/simonvic/tree-sitter-enforce) | community | `HFIJL` | @simonvic
-[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | community | `HF J ` | @filmor
-[facility](https://github.com/FacilityApi/tree-sitter-facility) | community | `HFIJ ` | @bryankenote
-[faust](https://github.com/khiner/tree-sitter-faust) | community | `H  J ` | @khiner
-[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | community | `HF JL` | @alexmozaidze
-[fidl](https://github.com/google/tree-sitter-fidl) | community | `HF J ` | @chaopeng
-[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | core | `HFIJL` | @amaanq
-[fish](https://github.com/ram02z/tree-sitter-fish) | community | `HFIJL` | @ram02z
-[foam](https://github.com/FoamScience/tree-sitter-foam) | community | `HFIJL` | @FoamScience
-[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | community | `HFIJL` | @amaanq
-[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | community | `HFIJ ` | @amaanq
-[fsh](https://github.com/mgramigna/tree-sitter-fsh) | community | `H  J ` | @mgramigna
-[fsharp](https://github.com/ionide/tree-sitter-fsharp) | community | `H  J ` | @nsidorenco
-[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | core | `H  J ` | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | community | `HFIJL` | @jirgn
-[gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | community | `HF JL` | @reiniscirpons
-[gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | community | `HF J ` | @reiniscirpons
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | community | `HFIJL` | @PrestonKnopp
-[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | community | `H  J ` | @godofavacyn
-[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | community | `HF J ` | @amaanq
-[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | community | `H  J ` | @gbprod
-[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | core | `H  JL` | @ObserverOfTime
-[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | community | `H  J ` | @gbprod
-[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | community | `H  J ` | @theHamsta
-[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | community | `HFIJL` | @amaanq
-[glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | community | `HFIJL` | @NullVoxPopuli
-[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | community | `H IJL` | @NullVoxPopuli
-[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | community | `H IJ ` | @NullVoxPopuli
-[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | core | `HFIJL` | @theHamsta
-[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | core | `HFIJL` | @amaanq
-[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | community | `H  J ` | @dpezto
-[go](https://github.com/tree-sitter/tree-sitter-go) | core | `HFIJL` | @theHamsta, @WinWisely268
-[goctl](https://github.com/chaozwn/tree-sitter-goctl) | community | `HFIJ ` | @chaozwn
-[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | community | `HF JL` | @pierpo
-[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | community | `H  J ` | @camdencheek
-[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | core | `H    ` | @amaanq
-[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | community | `HF JL` | @qvalentin
-[gowork](https://github.com/omertuc/tree-sitter-go-work) | community | `H  J ` | @omertuc
-[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | core | `H  J ` | @ObserverOfTime
-[graphql](https://github.com/bkegley/tree-sitter-graphql) | community | `H IJ ` | @bkegley
-[gren](https://github.com/MaeBrooks/tree-sitter-gren) | community | `H  J ` | @MaeBrooks
-[groovy](https://github.com/murtaza64/tree-sitter-groovy) | community | `HFIJL` | @murtaza64
-[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | core | `H    ` | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) | unsupported | `H  J ` | 
-[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | core | `HFIJL` | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | core | `HF JL` | @mrcjkb
-[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | community | `HF   ` | @lykahb
-[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | core | `HFIJ ` | @MichaHoffmann
-[heex](https://github.com/connorlay/tree-sitter-heex) | community | `HFIJL` | @connorlay
-[helm](https://github.com/ngalaiko/tree-sitter-go-template) | community | `HF JL` | @qvalentin
-[hjson](https://github.com/winston0410/tree-sitter-hjson) | community | `HFIJL` | @winston0410
-[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | core | `HFIJL` | @theHamsta
-[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | community | `H  J ` | @Freed-Wu
-[hocon](https://github.com/antosha417/tree-sitter-hocon) | unsupported | `HF J ` | @antosha417
-[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | community | `HF JL` | @urbit-pilled
-[html](https://github.com/tree-sitter/tree-sitter-html) | core | `HFIJL` | @TravonteD
-html_tags (queries only)[^html_tags] | community | `H IJ ` | @TravonteD
-[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | community | `HFIJ ` | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) | community | `HF J ` | @amaanq, @NTBBloodbath
-[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | community | `HFIJ ` | @pfeiferj
-[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | core | `HFIJ ` | @luckasRanarison
-[idl](https://github.com/cathaysia/tree-sitter-idl) | community | `H IJ ` | @cathaysia
-[idris](https://github.com/kayhide/tree-sitter-idris) | community | `HF JL` | @srghma
-[ini](https://github.com/justinmk/tree-sitter-ini) | community | `HF J ` | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | community | `HFIJL` | @yorickpeterse
-[ipkg](https://github.com/srghma/tree-sitter-ipkg) | community | `HFIJL` | @srghma
-[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | core | `HFIJL` | @fab4100
-[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | community | `HF JL` | @sogaiu
-[java](https://github.com/tree-sitter/tree-sitter-java) | core | `HFIJL` | @p00f
-[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | core | `HFIJL` | @steelsojka
-[jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | community | `H  J ` | @cathaysia
-[jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | community | `H  J ` | @cathaysia
-[jq](https://github.com/flurie/tree-sitter-jq) | community | `H  JL` | @ObserverOfTime
-[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | core | `H    ` | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) | core | `HFI L` | @steelsojka
-[json5](https://github.com/Joakker/tree-sitter-json5) | community | `H  J ` | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | community | `HFIJL` | @WhyNotHugo
-[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | community | `HF JL` | @nawordar
-jsx (queries only)[^jsx] | community | `HFIJ ` | @steelsojka
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | community | `HFIJL` | @fredrikekre
-[just](https://github.com/IndianBoy42/tree-sitter-just) | community | `HFIJL` | @Hubro
-[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | core | `HFIJL` | @amaanq
-[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | core | `HFIJL` | @amaanq
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | community | `HF JL` | @SalBakraa
-[koto](https://github.com/koto-lang/tree-sitter-koto) | community | `HF JL` | @irh
-[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | community | `H  J ` | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | community | `HF JL` | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | community | `HF J ` | @theHamsta, @clason
-[ledger](https://github.com/cbarrete/tree-sitter-ledger) | community | `HFIJ ` | @cbarrete
-[leo](https://github.com/r001/tree-sitter-leo) | community | `H IJ ` | @r001
-[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | core | `HFIJL` | @amaanq
-[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | community | `H  J ` | @hankthetank27
-[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | community | `HFIJL` | @toots
-[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | community | `H  J ` | @benwilliamgraham
-[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | stable | `HFIJL` | @muniftanjim
-[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | core | `H    ` | @amaanq
-[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | core | `H    ` | @amaanq
-[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | core | `HFIJL` | @amaanq
-[m68k](https://github.com/grahambates/tree-sitter-m68k) | community | `HF JL` | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) | community | `HF J ` | @lewis6991
-[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | stable | `HFIJ ` | @MDeiml
-[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | stable | `H  J ` | @MDeiml
-[matlab](https://github.com/acristoffers/tree-sitter-matlab) | community | `HFIJL` | @acristoffers
-[menhir](https://github.com/Kerl13/tree-sitter-menhir) | community | `H  J ` | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unsupported | `HFIJ ` | 
-[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | core | `HFIJ ` | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | community | `H  JL` | @artagnon
-[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | community | `H  J ` | @Freed-Wu
-[nasm](https://github.com/naclsn/tree-sitter-nasm) | community | `H  J ` | @ObserverOfTime
-[nginx](https://github.com/opa-oz/tree-sitter-nginx) | community | `HF J ` | @opa-oz
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unsupported | `H IJ ` | 
-[nim](https://github.com/alaviss/tree-sitter-nim) | community | `HF JL` | @aMOPel
-[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | community | `H  J ` | @aMOPel
-[ninja](https://github.com/alemuller/tree-sitter-ninja) | community | `HFIJ ` | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) | community | `HFIJL` | @leo60228
-[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | core | `HFIJL` | @amaanq
-[nu](https://github.com/nushell/tree-sitter-nu) | community | `H IJ ` | @abhisheksingh0x558
-[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | core | `HFIJL` | @amaanq
-[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | community | `H  J ` | @ColinKennedy
-[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` | @undu
-[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | core | `HFIJL` | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | community | `H  J ` | @undu
-[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | core | `HFIJL` | @amaanq
-[org](https://github.com/milisims/tree-sitter-org) | unsupported | `     ` | 
-[pascal](https://github.com/Isopod/tree-sitter-pascal) | community | `HFIJL` | @Isopod
-[passwd](https://github.com/ath3/tree-sitter-passwd) | community | `H    ` | @amaanq
-[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | core | `HF J ` | @ObserverOfTime
-[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | community | `HF J ` | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | core | `HFIJL` | @tk-shirasaka, @calebdw
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | core | `HFIJL` | @tk-shirasaka, @calebdw
-[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | community | `H    ` | @mikehaertl
-[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | community | `H  J ` | @leo60228
-[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | core | `HF J ` | @amaanq
-[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | community | `H    ` | @RabbiVeesh, @LeoNerd
-[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | core | `HFIJ ` | @ObserverOfTime
-[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | core | `HFIJL` | @amaanq, @mfelsche
-[powershell](https://github.com/airbus-cert/tree-sitter-powershell) | community | `HFIJL` | @L2jLiga
-[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | core | `H    ` | @ObserverOfTime
-[prisma](https://github.com/victorhqc/tree-sitter-prisma) | community | `HF J ` | @elianiva
-[problog](https://github.com/foxyseta/tree-sitter-prolog) | community | `HFIJ ` | @foxyseta
-[prolog](https://github.com/foxyseta/tree-sitter-prolog) | community | `HFIJ ` | @foxyseta
-[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | community | `H  J ` | @MichaHoffmann
-[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | core | `H  JL` | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) | community | `HFIJ ` | @treywood
-[prql](https://github.com/PRQL/tree-sitter-prql) | community | `H  J ` | @matthias-Q
-[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
-[pug](https://github.com/zealot128/tree-sitter-pug) | community | `H  J ` | @zealot128
-[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | core | `HFIJL` | @amaanq
-[purescript](https://github.com/postsolar/tree-sitter-purescript) | community | `H  JL` | @postsolar
-[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | core | `H  J ` | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` | @stsewd, @theHamsta
-[ql](https://github.com/tree-sitter/tree-sitter-ql) | core | `HFIJL` | @pwntester
-[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | core | `H  J ` | @amaanq
-[qmljs](https://github.com/yuja/tree-sitter-qmljs) | community | `HF J ` | @Decodetalkers
-[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | stable | `HFIJL` | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) | community | `H IJL` | @ribru17
-[racket](https://github.com/6cdh/tree-sitter-racket) | unsupported | `HF J ` | 
-[ralph](https://github.com/alephium/tree-sitter-ralph) | community | `H  J ` | @tdroxler
-[rasi](https://github.com/Fymyte/tree-sitter-rasi) | community | `HFIJL` | @Fymyte
-[razor](https://github.com/tris203/tree-sitter-razor) | community | `HF J ` | @tris203
-[rbs](https://github.com/joker1007/tree-sitter-rbs) | community | `HFIJ ` | @joker1007
-[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | core | `HFIJL` | @amaanq
-[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | core | `HFIJ ` | @ribru17
-[regex](https://github.com/tree-sitter/tree-sitter-regex) | core | `H    ` | @theHamsta
-[rego](https://github.com/FallenAngel97/tree-sitter-rego) | community | `H  J ` | @FallenAngel97
-[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | core | `H  J ` | @ObserverOfTime
-[rescript](https://github.com/rescript-lang/tree-sitter-rescript) | core | `HFIJL` | @ribru17
-[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | community | `HF J ` | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | community | `HFIJ ` | @Hubro
-[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | community | `H  J ` | @opa-oz
-[roc](https://github.com/faldor20/tree-sitter-roc) | community | `H  JL` | @nat-418
-[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | core | `HFIJL` | @amaanq
-[rst](https://github.com/stsewd/tree-sitter-rst) | community | `H  JL` | @stsewd
-[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | core | `HFIJL` | @TravonteD
-[runescript](https://github.com/2004Scape/tree-sitter-runescript) | community | `H  J ` | @2004Scape
-[rust](https://github.com/tree-sitter/tree-sitter-rust) | core | `HFIJL` | @amaanq
-[scala](https://github.com/tree-sitter/tree-sitter-scala) | core | `HF JL` | @stevanmilic
-[scfg](https://github.com/rockorager/tree-sitter-scfg) | unsupported | `H  J ` | @WhyNotHugo
-[scheme](https://github.com/6cdh/tree-sitter-scheme) | unsupported | `HF J ` | 
-[scss](https://github.com/serenadeai/tree-sitter-scss) | community | `HFIJ ` | @elianiva
-[sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | community | `H    ` | @aheber, @xixiaofinland
-[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | core | `HFIJL` | @theHamsta
-[slim](https://github.com/theoo/tree-sitter-slim) | community | `HFIJL` | @theoo
-[slint](https://github.com/slint-ui/tree-sitter-slint) | community | `HFIJL` | @hunger
-[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | core | `HFIJL` | @amaanq
-[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | community | `H  J ` | @amaanq, @keynmol
-[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | community | `HFIJL` | @osthomas
-[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | community | `HF J ` | @amaanq
-[soql](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber, @xixiafinland
-[sosl](https://github.com/aheber/tree-sitter-sfapex) | community | `H    ` | @aheber, @xixiafinland
-[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | community | `H  JL` | @Sarrus1
-[sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | community | `HFIJL` | @GordianDziwis
-[sql](https://github.com/derekstride/tree-sitter-sql) | community | `H IJ ` | @derekstride
-[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | core | `HFIJL` | @amaanq
-[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | core | `HFIJL` | @ObserverOfTime
-[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | core | `HFIJL` | @amaanq
-[strace](https://github.com/sigmaSd/tree-sitter-strace) | community | `H  J ` | @amaanq
-[styled](https://github.com/mskelton/tree-sitter-styled) | community | `HFIJ ` | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | community | `HFIJL` | @madskjeldgaard
-[superhtml](https://github.com/kristoff-it/superhtml) | community | `H  J ` | @rockorager
-[surface](https://github.com/connorlay/tree-sitter-surface) | community | `HFIJ ` | @connorlay
-[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | core | `HFIJL` | @amaanq
-[sway](https://github.com/FuelLabs/tree-sitter-sway.git) | core | `HFIJL` | @ribru17
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | community | `HFIJL` | @alex-pinkus
-[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | community | `HF J ` | @RaafatTurki
-[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | community | `HF JL` | @ok-ryoko
-[t32](https://gitlab.com/xasc/tree-sitter-t32) | community | `HFIJL` | @xasc
-[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | core | `HFIJL` | @amaanq
-[tact](https://github.com/tact-lang/tree-sitter-tact) | community | `HFIJL` | @novusnota
-[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | core | `HFIJ ` | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) | community | `HFIJL` | @euclidianAce
-[templ](https://github.com/vrischmann/tree-sitter-templ) | community | `HF J ` | @vrischmann
-[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | community | `HFIJ ` | @MichaHoffmann
-[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | community | `HFIJ ` | @Porter
-[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | core | `HFIJL` | @amaanq, @duskmoon314
-[tiger](https://github.com/ambroisie/tree-sitter-tiger) | community | `HFIJL` | @ambroisie
-[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | community | `HF JL` | @ahelwer, @susliko
-[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | community | `H  J ` | @Freed-Wu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | community | `H    ` | @arnarg
-[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | core | `HFIJL` | @tk-shirasaka
-[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | core | `H    ` | @amaanq
-[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` | @steelsojka
-[turtle](https://github.com/GordianDziwis/tree-sitter-turtle) | community | `HFIJL` | @GordianDziwis
-[twig](https://github.com/gbprod/tree-sitter-twig) | community | `H  J ` | @gbprod
-[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | core | `HFIJL` | @steelsojka
-[typespec](https://github.com/happenslol/tree-sitter-typespec) | community | `H IJ ` | @happenslol
-[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | community | `HFIJ ` | @Teddytrombone
-[typst](https://github.com/uben0/tree-sitter-typst) | community | `HFIJ ` | @uben0, @RaafatTurki
-[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | core | `H  JL` | @ObserverOfTime
-[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | core | `HFIJL` | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | community | `HF J ` | @tapegram
-[usd](https://github.com/ColinKennedy/tree-sitter-usd) | community | `HFIJL` | @ColinKennedy
-[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | core | `HFIJL` | @amaanq
-[v](https://github.com/vlang/v-analyzer) | community | `HFIJL` | @kkharji, @amaanq
-[vala](https://github.com/vala-lang/tree-sitter-vala) | community | `HF J ` | @Prince781
-[vento](https://github.com/ventojs/tree-sitter-vento) | community | `H  J ` | @wrapperup, @oscarotero
-[verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | community | `HF J ` | @zhangwwpeng
-[vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | community | `HF J ` | @jpt13653903
-[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | community | `H  J ` | @caarlos0
-[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | stable | `HF JL` | @clason
-[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | stable | `H  J ` | @clason
-[vrl](https://github.com/belltoy/tree-sitter-vrl) | community | `HFIJL` | @belltoy
-[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | core | `HFIJ ` | @WhyNotHugo, @lucario387
-[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | community | `HFIJ ` | @szebniok
-[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | core | `HFI  ` | @theHamsta
-[wing](https://github.com/winglang/tree-sitter-wing) | community | `HF JL` | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | community | `HF J ` | @liamwh
-[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | core | `H  JL` | @ObserverOfTime
-[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | core | `HFIJL` | @ObserverOfTime
-[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | community | `HF JL` | @ValdezFOmar
-[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | core | `HFIJL` | @amaanq
-[yang](https://github.com/Hubro/tree-sitter-yang) | community | `HFIJ ` | @Hubro
-[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | core | `HFIJL` | @Philipp-M, @amaanq
-[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | community | `H  J ` | @Freed-Wu
-[zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | stable | `HFIJL` | @amaanq
-[ziggy](https://github.com/kristoff-it/ziggy) | community | `H I  ` | @rockorager
-[ziggy_schema](https://github.com/kristoff-it/ziggy) | community | `H I  ` | @rockorager
+[ada](https://github.com/briot/tree-sitter-ada) | unstable | `HF JL` | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) | unstable | `HF J ` | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJL` | @dlvandenberg
+[apex](https://github.com/aheber/tree-sitter-sfapex) | unstable | `HF JL` | @aheber, @xixiafinland
+[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | unstable | `HFIJL` | @ObserverOfTime
+[asm](https://github.com/RubixDev/tree-sitter-asm) | unstable | `H  J ` | @RubixDev
+[astro](https://github.com/virchau13/tree-sitter-astro) | unstable | `HFIJL` | @virchau13
+[authzed](https://github.com/mleonidas/tree-sitter-authzed) | unstable | `H  J ` | @mattpolzin
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HF JL` | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unstable | `HF J ` | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` | @theHamsta, @clason
+[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` | @amaanq
+[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` | @gabmus
+[bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` | @ambroisie
+[c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` | @amaanq
+[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` | @amaanq
+[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | unstable | `HFIJL` | @amaanq
+[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | unstable | `HFIJL` | @ObserverOfTime
+[circom](https://github.com/Decurity/tree-sitter-circom) | unstable | `HF JL` | @alexandr-martirosyan
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) | unstable | `HF JL` | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) | unstable | `HFIJ ` | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | unstable | `H    ` | @stsewd
+[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | unstable | `HF JL` | @theHamsta
+[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | unstable | `H  J ` | @addcninblue
+[corn](https://github.com/jakestanger/tree-sitter-corn) | unstable | `HFIJL` | @jakestanger
+[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | unstable | `HFIJL` | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | unstable | `HFIJL` | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) | unstable | `HFIJ ` | @TravonteD
+[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
+[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | unstable | `HFIJL` | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) | unstable | `HFIJL` | @amaanq
+[cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | unstable | `HFIJ ` | @elliotfontaine
+[d](https://github.com/gdamore/tree-sitter-d) | unstable | `HFIJL` | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) | unstable | `HFIJL` | @akinsho
+[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | unstable | `HF J ` | @ValdezFOmar
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | unstable | `HFIJL` | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) | unstable | `HF J ` | @amaanq
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) | unstable | `HF J ` | @gbprod
+[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | unstable | `H  J ` | @ColinKennedy
+[djot](https://github.com/treeman/tree-sitter-djot) | unstable | `HFIJL` | @NoahTheDuke
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | unstable | `H  J ` | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) | unstable | `H IJ ` | @rydesun
+[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | unstable | `H IJ ` | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HF JL` | @ObserverOfTime
+[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | unstable | `H  J ` | @glehmann
+[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H  J ` | @RubixDev
+ecma (queries only)[^ecma] | unstable | `HFIJL` | @steelsojka
+[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | unstable | `HF J ` | @ValdezFOmar
+[eds](https://github.com/uyha/tree-sitter-eds) | unstable | `HF   ` | @uyha
+[eex](https://github.com/connorlay/tree-sitter-eex) | unstable | `H  J ` | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | unstable | `HFIJL` | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) | unstable | `HF J ` | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | unstable | `HFIJL` | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) | unstable | `H  J ` | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unstable | `H  J ` | 
+[enforce](https://github.com/simonvic/tree-sitter-enforce) | unstable | `HFIJL` | @simonvic
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | unstable | `HF J ` | @filmor
+[facility](https://github.com/FacilityApi/tree-sitter-facility) | unstable | `HFIJ ` | @bryankenote
+[faust](https://github.com/khiner/tree-sitter-faust) | unstable | `H  J ` | @khiner
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | unstable | `HF JL` | @alexmozaidze
+[fidl](https://github.com/google/tree-sitter-fidl) | unstable | `HF J ` | @chaopeng
+[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | unstable | `HFIJL` | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) | unstable | `HFIJL` | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJL` | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | unstable | `HFIJL` | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | unstable | `HFIJ ` | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) | unstable | `H  J ` | @mgramigna
+[fsharp](https://github.com/ionide/tree-sitter-fsharp) | unstable | `H  J ` | @nsidorenco
+[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | unstable | `H  J ` | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | unstable | `HFIJL` | @jirgn
+[gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` | @reiniscirpons
+[gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` | @reiniscirpons
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unstable | `HFIJL` | @PrestonKnopp
+[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | unstable | `H  J ` | @godofavacyn
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | unstable | `HF J ` | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | unstable | `H  J ` | @gbprod
+[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | unstable | `H  JL` | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | unstable | `H  J ` | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | unstable | `H  J ` | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | unstable | `HFIJL` | @amaanq
+[glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | unstable | `HFIJL` | @NullVoxPopuli
+[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | unstable | `H IJL` | @NullVoxPopuli
+[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | unstable | `H IJ ` | @NullVoxPopuli
+[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | unstable | `HFIJL` | @theHamsta
+[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | unstable | `HFIJL` | @amaanq
+[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | unstable | `H  J ` | @dpezto
+[go](https://github.com/tree-sitter/tree-sitter-go) | unstable | `HFIJL` | @theHamsta, @WinWisely268
+[goctl](https://github.com/chaozwn/tree-sitter-goctl) | unstable | `HFIJ ` | @chaozwn
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | unstable | `HF JL` | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | unstable | `H  J ` | @camdencheek
+[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | unstable | `H    ` | @amaanq
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` | @qvalentin
+[gowork](https://github.com/omertuc/tree-sitter-go-work) | unstable | `H  J ` | @omertuc
+[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | unstable | `H  J ` | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) | unstable | `H IJ ` | @bkegley
+[gren](https://github.com/MaeBrooks/tree-sitter-gren) | unstable | `H  J ` | @MaeBrooks
+[groovy](https://github.com/murtaza64/tree-sitter-groovy) | unstable | `HFIJL` | @murtaza64
+[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | unstable | `H    ` | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H  J ` | 
+[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | unstable | `HFIJL` | @amaanq
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | unstable | `HF JL` | @mrcjkb
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | unstable | `HF   ` | @lykahb
+[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) | unstable | `HFIJL` | @connorlay
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` | @qvalentin
+[hjson](https://github.com/winston0410/tree-sitter-hjson) | unstable | `HFIJL` | @winston0410
+[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | unstable | `HFIJL` | @theHamsta
+[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | unstable | `H  J ` | @Freed-Wu
+[hocon](https://github.com/antosha417/tree-sitter-hocon) | unstable | `HF J ` | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF JL` | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) | unstable | `HFIJL` | @TravonteD
+html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) | unstable | `HF J ` | @amaanq, @NTBBloodbath
+[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | unstable | `HFIJ ` | @pfeiferj
+[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | unstable | `HFIJ ` | @luckasRanarison
+[idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` | @cathaysia
+[idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` | @srghma
+[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` | @theHamsta
+[inko](https://github.com/inko-lang/tree-sitter-inko) | unstable | `HFIJL` | @yorickpeterse
+[ipkg](https://github.com/srghma/tree-sitter-ipkg) | unstable | `HFIJL` | @srghma
+[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` | @p00f
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | unstable | `HFIJL` | @steelsojka
+[jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | unstable | `H  J ` | @cathaysia
+[jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` | @cathaysia
+[jq](https://github.com/flurie/tree-sitter-jq) | unstable | `H  JL` | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFI L` | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) | unstable | `H  J ` | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | unstable | `HFIJL` | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` | @nawordar
+jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | unstable | `HFIJL` | @fredrikekre
+[just](https://github.com/IndianBoy42/tree-sitter-just) | unstable | `HFIJL` | @Hubro
+[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` | @amaanq
+[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` | @amaanq
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` | @SalBakraa
+[koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` | @irh
+[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` | @Willem-J-an
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | unstable | `HF JL` | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | unstable | `HF J ` | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) | unstable | `HFIJ ` | @cbarrete
+[leo](https://github.com/r001/tree-sitter-leo) | unstable | `H IJ ` | @r001
+[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | unstable | `HFIJL` | @amaanq
+[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | unstable | `H  J ` | @hankthetank27
+[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | unstable | `HFIJL` | @toots
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | unstable | `H  J ` | @benwilliamgraham
+[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | unstable | `HFIJL` | @muniftanjim
+[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | unstable | `H    ` | @amaanq
+[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | unstable | `H    ` | @amaanq
+[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | unstable | `HFIJL` | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) | unstable | `HF JL` | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) | unstable | `HF J ` | @lewis6991
+[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | unstable | `HFIJ ` | @MDeiml
+[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | unstable | `H  J ` | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) | unstable | `HFIJL` | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) | unstable | `H  J ` | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `HFIJ ` | 
+[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | unstable | `HFIJ ` | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H  JL` | @artagnon
+[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | unstable | `H  J ` | @Freed-Wu
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | unstable | `H  J ` | @ObserverOfTime
+[nginx](https://github.com/opa-oz/tree-sitter-nginx) | unstable | `HF J ` | @opa-oz
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unstable | `H IJ ` | 
+[nim](https://github.com/alaviss/tree-sitter-nim) | unstable | `HF JL` | @aMOPel
+[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | unstable | `H  J ` | @aMOPel
+[ninja](https://github.com/alemuller/tree-sitter-ninja) | unstable | `HFIJ ` | @alemuller
+[nix](https://github.com/cstrahan/tree-sitter-nix) | unstable | `HFIJL` | @leo60228
+[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | unstable | `HFIJL` | @amaanq
+[nu](https://github.com/nushell/tree-sitter-nu) | unstable | `HFIJ ` | @abhisheksingh0x558
+[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | unstable | `HFIJL` | @amaanq
+[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | unstable | `H  J ` | @ColinKennedy
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | unstable | `H  J ` | @undu
+[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | unstable | `HFIJL` | @amaanq
+[pascal](https://github.com/Isopod/tree-sitter-pascal) | unstable | `HFIJL` | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) | unstable | `H    ` | @amaanq
+[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | unstable | `HF J ` | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | unstable | `HF J ` | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | unstable | `HFIJL` | @tk-shirasaka, @calebdw
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | unstable | `HFIJL` | @tk-shirasaka, @calebdw
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | unstable | `H  J ` | @leo60228
+[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | unstable | `HF J ` | @amaanq
+[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | unstable | `H    ` | @RabbiVeesh, @LeoNerd
+[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` | @ObserverOfTime
+[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | unstable | `HFIJL` | @amaanq, @mfelsche
+[powershell](https://github.com/airbus-cert/tree-sitter-powershell) | unstable | `HFIJL` | @L2jLiga
+[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | unstable | `H    ` | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) | unstable | `HF J ` | @elianiva
+[problog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` | @foxyseta
+[prolog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` | @foxyseta
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` | @MichaHoffmann
+[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | unstable | `H  JL` | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) | unstable | `HFIJ ` | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) | unstable | `H  J ` | @matthias-Q
+[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` | @zealot128
+[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | unstable | `HFIJL` | @amaanq
+[purescript](https://github.com/postsolar/tree-sitter-purescript) | unstable | `H  JL` | @postsolar
+[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | unstable | `H  J ` | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) | unstable | `HFIJL` | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) | unstable | `HFIJL` | @pwntester
+[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | unstable | `H  J ` | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) | unstable | `HF J ` | @Decodetalkers
+[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | unstable | `HFIJL` | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) | unstable | `H IJL` | @ribru17
+[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J ` | 
+[ralph](https://github.com/alephium/tree-sitter-ralph) | unstable | `H  J ` | @tdroxler
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) | unstable | `HFIJL` | @Fymyte
+[razor](https://github.com/tris203/tree-sitter-razor) | unstable | `HF J ` | @tris203
+[rbs](https://github.com/joker1007/tree-sitter-rbs) | unstable | `HFIJ ` | @joker1007
+[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | unstable | `HFIJL` | @amaanq
+[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | unstable | `HFIJ ` | @ribru17
+[regex](https://github.com/tree-sitter/tree-sitter-regex) | unstable | `H    ` | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) | unstable | `H  J ` | @FallenAngel97
+[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | unstable | `H  J ` | @ObserverOfTime
+[rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` | @ribru17
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
+[robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` | @Hubro
+[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
+[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H  JL` | @nat-418
+[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | unstable | `HFIJL` | @TravonteD
+[runescript](https://github.com/2004Scape/tree-sitter-runescript) | unstable | `H  J ` | @2004Scape
+[rust](https://github.com/tree-sitter/tree-sitter-rust) | unstable | `HFIJL` | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) | unstable | `HF JL` | @stevanmilic
+[scfg](https://github.com/rockorager/tree-sitter-scfg) | unstable | `H  J ` | @WhyNotHugo
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` | 
+[scss](https://github.com/serenadeai/tree-sitter-scss) | unstable | `HFIJ ` | @elianiva
+[sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | unstable | `H    ` | @aheber, @xixiaofinland
+[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | unstable | `HFIJL` | @theHamsta
+[slim](https://github.com/theoo/tree-sitter-slim) | unstable | `HFIJL` | @theoo
+[slint](https://github.com/slint-ui/tree-sitter-slint) | unstable | `HFIJL` | @hunger
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | unstable | `HFIJL` | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | unstable | `H  J ` | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` | @osthomas
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | unstable | `HF J ` | @amaanq
+[soql](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` | @aheber, @xixiafinland
+[sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` | @aheber, @xixiafinland
+[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | unstable | `H  JL` | @Sarrus1
+[sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | unstable | `HFIJL` | @GordianDziwis
+[sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `H IJ ` | @derekstride
+[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | unstable | `HFIJL` | @amaanq
+[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | unstable | `HFIJL` | @ObserverOfTime
+[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | unstable | `H  J ` | @amaanq
+[styled](https://github.com/mskelton/tree-sitter-styled) | unstable | `HFIJ ` | @mskelton
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unstable | `HFIJL` | @madskjeldgaard
+[superhtml](https://github.com/kristoff-it/superhtml) | unstable | `H  J ` | @rockorager
+[surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` | @amaanq
+[sway](https://github.com/FuelLabs/tree-sitter-sway.git) | unstable | `HFIJL` | @ribru17
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` | @RaafatTurki
+[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` | @ok-ryoko
+[t32](https://gitlab.com/xasc/tree-sitter-t32) | unstable | `HFIJL` | @xasc
+[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | unstable | `HFIJL` | @amaanq
+[tact](https://github.com/tact-lang/tree-sitter-tact) | unstable | `HFIJL` | @novusnota
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | unstable | `HFIJ ` | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) | unstable | `HFIJL` | @euclidianAce
+[templ](https://github.com/vrischmann/tree-sitter-templ) | unstable | `HF J ` | @vrischmann
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
+[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | unstable | `HFIJ ` | @Porter
+[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) | unstable | `HFIJL` | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | unstable | `HF JL` | @ahelwer, @susliko
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` | @Freed-Wu
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | unstable | `H    ` | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | unstable | `HFIJL` | @tk-shirasaka
+[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` | @steelsojka
+[turtle](https://github.com/GordianDziwis/tree-sitter-turtle) | unstable | `HFIJL` | @GordianDziwis
+[twig](https://github.com/gbprod/tree-sitter-twig) | unstable | `H  J ` | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` | @steelsojka
+[typespec](https://github.com/happenslol/tree-sitter-typespec) | unstable | `H IJ ` | @happenslol
+[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | unstable | `HFIJ ` | @Teddytrombone
+[typst](https://github.com/uben0/tree-sitter-typst) | unstable | `HFIJ ` | @uben0, @RaafatTurki
+[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | unstable | `H  JL` | @ObserverOfTime
+[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | unstable | `HFIJL` | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `HF J ` | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) | unstable | `HFIJL` | @ColinKennedy
+[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | unstable | `HFIJL` | @amaanq
+[v](https://github.com/vlang/v-analyzer) | unstable | `HFIJL` | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) | unstable | `HF J ` | @Prince781
+[vento](https://github.com/ventojs/tree-sitter-vento) | unstable | `H  J ` | @wrapperup, @oscarotero
+[verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` | @zhangwwpeng
+[vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | unstable | `HF J ` | @jpt13653903
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | unstable | `H  J ` | @caarlos0
+[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | unstable | `HF JL` | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | unstable | `H  J ` | @clason
+[vrl](https://github.com/belltoy/tree-sitter-vrl) | unstable | `HFIJL` | @belltoy
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | unstable | `HFIJ ` | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` | @szebniok
+[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` | @theHamsta
+[wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` | @gshpychka, @MarkMcCulloh
+[wit](https://github.com/liamwh/tree-sitter-wit) | unstable | `HF J ` | @liamwh
+[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` | @ObserverOfTime
+[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` | @ValdezFOmar
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | unstable | `HFIJL` | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) | unstable | `HFIJ ` | @Hubro
+[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | unstable | `HFIJL` | @Philipp-M, @amaanq
+[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | unstable | `H  J ` | @Freed-Wu
+[zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` | @amaanq
+[ziggy](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
+[ziggy_schema](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
 [^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gap]: GAP system
diff --git a/TODO.md b/TODO.md
index 5aef3991c..add857336 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,7 +6,7 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 - [ ] **`parsers.lua`:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **`parsers.lua`:** add WASM support (tier 1)
-- [ ] **`parsers.lua`:** update tiers (stable, dev, unmaintained, broken)
+- [ ] **`install.lua`:** migrate to async v2
 - [ ] **tests:** fix, update (remove custom crate, plenary dependency)
 - [ ] **documentation:** consolidate, autogenerate?
 - [ ] **documentation:** migration guide
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 9ba76be2a..b5028768d 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -42,10 +42,10 @@ To install supported parsers and queries, put this in your `init.lua` file:
     -- Defaults to the `stdpath('data')/site` dir.
     install_dir = "/some/path/to/store/parsers",
 
-    -- A list of parser names, or "core", "stable", "community", "unstable"
-    ensure_install = { "core", "rust" },
+    -- A list of parser names, or "stable", "unstable", "unmaintained", "unsupported"
+    ensure_install = { "stable", "rust" },
 
-    -- List of parsers to ignore installing (for "core" etc.)
+    -- List of parsers to ignore installing (for "stable" etc.)
     ignore_install = { "javascript" },
   }
 
diff --git a/lua/nvim-treesitter/_meta/parsers.lua b/lua/nvim-treesitter/_meta/parsers.lua
index e265bf611..f3cb81b6f 100644
--- a/lua/nvim-treesitter/_meta/parsers.lua
+++ b/lua/nvim-treesitter/_meta/parsers.lua
@@ -35,7 +35,7 @@ error('Cannot require a meta file')
 ---List of other languages to install (e.g., if queries inherit from them)
 ---@field requires? string[]
 ---
----Language support tier, maps to "core", "stable", "community", "unmaintained"
+---Language support tier, maps to "stable", "unstable", "unmaintained", "unsupported"
 ---@field tier integer
 ---
 ---Explanatory footnote text to add in SUPPORTED_LANGUAGES.md
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 4781d5a21..b1cb4f761 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -1,6 +1,6 @@
 local M = {}
 
-M.tiers = { 'stable', 'core', 'community', 'unsupported' }
+M.tiers = { 'stable', 'unstable', 'unmaintained', 'unsupported' }
 
 ---@class TSConfig
 ---@field ensure_install string[]
@@ -10,7 +10,7 @@ M.tiers = { 'stable', 'core', 'community', 'unsupported' }
 ---@type TSConfig
 local config = {
   ensure_install = {},
-  ignore_install = { 'unsupported' },
+  ignore_install = {},
   install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
 }
 
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 75f202e60..1d2329523 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -6,7 +6,7 @@ return {
       url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
-    tier = 3,
+    tier = 2,
   },
   agda = {
     install_info = {
@@ -24,16 +24,16 @@ return {
     },
     maintainers = { '@dlvandenberg' },
     requires = { 'html', 'html_tags' },
-    tier = 3,
+    tier = 2,
   },
   apex = {
     install_info = {
       location = 'apex',
-      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
+      revision = '3597575a429766dd7ecce9f5bb97f6fec4419d5d',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
-    tier = 3,
+    tier = 2,
   },
   arduino = {
     install_info = {
@@ -51,7 +51,7 @@ return {
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
-    tier = 3,
+    tier = 2,
   },
   astro = {
     install_info = {
@@ -61,7 +61,7 @@ return {
     },
     maintainers = { '@virchau13' },
     requires = { 'html', 'html_tags' },
-    tier = 3,
+    tier = 2,
   },
   authzed = {
     install_info = {
@@ -69,14 +69,14 @@ return {
       url = 'https://github.com/mleonidas/tree-sitter-authzed',
     },
     maintainers = { '@mattpolzin' },
-    tier = 3,
+    tier = 2,
   },
   awk = {
     install_info = {
       revision = '34bbdc7cce8e803096f47b625979e34c1be38127',
       url = 'https://github.com/Beaglefoot/tree-sitter-awk',
     },
-    tier = 4,
+    tier = 2,
   },
   bash = {
     install_info = {
@@ -84,7 +84,7 @@ return {
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
-    tier = 1,
+    tier = 2,
   },
   bass = {
     install_info = {
@@ -92,7 +92,7 @@ return {
       url = 'https://github.com/vito/tree-sitter-bass',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   beancount = {
     install_info = {
@@ -100,7 +100,7 @@ return {
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
-    tier = 3,
+    tier = 2,
   },
   bibtex = {
     install_info = {
@@ -108,7 +108,7 @@ return {
       url = 'https://github.com/latex-lsp/tree-sitter-bibtex',
     },
     maintainers = { '@theHamsta', '@clason' },
-    tier = 3,
+    tier = 2,
   },
   bicep = {
     install_info = {
@@ -140,7 +140,7 @@ return {
       url = 'https://gitlab.com/gabmus/tree-sitter-blueprint',
     },
     maintainers = { '@gabmus' },
-    tier = 4,
+    tier = 2,
   },
   bp = {
     install_info = {
@@ -149,7 +149,7 @@ return {
     },
     maintainers = { '@ambroisie' },
     readme_note = 'Android Blueprint',
-    tier = 3,
+    tier = 2,
   },
   brightscript = {
     install_info = {
@@ -165,11 +165,11 @@ return {
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
-    tier = 1,
+    tier = 2,
   },
   c_sharp = {
     install_info = {
-      revision = 'b27b091bfdc5f16d0ef76421ea5609c82a57dff0',
+      revision = 'b5eb5742f6a7e9438bee22ce8026d6b927be2cd7',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -213,7 +213,7 @@ return {
       url = 'https://github.com/Decurity/tree-sitter-circom',
     },
     maintainers = { '@alexandr-martirosyan' },
-    tier = 3,
+    tier = 2,
   },
   clojure = {
     install_info = {
@@ -221,7 +221,7 @@ return {
       url = 'https://github.com/sogaiu/tree-sitter-clojure',
     },
     maintainers = { '@NoahTheDuke' },
-    tier = 3,
+    tier = 2,
   },
   cmake = {
     install_info = {
@@ -229,7 +229,7 @@ return {
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
-    tier = 3,
+    tier = 2,
   },
   comment = {
     install_info = {
@@ -237,7 +237,7 @@ return {
       url = 'https://github.com/stsewd/tree-sitter-comment',
     },
     maintainers = { '@stsewd' },
-    tier = 3,
+    tier = 2,
   },
   commonlisp = {
     install_info = {
@@ -254,7 +254,7 @@ return {
       url = 'https://github.com/addcninblue/tree-sitter-cooklang',
     },
     maintainers = { '@addcninblue' },
-    tier = 3,
+    tier = 2,
   },
   corn = {
     install_info = {
@@ -262,7 +262,7 @@ return {
       url = 'https://github.com/jakestanger/tree-sitter-corn',
     },
     maintainers = { '@jakestanger' },
-    tier = 3,
+    tier = 2,
   },
   cpon = {
     install_info = {
@@ -316,7 +316,7 @@ return {
       url = 'https://github.com/eonpatapon/tree-sitter-cue',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   cylc = {
     install_info = {
@@ -324,7 +324,7 @@ return {
       url = 'https://github.com/elliotfontaine/tree-sitter-cylc',
     },
     maintainers = { '@elliotfontaine' },
-    tier = 3,
+    tier = 2,
   },
   d = {
     install_info = {
@@ -332,7 +332,7 @@ return {
       url = 'https://github.com/gdamore/tree-sitter-d',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   dart = {
     install_info = {
@@ -340,7 +340,7 @@ return {
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
-    tier = 3,
+    tier = 2,
   },
   desktop = {
     install_info = {
@@ -348,7 +348,7 @@ return {
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
-    tier = 3,
+    tier = 2,
   },
   devicetree = {
     install_info = {
@@ -356,7 +356,7 @@ return {
       url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
     maintainers = { '@jedrzejboczar' },
-    tier = 3,
+    tier = 2,
   },
   dhall = {
     install_info = {
@@ -364,7 +364,7 @@ return {
       url = 'https://github.com/jbellerb/tree-sitter-dhall',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   diff = {
     install_info = {
@@ -372,7 +372,7 @@ return {
       url = 'https://github.com/the-mikedavis/tree-sitter-diff',
     },
     maintainers = { '@gbprod' },
-    tier = 3,
+    tier = 2,
   },
   disassembly = {
     install_info = {
@@ -380,7 +380,7 @@ return {
       url = 'https://github.com/ColinKennedy/tree-sitter-disassembly',
     },
     maintainers = { '@ColinKennedy' },
-    tier = 3,
+    tier = 2,
   },
   djot = {
     install_info = {
@@ -388,7 +388,7 @@ return {
       url = 'https://github.com/treeman/tree-sitter-djot',
     },
     maintainers = { '@NoahTheDuke' },
-    tier = 3,
+    tier = 2,
   },
   dockerfile = {
     install_info = {
@@ -396,7 +396,7 @@ return {
       url = 'https://github.com/camdencheek/tree-sitter-dockerfile',
     },
     maintainers = { '@camdencheek' },
-    tier = 3,
+    tier = 2,
   },
   dot = {
     install_info = {
@@ -404,7 +404,7 @@ return {
       url = 'https://github.com/rydesun/tree-sitter-dot',
     },
     maintainers = { '@rydesun' },
-    tier = 3,
+    tier = 2,
   },
   doxygen = {
     install_info = {
@@ -429,7 +429,7 @@ return {
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
-    tier = 3,
+    tier = 2,
   },
   ebnf = {
     install_info = {
@@ -438,12 +438,12 @@ return {
       url = 'https://github.com/RubixDev/ebnf',
     },
     maintainers = { '@RubixDev' },
-    tier = 3,
+    tier = 2,
   },
   ecma = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, typescript, tsx, qmljs',
-    tier = 3,
+    tier = 2,
   },
   editorconfig = {
     install_info = {
@@ -451,7 +451,7 @@ return {
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
-    tier = 3,
+    tier = 2,
   },
   eds = {
     install_info = {
@@ -459,7 +459,7 @@ return {
       url = 'https://github.com/uyha/tree-sitter-eds',
     },
     maintainers = { '@uyha' },
-    tier = 3,
+    tier = 2,
   },
   eex = {
     install_info = {
@@ -467,7 +467,7 @@ return {
       url = 'https://github.com/connorlay/tree-sitter-eex',
     },
     maintainers = { '@connorlay' },
-    tier = 3,
+    tier = 2,
   },
   elixir = {
     install_info = {
@@ -475,7 +475,7 @@ return {
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
-    tier = 3,
+    tier = 2,
   },
   elm = {
     install_info = {
@@ -483,7 +483,7 @@ return {
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
-    tier = 3,
+    tier = 2,
   },
   elsa = {
     install_info = {
@@ -491,7 +491,7 @@ return {
       url = 'https://github.com/glapa-grossklag/tree-sitter-elsa',
     },
     maintainers = { '@glapa-grossklag', '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   elvish = {
     install_info = {
@@ -499,30 +499,30 @@ return {
       url = 'https://github.com/elves/tree-sitter-elvish',
     },
     maintainers = { '@elves' },
-    tier = 3,
+    tier = 2,
   },
   embedded_template = {
     install_info = {
       revision = '8495d106154741e6d35d37064f864758ece75de6',
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
-    tier = 4,
+    tier = 2,
   },
   enforce = {
     install_info = {
-      revision = '9db7a49f3d73222c05b75dcfa8892f5e93542d1e',
+      revision = 'cf853e5f56f1babe5ec573e356f6fbb4784bf5c1',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
-    tier = 3,
+    tier = 2,
   },
   erlang = {
     install_info = {
-      revision = '9cea919877741b2ed87cf215c0a06feb9a1930bf',
+      revision = '370cea629eb62a8686504b9fb3252a5e1ae55313',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
-    tier = 3,
+    tier = 2,
   },
   facility = {
     install_info = {
@@ -530,7 +530,7 @@ return {
       url = 'https://github.com/FacilityApi/tree-sitter-facility',
     },
     maintainers = { '@bryankenote' },
-    tier = 3,
+    tier = 2,
   },
   faust = {
     install_info = {
@@ -538,7 +538,7 @@ return {
       url = 'https://github.com/khiner/tree-sitter-faust',
     },
     maintainers = { '@khiner' },
-    tier = 3,
+    tier = 2,
   },
   fennel = {
     install_info = {
@@ -547,7 +547,7 @@ return {
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
     maintainers = { '@alexmozaidze' },
-    tier = 3,
+    tier = 2,
   },
   fidl = {
     install_info = {
@@ -555,7 +555,7 @@ return {
       url = 'https://github.com/google/tree-sitter-fidl',
     },
     maintainers = { '@chaopeng' },
-    tier = 3,
+    tier = 2,
   },
   firrtl = {
     install_info = {
@@ -571,7 +571,7 @@ return {
       url = 'https://github.com/ram02z/tree-sitter-fish',
     },
     maintainers = { '@ram02z' },
-    tier = 3,
+    tier = 2,
   },
   foam = {
     install_info = {
@@ -579,7 +579,7 @@ return {
       url = 'https://github.com/FoamScience/tree-sitter-foam',
     },
     maintainers = { '@FoamScience' },
-    tier = 3,
+    tier = 2,
   },
   forth = {
     install_info = {
@@ -587,7 +587,7 @@ return {
       url = 'https://github.com/AlexanderBrevig/tree-sitter-forth',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   fortran = {
     install_info = {
@@ -595,7 +595,7 @@ return {
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   fsh = {
     install_info = {
@@ -603,7 +603,7 @@ return {
       url = 'https://github.com/mgramigna/tree-sitter-fsh',
     },
     maintainers = { '@mgramigna' },
-    tier = 3,
+    tier = 2,
   },
   fsharp = {
     install_info = {
@@ -612,7 +612,7 @@ return {
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
-    tier = 3,
+    tier = 2,
   },
   func = {
     install_info = {
@@ -628,7 +628,7 @@ return {
       url = 'https://gitlab.com/jirgn/tree-sitter-fusion',
     },
     maintainers = { '@jirgn' },
-    tier = 3,
+    tier = 2,
   },
   gap = {
     install_info = {
@@ -637,7 +637,7 @@ return {
     },
     maintainers = { '@reiniscirpons' },
     readme_note = 'GAP system',
-    tier = 3,
+    tier = 2,
   },
   gaptst = {
     install_info = {
@@ -647,7 +647,7 @@ return {
     maintainers = { '@reiniscirpons' },
     readme_note = 'GAP system test files',
     requires = { 'gap' },
-    tier = 3,
+    tier = 2,
   },
   gdscript = {
     install_info = {
@@ -656,7 +656,7 @@ return {
     },
     maintainers = { '@PrestonKnopp' },
     readme_note = 'Godot',
-    tier = 3,
+    tier = 2,
   },
   gdshader = {
     install_info = {
@@ -664,7 +664,7 @@ return {
       url = 'https://github.com/GodOfAvacyn/tree-sitter-gdshader',
     },
     maintainers = { '@godofavacyn' },
-    tier = 3,
+    tier = 2,
   },
   git_config = {
     install_info = {
@@ -672,7 +672,7 @@ return {
       url = 'https://github.com/the-mikedavis/tree-sitter-git-config',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   git_rebase = {
     install_info = {
@@ -680,7 +680,7 @@ return {
       url = 'https://github.com/the-mikedavis/tree-sitter-git-rebase',
     },
     maintainers = { '@gbprod' },
-    tier = 3,
+    tier = 2,
   },
   gitattributes = {
     install_info = {
@@ -696,7 +696,7 @@ return {
       url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
     maintainers = { '@gbprod' },
-    tier = 3,
+    tier = 2,
   },
   gitignore = {
     install_info = {
@@ -704,7 +704,7 @@ return {
       url = 'https://github.com/shunsambongi/tree-sitter-gitignore',
     },
     maintainers = { '@theHamsta' },
-    tier = 3,
+    tier = 2,
   },
   gleam = {
     install_info = {
@@ -712,7 +712,7 @@ return {
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   glimmer = {
     install_info = {
@@ -721,7 +721,7 @@ return {
     },
     maintainers = { '@NullVoxPopuli' },
     readme_note = 'Glimmer and Ember',
-    tier = 3,
+    tier = 2,
   },
   glimmer_javascript = {
     install_info = {
@@ -731,7 +731,7 @@ return {
     },
     maintainers = { '@NullVoxPopuli' },
     requires = { 'ecma' },
-    tier = 3,
+    tier = 2,
   },
   glimmer_typescript = {
     install_info = {
@@ -741,7 +741,7 @@ return {
     },
     maintainers = { '@NullVoxPopuli' },
     requires = { 'typescript' },
-    tier = 3,
+    tier = 2,
   },
   glsl = {
     install_info = {
@@ -768,7 +768,7 @@ return {
       url = 'https://github.com/dpezto/tree-sitter-gnuplot',
     },
     maintainers = { '@dpezto' },
-    tier = 3,
+    tier = 2,
   },
   go = {
     install_info = {
@@ -784,7 +784,7 @@ return {
       url = 'https://github.com/chaozwn/tree-sitter-goctl',
     },
     maintainers = { '@chaozwn' },
-    tier = 3,
+    tier = 2,
   },
   godot_resource = {
     install_info = {
@@ -793,7 +793,7 @@ return {
     },
     maintainers = { '@pierpo' },
     readme_note = 'Godot Resources',
-    tier = 3,
+    tier = 2,
   },
   gomod = {
     install_info = {
@@ -801,7 +801,7 @@ return {
       url = 'https://github.com/camdencheek/tree-sitter-go-mod',
     },
     maintainers = { '@camdencheek' },
-    tier = 3,
+    tier = 2,
   },
   gosum = {
     install_info = {
@@ -817,7 +817,7 @@ return {
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
-    tier = 3,
+    tier = 2,
   },
   gowork = {
     install_info = {
@@ -825,7 +825,7 @@ return {
       url = 'https://github.com/omertuc/tree-sitter-go-work',
     },
     maintainers = { '@omertuc' },
-    tier = 3,
+    tier = 2,
   },
   gpg = {
     install_info = {
@@ -841,7 +841,7 @@ return {
       url = 'https://github.com/bkegley/tree-sitter-graphql',
     },
     maintainers = { '@bkegley' },
-    tier = 3,
+    tier = 2,
   },
   gren = {
     install_info = {
@@ -849,7 +849,7 @@ return {
       url = 'https://github.com/MaeBrooks/tree-sitter-gren',
     },
     maintainers = { '@MaeBrooks' },
-    tier = 3,
+    tier = 2,
   },
   groovy = {
     install_info = {
@@ -857,7 +857,7 @@ return {
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
-    tier = 3,
+    tier = 2,
   },
   gstlaunch = {
     install_info = {
@@ -872,7 +872,7 @@ return {
       revision = 'bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0',
       url = 'https://github.com/slackhq/tree-sitter-hack',
     },
-    tier = 4,
+    tier = 2,
   },
   hare = {
     install_info = {
@@ -896,7 +896,7 @@ return {
       url = 'https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent',
     },
     maintainers = { '@lykahb' },
-    tier = 3,
+    tier = 2,
   },
   hcl = {
     install_info = {
@@ -912,7 +912,7 @@ return {
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
-    tier = 3,
+    tier = 2,
   },
   helm = {
     install_info = {
@@ -921,7 +921,7 @@ return {
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
-    tier = 3,
+    tier = 2,
   },
   hjson = {
     install_info = {
@@ -931,7 +931,7 @@ return {
     },
     maintainers = { '@winston0410' },
     requires = { 'json' },
-    tier = 3,
+    tier = 2,
   },
   hlsl = {
     install_info = {
@@ -949,7 +949,7 @@ return {
       url = 'https://github.com/Freed-Wu/tree-sitter-hlsplaylist',
     },
     maintainers = { '@Freed-Wu' },
-    tier = 3,
+    tier = 2,
   },
   hocon = {
     install_info = {
@@ -958,7 +958,7 @@ return {
       url = 'https://github.com/antosha417/tree-sitter-hocon',
     },
     maintainers = { '@antosha417' },
-    tier = 4,
+    tier = 2,
   },
   hoon = {
     install_info = {
@@ -966,7 +966,7 @@ return {
       url = 'https://github.com/urbit-pilled/tree-sitter-hoon',
     },
     maintainers = { '@urbit-pilled' },
-    tier = 3,
+    tier = 2,
   },
   html = {
     install_info = {
@@ -980,7 +980,7 @@ return {
   html_tags = {
     maintainers = { '@TravonteD' },
     readme_note = 'queries required by html, astro, vue, svelte',
-    tier = 3,
+    tier = 2,
   },
   htmldjango = {
     install_info = {
@@ -988,15 +988,15 @@ return {
       url = 'https://github.com/interdependence/tree-sitter-htmldjango',
     },
     maintainers = { '@ObserverOfTime' },
-    tier = 3,
+    tier = 2,
   },
   http = {
     install_info = {
-      revision = 'd2e4e4c7d03f70e0465d436f2b5f67497cd544ca',
+      revision = '77ecf6385f1b5d422e0bbd12204374d287d61ad2',
       url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
-    tier = 3,
+    tier = 2,
   },
   hurl = {
     install_info = {
@@ -1004,7 +1004,7 @@ return {
       url = 'https://github.com/pfeiferj/tree-sitter-hurl',
     },
     maintainers = { '@pfeiferj' },
-    tier = 3,
+    tier = 2,
   },
   hyprlang = {
     install_info = {
@@ -1016,11 +1016,11 @@ return {
   },
   idl = {
     install_info = {
-      revision = '86ff7f19747a761dc8ba72f4045fd64aed94ba4c',
+      revision = 'b14e7971cfbd64fa0ebcdeaa4dfbb3cb0bfabd7c',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
-    tier = 3,
+    tier = 2,
   },
   idris = {
     install_info = {
@@ -1028,7 +1028,7 @@ return {
       url = 'https://github.com/kayhide/tree-sitter-idris',
     },
     maintainers = { '@srghma' },
-    tier = 3,
+    tier = 2,
   },
   ini = {
     install_info = {
@@ -1036,7 +1036,7 @@ return {
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
-    tier = 3,
+    tier = 2,
   },
   inko = {
     install_info = {
@@ -1044,7 +1044,7 @@ return {
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
-    tier = 3,
+    tier = 2,
   },
   ipkg = {
     install_info = {
@@ -1052,7 +1052,7 @@ return {
       url = 'https://github.com/srghma/tree-sitter-ipkg',
     },
     maintainers = { '@srghma' },
-    tier = 3,
+    tier = 2,
   },
   ispc = {
     install_info = {
@@ -1070,7 +1070,7 @@ return {
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
-    tier = 3,
+    tier = 2,
   },
   java = {
     install_info = {
@@ -1106,7 +1106,7 @@ return {
     maintainers = { '@cathaysia' },
     readme_note = 'basic highlighting',
     requires = { 'jinja_inline' },
-    tier = 3,
+    tier = 2,
   },
   jinja_inline = {
     install_info = {
@@ -1116,7 +1116,7 @@ return {
     },
     maintainers = { '@cathaysia' },
     readme_note = 'needed for full highlighting',
-    tier = 3,
+    tier = 2,
   },
   jq = {
     install_info = {
@@ -1124,7 +1124,7 @@ return {
       url = 'https://github.com/flurie/tree-sitter-jq',
     },
     maintainers = { '@ObserverOfTime' },
-    tier = 3,
+    tier = 2,
   },
   jsdoc = {
     install_info = {
@@ -1148,7 +1148,7 @@ return {
       url = 'https://github.com/Joakker/tree-sitter-json5',
     },
     maintainers = { '@Joakker' },
-    tier = 3,
+    tier = 2,
   },
   jsonc = {
     install_info = {
@@ -1158,7 +1158,7 @@ return {
     },
     maintainers = { '@WhyNotHugo' },
     requires = { 'json' },
-    tier = 3,
+    tier = 2,
   },
   jsonnet = {
     install_info = {
@@ -1166,20 +1166,20 @@ return {
       url = 'https://github.com/sourcegraph/tree-sitter-jsonnet',
     },
     maintainers = { '@nawordar' },
-    tier = 3,
+    tier = 2,
   },
   jsx = {
     maintainers = { '@steelsojka' },
     readme_note = 'queries required by javascript, tsx',
-    tier = 3,
+    tier = 2,
   },
   julia = {
     install_info = {
-      revision = '3f9870ca1f419e480f39fc181fcfb6dad480969a',
+      revision = '12a3aede757bc7fbdfb1909507c7a6fddd31df37',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
-    tier = 3,
+    tier = 2,
   },
   just = {
     install_info = {
@@ -1187,7 +1187,7 @@ return {
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
-    tier = 3,
+    tier = 2,
   },
   kcl = {
     install_info = {
@@ -1219,7 +1219,7 @@ return {
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
-    tier = 3,
+    tier = 2,
   },
   koto = {
     install_info = {
@@ -1227,7 +1227,7 @@ return {
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
-    tier = 3,
+    tier = 2,
   },
   kusto = {
     install_info = {
@@ -1235,7 +1235,7 @@ return {
       url = 'https://github.com/Willem-J-an/tree-sitter-kusto',
     },
     maintainers = { '@Willem-J-an' },
-    tier = 3,
+    tier = 2,
   },
   lalrpop = {
     install_info = {
@@ -1243,7 +1243,7 @@ return {
       url = 'https://github.com/traxys/tree-sitter-lalrpop',
     },
     maintainers = { '@traxys' },
-    tier = 3,
+    tier = 2,
   },
   latex = {
     install_info = {
@@ -1252,7 +1252,7 @@ return {
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
-    tier = 3,
+    tier = 2,
   },
   ledger = {
     install_info = {
@@ -1260,7 +1260,7 @@ return {
       url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
     maintainers = { '@cbarrete' },
-    tier = 3,
+    tier = 2,
   },
   leo = {
     install_info = {
@@ -1268,7 +1268,7 @@ return {
       url = 'https://github.com/r001/tree-sitter-leo',
     },
     maintainers = { '@r001' },
-    tier = 3,
+    tier = 2,
   },
   linkerscript = {
     install_info = {
@@ -1284,7 +1284,7 @@ return {
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
-    tier = 3,
+    tier = 2,
   },
   liquidsoap = {
     install_info = {
@@ -1292,7 +1292,7 @@ return {
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
-    tier = 3,
+    tier = 2,
   },
   llvm = {
     install_info = {
@@ -1300,7 +1300,7 @@ return {
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
-    tier = 3,
+    tier = 2,
   },
   lua = {
     install_info = {
@@ -1308,7 +1308,7 @@ return {
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
-    tier = 1,
+    tier = 2,
   },
   luadoc = {
     install_info = {
@@ -1343,7 +1343,7 @@ return {
       url = 'https://github.com/grahambates/tree-sitter-m68k',
     },
     maintainers = { '@grahambates' },
-    tier = 3,
+    tier = 2,
   },
   make = {
     install_info = {
@@ -1351,7 +1351,7 @@ return {
       url = 'https://github.com/alemuller/tree-sitter-make',
     },
     maintainers = { '@lewis6991' },
-    tier = 3,
+    tier = 2,
   },
   markdown = {
     install_info = {
@@ -1362,7 +1362,7 @@ return {
     maintainers = { '@MDeiml' },
     readme_note = 'basic highlighting',
     requires = { 'markdown_inline' },
-    tier = 1,
+    tier = 2,
   },
   markdown_inline = {
     install_info = {
@@ -1372,7 +1372,7 @@ return {
     },
     maintainers = { '@MDeiml' },
     readme_note = 'needed for full highlighting',
-    tier = 1,
+    tier = 2,
   },
   matlab = {
     install_info = {
@@ -1380,7 +1380,7 @@ return {
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
-    tier = 3,
+    tier = 2,
   },
   menhir = {
     install_info = {
@@ -1388,14 +1388,14 @@ return {
       url = 'https://github.com/Kerl13/tree-sitter-menhir',
     },
     maintainers = { '@Kerl13' },
-    tier = 3,
+    tier = 2,
   },
   mermaid = {
     install_info = {
       revision = '90ae195b31933ceb9d079abfa8a3ad0a36fee4cc',
       url = 'https://github.com/monaqa/tree-sitter-mermaid',
     },
-    tier = 4,
+    tier = 2,
   },
   meson = {
     install_info = {
@@ -1408,11 +1408,11 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '65bca19232744b920859ce682cd830b5006b8ccd',
+      revision = '9d83ca263fa7ec8ac7a5fd8ad14891b2dc583a32',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
-    tier = 3,
+    tier = 2,
   },
   muttrc = {
     install_info = {
@@ -1420,7 +1420,7 @@ return {
       url = 'https://github.com/neomutt/tree-sitter-muttrc',
     },
     maintainers = { '@Freed-Wu' },
-    tier = 3,
+    tier = 2,
   },
   nasm = {
     install_info = {
@@ -1428,7 +1428,7 @@ return {
       url = 'https://github.com/naclsn/tree-sitter-nasm',
     },
     maintainers = { '@ObserverOfTime' },
-    tier = 3,
+    tier = 2,
   },
   nginx = {
     install_info = {
@@ -1436,14 +1436,14 @@ return {
       url = 'https://github.com/opa-oz/tree-sitter-nginx',
     },
     maintainers = { '@opa-oz' },
-    tier = 3,
+    tier = 2,
   },
   nickel = {
     install_info = {
       revision = '25464b33522c3f609fa512aa9651707c0b66d48b',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
-    tier = 4,
+    tier = 2,
   },
   nim = {
     install_info = {
@@ -1452,7 +1452,7 @@ return {
     },
     maintainers = { '@aMOPel' },
     requires = { 'nim_format_string' },
-    tier = 3,
+    tier = 2,
   },
   nim_format_string = {
     install_info = {
@@ -1460,7 +1460,7 @@ return {
       url = 'https://github.com/aMOPel/tree-sitter-nim-format-string',
     },
     maintainers = { '@aMOPel' },
-    tier = 3,
+    tier = 2,
   },
   ninja = {
     install_info = {
@@ -1468,7 +1468,7 @@ return {
       url = 'https://github.com/alemuller/tree-sitter-ninja',
     },
     maintainers = { '@alemuller' },
-    tier = 3,
+    tier = 2,
   },
   nix = {
     install_info = {
@@ -1476,7 +1476,7 @@ return {
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
-    tier = 3,
+    tier = 2,
   },
   nqc = {
     install_info = {
@@ -1489,11 +1489,11 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'd0b26e45525016ef8e6f2ced05852437c06a00ca',
+      revision = '2a153c88d5d44d96653057c7cc14292f4e641bef',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
-    tier = 3,
+    tier = 2,
   },
   objc = {
     install_info = {
@@ -1511,7 +1511,7 @@ return {
       url = 'https://github.com/ColinKennedy/tree-sitter-objdump',
     },
     maintainers = { '@ColinKennedy' },
-    tier = 3,
+    tier = 2,
   },
   ocaml = {
     install_info = {
@@ -1539,7 +1539,7 @@ return {
       url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
     },
     maintainers = { '@undu' },
-    tier = 3,
+    tier = 2,
   },
   odin = {
     install_info = {
@@ -1555,7 +1555,7 @@ return {
       url = 'https://github.com/Isopod/tree-sitter-pascal',
     },
     maintainers = { '@Isopod' },
-    tier = 3,
+    tier = 2,
   },
   passwd = {
     install_info = {
@@ -1563,7 +1563,7 @@ return {
       url = 'https://github.com/ath3/tree-sitter-passwd',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   pem = {
     install_info = {
@@ -1577,11 +1577,11 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = 'db79ba96ba13e2e89ce9da07c1cc1dfbe6e2e0f6',
+      revision = 'bb53f204aa3e7507960014642965c9f9a9e84b1d',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
-    tier = 3,
+    tier = 2,
   },
   php = {
     install_info = {
@@ -1611,7 +1611,7 @@ return {
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
     maintainers = { '@mikehaertl' },
-    tier = 3,
+    tier = 2,
   },
   pioasm = {
     install_info = {
@@ -1619,7 +1619,7 @@ return {
       url = 'https://github.com/leo60228/tree-sitter-pioasm',
     },
     maintainers = { '@leo60228' },
-    tier = 3,
+    tier = 2,
   },
   po = {
     install_info = {
@@ -1637,7 +1637,7 @@ return {
       url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
-    tier = 3,
+    tier = 2,
   },
   poe_filter = {
     install_info = {
@@ -1663,7 +1663,7 @@ return {
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
-    tier = 3,
+    tier = 2,
   },
   printf = {
     install_info = {
@@ -1679,7 +1679,7 @@ return {
       url = 'https://github.com/victorhqc/tree-sitter-prisma',
     },
     maintainers = { '@elianiva' },
-    tier = 3,
+    tier = 2,
   },
   problog = {
     install_info = {
@@ -1689,7 +1689,7 @@ return {
     },
     maintainers = { '@foxyseta' },
     requires = { 'prolog' },
-    tier = 3,
+    tier = 2,
   },
   prolog = {
     install_info = {
@@ -1698,7 +1698,7 @@ return {
       url = 'https://github.com/foxyseta/tree-sitter-prolog',
     },
     maintainers = { '@foxyseta' },
-    tier = 3,
+    tier = 2,
   },
   promql = {
     install_info = {
@@ -1706,7 +1706,7 @@ return {
       url = 'https://github.com/MichaHoffmann/tree-sitter-promql',
     },
     maintainers = { '@MichaHoffmann' },
-    tier = 3,
+    tier = 2,
   },
   properties = {
     install_info = {
@@ -1723,7 +1723,7 @@ return {
       url = 'https://github.com/treywood/tree-sitter-proto',
     },
     maintainers = { '@treywood' },
-    tier = 3,
+    tier = 2,
   },
   prql = {
     install_info = {
@@ -1731,7 +1731,7 @@ return {
       url = 'https://github.com/PRQL/tree-sitter-prql',
     },
     maintainers = { '@matthias-Q' },
-    tier = 3,
+    tier = 2,
   },
   psv = {
     install_info = {
@@ -1749,7 +1749,7 @@ return {
       url = 'https://github.com/zealot128/tree-sitter-pug',
     },
     maintainers = { '@zealot128' },
-    tier = 3,
+    tier = 2,
   },
   puppet = {
     install_info = {
@@ -1765,7 +1765,7 @@ return {
       url = 'https://github.com/postsolar/tree-sitter-purescript',
     },
     maintainers = { '@postsolar' },
-    tier = 3,
+    tier = 2,
   },
   pymanifest = {
     install_info = {
@@ -1782,7 +1782,7 @@ return {
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
-    tier = 1,
+    tier = 2,
   },
   ql = {
     install_info = {
@@ -1808,7 +1808,7 @@ return {
     },
     maintainers = { '@Decodetalkers' },
     requires = { 'ecma' },
-    tier = 3,
+    tier = 2,
   },
   query = {
     install_info = {
@@ -1817,7 +1817,7 @@ return {
     },
     maintainers = { '@steelsojka' },
     readme_note = 'Tree-sitter query language',
-    tier = 1,
+    tier = 2,
   },
   r = {
     install_info = {
@@ -1825,14 +1825,14 @@ return {
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
-    tier = 3,
+    tier = 2,
   },
   racket = {
     install_info = {
       revision = '5b211bf93021d1c45f39aa96898be9f794f087e4',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
-    tier = 4,
+    tier = 2,
   },
   ralph = {
     install_info = {
@@ -1840,7 +1840,7 @@ return {
       url = 'https://github.com/alephium/tree-sitter-ralph',
     },
     maintainers = { '@tdroxler' },
-    tier = 3,
+    tier = 2,
   },
   rasi = {
     install_info = {
@@ -1848,7 +1848,7 @@ return {
       url = 'https://github.com/Fymyte/tree-sitter-rasi',
     },
     maintainers = { '@Fymyte' },
-    tier = 3,
+    tier = 2,
   },
   razor = {
     install_info = {
@@ -1857,7 +1857,7 @@ return {
       url = 'https://github.com/tris203/tree-sitter-razor',
     },
     maintainers = { '@tris203' },
-    tier = 3,
+    tier = 2,
   },
   rbs = {
     install_info = {
@@ -1865,7 +1865,7 @@ return {
       url = 'https://github.com/joker1007/tree-sitter-rbs',
     },
     maintainers = { '@joker1007' },
-    tier = 3,
+    tier = 2,
   },
   re2c = {
     install_info = {
@@ -1897,7 +1897,7 @@ return {
       url = 'https://github.com/FallenAngel97/tree-sitter-rego',
     },
     maintainers = { '@FallenAngel97' },
-    tier = 3,
+    tier = 2,
   },
   requirements = {
     install_info = {
@@ -1922,7 +1922,7 @@ return {
       url = 'https://github.com/bamonroe/tree-sitter-rnoweb',
     },
     maintainers = { '@bamonroe' },
-    tier = 3,
+    tier = 2,
   },
   robot = {
     install_info = {
@@ -1930,7 +1930,7 @@ return {
       url = 'https://github.com/Hubro/tree-sitter-robot',
     },
     maintainers = { '@Hubro' },
-    tier = 3,
+    tier = 2,
   },
   robots = {
     install_info = {
@@ -1938,7 +1938,7 @@ return {
       url = 'https://github.com/opa-oz/tree-sitter-robots-txt',
     },
     maintainers = { '@opa-oz' },
-    tier = 3,
+    tier = 2,
   },
   roc = {
     install_info = {
@@ -1946,7 +1946,7 @@ return {
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
-    tier = 3,
+    tier = 2,
   },
   ron = {
     install_info = {
@@ -1962,7 +1962,7 @@ return {
       url = 'https://github.com/stsewd/tree-sitter-rst',
     },
     maintainers = { '@stsewd' },
-    tier = 3,
+    tier = 2,
   },
   ruby = {
     install_info = {
@@ -1978,7 +1978,7 @@ return {
       url = 'https://github.com/2004Scape/tree-sitter-runescript',
     },
     maintainers = { '@2004Scape' },
-    tier = 3,
+    tier = 2,
   },
   rust = {
     install_info = {
@@ -2003,14 +2003,14 @@ return {
       url = 'https://github.com/rockorager/tree-sitter-scfg',
     },
     maintainers = { '@WhyNotHugo' },
-    tier = 4,
+    tier = 2,
   },
   scheme = {
     install_info = {
       revision = '63e25a4a84142ae7ee0ee01fe3a32c985ca16745',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
-    tier = 4,
+    tier = 2,
   },
   scss = {
     install_info = {
@@ -2019,17 +2019,17 @@ return {
     },
     maintainers = { '@elianiva' },
     requires = { 'css' },
-    tier = 3,
+    tier = 2,
   },
   sflog = {
     install_info = {
       location = 'sflog',
-      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
+      revision = '3597575a429766dd7ecce9f5bb97f6fec4419d5d',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiaofinland' },
     readme_note = 'Salesforce debug log',
-    tier = 3,
+    tier = 2,
   },
   slang = {
     install_info = {
@@ -2047,7 +2047,7 @@ return {
       url = 'https://github.com/theoo/tree-sitter-slim',
     },
     maintainers = { '@theoo' },
-    tier = 3,
+    tier = 2,
   },
   slint = {
     install_info = {
@@ -2055,7 +2055,7 @@ return {
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
-    tier = 3,
+    tier = 2,
   },
   smali = {
     install_info = {
@@ -2071,7 +2071,7 @@ return {
       url = 'https://github.com/indoorvivants/tree-sitter-smithy',
     },
     maintainers = { '@amaanq', '@keynmol' },
-    tier = 3,
+    tier = 2,
   },
   snakemake = {
     install_info = {
@@ -2080,7 +2080,7 @@ return {
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
     },
     maintainers = { '@osthomas' },
-    tier = 3,
+    tier = 2,
   },
   solidity = {
     install_info = {
@@ -2088,25 +2088,25 @@ return {
       url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   soql = {
     install_info = {
       location = 'soql',
-      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
+      revision = '3597575a429766dd7ecce9f5bb97f6fec4419d5d',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
-    tier = 3,
+    tier = 2,
   },
   sosl = {
     install_info = {
       location = 'sosl',
-      revision = 'eade4054efc897f4bb18a5b7bf4b5a824dbffa74',
+      revision = '3597575a429766dd7ecce9f5bb97f6fec4419d5d',
       url = 'https://github.com/aheber/tree-sitter-sfapex',
     },
     maintainers = { '@aheber', '@xixiafinland' },
-    tier = 3,
+    tier = 2,
   },
   sourcepawn = {
     install_info = {
@@ -2114,7 +2114,7 @@ return {
       url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
     },
     maintainers = { '@Sarrus1' },
-    tier = 3,
+    tier = 2,
   },
   sparql = {
     install_info = {
@@ -2123,7 +2123,7 @@ return {
       url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
     },
     maintainers = { '@GordianDziwis' },
-    tier = 3,
+    tier = 2,
   },
   sql = {
     install_info = {
@@ -2133,7 +2133,7 @@ return {
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
-    tier = 3,
+    tier = 2,
   },
   squirrel = {
     install_info = {
@@ -2166,7 +2166,7 @@ return {
       url = 'https://github.com/sigmaSd/tree-sitter-strace',
     },
     maintainers = { '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   styled = {
     install_info = {
@@ -2175,7 +2175,7 @@ return {
       url = 'https://github.com/mskelton/tree-sitter-styled',
     },
     maintainers = { '@mskelton' },
-    tier = 3,
+    tier = 2,
   },
   supercollider = {
     install_info = {
@@ -2183,16 +2183,16 @@ return {
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
-    tier = 3,
+    tier = 2,
   },
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = 'e6eba40bf54dd94d842154be0389c53a37be8dc8',
+      revision = '9266b3131bbcc0705b3b752bcb7478871a143740',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
-    tier = 3,
+    tier = 2,
   },
   surface = {
     install_info = {
@@ -2200,7 +2200,7 @@ return {
       url = 'https://github.com/connorlay/tree-sitter-surface',
     },
     maintainers = { '@connorlay' },
-    tier = 3,
+    tier = 2,
   },
   svelte = {
     install_info = {
@@ -2227,7 +2227,7 @@ return {
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
-    tier = 3,
+    tier = 2,
   },
   sxhkdrc = {
     install_info = {
@@ -2235,7 +2235,7 @@ return {
       url = 'https://github.com/RaafatTurki/tree-sitter-sxhkdrc',
     },
     maintainers = { '@RaafatTurki' },
-    tier = 3,
+    tier = 2,
   },
   systemtap = {
     install_info = {
@@ -2243,7 +2243,7 @@ return {
       url = 'https://github.com/ok-ryoko/tree-sitter-systemtap',
     },
     maintainers = { '@ok-ryoko' },
-    tier = 3,
+    tier = 2,
   },
   t32 = {
     install_info = {
@@ -2251,7 +2251,7 @@ return {
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
-    tier = 3,
+    tier = 2,
   },
   tablegen = {
     install_info = {
@@ -2267,7 +2267,7 @@ return {
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
-    tier = 3,
+    tier = 2,
   },
   tcl = {
     install_info = {
@@ -2292,7 +2292,7 @@ return {
       url = 'https://github.com/euclidianAce/tree-sitter-teal',
     },
     maintainers = { '@euclidianAce' },
-    tier = 3,
+    tier = 2,
   },
   templ = {
     install_info = {
@@ -2301,7 +2301,7 @@ return {
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
-    tier = 3,
+    tier = 2,
   },
   terraform = {
     install_info = {
@@ -2311,7 +2311,7 @@ return {
     },
     maintainers = { '@MichaHoffmann' },
     requires = { 'hcl' },
-    tier = 3,
+    tier = 2,
   },
   textproto = {
     install_info = {
@@ -2319,7 +2319,7 @@ return {
       url = 'https://github.com/PorterAtGoogle/tree-sitter-textproto',
     },
     maintainers = { '@Porter' },
-    tier = 3,
+    tier = 2,
   },
   thrift = {
     install_info = {
@@ -2335,7 +2335,7 @@ return {
       url = 'https://github.com/ambroisie/tree-sitter-tiger',
     },
     maintainers = { '@ambroisie' },
-    tier = 3,
+    tier = 2,
   },
   tlaplus = {
     install_info = {
@@ -2343,7 +2343,7 @@ return {
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
-    tier = 3,
+    tier = 2,
   },
   tmux = {
     install_info = {
@@ -2351,7 +2351,7 @@ return {
       url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
     maintainers = { '@Freed-Wu' },
-    tier = 3,
+    tier = 2,
   },
   todotxt = {
     install_info = {
@@ -2359,7 +2359,7 @@ return {
       url = 'https://github.com/arnarg/tree-sitter-todotxt',
     },
     maintainers = { '@arnarg' },
-    tier = 3,
+    tier = 2,
   },
   toml = {
     install_info = {
@@ -2396,7 +2396,7 @@ return {
       url = 'https://github.com/GordianDziwis/tree-sitter-turtle',
     },
     maintainers = { '@GordianDziwis' },
-    tier = 3,
+    tier = 2,
   },
   twig = {
     install_info = {
@@ -2404,7 +2404,7 @@ return {
       url = 'https://github.com/gbprod/tree-sitter-twig',
     },
     maintainers = { '@gbprod' },
-    tier = 3,
+    tier = 2,
   },
   typescript = {
     install_info = {
@@ -2423,7 +2423,7 @@ return {
       url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
     maintainers = { '@happenslol' },
-    tier = 3,
+    tier = 2,
   },
   typoscript = {
     install_info = {
@@ -2431,15 +2431,15 @@ return {
       url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
     },
     maintainers = { '@Teddytrombone' },
-    tier = 3,
+    tier = 2,
   },
   typst = {
     install_info = {
-      revision = 'cb0ffe14259f7f63ee6f05b57ceb24a35bedef75',
+      revision = '46cf4ded12ee974a70bf8457263b67ad7ee0379d',
       url = 'https://github.com/uben0/tree-sitter-typst',
     },
     maintainers = { '@uben0', '@RaafatTurki' },
-    tier = 3,
+    tier = 2,
   },
   udev = {
     install_info = {
@@ -2464,7 +2464,7 @@ return {
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },
-    tier = 3,
+    tier = 2,
   },
   usd = {
     install_info = {
@@ -2472,7 +2472,7 @@ return {
       url = 'https://github.com/ColinKennedy/tree-sitter-usd',
     },
     maintainers = { '@ColinKennedy' },
-    tier = 3,
+    tier = 2,
   },
   uxntal = {
     install_info = {
@@ -2485,11 +2485,11 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '0461bf8addccb4df566827f1601f415d07b1ffbc',
+      revision = '1047c9d876451c3fcf78343fff26cdfff3855b8c',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
-    tier = 3,
+    tier = 2,
   },
   vala = {
     install_info = {
@@ -2497,7 +2497,7 @@ return {
       url = 'https://github.com/vala-lang/tree-sitter-vala',
     },
     maintainers = { '@Prince781' },
-    tier = 3,
+    tier = 2,
   },
   vento = {
     install_info = {
@@ -2505,7 +2505,7 @@ return {
       url = 'https://github.com/ventojs/tree-sitter-vento',
     },
     maintainers = { '@wrapperup', '@oscarotero' },
-    tier = 3,
+    tier = 2,
   },
   verilog = {
     install_info = {
@@ -2513,7 +2513,7 @@ return {
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
-    tier = 3,
+    tier = 2,
   },
   vhdl = {
     install_info = {
@@ -2521,15 +2521,15 @@ return {
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
-    tier = 3,
+    tier = 2,
   },
   vhs = {
     install_info = {
-      revision = '966067fe81d78071805d8e55ec836b3926c4ece4',
+      revision = '3f202326c06f1c4d47aa82b9013a6b71aea70611',
       url = 'https://github.com/charmbracelet/tree-sitter-vhs',
     },
     maintainers = { '@caarlos0' },
-    tier = 3,
+    tier = 2,
   },
   vim = {
     install_info = {
@@ -2537,7 +2537,7 @@ return {
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
-    tier = 1,
+    tier = 2,
   },
   vimdoc = {
     install_info = {
@@ -2545,7 +2545,7 @@ return {
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
-    tier = 1,
+    tier = 2,
   },
   vrl = {
     install_info = {
@@ -2553,7 +2553,7 @@ return {
       url = 'https://github.com/belltoy/tree-sitter-vrl',
     },
     maintainers = { '@belltoy' },
-    tier = 3,
+    tier = 2,
   },
   vue = {
     install_info = {
@@ -2572,7 +2572,7 @@ return {
       url = 'https://github.com/szebniok/tree-sitter-wgsl',
     },
     maintainers = { '@szebniok' },
-    tier = 3,
+    tier = 2,
   },
   wgsl_bevy = {
     install_info = {
@@ -2589,7 +2589,7 @@ return {
       url = 'https://github.com/winglang/tree-sitter-wing',
     },
     maintainers = { '@gshpychka', '@MarkMcCulloh' },
-    tier = 3,
+    tier = 2,
   },
   wit = {
     install_info = {
@@ -2597,7 +2597,7 @@ return {
       url = 'https://github.com/liamwh/tree-sitter-wit',
     },
     maintainers = { '@liamwh' },
-    tier = 3,
+    tier = 2,
   },
   xcompose = {
     install_info = {
@@ -2623,7 +2623,7 @@ return {
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
-    tier = 3,
+    tier = 2,
   },
   yaml = {
     install_info = {
@@ -2639,7 +2639,7 @@ return {
       url = 'https://github.com/Hubro/tree-sitter-yang',
     },
     maintainers = { '@Hubro' },
-    tier = 3,
+    tier = 2,
   },
   yuck = {
     install_info = {
@@ -2655,7 +2655,7 @@ return {
       url = 'https://github.com/Freed-Wu/tree-sitter-zathurarc',
     },
     maintainers = { '@Freed-Wu' },
-    tier = 3,
+    tier = 2,
   },
   zig = {
     install_info = {
@@ -2663,7 +2663,7 @@ return {
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
     },
     maintainers = { '@amaanq' },
-    tier = 1,
+    tier = 2,
   },
   ziggy = {
     install_info = {
@@ -2672,7 +2672,7 @@ return {
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
-    tier = 3,
+    tier = 2,
   },
   ziggy_schema = {
     install_info = {
@@ -2681,6 +2681,6 @@ return {
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
-    tier = 3,
+    tier = 2,
   },
 }
diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index ec1308d77..83f54e9da 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -8,7 +8,7 @@ local updates = {} ---@type string[]
 
 -- check for new revisions
 for k, p in pairs(parsers) do
-  if p.tier < 5 and p.install_info then
+  if p.tier <= 2 and p.install_info then
     print('Updating ' .. k)
     jobs[k] = vim.system({ 'git', 'ls-remote', p.install_info.url })
   end

From 02a1a0537c450fe6c9dd525320c688a54aa52baa Mon Sep 17 00:00:00 2001
From: Sebastian Lyng Johansen <sebastian@lyngjohansen.com>
Date: Mon, 17 Feb 2025 17:18:33 +0100
Subject: [PATCH 2324/2704] fix(install): early return if parser_info does not
 exist

---
 SUPPORTED_LANGUAGES.md          |  3 +-
 lua/nvim-treesitter/install.lua |  1 +
 lua/nvim-treesitter/parsers.lua | 76 ++++++++++++++++-----------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 648c0d445..e64daff2d 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -151,6 +151,7 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
 jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [julia](https://github.com/tree-sitter/tree-sitter-julia) | unstable | `HFIJL` | @fredrikekre
 [just](https://github.com/IndianBoy42/tree-sitter-just) | unstable | `HFIJL` | @Hubro
+[kcl](https://github.com/kcl-lang/tree-sitter-kcl) | unstable | `HF J ` | @bertbaron
 [kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` | @amaanq
 [kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` | @amaanq
 [kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` | @SalBakraa
@@ -261,7 +262,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` | @aheber, @xixiafinland
 [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | unstable | `H  JL` | @Sarrus1
 [sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | unstable | `HFIJL` | @GordianDziwis
-[sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `H IJ ` | @derekstride
+[sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `HFIJ ` | @derekstride
 [squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | unstable | `HFIJL` | @amaanq
 [ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | unstable | `HFIJL` | @ObserverOfTime
 [starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 930a8f8f6..c2a5ea396 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -91,6 +91,7 @@ local function get_parser_install_info(lang)
 
   if not parser_config then
     log.error('Parser not available for language "' .. lang .. '"')
+    return
   end
 
   return parser_config.install_info
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1d2329523..fff614bc6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -225,7 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = 'e409ae33f00e04cde30f2bcffb979caf1a33562a',
+      revision = 'cd00bbcb77fe31283ca79b0038387ec7411759ae',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -336,7 +336,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = 'e81af6ab94a728ed99c30083be72d88e6d56cf9e',
+      revision = '80e23c07b64494f7e21090bb3450223ef0b192f4',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -384,7 +384,7 @@ return {
   },
   djot = {
     install_info = {
-      revision = '67e6e23ba7be81a4373e0f49e21207bdc32d12a5',
+      revision = 'eb31845d59b9ee8c1b2098e78e9ca72004bd1579',
       url = 'https://github.com/treeman/tree-sitter-djot',
     },
     maintainers = { '@NoahTheDuke' },
@@ -417,7 +417,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '26e95de449d772bc2dd4f0382580f84e2a0754d6',
+      revision = '2128a0b249263e238d88cb894dad00c3168fea37',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -425,7 +425,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = '6695a2dfea5f8d9076b11f9bebcac8184e405e67',
+      revision = 'ae378d9d1306e9a967698516041f6f8803db5592',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -471,7 +471,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = '86ec2ed45d6d9433b4e0b88cd3d96796bd45625f',
+      revision = '450a8194f5a66561135962cfc8d7545a27b61c4c',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -510,7 +510,7 @@ return {
   },
   enforce = {
     install_info = {
-      revision = 'cf853e5f56f1babe5ec573e356f6fbb4784bf5c1',
+      revision = '8201c3c354c34b96d5a531c8e63d262209ee06cb',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '022b032d31299c5d8336cdfd0ece97de20a609c0',
+      revision = '21b740801794b6570a0380f8aef22bb67214ea65',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -608,7 +608,7 @@ return {
   fsharp = {
     install_info = {
       location = 'fsharp',
-      revision = 'ad824dea984734406b50699c5f388a7412e85946',
+      revision = '02929f084726db969e5b916d144436f248146824',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -1040,7 +1040,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = '0b08a8f976456a9271f70d4682143328d7224115',
+      revision = 'f58a87ac4dc6a7955c64c9e4408fbd693e804686',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
@@ -1100,7 +1100,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '41b17a33f335130ce9861fd21bffeb88fd768ef4',
+      revision = '07a62adf99c0f41e0cab7ab523541309a8d73dc4',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1111,7 +1111,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '41b17a33f335130ce9861fd21bffeb88fd768ef4',
+      revision = '07a62adf99c0f41e0cab7ab523541309a8d73dc4',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1191,8 +1191,8 @@ return {
   },
   kcl = {
     install_info = {
+      revision = 'b0b2eb38009e04035a6e266c7e11e541f3caab7c',
       url = 'https://github.com/kcl-lang/tree-sitter-kcl',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@bertbaron' },
     tier = 2,
@@ -1280,7 +1280,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = '23ac814111e2b4b4b083e2c92219af2d5b74d13d',
+      revision = '6e03a054a71cd419d9702725243137641e97ba51',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1399,7 +1399,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = 'c5fffb8edd39f22644084ab3f73a924a75721ee3',
+      revision = '12edaf0dfef0a43bc74336a4432b2db1c65788d6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '9d83ca263fa7ec8ac7a5fd8ad14891b2dc583a32',
+      revision = 'af14b427119a7428b461277bfc43abe5864d995d',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'b3a88cf3e597d48c33657deca4fda7a75c0069c1',
+      revision = '48057cf966641e7a49b09700550751195c34bcb5',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1489,7 +1489,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '2a153c88d5d44d96653057c7cc14292f4e641bef',
+      revision = 'b99dc3b7b26337d84f95c0de4dda81077b03e5c7',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1516,7 +1516,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '91e4d9106f5da8199ab5158ba65e02da3e664597',
+      revision = 'db52ba3f7f33c9949bba115a813d7c30a359cd87',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1525,7 +1525,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '91e4d9106f5da8199ab5158ba65e02da3e664597',
+      revision = 'db52ba3f7f33c9949bba115a813d7c30a359cd87',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1551,7 +1551,7 @@ return {
   },
   pascal = {
     install_info = {
-      revision = 'd0ebabefaea9ac3f6fc3004cf08cd121b66da9e4',
+      revision = '78426d96bde7114af979e314283e45d087603428',
       url = 'https://github.com/Isopod/tree-sitter-pascal',
     },
     maintainers = { '@Isopod' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'f3a19ab3217a6e838870fc7142fa492d1fd7a7c9',
+      revision = 'f7cf7348737d8cff1b13407a0bfedce02ee7b046',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'f3a19ab3217a6e838870fc7142fa492d1fd7a7c9',
+      revision = 'f7cf7348737d8cff1b13407a0bfedce02ee7b046',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1659,7 +1659,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '32fe49cc5d4a2d5a976dacafc0da16d98787866b',
+      revision = 'e904962e25858b7e8e19c653e737ad3b7d1c55bd',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1853,7 +1853,7 @@ return {
   razor = {
     install_info = {
       generate_from_json = true,
-      revision = 'a47cd8ca148685629739a4ab69f58864800fbdab',
+      revision = 'fe46ce5ea7d844e53d59bc96f2175d33691c61c5',
       url = 'https://github.com/tris203/tree-sitter-razor',
     },
     maintainers = { '@tris203' },
@@ -1901,7 +1901,7 @@ return {
   },
   requirements = {
     install_info = {
-      revision = '5ad9b7581b3334f6ad492847d007f2fac6e6e5f2',
+      revision = '728910099ddea7f1f94ea95a35a70d1ea76a1639',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-requirements',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1958,7 +1958,7 @@ return {
   },
   rst = {
     install_info = {
-      revision = '899e073a10012b8028b643d676c30bbf9c64a45d',
+      revision = '4e562e1598b95b93db4f3f64fe40ddefbc677a15',
       url = 'https://github.com/stsewd/tree-sitter-rst',
     },
     maintainers = { '@stsewd' },
@@ -1982,7 +1982,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '2eaf126458a4d6a69401089b6ba78c5e5d6c1ced',
+      revision = '02da1b25f6dfc7341ddb80f37f708cdd9301be2d',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2043,7 +2043,7 @@ return {
   },
   slim = {
     install_info = {
-      revision = 'a0f08e85b787248219ea645423c5916c8d620ef6',
+      revision = '546e3aa1af8a3b355c7734efccd9a759ffc0b43a',
       url = 'https://github.com/theoo/tree-sitter-slim',
     },
     maintainers = { '@theoo' },
@@ -2171,7 +2171,7 @@ return {
   styled = {
     install_info = {
       generate_from_json = true,
-      revision = '75d3ad20818c30c49b445ca2cb35999c278b3453',
+      revision = '319cdcaa0346ba6db668a222d938e5c3569e2a51',
       url = 'https://github.com/mskelton/tree-sitter-styled',
     },
     maintainers = { '@mskelton' },
@@ -2188,7 +2188,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '9266b3131bbcc0705b3b752bcb7478871a143740',
+      revision = '15ff939100f9d52342445407973f3ce125a8437e',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2223,7 +2223,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '1ebc09c38f41d6aab7dd65ca0f8ea032ced0364f',
+      revision = '42ad8f6b4dc9b46285893cc37b460323b54932d4',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2339,7 +2339,7 @@ return {
   },
   tlaplus = {
     install_info = {
-      revision = 'd711f24c93221cdfc9a9b4dbb0998f528fc982ac',
+      revision = '4ba91b07b97741a67f61221d0d50e6d962e4987e',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
@@ -2485,7 +2485,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '1047c9d876451c3fcf78343fff26cdfff3855b8c',
+      revision = '532bebd50742ef15949bdd67c36d46697c847628',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2517,7 +2517,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = 'cfc522af3e49c1a00ae74e01aa14e19818dab8f2',
+      revision = 'db1d7446bd07d811981734cd501fe1994cbad99d',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2610,7 +2610,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '26e95de449d772bc2dd4f0382580f84e2a0754d6',
+      revision = '2128a0b249263e238d88cb894dad00c3168fea37',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2668,7 +2668,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = 'acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831',
+      revision = 'af41bdb5b1d64404c2ec7eb1d9de01083c0d2596',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2677,7 +2677,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = 'acf2b6b5aa8b9ce93f4a1ef1adf4e95c06db7831',
+      revision = 'af41bdb5b1d64404c2ec7eb1d9de01083c0d2596',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },

From 6fe00326406d1aedd0383c4b8b5e7c1ae02197b0 Mon Sep 17 00:00:00 2001
From: przepompownia <przepompownia@users.noreply.github.com>
Date: Wed, 5 Mar 2025 20:03:30 +0100
Subject: [PATCH 2325/2704] feat(install): allow pass callback to `update()`

Problem: cannot run `:TSUpdate synchronously`

Solution: pass callback used after exiting jobs
(like in `install-parsers`).
---
 SUPPORTED_LANGUAGES.md          |  3 +-
 lua/nvim-treesitter/install.lua | 11 +++---
 lua/nvim-treesitter/parsers.lua | 64 ++++++++++++++++-----------------
 scripts/install-parsers.lua     | 21 +++++++----
 4 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index e64daff2d..4a1df1671 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -240,7 +240,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
 [robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` | @Hubro
 [robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
-[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H  JL` | @nat-418
+[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H IJL` | @nat-418
 [ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
 [rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` | @stsewd
 [ruby](https://github.com/tree-sitter/tree-sitter-ruby) | unstable | `HFIJL` | @TravonteD
@@ -282,6 +282,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | unstable | `HFIJ ` | @lewis6991
 [teal](https://github.com/euclidianAce/tree-sitter-teal) | unstable | `HFIJL` | @euclidianAce
 [templ](https://github.com/vrischmann/tree-sitter-templ) | unstable | `HF J ` | @vrischmann
+[tera](https://github.com/uncenter/tree-sitter-tera) | unstable | `H  J ` | @uncenter
 [terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
 [textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | unstable | `HFIJ ` | @Porter
 [thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` | @amaanq, @duskmoon314
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c2a5ea396..9ff245ab6 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -455,8 +455,8 @@ end, 3)
 
 ---@param languages? string[]|string
 ---@param _options? UpdateOptions
----@param _callback function
-M.update = a.sync(function(languages, _options, _callback)
+---@param callback function
+M.update = a.sync(function(languages, _options, callback)
   reload_parsers()
   if not languages or #languages == 0 then
     languages = 'all'
@@ -465,11 +465,14 @@ M.update = a.sync(function(languages, _options, _callback)
   languages = vim.tbl_filter(needs_update, languages) ---@type string[]
 
   if #languages > 0 then
-    install(languages, { force = true })
+    install(languages, { force = true }, callback)
   else
     log.info('All parsers are up-to-date')
+    if callback then
+      callback(true)
+    end
   end
-end, 2)
+end, 3)
 
 ---@async
 ---@param logger Logger
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fff614bc6..f4d0ea374 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -19,7 +19,7 @@ return {
   angular = {
     install_info = {
       generate_from_json = true,
-      revision = '745d3c65c2294aca1110b6b6ad6805124be605c9',
+      revision = 'cba288924f4832abb619c627539f111004ff22e5',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -47,7 +47,7 @@ return {
   },
   asm = {
     install_info = {
-      revision = '5bb5b03e3c1ce5853b5282b9fba060f7c7bbf11e',
+      revision = '04962e15f6b464cf1d75eada59506dc25090e186',
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
@@ -225,7 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = 'cd00bbcb77fe31283ca79b0038387ec7411759ae',
+      revision = 'c70336e8db6d3842721d9be40610580908ff45ba',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -518,7 +518,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '370cea629eb62a8686504b9fb3252a5e1ae55313',
+      revision = '364e323b32d098ad0e7b29e7adb4005c2bb5cf34',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = 'af6043419f5aa0f8b6c2a26db0187aefa46c7f5f',
+      revision = 'e01c88449b53e2ee5dad222d4020cc7006c5b700',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -1032,7 +1032,7 @@ return {
   },
   ini = {
     install_info = {
-      revision = '962568c9efa71d25720ab42c5d36e222626ef3a6',
+      revision = '32b31863f222bf22eb43b07d4e9be8017e36fb31',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
@@ -1100,7 +1100,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '07a62adf99c0f41e0cab7ab523541309a8d73dc4',
+      revision = '9af6ce9380fabd3d5b19d0254b8c8936e879c471',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1111,7 +1111,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '07a62adf99c0f41e0cab7ab523541309a8d73dc4',
+      revision = '9af6ce9380fabd3d5b19d0254b8c8936e879c471',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1399,7 +1399,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '12edaf0dfef0a43bc74336a4432b2db1c65788d6',
+      revision = '742a21e11e914096e0172dad2f0b85e7554c95ff',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'af14b427119a7428b461277bfc43abe5864d995d',
+      revision = 'c7c62f37a8612a897d25906d93363fec36c1591c',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1472,7 +1472,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = '48057cf966641e7a49b09700550751195c34bcb5',
+      revision = 'cfc53fd287d23ab7281440a8526c73542984669b',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1489,7 +1489,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'b99dc3b7b26337d84f95c0de4dda81077b03e5c7',
+      revision = 'c10340b5bb3789f69182acf8f34c3d4fc24d2fe1',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1516,7 +1516,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = 'db52ba3f7f33c9949bba115a813d7c30a359cd87',
+      revision = '91708deb10cb4fe68ab3c50891426b9967dbf35a',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1525,7 +1525,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = 'db52ba3f7f33c9949bba115a813d7c30a359cd87',
+      revision = '91708deb10cb4fe68ab3c50891426b9967dbf35a',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1535,7 +1535,7 @@ return {
   ocamllex = {
     install_info = {
       generate = true,
-      revision = '5da5bb7508ac9fd3317561670ef18c126a0fe2aa',
+      revision = 'c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f',
       url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
     },
     maintainers = { '@undu' },
@@ -1942,7 +1942,7 @@ return {
   },
   roc = {
     install_info = {
-      revision = 'de0839d6c7db2405e827435cf3ac62d22f4bd5e9',
+      revision = '32e20cb1133a5a189f986c3b5df47ac730fbee3d',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
@@ -1982,7 +1982,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '02da1b25f6dfc7341ddb80f37f708cdd9301be2d',
+      revision = 'e86119bdb4968b9799f6a014ca2401c178d54b5f',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -1990,7 +1990,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'd67fe3ba3879bd7ba74bd7f56c9a38fed241ba25',
+      revision = 'ed939ed550ebff7d4ad8aafb4d5aad44de69965d',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2188,7 +2188,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '15ff939100f9d52342445407973f3ce125a8437e',
+      revision = '91d92846e8baaafc8854d2b9d0ac436bc16234db',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2223,7 +2223,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '42ad8f6b4dc9b46285893cc37b460323b54932d4',
+      revision = '02db52e14bc303322d22019fff7823d72904dfe5',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2277,14 +2277,6 @@ return {
     maintainers = { '@lewis6991' },
     tier = 2,
   },
-  tera = {
-    install_info = {
-      url = 'https://github.com/uncenter/tree-sitter-tera',
-      files = { 'src/parser.c', 'src/scanner.c' },
-    },
-    maintainers = { '@uncenter' },
-    tier = 2,
-  },
   teal = {
     install_info = {
       generate = true,
@@ -2303,6 +2295,14 @@ return {
     maintainers = { '@vrischmann' },
     tier = 2,
   },
+  tera = {
+    install_info = {
+      revision = '588f14ce363904bebd926492bbd1d2c53f8d5f14',
+      url = 'https://github.com/uncenter/tree-sitter-tera',
+    },
+    maintainers = { '@uncenter' },
+    tier = 2,
+  },
   terraform = {
     install_info = {
       location = 'dialects/terraform',
@@ -2460,7 +2460,7 @@ return {
   unison = {
     install_info = {
       generate = true,
-      revision = '3c97db76d3cdbd002dfba493620c2d5df2fd6fa9',
+      revision = '169e7f748a540ec360c0cb086b448faad012caa4',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },
@@ -2517,7 +2517,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = 'db1d7446bd07d811981734cd501fe1994cbad99d',
+      revision = '32d3e3daa745bf9f1665676f323be968444619e1',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2668,7 +2668,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = 'af41bdb5b1d64404c2ec7eb1d9de01083c0d2596',
+      revision = '00958faeaeb97d9b7beb76f128a5401441182204',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2677,7 +2677,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = 'af41bdb5b1d64404c2ec7eb1d9de01083c0d2596',
+      revision = '00958faeaeb97d9b7beb76f128a5401441182204',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index 36be0b9c4..cb7389e19 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -1,11 +1,14 @@
 #!/usr/bin/env -S nvim -l
 
 local generate = false
+local update = false
 local max_jobs = nil ---@as integer
 local parsers = {}
 for i = 1, #_G.arg do
   if _G.arg[i] == '--generate' then
     generate = true
+  elseif _G.arg[i] == '--update' then
+    update = true
   elseif _G.arg[i]:find('^%-%-max%-jobs') then
     max_jobs = _G.arg[i]:match('=(%d+)')
   else
@@ -19,13 +22,19 @@ vim.opt.runtimepath:append('.')
 vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
 
 local ok = nil
-require('nvim-treesitter.install').install(
-  #parsers > 0 and parsers or 'all',
-  { force = true, generate = generate, max_jobs = max_jobs },
-  function(success)
+if update then
+  require('nvim-treesitter.install').update('all', {}, function(success)
     ok = success
-  end
-)
+  end)
+else
+  require('nvim-treesitter.install').install(
+    #parsers > 0 and parsers or 'all',
+    { force = true, generate = generate, max_jobs = max_jobs },
+    function(success)
+      ok = success
+    end
+  )
+end
 
 vim.wait(6000000, function()
   return ok ~= nil

From 12e0246e4fc2b75742d98a546216234444fdad28 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 12 Mar 2025 09:44:33 +0100
Subject: [PATCH 2326/2704] fix(formatter): increase match limit

Problem: Some very long patterns were not formatted correctly.

Solution: Increase the match limit when iterating to 1024.
---
 SUPPORTED_LANGUAGES.md                    |  3 +
 lua/nvim-treesitter/parsers.lua           | 98 +++++++++++------------
 runtime/queries/commonlisp/highlights.scm |  3 +-
 runtime/queries/racket/highlights.scm     |  3 +-
 scripts/format-queries.lua                |  2 +-
 5 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 4a1df1671..8eac31b73 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -26,10 +26,12 @@ Language | Tier | Queries | Maintainer
 [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` | @theHamsta, @clason
 [bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` | @amaanq
 [bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
+[blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` | @calebdw
 [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` | @gabmus
 [bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` | @ambroisie
 [c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
 [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` | @amaanq
+[caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` | @opa-oz
 [cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` | @amaanq
 [capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | unstable | `HFIJL` | @amaanq
 [chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | unstable | `HFIJL` | @ObserverOfTime
@@ -139,6 +141,7 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
 [ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` | @fab4100
 [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` | @sogaiu
 [java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` | @p00f
+[javadoc](https://github.com/rmuir/tree-sitter-javadoc) | unstable | `H IJ ` | @rmuir
 [javascript](https://github.com/tree-sitter/tree-sitter-javascript) | unstable | `HFIJL` | @steelsojka
 [jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | unstable | `H  J ` | @cathaysia
 [jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` | @cathaysia
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f4d0ea374..32ef7cdee 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -19,7 +19,7 @@ return {
   angular = {
     install_info = {
       generate_from_json = true,
-      revision = 'cba288924f4832abb619c627539f111004ff22e5',
+      revision = 'be53f2597dded40c90b5f53ed9f4521422f6b6b3',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -128,8 +128,8 @@ return {
   },
   blade = {
     install_info = {
+      revision = 'bcdc4b01827cac21205f7453e9be02f906943128',
       url = 'https://github.com/EmranMR/tree-sitter-blade',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@calebdw' },
     tier = 2,
@@ -175,6 +175,14 @@ return {
     maintainers = { '@amaanq' },
     tier = 2,
   },
+  caddy = {
+    install_info = {
+      revision = '2686186edb61be47960431c93a204fb249681360',
+      url = 'https://github.com/opa-oz/tree-sitter-caddy',
+    },
+    maintainers = { '@opa-oz' },
+    tier = 3,
+  },
   cairo = {
     install_info = {
       revision = '6238f609bea233040fe927858156dee5515a0745',
@@ -183,14 +191,6 @@ return {
     maintainers = { '@amaanq' },
     tier = 2,
   },
-  caddy = {
-    install_info = {
-      url = 'https://github.com/opa-oz/tree-sitter-caddy',
-      files = { 'src/parser.c', 'src/scanner.c' },
-    },
-    maintainers = { '@opa-oz' },
-    tier = 3,
-  },
   capnp = {
     install_info = {
       revision = '7b0883c03e5edd34ef7bcf703194204299d7099f',
@@ -225,7 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = 'c70336e8db6d3842721d9be40610580908ff45ba',
+      revision = 'fe48221d4d9842d916d66b5e71ab3c6307ec28b3',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -242,7 +242,7 @@ return {
   commonlisp = {
     install_info = {
       generate_from_json = true,
-      revision = 'bf2a65b1c119898a1a17389e07f2a399c05cdc0c',
+      revision = '32323509b3d9fe96607d151c2da2c9009eb13a2f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-commonlisp',
     },
     maintainers = { '@theHamsta' },
@@ -303,7 +303,7 @@ return {
   cuda = {
     install_info = {
       generate_from_json = true,
-      revision = '757e0a61f9d38b3d9eaa299e8d866e8283ffc284',
+      revision = '014628ae8d2df391b88ddb9fa0260fd97f770829',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
     maintainers = { '@theHamsta' },
@@ -417,7 +417,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '2128a0b249263e238d88cb894dad00c3168fea37',
+      revision = '0d9a8099c963ed53e183425c1b47fa2622c8eaf7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '21b740801794b6570a0380f8aef22bb67214ea65',
+      revision = '64e11001d7ef3e8ac18e55a3a2d811fe36430923',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -692,7 +692,7 @@ return {
   },
   gitcommit = {
     install_info = {
-      revision = 'db0e0c4fb9095fdc42a7af34019c0616c071e9eb',
+      revision = 'a716678c0f00645fed1e6f1d0eb221481dbd6f6d',
       url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
     maintainers = { '@gbprod' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = 'e01c88449b53e2ee5dad222d4020cc7006c5b700',
+      revision = '99ec4101504452c488b7c835fb65cfef75b090b7',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -726,7 +726,7 @@ return {
   glimmer_javascript = {
     install_info = {
       generate_from_json = true,
-      revision = '7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3',
+      revision = 'babba3fc0c822a633261ce9e96a4d7986050eb0c',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -736,7 +736,7 @@ return {
   glimmer_typescript = {
     install_info = {
       generate_from_json = true,
-      revision = '4006128790efb58ca82a4492d8ef0983b260fc6a',
+      revision = '48c60295f1ee34ea4ed6e5177102be6d24bfc9d0',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -746,7 +746,7 @@ return {
   glsl = {
     install_info = {
       generate_from_json = true,
-      revision = '66aec57f7119c7e8e40665b723cd7af5594f15ee',
+      revision = '24a6c8ef698e4480fecf8340d771fbcb5de8fbb4',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
     },
     maintainers = { '@theHamsta' },
@@ -936,7 +936,7 @@ return {
   hlsl = {
     install_info = {
       generate_from_json = true,
-      revision = 'b309425a7ab4456605cfe78774b80f7e275ca87d',
+      revision = 'bab9111922d53d43668fabb61869bec51bbcb915',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
     },
     maintainers = { '@theHamsta' },
@@ -1082,8 +1082,8 @@ return {
   },
   javadoc = {
     install_info = {
+      revision = 'db9589e9c61cff7d7fcc207744c711b10b60a7a3',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
-      files = { 'src/parser.c', 'src/scanner.c' },
     },
     maintainers = { '@rmuir' },
     tier = 2,
@@ -1223,7 +1223,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '329b0e84ef6cc6950665de4accd0bdda1601a2f1',
+      revision = '673511402dfef07b25cfa43991693b8442695fc7',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1239,7 +1239,7 @@ return {
   },
   lalrpop = {
     install_info = {
-      revision = 'a7f5ea297bd621d072ed4cb2cc8ba5ae64ae3c4b',
+      revision = '8d38e9755c05d37df8a24dadb0fc64f6588ac188',
       url = 'https://github.com/traxys/tree-sitter-lalrpop',
     },
     maintainers = { '@traxys' },
@@ -1280,7 +1280,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = '6e03a054a71cd419d9702725243137641e97ba51',
+      revision = 'd269f4d52cd08f6cbc6636ee23cc30a9f6c32e42',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1304,7 +1304,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = '68d29aa745b68ae22cbbdb5dcb68c20232521ff6',
+      revision = 'db16e76558122e834ee214c8dc755b4a3edc82a9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1356,7 +1356,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '192407ab5a24bfc24f13332979b5e7967518754a',
+      revision = '413285231ce8fa8b11e7074bbe265b48aa7277f9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1367,7 +1367,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '192407ab5a24bfc24f13332979b5e7967518754a',
+      revision = '413285231ce8fa8b11e7074bbe265b48aa7277f9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1399,7 +1399,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '742a21e11e914096e0172dad2f0b85e7554c95ff',
+      revision = '9c74e8e8917b83d90e38ac040949079437ec0043',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'c7c62f37a8612a897d25906d93363fec36c1591c',
+      revision = '922cbb97f3d20044e6b4362b3d7af5e530ed8f34',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1659,7 +1659,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = 'e904962e25858b7e8e19c653e737ad3b7d1c55bd',
+      revision = '66d5e61126989c0aca57ff77d19b2064919b51e1',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1684,7 +1684,7 @@ return {
   problog = {
     install_info = {
       location = 'grammars/problog',
-      revision = '93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8',
+      revision = 'd8d415f6a1cf80ca138524bcc395810b176d40fa',
       url = 'https://github.com/foxyseta/tree-sitter-prolog',
     },
     maintainers = { '@foxyseta' },
@@ -1694,7 +1694,7 @@ return {
   prolog = {
     install_info = {
       location = 'grammars/prolog',
-      revision = '93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8',
+      revision = 'd8d415f6a1cf80ca138524bcc395810b176d40fa',
       url = 'https://github.com/foxyseta/tree-sitter-prolog',
     },
     maintainers = { '@foxyseta' },
@@ -1812,7 +1812,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '0555ac0da902abff06076e40501102cee3ba68bd',
+      revision = '930202c2a80965a7a9ca018b5b2a08b25dfa7f12',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1942,7 +1942,7 @@ return {
   },
   roc = {
     install_info = {
-      revision = '32e20cb1133a5a189f986c3b5df47ac730fbee3d',
+      revision = '0b1afe88161cbd81f5ddea1bb4fa786314ed49a7',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
@@ -1990,7 +1990,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'ed939ed550ebff7d4ad8aafb4d5aad44de69965d',
+      revision = '42a1542248ff611ba2091fe76c6dbf42551ebef8',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2188,7 +2188,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '91d92846e8baaafc8854d2b9d0ac436bc16234db',
+      revision = 'fc7c594f52528e4a4a08671137850143d55a5bf2',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2223,7 +2223,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '02db52e14bc303322d22019fff7823d72904dfe5',
+      revision = 'aca5a52aa3cab858944d3c02701ccf5b2d8fd0f9',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2263,7 +2263,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = '83e264928fa194b7283428527259e88e54205264',
+      revision = 'a19be2d4c1956e12facfc717e28f13a6ad0860e0',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2297,7 +2297,7 @@ return {
   },
   tera = {
     install_info = {
-      revision = '588f14ce363904bebd926492bbd1d2c53f8d5f14',
+      revision = '482b475b32e6bae67f9d57abc60545399fd9b0a3',
       url = 'https://github.com/uncenter/tree-sitter-tera',
     },
     maintainers = { '@uncenter' },
@@ -2331,7 +2331,7 @@ return {
   },
   tiger = {
     install_info = {
-      revision = 'a7f11d946b44244f71df41d2a78af0665d618dae',
+      revision = '4a77b2d7a004587646bddc4e854779044b6db459',
       url = 'https://github.com/ambroisie/tree-sitter-tiger',
     },
     maintainers = { '@ambroisie' },
@@ -2427,7 +2427,7 @@ return {
   },
   typoscript = {
     install_info = {
-      revision = '43b221c0b76e77244efdaa9963e402a17c930fbc',
+      revision = '5d8fde870b0ded1f429ba5bb249a9d9f8589ff5f',
       url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
     },
     maintainers = { '@Teddytrombone' },
@@ -2485,7 +2485,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '532bebd50742ef15949bdd67c36d46697c847628',
+      revision = '26c2c4c2b3fb4f7a07ae78d298b36998b7ffa956',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2517,7 +2517,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '32d3e3daa745bf9f1665676f323be968444619e1',
+      revision = '35ed277d3e98836796bc764010dc3fb800d14ee4',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2533,7 +2533,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = 'f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7',
+      revision = '11b688a1f0e97c0c4e3dbabf4a38016335f4d237',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2541,7 +2541,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = 'd2e4b5c172a109966c2ce0378f73df6cede39400',
+      revision = '2694c3d27e2ca98a0ccde72f33887394300d524e',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2610,7 +2610,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '2128a0b249263e238d88cb894dad00c3168fea37',
+      revision = '0d9a8099c963ed53e183425c1b47fa2622c8eaf7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2668,7 +2668,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = '00958faeaeb97d9b7beb76f128a5401441182204',
+      revision = '8a29017169f43dc2c3526817e98142eb9a335087',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2677,7 +2677,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = '00958faeaeb97d9b7beb76f128a5401441182204',
+      revision = '8a29017169f43dc2c3526817e98142eb9a335087',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
diff --git a/runtime/queries/commonlisp/highlights.scm b/runtime/queries/commonlisp/highlights.scm
index 7236c84de..dbd41657f 100644
--- a/runtime/queries/commonlisp/highlights.scm
+++ b/runtime/queries/commonlisp/highlights.scm
@@ -295,8 +295,7 @@
     "clear-output" "assoc-if" "string/=" "princ" "directory-namestring" "stream-error-stream"
     "array-element-type" "setq" "copy-seq" "time" "restart-case" "prog*" "shared-initialize"
     "array-total-size" "simple-bit-vector-p" "define-method-combination" "write-byte" "constantly"
-    "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast")
-  )
+    "caddar" "print-object" "vector" "throw" "reverse" ">=" "upper-case-p" "nbutlast"))
 
 (list_lit
   .
diff --git a/runtime/queries/racket/highlights.scm b/runtime/queries/racket/highlights.scm
index 9e3066743..ac6b4de4b 100644
--- a/runtime/queries/racket/highlights.scm
+++ b/runtime/queries/racket/highlights.scm
@@ -140,8 +140,7 @@
     "unit/c" "unit/new-import-export" "unit/s" "unless" "unquote" "unquote-splicing" "unsyntax"
     "unsyntax-splicing" "values/drop" "when" "with-continuation-mark" "with-contract"
     "with-contract-continuation-mark" "with-handlers" "with-handlers*" "with-method" "with-syntax"
-    "~?" "~@" "λ")
-  )
+    "~?" "~@" "λ"))
 
 ; builtin procedures
 ((symbol) @function.builtin
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index f924b8064..c7362687e 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -446,7 +446,7 @@ local function format(bufnr, queries)
   }
   local root = ts.get_parser(bufnr, 'query'):parse(true)[1]:root()
   local query = ts.query.parse('query', queries)
-  for id, node, metadata in query:iter_captures(root, bufnr) do
+  for id, node, metadata in query:iter_captures(root, bufnr, nil, nil, { match_limit = 1024 }) do
     if query.captures[id]:sub(1, 1) ~= '_' then
       map[query.captures[id]][node:id()] = metadata and (metadata[id] and metadata[id] or metadata)
         or {}

From 9365cf8a970a00cbb2a16f45319093d2cafe551f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 26 Mar 2025 09:54:22 +0100
Subject: [PATCH 2327/2704] fix(install): don't prompt on installed parsers
 (skip)

Use `:TSInstall!` or `force = true` to reinstall.
---
 TODO.md                         |  2 ++
 lua/nvim-treesitter/config.lua  |  2 +-
 lua/nvim-treesitter/install.lua | 12 ++----------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/TODO.md b/TODO.md
index add857336..330b00d37 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,6 +4,8 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
+- [ ] **`config.lua`:** drop ensure_install (replace with install), ignore_install
+- [ ] **`install.lua`:** simply skip Tier 4 parsers (`get_install_info`)
 - [ ] **`parsers.lua`:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **`parsers.lua`:** add WASM support (tier 1)
 - [ ] **`install.lua`:** migrate to async v2
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index b1cb4f761..473a97ee9 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -20,7 +20,7 @@ function M.setup(user_data)
   if user_data then
     if user_data.install_dir then
       user_data.install_dir = vim.fs.normalize(user_data.install_dir)
-      --TODO(clason): insert after/before site, or leave to user?
+      --TODO(clason): leave to user!
       vim.opt.runtimepath:append(user_data.install_dir)
     end
     config = vim.tbl_deep_extend('force', config, user_data)
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 9ff245ab6..d49a7cbc9 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -365,12 +365,8 @@ local install_status = {} ---@type table<string,InstallStatus?>
 ---@return InstallStatus status
 local function install_lang(lang, cache_dir, install_dir, force, generate)
   if not force and vim.list_contains(config.installed_parsers(), lang) then
-    local yesno = fn.input(lang .. ' parser already available: would you like to reinstall ? y/n: ')
-    print('\n ')
-    if yesno:sub(1, 1) ~= 'y' then
-      install_status[lang] = 'installed'
-      return 'installed'
-    end
+    install_status[lang] = 'installed'
+    return 'installed'
   end
 
   if install_status[lang] then
@@ -444,10 +440,6 @@ M.install = a.sync(function(languages, options, callback)
 
   languages = config.norm_languages(languages, options and options.skip)
 
-  if languages[1] == 'all' then
-    options.force = true
-  end
-
   install(languages, options, callback)
 end, 3)
 

From 328ee3db548db585208ae2ff0bf4fd06231581aa Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 26 Mar 2025 13:08:49 +0100
Subject: [PATCH 2328/2704] fix(install): skip tier 4 parsers when installing
 and updating

---
 lua/nvim-treesitter/config.lua  | 18 ++++++++++---
 lua/nvim-treesitter/health.lua  |  2 +-
 lua/nvim-treesitter/indent.lua  |  2 +-
 lua/nvim-treesitter/install.lua | 19 +++++++------
 lua/nvim-treesitter/locals.lua  |  2 +-
 lua/nvim-treesitter/parsers.lua | 48 ++++++++++++++++-----------------
 6 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 473a97ee9..7ef5aeddf 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -27,8 +27,10 @@ function M.setup(user_data)
   end
 
   if #config.ensure_install > 0 then
-    local to_install = M.norm_languages(config.ensure_install, { ignored = true, installed = true })
-
+    local to_install = M.norm_languages(
+      config.ensure_install,
+      { ignored = true, installed = true, unsupported = true }
+    )
     if #to_install > 0 then
       require('nvim-treesitter.install').install(to_install, { force = true })
     end
@@ -103,7 +105,7 @@ end
 
 ---Normalize languages
 ---@param languages? string[]|string
----@param skip? { ignored: boolean, missing: boolean, installed: boolean, dependencies: boolean }
+---@param skip? { ignored: boolean, missing: boolean, unsupported: boolean, installed: boolean, dependencies: boolean }
 ---@return string[]
 function M.norm_languages(languages, skip)
   if not languages then
@@ -164,6 +166,16 @@ function M.norm_languages(languages, skip)
     languages
   )
 
+  if skip and skip.unsupported then
+    languages = vim.tbl_filter(
+      --- @param v string
+      function(v)
+        return parsers[v].tier < 4
+      end,
+      languages
+    )
+  end
+
   if not (skip and skip.dependencies) then
     for _, lang in pairs(languages) do
       if parsers[lang].requires then
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 1776cffe7..68b01bb35 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -25,7 +25,7 @@ local function install_health()
 
   do -- nvim check
     if vim.fn.has('nvim-0.11') ~= 1 then
-      health.error('Nvim-treesitter requires the latest Neovim nightly')
+      health.error('Nvim-treesitter requires Neovim 0.11.0 or later.')
     end
 
     if vim.treesitter.language_version then
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 6b674dc63..03489f22e 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -134,7 +134,7 @@ function M.get_indent(lnum)
   end
 
   -- Get language tree with smallest range around node that's not a comment parser
-  local root, lang_tree ---@type TSNode, LanguageTree
+  local root, lang_tree ---@type TSNode, vim.treesitter.LanguageTree
   parser:for_each_tree(function(tstree, tree)
     if not tstree or M.comment_parsers[tree:lang()] then
       return
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index d49a7cbc9..c208a2709 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -148,7 +148,7 @@ local function do_generate(logger, repo, compile_location)
     'generate',
     '--abi',
     tostring(vim.treesitter.language_version),
-    repo.generate_from_json and 'src/grammar.json',
+    repo.generate_from_json and 'src/grammar.json' or nil,
   }, { cwd = compile_location })
   if r.code > 0 then
     return logger:error('Error during "tree-sitter generate": %s', r.stderr)
@@ -432,14 +432,12 @@ local function install(languages, options, callback)
   end
 end
 
+---@param languages string[]
+---@param options? InstallOptions
+---@param callback? fun(boolean)
 M.install = a.sync(function(languages, options, callback)
   reload_parsers()
-  if not languages or #languages == 0 then
-    languages = 'all'
-  end
-
-  languages = config.norm_languages(languages, options and options.skip)
-
+  languages = config.norm_languages(languages, { ignored = true, unsupported = true })
   install(languages, options, callback)
 end, 3)
 
@@ -447,13 +445,14 @@ end, 3)
 
 ---@param languages? string[]|string
 ---@param _options? UpdateOptions
----@param callback function
+---@param callback? function
 M.update = a.sync(function(languages, _options, callback)
   reload_parsers()
   if not languages or #languages == 0 then
     languages = 'all'
   end
-  languages = config.norm_languages(languages, { ignored = true, missing = true })
+  languages =
+    config.norm_languages(languages, { ignored = true, missing = true, unsupported = true })
   languages = vim.tbl_filter(needs_update, languages) ---@type string[]
 
   if #languages > 0 then
@@ -501,7 +500,7 @@ end
 
 ---@param languages string[]|string
 ---@param _options? UpdateOptions
----@param _callback fun()
+---@param _callback? fun()
 M.uninstall = a.sync(function(languages, _options, _callback)
   languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
 
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index c8ebe0b0d..63b3d458c 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -159,7 +159,7 @@ local function get_root(bufnr)
 end
 
 ---@param bufnr integer: the buffer
----@return Query|nil query: `locals` query
+---@return vim.treesitter.Query|nil query: `locals` query
 ---@return TSNode|nil root: root node of the bufferocal function get_query(bufnr)
 local function get_query(bufnr)
   local root = get_root(bufnr)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 32ef7cdee..263985ecf 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -19,7 +19,7 @@ return {
   angular = {
     install_info = {
       generate_from_json = true,
-      revision = 'be53f2597dded40c90b5f53ed9f4521422f6b6b3',
+      revision = '843525141575e397541e119698f0532755e959f6',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -447,7 +447,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '02f562e71dc28d573187809eecdffaee7c82321c',
+      revision = '3f2b371537355f6e53cc3af37f79ba450efb5132',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -510,7 +510,7 @@ return {
   },
   enforce = {
     install_info = {
-      revision = '8201c3c354c34b96d5a531c8e63d262209ee06cb',
+      revision = 'aedd0bbab9dcc9caec9cc4e32bd303e86509522b',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
@@ -518,7 +518,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '364e323b32d098ad0e7b29e7adb4005c2bb5cf34',
+      revision = '416ca60d7d2a824c0d346163541153e230710780',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '64e11001d7ef3e8ac18e55a3a2d811fe36430923',
+      revision = 'd738334e4a21866a1ab81fb3f27f9b0b2ad2e515',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -726,7 +726,7 @@ return {
   glimmer_javascript = {
     install_info = {
       generate_from_json = true,
-      revision = 'babba3fc0c822a633261ce9e96a4d7986050eb0c',
+      revision = '5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -736,7 +736,7 @@ return {
   glimmer_typescript = {
     install_info = {
       generate_from_json = true,
-      revision = '48c60295f1ee34ea4ed6e5177102be6d24bfc9d0',
+      revision = '12d98944c1d5077b957cbdb90d663a7c4d50118c',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -900,7 +900,7 @@ return {
   },
   hcl = {
     install_info = {
-      revision = '9e3ec9848f28d26845ba300fd73c740459b83e9b',
+      revision = 'de10d494dbd6b71cdf07a678fecbf404dbfe4398',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -992,7 +992,7 @@ return {
   },
   http = {
     install_info = {
-      revision = '77ecf6385f1b5d422e0bbd12204374d287d61ad2',
+      revision = 'db8b4398de90b6d0b6c780aba96aaa2cd8e9202c',
       url = 'https://github.com/rest-nvim/tree-sitter-http',
     },
     maintainers = { '@amaanq', '@NTBBloodbath' },
@@ -1082,7 +1082,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'db9589e9c61cff7d7fcc207744c711b10b60a7a3',
+      revision = '330cc9cb4f33545f7bfce6c3b6aa77fe6db1b537',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1223,7 +1223,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '673511402dfef07b25cfa43991693b8442695fc7',
+      revision = '46770abba021e2ddd2c51d9fa3087fd1ab6b2aea',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1399,7 +1399,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '9c74e8e8917b83d90e38ac040949079437ec0043',
+      revision = 'a56af662e8540412fed5e40cc20435b2b9a20502',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1489,7 +1489,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'c10340b5bb3789f69182acf8f34c3d4fc24d2fe1',
+      revision = 'd5c71a10b4d1b02e38967b05f8de70e847448dd1',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1577,7 +1577,7 @@ return {
     install_info = {
       branch = 'release',
       generate_from_json = true,
-      revision = 'bb53f204aa3e7507960014642965c9f9a9e84b1d',
+      revision = 'ecd90bd8b381bcc7219fed4fe351903630e761c6',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'f7cf7348737d8cff1b13407a0bfedce02ee7b046',
+      revision = '576a56fa7f8b68c91524cdd211eb2ffc43e7bb11',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'f7cf7348737d8cff1b13407a0bfedce02ee7b046',
+      revision = '576a56fa7f8b68c91524cdd211eb2ffc43e7bb11',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1803,7 +1803,7 @@ return {
   qmljs = {
     install_info = {
       generate_from_json = true,
-      revision = '8fef30e231d74b65c713bcbac21956156d8963da',
+      revision = '0889da4632bba3ec6f39ef4102625654890c15c1',
       url = 'https://github.com/yuja/tree-sitter-qmljs',
     },
     maintainers = { '@Decodetalkers' },
@@ -1990,7 +1990,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = '42a1542248ff611ba2091fe76c6dbf42551ebef8',
+      revision = 'c1189954df854977c3a52003ca8a247c5f4729ba',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2188,7 +2188,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = 'fc7c594f52528e4a4a08671137850143d55a5bf2',
+      revision = '16887e9fa3122c36a3d4942470e33c1c282fe859',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2263,7 +2263,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = 'a19be2d4c1956e12facfc717e28f13a6ad0860e0',
+      revision = '47af20264abbd24ea282ded0f8ee9cad3cf3bf2f',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2271,7 +2271,7 @@ return {
   },
   tcl = {
     install_info = {
-      revision = '98015ebe182d94e5a4439e32ffd91beaac32fcb9',
+      revision = 'f15e711167661d1ba541d4f62b9dbfc4ce61ec56',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
@@ -2297,7 +2297,7 @@ return {
   },
   tera = {
     install_info = {
-      revision = '482b475b32e6bae67f9d57abc60545399fd9b0a3',
+      revision = '25a7c617192253bddfa65e378975d8c476419010',
       url = 'https://github.com/uncenter/tree-sitter-tera',
     },
     maintainers = { '@uncenter' },
@@ -2306,7 +2306,7 @@ return {
   terraform = {
     install_info = {
       location = 'dialects/terraform',
-      revision = '9e3ec9848f28d26845ba300fd73c740459b83e9b',
+      revision = 'de10d494dbd6b71cdf07a678fecbf404dbfe4398',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -2525,7 +2525,7 @@ return {
   },
   vhs = {
     install_info = {
-      revision = '3f202326c06f1c4d47aa82b9013a6b71aea70611',
+      revision = '0c6fae9d2cfc5b217bfd1fe84a7678f5917116db',
       url = 'https://github.com/charmbracelet/tree-sitter-vhs',
     },
     maintainers = { '@caarlos0' },

From cbfe8a20c76582b0f2532e94fbd7ea9c80f25455 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 5 Apr 2025 12:22:48 +0200
Subject: [PATCH 2329/2704] feat(html): use gsub for mimetype lookup

---
 SUPPORTED_LANGUAGES.md                        |  1 +
 lua/nvim-treesitter/parsers.lua               |  2 +-
 plugin/filetypes.lua                          |  2 +-
 plugin/query_predicates.lua                   | 27 -----------------
 runtime/queries/html_tags/injections.scm      | 30 +++++++++++++++++--
 .../injections/html/test-html-injections.html |  6 ++--
 6 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 8eac31b73..dbb2934bf 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -29,6 +29,7 @@ Language | Tier | Queries | Maintainer
 [blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` | @calebdw
 [blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` | @gabmus
 [bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` | @ambroisie
+[brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` | @ajdelcimmuto
 [c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
 [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` | @amaanq
 [caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` | @opa-oz
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 263985ecf..01c78a63f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -153,8 +153,8 @@ return {
   },
   brightscript = {
     install_info = {
+      revision = '48ce1687125c6dfefcc7a1bef19fa0f0f00426cc',
       url = 'https://github.com/ajdelcimmuto/tree-sitter-brightscript',
-      files = { 'src/parser.c' },
     },
     maintainers = { '@ajdelcimmuto' },
     tier = 2,
diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index 82b2900ac..feb1194a6 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -22,7 +22,7 @@ local filetypes = {
   haskell_persistent = { 'haskellpersistent' },
   idris = { 'idris2' },
   janet_simple = { 'janet' },
-  javascript = { 'javascriptreact', 'ecma', 'jsx', 'js' },
+  javascript = { 'javascriptreact', 'ecma', 'ecmascript', 'jsx', 'js' },
   javascript_glimmer = { 'javascript.glimmer' },
   linkerscript = { 'ld' },
   latex = { 'tex' },
diff --git a/plugin/query_predicates.lua b/plugin/query_predicates.lua
index 06bf957f8..1a500f591 100644
--- a/plugin/query_predicates.lua
+++ b/plugin/query_predicates.lua
@@ -39,30 +39,3 @@ end, { force = true })
 query.add_predicate('any-kind-eq?', function(match, _, _, pred)
   return predicates['kind-eq'](match, pred, true)
 end, { force = true })
-
--- register custom directives
-
-local mimetype_aliases = {
-  ['importmap'] = 'json',
-  ['module'] = 'javascript',
-  ['application/ecmascript'] = 'javascript',
-  ['text/ecmascript'] = 'javascript',
-}
-
----@param match TSQueryMatch
----@param _ string
----@param bufnr integer
----@param pred string[]
----@return boolean|nil
-query.add_directive('set-lang-from-mimetype!', function(match, _, bufnr, pred, metadata)
-  local id = pred[2]
-  local node = match[id]
-  local type_attr_value = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] })
-  local configured = mimetype_aliases[type_attr_value]
-  if configured then
-    metadata['injection.language'] = configured
-  else
-    local parts = vim.split(type_attr_value, '/', {})
-    metadata['injection.language'] = parts[#parts]
-  end
-end, { force = true })
diff --git a/runtime/queries/html_tags/injections.scm b/runtime/queries/html_tags/injections.scm
index 5b78e37b4..1c8ce012b 100644
--- a/runtime/queries/html_tags/injections.scm
+++ b/runtime/queries/html_tags/injections.scm
@@ -32,16 +32,40 @@
   (#not-lua-match? @_no_type_lang "%stype%s*=")
   (#set! injection.language "javascript"))
 
-; <script type="mimetype-or-well-known-script-type">
+; <script type="foo/bar">
 (script_element
   (start_tag
     (attribute
       (attribute_name) @_attr
       (#eq? @_attr "type")
       (quoted_attribute_value
-        (attribute_value) @_type)))
+        (attribute_value) @injection.language)))
   (raw_text) @injection.content
-  (#set-lang-from-mimetype! @_type))
+  (#gsub! @injection.language "(.+)/(.+)" "%2"))
+
+; <script type="importmap">
+((script_element
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (#eq? @_attr "type")
+      (quoted_attribute_value
+        (attribute_value) @_type)))
+  (raw_text) @injection.content)
+  (#eq? @_type "importmap")
+  (#set! injection.language "json"))
+
+; <script type="module">
+((script_element
+  (start_tag
+    (attribute
+      (attribute_name) @_attr
+      (#eq? @_attr "type")
+      (quoted_attribute_value
+        (attribute_value) @_type)))
+  (raw_text) @injection.content)
+  (#eq? @_type "module")
+  (#set! injection.language "javascript"))
 
 ; <a style="/* css */">
 ((attribute
diff --git a/tests/query/injections/html/test-html-injections.html b/tests/query/injections/html/test-html-injections.html
index 0df3bd420..8b08b3f38 100644
--- a/tests/query/injections/html/test-html-injections.html
+++ b/tests/query/injections/html/test-html-injections.html
@@ -19,6 +19,8 @@
                   <!--  ^ @javascript -->
     <script async defer> const x = 1 </script>
                      <!--  ^ @javascript -->
+    <script type="module"> import { foo } from "bar" </script>
+                                  <!--  ^ @javascript -->
     <script type="text/javascript"> const x = 1 </script>
                                   <!--  ^ @javascript -->
     <script type="text/ecmascript"> const x = 1 </script>
@@ -27,8 +29,6 @@
                                        <!--  ^ @javascript -->
     <script type="application/javascript"> const x = 1 </script>
                                        <!--  ^ @javascript -->
-    <script type="module"> import { foo } from "bar" </script>
-                                 <!--  ^ @javascript -->
     <script defer type="text/javascript"> const x = 1 </script>
                                         <!--  ^ @javascript -->
     <script type="text/markdown">## Hello *World*!</script>
@@ -40,7 +40,7 @@
     <script type="application/json">{ "true": false }</script>
                                       <!--  ^ @json -->
     <script type="importmap">{ "true": false }</script>
-                                  <!--  ^ @json -->
+                                   <!--  ^ @json -->
     <div style="height: 100%">
                <!--  ^ @css -->
       Test div to test css injections for style attributes

From c13511c8842451f4408666ae803b07d030b3782d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 18 Apr 2025 13:14:31 +0200
Subject: [PATCH 2330/2704] feat(parsers): update nickel, sql, devicetree,
 dhall, htmldjango, t32, gap, javadoc, templ, jinja, tera, verilog, meson,
 mlir, typespec, wit, phpdoc, superhtml, git_config, swift, terraform, vim,
 koto, rasi, rescript, bp, enforce, erlang, jinja_inline, cmake, fennel,
 comment, slint, elm, rust, hcl

---
 lua/nvim-treesitter/parsers.lua | 72 ++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 01c78a63f..58456ecfa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -144,7 +144,7 @@ return {
   },
   bp = {
     install_info = {
-      revision = '16c43068ec30828c5aed11e87262c56f36782595',
+      revision = 'ee641d15390183d7535777947ce0f2f1fbcee69f',
       url = 'https://github.com/ambroisie/tree-sitter-bp',
     },
     maintainers = { '@ambroisie' },
@@ -225,7 +225,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = 'fe48221d4d9842d916d66b5e71ab3c6307ec28b3',
+      revision = 'c2fdefaf7ae3b7c5cf11705fe63c516b1c490590',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -233,7 +233,7 @@ return {
   },
   comment = {
     install_info = {
-      revision = '3555706cef8b98d3e4c7379d7260548ff03ad363',
+      revision = '85eae6644d25bcbdd19f4a35c9946abc71c2d6fe',
       url = 'https://github.com/stsewd/tree-sitter-comment',
     },
     maintainers = { '@stsewd' },
@@ -352,7 +352,7 @@ return {
   },
   devicetree = {
     install_info = {
-      revision = '16f640f3c59117c9e749d581634afdb00e004f4c',
+      revision = '6557729f4afaf01dec7481d4e5975515ea8f0edd',
       url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
     maintainers = { '@jedrzejboczar' },
@@ -360,7 +360,7 @@ return {
   },
   dhall = {
     install_info = {
-      revision = '4a6c08abfb54827db4e722d6cdca81b093898988',
+      revision = '62013259b26ac210d5de1abf64cf1b047ef88000',
       url = 'https://github.com/jbellerb/tree-sitter-dhall',
     },
     maintainers = { '@amaanq' },
@@ -479,7 +479,7 @@ return {
   },
   elm = {
     install_info = {
-      revision = 'e34bdc5c512918628b05b48e633f711123204e45',
+      revision = '3b373a3ccb48f31aa4b7ddc9092e2f5e24ab7aed',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
@@ -510,7 +510,7 @@ return {
   },
   enforce = {
     install_info = {
-      revision = 'aedd0bbab9dcc9caec9cc4e32bd303e86509522b',
+      revision = '36064bd71ce22e9a8c73b64b1a3448cc600a4312',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
@@ -518,7 +518,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '416ca60d7d2a824c0d346163541153e230710780',
+      revision = '067d66937c8eeb6651e349f400c1756c2ea90b2e',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -543,7 +543,7 @@ return {
   fennel = {
     install_info = {
       generate_from_json = true,
-      revision = 'cfbfa478dc2dbef267ee94ae4323d9c886f45e94',
+      revision = 'de06b9ad366f0186080056109a8c3be980129538',
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
     maintainers = { '@alexmozaidze' },
@@ -632,7 +632,7 @@ return {
   },
   gap = {
     install_info = {
-      revision = '7db79590d2f8b0e0246008ecfd569b4bfca587a9',
+      revision = '8dee53cfb962600dd35ca25432f005e7920e89f2',
       url = 'https://github.com/gap-system/tree-sitter-gap',
     },
     maintainers = { '@reiniscirpons' },
@@ -668,7 +668,7 @@ return {
   },
   git_config = {
     install_info = {
-      revision = '9c2a1b7894e6d9eedfe99805b829b4ecd871375e',
+      revision = 'edc973f498482529ff2a319249d0f43a22860321',
       url = 'https://github.com/the-mikedavis/tree-sitter-git-config',
     },
     maintainers = { '@amaanq' },
@@ -900,7 +900,7 @@ return {
   },
   hcl = {
     install_info = {
-      revision = 'de10d494dbd6b71cdf07a678fecbf404dbfe4398',
+      revision = '41a2e702413a53f2614533b2aa9c187816116cbc',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -984,7 +984,7 @@ return {
   },
   htmldjango = {
     install_info = {
-      revision = 'ea71012d3fe14dd0b69f36be4f96bdfe9155ebae',
+      revision = '3a643167ad9afac5d61e092f08ff5b054576fadf',
       url = 'https://github.com/interdependence/tree-sitter-htmldjango',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1082,7 +1082,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '330cc9cb4f33545f7bfce6c3b6aa77fe6db1b537',
+      revision = 'd162cc3344a9be8196b72d8780478474c4e0fd55',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1100,7 +1100,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '9af6ce9380fabd3d5b19d0254b8c8936e879c471',
+      revision = '258d7fb22fa6cd2dc800f201cfdcbe05111a836c',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1111,7 +1111,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '9af6ce9380fabd3d5b19d0254b8c8936e879c471',
+      revision = '258d7fb22fa6cd2dc800f201cfdcbe05111a836c',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1223,7 +1223,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '46770abba021e2ddd2c51d9fa3087fd1ab6b2aea',
+      revision = 'f4e64231b5a2ddd3ff2731896b3bbcaf1c0b32a1',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1399,7 +1399,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = 'a56af662e8540412fed5e40cc20435b2b9a20502',
+      revision = '0e5919d240fd639d81ddc9778152bf487bb9efc7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '922cbb97f3d20044e6b4362b3d7af5e530ed8f34',
+      revision = '8a9c57fe224cbc9194a08c1d5b734290b354edc2',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1440,7 +1440,7 @@ return {
   },
   nickel = {
     install_info = {
-      revision = '25464b33522c3f609fa512aa9651707c0b66d48b',
+      revision = 'f77c02df6dd0845594846beeeedf3715d4b68758',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 2,
@@ -1607,7 +1607,7 @@ return {
   phpdoc = {
     install_info = {
       generate_from_json = true,
-      revision = 'fe3202e468bc17332bec8969f2b50ff1f1da3a46',
+      revision = '03bb10330704b0b371b044e937d5cc7cd40b4999',
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
     maintainers = { '@mikehaertl' },
@@ -1844,7 +1844,7 @@ return {
   },
   rasi = {
     install_info = {
-      revision = '6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa',
+      revision = 'e735c6881d8b475aaa4ef8f0a2bdfd825b438143',
       url = 'https://github.com/Fymyte/tree-sitter-rasi',
     },
     maintainers = { '@Fymyte' },
@@ -1910,7 +1910,7 @@ return {
   },
   rescript = {
     install_info = {
-      revision = '4606cd81c4c31d1d02390fee530858323410a74c',
+      revision = 'd2df8a285fff95de56a91d2f8152aeceb66f40ef',
       url = 'https://github.com/rescript-lang/tree-sitter-rescript',
     },
     maintainers = { '@ribru17' },
@@ -1982,7 +1982,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = 'e86119bdb4968b9799f6a014ca2401c178d54b5f',
+      revision = '3691201b01cacb2f96ffca4c632c4e938bfacd88',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2051,7 +2051,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = 'f11da7e62051ba8b9d4faa299c26de8aeedfc1cd',
+      revision = '3493309534cd08ae176c7b917ec79068dca2c1c9',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2129,7 +2129,7 @@ return {
     install_info = {
       branch = 'gh-pages',
       generate_from_json = true,
-      revision = 'b9d109588d5b5ed986c857464830c2f0bef53f18',
+      revision = 'b1ec2aa5091624e4729f0a771a6d631afebf1ed4',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2188,7 +2188,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '16887e9fa3122c36a3d4942470e33c1c282fe859',
+      revision = '13f5a2221cb748bbe50ad702e89362afd5b925a7',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2223,7 +2223,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'aca5a52aa3cab858944d3c02701ccf5b2d8fd0f9',
+      revision = '672079db0c0de8d38b018ecc9fe2bb8fa2c722d3',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2247,7 +2247,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = 'e5a12f798f056049642aa03fbb83786e3a5b95d4',
+      revision = 'dc2a9a3bcc4ad29fff36d3f3bbc62ae117e83028',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2289,7 +2289,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = 'def9849184de71a797c4e2b2837df85abeccf92c',
+      revision = '7f7f06b3931ca00e8ddfbeab3fc08ad00d297fad',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2297,7 +2297,7 @@ return {
   },
   tera = {
     install_info = {
-      revision = '25a7c617192253bddfa65e378975d8c476419010',
+      revision = 'd006172998fa8b81f96b0f2fc7fa2bf25207c46b',
       url = 'https://github.com/uncenter/tree-sitter-tera',
     },
     maintainers = { '@uncenter' },
@@ -2306,7 +2306,7 @@ return {
   terraform = {
     install_info = {
       location = 'dialects/terraform',
-      revision = 'de10d494dbd6b71cdf07a678fecbf404dbfe4398',
+      revision = '41a2e702413a53f2614533b2aa9c187816116cbc',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -2419,7 +2419,7 @@ return {
   },
   typespec = {
     install_info = {
-      revision = '42fb163442ef2691b9b720fb4e4e846809415d18',
+      revision = 'b6b6a66a18e98f44cc2f2cdbfd2e1df845b59852',
       url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
     maintainers = { '@happenslol' },
@@ -2509,7 +2509,7 @@ return {
   },
   verilog = {
     install_info = {
-      revision = '15fbf73dafaffc89050d247857beb27500ea30e8',
+      revision = 'ba3c1e305caf948f718293c86c6018a82ed5043e',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2533,7 +2533,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '11b688a1f0e97c0c4e3dbabf4a38016335f4d237',
+      revision = '0f31cb98e5c0cb3707e097bf95a04c0c2aac573d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2593,7 +2593,7 @@ return {
   },
   wit = {
     install_info = {
-      revision = '81490b4e74c792369e005f72b0d46fe082d3fed2',
+      revision = '37bf43c7f11d2b4af7a78d98a19e6d5c2cf04ad2',
       url = 'https://github.com/liamwh/tree-sitter-wit',
     },
     maintainers = { '@liamwh' },

From 990110336c69f142137992b61b8295c23e5b0387 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 18 Apr 2025 13:16:48 +0200
Subject: [PATCH 2331/2704] feat(julia)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua  | 2 +-
 runtime/queries/julia/locals.scm | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 58456ecfa..a8e782c1c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1175,7 +1175,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = '12a3aede757bc7fbdfb1909507c7a6fddd31df37',
+      revision = '18b739c1563c83fc816170a4241adfa4b69e5c47',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
diff --git a/runtime/queries/julia/locals.scm b/runtime/queries/julia/locals.scm
index 500b7fe58..218a84ae9 100644
--- a/runtime/queries/julia/locals.scm
+++ b/runtime/queries/julia/locals.scm
@@ -9,14 +9,6 @@
   (tuple_expression
     (identifier) @local.definition.var))
 
-; let/const bindings
-(let_binding
-  (identifier) @local.definition.var)
-
-(let_binding
-  (tuple_expression
-    (identifier) @local.definition.var))
-
 ; For bindings
 (for_binding
   (identifier) @local.definition.var)

From 308c9b26c7ee1ce0db19650140dcfa5fb71300ee Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 18 Apr 2025 13:22:20 +0200
Subject: [PATCH 2332/2704] feat(tcl)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 runtime/queries/tcl/indents.scm | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a8e782c1c..791f63328 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2271,7 +2271,7 @@ return {
   },
   tcl = {
     install_info = {
-      revision = 'f15e711167661d1ba541d4f62b9dbfc4ce61ec56',
+      revision = '7b582f8b113bd8a014a44e07d103f70205ac983d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
diff --git a/runtime/queries/tcl/indents.scm b/runtime/queries/tcl/indents.scm
index bc0355372..253cd899e 100644
--- a/runtime/queries/tcl/indents.scm
+++ b/runtime/queries/tcl/indents.scm
@@ -2,7 +2,9 @@
   (braced_word_simple)
   (namespace)
   (command)
-  (conditional)
+  (if)
+  (else)
+  (elseif)
   (foreach)
   (while)
   (try)

From ed1f573aaeb9570d200fe16a0d041e335ebb070c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 19 Apr 2025 10:33:53 +0200
Subject: [PATCH 2333/2704] feat(parsers): update ziggy, ziggy_schema, bibtex,
 latex

---
 lua/nvim-treesitter/parsers.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 791f63328..4a5bf1479 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -104,7 +104,7 @@ return {
   },
   bibtex = {
     install_info = {
-      revision = 'ccfd77db0ed799b6c22c214fe9d2937f47bc8b34',
+      revision = '8d04ed27b3bc7929f14b7df9236797dab9f3fa66',
       url = 'https://github.com/latex-lsp/tree-sitter-bibtex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -1248,7 +1248,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = '7b06f6ed394308e7407a1703d2724128c45fc9d7',
+      revision = 'f736d24d89acbd90092d92089e5171e6a449db40',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -2668,7 +2668,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = '8a29017169f43dc2c3526817e98142eb9a335087',
+      revision = 'fe3bf9389e7ff213cf3548caaf9c6f3d4bb38647',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2677,7 +2677,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = '8a29017169f43dc2c3526817e98142eb9a335087',
+      revision = 'fe3bf9389e7ff213cf3548caaf9c6f3d4bb38647',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },

From 037ac775e1bd25577463a4cbdf7991ca3f78fddb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 22 Apr 2025 10:44:45 +0200
Subject: [PATCH 2334/2704] feat: add .tsqueryrc.json

---
 .tsqueryrc.json | 375 ++++++++++++++++++++++++++++++++++++++++++++++++
 CONTRIBUTING.md |   1 +
 TODO.md         |   1 +
 3 files changed, 377 insertions(+)
 create mode 100644 .tsqueryrc.json

diff --git a/.tsqueryrc.json b/.tsqueryrc.json
new file mode 100644
index 000000000..129550b46
--- /dev/null
+++ b/.tsqueryrc.json
@@ -0,0 +1,375 @@
+{
+  "$schema": "https://raw.githubusercontent.com/ribru17/ts_query_ls/refs/heads/master/schemas/config.json",
+  "parser_install_directories": ["${HOME}/.local/share/nvim/site/parser"],
+  "parser_aliases": {
+    "html_tags": "html",
+    "ecma": "javascript",
+    "jsx": "javascript"
+  },
+  "valid_captures": {
+    "highlights": {
+      "variable": "various variable names",
+      "variable.builtin": "built-in variable names (e.g. `this`)",
+      "variable.parameter": "parameters of a function",
+      "variable.parameter.builtin": "special parameters (e.g. `_`, `it`)",
+      "variable.member": "object and struct fields",
+
+      "constant": "constant identifiers",
+      "constant.builtin": "built-in constant values",
+      "constant.macro": "constants defined by the preprocessor",
+
+      "module": "modules or namespaces",
+      "module.builtin": "built-in modules or namespaces",
+      "label": "GOTO and other labels (e.g. `label:` in C), including heredoc labels",
+
+      "string": "string literals",
+      "string.documentation": "string documenting code (e.g. Python docstrings)",
+      "string.regexp": "regular expressions",
+      "string.escape": "escape sequences",
+      "string.special": "other special strings (e.g. dates)",
+      "string.special.symbol": "symbols or atoms",
+      "string.special.url": "URIs (e.g. hyperlinks)",
+      "string.special.path": "filenames",
+
+      "character": "character literals",
+      "character.special": "special characters (e.g. wildcards)",
+
+      "boolean": "boolean literals",
+      "number": "numeric literals",
+      "number.float": "floating-point number literals",
+
+      "type": "type or class definitions and annotations",
+      "type.builtin": "built-in types",
+      "type.definition": "identifiers in type definitions (e.g. `typedef <type> <identifier>` in C)",
+
+      "attribute": "attribute annotations (e.g. Python decorators, Rust lifetimes)",
+      "attribute.builtin": "builtin annotations (e.g. `@property` in Python)",
+      "property": "the key in key/value pairs",
+
+      "function": "function definitions",
+      "function.builtin": "built-in functions",
+      "function.call": "function calls",
+      "function.macro": "preprocessor macros",
+
+      "function.method": "method definitions",
+      "function.method.call": "method calls",
+
+      "constructor": "constructor calls and definitions",
+      "operator": "symbolic operators (e.g. `+` / `*`)",
+
+      "keyword": "keywords not fitting into specific categories",
+      "keyword.coroutine": "keywords related to coroutines (e.g. `go` in Go, `async/await` in Python)",
+      "keyword.function": "keywords that define a function (e.g. `func` in Go, `def` in Python)",
+      "keyword.operator": "operators that are English words (e.g. `and` / `or`)",
+      "keyword.import": "keywords for including or exporting modules (e.g. `import` / `from` in Python)",
+      "keyword.type": "keywords describing namespaces and composite types (e.g. `struct`, `enum`)",
+      "keyword.modifier": "keywords modifying other constructs (e.g. `const`, `static`, `public`)",
+      "keyword.repeat": "keywords related to loops (e.g. `for` / `while`)",
+      "keyword.return": "keywords like `return` and `yield`",
+      "keyword.debug": "keywords related to debugging",
+      "keyword.exception": "keywords related to exceptions (e.g. `throw` / `catch`)",
+      "keyword.conditional": "keywords related to conditionals (e.g. `if` / `else`)",
+      "keyword.conditional.ternary": "ternary operator (e.g. `?` / `:`)",
+      "keyword.directive": "various preprocessor directives & shebangs",
+      "keyword.directive.define": "preprocessor definition directives",
+
+      "punctuation.delimiter": "delimiters (e.g. `;` / `.` / `,`)",
+      "punctuation.bracket": "brackets (e.g. `()` / `{}` / `[]`)",
+      "punctuation.special": "special symbols (e.g. `{}` in string interpolation)",
+
+      "comment": "line and block comments",
+      "comment.documentation": "comments documenting code",
+      "comment.error": "error-type comments (e.g. `ERROR`, `FIXME`, `DEPRECATED`)",
+      "comment.warning": "warning-type comments (e.g. `WARNING`, `FIX`, `HACK`)",
+      "comment.todo": "todo-type comments (e.g. `TODO`, `WIP`)",
+      "comment.note": "note-type comments (e.g. `NOTE`, `INFO`, `XXX`)",
+
+      "markup.strong": "bold text",
+      "markup.italic": "italic text",
+      "markup.strikethrough": "struck-through text",
+      "markup.underline": "underlined text (only for literal underline markup!)",
+      "markup.heading": "headings, titles (including markers)",
+      "markup.heading.1": "top-level heading",
+      "markup.heading.2": "section heading",
+      "markup.heading.3": "subsection heading",
+      "markup.heading.4": "and so on",
+      "markup.heading.5": "and so forth",
+      "markup.heading.6": "six levels ought to be enough for anybody",
+      "markup.quote": "block quotes",
+      "markup.math": "math environments (e.g. `$ ... $` in LaTeX)",
+      "markup.link": "text references, footnotes, citations, etc.",
+      "markup.link.label": "link, reference descriptions",
+      "markup.link.url": "URL-style links",
+      "markup.raw": "literal or verbatim text (e.g. inline code)",
+      "markup.raw.block": "literal or verbatim text as a stand-alone block ; (use priority 90 for blocks with injections)",
+      "markup.list": "list markers",
+      "markup.list.checked": "checked todo-style list markers",
+      "markup.list.unchecked": "unchecked todo-style list markers",
+
+      "diff.plus": "added text (for diff files)",
+      "diff.minus": "deleted text (for diff files)",
+      "diff.delta": "changed text (for diff files)",
+
+      "tag": "XML-style tag names (and similar)",
+      "tag.builtin": "builtin tag names (e.g. HTML5 tags)",
+      "tag.attribute": "XML-style tag attributes",
+      "tag.delimiter": "XML-style tag delimiters",
+
+      "conceal": "captures that are only meant to be concealed",
+      "spell": "for defining regions to be spellchecked",
+      "nospell": "for defining regions that should NOT be spellchecked",
+      "none": "completely disable the highlight"
+    },
+    "injections": {
+      "injection.content": "indicates that the captured node should have its contents re-parsed using another language",
+      "injection.language": "indicates that the captured node’s text may contain the name of a language that should be used to re-parse the `@injection.content`",
+      "injection.filename": "indicates that the captured node’s text may contain a filename; the corresponding filetype is then looked-up up via `vim.filetype.match()` and treated as the name of a language that should be used to re-parse the `@injection.content`"
+    },
+    "folds": {
+      "fold": "fold this node"
+    },
+    "indents": {
+      "indent.begin": "indent children when matching this node",
+      "indent.end": "marks the end of indented block",
+      "indent.align": "behaves like python aligned/hanging indent",
+      "indent.dedent": "dedent children when matching this node",
+      "indent.branch": "dedent itself when matching this node",
+      "indent.ignore": "do not indent in this node",
+      "indent.auto": "behaves like 'autoindent' buffer option",
+      "indent.zero": "sets this node at position 0 (no indent)"
+    },
+    "locals": {
+      "local.definition": "various definitions",
+      "local.definition.constant": "constants",
+      "local.definition.function": "functions",
+      "local.definition.method": "methods",
+      "local.definition.var": "variables",
+      "local.definition.parameter": "parameters",
+      "local.definition.macro": "preprocessor macros",
+      "local.definition.type": "types or classes",
+      "local.definition.field": "fields or properties",
+      "local.definition.enum": "enumerations",
+      "local.definition.namespace": "modules or namespaces",
+      "local.definition.import": "imported names",
+      "local.definition.associated": "the associated type of a variable",
+      "local.scope": "scope block",
+      "local.reference": "identifier reference"
+    }
+  },
+  "valid_predicates": {
+    "eq": {
+      "any": true,
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "any",
+          "arity": "required"
+        }
+      ],
+      "description": "checks for equality between two nodes, or a node and a string"
+    },
+    "any-of": {
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "variadic"
+        }
+      ],
+      "description": "match any of the given strings against the text corresponding to a node"
+    },
+    "contains": {
+      "any": true,
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "variadic"
+        }
+      ],
+      "description": "match a string against parts of the text corresponding to a node"
+    },
+    "match": {
+      "any": true,
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        }
+      ],
+      "description": "Match a regexp against the text corresponding to a node"
+    },
+    "lua-match": {
+      "any": true,
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        }
+      ],
+      "description": "match a Lua pattern against the text corresponding to a node"
+    },
+    "has-ancestor": {
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "variadic"
+        }
+      ],
+      "description": "match any of the given node types against all ancestors of a node"
+    },
+    "has-parent": {
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "any",
+          "arity": "required"
+        },
+        {
+          "type": "any",
+          "arity": "variadic"
+        }
+      ],
+      "description": "match any of the given node types against the direct ancestor of a node"
+    },
+    "kind-eq": {
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "variadic"
+        }
+      ],
+      "description": "checks whether a capture corresponds to a given set of nodes"
+    }
+  },
+  "valid_directives": {
+    "set": {
+      "parameters": [
+        {
+          "type": "any",
+          "arity": "required"
+        },
+        {
+          "type": "any",
+          "arity": "optional"
+        },
+        {
+          "type": "any",
+          "arity": "optional"
+        }
+      ],
+      "description": "sets key/value metadata for a specific match or capture"
+    },
+    "offset": {
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        }
+      ],
+      "description": "Takes the range of the captured node and applies an offset. This will set a new range in the form of a list like { {start_row}, {start_col}, {end_row}, {end_col} } for the captured node with `capture_id` as `metadata[capture_id].range`."
+    },
+    "gsub": {
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "required"
+        }
+      ],
+      "description": "Transforms the content of the node using a Lua pattern. This will set a new `metadata[capture_id].text`."
+    },
+    "trim": {
+      "parameters": [
+        {
+          "type": "capture",
+          "arity": "required"
+        },
+        {
+          "type": "string",
+          "arity": "optional"
+        },
+        {
+          "type": "string",
+          "arity": "optional"
+        },
+        {
+          "type": "string",
+          "arity": "optional"
+        },
+        {
+          "type": "string",
+          "arity": "optional"
+        }
+      ],
+      "description": "Trims whitespace from the node. Sets a new `metadata[capture_id].range`. Takes a capture ID and, optionally, four integers to customize trimming behavior (`1` meaning trim, `0` meaning don't trim). When only given a capture ID, trims blank lines (lines that contain only whitespace, or are empty) from the end of the node (for backwards compatibility). Can trim all whitespace from both sides of the node if parameters are given."
+    }
+  }
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d82c9cd7b..81cd45dbb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -364,6 +364,7 @@ the node describing the language and `@injection.content` to describe the inject
 ```query
 @injection.language ; dynamic detection of the injection language (i.e. the text of the captured node describes the language)
 @injection.content  ; region for the dynamically detected language
+@injection.filename ; indicates that the captured node’s text may contain a filename; the corresponding filetype is then looked-up up via vim.filetype.match() and treated as the name of a language that should be used to re-parse the `@injection.content`
 ```
 
 For example, to inject javascript into HTML's `<script>` tag
diff --git a/TODO.md b/TODO.md
index 330b00d37..53e2b3c68 100644
--- a/TODO.md
+++ b/TODO.md
@@ -10,6 +10,7 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [ ] **`parsers.lua`:** add WASM support (tier 1)
 - [ ] **`install.lua`:** migrate to async v2
 - [ ] **tests:** fix, update (remove custom crate, plenary dependency)
+- [ ] **CI:** switch to ts_query_ls, add update readme as check (remove update job)
 - [ ] **documentation:** consolidate, autogenerate?
 - [ ] **documentation:** migration guide
 - [ ] **indents:** rewrite (Helix compatible)

From 73adbe597e8350cdf2773e524eb2199841ea2ab6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 27 Apr 2025 11:08:34 +0200
Subject: [PATCH 2335/2704] feat(parsers): update swift, tact, tcl, templ,
 mlir, kotlin, koto, elixir, php_only, ocaml, ocaml_interface, php, astro,
 slang, slim, blade, gleam, v, ledger

---
 lua/nvim-treesitter/parsers.lua | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4a5bf1479..bb3bb6f81 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -56,7 +56,7 @@ return {
   astro = {
     install_info = {
       generate_from_json = true,
-      revision = '0ad33e32ae9726e151d16ca20ba3e507ff65e01f',
+      revision = '213f6e6973d9b456c6e50e86f19f66877e7ef0ee',
       url = 'https://github.com/virchau13/tree-sitter-astro',
     },
     maintainers = { '@virchau13' },
@@ -128,7 +128,7 @@ return {
   },
   blade = {
     install_info = {
-      revision = 'bcdc4b01827cac21205f7453e9be02f906943128',
+      revision = 'fbe5f81b54f0f6153961824ce306ffc805134980',
       url = 'https://github.com/EmranMR/tree-sitter-blade',
     },
     maintainers = { '@calebdw' },
@@ -471,7 +471,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = '450a8194f5a66561135962cfc8d7545a27b61c4c',
+      revision = 'b848e63e9f2a68accff0332392f07582c046295a',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '99ec4101504452c488b7c835fb65cfef75b090b7',
+      revision = '5efbe4fdf199f30a90393196bfbf842d866753c2',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -1215,7 +1215,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6',
+      revision = '5b7b9b73fbe1e41b7d49bb5a8f3c66ac3d022540',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1223,7 +1223,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = 'f4e64231b5a2ddd3ff2731896b3bbcaf1c0b32a1',
+      revision = '1e610746f48c24607733fac158d5bae79accd845',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1256,7 +1256,7 @@ return {
   },
   ledger = {
     install_info = {
-      revision = 'd313153eef68c557ba4538b20de2d0e92f3ef6f8',
+      revision = '4d828c87e8bf3f7cef9927417b47ce1126c1ca29',
       url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
     maintainers = { '@cbarrete' },
@@ -1408,7 +1408,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '8a9c57fe224cbc9194a08c1d5b734290b354edc2',
+      revision = 'c6c67b6138eba6b6efb7be2ca8febe5f1954ca7a',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1516,7 +1516,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '91708deb10cb4fe68ab3c50891426b9967dbf35a',
+      revision = 'ef6ed4a773a260545f0b03c43d2ca78235e9a488',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1525,7 +1525,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '91708deb10cb4fe68ab3c50891426b9967dbf35a',
+      revision = 'ef6ed4a773a260545f0b03c43d2ca78235e9a488',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1586,7 +1586,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '576a56fa7f8b68c91524cdd211eb2ffc43e7bb11',
+      revision = 'eb289f127fc341ae7129902a2dd1c6c197a4c1e7',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1597,7 +1597,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '576a56fa7f8b68c91524cdd211eb2ffc43e7bb11',
+      revision = 'eb289f127fc341ae7129902a2dd1c6c197a4c1e7',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -2034,7 +2034,7 @@ return {
   slang = {
     install_info = {
       generate_from_json = true,
-      revision = '3ed23c04a412a0559162d9cadf96dfff7cb36079',
+      revision = '327b1b821c255867a4fb724c8eee48887e3d014b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
     maintainers = { '@theHamsta' },
@@ -2043,7 +2043,7 @@ return {
   },
   slim = {
     install_info = {
-      revision = '546e3aa1af8a3b355c7734efccd9a759ffc0b43a',
+      revision = 'd8a79d15c7b9a68d2d1616c319d2b04d1999ab9f',
       url = 'https://github.com/theoo/tree-sitter-slim',
     },
     maintainers = { '@theoo' },
@@ -2223,7 +2223,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '672079db0c0de8d38b018ecc9fe2bb8fa2c722d3',
+      revision = '99a5241ceac351a4af57bcc3571cef5064bde0a3',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2263,7 +2263,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = '47af20264abbd24ea282ded0f8ee9cad3cf3bf2f',
+      revision = 'fc114d17f9b65b7c30f077c354b6c4a62bbfbf64',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2271,7 +2271,7 @@ return {
   },
   tcl = {
     install_info = {
-      revision = '7b582f8b113bd8a014a44e07d103f70205ac983d',
+      revision = '2b7caac46a25e45e6f8ec9c2e1fa4bfc998ae21b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
@@ -2289,7 +2289,7 @@ return {
   templ = {
     install_info = {
       generate_from_json = true,
-      revision = '7f7f06b3931ca00e8ddfbeab3fc08ad00d297fad',
+      revision = 'bd52132b4ef7a028189f0e52d7c89e36a083c6fa',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2485,7 +2485,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '26c2c4c2b3fb4f7a07ae78d298b36998b7ffa956',
+      revision = '59a8889d84a293d7c0366d14c8dbb0eec24fe889',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },

From 522e0c6991c4852be9539dfe0d9f19eae998dfe6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 27 Apr 2025 13:02:32 +0200
Subject: [PATCH 2336/2704] feat(setup)!: remove ensure_install field

Instead, call `require('nvim-treesitter').install( { ... } )` manually.

This gives users full control over how they want to install parsers
(sync, from grammar, limited concurrency) and obviates the need for
calling `setup` for most users.
---
 .luarc.json                    |  7 ++++---
 README.md                      | 16 ++++++++++------
 TODO.md                        |  2 +-
 doc/nvim-treesitter.txt        | 30 ++++++++++--------------------
 lua/nvim-treesitter/config.lua | 13 -------------
 lua/nvim-treesitter/init.lua   | 12 ++++++++++++
 scripts/minimal_init.lua       |  3 ---
 7 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/.luarc.json b/.luarc.json
index 5b5aa24b2..b983242ef 100644
--- a/.luarc.json
+++ b/.luarc.json
@@ -5,12 +5,13 @@
   },
   "workspace": {
     "library": [
-      "lua",
       "$VIMRUNTIME",
-      "${3rd}/luv/library",
       "${3rd}/busted/library"
     ],
-    "checkThirdParty": false
+    "ignoreDir": [
+      "tests"
+    ],
+    "checkThirdParty": "Disable"
   },
   "diagnostics": {
     "groupFileStatus": {
diff --git a/README.md b/README.md
index 7ea64b76d..23016ba58 100644
--- a/README.md
+++ b/README.md
@@ -53,17 +53,21 @@ require('lazy').setup(
 
 ```lua
 require'nvim-treesitter'.setup {
-  -- A list of parser names or tiers ('stable', 'unstable')
-  ensure_install = { 'stable' },
-
-  -- List of parsers to ignore when installing tiers
-  ignore_install = { 'rust' },
-
   -- Directory to install parsers and queries to
   install_dir = vim.fn.stdpath('data') .. '/site'
+  -- List of parsers to ignore when installing tiers
+  ignore_install = { },
 }
 ```
 
+Parsers and queries can then be installed with
+
+```lua
+require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
+```
+
+(This is a no-op if the parsers are already installed.) Note that this function runs asynchronously; for synchronous installation in a script context ("bootstrapping"), adapt [this script](scripts/install-parsers.lua) to your needs.
+
 Check [`:h nvim-treesitter-commands`](doc/nvim-treesitter.txt) for a list of all available commands.
 
 # Supported languages
diff --git a/TODO.md b/TODO.md
index 53e2b3c68..afc451685 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,7 +4,6 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
-- [ ] **`config.lua`:** drop ensure_install (replace with install), ignore_install
 - [ ] **`install.lua`:** simply skip Tier 4 parsers (`get_install_info`)
 - [ ] **`parsers.lua`:** allow specifying version in addition to commit hash (for Tier 1)
 - [ ] **`parsers.lua`:** add WASM support (tier 1)
@@ -31,3 +30,4 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [X] rewrite installation using async module (drop support for sync; use callback instead)
 - [X] switch to upstream injection format
 - [X] remove locals from highlighting (cf. https://github.com/nvim-treesitter/nvim-treesitter/issues/3944#issuecomment-1458782497)
+- [X] drop ensure_install (replace with install)
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index b5028768d..f0abcc779 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -22,34 +22,24 @@ WARNING: This is work in progress and requires the latest commit on Neovim
 ==============================================================================
 QUICK START                                       *nvim-treesitter-quickstart*
 
-Install the parser for your language
-
->vim
-  :TSInstall {language}
-<
-
-To get a list of supported languages
-
->vim
-  :TSInstall <tab>
-<
-
-To install supported parsers and queries, put this in your `init.lua` file:
-
+To configure `nvim-treesitter`, put this in your `init.lua` file:
 >lua
-  require'nvim-treesitter.config'.setup {
+  require'nvim-treesitter'.setup {
     -- A directory to install the parsers and queries to.
     -- Defaults to the `stdpath('data')/site` dir.
     install_dir = "/some/path/to/store/parsers",
-
-    -- A list of parser names, or "stable", "unstable", "unmaintained", "unsupported"
-    ensure_install = { "stable", "rust" },
-
     -- List of parsers to ignore installing (for "stable" etc.)
-    ignore_install = { "javascript" },
+    ignore_install = { "some_parser" },
   }
 
+NOTE: You do not need to call `setup` to use this plugin with the default
+settings!
+
+Parsers and queries can then be installed with >lua
+    require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
 <
+(This is a no-op if the parsers are already installed.)
+
 To check installed parsers and queries, use `:checkhealth nvim-treesitter`.
 
 ==============================================================================
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 7ef5aeddf..44c9b09c5 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -3,13 +3,11 @@ local M = {}
 M.tiers = { 'stable', 'unstable', 'unmaintained', 'unsupported' }
 
 ---@class TSConfig
----@field ensure_install string[]
 ---@field ignore_install string[]
 ---@field install_dir string
 
 ---@type TSConfig
 local config = {
-  ensure_install = {},
   ignore_install = {},
   install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
 }
@@ -20,21 +18,10 @@ function M.setup(user_data)
   if user_data then
     if user_data.install_dir then
       user_data.install_dir = vim.fs.normalize(user_data.install_dir)
-      --TODO(clason): leave to user!
       vim.opt.runtimepath:append(user_data.install_dir)
     end
     config = vim.tbl_deep_extend('force', config, user_data)
   end
-
-  if #config.ensure_install > 0 then
-    local to_install = M.norm_languages(
-      config.ensure_install,
-      { ignored = true, installed = true, unsupported = true }
-    )
-    if #to_install > 0 then
-      require('nvim-treesitter.install').install(to_install, { force = true })
-    end
-  end
 end
 
 -- Returns the install path for parsers, parser info, and queries.
diff --git a/lua/nvim-treesitter/init.lua b/lua/nvim-treesitter/init.lua
index aac1c6ba6..52eab71c8 100644
--- a/lua/nvim-treesitter/init.lua
+++ b/lua/nvim-treesitter/init.lua
@@ -4,6 +4,18 @@ function M.setup(...)
   require('nvim-treesitter.config').setup(...)
 end
 
+function M.install(...)
+  require('nvim-treesitter.install').install(...)
+end
+
+function M.uninstall(...)
+  require('nvim-treesitter.install').uninstall(...)
+end
+
+function M.update(...)
+  require('nvim-treesitter.install').update(...)
+end
+
 function M.indentexpr()
   return require('nvim-treesitter.indent').get_indent(vim.v.lnum)
 end
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 2af5f8ecb..648ffa69f 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -1,13 +1,11 @@
 vim.opt.runtimepath:append('.')
 vim.cmd.runtime({ 'plugin/plenary.vim', bang = true })
-vim.cmd.runtime({ 'plugin/nvim-treesitter.lua', bang = true })
 vim.cmd.runtime({ 'plugin/query_predicates.lua', bang = true })
 vim.cmd.runtime({ 'plugin/filetypes.lua', bang = true })
 
 vim.filetype.add({
   extension = {
     conf = 'hocon',
-    hurl = 'hurl',
     ncl = 'nickel',
     tig = 'tiger',
     w = 'wing',
@@ -17,7 +15,6 @@ vim.filetype.add({
 vim.o.swapfile = false
 vim.bo.swapfile = false
 
-require('nvim-treesitter').setup()
 vim.api.nvim_create_autocmd('FileType', {
   callback = function(args)
     pcall(vim.treesitter.start)

From bdc2e01958209dea64fc1a8b7dbf34d0dd96930e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 27 Apr 2025 14:00:40 +0200
Subject: [PATCH 2337/2704] feat(install)!: always generate from json if
 possible

---
 README.md                             |   9 +-
 SUPPORTED_LANGUAGES.md                | 647 +++++++++++++-------------
 lua/nvim-treesitter/_meta/parsers.lua |   2 +-
 lua/nvim-treesitter/install.lua       |  12 +-
 lua/nvim-treesitter/parsers.lua       |  42 +-
 scripts/update-readme.lua             |   9 +-
 6 files changed, 347 insertions(+), 374 deletions(-)

diff --git a/README.md b/README.md
index 23016ba58..d3de57759 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,10 @@ The `nvim-treesitter` plugin provides
 ## Requirements
 
 - Neovim 0.11.0 or later (nightly)
-- `tar` and `curl` in your path (or alternatively `git`)
-- [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) CLI (0.24.0 or later)
+- `tar` and `curl` in your path
+- [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) CLI (0.25.0 or later)
 - a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
+- `Node` (23.0.0 or later) for some parsers (see the [list of supported languages](SUPPORTED_LANGUAGES.md))
 
 ## Installation
 
@@ -74,9 +75,7 @@ Check [`:h nvim-treesitter-commands`](doc/nvim-treesitter.txt) for a list of all
 
 For `nvim-treesitter` to support a specific feature for a specific language requires both a parser for that language and an appropriate language-specific query file for that feature.
 
-A list of the currently supported languages can be found [on this page](SUPPORTED_LANGUAGES.md).
-
-We are looking for maintainers to add more parsers and to write query files for their languages. Check our [tracking issue](https://github.com/nvim-treesitter/nvim-treesitter/issues/2282) for open language requests.
+A list of the currently supported languages can be found [on this page](SUPPORTED_LANGUAGES.md). If you wish to add a new language or improve the queries for the an existing one, please see our [contributing guide](CONTRIBUTING.md).
 
 For related information on the supported languages, including related plugins, see [this wiki page](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Supported-Languages-Information).
 
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index dbb2934bf..94e105085 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -5,333 +5,334 @@ The following is a list of languages for which a parser can be installed through
 Legend:
 - **Tier:** _stable_ (updates follow semver releases), _unstable_ (updates follow HEAD), _unmaintained_ (no automatic updates), or _unsupported_ (known to be broken, cannot be installed)
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
+- **Node:** Parser requires `node` for installation
 - **Maintainer** of queries in nvim-treesitter (may be different from parser maintainer!)
 
 <!--This section of the README is automatically updated by a CI job-->
 <!--parserinfo-->
-Language | Tier | Queries | Maintainer
--------- |:----:|:-------:| ----------
-[ada](https://github.com/briot/tree-sitter-ada) | unstable | `HF JL` | @briot
-[agda](https://github.com/tree-sitter/tree-sitter-agda) | unstable | `HF J ` | @Decodetalkers
-[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJL` | @dlvandenberg
-[apex](https://github.com/aheber/tree-sitter-sfapex) | unstable | `HF JL` | @aheber, @xixiafinland
-[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | unstable | `HFIJL` | @ObserverOfTime
-[asm](https://github.com/RubixDev/tree-sitter-asm) | unstable | `H  J ` | @RubixDev
-[astro](https://github.com/virchau13/tree-sitter-astro) | unstable | `HFIJL` | @virchau13
-[authzed](https://github.com/mleonidas/tree-sitter-authzed) | unstable | `H  J ` | @mattpolzin
-[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HF JL` | @TravonteD
-[bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unstable | `HF J ` | @polarmutex
-[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` | @theHamsta, @clason
-[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` | @amaanq
-[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
-[blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` | @calebdw
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` | @gabmus
-[bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` | @ambroisie
-[brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` | @ajdelcimmuto
-[c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` | @amaanq
-[caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` | @opa-oz
-[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` | @amaanq
-[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | unstable | `HFIJL` | @amaanq
-[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | unstable | `HFIJL` | @ObserverOfTime
-[circom](https://github.com/Decurity/tree-sitter-circom) | unstable | `HF JL` | @alexandr-martirosyan
-[clojure](https://github.com/sogaiu/tree-sitter-clojure) | unstable | `HF JL` | @NoahTheDuke
-[cmake](https://github.com/uyha/tree-sitter-cmake) | unstable | `HFIJ ` | @uyha
-[comment](https://github.com/stsewd/tree-sitter-comment) | unstable | `H    ` | @stsewd
-[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | unstable | `HF JL` | @theHamsta
-[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | unstable | `H  J ` | @addcninblue
-[corn](https://github.com/jakestanger/tree-sitter-corn) | unstable | `HFIJL` | @jakestanger
-[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | unstable | `HFIJL` | @amaanq
-[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | unstable | `HFIJL` | @theHamsta
-[css](https://github.com/tree-sitter/tree-sitter-css) | unstable | `HFIJ ` | @TravonteD
-[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
-[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | unstable | `HFIJL` | @theHamsta
-[cue](https://github.com/eonpatapon/tree-sitter-cue) | unstable | `HFIJL` | @amaanq
-[cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | unstable | `HFIJ ` | @elliotfontaine
-[d](https://github.com/gdamore/tree-sitter-d) | unstable | `HFIJL` | @amaanq
-[dart](https://github.com/UserNobody14/tree-sitter-dart) | unstable | `HFIJL` | @akinsho
-[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | unstable | `HF J ` | @ValdezFOmar
-[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | unstable | `HFIJL` | @jedrzejboczar
-[dhall](https://github.com/jbellerb/tree-sitter-dhall) | unstable | `HF J ` | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) | unstable | `HF J ` | @gbprod
-[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | unstable | `H  J ` | @ColinKennedy
-[djot](https://github.com/treeman/tree-sitter-djot) | unstable | `HFIJL` | @NoahTheDuke
-[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | unstable | `H  J ` | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) | unstable | `H IJ ` | @rydesun
-[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | unstable | `H IJ ` | @amaanq
-[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HF JL` | @ObserverOfTime
-[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | unstable | `H  J ` | @glehmann
-[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H  J ` | @RubixDev
-ecma (queries only)[^ecma] | unstable | `HFIJL` | @steelsojka
-[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | unstable | `HF J ` | @ValdezFOmar
-[eds](https://github.com/uyha/tree-sitter-eds) | unstable | `HF   ` | @uyha
-[eex](https://github.com/connorlay/tree-sitter-eex) | unstable | `H  J ` | @connorlay
-[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | unstable | `HFIJL` | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) | unstable | `HF J ` | @zweimach
-[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | unstable | `HFIJL` | @glapa-grossklag, @amaanq
-[elvish](https://github.com/elves/tree-sitter-elvish) | unstable | `H  J ` | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unstable | `H  J ` | 
-[enforce](https://github.com/simonvic/tree-sitter-enforce) | unstable | `HFIJL` | @simonvic
-[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | unstable | `HF J ` | @filmor
-[facility](https://github.com/FacilityApi/tree-sitter-facility) | unstable | `HFIJ ` | @bryankenote
-[faust](https://github.com/khiner/tree-sitter-faust) | unstable | `H  J ` | @khiner
-[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | unstable | `HF JL` | @alexmozaidze
-[fidl](https://github.com/google/tree-sitter-fidl) | unstable | `HF J ` | @chaopeng
-[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | unstable | `HFIJL` | @amaanq
-[fish](https://github.com/ram02z/tree-sitter-fish) | unstable | `HFIJL` | @ram02z
-[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJL` | @FoamScience
-[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | unstable | `HFIJL` | @amaanq
-[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | unstable | `HFIJ ` | @amaanq
-[fsh](https://github.com/mgramigna/tree-sitter-fsh) | unstable | `H  J ` | @mgramigna
-[fsharp](https://github.com/ionide/tree-sitter-fsharp) | unstable | `H  J ` | @nsidorenco
-[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | unstable | `H  J ` | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | unstable | `HFIJL` | @jirgn
-[gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` | @reiniscirpons
-[gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` | @reiniscirpons
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unstable | `HFIJL` | @PrestonKnopp
-[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | unstable | `H  J ` | @godofavacyn
-[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | unstable | `HF J ` | @amaanq
-[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | unstable | `H  J ` | @gbprod
-[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | unstable | `H  JL` | @ObserverOfTime
-[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | unstable | `H  J ` | @gbprod
-[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | unstable | `H  J ` | @theHamsta
-[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | unstable | `HFIJL` | @amaanq
-[glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | unstable | `HFIJL` | @NullVoxPopuli
-[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | unstable | `H IJL` | @NullVoxPopuli
-[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | unstable | `H IJ ` | @NullVoxPopuli
-[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | unstable | `HFIJL` | @theHamsta
-[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | unstable | `HFIJL` | @amaanq
-[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | unstable | `H  J ` | @dpezto
-[go](https://github.com/tree-sitter/tree-sitter-go) | unstable | `HFIJL` | @theHamsta, @WinWisely268
-[goctl](https://github.com/chaozwn/tree-sitter-goctl) | unstable | `HFIJ ` | @chaozwn
-[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | unstable | `HF JL` | @pierpo
-[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | unstable | `H  J ` | @camdencheek
-[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | unstable | `H    ` | @amaanq
-[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` | @qvalentin
-[gowork](https://github.com/omertuc/tree-sitter-go-work) | unstable | `H  J ` | @omertuc
-[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | unstable | `H  J ` | @ObserverOfTime
-[graphql](https://github.com/bkegley/tree-sitter-graphql) | unstable | `H IJ ` | @bkegley
-[gren](https://github.com/MaeBrooks/tree-sitter-gren) | unstable | `H  J ` | @MaeBrooks
-[groovy](https://github.com/murtaza64/tree-sitter-groovy) | unstable | `HFIJL` | @murtaza64
-[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | unstable | `H    ` | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H  J ` | 
-[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | unstable | `HFIJL` | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | unstable | `HF JL` | @mrcjkb
-[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | unstable | `HF   ` | @lykahb
-[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
-[heex](https://github.com/connorlay/tree-sitter-heex) | unstable | `HFIJL` | @connorlay
-[helm](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` | @qvalentin
-[hjson](https://github.com/winston0410/tree-sitter-hjson) | unstable | `HFIJL` | @winston0410
-[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | unstable | `HFIJL` | @theHamsta
-[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | unstable | `H  J ` | @Freed-Wu
-[hocon](https://github.com/antosha417/tree-sitter-hocon) | unstable | `HF J ` | @antosha417
-[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF JL` | @urbit-pilled
-[html](https://github.com/tree-sitter/tree-sitter-html) | unstable | `HFIJL` | @TravonteD
-html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
-[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) | unstable | `HF J ` | @amaanq, @NTBBloodbath
-[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | unstable | `HFIJ ` | @pfeiferj
-[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | unstable | `HFIJ ` | @luckasRanarison
-[idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` | @cathaysia
-[idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` | @srghma
-[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | unstable | `HFIJL` | @yorickpeterse
-[ipkg](https://github.com/srghma/tree-sitter-ipkg) | unstable | `HFIJL` | @srghma
-[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` | @fab4100
-[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` | @sogaiu
-[java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` | @p00f
-[javadoc](https://github.com/rmuir/tree-sitter-javadoc) | unstable | `H IJ ` | @rmuir
-[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | unstable | `HFIJL` | @steelsojka
-[jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | unstable | `H  J ` | @cathaysia
-[jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` | @cathaysia
-[jq](https://github.com/flurie/tree-sitter-jq) | unstable | `H  JL` | @ObserverOfTime
-[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFI L` | @steelsojka
-[json5](https://github.com/Joakker/tree-sitter-json5) | unstable | `H  J ` | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | unstable | `HFIJL` | @WhyNotHugo
-[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` | @nawordar
-jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | unstable | `HFIJL` | @fredrikekre
-[just](https://github.com/IndianBoy42/tree-sitter-just) | unstable | `HFIJL` | @Hubro
-[kcl](https://github.com/kcl-lang/tree-sitter-kcl) | unstable | `HF J ` | @bertbaron
-[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` | @amaanq
-[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` | @amaanq
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` | @SalBakraa
-[koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` | @irh
-[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | unstable | `HF JL` | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | unstable | `HF J ` | @theHamsta, @clason
-[ledger](https://github.com/cbarrete/tree-sitter-ledger) | unstable | `HFIJ ` | @cbarrete
-[leo](https://github.com/r001/tree-sitter-leo) | unstable | `H IJ ` | @r001
-[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | unstable | `HFIJL` | @amaanq
-[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | unstable | `H  J ` | @hankthetank27
-[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | unstable | `HFIJL` | @toots
-[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | unstable | `H  J ` | @benwilliamgraham
-[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | unstable | `HFIJL` | @muniftanjim
-[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | unstable | `H    ` | @amaanq
-[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | unstable | `H    ` | @amaanq
-[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | unstable | `HFIJL` | @amaanq
-[m68k](https://github.com/grahambates/tree-sitter-m68k) | unstable | `HF JL` | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) | unstable | `HF J ` | @lewis6991
-[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | unstable | `HFIJ ` | @MDeiml
-[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | unstable | `H  J ` | @MDeiml
-[matlab](https://github.com/acristoffers/tree-sitter-matlab) | unstable | `HFIJL` | @acristoffers
-[menhir](https://github.com/Kerl13/tree-sitter-menhir) | unstable | `H  J ` | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `HFIJ ` | 
-[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | unstable | `HFIJ ` | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H  JL` | @artagnon
-[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | unstable | `H  J ` | @Freed-Wu
-[nasm](https://github.com/naclsn/tree-sitter-nasm) | unstable | `H  J ` | @ObserverOfTime
-[nginx](https://github.com/opa-oz/tree-sitter-nginx) | unstable | `HF J ` | @opa-oz
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unstable | `H IJ ` | 
-[nim](https://github.com/alaviss/tree-sitter-nim) | unstable | `HF JL` | @aMOPel
-[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | unstable | `H  J ` | @aMOPel
-[ninja](https://github.com/alemuller/tree-sitter-ninja) | unstable | `HFIJ ` | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) | unstable | `HFIJL` | @leo60228
-[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | unstable | `HFIJL` | @amaanq
-[nu](https://github.com/nushell/tree-sitter-nu) | unstable | `HFIJ ` | @abhisheksingh0x558
-[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | unstable | `HFIJL` | @amaanq
-[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | unstable | `H  J ` | @ColinKennedy
-[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` | @undu
-[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | unstable | `H  J ` | @undu
-[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | unstable | `HFIJL` | @amaanq
-[pascal](https://github.com/Isopod/tree-sitter-pascal) | unstable | `HFIJL` | @Isopod
-[passwd](https://github.com/ath3/tree-sitter-passwd) | unstable | `H    ` | @amaanq
-[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | unstable | `HF J ` | @ObserverOfTime
-[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | unstable | `HF J ` | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | unstable | `HFIJL` | @tk-shirasaka, @calebdw
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | unstable | `HFIJL` | @tk-shirasaka, @calebdw
-[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` | @mikehaertl
-[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | unstable | `H  J ` | @leo60228
-[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | unstable | `HF J ` | @amaanq
-[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | unstable | `H    ` | @RabbiVeesh, @LeoNerd
-[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` | @ObserverOfTime
-[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | unstable | `HFIJL` | @amaanq, @mfelsche
-[powershell](https://github.com/airbus-cert/tree-sitter-powershell) | unstable | `HFIJL` | @L2jLiga
-[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | unstable | `H    ` | @ObserverOfTime
-[prisma](https://github.com/victorhqc/tree-sitter-prisma) | unstable | `HF J ` | @elianiva
-[problog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` | @foxyseta
-[prolog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` | @foxyseta
-[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` | @MichaHoffmann
-[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | unstable | `H  JL` | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) | unstable | `HFIJ ` | @treywood
-[prql](https://github.com/PRQL/tree-sitter-prql) | unstable | `H  J ` | @matthias-Q
-[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
-[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` | @zealot128
-[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | unstable | `HFIJL` | @amaanq
-[purescript](https://github.com/postsolar/tree-sitter-purescript) | unstable | `H  JL` | @postsolar
-[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | unstable | `H  J ` | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) | unstable | `HFIJL` | @stsewd, @theHamsta
-[ql](https://github.com/tree-sitter/tree-sitter-ql) | unstable | `HFIJL` | @pwntester
-[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | unstable | `H  J ` | @amaanq
-[qmljs](https://github.com/yuja/tree-sitter-qmljs) | unstable | `HF J ` | @Decodetalkers
-[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | unstable | `HFIJL` | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) | unstable | `H IJL` | @ribru17
-[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J ` | 
-[ralph](https://github.com/alephium/tree-sitter-ralph) | unstable | `H  J ` | @tdroxler
-[rasi](https://github.com/Fymyte/tree-sitter-rasi) | unstable | `HFIJL` | @Fymyte
-[razor](https://github.com/tris203/tree-sitter-razor) | unstable | `HF J ` | @tris203
-[rbs](https://github.com/joker1007/tree-sitter-rbs) | unstable | `HFIJ ` | @joker1007
-[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | unstable | `HFIJL` | @amaanq
-[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | unstable | `HFIJ ` | @ribru17
-[regex](https://github.com/tree-sitter/tree-sitter-regex) | unstable | `H    ` | @theHamsta
-[rego](https://github.com/FallenAngel97/tree-sitter-rego) | unstable | `H  J ` | @FallenAngel97
-[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | unstable | `H  J ` | @ObserverOfTime
-[rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` | @ribru17
-[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` | @Hubro
-[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
-[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H IJL` | @nat-418
-[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
-[rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` | @stsewd
-[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | unstable | `HFIJL` | @TravonteD
-[runescript](https://github.com/2004Scape/tree-sitter-runescript) | unstable | `H  J ` | @2004Scape
-[rust](https://github.com/tree-sitter/tree-sitter-rust) | unstable | `HFIJL` | @amaanq
-[scala](https://github.com/tree-sitter/tree-sitter-scala) | unstable | `HF JL` | @stevanmilic
-[scfg](https://github.com/rockorager/tree-sitter-scfg) | unstable | `H  J ` | @WhyNotHugo
-[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` | 
-[scss](https://github.com/serenadeai/tree-sitter-scss) | unstable | `HFIJ ` | @elianiva
-[sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | unstable | `H    ` | @aheber, @xixiaofinland
-[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | unstable | `HFIJL` | @theHamsta
-[slim](https://github.com/theoo/tree-sitter-slim) | unstable | `HFIJL` | @theoo
-[slint](https://github.com/slint-ui/tree-sitter-slint) | unstable | `HFIJL` | @hunger
-[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | unstable | `HFIJL` | @amaanq
-[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | unstable | `H  J ` | @amaanq, @keynmol
-[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` | @osthomas
-[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | unstable | `HF J ` | @amaanq
-[soql](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` | @aheber, @xixiafinland
-[sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` | @aheber, @xixiafinland
-[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | unstable | `H  JL` | @Sarrus1
-[sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | unstable | `HFIJL` | @GordianDziwis
-[sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `HFIJ ` | @derekstride
-[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | unstable | `HFIJL` | @amaanq
-[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | unstable | `HFIJL` | @ObserverOfTime
-[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` | @amaanq
-[strace](https://github.com/sigmaSd/tree-sitter-strace) | unstable | `H  J ` | @amaanq
-[styled](https://github.com/mskelton/tree-sitter-styled) | unstable | `HFIJ ` | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unstable | `HFIJL` | @madskjeldgaard
-[superhtml](https://github.com/kristoff-it/superhtml) | unstable | `H  J ` | @rockorager
-[surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` | @connorlay
-[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` | @amaanq
-[sway](https://github.com/FuelLabs/tree-sitter-sway.git) | unstable | `HFIJL` | @ribru17
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` | @alex-pinkus
-[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` | @RaafatTurki
-[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` | @ok-ryoko
-[t32](https://gitlab.com/xasc/tree-sitter-t32) | unstable | `HFIJL` | @xasc
-[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | unstable | `HFIJL` | @amaanq
-[tact](https://github.com/tact-lang/tree-sitter-tact) | unstable | `HFIJL` | @novusnota
-[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | unstable | `HFIJ ` | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) | unstable | `HFIJL` | @euclidianAce
-[templ](https://github.com/vrischmann/tree-sitter-templ) | unstable | `HF J ` | @vrischmann
-[tera](https://github.com/uncenter/tree-sitter-tera) | unstable | `H  J ` | @uncenter
-[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
-[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | unstable | `HFIJ ` | @Porter
-[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` | @amaanq, @duskmoon314
-[tiger](https://github.com/ambroisie/tree-sitter-tiger) | unstable | `HFIJL` | @ambroisie
-[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | unstable | `HF JL` | @ahelwer, @susliko
-[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` | @Freed-Wu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | unstable | `H    ` | @arnarg
-[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | unstable | `HFIJL` | @tk-shirasaka
-[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
-[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` | @steelsojka
-[turtle](https://github.com/GordianDziwis/tree-sitter-turtle) | unstable | `HFIJL` | @GordianDziwis
-[twig](https://github.com/gbprod/tree-sitter-twig) | unstable | `H  J ` | @gbprod
-[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` | @steelsojka
-[typespec](https://github.com/happenslol/tree-sitter-typespec) | unstable | `H IJ ` | @happenslol
-[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | unstable | `HFIJ ` | @Teddytrombone
-[typst](https://github.com/uben0/tree-sitter-typst) | unstable | `HFIJ ` | @uben0, @RaafatTurki
-[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | unstable | `H  JL` | @ObserverOfTime
-[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | unstable | `HFIJL` | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `HF J ` | @tapegram
-[usd](https://github.com/ColinKennedy/tree-sitter-usd) | unstable | `HFIJL` | @ColinKennedy
-[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | unstable | `HFIJL` | @amaanq
-[v](https://github.com/vlang/v-analyzer) | unstable | `HFIJL` | @kkharji, @amaanq
-[vala](https://github.com/vala-lang/tree-sitter-vala) | unstable | `HF J ` | @Prince781
-[vento](https://github.com/ventojs/tree-sitter-vento) | unstable | `H  J ` | @wrapperup, @oscarotero
-[verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` | @zhangwwpeng
-[vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | unstable | `HF J ` | @jpt13653903
-[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | unstable | `H  J ` | @caarlos0
-[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | unstable | `HF JL` | @clason
-[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | unstable | `H  J ` | @clason
-[vrl](https://github.com/belltoy/tree-sitter-vrl) | unstable | `HFIJL` | @belltoy
-[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | unstable | `HFIJ ` | @WhyNotHugo, @lucario387
-[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` | @szebniok
-[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` | @theHamsta
-[wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | unstable | `HF J ` | @liamwh
-[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` | @ObserverOfTime
-[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` | @ObserverOfTime
-[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` | @ValdezFOmar
-[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | unstable | `HFIJL` | @amaanq
-[yang](https://github.com/Hubro/tree-sitter-yang) | unstable | `HFIJ ` | @Hubro
-[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | unstable | `HFIJL` | @Philipp-M, @amaanq
-[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | unstable | `H  J ` | @Freed-Wu
-[zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` | @amaanq
-[ziggy](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
-[ziggy_schema](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
+Language | Tier | Queries | Node | Maintainer
+-------- |:----:|:-------:|:----:| ----------
+[ada](https://github.com/briot/tree-sitter-ada) | unstable | `HF JL` |   | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) | unstable | `HF J ` |   | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJL` |   | @dlvandenberg
+[apex](https://github.com/aheber/tree-sitter-sfapex) | unstable | `HF JL` |   | @aheber, @xixiafinland
+[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | unstable | `HFIJL` |   | @ObserverOfTime
+[asm](https://github.com/RubixDev/tree-sitter-asm) | unstable | `H  J ` |   | @RubixDev
+[astro](https://github.com/virchau13/tree-sitter-astro) | unstable | `HFIJL` |   | @virchau13
+[authzed](https://github.com/mleonidas/tree-sitter-authzed) | unstable | `H  J ` |   | @mattpolzin
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` |   | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HF JL` |   | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` |   | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unstable | `HF J ` |   | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` |   | @theHamsta, @clason
+[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` |   | @amaanq
+[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` |   | @amaanq
+[blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` |   | @calebdw
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` |   | @gabmus
+[bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` |   | @ambroisie
+[brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` |   | @ajdelcimmuto
+[c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` |   | @amaanq
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` |   | @amaanq
+[caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` |   | @opa-oz
+[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` |   | @amaanq
+[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | unstable | `HFIJL` |   | @amaanq
+[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | unstable | `HFIJL` |   | @ObserverOfTime
+[circom](https://github.com/Decurity/tree-sitter-circom) | unstable | `HF JL` |   | @alexandr-martirosyan
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) | unstable | `HF JL` |   | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) | unstable | `HFIJ ` |   | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | unstable | `H    ` |   | @stsewd
+[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | unstable | `HF JL` |   | @theHamsta
+[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | unstable | `H  J ` |   | @addcninblue
+[corn](https://github.com/jakestanger/tree-sitter-corn) | unstable | `HFIJL` |   | @jakestanger
+[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | unstable | `HFIJL` |   | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | unstable | `HFIJL` |   | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) | unstable | `HFIJ ` |   | @TravonteD
+[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` |   | @amaanq
+[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | unstable | `HFIJL` |   | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) | unstable | `HFIJL` |   | @amaanq
+[cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | unstable | `HFIJ ` |   | @elliotfontaine
+[d](https://github.com/gdamore/tree-sitter-d) | unstable | `HFIJL` |   | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) | unstable | `HFIJL` |   | @akinsho
+[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | unstable | `HF J ` |   | @ValdezFOmar
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | unstable | `HFIJL` |   | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) | unstable | `HF J ` |   | @amaanq
+[diff](https://github.com/the-mikedavis/tree-sitter-diff) | unstable | `HF J ` |   | @gbprod
+[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | unstable | `H  J ` |   | @ColinKennedy
+[djot](https://github.com/treeman/tree-sitter-djot) | unstable | `HFIJL` |   | @NoahTheDuke
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | unstable | `H  J ` |   | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) | unstable | `H IJ ` |   | @rydesun
+[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | unstable | `H IJ ` |   | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HF JL` |   | @ObserverOfTime
+[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | unstable | `H  J ` |   | @glehmann
+[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H  J ` |   | @RubixDev
+ecma (queries only)[^ecma] | unstable | `HFIJL` |   | @steelsojka
+[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | unstable | `HF J ` |   | @ValdezFOmar
+[eds](https://github.com/uyha/tree-sitter-eds) | unstable | `HF   ` |   | @uyha
+[eex](https://github.com/connorlay/tree-sitter-eex) | unstable | `H  J ` |   | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | unstable | `HFIJL` |   | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) | unstable | `HF J ` |   | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | unstable | `HFIJL` |   | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) | unstable | `H  J ` |   | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unstable | `H  J ` |   | 
+[enforce](https://github.com/simonvic/tree-sitter-enforce) | unstable | `HFIJL` |   | @simonvic
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | unstable | `HF J ` |   | @filmor
+[facility](https://github.com/FacilityApi/tree-sitter-facility) | unstable | `HFIJ ` |   | @bryankenote
+[faust](https://github.com/khiner/tree-sitter-faust) | unstable | `H  J ` |   | @khiner
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | unstable | `HF JL` |   | @alexmozaidze
+[fidl](https://github.com/google/tree-sitter-fidl) | unstable | `HF J ` |   | @chaopeng
+[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | unstable | `HFIJL` |   | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) | unstable | `HFIJL` |   | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJL` |   | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | unstable | `HFIJL` |   | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | unstable | `HFIJ ` |   | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) | unstable | `H  J ` |   | @mgramigna
+[fsharp](https://github.com/ionide/tree-sitter-fsharp) | unstable | `H  J ` |   | @nsidorenco
+[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | unstable | `H  J ` |   | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | unstable | `HFIJL` |   | @jirgn
+[gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` |   | @reiniscirpons
+[gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` |   | @reiniscirpons
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unstable | `HFIJL` |   | @PrestonKnopp
+[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | unstable | `H  J ` |   | @godofavacyn
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | unstable | `HF J ` |   | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | unstable | `H  J ` |   | @gbprod
+[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | unstable | `H  JL` |   | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | unstable | `H  J ` |   | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | unstable | `H  J ` |   | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | unstable | `HFIJL` |   | @amaanq
+[glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | unstable | `HFIJL` |   | @NullVoxPopuli
+[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | unstable | `H IJL` |   | @NullVoxPopuli
+[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | unstable | `H IJ ` |   | @NullVoxPopuli
+[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | unstable | `HFIJL` |   | @theHamsta
+[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | unstable | `HFIJL` |   | @amaanq
+[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | unstable | `H  J ` |   | @dpezto
+[go](https://github.com/tree-sitter/tree-sitter-go) | unstable | `HFIJL` |   | @theHamsta, @WinWisely268
+[goctl](https://github.com/chaozwn/tree-sitter-goctl) | unstable | `HFIJ ` |   | @chaozwn
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | unstable | `HF JL` |   | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | unstable | `H  J ` |   | @camdencheek
+[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | unstable | `H    ` |   | @amaanq
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` |   | @qvalentin
+[gowork](https://github.com/omertuc/tree-sitter-go-work) | unstable | `H  J ` |   | @omertuc
+[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | unstable | `H  J ` |   | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) | unstable | `H IJ ` |   | @bkegley
+[gren](https://github.com/MaeBrooks/tree-sitter-gren) | unstable | `H  J ` |   | @MaeBrooks
+[groovy](https://github.com/murtaza64/tree-sitter-groovy) | unstable | `HFIJL` |   | @murtaza64
+[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | unstable | `H    ` |   | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H  J ` |   | 
+[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | unstable | `HFIJL` |   | @amaanq
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | unstable | `HF JL` |   | @mrcjkb
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | unstable | `HF   ` |   | @lykahb
+[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | unstable | `HFIJ ` |   | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) | unstable | `HFIJL` |   | @connorlay
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` |   | @qvalentin
+[hjson](https://github.com/winston0410/tree-sitter-hjson) | unstable | `HFIJL` |   | @winston0410
+[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | unstable | `HFIJL` |   | @theHamsta
+[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | unstable | `H  J ` |   | @Freed-Wu
+[hocon](https://github.com/antosha417/tree-sitter-hocon) | unstable | `HF J ` |   | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF JL` |   | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) | unstable | `HFIJL` |   | @TravonteD
+html_tags (queries only)[^html_tags] | unstable | `H IJ ` |   | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` |   | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) | unstable | `HF J ` |   | @amaanq, @NTBBloodbath
+[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | unstable | `HFIJ ` |   | @pfeiferj
+[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | unstable | `HFIJ ` |   | @luckasRanarison
+[idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` |   | @cathaysia
+[idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` |   | @srghma
+[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` |   | @theHamsta
+[inko](https://github.com/inko-lang/tree-sitter-inko) | unstable | `HFIJL` |   | @yorickpeterse
+[ipkg](https://github.com/srghma/tree-sitter-ipkg) | unstable | `HFIJL` |   | @srghma
+[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` |   | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` |   | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` |   | @p00f
+[javadoc](https://github.com/rmuir/tree-sitter-javadoc) | unstable | `H IJ ` |   | @rmuir
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | unstable | `HFIJL` |   | @steelsojka
+[jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | unstable | `H  J ` |   | @cathaysia
+[jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` |   | @cathaysia
+[jq](https://github.com/flurie/tree-sitter-jq) | unstable | `H  JL` |   | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` |   | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFI L` |   | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) | unstable | `H  J ` |   | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | unstable | `HFIJL` |   | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` |   | @nawordar
+jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
+[julia](https://github.com/tree-sitter/tree-sitter-julia) | unstable | `HFIJL` |   | @fredrikekre
+[just](https://github.com/IndianBoy42/tree-sitter-just) | unstable | `HFIJL` |   | @Hubro
+[kcl](https://github.com/kcl-lang/tree-sitter-kcl) | unstable | `HF J ` |   | @bertbaron
+[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` |   | @amaanq
+[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` |   | @amaanq
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` |   | @SalBakraa
+[koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` |   | @irh
+[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` |   | @Willem-J-an
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | unstable | `HF JL` |   | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | unstable | `HF J ` |   | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) | unstable | `HFIJ ` |   | @cbarrete
+[leo](https://github.com/r001/tree-sitter-leo) | unstable | `H IJ ` |   | @r001
+[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | unstable | `HFIJL` |   | @amaanq
+[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | unstable | `H  J ` |   | @hankthetank27
+[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | unstable | `HFIJL` |   | @toots
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | unstable | `H  J ` |   | @benwilliamgraham
+[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | unstable | `HFIJL` |   | @muniftanjim
+[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | unstable | `H    ` |   | @amaanq
+[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | unstable | `H    ` |   | @amaanq
+[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | unstable | `HFIJL` |   | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) | unstable | `HF JL` |   | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) | unstable | `HF J ` |   | @lewis6991
+[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | unstable | `HFIJ ` |   | @MDeiml
+[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | unstable | `H  J ` |   | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) | unstable | `HFIJL` |   | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) | unstable | `H  J ` |   | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `HFIJ ` |   | 
+[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | unstable | `HFIJ ` |   | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H  JL` |   | @artagnon
+[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | unstable | `H  J ` |   | @Freed-Wu
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | unstable | `H  J ` |   | @ObserverOfTime
+[nginx](https://github.com/opa-oz/tree-sitter-nginx) | unstable | `HF J ` |   | @opa-oz
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unstable | `H IJ ` |   | 
+[nim](https://github.com/alaviss/tree-sitter-nim) | unstable | `HF JL` |   | @aMOPel
+[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | unstable | `H  J ` |   | @aMOPel
+[ninja](https://github.com/alemuller/tree-sitter-ninja) | unstable | `HFIJ ` |   | @alemuller
+[nix](https://github.com/cstrahan/tree-sitter-nix) | unstable | `HFIJL` |   | @leo60228
+[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | unstable | `HFIJL` |   | @amaanq
+[nu](https://github.com/nushell/tree-sitter-nu) | unstable | `HFIJ ` |   | @abhisheksingh0x558
+[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | unstable | `HFIJL` |   | @amaanq
+[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | unstable | `H  J ` |   | @ColinKennedy
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` |   | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` |   | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | unstable | `H  J ` |   | @undu
+[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | unstable | `HFIJL` |   | @amaanq
+[pascal](https://github.com/Isopod/tree-sitter-pascal) | unstable | `HFIJL` |   | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) | unstable | `H    ` |   | @amaanq
+[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | unstable | `HF J ` |   | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | unstable | `HF J ` |   | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | unstable | `HFIJL` |   | @tk-shirasaka, @calebdw
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | unstable | `HFIJL` |   | @tk-shirasaka, @calebdw
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` |   | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | unstable | `H  J ` |   | @leo60228
+[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | unstable | `HF J ` |   | @amaanq
+[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | unstable | `H    ` |   | @RabbiVeesh, @LeoNerd
+[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` |   | @ObserverOfTime
+[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | unstable | `HFIJL` |   | @amaanq, @mfelsche
+[powershell](https://github.com/airbus-cert/tree-sitter-powershell) | unstable | `HFIJL` |   | @L2jLiga
+[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | unstable | `H    ` |   | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) | unstable | `HF J ` |   | @elianiva
+[problog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` |   | @foxyseta
+[prolog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` |   | @foxyseta
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` |   | @MichaHoffmann
+[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | unstable | `H  JL` |   | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) | unstable | `HFIJ ` |   | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) | unstable | `H  J ` |   | @matthias-Q
+[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` |   | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` |   | @zealot128
+[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | unstable | `HFIJL` |   | @amaanq
+[purescript](https://github.com/postsolar/tree-sitter-purescript) | unstable | `H  JL` |   | @postsolar
+[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | unstable | `H  J ` |   | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) | unstable | `HFIJL` |   | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) | unstable | `HFIJL` |   | @pwntester
+[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | unstable | `H  J ` |   | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) | unstable | `HF J ` |   | @Decodetalkers
+[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | unstable | `HFIJL` |   | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) | unstable | `H IJL` |   | @ribru17
+[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J ` |   | 
+[ralph](https://github.com/alephium/tree-sitter-ralph) | unstable | `H  J ` |   | @tdroxler
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) | unstable | `HFIJL` |   | @Fymyte
+[razor](https://github.com/tris203/tree-sitter-razor) | unstable | `HF J ` |   | @tris203
+[rbs](https://github.com/joker1007/tree-sitter-rbs) | unstable | `HFIJ ` |   | @joker1007
+[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | unstable | `HFIJL` |   | @amaanq
+[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | unstable | `HFIJ ` |   | @ribru17
+[regex](https://github.com/tree-sitter/tree-sitter-regex) | unstable | `H    ` |   | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) | unstable | `H  J ` |   | @FallenAngel97
+[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | unstable | `H  J ` |   | @ObserverOfTime
+[rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` |   | @ribru17
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` |   | @bamonroe
+[robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` |   | @Hubro
+[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` |   | @opa-oz
+[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H IJL` |   | @nat-418
+[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` |   | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` |   | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | unstable | `HFIJL` |   | @TravonteD
+[runescript](https://github.com/2004Scape/tree-sitter-runescript) | unstable | `H  J ` |   | @2004Scape
+[rust](https://github.com/tree-sitter/tree-sitter-rust) | unstable | `HFIJL` |   | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) | unstable | `HF JL` |   | @stevanmilic
+[scfg](https://github.com/rockorager/tree-sitter-scfg) | unstable | `H  J ` | X | @WhyNotHugo
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` |   | 
+[scss](https://github.com/serenadeai/tree-sitter-scss) | unstable | `HFIJ ` |   | @elianiva
+[sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | unstable | `H    ` |   | @aheber, @xixiaofinland
+[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | unstable | `HFIJL` |   | @theHamsta
+[slim](https://github.com/theoo/tree-sitter-slim) | unstable | `HFIJL` |   | @theoo
+[slint](https://github.com/slint-ui/tree-sitter-slint) | unstable | `HFIJL` |   | @hunger
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | unstable | `HFIJL` |   | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | unstable | `H  J ` |   | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` |   | @osthomas
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | unstable | `HF J ` |   | @amaanq
+[soql](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` |   | @aheber, @xixiafinland
+[sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` |   | @aheber, @xixiafinland
+[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | unstable | `H  JL` |   | @Sarrus1
+[sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | unstable | `HFIJL` |   | @GordianDziwis
+[sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `HFIJ ` |   | @derekstride
+[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | unstable | `HFIJL` |   | @amaanq
+[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | unstable | `HFIJL` |   | @ObserverOfTime
+[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` |   | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | unstable | `H  J ` |   | @amaanq
+[styled](https://github.com/mskelton/tree-sitter-styled) | unstable | `HFIJ ` |   | @mskelton
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unstable | `HFIJL` |   | @madskjeldgaard
+[superhtml](https://github.com/kristoff-it/superhtml) | unstable | `H  J ` |   | @rockorager
+[surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` |   | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` |   | @amaanq
+[sway](https://github.com/FuelLabs/tree-sitter-sway.git) | unstable | `HFIJL` |   | @ribru17
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` | X | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` |   | @RaafatTurki
+[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` |   | @ok-ryoko
+[t32](https://gitlab.com/xasc/tree-sitter-t32) | unstable | `HFIJL` |   | @xasc
+[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | unstable | `HFIJL` |   | @amaanq
+[tact](https://github.com/tact-lang/tree-sitter-tact) | unstable | `HFIJL` |   | @novusnota
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | unstable | `HFIJ ` |   | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) | unstable | `HFIJL` |   | @euclidianAce
+[templ](https://github.com/vrischmann/tree-sitter-templ) | unstable | `HF J ` |   | @vrischmann
+[tera](https://github.com/uncenter/tree-sitter-tera) | unstable | `H  J ` |   | @uncenter
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | unstable | `HFIJ ` |   | @MichaHoffmann
+[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | unstable | `HFIJ ` |   | @Porter
+[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` |   | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) | unstable | `HFIJL` |   | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | unstable | `HF JL` |   | @ahelwer, @susliko
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` |   | @Freed-Wu
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | unstable | `H    ` |   | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | unstable | `HFIJL` |   | @tk-shirasaka
+[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` |   | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` |   | @steelsojka
+[turtle](https://github.com/GordianDziwis/tree-sitter-turtle) | unstable | `HFIJL` |   | @GordianDziwis
+[twig](https://github.com/gbprod/tree-sitter-twig) | unstable | `H  J ` |   | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` |   | @steelsojka
+[typespec](https://github.com/happenslol/tree-sitter-typespec) | unstable | `H IJ ` |   | @happenslol
+[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | unstable | `HFIJ ` |   | @Teddytrombone
+[typst](https://github.com/uben0/tree-sitter-typst) | unstable | `HFIJ ` |   | @uben0, @RaafatTurki
+[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | unstable | `H  JL` |   | @ObserverOfTime
+[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | unstable | `HFIJL` |   | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `HF J ` |   | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) | unstable | `HFIJL` |   | @ColinKennedy
+[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | unstable | `HFIJL` |   | @amaanq
+[v](https://github.com/vlang/v-analyzer) | unstable | `HFIJL` |   | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) | unstable | `HF J ` |   | @Prince781
+[vento](https://github.com/ventojs/tree-sitter-vento) | unstable | `H  J ` |   | @wrapperup, @oscarotero
+[verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` |   | @zhangwwpeng
+[vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | unstable | `HF J ` |   | @jpt13653903
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | unstable | `H  J ` |   | @caarlos0
+[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | unstable | `HF JL` |   | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | unstable | `H  J ` |   | @clason
+[vrl](https://github.com/belltoy/tree-sitter-vrl) | unstable | `HFIJL` |   | @belltoy
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | unstable | `HFIJ ` |   | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` |   | @szebniok
+[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` |   | @theHamsta
+[wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` |   | @gshpychka, @MarkMcCulloh
+[wit](https://github.com/liamwh/tree-sitter-wit) | unstable | `HF J ` |   | @liamwh
+[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` |   | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` |   | @ObserverOfTime
+[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` |   | @ValdezFOmar
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | unstable | `HFIJL` |   | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) | unstable | `HFIJ ` |   | @Hubro
+[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | unstable | `HFIJL` |   | @Philipp-M, @amaanq
+[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | unstable | `H  J ` |   | @Freed-Wu
+[zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` |   | @amaanq
+[ziggy](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` |   | @rockorager
+[ziggy_schema](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` |   | @rockorager
 [^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gap]: GAP system
diff --git a/lua/nvim-treesitter/_meta/parsers.lua b/lua/nvim-treesitter/_meta/parsers.lua
index f3cb81b6f..9ec2f0b9a 100644
--- a/lua/nvim-treesitter/_meta/parsers.lua
+++ b/lua/nvim-treesitter/_meta/parsers.lua
@@ -18,7 +18,7 @@ error('Cannot require a meta file')
 ---Repo does not contain a `parser.c`; must be generated from grammar first
 ---@field generate? boolean
 ---
----Parser needs to be generated from `grammar.json` (generating from `grammar.js` requires npm)
+---Generate parser from `grammar.json` instead of `grammar.js` (default true)
 ---@field generate_from_json? boolean
 ---
 ---Parser repo is a local directory; overrides `url`, `revision`, and `branch`
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c208a2709..75a18d5a8 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -136,11 +136,13 @@ end
 ---@param compile_location string
 ---@return string? err
 local function do_generate(logger, repo, compile_location)
+  local from_json = true
+  if repo.generate_from_json == false then
+    from_json = false
+  end
+
   logger:info(
-    string.format(
-      'Generating parser.c from %s...',
-      repo.generate_from_json and 'grammar.json' or 'grammar.js'
-    )
+    string.format('Generating parser.c from %s...', from_json and 'grammar.json' or 'grammar.js')
   )
 
   local r = system({
@@ -148,7 +150,7 @@ local function do_generate(logger, repo, compile_location)
     'generate',
     '--abi',
     tostring(vim.treesitter.language_version),
-    repo.generate_from_json and 'src/grammar.json' or nil,
+    from_json and 'src/grammar.json' or nil,
   }, { cwd = compile_location })
   if r.code > 0 then
     return logger:error('Error during "tree-sitter generate": %s', r.stderr)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index bb3bb6f81..da5f1d9ec 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,6 @@ return {
   },
   angular = {
     install_info = {
-      generate_from_json = true,
       revision = '843525141575e397541e119698f0532755e959f6',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
@@ -37,7 +36,6 @@ return {
   },
   arduino = {
     install_info = {
-      generate_from_json = true,
       revision = '017696bdf47ca2b10948c5a511f9ab387722d0f3',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
@@ -55,7 +53,6 @@ return {
   },
   astro = {
     install_info = {
-      generate_from_json = true,
       revision = '213f6e6973d9b456c6e50e86f19f66877e7ef0ee',
       url = 'https://github.com/virchau13/tree-sitter-astro',
     },
@@ -241,7 +238,6 @@ return {
   },
   commonlisp = {
     install_info = {
-      generate_from_json = true,
       revision = '32323509b3d9fe96607d151c2da2c9009eb13a2f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-commonlisp',
     },
@@ -274,7 +270,6 @@ return {
   },
   cpp = {
     install_info = {
-      generate_from_json = true,
       revision = 'e5cea0ec884c5c3d2d1e41a741a66ce13da4d945',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
@@ -302,7 +297,6 @@ return {
   },
   cuda = {
     install_info = {
-      generate_from_json = true,
       revision = '014628ae8d2df391b88ddb9fa0260fd97f770829',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
@@ -542,7 +536,6 @@ return {
   },
   fennel = {
     install_info = {
-      generate_from_json = true,
       revision = 'de06b9ad366f0186080056109a8c3be980129538',
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
@@ -725,7 +718,6 @@ return {
   },
   glimmer_javascript = {
     install_info = {
-      generate_from_json = true,
       revision = '5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript',
     },
@@ -735,7 +727,6 @@ return {
   },
   glimmer_typescript = {
     install_info = {
-      generate_from_json = true,
       revision = '12d98944c1d5077b957cbdb90d663a7c4d50118c',
       url = 'https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript',
     },
@@ -745,7 +736,6 @@ return {
   },
   glsl = {
     install_info = {
-      generate_from_json = true,
       revision = '24a6c8ef698e4480fecf8340d771fbcb5de8fbb4',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-glsl',
     },
@@ -925,7 +915,6 @@ return {
   },
   hjson = {
     install_info = {
-      generate_from_json = true,
       revision = '02fa3b79b3ff9a296066da6277adfc3f26cbc9e0',
       url = 'https://github.com/winston0410/tree-sitter-hjson',
     },
@@ -935,7 +924,6 @@ return {
   },
   hlsl = {
     install_info = {
-      generate_from_json = true,
       revision = 'bab9111922d53d43668fabb61869bec51bbcb915',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hlsl',
     },
@@ -953,7 +941,6 @@ return {
   },
   hocon = {
     install_info = {
-      generate_from_json = true,
       revision = 'c390f10519ae69fdb03b3e5764f5592fb6924bcc',
       url = 'https://github.com/antosha417/tree-sitter-hocon',
     },
@@ -1056,7 +1043,6 @@ return {
   },
   ispc = {
     install_info = {
-      generate_from_json = true,
       revision = '9b2f9aec2106b94b4e099fe75e73ebd8ae707c04',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ispc',
     },
@@ -1152,7 +1138,6 @@ return {
   },
   jsonc = {
     install_info = {
-      generate_from_json = true,
       revision = '02b01653c8a1c198ae7287d566efa86a135b30d5',
       url = 'https://gitlab.com/WhyNotHugo/tree-sitter-jsonc',
     },
@@ -1329,7 +1314,6 @@ return {
   },
   luau = {
     install_info = {
-      generate_from_json = true,
       revision = 'a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-luau',
     },
@@ -1480,7 +1464,6 @@ return {
   },
   nqc = {
     install_info = {
-      generate_from_json = true,
       revision = '14e6da1627aaef21d2b2aa0c37d04269766dcc1d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-nqc',
     },
@@ -1497,7 +1480,6 @@ return {
   },
   objc = {
     install_info = {
-      generate_from_json = true,
       revision = '181a81b8f23a2d593e7ab4259981f50122909fda',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-objc',
     },
@@ -1576,7 +1558,6 @@ return {
   perl = {
     install_info = {
       branch = 'release',
-      generate_from_json = true,
       revision = 'ecd90bd8b381bcc7219fed4fe351903630e761c6',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
@@ -1606,7 +1587,6 @@ return {
   },
   phpdoc = {
     install_info = {
-      generate_from_json = true,
       revision = '03bb10330704b0b371b044e937d5cc7cd40b4999',
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
@@ -1632,7 +1612,6 @@ return {
   pod = {
     install_info = {
       branch = 'release',
-      generate_from_json = true,
       revision = '0bf8387987c21bf2f8ed41d2575a8f22b139687f',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
     },
@@ -1802,7 +1781,6 @@ return {
   },
   qmljs = {
     install_info = {
-      generate_from_json = true,
       revision = '0889da4632bba3ec6f39ef4102625654890c15c1',
       url = 'https://github.com/yuja/tree-sitter-qmljs',
     },
@@ -1829,7 +1807,7 @@ return {
   },
   racket = {
     install_info = {
-      revision = '5b211bf93021d1c45f39aa96898be9f794f087e4',
+      revision = 'e5096d233a7e9ceef78d7fe1a6d30ae39b3a731f',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 2,
@@ -1852,7 +1830,6 @@ return {
   },
   razor = {
     install_info = {
-      generate_from_json = true,
       revision = 'fe46ce5ea7d844e53d59bc96f2175d33691c61c5',
       url = 'https://github.com/tris203/tree-sitter-razor',
     },
@@ -1999,6 +1976,7 @@ return {
   scfg = {
     install_info = {
       generate = true,
+      generate_from_json = false,
       revision = '2f3709e7656fa2c443f92041c91a9f843f8cd625',
       url = 'https://github.com/rockorager/tree-sitter-scfg',
     },
@@ -2007,7 +1985,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = '63e25a4a84142ae7ee0ee01fe3a32c985ca16745',
+      revision = '8af654581a1c957b634321c46df7c2298f1561d9',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2033,7 +2011,6 @@ return {
   },
   slang = {
     install_info = {
-      generate_from_json = true,
       revision = '327b1b821c255867a4fb724c8eee48887e3d014b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
@@ -2075,7 +2052,6 @@ return {
   },
   snakemake = {
     install_info = {
-      generate_from_json = true,
       revision = 'f36c1587624d6d84376c82a357c20fc319cbf02c',
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
     },
@@ -2118,7 +2094,6 @@ return {
   },
   sparql = {
     install_info = {
-      generate_from_json = true,
       revision = 'd853661ca680d8ff7f8d800182d5782b61d0dd58',
       url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
     },
@@ -2128,7 +2103,6 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      generate_from_json = true,
       revision = 'b1ec2aa5091624e4729f0a771a6d631afebf1ed4',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
@@ -2153,7 +2127,6 @@ return {
   },
   starlark = {
     install_info = {
-      generate_from_json = true,
       revision = 'a453dbf3ba433db0e5ec621a38a7e59d72e4dc69',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-starlark',
     },
@@ -2170,7 +2143,6 @@ return {
   },
   styled = {
     install_info = {
-      generate_from_json = true,
       revision = '319cdcaa0346ba6db668a222d938e5c3569e2a51',
       url = 'https://github.com/mskelton/tree-sitter-styled',
     },
@@ -2204,7 +2176,6 @@ return {
   },
   svelte = {
     install_info = {
-      generate_from_json = true,
       revision = 'ae5199db47757f785e43a14b332118a5474de1a2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-svelte',
     },
@@ -2223,6 +2194,7 @@ return {
   swift = {
     install_info = {
       generate = true,
+      generate_from_json = false,
       revision = '99a5241ceac351a4af57bcc3571cef5064bde0a3',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
@@ -2288,7 +2260,6 @@ return {
   },
   templ = {
     install_info = {
-      generate_from_json = true,
       revision = 'bd52132b4ef7a028189f0e52d7c89e36a083c6fa',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
@@ -2363,7 +2334,6 @@ return {
   },
   toml = {
     install_info = {
-      generate_from_json = true,
       revision = '64b56832c2cffe41758f28e05c756a3a98d16f41',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-toml',
     },
@@ -2381,7 +2351,6 @@ return {
   },
   tsx = {
     install_info = {
-      generate_from_json = true,
       location = 'tsx',
       revision = '75b3874edb2dc714fb1fd77a32013d0f8699989f',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
@@ -2408,7 +2377,6 @@ return {
   },
   typescript = {
     install_info = {
-      generate_from_json = true,
       location = 'typescript',
       revision = '75b3874edb2dc714fb1fd77a32013d0f8699989f',
       url = 'https://github.com/tree-sitter/tree-sitter-typescript',
@@ -2558,7 +2526,6 @@ return {
   vue = {
     install_info = {
       branch = 'main',
-      generate_from_json = true,
       revision = '22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
     },
@@ -2576,7 +2543,6 @@ return {
   },
   wgsl_bevy = {
     install_info = {
-      generate_from_json = true,
       revision = '47c1818d245a6156a488c4c4d06e9336714bae9b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
     },
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 5a8b1c17b..2505f845b 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -16,8 +16,8 @@ table.sort(sorted_parsers, function(a, b)
 end)
 
 local generated_text = [[
-Language | Tier | Queries | Maintainer
--------- |:----:|:-------:| ----------
+Language | Tier | Queries | Node | Maintainer
+-------- |:----:|:-------:|:----:| ----------
 ]]
 local footnotes = ''
 
@@ -58,6 +58,11 @@ for _, v in ipairs(sorted_parsers) do
     .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
     .. '` | '
 
+  -- node
+  generated_text = generated_text
+    .. (p.install_info and p.install_info.generate_from_json == false and 'X' or ' ')
+    .. ' | '
+
   -- Maintainer
   generated_text = generated_text
     .. (p.maintainers and table.concat(p.maintainers, ', ') or '')

From 53d7118483e5c0d7bbe5548a2c158dc6fd35f699 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 27 Apr 2025 16:08:59 +0200
Subject: [PATCH 2338/2704] refactor(lua): fix some luals warnings

---
 .gitattributes                  |  3 +++
 lua/nvim-treesitter/config.lua  |  2 +-
 lua/nvim-treesitter/health.lua  |  7 +++----
 lua/nvim-treesitter/indent.lua  | 25 +++++++++++++------------
 lua/nvim-treesitter/install.lua |  8 +++-----
 lua/nvim-treesitter/locals.lua  | 15 ++++++++-------
 plugin/query_predicates.lua     | 16 ++++++++--------
 scripts/check-queries.lua       |  8 ++++----
 scripts/format-queries.lua      | 26 +++++++++++++-------------
 scripts/install-parsers.lua     |  2 +-
 scripts/update-parsers.lua      |  5 +++--
 scripts/update-readme.lua       |  5 +----
 12 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..3375d5ce2
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+runtime/queries/**/*.scm linguist-language=Tree-sitter-Query
+doc/*.txt linguist-documentation
+SUPPORTED_LANGUAGES.md linguist-generated
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 44c9b09c5..b7ffbf47c 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -13,7 +13,7 @@ local config = {
 }
 
 ---Setup call for users to override configuration configurations.
----@param user_data TSConfig|nil user configuration table
+---@param user_data TSConfig? user configuration table
 function M.setup(user_data)
   if user_data then
     if user_data.install_dir then
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 68b01bb35..8ca51814e 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -93,7 +93,8 @@ local function install_health()
   end
 
   health.start('OS Info')
-  for k, v in pairs(vim.uv.os_uname()) do
+  local osinfo = vim.uv.os_uname() ---@type table<string,string>
+  for k, v in pairs(osinfo) do
     health.info(k .. ': ' .. v)
   end
 
@@ -107,9 +108,7 @@ local function install_health()
   end
   if
     vim.iter(vim.api.nvim_list_runtime_paths()):any(function(p)
-      if installdir == vim.fs.normalize(p) .. '/' then
-        return true
-      end
+      return installdir == vim.fs.normalize(p) .. '/'
     end)
   then
     health.ok('is in runtimepath.')
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 03489f22e..00f85dea2 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -26,7 +26,7 @@ end
 ---@param root TSNode
 ---@param lnum integer
 ---@param col? integer
----@return TSNode
+---@return TSNode?
 local function get_first_node_at_line(root, lnum, col)
   col = col or get_indentcols_at_line(lnum)
   return root:descendant_for_range(lnum - 1, col, lnum - 1, col + 1)
@@ -35,7 +35,7 @@ end
 ---@param root TSNode
 ---@param lnum integer
 ---@param col? integer
----@return TSNode
+---@return TSNode?
 local function get_last_node_at_line(root, lnum, col)
   col = col or (#getline(lnum) - 1)
   return root:descendant_for_range(lnum - 1, col, lnum - 1, col + 1)
@@ -52,8 +52,8 @@ end
 ---@param bufnr integer
 ---@param node TSNode
 ---@param delimiter string
----@return TSNode|nil child
----@return boolean|nil is_end
+---@return TSNode? child
+---@return boolean? is_end
 local function find_delimiter(bufnr, node, delimiter)
   for child, _ in node:iter_children() do
     if child:type() == delimiter then
@@ -89,6 +89,7 @@ local function memoize(fn, hash_fn)
 end
 
 local get_indents = memoize(function(bufnr, root, lang)
+  ---@type table<string,table<string,table>>
   local map = {
     ['indent.auto'] = {},
     ['indent.begin'] = {},
@@ -154,19 +155,19 @@ function M.get_indent(lnum)
   end
 
   local q = get_indents(vim.api.nvim_get_current_buf(), root, lang_tree:lang())
-  local node ---@type TSNode
+  local node ---@type TSNode?
   if getline(lnum):find('^%s*$') then
     local prevlnum = vim.fn.prevnonblank(lnum)
     local indentcols = get_indentcols_at_line(prevlnum)
     local prevline = vim.trim(getline(prevlnum))
     -- The final position can be trailing spaces, which should not affect indentation
     node = get_last_node_at_line(root, prevlnum, indentcols + #prevline - 1)
-    if node:type():match('comment') then
+    if node and node:type():match('comment') then
       -- The final node we capture of the previous line can be a comment node, which should also be ignored
       -- Unless the last line is an entire line of comment, ignore the comment range and find the last node again
       local first_node = get_first_node_at_line(root, prevlnum, indentcols)
       local _, scol, _, _ = node:range()
-      if first_node:id() ~= node:id() then
+      if first_node and first_node:id() ~= node:id() then
         -- In case the last captured node is a trailing comment node, re-trim the string
         prevline = vim.trim(prevline:sub(1, scol - indentcols))
         -- Add back indent as indent of prevline was trimmed away
@@ -174,7 +175,7 @@ function M.get_indent(lnum)
         node = get_last_node_at_line(root, prevlnum, col)
       end
     end
-    if q['indent.end'][node:id()] then
+    if node and q['indent.end'][node:id()] then
       node = get_first_node_at_line(root, lnum)
     end
   else
@@ -192,7 +193,7 @@ function M.get_indent(lnum)
   -- tracks to ensure multiple indent levels are not applied for same line
   local is_processed_by_row = {} --- @type table<integer,boolean>
 
-  if q['indent.zero'][node:id()] then
+  if node and q['indent.zero'][node:id()] then
     return 0
   end
 
@@ -240,7 +241,7 @@ function M.get_indent(lnum)
     local is_in_err = false
     if should_process then
       local parent = node:parent()
-      is_in_err = parent and parent:has_error()
+      is_in_err = parent and parent:has_error() or false
     end
     if
       should_process
@@ -276,8 +277,8 @@ function M.get_indent(lnum)
       and (srow ~= lnum - 1)
     then
       local metadata = q['indent.align'][node:id()]
-      local o_delim_node, o_is_last_in_line ---@type TSNode|nil, boolean|nil
-      local c_delim_node, c_is_last_in_line ---@type TSNode|nil, boolean|nil, boolean|nil
+      local o_delim_node, o_is_last_in_line ---@type TSNode?, boolean?
+      local c_delim_node, c_is_last_in_line ---@type TSNode?, boolean?, boolean?
       local indent_is_absolute = false
       if metadata['indent.open_delimiter'] then
         o_delim_node, o_is_last_in_line =
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 75a18d5a8..b36a7ddee 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -434,7 +434,7 @@ local function install(languages, options, callback)
   end
 end
 
----@param languages string[]
+---@param languages string[]|string
 ---@param options? InstallOptions
 ---@param callback? fun(boolean)
 M.install = a.sync(function(languages, options, callback)
@@ -443,10 +443,8 @@ M.install = a.sync(function(languages, options, callback)
   install(languages, options, callback)
 end, 3)
 
----@class UpdateOptions
-
 ---@param languages? string[]|string
----@param _options? UpdateOptions
+---@param _options? table
 ---@param callback? function
 M.update = a.sync(function(languages, _options, callback)
   reload_parsers()
@@ -501,7 +499,7 @@ local function uninstall_lang(logger, lang, parser, queries)
 end
 
 ---@param languages string[]|string
----@param _options? UpdateOptions
+---@param _options? table
 ---@param _callback? fun()
 M.uninstall = a.sync(function(languages, _options, _callback)
   languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index 63b3d458c..b6d9c25b2 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -18,7 +18,7 @@ end
 ---@param node TSNode
 ---@return TSNode result
 local function get_root_for_node(node)
-  local parent = node
+  local parent = node ---@type TSNode?
   local result = node
 
   while parent ~= nil do
@@ -56,9 +56,9 @@ end
 -- Iterates over a nodes scopes moving from the bottom up
 ---@param node TSNode
 ---@param bufnr integer
----@return fun(): TSNode|nil
+---@return fun(): TSNode?
 function M.iter_scope_tree(node, bufnr)
-  local last_node = node
+  local last_node = node ---@type TSNode?
   return function()
     if not last_node then
       return
@@ -247,7 +247,7 @@ M.get_definitions_lookup_table = memoize(function(bufnr)
     return {}
   end
 
-  local result = {}
+  local result = {} ---@type TSLocal[]
   for _, definition in ipairs(definitions) do
     for _, node_entry in ipairs(M.get_local_nodes(definition)) do
       local scopes = M.get_definition_scopes(node_entry.node, bufnr, node_entry.scope)
@@ -279,9 +279,10 @@ end)
 ---@param node TSNode: the definition node
 ---@param bufnr integer: the buffer
 ---@param scope_type TSScope: the scope type
+---@return TSNode[]
 function M.get_definition_scopes(node, bufnr, scope_type)
   local scopes = {}
-  local scope_count = 1 ---@type integer|nil
+  local scope_count = 1 ---@type integer?
 
   -- Definition is valid for the containing scope
   -- and the containing scope of that scope
@@ -365,7 +366,7 @@ end
 ---@param node TSNode
 ---@param bufnr? integer
 ---@param allow_scope? boolean
----@return TSNode|nil
+---@return TSNode?
 function M.containing_scope(node, bufnr, allow_scope)
   bufnr = bufnr or api.nvim_get_current_buf()
   allow_scope = allow_scope == nil or allow_scope == true
@@ -375,7 +376,7 @@ function M.containing_scope(node, bufnr, allow_scope)
     return
   end
 
-  local iter_node = node
+  local iter_node = node ---@type TSNode?
 
   while iter_node ~= nil and not vim.tbl_contains(scopes, iter_node) do
     iter_node = iter_node:parent()
diff --git a/plugin/query_predicates.lua b/plugin/query_predicates.lua
index 1a500f591..6511d3104 100644
--- a/plugin/query_predicates.lua
+++ b/plugin/query_predicates.lua
@@ -1,8 +1,8 @@
 local query = vim.treesitter.query
 
 local predicates = {
-  ---@param match TSQueryMatch
-  ---@param pred string[]
+  ---@param match table<integer,TSNode[]>
+  ---@param pred any[]
   ---@param any boolean
   ---@return boolean
   ['kind-eq'] = function(match, pred, any)
@@ -26,16 +26,16 @@ local predicates = {
 
 -- register custom predicates (overwrite existing; needed for CI)
 
----@param match TSQueryMatch
----@param pred string[]
----@return boolean|nil
+---@param match table<integer,TSNode[]>
+---@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 TSQueryMatch
----@param pred string[]
----@return boolean|nil
+---@param match table<integer,TSNode[]>
+---@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/scripts/check-queries.lua b/scripts/check-queries.lua
index dddaf80d7..66b947914 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -7,13 +7,13 @@ local parsers = #_G.arg > 0 and { unpack(_G.arg) }
   or require('nvim-treesitter.config').installed_parsers()
 
 -- Extract captures from documentation for validation
-local captures = {}
+local captures = {} ---@type table[]
 do
   local current_query ---@type string
 
   for line in io.lines('CONTRIBUTING.md') do
     if vim.startswith(line, '### ') then
-      current_query = line:sub(5):lower()
+      current_query = line:sub(5):lower() ---@type string
     elseif vim.startswith(line, '@') and current_query then
       if not captures[current_query] then
         captures[current_query] = {}
@@ -24,14 +24,14 @@ do
   end
 
   -- Complete captures for injections.
-  for _, lang in pairs(vim.tbl_keys(configs)) do
+  for lang, _ in pairs(configs) do
     table.insert(captures['injections'], lang)
   end
 end
 
 -- Check queries for each installed parser in parsers
 local errors = {} ---@type string[]
-local timings = {} ---@type number[][]
+local timings = {} ---@type { duration: number, lang: string, query_type: string }[]
 do
   print('::group::Check parsers')
 
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
index c7362687e..bc2cf70ce 100755
--- a/scripts/format-queries.lua
+++ b/scripts/format-queries.lua
@@ -351,7 +351,7 @@ end
 ---@param bufnr integer
 ---@param node TSNode
 ---@param lines string[]
----@param q table<string, vim.treesitter.query.TSMetadata>
+---@param q table<string, table[]>
 ---@param level integer
 local function iter(bufnr, node, lines, q, level)
   --- Sometimes 2 queries apply append twice. This is to prevent the case from happening
@@ -430,19 +430,19 @@ end
 ---@param queries string
 local function format(bufnr, queries)
   local lines = { '' }
-  -- stylua: ignore
+  ---@type table<string,table<string,table>>
   local map = {
-    ['format.ignore'] = {},           -- Ignore the node and its children
-    ['format.indent.begin'] = {},     -- +1 shiftwidth for all nodes after this
-    ['format.indent.dedent'] = {},    -- -1 shiftwidth for this line only
-    ['format.prepend-space'] = {},    -- Prepend a space before inserting the node
-    ['format.prepend-newline'] = {},  -- Prepend a \n before inserting the node
-    ['format.append-space'] = {},     -- Append a space after inserting the node
-    ['format.append-newline'] = {},   -- Append a newline after inserting the node
-    ['format.cancel-append'] = {},    -- Cancel any `@format.append-*` applied to the node
-    ['format.cancel-prepend'] = {},   -- Cancel any `@format.prepend-*` applied to the node
-    ['format.replace'] = {},          -- Dedicated capture used to store results of `(#gsub!)`
-    ['format.remove'] = {},           -- Do not add the syntax node to the result, i.e. brackets [], parens ()
+    ['format.ignore'] = {}, -- Ignore the node and its children
+    ['format.indent.begin'] = {}, -- +1 shiftwidth for all nodes after this
+    ['format.indent.dedent'] = {}, -- -1 shiftwidth for this line only
+    ['format.prepend-space'] = {}, -- Prepend a space before inserting the node
+    ['format.prepend-newline'] = {}, -- Prepend a \n before inserting the node
+    ['format.append-space'] = {}, -- Append a space after inserting the node
+    ['format.append-newline'] = {}, -- Append a newline after inserting the node
+    ['format.cancel-append'] = {}, -- Cancel any `@format.append-*` applied to the node
+    ['format.cancel-prepend'] = {}, -- Cancel any `@format.prepend-*` applied to the node
+    ['format.replace'] = {}, -- Dedicated capture used to store results of `(#gsub!)`
+    ['format.remove'] = {}, -- Do not add the syntax node to the result, i.e. brackets [], parens ()
   }
   local root = ts.get_parser(bufnr, 'query'):parse(true)[1]:root()
   local query = ts.query.parse('query', queries)
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index cb7389e19..1d9448ca7 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -12,7 +12,7 @@ for i = 1, #_G.arg do
   elseif _G.arg[i]:find('^%-%-max%-jobs') then
     max_jobs = _G.arg[i]:match('=(%d+)')
   else
-    parsers[#parsers + 1] = _G.arg[i]
+    parsers[#parsers + 1] = _G.arg[i] ---@type string
   end
 end
 
diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index 83f54e9da..70055c81d 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -55,8 +55,9 @@ if #updates > 0 then
   local update_list = table.concat(updates, ', ')
   print(string.format('\nUpdated parsers: %s', update_list))
   -- pass list to workflow
-  if os.getenv('GITHUB_ENV') then
-    local env = io.open(os.getenv('GITHUB_ENV'), 'a')
+  local gh_env = os.getenv('GITHUB_ENV')
+  if gh_env then
+    local env = assert(io.open(gh_env, 'a'))
     env:write(string.format('UPDATED_PARSERS=%s\n', update_list))
     env:close()
   end
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 2505f845b..37eae6826 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -3,11 +3,8 @@ vim.opt.runtimepath:append('.')
 local util = require('nvim-treesitter.util')
 local parsers = require('nvim-treesitter.parsers')
 local tiers = require('nvim-treesitter.config').tiers
----@class Parser
----@field name string
----@field parser ParserInfo
 
-local sorted_parsers = {}
+local sorted_parsers = {} ---@type { name: string, parser: ParserInfo }[]
 for k, v in pairs(parsers) do
   table.insert(sorted_parsers, { name = k, parser = v })
 end

From 44bb06bc123f2c90acbe79035cb19a8e89674d7d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 30 Apr 2025 18:11:16 +0200
Subject: [PATCH 2339/2704] chore: remove lockfile and update script

`main` branch and `parsers.lua` is the record of truth now
---
 lockfile.json                | 956 -----------------------------------
 scripts/convert-lockfile.lua |  22 -
 2 files changed, 978 deletions(-)
 delete mode 100644 lockfile.json
 delete mode 100755 scripts/convert-lockfile.lua

diff --git a/lockfile.json b/lockfile.json
deleted file mode 100644
index 4967a911c..000000000
--- a/lockfile.json
+++ /dev/null
@@ -1,956 +0,0 @@
-{
-  "ada": {
-    "revision": "e8e2515465cc2d7c444498e68bdb9f1d86767f95"
-  },
-  "agda": {
-    "revision": "b9b32fa042c2952a7bfca86847ea325e44ccc897"
-  },
-  "angular": {
-    "revision": "843525141575e397541e119698f0532755e959f6"
-  },
-  "apex": {
-    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
-  },
-  "arduino": {
-    "revision": "017696bdf47ca2b10948c5a511f9ab387722d0f3"
-  },
-  "asm": {
-    "revision": "04962e15f6b464cf1d75eada59506dc25090e186"
-  },
-  "astro": {
-    "revision": "0ad33e32ae9726e151d16ca20ba3e507ff65e01f"
-  },
-  "authzed": {
-    "revision": "1dec7e1af96c56924e3322cd85fdce15d0a31d00"
-  },
-  "awk": {
-    "revision": "34bbdc7cce8e803096f47b625979e34c1be38127"
-  },
-  "bash": {
-    "revision": "0c46d792d54c536be5ff7eb18eb95c70fccdb232"
-  },
-  "bass": {
-    "revision": "28dc7059722be090d04cd751aed915b2fee2f89a"
-  },
-  "beancount": {
-    "revision": "9bc460a05b5f096d69568b5fb36105032ff4ff97"
-  },
-  "bibtex": {
-    "revision": "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"
-  },
-  "bicep": {
-    "revision": "bff59884307c0ab009bd5e81afd9324b46a6c0f9"
-  },
-  "bitbake": {
-    "revision": "a5d04fdb5a69a02b8fa8eb5525a60dfb5309b73b"
-  },
-  "blade": {
-    "revision": "bcdc4b01827cac21205f7453e9be02f906943128"
-  },
-  "blueprint": {
-    "revision": "60ba73739c6083c693d86a1a7cf039c07eb4ed59"
-  },
-  "bp": {
-    "revision": "16c43068ec30828c5aed11e87262c56f36782595"
-  },
-  "brightscript": {
-    "revision": "48ce1687125c6dfefcc7a1bef19fa0f0f00426cc"
-  },
-  "c": {
-    "revision": "2a265d69a4caf57108a73ad2ed1e6922dd2f998c"
-  },
-  "c_sharp": {
-    "revision": "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7"
-  },
-  "caddy": {
-    "revision": "2686186edb61be47960431c93a204fb249681360"
-  },
-  "cairo": {
-    "revision": "6238f609bea233040fe927858156dee5515a0745"
-  },
-  "capnp": {
-    "revision": "7b0883c03e5edd34ef7bcf703194204299d7099f"
-  },
-  "chatito": {
-    "revision": "b4cbe9ab7672d5106e9550d8413835395a1be362"
-  },
-  "circom": {
-    "revision": "02150524228b1e6afef96949f2d6b7cc0aaf999e"
-  },
-  "clojure": {
-    "revision": "f4236d4da8aa92bc105d9c118746474c608e6af7"
-  },
-  "cmake": {
-    "revision": "fe48221d4d9842d916d66b5e71ab3c6307ec28b3"
-  },
-  "comment": {
-    "revision": "3555706cef8b98d3e4c7379d7260548ff03ad363"
-  },
-  "commonlisp": {
-    "revision": "32323509b3d9fe96607d151c2da2c9009eb13a2f"
-  },
-  "cooklang": {
-    "revision": "4ebe237c1cf64cf3826fc249e9ec0988fe07e58e"
-  },
-  "corn": {
-    "revision": "464654742cbfd3a3de560aba120998f1d5dfa844"
-  },
-  "cpon": {
-    "revision": "594289eadfec719198e560f9d7fd243c4db678d5"
-  },
-  "cpp": {
-    "revision": "e5cea0ec884c5c3d2d1e41a741a66ce13da4d945"
-  },
-  "css": {
-    "revision": "6e327db434fec0ee90f006697782e43ec855adf5"
-  },
-  "csv": {
-    "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
-  },
-  "cuda": {
-    "revision": "014628ae8d2df391b88ddb9fa0260fd97f770829"
-  },
-  "cue": {
-    "revision": "770737bcff2c4aa3f624d439e32b07dbb07102d3"
-  },
-  "cylc": {
-    "revision": "8b895c278f98d05e67997f5e3a43fb5531933023"
-  },
-  "d": {
-    "revision": "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"
-  },
-  "dart": {
-    "revision": "80e23c07b64494f7e21090bb3450223ef0b192f4"
-  },
-  "desktop": {
-    "revision": "6d66eea37afa1d6bc1e25ef457113743df42416d"
-  },
-  "devicetree": {
-    "revision": "16f640f3c59117c9e749d581634afdb00e004f4c"
-  },
-  "dhall": {
-    "revision": "4a6c08abfb54827db4e722d6cdca81b093898988"
-  },
-  "diff": {
-    "revision": "e42b8def4f75633568f1aecfe01817bf15164928"
-  },
-  "disassembly": {
-    "revision": "0229c0211dba909c5d45129ac784a3f4d49c243a"
-  },
-  "djot": {
-    "revision": "eb31845d59b9ee8c1b2098e78e9ca72004bd1579"
-  },
-  "dockerfile": {
-    "revision": "971acdd908568b4531b0ba28a445bf0bb720aba5"
-  },
-  "dot": {
-    "revision": "9ab85550c896d8b294d9b9ca1e30698736f08cea"
-  },
-  "doxygen": {
-    "revision": "ccd998f378c3f9345ea4eeb223f56d7b84d16687"
-  },
-  "dtd": {
-    "revision": "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"
-  },
-  "earthfile": {
-    "revision": "ae378d9d1306e9a967698516041f6f8803db5592"
-  },
-  "ebnf": {
-    "revision": "8e635b0b723c620774dfb8abf382a7f531894b40"
-  },
-  "editorconfig": {
-    "revision": "3f2b371537355f6e53cc3af37f79ba450efb5132"
-  },
-  "eds": {
-    "revision": "26d529e6cfecde391a03c21d1474eb51e0285805"
-  },
-  "eex": {
-    "revision": "f742f2fe327463335e8671a87c0b9b396905d1d1"
-  },
-  "elixir": {
-    "revision": "450a8194f5a66561135962cfc8d7545a27b61c4c"
-  },
-  "elm": {
-    "revision": "e34bdc5c512918628b05b48e633f711123204e45"
-  },
-  "elsa": {
-    "revision": "0a66b2b3f3c1915e67ad2ef9f7dbd2a84820d9d7"
-  },
-  "elvish": {
-    "revision": "5e7210d945425b77f82cbaebc5af4dd3e1ad40f5"
-  },
-  "embedded_template": {
-    "revision": "8495d106154741e6d35d37064f864758ece75de6"
-  },
-  "enforce": {
-    "revision": "aedd0bbab9dcc9caec9cc4e32bd303e86509522b"
-  },
-  "erlang": {
-    "revision": "416ca60d7d2a824c0d346163541153e230710780"
-  },
-  "facility": {
-    "revision": "e4bfd3e960de9f4b4648acb1c92e9b95b47d8cfb"
-  },
-  "faust": {
-    "revision": "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"
-  },
-  "fennel": {
-    "revision": "cfbfa478dc2dbef267ee94ae4323d9c886f45e94"
-  },
-  "fidl": {
-    "revision": "0a8910f293268e27ff554357c229ba172b0eaed2"
-  },
-  "firrtl": {
-    "revision": "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5"
-  },
-  "fish": {
-    "revision": "70640c0696abde32622afc43291a385681afbd32"
-  },
-  "foam": {
-    "revision": "f08bb76892b93e5b23c45ac3bd6b1eea5df323cc"
-  },
-  "forth": {
-    "revision": "90189238385cf636b9ee99ce548b9e5b5e569d48"
-  },
-  "fortran": {
-    "revision": "d738334e4a21866a1ab81fb3f27f9b0b2ad2e515"
-  },
-  "fsh": {
-    "revision": "fad2e175099a45efbc98f000cc196d3674cc45e0"
-  },
-  "fsharp": {
-    "revision": "02929f084726db969e5b916d144436f248146824"
-  },
-  "func": {
-    "revision": "f780ca55e65e7d7360d0229331763e16c452fc98"
-  },
-  "fusion": {
-    "revision": "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"
-  },
-  "gap": {
-    "revision": "7db79590d2f8b0e0246008ecfd569b4bfca587a9"
-  },
-  "gaptst": {
-    "revision": "69086d7627c03e1f4baf766bcef14c60d9e92331"
-  },
-  "gdscript": {
-    "revision": "48b49330888a4669b48619b211cc8da573827725"
-  },
-  "gdshader": {
-    "revision": "ffd9f958df13cae04593781d7d2562295a872455"
-  },
-  "git_config": {
-    "revision": "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"
-  },
-  "git_rebase": {
-    "revision": "bff4b66b44b020d918d67e2828eada1974a966aa"
-  },
-  "gitattributes": {
-    "revision": "5425944fd61bf2b3bad2c17c2dc9f53172b0f01d"
-  },
-  "gitcommit": {
-    "revision": "a716678c0f00645fed1e6f1d0eb221481dbd6f6d"
-  },
-  "gitignore": {
-    "revision": "f4685bf11ac466dd278449bcfe5fd014e94aa504"
-  },
-  "gleam": {
-    "revision": "99ec4101504452c488b7c835fb65cfef75b090b7"
-  },
-  "glimmer": {
-    "revision": "da605af8c5999b43e6839b575eae5e6cafabb06f"
-  },
-  "glimmer_javascript": {
-    "revision": "5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87"
-  },
-  "glimmer_typescript": {
-    "revision": "12d98944c1d5077b957cbdb90d663a7c4d50118c"
-  },
-  "glsl": {
-    "revision": "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"
-  },
-  "gn": {
-    "revision": "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05"
-  },
-  "gnuplot": {
-    "revision": "8923c1e38b9634a688a6c0dce7c18c8ffb823e79"
-  },
-  "go": {
-    "revision": "5e73f476efafe5c768eda19bbe877f188ded6144"
-  },
-  "goctl": {
-    "revision": "49c43532689fe1f53e8b9e009d0521cab02c432b"
-  },
-  "godot_resource": {
-    "revision": "91c55fdf325a832659e59cdf4a02bfe8a423f14c"
-  },
-  "gomod": {
-    "revision": "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c"
-  },
-  "gosum": {
-    "revision": "e2ac513b2240c7ff1069ae33b2df29ce90777c11"
-  },
-  "gotmpl": {
-    "revision": "5f19a36bb1eebb30454e277b222b278ceafed0dd"
-  },
-  "gowork": {
-    "revision": "949a8a470559543857a62102c84700d291fc984c"
-  },
-  "gpg": {
-    "revision": "63e80cfe1302da9f9c7ee8d9df295f47d7d181bf"
-  },
-  "graphql": {
-    "revision": "5e66e961eee421786bdda8495ed1db045e06b5fe"
-  },
-  "gren": {
-    "revision": "06389ece5bc7344ed3931dc516bb609d8864dd2a"
-  },
-  "groovy": {
-    "revision": "86911590a8e46d71301c66468e5620d9faa5b6af"
-  },
-  "gstlaunch": {
-    "revision": "549aef253fd38a53995cda1bf55c501174372bf7"
-  },
-  "hack": {
-    "revision": "bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0"
-  },
-  "hare": {
-    "revision": "4af5d82cf9ec39f67cb1db5b7a9269d337406592"
-  },
-  "haskell": {
-    "revision": "0975ef72fc3c47b530309ca93937d7d143523628"
-  },
-  "haskell_persistent": {
-    "revision": "577259b4068b2c281c9ebf94c109bd50a74d5857"
-  },
-  "hcl": {
-    "revision": "de10d494dbd6b71cdf07a678fecbf404dbfe4398"
-  },
-  "heex": {
-    "revision": "008626a3fad379d17c81d5ed576edd9bd7a4fbf7"
-  },
-  "helm": {
-    "revision": "5f19a36bb1eebb30454e277b222b278ceafed0dd"
-  },
-  "hjson": {
-    "revision": "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"
-  },
-  "hlsl": {
-    "revision": "bab9111922d53d43668fabb61869bec51bbcb915"
-  },
-  "hlsplaylist": {
-    "revision": "3bfda9271e3adb08d35f47a2102fe957009e1c55"
-  },
-  "hocon": {
-    "revision": "c390f10519ae69fdb03b3e5764f5592fb6924bcc"
-  },
-  "hoon": {
-    "revision": "1545137aadcc63660c47db9ad98d02fa602655d0"
-  },
-  "html": {
-    "revision": "cbb91a0ff3621245e890d1c50cc811bffb77a26b"
-  },
-  "htmldjango": {
-    "revision": "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"
-  },
-  "http": {
-    "revision": "db8b4398de90b6d0b6c780aba96aaa2cd8e9202c"
-  },
-  "hurl": {
-    "revision": "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"
-  },
-  "hyprlang": {
-    "revision": "d719158abe537b1916daaea6fa03287089f0b601"
-  },
-  "idl": {
-    "revision": "b14e7971cfbd64fa0ebcdeaa4dfbb3cb0bfabd7c"
-  },
-  "idris": {
-    "revision": "c56a25cf57c68ff929356db25505c1cc4c7820f6"
-  },
-  "ini": {
-    "revision": "32b31863f222bf22eb43b07d4e9be8017e36fb31"
-  },
-  "inko": {
-    "revision": "f58a87ac4dc6a7955c64c9e4408fbd693e804686"
-  },
-  "ipkg": {
-    "revision": "8d3e9782f2d091d0cd39c13bfb3068db0c675960"
-  },
-  "ispc": {
-    "revision": "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"
-  },
-  "janet_simple": {
-    "revision": "b08b402207fba0037d5152ce7c521351147f4388"
-  },
-  "java": {
-    "revision": "a7db5227ec40fcfe94489559d8c9bc7c8181e25a"
-  },
-  "javadoc": {
-    "revision": "330cc9cb4f33545f7bfce6c3b6aa77fe6db1b537"
-  },
-  "javascript": {
-    "revision": "6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c"
-  },
-  "jinja": {
-    "revision": "9af6ce9380fabd3d5b19d0254b8c8936e879c471"
-  },
-  "jinja_inline": {
-    "revision": "9af6ce9380fabd3d5b19d0254b8c8936e879c471"
-  },
-  "jq": {
-    "revision": "13990f530e8e6709b7978503da9bc8701d366791"
-  },
-  "jsdoc": {
-    "revision": "a417db5dbdd869fccb6a8b75ec04459e1d4ccd2c"
-  },
-  "json": {
-    "revision": "46aa487b3ade14b7b05ef92507fdaa3915a662a3"
-  },
-  "json5": {
-    "revision": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd"
-  },
-  "jsonc": {
-    "revision": "02b01653c8a1c198ae7287d566efa86a135b30d5"
-  },
-  "jsonnet": {
-    "revision": "ddd075f1939aed8147b7aa67f042eda3fce22790"
-  },
-  "julia": {
-    "revision": "12a3aede757bc7fbdfb1909507c7a6fddd31df37"
-  },
-  "just": {
-    "revision": "bb0c898a80644de438e6efe5d88d30bf092935cd"
-  },
-  "kcl": {
-    "revision": "b0b2eb38009e04035a6e266c7e11e541f3caab7c"
-  },
-  "kconfig": {
-    "revision": "9ac99fe4c0c27a35dc6f757cef534c646e944881"
-  },
-  "kdl": {
-    "revision": "b37e3d58e5c5cf8d739b315d6114e02d42e66664"
-  },
-  "kotlin": {
-    "revision": "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"
-  },
-  "koto": {
-    "revision": "46770abba021e2ddd2c51d9fa3087fd1ab6b2aea"
-  },
-  "kusto": {
-    "revision": "8353a1296607d6ba33db7c7e312226e5fc83e8ce"
-  },
-  "lalrpop": {
-    "revision": "8d38e9755c05d37df8a24dadb0fc64f6588ac188"
-  },
-  "latex": {
-    "revision": "7b06f6ed394308e7407a1703d2724128c45fc9d7"
-  },
-  "ledger": {
-    "revision": "d313153eef68c557ba4538b20de2d0e92f3ef6f8"
-  },
-  "leo": {
-    "revision": "6bc5564917edacd070afc4d33cf5e2e677831ea9"
-  },
-  "linkerscript": {
-    "revision": "f99011a3554213b654985a4b0a65b3b032ec4621"
-  },
-  "liquid": {
-    "revision": "d269f4d52cd08f6cbc6636ee23cc30a9f6c32e42"
-  },
-  "liquidsoap": {
-    "revision": "8e51fa63ddb93ac179d4e34a311d3d3f03780b42"
-  },
-  "llvm": {
-    "revision": "c14cb839003348692158b845db9edda201374548"
-  },
-  "lua": {
-    "revision": "db16e76558122e834ee214c8dc755b4a3edc82a9"
-  },
-  "luadoc": {
-    "revision": "873612aadd3f684dd4e631bdf42ea8990c57634e"
-  },
-  "luap": {
-    "revision": "c134aaec6acf4fa95fe4aa0dc9aba3eacdbbe55a"
-  },
-  "luau": {
-    "revision": "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f"
-  },
-  "m68k": {
-    "revision": "e128454c2210c0e0c10b68fe45ddb8fee80182a3"
-  },
-  "make": {
-    "revision": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"
-  },
-  "markdown": {
-    "revision": "413285231ce8fa8b11e7074bbe265b48aa7277f9"
-  },
-  "markdown_inline": {
-    "revision": "413285231ce8fa8b11e7074bbe265b48aa7277f9"
-  },
-  "matlab": {
-    "revision": "bbf1b3f0bd7417c1efb8958fe95be3d0d540207a"
-  },
-  "menhir": {
-    "revision": "be8866a6bcc2b563ab0de895af69daeffa88fe70"
-  },
-  "mermaid": {
-    "revision": "90ae195b31933ceb9d079abfa8a3ad0a36fee4cc"
-  },
-  "meson": {
-    "revision": "a56af662e8540412fed5e40cc20435b2b9a20502"
-  },
-  "mlir": {
-    "revision": "922cbb97f3d20044e6b4362b3d7af5e530ed8f34"
-  },
-  "muttrc": {
-    "revision": "173b0ab53a9c07962c9777189c4c70e90f1c1837"
-  },
-  "nasm": {
-    "revision": "d1b3638d017f2a8585e26dcfc66fe1df94185e30"
-  },
-  "nginx": {
-    "revision": "989da760be05a3334af3ec88705cbf57e6a9c41d"
-  },
-  "nickel": {
-    "revision": "25464b33522c3f609fa512aa9651707c0b66d48b"
-  },
-  "nim": {
-    "revision": "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7"
-  },
-  "nim_format_string": {
-    "revision": "d45f75022d147cda056e98bfba68222c9c8eca3a"
-  },
-  "ninja": {
-    "revision": "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"
-  },
-  "nix": {
-    "revision": "cfc53fd287d23ab7281440a8526c73542984669b"
-  },
-  "nqc": {
-    "revision": "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"
-  },
-  "nu": {
-    "revision": "d5c71a10b4d1b02e38967b05f8de70e847448dd1"
-  },
-  "objc": {
-    "revision": "181a81b8f23a2d593e7ab4259981f50122909fda"
-  },
-  "objdump": {
-    "revision": "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"
-  },
-  "ocaml": {
-    "revision": "91708deb10cb4fe68ab3c50891426b9967dbf35a"
-  },
-  "ocaml_interface": {
-    "revision": "91708deb10cb4fe68ab3c50891426b9967dbf35a"
-  },
-  "ocamllex": {
-    "revision": "c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f"
-  },
-  "odin": {
-    "revision": "d2ca8efb4487e156a60d5bd6db2598b872629403"
-  },
-  "pascal": {
-    "revision": "78426d96bde7114af979e314283e45d087603428"
-  },
-  "passwd": {
-    "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
-  },
-  "pem": {
-    "revision": "1d16b8e063fdf4385e389096c4bc4999eaaef05f"
-  },
-  "perl": {
-    "revision": "ecd90bd8b381bcc7219fed4fe351903630e761c6"
-  },
-  "php": {
-    "revision": "576a56fa7f8b68c91524cdd211eb2ffc43e7bb11"
-  },
-  "php_only": {
-    "revision": "576a56fa7f8b68c91524cdd211eb2ffc43e7bb11"
-  },
-  "phpdoc": {
-    "revision": "fe3202e468bc17332bec8969f2b50ff1f1da3a46"
-  },
-  "pioasm": {
-    "revision": "afece58efdb30440bddd151ef1347fa8d6f744a9"
-  },
-  "po": {
-    "revision": "bd860a0f57f697162bf28e576674be9c1500db5e"
-  },
-  "pod": {
-    "revision": "0bf8387987c21bf2f8ed41d2575a8f22b139687f"
-  },
-  "poe_filter": {
-    "revision": "2902dc45439125b9386812c1089a8e9b5f71c4ab"
-  },
-  "pony": {
-    "revision": "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"
-  },
-  "powershell": {
-    "revision": "66d5e61126989c0aca57ff77d19b2064919b51e1"
-  },
-  "printf": {
-    "revision": "df6b69967db7d74ab338a86a9ab45c0966c5ee3c"
-  },
-  "prisma": {
-    "revision": "73f39a6d5401cfdcd143951e499336cf5ab2ffaa"
-  },
-  "problog": {
-    "revision": "d8d415f6a1cf80ca138524bcc395810b176d40fa"
-  },
-  "prolog": {
-    "revision": "d8d415f6a1cf80ca138524bcc395810b176d40fa"
-  },
-  "promql": {
-    "revision": "77625d78eebc3ffc44d114a07b2f348dff3061b0"
-  },
-  "properties": {
-    "revision": "579b62f5ad8d96c2bb331f07d1408c92767531d9"
-  },
-  "proto": {
-    "revision": "e9f6b43f6844bd2189b50a422d4e2094313f6aa3"
-  },
-  "prql": {
-    "revision": "09e158cd3650581c0af4c49c2e5b10c4834c8646"
-  },
-  "psv": {
-    "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
-  },
-  "pug": {
-    "revision": "13e9195370172c86a8b88184cc358b23b677cc46"
-  },
-  "puppet": {
-    "revision": "15f192929b7d317f5914de2b4accd37b349182a6"
-  },
-  "purescript": {
-    "revision": "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"
-  },
-  "pymanifest": {
-    "revision": "be062582956165019d3253794b4d712f66dfeaaa"
-  },
-  "python": {
-    "revision": "710796b8b877a970297106e5bbc8e2afa47f86ec"
-  },
-  "ql": {
-    "revision": "1fd627a4e8bff8c24c11987474bd33112bead857"
-  },
-  "qmldir": {
-    "revision": "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"
-  },
-  "qmljs": {
-    "revision": "0889da4632bba3ec6f39ef4102625654890c15c1"
-  },
-  "query": {
-    "revision": "930202c2a80965a7a9ca018b5b2a08b25dfa7f12"
-  },
-  "r": {
-    "revision": "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a"
-  },
-  "racket": {
-    "revision": "5b211bf93021d1c45f39aa96898be9f794f087e4"
-  },
-  "ralph": {
-    "revision": "f6d81bf7a4599c77388035439cf5801cd461ff77"
-  },
-  "rasi": {
-    "revision": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa"
-  },
-  "razor": {
-    "revision": "fe46ce5ea7d844e53d59bc96f2175d33691c61c5"
-  },
-  "rbs": {
-    "revision": "de893b166476205b09e79cd3689f95831269579a"
-  },
-  "re2c": {
-    "revision": "c18a3c2f4b6665e35b7e50d6048ea3cff770c572"
-  },
-  "readline": {
-    "revision": "74addc90fc539d31d413c0c7cf7581997a7fa46e"
-  },
-  "regex": {
-    "revision": "b638d29335ef41215b86732dd51be34c701ef683"
-  },
-  "rego": {
-    "revision": "20b5a5958c837bc9f74b231022a68a594a313f6d"
-  },
-  "requirements": {
-    "revision": "728910099ddea7f1f94ea95a35a70d1ea76a1639"
-  },
-  "rescript": {
-    "revision": "4606cd81c4c31d1d02390fee530858323410a74c"
-  },
-  "rnoweb": {
-    "revision": "1a74dc0ed731ad07db39f063e2c5a6fe528cae7f"
-  },
-  "robot": {
-    "revision": "17c2300e91fc9da4ba14c16558bf4292941dc074"
-  },
-  "robots": {
-    "revision": "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"
-  },
-  "roc": {
-    "revision": "0b1afe88161cbd81f5ddea1bb4fa786314ed49a7"
-  },
-  "ron": {
-    "revision": "78938553b93075e638035f624973083451b29055"
-  },
-  "rst": {
-    "revision": "4e562e1598b95b93db4f3f64fe40ddefbc677a15"
-  },
-  "ruby": {
-    "revision": "89bd7a8e5450cb6a942418a619d30469f259e5d6"
-  },
-  "runescript": {
-    "revision": "cf85bbd5da0c5ad243301d889c7f84d790a4cae4"
-  },
-  "rust": {
-    "revision": "e86119bdb4968b9799f6a014ca2401c178d54b5f"
-  },
-  "scala": {
-    "revision": "c1189954df854977c3a52003ca8a247c5f4729ba"
-  },
-  "scfg": {
-    "revision": "2f3709e7656fa2c443f92041c91a9f843f8cd625"
-  },
-  "scheme": {
-    "revision": "63e25a4a84142ae7ee0ee01fe3a32c985ca16745"
-  },
-  "scss": {
-    "revision": "c478c6868648eff49eb04a4df90d703dc45b312a"
-  },
-  "sflog": {
-    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
-  },
-  "slang": {
-    "revision": "3ed23c04a412a0559162d9cadf96dfff7cb36079"
-  },
-  "slim": {
-    "revision": "546e3aa1af8a3b355c7734efccd9a759ffc0b43a"
-  },
-  "slint": {
-    "revision": "f11da7e62051ba8b9d4faa299c26de8aeedfc1cd"
-  },
-  "smali": {
-    "revision": "fdfa6a1febc43c7467aa7e937b87b607956f2346"
-  },
-  "smithy": {
-    "revision": "fa898ac0885d1da9a253695c3e0e91f5efc587cd"
-  },
-  "snakemake": {
-    "revision": "f36c1587624d6d84376c82a357c20fc319cbf02c"
-  },
-  "solidity": {
-    "revision": "d38dcd0b58b223c43e3f9265914fb3167dc624c6"
-  },
-  "soql": {
-    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
-  },
-  "sosl": {
-    "revision": "3597575a429766dd7ecce9f5bb97f6fec4419d5d"
-  },
-  "sourcepawn": {
-    "revision": "f2af8d0dc14c6790130cceb2a20027eb41a8297c"
-  },
-  "sparql": {
-    "revision": "d853661ca680d8ff7f8d800182d5782b61d0dd58"
-  },
-  "sql": {
-    "revision": "b9d109588d5b5ed986c857464830c2f0bef53f18"
-  },
-  "squirrel": {
-    "revision": "072c969749e66f000dba35a33c387650e203e96e"
-  },
-  "ssh_config": {
-    "revision": "0dd3c7e9f301758f6c69a6efde43d3048deb4d8a"
-  },
-  "starlark": {
-    "revision": "a453dbf3ba433db0e5ec621a38a7e59d72e4dc69"
-  },
-  "strace": {
-    "revision": "d819cdd5dbe455bd3c859193633c8d91c0df7c36"
-  },
-  "styled": {
-    "revision": "319cdcaa0346ba6db668a222d938e5c3569e2a51"
-  },
-  "supercollider": {
-    "revision": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"
-  },
-  "superhtml": {
-    "revision": "16887e9fa3122c36a3d4942470e33c1c282fe859"
-  },
-  "surface": {
-    "revision": "f4586b35ac8548667a9aaa4eae44456c1f43d032"
-  },
-  "svelte": {
-    "revision": "ae5199db47757f785e43a14b332118a5474de1a2"
-  },
-  "sway": {
-    "revision": "395006713db3bbb90d267ebdfcbf1881b399b05c"
-  },
-  "swift": {
-    "revision": "aca5a52aa3cab858944d3c02701ccf5b2d8fd0f9"
-  },
-  "sxhkdrc": {
-    "revision": "440d5f913d9465c9c776a1bd92334d32febcf065"
-  },
-  "systemtap": {
-    "revision": "f2b378a9af0b7e1192cff67a5fb45508c927205d"
-  },
-  "t32": {
-    "revision": "e5a12f798f056049642aa03fbb83786e3a5b95d4"
-  },
-  "tablegen": {
-    "revision": "b1170880c61355aaf38fc06f4af7d3c55abdabc4"
-  },
-  "tact": {
-    "revision": "47af20264abbd24ea282ded0f8ee9cad3cf3bf2f"
-  },
-  "tcl": {
-    "revision": "f15e711167661d1ba541d4f62b9dbfc4ce61ec56"
-  },
-  "teal": {
-    "revision": "3db655924b2ff1c54fdf6371b5425ea6b5dccefe"
-  },
-  "templ": {
-    "revision": "def9849184de71a797c4e2b2837df85abeccf92c"
-  },
-  "tera": {
-    "revision": "25a7c617192253bddfa65e378975d8c476419010"
-  },
-  "terraform": {
-    "revision": "de10d494dbd6b71cdf07a678fecbf404dbfe4398"
-  },
-  "textproto": {
-    "revision": "568471b80fd8793d37ed01865d8c2208a9fefd1b"
-  },
-  "thrift": {
-    "revision": "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"
-  },
-  "tiger": {
-    "revision": "4a77b2d7a004587646bddc4e854779044b6db459"
-  },
-  "tlaplus": {
-    "revision": "4ba91b07b97741a67f61221d0d50e6d962e4987e"
-  },
-  "tmux": {
-    "revision": "0252ecd080016e45e6305ef1a943388f5ae2f4b4"
-  },
-  "todotxt": {
-    "revision": "3937c5cd105ec4127448651a21aef45f52d19609"
-  },
-  "toml": {
-    "revision": "64b56832c2cffe41758f28e05c756a3a98d16f41"
-  },
-  "tsv": {
-    "revision": "7eb7297823605392d2bbcc4c09b1cd18d6fa9529"
-  },
-  "tsx": {
-    "revision": "75b3874edb2dc714fb1fd77a32013d0f8699989f"
-  },
-  "turtle": {
-    "revision": "7f789ea7ef765080f71a298fc96b7c957fa24422"
-  },
-  "twig": {
-    "revision": "085648e01d1422163a1702a44e72303b4e2a0bd1"
-  },
-  "typescript": {
-    "revision": "75b3874edb2dc714fb1fd77a32013d0f8699989f"
-  },
-  "typespec": {
-    "revision": "42fb163442ef2691b9b720fb4e4e846809415d18"
-  },
-  "typoscript": {
-    "revision": "5d8fde870b0ded1f429ba5bb249a9d9f8589ff5f"
-  },
-  "typst": {
-    "revision": "46cf4ded12ee974a70bf8457263b67ad7ee0379d"
-  },
-  "udev": {
-    "revision": "18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc"
-  },
-  "ungrammar": {
-    "revision": "debd26fed283d80456ebafa33a06957b0c52e451"
-  },
-  "unison": {
-    "revision": "169e7f748a540ec360c0cb086b448faad012caa4"
-  },
-  "usd": {
-    "revision": "4e0875f724d94d0c2ff36f9b8cb0b12f8b20d216"
-  },
-  "uxntal": {
-    "revision": "ad9b638b914095320de85d59c49ab271603af048"
-  },
-  "v": {
-    "revision": "26c2c4c2b3fb4f7a07ae78d298b36998b7ffa956"
-  },
-  "vala": {
-    "revision": "97e6db3c8c73b15a9541a458d8e797a07f588ef4"
-  },
-  "vento": {
-    "revision": "3b32474bc29584ea214e4e84b47102408263fe0e"
-  },
-  "verilog": {
-    "revision": "15fbf73dafaffc89050d247857beb27500ea30e8"
-  },
-  "vhdl": {
-    "revision": "35ed277d3e98836796bc764010dc3fb800d14ee4"
-  },
-  "vhs": {
-    "revision": "0c6fae9d2cfc5b217bfd1fe84a7678f5917116db"
-  },
-  "vim": {
-    "revision": "11b688a1f0e97c0c4e3dbabf4a38016335f4d237"
-  },
-  "vimdoc": {
-    "revision": "2694c3d27e2ca98a0ccde72f33887394300d524e"
-  },
-  "vrl": {
-    "revision": "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba"
-  },
-  "vue": {
-    "revision": "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"
-  },
-  "wgsl": {
-    "revision": "40259f3c77ea856841a4e0c4c807705f3e4a2b65"
-  },
-  "wgsl_bevy": {
-    "revision": "47c1818d245a6156a488c4c4d06e9336714bae9b"
-  },
-  "wing": {
-    "revision": "76e0c25844a66ebc6e866d690fcc5f4e90698947"
-  },
-  "wit": {
-    "revision": "81490b4e74c792369e005f72b0d46fe082d3fed2"
-  },
-  "xcompose": {
-    "revision": "fff3e72242aa110ebba6441946ea4d12d200fa68"
-  },
-  "xml": {
-    "revision": "0d9a8099c963ed53e183425c1b47fa2622c8eaf7"
-  },
-  "xresources": {
-    "revision": "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"
-  },
-  "yaml": {
-    "revision": "1805917414a9a8ba2473717fd69447277a175fae"
-  },
-  "yang": {
-    "revision": "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"
-  },
-  "yuck": {
-    "revision": "e877f6ade4b77d5ef8787075141053631ba12318"
-  },
-  "zathurarc": {
-    "revision": "0554b4a5d313244b7fc000cbb41c04afae4f4e31"
-  },
-  "zig": {
-    "revision": "b670c8df85a1568f498aa5c8cae42f51a90473c0"
-  },
-  "ziggy": {
-    "revision": "8a29017169f43dc2c3526817e98142eb9a335087"
-  },
-  "ziggy_schema": {
-    "revision": "8a29017169f43dc2c3526817e98142eb9a335087"
-  }
-}
diff --git a/scripts/convert-lockfile.lua b/scripts/convert-lockfile.lua
deleted file mode 100755
index 5759c0426..000000000
--- a/scripts/convert-lockfile.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
-local util = require('nvim-treesitter.util')
-local parsers = require('nvim-treesitter.parsers')
-
-local filename = require('nvim-treesitter.install').get_package_path('lockfile.json')
-local lockfile = vim.json.decode(util.read_file(filename)) --[[@as table<string,{revision:string}>]]
-
-for k, p in pairs(parsers) do
-  if p.install_info then
-    p.install_info.revision = lockfile[k].revision
-    p.install_info.files = nil
-  end
-end
-
--- write new parser file
-local header = '---@type nvim-ts.parsers\nreturn '
-local parser_file = header .. vim.inspect(parsers)
-if vim.fn.executable('stylua') == 1 then
-  parser_file = vim.system({ 'stylua', '-' }, { stdin = parser_file }):wait().stdout --[[@as string]]
-end
-util.write_file('lua/nvim-treesitter/parsers.lua', parser_file)

From 11736494df8a43d99332fdd60eb24a107b01f989 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 1 May 2025 19:11:30 +0200
Subject: [PATCH 2340/2704] fix(indent): don't skip parsing for yaml

---
 lua/nvim-treesitter/indent.lua | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 00f85dea2..5d9e86f66 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -2,10 +2,6 @@ local ts = vim.treesitter
 
 local M = {}
 
-M.avoid_force_reparsing = {
-  yaml = true,
-}
-
 M.comment_parsers = {
   comment = true,
   jsdoc = true,
@@ -125,14 +121,8 @@ function M.get_indent(lnum)
     return -1
   end
 
-  local ft = vim.bo[bufnr].filetype
-  local root_lang = vim.treesitter.language.get_lang(ft) or ft
-
-  -- some languages like Python will actually have worse results when re-parsing at opened new line
-  if not M.avoid_force_reparsing[root_lang] then
-    -- Reparse in case we got triggered by ":h indentkeys"
-    parser:parse({ vim.fn.line('w0') - 1, vim.fn.line('w$') })
-  end
+  -- Reparse in case we got triggered by ":h indentkeys"
+  parser:parse({ vim.fn.line('w0') - 1, vim.fn.line('w$') })
 
   -- Get language tree with smallest range around node that's not a comment parser
   local root, lang_tree ---@type TSNode, vim.treesitter.LanguageTree

From f7c5f7de5527cf2d3d802cd52fb10d5cb7a5da07 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 2 May 2025 17:10:35 +0200
Subject: [PATCH 2341/2704] feat(parsers): update robot, earthfile, racket,
 javadoc, scheme, t32, tact, templ, kotlin, tcl, meson, mlir

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index da5f1d9ec..216971525 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -419,7 +419,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = 'ae378d9d1306e9a967698516041f6f8803db5592',
+      revision = '8c93d89e262d9892ad692b3be05cfbcffbb9614f',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -1068,7 +1068,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'd162cc3344a9be8196b72d8780478474c4e0fd55',
+      revision = '5ae22c17a9a60ffbf674f00d0080d4304fde2231',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1200,7 +1200,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = '5b7b9b73fbe1e41b7d49bb5a8f3c66ac3d022540',
+      revision = '57fb4560ba8641865bc0baa6b3f413b236112c4c',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1383,7 +1383,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '0e5919d240fd639d81ddc9778152bf487bb9efc7',
+      revision = '8212b10366236987899e04645e572779ec0d0170',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1392,7 +1392,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'c6c67b6138eba6b6efb7be2ca8febe5f1954ca7a',
+      revision = 'a6ebbe50145120da1e72f732010c1e39adb98596',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1807,7 +1807,7 @@ return {
   },
   racket = {
     install_info = {
-      revision = 'e5096d233a7e9ceef78d7fe1a6d30ae39b3a731f',
+      revision = '78e147ac9be60e8e752fffaafa22293a785ac3dc',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 2,
@@ -1903,7 +1903,7 @@ return {
   },
   robot = {
     install_info = {
-      revision = '17c2300e91fc9da4ba14c16558bf4292941dc074',
+      revision = 'e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a',
       url = 'https://github.com/Hubro/tree-sitter-robot',
     },
     maintainers = { '@Hubro' },
@@ -1985,7 +1985,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = '8af654581a1c957b634321c46df7c2298f1561d9',
+      revision = 'd5b7655bea905f902d099abd539e1b66e1f4bf27',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2219,7 +2219,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = 'dc2a9a3bcc4ad29fff36d3f3bbc62ae117e83028',
+      revision = 'fd70d50f0b4789fd2bafc61e24057087336f4f68',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2235,7 +2235,7 @@ return {
   },
   tact = {
     install_info = {
-      revision = 'fc114d17f9b65b7c30f077c354b6c4a62bbfbf64',
+      revision = 'a6267c2091ed432c248780cec9f8d42c8766d9ad',
       url = 'https://github.com/tact-lang/tree-sitter-tact',
     },
     maintainers = { '@novusnota' },
@@ -2243,7 +2243,7 @@ return {
   },
   tcl = {
     install_info = {
-      revision = '2b7caac46a25e45e6f8ec9c2e1fa4bfc998ae21b',
+      revision = '93ad361b77faa39af410052e1ece22b9e6b8136c',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
@@ -2260,7 +2260,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = 'bd52132b4ef7a028189f0e52d7c89e36a083c6fa',
+      revision = '54367acb2b250879f39f2afee123c917ed0798e0',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },

From 3d0e642764f22d12c2496c27f132197f0ae96ccb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 2 May 2025 17:15:46 +0200
Subject: [PATCH 2342/2704] feat(gdscript)!: update parser and queries

`(underscore)` node was removed
---
 lua/nvim-treesitter/parsers.lua         | 2 +-
 runtime/queries/gdscript/highlights.scm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 216971525..a3efc076c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -644,7 +644,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = '48b49330888a4669b48619b211cc8da573827725',
+      revision = '25dadb2beaa2bb0f53d5fe97d2588a01e9b0f0b5',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
diff --git a/runtime/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
index cea9093c0..d7d3a648c 100644
--- a/runtime/queries/gdscript/highlights.scm
+++ b/runtime/queries/gdscript/highlights.scm
@@ -129,10 +129,10 @@
   (#eq? @keyword.operator "new"))
 
 ; Match Pattern
-[
-  (underscore)
-  (pattern_open_ending)
-] @character.special
+(pattern_open_ending) @character.special
+
+((identifier) @character.special
+  (#eq? @character.special "_"))
 
 ; Alternations
 [

From a83f2d1417cc7775409413903c04d82c48fbbbf8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 2 May 2025 17:19:08 +0200
Subject: [PATCH 2343/2704] feat(vim): update parser and queries

* add support for `:substitute` command
* add support for `=` lua chunks
---
 lua/nvim-treesitter/parsers.lua    | 2 +-
 runtime/queries/vim/highlights.scm | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a3efc076c..338cc0017 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2501,7 +2501,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '0f31cb98e5c0cb3707e097bf95a04c0c2aac573d',
+      revision = '054c4beaf7b95b52cb20b138bfd8b6fd6ba561a7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
index df7b3cf48..20a044a60 100644
--- a/runtime/queries/vim/highlights.scm
+++ b/runtime/queries/vim/highlights.scm
@@ -127,6 +127,7 @@
   "eval"
   "sign"
   "abort"
+  "substitute"
 ] @keyword
 
 (map_statement
@@ -313,6 +314,9 @@
 (binary_operation
   "." @operator)
 
+(lua_statement
+  "=" @keyword)
+
 ; Punctuation
 [
   "("

From 75ee7ff2f06628d161c621539b97277f8fd9a1a0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 1 May 2025 10:37:30 +0200
Subject: [PATCH 2344/2704] tests(gleam): fix assert tests that no longer parse
 correctly

---
 lua/nvim-treesitter/indent.lua            |  3 ++-
 tests/indent/gleam/assert.gleam           |  2 +-
 tests/indent/java_spec.lua                |  2 +-
 tests/indent/python_spec.lua              |  4 ++--
 tests/query/highlights/gleam/assert.gleam | 10 +++++-----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 5d9e86f66..dda632df3 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -4,6 +4,8 @@ local M = {}
 
 M.comment_parsers = {
   comment = true,
+  luadoc = true,
+  javadoc = true,
   jsdoc = true,
   phpdoc = true,
 }
@@ -121,7 +123,6 @@ function M.get_indent(lnum)
     return -1
   end
 
-  -- Reparse in case we got triggered by ":h indentkeys"
   parser:parse({ vim.fn.line('w0') - 1, vim.fn.line('w$') })
 
   -- Get language tree with smallest range around node that's not a comment parser
diff --git a/tests/indent/gleam/assert.gleam b/tests/indent/gleam/assert.gleam
index 2b2114628..71b94b1f8 100644
--- a/tests/indent/gleam/assert.gleam
+++ b/tests/indent/gleam/assert.gleam
@@ -1,4 +1,4 @@
 pub fn main() {
-  assert Ok(i) = 
+  assert Ok(i) == 
     parse_int("123")
 }
diff --git a/tests/indent/java_spec.lua b/tests/indent/java_spec.lua
index 97354dbc7..cbbc16092 100644
--- a/tests/indent/java_spec.lua
+++ b/tests/indent/java_spec.lua
@@ -26,7 +26,7 @@ describe('indent Java:', function()
     run:new_line(
       'issue_2583.java',
       { on_line = 3, text = 'int x = 1;', indent = 4 },
-      'fails because tree is in a broken state',
+      'broken tree',
       XFAIL
     )
     run:new_line('issue_2583.java', { on_line = 4, text = 'int x = 1;', indent = 4 })
diff --git a/tests/indent/python_spec.lua b/tests/indent/python_spec.lua
index 65be126fa..d0a86e540 100644
--- a/tests/indent/python_spec.lua
+++ b/tests/indent/python_spec.lua
@@ -56,13 +56,13 @@ describe('indent Python:', function()
     run:new_line(
       'join_lines.py',
       { on_line = 1, text = '+ 1 \\', indent = 4 },
-      'fails due two not working query at python/indent.scm:30',
+      'expected failure',
       XFAIL
     )
     run:new_line(
       'join_lines.py',
       { on_line = 4, text = '+ 1 \\', indent = 4 },
-      'fails due two not working query at python/indent.scm:30',
+      'expected failure',
       XFAIL
     )
     run:new_line('join_lines.py', { on_line = 7, text = '+ 1 \\', indent = 4 })
diff --git a/tests/query/highlights/gleam/assert.gleam b/tests/query/highlights/gleam/assert.gleam
index 8be39923d..fd95304ac 100644
--- a/tests/query/highlights/gleam/assert.gleam
+++ b/tests/query/highlights/gleam/assert.gleam
@@ -1,13 +1,13 @@
 pub fn main() {
-  assert Ok(i) = parse_int("123")
+  assert Ok(i) == parse_int("123")
   // <- @keyword.exception
   //     ^^ @constructor
   //       ^ @punctuation.bracket
   //        ^ @variable
   //         ^ @punctuation.bracket
   //           ^ @operator
-  //             ^^^^^^^^^ @function.call
-  //                      ^ @punctuation.bracket
-  //                       ^^^^^ @string
-  //                            ^ @punctuation.bracket
+  //              ^^^^^^^^^ @function.call
+  //                       ^ @punctuation.bracket
+  //                        ^^^^^ @string
+  //                             ^ @punctuation.bracket
 }

From afaf01ebd32df7320f58af2cd9ae1ce7021cd083 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 1 May 2025 19:47:10 +0200
Subject: [PATCH 2345/2704] tests(angular): don' reset filetype

`htmlangular` filetype support is now included in Nvim, so don't set
the filetype.
---
 tests/indent/angular_spec.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/indent/angular_spec.lua b/tests/indent/angular_spec.lua
index 3ead248b7..03ba153af 100644
--- a/tests/indent/angular_spec.lua
+++ b/tests/indent/angular_spec.lua
@@ -3,7 +3,6 @@ local runner = Runner:new(it, 'tests/indent/angular', {
   tabstop = 2,
   shiftwidth = 2,
   expandtab = true,
-  filetype = 'htmlangular',
 })
 
 describe('indent HTML Angular:', function()

From 4e906caca3895080ebae9bdbdd991501114f2a98 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 3 May 2025 13:31:59 -0700
Subject: [PATCH 2346/2704] refactor(locals): fix type annotations and warnings

---
 lua/nvim-treesitter/locals.lua | 40 +++++++++++++---------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index b6d9c25b2..6bddb752f 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -15,20 +15,6 @@ local function get_named_children(node)
   return nodes
 end
 
----@param node TSNode
----@return TSNode result
-local function get_root_for_node(node)
-  local parent = node ---@type TSNode?
-  local result = node
-
-  while parent ~= nil do
-    result = parent
-    parent = result:parent()
-  end
-
-  return result
-end
-
 -- Creates unique id for a node based on text and range
 ---@param scope TSNode: the scope node of the definition
 ---@param node_text string: the node text to use
@@ -64,7 +50,7 @@ function M.iter_scope_tree(node, bufnr)
       return
     end
 
-    local scope = M.containing_scope(last_node, bufnr, false) or get_root_for_node(node)
+    local scope = M.containing_scope(last_node, bufnr, false) or node:tree():root()
 
     last_node = scope:parent()
 
@@ -103,7 +89,9 @@ function M.recurse_local_nodes(local_def, accumulator, full_match, last_match)
   if local_def.node then
     accumulator(local_def, local_def.node, full_match, last_match)
   else
-    for match_key, def in pairs(local_def) do
+    for match_key, def in
+      pairs(local_def --[[@as {[string]: TSLocal}]])
+    do
       M.recurse_local_nodes(
         def,
         accumulator,
@@ -120,16 +108,16 @@ end
 ---@param hash_fn fun(...): any
 ---@return F
 local function memoize(fn, hash_fn)
-  local cache = setmetatable({}, { __mode = 'kv' }) ---@type table<any,any>
+  local cache = setmetatable({}, { __mode = 'kv' }) ---@type table<any,any[]>
 
   return function(...)
     local key = hash_fn(...)
     if cache[key] == nil then
-      local v = { fn(...) } ---@type any
+      local v = { fn(...) } ---@type any[]
 
       for k, value in pairs(v) do
         if value == nil then
-          value[k] = vim.NIL
+          value[k] = vim.NIL ---@type table
         end
       end
 
@@ -138,9 +126,9 @@ local function memoize(fn, hash_fn)
 
     local v = cache[key]
 
-    for k, value in pairs(v) do
+    for k, value in ipairs(v) do
       if value == vim.NIL then
-        value[k] = nil
+        value[k] = nil ---@type table
       end
     end
 
@@ -200,7 +188,9 @@ M.get = memoize(function(bufnr)
     local kind = query.captures[id]
 
     local scope = 'local' ---@type string
-    for k, v in pairs(metadata) do
+    for k, v in
+      pairs(metadata --[[@as {[integer|string]: string}]])
+    do
       if type(k) == 'string' and vim.endswith(k, 'local.scope') then
         scope = v
       end
@@ -325,7 +315,7 @@ function M.find_definition(node, bufnr)
     end
   end
 
-  return node, get_root_for_node(node), nil
+  return node, node:tree():root(), nil
 end
 
 -- Finds usages of a node in a given scope.
@@ -341,7 +331,7 @@ function M.find_usages(node, scope_node, bufnr)
     return {}
   end
 
-  scope_node = scope_node or get_root_for_node(node)
+  scope_node = scope_node or node:tree():root()
   local usages = {}
 
   local query, _ = get_query(bufnr)
@@ -379,7 +369,7 @@ function M.containing_scope(node, bufnr, allow_scope)
   local iter_node = node ---@type TSNode?
 
   while iter_node ~= nil and not vim.tbl_contains(scopes, iter_node) do
-    iter_node = iter_node:parent()
+    iter_node = iter_node:parent() ---@type TSNode?
   end
 
   return iter_node or (allow_scope and node or nil)

From 53dccb3a77da54a4e428275e8b44dbff77e0d47d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 29 Apr 2025 19:40:18 +0200
Subject: [PATCH 2347/2704] feat(tests)!: new infrastructure based on makefile

Problem: Not easy to run all checks and tests locally. Redundant CI
workflows.

Solution: Separate CI into two workflows:
 * lint: Lua files (stylua, luals), query files (valid captures,
   predicates, directives using tsqueryls), docs
   (SUPPORTED_LANGUAGES.md) -- does not need parser installation
 * tests: parsers (ABI compatibility), query files (tsqueryls on
   Linux/macOS; nvim on Windows), highlight and indent tests (separated
   for better readability) -- needs parser installation (but only once)

Switch to https://github.com/nvim-treesitter/highlight-assertions fork
with ABI 15 support.

Run all tests (on Linux and macOS) through `make` (`formatlua`,
`checklua`, `lintquery`, `formatquery`, `checkquery`, `docs`, `tests`),
which downloads and caches all necessary dependencies.

Remove `update-readme` workflow (replaced by lint job on PRs).
---
 .github/workflows/lint.yml           |  68 +++++++------
 .github/workflows/test-core.yml      |  22 ++++-
 .github/workflows/test-generate.yml  |   6 +-
 .github/workflows/test-queries.yml   |  10 +-
 .github/workflows/tests.yml          |  60 -----------
 .github/workflows/update-parsers.yml |   2 +-
 .github/workflows/update-readme.yml  |  47 ---------
 .gitignore                           |   1 +
 .luacheckrc                          |  21 ----
 .luarc.json                          |   1 +
 Makefile                             | 142 +++++++++++++++++++++++++++
 TODO.md                              |  10 +-
 scripts/check-parsers.lua            |  40 ++++++++
 scripts/check-queries.lua            |  36 -------
 scripts/ci-install.sh                |   7 --
 scripts/minimal_init.lua             |   1 +
 scripts/run_tests.sh                 |  16 ---
 tests/query/highlights_spec.lua      |  26 ++---
 tests/query/injection_spec.lua       |  25 ++---
 19 files changed, 269 insertions(+), 272 deletions(-)
 delete mode 100644 .github/workflows/tests.yml
 delete mode 100644 .github/workflows/update-readme.yml
 delete mode 100644 .luacheckrc
 create mode 100644 Makefile
 create mode 100755 scripts/check-parsers.lua
 delete mode 100755 scripts/run_tests.sh

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5c29559d0..cf9e9364f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,52 +1,50 @@
 name: Lint
 
 on:
+  push:
+    branches:
+      - "main"
   pull_request:
     branches:
       - "main"
+  workflow_dispatch:
 
 jobs:
-  luacheck:
-    name: Luacheck
+  lua:
+    name: Lint Lua files
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Prepare
+      - name: Format
         run: |
-          sudo apt-get update
-          sudo apt-get install luarocks -y
-          sudo luarocks install luacheck
-
-      - name: Run Luacheck
-        run: luacheck .
-
-  stylua:
-    name: StyLua
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Lint with stylua
-        uses: JohnnyMorganz/stylua-action@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          version: latest
-          args: --check .
-
-  format-queries:
-    name: Format queries
-    runs-on: ubuntu-latest
-    env:
-      NVIM_TAG: nightly
-    steps:
-      - uses: actions/checkout@v4
-      - uses: tree-sitter/setup-action/cli@v1
-      - name: Prepare
-        run: |
-          bash ./scripts/ci-install.sh
+          make formatlua
+          git diff --exit-code
 
       - name: Lint
+        run: make checklua
+
+  queries:
+    name: Lint query files
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Format
         run: |
-          nvim -l scripts/install-parsers.lua query
-          nvim -l scripts/format-queries.lua
+          make formatquery
+          git diff --exit-code
+
+      - name: Lint
+        run: make lintquery
+
+  readme:
+    name: Lint docs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check SUPPORTED_LANGUAGES
+        run: |
+          make docs
           git diff --exit-code
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 313084dab..05f8078ce 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -35,7 +35,7 @@ jobs:
         name: Generate and compile parsers
         run: $NVIM -l ./scripts/install-parsers.lua --generate --max-jobs=2
 
-      - if: inputs.type == 'queries'
+      - if: inputs.type == 'build'
         name: Setup Parsers Cache
         id: parsers-cache
         uses: actions/cache@v4
@@ -47,9 +47,25 @@ jobs:
             './lua/nvim-treesitter/install.lua',
             './lua/nvim-treesitter/parsers.lua') }}
 
-      - if: inputs.type == 'queries'
+      - if: inputs.type == 'build'
         name: Compile parsers
         run: $NVIM -l ./scripts/install-parsers.lua
 
-      - name: Check query files
+      - name: Check parsers
+        run: $NVIM -l ./scripts/check-parsers.lua
+
+      - name: Check queries (nvim)
+        if: ${{ matrix.os == 'windows-latest' }}
         run: $NVIM -l ./scripts/check-queries.lua
+
+      - name: Check queries (tsqueryls)
+        if: ${{ matrix.os != 'windows-latest' }}
+        run: make checkquery
+
+      - name: Run highlight tests
+        if: ${{ matrix.os != 'windows-latest' }}
+        run: make tests TESTS=query NVIM_BIN=$NVIM
+
+      - name: Run indents tests
+        if: ${{ matrix.os != 'windows-latest' }}
+        run: make tests TESTS=indent NVIM_BIN=$NVIM
diff --git a/.github/workflows/test-generate.yml b/.github/workflows/test-generate.yml
index ae2f7bd1f..0735f9f2c 100644
--- a/.github/workflows/test-generate.yml
+++ b/.github/workflows/test-generate.yml
@@ -1,4 +1,4 @@
-name: Generate from grammar
+name: Tests
 
 on:
   pull_request:
@@ -8,12 +8,12 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-generate-${{ github.ref }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   check_compilation:
-    name: Build
+    name: Generate
     if: contains(github.event.pull_request.labels.*.name, 'ci:generate') || github.event_name == 'workflow_dispatch'
     uses: ./.github/workflows/test-core.yml
     with:
diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml
index a7d4ae79c..5d95bb351 100644
--- a/.github/workflows/test-queries.yml
+++ b/.github/workflows/test-queries.yml
@@ -1,12 +1,16 @@
-name: Check queries
+name: Tests
 
 on:
+  push:
+    branches:
+      - "main"
   pull_request:
     branches:
       - "main"
+  workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-build-${{ github.ref }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
@@ -14,4 +18,4 @@ jobs:
     name: Build
     uses: ./.github/workflows/test-core.yml
     with:
-      type: "queries"
+      type: "build"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 7a946377c..000000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: Tests
-
-on:
-  # push:
-  #   branches:
-  #     - "main"
-  pull_request:
-    branches:
-      - "main"
-  workflow_dispatch:
-
-# Cancel any in-progress CI runs for a PR if it is updated
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  check_compilation:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-
-    name: Run tests
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: tree-sitter/setup-action/cli@v1
-
-      - name: Test Dependencies
-        run: |
-          mkdir -p ~/.local/share/nvim/site/pack/plenary.nvim/start
-          cd ~/.local/share/nvim/site/pack/plenary.nvim/start
-          git clone https://github.com/nvim-lua/plenary.nvim
-          curl -L https://github.com/theHamsta/highlight-assertions/releases/download/v0.1.6/highlight-assertions_v0.1.6_x86_64-unknown-linux-gnu.tar.gz | tar -xz
-          cp highlight-assertions /usr/local/bin
-
-      - name: Install and prepare Neovim
-        env:
-          NVIM_TAG: nightly
-          TREE_SITTER_CLI_TAG: v0.20.8
-        run: |
-          bash ./scripts/ci-install.sh
-
-      - name: Setup Parsers Cache
-        id: parsers-cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.local/share/nvim/site/parser/
-            ~/AppData/Local/nvim-data/site/parser/
-          key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
-            './lua/nvim-treesitter/install.lua',
-            './lua/nvim-treesitter/parsers.lua') }}
-
-      - name: Compile parsers
-        run: nvim -l ./scripts/install-parsers.lua
-
-      - name: Tests
-        run: PATH=/usr/local/bin:$PATH ./scripts/run_tests.sh
diff --git a/.github/workflows/update-parsers.yml b/.github/workflows/update-parsers.yml
index 683c732c6..ba3286428 100644
--- a/.github/workflows/update-parsers.yml
+++ b/.github/workflows/update-parsers.yml
@@ -2,7 +2,7 @@ name: Update parsers
 
 on:
   schedule:
-    - cron: "30 6 * * *"
+    - cron: "30 6 * * 6"
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
deleted file mode 100644
index 335756619..000000000
--- a/.github/workflows/update-readme.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Update README
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  update-readme:
-    name: Update README
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/create-github-app-token@v2
-        id: app-token
-        with:
-          app-id: ${{ vars.TOKEN_ID }}
-          private-key: ${{ secrets.TOKEN_PRIVATE_KEY }}
-
-      - name: Prepare
-        env:
-          NVIM_TAG: nightly
-        run: |
-          bash ./scripts/ci-install.sh
-
-      - name: Check README
-        run: |
-          nvim -l scripts/update-readme.lua || echo 'Needs update'
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          add-paths: SUPPORTED_LANGUAGES.md
-          token: ${{ steps.app-token.outputs.token }}
-          sign-commits: true
-          commit-message: "bot(readme): update"
-          title: Update SUPPORTED_LANGUAGES.md
-          body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
-          branch: update-readme-pr
-          base: ${{ github.head_ref }}
-
-      - name: Enable Pull Request Automerge
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh pr merge --rebase --auto update-readme-pr
diff --git a/.gitignore b/.gitignore
index cd7f125bd..ca538329d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.test-deps
 doc/tags
 .luacheckcache
 /tags
diff --git a/.luacheckrc b/.luacheckrc
deleted file mode 100644
index b0ee19d8a..000000000
--- a/.luacheckrc
+++ /dev/null
@@ -1,21 +0,0 @@
--- Rerun tests only if their modification time changed.
-cache = true
-codes = true
-
-exclude_files = {
-  "tests/indent/lua/"
-}
-
--- Glorious list of warnings: https://luacheck.readthedocs.io/en/stable/warnings.html
-ignore = {
-  "212", -- Unused argument, In the case of callback function, _arg_name is easier to understand than _, so this option is set to off.
-  "411", -- Redefining a local variable.
-  "412", -- Redefining an argument.
-  "422", -- Shadowing an argument
-  "122" -- Indirectly setting a readonly global
-}
-
--- Global objects defined by the C code
-read_globals = {
-  "vim",
-}
diff --git a/.luarc.json b/.luarc.json
index b983242ef..3917da0e2 100644
--- a/.luarc.json
+++ b/.luarc.json
@@ -9,6 +9,7 @@
       "${3rd}/busted/library"
     ],
     "ignoreDir": [
+      ".test-deps",
       "tests"
     ],
     "checkThirdParty": "Disable"
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..54fb96ed4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,142 @@
+NVIM_VERSION ?= nightly
+LUALS_VERSION := 3.14.0
+
+DEPDIR ?= .test-deps
+CURL ?= curl -sL --create-dirs
+
+ifeq ($(shell uname -s),Darwin)
+    NVIM_ARCH ?= macos-arm64
+    LUALS_ARCH ?= darwin-arm64
+    STYLUA_ARCH ?= macos-aarch64
+    RUST_ARCH ?= aarch64-apple-darwin
+else
+    NVIM_ARCH ?= linux-x86_64
+    LUALS_ARCH ?= linux-x64
+    STYLUA_ARCH ?= linux-x86_64
+    RUST_ARCH ?= x86_64-unknown-linux-gnu
+endif
+
+.DEFAULT_GOAL := all
+
+# download test dependencies
+
+NVIM := $(DEPDIR)/nvim-$(NVIM_ARCH)
+NVIM_TARBALL := $(NVIM).tar.gz
+NVIM_URL := https://github.com/neovim/neovim/releases/download/$(NVIM_VERSION)/$(notdir $(NVIM_TARBALL))
+NVIM_BIN := $(NVIM)/nvim-$(NVIM_ARCH)/bin/nvim
+NVIM_RUNTIME=$(NVIM)/nvim-$(NVIM_ARCH)/share/nvim/runtime
+
+.PHONY: nvim
+nvim: $(NVIM)
+
+$(NVIM):
+	$(CURL) $(NVIM_URL) -o $(NVIM_TARBALL)
+	mkdir $@
+	tar -xf $(NVIM_TARBALL) -C $@
+	rm -rf $(NVIM_TARBALL)
+
+LUALS := $(DEPDIR)/lua-language-server-$(LUALS_VERSION)-$(LUALS_ARCH)
+LUALS_TARBALL := $(LUALS).tar.gz
+LUALS_URL := https://github.com/LuaLS/lua-language-server/releases/download/$(LUALS_VERSION)/$(notdir $(LUALS_TARBALL))
+
+.PHONY: luals
+luals: $(LUALS)
+
+$(LUALS):
+	$(CURL) $(LUALS_URL) -o $(LUALS_TARBALL)
+	mkdir $@
+	tar -xf $(LUALS_TARBALL) -C $@
+	rm -rf $(LUALS_TARBALL)
+
+STYLUA := $(DEPDIR)/stylua-$(STYLUA_ARCH)
+STYLUA_TARBALL := $(STYLUA).zip
+STYLUA_URL := https://github.com/JohnnyMorganz/StyLua/releases/latest/download/$(notdir $(STYLUA_TARBALL))
+
+.PHONY: stylua
+stylua: $(STYLUA)
+
+$(STYLUA):
+	$(CURL) $(STYLUA_URL) -o $(STYLUA_TARBALL)
+	unzip $(STYLUA_TARBALL) -d $(STYLUA)
+	rm -rf $(STYLUA_TARBALL)
+
+TSQUERYLS := $(DEPDIR)/ts_query_ls-$(RUST_ARCH)
+TSQUERYLS_TARBALL := $(TSQUERYLS).tar.gz
+TSQUERYLS_URL := https://github.com/ribru17/ts_query_ls/releases/latest/download/$(notdir $(TSQUERYLS_TARBALL))
+
+.PHONY: tsqueryls
+tsqueryls: $(TSQUERYLS)
+
+$(TSQUERYLS):
+	$(CURL) $(TSQUERYLS_URL) -o $(TSQUERYLS_TARBALL)
+	mkdir $@
+	tar -xf $(TSQUERYLS_TARBALL) -C $@
+	rm -rf $(TSQUERYLS_TARBALL)
+
+HLASSERT := $(DEPDIR)/highlight-assertions-$(RUST_ARCH)
+HLASSERT_TARBALL := $(HLASSERT).tar.gz
+HLASSERT_URL := https://github.com/nvim-treesitter/highlight-assertions/releases/latest/download/$(notdir $(HLASSERT_TARBALL))
+
+.PHONY: hlassert
+hlassert: $(HLASSERT)
+
+$(HLASSERT):
+	$(CURL) $(HLASSERT_URL) -o $(HLASSERT_TARBALL)
+	mkdir $@
+	tar -xf $(HLASSERT_TARBALL) -C $@
+	rm -rf $(HLASSERT_TARBALL)
+
+PLENARY := $(DEPDIR)/plenary.nvim
+
+.PHONY: plenary
+plenary: $(PLENARY)
+
+$(PLENARY):
+	git clone --filter=blob:none https://github.com/nvim-lua/plenary.nvim $(PLENARY)
+
+# actual test targets
+
+.PHONY: lua
+lua: formatlua checklua
+
+.PHONY: formatlua
+formatlua: $(STYLUA)
+	$(STYLUA)/stylua .
+
+.PHONY: checklua
+checklua: $(LUALS) $(NVIM)
+	VIMRUNTIME=$(NVIM_RUNTIME) $(LUALS)/bin/lua-language-server \
+		--configpath=../.luarc.json \
+		--check=./
+
+.PHONY: query
+query: formatquery lintquery checkquery
+
+.PHONY: lintquery
+lintquery: $(TSQUERYLS)
+	$(TSQUERYLS)/ts_query_ls lint runtime/queries
+
+.PHONY: formatquery
+formatquery: $(TSQUERYLS)
+	$(TSQUERYLS)/ts_query_ls format runtime/queries
+
+.PHONY: checkquery
+checkquery: $(TSQUERYLS)
+	$(TSQUERYLS)/ts_query_ls check runtime/queries
+
+.PHONY: docs
+docs: $(NVIM)
+	$(NVIM_BIN) -l scripts/update-readme.lua
+
+.PHONY: tests
+tests: $(NVIM) $(HLASSERT) $(PLENARY)
+	HLASSERT=$(HLASSERT)/highlight-assertions PLENARY=$(PLENARY) \
+		$(NVIM_BIN) --headless --clean -u scripts/minimal_init.lua \
+		-c "PlenaryBustedDirectory tests/$(TESTS) { minimal_init = './scripts/minimal_init.lua' }"
+
+.PHONY: all
+all: lua query docs tests
+
+.PHONY: clean
+clean:
+	rm -rf $(DEPDIR)
diff --git a/TODO.md b/TODO.md
index afc451685..9c6d5fafd 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,17 +4,14 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
-- [ ] **`install.lua`:** simply skip Tier 4 parsers (`get_install_info`)
-- [ ] **`parsers.lua`:** allow specifying version in addition to commit hash (for Tier 1)
+- [ ] **`parsers.lua`:** track versioned releases for tier 1
 - [ ] **`parsers.lua`:** add WASM support (tier 1)
 - [ ] **`install.lua`:** migrate to async v2
-- [ ] **tests:** fix, update (remove custom crate, plenary dependency)
-- [ ] **CI:** switch to ts_query_ls, add update readme as check (remove update job)
+- [ ] **tests:** remove custom crate, plenary dependency
 - [ ] **documentation:** consolidate, autogenerate?
 - [ ] **documentation:** migration guide
-- [ ] **indents:** rewrite (Helix compatible)
+- [ ] **indents:** rewrite (Helix or Zed compatible)
 - [ ] **textobjects:** include simple(!) `node`, `scope` (using `locals`) objects
-- [ ] **downstream:** adapt to breaking changes (`nvim-treesitter-refactor`)
 
 ## DONE
 
@@ -31,3 +28,4 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [X] switch to upstream injection format
 - [X] remove locals from highlighting (cf. https://github.com/nvim-treesitter/nvim-treesitter/issues/3944#issuecomment-1458782497)
 - [X] drop ensure_install (replace with install)
+- [X] **CI:** switch to ts_query_ls, add update readme as check (remove update job)
diff --git a/scripts/check-parsers.lua b/scripts/check-parsers.lua
new file mode 100755
index 000000000..08e48740d
--- /dev/null
+++ b/scripts/check-parsers.lua
@@ -0,0 +1,40 @@
+#!/usr/bin/env -S nvim -l
+vim.opt.runtimepath:append('.')
+
+local configs = require('nvim-treesitter.parsers')
+local parsers = #_G.arg > 0 and { unpack(_G.arg) }
+  or require('nvim-treesitter.config').installed_parsers()
+
+local data = {} ---@type table[]
+local errors = {} ---@type string[]
+for _, lang in pairs(parsers) do
+  if configs[lang] and configs[lang].install_info then
+    local ok, info = pcall(vim.treesitter.language.inspect, lang)
+    if not ok then
+      errors[#errors + 1] = string.format('%s: %s', lang, info)
+    else
+      data[#data + 1] = { lang = lang, abi = info.abi_version, state_count = info.state_count }
+    end
+  end
+end
+
+if #errors > 0 then
+  print('::group::Errors')
+  for _, err in ipairs(errors) do
+    print(err)
+  end
+  print('::endgroup::')
+  print('Check failed!\n')
+  vim.cmd.cq()
+else
+  print('::group::State counts')
+  table.sort(data, function(a, b)
+    return a.state_count < b.state_count
+  end)
+
+  for i, val in ipairs(data) do
+    print(string.format('%i.\t%d\t%s (ABI %d)', #data - i + 1, val.state_count, val.lang, val.abi))
+  end
+  print('::endgroup::')
+  print('Check successful!')
+end
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 66b947914..0a684f5eb 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -6,29 +6,6 @@ local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
   or require('nvim-treesitter.config').installed_parsers()
 
--- Extract captures from documentation for validation
-local captures = {} ---@type table[]
-do
-  local current_query ---@type string
-
-  for line in io.lines('CONTRIBUTING.md') do
-    if vim.startswith(line, '### ') then
-      current_query = line:sub(5):lower() ---@type string
-    elseif vim.startswith(line, '@') and current_query then
-      if not captures[current_query] then
-        captures[current_query] = {}
-      end
-
-      table.insert(captures[current_query], vim.split(line:sub(2), ' ')[1])
-    end
-  end
-
-  -- Complete captures for injections.
-  for lang, _ in pairs(configs) do
-    table.insert(captures['injections'], lang)
-  end
-end
-
 -- Check queries for each installed parser in parsers
 local errors = {} ---@type string[]
 local timings = {} ---@type { duration: number, lang: string, query_type: string }[]
@@ -46,19 +23,6 @@ do
         print(string.format('Checking %s %s (%.02fms)', lang, query_type, duration * 1e-6))
         if not ok then
           errors[#errors + 1] = string.format('%s (%s): %s', lang, query_type, query)
-        else
-          if query then
-            for _, capture in ipairs(query.captures) do
-              local is_valid = (
-                vim.startswith(capture, '_') -- Helpers.
-                or vim.list_contains(captures[query_type], capture)
-              )
-              if not is_valid then
-                errors[#errors + 1] =
-                  string.format('%s (%s): invalid capture "@%s"', lang, query_type, capture)
-              end
-            end
-          end
         end
       end
     end
diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
index 43f3c4ade..3d656f842 100755
--- a/scripts/ci-install.sh
+++ b/scripts/ci-install.sh
@@ -10,19 +10,12 @@ if [[ $os == Linux ]]; then
   tar -zxf nvim-linux-x86_64.tar.gz
   sudo ln -s "$PWD"/nvim-linux-x86_64/bin/nvim /usr/local/bin
   rm -rf "$PWD"/nvim-linu-x86_x64/lib/nvim/parser
-  mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-  ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
 elif [[ $os == Darwin ]]; then
   RELEASE_NAME="nvim-macos-$(uname -m)"
   curl -L "https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/$RELEASE_NAME.tar.gz" | tar -xz
   sudo ln -s "$PWD/$RELEASE_NAME/bin/nvim" /usr/local/bin
   rm -rf "$PWD/$RELEASE_NAME/lib/nvim/parser"
-  mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-  ln -s "$PWD" ~/.local/share/nvim/site/pack/nvim-treesitter/start
 else
   curl -L "https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim-win64.zip" -o nvim-win64.zip
   unzip nvim-win64
-  mkdir -p ~/AppData/Local/nvim/pack/nvim-treesitter/start
-  mkdir -p ~/AppData/Local/nvim-data
-  cp -r "$PWD" ~/AppData/Local/nvim/pack/nvim-treesitter/start
 fi
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 648ffa69f..4a5e14f16 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -1,3 +1,4 @@
+vim.opt.runtimepath:append(os.getenv('PLENARY'))
 vim.opt.runtimepath:append('.')
 vim.cmd.runtime({ 'plugin/plenary.vim', bang = true })
 vim.cmd.runtime({ 'plugin/query_predicates.lua', bang = true })
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
deleted file mode 100755
index 7ae6b22c5..000000000
--- a/scripts/run_tests.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-HERE="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
-cd $HERE/..
-
-run() {
-    nvim --headless --noplugin  -u scripts/minimal_init.lua \
-        -c "PlenaryBustedDirectory $1 { minimal_init = './scripts/minimal_init.lua' }"
-}
-
-if [[ $2 = '--summary' ]]; then
-    ## really simple results summary by filtering plenary busted output
-    run tests/$1  2> /dev/null | grep -E '^\S*(Testing|Success|Failed|Errors)\s*:'
-else
-    run tests/$1
-fi
diff --git a/tests/query/highlights_spec.lua b/tests/query/highlights_spec.lua
index 0529af4a4..e59feb9f4 100644
--- a/tests/query/highlights_spec.lua
+++ b/tests/query/highlights_spec.lua
@@ -1,3 +1,4 @@
+local config = require('nvim-treesitter.config')
 local ts = vim.treesitter
 
 local COMMENT_NODES = {
@@ -6,27 +7,20 @@ local COMMENT_NODES = {
 }
 
 local function check_assertions(file)
-  assert.same(
-    1,
-    vim.fn.executable('highlight-assertions'),
-    '"highlight-assertions" not executable!'
-      .. ' Get it via "cargo install --git https://github.com/theHamsta/highlight-assertions"'
-  )
   local buf = vim.fn.bufadd(file)
   vim.fn.bufload(file)
   local ft = vim.bo[buf].filetype
   local lang = vim.treesitter.language.get_lang(ft) or ft
   local comment_node = COMMENT_NODES[lang] or 'comment'
-  local assertions = vim.fn.json_decode(
-    vim.fn.system(
-      "highlight-assertions -p '"
-        .. vim.api.nvim_get_runtime_file('parser/' .. lang .. '.so', false)[1]
-        .. "' -s '"
-        .. file
-        .. "' -c "
-        .. comment_node
-    )
-  )
+  local assertions = vim.fn.json_decode(vim.fn.system({
+    os.getenv('HLASSERT'),
+    '-p',
+    config.get_install_dir('parser') .. '/' .. lang .. '.so',
+    '-s',
+    file,
+    '-c',
+    comment_node,
+  }))
   assert.True(#assertions > 0, 'No assertions detected!')
 
   local parser = ts.get_parser(buf)
diff --git a/tests/query/injection_spec.lua b/tests/query/injection_spec.lua
index e90925e20..63734dd5b 100644
--- a/tests/query/injection_spec.lua
+++ b/tests/query/injection_spec.lua
@@ -6,24 +6,13 @@ local function check_assertions(file)
   vim.fn.bufload(file)
   local ft = vim.bo[buf].filetype
   local lang = vim.treesitter.language.get_lang(ft) or ft
-  assert.same(
-    1,
-    vim.fn.executable('highlight-assertions'),
-    '"highlight-assertions" not executable!'
-      .. ' Get it via "cargo install --git https://github.com/theHamsta/highlight-assertions"'
-  )
-  local assertions = vim.fn.json_decode(
-    vim.fn.system(
-      "highlight-assertions -p '"
-        .. config.get_install_dir('parser')
-        .. '/'
-        .. lang
-        .. ".so'"
-        .. " -s '"
-        .. file
-        .. "'"
-    )
-  )
+  local assertions = vim.fn.json_decode(vim.fn.system({
+    os.getenv('HLASSERT'),
+    '-p',
+    config.get_install_dir('parser') .. '/' .. lang .. '.so',
+    '-s',
+    file,
+  }))
   local parser = ts.get_parser(buf, lang)
 
   local top_level_root = parser:parse(true)[1]:root()

From 18bb6539178edac1547d2a3082ecc553fba37dfd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 4 May 2025 10:51:09 +0200
Subject: [PATCH 2348/2704] feat(locals)!: remove locals module

Problem: `locals.lua` was neither used nor tested, and providing it goes
against the goal of nvim-treesitter not being a required dependency for
other plugins.

Solution: Remove the module and document that the queries are provided
as-is for limited backward compatibility only.
---
 CONTRIBUTING.md                |   7 +-
 README.md                      |   2 +-
 lua/nvim-treesitter/locals.lua | 457 ---------------------------------
 3 files changed, 5 insertions(+), 461 deletions(-)
 delete mode 100644 lua/nvim-treesitter/locals.lua

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 81cd45dbb..ed87f8284 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,10 +51,10 @@ Each of these `scheme` files contains a _tree-sitter query_ for a given purpose.
 Before going any further, we highly suggest that you [read more about tree-sitter queries](https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries).
 
 Each query has an appropriate name, which is then used by modules to extract data from the syntax tree.
-For now these are the types of queries used by `nvim-treesitter`:
+For now these are the types of queries provided by `nvim-treesitter`:
 
 - `highlights.scm`: used for syntax highlighting, using the `highlight` module.
-- `locals.scm`: used to extract keyword definitions, scopes, references, etc, using the `locals` module.
+- `locals.scm`: used to extract keyword definitions, scopes, references, etc. (not used in this plugin).
 - `textobjects.scm`: used to define text objects.
 - `folds.scm`: used to define folds.
 - `injections.scm`: used to define injections.
@@ -296,7 +296,8 @@ Locals are used to keep track of definitions and references in local or global
 scopes, see [upstream
 documentation](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables).
 Note that nvim-treesitter uses more specific subcaptures for definitions and
-**does not use locals for highlighting**.
+**does not use locals** (for highlighting or any other purpose). These queries
+are only provided for (limited) backwards compatibility.
 
 ```query
 @local.definition            ; various definitions
diff --git a/README.md b/README.md
index d3de57759..5b04cf86c 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ Injections are used for multi-language documents, see `:h treesitter-language-in
 
 ## Locals
 
-These queries can be used to look up definitions and references to identifiers in a given scope. They are used, e.g., by the `nvim-treesitter-refactor` plugin.
+These queries can be used to look up definitions and references to identifiers in a given scope. They are not used in this plugin and are provided for (limited) backward compatibility.
 
 # Advanced setup
 
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
deleted file mode 100644
index 6bddb752f..000000000
--- a/lua/nvim-treesitter/locals.lua
+++ /dev/null
@@ -1,457 +0,0 @@
--- Functions to handle locals
--- Locals are a generalization of definition and scopes
--- it's the way nvim-treesitter uses to "understand" the code
-
-local api = vim.api
-local ts = vim.treesitter
-
-local M = {}
-
-local function get_named_children(node)
-  local nodes = {} ---@type TSNode[]
-  for i = 0, node:named_child_count() - 1, 1 do
-    nodes[i + 1] = node:named_child(i)
-  end
-  return nodes
-end
-
--- Creates unique id for a node based on text and range
----@param scope TSNode: the scope node of the definition
----@param node_text string: the node text to use
----@return string: a string id
-function M.get_definition_id(scope, node_text)
-  -- Add a valid starting character in case node text doesn't start with a valid one.
-  return table.concat({ 'k', node_text or '', scope:range() }, '_')
-end
-
--- Gets a table with all the scopes containing a node
--- The order is from most specific to least (bottom up)
----@param node TSNode
----@param bufnr integer
----@return TSNode[]
-function M.get_scope_tree(node, bufnr)
-  local scopes = {} ---@type TSNode[]
-
-  for scope in M.iter_scope_tree(node, bufnr) do
-    table.insert(scopes, scope)
-  end
-
-  return scopes
-end
-
--- Iterates over a nodes scopes moving from the bottom up
----@param node TSNode
----@param bufnr integer
----@return fun(): TSNode?
-function M.iter_scope_tree(node, bufnr)
-  local last_node = node ---@type TSNode?
-  return function()
-    if not last_node then
-      return
-    end
-
-    local scope = M.containing_scope(last_node, bufnr, false) or node:tree():root()
-
-    last_node = scope:parent()
-
-    return scope
-  end
-end
-
--- Gets a table of all nodes and their 'kinds' from a locals list
----@param local_def TSLocal[] the local list result
----@return TSLocal[] a list of node entries
-function M.get_local_nodes(local_def)
-  local result = {}
-
-  M.recurse_local_nodes(local_def, function(def, _, kind)
-    table.insert(result, vim.tbl_extend('keep', { kind = kind }, def))
-  end)
-
-  return result
-end
-
--- Recurse locals results until a node is found.
--- The accumulator function is given
--- * The table of the node
--- * The node
--- * The full definition match `@local.definition.var.something` -> 'var.something'
--- * The last definition match `@local.definition.var.something` -> 'something'
----@param local_def TSLocal The locals result
----@param accumulator function The accumulator function
----@param full_match? string The full match path to append to
----@param last_match? string The last match
-function M.recurse_local_nodes(local_def, accumulator, full_match, last_match)
-  if type(local_def) ~= 'table' then
-    return
-  end
-
-  if local_def.node then
-    accumulator(local_def, local_def.node, full_match, last_match)
-  else
-    for match_key, def in
-      pairs(local_def --[[@as {[string]: TSLocal}]])
-    do
-      M.recurse_local_nodes(
-        def,
-        accumulator,
-        full_match and (full_match .. '.' .. match_key) or match_key,
-        match_key
-      )
-    end
-  end
-end
-
----Memoize a function using hash_fn to hash the arguments.
----@generic F: function
----@param fn F
----@param hash_fn fun(...): any
----@return F
-local function memoize(fn, hash_fn)
-  local cache = setmetatable({}, { __mode = 'kv' }) ---@type table<any,any[]>
-
-  return function(...)
-    local key = hash_fn(...)
-    if cache[key] == nil then
-      local v = { fn(...) } ---@type any[]
-
-      for k, value in pairs(v) do
-        if value == nil then
-          value[k] = vim.NIL ---@type table
-        end
-      end
-
-      cache[key] = v
-    end
-
-    local v = cache[key]
-
-    for k, value in ipairs(v) do
-      if value == vim.NIL then
-        value[k] = nil ---@type table
-      end
-    end
-
-    return unpack(v)
-  end
-end
----@param bufnr integer: the buffer
----@return TSNode|nil root: root node of the buffer
-local function get_root(bufnr)
-  local parser = ts.get_parser(bufnr)
-  if not parser then
-    return
-  end
-  parser:parse()
-  return parser:trees()[1]:root()
-end
-
----@param bufnr integer: the buffer
----@return vim.treesitter.Query|nil query: `locals` query
----@return TSNode|nil root: root node of the bufferocal function get_query(bufnr)
-local function get_query(bufnr)
-  local root = get_root(bufnr)
-
-  local ft = vim.bo[bufnr].filetype
-  local lang = ts.language.get_lang(ft) or ft
-
-  local query = (ts.query.get(lang, 'locals'))
-
-  return query, root
-end
-
----@alias TSScope "parent"|"local"|"global"
-
----@class TSLocal
----@field kind string
----@field node TSNode
----@field scope TSScope
-
--- Return all locals for the buffer
---
--- memoized by buffer tick
---
----@param bufnr integer buffer
----@return TSLocal[] definitions
----@return TSLocal[] references
----@return TSNode[] scopes
-M.get = memoize(function(bufnr)
-  local query, root = get_query(bufnr)
-  if not query or not root then
-    return {}, {}, {}
-  end
-
-  local definitions = {}
-  local scopes = {}
-  local references = {}
-  for id, node, metadata in query:iter_captures(root, bufnr) do
-    local kind = query.captures[id]
-
-    local scope = 'local' ---@type string
-    for k, v in
-      pairs(metadata --[[@as {[integer|string]: string}]])
-    do
-      if type(k) == 'string' and vim.endswith(k, 'local.scope') then
-        scope = v
-      end
-    end
-
-    if node and vim.startswith(kind, 'local.definition') then
-      table.insert(definitions, { kind = kind, node = node, scope = scope })
-    end
-
-    if node and kind == 'local.scope' then
-      table.insert(scopes, node)
-    end
-
-    if node and kind == 'local.reference' then
-      table.insert(references, { kind = kind, node = node, scope = scope })
-    end
-  end
-
-  return definitions, references, scopes
-end, function(bufnr)
-  local root = get_root(bufnr)
-  if not root then
-    return tostring(bufnr)
-  end
-  return tostring(root:id())
-end)
-
--- Get a single dimension table to look definition nodes.
--- Keys are generated by using the range of the containing scope and the text of the definition node.
--- This makes looking up a definition for a given scope a simple key lookup.
---
--- This is memoized by buffer tick. If the function is called in succession
--- without the buffer tick changing, then the previous result will be used
--- since the syntax tree hasn't changed.
---
--- Usage lookups require finding the definition of the node, so `find_definition`
--- is called very frequently, which is why this lookup must be fast as possible.
---
----@param bufnr integer: the buffer
----@return TSLocal[] result: a table for looking up definitions
-M.get_definitions_lookup_table = memoize(function(bufnr)
-  local definitions, _, _ = M.get(bufnr)
-  if not definitions then
-    return {}
-  end
-
-  local result = {} ---@type TSLocal[]
-  for _, definition in ipairs(definitions) do
-    for _, node_entry in ipairs(M.get_local_nodes(definition)) do
-      local scopes = M.get_definition_scopes(node_entry.node, bufnr, node_entry.scope)
-      -- Always use the highest valid scope
-      local scope = scopes[#scopes]
-      local node_text = ts.get_node_text(node_entry.node, bufnr)
-      local id = M.get_definition_id(scope, node_text)
-
-      result[id] = node_entry
-    end
-  end
-
-  return result
-end, function(bufnr)
-  local root = get_root(bufnr)
-  if not root then
-    return tostring(bufnr)
-  end
-  return tostring(root:id())
-end)
-
--- Gets all the scopes of a definition based on the scope type
--- Scope types can be
---
--- "parent": Uses the parent of the containing scope, basically, skipping a scope
--- "global": Uses the top most scope
--- "local": Uses the containing scope of the definition. This is the default
---
----@param node TSNode: the definition node
----@param bufnr integer: the buffer
----@param scope_type TSScope: the scope type
----@return TSNode[]
-function M.get_definition_scopes(node, bufnr, scope_type)
-  local scopes = {}
-  local scope_count = 1 ---@type integer?
-
-  -- Definition is valid for the containing scope
-  -- and the containing scope of that scope
-  if scope_type == 'parent' then
-    scope_count = 2
-    -- Definition is valid in all parent scopes
-  elseif scope_type == 'global' then
-    scope_count = nil
-  end
-
-  local i = 0
-  for scope_node in M.iter_scope_tree(node, bufnr) do
-    table.insert(scopes, scope_node)
-    i = i + 1
-
-    if scope_count and i >= scope_count then
-      break
-    end
-  end
-
-  return scopes
-end
-
----@param node TSNode
----@param bufnr integer
----@return TSNode node
----@return TSNode scope
----@return string|nil kind
-function M.find_definition(node, bufnr)
-  local def_lookup = M.get_definitions_lookup_table(bufnr)
-  local node_text = ts.get_node_text(node, bufnr)
-
-  for scope in M.iter_scope_tree(node, bufnr) do
-    local id = M.get_definition_id(scope, node_text)
-
-    if def_lookup[id] then
-      local entry = def_lookup[id]
-
-      return entry.node, scope, entry.kind
-    end
-  end
-
-  return node, node:tree():root(), nil
-end
-
--- Finds usages of a node in a given scope.
----@param node TSNode the node to find usages for
----@param scope_node TSNode|nil the node to look within
----@param bufnr integer|nil the bufnr to look into
----@return TSNode[]: a list of nodes
-function M.find_usages(node, scope_node, bufnr)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  local node_text = ts.get_node_text(node, bufnr)
-
-  if not node_text or #node_text < 1 then
-    return {}
-  end
-
-  scope_node = scope_node or node:tree():root()
-  local usages = {}
-
-  local query, _ = get_query(bufnr)
-  if not query then
-    return {}
-  end
-
-  for id, node_capture in query:iter_captures(scope_node, bufnr) do
-    local kind = query.captures[id]
-    if
-      node_capture
-      and kind == 'local.reference'
-      and ts.get_node_text(node_capture, bufnr) == node_text
-    then
-      table.insert(usages, node_capture)
-    end
-  end
-
-  return usages
-end
-
----@param node TSNode
----@param bufnr? integer
----@param allow_scope? boolean
----@return TSNode?
-function M.containing_scope(node, bufnr, allow_scope)
-  bufnr = bufnr or api.nvim_get_current_buf()
-  allow_scope = allow_scope == nil or allow_scope == true
-
-  local _, _, scopes = M.get(bufnr)
-  if not node or not scopes then
-    return
-  end
-
-  local iter_node = node ---@type TSNode?
-
-  while iter_node ~= nil and not vim.tbl_contains(scopes, iter_node) do
-    iter_node = iter_node:parent() ---@type TSNode?
-  end
-
-  return iter_node or (allow_scope and node or nil)
-end
-
-function M.nested_scope(node, cursor_pos)
-  local bufnr = api.nvim_get_current_buf()
-
-  local _, _, scopes = M.get(bufnr)
-  if not node or not scopes then
-    return
-  end
-
-  local row = cursor_pos.row ---@type integer
-  local col = cursor_pos.col ---@type integer
-  local scope = M.containing_scope(node)
-
-  for _, child in ipairs(get_named_children(scope)) do
-    local row_, col_ = child:start()
-    if vim.tbl_contains(scopes, child) and ((row_ + 1 == row and col_ > col) or row_ + 1 > row) then
-      return child
-    end
-  end
-end
-
-function M.next_scope(node)
-  local bufnr = api.nvim_get_current_buf()
-
-  local _, _, scopes = M.get(bufnr)
-  if not node or not scopes then
-    return
-  end
-
-  local scope = M.containing_scope(node)
-  if not scope then
-    return
-  end
-
-  local parent = scope:parent()
-  if not parent then
-    return
-  end
-
-  local is_prev = true
-  for _, child in ipairs(get_named_children(parent)) do
-    if child == scope then
-      is_prev = false
-    elseif not is_prev and vim.tbl_contains(scopes, child) then
-      return child
-    end
-  end
-end
-
----@param node TSNode
----@return TSNode|nil
-function M.previous_scope(node)
-  local bufnr = api.nvim_get_current_buf()
-
-  local _, _, scopes = M.get(bufnr)
-  if not node or not scopes then
-    return
-  end
-
-  local scope = M.containing_scope(node)
-  if not scope then
-    return
-  end
-
-  local parent = scope:parent()
-  if not parent then
-    return
-  end
-
-  local is_prev = true
-  local children = get_named_children(parent)
-  for i = #children, 1, -1 do
-    if children[i] == scope then
-      is_prev = false
-    elseif not is_prev and vim.tbl_contains(scopes, children[i]) then
-      return children[i]
-    end
-  end
-end
-
-return M

From dc8f3415a7d5955f2dba5835fa989927b0ed0d24 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 May 2024 19:55:41 +0200
Subject: [PATCH 2349/2704] feat!: update tier 1 parsers to versions

---
 .github/workflows/update-parsers.yml | 15 +++++---
 CONTRIBUTING.md                      |  5 +++
 TODO.md                              |  3 +-
 scripts/install-parsers.lua          |  2 +-
 scripts/update-parsers.lua           | 51 ++++++++++++++++++++++------
 5 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/update-parsers.yml b/.github/workflows/update-parsers.yml
index ba3286428..351beef67 100644
--- a/.github/workflows/update-parsers.yml
+++ b/.github/workflows/update-parsers.yml
@@ -10,7 +10,11 @@ env:
 
 jobs:
   update-parsers:
-    name: Update parsers
+    strategy:
+      fail-fast: false
+      matrix:
+        tier: [1, 2]
+    name: Update parsers tier ${{ matrix.tier }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +39,7 @@ jobs:
           (cd "$BIN_DIR"; unzip stylua*.zip)
 
       - name: Update parsers
-        run: ./scripts/update-parsers.lua
+        run: ./scripts/update-parsers.lua --tier=${{ matrix.tier }}
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
@@ -44,12 +48,13 @@ jobs:
           token: ${{ steps.app-token.outputs.token }}
           sign-commits: true
           commit-message: "bot(parsers): update ${{ env.UPDATED_PARSERS }}"
-          title: "Update parsers: ${{ env.UPDATED_PARSERS }}"
+          title: "Update parsers (tier ${{ matrix.tier }}): ${{ env.UPDATED_PARSERS }}"
           body: "[beep boop](https://github.com/peter-evans/create-pull-request)"
-          branch: update-parsers-pr
+          branch: update-parsers-tier-${{ matrix.tier }}
           base: ${{ github.head_ref }}
 
       - name: Enable Pull Request Automerge
+        if: ${{ matrix.tier == 2 }}
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh pr merge --rebase --auto update-parsers-pr
+        run: gh pr merge --rebase --auto update-parsers-tier-2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ed87f8284..845891459 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,6 +36,11 @@ zimbu = {
 
 **Note:** The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
 
+**Note:** To qualify for Tier 1 ("stable"), a parser needs to
+ * make releases following semver (_patch_ for fixes not affecting queries; _minor_ for changes introducing new nodes or patterns; _major_ for changes removing nodes or previously valid patterns);
+ * provide WASM release artifacts;
+ * include and maintain reference queries.
+
 2. If the parser name is not the same as the Vim filetype, add an entry to the `filetypes` table in `plugin/filetypes.lua`:
 
 ```lua
diff --git a/TODO.md b/TODO.md
index 9c6d5fafd..7bf42c9aa 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,8 +4,6 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
-- [ ] **`parsers.lua`:** track versioned releases for tier 1
-- [ ] **`parsers.lua`:** add WASM support (tier 1)
 - [ ] **`install.lua`:** migrate to async v2
 - [ ] **tests:** remove custom crate, plenary dependency
 - [ ] **documentation:** consolidate, autogenerate?
@@ -29,3 +27,4 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [X] remove locals from highlighting (cf. https://github.com/nvim-treesitter/nvim-treesitter/issues/3944#issuecomment-1458782497)
 - [X] drop ensure_install (replace with install)
 - [X] **CI:** switch to ts_query_ls, add update readme as check (remove update job)
+- [X] **CI:** track versioned releases for tier 1
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index 1d9448ca7..6dbc73d68 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -2,7 +2,7 @@
 
 local generate = false
 local update = false
-local max_jobs = nil ---@as integer
+local max_jobs = nil ---@type integer?
 local parsers = {}
 for i = 1, #_G.arg do
   if _G.arg[i] == '--generate' then
diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index 70055c81d..fb09b9933 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -1,4 +1,18 @@
 #!/usr/bin/env -S nvim -l
+-- Update parsers to latest version (tier 1, stable) or commit (tier 2, unstable)
+--
+-- Usage:
+-- nvim -l update-parsers.lua            # update all (stable and unstable) parsers
+-- nvim -l update-parsers.lua --tier=1   # update stable parsers to latest version
+-- nvim -l update-parsers.lua --tier=2   # update unstable parsers to latest commit
+
+local tier = nil ---@type integer?
+for i = 1, #_G.arg do
+  if _G.arg[i]:find('^%-%-tier=') then
+    tier = tonumber(_G.arg[i]:match('=(%d+)'))
+  end
+end
+
 vim.opt.runtimepath:append('.')
 local util = require('nvim-treesitter.util')
 local parsers = require('nvim-treesitter.parsers')
@@ -8,9 +22,21 @@ local updates = {} ---@type string[]
 
 -- check for new revisions
 for k, p in pairs(parsers) do
-  if p.tier <= 2 and p.install_info then
+  if p.tier <= 2 and (tier == nil or p.tier == tier) and p.install_info then
     print('Updating ' .. k)
-    jobs[k] = vim.system({ 'git', 'ls-remote', p.install_info.url })
+    local cmd = p.tier == 1
+        and {
+          'git',
+          '-c',
+          'versionsort.suffix=-',
+          'ls-remote',
+          '--tags',
+          '--refs',
+          '--sort=v:refname',
+          p.install_info.url,
+        }
+      or { 'git', 'ls-remote', p.install_info.url }
+    jobs[k] = vim.system(cmd)
   end
 
   if #vim.tbl_keys(jobs) % 100 == 0 or next(parsers, k) == nil then
@@ -21,18 +47,23 @@ for k, p in pairs(parsers) do
       local info = parsers[name].install_info
       assert(info)
 
-      local branch = info.branch
-      local line = 1
-      if branch then
-        for j, l in ipairs(stdout) do
-          if l:find(vim.pesc(branch)) then
-            line = j
-            break
+      local sha ---@type string
+      if parsers[name].tier == 1 then
+        sha = stdout[#stdout - 1]:match('v[%d%.]+$')
+      else
+        local branch = info.branch
+        local line = 1
+        if branch then
+          for j, l in ipairs(stdout) do
+            if l:find(vim.pesc(branch)) then
+              line = j
+              break
+            end
           end
         end
+        sha = vim.split(stdout[line], '\t')[1]
       end
 
-      local sha = vim.split(stdout[line], '\t')[1]
       if info.revision ~= sha then
         info.revision = sha
         updates[#updates + 1] = name

From f10bcac66b67f5fcbf24290cfcac4b3581d912d1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 6 May 2025 10:35:58 +0200
Subject: [PATCH 2350/2704] feat(parsers): update vim, gren, comment,
 purescript, elm, matlab, javadoc, swift, godot_resource, query, vimdoc,
 ledger

---
 lua/nvim-treesitter/parsers.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 338cc0017..213f6fb24 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -230,7 +230,7 @@ return {
   },
   comment = {
     install_info = {
-      revision = '85eae6644d25bcbdd19f4a35c9946abc71c2d6fe',
+      revision = '689be73775bd2dd57b938b8e12bf50fec35a6ca3',
       url = 'https://github.com/stsewd/tree-sitter-comment',
     },
     maintainers = { '@stsewd' },
@@ -473,7 +473,7 @@ return {
   },
   elm = {
     install_info = {
-      revision = '3b373a3ccb48f31aa4b7ddc9092e2f5e24ab7aed',
+      revision = '6e3c6d51f13168f9d7794c8e8add7dfdd07d20b8',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
@@ -778,7 +778,7 @@ return {
   },
   godot_resource = {
     install_info = {
-      revision = '91c55fdf325a832659e59cdf4a02bfe8a423f14c',
+      revision = '99417ca9f4eccbf49e4ce5a69d89228811593bf5',
       url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
     maintainers = { '@pierpo' },
@@ -835,7 +835,7 @@ return {
   },
   gren = {
     install_info = {
-      revision = '06389ece5bc7344ed3931dc516bb609d8864dd2a',
+      revision = 'c36aac51a915fdfcaf178128ba1e9c2205b25930',
       url = 'https://github.com/MaeBrooks/tree-sitter-gren',
     },
     maintainers = { '@MaeBrooks' },
@@ -1068,7 +1068,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '5ae22c17a9a60ffbf674f00d0080d4304fde2231',
+      revision = 'e49c8f0e26dc79afc999f377121ecceb30ffcc74',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1241,7 +1241,7 @@ return {
   },
   ledger = {
     install_info = {
-      revision = '4d828c87e8bf3f7cef9927417b47ce1126c1ca29',
+      revision = '96c92d4908a836bf8f661166721c98439f8afb80',
       url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
     maintainers = { '@cbarrete' },
@@ -1360,7 +1360,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'bbf1b3f0bd7417c1efb8958fe95be3d0d540207a',
+      revision = '88ccb5ee90711e9961582d421c42bc8c6bd53f59',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1740,7 +1740,7 @@ return {
   },
   purescript = {
     install_info = {
-      revision = 'daf9b3e2be18b0b2996a1281f7783e0d041d8b80',
+      revision = '4cacfdaa75090bb790965674fe387bb215bab64b',
       url = 'https://github.com/postsolar/tree-sitter-purescript',
     },
     maintainers = { '@postsolar' },
@@ -1790,7 +1790,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '930202c2a80965a7a9ca018b5b2a08b25dfa7f12',
+      revision = 'dbab9b69f954167fb88785450dab32e5283b758d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2501,7 +2501,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '054c4beaf7b95b52cb20b138bfd8b6fd6ba561a7',
+      revision = 'ccc312e878aa84f32d180b8528a3585c7b86a545',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2509,7 +2509,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = '2694c3d27e2ca98a0ccde72f33887394300d524e',
+      revision = '6dab95ab84a006e8adfd6966c5fd9dde48224725',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },

From a7ab4381ae14736f53e9cd2e5a7798e561b6cc07 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 10 May 2025 10:23:59 +0200
Subject: [PATCH 2351/2704] feat(parsers): update t32, query, markdown,
 markdown_inline, meson, hyprlang, mlir, cpp, cylc

---
 lua/nvim-treesitter/parsers.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 213f6fb24..75278cd02 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -270,7 +270,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = 'e5cea0ec884c5c3d2d1e41a741a66ce13da4d945',
+      revision = '56455f4245baf4ea4e0881c5169de69d7edd5ae7',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -314,7 +314,7 @@ return {
   },
   cylc = {
     install_info = {
-      revision = '8b895c278f98d05e67997f5e3a43fb5531933023',
+      revision = '1f3cb70200b4e238e19652705336e7f2c52b8e2f',
       url = 'https://github.com/elliotfontaine/tree-sitter-cylc',
     },
     maintainers = { '@elliotfontaine' },
@@ -995,7 +995,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      revision = 'd719158abe537b1916daaea6fa03287089f0b601',
+      revision = 'd0441fd4b883ecc0e70140723a1cf5907992639a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
@@ -1340,7 +1340,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '413285231ce8fa8b11e7074bbe265b48aa7277f9',
+      revision = '071b3b70baad138aa28832cf02d16ca48f2e6f4d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1351,7 +1351,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '413285231ce8fa8b11e7074bbe265b48aa7277f9',
+      revision = '071b3b70baad138aa28832cf02d16ca48f2e6f4d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1383,7 +1383,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '8212b10366236987899e04645e572779ec0d0170',
+      revision = 'b1ff0037b665e7e84715390820d6ecbe763a9c79',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1392,7 +1392,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'a6ebbe50145120da1e72f732010c1e39adb98596',
+      revision = 'fdaa92565f5902afe81d958a48049f56721fd928',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1790,7 +1790,7 @@ return {
   },
   query = {
     install_info = {
-      revision = 'dbab9b69f954167fb88785450dab32e5283b758d',
+      revision = 'eba45dd965e119cb7cd3d5eea584e5d04bbef9a4',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2219,7 +2219,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = 'fd70d50f0b4789fd2bafc61e24057087336f4f68',
+      revision = '61607b32915fdeda275b2346e6a76a7c9b363251',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },

From e8bfe271b0da136048cdf20128b758ec87318479 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 5 May 2025 11:00:16 +0200
Subject: [PATCH 2352/2704] docs: update to rewrite

This updates

* README
* CONTRIBUTING
* the `:h nvim-treesitter` documentation

to the current state of `main`. It also adds a pull request template for
adding a new language.
---
 .github/PULL_REQUEST_TEMPLATE/new_language.md |  45 +++
 .github/pull_request_template.md              |   5 +
 .tsqueryrc.json                               |  16 +-
 CONTRIBUTING.md                               | 308 ++++++++++++------
 README.md                                     |  77 ++---
 TODO.md                                       |   2 -
 doc/nvim-treesitter.txt                       | 247 +++++++-------
 lua/nvim-treesitter/health.lua                |   2 +-
 8 files changed, 403 insertions(+), 299 deletions(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/new_language.md
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/PULL_REQUEST_TEMPLATE/new_language.md b/.github/PULL_REQUEST_TEMPLATE/new_language.md
new file mode 100644
index 000000000..0f814f0f0
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/new_language.md
@@ -0,0 +1,45 @@
+<!-- 
+  Before proceeding, make sure you have read https://github.com/nvim-treesitter/nvim-treesitter/blob/main/CONTRIBUTING.md!
+  Make sure to fill out all fields and read the checklist at the end.
+-->
+
+# Name of language
+
+<!-- Link to an official description of the language -->
+https://...
+
+<details>
+<summary>Representative code sample</summary>
+```
+max. 50 lines
+```
+</details>
+
+## Parser repo
+
+https://github.com/...
+
+<details>
+<summary>Parsed tree for code sample</summary>
+```
+paste output of tree-sitter parse or :InspectTree here
+```
+</details>
+
+## Queries
+
+Source of queries: https://github.com/... (or "written from scratch")
+
+<details>
+<summary>Screenshots of code sample</summary>
+<!-- paste screenshot of code sample using provided queries here -->
+</details>
+
+<!--
+CHECKLIST: _Before_ submitting, make sure
+
+* `./scripts/install-parsers.lua <language>` works without warnings
+* `./scripts/install-parsers.lua --generate <language>` works without warnings
+* `make query` works without warning
+* `make docs` is run
+-->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..1f5207d98
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,5 @@
+<!--
+  Before proceeding, make sure you have read https://github.com/nvim-treesitter/nvim-treesitter/blob/main/CONTRIBUTING.md!
+  If you are adding a new parser, use this link instead:
+  <https://github.com/nvim-treesitter/nvim-treesitter/compare/main...my-branch?quick_pull=1&template=new_language.md>
+-->
diff --git a/.tsqueryrc.json b/.tsqueryrc.json
index 129550b46..6d020e987 100644
--- a/.tsqueryrc.json
+++ b/.tsqueryrc.json
@@ -129,14 +129,14 @@
       "fold": "fold this node"
     },
     "indents": {
-      "indent.begin": "indent children when matching this node",
-      "indent.end": "marks the end of indented block",
-      "indent.align": "behaves like python aligned/hanging indent",
-      "indent.dedent": "dedent children when matching this node",
-      "indent.branch": "dedent itself when matching this node",
-      "indent.ignore": "do not indent in this node",
-      "indent.auto": "behaves like 'autoindent' buffer option",
-      "indent.zero": "sets this node at position 0 (no indent)"
+      "indent.begin": "Specifies that the next line should be indented.  Multiple indents on the same line get collapsed. Indent can also have `indent.immediate` set using a `#set!` directive, which permits the next line to indent even when the block intended to be indented has no content yet, improving interactive typing.",
+      "indent.end": "Used to specify that the indented region ends and any text subsequent to the capture should be dedented.",
+      "indent.align": "Specifies aligned indent blocks (like python aligned/hanging indent). Specify the delimiters with `indent.open_delimiter` and `indent.close_delimiter` metadata. For some languages, the last line of an `indent.align` block must not be the same indent as the natural next line, which can be controlled by setting `indent.avoid_last_matching_next`.",
+      "indent.dedent": "Specifies dedenting starting on the next line.",
+      "indent.branch": "Used to specify that a dedented region starts at the line including the captured nodes.",
+      "indent.ignore": "Specifies that indentation should be ignored for this node.",
+      "indent.auto": "Behaves like 'autoindent' buffer option.",
+      "indent.zero": "Sets indentation for this node to zero (no indentation)."
     },
     "locals": {
       "local.definition": "various definitions",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 845891459..983499e81 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,16 @@
 # Contributing to `nvim-treesitter`
 
-First of all, thank you very much for contributing to `nvim-treesitter`.
+The main parts of `nvim-treesitter` are
+* a curated list of [parsers](#Parsers);
+* a collection of [queries](#Queries).
 
-If you haven't already, you should really come and reach out to us on our
-[Matrix channel], so we can help you with any question you might have!
-
-The main goal of `nvim-treesitter` is to provide a framework to easily install parsers and queries.
-
-Depending on which part of the plugin you want to contribute to, please read the appropriate section.
+Before describing these in detail, some general advice:
+* Some basic knowledge of how tree-sitter works is assumed; we recommend reading
+  - the [upstream documentation](https://tree-sitter.github.io/tree-sitter/);
+  - [Neovim's documentation](https://neovim.io/doc/user/treesitter.html#treesitter).
+* There are dedicated Matrix channels for questions and general help:
+  - [#nvim-treesitter](https://matrix.to/#/#nvim-treesitter:matrix.org) for questions specific to Neovim's implementation and the queries here;
+  - [#tree-sitter](https://matrix.to/#/#tree-sitter-chat:matrix.org) for general questions regarding treesitter queries and the `tree-sitter` CLI.
 
 ## Parsers
 
@@ -34,12 +37,14 @@ zimbu = {
 }
 ```
 
-**Note:** The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
+>[!IMPORTANT]
+> The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
 
-**Note:** To qualify for Tier 1 ("stable"), a parser needs to
- * make releases following semver (_patch_ for fixes not affecting queries; _minor_ for changes introducing new nodes or patterns; _major_ for changes removing nodes or previously valid patterns);
- * provide WASM release artifacts;
- * include and maintain reference queries.
+>[!NOTE]
+> To qualify for Tier 1 ("stable"), a parser needs to
+> * make releases following semver (_patch_ for fixes not affecting queries; _minor_ for changes introducing new nodes or patterns; _major_ for changes removing nodes or previously valid patterns);
+> * provide WASM release artifacts;
+> * include and maintain reference queries.
 
 2. If the parser name is not the same as the Vim filetype, add an entry to the `filetypes` table in `plugin/filetypes.lua`:
 
@@ -47,30 +52,41 @@ zimbu = {
   zimbu = { 'zu' },
 ```
 
-**Note: We only support external scanners written in C for portability reasons.**
+>[!IMPORTANT]
+> Only external scanners written in C are supported for portability reasons.
+
+3. Update the list of [supported languages] by running `make docs` (or `./scripts/update-readme.lua` if on Windows).
+
+4. Test if both `:TSInstall zimbu` and `:TSInstallFromGrammar zimbu` work without errors (`:checkhealth treesitter` or `./scripts/check-parsers.lua zimbu`).
+
+>[!IMPORTANT]
+> You also need to add queries in order for the parser to actually be useful!
+
+When you're done, open a Pull Request using the [provided template](.github/PULL_REQUEST_TEMPLATE/new_language.md), e.g. using `gh pr create -B main -T new_language`.
 
 ## Queries
 
-Contributing to queries for an existing parser is basically modifying one of the `runtime/queries/*/*.scm`.
-Each of these `scheme` files contains a _tree-sitter query_ for a given purpose.
-Before going any further, we highly suggest that you [read more about tree-sitter queries](https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries).
+To add (or edit existing) queries, create a corresponding `runtime/queries/zimbu/*.scm` file:
 
-Each query has an appropriate name, which is then used by modules to extract data from the syntax tree.
-For now these are the types of queries provided by `nvim-treesitter`:
-
-- `highlights.scm`: used for syntax highlighting, using the `highlight` module.
+- `highlights.scm` used for syntax highlighting,
+- `injections.scm` used to specify nodes whose content should be parsed as a different language;
+- `folds.scm`; used to define folds;
 - `locals.scm`: used to extract keyword definitions, scopes, references, etc. (not used in this plugin).
-- `textobjects.scm`: used to define text objects.
-- `folds.scm`: used to define folds.
-- `injections.scm`: used to define injections.
+- `indents.scm`; used to control indentation.
 
-For these types there is a _norm_ you will have to follow so that features work fine.
-Here are some global advices:
+See [tree-sitter queries] for a basic description of the query language. The following tools can be helpful when writing or editing queries:
+* [ts_query_ls] is a language server for treesitter queries, which can validate, autocomplete, and format. This tool can also be used as an offline linter and formatter (accessible through `make lintquery`, `make checkquery`, `make formatquery` targets).
+* Neovim's `:InspectTree` will show the parsed tree for a buffer and highlight the text corresponding to any given node (and vice versa).
+* `:EditQuery` opens a "playground" where you can write query patterns and see which parts of the buffer are captured by each capture.
 
-- Examples of queries can be found in [runtime/queries/](runtime/queries/)
-- For highlights, all matching patterns are applied, with the last one determining the visible capture & highlight.
-- For injections, try your best to ensure that each captured node is only matched by a single pattern.
-- If the [parser is included in `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/SUPPORTED_LANGUAGES.md`) and installed with `:TSInstall`, you can use Neovim's developer tools (`:checkhealth`, `:InspectTree`, `:EditQuery`, `:Inspect`) to test your queries.
+>[!IMPORTANT]
+> The valid captures that can be used in queries is different for each editor, so you cannot just copy them, e.g., from Helix or the parser repositories. For Neovim, all valid captures are listed below. You can verify that your changes adhere to this by running `make lintquery`.
+
+>[!IMPORTANT]
+> Since grammars can change constantly, it is important to make sure that the patterns in a query are actually valid for the parser specified in nvim-treesitter's manifest. This can be verified using `make checkquery` (which requires the parser to be installed in the default directory(!) through `nvim-treesitter`). Opening the query in Neovim with the parser installed will also show all invalid patterns, either via [ts_query_ls] or Neovim's builtin query-linter.
+
+>[!TIP]
+> Before opening a PR, run `make query` to format, lint, and check all queries.
 
 #### Inheriting languages
 
@@ -96,7 +112,10 @@ Should you need to preserve a specific format for a node, you can exempt it (and
 
 ### Highlights
 
-As languages differ quite a lot, here is a set of captures available to you when building a `highlights.scm` query. Note that your color scheme needs to define (or link) these captures as highlight groups.
+Syntax highlighting is specified in a `highlights.scm` query, which assigns treesitter nodes to captures that can be assigned a highlight group. This feature is implemented in Neovim and documented at [`:h treesitter-highlight`](https://neovim.io/doc/user/treesitter.html#treesitter-highlight).
+Note that your color scheme needs to define (or link) these captures as highlight groups. You can use Neovim's built-in `:Inspect` function to see exactly which highlight groups are applied at a given position.
+
+The valid captures are listed below.
 
 #### Identifiers
 
@@ -255,45 +274,179 @@ Mainly for markup languages.
 #### Non-highlighting captures
 
 ```query
-@none    ; completely disable the highlight
 @conceal ; captures that are only meant to be concealed
 ```
 
+>[!TIP]
+> * See [`:h tree-sitter-highlight-conceal`](https://neovim.io/doc/user/treesitter.html#treesitter-highlight-conceal).
+> * The capture should be meaningful to allow proper highlighting when `set conceallevel=0`.
+> * A conceal can be restricted to part of the capture via the [`#offset!` directive](https://neovim.io/doc/user/treesitter.html#treesitter-directive-offset%21).
+
 ```query
 @spell   ; for defining regions to be spellchecked
 @nospell ; for defining regions that should NOT be spellchecked
 ```
 
-The main types of nodes which are spell checked are:
-- Comments
-- Strings; where it makes sense. Strings that have interpolation or are typically used for non text purposes are not spell checked (e.g. bash).
+>[!TIP]
+> The main types of nodes that should be spell checked are
+> - comments
+> - strings; where it makes sense. Strings that have interpolation or are typically used for non text purposes are not spell checked (e.g. bash).
 
 #### Predicates
 
-Captures can be restricted according to node contents using [predicates](https://neovim.io/doc/user/treesitter.html#treesitter-predicates). For performance reasons, prefer earlier predicates in this list:
+Captures can be restricted according to node contents using [predicates](https://neovim.io/doc/user/treesitter.html#treesitter-predicates).
 
-1. `#eq?` (literal match)
-2. `#any-of?` (one of several literal matches)
-3. `#lua-match?` (match against a [Lua pattern](https://neovim.io/doc/user/luaref.html#lua-pattern))
-4. `#match?`/`#vim-match?` (match against a [Vim regular expression](https://neovim.io/doc/user/pattern.html#regexp)
+>[!IMPORTANT]
+> For performance reasons, prefer earlier predicates in this list:
+>
+> 1. `#eq?` (literal match)
+> 2. `#any-of?` (one of several literal matches)
+> 3. `#lua-match?` (match against a [Lua pattern](https://neovim.io/doc/user/luaref.html#lua-pattern))
+> 4. `#match?`/`#vim-match?` (match against a [Vim regular expression](https://neovim.io/doc/user/pattern.html#regexp)
 
-#### Conceal
+Besides those provided by Neovim, nvim-treesitter also implements
 
-Captures can be concealed by setting the [`conceal` metadata](https://neovim.io/doc/user/treesitter.html#treesitter-highlight-conceal), e.g..,
 ```query
-    (fenced_code_block_delimiter @markup.raw.block (#set! conceal ""))
+#kind-eq?      ; checks whether a capture corresponds to a given set of nodes
+#any-kind-eq?  ; checks whether any of a list of captures corresponds to a given set of nodes
 ```
-The capture should be meaningful to allow proper highlighting when `set conceallevel=0`. If the unconcealed capture should not be highlighted (e.g., because an earlier pattern handles this), you can use `@conceal`.
 
-A conceal can be restricted to part of the capture via the [`#offset!` directive](https://neovim.io/doc/user/treesitter.html#treesitter-directive-offset%21).
+#### Directives
+
+Nodes contain metadata that can be modified via [directives](https://neovim.io/doc/user/treesitter.html#treesitter-directives).
 
 #### Priority
 
 Captures can be assigned a priority to control precedence of highlights via the
-`#set! priority <number>` directive (see `:h treesitter-highlight-priority`).
-The default priority for treesitter highlights is `100`; queries should only
-set priorities between `90` and `120`, to avoid conflict with other sources of
-highlighting (such as diagnostics or LSP semantic tokens).
+`#set! priority <number>` directive (see [`:h treesitter-highlight-priority`](https://neovim.io/doc/user/treesitter.html#treesitter-highlight-priority)). This is useful for controlling conflicts with injected languages or when inheriting queries from other languages.
+
+>[!NOTE]
+> The default priority for treesitter highlights is `100`; queries should only
+set priorities between `90` and `120`, to avoid conflict with other sources of highlighting (such as diagnostics or LSP semantic tokens).
+
+>[!TIP]
+> Precedence is also influenced by pattern order in a query file. If possible, try to achieve the correct result by reordering patterns before resorting to explicit priorities.
+
+### Injections
+
+Language injections are controlled by `injections.scm` queries, which specify nodes that should be parsed as a different language. This feature is implemented in Neovim and documented at
+[`:h treesitter-language-injections](https://neovim.io/doc/user/treesitter.html#treesitter-language-injections).
+
+The valid captures are:
+
+```query
+@injection.language ; dynamic detection of the injection language (i.e. the text of the captured node describes the language)
+@injection.content  ; region for the dynamically detected language
+@injection.filename ; indicates that the captured node’s text may contain a filename; the corresponding filetype is then looked-up up via vim.filetype.match() and treated as the name of a language that should be used to re-parse the `@injection.content`
+```
+
+>[!TIP]
+> When writing injection queries, try to ensure that each captured node is only matched by a single pattern.
+
+### Folds
+
+You can define folds for a given language by adding a `folds.scm` query. This is implemented in Neovim. The only valid capture is
+
+```query
+@fold ; fold this node
+```
+
+### Indents
+
+>[!WARNING]
+> Treesitter-based indentation is still experimental and likely to have breaking changes in the future.
+
+Indentation for a language is controlled by `indents.scm` queries. The following captures can be used to set the indentation for nodes, either relative or absolute
+
+* `@indent.begin` specifies that the next line should be indented.  Multiple
+indents on the same line get collapsed, e.g.,
+```query
+  (
+   (if_statement)
+   (ERROR "else") @indent.begin
+  )
+```
+You can also `#set! indent.immediate` to permit the next line to indent even when the block intended to be indented has no content yet. (This can improve interactive typing.)
+For example for Python,
+```query
+ ((if_statement) @indent.begin
+   (#set! indent.immediate 1))
+```
+will allow
+```python
+  if True:<CR>
+      # Auto indent to here
+```
+
+* `@indent.end` is used to specify that the indented region ends and any text subsequent to the capture should be dedented.
+
+* `@indent.branch` is used to specify that a dedented region starts at the line _including_ the captured nodes.
+
+* `@indent.dedent` specifies dedenting starting on the _next_ line.
+
+* `@indent.auto` behaves like Vim's [`autoindent`](https://neovim.io/doc/user/options.html#'autoindent') buffer option (copy whatever the indentation of previous line is when opening a new line after it).
+
+* `@indent.ignore` specifies that no indent should be added to this node.
+
+* `@indent.zero` sets the indentation of this node to 0 (i.e., removes _all_ indentation).
+
+* `@indent.align` can be used to specify blocks that should have the same indentation.
+This allows
+```
+  foo(a,
+      b,
+      c)
+```
+as well as
+```
+  foo(
+    a,
+    b,
+    c)
+```
+and
+```
+  foo(
+    a,
+    b,
+    c
+  )
+```
+To specify the delimiters to align at, `#set! indent.open_delimiter` and
+`indent.close_delimiter`, e.g.,
+```query
+ ((argument_list) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+```
+For some languages, the last line of an `indent.align` block must not be
+the same indent as the natural next line.
+For example in Python,
+
+```python
+  if (a > b and
+      c < d):
+      pass
+```
+is not correct, whereas
+```python
+  if (a > b and
+	c < d):
+      pass
+```
+would be correctly indented.  This behavior may be selected by setting
+`indent.avoid_last_matching_next`. For example,
+```query
+ (if_statement
+  condition: (parenthesized_expression) @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1)
+ )
+```
+specifies that the last line of an `@indent.align` capture
+should be additionally indented to avoid clashing with the indent of the first
+line of the block inside an `if`.
 
 ### Locals
 
@@ -302,7 +455,7 @@ scopes, see [upstream
 documentation](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#local-variables).
 Note that nvim-treesitter uses more specific subcaptures for definitions and
 **does not use locals** (for highlighting or any other purpose). These queries
-are only provided for (limited) backwards compatibility.
+are only provided for limited backwards compatibility.
 
 ```query
 @local.definition            ; various definitions
@@ -349,58 +502,7 @@ Possible scope values are:
 - `global`: The definition is valid in the root scope
 - `local`: The definition is valid in the containing scope. This is the default behavior
 
-### Folds
 
-You can define folds for a given language by adding a `folds.scm` query :
-
-```query
-@fold ; fold this node
-```
-
-If the `folds.scm` query is not present, this will fall back to the `@local.scope` captures in the `locals`
-query.
-
-### Injections
-
-Some captures are related to language injection (like markdown code blocks). They are used in `injections.scm`.
-
-If you want to dynamically detect the language (e.g. for Markdown blocks) use the `@injection.language` to capture
-the node describing the language and `@injection.content` to describe the injection region.
-
-```query
-@injection.language ; dynamic detection of the injection language (i.e. the text of the captured node describes the language)
-@injection.content  ; region for the dynamically detected language
-@injection.filename ; indicates that the captured node’s text may contain a filename; the corresponding filetype is then looked-up up via vim.filetype.match() and treated as the name of a language that should be used to re-parse the `@injection.content`
-```
-
-For example, to inject javascript into HTML's `<script>` tag
-
-```html
-<script>someJsCode();</script>
-```
-
-```query
-(script_element
-  (raw_text) @injection.content
-  (#set! injection.language "javascript")) ; set the parser language for @injection.content region to javascript
-```
-
-For regions that don't have a corresponding `@injection.language`, you need to manually set the language 
-through `(#set injection.language "lang_name")`
-
-To combine all matches of a pattern as one single block of content, add `(#set! injection.combined)` to such pattern
-
-### Indents
-
-```query
-@indent.begin       ; indent children when matching this node
-@indent.end         ; marks the end of indented block
-@indent.align       ; behaves like python aligned/hanging indent
-@indent.dedent      ; dedent children when matching this node
-@indent.branch      ; dedent itself when matching this node
-@indent.ignore      ; do not indent in this node
-@indent.auto        ; behaves like 'autoindent' buffer option
-@indent.zero        ; sets this node at position 0 (no indent)
-```
-
-[Matrix channel]: https://matrix.to/#/#nvim-treesitter:matrix.org
+[supported languages]: https://github.com/nvim-treesitter/nvim-treesitter/SUPPORTED_LANGUAGES.md
+[tree-sitter queries]: https://tree-sitter.github.io/tree-sitter/using-parsers/queries/index.html
+[ts_query_ls]: https://github.com/ribru17/ts_query_ls
diff --git a/README.md b/README.md
index 5b04cf86c..f55b570ad 100644
--- a/README.md
+++ b/README.md
@@ -15,14 +15,16 @@
   </p>
 </div>
 
-# WARNING
 
-**This branch is a [full, incompatible, rewrite of `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767) and [work in progress](TODO.md).** The **stable** branch is [`master`](https://github.com/nvim-treesitter/nvim-treesitter/tree/master).
+>[!WARNING]
+> This branch is a [full, incompatible, rewrite of `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767) and [work in progress](TODO.md). The **stable** branch is [`master`](https://github.com/nvim-treesitter/nvim-treesitter/tree/master).
 
 The `nvim-treesitter` plugin provides
 1. functions for installing, updating, and removing [**tree-sitter parsers**](SUPPORTED_LANGUAGES.md);
 2. a collection of **queries** for enabling tree-sitter features built into Neovim for these languages.
 
+For details on these and how to help improving them, see [CONTRIBUTING.md](./CONTRIBUTING.md).
+
 # Quickstart
 
 ## Requirements
@@ -37,7 +39,7 @@ The `nvim-treesitter` plugin provides
 
 You can install `nvim-treesitter` with your favorite package manager (or using the native `package` feature of vim, see `:h packages`).
 
-**NOTE: This plugin is only guaranteed to work with specific versions of language parsers** (as specified in the `parser.lua` table). **When upgrading the plugin, you must make sure that all installed parsers are updated to the latest version** via `:TSUpdate`.
+This plugin is only guaranteed to work with specific versions of language parsers** (as specified in the `parser.lua` table). **When upgrading the plugin, you must make sure that all installed parsers are updated to the latest version** via `:TSUpdate`.
 It is strongly recommended to automate this; e.g., using [lazy.nvim](https://github.com/folke/lazy.nvim)
 
 ```lua
@@ -46,7 +48,8 @@ require('lazy').setup(
 )
 ```
 
-**NOTE: This plugin does not support lazy-loading.**
+>[!IMPORTANT]
+> This plugin does not support lazy-loading.
 
 ## Setup
 
@@ -67,7 +70,14 @@ Parsers and queries can then be installed with
 require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
 ```
 
-(This is a no-op if the parsers are already installed.) Note that this function runs asynchronously; for synchronous installation in a script context ("bootstrapping"), adapt [this script](scripts/install-parsers.lua) to your needs.
+(This is a no-op if the parsers are already installed.) Note that this function runs asynchronously; for synchronous installation in a script context ("bootstrapping"), use something like
+```lua
+local done = nil
+require('nvim-treesitter').install({ 'rust', 'javascript', 'zig' }, function(success)
+  done = success
+end)
+vim.wait(3000000, function() return done ~= nil end)
+```
 
 Check [`:h nvim-treesitter-commands`](doc/nvim-treesitter.txt) for a list of all available commands.
 
@@ -75,7 +85,7 @@ Check [`:h nvim-treesitter-commands`](doc/nvim-treesitter.txt) for a list of all
 
 For `nvim-treesitter` to support a specific feature for a specific language requires both a parser for that language and an appropriate language-specific query file for that feature.
 
-A list of the currently supported languages can be found [on this page](SUPPORTED_LANGUAGES.md). If you wish to add a new language or improve the queries for the an existing one, please see our [contributing guide](CONTRIBUTING.md).
+A list of the currently supported languages can be found [on this page](SUPPORTED_LANGUAGES.md). If you wish to add a new language or improve the queries for an existing one, please see our [contributing guide](CONTRIBUTING.md).
 
 For related information on the supported languages, including related plugins, see [this wiki page](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Supported-Languages-Information).
 
@@ -134,13 +144,12 @@ callback = function()
   require('nvim-treesitter.parsers').zimbu = {
     install_info = {
       url = 'https://github.com/zimbulang/tree-sitter-zimbu',
-      files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
       revision = <sha>, -- commit hash for revision to check out; HEAD if missing
       -- optional entries:
       branch = 'develop', -- only needed if different from default branch
       location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
-      generate = true, -- only needed if repo does not contain pre-generated src/parser.c
-      generate_from_json = true, -- only needed if parser has npm dependencies
+      generate = true, -- only needed if repo does not contain pre-generated `src/parser.c`
+      generate_from_json = false, -- only needed if repo does not contain `src/grammar.json`
     },
   }
 end})
@@ -150,11 +159,10 @@ Alternatively, if you have a local checkout, you can instead use
 ```lua
     install_info = {
       path = '~/parsers/tree-sitter-zimbu',
-      files = { 'src/parser.c' }, -- note that some parsers also require src/scanner.c
       -- optional entries
-      location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
-      generate = true, -- only needed if repo does not contain pre-generated src/parser.c
-      generate_from_json = true, -- only needed if parser has npm dependencies
+      location = 'parser',
+      generate = true,
+      generate_from_json = false,
     },
 ```
 This will always use the state of the directory as-is (i.e., `branch` and `revision` will be ignored).
@@ -169,7 +177,8 @@ If Neovim does not detect your language's filetype by default, you can use [Neov
 
 3. Start `nvim` and `:TSInstall zimbu`.
 
-**Note:** Parsers using external scanner need to be written in C. C++ scanners are no longer supported.
+>[!IMPORTANT]
+> Parsers using external scanner need to be written in C.
 
 ### Modifying parsers
 
@@ -183,47 +192,9 @@ end})
 
 ## Adding queries
 
-Queries can be placed anywhere in your `runtimepath` under `queries/<language>`, with earlier directories taking precedence unless the queries are marked with `; extends`; see `:h treesitter-query`.
+Queries can be placed anywhere in your `runtimepath` under `queries/<language>`, with earlier directories taking precedence unless the queries are marked with `; extends`; see [`:h treesitter-query-modelines`](https://neovim.io/doc/user/treesitter.html#treesitter-query-modeline).
 
 E.g., to add queries for `zimbu`, put `highlights.scm` etc. under
 ```lua
 vim.fn.stdpath('data') .. 'site/queries/zimbu'
 ```
-
-# Troubleshooting
-
-Before doing anything, make sure you have the latest version of this plugin and run `:checkhealth nvim-treesitter`.
-It can also help to update the parsers via `:TSUpdate`.
-
-#### I get `Error detected while processing .../plugin/nvim-treesitter.vim` every time I open Neovim
-
-This is probably due to a change in a parser's grammar or its queries.
-Try updating the parser that you suspect has changed (`:TSUpdate {language}`) or all of them (`:TSUpdate`).
-If the error persists after updating all parsers,
-please [open an issue](https://github.com/nvim-treesitter/nvim-treesitter/issues/new/choose).
-
-#### I get `query error: invalid node type at position`
-
-This could be due a query file outside this plugin using outdated nodes,
-or due to an outdated parser.
-
-- Make sure you have the parsers up to date with `:TSUpdate`
-- Make sure you don't have more than one `parser` runtime directory.
-  You can execute this command `:= vim.api.nvim_get_runtime_file('parser', true)` to find all runtime directories.
-  If you get more than one path, remove the ones that are outside this plugin (`nvim-treesitter` directory),
-  so the correct version of the parser is used.
-
-#### I want to use a mirror instead of "https://github.com/"
-
-In your Lua config:
-
-```lua
-for _, config in pairs(require("nvim-treesitter.parsers")) do
-  config.install_info.url = config.install_info.url:gsub("https://github.com/", "something else")
-end
-
-require'nvim-treesitter'.setup {
-    --
-    --
-}
-```
diff --git a/TODO.md b/TODO.md
index 7bf42c9aa..5f12ac997 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,8 +6,6 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 - [ ] **`install.lua`:** migrate to async v2
 - [ ] **tests:** remove custom crate, plenary dependency
-- [ ] **documentation:** consolidate, autogenerate?
-- [ ] **documentation:** migration guide
 - [ ] **indents:** rewrite (Helix or Zed compatible)
 - [ ] **textobjects:** include simple(!) `node`, `scope` (using `locals`) objects
 
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index f0abcc779..f95872177 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -11,16 +11,14 @@ Authors:
                                        Type |gO| to see the table of contents.
 
 ==============================================================================
-INTRODUCTION                                           *nvim-treesitter-intro*
+INTRODUCTION                                             *nvim-treesitter-intro*
 
 Nvim-treesitter provides functionalities for managing treesitter parsers and
-compatible queries for core features (highlighting, injections, fold, indent).
-
-WARNING: This is work in progress and requires the latest commit on Neovim
-`master`.
+compatible queries for core features (highlighting, injections, folds,
+indents).
 
 ==============================================================================
-QUICK START                                       *nvim-treesitter-quickstart*
+QUICK START                                         *nvim-treesitter-quickstart*
 
 To configure `nvim-treesitter`, put this in your `init.lua` file:
 >lua
@@ -36,156 +34,141 @@ NOTE: You do not need to call `setup` to use this plugin with the default
 settings!
 
 Parsers and queries can then be installed with >lua
-    require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
+  require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
 <
-(This is a no-op if the parsers are already installed.)
-
 To check installed parsers and queries, use `:checkhealth nvim-treesitter`.
 
+Treesitter features for installed languages need to be enabled manually in a
+|FileType| autocommand or |ftplugin|, e.g. >lua
+  vim.api.nvim_create_autocmd('FileType', {
+    pattern = { 'rust', 'javascript', 'zig' },
+    callback = function()
+      -- syntax highlighting, provided by Neovim
+      vim.treesitter.start()
+      -- folds, provided by Neovim
+      vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+      -- indentation, provided by nvim-treesitter
+      vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+    end,
+  })
+<
 ==============================================================================
-COMMANDS                                            *nvim-treesitter-commands*
+COMMANDS                                              *nvim-treesitter-commands*
 
-								  *:TSInstall*
-:TSInstall {language} ... ~
+:TSInstall {language}                                               *:TSInstall*
 
-Install one or more treesitter parsers.
-You can use |:TSInstall| `all` to install all parsers. Use |:TSInstall!| to
-force the reinstallation of already installed parsers.
+Install one or more treesitter parsers. {language} can be one or multiple
+parsers or tiers (`stable`, `unstable`, or `all` (not recommended)). This is a
+no-op of the parser(s) are already installed. Installation is performed
+asynchronously. Use *:TSInstall!* to force installation even if a parser is
+already installed.
 
-								   *:TSUpdate*
-:TSUpdate {language} ... ~
+:TSInstallFromGrammar {language}                         *:TSInstallFromGrammar*
 
-Update the installed parser for one more {language} or all installed parsers
-if {language} is omitted. The specified parser is installed if it is not already
-installed.
+Like |:TSInstall| but also regenerates the `parser.c` from the original
+grammar. Useful for languages where the provided `parser.c` is outdated (e.g.,
+uses a no longer supported ABI).
 
-								*:TSUninstall*
-:TSUninstall {language} ... ~
+:TSUpdate [{language}]                                              *:TSUpdate*
 
-Deletes the parser for one or more {language}. You can use 'all' for language
-to uninstall all parsers.
+Update parsers to the `revision` specified in the manifest if this is newer
+than the installed version. If {language} is specified, update the
+corresponding parser or tier; otherwise update all installed parsers. This is
+a no-op if all (specified) parsers are up to date.
+
+Note: It is recommended to add this command as a build step in your plugin
+manager.
+
+:TSUninstall {language}                                           *:TSUninstall*
+
+Deletes the parser for one or more {language}, or all parsers with `all`.
+
+:TSLog                                                                  *:TSLog*
+
+Shows all messages from previous install, update, or uninstall operations.
 
 ==============================================================================
-INDENTATION                                        *nvim-treesitter-indentation*
+API                                                        *nvim-treesitter-api*
 
-Indentation based on treesitter for the |=| operator.
-NOTE: this is an experimental feature and will be upstreamed to Neovim when
-stable.
+setup({opts})                                          *nvim-treesitter.setup()*
 
-To enable it for a supported parser, add the following to a corresponding
-`FileType` autocommand or `ftplugin/<lang>.lua`:  >lua
+    Configure installation options. Needs to be specified before any
+    installation operation.
 
-  vim.bo.indentexpr = 'v.lua:require'nvim-treesitter'.indentexpr()'
+    Note: You only need to call `setup` if you want to set non-default
+    options!
 
+    Parameters: ~
+    • {opts}  `(table?)` Optional parameters:
+              • {install_dir} (`string?`, default `stdpath('data')/site/`)
+                directory to install parsers and queries to. Note: will be
+                appended to |runtimepath|.
+              • {ignore_install} (`string[]?`) list of languages to never
+                install even if specified for an installation operation.
+                (Useful when specifying tiers instead of individual
+                languages.)
+
+install({languages}, {opts}, {callback})             *nvim-treesitter.install()*
+
+    Download, compile, and install the specified treesitter parsers and copy
+    the corresponding queries to a directory on |runtimepath|, enabling their
+    use in Neovim.
+
+    Note: This operation is performed asynchronously by default. For
+    synchronous operation (e.g., in a bootstrapping script), you need to
+    provide a suitable {callback}: >lua
+        local done = nil
+        require('nvim-treesitter').install({ 'rust', 'javascript', 'zig' },
+          function(success)
+            done = success
+          end)
+        vim.wait(3000000, function() return done ~= nil end)
 <
+    Parameters: ~
+    • {languages}  `(string[]|string)` (List of) languages or tiers (`stable`,
+                   `unstable`) to install.
+    • {opts}       `(table?)` Optional parameters:
+                   • {force} (`boolean?`, default `false`) force installation
+                     of already installed parsers
+                   • {generate} (`boolean?`, default `false`) generate
+                     `parser.c` from `grammar.json` or `grammar.js` before
+                     compiling.
+                   • {max_jobs} (`integer?`) limit parallel tasks (useful in
+                     combination with {generate} on memory-limited systems).
+    • {callback}   `(function?`) Callback for synchronous execution.
 
-Indentation for a language is controlled by `indents.scm` queries. The
-following captures are supported:
+uninstall({languages})                              *nvim-treesitter.uninstall()*
 
+    Remove the parser and queries for the specified language(s).
 
-`@indent`				    *nvim-treesitter-indentation-queries*
-Queries can use the following captures: `@indent.begin` and `@indent.dedent`,
-`@indent.branch`, `@indent.end` or `@indent.align`. An `@indent.ignore` capture tells
-treesitter to ignore indentation and a `@indent.zero` capture sets
-the indentation to 0.
+    Parameters: ~
+    • {languages}  `(string[]|string)` (List of) languages or tiers (`stable`,
+                   `unstable`) to update.
 
-`@indent.begin`			    *nvim-treesitter-indentation-indent.begin*
-The `@indent.begin` specifies that the next line should be indented.  Multiple
-indents on the same line get collapsed. Eg.
+update({languages}, {callback})                       *nvim-treesitter.update()*
 
->query
-  (
-   (if_statement)
-   (ERROR "else") @indent.begin
-  )
+    Update the parsers and queries if older than the revision specified in the
+    manifest.
+
+    Note: This operation is performed asynchronously by default. For
+    synchronous operation (e.g., in a bootstrapping script), you need to
+    provide a suitable {callback}: >lua
+        local done = nil
+        require('nvim-treesitter').update(), 
+          function(success)
+            done = success
+          end)
+        vim.wait(3000000, function() return done ~= nil end)
 <
-Indent can also have `indent.immediate` set using a `#set!` directive, which
-permits the next line to indent even when the block intended to be indented
-has no content yet, improving interactive typing.
+    Parameters: ~
+    • {languages}  `(string[]|string)` (List of) languages or tiers to
+                   uninstall.
+    • {callback}   `(function?`) Callback for synchronous execution.
 
-eg for python:
->query
- ((if_statement) @indent.begin
-   (#set! indent.immediate 1))
+indentexpr()                                      *nvim-treesitter.indentexpr()*
+
+    Used to enable treesitter indentation for a language via >lua
+        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
 <
 
-Will allow:
->python
-  if True:<CR>
-      # Auto indent to here
-
-`@indent.end`				*nvim-treesitter-indentation-indent.end*
-An `@indent.end` capture is used to specify that the indented region ends and
-any text subsequent to the capture should be dedented.  
-
-`@indent.branch`		    *nvim-treesitter-indentation-indent.branch*
-An `@indent.branch` capture is used to specify that a dedented region starts
-at the line including the captured nodes.
-
-`@indent.dedent`		    *nvim-treesitter-indentation-indent.dedent*
-A `@indent.dedent` capture specifies dedenting starting on the next line.
->
-`@indent.align`		    *nvim-treesitter-indentation-aligned_indent.align*
-Aligned indent blocks may be specified with the `@indent.align` capture.
-This permits
-
->
-  foo(a,
-      b,
-      c)
-<
-As well as
->
-  foo(
-    a,
-    b,
-    c)
-<
-and finally
->
-  foo(
-    a,
-    b,
-    c
-  )
-<
-To specify the delimiters to use `indent.open_delimiter` and
-`indent.close_delimiter` should be used.  Eg.
->query
- ((argument_list) @indent.align
-  (#set! indent.open_delimiter "(")
-  (#set! indent.close_delimiter ")"))
-<
-
-For some languages the last line of an `indent.align` block must not be
-the same indent as the natural next line.
-
-For example in python:
-
->python
-  if (a > b and
-      c < d):
-      pass
-
-Is not correct, whereas
->python
-  if (a > b and
-	c < d):
-      pass
-
-Would be correctly indented.  This behavior may be chosen using
-`indent.avoid_last_matching_next`.  Eg.
-
->query
- (if_statement
-  condition: (parenthesized_expression) @indent.align
-  (#set! indent.open_delimiter "(")
-  (#set! indent.close_delimiter ")")
-  (#set! indent.avoid_last_matching_next 1)
- )
-<
-Could be used to specify that the last line of an `@indent.align` capture
-should be additionally indented to avoid clashing with the indent of the first
-line of the block inside an if.
-
 vim:tw=78:ts=8:expandtab:noet:ft=help:norl:
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 8ca51814e..6904899f6 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -7,7 +7,7 @@ local health = vim.health
 local M = {}
 
 local NVIM_TREESITTER_MINIMUM_ABI = 13
-local TREE_SITTER_MIN_VER = { 0, 25, 1 }
+local TREE_SITTER_MIN_VER = { 0, 25, 4 }
 
 ---@param name string
 ---@return table?

From 6b55bc0fab46be886ee81764228ddd8146dcbf9d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 13 May 2025 14:30:27 +0200
Subject: [PATCH 2353/2704] ci(test): remove parser cache

Since installation now installs parsers _and_ queries, caching parsers
doesn't allow skipping the installation step (and caching queries does
not pay off).
---
 .github/workflows/test-core.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 05f8078ce..0c0ae594c 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -31,26 +31,14 @@ jobs:
         run: |
           bash ./scripts/ci-install.sh
 
-      - if: inputs.type == 'generate'
-        name: Generate and compile parsers
-        run: $NVIM -l ./scripts/install-parsers.lua --generate --max-jobs=2
-
-      - if: inputs.type == 'build'
-        name: Setup Parsers Cache
-        id: parsers-cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.local/share/nvim/site/parser/
-            ~/AppData/Local/nvim-data/site/parser/
-          key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles(
-            './lua/nvim-treesitter/install.lua',
-            './lua/nvim-treesitter/parsers.lua') }}
-
       - if: inputs.type == 'build'
         name: Compile parsers
         run: $NVIM -l ./scripts/install-parsers.lua
 
+      - if: inputs.type == 'generate'
+        name: Generate and compile parsers
+        run: $NVIM -l ./scripts/install-parsers.lua --generate --max-jobs=2
+
       - name: Check parsers
         run: $NVIM -l ./scripts/check-parsers.lua
 

From 25f08b82afd3df904ab13b76106975eae370a91a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 13 May 2025 14:31:03 +0200
Subject: [PATCH 2354/2704] fix(hcl): remove unnecessary escapes

---
 runtime/queries/hcl/highlights.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/hcl/highlights.scm b/runtime/queries/hcl/highlights.scm
index 4fb7d1fca..f2c784f6f 100644
--- a/runtime/queries/hcl/highlights.scm
+++ b/runtime/queries/hcl/highlights.scm
@@ -1,10 +1,10 @@
 ; highlights.scm
 [
   "!"
-  "\*"
+  "*"
   "/"
   "%"
-  "\+"
+  "+"
   "-"
   ">"
   ">="
@@ -34,7 +34,7 @@
 
 [
   (ellipsis)
-  "\?"
+  "?"
   "=>"
 ] @punctuation.special
 

From 864e75a85d4bbe77745929a1ce4d4c63bef11480 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 13 May 2025 14:47:47 +0200
Subject: [PATCH 2355/2704] fix(c,cpp,fsharp,idl,powershell,sql,systemtap):
 remove unneeded escapes

---
 runtime/queries/c/injections.scm          | 2 +-
 runtime/queries/cpp/injections.scm        | 2 +-
 runtime/queries/fsharp/highlights.scm     | 2 +-
 runtime/queries/idl/injections.scm        | 4 ++--
 runtime/queries/powershell/highlights.scm | 2 +-
 runtime/queries/sql/highlights.scm        | 2 +-
 runtime/queries/systemtap/highlights.scm  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/runtime/queries/c/injections.scm b/runtime/queries/c/injections.scm
index 24634864e..ebedc1ec3 100644
--- a/runtime/queries/c/injections.scm
+++ b/runtime/queries/c/injections.scm
@@ -9,7 +9,7 @@
   (#set! injection.language "re2c"))
 
 ((comment) @injection.content
-  (#lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
+  (#lua-match? @injection.content "/[*/][!*/]<?[^a-zA-Z]")
   (#set! injection.language "doxygen"))
 
 ((call_expression
diff --git a/runtime/queries/cpp/injections.scm b/runtime/queries/cpp/injections.scm
index 1fbc8e131..795e40614 100644
--- a/runtime/queries/cpp/injections.scm
+++ b/runtime/queries/cpp/injections.scm
@@ -1,7 +1,7 @@
 ; inherits: c
 
 ((comment) @injection.content
-  (#lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
+  (#lua-match? @injection.content "/[*/][!*/]<?[^a-zA-Z]")
   (#set! injection.language "doxygen"))
 
 (raw_string_literal
diff --git a/runtime/queries/fsharp/highlights.scm b/runtime/queries/fsharp/highlights.scm
index e400e3522..72168528a 100644
--- a/runtime/queries/fsharp/highlights.scm
+++ b/runtime/queries/fsharp/highlights.scm
@@ -123,7 +123,7 @@
 ((argument_patterns
   (long_identifier
     (identifier) @character.special))
-  (#lua-match? @character.special "^\_.*"))
+  (#lua-match? @character.special "^_.*"))
 
 (member_defn
   (method_or_prop_defn
diff --git a/runtime/queries/idl/injections.scm b/runtime/queries/idl/injections.scm
index e4a286e42..e444fc482 100644
--- a/runtime/queries/idl/injections.scm
+++ b/runtime/queries/idl/injections.scm
@@ -1,8 +1,8 @@
 ((comment) @injection.content
-  (#lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
+  (#lua-match? @injection.content "/[*/][!*/]<?[^a-zA-Z]")
   (#set! injection.language "doxygen"))
 
 ((comment) @injection.content
-  (#not-lua-match? @injection.content "/[*\/][!*\/]<?[^a-zA-Z]")
+  (#not-lua-match? @injection.content "/[*/][!*/]<?[^a-zA-Z]")
   (#not-lua-match? @injection.content "//@[a-zA-Z]")
   (#set! injection.language "comment"))
diff --git a/runtime/queries/powershell/highlights.scm b/runtime/queries/powershell/highlights.scm
index 6081e8f1b..7d334ba2a 100644
--- a/runtime/queries/powershell/highlights.scm
+++ b/runtime/queries/powershell/highlights.scm
@@ -142,7 +142,7 @@
     "$true"))
 
 ((variable) @variable.builtin
-  (#lua-match? @variable.builtin "^\$env:"))
+  (#lua-match? @variable.builtin "^$env:"))
 
 (data_name
   (simple_name) @constant)
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index 67eef18ae..6b4b7026f 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -42,7 +42,7 @@
   (#lua-match? @number "^%d+$"))
 
 ((literal) @number.float
-  (#lua-match? @number.float "^[-]?%d*\.%d*$"))
+  (#lua-match? @number.float "^[-]?%d*%.%d*$"))
 
 (parameter) @variable.parameter
 
diff --git a/runtime/queries/systemtap/highlights.scm b/runtime/queries/systemtap/highlights.scm
index d1348dc91..f3484abd2 100644
--- a/runtime/queries/systemtap/highlights.scm
+++ b/runtime/queries/systemtap/highlights.scm
@@ -43,7 +43,7 @@
     "sprintln"))
 
 ((identifier) @variable.builtin
-  (#lua-match? @variable.builtin "^\$+[0-9A-Z_a-z]+\$*$"))
+  (#lua-match? @variable.builtin "^$+[0-9A-Z_a-z]+$*$"))
 
 (shebang_line) @keyword.directive
 

From b0a20057b0110952f22bc067720fe23887d5db32 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 15 May 2025 09:45:28 +0200
Subject: [PATCH 2356/2704] feat(config)!: remove `ignore_install`

This was only useful for no longer supported `auto_install` option.
---
 README.md                       |  2 --
 doc/nvim-treesitter.txt         |  6 ------
 lua/nvim-treesitter/config.lua  | 15 +--------------
 lua/nvim-treesitter/install.lua |  5 ++---
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index f55b570ad..fb4691bf3 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,6 @@ require('lazy').setup(
 require'nvim-treesitter'.setup {
   -- Directory to install parsers and queries to
   install_dir = vim.fn.stdpath('data') .. '/site'
-  -- List of parsers to ignore when installing tiers
-  ignore_install = { },
 }
 ```
 
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index f95872177..c810023f7 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -26,8 +26,6 @@ To configure `nvim-treesitter`, put this in your `init.lua` file:
     -- A directory to install the parsers and queries to.
     -- Defaults to the `stdpath('data')/site` dir.
     install_dir = "/some/path/to/store/parsers",
-    -- List of parsers to ignore installing (for "stable" etc.)
-    ignore_install = { "some_parser" },
   }
 
 NOTE: You do not need to call `setup` to use this plugin with the default
@@ -103,10 +101,6 @@ setup({opts})                                          *nvim-treesitter.setup()*
               • {install_dir} (`string?`, default `stdpath('data')/site/`)
                 directory to install parsers and queries to. Note: will be
                 appended to |runtimepath|.
-              • {ignore_install} (`string[]?`) list of languages to never
-                install even if specified for an installation operation.
-                (Useful when specifying tiers instead of individual
-                languages.)
 
 install({languages}, {opts}, {callback})             *nvim-treesitter.install()*
 
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index b7ffbf47c..8dcbdb37e 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -3,12 +3,10 @@ local M = {}
 M.tiers = { 'stable', 'unstable', 'unmaintained', 'unsupported' }
 
 ---@class TSConfig
----@field ignore_install string[]
 ---@field install_dir string
 
 ---@type TSConfig
 local config = {
-  ignore_install = {},
   install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
 }
 
@@ -92,7 +90,7 @@ end
 
 ---Normalize languages
 ---@param languages? string[]|string
----@param skip? { ignored: boolean, missing: boolean, unsupported: boolean, installed: boolean, dependencies: boolean }
+---@param skip? { missing: boolean, unsupported: boolean, installed: boolean, dependencies: boolean }
 ---@return string[]
 function M.norm_languages(languages, skip)
   if not languages then
@@ -110,17 +108,6 @@ function M.norm_languages(languages, skip)
 
   languages = expand_tiers(languages)
 
-  if skip and skip.ignored then
-    local ignored = expand_tiers(config.ignore_install)
-    languages = vim.tbl_filter(
-      --- @param v string
-      function(v)
-        return not vim.list_contains(ignored, v)
-      end,
-      languages
-    )
-  end
-
   if skip and skip.installed then
     local installed = M.installed_parsers()
     languages = vim.tbl_filter(
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index b36a7ddee..68f4c5ea4 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -439,7 +439,7 @@ end
 ---@param callback? fun(boolean)
 M.install = a.sync(function(languages, options, callback)
   reload_parsers()
-  languages = config.norm_languages(languages, { ignored = true, unsupported = true })
+  languages = config.norm_languages(languages, { unsupported = true })
   install(languages, options, callback)
 end, 3)
 
@@ -451,8 +451,7 @@ M.update = a.sync(function(languages, _options, callback)
   if not languages or #languages == 0 then
     languages = 'all'
   end
-  languages =
-    config.norm_languages(languages, { ignored = true, missing = true, unsupported = true })
+  languages = config.norm_languages(languages, { missing = true, unsupported = true })
   languages = vim.tbl_filter(needs_update, languages) ---@type string[]
 
   if #languages > 0 then

From 7a4a35de3ebe01e85beba91ebc124b7dd80bd287 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 16 May 2025 14:55:45 +0200
Subject: [PATCH 2357/2704] refactor(indent): use `node:byte_length()

---
 lua/nvim-treesitter/indent.lua | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index dda632df3..b0982c6c6 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -39,14 +39,6 @@ local function get_last_node_at_line(root, lnum, col)
   return root:descendant_for_range(lnum - 1, col, lnum - 1, col + 1)
 end
 
----@param node TSNode
----@return number
-local function node_length(node)
-  local _, _, start_byte = node:start()
-  local _, _, end_byte = node:end_()
-  return end_byte - start_byte
-end
-
 ---@param bufnr integer
 ---@param node TSNode
 ---@param delimiter string
@@ -133,7 +125,7 @@ function M.get_indent(lnum)
     end
     local local_root = tstree:root()
     if ts.is_in_node_range(local_root, lnum - 1, 0) then
-      if not root or node_length(root) >= node_length(local_root) then
+      if not root or root:byte_length() >= local_root:byte_length() then
         root = local_root
         lang_tree = tree
       end

From 69371f0148bb96b41047f036a58e7e648e200140 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 16 May 2025 15:44:26 +0100
Subject: [PATCH 2358/2704] feat(install)!: migrate to latest async.nvim impl
 (#7856)

Provides significantly simpler blocking installation and update.
---
 .gitattributes                  |   7 +-
 README.md                       |   8 +-
 TODO.md                         |   2 +-
 doc/nvim-treesitter.txt         |  29 +-
 lua/nvim-treesitter/async.lua   | 777 ++++++++++++++++++++++++++++----
 lua/nvim-treesitter/install.lua | 117 +++--
 scripts/install-parsers.lua     |  23 +-
 7 files changed, 788 insertions(+), 175 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 3375d5ce2..f88a2024f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
-runtime/queries/**/*.scm linguist-language=Tree-sitter-Query
-doc/*.txt linguist-documentation
-SUPPORTED_LANGUAGES.md linguist-generated
+runtime/queries/**/*.scm       linguist-language=tsq
+doc/*.txt                      linguist-documentation
+SUPPORTED_LANGUAGES.md         linguist-generated
+lua/nvim-treesitter/async.lua  linguist-vendored
diff --git a/README.md b/README.md
index fb4691bf3..703a41781 100644
--- a/README.md
+++ b/README.md
@@ -68,13 +68,9 @@ Parsers and queries can then be installed with
 require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
 ```
 
-(This is a no-op if the parsers are already installed.) Note that this function runs asynchronously; for synchronous installation in a script context ("bootstrapping"), use something like
+(This is a no-op if the parsers are already installed.) Note that this function runs asynchronously; for synchronous installation in a script context ("bootstrapping"), you need to `wait()` for it to finish:
 ```lua
-local done = nil
-require('nvim-treesitter').install({ 'rust', 'javascript', 'zig' }, function(success)
-  done = success
-end)
-vim.wait(3000000, function() return done ~= nil end)
+require('nvim-treesitter').install({ 'rust', 'javascript', 'zig' }):wait(300000) -- wait max. 5 minutes
 ```
 
 Check [`:h nvim-treesitter-commands`](doc/nvim-treesitter.txt) for a list of all available commands.
diff --git a/TODO.md b/TODO.md
index 5f12ac997..937a8b63b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,7 +4,6 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 
 ## TODO
 
-- [ ] **`install.lua`:** migrate to async v2
 - [ ] **tests:** remove custom crate, plenary dependency
 - [ ] **indents:** rewrite (Helix or Zed compatible)
 - [ ] **textobjects:** include simple(!) `node`, `scope` (using `locals`) objects
@@ -26,3 +25,4 @@ This document lists the planned and finished changes in this rewrite towards [Nv
 - [X] drop ensure_install (replace with install)
 - [X] **CI:** switch to ts_query_ls, add update readme as check (remove update job)
 - [X] **CI:** track versioned releases for tier 1
+- [X] **`install.lua`:** migrate to async v2
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index c810023f7..b57687961 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -102,7 +102,7 @@ setup({opts})                                          *nvim-treesitter.setup()*
                 directory to install parsers and queries to. Note: will be
                 appended to |runtimepath|.
 
-install({languages}, {opts}, {callback})             *nvim-treesitter.install()*
+install({languages} [, {opts}])                    *nvim-treesitter.install()*
 
     Download, compile, and install the specified treesitter parsers and copy
     the corresponding queries to a directory on |runtimepath|, enabling their
@@ -110,13 +110,9 @@ install({languages}, {opts}, {callback})             *nvim-treesitter.install()*
 
     Note: This operation is performed asynchronously by default. For
     synchronous operation (e.g., in a bootstrapping script), you need to
-    provide a suitable {callback}: >lua
-        local done = nil
-        require('nvim-treesitter').install({ 'rust', 'javascript', 'zig' },
-          function(success)
-            done = success
-          end)
-        vim.wait(3000000, function() return done ~= nil end)
+    `wait()` for it: >lua
+        require('nvim-treesitter').install({ 'rust', 'javascript', 'zig' })
+                                  :wait(300000) -- max. 5 minutes
 <
     Parameters: ~
     • {languages}  `(string[]|string)` (List of) languages or tiers (`stable`,
@@ -129,7 +125,6 @@ install({languages}, {opts}, {callback})             *nvim-treesitter.install()*
                      compiling.
                    • {max_jobs} (`integer?`) limit parallel tasks (useful in
                      combination with {generate} on memory-limited systems).
-    • {callback}   `(function?`) Callback for synchronous execution.
 
 uninstall({languages})                              *nvim-treesitter.uninstall()*
 
@@ -139,25 +134,19 @@ uninstall({languages})                              *nvim-treesitter.uninstall()
     • {languages}  `(string[]|string)` (List of) languages or tiers (`stable`,
                    `unstable`) to update.
 
-update({languages}, {callback})                       *nvim-treesitter.update()*
+update([{languages}])                                  *nvim-treesitter.update()*
 
     Update the parsers and queries if older than the revision specified in the
     manifest.
 
     Note: This operation is performed asynchronously by default. For
     synchronous operation (e.g., in a bootstrapping script), you need to
-    provide a suitable {callback}: >lua
-        local done = nil
-        require('nvim-treesitter').update(), 
-          function(success)
-            done = success
-          end)
-        vim.wait(3000000, function() return done ~= nil end)
+    `wait()` for it: >lua
+        require('nvim-treesitter').update():wait(300000) -- max. 5 minutes
 <
     Parameters: ~
-    • {languages}  `(string[]|string)` (List of) languages or tiers to
-                   uninstall.
-    • {callback}   `(function?`) Callback for synchronous execution.
+    • {languages}  `(string[]|string)?` (List of) languages or tiers to update
+                   (default: all installed).
 
 indentexpr()                                      *nvim-treesitter.indentexpr()*
 
diff --git a/lua/nvim-treesitter/async.lua b/lua/nvim-treesitter/async.lua
index 8a5e7c8af..e78c0f964 100644
--- a/lua/nvim-treesitter/async.lua
+++ b/lua/nvim-treesitter/async.lua
@@ -1,112 +1,725 @@
-local co = coroutine
+local pcall = copcall or pcall
 
+--- @param ... any
+--- @return {[integer]: any, n: integer}
+local function pack_len(...)
+  return { n = select('#', ...), ... }
+end
+
+--- like unpack() but use the length set by F.pack_len if present
+--- @param t? { [integer]: any, n?: integer }
+--- @param first? integer
+--- @return ...any
+local function unpack_len(t, first)
+  if t then
+    return unpack(t, first or 1, t.n or table.maxn(t))
+  end
+end
+
+--- @class async
 local M = {}
 
----Executes a future with a callback when it is done
----@param func function
----@param callback function
----@param ... unknown
-local function execute(func, callback, ...)
-  local thread = co.create(func)
+--- Weak table to keep track of running tasks
+--- @type table<thread,async.Task?>
+local threads = setmetatable({}, { __mode = 'k' })
 
-  local function step(...)
-    local ret = { co.resume(thread, ...) }
-    ---@type boolean, any
-    local stat, nargs_or_err = unpack(ret)
+--- @return async.Task?
+local function running()
+  local task = threads[coroutine.running()]
+  if task and not (task:_completed() or task._closing) then
+    return task
+  end
+end
 
-    if not stat then
-      error(
-        string.format(
-          'The coroutine failed with this message: %s\n%s',
-          nargs_or_err,
-          debug.traceback(thread)
-        )
-      )
-    end
+--- Base class for async tasks. Async functions should return a subclass of
+--- this. This is designed specifically to be a base class of uv_handle_t
+--- @class async.Handle
+--- @field close fun(self: async.Handle, callback?: fun())
+--- @field is_closing? fun(self: async.Handle): boolean
 
-    if co.status(thread) == 'dead' then
-      if callback then
-        callback(unpack(ret, 3, table.maxn(ret)))
-      end
-      return
-    end
+--- @alias async.CallbackFn fun(...: any): async.Handle?
 
-    ---@type function, any[]
-    local fn, args = ret[3], { unpack(ret, 4, table.maxn(ret)) }
-    args[nargs_or_err] = step
-    fn(unpack(args, 1, nargs_or_err))
+--- @class async.Task : async.Handle
+--- @field package _callbacks table<integer,fun(err?: any, ...: any)>
+--- @field package _callback_pos integer
+--- @field private _thread thread
+---
+--- Tasks can call other async functions (task of callback functions)
+--- when we are waiting on a child, we store the handle to it here so we can
+--- cancel it.
+--- @field private _current_child? async.Handle
+---
+--- Error result of the task is an error occurs.
+--- Must use `await` to get the result.
+--- @field private _err? any
+---
+--- Result of the task.
+--- Must use `await` to get the result.
+--- @field private _result? any[]
+local Task = {}
+Task.__index = Task
+
+--- @private
+--- @param func function
+--- @return async.Task
+function Task._new(func)
+  local thread = coroutine.create(func)
+
+  local self = setmetatable({
+    _closing = false,
+    _thread = thread,
+    _callbacks = {},
+    _callback_pos = 1,
+  }, Task)
+
+  threads[thread] = self
+
+  return self
+end
+
+--- @param callback fun(err?: any, ...: any)
+function Task:await(callback)
+  if self._closing then
+    callback('closing')
+  elseif self:_completed() then -- TODO(lewis6991): test
+    -- Already finished or closed
+    callback(self._err, unpack_len(self._result))
+  else
+    self._callbacks[self._callback_pos] = callback
+    self._callback_pos = self._callback_pos + 1
+  end
+end
+
+--- @package
+function Task:_completed()
+  return (self._err or self._result) ~= nil
+end
+
+-- Use max 32-bit signed int value to avoid overflow on 32-bit systems.
+-- Do not use `math.huge` as it is not interpreted as a positive integer on all
+-- platforms.
+local MAX_TIMEOUT = 2 ^ 31 - 1
+
+--- Synchronously wait (protected) for a task to finish (blocking)
+---
+--- If an error is returned, `Task:traceback()` can be used to get the
+--- stack trace of the error.
+---
+--- Example:
+--- ```lua
+---
+---   local ok, err_or_result = task:pwait(10)
+---
+---   if not ok then
+---     error(task:traceback(err_or_result))
+---   end
+---
+---   local _, result = assert(task:pwait(10))
+--- ```
+---
+--- Can be called if a task is closing.
+--- @param timeout? integer
+--- @return boolean status
+--- @return any ... result or error
+function Task:pwait(timeout)
+  local done = vim.wait(timeout or MAX_TIMEOUT, function()
+    -- Note we use self:_completed() instead of self:await() to avoid creating a
+    -- callback. This avoids having to cleanup/unregister any callback in the
+    -- case of a timeout.
+    return self:_completed()
+  end)
+
+  if not done then
+    return false, 'timeout'
+  elseif self._err then
+    return false, self._err
+  else
+    return true, unpack_len(self._result)
+  end
+end
+
+--- Synchronously wait for a task to finish (blocking)
+---
+--- Example:
+--- ```lua
+---   local result = task:wait(10) -- wait for 10ms or else error
+---
+---   local result = task:wait() -- wait indefinitely
+--- ```
+--- @param timeout? integer Timeout in milliseconds
+--- @return any ... result
+function Task:wait(timeout)
+  local res = pack_len(self:pwait(timeout))
+  local stat = res[1]
+
+  if not stat then
+    error(self:traceback(res[2]))
   end
 
-  step(...)
+  return unpack_len(res, 2)
+end
+
+--- @private
+--- @param msg? string
+--- @param _lvl? integer
+--- @return string
+function Task:_traceback(msg, _lvl)
+  _lvl = _lvl or 0
+
+  local thread = ('[%s] '):format(self._thread)
+
+  local child = self._current_child
+  if getmetatable(child) == Task then
+    --- @cast child async.Task
+    msg = child:_traceback(msg, _lvl + 1)
+  end
+
+  local tblvl = getmetatable(child) == Task and 2 or nil
+  msg = (msg or '') .. debug.traceback(self._thread, '', tblvl):gsub('\n\t', '\n\t' .. thread)
+
+  if _lvl == 0 then
+    --- @type string
+    msg = msg
+      :gsub('\nstack traceback:\n', '\nSTACK TRACEBACK:\n', 1)
+      :gsub('\nstack traceback:\n', '\n')
+      :gsub('\nSTACK TRACEBACK:\n', '\nstack traceback:\n', 1)
+  end
+
+  return msg
+end
+
+--- Get the traceback of a task when it is not active.
+--- Will also get the traceback of nested tasks.
+---
+--- @param msg? string
+--- @return string
+function Task:traceback(msg)
+  return self:_traceback(msg)
+end
+
+--- If a task completes with an error, raise the error
+function Task:raise_on_error()
+  self:await(function(err)
+    if err then
+      error(self:_traceback(err), 0)
+    end
+  end)
+  return self
+end
+
+--- @private
+--- @param err? any
+--- @param result? {[integer]: any, n: integer}
+function Task:_finish(err, result)
+  self._current_child = nil
+  self._err = err
+  self._result = result
+  threads[self._thread] = nil
+
+  local errs = {} --- @type string[]
+  for _, cb in pairs(self._callbacks) do
+    --- @type boolean, string
+    local ok, cb_err = pcall(cb, err, unpack_len(result))
+    if not ok then
+      errs[#errs + 1] = cb_err
+    end
+  end
+
+  if #errs > 0 then
+    error(table.concat(errs, '\n'), 0)
+  end
+end
+
+--- @return boolean
+function Task:is_closing()
+  return self._closing
+end
+
+--- Close the task and all its children.
+--- If callback is provided it will run asynchronously,
+--- else it will run synchronously.
+---
+--- @param callback? fun()
+function Task:close(callback)
+  if self:_completed() then
+    if callback then
+      callback()
+    end
+    return
+  end
+
+  if self._closing then
+    return
+  end
+
+  self._closing = true
+
+  if callback then -- async
+    if self._current_child then
+      self._current_child:close(function()
+        self:_finish('closed')
+        callback()
+      end)
+    else
+      self:_finish('closed')
+      callback()
+    end
+  else -- sync
+    if self._current_child then
+      self._current_child:close(function()
+        self:_finish('closed')
+      end)
+    else
+      self:_finish('closed')
+    end
+    vim.wait(0, function()
+      return self:_completed()
+    end)
+  end
+end
+
+--- @param obj any
+--- @return boolean
+local function is_async_handle(obj)
+  local ty = type(obj)
+  return (ty == 'table' or ty == 'userdata') and vim.is_callable(obj.close)
+end
+
+--- @param ... any
+function Task:_resume(...)
+  --- @type [boolean, string|async.CallbackFn]
+  local ret = pack_len(coroutine.resume(self._thread, ...))
+  local stat = ret[1]
+
+  if not stat then
+    -- Coroutine had error
+    self:_finish(ret[2])
+  elseif coroutine.status(self._thread) == 'dead' then
+    -- Coroutine finished
+    local result = pack_len(unpack_len(ret, 2))
+    self:_finish(nil, result)
+  else
+    local fn = ret[2]
+    --- @cast fn -string
+
+    -- TODO(lewis6991): refine error handler to be more specific
+    local ok, r
+    ok, r = pcall(fn, function(...)
+      if is_async_handle(r) then
+        --- @cast r async.Handle
+        -- We must close children before we resume to ensure
+        -- all resources are collected.
+        local args = pack_len(...)
+        r:close(function()
+          self:_resume(unpack_len(args))
+        end)
+      else
+        self:_resume(...)
+      end
+    end)
+
+    if not ok then
+      self:_finish(r)
+    elseif is_async_handle(r) then
+      self._current_child = r
+    end
+  end
+end
+
+--- @return 'running'|'suspended'|'normal'|'dead'?
+function Task:status()
+  return coroutine.status(self._thread)
+end
+
+--- Run a function in an async context, asynchronously.
+---
+--- Examples:
+--- ```lua
+--- -- The two below blocks are equivalent:
+---
+--- -- Run a uv function and wait for it
+--- local stat = async.arun(function()
+---     return async.await(2, vim.uv.fs_stat, 'foo.txt')
+--- end):wait()
+---
+--- -- Since uv functions have sync versions. You can just do:
+--- local stat = vim.fs_stat('foo.txt')
+--- ```
+--- @param func function
+--- @param ... any
+--- @return async.Task
+function M.arun(func, ...)
+  local task = Task._new(func)
+  task:_resume(...)
+  return task
+end
+
+--- @class async.TaskFun
+--- @field package _fun fun(...: any): any
+--- @operator call(...): any
+local TaskFun = {}
+TaskFun.__index = TaskFun
+
+function TaskFun:__call(...)
+  return M.arun(self._fun, ...)
+end
+
+--- Create an async function
+--- @param fun function
+--- @return async.TaskFun
+function M.async(fun)
+  return setmetatable({ _fun = fun }, TaskFun)
+end
+
+--- Returns the status of a task’s thread.
+---
+--- @param task? async.Task
+--- @return 'running'|'suspended'|'normal'|'dead'?
+function M.status(task)
+  task = task or running()
+  if task then
+    assert(getmetatable(task) == Task, 'Expected Task')
+    return task:status()
+  end
+end
+
+--- @async
+--- @generic R1, R2, R3, R4
+--- @param fun fun(callback: fun(r1: R1, r2: R2, r3: R3, r4: R4)): any?
+--- @return R1, R2, R3, R4
+local function yield(fun)
+  assert(type(fun) == 'function', 'Expected function')
+  return coroutine.yield(fun)
+end
+
+--- @async
+--- @param task async.Task
+--- @return any ...
+local function await_task(task)
+  --- @param callback fun(err?: string, ...: any)
+  --- @return function
+  local res = pack_len(yield(function(callback)
+    task:await(callback)
+    return task
+  end))
+
+  local err = res[1]
+
+  if err then
+    -- TODO(lewis6991): what is the correct level to pass?
+    error(err, 0)
+  end
+
+  return unpack_len(res, 2)
+end
+
+--- Asynchronous blocking wait
+--- @param argc integer
+--- @param fun async.CallbackFn
+--- @param ... any func arguments
+--- @return any ...
+local function await_cbfun(argc, fun, ...)
+  local args = pack_len(...)
+
+  --- @param callback fun(...:any)
+  --- @return any?
+  return yield(function(callback)
+    args[argc] = callback
+    args.n = math.max(args.n, argc)
+    return fun(unpack_len(args))
+  end)
+end
+
+--- @param taskfun async.TaskFun
+--- @param ... any
+--- @return any ...
+local function await_taskfun(taskfun, ...)
+  return taskfun._fun(...)
+end
+
+--- Asynchronous blocking wait
+---
+--- Example:
+--- ```lua
+--- local task = async.arun(function()
+---    return 1, 'a'
+--- end)
+---
+--- local task_fun = async.async(function(arg)
+---    return 2, 'b', arg
+--- end)
+---
+--- async.arun(function()
+---   do -- await a callback function
+---     async.await(1, vim.schedule)
+---   end
+---
+---   do -- await a task (new async context)
+---     local n, s = async.await(task)
+---     assert(n == 1 and s == 'a')
+---   end
+---
+---   do -- await a started task function (new async context)
+---     local n, s, arg = async.await(task_fun('A'))
+---     assert(n == 2)
+---     assert(s == 'b')
+---     assert(args == 'A')
+---   end
+---
+---   do -- await a task function (re-using the current async context)
+---     local n, s, arg = async.await(task_fun, 'B')
+---     assert(n == 2)
+---     assert(s == 'b')
+---     assert(args == 'B')
+---   end
+--- end)
+--- ```
+--- @async
+--- @overload fun(argc: integer, func: async.CallbackFn, ...:any): any ...
+--- @overload fun(task: async.Task): any ...
+--- @overload fun(taskfun: async.TaskFun): any ...
+function M.await(...)
+  assert(running(), 'Not in async context')
+
+  local arg1 = select(1, ...)
+
+  if type(arg1) == 'number' then
+    return await_cbfun(...)
+  elseif getmetatable(arg1) == Task then
+    return await_task(...)
+  elseif getmetatable(arg1) == TaskFun then
+    return await_taskfun(...)
+  end
+
+  error('Invalid arguments, expected Task or (argc, func) got: ' .. type(arg1), 2)
 end
 
 --- Creates an async function with a callback style function.
----@generic F: function
----@param func F
----@param argc integer
----@return F
-function M.wrap(func, argc)
-  vim.validate('func', func, 'function')
-  vim.validate('argc', argc, 'number')
-  ---@param ... unknown
-  ---@return unknown
+---
+--- Example:
+---
+--- ```lua
+--- --- Note the callback argument is not present in the return function
+--- --- @type fun(timeout: integer)
+--- local sleep = async.awrap(2, function(timeout, callback)
+---   local timer = vim.uv.new_timer()
+---   timer:start(timeout * 1000, 0, callback)
+---   -- uv_timer_t provides a close method so timer will be
+---   -- cleaned up when this function finishes
+---   return timer
+--- end)
+---
+--- async.arun(function()
+---   print('hello')
+---   sleep(2)
+---   print('world')
+--- end)
+--- ```
+---
+--- local atimer = async.awrap(
+--- @param argc integer
+--- @param func async.CallbackFn
+--- @return async function
+function M.awrap(argc, func)
+  assert(type(argc) == 'number')
+  assert(type(func) == 'function')
+  --- @async
   return function(...)
-    return co.yield(argc, func, ...)
+    return M.await(argc, func, ...)
   end
 end
 
----Use this to create a function which executes in an async context but
----called from a non-async context. Inherently this cannot return anything
----since it is non-blocking
----@generic F: function
----@param func async F
----@param nargs? integer
----@return F
-function M.sync(func, nargs)
-  nargs = nargs or 0
-  return function(...)
-    local callback = select(nargs + 1, ...)
-    execute(func, callback, unpack({ ... }, 1, nargs))
-  end
+if vim.schedule then
+  --- An async function that when called will yield to the Neovim scheduler to be
+  --- able to call the API.
+  M.schedule = M.awrap(1, vim.schedule)
 end
 
----@param n integer max number of concurrent jobs
----@param interrupt_check? function
----@param thunks function[]
----@return any
-function M.join(n, interrupt_check, thunks)
-  return co.yield(1, function(finish)
-    if #thunks == 0 then
-      return finish()
+--- Create a function that runs a function when it is garbage collected.
+--- @generic F
+--- @param f F
+--- @param gc fun()
+--- @return F
+local function gc_fun(f, gc)
+  local proxy = newproxy(true)
+  local proxy_mt = getmetatable(proxy)
+  proxy_mt.__gc = gc
+  proxy_mt.__call = function(_, ...)
+    return f(...)
+  end
+
+  return proxy
+end
+
+--- @param task_cbs table<async.Task,function>
+local function gc_cbs(task_cbs)
+  for task, tcb in pairs(task_cbs) do
+    for j, cb in pairs(task._callbacks) do
+      if cb == tcb then
+        task._callbacks[j] = nil
+        break
+      end
     end
+  end
+end
 
-    local remaining = { select(n + 1, unpack(thunks)) }
-    local to_go = #thunks
+--- @async
+--- Example:
+--- ```lua
+--- local task1 = async.arun(function()
+---   return 1, 'a'
+--- end)
+---
+--- local task2 = async.arun(function()
+---   return 1, 'a'
+--- end)
+---
+--- local task3 = async.arun(function()
+---   error('task3 error')
+--- end)
+---
+--- async.arun(function()
+---   for i, err, r1, r2 in async.iter({task1, task2, task3})
+---     print(i, err, r1, r2)
+---   end
+--- end)
+--- ```
+---
+--- Prints:
+--- ```
+--- 1 nil 1 'a'
+--- 2 nil 2 'b'
+--- 3 'task3 error' nil nil
+--- ```
+---
+--- @param tasks async.Task[]
+--- @return fun(): (integer?, any?, ...)
+function M.iter(tasks)
+  assert(running(), 'Not in async context')
 
-    local ret = {} ---@type any[]
+  local results = {} --- @type [integer, any, ...][]
 
-    local function cb(...)
-      ret[#ret + 1] = { ... }
-      to_go = to_go - 1
-      if to_go == 0 then
-        finish(ret)
-      elseif not interrupt_check or not interrupt_check() then
-        if #remaining > 0 then
-          local next_task = table.remove(remaining)
-          next_task(cb)
-        end
+  -- Iter blocks in an async context so only one waiter is needed
+  local waiter = nil
+  local task_cbs = {} --- @type table<async.Task,function>
+  local remaining = #tasks
+
+  --- If can_gc_cbs is true, then the iterator function has been garbage
+  --- collected and means any awaiters can also be garbage collected. The
+  --- only time we can't do this is if with the special case when iter() is
+  --- called anonymously (`local i = async.iter(tasks)()`), so we should not
+  --- garbage collect the callbacks until at least one awaiter is called.
+  local can_gc_cbs = false
+
+  for i, task in ipairs(tasks) do
+    local function cb(err, ...)
+      if can_gc_cbs == true then
+        gc_cbs(task_cbs)
+      end
+
+      local callback = waiter
+
+      -- Clear waiter before calling it
+      waiter = nil
+
+      remaining = remaining - 1
+      if callback then
+        -- Iterator is waiting, yield to it
+        callback(i, err, ...)
+      else
+        -- Task finished before Iterator was called. Store results.
+        table.insert(results, pack_len(i, err, ...))
       end
     end
 
-    for i = 1, math.min(n, #thunks) do
-      thunks[i](cb)
+    task_cbs[task] = cb
+    task:await(cb)
+  end
+
+  return gc_fun(
+    M.awrap(1, function(callback)
+      if next(results) then
+        local res = table.remove(results, 1)
+        callback(unpack_len(res))
+      elseif remaining == 0 then
+        callback() -- finish
+      else
+        assert(not waiter, 'internal error: waiter already set')
+        waiter = callback
+      end
+    end),
+    function()
+      -- Don't gc callbacks just yet. Wait until at least one of them is called.
+      can_gc_cbs = true
     end
-  end, 1)
+  )
 end
 
----An async function that when called will yield to the Neovim scheduler to be
----able to call the API.
----@type fun()
-M.main = M.wrap(vim.schedule, 1)
+do -- join()
+  --- @param results table<integer,table>
+  --- @param i integer
+  --- @param ... any
+  --- @return boolean
+  local function collect(results, i, ...)
+    if i then
+      results[i] = pack_len(...)
+    end
+    return i ~= nil
+  end
+
+  --- @param iter fun(): ...
+  --- @return table<integer,table>
+  local function drain_iter(iter)
+    local results = {} --- @type table<integer,table>
+    while collect(results, iter()) do
+    end
+    return results
+  end
+
+  --- @async
+  --- Wait for all tasks to finish and return their results.
+  ---
+  --- Example:
+  --- ```lua
+  --- local task1 = async.arun(function()
+  ---   return 1, 'a'
+  --- end)
+  ---
+  --- local task2 = async.arun(function()
+  ---   return 1, 'a'
+  --- end)
+  ---
+  --- local task3 = async.arun(function()
+  ---   error('task3 error')
+  --- end)
+  ---
+  --- async.arun(function()
+  ---   local results = async.join({task1, task2, task3})
+  ---   print(vim.inspect(results))
+  --- end)
+  --- ```
+  ---
+  --- Prints:
+  --- ```
+  --- {
+  ---   [1] = { nil, 1, 'a' },
+  ---   [2] = { nil, 2, 'b' },
+  ---   [3] = { 'task2 error' },
+  --- }
+  --- ```
+  --- @param tasks async.Task[]
+  --- @return table<integer,[any?,...?]>
+  function M.join(tasks)
+    assert(running(), 'Not in async context')
+    return drain_iter(M.iter(tasks))
+  end
+
+  --- @async
+  --- @param tasks async.Task[]
+  --- @return integer?, any?, ...?
+  function M.joinany(tasks)
+    return M.iter(tasks)()
+  end
+end
 
 return M
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 68f4c5ea4..6d60b7921 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -9,23 +9,53 @@ local parsers = require('nvim-treesitter.parsers')
 local util = require('nvim-treesitter.util')
 
 ---@type fun(path: string, new_path: string, flags?: table): string?
-local uv_copyfile = a.wrap(uv.fs_copyfile, 4)
+local uv_copyfile = a.awrap(4, uv.fs_copyfile)
 
 ---@type fun(path: string, mode: integer): string?
-local uv_mkdir = a.wrap(uv.fs_mkdir, 3)
+local uv_mkdir = a.awrap(3, uv.fs_mkdir)
 
 ---@type fun(path: string, new_path: string): string?
-local uv_rename = a.wrap(uv.fs_rename, 3)
+local uv_rename = a.awrap(3, uv.fs_rename)
 
 ---@type fun(path: string, new_path: string, flags?: table): string?
-local uv_symlink = a.wrap(uv.fs_symlink, 4)
+local uv_symlink = a.awrap(4, uv.fs_symlink)
 
 ---@type fun(path: string): string?
-local uv_unlink = a.wrap(uv.fs_unlink, 2)
+local uv_unlink = a.awrap(2, uv.fs_unlink)
 
 local MAX_JOBS = 100
 local INSTALL_TIMEOUT = 60000
 
+--- @async
+--- @param max_jobs integer
+--- @param task_funs async.TaskFun[]
+local function join(max_jobs, task_funs)
+  if #task_funs == 0 then
+    return
+  end
+
+  max_jobs = math.min(max_jobs, #task_funs)
+
+  local remaining = { select(max_jobs + 1, unpack(task_funs)) }
+  local to_go = #task_funs
+
+  a.await(1, function(finish)
+    local function cb()
+      to_go = to_go - 1
+      if to_go == 0 then
+        finish()
+      elseif #remaining > 0 then
+        local next_task = table.remove(remaining)
+        next_task():await(cb)
+      end
+    end
+
+    for i = 1, max_jobs do
+      task_funs[i]():await(cb)
+    end
+  end)
+end
+
 ---@async
 ---@param cmd string[]
 ---@param opts? vim.SystemOpts
@@ -33,8 +63,8 @@ local INSTALL_TIMEOUT = 60000
 local function system(cmd, opts)
   local cwd = opts and opts.cwd or uv.cwd()
   log.trace('running job: (cwd=%s) %s', cwd, table.concat(cmd, ' '))
-  local r = a.wrap(vim.system, 3)(cmd, opts) --[[@as vim.SystemCompleted]]
-  a.main()
+  local r = a.await(3, vim.system, cmd, opts) --[[@as vim.SystemCompleted]]
+  a.schedule()
   if r.stdout and r.stdout ~= '' then
     log.trace('stdout -> %s', r.stdout)
   end
@@ -190,7 +220,7 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
   do -- Create tmp dir
     logger:debug('Creating temporary directory: %s', tmp)
     local err = mkpath(tmp)
-    a.main()
+    a.schedule()
     if err then
       return logger:error('Could not create %s-tmp: %s', project_name, err)
     end
@@ -211,7 +241,7 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
   do -- Remove tarball
     logger:debug('Removing %s...', tarball_path)
     local err = uv_unlink(tarball_path)
-    a.main()
+    a.schedule()
     if err then
       return logger:error('Could not remove tarball: %s', err)
     end
@@ -223,7 +253,7 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
     local extracted = fs.joinpath(tmp, repo_project_name .. '-' .. dir_rev)
     logger:debug('Moving %s to %s/...', extracted, output_dir)
     local err = uv_rename(extracted, output_dir)
-    a.main()
+    a.schedule()
     if err then
       return logger:error('Could not rename temp: %s', err)
     end
@@ -265,7 +295,7 @@ local function do_install(logger, compile_location, target_location)
   end
 
   local err = uv_copyfile(compile_location, target_location)
-  a.main()
+  a.schedule()
   if err then
     return logger:error('Error during parser installation: %s', err)
   end
@@ -343,7 +373,7 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
   local queries_src = M.get_package_path('runtime', 'queries', lang)
   uv_unlink(queries)
   local err = uv_symlink(queries_src, queries, { dir = true, junction = true })
-  a.main()
+  a.schedule()
   if err then
     return logger:error(err)
   end
@@ -403,20 +433,20 @@ end
 ---@field max_jobs? integer
 
 --- Install a parser
+---@async
 ---@param languages string[]
 ---@param options? InstallOptions
----@param callback? fun(boolean)
-local function install(languages, options, callback)
+local function install(languages, options)
   options = options or {}
 
   local cache_dir = fs.normalize(fn.stdpath('cache'))
   local install_dir = config.get_install_dir('parser')
 
-  local tasks = {} ---@type fun()[]
+  local task_funs = {} ---@type async.TaskFun[]
   local done = 0
   for _, lang in ipairs(languages) do
-    tasks[#tasks + 1] = a.sync(function()
-      a.main()
+    task_funs[#task_funs + 1] = a.async(function()
+      a.schedule()
       local status = install_lang(lang, cache_dir, install_dir, options.force, options.generate)
       if status ~= 'failed' then
         done = done + 1
@@ -424,29 +454,24 @@ local function install(languages, options, callback)
     end)
   end
 
-  a.join(options and options.max_jobs or MAX_JOBS, nil, tasks)
-  if #tasks > 1 then
-    a.main()
-    log.info('Installed %d/%d languages', done, #tasks)
-  end
-  if callback then
-    callback(done == #tasks)
+  join(options and options.max_jobs or MAX_JOBS, task_funs)
+  if #task_funs > 1 then
+    a.schedule()
+    log.info('Installed %d/%d languages', done, #task_funs)
   end
+  return done == #task_funs
 end
 
 ---@param languages string[]|string
 ---@param options? InstallOptions
----@param callback? fun(boolean)
-M.install = a.sync(function(languages, options, callback)
+M.install = a.async(function(languages, options)
   reload_parsers()
   languages = config.norm_languages(languages, { unsupported = true })
-  install(languages, options, callback)
-end, 3)
+  return install(languages, options)
+end)
 
 ---@param languages? string[]|string
----@param _options? table
----@param callback? function
-M.update = a.sync(function(languages, _options, callback)
+M.update = a.async(function(languages)
   reload_parsers()
   if not languages or #languages == 0 then
     languages = 'all'
@@ -455,14 +480,12 @@ M.update = a.sync(function(languages, _options, callback)
   languages = vim.tbl_filter(needs_update, languages) ---@type string[]
 
   if #languages > 0 then
-    install(languages, { force = true }, callback)
+    return install(languages, { force = true })
   else
     log.info('All parsers are up-to-date')
-    if callback then
-      callback(true)
-    end
+    return true
   end
-end, 3)
+end)
 
 ---@async
 ---@param logger Logger
@@ -477,7 +500,7 @@ local function uninstall_lang(logger, lang, parser, queries)
   if fn.filereadable(parser) == 1 then
     logger:debug('Unlinking ' .. parser)
     local perr = uv_unlink(parser)
-    a.main()
+    a.schedule()
 
     if perr then
       return logger:error(perr)
@@ -487,7 +510,7 @@ local function uninstall_lang(logger, lang, parser, queries)
   if fn.isdirectory(queries) == 1 then
     logger:debug('Unlinking ' .. queries)
     local qerr = uv_unlink(queries)
-    a.main()
+    a.schedule()
 
     if qerr then
       return logger:error(qerr)
@@ -498,16 +521,14 @@ local function uninstall_lang(logger, lang, parser, queries)
 end
 
 ---@param languages string[]|string
----@param _options? table
----@param _callback? fun()
-M.uninstall = a.sync(function(languages, _options, _callback)
+M.uninstall = a.async(function(languages)
   languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
 
   local parser_dir = config.get_install_dir('parser')
   local query_dir = config.get_install_dir('queries')
   local installed = config.installed_parsers()
 
-  local tasks = {} ---@type fun()[]
+  local task_funs = {} ---@type async.TaskFun[]
   local done = 0
   for _, lang in ipairs(languages) do
     local logger = log.new('uninstall/' .. lang)
@@ -516,7 +537,7 @@ M.uninstall = a.sync(function(languages, _options, _callback)
     else
       local parser = fs.joinpath(parser_dir, lang) .. '.so'
       local queries = fs.joinpath(query_dir, lang)
-      tasks[#tasks + 1] = a.sync(function()
+      task_funs[#task_funs + 1] = a.async(function()
         local err = uninstall_lang(logger, lang, parser, queries)
         if not err then
           done = done + 1
@@ -525,11 +546,11 @@ M.uninstall = a.sync(function(languages, _options, _callback)
     end
   end
 
-  a.join(MAX_JOBS, nil, tasks)
-  if #tasks > 1 then
-    a.main()
-    log.info('Uninstalled %d/%d languages', done, #tasks)
+  join(MAX_JOBS, task_funs)
+  if #task_funs > 1 then
+    a.schedule()
+    log.info('Uninstalled %d/%d languages', done, #task_funs)
   end
-end, 2)
+end)
 
 return M
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index 6dbc73d68..f06d3ee46 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -21,24 +21,17 @@ vim.opt.runtimepath:append('.')
 -- needed on CI
 vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
 
-local ok = nil
-if update then
-  require('nvim-treesitter.install').update('all', {}, function(success)
-    ok = success
-  end)
-else
-  require('nvim-treesitter.install').install(
+---@type async.Task
+local task = update and require('nvim-treesitter.install').update('all')
+  or require('nvim-treesitter.install').install(
     #parsers > 0 and parsers or 'all',
-    { force = true, generate = generate, max_jobs = max_jobs },
-    function(success)
-      ok = success
-    end
+    { force = true, generate = generate, max_jobs = max_jobs }
   )
-end
 
-vim.wait(6000000, function()
-  return ok ~= nil
-end)
+local ok, err_or_ok = task:pwait(1800000) -- wait max. 30 minutes
 if not ok then
+  print('ERROR: ', err_or_ok)
+  vim.cmd.cq()
+elseif not err_or_ok then
   vim.cmd.cq()
 end

From a663e6944784ca39a285348c5b7e3ac8ba14822d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 16 May 2025 18:12:26 +0200
Subject: [PATCH 2359/2704] feat(parsers): update javadoc, jq, hcl, query,
 smithy, earthfile, tcl, llvm, godot_resource, git_config, terraform, teal,
 gdscript, mlir

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 75278cd02..9007a600c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -419,7 +419,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = '8c93d89e262d9892ad692b3be05cfbcffbb9614f',
+      revision = 'a37c5ee95ce401ca311c0ae1369d9cfb953e151d',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -644,7 +644,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = '25dadb2beaa2bb0f53d5fe97d2588a01e9b0f0b5',
+      revision = 'e964ce912b5b835f1caedb600df9d5be77e803a8',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -661,7 +661,7 @@ return {
   },
   git_config = {
     install_info = {
-      revision = 'edc973f498482529ff2a319249d0f43a22860321',
+      revision = '0fbc9f99d5a28865f9de8427fb0672d66f9d83a5',
       url = 'https://github.com/the-mikedavis/tree-sitter-git-config',
     },
     maintainers = { '@amaanq' },
@@ -778,7 +778,7 @@ return {
   },
   godot_resource = {
     install_info = {
-      revision = '99417ca9f4eccbf49e4ce5a69d89228811593bf5',
+      revision = 'a1a7295b376fbd2531601f4ffff191b031ffc795',
       url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
     maintainers = { '@pierpo' },
@@ -890,7 +890,7 @@ return {
   },
   hcl = {
     install_info = {
-      revision = '41a2e702413a53f2614533b2aa9c187816116cbc',
+      revision = '009def4ae38ec30e5b40beeae26efe93484ab286',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -1068,7 +1068,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'e49c8f0e26dc79afc999f377121ecceb30ffcc74',
+      revision = '001a8e4f8e839b640201c49046fbf5957fe1ee2c',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1106,7 +1106,7 @@ return {
   },
   jq = {
     install_info = {
-      revision = '13990f530e8e6709b7978503da9bc8701d366791',
+      revision = 'c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9',
       url = 'https://github.com/flurie/tree-sitter-jq',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1281,7 +1281,7 @@ return {
   },
   llvm = {
     install_info = {
-      revision = 'c14cb839003348692158b845db9edda201374548',
+      revision = '1ac83114e71839fa67f4cce2f864ebbbdf6e2a4f',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
@@ -1392,7 +1392,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'fdaa92565f5902afe81d958a48049f56721fd928',
+      revision = '3b2ae4ce9a8abca997ed3b34625d462248d1bbac',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1790,7 +1790,7 @@ return {
   },
   query = {
     install_info = {
-      revision = 'eba45dd965e119cb7cd3d5eea584e5d04bbef9a4',
+      revision = 'b5d39eab2cf3172d81352e5ef9df4639267c5813',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2044,7 +2044,7 @@ return {
   },
   smithy = {
     install_info = {
-      revision = 'fa898ac0885d1da9a253695c3e0e91f5efc587cd',
+      revision = 'ec4fe14586f2b0a1bc65d6db17f8d8acd8a90433',
       url = 'https://github.com/indoorvivants/tree-sitter-smithy',
     },
     maintainers = { '@amaanq', '@keynmol' },
@@ -2243,7 +2243,7 @@ return {
   },
   tcl = {
     install_info = {
-      revision = '93ad361b77faa39af410052e1ece22b9e6b8136c',
+      revision = '8f11ac7206a54ed11210491cee1e0657e2962c47',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-tcl',
     },
     maintainers = { '@lewis6991' },
@@ -2252,7 +2252,7 @@ return {
   teal = {
     install_info = {
       generate = true,
-      revision = '3db655924b2ff1c54fdf6371b5425ea6b5dccefe',
+      revision = '05d276e737055e6f77a21335b7573c9d3c091e2f',
       url = 'https://github.com/euclidianAce/tree-sitter-teal',
     },
     maintainers = { '@euclidianAce' },
@@ -2277,7 +2277,7 @@ return {
   terraform = {
     install_info = {
       location = 'dialects/terraform',
-      revision = '41a2e702413a53f2614533b2aa9c187816116cbc',
+      revision = '009def4ae38ec30e5b40beeae26efe93484ab286',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },

From 168fe16cdd9fd441e27e5554bcd9dc02d07e68be Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 17 May 2025 21:10:59 -0700
Subject: [PATCH 2360/2704] fix: tidy up some query mistakes

Revealed by the capture-less patterns lint
---
 runtime/queries/erlang/highlights.scm            | 4 ++--
 runtime/queries/linkerscript/injections.scm      | 2 +-
 runtime/queries/nim_format_string/highlights.scm | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 8bba348d9..4b5b8ee78 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -93,8 +93,8 @@
   lhs: _ @constant.macro
   (#set! priority 101))
 
-(_preprocessor_directive) @keyword.directive
-(#set! priority 99)
+((_preprocessor_directive) @keyword.directive
+  (#set! priority 99))
 
 ; Attributes
 (pp_include) @keyword.import
diff --git a/runtime/queries/linkerscript/injections.scm b/runtime/queries/linkerscript/injections.scm
index 51e6d1f6b..2f0e58eb6 100644
--- a/runtime/queries/linkerscript/injections.scm
+++ b/runtime/queries/linkerscript/injections.scm
@@ -1,2 +1,2 @@
-((comment)
+((comment) @injection.content
   (#set! injection.language "comment"))
diff --git a/runtime/queries/nim_format_string/highlights.scm b/runtime/queries/nim_format_string/highlights.scm
index fde9e4ba0..02a75e6a3 100644
--- a/runtime/queries/nim_format_string/highlights.scm
+++ b/runtime/queries/nim_format_string/highlights.scm
@@ -1,5 +1,3 @@
-(string_literal)
-
 (matching_curlies
   opening_curly: (opening_curly) @punctuation.special
   equals: (equals)? @punctuation.special

From 40cbddedf7e581caf58bab3fcd114641774178ea Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 18 May 2025 10:15:04 +0200
Subject: [PATCH 2361/2704] feat(parsers): update markdown_inline, markdown,
 vimdoc, fsharp, pascal, racket, lua, scheme, gleam, ocamllex, query

---
 lua/nvim-treesitter/parsers.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9007a600c..4b75837a8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -601,7 +601,7 @@ return {
   fsharp = {
     install_info = {
       location = 'fsharp',
-      revision = '02929f084726db969e5b916d144436f248146824',
+      revision = 'f29605148f24199cf4d9c4a203a5debc0cbcc648',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -701,7 +701,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '5efbe4fdf199f30a90393196bfbf842d866753c2',
+      revision = '6ece453acf8b14568c10f629f8cd25d3dde3794f',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -1289,7 +1289,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = 'db16e76558122e834ee214c8dc755b4a3edc82a9',
+      revision = 'e5e406935ff3e36529545955e2972646ed97f9e2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1340,7 +1340,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '071b3b70baad138aa28832cf02d16ca48f2e6f4d',
+      revision = 'efb075cbd57ce33f694c2bb264b99cdba0f31789',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1351,7 +1351,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '071b3b70baad138aa28832cf02d16ca48f2e6f4d',
+      revision = 'efb075cbd57ce33f694c2bb264b99cdba0f31789',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1517,7 +1517,7 @@ return {
   ocamllex = {
     install_info = {
       generate = true,
-      revision = 'c5cf996c23e38a1537069fbe2d4bb83a75fc7b2f',
+      revision = 'ed488aa334d1b4e3235e1efaaf96f00815ebc0e0',
       url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
     },
     maintainers = { '@undu' },
@@ -1533,7 +1533,7 @@ return {
   },
   pascal = {
     install_info = {
-      revision = '78426d96bde7114af979e314283e45d087603428',
+      revision = '5054931bcd022860dd5936864f981e359fb63aef',
       url = 'https://github.com/Isopod/tree-sitter-pascal',
     },
     maintainers = { '@Isopod' },
@@ -1790,7 +1790,7 @@ return {
   },
   query = {
     install_info = {
-      revision = 'b5d39eab2cf3172d81352e5ef9df4639267c5813',
+      revision = '8bf3112db43bdba3002bb1f88b7cda5f6278fc88',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1807,7 +1807,7 @@ return {
   },
   racket = {
     install_info = {
-      revision = '78e147ac9be60e8e752fffaafa22293a785ac3dc',
+      revision = '6d63a202602eb350e726b5e7814127ba22ed25fc',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 2,
@@ -1985,7 +1985,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = 'd5b7655bea905f902d099abd539e1b66e1f4bf27',
+      revision = '1e4d38d650bf6b53930ec9d41a7000775c134039',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2509,7 +2509,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = '6dab95ab84a006e8adfd6966c5fd9dde48224725',
+      revision = '9f6191a98702edc1084245abd5523279d4b681fb',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },

From b19b5ce17195f830fd2474c625e242cfc3aa5f90 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 18 May 2025 10:37:50 +0200
Subject: [PATCH 2362/2704] docs: final update after rewrite

Make clear this is not the default branch
---
 CONTRIBUTING.md |  6 +++---
 README.md       | 47 +++++++++++++++++++++++++----------------------
 TODO.md         | 28 ----------------------------
 3 files changed, 28 insertions(+), 53 deletions(-)
 delete mode 100644 TODO.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 983499e81..f665ce1ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,15 +22,15 @@ To add a new parser, edit the following files:
 zimbu = {
   install_info = {
     url = 'https://github.com/zimbulang/tree-sitter-zimbu', -- git repo; use `path` for local path
-    revision = 'v2.1', -- tag or commit hash, will be updated automatically
+    revision = 'v2.1', -- tag or commit hash
     -- optional entries:
     branch = 'develop', -- only needed if different from default branch
     location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
     generate = true, -- only needed if repo does not contain pre-generated src/parser.c
-    generate_from_json = true, -- only needed if grammar.js has npm-installed dependencies
+    generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either
   },
   maintainers = { '@me' }, -- the _query_ maintainers
-  tier = 1, -- stable: track versioned releases
+  tier = 1, -- stable: track versioned releases instead of latest commit
   -- optional entries:
   requires = { 'vim' }, -- if the queries inherit from another language
   readme_note = "an example language",
diff --git a/README.md b/README.md
index 703a41781..ef3a9f32c 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,17 @@
 <h1 align="center">
   <img src="https://github.com/nvim-treesitter/nvim-treesitter/assets/2361214/0513b223-c902-4f12-92ee-8ac4d8d6f41f" alt="nvim-treesitter">
 </h1>
-<div align="center">
-  <p>
-    <a href="https://matrix.to/#/#nvim-treesitter:matrix.org">
-      <img alt="Matrix Chat" src="https://img.shields.io/matrix/nvim-treesitter:matrix.org" />
-    </a>
-    <a href="https://github.com/nvim-treesitter/nvim-treesitter/actions?query=workflow%3A%22Linting+and+style+checking%22+branch%3Amaster">
-      <img alt="Linting and Style" src="https://github.com/nvim-treesitter/nvim-treesitter/workflows/Linting%20and%20style%20checking/badge.svg" />
-    </a>
-    <a href="https://github.com/nvim-treesitter/nvim-treesitter/actions?query=workflow%3A%22Check+loading+of+syntax+files%22+branch%3Amaster">
-      <img alt="Syntax files" src="https://github.com/nvim-treesitter/nvim-treesitter/workflows/Check%20loading%20of%20syntax%20files/badge.svg" />
-    </a>
-  </p>
-</div>
-
-
->[!WARNING]
-> This branch is a [full, incompatible, rewrite of `nvim-treesitter`](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767) and [work in progress](TODO.md). The **stable** branch is [`master`](https://github.com/nvim-treesitter/nvim-treesitter/tree/master).
 
 The `nvim-treesitter` plugin provides
 1. functions for installing, updating, and removing [**tree-sitter parsers**](SUPPORTED_LANGUAGES.md);
-2. a collection of **queries** for enabling tree-sitter features built into Neovim for these languages.
+2. a collection of **queries** for enabling tree-sitter features built into Neovim for these languages;
+3. a staging ground for [treesitter-based features](#Supported-features) considered for upstreaming to Neovim.
 
 For details on these and how to help improving them, see [CONTRIBUTING.md](./CONTRIBUTING.md).
 
+>[!CAUTION]
+> This is a full, incompatible, rewrite. If you can't or don't want to update, check out the [`master` branch](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/README.md) (which is locked but will remain available for backward compatibility).
+
 # Quickstart
 
 ## Requirements
@@ -35,6 +22,12 @@ For details on these and how to help improving them, see [CONTRIBUTING.md](./CON
 - a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
 - `Node` (23.0.0 or later) for some parsers (see the [list of supported languages](SUPPORTED_LANGUAGES.md))
 
+>[!IMPORTANT]
+> The **support policy** for Neovim is
+> 1. the _latest_ [stable release](https://github.com/neovim/neovim/releases/tag/stable);
+> 2. the _latest_ [nightly prerelease](https://github.com/neovim/neovim/releases/tag/nightly).
+> Other versions may work but are neither tested nor considered for fixes. In general, compatibility with Nvim 0.X is removed after the release of Nvim 0.(X+1).1.
+
 ## Installation
 
 You can install `nvim-treesitter` with your favorite package manager (or using the native `package` feature of vim, see `:h packages`).
@@ -43,14 +36,20 @@ This plugin is only guaranteed to work with specific versions of language parser
 It is strongly recommended to automate this; e.g., using [lazy.nvim](https://github.com/folke/lazy.nvim)
 
 ```lua
-require('lazy').setup(
-  { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', lazy = false }
-)
+require('lazy').setup({
+  'nvim-treesitter/nvim-treesitter',
+  lazy = false,
+  branch = 'main',
+  build = ':TSUpdate'
+})
 ```
 
 >[!IMPORTANT]
 > This plugin does not support lazy-loading.
 
+>[!IMPORTANT]
+> Make sure to specify the `main` branch since (for now) the default branch is [`master`](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/README.md).
+
 ## Setup
 
 `nvim-treesitter` can be configured by calling `setup`. The following snippet lists the available options and their default values. **You do not need to call `setup` for `nvim-treesitter` to work using default values.**
@@ -69,6 +68,7 @@ require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
 ```
 
 (This is a no-op if the parsers are already installed.) Note that this function runs asynchronously; for synchronous installation in a script context ("bootstrapping"), you need to `wait()` for it to finish:
+
 ```lua
 require('nvim-treesitter').install({ 'rust', 'javascript', 'zig' }):wait(300000) -- wait max. 5 minutes
 ```
@@ -143,13 +143,14 @@ callback = function()
       branch = 'develop', -- only needed if different from default branch
       location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
       generate = true, -- only needed if repo does not contain pre-generated `src/parser.c`
-      generate_from_json = false, -- only needed if repo does not contain `src/grammar.json`
+      generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either
     },
   }
 end})
 ```
 
 Alternatively, if you have a local checkout, you can instead use
+
 ```lua
     install_info = {
       path = '~/parsers/tree-sitter-zimbu',
@@ -177,6 +178,7 @@ If Neovim does not detect your language's filetype by default, you can use [Neov
 ### Modifying parsers
 
 You can use the same approach for overriding parser information. E.g., if you always want to generate the `lua` parser from grammar, add
+
 ```lua
 vim.api.nvim_create_autocmd('User', { pattern = 'TSUpdate',
 callback = function()
@@ -189,6 +191,7 @@ end})
 Queries can be placed anywhere in your `runtimepath` under `queries/<language>`, with earlier directories taking precedence unless the queries are marked with `; extends`; see [`:h treesitter-query-modelines`](https://neovim.io/doc/user/treesitter.html#treesitter-query-modeline).
 
 E.g., to add queries for `zimbu`, put `highlights.scm` etc. under
+
 ```lua
 vim.fn.stdpath('data') .. 'site/queries/zimbu'
 ```
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 937a8b63b..000000000
--- a/TODO.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Roadmap
-
-This document lists the planned and finished changes in this rewrite towards [Nvim-treesitter 1.0](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767).
-
-## TODO
-
-- [ ] **tests:** remove custom crate, plenary dependency
-- [ ] **indents:** rewrite (Helix or Zed compatible)
-- [ ] **textobjects:** include simple(!) `node`, `scope` (using `locals`) objects
-
-## DONE
-
-- [X] remove module framework
-- [X] remove extra utilities
-- [X] refactor `indent.lua` into standalone
-- [X] refactor `locals.lua` into standalone
-- [X] refactor commands, predicates, filetypes registration to plugin/
-- [X] support installing tiers of parsers
-- [X] install parsers to standard directory by default
-- [X] remove bundled queries from runtimepath; copy on parser install
-- [X] general refactor and cleanup
-- [X] rewrite installation using async module (drop support for sync; use callback instead)
-- [X] switch to upstream injection format
-- [X] remove locals from highlighting (cf. https://github.com/nvim-treesitter/nvim-treesitter/issues/3944#issuecomment-1458782497)
-- [X] drop ensure_install (replace with install)
-- [X] **CI:** switch to ts_query_ls, add update readme as check (remove update job)
-- [X] **CI:** track versioned releases for tier 1
-- [X] **`install.lua`:** migrate to async v2

From d08cf75e1bb52ce86a895dc287f9480a6d3d78b2 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Wed, 21 May 2025 21:47:18 +0200
Subject: [PATCH 2363/2704] feat(inko): add scoping to the locals queries

This way tooling that makes use of these queries (e.g. snacks.nvim) is
aware of the scoping of Inko types and methods.
---
 runtime/queries/inko/locals.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/runtime/queries/inko/locals.scm b/runtime/queries/inko/locals.scm
index 09450f525..b69681cd1 100644
--- a/runtime/queries/inko/locals.scm
+++ b/runtime/queries/inko/locals.scm
@@ -3,8 +3,9 @@
   (block)
 ] @local.scope
 
-(method
-  name: _ @local.definition.method)
+((method
+  name: _ @local.definition.method) @local.scope
+  (#set! definition.function.scope "parent"))
 
 (external_function
   name: _ @local.definition.function)
@@ -24,10 +25,11 @@
 (named_argument
   name: _ @local.definition.parameter)
 
-(class
+((class
   modifier: (modifier
     "enum")
-  name: _ @local.definition.enum)
+  name: _ @local.definition.enum) @local.scope
+  (#set! definition.type.scope "parent"))
 
 (class
   modifier: (modifier
@@ -36,11 +38,13 @@
     (define_case
       name: _ @local.definition.field)))
 
-(class
-  name: _ @local.definition.type)
+((class
+  name: _ @local.definition.type) @local.scope
+  (#set! definition.type.scope "parent"))
 
-(trait
-  name: _ @local.definition.type)
+((trait
+  name: _ @local.definition.type) @local.scope
+  (#set! definition.type.scope "parent"))
 
 (import
   (symbols

From 011f02936f5c69500315a32df1a1b01fdd2feaf3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 22 May 2025 08:19:22 +0200
Subject: [PATCH 2364/2704] fix(install): return task object in API functions

---
 lua/nvim-treesitter/init.lua | 6 +++---
 scripts/install-parsers.lua  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/init.lua b/lua/nvim-treesitter/init.lua
index 52eab71c8..561c1697a 100644
--- a/lua/nvim-treesitter/init.lua
+++ b/lua/nvim-treesitter/init.lua
@@ -5,15 +5,15 @@ function M.setup(...)
 end
 
 function M.install(...)
-  require('nvim-treesitter.install').install(...)
+  return require('nvim-treesitter.install').install(...)
 end
 
 function M.uninstall(...)
-  require('nvim-treesitter.install').uninstall(...)
+  return require('nvim-treesitter.install').uninstall(...)
 end
 
 function M.update(...)
-  require('nvim-treesitter.install').update(...)
+  return require('nvim-treesitter.install').update(...)
 end
 
 function M.indentexpr()
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index f06d3ee46..f2fd56082 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -22,8 +22,8 @@ vim.opt.runtimepath:append('.')
 vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
 
 ---@type async.Task
-local task = update and require('nvim-treesitter.install').update('all')
-  or require('nvim-treesitter.install').install(
+local task = update and require('nvim-treesitter').update('all')
+  or require('nvim-treesitter').install(
     #parsers > 0 and parsers or 'all',
     { force = true, generate = generate, max_jobs = max_jobs }
   )

From c78594ce064b9072ad94f660c81c1a17b26fcd29 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 22 May 2025 19:44:58 +0200
Subject: [PATCH 2365/2704] ci(test): throttle all install steps

---
 .github/workflows/test-core.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 0c0ae594c..d91c1bb4c 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -33,7 +33,7 @@ jobs:
 
       - if: inputs.type == 'build'
         name: Compile parsers
-        run: $NVIM -l ./scripts/install-parsers.lua
+        run: $NVIM -l ./scripts/install-parsers.lua --max-jobs=10
 
       - if: inputs.type == 'generate'
         name: Generate and compile parsers

From 652831b231270da36cfaa03af24df85d1bb47ae9 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 23 Mar 2025 01:14:22 -0700
Subject: [PATCH 2366/2704] feat(bash): highlight variable argument for `printf
 -v`

---
 runtime/queries/bash/highlights.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
index 58d57d9e5..428207b94 100644
--- a/runtime/queries/bash/highlights.scm
+++ b/runtime/queries/bash/highlights.scm
@@ -247,6 +247,17 @@
     "READLINE_ARGUMENT" "READLINE_LINE" "READLINE_MARK" "READLINE_POINT" "REPLY" "SECONDS" "SHELL"
     "SHELLOPTS" "SHLVL" "SRANDOM" "TIMEFORMAT" "TMOUT" "TMPDIR" "UID"))
 
+((command
+  name: (command_name
+    (word) @_printf)
+  .
+  argument: (word) @_v
+  .
+  argument: (word) @variable)
+  (#eq? @_printf "printf")
+  (#eq? @_v "-v")
+  (#lua-match? @variable "^[a-zA-Z_][a-zA-Z0-9_]*$"))
+
 (case_item
   value: (word) @variable.parameter)
 

From 354c30d2a2f0996b56886928cb3d36e9c6664a06 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 24 May 2025 18:25:34 +0200
Subject: [PATCH 2367/2704] feat(parsers): update desktop, dtd, editorconfig,
 janet_simple, liquid, c, v, perl, mlir, templ, vhdl, xml, xresources, yaml,
 tlaplus, cmake

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4b75837a8..6583bd3b9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -158,7 +158,7 @@ return {
   },
   c = {
     install_info = {
-      revision = '2a265d69a4caf57108a73ad2ed1e6922dd2f998c',
+      revision = '091093731389448e10822dd140621cfec1ff96b2',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -222,7 +222,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = 'c2fdefaf7ae3b7c5cf11705fe63c516b1c490590',
+      revision = 'cf9799600b2ba5e6620fdabddec3b2db8306bc46',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -338,7 +338,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '6d66eea37afa1d6bc1e25ef457113743df42416d',
+      revision = 'afec3093f6102b83a72aece728c53d17d3fcb2d4',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -411,7 +411,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '0d9a8099c963ed53e183425c1b47fa2622c8eaf7',
+      revision = '291b02018c525abe70fec41559cfe8f2f1cc84b2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -441,7 +441,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '3f2b371537355f6e53cc3af37f79ba450efb5132',
+      revision = '65de8da4ff21a8be40adb5dadcd7a0f39d2f0747',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -1052,7 +1052,7 @@ return {
   },
   janet_simple = {
     install_info = {
-      revision = 'b08b402207fba0037d5152ce7c521351147f4388',
+      revision = '7e28cbf1ca061887ea43591a2898001f4245fddf',
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
@@ -1265,7 +1265,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = 'd269f4d52cd08f6cbc6636ee23cc30a9f6c32e42',
+      revision = 'd6ebde3974742cd1b61b55d1d94aab1dacb41056',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1392,7 +1392,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '3b2ae4ce9a8abca997ed3b34625d462248d1bbac',
+      revision = '4d2396f21722d0c8d2ea285f380b21f1a71668b3',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1558,7 +1558,7 @@ return {
   perl = {
     install_info = {
       branch = 'release',
-      revision = 'ecd90bd8b381bcc7219fed4fe351903630e761c6',
+      revision = 'a2d8e5a32a63019d25bb7452455f4d646d11cce5',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -2260,7 +2260,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = '54367acb2b250879f39f2afee123c917ed0798e0',
+      revision = '5504cc96fbf5c9a029add2dfcb6e585e8fdaad75',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2310,7 +2310,7 @@ return {
   },
   tlaplus = {
     install_info = {
-      revision = '4ba91b07b97741a67f61221d0d50e6d962e4987e',
+      revision = '2d831940c782850f64dabf5b7b17e9e51f7f0ebb',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
@@ -2453,7 +2453,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '59a8889d84a293d7c0366d14c8dbb0eec24fe889',
+      revision = '0f963ca4c0cc888252f5a31f37c974d5e2527d06',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2485,7 +2485,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '35ed277d3e98836796bc764010dc3fb800d14ee4',
+      revision = 'ec2cb14f68053cf49d1d18cd5742af8e81771ebb',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2576,7 +2576,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '0d9a8099c963ed53e183425c1b47fa2622c8eaf7',
+      revision = '291b02018c525abe70fec41559cfe8f2f1cc84b2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2585,7 +2585,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'd0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6',
+      revision = 'dcbce0c5dde0fca01dd83a8f497ebe4d053eab1d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
@@ -2593,7 +2593,7 @@ return {
   },
   yaml = {
     install_info = {
-      revision = '1805917414a9a8ba2473717fd69447277a175fae',
+      revision = '08c5caaeb34e5ccd614706d3b5359a78f1c9e275',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
     },
     maintainers = { '@amaanq' },

From 0d60a092525ed669ae37289f9057988b8313ec59 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 25 May 2025 10:47:20 +0200
Subject: [PATCH 2368/2704] fix(typst): restore missing injections

---
 runtime/queries/typst/injections.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/queries/typst/injections.scm b/runtime/queries/typst/injections.scm
index 2f0e58eb6..344c6a308 100644
--- a/runtime/queries/typst/injections.scm
+++ b/runtime/queries/typst/injections.scm
@@ -1,2 +1,6 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+(raw_blck
+  (ident) @injection.language
+  (blob) @injection.content)

From c1dfc39285e4a11983dfbe556fb0be7f2a749977 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 25 May 2025 13:02:26 +0200
Subject: [PATCH 2369/2704] fix(config): prepend install_dir to rtp

---
 doc/nvim-treesitter.txt        | 2 +-
 lua/nvim-treesitter/config.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index b57687961..77e6f037f 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -100,7 +100,7 @@ setup({opts})                                          *nvim-treesitter.setup()*
     • {opts}  `(table?)` Optional parameters:
               • {install_dir} (`string?`, default `stdpath('data')/site/`)
                 directory to install parsers and queries to. Note: will be
-                appended to |runtimepath|.
+                prepended to |runtimepath|.
 
 install({languages} [, {opts}])                    *nvim-treesitter.install()*
 
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 8dcbdb37e..d78ee50c4 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -16,7 +16,7 @@ function M.setup(user_data)
   if user_data then
     if user_data.install_dir then
       user_data.install_dir = vim.fs.normalize(user_data.install_dir)
-      vim.opt.runtimepath:append(user_data.install_dir)
+      vim.opt.runtimepath:prepend(user_data.install_dir)
     end
     config = vim.tbl_deep_extend('force', config, user_data)
   end

From 1043871ef43e009aedfc1d9965335e168a4a0a08 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 26 May 2025 14:52:28 +0200
Subject: [PATCH 2370/2704] fix(swift): mark as unmaintained

Prevent from updating parser with breaking changes until queries are
adapted.
---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 94e105085..bb13fc2f7 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -278,7 +278,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` |   | @connorlay
 [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` |   | @amaanq
 [sway](https://github.com/FuelLabs/tree-sitter-sway.git) | unstable | `HFIJL` |   | @ribru17
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` | X | @alex-pinkus
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unmaintained | `HFIJL` | X | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` |   | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` |   | @ok-ryoko
 [t32](https://gitlab.com/xasc/tree-sitter-t32) | unstable | `HFIJL` |   | @xasc
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6583bd3b9..bcd5598cf 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2199,7 +2199,7 @@ return {
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
-    tier = 2,
+    tier = 3,
   },
   sxhkdrc = {
     install_info = {

From 61b0a05ec07280540d839aa9edfb81a84048fdf2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 26 May 2025 14:42:03 +0200
Subject: [PATCH 2371/2704] fix(install): create cache dir if not existing

---
 lua/nvim-treesitter/install.lua | 4 ++++
 scripts/install-parsers.lua     | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 6d60b7921..e6933fe58 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -440,6 +440,10 @@ local function install(languages, options)
   options = options or {}
 
   local cache_dir = fs.normalize(fn.stdpath('cache'))
+  if not vim.uv.fs_stat(cache_dir) then
+    vim.fn.mkdir(cache_dir, 'p')
+  end
+
   local install_dir = config.get_install_dir('parser')
 
   local task_funs = {} ---@type async.TaskFun[]
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index f2fd56082..e3804cab8 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -18,9 +18,6 @@ end
 
 vim.opt.runtimepath:append('.')
 
--- needed on CI
-vim.fn.mkdir(vim.fn.stdpath('cache'), 'p')
-
 ---@type async.Task
 local task = update and require('nvim-treesitter').update('all')
   or require('nvim-treesitter').install(

From dd63d7141faa8bb551c1ed76e6d0d0006aa1db2d Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Tue, 27 May 2025 10:17:09 +0200
Subject: [PATCH 2372/2704] fix(haskell): properly set inline-python injection
 language

---
 runtime/queries/haskell/injections.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/haskell/injections.scm b/runtime/queries/haskell/injections.scm
index a82addbce..98a396e5e 100644
--- a/runtime/queries/haskell/injections.scm
+++ b/runtime/queries/haskell/injections.scm
@@ -79,6 +79,7 @@
 ; Python
 ; inline-python
 (quasiquote
-  (quoter) @injection.language
-  (#any-of? @injection.language "pymain" "pye" "py_" "pyf")
-  (quasiquote_body) @injection.content)
+  (quoter) @_name
+  (#any-of? @_name "pymain" "pye" "py_" "pyf")
+  (quasiquote_body) @injection.content
+  (#set! injection.language "python"))

From 0140c29b31d56be040697176ae809ba0c709da02 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 27 May 2025 15:20:55 +0200
Subject: [PATCH 2373/2704] fix(health): only require ts>=v0.25

---
 lua/nvim-treesitter/health.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 6904899f6..57131f778 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -7,7 +7,7 @@ local health = vim.health
 local M = {}
 
 local NVIM_TREESITTER_MINIMUM_ABI = 13
-local TREE_SITTER_MIN_VER = { 0, 25, 4 }
+local TREE_SITTER_MIN_VER = { 0, 25, 0 }
 
 ---@param name string
 ---@return table?

From 024e6c5e46f8ec4237695b9e3020ecb601d817df Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 28 May 2025 09:41:11 +0200
Subject: [PATCH 2374/2704] fix(queries): fix rebase errors on main

---
 runtime/queries/agda/injections.scm     | 12 ------------
 runtime/queries/scala/injections.scm    |  3 +++
 runtime/queries/solidity/injections.scm | 12 ++++++++++++
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/runtime/queries/agda/injections.scm b/runtime/queries/agda/injections.scm
index a772e0bd9..2f0e58eb6 100644
--- a/runtime/queries/agda/injections.scm
+++ b/runtime/queries/agda/injections.scm
@@ -1,14 +1,2 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
-
-((comment) @injection.content
-  (#lua-match? @injection.content "^///[^/]")
-  (#set! injection.language "doxygen"))
-
-((comment) @injection.content
-  (#lua-match? @injection.content "^///$")
-  (#set! injection.language "doxygen"))
-
-((comment) @injection.content
-  (#lua-match? @injection.content "^/[*][*][^*].*[*]/$")
-  (#set! injection.language "doxygen"))
diff --git a/runtime/queries/scala/injections.scm b/runtime/queries/scala/injections.scm
index 2f0e58eb6..1c2fe3cc9 100644
--- a/runtime/queries/scala/injections.scm
+++ b/runtime/queries/scala/injections.scm
@@ -1,2 +1,5 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((block_comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/runtime/queries/solidity/injections.scm b/runtime/queries/solidity/injections.scm
index 2f0e58eb6..a772e0bd9 100644
--- a/runtime/queries/solidity/injections.scm
+++ b/runtime/queries/solidity/injections.scm
@@ -1,2 +1,14 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^///[^/]")
+  (#set! injection.language "doxygen"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^///$")
+  (#set! injection.language "doxygen"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^/[*][*][^*].*[*]/$")
+  (#set! injection.language "doxygen"))

From 71d2fd1bd410da85d03ee1da7a35e895ee7a8494 Mon Sep 17 00:00:00 2001
From: Noah Bogart <noah.bogart@hey.com>
Date: Wed, 28 May 2025 16:44:34 -0400
Subject: [PATCH 2375/2704] fix(just): do not restrict `@function.call` to
 explicit list (#7905)

---
 runtime/queries/just/highlights.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/runtime/queries/just/highlights.scm b/runtime/queries/just/highlights.scm
index fbbf4eece..743de4314 100644
--- a/runtime/queries/just/highlights.scm
+++ b/runtime/queries/just/highlights.scm
@@ -135,15 +135,5 @@
     argument: (string) @string.special.path))
   (#eq? @_dir "working-directory"))
 
-; Ref: https://just.systems/man/en/chapter_31.html
-;(function_call (identifier) @error)
 (function_call
-  (identifier) @function.call
-  (#any-of? @function.call
-    "arch" "num_cpus" "os" "os_family" "env_var" "env_var_or_default" "env" "invocation_directory"
-    "invocation_directory_native" "justfile" "justfile_directory" "just_executable" "quote"
-    "replace" "replace_regex" "trim" "trim_end" "trim_end_match" "trim_end_matches" "trim_start"
-    "trim_start_match" "trim_start_matches" "capitalize" "kebabcase" "lowercamelcase" "lowercase"
-    "shoutykebabcase" "shoutysnakecase" "snakecase" "titlecase" "uppercamelcase" "uppercase"
-    "absolute_path" "extension" "file_name" "file_stem" "parent_directory" "without_extension"
-    "clean" "join" "path_exists" "error" "sha256" "sha256_file" "uuid" "semver_matches"))
+  (identifier) @function.call)

From c59004f1e03e111099978932e86bb2f479b5ea73 Mon Sep 17 00:00:00 2001
From: Christian Buttner <christian@cbuttner.de>
Date: Wed, 28 May 2025 23:04:10 +0200
Subject: [PATCH 2376/2704] feat: add c3 (#7891)

---
 SUPPORTED_LANGUAGES.md            |   1 +
 lua/nvim-treesitter/parsers.lua   |   8 +
 runtime/queries/c3/folds.scm      |  35 +++
 runtime/queries/c3/highlights.scm | 408 ++++++++++++++++++++++++++++++
 runtime/queries/c3/indents.scm    |  73 ++++++
 runtime/queries/c3/injections.scm |   5 +
 6 files changed, 530 insertions(+)
 create mode 100644 runtime/queries/c3/folds.scm
 create mode 100644 runtime/queries/c3/highlights.scm
 create mode 100644 runtime/queries/c3/indents.scm
 create mode 100644 runtime/queries/c3/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index bb13fc2f7..0e6417529 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -32,6 +32,7 @@ Language | Tier | Queries | Node | Maintainer
 [bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` |   | @ambroisie
 [brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` |   | @ajdelcimmuto
 [c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` |   | @amaanq
+[c3](https://github.com/c3lang/tree-sitter-c3) | unstable | `HFIJ ` |   | @cbuttner
 [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` |   | @amaanq
 [caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` |   | @opa-oz
 [cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` |   | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index bcd5598cf..5b30d8003 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -164,6 +164,14 @@ return {
     maintainers = { '@amaanq' },
     tier = 2,
   },
+  c3 = {
+    install_info = {
+      revision = 'dce56ccc5d2731ac14a0f6bb3fd1666d994b2a25',
+      url = 'https://github.com/c3lang/tree-sitter-c3',
+    },
+    maintainers = { '@cbuttner' },
+    tier = 2,
+  },
   c_sharp = {
     install_info = {
       revision = 'b5eb5742f6a7e9438bee22ce8026d6b927be2cd7',
diff --git a/runtime/queries/c3/folds.scm b/runtime/queries/c3/folds.scm
new file mode 100644
index 000000000..0776e7678
--- /dev/null
+++ b/runtime/queries/c3/folds.scm
@@ -0,0 +1,35 @@
+[
+  ; Top-level declarations
+  (bitstruct_declaration)
+  (enum_declaration)
+  (faultdef_declaration)
+  (func_definition)
+  (import_declaration)+
+  (interface_declaration)
+  (macro_declaration)
+  (struct_declaration)
+  ; Statements
+  (asm_block_stmt)
+  (case_stmt)
+  (defer_stmt)
+  (do_stmt)
+  (for_stmt)
+  (foreach_stmt)
+  (if_stmt)
+  (switch_stmt)
+  (while_stmt)
+  (ct_for_stmt)
+  (ct_foreach_stmt)
+  (ct_switch_stmt)
+  (ct_case_stmt)
+  (ct_if_stmt)
+  (ct_else_stmt)
+  ; Comments
+  (block_comment)
+  (doc_comment)
+  ; Initializer list
+  (initializer_list)
+] @fold
+
+(compound_stmt
+  (compound_stmt) @fold)
diff --git a/runtime/queries/c3/highlights.scm b/runtime/queries/c3/highlights.scm
new file mode 100644
index 000000000..1f02496b8
--- /dev/null
+++ b/runtime/queries/c3/highlights.scm
@@ -0,0 +1,408 @@
+; Punctuation
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "[<"
+  ">]"
+] @punctuation.bracket
+
+[
+  ";"
+  ","
+  ":"
+  "::"
+] @punctuation.delimiter
+
+; Constant
+(const_ident) @constant
+
+[
+  "true"
+  "false"
+] @boolean
+
+"null" @constant.builtin
+
+; Variable
+[
+  (ident)
+  (ct_ident)
+  (hash_ident)
+] @variable
+
+; 1) Member
+(field_expr
+  field: (access_ident
+    (ident) @variable.member))
+
+(struct_member_declaration
+  (ident) @variable.member)
+
+(struct_member_declaration
+  (identifier_list
+    (ident) @variable.member))
+
+(bitstruct_member_declaration
+  (ident) @variable.member)
+
+(initializer_list
+  (initializer_element
+    (param_path
+      (param_path_element
+        (access_ident
+          (ident) @variable.member)))))
+
+; 2) Parameter
+(param
+  name: (_) @variable.parameter)
+
+(trailing_block_param
+  (at_ident) @variable.parameter)
+
+(call_arg_list
+  (call_arg
+    name: (_) @variable.parameter))
+
+(enum_param
+  (ident) @variable.parameter)
+
+; Keyword (from `c3c --list-keywords`)
+[
+  "alias"
+  "asm"
+  "attrdef"
+  "catch"
+  "defer"
+  "try"
+  "var"
+] @keyword
+
+[
+  "$alignof"
+  "$assert"
+  "$assignable"
+  "$case"
+  "$default"
+  "$defined"
+  "$echo"
+  "$else"
+  "$embed"
+  "$endfor"
+  "$endforeach"
+  "$endif"
+  "$endswitch"
+  "$eval"
+  "$evaltype"
+  "$error"
+  "$exec"
+  "$extnameof"
+  "$feature"
+  "$for"
+  "$foreach"
+  "$if"
+  "$include"
+  "$is_const"
+  "$nameof"
+  "$offsetof"
+  "$qnameof"
+  "$sizeof"
+  "$stringify"
+  "$switch"
+  "$typefrom"
+  "$typeof"
+  "$vacount"
+  "$vatype"
+  "$vaconst"
+  "$vaarg"
+  "$vaexpr"
+  "$vasplat"
+] @keyword.directive
+
+"assert" @keyword.debug
+
+"fn" @keyword.function
+
+"macro" @keyword.function
+
+"return" @keyword.return
+
+[
+  "import"
+  "module"
+] @keyword.import
+
+[
+  "bitstruct"
+  "enum"
+  "faultdef"
+  "interface"
+  "struct"
+  "typedef"
+  "union"
+] @keyword.type
+
+[
+  "case"
+  "default"
+  "else"
+  "if"
+  "nextcase"
+  "switch"
+] @keyword.conditional
+
+[
+  "break"
+  "continue"
+  "do"
+  "for"
+  "foreach"
+  "foreach_r"
+  "while"
+] @keyword.repeat
+
+[
+  "const"
+  "extern"
+  "inline"
+  "static"
+  "tlocal"
+] @keyword.modifier
+
+; Operator (from `c3c --list-operators`)
+[
+  "&"
+  "!"
+  "~"
+  "|"
+  "^"
+  "="
+  ">"
+  "/"
+  "."
+  "<"
+  "-"
+  "%"
+  "+"
+  "?"
+  "*"
+  "&&"
+  "!!"
+  "&="
+  "|="
+  "^="
+  "/="
+  ".."
+  "?:"
+  "=="
+  ">="
+  "=>"
+  "<="
+  "-="
+  "--"
+  "%="
+  "*="
+  "!="
+  "||"
+  "+="
+  "++"
+  "??"
+  "<<"
+  ">>"
+  "..."
+  "<<="
+  ">>="
+  "&&&"
+  "+++"
+  "|||"
+] @operator
+
+(range_expr
+  ":" @operator)
+
+(foreach_cond
+  ":" @operator)
+
+(ct_foreach_cond
+  ":" @operator)
+
+(ternary_expr
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+(elvis_orelse_expr
+  [
+    "?:"
+    "??"
+  ] @keyword.conditional.ternary)
+
+; Literal
+(integer_literal) @number
+
+(real_literal) @number.float
+
+(char_literal) @character
+
+(bytes_literal) @number
+
+; String
+(string_literal) @string
+
+(raw_string_literal) @string
+
+; Escape Sequence
+(escape_sequence) @string.escape
+
+; Builtin (constants)
+(builtin_const) @constant.builtin
+
+; Type Property (from `c3c --list-type-properties`)
+(type_access_expr
+  (access_ident
+    (ident) @variable.builtin
+    (#any-of? @variable.builtin
+      "alignof" "associated" "elements" "extnameof" "from_ordinal" "get" "inf" "is_eq" "is_ordered"
+      "is_substruct" "len" "lookup" "lookup_field" "max" "membersof" "methodsof" "min" "nan" "inner"
+      "kindof" "names" "nameof" "params" "paramsof" "parentof" "qnameof" "returns" "sizeof" "tagof"
+      "has_tagof" "values" "typeid")))
+
+; Label
+[
+  (label)
+  (label_target)
+] @label
+
+; Module
+(module_resolution
+  (ident) @module)
+
+(module_declaration
+  (path_ident
+    (ident) @module))
+
+(import_declaration
+  (path_ident
+    (ident) @module))
+
+; Attribute
+(attribute
+  name: (at_ident) @attribute)
+
+(at_type_ident) @attribute
+
+(call_inline_attributes
+  (at_ident) @attribute)
+
+(asm_block_stmt
+  (at_ident) @attribute)
+
+; Type
+[
+  (type_ident)
+  (ct_type_ident)
+] @type
+
+(base_type_name) @type.builtin
+
+; Function Definition
+(func_header
+  name: (_) @function)
+
+(func_header
+  method_type: (_)
+  name: (_) @function.method)
+
+(macro_header
+  name: (_) @function)
+
+(macro_header
+  method_type: (_)
+  name: (_) @function.method)
+
+; Function Call
+(call_expr
+  function: (ident_expr
+    [
+      (ident)
+      (at_ident)
+    ] @function.call))
+
+(call_expr
+  function: (trailing_generic_expr
+    argument: (ident_expr
+      [
+        (ident)
+        (at_ident)
+      ] @function.call)))
+
+; Method call
+(call_expr
+  function: (field_expr
+    field: (access_ident
+      [
+        (ident)
+        (at_ident)
+      ] @function.method.call)))
+
+; Method on type
+(call_expr
+  function: (type_access_expr
+    field: (access_ident
+      [
+        (ident)
+        (at_ident)
+      ] @function.method.call)))
+
+; Builtin call
+(call_expr
+  function: (builtin) @function.builtin)
+
+; Asm
+(asm_instr
+  [
+    (ident)
+    "int"
+  ] @function.builtin)
+
+(asm_expr
+  [
+    (ct_ident)
+    (ct_const_ident)
+  ] @variable.builtin)
+
+; Comment
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+(doc_comment) @comment.documentation
+
+(doc_comment_text) @spell
+
+(doc_comment_contract
+  name: (_) @attribute)
+
+(doc_comment_contract
+  parameter: [
+    (ident)
+    (ct_ident)
+    (hash_ident)
+  ] @variable.parameter
+  (#set! priority 110))
+
+(doc_comment_contract
+  [
+    ":"
+    "?"
+  ] @comment.documentation
+  (#set! priority 110))
+
+(doc_comment_contract
+  description: (_) @comment.documentation
+  (#set! priority 110))
diff --git a/runtime/queries/c3/indents.scm b/runtime/queries/c3/indents.scm
new file mode 100644
index 000000000..61758ce32
--- /dev/null
+++ b/runtime/queries/c3/indents.scm
@@ -0,0 +1,73 @@
+[
+  (compound_stmt)
+  (initializer_list)
+  (implies_body)
+  (struct_body)
+  (bitstruct_body)
+  (enum_body)
+  (interface_body)
+  (switch_body)
+  (ct_if_stmt)
+  (ct_for_stmt)
+  (ct_foreach_stmt)
+  (ct_switch_stmt)
+] @indent.begin
+
+([
+  (case_stmt)
+  (default_stmt)
+  (ct_case_stmt)
+] @indent.begin
+  (#set! indent.immediate 1))
+
+(expr_stmt
+  ";" @indent.end) @indent.begin
+
+(declaration
+  ";" @indent.end) @indent.begin
+
+(const_declaration
+  ";" @indent.end) @indent.begin
+
+(return_stmt
+  ";" @indent.end) @indent.begin
+
+(faultdef_declaration
+  ";" @indent.end) @indent.begin
+
+(macro_func_body
+  ";" @indent.end)
+
+[
+  ")"
+  "}"
+  "$endfor"
+  "$endforeach"
+  "$endswitch"
+  "$endif"
+] @indent.branch @indent.end
+
+"$else" @indent.branch
+
+([
+  (func_param_list)
+  (macro_param_list)
+  (enum_param_list)
+  (attribute_param_list)
+  (call_arg_list)
+  (paren_cond)
+  (for_cond)
+  (foreach_cond)
+  (paren_expr)
+] @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
+[
+  (block_comment)
+  (doc_comment)
+  (raw_string_literal)
+  (bytes_literal)
+] @indent.auto
+
+(string_literal) @indent.ignore
diff --git a/runtime/queries/c3/injections.scm b/runtime/queries/c3/injections.scm
new file mode 100644
index 000000000..3cd6aac8e
--- /dev/null
+++ b/runtime/queries/c3/injections.scm
@@ -0,0 +1,5 @@
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))

From f9ab837ca15b08628a43027623011ab96cba5bb7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 28 May 2025 09:25:08 +0200
Subject: [PATCH 2377/2704] fix(install): don't skip un-tiered parsers

---
 lua/nvim-treesitter/config.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index d78ee50c4..d073e3516 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -144,7 +144,7 @@ function M.norm_languages(languages, skip)
     languages = vim.tbl_filter(
       --- @param v string
       function(v)
-        return parsers[v].tier < 4
+        return not (parsers[v].tier and parsers[v].tier == 4)
       end,
       languages
     )

From 03c90480907fd4ec7ce3f76bbf3264100223b5df Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 28 May 2025 09:23:55 +0200
Subject: [PATCH 2378/2704] fix(install): only install queries for bundled
 parsers

---
 lua/nvim-treesitter/install.lua | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index e6933fe58..b669127ad 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -369,14 +369,20 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
     end
   end
 
-  local queries = fs.joinpath(config.get_install_dir('queries'), lang)
-  local queries_src = M.get_package_path('runtime', 'queries', lang)
-  uv_unlink(queries)
-  local err = uv_symlink(queries_src, queries, { dir = true, junction = true })
-  a.schedule()
-  if err then
-    return logger:error(err)
+  do -- install queries
+    local queries_src = M.get_package_path('runtime', 'queries', lang)
+    if uv.fs_stat(queries_src) then
+      local queries = fs.joinpath(config.get_install_dir('queries'), lang)
+
+      uv_unlink(queries)
+      local err = uv_symlink(queries_src, queries, { dir = true, junction = true })
+      a.schedule()
+      if err then
+        return logger:error(err)
+      end
+    end
   end
+
   logger:info('Language installed')
 end
 
@@ -440,8 +446,8 @@ local function install(languages, options)
   options = options or {}
 
   local cache_dir = fs.normalize(fn.stdpath('cache'))
-  if not vim.uv.fs_stat(cache_dir) then
-    vim.fn.mkdir(cache_dir, 'p')
+  if not uv.fs_stat(cache_dir) then
+    fn.mkdir(cache_dir, 'p')
   end
 
   local install_dir = config.get_install_dir('parser')
@@ -526,6 +532,7 @@ end
 
 ---@param languages string[]|string
 M.uninstall = a.async(function(languages)
+  reload_parsers()
   languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
 
   local parser_dir = config.get_install_dir('parser')
@@ -537,7 +544,7 @@ M.uninstall = a.async(function(languages)
   for _, lang in ipairs(languages) do
     local logger = log.new('uninstall/' .. lang)
     if not vim.list_contains(installed, lang) then
-      log.warn('Parser for ' .. lang .. ' is is not managed by nvim-treesitter')
+      log.warn('Parser for ' .. lang .. ' is not managed by nvim-treesitter')
     else
       local parser = fs.joinpath(parser_dir, lang) .. '.so'
       local queries = fs.joinpath(query_dir, lang)

From 0860b9b1070c4e1bcce66416844b633acd8e0d2a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 28 May 2025 13:55:33 +0200
Subject: [PATCH 2379/2704] fix(config): check both installed parsers and
 queries

Problem: Can't uninstall custom parsers without queries since
`installed_parsers` only iterates over installed queries (to include
query-only languages, and to avoid string manipulation).

Solution: Iterate over both queries and parsers to collect list of
installed languages (optionally only queries or only parsers).
---
 lua/nvim-treesitter/config.lua  | 28 +++++++++++++++++-----------
 lua/nvim-treesitter/health.lua  |  2 +-
 lua/nvim-treesitter/install.lua |  6 +++---
 plugin/nvim-treesitter.lua      |  2 +-
 scripts/check-parsers.lua       |  2 +-
 scripts/check-queries.lua       |  2 +-
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index d073e3516..e46e2d5d1 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -39,22 +39,28 @@ function M.get_install_dir(dir_name)
   return dir
 end
 
+---@param type 'queries'|'parsers'?
 ---@return string[]
-function M.installed_parsers()
-  local install_dir = M.get_install_dir('queries')
-
-  local installed = {} --- @type string[]
-  for f in vim.fs.dir(install_dir) do
-    installed[#installed + 1] = f
+function M.installed_languages(type)
+  local installed = {} --- @type table<string, boolean>
+  if not (type and type == 'parsers') then
+    for f in vim.fs.dir(M.get_install_dir('queries')) do
+      installed[f] = true
+    end
   end
-
-  return installed
+  if not (type and type == 'queries') then
+    for f in vim.fs.dir(M.get_install_dir('parser')) do
+      installed[vim.fn.fnamemodify(f, ':r')] = true
+    end
+  end
+  return vim.tbl_keys(installed)
 end
 
 -- Get a list of all available parsers
 ---@param tier integer? only get parsers of specified tier
 ---@return string[]
 function M.get_available(tier)
+  vim.api.nvim_exec_autocmds('User', { pattern = 'TSUpdate' })
   local parsers = require('nvim-treesitter.parsers')
   --- @type string[]
   local languages = vim.tbl_keys(parsers)
@@ -101,7 +107,7 @@ function M.norm_languages(languages, skip)
 
   if vim.list_contains(languages, 'all') then
     if skip and skip.missing then
-      return M.installed_parsers()
+      return M.installed_languages()
     end
     languages = M.get_available()
   end
@@ -109,7 +115,7 @@ function M.norm_languages(languages, skip)
   languages = expand_tiers(languages)
 
   if skip and skip.installed then
-    local installed = M.installed_parsers()
+    local installed = M.installed_languages()
     languages = vim.tbl_filter(
       --- @param v string
       function(v)
@@ -120,7 +126,7 @@ function M.norm_languages(languages, skip)
   end
 
   if skip and skip.missing then
-    local installed = M.installed_parsers()
+    local installed = M.installed_languages()
     languages = vim.tbl_filter(
       --- @param v string
       function(v)
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 57131f778..4095bce00 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -136,7 +136,7 @@ function M.check()
 
   -- Parser installation checks
   health.start('Installed languages' .. string.rep(' ', 5) .. 'H L F I J')
-  local languages = config.installed_parsers()
+  local languages = config.installed_languages()
   for _, lang in pairs(languages) do
     local parser = parsers[lang]
     local out = lang .. string.rep(' ', 22 - #lang)
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index b669127ad..6391beba9 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -402,7 +402,7 @@ local install_status = {} ---@type table<string,InstallStatus?>
 ---@param generate? boolean
 ---@return InstallStatus status
 local function install_lang(lang, cache_dir, install_dir, force, generate)
-  if not force and vim.list_contains(config.installed_parsers(), lang) then
+  if not force and vim.list_contains(config.installed_languages(), lang) then
     install_status[lang] = 'installed'
     return 'installed'
   end
@@ -532,12 +532,12 @@ end
 
 ---@param languages string[]|string
 M.uninstall = a.async(function(languages)
-  reload_parsers()
+  vim.api.nvim_exec_autocmds('User', { pattern = 'TSUpdate' })
   languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
 
   local parser_dir = config.get_install_dir('parser')
   local query_dir = config.get_install_dir('queries')
-  local installed = config.installed_parsers()
+  local installed = config.installed_languages()
 
   local task_funs = {} ---@type async.TaskFun[]
   local done = 0
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index b007ca29b..d4ccf3049 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -21,7 +21,7 @@ local function complete_installed_parsers(arglead)
     function(v)
       return v:find(arglead) ~= nil
     end,
-    require('nvim-treesitter.config').installed_parsers()
+    require('nvim-treesitter.config').installed_languages()
   )
 end
 
diff --git a/scripts/check-parsers.lua b/scripts/check-parsers.lua
index 08e48740d..152c8f7ea 100755
--- a/scripts/check-parsers.lua
+++ b/scripts/check-parsers.lua
@@ -3,7 +3,7 @@ vim.opt.runtimepath:append('.')
 
 local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
-  or require('nvim-treesitter.config').installed_parsers()
+  or require('nvim-treesitter.config').installed_languages('parsers')
 
 local data = {} ---@type table[]
 local errors = {} ---@type string[]
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 0a684f5eb..27869b6b5 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -4,7 +4,7 @@ vim.opt.runtimepath:append('.')
 local query_types = require('nvim-treesitter.health').bundled_queries
 local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
-  or require('nvim-treesitter.config').installed_parsers()
+  or require('nvim-treesitter.config').installed_languages('queries')
 
 -- Check queries for each installed parser in parsers
 local errors = {} ---@type string[]

From ce903fde5d36d7955d34faaf0b812a186417e746 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 29 May 2025 12:04:37 +0200
Subject: [PATCH 2380/2704] feat(api): expose list of available and installed
 languages

---
 doc/nvim-treesitter.txt         | 21 ++++++++++++++++++---
 lua/nvim-treesitter/config.lua  |  8 ++++----
 lua/nvim-treesitter/health.lua  |  2 +-
 lua/nvim-treesitter/init.lua    |  8 ++++++++
 lua/nvim-treesitter/install.lua |  4 ++--
 plugin/nvim-treesitter.lua      |  2 +-
 scripts/check-parsers.lua       |  2 +-
 scripts/check-queries.lua       |  2 +-
 8 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 77e6f037f..9ba6909b7 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -102,7 +102,7 @@ setup({opts})                                          *nvim-treesitter.setup()*
                 directory to install parsers and queries to. Note: will be
                 prepended to |runtimepath|.
 
-install({languages} [, {opts}])                    *nvim-treesitter.install()*
+install({languages} [, {opts}])                      *nvim-treesitter.install()*
 
     Download, compile, and install the specified treesitter parsers and copy
     the corresponding queries to a directory on |runtimepath|, enabling their
@@ -126,7 +126,7 @@ install({languages} [, {opts}])                    *nvim-treesitter.install()*
                    • {max_jobs} (`integer?`) limit parallel tasks (useful in
                      combination with {generate} on memory-limited systems).
 
-uninstall({languages})                              *nvim-treesitter.uninstall()*
+uninstall({languages})                             *nvim-treesitter.uninstall()*
 
     Remove the parser and queries for the specified language(s).
 
@@ -134,7 +134,7 @@ uninstall({languages})                              *nvim-treesitter.uninstall()
     • {languages}  `(string[]|string)` (List of) languages or tiers (`stable`,
                    `unstable`) to update.
 
-update([{languages}])                                  *nvim-treesitter.update()*
+update([{languages}])                                 *nvim-treesitter.update()*
 
     Update the parsers and queries if older than the revision specified in the
     manifest.
@@ -153,5 +153,20 @@ indentexpr()                                      *nvim-treesitter.indentexpr()*
     Used to enable treesitter indentation for a language via >lua
         vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
 <
+get_available([{tier}])                        *nvim-treesitter.get_available()*
+
+    Return list of languages available for installation.
+
+    Parameters: ~
+    • {tier}  `(integer?)` Only return languages of specified {tier} (`1`:
+              stable, `2`: unstable, `3`: unmaintained, `4`: unsupported)
+
+get_installed([{type}])                        *nvim-treesitter.get_installed()*
+
+    Return list of languages installed via `nvim-treesitter`.
+
+    Parameters: ~
+    • {type}  `('queries'|parsers'?)` If specified, only show languages with
+              installed queries or parsers, respectively.
 
 vim:tw=78:ts=8:expandtab:noet:ft=help:norl:
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index e46e2d5d1..1a5b56cdb 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -41,7 +41,7 @@ end
 
 ---@param type 'queries'|'parsers'?
 ---@return string[]
-function M.installed_languages(type)
+function M.get_installed(type)
   local installed = {} --- @type table<string, boolean>
   if not (type and type == 'parsers') then
     for f in vim.fs.dir(M.get_install_dir('queries')) do
@@ -107,7 +107,7 @@ function M.norm_languages(languages, skip)
 
   if vim.list_contains(languages, 'all') then
     if skip and skip.missing then
-      return M.installed_languages()
+      return M.get_installed()
     end
     languages = M.get_available()
   end
@@ -115,7 +115,7 @@ function M.norm_languages(languages, skip)
   languages = expand_tiers(languages)
 
   if skip and skip.installed then
-    local installed = M.installed_languages()
+    local installed = M.get_installed()
     languages = vim.tbl_filter(
       --- @param v string
       function(v)
@@ -126,7 +126,7 @@ function M.norm_languages(languages, skip)
   end
 
   if skip and skip.missing then
-    local installed = M.installed_languages()
+    local installed = M.get_installed()
     languages = vim.tbl_filter(
       --- @param v string
       function(v)
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 4095bce00..3f5058996 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -136,7 +136,7 @@ function M.check()
 
   -- Parser installation checks
   health.start('Installed languages' .. string.rep(' ', 5) .. 'H L F I J')
-  local languages = config.installed_languages()
+  local languages = config.get_installed()
   for _, lang in pairs(languages) do
     local parser = parsers[lang]
     local out = lang .. string.rep(' ', 22 - #lang)
diff --git a/lua/nvim-treesitter/init.lua b/lua/nvim-treesitter/init.lua
index 561c1697a..c5a9201f3 100644
--- a/lua/nvim-treesitter/init.lua
+++ b/lua/nvim-treesitter/init.lua
@@ -4,6 +4,14 @@ function M.setup(...)
   require('nvim-treesitter.config').setup(...)
 end
 
+function M.get_available(...)
+  return require('nvim-treesitter.config').get_available(...)
+end
+
+function M.get_installed(...)
+  return require('nvim-treesitter.config').get_installed(...)
+end
+
 function M.install(...)
   return require('nvim-treesitter.install').install(...)
 end
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 6391beba9..eb55d0191 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -402,7 +402,7 @@ local install_status = {} ---@type table<string,InstallStatus?>
 ---@param generate? boolean
 ---@return InstallStatus status
 local function install_lang(lang, cache_dir, install_dir, force, generate)
-  if not force and vim.list_contains(config.installed_languages(), lang) then
+  if not force and vim.list_contains(config.get_installed(), lang) then
     install_status[lang] = 'installed'
     return 'installed'
   end
@@ -537,7 +537,7 @@ M.uninstall = a.async(function(languages)
 
   local parser_dir = config.get_install_dir('parser')
   local query_dir = config.get_install_dir('queries')
-  local installed = config.installed_languages()
+  local installed = config.get_installed()
 
   local task_funs = {} ---@type async.TaskFun[]
   local done = 0
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index d4ccf3049..8bf2dbfde 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -21,7 +21,7 @@ local function complete_installed_parsers(arglead)
     function(v)
       return v:find(arglead) ~= nil
     end,
-    require('nvim-treesitter.config').installed_languages()
+    require('nvim-treesitter.config').get_installed()
   )
 end
 
diff --git a/scripts/check-parsers.lua b/scripts/check-parsers.lua
index 152c8f7ea..c2eefd7c9 100755
--- a/scripts/check-parsers.lua
+++ b/scripts/check-parsers.lua
@@ -3,7 +3,7 @@ vim.opt.runtimepath:append('.')
 
 local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
-  or require('nvim-treesitter.config').installed_languages('parsers')
+  or require('nvim-treesitter.config').get_installed('parsers')
 
 local data = {} ---@type table[]
 local errors = {} ---@type string[]
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 27869b6b5..796e3f5fc 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -4,7 +4,7 @@ vim.opt.runtimepath:append('.')
 local query_types = require('nvim-treesitter.health').bundled_queries
 local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
-  or require('nvim-treesitter.config').installed_languages('queries')
+  or require('nvim-treesitter.config').get_installed('queries')
 
 -- Check queries for each installed parser in parsers
 local errors = {} ---@type string[]

From ff770d718b34db10e33d18594153b4d1e0954882 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 29 May 2025 12:25:13 +0200
Subject: [PATCH 2381/2704] fix(install): don't print operation summary by
 default

Problem: People complain about noisy `install()`.

Solution: Gate operation summary behind `summary` install option
(default false, set to true for interactive `:TS*` commands).
---
 doc/nvim-treesitter.txt         | 20 ++++++++++++++++++--
 lua/nvim-treesitter/install.lua | 25 +++++++++++++++++++------
 plugin/nvim-treesitter.lua      |  7 ++++---
 scripts/install-parsers.lua     |  4 ++--
 4 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 9ba6909b7..f77cb061b 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -125,16 +125,21 @@ install({languages} [, {opts}])                      *nvim-treesitter.install()*
                      compiling.
                    • {max_jobs} (`integer?`) limit parallel tasks (useful in
                      combination with {generate} on memory-limited systems).
+                   • {summary} (`boolean?`, default `false`) print summary of
+                     successful and total operations for multiple languages.
 
-uninstall({languages})                             *nvim-treesitter.uninstall()*
+uninstall({languages} [, {opts}])                  *nvim-treesitter.uninstall()*
 
     Remove the parser and queries for the specified language(s).
 
     Parameters: ~
     • {languages}  `(string[]|string)` (List of) languages or tiers (`stable`,
                    `unstable`) to update.
+    • {opts}       `(table?)` Optional parameters:
+                   • {summary} (`boolean?`, default `false`) print summary of
+                     successful and total operations for multiple languages.
 
-update([{languages}])                                 *nvim-treesitter.update()*
+update([{languages}, {opts}])                         *nvim-treesitter.update()*
 
     Update the parsers and queries if older than the revision specified in the
     manifest.
@@ -147,6 +152,11 @@ update([{languages}])                                 *nvim-treesitter.update()*
     Parameters: ~
     • {languages}  `(string[]|string)?` (List of) languages or tiers to update
                    (default: all installed).
+    • {opts}       `(table?)` Optional parameters:
+                   • {max_jobs} (`integer?`) limit parallel tasks (useful in
+                     combination with {generate} on memory-limited systems).
+                   • {summary} (`boolean?`, default `false`) print summary of
+                     successful and total operations for multiple languages.
 
 indentexpr()                                      *nvim-treesitter.indentexpr()*
 
@@ -165,6 +175,12 @@ get_installed([{type}])                        *nvim-treesitter.get_installed()*
 
     Return list of languages installed via `nvim-treesitter`.
 
+    Note: This only searches `nvim-treesitter`'s (configured or default)
+    installation directory; parsers and queries from other sources can be
+    placed anywhere on 'runtimepath' and are not included. To list all, e.g.,
+    parsers that are installed from any source, use >lua
+        vim.api.nvim_get_runtime_file('parser/*', true)
+<
     Parameters: ~
     • {type}  `('queries'|parsers'?)` If specified, only show languages with
               installed queries or parsers, respectively.
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index eb55d0191..a5a2eb2a5 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -437,6 +437,7 @@ end
 ---@field force? boolean
 ---@field generate? boolean
 ---@field max_jobs? integer
+---@field summary? boolean
 
 --- Install a parser
 ---@async
@@ -467,7 +468,9 @@ local function install(languages, options)
   join(options and options.max_jobs or MAX_JOBS, task_funs)
   if #task_funs > 1 then
     a.schedule()
-    log.info('Installed %d/%d languages', done, #task_funs)
+    if options and options.summary then
+      log.info('Installed %d/%d languages', done, #task_funs)
+    end
   end
   return done == #task_funs
 end
@@ -481,7 +484,8 @@ M.install = a.async(function(languages, options)
 end)
 
 ---@param languages? string[]|string
-M.update = a.async(function(languages)
+---@param options? InstallOptions
+M.update = a.async(function(languages, options)
   reload_parsers()
   if not languages or #languages == 0 then
     languages = 'all'
@@ -489,10 +493,16 @@ M.update = a.async(function(languages)
   languages = config.norm_languages(languages, { missing = true, unsupported = true })
   languages = vim.tbl_filter(needs_update, languages) ---@type string[]
 
+  local summary = options and options.summary
   if #languages > 0 then
-    return install(languages, { force = true })
+    return install(
+      languages,
+      { force = true, summary = summary, max_jobs = options and options.max_jobs }
+    )
   else
-    log.info('All parsers are up-to-date')
+    if summary then
+      log.info('All parsers are up-to-date')
+    end
     return true
   end
 end)
@@ -531,7 +541,8 @@ local function uninstall_lang(logger, lang, parser, queries)
 end
 
 ---@param languages string[]|string
-M.uninstall = a.async(function(languages)
+---@param options? InstallOptions
+M.uninstall = a.async(function(languages, options)
   vim.api.nvim_exec_autocmds('User', { pattern = 'TSUpdate' })
   languages = config.norm_languages(languages or 'all', { missing = true, dependencies = true })
 
@@ -560,7 +571,9 @@ M.uninstall = a.async(function(languages)
   join(MAX_JOBS, task_funs)
   if #task_funs > 1 then
     a.schedule()
-    log.info('Uninstalled %d/%d languages', done, #task_funs)
+    if options and options.summary then
+      log.info('Uninstalled %d/%d languages', done, #task_funs)
+    end
   end
 end)
 
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index 8bf2dbfde..adeb41425 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -27,7 +27,7 @@ end
 
 -- create user commands
 api.nvim_create_user_command('TSInstall', function(args)
-  require('nvim-treesitter.install').install(args.fargs, { force = args.bang })
+  require('nvim-treesitter.install').install(args.fargs, { force = args.bang, summary = true })
 end, {
   nargs = '+',
   bang = true,
@@ -39,6 +39,7 @@ end, {
 api.nvim_create_user_command('TSInstallFromGrammar', function(args)
   require('nvim-treesitter.install').install(args.fargs, {
     generate = true,
+    summary = true,
     force = args.bang,
   })
 end, {
@@ -50,7 +51,7 @@ end, {
 })
 
 api.nvim_create_user_command('TSUpdate', function(args)
-  require('nvim-treesitter.install').update(args.fargs)
+  require('nvim-treesitter.install').update(args.fargs, { summary = true })
 end, {
   nargs = '*',
   bar = true,
@@ -59,7 +60,7 @@ end, {
 })
 
 api.nvim_create_user_command('TSUninstall', function(args)
-  require('nvim-treesitter.install').uninstall(args.fargs)
+  require('nvim-treesitter.install').uninstall(args.fargs, { summary = true })
 end, {
   nargs = '+',
   bar = true,
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index e3804cab8..2d083f3c3 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -19,10 +19,10 @@ end
 vim.opt.runtimepath:append('.')
 
 ---@type async.Task
-local task = update and require('nvim-treesitter').update('all')
+local task = update and require('nvim-treesitter').update('all', { summary = true })
   or require('nvim-treesitter').install(
     #parsers > 0 and parsers or 'all',
-    { force = true, generate = generate, max_jobs = max_jobs }
+    { force = true, summary = true, generate = generate, max_jobs = max_jobs }
   )
 
 local ok, err_or_ok = task:pwait(1800000) -- wait max. 30 minutes

From fa0bb30ebdd032f485f44b5caaae1db2b773c0c8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 30 May 2025 10:21:19 +0200
Subject: [PATCH 2382/2704] feat(parsers): update gdscript, gitattributes,
 godot_resource, xresources, yaml, ocaml, koto, ocaml_interface, c, ini, mlir,
 scheme, slint, c3, r, clojure, desktop, editorconfig, fortran

---
 lua/nvim-treesitter/parsers.lua | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5b30d8003..b1c39501f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -158,7 +158,7 @@ return {
   },
   c = {
     install_info = {
-      revision = '091093731389448e10822dd140621cfec1ff96b2',
+      revision = '7fa1be1b694b6e763686793d97da01f36a0e5c12',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = 'dce56ccc5d2731ac14a0f6bb3fd1666d994b2a25',
+      revision = '6eb8acc275961d137b4b4dd7fe84a19a0680c893',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -222,7 +222,7 @@ return {
   },
   clojure = {
     install_info = {
-      revision = 'f4236d4da8aa92bc105d9c118746474c608e6af7',
+      revision = '40c5fc2e2a0f511a802a82002553c5de00feeaf4',
       url = 'https://github.com/sogaiu/tree-sitter-clojure',
     },
     maintainers = { '@NoahTheDuke' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'afec3093f6102b83a72aece728c53d17d3fcb2d4',
+      revision = '752bab671c3a4ad0e566fa2c680af895f7fd1b77',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '65de8da4ff21a8be40adb5dadcd7a0f39d2f0747',
+      revision = '301edd3fff4486acca5ca9991ba76ba372059451',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = 'd738334e4a21866a1ab81fb3f27f9b0b2ad2e515',
+      revision = 'c687ba7b469cc22e22db6c90396ff2c98ba00d3b',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -652,7 +652,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = 'e964ce912b5b835f1caedb600df9d5be77e803a8',
+      revision = '2ed3ef9e30a7998a98eea4dfbcd308678f93b88f',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -685,7 +685,7 @@ return {
   },
   gitattributes = {
     install_info = {
-      revision = '5425944fd61bf2b3bad2c17c2dc9f53172b0f01d',
+      revision = 'f23072a51e1c764d6c5bf461194a775c8a5c7a95',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gitattributes',
     },
     maintainers = { '@ObserverOfTime' },
@@ -786,7 +786,7 @@ return {
   },
   godot_resource = {
     install_info = {
-      revision = 'a1a7295b376fbd2531601f4ffff191b031ffc795',
+      revision = '9bbb540e8a2734101c6857bd437f04baa974e03d',
       url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
     maintainers = { '@pierpo' },
@@ -1027,7 +1027,7 @@ return {
   },
   ini = {
     install_info = {
-      revision = '32b31863f222bf22eb43b07d4e9be8017e36fb31',
+      revision = '0e152b17fc0e929dd71f4bc4e317b3421ed39029',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
@@ -1216,7 +1216,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '1e610746f48c24607733fac158d5bae79accd845',
+      revision = '620ff8a32143f24f6f8e157bd1836183599d334d',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1400,7 +1400,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '4d2396f21722d0c8d2ea285f380b21f1a71668b3',
+      revision = '56753db408dbcc098e514c73cbb2351d344039e0',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1506,7 +1506,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = 'ef6ed4a773a260545f0b03c43d2ca78235e9a488',
+      revision = '029b1b6a87a8f1e8a9a7913a8a5bdecd36720789',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1515,7 +1515,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = 'ef6ed4a773a260545f0b03c43d2ca78235e9a488',
+      revision = '029b1b6a87a8f1e8a9a7913a8a5bdecd36720789',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1807,7 +1807,7 @@ return {
   },
   r = {
     install_info = {
-      revision = 'a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a',
+      revision = '7a7d4e04a325b336d53dbfef508918edba5ba240',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -1993,7 +1993,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = '1e4d38d650bf6b53930ec9d41a7000775c134039',
+      revision = 'e35b41a183164f4a12e10da3d0c430e837c3d75a',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2036,7 +2036,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '3493309534cd08ae176c7b917ec79068dca2c1c9',
+      revision = '32f970b57720010e77a486bc2001ee9e6c7c8250',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2593,7 +2593,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'dcbce0c5dde0fca01dd83a8f497ebe4d053eab1d',
+      revision = 'd09b560bb78a3304211db5110f9bd6b053becba4',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
@@ -2601,7 +2601,7 @@ return {
   },
   yaml = {
     install_info = {
-      revision = '08c5caaeb34e5ccd614706d3b5359a78f1c9e275',
+      revision = '3431ec21da1dde751bab55520963cf3a4f1121f3',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
     },
     maintainers = { '@amaanq' },

From 01dd4b05cf83bf3e4aaac7133a227de7226c1d1e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 30 May 2025 15:55:30 +0200
Subject: [PATCH 2383/2704] fix(check-queries): only show timings for existing
 queries

---
 scripts/check-queries.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 796e3f5fc..d951cf2d6 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -19,8 +19,10 @@ do
         local before = vim.uv.hrtime()
         local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
         local duration = vim.uv.hrtime() - before
-        table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
-        print(string.format('Checking %s %s (%.02fms)', lang, query_type, duration * 1e-6))
+        if query then
+          table.insert(timings, { duration = duration, lang = lang, query_type = query_type })
+          print(string.format('Checking %s %s (%.02fms)', lang, query_type, duration * 1e-6))
+        end
         if not ok then
           errors[#errors + 1] = string.format('%s (%s): %s', lang, query_type, query)
         end

From 9a51f860c123ee072c08ff3e093d480d32699390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20NICOLAS?= <ccjmne@gmail.com>
Date: Sat, 31 May 2025 02:26:17 +0200
Subject: [PATCH 2384/2704] fix(git_config): match lowercase Git config vars

Git config's sections, variable names, and (sometimes) subsections are
case-insensitive.  This commit proposes to match the full lowercase
variants in addition to the non-normalised, lowerCamelCase ones.

See `git help config`
---
 runtime/queries/git_config/highlights.scm | 4 ++--
 runtime/queries/git_config/injections.scm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/queries/git_config/highlights.scm b/runtime/queries/git_config/highlights.scm
index 6b37e9090..557ac60ec 100644
--- a/runtime/queries/git_config/highlights.scm
+++ b/runtime/queries/git_config/highlights.scm
@@ -7,7 +7,7 @@
 ((section_header
   (section_name) @keyword.import
   (subsection_name))
-  (#eq? @keyword.import "includeIf"))
+  (#any-of? @keyword.import "includeIf" "includeif"))
 
 (variable
   (name) @property)
@@ -47,7 +47,7 @@
 ((variable
   (name) @_name
   value: (string) @string.special.url)
-  (#eq? @_name "insteadOf"))
+  (#any-of? @_name "insteadOf" "insteadof"))
 
 ; Punctuation
 [
diff --git a/runtime/queries/git_config/injections.scm b/runtime/queries/git_config/injections.scm
index 7bda6979c..8b4d69282 100644
--- a/runtime/queries/git_config/injections.scm
+++ b/runtime/queries/git_config/injections.scm
@@ -4,7 +4,7 @@
 ((variable
   (name) @_name
   value: (string) @injection.content)
-  (#any-of? @_name "cmd" "command" "textconv" "sendmailCmd")
+  (#any-of? @_name "cmd" "command" "textconv" "sendmailCmd" "sendmailcmd")
   (#set! injection.language "bash"))
 
 (section
@@ -29,7 +29,7 @@
     (name) @_name
     value: (string) @injection.content)
   (#eq? @_interactive "interactive")
-  (#eq? @_name "diffFilter")
+  (#any-of? @_name "diffFilter" "difffilter")
   (#set! injection.language "bash"))
 
 ; https://github.com/git-lfs/git-lfs

From 3cad4eb434ba886a1a7035ae8955b7391a42aa05 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 31 May 2025 11:26:24 +0200
Subject: [PATCH 2385/2704] fix(lua): fix some emmyluals warnings

---
 lua/nvim-treesitter/config.lua  |  6 ++---
 lua/nvim-treesitter/health.lua  | 44 ++++++++++++++++-----------------
 lua/nvim-treesitter/indent.lua  |  2 +-
 lua/nvim-treesitter/install.lua |  7 +++---
 4 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 1a5b56cdb..9a586b7b5 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -96,7 +96,7 @@ end
 
 ---Normalize languages
 ---@param languages? string[]|string
----@param skip? { missing: boolean, unsupported: boolean, installed: boolean, dependencies: boolean }
+---@param skip? { missing: boolean?, unsupported: boolean?, installed: boolean?, dependencies: boolean? }
 ---@return string[]
 function M.norm_languages(languages, skip)
   if not languages then
@@ -150,7 +150,7 @@ function M.norm_languages(languages, skip)
     languages = vim.tbl_filter(
       --- @param v string
       function(v)
-        return not (parsers[v].tier and parsers[v].tier == 4)
+        return not (parsers[v] and parsers[v].tier and parsers[v].tier == 4)
       end,
       languages
     )
@@ -158,7 +158,7 @@ function M.norm_languages(languages, skip)
 
   if not (skip and skip.dependencies) then
     for _, lang in pairs(languages) do
-      if parsers[lang].requires then
+      if parsers[lang] and parsers[lang].requires then
         vim.list_extend(languages, parsers[lang].requires)
       end
     end
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 3f5058996..e284381dd 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -28,27 +28,25 @@ local function install_health()
       health.error('Nvim-treesitter requires Neovim 0.11.0 or later.')
     end
 
-    if vim.treesitter.language_version then
-      if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then
-        health.ok(
-          'Neovim was compiled with tree-sitter runtime ABI version '
-            .. vim.treesitter.language_version
-            .. ' (required >='
-            .. NVIM_TREESITTER_MINIMUM_ABI
-            .. ').'
-        )
-      else
-        health.error(
-          'Neovim was compiled with tree-sitter runtime ABI version '
-            .. vim.treesitter.language_version
-            .. '.\n'
-            .. 'nvim-treesitter expects at least ABI version '
-            .. NVIM_TREESITTER_MINIMUM_ABI
-            .. '\n'
-            .. 'Please make sure that Neovim is linked against a recent tree-sitter library when building'
-            .. ' or raise an issue at your Neovim packager. Parsers must be compatible with runtime ABI.'
-        )
-      end
+    if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then
+      health.ok(
+        'Neovim was compiled with tree-sitter runtime ABI version '
+          .. vim.treesitter.language_version
+          .. ' (required >='
+          .. NVIM_TREESITTER_MINIMUM_ABI
+          .. ').'
+      )
+    else
+      health.error(
+        'Neovim was compiled with tree-sitter runtime ABI version '
+          .. vim.treesitter.language_version
+          .. '.\n'
+          .. 'nvim-treesitter expects at least ABI version '
+          .. NVIM_TREESITTER_MINIMUM_ABI
+          .. '\n'
+          .. 'Please make sure that Neovim is linked against a recent tree-sitter library when building'
+          .. ' or raise an issue at your Neovim packager. Parsers must be compatible with runtime ABI.'
+      )
     end
   end
 
@@ -140,7 +138,7 @@ function M.check()
   for _, lang in pairs(languages) do
     local parser = parsers[lang]
     local out = lang .. string.rep(' ', 22 - #lang)
-    if parser.install_info then
+    if parser and parser.install_info then
       for _, query_group in pairs(M.bundled_queries) do
         local status, err = query_status(lang, query_group)
         out = out .. status .. ' '
@@ -149,7 +147,7 @@ function M.check()
         end
       end
     end
-    if parser.requires then
+    if parser and parser.requires then
       for _, p in pairs(parser.requires) do
         if not vim.list_contains(languages, p) then
           table.insert(error_collection, { lang, 'queries', 'dependency ' .. p .. ' missing' })
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index b0982c6c6..13f7b2740 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -106,7 +106,7 @@ end, function(bufnr, root, lang)
   return tostring(bufnr) .. root:id() .. '_' .. lang
 end)
 
----@param lnum number (1-indexed)
+---@param lnum integer (1-indexed)
 ---@return integer
 function M.get_indent(lnum)
   local bufnr = vim.api.nvim_get_current_buf()
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index a5a2eb2a5..c56069621 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -97,15 +97,14 @@ end
 
 ---@async
 ---@param path string
----@param mode? string
 ---@return string? err
-local function mkpath(path, mode)
+local function mkpath(path)
   local parent = fs.dirname(path)
   if not parent:match('^[./]$') and not uv.fs_stat(parent) then
-    mkpath(parent, mode)
+    mkpath(parent)
   end
 
-  return uv_mkdir(path, tonumber(mode or '755', 8))
+  return uv_mkdir(path, 493) -- tonumber('755', 8)
 end
 
 local M = {}

From 6d54a47f44e5e441cd546c89fb6462b1f50aaca9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 2 Jun 2025 13:23:26 +0200
Subject: [PATCH 2386/2704] feat(parsers): update desktop, javadoc, t32, templ,
 fortran, editorconfig, mlir, xresources, ocaml_interface, r, ocaml

---
 lua/nvim-treesitter/parsers.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b1c39501f..843fb16df 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '752bab671c3a4ad0e566fa2c680af895f7fd1b77',
+      revision = '6eb323a20db2f1e8736c3a05915afe1687283965',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '301edd3fff4486acca5ca9991ba76ba372059451',
+      revision = '4a00eb4b0e8fbf8f1594efa9b5b15386fbd7d563',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = 'c687ba7b469cc22e22db6c90396ff2c98ba00d3b',
+      revision = 'ab9aa007a8d982a5a7926663a8ab989cea0f5d9e',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -1076,7 +1076,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '001a8e4f8e839b640201c49046fbf5957fe1ee2c',
+      revision = 'c1bc2b76d8ff9fbc5aed7f823421bd5661f96828',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1400,7 +1400,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '56753db408dbcc098e514c73cbb2351d344039e0',
+      revision = '0f77bc710f61ec6be658ddf51851b2ed2cdaa20d',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1506,7 +1506,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '029b1b6a87a8f1e8a9a7913a8a5bdecd36720789',
+      revision = '3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1515,7 +1515,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '029b1b6a87a8f1e8a9a7913a8a5bdecd36720789',
+      revision = '3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1807,7 +1807,7 @@ return {
   },
   r = {
     install_info = {
-      revision = '7a7d4e04a325b336d53dbfef508918edba5ba240',
+      revision = '29c816328a086ef056799e3924ef6e09e6a9a8cb',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -2227,7 +2227,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '61607b32915fdeda275b2346e6a76a7c9b363251',
+      revision = '15f0032f3eadf95988293338e883c095fd5936f6',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2268,7 +2268,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = '5504cc96fbf5c9a029add2dfcb6e585e8fdaad75',
+      revision = 'de35706f89beed5087670a9c4421b7794ef02411',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2593,7 +2593,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'd09b560bb78a3304211db5110f9bd6b053becba4',
+      revision = '7e9f6fa9a6e9e4e5ced1683afc89a0d5b32a4ebc',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 27b0bd487c4a1c72c9b53d0ca6f67f0ac6956b0a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 2 Jun 2025 13:25:17 +0200
Subject: [PATCH 2387/2704] feat(nickel)!: update parser and queries

Breaking change: `(record_field)` -> `field_decl`
---
 lua/nvim-treesitter/parsers.lua       | 2 +-
 runtime/queries/nickel/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 843fb16df..dd7d3c75e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1432,7 +1432,7 @@ return {
   },
   nickel = {
     install_info = {
-      revision = 'f77c02df6dd0845594846beeeedf3715d4b68758',
+      revision = '9a05ab045c000cf37f02cff5c4de32b081444244',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 2,
diff --git a/runtime/queries/nickel/highlights.scm b/runtime/queries/nickel/highlights.scm
index 07673d797..c5ebfe166 100644
--- a/runtime/queries/nickel/highlights.scm
+++ b/runtime/queries/nickel/highlights.scm
@@ -61,7 +61,7 @@
 
 (interpolation_end) @punctuation.bracket
 
-(record_field) @variable.member
+(field_decl) @variable.member
 
 (builtin) @function.builtin
 

From fb9b2cfdc3e9b2488c315606e159022acb24f129 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 4 Jun 2025 10:32:50 +0200
Subject: [PATCH 2388/2704] feat(parsers): update bash, scala, slang, hyprlang,
 ini, query, javadoc, xml, php_only, angular, dtd, nu, php

---
 lua/nvim-treesitter/parsers.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index dd7d3c75e..d901ab810 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '843525141575e397541e119698f0532755e959f6',
+      revision = '820566bb4eb3d288822dbfee42417a5a9491aea6',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -77,7 +77,7 @@ return {
   },
   bash = {
     install_info = {
-      revision = '0c46d792d54c536be5ff7eb18eb95c70fccdb232',
+      revision = '8509e3229b863c255ab6b61f3bf74ad0bf14e8bc',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -419,7 +419,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '291b02018c525abe70fec41559cfe8f2f1cc84b2',
+      revision = '87be254e12169240a0e0214dbee5e208df96fa75',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1003,7 +1003,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      revision = 'd0441fd4b883ecc0e70140723a1cf5907992639a',
+      revision = 'd626ec06e4d876fc41200a30b3e6f2b4714c7367',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
@@ -1027,7 +1027,7 @@ return {
   },
   ini = {
     install_info = {
-      revision = '0e152b17fc0e929dd71f4bc4e317b3421ed39029',
+      revision = '31899dfa3b91622ea39e5c0bcddc88f45a9a3cfe',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
@@ -1076,7 +1076,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'c1bc2b76d8ff9fbc5aed7f823421bd5661f96828',
+      revision = 'ddf03959c0152bb61ed567f301ad6ecdab72f6ab',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1480,7 +1480,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'd5c71a10b4d1b02e38967b05f8de70e847448dd1',
+      revision = '100d06e29d13a8ebfc3f29173c07a5c4f2050586',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1575,7 +1575,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'eb289f127fc341ae7129902a2dd1c6c197a4c1e7',
+      revision = 'e771eb9fb5ccc65af35879487b66751568d10e48',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1586,7 +1586,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'eb289f127fc341ae7129902a2dd1c6c197a4c1e7',
+      revision = 'e771eb9fb5ccc65af35879487b66751568d10e48',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1798,7 +1798,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '8bf3112db43bdba3002bb1f88b7cda5f6278fc88',
+      revision = '55baffbdc6bd00bf177b796950497a01bb496241',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1975,7 +1975,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'c1189954df854977c3a52003ca8a247c5f4729ba',
+      revision = 'a2e91c845064bb4031e31b103e32bcdaefeea139',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2019,7 +2019,7 @@ return {
   },
   slang = {
     install_info = {
-      revision = '327b1b821c255867a4fb724c8eee48887e3d014b',
+      revision = 'a4454e3004a9e8fea2df7fd2535fbaa05500da21',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
     maintainers = { '@theHamsta' },
@@ -2584,7 +2584,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '291b02018c525abe70fec41559cfe8f2f1cc84b2',
+      revision = '87be254e12169240a0e0214dbee5e208df96fa75',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },

From 057e845518222c968251da7c7e7d4074c9620a1b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 29 May 2025 18:23:42 +0200
Subject: [PATCH 2389/2704] feat(install): support custom queries

---
 README.md                             |  10 +-
 lua/nvim-treesitter/_meta/parsers.lua |   3 +
 lua/nvim-treesitter/install.lua       | 133 +++++++++++++++++++-------
 lua/nvim-treesitter/util.lua          |   6 --
 4 files changed, 107 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index ef3a9f32c..921b11002 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ These queries can be used to look up definitions and references to identifiers i
 
 # Advanced setup
 
-## Adding parsers
+## Adding custom languages
 
 If you have a parser that is not on the list of supported languages (either as a repository on Github or in a local directory), you can add it manually for use by `nvim-treesitter` as follows:
 
@@ -144,6 +144,7 @@ callback = function()
       location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
       generate = true, -- only needed if repo does not contain pre-generated `src/parser.c`
       generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either
+      queries = 'queries/neovim', -- also install queries from given directory
     },
   }
 end})
@@ -158,6 +159,7 @@ Alternatively, if you have a local checkout, you can instead use
       location = 'parser',
       generate = true,
       generate_from_json = false,
+      queries = 'queries/neovim', -- symlink queries from given directory
     },
 ```
 This will always use the state of the directory as-is (i.e., `branch` and `revision` will be ignored).
@@ -189,9 +191,3 @@ end})
 ## Adding queries
 
 Queries can be placed anywhere in your `runtimepath` under `queries/<language>`, with earlier directories taking precedence unless the queries are marked with `; extends`; see [`:h treesitter-query-modelines`](https://neovim.io/doc/user/treesitter.html#treesitter-query-modeline).
-
-E.g., to add queries for `zimbu`, put `highlights.scm` etc. under
-
-```lua
-vim.fn.stdpath('data') .. 'site/queries/zimbu'
-```
diff --git a/lua/nvim-treesitter/_meta/parsers.lua b/lua/nvim-treesitter/_meta/parsers.lua
index 9ec2f0b9a..5af809bb0 100644
--- a/lua/nvim-treesitter/_meta/parsers.lua
+++ b/lua/nvim-treesitter/_meta/parsers.lua
@@ -23,6 +23,9 @@ error('Cannot require a meta file')
 ---
 ---Parser repo is a local directory; overrides `url`, `revision`, and `branch`
 ---@field path? string
+---
+---Directory with queries to be installed
+---@field queries? string
 
 ---@class ParserInfo
 ---
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c56069621..336f83717 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -14,6 +14,9 @@ local uv_copyfile = a.awrap(4, uv.fs_copyfile)
 ---@type fun(path: string, mode: integer): string?
 local uv_mkdir = a.awrap(3, uv.fs_mkdir)
 
+---@type fun(path: string): string?
+local uv_rmdir = a.awrap(2, uv.fs_rmdir)
+
 ---@type fun(path: string, new_path: string): string?
 local uv_rename = a.awrap(3, uv.fs_rename)
 
@@ -23,6 +26,36 @@ local uv_symlink = a.awrap(4, uv.fs_symlink)
 ---@type fun(path: string): string?
 local uv_unlink = a.awrap(2, uv.fs_unlink)
 
+---@async
+---@param path string
+---@return string? err
+local function mkpath(path)
+  local parent = fs.dirname(path)
+  if not parent:match('^[./]$') and not uv.fs_stat(parent) then
+    mkpath(parent)
+  end
+
+  return uv_mkdir(path, 493) -- tonumber('755', 8)
+end
+
+---@async
+---@param path string
+local function rmdir(path)
+  local stat = uv.fs_lstat(path)
+  if not stat then
+    return
+  end
+
+  if stat.type == 'directory' then
+    for file in fs.dir(path) do
+      rmdir(fs.joinpath(path, file))
+    end
+    return uv_rmdir(path)
+  else
+    return uv_unlink(path)
+  end
+end
+
 local MAX_JOBS = 100
 local INSTALL_TIMEOUT = 60000
 
@@ -95,18 +128,6 @@ local function download_file(url, output)
   end
 end
 
----@async
----@param path string
----@return string? err
-local function mkpath(path)
-  local parent = fs.dirname(path)
-  if not parent:match('^[./]$') and not uv.fs_stat(parent) then
-    mkpath(parent)
-  end
-
-  return uv_mkdir(path, 493) -- tonumber('755', 8)
-end
-
 local M = {}
 
 ---
@@ -199,7 +220,8 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
 
   local tmp = output_dir .. '-tmp'
 
-  util.delete(tmp)
+  rmdir(tmp)
+  a.schedule()
 
   url = url:gsub('.git$', '')
   local target = is_gitlab
@@ -258,7 +280,8 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
     end
   end
 
-  util.delete(tmp)
+  rmdir(tmp)
+  a.schedule()
 end
 
 ---@async
@@ -300,6 +323,38 @@ local function do_install(logger, compile_location, target_location)
   end
 end
 
+---@async
+---@param logger Logger
+---@param query_src string
+---@param query_dir string
+---@return string? err
+local function do_link_queries(logger, query_src, query_dir)
+  uv_unlink(query_dir)
+  local err = uv_symlink(query_src, query_dir, { dir = true, junction = true })
+  a.schedule()
+  if err then
+    return logger:error(err)
+  end
+end
+
+---@async
+---@param logger Logger
+---@param query_src string
+---@param query_dir string
+---@return string? err
+local function do_copy_queries(logger, query_src, query_dir)
+  rmdir(query_dir)
+  local err = uv_mkdir(query_dir, 493) -- tonumber('755', 8)
+
+  for f in fs.dir(query_src) do
+    err = uv_copyfile(fs.joinpath(query_src, f), fs.joinpath(query_dir, f))
+  end
+  a.schedule()
+  if err then
+    return logger:error(err)
+  end
+end
+
 ---@async
 ---@param lang string
 ---@param cache_dir string
@@ -310,9 +365,8 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
   local logger = log.new('install/' .. lang)
 
   local repo = get_parser_install_info(lang)
+  local project_name = 'tree-sitter-' .. lang
   if repo then
-    local project_name = 'tree-sitter-' .. lang
-
     local revision = repo.revision
 
     local compile_location ---@type string
@@ -320,7 +374,7 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
       compile_location = fs.normalize(repo.path)
     else
       local project_dir = fs.joinpath(cache_dir, project_name)
-      util.delete(project_dir)
+      rmdir(project_dir)
 
       revision = revision or repo.branch or 'main'
 
@@ -362,26 +416,37 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
       local revfile = fs.joinpath(config.get_install_dir('parser-info') or '', lang .. '.revision')
       util.write_file(revfile, revision or '')
     end
-
-    if not repo.path then
-      util.delete(fs.joinpath(cache_dir, project_name))
-    end
   end
 
   do -- install queries
-    local queries_src = M.get_package_path('runtime', 'queries', lang)
-    if uv.fs_stat(queries_src) then
-      local queries = fs.joinpath(config.get_install_dir('queries'), lang)
+    local query_src = M.get_package_path('runtime', 'queries', lang)
+    local query_dir = fs.joinpath(config.get_install_dir('queries'), lang)
+    local task ---@type function
 
-      uv_unlink(queries)
-      local err = uv_symlink(queries_src, queries, { dir = true, junction = true })
-      a.schedule()
+    if repo and repo.queries and repo.path then -- link queries from local repo
+      query_src = fs.joinpath(fs.normalize(repo.path), repo.queries)
+      task = do_link_queries
+    elseif repo and repo.queries then -- copy queries from tarball
+      query_src = fs.joinpath(cache_dir, project_name, repo.queries)
+      task = do_copy_queries
+    elseif uv.fs_stat(query_src) then -- link queries from runtime
+      task = do_link_queries
+    end
+
+    if task then
+      local err = task(logger, query_src, query_dir)
       if err then
-        return logger:error(err)
+        return err
       end
     end
   end
 
+  -- clean up
+  if repo and not repo.path then
+    rmdir(fs.joinpath(cache_dir, project_name))
+    a.schedule()
+  end
+
   logger:info('Language installed')
 end
 
@@ -520,17 +585,21 @@ local function uninstall_lang(logger, lang, parser, queries)
     logger:debug('Unlinking ' .. parser)
     local perr = uv_unlink(parser)
     a.schedule()
-
     if perr then
       return logger:error(perr)
     end
   end
 
-  if fn.isdirectory(queries) == 1 then
+  local stat = uv.fs_lstat(queries)
+  if stat then
     logger:debug('Unlinking ' .. queries)
-    local qerr = uv_unlink(queries)
+    local qerr ---@type string?
+    if stat.type == 'link' then
+      qerr = uv_unlink(queries)
+    else
+      qerr = rmdir(queries)
+    end
     a.schedule()
-
     if qerr then
       return logger:error(qerr)
     end
diff --git a/lua/nvim-treesitter/util.lua b/lua/nvim-treesitter/util.lua
index 8a9779617..f2ff2f77f 100644
--- a/lua/nvim-treesitter/util.lua
+++ b/lua/nvim-treesitter/util.lua
@@ -17,10 +17,4 @@ function M.write_file(filename, content)
   file:close()
 end
 
---- Recursively delete a directory
---- @param name string
-function M.delete(name)
-  vim.fs.rm(name, { recursive = true, force = true })
-end
-
 return M

From f976acdc9c8214145a11372d2a7ae4a032f62a39 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 31 May 2025 15:45:59 +0200
Subject: [PATCH 2390/2704] refactor(install): inline, rename, annotate

---
 lua/nvim-treesitter/install.lua | 90 +++++++++++++++------------------
 1 file changed, 41 insertions(+), 49 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 336f83717..c179600b6 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -40,7 +40,7 @@ end
 
 ---@async
 ---@param path string
-local function rmdir(path)
+local function rmpath(path)
   local stat = uv.fs_lstat(path)
   if not stat then
     return
@@ -48,7 +48,7 @@ local function rmdir(path)
 
   if stat.type == 'directory' then
     for file in fs.dir(path) do
-      rmdir(fs.joinpath(path, file))
+      rmpath(fs.joinpath(path, file))
     end
     return uv_rmdir(path)
   else
@@ -61,16 +61,16 @@ local INSTALL_TIMEOUT = 60000
 
 --- @async
 --- @param max_jobs integer
---- @param task_funs async.TaskFun[]
-local function join(max_jobs, task_funs)
-  if #task_funs == 0 then
+--- @param tasks async.TaskFun[]
+local function join(max_jobs, tasks)
+  if #tasks == 0 then
     return
   end
 
-  max_jobs = math.min(max_jobs, #task_funs)
+  max_jobs = math.min(max_jobs, #tasks)
 
-  local remaining = { select(max_jobs + 1, unpack(task_funs)) }
-  local to_go = #task_funs
+  local remaining = { select(max_jobs + 1, unpack(tasks)) }
+  local to_go = #tasks
 
   a.await(1, function(finish)
     local function cb()
@@ -84,7 +84,7 @@ local function join(max_jobs, task_funs)
     end
 
     for i = 1, max_jobs do
-      task_funs[i]():await(cb)
+      tasks[i]():await(cb)
     end
   end)
 end
@@ -108,26 +108,6 @@ local function system(cmd, opts)
   return r
 end
 
----@async
----@param url string
----@param output string
----@return string? err
-local function download_file(url, output)
-  local r = system({
-    'curl',
-    '--silent',
-    '--fail',
-    '--show-error',
-    '-L', -- follow redirects
-    url,
-    '--output',
-    output,
-  })
-  if r.code > 0 then
-    return r.stderr
-  end
-end
-
 local M = {}
 
 ---
@@ -220,7 +200,7 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
 
   local tmp = output_dir .. '-tmp'
 
-  rmdir(tmp)
+  rmpath(tmp)
   a.schedule()
 
   url = url:gsub('.git$', '')
@@ -232,9 +212,18 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
 
   do -- Download tarball
     logger:info('Downloading %s...', project_name)
-    local err = download_file(target, tarball_path)
-    if err then
-      return logger:error('Error during download: %s', err)
+    local r = system({
+      'curl',
+      '--silent',
+      '--fail',
+      '--show-error',
+      '-L', -- follow redirects
+      target,
+      '--output',
+      tarball_path,
+    })
+    if r.code > 0 then
+      return logger:error('Error during download: %s', r.stderr)
     end
   end
 
@@ -280,7 +269,7 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
     end
   end
 
-  rmdir(tmp)
+  rmpath(tmp)
   a.schedule()
 end
 
@@ -343,7 +332,7 @@ end
 ---@param query_dir string
 ---@return string? err
 local function do_copy_queries(logger, query_src, query_dir)
-  rmdir(query_dir)
+  rmpath(query_dir)
   local err = uv_mkdir(query_dir, 493) -- tonumber('755', 8)
 
   for f in fs.dir(query_src) do
@@ -374,7 +363,7 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
       compile_location = fs.normalize(repo.path)
     else
       local project_dir = fs.joinpath(cache_dir, project_name)
-      rmdir(project_dir)
+      rmpath(project_dir)
 
       revision = revision or repo.branch or 'main'
 
@@ -443,7 +432,7 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
 
   -- clean up
   if repo and not repo.path then
-    rmdir(fs.joinpath(cache_dir, project_name))
+    rmpath(fs.joinpath(cache_dir, project_name))
     a.schedule()
   end
 
@@ -517,10 +506,10 @@ local function install(languages, options)
 
   local install_dir = config.get_install_dir('parser')
 
-  local task_funs = {} ---@type async.TaskFun[]
+  local tasks = {} ---@type async.TaskFun[]
   local done = 0
   for _, lang in ipairs(languages) do
-    task_funs[#task_funs + 1] = a.async(function()
+    tasks[#tasks + 1] = a.async(--[[@async]] function()
       a.schedule()
       local status = install_lang(lang, cache_dir, install_dir, options.force, options.generate)
       if status ~= 'failed' then
@@ -529,16 +518,17 @@ local function install(languages, options)
     end)
   end
 
-  join(options and options.max_jobs or MAX_JOBS, task_funs)
-  if #task_funs > 1 then
+  join(options and options.max_jobs or MAX_JOBS, tasks)
+  if #tasks > 1 then
     a.schedule()
     if options and options.summary then
-      log.info('Installed %d/%d languages', done, #task_funs)
+      log.info('Installed %d/%d languages', done, #tasks)
     end
   end
-  return done == #task_funs
+  return done == #tasks
 end
 
+---@async
 ---@param languages string[]|string
 ---@param options? InstallOptions
 M.install = a.async(function(languages, options)
@@ -547,6 +537,7 @@ M.install = a.async(function(languages, options)
   return install(languages, options)
 end)
 
+---@async
 ---@param languages? string[]|string
 ---@param options? InstallOptions
 M.update = a.async(function(languages, options)
@@ -597,7 +588,7 @@ local function uninstall_lang(logger, lang, parser, queries)
     if stat.type == 'link' then
       qerr = uv_unlink(queries)
     else
-      qerr = rmdir(queries)
+      qerr = rmpath(queries)
     end
     a.schedule()
     if qerr then
@@ -608,6 +599,7 @@ local function uninstall_lang(logger, lang, parser, queries)
   logger:info('Language uninstalled')
 end
 
+---@async
 ---@param languages string[]|string
 ---@param options? InstallOptions
 M.uninstall = a.async(function(languages, options)
@@ -618,7 +610,7 @@ M.uninstall = a.async(function(languages, options)
   local query_dir = config.get_install_dir('queries')
   local installed = config.get_installed()
 
-  local task_funs = {} ---@type async.TaskFun[]
+  local tasks = {} ---@type async.TaskFun[]
   local done = 0
   for _, lang in ipairs(languages) do
     local logger = log.new('uninstall/' .. lang)
@@ -627,7 +619,7 @@ M.uninstall = a.async(function(languages, options)
     else
       local parser = fs.joinpath(parser_dir, lang) .. '.so'
       local queries = fs.joinpath(query_dir, lang)
-      task_funs[#task_funs + 1] = a.async(function()
+      tasks[#tasks + 1] = a.async(--[[@async]] function()
         local err = uninstall_lang(logger, lang, parser, queries)
         if not err then
           done = done + 1
@@ -636,11 +628,11 @@ M.uninstall = a.async(function(languages, options)
     end
   end
 
-  join(MAX_JOBS, task_funs)
-  if #task_funs > 1 then
+  join(MAX_JOBS, tasks)
+  if #tasks > 1 then
     a.schedule()
     if options and options.summary then
-      log.info('Uninstalled %d/%d languages', done, #task_funs)
+      log.info('Uninstalled %d/%d languages', done, #tasks)
     end
   end
 end)

From 27d0bef81e4086c00ed0dde7dc53ec8151bd7c89 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Thu, 5 Jun 2025 02:11:40 -0700
Subject: [PATCH 2391/2704] feat(desktop): update parser and queries

---
 lua/nvim-treesitter/parsers.lua        | 2 +-
 runtime/queries/desktop/highlights.scm | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d901ab810..3447c273d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '6eb323a20db2f1e8736c3a05915afe1687283965',
+      revision = 'b2cad1212116f23b3e8d0607b628bc6f72224c51',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
diff --git a/runtime/queries/desktop/highlights.scm b/runtime/queries/desktop/highlights.scm
index 7a5ebf241..ce55d7432 100644
--- a/runtime/queries/desktop/highlights.scm
+++ b/runtime/queries/desktop/highlights.scm
@@ -5,9 +5,6 @@
 (entry
   key: (identifier) @property)
 
-(localized_key
-  name: (identifier) @property)
-
 [
   (language)
   (country)

From faf63903ffa05a9dadd56258d737a0243393c0f5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 6 Jun 2025 16:41:38 +0200
Subject: [PATCH 2392/2704] fix(ipkg)!: remove parser and queries

grammar repo is 404 (user removed) and no forks exist
---
 SUPPORTED_LANGUAGES.md              |  3 +-
 lua/nvim-treesitter/parsers.lua     |  9 -----
 runtime/queries/ipkg/folds.scm      | 13 -------
 runtime/queries/ipkg/highlights.scm | 56 -----------------------------
 runtime/queries/ipkg/indents.scm    | 33 -----------------
 runtime/queries/ipkg/injections.scm |  5 ---
 runtime/queries/ipkg/locals.scm     | 24 -------------
 7 files changed, 1 insertion(+), 142 deletions(-)
 delete mode 100644 runtime/queries/ipkg/folds.scm
 delete mode 100644 runtime/queries/ipkg/highlights.scm
 delete mode 100644 runtime/queries/ipkg/indents.scm
 delete mode 100644 runtime/queries/ipkg/injections.scm
 delete mode 100644 runtime/queries/ipkg/locals.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 0e6417529..d9c56c4f2 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -137,10 +137,9 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` |   | @TravonteD
 [hurl](https://github.com/pfeiferj/tree-sitter-hurl) | unstable | `HFIJ ` |   | @pfeiferj
 [hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | unstable | `HFIJ ` |   | @luckasRanarison
 [idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` |   | @cathaysia
-[idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` |   | @srghma
+[idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` |   | 
 [ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` |   | @theHamsta
 [inko](https://github.com/inko-lang/tree-sitter-inko) | unstable | `HFIJL` |   | @yorickpeterse
-[ipkg](https://github.com/srghma/tree-sitter-ipkg) | unstable | `HFIJL` |   | @srghma
 [ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` |   | @fab4100
 [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` |   | @sogaiu
 [java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` |   | @p00f
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3447c273d..cbe6aac12 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1022,7 +1022,6 @@ return {
       revision = 'c56a25cf57c68ff929356db25505c1cc4c7820f6',
       url = 'https://github.com/kayhide/tree-sitter-idris',
     },
-    maintainers = { '@srghma' },
     tier = 2,
   },
   ini = {
@@ -1041,14 +1040,6 @@ return {
     maintainers = { '@yorickpeterse' },
     tier = 2,
   },
-  ipkg = {
-    install_info = {
-      revision = '8d3e9782f2d091d0cd39c13bfb3068db0c675960',
-      url = 'https://github.com/srghma/tree-sitter-ipkg',
-    },
-    maintainers = { '@srghma' },
-    tier = 2,
-  },
   ispc = {
     install_info = {
       revision = '9b2f9aec2106b94b4e099fe75e73ebd8ae707c04',
diff --git a/runtime/queries/ipkg/folds.scm b/runtime/queries/ipkg/folds.scm
deleted file mode 100644
index 271654f9a..000000000
--- a/runtime/queries/ipkg/folds.scm
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  (source_file)
-  (dependency_list)
-  (module_list)
-  (dependency_declaration)
-  (module_declaration)
-  (module_declaration)
-  (package_declaration)
-  (main_declaration)
-  (executable_declaration)
-  (version_declaration)
-  (langversion_declaration)
-] @fold
diff --git a/runtime/queries/ipkg/highlights.scm b/runtime/queries/ipkg/highlights.scm
deleted file mode 100644
index 13c102018..000000000
--- a/runtime/queries/ipkg/highlights.scm
+++ /dev/null
@@ -1,56 +0,0 @@
-; Keywords
-"package" @keyword.import
-
-[
-  "authors"
-  "maintainers"
-  "license"
-  "brief"
-  "readme"
-  "homepage"
-  "sourceloc"
-  "bugtracker"
-  "opts"
-  "sourcedir"
-  "builddir"
-  "outputdir"
-  "prebuild"
-  "postbuild"
-  "preinstall"
-  "postinstall"
-  "preclean"
-  "postclean"
-  "version"
-  "langversion"
-  "modules"
-  "main"
-  "executable"
-  "depends"
-] @keyword
-
-[
-  "="
-  (version_range_op)
-] @operator
-
-"," @punctuation.delimiter
-
-; Field values
-(string_value) @string
-
-(boolean_value) @boolean
-
-; Version numbers and ranges
-(version_number) @string.special
-
-[
-  (dependency_item)
-  (package_name)
-  (module_name)
-] @module
-
-; Comments
-[
-  (line_comment)
-  (block_comment)
-] @comment @spell
diff --git a/runtime/queries/ipkg/indents.scm b/runtime/queries/ipkg/indents.scm
deleted file mode 100644
index a596e9ebe..000000000
--- a/runtime/queries/ipkg/indents.scm
+++ /dev/null
@@ -1,33 +0,0 @@
-; Indentation rules for Idris .ipkg files
-[
-  (package_declaration)
-  (field_declaration)
-  (main_declaration)
-  (executable_declaration)
-  (version_declaration)
-  (langversion_declaration)
-] @indent.begin
-
-(dependency_declaration
-  "=" @indent.begin
-  (dependency_list
-    "," @indent.begin))
-
-(module_declaration
-  "=" @indent.begin
-  (module_list
-    "," @indent.begin))
-
-(field_declaration
-  "=" @indent.begin)
-
-"=" @indent.branch
-
-(string_value) @indent.begin
-
-[
-  (line_comment)
-  (block_comment)
-] @indent.ignore
-
-(ERROR) @indent.auto
diff --git a/runtime/queries/ipkg/injections.scm b/runtime/queries/ipkg/injections.scm
deleted file mode 100644
index 3cd6aac8e..000000000
--- a/runtime/queries/ipkg/injections.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-  (line_comment)
-  (block_comment)
-] @injection.content
-  (#set! injection.language "comment"))
diff --git a/runtime/queries/ipkg/locals.scm b/runtime/queries/ipkg/locals.scm
deleted file mode 100644
index c1970fcdf..000000000
--- a/runtime/queries/ipkg/locals.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-; Scopes
-(source_file) @local.scope
-
-; Definitions
-(package_declaration
-  (package_name) @local.definition.import)
-
-(module_declaration
-  (module_list
-    (module_name) @local.definition.namespace))
-
-(main_declaration
-  (module_name) @local.definition.import)
-
-(executable_declaration
-  (package_name) @local.definition.import)
-
-; References
-(dependency_declaration
-  (dependency_list
-    (dependency_item
-      (package_name) @local.reference)))
-
-(module_name) @local.reference

From c48b37a3c9cb8baedcb667c8c5f22b62185c8916 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Fri, 6 Jun 2025 19:36:48 +0900
Subject: [PATCH 2393/2704] feat(cpp): highlight template method call

---
 runtime/queries/cpp/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 85ff2dc40..ac0315275 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -154,6 +154,11 @@
   (field_expression
     (field_identifier) @function.method.call))
 
+(call_expression
+  (field_expression
+    (template_method
+      (field_identifier) @function.method.call)))
+
 ; constructors
 ((function_declarator
   (qualified_identifier

From 9c03c835fb2c7f0348742221d9c9540a69f47bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20NICOLAS?= <ccjmne@gmail.com>
Date: Thu, 5 Jun 2025 15:04:43 +0200
Subject: [PATCH 2394/2704] fix(bash): highlight shebang also when spaced

This commit aligns the shebang highlighting in bash syntax to what the
Linux kernel will recognise as a valid shebang construct.

In summary, the kernel will accept both headers:

    #!/usr/bin/env lua
    #! /usr/bin/env lua

The second one is quite prominently used throughout documentation
online, such as on Wikipedia's page for Shebang (Unix) [1].

Some sources are adamant it wouldn't be supported at a kernel level, but
it looks to me, upon closer inspection of the current kernel code [2],
that it is indeed quite evidently valid.  It'll simply skip over to the
first character that's neither a space 0x20 nor a tab 0x09.

[1] https://en.wikipedia.org/wiki/Shebang_(Unix)
[2] https://github.com/torvalds/linux/blob/ec7714e4947909190ffb3041a03311a975350fe0/fs/binfmt_script.c#L44-L71
---
 runtime/queries/bash/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
index 428207b94..6fe370011 100644
--- a/runtime/queries/bash/highlights.scm
+++ b/runtime/queries/bash/highlights.scm
@@ -269,4 +269,4 @@
 ((program
   .
   (comment) @keyword.directive @nospell)
-  (#lua-match? @keyword.directive "^#!/"))
+  (#lua-match? @keyword.directive "^#![ \t]*/"))

From 0fb1c6e92e6a03374d578b362301dbd22abd3840 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 9 Jun 2025 17:42:54 +0200
Subject: [PATCH 2395/2704] feat(parsers): update bash, purescript, r, cylc,
 meson, mlir, xresources, markdown, markdown_inline, scala, javadoc, slint,
 desktop, enforce, editorconfig, query

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index cbe6aac12..72d4f69ad 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -77,7 +77,7 @@ return {
   },
   bash = {
     install_info = {
-      revision = '8509e3229b863c255ab6b61f3bf74ad0bf14e8bc',
+      revision = '56b54c61fb48bce0c63e3dfa2240b5d274384763',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -322,7 +322,7 @@ return {
   },
   cylc = {
     install_info = {
-      revision = '1f3cb70200b4e238e19652705336e7f2c52b8e2f',
+      revision = '5517ecade85b1de85ed8e0cb742b81decc64183a',
       url = 'https://github.com/elliotfontaine/tree-sitter-cylc',
     },
     maintainers = { '@elliotfontaine' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'b2cad1212116f23b3e8d0607b628bc6f72224c51',
+      revision = '35db988d318c0ddfb8445adec1fd006095e73d89',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '4a00eb4b0e8fbf8f1594efa9b5b15386fbd7d563',
+      revision = 'cbe0d13e8d67d3a97856f29e5b1d4233cbf32577',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -512,7 +512,7 @@ return {
   },
   enforce = {
     install_info = {
-      revision = '36064bd71ce22e9a8c73b64b1a3448cc600a4312',
+      revision = '8e4c84144153deaf2b8461def43126cea6790020',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'ddf03959c0152bb61ed567f301ad6ecdab72f6ab',
+      revision = '32c3d81dda0e4dd70fef7e93f15dc8861d3f5818',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1339,7 +1339,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = 'efb075cbd57ce33f694c2bb264b99cdba0f31789',
+      revision = '9dca2b6834df9be17bed2ec0fc05c215fa10acf3',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1350,7 +1350,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = 'efb075cbd57ce33f694c2bb264b99cdba0f31789',
+      revision = '9dca2b6834df9be17bed2ec0fc05c215fa10acf3',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1382,7 +1382,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = 'b1ff0037b665e7e84715390820d6ecbe763a9c79',
+      revision = '243aa33382d6ac7b8b66d962024d339cb3bae3f6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1391,7 +1391,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '0f77bc710f61ec6be658ddf51851b2ed2cdaa20d',
+      revision = '3e214fc380b1159dd157cd6ed489a3b8fd8888a8',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1739,7 +1739,7 @@ return {
   },
   purescript = {
     install_info = {
-      revision = '4cacfdaa75090bb790965674fe387bb215bab64b',
+      revision = '603daa9178bcef3386b3040d86435794965fc6f2',
       url = 'https://github.com/postsolar/tree-sitter-purescript',
     },
     maintainers = { '@postsolar' },
@@ -1789,7 +1789,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '55baffbdc6bd00bf177b796950497a01bb496241',
+      revision = '2b3669919b22f1a6e5bfcf3753caaa63fd14e8ec',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1798,7 +1798,7 @@ return {
   },
   r = {
     install_info = {
-      revision = '29c816328a086ef056799e3924ef6e09e6a9a8cb',
+      revision = '95aff097aa927a66bb357f715b58cde821be8867',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -1966,7 +1966,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = 'a2e91c845064bb4031e31b103e32bcdaefeea139',
+      revision = '2d55e74b0485fe05058ffe5e8155506c9710c767',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2027,7 +2027,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '32f970b57720010e77a486bc2001ee9e6c7c8250',
+      revision = 'cd04d91ff4eaff3467a6a0968e29fa9e4ac8f024',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2584,7 +2584,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '7e9f6fa9a6e9e4e5ced1683afc89a0d5b32a4ebc',
+      revision = '45c020e74e924d8e3a0656a0dbe18688c063f5f0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From c29969e8efbea20b65dcc398d3fc403d5e51d006 Mon Sep 17 00:00:00 2001
From: Igor <igorlfs@ufmg.br>
Date: Thu, 12 Jun 2025 23:14:30 -0300
Subject: [PATCH 2396/2704] feat(dot): fold queries

---
 SUPPORTED_LANGUAGES.md        | 2 +-
 runtime/queries/dot/folds.scm | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/dot/folds.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index d9c56c4f2..4e3fe466d 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -61,7 +61,7 @@ Language | Tier | Queries | Node | Maintainer
 [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | unstable | `H  J ` |   | @ColinKennedy
 [djot](https://github.com/treeman/tree-sitter-djot) | unstable | `HFIJL` |   | @NoahTheDuke
 [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | unstable | `H  J ` |   | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) | unstable | `H IJ ` |   | @rydesun
+[dot](https://github.com/rydesun/tree-sitter-dot) | unstable | `HFIJ ` |   | @rydesun
 [doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | unstable | `H IJ ` |   | @amaanq
 [dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HF JL` |   | @ObserverOfTime
 [earthfile](https://github.com/glehmann/tree-sitter-earthfile) | unstable | `H  J ` |   | @glehmann
diff --git a/runtime/queries/dot/folds.scm b/runtime/queries/dot/folds.scm
new file mode 100644
index 000000000..280bbb465
--- /dev/null
+++ b/runtime/queries/dot/folds.scm
@@ -0,0 +1,4 @@
+[
+  (edge_stmt)+
+  (node_stmt)
+] @fold

From a64ef334be4f47cab7effdd08b57d7b38235eeb7 Mon Sep 17 00:00:00 2001
From: uncenter <uncenter@uncenter.dev>
Date: Sat, 14 Jun 2025 05:01:04 -0400
Subject: [PATCH 2397/2704] fix(css): universal selector "*" has precedence
 over operator (#7948)

---
 runtime/queries/css/highlights.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/runtime/queries/css/highlights.scm b/runtime/queries/css/highlights.scm
index 49471fdb2..5b43c014a 100644
--- a/runtime/queries/css/highlights.scm
+++ b/runtime/queries/css/highlights.scm
@@ -27,11 +27,6 @@
   (feature_name)
 ] @property
 
-[
-  (nesting_selector)
-  (universal_selector)
-] @character.special
-
 (function_name) @function
 
 [
@@ -58,6 +53,11 @@
 
 (important) @keyword.modifier
 
+[
+  (nesting_selector)
+  (universal_selector)
+] @character.special
+
 (attribute_selector
   (plain_value) @string)
 

From 43b7f16c50cda8f0bd571594d63f9ba8a46f0e45 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 15 Jun 2025 10:48:01 +0200
Subject: [PATCH 2398/2704] feat(parsers): update php_only, javadoc, erlang,
 faust, php, roc, slim, fortran, terraform, fish, mlir, sourcepawn, latex,
 matlab, hcl, vhdl

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 72d4f69ad..b493d0917 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -520,7 +520,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '067d66937c8eeb6651e349f400c1756c2ea90b2e',
+      revision = '07dad1469ecb7df80f2b6d5178f79564d19d67e0',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -536,7 +536,7 @@ return {
   },
   faust = {
     install_info = {
-      revision = 'f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4',
+      revision = 'aa033eb46c3b40e936db5847e0e91445ab606ee4',
       url = 'https://github.com/khiner/tree-sitter-faust',
     },
     maintainers = { '@khiner' },
@@ -568,7 +568,7 @@ return {
   },
   fish = {
     install_info = {
-      revision = '70640c0696abde32622afc43291a385681afbd32',
+      revision = 'aa074a0bacde8b5823c592574d7138f156a95776',
       url = 'https://github.com/ram02z/tree-sitter-fish',
     },
     maintainers = { '@ram02z' },
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = 'ab9aa007a8d982a5a7926663a8ab989cea0f5d9e',
+      revision = '1b08f4c65fb47c76d3532cd3f7432d03abb9ef69',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -898,7 +898,7 @@ return {
   },
   hcl = {
     install_info = {
-      revision = '009def4ae38ec30e5b40beeae26efe93484ab286',
+      revision = '28e327cd3f5be4816020b1230c0602a6deb40290',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '32c3d81dda0e4dd70fef7e93f15dc8861d3f5818',
+      revision = '573ff1f5e909daade4fba984fc5e8b14afe278ef',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1232,7 +1232,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = 'f736d24d89acbd90092d92089e5171e6a449db40',
+      revision = '8e130cd5394487f5b686fbbb547f4ad7dbe811db',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -1359,7 +1359,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '88ccb5ee90711e9961582d421c42bc8c6bd53f59',
+      revision = 'a419361e4a6f2ec435dac4465fb0c0e5b2446b08',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1391,7 +1391,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '3e214fc380b1159dd157cd6ed489a3b8fd8888a8',
+      revision = 'eb78968fdb3728510f9260129a2dd57b7c04f761',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1566,7 +1566,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'e771eb9fb5ccc65af35879487b66751568d10e48',
+      revision = 'b2278dbac9d58b02653fe6a8530ccebc492e4ed4',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1577,7 +1577,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'e771eb9fb5ccc65af35879487b66751568d10e48',
+      revision = 'b2278dbac9d58b02653fe6a8530ccebc492e4ed4',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1918,7 +1918,7 @@ return {
   },
   roc = {
     install_info = {
-      revision = '0b1afe88161cbd81f5ddea1bb4fa786314ed49a7',
+      revision = '94634c7e882d3c55066aa074cab4911284326deb',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
@@ -2019,7 +2019,7 @@ return {
   },
   slim = {
     install_info = {
-      revision = 'd8a79d15c7b9a68d2d1616c319d2b04d1999ab9f',
+      revision = 'a06113f5175b805a37d20df0a6f9d722e0ab6cfe',
       url = 'https://github.com/theoo/tree-sitter-slim',
     },
     maintainers = { '@theoo' },
@@ -2085,7 +2085,7 @@ return {
   },
   sourcepawn = {
     install_info = {
-      revision = 'f2af8d0dc14c6790130cceb2a20027eb41a8297c',
+      revision = '5a8fdd446b516c81e218245c12129c6ad4bccfa2',
       url = 'https://github.com/nilshelmig/tree-sitter-sourcepawn',
     },
     maintainers = { '@Sarrus1' },
@@ -2276,7 +2276,7 @@ return {
   terraform = {
     install_info = {
       location = 'dialects/terraform',
-      revision = '009def4ae38ec30e5b40beeae26efe93484ab286',
+      revision = '28e327cd3f5be4816020b1230c0602a6deb40290',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -2484,7 +2484,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = 'ec2cb14f68053cf49d1d18cd5742af8e81771ebb',
+      revision = '5840549516f2faf8c45cae5a3b16c1b81a2498a1',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },

From 9807487fe90afb7f53ddc22179272dad19c1044a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 17 Jun 2025 15:49:02 +0200
Subject: [PATCH 2399/2704] feat(parsers): update desktop, query, editorconfig,
 xresources, hcl, slint, markdown_inline, matlab, terraform, templ, nu, vhdl,
 tera, markdown, javadoc

---
 lua/nvim-treesitter/parsers.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b493d0917..c230e6979 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '35db988d318c0ddfb8445adec1fd006095e73d89',
+      revision = '5fc42b211b261d7c10f97f2c7fa9665cd0d3c8a0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'cbe0d13e8d67d3a97856f29e5b1d4233cbf32577',
+      revision = '9281e7d8522cc0d06b61f97920e27936fa12be11',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -898,7 +898,7 @@ return {
   },
   hcl = {
     install_info = {
-      revision = '28e327cd3f5be4816020b1230c0602a6deb40290',
+      revision = 'fad991865fee927dd1de5e172fb3f08ac674d914',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '573ff1f5e909daade4fba984fc5e8b14afe278ef',
+      revision = '3f2ed5575909874927489d2d47a3a2fda36959ee',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1339,7 +1339,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '9dca2b6834df9be17bed2ec0fc05c215fa10acf3',
+      revision = '7462bb66ac7e90312082269007fac2772fe5efd1',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1350,7 +1350,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '9dca2b6834df9be17bed2ec0fc05c215fa10acf3',
+      revision = '7462bb66ac7e90312082269007fac2772fe5efd1',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1359,7 +1359,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'a419361e4a6f2ec435dac4465fb0c0e5b2446b08',
+      revision = 'd5fd97c7aec0881d3429642a240ad536c74582b9',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1471,7 +1471,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '100d06e29d13a8ebfc3f29173c07a5c4f2050586',
+      revision = '7983592fe54750b750f2ee9dc8e89449257855d4',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1789,7 +1789,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '2b3669919b22f1a6e5bfcf3753caaa63fd14e8ec',
+      revision = '8a43889f89fd0667289936341bff3a77bafade17',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2027,7 +2027,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = 'cd04d91ff4eaff3467a6a0968e29fa9e4ac8f024',
+      revision = '03f24aa22d6712f79004286df6dd416ca6d2a91d',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2259,7 +2259,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = 'de35706f89beed5087670a9c4421b7794ef02411',
+      revision = 'a35a02cb608291ac8c12082dcbd2b5f34a7ad45f',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2267,7 +2267,7 @@ return {
   },
   tera = {
     install_info = {
-      revision = 'd006172998fa8b81f96b0f2fc7fa2bf25207c46b',
+      revision = '53ca9100f231b72474225d98c9e53d1a4275046d',
       url = 'https://github.com/uncenter/tree-sitter-tera',
     },
     maintainers = { '@uncenter' },
@@ -2276,7 +2276,7 @@ return {
   terraform = {
     install_info = {
       location = 'dialects/terraform',
-      revision = '28e327cd3f5be4816020b1230c0602a6deb40290',
+      revision = 'fad991865fee927dd1de5e172fb3f08ac674d914',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -2484,7 +2484,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '5840549516f2faf8c45cae5a3b16c1b81a2498a1',
+      revision = 'eacafa5d612fdea1d12332fe0f83e089e5571cf3',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2584,7 +2584,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '45c020e74e924d8e3a0656a0dbe18688c063f5f0',
+      revision = '65d52b286af0b2dd7153e045869a566b33a28f44',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 7e6fbcaa20e70b48990b199eb1310bee22adee0f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 17 Jun 2025 15:49:52 +0200
Subject: [PATCH 2400/2704] feat(purescript)!: update parser and queries

removed note: `(constructor_operator)`
---
 lua/nvim-treesitter/parsers.lua           | 2 +-
 runtime/queries/purescript/highlights.scm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c230e6979..3194af27c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1739,7 +1739,7 @@ return {
   },
   purescript = {
     install_info = {
-      revision = '603daa9178bcef3386b3040d86435794965fc6f2',
+      revision = '03bafc129e390d65178caaa72d8a1b91439d170e',
       url = 'https://github.com/postsolar/tree-sitter-purescript',
     },
     maintainers = { '@postsolar' },
diff --git a/runtime/queries/purescript/highlights.scm b/runtime/queries/purescript/highlights.scm
index 02426b0ab..33b62725c 100644
--- a/runtime/queries/purescript/highlights.scm
+++ b/runtime/queries/purescript/highlights.scm
@@ -52,7 +52,6 @@
 
 [
   (operator)
-  (constructor_operator)
   (type_operator)
   (all_names)
   "="

From 2a677dede2ea45d872ee32ea55e2f93bec0b0f4f Mon Sep 17 00:00:00 2001
From: guilhas07 <guilhermesoares1970@gmail.com>
Date: Wed, 18 Jun 2025 16:22:31 +0100
Subject: [PATCH 2401/2704] feat(vue): add template commentstring metadata

---
 runtime/queries/vue/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/vue/highlights.scm b/runtime/queries/vue/highlights.scm
index 64195c346..66b7ea61e 100644
--- a/runtime/queries/vue/highlights.scm
+++ b/runtime/queries/vue/highlights.scm
@@ -41,3 +41,6 @@
     (attribute_value) @none))
 
 (directive_modifier) @function.method
+
+((template_element) @_template
+  (#set! @_template bo.commentstring "<!-- %s -->"))

From 1bfa557b7d6bd7b3a594e89652ba7117a2b7d04d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 22 Jun 2025 15:40:36 +0200
Subject: [PATCH 2402/2704] feat(parsers): update gleam, latex, typespec,
 purescript, heex, nu

---
 lua/nvim-treesitter/parsers.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3194af27c..24fdded9c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -709,7 +709,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '6ece453acf8b14568c10f629f8cd25d3dde3794f',
+      revision = 'ee93c639dc82148d716919df336ad612fd33538e',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -906,7 +906,7 @@ return {
   },
   heex = {
     install_info = {
-      revision = '008626a3fad379d17c81d5ed576edd9bd7a4fbf7',
+      revision = '6603380caf806b3e6c7f0bf61627bb47023d79f1',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
@@ -1232,7 +1232,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = '8e130cd5394487f5b686fbbb547f4ad7dbe811db',
+      revision = '73c9b8992f72203386092ffd2a05f2dcba02d2cb',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
@@ -1471,7 +1471,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '7983592fe54750b750f2ee9dc8e89449257855d4',
+      revision = 'b64f0d1c93a76d167fabb01271905f0d18c5f10c',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1739,7 +1739,7 @@ return {
   },
   purescript = {
     install_info = {
-      revision = '03bafc129e390d65178caaa72d8a1b91439d170e',
+      revision = 'f541f95ffd6852fbbe88636317c613285bc105af',
       url = 'https://github.com/postsolar/tree-sitter-purescript',
     },
     maintainers = { '@postsolar' },
@@ -2386,7 +2386,7 @@ return {
   },
   typespec = {
     install_info = {
-      revision = 'b6b6a66a18e98f44cc2f2cdbfd2e1df845b59852',
+      revision = '814c98283fd92a248ba9d49ebfe61bc672a35875',
       url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
     maintainers = { '@happenslol' },

From 8867a9d6bf85a7847e3dff35b049880dbffb44d6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 22 Jun 2025 15:45:57 +0200
Subject: [PATCH 2403/2704] feat(powershell)!: update parser and queries

removed nodes: `"class"`, `"enum"`
---
 lua/nvim-treesitter/parsers.lua           | 2 +-
 runtime/queries/powershell/highlights.scm | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 24fdded9c..ade94c60c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1637,7 +1637,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '66d5e61126989c0aca57ff77d19b2064919b51e1',
+      revision = '01b67e81917482fb714409a40a8fea8fe21c42f6',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
diff --git a/runtime/queries/powershell/highlights.scm b/runtime/queries/powershell/highlights.scm
index 7d334ba2a..d26864275 100644
--- a/runtime/queries/powershell/highlights.scm
+++ b/runtime/queries/powershell/highlights.scm
@@ -62,11 +62,6 @@
 
 "return" @keyword.return
 
-[
-  "class"
-  "enum"
-] @keyword.type
-
 [
   "data"
   (class_attribute)

From 231724189636fc31950f071bca0d2d35c228035b Mon Sep 17 00:00:00 2001
From: Luis Calle <53507599+TheLeoP@users.noreply.github.com>
Date: Mon, 23 Jun 2025 13:15:08 -0500
Subject: [PATCH 2404/2704] fix: register `powershell` language for `ps1`
 filetype (#7965)

* chore: sort languages

* fix: register `powershell` language for `ps1` filetype
---
 plugin/filetypes.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index feb1194a6..fdfaefe30 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -24,8 +24,8 @@ local filetypes = {
   janet_simple = { 'janet' },
   javascript = { 'javascriptreact', 'ecma', 'ecmascript', 'jsx', 'js' },
   javascript_glimmer = { 'javascript.glimmer' },
-  linkerscript = { 'ld' },
   latex = { 'tex' },
+  linkerscript = { 'ld' },
   m68k = { 'asm68k' },
   make = { 'automake' },
   markdown = { 'pandoc' },
@@ -33,6 +33,7 @@ local filetypes = {
   ocaml_interface = { 'ocamlinterface' },
   perl = { 'pl' },
   poe_filter = { 'poefilter' },
+  powershell = { 'ps1' },
   properties = { 'jproperties' },
   python = { 'py', 'gyp' },
   qmljs = { 'qml' },

From 6c503103710e6ba95632b540f0f337c648b92f17 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Jun 2025 19:28:22 +0200
Subject: [PATCH 2405/2704] chore(wit): mark as unmaintained

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 4e3fe466d..9367de7db 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -322,7 +322,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` |   | @szebniok
 [wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` |   | @theHamsta
 [wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` |   | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | unstable | `HF J ` |   | @liamwh
+[wit](https://github.com/liamwh/tree-sitter-wit) | unmaintained | `HF J ` |   | @liamwh
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` |   | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` |   | @ObserverOfTime
 [xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` |   | @ValdezFOmar
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ade94c60c..fcfcbd45d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2562,7 +2562,7 @@ return {
       url = 'https://github.com/liamwh/tree-sitter-wit',
     },
     maintainers = { '@liamwh' },
-    tier = 2,
+    tier = 3,
   },
   xcompose = {
     install_info = {

From 13ddd4d7522ce3e5a1abc0ea34e10ec4e445908a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Jun 2025 10:48:39 +0200
Subject: [PATCH 2406/2704] feat(swift)!: update parser and queries

---
 SUPPORTED_LANGUAGES.md               |  2 +-
 lua/nvim-treesitter/parsers.lua      |  5 ++---
 runtime/queries/swift/folds.scm      |  2 +-
 runtime/queries/swift/highlights.scm | 23 ++++++-----------------
 runtime/queries/swift/indents.scm    |  2 +-
 runtime/queries/swift/injections.scm |  3 +++
 6 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 9367de7db..3fa4621d5 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -278,7 +278,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` |   | @connorlay
 [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` |   | @amaanq
 [sway](https://github.com/FuelLabs/tree-sitter-sway.git) | unstable | `HFIJL` |   | @ribru17
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unmaintained | `HFIJL` | X | @alex-pinkus
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` |   | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` |   | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` |   | @ok-ryoko
 [t32](https://gitlab.com/xasc/tree-sitter-t32) | unstable | `HFIJL` |   | @xasc
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fcfcbd45d..591fcf25e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2193,12 +2193,11 @@ return {
   swift = {
     install_info = {
       generate = true,
-      generate_from_json = false,
-      revision = '99a5241ceac351a4af57bcc3571cef5064bde0a3',
+      revision = 'ebefe3134fba71f61c1103cbf27047f749f2b587',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
-    tier = 3,
+    tier = 2,
   },
   sxhkdrc = {
     install_info = {
diff --git a/runtime/queries/swift/folds.scm b/runtime/queries/swift/folds.scm
index cfbc6d0b1..ca7f72593 100644
--- a/runtime/queries/swift/folds.scm
+++ b/runtime/queries/swift/folds.scm
@@ -26,7 +26,7 @@
   (tuple_expression)            ; ( foo + bar )
   (array_literal)               ; [ foo, bar ]
   (dictionary_literal)          ; [ foo: bar, x: y ]
-  (lambda_literal) 
+  (lambda_literal)
   (willset_didset_block)
   (willset_clause)
   (didset_clause)
diff --git a/runtime/queries/swift/highlights.scm b/runtime/queries/swift/highlights.scm
index 5c52ee9d6..b911183d1 100644
--- a/runtime/queries/swift/highlights.scm
+++ b/runtime/queries/swift/highlights.scm
@@ -158,25 +158,14 @@
 ; See https://docs.swift.org/swift-book/documentation/the-swift-programming-language/lexicalstructure/#Keywords-and-Punctuation
 [
   (diagnostic)
-  "#available"
-  "#unavailable"
-  "#fileLiteral"
-  "#colorLiteral"
-  "#imageLiteral"
-  "#keyPath"
-  "#selector"
-  "#externalMacro"
+  (availability_condition)
+  (playground_literal)
+  (key_path_string_expression)
+  (selector_expression)
+  (external_macro_definition)
 ] @function.macro
 
-[
-  "#column"
-  "#dsohandle"
-  "#fileID"
-  "#filePath"
-  "#file"
-  "#function"
-  "#line"
-] @constant.macro
+(special_literal) @constant.macro
 
 ; Statements
 (for_statement
diff --git a/runtime/queries/swift/indents.scm b/runtime/queries/swift/indents.scm
index 2366c3bd6..21a11bfa5 100644
--- a/runtime/queries/swift/indents.scm
+++ b/runtime/queries/swift/indents.scm
@@ -33,7 +33,7 @@
   (tuple_expression)            ; ( foo + bar )
   (array_literal)               ; [ foo, bar ]
   (dictionary_literal)          ; [ foo: bar, x: y ]
-  (lambda_literal) 
+  (lambda_literal)
   (willset_didset_block)
   (willset_clause)
   (didset_clause)
diff --git a/runtime/queries/swift/injections.scm b/runtime/queries/swift/injections.scm
index 19aae904e..6e01e2d4c 100644
--- a/runtime/queries/swift/injections.scm
+++ b/runtime/queries/swift/injections.scm
@@ -1,3 +1,6 @@
+((regex_literal) @injection.content
+  (#set! injection.language "regex"))
+
 ([
   (comment)
   (multiline_comment)

From 1181cd9a25360194b208bb9296ec26dc16433699 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Jun 2025 13:32:46 +0200
Subject: [PATCH 2407/2704] feat(verilog)!: rename to systemverilog

Grammar name was changed to coincide with repository name
---
 SUPPORTED_LANGUAGES.md                           |  2 +-
 lua/nvim-treesitter/parsers.lua                  | 16 ++++++++--------
 plugin/filetypes.lua                             |  2 +-
 .../queries/{verilog => systemverilog}/folds.scm |  0
 .../{verilog => systemverilog}/highlights.scm    |  0
 .../{verilog => systemverilog}/injections.scm    |  0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename runtime/queries/{verilog => systemverilog}/folds.scm (100%)
 rename runtime/queries/{verilog => systemverilog}/highlights.scm (100%)
 rename runtime/queries/{verilog => systemverilog}/injections.scm (100%)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 3fa4621d5..a3aabea78 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -281,6 +281,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` |   | @alex-pinkus
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` |   | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` |   | @ok-ryoko
+[systemverilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` |   | @zhangwwpeng
 [t32](https://gitlab.com/xasc/tree-sitter-t32) | unstable | `HFIJL` |   | @xasc
 [tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | unstable | `HFIJL` |   | @amaanq
 [tact](https://github.com/tact-lang/tree-sitter-tact) | unstable | `HFIJL` |   | @novusnota
@@ -312,7 +313,6 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [v](https://github.com/vlang/v-analyzer) | unstable | `HFIJL` |   | @kkharji, @amaanq
 [vala](https://github.com/vala-lang/tree-sitter-vala) | unstable | `HF J ` |   | @Prince781
 [vento](https://github.com/ventojs/tree-sitter-vento) | unstable | `H  J ` |   | @wrapperup, @oscarotero
-[verilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` |   | @zhangwwpeng
 [vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | unstable | `HF J ` |   | @jpt13653903
 [vhs](https://github.com/charmbracelet/tree-sitter-vhs) | unstable | `H  J ` |   | @caarlos0
 [vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | unstable | `HF JL` |   | @clason
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 591fcf25e..3cc89a884 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2215,6 +2215,14 @@ return {
     maintainers = { '@ok-ryoko' },
     tier = 2,
   },
+  systemverilog = {
+    install_info = {
+      revision = 'a412f4a00a6e56c65f519117969c926c35e80ce4',
+      url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
+    },
+    maintainers = { '@zhangwwpeng' },
+    tier = 2,
+  },
   t32 = {
     install_info = {
       revision = '15f0032f3eadf95988293338e883c095fd5936f6',
@@ -2473,14 +2481,6 @@ return {
     maintainers = { '@wrapperup', '@oscarotero' },
     tier = 2,
   },
-  verilog = {
-    install_info = {
-      revision = 'ba3c1e305caf948f718293c86c6018a82ed5043e',
-      url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
-    },
-    maintainers = { '@zhangwwpeng' },
-    tier = 2,
-  },
   vhdl = {
     install_info = {
       revision = 'eacafa5d612fdea1d12332fe0f83e089e5571cf3',
diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index fdfaefe30..ecddea292 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -44,6 +44,7 @@ local filetypes = {
   ssh_config = { 'sshconfig' },
   starlark = { 'bzl' },
   surface = { 'sface' },
+  systemverilog = { 'verilog' },
   t32 = { 'trace32' },
   tcl = { 'expect' },
   terraform = { 'terraform-vars' },
@@ -56,7 +57,6 @@ local filetypes = {
   udev = { 'udevrules' },
   uxntal = { 'tal', 'uxn' },
   v = { 'vlang' },
-  verilog = { 'systemverilog' },
   vhs = { 'tape' },
   xml = { 'xsd', 'xslt', 'svg' },
   xresources = { 'xdefaults' },
diff --git a/runtime/queries/verilog/folds.scm b/runtime/queries/systemverilog/folds.scm
similarity index 100%
rename from runtime/queries/verilog/folds.scm
rename to runtime/queries/systemverilog/folds.scm
diff --git a/runtime/queries/verilog/highlights.scm b/runtime/queries/systemverilog/highlights.scm
similarity index 100%
rename from runtime/queries/verilog/highlights.scm
rename to runtime/queries/systemverilog/highlights.scm
diff --git a/runtime/queries/verilog/injections.scm b/runtime/queries/systemverilog/injections.scm
similarity index 100%
rename from runtime/queries/verilog/injections.scm
rename to runtime/queries/systemverilog/injections.scm

From 98459ffcf7dfbeea83081166a2d732a8083a91c2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 24 Jun 2025 12:18:54 +0200
Subject: [PATCH 2408/2704] fix(health): sort language names

---
 lua/nvim-treesitter/health.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index e284381dd..b4d0c62d5 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -135,7 +135,8 @@ function M.check()
   -- Parser installation checks
   health.start('Installed languages' .. string.rep(' ', 5) .. 'H L F I J')
   local languages = config.get_installed()
-  for _, lang in pairs(languages) do
+  table.sort(languages)
+  for _, lang in ipairs(languages) do
     local parser = parsers[lang]
     local out = lang .. string.rep(' ', 22 - #lang)
     if parser and parser.install_info then

From 77ba555ceffaedd61ee1034e417368da24b9e540 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 25 Jun 2025 11:55:16 +0200
Subject: [PATCH 2409/2704] ci: bump luals to 3.15.0

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 54fb96ed4..15482e03b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NVIM_VERSION ?= nightly
-LUALS_VERSION := 3.14.0
+LUALS_VERSION := 3.15.0
 
 DEPDIR ?= .test-deps
 CURL ?= curl -sL --create-dirs

From 7110df63e1172eb9fa98cde61bbd38a4d325f97a Mon Sep 17 00:00:00 2001
From: Eric Mrak <enmrak@gmail.com>
Date: Thu, 26 Jun 2025 00:04:48 -0700
Subject: [PATCH 2410/2704] feat(fish): more builtin commands and variables
 (#7972)

builtin commands:
* abbr
* path

builtin variables:
* fish_cursor_*
---
 runtime/queries/fish/highlights.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/runtime/queries/fish/highlights.scm b/runtime/queries/fish/highlights.scm
index a7c451175..549bceda0 100644
--- a/runtime/queries/fish/highlights.scm
+++ b/runtime/queries/fish/highlights.scm
@@ -117,10 +117,10 @@
   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")
+      "." ":" "_" "abbr" "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" "path" "printf" "pwd" "random" "read"
+      "realpath" "set" "set_color" "source" "status" "string" "test" "time" "type" "ulimit" "wait")
   ])
 
 ; Functions
@@ -179,11 +179,12 @@
     "fish_term24bit" "fish_term256" "fish_ambiguous_width" "fish_emoji_width"
     "fish_autosuggestion_enabled" "fish_handle_reflow" "fish_key_bindings" "fish_escape_delay_ms"
     "fish_sequence_key_delay_ms" "fish_complete_path" "fish_cursor_selection_mode"
-    "fish_function_path" "fish_greeting" "fish_history" "fish_trace" "FISH_DEBUG"
-    "FISH_DEBUG_OUTPUT" "fish_user_paths" "umask" "BROWSER" "_" "argv" "CMD_DURATION" "COLUMNS"
-    "LINES" "fish_kill_signal" "fish_killring" "fish_read_limit" "fish_pid" "history" "HOME"
-    "hostname" "IFS" "last_pid" "PWD" "pipestatus" "SHLVL" "status" "status_generation" "TERM"
-    "USER" "EUID" "version" "FISH_VERSION"))
+    "fish_cursor_default" "fish_cursor_insert" "fish_cursor_replace" "fish_cursor_replace_one"
+    "fish_cursor_visual" "fish_cursor_external" "fish_function_path" "fish_greeting" "fish_history"
+    "fish_trace" "FISH_DEBUG" "FISH_DEBUG_OUTPUT" "fish_user_paths" "umask" "BROWSER" "_" "argv"
+    "CMD_DURATION" "COLUMNS" "LINES" "fish_kill_signal" "fish_killring" "fish_read_limit" "fish_pid"
+    "history" "HOME" "hostname" "IFS" "last_pid" "PWD" "pipestatus" "SHLVL" "status"
+    "status_generation" "TERM" "USER" "EUID" "version" "FISH_VERSION"))
 
 ; Nodes
 [

From 2e8f8562e6e32bfd4554f38ae00ffd72a2b4515d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 29 Jun 2025 11:34:46 +0200
Subject: [PATCH 2411/2704] fix(scripts): sort list of updated parsers

---
 scripts/update-parsers.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index fb09b9933..83f724970 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -83,6 +83,7 @@ if #updates > 0 then
   end
   util.write_file('lua/nvim-treesitter/parsers.lua', parser_file)
 
+  table.sort(updates)
   local update_list = table.concat(updates, ', ')
   print(string.format('\nUpdated parsers: %s', update_list))
   -- pass list to workflow

From 5948977de47457de10f2b0fb55d851cdf988e2dc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 29 Jun 2025 11:35:00 +0200
Subject: [PATCH 2412/2704] feat(parsers): update angular, clojure, gleam, idl,
 javadoc, jinja, jinja_inline, liquidsoap, nim, nu, poe_filter, r, ssh_config,
 systemverilog, v

---
 lua/nvim-treesitter/parsers.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3cc89a884..69ac17aa8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '820566bb4eb3d288822dbfee42417a5a9491aea6',
+      revision = '93bb92f1289b7fe765da6cc747c82ccdc0afeb8d',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -222,7 +222,7 @@ return {
   },
   clojure = {
     install_info = {
-      revision = '40c5fc2e2a0f511a802a82002553c5de00feeaf4',
+      revision = 'be514eec2c86d560c18fab146e9298e21b8eab62',
       url = 'https://github.com/sogaiu/tree-sitter-clojure',
     },
     maintainers = { '@NoahTheDuke' },
@@ -709,7 +709,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = 'ee93c639dc82148d716919df336ad612fd33538e',
+      revision = '21e0e7ba6f4f60ee80934cb368aa13c00d370734',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -1011,7 +1011,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = 'b14e7971cfbd64fa0ebcdeaa4dfbb3cb0bfabd7c',
+      revision = 'da50751d826030fcf8b1424de9f56cec2a274b38',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '3f2ed5575909874927489d2d47a3a2fda36959ee',
+      revision = 'ac58d03fde1aaf7dbf499e57bfed9ce87e36188d',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1085,7 +1085,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '258d7fb22fa6cd2dc800f201cfdcbe05111a836c',
+      revision = '251101981d86ccb2901741eddf3e7cf21567a66d',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1096,7 +1096,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '258d7fb22fa6cd2dc800f201cfdcbe05111a836c',
+      revision = '251101981d86ccb2901741eddf3e7cf21567a66d',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1272,7 +1272,7 @@ return {
   },
   liquidsoap = {
     install_info = {
-      revision = '8e51fa63ddb93ac179d4e34a311d3d3f03780b42',
+      revision = '68e6b247c880d1521f7b454663fb3735609eacf2',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
@@ -1430,7 +1430,7 @@ return {
   },
   nim = {
     install_info = {
-      revision = '897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7',
+      revision = '9ed4696d7f76e4937e2b63512a249a3ead7a0399',
       url = 'https://github.com/alaviss/tree-sitter-nim',
     },
     maintainers = { '@aMOPel' },
@@ -1471,7 +1471,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'b64f0d1c93a76d167fabb01271905f0d18c5f10c',
+      revision = 'd62bb4a0c78e9476a6dd0081761444f6870252ed',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1619,7 +1619,7 @@ return {
   },
   poe_filter = {
     install_info = {
-      revision = '2902dc45439125b9386812c1089a8e9b5f71c4ab',
+      revision = 'e449216700449f1bccaebbd3820cce794d6fd687',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-poe-filter',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1798,7 +1798,7 @@ return {
   },
   r = {
     install_info = {
-      revision = '95aff097aa927a66bb357f715b58cde821be8867',
+      revision = '7b4eb04dfcc86e6705cade825f8c1edbd46584b2',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -2118,7 +2118,7 @@ return {
   },
   ssh_config = {
     install_info = {
-      revision = '0dd3c7e9f301758f6c69a6efde43d3048deb4d8a',
+      revision = '2d620d0ad636705800cf0ddb92c30afe703cd84f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ssh-config',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2217,7 +2217,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = 'a412f4a00a6e56c65f519117969c926c35e80ce4',
+      revision = '3089b3fe310dd6cf9531e5e45f123202053a29a1',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2459,7 +2459,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '0f963ca4c0cc888252f5a31f37c974d5e2527d06',
+      revision = '5720fd00538ed069b43917fe377ca3fc21c89cb3',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },

From 4b2e9b049c288754dcc27fadccce97a1b16c0a53 Mon Sep 17 00:00:00 2001
From: przepompownia <przepompownia@users.noreply.github.com>
Date: Sun, 29 Jun 2025 14:42:16 +0200
Subject: [PATCH 2413/2704] feat(php): fold array_creation_expression

---
 runtime/queries/php_only/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/php_only/folds.scm b/runtime/queries/php_only/folds.scm
index 43453b174..0c744f88a 100644
--- a/runtime/queries/php_only/folds.scm
+++ b/runtime/queries/php_only/folds.scm
@@ -14,4 +14,5 @@
   (function_static_declaration)
   (method_declaration)
   (namespace_use_declaration)+
+  (array_creation_expression)
 ] @fold

From dbb63c8b7ae4789a128a4176d9f99bff2cdf1bdf Mon Sep 17 00:00:00 2001
From: przepompownia <przepompownia@users.noreply.github.com>
Date: Sun, 29 Jun 2025 15:37:58 +0200
Subject: [PATCH 2414/2704] feat(php): fold match_expression

---
 runtime/queries/php_only/folds.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/php_only/folds.scm b/runtime/queries/php_only/folds.scm
index 0c744f88a..7724cea93 100644
--- a/runtime/queries/php_only/folds.scm
+++ b/runtime/queries/php_only/folds.scm
@@ -15,4 +15,5 @@
   (method_declaration)
   (namespace_use_declaration)+
   (array_creation_expression)
+  (match_expression)
 ] @fold

From 1f069f1bc610493d38276023165075f7424ca7b4 Mon Sep 17 00:00:00 2001
From: Baruch Even <baruch@ev-en.org>
Date: Sun, 29 Jun 2025 19:10:29 +0300
Subject: [PATCH 2415/2704] feat(D):  highlight `(string)` etc. as
 `@keyword.type` (#7978)

Co-authored-by: Baruch Even <baruch@weka.io>
---
 runtime/queries/d/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/d/highlights.scm b/runtime/queries/d/highlights.scm
index 11d08a1b7..50428d20c 100644
--- a/runtime/queries/d/highlights.scm
+++ b/runtime/queries/d/highlights.scm
@@ -265,6 +265,9 @@
   (creal)
   (double)
   (cfloat)
+  (string)
+  (dstring)
+  (wstring)
 ] @type.builtin
 
 ; Functions

From 04935dec426a366f097ec8ae78dab6cc02ddafa0 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Thu, 3 Jul 2025 17:10:05 +0200
Subject: [PATCH 2416/2704] fix: remove import references to jsx/locals.scm

There are no JSX locals (yet...?)
---
 runtime/queries/javascript/locals.scm | 2 +-
 runtime/queries/tsx/locals.scm        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/javascript/locals.scm b/runtime/queries/javascript/locals.scm
index 6d6846fc7..f13db46bf 100644
--- a/runtime/queries/javascript/locals.scm
+++ b/runtime/queries/javascript/locals.scm
@@ -1,4 +1,4 @@
-; inherits: ecma,jsx
+; inherits: ecma
 
 ; Both properties are matched here.
 ;
diff --git a/runtime/queries/tsx/locals.scm b/runtime/queries/tsx/locals.scm
index 07391231c..1b61e36da 100644
--- a/runtime/queries/tsx/locals.scm
+++ b/runtime/queries/tsx/locals.scm
@@ -1 +1 @@
-; inherits: typescript,jsx
+; inherits: typescript

From dafb3cb3cb066774526c1103f3d1d6b34578800b Mon Sep 17 00:00:00 2001
From: Igor <igorlfs@ufmg.br>
Date: Thu, 3 Jul 2025 21:13:31 -0300
Subject: [PATCH 2417/2704] fix(http): prefer folding requests

---
 runtime/queries/http/folds.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/http/folds.scm b/runtime/queries/http/folds.scm
index f7108a551..bd45f8013 100644
--- a/runtime/queries/http/folds.scm
+++ b/runtime/queries/http/folds.scm
@@ -1,5 +1,5 @@
 [
-  (section)
+  (request)
   (json_body)
   (variable_declaration)+
 ] @fold

From 80281c19fd2dacce60958a3c29bab5ab6b721006 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 5 Jul 2025 12:12:53 +0200
Subject: [PATCH 2418/2704] feat(parsers): update c3, cpp, d, faust, fsharp,
 javadoc, julia, liquidsoap, meson, mlir, nu, powershell, roc, swift,
 systemverilog, t32, v

---
 lua/nvim-treesitter/parsers.lua | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 69ac17aa8..8f7ea231b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '6eb8acc275961d137b4b4dd7fe84a19a0680c893',
+      revision = '5abce05689bf46999c17bd0dcda2f75b8de61d0d',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -278,7 +278,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = '56455f4245baf4ea4e0881c5169de69d7edd5ae7',
+      revision = '2871652b9893ab19e621628da03e670227a5d9d0',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -330,7 +330,7 @@ return {
   },
   d = {
     install_info = {
-      revision = '45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a',
+      revision = 'fb028c8f14f4188286c2eef143f105def6fbf24f',
       url = 'https://github.com/gdamore/tree-sitter-d',
     },
     maintainers = { '@amaanq' },
@@ -536,7 +536,7 @@ return {
   },
   faust = {
     install_info = {
-      revision = 'aa033eb46c3b40e936db5847e0e91445ab606ee4',
+      revision = '122dd101919289ea809bad643712fcb483a1bed0',
       url = 'https://github.com/khiner/tree-sitter-faust',
     },
     maintainers = { '@khiner' },
@@ -609,7 +609,7 @@ return {
   fsharp = {
     install_info = {
       location = 'fsharp',
-      revision = 'f29605148f24199cf4d9c4a203a5debc0cbcc648',
+      revision = '5141851c278a99958469eb1736c7afc4ec738e47',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'ac58d03fde1aaf7dbf499e57bfed9ce87e36188d',
+      revision = 'c5b7341f62498ea139d591a5d6f450dc879b53b0',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1159,7 +1159,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = '18b739c1563c83fc816170a4241adfa4b69e5c47',
+      revision = '73d1539a51b8a202d6d2471cc594cf4d7c5e673f',
       url = 'https://github.com/tree-sitter/tree-sitter-julia',
     },
     maintainers = { '@fredrikekre' },
@@ -1272,7 +1272,7 @@ return {
   },
   liquidsoap = {
     install_info = {
-      revision = '68e6b247c880d1521f7b454663fb3735609eacf2',
+      revision = '05a5dbb23addd207a295b904e44dbdd321b3b332',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
@@ -1382,7 +1382,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '243aa33382d6ac7b8b66d962024d339cb3bae3f6',
+      revision = '280b6e59186f18528bab1567f5cc43b78b9cd881',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1391,7 +1391,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'eb78968fdb3728510f9260129a2dd57b7c04f761',
+      revision = 'ddd4cd2e274813b97624fd3f30803f1db2001474',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1471,7 +1471,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'd62bb4a0c78e9476a6dd0081761444f6870252ed',
+      revision = '436b3f94578974d6e0c89c201d4b99329ad0e944',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1637,7 +1637,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '01b67e81917482fb714409a40a8fea8fe21c42f6',
+      revision = '103a700af551ba8d3402fd68e6f3cd4bf45cbe80',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1918,7 +1918,7 @@ return {
   },
   roc = {
     install_info = {
-      revision = '94634c7e882d3c55066aa074cab4911284326deb',
+      revision = '40e52f343f1b1f270d6ecb2ca898ca9b8cba6936',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
     maintainers = { '@nat-418' },
@@ -2193,7 +2193,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'ebefe3134fba71f61c1103cbf27047f749f2b587',
+      revision = 'd8816ef1aae8d1e7cf23adff2ace9d556d4b369f',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2217,7 +2217,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '3089b3fe310dd6cf9531e5e45f123202053a29a1',
+      revision = '0dc5d86af86120094d9f1268613b529142212ddd',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2225,7 +2225,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '15f0032f3eadf95988293338e883c095fd5936f6',
+      revision = '412cf98b2784dfe9c95ce0d7de840605c6953417',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2459,7 +2459,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '5720fd00538ed069b43917fe377ca3fc21c89cb3',
+      revision = '6c511fc884312720e30ef5d169c63fe5f3d0209f',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },

From 0d32ec3c3efd1c26daa47796287e31fdd3307148 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 5 Jul 2025 14:47:35 +0200
Subject: [PATCH 2419/2704] feat(latex)!: update parser and queries

Breaking change: `label_definition`, `label_text` patterns
---
 lua/nvim-treesitter/parsers.lua      | 2 +-
 runtime/queries/latex/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8f7ea231b..cf9368840 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1232,7 +1232,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = '73c9b8992f72203386092ffd2a05f2dcba02d2cb',
+      revision = '9410012b3eba659da5de5a655b4041593b493cb7',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
diff --git a/runtime/queries/latex/highlights.scm b/runtime/queries/latex/highlights.scm
index c39cd1b14..ec39afcf5 100644
--- a/runtime/queries/latex/highlights.scm
+++ b/runtime/queries/latex/highlights.scm
@@ -87,7 +87,7 @@
 
 (label_definition
   command: _ @function.macro
-  name: (curly_group_text
+  name: (curly_group_label
     (_) @markup.link @nospell))
 
 (label_reference_range
@@ -99,7 +99,7 @@
 
 (label_reference
   command: _ @function.macro
-  names: (curly_group_text_list
+  names: (curly_group_label_list
     (_) @markup.link))
 
 (label_number

From 4400990e7362e2769bb1ff96895f623deb0380fa Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 7 Jul 2025 12:17:33 +0200
Subject: [PATCH 2420/2704] feat(vim): highlight "trim" in script heredocs

Allow the optional "trim", as documented in ":help :lua-heredoc".
---
 lua/nvim-treesitter/parsers.lua    | 2 +-
 runtime/queries/vim/highlights.scm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index cf9368840..c25daedaa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2499,7 +2499,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = 'ccc312e878aa84f32d180b8528a3585c7b86a545',
+      revision = 'a93e834bea0975ec0ccb3f6d18540e9bd8170a4d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
index 20a044a60..c35986fa3 100644
--- a/runtime/queries/vim/highlights.scm
+++ b/runtime/queries/vim/highlights.scm
@@ -253,6 +253,9 @@
 (heredoc
   (parameter) @keyword)
 
+(script
+  (parameter) @keyword)
+
 [
   (marker_definition)
   (endmarker)

From 3dc6834b30c96b0b11f467136d0a03bb100d868a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 8 Jul 2025 16:53:58 +0200
Subject: [PATCH 2421/2704] feat(parsers): update blueprint, desktop, fortran,
 javadoc, llvm, mlir, nu, requirements, superhtml, swift, v, xresources

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c25daedaa..cadffc13f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -133,7 +133,7 @@ return {
   },
   blueprint = {
     install_info = {
-      revision = '60ba73739c6083c693d86a1a7cf039c07eb4ed59',
+      revision = '355ef84ef8a958ac822117b652cf4d49bac16c79',
       url = 'https://gitlab.com/gabmus/tree-sitter-blueprint',
     },
     maintainers = { '@gabmus' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '5fc42b211b261d7c10f97f2c7fa9665cd0d3c8a0',
+      revision = '6096afc7b7a9e208036dff9103c71ddfe9580c54',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '1b08f4c65fb47c76d3532cd3f7432d03abb9ef69',
+      revision = '7021f9f0f44bbcb7c646b594b6ef8db3ed787f8e',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'c5b7341f62498ea139d591a5d6f450dc879b53b0',
+      revision = 'e3420bd8b3e6fa996348c4bbcf627b812a8c1422',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1280,7 +1280,7 @@ return {
   },
   llvm = {
     install_info = {
-      revision = '1ac83114e71839fa67f4cce2f864ebbbdf6e2a4f',
+      revision = 'badf46daedc7b469f5e849b53f2fb34e881962f1',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
@@ -1391,7 +1391,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'ddd4cd2e274813b97624fd3f30803f1db2001474',
+      revision = '78eb123cab8bb0dfaacb6b1ee617ef3fcc29d8b1',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1471,7 +1471,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '436b3f94578974d6e0c89c201d4b99329ad0e944',
+      revision = '6810930d133af12aed8fe4557935b635934ab61a',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1877,7 +1877,7 @@ return {
   },
   requirements = {
     install_info = {
-      revision = '728910099ddea7f1f94ea95a35a70d1ea76a1639',
+      revision = 'caeb2ba854dea55931f76034978de1fd79362939',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-requirements',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2159,7 +2159,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '13f5a2221cb748bbe50ad702e89362afd5b925a7',
+      revision = '0b9bd0e8fd6284c0cfca85f7997535fe7f051046',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2193,7 +2193,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'd8816ef1aae8d1e7cf23adff2ace9d556d4b369f',
+      revision = '370a4261d702c51d5d830b06bd4c25e44677d01b',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2459,7 +2459,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '6c511fc884312720e30ef5d169c63fe5f3d0209f',
+      revision = '236d51bba1bccd57fd2950956fbffe5fe0248735',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2583,7 +2583,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '65d52b286af0b2dd7153e045869a566b33a28f44',
+      revision = 'db9bf1aeca3e54dd390ae1d3994c665ca7ef5fa2',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 4eb12d7a1f82b6c8db9929bf2c4b38dc3177dd82 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 8 Jul 2025 17:01:38 +0200
Subject: [PATCH 2422/2704] feat(ziggy,ziggy-schema): update parser and queries

Breaking change: ziggy-schema removed "map" node
---
 lua/nvim-treesitter/parsers.lua             |  4 ++--
 runtime/queries/ziggy_schema/highlights.scm | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index cadffc13f..91ab94f1f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2632,7 +2632,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = 'fe3bf9389e7ff213cf3548caaf9c6f3d4bb38647',
+      revision = 'eeb21acc0a369dca503167fe963f4f5a7eda2659',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2641,7 +2641,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = 'fe3bf9389e7ff213cf3548caaf9c6f3d4bb38647',
+      revision = 'eeb21acc0a369dca503167fe963f4f5a7eda2659',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
diff --git a/runtime/queries/ziggy_schema/highlights.scm b/runtime/queries/ziggy_schema/highlights.scm
index 4e1770127..8555c79cc 100644
--- a/runtime/queries/ziggy_schema/highlights.scm
+++ b/runtime/queries/ziggy_schema/highlights.scm
@@ -9,9 +9,18 @@
   "struct"
   "root"
   "enum"
-  "map"
+  "null"
 ] @keyword
 
+(string) @string
+
+(number) @number
+
+[
+  "true"
+  "false"
+] @boolean
+
 (identifier) @type
 
 "?" @type
@@ -27,6 +36,7 @@
 
 [
   ","
+  ":"
   "|"
 ] @punctuation.delimiter
 

From c9e4edc127a90c3969e1bf5cdeab8892247e9c41 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Thu, 19 Jun 2025 10:42:38 -0500
Subject: [PATCH 2423/2704] feat(blade): update blade parser and queries

---
 lua/nvim-treesitter/parsers.lua      |  2 +-
 runtime/queries/blade/folds.scm      |  3 +-
 runtime/queries/blade/highlights.scm | 21 ++++-----
 runtime/queries/blade/indents.scm    | 16 ++++++-
 runtime/queries/blade/injections.scm | 66 ++++++++++++++++++++++++----
 5 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 91ab94f1f..8270b58a5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -125,7 +125,7 @@ return {
   },
   blade = {
     install_info = {
-      revision = 'fbe5f81b54f0f6153961824ce306ffc805134980',
+      revision = '5dd29dd50fa6c3de0bb5a2d24ec03f99ddb960bf',
       url = 'https://github.com/EmranMR/tree-sitter-blade',
     },
     maintainers = { '@calebdw' },
diff --git a/runtime/queries/blade/folds.scm b/runtime/queries/blade/folds.scm
index cc081a754..07c1fd86f 100644
--- a/runtime/queries/blade/folds.scm
+++ b/runtime/queries/blade/folds.scm
@@ -1,5 +1,6 @@
+; inherits: html
+
 [
-  (authorization)
   (conditional)
   (envoy)
   (fragment)
diff --git a/runtime/queries/blade/highlights.scm b/runtime/queries/blade/highlights.scm
index c05d2845f..b20999a5f 100644
--- a/runtime/queries/blade/highlights.scm
+++ b/runtime/queries/blade/highlights.scm
@@ -1,15 +1,16 @@
-([
+; inherits: html
+
+[
   (directive)
   (directive_start)
   (directive_end)
 ] @tag
-  (#set! priority 101))
 
-([
-  (bracket_start)
-  (bracket_end)
-] @tag.delimiter
-  (#set! priority 101))
-
-((comment) @comment @spell
-  (#set! priority 101))
+[
+  "{{"
+  "}}"
+  "{!!"
+  "!!}"
+  "("
+  ")"
+] @punctuation.bracket
diff --git a/runtime/queries/blade/indents.scm b/runtime/queries/blade/indents.scm
index bd3e84d16..a52bb3697 100644
--- a/runtime/queries/blade/indents.scm
+++ b/runtime/queries/blade/indents.scm
@@ -1,3 +1,15 @@
-(directive_start) @indent.begin
+; inherits: html
 
-(directive_end) @indent.end
+[
+  (conditional)
+  (envoy)
+  (fragment)
+  (livewire)
+  (loop)
+  (once)
+  (php_statement)
+  (section)
+  (stack)
+  (switch)
+  (verbatim)
+] @indent.begin
diff --git a/runtime/queries/blade/injections.scm b/runtime/queries/blade/injections.scm
index 12fa9f953..e8a0d708d 100644
--- a/runtime/queries/blade/injections.scm
+++ b/runtime/queries/blade/injections.scm
@@ -1,15 +1,65 @@
-((text) @injection.content
-  (#set! injection.combined)
-  (#set! injection.language html))
+; inherits: html
+
+((php_only) @injection.content
+  (#set! injection.language "php_only"))
+
+((parameter) @injection.content
+  (#set! injection.include-children)
+  (#set! injection.language "php_only"))
 
 ((text) @injection.content
   (#has-ancestor? @injection.content "envoy")
   (#set! injection.combined)
   (#set! injection.language bash))
 
-((php_only) @injection.content
-  (#set! injection.combined)
-  (#set! injection.language php_only))
+; Livewire attributes
+; <div wire:click="baz++">
+(attribute
+  (attribute_name) @_attr
+  (#any-of? @_attr "wire:model" "wire:click" "wire:stream" "wire:text" "wire:show")
+  (quoted_attribute_value
+    (attribute_value) @injection.content)
+  (#set! injection.language "javascript"))
 
-((parameter) @injection.content
-  (#set! injection.language php_only))
+; AlpineJS attributes
+; <div x-data="{ foo: 'bar' }" x-init="baz()">
+(attribute
+  (attribute_name) @_attr
+  (#lua-match? @_attr "^x%-%l+")
+  (#not-any-of? @_attr "x-teleport" "x-ref" "x-transition")
+  (quoted_attribute_value
+    (attribute_value) @injection.content)
+  (#set! injection.language "javascript"))
+
+(attribute
+  (attribute_name) @_attr
+  (#lua-match? @_attr "^[:@]%l+")
+  (quoted_attribute_value
+    (attribute_value) @injection.content)
+  (#set! injection.language "javascript"))
+
+; Blade escaped JS attributes
+; <x-foo ::bar="baz" />
+(element
+  (_
+    (tag_name) @_tag
+    (#lua-match? @_tag "^x%-%l+")
+    (attribute
+      (attribute_name) @_attr
+      (#lua-match? @_attr "^::%l+")
+      (quoted_attribute_value
+        (attribute_value) @injection.content)
+      (#set! injection.language "javascript"))))
+
+; Blade PHP attributes
+; <x-foo :bar="$baz" />
+(element
+  (_
+    (tag_name) @_tag
+    (#lua-match? @_tag "^x%-%l+")
+    (attribute
+      (attribute_name) @_attr
+      (#lua-match? @_attr "^:%l+")
+      (quoted_attribute_value
+        (attribute_value) @injection.content)
+      (#set! injection.language "php_only"))))

From c3ecec599b09684d900f4dd888676589a195a719 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 13 Jul 2025 11:31:00 +0200
Subject: [PATCH 2424/2704] feat(parsers): update beancount, blade, cpp,
 desktop, gosum, javadoc, liquidsoap, mlir, nix, slint, systemverilog, t32,
 vim, xresources

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8270b58a5..4bd000d80 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,7 +93,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = '9bc460a05b5f096d69568b5fb36105032ff4ff97',
+      revision = '97b46e5f37aa9030e9701c816e20760760ab4907',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -125,7 +125,7 @@ return {
   },
   blade = {
     install_info = {
-      revision = '5dd29dd50fa6c3de0bb5a2d24ec03f99ddb960bf',
+      revision = '59ce5b68e288002e3aee6cf5a379bbef21adbe6c',
       url = 'https://github.com/EmranMR/tree-sitter-blade',
     },
     maintainers = { '@calebdw' },
@@ -278,7 +278,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = '2871652b9893ab19e621628da03e670227a5d9d0',
+      revision = '5cb9b693cfd7bfacab1d9ff4acac1a4150700609',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '6096afc7b7a9e208036dff9103c71ddfe9580c54',
+      revision = 'deb91f587c97814058aea2cbd790e0b85c9bb361',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -803,7 +803,7 @@ return {
   },
   gosum = {
     install_info = {
-      revision = 'e2ac513b2240c7ff1069ae33b2df29ce90777c11',
+      revision = '27816eb6b7315746ae9fcf711e4e1396dc1cf237',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-go-sum',
     },
     maintainers = { '@amaanq' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'e3420bd8b3e6fa996348c4bbcf627b812a8c1422',
+      revision = '1a55fc4c0f9c24cf927a84cb7d382665523d45c5',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1272,7 +1272,7 @@ return {
   },
   liquidsoap = {
     install_info = {
-      revision = '05a5dbb23addd207a295b904e44dbdd321b3b332',
+      revision = '4de01f44de2c051c33832ce523cf44690561320d',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
@@ -1391,7 +1391,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '78eb123cab8bb0dfaacb6b1ee617ef3fcc29d8b1',
+      revision = '36f08b4c39997ee7b864ddeff1c64e5507be438e',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1455,7 +1455,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'cfc53fd287d23ab7281440a8526c73542984669b',
+      revision = 'cd4f6594508c820dca196d931c6bd4d21ef18520',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -2027,7 +2027,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '03f24aa22d6712f79004286df6dd416ca6d2a91d',
+      revision = '6ee7d053feabfff5d401491043a7286e30ffd7a8',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2217,7 +2217,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '0dc5d86af86120094d9f1268613b529142212ddd',
+      revision = '48dfe3c2579b851e1ef38a326b0aee9900afb9ae',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2225,7 +2225,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '412cf98b2784dfe9c95ce0d7de840605c6953417',
+      revision = '55b387ceead98ceaf38878ecc88f280e7f56f64c',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2499,7 +2499,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = 'a93e834bea0975ec0ccb3f6d18540e9bd8170a4d',
+      revision = '3dd4747082d1b717b8978211c06ef7b6cd16125b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2583,7 +2583,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'db9bf1aeca3e54dd390ae1d3994c665ca7ef5fa2',
+      revision = '9901f4f25f656a58bc7129098371d99279717efe',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 6c2234f7ba98ee8fec3b079939449a2d3e5c16b6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 14 Jul 2025 17:48:23 -0700
Subject: [PATCH 2425/2704] feat(c_sharp): highlight `::` (#8002)

---
 runtime/queries/c_sharp/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/c_sharp/highlights.scm b/runtime/queries/c_sharp/highlights.scm
index f23d7ec65..5055990b0 100644
--- a/runtime/queries/c_sharp/highlights.scm
+++ b/runtime/queries/c_sharp/highlights.scm
@@ -439,6 +439,7 @@
   "."
   ","
   ":"
+  "::"
 ] @punctuation.delimiter
 
 (conditional_expression

From 96f51adf716c2e289e88b9e291faa393c03f85c9 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 14 Jul 2025 17:55:29 -0700
Subject: [PATCH 2426/2704] fix(c_sharp): "<", ">" in type param lists are
 brackets (#8003)

---
 runtime/queries/c_sharp/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/runtime/queries/c_sharp/highlights.scm b/runtime/queries/c_sharp/highlights.scm
index 5055990b0..ce9911151 100644
--- a/runtime/queries/c_sharp/highlights.scm
+++ b/runtime/queries/c_sharp/highlights.scm
@@ -459,6 +459,12 @@
 
 (interpolation_brace) @punctuation.special
 
+(type_parameter_list
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
 (type_argument_list
   [
     "<"

From 8d8ca0996c79348cd59cf31065954f40fcf1679f Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 29 Jun 2025 19:53:33 +0200
Subject: [PATCH 2427/2704] docs: specify fold dos and don'ts

---
 CONTRIBUTING.md | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f665ce1ed..f376ed802 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -345,12 +345,35 @@ The valid captures are:
 
 ### Folds
 
-You can define folds for a given language by adding a `folds.scm` query. This is implemented in Neovim. The only valid capture is
+You can define folds for a given language by adding a `folds.scm` query. This is implemented in Neovim. The only valid capture is `@fold`:
 
 ```query
-@fold ; fold this node
+(function_definition) @fold ; fold this node
 ```
 
+Folds should be given to nodes with defined start and end delimiters/patterns, or to consecutive nodes which are part of the same conceptual "grouping", such as consecutive line comments or import statements. The following items are valid fold candidates:
+
+- Function/method definitions
+- Class/interface/trait definitions
+- Switch/match statements, and individual match arms
+- Execution blocks (such as those found in conditional statements or loops)
+- Parameter/argument lists
+- Array/object/string expressions
+- Consecutive import statements, consecutive line comments
+
+The following items would *not* be valid fold candidates:
+
+- Multiline assignment statements
+- Multiline property access expressions
+
+As a rule of thumb, these highlight captures usually reside in or around objects which should be folded:
+
+- `@function`, `@function.method`
+- `@keyword.import`, `@keyword.conditional`, `@keyword.repeat`
+- `@comment`, `@comment.documentation`
+- `@string`, `@string.documentation`
+- `@markup.heading.x`, `@markup.list`
+
 ### Indents
 
 >[!WARNING]

From 992e9ef3d09c3a52adf847c426b52e32bafad519 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 15 Jul 2025 09:37:41 -0700
Subject: [PATCH 2428/2704] ci: ensure parsers have a supported ABI version

---
 .tsqueryrc.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.tsqueryrc.json b/.tsqueryrc.json
index 6d020e987..e8e7fd920 100644
--- a/.tsqueryrc.json
+++ b/.tsqueryrc.json
@@ -1,6 +1,10 @@
 {
   "$schema": "https://raw.githubusercontent.com/ribru17/ts_query_ls/refs/heads/master/schemas/config.json",
   "parser_install_directories": ["${HOME}/.local/share/nvim/site/parser"],
+  "supported_abi_versions": {
+    "start": 13,
+    "end": 15
+  },
   "parser_aliases": {
     "html_tags": "html",
     "ecma": "javascript",

From a5edb0a274d0881dcb4670e2f9e06d2a146f74dd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 17 Jul 2025 11:37:40 +0200
Subject: [PATCH 2429/2704] feat(parsers): update arduino, editorconfig,
 gdscript, idl, javadoc, koto, matlab, mlir, nix, nu, powershell, printf,
 properties, slint, superhtml, systemverilog, t32, tera, twig, xcompose,
 xresources, ziggy, ziggy_schema

---
 lua/nvim-treesitter/parsers.lua | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4bd000d80..ba034d42b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -36,7 +36,7 @@ return {
   },
   arduino = {
     install_info = {
-      revision = '017696bdf47ca2b10948c5a511f9ab387722d0f3',
+      revision = '1b1fd5dbd196e80342cf79f6fc5de154232c2829',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '9281e7d8522cc0d06b61f97920e27936fa12be11',
+      revision = '8ed36589b5d0b3ebfdba45e1fd0ebefa01aafaea',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -652,7 +652,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = '2ed3ef9e30a7998a98eea4dfbcd308678f93b88f',
+      revision = 'cfe20d13767bdede420a6349077fc7dca11c9ad1',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -1011,7 +1011,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = 'da50751d826030fcf8b1424de9f56cec2a274b38',
+      revision = 'd5d7f57dd303b35169bd38c3a2268a24d3d76e38',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1067,7 +1067,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '1a55fc4c0f9c24cf927a84cb7d382665523d45c5',
+      revision = '51cbb3daa9b8a5ba9d6467db40ef45682a06811f',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1207,7 +1207,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '620ff8a32143f24f6f8e157bd1836183599d334d',
+      revision = 'c379c2c0fdc68e56bb1efe0d933b8fcdf9ff203c',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1359,7 +1359,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'd5fd97c7aec0881d3429642a240ad536c74582b9',
+      revision = 'c9abaedbc342e6c421fd37d8aa4d43389da0834a',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1391,7 +1391,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '36f08b4c39997ee7b864ddeff1c64e5507be438e',
+      revision = '98b7d2c6d69c0c83e44386a40ede09924e658189',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1455,7 +1455,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'cd4f6594508c820dca196d931c6bd4d21ef18520',
+      revision = 'bae4c4fb39a4cc87a838817c5e2da7effac75183',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1471,7 +1471,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '6810930d133af12aed8fe4557935b635934ab61a',
+      revision = '6544c4383643cf8608d50def2247a7af8314e148',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1637,7 +1637,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '103a700af551ba8d3402fd68e6f3cd4bf45cbe80',
+      revision = 'b59f9dd34f17998139877316995e796073faf84b',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1645,7 +1645,7 @@ return {
   },
   printf = {
     install_info = {
-      revision = 'df6b69967db7d74ab338a86a9ab45c0966c5ee3c',
+      revision = 'ec4e5674573d5554fccb87a887c97d4aec489da7',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-printf',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1688,7 +1688,7 @@ return {
   },
   properties = {
     install_info = {
-      revision = '579b62f5ad8d96c2bb331f07d1408c92767531d9',
+      revision = '6310671b24d4e04b803577b1c675d765cbd5773b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-properties',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2027,7 +2027,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '6ee7d053feabfff5d401491043a7286e30ffd7a8',
+      revision = '96bc969d20ff347030519184ea2467f4046a524d',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2159,7 +2159,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '0b9bd0e8fd6284c0cfca85f7997535fe7f051046',
+      revision = 'a67317fb81afe76cc04e6d92124cfc20a903cee7',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2217,7 +2217,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '48dfe3c2579b851e1ef38a326b0aee9900afb9ae',
+      revision = 'e5a589a76ce480db5a939ad4a4393c398eed35e9',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2225,7 +2225,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '55b387ceead98ceaf38878ecc88f280e7f56f64c',
+      revision = '2fcca1fd8d84c582478f1aebca7c8379346f3a04',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2274,7 +2274,7 @@ return {
   },
   tera = {
     install_info = {
-      revision = '53ca9100f231b72474225d98c9e53d1a4275046d',
+      revision = 'c0a0ebcd70a0e6a9f9ec1157308e4e0ea18b446e',
       url = 'https://github.com/uncenter/tree-sitter-tera',
     },
     maintainers = { '@uncenter' },
@@ -2375,7 +2375,7 @@ return {
   },
   twig = {
     install_info = {
-      revision = '085648e01d1422163a1702a44e72303b4e2a0bd1',
+      revision = '7195ee573ab5c3b3bb0e91b042e6f83ac1b11104',
       url = 'https://github.com/gbprod/tree-sitter-twig',
     },
     maintainers = { '@gbprod' },
@@ -2565,7 +2565,7 @@ return {
   },
   xcompose = {
     install_info = {
-      revision = 'fff3e72242aa110ebba6441946ea4d12d200fa68',
+      revision = 'a51d6366f041dbefec4da39a7eb3168a9b1cbc0e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xcompose',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2583,7 +2583,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '9901f4f25f656a58bc7129098371d99279717efe',
+      revision = 'b0822f2ea47600c6e11ee64b2dec8353c9684e8d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
@@ -2632,7 +2632,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = 'eeb21acc0a369dca503167fe963f4f5a7eda2659',
+      revision = 'de703372b2da6fd2c25a8a3c424663ff6bece4ac',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2641,7 +2641,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = 'eeb21acc0a369dca503167fe963f4f5a7eda2659',
+      revision = 'de703372b2da6fd2c25a8a3c424663ff6bece4ac',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },

From 61ec748ef7624b1962f392191aad61b91c0f9829 Mon Sep 17 00:00:00 2001
From: Alan Russell <ajrussellaudio@gmail.com>
Date: Fri, 18 Jul 2025 17:04:42 +0100
Subject: [PATCH 2430/2704] feat(groq): add parser and queries (#8008)

---
 SUPPORTED_LANGUAGES.md              |   1 +
 lua/nvim-treesitter/parsers.lua     |   8 +++
 runtime/queries/ecma/injections.scm |  11 +++
 runtime/queries/groq/folds.scm      |   5 ++
 runtime/queries/groq/highlights.scm | 104 ++++++++++++++++++++++++++++
 runtime/queries/groq/indents.scm    |  11 +++
 runtime/queries/groq/injections.scm |   2 +
 7 files changed, 142 insertions(+)
 create mode 100644 runtime/queries/groq/folds.scm
 create mode 100644 runtime/queries/groq/highlights.scm
 create mode 100644 runtime/queries/groq/indents.scm
 create mode 100644 runtime/queries/groq/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index a3aabea78..ded6c7a66 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -117,6 +117,7 @@ ecma (queries only)[^ecma] | unstable | `HFIJL` |   | @steelsojka
 [graphql](https://github.com/bkegley/tree-sitter-graphql) | unstable | `H IJ ` |   | @bkegley
 [gren](https://github.com/MaeBrooks/tree-sitter-gren) | unstable | `H  J ` |   | @MaeBrooks
 [groovy](https://github.com/murtaza64/tree-sitter-groovy) | unstable | `HFIJL` |   | @murtaza64
+[groq](https://github.com/ajrussellaudio/tree-sitter-groq) | unstable | `HFIJ ` |   | @ajrussellaudio
 [gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | unstable | `H    ` |   | @theHamsta
 [hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H  J ` |   | 
 [hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | unstable | `HFIJL` |   | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ba034d42b..ef84595de 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -857,6 +857,14 @@ return {
     maintainers = { '@murtaza64' },
     tier = 2,
   },
+  groq = {
+    install_info = {
+      revision = '9959049ddeb4416101653a071ee923ba9f7a5cb1',
+      url = 'https://github.com/ajrussellaudio/tree-sitter-groq',
+    },
+    maintainers = { '@ajrussellaudio' },
+    tier = 2,
+  },
   gstlaunch = {
     install_info = {
       revision = '549aef253fd38a53995cda1bf55c501174372bf7',
diff --git a/runtime/queries/ecma/injections.scm b/runtime/queries/ecma/injections.scm
index 04abafcde..669c75671 100644
--- a/runtime/queries/ecma/injections.scm
+++ b/runtime/queries/ecma/injections.scm
@@ -48,6 +48,17 @@
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children))
 
+; Sanity CMS GROQ query
+; defineQuery(`...`)
+(call_expression
+  function: (identifier) @_name
+  (#eq? @_name "defineQuery")
+  arguments: (arguments
+    (template_string) @injection.content)
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "groq"))
+
 (call_expression
   function: (identifier) @_name
   (#eq? @_name "gql")
diff --git a/runtime/queries/groq/folds.scm b/runtime/queries/groq/folds.scm
new file mode 100644
index 000000000..1eb05837d
--- /dev/null
+++ b/runtime/queries/groq/folds.scm
@@ -0,0 +1,5 @@
+[
+  (object)
+  (projection)
+  (array)
+] @fold
diff --git a/runtime/queries/groq/highlights.scm b/runtime/queries/groq/highlights.scm
new file mode 100644
index 000000000..e320e42c3
--- /dev/null
+++ b/runtime/queries/groq/highlights.scm
@@ -0,0 +1,104 @@
+; Keywords
+[
+  "select"
+  "asc"
+  "desc"
+] @keyword
+
+[
+  "in"
+  "match"
+] @keyword.operator
+
+; Operators
+[
+  "=="
+  "!="
+  ">"
+  ">="
+  "<"
+  "<="
+  "&&"
+  "||"
+  "!"
+  "+"
+  "-"
+  "*"
+  "/"
+  "%"
+  "**"
+  ".."
+  "..."
+  "=>"
+  "->"
+  "|"
+] @operator
+
+; Punctuation
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  ","
+  ":"
+  "."
+] @punctuation.delimiter
+
+; Literals
+(string) @string
+
+(number) @number
+
+[
+  (true)
+  (false)
+] @boolean
+
+; Special references
+[
+  (null)
+  (star)
+  (parent)
+  (this)
+] @constant.builtin
+
+; Identifiers
+(identifier) @variable
+
+; Parameters
+(parameter
+  "$" @variable.parameter
+  (identifier) @variable.parameter)
+
+; Function calls
+(function_call
+  (identifier) @function)
+
+(order_function
+  "order" @function.builtin)
+
+; Comments
+(comment) @comment @spell
+
+; String keys in projections/objects
+(pair
+  (literal
+    (string) @property))
+
+; Highlight field names in projections
+(projection
+  (identifier) @property)
+
+; Built-in functions (essential GROQ functions)
+(function_call
+  (identifier) @function.builtin
+  (#any-of? @function.builtin
+    "count" "length" "defined" "references" "now" "dateTime" "coalesce" "unique" "max" "min" "sum"
+    "avg" "round" "floor" "ceil" "abs" "sqrt" "upper" "lower" "string" "number" "boolean" "array"
+    "object" "type" "global" "sanity" "path" "delta" "after" "before"))
diff --git a/runtime/queries/groq/indents.scm b/runtime/queries/groq/indents.scm
new file mode 100644
index 000000000..b8ce9713d
--- /dev/null
+++ b/runtime/queries/groq/indents.scm
@@ -0,0 +1,11 @@
+[
+  (object)
+  (projection)
+] @indent.begin
+
+[
+  "{"
+  "}"
+] @indent.branch
+
+"}" @indent.end
diff --git a/runtime/queries/groq/injections.scm b/runtime/queries/groq/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/runtime/queries/groq/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From fba060b623f32c6d2e72a2d2954beb87433aecea Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 19 Jul 2025 02:36:38 -0700
Subject: [PATCH 2431/2704] feat(pkl): add parser and queries (#8011)

---
 SUPPORTED_LANGUAGES.md             |   1 +
 lua/nvim-treesitter/parsers.lua    |   8 ++
 runtime/queries/pkl/folds.scm      |   6 +
 runtime/queries/pkl/highlights.scm | 203 +++++++++++++++++++++++++++++
 runtime/queries/pkl/injections.scm |   6 +
 5 files changed, 224 insertions(+)
 create mode 100644 runtime/queries/pkl/folds.scm
 create mode 100644 runtime/queries/pkl/highlights.scm
 create mode 100644 runtime/queries/pkl/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index ded6c7a66..764b96e3c 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -208,6 +208,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | unstable | `HFIJL` |   | @tk-shirasaka, @calebdw
 [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` |   | @mikehaertl
 [pioasm](https://github.com/leo60228/tree-sitter-pioasm) | unstable | `H  J ` |   | @leo60228
+[pkl](https://github.com/apple/tree-sitter-pkl) | unstable | `HF J ` |   | @ribru17
 [po](https://github.com/tree-sitter-grammars/tree-sitter-po) | unstable | `HF J ` |   | @amaanq
 [pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | unstable | `H    ` |   | @RabbiVeesh, @LeoNerd
 [poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` |   | @ObserverOfTime
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ef84595de..5c611a3f8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1608,6 +1608,14 @@ return {
     maintainers = { '@leo60228' },
     tier = 2,
   },
+  pkl = {
+    install_info = {
+      revision = '4fc94a102c25ea383d70397dac7e677ca3731f1e',
+      url = 'https://github.com/apple/tree-sitter-pkl',
+    },
+    maintainers = { '@ribru17' },
+    tier = 2,
+  },
   po = {
     install_info = {
       revision = 'bd860a0f57f697162bf28e576674be9c1500db5e',
diff --git a/runtime/queries/pkl/folds.scm b/runtime/queries/pkl/folds.scm
new file mode 100644
index 000000000..385c4ceb9
--- /dev/null
+++ b/runtime/queries/pkl/folds.scm
@@ -0,0 +1,6 @@
+[
+  (clazz)
+  (objectBody)
+] @fold
+
+(importClause)+ @fold
diff --git a/runtime/queries/pkl/highlights.scm b/runtime/queries/pkl/highlights.scm
new file mode 100644
index 000000000..bc7e72757
--- /dev/null
+++ b/runtime/queries/pkl/highlights.scm
@@ -0,0 +1,203 @@
+(identifier) @variable
+
+(qualifiedAccessExpr
+  (identifier) @function.method.call
+  .
+  (argumentList))
+
+(qualifiedAccessExpr
+  (identifier) @variable.member .)
+
+; Operators
+[
+  "??"
+  "@"
+  "="
+  "<"
+  ">"
+  "!"
+  "=="
+  "!="
+  "<="
+  ">="
+  "&&"
+  "||"
+  "+"
+  "-"
+  "**"
+  "*"
+  "/"
+  "~/"
+  "%"
+  "|>"
+  "..."
+  "|"
+  "->"
+] @operator
+
+[
+  ","
+  ":"
+  "."
+  "?."
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+; Types
+(clazz
+  (identifier) @type.definition)
+
+(typeAlias
+  (identifier) @type.definition)
+
+((identifier) @type
+  (#lua-match? @type "^[A-Z]"))
+
+(typeArgumentList
+  [
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+; Method definitions
+(classMethod
+  (methodHeader
+    (identifier) @function.method))
+
+(objectMethod
+  (methodHeader
+    (identifier) @function.method))
+
+; Identifiers
+(classProperty
+  (identifier) @property)
+
+(objectProperty
+  (identifier) @property)
+
+(parameterList
+  (typedIdentifier
+    (identifier) @variable.parameter))
+
+(objectBodyParameters
+  (typedIdentifier
+    (identifier) @variable.parameter))
+
+; Literals
+[
+  (stringConstant)
+  (slStringLiteralExpr)
+  (mlStringLiteralExpr)
+] @string
+
+(escapeSequence) @string.escape
+
+(intLiteralExpr) @number
+
+(floatLiteralExpr) @number.float
+
+(stringInterpolation
+  [
+    "\\("
+    "\\#("
+    "\\##("
+    "\\###("
+    "\\####("
+    "\\#####("
+    "\\######("
+  ] @punctuation.special
+  ")" @punctuation.special)
+
+(nullableType
+  "?" @punctuation.special)
+
+[
+  (lineComment)
+  (blockComment)
+] @comment @spell
+
+(docComment) @comment.documentation @spell
+
+(shebangComment) @keyword.directive
+
+; Keywords
+[
+  "abstract"
+  "external"
+  "for"
+  "is"
+  "let"
+  "new"
+  "out"
+] @keyword
+
+"function" @keyword.function
+
+[
+  "as"
+  "in"
+] @keyword.operator
+
+[
+  "typealias"
+  "class"
+  "module"
+] @keyword.type
+
+[
+  "import"
+  "import*"
+  "amends"
+  "extends"
+] @keyword.import
+
+[
+  "when"
+  "if"
+  "else"
+] @keyword.conditional
+
+(modifier) @keyword.modifier
+
+(importExpr
+  [
+    "import"
+    "import*"
+  ] @function.builtin)
+
+(moduleExpr
+  "module" @type.builtin)
+
+[
+  (outerExpr)
+  "super"
+  (thisExpr)
+] @variable.builtin
+
+[
+  "read"
+  "read?"
+  "read*"
+  "throw"
+  "trace"
+] @function.builtin
+
+(nullLiteralExpr) @constant.builtin
+
+[
+  (falseLiteralExpr)
+  (trueLiteralExpr)
+] @boolean
+
+(newExpr
+  (declaredType
+    (qualifiedIdentifier
+      (identifier) @constructor .)))
diff --git a/runtime/queries/pkl/injections.scm b/runtime/queries/pkl/injections.scm
new file mode 100644
index 000000000..9d563b440
--- /dev/null
+++ b/runtime/queries/pkl/injections.scm
@@ -0,0 +1,6 @@
+([
+  (lineComment)
+  (blockComment)
+  (docComment)
+] @injection.content
+  (#set! injection.language "comment"))

From a98e67ad40e4ac97deee8ea97ce2d1c8c27352cc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 19 Jul 2025 15:00:01 +0200
Subject: [PATCH 2432/2704] fix(wit): update repo url

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 764b96e3c..8c6cd3ace 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -324,7 +324,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` |   | @szebniok
 [wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` |   | @theHamsta
 [wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` |   | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/liamwh/tree-sitter-wit) | unmaintained | `HF J ` |   | @liamwh
+[wit](https://github.com/bytecodealliance/tree-sitter-wit) | unstable | `HF J ` |   | @liamwh
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` |   | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` |   | @ObserverOfTime
 [xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` |   | @ValdezFOmar
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5c611a3f8..b1d21fbd5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2574,10 +2574,10 @@ return {
   wit = {
     install_info = {
       revision = '37bf43c7f11d2b4af7a78d98a19e6d5c2cf04ad2',
-      url = 'https://github.com/liamwh/tree-sitter-wit',
+      url = 'https://github.com/bytecodealliance/tree-sitter-wit',
     },
     maintainers = { '@liamwh' },
-    tier = 3,
+    tier = 2,
   },
   xcompose = {
     install_info = {

From 1e3b7562c2497ec5a9adfa8a2f036cb3da46ec3a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 19 Jul 2025 15:15:04 +0200
Subject: [PATCH 2433/2704] feat(wit)!: update parser and queries

---
 SUPPORTED_LANGUAGES.md             |  2 +-
 lua/nvim-treesitter/parsers.lua    |  4 ++--
 runtime/queries/wit/folds.scm      |  9 ++-------
 runtime/queries/wit/highlights.scm | 23 ++++++++++++++---------
 runtime/queries/wit/injections.scm |  5 ++++-
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 8c6cd3ace..cd6846f25 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -324,7 +324,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` |   | @szebniok
 [wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` |   | @theHamsta
 [wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` |   | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/bytecodealliance/tree-sitter-wit) | unstable | `HF J ` |   | @liamwh
+[wit](https://github.com/bytecodealliance/tree-sitter-wit) | unstable | `HF J ` |   | @mkatychev
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` |   | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` |   | @ObserverOfTime
 [xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` |   | @ValdezFOmar
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b1d21fbd5..aa9009430 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2573,10 +2573,10 @@ return {
   },
   wit = {
     install_info = {
-      revision = '37bf43c7f11d2b4af7a78d98a19e6d5c2cf04ad2',
+      revision = 'a0fd28afe24511160f0601ab45044690c1cb7d92',
       url = 'https://github.com/bytecodealliance/tree-sitter-wit',
     },
-    maintainers = { '@liamwh' },
+    maintainers = { '@mkatychev' },
     tier = 2,
   },
   xcompose = {
diff --git a/runtime/queries/wit/folds.scm b/runtime/queries/wit/folds.scm
index 7f84ddd2e..d2a12f122 100644
--- a/runtime/queries/wit/folds.scm
+++ b/runtime/queries/wit/folds.scm
@@ -1,11 +1,6 @@
-[
-  (world_items)
-  (world_body)
-  (interface_items)
-  (interface_body)
-] @fold
+(body) @fold
 
-(world_items
+(body
   [
     (use_item)
     (import_item)
diff --git a/runtime/queries/wit/highlights.scm b/runtime/queries/wit/highlights.scm
index 1f4b01cce..6bccf5ba0 100644
--- a/runtime/queries/wit/highlights.scm
+++ b/runtime/queries/wit/highlights.scm
@@ -1,12 +1,10 @@
-(comment) @comment @spell
-
 (ty
   (id)) @type
 
 (package_decl
   (id) @module)
 
-(valid_semver) @string.special
+(version) @string.special
 
 (world_item
   name: (id) @module)
@@ -17,7 +15,7 @@
 (import_item
   name: (id) @module
   (extern_type
-    (interface_body)))
+    (body)))
 
 (import_item
   name: (id) @function
@@ -27,7 +25,7 @@
 (export_item
   name: (id) @module
   (extern_type
-    (interface_body)))
+    (body)))
 
 (export_item
   name: (id) @function
@@ -55,7 +53,7 @@
 (flags_items
   name: (id) @type)
 
-(flags_body
+(body
   (id) @variable.member)
 
 (variant_items
@@ -128,8 +126,6 @@
   "s64"
   "f32"
   "f64"
-  "float32" ; deprecated
-  "float64" ; deprecated
   "char"
   "bool"
   "string"
@@ -163,4 +159,13 @@
   "<"
 ] @punctuation.bracket
 
-"=" @operator
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+(line_comment
+  (doc_comment)) @comment.documentation
+
+(block_comment
+  (doc_comment)) @comment.documentation
diff --git a/runtime/queries/wit/injections.scm b/runtime/queries/wit/injections.scm
index 2f0e58eb6..3cd6aac8e 100644
--- a/runtime/queries/wit/injections.scm
+++ b/runtime/queries/wit/injections.scm
@@ -1,2 +1,5 @@
-((comment) @injection.content
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
   (#set! injection.language "comment"))

From 20d77c2e5ba71315dee7dcf47456557413b1481e Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Thu, 17 Jul 2025 22:12:23 -0400
Subject: [PATCH 2434/2704] fix(jinja): assign highlights to all variables and
 functions

The majority of jinja variables aren't assigned any highlights at all.
Assign @variable to all identifiers.

Jinja filters without parameters are not highlighted as functions: add a
query for these.

Refine the existing @variable.member to only capture identifiers instead
of broader nodes.
---
 runtime/queries/jinja_inline/highlights.scm  | 30 ++++++++++++++++----
 tests/query/highlights/jinja/filters.jinja   | 19 +++++++++++++
 tests/query/highlights/jinja/tests.jinja     | 13 +++++++++
 tests/query/highlights/jinja/variables.jinja | 21 ++++++++++++++
 4 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 tests/query/highlights/jinja/filters.jinja
 create mode 100644 tests/query/highlights/jinja/tests.jinja
 create mode 100644 tests/query/highlights/jinja/variables.jinja

diff --git a/runtime/queries/jinja_inline/highlights.scm b/runtime/queries/jinja_inline/highlights.scm
index 69dba77b3..3a9660471 100644
--- a/runtime/queries/jinja_inline/highlights.scm
+++ b/runtime/queries/jinja_inline/highlights.scm
@@ -71,11 +71,7 @@
   "as"
 ] @keyword.import
 
-(import_statement
-  (identifier) @variable)
-
-(import_as
-  (identifier) @variable)
+(identifier) @variable
 
 [
   "if"
@@ -109,12 +105,34 @@
 
 (expression
   "."
-  (expression)+ @variable.member)
+  (expression
+    (binary_expression
+      .
+      (unary_expression
+        (primary_expression
+          (identifier) @variable.member)))))
+
+(expression
+  "."
+  (expression
+    (binary_expression
+      (binary_expression
+        (unary_expression
+          (primary_expression
+            (identifier) @variable.member))))))
 
 (assignment_expression
   "."
   (identifier)+ @variable.member)
 
+; jinja filters
+(binary_expression
+  (binary_operator
+    "|")
+  (unary_expression
+    (primary_expression
+      (identifier) @function.call)))
+
 (inline_trans
   "_" @function.builtin)
 
diff --git a/tests/query/highlights/jinja/filters.jinja b/tests/query/highlights/jinja/filters.jinja
new file mode 100644
index 000000000..a084cdc1a
--- /dev/null
+++ b/tests/query/highlights/jinja/filters.jinja
@@ -0,0 +1,19 @@
+{{ name|striptags|title }}
+{# ^^^^ @variable #}
+{#      ^^^^^ @function.call #}
+{#                ^^^^^ @function.call #}
+
+{{ listx|join(', ') }}
+{# ^^^^^ @variable #}
+{#       ^^^^ @function.call #}
+{#            ^^^^ @string #}
+
+{{ listx|join(str) }}
+{# ^^^^^ @variable #}
+{#       ^^^^ @function.call #}
+{#            ^^^ @variable.parameter #}
+
+{{ foo.bar|random }}
+{# ^^^ @variable #}
+{#     ^^^ @variable.member #}
+{#         ^^^^^^ @function.call #}
diff --git a/tests/query/highlights/jinja/tests.jinja b/tests/query/highlights/jinja/tests.jinja
new file mode 100644
index 000000000..0a138fb80
--- /dev/null
+++ b/tests/query/highlights/jinja/tests.jinja
@@ -0,0 +1,13 @@
+{% if loop.index is divisibleby 3 %}
+{#    ^^^^ @variable #}
+{#         ^^^^^ @variable.member #}
+{#                  ^^^^^^^^^^ @keyword.operator #}
+
+{% if loop.index is divisibleby(3) %}
+{#    ^^^^ @variable #}
+{#         ^^^^^ @variable.member #}
+
+{% if foo.bar.baz is divisibleby 3 %}
+{#    ^^^ @variable #}
+{#        ^^^ @variable.member #}
+{#            ^^^ @variable.member #}
diff --git a/tests/query/highlights/jinja/variables.jinja b/tests/query/highlights/jinja/variables.jinja
new file mode 100644
index 000000000..1ab78c35a
--- /dev/null
+++ b/tests/query/highlights/jinja/variables.jinja
@@ -0,0 +1,21 @@
+{{ foo }}
+{# ^^^ @variable #}
+
+{{ foo.bar }}
+{# ^^^ @variable #}
+{#     ^^^ @variable.member #}
+
+{{ foo['bar'] }}
+{# ^^^ @variable #}
+{#     ^^^^^ @string #}
+
+{{ foo.bar.baz }}
+{# ^^^ @variable #}
+{#     ^^^ @variable.member #}
+{#         ^^^ @variable.member #}
+
+{{ foo.bar + baz.qux }}
+{# ^^^ @variable #}
+{#     ^^^ @variable.member #}
+{#           ^^^ @variable #}
+{#               ^^^ @variable.member #}

From d6bce02b89eb8f0d7ef4b128238d03a87aaf584b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 20 Jul 2025 11:38:50 +0200
Subject: [PATCH 2435/2704] feat(parsers): update beancount, brightscript,
 enforce, gdscript, gpg, groq, matlab, mlir, nix, pem, pymanifest, t32, udev,
 vhdl

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index aa9009430..3710da058 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,7 +93,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = '97b46e5f37aa9030e9701c816e20760760ab4907',
+      revision = 'b8309e6856fe207f0425efa4f7a1d1f27890f8e8',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -150,7 +150,7 @@ return {
   },
   brightscript = {
     install_info = {
-      revision = '48ce1687125c6dfefcc7a1bef19fa0f0f00426cc',
+      revision = '55168264ea174085d2e91377a33f216190df2f51',
       url = 'https://github.com/ajdelcimmuto/tree-sitter-brightscript',
     },
     maintainers = { '@ajdelcimmuto' },
@@ -512,7 +512,7 @@ return {
   },
   enforce = {
     install_info = {
-      revision = '8e4c84144153deaf2b8461def43126cea6790020',
+      revision = 'a194046e64bdec2c9e2e1a7caa35326387f78b95',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
@@ -652,7 +652,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = 'cfe20d13767bdede420a6349077fc7dca11c9ad1',
+      revision = 'c370d711dc9ead679d40bb7e9364ceed0b3bfc28',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -827,7 +827,7 @@ return {
   },
   gpg = {
     install_info = {
-      revision = '63e80cfe1302da9f9c7ee8d9df295f47d7d181bf',
+      revision = '50482a322cf1fa00dfe327ef8b00e4607eeeaa1d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gpg-config',
     },
     maintainers = { '@ObserverOfTime' },
@@ -859,7 +859,7 @@ return {
   },
   groq = {
     install_info = {
-      revision = '9959049ddeb4416101653a071ee923ba9f7a5cb1',
+      revision = '1fa1ab0eb391a270957e8ad8c731b492e3645649',
       url = 'https://github.com/ajrussellaudio/tree-sitter-groq',
     },
     maintainers = { '@ajrussellaudio' },
@@ -1367,7 +1367,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'c9abaedbc342e6c421fd37d8aa4d43389da0834a',
+      revision = 'dfed7b4bc548f2c036837c3e7e09cae7d1835289',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '98b7d2c6d69c0c83e44386a40ede09924e658189',
+      revision = 'e2818d616fc43cbbba316723cbd68a53c66a2704',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1463,7 +1463,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'bae4c4fb39a4cc87a838817c5e2da7effac75183',
+      revision = 'ea1d87f7996be1329ef6555dcacfa63a69bd55c6',
       url = 'https://github.com/cstrahan/tree-sitter-nix',
     },
     maintainers = { '@leo60228' },
@@ -1556,7 +1556,7 @@ return {
   },
   pem = {
     install_info = {
-      revision = '1d16b8e063fdf4385e389096c4bc4999eaaef05f',
+      revision = '7374eab76f2caae02396721850f87af437b66c06',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-pem',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1763,7 +1763,7 @@ return {
   },
   pymanifest = {
     install_info = {
-      revision = 'be062582956165019d3253794b4d712f66dfeaaa',
+      revision = 'debbdb83fe6356adc7261c41c69b45ba49c97294',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-pymanifest',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2241,7 +2241,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '2fcca1fd8d84c582478f1aebca7c8379346f3a04',
+      revision = '335e5533de72a4ac8c6763958df1befbdc855a30',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2433,7 +2433,7 @@ return {
   },
   udev = {
     install_info = {
-      revision = '18a1d183c4c0cc40438bae2ebf8191aaf2dee8dc',
+      revision = '2fcb563a4d56a6b8e8c129252325fc6335e4acbf',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-udev',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2499,7 +2499,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = 'eacafa5d612fdea1d12332fe0f83e089e5571cf3',
+      revision = 'edf824ba11b445b7e43827587e83716b34b30fe5',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },

From afe267b50e72ce2f79d8ae9f7693b8290e8a15ef Mon Sep 17 00:00:00 2001
From: Jonas Chevalier <zimbatm@zimbatm.com>
Date: Sun, 20 Jul 2025 11:50:56 +0200
Subject: [PATCH 2436/2704] chore(nix): update url and maintainers

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index cd6846f25..a6ff7cd52 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -191,7 +191,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [nim](https://github.com/alaviss/tree-sitter-nim) | unstable | `HF JL` |   | @aMOPel
 [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | unstable | `H  J ` |   | @aMOPel
 [ninja](https://github.com/alemuller/tree-sitter-ninja) | unstable | `HFIJ ` |   | @alemuller
-[nix](https://github.com/cstrahan/tree-sitter-nix) | unstable | `HFIJL` |   | @leo60228
+[nix](https://github.com/nix-community/tree-sitter-nix) | unstable | `HFIJL` |   | @leo60228, @zimbatm
 [nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | unstable | `HFIJL` |   | @amaanq
 [nu](https://github.com/nushell/tree-sitter-nu) | unstable | `HFIJ ` |   | @abhisheksingh0x558
 [objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | unstable | `HFIJL` |   | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3710da058..7680de928 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1464,9 +1464,9 @@ return {
   nix = {
     install_info = {
       revision = 'ea1d87f7996be1329ef6555dcacfa63a69bd55c6',
-      url = 'https://github.com/cstrahan/tree-sitter-nix',
+      url = 'https://github.com/nix-community/tree-sitter-nix',
     },
-    maintainers = { '@leo60228' },
+    maintainers = { '@leo60228', '@zimbatm' },
     tier = 2,
   },
   nqc = {

From f14b356d548eafb6e0270aad904907424e16f9cd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 20 Jul 2025 11:47:34 +0200
Subject: [PATCH 2437/2704] feat(chatito)!: update parser and queries

node `(eq)` is replaced by field `eq: _`
---
 lua/nvim-treesitter/parsers.lua        | 2 +-
 runtime/queries/chatito/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7680de928..034a59a7e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -206,7 +206,7 @@ return {
   },
   chatito = {
     install_info = {
-      revision = 'b4cbe9ab7672d5106e9550d8413835395a1be362',
+      revision = '433a7a150da013f380d2bd435e0c4373f7f4481c',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-chatito',
     },
     maintainers = { '@ObserverOfTime' },
diff --git a/runtime/queries/chatito/highlights.scm b/runtime/queries/chatito/highlights.scm
index 47113f2cf..e756064b3 100644
--- a/runtime/queries/chatito/highlights.scm
+++ b/runtime/queries/chatito/highlights.scm
@@ -11,7 +11,7 @@
 
 "," @punctuation.delimiter
 
-(eq) @operator
+eq: _ @operator
 
 ([
   "\""

From d116118addd7444e7bd1b65a50de2d25bec32d28 Mon Sep 17 00:00:00 2001
From: MeanderingProgrammer <meanderingprogrammer@gmail.com>
Date: Wed, 9 Jul 2025 15:39:16 -0700
Subject: [PATCH 2438/2704] fix(install): don't make "installed" status
 persistent

Problem: Setting `install_status` to "installed" skips any future
install or update operation (even if forced). In particular, this breaks
`:TSUpdate` when calling `install()` in config files.

Solution: Don't set "installed" when skipping install and clear status
on successful operations.
---
 lua/nvim-treesitter/install.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c179600b6..233ea83fe 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -456,7 +456,6 @@ local install_status = {} ---@type table<string,InstallStatus?>
 ---@return InstallStatus status
 local function install_lang(lang, cache_dir, install_dir, force, generate)
   if not force and vim.list_contains(config.get_installed(), lang) then
-    install_status[lang] = 'installed'
     return 'installed'
   end
 
@@ -475,6 +474,7 @@ local function install_lang(lang, cache_dir, install_dir, force, generate)
 
   local status = install_status[lang]
   assert(status and status ~= 'installing')
+  install_status[lang] = nil
   return status
 end
 
@@ -570,7 +570,6 @@ end)
 ---@return string? err
 local function uninstall_lang(logger, lang, parser, queries)
   logger:debug('Uninstalling ' .. lang)
-  install_status[lang] = nil
 
   if fn.filereadable(parser) == 1 then
     logger:debug('Unlinking ' .. parser)

From 3650b4ef6a0c2eff49d59db6d30b2549557447a4 Mon Sep 17 00:00:00 2001
From: MeanderingProgrammer <meanderingprogrammer@gmail.com>
Date: Sun, 20 Jul 2025 15:36:06 -0700
Subject: [PATCH 2439/2704] refactor(install): replace status enum with boolean

---
 lua/nvim-treesitter/install.lua | 40 +++++++++++----------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 233ea83fe..6d672908a 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -439,13 +439,7 @@ local function try_install_lang(lang, cache_dir, install_dir, generate)
   logger:info('Language installed')
 end
 
----@alias InstallStatus
---- | 'installing'
---- | 'installed'
---- | 'failed'
---- | 'timeout'
-
-local install_status = {} ---@type table<string,InstallStatus?>
+local installing = {} ---@type table<string,boolean?>
 
 ---@async
 ---@param lang string
@@ -453,29 +447,21 @@ local install_status = {} ---@type table<string,InstallStatus?>
 ---@param install_dir string
 ---@param force? boolean
 ---@param generate? boolean
----@return InstallStatus status
+---@return boolean success
 local function install_lang(lang, cache_dir, install_dir, force, generate)
   if not force and vim.list_contains(config.get_installed(), lang) then
-    return 'installed'
-  end
-
-  if install_status[lang] then
-    if install_status[lang] == 'installing' then
-      vim.wait(INSTALL_TIMEOUT, function()
-        return install_status[lang] ~= 'installing'
-      end)
-      install_status[lang] = 'timeout'
-    end
+    return true
+  elseif installing[lang] then
+    local success = vim.wait(INSTALL_TIMEOUT, function()
+      return not installing[lang]
+    end)
+    return success
   else
-    install_status[lang] = 'installing'
+    installing[lang] = true
     local err = try_install_lang(lang, cache_dir, install_dir, generate)
-    install_status[lang] = err and 'failed' or 'installed'
+    installing[lang] = nil
+    return not err
   end
-
-  local status = install_status[lang]
-  assert(status and status ~= 'installing')
-  install_status[lang] = nil
-  return status
 end
 
 --- Reload the parser table and user modifications in case of update
@@ -511,8 +497,8 @@ local function install(languages, options)
   for _, lang in ipairs(languages) do
     tasks[#tasks + 1] = a.async(--[[@async]] function()
       a.schedule()
-      local status = install_lang(lang, cache_dir, install_dir, options.force, options.generate)
-      if status ~= 'failed' then
+      local success = install_lang(lang, cache_dir, install_dir, options.force, options.generate)
+      if success then
         done = done + 1
       end
     end)

From 6b3bf164b207a8d1e80dffa9c5b64f8ddbd7d585 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 21 Jul 2025 03:40:37 -0400
Subject: [PATCH 2440/2704] feat(glimmer): add fold queries  (#8020)

---
 SUPPORTED_LANGUAGES.md                       | 4 ++--
 runtime/queries/glimmer_javascript/folds.scm | 1 +
 runtime/queries/glimmer_typescript/folds.scm | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/glimmer_javascript/folds.scm
 create mode 100644 runtime/queries/glimmer_typescript/folds.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index a6ff7cd52..7a7f23505 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -101,8 +101,8 @@ ecma (queries only)[^ecma] | unstable | `HFIJL` |   | @steelsojka
 [gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | unstable | `H  J ` |   | @theHamsta
 [gleam](https://github.com/gleam-lang/tree-sitter-gleam) | unstable | `HFIJL` |   | @amaanq
 [glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | unstable | `HFIJL` |   | @NullVoxPopuli
-[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | unstable | `H IJL` |   | @NullVoxPopuli
-[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | unstable | `H IJ ` |   | @NullVoxPopuli
+[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | unstable | `HFIJL` |   | @NullVoxPopuli
+[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | unstable | `HFIJ ` |   | @NullVoxPopuli
 [glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | unstable | `HFIJL` |   | @theHamsta
 [gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | unstable | `HFIJL` |   | @amaanq
 [gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | unstable | `H  J ` |   | @dpezto
diff --git a/runtime/queries/glimmer_javascript/folds.scm b/runtime/queries/glimmer_javascript/folds.scm
new file mode 100644
index 000000000..04328f099
--- /dev/null
+++ b/runtime/queries/glimmer_javascript/folds.scm
@@ -0,0 +1 @@
+; inherits: ecma
diff --git a/runtime/queries/glimmer_typescript/folds.scm b/runtime/queries/glimmer_typescript/folds.scm
new file mode 100644
index 000000000..1b61e36da
--- /dev/null
+++ b/runtime/queries/glimmer_typescript/folds.scm
@@ -0,0 +1 @@
+; inherits: typescript

From 8c8742871a1489afd7878bfee4bc40465f4a116a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Jul 2025 11:00:40 +0200
Subject: [PATCH 2441/2704] fix(jinja): remove crashing pattern

https://github.com/cathaysia/tree-sitter-jinja/issues/37
---
 runtime/queries/jinja_inline/highlights.scm | 16 ++++++++--------
 tests/query/highlights/jinja/filters.jinja  | 19 -------------------
 2 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 tests/query/highlights/jinja/filters.jinja

diff --git a/runtime/queries/jinja_inline/highlights.scm b/runtime/queries/jinja_inline/highlights.scm
index 3a9660471..c072eea66 100644
--- a/runtime/queries/jinja_inline/highlights.scm
+++ b/runtime/queries/jinja_inline/highlights.scm
@@ -125,14 +125,14 @@
   "."
   (identifier)+ @variable.member)
 
-; jinja filters
-(binary_expression
-  (binary_operator
-    "|")
-  (unary_expression
-    (primary_expression
-      (identifier) @function.call)))
-
+; crashes parser: https://github.com/cathaysia/tree-sitter-jinja/issues/37
+; ; jinja filters
+; (binary_expression
+;   (binary_operator
+;     "|")
+;   (unary_expression
+;     (primary_expression
+;       (identifier) @function.call)))
 (inline_trans
   "_" @function.builtin)
 
diff --git a/tests/query/highlights/jinja/filters.jinja b/tests/query/highlights/jinja/filters.jinja
deleted file mode 100644
index a084cdc1a..000000000
--- a/tests/query/highlights/jinja/filters.jinja
+++ /dev/null
@@ -1,19 +0,0 @@
-{{ name|striptags|title }}
-{# ^^^^ @variable #}
-{#      ^^^^^ @function.call #}
-{#                ^^^^^ @function.call #}
-
-{{ listx|join(', ') }}
-{# ^^^^^ @variable #}
-{#       ^^^^ @function.call #}
-{#            ^^^^ @string #}
-
-{{ listx|join(str) }}
-{# ^^^^^ @variable #}
-{#       ^^^^ @function.call #}
-{#            ^^^ @variable.parameter #}
-
-{{ foo.bar|random }}
-{# ^^^ @variable #}
-{#     ^^^ @variable.member #}
-{#         ^^^^^^ @function.call #}

From 40cca05b40438ddd74125132b0cec58c9afdccb2 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 21 Jul 2025 19:09:00 -0700
Subject: [PATCH 2442/2704] fix(c, ecma): remove invalid predicate parameters

These are not valid named nodes in their respective languages.
---
 runtime/queries/c/highlights.scm | 2 +-
 runtime/queries/ecma/indents.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index ea65075f2..442343abf 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -149,7 +149,7 @@
 
 ((field_expression
   (field_identifier) @property) @_parent
-  (#not-has-parent? @_parent template_method function_declarator call_expression))
+  (#not-has-parent? @_parent function_declarator call_expression))
 
 (field_designator) @property
 
diff --git a/runtime/queries/ecma/indents.scm b/runtime/queries/ecma/indents.scm
index d56741670..b613426ee 100644
--- a/runtime/queries/ecma/indents.scm
+++ b/runtime/queries/ecma/indents.scm
@@ -33,11 +33,11 @@
 
 (assignment_expression
   right: (_) @_right
-  (#not-kind-eq? @_right "arrow_function" "function")) @indent.begin
+  (#not-kind-eq? @_right "arrow_function")) @indent.begin
 
 (variable_declarator
   value: (_) @_value
-  (#not-kind-eq? @_value "arrow_function" "call_expression" "function")) @indent.begin
+  (#not-kind-eq? @_value "arrow_function" "call_expression")) @indent.begin
 
 (arguments
   ")" @indent.end)

From 5d539943c6a8b7e4aa7c77c7b79517f07be5454f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 23 Jul 2025 13:30:47 +0200
Subject: [PATCH 2443/2704] feat(parsers): update angular, beancount, fennel,
 gleam, idl, javadoc, jinja, jinja_inline, koto, llvm, swift, systemverilog,
 tera, vhdl

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 034a59a7e..8e55982ec 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '93bb92f1289b7fe765da6cc747c82ccdc0afeb8d',
+      revision = 'd1f24a8890462cb740909ff62a3a079cded288bc',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -93,7 +93,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = 'b8309e6856fe207f0425efa4f7a1d1f27890f8e8',
+      revision = 'b7a2557e6c8cf1dc70a52cece1861522ad3903fc',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -544,7 +544,7 @@ return {
   },
   fennel = {
     install_info = {
-      revision = 'de06b9ad366f0186080056109a8c3be980129538',
+      revision = 'cf7c000d934f2ff0a282a2c276b1f72e7fb2a099',
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
     maintainers = { '@alexmozaidze' },
@@ -709,7 +709,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '21e0e7ba6f4f60ee80934cb368aa13c00d370734',
+      revision = 'dae1551a9911b24f41d876c23f2ab05ece0a9d4c',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -1019,7 +1019,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = 'd5d7f57dd303b35169bd38c3a2268a24d3d76e38',
+      revision = 'fb1bd480b84a5b75a0c7a44a8fed45c4fe2d9247',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '51cbb3daa9b8a5ba9d6467db40ef45682a06811f',
+      revision = 'de50fbed2cc4c83e5fa2ec2d4231496e06d55e32',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1093,7 +1093,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '251101981d86ccb2901741eddf3e7cf21567a66d',
+      revision = '129184fb7bbc2d3e29967002432a869ac3758f2e',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1104,7 +1104,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '251101981d86ccb2901741eddf3e7cf21567a66d',
+      revision = '129184fb7bbc2d3e29967002432a869ac3758f2e',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1215,7 +1215,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = 'c379c2c0fdc68e56bb1efe0d933b8fcdf9ff203c',
+      revision = '2ffc77c14f0ac1674384ff629bfc207b9c57ed89',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1288,7 +1288,7 @@ return {
   },
   llvm = {
     install_info = {
-      revision = 'badf46daedc7b469f5e849b53f2fb34e881962f1',
+      revision = '00c5389a4598e1dce66fbc3b3d34733d308f2751',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
@@ -2209,7 +2209,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '370a4261d702c51d5d830b06bd4c25e44677d01b',
+      revision = 'fc65dc2cc87047c3a45f1d26cce79ab9062a4881',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2233,7 +2233,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = 'e5a589a76ce480db5a939ad4a4393c398eed35e9',
+      revision = '140a6d96aa753f550d01c0d6c95dbf7c0cfae3fb',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2290,7 +2290,7 @@ return {
   },
   tera = {
     install_info = {
-      revision = 'c0a0ebcd70a0e6a9f9ec1157308e4e0ea18b446e',
+      revision = '692937d52c8dfd91ce0dde722b9b4febbc9bc712',
       url = 'https://github.com/uncenter/tree-sitter-tera',
     },
     maintainers = { '@uncenter' },
@@ -2499,7 +2499,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = 'edf824ba11b445b7e43827587e83716b34b30fe5',
+      revision = '73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },

From 57aa15d4cc6f6459f7f8d864d16f970eb801faff Mon Sep 17 00:00:00 2001
From: MeanderingProgrammer <meanderingprogrammer@gmail.com>
Date: Thu, 24 Jul 2025 14:41:44 -0700
Subject: [PATCH 2444/2704] fix(install): skip duplicate dependencies

---
 lua/nvim-treesitter/config.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 9a586b7b5..09ea2b7dc 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -164,7 +164,8 @@ function M.norm_languages(languages, skip)
     end
   end
 
-  return languages
+  table.sort(languages)
+  return vim.fn.uniq(languages) --[=[@as string[]]=]
 end
 
 return M

From 12be0e9f245398b51d85927e6ed514222132aa0a Mon Sep 17 00:00:00 2001
From: Igor <igorlfs@ufmg.br>
Date: Thu, 24 Jul 2025 18:59:16 -0300
Subject: [PATCH 2445/2704] fix(ini): register dosini and confini filetypes

---
 plugin/filetypes.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index ecddea292..a7bb3bcc0 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -21,6 +21,7 @@ local filetypes = {
   haskell = { 'hs' },
   haskell_persistent = { 'haskellpersistent' },
   idris = { 'idris2' },
+  ini = { 'confini', 'dosini' },
   janet_simple = { 'janet' },
   javascript = { 'javascriptreact', 'ecma', 'ecmascript', 'jsx', 'js' },
   javascript_glimmer = { 'javascript.glimmer' },

From b26b4258294c742c2613a7d98fe53014d1c8fe49 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 26 Jul 2025 17:30:10 +0200
Subject: [PATCH 2446/2704] feat(parsers): update gdscript, javadoc, lua,
 solidity, superhtml, systemverilog, zig, ziggy, ziggy_schema

---
 lua/nvim-treesitter/parsers.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8e55982ec..97d8c00f0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -652,7 +652,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = 'c370d711dc9ead679d40bb7e9364ceed0b3bfc28',
+      revision = '8d30b8dbb84a5f786b93726dca158ae8ea3c413f',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'de50fbed2cc4c83e5fa2ec2d4231496e06d55e32',
+      revision = 'c0d918967afc2f4d3e2276a75722e1b268730855',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1296,7 +1296,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = 'e5e406935ff3e36529545955e2972646ed97f9e2',
+      revision = 'd76023017f7485eae629cb60d406c7a1ca0f40c9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -2075,7 +2075,7 @@ return {
   },
   solidity = {
     install_info = {
-      revision = 'd38dcd0b58b223c43e3f9265914fb3167dc624c6',
+      revision = '322a3ddffca3ed96e559003fd03fa9881d7b4e20',
       url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
@@ -2175,7 +2175,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = 'a67317fb81afe76cc04e6d92124cfc20a903cee7',
+      revision = '8bb212b1044b4740c14bc73b649adab58a0cb481',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2233,7 +2233,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '140a6d96aa753f550d01c0d6c95dbf7c0cfae3fb',
+      revision = 'b2c95d30954fbd3cf9be6d96a3ad82e023c2fa12',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2639,7 +2639,7 @@ return {
   },
   zig = {
     install_info = {
-      revision = 'b670c8df85a1568f498aa5c8cae42f51a90473c0',
+      revision = 'b71affffdb4222ff2d2dea6e164f76603b0be6bc',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
     },
     maintainers = { '@amaanq' },
@@ -2648,7 +2648,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = 'de703372b2da6fd2c25a8a3c424663ff6bece4ac',
+      revision = 'e95c85cb58773c43e9d94c0b9422ae84697e68a1',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2657,7 +2657,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = 'de703372b2da6fd2c25a8a3c424663ff6bece4ac',
+      revision = 'e95c85cb58773c43e9d94c0b9422ae84697e68a1',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },

From 3561e1fb19bcd9f03ba074d769a8a78d01717b19 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 1 Aug 2025 18:01:39 +0200
Subject: [PATCH 2447/2704] feat(parsers): update ada, fortran, idl, javadoc,
 matlab, nim, powershell, slang, superhtml, swift, templ

---
 lua/nvim-treesitter/parsers.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 97d8c00f0..6a2ac8f4c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2,7 +2,7 @@
 return {
   ada = {
     install_info = {
-      revision = 'e8e2515465cc2d7c444498e68bdb9f1d86767f95',
+      revision = '0a4c27dc1308a9d2742de22e5fcfc0c137b3d3f3',
       url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '7021f9f0f44bbcb7c646b594b6ef8db3ed787f8e',
+      revision = '8334abca785db3a041292e3b3b818a82a55b238f',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -1019,7 +1019,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = 'fb1bd480b84a5b75a0c7a44a8fed45c4fe2d9247',
+      revision = '777b39538f9dc4ece1d891733bb4c91fc0627b16',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'c0d918967afc2f4d3e2276a75722e1b268730855',
+      revision = '26ef3becea1ff51f0025a8e0c38a6b3a39c09341',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1367,7 +1367,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'dfed7b4bc548f2c036837c3e7e09cae7d1835289',
+      revision = '2d30fdbb8fc7ec55d2fbf05172437ff0299878a5',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1438,7 +1438,7 @@ return {
   },
   nim = {
     install_info = {
-      revision = '9ed4696d7f76e4937e2b63512a249a3ead7a0399',
+      revision = '4ad352773688deb84a95eeaa9872acda5b466439',
       url = 'https://github.com/alaviss/tree-sitter-nim',
     },
     maintainers = { '@aMOPel' },
@@ -1653,7 +1653,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = 'b59f9dd34f17998139877316995e796073faf84b',
+      revision = '96ab1da05cfb55b52ee7000b4be8a4b6fad232f5',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -2026,7 +2026,7 @@ return {
   },
   slang = {
     install_info = {
-      revision = 'a4454e3004a9e8fea2df7fd2535fbaa05500da21',
+      revision = '5b0adf65710c3a7c265f0451ed6b4789410cbe63',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
     maintainers = { '@theHamsta' },
@@ -2175,7 +2175,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '8bb212b1044b4740c14bc73b649adab58a0cb481',
+      revision = 'c6111e7134c64b69a2934ccbba83460cb532d442',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2209,7 +2209,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'fc65dc2cc87047c3a45f1d26cce79ab9062a4881',
+      revision = '78d84ef82c387fceeb6094038da28717ea052e39',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2282,7 +2282,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = 'a35a02cb608291ac8c12082dcbd2b5f34a7ad45f',
+      revision = '47594c5cbef941e6a3ccf4ddb934a68cf4c68075',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },

From 05f29103552dcdd7faa77ce7c5152759c733f988 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 1 Aug 2025 18:15:49 +0200
Subject: [PATCH 2448/2704] feat(systemverilog)!: update parser and queries

Breaking changes:
1. `(comment)` node split into `(one_line_comment)` and
   `(block_comment)`
2. named `(directive_foo)` nodes replaced by anonymous `"'foo"`
   (with backtick!) nodes -- but not consistently
---
 lua/nvim-treesitter/parsers.lua              |  2 +-
 runtime/queries/systemverilog/highlights.scm | 32 ++++++++++----------
 runtime/queries/systemverilog/injections.scm |  5 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6a2ac8f4c..a79361c15 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2233,7 +2233,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = 'b2c95d30954fbd3cf9be6d96a3ad82e023c2fa12',
+      revision = '3bd2c5d2f60ed7b07c2177b34e2976ad9a87c659',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
diff --git a/runtime/queries/systemverilog/highlights.scm b/runtime/queries/systemverilog/highlights.scm
index 1e004ef76..21542941f 100644
--- a/runtime/queries/systemverilog/highlights.scm
+++ b/runtime/queries/systemverilog/highlights.scm
@@ -234,10 +234,13 @@
 [
   "include"
   "import"
-  "directive_include"
+  "`include"
 ] @keyword.import
 
-(comment) @comment @spell
+[
+  (one_line_comment)
+  (block_comment)
+] @comment @spell
 
 [
   "@"
@@ -300,9 +303,6 @@ port_name: (simple_identifier) @variable
 (net_decl_assignment
   (simple_identifier) @variable)
 
-(ERROR
-  (simple_identifier) @variable)
-
 ; variable.member
 (hierarchical_identifier
   (simple_identifier)
@@ -570,17 +570,17 @@ c_name: (c_identifier) @function
 
 ; directive
 [
-  "directive_define"
-  "directive_default_nettype"
-  "directive_resetall"
-  "directive_timescale"
-  "directive_undef"
-  "directive_undefineall"
-  "directive_ifdef"
-  "directive_ifndef"
-  "directive_elsif"
-  "directive_endif"
-  "directive_else"
+  "`define"
+  "`default_nettype"
+  (resetall_compiler_directive)
+  "`timescale"
+  "`undef"
+  (undefineall_compiler_directive)
+  "`ifdef"
+  "`ifndef"
+  "`elsif"
+  "`endif"
+  "`else"
 ] @keyword.directive.define
 
 (include_compiler_directive
diff --git a/runtime/queries/systemverilog/injections.scm b/runtime/queries/systemverilog/injections.scm
index 05aa24d8f..a6f3ca45e 100644
--- a/runtime/queries/systemverilog/injections.scm
+++ b/runtime/queries/systemverilog/injections.scm
@@ -1,4 +1,7 @@
-((comment) @injection.content
+([
+  (one_line_comment)
+  (block_comment)
+] @injection.content
   (#set! injection.language "comment"))
 
 ((macro_text) @injection.content

From a4fa3e2d187ad98eb74d27c566ab3c330397ed75 Mon Sep 17 00:00:00 2001
From: Robert Muir <rcmuir@apache.org>
Date: Mon, 21 Jul 2025 11:49:54 -0400
Subject: [PATCH 2449/2704] Revert "fix(jinja): remove crashing pattern"

This reverts commit 8c8742871a1489afd7878bfee4bc40465f4a116a.
---
 runtime/queries/jinja_inline/highlights.scm | 16 ++++++++--------
 tests/query/highlights/jinja/filters.jinja  | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 tests/query/highlights/jinja/filters.jinja

diff --git a/runtime/queries/jinja_inline/highlights.scm b/runtime/queries/jinja_inline/highlights.scm
index c072eea66..3a9660471 100644
--- a/runtime/queries/jinja_inline/highlights.scm
+++ b/runtime/queries/jinja_inline/highlights.scm
@@ -125,14 +125,14 @@
   "."
   (identifier)+ @variable.member)
 
-; crashes parser: https://github.com/cathaysia/tree-sitter-jinja/issues/37
-; ; jinja filters
-; (binary_expression
-;   (binary_operator
-;     "|")
-;   (unary_expression
-;     (primary_expression
-;       (identifier) @function.call)))
+; jinja filters
+(binary_expression
+  (binary_operator
+    "|")
+  (unary_expression
+    (primary_expression
+      (identifier) @function.call)))
+
 (inline_trans
   "_" @function.builtin)
 
diff --git a/tests/query/highlights/jinja/filters.jinja b/tests/query/highlights/jinja/filters.jinja
new file mode 100644
index 000000000..a084cdc1a
--- /dev/null
+++ b/tests/query/highlights/jinja/filters.jinja
@@ -0,0 +1,19 @@
+{{ name|striptags|title }}
+{# ^^^^ @variable #}
+{#      ^^^^^ @function.call #}
+{#                ^^^^^ @function.call #}
+
+{{ listx|join(', ') }}
+{# ^^^^^ @variable #}
+{#       ^^^^ @function.call #}
+{#            ^^^^ @string #}
+
+{{ listx|join(str) }}
+{# ^^^^^ @variable #}
+{#       ^^^^ @function.call #}
+{#            ^^^ @variable.parameter #}
+
+{{ foo.bar|random }}
+{# ^^^ @variable #}
+{#     ^^^ @variable.member #}
+{#         ^^^^^^ @function.call #}

From 4d9916e477e5d4e3b245845dfd285edf429f3252 Mon Sep 17 00:00:00 2001
From: Robert Muir <rcmuir@apache.org>
Date: Mon, 21 Jul 2025 11:53:16 -0400
Subject: [PATCH 2450/2704] fix(jinja_inline): fix crashing query pattern

If jinja_inline parser is regenerated, then this pattern hits an
"impossible" assert in tree-sitter query processing.
---
 runtime/queries/jinja_inline/highlights.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/jinja_inline/highlights.scm b/runtime/queries/jinja_inline/highlights.scm
index 3a9660471..b66d7fb2e 100644
--- a/runtime/queries/jinja_inline/highlights.scm
+++ b/runtime/queries/jinja_inline/highlights.scm
@@ -127,11 +127,11 @@
 
 ; jinja filters
 (binary_expression
-  (binary_operator
-    "|")
+  (binary_operator) @_operator
   (unary_expression
     (primary_expression
-      (identifier) @function.call)))
+      (identifier) @function.call))
+  (#eq? @_operator "|"))
 
 (inline_trans
   "_" @function.builtin)

From 37bcfdc6eba87334b58f43a19528751d3fe12f4e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 6 Aug 2025 13:16:08 +0200
Subject: [PATCH 2451/2704] refactor(config): prefer `vim.list.unique` for
 normalization

Also fix some emmyluals warnings
---
 lua/nvim-treesitter/config.lua  | 11 ++++++++---
 lua/nvim-treesitter/indent.lua  |  3 ++-
 lua/nvim-treesitter/install.lua |  2 ++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 09ea2b7dc..8150ad8a8 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -69,7 +69,7 @@ function M.get_available(tier)
     languages = vim.tbl_filter(
       --- @param p string
       function(p)
-        return parsers[p].tier == tier
+        return parsers[p] ~= nil and parsers[p].tier == tier
       end,
       languages
     )
@@ -164,8 +164,13 @@ function M.norm_languages(languages, skip)
     end
   end
 
-  table.sort(languages)
-  return vim.fn.uniq(languages) --[=[@as string[]]=]
+  -- TODO(clason): remove Nvim 0.11 compat
+  if vim.list then
+    return vim.list.unique(languages)
+  else
+    table.sort(languages)
+    return vim.fn.uniq(languages) --[=[@as string[] ]=]
+  end
 end
 
 return M
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 13f7b2740..6f8e4d8ff 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -52,7 +52,8 @@ local function find_delimiter(bufnr, node, delimiter)
       local end_char = { child:end_() }
       local trimmed_after_delim
       local escaped_delimiter = delimiter:gsub('[%-%.%+%[%]%(%)%$%^%%%?%*]', '%%%1')
-      trimmed_after_delim = line:sub(end_char[2] + 1):gsub('[%s' .. escaped_delimiter .. ']*', '')
+      trimmed_after_delim =
+        assert(line):sub(end_char[2] + 1):gsub('[%s' .. escaped_delimiter .. ']*', '')
       return child, #trimmed_after_delim == 0
     end
   end
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 6d672908a..29c91356c 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -40,6 +40,7 @@ end
 
 ---@async
 ---@param path string
+---@return string? err
 local function rmpath(path)
   local stat = uv.fs_lstat(path)
   if not stat then
@@ -482,6 +483,7 @@ end
 ---@async
 ---@param languages string[]
 ---@param options? InstallOptions
+---@return boolean true if installation successful
 local function install(languages, options)
   options = options or {}
 

From 4eb35c03443742a4c3b2db13d36da9cddb6268c3 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 6 Aug 2025 09:44:56 -0700
Subject: [PATCH 2452/2704] feat(gdscript): misc operators, semicolon highlight

---
 runtime/queries/gdscript/highlights.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/runtime/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
index d7d3a648c..f3fd3b62f 100644
--- a/runtime/queries/gdscript/highlights.scm
+++ b/runtime/queries/gdscript/highlights.scm
@@ -148,6 +148,7 @@
   ","
   "."
   ":"
+  ";"
 ] @punctuation.delimiter
 
 [
@@ -171,6 +172,7 @@
   "~"
   "-"
   "*"
+  "**"
   "/"
   "%"
   "+"
@@ -193,10 +195,13 @@
   "+="
   "-="
   "*="
+  "**="
   "/="
   "%="
   "&="
   "|="
+  "<<="
+  ">>="
   "->"
 ] @operator
 

From 9866036ec3c5db40700a9178494e0cfdcfe6ecfd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 8 Aug 2025 10:09:54 +0200
Subject: [PATCH 2453/2704] feat(parsers): update c3, c_sharp, desktop,
 editorconfig, fennel, gdshader, javadoc, llvm, matlab, nix, perl, scala,
 solidity, superhtml, xresource

---
 lua/nvim-treesitter/parsers.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a79361c15..2cb92ef3b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '5abce05689bf46999c17bd0dcda2f75b8de61d0d',
+      revision = 'be8c7fcfb424a93f541ebd21d23611b92dff0444',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -174,7 +174,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = 'b5eb5742f6a7e9438bee22ce8026d6b927be2cd7',
+      revision = '3431444351c871dffb32654f1299a00019280f2f',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'deb91f587c97814058aea2cbd790e0b85c9bb361',
+      revision = '8d6931b05ccc70eb4f88b384524ea5dd3d795958',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '8ed36589b5d0b3ebfdba45e1fd0ebefa01aafaea',
+      revision = '2d92f8bb8304d0b56883bb9df8f17cb351a07cc3',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -544,7 +544,7 @@ return {
   },
   fennel = {
     install_info = {
-      revision = 'cf7c000d934f2ff0a282a2c276b1f72e7fb2a099',
+      revision = '653c8abc72d1415cb85e032108d39022feb460be',
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
     maintainers = { '@alexmozaidze' },
@@ -661,7 +661,7 @@ return {
   },
   gdshader = {
     install_info = {
-      revision = 'ffd9f958df13cae04593781d7d2562295a872455',
+      revision = '14e834063e136fa69b6d91f711f4f1981acf424b',
       url = 'https://github.com/GodOfAvacyn/tree-sitter-gdshader',
     },
     maintainers = { '@godofavacyn' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '26ef3becea1ff51f0025a8e0c38a6b3a39c09341',
+      revision = '76ed31dff40686b350c994ceb4da90ad7f3a7f44',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1288,7 +1288,7 @@ return {
   },
   llvm = {
     install_info = {
-      revision = '00c5389a4598e1dce66fbc3b3d34733d308f2751',
+      revision = 'be4864bec38412aa2987b6dad01d1e389e9e9ca9',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
@@ -1367,7 +1367,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '2d30fdbb8fc7ec55d2fbf05172437ff0299878a5',
+      revision = '37941b272862ba52983f44cb6ec7b0eec6972c95',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1463,7 +1463,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'ea1d87f7996be1329ef6555dcacfa63a69bd55c6',
+      revision = '42d2e0e2996dec99ea7eb82d64a138e12a7ba006',
       url = 'https://github.com/nix-community/tree-sitter-nix',
     },
     maintainers = { '@leo60228', '@zimbatm' },
@@ -1565,7 +1565,7 @@ return {
   perl = {
     install_info = {
       branch = 'release',
-      revision = 'a2d8e5a32a63019d25bb7452455f4d646d11cce5',
+      revision = 'e95676fa54559c71f15ad73e871c1e44db8a9b05',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1982,7 +1982,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = '2d55e74b0485fe05058ffe5e8155506c9710c767',
+      revision = '97aead18d97708190a51d4f551ea9b05b60641c9',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2075,7 +2075,7 @@ return {
   },
   solidity = {
     install_info = {
-      revision = '322a3ddffca3ed96e559003fd03fa9881d7b4e20',
+      revision = '4e938a46c7030dd001bc99e1ac0f0c750ac98254',
       url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
@@ -2175,7 +2175,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = 'c6111e7134c64b69a2934ccbba83460cb532d442',
+      revision = '6ce62c9f0683f909de7e1601bc866f1db9cf92c9',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2599,7 +2599,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'b0822f2ea47600c6e11ee64b2dec8353c9684e8d',
+      revision = '3b1445a48e5ce26b43e37b51dec5abb3bf1fb3e4',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 13e3ce3bf41521551b8d1daf401d31938f62e7ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= <im.hanxi@gmail.com>
Date: Mon, 11 Aug 2025 15:21:23 +0800
Subject: [PATCH 2454/2704] feat(sproto): add parser

---
 SUPPORTED_LANGUAGES.md                |  1 +
 lua/nvim-treesitter/parsers.lua       |  8 +++++
 runtime/queries/sproto/folds.scm      |  6 ++++
 runtime/queries/sproto/highlights.scm | 47 +++++++++++++++++++++++++++
 runtime/queries/sproto/indents.scm    | 10 ++++++
 runtime/queries/sproto/injections.scm |  2 ++
 6 files changed, 74 insertions(+)
 create mode 100644 runtime/queries/sproto/folds.scm
 create mode 100644 runtime/queries/sproto/highlights.scm
 create mode 100644 runtime/queries/sproto/indents.scm
 create mode 100644 runtime/queries/sproto/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 7a7f23505..ceb928e72 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -269,6 +269,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` |   | @aheber, @xixiafinland
 [sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | unstable | `H  JL` |   | @Sarrus1
 [sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | unstable | `HFIJL` |   | @GordianDziwis
+[sproto](https://github.com/hanxi/tree-sitter-sproto) | unstable | `HFIJ ` |   | @hanxi
 [sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `HFIJ ` |   | @derekstride
 [squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | unstable | `HFIJL` |   | @amaanq
 [ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | unstable | `HFIJL` |   | @ObserverOfTime
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2cb92ef3b..98e9ef78a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2115,6 +2115,14 @@ return {
     maintainers = { '@GordianDziwis' },
     tier = 2,
   },
+  sproto = {
+    install_info = {
+      revision = 'd554c1456e35e7b2690552d52921c987d0cf6799',
+      url = 'https://github.com/hanxi/tree-sitter-sproto',
+    },
+    maintainers = { '@hanxi' },
+    tier = 2,
+  },
   sql = {
     install_info = {
       branch = 'gh-pages',
diff --git a/runtime/queries/sproto/folds.scm b/runtime/queries/sproto/folds.scm
new file mode 100644
index 000000000..03253d108
--- /dev/null
+++ b/runtime/queries/sproto/folds.scm
@@ -0,0 +1,6 @@
+[
+  (type_definition)
+  (protocol_definition)
+  (request_block)
+  (response_block)
+] @fold
diff --git a/runtime/queries/sproto/highlights.scm b/runtime/queries/sproto/highlights.scm
new file mode 100644
index 000000000..cd86ed22d
--- /dev/null
+++ b/runtime/queries/sproto/highlights.scm
@@ -0,0 +1,47 @@
+(comment) @comment @spell
+
+[
+  "."
+  ":"
+] @punctuation.delimiter
+
+"*" @operator
+
+[
+  "request"
+  "response"
+] @keyword
+
+(type_definition
+  name: (identifier) @type)
+
+(nested_type_definition
+  name: (identifier) @type)
+
+(type_specifier) @type
+
+[
+  "integer"
+  "boolean"
+  "string"
+  "binary"
+  "double"
+] @type.builtin
+
+(protocol_definition
+  name: (identifier) @function)
+
+(field_definition
+  name: (identifier) @property)
+
+(map_specifier
+  key: (identifier) @property)
+
+(integer) @number
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+] @punctuation.bracket
diff --git a/runtime/queries/sproto/indents.scm b/runtime/queries/sproto/indents.scm
new file mode 100644
index 000000000..33147d540
--- /dev/null
+++ b/runtime/queries/sproto/indents.scm
@@ -0,0 +1,10 @@
+[
+  (type_definition)
+  (protocol_definition)
+  (request_block)
+  (response_block)
+] @indent.begin
+
+"}" @indent.end @indent.branch
+
+(comment) @indent.auto
diff --git a/runtime/queries/sproto/injections.scm b/runtime/queries/sproto/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/runtime/queries/sproto/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 42ea5392432253188c11c31af420a0b83bb111dc Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Mon, 16 Jun 2025 22:29:40 -0500
Subject: [PATCH 2455/2704] feat(php): update php and php_only parsers to
 v0.24.0

---
 lua/nvim-treesitter/parsers.lua         |  4 ++--
 runtime/queries/php_only/highlights.scm | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 98e9ef78a..5802d3c4d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1574,7 +1574,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'b2278dbac9d58b02653fe6a8530ccebc492e4ed4',
+      revision = '182f034cd19a2f41f751eee0d57378fbfc96ab3a',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1585,7 +1585,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'b2278dbac9d58b02653fe6a8530ccebc492e4ed4',
+      revision = '182f034cd19a2f41f751eee0d57378fbfc96ab3a',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
diff --git a/runtime/queries/php_only/highlights.scm b/runtime/queries/php_only/highlights.scm
index 2d473dd0c..8258e29ad 100644
--- a/runtime/queries/php_only/highlights.scm
+++ b/runtime/queries/php_only/highlights.scm
@@ -44,21 +44,16 @@
   "protected"
   "public"
   "readonly"
-  (static_modifier)
+  "static"
 ] @keyword.modifier
 
-(function_static_declaration
-  "static" @keyword.modifier)
-
 [
   "return"
   "exit"
   "yield"
+  "yield from"
 ] @keyword.return
 
-(yield_expression
-  "from" @keyword.return)
-
 [
   "case"
   "else"
@@ -107,7 +102,7 @@
 
 [
   (php_tag)
-  "?>"
+  (php_end_tag)
   "("
   ")"
   "["
@@ -477,3 +472,9 @@
 (comment) @comment @spell
 
 (named_label_statement) @label
+
+(property_hook
+  (name) @label)
+
+(visibility_modifier
+  (operation) @label)

From 21da8ac2510bc2d4e9239e866a341ab0abc24959 Mon Sep 17 00:00:00 2001
From: Alexei Mozaidze <lexerpexer@proton.me>
Date: Mon, 11 Aug 2025 01:10:03 +0400
Subject: [PATCH 2456/2704] fix(fennel): highlight $ in multi-symbol context
 properly

Highlights the dollar symbol properly in multi-symbol contexts like
`$.some.properties`
---
 runtime/queries/fennel/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/fennel/highlights.scm b/runtime/queries/fennel/highlights.scm
index 2f0b5f738..c02f7bd14 100644
--- a/runtime/queries/fennel/highlights.scm
+++ b/runtime/queries/fennel/highlights.scm
@@ -104,6 +104,9 @@
 ((symbol) @variable.parameter
   (#any-of? @variable.parameter "$" "$..."))
 
+((symbol_fragment) @variable.parameter
+  (#eq? @variable.parameter "$"))
+
 ((symbol) @variable.parameter
   (#lua-match? @variable.parameter "^%$[1-9]$"))
 

From 4d43480167512deb7eed798147355d7f09e56d5c Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 21 Jul 2025 18:44:11 -0700
Subject: [PATCH 2457/2704] ci: validate predicate/directive string parameters

---
 .tsqueryrc.json | 54 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/.tsqueryrc.json b/.tsqueryrc.json
index e8e7fd920..cd3a692d5 100644
--- a/.tsqueryrc.json
+++ b/.tsqueryrc.json
@@ -246,11 +246,13 @@
         },
         {
           "type": "string",
-          "arity": "required"
+          "arity": "required",
+          "constraint": "named_node"
         },
         {
           "type": "string",
-          "arity": "variadic"
+          "arity": "variadic",
+          "constraint": "named_node"
         }
       ],
       "description": "match any of the given node types against all ancestors of a node"
@@ -262,12 +264,14 @@
           "arity": "required"
         },
         {
-          "type": "any",
-          "arity": "required"
+          "type": "string",
+          "arity": "required",
+          "constraint": "named_node"
         },
         {
-          "type": "any",
-          "arity": "variadic"
+          "type": "string",
+          "arity": "variadic",
+          "constraint": "named_node"
         }
       ],
       "description": "match any of the given node types against the direct ancestor of a node"
@@ -280,11 +284,13 @@
         },
         {
           "type": "string",
-          "arity": "required"
+          "arity": "required",
+          "constraint": "named_node"
         },
         {
           "type": "string",
-          "arity": "variadic"
+          "arity": "variadic",
+          "constraint": "named_node"
         }
       ],
       "description": "checks whether a capture corresponds to a given set of nodes"
@@ -316,19 +322,23 @@
         },
         {
           "type": "string",
-          "arity": "required"
+          "arity": "required",
+          "constraint": "integer"
         },
         {
           "type": "string",
-          "arity": "required"
+          "arity": "required",
+          "constraint": "integer"
         },
         {
           "type": "string",
-          "arity": "required"
+          "arity": "required",
+          "constraint": "integer"
         },
         {
           "type": "string",
-          "arity": "required"
+          "arity": "required",
+          "constraint": "integer"
         }
       ],
       "description": "Takes the range of the captured node and applies an offset. This will set a new range in the form of a list like { {start_row}, {start_col}, {end_row}, {end_col} } for the captured node with `capture_id` as `metadata[capture_id].range`."
@@ -358,19 +368,31 @@
         },
         {
           "type": "string",
-          "arity": "optional"
+          "arity": "optional",
+          "constraint": {
+            "enum": ["0", "1"]
+          }
         },
         {
           "type": "string",
-          "arity": "optional"
+          "arity": "optional",
+          "constraint": {
+            "enum": ["0", "1"]
+          }
         },
         {
           "type": "string",
-          "arity": "optional"
+          "arity": "optional",
+          "constraint": {
+            "enum": ["0", "1"]
+          }
         },
         {
           "type": "string",
-          "arity": "optional"
+          "arity": "optional",
+          "constraint": {
+            "enum": ["0", "1"]
+          }
         }
       ],
       "description": "Trims whitespace from the node. Sets a new `metadata[capture_id].range`. Takes a capture ID and, optionally, four integers to customize trimming behavior (`1` meaning trim, `0` meaning don't trim). When only given a capture ID, trims blank lines (lines that contain only whitespace, or are empty) from the end of the node (for backwards compatibility). Can trim all whitespace from both sides of the node if parameters are given."

From bf0234010a49dc1df5de93390f197cfd0abcb9aa Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 12 Aug 2025 11:04:13 +0200
Subject: [PATCH 2458/2704] ci: bump actions/checkout to v5

---
 .github/workflows/lint.yml           | 6 +++---
 .github/workflows/test-core.yml      | 2 +-
 .github/workflows/update-parsers.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cf9e9364f..27a75f8c0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
     name: Lint Lua files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Format
         run: |
@@ -28,7 +28,7 @@ jobs:
     name: Lint query files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Format
         run: |
@@ -42,7 +42,7 @@ jobs:
     name: Lint docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Check SUPPORTED_LANGUAGES
         run: |
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index d91c1bb4c..f20f1939d 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -21,7 +21,7 @@ jobs:
     env:
       NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: tree-sitter/setup-action/cli@v1
       - uses: ilammy/msvc-dev-cmd@v1
 
diff --git a/.github/workflows/update-parsers.yml b/.github/workflows/update-parsers.yml
index 351beef67..533fc2ddd 100644
--- a/.github/workflows/update-parsers.yml
+++ b/.github/workflows/update-parsers.yml
@@ -17,7 +17,7 @@ jobs:
     name: Update parsers tier ${{ matrix.tier }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
 

From cabbd52bb8d461ca1e6858c0476933256917de62 Mon Sep 17 00:00:00 2001
From: hsi <53867065+hsi@users.noreply.github.com>
Date: Mon, 11 Aug 2025 21:38:15 +0200
Subject: [PATCH 2459/2704] fix(health): highlights legend label

---
 lua/nvim-treesitter/health.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index b4d0c62d5..856e2183e 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -157,7 +157,7 @@ function M.check()
     end
     health.info(vim.fn.trim(out, ' ', 2))
   end
-  health.start('  Legend: H[ighlight], L[ocals], F[olds], I[ndents], In[J]ections')
+  health.start('  Legend: H[ighlights], L[ocals], F[olds], I[ndents], In[J]ections')
 
   if #error_collection > 0 then
     health.start('The following errors have been detected in query files:')

From 32cb9f9b9db71b0dc2454817727cd9a5d840658c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 16 Aug 2025 10:07:22 +0200
Subject: [PATCH 2460/2704] feat(parsers): update fennel, javadoc, llvm,
 matlab, mlir, nickel, nix, php, php_only, query, superhtml, vimdoc, wit

---
 lua/nvim-treesitter/parsers.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5802d3c4d..391a7ef74 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -544,7 +544,7 @@ return {
   },
   fennel = {
     install_info = {
-      revision = '653c8abc72d1415cb85e032108d39022feb460be',
+      revision = 'fd4a24e349bcbac8a03a5a00d0dfa207baf53ca5',
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
     maintainers = { '@alexmozaidze' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '76ed31dff40686b350c994ceb4da90ad7f3a7f44',
+      revision = '08f1977ad27b8d9a908193255ad0c94cc8742748',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1288,7 +1288,7 @@ return {
   },
   llvm = {
     install_info = {
-      revision = 'be4864bec38412aa2987b6dad01d1e389e9e9ca9',
+      revision = '470886ddd635e0ee48a4cb169e33d0c6d9bff32e',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
@@ -1367,7 +1367,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '37941b272862ba52983f44cb6ec7b0eec6972c95',
+      revision = 'da410185c1fabf823ab92798590f9a6606e5699b',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'e2818d616fc43cbbba316723cbd68a53c66a2704',
+      revision = '04630ec19f198c3ac2a0b98a004eeae083990c96',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1431,7 +1431,7 @@ return {
   },
   nickel = {
     install_info = {
-      revision = '9a05ab045c000cf37f02cff5c4de32b081444244',
+      revision = 'a0a5d98a6f0edb5d00a18e62e7d1d02a5607c391',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 2,
@@ -1463,7 +1463,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = '42d2e0e2996dec99ea7eb82d64a138e12a7ba006',
+      revision = 'ff4e2b4c5a3598e8be3edf16bc69f6677af32145',
       url = 'https://github.com/nix-community/tree-sitter-nix',
     },
     maintainers = { '@leo60228', '@zimbatm' },
@@ -1574,7 +1574,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '182f034cd19a2f41f751eee0d57378fbfc96ab3a',
+      revision = '1269143868747e3b8e50f221ca0a2e5a1a2f2b44',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1585,7 +1585,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '182f034cd19a2f41f751eee0d57378fbfc96ab3a',
+      revision = '1269143868747e3b8e50f221ca0a2e5a1a2f2b44',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1805,7 +1805,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '8a43889f89fd0667289936341bff3a77bafade17',
+      revision = '2668cc53024953224a40b1e6546d7b8ec5a11150',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2183,7 +2183,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '6ce62c9f0683f909de7e1601bc866f1db9cf92c9',
+      revision = '0daae5239bd9366dda0c28c7540d7503b0c104d4',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2531,7 +2531,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = '9f6191a98702edc1084245abd5523279d4b681fb',
+      revision = 'ffa29e863738adfc1496717c4acb7aae92a80ed4',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2581,7 +2581,7 @@ return {
   },
   wit = {
     install_info = {
-      revision = 'a0fd28afe24511160f0601ab45044690c1cb7d92',
+      revision = '8fd7cfd90be29b363922b2e09bf6a7db50de04a8',
       url = 'https://github.com/bytecodealliance/tree-sitter-wit',
     },
     maintainers = { '@mkatychev' },

From 2f28a14ed229bb534a9ef92591d1d17b392b0c0e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 19 Aug 2025 11:46:44 +0200
Subject: [PATCH 2461/2704] feat(parsers): update arduino, chatito, desktop,
 editorconfig, gitattributes, gpg, idl, javadoc, mlir, pem, php, php_only,
 poe_filter, xresources

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 391a7ef74..a76195b55 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -36,7 +36,7 @@ return {
   },
   arduino = {
     install_info = {
-      revision = '1b1fd5dbd196e80342cf79f6fc5de154232c2829',
+      revision = '3b5ddcdbcac43c6084358d3d14a30e10e2d36b88',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
@@ -206,7 +206,7 @@ return {
   },
   chatito = {
     install_info = {
-      revision = '433a7a150da013f380d2bd435e0c4373f7f4481c',
+      revision = 'c0ed82c665b732395073f635c74c300f09530a7f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-chatito',
     },
     maintainers = { '@ObserverOfTime' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '8d6931b05ccc70eb4f88b384524ea5dd3d795958',
+      revision = '0169df0e69bd2844e0d8bb167d030a0e4c021846',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '2d92f8bb8304d0b56883bb9df8f17cb351a07cc3',
+      revision = '17be0e84ac012b6731626baf6920ff24e1865a03',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -685,7 +685,7 @@ return {
   },
   gitattributes = {
     install_info = {
-      revision = 'f23072a51e1c764d6c5bf461194a775c8a5c7a95',
+      revision = '1b7af09d45b579f9f288453b95ad555f1f431645',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gitattributes',
     },
     maintainers = { '@ObserverOfTime' },
@@ -827,7 +827,7 @@ return {
   },
   gpg = {
     install_info = {
-      revision = '50482a322cf1fa00dfe327ef8b00e4607eeeaa1d',
+      revision = '4024eb268c59204280f8ac71ef146b8ff5e737f6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-gpg-config',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1019,7 +1019,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '777b39538f9dc4ece1d891733bb4c91fc0627b16',
+      revision = '6ab5582bd47b86df75afe90cdd8dc55d2d480ce1',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '08f1977ad27b8d9a908193255ad0c94cc8742748',
+      revision = '77afe93bc6fc10f2cf4935857b8e055b2a47bb94',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '04630ec19f198c3ac2a0b98a004eeae083990c96',
+      revision = 'b209a18d1a0f440acd3a85b6d633dac2660114e1',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1556,7 +1556,7 @@ return {
   },
   pem = {
     install_info = {
-      revision = '7374eab76f2caae02396721850f87af437b66c06',
+      revision = 'e525b177a229b1154fd81bc0691f943028d9e685',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-pem',
     },
     maintainers = { '@ObserverOfTime' },
@@ -1574,7 +1574,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '1269143868747e3b8e50f221ca0a2e5a1a2f2b44',
+      revision = '5b5627faaa290d89eb3d01b9bf47c3bb9e797dea',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1585,7 +1585,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '1269143868747e3b8e50f221ca0a2e5a1a2f2b44',
+      revision = '5b5627faaa290d89eb3d01b9bf47c3bb9e797dea',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1635,7 +1635,7 @@ return {
   },
   poe_filter = {
     install_info = {
-      revision = 'e449216700449f1bccaebbd3820cce794d6fd687',
+      revision = '205a7d576984feb38a9fc2d8cfe729617f9e0548',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-poe-filter',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2607,7 +2607,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '3b1445a48e5ce26b43e37b51dec5abb3bf1fb3e4',
+      revision = '6113943ab0847a307f3f3c38ff91d9cdfce9d0d9',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 6fd7117c1dc4e279f4153af70ae60bd4134b0f01 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 19 Aug 2025 11:52:35 +0200
Subject: [PATCH 2462/2704] feat(matlab)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua       | 2 +-
 runtime/queries/matlab/highlights.scm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a76195b55..88732ab19 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1367,7 +1367,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'da410185c1fabf823ab92798590f9a6606e5699b',
+      revision = '93020b226bf341de02336cdf1c19a7ce0b509cf2',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
diff --git a/runtime/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
index d2ab6053e..91fdae2a9 100644
--- a/runtime/queries/matlab/highlights.scm
+++ b/runtime/queries/matlab/highlights.scm
@@ -134,7 +134,8 @@
   (identifier) @function)
 
 (validation_functions
-  (identifier) @function)
+  (property_name
+    (identifier) @function))
 
 (command
   (command_name) @function.call)

From 44e90ec66e44f7dbb60030f453a48282b3a1125a Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Thu, 21 Aug 2025 18:31:55 +0200
Subject: [PATCH 2463/2704] feat(inko): add support for array patterns

This updates the version of the Inko parser to the latest version and
includes indent support for the new array pattern node.
---
 lua/nvim-treesitter/parsers.lua  | 2 +-
 runtime/queries/inko/indents.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 88732ab19..d658b5d18 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1042,7 +1042,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = 'f58a87ac4dc6a7955c64c9e4408fbd693e804686',
+      revision = '74cbd0f69053b4a9ad4fed8831dee983ec7e4990',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
diff --git a/runtime/queries/inko/indents.scm b/runtime/queries/inko/indents.scm
index d2d9a5724..260249343 100644
--- a/runtime/queries/inko/indents.scm
+++ b/runtime/queries/inko/indents.scm
@@ -27,6 +27,7 @@
   (trait)
   (tuple)
   (tuple_pattern)
+  (array_pattern)
   (type_arguments)
 ] @indent.begin
 

From 9f15c2b050ef2fa66462636eb48674d6b6562989 Mon Sep 17 00:00:00 2001
From: Caleb White <cdwhite3@pm.me>
Date: Mon, 25 Aug 2025 08:29:26 -0500
Subject: [PATCH 2464/2704] fix(blade): fix highlighting of php tags

---
 runtime/queries/blade/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/queries/blade/highlights.scm b/runtime/queries/blade/highlights.scm
index b20999a5f..dd8024bda 100644
--- a/runtime/queries/blade/highlights.scm
+++ b/runtime/queries/blade/highlights.scm
@@ -7,6 +7,8 @@
 ] @tag
 
 [
+  (php_tag)
+  (php_end_tag)
   "{{"
   "}}"
   "{!!"

From 35a124cb608fb137814d9af95d43a8b980206d8a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 25 Aug 2025 18:59:47 +0200
Subject: [PATCH 2465/2704] feat(parsers): update arduino, blade, desktop,
 elixir, javadoc, llvm, mlir, perl, superhtml, vhdl, xresources, ziggy,
 ziggy_schema

---
 lua/nvim-treesitter/parsers.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d658b5d18..9f14b2038 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -36,7 +36,7 @@ return {
   },
   arduino = {
     install_info = {
-      revision = '3b5ddcdbcac43c6084358d3d14a30e10e2d36b88',
+      revision = '2f0c1223c50aa4b754136db544204c6fc99ffc77',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
@@ -125,7 +125,7 @@ return {
   },
   blade = {
     install_info = {
-      revision = '59ce5b68e288002e3aee6cf5a379bbef21adbe6c',
+      revision = 'cc764dadcbbceb3f259396fef66f970c72e94f96',
       url = 'https://github.com/EmranMR/tree-sitter-blade',
     },
     maintainers = { '@calebdw' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '0169df0e69bd2844e0d8bb167d030a0e4c021846',
+      revision = 'cbf82f2b3f75c4f2367d11ef85d34fbad89a974d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -473,7 +473,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = 'b848e63e9f2a68accff0332392f07582c046295a',
+      revision = 'd24cecee673c4c770f797bac6f87ae4b6d7ddec5',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '77afe93bc6fc10f2cf4935857b8e055b2a47bb94',
+      revision = '384952d91ebc176fcf8f1933dff93b9c32430911',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1288,7 +1288,7 @@ return {
   },
   llvm = {
     install_info = {
-      revision = '470886ddd635e0ee48a4cb169e33d0c6d9bff32e',
+      revision = '2914786ae6774d4c4e25a230f4afe16aa68fe1c1',
       url = 'https://github.com/benwilliamgraham/tree-sitter-llvm',
     },
     maintainers = { '@benwilliamgraham' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'b209a18d1a0f440acd3a85b6d633dac2660114e1',
+      revision = '09666cead2c001cbbfc82b395007f6d8158113a5',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1565,7 +1565,7 @@ return {
   perl = {
     install_info = {
       branch = 'release',
-      revision = 'e95676fa54559c71f15ad73e871c1e44db8a9b05',
+      revision = '0c24d001dd1921e418fb933d208a7bd7dd3f923a',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -2183,7 +2183,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '0daae5239bd9366dda0c28c7540d7503b0c104d4',
+      revision = '8cb16babb0c66b6512d6aeb4cbc37ed90641d980',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2507,7 +2507,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '73ff9d3e7bc42b8cc123bf5f0b2db12a900ee9b7',
+      revision = '02523d7fb0321344c19c1f3f4ec6b83424c7d6c8',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2607,7 +2607,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '6113943ab0847a307f3f3c38ff91d9cdfce9d0d9',
+      revision = 'f40778ff42f2119aebacd46d4b6d785a4181a9ba',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
@@ -2656,7 +2656,7 @@ return {
   ziggy = {
     install_info = {
       location = 'tree-sitter-ziggy',
-      revision = 'e95c85cb58773c43e9d94c0b9422ae84697e68a1',
+      revision = '4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },
@@ -2665,7 +2665,7 @@ return {
   ziggy_schema = {
     install_info = {
       location = 'tree-sitter-ziggy-schema',
-      revision = 'e95c85cb58773c43e9d94c0b9422ae84697e68a1',
+      revision = '4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901',
       url = 'https://github.com/kristoff-it/ziggy',
     },
     maintainers = { '@rockorager' },

From 37cec5ec59d09db15ef364e237f8593b48754539 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 25 Aug 2025 19:09:38 +0200
Subject: [PATCH 2466/2704] feat(gotmpl,helm)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua       | 4 ++--
 runtime/queries/gotmpl/highlights.scm | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9f14b2038..cae9df413 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -811,7 +811,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = '5f19a36bb1eebb30454e277b222b278ceafed0dd',
+      revision = '65f4f86c3aaa9dabab36e3482584e8a111cf7db1',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -923,7 +923,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = '5f19a36bb1eebb30454e277b222b278ceafed0dd',
+      revision = '65f4f86c3aaa9dabab36e3482584e8a111cf7db1',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
diff --git a/runtime/queries/gotmpl/highlights.scm b/runtime/queries/gotmpl/highlights.scm
index 4ee768c28..80c977717 100644
--- a/runtime/queries/gotmpl/highlights.scm
+++ b/runtime/queries/gotmpl/highlights.scm
@@ -59,7 +59,6 @@
   [
     "if"
     "else"
-    "else if"
     "end"
   ] @keyword.conditional
   (#set! priority 110))
@@ -98,6 +97,14 @@
   ] @keyword.conditional
   (#set! priority 110))
 
+(continue_action
+  "continue" @keyword.repeat
+  (#set! priority 110))
+
+(break_action
+  "break" @keyword.repeat
+  (#set! priority 110))
+
 ; Literals
 ([
   (interpreted_string_literal)

From 85ec015f3be42a3c2c04648ff99d617d9609e5f0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 25 Aug 2025 19:19:32 +0200
Subject: [PATCH 2467/2704] feat(nu)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua   |  2 +-
 runtime/queries/nu/highlights.scm | 52 +++++++++++++------------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index cae9df413..ffa103213 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1479,7 +1479,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '6544c4383643cf8608d50def2247a7af8314e148',
+      revision = 'cc4624fbc6ec3563d98fbe8f215a8b8e10b16f32',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
diff --git a/runtime/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
index f8342fab4..fc73d3483 100644
--- a/runtime/queries/nu/highlights.scm
+++ b/runtime/queries/nu/highlights.scm
@@ -2,13 +2,8 @@
 ; keywords
 [
   "let"
-  "let-env"
   "mut"
   "const"
-  "hide-env"
-  "source"
-  "source-env"
-  "overlay"
 ] @keyword
 
 [
@@ -20,16 +15,9 @@
 [
   "loop"
   "while"
-  "break"
-  "continue"
 ] @keyword.repeat
 
-[
-  "def"
-  "do"
-] @keyword.function
-
-"return" @keyword.return
+"def" @keyword.function
 
 [
   "try"
@@ -49,9 +37,6 @@
   "extern"
 ] @keyword.modifier
 
-(hide_mod
-  "hide" @keyword)
-
 (decl_use
   module: (unquoted) @module)
 
@@ -59,21 +44,6 @@
   "for" @keyword
   "in" @keyword)
 
-(overlay_list
-  "list" @keyword.import)
-
-(overlay_hide
-  "hide" @keyword.import)
-
-(overlay_new
-  "new" @keyword.import)
-
-(overlay_use
-  "as" @keyword)
-
-(ctrl_error
-  "make" @keyword.import)
-
 ; ---
 ; literals
 (val_number) @number
@@ -316,6 +286,26 @@ key: (identifier) @property
       "zip")
   ])
 
+(command
+  head: (cmd_identifier) @keyword
+  (#any-of? @keyword "do" "source" "source-env" "hide" "hide-env"))
+
+(command
+  head: (cmd_identifier) @keyword.repeat
+  (#any-of? @keyword.repeat "break" "continue" "return"))
+
+(command
+  head: (cmd_identifier) @keyword
+  .
+  arg_str: (val_string) @keyword.import
+  (#any-of? @keyword "overlay" "error"))
+
+(command
+  head: (cmd_identifier) @_cmd
+  arg_str: (val_string) @keyword
+  (#eq? @_cmd "overlay")
+  (#eq? @keyword "as"))
+
 (command
   "^" @punctuation.delimiter
   head: (_) @function)

From 8302d4f547ce8881f06ff1ec2cf1c9748a43cb12 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 29 Aug 2025 14:45:10 +0200
Subject: [PATCH 2468/2704] feat(parsers): update bash, c, clojure, cpp,
 embedded_template, gap, go, html, java, javascript, json, json5, pkl, rust,
 supercollider

---
 lua/nvim-treesitter/parsers.lua | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ffa103213..ea48f3ad1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -77,7 +77,7 @@ return {
   },
   bash = {
     install_info = {
-      revision = '56b54c61fb48bce0c63e3dfa2240b5d274384763',
+      revision = 'b930fed16910a74c230e09ea5b97f671448d2116',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -158,7 +158,7 @@ return {
   },
   c = {
     install_info = {
-      revision = '7fa1be1b694b6e763686793d97da01f36a0e5c12',
+      revision = 'd8d0503aa0152119149ecad76685f37682c0d03f',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -222,7 +222,7 @@ return {
   },
   clojure = {
     install_info = {
-      revision = 'be514eec2c86d560c18fab146e9298e21b8eab62',
+      revision = 'e43eff80d17cf34852dcd92ca5e6986d23a7040f',
       url = 'https://github.com/sogaiu/tree-sitter-clojure',
     },
     maintainers = { '@NoahTheDuke' },
@@ -278,7 +278,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = '5cb9b693cfd7bfacab1d9ff4acac1a4150700609',
+      revision = '077f14ffd2de226ac95808596989c705f6dee289',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -505,7 +505,7 @@ return {
   },
   embedded_template = {
     install_info = {
-      revision = '8495d106154741e6d35d37064f864758ece75de6',
+      revision = 'c70c1de07dedd532089c0c90835c8ed9fa694f5c',
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
     tier = 2,
@@ -633,7 +633,7 @@ return {
   },
   gap = {
     install_info = {
-      revision = '8dee53cfb962600dd35ca25432f005e7920e89f2',
+      revision = '2bac14863b76ad0ff6fd7204c50574732acd66df',
       url = 'https://github.com/gap-system/tree-sitter-gap',
     },
     maintainers = { '@reiniscirpons' },
@@ -770,7 +770,7 @@ return {
   },
   go = {
     install_info = {
-      revision = '5e73f476efafe5c768eda19bbe877f188ded6144',
+      revision = '1547678a9da59885853f5f5cc8a99cc203fa2e2c',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
@@ -973,7 +973,7 @@ return {
   },
   html = {
     install_info = {
-      revision = 'cbb91a0ff3621245e890d1c50cc811bffb77a26b',
+      revision = '9fc04b9ef21a92e3ea9258f5690e4461394d7811',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
@@ -1067,7 +1067,7 @@ return {
   },
   java = {
     install_info = {
-      revision = 'a7db5227ec40fcfe94489559d8c9bc7c8181e25a',
+      revision = '968afb3c9be2d4dba4cd36f3580ee0b1a9c1c537',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
@@ -1083,7 +1083,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = '6fbef40512dcd9f0a61ce03a4c9ae7597b36ab5c',
+      revision = 'b131ccbf414a720cce088610539241a1eb170054',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1129,7 +1129,7 @@ return {
   },
   json = {
     install_info = {
-      revision = '46aa487b3ade14b7b05ef92507fdaa3915a662a3',
+      revision = 'fd38547e2fe5738e5b173e5f40a27df261224bba',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
@@ -1137,7 +1137,7 @@ return {
   },
   json5 = {
     install_info = {
-      revision = 'ab0ba8229d639ec4f3fa5f674c9133477f4b77bd',
+      revision = '5ebe24e210f0fbcd6180fd673ed184ed81f3bcc6',
       url = 'https://github.com/Joakker/tree-sitter-json5',
     },
     maintainers = { '@Joakker' },
@@ -1610,7 +1610,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = '4fc94a102c25ea383d70397dac7e677ca3731f1e',
+      revision = '97d0f3d32e8915a72fa6cf6b1832ba3884f8e82b',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1974,7 +1974,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '3691201b01cacb2f96ffca4c632c4e938bfacd88',
+      revision = '3bfef41a01ab49a25ffdecf998823b4b82fcaf69',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2174,7 +2174,7 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = '1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7',
+      revision = 'fd7f3bd457c8ef13cb547c4e79588cf1d2569997',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },

From 16da7ded58b41a4c320f32661264c6283ce8cd18 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 29 Aug 2025 14:50:43 +0200
Subject: [PATCH 2469/2704] feat(matlab)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua       | 2 +-
 runtime/queries/matlab/highlights.scm | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ea48f3ad1..3abe166a1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1367,7 +1367,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '93020b226bf341de02336cdf1c19a7ce0b509cf2',
+      revision = '96a3e8fb0a4ebd0db64db6b52043483937e9ca3a',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
diff --git a/runtime/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
index 91fdae2a9..66ec69465 100644
--- a/runtime/queries/matlab/highlights.scm
+++ b/runtime/queries/matlab/highlights.scm
@@ -134,8 +134,7 @@
   (identifier) @function)
 
 (validation_functions
-  (property_name
-    (identifier) @function))
+  (identifier) @function)
 
 (command
   (command_name) @function.call)
@@ -205,7 +204,11 @@
 
 (number) @number
 
-(boolean) @boolean
+((identifier) @boolean
+  (#eq? @boolean "true"))
+
+((identifier) @boolean
+  (#eq? @boolean "false"))
 
 ; Comments
 [

From cd64fd3f448eb6cc529830c7f265f7584168572b Mon Sep 17 00:00:00 2001
From: BlockLune <39331194+BlockLune@users.noreply.github.com>
Date: Sat, 30 Aug 2025 00:30:18 +0800
Subject: [PATCH 2470/2704] feat(wxml): add parser and queries

---
 SUPPORTED_LANGUAGES.md              |  1 +
 lua/nvim-treesitter/parsers.lua     |  8 ++++
 runtime/queries/wxml/folds.scm      |  7 +++
 runtime/queries/wxml/highlights.scm | 66 +++++++++++++++++++++++++++++
 runtime/queries/wxml/indents.scm    | 32 ++++++++++++++
 runtime/queries/wxml/injections.scm | 10 +++++
 6 files changed, 124 insertions(+)
 create mode 100644 runtime/queries/wxml/folds.scm
 create mode 100644 runtime/queries/wxml/highlights.scm
 create mode 100644 runtime/queries/wxml/indents.scm
 create mode 100644 runtime/queries/wxml/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index ceb928e72..25c5e1137 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -326,6 +326,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` |   | @theHamsta
 [wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` |   | @gshpychka, @MarkMcCulloh
 [wit](https://github.com/bytecodealliance/tree-sitter-wit) | unstable | `HF J ` |   | @mkatychev
+[wxml](https://github.com/BlockLune/tree-sitter-wxml) | unstable | `HFIJ ` |   | @BlockLune
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` |   | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` |   | @ObserverOfTime
 [xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` |   | @ValdezFOmar
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3abe166a1..027c8f745 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2587,6 +2587,14 @@ return {
     maintainers = { '@mkatychev' },
     tier = 2,
   },
+  wxml = {
+    install_info = {
+      revision = '7b821c748dc410332f59496c0dea2632168c4e5a',
+      url = 'https://github.com/BlockLune/tree-sitter-wxml',
+    },
+    maintainers = { '@BlockLune' },
+    tier = 2,
+  },
   xcompose = {
     install_info = {
       revision = 'a51d6366f041dbefec4da39a7eb3168a9b1cbc0e',
diff --git a/runtime/queries/wxml/folds.scm b/runtime/queries/wxml/folds.scm
new file mode 100644
index 000000000..df3eeeef7
--- /dev/null
+++ b/runtime/queries/wxml/folds.scm
@@ -0,0 +1,7 @@
+[
+  (element)
+  (block_element)
+  (slot_element)
+  (template_element)
+  (wxs_element)
+] @fold
diff --git a/runtime/queries/wxml/highlights.scm b/runtime/queries/wxml/highlights.scm
new file mode 100644
index 000000000..5bdbd5d50
--- /dev/null
+++ b/runtime/queries/wxml/highlights.scm
@@ -0,0 +1,66 @@
+; Comments
+(comment) @comment @spell
+
+; Text
+(text) @spell
+
+; Tag names
+(tag_name) @tag
+
+((tag_name) @tag.builtin
+  (#any-of? @tag.builtin "wxs" "template" "import" "include" "slot" "block"))
+
+; Attributes
+(attribute_name) @tag.attribute
+
+(attribute_value) @string
+
+(quoted_attribute_value) @string
+
+; WeChat specific attributes
+((attribute_name) @keyword.directive
+  (#lua-match? @keyword.directive "^wx:"))
+
+((attribute_name) @keyword.conditional
+  (#any-of? @keyword.conditional "wx:if" "wx:elif" "wx:else"))
+
+((attribute_name) @keyword.repeat
+  (#any-of? @keyword.repeat "wx:for" "wx:for-index" "wx:for-item"))
+
+((attribute_name) @keyword
+  (#lua-match? @keyword "^bind"))
+
+((attribute_name) @keyword
+  (#lua-match? @keyword "^catch"))
+
+((attribute_name) @keyword
+  (#lua-match? @keyword "^mut%-bind"))
+
+((attribute_name) @keyword
+  (#lua-match? @keyword "^model:"))
+
+((attribute_name) @keyword
+  (#lua-match? @keyword "^data-"))
+
+((attribute
+  (attribute_name) @_attr
+  (quoted_attribute_value) @string.special.url)
+  (#any-of? @_attr "href" "src")
+  (#offset! @string.special.url 0 1 0 -1))
+
+; Entity references
+(entity) @character.special
+
+; Interpolation delimiters
+(interpolation_start) @punctuation.special
+
+(interpolation_end) @punctuation.special
+
+[
+  "<"
+  ">"
+  "</"
+  "/>"
+] @tag.delimiter
+
+"=" @operator
diff --git a/runtime/queries/wxml/indents.scm b/runtime/queries/wxml/indents.scm
new file mode 100644
index 000000000..30172bb37
--- /dev/null
+++ b/runtime/queries/wxml/indents.scm
@@ -0,0 +1,32 @@
+; inherits: html_tags
+
+(block_element) @indent.begin
+
+(template_element) @indent.begin
+
+(wxs_element) @indent.begin
+
+(block_element
+  (block_end_tag
+    ">" @indent.end))
+
+(template_element
+  (template_end_tag
+    ">" @indent.end))
+
+(wxs_element
+  (wxs_end_tag
+    ">" @indent.end))
+
+(block_element
+  (block_end_tag) @indent.branch)
+
+(template_element
+  (template_end_tag) @indent.branch)
+
+(wxs_element
+  (wxs_end_tag) @indent.branch)
+
+(import_statement) @indent.ignore
+
+(include_statement) @indent.ignore
diff --git a/runtime/queries/wxml/injections.scm b/runtime/queries/wxml/injections.scm
new file mode 100644
index 000000000..09f615d38
--- /dev/null
+++ b/runtime/queries/wxml/injections.scm
@@ -0,0 +1,10 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((raw_text) @injection.content
+  (#set! injection.language "javascript")
+  (#set! injection.include-children))
+
+((expression) @injection.content
+  (#set! injection.language "javascript")
+  (#set! injection.include-children))

From 8fccdb3d493178994aca43ec1f6ff74740eed7ee Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 30 Aug 2025 20:39:35 -0700
Subject: [PATCH 2471/2704] feat(proto): more delimiter, property highlights

---
 runtime/queries/proto/highlights.scm    | 18 +++++++
 tests/query/highlights/proto/test.proto | 62 +++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 tests/query/highlights/proto/test.proto

diff --git a/runtime/queries/proto/highlights.scm b/runtime/queries/proto/highlights.scm
index 51f44a754..894686dd4 100644
--- a/runtime/queries/proto/highlights.scm
+++ b/runtime/queries/proto/highlights.scm
@@ -1,3 +1,19 @@
+(full_ident
+  (identifier) @variable)
+
+(full_ident
+  (identifier)
+  (identifier) @variable.member)
+
+(field
+  (identifier) @property)
+
+(field_option
+  (identifier) @property)
+
+(block_lit
+  (identifier) @property)
+
 [
   "extend"
   "extensions"
@@ -77,6 +93,8 @@
 [
   ";"
   ","
+  "."
+  ":"
 ] @punctuation.delimiter
 
 "=" @operator
diff --git a/tests/query/highlights/proto/test.proto b/tests/query/highlights/proto/test.proto
new file mode 100644
index 000000000..fdc610782
--- /dev/null
+++ b/tests/query/highlights/proto/test.proto
@@ -0,0 +1,62 @@
+syntax = "proto2";
+//       ^^^^^^^^ @string.special
+package sls.asfd.asfd;
+//      ^^^ @variable
+//         ^ @punctuation.delimiter
+//          ^^^^ @variable.member
+//              ^ @punctuation.delimiter
+//               ^^^^ @variable.member
+//                   ^ @punctuation.delimiter
+
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+//<- @keyword.import
+
+option (gogoproto.sizer_all) = true;
+option (gogoproto.marshaler_all) = true;
+option (gogoproto.unmarshaler_all.foo) = true;
+//      ^^^^^^^^^ @variable
+//                ^^^^^^^^^^^^^^^ @variable.member
+//                               ^ @punctuation.delimiter
+//                                ^^^ @variable.member
+
+message LogContent
+//<- @keyword.type
+{
+    required string Key = 1;
+//           ^^^^^^ @type
+//                  ^^^ @property
+//                      ^ @operator
+//                        ^ @number
+    required string Value = 2;
+//           ^^^^^^ @type
+//                  ^^^^^ @property
+    required CustomType Value = 2;
+//  ^^^^^^^^ @keyword.modifier
+//           ^^^^^^^^^^ @type
+
+    optional string cgroup_pids_mount = 76 [default = "/sys/fs/cgroup/pids"];
+
+    optional JsonFormat json_format = 6 [
+//  ^^^^^^^^ @keyword.modifier
+      retention = RETENTION_RUNTIME,
+//                ^^^^^^^^^^^^^^^^^ @variable
+//                                 ^ @punctuation.delimiter
+      targets = TARGET_TYPE_MESSAGE,
+//    ^^^^^^^ @property
+      targets = TARGET_TYPE_ENUM,
+      targets = TARGET_TYPE_FILE,
+      edition_defaults = { edition: "2023", value: "ALLOW" }
+//                         ^^^^^^^ @property
+//                                ^ @punctuation.delimiter
+//                                               ^ @punctuation.delimiter
+//                                                         ^ @punctuation.bracket
+    ];
+}
+

From 802195d8f1980db25a7a39a55f9a25df21756c73 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 30 Aug 2025 20:40:45 -0700
Subject: [PATCH 2472/2704] feat(proto): folds for import statements

---
 runtime/queries/proto/folds.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/queries/proto/folds.scm b/runtime/queries/proto/folds.scm
index 645ac1819..76f688b7d 100644
--- a/runtime/queries/proto/folds.scm
+++ b/runtime/queries/proto/folds.scm
@@ -3,3 +3,5 @@
   (message)
   (service)
 ] @fold
+
+(import)+ @fold

From 9addcdd01568a7c80333d5169dea0164ede5dd3d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 6 Sep 2025 11:08:43 +0200
Subject: [PATCH 2473/2704] feat(parsers): update agda, c3, embedded_template,
 javadoc, javascript, jinja, jinja_inline, pkl, slang, supercollider, sway,
 systemverilog

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 027c8f745..b8e2493f5 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -10,7 +10,7 @@ return {
   },
   agda = {
     install_info = {
-      revision = 'b9b32fa042c2952a7bfca86847ea325e44ccc897',
+      revision = 'e8d47a6987effe34d5595baf321d82d3519a8527',
       url = 'https://github.com/tree-sitter/tree-sitter-agda',
     },
     maintainers = { '@Decodetalkers' },
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = 'be8c7fcfb424a93f541ebd21d23611b92dff0444',
+      revision = '057a75df0c866034d8edce989f701ee2cb0481d8',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -505,7 +505,7 @@ return {
   },
   embedded_template = {
     install_info = {
-      revision = 'c70c1de07dedd532089c0c90835c8ed9fa694f5c',
+      revision = '3499d85f0a0d937c507a4a65368f2f63772786e1',
       url = 'https://github.com/tree-sitter/tree-sitter-embedded-template',
     },
     tier = 2,
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '384952d91ebc176fcf8f1933dff93b9c32430911',
+      revision = 'fea74f50f5a6dcef575687703b82a96f9e6d1312',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1083,7 +1083,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = 'b131ccbf414a720cce088610539241a1eb170054',
+      revision = '44c892e0be055ac465d5eeddae6d3e194424e7de',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1093,7 +1093,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '129184fb7bbc2d3e29967002432a869ac3758f2e',
+      revision = 'e589222a1ad44361bc376d5abdccd08e1fecfee5',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1104,7 +1104,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '129184fb7bbc2d3e29967002432a869ac3758f2e',
+      revision = 'e589222a1ad44361bc376d5abdccd08e1fecfee5',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1610,7 +1610,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = '97d0f3d32e8915a72fa6cf6b1832ba3884f8e82b',
+      revision = 'd62e832b69a0aa3d4f87fc34ba62d931d6c23f55',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -2026,7 +2026,7 @@ return {
   },
   slang = {
     install_info = {
-      revision = '5b0adf65710c3a7c265f0451ed6b4789410cbe63',
+      revision = '1dbcc4abc7b3cdd663eb03d93031167d6ed19f56',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-slang',
     },
     maintainers = { '@theHamsta' },
@@ -2174,7 +2174,7 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = 'fd7f3bd457c8ef13cb547c4e79588cf1d2569997',
+      revision = 'c6145cad24e19485f6ceb86e0a1be479d6537fb0',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
@@ -2208,7 +2208,7 @@ return {
   },
   sway = {
     install_info = {
-      revision = '395006713db3bbb90d267ebdfcbf1881b399b05c',
+      revision = '9b7845ce06ecb38b040c3940970b4fd0adc331d1',
       url = 'https://github.com/FuelLabs/tree-sitter-sway.git',
     },
     maintainers = { '@ribru17' },
@@ -2241,7 +2241,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '3bd2c5d2f60ed7b07c2177b34e2976ad9a87c659',
+      revision = '999e88565e199abec12d6fb7470419b5ae217386',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },

From 939556333f7d160161e7d590736850aca554d59b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 7 Sep 2025 11:27:17 +0200
Subject: [PATCH 2474/2704] feat(parsers): update arduino, desktop, hurl, mlir,
 query, slint, snakemake, xresources

---
 lua/nvim-treesitter/parsers.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b8e2493f5..822421bfe 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -36,7 +36,7 @@ return {
   },
   arduino = {
     install_info = {
-      revision = '2f0c1223c50aa4b754136db544204c6fc99ffc77',
+      revision = '53eb391da4c6c5857f8defa2c583c46c2594f565',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'cbf82f2b3f75c4f2367d11ef85d34fbad89a974d',
+      revision = 'ea5cff078ebd8abb42598e006e549e5cb75d4752',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -1003,7 +1003,7 @@ return {
   },
   hurl = {
     install_info = {
-      revision = 'ff07a42d9ec95443b5c1b57ed793414bf7b79be5',
+      revision = '1124058cd192e80d80914652a5850a5b1887cc10',
       url = 'https://github.com/pfeiferj/tree-sitter-hurl',
     },
     maintainers = { '@pfeiferj' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '09666cead2c001cbbfc82b395007f6d8158113a5',
+      revision = '1f3bc2fd4d4e28361d1ff75cf5763e1d0c2b6348',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1805,7 +1805,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '2668cc53024953224a40b1e6546d7b8ec5a11150',
+      revision = '60e253d3c9d6b1131a0f75c85e4bdcc9a48d5b42',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2043,7 +2043,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '96bc969d20ff347030519184ea2467f4046a524d',
+      revision = 'ecd60078bbd546eeb4c7fbbe02226752517b847f',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2067,7 +2067,7 @@ return {
   },
   snakemake = {
     install_info = {
-      revision = 'f36c1587624d6d84376c82a357c20fc319cbf02c',
+      revision = '7731408e5e8095fe242fdd423c3d3ae886fbf9fd',
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
     },
     maintainers = { '@osthomas' },
@@ -2615,7 +2615,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'f40778ff42f2119aebacd46d4b6d785a4181a9ba',
+      revision = '423597c9ee0cd9fd98691a9f9881ff4e6f7b047a',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From fee71c102c54146f90b14c89711ddbb8f95a1484 Mon Sep 17 00:00:00 2001
From: osthomas <8322329+osthomas@users.noreply.github.com>
Date: Sun, 7 Sep 2025 13:58:28 +0200
Subject: [PATCH 2475/2704] feat(snakemake): update queries (#8106)

also add indent tests
---
 runtime/queries/snakemake/highlights.scm      |  8 +--
 runtime/queries/snakemake/indents.scm         | 40 +++++++++------
 runtime/queries/snakemake/locals.scm          | 36 ++++++++++++++
 tests/indent/snakemake/blocks.smk             | 22 +++++++++
 .../indent/snakemake/directive_parameters.smk | 36 ++++++++++++++
 tests/indent/snakemake_spec.lua               | 49 +++++++++++++++++++
 6 files changed, 171 insertions(+), 20 deletions(-)
 create mode 100644 tests/indent/snakemake/blocks.smk
 create mode 100644 tests/indent/snakemake/directive_parameters.smk
 create mode 100644 tests/indent/snakemake_spec.lua

diff --git a/runtime/queries/snakemake/highlights.scm b/runtime/queries/snakemake/highlights.scm
index 8781b405c..59a180c44 100644
--- a/runtime/queries/snakemake/highlights.scm
+++ b/runtime/queries/snakemake/highlights.scm
@@ -63,20 +63,20 @@ body: (_
 ; directive labels in wildcard context
 ((wildcard
   (identifier) @label)
-  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+  (#any-of? @label "input" "jobid" "log" "output" "params" "resources" "rule" "threads" "wildcards"))
 
 ((wildcard
   (attribute
     object: (identifier) @label))
-  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+  (#any-of? @label "input" "jobid" "log" "output" "params" "resources" "rule" "threads" "wildcards"))
 
 ((wildcard
   (subscript
     value: (identifier) @label))
-  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards"))
+  (#any-of? @label "input" "jobid" "log" "output" "params" "resources" "rule" "threads" "wildcards"))
 
 ; directive labels in block context (eg. within 'run:')
 ((identifier) @label
-  (#any-of? @label "input" "log" "output" "params" "resources" "threads" "wildcards")
+  (#any-of? @label "input" "jobid" "log" "output" "params" "resources" "rule" "threads" "wildcards")
   (#has-ancestor? @label "directive")
   (#has-ancestor? @label "block"))
diff --git a/runtime/queries/snakemake/indents.scm b/runtime/queries/snakemake/indents.scm
index 140b7fb3c..d4ed63992 100644
--- a/runtime/queries/snakemake/indents.scm
+++ b/runtime/queries/snakemake/indents.scm
@@ -1,12 +1,12 @@
 ; inherits: python
 
-((rule_definition) @indent.begin
-  (#set! indent.immediate 1))
-
-((checkpoint_definition) @indent.begin
-  (#set! indent.immediate 1))
-
-((rule_inheritance) @indent.begin
+([
+  (rule_definition)
+  (checkpoint_definition)
+  (rule_inheritance)
+  (module_definition)
+  (directive)
+] @indent.begin
   (#set! indent.immediate 1))
 
 ((rule_import
@@ -14,12 +14,20 @@
   ":") @indent.begin
   (#set! indent.immediate 1))
 
-((module_definition) @indent.begin
-  (#set! indent.immediate 1))
-
-((directive) @indent.begin
-  (#set! indent.immediate 1))
-
-; end indentation after last parameter node (no following ',')
-(directive_parameters
-  (_) @indent.end .)
+; ; end indentation after last parameter node (no following ',')
+; ; accommodate different levels of nesting
+; ; see also queries/python/indents.scm: return_statement
+(directive
+  (directive_parameters
+    [
+      (_) @indent.dedent
+      (_
+        [
+          (_)
+          ")"
+          "}"
+          "]"
+        ] .) @indent.dedent
+    ]
+    . ; anchor at end: no subsequent ','
+    ))
diff --git a/runtime/queries/snakemake/locals.scm b/runtime/queries/snakemake/locals.scm
index 219f23347..8b5e7c0b4 100644
--- a/runtime/queries/snakemake/locals.scm
+++ b/runtime/queries/snakemake/locals.scm
@@ -2,3 +2,39 @@
 
 (rule_definition
   name: (identifier) @local.definition.type) @local.scope
+
+(rule_inheritance
+  alias: (as_pattern_target) @local.definition.type) @local.scope
+
+(checkpoint_definition
+  name: (identifier) @local.definition.type) @local.scope
+
+(module_definition
+  name: (identifier) @local.definition.type) @local.scope
+
+; use rule A from X
+(rule_import
+  (rule_import_list
+    (identifier) @local.definition.import)
+  .
+  module_name: (identifier) .) @local.scope
+
+; use rule A from X as A_fromX
+; use rule A from X as *_fromX
+; use rule * from X as *_fromX
+(rule_import
+  alias: (as_pattern_target) @local.definition.import .) @local.scope
+
+; use rule A from X with:
+(rule_import
+  (rule_import_list
+    (identifier) @local.definition.type)
+  .
+  module_name: (identifier)
+  .
+  "with") @local.scope
+
+; use rule A from X as Y with:
+(rule_import
+  alias: (as_pattern_target) @local.definition.type
+  "with") @local.scope
diff --git a/tests/indent/snakemake/blocks.smk b/tests/indent/snakemake/blocks.smk
new file mode 100644
index 000000000..fc10e7ae3
--- /dev/null
+++ b/tests/indent/snakemake/blocks.smk
@@ -0,0 +1,22 @@
+rule A:
+    """doc"""
+
+if True:
+    rule B:
+        """doc"""
+
+use rule other from somewhere
+
+use rule other2 from somewhere as other_alias
+
+use rule other3 from somewhere with:
+    input: 2
+
+use rule other4 from somewhere as other_alias2 with:
+    input: 2
+
+checkpoint C:
+    input: "1"
+
+module A:
+    snakefile: "x.smk"
diff --git a/tests/indent/snakemake/directive_parameters.smk b/tests/indent/snakemake/directive_parameters.smk
new file mode 100644
index 000000000..fa311bfb7
--- /dev/null
+++ b/tests/indent/snakemake/directive_parameters.smk
@@ -0,0 +1,36 @@
+rule A:
+    input: a
+    output: b
+    params:
+        a = 1,
+        b = 2,
+        c = 3
+    shell:
+        """
+        touch {output}
+        """
+
+rule B:
+    input: a,
+    output: a,
+        b
+    params:
+
+rule C:
+    # test dedent after variably nested nodes
+    params:
+        1
+    params:
+        "1"
+    params:
+        a = 1
+    params:
+        a = "1"
+    params:
+        a = call(1)
+    params:
+        a = call("1")
+    params:
+        a = config["a"]
+    params:
+        b = call(config["a"])
diff --git a/tests/indent/snakemake_spec.lua b/tests/indent/snakemake_spec.lua
new file mode 100644
index 000000000..111d01113
--- /dev/null
+++ b/tests/indent/snakemake_spec.lua
@@ -0,0 +1,49 @@
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
+
+local run = Runner:new(it, 'tests/indent/snakemake', {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe('indent Snakemake:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
+      expected_failures = {},
+    })
+  end)
+
+  describe('new line:', function()
+    run:new_line('blocks.smk', { on_line = 1, text = 'input: 1', indent = 4 })
+    run:new_line('blocks.smk', { on_line = 2, text = 'input: 1', indent = 4 })
+    run:new_line('blocks.smk', { on_line = 5, text = 'input: 1', indent = 8 })
+    run:new_line('blocks.smk', { on_line = 6, text = 'input: 1', indent = 8 })
+    run:new_line('blocks.smk', { on_line = 8, text = 'pass', indent = 0 })
+    run:new_line('blocks.smk', { on_line = 10, text = 'pass', indent = 0 })
+    run:new_line('blocks.smk', { on_line = 12, text = 'pass', indent = 4 })
+    run:new_line('blocks.smk', { on_line = 15, text = 'pass', indent = 4 })
+    run:new_line('directive_parameters.smk', { on_line = 4, text = 'before_a = 0,', indent = 8 })
+    run:new_line('directive_parameters.smk', { on_line = 5, text = 'after_a = 1.1,', indent = 8 })
+    run:new_line(
+      'directive_parameters.smk',
+      { on_line = 7, text = '"""dedent_after_last_param"""', indent = 4 }
+    )
+    run:new_line(
+      'directive_parameters.smk',
+      { on_line = 14, text = 'b = "indent_after_param_with_comma"', indent = 8 }
+    )
+    run:new_line(
+      'directive_parameters.smk',
+      { on_line = 15, text = 'b = "indent_after_param_with_comma"', indent = 8 }
+    )
+    run:new_line(
+      'directive_parameters.smk',
+      { on_line = 17, text = 'b = "indent_after_opening"', indent = 8 }
+    )
+    for _, line in ipairs({ 22, 24, 26, 28, 30, 32, 34, 36 }) do
+      run:new_line('directive_parameters.smk', { on_line = line, text = '"doc"', indent = 4 })
+    end
+  end)
+end)

From 7f8dd2e48bc47227d8138a5b5b1fb5a6d6e42237 Mon Sep 17 00:00:00 2001
From: altermo <107814000+altermo@users.noreply.github.com>
Date: Wed, 10 Sep 2025 09:29:48 +0200
Subject: [PATCH 2476/2704] fix(filetypes): correct glimmer_* mappings (#8110)

---
 plugin/filetypes.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index a7bb3bcc0..5e23adffd 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -24,7 +24,7 @@ local filetypes = {
   ini = { 'confini', 'dosini' },
   janet_simple = { 'janet' },
   javascript = { 'javascriptreact', 'ecma', 'ecmascript', 'jsx', 'js' },
-  javascript_glimmer = { 'javascript.glimmer' },
+  glimmer_javascript = { 'javascript.glimmer' },
   latex = { 'tex' },
   linkerscript = { 'ld' },
   m68k = { 'asm68k' },
@@ -53,7 +53,7 @@ local filetypes = {
   tlaplus = { 'tla' },
   tsx = { 'typescriptreact', 'typescript.tsx' },
   typescript = { 'ts' },
-  typescript_glimmer = { 'typescript.glimmer' },
+  glimmer_typescript = { 'typescript.glimmer' },
   typst = { 'typ' },
   udev = { 'udevrules' },
   uxntal = { 'tal', 'uxn' },

From f42378a959ffeaaf181b0b4793ee3cdb733324be Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 13 Sep 2025 04:24:44 -0400
Subject: [PATCH 2477/2704] feat(glimmer_*): add `glimmer_template` folds
 (#8115)

---
 runtime/queries/glimmer_javascript/folds.scm | 2 ++
 runtime/queries/glimmer_typescript/folds.scm | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/runtime/queries/glimmer_javascript/folds.scm b/runtime/queries/glimmer_javascript/folds.scm
index 04328f099..95accfece 100644
--- a/runtime/queries/glimmer_javascript/folds.scm
+++ b/runtime/queries/glimmer_javascript/folds.scm
@@ -1 +1,3 @@
 ; inherits: ecma
+
+(glimmer_template) @fold
diff --git a/runtime/queries/glimmer_typescript/folds.scm b/runtime/queries/glimmer_typescript/folds.scm
index 1b61e36da..62d0b9e0c 100644
--- a/runtime/queries/glimmer_typescript/folds.scm
+++ b/runtime/queries/glimmer_typescript/folds.scm
@@ -1 +1,3 @@
 ; inherits: typescript
+
+(glimmer_template) @fold

From f6adaede57e68eadd20c15cd1511ad4eea042cb0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 Sep 2025 10:23:18 +0200
Subject: [PATCH 2478/2704] feat(parsers): update authzed, bash, cpp, cylc,
 editorconfig, foam, gdscript, go, html, hurl, idl, java, javadoc, javascript,
 jsdoc, json, mlir, php, php_only, powershell, regex, rust, supercollider, zig

---
 lua/nvim-treesitter/parsers.lua | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 822421bfe..c3804a45e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -62,7 +62,7 @@ return {
   },
   authzed = {
     install_info = {
-      revision = '1dec7e1af96c56924e3322cd85fdce15d0a31d00',
+      revision = '83e5c26a8687eb4688fe91d690c735cc3d21ad81',
       url = 'https://github.com/mleonidas/tree-sitter-authzed',
     },
     maintainers = { '@mattpolzin' },
@@ -77,7 +77,7 @@ return {
   },
   bash = {
     install_info = {
-      revision = 'b930fed16910a74c230e09ea5b97f671448d2116',
+      revision = 'cef0974919c6fc7647a24ed1d89b291264b5abca',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -278,7 +278,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = '077f14ffd2de226ac95808596989c705f6dee289',
+      revision = 'e89fbaf0a4d294526c58259c40d5b3c16401f4e9',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -322,7 +322,7 @@ return {
   },
   cylc = {
     install_info = {
-      revision = '5517ecade85b1de85ed8e0cb742b81decc64183a',
+      revision = '6d1d81137112299324b526477ce1db989ab58fb8',
       url = 'https://github.com/elliotfontaine/tree-sitter-cylc',
     },
     maintainers = { '@elliotfontaine' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '17be0e84ac012b6731626baf6920ff24e1865a03',
+      revision = 'de41a82984170f3c1c4ff20f2e8b906e5a860e1d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -576,7 +576,7 @@ return {
   },
   foam = {
     install_info = {
-      revision = 'f08bb76892b93e5b23c45ac3bd6b1eea5df323cc',
+      revision = '472c24f11a547820327fb1be565bcfff98ea96a4',
       url = 'https://github.com/FoamScience/tree-sitter-foam',
     },
     maintainers = { '@FoamScience' },
@@ -652,7 +652,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = '8d30b8dbb84a5f786b93726dca158ae8ea3c413f',
+      revision = 'd28f24a9cc482a5274d77d41918b052e72cc18f4',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -770,7 +770,7 @@ return {
   },
   go = {
     install_info = {
-      revision = '1547678a9da59885853f5f5cc8a99cc203fa2e2c',
+      revision = '9d780544a2226ccd1a2a57299903d51d0d8c8951',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
@@ -973,7 +973,7 @@ return {
   },
   html = {
     install_info = {
-      revision = '9fc04b9ef21a92e3ea9258f5690e4461394d7811',
+      revision = '281738071a38865c9c52b41cd3f42a626407ffa1',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
@@ -1003,7 +1003,7 @@ return {
   },
   hurl = {
     install_info = {
-      revision = '1124058cd192e80d80914652a5850a5b1887cc10',
+      revision = '597efbd7ce9a814bb058f48eabd055b1d1e12145',
       url = 'https://github.com/pfeiferj/tree-sitter-hurl',
     },
     maintainers = { '@pfeiferj' },
@@ -1019,7 +1019,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '6ab5582bd47b86df75afe90cdd8dc55d2d480ce1',
+      revision = '914f1f9bea4458427351f20c25bf263288aaeb66',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1067,7 +1067,7 @@ return {
   },
   java = {
     install_info = {
-      revision = '968afb3c9be2d4dba4cd36f3580ee0b1a9c1c537',
+      revision = '12c4848bc6cf2660d80b435f8d8de1a9d4676d04',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'fea74f50f5a6dcef575687703b82a96f9e6d1312',
+      revision = 'a1917ed4cbf5c9438abbeb0a9d02b2d87bfebf7c',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1083,7 +1083,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = '44c892e0be055ac465d5eeddae6d3e194424e7de',
+      revision = '22da14e17db59c35aae2b9da2728337c301ce741',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1121,7 +1121,7 @@ return {
   },
   jsdoc = {
     install_info = {
-      revision = 'a417db5dbdd869fccb6a8b75ec04459e1d4ccd2c',
+      revision = '658d18dcdddb75c760363faa4963427a7c6b52db',
       url = 'https://github.com/tree-sitter/tree-sitter-jsdoc',
     },
     maintainers = { '@steelsojka' },
@@ -1129,7 +1129,7 @@ return {
   },
   json = {
     install_info = {
-      revision = 'fd38547e2fe5738e5b173e5f40a27df261224bba',
+      revision = '532a34b9e5a64fdcd5a8748a917fd489aa06d6fb',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '1f3bc2fd4d4e28361d1ff75cf5763e1d0c2b6348',
+      revision = 'ef7a2efed65814aa394875e2b578ff6aeb272b41',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1574,7 +1574,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '5b5627faaa290d89eb3d01b9bf47c3bb9e797dea',
+      revision = '9d7d6f649297ee01639e759795793cc57698031b',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1585,7 +1585,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '5b5627faaa290d89eb3d01b9bf47c3bb9e797dea',
+      revision = '9d7d6f649297ee01639e759795793cc57698031b',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1653,7 +1653,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '96ab1da05cfb55b52ee7000b4be8a4b6fad232f5',
+      revision = 'f272e5ac9bc48d0f6df2429cab914d216e9413cd',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1877,7 +1877,7 @@ return {
   },
   regex = {
     install_info = {
-      revision = 'b638d29335ef41215b86732dd51be34c701ef683',
+      revision = 'b2ac15e27fce703d2f37a79ccd94a5c0cbe9720b',
       url = 'https://github.com/tree-sitter/tree-sitter-regex',
     },
     maintainers = { '@theHamsta' },
@@ -1974,7 +1974,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '3bfef41a01ab49a25ffdecf998823b4b82fcaf69',
+      revision = '2a58b00ed44829eebcbe6f932604093b9396a43b',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2174,7 +2174,7 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = 'c6145cad24e19485f6ceb86e0a1be479d6537fb0',
+      revision = '613bac2ddc30bff4f0a1d88b1aa7e5ec8ca37028',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
@@ -2655,7 +2655,7 @@ return {
   },
   zig = {
     install_info = {
-      revision = 'b71affffdb4222ff2d2dea6e164f76603b0be6bc',
+      revision = '6479aa13f32f701c383083d8b28360ebd682fb7d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-zig',
     },
     maintainers = { '@amaanq' },

From 682d083292f01636622362cf9eb0e4b2f9de2b13 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 Sep 2025 10:31:02 +0200
Subject: [PATCH 2479/2704] feat(python)!: update parser and queries

Breaking change: anonymous node `"expect*"` was removed by the refactor.
---
 lua/nvim-treesitter/parsers.lua       | 2 +-
 runtime/queries/python/highlights.scm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c3804a45e..f9f9620e4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1772,7 +1772,7 @@ return {
   },
   python = {
     install_info = {
-      revision = '710796b8b877a970297106e5bbc8e2afa47f86ec',
+      revision = '293fdc02038ee2bf0e2e206711b69c90ac0d413f',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 00250de1b..e5b9ac3aa 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -223,7 +223,6 @@
 [
   "try"
   "except"
-  "except*"
   "raise"
   "finally"
 ] @keyword.exception

From 7aa24acae3a288e442e06928171f360bbdf75ba4 Mon Sep 17 00:00:00 2001
From: purarue <7804791+purarue@users.noreply.github.com>
Date: Sun, 14 Sep 2025 08:53:21 +0000
Subject: [PATCH 2480/2704] feat(rifleconf): add parser and queries

---
 SUPPORTED_LANGUAGES.md                   |  1 +
 lua/nvim-treesitter/parsers.lua          |  8 ++++++
 runtime/queries/rifleconf/highlights.scm | 31 ++++++++++++++++++++++++
 runtime/queries/rifleconf/injections.scm | 16 ++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 runtime/queries/rifleconf/highlights.scm
 create mode 100644 runtime/queries/rifleconf/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 25c5e1137..361585ab2 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -244,6 +244,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [rego](https://github.com/FallenAngel97/tree-sitter-rego) | unstable | `H  J ` |   | @FallenAngel97
 [requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | unstable | `H  J ` |   | @ObserverOfTime
 [rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` |   | @ribru17
+[rifleconf](https://github.com/purarue/tree-sitter-rifleconf) | unstable | `H  J ` |   | @purarue
 [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` |   | @bamonroe
 [robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` |   | @Hubro
 [robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` |   | @opa-oz
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f9f9620e4..096d93599 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1908,6 +1908,14 @@ return {
     maintainers = { '@ribru17' },
     tier = 2,
   },
+  rifleconf = {
+    install_info = {
+      url = 'https://github.com/purarue/tree-sitter-rifleconf',
+      revision = 'b215640ba72a9a8cac6f5d95dbc3d320cb546e13',
+    },
+    maintainers = { '@purarue' },
+    tier = 2,
+  },
   rnoweb = {
     install_info = {
       revision = '1a74dc0ed731ad07db39f063e2c5a6fe528cae7f',
diff --git a/runtime/queries/rifleconf/highlights.scm b/runtime/queries/rifleconf/highlights.scm
new file mode 100644
index 000000000..2ac837a3e
--- /dev/null
+++ b/runtime/queries/rifleconf/highlights.scm
@@ -0,0 +1,31 @@
+(comment) @comment @spell
+
+[
+  ","
+  ";"
+] @punctuation.delimiter
+
+[
+  "="
+  (condition_negation)
+] @operator
+
+; mark the string values for items interpreted as regex as string.regexp
+(binary_condition_expression
+  (binary_condition_identifier) @_keyword
+  (identifier) @string.regexp
+  (#any-of? @_keyword "match" "ext" "mime" "name" "path"))
+
+(binary_condition_identifier) @keyword
+
+(unary_condition_identifier) @keyword
+
+(condition_expression
+  (binary_condition_expression
+    (binary_condition_identifier) @keyword
+    (identifier) @number)
+  (#eq? @keyword "number"))
+
+(ask) @function.builtin
+
+(string) @string
diff --git a/runtime/queries/rifleconf/injections.scm b/runtime/queries/rifleconf/injections.scm
new file mode 100644
index 000000000..e0463982f
--- /dev/null
+++ b/runtime/queries/rifleconf/injections.scm
@@ -0,0 +1,16 @@
+; These are all interpreted as regex when evaluated
+; https://github.com/ranger/ranger/blob/38bb8901004b75a407ffee4b9e176bc0a436cb15/ranger/ext/rifle.py#L273-L282
+(binary_condition_expression
+  (binary_condition_identifier) @_keyword
+  (identifier) @injection.content
+  (#any-of? @_keyword "match" "ext" "mime" "name" "path")
+  (#set! injection.language "regex"))
+
+; highlight any commands using the bash tree-sitter parser
+(command_list
+  (command) @injection.content
+  (#set! injection.include-children)
+  (#set! injection.language "bash"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 030e979b23a65a22f1c0a43396e6c7cf676c8735 Mon Sep 17 00:00:00 2001
From: "Sergio A. Vargas" <savargasqu+git@unal.edu.co>
Date: Wed, 17 Sep 2025 10:53:25 -0500
Subject: [PATCH 2481/2704] docs(README): clarify that `tree-sitter-cli` is
 required (#8124)

Seems like most distros have split out the CLI package under this name and reserve `tree-sitter` for the library (and crates) only.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 921b11002..bdb9c1ddc 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ For details on these and how to help improving them, see [CONTRIBUTING.md](./CON
 
 - Neovim 0.11.0 or later (nightly)
 - `tar` and `curl` in your path
-- [`tree-sitter`](https://github.com/tree-sitter/tree-sitter) CLI (0.25.0 or later)
+- [`tree-sitter-cli`](https://github.com/tree-sitter/tree-sitter/blob/master/crates/cli/README.md) (0.25.0 or later)
 - a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
 - `Node` (23.0.0 or later) for some parsers (see the [list of supported languages](SUPPORTED_LANGUAGES.md))
 

From f4d22b96c58c799939b014e03eb4db1b5e5c82c9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Sep 2025 17:56:17 +0200
Subject: [PATCH 2482/2704] docs(health): consistent use of `tree-sitter-cli`

---
 lua/nvim-treesitter/health.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 856e2183e..3da7f5415 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -54,14 +54,14 @@ local function install_health()
     local ts = check_exe('tree-sitter')
     if ts then
       if vim.version.ge(ts.version, TREE_SITTER_MIN_VER) then
-        health.ok(string.format('tree-sitter %s (%s)', ts.version, ts.path))
+        health.ok(string.format('tree-sitter-cli %s (%s)', ts.version, ts.path))
       else
         health.error(
-          string.format('tree-sitter CLI v%d.%d.%d is required', unpack(TREE_SITTER_MIN_VER))
+          string.format('tree-sitter-cli v%d.%d.%d is required', unpack(TREE_SITTER_MIN_VER))
         )
       end
     else
-      health.error('tree-sitter CLI not found')
+      health.error('tree-sitter-cli not found')
     end
   end
 

From 1c760c1888f5e7474d1ae222f0638cb3b731629b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Sep 2025 18:08:02 +0200
Subject: [PATCH 2483/2704] feat(parsers): update bash, c, cpp, desktop, djot,
 dtd, editorconfig, gdscript, go, html, idl, java, javadoc, javascript, json,
 markdown, markdown_inline, mlir, php, php_only, python, r, rust, scheme,
 ssh_config, supercollider, superhtml, systemverilog, templ, xml, xresources

---
 lua/nvim-treesitter/parsers.lua       | 64 +++++++++++++--------------
 runtime/queries/python/highlights.scm | 12 +++--
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 096d93599..ff27ab5d9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -77,7 +77,7 @@ return {
   },
   bash = {
     install_info = {
-      revision = 'cef0974919c6fc7647a24ed1d89b291264b5abca',
+      revision = '20f55fb9663568f16ebceaac7673d2aa530add46',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
@@ -158,7 +158,7 @@ return {
   },
   c = {
     install_info = {
-      revision = 'd8d0503aa0152119149ecad76685f37682c0d03f',
+      revision = 'ae19b676b13bdcc13b7665397e6d9b14975473dd',
       url = 'https://github.com/tree-sitter/tree-sitter-c',
     },
     maintainers = { '@amaanq' },
@@ -278,7 +278,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = 'e89fbaf0a4d294526c58259c40d5b3c16401f4e9',
+      revision = '2a682d312b09eb737a08b4900ec786415574b6bf',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'ea5cff078ebd8abb42598e006e549e5cb75d4752',
+      revision = '4a0a5eec8644a7f3357f852d7a16d2550bb2cbc2',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -386,7 +386,7 @@ return {
   },
   djot = {
     install_info = {
-      revision = 'eb31845d59b9ee8c1b2098e78e9ca72004bd1579',
+      revision = '74fac1f53c6d52aeac104b6874e5506be6d0cfe6',
       url = 'https://github.com/treeman/tree-sitter-djot',
     },
     maintainers = { '@NoahTheDuke' },
@@ -419,7 +419,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '87be254e12169240a0e0214dbee5e208df96fa75',
+      revision = '863dbc381f44f6c136a399e684383b977bb2beaa',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'de41a82984170f3c1c4ff20f2e8b906e5a860e1d',
+      revision = '947228fb880f838c6d71e8f11dbc0bfb82cd4c78',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -652,7 +652,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = 'd28f24a9cc482a5274d77d41918b052e72cc18f4',
+      revision = 'e8f2cb84bfd61d025cbc39e95346ebc6b866daf1',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -770,7 +770,7 @@ return {
   },
   go = {
     install_info = {
-      revision = '9d780544a2226ccd1a2a57299903d51d0d8c8951',
+      revision = '2346a3ab1bb3857b48b29d779a1ef9799a248cd7',
       url = 'https://github.com/tree-sitter/tree-sitter-go',
     },
     maintainers = { '@theHamsta', '@WinWisely268' },
@@ -973,7 +973,7 @@ return {
   },
   html = {
     install_info = {
-      revision = '281738071a38865c9c52b41cd3f42a626407ffa1',
+      revision = '73a3947324f6efddf9e17c0ea58d454843590cc0',
       url = 'https://github.com/tree-sitter/tree-sitter-html',
     },
     maintainers = { '@TravonteD' },
@@ -1019,7 +1019,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '914f1f9bea4458427351f20c25bf263288aaeb66',
+      revision = '3632e926ef4ba924b05993683111480af0d5c9e3',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1067,7 +1067,7 @@ return {
   },
   java = {
     install_info = {
-      revision = '12c4848bc6cf2660d80b435f8d8de1a9d4676d04',
+      revision = 'e10607b45ff745f5f876bfa3e94fbcc6b44bdc11',
       url = 'https://github.com/tree-sitter/tree-sitter-java',
     },
     maintainers = { '@p00f' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'a1917ed4cbf5c9438abbeb0a9d02b2d87bfebf7c',
+      revision = '85acd4655cbfaef414de6e3f87436e63ef5cb0da',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1083,7 +1083,7 @@ return {
   },
   javascript = {
     install_info = {
-      revision = '22da14e17db59c35aae2b9da2728337c301ce741',
+      revision = '58404d8cf191d69f2674a8fd507bd5776f46cb11',
       url = 'https://github.com/tree-sitter/tree-sitter-javascript',
     },
     maintainers = { '@steelsojka' },
@@ -1129,7 +1129,7 @@ return {
   },
   json = {
     install_info = {
-      revision = '532a34b9e5a64fdcd5a8748a917fd489aa06d6fb',
+      revision = '001c28d7a29832b06b0e831ec77845553c89b56d',
       url = 'https://github.com/tree-sitter/tree-sitter-json',
     },
     maintainers = { '@steelsojka' },
@@ -1347,7 +1347,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '7462bb66ac7e90312082269007fac2772fe5efd1',
+      revision = '2dfd57f547f06ca5631a80f601e129d73fc8e9f0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1358,7 +1358,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '7462bb66ac7e90312082269007fac2772fe5efd1',
+      revision = '2dfd57f547f06ca5631a80f601e129d73fc8e9f0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'ef7a2efed65814aa394875e2b578ff6aeb272b41',
+      revision = 'fc6f378f2ce6ceee11ea31fbfc8d72955d9bbe27',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1574,7 +1574,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '9d7d6f649297ee01639e759795793cc57698031b',
+      revision = '9a85df21c63bdaf1695b7ac1430e29354cb5904f',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1585,7 +1585,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '9d7d6f649297ee01639e759795793cc57698031b',
+      revision = '9a85df21c63bdaf1695b7ac1430e29354cb5904f',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1772,7 +1772,7 @@ return {
   },
   python = {
     install_info = {
-      revision = '293fdc02038ee2bf0e2e206711b69c90ac0d413f',
+      revision = '26855eabccb19c6abf499fbc5b8dc7cc9ab8bc64',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
@@ -1814,7 +1814,7 @@ return {
   },
   r = {
     install_info = {
-      revision = '7b4eb04dfcc86e6705cade825f8c1edbd46584b2',
+      revision = '0e6ef7741712c09dc3ee6e81c42e919820cc65ef',
       url = 'https://github.com/r-lib/tree-sitter-r',
     },
     maintainers = { '@ribru17' },
@@ -1910,8 +1910,8 @@ return {
   },
   rifleconf = {
     install_info = {
-      url = 'https://github.com/purarue/tree-sitter-rifleconf',
       revision = 'b215640ba72a9a8cac6f5d95dbc3d320cb546e13',
+      url = 'https://github.com/purarue/tree-sitter-rifleconf',
     },
     maintainers = { '@purarue' },
     tier = 2,
@@ -1982,7 +1982,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '2a58b00ed44829eebcbe6f932604093b9396a43b',
+      revision = '00d7cbc95f0b8ea2703129550fbd1853a13e0e29',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2008,7 +2008,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = 'e35b41a183164f4a12e10da3d0c430e837c3d75a',
+      revision = '67b5c8d6ce19fd5265f13204fec0a3efa9e095d9',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2150,7 +2150,7 @@ return {
   },
   ssh_config = {
     install_info = {
-      revision = '2d620d0ad636705800cf0ddb92c30afe703cd84f',
+      revision = '71d2693deadaca8cdc09e38ba41d2f6042da1616',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-ssh-config',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2182,7 +2182,7 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = '613bac2ddc30bff4f0a1d88b1aa7e5ec8ca37028',
+      revision = '18be2f121ea0a722dfdffcc4439687fc1d10a9ce',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
@@ -2191,7 +2191,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '8cb16babb0c66b6512d6aeb4cbc37ed90641d980',
+      revision = '521458b2a61e607d07b794d85b5dcfcd10518745',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2249,7 +2249,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '999e88565e199abec12d6fb7470419b5ae217386',
+      revision = '9e06a0dddbef4e80a2091fd0a772cc93a55019f7',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2298,7 +2298,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = '47594c5cbef941e6a3ccf4ddb934a68cf4c68075',
+      revision = '27a1fc62c8dd4c49669e03629491f66449c6c435',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2614,7 +2614,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '87be254e12169240a0e0214dbee5e208df96fa75',
+      revision = '863dbc381f44f6c136a399e684383b977bb2beaa',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2623,7 +2623,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '423597c9ee0cd9fd98691a9f9881ff4e6f7b047a',
+      revision = '64a07d24c34a8e7915360e6ab367e9b0ff991307',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index e5b9ac3aa..0cdc957d0 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -358,17 +358,15 @@
 
 ((class_definition
   body: (block
-    (expression_statement
-      (assignment
-        left: (identifier) @variable.member))))
+    (assignment
+      left: (identifier) @variable.member)))
   (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition
   body: (block
-    (expression_statement
-      (assignment
-        left: (_
-          (identifier) @variable.member)))))
+    (assignment
+      left: (_
+        (identifier) @variable.member))))
   (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition

From 8ab64a37ea56762dc0d1a6da2bba2d4af88e3594 Mon Sep 17 00:00:00 2001
From: sharpchen <rui.chen.sharp@gmail.com>
Date: Wed, 17 Sep 2025 22:48:13 +0800
Subject: [PATCH 2484/2704] fix(c_sharp): missing query for delegate name

---
 runtime/queries/c_sharp/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/c_sharp/highlights.scm b/runtime/queries/c_sharp/highlights.scm
index ce9911151..d8cf08388 100644
--- a/runtime/queries/c_sharp/highlights.scm
+++ b/runtime/queries/c_sharp/highlights.scm
@@ -190,6 +190,9 @@
 (enum_declaration
   name: (identifier) @type)
 
+(delegate_declaration
+  name: (identifier) @type)
+
 (enum_member_declaration
   name: (identifier) @variable.member)
 

From 317a77affcd887441d67c5f7f1d5beff5243989b Mon Sep 17 00:00:00 2001
From: sharpchen <rui.chen.sharp@gmail.com>
Date: Thu, 18 Sep 2025 23:02:03 +0800
Subject: [PATCH 2485/2704] fix(c_sharp): missing highlight for parameter
 modifier

---
 runtime/queries/c_sharp/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/c_sharp/highlights.scm b/runtime/queries/c_sharp/highlights.scm
index d8cf08388..0c9489506 100644
--- a/runtime/queries/c_sharp/highlights.scm
+++ b/runtime/queries/c_sharp/highlights.scm
@@ -90,6 +90,9 @@
 (parameter
   name: (identifier) @variable.parameter)
 
+(parameter
+  (modifier) @keyword.modifier)
+
 (parameter_list
   name: (identifier) @variable.parameter)
 

From 1b8622a830da30c348998f26fab6934ca0133392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20de=20Vill=C3=A8le?=
 <25150288+Thibaulltt@users.noreply.github.com>
Date: Fri, 5 Sep 2025 10:46:07 +0200
Subject: [PATCH 2486/2704] feat(latex)!: update parser and queries

Breaking change: `(curly_group_label)` replaced by `(curly_group_text)`

see latex-lsp/tree-sitter-latex#213
---
 lua/nvim-treesitter/parsers.lua      | 2 +-
 runtime/queries/latex/highlights.scm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ff27ab5d9..8ea842356 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1240,7 +1240,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = '9410012b3eba659da5de5a655b4041593b493cb7',
+      revision = '7af2bf3addcab5ada8843cf08b857daf1799dbd4',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
diff --git a/runtime/queries/latex/highlights.scm b/runtime/queries/latex/highlights.scm
index ec39afcf5..30602c907 100644
--- a/runtime/queries/latex/highlights.scm
+++ b/runtime/queries/latex/highlights.scm
@@ -92,9 +92,9 @@
 
 (label_reference_range
   command: _ @function.macro
-  from: (curly_group_text
+  from: (curly_group_label
     (_) @markup.link)
-  to: (curly_group_text
+  to: (curly_group_label
     (_) @markup.link))
 
 (label_reference
@@ -104,7 +104,7 @@
 
 (label_number
   command: _ @function.macro
-  name: (curly_group_text
+  name: (curly_group_label
     (_) @markup.link)
   number: (_) @markup.link)
 

From c41b3b9841588e956663345cf01842a232d5eece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20de=20Vill=C3=A8le?=
 <25150288+Thibaulltt@users.noreply.github.com>
Date: Fri, 5 Sep 2025 11:12:12 +0200
Subject: [PATCH 2487/2704] feat(latex): add counter nodes' highlight rules

---
 lua/nvim-treesitter/parsers.lua      |  2 +-
 runtime/queries/latex/highlights.scm | 59 ++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8ea842356..16d575512 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1240,7 +1240,7 @@ return {
   latex = {
     install_info = {
       generate = true,
-      revision = '7af2bf3addcab5ada8843cf08b857daf1799dbd4',
+      revision = '7e0ecdc02926c7b9b2e0c76003d4fe7b0944f957',
       url = 'https://github.com/latex-lsp/tree-sitter-latex',
     },
     maintainers = { '@theHamsta', '@clason' },
diff --git a/runtime/queries/latex/highlights.scm b/runtime/queries/latex/highlights.scm
index 30602c907..3f195a13e 100644
--- a/runtime/queries/latex/highlights.scm
+++ b/runtime/queries/latex/highlights.scm
@@ -23,6 +23,9 @@
 (curly_group_spec
   (text) @variable.parameter)
 
+(curly_group_value
+  (value_literal) @constant)
+
 (brack_group_argc) @variable.parameter
 
 [
@@ -85,6 +88,54 @@
   declaration: (curly_group_command_name
     (_) @function))
 
+(counter_declaration
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable)
+  supercounter: (brack_group_word
+    (word) @variable)?)
+
+(counter_within_declaration
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable)
+  supercounter: (curly_group_word
+    (word) @variable))
+
+(counter_without_declaration
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable)
+  supercounter: (curly_group_word
+    (word) @variable))
+
+(counter_value
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable))
+
+; The 'value' fields for the two following highlights
+; are handled by counter_value and curly_group_value.
+(counter_definition
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable))
+
+(counter_addition
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable))
+
+(counter_increment
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable))
+
+(counter_typesetting
+  command: _ @function.macro @nospell
+  counter: (curly_group_word
+    (word) @variable))
+
 (label_definition
   command: _ @function.macro
   name: (curly_group_label
@@ -298,6 +349,14 @@
 
 ; Turn spelling off for whole nodes
 [
+  (counter_declaration)
+  (counter_within_declaration)
+  (counter_without_declaration)
+  (counter_value)
+  (counter_definition)
+  (counter_addition)
+  (counter_increment)
+  (counter_typesetting)
   (label_reference)
   (label_reference_range)
   (label_number)

From 20fc6b1270dddff7e16220e0a51d17614d41fd43 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 19 Sep 2025 13:35:29 +0200
Subject: [PATCH 2488/2704] feat(python): revert breaking change

This reverts the update in
https://github.com/nvim-treesitter/nvim-treesitter/pull/8128 which
turned out to have further breaking consequences.

Pin the parser to the last release (tier 1) to avoid pulling in more
breaking changes.
---
 SUPPORTED_LANGUAGES.md                |  2 +-
 lua/nvim-treesitter/parsers.lua       |  4 ++--
 runtime/queries/python/highlights.scm | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 361585ab2..61371d0e0 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -227,7 +227,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | unstable | `HFIJL` |   | @amaanq
 [purescript](https://github.com/postsolar/tree-sitter-purescript) | unstable | `H  JL` |   | @postsolar
 [pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | unstable | `H  J ` |   | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) | unstable | `HFIJL` |   | @stsewd, @theHamsta
+[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` |   | @stsewd, @theHamsta
 [ql](https://github.com/tree-sitter/tree-sitter-ql) | unstable | `HFIJL` |   | @pwntester
 [qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | unstable | `H  J ` |   | @amaanq
 [qmljs](https://github.com/yuja/tree-sitter-qmljs) | unstable | `HF J ` |   | @Decodetalkers
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 16d575512..79fe3a6b6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1772,11 +1772,11 @@ return {
   },
   python = {
     install_info = {
-      revision = '26855eabccb19c6abf499fbc5b8dc7cc9ab8bc64',
+      revision = 'v0.25.0',
       url = 'https://github.com/tree-sitter/tree-sitter-python',
     },
     maintainers = { '@stsewd', '@theHamsta' },
-    tier = 2,
+    tier = 1,
   },
   ql = {
     install_info = {
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 0cdc957d0..e5b9ac3aa 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -358,15 +358,17 @@
 
 ((class_definition
   body: (block
-    (assignment
-      left: (identifier) @variable.member)))
+    (expression_statement
+      (assignment
+        left: (identifier) @variable.member))))
   (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition
   body: (block
-    (assignment
-      left: (_
-        (identifier) @variable.member))))
+    (expression_statement
+      (assignment
+        left: (_
+          (identifier) @variable.member)))))
   (#lua-match? @variable.member "^[%l_].*$"))
 
 ((class_definition

From a1d3efbdf587a4c220d08249b1a4d8870c828d38 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 21 Sep 2025 10:32:52 +0200
Subject: [PATCH 2489/2704] feat(parsers): update ada, cuda, desktop, gdscript,
 json5, mlir, nu, slint, snakemake, supercollider, superhtml, vhdl, wgsl_bevy,
 xresources

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 79fe3a6b6..9e3a32e2e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2,7 +2,7 @@
 return {
   ada = {
     install_info = {
-      revision = '0a4c27dc1308a9d2742de22e5fcfc0c137b3d3f3',
+      revision = '364d3f4aa8b382113bdd5d3ca6d82dc9c74ac738',
       url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
@@ -305,7 +305,7 @@ return {
   },
   cuda = {
     install_info = {
-      revision = '014628ae8d2df391b88ddb9fa0260fd97f770829',
+      revision = '48b066f334f4cf2174e05a50218ce2ed98b6fd01',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-cuda',
     },
     maintainers = { '@theHamsta' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '4a0a5eec8644a7f3357f852d7a16d2550bb2cbc2',
+      revision = 'b77dad972dcc96f9a7123fb08d8eb46308e31d9a',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -652,7 +652,7 @@ return {
   },
   gdscript = {
     install_info = {
-      revision = 'e8f2cb84bfd61d025cbc39e95346ebc6b866daf1',
+      revision = '9686853b696db07118ad110e440d6de0ca6498b4',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
     maintainers = { '@PrestonKnopp' },
@@ -1137,7 +1137,7 @@ return {
   },
   json5 = {
     install_info = {
-      revision = '5ebe24e210f0fbcd6180fd673ed184ed81f3bcc6',
+      revision = '8cb4114a4d7e5bab75d74466422e032de31d83df',
       url = 'https://github.com/Joakker/tree-sitter-json5',
     },
     maintainers = { '@Joakker' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'fc6f378f2ce6ceee11ea31fbfc8d72955d9bbe27',
+      revision = '8f86b34b5e3dfe561e1e913df4a3d719ea1dcc5c',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1479,7 +1479,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'cc4624fbc6ec3563d98fbe8f215a8b8e10b16f32',
+      revision = '0e6c59c46db3c246eaf86ce5b325da1247e971a5',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -2051,7 +2051,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = 'ecd60078bbd546eeb4c7fbbe02226752517b847f',
+      revision = '152ec7f6a2aa29fe222f741d91bec70153c487da',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2075,7 +2075,7 @@ return {
   },
   snakemake = {
     install_info = {
-      revision = '7731408e5e8095fe242fdd423c3d3ae886fbf9fd',
+      revision = '68010430c3e51c0e84c1ce21c6551df0e2469f51',
       url = 'https://github.com/osthomas/tree-sitter-snakemake',
     },
     maintainers = { '@osthomas' },
@@ -2182,7 +2182,7 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = '18be2f121ea0a722dfdffcc4439687fc1d10a9ce',
+      revision = '76b3cab1773f08bb7d3a185420b0a44c6da8c294',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
@@ -2191,7 +2191,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '521458b2a61e607d07b794d85b5dcfcd10518745',
+      revision = '574a7a000c6e6a8a922c11afa9da60dca84e5e1f',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2515,7 +2515,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '02523d7fb0321344c19c1f3f4ec6b83424c7d6c8',
+      revision = '0c25aa064dc489ec5291e4879fa7ed41cf5fe680',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2573,7 +2573,7 @@ return {
   },
   wgsl_bevy = {
     install_info = {
-      revision = '47c1818d245a6156a488c4c4d06e9336714bae9b',
+      revision = 'd9306a798ede627001a8e5752f775858c8edd7e4',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy',
     },
     maintainers = { '@theHamsta' },
@@ -2623,7 +2623,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '64a07d24c34a8e7915360e6ab367e9b0ff991307',
+      revision = '2259ae28ad0e139b726dab286f7fa9626a1c2256',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From bd99d6bd2bdd346c5da090db5e3956de0e0a2f3f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 21 Sep 2025 10:38:22 +0200
Subject: [PATCH 2490/2704] feat(koto)!: update parser and queries

Breaking changes: `call`, `index`, `lookup` fields removed
---
 lua/nvim-treesitter/parsers.lua     | 2 +-
 runtime/queries/koto/highlights.scm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9e3a32e2e..0ddc29cd4 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1215,7 +1215,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '2ffc77c14f0ac1674384ff629bfc207b9c57ed89',
+      revision = '633744bca404ae4edb961a3c2d7bc947a987afa4',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
diff --git a/runtime/queries/koto/highlights.scm b/runtime/queries/koto/highlights.scm
index bd6ce8d0e..396d9bdc6 100644
--- a/runtime/queries/koto/highlights.scm
+++ b/runtime/queries/koto/highlights.scm
@@ -90,7 +90,8 @@
   (identifier) @module)
 
 (chain
-  lookup: (identifier) @variable.member)
+  (lookup
+    (identifier)) @variable.member)
 
 (chain
   start: (identifier) @function.call)

From 6ac9f2e51270cd6f57c4783a36c60cd03e4cfb94 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 21 Sep 2025 16:59:47 -0700
Subject: [PATCH 2491/2704] fix: align line continuation highlights (#8146)

These should be `@punctuation.special`. Added the highlight for python,
cylc, and make. Corrected it for earthfile and matlab.
---
 runtime/queries/cylc/highlights.scm      | 2 ++
 runtime/queries/earthfile/highlights.scm | 2 +-
 runtime/queries/make/highlights.scm      | 2 ++
 runtime/queries/matlab/highlights.scm    | 7 +++----
 runtime/queries/python/highlights.scm    | 2 ++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/runtime/queries/cylc/highlights.scm b/runtime/queries/cylc/highlights.scm
index a744caa52..086caf788 100644
--- a/runtime/queries/cylc/highlights.scm
+++ b/runtime/queries/cylc/highlights.scm
@@ -32,6 +32,8 @@
   (graph_parenthesis)
 ] @punctuation.bracket
 
+(line_continuation) @punctuation.special
+
 [
   "\""
   "\"\"\""
diff --git a/runtime/queries/earthfile/highlights.scm b/runtime/queries/earthfile/highlights.scm
index cc7dce298..ee0e300b5 100644
--- a/runtime/queries/earthfile/highlights.scm
+++ b/runtime/queries/earthfile/highlights.scm
@@ -126,4 +126,4 @@
 
 "=" @operator
 
-(line_continuation) @operator
+(line_continuation) @punctuation.special
diff --git a/runtime/queries/make/highlights.scm b/runtime/queries/make/highlights.scm
index afdfbe336..8d182c026 100644
--- a/runtime/queries/make/highlights.scm
+++ b/runtime/queries/make/highlights.scm
@@ -168,3 +168,5 @@
     "file"
     "value"
   ] @function.builtin)
+
+"\\" @punctuation.special
diff --git a/runtime/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
index 66ec69465..05713e05a 100644
--- a/runtime/queries/matlab/highlights.scm
+++ b/runtime/queries/matlab/highlights.scm
@@ -211,10 +211,9 @@
   (#eq? @boolean "false"))
 
 ; Comments
-[
-  (comment)
-  (line_continuation)
-] @comment @spell
+(comment) @comment @spell
+
+(line_continuation) @punctuation.special
 
 ((comment) @keyword.directive
   (#lua-match? @keyword.directive "^%%%% "))
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index e5b9ac3aa..3e777d08b 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -247,6 +247,8 @@
   "{" @punctuation.special
   "}" @punctuation.special)
 
+(line_continuation) @punctuation.special
+
 (type_conversion) @function.macro
 
 [

From 53819acac287632ee2b62e0f7b63057904984906 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Thu, 11 Sep 2025 15:27:19 +0200
Subject: [PATCH 2492/2704] feat(snl): add parser and queries

---
 SUPPORTED_LANGUAGES.md             |   2 +
 lua/nvim-treesitter/parsers.lua    |   9 ++
 runtime/queries/snl/folds.scm      |  21 +++
 runtime/queries/snl/highlights.scm | 245 +++++++++++++++++++++++++++++
 runtime/queries/snl/indents.scm    |  61 +++++++
 runtime/queries/snl/injections.scm | 117 ++++++++++++++
 runtime/queries/snl/locals.scm     |  65 ++++++++
 7 files changed, 520 insertions(+)
 create mode 100644 runtime/queries/snl/folds.scm
 create mode 100644 runtime/queries/snl/highlights.scm
 create mode 100644 runtime/queries/snl/indents.scm
 create mode 100644 runtime/queries/snl/injections.scm
 create mode 100644 runtime/queries/snl/locals.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 61371d0e0..2cc4bd6a9 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -265,6 +265,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | unstable | `HFIJL` |   | @amaanq
 [smithy](https://github.com/indoorvivants/tree-sitter-smithy) | unstable | `H  J ` |   | @amaanq, @keynmol
 [snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` |   | @osthomas
+[snl](https://github.com/minijackson/tree-sitter-snl)[^snl] | unstable | `HFIJL` |   | @minijackson
 [solidity](https://github.com/JoranHonig/tree-sitter-solidity) | unstable | `HF J ` |   | @amaanq
 [soql](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` |   | @aheber, @xixiafinland
 [sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` |   | @aheber, @xixiafinland
@@ -359,4 +360,5 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [^query]: Tree-sitter query language
 [^sflog]: Salesforce debug log
 [^slang]: Shader Slang
+[^snl]: EPICS Sequencer's SNL files
 <!--parserinfo-->
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0ddc29cd4..6a64739fa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2081,6 +2081,15 @@ return {
     maintainers = { '@osthomas' },
     tier = 2,
   },
+  snl = {
+    install_info = {
+      url = 'https://github.com/minijackson/tree-sitter-snl',
+      revision = '846e2d6809ac5863a15b5494f20fd267c21221c8',
+    },
+    maintainers = { '@minijackson' },
+    readme_note = "EPICS Sequencer's SNL files",
+    tier = 2,
+  },
   solidity = {
     install_info = {
       revision = '4e938a46c7030dd001bc99e1ac0f0c750ac98254',
diff --git a/runtime/queries/snl/folds.scm b/runtime/queries/snl/folds.scm
new file mode 100644
index 000000000..65e50c62f
--- /dev/null
+++ b/runtime/queries/snl/folds.scm
@@ -0,0 +1,21 @@
+[
+  (for_statement)
+  (if_statement)
+  (while_statement)
+  (funcdef)
+  (structdef)
+  (comment)
+  (preproc_if)
+  (preproc_elif)
+  (preproc_else)
+  (preproc_ifdef)
+  (preproc_function_def)
+  (init_expr)
+  (entry)
+  (state_set)
+  (state)
+  (exit)
+] @fold
+
+(initial_defn
+  (preproc_include))+ @fold
diff --git a/runtime/queries/snl/highlights.scm b/runtime/queries/snl/highlights.scm
new file mode 100644
index 000000000..423a7deb7
--- /dev/null
+++ b/runtime/queries/snl/highlights.scm
@@ -0,0 +1,245 @@
+(identifier) @variable
+
+[
+  "enum"
+  "struct"
+  "union"
+] @keyword.type
+
+[
+  "assign"
+  "const"
+  "entry"
+  "exit"
+  "foreign"
+  "monitor"
+  "option"
+  "program"
+  "ss"
+  "state"
+  "sync"
+  "syncq"
+  "to"
+  "typename"
+] @keyword
+
+"sizeof" @keyword.operator
+
+"return" @keyword.return
+
+[
+  "while"
+  "for"
+  "continue"
+  "break"
+] @keyword.repeat
+
+[
+  "if"
+  "else"
+  "when"
+] @keyword.conditional
+
+[
+  "#elif"
+  "#else"
+  "#endif"
+  "#if"
+  "#ifdef"
+  "#ifndef"
+  (preproc_directive)
+  (line_marker)
+] @keyword.directive
+
+"#define" @keyword.directive.define
+
+"#include" @keyword.import
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "."
+  ","
+  ";"
+] @punctuation.delimiter
+
+[
+  "%%"
+  "%{"
+  "}%"
+  "..."
+] @punctuation.special
+
+[
+  "+"
+  "-"
+  "*"
+  "&"
+  "!"
+  "~"
+  "++"
+  "--"
+  "="
+  ">>"
+  "<<"
+  "/"
+  ">"
+  ">="
+  "<"
+  "<="
+  "=="
+  "!="
+  "^"
+  "|"
+  "||"
+  "&&"
+  "%"
+  "*="
+  "/="
+  "%="
+  "+="
+  "-="
+  "<<="
+  ">>="
+  "&="
+  "^="
+  "|="
+] @operator
+
+(comma_expr
+  "," @operator)
+
+[
+  (true)
+  (false)
+] @boolean
+
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+[
+  (string_literal)
+  (system_lib_string)
+] @string
+
+(parameter_expansion
+  [
+    "{"
+    "}"
+  ] @string.special)
+
+(parameter_expansion
+  (identifier) @constant)
+
+(escape_sequence) @string.escape
+
+(null) @constant.builtin
+
+[
+  (number_literal)
+  (char_literal)
+] @number
+
+((preproc_arg) @function.macro
+  (#set! "priority" 90))
+
+(preproc_defined) @function.macro
+
+(call_expression
+  function: (identifier) @function.call)
+
+(call_expression
+  function: (field_expression
+    field: (identifier) @function.call))
+
+(function_declarator
+  declarator: (identifier) @function)
+
+(preproc_function_def
+  name: (identifier) @function.macro)
+
+(field_expression
+  field: (identifier) @property)
+
+(type_qualifier) @keyword.modifier
+
+(structdef
+  name: (identifier) @type.definition)
+
+[
+  (basetype)
+  (type_expr)
+] @type
+
+(prim_type) @type.builtin
+
+(program
+  name: (identifier) @constant)
+
+(state_set
+  name: (identifier) @function)
+
+(state
+  name: (identifier) @function)
+
+(transition
+  name: (identifier) @function)
+
+(option
+  name: (identifier) @constant)
+
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z%d_]*$"))
+
+(preproc_def
+  name: (_) @constant.macro)
+
+(preproc_call
+  directive: (preproc_directive) @_u
+  argument: (_) @constant.macro
+  (#eq? @_u "#undef"))
+
+(comment) @comment @spell
+
+(param_decl
+  (declarator
+    (identifier) @variable.parameter))
+
+((identifier) @variable.parameter
+  (#has-ancestor? @variable.parameter param_decl))
+
+(param_decl
+  (declarator
+    (pointer_declarator) @variable.parameter))
+
+(preproc_params
+  (identifier) @variable.parameter)
+
+((call_expression
+  function: (_) @function.builtin)
+  (#any-of? @function.builtin
+    "delay" "pvPut" "pvPutComplete" "pvArrayPutComplete" "pvPutCancel" "pvArrayPutCancel" "pvGet"
+    "pvGetComplete" "pvArrayGetComplete" "pvGetCancel" "pvArrayGetCancel" "pvGetQ" "pvFreeQ"
+    "pvFlushQ" "pvAssign" "pvAssignSubst" "pvMonitor" "pvArrayMonitor" "pvStopMonitor"
+    "pvArrayStopMonitor" "pvSync" "pvArraySync" "pvCount" "pvStatus" "pvSeverity" "pvMessage"
+    "pvTimeStamp" "pvAssigned" "pvConnected" "pvArrayConnected" "pvIndex" "pvFlush" "pvChannelCount"
+    "pvAssignCount" "pvConnectCount" "efSet" "efClear" "efTest" "efTestAndClear" "macValueGet"
+    "optGet"))
+
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin
+    "pvStatOK" "pvStatERROR" "pvStatDISCONN" "pvStatREAD" "pvStatWRITE" "pvStatHIHI" "pvStatHIGH"
+    "pvStatLOLO" "pvStatLOW" "pvStatSTATE" "pvStatCOS" "pvStatCOMM" "pvStatTIMEOUT" "pvStatHW_LIMIT"
+    "pvStatCALC" "pvStatSCAN" "pvStatLINK" "pvStatSOFT" "pvStatBAD_SUB" "pvStatUDF" "pvStatDISABLE"
+    "pvStatSIMM" "pvStatREAD_ACCESS" "pvStatWRITE_ACCESS" "pvSevrOK" "pvSevrERROR" "pvSevrNONE"
+    "pvSevrMINOR" "pvSevrMAJOR" "pvSevrINVALID" "DEFAULT" "ASYNC" "SYNC" "NOEVFLAG"))
diff --git a/runtime/queries/snl/indents.scm b/runtime/queries/snl/indents.scm
new file mode 100644
index 000000000..0d6523615
--- /dev/null
+++ b/runtime/queries/snl/indents.scm
@@ -0,0 +1,61 @@
+[
+  (field_declaration_list)
+  (state_set)
+  (state)
+  (block)
+  (member_decl)
+] @indent.begin
+
+(block
+  "}" @indent.end)
+
+[
+  "else"
+  "}"
+] @indent.branch
+
+(call_expression) @indent.begin
+
+(call_expression
+  ")" @indent.end)
+
+(if_statement
+  condition: (_) @indent.begin)
+
+(if_statement
+  consequence: (_) @_consequence
+  (#not-kind-eq? @_consequence block)) @indent.begin
+
+(else_statement
+  consequence: (_) @_consequence
+  (#not-kind-eq? @_consequence block)) @indent.begin
+
+(while_statement
+  body: (statement
+    (_) @_body)
+  (#not-kind-eq? @_body block)) @indent.begin
+
+(for_statement
+  body: (statement
+    (_) @_body)
+  (#not-kind-eq? @_body block)) @indent.begin
+
+(init_declarator) @indent.begin
+
+(transition
+  condition: (_) @indent.begin)
+
+[
+  "#define"
+  "#ifdef"
+  "#if"
+  "#else"
+  "#endif"
+] @indent.zero
+
+[
+  (preproc_arg)
+  (string_literal)
+] @indent.ignore
+
+(comment) @indent.auto
diff --git a/runtime/queries/snl/injections.scm b/runtime/queries/snl/injections.scm
new file mode 100644
index 000000000..b595d8033
--- /dev/null
+++ b/runtime/queries/snl/injections.scm
@@ -0,0 +1,117 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((c_code) @injection.content
+  (#set! injection.language "c"))
+
+((preproc_arg) @injection.content
+  (#set! injection.self))
+
+((call_expression
+  function: (identifier) @_function
+  (args
+    .
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
+  ; format-ignore
+  (#any-of? @_function 
+    "printf" "printf_s"
+    "vprintf" "vprintf_s"
+    "scanf" "scanf_s"
+    "vscanf" "vscanf_s"
+    "wprintf" "wprintf_s"
+    "vwprintf" "vwprintf_s"
+    "wscanf" "wscanf_s"
+    "vwscanf" "vwscanf_s"
+    "cscanf" "_cscanf"
+    "printw"
+    "scanw")
+  (#set! injection.language "printf"))
+
+((call_expression
+  function: (identifier) @_function
+  (args
+    (_)
+    .
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
+  ; format-ignore
+  (#any-of? @_function 
+    "fprintf" "fprintf_s"
+    "sprintf"
+    "dprintf"
+    "fscanf" "fscanf_s"
+    "sscanf" "sscanf_s"
+    "vsscanf" "vsscanf_s"
+    "vfprintf" "vfprintf_s"
+    "vsprintf"
+    "vdprintf"
+    "fwprintf" "fwprintf_s"
+    "vfwprintf" "vfwprintf_s"
+    "fwscanf" "fwscanf_s"
+    "swscanf" "swscanf_s"
+    "vswscanf" "vswscanf_s"
+    "vfscanf" "vfscanf_s"
+    "vfwscanf" "vfwscanf_s"
+    "wprintw"
+    "vw_printw" "vwprintw"
+    "wscanw"
+    "vw_scanw" "vwscanw")
+  (#set! injection.language "printf"))
+
+((call_expression
+  function: (identifier) @_function
+  (args
+    (_)
+    .
+    (_)
+    .
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
+  ; format-ignore
+  (#any-of? @_function 
+    "sprintf_s"
+    "snprintf" "snprintf_s"
+    "vsprintf_s"
+    "vsnprintf" "vsnprintf_s"
+    "swprintf" "swprintf_s"
+    "snwprintf_s"
+    "vswprintf" "vswprintf_s"
+    "vsnwprintf_s"
+    "mvprintw"
+    "mvscanw")
+  (#set! injection.language "printf"))
+
+((call_expression
+  function: (identifier) @_function
+  (args
+    (_)
+    .
+    (_)
+    .
+    (_)
+    .
+    [
+      (string_literal
+        (string_content) @injection.content)
+      (concatenated_string
+        (string_literal
+          (string_content) @injection.content))
+    ]))
+  (#any-of? @_function "mvwprintw" "mvwscanw")
+  (#set! injection.language "printf"))
diff --git a/runtime/queries/snl/locals.scm b/runtime/queries/snl/locals.scm
new file mode 100644
index 000000000..35c8da5c9
--- /dev/null
+++ b/runtime/queries/snl/locals.scm
@@ -0,0 +1,65 @@
+; Functions definitions
+(function_declarator
+  declarator: (identifier) @local.definition.function)
+
+(preproc_function_def
+  name: (identifier) @local.definition.macro) @local.scope
+
+(preproc_def
+  name: (identifier) @local.definition.macro)
+
+((identifier) @local.definition.parameter
+  (#has-ancestor? @local.definition.parameter param_decl))
+
+(init_declarator
+  (declarator
+    (identifier)) @local.definition.var)
+
+(array_declarator
+  (identifier) @local.definition.var)
+
+; Struct
+(member_decl
+  (declarator
+    (identifier)) @local.definition.field)
+
+(structdef
+  name: (identifier) @local.definition.type)
+
+; References
+((field_expression
+  field: (identifier) @local.reference)
+  (#set! reference.kind "field"))
+
+((call_expression
+  function: (identifier) @local.reference)
+  (#set! reference.kind "call"))
+
+((basetype
+  (identifier) @local.reference)
+  (#set! reference.kind "type"))
+
+; SNL specific
+(state_set
+  name: (identifier) @local.definition)
+
+(state
+  name: (identifier) @local.definition)
+
+(state_statement
+  name: (identifier) @local.reference)
+
+(transition
+  name: (identifier) @local.reference)
+
+(identifier) @local.reference
+
+[
+  (for_statement)
+  (if_statement)
+  (while_statement)
+  (source_file)
+  (block)
+  (state_set)
+  (state_block)
+] @local.scope

From 5a70b1eb8cbdf6c7f0a59dfb7356ad198421b620 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 22 Sep 2025 08:14:00 -0700
Subject: [PATCH 2493/2704] feat(hyprlang): highlight more exec keywords

---
 runtime/queries/hyprlang/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/hyprlang/highlights.scm b/runtime/queries/hyprlang/highlights.scm
index 5e3514125..340237fcc 100644
--- a/runtime/queries/hyprlang/highlights.scm
+++ b/runtime/queries/hyprlang/highlights.scm
@@ -3,7 +3,10 @@
 [
   "source"
   "exec"
+  "execr"
   "exec-once"
+  "execr-once"
+  "exec-shutdown"
 ] @keyword
 
 (keyword

From 1df23c59d8c3142fc9fc130575fbc761d10e30e4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 28 Sep 2025 11:55:09 +0200
Subject: [PATCH 2494/2704] feat(parsers): update ada, cpp, desktop, erlang,
 godot_resource, ini, javadoc, mlir, powershell, rifleconf, slint, sql,
 superhtml, t32, xresources

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6a64739fa..ce96a62a6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2,7 +2,7 @@
 return {
   ada = {
     install_info = {
-      revision = '364d3f4aa8b382113bdd5d3ca6d82dc9c74ac738',
+      revision = '9821c989184447f7f088f1096601eb23be35afc5',
       url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
@@ -278,7 +278,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = '2a682d312b09eb737a08b4900ec786415574b6bf',
+      revision = '12bd6f7e96080d2e70ec51d4068f2f66120dde35',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'b77dad972dcc96f9a7123fb08d8eb46308e31d9a',
+      revision = '73c3f1ec366061aa9b1f61d76fc3d37b86b5a9af',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -520,7 +520,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = '07dad1469ecb7df80f2b6d5178f79564d19d67e0',
+      revision = 'df268da05d8ed4837dd2a8e2af1906619c2f0aa0',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -786,7 +786,7 @@ return {
   },
   godot_resource = {
     install_info = {
-      revision = '9bbb540e8a2734101c6857bd437f04baa974e03d',
+      revision = '302c1895f54bf74d53a08572f7b26a6614209adc',
       url = 'https://github.com/PrestonKnopp/tree-sitter-godot-resource',
     },
     maintainers = { '@pierpo' },
@@ -1034,7 +1034,7 @@ return {
   },
   ini = {
     install_info = {
-      revision = '31899dfa3b91622ea39e5c0bcddc88f45a9a3cfe',
+      revision = '0eaed8040513e62ee2e9e8db9f086cf630a524eb',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
@@ -1075,7 +1075,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '85acd4655cbfaef414de6e3f87436e63ef5cb0da',
+      revision = 'c39005f7da0218cc3ac2734bef049a8fa9ee0e72',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1399,7 +1399,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '8f86b34b5e3dfe561e1e913df4a3d719ea1dcc5c',
+      revision = '14152c1e580043865131bca80bcd8e8cb9132df7',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1653,7 +1653,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = 'f272e5ac9bc48d0f6df2429cab914d216e9413cd',
+      revision = '497fe9ac43bdf090efbfe28fba65b7c0c7c6a7b3',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1910,7 +1910,7 @@ return {
   },
   rifleconf = {
     install_info = {
-      revision = 'b215640ba72a9a8cac6f5d95dbc3d320cb546e13',
+      revision = 'fe10eab6cacff239ec61f4456e793bed15703aaf',
       url = 'https://github.com/purarue/tree-sitter-rifleconf',
     },
     maintainers = { '@purarue' },
@@ -2051,7 +2051,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '152ec7f6a2aa29fe222f741d91bec70153c487da',
+      revision = '927f3e2f0213d0eea7f12c978c81067c3dc4289d',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2083,8 +2083,8 @@ return {
   },
   snl = {
     install_info = {
-      url = 'https://github.com/minijackson/tree-sitter-snl',
       revision = '846e2d6809ac5863a15b5494f20fd267c21221c8',
+      url = 'https://github.com/minijackson/tree-sitter-snl',
     },
     maintainers = { '@minijackson' },
     readme_note = "EPICS Sequencer's SNL files",
@@ -2143,7 +2143,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = 'b1ec2aa5091624e4729f0a771a6d631afebf1ed4',
+      revision = '0a997b07c777b6504792d04357a0f655897f15a8',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2200,7 +2200,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '574a7a000c6e6a8a922c11afa9da60dca84e5e1f',
+      revision = '4b60dd98f5d3e158967c9feb839ae71321a625b9',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2266,7 +2266,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '335e5533de72a4ac8c6763958df1befbdc855a30',
+      revision = '5f20682355725d840611b07b2ce9681034cff3a6',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2632,7 +2632,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '2259ae28ad0e139b726dab286f7fa9626a1c2256',
+      revision = 'c6f240ab53c75edc0b122bc26c994ceb410d5b27',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 9176343647ad99583becbcec7b17fc7fd5bd4782 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 28 Sep 2025 12:01:45 +0200
Subject: [PATCH 2495/2704] feat(inko)!: update parser and queries

Breaking change: `(array_pattern)` rule and node was removed again.
---
 lua/nvim-treesitter/parsers.lua  | 2 +-
 runtime/queries/inko/indents.scm | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ce96a62a6..67a492baa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1042,7 +1042,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = '74cbd0f69053b4a9ad4fed8831dee983ec7e4990',
+      revision = '1fcbf8ca64b1a088525235662ad80aa803d97413',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
diff --git a/runtime/queries/inko/indents.scm b/runtime/queries/inko/indents.scm
index 260249343..d2d9a5724 100644
--- a/runtime/queries/inko/indents.scm
+++ b/runtime/queries/inko/indents.scm
@@ -27,7 +27,6 @@
   (trait)
   (tuple)
   (tuple_pattern)
-  (array_pattern)
   (type_arguments)
 ] @indent.begin
 

From db50897909bfd77d816ef3958e392a2f7fccd057 Mon Sep 17 00:00:00 2001
From: Mouinul Hossain <122956967+OXY2DEV@users.noreply.github.com>
Date: Mon, 29 Sep 2025 07:04:09 +0600
Subject: [PATCH 2496/2704] feat(parsers): add kitty (#8129)

---
 SUPPORTED_LANGUAGES.md               |   1 +
 lua/nvim-treesitter/parsers.lua      |   8 ++
 runtime/queries/kitty/highlights.scm | 175 +++++++++++++++++++++++++++
 runtime/queries/kitty/injections.scm |  31 +++++
 4 files changed, 215 insertions(+)
 create mode 100644 runtime/queries/kitty/highlights.scm
 create mode 100644 runtime/queries/kitty/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 2cc4bd6a9..3386e6bf2 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -160,6 +160,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [kcl](https://github.com/kcl-lang/tree-sitter-kcl) | unstable | `HF J ` |   | @bertbaron
 [kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` |   | @amaanq
 [kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` |   | @amaanq
+[kitty](https://github.com/OXY2DEV/tree-sitter-kitty) | unstable | `H  J ` |   | @OXY2DEV
 [kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` |   | @SalBakraa
 [koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` |   | @irh
 [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` |   | @Willem-J-an
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 67a492baa..34a5aa04e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1205,6 +1205,14 @@ return {
     maintainers = { '@amaanq' },
     tier = 2,
   },
+  kitty = {
+    install_info = {
+      revision = '49f877cff80ab613808b34bde170ea477ec182fe',
+      url = 'https://github.com/OXY2DEV/tree-sitter-kitty',
+    },
+    maintainers = { '@OXY2DEV' },
+    tier = 2,
+  },
   kotlin = {
     install_info = {
       revision = '57fb4560ba8641865bc0baa6b3f413b236112c4c',
diff --git a/runtime/queries/kitty/highlights.scm b/runtime/queries/kitty/highlights.scm
new file mode 100644
index 000000000..c6b5a5dfd
--- /dev/null
+++ b/runtime/queries/kitty/highlights.scm
@@ -0,0 +1,175 @@
+(line_continuation) @comment
+
+(comment
+  (comment_content) @spell) @comment
+
+[
+  (pixel)
+  (percentage)
+  (number)
+] @number
+
+[
+  "steps"
+  "cubic-bezier"
+] @function.call
+
+(boolean) @boolean
+
+(color) @constant
+
+(string) @string
+
+[
+  (ctrl)
+  (alt)
+  (shift)
+  (function)
+  (super)
+  (mouse_button)
+  (up)
+  (left)
+  (right)
+  (middle)
+  (down)
+] @constant.builtin
+
+[
+  "+"
+  ">"
+  ":"
+  "-"
+  (separator)
+  "="
+  ","
+  "'"
+  ":"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+] @punctuation.bracket
+
+(special) @variable.builtin
+
+(key) @character
+
+(path) @string.special.path
+
+(label) @label
+
+(constant) @constant
+
+(direction) @constant
+
+(pattern) @string.regexp
+
+(flag) @constant
+
+((string) @constant
+  (#lua-match? @constant "^-"))
+
+(generic_action) @function.call
+
+(action_name) @function.call
+
+[
+  "pt"
+  "px"
+  "%"
+  "ratio"
+  (signal_name)
+  (clear_target)
+  (ligature_target)
+  (window_location)
+  (stdin_source)
+  (marker_type)
+  (window_state)
+  (logo_position)
+  (mouse_selection_type)
+  (window_layout)
+  (os_window)
+  "ignore-shell"
+  (detach_into)
+  "@selection"
+  (kitty_shell_open_as)
+  (mouse_event)
+  (font_modification_type)
+  (ease_step_position)
+  "c"
+  (filter_element_type)
+  "all"
+  (ligature_disabled)
+  (clipboard_action)
+  (shell_feature)
+  (source_strategy)
+  (notification_time)
+  (paste_action)
+  (pointer)
+  (layout)
+  (launch_type_value)
+  (os_window_class)
+  (layout_type)
+  (time_suffix)
+  (cursor)
+  (spacing_type)
+  (remote_action)
+  (font_feature)
+] @type
+
+(kitten
+  target: (string) @type)
+
+[
+  (color_option_name)
+  "map"
+  "mouse_map"
+  (option_name)
+] @keyword
+
+(open_url
+  value: (string) @string.special.url)
+
+(handle_click_actions
+  _ @type)
+
+(title) @string.special
+
+(font_change_amount
+  sign: (font_change_sign) @operator)
+
+(aliased_action
+  name: (string) @function.call)
+
+(set_colors
+  "set_colors" @function.call)
+
+(include
+  environment_variable: (string) @variable.builtin)
+
+(key_focus_on
+  condition: (string) @string.special)
+
+(mouse_mode
+  [
+    "grabbed"
+    "ungrabbed"
+  ] @variable.parameter)
+
+(font_property
+  name: (string) @variable.parameter)
+
+(url_excluded_characters
+  value: (string) @character)
+
+(transparent_color
+  "@" @punctuation.special
+  (alpha) @number)
+
+(env
+  variable: (string) @variable.builtin)
+
+(boolean_operator) @keyword.operator
+
+(notification_action) @function.call
diff --git a/runtime/queries/kitty/injections.scm b/runtime/queries/kitty/injections.scm
new file mode 100644
index 000000000..74fde7b76
--- /dev/null
+++ b/runtime/queries/kitty/injections.scm
@@ -0,0 +1,31 @@
+(launch_source_window
+  value: (string) @injection.content
+  (#set! injection.language "regex"))
+
+(launch_next_to
+  value: (string) @injection.content
+  (#set! injection.language "regex"))
+
+(marker_entry
+  (pattern) @injection.content
+  (#set! injection.language "regex"))
+
+(color_match
+  (pattern) @injection.content
+  (#set! injection.language "regex"))
+
+(color_match_tab
+  (pattern) @injection.content
+  (#set! injection.language "regex"))
+
+(include
+  glob: (pattern) @injection.content
+  (#set! injection.language "regex"))
+
+(filter_element
+  (pattern) @injection.content
+  (#set! injection.language "regex"))
+
+(comment
+  (comment_content) @injection.content
+  (#set! injection.language "comment"))

From 77362027f7aa850c87419fd571151e76b0b342a6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 28 Sep 2025 18:39:09 -0700
Subject: [PATCH 2497/2704] fix: remove redundant alternants (#8159)

---
 runtime/queries/bitbake/highlights.scm         |  1 -
 runtime/queries/circom/highlights.scm          |  2 --
 runtime/queries/d/highlights.scm               |  1 -
 runtime/queries/enforce/highlights.scm         |  1 -
 runtime/queries/fennel/locals.scm              |  1 -
 runtime/queries/fsharp/highlights.scm          |  1 -
 runtime/queries/gdscript/highlights.scm        |  1 -
 runtime/queries/gleam/indents.scm              |  2 --
 runtime/queries/go/highlights.scm              |  1 -
 runtime/queries/groovy/highlights.scm          |  3 ---
 runtime/queries/hack/highlights.scm            | 14 --------------
 runtime/queries/inko/highlights.scm            |  2 --
 runtime/queries/jinja_inline/highlights.scm    |  1 -
 runtime/queries/kitty/highlights.scm           |  1 -
 runtime/queries/luadoc/highlights.scm          |  1 -
 runtime/queries/matlab/highlights.scm          |  1 -
 runtime/queries/mermaid/highlights.scm         |  1 -
 runtime/queries/nu/highlights.scm              |  2 --
 runtime/queries/ocaml/highlights.scm           |  1 -
 runtime/queries/ocaml_interface/highlights.scm |  1 -
 runtime/queries/pascal/folds.scm               |  1 -
 runtime/queries/pascal/highlights.scm          |  1 -
 runtime/queries/pony/highlights.scm            |  1 -
 runtime/queries/prql/highlights.scm            |  1 -
 runtime/queries/re2c/highlights.scm            |  1 -
 runtime/queries/roc/indents.scm                |  1 -
 runtime/queries/scala/highlights.scm           |  1 -
 runtime/queries/solidity/highlights.scm        |  3 ---
 runtime/queries/sway/highlights.scm            |  2 --
 runtime/queries/t32/highlights.scm             |  5 -----
 runtime/queries/vhdl/folds.scm                 |  1 -
 runtime/queries/zig/highlights.scm             |  2 --
 32 files changed, 59 deletions(-)

diff --git a/runtime/queries/bitbake/highlights.scm b/runtime/queries/bitbake/highlights.scm
index c7316de6e..e10ae705b 100644
--- a/runtime/queries/bitbake/highlights.scm
+++ b/runtime/queries/bitbake/highlights.scm
@@ -281,7 +281,6 @@
   "=."
   "-"
   "-="
-  ":="
   "!="
   "*"
   "**"
diff --git a/runtime/queries/circom/highlights.scm b/runtime/queries/circom/highlights.scm
index c61925e7a..983df8703 100644
--- a/runtime/queries/circom/highlights.scm
+++ b/runtime/queries/circom/highlights.scm
@@ -119,8 +119,6 @@
   ">"
   "!"
   "~"
-  "-"
-  "+"
   "++"
   "--"
   "<=="
diff --git a/runtime/queries/d/highlights.scm b/runtime/queries/d/highlights.scm
index 50428d20c..e08b83b45 100644
--- a/runtime/queries/d/highlights.scm
+++ b/runtime/queries/d/highlights.scm
@@ -263,7 +263,6 @@
   (idouble)
   (ifloat)
   (creal)
-  (double)
   (cfloat)
   (string)
   (dstring)
diff --git a/runtime/queries/enforce/highlights.scm b/runtime/queries/enforce/highlights.scm
index aa8fb9b3e..35226202d 100644
--- a/runtime/queries/enforce/highlights.scm
+++ b/runtime/queries/enforce/highlights.scm
@@ -80,7 +80,6 @@
   "<<"
   "&"
   "|"
-  "^"
   "~"
 ] @operator
 
diff --git a/runtime/queries/fennel/locals.scm b/runtime/queries/fennel/locals.scm
index be63e728f..320c93bb9 100644
--- a/runtime/queries/fennel/locals.scm
+++ b/runtime/queries/fennel/locals.scm
@@ -11,7 +11,6 @@
   (collect_form)
   (icollect_form)
   (accumulate_form)
-  (for_form)
   (fcollect_form)
   (faccumulate_form)
   (case_form)
diff --git a/runtime/queries/fsharp/highlights.scm b/runtime/queries/fsharp/highlights.scm
index 72168528a..16b969fb6 100644
--- a/runtime/queries/fsharp/highlights.scm
+++ b/runtime/queries/fsharp/highlights.scm
@@ -246,7 +246,6 @@
   "<-"
   "&"
   "&&"
-  "|"
   "||"
   ":>"
   ":?>"
diff --git a/runtime/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
index f3fd3b62f..3885d0068 100644
--- a/runtime/queries/gdscript/highlights.scm
+++ b/runtime/queries/gdscript/highlights.scm
@@ -176,7 +176,6 @@
   "/"
   "%"
   "+"
-  "-"
   "<<"
   ">>"
   "&"
diff --git a/runtime/queries/gleam/indents.scm b/runtime/queries/gleam/indents.scm
index 3a44ea4c0..a8fa961d5 100644
--- a/runtime/queries/gleam/indents.scm
+++ b/runtime/queries/gleam/indents.scm
@@ -9,8 +9,6 @@
   (function)
   (let)
   (list)
-  (constant)
-  (function)
   (type_definition)
   (type_alias)
   (todo)
diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 7675cb790..91a9d4d76 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -61,7 +61,6 @@
   "!="
   "..."
   "*"
-  "*"
   "*="
   "/"
   "/="
diff --git a/runtime/queries/groovy/highlights.scm b/runtime/queries/groovy/highlights.scm
index 4504e16e2..69fcb6e1d 100644
--- a/runtime/queries/groovy/highlights.scm
+++ b/runtime/queries/groovy/highlights.scm
@@ -135,13 +135,10 @@
   "&&"
   "||"
   "?:"
-  "+"
-  "*"
   ".&"
   ".@"
   "?."
   "*."
-  "*"
   "*:"
   "++"
   "--"
diff --git a/runtime/queries/hack/highlights.scm b/runtime/queries/hack/highlights.scm
index bb9d2a55c..f74233e23 100644
--- a/runtime/queries/hack/highlights.scm
+++ b/runtime/queries/hack/highlights.scm
@@ -169,20 +169,6 @@
   "--"
   "!"
   "?:"
-  "="
-  "??="
-  ".="
-  "|="
-  "^="
-  "&="
-  "<<="
-  ">>="
-  "+="
-  "-="
-  "*="
-  "/="
-  "%="
-  "**="
   "=>"
   ; type modifiers
   "@"
diff --git a/runtime/queries/inko/highlights.scm b/runtime/queries/inko/highlights.scm
index 989bdb9e8..3b8ede262 100644
--- a/runtime/queries/inko/highlights.scm
+++ b/runtime/queries/inko/highlights.scm
@@ -35,11 +35,9 @@
   "<<"
   "<<="
   "<="
-  "<="
   "=="
   ">"
   ">="
-  ">="
   ">>"
   ">>="
   ">>>"
diff --git a/runtime/queries/jinja_inline/highlights.scm b/runtime/queries/jinja_inline/highlights.scm
index b66d7fb2e..fd2030fa8 100644
--- a/runtime/queries/jinja_inline/highlights.scm
+++ b/runtime/queries/jinja_inline/highlights.scm
@@ -56,7 +56,6 @@
   "endmacro"
   "endcall"
   "endset"
-  "endtrans"
   "endautoescape"
 ] @keyword
 
diff --git a/runtime/queries/kitty/highlights.scm b/runtime/queries/kitty/highlights.scm
index c6b5a5dfd..93e5d31a4 100644
--- a/runtime/queries/kitty/highlights.scm
+++ b/runtime/queries/kitty/highlights.scm
@@ -43,7 +43,6 @@
   "="
   ","
   "'"
-  ":"
 ] @punctuation.delimiter
 
 [
diff --git a/runtime/queries/luadoc/highlights.scm b/runtime/queries/luadoc/highlights.scm
index 1649e5d9b..f1680d7b2 100644
--- a/runtime/queries/luadoc/highlights.scm
+++ b/runtime/queries/luadoc/highlights.scm
@@ -20,7 +20,6 @@
   "@version"
   "@operator"
   "@nodiscard"
-  "@cast"
   "@overload"
   "@enum"
   "@language"
diff --git a/runtime/queries/matlab/highlights.scm b/runtime/queries/matlab/highlights.scm
index 05713e05a..7c7fd9a5f 100644
--- a/runtime/queries/matlab/highlights.scm
+++ b/runtime/queries/matlab/highlights.scm
@@ -170,7 +170,6 @@
   "-"
   ".*"
   "*"
-  ".*"
   "/"
   "./"
   "\\"
diff --git a/runtime/queries/mermaid/highlights.scm b/runtime/queries/mermaid/highlights.scm
index 2b7b56374..8fa11dfef 100644
--- a/runtime/queries/mermaid/highlights.scm
+++ b/runtime/queries/mermaid/highlights.scm
@@ -42,7 +42,6 @@
   "includes"
   "excludes"
   "todaymarker"
-  "title"
   "section"
   "direction"
   "subgraph"
diff --git a/runtime/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
index fc73d3483..38ffbaa2e 100644
--- a/runtime/queries/nu/highlights.scm
+++ b/runtime/queries/nu/highlights.scm
@@ -123,12 +123,10 @@ file_path: (val_string) @variable.parameter
   "*="
   "/="
   "++="
-  "-"
   ".."
   "..="
   "..<"
   "=>"
-  "="
   "|"
   "o>"
   "out>"
diff --git a/runtime/queries/ocaml/highlights.scm b/runtime/queries/ocaml/highlights.scm
index 891ff7bd5..82a74b7fb 100644
--- a/runtime/queries/ocaml/highlights.scm
+++ b/runtime/queries/ocaml/highlights.scm
@@ -294,7 +294,6 @@
   (hash_operator)
   (indexing_operator)
   (let_operator)
-  (and_operator)
   (match_operator)
 ] @operator
 
diff --git a/runtime/queries/ocaml_interface/highlights.scm b/runtime/queries/ocaml_interface/highlights.scm
index b623e432b..2f7cdba85 100644
--- a/runtime/queries/ocaml_interface/highlights.scm
+++ b/runtime/queries/ocaml_interface/highlights.scm
@@ -294,7 +294,6 @@
   (hash_operator)
   (indexing_operator)
   (let_operator)
-  (and_operator)
   (match_operator)
 ] @operator
 
diff --git a/runtime/queries/pascal/folds.scm b/runtime/queries/pascal/folds.scm
index 8fcde3ac0..ac527fbf0 100644
--- a/runtime/queries/pascal/folds.scm
+++ b/runtime/queries/pascal/folds.scm
@@ -19,7 +19,6 @@
   (declEnum)
   (declProcRef)
   (declExports)
-  (declProcRef)
   (declType)
   (defProc)
   (declField)
diff --git a/runtime/queries/pascal/highlights.scm b/runtime/queries/pascal/highlights.scm
index d6014ee1d..b81c0c599 100644
--- a/runtime/queries/pascal/highlights.scm
+++ b/runtime/queries/pascal/highlights.scm
@@ -41,7 +41,6 @@
   (kDestructor)
   (kOperator)
   (kReference)
-  (kInterface)
   (kImplementation)
   (kInitialization)
   (kFinalization)
diff --git a/runtime/queries/pony/highlights.scm b/runtime/queries/pony/highlights.scm
index f3d4b5dca..6ccb3d7ae 100644
--- a/runtime/queries/pony/highlights.scm
+++ b/runtime/queries/pony/highlights.scm
@@ -206,7 +206,6 @@
   "<="
   "<"
   "+~"
-  "-~"
   "*~"
   "/~"
   "%~"
diff --git a/runtime/queries/prql/highlights.scm b/runtime/queries/prql/highlights.scm
index d24777dc0..f49c887c8 100644
--- a/runtime/queries/prql/highlights.scm
+++ b/runtime/queries/prql/highlights.scm
@@ -85,7 +85,6 @@ alias: (identifier) @variable.member
   (keyword_avg)
   (keyword_sum)
   (keyword_stddev)
-  (keyword_count)
   (keyword_rank)
 ] @function
 
diff --git a/runtime/queries/re2c/highlights.scm b/runtime/queries/re2c/highlights.scm
index c89c30745..e15f97f82 100644
--- a/runtime/queries/re2c/highlights.scm
+++ b/runtime/queries/re2c/highlights.scm
@@ -1,6 +1,5 @@
 ; Namespaces
 [
-  "re2c"
   "re2c"
   "local"
   "rules"
diff --git a/runtime/queries/roc/indents.scm b/runtime/queries/roc/indents.scm
index 9a08f2074..b2cea9b77 100644
--- a/runtime/queries/roc/indents.scm
+++ b/runtime/queries/roc/indents.scm
@@ -22,7 +22,6 @@
   ;types
   (record_type)
   (tags_type)
-  (record_expr)
   (implements_implementation)
   "{"
   "("
diff --git a/runtime/queries/scala/highlights.scm b/runtime/queries/scala/highlights.scm
index f85c502a4..7e623aebc 100644
--- a/runtime/queries/scala/highlights.scm
+++ b/runtime/queries/scala/highlights.scm
@@ -186,7 +186,6 @@
   "end"
   "implicit"
   "extension"
-  "with"
 ] @keyword
 
 [
diff --git a/runtime/queries/solidity/highlights.scm b/runtime/queries/solidity/highlights.scm
index ca6988edb..ca1f65dd9 100644
--- a/runtime/queries/solidity/highlights.scm
+++ b/runtime/queries/solidity/highlights.scm
@@ -151,7 +151,6 @@
   "modifier"
   "var"
   "let"
-  "emit"
   "error"
   "fallback"
   "receive"
@@ -287,8 +286,6 @@
   ">"
   "!"
   "~"
-  "-"
-  "+"
   "++"
   "--"
   ":="
diff --git a/runtime/queries/sway/highlights.scm b/runtime/queries/sway/highlights.scm
index e408464fe..e1f72eb46 100644
--- a/runtime/queries/sway/highlights.scm
+++ b/runtime/queries/sway/highlights.scm
@@ -68,7 +68,6 @@
   "||"
   "^"
   "^="
-  "*"
   "*="
   "-"
   "-="
@@ -86,7 +85,6 @@
   "@"
   ".."
   "..="
-  "'"
   "?"
 ] @operator
 
diff --git a/runtime/queries/t32/highlights.scm b/runtime/queries/t32/highlights.scm
index 9211a49d2..83e8e19dd 100644
--- a/runtime/queries/t32/highlights.scm
+++ b/runtime/queries/t32/highlights.scm
@@ -22,13 +22,10 @@
   ".."
   "--"
   "++"
-  "+"
-  "-"
   "~"
   "!"
   "&"
   "->"
-  "*"
   "-="
   "+="
   "*="
@@ -39,8 +36,6 @@
   "^="
   ">>="
   "<<="
-  "--"
-  "++"
 ] @operator
 
 [
diff --git a/runtime/queries/vhdl/folds.scm b/runtime/queries/vhdl/folds.scm
index 9fc6deafe..42a58c25f 100644
--- a/runtime/queries/vhdl/folds.scm
+++ b/runtime/queries/vhdl/folds.scm
@@ -27,7 +27,6 @@
   (subprogram_definition)
   (subprogram_head)
   (procedure_specification)
-  (sequential_block)
   (loop_statement)
   (if_statement_block)
   (if_statement)
diff --git a/runtime/queries/zig/highlights.scm b/runtime/queries/zig/highlights.scm
index 1f9006781..a1dce6930 100644
--- a/runtime/queries/zig/highlights.scm
+++ b/runtime/queries/zig/highlights.scm
@@ -212,7 +212,6 @@
   ">="
   "<="
   "<"
-  "&"
   "^"
   "|"
   "<<"
@@ -221,7 +220,6 @@
   "+"
   "++"
   "+%"
-  "-%"
   "+|"
   "-|"
   "*"

From 99bd52ba56a4b7c9a8cc50a6140180755e76fac6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 1 Oct 2025 20:33:49 -0700
Subject: [PATCH 2498/2704] feat(java): highlight wildcards (#8165)

---
 runtime/queries/java/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/java/highlights.scm b/runtime/queries/java/highlights.scm
index df9ca14d4..641f1e3fd 100644
--- a/runtime/queries/java/highlights.scm
+++ b/runtime/queries/java/highlights.scm
@@ -235,6 +235,9 @@
     ":"
   ] @keyword.conditional.ternary)
 
+(wildcard
+  "?" @character.special)
+
 ; Loops
 [
   "for"

From 4709d4276c9cef5e353790071aec046d9b089719 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Fri, 3 Oct 2025 00:17:57 -0700
Subject: [PATCH 2499/2704] feat(python): highlight special brackets in
 `format_expression`

---
 runtime/queries/python/highlights.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 3e777d08b..70f6d9acc 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -247,6 +247,10 @@
   "{" @punctuation.special
   "}" @punctuation.special)
 
+(format_expression
+  "{" @punctuation.special
+  "}" @punctuation.special)
+
 (line_continuation) @punctuation.special
 
 (type_conversion) @function.macro

From b684696315a11e1b08564398bda778788eac92a9 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Fri, 3 Oct 2025 15:13:45 +0200
Subject: [PATCH 2500/2704] feat(inko): update parser and highlights

This commit includes syntax support for a few new syntax elements, and
updates the highlights queries to highlight two new expression keywords.
---
 lua/nvim-treesitter/parsers.lua     | 2 +-
 runtime/queries/inko/highlights.scm | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 34a5aa04e..af6814160 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1042,7 +1042,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = '1fcbf8ca64b1a088525235662ad80aa803d97413',
+      revision = '080e957d94b330e3867f063b148a8050b0888f4e',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
diff --git a/runtime/queries/inko/highlights.scm b/runtime/queries/inko/highlights.scm
index 3b8ede262..4bb9631f8 100644
--- a/runtime/queries/inko/highlights.scm
+++ b/runtime/queries/inko/highlights.scm
@@ -64,6 +64,11 @@
   "uni"
 ] @keyword
 
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
 "fn" @keyword.function
 
 "import" @keyword.import

From b4888ed9e8c3af52320ba3b52a88eccc1c18d498 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Oct 2025 10:51:48 +0200
Subject: [PATCH 2501/2704] chore(gdscript): mark as unmaintained

Significant upstream breaking changes are not adapted to.
---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 3386e6bf2..989187984 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -92,7 +92,7 @@ ecma (queries only)[^ecma] | unstable | `HFIJL` |   | @steelsojka
 [fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | unstable | `HFIJL` |   | @jirgn
 [gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` |   | @reiniscirpons
 [gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` |   | @reiniscirpons
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unstable | `HFIJL` |   | @PrestonKnopp
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unmaintained | `HFIJL` |   | 
 [gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | unstable | `H  J ` |   | @godofavacyn
 [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | unstable | `HF J ` |   | @amaanq
 [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | unstable | `H  J ` |   | @gbprod
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index af6814160..0ee85320a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -655,9 +655,8 @@ return {
       revision = '9686853b696db07118ad110e440d6de0ca6498b4',
       url = 'https://github.com/PrestonKnopp/tree-sitter-gdscript',
     },
-    maintainers = { '@PrestonKnopp' },
     readme_note = 'Godot',
-    tier = 2,
+    tier = 3,
   },
   gdshader = {
     install_info = {

From c579a8c0cfc2d8d448aa72e8ba4f84e6a68f4533 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Oct 2025 11:02:11 +0200
Subject: [PATCH 2502/2704] feat(parsers): update ada, c_sharp, css, dart,
 editorconfig, enforce, javadoc, koto, prisma, rust, sql, superhtml, t32

---
 lua/nvim-treesitter/parsers.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0ee85320a..c1e83d01f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2,7 +2,7 @@
 return {
   ada = {
     install_info = {
-      revision = '9821c989184447f7f088f1096601eb23be35afc5',
+      revision = 'b23672d313b4c994ab96fd54f1b7ff15eac68a55',
       url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
@@ -174,7 +174,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = '3431444351c871dffb32654f1299a00019280f2f',
+      revision = '6563c3af3f03ec948d08f9325e4bbd072e4c6b99',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -287,7 +287,7 @@ return {
   },
   css = {
     install_info = {
-      revision = '6e327db434fec0ee90f006697782e43ec855adf5',
+      revision = 'dda5cfc5722c429eaba1c910ca32c2c0c5bb1a3f',
       url = 'https://github.com/tree-sitter/tree-sitter-css',
     },
     maintainers = { '@TravonteD' },
@@ -338,7 +338,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = '80e23c07b64494f7e21090bb3450223ef0b192f4',
+      revision = 'c1222f5a65aba7e0175cc0cc6f88d198d9fe2b02',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '947228fb880f838c6d71e8f11dbc0bfb82cd4c78',
+      revision = '911d7017566116b15c4b2c339e1dbe11fcf03f63',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -512,7 +512,7 @@ return {
   },
   enforce = {
     install_info = {
-      revision = 'a194046e64bdec2c9e2e1a7caa35326387f78b95',
+      revision = 'b695854665e749acdd16ce4a2a2e2f38f9ea9ca3',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
@@ -1074,7 +1074,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'c39005f7da0218cc3ac2734bef049a8fa9ee0e72',
+      revision = '7d92cf188e4a3ed1b5068dd99af129f083c47e70',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1222,7 +1222,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '633744bca404ae4edb961a3c2d7bc947a987afa4',
+      revision = '7cba915fad6121f776f59e0d1787a3e36e4cfc4e',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1676,7 +1676,7 @@ return {
   },
   prisma = {
     install_info = {
-      revision = '73f39a6d5401cfdcd143951e499336cf5ab2ffaa',
+      revision = '3556b2c1f20ec9ac91e92d32c43d9d2a0ca3cc49',
       url = 'https://github.com/victorhqc/tree-sitter-prisma',
     },
     maintainers = { '@elianiva' },
@@ -1989,7 +1989,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '00d7cbc95f0b8ea2703129550fbd1853a13e0e29',
+      revision = '946595d164e77b705fa28385654f9420f59262ef',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2150,7 +2150,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '0a997b07c777b6504792d04357a0f655897f15a8',
+      revision = '4afe285bb142542cee0aa7b689fec00a71df4741',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2207,7 +2207,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = '4b60dd98f5d3e158967c9feb839ae71321a625b9',
+      revision = 'c52790b328b73237bcd924f3d65c5a17e794e8b1',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2273,7 +2273,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '5f20682355725d840611b07b2ce9681034cff3a6',
+      revision = 'd4e26ab7a730cfbe0cf84dba6ea3647989064839',
       url = 'https://gitlab.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },

From 01ced7499fb07f6c94abd316414ef198bd6e7058 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Oct 2025 11:08:09 +0200
Subject: [PATCH 2503/2704] feat(angular)!: update parser and queries

Breaking change: node `(static_member_expression)` was removed
---
 lua/nvim-treesitter/parsers.lua        | 2 +-
 runtime/queries/angular/highlights.scm | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c1e83d01f..8245bf553 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = 'd1f24a8890462cb740909ff62a3a079cded288bc',
+      revision = '15590fdaf2edbd33e5883b22c844eef545320fc5',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
diff --git a/runtime/queries/angular/highlights.scm b/runtime/queries/angular/highlights.scm
index 271e352e5..4793745b4 100644
--- a/runtime/queries/angular/highlights.scm
+++ b/runtime/queries/angular/highlights.scm
@@ -4,10 +4,7 @@
 
 (pipe_operator) @operator
 
-[
-  (string)
-  (static_member_expression)
-] @string
+(string) @string
 
 (number) @number
 

From 0594d1ba65ddd6fc73411afb78f09ffc912f37b3 Mon Sep 17 00:00:00 2001
From: blindfs <blindfs19@gmail.com>
Date: Mon, 6 Oct 2025 21:24:58 +0800
Subject: [PATCH 2504/2704] feat(nu)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua   | 2 +-
 runtime/queries/nu/highlights.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 8245bf553..72d607836 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1486,7 +1486,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '0e6c59c46db3c246eaf86ce5b325da1247e971a5',
+      revision = 'e1509fc9f9aa6579430a65f167528617df56b107',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
diff --git a/runtime/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
index 38ffbaa2e..e23a30fae 100644
--- a/runtime/queries/nu/highlights.scm
+++ b/runtime/queries/nu/highlights.scm
@@ -203,7 +203,7 @@ file_path: (val_string) @variable.parameter
 (param_value
   "=" @punctuation.delimiter)
 
-(param_cmd
+(param_completer
   "@" @punctuation.delimiter)
 
 (param_opt
@@ -240,7 +240,7 @@ key: (identifier) @property
 (parameter
   param_name: (_) @variable.parameter)
 
-(param_cmd
+(param_completer
   (cmd_identifier) @string)
 
 (attribute

From 3ab4f2d2d20be55874e2eb575145c6928d7d7d0e Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Tue, 7 Oct 2025 02:25:25 +0200
Subject: [PATCH 2505/2704] feat(inko): update parser for let pattern matching

Commit 9d7ed4 of the Inko tree-sitter grammar introduces support for
pattern matching in `let` expressions. This requires some corresponding
changes to the "local" queries to correctly define local variables. This
is done by simply defining locals for all "identifier_pattern" nodes,
instead of only doing this for "define_variable" nodes.
---
 lua/nvim-treesitter/parsers.lua | 2 +-
 runtime/queries/inko/locals.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 72d607836..26f8ca2af 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1041,7 +1041,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = '080e957d94b330e3867f063b148a8050b0888f4e',
+      revision = '9d7ed4f6c0ea2a8f846f3bb00e33ab21ec9ca379',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
diff --git a/runtime/queries/inko/locals.scm b/runtime/queries/inko/locals.scm
index b69681cd1..2d61c2c5d 100644
--- a/runtime/queries/inko/locals.scm
+++ b/runtime/queries/inko/locals.scm
@@ -13,7 +13,7 @@
 (argument
   name: _ @local.definition.parameter)
 
-(define_variable
+(identifier_pattern
   name: _ @local.definition.var)
 
 (define_constant

From de003000a287c501a6650a1ddd3be80ee34278d4 Mon Sep 17 00:00:00 2001
From: Steven Xu <stevenxxiu@gmail.com>
Date: Fri, 10 Oct 2025 20:47:09 +1100
Subject: [PATCH 2506/2704] feat(tmux)!: update parser and highlights

Breaking changes:

- Node `(variable)` was renamed to `(expr_double_quotes)`.
- Node `(variable_raw)` was renamed to `(expr_single_quotes)`.
- Node `(string)` was renamed to `(str_double_quotes)`.
- Node `(raw_string)` was renamed to `(str_single_quotes)`.
- Node `(raw_string_quote)` was removed.
---
 SUPPORTED_LANGUAGES.md              |  2 +-
 lua/nvim-treesitter/parsers.lua     |  4 ++--
 runtime/queries/tmux/highlights.scm | 26 ++++++++++++++++++++------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 989187984..90df4eb87 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -300,7 +300,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` |   | @amaanq, @duskmoon314
 [tiger](https://github.com/ambroisie/tree-sitter-tiger) | unstable | `HFIJL` |   | @ambroisie
 [tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | unstable | `HF JL` |   | @ahelwer, @susliko
-[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` |   | @Freed-Wu
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` |   | @Freed-Wu, @stevenxxiu
 [todotxt](https://github.com/arnarg/tree-sitter-todotxt) | unstable | `H    ` |   | @arnarg
 [toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | unstable | `HFIJL` |   | @tk-shirasaka
 [tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` |   | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 26f8ca2af..aba7016a1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2372,10 +2372,10 @@ return {
   },
   tmux = {
     install_info = {
-      revision = '0252ecd080016e45e6305ef1a943388f5ae2f4b4',
+      revision = 'a2936cb2579f7723b5744563c45bcefabc42fe47',
       url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
-    maintainers = { '@Freed-Wu' },
+    maintainers = { '@Freed-Wu', '@stevenxxiu' },
     tier = 2,
   },
   todotxt = {
diff --git a/runtime/queries/tmux/highlights.scm b/runtime/queries/tmux/highlights.scm
index 50da7d7d8..ea98dff06 100644
--- a/runtime/queries/tmux/highlights.scm
+++ b/runtime/queries/tmux/highlights.scm
@@ -1,19 +1,21 @@
-; Comments
 (comment) @comment @spell
 
-; General
 [
-  (string)
-  (raw_string)
+  "'"
+  (str_single_quotes)
+  (str_double_quotes)
 ] @string
 
-(int) @number
+(backslash_escape) @string.escape
 
 (path) @string.special.path
 
+(int) @number
+
 [
   (option)
   (variable_name)
+  (variable_name_short)
 ] @variable
 
 (command_line_option) @variable.builtin
@@ -21,7 +23,17 @@
 ((option) @variable.builtin
   (#not-lua-match? @variable.builtin "^@"))
 
-(command) @keyword
+[
+  (if_keyword)
+  (elif_keyword)
+  (else_keyword)
+  (endif_keyword)
+] @keyword.conditional
+
+[
+  (hidden_keyword)
+  (command)
+] @keyword
 
 (source_file_directive
   (command) @keyword.import)
@@ -33,6 +45,8 @@
 "=" @operator
 
 [
+  ";"
+  "';'"
   ","
   ":"
 ] @punctuation.delimiter

From cbafde992598b8ee05b5b80e165905655578fb75 Mon Sep 17 00:00:00 2001
From: Steven Xu <stevenxxiu@gmail.com>
Date: Sat, 11 Oct 2025 17:23:17 +1100
Subject: [PATCH 2507/2704] feat(tmux)!: update parser and highlights

Breaking changes:

- Nodes `(variable_name)`, `(expr_variable_name)`, `(variable_name_short)`, are exposed as `(name)`.
---
 lua/nvim-treesitter/parsers.lua     | 2 +-
 runtime/queries/tmux/highlights.scm | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index aba7016a1..936dc9592 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2372,7 +2372,7 @@ return {
   },
   tmux = {
     install_info = {
-      revision = 'a2936cb2579f7723b5744563c45bcefabc42fe47',
+      revision = '72b42cd0307bdfe471fd151a0282d0d38e889944',
       url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
     maintainers = { '@Freed-Wu', '@stevenxxiu' },
diff --git a/runtime/queries/tmux/highlights.scm b/runtime/queries/tmux/highlights.scm
index ea98dff06..33509d76e 100644
--- a/runtime/queries/tmux/highlights.scm
+++ b/runtime/queries/tmux/highlights.scm
@@ -14,8 +14,7 @@
 
 [
   (option)
-  (variable_name)
-  (variable_name_short)
+  (name)
 ] @variable
 
 (command_line_option) @variable.builtin

From 763f1e650b91aa951495e709d61597d1222dba65 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 11 Oct 2025 11:12:06 +0200
Subject: [PATCH 2508/2704] feat(parsers): update angular, comment, dart,
 desktop, enforce, erlang, gleam, gotmpl, hare, helm, javadoc, kitty, koto,
 mlir, racket, rust, scheme, superhtml, systemverilog, wit, xresources, yaml

---
 lua/nvim-treesitter/parsers.lua | 44 ++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 936dc9592..238f66f67 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '15590fdaf2edbd33e5883b22c844eef545320fc5',
+      revision = 'c884ad6cce47da111584aee4b147cdf7dd3383e1',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -238,7 +238,7 @@ return {
   },
   comment = {
     install_info = {
-      revision = '689be73775bd2dd57b938b8e12bf50fec35a6ca3',
+      revision = 'db922d7809637900089709e07e31b88c42354ec2',
       url = 'https://github.com/stsewd/tree-sitter-comment',
     },
     maintainers = { '@stsewd' },
@@ -338,7 +338,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = 'c1222f5a65aba7e0175cc0cc6f88d198d9fe2b02',
+      revision = 'd4d8f3e337d8be23be27ffc35a0aef972343cd54',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '73c3f1ec366061aa9b1f61d76fc3d37b86b5a9af',
+      revision = '73b9f3ac30ac8d01267a16b1c4f0880aecdb56b2',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -512,7 +512,7 @@ return {
   },
   enforce = {
     install_info = {
-      revision = 'b695854665e749acdd16ce4a2a2e2f38f9ea9ca3',
+      revision = 'eb2796871d966264cdb041b797416ef1757c8b4f',
       url = 'https://github.com/simonvic/tree-sitter-enforce',
     },
     maintainers = { '@simonvic' },
@@ -520,7 +520,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = 'df268da05d8ed4837dd2a8e2af1906619c2f0aa0',
+      revision = 'a260cb65eaa6e055289a34434f98c3aae6137ed5',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = 'dae1551a9911b24f41d876c23f2ab05ece0a9d4c',
+      revision = 'ec3c27c5eef20f48b17ee28152f521697df10312',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -810,7 +810,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = '65f4f86c3aaa9dabab36e3482584e8a111cf7db1',
+      revision = 'ca26229bafcd3f37698a2496c2a5efa2f07e86bc',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -881,7 +881,7 @@ return {
   },
   hare = {
     install_info = {
-      revision = '4af5d82cf9ec39f67cb1db5b7a9269d337406592',
+      revision = 'eed7ddf6a66b596906aa8ca3d40521b8278adc6f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hare',
     },
     maintainers = { '@amaanq' },
@@ -922,7 +922,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = '65f4f86c3aaa9dabab36e3482584e8a111cf7db1',
+      revision = 'ca26229bafcd3f37698a2496c2a5efa2f07e86bc',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -1074,7 +1074,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '7d92cf188e4a3ed1b5068dd99af129f083c47e70',
+      revision = '92f9d7115598c1b012f5931a84ee5d50d46c0eb7',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1206,7 +1206,7 @@ return {
   },
   kitty = {
     install_info = {
-      revision = '49f877cff80ab613808b34bde170ea477ec182fe',
+      revision = '064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5',
       url = 'https://github.com/OXY2DEV/tree-sitter-kitty',
     },
     maintainers = { '@OXY2DEV' },
@@ -1222,7 +1222,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '7cba915fad6121f776f59e0d1787a3e36e4cfc4e',
+      revision = '172050b74825a38e29ecc94c85a4dcd10d733738',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '14152c1e580043865131bca80bcd8e8cb9132df7',
+      revision = '7eadef0de98de1170cdffb68c0931e375fc1b046',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1829,7 +1829,7 @@ return {
   },
   racket = {
     install_info = {
-      revision = '6d63a202602eb350e726b5e7814127ba22ed25fc',
+      revision = '130e76536bd3a45df7b7fd71cfa3d0df25fcfe8e',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 2,
@@ -1989,7 +1989,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '946595d164e77b705fa28385654f9420f59262ef',
+      revision = '261b20226c04ef601adbdf185a800512a5f66291',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2015,7 +2015,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = '67b5c8d6ce19fd5265f13204fec0a3efa9e095d9',
+      revision = '591893b9a8b9ec85f5cef86e0cc1028012ad9f0e',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2207,7 +2207,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = 'c52790b328b73237bcd924f3d65c5a17e794e8b1',
+      revision = 'aeaa0c7d9ef983453952a2ee4983476fef0168f3',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2265,7 +2265,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '9e06a0dddbef4e80a2091fd0a772cc93a55019f7',
+      revision = 'e88937e66adc3ee7be0bfe40b7e937eafe4212bb',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2605,7 +2605,7 @@ return {
   },
   wit = {
     install_info = {
-      revision = '8fd7cfd90be29b363922b2e09bf6a7db50de04a8',
+      revision = '230984dfaf803a0ff8f77da5034361a62c326577',
       url = 'https://github.com/bytecodealliance/tree-sitter-wit',
     },
     maintainers = { '@mkatychev' },
@@ -2639,7 +2639,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'c6f240ab53c75edc0b122bc26c994ceb410d5b27',
+      revision = 'fd546d43fe0a179b59dfdfb296082c584870e11b',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
@@ -2647,7 +2647,7 @@ return {
   },
   yaml = {
     install_info = {
-      revision = '3431ec21da1dde751bab55520963cf3a4f1121f3',
+      revision = '7708026449bed86239b1cd5bce6e3c34dbca6415',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
     },
     maintainers = { '@amaanq' },

From 09d50fd1576feeda21e85af56bcbfbdf8fccef76 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 11 Oct 2025 08:45:31 -0700
Subject: [PATCH 2509/2704] fix(kitty): align line continuation highlights

Changes them from `@comment` to `@punctuation.special`, which is how
they are in other languages.
---
 runtime/queries/kitty/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/kitty/highlights.scm b/runtime/queries/kitty/highlights.scm
index 93e5d31a4..7fe0f214a 100644
--- a/runtime/queries/kitty/highlights.scm
+++ b/runtime/queries/kitty/highlights.scm
@@ -1,4 +1,4 @@
-(line_continuation) @comment
+(line_continuation) @punctuation.special
 
 (comment
   (comment_content) @spell) @comment

From 4b74045bbe6de587c36b1e96956fa22769b4cdf7 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 11 Oct 2025 09:02:49 -0700
Subject: [PATCH 2510/2704] chore: ask for file extension in new language PR
 template

This will really help me to search on github for diverse code samples.
---
 .github/PULL_REQUEST_TEMPLATE/new_language.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE/new_language.md b/.github/PULL_REQUEST_TEMPLATE/new_language.md
index 0f814f0f0..b35e84b3b 100644
--- a/.github/PULL_REQUEST_TEMPLATE/new_language.md
+++ b/.github/PULL_REQUEST_TEMPLATE/new_language.md
@@ -8,6 +8,8 @@
 <!-- Link to an official description of the language -->
 https://...
 
+Language file extension, if applicable: (e.g. `.zu`)
+
 <details>
 <summary>Representative code sample</summary>
 ```

From 0606c7a9dcaa5c5beee0b0f09043e9fdd1ba0a68 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sat, 11 Oct 2025 15:34:39 -0700
Subject: [PATCH 2511/2704] feat(vue): delimiter highlight touch-ups

---
 runtime/queries/vue/highlights.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/vue/highlights.scm b/runtime/queries/vue/highlights.scm
index 66b7ea61e..173908b5a 100644
--- a/runtime/queries/vue/highlights.scm
+++ b/runtime/queries/vue/highlights.scm
@@ -5,7 +5,15 @@
   "]"
 ] @punctuation.bracket
 
-(interpolation) @punctuation.special
+[
+  ":"
+  "."
+] @punctuation.delimiter
+
+[
+  (interpolation)
+  "@"
+] @punctuation.special
 
 (interpolation
   (raw_text) @none)

From 4968877bb2dceac45948e24ee14298b1006b4cbf Mon Sep 17 00:00:00 2001
From: Christoph Sax <c_sax@mailbox.org>
Date: Wed, 15 Oct 2025 21:16:29 +0200
Subject: [PATCH 2512/2704] fix(t32): update repo url

Switches the grammar repository from GitLab to GitHub.
---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 90df4eb87..59dcb4b41 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -288,7 +288,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
 [sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` |   | @RaafatTurki
 [systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` |   | @ok-ryoko
 [systemverilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` |   | @zhangwwpeng
-[t32](https://gitlab.com/xasc/tree-sitter-t32) | unstable | `HFIJL` |   | @xasc
+[t32](https://github.com/xasc/tree-sitter-t32) | unstable | `HFIJL` |   | @xasc
 [tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | unstable | `HFIJL` |   | @amaanq
 [tact](https://github.com/tact-lang/tree-sitter-tact) | unstable | `HFIJL` |   | @novusnota
 [tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | unstable | `HFIJ ` |   | @lewis6991
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 238f66f67..762717cd3 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2274,7 +2274,7 @@ return {
   t32 = {
     install_info = {
       revision = 'd4e26ab7a730cfbe0cf84dba6ea3647989064839',
-      url = 'https://gitlab.com/xasc/tree-sitter-t32',
+      url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
     tier = 2,

From 63fac0a576bc78a4790cbcce24646cca860bc8c1 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 15 Oct 2025 23:17:41 -0700
Subject: [PATCH 2513/2704] fix(vue): `@character.special` highlights for `:`,
 `.` (#8200)

---
 runtime/queries/vue/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/vue/highlights.scm b/runtime/queries/vue/highlights.scm
index 173908b5a..70e4f405e 100644
--- a/runtime/queries/vue/highlights.scm
+++ b/runtime/queries/vue/highlights.scm
@@ -8,7 +8,7 @@
 [
   ":"
   "."
-] @punctuation.delimiter
+] @character.special
 
 [
   (interpolation)

From cdb5d5ef233cd5d3c558b4a48dc367943bd5c016 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 Oct 2025 14:19:37 +0200
Subject: [PATCH 2514/2704] docs(readme): remove wiki link

---
 README.md               | 2 --
 doc/nvim-treesitter.txt | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bdb9c1ddc..71cf69e33 100644
--- a/README.md
+++ b/README.md
@@ -81,8 +81,6 @@ For `nvim-treesitter` to support a specific feature for a specific language requ
 
 A list of the currently supported languages can be found [on this page](SUPPORTED_LANGUAGES.md). If you wish to add a new language or improve the queries for an existing one, please see our [contributing guide](CONTRIBUTING.md).
 
-For related information on the supported languages, including related plugins, see [this wiki page](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Supported-Languages-Information).
-
 # Supported features
 
 `nvim-treesitter` provides queries for the following features. **These are not automatically enabled.**
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index f77cb061b..3bb3f9356 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -57,7 +57,7 @@ COMMANDS                                              *nvim-treesitter-commands*
 
 Install one or more treesitter parsers. {language} can be one or multiple
 parsers or tiers (`stable`, `unstable`, or `all` (not recommended)). This is a
-no-op of the parser(s) are already installed. Installation is performed
+no-op if the parser(s) are already installed. Installation is performed
 asynchronously. Use *:TSInstall!* to force installation even if a parser is
 already installed.
 

From 846d51137b8cbc030ab94edf9dc33968ddcdb195 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 Oct 2025 15:54:28 +0200
Subject: [PATCH 2515/2704] feat(julia): update builtin functions and types
 (#8203)

Update to Julia 1.12 (sync with upstream)
---
 runtime/queries/julia/highlights.scm | 31 +++++++++++++++-------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/runtime/queries/julia/highlights.scm b/runtime/queries/julia/highlights.scm
index 9a82c5d41..de32c67ed 100644
--- a/runtime/queries/julia/highlights.scm
+++ b/runtime/queries/julia/highlights.scm
@@ -45,12 +45,13 @@
       (identifier) @function.macro)))
 
 ; Built-in functions
-; filter(name -> Base.eval(Core, name) isa Core.Builtin, names(Core))
+; print.("\"", filter(name -> getglobal(Core, name) isa Core.Builtin, names(Core)), "\" ")
 ((identifier) @function.builtin
   (#any-of? @function.builtin
-    "applicable" "fieldtype" "getfield" "getglobal" "invoke" "isa" "isdefined" "modifyfield!"
-    "modifyglobal!" "nfields" "replacefield!" "replaceglobal!" "setfield!" "setfieldonce!"
-    "setglobal!" "setglobalonce!" "swapfield!" "swapglobal!" "throw" "tuple" "typeassert" "typeof"))
+    "applicable" "fieldtype" "getfield" "getglobal" "invoke" "isa" "isdefined" "isdefinedglobal"
+    "modifyfield!" "modifyglobal!" "nfields" "replacefield!" "replaceglobal!" "setfield!"
+    "setfieldonce!" "setglobal!" "setglobalonce!" "swapfield!" "swapglobal!" "throw" "tuple"
+    "typeassert" "typeof"))
 
 ; Type definitions
 (type_head
@@ -91,19 +92,21 @@
   (#any-of? @operator "<:" ">:"))
 
 ; Built-in types
-; filter(name -> typeof(Base.eval(Core, name)) in [DataType, UnionAll], names(Core))
+; print.("\"", filter(name -> typeof(Base.eval(Core, name)) in [DataType, UnionAll], names(Core)), "\" ")
 ((identifier) @type.builtin
   (#any-of? @type.builtin
     "AbstractArray" "AbstractChar" "AbstractFloat" "AbstractString" "Any" "ArgumentError" "Array"
-    "AssertionError" "Bool" "BoundsError" "Char" "ConcurrencyViolationError" "Cvoid" "DataType"
-    "DenseArray" "DivideError" "DomainError" "ErrorException" "Exception" "Expr" "Float16" "Float32"
-    "Float64" "Function" "GlobalRef" "IO" "InexactError" "InitError" "Int" "Int128" "Int16" "Int32"
-    "Int64" "Int8" "Integer" "InterruptException" "LineNumberNode" "LoadError" "Method"
-    "MethodError" "Module" "NTuple" "NamedTuple" "Nothing" "Number" "OutOfMemoryError"
-    "OverflowError" "Pair" "Ptr" "QuoteNode" "ReadOnlyMemoryError" "Real" "Ref" "SegmentationFault"
-    "Signed" "StackOverflowError" "String" "Symbol" "Task" "Tuple" "Type" "TypeError" "TypeVar"
-    "UInt" "UInt128" "UInt16" "UInt32" "UInt64" "UInt8" "UndefInitializer" "UndefKeywordError"
-    "UndefRefError" "UndefVarError" "Union" "UnionAll" "Unsigned" "VecElement" "WeakRef"))
+    "AssertionError" "AtomicMemory" "AtomicMemoryRef" "Bool" "BoundsError" "Char"
+    "ConcurrencyViolationError" "Cvoid" "DataType" "DenseArray" "DivideError" "DomainError"
+    "ErrorException" "Exception" "Expr" "FieldError" "Float16" "Float32" "Float64" "Function"
+    "GenericMemory" "GenericMemoryRef" "GlobalRef" "IO" "InexactError" "InitError" "Int" "Int128"
+    "Int16" "Int32" "Int64" "Int8" "Integer" "InterruptException" "LineNumberNode" "LoadError"
+    "Memory" "MemoryRef" "Method" "MethodError" "Module" "NTuple" "NamedTuple" "Nothing" "Number"
+    "OutOfMemoryError" "OverflowError" "Pair" "Ptr" "QuoteNode" "ReadOnlyMemoryError" "Real" "Ref"
+    "SegmentationFault" "Signed" "StackOverflowError" "String" "Symbol" "Task" "Tuple" "Type"
+    "TypeError" "TypeVar" "UInt" "UInt128" "UInt16" "UInt32" "UInt64" "UInt8" "UndefInitializer"
+    "UndefKeywordError" "UndefRefError" "UndefVarError" "Union" "UnionAll" "Unsigned" "VecElement"
+    "WeakRef"))
 
 ; Keywords
 [

From 71bf1665f804d46f7e4b24ad7ffc11f6ea5b271a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 19 Oct 2025 11:29:49 +0200
Subject: [PATCH 2516/2704] feat(parsers): update ada, cmake, desktop, dot,
 mlir, nu, qmljs, sparql, sql, superhtml, systemverilog, t32, tmux, xresources

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 762717cd3..5cdbf3e43 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2,7 +2,7 @@
 return {
   ada = {
     install_info = {
-      revision = 'b23672d313b4c994ab96fd54f1b7ff15eac68a55',
+      revision = '6c26c4413965dc7bacbccfa66503bf6b8228e254',
       url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
@@ -230,7 +230,7 @@ return {
   },
   cmake = {
     install_info = {
-      revision = 'cf9799600b2ba5e6620fdabddec3b2db8306bc46',
+      revision = 'c7b2a71e7f8ecb167fad4c97227c838439280175',
       url = 'https://github.com/uyha/tree-sitter-cmake',
     },
     maintainers = { '@uyha' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '73b9f3ac30ac8d01267a16b1c4f0880aecdb56b2',
+      revision = 'de6482e226443a210f27627e0240c12aa25c2925',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -402,7 +402,7 @@ return {
   },
   dot = {
     install_info = {
-      revision = '9ab85550c896d8b294d9b9ca1e30698736f08cea',
+      revision = '71e2c5241eef9de920a4efedfefd1d527dd9a118',
       url = 'https://github.com/rydesun/tree-sitter-dot',
     },
     maintainers = { '@rydesun' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '7eadef0de98de1170cdffb68c0931e375fc1b046',
+      revision = '47c3f2cf3b10016503f2577c2d99c15bb2053402',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1486,7 +1486,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'e1509fc9f9aa6579430a65f167528617df56b107',
+      revision = '4f4ac8667c1e7f80d0d9f9534845e63026210aaf',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1803,7 +1803,7 @@ return {
   },
   qmljs = {
     install_info = {
-      revision = '0889da4632bba3ec6f39ef4102625654890c15c1',
+      revision = '0bec4359a7eb2f6c9220cd57372d87d236f66d59',
       url = 'https://github.com/yuja/tree-sitter-qmljs',
     },
     maintainers = { '@Decodetalkers' },
@@ -2133,7 +2133,7 @@ return {
   },
   sparql = {
     install_info = {
-      revision = 'd853661ca680d8ff7f8d800182d5782b61d0dd58',
+      revision = '1ef52d35a73a2a5f2e433ecfd1c751c1360a923b',
       url = 'https://github.com/GordianDziwis/tree-sitter-sparql',
     },
     maintainers = { '@GordianDziwis' },
@@ -2150,7 +2150,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '4afe285bb142542cee0aa7b689fec00a71df4741',
+      revision = 'd71f2bd7f0e3dba84df7025fc9314738d180e71e',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2207,7 +2207,7 @@ return {
   superhtml = {
     install_info = {
       location = 'tree-sitter-superhtml',
-      revision = 'aeaa0c7d9ef983453952a2ee4983476fef0168f3',
+      revision = '8b5bb272b269afdd38cdf641c4a707dd92fbe902',
       url = 'https://github.com/kristoff-it/superhtml',
     },
     maintainers = { '@rockorager' },
@@ -2265,7 +2265,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = 'e88937e66adc3ee7be0bfe40b7e937eafe4212bb',
+      revision = '7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2273,7 +2273,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = 'd4e26ab7a730cfbe0cf84dba6ea3647989064839',
+      revision = '2f604ad17a15c09d99648199da7f173eed8250dc',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2372,7 +2372,7 @@ return {
   },
   tmux = {
     install_info = {
-      revision = '72b42cd0307bdfe471fd151a0282d0d38e889944',
+      revision = '815f8fa5ac7aeb6246c14896d16082fecdf98b2b',
       url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
     maintainers = { '@Freed-Wu', '@stevenxxiu' },
@@ -2639,7 +2639,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'fd546d43fe0a179b59dfdfb296082c584870e11b',
+      revision = '321231f99e3704f1555de14cda5dca93ee14a95b',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 30c466ad571b8b99fd06e3df8b2336e3ae63a53a Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Tue, 21 Oct 2025 15:10:18 +0800
Subject: [PATCH 2517/2704] fix(nu): separate patterns for `collection_type`

---
 runtime/queries/nu/highlights.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/runtime/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
index e23a30fae..e008352d4 100644
--- a/runtime/queries/nu/highlights.scm
+++ b/runtime/queries/nu/highlights.scm
@@ -344,14 +344,19 @@ key: (identifier) @property
   [
     "record"
     "table"
-  ] @type.builtin
-  "<" @punctuation.bracket
-  key: (_) @variable.parameter
+  ] @type.builtin)
+
+(collection_type
+  key: (_) @variable.parameter)
+
+(collection_type
   [
-    ","
-    ":"
-  ] @punctuation.delimiter
-  ">" @punctuation.bracket)
+    "<"
+    ">"
+  ] @punctuation.bracket)
+
+(collection_type
+  ":" @punctuation.special)
 
 (shebang) @keyword.directive
 

From 8fecb462580ec0794a803b1d6ff9e2c4896c3e6f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 20 Oct 2025 19:19:17 +0200
Subject: [PATCH 2518/2704] feat(julia)!: switch to maintained fork

breaking change: ABI 15, drop support for emoji identifiers
---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 59dcb4b41..f931a3590 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -155,7 +155,7 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` |   | @TravonteD
 [jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | unstable | `HFIJL` |   | @WhyNotHugo
 [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` |   | @nawordar
 jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
-[julia](https://github.com/tree-sitter/tree-sitter-julia) | unstable | `HFIJL` |   | @fredrikekre
+[julia](https://github.com/tree-sitter-grammars/tree-sitter-julia) | unstable | `HFIJL` |   | @clason
 [just](https://github.com/IndianBoy42/tree-sitter-just) | unstable | `HFIJL` |   | @Hubro
 [kcl](https://github.com/kcl-lang/tree-sitter-kcl) | unstable | `HF J ` |   | @bertbaron
 [kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` |   | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5cdbf3e43..62217fc33 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1166,10 +1166,10 @@ return {
   },
   julia = {
     install_info = {
-      revision = '73d1539a51b8a202d6d2471cc594cf4d7c5e673f',
-      url = 'https://github.com/tree-sitter/tree-sitter-julia',
+      revision = '8d11bcffb6eebcb08049436bd01bd98afa058dc4',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-julia',
     },
-    maintainers = { '@fredrikekre' },
+    maintainers = { '@clason' },
     tier = 2,
   },
   just = {

From eea5725822098255cc22233b053ba9d56aaf53b9 Mon Sep 17 00:00:00 2001
From: Isla Waters <info@mrsdizzie.com>
Date: Fri, 17 Oct 2025 10:06:14 -0400
Subject: [PATCH 2519/2704] feat(perl): Add language injection based on heredoc
 delimiter

---
 runtime/queries/perl/injections.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/queries/perl/injections.scm b/runtime/queries/perl/injections.scm
index ec11e9013..a1327bd4b 100644
--- a/runtime/queries/perl/injections.scm
+++ b/runtime/queries/perl/injections.scm
@@ -13,3 +13,7 @@
   (#not-lua-match? @_modifiers "e.*e")
   (#set! injection.language "perl")
   (#set! injection.include-children))
+
+(heredoc_content
+  (heredoc_end) @injection.language) @injection.content
+  (#set! injection.include-children)

From 4a9f57971ae455f07922800973f2d0eccc818e3a Mon Sep 17 00:00:00 2001
From: Isla Waters <info@mrsdizzie.com>
Date: Fri, 17 Oct 2025 10:35:00 -0400
Subject: [PATCH 2520/2704] Remove empty capture based on ts_query_ls output

---
 runtime/queries/perl/injections.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/queries/perl/injections.scm b/runtime/queries/perl/injections.scm
index a1327bd4b..56e9b14fa 100644
--- a/runtime/queries/perl/injections.scm
+++ b/runtime/queries/perl/injections.scm
@@ -16,4 +16,3 @@
 
 (heredoc_content
   (heredoc_end) @injection.language) @injection.content
-  (#set! injection.include-children)

From f2204e58dbb2031cb6783caa4541c4483edbb426 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 24 Oct 2025 18:47:39 -0700
Subject: [PATCH 2521/2704] fix: use proper `; inherits` syntax in queries
 (#8226)

Some queries don't add a colon after the `inherits` keyword, which nvim
could handle but `ts_query_ls` could not, causing it to give incomplete
diagnostics.
---
 runtime/queries/html/injections.scm      | 3 ++-
 runtime/queries/starlark/injections.scm  | 2 +-
 runtime/queries/vue/injections.scm       | 3 ++-
 runtime/queries/wgsl_bevy/folds.scm      | 3 ++-
 runtime/queries/wgsl_bevy/highlights.scm | 3 ++-
 runtime/queries/wgsl_bevy/indents.scm    | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/runtime/queries/html/injections.scm b/runtime/queries/html/injections.scm
index adb067d15..6a9d3e89e 100644
--- a/runtime/queries/html/injections.scm
+++ b/runtime/queries/html/injections.scm
@@ -1,4 +1,5 @@
-; inherits html_tags
+; inherits: html_tags
+
 (element
   (start_tag
     (tag_name) @_py_script)
diff --git a/runtime/queries/starlark/injections.scm b/runtime/queries/starlark/injections.scm
index 2b60646e2..0b920cbf9 100644
--- a/runtime/queries/starlark/injections.scm
+++ b/runtime/queries/starlark/injections.scm
@@ -1 +1 @@
-; inherits python
+; inherits: python
diff --git a/runtime/queries/vue/injections.scm b/runtime/queries/vue/injections.scm
index 586964011..d17bbb55f 100644
--- a/runtime/queries/vue/injections.scm
+++ b/runtime/queries/vue/injections.scm
@@ -1,4 +1,5 @@
-; inherits html_tags
+; inherits: html_tags
+
 ; <script lang="css">
 ((style_element
   (start_tag
diff --git a/runtime/queries/wgsl_bevy/folds.scm b/runtime/queries/wgsl_bevy/folds.scm
index bb371406d..2cb706060 100644
--- a/runtime/queries/wgsl_bevy/folds.scm
+++ b/runtime/queries/wgsl_bevy/folds.scm
@@ -1,2 +1,3 @@
-; inherits wgsl
+; inherits: wgsl
+
 (preproc_ifdef) @fold
diff --git a/runtime/queries/wgsl_bevy/highlights.scm b/runtime/queries/wgsl_bevy/highlights.scm
index 2a6a9740c..e4e9ce7c9 100644
--- a/runtime/queries/wgsl_bevy/highlights.scm
+++ b/runtime/queries/wgsl_bevy/highlights.scm
@@ -1,4 +1,5 @@
-; inherits wgsl
+; inherits: wgsl
+
 [
   "virtual"
   "override"
diff --git a/runtime/queries/wgsl_bevy/indents.scm b/runtime/queries/wgsl_bevy/indents.scm
index 381321877..d137ff787 100644
--- a/runtime/queries/wgsl_bevy/indents.scm
+++ b/runtime/queries/wgsl_bevy/indents.scm
@@ -1,4 +1,5 @@
-; inherits wgsl
+; inherits: wgsl
+
 [
   "#ifdef"
   "#ifndef"

From 400f38cc23d89e1d8e77b11bccf830dfc74ec5fb Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Fri, 24 Oct 2025 18:50:42 -0700
Subject: [PATCH 2522/2704] feat(hyprlang): update parser and queries (#8224)

---
 lua/nvim-treesitter/parsers.lua         | 2 +-
 runtime/queries/hyprlang/highlights.scm | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 62217fc33..3a45f1e1f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1010,7 +1010,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      revision = 'd626ec06e4d876fc41200a30b3e6f2b4714c7367',
+      revision = 'b23e85dded5d150ffee0ac83c01cbeb1520aad2f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
diff --git a/runtime/queries/hyprlang/highlights.scm b/runtime/queries/hyprlang/highlights.scm
index 340237fcc..97aca45e2 100644
--- a/runtime/queries/hyprlang/highlights.scm
+++ b/runtime/queries/hyprlang/highlights.scm
@@ -18,6 +18,9 @@
 (section
   (name) @module)
 
+(window_rule
+  (name) @function.call)
+
 (section
   device: (device_name) @string.special)
 
@@ -49,6 +52,7 @@
 
 [
   ","
+  ";"
   ":"
   "x"
   "@"
@@ -59,6 +63,8 @@
   ")"
   "{"
   "}"
+  "["
+  "]"
 ] @punctuation.bracket
 
 [

From 9ee023538e072163cc541f29bc74214f7b0b90f6 Mon Sep 17 00:00:00 2001
From: zc he <blindfs19@gmail.com>
Date: Sat, 25 Oct 2025 17:14:38 +0800
Subject: [PATCH 2523/2704] feat(nu): update syntax to Nu 0.108.0 (#8227)

also deduplicate bracket rules
---
 runtime/queries/nu/highlights.scm | 43 ++++++++++++++-----------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/runtime/queries/nu/highlights.scm b/runtime/queries/nu/highlights.scm
index e008352d4..2991ef970 100644
--- a/runtime/queries/nu/highlights.scm
+++ b/runtime/queries/nu/highlights.scm
@@ -219,6 +219,8 @@ file_path: (val_string) @variable.parameter
   "}"
   "["
   "]"
+  "<"
+  ">"
   "...["
   "...("
   "...{"
@@ -258,9 +260,9 @@ key: (identifier) @property
 
 (cmd_identifier) @function
 
-; generated with Nu 0.93.0
+; generated with Nu 0.108.0
 ; > help commands
-;   | filter { $in.command_type == builtin and $in.category != core }
+;   | where $it.command_type == built-in and $it.category != core
 ;   | each {$'"($in.name | split row " " | $in.0)"'}
 ;   | uniq
 ;   | str join ' '
@@ -268,20 +270,19 @@ key: (identifier) @property
   head: [
     (cmd_identifier) @function.builtin
     (#any-of? @function.builtin
-      "all" "ansi" "any" "append" "ast" "bits" "bytes" "cal" "cd" "char" "clear" "collect" "columns"
-      "compact" "complete" "config" "cp" "date" "debug" "decode" "default" "detect" "dfr" "drop"
-      "du" "each" "encode" "enumerate" "every" "exec" "exit" "explain" "explore" "export-env" "fill"
-      "filter" "find" "first" "flatten" "fmt" "format" "from" "generate" "get" "glob" "grid" "group"
+      "all" "ansi" "any" "append" "ast" "bits" "bytes" "cal" "cd" "char" "chunk-by" "chunks" "clear"
+      "collect" "columns" "compact" "complete" "config" "cp" "date" "debug" "decode" "default"
+      "detect" "drop" "du" "each" "encode" "enumerate" "every" "exec" "exit" "explain" "explore"
+      "fill" "filter" "find" "first" "flatten" "format" "from" "generate" "get" "glob" "grid"
       "group-by" "hash" "headers" "histogram" "history" "http" "input" "insert" "inspect"
-      "interleave" "into" "is-empty" "is-not-empty" "is-terminal" "items" "join" "keybindings"
+      "interleave" "into" "is-empty" "is-not-empty" "is-terminal" "items" "job" "join" "keybindings"
       "kill" "last" "length" "let-env" "lines" "load-env" "ls" "math" "merge" "metadata" "mkdir"
       "mktemp" "move" "mv" "nu-check" "nu-highlight" "open" "panic" "par-each" "parse" "path"
-      "plugin" "port" "prepend" "print" "ps" "query" "random" "range" "reduce" "reject" "rename"
-      "reverse" "rm" "roll" "rotate" "run-external" "save" "schema" "select" "seq" "shuffle" "skip"
-      "sleep" "sort" "sort-by" "split" "split-by" "start" "stor" "str" "sys" "table" "take" "tee"
-      "term" "timeit" "to" "touch" "transpose" "tutor" "ulimit" "uname" "uniq" "uniq-by" "update"
-      "upsert" "url" "values" "view" "watch" "where" "which" "whoami" "window" "with-env" "wrap"
-      "zip")
+      "plugin" "port" "prepend" "print" "ps" "query" "random" "reduce" "reject" "rename" "reverse"
+      "rm" "roll" "rotate" "run-external" "save" "schema" "select" "seq" "shuffle" "skip" "sleep"
+      "slice" "sort" "sort-by" "split" "start" "stor" "str" "sys" "table" "take" "tee" "term"
+      "timeit" "to" "touch" "transpose" "tutor" "ulimit" "uname" "uniq" "uniq-by" "update" "upsert"
+      "url" "values" "version" "view" "watch" "which" "whoami" "window" "with-env" "wrap" "zip")
   ])
 
 (command
@@ -314,6 +315,7 @@ key: (identifier) @property
   [
     "."
     "?"
+    "!"
   ] @punctuation.delimiter) @variable.parameter
 
 (stmt_let
@@ -334,11 +336,7 @@ key: (identifier) @property
 (flat_type) @type
 
 (list_type
-  "list" @type.builtin
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
+  "list" @type.builtin)
 
 (collection_type
   [
@@ -349,15 +347,12 @@ key: (identifier) @property
 (collection_type
   key: (_) @variable.parameter)
 
-(collection_type
-  [
-    "<"
-    ">"
-  ] @punctuation.bracket)
-
 (collection_type
   ":" @punctuation.special)
 
+(composite_type
+  "oneof" @type.builtin)
+
 (shebang) @keyword.directive
 
 (comment) @comment @spell

From 98fe644cb3b5ba390d1bc3f89299f93c70020803 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 25 Oct 2025 11:43:22 +0200
Subject: [PATCH 2524/2704] feat(parsers): update c3, desktop, dot, gomod, idl,
 julia, kitty, matlab, mlir, nu, php, php_only, tmux

---
 lua/nvim-treesitter/parsers.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 3a45f1e1f..210060250 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '057a75df0c866034d8edce989f701ee2cb0481d8',
+      revision = 'e4570693b8064a83cd7826795d5ef29400313d3c',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'de6482e226443a210f27627e0240c12aa25c2925',
+      revision = '773d164f6f3abd9cee37be17246bcae78b2ebcbc',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -402,7 +402,7 @@ return {
   },
   dot = {
     install_info = {
-      revision = '71e2c5241eef9de920a4efedfefd1d527dd9a118',
+      revision = '80327abbba6f47530edeb0df9f11bd5d5c93c14d',
       url = 'https://github.com/rydesun/tree-sitter-dot',
     },
     maintainers = { '@rydesun' },
@@ -794,7 +794,7 @@ return {
   },
   gomod = {
     install_info = {
-      revision = '6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c',
+      revision = '2e886870578eeba1927a2dc4bd2e2b3f598c5f9a',
       url = 'https://github.com/camdencheek/tree-sitter-go-mod',
     },
     maintainers = { '@camdencheek' },
@@ -1018,7 +1018,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '3632e926ef4ba924b05993683111480af0d5c9e3',
+      revision = '86d434e732f971ecec24571e0dcb6b14c8b19952',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1166,7 +1166,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = '8d11bcffb6eebcb08049436bd01bd98afa058dc4',
+      revision = 'a0b436e4a2895596eb9965a9493e18989defa521',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-julia',
     },
     maintainers = { '@clason' },
@@ -1206,7 +1206,7 @@ return {
   },
   kitty = {
     install_info = {
-      revision = '064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5',
+      revision = '2e9b602ca676cac63887cca5a4535106f3475c82',
       url = 'https://github.com/OXY2DEV/tree-sitter-kitty',
     },
     maintainers = { '@OXY2DEV' },
@@ -1374,7 +1374,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '96a3e8fb0a4ebd0db64db6b52043483937e9ca3a',
+      revision = 'd8f5728f67877d829b6ccd1b8bd1e0ad02b22217',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '47c3f2cf3b10016503f2577c2d99c15bb2053402',
+      revision = '65435795eb4132d5eff66d62347050e863e5ebe5',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1486,7 +1486,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '4f4ac8667c1e7f80d0d9f9534845e63026210aaf',
+      revision = '47d4b4f5369c0cae866724758ae88ef07e10e4f1',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1581,7 +1581,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '9a85df21c63bdaf1695b7ac1430e29354cb5904f',
+      revision = 'de11d0bcec62b8ed6b0c7edd55051042f37b8b05',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1592,7 +1592,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '9a85df21c63bdaf1695b7ac1430e29354cb5904f',
+      revision = 'de11d0bcec62b8ed6b0c7edd55051042f37b8b05',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -2372,7 +2372,7 @@ return {
   },
   tmux = {
     install_info = {
-      revision = '815f8fa5ac7aeb6246c14896d16082fecdf98b2b',
+      revision = '75d1b995b0c23400ac8e49db757a2e0386f9fa8f',
       url = 'https://github.com/Freed-Wu/tree-sitter-tmux',
     },
     maintainers = { '@Freed-Wu', '@stevenxxiu' },

From c53bb10a71a04860758757b190620814b4993a77 Mon Sep 17 00:00:00 2001
From: Lev Velykoivanenko <velykoivanenko.lev@gmail.com>
Date: Sun, 26 Oct 2025 17:25:42 +0100
Subject: [PATCH 2525/2704] fix(python): regex injection not working for
 concatenated strings (#8197)

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 runtime/queries/python/highlights.scm    | 10 +++++++++-
 runtime/queries/python/injections.scm    | 14 +++++++++++++-
 runtime/queries/starlark/injections.scm  |  9 ++++++++-
 tests/query/highlights/python/regex.py   | 19 +++++++++++++++++++
 tests/query/highlights/starlark/test.bzl | 11 +++++++++++
 tests/query/injections/python/test.py    | 18 ++++++++++++++++++
 tests/query/injections/starlark/test.bzl |  5 +++++
 7 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 tests/query/highlights/python/regex.py
 create mode 100644 tests/query/highlights/starlark/test.bzl
 create mode 100644 tests/query/injections/python/test.py
 create mode 100644 tests/query/injections/starlark/test.bzl

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 70f6d9acc..350990b1f 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -417,11 +417,19 @@
   function: (attribute
     object: (identifier) @_re)
   arguments: (argument_list
-    .
     (string
       (string_content) @string.regexp))
   (#eq? @_re "re"))
 
+(call
+  function: (attribute
+    object: (identifier) @_re)
+  arguments: (argument_list
+    (concatenated_string
+      (string
+        (string_content) @string.regexp)))
+  (#eq? @_re "re"))
+
 ; Decorators
 ((decorator
   "@" @attribute)
diff --git a/runtime/queries/python/injections.scm b/runtime/queries/python/injections.scm
index bbc924be4..2a120d9b5 100644
--- a/runtime/queries/python/injections.scm
+++ b/runtime/queries/python/injections.scm
@@ -2,12 +2,24 @@
   function: (attribute
     object: (identifier) @_re)
   arguments: (argument_list
-    .
     (string
       (string_content) @injection.content))
   (#eq? @_re "re")
   (#set! injection.language "regex"))
 
+(call
+  function: (attribute
+    object: (identifier) @_re)
+  arguments: (argument_list
+    (concatenated_string
+      [
+        (string
+          (string_content) @injection.content)
+        (comment)
+      ]+))
+  (#eq? @_re "re")
+  (#set! injection.language "regex"))
+
 ((binary_operator
   left: (string
     (string_content) @injection.content)
diff --git a/runtime/queries/starlark/injections.scm b/runtime/queries/starlark/injections.scm
index 0b920cbf9..a6656db97 100644
--- a/runtime/queries/starlark/injections.scm
+++ b/runtime/queries/starlark/injections.scm
@@ -1 +1,8 @@
-; inherits: python
+((binary_operator
+  left: (string
+    (string_content) @injection.content)
+  operator: "%")
+  (#set! injection.language "printf"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/tests/query/highlights/python/regex.py b/tests/query/highlights/python/regex.py
new file mode 100644
index 000000000..385ec7760
--- /dev/null
+++ b/tests/query/highlights/python/regex.py
@@ -0,0 +1,19 @@
+import re
+
+re_test = re.compile(r"^(?P<year>\d{4}) (?P<day>\d) \w\s{,3}$")
+#                                    ^ @string.regexp
+re_test = re.compile(
+    # comment
+    # ^ @comment
+    r"^(?P<year>\d{4}){1}"
+    # ^ @string.regexp
+    # comment
+    # ^ @comment
+    r"(?P<day>\d) \w\s{,3}"
+    # ^ @string.regexp
+    # comment
+    # ^ @comment
+)
+# interpolation
+print("foo %s bar %d" % ("arg1", 2))
+#          ^ @character
diff --git a/tests/query/highlights/starlark/test.bzl b/tests/query/highlights/starlark/test.bzl
new file mode 100644
index 000000000..88251f615
--- /dev/null
+++ b/tests/query/highlights/starlark/test.bzl
@@ -0,0 +1,11 @@
+# split
+# ^ @comment
+assert_eq('foo bar'.split(' '), ['foo', 'bar'])
+# ^ @keyword
+#        ^ @punctuation.bracket
+#          ^ @string
+#                  ^ @punctuation.delimiter
+assert_eq('foo bar foo'.rsplit(' ', 1), ['foo bar', 'foo'])
+#                                   ^ @number
+assert_eq("foo %s bar %d" % ("arg1", 2), "foo arg1 bar 2")
+#              ^ @character
diff --git a/tests/query/injections/python/test.py b/tests/query/injections/python/test.py
new file mode 100644
index 000000000..1d6a0a465
--- /dev/null
+++ b/tests/query/injections/python/test.py
@@ -0,0 +1,18 @@
+import re
+
+re_test = re.compile(r"^(?P<year>\d{4}) (?P<day>\d) \w\s{,3}$")
+#                                    ^ @regex
+re_test = re.compile(
+    # comment
+    # ^ @comment
+    r"^(?P<year>\d{4}) "
+    # comment
+    # ^ @comment
+    r"(?P<day>\d) \w\s{,3}$"
+    # ^ @regex
+    # comment
+    # comment
+    # ^ @comment
+)
+print("foo %s bar %d" % ("arg1", 2))
+#          ^ @printf
diff --git a/tests/query/injections/starlark/test.bzl b/tests/query/injections/starlark/test.bzl
new file mode 100644
index 000000000..4a8af5172
--- /dev/null
+++ b/tests/query/injections/starlark/test.bzl
@@ -0,0 +1,5 @@
+# split
+# ^ @comment
+assert_eq('foo bar'.split(' '), ['foo', 'bar'])
+assert_eq("foo %s bar %d" % ("arg1", 2), "foo arg1 bar 2")
+#              ^ @printf

From 738d9ced4ce5b4538c3a0e23ceca12c34c8d2e74 Mon Sep 17 00:00:00 2001
From: imawaki <imawaki.2015@gmail.com>
Date: Mon, 27 Oct 2025 03:07:19 +0900
Subject: [PATCH 2526/2704] feat(apex): javadoc injections (#8232)

Apex codebases commonly use Javadoc-style comments, similar to Java (Apex is Salesforce's object-oriented language).

This updates the injection query to capture javadoc nodes instead of the generic comment for better highlighting and parsing accuracy.
---
 runtime/queries/apex/injections.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/runtime/queries/apex/injections.scm b/runtime/queries/apex/injections.scm
index 3cd6aac8e..5c8cededd 100644
--- a/runtime/queries/apex/injections.scm
+++ b/runtime/queries/apex/injections.scm
@@ -3,3 +3,12 @@
   (block_comment)
 ] @injection.content
   (#set! injection.language "comment"))
+
+((block_comment) @injection.content
+  (#lua-match? @injection.content "/[*][*][%s]")
+  (#set! injection.language "javadoc"))
+
+; markdown-style javadocs https://openjdk.org/jeps/467
+((line_comment) @injection.content
+  (#lua-match? @injection.content "^///%s")
+  (#set! injection.language "javadoc"))

From 645f42e85d8665c91a9911c3896afb57d6b8a923 Mon Sep 17 00:00:00 2001
From: Christoph Horn <christoph-horn@hotmail.de>
Date: Mon, 27 Oct 2025 11:43:58 +0100
Subject: [PATCH 2527/2704] feat(julia)!: update parser and queries (#8235)

sync locals queries with upstream

---------

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 lua/nvim-treesitter/parsers.lua  |  2 +-
 runtime/queries/julia/locals.scm | 38 ++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 210060250..50bebeea7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1166,7 +1166,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = 'a0b436e4a2895596eb9965a9493e18989defa521',
+      revision = '5a5d3082e13edd5afc4c274498d6125ecc914870',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-julia',
     },
     maintainers = { '@clason' },
diff --git a/runtime/queries/julia/locals.scm b/runtime/queries/julia/locals.scm
index 218a84ae9..eff949a0d 100644
--- a/runtime/queries/julia/locals.scm
+++ b/runtime/queries/julia/locals.scm
@@ -1,27 +1,41 @@
 ; References
 (identifier) @local.reference
 
-; Variables
+; Definitions
 (assignment
+  .
   (identifier) @local.definition.var)
 
 (assignment
+  .
   (tuple_expression
     (identifier) @local.definition.var))
 
-; For bindings
+(assignment
+  .
+  (open_tuple
+    (identifier) @local.definition.var))
+
 (for_binding
+  .
   (identifier) @local.definition.var)
 
 (for_binding
+  .
   (tuple_expression
     (identifier) @local.definition.var))
 
-; Types
+(import_statement
+  (identifier) @local.definition.import)
+
+(using_statement
+  (identifier) @local.definition.import)
+
+(selected_import
+  (identifier) @local.definition.import)
+
 (module_definition
-  (identifier) @local.definition.type)
-
-(struct_definition
+  .
   (identifier) @local.definition.type)
 
 (type_head
@@ -32,17 +46,6 @@
     .
     (identifier) @local.definition.type))
 
-; Module imports
-(import_statement
-  (identifier) @local.definition.import)
-
-(using_statement
-  (identifier) @local.definition.import)
-
-(selected_import
-  (identifier) @local.definition.import)
-
-; Scopes
 (function_definition
   (signature
     (call_expression
@@ -55,6 +58,7 @@
       .
       (identifier) @local.definition.function))) @local.scope
 
+; Scopes
 [
   (quote_statement)
   (let_statement)

From 9ddd853e7e2ca1aa5dae23da1d8851b4c2319856 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 29 Oct 2025 19:26:43 +0100
Subject: [PATCH 2528/2704] feat(diff): update parser after move

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index f931a3590..135341be4 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -57,7 +57,7 @@ Language | Tier | Queries | Node | Maintainer
 [desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | unstable | `HF J ` |   | @ValdezFOmar
 [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | unstable | `HFIJL` |   | @jedrzejboczar
 [dhall](https://github.com/jbellerb/tree-sitter-dhall) | unstable | `HF J ` |   | @amaanq
-[diff](https://github.com/the-mikedavis/tree-sitter-diff) | unstable | `HF J ` |   | @gbprod
+[diff](https://github.com/tree-sitter-grammars/tree-sitter-diff) | unstable | `HF J ` |   | @gbprod
 [disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | unstable | `H  J ` |   | @ColinKennedy
 [djot](https://github.com/treeman/tree-sitter-djot) | unstable | `HFIJL` |   | @NoahTheDuke
 [dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | unstable | `H  J ` |   | @camdencheek
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 50bebeea7..665dddf5e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -370,8 +370,8 @@ return {
   },
   diff = {
     install_info = {
-      revision = 'e42b8def4f75633568f1aecfe01817bf15164928',
-      url = 'https://github.com/the-mikedavis/tree-sitter-diff',
+      revision = '2520c3f934b3179bb540d23e0ef45f75304b5fed',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-diff',
     },
     maintainers = { '@gbprod' },
     tier = 2,

From 2c30e515ebe79037ab8d15f7e59c0e2690f50626 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 29 Oct 2025 18:51:42 -0700
Subject: [PATCH 2529/2704] fix: prefer `#eq?` for checking equality with one
 string (#8246)

---
 .tsqueryrc.json                              |  4 ++++
 runtime/queries/bass/highlights.scm          |  2 +-
 runtime/queries/cmake/highlights.scm         |  2 +-
 runtime/queries/janet_simple/highlights.scm  |  2 +-
 runtime/queries/latex/highlights.scm         |  2 +-
 runtime/queries/ninja/highlights.scm         |  2 +-
 runtime/queries/slim/highlights.scm          | 16 ++++++++--------
 runtime/queries/systemverilog/highlights.scm |  2 +-
 runtime/queries/terraform/highlights.scm     |  2 +-
 9 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.tsqueryrc.json b/.tsqueryrc.json
index cd3a692d5..d146e2f76 100644
--- a/.tsqueryrc.json
+++ b/.tsqueryrc.json
@@ -185,6 +185,10 @@
           "type": "string",
           "arity": "required"
         },
+        {
+          "type": "string",
+          "arity": "required"
+        },
         {
           "type": "string",
           "arity": "variadic"
diff --git a/runtime/queries/bass/highlights.scm b/runtime/queries/bass/highlights.scm
index f84993af1..8508de9ab 100644
--- a/runtime/queries/bass/highlights.scm
+++ b/runtime/queries/bass/highlights.scm
@@ -79,7 +79,7 @@
 
 ; Repeats
 ((symbol) @keyword.repeat
-  (#any-of? @keyword.repeat "each"))
+  (#eq? @keyword.repeat "each"))
 
 ; Operators
 ((symbol) @operator
diff --git a/runtime/queries/cmake/highlights.scm b/runtime/queries/cmake/highlights.scm
index fbbf0d542..41713ea16 100644
--- a/runtime/queries/cmake/highlights.scm
+++ b/runtime/queries/cmake/highlights.scm
@@ -137,7 +137,7 @@
     ((argument) @_cache @keyword.modifier
       .
       (argument) @_type @type
-      (#any-of? @_cache "CACHE")
+      (#eq? @_cache "CACHE")
       (#any-of? @_type "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL"))))
 
 (normal_command
diff --git a/runtime/queries/janet_simple/highlights.scm b/runtime/queries/janet_simple/highlights.scm
index 552f865c6..eb82a9830 100644
--- a/runtime/queries/janet_simple/highlights.scm
+++ b/runtime/queries/janet_simple/highlights.scm
@@ -55,7 +55,7 @@
 
 ; Comment
 ((sym_lit) @comment
-  (#any-of? @comment "comment"))
+  (#eq? @comment "comment"))
 
 ; Special forms and builtin macros
 ;
diff --git a/runtime/queries/latex/highlights.scm b/runtime/queries/latex/highlights.scm
index 3f195a13e..06cb165e3 100644
--- a/runtime/queries/latex/highlights.scm
+++ b/runtime/queries/latex/highlights.scm
@@ -266,7 +266,7 @@
   (begin
     name: (curly_group_text
       (text) @label)
-    (#any-of? @label "frame"))
+    (#eq? @label "frame"))
   .
   (curly_group
     (_) @markup.heading))
diff --git a/runtime/queries/ninja/highlights.scm b/runtime/queries/ninja/highlights.scm
index 8323ee9e9..6d3a110b6 100644
--- a/runtime/queries/ninja/highlights.scm
+++ b/runtime/queries/ninja/highlights.scm
@@ -55,7 +55,7 @@
 ; ========
 (pool
   name: (identifier) @type.builtin
-  (#any-of? @type.builtin "console"))
+  (#eq? @type.builtin "console"))
 
 (build
   rule: (identifier) @function.builtin
diff --git a/runtime/queries/slim/highlights.scm b/runtime/queries/slim/highlights.scm
index e219932f6..f14ea864f 100644
--- a/runtime/queries/slim/highlights.scm
+++ b/runtime/queries/slim/highlights.scm
@@ -54,29 +54,29 @@
   (#any-of? @markup.italic "i" "em"))
 
 ((tag_name) @markup.link
-  (#any-of? @markup.link "a"))
+  (#eq? @markup.link "a"))
 
 ; Headings
 ((tag_name) @markup.heading
-  (#any-of? @markup.heading "header"))
+  (#eq? @markup.heading "header"))
 
 ((tag_name) @markup.heading.1
-  (#any-of? @markup.heading.1 "h1"))
+  (#eq? @markup.heading.1 "h1"))
 
 ((tag_name) @markup.heading.2
-  (#any-of? @markup.heading.2 "h2"))
+  (#eq? @markup.heading.2 "h2"))
 
 ((tag_name) @markup.heading.3
-  (#any-of? @markup.heading.3 "h3"))
+  (#eq? @markup.heading.3 "h3"))
 
 ((tag_name) @markup.heading.4
-  (#any-of? @markup.heading.4 "h4"))
+  (#eq? @markup.heading.4 "h4"))
 
 ((tag_name) @markup.heading.5
-  (#any-of? @markup.heading.5 "h5"))
+  (#eq? @markup.heading.5 "h5"))
 
 ((tag_name) @markup.heading.6
-  (#any-of? @markup.heading.6 "h6"))
+  (#eq? @markup.heading.6 "h6"))
 
 ((tag_name) @markup.list
   (#any-of? @markup.list "ul" "ol" "li" "dl" "dt" "dd"))
diff --git a/runtime/queries/systemverilog/highlights.scm b/runtime/queries/systemverilog/highlights.scm
index 21542941f..da251a6e4 100644
--- a/runtime/queries/systemverilog/highlights.scm
+++ b/runtime/queries/systemverilog/highlights.scm
@@ -327,7 +327,7 @@ port_name: (simple_identifier) @variable
 (method_call_body
   arguments: (list_of_arguments
     (expression) @variable.builtin
-    (#any-of? @variable.builtin "this")))
+    (#eq? @variable.builtin "this")))
 
 (implicit_class_handle) @variable.builtin
 
diff --git a/runtime/queries/terraform/highlights.scm b/runtime/queries/terraform/highlights.scm
index a6bf83cdb..d4f5d8b53 100644
--- a/runtime/queries/terraform/highlights.scm
+++ b/runtime/queries/terraform/highlights.scm
@@ -27,7 +27,7 @@
     (#eq? @type.builtin "terraform"))
   (get_attr
     (identifier) @variable.builtin
-    (#any-of? @variable.builtin "workspace")))
+    (#eq? @variable.builtin "workspace")))
 
 ; Terraform specific keywords
 ; FIXME: ideally only for identifiers under a `variable` block to minimize false positives

From a3b489680f2fc0620e1025584f72e90a1fa6eb3b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 29 Oct 2025 18:27:05 +0100
Subject: [PATCH 2530/2704] feat(scfg): update parser

---
 lua/nvim-treesitter/parsers.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 665dddf5e..fdf596304 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2005,9 +2005,7 @@ return {
   },
   scfg = {
     install_info = {
-      generate = true,
-      generate_from_json = false,
-      revision = '2f3709e7656fa2c443f92041c91a9f843f8cd625',
+      revision = 'd850fd470445d73de318a21d734d1e09e29b773c',
       url = 'https://github.com/rockorager/tree-sitter-scfg',
     },
     maintainers = { '@WhyNotHugo' },

From fd2880e8bc2c39eade94a4d329df3a14e603136d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 29 Oct 2025 18:36:39 +0100
Subject: [PATCH 2531/2704] feat(install): remove node requirement

* supported parsers _must_ commit at least `grammar.json`
* set `TREE_SITTER_JS_RUNTIME=native` when generating parser to use
  built-in quickjs instead of node (requires tree-sitter 0.26)
---
 CONTRIBUTING.md                 |   4 +-
 README.md                       |   3 +-
 SUPPORTED_LANGUAGES.md          | 661 ++++++++++++++++----------------
 lua/nvim-treesitter/health.lua  |   9 -
 lua/nvim-treesitter/install.lua |   2 +-
 scripts/update-readme.lua       |   9 +-
 6 files changed, 337 insertions(+), 351 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f376ed802..1d05a42cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,6 @@ zimbu = {
     branch = 'develop', -- only needed if different from default branch
     location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
     generate = true, -- only needed if repo does not contain pre-generated src/parser.c
-    generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either
   },
   maintainers = { '@me' }, -- the _query_ maintainers
   tier = 1, -- stable: track versioned releases instead of latest commit
@@ -37,6 +36,9 @@ zimbu = {
 }
 ```
 
+>[!IMPORTANT]
+> If the repo does not contain a pre-generated `src/parser.c`, it **must** at least contain `src/grammar.json` so that the parser can be generated without having `node` installed.
+
 >[!IMPORTANT]
 > The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
 
diff --git a/README.md b/README.md
index 71cf69e33..3ddf5b3df 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ For details on these and how to help improving them, see [CONTRIBUTING.md](./CON
 - `tar` and `curl` in your path
 - [`tree-sitter-cli`](https://github.com/tree-sitter/tree-sitter/blob/master/crates/cli/README.md) (0.25.0 or later)
 - a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
-- `Node` (23.0.0 or later) for some parsers (see the [list of supported languages](SUPPORTED_LANGUAGES.md))
 
 >[!IMPORTANT]
 > The **support policy** for Neovim is
@@ -141,7 +140,7 @@ callback = function()
       branch = 'develop', -- only needed if different from default branch
       location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
       generate = true, -- only needed if repo does not contain pre-generated `src/parser.c`
-      generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either
+      generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either -- WARNING: requires `node` for tree-sitter-cli <0.26.0!
       queries = 'queries/neovim', -- also install queries from given directory
     },
   }
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 135341be4..51277ef41 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -5,341 +5,340 @@ The following is a list of languages for which a parser can be installed through
 Legend:
 - **Tier:** _stable_ (updates follow semver releases), _unstable_ (updates follow HEAD), _unmaintained_ (no automatic updates), or _unsupported_ (known to be broken, cannot be installed)
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
-- **Node:** Parser requires `node` for installation
 - **Maintainer** of queries in nvim-treesitter (may be different from parser maintainer!)
 
 <!--This section of the README is automatically updated by a CI job-->
 <!--parserinfo-->
-Language | Tier | Queries | Node | Maintainer
--------- |:----:|:-------:|:----:| ----------
-[ada](https://github.com/briot/tree-sitter-ada) | unstable | `HF JL` |   | @briot
-[agda](https://github.com/tree-sitter/tree-sitter-agda) | unstable | `HF J ` |   | @Decodetalkers
-[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJL` |   | @dlvandenberg
-[apex](https://github.com/aheber/tree-sitter-sfapex) | unstable | `HF JL` |   | @aheber, @xixiafinland
-[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | unstable | `HFIJL` |   | @ObserverOfTime
-[asm](https://github.com/RubixDev/tree-sitter-asm) | unstable | `H  J ` |   | @RubixDev
-[astro](https://github.com/virchau13/tree-sitter-astro) | unstable | `HFIJL` |   | @virchau13
-[authzed](https://github.com/mleonidas/tree-sitter-authzed) | unstable | `H  J ` |   | @mattpolzin
-[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` |   | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HF JL` |   | @TravonteD
-[bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` |   | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unstable | `HF J ` |   | @polarmutex
-[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` |   | @theHamsta, @clason
-[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` |   | @amaanq
-[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` |   | @amaanq
-[blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` |   | @calebdw
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` |   | @gabmus
-[bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` |   | @ambroisie
-[brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` |   | @ajdelcimmuto
-[c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` |   | @amaanq
-[c3](https://github.com/c3lang/tree-sitter-c3) | unstable | `HFIJ ` |   | @cbuttner
-[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` |   | @amaanq
-[caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` |   | @opa-oz
-[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` |   | @amaanq
-[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | unstable | `HFIJL` |   | @amaanq
-[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | unstable | `HFIJL` |   | @ObserverOfTime
-[circom](https://github.com/Decurity/tree-sitter-circom) | unstable | `HF JL` |   | @alexandr-martirosyan
-[clojure](https://github.com/sogaiu/tree-sitter-clojure) | unstable | `HF JL` |   | @NoahTheDuke
-[cmake](https://github.com/uyha/tree-sitter-cmake) | unstable | `HFIJ ` |   | @uyha
-[comment](https://github.com/stsewd/tree-sitter-comment) | unstable | `H    ` |   | @stsewd
-[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | unstable | `HF JL` |   | @theHamsta
-[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | unstable | `H  J ` |   | @addcninblue
-[corn](https://github.com/jakestanger/tree-sitter-corn) | unstable | `HFIJL` |   | @jakestanger
-[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | unstable | `HFIJL` |   | @amaanq
-[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | unstable | `HFIJL` |   | @theHamsta
-[css](https://github.com/tree-sitter/tree-sitter-css) | unstable | `HFIJ ` |   | @TravonteD
-[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` |   | @amaanq
-[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | unstable | `HFIJL` |   | @theHamsta
-[cue](https://github.com/eonpatapon/tree-sitter-cue) | unstable | `HFIJL` |   | @amaanq
-[cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | unstable | `HFIJ ` |   | @elliotfontaine
-[d](https://github.com/gdamore/tree-sitter-d) | unstable | `HFIJL` |   | @amaanq
-[dart](https://github.com/UserNobody14/tree-sitter-dart) | unstable | `HFIJL` |   | @akinsho
-[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | unstable | `HF J ` |   | @ValdezFOmar
-[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | unstable | `HFIJL` |   | @jedrzejboczar
-[dhall](https://github.com/jbellerb/tree-sitter-dhall) | unstable | `HF J ` |   | @amaanq
-[diff](https://github.com/tree-sitter-grammars/tree-sitter-diff) | unstable | `HF J ` |   | @gbprod
-[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | unstable | `H  J ` |   | @ColinKennedy
-[djot](https://github.com/treeman/tree-sitter-djot) | unstable | `HFIJL` |   | @NoahTheDuke
-[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | unstable | `H  J ` |   | @camdencheek
-[dot](https://github.com/rydesun/tree-sitter-dot) | unstable | `HFIJ ` |   | @rydesun
-[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | unstable | `H IJ ` |   | @amaanq
-[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HF JL` |   | @ObserverOfTime
-[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | unstable | `H  J ` |   | @glehmann
-[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H  J ` |   | @RubixDev
-ecma (queries only)[^ecma] | unstable | `HFIJL` |   | @steelsojka
-[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | unstable | `HF J ` |   | @ValdezFOmar
-[eds](https://github.com/uyha/tree-sitter-eds) | unstable | `HF   ` |   | @uyha
-[eex](https://github.com/connorlay/tree-sitter-eex) | unstable | `H  J ` |   | @connorlay
-[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | unstable | `HFIJL` |   | @connorlay
-[elm](https://github.com/elm-tooling/tree-sitter-elm) | unstable | `HF J ` |   | @zweimach
-[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | unstable | `HFIJL` |   | @glapa-grossklag, @amaanq
-[elvish](https://github.com/elves/tree-sitter-elvish) | unstable | `H  J ` |   | @elves
-[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unstable | `H  J ` |   | 
-[enforce](https://github.com/simonvic/tree-sitter-enforce) | unstable | `HFIJL` |   | @simonvic
-[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | unstable | `HF J ` |   | @filmor
-[facility](https://github.com/FacilityApi/tree-sitter-facility) | unstable | `HFIJ ` |   | @bryankenote
-[faust](https://github.com/khiner/tree-sitter-faust) | unstable | `H  J ` |   | @khiner
-[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | unstable | `HF JL` |   | @alexmozaidze
-[fidl](https://github.com/google/tree-sitter-fidl) | unstable | `HF J ` |   | @chaopeng
-[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | unstable | `HFIJL` |   | @amaanq
-[fish](https://github.com/ram02z/tree-sitter-fish) | unstable | `HFIJL` |   | @ram02z
-[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJL` |   | @FoamScience
-[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | unstable | `HFIJL` |   | @amaanq
-[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | unstable | `HFIJ ` |   | @amaanq
-[fsh](https://github.com/mgramigna/tree-sitter-fsh) | unstable | `H  J ` |   | @mgramigna
-[fsharp](https://github.com/ionide/tree-sitter-fsharp) | unstable | `H  J ` |   | @nsidorenco
-[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | unstable | `H  J ` |   | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | unstable | `HFIJL` |   | @jirgn
-[gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` |   | @reiniscirpons
-[gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` |   | @reiniscirpons
-[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unmaintained | `HFIJL` |   | 
-[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | unstable | `H  J ` |   | @godofavacyn
-[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | unstable | `HF J ` |   | @amaanq
-[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | unstable | `H  J ` |   | @gbprod
-[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | unstable | `H  JL` |   | @ObserverOfTime
-[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | unstable | `H  J ` |   | @gbprod
-[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | unstable | `H  J ` |   | @theHamsta
-[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | unstable | `HFIJL` |   | @amaanq
-[glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | unstable | `HFIJL` |   | @NullVoxPopuli
-[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | unstable | `HFIJL` |   | @NullVoxPopuli
-[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | unstable | `HFIJ ` |   | @NullVoxPopuli
-[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | unstable | `HFIJL` |   | @theHamsta
-[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | unstable | `HFIJL` |   | @amaanq
-[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | unstable | `H  J ` |   | @dpezto
-[go](https://github.com/tree-sitter/tree-sitter-go) | unstable | `HFIJL` |   | @theHamsta, @WinWisely268
-[goctl](https://github.com/chaozwn/tree-sitter-goctl) | unstable | `HFIJ ` |   | @chaozwn
-[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | unstable | `HF JL` |   | @pierpo
-[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | unstable | `H  J ` |   | @camdencheek
-[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | unstable | `H    ` |   | @amaanq
-[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` |   | @qvalentin
-[gowork](https://github.com/omertuc/tree-sitter-go-work) | unstable | `H  J ` |   | @omertuc
-[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | unstable | `H  J ` |   | @ObserverOfTime
-[graphql](https://github.com/bkegley/tree-sitter-graphql) | unstable | `H IJ ` |   | @bkegley
-[gren](https://github.com/MaeBrooks/tree-sitter-gren) | unstable | `H  J ` |   | @MaeBrooks
-[groovy](https://github.com/murtaza64/tree-sitter-groovy) | unstable | `HFIJL` |   | @murtaza64
-[groq](https://github.com/ajrussellaudio/tree-sitter-groq) | unstable | `HFIJ ` |   | @ajrussellaudio
-[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | unstable | `H    ` |   | @theHamsta
-[hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H  J ` |   | 
-[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | unstable | `HFIJL` |   | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | unstable | `HF JL` |   | @mrcjkb
-[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | unstable | `HF   ` |   | @lykahb
-[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | unstable | `HFIJ ` |   | @MichaHoffmann
-[heex](https://github.com/connorlay/tree-sitter-heex) | unstable | `HFIJL` |   | @connorlay
-[helm](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` |   | @qvalentin
-[hjson](https://github.com/winston0410/tree-sitter-hjson) | unstable | `HFIJL` |   | @winston0410
-[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | unstable | `HFIJL` |   | @theHamsta
-[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | unstable | `H  J ` |   | @Freed-Wu
-[hocon](https://github.com/antosha417/tree-sitter-hocon) | unstable | `HF J ` |   | @antosha417
-[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF JL` |   | @urbit-pilled
-[html](https://github.com/tree-sitter/tree-sitter-html) | unstable | `HFIJL` |   | @TravonteD
-html_tags (queries only)[^html_tags] | unstable | `H IJ ` |   | @TravonteD
-[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` |   | @ObserverOfTime
-[http](https://github.com/rest-nvim/tree-sitter-http) | unstable | `HF J ` |   | @amaanq, @NTBBloodbath
-[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | unstable | `HFIJ ` |   | @pfeiferj
-[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | unstable | `HFIJ ` |   | @luckasRanarison
-[idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` |   | @cathaysia
-[idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` |   | 
-[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` |   | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | unstable | `HFIJL` |   | @yorickpeterse
-[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` |   | @fab4100
-[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` |   | @sogaiu
-[java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` |   | @p00f
-[javadoc](https://github.com/rmuir/tree-sitter-javadoc) | unstable | `H IJ ` |   | @rmuir
-[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | unstable | `HFIJL` |   | @steelsojka
-[jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | unstable | `H  J ` |   | @cathaysia
-[jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` |   | @cathaysia
-[jq](https://github.com/flurie/tree-sitter-jq) | unstable | `H  JL` |   | @ObserverOfTime
-[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` |   | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFI L` |   | @steelsojka
-[json5](https://github.com/Joakker/tree-sitter-json5) | unstable | `H  J ` |   | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | unstable | `HFIJL` |   | @WhyNotHugo
-[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` |   | @nawordar
-jsx (queries only)[^jsx] | unstable | `HFIJ ` |   | @steelsojka
-[julia](https://github.com/tree-sitter-grammars/tree-sitter-julia) | unstable | `HFIJL` |   | @clason
-[just](https://github.com/IndianBoy42/tree-sitter-just) | unstable | `HFIJL` |   | @Hubro
-[kcl](https://github.com/kcl-lang/tree-sitter-kcl) | unstable | `HF J ` |   | @bertbaron
-[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` |   | @amaanq
-[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` |   | @amaanq
-[kitty](https://github.com/OXY2DEV/tree-sitter-kitty) | unstable | `H  J ` |   | @OXY2DEV
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` |   | @SalBakraa
-[koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` |   | @irh
-[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` |   | @Willem-J-an
-[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | unstable | `HF JL` |   | @traxys
-[latex](https://github.com/latex-lsp/tree-sitter-latex) | unstable | `HF J ` |   | @theHamsta, @clason
-[ledger](https://github.com/cbarrete/tree-sitter-ledger) | unstable | `HFIJ ` |   | @cbarrete
-[leo](https://github.com/r001/tree-sitter-leo) | unstable | `H IJ ` |   | @r001
-[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | unstable | `HFIJL` |   | @amaanq
-[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | unstable | `H  J ` |   | @hankthetank27
-[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | unstable | `HFIJL` |   | @toots
-[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | unstable | `H  J ` |   | @benwilliamgraham
-[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | unstable | `HFIJL` |   | @muniftanjim
-[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | unstable | `H    ` |   | @amaanq
-[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | unstable | `H    ` |   | @amaanq
-[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | unstable | `HFIJL` |   | @amaanq
-[m68k](https://github.com/grahambates/tree-sitter-m68k) | unstable | `HF JL` |   | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) | unstable | `HF J ` |   | @lewis6991
-[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | unstable | `HFIJ ` |   | @MDeiml
-[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | unstable | `H  J ` |   | @MDeiml
-[matlab](https://github.com/acristoffers/tree-sitter-matlab) | unstable | `HFIJL` |   | @acristoffers
-[menhir](https://github.com/Kerl13/tree-sitter-menhir) | unstable | `H  J ` |   | @Kerl13
-[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `HFIJ ` |   | 
-[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | unstable | `HFIJ ` |   | @Decodetalkers
-[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H  JL` |   | @artagnon
-[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | unstable | `H  J ` |   | @Freed-Wu
-[nasm](https://github.com/naclsn/tree-sitter-nasm) | unstable | `H  J ` |   | @ObserverOfTime
-[nginx](https://github.com/opa-oz/tree-sitter-nginx) | unstable | `HF J ` |   | @opa-oz
-[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unstable | `H IJ ` |   | 
-[nim](https://github.com/alaviss/tree-sitter-nim) | unstable | `HF JL` |   | @aMOPel
-[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | unstable | `H  J ` |   | @aMOPel
-[ninja](https://github.com/alemuller/tree-sitter-ninja) | unstable | `HFIJ ` |   | @alemuller
-[nix](https://github.com/nix-community/tree-sitter-nix) | unstable | `HFIJL` |   | @leo60228, @zimbatm
-[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | unstable | `HFIJL` |   | @amaanq
-[nu](https://github.com/nushell/tree-sitter-nu) | unstable | `HFIJ ` |   | @abhisheksingh0x558
-[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | unstable | `HFIJL` |   | @amaanq
-[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | unstable | `H  J ` |   | @ColinKennedy
-[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` |   | @undu
-[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` |   | @undu
-[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | unstable | `H  J ` |   | @undu
-[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | unstable | `HFIJL` |   | @amaanq
-[pascal](https://github.com/Isopod/tree-sitter-pascal) | unstable | `HFIJL` |   | @Isopod
-[passwd](https://github.com/ath3/tree-sitter-passwd) | unstable | `H    ` |   | @amaanq
-[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | unstable | `HF J ` |   | @ObserverOfTime
-[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | unstable | `HF J ` |   | @RabbiVeesh, @LeoNerd
-[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | unstable | `HFIJL` |   | @tk-shirasaka, @calebdw
-[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | unstable | `HFIJL` |   | @tk-shirasaka, @calebdw
-[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` |   | @mikehaertl
-[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | unstable | `H  J ` |   | @leo60228
-[pkl](https://github.com/apple/tree-sitter-pkl) | unstable | `HF J ` |   | @ribru17
-[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | unstable | `HF J ` |   | @amaanq
-[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | unstable | `H    ` |   | @RabbiVeesh, @LeoNerd
-[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` |   | @ObserverOfTime
-[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | unstable | `HFIJL` |   | @amaanq, @mfelsche
-[powershell](https://github.com/airbus-cert/tree-sitter-powershell) | unstable | `HFIJL` |   | @L2jLiga
-[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | unstable | `H    ` |   | @ObserverOfTime
-[prisma](https://github.com/victorhqc/tree-sitter-prisma) | unstable | `HF J ` |   | @elianiva
-[problog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` |   | @foxyseta
-[prolog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` |   | @foxyseta
-[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` |   | @MichaHoffmann
-[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | unstable | `H  JL` |   | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) | unstable | `HFIJ ` |   | @treywood
-[prql](https://github.com/PRQL/tree-sitter-prql) | unstable | `H  J ` |   | @matthias-Q
-[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` |   | @amaanq
-[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` |   | @zealot128
-[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | unstable | `HFIJL` |   | @amaanq
-[purescript](https://github.com/postsolar/tree-sitter-purescript) | unstable | `H  JL` |   | @postsolar
-[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | unstable | `H  J ` |   | @ObserverOfTime
-[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` |   | @stsewd, @theHamsta
-[ql](https://github.com/tree-sitter/tree-sitter-ql) | unstable | `HFIJL` |   | @pwntester
-[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | unstable | `H  J ` |   | @amaanq
-[qmljs](https://github.com/yuja/tree-sitter-qmljs) | unstable | `HF J ` |   | @Decodetalkers
-[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | unstable | `HFIJL` |   | @steelsojka
-[r](https://github.com/r-lib/tree-sitter-r) | unstable | `H IJL` |   | @ribru17
-[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J ` |   | 
-[ralph](https://github.com/alephium/tree-sitter-ralph) | unstable | `H  J ` |   | @tdroxler
-[rasi](https://github.com/Fymyte/tree-sitter-rasi) | unstable | `HFIJL` |   | @Fymyte
-[razor](https://github.com/tris203/tree-sitter-razor) | unstable | `HF J ` |   | @tris203
-[rbs](https://github.com/joker1007/tree-sitter-rbs) | unstable | `HFIJ ` |   | @joker1007
-[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | unstable | `HFIJL` |   | @amaanq
-[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | unstable | `HFIJ ` |   | @ribru17
-[regex](https://github.com/tree-sitter/tree-sitter-regex) | unstable | `H    ` |   | @theHamsta
-[rego](https://github.com/FallenAngel97/tree-sitter-rego) | unstable | `H  J ` |   | @FallenAngel97
-[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | unstable | `H  J ` |   | @ObserverOfTime
-[rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` |   | @ribru17
-[rifleconf](https://github.com/purarue/tree-sitter-rifleconf) | unstable | `H  J ` |   | @purarue
-[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` |   | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` |   | @Hubro
-[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` |   | @opa-oz
-[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H IJL` |   | @nat-418
-[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` |   | @amaanq
-[rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` |   | @stsewd
-[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | unstable | `HFIJL` |   | @TravonteD
-[runescript](https://github.com/2004Scape/tree-sitter-runescript) | unstable | `H  J ` |   | @2004Scape
-[rust](https://github.com/tree-sitter/tree-sitter-rust) | unstable | `HFIJL` |   | @amaanq
-[scala](https://github.com/tree-sitter/tree-sitter-scala) | unstable | `HF JL` |   | @stevanmilic
-[scfg](https://github.com/rockorager/tree-sitter-scfg) | unstable | `H  J ` | X | @WhyNotHugo
-[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` |   | 
-[scss](https://github.com/serenadeai/tree-sitter-scss) | unstable | `HFIJ ` |   | @elianiva
-[sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | unstable | `H    ` |   | @aheber, @xixiaofinland
-[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | unstable | `HFIJL` |   | @theHamsta
-[slim](https://github.com/theoo/tree-sitter-slim) | unstable | `HFIJL` |   | @theoo
-[slint](https://github.com/slint-ui/tree-sitter-slint) | unstable | `HFIJL` |   | @hunger
-[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | unstable | `HFIJL` |   | @amaanq
-[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | unstable | `H  J ` |   | @amaanq, @keynmol
-[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` |   | @osthomas
-[snl](https://github.com/minijackson/tree-sitter-snl)[^snl] | unstable | `HFIJL` |   | @minijackson
-[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | unstable | `HF J ` |   | @amaanq
-[soql](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` |   | @aheber, @xixiafinland
-[sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` |   | @aheber, @xixiafinland
-[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | unstable | `H  JL` |   | @Sarrus1
-[sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | unstable | `HFIJL` |   | @GordianDziwis
-[sproto](https://github.com/hanxi/tree-sitter-sproto) | unstable | `HFIJ ` |   | @hanxi
-[sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `HFIJ ` |   | @derekstride
-[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | unstable | `HFIJL` |   | @amaanq
-[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | unstable | `HFIJL` |   | @ObserverOfTime
-[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` |   | @amaanq
-[strace](https://github.com/sigmaSd/tree-sitter-strace) | unstable | `H  J ` |   | @amaanq
-[styled](https://github.com/mskelton/tree-sitter-styled) | unstable | `HFIJ ` |   | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unstable | `HFIJL` |   | @madskjeldgaard
-[superhtml](https://github.com/kristoff-it/superhtml) | unstable | `H  J ` |   | @rockorager
-[surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` |   | @connorlay
-[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` |   | @amaanq
-[sway](https://github.com/FuelLabs/tree-sitter-sway.git) | unstable | `HFIJL` |   | @ribru17
-[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` |   | @alex-pinkus
-[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` |   | @RaafatTurki
-[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` |   | @ok-ryoko
-[systemverilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` |   | @zhangwwpeng
-[t32](https://github.com/xasc/tree-sitter-t32) | unstable | `HFIJL` |   | @xasc
-[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | unstable | `HFIJL` |   | @amaanq
-[tact](https://github.com/tact-lang/tree-sitter-tact) | unstable | `HFIJL` |   | @novusnota
-[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | unstable | `HFIJ ` |   | @lewis6991
-[teal](https://github.com/euclidianAce/tree-sitter-teal) | unstable | `HFIJL` |   | @euclidianAce
-[templ](https://github.com/vrischmann/tree-sitter-templ) | unstable | `HF J ` |   | @vrischmann
-[tera](https://github.com/uncenter/tree-sitter-tera) | unstable | `H  J ` |   | @uncenter
-[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | unstable | `HFIJ ` |   | @MichaHoffmann
-[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | unstable | `HFIJ ` |   | @Porter
-[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` |   | @amaanq, @duskmoon314
-[tiger](https://github.com/ambroisie/tree-sitter-tiger) | unstable | `HFIJL` |   | @ambroisie
-[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | unstable | `HF JL` |   | @ahelwer, @susliko
-[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` |   | @Freed-Wu, @stevenxxiu
-[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | unstable | `H    ` |   | @arnarg
-[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | unstable | `HFIJL` |   | @tk-shirasaka
-[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` |   | @amaanq
-[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` |   | @steelsojka
-[turtle](https://github.com/GordianDziwis/tree-sitter-turtle) | unstable | `HFIJL` |   | @GordianDziwis
-[twig](https://github.com/gbprod/tree-sitter-twig) | unstable | `H  J ` |   | @gbprod
-[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` |   | @steelsojka
-[typespec](https://github.com/happenslol/tree-sitter-typespec) | unstable | `H IJ ` |   | @happenslol
-[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | unstable | `HFIJ ` |   | @Teddytrombone
-[typst](https://github.com/uben0/tree-sitter-typst) | unstable | `HFIJ ` |   | @uben0, @RaafatTurki
-[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | unstable | `H  JL` |   | @ObserverOfTime
-[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | unstable | `HFIJL` |   | @Philipp-M, @amaanq
-[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `HF J ` |   | @tapegram
-[usd](https://github.com/ColinKennedy/tree-sitter-usd) | unstable | `HFIJL` |   | @ColinKennedy
-[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | unstable | `HFIJL` |   | @amaanq
-[v](https://github.com/vlang/v-analyzer) | unstable | `HFIJL` |   | @kkharji, @amaanq
-[vala](https://github.com/vala-lang/tree-sitter-vala) | unstable | `HF J ` |   | @Prince781
-[vento](https://github.com/ventojs/tree-sitter-vento) | unstable | `H  J ` |   | @wrapperup, @oscarotero
-[vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | unstable | `HF J ` |   | @jpt13653903
-[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | unstable | `H  J ` |   | @caarlos0
-[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | unstable | `HF JL` |   | @clason
-[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | unstable | `H  J ` |   | @clason
-[vrl](https://github.com/belltoy/tree-sitter-vrl) | unstable | `HFIJL` |   | @belltoy
-[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | unstable | `HFIJ ` |   | @WhyNotHugo, @lucario387
-[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` |   | @szebniok
-[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` |   | @theHamsta
-[wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` |   | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/bytecodealliance/tree-sitter-wit) | unstable | `HF J ` |   | @mkatychev
-[wxml](https://github.com/BlockLune/tree-sitter-wxml) | unstable | `HFIJ ` |   | @BlockLune
-[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` |   | @ObserverOfTime
-[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` |   | @ObserverOfTime
-[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` |   | @ValdezFOmar
-[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | unstable | `HFIJL` |   | @amaanq
-[yang](https://github.com/Hubro/tree-sitter-yang) | unstable | `HFIJ ` |   | @Hubro
-[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | unstable | `HFIJL` |   | @Philipp-M, @amaanq
-[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | unstable | `H  J ` |   | @Freed-Wu
-[zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` |   | @amaanq
-[ziggy](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` |   | @rockorager
-[ziggy_schema](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` |   | @rockorager
+Language | Tier | Queries | Maintainer
+-------- |:----:|:-------:| ----------
+[ada](https://github.com/briot/tree-sitter-ada) | unstable | `HF JL` | @briot
+[agda](https://github.com/tree-sitter/tree-sitter-agda) | unstable | `HF J ` | @Decodetalkers
+[angular](https://github.com/dlvandenberg/tree-sitter-angular) | unstable | `HFIJL` | @dlvandenberg
+[apex](https://github.com/aheber/tree-sitter-sfapex) | unstable | `HF JL` | @aheber, @xixiafinland
+[arduino](https://github.com/tree-sitter-grammars/tree-sitter-arduino) | unstable | `HFIJL` | @ObserverOfTime
+[asm](https://github.com/RubixDev/tree-sitter-asm) | unstable | `H  J ` | @RubixDev
+[astro](https://github.com/virchau13/tree-sitter-astro) | unstable | `HFIJL` | @virchau13
+[authzed](https://github.com/mleonidas/tree-sitter-authzed) | unstable | `H  J ` | @mattpolzin
+[awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` | 
+[bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HF JL` | @TravonteD
+[bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` | @amaanq
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unstable | `HF J ` | @polarmutex
+[bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` | @theHamsta, @clason
+[bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` | @amaanq
+[bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
+[blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` | @calebdw
+[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` | @gabmus
+[bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` | @ambroisie
+[brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` | @ajdelcimmuto
+[c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
+[c3](https://github.com/c3lang/tree-sitter-c3) | unstable | `HFIJ ` | @cbuttner
+[c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` | @amaanq
+[caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` | @opa-oz
+[cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` | @amaanq
+[capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | unstable | `HFIJL` | @amaanq
+[chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | unstable | `HFIJL` | @ObserverOfTime
+[circom](https://github.com/Decurity/tree-sitter-circom) | unstable | `HF JL` | @alexandr-martirosyan
+[clojure](https://github.com/sogaiu/tree-sitter-clojure) | unstable | `HF JL` | @NoahTheDuke
+[cmake](https://github.com/uyha/tree-sitter-cmake) | unstable | `HFIJ ` | @uyha
+[comment](https://github.com/stsewd/tree-sitter-comment) | unstable | `H    ` | @stsewd
+[commonlisp](https://github.com/tree-sitter-grammars/tree-sitter-commonlisp) | unstable | `HF JL` | @theHamsta
+[cooklang](https://github.com/addcninblue/tree-sitter-cooklang) | unstable | `H  J ` | @addcninblue
+[corn](https://github.com/jakestanger/tree-sitter-corn) | unstable | `HFIJL` | @jakestanger
+[cpon](https://github.com/tree-sitter-grammars/tree-sitter-cpon) | unstable | `HFIJL` | @amaanq
+[cpp](https://github.com/tree-sitter/tree-sitter-cpp) | unstable | `HFIJL` | @theHamsta
+[css](https://github.com/tree-sitter/tree-sitter-css) | unstable | `HFIJ ` | @TravonteD
+[csv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
+[cuda](https://github.com/tree-sitter-grammars/tree-sitter-cuda) | unstable | `HFIJL` | @theHamsta
+[cue](https://github.com/eonpatapon/tree-sitter-cue) | unstable | `HFIJL` | @amaanq
+[cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | unstable | `HFIJ ` | @elliotfontaine
+[d](https://github.com/gdamore/tree-sitter-d) | unstable | `HFIJL` | @amaanq
+[dart](https://github.com/UserNobody14/tree-sitter-dart) | unstable | `HFIJL` | @akinsho
+[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | unstable | `HF J ` | @ValdezFOmar
+[devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | unstable | `HFIJL` | @jedrzejboczar
+[dhall](https://github.com/jbellerb/tree-sitter-dhall) | unstable | `HF J ` | @amaanq
+[diff](https://github.com/tree-sitter-grammars/tree-sitter-diff) | unstable | `HF J ` | @gbprod
+[disassembly](https://github.com/ColinKennedy/tree-sitter-disassembly) | unstable | `H  J ` | @ColinKennedy
+[djot](https://github.com/treeman/tree-sitter-djot) | unstable | `HFIJL` | @NoahTheDuke
+[dockerfile](https://github.com/camdencheek/tree-sitter-dockerfile) | unstable | `H  J ` | @camdencheek
+[dot](https://github.com/rydesun/tree-sitter-dot) | unstable | `HFIJ ` | @rydesun
+[doxygen](https://github.com/tree-sitter-grammars/tree-sitter-doxygen) | unstable | `H IJ ` | @amaanq
+[dtd](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HF JL` | @ObserverOfTime
+[earthfile](https://github.com/glehmann/tree-sitter-earthfile) | unstable | `H  J ` | @glehmann
+[ebnf](https://github.com/RubixDev/ebnf) | unstable | `H  J ` | @RubixDev
+ecma (queries only)[^ecma] | unstable | `HFIJL` | @steelsojka
+[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | unstable | `HF J ` | @ValdezFOmar
+[eds](https://github.com/uyha/tree-sitter-eds) | unstable | `HF   ` | @uyha
+[eex](https://github.com/connorlay/tree-sitter-eex) | unstable | `H  J ` | @connorlay
+[elixir](https://github.com/elixir-lang/tree-sitter-elixir) | unstable | `HFIJL` | @connorlay
+[elm](https://github.com/elm-tooling/tree-sitter-elm) | unstable | `HF J ` | @zweimach
+[elsa](https://github.com/glapa-grossklag/tree-sitter-elsa) | unstable | `HFIJL` | @glapa-grossklag, @amaanq
+[elvish](https://github.com/elves/tree-sitter-elvish) | unstable | `H  J ` | @elves
+[embedded_template](https://github.com/tree-sitter/tree-sitter-embedded-template) | unstable | `H  J ` | 
+[enforce](https://github.com/simonvic/tree-sitter-enforce) | unstable | `HFIJL` | @simonvic
+[erlang](https://github.com/WhatsApp/tree-sitter-erlang) | unstable | `HF J ` | @filmor
+[facility](https://github.com/FacilityApi/tree-sitter-facility) | unstable | `HFIJ ` | @bryankenote
+[faust](https://github.com/khiner/tree-sitter-faust) | unstable | `H  J ` | @khiner
+[fennel](https://github.com/alexmozaidze/tree-sitter-fennel) | unstable | `HF JL` | @alexmozaidze
+[fidl](https://github.com/google/tree-sitter-fidl) | unstable | `HF J ` | @chaopeng
+[firrtl](https://github.com/tree-sitter-grammars/tree-sitter-firrtl) | unstable | `HFIJL` | @amaanq
+[fish](https://github.com/ram02z/tree-sitter-fish) | unstable | `HFIJL` | @ram02z
+[foam](https://github.com/FoamScience/tree-sitter-foam) | unstable | `HFIJL` | @FoamScience
+[forth](https://github.com/AlexanderBrevig/tree-sitter-forth) | unstable | `HFIJL` | @amaanq
+[fortran](https://github.com/stadelmanma/tree-sitter-fortran) | unstable | `HFIJ ` | @amaanq
+[fsh](https://github.com/mgramigna/tree-sitter-fsh) | unstable | `H  J ` | @mgramigna
+[fsharp](https://github.com/ionide/tree-sitter-fsharp) | unstable | `H  J ` | @nsidorenco
+[func](https://github.com/tree-sitter-grammars/tree-sitter-func) | unstable | `H  J ` | @amaanq
+[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | unstable | `HFIJL` | @jirgn
+[gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` | @reiniscirpons
+[gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` | @reiniscirpons
+[gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unmaintained | `HFIJL` | 
+[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | unstable | `H  J ` | @godofavacyn
+[git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | unstable | `HF J ` | @amaanq
+[git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | unstable | `H  J ` | @gbprod
+[gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | unstable | `H  JL` | @ObserverOfTime
+[gitcommit](https://github.com/gbprod/tree-sitter-gitcommit) | unstable | `H  J ` | @gbprod
+[gitignore](https://github.com/shunsambongi/tree-sitter-gitignore) | unstable | `H  J ` | @theHamsta
+[gleam](https://github.com/gleam-lang/tree-sitter-gleam) | unstable | `HFIJL` | @amaanq
+[glimmer](https://github.com/ember-tooling/tree-sitter-glimmer)[^glimmer] | unstable | `HFIJL` | @NullVoxPopuli
+[glimmer_javascript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript) | unstable | `HFIJL` | @NullVoxPopuli
+[glimmer_typescript](https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript) | unstable | `HFIJ ` | @NullVoxPopuli
+[glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) | unstable | `HFIJL` | @theHamsta
+[gn](https://github.com/tree-sitter-grammars/tree-sitter-gn) | unstable | `HFIJL` | @amaanq
+[gnuplot](https://github.com/dpezto/tree-sitter-gnuplot) | unstable | `H  J ` | @dpezto
+[go](https://github.com/tree-sitter/tree-sitter-go) | unstable | `HFIJL` | @theHamsta, @WinWisely268
+[goctl](https://github.com/chaozwn/tree-sitter-goctl) | unstable | `HFIJ ` | @chaozwn
+[godot_resource](https://github.com/PrestonKnopp/tree-sitter-godot-resource)[^godot_resource] | unstable | `HF JL` | @pierpo
+[gomod](https://github.com/camdencheek/tree-sitter-go-mod) | unstable | `H  J ` | @camdencheek
+[gosum](https://github.com/tree-sitter-grammars/tree-sitter-go-sum) | unstable | `H    ` | @amaanq
+[gotmpl](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` | @qvalentin
+[gowork](https://github.com/omertuc/tree-sitter-go-work) | unstable | `H  J ` | @omertuc
+[gpg](https://github.com/tree-sitter-grammars/tree-sitter-gpg-config) | unstable | `H  J ` | @ObserverOfTime
+[graphql](https://github.com/bkegley/tree-sitter-graphql) | unstable | `H IJ ` | @bkegley
+[gren](https://github.com/MaeBrooks/tree-sitter-gren) | unstable | `H  J ` | @MaeBrooks
+[groovy](https://github.com/murtaza64/tree-sitter-groovy) | unstable | `HFIJL` | @murtaza64
+[groq](https://github.com/ajrussellaudio/tree-sitter-groq) | unstable | `HFIJ ` | @ajrussellaudio
+[gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | unstable | `H    ` | @theHamsta
+[hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H  J ` | 
+[hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | unstable | `HFIJL` | @amaanq
+[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | unstable | `HF JL` | @mrcjkb
+[haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | unstable | `HF   ` | @lykahb
+[hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
+[heex](https://github.com/connorlay/tree-sitter-heex) | unstable | `HFIJL` | @connorlay
+[helm](https://github.com/ngalaiko/tree-sitter-go-template) | unstable | `HF JL` | @qvalentin
+[hjson](https://github.com/winston0410/tree-sitter-hjson) | unstable | `HFIJL` | @winston0410
+[hlsl](https://github.com/tree-sitter-grammars/tree-sitter-hlsl) | unstable | `HFIJL` | @theHamsta
+[hlsplaylist](https://github.com/Freed-Wu/tree-sitter-hlsplaylist) | unstable | `H  J ` | @Freed-Wu
+[hocon](https://github.com/antosha417/tree-sitter-hocon) | unstable | `HF J ` | @antosha417
+[hoon](https://github.com/urbit-pilled/tree-sitter-hoon) | unstable | `HF JL` | @urbit-pilled
+[html](https://github.com/tree-sitter/tree-sitter-html) | unstable | `HFIJL` | @TravonteD
+html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
+[htmldjango](https://github.com/interdependence/tree-sitter-htmldjango) | unstable | `HFIJ ` | @ObserverOfTime
+[http](https://github.com/rest-nvim/tree-sitter-http) | unstable | `HF J ` | @amaanq, @NTBBloodbath
+[hurl](https://github.com/pfeiferj/tree-sitter-hurl) | unstable | `HFIJ ` | @pfeiferj
+[hyprlang](https://github.com/tree-sitter-grammars/tree-sitter-hyprlang) | unstable | `HFIJ ` | @luckasRanarison
+[idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` | @cathaysia
+[idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` | 
+[ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` | @theHamsta
+[inko](https://github.com/inko-lang/tree-sitter-inko) | unstable | `HFIJL` | @yorickpeterse
+[ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` | @fab4100
+[janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` | @sogaiu
+[java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` | @p00f
+[javadoc](https://github.com/rmuir/tree-sitter-javadoc) | unstable | `H IJ ` | @rmuir
+[javascript](https://github.com/tree-sitter/tree-sitter-javascript) | unstable | `HFIJL` | @steelsojka
+[jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | unstable | `H  J ` | @cathaysia
+[jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` | @cathaysia
+[jq](https://github.com/flurie/tree-sitter-jq) | unstable | `H  JL` | @ObserverOfTime
+[jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFI L` | @steelsojka
+[json5](https://github.com/Joakker/tree-sitter-json5) | unstable | `H  J ` | @Joakker
+[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | unstable | `HFIJL` | @WhyNotHugo
+[jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` | @nawordar
+jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
+[julia](https://github.com/tree-sitter-grammars/tree-sitter-julia) | unstable | `HFIJL` | @clason
+[just](https://github.com/IndianBoy42/tree-sitter-just) | unstable | `HFIJL` | @Hubro
+[kcl](https://github.com/kcl-lang/tree-sitter-kcl) | unstable | `HF J ` | @bertbaron
+[kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` | @amaanq
+[kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` | @amaanq
+[kitty](https://github.com/OXY2DEV/tree-sitter-kitty) | unstable | `H  J ` | @OXY2DEV
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` | @SalBakraa
+[koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` | @irh
+[kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` | @Willem-J-an
+[lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | unstable | `HF JL` | @traxys
+[latex](https://github.com/latex-lsp/tree-sitter-latex) | unstable | `HF J ` | @theHamsta, @clason
+[ledger](https://github.com/cbarrete/tree-sitter-ledger) | unstable | `HFIJ ` | @cbarrete
+[leo](https://github.com/r001/tree-sitter-leo) | unstable | `H IJ ` | @r001
+[linkerscript](https://github.com/tree-sitter-grammars/tree-sitter-linkerscript) | unstable | `HFIJL` | @amaanq
+[liquid](https://github.com/hankthetank27/tree-sitter-liquid) | unstable | `H  J ` | @hankthetank27
+[liquidsoap](https://github.com/savonet/tree-sitter-liquidsoap) | unstable | `HFIJL` | @toots
+[llvm](https://github.com/benwilliamgraham/tree-sitter-llvm) | unstable | `H  J ` | @benwilliamgraham
+[lua](https://github.com/tree-sitter-grammars/tree-sitter-lua) | unstable | `HFIJL` | @muniftanjim
+[luadoc](https://github.com/tree-sitter-grammars/tree-sitter-luadoc) | unstable | `H    ` | @amaanq
+[luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | unstable | `H    ` | @amaanq
+[luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | unstable | `HFIJL` | @amaanq
+[m68k](https://github.com/grahambates/tree-sitter-m68k) | unstable | `HF JL` | @grahambates
+[make](https://github.com/alemuller/tree-sitter-make) | unstable | `HF J ` | @lewis6991
+[markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | unstable | `HFIJ ` | @MDeiml
+[markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | unstable | `H  J ` | @MDeiml
+[matlab](https://github.com/acristoffers/tree-sitter-matlab) | unstable | `HFIJL` | @acristoffers
+[menhir](https://github.com/Kerl13/tree-sitter-menhir) | unstable | `H  J ` | @Kerl13
+[mermaid](https://github.com/monaqa/tree-sitter-mermaid) | unstable | `HFIJ ` | 
+[meson](https://github.com/tree-sitter-grammars/tree-sitter-meson) | unstable | `HFIJ ` | @Decodetalkers
+[mlir](https://github.com/artagnon/tree-sitter-mlir) | unstable | `H  JL` | @artagnon
+[muttrc](https://github.com/neomutt/tree-sitter-muttrc) | unstable | `H  J ` | @Freed-Wu
+[nasm](https://github.com/naclsn/tree-sitter-nasm) | unstable | `H  J ` | @ObserverOfTime
+[nginx](https://github.com/opa-oz/tree-sitter-nginx) | unstable | `HF J ` | @opa-oz
+[nickel](https://github.com/nickel-lang/tree-sitter-nickel) | unstable | `H IJ ` | 
+[nim](https://github.com/alaviss/tree-sitter-nim) | unstable | `HF JL` | @aMOPel
+[nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | unstable | `H  J ` | @aMOPel
+[ninja](https://github.com/alemuller/tree-sitter-ninja) | unstable | `HFIJ ` | @alemuller
+[nix](https://github.com/nix-community/tree-sitter-nix) | unstable | `HFIJL` | @leo60228, @zimbatm
+[nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | unstable | `HFIJL` | @amaanq
+[nu](https://github.com/nushell/tree-sitter-nu) | unstable | `HFIJ ` | @abhisheksingh0x558
+[objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | unstable | `HFIJL` | @amaanq
+[objdump](https://github.com/ColinKennedy/tree-sitter-objdump) | unstable | `H  J ` | @ColinKennedy
+[ocaml](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` | @undu
+[ocaml_interface](https://github.com/tree-sitter/tree-sitter-ocaml) | unstable | `HFIJL` | @undu
+[ocamllex](https://github.com/atom-ocaml/tree-sitter-ocamllex) | unstable | `H  J ` | @undu
+[odin](https://github.com/tree-sitter-grammars/tree-sitter-odin) | unstable | `HFIJL` | @amaanq
+[pascal](https://github.com/Isopod/tree-sitter-pascal) | unstable | `HFIJL` | @Isopod
+[passwd](https://github.com/ath3/tree-sitter-passwd) | unstable | `H    ` | @amaanq
+[pem](https://github.com/tree-sitter-grammars/tree-sitter-pem) | unstable | `HF J ` | @ObserverOfTime
+[perl](https://github.com/tree-sitter-perl/tree-sitter-perl) | unstable | `HF J ` | @RabbiVeesh, @LeoNerd
+[php](https://github.com/tree-sitter/tree-sitter-php)[^php] | unstable | `HFIJL` | @tk-shirasaka, @calebdw
+[php_only](https://github.com/tree-sitter/tree-sitter-php)[^php_only] | unstable | `HFIJL` | @tk-shirasaka, @calebdw
+[phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) | unstable | `H    ` | @mikehaertl
+[pioasm](https://github.com/leo60228/tree-sitter-pioasm) | unstable | `H  J ` | @leo60228
+[pkl](https://github.com/apple/tree-sitter-pkl) | unstable | `HF J ` | @ribru17
+[po](https://github.com/tree-sitter-grammars/tree-sitter-po) | unstable | `HF J ` | @amaanq
+[pod](https://github.com/tree-sitter-perl/tree-sitter-pod) | unstable | `H    ` | @RabbiVeesh, @LeoNerd
+[poe_filter](https://github.com/tree-sitter-grammars/tree-sitter-poe-filter)[^poe_filter] | unstable | `HFIJ ` | @ObserverOfTime
+[pony](https://github.com/tree-sitter-grammars/tree-sitter-pony) | unstable | `HFIJL` | @amaanq, @mfelsche
+[powershell](https://github.com/airbus-cert/tree-sitter-powershell) | unstable | `HFIJL` | @L2jLiga
+[printf](https://github.com/tree-sitter-grammars/tree-sitter-printf) | unstable | `H    ` | @ObserverOfTime
+[prisma](https://github.com/victorhqc/tree-sitter-prisma) | unstable | `HF J ` | @elianiva
+[problog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` | @foxyseta
+[prolog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` | @foxyseta
+[promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` | @MichaHoffmann
+[properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | unstable | `H  JL` | @ObserverOfTime
+[proto](https://github.com/treywood/tree-sitter-proto) | unstable | `HFIJ ` | @treywood
+[prql](https://github.com/PRQL/tree-sitter-prql) | unstable | `H  J ` | @matthias-Q
+[psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
+[pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` | @zealot128
+[puppet](https://github.com/tree-sitter-grammars/tree-sitter-puppet) | unstable | `HFIJL` | @amaanq
+[purescript](https://github.com/postsolar/tree-sitter-purescript) | unstable | `H  JL` | @postsolar
+[pymanifest](https://github.com/tree-sitter-grammars/tree-sitter-pymanifest) | unstable | `H  J ` | @ObserverOfTime
+[python](https://github.com/tree-sitter/tree-sitter-python) | stable | `HFIJL` | @stsewd, @theHamsta
+[ql](https://github.com/tree-sitter/tree-sitter-ql) | unstable | `HFIJL` | @pwntester
+[qmldir](https://github.com/tree-sitter-grammars/tree-sitter-qmldir) | unstable | `H  J ` | @amaanq
+[qmljs](https://github.com/yuja/tree-sitter-qmljs) | unstable | `HF J ` | @Decodetalkers
+[query](https://github.com/tree-sitter-grammars/tree-sitter-query)[^query] | unstable | `HFIJL` | @steelsojka
+[r](https://github.com/r-lib/tree-sitter-r) | unstable | `H IJL` | @ribru17
+[racket](https://github.com/6cdh/tree-sitter-racket) | unstable | `HF J ` | 
+[ralph](https://github.com/alephium/tree-sitter-ralph) | unstable | `H  J ` | @tdroxler
+[rasi](https://github.com/Fymyte/tree-sitter-rasi) | unstable | `HFIJL` | @Fymyte
+[razor](https://github.com/tris203/tree-sitter-razor) | unstable | `HF J ` | @tris203
+[rbs](https://github.com/joker1007/tree-sitter-rbs) | unstable | `HFIJ ` | @joker1007
+[re2c](https://github.com/tree-sitter-grammars/tree-sitter-re2c) | unstable | `HFIJL` | @amaanq
+[readline](https://github.com/tree-sitter-grammars/tree-sitter-readline) | unstable | `HFIJ ` | @ribru17
+[regex](https://github.com/tree-sitter/tree-sitter-regex) | unstable | `H    ` | @theHamsta
+[rego](https://github.com/FallenAngel97/tree-sitter-rego) | unstable | `H  J ` | @FallenAngel97
+[requirements](https://github.com/tree-sitter-grammars/tree-sitter-requirements) | unstable | `H  J ` | @ObserverOfTime
+[rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` | @ribru17
+[rifleconf](https://github.com/purarue/tree-sitter-rifleconf) | unstable | `H  J ` | @purarue
+[rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
+[robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` | @Hubro
+[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
+[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H IJL` | @nat-418
+[ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
+[rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` | @stsewd
+[ruby](https://github.com/tree-sitter/tree-sitter-ruby) | unstable | `HFIJL` | @TravonteD
+[runescript](https://github.com/2004Scape/tree-sitter-runescript) | unstable | `H  J ` | @2004Scape
+[rust](https://github.com/tree-sitter/tree-sitter-rust) | unstable | `HFIJL` | @amaanq
+[scala](https://github.com/tree-sitter/tree-sitter-scala) | unstable | `HF JL` | @stevanmilic
+[scfg](https://github.com/rockorager/tree-sitter-scfg) | unstable | `H  J ` | @WhyNotHugo
+[scheme](https://github.com/6cdh/tree-sitter-scheme) | unstable | `HF J ` | 
+[scss](https://github.com/serenadeai/tree-sitter-scss) | unstable | `HFIJ ` | @elianiva
+[sflog](https://github.com/aheber/tree-sitter-sfapex)[^sflog] | unstable | `H    ` | @aheber, @xixiaofinland
+[slang](https://github.com/tree-sitter-grammars/tree-sitter-slang)[^slang] | unstable | `HFIJL` | @theHamsta
+[slim](https://github.com/theoo/tree-sitter-slim) | unstable | `HFIJL` | @theoo
+[slint](https://github.com/slint-ui/tree-sitter-slint) | unstable | `HFIJL` | @hunger
+[smali](https://github.com/tree-sitter-grammars/tree-sitter-smali) | unstable | `HFIJL` | @amaanq
+[smithy](https://github.com/indoorvivants/tree-sitter-smithy) | unstable | `H  J ` | @amaanq, @keynmol
+[snakemake](https://github.com/osthomas/tree-sitter-snakemake) | unstable | `HFIJL` | @osthomas
+[snl](https://github.com/minijackson/tree-sitter-snl)[^snl] | unstable | `HFIJL` | @minijackson
+[solidity](https://github.com/JoranHonig/tree-sitter-solidity) | unstable | `HF J ` | @amaanq
+[soql](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` | @aheber, @xixiafinland
+[sosl](https://github.com/aheber/tree-sitter-sfapex) | unstable | `H    ` | @aheber, @xixiafinland
+[sourcepawn](https://github.com/nilshelmig/tree-sitter-sourcepawn) | unstable | `H  JL` | @Sarrus1
+[sparql](https://github.com/GordianDziwis/tree-sitter-sparql) | unstable | `HFIJL` | @GordianDziwis
+[sproto](https://github.com/hanxi/tree-sitter-sproto) | unstable | `HFIJ ` | @hanxi
+[sql](https://github.com/derekstride/tree-sitter-sql) | unstable | `HFIJ ` | @derekstride
+[squirrel](https://github.com/tree-sitter-grammars/tree-sitter-squirrel) | unstable | `HFIJL` | @amaanq
+[ssh_config](https://github.com/tree-sitter-grammars/tree-sitter-ssh-config) | unstable | `HFIJL` | @ObserverOfTime
+[starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` | @amaanq
+[strace](https://github.com/sigmaSd/tree-sitter-strace) | unstable | `H  J ` | @amaanq
+[styled](https://github.com/mskelton/tree-sitter-styled) | unstable | `HFIJ ` | @mskelton
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unstable | `HFIJL` | @madskjeldgaard
+[superhtml](https://github.com/kristoff-it/superhtml) | unstable | `H  J ` | @rockorager
+[surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` | @connorlay
+[svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` | @amaanq
+[sway](https://github.com/FuelLabs/tree-sitter-sway.git) | unstable | `HFIJL` | @ribru17
+[swift](https://github.com/alex-pinkus/tree-sitter-swift) | unstable | `HFIJL` | @alex-pinkus
+[sxhkdrc](https://github.com/RaafatTurki/tree-sitter-sxhkdrc) | unstable | `HF J ` | @RaafatTurki
+[systemtap](https://github.com/ok-ryoko/tree-sitter-systemtap) | unstable | `HF JL` | @ok-ryoko
+[systemverilog](https://github.com/gmlarumbe/tree-sitter-systemverilog) | unstable | `HF J ` | @zhangwwpeng
+[t32](https://github.com/xasc/tree-sitter-t32) | unstable | `HFIJL` | @xasc
+[tablegen](https://github.com/tree-sitter-grammars/tree-sitter-tablegen) | unstable | `HFIJL` | @amaanq
+[tact](https://github.com/tact-lang/tree-sitter-tact) | unstable | `HFIJL` | @novusnota
+[tcl](https://github.com/tree-sitter-grammars/tree-sitter-tcl) | unstable | `HFIJ ` | @lewis6991
+[teal](https://github.com/euclidianAce/tree-sitter-teal) | unstable | `HFIJL` | @euclidianAce
+[templ](https://github.com/vrischmann/tree-sitter-templ) | unstable | `HF J ` | @vrischmann
+[tera](https://github.com/uncenter/tree-sitter-tera) | unstable | `H  J ` | @uncenter
+[terraform](https://github.com/MichaHoffmann/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
+[textproto](https://github.com/PorterAtGoogle/tree-sitter-textproto) | unstable | `HFIJ ` | @Porter
+[thrift](https://github.com/tree-sitter-grammars/tree-sitter-thrift) | unstable | `HFIJL` | @amaanq, @duskmoon314
+[tiger](https://github.com/ambroisie/tree-sitter-tiger) | unstable | `HFIJL` | @ambroisie
+[tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) | unstable | `HF JL` | @ahelwer, @susliko
+[tmux](https://github.com/Freed-Wu/tree-sitter-tmux) | unstable | `H  J ` | @Freed-Wu, @stevenxxiu
+[todotxt](https://github.com/arnarg/tree-sitter-todotxt) | unstable | `H    ` | @arnarg
+[toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) | unstable | `HFIJL` | @tk-shirasaka
+[tsv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
+[tsx](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` | @steelsojka
+[turtle](https://github.com/GordianDziwis/tree-sitter-turtle) | unstable | `HFIJL` | @GordianDziwis
+[twig](https://github.com/gbprod/tree-sitter-twig) | unstable | `H  J ` | @gbprod
+[typescript](https://github.com/tree-sitter/tree-sitter-typescript) | unstable | `HFIJL` | @steelsojka
+[typespec](https://github.com/happenslol/tree-sitter-typespec) | unstable | `H IJ ` | @happenslol
+[typoscript](https://github.com/Teddytrombone/tree-sitter-typoscript) | unstable | `HFIJ ` | @Teddytrombone
+[typst](https://github.com/uben0/tree-sitter-typst) | unstable | `HFIJ ` | @uben0, @RaafatTurki
+[udev](https://github.com/tree-sitter-grammars/tree-sitter-udev) | unstable | `H  JL` | @ObserverOfTime
+[ungrammar](https://github.com/tree-sitter-grammars/tree-sitter-ungrammar) | unstable | `HFIJL` | @Philipp-M, @amaanq
+[unison](https://github.com/kylegoetz/tree-sitter-unison) | unstable | `HF J ` | @tapegram
+[usd](https://github.com/ColinKennedy/tree-sitter-usd) | unstable | `HFIJL` | @ColinKennedy
+[uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | unstable | `HFIJL` | @amaanq
+[v](https://github.com/vlang/v-analyzer) | unstable | `HFIJL` | @kkharji, @amaanq
+[vala](https://github.com/vala-lang/tree-sitter-vala) | unstable | `HF J ` | @Prince781
+[vento](https://github.com/ventojs/tree-sitter-vento) | unstable | `H  J ` | @wrapperup, @oscarotero
+[vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | unstable | `HF J ` | @jpt13653903
+[vhs](https://github.com/charmbracelet/tree-sitter-vhs) | unstable | `H  J ` | @caarlos0
+[vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | unstable | `HF JL` | @clason
+[vimdoc](https://github.com/neovim/tree-sitter-vimdoc) | unstable | `H  J ` | @clason
+[vrl](https://github.com/belltoy/tree-sitter-vrl) | unstable | `HFIJL` | @belltoy
+[vue](https://github.com/tree-sitter-grammars/tree-sitter-vue) | unstable | `HFIJ ` | @WhyNotHugo, @lucario387
+[wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` | @szebniok
+[wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` | @theHamsta
+[wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` | @gshpychka, @MarkMcCulloh
+[wit](https://github.com/bytecodealliance/tree-sitter-wit) | unstable | `HF J ` | @mkatychev
+[wxml](https://github.com/BlockLune/tree-sitter-wxml) | unstable | `HFIJ ` | @BlockLune
+[xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` | @ObserverOfTime
+[xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` | @ObserverOfTime
+[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` | @ValdezFOmar
+[yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | unstable | `HFIJL` | @amaanq
+[yang](https://github.com/Hubro/tree-sitter-yang) | unstable | `HFIJ ` | @Hubro
+[yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | unstable | `HFIJL` | @Philipp-M, @amaanq
+[zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | unstable | `H  J ` | @Freed-Wu
+[zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` | @amaanq
+[ziggy](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
+[ziggy_schema](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
 [^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gap]: GAP system
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 3da7f5415..08ec42bb7 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -65,15 +65,6 @@ local function install_health()
     end
   end
 
-  do -- node check
-    local node = check_exe('node')
-    if node then
-      health.ok(string.format('node %s (%s)', node.version, node.path))
-    else
-      health.error('node not found')
-    end
-  end
-
   do -- curl+tar check
     local tar = check_exe('tar')
     if tar then
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 29c91356c..94d21d46a 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -182,7 +182,7 @@ local function do_generate(logger, repo, compile_location)
     '--abi',
     tostring(vim.treesitter.language_version),
     from_json and 'src/grammar.json' or nil,
-  }, { cwd = compile_location })
+  }, { cwd = compile_location, env = { TREE_SITTER_JS_RUNTIME = 'native' } })
   if r.code > 0 then
     return logger:error('Error during "tree-sitter generate": %s', r.stderr)
   end
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 37eae6826..19576a284 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -13,8 +13,8 @@ table.sort(sorted_parsers, function(a, b)
 end)
 
 local generated_text = [[
-Language | Tier | Queries | Node | Maintainer
--------- |:----:|:-------:|:----:| ----------
+Language | Tier | Queries | Maintainer
+-------- |:----:|:-------:| ----------
 ]]
 local footnotes = ''
 
@@ -55,11 +55,6 @@ for _, v in ipairs(sorted_parsers) do
     .. (vim.uv.fs_stat('runtime/queries/' .. v.name .. '/locals.scm') and 'L' or ' ')
     .. '` | '
 
-  -- node
-  generated_text = generated_text
-    .. (p.install_info and p.install_info.generate_from_json == false and 'X' or ' ')
-    .. ' | '
-
   -- Maintainer
   generated_text = generated_text
     .. (p.maintainers and table.concat(p.maintainers, ', ') or '')

From 64f4755b9d6ea9008265b09eb79fd91727311682 Mon Sep 17 00:00:00 2001
From: Tayfun Bocek <tayfunbocek@live.ca>
Date: Thu, 30 Oct 2025 16:59:19 +0300
Subject: [PATCH 2532/2704] feat!(gdshader): replace gdshader parser and
 queries (#8244)

Switch parser to https://github.com/airblast-dev/tree-sitter-gdshader
---
 SUPPORTED_LANGUAGES.md                        |   2 +-
 lua/nvim-treesitter/parsers.lua               |   6 +-
 runtime/queries/gdshader/highlights.scm       | 318 ++++++++++++------
 tests/query/highlights/gdshader/test.gdshader |  26 ++
 4 files changed, 250 insertions(+), 102 deletions(-)
 create mode 100644 tests/query/highlights/gdshader/test.gdshader

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 51277ef41..177b3951a 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -92,7 +92,7 @@ ecma (queries only)[^ecma] | unstable | `HFIJL` | @steelsojka
 [gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` | @reiniscirpons
 [gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` | @reiniscirpons
 [gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unmaintained | `HFIJL` | 
-[gdshader](https://github.com/GodOfAvacyn/tree-sitter-gdshader) | unstable | `H  J ` | @godofavacyn
+[gdshader](https://github.com/airblast-dev/tree-sitter-gdshader) | unstable | `H  J ` | @airblast-dev
 [git_config](https://github.com/the-mikedavis/tree-sitter-git-config) | unstable | `HF J ` | @amaanq
 [git_rebase](https://github.com/the-mikedavis/tree-sitter-git-rebase) | unstable | `H  J ` | @gbprod
 [gitattributes](https://github.com/tree-sitter-grammars/tree-sitter-gitattributes) | unstable | `H  JL` | @ObserverOfTime
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fdf596304..89d94fdbe 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -660,10 +660,10 @@ return {
   },
   gdshader = {
     install_info = {
-      revision = '14e834063e136fa69b6d91f711f4f1981acf424b',
-      url = 'https://github.com/GodOfAvacyn/tree-sitter-gdshader',
+      revision = '0dab84552f7d33a0084b469b7e38237302bf8e91',
+      url = 'https://github.com/airblast-dev/tree-sitter-gdshader',
     },
-    maintainers = { '@godofavacyn' },
+    maintainers = { '@airblast-dev' },
     tier = 2,
   },
   git_config = {
diff --git a/runtime/queries/gdshader/highlights.scm b/runtime/queries/gdshader/highlights.scm
index c93fd4721..4af3bdf97 100644
--- a/runtime/queries/gdshader/highlights.scm
+++ b/runtime/queries/gdshader/highlights.scm
@@ -1,38 +1,14 @@
 [
-  "render_mode"
-  "shader_type"
-  "group_uniforms"
   "global"
-  "instance"
+  "group_uniforms"
+  "uniform"
   "const"
   "varying"
-  "uniform"
+  "discard"
+  "render_mode"
+  "shader_type"
 ] @keyword
 
-"struct" @keyword.type
-
-[
-  (precision_qualifier)
-  (interpolation_qualifier)
-] @keyword.modifier
-
-[
-  "in"
-  "out"
-  "inout"
-] @keyword.modifier
-
-[
-  "while"
-  "for"
-] @keyword.repeat
-
-[
-  "continue"
-  "break"
-  "return"
-] @keyword.return
-
 [
   "if"
   "else"
@@ -41,51 +17,42 @@
   "default"
 ] @keyword.conditional
 
+"struct" @keyword.type
+
+"return" @keyword.return
+
 [
-  "#"
-  "include"
+  (parameter_qualifier)
+  (interpolation_specifier)
+  (precision_specifier)
+] @keyword
+
+[
+  "while"
+  "for"
+  "do"
+  "continue"
+  "break"
+] @keyword.repeat
+
+[
+  "#undef"
+  "#include"
+  "#if"
+  "#ifdef"
+  "#ifndef"
+  "#elif"
+  "#else"
+  "#endif"
 ] @keyword.directive
 
-(string) @string
+"#define" @keyword.directive.define
 
 [
-  "="
-  "+="
-  "-="
-  "!"
-  "~"
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-  "||"
-  "&&"
-  "|"
-  "^"
-  "&"
-  "=="
-  "!="
-  ">"
-  ">="
-  "<="
-  "<"
-  "<<"
-  ">>"
-  "++"
-  "--"
-] @operator
-
-(boolean) @boolean
-
-(integer) @number
-
-(float) @number.float
-
-[
-  "."
-  ","
   ";"
+  "."
+  ":"
+  ","
 ] @punctuation.delimiter
 
 [
@@ -97,46 +64,201 @@
   "}"
 ] @punctuation.bracket
 
-(builtin_type) @type.builtin
-
-(ident_type) @type.definition
-
 [
-  (shader_type)
-  (render_mode)
-  (hint_name)
-] @attribute
+  "="
+  "-"
+  "*"
+  "/"
+  "+"
+  "%"
+  "~"
+  "|"
+  "&"
+  "^"
+  "<<"
+  ">>"
+  "<"
+  "<="
+  ">="
+  ">"
+  "=="
+  "!="
+  "!"
+  "&&"
+  "||"
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "|="
+  "&="
+  "^="
+  ">>="
+  "<<="
+  "--"
+  "++"
+] @operator
 
-(builtin_variable) @constant.builtin
+(comma_expression
+  operator: "," @operator)
 
-(builtin_function) @function.builtin
+(ternary_expression
+  [
+    ":"
+    "?"
+  ]) @keyword.conditional.ternary
 
-(group_uniforms_declaration
-  group_name: (ident) @property
-  subgroup_name: (ident) @property)
+(primitive_type) @type.builtin
 
-(struct_declaration
-  name: (ident) @type)
+(type_identifier) @type
 
-(struct_member
-  name: (ident) @property)
+(integer) @number
 
-(function_declaration
-  name: (ident) @function)
+(float) @number.float
 
-(parameter
-  name: (ident) @variable.parameter)
+(boolean) @boolean
 
-(member_expr
-  member: (ident) @property)
+(case_statement
+  value: (identifier) @constant)
 
-(call_expr
-  function: [
-    (ident)
-    (builtin_type)
-  ] @function)
+(shader_type_statement
+  (shader_type) @keyword
+  (#any-of? @keyword "spatial" "canvas_item" "particle" "sky" "fog"))
 
-(call_expr
-  function: (builtin_type) @function.call)
+; spatial
+(source_file
+  (shader_type_statement
+    (shader_type) @_shader_type)
+  (#eq? @_shader_type "spatial")
+  (render_mode_statement
+    (render_mode) @keyword)
+  (#any-of? @keyword
+    "blend_mix" "blend_add" "blend_sub" "blend_mul" "blend_premul_alpha" "depth_draw_opaque"
+    "depth_draw_always" "depth_draw_never" "depth_prepass_alpha" "depth_test_disabled"
+    "sss_mode_skin" "cull_back" "cull_front" "cull_disabled" "unshaded" "wireframe"
+    "debug_shadow_splits" "diffuse_burley" "diffuse_lambert" "diffuse_lambert_wrap" "diffuse_toon"
+    "specular_schlick_ggx" "specular_toon" "specular_disabled" "skip_vertex_transform"
+    "world_vertex_coords" "ensure_correct_normals" "shadows_disabled" "ambient_light_disabled"
+    "shadow_to_opacity" "vertex_lighting" "particle_trails" "alpha_to_coverage"
+    "alpha_to_coverage_and_one" "fog_disabled"))
+
+; canvas_item
+(source_file
+  (shader_type_statement
+    (shader_type) @_shader_type)
+  (#eq? @_shader_type "canvas_item")
+  (render_mode_statement
+    (render_mode) @keyword)
+  (#any-of? @keyword
+    "blend_mix" "blend_add" "blend_sub" "blend_mul" "blend_premul_alpha" "blend_disabled" "unshaded"
+    "light_only" "skip_vertex_transform" "world_vertex_coords"))
+
+; particle
+(source_file
+  (shader_type_statement
+    (shader_type) @_shader_type)
+  (#eq? @_shader_type "particle")
+  (render_mode_statement
+    (render_mode) @keyword)
+  (#any-of? @keyword "keep_data" "disable_force" "disable_velocity" "collision_use_scale"))
+
+; sky
+(source_file
+  (shader_type_statement
+    (shader_type) @_shader_type)
+  (#eq? @_shader_type "sky")
+  (render_mode_statement
+    (render_mode) @keyword)
+  (#any-of? @keyword "use_half_res_pass" "use_quarter_res_pass" "disable_fog"))
+
+; fog has no render modes
+(identifier) @variable
+
+(struct_definition
+  name: (identifier) @type)
+
+(struct_definition
+  (struct_fields
+    (field_definition
+      declarator: [
+        (identifier) @variable.member
+        (array_declarator
+          declarator: (identifier) @variable.member)
+      ])))
+
+(preproc_include
+  path: (_) @string)
+
+(preproc_undef
+  argument: (identifier) @constant)
 
 (comment) @comment @spell
+
+; technically an injection site for bbcode TODO: maybe add it?
+((comment) @comment.documentation @spell
+  (#lua-match? @comment.documentation "^/%*%*[^/]"))
+
+(parameter_declaration
+  declarator: [
+    (identifier) @variable.parameter
+    (array_declarator
+      declarator: (identifier) @variable.parameter)
+  ])
+
+(function_definition
+  declarator: (identifier) @function)
+
+(call_expression
+  function: (identifier) @function.call)
+
+(field_expression
+  field: (_) @property)
+
+((call_expression
+  function: (identifier) @function.builtin)
+  (#any-of? @function.builtin
+    ; taken from: https://docs.godotengine.org/en/stable/tutorials/shaders/shader_reference/shader_functions.html
+    ; trigonometric builtins
+    "radians" "degrees" "sin" "cos" "tan" "asin" "acos" "atan" "sinh" "cosh" "tanh" "asinh" "acosh"
+    "atanh"
+    ; exponential and math builtins
+    "pow" "exp" "exp2" "log" "log2" "sqrt" "inversesqrt" "abs" "sign" "floor" "round" "roundEven"
+    "trunc" "ceil" "fract" "mod" "modf" "min" "max" "clamp" "mix" "fma" "step" "smoothstep" "isnan"
+    "isinf" "floatBitsToInt" "floatBitsToUint" "intBitsToFloat" "uintBitsToFloat"
+    ; geometric builtins
+    "length" "distance" "dot" "cross" "normalize" "reflect" "refract" "faceforward" "matrixCompMult"
+    "outerProduct" "transpose" "determinant" "inverse"
+    ; comparison builtins
+    "lessThan" "greaterThan" "lessThanEqual" "equal" "notEqual" "any" "all" "not"
+    ; texture builtins
+    "textureSize" "textureQueryLod" "textureQueryLevels" "texture" "textureProj" "textureLod"
+    "textureProjLod" "textureGrad" "textureProjGrad" "texelFetch" "textureGather" "dFdx"
+    "dFdxCoarse" "dFdxFine" "dFdy" "dFdyCoarse" "dFdyFine" "fwidth" "fwidthCoarse" "fwidthFine"
+    ; packing unpacking builtins
+    "packHalf2x16" "unpackHalf2x16" "packUnorm2x16" "unpackUnorm2x16" "packSnorm2x16"
+    "unpackSnorm2x16" "packUnorm4x8" "unpackUnorm4x8" "packSnorm4x8" "unpackSnorm4x8"
+    ; bitwise builtins
+    "bitfieldExtract" "bitfieldInsert" "bitfieldReverse" "bitCount" "findLSB" "findMSB" "imulExtend"
+    "umulExtend" "uaddCarry" "usubBorrow" "ldexp" "frexp"))
+
+; assume all uppercase variables as constants
+((identifier) @constant
+  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+
+((identifier) @constant.builtin
+  (#any-of? @constant.builtin
+    ; common / declared in all shader types
+    "PI" "E" "TAU" "CURRENT_RENDERER" "RENDERER_COMPATIBILITY" "RENDERER_MOBILE"
+    "RENDERER_FORWARD_PLUS"; TODO: add more builtins
+    ))
+
+((identifier) @variable.builtin
+  (#eq? @variable.builtin "TIME"))
+
+(type_hint
+  [
+    (identifier) @attribute
+    (call_expression
+      function: (_) @attribute)
+  ])
diff --git a/tests/query/highlights/gdshader/test.gdshader b/tests/query/highlights/gdshader/test.gdshader
new file mode 100644
index 000000000..db1459028
--- /dev/null
+++ b/tests/query/highlights/gdshader/test.gdshader
@@ -0,0 +1,26 @@
+shader_type spatial;
+
+render_mode unshaded, wireframe;
+// <- @keyword
+//          ^^^^^^^^ @keyword
+//                    ^^^^^^^^^ @keyword
+
+/** My Doc comment*/
+//^^^^^^^^^^^^^^^^^^ @comment.documentation
+uniform float MY_VALUE: interesting_hint = 1.0;
+//<- @keyword 
+//      ^^^^^ type.builtin
+//            ^^^^^^^^ constant
+//                    ^ @punctuation.delimiter
+//                      ^^^^^^^^^^^^^^^^ @attribute
+//                                       ^ @operator
+//                                         ^^^ @number.float
+//                                            ^ punctuation.delimiter
+
+void vertex() {
+// <- type.builtin
+//   ^^^^^^ @function
+  do {} while (123< 2231);
+//^^ keyword.repeat
+//      ^^^^^ keyword.repeat
+}

From 55820833a32c61a423587e2826c5b59577aaddbb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 2 Nov 2025 10:42:00 +0100
Subject: [PATCH 2533/2704] feat(parsers): update angular, desktop, earthfile,
 editorconfig, gdshader, javadoc, matlab, mlir, pkl, powershell, xresources

---
 lua/nvim-treesitter/parsers.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 89d94fdbe..e980ae3c3 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = 'c884ad6cce47da111584aee4b147cdf7dd3383e1',
+      revision = '513aad1a321a698b2fb1e388781a53038a672b24',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '773d164f6f3abd9cee37be17246bcae78b2ebcbc',
+      revision = '9557f694806a2e98720346fba695014663a2e970',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -427,7 +427,7 @@ return {
   },
   earthfile = {
     install_info = {
-      revision = 'a37c5ee95ce401ca311c0ae1369d9cfb953e151d',
+      revision = '5baef88717ad0156fd29a8b12d0d8245bb1096a8',
       url = 'https://github.com/glehmann/tree-sitter-earthfile',
     },
     maintainers = { '@glehmann' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '911d7017566116b15c4b2c339e1dbe11fcf03f63',
+      revision = '439a3fcdbf239db35f587936a36f48b704ba8357',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -660,7 +660,7 @@ return {
   },
   gdshader = {
     install_info = {
-      revision = '0dab84552f7d33a0084b469b7e38237302bf8e91',
+      revision = 'd8b662b2bc4a266818242e6c01e3e7e9fc3301a4',
       url = 'https://github.com/airblast-dev/tree-sitter-gdshader',
     },
     maintainers = { '@airblast-dev' },
@@ -1074,7 +1074,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '92f9d7115598c1b012f5931a84ee5d50d46c0eb7',
+      revision = '3e9a823a02d3115d74294f04c39bd2c958ec3da6',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1374,7 +1374,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'd8f5728f67877d829b6ccd1b8bd1e0ad02b22217',
+      revision = '05bf45a948246fb703cb9e5096ac7d1098df8f59',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '65435795eb4132d5eff66d62347050e863e5ebe5',
+      revision = 'f1c4a9445c65fb4668a87bfb344d762d0356781d',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1617,7 +1617,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'd62e832b69a0aa3d4f87fc34ba62d931d6c23f55',
+      revision = '798222b4a29ba9a9715583e22242ab0f2ac6abc0',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1660,7 +1660,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '497fe9ac43bdf090efbfe28fba65b7c0c7c6a7b3',
+      revision = '9379c77984af1f3d3d7e3cc5e897de3496725280',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -2637,7 +2637,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '321231f99e3704f1555de14cda5dca93ee14a95b',
+      revision = 'd1c0a65348272ff235e5553fcd9171b151d251b4',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 65a266bf693d3fc856dd341c25edea1a0917a30f Mon Sep 17 00:00:00 2001
From: Izzy Muerte <63051+bruxisma@users.noreply.github.com>
Date: Mon, 3 Nov 2025 00:37:30 -0800
Subject: [PATCH 2534/2704] fix(xml): remove `CDATA` injection

This change does not break existing injections that currently ship with nvim-treesitter, but instead allows additional injections to be defined by users, like those found in the Max/MSP Jitter XML Shader format.
---
 runtime/queries/xml/highlights.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/runtime/queries/xml/highlights.scm b/runtime/queries/xml/highlights.scm
index 85e6e9bb4..5ac9dd925 100644
--- a/runtime/queries/xml/highlights.scm
+++ b/runtime/queries/xml/highlights.scm
@@ -189,11 +189,10 @@
 ; Text
 (CharData) @none @spell
 
-((CDSect
+(CDSect
   (CDStart) @module
   (CData) @markup.raw
   "]]>" @module)
-  (#set! priority 105))
 
 ; Misc
 (Comment) @comment @spell

From 53049d6678ea71b2c55dc0487b2911e6fa79debf Mon Sep 17 00:00:00 2001
From: Igor Lacerda <igorlfs@ufmg.br>
Date: Wed, 5 Nov 2025 01:03:42 -0300
Subject: [PATCH 2535/2704] feat(ecma): variable definition from object
 destructure (#8233)

---
 runtime/queries/ecma/locals.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runtime/queries/ecma/locals.scm b/runtime/queries/ecma/locals.scm
index 24ea7c0a8..adc58531d 100644
--- a/runtime/queries/ecma/locals.scm
+++ b/runtime/queries/ecma/locals.scm
@@ -21,6 +21,10 @@
 (variable_declarator
   name: (identifier) @local.definition.var)
 
+(variable_declarator
+  name: (object_pattern
+    (shorthand_property_identifier_pattern) @local.definition.var))
+
 (import_specifier
   (identifier) @local.definition.import)
 

From 896e92a7f63c31d3d8f1df402b9824add8886a58 Mon Sep 17 00:00:00 2001
From: Alexey Svirshchevskiy <svirshchevskiy@gmail.com>
Date: Wed, 5 Nov 2025 05:07:27 +0100
Subject: [PATCH 2536/2704] fix(typescript): support type param for styled
 components (#8066)

---
 runtime/queries/tsx/injections.scm        |  2 +-
 runtime/queries/typescript/injections.scm | 27 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/tsx/injections.scm b/runtime/queries/tsx/injections.scm
index b6d9b28bf..07391231c 100644
--- a/runtime/queries/tsx/injections.scm
+++ b/runtime/queries/tsx/injections.scm
@@ -1 +1 @@
-; inherits: ecma,jsx
+; inherits: typescript,jsx
diff --git a/runtime/queries/typescript/injections.scm b/runtime/queries/typescript/injections.scm
index 04328f099..42c50efff 100644
--- a/runtime/queries/typescript/injections.scm
+++ b/runtime/queries/typescript/injections.scm
@@ -1 +1,28 @@
 ; inherits: ecma
+
+; styled.div<{}>`<css>`
+(call_expression
+  function: (non_null_expression
+    (instantiation_expression
+      (member_expression
+        object: (identifier) @_name
+        (#eq? @_name "styled")
+        property: (property_identifier))
+      type_arguments: (type_arguments)))
+  arguments: ((template_string) @injection.content
+    (#offset! @injection.content 0 1 0 -1)
+    (#set! injection.include-children)
+    (#set! injection.language "styled")))
+
+; styled.div<T>`<css>`
+(binary_expression
+  left: (binary_expression
+    left: (member_expression
+      object: (identifier) @_name
+      (#eq? @_name "styled")
+      property: (property_identifier))
+    right: (identifier))
+  right: (template_string) @injection.content
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "styled"))

From 1ddb266477eccf432983d723f94b86361b020010 Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Wed, 5 Nov 2025 20:13:53 -0800
Subject: [PATCH 2537/2704] feat(parsers): add zsh support (#8240)

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
Co-authored-by: Riley Bruins <ribru17@hotmail.com>
Co-authored-by: Tayfun Bocek <tayfunbocek@live.ca>
---
 SUPPORTED_LANGUAGES.md              |   1 +
 lua/nvim-treesitter/parsers.lua     |   8 +
 runtime/queries/zsh/folds.scm       |   9 +
 runtime/queries/zsh/highlights.scm  | 294 +++++++++++++++++++++++
 runtime/queries/zsh/injections.scm  |  78 ++++++
 runtime/queries/zsh/locals.scm      |  14 ++
 tests/query/highlights/zsh/test.zsh | 358 ++++++++++++++++++++++++++++
 7 files changed, 762 insertions(+)
 create mode 100644 runtime/queries/zsh/folds.scm
 create mode 100644 runtime/queries/zsh/highlights.scm
 create mode 100644 runtime/queries/zsh/injections.scm
 create mode 100644 runtime/queries/zsh/locals.scm
 create mode 100644 tests/query/highlights/zsh/test.zsh

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 177b3951a..95510e5af 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -339,6 +339,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` | @amaanq
 [ziggy](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
 [ziggy_schema](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
+[zsh](https://github.com/georgeharker/tree-sitter-zsh) | stable | `HF JL` | @georgeharker
 [^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gap]: GAP system
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e980ae3c3..883403fd6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2701,4 +2701,12 @@ return {
     maintainers = { '@rockorager' },
     tier = 2,
   },
+  zsh = {
+    install_info = {
+      revision = 'v0.34.0',
+      url = 'https://github.com/georgeharker/tree-sitter-zsh',
+    },
+    maintainers = { '@georgeharker' },
+    tier = 1,
+  },
 }
diff --git a/runtime/queries/zsh/folds.scm b/runtime/queries/zsh/folds.scm
new file mode 100644
index 000000000..766dbe598
--- /dev/null
+++ b/runtime/queries/zsh/folds.scm
@@ -0,0 +1,9 @@
+[
+  (function_definition)
+  (if_statement)
+  (case_statement)
+  (for_statement)
+  (while_statement)
+  (c_style_for_statement)
+  (heredoc_redirect)
+] @fold
diff --git a/runtime/queries/zsh/highlights.scm b/runtime/queries/zsh/highlights.scm
new file mode 100644
index 000000000..3bf1eed00
--- /dev/null
+++ b/runtime/queries/zsh/highlights.scm
@@ -0,0 +1,294 @@
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+  "[["
+  "]]"
+  "(("
+  "))"
+] @punctuation.bracket
+
+[
+  ";"
+  ";;"
+  ";&"
+  ";;&"
+  "&"
+] @punctuation.delimiter
+
+[
+  ">"
+  ">>"
+  "<"
+  "<<"
+  "&&"
+  "|"
+  "|&"
+  "||"
+  "="
+  "+="
+  "=~"
+  "=="
+  "!="
+  "&>"
+  "&>>"
+  "<&"
+  ">&"
+  ">|"
+  "<&-"
+  ">&-"
+  "<<-"
+  "<<<"
+  ".."
+  "!"
+] @operator
+
+; Do *not* spell check strings since they typically have some sort of
+; interpolation in them, or, are typically used for things like filenames, URLs,
+; flags and file content.
+[
+  (string)
+  (raw_string)
+  (ansi_c_string)
+  (heredoc_body)
+] @string
+
+[
+  (heredoc_start)
+  (heredoc_end)
+] @label
+
+(variable_assignment
+  (word) @string)
+
+; (command
+;   argument: "variable_ref" @string) ; bare dollar
+(concatenation
+  (word) @string)
+
+[
+  "if"
+  "then"
+  "else"
+  "elif"
+  "fi"
+  "case"
+  "in"
+  "esac"
+] @keyword.conditional
+
+[
+  "for"
+  "do"
+  "done"
+  "select"
+  "until"
+  "while"
+] @keyword.repeat
+
+[
+  "declare"
+  "typeset"
+  "readonly"
+  "local"
+  "unset"
+  "unsetenv"
+] @keyword
+
+"export" @keyword.import
+
+"function" @keyword.function
+
+(special_variable_name) @variable.builtin
+
+; trap -l
+((word) @constant.builtin
+  (#any-of? @constant.builtin
+    "SIGHUP" "SIGINT" "SIGQUIT" "SIGILL" "SIGTRAP" "SIGABRT" "SIGBUS" "SIGFPE" "SIGKILL" "SIGUSR1"
+    "SIGSEGV" "SIGUSR2" "SIGPIPE" "SIGALRM" "SIGTERM" "SIGSTKFLT" "SIGCHLD" "SIGCONT" "SIGSTOP"
+    "SIGTSTP" "SIGTTIN" "SIGTTOU" "SIGURG" "SIGXCPU" "SIGXFSZ" "SIGVTALRM" "SIGPROF" "SIGWINCH"
+    "SIGIO" "SIGPWR" "SIGSYS" "SIGRTMIN" "SIGRTMIN+1" "SIGRTMIN+2" "SIGRTMIN+3" "SIGRTMIN+4"
+    "SIGRTMIN+5" "SIGRTMIN+6" "SIGRTMIN+7" "SIGRTMIN+8" "SIGRTMIN+9" "SIGRTMIN+10" "SIGRTMIN+11"
+    "SIGRTMIN+12" "SIGRTMIN+13" "SIGRTMIN+14" "SIGRTMIN+15" "SIGRTMAX-14" "SIGRTMAX-13"
+    "SIGRTMAX-12" "SIGRTMAX-11" "SIGRTMAX-10" "SIGRTMAX-9" "SIGRTMAX-8" "SIGRTMAX-7" "SIGRTMAX-6"
+    "SIGRTMAX-5" "SIGRTMAX-4" "SIGRTMAX-3" "SIGRTMAX-2" "SIGRTMAX-1" "SIGRTMAX"))
+
+((word) @boolean
+  (#any-of? @boolean "true" "false"))
+
+(comment) @comment @spell
+
+(test_operator) @operator
+
+(command_substitution
+  "$(" @punctuation.special
+  ")" @punctuation.special)
+
+(process_substitution
+  [
+    "<("
+    ">("
+  ] @punctuation.special
+  ")" @punctuation.special)
+
+(arithmetic_expansion
+  [
+    "$(("
+    "(("
+  ] @punctuation.special
+  "))" @punctuation.special)
+
+(arithmetic_expansion
+  "," @punctuation.delimiter)
+
+(ternary_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+(binary_expression
+  operator: _ @operator)
+
+(unary_expression
+  operator: _ @operator)
+
+(postfix_expression
+  operator: _ @operator)
+
+(function_definition
+  name: (word) @function)
+
+(command_name
+  (word) @function.call)
+
+(command_name
+  (word) @function.builtin
+  (#any-of? @function.builtin
+    "." ":" "alias" "bg" "bind" "break" "builtin" "caller" "cd" "command" "compgen" "complete"
+    "compopt" "continue" "coproc" "dirs" "disown" "echo" "enable" "eval" "exec" "exit" "false" "fc"
+    "fg" "getopts" "hash" "help" "history" "jobs" "kill" "let" "logout" "mapfile" "popd" "printf"
+    "pushd" "pwd" "read" "readarray" "return" "set" "shift" "shopt" "source" "suspend" "test" "time"
+    "times" "trap" "true" "type" "typeset" "ulimit" "umask" "unalias" "wait"))
+
+(command
+  argument: [
+    (word) @variable.parameter
+    (concatenation
+      (word) @variable.parameter)
+  ])
+
+(declaration_command
+  (word) @variable.parameter)
+
+(unset_command
+  (word) @variable.parameter)
+
+(number) @number
+
+((word) @number
+  (#lua-match? @number "^[0-9]+$"))
+
+(file_redirect
+  (word) @string.special.path)
+
+(herestring_redirect
+  (word) @string)
+
+(file_descriptor) @operator
+
+(variable_ref
+  "$" @punctuation.special)
+
+(expansion
+  "${" @punctuation.special
+  "}" @punctuation.special)
+
+"``" @punctuation.special
+
+(array_star) @variable.builtin
+
+(array_at) @variable.builtin
+
+(expansion_flags) @attribute.builtin
+
+(expansion_style) @attribute.builtin
+
+(expansion_pattern
+  pattern: "#" @attribute.builtin)
+
+(expansion_modifier) @attribute.builtin
+
+(simple_variable_name) @variable
+
+(glob_pattern) @string.regexp
+
+(variable_name) @variable
+
+((variable_name) @constant
+  (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+
+((variable_name) @variable.builtin
+  (#any-of? @variable.builtin
+    ; https://www.gnu.org/software/bash/manual/html_node/Bourne-Shell-Variables.html
+    "CDPATH" "HOME" "IFS" "MAIL" "MAILPATH" "OPTARG" "OPTIND" "PATH" "PS1" "PS2"
+    ; https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html
+    "_" "BASH" "BASHOPTS" "BASHPID" "BASH_ALIASES" "BASH_ARGC" "BASH_ARGV" "BASH_ARGV0" "BASH_CMDS"
+    "BASH_COMMAND" "BASH_COMPAT" "BASH_ENV" "BASH_EXECUTION_STRING" "BASH_LINENO"
+    "BASH_LOADABLES_PATH" "BASH_REMATCH" "BASH_SOURCE" "BASH_SUBSHELL" "BASH_VERSINFO"
+    "BASH_VERSION" "BASH_XTRACEFD" "CHILD_MAX" "COLUMNS" "COMP_CWORD" "COMP_LINE" "COMP_POINT"
+    "COMP_TYPE" "COMP_KEY" "COMP_WORDBREAKS" "COMP_WORDS" "COMPREPLY" "COPROC" "DIRSTACK" "EMACS"
+    "ENV" "EPOCHREALTIME" "EPOCHSECONDS" "EUID" "EXECIGNORE" "FCEDIT" "FIGNORE" "FUNCNAME"
+    "FUNCNEST" "GLOBIGNORE" "GROUPS" "histchars" "HISTCMD" "HISTCONTROL" "HISTFILE" "HISTFILESIZE"
+    "HISTIGNORE" "HISTSIZE" "HISTTIMEFORMAT" "HOSTFILE" "HOSTNAME" "HOSTTYPE" "IGNOREEOF" "INPUTRC"
+    "INSIDE_EMACS" "LANG" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_NUMERIC" "LC_TIME"
+    "LINENO" "LINES" "MACHTYPE" "MAILCHECK" "MAPFILE" "OLDPWD" "OPTERR" "OSTYPE" "PIPESTATUS"
+    "POSIXLY_CORRECT" "PPID" "PROMPT_COMMAND" "PROMPT_DIRTRIM" "PS0" "PS3" "PS4" "PWD" "RANDOM"
+    "READLINE_ARGUMENT" "READLINE_LINE" "READLINE_MARK" "READLINE_POINT" "REPLY" "SECONDS" "SHELL"
+    "SHELLOPTS" "SHLVL" "SRANDOM" "TIMEFORMAT" "TMOUT" "TMPDIR" "UID"))
+
+((simple_variable_name) @variable.builtin
+  (#any-of? @variable.builtin
+    ; https://www.gnu.org/software/bash/manual/html_node/Bourne-Shell-Variables.html
+    "CDPATH" "HOME" "IFS" "MAIL" "MAILPATH" "OPTARG" "OPTIND" "PATH" "PS1" "PS2"
+    ; https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html
+    "_" "BASH" "BASHOPTS" "BASHPID" "BASH_ALIASES" "BASH_ARGC" "BASH_ARGV" "BASH_ARGV0" "BASH_CMDS"
+    "BASH_COMMAND" "BASH_COMPAT" "BASH_ENV" "BASH_EXECUTION_STRING" "BASH_LINENO"
+    "BASH_LOADABLES_PATH" "BASH_REMATCH" "BASH_SOURCE" "BASH_SUBSHELL" "BASH_VERSINFO"
+    "BASH_VERSION" "BASH_XTRACEFD" "CHILD_MAX" "COLUMNS" "COMP_CWORD" "COMP_LINE" "COMP_POINT"
+    "COMP_TYPE" "COMP_KEY" "COMP_WORDBREAKS" "COMP_WORDS" "COMPREPLY" "COPROC" "DIRSTACK" "EMACS"
+    "ENV" "EPOCHREALTIME" "EPOCHSECONDS" "EUID" "EXECIGNORE" "FCEDIT" "FIGNORE" "FUNCNAME"
+    "FUNCNEST" "GLOBIGNORE" "GROUPS" "histchars" "HISTCMD" "HISTCONTROL" "HISTFILE" "HISTFILESIZE"
+    "HISTIGNORE" "HISTSIZE" "HISTTIMEFORMAT" "HOSTFILE" "HOSTNAME" "HOSTTYPE" "IGNOREEOF" "INPUTRC"
+    "INSIDE_EMACS" "LANG" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_NUMERIC" "LC_TIME"
+    "LINENO" "LINES" "MACHTYPE" "MAILCHECK" "MAPFILE" "OLDPWD" "OPTERR" "OSTYPE" "PIPESTATUS"
+    "POSIXLY_CORRECT" "PPID" "PROMPT_COMMAND" "PROMPT_DIRTRIM" "PS0" "PS3" "PS4" "PWD" "RANDOM"
+    "READLINE_ARGUMENT" "READLINE_LINE" "READLINE_MARK" "READLINE_POINT" "REPLY" "SECONDS" "SHELL"
+    "SHELLOPTS" "SHLVL" "SRANDOM" "TIMEFORMAT" "TMOUT" "TMPDIR" "UID"))
+
+((command
+  name: (command_name
+    (word) @_printf)
+  .
+  argument: (word) @_v
+  .
+  argument: (word) @variable)
+  (#eq? @_printf "printf")
+  (#eq? @_v "-v")
+  (#lua-match? @variable "^[a-zA-Z_][a-zA-Z0-9_]*$"))
+
+(case_item
+  value: (word) @variable.parameter)
+
+[
+  (regex)
+  (extglob_pattern)
+] @string.regexp
+
+((program
+  .
+  (comment) @keyword.directive @nospell)
+  (#lua-match? @keyword.directive "^#![ \t]*/"))
diff --git a/runtime/queries/zsh/injections.scm b/runtime/queries/zsh/injections.scm
new file mode 100644
index 000000000..e1095773b
--- /dev/null
+++ b/runtime/queries/zsh/injections.scm
@@ -0,0 +1,78 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+
+((regex) @injection.content
+  (#set! injection.language "regex"))
+
+(heredoc_redirect
+  (heredoc_body) @injection.content
+  (heredoc_end) @injection.language)
+
+; printf 'format'
+((command
+  name: (command_name) @_command
+  .
+  argument: [
+    (string) @injection.content
+    (concatenation
+      (string) @injection.content)
+    (raw_string) @injection.content
+    (concatenation
+      (raw_string) @injection.content)
+  ])
+  (#eq? @_command "printf")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "printf"))
+
+; printf -v var 'format'
+((command
+  name: (command_name) @_command
+  argument: (word) @_arg
+  .
+  (_)
+  .
+  argument: [
+    (string) @injection.content
+    (concatenation
+      (string) @injection.content)
+    (raw_string) @injection.content
+    (concatenation
+      (raw_string) @injection.content)
+  ])
+  (#eq? @_command "printf")
+  (#eq? @_arg "-v")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "printf"))
+
+; printf -- 'format'
+((command
+  name: (command_name) @_command
+  argument: (word) @_arg
+  .
+  argument: [
+    (string) @injection.content
+    (concatenation
+      (string) @injection.content)
+    (raw_string) @injection.content
+    (concatenation
+      (raw_string) @injection.content)
+  ])
+  (#eq? @_command "printf")
+  (#eq? @_arg "--")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "printf"))
+
+((command
+  name: (command_name) @_command
+  .
+  argument: [
+    (string)
+    (raw_string)
+  ] @injection.content)
+  (#eq? @_command "bind")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.language "readline"))
diff --git a/runtime/queries/zsh/locals.scm b/runtime/queries/zsh/locals.scm
new file mode 100644
index 000000000..347f51fa2
--- /dev/null
+++ b/runtime/queries/zsh/locals.scm
@@ -0,0 +1,14 @@
+; Scopes
+(function_definition) @local.scope
+
+; Definitions
+(variable_assignment
+  name: (variable_name) @local.definition.var)
+
+(function_definition
+  name: (word) @local.definition.function)
+
+; References
+(variable_name) @local.reference
+
+(word) @local.reference
diff --git a/tests/query/highlights/zsh/test.zsh b/tests/query/highlights/zsh/test.zsh
new file mode 100644
index 000000000..b1c4e398f
--- /dev/null
+++ b/tests/query/highlights/zsh/test.zsh
@@ -0,0 +1,358 @@
+#!/bin/zsh
+# ^^^^^^^^ @comment @spell
+
+# Basic comment
+# <- @comment @spell
+
+# Variables and assignments
+name="value"
+#^^^ @variable @constant
+#   ^ @operator
+#    ^^^^^^^ @string
+
+export PATH="/usr/bin:$PATH"
+#^^^^^ @keyword.import
+#      ^^^^ @variable @constant @variable.builtin
+#          ^ @operator
+#           ^^^^^^^^^^^^^^^^ @string
+#                     ^ @punctuation.special
+#                      ^^^^ @variable.builtin
+
+# Function definition
+function myfunction() {
+#^^^^^^^ @keyword.function
+#        ^^^^^^^^^^ @function @number
+    echo "Hello World"
+    #^^^ @function.call @function.builtin @number
+    #    ^^^^^^^^^^^^^ @string
+}
+
+myfunction() {
+#^^^^^^^^^ @function @number
+    local var="test"
+    #^^^^ @keyword
+    #     ^^^ @variable @constant
+    #        ^ @operator
+    #         ^^^^^^ @string
+}
+
+# Built-in commands
+echo "Hello"
+#^^^ @function.call @function.builtin @number
+#    ^^^^^^^ @string
+
+cd /home/user
+#^ @function.call @function.builtin @number
+#  ^^^^^^^^^^ @variable.parameter @number
+
+ls -la
+#^ @function.call @number
+#  ^^^ @variable.parameter @number
+
+# Control structures
+if [[ -f "$file" ]]; then
+#^ @keyword.conditional
+#  ^^ @punctuation.bracket
+#     ^^ @operator @operator
+#        ^^^^^^^ @string
+#         ^ @punctuation.special @none
+#                ^^ @punctuation.bracket
+#                  ^ @punctuation.delimiter
+#                     ^^^^ @keyword.conditional
+    echo "File exists"
+    #^^^ @function.call @function.builtin @number
+    #    ^^^^^^^^^^^^^ @string
+fi
+#^ @keyword.conditional
+
+for i in {1..10}; do
+#^^ @keyword.repeat
+#      ^^ @keyword.conditional
+#        ^ @punctuation.bracket
+#         ^ @number
+#          ^^ @operator
+#            ^^ @number
+#              ^ @punctuation.bracket
+#               ^ @punctuation.delimiter
+#                  ^^ @keyword.repeat
+    echo $i 
+    #^^^ @function.call @function.builtin @number
+    #    ^ @punctuation.special
+done
+#^^^ @keyword.repeat
+
+while read line; do
+#^^^^ @keyword.repeat
+#     ^^^^ @function.call @function.builtin @number
+#          ^^^^ @variable.parameter @number
+#              ^ @punctuation.delimiter
+#                ^^ @keyword.repeat
+    echo "$line"
+    #^^^ @function.call @function.builtin @number
+    #    ^^^^^^^ @string
+    #     ^ @punctuation.special @none
+done
+#^^^ @keyword.repeat
+
+case $input in
+#^^^ @keyword.conditional
+#    ^ @punctuation.special @none
+#           ^^ @keyword.conditional
+    "yes"|"y")
+    #^^^^ @string @variable.parameter
+    #    ^ @operator
+    #     ^^^ @string @variable.parameter
+    #        ^ @punctuation.bracket
+        echo "Yes"
+        #^^^ @function.call @function.builtin @number
+        #    ^^^^^ @string
+        ;; 
+        #^ @punctuation.delimiter
+    "no"|"n")
+    #^^^ @string @variable.parameter
+    #   ^ @operator
+    #    ^^^ @string @variable.parameter
+    #       ^ @punctuation.bracket
+        echo "No"
+        #^^^ @function.call @function.builtin @number
+        #    ^^^^ @string
+        ;;
+        #^ @punctuation.delimiter
+    *)
+   #^ @string.regexp
+   # ^ @punctuation.bracket
+        echo "Unknown"
+        #^^^ @function.call @function.builtin @number
+        #    ^^^^^^^^^ @string
+        ;;
+        #^ @punctuation.delimiter
+esac
+#^^^ @keyword.conditional
+
+# Arrays
+arr=(one two three)
+#^^ @variable @constant
+#  ^ @operator
+#   ^ @punctuation.bracket
+#                 ^ @punctuation.bracket
+
+echo ${arr[1]}
+#^^^ @function.call @function.builtin @number
+#    ^ @punctuation.special
+#     ^ @punctuation.special
+#         ^ @punctuation.bracket
+#          ^ @number
+#           ^ @punctuation.bracket
+#            ^ @punctuation.special
+
+# Parameter expansion
+echo ${name:-default}
+#^^^ @function.call @function.builtin @number
+#    ^^ @punctuation.special
+#                   ^ @punctuation.special
+
+echo ${#name}
+#^^^ @function.call @function.builtin @number
+#    ^^ @punctuation.special
+#           ^ @punctuation.special
+
+# Command substitution
+result=$(date)
+#^^^^^ @variable @constant
+#     ^ @operator
+#      ^ @punctuation.special
+#       ^ @punctuation.special
+#        ^^^^ @function.call @number
+#            ^ @punctuation.special
+
+result=`date`
+#^^^^^ @variable @constant
+#     ^ @operator
+#       ^^^^ @function.call @number
+
+# Pipes and redirection
+ls | grep "test" > output.txt
+#^ @function.call @number
+#  ^ @operator
+#    ^^^^ @function.call @number
+#         ^^^^^^ @string
+#                ^ @operator
+#                  ^^^^^^^^^^ @string.special.path @number
+
+cat < input.txt >> output.txt
+#^^ @function.call @number
+#   ^ @operator
+#     ^^^^^^^^^ @string.special.path @number
+#               ^^ @operator
+#                  ^^^^^^^^^^ @string.special.path @number
+
+# Process substitution
+diff <(ls dir1) <(ls dir2)
+#^^^ @function.call @number
+#    ^ @punctuation.special
+#     ^ @punctuation.special
+#      ^^ @function.call @number
+#         ^^^^ @variable.parameter @number
+#                ^^ @punctuation.special
+#                  ^^ @function.call @number
+#                     ^^^^ @variable.parameter @number
+#                        ^ @punctuation.special @punctuation.bracket
+
+# Test commands
+[[ -f file.txt ]]
+#^ @punctuation.bracket
+#  ^^ @operator @operator
+#              ^^ @punctuation.bracket
+
+ [ -n "$var" ]
+#^ @punctuation.bracket
+#  ^^ @operator @operator
+#     ^^^^^ @string
+#      ^ @punctuation.special
+#            ^ @punctuation.bracket
+
+# Arithmetic expansion
+echo $((2 + 3))
+#^^^ @function.call @function.builtin @number
+#    ^ @punctuation.special
+#     ^^ @punctuation.special
+#       ^ @number
+#         ^ @operator
+#           ^ @number
+#             ^^ @punctuation.special @punctuation.bracket
+
+# Globbing patterns
+ls *.txt
+#^ @function.call @number
+
+# Brace expansion
+echo {a,b,c}
+#^^^ @function.call @function.builtin @number
+
+# Here documents
+cat << EOF
+#^^ @function.call @number
+#   ^^ @operator
+#      ^^^ @label
+This is a heredoc
+#^^^^^^^^^^^^^^^^^ @string
+EOF
+#^^ @label
+
+cat <<< "string"
+#^^ @function.call @number
+#   ^^ @operator
+#     ^ @operator
+#       ^^^^^^^^ @string
+
+# Special variables
+echo $0 $1 $@ $* $# $?
+#^^^ @function.call @function.builtin @number
+#    ^^ @punctuation.special @none @variable.builtin
+#     ^ @variable.builtin
+#       ^^ @punctuation.special @none @variable.builtin
+#        ^ @variable.builtin
+#          ^^ @punctuation.special @none @variable.builtin
+#           ^ @variable.builtin
+#             ^^ @punctuation.special @none @variable.builtin
+#              ^ @variable.builtin
+#                ^^ @punctuation.special @none @variable.builtin
+#                 ^ @variable.builtin
+#                   ^^ @punctuation.special @none @variable.builtin
+#                    ^ @variable.builtin
+# NOTE: $$ is not captured by current query/grammar
+
+# Conditional operators
+[[ $a == $b ]] && echo "equal"
+#^ @punctuation.bracket
+#  ^ @punctuation.special @none
+#     ^^ @operator @operator
+#        ^ @punctuation.special @none
+#           ^^ @punctuation.bracket
+#              ^^ @operator
+#                 ^^^^ @function.builtin @function.call @number
+#                      ^^^^^^^ @string
+
+[[ $a != $b ]] || echo "not equal"
+#^ @punctuation.bracket
+#  ^^ @punctuation.special @none
+#     ^^ @operator
+#        ^^ @punctuation.special @none
+#              ^^ @operator
+#                 ^^^^ @function.call @function.builtin @number
+#                      ^^^^^^^^^^^ @string
+
+# Background jobs
+sleep 10 &
+#^^^^ @function.call @number
+#     ^^ @number
+#        ^ @punctuation.delimiter
+
+# Negation
+ ! command
+#^ @operator
+  #^^^^^^ @function.call @number
+
+# File descriptors
+exec 3> file.txt
+#^^^ @function.call @function.builtin @number
+#    ^ @operator
+#     ^ @operator
+#       ^^^^^^^^ @string.special.path @number
+
+# ZSH-specific features
+setopt AUTO_CD
+#^^^^^ @function.call @number
+#      ^^^^^^^ @variable.parameter @number
+
+autoload -U compinit
+#^^^^^^^ @function.call @number
+#        ^^ @variable.parameter @number
+#           ^^^^^^^^ @variable.parameter @number
+
+# Associative arrays
+typeset -A hash
+#^^^^^^ @keyword
+#       ^^ @variable.parameter @number
+#          ^^^^ @variable.parameter @constant
+
+hash[key]="value"
+#^^^ @variable @constant
+#   ^ punctuation.bracket
+#       ^ punctuation.bracket
+#        ^ @operator
+#         ^^^^^^^ @string
+
+# Regular expressions
+[[ "text" =~ ^[a-z]+$ ]]
+#^ @punctuation.bracket
+#  ^^^^^^ @string
+#         ^^ @operator
+#            ^^^^^^^^^ @string.regexp
+#                     ^^ @punctuation.bracket
+
+# Quotes and escaping
+echo "double quotes with $var"
+#^^^ @function.call @function.builtin @number
+#    ^^^^^^^^^^^^^^^^^^^^^^^^^ @string
+#                        ^ @punctuation.special @none
+
+echo 'single quotes $var'
+#^^^ @function.call @function.builtin @number
+#    ^^^^^^^^^^^^^^^^^^^^ @string
+
+echo $'ansi-c quotes\n'
+#^^^ @function.call @function.builtin @number
+#     ^^^^^^^^^^^^^^^^^ @string
+
+echo "escaped \" quote"
+#^^^ @function.call @function.builtin @number
+#    ^^^^^^^^^^^^^^^^^^ @string
+
+# Command chaining
+cmd1 && cmd2 || cmd3
+#^^^ @function.call @number
+#    ^^ @operator
+#       ^^^^ @function.call @number
+#            ^^ @operator
+#               ^^^^ @function.call @number

From 5eca61b32a5ce298f55ecdfd48511977f5c37f77 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Thu, 6 Nov 2025 20:06:46 +0900
Subject: [PATCH 2538/2704] fix(python): nospell for interpolation

---
 runtime/queries/python/highlights.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index 350990b1f..1b046d699 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -4,7 +4,7 @@
 (identifier) @variable
 
 ; Reset highlighting in f-string interpolations
-(interpolation) @none
+(interpolation) @none @nospell
 
 ; Identifier naming conventions
 ((identifier) @type

From d97d226cfd4c00af000b3b8529261352677fc6a8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 8 Nov 2025 11:49:48 +0100
Subject: [PATCH 2539/2704] feat(parsers): update asm, devicetree, gdshader,
 hack, hyprlang, koto, matlab, mlir, nix, ocamllex, pkl, sql, templ, zsh

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 883403fd6..41c35c873 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -45,7 +45,7 @@ return {
   },
   asm = {
     install_info = {
-      revision = '04962e15f6b464cf1d75eada59506dc25090e186',
+      revision = 'ac345bcaac44567bd0eee17bf4cc94744cb0ddd0',
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
@@ -354,7 +354,7 @@ return {
   },
   devicetree = {
     install_info = {
-      revision = '6557729f4afaf01dec7481d4e5975515ea8f0edd',
+      revision = 'e685f1f6ac1702b046415efb476444167d63e41a',
       url = 'https://github.com/joelspadin/tree-sitter-devicetree',
     },
     maintainers = { '@jedrzejboczar' },
@@ -660,7 +660,7 @@ return {
   },
   gdshader = {
     install_info = {
-      revision = 'd8b662b2bc4a266818242e6c01e3e7e9fc3301a4',
+      revision = '6d0b37368b4535d773b93dfe082728ab36f0d617',
       url = 'https://github.com/airblast-dev/tree-sitter-gdshader',
     },
     maintainers = { '@airblast-dev' },
@@ -874,7 +874,7 @@ return {
   },
   hack = {
     install_info = {
-      revision = 'bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0',
+      revision = '1a7ded90288189746c54861ac144ede97df95081',
       url = 'https://github.com/slackhq/tree-sitter-hack',
     },
     tier = 2,
@@ -1010,7 +1010,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      revision = 'b23e85dded5d150ffee0ac83c01cbeb1520aad2f',
+      revision = '22723f25f3faf329863d952c9601b492afd971c9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
@@ -1222,7 +1222,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '172050b74825a38e29ecc94c85a4dcd10d733738',
+      revision = '5bdb50e0c15a513397933620b8827e0ec83bca97',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1374,7 +1374,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '05bf45a948246fb703cb9e5096ac7d1098df8f59',
+      revision = '281a0ad48db1ed06e2699d2b32b58198a72c82b2',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'f1c4a9445c65fb4668a87bfb344d762d0356781d',
+      revision = 'bef500a5bab405def20bc58fcfee1c9c527e3d89',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1470,7 +1470,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'ff4e2b4c5a3598e8be3edf16bc69f6677af32145',
+      revision = 'c5795af5a64ab8daa76bb77f30c24b5ed38976b5',
       url = 'https://github.com/nix-community/tree-sitter-nix',
     },
     maintainers = { '@leo60228', '@zimbatm' },
@@ -1531,7 +1531,7 @@ return {
   ocamllex = {
     install_info = {
       generate = true,
-      revision = 'ed488aa334d1b4e3235e1efaaf96f00815ebc0e0',
+      revision = '33722b8be73079946a7c6dd9598e3f57956ed36d',
       url = 'https://github.com/atom-ocaml/tree-sitter-ocamllex',
     },
     maintainers = { '@undu' },
@@ -1617,7 +1617,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = '798222b4a29ba9a9715583e22242ab0f2ac6abc0',
+      revision = 'e6b390b87a3998a3ebf61f3ee7c3605953e65453',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -2148,7 +2148,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = 'd71f2bd7f0e3dba84df7025fc9314738d180e71e',
+      revision = 'd98aed3660ef1e9660ec6e359192bd2ab78bd78c',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2312,7 +2312,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = '27a1fc62c8dd4c49669e03629491f66449c6c435',
+      revision = '1975f67058325403c5412cde48b181a3fa817870',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2703,7 +2703,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.34.0',
+      revision = 'v0.36.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },

From 81aec1e45d58b587fa055a938cd6642c6b94ba4d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 8 Nov 2025 13:23:17 +0100
Subject: [PATCH 2540/2704] ci: add check for downstream queries

Problem: Parser updates may break downstream queries.

Solution: Add workflow that clones and validates queries in

* https://github.com/nvim-treesitter/nvim-treesitter-textobjects#main
* https://github.com/nvim-treesitter/nvim-treesitter-context

on changes to the parsers.lua table. (Workflow should not be required to
pass; the purpose is to give a heads-up that follow-up PRs are needed.)
---
 .github/workflows/downstream.yml | 58 ++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/downstream.yml

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
new file mode 100644
index 000000000..b4ea6fc85
--- /dev/null
+++ b/.github/workflows/downstream.yml
@@ -0,0 +1,58 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - "main"
+    paths:
+      - "lua/nvim-treesitter/parsers.lua"
+  workflow_dispatch:
+
+jobs:
+  test-downstream:
+    name: Check downstream queries
+    runs-on: ubuntu-latest
+    env:
+      NVIM: "nvim"
+    steps:
+      - uses: actions/checkout@v5
+      - uses: tree-sitter/setup-action/cli@v1
+
+      - name: Install and prepare Neovim
+        env:
+          NVIM_TAG: "nightly"
+        run: |
+          bash ./scripts/ci-install.sh
+
+      - name: Compile parsers
+        run: $NVIM -l ./scripts/install-parsers.lua --max-jobs=10
+
+      - name: Set up ts_query_ls
+        run: curl -fL https://github.com/ribru17/ts_query_ls/releases/latest/download/ts_query_ls-x86_64-unknown-linux-gnu.tar.gz | tar -xz
+
+      - name: Clone textobjects
+        uses: actions/checkout@v5
+        with:
+          repository: nvim-treesitter/nvim-treesitter-textobjects
+          ref: main
+          path: .tests/nvim-treesitter-textobjects
+          sparse-checkout: queries
+
+      - name: Check textobjects
+        working-directory:  .tests/nvim-treesitter-textobjects/
+        run: ../../ts_query_ls check queries/
+
+      - name: Clone context
+        if: always()
+        uses: actions/checkout@v5
+        with:
+          repository: nvim-treesitter/nvim-treesitter-context
+          ref: master
+          path: .tests/nvim-treesitter-context
+          sparse-checkout: queries
+
+      - name: Check context
+        if: always()
+        working-directory:  .tests/nvim-treesitter-context/
+        run: ../../ts_query_ls check queries/
+

From 0a6817bcbb6d843d579a119d98f405c1215f2ff5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 10 Nov 2025 18:35:19 +0100
Subject: [PATCH 2541/2704] feat(haskell): switch to maintained fork

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 95510e5af..4ac36d9c1 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -120,7 +120,7 @@ ecma (queries only)[^ecma] | unstable | `HFIJL` | @steelsojka
 [gstlaunch](https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch) | unstable | `H    ` | @theHamsta
 [hack](https://github.com/slackhq/tree-sitter-hack) | unstable | `H  J ` | 
 [hare](https://github.com/tree-sitter-grammars/tree-sitter-hare) | unstable | `HFIJL` | @amaanq
-[haskell](https://github.com/tree-sitter/tree-sitter-haskell) | unstable | `HF JL` | @mrcjkb
+[haskell](https://github.com/tree-sitter-grammars/tree-sitter-haskell) | unstable | `HF JL` | @mrcjkb
 [haskell_persistent](https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent) | unstable | `HF   ` | @lykahb
 [hcl](https://github.com/tree-sitter-grammars/tree-sitter-hcl) | unstable | `HFIJ ` | @MichaHoffmann
 [heex](https://github.com/connorlay/tree-sitter-heex) | unstable | `HFIJL` | @connorlay
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 41c35c873..360dd462e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -889,8 +889,8 @@ return {
   },
   haskell = {
     install_info = {
-      revision = '0975ef72fc3c47b530309ca93937d7d143523628',
-      url = 'https://github.com/tree-sitter/tree-sitter-haskell',
+      revision = '2e51745eed8cd2ec429302b74250189467d665a4',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-haskell',
     },
     maintainers = { '@mrcjkb' },
     tier = 2,

From f46e3a09bdfd148263227cfcfdf68d19e5b0e89c Mon Sep 17 00:00:00 2001
From: Tayfun Bocek <tayfunbocek@live.ca>
Date: Tue, 11 Nov 2025 10:21:29 +0300
Subject: [PATCH 2542/2704] fix(gdshader): add missing keyword to group (#8274)

---
 runtime/queries/gdshader/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/gdshader/highlights.scm b/runtime/queries/gdshader/highlights.scm
index 4af3bdf97..b4bb46ea1 100644
--- a/runtime/queries/gdshader/highlights.scm
+++ b/runtime/queries/gdshader/highlights.scm
@@ -1,5 +1,6 @@
 [
   "global"
+  "instance"
   "group_uniforms"
   "uniform"
   "const"

From b50774079aa3de80a06dce1634e7e1aa26d25848 Mon Sep 17 00:00:00 2001
From: Christoph Sax <xasc@users.noreply.github.com>
Date: Wed, 12 Nov 2025 10:06:04 +0100
Subject: [PATCH 2543/2704] feat(t32)!: update parser and queries (#8276)

`trace32_hll_variable` has been removed from the grammar. The
queries are now capturing `symbol` instead. `symbol` is highlighted
as variable or constant.
---
 lua/nvim-treesitter/parsers.lua         |  2 +-
 runtime/queries/t32/highlights.scm      | 10 +++++++---
 runtime/queries/t32/locals.scm          |  4 ++--
 tests/query/highlights/t32/keywords.cmm |  2 +-
 tests/query/highlights/t32/literals.cmm |  2 +-
 tests/query/highlights/t32/var.cmm      | 10 +++++-----
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 360dd462e..5dbe4623f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2271,7 +2271,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '2f604ad17a15c09d99648199da7f173eed8250dc',
+      revision = '056123923a10e3d537914885cfbacf79cd644e40',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
diff --git a/runtime/queries/t32/highlights.scm b/runtime/queries/t32/highlights.scm
index 83e8e19dd..1835bf3fe 100644
--- a/runtime/queries/t32/highlights.scm
+++ b/runtime/queries/t32/highlights.scm
@@ -102,8 +102,6 @@
 
 (path) @string.special.path
 
-(symbol) @string.special.symbol
-
 [
   (character)
   (hll_char_literal)
@@ -159,7 +157,7 @@
 ; Variables, constants and labels
 (macro) @variable.builtin
 
-(trace32_hll_variable) @variable.builtin
+(symbol) @variable
 
 (argument_list
   (identifier) @constant.builtin)
@@ -168,6 +166,12 @@
   (identifier) @constant.builtin)
   (#lua-match? @constant.builtin "^[%%/][%l%u][%l%u%d.]*$"))
 
+((symbol) @constant
+  (#lua-match? @constant "^\\\\\\\\\\\\[^\\\\]*(\\\\\\\\[^\\\\]*)?(\\\\[^\\\\]*)?$"))
+
+((symbol) @constant
+  (#lua-match? @constant "^\\\\\\\\[^\\\\]*(\\\\[^\\\\]*)?$"))
+
 ((command_expression
   command: (identifier) @keyword
   arguments: (argument_list
diff --git a/runtime/queries/t32/locals.scm b/runtime/queries/t32/locals.scm
index 91bf7660e..433a01e8f 100644
--- a/runtime/queries/t32/locals.scm
+++ b/runtime/queries/t32/locals.scm
@@ -13,7 +13,7 @@
 (command_expression
   command: (identifier)
   arguments: (argument_list
-    declarator: (trace32_hll_variable) @local.definition.var))
+    declarator: (symbol) @local.definition.var))
 
 ; Function definitions
 (subroutine_block
@@ -32,5 +32,5 @@
 
 [
   (macro)
-  (trace32_hll_variable)
+  (symbol)
 ] @local.reference
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
index d1516eb29..22d3c1b63 100644
--- a/tests/query/highlights/t32/keywords.cmm
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -109,7 +109,7 @@ SUBROUTINE start_debug
     COVerage.ListModule %MULTI.OBC \sieve
 ;    ^ @keyword
 ;                        ^ @constant.builtin
-;                                  ^ @string.special.symbol
+;                                  ^ @variable
 
     Var.DRAW flags[0..16] /Alternate 3
 ;    ^ @keyword
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
index a9d72e441..92c9e5b16 100644
--- a/tests/query/highlights/t32/literals.cmm
+++ b/tests/query/highlights/t32/literals.cmm
@@ -20,7 +20,7 @@ DATA.SET P:&HEAD+0x4 %LONG DATA.LONG(EA:&HEAD+0x4)&0xFFFFFF
 ;                                    ^ @constant.builtin
 
 List `main`
-;    ^ @string.special.symbol
+;    ^ @variable
 
 &range = 'a'--'z'||'0'--'9'
 ;        ^ @character
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
index 0deed996f..2413c61a3 100644
--- a/tests/query/highlights/t32/var.cmm
+++ b/tests/query/highlights/t32/var.cmm
@@ -1,7 +1,7 @@
 Var.NEWGLOBAL char[4][32] \myarr
 ; <- @keyword
 ;             ^ @type.builtin
-;                          ^ @variable.builtin
+;                          ^ @variable
 LOCAL &i &data
 
 &data="zero|one|two|three"
@@ -12,20 +12,20 @@ WHILE &i<4
     PRIVATE &val
     &val=STRing.SPLIT("&data","|",&i)
     Var.Assign \myarr[&i]="&val"
-;              ^ @variable.builtin
+;              ^ @variable
 ;                        ^ @operator
     &i=&i+1.
 )
 
 Var.NEWLOCAL \x
 ; <- @keyword
-;             ^ @variable.builtin
+;             ^ @variable
 Var.set \x=func3(5,3)
-;       ^ @variable.builtin
+;       ^ @variable
 ;          ^ @function.call
 ;                ^ @number
 PRINT Var.VALUE(\x)
-;               ^ @variable.builtin
+;               ^ @variable
 PRINT Var.VALUE('a')
 ;               ^ @character
 Var.Assign (*ap)[2..4] = &a

From 0427eeb38594045e39c27f0ba2fcc7d51a525d5b Mon Sep 17 00:00:00 2001
From: Derek Stride <derek.stride@shopify.com>
Date: Thu, 13 Nov 2025 18:15:19 -0500
Subject: [PATCH 2544/2704] feat(sql): update parser, highlights (#8272)

---
 lua/nvim-treesitter/parsers.lua    |  2 +-
 runtime/queries/sql/highlights.scm | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5dbe4623f..2bf3933d6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2148,7 +2148,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = 'd98aed3660ef1e9660ec6e359192bd2ab78bd78c',
+      revision = '4094309b58ccb74d041fb531ae6b7193a3ebc351',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index 6b4b7026f..b3a0c71c6 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -10,6 +10,7 @@
   (keyword_gin)
   (keyword_brin)
   (keyword_array)
+  (keyword_object_id)
 ] @function.call
 
 (object_reference
@@ -115,6 +116,8 @@
   (keyword_primary)
   (keyword_delete)
   (keyword_create)
+  (keyword_show)
+  (keyword_unload)
   (keyword_insert)
   (keyword_merge)
   (keyword_distinct)
@@ -149,6 +152,7 @@
   (keyword_constraint)
   (keyword_force)
   (keyword_use)
+  (keyword_include)
   (keyword_for)
   (keyword_if)
   (keyword_exists)
@@ -260,6 +264,8 @@
   (keyword_start)
   (keyword_restart)
   (keyword_tablespace)
+  (keyword_split)
+  (keyword_tablets)
   (keyword_until)
   (keyword_user)
   (keyword_valid)
@@ -272,6 +278,7 @@
   (keyword_out)
   (keyword_inout)
   (keyword_variadic)
+  (keyword_ordinality)
   (keyword_session)
   (keyword_isolation)
   (keyword_level)
@@ -302,8 +309,29 @@
   (keyword_statement)
   (keyword_execute)
   (keyword_procedure)
+  (keyword_copy)
+  (keyword_delimiter)
+  (keyword_encoding)
+  (keyword_escape)
+  (keyword_force_not_null)
+  (keyword_force_null)
+  (keyword_force_quote)
+  (keyword_freeze)
+  (keyword_header)
+  (keyword_match)
+  (keyword_program)
+  (keyword_quote)
+  (keyword_stdin)
+  (keyword_extended)
+  (keyword_main)
+  (keyword_plain)
+  (keyword_storage)
+  (keyword_compression)
+  (keyword_duplicate)
 ] @keyword
 
+(keyword_while) @keyword.repeat
+
 [
   (keyword_restrict)
   (keyword_unbounded)

From 2144e88dacd193cc92a01f622e56feca4a5922f6 Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Thu, 13 Nov 2025 15:20:34 -0800
Subject: [PATCH 2545/2704] feat(zsh): bump parser, disallow injections for
 regex with expansion

---
 lua/nvim-treesitter/parsers.lua    | 2 +-
 runtime/queries/zsh/injections.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2bf3933d6..aeadd60d2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2703,7 +2703,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.36.0',
+      revision = 'v0.42.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },
diff --git a/runtime/queries/zsh/injections.scm b/runtime/queries/zsh/injections.scm
index e1095773b..3e21206ab 100644
--- a/runtime/queries/zsh/injections.scm
+++ b/runtime/queries/zsh/injections.scm
@@ -2,6 +2,7 @@
   (#set! injection.language "comment"))
 
 ((regex) @injection.content
+  (#not-lua-match? @injection.content "%${.*}")
   (#set! injection.language "regex"))
 
 (heredoc_redirect

From 2696fb832677fcd06588806d006aff923a4185a7 Mon Sep 17 00:00:00 2001
From: Tomohiro Hashidate <kakyoin.hierophant@gmail.com>
Date: Sat, 15 Nov 2025 00:04:54 +0900
Subject: [PATCH 2546/2704] feat(ruby): update queries to support rbs-inline
 syntax (#8282)

---
 lua/nvim-treesitter/parsers.lua     |  2 +-
 runtime/queries/rbs/highlights.scm  | 25 +++++++++++++++++++++++++
 runtime/queries/ruby/injections.scm | 12 ++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index aeadd60d2..73f320c4a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1860,7 +1860,7 @@ return {
   },
   rbs = {
     install_info = {
-      revision = 'de893b166476205b09e79cd3689f95831269579a',
+      revision = '5282e2f36d4109f5315c1d9486b5b0c2044622bb',
       url = 'https://github.com/joker1007/tree-sitter-rbs',
     },
     maintainers = { '@joker1007' },
diff --git a/runtime/queries/rbs/highlights.scm b/runtime/queries/rbs/highlights.scm
index 9de9c427d..6c4b2434d 100644
--- a/runtime/queries/rbs/highlights.scm
+++ b/runtime/queries/rbs/highlights.scm
@@ -106,10 +106,18 @@
 
 (global_name) @variable
 
+; Generics Keywords
+[
+  (generics_unchecked)
+  (generics_variance)
+] @keyword
+
 ; Standard Arguments
 (parameter
   (var_name) @variable.parameter)
 
+(unnamed_parameter) @variable.parameter
+
 ; Keyword Arguments
 (keyword) @variable.parameter
 
@@ -144,6 +152,10 @@
   "&"
   "|"
   "^"
+  "?"
+  (rest_operator)
+  (block_operator)
+  (optional_block_operator)
 ] @operator
 
 ; Punctuation
@@ -159,4 +171,17 @@
 [
   ","
   "."
+  ":"
 ] @punctuation.delimiter
+
+; RBS Inline syntax
+(inline_class_annotation) @keyword
+
+(inline_doc
+  (var_name) @variable.parameter)
+
+(inline_generic) @keyword
+
+(inline_override) @keyword
+
+(inline_skip) @keyword
diff --git a/runtime/queries/ruby/injections.scm b/runtime/queries/ruby/injections.scm
index e998e2bd7..2f75c846a 100644
--- a/runtime/queries/ruby/injections.scm
+++ b/runtime/queries/ruby/injections.scm
@@ -1,6 +1,18 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
+((comment) @injection.content
+  (#lua-match? @injection.content "^#:")
+  (#set! injection.language "rbs"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^#%s+@rbs")
+  (#set! injection.language "rbs"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^#%s+|")
+  (#set! injection.language "rbs"))
+
 (heredoc_body
   (heredoc_content) @injection.content
   (heredoc_end) @injection.language)

From 0cfa59947416d14e36a41e6fe4f025abd8760301 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 14 Nov 2025 12:50:49 +0100
Subject: [PATCH 2547/2704]  chore: remove format-queries script

 The source of truth for formatting (according to make formatquery and
 CI) is now ts_query_ls, so remove the no longer required script to
 prevent divergence and bitrotting.
---
 CONTRIBUTING.md            |   2 +-
 scripts/format-queries.lua | 467 -------------------------------------
 2 files changed, 1 insertion(+), 468 deletions(-)
 delete mode 100755 scripts/format-queries.lua

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d05a42cd..c4ec8e192 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -105,7 +105,7 @@ you can mark the language as optional (by putting it between parenthesis).
 
 #### Formatting
 
-All queries are expected to follow a standard format, with every node on a single line and indented by two spaces for each level of nesting. You can automatically format the bundled queries by running the provided formatter `./scripts/format-queries.lua` on a single file (ending in `.scm`) or directory to format.
+All queries are expected to follow a standard format, with every node on a single line and indented by two spaces for each level of nesting. You can automatically format the bundled queries by running `make formatquery`.
 
 Should you need to preserve a specific format for a node, you can exempt it (and all contained nodes) by placing before it
 ```query
diff --git a/scripts/format-queries.lua b/scripts/format-queries.lua
deleted file mode 100755
index bc2cf70ce..000000000
--- a/scripts/format-queries.lua
+++ /dev/null
@@ -1,467 +0,0 @@
-#!/usr/bin/env -S nvim -l
-
-local ts = vim.treesitter
-local get_node_text = ts.get_node_text
-
----@type string[]
-local files
-
-local arg = _G.arg[1] or '.'
-if arg:match('.*%.scm$') then
-  files = { arg }
-else
-  files = vim.fn.split(vim.fn.glob(arg .. '/**/*.scm'))
-end
-
-ts.query.add_predicate('kind-eq?', function(match, _, _, pred)
-  local nodes = match[pred[2]]
-  local types = { unpack(pred, 3) }
-
-  if not nodes or #nodes == 0 then
-    return true
-  end
-
-  for _, node in pairs(nodes) do
-    if not vim.tbl_contains(types, node:type()) then
-      return false
-    end
-  end
-  return true
-end, {
-  force = true,
-  all = true,
-})
-
-ts.query.add_predicate('is-start-of-line?', function(match, _, _, pred)
-  local nodes = match[pred[2]]
-  if not nodes or #nodes == 0 then
-    return true
-  end
-  for _, node in pairs(nodes) do
-    local start_row, start_col = node:start()
-    if vim.fn.indent(start_row + 1) ~= start_col then
-      return false
-    end
-  end
-  return true
-end, {
-  force = true,
-  all = true,
-})
-
---- Control the indent here. Change to \t if uses tab instead
-local indent_str = '  '
-local indent_width_plus_one = 3
-local textwidth = 100
-
--- Query to control the formatter
-local format_queries = [[
-;;query
-;; Ignore next node with `; format-ignore`
-(
-  (comment) @_pattern
-  .
-  (_) @format.ignore
-  (#lua-match? @_pattern "^;+%s*format%-ignore"))
-
-;; {{{
-;; Add newlines to top level nodes
-;; {{{
-;; Preserve inline comments
-(program
-  . (_)
-  (comment) @format.prepend-newline
-  (#is-start-of-line? @format.prepend-newline))
-(program
-  . (_)
-  (comment) @_comment
-  .
-  (comment) @format.prepend-newline
-  (#not-is-start-of-line? @_comment)
-  (#is-start-of-line? @format.prepend-newline))
-; Extra newline for modelines
-(program
-  (comment) @_modeline
-  .
-  (_) @format.prepend-newline
-  (#is-start-of-line? @_modeline)
-  (#contains? @_modeline "^;+%s*inherits:"))
-(program
-  (comment) @_modeline
-  .
-  (_) @format.prepend-newline
-  (#is-start-of-line? @_modeline)
-  (#contains? @_modeline "^;+%s*extends%s*$"))
-;; }}}
-;; Making sure all top-level patterns are separated
-(program
-  (_) @format.append-newline)
-(program
-  (_) @format.cancel-append .)
-(program
-  . (_)
-  [
-    (list)
-    (grouping)
-    (named_node)
-    (anonymous_node)
-    (missing_node)
-    (field_definition)
-  ] @format.prepend-newline)
-
-(program
-  (comment) @_comment
-  .
-  [
-    (list)
-    (grouping)
-    (named_node)
-    (anonymous_node)
-    (missing_node)
-    (field_definition)
-    (comment)
-  ] @format.cancel-prepend
-  (#is-start-of-line? @_comment)
-  (#not-lua-match? @_comment "^;+%s*inherits:")
-  (#not-lua-match? @_comment "^;+%s*extends%s*$"))
-;; }}}
-
-;; delims
-[
-  ":"
-  "."
-] @format.append-space
-(predicate
-  "." @format.cancel-append @format.replace
-  (#gsub! @format.replace "%." "#"))
-(
-  "." @format.prepend-space @format.cancel-append
-  .
-  ")")
-
-;; List handler
-;; Only starts indent if 2 or more elements
-(list
-  "[" @format.indent.begin
-  "]" @format.indent.dedent)
-;; Otherwise, remove brackets
-(list
-  "[" @format.remove @format.cancel-append
-  .
-  (_) @format.cancel-append
-  .
-  "]" @format.remove)
-;; [ ... ] @capture1 @capture2
-;; Append newlines for nodes inside the list
-(list
-  (_) @format.append-newline
-  (#not-kind-eq? @format.append-newline "capture" "quantifier"))
-
-;; (_), "_" and _ handler
-;; Start indents if it's one of these patterns
-(named_node
-  [
-    "_"
-    name: (identifier)
-  ] @format.indent.begin
-  .
-  [
-    (list)              ; (foo [...])
-    (grouping)          ; (foo ((foo)))
-    (negated_field)     ; (foo !field)
-    (field_definition)  ; (foo field: (...))
-    (named_node)        ; (foo (bar))
-    (predicate)         ; (named_node (#set!))
-    (anonymous_node)
-    (missing_node)
-    "."
-  ])
-;; Honoring comment's position within a node
-(named_node
-  [
-    "_"
-    name: (identifier)
-  ] @format.indent.begin
-  .
-  (comment) @_comment
-  (#is-start-of-line? @_comment))
-(named_node
-  [
-    "_"
-    name: (identifier)
-  ] @format.indent.begin @format.cancel-append
-  .
-  "."? @format.prepend-newline
-  .
-  (comment) @format.prepend-space
-  (#not-is-start-of-line? @format.prepend-space))
-
-;; Add newlines for other nodes, in case the top node is indented
-(named_node
-  [
-    (list)
-    (grouping)
-    (negated_field)
-    (field_definition)
-    (named_node)
-    (predicate)
-    (anonymous_node)
-    (missing_node)
-    "."
-  ] @format.append-newline)
-
-;; Collapse closing parentheses
-(named_node
-  [
-    "_"
-    name: (identifier)
-    (_)
-  ] @format.cancel-append
-  .
-  ")"
-  (#not-kind-eq? @format.cancel-append "comment"))
-
-;; All captures should be separated with a space
-(capture) @format.prepend-space
-
-; ( (_) ) handler
-(grouping
-  "("
-  .
-  [
-    (named_node)                  ; ((foo))
-    (list)                        ; ([foo] (...))
-    (anonymous_node)              ; ("foo")
-    (missing_node)
-    (grouping . (_))
-  ] @format.indent.begin
-  .
-  (_))
-(grouping
-  "("
-  .
-  (grouping) @format.indent.begin
-  (predicate))
-(grouping
-  "("
-  [
-    (anonymous_node)
-    (missing_node)
-    (named_node)
-    (list)
-    (predicate)
-    (grouping . (_))
-    (field_definition)
-    "."
-  ] @format.append-newline
-  (_) .)
-;; Collapsing closing parens
-(grouping
-  (_) @format.cancel-append . ")"
-  (#not-kind-eq? @format.cancel-append "comment"))
-(grouping
-  (capture) @format.prepend-space)
-(missing_node
-  name: (_) @format.prepend-space)
-;; Remove unnecessary parens
-(grouping
-  "(" @format.remove
-  .
-  (_)
-  .
-  ")" @format.remove .)
-(grouping
-  "(" @format.remove
-  .
-  [
-    (grouping)
-    (anonymous_node
-      name: (string) .)
-    (missing_node
-      name: (_) .)
-    (named_node
-      [
-        "_"
-        name: (identifier)
-      ] .)
-  ]
-  .
-  ")" @format.remove
-  .
-  (capture))
-
-; Separate this query to avoid capture duplication
-(predicate
-  "(" @format.indent.begin @format.cancel-append)
-(predicate
-  (parameters
-    (comment) @format.prepend-newline
-    .
-    (_) @format.cancel-prepend)
-  (#is-start-of-line? @format.prepend-newline))
-(predicate
-  (parameters
-    (_) @format.prepend-space)
-  (#set! conditional-newline))
-(predicate
-  (parameters
-    .
-    (capture)
-    . (_) @format.prepend-space)
-  (#set! lookahead-newline)
-  (#set! conditional-newline))
-
-;; Comment related handlers
-(comment) @format.append-newline
-;; comment styling. Feel free to change in the future
-((comment) @format.replace
-  (#gsub! @format.replace "^;+(%s*.-)%s*$" ";%1"))
-;; Preserve end of line comments
-(
-  [
-    "."
-    ":"
-    (list)
-    (grouping)
-    (named_node)
-    (anonymous_node)
-    (missing_node)
-    (negated_field)
-  ] @format.cancel-append
-  .
-  (quantifier)?
-  .
-  "."? @format.prepend-newline ; Make sure anchor are not eol but start of newline
-  .
-  (comment) @format.prepend-space
-  (#not-is-start-of-line? @format.prepend-space))
-]]
-
----@param lines string[]
----@param lines_to_append string[]
-local function append_lines(lines, lines_to_append)
-  for i = 1, #lines_to_append, 1 do
-    lines[#lines] = lines[#lines] .. lines_to_append[i]
-    if i ~= #lines_to_append then
-      lines[#lines + 1] = ''
-    end
-  end
-end
-
----@param bufnr integer
----@param node TSNode
----@param lines string[]
----@param q table<string, table[]>
----@param level integer
-local function iter(bufnr, node, lines, q, level)
-  --- Sometimes 2 queries apply append twice. This is to prevent the case from happening
-  local apply_newline = false
-  for child, _ in node:iter_children() do
-    local id = child:id()
-    if apply_newline then
-      apply_newline = false
-      lines[#lines + 1] = string.rep(indent_str, level)
-    end
-    if q['format.ignore'][id] then
-      local text =
-        vim.split(get_node_text(child, bufnr):gsub('\r\n?', '\n'), '\n', { trimempty = true })
-      append_lines(lines, text)
-    elseif not q['format.remove'][id] then
-      if not q['format.cancel-prepend'][id] then
-        if q['format.prepend-newline'][id] then
-          lines[#lines + 1] = string.rep(indent_str, level)
-        elseif q['format.prepend-space'][id] then
-          if not q['format.prepend-space'][id]['conditional-newline'] then
-            lines[#lines] = lines[#lines] .. ' '
-          elseif child:byte_length() + 1 + #lines[#lines] > textwidth then
-            lines[#lines + 1] = string.rep(indent_str, level)
-          else
-            -- Do a rough guess of the actual byte length. If it's larger than `columns` then add a newline first
-            -- column - byte_end + byte_start
-            local _, _, byte_start = child:start()
-            local _, _, byte_end = node:end_()
-            if
-              q['format.prepend-space'][id]['lookahead-newline']
-              and (byte_end - byte_start) + #lines[#lines] > textwidth
-            then
-              lines[#lines + 1] = string.rep(indent_str, level)
-            else
-              lines[#lines] = lines[#lines] .. ' '
-            end
-          end
-        end
-      end
-      if q['format.replace'][id] then
-        append_lines(lines, vim.split(q['format.replace'][id].text, '\n', { trimempty = true }))
-      elseif
-        child:named_child_count() == 0
-        -- Workaround to preserve string content
-        or child:type() == 'string'
-      then
-        append_lines(
-          lines,
-          vim.split(
-            string.gsub(get_node_text(child, bufnr), '\r\n?', '\n'),
-            '\n+',
-            { trimempty = true }
-          )
-        )
-      else
-        iter(bufnr, child, lines, q, level)
-      end
-      if q['format.indent.begin'][id] then
-        level = level + 1
-        apply_newline = true
-      elseif q['format.indent.dedent'][id] then
-        lines[#lines] = string.sub(lines[#lines], indent_width_plus_one)
-      end
-    end
-    if q['format.cancel-append'][id] then
-      apply_newline = false
-    elseif q['format.append-newline'][id] then
-      apply_newline = true
-    elseif q['format.append-space'][id] then
-      lines[#lines] = lines[#lines] .. ' '
-    end
-  end
-end
-
----@param bufnr integer
----@param queries string
-local function format(bufnr, queries)
-  local lines = { '' }
-  ---@type table<string,table<string,table>>
-  local map = {
-    ['format.ignore'] = {}, -- Ignore the node and its children
-    ['format.indent.begin'] = {}, -- +1 shiftwidth for all nodes after this
-    ['format.indent.dedent'] = {}, -- -1 shiftwidth for this line only
-    ['format.prepend-space'] = {}, -- Prepend a space before inserting the node
-    ['format.prepend-newline'] = {}, -- Prepend a \n before inserting the node
-    ['format.append-space'] = {}, -- Append a space after inserting the node
-    ['format.append-newline'] = {}, -- Append a newline after inserting the node
-    ['format.cancel-append'] = {}, -- Cancel any `@format.append-*` applied to the node
-    ['format.cancel-prepend'] = {}, -- Cancel any `@format.prepend-*` applied to the node
-    ['format.replace'] = {}, -- Dedicated capture used to store results of `(#gsub!)`
-    ['format.remove'] = {}, -- Do not add the syntax node to the result, i.e. brackets [], parens ()
-  }
-  local root = ts.get_parser(bufnr, 'query'):parse(true)[1]:root()
-  local query = ts.query.parse('query', queries)
-  for id, node, metadata in query:iter_captures(root, bufnr, nil, nil, { match_limit = 1024 }) do
-    if query.captures[id]:sub(1, 1) ~= '_' then
-      map[query.captures[id]][node:id()] = metadata and (metadata[id] and metadata[id] or metadata)
-        or {}
-    end
-  end
-
-  iter(bufnr, root, lines, map, 0)
-  vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-end
-
-for _, file in ipairs(files) do
-  local buf = vim.fn.bufadd(file)
-  vim.fn.bufload(file)
-  vim.api.nvim_set_current_buf(buf)
-  format(buf, format_queries)
-end
-
-vim.cmd('silent wa!')

From 69c76488f7c6929ce55222f6a887e497a24c74b8 Mon Sep 17 00:00:00 2001
From: Mikhail Katychev <mkatych@gmail.com>
Date: Mon, 17 Nov 2025 04:06:00 -0600
Subject: [PATCH 2548/2704] feat(wit)! update parser and queries to 1.2.0
 (#8199)

---
 SUPPORTED_LANGUAGES.md             |  3 +-
 lua/nvim-treesitter/parsers.lua    |  4 +-
 runtime/queries/wit/highlights.scm | 60 ++++++++++++++++++++++++------
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 4ac36d9c1..11c718d69 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -5,6 +5,7 @@ The following is a list of languages for which a parser can be installed through
 Legend:
 - **Tier:** _stable_ (updates follow semver releases), _unstable_ (updates follow HEAD), _unmaintained_ (no automatic updates), or _unsupported_ (known to be broken, cannot be installed)
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
+- **Node:** Parser requires `node` for installation
 - **Maintainer** of queries in nvim-treesitter (may be different from parser maintainer!)
 
 <!--This section of the README is automatically updated by a CI job-->
@@ -327,7 +328,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [wgsl](https://github.com/szebniok/tree-sitter-wgsl) | unstable | `HFIJ ` | @szebniok
 [wgsl_bevy](https://github.com/tree-sitter-grammars/tree-sitter-wgsl-bevy) | unstable | `HFI  ` | @theHamsta
 [wing](https://github.com/winglang/tree-sitter-wing) | unstable | `HF JL` | @gshpychka, @MarkMcCulloh
-[wit](https://github.com/bytecodealliance/tree-sitter-wit) | unstable | `HF J ` | @mkatychev
+[wit](https://github.com/bytecodealliance/tree-sitter-wit) | stable | `HF J ` | @mkatychev
 [wxml](https://github.com/BlockLune/tree-sitter-wxml) | unstable | `HFIJ ` | @BlockLune
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` | @ObserverOfTime
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 73f320c4a..a07a8b2fe 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2603,11 +2603,11 @@ return {
   },
   wit = {
     install_info = {
-      revision = '230984dfaf803a0ff8f77da5034361a62c326577',
+      revision = 'v1.2.0',
       url = 'https://github.com/bytecodealliance/tree-sitter-wit',
     },
     maintainers = { '@mkatychev' },
-    tier = 2,
+    tier = 1,
   },
   wxml = {
     install_info = {
diff --git a/runtime/queries/wit/highlights.scm b/runtime/queries/wit/highlights.scm
index 6bccf5ba0..d950f9549 100644
--- a/runtime/queries/wit/highlights.scm
+++ b/runtime/queries/wit/highlights.scm
@@ -6,6 +6,32 @@
 
 (version) @string.special
 
+(use_path
+  [
+    "@"
+    "/"
+  ] @punctuation.delimiter)
+
+(package_decl
+  [
+    "@"
+    "/"
+  ] @punctuation.delimiter)
+
+; feature gates with leading `@`
+(_
+  .
+  "@" @punctuation.special
+  .
+  [
+    "since"
+    "unstable"
+    "deprecated"
+  ] @attribute.builtin)
+
+(unstable_gate
+  feature: (id) @string)
+
 (world_item
   name: (id) @module)
 
@@ -53,8 +79,7 @@
 (flags_items
   name: (id) @type)
 
-(body
-  (id) @variable.member)
+(flags_field) @variable.member
 
 (variant_items
   name: (id) @type)
@@ -65,8 +90,7 @@
 (enum_items
   name: (id) @type)
 
-(enum_case
-  name: (id) @constant)
+(enum_case) @constant
 
 (resource_item
   name: (id) @type)
@@ -89,6 +113,9 @@
 (use_path
   (id) @module)
 
+(alias_item
+  (id) @module)
+
 (use_names_item
   (id) @module)
 
@@ -108,11 +135,16 @@
 
 "static" @keyword.modifier
 
+"async" @keyword.coroutine
+
+(uint) @constant
+
 [
   "include"
   "import"
   "export"
   "as"
+  "with"
 ] @keyword.import
 
 [
@@ -129,20 +161,21 @@
   "char"
   "bool"
   "string"
+] @type.builtin
+
+[
   "tuple"
   "list"
   "option"
   "result"
   "borrow"
-] @type.builtin
+  "future"
+  "stream"
+] @type
+
+"_" @variable.parameter.builtin
 
 [
-  "@"
-  "_"
-] @punctuation.special
-
-[
-  "/"
   ";"
   ":"
   ","
@@ -150,6 +183,9 @@
   "->"
 ] @punctuation.delimiter
 
+(use_path
+  "/" @punctuation.delimiter)
+
 [
   "{"
   "}"
@@ -159,6 +195,8 @@
   "<"
 ] @punctuation.bracket
 
+"=" @operator
+
 [
   (line_comment)
   (block_comment)

From 3a48d16c95bcb444ad5680ed9b4dc94cb4ac48e2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 17 Nov 2025 11:07:29 +0100
Subject: [PATCH 2549/2704] fix(ziggy): mark as unmaintained

---
 SUPPORTED_LANGUAGES.md          | 4 ++--
 lua/nvim-treesitter/parsers.lua | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 11c718d69..17644448a 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -338,8 +338,8 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | unstable | `HFIJL` | @Philipp-M, @amaanq
 [zathurarc](https://github.com/Freed-Wu/tree-sitter-zathurarc) | unstable | `H  J ` | @Freed-Wu
 [zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` | @amaanq
-[ziggy](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
-[ziggy_schema](https://github.com/kristoff-it/ziggy) | unstable | `H I  ` | @rockorager
+[ziggy](https://github.com/kristoff-it/ziggy) | unmaintained | `H I  ` | 
+[ziggy_schema](https://github.com/kristoff-it/ziggy) | unmaintained | `H I  ` | 
 [zsh](https://github.com/georgeharker/tree-sitter-zsh) | stable | `HF JL` | @georgeharker
 [^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a07a8b2fe..5569f5be9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2689,8 +2689,7 @@ return {
       revision = '4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901',
       url = 'https://github.com/kristoff-it/ziggy',
     },
-    maintainers = { '@rockorager' },
-    tier = 2,
+    tier = 3,
   },
   ziggy_schema = {
     install_info = {
@@ -2698,8 +2697,7 @@ return {
       revision = '4353b20ef2ac750e35c6d68e4eb2a07c2d7cf901',
       url = 'https://github.com/kristoff-it/ziggy',
     },
-    maintainers = { '@rockorager' },
-    tier = 2,
+    tier = 3,
   },
   zsh = {
     install_info = {

From c682a239a9404ce5f90a2d0da34790eff1ed2932 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 17 Nov 2025 11:12:46 +0100
Subject: [PATCH 2550/2704] feat(parsers): update asm, c_sharp, csv, desktop,
 gdshader, gotmpl, haskell, heex, helm, javadoc, matlab, mlir, pkl, psv, t32,
 tsv, xresources

---
 lua/nvim-treesitter/parsers.lua | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5569f5be9..eac0a16de 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -45,7 +45,7 @@ return {
   },
   asm = {
     install_info = {
-      revision = 'ac345bcaac44567bd0eee17bf4cc94744cb0ddd0',
+      revision = '839741fef4dab5128952334624905c82b40c7133',
       url = 'https://github.com/RubixDev/tree-sitter-asm',
     },
     maintainers = { '@RubixDev' },
@@ -174,7 +174,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = '6563c3af3f03ec948d08f9325e4bbd072e4c6b99',
+      revision = '485f0bae0274ac9114797fc10db6f7034e4086e3',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -296,7 +296,7 @@ return {
   csv = {
     install_info = {
       location = 'csv',
-      revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
+      revision = 'f6bf6e35eb0b95fbadea4bb39cb9709507fcb181',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
     },
     maintainers = { '@amaanq' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '9557f694806a2e98720346fba695014663a2e970',
+      revision = '685a0076aa68b897e592af1ec6bf862bb84321e5',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -660,7 +660,7 @@ return {
   },
   gdshader = {
     install_info = {
-      revision = '6d0b37368b4535d773b93dfe082728ab36f0d617',
+      revision = 'a06bc744f89c532bc7980b545bd39ae5489e314c',
       url = 'https://github.com/airblast-dev/tree-sitter-gdshader',
     },
     maintainers = { '@airblast-dev' },
@@ -810,7 +810,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = 'ca26229bafcd3f37698a2496c2a5efa2f07e86bc',
+      revision = '9e54fa38db26c556c2669492063324ef481c9d43',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -889,7 +889,7 @@ return {
   },
   haskell = {
     install_info = {
-      revision = '2e51745eed8cd2ec429302b74250189467d665a4',
+      revision = 'da65949d6f82242dbf29d67bc69b18fce125ef87',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-haskell',
     },
     maintainers = { '@mrcjkb' },
@@ -913,7 +913,7 @@ return {
   },
   heex = {
     install_info = {
-      revision = '6603380caf806b3e6c7f0bf61627bb47023d79f1',
+      revision = 'b5a7cb5f74dc695a9ff5f04919f872ebc7a895e9',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
@@ -922,7 +922,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = 'ca26229bafcd3f37698a2496c2a5efa2f07e86bc',
+      revision = '9e54fa38db26c556c2669492063324ef481c9d43',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -1074,7 +1074,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '3e9a823a02d3115d74294f04c39bd2c958ec3da6',
+      revision = '2533affe83e57df9b0dbf7350cd73a84af9811b3',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1374,7 +1374,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '281a0ad48db1ed06e2699d2b32b58198a72c82b2',
+      revision = '2e60b9e96774e52edd91cbef37ead8f46c6e1221',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'bef500a5bab405def20bc58fcfee1c9c527e3d89',
+      revision = 'f13087c89de99738217a84727dbf95339a67591f',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1617,7 +1617,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'e6b390b87a3998a3ebf61f3ee7c3605953e65453',
+      revision = 'a109e0b4823d61ccd1461a1641da8119af7c0a5e',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1737,7 +1737,7 @@ return {
   psv = {
     install_info = {
       location = 'psv',
-      revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
+      revision = 'f6bf6e35eb0b95fbadea4bb39cb9709507fcb181',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
     },
     maintainers = { '@amaanq' },
@@ -2271,7 +2271,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '056123923a10e3d537914885cfbacf79cd644e40',
+      revision = '3cf141649c74f3aa018a8e24c7f3fa01bc5ecd1e',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2395,7 +2395,7 @@ return {
   tsv = {
     install_info = {
       location = 'tsv',
-      revision = '7eb7297823605392d2bbcc4c09b1cd18d6fa9529',
+      revision = 'f6bf6e35eb0b95fbadea4bb39cb9709507fcb181',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-csv',
     },
     maintainers = { '@amaanq' },
@@ -2637,7 +2637,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'd1c0a65348272ff235e5553fcd9171b151d251b4',
+      revision = '099f2bec9b441c960d66ebd856fbbcc84b3f8015',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From bb83a676128d95c865e40ba71376d883bdadec14 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 19 Nov 2025 10:53:56 +0100
Subject: [PATCH 2551/2704] fix(fsharp): correct use of supertypes in `(_type)`
 patterns

Problem: These patterns were impossible, since children need to be children of
every subtype of a supertype to be captured in this way. As subtypes
could appear as children themselves, the query code silently "skipped
over" the supertype restriction in the pattern. This was fixed in
tree-sitter v0.26.0, which now (correctly) flags these patterns as
"impossible".

Solution: Add the appropriate child nodes explicitly.
---
 runtime/queries/fsharp/highlights.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/runtime/queries/fsharp/highlights.scm b/runtime/queries/fsharp/highlights.scm
index 16b969fb6..ba70ea5c6 100644
--- a/runtime/queries/fsharp/highlights.scm
+++ b/runtime/queries/fsharp/highlights.scm
@@ -376,8 +376,9 @@
   (unit) @function.call)
 
 ((_type
-  (long_identifier
-    (identifier) @type.builtin))
+  (simple_type
+    (long_identifier
+      (identifier) @type.builtin)))
   (#any-of? @type.builtin
     "bool" "byte" "sbyte" "int16" "uint16" "int" "uint" "int64" "uint64" "nativeint" "unativeint"
     "decimal" "float" "double" "float32" "single" "char" "string" "unit"))
@@ -401,8 +402,9 @@
   (attributes
     (attribute
       (_type
-        (long_identifier
-          (identifier) @attribute))))
+        (simple_type
+          (long_identifier
+            (identifier) @attribute)))))
   (function_or_value_defn
     (value_declaration_left
       .

From 3bbae7b32e0cc417438e54ec77eb7083e5f38c0f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 23 Nov 2025 13:26:11 +0100
Subject: [PATCH 2552/2704] feat(parsers): update angular, ini, json5, koto,
 matlab, mlir, nix, pkl, query, sql, t32, vimdoc, zsh

---
 lua/nvim-treesitter/parsers.lua | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index eac0a16de..34d989c71 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '513aad1a321a698b2fb1e388781a53038a672b24',
+      revision = '8b4f7e65d22bfec2448cad935b18c9c970cc4719',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -1033,7 +1033,7 @@ return {
   },
   ini = {
     install_info = {
-      revision = '0eaed8040513e62ee2e9e8db9f086cf630a524eb',
+      revision = 'bea223734aa9cea2c8793bf9098bd7fdef912f57',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
@@ -1136,7 +1136,7 @@ return {
   },
   json5 = {
     install_info = {
-      revision = '8cb4114a4d7e5bab75d74466422e032de31d83df',
+      revision = 'aa630ef48903ab99e406a8acd2e2933077cc34e1',
       url = 'https://github.com/Joakker/tree-sitter-json5',
     },
     maintainers = { '@Joakker' },
@@ -1222,7 +1222,7 @@ return {
   },
   koto = {
     install_info = {
-      revision = '5bdb50e0c15a513397933620b8827e0ec83bca97',
+      revision = 'f8b3f62c0eed185dca1559789e78759d4bee60e5',
       url = 'https://github.com/koto-lang/tree-sitter-koto',
     },
     maintainers = { '@irh' },
@@ -1374,7 +1374,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '2e60b9e96774e52edd91cbef37ead8f46c6e1221',
+      revision = '1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'f13087c89de99738217a84727dbf95339a67591f',
+      revision = '80ac665f68a5d1c6ca0443f71b6cd60e24e84157',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1470,7 +1470,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'c5795af5a64ab8daa76bb77f30c24b5ed38976b5',
+      revision = 'bfcb03e6ddccc5a1eb84cea0176096f85a7af333',
       url = 'https://github.com/nix-community/tree-sitter-nix',
     },
     maintainers = { '@leo60228', '@zimbatm' },
@@ -1617,7 +1617,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'a109e0b4823d61ccd1461a1641da8119af7c0a5e',
+      revision = 'd9b3b1a48894b7e92172ec32f264ce853acf2d90',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1812,7 +1812,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '60e253d3c9d6b1131a0f75c85e4bdcc9a48d5b42',
+      revision = 'eeac2b75cf77c9c8571384d7242f89ade78f9939',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2148,7 +2148,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '4094309b58ccb74d041fb531ae6b7193a3ebc351',
+      revision = '0a3d963f48bf34d2765301f92ea525b4c5103696',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2271,7 +2271,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '3cf141649c74f3aa018a8e24c7f3fa01bc5ecd1e',
+      revision = 'c3f72e1786b3440b98cb1b082c13c9033e1d08a9',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2553,7 +2553,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = 'ffa29e863738adfc1496717c4acb7aae92a80ed4',
+      revision = '0384c4156b1edffe3cc6e7136f27126c5da3f39e',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2701,7 +2701,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.42.0',
+      revision = 'v0.47.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },

From d6ebbd5039954ecd47463802a16b5d8d7f223eef Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 25 Nov 2025 10:23:02 +0100
Subject: [PATCH 2553/2704] fix(haskell): correct use of supertypes in `(decl)`
 patterns

Problem: These patterns were impossible, since children need to be children of
every subtype of a supertype to be captured in this way. As subtypes
could appear as children themselves, the query code silently "skipped
over" the supertype restriction in the pattern. This was fixed in
tree-sitter v0.26.0, which now (correctly) flags these patterns as
"impossible".

Solution: Add the appropriate child nodes explicitly.
---
 runtime/queries/haskell/highlights.scm | 34 +++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index 0880f020e..de0eaf0a1 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -121,7 +121,21 @@
 
 ; ----------------------------------------------------------------------------
 ; Functions and variables
-(decl
+(decl/signature
+  [
+    name: (variable) @function
+    names: (binding_list
+      (variable) @function)
+  ])
+
+(decl/function
+  [
+    name: (variable) @function
+    names: (binding_list
+      (variable) @function)
+  ])
+
+(decl/bind
   [
     name: (variable) @function
     names: (binding_list
@@ -142,7 +156,14 @@
   type: (type))
   .
   (decl
-    name: (variable) @variable)
+    [
+      (signature
+        name: (variable) @variable)
+      (function
+        name: (variable) @variable)
+      (bind
+        name: (variable) @variable)
+    ])
   match: (_)
   (#eq? @_name @variable))
 
@@ -160,7 +181,14 @@
   (#eq? @_type "IO"))
   .
   (decl
-    name: (variable) @function)
+    [
+      (signature
+        name: (variable) @function)
+      (function
+        name: (variable) @function)
+      (bind
+        name: (variable) @function)
+    ])
   match: (_)
   (#eq? @_name @function))
 

From c5871d9d870c866fea9f271f1a3b3f29049a4793 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 25 Nov 2025 10:34:35 +0100
Subject: [PATCH 2554/2704] fix(perl): correct use of supertypes

---
 runtime/queries/perl/highlights.scm | 34 ++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/runtime/queries/perl/highlights.scm b/runtime/queries/perl/highlights.scm
index d52baab44..6baee6b9b 100644
--- a/runtime/queries/perl/highlights.scm
+++ b/runtime/queries/perl/highlights.scm
@@ -256,15 +256,37 @@
 ; all post deref sigils highlighted as operators, and the unrolly star is a special char
 (postfix_deref
   [
-    "$"
+    (scalar_deref_expression
+      "$" @operator
+      "*" @character.special)
+    (array_deref_expression
+      "@" @operator
+      "*" @character.special)
+    (arraylen_deref_expression
+      "$#" @operator
+      "*" @character.special)
+    (hash_deref_expression
+      "%" @operator
+      "*" @character.special)
+    (amper_deref_expression
+      "&" @operator
+      "*" @character.special)
+    (glob_deref_expression
+      "*" @operator
+      "*" @character.special)
+  ])
+
+(slices/slice_expression
+  [
+    arrayref: _
+    hashref: _
+  ]
+  [
     "@"
     "%"
-    "*"
-    "$#"
-  ] @operator
-  "*" @character.special)
+  ] @operator)
 
-(slices
+(slices/keyval_expression
   [
     arrayref: _
     hashref: _

From d56ed0f7f90d6492ce422f5e0a9cb36d3169eb96 Mon Sep 17 00:00:00 2001
From: Tayfun Bocek <tayfunbocek@live.ca>
Date: Thu, 27 Nov 2025 12:35:21 +0300
Subject: [PATCH 2555/2704] feat(gdshader): update highlight queries (#8299)

* use uniform scope node instead of literal matching

This avoids the need to refactor if other scope types are added. Maybe
helps performance as well.

* add method expression highlight
---
 runtime/queries/gdshader/highlights.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/gdshader/highlights.scm b/runtime/queries/gdshader/highlights.scm
index b4bb46ea1..0e29d53e7 100644
--- a/runtime/queries/gdshader/highlights.scm
+++ b/runtime/queries/gdshader/highlights.scm
@@ -1,6 +1,4 @@
 [
-  "global"
-  "instance"
   "group_uniforms"
   "uniform"
   "const"
@@ -10,6 +8,8 @@
   "shader_type"
 ] @keyword
 
+(scope) @keyword
+
 [
   "if"
   "else"
@@ -213,6 +213,9 @@
 (call_expression
   function: (identifier) @function.call)
 
+(method_expression
+  method: (_) @function.method.call)
+
 (field_expression
   field: (_) @property)
 

From 17885756e63df73ed90db62e4630f744ceda6514 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 27 Nov 2025 18:49:19 +0100
Subject: [PATCH 2556/2704] feat(parsers): update angular, c3, desktop,
 editorconfig, elm, gdshader, gleam, haskell, idl, php, php_only, pkl, query,
 readline, vimdoc, xresources

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 34d989c71..e32bf962a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '8b4f7e65d22bfec2448cad935b18c9c970cc4719',
+      revision = '56fffa8c9ea7389cb2237f4a01c4a2058ac64416',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = 'e4570693b8064a83cd7826795d5ef29400313d3c',
+      revision = '2e852d524cdab2e857ac7fb3ad814b39ae858916',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '685a0076aa68b897e592af1ec6bf862bb84321e5',
+      revision = '2d93b616b0c247121dab59590b3182af1a9ecb3b',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '439a3fcdbf239db35f587936a36f48b704ba8357',
+      revision = 'f08fb1f53130d2c765e45181eae26535e1a7a7f1',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -481,7 +481,7 @@ return {
   },
   elm = {
     install_info = {
-      revision = '6e3c6d51f13168f9d7794c8e8add7dfdd07d20b8',
+      revision = '027728466b8115cf807517af943cbeaed34053fc',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
@@ -660,7 +660,7 @@ return {
   },
   gdshader = {
     install_info = {
-      revision = 'a06bc744f89c532bc7980b545bd39ae5489e314c',
+      revision = '68268631c8b6dc093985f1246b099f81b30ea7d1',
       url = 'https://github.com/airblast-dev/tree-sitter-gdshader',
     },
     maintainers = { '@airblast-dev' },
@@ -708,7 +708,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = 'ec3c27c5eef20f48b17ee28152f521697df10312',
+      revision = 'f4d55f3c5b690d4afe8853da892bc290d96deb34',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -889,7 +889,7 @@ return {
   },
   haskell = {
     install_info = {
-      revision = 'da65949d6f82242dbf29d67bc69b18fce125ef87',
+      revision = '7fa19f195803a77855f036ee7f49e4b22856e338',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-haskell',
     },
     maintainers = { '@mrcjkb' },
@@ -1018,7 +1018,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '86d434e732f971ecec24571e0dcb6b14c8b19952',
+      revision = '0c9aa1588cec4c64235ec3ed014ca72aa79e72ca',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1581,7 +1581,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = 'de11d0bcec62b8ed6b0c7edd55051042f37b8b05',
+      revision = '7d07b41ce2d442ca9a90ed85d0075eccc17ae315',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1592,7 +1592,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = 'de11d0bcec62b8ed6b0c7edd55051042f37b8b05',
+      revision = '7d07b41ce2d442ca9a90ed85d0075eccc17ae315',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1617,7 +1617,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'd9b3b1a48894b7e92172ec32f264ce853acf2d90',
+      revision = '82f0e990b727374014371681457cc6ea5c3daa97',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1812,7 +1812,7 @@ return {
   },
   query = {
     install_info = {
-      revision = 'eeac2b75cf77c9c8571384d7242f89ade78f9939',
+      revision = 'a225e21d81201be77da58de614e2b7851735677a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1876,7 +1876,7 @@ return {
   },
   readline = {
     install_info = {
-      revision = '74addc90fc539d31d413c0c7cf7581997a7fa46e',
+      revision = '6b744c527aebd12e46a5ecb3aebdb8d621a8e83e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-readline',
     },
     maintainers = { '@ribru17' },
@@ -2553,7 +2553,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = '0384c4156b1edffe3cc6e7136f27126c5da3f39e',
+      revision = '5cb043a38ff04cadb6b8e6688aabbf34edd0c3e3',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2637,7 +2637,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '099f2bec9b441c960d66ebd856fbbcc84b3f8015',
+      revision = 'd466418f1c8850276bb7787a135372cb70868b1d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 00c906abb9550e72bc0c640545b5499b9525bb40 Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Sun, 30 Nov 2025 23:46:21 -0800
Subject: [PATCH 2557/2704] fix(zsh): update posix shell variables

---
 lua/nvim-treesitter/parsers.lua    |  2 +-
 runtime/queries/zsh/highlights.scm | 92 ++++++++++++++++++++----------
 2 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e32bf962a..49d2a3bed 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2701,7 +2701,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.47.0',
+      revision = 'v0.48.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },
diff --git a/runtime/queries/zsh/highlights.scm b/runtime/queries/zsh/highlights.scm
index 3bf1eed00..75a37408b 100644
--- a/runtime/queries/zsh/highlights.scm
+++ b/runtime/queries/zsh/highlights.scm
@@ -233,41 +233,73 @@
 
 ((variable_name) @variable.builtin
   (#any-of? @variable.builtin
-    ; https://www.gnu.org/software/bash/manual/html_node/Bourne-Shell-Variables.html
+    ; POSIX shell variables
     "CDPATH" "HOME" "IFS" "MAIL" "MAILPATH" "OPTARG" "OPTIND" "PATH" "PS1" "PS2"
-    ; https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html
-    "_" "BASH" "BASHOPTS" "BASHPID" "BASH_ALIASES" "BASH_ARGC" "BASH_ARGV" "BASH_ARGV0" "BASH_CMDS"
-    "BASH_COMMAND" "BASH_COMPAT" "BASH_ENV" "BASH_EXECUTION_STRING" "BASH_LINENO"
-    "BASH_LOADABLES_PATH" "BASH_REMATCH" "BASH_SOURCE" "BASH_SUBSHELL" "BASH_VERSINFO"
-    "BASH_VERSION" "BASH_XTRACEFD" "CHILD_MAX" "COLUMNS" "COMP_CWORD" "COMP_LINE" "COMP_POINT"
-    "COMP_TYPE" "COMP_KEY" "COMP_WORDBREAKS" "COMP_WORDS" "COMPREPLY" "COPROC" "DIRSTACK" "EMACS"
-    "ENV" "EPOCHREALTIME" "EPOCHSECONDS" "EUID" "EXECIGNORE" "FCEDIT" "FIGNORE" "FUNCNAME"
-    "FUNCNEST" "GLOBIGNORE" "GROUPS" "histchars" "HISTCMD" "HISTCONTROL" "HISTFILE" "HISTFILESIZE"
-    "HISTIGNORE" "HISTSIZE" "HISTTIMEFORMAT" "HOSTFILE" "HOSTNAME" "HOSTTYPE" "IGNOREEOF" "INPUTRC"
-    "INSIDE_EMACS" "LANG" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_NUMERIC" "LC_TIME"
-    "LINENO" "LINES" "MACHTYPE" "MAILCHECK" "MAPFILE" "OLDPWD" "OPTERR" "OSTYPE" "PIPESTATUS"
-    "POSIXLY_CORRECT" "PPID" "PROMPT_COMMAND" "PROMPT_DIRTRIM" "PS0" "PS3" "PS4" "PWD" "RANDOM"
-    "READLINE_ARGUMENT" "READLINE_LINE" "READLINE_MARK" "READLINE_POINT" "REPLY" "SECONDS" "SHELL"
-    "SHELLOPTS" "SHLVL" "SRANDOM" "TIMEFORMAT" "TMOUT" "TMPDIR" "UID"))
+    ; https://zsh.sourceforge.io/Doc/Release/Parameters.html#Parameters-Set-By-The-Shell
+    "_" "ARGC" "CPUTYPE" "DIRSTACK" "EGID" "EPOCHREALTIME" "EPOCHSECONDS" "ERRNO" "EUID"
+    "FUNCFILETRACE" "FUNCNEST" "FUNCSOURCETRACE" "FUNCSTACK" "GID" "HISTCMD" "HOST" "LINENO"
+    "LOGNAME" "MACHTYPE" "OLDPWD" "OSTYPE" "PIPESTATUS" "PPID" "PWD" "RANDOM" "SECONDS" "SHLVL"
+    "TRY_BLOCK_ERROR" "TRY_BLOCK_INTERRUPT" "TTY" "TTYIDLE" "UID" "USERNAME" "VENDOR" "ZSH_ARGZERO"
+    "ZSH_EVAL_CONTEXT" "ZSH_EXECUTION_STRING" "ZSH_NAME" "ZSH_PATCHLEVEL" "ZSH_SCRIPT"
+    "ZSH_SUBSHELL" "ZSH_VERSION"
+    ; ZLE parameters (set by shell) - https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html
+    "BUFFER" "BUFFERLINES" "CONTEXT" "CURSOR" "CUTBUFFER" "HISTNO" "ISEARCHMATCH_ACTIVE"
+    "ISEARCHMATCH_END" "ISEARCHMATCH_START" "KEYMAP" "KEYS" "KEYS_QUEUED_COUNT" "LASTABORTEDSEARCH"
+    "LASTSEARCH" "LASTWIDGET" "LBUFFER" "MARK" "MATCH" "MBEGIN" "MEND" "NUMERIC" "PENDING"
+    "POSTDISPLAY" "PREBUFFER" "PREDISPLAY" "PREFIX" "QIPREFIX" "QISUFFIX" "RBUFFER" "REGION_ACTIVE"
+    "REPLY" "SAVECURSOR" "SUFFIX" "UNDO_CHANGE_NO" "UNDO_LIMIT_NO" "WIDGET" "WIDGETFUNC"
+    "WIDGETSTYLE" "YANK_ACTIVE" "YANK_END" "YANK_START" "WORDS_STYLE" "ZLE_RECURSIVE" "ZLE_STATE"
+    ; Completion parameters - https://zsh.sourceforge.io/Doc/Release/Completion-Widgets.html
+    "CURRENT" "IPREFIX" "ISUFFIX" "compstate"
+    ; https://zsh.sourceforge.io/Doc/Release/Parameters.html#Parameters-Used-By-The-Shell
+    "ARGV0" "BAUD" "COLUMNS" "CORRECT_IGNORE" "CORRECT_IGNORE_FILE" "DIRSTACKSIZE" "EDITOR" "ENV"
+    "FCEDIT" "FIGNORE" "FPATH" "HISTCHARS" "HISTFILE" "HISTSIZE" "KEYBOARD_HACK" "KEYTIMEOUT" "LANG"
+    "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_NUMERIC" "LC_TIME" "LINES" "LISTMAX"
+    "LOGCHECK" "MAILCHECK" "MANPATH" "MODULE_PATH" "NULLCMD" "POSTEDIT" "PROMPT" "PROMPT2" "PROMPT3"
+    "PROMPT4" "PROMPTCHARS" "PS3" "PS4" "PSVAR" "READNULLCMD" "RPROMPT" "RPROMPT2" "RPS1" "RPS2"
+    "SAVEHIST" "SHELL" "SPROMPT" "STTY" "TERM" "TIMEFMT" "TMOUT" "TMPPREFIX" "VISUAL" "WATCH"
+    "WATCHFMT" "WORDCHARS" "ZBEEP" "ZDOTDIR" "ZLE_LINE_ABORTED" "ZLE_REMOVE_SUFFIX_CHARS"
+    "ZLE_RPROMPT_INDENT" "ZLE_SPACE_SUFFIX_CHARS"
+    ; Array/lowercase tied parameters - https://zsh.sourceforge.io/Doc/Release/Variables-Index.html
+    "argv" "cdpath" "dirstack" "fignore" "fpath" "funcfiletrace" "funcsourcetrace" "funcstack"
+    "functrace" "histchars" "killring" "mailpath" "manpath" "match" "mbegin" "mend" "module_path"
+    "options" "path" "pipestatus" "prompt" "psvar" "reply" "signals" "status" "watch" "words"
+    "zsh_eval_context"))
 
 ((simple_variable_name) @variable.builtin
   (#any-of? @variable.builtin
-    ; https://www.gnu.org/software/bash/manual/html_node/Bourne-Shell-Variables.html
+    ; POSIX shell variables
     "CDPATH" "HOME" "IFS" "MAIL" "MAILPATH" "OPTARG" "OPTIND" "PATH" "PS1" "PS2"
-    ; https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html
-    "_" "BASH" "BASHOPTS" "BASHPID" "BASH_ALIASES" "BASH_ARGC" "BASH_ARGV" "BASH_ARGV0" "BASH_CMDS"
-    "BASH_COMMAND" "BASH_COMPAT" "BASH_ENV" "BASH_EXECUTION_STRING" "BASH_LINENO"
-    "BASH_LOADABLES_PATH" "BASH_REMATCH" "BASH_SOURCE" "BASH_SUBSHELL" "BASH_VERSINFO"
-    "BASH_VERSION" "BASH_XTRACEFD" "CHILD_MAX" "COLUMNS" "COMP_CWORD" "COMP_LINE" "COMP_POINT"
-    "COMP_TYPE" "COMP_KEY" "COMP_WORDBREAKS" "COMP_WORDS" "COMPREPLY" "COPROC" "DIRSTACK" "EMACS"
-    "ENV" "EPOCHREALTIME" "EPOCHSECONDS" "EUID" "EXECIGNORE" "FCEDIT" "FIGNORE" "FUNCNAME"
-    "FUNCNEST" "GLOBIGNORE" "GROUPS" "histchars" "HISTCMD" "HISTCONTROL" "HISTFILE" "HISTFILESIZE"
-    "HISTIGNORE" "HISTSIZE" "HISTTIMEFORMAT" "HOSTFILE" "HOSTNAME" "HOSTTYPE" "IGNOREEOF" "INPUTRC"
-    "INSIDE_EMACS" "LANG" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_NUMERIC" "LC_TIME"
-    "LINENO" "LINES" "MACHTYPE" "MAILCHECK" "MAPFILE" "OLDPWD" "OPTERR" "OSTYPE" "PIPESTATUS"
-    "POSIXLY_CORRECT" "PPID" "PROMPT_COMMAND" "PROMPT_DIRTRIM" "PS0" "PS3" "PS4" "PWD" "RANDOM"
-    "READLINE_ARGUMENT" "READLINE_LINE" "READLINE_MARK" "READLINE_POINT" "REPLY" "SECONDS" "SHELL"
-    "SHELLOPTS" "SHLVL" "SRANDOM" "TIMEFORMAT" "TMOUT" "TMPDIR" "UID"))
+    ; https://zsh.sourceforge.io/Doc/Release/Parameters.html#Parameters-Set-By-The-Shell
+    "_" "ARGC" "CPUTYPE" "DIRSTACK" "EGID" "EPOCHREALTIME" "EPOCHSECONDS" "ERRNO" "EUID"
+    "FUNCFILETRACE" "FUNCNEST" "FUNCSOURCETRACE" "FUNCSTACK" "GID" "HISTCMD" "HOST" "LINENO"
+    "LOGNAME" "MACHTYPE" "OLDPWD" "OSTYPE" "PIPESTATUS" "PPID" "PWD" "RANDOM" "SECONDS" "SHLVL"
+    "TRY_BLOCK_ERROR" "TRY_BLOCK_INTERRUPT" "TTY" "TTYIDLE" "UID" "USERNAME" "VENDOR" "ZSH_ARGZERO"
+    "ZSH_EVAL_CONTEXT" "ZSH_EXECUTION_STRING" "ZSH_NAME" "ZSH_PATCHLEVEL" "ZSH_SCRIPT"
+    "ZSH_SUBSHELL" "ZSH_VERSION"
+    ; ZLE parameters (set by shell) - https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html
+    "BUFFER" "BUFFERLINES" "CONTEXT" "CURSOR" "CUTBUFFER" "HISTNO" "ISEARCHMATCH_ACTIVE"
+    "ISEARCHMATCH_END" "ISEARCHMATCH_START" "KEYMAP" "KEYS" "KEYS_QUEUED_COUNT" "LASTABORTEDSEARCH"
+    "LASTSEARCH" "LASTWIDGET" "LBUFFER" "MARK" "MATCH" "MBEGIN" "MEND" "NUMERIC" "PENDING"
+    "POSTDISPLAY" "PREBUFFER" "PREDISPLAY" "PREFIX" "QIPREFIX" "QISUFFIX" "RBUFFER" "REGION_ACTIVE"
+    "REPLY" "SAVECURSOR" "SUFFIX" "UNDO_CHANGE_NO" "UNDO_LIMIT_NO" "WIDGET" "WIDGETFUNC"
+    "WIDGETSTYLE" "YANK_ACTIVE" "YANK_END" "YANK_START" "WORDS_STYLE" "ZLE_RECURSIVE" "ZLE_STATE"
+    ; Completion parameters - https://zsh.sourceforge.io/Doc/Release/Completion-Widgets.html
+    "CURRENT" "IPREFIX" "ISUFFIX" "compstate"
+    ; https://zsh.sourceforge.io/Doc/Release/Parameters.html#Parameters-Used-By-The-Shell
+    "ARGV0" "BAUD" "COLUMNS" "CORRECT_IGNORE" "CORRECT_IGNORE_FILE" "DIRSTACKSIZE" "EDITOR" "ENV"
+    "FCEDIT" "FIGNORE" "FPATH" "HISTCHARS" "HISTFILE" "HISTSIZE" "KEYBOARD_HACK" "KEYTIMEOUT" "LANG"
+    "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_NUMERIC" "LC_TIME" "LINES" "LISTMAX"
+    "LOGCHECK" "MAILCHECK" "MANPATH" "MODULE_PATH" "NULLCMD" "POSTEDIT" "PROMPT" "PROMPT2" "PROMPT3"
+    "PROMPT4" "PROMPTCHARS" "PS3" "PS4" "PSVAR" "READNULLCMD" "RPROMPT" "RPROMPT2" "RPS1" "RPS2"
+    "SAVEHIST" "SHELL" "SPROMPT" "STTY" "TERM" "TIMEFMT" "TMOUT" "TMPPREFIX" "VISUAL" "WATCH"
+    "WATCHFMT" "WORDCHARS" "ZBEEP" "ZDOTDIR" "ZLE_LINE_ABORTED" "ZLE_REMOVE_SUFFIX_CHARS"
+    "ZLE_RPROMPT_INDENT" "ZLE_SPACE_SUFFIX_CHARS"
+    ; Array/lowercase tied parameters - https://zsh.sourceforge.io/Doc/Release/Variables-Index.html
+    "argv" "cdpath" "dirstack" "fignore" "fpath" "funcfiletrace" "funcsourcetrace" "funcstack"
+    "functrace" "histchars" "killring" "mailpath" "manpath" "match" "mbegin" "mend" "module_path"
+    "options" "path" "pipestatus" "prompt" "psvar" "reply" "signals" "status" "watch" "words"
+    "zsh_eval_context"))
 
 ((command
   name: (command_name

From e527584cf8508b2f99f127c2a20f93237e8fcf83 Mon Sep 17 00:00:00 2001
From: nsfisis <54318333+nsfisis@users.noreply.github.com>
Date: Wed, 3 Dec 2025 05:03:33 +0900
Subject: [PATCH 2558/2704] feat(vhs): update options list (#8309)

---
 runtime/queries/vhs/highlights.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/runtime/queries/vhs/highlights.scm b/runtime/queries/vhs/highlights.scm
index 469fdd139..a8bb99c6c 100644
--- a/runtime/queries/vhs/highlights.scm
+++ b/runtime/queries/vhs/highlights.scm
@@ -30,6 +30,12 @@
   "Theme"
   "LoopOffset"
   "Width"
+  "BorderRadius"
+  "Margin"
+  "MarginFill"
+  "WindowBar"
+  "WindowBarSize"
+  "CursorBlink"
 ] @type
 
 "@" @operator

From c5623d3486c1cda5f73e28a3a4abb454f708c48c Mon Sep 17 00:00:00 2001
From: Gabriel Holodak <gthepiper@gmail.com>
Date: Tue, 2 Dec 2025 20:15:52 -0500
Subject: [PATCH 2559/2704] docs: document setting foldmethod alongside
 foldexpr (#8187)

---
 README.md               | 1 +
 doc/nvim-treesitter.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 3ddf5b3df..8d2e22f41 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,7 @@ Treesitter-based folding is provided by Neovim. To enable it, put the following
 
 ```lua
 vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+vim.wo.foldmethod = 'expr'
 ```
 
 ## Indentation
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt
index 3bb3f9356..e6a67f398 100644
--- a/doc/nvim-treesitter.txt
+++ b/doc/nvim-treesitter.txt
@@ -45,6 +45,7 @@ Treesitter features for installed languages need to be enabled manually in a
       vim.treesitter.start()
       -- folds, provided by Neovim
       vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+      vim.wo.foldmethod = 'expr'
       -- indentation, provided by nvim-treesitter
       vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
     end,

From 857fb97bb65c8a71b0c4a568cfcfef95679854d5 Mon Sep 17 00:00:00 2001
From: Alexei Mozaidze <lexerpexer@proton.me>
Date: Wed, 3 Dec 2025 20:32:06 +0400
Subject: [PATCH 2560/2704] fix(fennel): highlight `$[1-9]` in multi-symbol
 context properly

Highlights the dollar symbol properly in multi-symbol contexts, like `$3.some.properties`.
There was already a fix for a similar issue on #8067, but it only addressed `$.some.properties`, but not the variant with the argument number in it.
---
 runtime/queries/fennel/highlights.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/queries/fennel/highlights.scm b/runtime/queries/fennel/highlights.scm
index c02f7bd14..a70f200dc 100644
--- a/runtime/queries/fennel/highlights.scm
+++ b/runtime/queries/fennel/highlights.scm
@@ -102,13 +102,13 @@
   ])
 
 ((symbol) @variable.parameter
-  (#any-of? @variable.parameter "$" "$..."))
+  (#lua-match? @variable.parameter "^%$[1-9]?$"))
 
 ((symbol_fragment) @variable.parameter
-  (#eq? @variable.parameter "$"))
+  (#lua-match? @variable.parameter "^%$[1-9]?$"))
 
 ((symbol) @variable.parameter
-  (#lua-match? @variable.parameter "^%$[1-9]$"))
+  (#eq? @variable.parameter "$..."))
 
 ((symbol) @operator
   (#any-of? @operator

From 75797cdd8ac125c7ace065b17788b439dcf89a71 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Thu, 4 Dec 2025 10:42:01 +0100
Subject: [PATCH 2561/2704] feat(angular): add style_unit highlighting(#8312)

---
 lua/nvim-treesitter/parsers.lua        | 2 +-
 runtime/queries/angular/highlights.scm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 49d2a3bed..749f7c6ec 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '56fffa8c9ea7389cb2237f4a01c4a2058ac64416',
+      revision = 'd2f388435b062fdd6b3c386db6c23db2da67e578',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
diff --git a/runtime/queries/angular/highlights.scm b/runtime/queries/angular/highlights.scm
index 4793745b4..ad192329a 100644
--- a/runtime/queries/angular/highlights.scm
+++ b/runtime/queries/angular/highlights.scm
@@ -2,6 +2,8 @@
 
 (identifier) @variable
 
+(style_unit) @variable
+
 (pipe_operator) @operator
 
 (string) @string

From e0eec76dad852814e5972aa66ec2dc98d03525a8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 5 Dec 2025 15:32:28 +0100
Subject: [PATCH 2562/2704] fix(lua): fix some emmyluals warnings

---
 .emmyrc.json                    | 25 +++++++++++++++++++++++++
 lua/nvim-treesitter/config.lua  |  2 +-
 lua/nvim-treesitter/install.lua |  2 +-
 scripts/check-queries.lua       |  1 -
 scripts/install-parsers.lua     |  4 ++--
 scripts/update-parsers.lua      | 16 ++++++++--------
 6 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 .emmyrc.json

diff --git a/.emmyrc.json b/.emmyrc.json
new file mode 100644
index 000000000..34d1e0b86
--- /dev/null
+++ b/.emmyrc.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "https://raw.githubusercontent.com/EmmyLuaLs/emmylua-analyzer-rust/refs/heads/main/crates/emmylua_code_analysis/resources/schema.json",
+  "format": {
+    "externalTool": {
+      "program": "stylua",
+      "args": [
+        "-",
+        "--stdin-filepath",
+        "${file}"
+      ]
+    }
+  },
+  "diagnostics": {
+    "disable": [
+      "unnecessary-if"
+    ]
+  },
+  "codeAction": {
+    "insertSpace": true
+  },
+  "strict": {
+    "typeCall": true,
+    "arrayIndex": true
+  }
+}
diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 8150ad8a8..f76897bc4 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -7,7 +7,7 @@ M.tiers = { 'stable', 'unstable', 'unmaintained', 'unsupported' }
 
 ---@type TSConfig
 local config = {
-  install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
+  install_dir = vim.fs.joinpath(vim.fn.stdpath('data') --[[@as string]], 'site'),
 }
 
 ---Setup call for users to override configuration configurations.
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 94d21d46a..1020e7da9 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -487,7 +487,7 @@ end
 local function install(languages, options)
   options = options or {}
 
-  local cache_dir = fs.normalize(fn.stdpath('cache'))
+  local cache_dir = fs.normalize(fn.stdpath('cache') --[[@as string]])
   if not uv.fs_stat(cache_dir) then
     fn.mkdir(cache_dir, 'p')
   end
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index d951cf2d6..94d8951cb 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -14,7 +14,6 @@ do
 
   for _, lang in pairs(parsers) do
     if configs[lang] and configs[lang].install_info then
-      timings[lang] = {}
       for _, query_type in pairs(query_types) do
         local before = vim.uv.hrtime()
         local ok, query = pcall(vim.treesitter.query.get, lang, query_type)
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index 2d083f3c3..c97c6eecc 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -2,7 +2,7 @@
 
 local generate = false
 local update = false
-local max_jobs = nil ---@type integer?
+local max_jobs = nil ---@type number?
 local parsers = {}
 for i = 1, #_G.arg do
   if _G.arg[i] == '--generate' then
@@ -10,7 +10,7 @@ for i = 1, #_G.arg do
   elseif _G.arg[i] == '--update' then
     update = true
   elseif _G.arg[i]:find('^%-%-max%-jobs') then
-    max_jobs = _G.arg[i]:match('=(%d+)')
+    max_jobs = tonumber(_G.arg[i]:match('=(%d+)'))
   else
     parsers[#parsers + 1] = _G.arg[i] ---@type string
   end
diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index 83f724970..bab572c27 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -6,7 +6,7 @@
 -- nvim -l update-parsers.lua --tier=1   # update stable parsers to latest version
 -- nvim -l update-parsers.lua --tier=2   # update unstable parsers to latest commit
 
-local tier = nil ---@type integer?
+local tier = nil ---@type number?
 for i = 1, #_G.arg do
   if _G.arg[i]:find('^%-%-tier=') then
     tier = tonumber(_G.arg[i]:match('=(%d+)'))
@@ -41,15 +41,15 @@ for k, p in pairs(parsers) do
 
   if #vim.tbl_keys(jobs) % 100 == 0 or next(parsers, k) == nil then
     for name, job in pairs(jobs) do
-      local stdout = vim.split(job:wait().stdout, '\n')
+      local stdout = vim.split(job:wait().stdout or '', '\n')
       jobs[name] = nil
 
-      local info = parsers[name].install_info
-      assert(info)
+      assert(parsers[name])
+      local info = assert(parsers[name].install_info)
 
-      local sha ---@type string
+      local sha ---@type string?
       if parsers[name].tier == 1 then
-        sha = stdout[#stdout - 1]:match('v[%d%.]+$')
+        sha = stdout[#stdout - 1] and stdout[#stdout - 1]:match('v[%d%.]+$')
       else
         local branch = info.branch
         local line = 1
@@ -61,10 +61,10 @@ for k, p in pairs(parsers) do
             end
           end
         end
-        sha = vim.split(stdout[line], '\t')[1]
+        sha = stdout[line] and vim.split(stdout[line], '\t')[1]
       end
 
-      if info.revision ~= sha then
+      if sha and info.revision ~= sha then
         info.revision = sha
         updates[#updates + 1] = name
       end

From 6f2121231af93a8d448b937ac60f3476a722286e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 6 Dec 2025 13:04:17 +0100
Subject: [PATCH 2563/2704] feat(parsers): update angular, c3, desktop, elm,
 forth, inko, mlir, nix, pkl, powershell, templ, xresources

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 749f7c6ec..e1e5cc23c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = 'd2f388435b062fdd6b3c386db6c23db2da67e578',
+      revision = '3bd2036e710f609ea08fcfca5a1eb1169ecc114f',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '2e852d524cdab2e857ac7fb3ad814b39ae858916',
+      revision = '3bcb189c85a15d5e47a12947fbb25cd6604025f5',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '2d93b616b0c247121dab59590b3182af1a9ecb3b',
+      revision = 'f5709fd5297676875aa6d636e52cff7039573cb0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -481,7 +481,7 @@ return {
   },
   elm = {
     install_info = {
-      revision = '027728466b8115cf807517af943cbeaed34053fc',
+      revision = '3d000d37b99ac2640bf24c1a7a5c9a58485778df',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
@@ -584,7 +584,7 @@ return {
   },
   forth = {
     install_info = {
-      revision = '90189238385cf636b9ee99ce548b9e5b5e569d48',
+      revision = '360ef13f8c609ec6d2e80782af69958b84e36cd0',
       url = 'https://github.com/AlexanderBrevig/tree-sitter-forth',
     },
     maintainers = { '@amaanq' },
@@ -1041,7 +1041,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = '9d7ed4f6c0ea2a8f846f3bb00e33ab21ec9ca379',
+      revision = 'fc37d05c363ccf7f515354c5a47d72b2d3ff555e',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
@@ -1406,7 +1406,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '80ac665f68a5d1c6ca0443f71b6cd60e24e84157',
+      revision = '834a0b01e98eaf4313dfd48778e20bef1738ff8f',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1470,7 +1470,7 @@ return {
   },
   nix = {
     install_info = {
-      revision = 'bfcb03e6ddccc5a1eb84cea0176096f85a7af333',
+      revision = 'eabf96807ea4ab6d6c7f09b671a88cd483542840',
       url = 'https://github.com/nix-community/tree-sitter-nix',
     },
     maintainers = { '@leo60228', '@zimbatm' },
@@ -1617,7 +1617,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = '82f0e990b727374014371681457cc6ea5c3daa97',
+      revision = 'd50709f1b71e77844c4551c655792d100a5ca559',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1660,7 +1660,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '9379c77984af1f3d3d7e3cc5e897de3496725280',
+      revision = '17f0c1a6514d3b46e64df7b88f464c0bd85078a6',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -2312,7 +2312,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = '1975f67058325403c5412cde48b181a3fa817870',
+      revision = '3057cd485f7f23a8ad24107c6adc604f8c5ce3db',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2637,7 +2637,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'd466418f1c8850276bb7787a135372cb70868b1d',
+      revision = 'a96227aaa37e5f8e1a5888bfac2dcb31ad0bf1f1',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 596923959a50d8d975ec129f531f6673ea72fc21 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 6 Dec 2025 13:22:04 +0100
Subject: [PATCH 2564/2704] fix(inko): downgrade parser

Problem: The commit https://github.com/inko-lang/tree-sitter-inko/commit/fc37d05c363ccf7f515354c5a47d72b2d3ff555e broke parsing a textobjects query.

Solution: Downgrade parser to previous commit and pin it (until we can move it to tier 1).
---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 17644448a..7a3380cd8 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -140,7 +140,7 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
 [idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` | @cathaysia
 [idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` | 
 [ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | unstable | `HFIJL` | @yorickpeterse
+[inko](https://github.com/inko-lang/tree-sitter-inko) | unmaintained | `HFIJL` | @yorickpeterse
 [ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` | @fab4100
 [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` | @sogaiu
 [java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` | @p00f
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e1e5cc23c..13b481140 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1041,11 +1041,11 @@ return {
   },
   inko = {
     install_info = {
-      revision = 'fc37d05c363ccf7f515354c5a47d72b2d3ff555e',
+      revision = '9d7ed4f6c0ea2a8f846f3bb00e33ab21ec9ca379',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
-    tier = 2,
+    tier = 3,
   },
   ispc = {
     install_info = {

From 41913a8d448f4f95a7819bfbc90ddf17b97cd84e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 6 Dec 2025 13:54:14 +0100
Subject: [PATCH 2565/2704] feat(bash): update parser

Breaking change: removed double parenthesis as valid opening to
arithmetic expansion. (Only `$((` is allowed according to the manual.)
---
 lua/nvim-treesitter/parsers.lua              | 2 +-
 tests/query/highlights/bash/double-parens.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 13b481140..2791d19a8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -77,7 +77,7 @@ return {
   },
   bash = {
     install_info = {
-      revision = '20f55fb9663568f16ebceaac7673d2aa530add46',
+      revision = 'a06c2e4415e9bc0346c6b86d401879ffb44058f7',
       url = 'https://github.com/tree-sitter/tree-sitter-bash',
     },
     maintainers = { '@TravonteD' },
diff --git a/tests/query/highlights/bash/double-parens.sh b/tests/query/highlights/bash/double-parens.sh
index 8d841d170..7f9209713 100644
--- a/tests/query/highlights/bash/double-parens.sh
+++ b/tests/query/highlights/bash/double-parens.sh
@@ -1,6 +1,6 @@
-if (( $(tree-sitter parse test/Petalisp/**/*.lisp -q | wc -l) > 2 )); then
-#  ^ @punctuation.special
-#                                                                  ^ @punctuation.special
-#                                                           ^ @punctuation.bracket
+if $(( $(tree-sitter parse test/Petalisp/**/*.lisp -q | wc -l) > 2 )); then
+#   ^ @punctuation.special
+#                                                                   ^ @punctuation.special
+#                                                            ^ @punctuation.bracket
    exit 1 
 fi

From d72fa25b545da316cae7e596263656eac7afc2af Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 6 Dec 2025 14:05:46 +0100
Subject: [PATCH 2566/2704] feat(fortran)!: update parser and queries

Breaking change: `(do_loop_statement)` renamed to `(do_loop)`
---
 lua/nvim-treesitter/parsers.lua     | 2 +-
 runtime/queries/fortran/folds.scm   | 2 +-
 runtime/queries/fortran/indents.scm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2791d19a8..304e3a24d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '8334abca785db3a041292e3b3b818a82a55b238f',
+      revision = 'd0d1bc84c43870788c1b402f2e6b490b27257f9e',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
diff --git a/runtime/queries/fortran/folds.scm b/runtime/queries/fortran/folds.scm
index cedbdb635..7b06b1719 100644
--- a/runtime/queries/fortran/folds.scm
+++ b/runtime/queries/fortran/folds.scm
@@ -3,7 +3,7 @@
   (if_statement)
   (where_statement)
   (enum_statement)
-  (do_loop_statement)
+  (do_loop)
   (derived_type_definition)
   (function)
   (subroutine)
diff --git a/runtime/queries/fortran/indents.scm b/runtime/queries/fortran/indents.scm
index 86704c4f4..0f9ba3d7e 100644
--- a/runtime/queries/fortran/indents.scm
+++ b/runtime/queries/fortran/indents.scm
@@ -5,7 +5,7 @@
   (function)
   ; (interface)
   (if_statement)
-  (do_loop_statement)
+  (do_loop)
   (where_statement)
   (derived_type_definition)
   (enum)

From d2350758b39dce3593ffa8b058f863ea4cfa5b0e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 5 Dec 2025 09:59:04 +0100
Subject: [PATCH 2567/2704] feat(parsers)!: remove gitlab-hosted blueprint,
 fusion, jsonc

Problem: Gitlab has too frequent outages, which break automation.

Solution: Drop all Gitlab-hosted parsers (two of which have been
unmaintained for years).
---
 CONTRIBUTING.md                               |   3 +
 SUPPORTED_LANGUAGES.md                        |   3 -
 lua/nvim-treesitter/_meta/parsers.lua         |   2 +-
 lua/nvim-treesitter/parsers.lua               |  25 ----
 runtime/queries/blueprint/highlights.scm      |  75 ----------
 runtime/queries/blueprint/injections.scm      |   2 -
 runtime/queries/fusion/folds.scm              |   6 -
 runtime/queries/fusion/highlights.scm         | 132 ------------------
 runtime/queries/fusion/indents.scm            |  24 ----
 runtime/queries/fusion/injections.scm         |   5 -
 runtime/queries/fusion/locals.scm             |  23 ---
 runtime/queries/jsonc/folds.scm               |   1 -
 runtime/queries/jsonc/highlights.scm          |   3 -
 runtime/queries/jsonc/indents.scm             |   3 -
 runtime/queries/jsonc/injections.scm          |   2 -
 runtime/queries/jsonc/locals.scm              |   1 -
 tests/query/highlights/fusion/afx.fusion      |  17 ---
 tests/query/highlights/fusion/basic.fusion    |  60 --------
 .../highlights/fusion/expressions.fusion      |  82 -----------
 19 files changed, 4 insertions(+), 465 deletions(-)
 delete mode 100644 runtime/queries/blueprint/highlights.scm
 delete mode 100644 runtime/queries/blueprint/injections.scm
 delete mode 100644 runtime/queries/fusion/folds.scm
 delete mode 100644 runtime/queries/fusion/highlights.scm
 delete mode 100644 runtime/queries/fusion/indents.scm
 delete mode 100644 runtime/queries/fusion/injections.scm
 delete mode 100644 runtime/queries/fusion/locals.scm
 delete mode 100644 runtime/queries/jsonc/folds.scm
 delete mode 100644 runtime/queries/jsonc/highlights.scm
 delete mode 100644 runtime/queries/jsonc/indents.scm
 delete mode 100644 runtime/queries/jsonc/injections.scm
 delete mode 100644 runtime/queries/jsonc/locals.scm
 delete mode 100644 tests/query/highlights/fusion/afx.fusion
 delete mode 100644 tests/query/highlights/fusion/basic.fusion
 delete mode 100644 tests/query/highlights/fusion/expressions.fusion

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c4ec8e192..0dc03947b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,6 +42,9 @@ zimbu = {
 >[!IMPORTANT]
 > The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
 
+>[!IMPORTANT]
+> Due to reliability issues with smaller codeforges, only Github-hosted parsers are currently eligible for inclusion. (The development may happen elsewhere, but there must at least exist a Github mirror to pull the source from.) We are monitoring the situation and hope to support more codeforges again in the future.
+
 >[!NOTE]
 > To qualify for Tier 1 ("stable"), a parser needs to
 > * make releases following semver (_patch_ for fixes not affecting queries; _minor_ for changes introducing new nodes or patterns; _major_ for changes removing nodes or previously valid patterns);
diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 7a3380cd8..695171c15 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -28,7 +28,6 @@ Language | Tier | Queries | Maintainer
 [bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` | @amaanq
 [bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
 [blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` | @calebdw
-[blueprint](https://gitlab.com/gabmus/tree-sitter-blueprint) | unstable | `H  J ` | @gabmus
 [bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` | @ambroisie
 [brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` | @ajdelcimmuto
 [c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
@@ -89,7 +88,6 @@ ecma (queries only)[^ecma] | unstable | `HFIJL` | @steelsojka
 [fsh](https://github.com/mgramigna/tree-sitter-fsh) | unstable | `H  J ` | @mgramigna
 [fsharp](https://github.com/ionide/tree-sitter-fsharp) | unstable | `H  J ` | @nsidorenco
 [func](https://github.com/tree-sitter-grammars/tree-sitter-func) | unstable | `H  J ` | @amaanq
-[fusion](https://gitlab.com/jirgn/tree-sitter-fusion) | unstable | `HFIJL` | @jirgn
 [gap](https://github.com/gap-system/tree-sitter-gap)[^gap] | unstable | `HF JL` | @reiniscirpons
 [gaptst](https://github.com/gap-system/tree-sitter-gaptst)[^gaptst] | unstable | `HF J ` | @reiniscirpons
 [gdscript](https://github.com/PrestonKnopp/tree-sitter-gdscript)[^gdscript] | unmaintained | `HFIJL` | 
@@ -152,7 +150,6 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
 [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` | @steelsojka
 [json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFI L` | @steelsojka
 [json5](https://github.com/Joakker/tree-sitter-json5) | unstable | `H  J ` | @Joakker
-[jsonc](https://gitlab.com/WhyNotHugo/tree-sitter-jsonc) | unstable | `HFIJL` | @WhyNotHugo
 [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` | @nawordar
 jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [julia](https://github.com/tree-sitter-grammars/tree-sitter-julia) | unstable | `HFIJL` | @clason
diff --git a/lua/nvim-treesitter/_meta/parsers.lua b/lua/nvim-treesitter/_meta/parsers.lua
index 5af809bb0..3a97b35a5 100644
--- a/lua/nvim-treesitter/_meta/parsers.lua
+++ b/lua/nvim-treesitter/_meta/parsers.lua
@@ -3,7 +3,7 @@ error('Cannot require a meta file')
 
 ---@class InstallInfo
 ---
----URL of parser repo (Github/Gitlab)
+---URL of parser repo (Github)
 ---@field url string
 ---
 ---Commit hash of parser to download (compatible with queries)
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 304e3a24d..1351a00de 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -131,14 +131,6 @@ return {
     maintainers = { '@calebdw' },
     tier = 2,
   },
-  blueprint = {
-    install_info = {
-      revision = '355ef84ef8a958ac822117b652cf4d49bac16c79',
-      url = 'https://gitlab.com/gabmus/tree-sitter-blueprint',
-    },
-    maintainers = { '@gabmus' },
-    tier = 2,
-  },
   bp = {
     install_info = {
       revision = 'ee641d15390183d7535777947ce0f2f1fbcee69f',
@@ -623,14 +615,6 @@ return {
     maintainers = { '@amaanq' },
     tier = 2,
   },
-  fusion = {
-    install_info = {
-      revision = '19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6',
-      url = 'https://gitlab.com/jirgn/tree-sitter-fusion',
-    },
-    maintainers = { '@jirgn' },
-    tier = 2,
-  },
   gap = {
     install_info = {
       revision = '2bac14863b76ad0ff6fd7204c50574732acd66df',
@@ -1142,15 +1126,6 @@ return {
     maintainers = { '@Joakker' },
     tier = 2,
   },
-  jsonc = {
-    install_info = {
-      revision = '02b01653c8a1c198ae7287d566efa86a135b30d5',
-      url = 'https://gitlab.com/WhyNotHugo/tree-sitter-jsonc',
-    },
-    maintainers = { '@WhyNotHugo' },
-    requires = { 'json' },
-    tier = 2,
-  },
   jsonnet = {
     install_info = {
       revision = 'ddd075f1939aed8147b7aa67f042eda3fce22790',
diff --git a/runtime/queries/blueprint/highlights.scm b/runtime/queries/blueprint/highlights.scm
deleted file mode 100644
index f3c39f232..000000000
--- a/runtime/queries/blueprint/highlights.scm
+++ /dev/null
@@ -1,75 +0,0 @@
-(object_id) @variable
-
-(string) @string
-
-(escape_sequence) @string.escape
-
-(comment) @comment @spell
-
-(constant) @constant.builtin
-
-(boolean) @boolean
-
-(using) @keyword.import
-
-(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)
-
-(import_statement
-  (gobject_library) @module)
-
-(import_statement
-  (version_number) @number.float)
-
-(float) @number.float
-
-(number) @number
-
-[
-  ";"
-  "."
-  ","
-] @punctuation.delimiter
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-] @punctuation.bracket
diff --git a/runtime/queries/blueprint/injections.scm b/runtime/queries/blueprint/injections.scm
deleted file mode 100644
index 2f0e58eb6..000000000
--- a/runtime/queries/blueprint/injections.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-((comment) @injection.content
-  (#set! injection.language "comment"))
diff --git a/runtime/queries/fusion/folds.scm b/runtime/queries/fusion/folds.scm
deleted file mode 100644
index 179fc160b..000000000
--- a/runtime/queries/fusion/folds.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  (comment)
-  (block)
-  (afx_comment)
-  (afx_element)
-] @fold
diff --git a/runtime/queries/fusion/highlights.scm b/runtime/queries/fusion/highlights.scm
deleted file mode 100644
index 7108e5705..000000000
--- a/runtime/queries/fusion/highlights.scm
+++ /dev/null
@@ -1,132 +0,0 @@
-(comment) @comment @spell
-
-(afx_comment) @comment @spell
-
-; 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) @spell
-
-; identifiers eel
-(eel_object_path
-  (eel_path_identifier) @variable.builtin
-  (#any-of? @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" @keyword.import
-  (source_file) @string.special.url)
-
-(namespace_declaration
-  "namespace" @keyword.type
-  (alias_namespace) @module)
-
-(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)
-] @module
-
-(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
-  [
-    "?"
-    ":"
-  ] @keyword.conditional.ternary)
diff --git a/runtime/queries/fusion/indents.scm b/runtime/queries/fusion/indents.scm
deleted file mode 100644
index 0ba6cf758..000000000
--- a/runtime/queries/fusion/indents.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-[
-  (block)
-  (value_dsl)
-  (afx_element)
-  (afx_element_self_closing)
-  (eel_array)
-  (eel_object)
-] @indent.begin
-
-(block
-  end: _ @indent.branch)
-
-(value_dsl
-  end: _ @indent.branch)
-
-(eel_array
-  end: _ @indent.branch)
-
-(eel_object
-  end: _ @indent.branch)
-
-(afx_closing_element) @indent.branch
-
-(comment) @indent.ignore
diff --git a/runtime/queries/fusion/injections.scm b/runtime/queries/fusion/injections.scm
deleted file mode 100644
index 085cdb458..000000000
--- a/runtime/queries/fusion/injections.scm
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-  (comment)
-  (afx_comment)
-] @injection.content
-  (#set! injection.language "comment"))
diff --git a/runtime/queries/fusion/locals.scm b/runtime/queries/fusion/locals.scm
deleted file mode 100644
index d23e0ab46..000000000
--- a/runtime/queries/fusion/locals.scm
+++ /dev/null
@@ -1,23 +0,0 @@
-; Fusion base
-(block) @local.scope
-
-(namespace_declaration
-  (alias_namespace) @local.definition.namespace)
-
-(property
-  (path
-    (path_part) @local.definition.field))
-
-(type
-  namespace: (package_name)? @local.definition.namespace
-  name: (type_name) @local.definition.type)
-
-; Eel Expressions
-(eel_arrow_function) @local.scope
-
-(eel_object) @local.scope
-
-(eel_parameter) @local.definition.parameter
-
-(eel_object_pair
-  key: (eel_property_name) @local.definition.field)
diff --git a/runtime/queries/jsonc/folds.scm b/runtime/queries/jsonc/folds.scm
deleted file mode 100644
index 41269219e..000000000
--- a/runtime/queries/jsonc/folds.scm
+++ /dev/null
@@ -1 +0,0 @@
-; inherits: json
diff --git a/runtime/queries/jsonc/highlights.scm b/runtime/queries/jsonc/highlights.scm
deleted file mode 100644
index e50112155..000000000
--- a/runtime/queries/jsonc/highlights.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-; inherits: json
-
-(comment) @comment @spell
diff --git a/runtime/queries/jsonc/indents.scm b/runtime/queries/jsonc/indents.scm
deleted file mode 100644
index 3b01ca999..000000000
--- a/runtime/queries/jsonc/indents.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-; inherits: json
-
-(comment) @indent.ignore
diff --git a/runtime/queries/jsonc/injections.scm b/runtime/queries/jsonc/injections.scm
deleted file mode 100644
index 2f0e58eb6..000000000
--- a/runtime/queries/jsonc/injections.scm
+++ /dev/null
@@ -1,2 +0,0 @@
-((comment) @injection.content
-  (#set! injection.language "comment"))
diff --git a/runtime/queries/jsonc/locals.scm b/runtime/queries/jsonc/locals.scm
deleted file mode 100644
index 41269219e..000000000
--- a/runtime/queries/jsonc/locals.scm
+++ /dev/null
@@ -1 +0,0 @@
-; inherits: json
diff --git a/tests/query/highlights/fusion/afx.fusion b/tests/query/highlights/fusion/afx.fusion
deleted file mode 100644
index 4ccb8174f..000000000
--- a/tests/query/highlights/fusion/afx.fusion
+++ /dev/null
@@ -1,17 +0,0 @@
-property = afx`
-  <!-- some comment -->
-<!--   ^@comment -->
-
-  <div attribute="value">text</div>
-<!-- ^@tag -->
-<!--   ^@tag.attribute -->
-<!--              ^@string -->
-<!--                         ^@punctuation.bracket -->
-<!--                           ^@tag -->
-
-  <Namespace:Type {...spread} some={(a) => true} />
-<!-- ^@tag -->
-<!--                  ^@variable -->
-<!--                                 ^@variable -->
-<!--                                        ^@boolean -->
-`
diff --git a/tests/query/highlights/fusion/basic.fusion b/tests/query/highlights/fusion/basic.fusion
deleted file mode 100644
index 5f3cc346a..000000000
--- a/tests/query/highlights/fusion/basic.fusion
+++ /dev/null
@@ -1,60 +0,0 @@
-include: SomeFile.fusion
-//<- @keyword.import
-//       ^ @string.special.url
-
-namespace: ns = Neos.Fusion.Space
-//<- @keyword.type
-//         ^ @module
-//            ^ @operator
-//              ^ @module
-
-prototype(MyType) < prototype(ns:SuperType) {
-//<-keyword
-//       ^ @punctuation.bracket
-//        ^ @type
-//              ^ @punctuation.bracket
-//                ^ @operator
-//                            ^ @module
-//                                ^ @type
-
-  deleteProp >
-  //         ^ @operator
-
-  string = 'value'
-  //<- @property
-  //     ^ @operator
-  //        ^ @string
-
-  number = 10.2
-  //       ^ @number
-
-  null = null
-  //     ^ @constant.builtin
-
-  boolean = true
-  //        ^ @boolean
-
-  property.inner = "value"
-  //<- @property
-  //       ^ @property
-
-  property.@meta = "value"
-  //<- @property
-  //       ^ @attribute
-
-  property.type = SomeType
-  //<- @property
-  //              ^ @type
-
-  property.aliasedType = ns:SomeType
-  //<- @property
-  //                     ^ @module
-  //                        ^ @type
-
-  property.fullQualifiedType = SomeNamespace:SomeType
-  //<- @property
-  //                           ^ @module
-  //                                         ^ @type
-
-}
-
diff --git a/tests/query/highlights/fusion/expressions.fusion b/tests/query/highlights/fusion/expressions.fusion
deleted file mode 100644
index b1822dda8..000000000
--- a/tests/query/highlights/fusion/expressions.fusion
+++ /dev/null
@@ -1,82 +0,0 @@
-string = ${'foo'}
-//          ^string
-
-string = ${'foo \'bar\' baz'}
-//                ^string
-
-string = ${"foo"}
-//          ^string
-
-string = ${"foo ${test}"}
-//               ^string
-
-boolean = ${true}
-//          ^boolean
-
-number = ${1}
-//         ^number
-
-number = ${1.2}
-//         ^number
-
-propertyPath = ${property.path}
-//               ^variable
-//                        ^variable
-
-thisorProps = ${this.path}
-//              ^variable.builtin
-//                   ^variable
-
-thisorProps = ${props.path}
-//              ^variable.builtin
-//                    ^variable
-
-array = ${[]}
-//        ^punctuation.bracket
-
-array = ${[true, 'string', 1, [true]]}
-//        ^punctuation.bracket
-//         ^boolean
-//                ^string
-//                         ^number
-//                            ^punctuation.bracket
-//                             ^boolean
-
-object = ${{}}
-//         ^punctuation.bracket
-
-object = ${{first: 'value', second: true, third: [], fourth: object.path }}
-//          ^property
-//                  ^string
-//                          ^property
-//                                  ^boolean
-//                                        ^property
-//                                               ^punctuation.bracket
-//                                                   ^property
-//                                                                  ^variable
-
-result = ${methodCall()}
-//         ^function
-
-result = ${Some.methodCall(param, param)}
-//              ^function
-//                         ^variable
-//                                ^variable
-
-arrowFunction =  ${map(foo, (bar, buz) => bar * buz)}
-//                 ^function
-//                           ^variable
-//                                ^variable
-
-logic = ${!foo && !(bar || baz) and not 'string'}
-//        ^operator
-//             ^operator
-//                ^operator
-//                      ^operator
-//                              ^operator
-
-ternary = ${ check ? true : false}
-//                 ^@keyword.conditional.ternary
-//                        ^@keyword.conditional.ternary
-
-

From 9d47b2558b29fc8c0bce5f54b8424c5f8e2c80c7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 6 Dec 2025 11:12:18 +0100
Subject: [PATCH 2568/2704] feat(json): add support for jsonc files

---
 SUPPORTED_LANGUAGES.md              | 2 +-
 plugin/filetypes.lua                | 1 +
 runtime/queries/json/highlights.scm | 2 ++
 runtime/queries/json/indents.scm    | 2 ++
 runtime/queries/json/injections.scm | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/json/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 695171c15..0000baa6d 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -148,7 +148,7 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
 [jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` | @cathaysia
 [jq](https://github.com/flurie/tree-sitter-jq) | unstable | `H  JL` | @ObserverOfTime
 [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` | @steelsojka
-[json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFI L` | @steelsojka
+[json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFIJL` | @steelsojka
 [json5](https://github.com/Joakker/tree-sitter-json5) | unstable | `H  J ` | @Joakker
 [jsonnet](https://github.com/sourcegraph/tree-sitter-jsonnet) | unstable | `HF JL` | @nawordar
 jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index 5e23adffd..7759c1f5c 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -24,6 +24,7 @@ local filetypes = {
   ini = { 'confini', 'dosini' },
   janet_simple = { 'janet' },
   javascript = { 'javascriptreact', 'ecma', 'ecmascript', 'jsx', 'js' },
+  json = { 'jsonc' },
   glimmer_javascript = { 'javascript.glimmer' },
   latex = { 'tex' },
   linkerscript = { 'ld' },
diff --git a/runtime/queries/json/highlights.scm b/runtime/queries/json/highlights.scm
index 85915285a..61f087166 100644
--- a/runtime/queries/json/highlights.scm
+++ b/runtime/queries/json/highlights.scm
@@ -36,3 +36,5 @@
 ((escape_sequence) @conceal
   (#eq? @conceal "\\\"")
   (#set! conceal "\""))
+
+(comment) @comment @spell
diff --git a/runtime/queries/json/indents.scm b/runtime/queries/json/indents.scm
index 8274ee3d5..3680289bd 100644
--- a/runtime/queries/json/indents.scm
+++ b/runtime/queries/json/indents.scm
@@ -7,3 +7,5 @@
   "}"
   "]"
 ] @indent.branch
+
+(comment) @indent.ignore
diff --git a/runtime/queries/json/injections.scm b/runtime/queries/json/injections.scm
new file mode 100644
index 000000000..2f0e58eb6
--- /dev/null
+++ b/runtime/queries/json/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))

From 20db421f5fba0c23f6a7629af96ba6d4fc531677 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorick@yorickpeterse.com>
Date: Sat, 6 Dec 2025 22:38:22 +0100
Subject: [PATCH 2569/2704] feat(inko): update to v0.4.0 (#8327)

This changes the structure of "if" expressions so the queries for
nvim-treesitter-textobjects can be changed as to not cause any crashes.
---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 0000baa6d..b2c006f84 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -138,7 +138,7 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
 [idl](https://github.com/cathaysia/tree-sitter-idl) | unstable | `H IJ ` | @cathaysia
 [idris](https://github.com/kayhide/tree-sitter-idris) | unstable | `HF JL` | 
 [ini](https://github.com/justinmk/tree-sitter-ini) | unstable | `HF J ` | @theHamsta
-[inko](https://github.com/inko-lang/tree-sitter-inko) | unmaintained | `HFIJL` | @yorickpeterse
+[inko](https://github.com/inko-lang/tree-sitter-inko) | stable | `HFIJL` | @yorickpeterse
 [ispc](https://github.com/tree-sitter-grammars/tree-sitter-ispc) | unstable | `HFIJL` | @fab4100
 [janet_simple](https://github.com/sogaiu/tree-sitter-janet-simple) | unstable | `HF JL` | @sogaiu
 [java](https://github.com/tree-sitter/tree-sitter-java) | unstable | `HFIJL` | @p00f
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1351a00de..49f16187b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1025,11 +1025,11 @@ return {
   },
   inko = {
     install_info = {
-      revision = '9d7ed4f6c0ea2a8f846f3bb00e33ab21ec9ca379',
+      revision = 'v0.4.0',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },
-    tier = 3,
+    tier = 1,
   },
   ispc = {
     install_info = {

From bfc6c995404def9b01055df90f016d1a3be17ce5 Mon Sep 17 00:00:00 2001
From: Cameron <Alleyria@gmail.com>
Date: Mon, 8 Dec 2025 11:27:09 +0100
Subject: [PATCH 2570/2704] fix(ruby): highlighting for string-literal symbols
 (#8317)

---
 runtime/queries/ruby/highlights.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/ruby/highlights.scm b/runtime/queries/ruby/highlights.scm
index a1a2c250d..0472df092 100644
--- a/runtime/queries/ruby/highlights.scm
+++ b/runtime/queries/ruby/highlights.scm
@@ -186,10 +186,14 @@
 [
   (bare_symbol)
   (simple_symbol)
-  (delimited_symbol)
   (hash_key_symbol)
 ] @string.special.symbol
 
+(delimited_symbol
+  ":\"" @string.special.symbol
+  (string_content) @string.special.symbol
+  "\"" @string.special.symbol)
+
 (regex
   (string_content) @string.regexp)
 

From 93537d699851b35ae8518af17ee858981f5ea6ea Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 8 Dec 2025 03:37:42 -0800
Subject: [PATCH 2571/2704] feat(bash): remove unnecessary captures

- Bash does not have boolean values and the builtin `true`
  and `false` commands are already covered by another capture.
- The grammar has a `number` node and it's already captured.
---
 runtime/queries/bash/highlights.scm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
index 6fe370011..118ca6bd2 100644
--- a/runtime/queries/bash/highlights.scm
+++ b/runtime/queries/bash/highlights.scm
@@ -117,9 +117,6 @@
     "SIGRTMAX-12" "SIGRTMAX-11" "SIGRTMAX-10" "SIGRTMAX-9" "SIGRTMAX-8" "SIGRTMAX-7" "SIGRTMAX-6"
     "SIGRTMAX-5" "SIGRTMAX-4" "SIGRTMAX-3" "SIGRTMAX-2" "SIGRTMAX-1" "SIGRTMAX"))
 
-((word) @boolean
-  (#any-of? @boolean "true" "false"))
-
 (comment) @comment @spell
 
 (test_operator) @operator
@@ -190,9 +187,6 @@
 
 (number) @number
 
-((word) @number
-  (#lua-match? @number "^[0-9]+$"))
-
 (file_redirect
   (word) @string.special.path)
 

From f47f549f74cea5d5f25a5205c9e127cd882f1d20 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 8 Dec 2025 01:09:27 -0800
Subject: [PATCH 2572/2704] feat(bash): highlight arguments of trap and kill
 builtin commands

---
 runtime/queries/bash/highlights.scm | 36 +++++++++++++++++++----------
 runtime/queries/bash/injections.scm | 12 ++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
index 118ca6bd2..69bfaad1a 100644
--- a/runtime/queries/bash/highlights.scm
+++ b/runtime/queries/bash/highlights.scm
@@ -105,18 +105,6 @@
 
 (special_variable_name) @constant
 
-; trap -l
-((word) @constant.builtin
-  (#any-of? @constant.builtin
-    "SIGHUP" "SIGINT" "SIGQUIT" "SIGILL" "SIGTRAP" "SIGABRT" "SIGBUS" "SIGFPE" "SIGKILL" "SIGUSR1"
-    "SIGSEGV" "SIGUSR2" "SIGPIPE" "SIGALRM" "SIGTERM" "SIGSTKFLT" "SIGCHLD" "SIGCONT" "SIGSTOP"
-    "SIGTSTP" "SIGTTIN" "SIGTTOU" "SIGURG" "SIGXCPU" "SIGXFSZ" "SIGVTALRM" "SIGPROF" "SIGWINCH"
-    "SIGIO" "SIGPWR" "SIGSYS" "SIGRTMIN" "SIGRTMIN+1" "SIGRTMIN+2" "SIGRTMIN+3" "SIGRTMIN+4"
-    "SIGRTMIN+5" "SIGRTMIN+6" "SIGRTMIN+7" "SIGRTMIN+8" "SIGRTMIN+9" "SIGRTMIN+10" "SIGRTMIN+11"
-    "SIGRTMIN+12" "SIGRTMIN+13" "SIGRTMIN+14" "SIGRTMIN+15" "SIGRTMAX-14" "SIGRTMAX-13"
-    "SIGRTMAX-12" "SIGRTMAX-11" "SIGRTMAX-10" "SIGRTMAX-9" "SIGRTMAX-8" "SIGRTMAX-7" "SIGRTMAX-6"
-    "SIGRTMAX-5" "SIGRTMAX-4" "SIGRTMAX-3" "SIGRTMAX-2" "SIGRTMAX-1" "SIGRTMAX"))
-
 (comment) @comment @spell
 
 (test_operator) @operator
@@ -179,6 +167,30 @@
       (word) @variable.parameter)
   ])
 
+; help trap
+(command
+  name: (command_name
+    (word) @_command)
+  argument: (word) @string.special
+  (#eq? @_command "trap")
+  (#any-of? @string.special "EXIT" "DEBUG" "RETURN" "ERR"))
+
+; trap -l
+(command
+  name: (command_name
+    (word) @_command)
+  argument: (word) @string.special
+  (#any-of? @_command "trap" "kill")
+  (#any-of? @string.special
+    "SIGHUP" "SIGINT" "SIGQUIT" "SIGILL" "SIGTRAP" "SIGABRT" "SIGBUS" "SIGFPE" "SIGKILL" "SIGUSR1"
+    "SIGSEGV" "SIGUSR2" "SIGPIPE" "SIGALRM" "SIGTERM" "SIGSTKFLT" "SIGCHLD" "SIGCONT" "SIGSTOP"
+    "SIGTSTP" "SIGTTIN" "SIGTTOU" "SIGURG" "SIGXCPU" "SIGXFSZ" "SIGVTALRM" "SIGPROF" "SIGWINCH"
+    "SIGIO" "SIGPWR" "SIGSYS" "SIGRTMIN" "SIGRTMIN+1" "SIGRTMIN+2" "SIGRTMIN+3" "SIGRTMIN+4"
+    "SIGRTMIN+5" "SIGRTMIN+6" "SIGRTMIN+7" "SIGRTMIN+8" "SIGRTMIN+9" "SIGRTMIN+10" "SIGRTMIN+11"
+    "SIGRTMIN+12" "SIGRTMIN+13" "SIGRTMIN+14" "SIGRTMIN+15" "SIGRTMAX-14" "SIGRTMAX-13"
+    "SIGRTMAX-12" "SIGRTMAX-11" "SIGRTMAX-10" "SIGRTMAX-9" "SIGRTMAX-8" "SIGRTMAX-7" "SIGRTMAX-6"
+    "SIGRTMAX-5" "SIGRTMAX-4" "SIGRTMAX-3" "SIGRTMAX-2" "SIGRTMAX-1" "SIGRTMAX"))
+
 (declaration_command
   (word) @variable.parameter)
 
diff --git a/runtime/queries/bash/injections.scm b/runtime/queries/bash/injections.scm
index e1095773b..5b7e06bac 100644
--- a/runtime/queries/bash/injections.scm
+++ b/runtime/queries/bash/injections.scm
@@ -76,3 +76,15 @@
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children)
   (#set! injection.language "readline"))
+
+((command
+  name: (command_name) @_command
+  .
+  argument: [
+    (string)
+    (raw_string)
+  ] @injection.content)
+  (#eq? @_command "trap")
+  (#offset! @injection.content 0 1 0 -1)
+  (#set! injection.include-children)
+  (#set! injection.self))

From a98a740c555f97924d069df8c67408d1146ebd13 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 9 Dec 2025 10:11:54 +0100
Subject: [PATCH 2573/2704] feat(parsers): update brightscript, desktop,
 gotmpl, helm, ini, javadoc, mlir, nu, powershell, slint, vimdoc, xresources

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 49f16187b..0f9fc5057 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -142,7 +142,7 @@ return {
   },
   brightscript = {
     install_info = {
-      revision = '55168264ea174085d2e91377a33f216190df2f51',
+      revision = '253fdfaa23814cb46c2d5fc19049fa0f2f62c6da',
       url = 'https://github.com/ajdelcimmuto/tree-sitter-brightscript',
     },
     maintainers = { '@ajdelcimmuto' },
@@ -338,7 +338,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'f5709fd5297676875aa6d636e52cff7039573cb0',
+      revision = 'bbcedf9a11cb6c5f7cd8fcc041301aa0c204bfc0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -794,7 +794,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = '9e54fa38db26c556c2669492063324ef481c9d43',
+      revision = '226692db9da6cb9939284b1ed263a0fb82d26768',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -906,7 +906,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = '9e54fa38db26c556c2669492063324ef481c9d43',
+      revision = '226692db9da6cb9939284b1ed263a0fb82d26768',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -1017,7 +1017,7 @@ return {
   },
   ini = {
     install_info = {
-      revision = 'bea223734aa9cea2c8793bf9098bd7fdef912f57',
+      revision = 'e4018b5176132b4f3c5d6e61cea383f42288d0f5',
       url = 'https://github.com/justinmk/tree-sitter-ini',
     },
     maintainers = { '@theHamsta' },
@@ -1058,7 +1058,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '2533affe83e57df9b0dbf7350cd73a84af9811b3',
+      revision = '5c6157fe1c44e843f739e11b41c48c5918ec8709',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1381,7 +1381,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '834a0b01e98eaf4313dfd48778e20bef1738ff8f',
+      revision = '1f76a88b79e70222968a9f8185992c9bb5ddacf0',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1461,7 +1461,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '47d4b4f5369c0cae866724758ae88ef07e10e4f1',
+      revision = '64ba3f8f5f9c8bd21a79341f0957b453303a98b8',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1635,7 +1635,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '17f0c1a6514d3b46e64df7b88f464c0bd85078a6',
+      revision = '7212f47716ced384ac012b2cc428fd9f52f7c5d4',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -2031,7 +2031,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '927f3e2f0213d0eea7f12c978c81067c3dc4289d',
+      revision = 'f2e4e5a7bccb177562de8f5b4fe49a5531c9f7ca',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2528,7 +2528,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = '5cb043a38ff04cadb6b8e6688aabbf34edd0c3e3',
+      revision = '570dc10aed5963546322e6c935e1125b9fd747bf',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2612,7 +2612,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'a96227aaa37e5f8e1a5888bfac2dcb31ad0bf1f1',
+      revision = '68240ae1beef503cfe0d1bc40f25b0fab71df8f5',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 02693ce64c87e43eaa0e11e907116b2190217d07 Mon Sep 17 00:00:00 2001
From: adaitche <anton@daitche.org>
Date: Tue, 9 Dec 2025 10:53:37 +0100
Subject: [PATCH 2574/2704] feat(sql): improve `@type` capture (#8315)

Problem: `@type` currently captures function calls but fails to
capture CTE names.

Solution: Don't capture types in invocations. Add pattern for `cte`.
---
 runtime/queries/sql/highlights.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/sql/highlights.scm b/runtime/queries/sql/highlights.scm
index b3a0c71c6..7a201a026 100644
--- a/runtime/queries/sql/highlights.scm
+++ b/runtime/queries/sql/highlights.scm
@@ -13,8 +13,12 @@
   (keyword_object_id)
 ] @function.call
 
-(object_reference
-  name: (identifier) @type)
+((object_reference
+  name: (identifier) @type) @_obj_ref
+  (#not-has-parent? @_obj_ref invocation))
+
+(cte
+  (identifier) @type)
 
 (relation
   alias: (identifier) @variable)

From 186810d6adccccc9503785533ab569e3e63d5b37 Mon Sep 17 00:00:00 2001
From: Riad <rrddrose@gmail.com>
Date: Mon, 8 Dec 2025 05:21:28 +0100
Subject: [PATCH 2575/2704] feat(gdscript): update builtin highlights

Added all builtin annotations, constants, methods
and types as of godot commit : 10c7cb8
---
 runtime/queries/gdscript/highlights.scm | 331 +++++++++++++++++++-----
 1 file changed, 270 insertions(+), 61 deletions(-)

diff --git a/runtime/queries/gdscript/highlights.scm b/runtime/queries/gdscript/highlights.scm
index 3885d0068..737453059 100644
--- a/runtime/queries/gdscript/highlights.scm
+++ b/runtime/queries/gdscript/highlights.scm
@@ -248,34 +248,241 @@
 
 ; Builtins
 ; generated from
-; - godot commit: fb10e67fef
-; - https://github.com/godotengine/godot/blob/fb10e67fef/doc/classes
-; - https://github.com/godotengine/godot/blob/fb10e67fef/doc/classes/@GlobalScope.xml
-; - https://github.com/godotengine/godot/blob/fb10e67fef/modules/gdscript/doc_classes/@GDScript.xml
+; - godot commit: 10c7cb8
+; - https://github.com/godotengine/godot/blob/10c7cb878a/doc/classes
+; - https://github.com/godotengine/godot/blob/10c7cb878a/doc/classes/@GlobalScope.xml
+; - https://github.com/godotengine/godot/blob/10c7cb878a/modules/gdscript/doc_classes/@GDScript.xml
 ; Built-in Annotations
 ((annotation
   "@" @attribute
   (identifier) @attribute)
   (#any-of? @attribute
     ; from modules/gdscript/doc_classes/@GDScript.xml
-    "export" "export_category" "export_color_no_alpha" "export_custom" "export_dir" "export_enum"
-    "export_exp_easing" "export_file" "export_flags" "export_flags_2d_navigation"
-    "export_flags_2d_physics" "export_flags_2d_render" "export_flags_3d_navigation"
-    "export_flags_3d_physics" "export_flags_3d_render" "export_flags_avoidance" "export_global_dir"
-    "export_global_file" "export_group" "export_multiline" "export_node_path" "export_placeholder"
-    "export_range" "export_storage" "export_subgroup" "icon" "onready" "rpc" "static_unload" "tool"
-    "warning_ignore"))
+    "abstract" "export" "export_category" "export_color_no_alpha" "export_custom" "export_dir"
+    "export_enum" "export_exp_easing" "export_file" "export_file_path" "export_flags"
+    "export_flags_2d_navigation" "export_flags_2d_physics" "export_flags_2d_render"
+    "export_flags_3d_navigation" "export_flags_3d_physics" "export_flags_3d_render"
+    "export_flags_avoidance" "export_global_dir" "export_global_file" "export_group"
+    "export_multiline" "export_node_path" "export_placeholder" "export_range" "export_storage"
+    "export_subgroup" "export_tool_button" "icon" "onready" "rpc" "static_unload" "tool"
+    "warning_ignore" "warning_ignore_restore" "warning_ignore_start"))
 
 ; Builtin Types
 ((identifier) @type.builtin
   (#any-of? @type.builtin
     ; from doc/classes/*.xml
-    "AABB" "Array" "Basis" "Callable" "Color" "Dictionary" "NodePath" "PackedByteArray"
-    "PackedColorArray" "PackedFloat32Array" "PackedFloat64Array" "PackedInt32Array"
-    "PackedInt64Array" "PackedStringArray" "PackedVector2Array" "PackedVector3Array" "Plane"
-    "Projection" "Quaternion" "RID" "Rect2" "Rect2i" "Signal" "String" "StringName" "Transform2D"
-    "Transform3D" "Vector2" "Vector2i" "Vector3" "Vector3i" "Vector4" "Vector4i" "bool" "float"
-    "int"
+    "AABB" "AESContext" "AStar2D" "AStar3D" "AStarGrid2D" "AcceptDialog" "AimModifier3D"
+    "AnimatableBody2D" "AnimatableBody3D" "AnimatedSprite2D" "AnimatedSprite3D" "AnimatedTexture"
+    "Animation" "AnimationLibrary" "AnimationMixer" "AnimationNode" "AnimationNodeAdd2"
+    "AnimationNodeAdd3" "AnimationNodeAnimation" "AnimationNodeBlend2" "AnimationNodeBlend3"
+    "AnimationNodeBlendSpace1D" "AnimationNodeBlendSpace2D" "AnimationNodeBlendTree"
+    "AnimationNodeExtension" "AnimationNodeOneShot" "AnimationNodeOutput"
+    "AnimationNodeStateMachine" "AnimationNodeStateMachinePlayback"
+    "AnimationNodeStateMachineTransition" "AnimationNodeSub2" "AnimationNodeSync"
+    "AnimationNodeTimeScale" "AnimationNodeTimeSeek" "AnimationNodeTransition" "AnimationPlayer"
+    "AnimationRootNode" "AnimationTree" "Area2D" "Area3D" "Array" "ArrayMesh" "ArrayOccluder3D"
+    "AspectRatioContainer" "AtlasTexture" "AudioBusLayout" "AudioEffect" "AudioEffectAmplify"
+    "AudioEffectBandLimitFilter" "AudioEffectBandPassFilter" "AudioEffectCapture"
+    "AudioEffectChorus" "AudioEffectCompressor" "AudioEffectDelay" "AudioEffectDistortion"
+    "AudioEffectEQ" "AudioEffectEQ10" "AudioEffectEQ21" "AudioEffectEQ6" "AudioEffectFilter"
+    "AudioEffectHardLimiter" "AudioEffectHighPassFilter" "AudioEffectHighShelfFilter"
+    "AudioEffectInstance" "AudioEffectLimiter" "AudioEffectLowPassFilter"
+    "AudioEffectLowShelfFilter" "AudioEffectNotchFilter" "AudioEffectPanner" "AudioEffectPhaser"
+    "AudioEffectPitchShift" "AudioEffectRecord" "AudioEffectReverb" "AudioEffectSpectrumAnalyzer"
+    "AudioEffectSpectrumAnalyzerInstance" "AudioEffectStereoEnhance" "AudioListener2D"
+    "AudioListener3D" "AudioSample" "AudioSamplePlayback" "AudioServer" "AudioStream"
+    "AudioStreamGenerator" "AudioStreamGeneratorPlayback" "AudioStreamMicrophone"
+    "AudioStreamPlayback" "AudioStreamPlaybackPolyphonic" "AudioStreamPlaybackResampled"
+    "AudioStreamPlayer" "AudioStreamPlayer2D" "AudioStreamPlayer3D" "AudioStreamPolyphonic"
+    "AudioStreamRandomizer" "AudioStreamWAV" "BackBufferCopy" "BaseButton" "BaseMaterial3D" "Basis"
+    "BitMap" "Bone2D" "BoneAttachment3D" "BoneConstraint3D" "BoneMap" "BoneTwistDisperser3D"
+    "BoxContainer" "BoxMesh" "BoxOccluder3D" "BoxShape3D" "Button" "ButtonGroup" "CCDIK3D"
+    "CPUParticles2D" "CPUParticles3D" "Callable" "CallbackTweener" "Camera2D" "Camera3D"
+    "CameraAttributes" "CameraAttributesPhysical" "CameraAttributesPractical" "CameraFeed"
+    "CameraServer" "CameraTexture" "CanvasGroup" "CanvasItem" "CanvasItemMaterial" "CanvasLayer"
+    "CanvasModulate" "CanvasTexture" "CapsuleMesh" "CapsuleShape2D" "CapsuleShape3D"
+    "CenterContainer" "ChainIK3D" "CharFXTransform" "CharacterBody2D" "CharacterBody3D" "CheckBox"
+    "CheckButton" "CircleShape2D" "ClassDB" "CodeEdit" "CodeHighlighter" "CollisionObject2D"
+    "CollisionObject3D" "CollisionPolygon2D" "CollisionPolygon3D" "CollisionShape2D"
+    "CollisionShape3D" "Color" "ColorPalette" "ColorPicker" "ColorPickerButton" "ColorRect"
+    "Compositor" "CompositorEffect" "CompressedCubemap" "CompressedCubemapArray"
+    "CompressedTexture2D" "CompressedTexture2DArray" "CompressedTexture3D"
+    "CompressedTextureLayered" "ConcavePolygonShape2D" "ConcavePolygonShape3D" "ConeTwistJoint3D"
+    "ConfigFile" "ConfirmationDialog" "Container" "Control" "ConvertTransformModifier3D"
+    "ConvexPolygonShape2D" "ConvexPolygonShape3D" "CopyTransformModifier3D" "Crypto" "CryptoKey"
+    "Cubemap" "CubemapArray" "Curve" "Curve2D" "Curve3D" "CurveTexture" "CurveXYZTexture"
+    "CylinderMesh" "CylinderShape3D" "DPITexture" "DTLSServer" "DampedSpringJoint2D" "Decal"
+    "Dictionary" "DirAccess" "DirectionalLight2D" "DirectionalLight3D" "DisplayServer"
+    "EditorCommandPalette" "EditorContextMenuPlugin" "EditorDebuggerPlugin" "EditorDebuggerSession"
+    "EditorDock" "EditorExportPlatform" "EditorExportPlatformAppleEmbedded"
+    "EditorExportPlatformExtension" "EditorExportPlatformPC" "EditorExportPlugin"
+    "EditorExportPreset" "EditorFeatureProfile" "EditorFileDialog" "EditorFileSystem"
+    "EditorFileSystemDirectory" "EditorFileSystemImportFormatSupportQuery" "EditorImportPlugin"
+    "EditorInspector" "EditorInspectorPlugin" "EditorInterface" "EditorNode3DGizmo"
+    "EditorNode3DGizmoPlugin" "EditorPaths" "EditorPlugin" "EditorProperty"
+    "EditorResourceConversionPlugin" "EditorResourcePicker" "EditorResourcePreview"
+    "EditorResourcePreviewGenerator" "EditorResourceTooltipPlugin" "EditorSceneFormatImporter"
+    "EditorScenePostImport" "EditorScenePostImportPlugin" "EditorScript" "EditorScriptPicker"
+    "EditorSelection" "EditorSettings" "EditorSpinSlider" "EditorSyntaxHighlighter" "EditorToaster"
+    "EditorTranslationParserPlugin" "EditorUndoRedoManager" "EditorVCSInterface" "EncodedObjectAsID"
+    "Engine" "EngineDebugger" "EngineProfiler" "Environment" "Expression" "ExternalTexture"
+    "FABRIK3D" "FileAccess" "FileDialog" "FileSystemDock" "FlowContainer" "FogMaterial" "FogVolume"
+    "FoldableContainer" "FoldableGroup" "Font" "FontFile" "FontVariation" "FramebufferCacheRD"
+    "GDExtension" "GDExtensionManager" "GPUParticles2D" "GPUParticles3D" "GPUParticlesAttractor3D"
+    "GPUParticlesAttractorBox3D" "GPUParticlesAttractorSphere3D"
+    "GPUParticlesAttractorVectorField3D" "GPUParticlesCollision3D" "GPUParticlesCollisionBox3D"
+    "GPUParticlesCollisionHeightField3D" "GPUParticlesCollisionSDF3D"
+    "GPUParticlesCollisionSphere3D" "Generic6DOFJoint3D" "Geometry2D" "Geometry3D"
+    "GeometryInstance3D" "GodotInstance" "Gradient" "GradientTexture1D" "GradientTexture2D"
+    "GraphEdit" "GraphElement" "GraphFrame" "GraphNode" "GridContainer" "GrooveJoint2D"
+    "HBoxContainer" "HFlowContainer" "HMACContext" "HScrollBar" "HSeparator" "HSlider"
+    "HSplitContainer" "HTTPClient" "HTTPRequest" "HashingContext" "HeightMapShape3D" "HingeJoint3D"
+    "IKModifier3D" "IP" "Image" "ImageFormatLoader" "ImageFormatLoaderExtension" "ImageTexture"
+    "ImageTexture3D" "ImageTextureLayered" "ImmediateMesh" "ImporterMesh" "ImporterMeshInstance3D"
+    "Input" "InputEvent" "InputEventAction" "InputEventFromWindow" "InputEventGesture"
+    "InputEventJoypadButton" "InputEventJoypadMotion" "InputEventKey" "InputEventMIDI"
+    "InputEventMagnifyGesture" "InputEventMouse" "InputEventMouseButton" "InputEventMouseMotion"
+    "InputEventPanGesture" "InputEventScreenDrag" "InputEventScreenTouch" "InputEventShortcut"
+    "InputEventWithModifiers" "InputMap" "InstancePlaceholder" "IntervalTweener" "ItemList"
+    "IterateIK3D" "JNISingleton" "JSON" "JSONRPC" "JacobianIK3D" "JavaClass" "JavaClassWrapper"
+    "JavaObject" "JavaScriptBridge" "JavaScriptObject" "Joint2D" "Joint3D" "JointLimitation3D"
+    "JointLimitationCone3D" "KinematicCollision2D" "KinematicCollision3D" "Label" "Label3D"
+    "LabelSettings" "Light2D" "Light3D" "LightOccluder2D" "LightmapGI" "LightmapGIData"
+    "LightmapProbe" "Lightmapper" "LightmapperRD" "LimitAngularVelocityModifier3D" "Line2D"
+    "LineEdit" "LinkButton" "Logger" "LookAtModifier3D" "MainLoop" "MarginContainer" "Marker2D"
+    "Marker3D" "Marshalls" "Material" "MenuBar" "MenuButton" "Mesh"
+    "MeshConvexDecompositionSettings" "MeshDataTool" "MeshInstance2D" "MeshInstance3D" "MeshLibrary"
+    "MeshTexture" "MethodTweener" "MissingNode" "MissingResource" "ModifierBoneTarget3D"
+    "MovieWriter" "MultiMesh" "MultiMeshInstance2D" "MultiMeshInstance3D" "MultiplayerAPI"
+    "MultiplayerAPIExtension" "MultiplayerPeer" "MultiplayerPeerExtension" "Mutex" "NativeMenu"
+    "NavigationAgent2D" "NavigationAgent3D" "NavigationLink2D" "NavigationLink3D" "NavigationMesh"
+    "NavigationMeshGenerator" "NavigationMeshSourceGeometryData2D"
+    "NavigationMeshSourceGeometryData3D" "NavigationObstacle2D" "NavigationObstacle3D"
+    "NavigationPathQueryParameters2D" "NavigationPathQueryParameters3D"
+    "NavigationPathQueryResult2D" "NavigationPathQueryResult3D" "NavigationPolygon"
+    "NavigationRegion2D" "NavigationRegion3D" "NavigationServer2D" "NavigationServer2DManager"
+    "NavigationServer3D" "NavigationServer3DManager" "NinePatchRect" "Node" "Node2D" "Node3D"
+    "Node3DGizmo" "NodePath" "ORMMaterial3D" "OS" "Object" "Occluder3D" "OccluderInstance3D"
+    "OccluderPolygon2D" "OmniLight3D" "OptimizedTranslation" "OptionButton" "PCKPacker"
+    "PackedByteArray" "PackedColorArray" "PackedDataContainer" "PackedDataContainerRef"
+    "PackedFloat32Array" "PackedFloat64Array" "PackedInt32Array" "PackedInt64Array" "PackedScene"
+    "PackedStringArray" "PackedVector2Array" "PackedVector3Array" "PackedVector4Array" "PacketPeer"
+    "PacketPeerDTLS" "PacketPeerExtension" "PacketPeerStream" "PacketPeerUDP" "Panel"
+    "PanelContainer" "PanoramaSkyMaterial" "Parallax2D" "ParallaxBackground" "ParallaxLayer"
+    "ParticleProcessMaterial" "Path2D" "Path3D" "PathFollow2D" "PathFollow3D" "Performance"
+    "PhysicalBone2D" "PhysicalBone3D" "PhysicalBoneSimulator3D" "PhysicalSkyMaterial"
+    "PhysicsBody2D" "PhysicsBody3D" "PhysicsDirectBodyState2D" "PhysicsDirectBodyState2DExtension"
+    "PhysicsDirectBodyState3D" "PhysicsDirectBodyState3DExtension" "PhysicsDirectSpaceState2D"
+    "PhysicsDirectSpaceState2DExtension" "PhysicsDirectSpaceState3D"
+    "PhysicsDirectSpaceState3DExtension" "PhysicsMaterial" "PhysicsPointQueryParameters2D"
+    "PhysicsPointQueryParameters3D" "PhysicsRayQueryParameters2D" "PhysicsRayQueryParameters3D"
+    "PhysicsServer2D" "PhysicsServer2DExtension" "PhysicsServer2DManager" "PhysicsServer3D"
+    "PhysicsServer3DExtension" "PhysicsServer3DManager" "PhysicsServer3DRenderingServerHandler"
+    "PhysicsShapeQueryParameters2D" "PhysicsShapeQueryParameters3D" "PhysicsTestMotionParameters2D"
+    "PhysicsTestMotionParameters3D" "PhysicsTestMotionResult2D" "PhysicsTestMotionResult3D"
+    "PinJoint2D" "PinJoint3D" "PlaceholderCubemap" "PlaceholderCubemapArray" "PlaceholderMaterial"
+    "PlaceholderMesh" "PlaceholderTexture2D" "PlaceholderTexture2DArray" "PlaceholderTexture3D"
+    "PlaceholderTextureLayered" "Plane" "PlaneMesh" "PointLight2D" "PointMesh" "Polygon2D"
+    "PolygonOccluder3D" "PolygonPathFinder" "Popup" "PopupMenu" "PopupPanel"
+    "PortableCompressedTexture2D" "PrimitiveMesh" "PrismMesh" "ProceduralSkyMaterial" "ProgressBar"
+    "ProjectSettings" "Projection" "PropertyTweener" "QuadMesh" "QuadOccluder3D" "Quaternion"
+    "RDAttachmentFormat" "RDFramebufferPass" "RDPipelineColorBlendState"
+    "RDPipelineColorBlendStateAttachment" "RDPipelineDepthStencilState" "RDPipelineMultisampleState"
+    "RDPipelineRasterizationState" "RDPipelineSpecializationConstant" "RDSamplerState"
+    "RDShaderFile" "RDShaderSPIRV" "RDShaderSource" "RDTextureFormat" "RDTextureView" "RDUniform"
+    "RDVertexAttribute" "RID" "RandomNumberGenerator" "Range" "RayCast2D" "RayCast3D" "Rect2"
+    "Rect2i" "RectangleShape2D" "RefCounted" "ReferenceRect" "ReflectionProbe" "RemoteTransform2D"
+    "RemoteTransform3D" "RenderData" "RenderDataExtension" "RenderDataRD" "RenderSceneBuffers"
+    "RenderSceneBuffersConfiguration" "RenderSceneBuffersExtension" "RenderSceneBuffersRD"
+    "RenderSceneData" "RenderSceneDataExtension" "RenderSceneDataRD" "RenderingDevice"
+    "RenderingServer" "Resource" "ResourceFormatLoader" "ResourceFormatSaver" "ResourceImporter"
+    "ResourceImporterBMFont" "ResourceImporterBitMap" "ResourceImporterCSVTranslation"
+    "ResourceImporterDynamicFont" "ResourceImporterImage" "ResourceImporterImageFont"
+    "ResourceImporterLayeredTexture" "ResourceImporterOBJ" "ResourceImporterSVG"
+    "ResourceImporterScene" "ResourceImporterShaderFile" "ResourceImporterTexture"
+    "ResourceImporterTextureAtlas" "ResourceImporterWAV" "ResourceLoader" "ResourcePreloader"
+    "ResourceSaver" "ResourceUID" "RetargetModifier3D" "RibbonTrailMesh" "RichTextEffect"
+    "RichTextLabel" "RigidBody2D" "RigidBody3D" "RootMotionView" "SceneState" "SceneTree"
+    "SceneTreeTimer" "Script" "ScriptBacktrace" "ScriptCreateDialog" "ScriptEditor"
+    "ScriptEditorBase" "ScriptExtension" "ScriptLanguage" "ScriptLanguageExtension" "ScrollBar"
+    "ScrollContainer" "SegmentShape2D" "Semaphore" "SeparationRayShape2D" "SeparationRayShape3D"
+    "Separator" "Shader" "ShaderGlobalsOverride" "ShaderInclude" "ShaderIncludeDB" "ShaderMaterial"
+    "Shape2D" "Shape3D" "ShapeCast2D" "ShapeCast3D" "Shortcut" "Signal" "Skeleton2D" "Skeleton3D"
+    "SkeletonIK3D" "SkeletonModification2D" "SkeletonModification2DCCDIK"
+    "SkeletonModification2DFABRIK" "SkeletonModification2DJiggle" "SkeletonModification2DLookAt"
+    "SkeletonModification2DPhysicalBones" "SkeletonModification2DStackHolder"
+    "SkeletonModification2DTwoBoneIK" "SkeletonModificationStack2D" "SkeletonModifier3D"
+    "SkeletonProfile" "SkeletonProfileHumanoid" "Skin" "SkinReference" "Sky" "Slider"
+    "SliderJoint3D" "SocketServer" "SoftBody3D" "SphereMesh" "SphereOccluder3D" "SphereShape3D"
+    "SpinBox" "SplineIK3D" "SplitContainer" "SpotLight3D" "SpringArm3D" "SpringBoneCollision3D"
+    "SpringBoneCollisionCapsule3D" "SpringBoneCollisionPlane3D" "SpringBoneCollisionSphere3D"
+    "SpringBoneSimulator3D" "Sprite2D" "Sprite3D" "SpriteBase3D" "SpriteFrames" "StandardMaterial3D"
+    "StaticBody2D" "StaticBody3D" "StatusIndicator" "StreamPeer" "StreamPeerBuffer"
+    "StreamPeerExtension" "StreamPeerGZIP" "StreamPeerSocket" "StreamPeerTCP" "StreamPeerTLS"
+    "StreamPeerUDS" "String" "StringName" "StyleBox" "StyleBoxEmpty" "StyleBoxFlat" "StyleBoxLine"
+    "StyleBoxTexture" "SubViewport" "SubViewportContainer" "SubtweenTweener" "SurfaceTool"
+    "SyntaxHighlighter" "SystemFont" "TCPServer" "TLSOptions" "TabBar" "TabContainer" "TextEdit"
+    "TextLine" "TextMesh" "TextParagraph" "TextServer" "TextServerDummy" "TextServerExtension"
+    "TextServerManager" "Texture" "Texture2D" "Texture2DArray" "Texture2DArrayRD" "Texture2DRD"
+    "Texture3D" "Texture3DRD" "TextureButton" "TextureCubemapArrayRD" "TextureCubemapRD"
+    "TextureLayered" "TextureLayeredRD" "TextureProgressBar" "TextureRect" "Theme" "ThemeDB"
+    "Thread" "TileData" "TileMap" "TileMapLayer" "TileMapPattern" "TileSet" "TileSetAtlasSource"
+    "TileSetScenesCollectionSource" "TileSetSource" "Time" "Timer" "TorusMesh" "TouchScreenButton"
+    "Transform2D" "Transform3D" "Translation" "TranslationDomain" "TranslationServer" "Tree"
+    "TreeItem" "TriangleMesh" "TubeTrailMesh" "Tween" "Tweener" "TwoBoneIK3D" "UDPServer"
+    "UDSServer" "UndoRedo" "UniformSetCacheRD" "VBoxContainer" "VFlowContainer" "VScrollBar"
+    "VSeparator" "VSlider" "VSplitContainer" "Variant" "Vector2" "Vector2i" "Vector3" "Vector3i"
+    "Vector4" "Vector4i" "VehicleBody3D" "VehicleWheel3D" "VideoStream" "VideoStreamPlayback"
+    "VideoStreamPlayer" "Viewport" "ViewportTexture" "VisibleOnScreenEnabler2D"
+    "VisibleOnScreenEnabler3D" "VisibleOnScreenNotifier2D" "VisibleOnScreenNotifier3D"
+    "VisualInstance3D" "VisualShader" "VisualShaderNode" "VisualShaderNodeBillboard"
+    "VisualShaderNodeBooleanConstant" "VisualShaderNodeBooleanParameter" "VisualShaderNodeClamp"
+    "VisualShaderNodeColorConstant" "VisualShaderNodeColorFunc" "VisualShaderNodeColorOp"
+    "VisualShaderNodeColorParameter" "VisualShaderNodeComment" "VisualShaderNodeCompare"
+    "VisualShaderNodeConstant" "VisualShaderNodeCubemap" "VisualShaderNodeCubemapParameter"
+    "VisualShaderNodeCurveTexture" "VisualShaderNodeCurveXYZTexture" "VisualShaderNodeCustom"
+    "VisualShaderNodeDerivativeFunc" "VisualShaderNodeDeterminant" "VisualShaderNodeDistanceFade"
+    "VisualShaderNodeDotProduct" "VisualShaderNodeExpression" "VisualShaderNodeFaceForward"
+    "VisualShaderNodeFloatConstant" "VisualShaderNodeFloatFunc" "VisualShaderNodeFloatOp"
+    "VisualShaderNodeFloatParameter" "VisualShaderNodeFrame" "VisualShaderNodeFresnel"
+    "VisualShaderNodeGlobalExpression" "VisualShaderNodeGroupBase" "VisualShaderNodeIf"
+    "VisualShaderNodeInput" "VisualShaderNodeIntConstant" "VisualShaderNodeIntFunc"
+    "VisualShaderNodeIntOp" "VisualShaderNodeIntParameter" "VisualShaderNodeIs"
+    "VisualShaderNodeLinearSceneDepth" "VisualShaderNodeMix" "VisualShaderNodeMultiplyAdd"
+    "VisualShaderNodeOuterProduct" "VisualShaderNodeOutput" "VisualShaderNodeParameter"
+    "VisualShaderNodeParameterRef" "VisualShaderNodeParticleAccelerator"
+    "VisualShaderNodeParticleBoxEmitter" "VisualShaderNodeParticleConeVelocity"
+    "VisualShaderNodeParticleEmit" "VisualShaderNodeParticleEmitter"
+    "VisualShaderNodeParticleMeshEmitter" "VisualShaderNodeParticleMultiplyByAxisAngle"
+    "VisualShaderNodeParticleOutput" "VisualShaderNodeParticleRandomness"
+    "VisualShaderNodeParticleRingEmitter" "VisualShaderNodeParticleSphereEmitter"
+    "VisualShaderNodeProximityFade" "VisualShaderNodeRandomRange" "VisualShaderNodeRemap"
+    "VisualShaderNodeReroute" "VisualShaderNodeResizableBase" "VisualShaderNodeRotationByAxis"
+    "VisualShaderNodeSDFRaymarch" "VisualShaderNodeSDFToScreenUV" "VisualShaderNodeSample3D"
+    "VisualShaderNodeScreenNormalWorldSpace" "VisualShaderNodeScreenUVToSDF"
+    "VisualShaderNodeSmoothStep" "VisualShaderNodeStep" "VisualShaderNodeSwitch"
+    "VisualShaderNodeTexture" "VisualShaderNodeTexture2DArray"
+    "VisualShaderNodeTexture2DArrayParameter" "VisualShaderNodeTexture2DParameter"
+    "VisualShaderNodeTexture3D" "VisualShaderNodeTexture3DParameter"
+    "VisualShaderNodeTextureParameter" "VisualShaderNodeTextureParameterTriplanar"
+    "VisualShaderNodeTextureSDF" "VisualShaderNodeTextureSDFNormal"
+    "VisualShaderNodeTransformCompose" "VisualShaderNodeTransformConstant"
+    "VisualShaderNodeTransformDecompose" "VisualShaderNodeTransformFunc"
+    "VisualShaderNodeTransformOp" "VisualShaderNodeTransformParameter"
+    "VisualShaderNodeTransformVecMult" "VisualShaderNodeUIntConstant" "VisualShaderNodeUIntFunc"
+    "VisualShaderNodeUIntOp" "VisualShaderNodeUIntParameter" "VisualShaderNodeUVFunc"
+    "VisualShaderNodeUVPolarCoord" "VisualShaderNodeVarying" "VisualShaderNodeVaryingGetter"
+    "VisualShaderNodeVaryingSetter" "VisualShaderNodeVec2Constant" "VisualShaderNodeVec2Parameter"
+    "VisualShaderNodeVec3Constant" "VisualShaderNodeVec3Parameter" "VisualShaderNodeVec4Constant"
+    "VisualShaderNodeVec4Parameter" "VisualShaderNodeVectorBase" "VisualShaderNodeVectorCompose"
+    "VisualShaderNodeVectorDecompose" "VisualShaderNodeVectorDistance" "VisualShaderNodeVectorFunc"
+    "VisualShaderNodeVectorLen" "VisualShaderNodeVectorOp" "VisualShaderNodeVectorRefract"
+    "VisualShaderNodeWorldPositionFromDepth" "VoxelGI" "VoxelGIData" "WeakRef" "Window"
+    "WorkerThreadPool" "World2D" "World3D" "WorldBoundaryShape2D" "WorldBoundaryShape3D"
+    "WorldEnvironment" "X509Certificate" "XMLParser" "XRAnchor3D" "XRBodyModifier3D" "XRBodyTracker"
+    "XRCamera3D" "XRController3D" "XRControllerTracker" "XRFaceModifier3D" "XRFaceTracker"
+    "XRHandModifier3D" "XRHandTracker" "XRInterface" "XRInterfaceExtension" "XRNode3D" "XROrigin3D"
+    "XRPose" "XRPositionalTracker" "XRServer" "XRTracker" "XRVRS" "bool" "float" "int"
     ; from doc/classes/@GlobalScope.xml
     "AudioServer" "CameraServer" "ClassDB" "DisplayServer" "EditorInterface" "Engine"
     "EngineDebugger" "GDExtensionManager" "Geometry2D" "Geometry3D" "GodotSharp" "IP" "Input"
@@ -307,7 +514,7 @@
     "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
     ; from modules/gdscript/doc_classes/@GDScript.xml
     "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict" "is_instance_of"
-    "len" "load" "preload" "print_debug" "print_stack" "range" "type_exists"))
+    "len" "load" "ord" "preload" "print_debug" "print_stack" "range" "type_exists"))
 
 ; Builtin Constants
 ((identifier) @constant.builtin
@@ -322,7 +529,7 @@
     "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_DOES_NOT_EXIST" "ERR_DUPLICATE_SYMBOL"
     "ERR_FILE_ALREADY_IN_USE" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_CANT_OPEN"
     "ERR_FILE_CANT_READ" "ERR_FILE_CANT_WRITE" "ERR_FILE_CORRUPT" "ERR_FILE_EOF"
-    "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_NOT_FOUND" "ERR_FILE_NO_PERMISSION"
+    "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_NO_PERMISSION" "ERR_FILE_NOT_FOUND"
     "ERR_FILE_UNRECOGNIZED" "ERR_HELP" "ERR_INVALID_DATA" "ERR_INVALID_DECLARATION"
     "ERR_INVALID_PARAMETER" "ERR_LINK_FAILED" "ERR_LOCKED" "ERR_METHOD_NOT_FOUND"
     "ERR_OUT_OF_MEMORY" "ERR_PARAMETER_RANGE_ERROR" "ERR_PARSE_ERROR" "ERR_PRINTER_ON_FIRE"
@@ -332,9 +539,9 @@
     "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_FILL" "HORIZONTAL_ALIGNMENT_LEFT"
     "HORIZONTAL_ALIGNMENT_RIGHT" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM"
     "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_CENTER_TO"
-    "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK" "INLINE_ALIGNMENT_TOP"
-    "INLINE_ALIGNMENT_TOP_TO" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM"
-    "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_TOP" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X"
+    "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK" "INLINE_ALIGNMENT_TO_BASELINE"
+    "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TOP"
+    "INLINE_ALIGNMENT_TOP_TO" "INLINE_ALIGNMENT_TO_TOP" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X"
     "JOY_AXIS_LEFT_Y" "JOY_AXIS_MAX" "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_SDL_MAX"
     "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_BACK"
     "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT" "JOY_BUTTON_DPAD_UP"
@@ -370,11 +577,11 @@
     "KEY_SECTION" "KEY_SEMICOLON" "KEY_SHIFT" "KEY_SLASH" "KEY_SPACE" "KEY_SPECIAL" "KEY_STANDBY"
     "KEY_STOP" "KEY_SYSREQ" "KEY_T" "KEY_TAB" "KEY_U" "KEY_UNDERSCORE" "KEY_UNKNOWN" "KEY_UP"
     "KEY_V" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_W" "KEY_X" "KEY_Y" "KEY_YEN"
-    "KEY_Z" "METHOD_FLAGS_DEFAULT" "METHOD_FLAG_CONST" "METHOD_FLAG_EDITOR" "METHOD_FLAG_NORMAL"
-    "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAG_STATIC" "METHOD_FLAG_VARARG" "METHOD_FLAG_VIRTUAL"
-    "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_AFTERTOUCH" "MIDI_MESSAGE_CHANNEL_PRESSURE"
-    "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_NONE"
-    "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_PITCH_BEND"
+    "KEY_Z" "METHOD_FLAG_CONST" "METHOD_FLAG_EDITOR" "METHOD_FLAG_NORMAL" "METHOD_FLAG_OBJECT_CORE"
+    "METHOD_FLAGS_DEFAULT" "METHOD_FLAG_STATIC" "METHOD_FLAG_VARARG" "METHOD_FLAG_VIRTUAL"
+    "METHOD_FLAG_VIRTUAL_REQUIRED" "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_AFTERTOUCH"
+    "MIDI_MESSAGE_CHANNEL_PRESSURE" "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_CONTROL_CHANGE"
+    "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_PITCH_BEND"
     "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
     "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_START" "MIDI_MESSAGE_STOP"
     "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_SYSTEM_RESET" "MIDI_MESSAGE_TIMING_CLOCK"
@@ -387,40 +594,42 @@
     "OP_GREATER_EQUAL" "OP_IN" "OP_LESS" "OP_LESS_EQUAL" "OP_MAX" "OP_MODULE" "OP_MULTIPLY"
     "OP_NEGATE" "OP_NOT" "OP_NOT_EQUAL" "OP_OR" "OP_POSITIVE" "OP_POWER" "OP_SHIFT_LEFT"
     "OP_SHIFT_RIGHT" "OP_SUBTRACT" "OP_XOR" "PROPERTY_HINT_ARRAY_TYPE"
-    "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_DIR" "PROPERTY_HINT_ENUM"
-    "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXPRESSION" "PROPERTY_HINT_EXP_EASING"
-    "PROPERTY_HINT_FILE" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_GLOBAL_DIR"
-    "PROPERTY_HINT_GLOBAL_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE"
-    "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_INT_IS_OBJECTID"
-    "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_LAYERS_2D_NAVIGATION"
-    "PROPERTY_HINT_LAYERS_2D_PHYSICS" "PROPERTY_HINT_LAYERS_2D_RENDER"
-    "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
-    "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_AVOIDANCE" "PROPERTY_HINT_LINK"
-    "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING" "PROPERTY_HINT_MAX"
-    "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE"
-    "PROPERTY_HINT_NODE_PATH_VALID_TYPES" "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_NONE"
-    "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_PASSWORD"
+    "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_DICTIONARY_TYPE" "PROPERTY_HINT_DIR"
+    "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
+    "PROPERTY_HINT_EXPRESSION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_FILE_PATH" "PROPERTY_HINT_FLAGS"
+    "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_GLOBAL_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE"
+    "PROPERTY_HINT_GROUP_ENABLE" "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_INPUT_NAME"
+    "PROPERTY_HINT_INT_IS_OBJECTID" "PROPERTY_HINT_INT_IS_POINTER"
+    "PROPERTY_HINT_LAYERS_2D_NAVIGATION" "PROPERTY_HINT_LAYERS_2D_PHYSICS"
+    "PROPERTY_HINT_LAYERS_2D_RENDER" "PROPERTY_HINT_LAYERS_3D_NAVIGATION"
+    "PROPERTY_HINT_LAYERS_3D_PHYSICS" "PROPERTY_HINT_LAYERS_3D_RENDER"
+    "PROPERTY_HINT_LAYERS_AVOIDANCE" "PROPERTY_HINT_LINK" "PROPERTY_HINT_LOCALE_ID"
+    "PROPERTY_HINT_LOCALIZABLE_STRING" "PROPERTY_HINT_MAX" "PROPERTY_HINT_MULTILINE_TEXT"
+    "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_NODE_PATH_VALID_TYPES"
+    "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_NONE" "PROPERTY_HINT_OBJECT_ID"
+    "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_ONESHOT" "PROPERTY_HINT_PASSWORD"
     "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_RANGE" "PROPERTY_HINT_RESOURCE_TYPE"
-    "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_TYPE_STRING" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
-    "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_CATEGORY" "PROPERTY_USAGE_CHECKABLE"
-    "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_CLASS_IS_ENUM"
-    "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE" "PROPERTY_USAGE_EDITOR"
-    "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT"
-    "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_INTERNAL"
-    "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_NEVER_DUPLICATE"
-    "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT" "PROPERTY_USAGE_NONE"
-    "PROPERTY_USAGE_NO_EDITOR" "PROPERTY_USAGE_NO_INSTANCE_STATE" "PROPERTY_USAGE_READ_ONLY"
-    "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_RESTART_IF_CHANGED"
-    "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_SECRET"
-    "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_STORE_IF_NULL" "PROPERTY_USAGE_SUBGROUP"
-    "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "SIDE_BOTTOM" "SIDE_LEFT" "SIDE_RIGHT" "SIDE_TOP"
-    "TYPE_AABB" "TYPE_ARRAY" "TYPE_BASIS" "TYPE_BOOL" "TYPE_CALLABLE" "TYPE_COLOR" "TYPE_DICTIONARY"
-    "TYPE_FLOAT" "TYPE_INT" "TYPE_MAX" "TYPE_NIL" "TYPE_NODE_PATH" "TYPE_OBJECT"
-    "TYPE_PACKED_BYTE_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY"
-    "TYPE_PACKED_FLOAT64_ARRAY" "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY"
-    "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PLANE"
-    "TYPE_PROJECTION" "TYPE_QUATERNION" "TYPE_RECT2" "TYPE_RECT2I" "TYPE_RID" "TYPE_SIGNAL"
-    "TYPE_STRING" "TYPE_STRING_NAME" "TYPE_TRANSFORM2D" "TYPE_TRANSFORM3D" "TYPE_VECTOR2"
-    "TYPE_VECTOR2I" "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_VECTOR4" "TYPE_VECTOR4I" "VERTICAL"
+    "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_TOOL_BUTTON" "PROPERTY_HINT_TYPE_STRING"
+    "PROPERTY_USAGE_ALWAYS_DUPLICATE" "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_CATEGORY"
+    "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_CLASS_IS_BITFIELD"
+    "PROPERTY_USAGE_CLASS_IS_ENUM" "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
+    "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_EDITOR_BASIC_SETTING"
+    "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_HIGH_END_GFX"
+    "PROPERTY_USAGE_INTERNAL" "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_NEVER_DUPLICATE"
+    "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT"
+    "PROPERTY_USAGE_NO_EDITOR" "PROPERTY_USAGE_NO_INSTANCE_STATE" "PROPERTY_USAGE_NONE"
+    "PROPERTY_USAGE_READ_ONLY" "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT"
+    "PROPERTY_USAGE_RESTART_IF_CHANGED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE"
+    "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_SECRET" "PROPERTY_USAGE_STORAGE"
+    "PROPERTY_USAGE_STORE_IF_NULL" "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED"
+    "SIDE_BOTTOM" "SIDE_LEFT" "SIDE_RIGHT" "SIDE_TOP" "TYPE_AABB" "TYPE_ARRAY" "TYPE_BASIS"
+    "TYPE_BOOL" "TYPE_CALLABLE" "TYPE_COLOR" "TYPE_DICTIONARY" "TYPE_FLOAT" "TYPE_INT" "TYPE_MAX"
+    "TYPE_NIL" "TYPE_NODE_PATH" "TYPE_OBJECT" "TYPE_PACKED_BYTE_ARRAY" "TYPE_PACKED_COLOR_ARRAY"
+    "TYPE_PACKED_FLOAT32_ARRAY" "TYPE_PACKED_FLOAT64_ARRAY" "TYPE_PACKED_INT32_ARRAY"
+    "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY"
+    "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_VECTOR4_ARRAY" "TYPE_PLANE" "TYPE_PROJECTION"
+    "TYPE_QUATERNION" "TYPE_RECT2" "TYPE_RECT2I" "TYPE_RID" "TYPE_SIGNAL" "TYPE_STRING"
+    "TYPE_STRING_NAME" "TYPE_TRANSFORM2D" "TYPE_TRANSFORM3D" "TYPE_VECTOR2" "TYPE_VECTOR2I"
+    "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_VECTOR4" "TYPE_VECTOR4I" "VERTICAL"
     "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_FILL"
     "VERTICAL_ALIGNMENT_TOP"))

From b6271b678e035a5cbf62d637364f3eeca0890171 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Wed, 23 Jul 2025 15:58:06 +0200
Subject: [PATCH 2576/2704] feat(haskell): injection for
 morpheus-graphql-client quasiquotes

---
 runtime/queries/haskell/injections.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/runtime/queries/haskell/injections.scm b/runtime/queries/haskell/injections.scm
index 98a396e5e..b4d92aa30 100644
--- a/runtime/queries/haskell/injections.scm
+++ b/runtime/queries/haskell/injections.scm
@@ -83,3 +83,14 @@
   (#any-of? @_name "pymain" "pye" "py_" "pyf")
   (quasiquote_body) @injection.content
   (#set! injection.language "python"))
+
+; -----------------------------------------------------------------------------
+; GraphQL
+; morpheus-graphql-client
+(_
+  function: (apply
+    function: (variable) @_name)
+  argument: (quasiquote
+    body: (quasiquote_body) @injection.content)
+  (#set! injection.language "graphql")
+  (#eq? @_name "declareLocalTypesInline"))

From 2979e048b356cfd32dc419d5803dc356b9832adf Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 11 Dec 2025 10:44:35 +0100
Subject: [PATCH 2577/2704] ci(test): bump tree-sitter/setup-actions to v2

---
 .github/workflows/downstream.yml | 2 +-
 .github/workflows/test-core.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index b4ea6fc85..03fb42a36 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -16,7 +16,7 @@ jobs:
       NVIM: "nvim"
     steps:
       - uses: actions/checkout@v5
-      - uses: tree-sitter/setup-action/cli@v1
+      - uses: tree-sitter/setup-action/cli@v2
 
       - name: Install and prepare Neovim
         env:
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index f20f1939d..83a4729c1 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -22,7 +22,7 @@ jobs:
       NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
     steps:
       - uses: actions/checkout@v5
-      - uses: tree-sitter/setup-action/cli@v1
+      - uses: tree-sitter/setup-action/cli@v2
       - uses: ilammy/msvc-dev-cmd@v1
 
       - name: Install and prepare Neovim

From 74d3999522bfc96b90947f975ba5897febd933a1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 Dec 2025 14:16:22 +0100
Subject: [PATCH 2578/2704] feat(parsers): update fortran, gotmpl, helm, idl,
 mlir, pkl, query, racket, scheme, slint, vhdl, zsh

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0f9fc5057..e3f13fca1 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -584,7 +584,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = 'd0d1bc84c43870788c1b402f2e6b490b27257f9e',
+      revision = 'e0132896b8959c09dc20b56e4a1c5d25bc341697',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -794,7 +794,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = '226692db9da6cb9939284b1ed263a0fb82d26768',
+      revision = 'c59999dc449c29549f5735eaac31b938a13b6c14',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -906,7 +906,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = '226692db9da6cb9939284b1ed263a0fb82d26768',
+      revision = 'c59999dc449c29549f5735eaac31b938a13b6c14',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -1002,7 +1002,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '0c9aa1588cec4c64235ec3ed014ca72aa79e72ca',
+      revision = 'e6b8b4d2ba285caacf6f9e931f1f637f5bc02b03',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1381,7 +1381,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '1f76a88b79e70222968a9f8185992c9bb5ddacf0',
+      revision = '458459efa2c5bc6ee77e3a69f05d24ba51a7bd54',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1592,7 +1592,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'd50709f1b71e77844c4551c655792d100a5ca559',
+      revision = 'ac58931956c000d3aeefbb55a81fc3c5bd6aecf0',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1787,7 +1787,7 @@ return {
   },
   query = {
     install_info = {
-      revision = 'a225e21d81201be77da58de614e2b7851735677a',
+      revision = 'a4e379d4a4b77a09e91c1c9e12d4b898214f990e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -1804,7 +1804,7 @@ return {
   },
   racket = {
     install_info = {
-      revision = '130e76536bd3a45df7b7fd71cfa3d0df25fcfe8e',
+      revision = '56b57807f86aa4ddb14892572b318edd4bc90ebe',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 2,
@@ -1988,7 +1988,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = '591893b9a8b9ec85f5cef86e0cc1028012ad9f0e',
+      revision = 'b5c701148501fa056302827442b5b4956f1edc03',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2031,7 +2031,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = 'f2e4e5a7bccb177562de8f5b4fe49a5531c9f7ca',
+      revision = '10fb0f188d7950400773c06ba6c31075866e14bf',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2504,7 +2504,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '0c25aa064dc489ec5291e4879fa7ed41cf5fe680',
+      revision = '3d8d72fd2deb27d7bcebf927c4e4bf050fbaf4ba',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2676,7 +2676,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.48.0',
+      revision = 'v0.50.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },

From 74b119812e9f82bccc2f0eca156faff0354362ae Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 Dec 2025 14:22:22 +0100
Subject: [PATCH 2579/2704] feat(gleam)!: update parser and queries

Breaking change: `(bit_string_*)` renamed to `(bit_array_*)`
---
 lua/nvim-treesitter/parsers.lua      | 2 +-
 runtime/queries/gleam/highlights.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e3f13fca1..9aaf4c477 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -692,7 +692,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = 'f4d55f3c5b690d4afe8853da892bc290d96deb34',
+      revision = '0c0c63a07998767b22f0d2655f903611eca6acd0',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
diff --git a/runtime/queries/gleam/highlights.scm b/runtime/queries/gleam/highlights.scm
index f80bda240..f25926f92 100644
--- a/runtime/queries/gleam/highlights.scm
+++ b/runtime/queries/gleam/highlights.scm
@@ -106,7 +106,7 @@
 (string) @string
 
 ; Bit Strings
-(bit_string_segment) @string.special
+(bit_array_segment) @string.special
 
 ; Numbers
 (integer) @number

From d3218d988f72ed34414959c9ccd802d393432d6e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 14 Dec 2025 13:11:45 +0100
Subject: [PATCH 2580/2704] docs(readme)!: `main` is now the default branch

---
 README.md | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 8d2e22f41..0f363c5f7 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ The `nvim-treesitter` plugin provides
 For details on these and how to help improving them, see [CONTRIBUTING.md](./CONTRIBUTING.md).
 
 >[!CAUTION]
-> This is a full, incompatible, rewrite. If you can't or don't want to update, check out the [`master` branch](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/README.md) (which is locked but will remain available for backward compatibility).
+> This is a full, incompatible, rewrite. If you can't or don't want to update, specify the [`master` branch](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/README.md) (which is locked but will remain available for backward compatibility).
 
 # Quickstart
 
@@ -18,7 +18,7 @@ For details on these and how to help improving them, see [CONTRIBUTING.md](./CON
 
 - Neovim 0.11.0 or later (nightly)
 - `tar` and `curl` in your path
-- [`tree-sitter-cli`](https://github.com/tree-sitter/tree-sitter/blob/master/crates/cli/README.md) (0.25.0 or later)
+- [`tree-sitter-cli`](https://github.com/tree-sitter/tree-sitter/blob/master/crates/cli/README.md) (0.26.1 or later)
 - a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
 
 >[!IMPORTANT]
@@ -38,7 +38,6 @@ It is strongly recommended to automate this; e.g., using [lazy.nvim](https://git
 require('lazy').setup({
   'nvim-treesitter/nvim-treesitter',
   lazy = false,
-  branch = 'main',
   build = ':TSUpdate'
 })
 ```
@@ -46,16 +45,13 @@ require('lazy').setup({
 >[!IMPORTANT]
 > This plugin does not support lazy-loading.
 
->[!IMPORTANT]
-> Make sure to specify the `main` branch since (for now) the default branch is [`master`](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/README.md).
-
 ## Setup
 
-`nvim-treesitter` can be configured by calling `setup`. The following snippet lists the available options and their default values. **You do not need to call `setup` for `nvim-treesitter` to work using default values.**
+`nvim-treesitter` can be configured by calling `setup`. **You do not need to call `setup` for `nvim-treesitter` to work using default values.**
 
 ```lua
 require'nvim-treesitter'.setup {
-  -- Directory to install parsers and queries to
+  -- Directory to install parsers and queries to (prepended to `runtimepath` to have priority)
   install_dir = vim.fn.stdpath('data') .. '/site'
 }
 ```
@@ -100,8 +96,8 @@ vim.api.nvim_create_autocmd('FileType', {
 Treesitter-based folding is provided by Neovim. To enable it, put the following in your `ftplugin` or `FileType` autocommand:
 
 ```lua
-vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
-vim.wo.foldmethod = 'expr'
+vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+vim.wo[0][0].foldmethod = 'expr'
 ```
 
 ## Indentation
@@ -141,7 +137,7 @@ callback = function()
       branch = 'develop', -- only needed if different from default branch
       location = 'parser', -- only needed if the parser is in subdirectory of a "monorepo"
       generate = true, -- only needed if repo does not contain pre-generated `src/parser.c`
-      generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either -- WARNING: requires `node` for tree-sitter-cli <0.26.0!
+      generate_from_json = false, -- only needed if repo does not contain `src/grammar.json` either
       queries = 'queries/neovim', -- also install queries from given directory
     },
   }
@@ -173,7 +169,7 @@ If Neovim does not detect your language's filetype by default, you can use [Neov
 3. Start `nvim` and `:TSInstall zimbu`.
 
 >[!IMPORTANT]
-> Parsers using external scanner need to be written in C.
+> If the parser requires an external scanner, this must be written in C.
 
 ### Modifying parsers
 

From 568f2a3b7d610c4922b7d7aa0cd67c45b5158ed5 Mon Sep 17 00:00:00 2001
From: Manfred Egger <github@tmk-stgeorgen.at>
Date: Wed, 17 Dec 2025 11:48:06 +0100
Subject: [PATCH 2581/2704] feat(typoscript)!: update grammar and queries
 (#8341)

Breaking change: `(condition_bool)` renamed to `(condition_bool_legacy)`
---
 lua/nvim-treesitter/parsers.lua           |  2 +-
 runtime/queries/typoscript/folds.scm      | 12 +++-
 runtime/queries/typoscript/highlights.scm | 81 ++++++++++++++++++++---
 runtime/queries/typoscript/indents.scm    | 12 +++-
 runtime/queries/typoscript/injections.scm | 11 +++
 5 files changed, 104 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9aaf4c477..7a89e31a7 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2422,7 +2422,7 @@ return {
   },
   typoscript = {
     install_info = {
-      revision = '5d8fde870b0ded1f429ba5bb249a9d9f8589ff5f',
+      revision = 'e59069a4cc08b2dacccd40827fe971ca3c6821b7',
       url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
     },
     maintainers = { '@Teddytrombone' },
diff --git a/runtime/queries/typoscript/folds.scm b/runtime/queries/typoscript/folds.scm
index fd7d23999..2bb3f69c5 100644
--- a/runtime/queries/typoscript/folds.scm
+++ b/runtime/queries/typoscript/folds.scm
@@ -1 +1,11 @@
-(block) @fold
+[
+  (block)
+  (condition_block)
+  (multiline_value)
+] @fold
+
+(import_legacy)+ @fold
+
+(import)+ @fold
+
+(comment)+ @fold
diff --git a/runtime/queries/typoscript/highlights.scm b/runtime/queries/typoscript/highlights.scm
index 63327f178..bc214cba0 100644
--- a/runtime/queries/typoscript/highlights.scm
+++ b/runtime/queries/typoscript/highlights.scm
@@ -1,10 +1,28 @@
 (identifier) @variable.member
 
+(symfony_variable) @variable
+
 (constant) @constant
 
-(modifier_function) @function
+(symfony_method) @function.method.call
 
-(modifier_predefined) @function.builtin
+[
+  (modifier_function)
+  (symfony_function)
+] @function.call
+
+[
+  (modifier_predefined)
+  (symfony_predefined_function)
+] @function.builtin
+
+(modifier_parameter) @variable.parameter
+
+(symfony_function_parameter
+  (symfony_variable) @variable.parameter)
+
+(symfony_method_parameter
+  (symfony_variable) @variable.parameter)
 
 [
   (condition)
@@ -12,13 +30,19 @@
   (condition_else)
 ] @keyword.conditional
 
-(cobject) @type.builtin
-
 [
   "@import"
   "INCLUDE_TYPOSCRIPT"
 ] @keyword.import
 
+(condition_attribute) @tag.attribute
+
+(cobject) @type.builtin
+
+(symfony_built_in_variable) @variable.builtin
+
+(symfony_property) @variable.member
+
 [
   (comment)
   (single_line_comment)
@@ -26,22 +50,59 @@
 
 [
   (string)
-  (multiline_value)
+  (multiline_value_content)
+  (symfony_string)
 ] @string
 
+(deletion_line
+  ">" @operator)
+
+(copy_line
+  "<" @operator)
+
 [
   "="
-  ">"
-  "<"
-  ":="
   "=<"
-  (condition_bool)
+  ":="
+  "?."
+  (symfony_condition_operator)
+  (condition_bool_legacy)
+  (constant_null_coalescing)
 ] @operator
 
-"," @punctuation.delimiter
+(symfony_ternary_operator) @keyword.conditional.ternary
+
+((symfony_condition_operator) @keyword.operator
+  (#any-of? @keyword.operator
+    "and" "or" "xor" "not" "not in" "in" "contains" "starts with" "ends with" "matches"))
+
+[
+  ","
+  "."
+] @punctuation.delimiter
+
+(symfony_property_access
+  "." @operator)
+
+(symfony_method_call
+  "." @operator)
 
 [
   "("
   ")"
+  "["
+  "]"
   (block_punctuation)
 ] @punctuation.bracket
+
+(condition
+  "[" @punctuation.special)
+
+(condition
+  "]" @punctuation.special)
+
+(symfony_number) @number
+
+(symfony_boolean) @boolean
+
+(symfony_null) @constant.builtin
diff --git a/runtime/queries/typoscript/indents.scm b/runtime/queries/typoscript/indents.scm
index 4f5fb4797..ff5ddb603 100644
--- a/runtime/queries/typoscript/indents.scm
+++ b/runtime/queries/typoscript/indents.scm
@@ -1,5 +1,13 @@
 (block) @indent.begin
 
-"}" @indent.branch @indent.end
+"}" @indent.end
 
-(comment) @indent.ignore
+[
+  "{"
+  "}"
+] @indent.branch
+
+[
+  (comment)
+  (multiline_value)
+] @indent.ignore
diff --git a/runtime/queries/typoscript/injections.scm b/runtime/queries/typoscript/injections.scm
index 2f0e58eb6..7e4bfe599 100644
--- a/runtime/queries/typoscript/injections.scm
+++ b/runtime/queries/typoscript/injections.scm
@@ -1,2 +1,13 @@
+((multiline_line
+  (identifier) @_id
+  .
+  (multiline_value
+    (multiline_value_content) @injection.content))
+  (#lua-match? @_id "_CSS_DEFAULT_STYLE$")
+  (#set! injection.language "css"))
+
 ((comment) @injection.content
   (#set! injection.language "comment"))
+
+((single_line_comment) @injection.content
+  (#set! injection.language "comment"))

From d0bf5ff2b00939eab39c6572aec7cf232f843b1f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Dec 2025 11:48:47 +0100
Subject: [PATCH 2582/2704] feat(parsers): update ada, c3, comment, desktop,
 editorconfig, elm, julia, mlir, nu, phpdoc, t32, tera, vim, vimdoc,
 xresources, zsh

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7a89e31a7..e0612af38 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2,7 +2,7 @@
 return {
   ada = {
     install_info = {
-      revision = '6c26c4413965dc7bacbccfa66503bf6b8228e254',
+      revision = '6b58259a08b1a22ba0247a7ce30be384db618da6',
       url = 'https://github.com/briot/tree-sitter-ada',
     },
     maintainers = { '@briot' },
@@ -158,7 +158,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '3bcb189c85a15d5e47a12947fbb25cd6604025f5',
+      revision = '6b4e9127f90fa35d39f5314211bc5f7e304304bb',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -230,7 +230,7 @@ return {
   },
   comment = {
     install_info = {
-      revision = 'db922d7809637900089709e07e31b88c42354ec2',
+      revision = '66272d2b6c73fb61157541b69dd0a7ce7b42a5ad',
       url = 'https://github.com/stsewd/tree-sitter-comment',
     },
     maintainers = { '@stsewd' },
@@ -338,7 +338,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'bbcedf9a11cb6c5f7cd8fcc041301aa0c204bfc0',
+      revision = 'c38aed8c230dd8f59b5f74ffa5046352b3d376e2',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -441,7 +441,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'f08fb1f53130d2c765e45181eae26535e1a7a7f1',
+      revision = '783a30a216b982a6827b2abe52a4edbd909cb26a',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -473,7 +473,7 @@ return {
   },
   elm = {
     install_info = {
-      revision = '3d000d37b99ac2640bf24c1a7a5c9a58485778df',
+      revision = '6d9511c28181db66daee4e883f811f6251220943',
       url = 'https://github.com/elm-tooling/tree-sitter-elm',
     },
     maintainers = { '@zweimach' },
@@ -1141,7 +1141,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = '5a5d3082e13edd5afc4c274498d6125ecc914870',
+      revision = 'dd7f707577585ade7a488d32dbfb366246ea3837',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-julia',
     },
     maintainers = { '@clason' },
@@ -1381,7 +1381,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '458459efa2c5bc6ee77e3a69f05d24ba51a7bd54',
+      revision = '837b0cc2c7b8ae20fb1b582eb507873c6e588e01',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1461,7 +1461,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '64ba3f8f5f9c8bd21a79341f0957b453303a98b8',
+      revision = '4c149627cc592560f77ead1c384e27ec85926407',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1576,7 +1576,7 @@ return {
   },
   phpdoc = {
     install_info = {
-      revision = '03bb10330704b0b371b044e937d5cc7cd40b4999',
+      revision = '488198e61f49fc74ee54069a4126b556665a57cc',
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
     maintainers = { '@mikehaertl' },
@@ -2246,7 +2246,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = 'c3f72e1786b3440b98cb1b082c13c9033e1d08a9',
+      revision = 'f61c5f112af4aa5cc674f0197e00fa358aab7bbb',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2295,7 +2295,7 @@ return {
   },
   tera = {
     install_info = {
-      revision = '692937d52c8dfd91ce0dde722b9b4febbc9bc712',
+      revision = '3a38c368e806268daac9923a27e72bcafbbc16bb',
       url = 'https://github.com/uncenter/tree-sitter-tera',
     },
     maintainers = { '@uncenter' },
@@ -2520,7 +2520,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '3dd4747082d1b717b8978211c06ef7b6cd16125b',
+      revision = '8b8db7d8e4db799ab6b0db25a7990c2890133c1e',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2528,7 +2528,7 @@ return {
   },
   vimdoc = {
     install_info = {
-      revision = '570dc10aed5963546322e6c935e1125b9fd747bf',
+      revision = 'f061895a0eff1d5b90e4fb60d21d87be3267031a',
       url = 'https://github.com/neovim/tree-sitter-vimdoc',
     },
     maintainers = { '@clason' },
@@ -2612,7 +2612,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '68240ae1beef503cfe0d1bc40f25b0fab71df8f5',
+      revision = 'a19a2acc5299b9bc0e3b4c8184c2860fdc66eba0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
@@ -2676,7 +2676,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.50.0',
+      revision = 'v0.52.1',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },

From 846c7b50ee4ee44b62800b9ce91363af3dbe7ab9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Dec 2025 12:46:24 +0100
Subject: [PATCH 2583/2704] chore: remove FUNDING.yml

---
 .github/FUNDING.yml             | 2 --
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index b2844b214..000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-open_collective: "nvim-treesitter"
-github: "nvim-treesitter"
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e0612af38..d5decb683 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1372,7 +1372,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '280b6e59186f18528bab1567f5cc43b78b9cd881',
+      revision = 'd4fa3c7260d1537ac5183740b9338373a673d5c0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },

From fc21d3db8c1d95d414c0ae4406309fe7d3c9f9d6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Dec 2025 12:47:00 +0100
Subject: [PATCH 2584/2704] ci: add dependabot for GH actions

---
 .github/dependabot.yml          | 17 +++++++++++++++++
 lua/nvim-treesitter/parsers.lua |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..3c14c5874
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    cooldown:
+      default-days: 3
+    commit-message:
+      prefix: "ci"
+    labels:
+      - "dependencies"
+      - "github-actions"
+    groups:
+      actions:
+        patterns: ["*"]
+
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d5decb683..e0612af38 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1372,7 +1372,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = 'd4fa3c7260d1537ac5183740b9338373a673d5c0',
+      revision = '280b6e59186f18528bab1567f5cc43b78b9cd881',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },

From cfdca13a5da647d21be206bf2eb90629a7e7c734 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 11:56:00 +0000
Subject: [PATCH 2585/2704] ci: bump the actions group with 2 updates

Bumps the actions group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request).


Updates `actions/checkout` from 5 to 6
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

Updates `peter-evans/create-pull-request` from 7 to 8
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: peter-evans/create-pull-request
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/downstream.yml     | 6 +++---
 .github/workflows/lint.yml           | 6 +++---
 .github/workflows/test-core.yml      | 2 +-
 .github/workflows/update-parsers.yml | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index 03fb42a36..e9f69fb72 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -15,7 +15,7 @@ jobs:
     env:
       NVIM: "nvim"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: tree-sitter/setup-action/cli@v2
 
       - name: Install and prepare Neovim
@@ -31,7 +31,7 @@ jobs:
         run: curl -fL https://github.com/ribru17/ts_query_ls/releases/latest/download/ts_query_ls-x86_64-unknown-linux-gnu.tar.gz | tar -xz
 
       - name: Clone textobjects
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: nvim-treesitter/nvim-treesitter-textobjects
           ref: main
@@ -44,7 +44,7 @@ jobs:
 
       - name: Clone context
         if: always()
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: nvim-treesitter/nvim-treesitter-context
           ref: master
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 27a75f8c0..41830b225 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
     name: Lint Lua files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Format
         run: |
@@ -28,7 +28,7 @@ jobs:
     name: Lint query files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Format
         run: |
@@ -42,7 +42,7 @@ jobs:
     name: Lint docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Check SUPPORTED_LANGUAGES
         run: |
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 83a4729c1..3a0b3cffa 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -21,7 +21,7 @@ jobs:
     env:
       NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: tree-sitter/setup-action/cli@v2
       - uses: ilammy/msvc-dev-cmd@v1
 
diff --git a/.github/workflows/update-parsers.yml b/.github/workflows/update-parsers.yml
index 533fc2ddd..23741d761 100644
--- a/.github/workflows/update-parsers.yml
+++ b/.github/workflows/update-parsers.yml
@@ -17,7 +17,7 @@ jobs:
     name: Update parsers tier ${{ matrix.tier }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: main
 
@@ -42,7 +42,7 @@ jobs:
         run: ./scripts/update-parsers.lua --tier=${{ matrix.tier }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           add-paths: lua/nvim-treesitter/parsers.lua
           token: ${{ steps.app-token.outputs.token }}

From 4fc09bee78e91bf4ba471cdab4bf9dfa37fde51c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 17 Dec 2025 13:01:30 +0100
Subject: [PATCH 2586/2704] ci(dependabot): fix labels

---
 .github/dependabot.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3c14c5874..e80604577 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,8 +9,7 @@ updates:
     commit-message:
       prefix: "ci"
     labels:
-      - "dependencies"
-      - "github-actions"
+      - "CI"
     groups:
       actions:
         patterns: ["*"]

From e08ad49dbd62d68789930ca87068da89e71cb71a Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 06:50:36 +0000
Subject: [PATCH 2587/2704] bot(parsers): update editorconfig, meson, mlir,
 phpdoc, t32, vhdl

---
 lua/nvim-treesitter/parsers.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e0612af38..69d97719c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -441,7 +441,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '783a30a216b982a6827b2abe52a4edbd909cb26a',
+      revision = 'c571889b7c875690b78f79c4304cbf267e130818',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -1372,7 +1372,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '280b6e59186f18528bab1567f5cc43b78b9cd881',
+      revision = 'd4fa3c7260d1537ac5183740b9338373a673d5c0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1381,7 +1381,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '837b0cc2c7b8ae20fb1b582eb507873c6e588e01',
+      revision = '6b15a0164c0aeed3009e9feff3dc38d54e91cef9',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1576,7 +1576,7 @@ return {
   },
   phpdoc = {
     install_info = {
-      revision = '488198e61f49fc74ee54069a4126b556665a57cc',
+      revision = '12d50307e6c02e5f4f876fa6cf2edea1f7808c0d',
       url = 'https://github.com/claytonrcarter/tree-sitter-phpdoc',
     },
     maintainers = { '@mikehaertl' },
@@ -2246,7 +2246,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = 'f61c5f112af4aa5cc674f0197e00fa358aab7bbb',
+      revision = '5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2504,7 +2504,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '3d8d72fd2deb27d7bcebf927c4e4bf050fbaf4ba',
+      revision = '7ae08deb5d1641aa57111342218ca1e1b3a5d539',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },

From f795520371e6563dac17a0d556f41d70ca86a789 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 20 Dec 2025 12:32:01 +0100
Subject: [PATCH 2588/2704] fix(strace): generate removed parser

---
 lua/nvim-treesitter/parsers.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 69d97719c..2827adb07 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2155,7 +2155,8 @@ return {
   },
   strace = {
     install_info = {
-      revision = 'd819cdd5dbe455bd3c859193633c8d91c0df7c36',
+      generate = true,
+      revision = '776e96ca962a58cd6858e2c5a2dd4e7e941dbcd4',
       url = 'https://github.com/sigmaSd/tree-sitter-strace',
     },
     maintainers = { '@amaanq' },

From 8cdffc6d334731ce3703b6d870a5a34fd878208a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 20 Dec 2025 12:30:45 +0100
Subject: [PATCH 2589/2704] feat(vim): support `:tab` command

---
 runtime/queries/vim/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
index c35986fa3..96280cd42 100644
--- a/runtime/queries/vim/highlights.scm
+++ b/runtime/queries/vim/highlights.scm
@@ -110,6 +110,7 @@
   "cnext"
   "cprevious"
   "cNext"
+  "tab"
   "vertical"
   "leftabove"
   "aboveleft"

From 6e42d823ce0a5a76180c473c119c7677738a09d1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 21 Dec 2025 15:18:17 +0100
Subject: [PATCH 2590/2704] fix(strace): no longer need to generate

---
 lua/nvim-treesitter/parsers.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2827adb07..595191dde 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2155,8 +2155,7 @@ return {
   },
   strace = {
     install_info = {
-      generate = true,
-      revision = '776e96ca962a58cd6858e2c5a2dd4e7e941dbcd4',
+      revision = 'ac874ddfcc08d689fee1f4533789e06d88388f29',
       url = 'https://github.com/sigmaSd/tree-sitter-strace',
     },
     maintainers = { '@amaanq' },

From 7ba26e7685a58d47e10840617d1d035dcdd5e018 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Fri, 26 Dec 2025 17:35:54 +0100
Subject: [PATCH 2591/2704] perf(nix): replace match with lua-match

---
 runtime/queries/nix/injections.scm            | 104 ++++++++++++++----
 .../injections/nix/test-nix-injections.nix    |  28 +++--
 2 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
index 26ba6e2da..7d0ffe8e5 100644
--- a/runtime/queries/nix/injections.scm
+++ b/runtime/queries/nix/injections.scm
@@ -34,7 +34,7 @@
       ((string_fragment) @injection.content
         (#set! injection.language "regex")))
   ]
-  (#match? @_func "(^|\\.)match$")
+  (#lua-match? @_func "^%a*%.*match$")
   (#set! injection.combined))
 
 (binding
@@ -48,7 +48,46 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#match? @_path "(^\\w+(Phase|Hook|Check)|(pre|post)[A-Z]\\w+|script)$"))
+  (#lua-match? @_path "^%a+Phase$"))
+
+(binding
+  attrpath: (attrpath
+    (identifier) @_path)
+  expression: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ]
+  (#lua-match? @_path "^pre%a+$"))
+
+(binding
+  attrpath: (attrpath
+    (identifier) @_path)
+  expression: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ]
+  (#lua-match? @_path "^post%a+$"))
+
+(binding
+  attrpath: (attrpath
+    (identifier) @_path)
+  expression: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ]
+  (#lua-match? @_path "^script$"))
 
 (apply_expression
   function: (_) @_func
@@ -67,8 +106,8 @@
             ((string_fragment) @injection.content
               (#set! injection.language "bash")))
         ])))
-  (#match? @_func "(^|\\.)writeShellApplication$")
-  (#match? @_path "^text$")
+  (#lua-match? @_func "^%a*%.*writeShellApplication$")
+  (#lua-match? @_path "^text$")
   (#set! injection.combined))
 
 (apply_expression
@@ -83,7 +122,7 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#match? @_func "(^|\\.)runCommand((No)?CC)?(Local)?$")
+  (#lua-match? @_func "^%a*%.*runCommand%a*$")
   (#set! injection.combined))
 
 ((apply_expression
@@ -97,7 +136,35 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ])
-  (#match? @_func "(^|\\.)write(Bash|Dash|ShellScript)(Bin)?$")
+  (#lua-match? @_func "^%a*%.*writeBash%a*$")
+  (#set! injection.combined))
+
+((apply_expression
+  function: (apply_expression
+    function: (_) @_func)
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ])
+  (#lua-match? @_func "^%a*%.*writeDash%a*$")
+  (#set! injection.combined))
+
+((apply_expression
+  function: (apply_expression
+    function: (_) @_func)
+  argument: [
+    (string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+    (indented_string_expression
+      ((string_fragment) @injection.content
+        (#set! injection.language "bash")))
+  ])
+  (#lua-match? @_func "^%a*%.*writeShellScript%a*$")
   (#set! injection.combined))
 
 ((apply_expression
@@ -111,7 +178,7 @@
       ((string_fragment) @injection.content
         (#set! injection.language "fish")))
   ])
-  (#match? @_func "(^|\\.)writeFish(Bin)?$")
+  (#lua-match? @_func "^%a*%.*writeFish%a*$")
   (#set! injection.combined))
 
 ((apply_expression
@@ -126,13 +193,12 @@
       ((string_fragment) @injection.content
         (#set! injection.language "haskell")))
   ])
-  (#match? @_func "(^|\\.)writeHaskell(Bin)?$")
+  (#lua-match? @_func "^%a*%.*writeHaskell%a*$")
   (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
-    function: (apply_expression
-      function: (_) @_func))
+    function: (_) @_func)
   argument: [
     (string_expression
       ((string_fragment) @injection.content
@@ -141,13 +207,12 @@
       ((string_fragment) @injection.content
         (#set! injection.language "javascript")))
   ])
-  (#match? @_func "(^|\\.)writeJS(Bin)?$")
+  (#lua-match? @_func "^%a*%.*writeJS%a*$")
   (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
-    function: (apply_expression
-      function: (_) @_func))
+    function: (_) @_func)
   argument: [
     (string_expression
       ((string_fragment) @injection.content
@@ -156,13 +221,12 @@
       ((string_fragment) @injection.content
         (#set! injection.language "perl")))
   ])
-  (#match? @_func "(^|\\.)writePerl(Bin)?$")
+  (#lua-match? @_func "^%a*%.*writePerl%a*$")
   (#set! injection.combined))
 
 ((apply_expression
   function: (apply_expression
-    function: (apply_expression
-      function: (_) @_func))
+    function: (_) @_func)
   argument: [
     (string_expression
       ((string_fragment) @injection.content
@@ -171,13 +235,11 @@
       ((string_fragment) @injection.content
         (#set! injection.language "python")))
   ])
-  (#match? @_func "(^|\\.)write(PyPy|Python)[23](Bin)?$")
+  (#lua-match? @_func "^%a*%.*writePy%a*%d*%a*$")
   (#set! injection.combined))
 
 ((apply_expression
-  function: (apply_expression
-    function: (apply_expression
-      function: (_) @_func))
+  function: (_) @_func
   argument: [
     (string_expression
       ((string_fragment) @injection.content
@@ -186,7 +248,7 @@
       ((string_fragment) @injection.content
         (#set! injection.language "rust")))
   ])
-  (#match? @_func "(^|\\.)writeRust(Bin)?$")
+  (#lua-match? @_func "^%a*%.*writeRust%a*$")
   (#set! injection.combined))
 
 ; (nixosTest) testScript
diff --git a/tests/query/injections/nix/test-nix-injections.nix b/tests/query/injections/nix/test-nix-injections.nix
index 477ca4abb..b358326ab 100644
--- a/tests/query/injections/nix/test-nix-injections.nix
+++ b/tests/query/injections/nix/test-nix-injections.nix
@@ -1,8 +1,11 @@
-{ pkgs, stdenv }:
 # NOTE: This file is for testing queries. If evaluated with nix, this will probably error.
-{ 
+{ pkgs, stdenv }: let
+  match = builtins.match;
+in { 
   regex = builtins.match "^.*[{](.+)[}].*$" "blahblah {something} blahblah" [ "something" ];
 
+  regex2 = match "^.*[{](.+)[}].*$" "blahblah {something} blahblah" [ "something" ];
+
   drv1 = stdenv.mkDerivation {
     buildPhase = "mkdir $out";
     installPhase = ''
@@ -23,38 +26,43 @@
     echo "bar" > $out/foo.txt
   '';
 
-  drv4 = pkgs.writeShellScriptBin "hello" ''
+  drv4 = pkgs.runCommandNoCC "foo-bar" {} ''
+    mkir $out
+    echo "bar" > $out/foo.txt
+  '';
+
+  drv5 = pkgs.writeShellScriptBin "hello" ''
     echo "Hello world!"
   '';
 
-  drv5 = pkgs.writeFishBin "hello" ''
+  drv6 = pkgs.writeFishBin "hello" ''
     echo "Hello world!"
   '';
 
-  drv6 = pkgs.writeHaskellBin "hello" ''
+  drv7 = pkgs.writeHaskellBin "hello" ''
     main :: IO ()
     main = putStrLn "Hello world!"
   '';
 
-  drv7 = pkgs.writeJSBin "hello" ''
+  drv8 = pkgs.writeJSBin "hello" ''
     console.log('Hello world!');
   '';
 
-  drv8 = pkgs.writePerlBin "hello" ''
+  drv9 = pkgs.writePerlBin "hello" ''
     print("Hello world!\n");
   '';
 
-  drv9 = pkgs.writePythonBin "hello" ''
+  drv10 = pkgs.writePythonBin "hello" ''
     print("Hello world!");
   '';
 
-  drv10 = pkgs.writeRustBin "hello" ''
+  drv11 = pkgs.writeRustBin "hello" ''
     fn main() {
       println!("Hello world!");
     }
   '';
 
-  drv11 = {
+  drv12 = {
     nodes = null;
     testScript = ''
       print("Hello world!");

From 45d08da7bb3ea206d698b33f0576fdf9661e2979 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Fri, 26 Dec 2025 21:45:27 +0100
Subject: [PATCH 2592/2704] chore(nix): add mrcjkb to maintainers

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index b2c006f84..318a004f8 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -189,7 +189,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [nim](https://github.com/alaviss/tree-sitter-nim) | unstable | `HF JL` | @aMOPel
 [nim_format_string](https://github.com/aMOPel/tree-sitter-nim-format-string) | unstable | `H  J ` | @aMOPel
 [ninja](https://github.com/alemuller/tree-sitter-ninja) | unstable | `HFIJ ` | @alemuller
-[nix](https://github.com/nix-community/tree-sitter-nix) | unstable | `HFIJL` | @leo60228, @zimbatm
+[nix](https://github.com/nix-community/tree-sitter-nix) | unstable | `HFIJL` | @leo60228, @mrcjkb, @zimbatm
 [nqc](https://github.com/tree-sitter-grammars/tree-sitter-nqc) | unstable | `HFIJL` | @amaanq
 [nu](https://github.com/nushell/tree-sitter-nu) | unstable | `HFIJ ` | @abhisheksingh0x558
 [objc](https://github.com/tree-sitter-grammars/tree-sitter-objc) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 595191dde..2c06f6dce 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1448,7 +1448,7 @@ return {
       revision = 'eabf96807ea4ab6d6c7f09b671a88cd483542840',
       url = 'https://github.com/nix-community/tree-sitter-nix',
     },
-    maintainers = { '@leo60228', '@zimbatm' },
+    maintainers = { '@leo60228', '@mrcjkb', '@zimbatm' },
     tier = 2,
   },
   nqc = {

From 36fcb4a4238928f0b627e1ab84ade0acc1facc2c Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 27 Dec 2025 06:52:04 +0000
Subject: [PATCH 2593/2704] bot(parsers): update desktop, editorconfig, erlang,
 gotmpl, helm, lua, mlir, pascal, sql, typoscript, v, xresources

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 2c06f6dce..f5e0d7d4b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -338,7 +338,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'c38aed8c230dd8f59b5f74ffa5046352b3d376e2',
+      revision = '317de59070dd4f8bd0af03dd3dea5dda0e7a0449',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -441,7 +441,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'c571889b7c875690b78f79c4304cbf267e130818',
+      revision = '3d4994215125087ffea228ccec3654d313968579',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -512,7 +512,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = 'a260cb65eaa6e055289a34434f98c3aae6137ed5',
+      revision = 'f21023bbd6cd30cadbc793d80ae4d990d9be86fc',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -794,7 +794,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = 'c59999dc449c29549f5735eaac31b938a13b6c14',
+      revision = '04270cd3512e2c7de0c5f2823725d7b0c4c01fda',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -906,7 +906,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = 'c59999dc449c29549f5735eaac31b938a13b6c14',
+      revision = '04270cd3512e2c7de0c5f2823725d7b0c4c01fda',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -1278,7 +1278,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = 'd76023017f7485eae629cb60d406c7a1ca0f40c9',
+      revision = '97db86785105b198a760c82f146e4b52d889f386',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1381,7 +1381,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '6b15a0164c0aeed3009e9feff3dc38d54e91cef9',
+      revision = 'c7eec06be8a9ddae688e1b03fca2eed79e9801c4',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1522,7 +1522,7 @@ return {
   },
   pascal = {
     install_info = {
-      revision = '5054931bcd022860dd5936864f981e359fb63aef',
+      revision = '042119eca2e18a60e56317fb06ee3ba5c32cb447',
       url = 'https://github.com/Isopod/tree-sitter-pascal',
     },
     maintainers = { '@Isopod' },
@@ -2123,7 +2123,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '0a3d963f48bf34d2765301f92ea525b4c5103696',
+      revision = '2d5dcd16f9ee49cb5a6d99eabb00fd4ea298587f',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2422,7 +2422,7 @@ return {
   },
   typoscript = {
     install_info = {
-      revision = 'e59069a4cc08b2dacccd40827fe971ca3c6821b7',
+      revision = '1811c767f3f72be669891b524a07c58b1eb0db87',
       url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
     },
     maintainers = { '@Teddytrombone' },
@@ -2480,7 +2480,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '236d51bba1bccd57fd2950956fbffe5fe0248735',
+      revision = '5f6c9c414f6e1ca3b991830c2d32b4cb83bef383',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2612,7 +2612,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'a19a2acc5299b9bc0e3b4c8184c2860fdc66eba0',
+      revision = 'ff2b89e99d7760e77544b662125df84d7be1641d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 7efc1b58a8061d29786860006c7257c90a5196dc Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc@jakobi.dev>
Date: Mon, 29 Dec 2025 16:47:03 +0100
Subject: [PATCH 2594/2704] fix(nix):  refactor nixosTest injections for better
 performance (#8378)

---
 runtime/queries/nix/injections.scm            | 38 ++++++++++++++-----
 .../injections/nix/test-nix-injections.nix    |  8 ++--
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
index 7d0ffe8e5..718a9c1c5 100644
--- a/runtime/queries/nix/injections.scm
+++ b/runtime/queries/nix/injections.scm
@@ -251,17 +251,35 @@
   (#lua-match? @_func "^%a*%.*writeRust%a*$")
   (#set! injection.combined))
 
-; (nixosTest) testScript
-((binding
-  attrpath: (attrpath) @_attr_name
-  (#eq? @_attr_name "nodes"))
-  (binding
-    attrpath: (attrpath) @_func_name
-    (#eq? @_func_name "testScript")
+; (runTest) testScript
+(apply_expression
+  function: (_) @_func
+  argument: (_
+    (_)*
     (_
-      (string_fragment) @injection.content
-      (#set! injection.language "python")))
-  (#set! injection.combined))
+      (binding
+        attrpath: (attrpath) @_func_name
+        expression: (_
+          (string_fragment) @injection.content
+          (#set! injection.language "python")))
+      (#eq? @_func_name "testScript")
+      (#lua-match? @_func "^.*%.*runTest$")
+      (#set! injection.combined))))
+
+; (nixosTest) testScript
+(apply_expression
+  function: (_) @_func
+  argument: (_
+    (_)*
+    (_
+      (binding
+        attrpath: (attrpath) @_func_name
+        expression: (_
+          (string_fragment) @injection.content
+          (#set! injection.language "python")))
+      (#eq? @_func_name "testScript")
+      (#lua-match? @_func "^.*%.*nixosTest$")
+      (#set! injection.combined))))
 
 ; home-manager Neovim plugin config
 (attrset_expression
diff --git a/tests/query/injections/nix/test-nix-injections.nix b/tests/query/injections/nix/test-nix-injections.nix
index b358326ab..7505398e6 100644
--- a/tests/query/injections/nix/test-nix-injections.nix
+++ b/tests/query/injections/nix/test-nix-injections.nix
@@ -1,7 +1,7 @@
 # NOTE: This file is for testing queries. If evaluated with nix, this will probably error.
-{ pkgs, stdenv }: let
+{ pkgs, stdenv, lib }: let
   match = builtins.match;
-in { 
+in {
   regex = builtins.match "^.*[{](.+)[}].*$" "blahblah {something} blahblah" [ "something" ];
 
   regex2 = match "^.*[{](.+)[}].*$" "blahblah {something} blahblah" [ "something" ];
@@ -12,7 +12,7 @@ in {
       echo "bar" > $out/foo.txt
     '';
   };
-  
+
   drv2 = pkgs.writeShellApplication {
     name = "shellApp";
     buildInputs = [];
@@ -62,7 +62,7 @@ in {
     }
   '';
 
-  drv12 = {
+  drv12 = lib.nixos.runTest {
     nodes = null;
     testScript = ''
       print("Hello world!");

From d6ce707613e9d19873b7f9f37d9643c9caf4b032 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 31 Dec 2025 13:47:33 +0100
Subject: [PATCH 2595/2704] feat(lua): replace operator list with field

---
 runtime/queries/lua/highlights.scm | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 79ab165aa..6e33a955c 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -70,36 +70,18 @@
   ] @keyword.function)
 
 ; Operators
+(binary_expression
+  operator: _ @operator)
+
+(unary_expression
+  operator: _ @operator)
+
 [
   "and"
   "not"
   "or"
 ] @keyword.operator
 
-[
-  "+"
-  "-"
-  "*"
-  "/"
-  "%"
-  "^"
-  "#"
-  "=="
-  "~="
-  "<="
-  ">="
-  "<"
-  ">"
-  "="
-  "&"
-  "~"
-  "|"
-  "<<"
-  ">>"
-  "//"
-  ".."
-] @operator
-
 ; Punctuations
 [
   ";"

From c6dd314086f7b471bf6c9110092a94ce1c06d220 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 31 Dec 2025 14:15:06 +0100
Subject: [PATCH 2596/2704] fix(lua): re-add missing assignment operator

---
 runtime/queries/lua/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 6e33a955c..0bfdda4e5 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -76,6 +76,8 @@
 (unary_expression
   operator: _ @operator)
 
+"=" @operator
+
 [
   "and"
   "not"

From efa5d1fa3a7218c6fd8e04c42882af4b8468e8b2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 2 Jan 2026 09:56:33 +0100
Subject: [PATCH 2597/2704] feat(robots)!: adapt to renamed parser

---
 SUPPORTED_LANGUAGES.md                                | 2 +-
 lua/nvim-treesitter/parsers.lua                       | 4 ++--
 runtime/queries/{robots => robots_txt}/highlights.scm | 0
 runtime/queries/{robots => robots_txt}/injections.scm | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename runtime/queries/{robots => robots_txt}/highlights.scm (100%)
 rename runtime/queries/{robots => robots_txt}/injections.scm (100%)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 318a004f8..15cd8c8b0 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -245,7 +245,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [rifleconf](https://github.com/purarue/tree-sitter-rifleconf) | unstable | `H  J ` | @purarue
 [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
 [robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` | @Hubro
-[robots](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
+[robots_txt](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
 [roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H IJL` | @nat-418
 [ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
 [rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` | @stsewd
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index f5e0d7d4b..ab1ecc464 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1914,9 +1914,9 @@ return {
     maintainers = { '@Hubro' },
     tier = 2,
   },
-  robots = {
+  robots_txt = {
     install_info = {
-      revision = '8e3a4205b76236bb6dbebdbee5afc262ce38bb62',
+      revision = '0c066107e3548de79316a6a4ec771e2f7cf7c468',
       url = 'https://github.com/opa-oz/tree-sitter-robots-txt',
     },
     maintainers = { '@opa-oz' },
diff --git a/runtime/queries/robots/highlights.scm b/runtime/queries/robots_txt/highlights.scm
similarity index 100%
rename from runtime/queries/robots/highlights.scm
rename to runtime/queries/robots_txt/highlights.scm
diff --git a/runtime/queries/robots/injections.scm b/runtime/queries/robots_txt/injections.scm
similarity index 100%
rename from runtime/queries/robots/injections.scm
rename to runtime/queries/robots_txt/injections.scm

From 1927c76aec829d40dcad24b6469cb639f1334096 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 1 Jan 2026 20:52:04 +0100
Subject: [PATCH 2598/2704] feat(install): warn on unsupported parsers

---
 lua/nvim-treesitter/config.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index f76897bc4..b3a294563 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -140,8 +140,12 @@ function M.norm_languages(languages, skip)
   languages = vim.tbl_filter(
     --- @param v string
     function(v)
-      -- TODO(lewis6991): warn of any unknown parsers?
-      return parsers[v] ~= nil
+      if parsers[v] ~= nil then
+        return true
+      else
+        require('nvim-treesitter.log').warn('skipping unsupported language: ' .. v)
+        return false
+      end
     end,
     languages
   )

From 737088f8571293f6a1ef8cd6c858d5daf9a38162 Mon Sep 17 00:00:00 2001
From: Daniel Jakots <danieljakots@users.noreply.github.com>
Date: Fri, 2 Jan 2026 10:37:00 -0500
Subject: [PATCH 2599/2704] docs(languages): remove unused `node` legend
 (#8396)

erroneously reintroduced in 69c76488f7c6929ce55222f6a887e497a24c74b8.
---
 SUPPORTED_LANGUAGES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 15cd8c8b0..33b1dd041 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -5,7 +5,6 @@ The following is a list of languages for which a parser can be installed through
 Legend:
 - **Tier:** _stable_ (updates follow semver releases), _unstable_ (updates follow HEAD), _unmaintained_ (no automatic updates), or _unsupported_ (known to be broken, cannot be installed)
 - **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
-- **Node:** Parser requires `node` for installation
 - **Maintainer** of queries in nvim-treesitter (may be different from parser maintainer!)
 
 <!--This section of the README is automatically updated by a CI job-->

From 46c16d89a8e2d53c1a38c01dd4b93d971b850c75 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 3 Jan 2026 06:52:19 +0000
Subject: [PATCH 2600/2704] bot(parsers): update c3, desktop, editorconfig,
 javadoc, kitty, lua, nginx, query, swift, templ, typespec, v, vim, xresources

---
 SUPPORTED_LANGUAGES.md          |  2 +-
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 33b1dd041..03e8b5d4f 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -22,7 +22,7 @@ Language | Tier | Queries | Maintainer
 [awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` | 
 [bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HF JL` | @TravonteD
 [bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unstable | `HF J ` | @polarmutex
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unmaintained | `HF J ` | @polarmutex
 [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` | @theHamsta, @clason
 [bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` | @amaanq
 [bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ab1ecc464..ac6284f42 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,11 +93,11 @@ return {
   },
   beancount = {
     install_info = {
-      revision = 'b7a2557e6c8cf1dc70a52cece1861522ad3903fc',
+      revision = '07bfb0ec6d9e255d776cdd3362128364d2b0bb2f',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
-    tier = 2,
+    tier = 3,
   },
   bibtex = {
     install_info = {
@@ -158,7 +158,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '6b4e9127f90fa35d39f5314211bc5f7e304304bb',
+      revision = '805f776dcfbfef5c9baf4270ec942b3e8dc7ff16',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -338,7 +338,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '317de59070dd4f8bd0af03dd3dea5dda0e7a0449',
+      revision = 'c0279c1fb1e2e1f06f374437815d4abda02e30b2',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -441,7 +441,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '3d4994215125087ffea228ccec3654d313968579',
+      revision = 'f8e8a4cefe4de5d7e87bd129f3a69bdcdf73eebe',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -1058,7 +1058,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '5c6157fe1c44e843f739e11b41c48c5918ec8709',
+      revision = '373fbd84f35aff70031426ed6edf3cdf52b93532',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1181,7 +1181,7 @@ return {
   },
   kitty = {
     install_info = {
-      revision = '2e9b602ca676cac63887cca5a4535106f3475c82',
+      revision = 'f821c16397ffab5b776d8781245215811438a624',
       url = 'https://github.com/OXY2DEV/tree-sitter-kitty',
     },
     maintainers = { '@OXY2DEV' },
@@ -1278,7 +1278,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = '97db86785105b198a760c82f146e4b52d889f386',
+      revision = 'e284fcec45ead0d477e326fccd2cd4a68a89dae4',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1405,7 +1405,7 @@ return {
   },
   nginx = {
     install_info = {
-      revision = '989da760be05a3334af3ec88705cbf57e6a9c41d',
+      revision = '47ade644d754cce57974aac44d2c9450e823d4f4',
       url = 'https://github.com/opa-oz/tree-sitter-nginx',
     },
     maintainers = { '@opa-oz' },
@@ -1787,7 +1787,7 @@ return {
   },
   query = {
     install_info = {
-      revision = 'a4e379d4a4b77a09e91c1c9e12d4b898214f990e',
+      revision = '6350ad724e7b17a7eea712d4860b4d2ae892e0b6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2214,7 +2214,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '78d84ef82c387fceeb6094038da28717ea052e39',
+      revision = '82a239e4c164b0567fb99b80b53f99ba661f2168',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2287,7 +2287,7 @@ return {
   },
   templ = {
     install_info = {
-      revision = '3057cd485f7f23a8ad24107c6adc604f8c5ce3db',
+      revision = '1c6db04effbcd7773c826bded9783cbc3061bd55',
       url = 'https://github.com/vrischmann/tree-sitter-templ',
     },
     maintainers = { '@vrischmann' },
@@ -2414,7 +2414,7 @@ return {
   },
   typespec = {
     install_info = {
-      revision = '814c98283fd92a248ba9d49ebfe61bc672a35875',
+      revision = '395bef1e1eb4dd18365401642beb534e8a244056',
       url = 'https://github.com/happenslol/tree-sitter-typespec',
     },
     maintainers = { '@happenslol' },
@@ -2480,7 +2480,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '5f6c9c414f6e1ca3b991830c2d32b4cb83bef383',
+      revision = '9cf6a37689f06b17d170dec644ace81eb8eab280',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },
@@ -2520,7 +2520,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '8b8db7d8e4db799ab6b0db25a7990c2890133c1e',
+      revision = '78866caaacf123f4d9d227fe1ab521cc62167a88',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2612,7 +2612,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'ff2b89e99d7760e77544b662125df84d7be1641d',
+      revision = 'f60fb1e661d85f35fb8e7b988a41d2a74f65bfd4',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 86cf4fb68444be61eae330baf50fbd7451e1568b Mon Sep 17 00:00:00 2001
From: neno <2623996218@qq.com>
Date: Wed, 31 Dec 2025 23:54:37 +0800
Subject: [PATCH 2601/2704] fix(ruby): improve highlights for pattern matching
 and for...in loops

---
 runtime/queries/ruby/highlights.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/runtime/queries/ruby/highlights.scm b/runtime/queries/ruby/highlights.scm
index 0472df092..5aa518a28 100644
--- a/runtime/queries/ruby/highlights.scm
+++ b/runtime/queries/ruby/highlights.scm
@@ -48,6 +48,9 @@
   "then"
 ] @keyword.conditional
 
+(in_clause
+  "in" @keyword.conditional)
+
 (if
   "end" @keyword.conditional)
 
@@ -61,6 +64,9 @@
   "next"
 ] @keyword.repeat
 
+(in
+  "in" @keyword.repeat)
+
 (constant) @constant
 
 ((identifier) @keyword.modifier
@@ -291,6 +297,9 @@
 (pair
   ":" @punctuation.delimiter)
 
+(keyword_pattern
+  ":" @punctuation.delimiter)
+
 [
   "("
   ")"

From 433779916223596dce3ea64f4b77300c3aa2bfdc Mon Sep 17 00:00:00 2001
From: Sten Laane <21343173+StenAL@users.noreply.github.com>
Date: Wed, 31 Dec 2025 08:59:16 +0200
Subject: [PATCH 2602/2704] feat(bash): add indents query

It's pretty basic at the moment but already makes working with bash
scripts way easier.
---
 SUPPORTED_LANGUAGES.md           |  2 +-
 runtime/queries/bash/indents.scm | 32 ++++++++++++++++++++++++++
 tests/indent/bash/test.sh        | 39 ++++++++++++++++++++++++++++++++
 tests/indent/bash_spec.lua       | 33 +++++++++++++++++++++++++++
 4 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/bash/indents.scm
 create mode 100644 tests/indent/bash/test.sh
 create mode 100644 tests/indent/bash_spec.lua

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 03e8b5d4f..d1e0e7907 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -20,7 +20,7 @@ Language | Tier | Queries | Maintainer
 [astro](https://github.com/virchau13/tree-sitter-astro) | unstable | `HFIJL` | @virchau13
 [authzed](https://github.com/mleonidas/tree-sitter-authzed) | unstable | `H  J ` | @mattpolzin
 [awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` | 
-[bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HF JL` | @TravonteD
+[bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HFIJL` | @TravonteD
 [bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` | @amaanq
 [beancount](https://github.com/polarmutex/tree-sitter-beancount) | unmaintained | `HF J ` | @polarmutex
 [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` | @theHamsta, @clason
diff --git a/runtime/queries/bash/indents.scm b/runtime/queries/bash/indents.scm
new file mode 100644
index 000000000..c0a4bed47
--- /dev/null
+++ b/runtime/queries/bash/indents.scm
@@ -0,0 +1,32 @@
+[
+  (if_statement)
+  (for_statement)
+  (while_statement)
+  (case_statement)
+  (function_definition)
+  (compound_statement)
+  (subshell)
+  (command_substitution)
+  (do_group)
+  (case_item)
+] @indent.begin
+
+[
+  "fi"
+  "done"
+  "esac"
+  "}"
+  ")"
+  "then"
+  "do"
+  (elif_clause)
+  (else_clause)
+] @indent.branch
+
+[
+  "fi"
+  "done"
+  "esac"
+  "}"
+  ")"
+] @indent.end
diff --git a/tests/indent/bash/test.sh b/tests/indent/bash/test.sh
new file mode 100644
index 000000000..7e708a93d
--- /dev/null
+++ b/tests/indent/bash/test.sh
@@ -0,0 +1,39 @@
+for i in 1 2 3; do
+    if [[ true ]]; then
+        echo "asd"
+    elif [ true ]; then
+        echo "dsa"
+    else
+        echo ""
+    fi
+    echo $i
+done
+
+while true; do
+    break
+done
+
+case $foo in
+    a) echo a ;;
+    b) echo b ;;
+esac
+
+function x() {
+    echo x
+}
+
+y() {
+    echo y
+}
+
+{
+    echo z
+}
+
+(
+    echo subshell
+)
+
+A=$(
+    echo command substitution
+)
diff --git a/tests/indent/bash_spec.lua b/tests/indent/bash_spec.lua
new file mode 100644
index 000000000..fa551c37c
--- /dev/null
+++ b/tests/indent/bash_spec.lua
@@ -0,0 +1,33 @@
+local Runner = require('tests.indent.common').Runner
+local XFAIL = require('tests.indent.common').XFAIL
+
+local run = Runner:new(it, 'tests/indent/bash', {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 0,
+  expandtab = true,
+})
+
+describe('indent Bash:', function()
+  describe('whole file:', function()
+    run:whole_file('.', {
+      expected_failures = {},
+    })
+  end)
+
+  describe('new line:', function()
+    run:new_line('test.sh', { on_line = 1, text = 'echo test', indent = 4 }) -- in "for"
+    run:new_line('test.sh', { on_line = 2, text = 'echo test', indent = 8 }) -- in "if"
+    run:new_line('test.sh', { on_line = 4, text = 'echo test', indent = 8 }) -- in "elif"
+    run:new_line('test.sh', { on_line = 6, text = 'echo test', indent = 8 }) -- in "else"
+    run:new_line('test.sh', { on_line = 8, text = 'echo test', indent = 4 }) -- after "fi"
+    run:new_line('test.sh', { on_line = 12, text = 'echo test', indent = 4 }) -- in "while"
+    run:new_line('test.sh', { on_line = 18, text = 'c) echo test ;;', indent = 4 }) -- in "case"
+    run:new_line('test.sh', { on_line = 21, text = 'echo test', indent = 4 }) -- in "function"
+    run:new_line('test.sh', { on_line = 25, text = 'echo test', indent = 4 }) -- in "f() { ... }"
+    run:new_line('test.sh', { on_line = 29, text = 'echo test', indent = 4 }) -- in "{ ... }"
+    run:new_line('test.sh', { on_line = 33, text = 'echo test', indent = 4 }) -- in subshell
+    run:new_line('test.sh', { on_line = 37, text = 'echo test', indent = 4 }) -- in command substitution
+    run:new_line('test.sh', { on_line = 39, text = 'echo test', indent = 0 })
+  end)
+end)

From 300b906a9514d5e0ce02911d371445382fe35a31 Mon Sep 17 00:00:00 2001
From: PolarMutex <115141+polarmutex@users.noreply.github.com>
Date: Sat, 3 Jan 2026 12:15:14 -0500
Subject: [PATCH 2603/2704] fix(beancount): update to windows-compatible
 version (#8401)

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index d1e0e7907..a487c7cca 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -22,7 +22,7 @@ Language | Tier | Queries | Maintainer
 [awk](https://github.com/Beaglefoot/tree-sitter-awk) | unstable | `H  J ` | 
 [bash](https://github.com/tree-sitter/tree-sitter-bash) | unstable | `HFIJL` | @TravonteD
 [bass](https://github.com/vito/tree-sitter-bass) | unstable | `HFIJL` | @amaanq
-[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unmaintained | `HF J ` | @polarmutex
+[beancount](https://github.com/polarmutex/tree-sitter-beancount) | unstable | `HF J ` | @polarmutex
 [bibtex](https://github.com/latex-lsp/tree-sitter-bibtex) | unstable | `HFIJ ` | @theHamsta, @clason
 [bicep](https://github.com/tree-sitter-grammars/tree-sitter-bicep) | unstable | `HFIJL` | @amaanq
 [bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ac6284f42..9ce38664d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,11 +93,11 @@ return {
   },
   beancount = {
     install_info = {
-      revision = '07bfb0ec6d9e255d776cdd3362128364d2b0bb2f',
+      revision = '653cce316fbff8d212a2488ae13df648efb542a4',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
-    tier = 3,
+    tier = 2,
   },
   bibtex = {
     install_info = {

From 31fc7e10cd7c1fd7717b439050d0f91c2c4f0a4b Mon Sep 17 00:00:00 2001
From: Chris Dragan <chris@dragan.dev>
Date: Sun, 4 Jan 2026 10:08:07 +0000
Subject: [PATCH 2604/2704] feat: add kos parser and queries (#8389)

---
 SUPPORTED_LANGUAGES.md              |   1 +
 lua/nvim-treesitter/parsers.lua     |   8 ++
 runtime/queries/kos/folds.scm       |  19 ++++
 runtime/queries/kos/highlights.scm  | 141 ++++++++++++++++++++++++++
 runtime/queries/kos/injections.scm  |   6 ++
 runtime/queries/kos/locals.scm      |  41 ++++++++
 tests/query/highlights/kos/test.kos | 149 ++++++++++++++++++++++++++++
 7 files changed, 365 insertions(+)
 create mode 100644 runtime/queries/kos/folds.scm
 create mode 100644 runtime/queries/kos/highlights.scm
 create mode 100644 runtime/queries/kos/injections.scm
 create mode 100644 runtime/queries/kos/locals.scm
 create mode 100644 tests/query/highlights/kos/test.kos

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index a487c7cca..153483006 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -157,6 +157,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [kconfig](https://github.com/tree-sitter-grammars/tree-sitter-kconfig) | unstable | `HFIJL` | @amaanq
 [kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` | @amaanq
 [kitty](https://github.com/OXY2DEV/tree-sitter-kitty) | unstable | `H  J ` | @OXY2DEV
+[kos](https://github.com/kos-lang/tree-sitter-kos) | unstable | `HF JL` | @cdragan
 [kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` | @SalBakraa
 [koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` | @irh
 [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` | @Willem-J-an
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9ce38664d..b7037d245 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1187,6 +1187,14 @@ return {
     maintainers = { '@OXY2DEV' },
     tier = 2,
   },
+  kos = {
+    install_info = {
+      revision = '5f11d41b3150b0837e8b3964151ebb7fc4f367e9',
+      url = 'https://github.com/kos-lang/tree-sitter-kos',
+    },
+    maintainers = { '@cdragan' },
+    tier = 2,
+  },
   kotlin = {
     install_info = {
       revision = '57fb4560ba8641865bc0baa6b3f413b236112c4c',
diff --git a/runtime/queries/kos/folds.scm b/runtime/queries/kos/folds.scm
new file mode 100644
index 000000000..ca51a5406
--- /dev/null
+++ b/runtime/queries/kos/folds.scm
@@ -0,0 +1,19 @@
+[
+  (function_decl)
+  (constructor_literal)
+  (function_literal)
+  (class_decl)
+  (class_literal)
+  (do_statement)
+  (if_statement)
+  (try_statement)
+  (defer_statement)
+  (with_statement)
+  (switch_statement)
+  (switch_case)
+  (default_case)
+  (loop_statement)
+  (repeat_statement)
+  (while_statement)
+  (for_statement)
+] @fold
diff --git a/runtime/queries/kos/highlights.scm b/runtime/queries/kos/highlights.scm
new file mode 100644
index 000000000..0942b2b89
--- /dev/null
+++ b/runtime/queries/kos/highlights.scm
@@ -0,0 +1,141 @@
+(hash_bang) @keyword.directive
+
+(comment) @comment @spell
+
+(number) @number
+
+(identifier) @variable
+
+(property_identifier) @property
+
+[
+  (string_literal)
+  (string_literal_begin)
+  (string_literal_continuation)
+  (string_literal_end)
+] @string
+
+[
+  "case"
+  "default"
+  "else"
+  "if"
+  "switch"
+] @keyword.conditional
+
+"import" @keyword.import
+
+[
+  (break_statement)
+  (continue_statement)
+  "for"
+  "loop"
+  "repeat"
+  "while"
+] @keyword.repeat
+
+(for_statement
+  "in" @keyword.repeat)
+
+"class" @keyword.type
+
+[
+  "return"
+  "yield"
+] @keyword.return
+
+[
+  "catch"
+  "defer"
+  "throw"
+  "try"
+] @keyword.exception
+
+[
+  "constructor"
+  "fun"
+  "=>"
+] @keyword.function
+
+[
+  "_"
+  (line)
+  "assert"
+  ;"async"
+  "const"
+  "do"
+  "extends"
+  (fallthrough_statement)
+  ;"get"
+  ;"match"
+  "public"
+  ;"set"
+  ;"static"
+  "var"
+  "with"
+] @keyword
+
+[
+  (this)
+  (super)
+] @variable.builtin
+
+[
+  (false)
+  (true)
+] @boolean
+
+(void) @constant.builtin
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  ";"
+  ":"
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  (arithmetic_assignment_operator)
+  (comparison_operator)
+  (bitwise_operator)
+  (additive_operator)
+  (multiplicative_operator)
+  (logical_operator)
+  (unary_operator)
+  "->"
+  "..."
+  "="
+  "?"
+] @operator
+
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+(class_member
+  (function_decl
+    name: (identifier) @function.method))
+
+(function_decl
+  name: (identifier) @function)
+
+(class_decl
+  name: (identifier) @type)
+
+(invocation
+  (identifier) @function.call)
+
+(invocation
+  (refinement
+    property: (property_identifier) @function.method.call))
diff --git a/runtime/queries/kos/injections.scm b/runtime/queries/kos/injections.scm
new file mode 100644
index 000000000..2677f272b
--- /dev/null
+++ b/runtime/queries/kos/injections.scm
@@ -0,0 +1,6 @@
+(((comment) @_jsdoc_comment
+  (#lua-match? @_jsdoc_comment "^/[*][*][^*].*[*]/$")) @injection.content
+  (#set! injection.language "jsdoc"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/runtime/queries/kos/locals.scm b/runtime/queries/kos/locals.scm
new file mode 100644
index 000000000..37f14f4e6
--- /dev/null
+++ b/runtime/queries/kos/locals.scm
@@ -0,0 +1,41 @@
+; Scopes
+;-------
+(compound_statement) @local.scope
+
+(for_statement) @local.scope
+
+(function_decl) @local.scope
+
+(constructor_literal) @local.scope
+
+(function_literal) @local.scope
+
+(with_statement) @local.scope
+
+(catch_clause) @local.scope
+
+; Definitions
+;------------
+(variable_decl
+  variable: (identifier) @local.definition.var)
+
+(parameter
+  parameter: (identifier) @local.definition.parameter)
+
+(import
+  module: (identifier) @local.definition.import)
+
+(import
+  symbol: (identifier) @local.definition.import)
+
+(function_decl
+  name: (identifier) @local.definition.function
+  (#set! definition.var.scope parent))
+
+(class_decl
+  name: (identifier) @local.definition.type
+  (#set! definition.var.scope parent))
+
+; References
+;------------
+(identifier) @local.reference
diff --git a/tests/query/highlights/kos/test.kos b/tests/query/highlights/kos/test.kos
new file mode 100644
index 000000000..981fdb313
--- /dev/null
+++ b/tests/query/highlights/kos/test.kos
@@ -0,0 +1,149 @@
+#!/usr/bin/env kos
+# ^ keyword.directive
+public var item = 1;
+# ^ keyword
+#      ^ keyword
+#          ^ variable
+#               ^ operator
+#                 ^ number
+#                  ^ punctuation.delimiter
+
+# hash comment
+# <- @comment @spell
+
+// slash comment
+# <- @comment @spell
+
+/* block comment */
+# <- @comment @spell
+
+fun name(arg1,
+# ^ keyword.function
+#   ^ function
+#       ^ punctuation.bracket
+#        ^ variable
+#            ^ punctuation.delimiter
+         arg2 = "default",
+#        ^ variable
+#             ^ operator
+#               ^ string
+#                        ^ punctuation.delimiter
+         arg3...)
+#        ^ variable
+#            ^ operator
+#               ^ punctuation.bracket
+{
+# <- punctuation.bracket
+    arg1 += 1
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 -= 2
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 *= 3
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 /= 4
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 %= 5
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 |= 6
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 &= 7
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 ^= 8
+    # ^ variable
+    #    ^ operator
+    #       ^ number
+    arg1 <<= 9
+    # ^ variable
+    #    ^ operator
+    #        ^ number
+    arg1 >>= 10
+    # ^ variable
+    #    ^ operator
+    #        ^ number
+    arg1 >>>= 11
+    # ^ variable
+    #    ^ operator
+    #         ^ number
+    arg1.prop[arg1](arg1)[void] = true
+    # ^ variable
+    #   ^ punctuation.delimiter
+    #    ^ property
+    #        ^ punctuation.bracket
+    #         ^ variable
+    #             ^ punctuation.bracket
+    #              ^ punctuation.bracket
+    #               ^ variable
+    #                   ^ punctuation.bracket
+    #                    ^ punctuation.bracket
+    #                     ^ constant.builtin
+    #                           ^ operator
+    #                             ^ boolean
+    arg1 = 1 * (arg1 + 2) / arg1 - 3 % arg1
+    # ^ variable
+    #    ^ operator
+    #      ^ number
+    #        ^ operator
+    #          ^ punctuation.bracket
+    #           ^ variable
+    #                ^ operator
+    #                  ^ number
+    #                   ^ punctuation.bracket
+    #                     ^ operator
+    #                       ^ variable
+    #                            ^ operator
+    #                              ^ number
+    #                                ^ operator
+    #                                  ^ variable
+    for const elem in arg1 {
+    # ^ keyword.repeat
+    #   ^ keyword
+    #         ^ variable
+    #              ^ keyword.repeat
+    #                 ^ variable
+    #                      ^ punctuation.bracket
+        if elem {
+    #   ^ keyword.conditional
+    #      ^ variable
+    #           ^ punctuation.bracket
+            continue
+    #       ^ keyword.repeat
+        }
+    #   ^ punctuation.bracket
+        else {
+    #   ^ keyword.conditional
+    #        ^ punctuation.bracket
+            break
+    #       ^ keyword.repeat
+        }
+    #   ^ punctuation.bracket
+    }
+    # <- punctuation.bracket
+}
+# <- punctuation.bracket
+
+name(42)
+# <- function.call
+#   ^ punctuation.bracket
+#    ^ number
+#      ^ punctuation.bracket
+
+name.name()
+# <- variable
+#   ^ punctuation.delimiter
+#    ^ function.method.call
+#        ^ punctuation.bracket
+#         ^ punctuation.bracket

From 99dfc5acefd7728cec4ad0d0a6a9720f2c2896ff Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 4 Jan 2026 18:04:18 +0100
Subject: [PATCH 2605/2704] docs(readme): fix lazy snippet

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0f363c5f7..298ee8182 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@ For details on these and how to help improving them, see [CONTRIBUTING.md](./CON
 You can install `nvim-treesitter` with your favorite package manager (or using the native `package` feature of vim, see `:h packages`).
 
 This plugin is only guaranteed to work with specific versions of language parsers** (as specified in the `parser.lua` table). **When upgrading the plugin, you must make sure that all installed parsers are updated to the latest version** via `:TSUpdate`.
-It is strongly recommended to automate this; e.g., using [lazy.nvim](https://github.com/folke/lazy.nvim)
+It is strongly recommended to automate this; e.g., using the following spec with [lazy.nvim](https://github.com/folke/lazy.nvim):
 
 ```lua
-require('lazy').setup({
+{
   'nvim-treesitter/nvim-treesitter',
   lazy = false,
   build = ':TSUpdate'

From b033ab331ca0bccbd93c3c2b4f886fdfc09abec0 Mon Sep 17 00:00:00 2001
From: Farid <faridfarajli86@gmail.com>
Date: Mon, 5 Jan 2026 14:15:36 +0400
Subject: [PATCH 2606/2704] docs(readme): fix lazy snippet

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 298ee8182..f542e4933 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ It is strongly recommended to automate this; e.g., using the following spec with
   'nvim-treesitter/nvim-treesitter',
   lazy = false,
   build = ':TSUpdate'
-})
+}
 ```
 
 >[!IMPORTANT]

From de878155ca66c49b027b1380e4e60a6c665b2630 Mon Sep 17 00:00:00 2001
From: Igor Lacerda <igorlfs@ufmg.br>
Date: Wed, 7 Jan 2026 12:39:29 -0300
Subject: [PATCH 2607/2704] fix(html_tags): disable spell for tags (#8410)

When tags are embedded into markdown, they'd get spell checked, in spite
of that not really making sense. The real culprit of this issue is
markdown's spell being too "loose".
---
 runtime/queries/html_tags/highlights.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/html_tags/highlights.scm b/runtime/queries/html_tags/highlights.scm
index 9eaf813be..94a338aa7 100644
--- a/runtime/queries/html_tags/highlights.scm
+++ b/runtime/queries/html_tags/highlights.scm
@@ -1,9 +1,11 @@
-(tag_name) @tag
+(tag_name) @tag @nospell
 
 ; (erroneous_end_tag_name) @error ; we do not lint syntax errors
 (comment) @comment @spell
 
-(attribute_name) @tag.attribute
+(attribute_name) @tag.attribute @nospell
+
+(attribute_value) @nospell
 
 ((attribute
   (quoted_attribute_value) @string)

From 6feaebb4561711cf6b99f2e8b96715a9fc9b496b Mon Sep 17 00:00:00 2001
From: Chris Dragan <chris@dragan.dev>
Date: Thu, 8 Jan 2026 05:53:42 +0000
Subject: [PATCH 2608/2704] feat(kos): highlights improvements (#8404)

* Mark floats as number.float
* Mark function arguments as variable.parameter
* Mark _ placeholder as character.special
* Mark string interpolation delimiters as punctuation.special
---
 lua/nvim-treesitter/parsers.lua     |  2 +-
 runtime/queries/kos/highlights.scm  | 17 +++++++++++-
 tests/query/highlights/kos/test.kos | 40 ++++++++++++++++++++++++++---
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b7037d245..e8af232b6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1189,7 +1189,7 @@ return {
   },
   kos = {
     install_info = {
-      revision = '5f11d41b3150b0837e8b3964151ebb7fc4f367e9',
+      revision = '03b261c1a78b71c38cf4616497f253c4a4ce118b',
       url = 'https://github.com/kos-lang/tree-sitter-kos',
     },
     maintainers = { '@cdragan' },
diff --git a/runtime/queries/kos/highlights.scm b/runtime/queries/kos/highlights.scm
index 0942b2b89..07757d2e3 100644
--- a/runtime/queries/kos/highlights.scm
+++ b/runtime/queries/kos/highlights.scm
@@ -4,8 +4,13 @@
 
 (number) @number
 
+(float_number) @number.float
+
 (identifier) @variable
 
+(parameter
+  parameter: (identifier) @variable.parameter)
+
 (property_identifier) @property
 
 [
@@ -57,8 +62,9 @@
   "=>"
 ] @keyword.function
 
+"_" @character.special
+
 [
-  "_"
   (line)
   "assert"
   ;"async"
@@ -96,6 +102,15 @@
   "}"
 ] @punctuation.bracket
 
+(string_literal_begin
+  "\\(" @punctuation.special)
+
+(string_literal_continuation
+  "\\(" @punctuation.special)
+
+(formatted_string
+  ")" @punctuation.special)
+
 [
   ";"
   ":"
diff --git a/tests/query/highlights/kos/test.kos b/tests/query/highlights/kos/test.kos
index 981fdb313..4e1b0ec6d 100644
--- a/tests/query/highlights/kos/test.kos
+++ b/tests/query/highlights/kos/test.kos
@@ -21,15 +21,15 @@ fun name(arg1,
 # ^ keyword.function
 #   ^ function
 #       ^ punctuation.bracket
-#        ^ variable
+#        ^ variable.parameter
 #            ^ punctuation.delimiter
          arg2 = "default",
-#        ^ variable
+#        ^ variable.parameter
 #             ^ operator
 #               ^ string
 #                        ^ punctuation.delimiter
          arg3...)
-#        ^ variable
+#        ^ variable.parameter
 #            ^ operator
 #               ^ punctuation.bracket
 {
@@ -147,3 +147,37 @@ name.name()
 #    ^ function.method.call
 #        ^ punctuation.bracket
 #         ^ punctuation.bracket
+
+print("hello \(123 + var) world \(true)")
+# <- function.call
+#    ^ punctuation.bracket
+#     ^ string
+#            ^ punctuation.special
+#              ^ number
+#                  ^ operator
+#                    ^ variable
+#                       ^ punctuation.special
+#                        ^ string
+#                               ^ punctuation.special
+#                                 ^ boolean
+#                                     ^ punctuation.special
+#                                       ^ punctuation.bracket
+
+[] -> each((x,_,y) => x + y)
+# <- punctuation.bracket
+#^ punctuation.bracket
+#  ^ operator
+#     ^ function.call
+#         ^ punctuation.bracket
+#          ^ punctuation.bracket
+#           ^ variable.parameter
+#            ^ punctuation.delimiter
+#             ^ character.special
+#              ^ punctuation.delimiter
+#               ^ variable.parameter
+#                ^ punctuation.bracket
+#                  ^ keyword.function
+#                     ^ variable
+#                       ^ operator
+#                         ^ variable
+#                          ^ punctuation.bracket

From 9177f2ff061627f0af0f994e3a3c620a84c0c59b Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <stf_xl@wp.pl>
Date: Thu, 8 Jan 2026 06:59:10 +0100
Subject: [PATCH 2609/2704] feat(parsers): add bpftrace (#8399)

Co-authored-by: Riley Bruins <ribru17@hotmail.com>
---
 SUPPORTED_LANGUAGES.md                  |   1 +
 lua/nvim-treesitter/parsers.lua         |   8 +
 runtime/queries/bpftrace/highlights.scm | 228 ++++++++++++++++++++++++
 runtime/queries/bpftrace/injections.scm |  12 ++
 4 files changed, 249 insertions(+)
 create mode 100644 runtime/queries/bpftrace/highlights.scm
 create mode 100644 runtime/queries/bpftrace/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 153483006..59be83a32 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -28,6 +28,7 @@ Language | Tier | Queries | Maintainer
 [bitbake](https://github.com/tree-sitter-grammars/tree-sitter-bitbake) | unstable | `HFIJL` | @amaanq
 [blade](https://github.com/EmranMR/tree-sitter-blade) | unstable | `HFIJ ` | @calebdw
 [bp](https://github.com/ambroisie/tree-sitter-bp)[^bp] | unstable | `HFIJL` | @ambroisie
+[bpftrace](https://github.com/sgruszka/tree-sitter-bpftrace) | unstable | `H  J ` | @sgruszka
 [brightscript](https://github.com/ajdelcimmuto/tree-sitter-brightscript) | unstable | `HFIJ ` | @ajdelcimmuto
 [c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
 [c3](https://github.com/c3lang/tree-sitter-c3) | unstable | `HFIJ ` | @cbuttner
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e8af232b6..1aa37c35c 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -140,6 +140,14 @@ return {
     readme_note = 'Android Blueprint',
     tier = 2,
   },
+  bpftrace = {
+    install_info = {
+      revision = '9cdfa285bb4fd3abc74cce6e2fb46f381feca987',
+      url = 'https://github.com/sgruszka/tree-sitter-bpftrace',
+    },
+    maintainers = { '@sgruszka' },
+    tier = 2,
+  },
   brightscript = {
     install_info = {
       revision = '253fdfaa23814cb46c2d5fc19049fa0f2f62c6da',
diff --git a/runtime/queries/bpftrace/highlights.scm b/runtime/queries/bpftrace/highlights.scm
new file mode 100644
index 000000000..30a489537
--- /dev/null
+++ b/runtime/queries/bpftrace/highlights.scm
@@ -0,0 +1,228 @@
+; Comments
+[
+  (line_comment)
+  (block_comment)
+] @comment @spell
+
+; String and numeric literals
+(string_literal) @string
+
+(escape_sequence) @string.escape
+
+(integer_literal) @number
+
+(boolean_literal) @boolean
+
+; Variables
+(identifier) @variable
+
+(args_keyword) @variable.builtin
+
+((identifier) @variable.builtin
+  (#lua-match? @variable.builtin "^arg[0-9]+$"))
+
+(scratch_variable) @variable
+
+(map_variable) @variable
+
+(script_parameter) @variable.parameter
+
+; Macro
+(macro_definition
+  (identifier) @function.macro)
+
+; Probes
+; fentry/fexit, kprobe/kretprobe, rawtracepoint
+(probe
+  provider: (_) @type.builtin
+  module: (wildcard_identifier) @module
+  function: (wildcard_identifier) @property)
+
+(probe
+  provider: (_) @type.builtin
+  function: (wildcard_identifier) @property)
+
+; uprobe/uretprobe
+(probe
+  provider: (uprobe_uretprobe_provider) @type.builtin
+  binary: (file_identifier) @string.special.path
+  function: (identifier) @property)
+
+; tracepoint
+(probe
+  provider: (_) @type.builtin
+  subsys: (wildcard_identifier) @module
+  event: (wildcard_identifier) @property)
+
+; software/hardware
+(probe
+  provider: (_) @type.builtin
+  event: (identifier_with_dash) @property
+  count: (integer_literal) @number)
+
+(probe
+  provider: (_) @type.builtin
+  event: (identifier_with_dash) @property)
+
+; bench/test
+(probe
+  provider: (bench_test_provider) @type.builtin
+  function: (identifier) @property)
+
+; profile/interval
+(probe
+  provider: (profile_interval_provider) @type.builtin
+  unit: (time_unit) @string.special
+  count: (integer_literal) @property)
+
+(probe
+  provider: (profile_interval_provider) @type.builtin
+  count: (integer_literal) @number)
+
+; iter
+(probe
+  provider: (iter_provider) @type.builtin
+  object: (identifier) @module
+  pin: (file_identifier) @property)
+
+(probe
+  provider: (iter_provider) @type.builtin
+  object: (identifier) @module)
+
+; ustd
+(probe
+  provider: (ustd_provider) @type.builtin
+  binary: (file_identifier) @string.special.path
+  namespace: (identifier) @variable
+  function: (identifier) @property)
+
+(probe
+  provider: (ustd_provider) @type.builtin
+  binary: (file_identifier) @string.special.path
+  function: (identifier) @property)
+
+; watchpoint/asyncwatchpoint
+(probe
+  provider: (watchpoint_provider) @type.builtin
+  address: (integer_literal) @number
+  length: (integer_literal) @number
+  mode: (watchpoint_mode) @property)
+
+; Types
+(type_specifier) @type
+
+(integer_type) @type.builtin
+
+[
+  "BEGIN"
+  "begin"
+  "END"
+  "end"
+] @type.builtin
+
+; Keywords
+(hashbang) @keyword.directive
+
+(return_statement) @keyword.return
+
+[
+  "config"
+  "let"
+  "macro"
+  "offsetof"
+  "sizeof"
+] @keyword
+
+[
+  "if"
+  "else"
+] @keyword.conditional
+
+[
+  "for"
+  "unroll"
+  "while"
+  (break_statement)
+  (continue_statement)
+] @keyword.repeat
+
+"import" @keyword.import
+
+(field_expression
+  field: (identifier) @property)
+
+(call_expression
+  function: (identifier) @function.call)
+
+; Punctuations
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  ","
+  ";"
+  ":"
+  "."
+] @punctuation.delimiter
+
+; Operators
+[
+  ; Field access
+  "->"
+  ; Range
+  ".."
+  ; Assignment
+  "="
+  "<<="
+  ">>="
+  "+="
+  "-="
+  "*="
+  "/="
+  "%="
+  "&="
+  "|="
+  "^="
+  ; Update
+  "--"
+  "++"
+  ; Arithmetic
+  "%"
+  "+"
+  "-"
+  "*"
+  "/"
+  ; Relational
+  "<="
+  "<"
+  ">="
+  ">"
+  "=="
+  "!="
+  ; Bitwise
+  "&"
+  "^"
+  "|"
+  "~"
+  "<<"
+  ">>"
+  ; Logical
+  "&&"
+  "||"
+  "!"
+] @operator
+
+(conditional_expression
+  [
+    "?"
+    ":"
+  ] @keyword.conditional.ternary)
+
+(predicate
+  "/" @punctuation.delimiter)
diff --git a/runtime/queries/bpftrace/injections.scm b/runtime/queries/bpftrace/injections.scm
new file mode 100644
index 000000000..8907d9f84
--- /dev/null
+++ b/runtime/queries/bpftrace/injections.scm
@@ -0,0 +1,12 @@
+([
+  (c_struct)
+  (c_preproc)
+  (c_preproc_block)
+] @injection.content
+  (#set! injection.language "c"))
+
+([
+  (line_comment)
+  (block_comment)
+] @injection.content
+  (#set! injection.language "comment"))

From 5e8652dbafca97855514c5aab9ae6f7901d2504b Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 7 Jan 2026 22:05:52 -0800
Subject: [PATCH 2610/2704] fix(usd): misc punctuation highlights

---
 runtime/queries/usd/highlights.scm    | 2 ++
 tests/query/highlights/usd/prims.usda | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/runtime/queries/usd/highlights.scm b/runtime/queries/usd/highlights.scm
index d6c2a3668..98a7ff95c 100644
--- a/runtime/queries/usd/highlights.scm
+++ b/runtime/queries/usd/highlights.scm
@@ -52,12 +52,14 @@
   "]"
   "{"
   "}"
+  "[]"
 ] @punctuation.bracket
 
 [
   ":"
   ";"
   "."
+  ","
 ] @punctuation.delimiter
 
 "=" @operator
diff --git a/tests/query/highlights/usd/prims.usda b/tests/query/highlights/usd/prims.usda
index da9a5d6fe..dcb6c3b59 100644
--- a/tests/query/highlights/usd/prims.usda
+++ b/tests/query/highlights/usd/prims.usda
@@ -3,8 +3,10 @@ def Xform "cube" (
     # <- @keyword
         asset[] payloadAssetDependencies = [@fizz.usd@, @buzz.usd@]
         # <- @type
+        #    ^ @punctuation.bracket
         #       ^ @keyword
         #                                   ^ @string.special.url
+        #                                             ^ @punctuation.delimiter
         #                                               ^ @string.special.url
     }
 )

From 2ba5ec184609a96b513bf4c53a20512d64e27f39 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 8 Jan 2026 10:22:02 +0100
Subject: [PATCH 2611/2704] test(init): remove upstreamed Nickel ft detection

---
 scripts/minimal_init.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 4a5e14f16..a90f56004 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -7,7 +7,6 @@ vim.cmd.runtime({ 'plugin/filetypes.lua', bang = true })
 vim.filetype.add({
   extension = {
     conf = 'hocon',
-    ncl = 'nickel',
     tig = 'tiger',
     w = 'wing',
   },

From 6016f1232dea2c3f4e60a90d36510a362d5703e0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Jan 2026 06:51:38 +0000
Subject: [PATCH 2612/2704] bot(parsers): update beancount, bpftrace, c3,
 fortran, gleam, lua, mlir, sql

---
 lua/nvim-treesitter/parsers.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1aa37c35c..ab2ec1c1f 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,7 +93,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = '653cce316fbff8d212a2488ae13df648efb542a4',
+      revision = '23b21252da8b8cb0f03d1d1fc4c8f87d407e1cdf',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -142,7 +142,7 @@ return {
   },
   bpftrace = {
     install_info = {
-      revision = '9cdfa285bb4fd3abc74cce6e2fb46f381feca987',
+      revision = 'dee4269b564fdf7071ee454e873767fd334f79ae',
       url = 'https://github.com/sgruszka/tree-sitter-bpftrace',
     },
     maintainers = { '@sgruszka' },
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '805f776dcfbfef5c9baf4270ec942b3e8dc7ff16',
+      revision = '2c04e7858d63497152d42f08d3067972618aeedc',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = 'e0132896b8959c09dc20b56e4a1c5d25bc341697',
+      revision = '589151aab08fdd7404678330e8abacf9b78bb595',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -700,7 +700,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '0c0c63a07998767b22f0d2655f903611eca6acd0',
+      revision = 'dd4e328c5fd5f158d47a22339d8ce0f8be918a0b',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -1294,7 +1294,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = 'e284fcec45ead0d477e326fccd2cd4a68a89dae4',
+      revision = 'de08dfd9640604763558530d2ce703cbe6a16bb6',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1397,7 +1397,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'c7eec06be8a9ddae688e1b03fca2eed79e9801c4',
+      revision = '9edc9201736c5a471314b4e28c20d0f0b4642b6f',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -2139,7 +2139,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '2d5dcd16f9ee49cb5a6d99eabb00fd4ea298587f',
+      revision = '5129061608da71146c813e13c32a54f4b13645c8',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },

From 5a7e5638e7d220575b1c22c8a2e099b52231886e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 10 Jan 2026 06:51:35 +0000
Subject: [PATCH 2613/2704] bot(parsers): update inko

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ab2ec1c1f..1bee7e59b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1033,7 +1033,7 @@ return {
   },
   inko = {
     install_info = {
-      revision = 'v0.4.0',
+      revision = 'v0.5.1',
       url = 'https://github.com/inko-lang/tree-sitter-inko',
     },
     maintainers = { '@yorickpeterse' },

From c872ec85cc73fba3f3368f6974d17b82f7c0f72b Mon Sep 17 00:00:00 2001
From: Abbath <pitongogi@gmail.com>
Date: Tue, 13 Jan 2026 02:19:22 +0100
Subject: [PATCH 2614/2704] fix(haskell): syntax highlighting for Haskell
 lambda expressions

Fixes highlighting for lambdas with multiple parameters.
---
 runtime/queries/haskell/highlights.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index de0eaf0a1..8e9f1b3c3 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -9,7 +9,8 @@
     (_) @variable.parameter))
 
 (expression/lambda
-  (_)+ @variable.parameter
+  patterns: (patterns
+    (_) @variable.parameter)
   "->")
 
 (decl/function

From 15b3416cc1f557c4932468e512a0bd45871167bc Mon Sep 17 00:00:00 2001
From: Abbath <pitongogi@gmail.com>
Date: Wed, 14 Jan 2026 11:16:45 +0100
Subject: [PATCH 2615/2704] fix(haskell): highlighting for operator definition
 and operator-like constructors.

---
 runtime/queries/haskell/highlights.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index 8e9f1b3c3..9d043b49d 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -227,7 +227,9 @@
     (qualified
       ((module) @module
         (variable) @function.call))
-  ])
+  ]
+  (operator) @_op
+  (#match? @_op "^[^:].*"))
 
 ; infix operators applied to variables
 ((expression/variable) @variable
@@ -246,7 +248,7 @@
 (function
   (infix
     left_operand: [
-      (variable) @variable
+      (variable) @variable.parameter
       (qualified
         ((module) @module
           (variable) @variable))

From 8aada0e3940c573e38b417a226b43bc8675f8958 Mon Sep 17 00:00:00 2001
From: Abbath <pitongogi@gmail.com>
Date: Fri, 16 Jan 2026 17:56:29 +0100
Subject: [PATCH 2616/2704] fix(haskell): use grammar for operator detection
 instead of match

---
 runtime/queries/haskell/highlights.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/runtime/queries/haskell/highlights.scm b/runtime/queries/haskell/highlights.scm
index 9d043b49d..d0fdc17f6 100644
--- a/runtime/queries/haskell/highlights.scm
+++ b/runtime/queries/haskell/highlights.scm
@@ -228,8 +228,7 @@
       ((module) @module
         (variable) @function.call))
   ]
-  (operator) @_op
-  (#match? @_op "^[^:].*"))
+  operator: (operator))
 
 ; infix operators applied to variables
 ((expression/variable) @variable

From 7c14161403275550f94e1b218510f3ecbbb3c58e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 17 Jan 2026 06:51:48 +0000
Subject: [PATCH 2617/2704] bot(parsers): update bpftrace, desktop,
 editorconfig, glimmer, javadoc, liquidsoap, markdown, markdown_inline,
 matlab, meson, mlir, nim, pkl, rego, rescript, swift, vhdl, xresources

---
 lua/nvim-treesitter/parsers.lua | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1bee7e59b..b45d1067d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -142,7 +142,7 @@ return {
   },
   bpftrace = {
     install_info = {
-      revision = 'dee4269b564fdf7071ee454e873767fd334f79ae',
+      revision = '99ad82e02067a25b2a717fc006ea74b1604f7115',
       url = 'https://github.com/sgruszka/tree-sitter-bpftrace',
     },
     maintainers = { '@sgruszka' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'c0279c1fb1e2e1f06f374437815d4abda02e30b2',
+      revision = 'f9cf7575dd35ee3f0964efd850f5547023f8b3c7',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'f8e8a4cefe4de5d7e87bd129f3a69bdcdf73eebe',
+      revision = '1c07dcd050e98eaaa9aa628599dda0406821899a',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -708,7 +708,7 @@ return {
   },
   glimmer = {
     install_info = {
-      revision = 'da605af8c5999b43e6839b575eae5e6cafabb06f',
+      revision = '88af85568bde3b91acb5d4c352ed094d0c1f9d84',
       url = 'https://github.com/ember-tooling/tree-sitter-glimmer',
     },
     maintainers = { '@NullVoxPopuli' },
@@ -1066,7 +1066,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '373fbd84f35aff70031426ed6edf3cdf52b93532',
+      revision = '60bfacbc38a4d7902915ddf5338d0035274226d5',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1278,7 +1278,7 @@ return {
   },
   liquidsoap = {
     install_info = {
-      revision = '4de01f44de2c051c33832ce523cf44690561320d',
+      revision = 'd092c65598e940564e12214ff7c2097528cfa159',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
@@ -1345,7 +1345,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '2dfd57f547f06ca5631a80f601e129d73fc8e9f0',
+      revision = 'aca7767daa8bbe3daddafc312c34be88383c828b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1356,7 +1356,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '2dfd57f547f06ca5631a80f601e129d73fc8e9f0',
+      revision = 'aca7767daa8bbe3daddafc312c34be88383c828b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1365,7 +1365,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '1bccabdbd420a9c3c3f96f36d7f9e65b3d9c88ef',
+      revision = 'f3eef66526fdae0469207d8e561fb5771eea1721',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1388,7 +1388,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = 'd4fa3c7260d1537ac5183740b9338373a673d5c0',
+      revision = '64ecb49f15417ee08037ddbcf29709dbabb67a8a',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1397,7 +1397,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '9edc9201736c5a471314b4e28c20d0f0b4642b6f',
+      revision = 'c457b68dd485c6bcbd82acc642ead9340f37fa77',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1436,7 +1436,7 @@ return {
   },
   nim = {
     install_info = {
-      revision = '4ad352773688deb84a95eeaa9872acda5b466439',
+      revision = '9b4ede21a6ca866d29263f6b66c070961bc622b4',
       url = 'https://github.com/alaviss/tree-sitter-nim',
     },
     maintainers = { '@aMOPel' },
@@ -1608,7 +1608,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'ac58931956c000d3aeefbb55a81fc3c5bd6aecf0',
+      revision = 'd9c591b4e770934fe15c2f1b3658f35553f6cb40',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1883,7 +1883,7 @@ return {
   },
   rego = {
     install_info = {
-      revision = '20b5a5958c837bc9f74b231022a68a594a313f6d',
+      revision = 'ddd39af81fe8b0288102a7cb97959dfce723e0f3',
       url = 'https://github.com/FallenAngel97/tree-sitter-rego',
     },
     maintainers = { '@FallenAngel97' },
@@ -1900,7 +1900,7 @@ return {
   },
   rescript = {
     install_info = {
-      revision = 'd2df8a285fff95de56a91d2f8152aeceb66f40ef',
+      revision = '4abea6f22b180cd5a82b55941a9c42c1d281c30f',
       url = 'https://github.com/rescript-lang/tree-sitter-rescript',
     },
     maintainers = { '@ribru17' },
@@ -2230,7 +2230,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '82a239e4c164b0567fb99b80b53f99ba661f2168',
+      revision = '237e5dc79f041ca775b1742e36ba18f15fcece83',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2520,7 +2520,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '7ae08deb5d1641aa57111342218ca1e1b3a5d539',
+      revision = '674ed9fe6c13c79c0e7407daaf4518d053e6f0f4',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2628,7 +2628,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'f60fb1e661d85f35fb8e7b988a41d2a74f65bfd4',
+      revision = 'c08cb31b8a3a8c37cc8a98ff251790994bbfb25e',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 19261d56ed222ed93c6310943af0954d54c618fa Mon Sep 17 00:00:00 2001
From: Nico Salm <nico@salm.dev>
Date: Fri, 16 Jan 2026 01:09:25 -0600
Subject: [PATCH 2618/2704] fix(rust): highlight doc comment markers as
 @comment.documentation

Co-authored-by: LunarLambda <LunarLambda@users.noreply.github.com>
---
 runtime/queries/rust/highlights.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index de9d09684..2342dcfa3 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -476,9 +476,12 @@
 [
   (line_comment)
   (block_comment)
+] @comment @spell
+
+[
   (outer_doc_comment_marker)
   (inner_doc_comment_marker)
-] @comment @spell
+] @comment.documentation
 
 (line_comment
   (doc_comment)) @comment.documentation

From d19def46c112c26c17adeef88dd1253cc6d623a1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 17 Jan 2026 16:10:23 +0100
Subject: [PATCH 2619/2704] fix(make): switch to maintained fork

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 59be83a32..421ed2026 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -175,7 +175,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [luap](https://github.com/tree-sitter-grammars/tree-sitter-luap)[^luap] | unstable | `H    ` | @amaanq
 [luau](https://github.com/tree-sitter-grammars/tree-sitter-luau) | unstable | `HFIJL` | @amaanq
 [m68k](https://github.com/grahambates/tree-sitter-m68k) | unstable | `HF JL` | @grahambates
-[make](https://github.com/alemuller/tree-sitter-make) | unstable | `HF J ` | @lewis6991
+[make](https://github.com/tree-sitter-grammars/tree-sitter-make) | unstable | `HF J ` | @lewis6991
 [markdown](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown] | unstable | `HFIJ ` | @MDeiml
 [markdown_inline](https://github.com/tree-sitter-grammars/tree-sitter-markdown)[^markdown_inline] | unstable | `H  J ` | @MDeiml
 [matlab](https://github.com/acristoffers/tree-sitter-matlab) | unstable | `HFIJL` | @acristoffers
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b45d1067d..de7a85171 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1336,8 +1336,8 @@ return {
   },
   make = {
     install_info = {
-      revision = 'a4b9187417d6be349ee5fd4b6e77b4172c6827dd',
-      url = 'https://github.com/alemuller/tree-sitter-make',
+      revision = '5e9e8f8ff3387b0edcaa90f46ddf3629f4cfeb1d',
+      url = 'https://github.com/tree-sitter-grammars/tree-sitter-make',
     },
     maintainers = { '@lewis6991' },
     tier = 2,

From 3121570f07fb6da120e22208d82ea70c7cbcd457 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 17 Jan 2026 14:41:56 +0100
Subject: [PATCH 2620/2704] docs(contributing): inclusion criteria

---
 CONTRIBUTING.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0dc03947b..52ec52633 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,6 +14,21 @@ Before describing these in detail, some general advice:
 
 ## Parsers
 
+>[!IMPORTANT]
+> To qualify for inclusion, a parser must meet the following criteria:
+> * correspond to a filetype detected by Neovim (nightly)
+> * feature complete, tested by users, and actively maintained (according to maintainer discretion)
+> * hosted or mirrored on Github (other codeforges are not reliable enough for CI)
+> * covered by CI using [upstream workflows](https://github.com/tree-sitter/workflows)
+> * provide reference queries covered by a [`ts_query_ls` workflow](https://github.com/tree-sitter-grammars/template/blob/9c46d09d688d27c7aef31c2b32f50260de4e7906/.github/workflows/ci.yml#L69-L86)
+> * if the repo contains a `src/parser.c`, it must support the latest ABI
+> * if the repo does _not_ contain a `src/parser.c`, it must contain an up-to-date `src/grammar.json`
+> * if the repo contains an external scanner, it must be written in C99
+>
+> Tier 1 parsers (preferred) in addition need to
+> * make regular releases following semver (_patch_ for fixes not affecting queries; _minor_ for changes introducing new nodes or patterns; _major_ for changes removing nodes or previously valid patterns)
+> * provide WASM release artifacts
+
 To add a new parser, edit the following files:
 
 1. In `lua/parsers.lua`, add an entry to the returned table of the following form:
@@ -36,30 +51,15 @@ zimbu = {
 }
 ```
 
->[!IMPORTANT]
-> If the repo does not contain a pre-generated `src/parser.c`, it **must** at least contain `src/grammar.json` so that the parser can be generated without having `node` installed.
-
 >[!IMPORTANT]
 > The "maintainers" here refers to the person maintaining the **queries** in `nvim-treesitter`, not the parser maintainers (who likely don't use Neovim). The maintainers' duty is to review issues and PRs related to the query and to keep them updated with respect to parser changes.
 
->[!IMPORTANT]
-> Due to reliability issues with smaller codeforges, only Github-hosted parsers are currently eligible for inclusion. (The development may happen elsewhere, but there must at least exist a Github mirror to pull the source from.) We are monitoring the situation and hope to support more codeforges again in the future.
-
->[!NOTE]
-> To qualify for Tier 1 ("stable"), a parser needs to
-> * make releases following semver (_patch_ for fixes not affecting queries; _minor_ for changes introducing new nodes or patterns; _major_ for changes removing nodes or previously valid patterns);
-> * provide WASM release artifacts;
-> * include and maintain reference queries.
-
 2. If the parser name is not the same as the Vim filetype, add an entry to the `filetypes` table in `plugin/filetypes.lua`:
 
 ```lua
   zimbu = { 'zu' },
 ```
 
->[!IMPORTANT]
-> Only external scanners written in C are supported for portability reasons.
-
 3. Update the list of [supported languages] by running `make docs` (or `./scripts/update-readme.lua` if on Windows).
 
 4. Test if both `:TSInstall zimbu` and `:TSInstallFromGrammar zimbu` work without errors (`:checkhealth treesitter` or `./scripts/check-parsers.lua zimbu`).

From d9a5fb8484374e8ed5d88dd9e0475a760c168d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mariusz=20Biega=C5=84ski?= <mbbieganski@protonmail.com>
Date: Sun, 18 Jan 2026 17:18:53 +0100
Subject: [PATCH 2621/2704] docs(supported_languages): fix order of available
 queries

---
 SUPPORTED_LANGUAGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 421ed2026..32d538361 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -4,7 +4,7 @@ The following is a list of languages for which a parser can be installed through
 
 Legend:
 - **Tier:** _stable_ (updates follow semver releases), _unstable_ (updates follow HEAD), _unmaintained_ (no automatic updates), or _unsupported_ (known to be broken, cannot be installed)
-- **Queries** available for **H**ighlights, **I**ndents, **F**olds, In**J**ections, **L**ocals
+- **Queries** available for **H**ighlights, **F**olds, **I**ndents, In**J**ections, **L**ocals
 - **Maintainer** of queries in nvim-treesitter (may be different from parser maintainer!)
 
 <!--This section of the README is automatically updated by a CI job-->

From b9933f0e1386c7b63fe131d9979d9c2613da551a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 19 Jan 2026 10:32:26 +0100
Subject: [PATCH 2622/2704] test(init): remove upstreamed Tiger ft detection

---
 scripts/minimal_init.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index a90f56004..5af027d5a 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -7,7 +7,6 @@ vim.cmd.runtime({ 'plugin/filetypes.lua', bang = true })
 vim.filetype.add({
   extension = {
     conf = 'hocon',
-    tig = 'tiger',
     w = 'wing',
   },
 })

From e75c007f2747050c2c620dc862c77b8f242551a8 Mon Sep 17 00:00:00 2001
From: Peter Cardenas <16930781+PeterCardenas@users.noreply.github.com>
Date: Mon, 19 Jan 2026 05:34:27 -0800
Subject: [PATCH 2623/2704] fix(fish): update builtin highlights

---
 runtime/queries/fish/highlights.scm | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/runtime/queries/fish/highlights.scm b/runtime/queries/fish/highlights.scm
index 549bceda0..da5c52a32 100644
--- a/runtime/queries/fish/highlights.scm
+++ b/runtime/queries/fish/highlights.scm
@@ -112,15 +112,16 @@
 (command
   name: (word) @function.call)
 
-; derived from builtin -n (fish 3.2.2)
+; derived from builtin -n (fish 4.3.3)
 (command
   name: [
     (word) @function.builtin
     (#any-of? @function.builtin
       "." ":" "_" "abbr" "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" "path" "printf" "pwd" "random" "read"
-      "realpath" "set" "set_color" "source" "status" "string" "test" "time" "type" "ulimit" "wait")
+      "exit" "fg" "fish_indent" "fish_key_reader" "functions" "history" "isatty" "jobs" "math"
+      "path" "printf" "pwd" "random" "read" "realpath" "set" "set_color" "source" "status" "string"
+      "test" "time" "type" "ulimit" "wait")
   ])
 
 ; Functions
@@ -163,15 +164,15 @@
 ; Reference: https://fishshell.com/docs/current/language.html#special-variables
 ((variable_name) @variable.builtin
   (#any-of? @variable.builtin
-    "PATH" "CDPATH" "LANG" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_MONETARY" "LC_NUMERIC"
-    "LC_TIME" "fish_color_normal" "fish_color_command" "fish_color_keyword" "fish_color_keyword"
-    "fish_color_redirection" "fish_color_end" "fish_color_error" "fish_color_param"
-    "fish_color_valid_path" "fish_color_option" "fish_color_comment" "fish_color_selection"
-    "fish_color_operator" "fish_color_escape" "fish_color_autosuggestion" "fish_color_cwd"
-    "fish_color_cwd_root" "fish_color_user" "fish_color_host" "fish_color_host_remote"
-    "fish_color_status" "fish_color_cancel" "fish_color_search_match" "fish_color_history_current"
-    "fish_pager_color_progress" "fish_pager_color_background" "fish_pager_color_prefix"
-    "fish_pager_color_completion" "fish_pager_color_description"
+    "PATH" "CDPATH" "LANG" "LANGUAGE" "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" "LC_MONETARY"
+    "LC_NUMERIC" "LC_TIME" "fish_color_normal" "fish_color_command" "fish_color_keyword"
+    "fish_color_keyword" "fish_color_redirection" "fish_color_end" "fish_color_error"
+    "fish_color_param" "fish_color_valid_path" "fish_color_option" "fish_color_comment"
+    "fish_color_selection" "fish_color_operator" "fish_color_escape" "fish_color_autosuggestion"
+    "fish_color_cwd" "fish_color_cwd_root" "fish_color_user" "fish_color_host"
+    "fish_color_host_remote" "fish_color_status" "fish_color_cancel" "fish_color_search_match"
+    "fish_color_history_current" "fish_pager_color_progress" "fish_pager_color_background"
+    "fish_pager_color_prefix" "fish_pager_color_completion" "fish_pager_color_description"
     "fish_pager_color_selected_background" "fish_pager_color_selected_prefix"
     "fish_pager_color_selected_completion" "fish_pager_color_selected_description"
     "fish_pager_color_secondary_background" "fish_pager_color_secondary_prefix"
@@ -183,8 +184,8 @@
     "fish_cursor_visual" "fish_cursor_external" "fish_function_path" "fish_greeting" "fish_history"
     "fish_trace" "FISH_DEBUG" "FISH_DEBUG_OUTPUT" "fish_user_paths" "umask" "BROWSER" "_" "argv"
     "CMD_DURATION" "COLUMNS" "LINES" "fish_kill_signal" "fish_killring" "fish_read_limit" "fish_pid"
-    "history" "HOME" "hostname" "IFS" "last_pid" "PWD" "pipestatus" "SHLVL" "status"
-    "status_generation" "TERM" "USER" "EUID" "version" "FISH_VERSION"))
+    "fish_terminal_color_theme" "history" "HOME" "hostname" "IFS" "last_pid" "PWD" "pipestatus"
+    "SHLVL" "status" "status_generation" "TERM" "USER" "EUID" "version" "FISH_VERSION"))
 
 ; Nodes
 [

From ec034813775d7e2974c7551c8c34499a828963f8 Mon Sep 17 00:00:00 2001
From: mintbug <mintbug@disroot.org>
Date: Tue, 20 Jan 2026 17:32:27 +0300
Subject: [PATCH 2624/2704] feat(typst): set url attribute for links

---
 runtime/queries/typst/highlights.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/typst/highlights.scm b/runtime/queries/typst/highlights.scm
index a0dcc1b89..0ae538fe1 100644
--- a/runtime/queries/typst/highlights.scm
+++ b/runtime/queries/typst/highlights.scm
@@ -106,7 +106,17 @@
 
 (emph) @markup.italic
 
-(url) @markup.link.url
+((url) @markup.link.url
+  (#set! @markup.link.url url @markup.link.url))
+
+(call
+  item: (ident) @_link
+  (#eq? @_link "link")
+  (group
+    .
+    (string) @markup.link.url
+    (#offset! @markup.link.url 0 1 0 -1)
+    (#set! @markup.link.url url @markup.link.url)))
 
 ; code blocks
 (raw_span) @markup.raw

From 0d1b8b026b1c731011697f8010bc4856126c1f06 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 22 Jan 2026 18:23:05 +0100
Subject: [PATCH 2625/2704] ci: use ubuntu-slim for small jobs

---
 .github/workflows/lint.yml           | 6 +++---
 .github/workflows/update-parsers.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 41830b225..6ed8e7ba2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   lua:
     name: Lint Lua files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: actions/checkout@v6
 
@@ -26,7 +26,7 @@ jobs:
 
   queries:
     name: Lint query files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: actions/checkout@v6
 
@@ -40,7 +40,7 @@ jobs:
 
   readme:
     name: Lint docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: actions/checkout@v6
 
diff --git a/.github/workflows/update-parsers.yml b/.github/workflows/update-parsers.yml
index 23741d761..7b68b2412 100644
--- a/.github/workflows/update-parsers.yml
+++ b/.github/workflows/update-parsers.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         tier: [1, 2]
     name: Update parsers tier ${{ matrix.tier }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: actions/checkout@v6
         with:

From 61d3f5b186dbaf0eb12528b9ff9343fb1c2a956f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 22 Jan 2026 18:24:05 +0100
Subject: [PATCH 2626/2704] test(lint): bump luals to 3.17.1

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 15482e03b..9442df997 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NVIM_VERSION ?= nightly
-LUALS_VERSION := 3.15.0
+LUALS_VERSION := 3.17.1
 
 DEPDIR ?= .test-deps
 CURL ?= curl -sL --create-dirs

From 62dad2a60a10ca8e2b835875841b01b1c3f9304d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 22 Jan 2026 18:30:35 +0100
Subject: [PATCH 2627/2704] ci: add concurrency for downstream tests

---
 .github/workflows/downstream.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index e9f69fb72..c3829c51a 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -8,6 +8,10 @@ on:
       - "lua/nvim-treesitter/parsers.lua"
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-generate-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   test-downstream:
     name: Check downstream queries

From 511e5ccf404f8a96ee31866b079fca033a8a7c4e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 22 Jan 2026 18:37:55 +0100
Subject: [PATCH 2628/2704] ci: correct concurrency group for downstream

---
 .github/workflows/downstream.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index c3829c51a..46e699613 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-generate-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:

From 88f1dfc211c3a2fb47f1451fd5edc972ec697e58 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <stf_xl@wp.pl>
Date: Fri, 23 Jan 2026 09:03:17 +0100
Subject: [PATCH 2629/2704] feat(bpftrace): update parser and small highlights
 improvements

Update parser. Use new builtins from grammar (don't use lua-match).
---
 lua/nvim-treesitter/parsers.lua         | 2 +-
 runtime/queries/bpftrace/highlights.scm | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index de7a85171..5ea9c8f69 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -142,7 +142,7 @@ return {
   },
   bpftrace = {
     install_info = {
-      revision = '99ad82e02067a25b2a717fc006ea74b1604f7115',
+      revision = '0978030fdcdab74d49faaee2a60eb94607a367cc',
       url = 'https://github.com/sgruszka/tree-sitter-bpftrace',
     },
     maintainers = { '@sgruszka' },
diff --git a/runtime/queries/bpftrace/highlights.scm b/runtime/queries/bpftrace/highlights.scm
index 30a489537..19e568515 100644
--- a/runtime/queries/bpftrace/highlights.scm
+++ b/runtime/queries/bpftrace/highlights.scm
@@ -18,8 +18,9 @@
 
 (args_keyword) @variable.builtin
 
-((identifier) @variable.builtin
-  (#lua-match? @variable.builtin "^arg[0-9]+$"))
+(argn_identifier) @variable.builtin
+
+(retval_identifier) @variable.builtin
 
 (scratch_variable) @variable
 

From b67d29ce748c3c488485a4733e16acda0ec8d09e Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 24 Jan 2026 06:53:33 +0000
Subject: [PATCH 2630/2704] bot(parsers): update c_sharp, desktop, dtd,
 editorconfig, fennel, fortran, hcl, javadoc, just, lalrpop, lua, markdown,
 markdown_inline, meson, mlir, rescript, rifleconf, sql, swift, terraform,
 tlaplus, vim, xml, xresources

---
 lua/nvim-treesitter/parsers.lua | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5ea9c8f69..65ffba196 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -174,7 +174,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = '485f0bae0274ac9114797fc10db6f7034e4086e3',
+      revision = 'f05a2ca99d329de2e6c32f26a21c6169b2bfcbb7',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -346,7 +346,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = 'f9cf7575dd35ee3f0964efd850f5547023f8b3c7',
+      revision = '137292ae28e05011dbc7c5c383e2b25db1cf77c9',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -419,7 +419,7 @@ return {
   dtd = {
     install_info = {
       location = 'dtd',
-      revision = '863dbc381f44f6c136a399e684383b977bb2beaa',
+      revision = '5000ae8f22d11fbe93939b05c1e37cf21117162d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -449,7 +449,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '1c07dcd050e98eaaa9aa628599dda0406821899a',
+      revision = '851f2c2483239ce62f919bf3408ccd20dc0b5c01',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -544,7 +544,7 @@ return {
   },
   fennel = {
     install_info = {
-      revision = 'fd4a24e349bcbac8a03a5a00d0dfa207baf53ca5',
+      revision = '3f0f6b24d599e92460b969aabc4f4c5a914d15a0',
       url = 'https://github.com/alexmozaidze/tree-sitter-fennel',
     },
     maintainers = { '@alexmozaidze' },
@@ -592,7 +592,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '589151aab08fdd7404678330e8abacf9b78bb595',
+      revision = '43cd127cd41ff6e57b3ececb3cc283c5af4796e7',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -897,7 +897,7 @@ return {
   },
   hcl = {
     install_info = {
-      revision = 'fad991865fee927dd1de5e172fb3f08ac674d914',
+      revision = '64ad62785d442eb4d45df3a1764962dafd5bc98b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -1066,7 +1066,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '60bfacbc38a4d7902915ddf5338d0035274226d5',
+      revision = '141525e73c9ad2fe7df8861047d4068ddbb6c337',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1157,7 +1157,7 @@ return {
   },
   just = {
     install_info = {
-      revision = 'bb0c898a80644de438e6efe5d88d30bf092935cd',
+      revision = '7333f8c150aaac5bb46decc2d225a2d4cde8c51e',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
@@ -1229,7 +1229,7 @@ return {
   },
   lalrpop = {
     install_info = {
-      revision = '8d38e9755c05d37df8a24dadb0fc64f6588ac188',
+      revision = '27b0f7bb55b4cabd8f01a933d9ee6a49dbfc2192',
       url = 'https://github.com/traxys/tree-sitter-lalrpop',
     },
     maintainers = { '@traxys' },
@@ -1294,7 +1294,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = 'de08dfd9640604763558530d2ce703cbe6a16bb6',
+      revision = 'e40f5b6e6df9c2d1d6d664ff5d346a75d71ee6b2',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1345,7 +1345,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = 'aca7767daa8bbe3daddafc312c34be88383c828b',
+      revision = 'da063e1ba4303ff08781eb440cc9a7bd41e55dd8',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1356,7 +1356,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = 'aca7767daa8bbe3daddafc312c34be88383c828b',
+      revision = 'da063e1ba4303ff08781eb440cc9a7bd41e55dd8',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1388,7 +1388,7 @@ return {
   },
   meson = {
     install_info = {
-      revision = '64ecb49f15417ee08037ddbcf29709dbabb67a8a',
+      revision = 'c84f3540624b81fc44067030afce2ff78d6ede05',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-meson',
     },
     maintainers = { '@Decodetalkers' },
@@ -1397,7 +1397,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'c457b68dd485c6bcbd82acc642ead9340f37fa77',
+      revision = '4ab28ecdacef343af56c09b7981580503e49fadb',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1900,7 +1900,7 @@ return {
   },
   rescript = {
     install_info = {
-      revision = '4abea6f22b180cd5a82b55941a9c42c1d281c30f',
+      revision = '5938ae1578aa559b4fa903f7cabc31da14f71c84',
       url = 'https://github.com/rescript-lang/tree-sitter-rescript',
     },
     maintainers = { '@ribru17' },
@@ -1908,7 +1908,7 @@ return {
   },
   rifleconf = {
     install_info = {
-      revision = 'fe10eab6cacff239ec61f4456e793bed15703aaf',
+      revision = '6389ef0fc0d48f0397ec233109c074a0cb685e36',
       url = 'https://github.com/purarue/tree-sitter-rifleconf',
     },
     maintainers = { '@purarue' },
@@ -2139,7 +2139,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '5129061608da71146c813e13c32a54f4b13645c8',
+      revision = '86e3d03837d282544439620eb74d224586074b8b',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2230,7 +2230,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '237e5dc79f041ca775b1742e36ba18f15fcece83',
+      revision = 'c7287392d610ca9d7c80f9edd2c6ef8f518b377b',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2320,7 +2320,7 @@ return {
   terraform = {
     install_info = {
       location = 'dialects/terraform',
-      revision = 'fad991865fee927dd1de5e172fb3f08ac674d914',
+      revision = '64ad62785d442eb4d45df3a1764962dafd5bc98b',
       url = 'https://github.com/MichaHoffmann/tree-sitter-hcl',
     },
     maintainers = { '@MichaHoffmann' },
@@ -2353,7 +2353,7 @@ return {
   },
   tlaplus = {
     install_info = {
-      revision = '2d831940c782850f64dabf5b7b17e9e51f7f0ebb',
+      revision = '8d749f9a598b47b7110c7340006c8eb8a9552566',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },
@@ -2536,7 +2536,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '78866caaacf123f4d9d227fe1ab521cc62167a88',
+      revision = '1cd0a0892b389bd314a9bd09545160e5ee3c9137',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },
@@ -2619,7 +2619,7 @@ return {
   xml = {
     install_info = {
       location = 'xml',
-      revision = '863dbc381f44f6c136a399e684383b977bb2beaa',
+      revision = '5000ae8f22d11fbe93939b05c1e37cf21117162d',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-xml',
     },
     maintainers = { '@ObserverOfTime' },
@@ -2628,7 +2628,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'c08cb31b8a3a8c37cc8a98ff251790994bbfb25e',
+      revision = 'a81f1ea4478d03c223ef7eace535a36220bddd8c',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From 275b9fe801d56d5fea6d34f5bfea8bb24887b805 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 24 Jan 2026 06:53:19 +0000
Subject: [PATCH 2631/2704] bot(parsers): update zsh

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 65ffba196..556bcdf8d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2692,7 +2692,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.52.1',
+      revision = 'v0.53.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },

From 67b3ce05295bb7fb6548de29ff651e48a59d2194 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 24 Jan 2026 16:21:10 -0500
Subject: [PATCH 2632/2704] fix(glimmer) update injections

---
 runtime/queries/glimmer/injections.scm | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/runtime/queries/glimmer/injections.scm b/runtime/queries/glimmer/injections.scm
index 30b438682..9efa71f5e 100644
--- a/runtime/queries/glimmer/injections.scm
+++ b/runtime/queries/glimmer/injections.scm
@@ -3,19 +3,12 @@
   (#set! injection.language "comment"))
 
 ; <style> tags
-((element_node
-  (element_node_start
-    (tag_name) @_tag_name
-    (#eq? @_tag_name "style"))) @injection.content
-  (#offset! @injection.content 0 7 0 -8)
-  (#set! injection.language "css")
-  (#set! injection.include-children))
+((style_element
+  (raw_text) @injection.content)
+  (#set! injection.language "css"))
 
 ; <script> tags
-((element_node
-  (element_node_start
-    (tag_name) @_tag_name
-    (#eq? @_tag_name "script"))) @injection.content
-  (#offset! @injection.content 0 8 0 -9)
-  (#set! injection.language "glimmer_javascript")
+((script_element
+  (raw_text) @injection.content)
+  (#set! injection.language "javascript")
   (#set! injection.include-children))

From 81aca2f9815e26f638f697df1d828ca290847b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Mary=C5=84czak?=
 <marynczak.bartlomiej@gmail.com>
Date: Sat, 24 Jan 2026 22:21:27 +0100
Subject: [PATCH 2633/2704] feat(rust): add !xml injection

---
 runtime/queries/rust/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm
index 7bffd1fc9..b7d5b4bb6 100644
--- a/runtime/queries/rust/injections.scm
+++ b/runtime/queries/rust/injections.scm
@@ -5,7 +5,7 @@
     (identifier) @_macro_name
   ]
   (token_tree) @injection.content
-  (#not-any-of? @_macro_name "slint" "html" "json")
+  (#not-any-of? @_macro_name "slint" "html" "json" "xml")
   (#set! injection.language "rust")
   (#set! injection.include-children))
 
@@ -16,7 +16,7 @@
     (identifier) @injection.language
   ]
   (token_tree) @injection.content
-  (#any-of? @injection.language "slint" "html" "json")
+  (#any-of? @injection.language "slint" "html" "json" "xml")
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children))
 

From 568ede7e79172a0fe7c9d631454a97ad968deaf2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sun, 25 Jan 2026 11:03:28 +0000
Subject: [PATCH 2634/2704] bot(parsers): update ruby, vue

---
 lua/nvim-treesitter/parsers.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 556bcdf8d..9dcada1f9 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1964,7 +1964,7 @@ return {
   },
   ruby = {
     install_info = {
-      revision = '89bd7a8e5450cb6a942418a619d30469f259e5d6',
+      revision = 'ab6dca77a8184abc94af6e3e82538741b5078d63',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
@@ -2561,7 +2561,7 @@ return {
   vue = {
     install_info = {
       branch = 'main',
-      revision = '22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff',
+      revision = 'ce8011a414fdf8091f4e4071752efc376f4afb08',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
     },
     maintainers = { '@WhyNotHugo', '@lucario387' },

From 0ac55b85c6554ba40d614649bac6ac5e8714c326 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 27 Jan 2026 11:51:58 +0100
Subject: [PATCH 2635/2704] refactor(lua): replace vim.opt with vim.o

---
 lua/nvim-treesitter/config.lua | 2 +-
 scripts/check-parsers.lua      | 2 +-
 scripts/check-queries.lua      | 2 +-
 scripts/install-parsers.lua    | 3 +--
 scripts/minimal_init.lua       | 3 +--
 scripts/update-parsers.lua     | 2 +-
 scripts/update-readme.lua      | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index b3a294563..97fca649f 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -16,7 +16,7 @@ function M.setup(user_data)
   if user_data then
     if user_data.install_dir then
       user_data.install_dir = vim.fs.normalize(user_data.install_dir)
-      vim.opt.runtimepath:prepend(user_data.install_dir)
+      vim.o.rtp = user_data.install_dir .. ',' .. vim.o.rtp
     end
     config = vim.tbl_deep_extend('force', config, user_data)
   end
diff --git a/scripts/check-parsers.lua b/scripts/check-parsers.lua
index c2eefd7c9..9d39af482 100755
--- a/scripts/check-parsers.lua
+++ b/scripts/check-parsers.lua
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 
 local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 94d8951cb..4c9fc86b1 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 
 local query_types = require('nvim-treesitter.health').bundled_queries
 local configs = require('nvim-treesitter.parsers')
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index c97c6eecc..855c73cbd 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -1,4 +1,5 @@
 #!/usr/bin/env -S nvim -l
+vim.o.rtp = vim.o.rtp .. ',.'
 
 local generate = false
 local update = false
@@ -16,8 +17,6 @@ for i = 1, #_G.arg do
   end
 end
 
-vim.opt.runtimepath:append('.')
-
 ---@type async.Task
 local task = update and require('nvim-treesitter').update('all', { summary = true })
   or require('nvim-treesitter').install(
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 5af027d5a..502893bb0 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -1,5 +1,4 @@
-vim.opt.runtimepath:append(os.getenv('PLENARY'))
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.,' .. os.getenv('PLENARY')
 vim.cmd.runtime({ 'plugin/plenary.vim', bang = true })
 vim.cmd.runtime({ 'plugin/query_predicates.lua', bang = true })
 vim.cmd.runtime({ 'plugin/filetypes.lua', bang = true })
diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index bab572c27..469865393 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -13,7 +13,7 @@ for i = 1, #_G.arg do
   end
 end
 
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 local util = require('nvim-treesitter.util')
 local parsers = require('nvim-treesitter.parsers')
 
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 19576a284..90b962b5a 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 local util = require('nvim-treesitter.util')
 local parsers = require('nvim-treesitter.parsers')
 local tiers = require('nvim-treesitter.config').tiers

From f8bbc3177d929dc86e272c41cc15219f0a7aa1ac Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 27 Jan 2026 11:53:21 +0100
Subject: [PATCH 2636/2704] feat(roc): mark as unmaintained

---
 SUPPORTED_LANGUAGES.md          | 4 ++--
 lua/nvim-treesitter/parsers.lua | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 32d538361..5b767a487 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -33,7 +33,7 @@ Language | Tier | Queries | Maintainer
 [c](https://github.com/tree-sitter/tree-sitter-c) | unstable | `HFIJL` | @amaanq
 [c3](https://github.com/c3lang/tree-sitter-c3) | unstable | `HFIJ ` | @cbuttner
 [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) | unstable | `HF JL` | @amaanq
-[caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` | @opa-oz
+[caddy](https://github.com/opa-oz/tree-sitter-caddy) | unmaintained | `HFIJ ` | 
 [cairo](https://github.com/tree-sitter-grammars/tree-sitter-cairo) | unstable | `HFIJL` | @amaanq
 [capnp](https://github.com/tree-sitter-grammars/tree-sitter-capnp) | unstable | `HFIJL` | @amaanq
 [chatito](https://github.com/tree-sitter-grammars/tree-sitter-chatito) | unstable | `HFIJL` | @ObserverOfTime
@@ -247,7 +247,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
 [robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` | @Hubro
 [robots_txt](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
-[roc](https://github.com/faldor20/tree-sitter-roc) | unstable | `H IJL` | @nat-418
+[roc](https://github.com/faldor20/tree-sitter-roc) | unmaintained | `H IJL` | 
 [ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
 [rst](https://github.com/stsewd/tree-sitter-rst) | unstable | `H  JL` | @stsewd
 [ruby](https://github.com/tree-sitter/tree-sitter-ruby) | unstable | `HFIJL` | @TravonteD
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9dcada1f9..344da0130 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -185,7 +185,6 @@ return {
       revision = '2686186edb61be47960431c93a204fb249681360',
       url = 'https://github.com/opa-oz/tree-sitter-caddy',
     },
-    maintainers = { '@opa-oz' },
     tier = 3,
   },
   cairo = {
@@ -1943,8 +1942,7 @@ return {
       revision = '40e52f343f1b1f270d6ecb2ca898ca9b8cba6936',
       url = 'https://github.com/faldor20/tree-sitter-roc',
     },
-    maintainers = { '@nat-418' },
-    tier = 2,
+    tier = 3,
   },
   ron = {
     install_info = {

From 5465196ba8ca9c566fd1717cc0bd6414c10152ad Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 29 Jan 2026 10:17:04 +0100
Subject: [PATCH 2637/2704] fix(health): update required tree-sitter version

---
 lua/nvim-treesitter/health.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 08ec42bb7..b81483e73 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -7,7 +7,7 @@ local health = vim.health
 local M = {}
 
 local NVIM_TREESITTER_MINIMUM_ABI = 13
-local TREE_SITTER_MIN_VER = { 0, 25, 0 }
+local TREE_SITTER_MIN_VER = { 0, 26, 1 }
 
 ---@param name string
 ---@return table?

From cc12e37e5bdc5467c9a06ab9b0887a97758f567f Mon Sep 17 00:00:00 2001
From: stefan <stefan.r.boca@gmail.com>
Date: Wed, 28 Jan 2026 15:55:38 -0800
Subject: [PATCH 2638/2704] fix(nix): make all bash injections combined

---
 runtime/queries/nix/injections.scm                 | 12 ++++++++----
 tests/query/injections/nix/test-nix-injections.nix |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm
index 718a9c1c5..c1593b91f 100644
--- a/runtime/queries/nix/injections.scm
+++ b/runtime/queries/nix/injections.scm
@@ -48,7 +48,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^%a+Phase$"))
+  (#lua-match? @_path "^%a+Phase$")
+  (#set! injection.combined))
 
 (binding
   attrpath: (attrpath
@@ -61,7 +62,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^pre%a+$"))
+  (#lua-match? @_path "^pre%a+$")
+  (#set! injection.combined))
 
 (binding
   attrpath: (attrpath
@@ -74,7 +76,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^post%a+$"))
+  (#lua-match? @_path "^post%a+$")
+  (#set! injection.combined))
 
 (binding
   attrpath: (attrpath
@@ -87,7 +90,8 @@
       ((string_fragment) @injection.content
         (#set! injection.language "bash")))
   ]
-  (#lua-match? @_path "^script$"))
+  (#lua-match? @_path "^script$")
+  (#set! injection.combined))
 
 (apply_expression
   function: (_) @_func
diff --git a/tests/query/injections/nix/test-nix-injections.nix b/tests/query/injections/nix/test-nix-injections.nix
index 7505398e6..f0907a901 100644
--- a/tests/query/injections/nix/test-nix-injections.nix
+++ b/tests/query/injections/nix/test-nix-injections.nix
@@ -9,7 +9,8 @@ in {
   drv1 = stdenv.mkDerivation {
     buildPhase = "mkdir $out";
     installPhase = ''
-      echo "bar" > $out/foo.txt
+      echo "${bar}" > $out/foo.txt
+      echo "baz"" >> $out/foo.txt
     '';
   };
 

From 04ab807f8e6d3e42f385b872fd1dc20dcef12193 Mon Sep 17 00:00:00 2001
From: Christian Buttner <christian@cbuttner.de>
Date: Thu, 29 Jan 2026 11:02:30 +0100
Subject: [PATCH 2639/2704] feat(c3)!: update parser and highlights (#8477)

Breaking: `(import_declaration (path_ident))` changed to `(import_path (path_ident))`
---
 lua/nvim-treesitter/parsers.lua   |  2 +-
 runtime/queries/c3/highlights.scm | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 344da0130..ed9aa327e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '2c04e7858d63497152d42f08d3067972618aeedc',
+      revision = '7ef54adef1008ce7d943c2cca03aee93a79b2252',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
diff --git a/runtime/queries/c3/highlights.scm b/runtime/queries/c3/highlights.scm
index 1f02496b8..f2aa46dea 100644
--- a/runtime/queries/c3/highlights.scm
+++ b/runtime/queries/c3/highlights.scm
@@ -106,6 +106,7 @@
   "$if"
   "$include"
   "$is_const"
+  "$kindof"
   "$nameof"
   "$offsetof"
   "$qnameof"
@@ -218,6 +219,8 @@
   "&&&"
   "+++"
   "|||"
+  "???"
+  "+++="
 ] @operator
 
 (range_expr
@@ -232,6 +235,7 @@
 (ternary_expr
   [
     "?"
+    "???"
     ":"
   ] @keyword.conditional.ternary)
 
@@ -268,8 +272,8 @@
     (#any-of? @variable.builtin
       "alignof" "associated" "elements" "extnameof" "from_ordinal" "get" "inf" "is_eq" "is_ordered"
       "is_substruct" "len" "lookup" "lookup_field" "max" "membersof" "methodsof" "min" "nan" "inner"
-      "kindof" "names" "nameof" "params" "paramsof" "parentof" "qnameof" "returns" "sizeof" "tagof"
-      "has_tagof" "values" "typeid")))
+      "kindof" "names" "nameof" "params" "paramsof" "parentof" "qnameof" "returns" "sizeof" "set"
+      "tagof" "has_tagof" "values" "typeid")))
 
 ; Label
 [
@@ -285,7 +289,7 @@
   (path_ident
     (ident) @module))
 
-(import_declaration
+(import_path
   (path_ident
     (ident) @module))
 
@@ -298,6 +302,9 @@
 (call_inline_attributes
   (at_ident) @attribute)
 
+(type_suffix
+  (at_ident) @attribute)
+
 (asm_block_stmt
   (at_ident) @attribute)
 

From 19c729dae6e0eeb79423df0cf37780aa9a7cc3b7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 29 Jan 2026 16:14:17 +0100
Subject: [PATCH 2640/2704] fix(install)!: remove gitlab codepath

Gitlab tarballs have started including the commit hash, so downstream
processing fails anyway.
---
 lua/nvim-treesitter/install.lua | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 1020e7da9..81fad11d2 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -197,17 +197,13 @@ end
 ---@param output_dir string
 ---@return string? err
 local function do_download(logger, url, project_name, cache_dir, revision, output_dir)
-  local is_gitlab = url:find('gitlab.com', 1, true)
-
   local tmp = output_dir .. '-tmp'
 
   rmpath(tmp)
   a.schedule()
 
   url = url:gsub('.git$', '')
-  local target = is_gitlab
-      and string.format('%s/-/archive/%s/%s-%s.tar.gz', url, revision, project_name, revision)
-    or string.format('%s/archive/%s.tar.gz', url, revision)
+  local target = string.format('%s/archive/%s.tar.gz', url, revision)
 
   local tarball_path = fs.joinpath(cache_dir, project_name .. '.tar.gz')
 

From ac1d0ff910f3d7c6e0452461e7fe7d12c3687971 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 31 Jan 2026 11:01:43 +0100
Subject: [PATCH 2641/2704] fix(scripts): guard against empty reply when
 checking new revisions

---
 scripts/update-parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index 469865393..d3a33ad6c 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -64,7 +64,7 @@ for k, p in pairs(parsers) do
         sha = stdout[line] and vim.split(stdout[line], '\t')[1]
       end
 
-      if sha and info.revision ~= sha then
+      if sha and sha ~= '' and info.revision ~= sha then
         info.revision = sha
         updates[#updates + 1] = name
       end

From 4967fa48b0fe7a7f92cee546c76bb4bb61bb14d5 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 31 Jan 2026 10:08:25 +0000
Subject: [PATCH 2642/2704] bot(parsers): update beancount, c3, dart, desktop,
 editorconfig, gap, jinja, jinja_inline, matlab, mlir, nu, pkl, swift, unison,
 xresources, yaml

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ed9aa327e..dd2e14309 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,7 +93,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = '23b21252da8b8cb0f03d1d1fc4c8f87d407e1cdf',
+      revision = 'd7a03a7506fbbbc4b16a9a2054ff7c2b337744b8',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '7ef54adef1008ce7d943c2cca03aee93a79b2252',
+      revision = '302fab443c2237e3b8fb3e991454db0e442af130',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -337,7 +337,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = 'd4d8f3e337d8be23be27ffc35a0aef972343cd54',
+      revision = '5650b09d9fc4ef9315b361c74aa811bbdbc09458',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -345,7 +345,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '137292ae28e05011dbc7c5c383e2b25db1cf77c9',
+      revision = '27c713cd097f85d3024569adf34e069cade84905',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -448,7 +448,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '851f2c2483239ce62f919bf3408ccd20dc0b5c01',
+      revision = 'b58de0ce2c52990c8913e39a8c14ce4a40e29a39',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -624,7 +624,7 @@ return {
   },
   gap = {
     install_info = {
-      revision = '2bac14863b76ad0ff6fd7204c50574732acd66df',
+      revision = 'ed2480d42281586932920527823b307bc45052b8',
       url = 'https://github.com/gap-system/tree-sitter-gap',
     },
     maintainers = { '@reiniscirpons' },
@@ -1083,7 +1083,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = 'e589222a1ad44361bc376d5abdccd08e1fecfee5',
+      revision = '7bd0422c6a57aaabfee8603502d7708d0a536f5f',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1094,7 +1094,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = 'e589222a1ad44361bc376d5abdccd08e1fecfee5',
+      revision = '7bd0422c6a57aaabfee8603502d7708d0a536f5f',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1364,7 +1364,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'f3eef66526fdae0469207d8e561fb5771eea1721',
+      revision = 'f29f784107722e237e188bec333d4779082a2db1',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1396,7 +1396,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '4ab28ecdacef343af56c09b7981580503e49fadb',
+      revision = 'd989734f56e86c4949a4e74b39d573db8528efa0',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1476,7 +1476,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = '4c149627cc592560f77ead1c384e27ec85926407',
+      revision = 'bb3f533e5792260291945e1f329e1f0a779def6e',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1607,7 +1607,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'd9c591b4e770934fe15c2f1b3658f35553f6cb40',
+      revision = '57ed643ffd6b4f12c6f829cd3268e9ad216e2c30',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -2228,7 +2228,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'c7287392d610ca9d7c80f9edd2c6ef8f518b377b',
+      revision = '12bacf3ee30f6c39e7cfa6ca6625cac012589236',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2469,7 +2469,7 @@ return {
   unison = {
     install_info = {
       generate = true,
-      revision = '169e7f748a540ec360c0cb086b448faad012caa4',
+      revision = 'c09e95252b4b3f5914c33d72a48af25089737afd',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },
@@ -2626,7 +2626,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = 'a81f1ea4478d03c223ef7eace535a36220bddd8c',
+      revision = '8ec70e2171025d09146afd2cce9712affe9ff3dd',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
@@ -2634,7 +2634,7 @@ return {
   },
   yaml = {
     install_info = {
-      revision = '7708026449bed86239b1cd5bce6e3c34dbca6415',
+      revision = '4463985dfccc640f3d6991e3396a2047610cf5f8',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yaml',
     },
     maintainers = { '@amaanq' },

From 70a9fecaf5aeae70c765d4c51a8038165a91aa06 Mon Sep 17 00:00:00 2001
From: phanium <91544758+phanen@users.noreply.github.com>
Date: Thu, 5 Feb 2026 10:52:53 +0800
Subject: [PATCH 2643/2704] fix(lua): injections in vim.{rpcrequest,rpcnotify}

---
 runtime/queries/lua/injections.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
index e76745f4f..8f371c9ed 100644
--- a/runtime/queries/lua/injections.scm
+++ b/runtime/queries/lua/injections.scm
@@ -34,10 +34,10 @@
     (_)
     .
     (string
-      content: _ @_method)
+      content: (_) @_method)
     .
     (string
-      content: _ @injection.content)))
+      content: (_) @injection.content)))
   (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
   (#eq? @_method "nvim_exec_lua")
   (#set! injection.language "lua"))

From 92c9b016d16473dabd2bf3760196cf2d928edacc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 6 Feb 2026 12:11:57 +0100
Subject: [PATCH 2644/2704] fix(install): retry on server error

---
 lua/nvim-treesitter/install.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 81fad11d2..c19a000e5 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -214,6 +214,8 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
       '--silent',
       '--fail',
       '--show-error',
+      '--retry',
+      '3',
       '-L', -- follow redirects
       target,
       '--output',

From 45a07f869b0cffba342276f2c77ba7c116d35db8 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 7 Feb 2026 07:07:14 +0000
Subject: [PATCH 2645/2704] bot(parsers): update javadoc, just, kotlin,
 markdown, markdown_inline, matlab, mlir, php, php_only, pkl, slint, unison

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index dd2e14309..a699ae53d 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1065,7 +1065,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '141525e73c9ad2fe7df8861047d4068ddbb6c337',
+      revision = 'd1a2efc871825ff29a1d241cdcac5713c99cfd54',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1156,7 +1156,7 @@ return {
   },
   just = {
     install_info = {
-      revision = '7333f8c150aaac5bb46decc2d225a2d4cde8c51e',
+      revision = 'fe94f5230d97ff9fc7bee8c57e650dff615ed7cc',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
@@ -1204,7 +1204,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = '57fb4560ba8641865bc0baa6b3f413b236112c4c',
+      revision = '6b9788578ae23a1bc7c87e8d564e0daf7671dee3',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     maintainers = { '@SalBakraa' },
@@ -1344,7 +1344,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = 'da063e1ba4303ff08781eb440cc9a7bd41e55dd8',
+      revision = 'bd2d09ecdbd36289bb7185c8751bbf14c5afe838',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1355,7 +1355,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = 'da063e1ba4303ff08781eb440cc9a7bd41e55dd8',
+      revision = 'bd2d09ecdbd36289bb7185c8751bbf14c5afe838',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1364,7 +1364,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = 'f29f784107722e237e188bec333d4779082a2db1',
+      revision = '574dde565caddf8cf44eec7df3cb89eb96053ed7',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1396,7 +1396,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'd989734f56e86c4949a4e74b39d573db8528efa0',
+      revision = 'a547cb73d7c6373e77692bb7739e670b5de60f86',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1571,7 +1571,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '7d07b41ce2d442ca9a90ed85d0075eccc17ae315',
+      revision = '015ce839db5ae9ceda763bf12e071867fbe8cc89',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1582,7 +1582,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '7d07b41ce2d442ca9a90ed85d0075eccc17ae315',
+      revision = '015ce839db5ae9ceda763bf12e071867fbe8cc89',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1607,7 +1607,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = '57ed643ffd6b4f12c6f829cd3268e9ad216e2c30',
+      revision = '0be2b56dec91cf03d6b653dcbb24188dd5c44dd6',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -2045,7 +2045,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '10fb0f188d7950400773c06ba6c31075866e14bf',
+      revision = '5dafe6745dd3bb24342acebe478015b642dc7135',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2469,7 +2469,7 @@ return {
   unison = {
     install_info = {
       generate = true,
-      revision = 'c09e95252b4b3f5914c33d72a48af25089737afd',
+      revision = '873e599faaba40a69b8f9507f90bcfa0ae0bbe26',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },

From 9f2dad22ef8bb14fd1e0a3aa8859cdc88170668b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 11 Feb 2026 11:58:19 +0100
Subject: [PATCH 2646/2704] feat(vento)!: update parser and queries

Breaking change: `(keyword)` node removed.

Also mark as unmaintained (Copilot-maintained)
---
 SUPPORTED_LANGUAGES.md               |  2 +-
 lua/nvim-treesitter/parsers.lua      |  5 ++---
 runtime/queries/vento/highlights.scm | 22 +++++++++++++++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 5b767a487..1f254f369 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -316,7 +316,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [uxntal](https://github.com/tree-sitter-grammars/tree-sitter-uxntal) | unstable | `HFIJL` | @amaanq
 [v](https://github.com/vlang/v-analyzer) | unstable | `HFIJL` | @kkharji, @amaanq
 [vala](https://github.com/vala-lang/tree-sitter-vala) | unstable | `HF J ` | @Prince781
-[vento](https://github.com/ventojs/tree-sitter-vento) | unstable | `H  J ` | @wrapperup, @oscarotero
+[vento](https://github.com/ventojs/tree-sitter-vento) | unmaintained | `H  J ` | 
 [vhdl](https://github.com/jpt13653903/tree-sitter-vhdl) | unstable | `HF J ` | @jpt13653903
 [vhs](https://github.com/charmbracelet/tree-sitter-vhs) | unstable | `H  J ` | @caarlos0
 [vim](https://github.com/tree-sitter-grammars/tree-sitter-vim) | unstable | `HF JL` | @clason
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a699ae53d..7b930ee50 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2510,11 +2510,10 @@ return {
   },
   vento = {
     install_info = {
-      revision = '3b32474bc29584ea214e4e84b47102408263fe0e',
+      revision = 'edd6596d4b0f392b87fc345dc26d84a6c32f7059',
       url = 'https://github.com/ventojs/tree-sitter-vento',
     },
-    maintainers = { '@wrapperup', '@oscarotero' },
-    tier = 2,
+    tier = 3,
   },
   vhdl = {
     install_info = {
diff --git a/runtime/queries/vento/highlights.scm b/runtime/queries/vento/highlights.scm
index 9d35b2f66..ec31aae20 100644
--- a/runtime/queries/vento/highlights.scm
+++ b/runtime/queries/vento/highlights.scm
@@ -1,6 +1,26 @@
 (comment) @comment @spell
 
-(keyword) @keyword
+[
+  "if"
+  "/if"
+  "else"
+  "for"
+  "/for"
+  "layout"
+  "/layout"
+  "set"
+  "/set"
+  "import"
+  "export"
+  "/export"
+  "include"
+  "function"
+  "/function"
+  "fragment"
+  "/fragment"
+  "of"
+  "async"
+] @keyword
 
 (tag
   [

From 88a84873789d262bb39a72885424839d05d73211 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 14 Feb 2026 07:09:20 +0000
Subject: [PATCH 2647/2704] bot(parsers): update dart, fortran, gleam,
 janet_simple, just, mlir, rescript, slint, solidity, sql, t32, unison

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 7b930ee50..fe3d5f4d8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -337,7 +337,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = '5650b09d9fc4ef9315b361c74aa811bbdbc09458',
+      revision = '81638dbbdb76a0e88ea8c31b95ec76b9625ddb84',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '43cd127cd41ff6e57b3ececb3cc283c5af4796e7',
+      revision = '32fe27ec32b6a3bc2bc333566e6457f10fc7bbe3',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -699,7 +699,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = 'dd4e328c5fd5f158d47a22339d8ce0f8be918a0b',
+      revision = '6ea757f7eb8d391dbf24dbb9461990757946dd5e',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -1049,7 +1049,7 @@ return {
   },
   janet_simple = {
     install_info = {
-      revision = '7e28cbf1ca061887ea43591a2898001f4245fddf',
+      revision = 'd183186995204314700be3e9e0a48053ea16b350',
       url = 'https://github.com/sogaiu/tree-sitter-janet-simple',
     },
     maintainers = { '@sogaiu' },
@@ -1156,7 +1156,7 @@ return {
   },
   just = {
     install_info = {
-      revision = 'fe94f5230d97ff9fc7bee8c57e650dff615ed7cc',
+      revision = '60df3d5b3fda2a22fdb3621226cafab50b763663',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
@@ -1396,7 +1396,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'a547cb73d7c6373e77692bb7739e670b5de60f86',
+      revision = 'd2ba26eeee7e3fd83a52236e1f143da42145ade7',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1899,7 +1899,7 @@ return {
   },
   rescript = {
     install_info = {
-      revision = '5938ae1578aa559b4fa903f7cabc31da14f71c84',
+      revision = '3159c949c15096b02b470bd4025754806fc7a17d',
       url = 'https://github.com/rescript-lang/tree-sitter-rescript',
     },
     maintainers = { '@ribru17' },
@@ -2045,7 +2045,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = '5dafe6745dd3bb24342acebe478015b642dc7135',
+      revision = 'a6e4e1c656429e5df52dcfcd92da87b642f6678b',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2086,7 +2086,7 @@ return {
   },
   solidity = {
     install_info = {
-      revision = '4e938a46c7030dd001bc99e1ac0f0c750ac98254',
+      revision = '048fe686cb1fde267243739b8bdbec8fc3a55272',
       url = 'https://github.com/JoranHonig/tree-sitter-solidity',
     },
     maintainers = { '@amaanq' },
@@ -2137,7 +2137,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '86e3d03837d282544439620eb74d224586074b8b',
+      revision = 'c686d575d6ee585c404c30dd1cf2a0f42d687460',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2260,7 +2260,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '5b5e4336731bda5ea2e6b78b6a2d9e7a89032b75',
+      revision = 'c4c5fa31666c66036ad3ace8179a408b8478395f',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2469,7 +2469,7 @@ return {
   unison = {
     install_info = {
       generate = true,
-      revision = '873e599faaba40a69b8f9507f90bcfa0ae0bbe26',
+      revision = '16650de9f519e41f8e88b22b4c401d50fa0ac8ca',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },

From b032f66f0b9077a656aa5d811de09be944970fae Mon Sep 17 00:00:00 2001
From: fin-w <41450706+fin-w@users.noreply.github.com>
Date: Sat, 14 Feb 2026 11:33:04 +0000
Subject: [PATCH 2648/2704] fix(health): consistent abbreviations in legend

---
 lua/nvim-treesitter/health.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index b81483e73..ff0c0c0cf 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -148,7 +148,7 @@ function M.check()
     end
     health.info(vim.fn.trim(out, ' ', 2))
   end
-  health.start('  Legend: H[ighlights], L[ocals], F[olds], I[ndents], In[J]ections')
+  health.start('  Legend: [H]ighlights, [L]ocals, [F]olds, [I]ndents, In[J]ections')
 
   if #error_collection > 0 then
     health.start('The following errors have been detected in query files:')

From 4d9466677a5ceadef104eaa0fe08d60d91c4e9a7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 14 Feb 2026 13:11:26 +0100
Subject: [PATCH 2649/2704] fix(install): raise number of retries

Seven retries ought to be enough for anybody.
---
 lua/nvim-treesitter/install.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c19a000e5..30e2d2ce7 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -215,7 +215,7 @@ local function do_download(logger, url, project_name, cache_dir, revision, outpu
       '--fail',
       '--show-error',
       '--retry',
-      '3',
+      '7',
       '-L', -- follow redirects
       target,
       '--output',

From ca35dc5184327f9e19b70932190a256235acecb1 Mon Sep 17 00:00:00 2001
From: Dennis van den Berg <dennis.vandenberg@nedap.com>
Date: Tue, 17 Feb 2026 12:12:06 +0100
Subject: [PATCH 2650/2704] feat(angular): adds support for css class bindings

---
 lua/nvim-treesitter/parsers.lua        | 2 +-
 runtime/queries/angular/highlights.scm | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fe3d5f4d8..e92d098e3 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '3bd2036e710f609ea08fcfca5a1eb1169ecc114f',
+      revision = '41c861193f576cf0282573e7715dc4daa015de34',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
diff --git a/runtime/queries/angular/highlights.scm b/runtime/queries/angular/highlights.scm
index ad192329a..d248d2e4c 100644
--- a/runtime/queries/angular/highlights.scm
+++ b/runtime/queries/angular/highlights.scm
@@ -28,6 +28,12 @@
 (binding_name
   (identifier) @keyword)
 
+(class_binding
+  [
+    (identifier)
+    (class_name)
+  ] @keyword)
+
 (event_binding
   (binding_name
     (identifier) @keyword))

From 2bd9b9b4f12eed175fba35ca2db8e8584546a4ec Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Tue, 17 Feb 2026 16:57:28 +0000
Subject: [PATCH 2651/2704] bot(parsers): update angular, bpftrace, c_sharp,
 fortran, markdown, markdown_inline, mlir, nickel, tlaplus

---
 lua/nvim-treesitter/parsers.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e92d098e3..0f95813fa 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -18,7 +18,7 @@ return {
   },
   angular = {
     install_info = {
-      revision = '41c861193f576cf0282573e7715dc4daa015de34',
+      revision = 'f0d0685701b70883fa2dfe94ee7dc27965cab841',
       url = 'https://github.com/dlvandenberg/tree-sitter-angular',
     },
     maintainers = { '@dlvandenberg' },
@@ -142,7 +142,7 @@ return {
   },
   bpftrace = {
     install_info = {
-      revision = '0978030fdcdab74d49faaee2a60eb94607a367cc',
+      revision = '774f4458ad39691336ead1ee361b22434c4cdec7',
       url = 'https://github.com/sgruszka/tree-sitter-bpftrace',
     },
     maintainers = { '@sgruszka' },
@@ -174,7 +174,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = 'f05a2ca99d329de2e6c32f26a21c6169b2bfcbb7',
+      revision = 'f1bf9a9b8410b1ebea900e2e5fc000007d5ef99d',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '32fe27ec32b6a3bc2bc333566e6457f10fc7bbe3',
+      revision = '2880b7aab4fb7cc618de1ef3d4c6d93b2396c031',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -1344,7 +1344,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = 'bd2d09ecdbd36289bb7185c8751bbf14c5afe838',
+      revision = 'cee71b8288f2ec09c29415219ac15a654bd571b9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1355,7 +1355,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = 'bd2d09ecdbd36289bb7185c8751bbf14c5afe838',
+      revision = 'cee71b8288f2ec09c29415219ac15a654bd571b9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1396,7 +1396,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'd2ba26eeee7e3fd83a52236e1f143da42145ade7',
+      revision = 'e4d15660e9984f742aa4bde95012d7e809ddb4d4',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1428,7 +1428,7 @@ return {
   },
   nickel = {
     install_info = {
-      revision = 'a0a5d98a6f0edb5d00a18e62e7d1d02a5607c391',
+      revision = 'b5b6cc3bc7b9ea19f78fed264190685419cd17a8',
       url = 'https://github.com/nickel-lang/tree-sitter-nickel',
     },
     tier = 2,
@@ -2351,7 +2351,7 @@ return {
   },
   tlaplus = {
     install_info = {
-      revision = '8d749f9a598b47b7110c7340006c8eb8a9552566',
+      revision = 'add40814fda369f6efd989977b2c498aaddde984',
       url = 'https://github.com/tlaplus-community/tree-sitter-tlaplus',
     },
     maintainers = { '@ahelwer', '@susliko' },

From 02115634451887fe53ca7e2203b22767de746bd4 Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <stefan@vanburen.xyz>
Date: Wed, 18 Feb 2026 11:26:40 -0500
Subject: [PATCH 2652/2704] feat(protobuf)!: switch parser repo (#8514)

This switches the protobuf parser to https://github.com/coder3101/tree-sitter-proto,
which is a maintained parser and used in Zed.

The old https://github.com/treywood/tree-sitter-proto is effectively
unmaintained AFAICT, so it would be nice to have a maintained repo here.
---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 1f254f369..3e8312d82 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -219,7 +219,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [prolog](https://github.com/foxyseta/tree-sitter-prolog) | unstable | `HFIJ ` | @foxyseta
 [promql](https://github.com/MichaHoffmann/tree-sitter-promql) | unstable | `H  J ` | @MichaHoffmann
 [properties](https://github.com/tree-sitter-grammars/tree-sitter-properties)[^properties] | unstable | `H  JL` | @ObserverOfTime
-[proto](https://github.com/treywood/tree-sitter-proto) | unstable | `HFIJ ` | @treywood
+[proto](https://github.com/coder3101/tree-sitter-proto) | unstable | `HFIJ ` | @stefanvanburen
 [prql](https://github.com/PRQL/tree-sitter-prql) | unstable | `H  J ` | @matthias-Q
 [psv](https://github.com/tree-sitter-grammars/tree-sitter-csv) | unstable | `H    ` | @amaanq
 [pug](https://github.com/zealot128/tree-sitter-pug) | unstable | `H  J ` | @zealot128
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0f95813fa..946abb191 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1710,10 +1710,10 @@ return {
   },
   proto = {
     install_info = {
-      revision = 'e9f6b43f6844bd2189b50a422d4e2094313f6aa3',
-      url = 'https://github.com/treywood/tree-sitter-proto',
+      revision = '0e122d8444fd67cd8fb72fc927323b36807e7ace',
+      url = 'https://github.com/coder3101/tree-sitter-proto',
     },
-    maintainers = { '@treywood' },
+    maintainers = { '@stefanvanburen' },
     tier = 2,
   },
   prql = {

From 23502d650a851599428ca51f418e96960ea68f52 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 18 Feb 2026 11:32:57 -0500
Subject: [PATCH 2653/2704] fix(glimmer_typescript): inherit typescript indents

---
 runtime/queries/glimmer_typescript/indents.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/runtime/queries/glimmer_typescript/indents.scm b/runtime/queries/glimmer_typescript/indents.scm
index 237254d4c..ec026473f 100644
--- a/runtime/queries/glimmer_typescript/indents.scm
+++ b/runtime/queries/glimmer_typescript/indents.scm
@@ -1,3 +1,5 @@
+; inherits: typescript
+
 (glimmer_opening_tag) @indent.begin
 
 (glimmer_closing_tag) @indent.end

From ecdae44baefeffceade8b0c752d80ececad28e76 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 18 Feb 2026 19:47:57 +0100
Subject: [PATCH 2654/2704] feat(kotlin)!: update parser and queries

Breaking change: removed nodes `"!in"` and `"!is"`.
---
 SUPPORTED_LANGUAGES.md                | 2 +-
 lua/nvim-treesitter/parsers.lua       | 3 +--
 runtime/queries/kotlin/highlights.scm | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 3e8312d82..f2082ed1a 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -159,7 +159,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [kdl](https://github.com/tree-sitter-grammars/tree-sitter-kdl) | unstable | `HFIJL` | @amaanq
 [kitty](https://github.com/OXY2DEV/tree-sitter-kitty) | unstable | `H  J ` | @OXY2DEV
 [kos](https://github.com/kos-lang/tree-sitter-kos) | unstable | `HF JL` | @cdragan
-[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` | @SalBakraa
+[kotlin](https://github.com/fwcd/tree-sitter-kotlin) | unstable | `HF JL` | 
 [koto](https://github.com/koto-lang/tree-sitter-koto) | unstable | `HF JL` | @irh
 [kusto](https://github.com/Willem-J-an/tree-sitter-kusto) | unstable | `H  J ` | @Willem-J-an
 [lalrpop](https://github.com/traxys/tree-sitter-lalrpop) | unstable | `HF JL` | @traxys
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 946abb191..dff153a22 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1204,10 +1204,9 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = '6b9788578ae23a1bc7c87e8d564e0daf7671dee3',
+      revision = '48c964a9ddfe4387968d1b6412d7b39106fb7f39',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
-    maintainers = { '@SalBakraa' },
     tier = 2,
   },
   koto = {
diff --git a/runtime/queries/kotlin/highlights.scm b/runtime/queries/kotlin/highlights.scm
index 8eda6ef61..a45ab23d5 100644
--- a/runtime/queries/kotlin/highlights.scm
+++ b/runtime/queries/kotlin/highlights.scm
@@ -153,7 +153,7 @@
     "charArrayOf" "emptyArray" "mapOf" "setOf" "listOf" "emptyMap" "emptySet" "emptyList"
     "mutableMapOf" "mutableSetOf" "mutableListOf" "print" "println" "error" "TODO" "run"
     "runCatching" "repeat" "lazy" "lazyOf" "enumValues" "enumValueOf" "assert" "check"
-    "checkNotNull" "require" "requireNotNull" "with" "suspend" "synchronized"))
+    "checkNotNull" "require" "requireNotNull" "with" "synchronized"))
 
 ; Literals
 [
@@ -343,12 +343,11 @@
   "?:"
   "!!"
   "is"
-  "!is"
   "in"
-  "!in"
   "as"
   "as?"
   ".."
+  "..<"
   "->"
 ] @operator
 

From 3edb01f912867603c2aef9079f208f0244c0885b Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Thu, 19 Feb 2026 09:39:22 -0500
Subject: [PATCH 2655/2704] fix(install): unlink files before copy on unix to
 prevent crashes (#8517)

uv_fs_copyfile will truncate the target first, which can result in
hard-to-debug crashes if the shared object is currently in use.

instead, unlink the target first, so that the operation doesn't modify
any in-use files. the disk space from the old parsers won't be reclaimed
until any processes using them relinquish their open file handles.
---
 lua/nvim-treesitter/install.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 30e2d2ce7..b94b31027 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -302,6 +302,8 @@ local function do_install(logger, compile_location, target_location)
     local tempfile = target_location .. tostring(uv.hrtime())
     uv_rename(target_location, tempfile) -- parser may be in use: rename...
     uv_unlink(tempfile) -- ...and mark for garbage collection
+  else
+    uv_unlink(target_location) -- don't disturb existing memory-mapped content
   end
 
   local err = uv_copyfile(compile_location, target_location)

From fcd51bbe9245aa9b79a3930ed9ac42e16e1cf33f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 20 Feb 2026 10:55:46 +0100
Subject: [PATCH 2656/2704] fix(supercollider): mark as tier 3

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index f2082ed1a..a3f90d44e 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -277,7 +277,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` | @amaanq
 [strace](https://github.com/sigmaSd/tree-sitter-strace) | unstable | `H  J ` | @amaanq
 [styled](https://github.com/mskelton/tree-sitter-styled) | unstable | `HFIJ ` | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unstable | `HFIJL` | @madskjeldgaard
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unmaintained | `HFIJL` | @madskjeldgaard
 [superhtml](https://github.com/kristoff-it/superhtml) | unstable | `H  J ` | @rockorager
 [surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` | @connorlay
 [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index dff153a22..a0d1b6453 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2188,7 +2188,7 @@ return {
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard' },
-    tier = 2,
+    tier = 3,
   },
   superhtml = {
     install_info = {

From dc42c209f3820bdfaae0956f15de29689aa6b451 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 21 Feb 2026 07:05:40 +0000
Subject: [PATCH 2657/2704] bot(parsers): update c_sharp, desktop,
 editorconfig, fish, kitty, kotlin, mlir, proto, rescript, sql, swift,
 xresources

---
 lua/nvim-treesitter/parsers.lua | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a0d1b6453..e58ac2483 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -174,7 +174,7 @@ return {
   },
   c_sharp = {
     install_info = {
-      revision = 'f1bf9a9b8410b1ebea900e2e5fc000007d5ef99d',
+      revision = '88366631d598ce6595ec655ce1591b315cffb14c',
       url = 'https://github.com/tree-sitter/tree-sitter-c-sharp',
     },
     maintainers = { '@amaanq' },
@@ -345,7 +345,7 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '27c713cd097f85d3024569adf34e069cade84905',
+      revision = '4a99354f8e9bb7270586f6f539130c74e59cafdd',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
@@ -448,7 +448,7 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = 'b58de0ce2c52990c8913e39a8c14ce4a40e29a39',
+      revision = '406ab80f7dc4f3aac252ad3d106737a621dde47d',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
@@ -567,7 +567,7 @@ return {
   },
   fish = {
     install_info = {
-      revision = 'aa074a0bacde8b5823c592574d7138f156a95776',
+      revision = '5248e7c375183b83f70cc6d8a7b2f5438234d395',
       url = 'https://github.com/ram02z/tree-sitter-fish',
     },
     maintainers = { '@ram02z' },
@@ -1188,7 +1188,7 @@ return {
   },
   kitty = {
     install_info = {
-      revision = 'f821c16397ffab5b776d8781245215811438a624',
+      revision = 'fa6ab3fd32d890a0217495c96b35761e6d2dcb5b',
       url = 'https://github.com/OXY2DEV/tree-sitter-kitty',
     },
     maintainers = { '@OXY2DEV' },
@@ -1204,7 +1204,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = '48c964a9ddfe4387968d1b6412d7b39106fb7f39',
+      revision = 'c10ad83a66c76855e006496db3bdb002afc49203',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     tier = 2,
@@ -1395,7 +1395,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'e4d15660e9984f742aa4bde95012d7e809ddb4d4',
+      revision = 'fe703bcb17ee58a3029df8a35099be1415877633',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1709,7 +1709,7 @@ return {
   },
   proto = {
     install_info = {
-      revision = '0e122d8444fd67cd8fb72fc927323b36807e7ace',
+      revision = '213175b7aa595fab7eba7d4eadeb62d9c7e0879e',
       url = 'https://github.com/coder3101/tree-sitter-proto',
     },
     maintainers = { '@stefanvanburen' },
@@ -1898,7 +1898,7 @@ return {
   },
   rescript = {
     install_info = {
-      revision = '3159c949c15096b02b470bd4025754806fc7a17d',
+      revision = '43c2f1f35024918d415dc933d4cc534d6419fedf',
       url = 'https://github.com/rescript-lang/tree-sitter-rescript',
     },
     maintainers = { '@ribru17' },
@@ -2136,7 +2136,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = 'c686d575d6ee585c404c30dd1cf2a0f42d687460',
+      revision = '71f3c41ff9c99505b2bda30361baaefdc3fed2b2',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2227,7 +2227,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '12bacf3ee30f6c39e7cfa6ca6625cac012589236',
+      revision = 'ae604674719764ce26f18017afa4a98949077075',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2624,7 +2624,7 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '8ec70e2171025d09146afd2cce9712affe9ff3dd',
+      revision = '30c59f2f095910509a8379f5de71db3acfef15d6',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },

From d660b7c002f3922b6bb3da47206645488a698426 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Sun, 22 Feb 2026 04:36:59 -0800
Subject: [PATCH 2658/2704] feat(editorconfig)!: update parser and queries

Removed nodes:
section_name, expansion_string, wildcard_characters,
wildcard_any_characters, wildcard_single_character, unset, boolean,
spelling_language, indent_style, end_of_line, charset, unknown

Renamed nodes:
identifier -> property
negation -> "!"
path_separator -> "/"
escaped_character -> character_escape
---
 SUPPORTED_LANGUAGES.md                      |  2 +-
 lua/nvim-treesitter/parsers.lua             |  4 +-
 runtime/queries/editorconfig/highlights.scm | 50 +++++++--------------
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index a3f90d44e..6ef00bc70 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -66,7 +66,7 @@ Language | Tier | Queries | Maintainer
 [earthfile](https://github.com/glehmann/tree-sitter-earthfile) | unstable | `H  J ` | @glehmann
 [ebnf](https://github.com/RubixDev/ebnf) | unstable | `H  J ` | @RubixDev
 ecma (queries only)[^ecma] | unstable | `HFIJL` | @steelsojka
-[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | unstable | `HF J ` | @ValdezFOmar
+[editorconfig](https://github.com/ValdezFOmar/tree-sitter-editorconfig) | stable | `HF J ` | @ValdezFOmar
 [eds](https://github.com/uyha/tree-sitter-eds) | unstable | `HF   ` | @uyha
 [eex](https://github.com/connorlay/tree-sitter-eex) | unstable | `H  J ` | @connorlay
 [elixir](https://github.com/elixir-lang/tree-sitter-elixir) | unstable | `HFIJL` | @connorlay
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index e58ac2483..ac8884b14 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -448,11 +448,11 @@ return {
   },
   editorconfig = {
     install_info = {
-      revision = '406ab80f7dc4f3aac252ad3d106737a621dde47d',
+      revision = 'v2.0.0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-editorconfig',
     },
     maintainers = { '@ValdezFOmar' },
-    tier = 2,
+    tier = 1,
   },
   eds = {
     install_info = {
diff --git a/runtime/queries/editorconfig/highlights.scm b/runtime/queries/editorconfig/highlights.scm
index feb0a524c..a1d686b36 100644
--- a/runtime/queries/editorconfig/highlights.scm
+++ b/runtime/queries/editorconfig/highlights.scm
@@ -1,14 +1,19 @@
 (comment) @comment @spell
 
-(section
-  (section_name) @string.special.path)
+(property) @property
 
-(character_choice
-  (character) @constant)
+(string) @string
 
-(character_range
-  start: (character) @constant
-  end: (character) @constant)
+(header
+  (glob) @string.special.path)
+
+(character) @character
+
+(character_escape) @string.escape
+
+(wildcard) @character.special
+
+(integer) @number
 
 [
   "["
@@ -20,36 +25,11 @@
 [
   ","
   ".."
-  (path_separator)
+  "/"
+  "-"
 ] @punctuation.delimiter
 
 [
-  "-"
   "="
-  (negation)
+  "!"
 ] @operator
-
-[
-  (wildcard_characters)
-  (wildcard_any_characters)
-  (wildcard_single_character)
-] @character.special
-
-(escaped_character) @string.escape
-
-(pair
-  key: (identifier) @property
-  value: (_) @string)
-
-(boolean) @boolean
-
-(integer) @number
-
-(unset) @constant.builtin
-
-[
-  (spelling_language)
-  (indent_style)
-  (end_of_line)
-  (charset)
-] @string.special

From a8845121f063458ef23df86e73f16bbee71ec67b Mon Sep 17 00:00:00 2001
From: Ark1409 <121744254+Ark1409@users.noreply.github.com>
Date: Tue, 24 Feb 2026 18:25:39 -0800
Subject: [PATCH 2659/2704] fix(c_sharp): missing highlight for lambda modifier
 (#8526)

---
 runtime/queries/c_sharp/highlights.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtime/queries/c_sharp/highlights.scm b/runtime/queries/c_sharp/highlights.scm
index 0c9489506..75aa3f847 100644
--- a/runtime/queries/c_sharp/highlights.scm
+++ b/runtime/queries/c_sharp/highlights.scm
@@ -327,6 +327,9 @@
 (lambda_expression
   type: (identifier) @type)
 
+(lambda_expression
+  (modifier) @keyword.modifier)
+
 (as_expression
   right: (identifier) @type)
 

From c6d295e96698b14c344a62a3abcf64139268c56b Mon Sep 17 00:00:00 2001
From: Salomon Popp <hi@salomonpopp.me>
Date: Wed, 25 Feb 2026 10:06:48 +0100
Subject: [PATCH 2660/2704] feat(nickel): update highlight queries to grammar
 changes

---
 runtime/queries/nickel/highlights.scm | 69 ++++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/runtime/queries/nickel/highlights.scm b/runtime/queries/nickel/highlights.scm
index c5ebfe166..20b52b30e 100644
--- a/runtime/queries/nickel/highlights.scm
+++ b/runtime/queries/nickel/highlights.scm
@@ -1,5 +1,8 @@
 (comment) @comment @spell
 
+(annot_atom
+  doc: (static_string) @spell)
+
 [
   "forall"
   "in"
@@ -7,6 +10,10 @@
   "default"
   "doc"
   "rec"
+  "optional"
+  "priority"
+  "force"
+  "not_exported"
 ] @keyword
 
 "fun" @keyword.function
@@ -30,13 +37,27 @@
 
 "null" @constant.builtin
 
+(enum_tag) @constant
+
 (num_literal) @number
 
-(infix_op) @operator
+[
+  (infix_op)
+  "|>"
+  "="
+  "&"
+  "=="
+  "/"
+  "!="
+  "<"
+  ">"
+  "@"
+  ".."
+] @operator
 
 (type_atom) @type
 
-(enum_tag) @variable
+(static_string) @string
 
 (chunk_literal_single) @string
 
@@ -51,24 +72,58 @@
   ")"
   "[|"
   "|]"
+  "["
+  "]"
 ] @punctuation.bracket
 
-(multstr_start) @punctuation.bracket
+[
+  ","
+  "."
+  ":"
+  "|"
+  "->"
+  "+"
+  "-"
+  "*"
+] @punctuation.delimiter
 
-(multstr_end) @punctuation.bracket
+(multstr_start) @string
+
+(multstr_end) @string
 
 (interpolation_start) @punctuation.bracket
 
 (interpolation_end) @punctuation.bracket
 
-(field_decl) @variable.member
-
 (builtin) @function.builtin
 
 (fun_expr
   pats: (pattern_fun
     (ident) @variable.parameter))
 
+; application where the head terms is an identifier: function arg1 arg2 arg3
 (applicative
   t1: (applicative
-    (record_operand) @function))
+    .
+    (record_operand
+      (atom
+        (ident))) @function))
+
+; application where the head terms is a record field path: foo.bar.function arg1 arg2 arg3
+(applicative
+  t1: (applicative
+    .
+    (record_operand
+      (record_operation_chain)) @function))
+
+(str_chunks) @string
+
+(field_path_elem) @property
+
+(infix_expr
+  op: (infix_b_op_6)
+  t2: (infix_expr
+    (applicative
+      .
+      (record_operand
+        (record_operation_chain) @function))))

From 67d0fd3e0a2a985a4c66461dfd7ab94e499dee38 Mon Sep 17 00:00:00 2001
From: Omar Valdez <omarantoniovaldezf2@gmail.com>
Date: Mon, 23 Feb 2026 20:40:21 -0800
Subject: [PATCH 2661/2704] feat(xresources,desktop): mark as tier 1

---
 SUPPORTED_LANGUAGES.md          | 4 ++--
 lua/nvim-treesitter/parsers.lua | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 6ef00bc70..c62071e1a 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -53,7 +53,7 @@ Language | Tier | Queries | Maintainer
 [cylc](https://github.com/elliotfontaine/tree-sitter-cylc) | unstable | `HFIJ ` | @elliotfontaine
 [d](https://github.com/gdamore/tree-sitter-d) | unstable | `HFIJL` | @amaanq
 [dart](https://github.com/UserNobody14/tree-sitter-dart) | unstable | `HFIJL` | @akinsho
-[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | unstable | `HF J ` | @ValdezFOmar
+[desktop](https://github.com/ValdezFOmar/tree-sitter-desktop) | stable | `HF J ` | @ValdezFOmar
 [devicetree](https://github.com/joelspadin/tree-sitter-devicetree) | unstable | `HFIJL` | @jedrzejboczar
 [dhall](https://github.com/jbellerb/tree-sitter-dhall) | unstable | `HF J ` | @amaanq
 [diff](https://github.com/tree-sitter-grammars/tree-sitter-diff) | unstable | `HF J ` | @gbprod
@@ -330,7 +330,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [wxml](https://github.com/BlockLune/tree-sitter-wxml) | unstable | `HFIJ ` | @BlockLune
 [xcompose](https://github.com/tree-sitter-grammars/tree-sitter-xcompose) | unstable | `H  JL` | @ObserverOfTime
 [xml](https://github.com/tree-sitter-grammars/tree-sitter-xml) | unstable | `HFIJL` | @ObserverOfTime
-[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | unstable | `HF JL` | @ValdezFOmar
+[xresources](https://github.com/ValdezFOmar/tree-sitter-xresources) | stable | `HF JL` | @ValdezFOmar
 [yaml](https://github.com/tree-sitter-grammars/tree-sitter-yaml) | unstable | `HFIJL` | @amaanq
 [yang](https://github.com/Hubro/tree-sitter-yang) | unstable | `HFIJ ` | @Hubro
 [yuck](https://github.com/tree-sitter-grammars/tree-sitter-yuck) | unstable | `HFIJL` | @Philipp-M, @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index ac8884b14..6c00ea4f2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -345,11 +345,11 @@ return {
   },
   desktop = {
     install_info = {
-      revision = '4a99354f8e9bb7270586f6f539130c74e59cafdd',
+      revision = 'v1.1.1',
       url = 'https://github.com/ValdezFOmar/tree-sitter-desktop',
     },
     maintainers = { '@ValdezFOmar' },
-    tier = 2,
+    tier = 1,
   },
   devicetree = {
     install_info = {
@@ -2624,11 +2624,11 @@ return {
   },
   xresources = {
     install_info = {
-      revision = '30c59f2f095910509a8379f5de71db3acfef15d6',
+      revision = 'v1.0.0',
       url = 'https://github.com/ValdezFOmar/tree-sitter-xresources',
     },
     maintainers = { '@ValdezFOmar' },
-    tier = 2,
+    tier = 1,
   },
   yaml = {
     install_info = {

From 0f5b204603234a523fafa8f6b860fd36f80a23f6 Mon Sep 17 00:00:00 2001
From: Ilya Ilyinykh <18665585+IlyasYOY@users.noreply.github.com>
Date: Wed, 25 Feb 2026 20:35:46 +0300
Subject: [PATCH 2662/2704] fix(typst): indentation for block and branch

---
 runtime/queries/typst/indents.scm |  4 +++-
 tests/indent/typst/call.typ       | 14 ++++++++++++++
 tests/indent/typst/for.typ        |  8 ++++++++
 tests/indent/typst/if.typ         | 15 +++++++++++++++
 tests/indent/typst/let.typ        | 13 +++++++++++++
 tests/indent/typst/set.typ        |  9 +++++++++
 tests/indent/typst/show.typ       |  7 +++++++
 tests/indent/typst_spec.lua       | 12 ++++++++++++
 8 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 tests/indent/typst/call.typ
 create mode 100644 tests/indent/typst/for.typ
 create mode 100644 tests/indent/typst/if.typ
 create mode 100644 tests/indent/typst/let.typ
 create mode 100644 tests/indent/typst/set.typ
 create mode 100644 tests/indent/typst/show.typ
 create mode 100644 tests/indent/typst_spec.lua

diff --git a/runtime/queries/typst/indents.scm b/runtime/queries/typst/indents.scm
index d43c586c1..424320fe4 100644
--- a/runtime/queries/typst/indents.scm
+++ b/runtime/queries/typst/indents.scm
@@ -3,10 +3,12 @@
   (let)
   (show)
   (call)
+  (for)
+  (branch)
 ] @indent.begin
 
 [
   "]"
   "}"
   ")"
-] @indent.branch @indent.end
+] @indent.end @indent.branch
diff --git a/tests/indent/typst/call.typ b/tests/indent/typst/call.typ
new file mode 100644
index 000000000..f0a64c97a
--- /dev/null
+++ b/tests/indent/typst/call.typ
@@ -0,0 +1,14 @@
+#foo(
+	arg1,
+	arg2,
+)
+
+#bar[
+	content here
+]
+
+#baz(
+	inner(
+		nested,
+	),
+)
diff --git a/tests/indent/typst/for.typ b/tests/indent/typst/for.typ
new file mode 100644
index 000000000..95fe60e9a
--- /dev/null
+++ b/tests/indent/typst/for.typ
@@ -0,0 +1,8 @@
+#for x in (1, 2, 3) {
+	x
+}
+
+#for x in (1, 2, 3) {
+	let y = x + 1
+	y
+}
diff --git a/tests/indent/typst/if.typ b/tests/indent/typst/if.typ
new file mode 100644
index 000000000..41bbaa4c1
--- /dev/null
+++ b/tests/indent/typst/if.typ
@@ -0,0 +1,15 @@
+#if true {
+	"this is one leve"
+}
+
+#set page(header: {
+	if true {
+		"this is internal on level"
+	}
+})
+
+#if true {
+	if false {
+		"this is it"
+	}
+}
diff --git a/tests/indent/typst/let.typ b/tests/indent/typst/let.typ
new file mode 100644
index 000000000..fa0c374c6
--- /dev/null
+++ b/tests/indent/typst/let.typ
@@ -0,0 +1,13 @@
+#let foo(
+	x,
+	y,
+) = x + y
+
+#let bar = {
+	let x = 1
+	x
+}
+
+#let baz(x) = {
+	x + 1
+}
diff --git a/tests/indent/typst/set.typ b/tests/indent/typst/set.typ
new file mode 100644
index 000000000..861b2f95e
--- /dev/null
+++ b/tests/indent/typst/set.typ
@@ -0,0 +1,9 @@
+#set text(
+	size: 12pt,
+	font: "Arial",
+)
+
+#set page(
+	width: 210mm,
+	height: 297mm,
+)
diff --git a/tests/indent/typst/show.typ b/tests/indent/typst/show.typ
new file mode 100644
index 000000000..3947b66c6
--- /dev/null
+++ b/tests/indent/typst/show.typ
@@ -0,0 +1,7 @@
+#show heading: it => {
+	it
+}
+
+#show link: it => {
+	underline(it)
+}
diff --git a/tests/indent/typst_spec.lua b/tests/indent/typst_spec.lua
new file mode 100644
index 000000000..81540405f
--- /dev/null
+++ b/tests/indent/typst_spec.lua
@@ -0,0 +1,12 @@
+local Runner = require('tests.indent.common').Runner
+
+local run = Runner:new(it, 'tests/indent/typst', {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 4,
+  expandtab = false,
+})
+
+describe('indent typst:', function()
+  run:whole_file('.')
+end)

From eaa5caed2a7b9c805ef221d2afcb3bf2a7b8d714 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 26 Feb 2026 10:34:01 +0100
Subject: [PATCH 2663/2704] feat(make): update parser and queries

---
 lua/nvim-treesitter/parsers.lua     | 2 +-
 runtime/queries/make/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6c00ea4f2..a060b304b 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1334,7 +1334,7 @@ return {
   },
   make = {
     install_info = {
-      revision = '5e9e8f8ff3387b0edcaa90f46ddf3629f4cfeb1d',
+      revision = '70613f3d812cbabbd7f38d104d60a409c4008b43',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-make',
     },
     maintainers = { '@lewis6991' },
diff --git a/runtime/queries/make/highlights.scm b/runtime/queries/make/highlights.scm
index 8d182c026..b4ef14cb1 100644
--- a/runtime/queries/make/highlights.scm
+++ b/runtime/queries/make/highlights.scm
@@ -167,6 +167,7 @@
     "eval"
     "file"
     "value"
+    "let"
   ] @function.builtin)
 
 "\\" @punctuation.special

From 8ada222612ae8410eb1a8b51cc18d1b19ae72a16 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:01:56 +0000
Subject: [PATCH 2664/2704] bot(parsers): update cpp, cue, fish, groovy, julia,
 liquid, lua, markdown, markdown_inline, mlir, pkl, powershell, query, slint,
 sql, swift, systemverilog, vhdl, vim

---
 lua/nvim-treesitter/parsers.lua | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index a060b304b..19b025745 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -277,7 +277,7 @@ return {
   },
   cpp = {
     install_info = {
-      revision = '12bd6f7e96080d2e70ec51d4068f2f66120dde35',
+      revision = '8b5b49eb196bec7040441bee33b2c9a4838d6967',
       url = 'https://github.com/tree-sitter/tree-sitter-cpp',
     },
     maintainers = { '@theHamsta' },
@@ -313,7 +313,7 @@ return {
   },
   cue = {
     install_info = {
-      revision = '770737bcff2c4aa3f624d439e32b07dbb07102d3',
+      revision = 'be0f609c73cc2929811a9bce0ed90ca71ea87604',
       url = 'https://github.com/eonpatapon/tree-sitter-cue',
     },
     maintainers = { '@amaanq' },
@@ -567,7 +567,7 @@ return {
   },
   fish = {
     install_info = {
-      revision = '5248e7c375183b83f70cc6d8a7b2f5438234d395',
+      revision = 'fa2143f5d66a9eb6c007ba9173525ea7aaafe788',
       url = 'https://github.com/ram02z/tree-sitter-fish',
     },
     maintainers = { '@ram02z' },
@@ -841,7 +841,7 @@ return {
   },
   groovy = {
     install_info = {
-      revision = '86911590a8e46d71301c66468e5620d9faa5b6af',
+      revision = 'a88865a3301a538e2060af5b401f4f431f71406e',
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
@@ -1148,7 +1148,7 @@ return {
   },
   julia = {
     install_info = {
-      revision = 'dd7f707577585ade7a488d32dbfb366246ea3837',
+      revision = '8454f266717232525ed03c7b09164b0404a03150',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-julia',
     },
     maintainers = { '@clason' },
@@ -1268,7 +1268,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = 'd6ebde3974742cd1b61b55d1d94aab1dacb41056',
+      revision = 'fa11c7ba45038b61e03a8a00ad667fb5f3d72088',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1292,7 +1292,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = 'e40f5b6e6df9c2d1d6d664ff5d346a75d71ee6b2',
+      revision = '9380fa1adad9b4277bcaf6afbd1600267220a8a8',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1343,7 +1343,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = 'cee71b8288f2ec09c29415219ac15a654bd571b9',
+      revision = '808e105aff82bc7cbc1587384dab71151b62182f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1354,7 +1354,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = 'cee71b8288f2ec09c29415219ac15a654bd571b9',
+      revision = '808e105aff82bc7cbc1587384dab71151b62182f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1395,7 +1395,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = 'fe703bcb17ee58a3029df8a35099be1415877633',
+      revision = '520cab3d4c436a5ee84d18e36647a83da6e46c02',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1606,7 +1606,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = '0be2b56dec91cf03d6b653dcbb24188dd5c44dd6',
+      revision = 'a02fc36f6001a22e7fdf35eaabbadb7b39c74ba5',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1649,7 +1649,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = '7212f47716ced384ac012b2cc428fd9f52f7c5d4',
+      revision = 'da65ba3acc93777255781b447f5e7448245df4bf',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1801,7 +1801,7 @@ return {
   },
   query = {
     install_info = {
-      revision = '6350ad724e7b17a7eea712d4860b4d2ae892e0b6',
+      revision = 'fc5409c6820dd5e02b0b0a309d3da2bfcde2db17',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-query',
     },
     maintainers = { '@steelsojka' },
@@ -2044,7 +2044,7 @@ return {
   },
   slint = {
     install_info = {
-      revision = 'a6e4e1c656429e5df52dcfcd92da87b642f6678b',
+      revision = '4d7ad0617c30f865f051bbac04a9826bea29f987',
       url = 'https://github.com/slint-ui/tree-sitter-slint',
     },
     maintainers = { '@hunger' },
@@ -2136,7 +2136,7 @@ return {
   sql = {
     install_info = {
       branch = 'gh-pages',
-      revision = '71f3c41ff9c99505b2bda30361baaefdc3fed2b2',
+      revision = '851e9cb257ba7c66cc8c14214a31c44d2f1e954e',
       url = 'https://github.com/derekstride/tree-sitter-sql',
     },
     maintainers = { '@derekstride' },
@@ -2227,7 +2227,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = 'ae604674719764ce26f18017afa4a98949077075',
+      revision = '30e18c7b0210b33ffd6e8a7028e170a9dc90825b',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2251,7 +2251,7 @@ return {
   },
   systemverilog = {
     install_info = {
-      revision = '7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2',
+      revision = '293928578cb27fbd0005fcc5f09c09a1e8628c89',
       url = 'https://github.com/gmlarumbe/tree-sitter-systemverilog',
     },
     maintainers = { '@zhangwwpeng' },
@@ -2516,7 +2516,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '674ed9fe6c13c79c0e7407daaf4518d053e6f0f4',
+      revision = '7e0d014691c1b8c25e8fe8f30cc3ac4649df3f57',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },
@@ -2532,7 +2532,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '1cd0a0892b389bd314a9bd09545160e5ee3c9137',
+      revision = '59d2fd4a46a18f07e29a863b07bbc2409c34c6d0',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },

From 957f86ae3f049ab6681ed64c05b05768fcaed0d2 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:01:28 +0000
Subject: [PATCH 2665/2704] bot(parsers): update zsh

---
 lua/nvim-treesitter/parsers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 19b025745..9d8b73930 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2688,7 +2688,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.53.0',
+      revision = 'v0.56.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },

From b9171ede5de41b3f2dfa33fe33ebd585d795f928 Mon Sep 17 00:00:00 2001
From: Tomas Sandven <597206+Hubro@users.noreply.github.com>
Date: Thu, 26 Feb 2026 20:17:27 +0100
Subject: [PATCH 2666/2704] feat(robot): update parser, mark as stable

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index c62071e1a..033722987 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -245,7 +245,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` | @ribru17
 [rifleconf](https://github.com/purarue/tree-sitter-rifleconf) | unstable | `H  J ` | @purarue
 [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | unstable | `HFIJ ` | @Hubro
+[robot](https://github.com/Hubro/tree-sitter-robot) | stable | `HFIJ ` | @Hubro
 [robots_txt](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
 [roc](https://github.com/faldor20/tree-sitter-roc) | unmaintained | `H IJL` | 
 [ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 9d8b73930..49b6de5a8 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1922,11 +1922,11 @@ return {
   },
   robot = {
     install_info = {
-      revision = 'e34def7cb0d8a66a59ec5057fe17bb4e6b17b56a',
+      revision = 'v1.2.0',
       url = 'https://github.com/Hubro/tree-sitter-robot',
     },
     maintainers = { '@Hubro' },
-    tier = 2,
+    tier = 1,
   },
   robots_txt = {
     install_info = {

From ae2081cfcd3719d74b600f8377e4a99d1ec19c4a Mon Sep 17 00:00:00 2001
From: Igor <igorlfs@ufmg.br>
Date: Fri, 27 Feb 2026 00:24:52 -0300
Subject: [PATCH 2667/2704] feat(ecma): variable definition from object
 destructure with alias

---
 runtime/queries/ecma/locals.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/runtime/queries/ecma/locals.scm b/runtime/queries/ecma/locals.scm
index adc58531d..97570e44a 100644
--- a/runtime/queries/ecma/locals.scm
+++ b/runtime/queries/ecma/locals.scm
@@ -25,6 +25,11 @@
   name: (object_pattern
     (shorthand_property_identifier_pattern) @local.definition.var))
 
+(variable_declarator
+  (object_pattern
+    (pair_pattern
+      (identifier) @local.definition.var)))
+
 (import_specifier
   (identifier) @local.definition.import)
 

From 6bc51d020a5e06b7e20ea82dbc47196d3d3027c7 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 28 Feb 2026 07:01:10 +0000
Subject: [PATCH 2668/2704] bot(parsers): update blade, kotlin, liquidsoap,
 lua, markdown, markdown_inline, mlir, proto, unison, vim

---
 lua/nvim-treesitter/parsers.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 49b6de5a8..39dc10687 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -125,7 +125,7 @@ return {
   },
   blade = {
     install_info = {
-      revision = 'cc764dadcbbceb3f259396fef66f970c72e94f96',
+      revision = '42b3c5a06bc29fbd2c2cbd52b96113365fbed646',
       url = 'https://github.com/EmranMR/tree-sitter-blade',
     },
     maintainers = { '@calebdw' },
@@ -1204,7 +1204,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'c10ad83a66c76855e006496db3bdb002afc49203',
+      revision = 'cbed96ab13dbc082eeeb2e8333c342a62829c29d',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     tier = 2,
@@ -1276,7 +1276,7 @@ return {
   },
   liquidsoap = {
     install_info = {
-      revision = 'd092c65598e940564e12214ff7c2097528cfa159',
+      revision = 'abd0eccddd680102064e0eca82ef954bd8d1a301',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
@@ -1292,7 +1292,7 @@ return {
   },
   lua = {
     install_info = {
-      revision = '9380fa1adad9b4277bcaf6afbd1600267220a8a8',
+      revision = '10fe0054734eec83049514ea2e718b2a56acd0c9',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-lua',
     },
     maintainers = { '@muniftanjim' },
@@ -1343,7 +1343,7 @@ return {
   markdown = {
     install_info = {
       location = 'tree-sitter-markdown',
-      revision = '808e105aff82bc7cbc1587384dab71151b62182f',
+      revision = 'f969cd3ae3f9fbd4e43205431d0ae286014c05b5',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1354,7 +1354,7 @@ return {
   markdown_inline = {
     install_info = {
       location = 'tree-sitter-markdown-inline',
-      revision = '808e105aff82bc7cbc1587384dab71151b62182f',
+      revision = 'f969cd3ae3f9fbd4e43205431d0ae286014c05b5',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-markdown',
     },
     maintainers = { '@MDeiml' },
@@ -1395,7 +1395,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '520cab3d4c436a5ee84d18e36647a83da6e46c02',
+      revision = '1cff1bf79135f8effef87d7cee9d3b26d1970ee9',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1709,7 +1709,7 @@ return {
   },
   proto = {
     install_info = {
-      revision = '213175b7aa595fab7eba7d4eadeb62d9c7e0879e',
+      revision = 'f0e767689c6e9efe7ff2e4b8680db71411915588',
       url = 'https://github.com/coder3101/tree-sitter-proto',
     },
     maintainers = { '@stefanvanburen' },
@@ -2468,7 +2468,7 @@ return {
   unison = {
     install_info = {
       generate = true,
-      revision = '16650de9f519e41f8e88b22b4c401d50fa0ac8ca',
+      revision = '10365cc70ab2b2de85ea7ab35cf6b7636c36ce8b',
       url = 'https://github.com/kylegoetz/tree-sitter-unison',
     },
     maintainers = { '@tapegram' },
@@ -2532,7 +2532,7 @@ return {
   },
   vim = {
     install_info = {
-      revision = '59d2fd4a46a18f07e29a863b07bbc2409c34c6d0',
+      revision = '3092fcd99eb87bbd0fc434aa03650ba58bd5b43b',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vim',
     },
     maintainers = { '@clason' },

From 995b75fd5129726c2ac922227944ab51871b05a5 Mon Sep 17 00:00:00 2001
From: Ethan Rutt <122636652+ethanrutt@users.noreply.github.com>
Date: Sun, 1 Mar 2026 15:29:06 -0600
Subject: [PATCH 2669/2704] feat: add gql function highlighting for ecmascript
 injection (#8541)

---
 runtime/queries/ecma/injections.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/ecma/injections.scm b/runtime/queries/ecma/injections.scm
index 669c75671..69afb6d41 100644
--- a/runtime/queries/ecma/injections.scm
+++ b/runtime/queries/ecma/injections.scm
@@ -59,10 +59,15 @@
   (#set! injection.include-children)
   (#set! injection.language "groq"))
 
+; gql`...` or gql(`...`)
 (call_expression
   function: (identifier) @_name
   (#eq? @_name "gql")
-  arguments: (template_string) @injection.content
+  arguments: [
+    (arguments
+      (template_string) @injection.content)
+    (template_string) @injection.content
+  ]
   (#offset! @injection.content 0 1 0 -1)
   (#set! injection.include-children)
   (#set! injection.language "graphql"))

From cb2cb74f3c3cbbcc17e79cada2060165d616d849 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Sun, 1 Mar 2026 12:57:34 -0800
Subject: [PATCH 2670/2704] feat(nickel): many more highlights

---
 runtime/queries/nickel/highlights.scm | 36 +++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/runtime/queries/nickel/highlights.scm b/runtime/queries/nickel/highlights.scm
index 20b52b30e..2f563e9f8 100644
--- a/runtime/queries/nickel/highlights.scm
+++ b/runtime/queries/nickel/highlights.scm
@@ -30,7 +30,13 @@
 
 (types) @type
 
-"Array" @type.builtin
+[
+  "Array"
+  "Number"
+  "Dyn"
+  "Bool"
+  "String"
+] @type.builtin
 
 ; BUILTIN Constants
 (bool) @boolean
@@ -46,15 +52,29 @@
   "|>"
   "="
   "&"
+  "&&"
+  "||"
   "=="
+  "+"
+  "-"
+  "*"
   "/"
+  "%"
+  "!"
+  "?"
   "!="
   "<"
+  "<="
   ">"
+  ">="
   "@"
   ".."
+  "=>"
+  "++"
 ] @operator
 
+"or" @keyword.operator
+
 (type_atom) @type
 
 (static_string) @string
@@ -80,23 +100,25 @@
   ","
   "."
   ":"
+  ";"
   "|"
   "->"
-  "+"
-  "-"
-  "*"
 ] @punctuation.delimiter
 
 (multstr_start) @string
 
 (multstr_end) @string
 
-(interpolation_start) @punctuation.bracket
-
-(interpolation_end) @punctuation.bracket
+[
+  (interpolation_start)
+  (interpolation_end)
+] @punctuation.special
 
 (builtin) @function.builtin
 
+(builtin
+  "%" @function.builtin)
+
 (fun_expr
   pats: (pattern_fun
     (ident) @variable.parameter))

From 972f378653c794b0ff82282a844732695064b70f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 3 Mar 2026 19:18:04 +0100
Subject: [PATCH 2671/2704] fix(config): normalize default `install_dir`

Problem: The default `install_dir` is not normalized, leading to a
false positive checkhealth failure when comparing against the normalized
`runtimepath` directories.

Solution: Use trailing slash in default `install_dir`.
---
 lua/nvim-treesitter/config.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 97fca649f..ca8f9b73d 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -7,7 +7,7 @@ M.tiers = { 'stable', 'unstable', 'unmaintained', 'unsupported' }
 
 ---@type TSConfig
 local config = {
-  install_dir = vim.fs.joinpath(vim.fn.stdpath('data') --[[@as string]], 'site'),
+  install_dir = vim.fs.joinpath(vim.fn.stdpath('data') --[[@as string]], 'site/'),
 }
 
 ---Setup call for users to override configuration configurations.

From 544320a9cf5d6bf539ec1cc54d393064015670c4 Mon Sep 17 00:00:00 2001
From: elgiano <elgiano@gmail.com>
Date: Fri, 20 Feb 2026 15:38:13 +0100
Subject: [PATCH 2672/2704] feat(supercollider)!: update parser and queries

parser PR: https://github.com/madskjeldgaard/tree-sitter-supercollider/pull/67

removed nodes:
control_structure, if, while, for, forby, method_call,
method_name, instance_variable_setter_call, argument_calls

added nodes:
class_def_body, !==, ===

modified nodes:
function_call now has fields receiver, name and arguments
chained method calls now appear as nested function_calls (where receiver
is another function_call)
---
 SUPPORTED_LANGUAGES.md                       |  2 +-
 lua/nvim-treesitter/parsers.lua              |  6 +-
 runtime/queries/supercollider/folds.scm      |  1 -
 runtime/queries/supercollider/highlights.scm | 73 +++++++++++++++-----
 runtime/queries/supercollider/indents.scm    | 19 +++--
 runtime/queries/supercollider/locals.scm     |  1 -
 6 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 033722987..90d77afb8 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -277,7 +277,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [starlark](https://github.com/tree-sitter-grammars/tree-sitter-starlark) | unstable | `HFIJL` | @amaanq
 [strace](https://github.com/sigmaSd/tree-sitter-strace) | unstable | `H  J ` | @amaanq
 [styled](https://github.com/mskelton/tree-sitter-styled) | unstable | `HFIJ ` | @mskelton
-[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unmaintained | `HFIJL` | @madskjeldgaard
+[supercollider](https://github.com/madskjeldgaard/tree-sitter-supercollider) | unstable | `HFIJL` | @madskjeldgaard, @elgiano
 [superhtml](https://github.com/kristoff-it/superhtml) | unstable | `H  J ` | @rockorager
 [surface](https://github.com/connorlay/tree-sitter-surface) | unstable | `HFIJ ` | @connorlay
 [svelte](https://github.com/tree-sitter-grammars/tree-sitter-svelte) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 39dc10687..4206c656a 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2184,11 +2184,11 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = '76b3cab1773f08bb7d3a185420b0a44c6da8c294',
+      revision = 'e2d1480de0a62cd53f81645cb39bc1f3fa2dce5a',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
-    maintainers = { '@madskjeldgaard' },
-    tier = 3,
+    maintainers = { '@madskjeldgaard', '@elgiano' },
+    tier = 2,
   },
   superhtml = {
     install_info = {
diff --git a/runtime/queries/supercollider/folds.scm b/runtime/queries/supercollider/folds.scm
index 2f5f1043a..a62272b5c 100644
--- a/runtime/queries/supercollider/folds.scm
+++ b/runtime/queries/supercollider/folds.scm
@@ -2,5 +2,4 @@
   (function_call)
   (code_block)
   (function_block)
-  (control_structure)
 ] @fold
diff --git a/runtime/queries/supercollider/highlights.scm b/runtime/queries/supercollider/highlights.scm
index c56bce69a..bef85ef45 100644
--- a/runtime/queries/supercollider/highlights.scm
+++ b/runtime/queries/supercollider/highlights.scm
@@ -1,6 +1,6 @@
 ; highlights.scm
 ; See this for full list: https://github.com/nvim-treesitter/nvim-treesitter/blob/master/CONTRIBUTING.md
-; comments
+; Comments
 (line_comment) @comment @spell
 
 (block_comment) @comment @spell
@@ -9,6 +9,12 @@
 (argument
   name: (identifier) @variable.parameter)
 
+"..." @variable.parameter ; variable argument
+
+; For function calls
+(named_argument
+  name: (identifier) @variable.parameter)
+
 ; Variables
 (local_var
   name: (identifier) @variable)
@@ -18,31 +24,58 @@
 
 (builtin_var) @constant.builtin
 
-; (variable) @variable
 ; Functions
 (function_definition
   name: (variable) @function)
 
-; For function calls
-(named_argument
-  name: (identifier) @function.call)
-
 ; Methods
-(method_call
-  name: (method_name) @function.method.call)
+(function_call
+  name: (_) @function.method.call)
+
+; Collections
+(associative_item
+  (identifier) @property)
 
 ; Classes
 (class) @type
 
+(parent_class) @type
+
+(instance_method_name) @function.method
+
+(class_method_name) @function.method
+
 ; Literals
+(bool) @boolean
+
 (number) @number
 
 (float) @number.float
 
 (string) @string
 
+(escape_sequence) @string.escape
+
 (symbol) @string.special.symbol
 
+; Conditionals
+[
+  "?"
+  "!?"
+  "??"
+] @keyword.conditional
+
+((function_call
+  name: (_) @keyword.conditional)
+  (#any-of? @keyword.conditional "if" "while" "case" "switch" "try" "protect"))
+
+((function_call
+  name: (_) @keyword.repeat)
+  (#any-of? @keyword.repeat "for" "forBy"))
+
+; Duplication operator
+"!" @keyword.repeat
+
 ; Operators
 [
   "&&"
@@ -52,6 +85,8 @@
   "^"
   "=="
   "!="
+  "==="
+  "!=="
   "<"
   "<="
   ">"
@@ -64,6 +99,13 @@
   "/"
   "%"
   "="
+  "@"
+  "|@|"
+  "@@"
+  "@|@"
+  "++"
+  "+/+"
+  ".."
 ] @operator
 
 ; Keywords
@@ -71,11 +113,13 @@
   "arg"
   "classvar"
   "const"
-  ; "super"
-  ; "this"
   "var"
 ] @keyword
 
+((local_var
+  name: (identifier) @variable.builtin)
+  (#any-of? @variable.builtin "this" "super"))
+
 ; Brackets
 [
   "("
@@ -92,12 +136,5 @@
   ";"
   "."
   ","
+  ":"
 ] @punctuation.delimiter
-
-; control structure
-(control_structure) @keyword.conditional
-
-(escape_sequence) @string.escape
-
-; SinOsc.ar()!2
-(duplicated_statement) @keyword.repeat
diff --git a/runtime/queries/supercollider/indents.scm b/runtime/queries/supercollider/indents.scm
index c0cffab3c..396721abf 100644
--- a/runtime/queries/supercollider/indents.scm
+++ b/runtime/queries/supercollider/indents.scm
@@ -12,21 +12,30 @@
   (variable_definition)
   (variable_definition_sequence
     (variable_definition))
-  (control_structure)
   (return_statement)
 ] @indent.begin
 
 [
   (parameter_call_list
-    (argument_calls))
-  "("
+    (_))
   ")"
-  "{"
   "}"
-  "["
   "]"
 ] @indent.branch
 
+; for auto-indent while typing
+(ERROR
+  "{") @indent.begin
+
+(ERROR
+  "}") @indent.branch
+
+(ERROR
+  "[") @indent.begin
+
+(ERROR
+  "]") @indent.branch
+
 [
   (block_comment)
   (line_comment)
diff --git a/runtime/queries/supercollider/locals.scm b/runtime/queries/supercollider/locals.scm
index 066bbf9ab..b0a082131 100644
--- a/runtime/queries/supercollider/locals.scm
+++ b/runtime/queries/supercollider/locals.scm
@@ -3,7 +3,6 @@
   (function_call)
   (code_block)
   (function_block)
-  (control_structure)
 ] @local.scope
 
 ; Definitions

From 1970f0d3bbb99c7659e58914948749437c7b7398 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 6 Mar 2026 10:58:02 +0100
Subject: [PATCH 2673/2704] feat(robot)!: update parser and queries

Breaking change: replaced `(variable_definition)` by
`(scalar_variable)`, `(list_variable)` and `(dictionary_variable)`.

Also mark queries as unmaintained.
---
 SUPPORTED_LANGUAGES.md               | 2 +-
 lua/nvim-treesitter/parsers.lua      | 5 ++---
 runtime/queries/robot/highlights.scm | 8 +++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 90d77afb8..547b48d04 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -245,7 +245,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [rescript](https://github.com/rescript-lang/tree-sitter-rescript) | unstable | `HFIJL` | @ribru17
 [rifleconf](https://github.com/purarue/tree-sitter-rifleconf) | unstable | `H  J ` | @purarue
 [rnoweb](https://github.com/bamonroe/tree-sitter-rnoweb) | unstable | `HF J ` | @bamonroe
-[robot](https://github.com/Hubro/tree-sitter-robot) | stable | `HFIJ ` | @Hubro
+[robot](https://github.com/Hubro/tree-sitter-robot) | unmaintained | `HFIJ ` | 
 [robots_txt](https://github.com/opa-oz/tree-sitter-robots-txt) | unstable | `H  J ` | @opa-oz
 [roc](https://github.com/faldor20/tree-sitter-roc) | unmaintained | `H IJL` | 
 [ron](https://github.com/tree-sitter-grammars/tree-sitter-ron) | unstable | `HFIJL` | @amaanq
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 4206c656a..fe5e1b7ba 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1922,11 +1922,10 @@ return {
   },
   robot = {
     install_info = {
-      revision = 'v1.2.0',
+      revision = 'v1.3.0',
       url = 'https://github.com/Hubro/tree-sitter-robot',
     },
-    maintainers = { '@Hubro' },
-    tier = 1,
+    tier = 3,
   },
   robots_txt = {
     install_info = {
diff --git a/runtime/queries/robot/highlights.scm b/runtime/queries/robot/highlights.scm
index a9c545b8a..ab30906c7 100644
--- a/runtime/queries/robot/highlights.scm
+++ b/runtime/queries/robot/highlights.scm
@@ -10,7 +10,13 @@
   (test_case_setting)
 ] @keyword
 
-(variable_definition
+(scalar_variable
+  (variable_name) @variable)
+
+(list_variable
+  (variable_name) @variable)
+
+(dictionary_variable
   (variable_name) @variable)
 
 (keyword_definition

From ebe76eb800d4e8df754fc96f8a7b84f578224a97 Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <svanburen@buf.build>
Date: Fri, 6 Mar 2026 11:12:43 -0500
Subject: [PATCH 2674/2704] feat(proto): sync queries with upstream (#8554)

This adds support for [Protobuf Editions][1], and a couple other minor
fixes.

Ref: https://github.com/coder3101/tree-sitter-proto/tree/main/queries

[1]: https://protobuf.dev/editions/overview/
---
 runtime/queries/proto/folds.scm      |  2 ++
 runtime/queries/proto/highlights.scm | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/runtime/queries/proto/folds.scm b/runtime/queries/proto/folds.scm
index 76f688b7d..87fe6d304 100644
--- a/runtime/queries/proto/folds.scm
+++ b/runtime/queries/proto/folds.scm
@@ -2,6 +2,8 @@
   (enum)
   (message)
   (service)
+  (oneof)
+  (rpc)
 ] @fold
 
 (import)+ @fold
diff --git a/runtime/queries/proto/highlights.scm b/runtime/queries/proto/highlights.scm
index 894686dd4..22df9002f 100644
--- a/runtime/queries/proto/highlights.scm
+++ b/runtime/queries/proto/highlights.scm
@@ -11,6 +11,9 @@
 (field_option
   (identifier) @property)
 
+(enum_value_option
+  (identifier) @property)
+
 (block_lit
   (identifier) @property)
 
@@ -21,13 +24,17 @@
   "option"
   "reserved"
   "syntax"
+  "edition"
   "to"
+  "max"
 ] @keyword
 
 [
   "enum"
+  "group"
   "service"
   "message"
+  "map"
 ] @keyword.type
 
 "rpc" @keyword.function
@@ -35,9 +42,14 @@
 "returns" @keyword.return
 
 [
+  "export"
+  "local"
   "optional"
   "repeated"
   "required"
+  "stream"
+  "weak"
+  "public"
 ] @keyword.modifier
 
 [
@@ -65,6 +77,8 @@
   "\"proto2\""
 ] @string.special
 
+(escape_sequence) @string.escape
+
 (int_lit) @number
 
 (float_lit) @number.float
@@ -97,4 +111,8 @@
   ":"
 ] @punctuation.delimiter
 
-"=" @operator
+[
+  "="
+  "-"
+  "+"
+] @operator

From 9fd4d998c3d7e695c393e66346fb468d032ad3f0 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 7 Mar 2026 07:03:10 +0000
Subject: [PATCH 2675/2704] bot(parsers): update wit, zsh

---
 lua/nvim-treesitter/parsers.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fe5e1b7ba..0bcf9bae6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2589,7 +2589,7 @@ return {
   },
   wit = {
     install_info = {
-      revision = 'v1.2.0',
+      revision = 'v1.3.0',
       url = 'https://github.com/bytecodealliance/tree-sitter-wit',
     },
     maintainers = { '@mkatychev' },
@@ -2687,7 +2687,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.56.0',
+      revision = 'v0.57.0',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },

From 4110daee15fdf1a2030a2c989e6f240b31d6f5e6 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 7 Mar 2026 07:03:26 +0000
Subject: [PATCH 2676/2704] bot(parsers): update blade, elixir, gitcommit,
 groovy, idl, javadoc, kotlin, liquidsoap, matlab, nu, pkl, proto, t32, vhdl

---
 lua/nvim-treesitter/parsers.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 0bcf9bae6..5f1f12e90 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -125,7 +125,7 @@ return {
   },
   blade = {
     install_info = {
-      revision = '42b3c5a06bc29fbd2c2cbd52b96113365fbed646',
+      revision = 'b9436b7b936907aff730de0dac1b99d7c632cc86',
       url = 'https://github.com/EmranMR/tree-sitter-blade',
     },
     maintainers = { '@calebdw' },
@@ -472,7 +472,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = 'd24cecee673c4c770f797bac6f87ae4b6d7ddec5',
+      revision = '5c22791c9836d436ce31de5e454fbad0e706ea96',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -683,7 +683,7 @@ return {
   },
   gitcommit = {
     install_info = {
-      revision = 'a716678c0f00645fed1e6f1d0eb221481dbd6f6d',
+      revision = 'f912e0eec7c76da79df94a3e94cb8432244cddcd',
       url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
     maintainers = { '@gbprod' },
@@ -841,7 +841,7 @@ return {
   },
   groovy = {
     install_info = {
-      revision = 'a88865a3301a538e2060af5b401f4f431f71406e',
+      revision = '781d9cd1b482a70a6b27091e5c9e14bbcab3b768',
       url = 'https://github.com/murtaza64/tree-sitter-groovy',
     },
     maintainers = { '@murtaza64' },
@@ -1009,7 +1009,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = 'e6b8b4d2ba285caacf6f9e931f1f637f5bc02b03',
+      revision = 'e07d32972b41cc4c02cfd49f9df2abaa3ae54303',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1065,7 +1065,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = 'd1a2efc871825ff29a1d241cdcac5713c99cfd54',
+      revision = '42c9bc340c90ec15ed96eb4314269e8249376be9',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1204,7 +1204,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'cbed96ab13dbc082eeeb2e8333c342a62829c29d',
+      revision = 'f3a1ea74304adad67164a0a6ffe729428748a7a7',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     tier = 2,
@@ -1276,7 +1276,7 @@ return {
   },
   liquidsoap = {
     install_info = {
-      revision = 'abd0eccddd680102064e0eca82ef954bd8d1a301',
+      revision = '0169d92b0a93e9f32289533ef23abdafca579e56',
       url = 'https://github.com/savonet/tree-sitter-liquidsoap',
     },
     maintainers = { '@toots' },
@@ -1363,7 +1363,7 @@ return {
   },
   matlab = {
     install_info = {
-      revision = '574dde565caddf8cf44eec7df3cb89eb96053ed7',
+      revision = 'c2390a59016f74e7d5f75ef09510768b4f30217e',
       url = 'https://github.com/acristoffers/tree-sitter-matlab',
     },
     maintainers = { '@acristoffers' },
@@ -1475,7 +1475,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'bb3f533e5792260291945e1f329e1f0a779def6e',
+      revision = 'f4793e3809bb84e78dee260b47085d8203a58d88',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1606,7 +1606,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'a02fc36f6001a22e7fdf35eaabbadb7b39c74ba5',
+      revision = 'ed032d19364318750139afbde59eeb674cda1b4c',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1709,7 +1709,7 @@ return {
   },
   proto = {
     install_info = {
-      revision = 'f0e767689c6e9efe7ff2e4b8680db71411915588',
+      revision = '5e0d0456c4be881a3007f35957018a1eb526aed7',
       url = 'https://github.com/coder3101/tree-sitter-proto',
     },
     maintainers = { '@stefanvanburen' },
@@ -2258,7 +2258,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = 'c4c5fa31666c66036ad3ace8179a408b8478395f',
+      revision = '05d4e5469fd50b08981e6e67ea2c9011b2b76206',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2515,7 +2515,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '7e0d014691c1b8c25e8fe8f30cc3ac4649df3f57',
+      revision = '58114f35d0865e348692256bfc5ae661fc1efb0c',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },

From 5cb05e1b0fa3c469958a2b26f36b3fe930af221c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 7 Mar 2026 11:09:03 +0100
Subject: [PATCH 2677/2704] fix(filetype): don't register `c-sharp`

Language names can only contain hyphens, and dashes are normalized by
Nvim itself now.
---
 plugin/filetypes.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
index 7759c1f5c..f8fe0c287 100644
--- a/plugin/filetypes.lua
+++ b/plugin/filetypes.lua
@@ -2,7 +2,7 @@ local filetypes = {
   angular = { 'htmlangular' },
   bash = { 'sh' },
   bibtex = { 'bib' },
-  c_sharp = { 'cs', 'csharp', 'c-sharp' },
+  c_sharp = { 'cs', 'csharp' },
   commonlisp = { 'lisp' },
   cooklang = { 'cook' },
   devicetree = { 'dts' },

From 493890b87a81dfe6a7e577dbc364ae33fa482da9 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Wed, 11 Mar 2026 17:24:03 -0700
Subject: [PATCH 2678/2704] feat(textproto): punctuation and string escape
 highlights

---
 runtime/queries/textproto/highlights.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/runtime/queries/textproto/highlights.scm b/runtime/queries/textproto/highlights.scm
index 527af0398..f4d355ce2 100644
--- a/runtime/queries/textproto/highlights.scm
+++ b/runtime/queries/textproto/highlights.scm
@@ -6,6 +6,18 @@
 
 (number) @number
 
+"-" @operator
+
+[
+  ":"
+  ";"
+  ","
+  "."
+  "/"
+] @punctuation.delimiter
+
+(string_escape) @string.escape
+
 ; For stuff like "inf" and "-inf".
 (scalar_value
   [

From eb1f8e80cb28eb7892f347609e0bdc5eb574b945 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 14 Mar 2026 07:10:11 +0000
Subject: [PATCH 2679/2704] bot(parsers): update c3, elixir, erlang, fsharp,
 gitcommit, hyprlang, kotlin, ledger, pkl, powershell, proto, ruby, scala,
 scheme, t32, v

---
 lua/nvim-treesitter/parsers.lua | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 5f1f12e90..6dfd4208e 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '302fab443c2237e3b8fb3e991454db0e442af130',
+      revision = '24dc1da56e412a59c9d3ee4ffaf55dac58cc1dd4',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -472,7 +472,7 @@ return {
   },
   elixir = {
     install_info = {
-      revision = '5c22791c9836d436ce31de5e454fbad0e706ea96',
+      revision = '7937d3b4d65fa574163cfa59394515d3c1cf16f4',
       url = 'https://github.com/elixir-lang/tree-sitter-elixir',
     },
     maintainers = { '@connorlay' },
@@ -519,7 +519,7 @@ return {
   },
   erlang = {
     install_info = {
-      revision = 'f21023bbd6cd30cadbc793d80ae4d990d9be86fc',
+      revision = '1d78195c4fbb1fc027eb3e4220427f1eb8bfc89e',
       url = 'https://github.com/WhatsApp/tree-sitter-erlang',
     },
     maintainers = { '@filmor' },
@@ -608,7 +608,7 @@ return {
   fsharp = {
     install_info = {
       location = 'fsharp',
-      revision = '5141851c278a99958469eb1736c7afc4ec738e47',
+      revision = '2b3c4fae185d5185b5fa1a3d3117cad35f669352',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -683,7 +683,7 @@ return {
   },
   gitcommit = {
     install_info = {
-      revision = 'f912e0eec7c76da79df94a3e94cb8432244cddcd',
+      revision = '33fe8548abcc6e374feaac5724b5a2364bf23090',
       url = 'https://github.com/gbprod/tree-sitter-gitcommit',
     },
     maintainers = { '@gbprod' },
@@ -1001,7 +1001,7 @@ return {
   },
   hyprlang = {
     install_info = {
-      revision = '22723f25f3faf329863d952c9601b492afd971c9',
+      revision = 'cecd6b748107d9da1f7b4ca03ef95f1f71d93b8f',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-hyprlang',
     },
     maintainers = { '@luckasRanarison' },
@@ -1204,7 +1204,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'f3a1ea74304adad67164a0a6ffe729428748a7a7',
+      revision = 'a1760ba7178fe76515e7cfe7577deae2335fa57d',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     tier = 2,
@@ -1244,7 +1244,7 @@ return {
   },
   ledger = {
     install_info = {
-      revision = '96c92d4908a836bf8f661166721c98439f8afb80',
+      revision = '2edce0372079896c810c7b218587f2b3fbb7a086',
       url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
     maintainers = { '@cbarrete' },
@@ -1606,7 +1606,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = 'ed032d19364318750139afbde59eeb674cda1b4c',
+      revision = '7c8a0d15d83c1a436e91277d5023340f1ae5726b',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1649,7 +1649,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = 'da65ba3acc93777255781b447f5e7448245df4bf',
+      revision = 'b881dfbe71a770ea37d434c80d3523091b81f6db',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1709,7 +1709,7 @@ return {
   },
   proto = {
     install_info = {
-      revision = '5e0d0456c4be881a3007f35957018a1eb526aed7',
+      revision = 'eacb7f162e35a18a0dd8ce734f7e7baf2a8398ca',
       url = 'https://github.com/coder3101/tree-sitter-proto',
     },
     maintainers = { '@stefanvanburen' },
@@ -1960,7 +1960,7 @@ return {
   },
   ruby = {
     install_info = {
-      revision = 'ab6dca77a8184abc94af6e3e82538741b5078d63',
+      revision = 'ad907a69da0c8a4f7a943a7fe012712208da6dee',
       url = 'https://github.com/tree-sitter/tree-sitter-ruby',
     },
     maintainers = { '@TravonteD' },
@@ -1984,7 +1984,7 @@ return {
   },
   scala = {
     install_info = {
-      revision = '97aead18d97708190a51d4f551ea9b05b60641c9',
+      revision = '14c5cfd2b8e0f057ba0f4f72ee4812b0ae6cdce3',
       url = 'https://github.com/tree-sitter/tree-sitter-scala',
     },
     maintainers = { '@stevanmilic' },
@@ -2000,7 +2000,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = 'b5c701148501fa056302827442b5b4956f1edc03',
+      revision = '8004e59a1d17ca670aa34d09021c8499fdefaf61',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2258,7 +2258,7 @@ return {
   },
   t32 = {
     install_info = {
-      revision = '05d4e5469fd50b08981e6e67ea2c9011b2b76206',
+      revision = '3bce3977303c3f88bfa9fcdfcfd1a4f8f6ffa0b0',
       url = 'https://github.com/xasc/tree-sitter-t32',
     },
     maintainers = { '@xasc' },
@@ -2492,7 +2492,7 @@ return {
   v = {
     install_info = {
       location = 'tree_sitter_v',
-      revision = '9cf6a37689f06b17d170dec644ace81eb8eab280',
+      revision = '095865df4b9ddd21e376d635586c663d5a736f71',
       url = 'https://github.com/vlang/v-analyzer',
     },
     maintainers = { '@kkharji', '@amaanq' },

From 88a217f57061e5c98c9278bf93b0282e33b3d3bf Mon Sep 17 00:00:00 2001
From: Luca Papagni <89859659+lu-papagni@users.noreply.github.com>
Date: Sat, 14 Mar 2026 19:06:38 +0100
Subject: [PATCH 2680/2704] Show errors on `vim.system` failure (#8552)

Problem: `vim.system` throws an error when `uv.spawn` fails, in
particular when `cmd` or `cwd` does not exist. This kills the coroutine,
which makes the corresponding async call hang.

Solution: Wrap `vim.system` in a function that catches any error and
returns it as `stderr` in a `SystemObj`.

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 lua/nvim-treesitter/install.lua | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index b94b31027..2c564b9ab 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -97,7 +97,31 @@ end
 local function system(cmd, opts)
   local cwd = opts and opts.cwd or uv.cwd()
   log.trace('running job: (cwd=%s) %s', cwd, table.concat(cmd, ' '))
-  local r = a.await(3, vim.system, cmd, opts) --[[@as vim.SystemCompleted]]
+
+  ---vim.system throws an error when uv.spawn fails, in particular if cmd or cwd
+  ---does not exist. This kills the coroutine, so the async'ed call simply hangs.
+  ---Instead, we pass a wrapper that catches errors and propagates them as a proper
+  ---`SystemObj`.
+  ---TODO(clason): remove when https://github.com/neovim/neovim/issues/38257 is resolved.
+  ---@param _cmd string[]
+  ---@param _opts vim.SystemOpts
+  ---@param on_exit fun(result: vim.SystemCompleted)
+  ---@return vim.SystemObj?
+  local function system_wrap(_cmd, _opts, on_exit)
+    local ok, ret = pcall(vim.system, _cmd, _opts, on_exit)
+    if not ok then
+      on_exit({
+        code = 125,
+        signal = 0,
+        stdout = '',
+        stderr = ret --[[@as string]],
+      })
+      return nil
+    end
+    return ret --[[@as vim.SystemObj]]
+  end
+
+  local r = a.await(3, system_wrap, cmd, opts) --[[@as vim.SystemCompleted]]
   a.schedule()
   if r.stdout and r.stdout ~= '' then
     log.trace('stdout -> %s', r.stdout)

From f873ec2955098fc4b7c3abfe891bdd49fa7947e2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 12 Mar 2026 10:06:58 +0100
Subject: [PATCH 2681/2704] refactor(config): no trailing slash in installdir

---
 lua/nvim-treesitter/config.lua | 2 +-
 lua/nvim-treesitter/health.lua | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index ca8f9b73d..97fca649f 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -7,7 +7,7 @@ M.tiers = { 'stable', 'unstable', 'unmaintained', 'unsupported' }
 
 ---@type TSConfig
 local config = {
-  install_dir = vim.fs.joinpath(vim.fn.stdpath('data') --[[@as string]], 'site/'),
+  install_dir = vim.fs.joinpath(vim.fn.stdpath('data') --[[@as string]], 'site'),
 }
 
 ---Setup call for users to override configuration configurations.
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index ff0c0c0cf..2fcaea5a0 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -95,11 +95,7 @@ local function install_health()
   else
     health.error('is not writable.')
   end
-  if
-    vim.iter(vim.api.nvim_list_runtime_paths()):any(function(p)
-      return installdir == vim.fs.normalize(p) .. '/'
-    end)
-  then
+  if vim.list_contains(vim.api.nvim_list_runtime_paths(), installdir) then
     health.ok('is in runtimepath.')
   else
     health.error('is not in runtimepath.')

From 2f5d4c3f3c675962242096bcc8e586d76dd72eb2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 14 Mar 2026 19:39:31 +0100
Subject: [PATCH 2682/2704] docs(readme): clarify pre-release support policy

---
 README.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index f542e4933..94206aa31 100644
--- a/README.md
+++ b/README.md
@@ -16,16 +16,15 @@ For details on these and how to help improving them, see [CONTRIBUTING.md](./CON
 
 ## Requirements
 
-- Neovim 0.11.0 or later (nightly)
+- Neovim 0.12.0 or later (nightly)
 - `tar` and `curl` in your path
-- [`tree-sitter-cli`](https://github.com/tree-sitter/tree-sitter/blob/master/crates/cli/README.md) (0.26.1 or later)
+- [`tree-sitter-cli`](https://github.com/tree-sitter/tree-sitter/blob/master/crates/cli/README.md) (0.26.1 or later, installed via your package manager, **not npm**)
 - a C compiler in your path (see <https://docs.rs/cc/latest/cc/#compile-time-requirements>)
 
 >[!IMPORTANT]
-> The **support policy** for Neovim is
-> 1. the _latest_ [stable release](https://github.com/neovim/neovim/releases/tag/stable);
-> 2. the _latest_ [nightly prerelease](https://github.com/neovim/neovim/releases/tag/nightly).
-> Other versions may work but are neither tested nor considered for fixes. In general, compatibility with Nvim 0.X is removed after the release of Nvim 0.(X+1).1.
+> The current **support policy** for Neovim is
+> * the _latest_ [nightly prerelease](https://github.com/neovim/neovim/releases/tag/nightly).
+> Other versions may work but are neither tested nor considered for fixes. Once this plugin is [considered stable](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767), support will be added for the latest release.
 
 ## Installation
 
@@ -50,7 +49,7 @@ It is strongly recommended to automate this; e.g., using the following spec with
 `nvim-treesitter` can be configured by calling `setup`. **You do not need to call `setup` for `nvim-treesitter` to work using default values.**
 
 ```lua
-require'nvim-treesitter'.setup {
+require('nvim-treesitter').setup {
   -- Directory to install parsers and queries to (prepended to `runtimepath` to have priority)
   install_dir = vim.fn.stdpath('data') .. '/site'
 }
@@ -59,7 +58,7 @@ require'nvim-treesitter'.setup {
 Parsers and queries can then be installed with
 
 ```lua
-require'nvim-treesitter'.install { 'rust', 'javascript', 'zig' }
+require('nvim-treesitter').install { 'rust', 'javascript', 'zig' }
 ```
 
 (This is a no-op if the parsers are already installed.) Note that this function runs asynchronously; for synchronous installation in a script context ("bootstrapping"), you need to `wait()` for it to finish:

From ebc3201290b8372df2b3a1c23b71b9f007d972ff Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 16 Mar 2026 09:58:10 +0100
Subject: [PATCH 2683/2704] fix(zsh): mark as tier 2

---
 SUPPORTED_LANGUAGES.md          | 2 +-
 lua/nvim-treesitter/parsers.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 547b48d04..978a4b8ed 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -338,7 +338,7 @@ jsx (queries only)[^jsx] | unstable | `HFIJ ` | @steelsojka
 [zig](https://github.com/tree-sitter-grammars/tree-sitter-zig) | unstable | `HFIJL` | @amaanq
 [ziggy](https://github.com/kristoff-it/ziggy) | unmaintained | `H I  ` | 
 [ziggy_schema](https://github.com/kristoff-it/ziggy) | unmaintained | `H I  ` | 
-[zsh](https://github.com/georgeharker/tree-sitter-zsh) | stable | `HF JL` | @georgeharker
+[zsh](https://github.com/georgeharker/tree-sitter-zsh) | unstable | `HF JL` | @georgeharker
 [^bp]: Android Blueprint
 [^ecma]: queries required by javascript, typescript, tsx, qmljs
 [^gap]: GAP system
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 6dfd4208e..d894046cc 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2687,10 +2687,10 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'v0.57.0',
+      revision = '5aa8b258cc81a5ac1b76faf7dfc1a11dad300830',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },
-    tier = 1,
+    tier = 2,
   },
 }

From b9f9d692f1c7f0427502a3b84fa25d4bedb29ec1 Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Mon, 16 Mar 2026 12:08:58 -0700
Subject: [PATCH 2684/2704] feat(zsh): update parser and queries

add `;|` highlighting
---
 lua/nvim-treesitter/parsers.lua    | 2 +-
 runtime/queries/zsh/highlights.scm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index d894046cc..c09bdfe32 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2687,7 +2687,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = '5aa8b258cc81a5ac1b76faf7dfc1a11dad300830',
+      revision = 'b5d435fdef93257af6a7b6f957662fc88942609f',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },
diff --git a/runtime/queries/zsh/highlights.scm b/runtime/queries/zsh/highlights.scm
index 75a37408b..9c97ddce0 100644
--- a/runtime/queries/zsh/highlights.scm
+++ b/runtime/queries/zsh/highlights.scm
@@ -16,6 +16,7 @@
   ";;"
   ";&"
   ";;&"
+  ";|"
   "&"
 ] @punctuation.delimiter
 

From c9fea86a5a3c2d7f52e5cd53448edfaf7953bc75 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 16 Mar 2026 20:50:10 +0100
Subject: [PATCH 2685/2704] test(indent): drop plenary.path

---
 tests/indent/common.lua | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index 6add58c7f..a65aa8022 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -3,11 +3,10 @@ local M = {}
 local assert = require('luassert')
 local say = require('say')
 local scan_dir = require('plenary.scandir').scan_dir
-local Path = require('plenary.path')
 
 M.XFAIL = 'xfail'
 
-local function same_indent(state, arguments)
+local function same_indent(_, arguments)
   local before = arguments[1]
   local after = arguments[2]
 
@@ -166,7 +165,7 @@ Runner.__index = Runner
 function Runner:new(it, base_dir, buf_opts)
   local runner = {}
   runner.it = it
-  runner.base_dir = Path:new(base_dir)
+  runner.base_dir = base_dir
   runner.buf_opts = buf_opts
   return setmetatable(runner, self)
 end
@@ -175,19 +174,18 @@ function Runner:whole_file(dirs, opts)
   opts = opts or {}
   local expected_failures = opts.expected_failures or {}
   expected_failures = vim.tbl_map(function(f)
-    return Path:new(f):make_relative(self.base_dir.filename)
+    return vim.fs.normalize(vim.fs.joinpath(self.base_dir, f))
   end, expected_failures)
   dirs = type(dirs) == 'table' and dirs or { dirs }
   dirs = vim.tbl_map(function(dir)
-    dir = self.base_dir / Path:new(dir)
-    assert.is.same(1, vim.fn.isdirectory(dir.filename))
-    return dir.filename
+    dir = vim.fs.normalize(vim.fs.joinpath(self.base_dir, dir))
+    assert.is.same(1, vim.fn.isdirectory(dir))
+    return dir
   end, dirs)
   local files = vim.iter(vim.tbl_map(scan_dir, dirs)):flatten():totable()
   for _, file in ipairs(files) do
-    local relpath = Path:new(file):make_relative(self.base_dir.filename)
-    self.it(relpath, function()
-      M.indent_whole_file(file, self.buf_opts, vim.tbl_contains(expected_failures, relpath))
+    self.it(file, function()
+      M.indent_whole_file(file, self.buf_opts, vim.tbl_contains(expected_failures, file))
     end)
   end
 end
@@ -195,8 +193,8 @@ end
 function Runner:new_line(file, spec, title, xfail)
   title = title and title or tostring(spec.on_line)
   self.it(string.format('%s[%s]', file, title), function()
-    local path = self.base_dir / file
-    M.indent_new_line(path.filename, spec, self.buf_opts, xfail)
+    local path = vim.fs.joinpath(self.base_dir, file)
+    M.indent_new_line(path, spec, self.buf_opts, xfail)
   end)
 end
 

From 2cc172c28e5550e00e6beead4599b1469469c1c7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 17 Mar 2026 09:27:15 +0100
Subject: [PATCH 2686/2704] test(indent): we have scan_dir at home

---
 tests/indent/common.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index a65aa8022..ccc126870 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -2,7 +2,6 @@ local M = {}
 
 local assert = require('luassert')
 local say = require('say')
-local scan_dir = require('plenary.scandir').scan_dir
 
 M.XFAIL = 'xfail'
 
@@ -182,8 +181,13 @@ function Runner:whole_file(dirs, opts)
     assert.is.same(1, vim.fn.isdirectory(dir))
     return dir
   end, dirs)
-  local files = vim.iter(vim.tbl_map(scan_dir, dirs)):flatten():totable()
-  for _, file in ipairs(files) do
+  local scandir = function(dir)
+    return vim.fs.find(function()
+      return true
+    end, { path = dir, limit = math.huge })
+  end
+  local files = vim.iter(dirs):map(scandir):flatten()
+  for _, file in files:enumerate() do
     self.it(file, function()
       M.indent_whole_file(file, self.buf_opts, vim.tbl_contains(expected_failures, file))
     end)

From 2b50ab5ccbcd9e5708deb351308edd738adbf84c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 17 Mar 2026 10:12:15 +0100
Subject: [PATCH 2687/2704] test: replace plenary with plentest.nvim

Problem: plenary.nvim as test runner is overkill and no longer
maintained.

Solution: Replace with a minimal fork based on Neovim API and vendored
luassert.
---
 Makefile                 | 16 ++++++++--------
 scripts/minimal_init.lua |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9442df997..572a7f30b 100644
--- a/Makefile
+++ b/Makefile
@@ -86,13 +86,13 @@ $(HLASSERT):
 	tar -xf $(HLASSERT_TARBALL) -C $@
 	rm -rf $(HLASSERT_TARBALL)
 
-PLENARY := $(DEPDIR)/plenary.nvim
+PLENTEST := $(DEPDIR)/plentest.nvim
 
-.PHONY: plenary
-plenary: $(PLENARY)
+.PHONY: plentest
+plentest: $(PLENTEST)
 
-$(PLENARY):
-	git clone --filter=blob:none https://github.com/nvim-lua/plenary.nvim $(PLENARY)
+$(PLENTEST):
+	git clone --filter=blob:none https://github.com/nvim-treesitter/plentest.nvim $(PLENTEST)
 
 # actual test targets
 
@@ -129,10 +129,10 @@ docs: $(NVIM)
 	$(NVIM_BIN) -l scripts/update-readme.lua
 
 .PHONY: tests
-tests: $(NVIM) $(HLASSERT) $(PLENARY)
-	HLASSERT=$(HLASSERT)/highlight-assertions PLENARY=$(PLENARY) \
+tests: $(NVIM) $(HLASSERT) $(PLENTEST)
+	HLASSERT=$(HLASSERT)/highlight-assertions PLENTEST=$(PLENTEST) \
 		$(NVIM_BIN) --headless --clean -u scripts/minimal_init.lua \
-		-c "PlenaryBustedDirectory tests/$(TESTS) { minimal_init = './scripts/minimal_init.lua' }"
+		-c "lua require('plentest').test_directory('tests/$(TESTS)', { minimal_init = './scripts/minimal_init.lua' })"
 
 .PHONY: all
 all: lua query docs tests
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 502893bb0..f3e1c3652 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -1,5 +1,5 @@
-vim.o.rtp = vim.o.rtp .. ',.,' .. os.getenv('PLENARY')
-vim.cmd.runtime({ 'plugin/plenary.vim', bang = true })
+vim.o.rtp = os.getenv('PLENTEST') .. ',.,' .. vim.o.rtp
+vim.o.rtp = vim.fn.stdpath('data') .. '/site,' .. vim.o.rtp
 vim.cmd.runtime({ 'plugin/query_predicates.lua', bang = true })
 vim.cmd.runtime({ 'plugin/filetypes.lua', bang = true })
 

From 53f6ce29df5841ce26e5a9f06fb371088b8d8031 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 20 Mar 2026 10:38:35 +0100
Subject: [PATCH 2688/2704] feat(zsh)!: update parser and queries

---
 lua/nvim-treesitter/parsers.lua    | 2 +-
 runtime/queries/zsh/highlights.scm | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index c09bdfe32..1198d6df6 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2687,7 +2687,7 @@ return {
   },
   zsh = {
     install_info = {
-      revision = 'b5d435fdef93257af6a7b6f957662fc88942609f',
+      revision = 'bd344c23a7683e293d077c6648e88f209782fedb',
       url = 'https://github.com/georgeharker/tree-sitter-zsh',
     },
     maintainers = { '@georgeharker' },
diff --git a/runtime/queries/zsh/highlights.scm b/runtime/queries/zsh/highlights.scm
index 9c97ddce0..20fac01ba 100644
--- a/runtime/queries/zsh/highlights.scm
+++ b/runtime/queries/zsh/highlights.scm
@@ -14,9 +14,8 @@
 [
   ";"
   ";;"
-  ";&"
-  ";;&"
-  ";|"
+  (case_fallthrough)
+  (case_test_next)
   "&"
 ] @punctuation.delimiter
 

From 877f724846f2202a16e311bd19efb954bd1c430e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 16:37:59 +0000
Subject: [PATCH 2689/2704] ci: bump actions/create-github-app-token in the
 actions group

Bumps the actions group with 1 update: [actions/create-github-app-token](https://github.com/actions/create-github-app-token).


Updates `actions/create-github-app-token` from 2 to 3
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](https://github.com/actions/create-github-app-token/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-parsers.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-parsers.yml b/.github/workflows/update-parsers.yml
index 7b68b2412..694a8bbbd 100644
--- a/.github/workflows/update-parsers.yml
+++ b/.github/workflows/update-parsers.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           ref: main
 
-      - uses: actions/create-github-app-token@v2
+      - uses: actions/create-github-app-token@v3
         id: app-token
         with:
           app-id: ${{ vars.TOKEN_ID }}

From e5f65e31a5ec0e8526b2311ff8c7aaea4a581c82 Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 21 Mar 2026 07:07:27 +0000
Subject: [PATCH 2690/2704] bot(parsers): update arduino, c3, cue, dart,
 fortran, fsharp, git_rebase, gleam, heex, idl, just, kotlin, ledger, mlir,
 nim, nu, php, php_only, powershell, proto, racket, rust, scheme, swift, vhdl

---
 lua/nvim-treesitter/parsers.lua | 50 ++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 1198d6df6..74d649691 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -36,7 +36,7 @@ return {
   },
   arduino = {
     install_info = {
-      revision = '53eb391da4c6c5857f8defa2c583c46c2594f565',
+      revision = '11dd46c9ae25135c473c0003a133bb06a484af0c',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-arduino',
     },
     maintainers = { '@ObserverOfTime' },
@@ -166,7 +166,7 @@ return {
   },
   c3 = {
     install_info = {
-      revision = '24dc1da56e412a59c9d3ee4ffaf55dac58cc1dd4',
+      revision = '78e2ae9cff29ef8ca6666006abe80f1236d42996',
       url = 'https://github.com/c3lang/tree-sitter-c3',
     },
     maintainers = { '@cbuttner' },
@@ -313,7 +313,7 @@ return {
   },
   cue = {
     install_info = {
-      revision = 'be0f609c73cc2929811a9bce0ed90ca71ea87604',
+      revision = '20bb9195dac00b64c00ee494812abf3bf76f4181',
       url = 'https://github.com/eonpatapon/tree-sitter-cue',
     },
     maintainers = { '@amaanq' },
@@ -337,7 +337,7 @@ return {
   },
   dart = {
     install_info = {
-      revision = '81638dbbdb76a0e88ea8c31b95ec76b9625ddb84',
+      revision = '0fc19c3a57b1109802af41d2b8f60d8835c5da3a',
       url = 'https://github.com/UserNobody14/tree-sitter-dart',
     },
     maintainers = { '@akinsho' },
@@ -591,7 +591,7 @@ return {
   },
   fortran = {
     install_info = {
-      revision = '2880b7aab4fb7cc618de1ef3d4c6d93b2396c031',
+      revision = 'be30d90dc7dfa4080b9c4abed3f400c9163a88df',
       url = 'https://github.com/stadelmanma/tree-sitter-fortran',
     },
     maintainers = { '@amaanq' },
@@ -608,7 +608,7 @@ return {
   fsharp = {
     install_info = {
       location = 'fsharp',
-      revision = '2b3c4fae185d5185b5fa1a3d3117cad35f669352',
+      revision = '1c2d9351d1f731c08cfdc4ed41e63126ae56e462',
       url = 'https://github.com/ionide/tree-sitter-fsharp',
     },
     maintainers = { '@nsidorenco' },
@@ -667,7 +667,7 @@ return {
   },
   git_rebase = {
     install_info = {
-      revision = 'bff4b66b44b020d918d67e2828eada1974a966aa',
+      revision = '760ba8e34e7a68294ffb9c495e1388e030366188',
       url = 'https://github.com/the-mikedavis/tree-sitter-git-rebase',
     },
     maintainers = { '@gbprod' },
@@ -699,7 +699,7 @@ return {
   },
   gleam = {
     install_info = {
-      revision = '6ea757f7eb8d391dbf24dbb9461990757946dd5e',
+      revision = '0bb1b0ae1a3555180ae7b0004851da747fc230d1',
       url = 'https://github.com/gleam-lang/tree-sitter-gleam',
     },
     maintainers = { '@amaanq' },
@@ -904,7 +904,7 @@ return {
   },
   heex = {
     install_info = {
-      revision = 'b5a7cb5f74dc695a9ff5f04919f872ebc7a895e9',
+      revision = '3968d6e20b3c4cc234f339eddd6b7d118516e281',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
@@ -1009,7 +1009,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = 'e07d32972b41cc4c02cfd49f9df2abaa3ae54303',
+      revision = '57c4ba057415ebe8e184fb11716c985dc3545e5e',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1156,7 +1156,7 @@ return {
   },
   just = {
     install_info = {
-      revision = '60df3d5b3fda2a22fdb3621226cafab50b763663',
+      revision = 'd9da862c156020c1a83d3c6ccdda32be6d8a5d4a',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
@@ -1204,7 +1204,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = 'a1760ba7178fe76515e7cfe7577deae2335fa57d',
+      revision = '802fd920c153b02b9d266369a3ef061622f2bbf0',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     tier = 2,
@@ -1244,7 +1244,7 @@ return {
   },
   ledger = {
     install_info = {
-      revision = '2edce0372079896c810c7b218587f2b3fbb7a086',
+      revision = '22a1ab8195c1f6e808679f803007756fe7638c6f',
       url = 'https://github.com/cbarrete/tree-sitter-ledger',
     },
     maintainers = { '@cbarrete' },
@@ -1395,7 +1395,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '1cff1bf79135f8effef87d7cee9d3b26d1970ee9',
+      revision = '90d41fd327a8a6ded2fb366909ea86d8e31392ea',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1434,7 +1434,7 @@ return {
   },
   nim = {
     install_info = {
-      revision = '9b4ede21a6ca866d29263f6b66c070961bc622b4',
+      revision = '3878440d9398515ae053c6f6024986e69868bb74',
       url = 'https://github.com/alaviss/tree-sitter-nim',
     },
     maintainers = { '@aMOPel' },
@@ -1475,7 +1475,7 @@ return {
   },
   nu = {
     install_info = {
-      revision = 'f4793e3809bb84e78dee260b47085d8203a58d88',
+      revision = '696d257f6b652edb50878a783b30ad7833dec49e',
       url = 'https://github.com/nushell/tree-sitter-nu',
     },
     maintainers = { '@abhisheksingh0x558' },
@@ -1570,7 +1570,7 @@ return {
   php = {
     install_info = {
       location = 'php',
-      revision = '015ce839db5ae9ceda763bf12e071867fbe8cc89',
+      revision = '3f2465c217d0a966d41e584b42d75522f2a3149e',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1581,7 +1581,7 @@ return {
   php_only = {
     install_info = {
       location = 'php_only',
-      revision = '015ce839db5ae9ceda763bf12e071867fbe8cc89',
+      revision = '3f2465c217d0a966d41e584b42d75522f2a3149e',
       url = 'https://github.com/tree-sitter/tree-sitter-php',
     },
     maintainers = { '@tk-shirasaka', '@calebdw' },
@@ -1649,7 +1649,7 @@ return {
   powershell = {
     filetype = 'ps1',
     install_info = {
-      revision = 'b881dfbe71a770ea37d434c80d3523091b81f6db',
+      revision = '73800ecc8bddeee8f1079a5a2e0c13c3d00269bb',
       url = 'https://github.com/airbus-cert/tree-sitter-powershell',
     },
     maintainers = { '@L2jLiga' },
@@ -1709,7 +1709,7 @@ return {
   },
   proto = {
     install_info = {
-      revision = 'eacb7f162e35a18a0dd8ce734f7e7baf2a8398ca',
+      revision = 'd65a18ce7c2242801f702770114ad08056c7f8c9',
       url = 'https://github.com/coder3101/tree-sitter-proto',
     },
     maintainers = { '@stefanvanburen' },
@@ -1818,7 +1818,7 @@ return {
   },
   racket = {
     install_info = {
-      revision = '56b57807f86aa4ddb14892572b318edd4bc90ebe',
+      revision = '54649be8b939341d2d5410b594ab954fe8814bd0',
       url = 'https://github.com/6cdh/tree-sitter-racket',
     },
     tier = 2,
@@ -1976,7 +1976,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '261b20226c04ef601adbdf185a800512a5f66291',
+      revision = '8a1ccae7aaccdc11b04dbd803453e3e9cfd9159b',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2000,7 +2000,7 @@ return {
   },
   scheme = {
     install_info = {
-      revision = '8004e59a1d17ca670aa34d09021c8499fdefaf61',
+      revision = 'c6cb7c7d7a04b3f5d999c28e2e9c0c31b2d50ece',
       url = 'https://github.com/6cdh/tree-sitter-scheme',
     },
     tier = 2,
@@ -2226,7 +2226,7 @@ return {
   swift = {
     install_info = {
       generate = true,
-      revision = '30e18c7b0210b33ffd6e8a7028e170a9dc90825b',
+      revision = '8abb3e8b33256d89127a35e87480736f74755ff9',
       url = 'https://github.com/alex-pinkus/tree-sitter-swift',
     },
     maintainers = { '@alex-pinkus' },
@@ -2515,7 +2515,7 @@ return {
   },
   vhdl = {
     install_info = {
-      revision = '58114f35d0865e348692256bfc5ae661fc1efb0c',
+      revision = 'c2d9be3d5ab7fb2cae8ad5ae604cd3606a4af0f2',
       url = 'https://github.com/jpt13653903/tree-sitter-vhdl',
     },
     maintainers = { '@jpt13653903' },

From 0e0db770f2a3691fae478798342f4ac431accefd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 22 Mar 2026 12:15:39 +0100
Subject: [PATCH 2691/2704] fix(parsers): don't specify default branch

---
 lua/nvim-treesitter/parsers.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 74d649691..93d06bcb0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2555,7 +2555,6 @@ return {
   },
   vue = {
     install_info = {
-      branch = 'main',
       revision = 'ce8011a414fdf8091f4e4071752efc376f4afb08',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-vue',
     },

From 875515255192864c33981c3ed66ad94e561b904a Mon Sep 17 00:00:00 2001
From: Christian Clason <ch.clason+github@icloud.com>
Date: Sun, 22 Mar 2026 17:49:17 +0100
Subject: [PATCH 2692/2704] fix(parsers): track default branch for perl, pod
 (#8605)

Problem: non-default "release" branch tracking is broken, but the
default branch contains grammar.json.

Solution: track default `main` branch and generate parser from JSON.
---
 lua/nvim-treesitter/parsers.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 93d06bcb0..815e474e2 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1560,8 +1560,8 @@ return {
   },
   perl = {
     install_info = {
-      branch = 'release',
-      revision = '0c24d001dd1921e418fb933d208a7bd7dd3f923a',
+      generate = true,
+      revision = 'ea9667dc65a816acace002a2b1b099978785ca33',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-perl',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1622,8 +1622,8 @@ return {
   },
   pod = {
     install_info = {
-      branch = 'release',
-      revision = '0bf8387987c21bf2f8ed41d2575a8f22b139687f',
+      generate = true,
+      revision = '4559a9767eb15d757dce24107b840b137f673d33',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },

From 6620ae1c44dfa8623b22d0cbf873a9e8d073b849 Mon Sep 17 00:00:00 2001
From: Adrian Wang <86359799+0xDamn@users.noreply.github.com>
Date: Mon, 23 Mar 2026 17:32:51 +0800
Subject: [PATCH 2693/2704] fix(install): use rename-before-unlink on all
 platforms

Problem: On macOS Apple Silicon, a plain unlink can leave stale code
signature metadata in the kernel cache, causing SIGKILL on next page
fault after `TSUpdate`.

Solution: Apply the rename-then-unlink strategy unconditionally instead
of only on Windows.
---
 lua/nvim-treesitter/install.lua | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 2c564b9ab..893f95361 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -322,13 +322,9 @@ end
 local function do_install(logger, compile_location, target_location)
   logger:info(string.format('Installing parser'))
 
-  if uv.os_uname().sysname == 'Windows_NT' then -- why can't you just be normal?!
-    local tempfile = target_location .. tostring(uv.hrtime())
-    uv_rename(target_location, tempfile) -- parser may be in use: rename...
-    uv_unlink(tempfile) -- ...and mark for garbage collection
-  else
-    uv_unlink(target_location) -- don't disturb existing memory-mapped content
-  end
+  local tempfile = target_location .. tostring(uv.hrtime())
+  uv_rename(target_location, tempfile) -- parser may be in use: rename...
+  uv_unlink(tempfile) -- ...and mark for garbage collection
 
   local err = uv_copyfile(compile_location, target_location)
   a.schedule()

From f059649bc39ab39d55f2a165db752c956897d4fd Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 27 Mar 2026 11:37:59 -0700
Subject: [PATCH 2694/2704] fix(go): highlight rune as `@character` (#8612)

---
 runtime/queries/go/highlights.scm | 34 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index 91a9d4d76..0251f3b5b 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -152,32 +152,28 @@
     "panic" "print" "println" "real" "recover"))
 
 ; Delimiters
-"." @punctuation.delimiter
+[
+  "."
+  ","
+  ":"
+  ";"
+] @punctuation.delimiter
 
-"," @punctuation.delimiter
-
-":" @punctuation.delimiter
-
-";" @punctuation.delimiter
-
-"(" @punctuation.bracket
-
-")" @punctuation.bracket
-
-"{" @punctuation.bracket
-
-"}" @punctuation.bracket
-
-"[" @punctuation.bracket
-
-"]" @punctuation.bracket
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
 
 ; Literals
 (interpreted_string_literal) @string
 
 (raw_string_literal) @string
 
-(rune_literal) @string
+(rune_literal) @character
 
 (escape_sequence) @string.escape
 

From da8bf82a534506989c7bc9189552b5fba958f0c6 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 27 Mar 2026 15:22:25 -0700
Subject: [PATCH 2695/2704] fix(kotlin): regex and printf injections not
 applying (#8613)

---
 runtime/queries/kotlin/injections.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/runtime/queries/kotlin/injections.scm b/runtime/queries/kotlin/injections.scm
index b2bc233ff..a9bffab7b 100644
--- a/runtime/queries/kotlin/injections.scm
+++ b/runtime/queries/kotlin/injections.scm
@@ -8,7 +8,8 @@
 ;    - "[abc]?".toRegex()
 (call_expression
   (navigation_expression
-    ((string_literal) @injection.content
+    ((string_literal
+      (string_content) @injection.content)
       (#set! injection.language "regex"))
     (navigation_suffix
       ((simple_identifier) @_function
@@ -21,7 +22,8 @@
   (call_suffix
     (value_arguments
       (value_argument
-        (string_literal) @injection.content
+        (string_literal
+          (string_content) @injection.content)
         (#set! injection.language "regex")))))
 
 ;    - Regex.fromLiteral("[abc]?")
@@ -35,13 +37,15 @@
   (call_suffix
     (value_arguments
       (value_argument
-        (string_literal) @injection.content
+        (string_literal
+          (string_content) @injection.content)
         (#set! injection.language "regex")))))
 
 ; "pi = %.2f".format(3.14159)
 ((call_expression
   (navigation_expression
-    (string_literal) @injection.content
+    (string_literal
+      (string_content) @injection.content)
     (navigation_suffix
       (simple_identifier) @_method)))
   (#eq? @_method "format")

From 7caec274fd19c12b55902a5b795100d21531391f Mon Sep 17 00:00:00 2001
From: "nvim-treesitter-bot[bot]"
 <157957100+nvim-treesitter-bot[bot]@users.noreply.github.com>
Date: Sat, 28 Mar 2026 07:28:16 +0000
Subject: [PATCH 2696/2704] bot(parsers): update beancount, gotmpl, heex, helm,
 idl, javadoc, jinja, jinja_inline, just, kotlin, liquid, mlir, ocaml,
 ocaml_interface, pkl, pod, rust, supercollider, typoscript

---
 lua/nvim-treesitter/parsers.lua | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 815e474e2..17ec140ea 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -93,7 +93,7 @@ return {
   },
   beancount = {
     install_info = {
-      revision = 'd7a03a7506fbbbc4b16a9a2054ff7c2b337744b8',
+      revision = '429cff869513cf9e34a2cf604fbfaaedc467e809',
       url = 'https://github.com/polarmutex/tree-sitter-beancount',
     },
     maintainers = { '@polarmutex' },
@@ -801,7 +801,7 @@ return {
   },
   gotmpl = {
     install_info = {
-      revision = '04270cd3512e2c7de0c5f2823725d7b0c4c01fda',
+      revision = 'aa71f63de226c5592dfbfc1f29949522d7c95fac',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -904,7 +904,7 @@ return {
   },
   heex = {
     install_info = {
-      revision = '3968d6e20b3c4cc234f339eddd6b7d118516e281',
+      revision = '5842537f734d7c12685bf27d6005313e3e5a47a0',
       url = 'https://github.com/connorlay/tree-sitter-heex',
     },
     maintainers = { '@connorlay' },
@@ -913,7 +913,7 @@ return {
   helm = {
     install_info = {
       location = 'dialects/helm',
-      revision = '04270cd3512e2c7de0c5f2823725d7b0c4c01fda',
+      revision = 'aa71f63de226c5592dfbfc1f29949522d7c95fac',
       url = 'https://github.com/ngalaiko/tree-sitter-go-template',
     },
     maintainers = { '@qvalentin' },
@@ -1009,7 +1009,7 @@ return {
   },
   idl = {
     install_info = {
-      revision = '57c4ba057415ebe8e184fb11716c985dc3545e5e',
+      revision = 'fb65762a13538b397e41a5fc1e9564c9df841410',
       url = 'https://github.com/cathaysia/tree-sitter-idl',
     },
     maintainers = { '@cathaysia' },
@@ -1065,7 +1065,7 @@ return {
   },
   javadoc = {
     install_info = {
-      revision = '42c9bc340c90ec15ed96eb4314269e8249376be9',
+      revision = 'e2f56b4d0df08f6ed5df8bae266f9e75b340a9ab',
       url = 'https://github.com/rmuir/tree-sitter-javadoc',
     },
     maintainers = { '@rmuir' },
@@ -1083,7 +1083,7 @@ return {
   jinja = {
     install_info = {
       location = 'tree-sitter-jinja',
-      revision = '7bd0422c6a57aaabfee8603502d7708d0a536f5f',
+      revision = '413dba9fea354b62f6adada1815b2f504e32ffb5',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1094,7 +1094,7 @@ return {
   jinja_inline = {
     install_info = {
       location = 'tree-sitter-jinja_inline',
-      revision = '7bd0422c6a57aaabfee8603502d7708d0a536f5f',
+      revision = '413dba9fea354b62f6adada1815b2f504e32ffb5',
       url = 'https://github.com/cathaysia/tree-sitter-jinja',
     },
     maintainers = { '@cathaysia' },
@@ -1156,7 +1156,7 @@ return {
   },
   just = {
     install_info = {
-      revision = 'd9da862c156020c1a83d3c6ccdda32be6d8a5d4a',
+      revision = '5685543a6e64f66335e25518c9ae8ffa1dae3d01',
       url = 'https://github.com/IndianBoy42/tree-sitter-just',
     },
     maintainers = { '@Hubro' },
@@ -1204,7 +1204,7 @@ return {
   },
   kotlin = {
     install_info = {
-      revision = '802fd920c153b02b9d266369a3ef061622f2bbf0',
+      revision = '93bfeee1555d2b1442d68c44b0afde2a3b069e46',
       url = 'https://github.com/fwcd/tree-sitter-kotlin',
     },
     tier = 2,
@@ -1268,7 +1268,7 @@ return {
   },
   liquid = {
     install_info = {
-      revision = 'fa11c7ba45038b61e03a8a00ad667fb5f3d72088',
+      revision = '9566ca79911052919fce09d26f1f655b5e093857',
       url = 'https://github.com/hankthetank27/tree-sitter-liquid',
     },
     maintainers = { '@hankthetank27' },
@@ -1395,7 +1395,7 @@ return {
   mlir = {
     install_info = {
       generate = true,
-      revision = '90d41fd327a8a6ded2fb366909ea86d8e31392ea',
+      revision = '96fa0adc3028cc6a9d281370c9f213a457c4a2d0',
       url = 'https://github.com/artagnon/tree-sitter-mlir',
     },
     maintainers = { '@artagnon' },
@@ -1501,7 +1501,7 @@ return {
   ocaml = {
     install_info = {
       location = 'grammars/ocaml',
-      revision = '3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc',
+      revision = '5a979b3ec7f1fe990b8e8c4412294a0cf7228e45',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1510,7 +1510,7 @@ return {
   ocaml_interface = {
     install_info = {
       location = 'grammars/interface',
-      revision = '3ef7c00b29e41e3a0c1d18e82ea37c64d72b93fc',
+      revision = '5a979b3ec7f1fe990b8e8c4412294a0cf7228e45',
       url = 'https://github.com/tree-sitter/tree-sitter-ocaml',
     },
     maintainers = { '@undu' },
@@ -1606,7 +1606,7 @@ return {
   },
   pkl = {
     install_info = {
-      revision = '7c8a0d15d83c1a436e91277d5023340f1ae5726b',
+      revision = 'f5beed1da8e5fc856a1a11e29a929d0b7cdcfe3c',
       url = 'https://github.com/apple/tree-sitter-pkl',
     },
     maintainers = { '@ribru17' },
@@ -1623,7 +1623,7 @@ return {
   pod = {
     install_info = {
       generate = true,
-      revision = '4559a9767eb15d757dce24107b840b137f673d33',
+      revision = '57c606aa3373ba876d44113d13fe7bdc2c060723',
       url = 'https://github.com/tree-sitter-perl/tree-sitter-pod',
     },
     maintainers = { '@RabbiVeesh', '@LeoNerd' },
@@ -1976,7 +1976,7 @@ return {
   },
   rust = {
     install_info = {
-      revision = '8a1ccae7aaccdc11b04dbd803453e3e9cfd9159b',
+      revision = '77a3747266f4d621d0757825e6b11edcbf991ca5',
       url = 'https://github.com/tree-sitter/tree-sitter-rust',
     },
     maintainers = { '@amaanq' },
@@ -2183,7 +2183,7 @@ return {
   },
   supercollider = {
     install_info = {
-      revision = 'e2d1480de0a62cd53f81645cb39bc1f3fa2dce5a',
+      revision = '2b03ff49dd19b046add072d0861c4d1ca8a384c8',
       url = 'https://github.com/madskjeldgaard/tree-sitter-supercollider',
     },
     maintainers = { '@madskjeldgaard', '@elgiano' },
@@ -2434,7 +2434,7 @@ return {
   },
   typoscript = {
     install_info = {
-      revision = '1811c767f3f72be669891b524a07c58b1eb0db87',
+      revision = 'b5d0162b328ec52cf300054a8a23d47f84f55cb4',
       url = 'https://github.com/Teddytrombone/tree-sitter-typoscript',
     },
     maintainers = { '@Teddytrombone' },

From 90cd6580e720caedacb91fdd587b747a6e77d61f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 31 Mar 2026 11:14:37 +0200
Subject: [PATCH 2697/2704] tests: add stable Nvim

---
 .github/workflows/test-core.yml | 4 ++--
 README.md                       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 3a0b3cffa..0910099c6 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -15,8 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        nvim_tag: [nightly]
-    name: ${{ matrix.os }}
+        nvim_tag: [stable, nightly]
+    name: ${{matrix.nvim_tag}} / ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     env:
       NVIM: ${{ matrix.os == 'windows-latest' && 'nvim-win64\\bin\\nvim.exe' || 'nvim' }}
diff --git a/README.md b/README.md
index 94206aa31..235df2dc3 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ The `nvim-treesitter` plugin provides
 For details on these and how to help improving them, see [CONTRIBUTING.md](./CONTRIBUTING.md).
 
 >[!CAUTION]
-> This is a full, incompatible, rewrite. If you can't or don't want to update, specify the [`master` branch](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/README.md) (which is locked but will remain available for backward compatibility).
+> This is a full, incompatible, rewrite: Treat this as a different plugin you need to set up from scratch following the instructions below. If you can't or don't want to update, specify the [`master` branch](https://github.com/nvim-treesitter/nvim-treesitter/blob/master/README.md) (which is locked but will remain available for backward compatibility with Nvim 0.11).
 
 # Quickstart
 
@@ -23,8 +23,9 @@ For details on these and how to help improving them, see [CONTRIBUTING.md](./CON
 
 >[!IMPORTANT]
 > The current **support policy** for Neovim is
+> * the _latest_ [stable release](https://github.com/neovim/neovim/releases/tag/stable),
 > * the _latest_ [nightly prerelease](https://github.com/neovim/neovim/releases/tag/nightly).
-> Other versions may work but are neither tested nor considered for fixes. Once this plugin is [considered stable](https://github.com/nvim-treesitter/nvim-treesitter/issues/4767), support will be added for the latest release.
+> Other versions may work but are neither tested nor considered for fixes.
 
 ## Installation
 

From c82bf96f0a773d85304feeb695e1e23b2207ac35 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 1 Apr 2026 10:42:59 +0200
Subject: [PATCH 2698/2704] feat!: drop support for Nvim 0.11

---
 lua/nvim-treesitter/config.lua | 8 +-------
 lua/nvim-treesitter/health.lua | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/config.lua b/lua/nvim-treesitter/config.lua
index 97fca649f..3ea96f36d 100644
--- a/lua/nvim-treesitter/config.lua
+++ b/lua/nvim-treesitter/config.lua
@@ -168,13 +168,7 @@ function M.norm_languages(languages, skip)
     end
   end
 
-  -- TODO(clason): remove Nvim 0.11 compat
-  if vim.list then
-    return vim.list.unique(languages)
-  else
-    table.sort(languages)
-    return vim.fn.uniq(languages) --[=[@as string[] ]=]
-  end
+  return vim.list.unique(languages)
 end
 
 return M
diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 2fcaea5a0..7a54dd0fc 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -24,8 +24,8 @@ local function install_health()
   health.start('Requirements')
 
   do -- nvim check
-    if vim.fn.has('nvim-0.11') ~= 1 then
-      health.error('Nvim-treesitter requires Neovim 0.11.0 or later.')
+    if vim.fn.has('nvim-0.12') ~= 1 then
+      health.error('Nvim-treesitter requires Neovim 0.12.0 or later.')
     end
 
     if vim.treesitter.language_version >= NVIM_TREESITTER_MINIMUM_ABI then

From 6878ae017d691a0df1c49d8a091c88a33e4c2d50 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 8 Dec 2025 12:49:05 +0100
Subject: [PATCH 2699/2704] ci: migrate to emmyluals

---
 .emmyrc.json                    |  9 ++++++++-
 Makefile                        | 25 +++++++++++--------------
 lua/nvim-treesitter/async.lua   | 31 +++++++++++++++++++++----------
 lua/nvim-treesitter/indent.lua  |  2 +-
 lua/nvim-treesitter/install.lua |  6 ++++--
 5 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/.emmyrc.json b/.emmyrc.json
index 34d1e0b86..ebf5cc99e 100644
--- a/.emmyrc.json
+++ b/.emmyrc.json
@@ -12,7 +12,14 @@
   },
   "diagnostics": {
     "disable": [
-      "unnecessary-if"
+      "unnecessary-if",
+      "incomplete-signature-doc"
+    ],
+    "enables": [
+      "iter-variable-reassign",
+      "non-literal-expressions-in-assert",
+      "incomplete-signature-doc",
+      "missing-global-doc"
     ]
   },
   "codeAction": {
diff --git a/Makefile b/Makefile
index 572a7f30b..e22e2e6ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 NVIM_VERSION ?= nightly
-LUALS_VERSION := 3.17.1
 
 DEPDIR ?= .test-deps
 CURL ?= curl -sL --create-dirs
@@ -35,18 +34,18 @@ $(NVIM):
 	tar -xf $(NVIM_TARBALL) -C $@
 	rm -rf $(NVIM_TARBALL)
 
-LUALS := $(DEPDIR)/lua-language-server-$(LUALS_VERSION)-$(LUALS_ARCH)
-LUALS_TARBALL := $(LUALS).tar.gz
-LUALS_URL := https://github.com/LuaLS/lua-language-server/releases/download/$(LUALS_VERSION)/$(notdir $(LUALS_TARBALL))
+EMMYLUALS := $(DEPDIR)/emmylua_check-$(LUALS_ARCH)
+EMMYLUALS_TARBALL := $(EMMYLUALS).tar.gz
+EMMYLUALS_URL := https://github.com/emmyluals/emmylua-analyzer-rust/releases/latest/download/$(notdir $(EMMYLUALS_TARBALL))
 
-.PHONY: luals
-luals: $(LUALS)
+.PHONY: emmyluals
+emmyluals: $(EMMYLUALS)
 
-$(LUALS):
-	$(CURL) $(LUALS_URL) -o $(LUALS_TARBALL)
+$(EMMYLUALS):
+	$(CURL) $(EMMYLUALS_URL) -o $(EMMYLUALS_TARBALL)
 	mkdir $@
-	tar -xf $(LUALS_TARBALL) -C $@
-	rm -rf $(LUALS_TARBALL)
+	tar -xf $(EMMYLUALS_TARBALL) -C $@
+	rm -rf $(EMMYLUALS_TARBALL)
 
 STYLUA := $(DEPDIR)/stylua-$(STYLUA_ARCH)
 STYLUA_TARBALL := $(STYLUA).zip
@@ -104,10 +103,8 @@ formatlua: $(STYLUA)
 	$(STYLUA)/stylua .
 
 .PHONY: checklua
-checklua: $(LUALS) $(NVIM)
-	VIMRUNTIME=$(NVIM_RUNTIME) $(LUALS)/bin/lua-language-server \
-		--configpath=../.luarc.json \
-		--check=./
+checklua: $(EMMYLUALS) $(NVIM)
+	VIMRUNTIME=$(NVIM_RUNTIME) $(EMMYLUALS)/emmylua_check --warnings-as-errors .
 
 .PHONY: query
 query: formatquery lintquery checkquery
diff --git a/lua/nvim-treesitter/async.lua b/lua/nvim-treesitter/async.lua
index e78c0f964..a0a59e4b1 100644
--- a/lua/nvim-treesitter/async.lua
+++ b/lua/nvim-treesitter/async.lua
@@ -1,3 +1,4 @@
+---@meta nvim-treesitter.async vendored file, don't diagnose
 local pcall = copcall or pcall
 
 --- @param ... any
@@ -345,8 +346,9 @@ end
 --- -- Since uv functions have sync versions. You can just do:
 --- local stat = vim.fs_stat('foo.txt')
 --- ```
---- @param func function
---- @param ... any
+--- @generic T, R
+--- @param func async fun(...: T...): R...
+--- @param ... T...
 --- @return async.Task
 function M.arun(func, ...)
   local task = Task._new(func)
@@ -354,19 +356,27 @@ function M.arun(func, ...)
   return task
 end
 
---- @class async.TaskFun
---- @field package _fun fun(...: any): any
---- @operator call(...): any
+--- @alias async.TaskFun<T, R> fun(...: T...): async.Task
+
+--- @generic T, R
+--- @class async._TaskFun<T, R>
+--- @field package _fun async fun(...: T...): R...
+--- @operator call(...: T...): async.Task
 local TaskFun = {}
 TaskFun.__index = TaskFun
 
+--- @generic T, R
+--- @param self async._TaskFun<T, R>
+--- @param ... T...
+--- @return async.Task
 function TaskFun:__call(...)
   return M.arun(self._fun, ...)
 end
 
 --- Create an async function
---- @param fun function
---- @return async.TaskFun
+--- @generic T, R
+--- @param fun async fun(...: T...): R...
+--- @return async.TaskFun<T, R>
 function M.async(fun)
   return setmetatable({ _fun = fun }, TaskFun)
 end
@@ -430,9 +440,10 @@ local function await_cbfun(argc, fun, ...)
   end)
 end
 
---- @param taskfun async.TaskFun
---- @param ... any
---- @return any ...
+--- @generic T, R
+--- @param taskfun async.TaskFun<T, R>
+--- @param ... T...
+--- @return R...
 local function await_taskfun(taskfun, ...)
   return taskfun._fun(...)
 end
diff --git a/lua/nvim-treesitter/indent.lua b/lua/nvim-treesitter/indent.lua
index 6f8e4d8ff..ee513c351 100644
--- a/lua/nvim-treesitter/indent.lua
+++ b/lua/nvim-treesitter/indent.lua
@@ -97,7 +97,7 @@ local get_indents = memoize(function(bufnr, root, lang)
     return map
   end
   for id, node, metadata in query:iter_captures(root, bufnr) do
-    if query.captures[id]:sub(1, 1) ~= '_' then
+    if assert(query.captures[id]):sub(1, 1) ~= '_' then
       map[query.captures[id]][node:id()] = metadata or {}
     end
   end
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 893f95361..71d5a3c76 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -85,6 +85,7 @@ local function join(max_jobs, tasks)
     end
 
     for i = 1, max_jobs do
+      assert(tasks[i])
       tasks[i]():await(cb)
     end
   end)
@@ -155,7 +156,8 @@ end
 ---@param ... string
 ---@return string
 function M.get_package_path(...)
-  return fs.joinpath(fn.fnamemodify(debug.getinfo(1, 'S').source:sub(2), ':p:h:h:h'), ...)
+  local info = assert(debug.getinfo(1, 'S'))
+  return fs.joinpath(fn.fnamemodify(info.source:sub(2), ':p:h:h:h'), ...)
 end
 
 ---@param lang string
@@ -487,8 +489,8 @@ end
 
 --- Reload the parser table and user modifications in case of update
 local function reload_parsers()
-  ---@diagnostic disable-next-line:no-unknown
   package.loaded['nvim-treesitter.parsers'] = nil
+  ---@diagnostic disable-next-line:duplicate-require
   parsers = require('nvim-treesitter.parsers')
   vim.api.nvim_exec_autocmds('User', { pattern = 'TSUpdate' })
 end

From 539abf6da5ee8702e37b82cc953131dadd570da2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 2 Apr 2026 18:54:02 +0200
Subject: [PATCH 2700/2704] chore: remove redundant emmyluarc entry

---
 .emmyrc.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.emmyrc.json b/.emmyrc.json
index ebf5cc99e..2c67b9855 100644
--- a/.emmyrc.json
+++ b/.emmyrc.json
@@ -18,7 +18,6 @@
     "enables": [
       "iter-variable-reassign",
       "non-literal-expressions-in-assert",
-      "incomplete-signature-doc",
       "missing-global-doc"
     ]
   },

From 81295eb0c5fc05ab3796a28c9f160c3ac4098106 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Fri, 3 Apr 2026 01:43:28 -0700
Subject: [PATCH 2701/2704] feat(parsers): add jjdescription (#8625)

---
 SUPPORTED_LANGUAGES.md                       |  1 +
 lua/nvim-treesitter/parsers.lua              |  8 ++++
 runtime/queries/jjdescription/highlights.scm | 42 ++++++++++++++++++++
 runtime/queries/jjdescription/injections.scm |  6 +++
 4 files changed, 57 insertions(+)
 create mode 100644 runtime/queries/jjdescription/highlights.scm
 create mode 100644 runtime/queries/jjdescription/injections.scm

diff --git a/SUPPORTED_LANGUAGES.md b/SUPPORTED_LANGUAGES.md
index 978a4b8ed..98b798ab9 100644
--- a/SUPPORTED_LANGUAGES.md
+++ b/SUPPORTED_LANGUAGES.md
@@ -146,6 +146,7 @@ html_tags (queries only)[^html_tags] | unstable | `H IJ ` | @TravonteD
 [javascript](https://github.com/tree-sitter/tree-sitter-javascript) | unstable | `HFIJL` | @steelsojka
 [jinja](https://github.com/cathaysia/tree-sitter-jinja)[^jinja] | unstable | `H  J ` | @cathaysia
 [jinja_inline](https://github.com/cathaysia/tree-sitter-jinja)[^jinja_inline] | unstable | `H  J ` | @cathaysia
+[jjdescription](https://github.com/ribru17/tree-sitter-jjdescription) | stable | `H  J ` | @ribru17
 [jq](https://github.com/flurie/tree-sitter-jq) | unstable | `H  JL` | @ObserverOfTime
 [jsdoc](https://github.com/tree-sitter/tree-sitter-jsdoc) | unstable | `H    ` | @steelsojka
 [json](https://github.com/tree-sitter/tree-sitter-json) | unstable | `HFIJL` | @steelsojka
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 17ec140ea..fc5e42ac0 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1101,6 +1101,14 @@ return {
     readme_note = 'needed for full highlighting',
     tier = 2,
   },
+  jjdescription = {
+    install_info = {
+      revision = 'v1.0.3',
+      url = 'https://github.com/ribru17/tree-sitter-jjdescription',
+    },
+    maintainers = { '@ribru17' },
+    tier = 1,
+  },
   jq = {
     install_info = {
       revision = 'c204e36d2c3c6fce1f57950b12cabcc24e5cc4d9',
diff --git a/runtime/queries/jjdescription/highlights.scm b/runtime/queries/jjdescription/highlights.scm
new file mode 100644
index 000000000..7c87c08be
--- /dev/null
+++ b/runtime/queries/jjdescription/highlights.scm
@@ -0,0 +1,42 @@
+[
+  (comment)
+  (generated_comment)
+] @comment
+
+(comment_content) @spell
+
+(subject) @markup.heading
+
+(type) @keyword
+
+(scope) @variable.parameter
+
+(change_id) @constant
+
+(filepath) @string.special.path
+
+((rest) @comment
+  (#not-lua-match? @comment "^diff"))
+
+"JJ: ignore-rest" @keyword.directive
+
+[
+  "("
+  ")"
+] @punctuation.bracket
+
+":" @punctuation.delimiter
+
+"!" @punctuation.special
+
+[
+  "A"
+  "C"
+] @diff.plus
+
+"D" @diff.minus
+
+[
+  "M"
+  "R"
+] @diff.delta
diff --git a/runtime/queries/jjdescription/injections.scm b/runtime/queries/jjdescription/injections.scm
new file mode 100644
index 000000000..538383a3d
--- /dev/null
+++ b/runtime/queries/jjdescription/injections.scm
@@ -0,0 +1,6 @@
+((comment_content) @injection.content
+  (#set! injection.language "comment"))
+
+((rest) @injection.content
+  (#lua-match? @injection.content "^diff")
+  (#set! injection.language "diff"))

From 2098db61dcca4857465c340ee29c81f12c7355e8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Apr 2026 14:05:55 +0200
Subject: [PATCH 2702/2704] fix(yuck): improper use of supertypes in queries

Problem: `(ast_block)` is a supertype, of which `(symbol)` (among
others) is a subtype, which makes the final local pattern invalid.
(This was not noticed before because the parser is stuck at ABI 14
due to a missing `tree-sitter.json`.)

Solution: Fix the pattern and use supertype where appropriate.
---
 lua/nvim-treesitter/parsers.lua  | 2 +-
 runtime/queries/yuck/indents.scm | 2 --
 runtime/queries/yuck/locals.scm  | 7 +------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index fc5e42ac0..8c9ff4a18 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -2654,7 +2654,7 @@ return {
   },
   yuck = {
     install_info = {
-      revision = 'e877f6ade4b77d5ef8787075141053631ba12318',
+      revision = '6c60112b3b3e739fb1ca4a8ea4bea2b6ffe11318',
       url = 'https://github.com/tree-sitter-grammars/tree-sitter-yuck',
     },
     maintainers = { '@Philipp-M', '@amaanq' },
diff --git a/runtime/queries/yuck/indents.scm b/runtime/queries/yuck/indents.scm
index 515795021..806516bea 100644
--- a/runtime/queries/yuck/indents.scm
+++ b/runtime/queries/yuck/indents.scm
@@ -1,7 +1,5 @@
 [
   (ast_block)
-  (array)
-  (expr)
   (json_array)
   (json_object)
   (parenthesized_expression)
diff --git a/runtime/queries/yuck/locals.scm b/runtime/queries/yuck/locals.scm
index 9f40b2082..6c23fec38 100644
--- a/runtime/queries/yuck/locals.scm
+++ b/runtime/queries/yuck/locals.scm
@@ -1,8 +1,5 @@
 [
   (ast_block)
-  (list)
-  (array)
-  (expr)
   (json_array)
   (json_object)
   (parenthesized_expression)
@@ -16,6 +13,4 @@
   (simplexpr
     (ident) @local.definition.field))
 
-(ast_block
-  (symbol)
-  (ident) @local.definition.type)
+(symbol) @local.definition.type

From 234d76709e8de5efe0357458e097b633a1886890 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Apr 2026 14:26:51 +0200
Subject: [PATCH 2703/2704] ci(tests): remove ilammy/msvc-dev-cmd

Problem: Action uses deprecated Node 20, and Windows runners have a
current msvc build tools by default.

Solution: Remove action.
---
 .github/workflows/test-core.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 0910099c6..0332f479a 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -23,7 +23,6 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - uses: tree-sitter/setup-action/cli@v2
-      - uses: ilammy/msvc-dev-cmd@v1
 
       - name: Install and prepare Neovim
         env:

From 4916d6592ede8c07973490d9322f187e07dfefac Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Apr 2026 15:05:06 +0200
Subject: [PATCH 2704/2704] fix(health): normalize rtp when checking
 install_dir

Problem: Windows.

Solution: vim.fs.normalize.
---
 lua/nvim-treesitter/health.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lua/nvim-treesitter/health.lua b/lua/nvim-treesitter/health.lua
index 7a54dd0fc..11e899f2d 100644
--- a/lua/nvim-treesitter/health.lua
+++ b/lua/nvim-treesitter/health.lua
@@ -95,7 +95,9 @@ local function install_health()
   else
     health.error('is not writable.')
   end
-  if vim.list_contains(vim.api.nvim_list_runtime_paths(), installdir) then
+  if
+    vim.list_contains(vim.tbl_map(vim.fs.normalize, vim.api.nvim_list_runtime_paths()), installdir)
+  then
     health.ok('is in runtimepath.')
   else
     health.error('is not in runtimepath.')